diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 22:56:36 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 22:56:36 -0500 |
| commit | 5c28d05bb40b47f084a34eb732da92c899e18db6 (patch) | |
| tree | b7e427bbb988bfdc51e347a87f6ab663c1f45a7b /mobile/mobile_45.asm | |
| parent | 8e1e583640fcb82cb8d6327a0174a892b4ba0ad2 (diff) | |
| parent | 2c789b64b1bfa9ec33d805d06ad3a7141e3871f1 (diff) | |
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
Diffstat (limited to 'mobile/mobile_45.asm')
| -rw-r--r-- | mobile/mobile_45.asm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index a7550cd55..920ef5cd7 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -61,7 +61,7 @@ String_114163: ; 114163 ; 114165 Jumptable_114165: ; 114165 - dw Function114268 + dw Stubbed_Function114268 dw Function114269 dw Function11433c dw Function1143b7 @@ -159,7 +159,8 @@ Function11425c: ; 11425c ; 114268 -Function114268: mobile +Stubbed_Function114268: + ret ; 114269 @@ -7348,7 +7349,7 @@ INCBIN "data/mobile/ascii-sym.txt" ; everything from here to the end of the bank is related to the ; Mobile Stadium option from the continue/newgame menu. -; XXX better function names +; Needs better function names MobileStudium: ; 0x117a7f ld a, [hInMenu] push af |