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 /engine/debug.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 'engine/debug.asm')
| -rwxr-xr-x | engine/debug.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/debug.asm b/engine/debug.asm index c36652148..c131d7ae5 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -315,12 +315,12 @@ Function81adb: ; 81adb hlcoord 12, 3 call _PrepMonFrontpic ld de, vTiles2 tile $31 - predef GetMonBackpic + predef Predef_GetMonBackpic ld a, $31 ld [hGraphicStartTile], a hlcoord 2, 4 lb bc, 6, 6 - predef PlaceGraphic + predef Predef_PlaceGraphic ld a, [wd003] and a jr z, .asm_81b66 @@ -346,13 +346,13 @@ Function81adb: ; 81adb hlcoord 4, 1 call PlaceString ld de, vTiles2 - callfar GetTrainerPic + callfar Predef_GetTrainerPic xor a ld [TempEnemyMonSpecies], a ld [hGraphicStartTile], a hlcoord 2, 3 lb bc, 7, 7 - predef PlaceGraphic + predef Predef_PlaceGraphic .asm_81ba9 ld a, $1 @@ -739,7 +739,7 @@ Function81df4: ; 81df4 ld a, [wd004] inc a ld [wd265], a - predef GetTMHMMove + predef Predef_GetTMHMMove ld a, [wd265] ld [wPutativeTMHMMove], a call GetMoveName @@ -748,7 +748,7 @@ Function81df4: ; 81df4 ld a, [wd004] call Function81e55 ld [CurItem], a - predef CanLearnTMHMMove + predef Predef_CanLearnTMHMMove ld a, c and a ld de, String_81e46 |