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:
@@ -27,7 +27,7 @@ PlaceMenuItemQuantity: ; 0x24ac3
|
||||
.done
|
||||
ret
|
||||
|
||||
PlaceMoneyTopRight: ; 24ae8
|
||||
Special_PlaceMoneyTopRight: ; 24ae8
|
||||
ld hl, MenuDataHeader_0x24b15
|
||||
call CopyMenuDataHeader
|
||||
jr PlaceMoneyDataHeader
|
||||
@@ -110,8 +110,8 @@ CoinString: ; 24b89
|
||||
ShowMoney_TerminatorString: ; 24b8e
|
||||
db "@"
|
||||
|
||||
Function24b8f: ; 24b8f
|
||||
; unreferenced, related to safari?
|
||||
Unreferenced_Function24b8f: ; 24b8f
|
||||
; related to safari?
|
||||
ld hl, Options
|
||||
ld a, [hl]
|
||||
push af
|
||||
|
Reference in New Issue
Block a user