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:
@@ -28,8 +28,7 @@ MenuTextBox:: ; 1d4f
|
||||
jp PrintText
|
||||
; 1d57
|
||||
|
||||
ret_1d57:: ; 1d57
|
||||
; unreferenced
|
||||
; unused
|
||||
ret
|
||||
; 1d58
|
||||
|
||||
@@ -450,8 +449,7 @@ PlaceNthMenuStrings:: ; 1f8d
|
||||
ret
|
||||
; 1f9e
|
||||
|
||||
Function1f9e:: ; 1f9e
|
||||
; unreferenced
|
||||
Unreferenced_Function1f9e:: ; 1f9e
|
||||
call GetMenuDataPointerTableEntry
|
||||
inc hl
|
||||
inc hl
|
||||
|
Reference in New Issue
Block a user