From 40c17c906b2b3f65b3b04b1933b90238a7ac5566 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 26 May 2014 14:04:56 -0700 Subject: Remove most static wram addresses. Use labels instead. For unknown addresses, use "w
". Label overleads are still an issue. --- engine/predefs17.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/predefs17.asm') diff --git a/engine/predefs17.asm b/engine/predefs17.asm index d261804a..1802f08d 100755 --- a/engine/predefs17.asm +++ b/engine/predefs17.asm @@ -2,9 +2,9 @@ ; so that the full Pokedex information gets displayed in Oak's lab DisplayStarterMonDex: ; 5c0dc (17:40dc) ld a, %01001011 ; set starter flags - ld [wPokedexOwned], a ; $d2f7 + ld [wPokedexOwned], a ; wPokedexOwned ld a, $3d call Predef ; indirect jump to ShowPokedexData (402d1 (10:42d1)) xor a ; unset starter flags - ld [wPokedexOwned], a ; $d2f7 + ld [wPokedexOwned], a ; wPokedexOwned ret -- cgit v1.3.1-sl0p From 38ac74f22285974bda6a0ed537958def8415076e Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 16 Jun 2014 11:37:36 -0700 Subject: Remove generated "indirect jump" comments. The destination is obvious when using the predef macro. --- engine/battle/1.asm | 6 ++--- engine/battle/15.asm | 2 +- engine/battle/4.asm | 2 +- engine/battle/4_2.asm | 4 +-- engine/battle/animations.asm | 6 ++--- engine/battle/core.asm | 46 +++++++++++++++++----------------- engine/battle/e_2.asm | 2 +- engine/cable_club.asm | 6 ++--- engine/evos_moves.asm | 8 +++--- engine/give_pokemon.asm | 2 +- engine/hall_of_fame.asm | 10 ++++---- engine/hidden_object_functions17.asm | 2 +- engine/hidden_object_functions7.asm | 2 +- engine/intro.asm | 4 +-- engine/items/items.asm | 2 +- engine/menu/bills_pc.asm | 4 +-- engine/menu/oaks_pc.asm | 2 +- engine/mon_party_sprites.asm | 2 +- engine/oak_speech.asm | 2 +- engine/overworld/card_key.asm | 4 +-- engine/overworld/ledges.asm | 2 +- engine/overworld/movement.asm | 2 +- engine/overworld/npc_movement.asm | 2 +- engine/overworld/player_animations.asm | 2 +- engine/predefs17.asm | 2 +- engine/titlescreen.asm | 4 +-- engine/trade.asm | 2 +- home.asm | 8 +++--- main.asm | 12 ++++----- scripts/agatha.asm | 2 +- scripts/bruno.asm | 2 +- scripts/celadonmartroof.asm | 2 +- scripts/lab4.asm | 2 +- scripts/lance.asm | 2 +- scripts/lorelei.asm | 2 +- scripts/mansion1.asm | 2 +- scripts/mansion2.asm | 2 +- scripts/mtmoon3.asm | 2 +- scripts/pewtergym.asm | 4 +-- scripts/pokemontower5.asm | 2 +- scripts/pokemontower7.asm | 4 +-- scripts/route12.asm | 2 +- scripts/route16.asm | 2 +- scripts/route20.asm | 4 +-- scripts/route22.asm | 4 +-- scripts/route23.asm | 4 +-- scripts/route25.asm | 8 +++--- scripts/silphco10.asm | 2 +- scripts/silphco11.asm | 6 ++--- scripts/silphco3.asm | 4 +-- scripts/silphco7.asm | 8 +++--- scripts/silphco8.asm | 2 +- scripts/silphco9.asm | 8 +++--- scripts/vermiliongym.asm | 2 +- scripts/victoryroad1.asm | 2 +- scripts/victoryroad2.asm | 2 +- scripts/victoryroad3.asm | 6 ++--- scripts/viridiangym.asm | 2 +- 58 files changed, 125 insertions(+), 125 deletions(-) (limited to 'engine/predefs17.asm') diff --git a/engine/battle/1.asm b/engine/battle/1.asm index 8c0466d4..ace29477 100755 --- a/engine/battle/1.asm +++ b/engine/battle/1.asm @@ -77,11 +77,11 @@ Func_7861: ; 7861 (1:7861) .asm_78aa ld [wListMenuID], a ; wListMenuID ld a, $48 - call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d)) + call Predef ld a, $0 - call Predef ; indirect jump to Func_3cd60 (3cd60 (f:4d60)) + call Predef ld a, $49 - call Predef ; indirect jump to Func_3cdec (3cdec (f:4dec)) + call Predef callab ReadPlayerMonCurHPAndStatus ld hl, SuckedHealthText ; $78dc ld a, [H_WHOSETURN] ; $fff3 diff --git a/engine/battle/15.asm b/engine/battle/15.asm index d6d59d5f..ba79d77e 100755 --- a/engine/battle/15.asm +++ b/engine/battle/15.asm @@ -246,7 +246,7 @@ Func_5525f: ; 5525f (15:525f) ld a, [wd0b5] ld [wd11e], a ld a, $1a - call Predef ; indirect jump to Func_3af5b (3af5b (e:6f5b)) + call Predef ld hl, wccd3 ld a, [wWhichPokemon] ; wWhichPokemon ld c, a diff --git a/engine/battle/4.asm b/engine/battle/4.asm index f41e7018..6e2bad34 100755 --- a/engine/battle/4.asm +++ b/engine/battle/4.asm @@ -44,7 +44,7 @@ asm_128fb: ; 128fb (4:68fb) ld a, [wcfbb] ld e, a ld a, $26 - call Predef ; indirect jump to UpdateHPBar_LoadRegisters (f9dc (3:79dc)) + call Predef ld a, $6 ld d, a ld c, a diff --git a/engine/battle/4_2.asm b/engine/battle/4_2.asm index d7625a59..d96fb87c 100755 --- a/engine/battle/4_2.asm +++ b/engine/battle/4_2.asm @@ -44,7 +44,7 @@ Func_137aa: ; 137aa (4:77aa) xor a ld [wccd4], a ld a, $2a - call Predef ; indirect jump to Func_3ad1c (3ad1c (e:6d1c)) + call Predef .asm_13813 xor a ld [wd083], a @@ -264,7 +264,7 @@ RecoilEffect_: ; 1392c (4:792c) .asm_13990 ld [wListMenuID], a ; wListMenuID ld a, $48 - call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d)) + call Predef ld hl, HitWithRecoilText ; $799e jp PrintText HitWithRecoilText: ; 1399e (4:799e) diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 6e5e9903..a5fb0253 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1228,7 +1228,7 @@ Func_791fc: ; 791fc (1e:51fc) Func_79209: ; 79209 (1e:5209) ld a, $21 - jp Predef ; indirect jump to Func_480ff (480ff (12:40ff)) + jp Predef AnimationShakeScreen: ; 7920e (1e:520e) ; Shakes the screen for a while. Used in Earthquake/Fissure/etc. animations. @@ -1236,7 +1236,7 @@ AnimationShakeScreen: ; 7920e (1e:520e) Func_79210: ; 79210 (1e:5210) ld a, $24 - jp Predef ; indirect jump to Func_48125 (48125 (12:4125)) + jp Predef AnimationWaterDropletsEverywhere: ; 79215 (1e:5215) ; Draws water droplets all over the screen and makes them @@ -2144,7 +2144,7 @@ Func_79793: ; 79793 (1e:5793) ld [wd0b5], a call GetMonHeader ld a, $4 - call Predef ; indirect jump to LoadMonBackSprite (3f103 (f:7103)) + call Predef xor a call Func_79842 call Func_79820 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a9f681de..15102340 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -174,7 +174,7 @@ Func_3c04c: ; 3c04c (f:404c) FuncCoord 1, 5 ld hl, Coord ld a, $1 - call Predef ; indirect jump to Func_3f0c6 (3f0c6 (f:70c6)) + call Predef xor a ld [$ffb0], a ld [rWY], a ; $ff4a @@ -752,7 +752,7 @@ UpdateCurMonHPBar: ; 3c4f6 (f:44f6) push bc ld [wListMenuID], a ; wListMenuID ld a, $48 - call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d)) + call Predef pop bc ret @@ -1760,7 +1760,7 @@ Func_3cc91: ; 3cc91 (f:4c91) Func_3cca4: ; 3cca4 (f:4ca4) call Func_3cd60 ld a, $4 - call Predef ; indirect jump to LoadMonBackSprite (3f103 (f:7103)) + call Predef xor a ld [$ffe1], a ld hl, wcc2d @@ -1792,7 +1792,7 @@ Func_3cca4: ; 3cca4 (f:4ca4) FuncCoord 4, 11 ld hl, Coord ld a, $2 - call Predef ; indirect jump to Func_3f073 (3f073 (f:7073)) + call Predef ld a, [wcf91] call PlayCry call Func_3ee94 @@ -1810,7 +1810,7 @@ Func_3ccfa: ; 3ccfa (f:4cfa) ld [wcd6c], a ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld a, $5 - call Predef ; indirect jump to Func_79aba (79aba (1e:5aba)) + call Predef ld c, $4 call DelayFrames call Func_3cd3a @@ -1822,7 +1822,7 @@ Func_3ccfa: ; 3ccfa (f:4cfa) xor a ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld a, $5 - call Predef ; indirect jump to Func_79aba (79aba (1e:5aba)) + call Predef call Delay3 call Func_3cd3a ld a, $4c @@ -1890,7 +1890,7 @@ Func_3cd60: ; 3cd60 (f:4d60) FuncCoord 10, 9 ld hl, Coord ld a, $5f - call Predef ; indirect jump to Func_128ef (128ef (4:68ef)) + call Predef ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld hl, wcf1d @@ -2385,9 +2385,9 @@ Func_3d119: ; 3d119 (f:5119) ld hl, wPartyMon1Species ; wPartyMon1Species (aliases: wPartyMon1) call ClearSprites ld a, $36 - call Predef ; indirect jump to StatusScreen (12953 (4:6953)) + call Predef ld a, $37 - call Predef ; indirect jump to StatusScreen2 (12b57 (4:6b57)) + call Predef ld a, [W_ENEMYBATTSTATUS2] ; W_ENEMYBATTSTATUS2 bit 4, a ld hl, AnimationSubstitute @@ -2923,7 +2923,7 @@ Func_3d4b6: ; 3d4b6 (f:54b6) FuncCoord 2, 10 ld hl, Coord ld a, $5d - call Predef ; indirect jump to Func_27d98 (27d98 (9:7d98)) + call Predef .asm_3d54e ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ; $ffba @@ -3873,7 +3873,7 @@ PrintMoveFailureText: ; 3dbe2 (f:5be2) call PrintText ld b, $4 ld a, $24 - call Predef ; indirect jump to Func_48125 (48125 (12:4125)) + call Predef ld a, [H_WHOSETURN] ; $fff3 and a jr nz, .asm_3dc3f @@ -6148,12 +6148,12 @@ Func_3eb01: ; 3eb01 (f:6b01) xor a ld [wHPBarMaxHP], a ld a, $3e - call Predef ; indirect jump to WriteMonMoves (3afb8 (e:6fb8)) + call Predef .asm_3ebca ld hl, wEnemyMonMoves ld de, wEnemyMonSpecial + 1 ld a, $5e - call Predef ; indirect jump to LoadMovePPs (f473 (3:7473)) + call Predef ld hl, W_MONHBASESTATS ld de, wd002 ld b, $5 @@ -6179,7 +6179,7 @@ Func_3eb01: ; 3eb01 (f:6b01) ld a, [wEnemyMonSpecies2] ld [wd11e], a ld a, $3a - call Predef ; indirect jump to IndexToPokedex (41010 (10:5010)) + call Predef ld a, [wd11e] dec a ld c, a @@ -6213,7 +6213,7 @@ Func_3ec32: ; 3ec32 (f:6c32) .asm_3ec4d call DelayFrame ld a, $30 - call Predef ; indirect jump to BattleTransition (7096d (1c:496d)) + call Predef callab Func_3ee58 ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ; $ffba @@ -6256,7 +6256,7 @@ Func_3ec92: ; 3ec92 (f:6c92) ld a, BANK(RedPicBack) call UncompressSpriteFromDE ld a, $3 - call Predef ; indirect jump to ScaleSpriteByTwo (2fe40 (b:7e40)) + call Predef ld hl, wOAMBuffer xor a ld [H_DOWNARROWBLINKCNT1], a ; $ff8b @@ -6307,7 +6307,7 @@ Func_3ec92: ; 3ec92 (f:6c92) FuncCoord 1, 5 ld hl, Coord ld a, $1 - jp Predef ; indirect jump to Func_3f0c6 (3f0c6 (f:70c6)) + jp Predef Func_3ed02: ; 3ed02 (f:6d02) callab Func_39680 @@ -6710,7 +6710,7 @@ asm_3ef3d: ; 3ef3d (f:6f3d) FuncCoord 12, 0 ld hl, Coord ld a, $1 - call Predef ; indirect jump to Func_3f0c6 (3f0c6 (f:70c6)) + call Predef ld a, $ff ld [wEnemyMonPartyPos], a ld a, $2 @@ -6766,7 +6766,7 @@ InitWildBattle: ; 3ef8b (f:6f8b) FuncCoord 12, 0 ld hl, Coord ld a, $1 - call Predef ; indirect jump to Func_3f0c6 (3f0c6 (f:70c6)) + call Predef Func_3efeb: ; 3efeb (f:6feb) ld b, $0 @@ -6856,7 +6856,7 @@ Func_3f073: ; 3f073 (f:7073) ld [wcd6c], a ld bc, $303 ld a, $5 - call Predef ; indirect jump to Func_79aba (79aba (1e:5aba)) + call Predef ld c, $4 call DelayFrames ld bc, $ffd7 @@ -6865,7 +6865,7 @@ Func_3f073: ; 3f073 (f:7073) ld [wcd6c], a ld bc, $505 ld a, $5 - call Predef ; indirect jump to Func_79aba (79aba (1e:5aba)) + call Predef ld c, $5 call DelayFrames ld bc, $ffd7 @@ -6943,7 +6943,7 @@ LoadMonBackSprite: ld hl, W_MONHBACKSPRITE - W_MONHEADER call UncompressMonSprite ld a, $3 - call Predef ; indirect jump to ScaleSpriteByTwo (2fe40 (b:7e40)) + call Predef ld de, vBackPic call InterlaceMergeSpriteBuffers ; combine the two buffers to a single 2bpp sprite ld hl, vSprites @@ -8547,7 +8547,7 @@ Func_3fbbc: ; 3fbbc (f:7bbc) push de push bc ld a, $8 - call Predef ; indirect jump to MoveAnimation (78d5e (1e:4d5e)) + call Predef pop bc pop de pop hl diff --git a/engine/battle/e_2.asm b/engine/battle/e_2.asm index 37b6a0a3..f35b4e3a 100755 --- a/engine/battle/e_2.asm +++ b/engine/battle/e_2.asm @@ -95,7 +95,7 @@ HealEffect_: ; 3b9ec (e:79ec) .asm_3ba83 ld [wListMenuID], a ; wListMenuID ld a, $48 - call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d)) + call Predef ld hl, Func_3cd5a ; $4d5a call BankswitchEtoF ld hl, RegainedHealthText ; $7aac diff --git a/engine/cable_club.asm b/engine/cable_club.asm index afca9392..1762d2be 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -274,9 +274,9 @@ Func_5345: ; 5345 ld hl, W_OPTIONS ; W_OPTIONS res 7, [hl] ld a, $2c - call Predef ; indirect jump to InitOpponent (3ef18 (f:6f18)) + call Predef ld a, $7 - call Predef ; indirect jump to HealParty (f6a5 (3:76a5)) + call Predef jp Func_577d .asm_5506 ld c, BANK(Music_GameCorner) @@ -886,7 +886,7 @@ Func_5a5f: ; 5a5f (1:5a5f) cp $5 ret nz ld a, $4d - call Predef ; indirect jump to Func_5aaf (5aaf (1:5aaf)) + call Predef jp Init .asm_5a75 call Func_5317 diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 432e488f..9cd2612b 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -153,7 +153,7 @@ Func_3ad71: ; 3ad71 (e:6d71) ld a, [wd0b5] ld [wd11e], a ld a, $3a - call Predef ; indirect jump to IndexToPokedex (41010 (10:5010)) + call Predef ld a, [wd11e] dec a ld hl, BaseStats @@ -206,12 +206,12 @@ Func_3ad71: ; 3ad71 (e:6d71) call Func_3af5b pop hl ld a, $42 - call Predef ; indirect jump to SetPartyMonTypes (5db5e (17:5b5e)) + call Predef ld a, [W_ISINBATTLE] ; W_ISINBATTLE and a call z, Func_3af52 ld a, $3a - call Predef ; indirect jump to IndexToPokedex (41010 (10:5010)) + call Predef ld a, [wd11e] dec a ld c, a @@ -362,7 +362,7 @@ Func_3af5b: ; 3af5b (e:6f5b) call GetMoveName call CopyStringToCF4B ld a, $1b - call Predef ; indirect jump to LearnMove (6e43 (1:6e43)) + call Predef .asm_3afb1 ld a, [wcf91] ld [wd11e], a diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 14d75472..3bda4729 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -53,7 +53,7 @@ SetPokedexOwnedFlag: ; 4fe11 (13:7e11) push af ld [wd11e], a ld a, $3a - call Predef ; indirect jump to IndexToPokedex (41010 (10:5010)) + call Predef ld a, [wd11e] dec a ld c, a diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 28705901..de0ff19a 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -118,7 +118,7 @@ Func_70278: ; 70278 (1c:4278) call GetMonHeader call LoadFrontSpriteByMonIndex ld a, $4 - call Predef ; indirect jump to LoadMonBackSprite (3f103 (f:7103)) + call Predef .asm_702ab ld b, $b ld c, $0 @@ -180,7 +180,7 @@ Func_702f0: ; 702f0 (1c:42f0) FuncCoord 3, 9 ld hl, Coord ld a, $4b - call Predef ; indirect jump to Func_27d6b (27d6b (9:7d6b)) + call Predef ld a, [wWhichTrade] ; wWhichTrade jp PlayCry @@ -203,7 +203,7 @@ Func_7033e: ; 7033e (1c:433e) ld a, BANK(RedPicBack) call UncompressSpriteFromDE ld a, $3 - call Predef ; indirect jump to ScaleSpriteByTwo (2fe40 (b:7e40)) + call Predef ld de, vBackPic call InterlaceMergeSpriteBuffers ld c, $1 @@ -213,13 +213,13 @@ Func_7036d: ; 7036d (1c:436d) FuncCoord 12, 5 ld hl, Coord ld a, $31 - jp Predef ; indirect jump to Func_79dda (79dda (1e:5dda)) + jp Predef Func_70377: ; 70377 (1c:4377) ld hl, wd747 set 3, [hl] ld a, $56 - call Predef ; indirect jump to DisplayDexRating (44169 (11:4169)) + call Predef FuncCoord 0, 4 ld hl, Coord ld b, $6 diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index bdda042c..8c0b6a0a 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -80,7 +80,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) FuncCoord 10, 11 ld hl, Coord ld a, $2 - call Predef ; indirect jump to Func_3f073 (3f073 (f:7073)) + call Predef call WaitForTextScrollButtonPress call LoadScreenTilesFromBuffer1 call Delay3 diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 034185fc..4d1e0339 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -294,7 +294,7 @@ CinnabarGymQuiz_1eb0a: ; 1eb0a (7:6b0a) pop bc ld [wd09f], a ld a, $17 - call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + call Predef ld hl, $ffdb dec [hl] jr nz, .asm_1eb0e diff --git a/engine/intro.asm b/engine/intro.asm index 00907065..c3449c0b 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -265,11 +265,11 @@ Func_4183f: ; 4183f (10:583f) Func_41842: ; 41842 (10:5842) ld c, $0 ld a, $31 - jp Predef ; indirect jump to Func_79dda + jp Predef Func_41849: ; 41849 (10:5849) ld a, $33 - call Predef ; indirect jump to Func_79869 + call Predef ld a, b jp PlaySound diff --git a/engine/items/items.asm b/engine/items/items.asm index fbf013c4..194b7733 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -2675,7 +2675,7 @@ Func_e7a4: ; e7a4 (3:67a4) ld a, $2 ld [wd07d], a ld a, $4e - call Predef ; indirect jump to Func_64eb (64eb (1:64eb)) + call Predef ld a, [W_NUMINBOX] ; wda80 dec a jr z, .asm_e867 diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index e48f6bd3..3c813861 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -467,9 +467,9 @@ Func_2174b: ; 2174b (8:574b) .asm_217b0 ld [wcc49], a ld a, $36 - call Predef ; indirect jump to StatusScreen (12953 (4:6953)) + call Predef ld a, $37 - call Predef ; indirect jump to StatusScreen2 (12b57 (4:6b57)) + call Predef call LoadScreenTilesFromBuffer1 call ReloadTilesetTilePatterns call GoPAL_SET_CF1C diff --git a/engine/menu/oaks_pc.asm b/engine/menu/oaks_pc.asm index b32ffe7f..1d591d1d 100755 --- a/engine/menu/oaks_pc.asm +++ b/engine/menu/oaks_pc.asm @@ -9,7 +9,7 @@ OpenOaksPC: ; 1e915 (7:6915) and a jr nz, .asm_1e932 ld a, $56 - call Predef ; indirect jump to DisplayDexRating (44169 (11:4169)) + call Predef .asm_1e932 ld hl, ClosedOaksPCText call PrintText diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index 5b6a11a3..c27c65b5 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -378,7 +378,7 @@ Func_718c3: ; 718c3 (1c:58c3) GetPartyMonSpriteID: ; 718e9 (1c:58e9) ld [wd11e], a ld a, $3a - call Predef ; indirect jump to IndexToPokedex (41010 (10:5010)) + call Predef ld a, [wd11e] ld c, a dec a diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 8ca82b0b..c7f2abf7 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -42,7 +42,7 @@ OakSpeech: ; 6115 (1:6115) call LoadTextBoxTilePatterns call SetDefaultNames ld a,$18 - call Predef ; indirect jump to InitializePlayerData + call Predef ld hl,wNumBoxItems ld a,POTION ld [wcf91],a diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm index 0dbbb665..991512bb 100755 --- a/engine/overworld/card_key.asm +++ b/engine/overworld/card_key.asm @@ -9,7 +9,7 @@ PrintCardKeyText: ; 52673 (14:6673) cp b jr nz, .asm_5267a ld a, $35 - call Predef ; indirect jump to Func_c586 (c586 (3:4586)) + call Predef ld a, [wcfc6] cp $18 jr z, .asm_5269c @@ -50,7 +50,7 @@ PrintCardKeyText: ; 52673 (14:6673) .asm_526ca ld [wd09f], a ld a, $17 - call Predef ; indirect jump to Func_ee9e + call Predef ld hl, wd126 set 5, [hl] ld a, (SFX_1f_57 - SFX_Headers_1f) / 3 diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index 1da91880..c1db3d43 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -6,7 +6,7 @@ HandleLedges: ; 1a672 (6:6672) and a ; OVERWORLD ret nz ld a, $35 - call Predef ; indirect jump to Func_c586 (c586 (3:4586)) + call Predef ld a, [wSpriteStateData1 + 9] ld b, a FuncCoord 8, 9 diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index a01a5d0a..374b8ea6 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -459,7 +459,7 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd) ; tests if sprite is off screen or otherwise unable to do anything CheckSpriteAvailability: ; 50dc (1:50dc) ld a, $12 - call Predef ; indirect jump to IsMissableObjectHidden (f1a6 (3:71a6)) + call Predef ld a, [$ffe5] and a jp nz, .spriteInvisible diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 260dafd9..d228df76 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -146,7 +146,7 @@ Func_1a4f4: ; 1a4f4 (6:64f4) ld a, $0 ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef ld hl, wd730 res 7, [hl] ld hl, wd72e diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 45051531..68a6b170 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -422,7 +422,7 @@ Func_707b6: ; 707b6 (1c:47b6) ld [hli], a ld [hl], a ld a, $4c - call Predef ; indirect jump to PrintEmotionBubble (17c47 (5:7c47)) + call Predef ld a, [wSpriteStateData1 + 2] cp $4 jr nz, .asm_70833 diff --git a/engine/predefs17.asm b/engine/predefs17.asm index 1802f08d..91a6f7fe 100755 --- a/engine/predefs17.asm +++ b/engine/predefs17.asm @@ -4,7 +4,7 @@ DisplayStarterMonDex: ; 5c0dc (17:40dc) ld a, %01001011 ; set starter flags ld [wPokedexOwned], a ; wPokedexOwned ld a, $3d - call Predef ; indirect jump to ShowPokedexData (402d1 (10:42d1)) + call Predef xor a ; unset starter flags ld [wPokedexOwned], a ; wPokedexOwned ret diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index d8a00e6f..9698da56 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -275,12 +275,12 @@ Func_4496: ; 4496 (1:4496) ld a, $90 ld [$ffb0], a ld d, 1 ; scroll out - callba TitleScroll ; indirect jump to TitleScroll (37258 (d:7258)) + callba TitleScroll ret Func_44c1: ; 44c1 (1:44c1) ld d, 0 ; scroll in - callba TitleScroll ; indirect jump to TitleScroll (37258 (d:7258)) + callba TitleScroll xor a ld [$ffb0], a ret diff --git a/engine/trade.asm b/engine/trade.asm index 1a984ceb..977656b5 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -767,4 +767,4 @@ Func_41676: ; 41676 (10:5676) xor a ld [wcc5b], a ld a, $8 - jp Predef ; indirect jump to MoveAnimation (78d5e (1e:4d5e)) + jp Predef diff --git a/home.asm b/home.asm index b4f50f5e..f1dd60b4 100644 --- a/home.asm +++ b/home.asm @@ -276,7 +276,7 @@ LoadFrontSpriteByMonIndex:: ; 1389 (0:1389) ld a, [wcf91] ld [wd11e], a ld a, $3a - call Predef ; indirect jump to IndexToPokedex (41010 (10:5010)) + call Predef ld hl, wd11e ld a, [hl] pop bc @@ -2961,7 +2961,7 @@ EndTrainerBattle:: ; 3275 (0:3275) ld a, [hl] ld [wcc4d], a ; load corresponding missable object index and remove it ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef .skipRemoveSprite ld hl, wd730 bit 4, [hl] @@ -3049,7 +3049,7 @@ CheckForEngagingTrainers:: ; 3306 (0:3306) swap a ld [wTrainerSpriteOffset], a ; wWhichTrade ld a, $39 - call Predef ; indirect jump to CheckEngagePlayer (5690f (15:690f)) + call Predef pop de pop hl ld a, [wTrainerSpriteOffset] ; wWhichTrade @@ -4012,7 +4012,7 @@ WaitForTextScrollButtonPress:: ; 3865 (0:3865) pop hl call JoypadLowSensitivity ld a, $2d - call Predef ; indirect jump to Func_5a5f (5a5f (1:5a5f)) + call Predef ld a, [$ffb5] and A_BUTTON | B_BUTTON jr z, .asm_3872 diff --git a/main.asm b/main.asm index 6df502f9..9d612cd2 100755 --- a/main.asm +++ b/main.asm @@ -2533,12 +2533,12 @@ Func_c69c: ; c69c (3:469c) jr z, .asm_c733 ld b, $2 ld a, $1f - call Predef ; indirect jump to Func_480eb (480eb (12:40eb)) + call Predef ld a, (SFX_02_43 - SFX_Headers_02) / 3 call PlaySound .asm_c733 ld a, $14 - call Predef ; indirect jump to AnyPlayerPokemonAliveCheck (3ca83 (f:4a83)) + call Predef ld a, d and a jr nz, .asm_c74f @@ -3379,7 +3379,7 @@ Func_f225: ; f225 (3:7225) and $f0 ret z ld a, $5a - call Predef ; indirect jump to Func_c60b (c60b (3:460b)) + call Predef ld a, [wd71c] and a jp nz, Func_f2dd @@ -3500,7 +3500,7 @@ _AddPokemonToParty: ; f2e5 (3:72e5) ld a, $2 ld [wd07d], a ld a, $4e - call Predef ; indirect jump to Func_64eb (64eb (1:64eb)) + call Predef .asm_f33f ld hl, wPartyMons ld a, [wcc49] @@ -3533,7 +3533,7 @@ _AddPokemonToParty: ; f2e5 (3:72e5) ld [wd11e], a push de ld a, $3a - call Predef ; indirect jump to IndexToPokedex (41010 (10:5010)) + call Predef pop de ld a, [wd11e] dec a @@ -3636,7 +3636,7 @@ _AddPokemonToParty: ; f2e5 (3:72e5) xor a ld [wHPBarMaxHP], a ld a, $3e - call Predef ; indirect jump to WriteMonMoves (3afb8 (e:6fb8)) + call Predef pop de ld a, [wPlayerID] ; set trainer ID to player ID inc de diff --git a/scripts/agatha.asm b/scripts/agatha.asm index ec6f35c6..e80e7d32 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -25,7 +25,7 @@ AgathaScript_76459: ; 76459 (1d:6459) ld [wd09f], a ld bc, $2 ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef AgathaScript_76464: ; 76464 (1d:6464) xor a diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 9d10c568..7f9dd1b6 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -25,7 +25,7 @@ BrunoScript_76302: ; 76302 (1d:6302) ld [wd09f], a ld bc, $2 ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef BrunoScript_7630d: ; 7630d (1d:630d) xor a diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index 73895736..1eb02dc2 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -15,7 +15,7 @@ CeladonMartRoofScript_483d8: ; 483d8 (12:43d8) ld [wd11e], a ld b, a ld a, $1c - call Predef ; indirect jump to Func_f8a5 (f8a5 (3:78a5)) + call Predef pop de pop hl ld a, b diff --git a/scripts/lab4.asm b/scripts/lab4.asm index a98e8e34..6a025f03 100755 --- a/scripts/lab4.asm +++ b/scripts/lab4.asm @@ -19,7 +19,7 @@ Lab4Script_75d38: ; 75d38 (1d:5d38) ld [wd11e], a ld b, a ld a, $1c - call Predef ; indirect jump to Func_f8a5 (f8a5 (3:78a5)) + call Predef pop de pop hl ld a, b diff --git a/scripts/lance.asm b/scripts/lance.asm index 1694704c..26d42788 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -35,7 +35,7 @@ LanceScript_5a2de: ; 5a2de (16:62de) LanceScript_5a2f0: ; 5a2f0 (16:62f0) ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef LanceScript_5a2f5: ; 5a2f5 (16:62f5) xor a diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index b6387fec..fb10a17d 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -26,7 +26,7 @@ LoreleiScript_76191: ; 76191 (1d:6191) ld [wd09f], a ld bc, $2 ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef LoreleiScript_761b6: ; 761b6 (1d:61b6) xor a diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index fe595094..7f314634 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -44,7 +44,7 @@ Mansion1Script_4430b: ; 4430b (11:430b) ld [wd09f], a asm_44310: ; 44310 (11:4310) ld a, $17 - call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + call Predef ret Mansion1Script_Switches: ; 44316 (11:4316) diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 4d6a11a9..679dd70a 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -41,7 +41,7 @@ Mansion2Script_51fee: ; 51fee (14:5fee) Mansion2Script_5202f: ; 5202f (14:602f) ld [wd09f], a ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef Mansion2Script_Switches: ; 52037 (14:6037) ld a, [wSpriteStateData1 + 9] diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index c9ac851e..732294cc 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -152,7 +152,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb) .asm_49e1f ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef xor a ld [wJoyIgnore], a ld a, $0 diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index e718538f..4d148906 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -70,11 +70,11 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) ld a, $4 ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef ld a, $22 ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef ld hl, wd7eb res 0, [hl] diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm index 0f164ab4..ff084349 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/pokemontower5.asm @@ -33,7 +33,7 @@ PokemonTower5Script0: ; 6094b (18:494b) ld hl, wd72e set 4, [hl] ld a, $7 - call Predef ; indirect jump to HealParty (f6a5 (3:76a5)) + call Predef call GBFadeOut2 call Delay3 call Delay3 diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 5a51e468..381d1c64 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -53,7 +53,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56) jr nz, .missableObjectsListLoop ld [wcc4d], a ; remove missable object ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef xor a ld [wJoyIgnore], a ld [wcf13], a @@ -70,7 +70,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86) ld a, $43 ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef ld a, $4 ld [wSpriteStateData1 + 9], a ld a, $95 diff --git a/scripts/route12.asm b/scripts/route12.asm index db743662..e722f15d 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -37,7 +37,7 @@ Route12Script0: ; 59619 (16:5619) ld a, $1d ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef ld a, $3 ld [W_ROUTE12CURSCRIPT], a ld [W_CURMAPSCRIPT], a diff --git a/scripts/route16.asm b/scripts/route16.asm index 39c3f477..afae25c9 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -37,7 +37,7 @@ Route16Script0: ; 59959 (16:5959) ld a, $21 ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef call UpdateSprites ld a, $3 ld [W_ROUTE16CURSCRIPT], a diff --git a/scripts/route20.asm b/scripts/route20.asm index ef2652c0..376d7da9 100755 --- a/scripts/route20.asm +++ b/scripts/route20.asm @@ -51,12 +51,12 @@ Route20Script_50cc6: ; 50cc6 (14:4cc6) Route20Script_50d0c: ; 50d0c (14:4d0c) ld [wcc4d], a ld a, $15 - jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) + jp Predef Route20Script_50d14: ; 50d14 (14:4d14) ld [wcc4d], a ld a, $11 - jp Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + jp Predef Route20ScriptPointers: ; 50d1c (14:4d1c) dw CheckFightingMapTrainers diff --git a/scripts/route22.asm b/scripts/route22.asm index f9f38e79..d9fce630 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -224,7 +224,7 @@ Route22Script_5104e: ; 5104e (14:504e) xor a ld [wcd50], a ld a, $4c - call Predef ; indirect jump to PrintEmotionBubble (17c47 (5:7c47)) + call Predef ld a, [wd700] and a jr z, .skipYVisibilityTesta @@ -356,7 +356,7 @@ Route22Script6: ; 51151 (14:5151) ld a, $23 ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef call Func_2307 ld hl, wd7eb res 1, [hl] diff --git a/scripts/route23.asm b/scripts/route23.asm index b5e0c0f8..507db5ce 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -19,11 +19,11 @@ Route23Script_511e9: ; 511e9 (14:51e9) ld a, $7a ld [wcc4d], a ld a, $15 - call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) + call Predef ld a, $60 ld [wcc4d], a ld a, $11 - jp Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + jp Predef Route23ScriptPointers: ; 51213 (14:5213) dw Route23Script0 diff --git a/scripts/route25.asm b/scripts/route25.asm index 04035065..609205ec 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -22,7 +22,7 @@ Route25Script_515e1: ; 515e1 (14:55e1) ld a, $61 ld [wcc4d], a ld a, $15 - jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) + jp Predef .asm_515ff bit 4, [hl] ret z @@ -30,15 +30,15 @@ Route25Script_515e1: ; 515e1 (14:55e1) ld a, $24 ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef ld a, $62 ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef ld a, $63 ld [wcc4d], a ld a, $15 - jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) + jp Predef Route25ScriptPointers: ; 51622 (14:5622) dw CheckFightingMapTrainers diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index 3b541391..b3264520 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -23,7 +23,7 @@ SilphCo10Script_5a14f: ; 5a14f (16:614f) ld [wd09f], a ld bc, $405 ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef DataTable_5a173: ; 5a173 (16:6173) db $04,$05,$FF diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 5d1186da..44918bea 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -23,7 +23,7 @@ SilphCo11Script_62110: ; 62110 (18:6110) ld [wd09f], a ld bc, $603 ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef DataTable_62134: ; 62134 (18:6134) db $06,$03,$FF @@ -81,7 +81,7 @@ SilphCo11Script_6216d: ; 6216d (18:616d) push hl ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef pop hl jr .asm_62170 .asm_62181 @@ -93,7 +93,7 @@ SilphCo11Script_6216d: ; 6216d (18:616d) push hl ld [wcc4d], a ld a, $15 - call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) + call Predef pop hl jr .asm_62184 diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index b63b59d6..4ea577a5 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -24,7 +24,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) ld [wd09f], a ld bc, $404 ld a, $17 - call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + call Predef pop af .asm_59f98 bit 1, a @@ -33,7 +33,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) ld [wd09f], a ld bc, $408 ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef DataTable_59fa8: ; 59fa8 (16:5fa8) db $04,$04,$04,$08,$FF diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 0854242b..6f2b306c 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -24,7 +24,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) ld [wd09f], a ld bc, $305 ld a, $17 - call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + call Predef pop af .asm_51b9e bit 5, a @@ -34,7 +34,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) ld [wd09f], a ld bc, $20a ld a, $17 - call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + call Predef pop af .asm_51bb1 bit 6, a @@ -43,7 +43,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) ld [wd09f], a ld bc, $60a ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef DataTable_51bc1: ; 51bc1 (14:5bc1) db $03,$05,$02,$0A,$06,$0A,$FF @@ -247,7 +247,7 @@ SilphCo7Script5: ; 51d25 (14:5d25) ld a, $a7 ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef call Func_2307 xor a ld [wJoyIgnore], a diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm index 5a954cbb..a1d05fd6 100755 --- a/scripts/silphco8.asm +++ b/scripts/silphco8.asm @@ -23,7 +23,7 @@ SilphCo8Script_5651a: ; 5651a (15:651a) ld [wd09f], a ld bc, $403 ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef DataTable_5653e: ; 5653e (15:653e) db $04,$03,$FF diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index e93e8601..2247a00f 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -24,7 +24,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) ld [wd09f], a ld bc, $401 ld a, $17 - call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + call Predef pop af .asm_5d7f8 bit 1, a @@ -34,7 +34,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) ld [wd09f], a ld bc, $209 ld a, $17 - call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + call Predef pop af .asm_5d80b bit 2, a @@ -44,7 +44,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) ld [wd09f], a ld bc, $509 ld a, $17 - call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + call Predef pop af .asm_5d81e bit 3, a @@ -53,7 +53,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) ld [wd09f], a ld bc, $605 ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef DataTable_5d82e: ; 5d82e (17:582e) db $04,$01,$02,$09,$05,$09,$06,$05,$FF diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index f1cb42ff..a76d34d8 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -41,7 +41,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) ld [wd09f], a ld bc, $202 ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a) xor a diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index 1dc62af8..21b87faa 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -18,7 +18,7 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) ld [wd09f], a ld bc, $604 ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a) dw VictoryRoad1Script0 diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index 071af611..034c7545 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -37,7 +37,7 @@ VictoryRoad2Script_517c9: ; 517c9 (14:57c9) VictoryRoad2Script_517e2: ; 517e2 (14:57e2) ld [wd09f], a ld a, $17 - call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + call Predef ret VictoryRoad2ScriptPointers: ; 517eb (14:57eb) diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 9c27ebc1..ea04671c 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -20,7 +20,7 @@ VictoryRoad3Script_44996: ; 44996 (11:4996) ld [wd09f], a ld bc, $503 ld a, $17 - jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) + jp Predef VictoryRoad3ScriptPointers: ; 449b1 (11:49b1) dw VictoryRoad3Script0 @@ -51,11 +51,11 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) ld a, $7a ld [wcc4d], a ld a, $11 - call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) + call Predef ld a, $60 ld [wcc4d], a ld a, $15 - jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) + jp Predef .coordsData_449f9: ; 449f9 (11:49f9) db $05,$03 diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 9034cc06..e0c59e61 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -178,7 +178,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) ld a, $23 ld [wcc4d], a ld a, $15 - call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) + call Predef ld hl, wd7eb set 1, [hl] set 7, [hl] -- cgit v1.3.1-sl0p From 35f2bb90d4a8f8e4dcac3fbab7d89cbc590285e8 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 16 Jun 2014 13:03:05 -0700 Subject: Rename predef functions so they aren't excessive in length. This is mostly because of an rgbasm bug that prevents macro arguments from exceeding 16 characters, but the names were bad anyway. --- engine/HoF_room_pc.asm | 2 +- engine/battle/1c.asm | 1 + engine/battle/core.asm | 12 +++--- engine/battle/e.asm | 4 +- engine/give_pokemon.asm | 2 +- engine/hp_bar.asm | 8 ++-- engine/in_game_trades.asm | 2 +- engine/items/items.asm | 2 +- engine/items/tms.asm | 2 +- engine/menu/naming_screen.asm | 2 +- engine/menu/pokedex.asm | 2 +- engine/menu/vending_machine.asm | 2 +- engine/overworld/emotion_bubbles.asm | 2 +- engine/overworld/item.asm | 2 +- engine/overworld/player_animations.asm | 2 +- engine/overworld/trainers.asm | 2 +- engine/palettes.asm | 2 +- engine/predefs.asm | 73 ++++++++++++---------------------- engine/predefs17.asm | 2 +- engine/slot_machine.asm | 2 +- home.asm | 4 +- home/overworld.asm | 12 +++--- main.asm | 26 ++++++------ scripts/celadongamecorner.asm | 2 +- scripts/daycarem.asm | 2 +- scripts/mtmoonpokecenter.asm | 2 +- scripts/museum1f.asm | 2 +- scripts/oakslab.asm | 4 +- scripts/safarizoneentrance.asm | 2 +- 29 files changed, 81 insertions(+), 103 deletions(-) (limited to 'engine/predefs17.asm') diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index a6b3f4d5..0ebb3b61 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -1,4 +1,4 @@ -HallOfFameComputer: ; 7405c (1d:405c) +HallOfFamePC: ; 7405c (1d:405c) callba AnimateHallOfFame call ClearScreen ld c, $64 diff --git a/engine/battle/1c.asm b/engine/battle/1c.asm index 242b8d66..5523ba7d 100755 --- a/engine/battle/1c.asm +++ b/engine/battle/1c.asm @@ -430,6 +430,7 @@ BattleTransition_OutwardSpiral_: ; 70af9 (1c:4af9) ld [wd09f], a jr .done2_ +FlashScreen: BattleTransition_FlashScreen_: ; 70b5d (1c:4b5d) ld hl, BattleTransition_FlashScreenPalettes .loop diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 15102340..21ee9d0d 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -241,7 +241,7 @@ Func_3c11e: ; 3c11e (f:411e) call DelayFrames call SaveScreenTilesToBuffer1 .asm_3c14f - call AnyPlayerPokemonAliveCheck + call AnyPartyAlive ld a, d and a jp z, HandlePlayerBlackOut @@ -774,7 +774,7 @@ HandleEnemyMonFainted: ; 3c525 (f:4525) xor a ld [wccf0], a call FaintEnemyPokemon - call AnyPlayerPokemonAliveCheck + call AnyPartyAlive ld a, d and a jp z, HandlePlayerBlackOut @@ -870,7 +870,7 @@ FaintEnemyPokemon ; 0x3c567 jr nz, .playermonnotfaint call Func_3c741 .playermonnotfaint - call AnyPlayerPokemonAliveCheck + call AnyPartyAlive ld a, d and a ret z @@ -1021,7 +1021,7 @@ HandlePlayerMonFainted: ; 3c700 (f:4700) ld a, $1 ld [wccf0], a call Func_3c741 - call AnyPlayerPokemonAliveCheck ; test if any more mons are alive + call AnyPartyAlive ; test if any more mons are alive ld a, d and a jp z, HandlePlayerBlackOut @@ -1492,7 +1492,7 @@ TrainerSentOutText: ; 3ca7e (f:4a7e) ; tests if the player has any pokemon that are not fainted ; sets d = 0 if all fainted, d != 0 if some mons are still alive -AnyPlayerPokemonAliveCheck: ; 3ca83 (f:4a83) +AnyPartyAlive: ; 3ca83 (f:4a83) ld a, [wPartyCount] ; wPartyCount ld e, a xor a @@ -6930,7 +6930,7 @@ asm_3f0d0: ; 3f0d0 (f:70d0) jr nz, .asm_3f0f4 ret -LoadMonBackSprite: +LoadMonBackPic: ; Assumes the monster's attributes have ; been loaded with GetMonHeader. ld a, [wBattleMonSpecies2] diff --git a/engine/battle/e.asm b/engine/battle/e.asm index f3eac4c9..0cea797d 100755 --- a/engine/battle/e.asm +++ b/engine/battle/e.asm @@ -758,7 +758,7 @@ ReadTrainer: ; 39c53 (e:5c53) ld a,1 ld [wcc49],a push hl - call AddPokemonToParty + call AddPartyMon pop hl jr .LoopTrainerData .SpecialTrainer @@ -775,7 +775,7 @@ ReadTrainer: ; 39c53 (e:5c53) ld a,1 ld [wcc49],a push hl - call AddPokemonToParty + call AddPartyMon pop hl jr .SpecialTrainer .AddLoneMove diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 3bda4729..21b56bf3 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -41,7 +41,7 @@ _GivePokemon: ; 4fda5 (13:7da5) ret .asm_4fe01 call SetPokedexOwnedFlag - call AddPokemonToParty + call AddPartyMon ld a, $1 ld [wcc3c], a ld [wccd3], a diff --git a/engine/hp_bar.asm b/engine/hp_bar.asm index b4d7125c..de0c4e41 100755 --- a/engine/hp_bar.asm +++ b/engine/hp_bar.asm @@ -1,9 +1,9 @@ -UpdateHPBar_LoadRegisters: ; f9dc (3:79dc) +HPBarLength: ; f9dc (3:79dc) call GetPredefRegisters ; calculates bc * 48 / de, the number of pixels the HP bar has ; the result is always at least 1 -UpdateHPBar_CalcNumberOfHPBarPixels: ; f9df (3:79df) +GetHPBarLength: ; f9df (3:79df) push hl xor a ld hl, H_MULTIPLICAND @@ -254,12 +254,12 @@ UpdateHPBar_CalcOldNewHPBarPixels: ; fb30 (3:7b30) ld l, a push hl push de - call UpdateHPBar_CalcNumberOfHPBarPixels ; calc num pixels for old HP + call GetHPBarLength ; calc num pixels for old HP ld a, e pop de pop bc push af - call UpdateHPBar_CalcNumberOfHPBarPixels ; calc num pixels for new HP + call GetHPBarLength ; calc num pixels for new HP pop af ld d, e ld e, a diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index e39cdb67..e1b6f757 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -136,7 +136,7 @@ Func_71c07: ; 71c07 (1c:5c07) call RemovePokemon ld a,$80 ld [wcc49],a - call AddPokemonToParty + call AddPartyMon call Func_71d19 callab EvolveTradeMon call ClearScreen diff --git a/engine/items/items.asm b/engine/items/items.asm index 194b7733..6b1bf8b3 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -431,7 +431,7 @@ ItemUseBall: ; d687 (3:5687) xor a ld [wcc49],a call ClearSprites - call AddPokemonToParty ;add mon to Party + call AddPartyMon ;add mon to Party jr .End .sendToBox ;$5907 call ClearSprites diff --git a/engine/items/tms.asm b/engine/items/tms.asm index 53b338d6..7a13250b 100755 --- a/engine/items/tms.asm +++ b/engine/items/tms.asm @@ -1,5 +1,5 @@ ; tests if mon [wcf91] can learn move [wd0e0] -TestMonMoveCompatibility: ; 1373e (4:773e) +CanLearnTM: ; 1373e (4:773e) ld a, [wcf91] ld [wd0b5], a call GetMonHeader diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 35c8be12..e065d98d 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -1,4 +1,4 @@ -AskForMonNickname: ; 64eb (1:64eb) +AskName: ; 64eb (1:64eb) call SaveScreenTilesToBuffer1 call GetPredefRegisters push hl diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 3f50d8c5..2336cb47 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -1,4 +1,4 @@ -DisplayPokedexMenu_: ; 40000 (10:4000) +ShowPokedexMenu: ; 40000 (10:4000) call GBPalWhiteOut call ClearScreen call UpdateSprites ; move sprites diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index 8a84c5e2..19550899 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -71,7 +71,7 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) ld hl, $ffde ld de, wPlayerMoney + 2 ; wd349 ld c, $3 - ld a, $c ; SubtractBCDPredef + ld a, $c ; SubBCDPredef call Predef ld a, $13 ld [wd125], a diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index a8d863df..ae7702b4 100755 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -1,4 +1,4 @@ -PrintEmotionBubble: ; 17c47 (5:7c47) +EmotionBubble: ; 17c47 (5:7c47) ld a, [wcd50] ld c, a ld b, $0 diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm index c66fc143..a75c393c 100644 --- a/engine/overworld/item.asm +++ b/engine/overworld/item.asm @@ -32,7 +32,7 @@ PickupItem: ld a, [$ffdb] ld [wcc4d], a - ld a, $11 ; RemoveMissableObject + ld a, $11 ; HideObject call Predef ld a, 1 ld [wcc3c], a diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 68a6b170..184d38f4 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -89,7 +89,7 @@ Func_705aa: ; 705aa (1c:45aa) ld [hl], a jp Func_70755 -_DoFlyOrTeleportAwayGraphics: ; 705ba (1c:45ba) +_LeaveMapAnim: ; 705ba (1c:45ba) call Func_706ef call Func_70787 ld a, b diff --git a/engine/overworld/trainers.asm b/engine/overworld/trainers.asm index 583decb9..b05ddbf1 100755 --- a/engine/overworld/trainers.asm +++ b/engine/overworld/trainers.asm @@ -159,7 +159,7 @@ Func_56903: ; 56903 (15:6903) ret ; tests if this trainer is in the right position to engage the player and do so if she is. -CheckEngagePlayer: ; 5690f (15:690f) +TrainerEngage: ; 5690f (15:690f) push hl push de ld a, [wTrainerSpriteOffset] ; wWhichTrade diff --git a/engine/palettes.asm b/engine/palettes.asm index 5eae18bd..5835f483 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -379,7 +379,7 @@ SendSGBPacket: ; 71feb (1c:5feb) ; else send 16 more bytes jr .loop2 -LoadSGBBorderAndPalettes: ; 7202b (1c:602b) +LoadSGB: ; 7202b (1c:602b) xor a ld [wcf1b], a call Func_7209b diff --git a/engine/predefs.asm b/engine/predefs.asm index e0df874f..7081df53 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -56,8 +56,7 @@ PredefPointers: ; 4fe79 (13:7e79) dbw BANK(Func_3f0c6),Func_3f0c6 dbw BANK(Func_3f073),Func_3f073 dbw BANK(ScaleSpriteByTwo), ScaleSpriteByTwo - db BANK(LoadMonBackSprite) ; dbw macro gives an error for some reason - dw LoadMonBackSprite + dbw BANK(LoadMonBackPic), LoadMonBackPic dbw BANK(Func_79aba),Func_79aba dbw BANK(Func_f132),Func_f132 HealPartyPredef: ; 4fe8e (13:7e8e) @@ -66,32 +65,24 @@ MoveAnimationPredef: ; 4fe91 (13:7e91) dbw BANK(MoveAnimation),MoveAnimation; 08 play move animation dbw BANK(DivideBCDPredef),DivideBCDPredef dbw BANK(DivideBCDPredef),DivideBCDPredef - dbw BANK(AddBCDPredef),AddBCDPredef - db BANK(SubtractBCDPredef) - dw SubtractBCDPredef + dbw BANK(AddBCDPredef), AddBCDPredef + dbw BANK(SubBCDPredef), SubBCDPredef dbw BANK(DivideBCDPredef),DivideBCDPredef dbw BANK(DivideBCDPredef),DivideBCDPredef - db BANK(InitializePlayerData) - dw InitializePlayerData + dbw BANK(InitPlayerData), InitPlayerData dbw BANK(FlagActionPredef),FlagActionPredef - db BANK(RemoveMissableObject) - dw RemoveMissableObject - db BANK(IsMissableObjectHidden) - dw IsMissableObjectHidden + dbw BANK(HideObject), HideObject + dbw BANK(IsObjectHidden), IsObjectHidden dbw BANK(Func_c69c),Func_c69c - db BANK(AnyPlayerPokemonAliveCheck) - dw AnyPlayerPokemonAliveCheck - db BANK(AddMissableObject) - dw AddMissableObject - db BANK(AddMissableObject) - dw AddMissableObject + dbw BANK(AnyPartyAlive), AnyPartyAlive + dbw BANK(ShowObject), ShowObject + dbw BANK(ShowObject), ShowObject dbw BANK(Func_ee9e),Func_ee9e - db BANK(InitializePlayerData) - dw InitializePlayerData + dbw BANK(InitPlayerData), InitPlayerData dbw BANK(Func_c754),Func_c754 dbw BANK(Func_3af5b),Func_3af5b dbw BANK(LearnMove),LearnMove - dbw BANK(IsItemInBag_),IsItemInBag_; 1C, used in Pokémon Tower + dbw BANK(IsItemInBag_),IsItemInBag_ ; 1C, used in Pokémon Tower dbw $03,Func_3eb5 ; for these two, the bank number is actually 0 dbw $03,GiveItem dbw BANK(Func_480eb),Func_480eb @@ -101,12 +92,10 @@ MoveAnimationPredef: ; 4fe91 (13:7e91) dbw BANK(Func_f9a0),Func_f9a0 dbw BANK(Func_48125),Func_48125 dbw BANK(UpdateHPBar),UpdateHPBar - db BANK(UpdateHPBar_LoadRegisters) - dw UpdateHPBar_LoadRegisters + dbw BANK(HPBarLength), HPBarLength dbw BANK(Func_5ab0),Func_5ab0 dbw BANK(Func_3ed02),Func_3ed02 - db BANK(DisplayPokedexMenu_) - dw DisplayPokedexMenu_ + dbw BANK(ShowPokedexMenu), ShowPokedexMenu dbw BANK(Func_3ad1c),Func_3ad1c dbw BANK(SaveSAVtoSRAM0),SaveSAVtoSRAM0 dbw BANK(InitOpponent),InitOpponent @@ -117,58 +106,46 @@ MoveAnimationPredef: ; 4fe91 (13:7e91) dbw BANK(Func_79dda),Func_79dda dbw BANK(PlayIntro),PlayIntro dbw BANK(Func_79869),Func_79869 - db BANK(BattleTransition_FlashScreen_) - dw BattleTransition_FlashScreen_ + dbw BANK(FlashScreen), FlashScreen dbw BANK(Func_c586),Func_c586 dbw BANK(StatusScreen),StatusScreen ; 37 0x12953 dbw BANK(StatusScreen2),StatusScreen2 ; 38 dbw BANK(Func_410e2),Func_410e2 - db BANK(CheckEngagePlayer) - dw CheckEngagePlayer + dbw BANK(TrainerEngage), TrainerEngage dbw BANK(IndexToPokedex),IndexToPokedex dbw BANK(Predef3B),Predef3B; 3B display pic? dbw BANK(UsedCut),UsedCut dbw BANK(ShowPokedexData),ShowPokedexData dbw BANK(WriteMonMoves),WriteMonMoves dbw BANK(SaveSAV),SaveSAV - db BANK(LoadSGBBorderAndPalettes) - dw LoadSGBBorderAndPalettes + dbw BANK(LoadSGB), LoadSGB dbw BANK(Func_f113),Func_f113 dbw BANK(SetPartyMonTypes),SetPartyMonTypes - db BANK(TestMonMoveCompatibility) - dw TestMonMoveCompatibility + dbw BANK(CanLearnTM), CanLearnTM dbw BANK(TMToMove),TMToMove dbw BANK(Func_71ddf),Func_71ddf - db BANK(DisplayStarterMonDex) - dw DisplayStarterMonDex; 46 load dex screen - db BANK(_AddPokemonToParty) - dw _AddPokemonToParty + dbw BANK(StarterDex), StarterDex ; 46 + dbw BANK(_AddPartyMon), _AddPartyMon dbw BANK(UpdateHPBar),UpdateHPBar dbw BANK(Func_3cdec),Func_3cdec dbw BANK(LoadTownMap_Nest),LoadTownMap_Nest dbw BANK(Func_27d6b),Func_27d6b - db BANK(PrintEmotionBubble) - dw PrintEmotionBubble; 4C player exclamation + dbw BANK(EmotionBubble), EmotionBubble; 4C player exclamation dbw BANK(Func_5aaf),Func_5aaf; return immediately - db BANK(AskForMonNickname) - dw AskForMonNickname + dbw BANK(AskName), AskName dbw BANK(PewterGuys),PewterGuys dbw BANK(SaveSAVtoSRAM2),SaveSAVtoSRAM2 dbw BANK(LoadSAVCheckSum2),LoadSAVCheckSum2 dbw BANK(LoadSAV),LoadSAV dbw BANK(SaveSAVtoSRAM1),SaveSAVtoSRAM1 dbw BANK(Predef54),Predef54 ; 54 initiate trade - db BANK(HallOfFameComputer) - dw HallOfFameComputer + dbw BANK(HallOfFamePC), HallOfFamePC dbw BANK(DisplayDexRating),DisplayDexRating - db $1E ; uses wrong bank number - dw _DoFlyOrTeleportAwayGraphics - db $1E ; uses wrong bank number - dw Func_70510 + dbw $1E, _LeaveMapAnim ; wrong bank + dbw $1E, Func_70510 ; wrong bank dbw BANK(Func_c5be),Func_c5be dbw BANK(Func_c60b),Func_c60b - db BANK(PrintUsedStrengthText) - dw PrintUsedStrengthText + dbw BANK(PrintStrengthTxt), PrintStrengthTxt dbw BANK(PickupItem),PickupItem dbw BANK(Func_27d98),Func_27d98 dbw BANK(LoadMovePPs),LoadMovePPs diff --git a/engine/predefs17.asm b/engine/predefs17.asm index 91a6f7fe..11e67aff 100755 --- a/engine/predefs17.asm +++ b/engine/predefs17.asm @@ -1,6 +1,6 @@ ; this function temporarily makes the starters (and Ivysaur) seen ; so that the full Pokedex information gets displayed in Oak's lab -DisplayStarterMonDex: ; 5c0dc (17:40dc) +StarterDex: ; 5c0dc (17:40dc) ld a, %01001011 ; set starter flags ld [wPokedexOwned], a ; wPokedexOwned ld a, $3d diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 68a15a18..0e17d13f 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -618,7 +618,7 @@ SlotMachine_37741: ; 37741 (d:7741) ld [hli], a ld de, wPlayerCoins + 1 ld c, $2 - ld a, $c ; SubtractBCDPredef + ld a, $c ; SubBCDPredef call Predef SlotMachine_37754: ; 37754 (d:7754) diff --git a/home.asm b/home.asm index f1dd60b4..5062b18c 100644 --- a/home.asm +++ b/home.asm @@ -4146,11 +4146,11 @@ RemovePokemon:: ; 391f (0:391f) ld b, BANK(_RemovePokemon) jp Bankswitch -AddPokemonToParty:: ; 3927 (0:3927) +AddPartyMon:: ; 3927 (0:3927) push hl push de push bc - callba _AddPokemonToParty + callba _AddPartyMon pop bc pop de pop hl diff --git a/home/overworld.asm b/home/overworld.asm index 84c96f3e..941b50cb 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -332,7 +332,7 @@ OverworldLoopLessDelay:: ld a,[W_CURMAP] cp a,OAKS_LAB jp z,.noFaintCheck - callab AnyPlayerPokemonAliveCheck ; check if all the player's pokemon fainted + callab AnyPartyAlive ; check if all the player's pokemon fainted ld a,d and a jr z,.allPokemonFainted @@ -507,7 +507,7 @@ WarpFound2:: ; 073c (0:073c) ; if it's a Silph Co. teleporter ld hl,wd732 set 3,[hl] - call DoFlyOrTeleportAwayGraphics + call LeaveMapAnim jr .skipMapChangeSound .notTeleporter call PlayMapChangeSound @@ -778,16 +778,16 @@ HandleFlyOrTeleportAway:: ld hl, wd732 set 2, [hl] res 5, [hl] - call DoFlyOrTeleportAwayGraphics + call LeaveMapAnim ld a, Bank(Func_62ce) ld [H_LOADEDROMBANK], a ld [$2000], a call Func_62ce jp Func_5d5f -DoFlyOrTeleportAwayGraphics:: - ld b, BANK(_DoFlyOrTeleportAwayGraphics) - ld hl, _DoFlyOrTeleportAwayGraphics +LeaveMapAnim:: + ld b, BANK(_LeaveMapAnim) + ld hl, _LeaveMapAnim jp Bankswitch LoadPlayerSpriteGraphics:: diff --git a/main.asm b/main.asm index 9d612cd2..ef17ad63 100755 --- a/main.asm +++ b/main.asm @@ -487,7 +487,7 @@ TestBattle: xor a ld [wcc49], a ld [W_CURMAP], a - call AddPokemonToParty + call AddPartyMon ; Fight against a ; level 20 Rhydon. @@ -686,7 +686,7 @@ SetIshiharaTeam: ; 64ca (1:64ca) ld a, [de] ld [W_CURENEMYLVL], a inc de - call AddPokemonToParty + call AddPartyMon jr .loop IshiharaTeam: ; 64df (1:64df) @@ -2638,7 +2638,7 @@ Func_c8de: ; c8de (3:48de) INCLUDE "data/hide_show_data.asm" -PrintUsedStrengthText: ; cd99 (3:4d99) +PrintStrengthTxt: ; cd99 (3:4d99) ld hl, wd728 set 0, [hl] ld hl, UsedStrengthText @@ -3231,7 +3231,7 @@ InitializeMissableObjectsFlags: ; f175 (3:7175) jr .missableObjectsLoop ; tests if current sprite is a missable object that is hidden/has been removed -IsMissableObjectHidden: ; f1a6 (3:71a6) +IsObjectHidden: ; f1a6 (3:71a6) ld a, [H_CURRENTSPRITEOFFSET] swap a ld b, a @@ -3258,7 +3258,7 @@ IsMissableObjectHidden: ; f1a6 (3:71a6) ; adds missable object (items, leg. pokemon, etc.) to the map ; [wcc4d]: index of the missable object to be added (global index) -AddMissableObject: ; f1c8 (3:71c8) +ShowObject: ; f1c8 (3:71c8) ld hl, W_MISSABLEOBJECTFLAGS ld a, [wcc4d] ld c, a @@ -3268,7 +3268,7 @@ AddMissableObject: ; f1c8 (3:71c8) ; removes missable object (items, leg. pokemon, etc.) from the map ; [wcc4d]: index of the missable object to be removed (global index) -RemoveMissableObject: ; f1d7 (3:71d7) +HideObject: ; f1d7 (3:71d7) ld hl, W_MISSABLEOBJECTFLAGS ld a, [wcc4d] ld c, a @@ -3452,7 +3452,7 @@ Func_f2dd: ; f2dd (3:72dd) res 6, [hl] ret -_AddPokemonToParty: ; f2e5 (3:72e5) +_AddPartyMon: ; f2e5 (3:72e5) ld de, wPartyCount ; wPartyCount ld a, [wcc49] and $f @@ -3668,7 +3668,7 @@ _AddPokemonToParty: ; f2e5 (3:72e5) inc de inc de pop hl - call AddPokemonToParty_WriteMovePP + call AddPartyMon_WriteMovePP inc de ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL ld [de], a @@ -3694,7 +3694,7 @@ _AddPokemonToParty: ; f2e5 (3:72e5) LoadMovePPs: ; f473 (3:7473) call GetPredefRegisters ; fallthrough -AddPokemonToParty_WriteMovePP: ; f476 (3:7476) +AddPartyMon_WriteMovePP: ; f476 (3:7476) ld b, $4 .pploop ld a, [hli] ; read move ID @@ -4286,7 +4286,7 @@ Func_f800: ; f800 (3:7800) ld de, $ffa1 ld hl, $ffa4 push bc - call SubtractBCD + call SubBCD pop bc jr .asm_f803 @@ -4318,10 +4318,10 @@ AddBCD:: ret -SubtractBCDPredef:: +SubBCDPredef:: call GetPredefRegisters -SubtractBCD:: +SubBCD:: and a ld b, c .sub @@ -4346,7 +4346,7 @@ SubtractBCD:: ret -InitializePlayerData: +InitPlayerData: call Random ld a, [hRandomSub] diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 039abe42..4cb001e6 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -157,7 +157,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9) ld hl, $ffa1 ld de, wPlayerMoney + 2 ld c, $3 - ld a, $c ; SubtractBCDPredef + ld a, $c ; SubBCDPredef call Predef xor a ldh [$9f], a diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index d2a70578..b584c4ed 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -156,7 +156,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) inc hl ld de, wPlayerMoney + 2 ld c, $3 - ld a, $c ; SubtractBCDPredef + ld a, $c ; SubBCDPredef call Predef ld a, (SFX_02_5a - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index e4515a61..6bbe7a1b 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -55,7 +55,7 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) ld hl, wTrainerFacingDirection ld de, wPlayerMoney + 2 ld c, $3 - ld a, $c ; SubtractBCDPredef + ld a, $c ; SubBCDPredef call Predef ld a, $13 ld [wd125], a diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index ed36973d..5e1bb792 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -103,7 +103,7 @@ Museum1FText1: ; 5c135 (17:4135) ld hl, wTrainerFacingDirection ld de, wPlayerMoney + 2 ld c, $3 - ld a, $c ; SubtractBCDPredef + ld a, $c ; SubBCDPredef call Predef ld a, $13 ld [wd125], a diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 0a54082d..194eb1a8 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -847,7 +847,7 @@ OaksLabScript_1d157: ; 1d157 (7:5157) ld hl, wd730 set 6, [hl] ld a, $46 - call Predef ; DisplayStarterMonDex + call Predef ; StarterDex ld hl, wd730 res 6, [hl] call ReloadMapData @@ -921,7 +921,7 @@ asm_1d1e5: ; 1d1e5 (7:51e5) ld [W_CURENEMYLVL], a ld a, [wcf91] ld [wd11e], a - call AddPokemonToParty + call AddPartyMon ld hl, wd72e set 3, [hl] ld a, $fc diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index b560c53d..7140f67b 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -176,7 +176,7 @@ SafariZoneEntranceText4: ; 752ca (1d:52ca) ld hl, wTrainerFacingDirection ld de, wPlayerMoney + 2 ld c, $3 - ld a, $c ; SubtractBCDPredef + ld a, $c ; SubBCDPredef call Predef ld a, $13 ld [wd125], a -- cgit v1.3.1-sl0p From b36f793667924f868282ce979fabab3e95d642a5 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 16 Jun 2014 13:57:26 -0700 Subject: Use macros for predef calls/jumps instead of static ids. --- engine/battle/1.asm | 9 +-- engine/battle/15.asm | 15 ++-- engine/battle/4.asm | 3 +- engine/battle/4_2.asm | 9 +-- engine/battle/animations.asm | 15 ++-- engine/battle/b_2.asm | 3 +- engine/battle/core.asm | 111 ++++++++++-------------------- engine/battle/e.asm | 6 +- engine/battle/e_2.asm | 3 +- engine/cable_club.asm | 24 +++---- engine/evos_moves.asm | 15 ++-- engine/game_corner_slots2.asm | 3 +- engine/give_pokemon.asm | 6 +- engine/hall_of_fame.asm | 15 ++-- engine/hidden_object_functions17.asm | 3 +- engine/hidden_object_functions7.asm | 9 +-- engine/in_game_trades.asm | 9 +-- engine/intro.asm | 6 +- engine/items/itemfinder.asm | 3 +- engine/items/items.asm | 60 ++++++---------- engine/items/tms.asm | 3 +- engine/menu/bills_pc.asm | 6 +- engine/menu/diploma.asm | 3 +- engine/menu/main_menu.asm | 3 +- engine/menu/oaks_pc.asm | 3 +- engine/menu/party_menu.asm | 6 +- engine/menu/pokedex.asm | 6 +- engine/menu/prize_menu.asm | 3 +- engine/menu/start_sub_menus.asm | 24 +++---- engine/menu/status_screen.asm | 6 +- engine/menu/vending_machine.asm | 3 +- engine/mon_party_sprites.asm | 3 +- engine/oak_speech.asm | 6 +- engine/overworld/card_key.asm | 6 +- engine/overworld/hidden_items.asm | 18 ++--- engine/overworld/item.asm | 3 +- engine/overworld/ledges.asm | 3 +- engine/overworld/movement.asm | 3 +- engine/overworld/npc_movement.asm | 12 ++-- engine/overworld/player_animations.asm | 3 +- engine/palettes.asm | 3 +- engine/predefs.asm | 2 +- engine/predefs17.asm | 3 +- engine/slot_machine.asm | 9 +-- engine/trade.asm | 3 +- engine/trade2.asm | 6 +- home.asm | 39 ++++------- home/overworld.asm | 27 +++----- main.asm | 45 ++++-------- scripts/agatha.asm | 3 +- scripts/billshouse.asm | 12 ++-- scripts/blueshouse.asm | 3 +- scripts/bruno.asm | 3 +- scripts/celadongamecorner.asm | 24 +++---- scripts/celadonmansion5.asm | 3 +- scripts/celadonmartelevator.asm | 3 +- scripts/celadonmartroof.asm | 3 +- scripts/ceruleancity.asm | 9 +-- scripts/ceruleancity2.asm | 9 +-- scripts/ceruleanhouse1.asm | 3 +- scripts/ceruleanhousetrashed.asm | 3 +- scripts/cinnabargym.asm | 3 +- scripts/daycarem.asm | 9 +-- scripts/fightingdojo.asm | 6 +- scripts/gary.asm | 6 +- scripts/halloffameroom.asm | 6 +- scripts/lab2.asm | 3 +- scripts/lab4.asm | 6 +- scripts/lance.asm | 3 +- scripts/lorelei.asm | 3 +- scripts/mansion1.asm | 3 +- scripts/mansion2.asm | 3 +- scripts/mtmoon3.asm | 9 +-- scripts/mtmoonpokecenter.asm | 3 +- scripts/museum1f.asm | 6 +- scripts/oakslab.asm | 54 +++++---------- scripts/pallettown.asm | 18 ++--- scripts/pewtercity.asm | 12 ++-- scripts/pewtergym.asm | 6 +- scripts/pokemontower2.asm | 3 +- scripts/pokemontower5.asm | 3 +- scripts/pokemontower7.asm | 15 ++-- scripts/rockethideout1.asm | 3 +- scripts/rockethideout4.asm | 12 ++-- scripts/rockethideoutelevator.asm | 3 +- scripts/route11gateupstairs.asm | 6 +- scripts/route12.asm | 3 +- scripts/route15gateupstairs.asm | 3 +- scripts/route16.asm | 3 +- scripts/route18gateupstairs.asm | 3 +- scripts/route20.asm | 6 +- scripts/route22.asm | 12 ++-- scripts/route23.asm | 15 ++-- scripts/route25.asm | 12 ++-- scripts/route2gate.asm | 3 +- scripts/route2house.asm | 3 +- scripts/safarizoneentrance.asm | 3 +- scripts/seafoamislands1.asm | 6 +- scripts/seafoamislands2.asm | 6 +- scripts/seafoamislands3.asm | 6 +- scripts/seafoamislands4.asm | 6 +- scripts/silphco1.asm | 3 +- scripts/silphco10.asm | 3 +- scripts/silphco11.asm | 9 +-- scripts/silphco2.asm | 6 +- scripts/silphco3.asm | 6 +- scripts/silphco4.asm | 6 +- scripts/silphco5.asm | 9 +-- scripts/silphco6.asm | 3 +- scripts/silphco7.asm | 12 ++-- scripts/silphco8.asm | 3 +- scripts/silphco9.asm | 15 ++-- scripts/silphcoelevator.asm | 3 +- scripts/ssanne2.asm | 6 +- scripts/undergroundpathentranceroute5.asm | 3 +- scripts/vermilioncity.asm | 6 +- scripts/vermiliongym.asm | 3 +- scripts/vermilionhouse3.asm | 3 +- scripts/victoryroad1.asm | 3 +- scripts/victoryroad2.asm | 3 +- scripts/victoryroad3.asm | 9 +-- scripts/viridiangym.asm | 6 +- 122 files changed, 360 insertions(+), 719 deletions(-) (limited to 'engine/predefs17.asm') diff --git a/engine/battle/1.asm b/engine/battle/1.asm index ace29477..7e744dba 100755 --- a/engine/battle/1.asm +++ b/engine/battle/1.asm @@ -76,12 +76,9 @@ Func_7861: ; 7861 (1:7861) xor a .asm_78aa ld [wListMenuID], a ; wListMenuID - ld a, $48 - call Predef - ld a, $0 - call Predef - ld a, $49 - call Predef + predef UpdateHPBar2 + predef Func_3cd60 + predef Func_3cdec callab ReadPlayerMonCurHPAndStatus ld hl, SuckedHealthText ; $78dc ld a, [H_WHOSETURN] ; $fff3 diff --git a/engine/battle/15.asm b/engine/battle/15.asm index ba79d77e..69d8ff3f 100755 --- a/engine/battle/15.asm +++ b/engine/battle/15.asm @@ -17,8 +17,7 @@ Func_5525f: ; 5525f (15:525f) ld a, [wWhichPokemon] ld c, a ld b, $2 - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef ld a, c and a pop hl @@ -245,14 +244,12 @@ Func_5525f: ; 5525f (15:525f) ld [wcc49], a ld a, [wd0b5] ld [wd11e], a - ld a, $1a - call Predef + predef Func_3af5b ld hl, wccd3 ld a, [wWhichPokemon] ; wWhichPokemon ld c, a ld b, $1 - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef pop hl pop af ld [W_CURENEMYLVL], a ; W_CURENEMYLVL @@ -277,14 +274,12 @@ Func_55436: ; 55436 (15:5436) ld c, a ld b, $1 push bc - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef ld hl, wccf5 xor a ld [hl], a pop bc - ld a, $10 ; FlagActionPredef - jp Predef + predef_jump FlagActionPredef Func_5546c: ; 5546c (15:546c) ld a, [wPartyAliveFlags] diff --git a/engine/battle/4.asm b/engine/battle/4.asm index 11772a15..db6614cc 100755 --- a/engine/battle/4.asm +++ b/engine/battle/4.asm @@ -43,8 +43,7 @@ asm_128fb: ; 128fb (4:68fb) ld d, a ld a, [wcfbb] ld e, a - ld a, $26 - call Predef + predef HPBarLength ld a, $6 ld d, a ld c, a diff --git a/engine/battle/4_2.asm b/engine/battle/4_2.asm index d96fb87c..db9d076f 100755 --- a/engine/battle/4_2.asm +++ b/engine/battle/4_2.asm @@ -36,15 +36,13 @@ Func_137aa: ; 137aa (4:77aa) jr z, .asm_1380a ld de, wPlayerMoney + 2 ; wd349 ld c, $3 - ld a, $b ; AddBCDPredef - call Predef + predef AddBCDPredef ld hl, PickUpPayDayMoneyText call PrintText .asm_1380a xor a ld [wccd4], a - ld a, $2a - call Predef + predef Func_3ad1c .asm_13813 xor a ld [wd083], a @@ -263,8 +261,7 @@ RecoilEffect_: ; 1392c (4:792c) xor a .asm_13990 ld [wListMenuID], a ; wListMenuID - ld a, $48 - call Predef + predef UpdateHPBar2 ld hl, HitWithRecoilText ; $799e jp PrintText HitWithRecoilText: ; 1399e (4:799e) diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index a5fb0253..8fad427a 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -831,11 +831,9 @@ DoRockSlideSpecialEffects: ; 78fd9 (1e:4fd9) ; if the subaninmation counter is between 8 and 11, shake the screen horizontally and vertically .shakeScreen ld b,1 - ld a,$24 - call Predef ; shake horizontally + predef Func_48125 ; shake horizontally ld b,1 - ld a,$21 - jp Predef ; shake vertically + predef_jump Func_480ff ; shake vertically FlashScreenEveryEightFrameBlocks: ; 78ff7 (1e:4ff7) ld a,[W_SUBANIMCOUNTER] @@ -1227,16 +1225,14 @@ Func_791fc: ; 791fc (1e:51fc) ld b, $5 Func_79209: ; 79209 (1e:5209) - ld a, $21 - jp Predef + predef_jump Func_480ff AnimationShakeScreen: ; 7920e (1e:520e) ; Shakes the screen for a while. Used in Earthquake/Fissure/etc. animations. ld b, $8 Func_79210: ; 79210 (1e:5210) - ld a, $24 - jp Predef + predef_jump Func_48125 AnimationWaterDropletsEverywhere: ; 79215 (1e:5215) ; Draws water droplets all over the screen and makes them @@ -2143,8 +2139,7 @@ Func_79793: ; 79793 (1e:5793) ld [wBattleMonSpecies2], a ld [wd0b5], a call GetMonHeader - ld a, $4 - call Predef + predef LoadMonBackPic xor a call Func_79842 call Func_79820 diff --git a/engine/battle/b_2.asm b/engine/battle/b_2.asm index 3c839cba..e343f1aa 100755 --- a/engine/battle/b_2.asm +++ b/engine/battle/b_2.asm @@ -120,8 +120,7 @@ PayDayEffect_ ; 2feb8 (b:7eb8) ld [hl], a ld de, wcce7 ld c, $3 - ld a, $b ; AddBCDPredef - call Predef + predef AddBCDPredef ld hl, CoinsScatteredText ; $7f04 jp PrintText diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a1a69a4f..4f382df7 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -173,8 +173,7 @@ Func_3c04c: ; 3c04c (f:404c) ld [$ffe1], a FuncCoord 1, 5 ld hl, Coord - ld a, $1 - call Predef + predef Func_3f0c6 xor a ld [$ffb0], a ld [rWY], a ; $ff4a @@ -320,12 +319,10 @@ Func_3c1ad: ; 3c1ad (f:41ad) ld b, $1 push bc ld hl, wPartyAliveFlags - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef ld hl, wccf5 pop bc - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef call Func_3cba6 call LoadScreenTilesFromBuffer1 call Func_3cc91 @@ -751,8 +748,7 @@ UpdateCurMonHPBar: ; 3c4f6 (f:44f6) .playersTurn push bc ld [wListMenuID], a ; wListMenuID - ld a, $48 - call Predef + predef UpdateHPBar2 pop bc ret @@ -996,8 +992,7 @@ TrainerBattleVictory: ; 3c696 (f:4696) ld de, wPlayerMoney + 2 ; wd349 ld hl, wd07b ld c, $3 - ld a, $b ; AddBCDPredef - jp Predef + predef_jump AddBCDPredef MoneyForWinningText: ; 3c6e4 (f:46e4) TX_FAR _MoneyForWinningText @@ -1053,8 +1048,7 @@ Func_3c741: ; 3c741 (f:4741) ld c, a ld hl, wPartyAliveFlags ; clear fainted mon's alive flag ld b, $0 - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1 res 2, [hl] ; reset "attacking multiple times" flag ld a, [wd083] @@ -1153,12 +1147,10 @@ Func_3c7d8: ; 3c7d8 (f:47d8) ld hl, wPartyAliveFlags ld b, $1 push bc - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef pop bc ld hl, wccf5 - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef call Func_3cba6 call GBPalWhiteOut call Func_3ee5b @@ -1317,14 +1309,12 @@ EnemySendOut: ; 3c90e (f:490e) ld c,a ld b,1 push bc - ld a,$10 - call Predef + predef FlagActionPredef ld hl,wccf5 xor a ld [hl],a pop bc - ld a,$10 - call Predef + predef FlagActionPredef Func_3c92a: ; 3c92a (f:492a) xor a ld hl,wd065 @@ -1468,8 +1458,7 @@ Func_3c92a: ; 3c92a (f:492a) ld [$FFE1],a FuncCoord 15, 6 ld hl,Coord - ld a,2 - call Predef + predef Func_3f073 ld a,[wEnemyMonSpecies2] call PlayCry call Func_3cdec @@ -1759,8 +1748,7 @@ Func_3cc91: ; 3cc91 (f:4c91) Func_3cca4: ; 3cca4 (f:4ca4) call Func_3cd60 - ld a, $4 - call Predef + predef LoadMonBackPic xor a ld [$ffe1], a ld hl, wcc2d @@ -1791,8 +1779,7 @@ Func_3cca4: ; 3cca4 (f:4ca4) call PlayMoveAnimation FuncCoord 4, 11 ld hl, Coord - ld a, $2 - call Predef + predef Func_3f073 ld a, [wcf91] call PlayCry call Func_3ee94 @@ -1809,8 +1796,7 @@ Func_3ccfa: ; 3ccfa (f:4cfa) xor a ld [wcd6c], a ld [H_DOWNARROWBLINKCNT1], a ; $ff8b - ld a, $5 - call Predef + predef Func_79aba ld c, $4 call DelayFrames call Func_3cd3a @@ -1821,8 +1807,7 @@ Func_3ccfa: ; 3ccfa (f:4cfa) ld [wcd6c], a xor a ld [H_DOWNARROWBLINKCNT1], a ; $ff8b - ld a, $5 - call Predef + predef Func_79aba call Delay3 call Func_3cd3a ld a, $4c @@ -1889,8 +1874,7 @@ Func_3cd60: ; 3cd60 (f:4d60) ld [wcf91], a FuncCoord 10, 9 ld hl, Coord - ld a, $5f - call Predef + predef DrawHP ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld hl, wcf1d @@ -2384,10 +2368,8 @@ Func_3d119: ; 3d119 (f:5119) ld [wcc49], a ld hl, wPartyMon1Species ; wPartyMon1Species (aliases: wPartyMon1) call ClearSprites - ld a, $36 - call Predef - ld a, $37 - call Predef + predef StatusScreen + predef StatusScreen2 ld a, [W_ENEMYBATTSTATUS2] ; W_ENEMYBATTSTATUS2 bit 4, a ld hl, AnimationSubstitute @@ -2440,12 +2422,10 @@ Func_3d1ba: ; 3d1ba (f:51ba) ld b, $1 push bc ld hl, wPartyAliveFlags - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef pop bc ld hl, wccf5 - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef call Func_3cba6 call Func_3cc91 call SaveScreenTilesToBuffer1 @@ -2922,8 +2902,7 @@ Func_3d4b6: ; 3d4b6 (f:54b6) call GetCurrentMove FuncCoord 2, 10 ld hl, Coord - ld a, $5d - call Predef + predef Func_27d98 .asm_3d54e ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ; $ffba @@ -3872,8 +3851,7 @@ PrintMoveFailureText: ; 3dbe2 (f:5be2) ld hl, KeptGoingAndCrashedText ; $5c47 call PrintText ld b, $4 - ld a, $24 - call Predef + predef Func_48125 ld a, [H_WHOSETURN] ; $fff3 and a jr nz, .asm_3dc3f @@ -4799,8 +4777,7 @@ ApplyDamageToEnemyPokemon: ; 3e142 (f:6142) ld hl,Coord xor a ld [wListMenuID],a - ld a,$48 - call Predef ; animate the HP bar shortening + predef UpdateHPBar2 ; animate the HP bar shortening ApplyAttackToEnemyPokemonDone: ; 3e19d (f:619d) jp Func_3cd5a ; redraw pokemon names and HP bars @@ -4919,8 +4896,7 @@ ApplyDamageToPlayerPokemon: ; 3e200 (f:6200) ld hl,Coord ld a,$01 ld [wListMenuID],a - ld a,$48 - call Predef ; animate the HP bar shortening + predef UpdateHPBar2 ; animate the HP bar shortening ApplyAttackToPlayerPokemonDone jp Func_3cd5a ; redraw pokemon names and HP bars @@ -6147,13 +6123,11 @@ Func_3eb01: ; 3eb01 (f:6b01) dec de xor a ld [wHPBarMaxHP], a - ld a, $3e - call Predef + predef WriteMonMoves .asm_3ebca ld hl, wEnemyMonMoves ld de, wEnemyMonSpecial + 1 - ld a, $5e - call Predef + predef LoadMovePPs ld hl, W_MONHBASESTATS ld de, wd002 ld b, $5 @@ -6178,15 +6152,13 @@ Func_3eb01: ; 3eb01 (f:6b01) call CopyData ld a, [wEnemyMonSpecies2] ld [wd11e], a - ld a, $3a - call Predef + predef IndexToPokedex ld a, [wd11e] dec a ld c, a ld b, $1 ld hl, wPokedexSeen ; wd30a - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef ld hl, wEnemyMonLevel ; wEnemyMonLevel ld de, wcd23 ld bc, $b @@ -6212,8 +6184,7 @@ Func_3ec32: ; 3ec32 (f:6c32) call ClearScreen .asm_3ec4d call DelayFrame - ld a, $30 - call Predef + predef BattleTransition callab Func_3ee58 ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ; $ffba @@ -6255,8 +6226,7 @@ Func_3ec92: ; 3ec92 (f:6c92) .asm_3ec9e ld a, BANK(RedPicBack) call UncompressSpriteFromDE - ld a, $3 - call Predef + predef ScaleSpriteByTwo ld hl, wOAMBuffer xor a ld [H_DOWNARROWBLINKCNT1], a ; $ff8b @@ -6306,8 +6276,7 @@ Func_3ec92: ; 3ec92 (f:6c92) ld [$ffe1], a FuncCoord 1, 5 ld hl, Coord - ld a, $1 - jp Predef + predef_jump Func_3f0c6 Func_3ed02: ; 3ed02 (f:6d02) callab Func_39680 @@ -6709,8 +6678,7 @@ asm_3ef3d: ; 3ef3d (f:6f3d) ld [wAICount], a ; wccdf FuncCoord 12, 0 ld hl, Coord - ld a, $1 - call Predef + predef Func_3f0c6 ld a, $ff ld [wEnemyMonPartyPos], a ld a, $2 @@ -6765,8 +6733,7 @@ InitWildBattle: ; 3ef8b (f:6f8b) ld [$ffe1], a FuncCoord 12, 0 ld hl, Coord - ld a, $1 - call Predef + predef Func_3f0c6 Func_3efeb: ; 3efeb (f:6feb) ld b, $0 @@ -6855,8 +6822,7 @@ Func_3f073: ; 3f073 (f:7073) ld a, $1 ld [wcd6c], a ld bc, $303 - ld a, $5 - call Predef + predef Func_79aba ld c, $4 call DelayFrames ld bc, $ffd7 @@ -6864,8 +6830,7 @@ Func_3f073: ; 3f073 (f:7073) xor a ld [wcd6c], a ld bc, $505 - ld a, $5 - call Predef + predef Func_79aba ld c, $5 call DelayFrames ld bc, $ffd7 @@ -6942,8 +6907,7 @@ LoadMonBackPic: call ClearScreenArea ld hl, W_MONHBACKSPRITE - W_MONHEADER call UncompressMonSprite - ld a, $3 - call Predef + predef ScaleSpriteByTwo ld de, vBackPic call InterlaceMergeSpriteBuffers ; combine the two buffers to a single 2bpp sprite ld hl, vSprites @@ -8546,8 +8510,7 @@ Func_3fbbc: ; 3fbbc (f:7bbc) push hl push de push bc - ld a, $8 - call Predef + predef MoveAnimation pop bc pop de pop hl diff --git a/engine/battle/e.asm b/engine/battle/e.asm index 0cea797d..3e9f3685 100755 --- a/engine/battle/e.asm +++ b/engine/battle/e.asm @@ -855,8 +855,7 @@ ReadTrainer: ; 39c53 (e:5c53) ld hl,wd047 ld c,2 push bc - ld a,$B - call Predef + predef AddBCDPredef pop bc inc de inc de @@ -1178,8 +1177,7 @@ Func_3a718: ; 3a718 (e:6718) ld hl,Coord xor a ld [wListMenuID],a - ld a,$48 - call Predef + predef UpdateHPBar2 jp DecrementAICount Func_3a72a: ; 3a72a (e:672a) diff --git a/engine/battle/e_2.asm b/engine/battle/e_2.asm index f35b4e3a..f6d65301 100755 --- a/engine/battle/e_2.asm +++ b/engine/battle/e_2.asm @@ -94,8 +94,7 @@ HealEffect_: ; 3b9ec (e:79ec) xor a .asm_3ba83 ld [wListMenuID], a ; wListMenuID - ld a, $48 - call Predef + predef UpdateHPBar2 ld hl, Func_3cd5a ; $4d5a call BankswitchEtoF ld hl, RegainedHealthText ; $7aac diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 1762d2be..75d8bd00 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -273,10 +273,8 @@ Func_5345: ; 5345 call Delay3 ld hl, W_OPTIONS ; W_OPTIONS res 7, [hl] - ld a, $2c - call Predef - ld a, $7 - call Predef + predef InitOpponent + predef HealParty jp Func_577d .asm_5506 ld c, BANK(Music_GameCorner) @@ -610,10 +608,8 @@ Func_57c7: Func_57d6: ld a, [wCurrentMenuItem] ld [wWhichPokemon], a - ld a, $36 - call Predef - ld a, $37 - call Predef + predef StatusScreen + predef StatusScreen2 call GBPalNormal call LoadTrainerInfoTextBoxTiles call Func_57f2 @@ -827,12 +823,10 @@ TradeCenter_Trade: ld a, [$ffaa] cp $1 jr z, .asm_59d9 ; 0x59d0 $7 - ld a, $38 - call Predef + predef Func_410e2 jr .asm_59de ; 0x59d7 $5 .asm_59d9 - ld a, $2f - call Predef + predef Func_410f3 .asm_59de callab Func_3ad0e call ClearScreen @@ -847,8 +841,7 @@ TradeCenter_Trade: ld hl, wTileMap + $119 ld de, TradeCompleted call PlaceString - ld a, $50 - call Predef + predef SaveSAVtoSRAM2 ld c, $32 call DelayFrames xor a @@ -885,8 +878,7 @@ Func_5a5f: ; 5a5f (1:5a5f) jr z, .asm_5a75 cp $5 ret nz - ld a, $4d - call Predef + predef Func_5aaf jp Init .asm_5a75 call Func_5317 diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 9cd2612b..fd93fa14 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -152,8 +152,7 @@ Func_3ad71: ; 3ad71 (e:6d71) push af ld a, [wd0b5] ld [wd11e], a - ld a, $3a - call Predef + predef IndexToPokedex ld a, [wd11e] dec a ld hl, BaseStats @@ -205,13 +204,11 @@ Func_3ad71: ; 3ad71 (e:6d71) ld [wcc49], a call Func_3af5b pop hl - ld a, $42 - call Predef + predef SetPartyMonTypes ld a, [W_ISINBATTLE] ; W_ISINBATTLE and a call z, Func_3af52 - ld a, $3a - call Predef + predef IndexToPokedex ld a, [wd11e] dec a ld c, a @@ -361,8 +358,7 @@ Func_3af5b: ; 3af5b (e:6f5b) ld [wd11e], a call GetMoveName call CopyStringToCF4B - ld a, $1b - call Predef + predef LearnMove .asm_3afb1 ld a, [wcf91] ld [wd11e], a @@ -489,7 +485,6 @@ WriteMonMoves_ShiftMoveData: ; 3b04e (e:704e) ret Func_3b057: ; 3b057 (e:7057) - ld a, $10 ; FlagActionPredef - jp Predef + predef_jump FlagActionPredef INCLUDE "data/evos_moves.asm" diff --git a/engine/game_corner_slots2.asm b/engine/game_corner_slots2.asm index 0eff01b9..66e51237 100755 --- a/engine/game_corner_slots2.asm +++ b/engine/game_corner_slots2.asm @@ -3,8 +3,7 @@ AbleToPlaySlotsCheck ; 2ff09 (b:7f09) and $8 jr z, .done ; not able ld b, COIN_CASE - ld a, $1c - call Predef ; IsItemInBag_ + predef IsItemInBag_ ; IsItemInBag_ ld a, b and a ld b, $33 ; GameCornerCoinCaseText diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 21b56bf3..9399fb05 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -52,15 +52,13 @@ SetPokedexOwnedFlag: ; 4fe11 (13:7e11) ld a, [wcf91] push af ld [wd11e], a - ld a, $3a - call Predef + predef IndexToPokedex ld a, [wd11e] dec a ld c, a ld hl, wPokedexOwned ; wPokedexOwned ld b, $1 - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef pop af ld [wd11e], a call GetMonName diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index de0ff19a..caadce13 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -117,8 +117,7 @@ Func_70278: ; 70278 (1c:4278) ld hl, Coord call GetMonHeader call LoadFrontSpriteByMonIndex - ld a, $4 - call Predef + predef LoadMonBackPic .asm_702ab ld b, $b ld c, $0 @@ -179,8 +178,7 @@ Func_702f0: ; 702f0 (1c:42f0) ld [wd0b5], a FuncCoord 3, 9 ld hl, Coord - ld a, $4b - call Predef + predef Func_27d6b ld a, [wWhichTrade] ; wWhichTrade jp PlayCry @@ -202,8 +200,7 @@ Func_7033e: ; 7033e (1c:433e) ld de, RedPicBack ; $7e0a ld a, BANK(RedPicBack) call UncompressSpriteFromDE - ld a, $3 - call Predef + predef ScaleSpriteByTwo ld de, vBackPic call InterlaceMergeSpriteBuffers ld c, $1 @@ -212,14 +209,12 @@ Func_7036d: ; 7036d (1c:436d) ld b, $0 FuncCoord 12, 5 ld hl, Coord - ld a, $31 - jp Predef + predef_jump Func_79dda Func_70377: ; 70377 (1c:4377) ld hl, wd747 set 3, [hl] - ld a, $56 - call Predef + predef DisplayDexRating FuncCoord 0, 4 ld hl, Coord ld b, $6 diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 8c0b6a0a..d2408a5b 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -79,8 +79,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) ld [$ffe1], a FuncCoord 10, 11 ld hl, Coord - ld a, $2 - call Predef + predef Func_3f073 call WaitForTextScrollButtonPress call LoadScreenTilesFromBuffer1 call Delay3 diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 4d1e0339..848f6f3d 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -194,8 +194,7 @@ CinnabarQuizQuestionsText6: ; 1ea85 (7:6a85) CinnabarGymQuiz_1ea8a: ; 1ea8a (7:6a8a) ld hl, wd79c - ld a, $10 ; FlagActionPredef - jp Predef + predef_jump FlagActionPredef CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92) call YesNoChoice @@ -227,8 +226,7 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92) ld c, a ld b, $2 ld hl, wd79a - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef ld a, c and a ret nz @@ -293,8 +291,7 @@ CinnabarGymQuiz_1eb0a: ; 1eb0a (7:6b0a) .asm_1eb38 pop bc ld [wd09f], a - ld a, $17 - call Predef + predef Func_ee9e ld hl, $ffdb dec [hl] jr nz, .asm_1eb0e diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index e1b6f757..7f0b21c1 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -39,8 +39,7 @@ Predef54: ; 71ad9 (1c:5ad9) ld a,[wWhichTrade] ld c,a ld b,$2 - ld a,$10 - call Predef + predef FlagActionPredef ld a,c and a ld a,$4 @@ -112,8 +111,7 @@ Func_71c07: ; 71c07 (1c:5c07) ld a,[wWhichTrade] ld c,a ld b,$1 - ld a,$10 - call Predef + predef FlagActionPredef ld hl, ConnectCableText call PrintText ld a,[wWhichPokemon] @@ -122,8 +120,7 @@ Func_71c07: ; 71c07 (1c:5c07) push af call LoadHpBarAndStatusTilePatterns call Func_71cc1 - ld a,$38 - call Predef + predef Func_410e2 pop af ld [W_CURENEMYLVL],a pop af diff --git a/engine/intro.asm b/engine/intro.asm index c3449c0b..2b8c2dbf 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -264,12 +264,10 @@ Func_4183f: ; 4183f (10:583f) Func_41842: ; 41842 (10:5842) ld c, $0 - ld a, $31 - jp Predef + predef_jump Func_79dda Func_41849: ; 41849 (10:5849) - ld a, $33 - call Predef + predef Func_79869 ld a, b jp PlaySound diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm index 87acf48c..d7e5b3ce 100755 --- a/engine/items/itemfinder.asm +++ b/engine/items/itemfinder.asm @@ -11,8 +11,7 @@ HiddenItemNear: ; 7481f (1d:481f) ld hl, wd6f0 ld c, b ld b, $2 - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef ld a, c pop hl pop bc diff --git a/engine/items/items.asm b/engine/items/items.asm index 6b1bf8b3..fbb2ec8f 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -326,8 +326,7 @@ ItemUseBall: ; d687 (3:5687) push af ld a,[wcf91] push af - ld a,$08 ;probably animations - call Predef + predef MoveAnimation pop af ld [wcf91],a pop af @@ -397,23 +396,20 @@ ItemUseBall: ; d687 (3:5687) jr z,.printText1 ld hl,ItemUseBallText05 call PrintText - ld a,$3a ;convert order: Internal->Dex - call Predef + predef IndexToPokedex ld a,[wd11e] dec a ld c,a ld b,2 ld hl,wPokedexOwned ;Dex_own_flags (pokemon) - ld a,$10 - call Predef ;check Dex flag (own already or not) + predef FlagActionPredef ld a,c push af ld a,[wd11e] dec a ld c,a ld b,1 - ld a,$10 ;set Dex_own_flag? - call Predef + predef FlagActionPredef pop af and a jr nz,.checkParty @@ -422,8 +418,7 @@ ItemUseBall: ; d687 (3:5687) call ClearSprites ld a,[wEnemyMonSpecies] ;caught mon_ID ld [wd11e],a - ld a,$3d - call Predef + predef ShowPokedexData .checkParty ;$58f4 ld a,[wPartyCount] cp a,6 ;is party full? @@ -627,8 +622,7 @@ SurfingNoPlaceToGetOffText: ; da51 (3:5a51) db "@" ItemUsePokedex: ; da56 (3:5a56) - ld a,$29 - jp Predef + predef_jump ShowPokedexMenu ItemUseEvoStone: ; da5b (3:5a5b) ld a,[W_ISINBATTLE] @@ -783,8 +777,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld de,wBattleMonMaxHP ld bc,10 call CopyData ; copy party stats to in-battle stat data - ld a,$28 - call Predef + predef Func_3ed02 jp .doneHealing .healHP inc hl ; hl = address of current HP @@ -814,8 +807,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld c,a ld hl,wccf5 ld b,$02 - ld a,$10 - call Predef + predef FlagActionPredef ld a,c and a jr z,.next @@ -823,8 +815,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld c,a ld hl,wPartyAliveFlags ld b,$01 - ld a,$10 - call Predef + predef FlagActionPredef .next pop bc pop de @@ -934,8 +925,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld [$fff6],a ld a,$02 ld [wListMenuID],a - ld a,$48 - call Predef ; animate HP bar decrease of pokemon that used Softboiled + predef UpdateHPBar2 ; animate HP bar decrease of pokemon that used Softboiled ld a,[$fff6] res 0,a ld [$fff6],a @@ -1085,8 +1075,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld [$fff6],a ld a,$02 ld [wListMenuID],a - ld a,$48 - call Predef ; animate the HP bar lengthening + predef UpdateHPBar2 ; animate the HP bar lengthening ld a,[$fff6] res 0,a ld [$fff6],a @@ -1285,8 +1274,7 @@ ItemUseMedicine: ; dabb (3:5abb) call WaitForTextScrollButtonPress ; wait for button press xor a ld [wcc49],a - ld a,$1a - call Predef ; learn level up move, if any + predef Func_3af5b ; learn level up move, if any xor a ld [wccd4],a callab Func_3ad0e ; evolve pokemon, if appropriate @@ -1356,8 +1344,7 @@ BaitRockCommon: ; df7f (3:5f7f) ld a,$ff .noCarry ld [hl],a - ld a,$08 - call Predef ; do animation + predef MoveAnimation ; do animation ld c,70 jp DelayFrames @@ -2096,8 +2083,7 @@ ItemUseTMHM: ; e479 (3:6479) .skipAdding inc a ld [wd11e],a - ld a,$44 - call Predef ; get move ID from TM/HM ID + predef TMToMove ; get move ID from TM/HM ID ld a,[wd11e] ld [wd0e0],a call GetMoveName @@ -2152,8 +2138,7 @@ ItemUseTMHM: ; e479 (3:6479) call GoPAL_SET_CF1C jp LoadScreenTilesFromBuffer1 ; restore saved screen .checkIfAbleToLearnMove - ld a,$43 - call Predef ; check if the pokemon can learn the move + predef CanLearnTM ; check if the pokemon can learn the move push bc ld a,[wWhichPokemon] ld hl,wPartyMonNicks @@ -2171,8 +2156,7 @@ ItemUseTMHM: ; e479 (3:6479) .checkIfAlreadyLearnedMove callab CheckIfMoveIsKnown ; check if the pokemon already knows the move jr c,.chooseMon - ld a,$1b - call Predef ; teach move + predef LearnMove ; teach move pop af ld [wcf91],a pop af @@ -2232,8 +2216,7 @@ ThrowBallAtTrainerMon: ; e58b (3:658b) call Delay3 ld a,TOSS_ANIM ld [W_ANIMATIONID],a - ld a,$08 - call Predef ; do animation + predef MoveAnimation ; do animation ld hl,ThrowBallAtTrainerMonText1 call PrintText ld hl,ThrowBallAtTrainerMonText2 @@ -2321,8 +2304,7 @@ RestoreBonusPP: ; e606 (3:6606) call AddNTimes push hl ld de,wcd78 - 1 - ld a,$5e - call Predef ; loads the normal max PP of each of the pokemon's moves to wcd78 + predef LoadMovePPs ; loads the normal max PP of each of the pokemon's moves to wcd78 pop hl ld c,21 ld b,0 @@ -2574,8 +2556,7 @@ IsKeyItem_: ; e764 (3:6764) ld c,a ld hl,wHPBarMaxHP ld b,$02 ; test bit - ld a,$10 - call Predef ; bitfield operation function + predef FlagActionPredef ; bitfield operation function ld a,c and a ret nz @@ -2674,8 +2655,7 @@ Func_e7a4: ; e7a4 (3:67a4) ld hl, wBoxMonNicks ld a, $2 ld [wd07d], a - ld a, $4e - call Predef + predef AskName ld a, [W_NUMINBOX] ; wda80 dec a jr z, .asm_e867 diff --git a/engine/items/tms.asm b/engine/items/tms.asm index 7a13250b..ef427860 100755 --- a/engine/items/tms.asm +++ b/engine/items/tms.asm @@ -18,8 +18,7 @@ CanLearnTM: ; 1373e (4:773e) .TMfoundLoop pop hl ld b, $2 ; read corresponding bit from TM compatibility array - ld a, $10 ; FlagActionPredef - jp Predef + predef_jump FlagActionPredef ; converts TM/HM number in wd11e into move number ; HMs start at 51 diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 3c813861..2640bada 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -466,10 +466,8 @@ Func_2174b: ; 2174b (8:574b) ld a, $2 .asm_217b0 ld [wcc49], a - ld a, $36 - call Predef - ld a, $37 - call Predef + predef StatusScreen + predef StatusScreen2 call LoadScreenTilesFromBuffer1 call ReloadTilesetTilePatterns call GoPAL_SET_CF1C diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index e31e31aa..3bf185fd 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -14,8 +14,7 @@ DisplayDiploma: ; 566e2 (15:66e2) call FarCopyData2 ld hl, wTileMap ld bc, $1012 - ld a, $27 - call Predef + predef Func_5ab0 ld hl, DiplomaTextPointersAndCoords ; $6784 ld c, $5 .asm_56715 diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 5f2c1cd5..06c85096 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -9,8 +9,7 @@ MainMenu: ; 5af2 (1:5af2) jr nc,.next0 ; Predef 52 loads the save from SRAM to RAM - ld a,$52 - call Predef + predef LoadSAV .next0 ld c,20 diff --git a/engine/menu/oaks_pc.asm b/engine/menu/oaks_pc.asm index 1d591d1d..6e7edda2 100755 --- a/engine/menu/oaks_pc.asm +++ b/engine/menu/oaks_pc.asm @@ -8,8 +8,7 @@ OpenOaksPC: ; 1e915 (7:6915) ld a, [wCurrentMenuItem] ; wCurrentMenuItem and a jr nz, .asm_1e932 - ld a, $56 - call Predef + predef DisplayDexRating .asm_1e932 ld hl, ClosedOaksPCText call PrintText diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 8ad5260d..d0a74c11 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -93,8 +93,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) set 0,a ld [$FFF6],a add hl,bc - ld a,$60 - call Predef ; draw HP bar and prints current / max HP + predef Func_128f6 ; draw HP bar and prints current / max HP ld a,[$FFF6] res 0,a ld [$FFF6],a @@ -103,8 +102,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) jr .printLevel .teachMoveMenu push hl - ld a,$43 - call Predef ; check if the pokemon can learn the move + predef CanLearnTM ; check if the pokemon can learn the move pop hl ld de,.ableToLearnMoveText ld a,c diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 2336cb47..4d3f5aaa 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -145,8 +145,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) call PlaySound ; play sound jr .handleMenuInput .choseArea - ld a,$4a - call Predef ; display pokemon areas + predef LoadTownMap_Nest ; display pokemon areas ld b,0 jr .exitSideMenu @@ -392,8 +391,7 @@ IsPokemonBitSet: ; 402c2 (10:42c2) dec a ld c,a ld b,2 - ld a,$10 - call Predef + predef FlagActionPredef ld a,c and a ret diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index 7ceabbed..63bdedee 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -257,8 +257,7 @@ HandlePrizeChoice: ; 528c6 (14:68c6) ld hl,$FFA1 ld de,wPlayerCoins + 1 ld c,$02 ; how many bytes - ld a,$0C - call Predef ; subtract coins (BCD daa operations) + predef SubBCDPredef ; subtract coins (BCD daa operations) jp PrintPrizePrice .BagFull ld hl,PrizeRoomBagIsFullTextPtr diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 6a21a50e..bb23321b 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -1,6 +1,5 @@ StartMenu_Pokedex: ; 13095 (4:7095) - ld a,$29 - call Predef + predef ShowPokedexMenu call LoadScreenTilesFromBuffer2 ; restore saved screen call Delay3 call LoadGBPal @@ -98,10 +97,8 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) call ClearSprites xor a ld [wcc49],a - ld a,$36 - call Predef - ld a,$37 - call Predef + predef StatusScreen + predef StatusScreen2 call ReloadMapData jp StartMenu_Pokemon .choseOutOfBattleMove @@ -155,8 +152,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) .cut bit 1,a ; does the player have the Cascade Badge? jp z,.newBadgeRequired - ld a,$3c - call Predef + predef UsedCut ld a,[wcd6a] and a jp z,.loop @@ -181,8 +177,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) .strength bit 3,a ; does the player have the Rainbow Badge? jp z,.newBadgeRequired - ld a,$5b - call Predef + predef PrintStrengthTxt call GBPalWhiteOutWithDelay3 jp .goBackToMap .flash @@ -515,8 +510,7 @@ StartMenu_TrainerInfo: ; 13460 (4:7460) xor a ld [$ffd7],a call DrawTrainerInfo - ld a,$2e - call Predef ; draw badges + predef DrawBadges ; draw badges ld b,$0d call GoPAL_SET call GBPalNormal @@ -535,8 +529,7 @@ StartMenu_TrainerInfo: ; 13460 (4:7460) DrawTrainerInfo: ; 1349a (4:749a) ld de,RedPicFront ld bc,(BANK(RedPicFront) << 8) | $01 - ld a,$3b - call Predef + predef Predef3B call DisableLCD FuncCoord 0,2 ld hl,Coord @@ -711,8 +704,7 @@ StartMenu_SaveReset: ; 135e3 (4:75e3) ld a,[wd72e] bit 6,a ; is the player using the link feature? jp nz,Init - ld a,$3f - call Predef ; save the game + predef SaveSAV ; save the game call LoadScreenTilesFromBuffer2 ; restore saved screen jp HoldTextDisplayOpen diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index 3bacd306..3b830244 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -84,8 +84,7 @@ StatusScreen: ; 12953 (4:6953) ld a, [W_MONHDEXNUM] ld [wd11e], a ld [wd0b5], a - ld a, $3a - call Predef + predef IndexToPokedex FuncCoord 3,7 ld hl, Coord ld de, wd11e @@ -93,8 +92,7 @@ StatusScreen: ; 12953 (4:6953) call PrintNumber ; Pokémon no. FuncCoord 11,10 ld hl, Coord - ld a, $4b - call Predef ; Prints the type (?) + predef Func_27d6b ; Prints the type (?) ld hl, NamePointers2 ; $6a9d call .unk_12a7e ld d, h diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index 19550899..73dece40 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -71,8 +71,7 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) ld hl, $ffde ld de, wPlayerMoney + 2 ; wd349 ld c, $3 - ld a, $c ; SubBCDPredef - call Predef + predef SubBCDPredef ld a, $13 ld [wd125], a jp DisplayTextBoxID diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index c27c65b5..e05bdd55 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -377,8 +377,7 @@ Func_718c3: ; 718c3 (1c:58c3) GetPartyMonSpriteID: ; 718e9 (1c:58e9) ld [wd11e], a - ld a, $3a - call Predef + predef IndexToPokedex ld a, [wd11e] ld c, a dec a diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index c7f2abf7..314c34df 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -41,8 +41,7 @@ OakSpeech: ; 6115 (1:6115) call ClearScreen call LoadTextBoxTilePatterns call SetDefaultNames - ld a,$18 - call Predef + predef InitPlayerData2 ld hl,wNumBoxItems ld a,POTION ld [wcf91],a @@ -234,5 +233,4 @@ IntroPredef3B: ; 62a4 (1:62a4) .next xor a ld [$FFE1],a - ld a,1 - jp Predef + predef_jump Func_3f0c6 diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm index 991512bb..f48c26f4 100755 --- a/engine/overworld/card_key.asm +++ b/engine/overworld/card_key.asm @@ -8,8 +8,7 @@ PrintCardKeyText: ; 52673 (14:6673) ret z cp b jr nz, .asm_5267a - ld a, $35 - call Predef + predef Func_c586 ld a, [wcfc6] cp $18 jr z, .asm_5269c @@ -49,8 +48,7 @@ PrintCardKeyText: ; 52673 (14:6673) ld a, $e .asm_526ca ld [wd09f], a - ld a, $17 - call Predef + predef Func_ee9e ld hl, wd126 set 5, [hl] ld a, (SFX_1f_57 - SFX_Headers_1f) / 3 diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index 21ccdaad..77bd8fe6 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -6,8 +6,7 @@ HiddenItems: ; 76688 (1d:6688) ld a, [wTrainerScreenX] ld c, a ld b, $2 - ld a, $10 - call Predef + predef FlagActionPredef ld a, c and a ret nz @@ -35,8 +34,7 @@ FoundHiddenItemText: ; 7675b (1d:675b) ld a, [wTrainerScreenX] ld c, a ld b, $1 - ld a, $10 - call Predef + predef FlagActionPredef ld a, (SFX_02_3b - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent ; play sound call WaitForSoundToFinish ; wait for sound to finish playing @@ -55,8 +53,7 @@ HiddenItemBagFullText: ; 76794 (1d:6794) HiddenCoins: ; 76799 (1d:6799) ld b, COIN_CASE - ld a, $1c - call Predef + predef IsItemInBag_ ld a, b and a ret z @@ -67,8 +64,7 @@ HiddenCoins: ; 76799 (1d:6799) ld a, [wTrainerScreenX] ld c, a ld b, $2 - ld a, $10 - call Predef + predef FlagActionPredef ld a, c and a ret nz @@ -104,14 +100,12 @@ HiddenCoins: ; 76799 (1d:6799) ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 - ld a, $b ; AddBCDPredef - call Predef + predef AddBCDPredef ld hl, wd6fe ld a, [wTrainerScreenX] ld c, a ld b, $1 - ld a, $10 - call Predef + predef FlagActionPredef call EnableAutoTextBoxDrawing ld a, [wPlayerCoins] cp $99 diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm index a75c393c..a69ec106 100644 --- a/engine/overworld/item.asm +++ b/engine/overworld/item.asm @@ -32,8 +32,7 @@ PickupItem: ld a, [$ffdb] ld [wcc4d], a - ld a, $11 ; HideObject - call Predef + predef HideObject ld a, 1 ld [wcc3c], a ld hl, FoundItemText diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index c1db3d43..b64a1174 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -5,8 +5,7 @@ HandleLedges: ; 1a672 (6:6672) ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET and a ; OVERWORLD ret nz - ld a, $35 - call Predef + predef Func_c586 ld a, [wSpriteStateData1 + 9] ld b, a FuncCoord 8, 9 diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 374b8ea6..f8dd5fc4 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -458,8 +458,7 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd) ; tests if sprite is off screen or otherwise unable to do anything CheckSpriteAvailability: ; 50dc (1:50dc) - ld a, $12 - call Predef + predef IsObjectHidden ld a, [$ffe5] and a jp nz, .spriteInvisible diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index d228df76..2cf6fea9 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -86,8 +86,7 @@ Func_1a485: ; 1a485 (6:6485) ld a, [wcca1] ld [wcd38], a ld [$ff95], a - ld a, $23 - call Predef + predef Func_f9a0 call Func_3486 ld a, $2 ld [wcf10], a @@ -145,8 +144,7 @@ Func_1a4f4: ; 1a4f4 (6:64f4) ret nz ld a, $0 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld hl, wd730 res 7, [hl] ld hl, wd72e @@ -175,8 +173,7 @@ Func_1a514: ; 1a514 (6:6514) ld [wcd38], a xor a ld [wd12f], a - ld a, $4f - call Predef + predef PewterGuys ld hl, wcc97 ld de, RLEList_PewterMuseumGuy call DecodeRLEList @@ -233,8 +230,7 @@ Func_1a581: ; 1a581 (6:6581) ld [wcd38], a ld a, $1 ld [wd12f], a - ld a, $4f - call Predef + predef PewterGuys ld hl, wcc97 ld de, RLEList_PewterGymGuy call DecodeRLEList diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 184d38f4..ee4c999d 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -421,8 +421,7 @@ Func_707b6: ; 707b6 (1c:47b6) xor a ld [hli], a ld [hl], a - ld a, $4c - call Predef + predef EmotionBubble ld a, [wSpriteStateData1 + 2] cp $4 jr nz, .asm_70833 diff --git a/engine/palettes.asm b/engine/palettes.asm index 5835f483..eafd8ef6 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -268,8 +268,7 @@ DeterminePaletteIDOutOfBattle: ; 71f9d (1c:5f9d) and a jr z, .idZero push bc - ld a, $3A - call Predef ; turn Pokemon ID number into Pokedex number + predef IndexToPokedex ; turn Pokemon ID number into Pokedex number pop bc ld a, [wd11e] .idZero diff --git a/engine/predefs.asm b/engine/predefs.asm index 53022bc4..3ac99585 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -49,7 +49,7 @@ GetPredefPointer: ret -PredefPointers: ; 4fe79 (13:7e79) +PredefPointers:: ; 4fe79 (13:7e79) ; these are pointers to ASM routines. ; they appear to be used in overworld map scripts. add_predef Func_3cd60 diff --git a/engine/predefs17.asm b/engine/predefs17.asm index 11e67aff..74977ee8 100755 --- a/engine/predefs17.asm +++ b/engine/predefs17.asm @@ -3,8 +3,7 @@ StarterDex: ; 5c0dc (17:40dc) ld a, %01001011 ; set starter flags ld [wPokedexOwned], a ; wPokedexOwned - ld a, $3d - call Predef + predef ShowPokedexData xor a ; unset starter flags ld [wPokedexOwned], a ; wPokedexOwned ret diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 0e17d13f..e43cc9ab 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -17,8 +17,7 @@ PromptUserToPlaySlots: ; 3730e (d:730e) xor a ld [hli], a ld [hl], $2 - ld a, $4c - call Predef + predef EmotionBubble call GBPalWhiteOutWithDelay3 call LoadSlotMachineTiles call LoadFontTilePatterns @@ -618,8 +617,7 @@ SlotMachine_37741: ; 37741 (d:7741) ld [hli], a ld de, wPlayerCoins + 1 ld c, $2 - ld a, $c ; SubBCDPredef - call Predef + predef SubBCDPredef SlotMachine_37754: ; 37754 (d:7754) ld hl, wTileMap + $19 @@ -660,8 +658,7 @@ SlotMachine_3776b: ; 3776b (d:776b) ld hl, wcd47 ld de, wPlayerCoins + 1 ld c, $2 - ld a, $b ; AddBCDPredef - call Predef + predef AddBCDPredef call SlotMachine_37754 call SlotMachine_3775f ld a, (SFX_1f_65 - SFX_Headers_1f) / 3 diff --git a/engine/trade.asm b/engine/trade.asm index 977656b5..3da1760f 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -766,5 +766,4 @@ Func_41676: ; 41676 (10:5676) ld [W_ANIMATIONID], a ; W_ANIMATIONID xor a ld [wcc5b], a - ld a, $8 - jp Predef + predef_jump MoveAnimation diff --git a/engine/trade2.asm b/engine/trade2.asm index 40b86747..496ce24b 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -5,8 +5,7 @@ Func_42769: ; 42769 (10:6769) call PlaceString ld a,[wWhichTrade] ld [wd11e],a - ld a,$3A - call Predef + predef IndexToPokedex FuncCoord 9, 0 ld hl,Coord ld de,wd11e @@ -33,8 +32,7 @@ Func_427a7: ; 427a7 (10:67a7) call PlaceString ld a,[wTrainerEngageDistance] ld [wd11e],a - ld a,$3A - call Predef + predef IndexToPokedex FuncCoord 9, 10 ld hl,Coord ld de,wd11e diff --git a/home.asm b/home.asm index 5062b18c..e9dc60c3 100644 --- a/home.asm +++ b/home.asm @@ -275,8 +275,7 @@ LoadFrontSpriteByMonIndex:: ; 1389 (0:1389) push af ld a, [wcf91] ld [wd11e], a - ld a, $3a - call Predef + predef IndexToPokedex ld hl, wd11e ld a, [hl] pop bc @@ -576,8 +575,7 @@ GetMonHeader:: ; 1537 (0:1537) jr z,.specialID cp a,MEW jr z,.mew - ld a,$3a - call Predef ; convert pokemon ID in [wd11e] to pokedex number + predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number ld a,[wd11e] dec a ld bc,28 @@ -1509,8 +1507,7 @@ PokeCenterSignText:: ; 24ef (0:24ef) Predef5CText:: ; 24f4 (0:24f4) ; XXX better label (what does predef $5C do?) db $08 ; asm - ld a, $5c - call Predef + predef PickupItem jp TextScriptEnd @@ -1862,8 +1859,7 @@ AddAmountSoldToMoney:: ; 2b9e (0:2b9e) ld de,wPlayerMoney + 2 ld hl,$ffa1 ; total price of items ld c,3 ; length of money in bytes - ld a,$0b - call Predef ; add total price to money + predef AddBCDPredef ; add total price to money ld a,$13 ld [wd125],a call DisplayTextBoxID ; redraw money text box @@ -2182,8 +2178,7 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) ld de,$ffa1 ld hl,$ff8d push bc - ld a,$0b - call Predef ; add the individual price to the current sum + predef AddBCDPredef ; add the individual price to the current sum pop bc dec b jr nz,.addLoop @@ -2195,8 +2190,7 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) ld [$ffa3],a ld a,$02 ld [$ffa4],a - ld a,$0d - call Predef ; halves the price + predef DivideBCDPredef3 ; halves the price ; store the halved price ld a,[$ffa2] ld [$ff9f],a @@ -2843,8 +2837,7 @@ ReadTrainerHeaderInfo:: ; 3193 (0:3193) ret TrainerFlagAction:: - ld a, $10 ; FlagActionPredef - jp Predef + predef_jump FlagActionPredef ; direct talking to a trainer (rather than getting seen by one) TalkToTrainer:: ; 31cc (0:31cc) @@ -2900,8 +2893,7 @@ CheckFightingMapTrainers:: ; 3219 (0:3219) ld [wcd4f], a xor a ld [wcd50], a - ld a, $4c - call Predef + predef EmotionBubble ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a xor a @@ -2960,8 +2952,7 @@ EndTrainerBattle:: ; 3275 (0:3275) inc hl ld a, [hl] ld [wcc4d], a ; load corresponding missable object index and remove it - ld a, $11 - call Predef + predef HideObject .skipRemoveSprite ld hl, wd730 bit 4, [hl] @@ -3048,8 +3039,7 @@ CheckForEngagingTrainers:: ; 3306 (0:3306) ld a, [wcf13] swap a ld [wTrainerSpriteOffset], a ; wWhichTrade - ld a, $39 - call Predef + predef TrainerEngage pop de pop hl ld a, [wTrainerSpriteOffset] ; wWhichTrade @@ -3258,8 +3248,7 @@ IsItemInBag:: ; 3493 (0:3493) ; set zero flag if item isn't in player's bag ; else reset zero flag ; related to Pokémon Tower and ghosts - ld a,$1C - call Predef + predef IsItemInBag_ ld a,b and a ret @@ -4011,8 +4000,7 @@ WaitForTextScrollButtonPress:: ; 3865 (0:3865) call HandleDownArrowBlinkTiming pop hl call JoypadLowSensitivity - ld a, $2d - call Predef + predef Func_5a5f ld a, [$ffb5] and A_BUTTON | B_BUTTON jr z, .asm_3872 @@ -5079,8 +5067,7 @@ GoPAL_SET:: ; 3def (0:3def) ld a,[wcf1b] and a ret z - ld a,$45 - jp Predef + predef_jump Func_71ddf GetHealthBarColor:: ; Return at hl the palette of diff --git a/home/overworld.asm b/home/overworld.asm index 941b50cb..872d63ee 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -98,8 +98,7 @@ OverworldLoopLessDelay:: and a jp z,OverworldLoop .displayDialogue - ld a,$35 - call Predef ; check what is in front of the player + predef Func_c586 ; check what is in front of the player call UpdateSprites ; move sprites ld a,[wFlags_0xcd60] bit 2,a @@ -117,8 +116,7 @@ OverworldLoopLessDelay:: ld a,$00 ld [wcc47],a jr z,.changeMap - ld a,$52 - call Predef + predef LoadSAV ld a,[W_CURMAP] ld [wd71a],a call Func_62ce @@ -301,8 +299,7 @@ OverworldLoopLessDelay:: ld a,[W_ISINBATTLE] and a jp nz,CheckWarpsNoCollision - ld a,$13 - call Predef ; decrement HP of poisoned pokemon + predef Func_c69c ; decrement HP of poisoned pokemon ld a,[wd12d] and a jp nz,HandleBlackOut ; if all pokemon fainted @@ -1070,8 +1067,7 @@ IsSpriteOrSignInFrontOfPlayer:: ; 0b23 (0:0b23) and a jr z,.extendRangeOverCounter ; if there are signs - ld a,$35 - call Predef ; get the coordinates in front of the player in de + predef Func_c586 ; get the coordinates in front of the player in de ld hl,wd4b1 ; start of sign coordinates ld a,[wd4b0] ; number of signs in the map ld b,a @@ -1105,8 +1101,7 @@ IsSpriteOrSignInFrontOfPlayer:: ; 0b23 (0:0b23) jr nz,.signLoop ; check if the player is front of a counter in a pokemon center, pokemart, etc. and if so, extend the range at which he can talk to the NPC .extendRangeOverCounter - ld a,$35 - call Predef ; get the tile in front of the player in c + predef Func_c586 ; get the tile in front of the player in c ld hl,W_TILESETTALKINGOVERTILES ; list of tiles that extend talking range (counter tiles) ld b,$03 ld d,$20 ; talking range in pixels (long range) @@ -1246,8 +1241,7 @@ CollisionCheckOnLand:: ; 0bd1 (0:0bd1) ; function that checks if the tile in front of the player is passable ; clears carry if it is, sets carry if not CheckTilePassable:: ; 0c10 (0:0c10) - ld a,$35 - call Predef ; get tile in front of player + predef Func_c586 ; get tile in front of player ld a,[wcfc6] ; tile in front of player ld c,a ld hl,W_TILESETCOLLISIONPTR ; pointer to list of passable tiles @@ -1271,8 +1265,7 @@ CheckTilePassable:: ; 0c10 (0:0c10) ; sets carry if there is a collision and unsets carry if not CheckForJumpingAndTilePairCollisions:: ; 0c2a (0:0c2a) push hl - ld a,$35 - call Predef ; get the tile in front of the player + predef Func_c586 ; get the tile in front of the player push de push bc callba HandleLedges ; check if the player is trying to jump a ledge @@ -1920,8 +1913,7 @@ CollisionCheckOnWater:: ; 0fb7 (0:0fb7) ld hl,TilePairCollisionsWater call CheckForJumpingAndTilePairCollisions jr c,.collision - ld a,$35 - call Predef ; get tile in front of player (puts it in c and [wcfc6]) + predef Func_c586 ; get tile in front of player (puts it in c and [wcfc6]) ld a,[wcfc6] ; tile in front of player cp a,$14 ; water tile jr z,.noCollision ; keep surfing if it's a water tile @@ -2274,8 +2266,7 @@ LoadMapHeader:: ; 107c (0:107c) dec b jp nz,.loadSpriteLoop .finishUp - ld a,$19 - call Predef ; load tileset data + predef Func_c754 ; load tileset data callab LoadWildData ; load wild pokemon data pop hl ; restore hl from before going to the warp/sign/sprite data (this value was saved for seemingly no purpose) ld a,[W_CURMAPHEIGHT] ; map height in 4x4 tile blocks diff --git a/main.asm b/main.asm index 324f6a11..df42f937 100755 --- a/main.asm +++ b/main.asm @@ -49,8 +49,7 @@ Func_40b0:: ld [$ffa3], a ld a, 2 ld [$ffa4], a - ld a, $d ; DivideBCDPredef - call Predef + predef DivideBCDPredef3 ld a, [$ffa2] ld [wPlayerMoney], a ld a, [$ffa2 + 1] @@ -65,8 +64,7 @@ Func_40b0:: set 6, [hl] ld a, %11111111 ld [wJoyIgnore], a - ld a, $7 ; HealParty - jp Predef + predef_jump HealParty MewPicFront:: INCBIN "pic/bmon/mew.pic" @@ -520,8 +518,7 @@ INCLUDE "engine/oak_speech.asm" Func_62ce: ; 62ce (1:62ce) call Func_62ff - ld a,$19 - call Predef + predef Func_c754 ld hl,wd732 bit 2,[hl] res 2,[hl] @@ -714,8 +711,7 @@ SubtractAmountPaidFromMoney_: ; 6b21 (1:6b21) ld de,wPlayerMoney + 2 ld hl,$ffa1 ; total price of items ld c,3 ; length of money in bytes - ld a,$0c - call Predef ; subtract total price from money + predef SubBCDPredef ; subtract total price from money ld a,$13 ld [wd125],a call DisplayTextBoxID ; redraw money text box @@ -1927,22 +1923,19 @@ _RemovePokemon: ; 7b68 (1:7b68) Func_7c18: ; 7c18 (1:7c18) ld hl, wd730 set 6, [hl] - ld a, $3d - call Predef + predef ShowPokedexData ld hl, wd730 res 6, [hl] call ReloadMapData ld c, $a call DelayFrames - ld a, $3a - call Predef + predef IndexToPokedex ld a, [wd11e] dec a ld c, a ld b, $1 ld hl, wPokedexSeen - ld a, $10 - call Predef + predef FlagActionPredef ld a, $1 ld [wcc3c], a ret @@ -2531,13 +2524,11 @@ Func_c69c: ; c69c (3:469c) and a jr z, .asm_c733 ld b, $2 - ld a, $1f - call Predef + predef Func_480eb ld a, (SFX_02_43 - SFX_Headers_02) / 3 call PlaySound .asm_c733 - ld a, $14 - call Predef + predef AnyPartyAlive ld a, d and a jr nz, .asm_c74f @@ -3137,8 +3128,7 @@ Func_f113: ; f113 (3:7113) ld c, a ld b, $1 ld hl, W_TOWNVISITEDFLAG ; mark town as visited (for flying) - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef .notInTown ld hl, MapHSPointers ld a, [W_CURMAP] ; W_CURMAP @@ -3378,8 +3368,7 @@ Func_f225: ; f225 (3:7225) ld a, [hJoyHeld] and $f0 ret z - ld a, $5a - call Predef + predef Func_c60b ld a, [wd71c] and a jp nz, Func_f2dd @@ -3499,8 +3488,7 @@ _AddPartyMon: ; f2e5 (3:72e5) call SkipFixedLengthTextEntries ld a, $2 ld [wd07d], a - ld a, $4e - call Predef + predef AskName .asm_f33f ld hl, wPartyMons ld a, [wcc49] @@ -3532,8 +3520,7 @@ _AddPartyMon: ; f2e5 (3:72e5) ld a, [wcf91] ld [wd11e], a push de - ld a, $3a - call Predef + predef IndexToPokedex pop de ld a, [wd11e] dec a @@ -3635,8 +3622,7 @@ _AddPartyMon: ; f2e5 (3:72e5) dec de xor a ld [wHPBarMaxHP], a - ld a, $3e - call Predef + predef WriteMonMoves pop de ld a, [wPlayerID] ; set trainer ID to player ID inc de @@ -3770,8 +3756,7 @@ _AddEnemyMonToPlayerParty: ; f49d (3:749d) call CopyData ; write new mon's nickname (from an enemy mon) ld a, [wcf91] ld [wd11e], a - ld a, $3a - call Predef + predef IndexToPokedex ld a, [wd11e] dec a ld c, a diff --git a/scripts/agatha.asm b/scripts/agatha.asm index e80e7d32..b31fc412 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -24,8 +24,7 @@ AgathaScript_76443: ; 76443 (1d:6443) AgathaScript_76459: ; 76459 (1d:6459) ld [wd09f], a ld bc, $2 - ld a, $17 - jp Predef + predef_jump Func_ee9e AgathaScript_76464: ; 76464 (1d:6464) xor a diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index 1e5d1555..3a8a33c0 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -41,8 +41,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6) ret nz ld a, $61 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld hl, wd7f2 set 6, [hl] xor a @@ -70,8 +69,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5) call Func_32f9 ld a, $62 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld c, $8 call DelayFrames ld a, $2 @@ -165,12 +163,10 @@ BillsHouseText2: ; 1e874 (7:6874) set 4, [hl] ld a, $7 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld a, $9 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject .asm_5491f ; 0x1e8a9 ld hl, BillsHouseText_1e8cb call PrintText diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 1055f47a..4f336ea9 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -44,8 +44,7 @@ BluesHouseText1: ; 19b5d (6:5b5d) jr nc, .BagFull ld a,$29 ld [wcc4d],a - ld a,$11 - call Predef ; hide table map object + predef HideObject ; hide table map object ld hl,GotMapText call PrintText ld hl,wd74a diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 7f9dd1b6..d0382fa4 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -24,8 +24,7 @@ BrunoScript_762ec: ; 762ec (1d:62ec) BrunoScript_76302: ; 76302 (1d:6302) ld [wd09f], a ld bc, $2 - ld a, $17 - jp Predef + predef_jump Func_ee9e BrunoScript_7630d: ; 7630d (1d:630d) xor a diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 4cb001e6..2d638044 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -34,8 +34,7 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec) ld a, $2a ld [wd09f], a ld bc, $0208 - ld a, $17 - jp Predef + predef_jump Func_ee9e CeladonGameCornerScript_48c07: ; 48c07 (12:4c07) xor a @@ -97,8 +96,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69) ld [wJoyIgnore], a ld a, $46 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld hl, wd126 set 5, [hl] set 6, [hl] @@ -157,8 +155,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9) ld hl, $ffa1 ld de, wPlayerMoney + 2 ld c, $3 - ld a, $c ; SubBCDPredef - call Predef + predef SubBCDPredef xor a ldh [$9f], a ldh [$a0], a @@ -167,8 +164,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9) ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 - ld a, $b ; AddBCDPredef - call Predef + predef AddBCDPredef call CeladonGameCornerScript_48f1e ld hl, CeladonGameCornerText_48d27 jr .asm_e2afd ; 0x48d0d @@ -236,8 +232,7 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a) ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 - ld a, $b ; AddBCDPredef - call Predef + predef AddBCDPredef ld hl, wd77e set 2, [hl] ld a, $1 @@ -319,8 +314,7 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9) ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 - ld a, $b ; AddBCDPredef - call Predef + predef AddBCDPredef ld hl, wd77e set 4, [hl] ld hl, Received20CoinsText @@ -373,8 +367,7 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b) ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 - ld a, $b ; AddBCDPredef - call Predef + predef AddBCDPredef ld hl, wd77e set 3, [hl] ld hl, CeladonGameCornerText_48e8d @@ -456,8 +449,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd) ld a, $43 ld [wd09f], a ld bc, $0208 - ld a, $17 - call Predef + predef Func_ee9e jp TextScriptEnd CeladonGameCornerText_48f09: ; 48f09 (12:4f09) diff --git a/scripts/celadonmansion5.asm b/scripts/celadonmansion5.asm index b8cd77ee..66ef96d8 100755 --- a/scripts/celadonmansion5.asm +++ b/scripts/celadonmansion5.asm @@ -16,7 +16,6 @@ CeladonMansion5Text2: ; 1dd46 (7:5d46) jr nc, .asm_24365 ; 0x1dd4d ld a, $45 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject .asm_24365 ; 0x1dd59 jp TextScriptEnd diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm index 723eab36..1e32647d 100755 --- a/scripts/celadonmartelevator.asm +++ b/scripts/celadonmartelevator.asm @@ -66,6 +66,5 @@ CeladonMartElevatorText1: ; 4865e (12:465e) db $08 ; asm call CeladonMartElevatorScript_48631 ld hl, CeldaonMartElevatorWarpMaps ; $464a - ld a, $61 - call Predef + predef Func_1c9c6 jp TextScriptEnd diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index 1eb02dc2..02f2959d 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -14,8 +14,7 @@ CeladonMartRoofScript_483d8: ; 483d8 (12:43d8) push de ld [wd11e], a ld b, a - ld a, $1c - call Predef + predef IsItemInBag_ pop de pop hl ld a, b diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index c2ecf26c..419dbd8c 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -10,8 +10,7 @@ CeruleanCityScript_1948c: ; 1948c (6:548c) ld [W_CERULEANCITYCURSCRIPT], a ld a, $5 ld [wcc4d], a - ld a, $11 - jp Predef + predef_jump HideObject CeruleanCityScriptPointers: ; 1949d (6:549d) dw CeruleanCityScript0 @@ -91,8 +90,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) .asm_19535 ld a, $5 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld de, CeruleanCityMovement1 ld a, $1 ld [$ff8c], a @@ -208,8 +206,7 @@ CeruleanCityScript3: ; 19610 (6:5610) ret nz ld a, $5 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject xor a ld [wJoyIgnore], a call Func_2307 diff --git a/scripts/ceruleancity2.asm b/scripts/ceruleancity2.asm index cb7eee15..57c9ea4a 100755 --- a/scripts/ceruleancity2.asm +++ b/scripts/ceruleancity2.asm @@ -5,15 +5,12 @@ Func_74872: ; 74872 (1d:4872) call GBFadeIn1 ld a, $07 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld a, $09 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $06 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject call GBFadeOut1 ret diff --git a/scripts/ceruleanhouse1.asm b/scripts/ceruleanhouse1.asm index 6bc1cd30..27a91ab5 100755 --- a/scripts/ceruleanhouse1.asm +++ b/scripts/ceruleanhouse1.asm @@ -13,6 +13,5 @@ CeruleanHouse1Text2: ; 1d702 (7:5702) db $08 ; asm ld a, $6 ld [wWhichTrade], a - ld a, $54 - call Predef + predef Predef54 jp TextScriptEnd diff --git a/scripts/ceruleanhousetrashed.asm b/scripts/ceruleanhousetrashed.asm index 1bb60564..02b40dcb 100755 --- a/scripts/ceruleanhousetrashed.asm +++ b/scripts/ceruleanhousetrashed.asm @@ -10,8 +10,7 @@ CeruleanHouseTrashedTextPointers: ; 1d689 (7:5689) CeruleanHouseTrashedText1: ; 1d68f (7:568f) db $08 ; asm ld b, $e4 - ld a, $1c - call Predef + predef IsItemInBag_ and b jr z, .asm_f8734 ; 0x1d698 ld hl, CeruleanHouseTrashedText_1d6b0 diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 8d1cb2d6..8ce02e81 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -87,8 +87,7 @@ CinnabarGymScript1: ; 757dc (1d:57dc) jp DisplayTextID CinnabarGymScript_757f1: ; 757f1 (1d:57f1) - ld a, $10 ; FlagActionPredef - jp Predef + predef_jump FlagActionPredef CinnabarGymScript2: ; 757f6 (1d:57f6) ld a, [W_ISINBATTLE] diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index b584c4ed..e463d380 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -120,8 +120,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) push hl push de push bc - ld a, $b ; AddBCDPredef - call Predef + predef AddBCDPredef pop bc pop de pop hl @@ -156,8 +155,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) inc hl ld de, wPlayerMoney + 2 ld c, $3 - ld a, $c ; SubBCDPredef - call Predef + predef SubBCDPredef ld a, (SFX_02_5a - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent ld a, $13 @@ -181,8 +179,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld e, l ld a, $1 ld [wHPBarMaxHP], a - ld a, $3e - call Predef + predef WriteMonMoves pop bc pop af ld hl, wPartyMon1HP diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index 23816925..5f244781 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -281,8 +281,7 @@ FightingDojoText6: ; 5cf06 (17:4f06) ; once Poké Ball is taken, hide sprite ld a, $4a ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld hl, wd7b1 set 6, [hl] set 0, [hl] @@ -323,8 +322,7 @@ FightingDojoText7: ; 5cf4e (17:4f4e) ; once Poké Ball is taken, hide sprite ld a, $4b ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject .done jp TextScriptEnd diff --git a/scripts/gary.asm b/scripts/gary.asm index 20140cf7..f909a618 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -122,8 +122,7 @@ GaryScript4: ; 75fe4 (1d:5fe4) call MoveSprite ld a, $d6 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld a, $5 ld [W_GARYCURSCRIPT], a ret @@ -193,8 +192,7 @@ GaryScript8: ; 76083 (1d:6083) ret nz ld a, $d6 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $9 ld [W_GARYCURSCRIPT], a ret diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index f88d8498..1273305e 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -25,8 +25,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) push af xor a ld [wJoyIgnore], a - ld a, $55 - call Predef + predef HallOfFamePC pop af ld [wd358], a ld hl, W_FLAGS_D733 @@ -101,8 +100,7 @@ HallofFameRoomScript1: ; 5a52b (16:652b) ld [wJoyIgnore], a ld a, $8 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $2 ld [W_HALLOFFAMEROOMCURSCRIPT], a ret diff --git a/scripts/lab2.asm b/scripts/lab2.asm index a626de98..4075f737 100755 --- a/scripts/lab2.asm +++ b/scripts/lab2.asm @@ -21,6 +21,5 @@ Lab2Text3: ; 75c37 (1d:5c37) ld a, $8 ld [wWhichTrade], a asm_78552: ; 75c3d (1d:5c3d) - ld a, $54 - call Predef + predef Predef54 jp TextScriptEnd diff --git a/scripts/lab4.asm b/scripts/lab4.asm index 6a025f03..a1df3387 100755 --- a/scripts/lab4.asm +++ b/scripts/lab4.asm @@ -18,8 +18,7 @@ Lab4Script_75d38: ; 75d38 (1d:5d38) push de ld [wd11e], a ld b, a - ld a, $1c - call Predef + predef IsItemInBag_ pop de pop hl ld a, b @@ -105,8 +104,7 @@ Lab4Text2: ; 75dda (1d:5dda) db $08 ; asm ld a, $3 ld [wWhichTrade], a - ld a, $54 - call Predef + predef Predef54 jp TextScriptEnd LoadFossilItemAndMonNameBank1D: ; 75de8 (1d:5de8) diff --git a/scripts/lance.asm b/scripts/lance.asm index 26d42788..90295042 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -34,8 +34,7 @@ LanceScript_5a2de: ; 5a2de (16:62de) ld bc, $603 LanceScript_5a2f0: ; 5a2f0 (16:62f0) - ld a, $17 - jp Predef + predef_jump Func_ee9e LanceScript_5a2f5: ; 5a2f5 (16:62f5) xor a diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index fb10a17d..670b6b66 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -25,8 +25,7 @@ LoreleiScript_76191: ; 76191 (1d:6191) .asm_761ab ld [wd09f], a ld bc, $2 - ld a, $17 - jp Predef + predef_jump Func_ee9e LoreleiScript_761b6: ; 761b6 (1d:61b6) xor a diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index 7f314634..ee1b42b4 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -43,8 +43,7 @@ Mansion1Script_4430b: ; 4430b (11:430b) ld a, $e ld [wd09f], a asm_44310: ; 44310 (11:4310) - ld a, $17 - call Predef + predef Func_ee9e ret Mansion1Script_Switches: ; 44316 (11:4316) diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 679dd70a..30261637 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -40,8 +40,7 @@ Mansion2Script_51fee: ; 51fee (14:5fee) Mansion2Script_5202f: ; 5202f (14:602f) ld [wd09f], a - ld a, $17 - jp Predef + predef_jump Func_ee9e Mansion2Script_Switches: ; 52037 (14:6037) ld a, [wSpriteStateData1 + 9] diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 732294cc..8d6aaeed 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -151,8 +151,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb) ld a, $6d .asm_49e1f ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject xor a ld [wJoyIgnore], a ld a, $0 @@ -284,8 +283,7 @@ MtMoon3Text6: ; 49ee9 (12:5ee9) call MtMoon3Script_49f69 ld a, $6d ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld hl, wd7f6 set 6, [hl] ld a, $4 @@ -314,8 +312,7 @@ MtMoon3Text7: ; 49f29 (12:5f29) call MtMoon3Script_49f69 ld a, $6e ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld hl, wd7f6 set 7, [hl] ld a, $4 diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index 6bbe7a1b..94054561 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -55,8 +55,7 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) ld hl, wTrainerFacingDirection ld de, wPlayerMoney + 2 ld c, $3 - ld a, $c ; SubBCDPredef - call Predef + predef SubBCDPredef ld a, $13 ld [wd125], a call DisplayTextBoxID diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 5e1bb792..e593cf39 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -103,8 +103,7 @@ Museum1FText1: ; 5c135 (17:4135) ld hl, wTrainerFacingDirection ld de, wPlayerMoney + 2 ld c, $3 - ld a, $c ; SubBCDPredef - call Predef + predef SubBCDPredef ld a, $13 ld [wd125], a call DisplayTextBoxID @@ -203,8 +202,7 @@ Museum1FText3: ; 5c256 (17:4256) set 1, [hl] ld a, $34 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld hl, ReceivedOldAmberText jr .asm_52e0f ; 0x5c27e .BagFull diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 194eb1a8..fb56aade 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -40,8 +40,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e) ret nz ld a, $31 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld hl, wd72e res 4, [hl] @@ -68,12 +67,10 @@ OaksLabScript2: ; 1cb82 (7:4b82) ret nz ld a, $31 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $2e ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld a, $3 ld [W_OAKSLABCURSCRIPT], a @@ -294,8 +291,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld a, $2d .asm_1cd32 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject call Delay3 ld a, [wWhichTrade] ld [W_RIVALSTARTER], a @@ -341,13 +337,11 @@ OaksLabScript10: ; 1cd6d (7:4d6d) ld a, $1 swap a ld [$ff95], a - ld a, $22 - call Predef + predef Func_f929 ld a, [$ff95] dec a ld [$ff95], a - ld a, $20 - call Predef + predef Func_f8ba ld de, wcc97 ld a, $1 ld [$ff8c], a @@ -410,8 +404,7 @@ OaksLabScript12: ; 1ce03 (7:4e03) xor a ld [$ff8d], a call Func_34a6 ; face object - ld a, $7 - call Predef + predef HealParty ld hl, wd74b set 3, [hl] @@ -454,8 +447,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d) jr nz, .asm_1ce8c ; 0x1ce72 $18 ld a, $2a ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject xor a ld [wJoyIgnore], a call Func_2307 ; reset to map music @@ -498,8 +490,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0) call OaksLabScript_1d02b ld a, $2a ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld a, [wcd37] ld [wd157], a ld b, $0 @@ -558,12 +549,10 @@ OaksLabScript16: ; 1cf12 (7:4f12) call Delay3 ld a, $2f ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $30 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject call OaksLabScript_1cefd ld a, $1a ld [$ff8c], a @@ -583,12 +572,10 @@ OaksLabScript16: ; 1cf12 (7:4f12) set 0, [hl] ld a, $1 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $2 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld a, [wd157] ld b, $0 ld c, a @@ -616,16 +603,14 @@ OaksLabScript17: ; 1cfd4 (7:4fd4) call Func_2307 ld a, $2a ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld hl, wd7eb set 0, [hl] res 1, [hl] set 7, [hl] ld a, $22 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld a, $5 ld [W_PALLETTOWNCURSCRIPT], a xor a @@ -846,8 +831,7 @@ OaksLabScript_1d157: ; 1d157 (7:5157) ld [hl], $c ld hl, wd730 set 6, [hl] - ld a, $46 - call Predef ; StarterDex + predef StarterDex ; StarterDex ld hl, wd730 res 6, [hl] call ReloadMapData @@ -907,8 +891,7 @@ asm_1d1e3: ; 1d1e3 (7:51e3) ld a, $2d asm_1d1e5: ; 1d1e5 (7:51e5) ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $1 ld [wcc3c], a ld hl, OaksLabMonEnergeticText @@ -974,8 +957,7 @@ OaksLabText5: ; 1d248 (7:5248) call PrintText ld a, $1 ld [wcc3c], a - ld a, $56 - call Predef + predef DisplayDexRating jp .asm_0f042 .asm_b28b0 ; 0x1d279 ld b,POKE_BALL diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index d87668fd..16098dcf 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -56,8 +56,7 @@ PalletTownScript1: ; 18eb2 (6:4eb2) ld [wJoyIgnore],a ld a,0 ld [wcc4d],a - ld a,$15 - call Predef + predef ShowObject ; trigger the next script ld a,2 @@ -78,12 +77,10 @@ PalletTownScript2: ; 18ed2 (6:4ed2) ld a,1 swap a ld [$FF95],a - ld a,$22 - call Predef + predef Func_f929 ld hl,$FF95 dec [hl] - ld a,$20 - call Predef ; load Oak’s movement into wcc97 + predef Func_f8ba ; load Oak’s movement into wcc97 ld de,wcc97 ld a,1 ; oak ld [$FF8C],a @@ -146,12 +143,10 @@ PalletTownScript5: ; 18f56 (6:4f56) set 2,[hl] ld a,$27 ld [wcc4d],a - ld a,$11 - call Predef + predef HideObject ld a,$28 ld [wcc4d],a - ld a,$15 - jp Predef + predef_jump ShowObject .next ld a,[wd74b] bit 4,a @@ -193,8 +188,7 @@ OakAppearsText: ; 18fb0 (6:4fb0) xor a ld [wcd4f],a ld [wcd50],a - ld a,$4C - call Predef ; display ! over head + predef EmotionBubble ; display ! over head ld a,4 ld [wd528],a jp TextScriptEnd diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 5f4fea82..e7a143f9 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -87,8 +87,7 @@ PewterCityScript2: ; 192d3 (6:52d3) ret nz ld a, $3 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $3 ld [W_PEWTERCITYCURSCRIPT], a ret @@ -99,8 +98,7 @@ PewterCityScript3: ; 192e9 (6:52e9) call Func_32fe ld a, $3 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject xor a ld [wJoyIgnore], a ld a, $0 @@ -153,8 +151,7 @@ PewterCityScript5: ; 19359 (6:5359) ret nz ld a, $4 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $6 ld [W_PEWTERCITYCURSCRIPT], a ret @@ -165,8 +162,7 @@ PewterCityScript6: ; 1936f (6:536f) call Func_32fe ld a, $4 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject xor a ld [wJoyIgnore], a ld a, $0 diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 4d148906..2feb9817 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -69,12 +69,10 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) ld a, $4 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $22 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld hl, wd7eb res 0, [hl] diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index e1357b34..f370d7b7 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -101,8 +101,7 @@ PokemonTower2Script2: ; 605bb (18:45bb) ret nz ld a, $38 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject xor a ld [wJoyIgnore], a call Func_2307 diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm index ff084349..317690a2 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/pokemontower5.asm @@ -32,8 +32,7 @@ PokemonTower5Script0: ; 6094b (18:494b) ld [wJoyIgnore], a ld hl, wd72e set 4, [hl] - ld a, $7 - call Predef + predef HealParty call GBFadeOut2 call Delay3 call Delay3 diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 381d1c64..431855cb 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -52,8 +52,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56) ld a, [hli] jr nz, .missableObjectsListLoop ld [wcc4d], a ; remove missable object - ld a, $11 - call Predef + predef HideObject xor a ld [wJoyIgnore], a ld [wcf13], a @@ -69,8 +68,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86) ld [wJoyIgnore], a ld a, $43 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $4 ld [wSpriteStateData1 + 9], a ld a, $95 @@ -226,16 +224,13 @@ PokemonTower7Text4: ; 60e8a (18:4e8a) set 7, [hl] ld a, $44 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld a, $17 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $18 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld a, $4 ld [W_POKEMONTOWER7CURSCRIPT], a ld [W_CURMAPSCRIPT], a diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index 9f9c03b0..43e4fd26 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -30,8 +30,7 @@ RocketHideout1Script_44be0: ; 44be0 (11:4be0) .asm_44c03 ld [wd09f], a ld bc, $080c - ld a, $17 - jp Predef + predef_jump Func_ee9e RocketHideout1ScriptPointers: ; 44c0e (11:4c0e) dw CheckFightingMapTrainers diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 3faa566e..5c99f3a1 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -31,8 +31,7 @@ RocketHideout4Script_45473: ; 45473 (11:5473) .asm_45498 ld [wd09f], a ld bc, $050c - ld a, $17 - jp Predef + predef_jump Func_ee9e RocketHideout4Script_454a3: ; 454a3 (11:54a3) xor a @@ -62,12 +61,10 @@ RocketHideout4Script3: ; 454b6 (11:54b6) call GBFadeIn1 ld a, $83 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $87 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject call UpdateSprites call GBFadeOut1 xor a @@ -222,8 +219,7 @@ RocketHideout4AfterBattleText4: ; 455cf (11:55cf) jr nz, .asm_455e9 ; 0x455dd $a ld a, $88 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject .asm_455e9 jp TextScriptEnd diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm index fa208a5e..73313dd7 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/rockethideoutelevator.asm @@ -68,8 +68,7 @@ RocketHideoutElevatorText1: ; 4576d (11:576d) jr z, .asm_8d8f0 ; 0x45773 call RocketHideoutElevatorScript_45741 ld hl, RocketHideoutElevatorWarpMaps ; $5759 - ld a, $61 - call Predef + predef Func_1c9c6 jr .asm_46c43 ; 0x45780 .asm_8d8f0 ; 0x45782 ld hl, RocketHideoutElevatorText_4578b diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm index e6d7eba9..5c0cc574 100755 --- a/scripts/route11gateupstairs.asm +++ b/scripts/route11gateupstairs.asm @@ -11,8 +11,7 @@ Route11GateUpstairsText1: ; 4945f (12:545f) db $08 ; asm xor a ld [wWhichTrade], a - ld a, $54 - call Predef + predef Predef54 asm_49469: ; 49469 (12:5469) jp TextScriptEnd @@ -32,8 +31,7 @@ Route11GateUpstairsText2: ; 4946c (12:546c) ld de, wcc5b ld bc, $000d call CopyData - ld a, $62 - call Predef ; call oak's aide script + predef OaksAideScript ; call oak's aide script ld a, [$ffdb] dec a jr nz, .asm_494a1 ; 0x49494 $b diff --git a/scripts/route12.asm b/scripts/route12.asm index e722f15d..b7ec451a 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -36,8 +36,7 @@ Route12Script0: ; 59619 (16:5619) ld [W_CURENEMYLVL], a ; W_CURENEMYLVL ld a, $1d ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $3 ld [W_ROUTE12CURSCRIPT], a ld [W_CURMAPSCRIPT], a diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm index 88b6576f..2d328122 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/route15gateupstairs.asm @@ -20,8 +20,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651) ld de, wcc5b ld bc, $000d call CopyData - ld a, $62 - call Predef ; call oak's aide script + predef OaksAideScript ; call oak's aide script ld a, [$ffdb] cp $1 jr nz, .asm_49689 ; 0x4967c $b diff --git a/scripts/route16.asm b/scripts/route16.asm index afae25c9..01bd35ad 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -36,8 +36,7 @@ Route16Script0: ; 59959 (16:5959) ld [W_CURENEMYLVL], a ; W_CURENEMYLVL ld a, $21 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject call UpdateSprites ld a, $3 ld [W_ROUTE16CURSCRIPT], a diff --git a/scripts/route18gateupstairs.asm b/scripts/route18gateupstairs.asm index d9164d1d..9db16aeb 100755 --- a/scripts/route18gateupstairs.asm +++ b/scripts/route18gateupstairs.asm @@ -10,8 +10,7 @@ Route18GateUpstairsText1: ; 4997e (12:597e) db $08 ; asm ld a, $5 ld [wWhichTrade], a - ld a, $54 - call Predef + predef Predef54 jp TextScriptEnd Route18GateUpstairsText2: ; 4998c (12:598c) diff --git a/scripts/route20.asm b/scripts/route20.asm index 376d7da9..7e8df3da 100755 --- a/scripts/route20.asm +++ b/scripts/route20.asm @@ -50,13 +50,11 @@ Route20Script_50cc6: ; 50cc6 (14:4cc6) Route20Script_50d0c: ; 50d0c (14:4d0c) ld [wcc4d], a - ld a, $15 - jp Predef + predef_jump ShowObject Route20Script_50d14: ; 50d14 (14:4d14) ld [wcc4d], a - ld a, $11 - jp Predef + predef_jump HideObject Route20ScriptPointers: ; 50d1c (14:4d1c) dw CheckFightingMapTrainers diff --git a/scripts/route22.asm b/scripts/route22.asm index d9fce630..aba6a479 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -82,8 +82,7 @@ Route22Script0: ; 50f00 (14:4f00) ld [wcd4f], a xor a ld [wcd50], a - ld a, $4c - call Predef + predef EmotionBubble ld a, [wd700] and a jr z, .asm_50f4e ; 0x50f44 $8 @@ -208,8 +207,7 @@ Route22Script3: ; 5102a (14:502a) ld [wJoyIgnore], a ld a, $22 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject call Func_2307 ld hl, wd7eb res 0, [hl] @@ -223,8 +221,7 @@ Route22Script_5104e: ; 5104e (14:504e) ld [wcd4f], a xor a ld [wcd50], a - ld a, $4c - call Predef + predef EmotionBubble ld a, [wd700] and a jr z, .skipYVisibilityTesta @@ -355,8 +352,7 @@ Route22Script6: ; 51151 (14:5151) ld [wJoyIgnore], a ld a, $23 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject call Func_2307 ld hl, wd7eb res 1, [hl] diff --git a/scripts/route23.asm b/scripts/route23.asm index 507db5ce..55184600 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -18,12 +18,10 @@ Route23Script_511e9: ; 511e9 (14:51e9) res 6, [hl] ld a, $7a ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld a, $60 ld [wcc4d], a - ld a, $11 - jp Predef + predef_jump HideObject Route23ScriptPointers: ; 51213 (14:5213) dw Route23Script0 @@ -56,8 +54,7 @@ Route23Script0: ; 51219 (14:5219) ld [wWhichTrade], a ld b, $2 ld hl, wd7ed - ld a, $10 - call Predef + predef FlagActionPredef ld a, c and a ret nz @@ -198,8 +195,7 @@ Route23Script_51346: ; 51346 (14:5346) ld c, a ld b, $2 ld hl, W_OBTAINEDBADGES - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef ld a, c and a jr nz, .asm_5136e @@ -216,8 +212,7 @@ Route23Script_51346: ; 51346 (14:5346) ld c, a ld b, $1 ld hl, wd7ed - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef ld a, $2 ld [W_ROUTE23CURSCRIPT], a ret diff --git a/scripts/route25.asm b/scripts/route25.asm index 609205ec..088be3a2 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -21,24 +21,20 @@ Route25Script_515e1: ; 515e1 (14:55e1) res 6, [hl] ld a, $61 ld [wcc4d], a - ld a, $15 - jp Predef + predef_jump ShowObject .asm_515ff bit 4, [hl] ret z set 7, [hl] ld a, $24 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $62 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $63 ld [wcc4d], a - ld a, $15 - jp Predef + predef_jump ShowObject Route25ScriptPointers: ; 51622 (14:5622) dw CheckFightingMapTrainers diff --git a/scripts/route2gate.asm b/scripts/route2gate.asm index b6e00b51..8ee087c8 100755 --- a/scripts/route2gate.asm +++ b/scripts/route2gate.asm @@ -20,8 +20,7 @@ Route2GateText1: ; 5d5db (17:55db) ld de, wcc5b ld bc, $000d call CopyData - ld a, $62 - call Predef ; call oak's aide script + predef OaksAideScript ; call oak's aide script ldh a, [$db] cp $1 jr nz, .asm_ad646 ; 0x5d606 diff --git a/scripts/route2house.asm b/scripts/route2house.asm index 50a058b8..75da399b 100755 --- a/scripts/route2house.asm +++ b/scripts/route2house.asm @@ -13,6 +13,5 @@ Route2HouseText2: ; 1def9 (7:5ef9) db $08 ; asm ld a, $1 ld [wWhichTrade], a - ld a, $54 - call Predef + predef Predef54 jp TextScriptEnd diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index 7140f67b..ffc7f402 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -176,8 +176,7 @@ SafariZoneEntranceText4: ; 752ca (1d:52ca) ld hl, wTrainerFacingDirection ld de, wPlayerMoney + 2 ld c, $3 - ld a, $c ; SubBCDPredef - call Predef + predef SubBCDPredef ld a, $13 ld [wd125], a call DisplayTextBoxID diff --git a/scripts/seafoamislands1.asm b/scripts/seafoamislands1.asm index 3558226b..55bbd43e 100755 --- a/scripts/seafoamislands1.asm +++ b/scripts/seafoamislands1.asm @@ -28,12 +28,10 @@ SeafoamIslands1Script: ; 447e9 (11:47e9) .asm_44825 ld a, [wd079] ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, [wd07a] ld [wcc4d], a - ld a, $15 - jp Predef + predef_jump ShowObject .asm_4483b ld a, $9f ld [wd71d], a diff --git a/scripts/seafoamislands2.asm b/scripts/seafoamislands2.asm index 9ee8fd28..b14c16d8 100755 --- a/scripts/seafoamislands2.asm +++ b/scripts/seafoamislands2.asm @@ -26,12 +26,10 @@ SeafoamIslands2Script: ; 46315 (11:6315) .asm_4634c ld a, [wd079] ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, [wd07a] ld [wcc4d], a - ld a, $15 - jp Predef + predef_jump ShowObject .asm_46362 ld a, $a0 ld [wd71d], a diff --git a/scripts/seafoamislands3.asm b/scripts/seafoamislands3.asm index 46f9a74e..aa7b3615 100755 --- a/scripts/seafoamislands3.asm +++ b/scripts/seafoamislands3.asm @@ -26,12 +26,10 @@ SeafoamIslands3Script: ; 46451 (11:6451) .asm_46488 ld a, [wd079] ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, [wd07a] ld [wcc4d], a - ld a, $15 - jp Predef + predef_jump ShowObject .asm_4649e ld a, $a1 ld [wd71d], a diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm index 3c2be99c..ac573994 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/seafoamislands4.asm @@ -26,12 +26,10 @@ SeafoamIslands4Script: ; 4658d (11:658d) .asm_465c4 ld a, [wd079] ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, [wd07a] ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject jr .asm_465ed ; 0x465da $11 .asm_465dc ld a, $a2 diff --git a/scripts/silphco1.asm b/scripts/silphco1.asm index 0ac616c0..990e5c2a 100755 --- a/scripts/silphco1.asm +++ b/scripts/silphco1.asm @@ -9,8 +9,7 @@ SilphCo1Script: ; 5d44e (17:544e) ret nz ld a, $4c ld [wcc4d], a - ld a, $15 - jp Predef + predef_jump ShowObject SilphCo1TextPointers: ; 5d469 (17:5469) dw SilphCo1Text1 diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index b3264520..c831655f 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -22,8 +22,7 @@ SilphCo10Script_5a14f: ; 5a14f (16:614f) ld a, $54 ld [wd09f], a ld bc, $405 - ld a, $17 - jp Predef + predef_jump Func_ee9e DataTable_5a173: ; 5a173 (16:6173) db $04,$05,$FF diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 44918bea..b63bc523 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -22,8 +22,7 @@ SilphCo11Script_62110: ; 62110 (18:6110) ld a, $20 ld [wd09f], a ld bc, $603 - ld a, $17 - jp Predef + predef_jump Func_ee9e DataTable_62134: ; 62134 (18:6134) db $06,$03,$FF @@ -80,8 +79,7 @@ SilphCo11Script_6216d: ; 6216d (18:616d) jr z, .asm_62181 push hl ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject pop hl jr .asm_62170 .asm_62181 @@ -92,8 +90,7 @@ SilphCo11Script_6216d: ; 6216d (18:616d) ret z push hl ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject pop hl jr .asm_62184 diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index 755b5138..20d689e6 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -23,8 +23,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07) ld a, $54 ld [wd09f], a ld bc, $0202 - ld a, $17 - call Predef + predef Func_ee9e pop af .asm_59d2e bit 6, a @@ -32,8 +31,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07) ld a, $54 ld [wd09f], a ld bc, $0502 - ld a, $17 - jp Predef + predef_jump Func_ee9e DataTable_59d3e: ; 59d3e (16:5d3e) db $02,$02,$05,$02,$FF diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index 4ea577a5..5527d923 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -23,8 +23,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) ld a, $5f ld [wd09f], a ld bc, $404 - ld a, $17 - call Predef + predef Func_ee9e pop af .asm_59f98 bit 1, a @@ -32,8 +31,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) ld a, $5f ld [wd09f], a ld bc, $408 - ld a, $17 - jp Predef + predef_jump Func_ee9e DataTable_59fa8: ; 59fa8 (16:5fa8) db $04,$04,$04,$08,$FF diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index 7b6992fa..718077ce 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -23,8 +23,7 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21) ld a, $54 ld [wd09f], a ld bc, $0602 - ld a, $17 - call Predef + predef Func_ee9e pop af .asm_19d48 bit 1, a @@ -32,8 +31,7 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21) ld a, $54 ld [wd09f], a ld bc, $0406 - ld a, $17 - jp Predef + predef_jump Func_ee9e SilphCo4Data19d58: ; 19d58 (6:5d58) db $06, $02, $04, $06, $ff diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index d586ae94..709af20b 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -23,8 +23,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) ld a, $5f ld [wd09f], a ld bc, $0203 - ld a, $17 - call Predef + predef Func_ee9e pop af .asm_19f74 bit 1, a @@ -33,8 +32,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) ld a, $5f ld [wd09f], a ld bc, $0603 - ld a, $17 - call Predef + predef Func_ee9e pop af .asm_19f87 bit 2, a @@ -42,8 +40,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) ld a, $5f ld [wd09f], a ld bc, $0507 - ld a, $17 - jp Predef + predef_jump Func_ee9e SilphCo5Coords: ; 19f97 (6:5f97) ; coords? db $02, $03, $06, $03, $05, $07, $ff diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index 5bea4eae..4a9477c6 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -22,8 +22,7 @@ SilphCo6Script_1a1bf: ; 1a1bf (6:61bf) ld a, $5f ld [wd09f], a ld bc, $0602 - ld a, $17 - jp Predef + predef_jump Func_ee9e SilphCo6Coords1: ; 1a1e3 (6:61e3) db $06, $02 diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 6f2b306c..bd611763 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -23,8 +23,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) ld a, $54 ld [wd09f], a ld bc, $305 - ld a, $17 - call Predef + predef Func_ee9e pop af .asm_51b9e bit 5, a @@ -33,8 +32,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) ld a, $54 ld [wd09f], a ld bc, $20a - ld a, $17 - call Predef + predef Func_ee9e pop af .asm_51bb1 bit 6, a @@ -42,8 +40,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) ld a, $54 ld [wd09f], a ld bc, $60a - ld a, $17 - jp Predef + predef_jump Func_ee9e DataTable_51bc1: ; 51bc1 (14:5bc1) db $03,$05,$02,$0A,$06,$0A,$FF @@ -246,8 +243,7 @@ SilphCo7Script5: ; 51d25 (14:5d25) ret nz ld a, $a7 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject call Func_2307 xor a ld [wJoyIgnore], a diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm index a1d05fd6..cc508e61 100755 --- a/scripts/silphco8.asm +++ b/scripts/silphco8.asm @@ -22,8 +22,7 @@ SilphCo8Script_5651a: ; 5651a (15:651a) ld a, $5f ld [wd09f], a ld bc, $403 - ld a, $17 - jp Predef + predef_jump Func_ee9e DataTable_5653e: ; 5653e (15:653e) db $04,$03,$FF diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index 2247a00f..c4f7a895 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -23,8 +23,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) ld a, $5f ld [wd09f], a ld bc, $401 - ld a, $17 - call Predef + predef Func_ee9e pop af .asm_5d7f8 bit 1, a @@ -33,8 +32,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) ld a, $54 ld [wd09f], a ld bc, $209 - ld a, $17 - call Predef + predef Func_ee9e pop af .asm_5d80b bit 2, a @@ -43,8 +41,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) ld a, $54 ld [wd09f], a ld bc, $509 - ld a, $17 - call Predef + predef Func_ee9e pop af .asm_5d81e bit 3, a @@ -52,8 +49,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) ld a, $5f ld [wd09f], a ld bc, $605 - ld a, $17 - jp Predef + predef_jump Func_ee9e DataTable_5d82e: ; 5d82e (17:582e) db $04,$01,$02,$09,$05,$09,$06,$05,$FF @@ -167,8 +163,7 @@ SilphCo9Text1: ; 5d8b8 (17:58b8) jr nz, .asm_a14c3 ; 0x5d8be ld hl, SilphCo9Text_5d8e5 call PrintText - ld a, $7 - call Predef + predef HealParty call GBFadeOut2 call Delay3 call GBFadeIn2 diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index 64240c26..853d7357 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -73,6 +73,5 @@ SilphCoElevatorText1: ; 45835 (11:5835) db $08 ; asm call SilphCoElevatorScript_457f1 ld hl, SilphCoElevatorWarpMaps ; $5811 - ld a, $61 - call Predef + predef Func_1c9c6 jp TextScriptEnd diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index 22e4408f..f3822ec7 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -34,8 +34,7 @@ SSAnne2Script0: ; 613be (18:53be) ld [$ffdb], a ld a, $71 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject call Delay3 ld a, $2 ld [$ff8c], a @@ -163,8 +162,7 @@ SSAnne2Script3: ; 614be (18:54be) ld [wJoyIgnore], a ld a, $71 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject call Func_2307 ld a, $4 ld [W_SSANNE2CURSCRIPT], a diff --git a/scripts/undergroundpathentranceroute5.asm b/scripts/undergroundpathentranceroute5.asm index 9a437e85..1fb62f48 100755 --- a/scripts/undergroundpathentranceroute5.asm +++ b/scripts/undergroundpathentranceroute5.asm @@ -13,7 +13,6 @@ UndergroundPathEntranceRoute5Text1: ; 5d6b2 (17:56b2) db $08 ; asm ld a, $9 ld [wWhichTrade], a - ld a, $54 - call Predef + predef Predef54 ld hl, UndergroundPathEntranceRoute5_5d6af ret diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 06143eab..da70b819 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -55,8 +55,7 @@ VermilionCityScript0: ; 197e6 (6:57e6) bit 2, a jr nz, .asm_19810 ; 0x19804 $a ld b, $3f - ld a, $1c - call Predef + predef IsItemInBag_ ld a, b and a ret nz @@ -176,8 +175,7 @@ VermilionCityText3: ; 198b1 (6:58b1) ld hl, SSAnneWelcomeText9 call PrintText ld b, S_S__TICKET - ld a, $1c - call Predef + predef IsItemInBag_ ld a, b and a jr nz, .asm_0419b ; 0x198df diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index a76d34d8..fa6b2fc2 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -40,8 +40,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) .asm_5ca7f ld [wd09f], a ld bc, $202 - ld a, $17 - jp Predef + predef_jump Func_ee9e VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a) xor a diff --git a/scripts/vermilionhouse3.asm b/scripts/vermilionhouse3.asm index b6bceeea..7b4e95fd 100755 --- a/scripts/vermilionhouse3.asm +++ b/scripts/vermilionhouse3.asm @@ -8,6 +8,5 @@ VermilionHouse3Text1: ; 19c17 (6:5c17) db $08 ; asm ld a, $4 ld [wWhichTrade], a - ld a, $54 - call Predef + predef Predef54 jp TextScriptEnd diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index 21b87faa..cebd8070 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -17,8 +17,7 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) ld a, $1d ld [wd09f], a ld bc, $604 - ld a, $17 - jp Predef + predef_jump Func_ee9e VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a) dw VictoryRoad1Script0 diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index 034c7545..cf52e3a3 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -36,8 +36,7 @@ VictoryRoad2Script_517c9: ; 517c9 (14:57c9) VictoryRoad2Script_517e2: ; 517e2 (14:57e2) ld [wd09f], a - ld a, $17 - call Predef + predef Func_ee9e ret VictoryRoad2ScriptPointers: ; 517eb (14:57eb) diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index ea04671c..e35e9131 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -19,8 +19,7 @@ VictoryRoad3Script_44996: ; 44996 (11:4996) ld a, $1d ld [wd09f], a ld bc, $503 - ld a, $17 - jp Predef + predef_jump Func_ee9e VictoryRoad3ScriptPointers: ; 449b1 (11:49b1) dw VictoryRoad3Script0 @@ -50,12 +49,10 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) jr nz, .asm_449fe ld a, $7a ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject ld a, $60 ld [wcc4d], a - ld a, $15 - jp Predef + predef_jump ShowObject .coordsData_449f9: ; 449f9 (11:49f9) db $05,$03 diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index e0c59e61..65ad3553 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -177,8 +177,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) ld a, $23 ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld hl, wd7eb set 1, [hl] set 7, [hl] @@ -293,8 +292,7 @@ ViridianGymText1: ; 74a69 (1d:4a69) call GBFadeIn1 ld a, $32 ld [wcc4d], a - ld a, $11 - call Predef + predef HideObject call UpdateSprites call Delay3 call GBFadeOut1 -- cgit v1.3.1-sl0p