Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts: # data/items/descriptions.asm # data/sprite_anims/framesets.asm # engine/crystal_colors.asm # engine/events/kurt.asm # engine/events/special.asm # engine/events/std_scripts.asm # engine/events_3.asm # engine/item_effects.asm # engine/namingscreen.asm # engine/scripting.asm # engine/stats_screen.asm # engine/trade_animation.asm # home/audio.asm # main.asm # maps/BattleTower1F.asm # maps/BattleTowerBattleRoom.asm # maps/BurnedTowerB1F.asm # maps/ElmsLab.asm # maps/GoldenrodDeptStore5F.asm # maps/GoldenrodUnderground.asm # maps/HallOfFame.asm # maps/MahoganyTown.asm # maps/ManiasHouse.asm # maps/MobileBattleRoom.asm # maps/MobileTradeRoomMobile.asm # maps/RadioTower2F.asm # maps/Route35NationalParkGate.asm # maps/Route36NationalParkGate.asm # maps/Route39Farmhouse.asm # tilesets/palette_maps.asm
This commit is contained in:
@@ -33,8 +33,7 @@ Function11c075: ; 11c075
|
||||
ret
|
||||
; 11c082
|
||||
|
||||
Function11c082: ; 11c082
|
||||
; XXX
|
||||
Unreferenced_Function11c082: ; 11c082
|
||||
push de
|
||||
ld a, c
|
||||
call Function11c254
|
||||
@@ -275,7 +274,7 @@ CopyMobileEZChatToC608: ; 11c156
|
||||
jr .copy_string
|
||||
; 11c1ab
|
||||
|
||||
Function11c1ab: ; 11c1ab
|
||||
Special_Function11c1ab: ; 11c1ab
|
||||
ld a, [hInMenu]
|
||||
push af
|
||||
ld a, $1
|
||||
|
Reference in New Issue
Block a user