From 8f8281fe6ed02d8235ab9f92fa6ae93f50a3bf8e Mon Sep 17 00:00:00 2001 From: yenatch Date: Fri, 23 May 2014 15:34:35 -0700 Subject: Comment some more bank 0 functions. --- scripts/halloffameroom.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index 962fa643..1ce2e978 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -58,7 +58,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) dec b jr nz, .asm_5a4ff ; 0x5a505 $f8 call WaitForTextScrollButtonPress - jp InitGame + jp Init HallofFameRoomScript0: ; 5a50d (16:650d) ld a, $ff -- cgit v1.2.3 From 64479cd64205d611a66698f447aa42c16c334b2d Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 24 May 2014 11:40:38 -0700 Subject: Rename random number function and hram labels. GenRandom -> Random GenRandomInBattle -> BattleRandom H_RAND1 -> hRandomAdd H_RAND2 -> hRandomSub --- scripts/celadongamecorner.asm | 2 +- scripts/vermilioncity.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index f4e23d6e..303b8a19 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -11,7 +11,7 @@ CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) bit 6, [hl] res 6, [hl] ret z - call GenRandom + call Random ld a, [$ffd3] cp $7 jr nc, .asm_48be2 diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 3f582dba..3298221f 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -14,7 +14,7 @@ VermilionCityScript: ; 197a1 (6:57a1) jp CallFunctionInTable VermilionCityScript_197c0: ; 197c0 (6:57c0) - call GenRandom + call Random ld a, [$ffd4] and $e ld [$d743], a -- cgit v1.2.3 From d307c854991f5eb24e12935e6906ad81ed244334 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 25 May 2014 10:09:39 -0700 Subject: Clean up some bank 3 functions and rename flag action functions. --- scripts/cinnabargym.asm | 4 ++-- scripts/route23.asm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 1d66a1bf..5f9ddc32 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -87,8 +87,8 @@ CinnabarGymScript1: ; 757dc (1d:57dc) jp DisplayTextID CinnabarGymScript_757f1: ; 757f1 (1d:57f1) - ld a, $10 - jp Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + jp Predef CinnabarGymScript2: ; 757f6 (1d:57f6) ld a, [$d057] diff --git a/scripts/route23.asm b/scripts/route23.asm index aca5efb7..19b22f04 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -198,8 +198,8 @@ Route23Script_51346: ; 51346 (14:5346) ld c, a ld b, $2 ld hl, W_OBTAINEDBADGES - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef ld a, c and a jr nz, .asm_5136e @@ -216,8 +216,8 @@ Route23Script_51346: ; 51346 (14:5346) ld c, a ld b, $1 ld hl, $d7ed - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef ld a, $2 ld [W_ROUTE23CURSCRIPT], a ret -- cgit v1.2.3 From 031e33957dfaf9a5e29fb67aaf600ec809b8e35f Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 25 May 2014 10:51:53 -0700 Subject: Rename joypad registers. --- scripts/agatha.asm | 6 +++--- scripts/billshouse.asm | 6 +++--- scripts/bruno.asm | 6 +++--- scripts/celadongamecorner.asm | 6 +++--- scripts/celadongym.asm | 4 ++-- scripts/ceruleancity.asm | 18 +++++++++--------- scripts/ceruleangym.asm | 4 ++-- scripts/cinnabargym.asm | 8 ++++---- scripts/cinnabarisland.asm | 4 ++-- scripts/fightingdojo.asm | 2 +- scripts/fuchsiagym.asm | 4 ++-- scripts/gary.asm | 18 +++++++++--------- scripts/halloffameroom.asm | 10 +++++----- scripts/lance.asm | 6 +++--- scripts/lorelei.asm | 6 +++--- scripts/mansion1.asm | 2 +- scripts/mansion2.asm | 2 +- scripts/mansion3.asm | 2 +- scripts/mansion4.asm | 2 +- scripts/mtmoon3.asm | 10 +++++----- scripts/museum1f.asm | 4 ++-- scripts/oakslab.asm | 22 +++++++++++----------- scripts/pallettown.asm | 12 ++++++------ scripts/pewtercity.asm | 6 +++--- scripts/pewtergym.asm | 4 ++-- scripts/pokemontower2.asm | 10 +++++----- scripts/pokemontower5.asm | 6 +++--- scripts/pokemontower6.asm | 10 +++++----- scripts/pokemontower7.asm | 8 ++++---- scripts/redshouse2f.asm | 2 +- scripts/rockethideout2.asm | 4 ++-- scripts/rockethideout3.asm | 4 ++-- scripts/rockethideout4.asm | 6 +++--- scripts/route12.asm | 2 +- scripts/route16.asm | 2 +- scripts/route16gate.asm | 6 +++--- scripts/route18gate.asm | 6 +++--- scripts/route22.asm | 18 +++++++++--------- scripts/route22gate.asm | 6 +++--- scripts/route23.asm | 4 ++-- scripts/route24.asm | 10 +++++----- scripts/route5gate.asm | 4 ++-- scripts/route6gate.asm | 4 ++-- scripts/route7gate.asm | 4 ++-- scripts/route8gate.asm | 4 ++-- scripts/safarizoneentrance.asm | 18 +++++++++--------- scripts/saffrongym.asm | 4 ++-- scripts/seafoamislands5.asm | 4 ++-- scripts/silphco11.asm | 12 ++++++------ scripts/silphco7.asm | 12 ++++++------ scripts/ssanne2.asm | 12 ++++++------ scripts/vermilioncity.asm | 8 ++++---- scripts/vermiliondock.asm | 6 +++--- scripts/vermiliongym.asm | 4 ++-- scripts/viridiancity.asm | 10 +++++----- scripts/viridiangym.asm | 8 ++++---- 56 files changed, 196 insertions(+), 196 deletions(-) (limited to 'scripts') diff --git a/scripts/agatha.asm b/scripts/agatha.asm index 749f84e7..eb0e21d6 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -63,8 +63,8 @@ AgathaScript0: ; 76490 (1d:6490) call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [H_NEWLYPRESSEDBUTTONS], a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyPressed], a + ld [hJoyHeld], a ld [$ccd3], a ld [$cd38], a ld a, [wWhichTrade] ; $cd3d @@ -101,7 +101,7 @@ AgathaScript3: ; 764da (1d:64da) ret nz call Delay3 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_AGATHACURSCRIPT], a ld [W_CURMAPSCRIPT], a ret diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index 6d397de1..846e47ff 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -46,7 +46,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6) ld hl, $d7f2 set 6, [hl] xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $3 ld [W_BILLSHOUSECURSCRIPT], a ret @@ -56,7 +56,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5) bit 3, a ret z ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $2 ld [$cf13], a ld a, $c @@ -90,7 +90,7 @@ BillsHouseScript4: ; 1e80d (7:680d) bit 0, a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d7f2 set 5, [hl] ld hl, $d7f1 diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 60d579b2..8f9368d6 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -63,8 +63,8 @@ BrunoScript0: ; 76339 (1d:6339) call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [H_NEWLYPRESSEDBUTTONS], a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyPressed], a + ld [hJoyHeld], a ld [$ccd3], a ld [$cd38], a ld a, [wWhichTrade] ; $cd3d @@ -101,7 +101,7 @@ BrunoScript3: ; 76383 (1d:6383) ret nz call Delay3 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_BRUNOCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 303b8a19..be0a04fb 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -39,7 +39,7 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec) CeladonGameCornerScript_48c07: ; 48c07 (12:4c07) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_CELADONGAMECORNERCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -57,7 +57,7 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) cp $ff jp z, CeladonGameCornerScript_48c07 ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $d ld [H_SPRITEHEIGHT], a call DisplayTextID @@ -94,7 +94,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69) bit 0, a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $46 ld [$cc4d], a ld a, $11 diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 67102fb7..1eecffab 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -24,7 +24,7 @@ Gym4LeaderName: ; 4893d (12:493d) CeladonGymText_48943: ; 48943 (12:4943) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_CELADONGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -40,7 +40,7 @@ CeladonGymScript3: ; 48956 (12:4956) cp $ff jp z, CeladonGymText_48943 ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a CeladonGymText_48963: ; 48963 (12:4963) ld a, $9 diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 61157bbb..d84d882a 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -6,7 +6,7 @@ CeruleanCityScript: ; 19480 (6:5480) CeruleanCityScript_1948c: ; 1948c (6:548c) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_CERULEANCITYCURSCRIPT], a ld a, $5 ld [$cc4d], a @@ -25,14 +25,14 @@ CeruleanCityScript4: ; 194a7 (6:54a7) cp $ff jp z, CeruleanCityScript_1948c ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d75b set 7, [hl] ld a, $2 ld [$ff8c], a call DisplayTextID xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_CERULEANCITYCURSCRIPT], a ret @@ -76,9 +76,9 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld a, MUSIC_MEET_RIVAL call PlayMusic xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, [W_XCOORD] cp $14 jr z, .asm_19535 ; 0x19526 $d @@ -126,7 +126,7 @@ CeruleanCityScript1: ; 19567 (6:5567) bit 0, a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $1 ld [$ff8c], a call DisplayTextID @@ -156,7 +156,7 @@ CeruleanCityScript1: ; 19567 (6:5567) ld [W_TRAINERNO], a xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a call CeruleanCityScript_1955d ld a, $2 ld [W_CERULEANCITYCURSCRIPT], a @@ -168,7 +168,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) jp z, CeruleanCityScript_1948c call CeruleanCityScript_1955d ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d75a set 0, [hl] ld a, $1 @@ -211,7 +211,7 @@ CeruleanCityScript3: ; 19610 (6:5610) ld a, $11 call Predef xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a call Func_2307 ld a, $0 ld [W_CERULEANCITYCURSCRIPT], a diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index 7d35cf71..8f6ac2c9 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -24,7 +24,7 @@ Gym2LeaderName: ; 5c6e7 (17:46e7) CeruleanGymScript_5c6ed: ; 5c6ed (17:46ed) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_CERULEANGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -40,7 +40,7 @@ CeruleanGymScript3: ; 5c700 (17:4700) cp $ff jp z, CeruleanGymScript_5c6ed ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a CeruleanGymScript_5c70d: ; 5c70d (17:470d) ld a, $5 diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 5f9ddc32..03f60b0f 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -30,7 +30,7 @@ Gym7LeaderName: ; 7578b (1d:578b) CinnabarGymScript_75792: ; 75792 (1d:5792) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_CINNABARGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ld [$da38], a @@ -80,7 +80,7 @@ CinnabarGymScript1: ; 757dc (1d:57dc) bit 0, a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, [$da38] ld [wTrainerHeaderFlagBit], a ld [$ff8c], a @@ -122,7 +122,7 @@ CinnabarGymScript2: ; 757f6 (1d:57f6) call CinnabarGymScript_757f1 call Func_3ead xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [$da38], a ld a, $0 ld [W_CINNABARGYMCURSCRIPT], a @@ -134,7 +134,7 @@ CinnabarGymScript3: ; 7584a (1d:584a) cp $ff jp z, CinnabarGymScript_75792 ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a CinnabarGymScript3_75857: ; 75857 (1d:5857) ld a, $a ld [$ff8c], a diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index ab77926a..5bb03843 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -30,7 +30,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) ld [$ff8c], a call DisplayTextID xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $1 ld [$cd38], a ld a, $80 @@ -38,7 +38,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) call Func_3486 xor a ld [$c109], a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $1 ld [W_CINNABARISLANDCURSCRIPT], a ret diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index 4dc7fe7b..a491349c 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -32,7 +32,7 @@ FightingDojoScript1: ; 5cd83 (17:4d83) bit 1, a ret nz xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld [$cf0d], a ld a, [W_YCOORD] cp $3 diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 789c2367..4fc8dd61 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -25,7 +25,7 @@ Gym5LeaderName: ; 75472 (1d:5472) FuchsiaGymScript_75477: ; 75477 (1d:5477) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_FUCHSIAGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -41,7 +41,7 @@ FuchsiaGymScript3: ; 7548a (1d:548a) cp $ff jp z, FuchsiaGymScript_75477 ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a FuchsiaGymScript3_75497: ; 75497 (1d:5497) ld a, $9 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c diff --git a/scripts/gary.asm b/scripts/gary.asm index dc7b1252..67b4a424 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -6,7 +6,7 @@ GaryScript: ; 75f1d (1d:5f1d) GaryScript_75f29: ; 75f29 (1d:5f29) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_GARYCURSCRIPT], a ret @@ -28,7 +28,7 @@ GaryScript0: ; 75f47 (1d:5f47) GaryScript1: ; 75f48 (1d:5f48) ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $ccd3 ld de, RLEMovement75f63 call DecodeRLEList @@ -51,7 +51,7 @@ GaryScript2: ; 75f6a (1d:5f6a) ret nz call Delay3 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d355 res 7, [hl] ld a, $1 @@ -84,7 +84,7 @@ GaryScript2: ; 75f6a (1d:5f6a) ld [W_TRAINERNO], a xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $3 ld [W_GARYCURSCRIPT], a ret @@ -97,7 +97,7 @@ GaryScript3: ; 75fbb (1d:5fbb) ld hl, $d867 set 1, [hl] ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $1 ld [$ff8c], a call GaryScript_760c8 @@ -201,7 +201,7 @@ GaryScript8: ; 76083 (1d:6083) GaryScript9: ; 76099 (1d:6099) ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $ccd3 ld de, RLEMovement760b4 call DecodeRLEList @@ -222,17 +222,17 @@ GaryScript10: ; 760b9 (1d:60b9) and a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $0 ld [W_GARYCURSCRIPT], a ret GaryScript_760c8 ; 760c8 (1d:60c8) ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a call DisplayTextID ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ret GaryTextPointers: ; 760d6 (1d:60d6) diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index 1ce2e978..d91fad22 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -6,7 +6,7 @@ HallofFameRoomScript: ; 5a49e (16:649e) HallofFameRoomScript_5a4aa: ; 5a4aa (16:64aa) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_HALLOFFAMEROOMCURSCRIPT], a ret @@ -24,7 +24,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) ld a, [$d358] push af xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $55 call Predef pop af @@ -62,7 +62,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) HallofFameRoomScript0: ; 5a50d (16:650d) ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $ccd3 ld de, RLEMovement5a528 call DecodeRLEList @@ -91,14 +91,14 @@ HallofFameRoomScript1: ; 5a52b (16:652b) call Func_34a6 call Delay3 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a inc a ld [$d528], a ld a, $1 ld [$ff8c], a call DisplayTextID ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $8 ld [$cc4d], a ld a, $11 diff --git a/scripts/lance.asm b/scripts/lance.asm index 445b4052..e2019442 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -60,7 +60,7 @@ LanceScript0: ; 5a305 (16:6305) call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, [wWhichTrade] ; $cd3d cp $3 jr nc, .asm_5a325 @@ -99,7 +99,7 @@ LanceScript2: ; 5a349 (16:6349) LanceScript_5a35b: ; 5a35b (16:635b) ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $ccd3 ld de, RLEList_5a379 call DecodeRLEList @@ -124,7 +124,7 @@ LanceScript3: ; 5a382 (16:6382) ret nz call Delay3 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_LANCECURSCRIPT], a ld [W_CURMAPSCRIPT], a ret diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index eb2da2bd..b102d271 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -63,8 +63,8 @@ LoreleiScript0: ; 761e2 (1d:61e2) call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [H_NEWLYPRESSEDBUTTONS], a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyPressed], a + ld [hJoyHeld], a ld [$ccd3], a ld [$cd38], a ld a, [wWhichTrade] ; $cd3d @@ -101,7 +101,7 @@ LoreleiScript3: ; 7622c (1d:622c) ret nz call Delay3 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_LORELEICURSCRIPT], a ld [W_CURMAPSCRIPT], a ret diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index adb73daf..97206711 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -52,7 +52,7 @@ Mansion1Script_Switches: ; 44316 (11:4316) cp $4 ret nz xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $4 ld [H_SPRITEHEIGHT], a jp DisplayTextID diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index e55ee4d3..0b3bd5ff 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -48,7 +48,7 @@ Mansion2Script_Switches: ; 52037 (14:6037) cp $4 ret nz xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $5 ld [H_SPRITEHEIGHT], a jp DisplayTextID diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index 06757e53..d06af9d2 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -78,7 +78,7 @@ Mansion3Script_Switches: ; 5227a (14:627a) cp $4 ret nz xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $6 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c jp DisplayTextID diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index d628baf2..039a1fd4 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -49,7 +49,7 @@ Mansion4Script_Switches: ; 52420 (14:6420) cp $4 ret nz xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $9 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c jp DisplayTextID diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 669d6fe4..81d5edd7 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -40,7 +40,7 @@ CoordsData_49d37: ; 49d37 (12:5d37) MtMoon3Script_49d58: ; 49d58 (12:5d58) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_MTMOON3CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -64,7 +64,7 @@ MtMoon3Script0: ; 49d6f (12:5d6f) cp $d jp nz, MtMoon3Script_49d91 xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $1 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c jp DisplayTextID @@ -84,7 +84,7 @@ MtMoon3Script3: ; 49d9a (12:5d9a) ld hl, $d7f6 set 1, [hl] xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $0 ld [W_MTMOON3CURSCRIPT], a ld [W_CURMAPSCRIPT], a @@ -136,7 +136,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb) bit 0, a ret nz ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $1 ld [$cc3c], a ld a, $a @@ -154,7 +154,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb) ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $0 ld [W_MTMOON3CURSCRIPT], a ld [W_CURMAPSCRIPT], a diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 04261346..94e9d410 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -23,7 +23,7 @@ Museum1FScript0: ; 5c10d (17:410d) ret nz .asm_5c120 xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $1 ld [$ff8c], a jp DisplayTextID @@ -73,7 +73,7 @@ Museum1FText1: ; 5c135 (17:4135) ld [$d125], a call DisplayTextBoxID xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld hl, Museum1FText_5c21f call PrintText call YesNoChoice diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 4f2ca054..62f02a9d 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -129,7 +129,7 @@ OaksLabScript4: ; 1cbd2 (7:4bd2) OaksLabScript5: ; 1cbfd (7:4bfd) ld a, $fc - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $11 ld [$ff8c], a call DisplayTextID @@ -148,7 +148,7 @@ OaksLabScript5: ; 1cbfd (7:4bfd) ld hl, $d74b set 1, [hl] xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $6 ld [W_OAKSLABCURSCRIPT], a @@ -271,7 +271,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) bit 0, a ret nz ld a, $fc - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $1 ld [$ff8c], a ld a, $4 @@ -313,7 +313,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld hl, $d74b set 2, [hl] xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $a ld [W_OAKSLABCURSCRIPT], a @@ -389,7 +389,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9) set 6, [hl] set 7, [hl] xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $8 ld [$d528], a ld a, $c @@ -398,7 +398,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9) OaksLabScript12: ; 1ce03 (7:4e03) ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $8 ld [$d528], a call UpdateSprites @@ -457,7 +457,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d) ld a, $11 call Predef xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a call Func_2307 ; reset to map music ld a, $12 ld [W_OAKSLABCURSCRIPT], a @@ -486,7 +486,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d) OaksLabScript15: ; 1ceb0 (7:4eb0) xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a call EnableAutoTextBoxDrawing ld a, $ff ld [$c0ee], a @@ -536,7 +536,7 @@ OaksLabScript16: ; 1cf12 (7:4f12) call EnableAutoTextBoxDrawing call Func_2307 ld a, $fc - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a call OaksLabScript_1cefd ld a, $16 ld [$ff8c], a @@ -629,7 +629,7 @@ OaksLabScript17: ; 1cfd4 (7:4fd4) ld a, $5 ld [W_PALLETTOWNCURSCRIPT], a xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $12 ld [W_OAKSLABCURSCRIPT], a @@ -925,7 +925,7 @@ asm_1d1e5: ; 1d1e5 (7:51e5) ld hl, $d72e set 3, [hl] ld a, $fc - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $8 ld [W_OAKSLABCURSCRIPT], a OaksLabMonChoiceEnd: ; 1d21f (7:521f) diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index e1b51cf6..4fa61c95 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -27,7 +27,7 @@ PalletTownScript0: ; 18e81 (6:4e81) cp 1 ; is player near north exit? ret nz xor a - ld [H_CURRENTPRESSEDBUTTONS],a + ld [hJoyHeld],a ld a,4 ld [$D528],a ld a,$FF @@ -37,7 +37,7 @@ PalletTownScript0: ; 18e81 (6:4e81) ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music call PlayMusic ; plays music ld a,$FC - ld [wJoypadForbiddenButtonsMask],a + ld [wJoyIgnore],a ld hl,$D74B set 7,[hl] @@ -53,7 +53,7 @@ PalletTownScript1: ; 18eb2 (6:4eb2) ld [$FF8C],a call DisplayTextID ld a,$FF - ld [wJoypadForbiddenButtonsMask],a + ld [wJoyIgnore],a ld a,0 ld [$CC4D],a ld a,$15 @@ -89,7 +89,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2) ld [$FF8C],a call MoveSprite ld a,$FF - ld [wJoypadForbiddenButtonsMask],a + ld [wJoyIgnore],a ; trigger the next script ld a,3 @@ -105,12 +105,12 @@ PalletTownScript3: ; 18f12 (6:4f12) ld a,1 ld [$CF0D],a ld a,$FC - ld [wJoypadForbiddenButtonsMask],a + ld [wJoyIgnore],a ld a,1 ld [$FF8C],a call DisplayTextID ld a,$FF - ld [wJoypadForbiddenButtonsMask],a + ld [wJoyIgnore],a ld a,1 ld [$CF13],a xor a diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index e738dedf..6c7dad16 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -29,7 +29,7 @@ PewterCityScript_1925e: ; 1925e (6:525e) call ArePlayerCoordsInArray ret nc ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $5 ld [$ff8c], a jp DisplayTextID @@ -102,7 +102,7 @@ PewterCityScript3: ; 192e9 (6:52e9) ld a, $15 call Predef xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $0 ld [W_PEWTERCITYCURSCRIPT], a ret @@ -168,7 +168,7 @@ PewterCityScript6: ; 1936f (6:536f) ld a, $15 call Predef xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $0 ld [W_PEWTERCITYCURSCRIPT], a ret diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 2ba001d4..e6dfdefa 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -24,7 +24,7 @@ Gym1LeaderName: ; 5c3b9 (17:43b9) PewterGymScript_5c3bf: ; 5c3bf (17:43bf) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_PEWTERGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -40,7 +40,7 @@ PewterGymScript3: ; 5c3d2 (17:43d2) cp $ff jp z, PewterGymScript_5c3bf ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a PewterGymScript_5c3df: ; 5c3df (17:43df) ld a, $4 diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index 4554413a..7a77befc 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -6,7 +6,7 @@ PokemonTower2Script: ; 604f2 (18:44f2) PokemonTower2Script_604fe: ; 604fe (18:44fe) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_POKEMONTOWER2CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -51,8 +51,8 @@ PokemonTower2Script0: ; 6050f (18:450f) ld [$ff8c], a call DisplayTextID xor a - ld [H_CURRENTPRESSEDBUTTONS], a - ld [H_NEWLYPRESSEDBUTTONS], a + ld [hJoyHeld], a + ld [hJoyPressed], a ret CoordsData_6055e: ; 6055e (18:455e) @@ -65,7 +65,7 @@ PokemonTower2Script1: ; 60563 (18:4563) cp $ff jp z, PokemonTower2Script_604fe ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d764 set 7, [hl] ld a, $1 @@ -104,7 +104,7 @@ PokemonTower2Script2: ; 605bb (18:45bb) ld a, $11 call Predef xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a call Func_2307 ld a, $0 ld [W_POKEMONTOWER2CURSCRIPT], a diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm index 5c43c7da..85cdee21 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/pokemontower5.asm @@ -27,9 +27,9 @@ PokemonTower5Script0: ; 6094b (18:494b) set 7, [hl] ret nz xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d72e set 4, [hl] ld a, $7 @@ -42,7 +42,7 @@ PokemonTower5Script0: ; 6094b (18:494b) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ret CoordsData_60992: ; 60992 (18:4992) diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index e3d8a4c4..2b61857f 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -9,7 +9,7 @@ PokemonTower6Script: ; 60aef (18:4aef) Func_60b02: ; 60b02 (18:4b02) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -29,7 +29,7 @@ PokemonTower6Script0: ; 60b17 (18:4b17) call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $6 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID @@ -50,13 +50,13 @@ PokemonTower6Script4: ; 60b48 (18:4b48) cp $ff jp z, Func_60b02 ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, [$d72d] bit 6, a ret nz call UpdateSprites ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, [$cf0b] and a jr nz, .asm_60b82 @@ -66,7 +66,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $0 ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_CURMAPSCRIPT], a diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 3e1fcccb..e2806f70 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -9,7 +9,7 @@ PokemonTower7Script: ; 60d05 (18:4d05) PokemonTower7Script_60d18: ; 60d18 (18:4d18) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_POKEMONTOWER7CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -29,7 +29,7 @@ PokemonTower7Script2: ; 60d23 (18:4d23) jp z, PokemonTower7Script_60d18 call EndTrainerBattle ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, [$cf13] ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID @@ -55,7 +55,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56) ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [$cf13], a ld [wTrainerHeaderFlagBit], a ld [$da38], a @@ -66,7 +66,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56) PokemonTower7Script4: ; 60d86 (18:4d86) ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $43 ld [$cc4d], a ld a, $11 diff --git a/scripts/redshouse2f.asm b/scripts/redshouse2f.asm index 1004860c..f11fc25e 100755 --- a/scripts/redshouse2f.asm +++ b/scripts/redshouse2f.asm @@ -10,7 +10,7 @@ RedsHouse2FScriptPointers: ; 5c0bc (17:40bc) RedsHouse2FScript0: ; 5c0c0 (17:40c0) xor a - ld [H_CURRENTPRESSEDBUTTONS],a + ld [hJoyHeld],a ld a,8 ld [$D528],a ld a,1 diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index ac427373..43207abd 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -28,7 +28,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42) ld a, (SFX_02_52 - SFX_Headers_02) / 3 call PlaySound ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $3 ld [W_CURMAPSCRIPT], a ret @@ -310,7 +310,7 @@ RocketHideout2Script3: ; 44fc2 (11:4fc2) and a jr nz, LoadSpinnerArrowTiles xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d736 res 7, [hl] ld a, $0 diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index d9e1d077..d70dac3f 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -28,7 +28,7 @@ RocketHideout3Script0: ; 45240 (11:5240) ld a, (SFX_02_52 - SFX_Headers_02) / 3 call PlaySound ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $3 ld [W_CURMAPSCRIPT], a ret @@ -140,7 +140,7 @@ RocketHideout3Script3 ; 452e4 (11:452e4) and a jp nz, LoadSpinnerArrowTiles xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d736 res 7, [hl] ld a, $0 diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 5e245e8d..3a8ed22b 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -36,7 +36,7 @@ RocketHideout4Script_45473: ; 45473 (11:5473) RocketHideout4Script_454a3: ; 454a3 (11:54a3) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_ROCKETHIDEOUT4CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -53,7 +53,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6) jp z, RocketHideout4Script_454a3 call UpdateSprites ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d81b set 7, [hl] ld a, $a @@ -71,7 +71,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6) call UpdateSprites call GBFadeOut1 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d126 set 5, [hl] ld a, $0 diff --git a/scripts/route12.asm b/scripts/route12.asm index 5bbdac3f..7d7ddff0 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -9,7 +9,7 @@ Route12Script: ; 595f3 (16:55f3) Route12Script_59606: ; 59606 (16:5606) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_ROUTE12CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret diff --git a/scripts/route16.asm b/scripts/route16.asm index 08739131..cddc99bb 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -9,7 +9,7 @@ Route16Script: ; 59933 (16:5933) Func_59946: ; 59946 (16:5946) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_ROUTE16CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret diff --git a/scripts/route16gate.asm b/scripts/route16gate.asm index 5131a1ff..ce1f6f3d 100755 --- a/scripts/route16gate.asm +++ b/scripts/route16gate.asm @@ -22,7 +22,7 @@ Route16GateScript0: ; 496d7 (12:56d7) ld [$ff8c], a call DisplayTextID xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, [$cd3d] cp $1 jr z, .asm_4970e ; 0x496f1 $1b @@ -55,7 +55,7 @@ Route16GateScript1: ; 4971d (12:571d) and a ret nz ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a Route16GateScript2: ; 49727 (12:5727) ld a, $1 @@ -75,7 +75,7 @@ Route16GateScript3: ; 49741 (12:5741) and a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d730 res 7, [hl] ld a, $0 diff --git a/scripts/route18gate.asm b/scripts/route18gate.asm index d55ed412..8ad85458 100755 --- a/scripts/route18gate.asm +++ b/scripts/route18gate.asm @@ -22,7 +22,7 @@ Route18GateScript0: ; 4988f (12:588f) ld [$ff8c], a call DisplayTextID xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, [$cd3d] cp $1 jr z, .asm_498c6 ; 0x498a9 $1b @@ -55,7 +55,7 @@ Route18GateScript1: ; 498d5 (12:58d5) and a ret nz ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a Route18GateScript2: ; 498df (12:58df) ld a, $1 @@ -75,7 +75,7 @@ Route18GateScript3: ; 498f9 (12:58f9) and a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d730 res 7, [hl] ld a, $0 diff --git a/scripts/route22.asm b/scripts/route22.asm index 75d10595..4fd93b3d 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -16,7 +16,7 @@ Route22ScriptPointers: ; 50ebe (14:4ebe) Route22Script_50ece: ; 50ece (14:4ece) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_ROUTE22CURSCRIPT], a Route22Script7: ; 50ed5 (14:4ed5) ret @@ -60,9 +60,9 @@ Route22Script0: ; 50f00 (14:4f00) ld a, [$cd3d] ld [$cf0d], a xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $2 ld [$d528], a ld a, [$d7eb] @@ -120,7 +120,7 @@ Route22Script1: ; 50f62 (14:4f62) ld [$ff8c], a call Func_34a6 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $1 ld [$ff8c], a call DisplayTextID @@ -161,7 +161,7 @@ Route22Script2: ; 50fb5 (14:4fb5) ld [$ff8c], a call Func_34a6 ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d7eb set 5, [hl] ld a, $1 @@ -205,7 +205,7 @@ Route22Script3: ; 5102a (14:502a) bit 0, a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $22 ld [$cc4d], a ld a, $11 @@ -264,7 +264,7 @@ Route22Script4: ; 51087 (14:5087) ld [$ff8d], a call Func_34a6 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $2 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID @@ -308,7 +308,7 @@ Route22Script5: ; 510df (14:50df) ld [$ff8d], a call Func_34a6 ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d7eb set 6, [hl] ld a, $2 @@ -352,7 +352,7 @@ Route22Script6: ; 51151 (14:5151) bit 0, a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $23 ld [$cc4d], a ld a, $11 diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index e445a358..7dd876e6 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -22,7 +22,7 @@ Route22GateScript0: ; 1e6a4 (7:66a4) call ArePlayerCoordsInArray ret nc xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $1 ld [$ff8c], a jp DisplayTextID @@ -38,7 +38,7 @@ Route22GateScript_1e6ba: ; 1e6ba (7:66ba) ld a, $80 ld [$ccd3], a ld [$c109], a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a jp Func_3486 Route22GateScript1: ; 1e6cd (7:66cd) @@ -46,7 +46,7 @@ Route22GateScript1: ; 1e6cd (7:66cd) and a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a call Delay3 ld a, $0 ld [W_ROUTE22GATECURSCRIPT], a diff --git a/scripts/route23.asm b/scripts/route23.asm index 19b22f04..28a811f7 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -64,7 +64,7 @@ Route23Script0: ; 51219 (14:5219) call Route23Script_5125d call DisplayTextID xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ret YCoordsData_51255: ; 51255 (14:5255) @@ -126,7 +126,7 @@ Route23Script_512d8: ; 512d8 (14:52d8) ld [$ccd3], a xor a ld [$c109], a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a jp Func_3486 Route23Script1: ; 512ec (14:52ec) diff --git a/scripts/route24.asm b/scripts/route24.asm index 0e77c6f7..46d528ec 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -9,7 +9,7 @@ Route24Script: ; 513ad (14:53ad) Route24Script_513c0: ; 513c0 (14:53c0) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_ROUTE24CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -29,7 +29,7 @@ Route24Script0: ; 513d5 (14:53d5) call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $1 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID @@ -66,14 +66,14 @@ Route24Script3: ; 51422 (14:5422) jp z, Route24Script_513c0 call UpdateSprites ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d7ef set 1, [hl] ld a, $1 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $0 ld [W_ROUTE24CURSCRIPT], a ld [W_CURMAPSCRIPT], a @@ -175,7 +175,7 @@ Route24Text1: ; 514a4 (14:54a4) call EngageMapTrainer call InitBattleEnemyParameters xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $3 ld [W_ROUTE24CURSCRIPT], a ld [W_CURMAPSCRIPT], a diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index ea5feda0..df714afb 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -25,7 +25,7 @@ Route5GateScript0: ; 1df50 (7:5f50) ld a, $2 ld [$d528], a xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a callba RemoveGuardDrink ld a, [$ff00+$db] and a @@ -56,7 +56,7 @@ Route5GateScript1: ; 1df94 (7:5f94) ret nz call Delay3 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_ROUTE5GATECURSCRIPT], a ret diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm index 22fe5ede..b0c12975 100755 --- a/scripts/route6gate.asm +++ b/scripts/route6gate.asm @@ -19,7 +19,7 @@ Route6GateScript0: ; 1e04e (7:604e) ld a, $1 ld [$d528], a xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a callba RemoveGuardDrink ld a, [$ffdb] and a @@ -48,7 +48,7 @@ Route6GateScript1: ; 1e091 (7:6091) ret nz call Delay3 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_ROUTE6GATECURSCRIPT], a ret diff --git a/scripts/route7gate.asm b/scripts/route7gate.asm index 5597c784..08e7bc4c 100755 --- a/scripts/route7gate.asm +++ b/scripts/route7gate.asm @@ -31,7 +31,7 @@ Route7GateScript0: ; 1e128 (7:6128) ld a, $8 ld [$d528], a xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a callba RemoveGuardDrink ld a, [$ffdb] and a @@ -62,7 +62,7 @@ Route7GateScript1: ; 1e16c (7:616c) ret nz call Delay3 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_ROUTE7GATECURSCRIPT], a ld [W_CURMAPSCRIPT], a ret diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm index 426b532e..0dfa1e78 100755 --- a/scripts/route8gate.asm +++ b/scripts/route8gate.asm @@ -30,7 +30,7 @@ Route8GateScript0: ; 1e1ee (7:61ee) ld a, $2 ld [$d528], a xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a callba RemoveGuardDrink ld a, [$ffdb] and a @@ -60,7 +60,7 @@ Route8GateScript1: ; 1e231 (7:6231) ret nz call Delay3 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_ROUTE8GATECURSCRIPT], a ret diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index d1bc0d37..ebb3b300 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -21,9 +21,9 @@ SafariZoneEntranceScript0: ; 751e7 (1d:51e7) ld [$ff8c], a call DisplayTextID ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $c ld [$c109], a ld a, [$cd3d] @@ -37,7 +37,7 @@ SafariZoneEntranceScript0: ; 751e7 (1d:51e7) ld c, $1 call SafariZoneEntranceScript_752a3 ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $1 ld [W_SAFARIZONEENTRANCECURSCRIPT], a ret @@ -52,21 +52,21 @@ SafariZoneEntranceScript1: ; 75226 (1d:5226) ret nz SafariZoneEntranceScript2: ; 7522a (1d:522a) xor a - ld [H_CURRENTPRESSEDBUTTONS], a - ld [wJoypadForbiddenButtonsMask], a + ld [hJoyHeld], a + ld [wJoyIgnore], a call UpdateSprites ld a, $4 ld [$ff8c], a call DisplayTextID ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ret SafariZoneEntranceScript3: ; 75240 (1d:5240) call SafariZoneEntranceScript_752b4 ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $5 ld [W_SAFARIZONEENTRANCECURSCRIPT], a ret @@ -81,7 +81,7 @@ SafariZoneEntranceScript5: ; 7524e (1d:524e) res 7, [hl] call UpdateSprites ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $6 ld [$ff8c], a call DisplayTextID @@ -104,7 +104,7 @@ SafariZoneEntranceScript4: ; 75287 (1d:5287) call SafariZoneEntranceScript_752b4 ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $0 ld [W_SAFARIZONEENTRANCECURSCRIPT], a ret diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 40482831..6d56c19d 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -24,7 +24,7 @@ Gym6LeaderName: ; 5d040 (17:5040) SaffronGymText_5d048: ; 5d048 (17:5048) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_SAFFRONGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -40,7 +40,7 @@ SaffronGymScript3: ; 5d05b (17:505b) cp $ff jp z, SaffronGymText_5d048 ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a SaffronGymText_5d068: ; 5d068 (17:5068) ld a, $a diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm index 153a1bb6..3ddff929 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/seafoamislands5.asm @@ -7,7 +7,7 @@ SeafoamIslands5Script: ; 46799 (11:6799) SeafoamIslands5Script_467a5: ; 467a5 (11:67a5) xor a ld [W_SEAFOAMISLANDS5CURSCRIPT], a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ret SeafoamIslands5ScriptPointers: ; 467ad (11:67ad) @@ -66,7 +66,7 @@ SeafoamIslands5Script1: ; 46807 (11:6807) and a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $0 ld [W_SEAFOAMISLANDS5CURSCRIPT], a ret diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index f24c6774..d4bd6ba0 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -110,7 +110,7 @@ MissableObjectIDs_6219b: ; 6219b (18:619b) SilphCo11Script_621c4: ; 621c4 (18:61c4) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a SilphCo11Script_621c8: ; 621c8 (18:61c8) ld [W_SILPHCO11CURSCRIPT], a @@ -135,9 +135,9 @@ SilphCo11Script0: ; 621db (18:61db) ld a, [wWhichTrade] ; $cd3d ld [$cf0d], a xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $3 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID @@ -181,7 +181,7 @@ SilphCo11Script5: ; 62227 (18:6227) .asm_62240 call SilphCo11Script_6221a ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $6 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID @@ -193,7 +193,7 @@ SilphCo11Script5: ; 62227 (18:6227) ld hl, $d838 set 7, [hl] xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a jp SilphCo11Script_621c8 SilphCo11Script3: ; 6226a (18:626a) @@ -230,7 +230,7 @@ SilphCo11Script4: ; 62293 (18:6293) call EngageMapTrainer call InitBattleEnemyParameters xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $5 jp SilphCo11Script_621c8 diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index d1c1bdb6..6e3b81aa 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -104,7 +104,7 @@ SilphCo7Text_51bf4: ; 51bf4 (14:5bf4) SilphCo7Text_51c0c: ; 51c0c (14:5c0c) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a SilphCo7Text_51c10: ; 51c10 (14:5c10) ld [W_SILPHCO7CURSCRIPT], a @@ -127,9 +127,9 @@ SilphCo7Script0: ; 51c23 (14:5c23) call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $4 ld [$d528], a ld a, $ff @@ -170,7 +170,7 @@ SilphCo7Script3: ; 51c82 (14:5c82) bit 0, a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $d ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID @@ -205,7 +205,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) cp $ff jp z, SilphCo7Text_51c0c ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d82f set 0, [hl] ld a, $4 @@ -250,7 +250,7 @@ SilphCo7Script5: ; 51d25 (14:5d25) call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) call Func_2307 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a jp SilphCo7Text_51c10 SilphCo7TextPointers: ; 51d3f (14:5d3f) diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index 449dab83..b8f53b2b 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -6,7 +6,7 @@ SSAnne2Script: ; 6139f (18:539f) SSAnne2Script_613ab: ; 613ab (18:53ab) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_SSANNE2CURSCRIPT], a ret @@ -41,9 +41,9 @@ SSAnne2Script0: ; 613be (18:53be) ld [$ff8c], a call SetSpriteMovementBytesToFF xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, [$ffdb] cp $2 jr nz, .asm_61400 ; 0x613f9 $5 @@ -88,7 +88,7 @@ SSAnne2Script1: ; 61430 (18:5430) ret nz call SSAnne2Script_61416 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $2 ld [$ff8c], a call DisplayTextID @@ -123,7 +123,7 @@ SSAnne2Script2: ; 6146d (18:546d) jp z, SSAnne2Script_613ab call SSAnne2Script_61416 ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $3 ld [$ff8c], a call DisplayTextID @@ -160,7 +160,7 @@ SSAnne2Script3: ; 614be (18:54be) bit 0, a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $71 ld [$cc4d], a ld a, $11 diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 3298221f..62fd9fce 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -46,7 +46,7 @@ VermilionCityScript0: ; 197e6 (6:57e6) call ArePlayerCoordsInArray ret nc xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld [$cf0d], a ld a, $3 ld [$ff8c], a @@ -84,7 +84,7 @@ VermilionCityScript4: ; 19826 (6:5826) VermilionCityScript2: ; 19833 (6:5833) ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $40 ld [$ccd3], a ld [$ccd4], a @@ -100,8 +100,8 @@ VermilionCityScript3: ; 1984e (6:584e) and a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [wJoyIgnore], a + ld [hJoyHeld], a ld a, $0 ld [W_VERMILIONCITYCURSCRIPT], a ret diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index 164abe7c..a490f61d 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -25,7 +25,7 @@ VermilionDockScript: ; 1db52 (7:5b52) ld [$c206], a ld [$cd3b], a dec a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ret .asm_1db8d bit 5, [hl] @@ -33,14 +33,14 @@ VermilionDockScript: ; 1db52 (7:5b52) ld a, [$cd38] and a ret nz - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a set 5, [hl] ret VermilionDock_1db9b: ; 1db9b (7:5b9b) set 2, [hl] ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [$c0ee], a call PlaySound ld c, BANK(Music_Surfing) diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index de3678dd..2da613f9 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -45,7 +45,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_VERMILIONGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -61,7 +61,7 @@ VermilionGymScript3: ; 5ca9d (17:4a9d) cp $ff jp z, VermilionGymScript_5ca8a ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a VermilionGymScript_5caaa: ; 5caaa (17:4aaa) ld a, $6 diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index 4bb04ba7..541bb76d 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -35,7 +35,7 @@ ViridianCityScript_1900b: ; 1900b (6:500b) ld [$ff8c], a call DisplayTextID xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a call ViridianCityScript_190cf ld a, $3 ld [W_VIRIDIANCITYCURSCRIPT], a @@ -55,7 +55,7 @@ ViridianCityScript_1903d: ; 1903d (6:503d) ld [$ff8c], a call DisplayTextID xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a call ViridianCityScript_190cf ld a, $3 ld [W_VIRIDIANCITYCURSCRIPT], a @@ -96,13 +96,13 @@ ViridianCityScript2: ; 1908f (6:508f) call UpdateSprites call Delay3 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $f ld [$ff8c], a call DisplayTextID xor a ld [W_BATTLETYPE], a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $0 ld [W_VIRIDIANCITYCURSCRIPT], a ret @@ -124,7 +124,7 @@ ViridianCityScript_190cf: ; 190cf (6:50cf) ld [$ccd3], a xor a ld [$c109], a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ret ViridianCityTextPointers: ; 190e4 (6:50e4) diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 0f042339..9639140f 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -17,7 +17,7 @@ Gym8LeaderName: ; 748cd (1d:48cd) ViridianGymScript_748d6: ; 748d6 (1d:48d6) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_VIRIDIANGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -44,7 +44,7 @@ ViridianGymScript0: ; 748eb (1d:48eb) ld a, (SFX_02_52 - SFX_Headers_02) / 3 call PlaySound ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $4 ld [W_CURMAPSCRIPT], a ret @@ -125,7 +125,7 @@ ViridianGymScript4: ; 7496b (1d:496b) and a jr nz, .asm_74980 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d736 res 7, [hl] ld a, $0 @@ -141,7 +141,7 @@ ViridianGymScript3: ; 74988 (1d:4988) cp $ff jp z, ViridianGymScript_748d6 ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ViridianGymScript3_74995: ; 74995 (1d:4995) ld a, $c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c -- cgit v1.2.3 From 4be11293e5c7d6bf4a2fc374974545a21a5e3572 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 25 May 2014 17:27:02 -0700 Subject: Label BCD math predefs. --- scripts/celadongamecorner.asm | 10 +++++----- scripts/daycarem.asm | 4 ++-- scripts/mtmoonpokecenter.asm | 2 +- scripts/museum1f.asm | 2 +- scripts/safarizoneentrance.asm | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'scripts') diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index be0a04fb..19b920c9 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -157,7 +157,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9) ld hl, $ffa1 ld de, $d349 ld c, $3 - ld a, $c + ld a, $c ; SubtractBCDPredef call Predef xor a ldh [$9f], a @@ -167,7 +167,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9) ld de, $d5a5 ld hl, $ffa1 ld c, $2 - ld a, $b + ld a, $b ; AddBCDPredef call Predef call CeladonGameCornerScript_48f1e ld hl, CeladonGameCornerText_48d27 @@ -236,7 +236,7 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a) ld de, $d5a5 ld hl, $ffa1 ld c, $2 - ld a, $b + ld a, $b ; AddBCDPredef call Predef ld hl, $d77e set 2, [hl] @@ -319,7 +319,7 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9) ld de, $d5a5 ld hl, $ffa1 ld c, $2 - ld a, $b + ld a, $b ; AddBCDPredef call Predef ld hl, $d77e set 4, [hl] @@ -373,7 +373,7 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b) ld de, $d5a5 ld hl, $ffa1 ld c, $2 - ld a, $b + ld a, $b ; AddBCDPredef call Predef ld hl, $d77e set 3, [hl] diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 706a7bbf..96cff2ea 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -120,7 +120,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) push hl push de push bc - ld a, $b + ld a, $b ; AddBCDPredef call Predef pop bc pop de @@ -156,7 +156,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) inc hl ld de, $d349 ld c, $3 - ld a, $c + ld a, $c ; SubtractBCDPredef call Predef ld a, (SFX_02_5a - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index 01272c30..0b612310 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -55,7 +55,7 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) ld hl, $cd3f ld de, $d349 ld c, $3 - ld a, $c + ld a, $c ; SubtractBCDPredef call Predef ld a, $13 ld [$d125], a diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 94e9d410..b282b67c 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -103,7 +103,7 @@ Museum1FText1: ; 5c135 (17:4135) ld hl, $cd3f ld de, $d349 ld c, $3 - ld a, $c + ld a, $c ; SubtractBCDPredef call Predef ld a, $13 ld [$d125], a diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index ebb3b300..d02bbd48 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -176,7 +176,7 @@ SafariZoneEntranceText4: ; 752ca (1d:52ca) ld hl, $cd3f ld de, $d349 ld c, $3 - ld a, $c + ld a, $c ; SubtractBCDPredef call Predef ld a, $13 ld [$d125], a -- cgit v1.2.3 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. --- scripts/agatha.asm | 28 ++--- scripts/battlecenterm.asm | 10 +- scripts/bikeshop.asm | 28 ++--- scripts/billshouse.asm | 30 +++--- scripts/blueshouse.asm | 10 +- scripts/bruno.asm | 28 ++--- scripts/celadoncity.asm | 8 +- scripts/celadondiner.asm | 4 +- scripts/celadongamecorner.asm | 78 +++++++------- scripts/celadongym.asm | 38 +++---- scripts/celadonmansion3.asm | 4 +- scripts/celadonmansion5.asm | 2 +- scripts/celadonmart3.asm | 4 +- scripts/celadonmartelevator.asm | 14 +-- scripts/celadonmartroof.asm | 58 +++++------ scripts/ceruleancity.asm | 44 ++++---- scripts/ceruleancity2.asm | 6 +- scripts/ceruleangym.asm | 26 ++--- scripts/ceruleanhouse2.asm | 16 +-- scripts/cinnabargym.asm | 68 ++++++------ scripts/cinnabarisland.asm | 16 +-- scripts/copycatshouse2f.asm | 8 +- scripts/daycarem.asm | 40 +++---- scripts/fanclub.asm | 18 ++-- scripts/fightingdojo.asm | 68 ++++++------ scripts/fuchsiacity.asm | 2 +- scripts/fuchsiagym.asm | 36 +++---- scripts/fuchsiahouse2.asm | 10 +- scripts/fuchsiahouse3.asm | 6 +- scripts/gary.asm | 34 +++--- scripts/halloffameroom.asm | 18 ++-- scripts/indigoplateaulobby.asm | 8 +- scripts/lab3.asm | 4 +- scripts/lab4.asm | 18 ++-- scripts/lance.asm | 28 ++--- scripts/lavenderhouse1.asm | 8 +- scripts/lavenderhouse2.asm | 2 +- scripts/lavendermart.asm | 2 +- scripts/lavendertown.asm | 2 +- scripts/lorelei.asm | 30 +++--- scripts/mansion1.asm | 20 ++-- scripts/mansion2.asm | 18 ++-- scripts/mansion3.asm | 26 ++--- scripts/mansion4.asm | 10 +- scripts/mtmoon1.asm | 14 +-- scripts/mtmoon3.asm | 56 +++++----- scripts/mtmoonpokecenter.asm | 18 ++-- scripts/museum1f.asm | 38 +++---- scripts/namerater.asm | 12 +-- scripts/oakslab.asm | 212 +++++++++++++++++++------------------- scripts/pallettown.asm | 56 +++++----- scripts/pewtercity.asm | 48 ++++----- scripts/pewtergym.asm | 32 +++--- scripts/pewtermart.asm | 2 +- scripts/pewterpokecenter.asm | 22 ++-- scripts/pokemontower2.asm | 28 ++--- scripts/pokemontower3.asm | 6 +- scripts/pokemontower4.asm | 6 +- scripts/pokemontower5.asm | 16 +-- scripts/pokemontower6.asm | 32 +++--- scripts/pokemontower7.asm | 46 ++++----- scripts/powerplant.asm | 18 ++-- scripts/redshouse1f.asm | 12 +-- scripts/redshouse2f.asm | 2 +- scripts/rockethideout1.asm | 20 ++-- scripts/rockethideout2.asm | 16 +-- scripts/rockethideout3.asm | 10 +- scripts/rockethideout4.asm | 32 +++--- scripts/rockethideoutelevator.asm | 14 +-- scripts/rocktunnel1.asm | 14 +-- scripts/rocktunnel2.asm | 16 +-- scripts/route1.asm | 2 +- scripts/route10.asm | 12 +-- scripts/route11.asm | 20 ++-- scripts/route11gateupstairs.asm | 12 +-- scripts/route12.asm | 28 ++--- scripts/route12gateupstairs.asm | 8 +- scripts/route12house.asm | 6 +- scripts/route13.asm | 20 ++-- scripts/route14.asm | 20 ++-- scripts/route15.asm | 20 ++-- scripts/route15gateupstairs.asm | 10 +- scripts/route16.asm | 26 ++--- scripts/route16gate.asm | 20 ++-- scripts/route16house.asm | 4 +- scripts/route17.asm | 20 ++-- scripts/route18.asm | 6 +- scripts/route18gate.asm | 20 ++-- scripts/route19.asm | 20 ++-- scripts/route20.asm | 30 +++--- scripts/route21.asm | 18 ++-- scripts/route22.asm | 94 ++++++++--------- scripts/route22gate.asm | 8 +- scripts/route23.asm | 34 +++--- scripts/route24.asm | 38 +++---- scripts/route25.asm | 30 +++--- scripts/route2gate.asm | 10 +- scripts/route3.asm | 16 +-- scripts/route4.asm | 2 +- scripts/route5gate.asm | 16 +-- scripts/route6.asm | 12 +-- scripts/route6gate.asm | 18 ++-- scripts/route7gate.asm | 18 ++-- scripts/route8.asm | 18 ++-- scripts/route8gate.asm | 18 ++-- scripts/route9.asm | 18 ++-- scripts/safarizoneentrance.asm | 52 +++++----- scripts/safarizonesecrethouse.asm | 4 +- scripts/saffrongym.asm | 40 +++---- scripts/saffronhouse2.asm | 4 +- scripts/seafoamislands1.asm | 24 ++--- scripts/seafoamislands2.asm | 22 ++-- scripts/seafoamislands3.asm | 22 ++-- scripts/seafoamislands4.asm | 44 ++++---- scripts/seafoamislands5.asm | 28 ++--- scripts/silphco1.asm | 6 +- scripts/silphco10.asm | 14 +-- scripts/silphco11.asm | 46 ++++----- scripts/silphco2.asm | 26 ++--- scripts/silphco3.asm | 16 +-- scripts/silphco4.asm | 20 ++-- scripts/silphco5.asm | 20 ++-- scripts/silphco6.asm | 16 +-- scripts/silphco7.asm | 72 ++++++------- scripts/silphco8.asm | 20 ++-- scripts/silphco9.asm | 26 ++--- scripts/silphcoelevator.asm | 14 +-- scripts/ssanne10.asm | 12 +-- scripts/ssanne2.asm | 22 ++-- scripts/ssanne5.asm | 4 +- scripts/ssanne7.asm | 26 ++--- scripts/ssanne8.asm | 8 +- scripts/ssanne9.asm | 12 +-- scripts/unknowndungeon3.asm | 2 +- scripts/vermilioncity.asm | 32 +++--- scripts/vermiliondock.asm | 56 +++++----- scripts/vermiliongym.asm | 34 +++--- scripts/vermilionhouse2.asm | 6 +- scripts/victoryroad1.asm | 16 +-- scripts/victoryroad2.asm | 28 ++--- scripts/victoryroad3.asm | 36 +++---- scripts/viridiancity.asm | 42 ++++---- scripts/viridianforest.asm | 6 +- scripts/viridiangym.asm | 60 +++++------ scripts/viridianmart.asm | 10 +- 145 files changed, 1677 insertions(+), 1677 deletions(-) (limited to 'scripts') diff --git a/scripts/agatha.asm b/scripts/agatha.asm index eb0e21d6..ec6f35c6 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -9,11 +9,11 @@ AgathaScript: ; 7642d (1d:642d) ret AgathaScript_76443: ; 76443 (1d:6443) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z - ld a, [$d865] + ld a, [wd865] bit 1, a jr z, .asm_76457 ld a, $e @@ -22,7 +22,7 @@ AgathaScript_76443: ; 76443 (1d:6443) ld a, $3b AgathaScript_76459: ; 76459 (1d:6459) - ld [$d09f], a + ld [wd09f], a ld bc, $2 ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -42,7 +42,7 @@ AgathaScriptPointers: ; 76469 (1d:6469) AgathaScript4: ; 76473 (1d:6473) ret asm_76474: ; 76474 (1d:6474) - ld hl, $ccd3 + ld hl, wccd3 ld a, $40 ld [hli], a ld [hli], a @@ -51,7 +51,7 @@ asm_76474: ; 76474 (1d:6474) ld [hli], a ld [hl], a ld a, $6 - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $3 ld [W_AGATHACURSCRIPT], a @@ -65,12 +65,12 @@ AgathaScript0: ; 76490 (1d:6490) xor a ld [hJoyPressed], a ld [hJoyHeld], a - ld [$ccd3], a - ld [$cd38], a - ld a, [wWhichTrade] ; $cd3d + ld [wccd3], a + ld [wcd38], a + ld a, [wWhichTrade] ; wWhichTrade cp $3 jr c, .asm_764b4 - ld hl, $d865 + ld hl, wd865 bit 6, [hl] set 6, [hl] jr z, asm_76474 @@ -79,9 +79,9 @@ AgathaScript0: ; 76490 (1d:6490) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID ld a, $40 - ld [$ccd3], a + ld [wccd3], a ld a, $1 - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $3 ld [W_AGATHACURSCRIPT], a @@ -96,7 +96,7 @@ CoordsData_764d1: ; 764d1 (1d:64d1) db $FF AgathaScript3: ; 764da (1d:64da) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 @@ -108,7 +108,7 @@ AgathaScript3: ; 764da (1d:64da) AgathaScript2: ; 764ed (1d:64ed) call EndTrainerBattle - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, AgathaScript_76464 ld a, $1 @@ -126,7 +126,7 @@ AgathaTrainerHeaders: ; 76509 (1d:6509) AgathaTrainerHeader0: ; 76509 (1d:6509) db $1 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d865 ; flag's byte + dw wd865 ; flag's byte dw AgathaBeforeBattleText ; 0x6520 TextBeforeBattle dw AgathaAfterBattleText ; 0x652a TextAfterBattle dw AgathaEndBattleText ; 0x6525 TextEndBattle diff --git a/scripts/battlecenterm.asm b/scripts/battlecenterm.asm index 846b78fb..b65380d2 100755 --- a/scripts/battlecenterm.asm +++ b/scripts/battlecenterm.asm @@ -10,24 +10,24 @@ BattleCenterMScript: ; 4fd10 (13:7d10) ld a, $1 ld [$ff8c], a call Func_34ae - ld hl, $d72d + ld hl, wd72d bit 0, [hl] set 0, [hl] ret nz - ld hl, $c214 + ld hl, wSpriteStateData2 + $14 ld a, $8 ld [hli], a ld a, $a ld [hl], a ld a, $8 - ld [$c119], a + ld [wSpriteStateData1 + $19], a ld a, [$ffaa] cp $2 ret z ld a, $7 - ld [$c215], a + ld [wSpriteStateData2 + $15], a ld a, $c - ld [$c119], a + ld [wSpriteStateData1 + $19], a ret BattleCenterMTextPointers: ; 4fd4c (13:7d4c) diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index 75714dbc..c30829e9 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -8,7 +8,7 @@ BikeShopTextPointers: ; 1d73f (7:573f) BikeShopText1: ; 1d745 (7:5745) db $08 ; asm - ld a, [$d75f] + ld a, [wd75f] bit 0, a jr z, .asm_260d4 ; 0x1d74b ld hl, BikeShopText_1d82f @@ -26,7 +26,7 @@ BikeShopText1: ; 1d745 (7:5745) ld a, BIKE_VOUCHER ldh [$db], a callba RemoveItemByID - ld hl, $d75f + ld hl, wd75f set 0, [hl] ld hl, BikeShopText_1d824 call PrintText @@ -39,28 +39,28 @@ BikeShopText1: ; 1d745 (7:5745) ld hl, BikeShopText_1d810 call PrintText xor a - ld [$cc26], a - ld [$cc2a], a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a ld a, $3 - ld [$cc29], a + ld [wMenuWatchedKeys], a ld a, $1 - ld [$cc28], a + ld [wMaxMenuItem], a ld a, $2 - ld [$cc24], a + ld [wTopMenuItemY], a ld a, $1 - ld [$cc25], a - ld hl, $d730 + ld [wTopMenuItemX], a + ld hl, wd730 set 6, [hl] ld hl, wTileMap ld b, $4 ld c, $f call TextBoxBorder call UpdateSprites - FuncCoord 2, 2 ; $c3ca + FuncCoord 2, 2 ld hl, Coord ld de, BikeShopMenuText call PlaceString - FuncCoord 8, 3 ; $c3e4 + FuncCoord 8, 3 ld hl, Coord ld de, BikeShopMenuPrice call PlaceString @@ -69,9 +69,9 @@ BikeShopText1: ; 1d745 (7:5745) call HandleMenuInput bit 1, a jr nz, .asm_b7579 ; 0x1d7dc - ld hl, $d730 + ld hl, wd730 res 6, [hl] - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_b7579 ; 0x1d7e7 ld hl, BikeShopText_1d81a @@ -133,7 +133,7 @@ BikeShopText_1d843: ; 1d843 (7:5843) BikeShopText3: ; 1d848 (7:5848) db $08 ; asm - ld a, [$d75f] + ld a, [wd75f] bit 0, a ld hl, BikeShopText_1d861 jr nz, .asm_34d2d ; 0x1d851 diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index 846e47ff..1e5d1555 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -16,7 +16,7 @@ BillsHouseScript0: ; 1e782 (7:6782) ret BillsHouseScript1: ; 1e783 (7:6783) - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] and a ld de, MovementData_1e79c jr nz, .asm_1e78f ; 0x1e78a $3 @@ -36,14 +36,14 @@ MovementData_1e7a0: ; 1e7a0 (7:67a0) db $C0,$40,$40,$80,$40,$FF BillsHouseScript2: ; 1e7a6 (7:67a6) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $61 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef - ld hl, $d7f2 + ld hl, wd7f2 set 6, [hl] xor a ld [wJoyIgnore], a @@ -52,13 +52,13 @@ BillsHouseScript2: ; 1e7a6 (7:67a6) ret BillsHouseScript3: ; 1e7c5 (7:67c5) - ld a, [$d7f2] + ld a, [wd7f2] bit 3, a ret z ld a, $f0 ld [wJoyIgnore], a ld a, $2 - ld [$cf13], a + ld [wcf13], a ld a, $c ld [$ffeb], a ld a, $40 @@ -69,7 +69,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5) ld [$ffee], a call Func_32f9 ld a, $62 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef ld c, $8 @@ -86,14 +86,14 @@ MovementData_1e807: ; 1e807 (7:6807) db $00,$C0,$C0,$C0,$00,$FF BillsHouseScript4: ; 1e80d (7:680d) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz xor a ld [wJoyIgnore], a - ld hl, $d7f2 + ld hl, wd7f2 set 5, [hl] - ld hl, $d7f1 + ld hl, wd7f1 set 0, [hl] ld a, $0 ld [W_BILLSHOUSECURSCRIPT], a @@ -121,7 +121,7 @@ BillsHouseText1: ; 1e83d (7:683d) ld hl, BillsHouseText_1e865 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, asm_6b196 ; 0x1e84b $d asm_4d03c: ; 1e84d (7:684d) @@ -151,7 +151,7 @@ BillsHouseText_1e86f: ; 1e86f (7:686f) BillsHouseText2: ; 1e874 (7:6874) db $08 ; asm - ld a, [$d7f2] + ld a, [wd7f2] bit 4, a jr nz, .asm_5491f ; 0x1e87a ld hl, BillThankYouText @@ -161,14 +161,14 @@ BillsHouseText2: ; 1e874 (7:6874) jr nc, .BagFull ld hl, SSTicketReceivedText call PrintText - ld hl, $d7f2 + ld hl, wd7f2 set 4, [hl] ld a, $7 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef ld a, $9 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef .asm_5491f ; 0x1e8a9 diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 1699160f..1055f47a 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -9,7 +9,7 @@ BluesHouseScriptPointers: ; 19b47 (6:5b47) dw BluesHouseScript1 BluesHouseScript0: ; 19b4b (6:5b4b) - ld hl,$D74A + ld hl,wd74a set 1,[hl] ; trigger the next script @@ -27,10 +27,10 @@ BluesHouseTextPointers: ; 19b57 (6:5b57) BluesHouseText1: ; 19b5d (6:5b5d) db 8 - ld a,[$D74A] + ld a,[wd74a] bit 0,a jr nz,.GotMap - ld a,[$D74B] + ld a,[wd74b] bit 5,a jr nz,.GiveMap ld hl,DaisyInitialText @@ -43,12 +43,12 @@ BluesHouseText1: ; 19b5d (6:5b5d) call GiveItem jr nc, .BagFull ld a,$29 - ld [$CC4D],a + ld [wcc4d],a ld a,$11 call Predef ; hide table map object ld hl,GotMapText call PrintText - ld hl,$D74A + ld hl,wd74a set 0,[hl] jr .done .GotMap diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 8f9368d6..9d10c568 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -9,11 +9,11 @@ BrunoScript: ; 762d6 (1d:62d6) ret BrunoScript_762ec: ; 762ec (1d:62ec) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z - ld a, [$d864] + ld a, [wd864] bit 1, a jr z, .asm_76300 ld a, $5 @@ -22,7 +22,7 @@ BrunoScript_762ec: ; 762ec (1d:62ec) ld a, $24 BrunoScript_76302: ; 76302 (1d:6302) - ld [$d09f], a + ld [wd09f], a ld bc, $2 ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -42,7 +42,7 @@ BrunoScriptPointers: ; 76312 (1d:6312) BrunoScript4: ; 7631c (1d:631c) ret asm_7631d: ; 7631d (1d:631d) - ld hl, $ccd3 + ld hl, wccd3 ld a, $40 ld [hli], a ld [hli], a @@ -51,7 +51,7 @@ asm_7631d: ; 7631d (1d:631d) ld [hli], a ld [hl], a ld a, $6 - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $3 ld [W_BRUNOCURSCRIPT], a @@ -65,12 +65,12 @@ BrunoScript0: ; 76339 (1d:6339) xor a ld [hJoyPressed], a ld [hJoyHeld], a - ld [$ccd3], a - ld [$cd38], a - ld a, [wWhichTrade] ; $cd3d + ld [wccd3], a + ld [wcd38], a + ld a, [wWhichTrade] ; wWhichTrade cp $3 jr c, .asm_7635d - ld hl, $d864 + ld hl, wd864 bit 6, [hl] set 6, [hl] jr z, asm_7631d @@ -79,9 +79,9 @@ BrunoScript0: ; 76339 (1d:6339) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID ld a, $40 - ld [$ccd3], a + ld [wccd3], a ld a, $1 - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $3 ld [W_BRUNOCURSCRIPT], a @@ -96,7 +96,7 @@ CoordsData_7637a: ; 7637a (1d:637a) db $FF BrunoScript3: ; 76383 (1d:6383) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 @@ -108,7 +108,7 @@ BrunoScript3: ; 76383 (1d:6383) BrunoScript2: ; 76396 (1d:6396) call EndTrainerBattle - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, BrunoScript_7630d ld a, $1 @@ -123,7 +123,7 @@ BrunoTrainerHeaders: ; 763ac (1d:63ac) BrunoTrainerHeader0: ; 763ac (1d:63ac) db $1 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d864 ; flag's byte + dw wd864 ; flag's byte dw BrunoBeforeBattleText ; 0x63c3 TextBeforeBattle dw BrunoAfterBattleText ; 0x63cd TextAfterBattle dw BrunoEndBattleText ; 0x63c8 TextEndBattle diff --git a/scripts/celadoncity.asm b/scripts/celadoncity.asm index 2f2a3128..004d8773 100755 --- a/scripts/celadoncity.asm +++ b/scripts/celadoncity.asm @@ -1,9 +1,9 @@ CeladonCityScript: ; 19956 (6:5956) call EnableAutoTextBoxDrawing - ld hl, $d77e + ld hl, wd77e res 0, [hl] res 7, [hl] - ld hl, $d816 + ld hl, wd816 res 7, [hl] ret @@ -45,7 +45,7 @@ CeladonCityText4: ; 19999 (6:5999) CeladonCityText5: ; 1999e (6:599e) db $08 ; asm - ld a, [$d777] + ld a, [wd777] bit 0, a jr nz, .asm_7053f ; 0x199a4 ld hl, TM41PreText @@ -59,7 +59,7 @@ CeladonCityText5: ; 1999e (6:599e) .Success ld hl, ReceivedTM41Text call PrintText - ld hl, $d777 + ld hl, wd777 set 0, [hl] jr .Done .asm_7053f ; 0x199c9 diff --git a/scripts/celadondiner.asm b/scripts/celadondiner.asm index 06cce8fd..5ae89022 100755 --- a/scripts/celadondiner.asm +++ b/scripts/celadondiner.asm @@ -27,7 +27,7 @@ CeladonDinerText4: ; 4916e (12:516e) CeladonDinerText5: ; 49173 (12:5173) db $08 ; asm - ld a, [$d783] + ld a, [wd783] bit 0, a jr nz, .asm_eb14d ; 0x49179 ld hl, CeladonDinerText_491a7 @@ -35,7 +35,7 @@ CeladonDinerText5: ; 49173 (12:5173) ld bc, (COIN_CASE << 8) | 1 call GiveItem jr nc, .BagFull - ld hl, $d783 + ld hl, wd783 set 0, [hl] ld hl, ReceivedCoinCaseText call PrintText diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 19b920c9..039abe42 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -7,7 +7,7 @@ CeladonGameCornerScript: ; 48bbd (12:4bbd) jp CallFunctionInTable CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) - ld hl, $d126 + ld hl, wd126 bit 6, [hl] res 6, [hl] ret z @@ -20,19 +20,19 @@ CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) srl a srl a srl a - ld [$cd05], a + ld [wcd05], a ret CeladonGameCornerScript_48bec: ; 48bec (12:4bec) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z - ld a, [$d77e] + ld a, [wd77e] bit 1, a ret nz ld a, $2a - ld [$d09f], a + ld [wd09f], a ld bc, $0208 ld a, $17 jp Predef @@ -90,16 +90,16 @@ MovementData_48c63: ; 48c63 (12:4c63) db $C0,$C0,$C0,$C0,$C0,$FF CeladonGameCornerScript2: ; 48c69 (12:4c69) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz xor a ld [wJoyIgnore], a ld a, $46 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef - ld hl, $d126 + ld hl, wd126 set 5, [hl] set 6, [hl] ld a, $0 @@ -131,7 +131,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9) ld hl, CeladonGameCornerText_48d22 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_c650b ; 0x48cba ld b,COIN_CASE @@ -155,7 +155,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9) ld a, $10 ldh [$a0], a ld hl, $ffa1 - ld de, $d349 + ld de, wPlayerMoney + 2 ld c, $3 ld a, $c ; SubtractBCDPredef call Predef @@ -164,7 +164,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9) ldh [$a0], a ld a, $50 ldh [$a1], a - ld de, $d5a5 + ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 ld a, $b ; AddBCDPredef @@ -218,7 +218,7 @@ CeladonGameCornerText4: ; 48d45 (12:4d45) CeladonGameCornerText5: ; 48d4a (12:4d4a) db $08 ; asm - ld a, [$d77e] + ld a, [wd77e] bit 2, a jr nz, .asm_d0957 ; 0x48d50 ld hl, CeladonGameCornerText_48d9c @@ -233,15 +233,15 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a) ldh [$a0], a ld a, $10 ldh [$a1], a - ld de, $d5a5 + ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 ld a, $b ; AddBCDPredef call Predef - ld hl, $d77e + ld hl, wd77e set 2, [hl] ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld hl, Received10CoinsText jr .asm_c7d1a ; 0x48d87 .asm_d0957 ; 0x48d89 @@ -278,7 +278,7 @@ CeladonGameCornerText6: ; 48db1 (12:4db1) CeladonGameCornerText7: ; 48db6 (12:4db6) db $08 ; asm - ld a, [$d77c] + ld a, [wd77c] bit 1, a ld hl, CeladonGameCornerText_48dca ; $4dca jr z, .asm_be3fd ; 0x48dbf @@ -301,7 +301,7 @@ CeladonGameCornerText8: ; 48dd4 (12:4dd4) CeladonGameCornerText9: ; 48dd9 (12:4dd9) db $08 ; asm - ld a, [$d77e] + ld a, [wd77e] bit 4, a jr nz, .asm_ed8bc ; 0x48ddf ld hl, CeladonGameCornerText_48e26 @@ -316,12 +316,12 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9) ldh [$a0], a ld a, $20 ldh [$a1], a - ld de, $d5a5 + ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 ld a, $b ; AddBCDPredef call Predef - ld hl, $d77e + ld hl, wd77e set 4, [hl] ld hl, Received20CoinsText jr .asm_0ddc2 ; 0x48e11 @@ -355,7 +355,7 @@ CeladonGameCornerText_48e36: ; 48e36 (12:4e36) CeladonGameCornerText10: ; 48e3b (12:4e3b) db $08 ; asm - ld a, [$d77e] + ld a, [wd77e] bit 3, a jr nz, .asm_ff080 ; 0x48e41 ld hl, CeladonGameCornerText_48e88 ; $4e88 @@ -370,12 +370,12 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b) ldh [$a0], a ld a, $20 ldh [$a1], a - ld de, $d5a5 + ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 ld a, $b ; AddBCDPredef call Predef - ld hl, $d77e + ld hl, wd77e set 3, [hl] ld hl, CeladonGameCornerText_48e8d jr .asm_78d65 ; 0x48e73 @@ -411,14 +411,14 @@ CeladonGameCornerText11: ; 48e9d (12:4e9d) db $08 ; asm ld hl, CeladonGameCornerText_48ece call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, CeladonGameCornerText_48ed3 ld de, CeladonGameCornerText_48ed3 call PreBattleSaveRegisters ldh a, [$8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters xor a @@ -444,17 +444,17 @@ CeladonGameCornerText13: ; 48ed8 (12:4ed8) CeladonGameCornerText12: ; 48edd (12:4edd) db $08 ; asm ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld hl, CeladonGameCornerText_48f09 call PrintText call WaitForSoundToFinish ld a, (SFX_02_57 - SFX_Headers_02) / 3 call PlaySound call WaitForSoundToFinish - ld hl, $d77e + ld hl, wd77e set 1, [hl] ld a, $43 - ld [$d09f], a + ld [wd09f], a ld bc, $0208 ld a, $17 call Predef @@ -473,46 +473,46 @@ CeladonGameCornerText_48f19: ; 48f19 (12:4f19) db "@" CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) - ld hl, $d730 + ld hl, wd730 set 6, [hl] - FuncCoord 11, 0 ; $c3ab + FuncCoord 11, 0 ld hl, Coord ld b, $5 ld c, $7 call TextBoxBorder call UpdateSprites - FuncCoord 12, 1 ; $c3c0 + FuncCoord 12, 1 ld hl, Coord ld b, $4 ld c, $7 call ClearScreenArea - FuncCoord 12, 2 ; $c3d4 + FuncCoord 12, 2 ld hl, Coord ld de, GameCornerMoneyText call PlaceString - FuncCoord 12, 3 ; $c3e8 + FuncCoord 12, 3 ld hl, Coord ld de, GameCornerBlankText1 call PlaceString - FuncCoord 12, 3 ; $c3e8 + FuncCoord 12, 3 ld hl, Coord - ld de, $d347 + ld de, wPlayerMoney ld c, $a3 call PrintBCDNumber - FuncCoord 12, 4 ; $c3fc + FuncCoord 12, 4 ld hl, Coord ld de, GameCornerCoinText call PlaceString - FuncCoord 12, 5 ; $c410 + FuncCoord 12, 5 ld hl, Coord ld de, GameCornerBlankText2 call PlaceString - FuncCoord 15, 5 ; $c413 + FuncCoord 15, 5 ld hl, Coord - ld de, $d5a4 + ld de, wPlayerCoins ld c, $82 call PrintBCDNumber - ld hl, $d730 + ld hl, wd730 res 6, [hl] ret diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 1eecffab..6d44175e 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -1,5 +1,5 @@ CeladonGymScript: ; 4890a (12:490a) - ld hl, $d126 + ld hl, wd126 bit 6, [hl] res 6, [hl] call nz, CeladonGymScript_48927 @@ -36,7 +36,7 @@ CeladonGymScriptPointers: ; 4894e (12:494e) dw CeladonGymScript3 CeladonGymScript3: ; 48956 (12:4956) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, CeladonGymText_48943 ld a, $f0 @@ -46,7 +46,7 @@ CeladonGymText_48963: ; 48963 (12:4963) ld a, $9 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d77c + ld hl, wd77c set 1, [hl] ld bc, (TM_21 << 8) | 1 call GiveItem @@ -54,7 +54,7 @@ CeladonGymText_48963: ; 48963 (12:4963) ld a, $a ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d77c + ld hl, wd77c set 0, [hl] jr .asm_4898c .BagFull @@ -64,14 +64,14 @@ CeladonGymText_48963: ; 48963 (12:4963) .asm_4898c ld hl, W_OBTAINEDBADGES set 3, [hl] - ld hl, $d72a + ld hl, wd72a set 3, [hl] ; deactivate gym trainers - ld a, [$d77c] + ld a, [wd77c] or %11111100 - ld [$d77c], a - ld hl, $d77d + ld [wd77c], a + ld hl, wd77d set 0, [hl] jp CeladonGymText_48943 @@ -93,7 +93,7 @@ CeladonGymTrainerHeaders: ; 489bc (12:49bc) CeladonGymTrainerHeader0: ; 489bc (12:49bc) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d77c ; flag's byte + dw wd77c ; flag's byte dw CeladonGymBattleText2 ; 0x4a8b TextBeforeBattle dw CeladonGymAfterBattleText2 ; 0x4a95 TextAfterBattle dw CeladonGymEndBattleText2 ; 0x4a90 TextEndBattle @@ -102,7 +102,7 @@ CeladonGymTrainerHeader0: ; 489bc (12:49bc) CeladonGymTrainerHeader2: ; 489c8 (12:49c8) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d77c ; flag's byte + dw wd77c ; flag's byte dw CeladonGymBattleText3 ; 0x4aa4 TextBeforeBattle dw CeladonGymAfterBattleText3 ; 0x4aae TextAfterBattle dw CeladonGymEndBattleText3 ; 0x4aa9 TextEndBattle @@ -111,7 +111,7 @@ CeladonGymTrainerHeader2: ; 489c8 (12:49c8) CeladonGymTrainerHeader3: ; 489d4 (12:49d4) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d77c ; flag's byte + dw wd77c ; flag's byte dw CeladonGymBattleText4 ; 0x4abd TextBeforeBattle dw CeladonGymAfterBattleText4 ; 0x4ac7 TextAfterBattle dw CeladonGymEndBattleText4 ; 0x4ac2 TextEndBattle @@ -120,7 +120,7 @@ CeladonGymTrainerHeader3: ; 489d4 (12:49d4) CeladonGymTrainerHeader4: ; 489e0 (12:49e0) db $5 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d77c ; flag's byte + dw wd77c ; flag's byte dw CeladonGymBattleText5 ; 0x4ad6 TextBeforeBattle dw CeladonGymAfterBattleText5 ; 0x4ae0 TextAfterBattle dw CeladonGymEndBattleText5 ; 0x4adb TextEndBattle @@ -129,7 +129,7 @@ CeladonGymTrainerHeader4: ; 489e0 (12:49e0) CeladonGymTrainerHeader5: ; 489ec (12:49ec) db $6 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d77c ; flag's byte + dw wd77c ; flag's byte dw CeladonGymBattleText6 ; 0x4aef TextBeforeBattle dw CeladonGymAfterBattleText6 ; 0x4af9 TextAfterBattle dw CeladonGymEndBattleText6 ; 0x4af4 TextEndBattle @@ -138,7 +138,7 @@ CeladonGymTrainerHeader5: ; 489ec (12:49ec) CeladonGymTrainerHeader6: ; 489f8 (12:49f8) db $7 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d77c ; flag's byte + dw wd77c ; flag's byte dw CeladonGymBattleText7 ; 0x4b08 TextBeforeBattle dw CeladonGymAfterBattleText7 ; 0x4b12 TextAfterBattle dw CeladonGymEndBattleText7 ; 0x4b0d TextEndBattle @@ -147,7 +147,7 @@ CeladonGymTrainerHeader6: ; 489f8 (12:49f8) CeladonGymTrainerHeader7: ; 48a04 (12:4a04) db $8 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d77c ; flag's byte + dw wd77c ; flag's byte dw CeladonGymBattleText8 ; 0x4b21 TextBeforeBattle dw CeladonGymAfterBattleText8 ; 0x4b2b TextAfterBattle dw CeladonGymEndBattleText8 ; 0x4b26 TextEndBattle @@ -157,7 +157,7 @@ CeladonGymTrainerHeader7: ; 48a04 (12:4a04) CeladonGymText1: ; 48a11 (12:4a11) db $08 ; asm - ld a, [$d77c] + ld a, [wd77c] bit 1, a jr z, .asm_16064 ; 0x48a17 bit 0, a @@ -172,18 +172,18 @@ CeladonGymText1: ; 48a11 (12:4a11) .asm_16064 ; 0x48a2d ld hl, CeladonGymText_48a5e call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, CeladonGymText_48a63 ld de, CeladonGymText_48a63 call PreBattleSaveRegisters ldh a, [$8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $4 - ld [$d05c], a + ld [W_GYMLEADERNO], a ld a, $3 ld [W_CELADONGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a diff --git a/scripts/celadonmansion3.asm b/scripts/celadonmansion3.asm index 4c4fd67a..73cd45ed 100755 --- a/scripts/celadonmansion3.asm +++ b/scripts/celadonmansion3.asm @@ -30,7 +30,7 @@ DirectorText: ; 487b2 (12:47b2) ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits - ld a, [$d11e] + ld a, [wd11e] cp 150 jr nc, .CompletedDex ld hl, .GameDesigner @@ -51,7 +51,7 @@ DirectorText: ; 487b2 (12:47b2) db $8 ; asm callab DisplayDiploma ld a, $1 - ld [$cc3c], a + ld [wcc3c], a jp TextScriptEnd GameFreakPCText1: ; 487eb (12:47eb) diff --git a/scripts/celadonmansion5.asm b/scripts/celadonmansion5.asm index 1d03ae5e..b8cd77ee 100755 --- a/scripts/celadonmansion5.asm +++ b/scripts/celadonmansion5.asm @@ -15,7 +15,7 @@ CeladonMansion5Text2: ; 1dd46 (7:5d46) call GivePokemon jr nc, .asm_24365 ; 0x1dd4d ld a, $45 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef .asm_24365 ; 0x1dd59 diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm index 969fa5f8..8874a743 100755 --- a/scripts/celadonmart3.asm +++ b/scripts/celadonmart3.asm @@ -22,7 +22,7 @@ CeladonMart3TextPointers: ; 48228 (12:4228) CeladonMart3Text1: ; 4824a (12:424a) db $08 ; asm - ld a, [$d778] + ld a, [wd778] bit 7, a jr nz, .asm_a5463 ; 0x48250 ld hl, TM18PreReceiveText @@ -30,7 +30,7 @@ CeladonMart3Text1: ; 4824a (12:424a) ld bc, (TM_18 << 8) | 1 call GiveItem jr nc, .BagFull - ld hl, $d778 + ld hl, wd778 set 7, [hl] ld hl, ReceivedTM18Text jr .asm_81359 ; 0x48268 diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm index 9712ef04..723eab36 100755 --- a/scripts/celadonmartelevator.asm +++ b/scripts/celadonmartelevator.asm @@ -1,5 +1,5 @@ CeladonMartElevatorScript: ; 48600 (12:4600) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] push hl @@ -9,16 +9,16 @@ CeladonMartElevatorScript: ; 48600 (12:4600) res 7, [hl] call nz, CeladonMartElevatorScript_48654 xor a - ld [$cf0c], a + ld [wcf0c], a inc a - ld [$cc3c], a + ld [wcc3c], a ret CeladonMartElevatorScript_4861c: ; 4861c (12:461c) - ld hl, $d3af - ld a, [$d73b] + ld hl, wd3af + ld a, [wd73b] ld b, a - ld a, [$d73c] + ld a, [wd73c] ld c, a call CeladonMartElevatorScript_4862a @@ -35,7 +35,7 @@ CeladonMartElevatorScript_48631: ; 48631 (12:4631) ld hl, CeladonMartElavatorFloors ; $4643 call LoadItemList ld hl, CeldaonMartElevatorWarpMaps ; $464a - ld de, $cc5b + ld de, wcc5b ld bc, $000a jp CopyData diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index d1765575..73895736 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -3,8 +3,8 @@ CeladonMartRoofScript: ; 483d5 (12:43d5) CeladonMartRoofScript_483d8: ; 483d8 (12:43d8) xor a - ld [$cd37], a - ld de, $cc5b + ld [wcd37], a + ld de, wcc5b ld hl, CeladonMartRoofDrinkList ; $4408 .asm_483e2 ld a, [hli] @@ -12,7 +12,7 @@ CeladonMartRoofScript_483d8: ; 483d8 (12:43d8) jr z, .asm_48404 push hl push de - ld [$d11e], a + ld [wd11e], a ld b, a ld a, $1c call Predef ; indirect jump to Func_f8a5 (f8a5 (3:78a5)) @@ -21,11 +21,11 @@ CeladonMartRoofScript_483d8: ; 483d8 (12:43d8) ld a, b and a jr z, .asm_483e2 - ld a, [$d11e] + ld a, [wd11e] ld [de], a inc de push hl - ld hl, $cd37 + ld hl, wcd37 inc [hl] pop hl jr .asm_483e2 @@ -41,22 +41,22 @@ CeladonMartRoofDrinkList: ; 48408 (12:4408) db $00 CeladonMartRoofScript_4840c: ; 4840c (12:440c) - ld hl, $d730 + ld hl, wd730 set 6, [hl] ld hl, CeladonMartRoofText_484ee ; $44ee call PrintText xor a - ld [wCurrentMenuItem], a ; $cc26 + ld [wCurrentMenuItem], a ; wCurrentMenuItem ld a, $3 - ld [wMenuWatchedKeys], a ; $cc29 - ld a, [$cd37] + ld [wMenuWatchedKeys], a ; wMenuWatchedKeys + ld a, [wcd37] dec a - ld [wMaxMenuItem], a ; $cc28 + ld [wMaxMenuItem], a ; wMaxMenuItem ld a, $2 - ld [wTopMenuItemY], a ; $cc24 + ld [wTopMenuItemY], a ; wTopMenuItemY ld a, $1 - ld [wTopMenuItemX], a ; $cc25 - ld a, [$cd37] + ld [wTopMenuItemX], a ; wTopMenuItemX + ld a, [wcd37] dec a ld bc, $2 ld hl, $3 @@ -68,13 +68,13 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) call TextBoxBorder call UpdateSprites call CeladonMartRoofScript_48532 - ld hl, $d730 + ld hl, wd730 res 6, [hl] call HandleMenuInput bit 1, a ret nz - ld hl, $cc5b - ld a, [wCurrentMenuItem] ; $cc26 + ld hl, wcc5b + ld a, [wCurrentMenuItem] ; wCurrentMenuItem ld d, $0 ld e, a add hl, de @@ -84,7 +84,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) jr z, .asm_484b6 cp SODA_POP jr z, .asm_48492 - ld a, [$d778] + ld a, [wd778] bit 6, a jr nz, .asm_484e0 ld hl, CeladonMartRoofText_48515 ; $4515 @@ -95,11 +95,11 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) jr nc, .BagFull ld hl, ReceivedTM49Text call PrintText - ld hl, $d778 + ld hl, wd778 set 6, [hl] ret .asm_48492 - ld a, [$d778] + ld a, [wd778] bit 5, a jr nz, .asm_484e0 ld hl, CeladonMartRoofText_48504 ; $4504 @@ -110,11 +110,11 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) jr nc, .BagFull ld hl, CeladonMartRoofText_4850a ; $450a call PrintText - ld hl, $d778 + ld hl, wd778 set 5, [hl] ret .asm_484b6 - ld a, [$d778] + ld a, [wd778] bit 4, a jr nz, .asm_484e0 ld hl, CeladonMartRoofText_484f3 ; $44f3 @@ -125,7 +125,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) jr nc, .BagFull ld hl, CeladonMartRoofText_484f9 ; $44f9 call PrintText - ld hl, $d778 + ld hl, wd778 set 4, [hl] ret .BagFull @@ -191,7 +191,7 @@ CeladonMartRoofText_4852c: ; 4852c (12:452c) db "@" CeladonMartRoofScript_48532: ; 48532 (12:4532) - ld hl, $cc5b + ld hl, wcc5b xor a ld [$ffdb], a .asm_48538 @@ -199,14 +199,14 @@ CeladonMartRoofScript_48532: ; 48532 (12:4532) cp $ff ret z push hl - ld [$d11e], a + ld [wd11e], a call GetItemName - FuncCoord 2, 2 ; $c3ca + FuncCoord 2, 2 ld hl, Coord ld a, [$ffdb] ld bc, $28 call AddNTimes - ld de, $cd6d + ld de, wcd6d call PlaceString ld hl, $ffdb inc [hl] @@ -228,15 +228,15 @@ CeladonMartRoofText1: ; 48567 (12:4567) CeladonMartRoofText2: ; 4856c (12:456c) db $08 ; asm call CeladonMartRoofScript_483d8 - ld a, [$cd37] + ld a, [wcd37] and a jr z, .asm_914b9 ; 0x48574 ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld hl, CeladonMartRoofText4 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_05aa4 ; 0x48588 call CeladonMartRoofScript_4840c diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index d84d882a..0ebd70a1 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -9,7 +9,7 @@ CeruleanCityScript_1948c: ; 1948c (6:548c) ld [wJoyIgnore], a ld [W_CERULEANCITYCURSCRIPT], a ld a, $5 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 jp Predef @@ -26,7 +26,7 @@ CeruleanCityScript4: ; 194a7 (6:54a7) jp z, CeruleanCityScript_1948c ld a, $f0 ld [wJoyIgnore], a - ld hl, $d75b + ld hl, wd75b set 7, [hl] ld a, $2 ld [$ff8c], a @@ -37,13 +37,13 @@ CeruleanCityScript4: ; 194a7 (6:54a7) ret CeruleanCityScript0: ; 194c8 (6:54c8) - ld a, [$d75b] + ld a, [wd75b] bit 7, a jr nz, .asm_194f7 ; 0x194cd $28 ld hl, CeruleanCityCoords1 call ArePlayerCoordsInArray jr nc, .asm_194f7 ; 0x194d5 $20 - ld a, [$cd3d] + ld a, [wWhichTrade] cp $1 ld a, $8 ld b, $0 @@ -51,25 +51,25 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld a, $4 ld b, $4 .asm_194e6 - ld [$d528], a + ld [wd528], a ld a, b - ld [$c129], a + ld [wSpriteStateData1 + $29], a call Delay3 ld a, $2 ld [$ff8c], a jp DisplayTextID .asm_194f7 - ld a, [$d75a] + ld a, [wd75a] bit 0, a ret nz ld hl, CeruleanCityCoords2 call ArePlayerCoordsInArray ret nc - ld a, [$d700] + ld a, [wd700] and a jr z, .asm_19512 ; 0x19508 $8 ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound .asm_19512 ld c, BANK(Music_MeetRival) @@ -90,7 +90,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld [hl], $19 .asm_19535 ld a, $5 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef ld de, CeruleanCityMovement1 @@ -122,7 +122,7 @@ CeruleanCityScript_1955d: ; 1955d (6:555d) jp Func_34a6 ; face object CeruleanCityScript1: ; 19567 (6:5567) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz xor a @@ -130,7 +130,7 @@ CeruleanCityScript1: ; 19567 (6:5567) ld a, $1 ld [$ff8c], a call DisplayTextID - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, CeruleanCityText_1966d @@ -163,19 +163,19 @@ CeruleanCityScript1: ; 19567 (6:5567) ret CeruleanCityScript2: ; 195b1 (6:55b1) - ld a, [$d057] + ld a, [W_ISINBATTLE] cp $ff jp z, CeruleanCityScript_1948c call CeruleanCityScript_1955d ld a, $f0 ld [wJoyIgnore], a - ld hl, $d75a + ld hl, wd75a set 0, [hl] ld a, $1 ld [$ff8c], a call DisplayTextID ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound callba Music_RivalAlternateStart ld a, $1 @@ -203,11 +203,11 @@ CeruleanCityMovement4: ; 19608 (6:5608) db $c0,$00,$00,$00,$00,$00,$00,$FF CeruleanCityScript3: ; 19610 (6:5610) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $5 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef xor a @@ -238,7 +238,7 @@ CeruleanCityTextPointers: ; 1962d (6:562d) CeruleanCityText1: ; 1964f (6:564f) db $08 ; asm - ld a, [$d75a] ; rival battle flag + ld a, [wd75a] ; rival battle flag bit 0, a ; do pre-battle text jr z, .PreBattleText @@ -270,19 +270,19 @@ CeruleanCityText_19677: ; 19677 (6:5677) CeruleanCityText2: ; 1967c (6:567c) db $8 - ld a, [$d75b] + ld a, [wd75b] bit 7, a jr nz, .asm_4ca20 ; 0x19682 $29 ld hl, CeruleanCityText_196d9 call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, CeruleanCityText_196ee ld de, CeruleanCityText_196ee call PreBattleSaveRegisters ld a, [$ff8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $4 @@ -299,7 +299,7 @@ CeruleanCityText2: ; 1967c (6:567c) jr .Done .Success ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld hl, ReceivedTM28Text call PrintText callba Func_74872 diff --git a/scripts/ceruleancity2.asm b/scripts/ceruleancity2.asm index db2d12a1..cb7eee15 100755 --- a/scripts/ceruleancity2.asm +++ b/scripts/ceruleancity2.asm @@ -4,15 +4,15 @@ Func_74872: ; 74872 (1d:4872) ; the screen then fades out, he disappears, and fades back in call GBFadeIn1 ld a, $07 - ld [$CC4D], a + ld [wcc4d], a ld a, $15 call Predef ld a, $09 - ld [$CC4D], a + ld [wcc4d], a ld a, $11 call Predef ld a, $06 - ld [$CC4D], a + ld [wcc4d], a ld a, $11 call Predef call GBFadeOut1 diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index 8f6ac2c9..19296fe2 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -1,5 +1,5 @@ CeruleanGymScript: ; 5c6b3 (17:46b3) - ld hl, $d126 + ld hl, wd126 bit 6, [hl] res 6, [hl] call nz, CeruleanGymScript_5c6d0 @@ -36,7 +36,7 @@ CeruleanGymScriptPointers: ; 5c6f8 (17:46f8) dw CeruleanGymScript3 CeruleanGymScript3: ; 5c700 (17:4700) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, CeruleanGymScript_5c6ed ld a, $f0 @@ -46,7 +46,7 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d) ld a, $5 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d75e + ld hl, wd75e set 7, [hl] ld bc, (TM_11 << 8) | 1 call GiveItem @@ -54,7 +54,7 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d) ld a, $6 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d75e + ld hl, wd75e set 6, [hl] jr .asm_5c736 .BagFull @@ -64,11 +64,11 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d) .asm_5c736 ld hl, W_OBTAINEDBADGES set 1, [hl] - ld hl, $d72a + ld hl, wd72a set 1, [hl] ; deactivate gym trainers - ld hl, $d75e + ld hl, wd75e set 2, [hl] set 3, [hl] @@ -87,7 +87,7 @@ CeruleanGymTrainerHeaders: ; 5c758 (17:4758) CeruleanGymTrainerHeader0: ; 5c758 (17:4758) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d75e ; flag's byte + dw wd75e ; flag's byte dw CeruleanGymBattleText1 ; 0x47e9 TextBeforeBattle dw CeruleanGymAfterBattleText1 ; 0x47f3 TextAfterBattle dw CeruleanGymEndBattleText1 ; 0x47ee TextEndBattle @@ -96,7 +96,7 @@ CeruleanGymTrainerHeader0: ; 5c758 (17:4758) CeruleanGymTrainerHeader1: ; 5c764 (17:4764) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d75e ; flag's byte + dw wd75e ; flag's byte dw CeruleanGymBattleText2 ; 0x4802 TextBeforeBattle dw CeruleanGymAfterBattleText2 ; 0x480c TextAfterBattle dw CeruleanGymEndBattleText2 ; 0x4807 TextEndBattle @@ -106,7 +106,7 @@ CeruleanGymTrainerHeader1: ; 5c764 (17:4764) CeruleanGymText1: ; 5c771 (17:4771) db $08 ; asm - ld a, [$d75e] + ld a, [wd75e] bit 7, a jr z, .asm_10854 ; 0x5c777 bit 6, a @@ -121,18 +121,18 @@ CeruleanGymText1: ; 5c771 (17:4771) .asm_10854 ; 0x5c78d ld hl, CeruleanGymText_5c7be call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, CeruleanGymText_5c7d8 ld de, CeruleanGymText_5c7d8 call PreBattleSaveRegisters ldh a, [$8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $2 - ld [$d05c], a + ld [W_GYMLEADERNO], a xor a ldh [$b4], a ld a, $3 @@ -203,7 +203,7 @@ CeruleanGymAfterBattleText2: ; 5c80c (17:480c) CeruleanGymText4: ; 5c811 (17:4811) db $08 ; asm - ld a, [$d75e] + ld a, [wd75e] bit 7, a jr nz, .asm_f80ce ; 0x5c817 ld hl, CeruleanGymText_5c82a diff --git a/scripts/ceruleanhouse2.asm b/scripts/ceruleanhouse2.asm index eae26047..a45c0fda 100755 --- a/scripts/ceruleanhouse2.asm +++ b/scripts/ceruleanhouse2.asm @@ -1,8 +1,8 @@ CeruleanHouse2Script: ; 74e09 (1d:4e09) ld a, $1 - ld [$cf0c], a + ld [wcf0c], a dec a - ld [$cc3c], a + ld [wcc3c], a ret CeruleanHouse2TextPointers: ; 74e13 (1d:4e13) @@ -20,20 +20,20 @@ CeruleanHouse2Text1: ; 74e15 (1d:4e15) call PrintText ld hl, BadgeItemList call LoadItemList - ld hl, $cf7b + ld hl, wStringBuffer2 + 11 ld a, l - ld [$cf8b], a + ld [wcf8b], a ld a, h - ld [$cf8c], a + ld [wcf8c], a xor a - ld [$cf93], a - ld [$cc35], a + ld [wcf93], a + ld [wcc35], a ld a, SPECIALLISTMENU ld [wListMenuID], a call DisplayListMenuID jr c, .asm_74e60 ; 0x74e49 $15 ld hl, TextPointers_74e86 - ld a, [$cf91] + ld a, [wcf91] sub $15 add a ld d, $0 diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 03f60b0f..8d1cb2d6 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -6,7 +6,7 @@ CinnabarGymScript: ; 7574a (1d:574a) jp CallFunctionInTable CinnabarGymScript_75759: ; 75759 (1d:5759) - ld hl, $D126 + ld hl, wd126 bit 6, [hl] res 6, [hl] push hl @@ -15,7 +15,7 @@ CinnabarGymScript_75759: ; 75759 (1d:5759) bit 5, [hl] res 5, [hl] call nz, Func_3ead - ld hl, $D79B + ld hl, wd79b res 7, [hl] ret CinnabarGymScript_75772: ; 75772 (1d:5772) @@ -33,7 +33,7 @@ CinnabarGymScript_75792: ; 75792 (1d:5792) ld [wJoyIgnore], a ld [W_CINNABARGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a - ld [$da38], a + ld [wda38], a ret CinnabarGymScript_757a0: ; 757a0 (1d:57a0) @@ -48,20 +48,20 @@ CinnabarGymScriptPointers: ; 757a6 (1d:57a6) dw CinnabarGymScript3 CinnabarGymScript0: ; 757ae (1d:57ae) - ld a, [$da38] + ld a, [wda38] and a ret z ld [$ff8c], a cp $4 jr nz, .asm_757c3 ; 0x757b7 $a ld a, $4 - ld [$d528], a + ld [wd528], a ld de, MovementData_757d7 jr .asm_757cb ; 0x757c1 $8 .asm_757c3 ld de, MovementData_757da ld a, $1 - ld [$d528], a + ld [wd528], a .asm_757cb call MoveSprite ld a, $1 @@ -76,12 +76,12 @@ MovementData_757da: ; 757da (1d:57da) db $80,$FF CinnabarGymScript1: ; 757dc (1d:57dc) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz xor a ld [wJoyIgnore], a - ld a, [$da38] + ld a, [wda38] ld [wTrainerHeaderFlagBit], a ld [$ff8c], a jp DisplayTextID @@ -91,14 +91,14 @@ CinnabarGymScript_757f1: ; 757f1 (1d:57f1) jp Predef CinnabarGymScript2: ; 757f6 (1d:57f6) - ld a, [$d057] + ld a, [W_ISINBATTLE] cp $ff jp z, CinnabarGymScript_75792 ld a, [wTrainerHeaderFlagBit] ld [$ffdb], a ld c, a ld b, $2 - ld hl, $d79a + ld hl, wd79a call CinnabarGymScript_757f1 ld a, c and a @@ -112,25 +112,25 @@ CinnabarGymScript2: ; 757f6 (1d:57f6) ld [$ffdb], a ld c, a ld b, $1 - ld hl, $d79a + ld hl, wd79a call CinnabarGymScript_757f1 ld a, [wTrainerHeaderFlagBit] sub $2 ld c, a ld b, $1 - ld hl, $d79c + ld hl, wd79c call CinnabarGymScript_757f1 call Func_3ead xor a ld [wJoyIgnore], a - ld [$da38], a + ld [wda38], a ld a, $0 ld [W_CINNABARGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret CinnabarGymScript3: ; 7584a (1d:584a) - ld a, [$d057] + ld a, [W_ISINBATTLE] cp $ff jp z, CinnabarGymScript_75792 ld a, $f0 @@ -139,7 +139,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857) ld a, $a ld [$ff8c], a call DisplayTextID - ld hl, $d79a + ld hl, wd79a set 1, [hl] ld bc, (TM_38 << 8) | 1 call GiveItem @@ -147,7 +147,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857) ld a, $b ld [$ff8c], a call DisplayTextID - ld hl, $d79a + ld hl, wd79a set 0, [hl] jr .asm_75880 ; 0x75877 $7 .BagFull @@ -157,17 +157,17 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857) .asm_75880 ld hl, W_OBTAINEDBADGES set 6, [hl] - ld hl, $d72a + ld hl, wd72a set 6, [hl] ; deactivate gym trainers - ld a, [$d79a] + ld a, [wd79a] or %11111100 - ld [$d79a], a - ld hl, $d79b + ld [wd79a], a + ld hl, wd79b set 0, [hl] - ld hl, $d126 + ld hl, wd126 set 5, [hl] jp CinnabarGymScript_75792 @@ -188,13 +188,13 @@ CinnabarGymTextPointers: ; 7589f (1d:589f) CinnabarGymScript_758b7: ; 758b7 (1d:58b7) ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] - ld a, [$cf13] + ld a, [wcf13] cp $1 jr z, .asm_758d4 ld a, $2 @@ -208,7 +208,7 @@ CinnabarGymScript_758b7: ; 758b7 (1d:58b7) CinnabarGymText1: ; 758df (1d:58df) db $8 - ld a, [$d79a] + ld a, [wd79a] bit 1, a jr z, .asm_d9332 ; 0x758e5 $16 bit 0, a @@ -227,7 +227,7 @@ CinnabarGymText1: ; 758df (1d:58df) ld de, BlaineEndBattleText call PreBattleSaveRegisters ld a, $7 - ld [$d05c], a + ld [W_GYMLEADERNO], a jp CinnabarGymScript_758b7 BlaineBattleText: ; 75914 (1d:5914) @@ -261,7 +261,7 @@ TM38NoRoomText: ; 75934 (1d:5934) CinnabarGymText2: ; 75939 (1d:5939) db $08 ; asm call CinnabarGymScript_757a0 - ld a, [$d79a] + ld a, [wd79a] bit 2, a jr nz, .asm_46bb4 ; 0x75942 ld hl, CinnabarGymText_7595f @@ -290,7 +290,7 @@ CinnabarGymText_75969: ; 75969 (1d:5969) CinnabarGymText3: ; 7596e (1d:596e) db $08 ; asm call CinnabarGymScript_757a0 - ld a, [$d79a] + ld a, [wd79a] bit 3, a jr nz, .asm_4b406 ; 0x75977 ld hl, CinnabarGymText_75994 @@ -319,7 +319,7 @@ CinnabarGymText_7599e: ; 7599e (1d:599e) CinnabarGymText4: ; 759a3 (1d:59a3) db $08 ; asm call CinnabarGymScript_757a0 - ld a, [$d79a] + ld a, [wd79a] bit 4, a jr nz, .asm_c0673 ; 0x759ac ld hl, CinnabarGymText_759c9 @@ -348,7 +348,7 @@ CinnabarGymText_759d3: ; 759d3 (1d:59d3) CinnabarGymText5: ; 759d8 (1d:59d8) db $08 ; asm call CinnabarGymScript_757a0 - ld a, [$d79a] + ld a, [wd79a] bit 5, a jr nz, .asm_5cfd7 ; 0x759e1 ld hl, CinnabarGymText_759fe @@ -377,7 +377,7 @@ CinnabarGymText_75a08: ; 75a08 (1d:5a08) CinnabarGymText6: ; 75a0d (1d:5a0d) db $08 ; asm call CinnabarGymScript_757a0 - ld a, [$d79a] + ld a, [wd79a] bit 6, a jr nz, .asm_776b4 ; 0x75a16 ld hl, CinnabarGymText_75a33 @@ -406,7 +406,7 @@ CinnabarGymText_75a3d: ; 75a3d (1d:5a3d) CinnabarGymText7: ; 75a42 (1d:5a42) db $08 ; asm call CinnabarGymScript_757a0 - ld a, [$d79a] + ld a, [wd79a] bit 7, a jr nz, .asm_2f755 ; 0x75a4b ld hl, CinnabarGymText_75a68 @@ -435,7 +435,7 @@ CinnabarGymText_75a72: ; 75a72 (1d:5a72) CinnabarGymText8: ; 75a77 (1d:5a77) db $08 ; asm call CinnabarGymScript_757a0 - ld a, [$d79b] + ld a, [wd79b] bit 0, a jr nz, .asm_d87be ; 0x75a80 ld hl, CinnabarGymText_75a9d @@ -463,7 +463,7 @@ CinnabarGymText_75aa7: ; 75aa7 (1d:5aa7) CinnabarGymText9: ; 75aac (1d:5aac) db $08 ; asm - ld a, [$d79a] + ld a, [wd79a] bit 1, a jr nz, .asm_627d9 ; 0x75ab2 ld hl, CinnabarGymText_75ac2 diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index 5bb03843..8d27198b 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -1,10 +1,10 @@ CinnabarIslandScript: ; 1ca19 (7:4a19) call EnableAutoTextBoxDrawing - ld hl, $d126 + ld hl, wd126 set 5, [hl] - ld hl, $d796 + ld hl, wd796 res 0, [hl] - ld hl, $d7a3 + ld hl, wd7a3 res 1, [hl] ld hl, CinnabarIslandScriptPointers ld a, [W_CINNABARISLANDCURSCRIPT] @@ -25,26 +25,26 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) cp $12 ret nz ld a, $8 - ld [$d528], a + ld [wd528], a ld a, $8 ld [$ff8c], a call DisplayTextID xor a ld [hJoyHeld], a ld a, $1 - ld [$cd38], a + ld [wcd38], a ld a, $80 - ld [$ccd3], a + ld [wccd3], a call Func_3486 xor a - ld [$c109], a + ld [wSpriteStateData1 + 9], a ld [wJoyIgnore], a ld a, $1 ld [W_CINNABARISLANDCURSCRIPT], a ret CinnabarIslandScript1: ; 1ca73 (7:4a73) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 diff --git a/scripts/copycatshouse2f.asm b/scripts/copycatshouse2f.asm index afe589da..ea1e91b3 100755 --- a/scripts/copycatshouse2f.asm +++ b/scripts/copycatshouse2f.asm @@ -12,11 +12,11 @@ CopycatsHouse2FTextPointers: ; 5cc74 (17:4c74) CopycatsHouse2FText1: ; 5cc82 (17:4c82) db $08 ; asm - ld a, [$d7af] + ld a, [wd7af] bit 0, a jr nz, .asm_7ccf3 ; 0x5cc88 ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld hl, CopycatsHouse2FText_5ccd4 call PrintText ld b, POKE_DOLL @@ -32,7 +32,7 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82) ld a, POKE_DOLL ldh [$db], a callba RemoveItemByID - ld hl, $d7af + ld hl, wd7af set 0, [hl] jr .asm_62ecd ; 0x5ccc1 .BagFull @@ -84,7 +84,7 @@ CopycatsHouse2FText6: ; 5ccfe (17:4cfe) CopycatsHouse2FText7: ; 5cd03 (17:4d03) db $08 ; asm - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] cp $4 ld hl, CopycatsHouse2FText_5cd1c jr nz, .asm_399a4 ; 0x5cd0c diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 96cff2ea..d2a07418 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -13,20 +13,20 @@ DayCareMText1: ; 56254 (15:6254) ld hl, DayCareMText_5640f call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a ld hl, DayCareMText_5643b jp nz, DayCareMScript_56409 - ld a, [$d163] + ld a, [W_NUMINPARTY] dec a ld hl, DayCareMText_56445 jp z, DayCareMScript_56409 ld hl, DayCareMText_56414 call PrintText xor a - ld [$cfcb], a - ld [$d07d], a - ld [$cc35], a + ld [wcfcb], a + ld [wd07d], a + ld [wcc35], a call DisplayPartyMenu push af call GBPalWhiteOutWithDelay3 @@ -39,21 +39,21 @@ DayCareMText1: ; 56254 (15:6254) ld hl, DayCareMText_5644a jp c, DayCareMScript_56409 xor a - ld [$cc2b], a + ld [wcc2b], a ld a, [wWhichPokemon] - ld hl, $d2b5 + ld hl, W_PARTYMON1NAME call GetPartyMonName ld hl, DayCareMText_56419 call PrintText ld a, $1 ld [W_DAYCARE_IN_USE], a ld a, $3 - ld [$cf95], a + ld [wcf95], a call Func_3a68 xor a - ld [$cf95], a + ld [wcf95], a call RemovePokemon - ld a, [$cf91] + ld a, [wcf91] call PlayCry ld hl, DayCareMText_5641e jp DayCareMScript_56409 @@ -63,7 +63,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld hl, W_DAYCAREMONNAME call GetPartyMonName ld a, $3 - ld [$cc49], a + ld [wcc49], a call LoadMonData callab Func_58f43 ld a, d @@ -71,7 +71,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) jr c, .asm_56315 ld d, $64 callab CalcExperience - ld hl, $da6d + ld hl, wda6d ld a, [H_NUMTOPRINT] ld [hli], a ld a, [$ff97] @@ -83,7 +83,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) .asm_56315 xor a ld [wTrainerEngageDistance], a - ld hl, $da62 + ld hl, wda62 ld a, [hl] ld [wTrainerSpriteOffset], a cp d @@ -130,7 +130,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld hl, DayCareMText_56428 call PrintText ld a, $13 - ld [$d125], a + ld [wd125], a call DisplayTextBoxID call YesNoChoice ld hl, DayCareMText_56437 @@ -154,22 +154,22 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld hl, wTrainerEngageDistance ld [hli], a inc hl - ld de, $d349 + ld de, wPlayerMoney + 2 ld c, $3 ld a, $c ; SubtractBCDPredef call Predef ld a, (SFX_02_5a - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent ld a, $13 - ld [$d125], a + ld [wd125], a call DisplayTextBoxID ld hl, DayCareMText_5644f call PrintText ld a, $2 - ld [$cf95], a + ld [wcf95], a call Func_3a68 ld a, [W_DAYCAREMONDATA] - ld [$cf91], a + ld [wcf91], a ld a, [W_NUMINPARTY] dec a push af @@ -196,14 +196,14 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) inc de ld a, [hl] ld [de], a - ld a, [$cf91] + ld a, [wcf91] call PlayCry ld hl, DayCareMText_5642d jr DayCareMScript_56409 .asm_56403 ld a, [wTrainerSpriteOffset] - ld [$da62], a + ld [wda62], a DayCareMScript_56409: ; 56409 (15:6409) call PrintText diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm index 8ea8d36d..f9a839fa 100755 --- a/scripts/fanclub.asm +++ b/scripts/fanclub.asm @@ -3,7 +3,7 @@ FanClubScript: ; 59b70 (16:5b70) FanClubBikeInBag: ; check if any bike paraphernalia in bag - ld a, [$d771] + ld a, [wd771] bit 1, a ; got bike voucher? ret nz ld b, BICYCLE @@ -25,18 +25,18 @@ FanClubTextPointers: ; 59b84 (16:5b84) FanClubText1: ; pikachu fan db $08 ; asm - ld a, [$d771] + ld a, [wd771] bit 7, a jr nz, .mineisbetter ld hl, .normaltext call PrintText - ld hl, $d771 + ld hl, wd771 set 6, [hl] jr .done .mineisbetter ld hl, .bettertext call PrintText - ld hl, $d771 + ld hl, wd771 res 7, [hl] .done jp TextScriptEnd @@ -52,18 +52,18 @@ FanClubText1: FanClubText2: ; seel fan db $08 ; asm - ld a, [$d771] + ld a, [wd771] bit 6, a jr nz, .mineisbetter ld hl, .normaltext call PrintText - ld hl, $d771 + ld hl, wd771 set 7, [hl] jr .done .mineisbetter ld hl, .bettertext call PrintText - ld hl, $d771 + ld hl, wd771 res 6, [hl] .done jp TextScriptEnd @@ -113,7 +113,7 @@ FanClubText5: ld hl, .meetchairtext call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .nothanks @@ -125,7 +125,7 @@ FanClubText5: jr nc, .BagFull ld hl, .receivedvouchertext call PrintText - ld hl, $d771 + ld hl, wd771 set 1, [hl] jr .done .BagFull diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index a491349c..23816925 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -9,9 +9,9 @@ FightingDojoScript: ; 5cd5d (17:4d5d) FightingDojoScript_5cd70: ; 5cd70 (17:4d70) xor a - ld [$cd6b], a - ld [$d642], a - ld [$da39], a + ld [wJoyIgnore], a + ld [W_FIGHTINGDOJOCURSCRIPT], a + ld [W_CURMAPSCRIPT], a ret FightingDojoScriptPointers: ; 5cd7b (17:4d7b) @@ -21,19 +21,19 @@ FightingDojoScriptPointers: ; 5cd7b (17:4d7b) dw FightingDojoScript3 FightingDojoScript1: ; 5cd83 (17:4d83) - ld a, [$d7b1] + ld a, [wd7b1] bit 0, a ret nz call CheckFightingMapTrainers ld a, [wTrainerHeaderFlagBit] and a ret nz - ld a, [$d7b1] + ld a, [wd7b1] bit 1, a ret nz xor a ld [hJoyHeld], a - ld [$cf0d], a + ld [wcf0d], a ld a, [W_YCOORD] cp $3 ret nz @@ -41,9 +41,9 @@ FightingDojoScript1: ; 5cd83 (17:4d83) cp $4 ret nz ld a, $1 - ld [$cf0d], a + ld [wcf0d], a ld a, $1 - ld [$d528], a + ld [wd528], a ld a, $1 ld [$ff8c], a ld a, $8 @@ -55,14 +55,14 @@ FightingDojoScript1: ; 5cd83 (17:4d83) ret FightingDojoScript3: ; 5cdc6 (17:4dc6) - ld a, [$d057] + ld a, [W_ISINBATTLE] cp $ff jp z, FightingDojoScript_5cd70 - ld a, [$cf0d] + ld a, [wcf0d] and a jr z, .asm_5cde4 ld a, $1 - ld [$d528], a + ld [wd528], a ld a, $1 ld [$ff8c], a ld a, $8 @@ -71,17 +71,17 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6) .asm_5cde4 ld a, $f0 - ld [$cd6b], a - ld a, [$d7b1] + ld [wJoyIgnore], a + ld a, [wd7b1] or $3e - ld [$d7b1], a + ld [wd7b1], a ld a, $8 ld [$ff8c], a call DisplayTextID xor a - ld [$cd6b], a - ld [$d642], a - ld [$da39], a + ld [wJoyIgnore], a + ld [W_FIGHTINGDOJOCURSCRIPT], a + ld [W_CURMAPSCRIPT], a ret FightingDojoTextPointers: ; 5ce03 (17:4e03) @@ -98,7 +98,7 @@ FightingDojoTrainerHeaders: ; 5ce13 (17:4e13) FightingDojoTrainerHeader0: ; 5ce13 (17:4e13) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7b1 ; flag's byte + dw wd7b1 ; flag's byte dw FightingDojoBattleText1 ; 0x4eac TextBeforeBattle dw FightingDojoAfterBattleText1 ; 0x4eb6 TextAfterBattle dw FightingDojoEndBattleText1 ; 0x4eb1 TextEndBattle @@ -107,7 +107,7 @@ FightingDojoTrainerHeader0: ; 5ce13 (17:4e13) FightingDojoTrainerHeader1: ; 5ce1f (17:4e1f) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7b1 ; flag's byte + dw wd7b1 ; flag's byte dw FightingDojoBattleText2 ; 0x4ec5 TextBeforeBattle dw FightingDojoAfterBattleText2 ; 0x4ecf TextAfterBattle dw FightingDojoEndBattleText2 ; 0x4eca TextEndBattle @@ -116,7 +116,7 @@ FightingDojoTrainerHeader1: ; 5ce1f (17:4e1f) FightingDojoTrainerHeader2: ; 5ce2b (17:4e2b) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7b1 ; flag's byte + dw wd7b1 ; flag's byte dw FightingDojoBattleText3 ; 0x4ede TextBeforeBattle dw FightingDojoAfterBattleText3 ; 0x4ee8 TextAfterBattle dw FightingDojoEndBattleText3 ; 0x4ee3 TextEndBattle @@ -125,7 +125,7 @@ FightingDojoTrainerHeader2: ; 5ce2b (17:4e2b) FightingDojoTrainerHeader3: ; 5ce37 (17:4e37) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7b1 ; flag's byte + dw wd7b1 ; flag's byte dw FightingDojoBattleText4 ; 0x4ef7 TextBeforeBattle dw FightingDojoAfterBattleText4 ; 0x4f01 TextAfterBattle dw FightingDojoEndBattleText4 ; 0x4efc TextEndBattle @@ -135,21 +135,21 @@ FightingDojoTrainerHeader3: ; 5ce37 (17:4e37) FightingDojoText1: ; 5ce44 (17:4e44) db $08 ; asm - ld a, [$d7b1] + ld a, [wd7b1] bit 0, a jp nz, .continue1 bit 1, a jp nz, .continue2 ld hl, FightingDojoText_5ce8e call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, FightingDojoText_5ce93 ld de, FightingDojoText_5ce93 call PreBattleSaveRegisters ldh a, [$8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 @@ -257,7 +257,7 @@ FightingDojoAfterBattleText4: ; 5cf01 (17:4f01) FightingDojoText6: ; 5cf06 (17:4f06) ; Hitmonlee Poké Ball db $08 ; asm - ld a, [$d7b1] + ld a, [wd7b1] and %11000000 jr z, .GetMon ld hl, OtherHitmonText @@ -269,10 +269,10 @@ FightingDojoText6: ; 5cf06 (17:4f06) ld hl, WantHitmonleeText call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .done - ld a, [$cf91] + ld a, [wcf91] ld b, a ld c, 30 call GivePokemon @@ -280,10 +280,10 @@ FightingDojoText6: ; 5cf06 (17:4f06) ; once Poké Ball is taken, hide sprite ld a, $4a - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef - ld hl, $d7b1 + ld hl, wd7b1 set 6, [hl] set 0, [hl] .done @@ -296,7 +296,7 @@ WantHitmonleeText: ; 5cf49 (17:4f49) FightingDojoText7: ; 5cf4e (17:4f4e) ; Hitmonchan Poké Ball db $08 ; asm - ld a, [$d7b1] + ld a, [wd7b1] and %11000000 jr z, .GetMon ld hl, OtherHitmonText @@ -308,21 +308,21 @@ FightingDojoText7: ; 5cf4e (17:4f4e) ld hl, WantHitmonchanText call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .done - ld a, [$cf91] + ld a, [wcf91] ld b, a ld c,30 call GivePokemon jr nc, .done - ld hl, $d7b1 + ld hl, wd7b1 set 7, [hl] set 0, [hl] ; once Poké Ball is taken, hide sprite ld a, $4b - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef .done diff --git a/scripts/fuchsiacity.asm b/scripts/fuchsiacity.asm index 9014dffe..6b7e067b 100755 --- a/scripts/fuchsiacity.asm +++ b/scripts/fuchsiacity.asm @@ -135,7 +135,7 @@ FuchsiaCityLaprasText: ; 19aef (6:5aef) FuchsiaCityText24: ; 19af4 (6:5af4) db $08 ; asm - ld a, [$d7f6] + ld a, [wd7f6] bit 6, a jr nz, .asm_3b4e8 ; 0x19afa bit 7, a diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 4fc8dd61..09a767eb 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -9,7 +9,7 @@ FuchsiaGymScript: ; 7543d (1d:543d) ret FuchsiaGymScript_75453: ; 75453 (1d:5453) - ld hl, $D126 + ld hl, wd126 bit 6, [hl] res 6, [hl] ret z @@ -37,7 +37,7 @@ FuchsiaGymScriptPointers: ; 75482 (1d:5482) dw FuchsiaGymScript3 FuchsiaGymScript3: ; 7548a (1d:548a) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, FuchsiaGymScript_75477 ld a, $f0 @@ -46,7 +46,7 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497) ld a, $9 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d792 + ld hl, wd792 set 1, [hl] ld bc, (TM_06 << 8) | 1 call GiveItem @@ -54,7 +54,7 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497) ld a, $a ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d792 + ld hl, wd792 set 0, [hl] jr .asm_754c0 .BagFull @@ -64,13 +64,13 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497) .asm_754c0 ld hl, W_OBTAINEDBADGES set 4, [hl] - ld hl, $d72a + ld hl, wd72a set 4, [hl] ; deactivate gym trainers - ld a, [$d792] + ld a, [wd792] or %11111100 - ld [$d792], a + ld [wd792], a jp FuchsiaGymScript_75477 @@ -91,7 +91,7 @@ FuchsiaGymTrainerHeaders: ; 754eb (1d:54eb) FuchsiaGymTrainerHeader0: ; 754eb (1d:54eb) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d792 ; flag's byte + dw wd792 ; flag's byte dw FuchsiaGymBattleText1 ; 0x55ae TextBeforeBattle dw FuchsiaGymAfterBattleText1 ; 0x55b8 TextAfterBattle dw FuchsiaGymEndBattleText1 ; 0x55b3 TextEndBattle @@ -100,7 +100,7 @@ FuchsiaGymTrainerHeader0: ; 754eb (1d:54eb) FuchsiaGymTrainerHeader2: ; 754f7 (1d:54f7) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d792 ; flag's byte + dw wd792 ; flag's byte dw FuchsiaGymBattleText2 ; 0x55c7 TextBeforeBattle dw FuchsiaGymAfterBattleText2 ; 0x55d1 TextAfterBattle dw FuchsiaGymEndBattleText2 ; 0x55cc TextEndBattle @@ -109,7 +109,7 @@ FuchsiaGymTrainerHeader2: ; 754f7 (1d:54f7) FuchsiaGymTrainerHeader3: ; 75503 (1d:5503) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d792 ; flag's byte + dw wd792 ; flag's byte dw FuchsiaGymBattleText3 ; 0x55e0 TextBeforeBattle dw FuchsiaGymAfterBattleText3 ; 0x55ea TextAfterBattle dw FuchsiaGymEndBattleText3 ; 0x55e5 TextEndBattle @@ -118,7 +118,7 @@ FuchsiaGymTrainerHeader3: ; 75503 (1d:5503) FuchsiaGymTrainerHeader4: ; 7550f (1d:550f) db $5 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d792 ; flag's byte + dw wd792 ; flag's byte dw FuchsiaGymBattleText4 ; 0x55f9 TextBeforeBattle dw FuchsiaGymAfterBattleText4 ; 0x5603 TextAfterBattle dw FuchsiaGymEndBattleText4 ; 0x55fe TextEndBattle @@ -127,7 +127,7 @@ FuchsiaGymTrainerHeader4: ; 7550f (1d:550f) FuchsiaGymTrainerHeader5: ; 7551b (1d:551b) db $6 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d792 ; flag's byte + dw wd792 ; flag's byte dw FuchsiaGymBattleText5 ; 0x5612 TextBeforeBattle dw FuchsiaGymAfterBattleText5 ; 0x561c TextAfterBattle dw FuchsiaGymEndBattleText5 ; 0x5617 TextEndBattle @@ -136,7 +136,7 @@ FuchsiaGymTrainerHeader5: ; 7551b (1d:551b) FuchsiaGymTrainerHeader6: ; 75527 (1d:5527) db $7 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d792 ; flag's byte + dw wd792 ; flag's byte dw FuchsiaGymBattleText6 ; 0x562b TextBeforeBattle dw FuchsiaGymAfterBattleText6 ; 0x5635 TextAfterBattle dw FuchsiaGymEndBattleText6 ; 0x5630 TextEndBattle @@ -146,7 +146,7 @@ FuchsiaGymTrainerHeader6: ; 75527 (1d:5527) FuchsiaGymText1: ; 75534 (1d:5534) db $08 ; asm - ld a, [$d792] + ld a, [wd792] bit 1, a jr z, .asm_181b6 ; 0x7553a bit 0, a @@ -161,18 +161,18 @@ FuchsiaGymText1: ; 75534 (1d:5534) .asm_181b6 ; 0x75550 ld hl, UnnamedText_75581 call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, UnnamedText_75586 ld de, UnnamedText_75586 call PreBattleSaveRegisters ldh a, [$8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $5 - ld [$d05c], a + ld [W_GYMLEADERNO], a xor a ldh [$b4], a ld a, $3 @@ -318,7 +318,7 @@ FuchsiaGymAfterBattleText6: ; 75635 (1d:5635) FuchsiaGymText8: ; 7563a (1d:563a) db $08 ; asm - ld a, [$d792] + ld a, [wd792] bit 1, a ld hl, UnnamedText_75653 jr nz, .asm_50671 ; 0x75643 diff --git a/scripts/fuchsiahouse2.asm b/scripts/fuchsiahouse2.asm index 82957d2d..33bae7e4 100755 --- a/scripts/fuchsiahouse2.asm +++ b/scripts/fuchsiahouse2.asm @@ -10,19 +10,19 @@ FuchsiaHouse2TextPointers: ; 750b8 (1d:50b8) FuchsiaHouse2Text1: ; 750c2 (1d:50c2) db $08 ; asm - ld a, [$d78e] + ld a, [wd78e] bit 0, a jr nz, .subtract ; 0x750c8 ld b,GOLD_TEETH call IsItemInBag jr nz, .asm_3f30f ; 0x750cf - ld a, [$d78e] + ld a, [wd78e] bit 1, a jr nz, .asm_60cba ; 0x750d6 ld hl, WardenGibberishText1 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a ld hl, WardenGibberishText3 jr nz, .asm_61238 ; 0x750e8 @@ -36,7 +36,7 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2) ld a, GOLD_TEETH ldh [$db], a callba RemoveItemByID - ld hl, $d78e + ld hl, wd78e set 1, [hl] .asm_60cba ; 0x75109 ld hl, WardenThankYouText @@ -46,7 +46,7 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2) jr nc, .BagFull ld hl, ReceivedHM04Text call PrintText - ld hl, $d78e + ld hl, wd78e set 0, [hl] jr .asm_52039 ; 0x75122 .subtract ; 0x75124 diff --git a/scripts/fuchsiahouse3.asm b/scripts/fuchsiahouse3.asm index ec5654ba..372df6a6 100755 --- a/scripts/fuchsiahouse3.asm +++ b/scripts/fuchsiahouse3.asm @@ -6,7 +6,7 @@ FuchsiaHouse3TextPointers: ; 5617f (15:617f) FuchsiaHouse3Text1: ; 56181 (15:6181) db $08 ; asm - ld a, [$d728] + ld a, [wd728] bit 4, a jr nz, .after @@ -14,7 +14,7 @@ FuchsiaHouse3Text1: ; 56181 (15:6181) call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .refused @@ -22,7 +22,7 @@ FuchsiaHouse3Text1: ; 56181 (15:6181) call GiveItem jr nc, .full - ld hl, $d728 + ld hl, wd728 set 4, [hl] ld hl, FuchsiaHouse3Text_561c2 diff --git a/scripts/gary.asm b/scripts/gary.asm index 67b4a424..20140cf7 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -29,11 +29,11 @@ GaryScript0: ; 75f47 (1d:5f47) GaryScript1: ; 75f48 (1d:5f48) ld a, $ff ld [wJoyIgnore], a - ld hl, $ccd3 + ld hl, wccd3 ld de, RLEMovement75f63 call DecodeRLEList dec a - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $2 ld [W_GARYCURSCRIPT], a @@ -46,19 +46,19 @@ RLEMovement75f63: ; 75f63 (1d:5f63) db $ff GaryScript2: ; 75f6a (1d:5f6a) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 xor a ld [wJoyIgnore], a - ld hl, $d355 + ld hl, W_OPTIONS res 7, [hl] ld a, $1 ld [$ff8c], a call DisplayTextID call Delay3 - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, GaryText_760f9 @@ -94,7 +94,7 @@ GaryScript3: ; 75fbb (1d:5fbb) cp $ff jp z, GaryScript_75f29 call UpdateSprites ; move sprites - ld hl, $d867 + ld hl, wd867 set 1, [hl] ld a, $f0 ld [wJoyIgnore], a @@ -121,7 +121,7 @@ GaryScript4: ; 75fe4 (1d:5fe4) ld [$ff8c], a call MoveSprite ld a, $d6 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef ld a, $5 @@ -132,11 +132,11 @@ MovementData_76014: ; 76014 (1d:6014) db $40,$40,$40,$40,$40,$FF GaryScript5: ; 7601a (1d:601a) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $2 - ld [$d528], a + ld [wd528], a ld a, $1 ld [$ff8c], a ld a, $8 @@ -188,11 +188,11 @@ MovementData_76080: ; 76080 (1d:6080) db $40,$40,$FF GaryScript8: ; 76083 (1d:6083) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $d6 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ld a, $9 @@ -202,11 +202,11 @@ GaryScript8: ; 76083 (1d:6083) GaryScript9: ; 76099 (1d:6099) ld a, $ff ld [wJoyIgnore], a - ld hl, $ccd3 + ld hl, wccd3 ld de, RLEMovement760b4 call DecodeRLEList dec a - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $a ld [W_GARYCURSCRIPT], a @@ -218,7 +218,7 @@ RLEMovement760b4 ; 760b4 (1d:60b4) db $ff GaryScript10: ; 760b9 (1d:60b9) - ld a, [$cd38] + ld a, [wcd38] and a ret nz xor a @@ -244,7 +244,7 @@ GaryTextPointers: ; 760d6 (1d:60d6) GaryText1: ; 760e0 (1d:60e0) db $08 ; asm - ld a, [$d867] + ld a, [wd867] bit 1, a ld hl, GaryText_760f4 jr z, .asm_17e9f ; 0x760e9 @@ -275,8 +275,8 @@ GaryText2: ; 76108 (1d:6108) GaryText3: ; 7610d (1d:610d) db $8 - ld a, [$d717] - ld [$d11e], a + ld a, [W_PLAYERSTARTER] + ld [wd11e], a call GetMonName ld hl, GaryText_76120 call PrintText diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index d91fad22..f88d8498 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -21,14 +21,14 @@ HallofFameRoomScript3: ; 5a4ba (16:64ba) HallofFameRoomScript2: ; 5a4bb (16:64bb) call Delay3 - ld a, [$d358] + ld a, [wd358] push af xor a ld [wJoyIgnore], a ld a, $55 call Predef pop af - ld [$d358], a + ld [wd358], a ld hl, W_FLAGS_D733 res 1, [hl] inc hl @@ -40,7 +40,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) ld [hl], a ld [W_LANCECURSCRIPT], a ld [W_HALLOFFAMEROOMCURSCRIPT], a - ld hl, $d863 + ld hl, wd863 ld [hli], a ld [hli], a ld [hli], a @@ -63,11 +63,11 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) HallofFameRoomScript0: ; 5a50d (16:650d) ld a, $ff ld [wJoyIgnore], a - ld hl, $ccd3 + ld hl, wccd3 ld de, RLEMovement5a528 call DecodeRLEList dec a - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $1 ld [W_HALLOFFAMEROOMCURSCRIPT], a @@ -78,11 +78,11 @@ RLEMovement5a528: ; 5a528 (16:6528) db $ff HallofFameRoomScript1: ; 5a52b (16:652b) - ld a, [$cd38] + ld a, [wcd38] and a ret nz ld a, $1 - ld [$d528], a + ld [wd528], a ld a, $1 ld [$ff8c], a call SetSpriteMovementBytesToFF @@ -93,14 +93,14 @@ HallofFameRoomScript1: ; 5a52b (16:652b) xor a ld [wJoyIgnore], a inc a - ld [$d528], a + ld [wd528], a ld a, $1 ld [$ff8c], a call DisplayTextID ld a, $ff ld [wJoyIgnore], a ld a, $8 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ld a, $2 diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm index 861939b6..96221c97 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/indigoplateaulobby.asm @@ -1,17 +1,17 @@ IndigoPlateauLobbyScript: ; 19c5b (6:5c5b) call Func_22fa call EnableAutoTextBoxDrawing - ld hl, $d126 + ld hl, wd126 bit 6, [hl] res 6, [hl] ret z - ld hl, $d869 + ld hl, wd869 res 7, [hl] - ld hl, $d734 + ld hl, wd734 bit 1, [hl] res 1, [hl] ret z - ld hl, $d863 + ld hl, wd863 xor a ld [hli], a ld [hli], a diff --git a/scripts/lab3.asm b/scripts/lab3.asm index d56aba26..66839b17 100755 --- a/scripts/lab3.asm +++ b/scripts/lab3.asm @@ -10,7 +10,7 @@ Lab3TextPointers: ; 75c8a (1d:5c8a) Lab3Text1: ; 75c94 (1d:5c94) db $08 ; asm - ld a, [$d7a1] + ld a, [wd7a1] bit 7, a jr nz, .asm_e551a ; 0x75c9a ld hl, TM35PreReceiveText @@ -20,7 +20,7 @@ Lab3Text1: ; 75c94 (1d:5c94) jr nc, .BagFull ld hl, ReceivedTM35Text call PrintText - ld hl, $d7a1 + ld hl, wd7a1 set 7, [hl] jr .asm_eb896 ; 0x75cb5 .BagFull diff --git a/scripts/lab4.asm b/scripts/lab4.asm index 7bd071ea..a98e8e34 100755 --- a/scripts/lab4.asm +++ b/scripts/lab4.asm @@ -7,8 +7,8 @@ Lab4TextPointers: ; 75d34 (1d:5d34) Lab4Script_75d38: ; 75d38 (1d:5d38) xor a - ld [$cd37], a - ld de, $cc5b + ld [wcd37], a + ld de, wcc5b ld hl, FossilsList .asm_75d42 ld a, [hli] @@ -16,7 +16,7 @@ Lab4Script_75d38: ; 75d38 (1d:5d38) jr z, .asm_75d64 push hl push de - ld [$d11e], a + ld [wd11e], a ld b, a ld a, $1c call Predef ; indirect jump to Func_f8a5 (f8a5 (3:78a5)) @@ -25,11 +25,11 @@ Lab4Script_75d38: ; 75d38 (1d:5d38) ld a, b and a jr z, .asm_75d42 - ld a, [$d11e] + ld a, [wd11e] ld [de], a inc de push hl - ld hl, $cd37 + ld hl, wcd37 inc [hl] pop hl jr .asm_75d42 @@ -46,13 +46,13 @@ FossilsList: ; 75d68 (1d:5d68) Lab4Text1: ; 75d6c (1d:5d6c) db $8 - ld a, [$d7a3] + ld a, [wd7a3] bit 0, a jr nz, .asm_75d96 ; 0x75d72 $22 ld hl, Lab4Text_75dc6 call PrintText call Lab4Script_75d38 - ld a, [$cd37] + ld a, [wcd37] and a jr z, .asm_75d8d ; 0x75d81 $a callba GiveFossilToCinnabarLab @@ -72,14 +72,14 @@ Lab4Text1: ; 75d6c (1d:5d6c) call LoadFossilItemAndMonNameBank1D ld hl, Lab4Text_75dd5 call PrintText - ld hl, $d7a3 + ld hl, wd7a3 set 2, [hl] ld a, [W_FOSSILMON] ld b, a ld c, $1e call GivePokemon jr nc, .asm_75d93 ; 0x75db9 $d8 - ld hl, $d7a3 + ld hl, wd7a3 res 0, [hl] res 1, [hl] res 2, [hl] diff --git a/scripts/lance.asm b/scripts/lance.asm index e2019442..1694704c 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -9,11 +9,11 @@ LanceScript: ; 5a2ae (16:62ae) ret LanceScript_5a2c4: ; 5a2c4 (16:62c4) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z - ld a, [$d866] + ld a, [wd866] bit 7, a jr nz, .asm_5a2da ld a, $31 @@ -25,12 +25,12 @@ LanceScript_5a2c4: ; 5a2c4 (16:62c4) LanceScript_5a2de: ; 5a2de (16:62de) push bc - ld [$d09f], a + ld [wd09f], a ld bc, $602 call LanceScript_5a2f0 pop bc ld a, b - ld [$d09f], a + ld [wd09f], a ld bc, $603 LanceScript_5a2f0: ; 5a2f0 (16:62f0) @@ -53,7 +53,7 @@ LanceScript4: ; 5a304 (16:6304) ret LanceScript0: ; 5a305 (16:6305) - ld a, [$d866] + ld a, [wd866] bit 6, a ret nz ld hl, CoordsData_5a33e @@ -61,7 +61,7 @@ LanceScript0: ; 5a305 (16:6305) jp nc, CheckFightingMapTrainers xor a ld [hJoyHeld], a - ld a, [wWhichTrade] ; $cd3d + ld a, [wWhichTrade] ; wWhichTrade cp $3 jr nc, .asm_5a325 ld a, $1 @@ -70,11 +70,11 @@ LanceScript0: ; 5a305 (16:6305) .asm_5a325 cp $5 jr z, LanceScript_5a35b - ld hl, $d866 + ld hl, wd866 bit 7, [hl] set 7, [hl] ret nz - ld hl, $d126 + ld hl, wd126 set 5, [hl] ld a, (SFX_02_57 - SFX_Headers_02) / 3 call PlaySound @@ -90,7 +90,7 @@ CoordsData_5a33e: ; 5a33e (16:633e) LanceScript2: ; 5a349 (16:6349) call EndTrainerBattle - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, LanceScript_5a2f5 ld a, $1 @@ -100,11 +100,11 @@ LanceScript2: ; 5a349 (16:6349) LanceScript_5a35b: ; 5a35b (16:635b) ld a, $ff ld [wJoyIgnore], a - ld hl, $ccd3 + ld hl, wccd3 ld de, RLEList_5a379 call DecodeRLEList dec a - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $3 ld [W_LANCECURSCRIPT], a @@ -119,7 +119,7 @@ RLEList_5a379: ; 5a379 (16:6379) db $FF LanceScript3: ; 5a382 (16:6382) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 @@ -136,7 +136,7 @@ LanceTrainerHeaders: ; 5a397 (16:6397) LanceTrainerHeader0: ; 5a397 (16:6397) db $1 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d866 ; flag's byte + dw wd866 ; flag's byte dw LanceBeforeBattleText ; 0x63ae TextBeforeBattle dw LanceAfterBattleText ; 0x63b8 TextAfterBattle dw LanceEndBattleText ; 0x63b3 TextEndBattle @@ -161,6 +161,6 @@ LanceEndBattleText: ; 5a3b3 (16:63b3) LanceAfterBattleText: ; 5a3b8 (16:63b8) TX_FAR _LanceAfterBattleText db $8 - ld hl, $d866 + ld hl, wd866 set 6, [hl] jp TextScriptEnd diff --git a/scripts/lavenderhouse1.asm b/scripts/lavenderhouse1.asm index 0f7bf417..5fd1dd34 100755 --- a/scripts/lavenderhouse1.asm +++ b/scripts/lavenderhouse1.asm @@ -12,7 +12,7 @@ LavenderHouse1TextPointers: ; 1d8ac (7:58ac) LavenderHouse1Text1: ; 1d8b8 (7:58b8) db $08 ; asm - ld a, [$d7e0] + ld a, [wd7e0] bit 7, a jr nz, .asm_72e5d ; 0x1d8be ld hl, LavenderHouse1Text_1d8d1 @@ -34,7 +34,7 @@ LavenderHouse1Text_1d8d6: ; 1d8d6 (7:58d6) LavenderHouse1Text2: ; 1d8db (7:58db) db $08 ; asm - ld a, [$d7e0] + ld a, [wd7e0] bit 7, a jr nz, .asm_06470 ; 0x1d8e1 ld hl, LavenderHouse1Text_1d8f4 @@ -70,7 +70,7 @@ LavenderHouse1Text4: ; 1d90b (7:590b) LavenderHouse1Text5: ; 1d918 (7:5918) db $08 ; asm - ld a, [$d76c] + ld a, [wd76c] bit 0, a jr nz, .asm_15ac2 ; 0x1d91e ld hl, LavenderHouse1Text_1d94c @@ -80,7 +80,7 @@ LavenderHouse1Text5: ; 1d918 (7:5918) jr nc, .BagFull ld hl, ReceivedFluteText call PrintText - ld hl, $d76c + ld hl, wd76c set 0, [hl] jr .asm_da749 ; 0x1d939 .BagFull diff --git a/scripts/lavenderhouse2.asm b/scripts/lavenderhouse2.asm index db4f0cab..c2120058 100755 --- a/scripts/lavenderhouse2.asm +++ b/scripts/lavenderhouse2.asm @@ -15,7 +15,7 @@ LavenderHouse2Text1: ; 1d9b6 (7:59b6) LavenderHouse2Text2: ; 1d9c3 (7:59c3) db $08 ; asm - ld a, [$d7e0] + ld a, [wd7e0] bit 7, a jr nz, .asm_65711 ; 0x1d9c9 ld hl, LavenderHouse2Text_1d9dc diff --git a/scripts/lavendermart.asm b/scripts/lavendermart.asm index 78870a66..3852a235 100755 --- a/scripts/lavendermart.asm +++ b/scripts/lavendermart.asm @@ -12,7 +12,7 @@ LavenderMartText2: ; 5c935 (17:4935) LavenderMartText3: ; 5c93a (17:493a) db $08 ; asm - ld a, [$d7e0] + ld a, [wd7e0] bit 7, a jr nz, .asm_c88d4 ; 0x5c940 ld hl, LavenderMart_5c953 diff --git a/scripts/lavendertown.asm b/scripts/lavendertown.asm index 41eb0242..a4f1f200 100755 --- a/scripts/lavendertown.asm +++ b/scripts/lavendertown.asm @@ -17,7 +17,7 @@ LavenderTownText1: ; 44120 (11:4120) ld hl, LavenderTownText_4413c call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a ld hl, LavenderTownText_44146 jr nz, .asm_40831 ; 0x44131 diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index b102d271..b6387fec 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -9,13 +9,13 @@ LoreleiScript: ; 7617b (1d:617b) ret LoreleiScript_76191: ; 76191 (1d:6191) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z - ld hl, $d734 + ld hl, wd734 set 1, [hl] - ld a, [$d863] + ld a, [wd863] bit 1, a jr z, .asm_761a9 ld a, $5 @@ -23,7 +23,7 @@ LoreleiScript_76191: ; 76191 (1d:6191) .asm_761a9 ld a, $24 .asm_761ab - ld [$d09f], a + ld [wd09f], a ld bc, $2 ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -43,7 +43,7 @@ LoreleiScriptPointers: ; 761bb (1d:61bb) LoreleiScript4: ; 761c5 (1d:61c5) ret asm_761c6: ; 761c6 (1d:61c6) - ld hl, $ccd3 + ld hl, wccd3 ld a, $40 ld [hli], a ld [hli], a @@ -52,7 +52,7 @@ asm_761c6: ; 761c6 (1d:61c6) ld [hli], a ld [hl], a ld a, $6 - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $3 ld [W_LORELEICURSCRIPT], a @@ -65,12 +65,12 @@ LoreleiScript0: ; 761e2 (1d:61e2) xor a ld [hJoyPressed], a ld [hJoyHeld], a - ld [$ccd3], a - ld [$cd38], a - ld a, [wWhichTrade] ; $cd3d + ld [wccd3], a + ld [wcd38], a + ld a, [wWhichTrade] ; wWhichTrade cp $3 jr c, .asm_76206 - ld hl, $d863 + ld hl, wd863 bit 6, [hl] set 6, [hl] jr z, asm_761c6 @@ -79,9 +79,9 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID ld a, $40 - ld [$ccd3], a + ld [wccd3], a ld a, $1 - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $3 ld [W_LORELEICURSCRIPT], a @@ -96,7 +96,7 @@ CoordsData_76223: ; 76223 (1d:6223) db $FF LoreleiScript3: ; 7622c (1d:622c) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 @@ -107,7 +107,7 @@ LoreleiScript3: ; 7622c (1d:622c) ret LoreleiScript2: ; 7623f (1d:623f) call EndTrainerBattle - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, LoreleiScript_761b6 ld a, $1 @@ -122,7 +122,7 @@ LoreleiTrainerHeaders: ; 76255 (1d:6255) LoreleiTrainerHeader0: ; 76255 (1d:6255) db $1 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d863 ; flag's byte + dw wd863 ; flag's byte dw LoreleiBeforeBattleText ; 0x626c TextBeforeBattle dw LoreleiAfterBattleText ; 0x6276 TextAfterBattle dw LoreleiEndBattleText ; 0x6271 TextEndBattle diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index 97206711..fe595094 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -9,11 +9,11 @@ Mansion1Script: ; 442af (11:42af) ret Mansion1Subscript1: ; 442c5 (11:42c5) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z - ld a, [$d796] + ld a, [wd796] bit 0, a jr nz, .asm_442ec ; 0x442d2 $18 ld bc, $060c @@ -36,19 +36,19 @@ Mansion1Subscript1: ; 442c5 (11:42c5) Mansion1Script_44304: ; 44304 (11:4304) ld a, $2d - ld [$d09f], a + ld [wd09f], a jr asm_44310 Mansion1Script_4430b: ; 4430b (11:430b) ld a, $e - ld [$d09f], a + ld [wd09f], a asm_44310: ; 44310 (11:4310) ld a, $17 call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) ret Mansion1Script_Switches: ; 44316 (11:4316) - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] cp $4 ret nz xor a @@ -72,7 +72,7 @@ Mansion1TrainerHeaders: ; 44334 (11:4334) Mansion1TrainerHeader0: ; 44334 (11:4334) db $1 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d798 ; flag's byte + dw wd798 ; flag's byte dw Mansion1BattleText2 ; 0x434b TextBeforeBattle dw Mansion1AfterBattleText2 ; 0x4355 TextAfterBattle dw Mansion1EndBattleText2 ; 0x4350 TextEndBattle @@ -103,18 +103,18 @@ Mansion1Text4: ; 4435a (11:435a) ld hl, MansionSwitchText call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_4438c ; 0x44368 $22 ld a, $1 - ld [$cc3c], a - ld hl, $d126 + ld [wcc3c], a + ld hl, wd126 set 5, [hl] ld hl, MansionSwitchPressedText call PrintText ld a, (SFX_02_57 - SFX_Headers_02) / 3 call PlaySound - ld hl, $d796 + ld hl, wd796 bit 0, [hl] set 0, [hl] jr z, .asm_44392 ; 0x44386 $a diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 0b3bd5ff..4d6a11a9 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -9,11 +9,11 @@ Mansion2Script: ; 51fd8 (14:5fd8) ret Mansion2Script_51fee: ; 51fee (14:5fee) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z - ld a, [$d796] + ld a, [wd796] bit 0, a jr nz, .asm_52016 ld a, $e @@ -39,12 +39,12 @@ Mansion2Script_51fee: ; 51fee (14:5fee) ret Mansion2Script_5202f: ; 5202f (14:602f) - ld [$d09f], a + ld [wd09f], a ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) Mansion2Script_Switches: ; 52037 (14:6037) - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] cp $4 ret nz xor a @@ -69,7 +69,7 @@ Mansion2TrainerHeaders: ; 52057 (14:6057) Mansion2TrainerHeader0: ; 52057 (14:6057) db $1 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d847 ; flag's byte + dw wd847 ; flag's byte dw Mansion2BattleText1 ; 0x606e TextBeforeBattle dw Mansion2AfterBattleText1 ; 0x6078 TextAfterBattle dw Mansion2EndBattleText1 ; 0x6073 TextEndBattle @@ -109,18 +109,18 @@ Mansion2Text5: ; 52087 (14:6087) ld hl, Mansion2Text_520c2 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_520b9 ; 0x52095 $22 ld a, $1 - ld [$cc3c], a - ld hl, $d126 + ld [wcc3c], a + ld hl, wd126 set 5, [hl] ld hl, Mansion2Text_520c7 call PrintText ld a, (SFX_02_57 - SFX_Headers_02) / 3 call PlaySound - ld hl, $d796 + ld hl, wd796 bit 0, [hl] set 0, [hl] jr z, .asm_520bf ; 0x520b3 $a diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index d06af9d2..4e9c2271 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -9,11 +9,11 @@ Mansion3Script: ; 521ee (14:61ee) ret Mansion3Script_52204: ; 52204 (14:6204) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z - ld a, [$d796] + ld a, [wd796] bit 0, a jr nz, .asm_52224 ld a, $e @@ -40,7 +40,7 @@ Mansion3ScriptPointers: ; 52235 (14:6235) Mansion3Script0: ; 5223b (14:623b) ld hl, CoordsData_52254 call Mansion3Script_5225b - ld a, [$d71e] + ld a, [wd71e] and a jp z, CheckFightingMapTrainers cp $3 @@ -48,7 +48,7 @@ Mansion3Script0: ; 5223b (14:623b) jr nz, .asm_52250 ld a, $d6 .asm_52250 - ld [$d71d], a + ld [wd71d], a ret CoordsData_52254: ; 52254 (14:6254) @@ -59,22 +59,22 @@ CoordsData_52254: ; 52254 (14:6254) Mansion3Script_5225b: ; 5225b (14:625b) xor a - ld [$d71e], a - ld a, [$d72d] + ld [wd71e], a + ld a, [wd72d] bit 4, a ret nz call ArePlayerCoordsInArray ret nc - ld a, [wWhichTrade] ; $cd3d - ld [$d71e], a - ld hl, $d72d + ld a, [wWhichTrade] ; wWhichTrade + ld [wd71e], a + ld hl, wd72d set 4, [hl] - ld hl, $d732 + ld hl, wd732 set 4, [hl] ret Mansion3Script_Switches: ; 5227a (14:627a) - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] cp $4 ret nz xor a @@ -95,7 +95,7 @@ Mansion3TrainerHeaders: ; 52296 (14:6296) Mansion3TrainerHeader0: ; 52296 (14:6296) db $1 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d849 ; flag's byte + dw wd849 ; flag's byte dw Mansion3BattleText1 ; 0x62c3 TextBeforeBattle dw Mansion3AfterBattleText1 ; 0x62cd TextAfterBattle dw Mansion3EndBattleText1 ; 0x62c8 TextEndBattle @@ -104,7 +104,7 @@ Mansion3TrainerHeader0: ; 52296 (14:6296) Mansion3TrainerHeader2: ; 522a2 (14:62a2) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d849 ; flag's byte + dw wd849 ; flag's byte dw Mansion3BattleText2 ; 0x62d2 TextBeforeBattle dw Mansion3AfterBattleText2 ; 0x62dc TextAfterBattle dw Mansion3EndBattleText2 ; 0x62d7 TextEndBattle diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index 039a1fd4..cfd78c5f 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -9,11 +9,11 @@ Mansion4Script: ; 523b9 (14:63b9) ret Mansion4Script_523cf: ; 523cf (14:63cf) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z - ld a, [$d796] + ld a, [wd796] bit 0, a jr nz, .asm_523ff ld a, $e @@ -45,7 +45,7 @@ Mansion4Script_523cf: ; 523cf (14:63cf) ret Mansion4Script_Switches: ; 52420 (14:6420) - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] cp $4 ret nz xor a @@ -74,7 +74,7 @@ Mansion4TrainerHeaders: ; 52448 (14:6448) Mansion4TrainerHeader0: ; 52448 (14:6448) db $1 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d84b ; flag's byte + dw wd84b ; flag's byte dw Mansion4BattleText1 ; 0x6475 TextBeforeBattle dw Mansion4AfterBattleText1 ; 0x647f TextAfterBattle dw Mansion4EndBattleText1 ; 0x647a TextEndBattle @@ -83,7 +83,7 @@ Mansion4TrainerHeader0: ; 52448 (14:6448) Mansion4TrainerHeader2: ; 52454 (14:6454) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d84b ; flag's byte + dw wd84b ; flag's byte dw Mansion4BattleText2 ; 0x6484 TextBeforeBattle dw Mansion4AfterBattleText2 ; 0x648e TextAfterBattle dw Mansion4EndBattleText2 ; 0x6489 TextEndBattle diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm index 1954391c..42f98d98 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/mtmoon1.asm @@ -32,7 +32,7 @@ MtMoon1TrainerHeaders: ; 499fd (12:59fd) MtMoon1TrainerHeader0: ; 499fd (12:59fd) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7f5 ; flag's byte + dw wd7f5 ; flag's byte dw MtMoon1BattleText2 ; 0x5a98 TextBeforeBattle dw MtMoon1AfterBattleText2 ; 0x5aa2 TextAfterBattle dw MtMoon1EndBattleText2 ; 0x5a9d TextEndBattle @@ -41,7 +41,7 @@ MtMoon1TrainerHeader0: ; 499fd (12:59fd) MtMoon1TrainerHeader2: ; 49a09 (12:5a09) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7f5 ; flag's byte + dw wd7f5 ; flag's byte dw MtMoon1BattleText3 ; 0x5aa7 TextBeforeBattle dw MtMoon1AfterBattleText3 ; 0x5ab1 TextAfterBattle dw MtMoon1EndBattleText3 ; 0x5aac TextEndBattle @@ -50,7 +50,7 @@ MtMoon1TrainerHeader2: ; 49a09 (12:5a09) MtMoon1TrainerHeader3: ; 49a15 (12:5a15) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7f5 ; flag's byte + dw wd7f5 ; flag's byte dw MtMoon1BattleText4 ; 0x5ab6 TextBeforeBattle dw MtMoon1AfterBattleText4 ; 0x5ac0 TextAfterBattle dw MtMoon1EndBattleText4 ; 0x5abb TextEndBattle @@ -59,7 +59,7 @@ MtMoon1TrainerHeader3: ; 49a15 (12:5a15) MtMoon1TrainerHeader4: ; 49a21 (12:5a21) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7f5 ; flag's byte + dw wd7f5 ; flag's byte dw MtMoon1BattleText5 ; 0x5ac5 TextBeforeBattle dw MtMoon1AfterBattleText5 ; 0x5acf TextAfterBattle dw MtMoon1EndBattleText5 ; 0x5aca TextEndBattle @@ -68,7 +68,7 @@ MtMoon1TrainerHeader4: ; 49a21 (12:5a21) MtMoon1TrainerHeader5: ; 49a2d (12:5a2d) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7f5 ; flag's byte + dw wd7f5 ; flag's byte dw MtMoon1BattleText6 ; 0x5ad4 TextBeforeBattle dw MtMoon1AfterBattleText6 ; 0x5ade TextAfterBattle dw MtMoon1EndBattleText6 ; 0x5ad9 TextEndBattle @@ -77,7 +77,7 @@ MtMoon1TrainerHeader5: ; 49a2d (12:5a2d) MtMoon1TrainerHeader6: ; 49a39 (12:5a39) db $6 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7f5 ; flag's byte + dw wd7f5 ; flag's byte dw MtMoon1BattleText7 ; 0x5ae3 TextBeforeBattle dw MtMoon1AfterBattleText7 ; 0x5aed TextAfterBattle dw MtMoon1EndBattleText7 ; 0x5ae8 TextEndBattle @@ -86,7 +86,7 @@ MtMoon1TrainerHeader6: ; 49a39 (12:5a39) MtMoon1TrainerHeader7: ; 49a45 (12:5a45) db $7 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7f5 ; flag's byte + dw wd7f5 ; flag's byte dw MtMoon1BattleText8 ; 0x5af2 TextBeforeBattle dw MtMoon1AfterBattleText8 ; 0x5afc TextAfterBattle dw MtMoon1EndBattleText8 ; 0x5af7 TextEndBattle diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 81d5edd7..c9ac851e 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -5,17 +5,17 @@ MtMoon3Script: ; 49d0b (12:5d0b) ld a, [W_MTMOON3CURSCRIPT] call ExecuteCurMapScriptInTable ld [W_MTMOON3CURSCRIPT], a - ld a, [$d7f6] + ld a, [wd7f6] bit 1, a ret z ld hl, CoordsData_49d37 call ArePlayerCoordsInArray jr nc, .asm_49d31 ; 0x49d29 $6 - ld hl, $d72e + ld hl, wd72e set 4, [hl] ret .asm_49d31 - ld hl, $d72e + ld hl, wd72e res 4, [hl] ret @@ -54,13 +54,13 @@ MtMoon3ScriptPointers: ; 49d63 (12:5d63) dw MtMoon3Script5 MtMoon3Script0: ; 49d6f (12:5d6f) - ld a, [$d7f6] + ld a, [wd7f6] bit 1, a jp nz, MtMoon3Script_49d91 - ld a, [W_YCOORD] ; $d361 + ld a, [W_YCOORD] ; wd361 cp $8 jp nz, MtMoon3Script_49d91 - ld a, [W_XCOORD] ; $d362 + ld a, [W_XCOORD] ; wd362 cp $d jp nz, MtMoon3Script_49d91 xor a @@ -70,18 +70,18 @@ MtMoon3Script0: ; 49d6f (12:5d6f) jp DisplayTextID MtMoon3Script_49d91: ; 49d91 (12:5d91) - ld a, [$d7f6] + ld a, [wd7f6] and $c0 jp z, CheckFightingMapTrainers ret MtMoon3Script3: ; 49d9a (12:5d9a) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, MtMoon3Script_49d58 call UpdateSprites call Delay3 - ld hl, $d7f6 + ld hl, wd7f6 set 1, [hl] xor a ld [wJoyIgnore], a @@ -132,17 +132,17 @@ MovementData_49df9: ; 49df9 (12:5df9) db $40,$FF MtMoon3Script5: ; 49dfb (12:5dfb) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $f0 ld [wJoyIgnore], a ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld a, $a ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld a, [$d7f6] + ld a, [wd7f6] bit 6, a jr z, .asm_49e1d ld a, $6e @@ -150,7 +150,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb) .asm_49e1d ld a, $6d .asm_49e1f - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) xor a @@ -176,7 +176,7 @@ MtMoon3TrainerHeaders: ; 49e48 (12:5e48) MtMoon3TrainerHeader0: ; 49e48 (12:5e48) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7f6 ; flag's byte + dw wd7f6 ; flag's byte dw MtMoon3BattleText2 ; 0x5f9f TextBeforeBattle dw MtMoon3AfterBattleText2 ; 0x5fa9 TextAfterBattle dw MtMoon3EndBattleText2 ; 0x5fa4 TextEndBattle @@ -185,7 +185,7 @@ MtMoon3TrainerHeader0: ; 49e48 (12:5e48) MtMoon3TrainerHeader2: ; 49e54 (12:5e54) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7f6 ; flag's byte + dw wd7f6 ; flag's byte dw MtMoon3BattleText3 ; 0x5fae TextBeforeBattle dw MtMoon3AfterBattleText3 ; 0x5fb8 TextAfterBattle dw MtMoon3EndBattleText3 ; 0x5fb3 TextEndBattle @@ -194,7 +194,7 @@ MtMoon3TrainerHeader2: ; 49e54 (12:5e54) MtMoon3TrainerHeader3: ; 49e60 (12:5e60) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7f6 ; flag's byte + dw wd7f6 ; flag's byte dw MtMoon3BattleText4 ; 0x5fbd TextBeforeBattle dw MtMoon3AfterBattleText4 ; 0x5fc7 TextAfterBattle dw MtMoon3EndBattleText4 ; 0x5fc2 TextEndBattle @@ -203,7 +203,7 @@ MtMoon3TrainerHeader3: ; 49e60 (12:5e60) MtMoon3TrainerHeader4: ; 49e6c (12:5e6c) db $5 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7f6 ; flag's byte + dw wd7f6 ; flag's byte dw MtMoon3BattleText5 ; 0x5fcc TextBeforeBattle dw MtMoon3AfterBattleText5 ; 0x5fd6 TextAfterBattle dw MtMoon3EndBattleText5 ; 0x5fd1 TextEndBattle @@ -213,7 +213,7 @@ MtMoon3TrainerHeader4: ; 49e6c (12:5e6c) MtMoon3Text1: ; 49e79 (12:5e79) db $08 ; asm - ld a, [$d7f6] + ld a, [wd7f6] bit 1, a jr z, .asm_be1e0 ; 0x49e7f and $c0 @@ -224,14 +224,14 @@ MtMoon3Text1: ; 49e79 (12:5e79) .asm_be1e0 ; 0x49e8d ld hl, MtMoon3Text_49f85 call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, MtMoon3Text_49f8a ld de, MtMoon3Text_49f8a call PreBattleSaveRegisters ldh a, [$8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 @@ -271,11 +271,11 @@ MtMoon3Text5: ; 49edf (12:5edf) MtMoon3Text6: ; 49ee9 (12:5ee9) db $08 ; asm ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld hl, MtMoon3Text_49f24 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_1fa5e ; 0x49efc ld bc,(DOME_FOSSIL << 8) | 1 @@ -283,10 +283,10 @@ MtMoon3Text6: ; 49ee9 (12:5ee9) jp nc, MtMoon3Script_49f76 call MtMoon3Script_49f69 ld a, $6d - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef - ld hl, $d7f6 + ld hl, wd7f6 set 6, [hl] ld a, $4 ld [W_MTMOON3CURSCRIPT], a @@ -301,11 +301,11 @@ MtMoon3Text_49f24: ; 49f24 (12:5f24) MtMoon3Text7: ; 49f29 (12:5f29) db $08 ; asm ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld hl, MtMoon3Text_49f64 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_8e988 ; 0x49f3c ld bc, (HELIX_FOSSIL << 8) | 1 @@ -313,10 +313,10 @@ MtMoon3Text7: ; 49f29 (12:5f29) jp nc, MtMoon3Script_49f76 call MtMoon3Script_49f69 ld a, $6e - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef - ld hl, $d7f6 + ld hl, wd7f6 set 7, [hl] ld a, $4 ld [W_MTMOON3CURSCRIPT], a diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index 0b612310..e4515a61 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -23,16 +23,16 @@ MtMoonPokecenterText3: ; 492e7 (12:52e7) MtMoonPokecenterText4: ; 492ec (12:52ec) db $08 ; asm - ld a, [$d7c6] + ld a, [wd7c6] add a jp c, .asm_49353 ld hl, MtMoonPokecenterText_4935c call PrintText ld a, $13 - ld [$d125], a + ld [wd125], a call DisplayTextBoxID call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jp nz, .asm_4934e ldh [$9f], a @@ -49,18 +49,18 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) jr nc, .asm_49359 ; 0x49324 xor a ld [wWhichTrade], a - ld [$cd3f], a + ld [wTrainerFacingDirection], a ld a, $5 - ld [$cd3e], a - ld hl, $cd3f - ld de, $d349 + ld [wTrainerEngageDistance], a + ld hl, wTrainerFacingDirection + ld de, wPlayerMoney + 2 ld c, $3 ld a, $c ; SubtractBCDPredef call Predef ld a, $13 - ld [$d125], a + ld [wd125], a call DisplayTextBoxID - ld hl, $d7c6 + ld hl, wd7c6 set 7, [hl] jr .asm_49359 ; 0x4934c .asm_4934e ; 0x4934e diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index b282b67c..ed36973d 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -1,8 +1,8 @@ Museum1FScript: ; 5c0f7 (17:40f7) ld a, $1 - ld [$cf0c], a + ld [wcf0c], a xor a - ld [$cc3c], a + ld [wcc3c], a ld hl, Museum1FScriptPointers ld a, [W_MUSEUM1FCURSCRIPT] jp CallFunctionInTable @@ -54,14 +54,14 @@ Museum1FText1: ; 5c135 (17:4135) cp $c jp z, Museum1FScript_5c1f9 .asm_d49e7 - ld a, [$d754] + ld a, [wd754] bit 0, a jr nz, .asm_31a16 ld hl, Museum1FText_5c23d call PrintText jp asm_d1145 .asm_b8709 - ld a, [$d754] + ld a, [wd754] bit 0, a jr z, .asm_3ded4 .asm_31a16 @@ -70,14 +70,14 @@ Museum1FText1: ; 5c135 (17:4135) jp asm_d1145 .asm_3ded4 ld a, $13 - ld [$d125], a + ld [wd125], a call DisplayTextBoxID xor a ld [hJoyHeld], a ld hl, Museum1FText_5c21f call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_de133 xor a @@ -93,20 +93,20 @@ Museum1FText1: ; 5c135 (17:4135) .asm_0f3e3 ld hl, Museum1FText_5c224 call PrintText - ld hl, $d754 + ld hl, wd754 set 0, [hl] xor a - ld [$cd3d], a - ld [$cd3e], a + ld [wWhichTrade], a + ld [wTrainerEngageDistance], a ld a, $50 - ld [$cd3f], a - ld hl, $cd3f - ld de, $d349 + ld [wTrainerFacingDirection], a + ld hl, wTrainerFacingDirection + ld de, wPlayerMoney + 2 ld c, $3 ld a, $c ; SubtractBCDPredef call Predef ld a, $13 - ld [$d125], a + ld [wd125], a call DisplayTextBoxID ld a, (SFX_02_5a - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent @@ -116,9 +116,9 @@ Museum1FText1: ; 5c135 (17:4135) ld hl, Museum1FText_5c21a ; $421a call PrintText ld a, $1 - ld [$cd38], a + ld [wcd38], a ld a, $80 - ld [$ccd3], a + ld [wccd3], a call Func_3486 call UpdateSprites jr asm_d1145 @@ -131,7 +131,7 @@ Museum1FScript_5c1f9: ; 5c1f9 (17:41f9) ld hl, Museum1FText_5c22e call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] cp $0 jr nz, .asm_d1144 ld hl, Museum1FText_5c233 @@ -191,7 +191,7 @@ Museum1FText_5c251: ; 5c251 (17:4251) Museum1FText3: ; 5c256 (17:4256) db $08 ; asm - ld a, [$d754] + ld a, [wd754] bit 1, a jr nz, .asm_16599 ; 0x5c25c ld hl, Museum1FText_5c28e @@ -199,10 +199,10 @@ Museum1FText3: ; 5c256 (17:4256) ld bc, (OLD_AMBER << 8) | 1 call GiveItem jr nc, .BagFull - ld hl, $d754 + ld hl, wd754 set 1, [hl] ld a, $34 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ld hl, ReceivedOldAmberText diff --git a/scripts/namerater.asm b/scripts/namerater.asm index 6e927667..31bb5fcb 100755 --- a/scripts/namerater.asm +++ b/scripts/namerater.asm @@ -4,7 +4,7 @@ NameRaterScript: ; 1da12 (7:5a12) NameRaterScript_1da15: ; 1da15 (7:5a15) call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a ret @@ -17,11 +17,11 @@ NameRaterScript_1da20: ; 1da20 (7:5a20) ld c, $b call .asm_1da47 jr c, .asm_1da52 ; 0x1da34 $1c - ld hl, $d177 + ld hl, W_PARTYMON1_OTID ld bc, $002c ld a, [wWhichPokemon] call AddNTimes - ld de, $d359 + ld de, wPlayerID ld c, $2 .asm_1da47 ld a, [de] @@ -49,9 +49,9 @@ NameRaterText1: ; 1da56 (7:5a56) ld hl, NameRaterText_1dab8 call PrintText xor a - ld [$d07d], a - ld [$cfcb], a - ld [$cc35], a + ld [wd07d], a + ld [wcfcb], a + ld [wcc35], a call DisplayPartyMenu push af call GBPalWhiteOutWithDelay3 diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 62f02a9d..0a54082d 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -1,11 +1,11 @@ OaksLabScript: ; 1cb0e (7:4b0e) - ld a, [$d74b] + ld a, [wd74b] bit 6, a call nz, OaksLabScript_1d076 ld a, $1 - ld [$cf0c], a + ld [wcf0c], a xor a - ld [$cc3c], a + ld [wcc3c], a ld hl, OaksLabScriptPointers ld a, [W_OAKSLABCURSCRIPT] jp CallFunctionInTable @@ -32,17 +32,17 @@ OaksLabScriptPointers: ; 1cb28 (7:4b28) dw OaksLabScript18 OaksLabScript0: ; 1cb4e (7:4b4e) - ld a, [$d74b] + ld a, [wd74b] bit 7, a ret z - ld a, [$cf10] + ld a, [wcf10] and a ret nz ld a, $31 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef - ld hl, $d72e + ld hl, wd72e res 4, [hl] ld a, $1 @@ -63,15 +63,15 @@ OakEntryMovement: ; 1cb7e (7:4b7e) db $40,$40,$40,$FF OaksLabScript2: ; 1cb82 (7:4b82) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $31 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ld a, $2e - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef @@ -81,11 +81,11 @@ OaksLabScript2: ; 1cb82 (7:4b82) OaksLabScript3: ; 1cba2 (7:4ba2) call Delay3 - ld hl, $ccd3 + ld hl, wccd3 ld de, PlayerEntryMovementRLE call DecodeRLEList dec a - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $1 ld [$ff8c], a @@ -106,12 +106,12 @@ PlayerEntryMovementRLE: ; 1cbcf (7:4bcf) db $40, $8, $ff OaksLabScript4: ; 1cbd2 (7:4bd2) - ld a, [$cd38] + ld a, [wcd38] and a ret nz - ld hl, $d747 + ld hl, wd747 set 0, [hl] - ld hl, $d74b + ld hl, wd74b set 0, [hl] ld a, $1 ld [$ff8c], a @@ -145,7 +145,7 @@ OaksLabScript5: ; 1cbfd (7:4bfd) ld a, $14 ld [$ff8c], a call DisplayTextID - ld hl, $d74b + ld hl, wd74b set 1, [hl] xor a ld [wJoyIgnore], a @@ -173,19 +173,19 @@ OaksLabScript6: ; 1cc36 (7:4c36) ld [$ff8c], a call DisplayTextID ld a, $1 - ld [$cd38], a + ld [wcd38], a ld a, $40 - ld [$ccd3], a + ld [wccd3], a call Func_3486 ld a, $8 - ld [$d528], a + ld [wd528], a ld a, $7 ld [W_OAKSLABCURSCRIPT], a ret OaksLabScript7: ; 1cc72 (7:4c72) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 @@ -267,7 +267,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) ret OaksLabScript9: ; 1cd00 (7:4d00) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $fc @@ -280,7 +280,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld a, $d ld [$ff8c], a call DisplayTextID - ld a, [$cd3e] + ld a, [wTrainerEngageDistance] cp $2 jr nz, .asm_1cd28 ; 0x1cd22 $4 ld a, $2b @@ -293,14 +293,14 @@ OaksLabScript9: ; 1cd00 (7:4d00) .asm_1cd30 ld a, $2d .asm_1cd32 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef call Delay3 - ld a, [$cd3d] + ld a, [wWhichTrade] ld [W_RIVALSTARTER], a - ld [$cf91], a - ld [$d11e], a + ld [wcf91], a + ld [wd11e], a call GetMonName ld a, $1 ld [$ff8c], a @@ -310,7 +310,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld a, $e ld [$ff8c], a call DisplayTextID - ld hl, $d74b + ld hl, wd74b set 2, [hl] xor a ld [wJoyIgnore], a @@ -329,7 +329,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d) ld [$ff8d], a call Func_34a6 ; face object ld a, $8 - ld [$d528], a + ld [wd528], a ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic ; play music @@ -348,7 +348,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d) ld [$ff95], a ld a, $20 call Predef - ld de, $cc97 + ld de, wcc97 ld a, $1 ld [$ff8c], a call MoveSprite @@ -358,7 +358,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d) ret OaksLabScript11: ; 1cdb9 (7:4db9) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz @@ -380,18 +380,18 @@ OaksLabScript11: ; 1cdb9 (7:4db9) .done ld [W_TRAINERNO], a ld a, $1 - ld [$cf13], a + ld [wcf13], a call Func_32ef ld hl, OaksLabText_1d3be ld de, OaksLabText_1d3c3 call PreBattleSaveRegisters - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] xor a ld [wJoyIgnore], a ld a, $8 - ld [$d528], a + ld [wd528], a ld a, $c ld [W_OAKSLABCURSCRIPT], a ret @@ -400,10 +400,10 @@ OaksLabScript12: ; 1ce03 (7:4e03) ld a, $f0 ld [wJoyIgnore], a ld a, $8 - ld [$d528], a + ld [wd528], a call UpdateSprites ld a, $1 - ld [$cf13], a + ld [wcf13], a call Func_32f9 ld a, $1 ld [$ff8c], a @@ -412,7 +412,7 @@ OaksLabScript12: ; 1ce03 (7:4e03) call Func_34a6 ; face object ld a, $7 call Predef - ld hl, $d74b + ld hl, wd74b set 3, [hl] ld a, $d @@ -439,7 +439,7 @@ OaksLabScript13: ; 1ce32 (7:4e32) .asm_1ce5b ld a, $80 .asm_1ce5d - ld [$cc5b], a + ld [wcc5b], a ld a, $e ld [W_OAKSLABCURSCRIPT], a @@ -449,11 +449,11 @@ OaksLabScript13: ; 1ce32 (7:4e32) db $E0,$00,$00,$00,$00,$00,$FF OaksLabScript14: ; 1ce6d (7:4e6d) - ld a, [$d730] + ld a, [wd730] bit 0, a jr nz, .asm_1ce8c ; 0x1ce72 $18 ld a, $2a - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef xor a @@ -463,24 +463,24 @@ OaksLabScript14: ; 1ce6d (7:4e6d) ld [W_OAKSLABCURSCRIPT], a jr .done ; 0x1ce8a $23 .asm_1ce8c - ld a, [$cf0f] + ld a, [wcf0f] cp $5 jr nz, .asm_1cea8 ; 0x1ce91 $15 ld a, [W_XCOORD] cp $4 jr nz, .asm_1cea1 ; 0x1ce98 $7 ld a, $c - ld [$c109], a + ld [wSpriteStateData1 + 9], a jr .done ; 0x1ce9f $e .asm_1cea1 ld a, $8 - ld [$c109], a + ld [wSpriteStateData1 + 9], a jr .done ; 0x1cea6 $7 .asm_1cea8 cp $4 ret nz xor a - ld [$c109], a + ld [wSpriteStateData1 + 9], a .done ret @@ -489,7 +489,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0) ld [hJoyHeld], a call EnableAutoTextBoxDrawing ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound callba Music_RivalAlternateStart ld a, $15 @@ -497,20 +497,20 @@ OaksLabScript15: ; 1ceb0 (7:4eb0) call DisplayTextID call OaksLabScript_1d02b ld a, $2a - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef - ld a, [$cd37] - ld [$d157], a + ld a, [wcd37] + ld [wd157], a ld b, $0 ld c, a - ld hl, $cc97 + ld hl, wcc97 ld a, $40 call FillMemory ld [hl], $ff ld a, $1 ld [$ff8c], a - ld de, $cc97 + ld de, wcc97 call MoveSprite ld a, $10 @@ -530,7 +530,7 @@ OaksLabScript_1cefd ; 1cefd (7:4efd) jp Func_34a6 ; face object OaksLabScript16: ; 1cf12 (7:4f12) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz call EnableAutoTextBoxDrawing @@ -557,11 +557,11 @@ OaksLabScript16: ; 1cf12 (7:4f12) call DisplayTextID call Delay3 ld a, $2f - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ld a, $30 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef call OaksLabScript_1cefd @@ -577,32 +577,32 @@ OaksLabScript16: ; 1cf12 (7:4f12) ld a, $1b ld [$ff8c], a call DisplayTextID - ld hl, $d74b + ld hl, wd74b set 5, [hl] - ld hl, $d74e + ld hl, wd74e set 0, [hl] ld a, $1 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ld a, $2 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef - ld a, [$d157] + ld a, [wd157] ld b, $0 ld c, a - ld hl, $cc97 + ld hl, wcc97 xor a call FillMemory ld [hl], $ff ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound callba Music_RivalAlternateStart ld a, $1 ld [$ff8c], a - ld de, $cc97 + ld de, wcc97 call MoveSprite ld a, $11 @@ -610,20 +610,20 @@ OaksLabScript16: ; 1cf12 (7:4f12) ret OaksLabScript17: ; 1cfd4 (7:4fd4) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz call Func_2307 ld a, $2a - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef - ld hl, $d7eb + ld hl, wd7eb set 0, [hl] res 1, [hl] set 7, [hl] ld a, $22 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef ld a, $5 @@ -651,11 +651,11 @@ OaksLabScript_1d00a: ; 1d00a (7:500a) inc c jr .asm_1d010 ; 0x1d01a $f4 .GotParcel - ld hl, $d31d + ld hl, wNumBagItems ld a, c ld [wWhichPokemon], a ld a, $1 - ld [$cf96], a + ld [wcf96], a jp RemoveItemFromInventory OaksLabScript_1d02b: ; 1d02b (7:502b) @@ -667,7 +667,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b) cp $3 jr nz, .asm_1d045 ; 0x1d038 $b ld a, $4 - ld [$cd37], a + ld [wcd37], a ld a, $30 ld b, $b jr .asm_1d068 ; 0x1d043 $23 @@ -675,13 +675,13 @@ OaksLabScript_1d02b: ; 1d02b (7:502b) cp $1 jr nz, .asm_1d054 ; 0x1d047 $b ld a, $2 - ld [$cd37], a + ld [wcd37], a ld a, $30 ld b, $9 jr .asm_1d068 ; 0x1d052 $14 .asm_1d054 ld a, $3 - ld [$cd37], a + ld [wcd37], a ld b, $a ld a, [W_XCOORD] cp $4 @@ -695,7 +695,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b) ld a, b ld [$ffed], a ld a, $1 - ld [$cf13], a + ld [wcf13], a call Func_32f9 ret @@ -750,7 +750,7 @@ OaksLabTextPointers: ; 1d082 (7:5082) OaksLabText28: ; 1d0ce (7:50ce) OaksLabText1: ; 1d0ce (7:50ce) db $08 ; asm - ld a, [$d74b] + ld a, [wd74b] bit 0, a jr nz, .asm_1d0de ; 0x1d0d4 ld hl, OaksLabGaryText1 @@ -784,9 +784,9 @@ OaksLabText29: ; 1d102 (7:5102) OaksLabText2: ; 1d102 (7:5102) db $8 ld a, STARTER2 - ld [$cd3d], a + ld [wWhichTrade], a ld a, $3 - ld [$cd3e], a + ld [wTrainerEngageDistance], a ld a, STARTER1 ld b, $2 jr OaksLabScript_1d133 ; 0x1d111 $20 @@ -795,9 +795,9 @@ OaksLabText30: ; 1d113 (7:5113) OaksLabText3: ; 1d113 (7:5113) db $8 ld a, STARTER3 - ld [$cd3d], a + ld [wWhichTrade], a ld a, $4 - ld [$cd3e], a + ld [wTrainerEngageDistance], a ld a, STARTER2 ld b, $3 jr OaksLabScript_1d133 ; 0x1d122 $f @@ -806,18 +806,18 @@ OaksLabText31: ; 1d124 (7:5124) OaksLabText4: ; 1d124 (7:5124) db $8 ld a, STARTER1 - ld [$cd3d], a + ld [wWhichTrade], a ld a, $2 - ld [$cd3e], a + ld [wTrainerEngageDistance], a ld a, STARTER3 ld b, $4 OaksLabScript_1d133: ; 1d133 (7:5133) - ld [$cf91], a - ld [$d11e], a + ld [wcf91], a + ld [wd11e], a ld a, b - ld [$cf13], a - ld a, [$d74b] + ld [wcf13], a + ld a, [wd74b] bit 2, a jp nz, OaksLabScript_1d22d bit 1, a @@ -844,16 +844,16 @@ OaksLabScript_1d157: ; 1d157 (7:5157) ld [$ff8b], a call Func_34fc ld [hl], $c - ld hl, $d730 + ld hl, wd730 set 6, [hl] ld a, $46 call Predef ; DisplayStarterMonDex - ld hl, $d730 + ld hl, wd730 res 6, [hl] call ReloadMapData ld c, $a call DelayFrames - ld a, [$cf13] + ld a, [wcf13] cp $2 jr z, OaksLabLookAtCharmander cp $3 @@ -884,16 +884,16 @@ OaksLabBulbasaurText: ; 1d1ae (7:51ae) OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3) call PrintText ld a, $1 - ld [$cc3c], a + ld [wcc3c], a call YesNoChoice ; yes/no menu - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, OaksLabMonChoiceEnd - ld a, [$cf91] - ld [$d717], a - ld [$d11e], a + ld a, [wcf91] + ld [W_PLAYERSTARTER], a + ld [wd11e], a call GetMonName - ld a, [$cf13] + ld a, [wcf13] cp $2 jr nz, asm_1d1db ; 0x1d1d5 $4 ld a, $2b @@ -906,23 +906,23 @@ asm_1d1db: ; 1d1db (7:51db) asm_1d1e3: ; 1d1e3 (7:51e3) ld a, $2d asm_1d1e5: ; 1d1e5 (7:51e5) - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld hl, OaksLabMonEnergeticText call PrintText ld hl, OaksLabReceivedMonText call PrintText xor a - ld [$cc49], a + ld [wcc49], a ld a, $5 - ld [$d127], a - ld a, [$cf91] - ld [$d11e], a + ld [W_CURENEMYLVL], a + ld a, [wcf91] + ld [wd11e], a call AddPokemonToParty - ld hl, $d72e + ld hl, wd72e set 3, [hl] ld a, $fc ld [wJoyIgnore], a @@ -957,23 +957,23 @@ OaksLabLastMonText: ; 1d243 (7:5243) OaksLabText32: ; 1d248 (7:5248) OaksLabText5: ; 1d248 (7:5248) db $08 ; asm - ld a, [$d747] + ld a, [wd747] bit 6, a jr nz, .asm_50e81 ; 0x1d24e - ld hl, $d2f7 + ld hl, wPokedexOwned ld b, $13 call CountSetBits - ld a, [$d11e] + ld a, [wd11e] cp $2 jr c, .asm_b28b0 ; 0x1d25d - ld a, [$d74b] + ld a, [wd74b] bit 5, a jr z, .asm_b28b0 ; 0x1d264 .asm_50e81 ; 0x1d266 ld hl, OaksLabText_1d31d call PrintText ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld a, $56 call Predef jp .asm_0f042 @@ -981,15 +981,15 @@ OaksLabText5: ; 1d248 (7:5248) ld b,POKE_BALL call IsItemInBag jr nz, .asm_17c30 ; 0x1d27e - ld a, [$d7eb] + ld a, [wd7eb] bit 5, a jr nz, .asm_f1adc ; 0x1d285 - ld a, [$d74b] + ld a, [wd74b] bit 5, a jr nz, .asm_333a2 ; 0x1d28c bit 3, a jr nz, .asm_76269 ; 0x1d290 - ld a, [$d72e] + ld a, [wd72e] bit 3, a jr nz, .asm_4a5e0 ; 0x1d297 ld hl, OaksLabText_1d2f0 @@ -1018,7 +1018,7 @@ OaksLabText5: ; 1d248 (7:5248) call PrintText jr .asm_0f042 ; 0x1d2ce .asm_f1adc ; 0x1d2d0 - ld hl, $d74b + ld hl, wd74b bit 4, [hl] set 4, [hl] jr nz, .asm_17c30 ; 0x1d2d7 diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index 4fa61c95..d87668fd 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -1,8 +1,8 @@ PalletTownScript: ; 18e5b (6:4e5b) - ld a,[$D74B] + ld a,[wd74b] bit 4,a jr z,.next - ld hl,$D747 + ld hl,wd747 set 6,[hl] .next call EnableAutoTextBoxDrawing @@ -20,7 +20,7 @@ PalletTownScriptPointers: ; 18e73 (6:4e73) dw PalletTownScript6 PalletTownScript0: ; 18e81 (6:4e81) - ld a,[$D747] + ld a,[wd747] bit 0,a ret nz ld a,[W_YCOORD] @@ -29,7 +29,7 @@ PalletTownScript0: ; 18e81 (6:4e81) xor a ld [hJoyHeld],a ld a,4 - ld [$D528],a + ld [wd528],a ld a,$FF call PlaySound ; stop music ld a, BANK(Music_MeetProfOak) @@ -38,7 +38,7 @@ PalletTownScript0: ; 18e81 (6:4e81) call PlayMusic ; plays music ld a,$FC ld [wJoyIgnore],a - ld hl,$D74B + ld hl,wd74b set 7,[hl] ; trigger the next script @@ -48,14 +48,14 @@ PalletTownScript0: ; 18e81 (6:4e81) PalletTownScript1: ; 18eb2 (6:4eb2) xor a - ld [$CF0D],a + ld [wcf0d],a ld a,1 ld [$FF8C],a call DisplayTextID ld a,$FF ld [wJoyIgnore],a ld a,0 - ld [$CC4D],a + ld [wcc4d],a ld a,$15 call Predef @@ -83,8 +83,8 @@ PalletTownScript2: ; 18ed2 (6:4ed2) ld hl,$FF95 dec [hl] ld a,$20 - call Predef ; load Oak’s movement into $CC97 - ld de,$CC97 + call Predef ; load Oak’s movement into wcc97 + ld de,wcc97 ld a,1 ; oak ld [$FF8C],a call MoveSprite @@ -97,13 +97,13 @@ PalletTownScript2: ; 18ed2 (6:4ed2) ret PalletTownScript3: ; 18f12 (6:4f12) - ld a,[$D730] + ld a,[wd730] bit 0,a ret nz xor a - ld [$C109],a + ld [wSpriteStateData1 + 9],a ld a,1 - ld [$CF0D],a + ld [wcf0d],a ld a,$FC ld [wJoyIgnore],a ld a,1 @@ -112,13 +112,13 @@ PalletTownScript3: ; 18f12 (6:4f12) ld a,$FF ld [wJoyIgnore],a ld a,1 - ld [$CF13],a + ld [wcf13],a xor a - ld [$CF10],a + ld [wcf10],a ld a,1 - ld [$CC57],a + ld [wcc57],a ld a,[H_LOADEDROMBANK] - ld [$CC58],a + ld [wcc58],a ; trigger the next script ld a,4 @@ -126,7 +126,7 @@ PalletTownScript3: ; 18f12 (6:4f12) ret PalletTownScript4: ; 18f4b (6:4f4b) - ld a,[$CC57] + ld a,[wcc57] and a ret nz @@ -136,27 +136,27 @@ PalletTownScript4: ; 18f4b (6:4f4b) ret PalletTownScript5: ; 18f56 (6:4f56) - ld a,[$D74A] + ld a,[wd74a] bit 2,a jr nz,.next and 3 cp 3 jr nz,.next - ld hl,$D74A + ld hl,wd74a set 2,[hl] ld a,$27 - ld [$CC4D],a + ld [wcc4d],a ld a,$11 call Predef ld a,$28 - ld [$CC4D],a + ld [wcc4d],a ld a,$15 jp Predef .next - ld a,[$D74B] + ld a,[wd74b] bit 4,a ret z - ld hl,$D74B + ld hl,wd74b set 6,[hl] PalletTownScript6: ; 18f87 (6:4f87) ret @@ -172,11 +172,11 @@ PalletTownTextPointers: ; 18f88 (6:4f88) PalletTownText1: ; 18f96 (6:4f96) db 8 - ld a,[$CF0D] + ld a,[wcf0d] and a jr nz,.next ld a,1 - ld [$CC3C],a + ld [wcc3c],a ld hl,OakAppearsText jr .done .next @@ -191,12 +191,12 @@ OakAppearsText: ; 18fb0 (6:4fb0) ld c,10 call DelayFrames xor a - ld [$CD4F],a - ld [$CD50],a + ld [wcd4f],a + ld [wcd50],a ld a,$4C call Predef ; display ! over head ld a,4 - ld [$D528],a + ld [wd528],a jp TextScriptEnd OakWalksUpText: ; 18fce (6:4fce) diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 6c7dad16..5f4fea82 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -16,13 +16,13 @@ PewterCityScriptPointers: ; 19243 (6:5243) PewterCityScript0: ; 19251 (6:5251) xor a ld [W_MUSEUM1FCURSCRIPT], a - ld hl, $d754 + ld hl, wd754 res 0, [hl] call PewterCityScript_1925e ret PewterCityScript_1925e: ; 1925e (6:525e) - ld a, [$d755] + ld a, [wd755] bit 7, a ret nz ld hl, CoordsData_19277 @@ -42,7 +42,7 @@ CoordsData_19277: ; 19277 (6:5277) db $ff PewterCityScript1: ; 19280 (6:5280) - ld a, [$cc57] + ld a, [wcc57] and a ret nz ld a, $3 @@ -68,7 +68,7 @@ PewterCityScript1: ; 19280 (6:5280) ld a, $11 ld [$ffee], a ld a, $3 - ld [$cf13], a + ld [wcf13], a call Func_32f9 ld a, $3 ld [$ff8c], a @@ -82,11 +82,11 @@ MovementData_PewterMuseumGuyExit: ; 192ce (6:52ce) db $00,$00,$00,$00,$FF PewterCityScript2: ; 192d3 (6:52d3) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $3 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ld a, $3 @@ -95,10 +95,10 @@ PewterCityScript2: ; 192d3 (6:52d3) PewterCityScript3: ; 192e9 (6:52e9) ld a, $3 - ld [$cf13], a + ld [wcf13], a call Func_32fe ld a, $3 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef xor a @@ -108,7 +108,7 @@ PewterCityScript3: ; 192e9 (6:52e9) ret PewterCityScript4: ; 19305 (6:5305) - ld a, [$cc57] + ld a, [wcc57] and a ret nz ld a, $5 @@ -134,7 +134,7 @@ PewterCityScript4: ; 19305 (6:5305) ld a, $10 ld [$ffee], a ld a, $5 - ld [$cf13], a + ld [wcf13], a call Func_32f9 ld a, $5 ld [$ff8c], a @@ -148,11 +148,11 @@ MovementData_PewterGymGuyExit: ; 19353 (6:5353) db $C0,$C0,$C0,$C0,$C0,$FF PewterCityScript5: ; 19359 (6:5359) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $4 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ld a, $6 @@ -161,10 +161,10 @@ PewterCityScript5: ; 19359 (6:5359) PewterCityScript6: ; 1936f (6:536f) ld a, $5 - ld [$cf13], a + ld [wcf13], a call Func_32fe ld a, $4 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef xor a @@ -202,7 +202,7 @@ PewterCityText3: ; 193b1 (6:53b1) ld hl, PewterCityText_193f1 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_f46a9 ; 0x193bf ld hl, PewterCityText_193f6 @@ -214,13 +214,13 @@ PewterCityText3: ; 193b1 (6:53b1) xor a ldh [$b3], a ldh [$b4], a - ld [$cf10], a + ld [wcf10], a ld a, $2 - ld [$cc57], a + ld [wcc57], a ldh a, [$b8] - ld [$cc58], a + ld [wcc58], a ld a, $3 - ld [$cf13], a + ld [wcf13], a call Func_32f4 ld a, $1 ld [W_PEWTERCITYCURSCRIPT], a @@ -248,7 +248,7 @@ PewterCityText4: ; 19405 (6:5405) ld hl, PewterCityText_19427 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] cp $0 jr nz, .asm_e4603 ld hl, PewterCityText_1942c @@ -278,13 +278,13 @@ PewterCityText5: ; 19436 (6:5436) call PrintText xor a ldh [$b4], a - ld [$cf10], a + ld [wcf10], a ld a, $3 - ld [$cc57], a + ld [wcc57], a ldh a, [$b8] - ld [$cc58], a + ld [wcc58], a ld a, $5 - ld [$cf13], a + ld [wcf13], a call Func_32f4 ld a, $4 ld [W_PEWTERCITYCURSCRIPT], a diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index e6dfdefa..e718538f 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -1,5 +1,5 @@ PewterGymScript: ; 5c387 (17:4387) - ld hl, $d126 + ld hl, wd126 bit 6, [hl] res 6, [hl] call nz, PewterGymScript_5c3a4 @@ -36,7 +36,7 @@ PewterGymScriptPointers: ; 5c3ca (17:43ca) dw PewterGymScript3 PewterGymScript3: ; 5c3d2 (17:43d2) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, PewterGymScript_5c3bf ld a, $f0 @@ -46,7 +46,7 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) ld a, $4 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d755 + ld hl, wd755 set 7, [hl] ld bc, (TM_34 << 8) | 1 call GiveItem @@ -54,7 +54,7 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) ld a, $5 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d755 + ld hl, wd755 set 6, [hl] jr .asm_5c408 .BagFull @@ -64,24 +64,24 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) .asm_5c408 ld hl, W_OBTAINEDBADGES set 0, [hl] - ld hl, $d72a + ld hl, wd72a set 0, [hl] ld a, $4 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) ld a, $22 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) - ld hl, $d7eb + ld hl, wd7eb res 0, [hl] res 7, [hl] ; deactivate gym trainers - ld hl, $d755 + ld hl, wd755 set 2, [hl] jp PewterGymScript_5c3bf @@ -98,7 +98,7 @@ PewterGymTrainerHeaders: ; 5c441 (17:4441) PewterGymTrainerHeader0: ; 5c441 (17:4441) db $2 ; flag's bit db ($5 << 4) ; trainer's view range - dw $d755 ; flag's byte + dw wd755 ; flag's byte dw PewterGymBattleText1 ; 0x44d0 TextBeforeBattle dw PewterGymAfterBattleText1 ; 0x44da TextAfterBattle dw PewterGymEndBattleText1 ; 0x44d5 TextEndBattle @@ -108,7 +108,7 @@ PewterGymTrainerHeader0: ; 5c441 (17:4441) PewterGymText1: ; 5c44e (17:444e) db $08 ; asm - ld a, [$d755] + ld a, [wd755] bit 7, a jr z, .asm_4a735 ; 0x5c454 bit 6, a @@ -123,18 +123,18 @@ PewterGymText1: ; 5c44e (17:444e) .asm_4a735 ; 0x5c46a ld hl, PewterGymText_5c49e call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, PewterGymText_5c4bc ld de, PewterGymText_5c4bc call PreBattleSaveRegisters ldh a, [$8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $1 - ld [$d05c], a + ld [W_GYMLEADERNO], a xor a ldh [$b4], a ld a, $3 @@ -191,13 +191,13 @@ PewterGymAfterBattleText1: ; 5c4da (17:44da) PewterGymText3: ; 5c4df (17:44df) db $08 ; asm - ld a, [$d72a] + ld a, [wd72a] bit 0, a jr nz, .asm_71369 ; 0x5c4e5 ld hl, PewterGymText_5c515 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_6123a ; 0x5c4f4 ld hl, PewterGymText_5c51a diff --git a/scripts/pewtermart.asm b/scripts/pewtermart.asm index 3abe2a93..4e867aee 100755 --- a/scripts/pewtermart.asm +++ b/scripts/pewtermart.asm @@ -1,7 +1,7 @@ PewterMartScript: ; 74cad (1d:4cad) call EnableAutoTextBoxDrawing ld a, $1 - ld [$cf0c], a + ld [wcf0c], a ret PewterMartTextPointers: ; 74cb6 (1d:4cb6) diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 4b97a01d..252c6d5b 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -18,7 +18,7 @@ PewterPokecenterText2: ; 5c596 (17:4596) PewterPokecenterText3: ; 5c59b (17:459b) db $8 ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld hl, PewterPokecenterText5 call PrintText ld a, $ff @@ -26,11 +26,11 @@ PewterPokecenterText3: ; 5c59b (17:459b) ld c, $20 call DelayFrames ld hl, Unknown_5c608 ; $4608 - ld de, $cd3f + ld de, wTrainerFacingDirection ld bc, $0004 call CopyData - ld a, [$c132] - ld hl, $cd3f + ld a, [wSpriteStateData1 + $32] + ld hl, wTrainerFacingDirection .asm_5c5c3 cp [hl] inc hl @@ -43,20 +43,20 @@ PewterPokecenterText3: ; 5c59b (17:459b) pop hl .asm_5c5d1 ld a, [hl] - ld [$c132], a + ld [wSpriteStateData1 + $32], a push hl - ld hl, $cd3f - ld de, $cd3e + ld hl, wTrainerFacingDirection + ld de, wTrainerEngageDistance ld bc, $0004 call CopyData - ld a, [$cd3e] - ld [$cd42], a + ld a, [wTrainerEngageDistance] + ld [wcd42], a pop hl ld c, $18 call DelayFrames - ld a, [$c026] + ld a, [wc026] ld b, a - ld a, [$c027] + ld a, [wc027] or b jr nz, .asm_5c5d1 ; 0x5c5f6 $d9 ld c, $30 diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index 7a77befc..e1357b34 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -17,31 +17,31 @@ PokemonTower2ScriptPointers: ; 60509 (18:4509) dw PokemonTower2Script2 PokemonTower2Script0: ; 6050f (18:450f) - ld a, [$d764] + ld a, [wd764] bit 7, a ret nz ld hl, CoordsData_6055e ; $455e call ArePlayerCoordsInArray ret nc ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld hl, $d764 + ld hl, wd764 res 6, [hl] - ld a, [$cd3d] + ld a, [wWhichTrade] cp $1 ld a, $8 ld b, $0 jr nz, .asm_60544 ; 0x60539 $9 - ld hl, $d764 + ld hl, wd764 set 6, [hl] ld a, $2 ld b, $c .asm_60544 - ld [$d528], a + ld [wd528], a ld a, $1 ld [$ff8c], a ld a, b @@ -61,18 +61,18 @@ CoordsData_6055e: ; 6055e (18:455e) db $0F ; isn't this supposed to end in $ff? PokemonTower2Script1: ; 60563 (18:4563) - ld a, [$d057] + ld a, [W_ISINBATTLE] cp $ff jp z, PokemonTower2Script_604fe ld a, $f0 ld [wJoyIgnore], a - ld hl, $d764 + ld hl, wd764 set 7, [hl] ld a, $1 ld [$ff8c], a call DisplayTextID ld de, MovementData_605b2 - ld a, [$d764] + ld a, [wd764] bit 6, a jr nz, .asm_60589 ; 0x60584 $3 ld de, MovementData_605a9 @@ -81,7 +81,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld [$ff8c], a call MoveSprite ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound callba Music_RivalAlternateStart ld a, $2 @@ -96,11 +96,11 @@ MovementData_605b2: ; 605b2 (18:45b2) db $00,$00,$C0,$C0,$C0,$C0,$00,$00,$FF PokemonTower2Script2: ; 605bb (18:45bb) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $38 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef xor a @@ -117,7 +117,7 @@ PokemonTower2TextPointers: ; 605db (18:45db) PokemonTower2Text1: ; 605df (18:45df) db $08 ; asm - ld a, [$d764] + ld a, [wd764] bit 7, a jr z, .asm_16f24 ; 0x605e5 ld hl, PokemonTower2Text_6063c @@ -126,7 +126,7 @@ PokemonTower2Text1: ; 605df (18:45df) .asm_16f24 ; 0x605ef ld hl, PokemonTower2Text_6062d call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, PokemonTower2Text_60632 diff --git a/scripts/pokemontower3.asm b/scripts/pokemontower3.asm index 74568a83..f05623fb 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/pokemontower3.asm @@ -22,7 +22,7 @@ PokemonTower3TrainerHeaders: ; 606ed (18:46ed) PokemonTower3TrainerHeader0: ; 606ed (18:46ed) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d765 ; flag's byte + dw wd765 ; flag's byte dw PokemonTower3BattleText1 ; 0x4730 TextBeforeBattle dw PokemonTower3AfterBattleText1 ; 0x473a TextAfterBattle dw PokemonTower3EndBattleText1 ; 0x4735 TextEndBattle @@ -31,7 +31,7 @@ PokemonTower3TrainerHeader0: ; 606ed (18:46ed) PokemonTower3TrainerHeader1: ; 606f9 (18:46f9) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d765 ; flag's byte + dw wd765 ; flag's byte dw PokemonTower3BattleText2 ; 0x473f TextBeforeBattle dw PokemonTower3AfterBattleText2 ; 0x4749 TextAfterBattle dw PokemonTower3EndBattleText2 ; 0x4744 TextEndBattle @@ -40,7 +40,7 @@ PokemonTower3TrainerHeader1: ; 606f9 (18:46f9) PokemonTower3TrainerHeader2: ; 60705 (18:4705) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d765 ; flag's byte + dw wd765 ; flag's byte dw PokemonTower3BattleText3 ; 0x474e TextBeforeBattle dw PokemonTower3AfterBattleText3 ; 0x4758 TextAfterBattle dw PokemonTower3EndBattleText3 ; 0x4753 TextEndBattle diff --git a/scripts/pokemontower4.asm b/scripts/pokemontower4.asm index 05fcb23f..e48b9681 100755 --- a/scripts/pokemontower4.asm +++ b/scripts/pokemontower4.asm @@ -24,7 +24,7 @@ PokemonTower4TrainerHeaders: ; 6081b (18:481b) PokemonTower4TrainerHeader0: ; 6081b (18:481b) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d766 ; flag's byte + dw wd766 ; flag's byte dw PokemonTower4BattleText1 ; 0x485e TextBeforeBattle dw PokemonTower4AfterBattleText1 ; 0x4868 TextAfterBattle dw PokemonTower4EndBattleText1 ; 0x4863 TextEndBattle @@ -33,7 +33,7 @@ PokemonTower4TrainerHeader0: ; 6081b (18:481b) PokemonTower4TrainerHeader1: ; 60827 (18:4827) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d766 ; flag's byte + dw wd766 ; flag's byte dw PokemonTower4BattleText2 ; 0x486d TextBeforeBattle dw PokemonTower4AfterBattleText2 ; 0x4877 TextAfterBattle dw PokemonTower4EndBattleText2 ; 0x4872 TextEndBattle @@ -42,7 +42,7 @@ PokemonTower4TrainerHeader1: ; 60827 (18:4827) PokemonTower4TrainerHeader2: ; 60833 (18:4833) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d766 ; flag's byte + dw wd766 ; flag's byte dw PokemonTower4BattleText3 ; 0x487c TextBeforeBattle dw PokemonTower4AfterBattleText3 ; 0x4886 TextAfterBattle dw PokemonTower4EndBattleText3 ; 0x4881 TextEndBattle diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm index 85cdee21..0f164ab4 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/pokemontower5.asm @@ -16,13 +16,13 @@ PokemonTower5Script0: ; 6094b (18:494b) ld hl, CoordsData_60992 ; $4992 call ArePlayerCoordsInArray jr c, .asm_60960 - ld hl, $d72e + ld hl, wd72e res 4, [hl] - ld hl, $d767 + ld hl, wd767 res 7, [hl] jp CheckFightingMapTrainers .asm_60960 - ld hl, $d767 + ld hl, wd767 bit 7, [hl] set 7, [hl] ret nz @@ -30,7 +30,7 @@ PokemonTower5Script0: ; 6094b (18:494b) ld [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a - ld hl, $d72e + ld hl, wd72e set 4, [hl] ld a, $7 call Predef ; indirect jump to HealParty (f6a5 (3:76a5)) @@ -65,7 +65,7 @@ PokemonTower5TrainerHeaders: ; 609a9 (18:49a9) PokemonTower5TrainerHeader0: ; 609a9 (18:49a9) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d767 ; flag's byte + dw wd767 ; flag's byte dw PokemonTower5BattleText1 ; 0x49e9 TextBeforeBattle dw PokemonTower5AfterBattleText1 ; 0x49f3 TextAfterBattle dw PokemonTower5EndBattleText1 ; 0x49ee TextEndBattle @@ -74,7 +74,7 @@ PokemonTower5TrainerHeader0: ; 609a9 (18:49a9) PokemonTower5TrainerHeader1: ; 609b5 (18:49b5) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d767 ; flag's byte + dw wd767 ; flag's byte dw PokemonTower5BattleText2 ; 0x4a02 TextBeforeBattle dw PokemonTower5AfterBattleText2 ; 0x4a0c TextAfterBattle dw PokemonTower5EndBattleText2 ; 0x4a07 TextEndBattle @@ -83,7 +83,7 @@ PokemonTower5TrainerHeader1: ; 609b5 (18:49b5) PokemonTower5TrainerHeader2: ; 609c1 (18:49c1) db $4 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d767 ; flag's byte + dw wd767 ; flag's byte dw PokemonTower5BattleText3 ; 0x4a1b TextBeforeBattle dw PokemonTower5AfterBattleText3 ; 0x4a25 TextAfterBattle dw PokemonTower5EndBattleText3 ; 0x4a20 TextEndBattle @@ -92,7 +92,7 @@ PokemonTower5TrainerHeader2: ; 609c1 (18:49c1) PokemonTower5TrainerHeader3: ; 609cd (18:49cd) db $5 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d767 ; flag's byte + dw wd767 ; flag's byte dw PokemonTower5BattleText4 ; 0x4a34 TextBeforeBattle dw PokemonTower5AfterBattleText4 ; 0x4a3e TextAfterBattle dw PokemonTower5EndBattleText4 ; 0x4a39 TextEndBattle diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index 2b61857f..b7be3941 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -22,7 +22,7 @@ PokemonTower6ScriptPointers: ; 60b0d (18:4b0d) dw PokemonTower6Script4 PokemonTower6Script0: ; 60b17 (18:4b17) - ld a, [$d768] + ld a, [wd768] bit 7, a jp nz, CheckFightingMapTrainers ld hl, CoordsData_60b45 ; $4b45 @@ -34,9 +34,9 @@ PokemonTower6Script0: ; 60b17 (18:4b17) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID ld a, MAROWAK - ld [W_CUROPPONENT], a ; $d059 + ld [W_CUROPPONENT], a ; wd059 ld a, 30 - ld [W_CURENEMYLVL], a ; $d127 + ld [W_CURENEMYLVL], a ; W_CURENEMYLVL ld a, $4 ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_CURMAPSCRIPT], a @@ -46,21 +46,21 @@ CoordsData_60b45: ; 60b45 (18:4b45) db $10,$0A,$FF PokemonTower6Script4: ; 60b48 (18:4b48) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, Func_60b02 ld a, $ff ld [wJoyIgnore], a - ld a, [$d72d] + ld a, [wd72d] bit 6, a ret nz call UpdateSprites ld a, $f0 ld [wJoyIgnore], a - ld a, [$cf0b] + ld a, [wcf0b] and a jr nz, .asm_60b82 - ld hl, $d768 + ld hl, wd768 set 7, [hl] ld a, $7 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c @@ -73,13 +73,13 @@ PokemonTower6Script4: ; 60b48 (18:4b48) ret .asm_60b82 ld a, $1 - ld [$cd38], a + ld [wcd38], a ld a, $10 - ld [$ccd3], a + ld [wccd3], a xor a - ld [$c206], a - ld [$cd3b], a - ld hl, $d730 + ld [wSpriteStateData2 + $06], a + ld [wcd3b], a + ld hl, wd730 set 7, [hl] ld a, $3 ld [W_POKEMONTOWER6CURSCRIPT], a @@ -87,7 +87,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48) ret PokemonTower6Script3: ; 60ba1 (18:4ba1) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 @@ -109,7 +109,7 @@ PokemonTower6TrainerHeaders: ; 60bbf (18:4bbf) PokemonTower6TrainerHeader0: ; 60bbf (18:4bbf) db $1 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d768 ; flag's byte + dw wd768 ; flag's byte dw PokemonTower6BattleText1 ; 0x4c29 TextBeforeBattle dw PokemonTower6AfterBattleText1 ; 0x4c33 TextAfterBattle dw PokemonTower6EndBattleText1 ; 0x4c2e TextEndBattle @@ -118,7 +118,7 @@ PokemonTower6TrainerHeader0: ; 60bbf (18:4bbf) PokemonTower6TrainerHeader1: ; 60bcb (18:4bcb) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d768 ; flag's byte + dw wd768 ; flag's byte dw PokemonTower6BattleText2 ; 0x4c38 TextBeforeBattle dw PokemonTower6AfterBattleText2 ; 0x4c42 TextAfterBattle dw PokemonTower6EndBattleText2 ; 0x4c3d TextEndBattle @@ -127,7 +127,7 @@ PokemonTower6TrainerHeader1: ; 60bcb (18:4bcb) PokemonTower6TrainerHeader2: ; 60bd7 (18:4bd7) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d768 ; flag's byte + dw wd768 ; flag's byte dw PokemonTower6BattleText3 ; 0x4c47 TextBeforeBattle dw PokemonTower6AfterBattleText3 ; 0x4c51 TextAfterBattle dw PokemonTower6EndBattleText3 ; 0x4c4c TextEndBattle diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index e2806f70..5a51e468 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -24,13 +24,13 @@ PokemonTower7ScriptPointers: ; 60d23 (18:4d23) PokemonTower7Script2: ; 60d23 (18:4d23) ld hl, wFlags_0xcd60 res 0, [hl] - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, PokemonTower7Script_60d18 call EndTrainerBattle ld a, $f0 ld [wJoyIgnore], a - ld a, [$cf13] + ld a, [wcf13] ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID call PokemonTower7Script_60db6 @@ -40,25 +40,25 @@ PokemonTower7Script2: ; 60d23 (18:4d23) ret PokemonTower7Script3: ; 60d56 (18:4d56) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld hl, W_MISSABLEOBJECTLIST - ld a, [$cf13] + ld a, [wcf13] ld b, a .missableObjectsListLoop ld a, [hli] cp b ; search for sprite ID in missing objects list ld a, [hli] jr nz, .missableObjectsListLoop - ld [$cc4d], a ; remove missable object + ld [wcc4d], a ; remove missable object ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) xor a ld [wJoyIgnore], a - ld [$cf13], a + ld [wcf13], a ld [wTrainerHeaderFlagBit], a - ld [$da38], a + ld [wda38], a ld a, $0 ld [W_POKEMONTOWER7CURSCRIPT], a ld [W_CURMAPSCRIPT], a @@ -68,18 +68,18 @@ PokemonTower7Script4: ; 60d86 (18:4d86) ld a, $ff ld [wJoyIgnore], a ld a, $43 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) ld a, $4 - ld [$c109], a + ld [wSpriteStateData1 + 9], a ld a, $95 ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld a, $1 - ld [$d42f], a + ld [wd42f], a ld a, LAVENDER_TOWN ld [wLastMap], a - ld hl, $d72d + ld hl, wd72d set 3, [hl] ld a, $0 ld [W_POKEMONTOWER7CURSCRIPT], a @@ -88,15 +88,15 @@ PokemonTower7Script4: ; 60d86 (18:4d86) PokemonTower7Script_60db6: ; 60db6 (18:4db6) ld hl, CoordsData_60de3 ; $4de3 - ld a, [$cf13] + ld a, [wcf13] dec a swap a ld d, $0 ld e, a add hl, de - ld a, [W_YCOORD] ; $d361 + ld a, [W_YCOORD] ; wd361 ld b, a - ld a, [W_XCOORD] ; $d362 + ld a, [W_XCOORD] ; wd362 ld c, a .asm_60dcb ld a, [hli] @@ -108,7 +108,7 @@ PokemonTower7Script_60db6: ; 60db6 (18:4db6) ld a, [hli] ld d, [hl] ld e, a - ld a, [$cf13] + ld a, [wcf13] ld [H_DOWNARROWBLINKCNT2], a ; $ff8c jp MoveSprite .asm_60dde @@ -172,7 +172,7 @@ PokemonTower7TrainerHeaders: ; 60e47 (18:4e47) PokemonTower7TrainerHeader0: ; 60e47 (18:4e47) db $1 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d769 ; flag's byte + dw wd769 ; flag's byte dw PokemonTower7BattleText1 ; 0x4ec9 TextBeforeBattle dw PokemonTower7AfterBattleText1 ; 0x4ed3 TextAfterBattle dw PokemonTower7EndBattleText1 ; 0x4ece TextEndBattle @@ -181,7 +181,7 @@ PokemonTower7TrainerHeader0: ; 60e47 (18:4e47) PokemonTower7TrainerHeader1: ; 60e53 (18:4e53) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d769 ; flag's byte + dw wd769 ; flag's byte dw PokemonTower7BattleText2 ; 0x4ed8 TextBeforeBattle dw PokemonTower7AfterBattleText2 ; 0x4ee2 TextAfterBattle dw PokemonTower7EndBattleText2 ; 0x4edd TextEndBattle @@ -190,7 +190,7 @@ PokemonTower7TrainerHeader1: ; 60e53 (18:4e53) PokemonTower7TrainerHeader2: ; 60e5f (18:4e5f) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d769 ; flag's byte + dw wd769 ; flag's byte dw PokemonTower7BattleText3 ; 0x4ee7 TextBeforeBattle dw PokemonTower7AfterBattleText3 ; 0x4ef1 TextAfterBattle dw PokemonTower7EndBattleText3 ; 0x4eec TextEndBattle @@ -220,20 +220,20 @@ PokemonTower7Text4: ; 60e8a (18:4e8a) db $08 ; asm ld hl, PokemonTower7Text_60ec4 call PrintText - ld hl, $d7e0 + ld hl, wd7e0 set 7, [hl] - ld hl, $d769 + ld hl, wd769 set 7, [hl] ld a, $44 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef ld a, $17 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ld a, $18 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef ld a, $4 diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index d5e126dc..b90ba7a1 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -32,7 +32,7 @@ PowerPlantTrainerHeaders: ; 1e2fb (7:62fb) PowerPlantTrainerHeader0: ; 1e2fb (7:62fb) db 1 ; flag's bit db 0 ; view range - dw $d7d3 ; flag's byte + dw wd7d3 ; flag's byte dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle @@ -41,7 +41,7 @@ PowerPlantTrainerHeader0: ; 1e2fb (7:62fb) PowerPlantTrainerHeader1: ; 1e307 (7:6307) db 2 ; flag's bit db 0 ; view range - dw $d7d3 ; flag's byte + dw wd7d3 ; flag's byte dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle @@ -50,7 +50,7 @@ PowerPlantTrainerHeader1: ; 1e307 (7:6307) PowerPlantTrainerHeader2: ; 1e313 (7:6313) db 3 ; flag's bit db 0 ; view range - dw $d7d3 ; flag's byte + dw wd7d3 ; flag's byte dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle @@ -59,7 +59,7 @@ PowerPlantTrainerHeader2: ; 1e313 (7:6313) PowerPlantTrainerHeader3: ; 1e31f (7:631f) db 4 ; flag's bit db 0 ; view range - dw $d7d3 ; flag's byte + dw wd7d3 ; flag's byte dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle @@ -68,7 +68,7 @@ PowerPlantTrainerHeader3: ; 1e31f (7:631f) PowerPlantTrainerHeader4: ; 1e32b (7:632b) db 5 ; flag's bit db 0 ; view range - dw $d7d3 ; flag's byte + dw wd7d3 ; flag's byte dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle @@ -77,7 +77,7 @@ PowerPlantTrainerHeader4: ; 1e32b (7:632b) PowerPlantTrainerHeader5: ; 1e337 (7:6337) db 6 ; flag's bit db 0 ; view range - dw $d7d3 ; flag's byte + dw wd7d3 ; flag's byte dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle @@ -86,7 +86,7 @@ PowerPlantTrainerHeader5: ; 1e337 (7:6337) PowerPlantTrainerHeader6: ; 1e343 (7:6343) db 7 ; flag's bit db 0 ; view range - dw $d7d3 ; flag's byte + dw wd7d3 ; flag's byte dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle @@ -95,7 +95,7 @@ PowerPlantTrainerHeader6: ; 1e343 (7:6343) PowerPlantTrainerHeader7: ; 1e34f (7:634f) db 8 ; flag's bit db 0 ; view range - dw $d7d3 ; flag's byte + dw wd7d3 ; flag's byte dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle @@ -104,7 +104,7 @@ PowerPlantTrainerHeader7: ; 1e34f (7:634f) PowerPlantTrainerHeader8: ; 1e35b (7:635b) db 9 ; flag's bit db 0 ; view range - dw $d7d3 ; flag's byte + dw wd7d3 ; flag's byte dw ZapdosBattleText ; TextBeforeBattle dw ZapdosBattleText ; TextAfterBattle dw ZapdosBattleText ; TextEndBattle diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm index b787669e..4bab98fe 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/redshouse1f.asm @@ -7,7 +7,7 @@ RedsHouse1FTextPointers: ; 4816b (12:416b) RedsHouse1FText1: ; 4816f (12:416f) ; 416F Mom db 8 - ld a, [$D72E] + ld a, [wd72e] bit 3, a jr nz, .heal ; if player has received a Pokémon from Oak, heal team ld hl, MomWakeUpText @@ -29,14 +29,14 @@ MomHealPokemon: ; 4818a (12:418a) call ReloadMapData PREDEF HealPartyPredef ld a, MUSIC_PKMN_HEALED - ld [$C0EE], a + ld [wc0ee], a call PlaySound ; play sound? .next - ld a, [$C026] + ld a, [wc026] cp MUSIC_PKMN_HEALED jr z, .next - ld a, [$D35B] - ld [$C0EE], a + ld a, [wd35b] + ld [wc0ee], a call PlaySound call GBFadeIn2 ld hl, MomHealText2 @@ -51,7 +51,7 @@ MomHealText2: ; 481c1 (12:41c1) RedsHouse1FText2: ; 0x481c6 TV db 8 - ld a,[$C109] + ld a,[wSpriteStateData1 + 9] cp 4 ld hl,TVWrongSideText jr nz,.done ; if player is not facing up diff --git a/scripts/redshouse2f.asm b/scripts/redshouse2f.asm index f11fc25e..8fcdc66e 100755 --- a/scripts/redshouse2f.asm +++ b/scripts/redshouse2f.asm @@ -12,7 +12,7 @@ RedsHouse2FScript0: ; 5c0c0 (17:40c0) xor a ld [hJoyHeld],a ld a,8 - ld [$D528],a + ld [wd528],a ld a,1 ld [W_REDSHOUSE2CURSCRIPT],a ret diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index ce88ff90..9f9c03b0 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -9,11 +9,11 @@ RocketHideout1Script: ; 44bca (11:4bca) ret RocketHideout1Script_44be0: ; 44be0 (11:4be0) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z - ld a, [$d815] + ld a, [wd815] bit 7, a jr nz, .asm_44c01 bit 5, a @@ -23,12 +23,12 @@ RocketHideout1Script_44be0: ; 44be0 (11:4be0) .asm_44bf7 ld a, (SFX_02_57 - SFX_Headers_02) / 3 call PlaySound - ld hl, $d815 + ld hl, wd815 bit 7, [hl] .asm_44c01 ld a, $e .asm_44c03 - ld [$d09f], a + ld [wd09f], a ld bc, $080c ld a, $17 jp Predef @@ -51,7 +51,7 @@ RocketHideout1TrainerHeaders: ; 44c22 (11:4c22) RocketHideout1TrainerHeader0: ; 44c22 (11:4c22) db $1 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d815 ; flag's byte + dw wd815 ; flag's byte dw RocketHideout1BattleText2 ; 0x4ca1 TextBeforeBattle dw RocketHideout1AfterBattleTxt2 ; 0x4cab TextAfterBattle dw RocketHideout1EndBattleText2 ; 0x4ca6 TextEndBattle @@ -60,7 +60,7 @@ RocketHideout1TrainerHeader0: ; 44c22 (11:4c22) RocketHideout1TrainerHeader2: ; 44c2e (11:4c2e) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d815 ; flag's byte + dw wd815 ; flag's byte dw RocketHideout1BattleText3 ; 0x4cb0 TextBeforeBattle dw RocketHideout1AfterBattleTxt3 ; 0x4cba TextAfterBattle dw RocketHideout1EndBattleText3 ; 0x4cb5 TextEndBattle @@ -69,7 +69,7 @@ RocketHideout1TrainerHeader2: ; 44c2e (11:4c2e) RocketHideout1TrainerHeader3: ; 44c3a (11:4c3a) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d815 ; flag's byte + dw wd815 ; flag's byte dw RocketHideout1BattleText4 ; 0x4cbf TextBeforeBattle dw RocketHideout1AfterBattleTxt4 ; 0x4cc9 TextAfterBattle dw RocketHideout1EndBattleText4 ; 0x4cc4 TextEndBattle @@ -78,7 +78,7 @@ RocketHideout1TrainerHeader3: ; 44c3a (11:4c3a) RocketHideout1TrainerHeader4: ; 44c46 (11:4c46) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d815 ; flag's byte + dw wd815 ; flag's byte dw RocketHideout1BattleText5 ; 0x4cce TextBeforeBattle dw RocketHideout1AfterBattleTxt5 ; 0x4cd8 TextAfterBattle dw RocketHideout1EndBattleText5 ; 0x4cd3 TextEndBattle @@ -87,7 +87,7 @@ RocketHideout1TrainerHeader4: ; 44c46 (11:4c46) RocketHideout1TrainerHeader5: ; 44c52 (11:4c52) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d815 ; flag's byte + dw wd815 ; flag's byte dw RocketHideout1BattleText6 ; 0x4cdd TextBeforeBattle dw RocketHideout1AfterBattleTxt6 ; 0x4ce2 TextAfterBattle dw RocketHideout1EndBattleText6 ; 0x4c91 TextEndBattle @@ -128,7 +128,7 @@ RocketHideout1Text5: ; 44c87 (11:4c87) RocketHideout1EndBattleText6: ; 44c91 (11:4c91) TX_FAR _RocketHideout1EndBattleText6 db $8 - ld hl, $d815 + ld hl, wd815 set 5, [hl] ld hl, RocketHideout1Text_44c9f ret diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index 43207abd..a476f060 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -22,7 +22,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42) call Func_3442 cp $ff jp z, CheckFightingMapTrainers - ld hl, $d736 + ld hl, wd736 set 7, [hl] call Func_3486 ld a, (SFX_02_52 - SFX_Headers_02) / 3 @@ -306,19 +306,19 @@ RocketHideout2ArrowMovement36: ; 44fbb (11:4fbb) db $FF RocketHideout2Script3: ; 44fc2 (11:4fc2) - ld a, [$cd38] + ld a, [wcd38] and a jr nz, LoadSpinnerArrowTiles xor a ld [wJoyIgnore], a - ld hl, $d736 + ld hl, wd736 res 7, [hl] ld a, $0 ld [W_CURMAPSCRIPT], a ret LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) - ld a, [$c102] + ld a, [wSpriteStateData1 + 2] srl a srl a ld hl, SpinnerPlayerFacingDirections ; $5083 @@ -326,14 +326,14 @@ LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) ld b, $0 add hl, bc ld a, [hl] - ld [$c102], a - ld a, [W_CURMAPTILESET] ; $d367 + ld [wSpriteStateData1 + 2], a + ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET cp FACILITY ld hl, SpinnerArrowTilePointers1 ; $5023 jr z, .asm_44ff6 ld hl, SpinnerArrowTilePointers2 ; $5053 .asm_44ff6 - ld a, [$cd38] + ld a, [wcd38] bit 0, a jr nz, .asm_45001 ld de, $18 @@ -474,7 +474,7 @@ RocketHideout2TrainerHeaders: ; 450d1 (11:50d1) RocketHideout2TrainerHeader0: ; 450d1 (11:50d1) db $1 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d817 ; flag's byte + dw wd817 ; flag's byte dw RocketHideout2BattleText2 ; 0x50e8 TextBeforeBattle dw RocketHideout2AfterBattleTxt2 ; 0x50f2 TextAfterBattle dw RocketHideout2EndBattleText2 ; 0x50ed TextEndBattle diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index d70dac3f..e3223a85 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -22,7 +22,7 @@ RocketHideout3Script0: ; 45240 (11:5240) call Func_3442 cp $ff jp z, CheckFightingMapTrainers - ld hl, $d736 + ld hl, wd736 set 7, [hl] call Func_3486 ld a, (SFX_02_52 - SFX_Headers_02) / 3 @@ -136,12 +136,12 @@ RocketHideout3ArrowMovement12: ; 452e1 (11:52e1) db $FF RocketHideout3Script3 ; 452e4 (11:452e4) - ld a, [$cd38] + ld a, [wcd38] and a jp nz, LoadSpinnerArrowTiles xor a ld [wJoyIgnore], a - ld hl, $d736 + ld hl, wd736 res 7, [hl] ld a, $0 ld [W_CURMAPSCRIPT], a @@ -157,7 +157,7 @@ RocketHideout3TrainerHeaders: ; 45302 (11:5302) RocketHideout3TrainerHeader0: ; 45302 (11:5302) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d819 ; flag's byte + dw wd819 ; flag's byte dw RocketHideout3BattleText2 ; 0x5325 TextBeforeBattle dw RocketHideout3AfterBattleTxt2 ; 0x532f TextAfterBattle dw RocketHideout3EndBattleText2 ; 0x532a TextEndBattle @@ -166,7 +166,7 @@ RocketHideout3TrainerHeader0: ; 45302 (11:5302) RocketHideout3TrainerHeader2: ; 4530e (11:530e) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d819 ; flag's byte + dw wd819 ; flag's byte dw RocketHideout3BattleTxt ; 0x533e TextBeforeBattle dw RocketHideout3AfterBattleText3 ; 0x5348 TextAfterBattle dw RocketHideout3EndBattleText3 ; 0x5343 TextEndBattle diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 3a8ed22b..3faa566e 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -9,11 +9,11 @@ RocketHideout4Script: ; 4545d (11:545d) ret RocketHideout4Script_45473: ; 45473 (11:5473) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z - ld a, [$d81b] + ld a, [wd81b] bit 5, a jr nz, .asm_45496 and $c @@ -24,12 +24,12 @@ RocketHideout4Script_45473: ; 45473 (11:5473) .asm_4548c ld a, (SFX_02_57 - SFX_Headers_02) / 3 call PlaySound - ld hl, $d81b + ld hl, wd81b set 5, [hl] .asm_45496 ld a, $e .asm_45498 - ld [$d09f], a + ld [wd09f], a ld bc, $050c ld a, $17 jp Predef @@ -54,25 +54,25 @@ RocketHideout4Script3: ; 454b6 (11:54b6) call UpdateSprites ld a, $f0 ld [wJoyIgnore], a - ld hl, $d81b + ld hl, wd81b set 7, [hl] ld a, $a ld [H_SPRITEHEIGHT], a call DisplayTextID call GBFadeIn1 ld a, $83 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ld a, $87 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef call UpdateSprites call GBFadeOut1 xor a ld [wJoyIgnore], a - ld hl, $d126 + ld hl, wd126 set 5, [hl] ld a, $0 ld [W_ROCKETHIDEOUT4CURSCRIPT], a @@ -95,7 +95,7 @@ RocketHideout4TrainerHeaders: ; 45515 (11:5515) RocketHideout4TrainerHeader0: ; 45515 (11:5515) db $2 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d81b ; flag's byte + dw wd81b ; flag's byte dw RocketHideout4BattleText2 ; 0x5593 TextBeforeBattle dw RocketHideout4AfterBattleText2 ; 0x559d TextAfterBattle dw RocketHideout4EndBattleText2 ; 0x5598 TextEndBattle @@ -104,7 +104,7 @@ RocketHideout4TrainerHeader0: ; 45515 (11:5515) RocketHideout4TrainerHeader2: ; 45521 (11:5521) db $3 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d81b ; flag's byte + dw wd81b ; flag's byte dw RocketHideout4BattleText3 ; 0x55ac TextBeforeBattle dw RocketHideout4AfterBattleText3 ; 0x55b6 TextAfterBattle dw RocketHideout4EndBattleText3 ; 0x55b1 TextEndBattle @@ -113,7 +113,7 @@ RocketHideout4TrainerHeader2: ; 45521 (11:5521) RocketHideout4TrainerHeader3: ; 4552d (11:552d) db $4 ; flag's bit db ($1 << 4) ; trainer's view range - dw $d81b ; flag's byte + dw wd81b ; flag's byte dw RocketHideout4BattleText4 ; 0x55c5 TextBeforeBattle dw RocketHideout4AfterBattleText4 ; 0x55cf TextAfterBattle dw RocketHideout4EndBattleText4 ; 0x55ca TextEndBattle @@ -123,19 +123,19 @@ RocketHideout4TrainerHeader3: ; 4552d (11:552d) RocketHideout4Text1: ; 4553a (11:553a) db $08 ; asm - ld a, [$d81b] + ld a, [wd81b] bit 7, a jp nz, .asm_545571 ld hl, RocketHideout4Text_4557a call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, RocketHideout4Text_4557f ld de, RocketHideout4Text_4557f call PreBattleSaveRegisters ldh a, [$8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters xor a @@ -216,12 +216,12 @@ RocketHideout4AfterBattleText4: ; 455cf (11:55cf) db $8 ld hl, RocketHideout4Text_455ec ; $55ec call PrintText - ld hl, $d81b + ld hl, wd81b bit 6, [hl] set 6, [hl] jr nz, .asm_455e9 ; 0x455dd $a ld a, $88 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef .asm_455e9 diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm index 57e62177..fa208a5e 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/rockethideoutelevator.asm @@ -1,5 +1,5 @@ RocketHideoutElevatorScript: ; 45710 (11:5710) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] push hl @@ -9,16 +9,16 @@ RocketHideoutElevatorScript: ; 45710 (11:5710) res 7, [hl] call nz, RocketHideoutElevatorScript_4575f xor a - ld [$cf0c], a + ld [wcf0c], a inc a - ld [$cc3c], a + ld [wcc3c], a ret RocketHideoutElevatorScript_4572c: ; 4572c (11:572c) - ld hl, $d3af - ld a, [$d73b] + ld hl, wd3af + ld a, [wd73b] ld b, a - ld a, [$d73c] + ld a, [wd73c] ld c, a call RocketHideoutElevatorScript_4573a @@ -35,7 +35,7 @@ RocketHideoutElevatorScript_45741: ; 45741 (11:5741) ld hl, RocketHideoutElavatorFloors ; $5754 call LoadItemList ld hl, RocketHideoutElevatorWarpMaps ; $5759 - ld de, $cc5b + ld de, wcc5b ld bc, $0006 call CopyData ret diff --git a/scripts/rocktunnel1.asm b/scripts/rocktunnel1.asm index be49e494..ad6e493f 100755 --- a/scripts/rocktunnel1.asm +++ b/scripts/rocktunnel1.asm @@ -26,7 +26,7 @@ RockTunnel1TrainerHeaders: ; 44505 (11:4505) RockTunnel1TrainerHeader1: ; 44505 (11:4505) db $1 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d2 ; flag's byte + dw wd7d2 ; flag's byte dw RockTunnel1BattleText1 ; 0x4588 TextBeforeBattle dw RockTunnel1AfterBattleText1 ; 0x4592 TextAfterBattle dw RockTunnel1EndBattleText1 ; 0x458d TextEndBattle @@ -35,7 +35,7 @@ RockTunnel1TrainerHeader1: ; 44505 (11:4505) RockTunnel1TrainerHeader2: ; 44511 (11:4511) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d2 ; flag's byte + dw wd7d2 ; flag's byte dw RockTunnel1BattleText2 ; 0x4597 TextBeforeBattle dw RockTunnel1AfterBattleText2 ; 0x45a1 TextAfterBattle dw RockTunnel1EndBattleText2 ; 0x459c TextEndBattle @@ -44,7 +44,7 @@ RockTunnel1TrainerHeader2: ; 44511 (11:4511) RockTunnel1TrainerHeader3: ; 4451d (11:451d) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7d2 ; flag's byte + dw wd7d2 ; flag's byte dw RockTunnel1BattleText3 ; 0x45a6 TextBeforeBattle dw RockTunnel1AfterBattleText3 ; 0x45b0 TextAfterBattle dw RockTunnel1EndBattleText3 ; 0x45ab TextEndBattle @@ -53,7 +53,7 @@ RockTunnel1TrainerHeader3: ; 4451d (11:451d) RockTunnel1TrainerHeader4: ; 44529 (11:4529) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7d2 ; flag's byte + dw wd7d2 ; flag's byte dw RockTunnel1BattleText4 ; 0x45b5 TextBeforeBattle dw RockTunnel1AfterBattleText4 ; 0x45bf TextAfterBattle dw RockTunnel1EndBattleText4 ; 0x45ba TextEndBattle @@ -62,7 +62,7 @@ RockTunnel1TrainerHeader4: ; 44529 (11:4529) RockTunnel1TrainerHeader5: ; 44535 (11:4535) db $5 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d2 ; flag's byte + dw wd7d2 ; flag's byte dw RockTunnel1BattleText5 ; 0x45c4 TextBeforeBattle dw RockTunnel1AfterBattleText5 ; 0x45ce TextAfterBattle dw RockTunnel1EndBattleText5 ; 0x45c9 TextEndBattle @@ -71,7 +71,7 @@ RockTunnel1TrainerHeader5: ; 44535 (11:4535) RockTunnel1TrainerHeader6: ; 44541 (11:4541) db $6 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d2 ; flag's byte + dw wd7d2 ; flag's byte dw RockTunnel1BattleText6 ; 0x45d3 TextBeforeBattle dw RockTunnel1AfterBattleText6 ; 0x45dd TextAfterBattle dw RockTunnel1EndBattleText6 ; 0x45d8 TextEndBattle @@ -80,7 +80,7 @@ RockTunnel1TrainerHeader6: ; 44541 (11:4541) RockTunnel1TrainerHeader7: ; 4454d (11:454d) db $7 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d2 ; flag's byte + dw wd7d2 ; flag's byte dw RockTunnel1BattleText7 ; 0x45e2 TextBeforeBattle dw RockTunnel1AfterBattleText7 ; 0x45ec TextAfterBattle dw RockTunnel1EndBattleText7 ; 0x45e7 TextEndBattle diff --git a/scripts/rocktunnel2.asm b/scripts/rocktunnel2.asm index 62f4fe18..a35a7325 100755 --- a/scripts/rocktunnel2.asm +++ b/scripts/rocktunnel2.asm @@ -26,7 +26,7 @@ RockTunnel2TrainerHeaders: ; 46014 (11:6014) RockTunnel2TrainerHeader0: ; 46014 (11:6014) db $1 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d87d ; flag's byte + dw wd87d ; flag's byte dw RockTunnel2BattleText2 ; 0x60c5 TextBeforeBattle dw RockTunnel2AfterBattleText2 ; 0x60cf TextAfterBattle dw RockTunnel2EndBattleText2 ; 0x60ca TextEndBattle @@ -35,7 +35,7 @@ RockTunnel2TrainerHeader0: ; 46014 (11:6014) RockTunnel2TrainerHeader2: ; 46020 (11:6020) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d87d ; flag's byte + dw wd87d ; flag's byte dw RockTunnel2BattleText3 ; 0x60d4 TextBeforeBattle dw RockTunnel2AfterBattleText3 ; 0x60de TextAfterBattle dw RockTunnel2EndBattleText3 ; 0x60d9 TextEndBattle @@ -44,7 +44,7 @@ RockTunnel2TrainerHeader2: ; 46020 (11:6020) RockTunnel2TrainerHeader3: ; 4602c (11:602c) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d87d ; flag's byte + dw wd87d ; flag's byte dw RockTunnel2BattleText4 ; 0x60e3 TextBeforeBattle dw RockTunnel2AfterBattleText4 ; 0x60ed TextAfterBattle dw RockTunnel2EndBattleText4 ; 0x60e8 TextEndBattle @@ -53,7 +53,7 @@ RockTunnel2TrainerHeader3: ; 4602c (11:602c) RockTunnel2TrainerHeader4: ; 46038 (11:6038) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d87d ; flag's byte + dw wd87d ; flag's byte dw RockTunnel2BattleText5 ; 0x60f2 TextBeforeBattle dw RockTunnel2AfterBattleText5 ; 0x60fc TextAfterBattle dw RockTunnel2EndBattleText5 ; 0x60f7 TextEndBattle @@ -62,7 +62,7 @@ RockTunnel2TrainerHeader4: ; 46038 (11:6038) RockTunnel2TrainerHeader5: ; 46044 (11:6044) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d87d ; flag's byte + dw wd87d ; flag's byte dw RockTunnel2BattleText6 ; 0x6101 TextBeforeBattle dw RockTunnel2AfterBattleText6 ; 0x610b TextAfterBattle dw RockTunnel2EndBattleText6 ; 0x6106 TextEndBattle @@ -71,7 +71,7 @@ RockTunnel2TrainerHeader5: ; 46044 (11:6044) RockTunnel2TrainerHeader6: ; 46050 (11:6050) db $6 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d87d ; flag's byte + dw wd87d ; flag's byte dw RockTunnel2BattleText7 ; 0x6110 TextBeforeBattle dw RockTunnel2AfterBattleText7 ; 0x611a TextAfterBattle dw RockTunnel2EndBattleText7 ; 0x6115 TextEndBattle @@ -80,7 +80,7 @@ RockTunnel2TrainerHeader6: ; 46050 (11:6050) RockTunnel2TrainerHeader7: ; 4605c (11:605c) db $7 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d87d ; flag's byte + dw wd87d ; flag's byte dw RockTunnel2BattleText8 ; 0x611f TextBeforeBattle dw RockTunnel2AfterBattleText8 ; 0x6129 TextAfterBattle dw RockTunnel2EndBattleText8 ; 0x6124 TextEndBattle @@ -89,7 +89,7 @@ RockTunnel2TrainerHeader7: ; 4605c (11:605c) RockTunnel2TrainerHeader8: ; 46068 (11:6068) db $8 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d87d ; flag's byte + dw wd87d ; flag's byte dw RockTunnel2BattleText9 ; 0x612e TextBeforeBattle dw RockTunnel2AfterBattleText9 ; 0x6138 TextAfterBattle dw RockTunnel2EndBattleText9 ; 0x6133 TextEndBattle diff --git a/scripts/route1.asm b/scripts/route1.asm index 1faf5a48..189b987b 100755 --- a/scripts/route1.asm +++ b/scripts/route1.asm @@ -8,7 +8,7 @@ Route1TextPointers: ; 1cab2 (7:4ab2) Route1Text1: ; 1cab8 (7:4ab8) db $08 ; asm - ld hl, $d7bf + ld hl, wd7bf bit 0, [hl] set 0, [hl] jr nz, .asm_02840 ; 0x1cac0 diff --git a/scripts/route10.asm b/scripts/route10.asm index 1e0ecb91..e5e0dec2 100755 --- a/scripts/route10.asm +++ b/scripts/route10.asm @@ -28,7 +28,7 @@ Route10TrainerHeaders: ; 59363 (16:5363) Route10TrainerHeader0: ; 59363 (16:5363) db $1 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d1 ; flag's byte + dw wd7d1 ; flag's byte dw Route10BattleText1 ; 0x53b6 TextBeforeBattle dw Route10AfterBattleText1 ; 0x53c0 TextAfterBattle dw Route10EndBattleText1 ; 0x53bb TextEndBattle @@ -37,7 +37,7 @@ Route10TrainerHeader0: ; 59363 (16:5363) Route10TrainerHeader1: ; 5936f (16:536f) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7d1 ; flag's byte + dw wd7d1 ; flag's byte dw Route10BattleText2 ; 0x53cf TextBeforeBattle dw Route10AfterBattleText2 ; 0x53d9 TextAfterBattle dw Route10EndBattleText2 ; 0x53d4 TextEndBattle @@ -46,7 +46,7 @@ Route10TrainerHeader1: ; 5936f (16:536f) Route10TrainerHeader2: ; 5937b (16:537b) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d1 ; flag's byte + dw wd7d1 ; flag's byte dw Route10BattleText3 ; 0x53e8 TextBeforeBattle dw Route10AfterBattleText3 ; 0x53f2 TextAfterBattle dw Route10EndBattleText3 ; 0x53ed TextEndBattle @@ -55,7 +55,7 @@ Route10TrainerHeader2: ; 5937b (16:537b) Route10TrainerHeader3: ; 59387 (16:5387) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7d1 ; flag's byte + dw wd7d1 ; flag's byte dw Route10BattleText4 ; 0x5401 TextBeforeBattle dw Route10AfterBattleText4 ; 0x540b TextAfterBattle dw Route10EndBattleText4 ; 0x5406 TextEndBattle @@ -64,7 +64,7 @@ Route10TrainerHeader3: ; 59387 (16:5387) Route10TrainerHeader4: ; 59393 (16:5393) db $5 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7d1 ; flag's byte + dw wd7d1 ; flag's byte dw Route10BattleText5 ; 0x541a TextBeforeBattle dw Route10AfterBattleText5 ; 0x5424 TextAfterBattle dw Route10EndBattleText5 ; 0x541f TextEndBattle @@ -73,7 +73,7 @@ Route10TrainerHeader4: ; 59393 (16:5393) Route10TrainerHeader5: ; 5939f (16:539f) db $6 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7d1 ; flag's byte + dw wd7d1 ; flag's byte dw Route10BattleText6 ; 0x5433 TextBeforeBattle dw Route10AfterBattleText6 ; 0x543d TextAfterBattle dw Route10EndBattleText6 ; 0x5438 TextEndBattle diff --git a/scripts/route11.asm b/scripts/route11.asm index 6217569e..fb50937e 100755 --- a/scripts/route11.asm +++ b/scripts/route11.asm @@ -29,7 +29,7 @@ Route11TrainerHeaders: ; 5947b (16:547b) Route11TrainerHeader0: ; 5947b (16:547b) db $1 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7d5 ; flag's byte + dw wd7d5 ; flag's byte dw Route11BattleText1 ; 0x54fe TextBeforeBattle dw Route11AfterBattleText1 ; 0x5508 TextAfterBattle dw Route11EndBattleText1 ; 0x5503 TextEndBattle @@ -38,7 +38,7 @@ Route11TrainerHeader0: ; 5947b (16:547b) Route11TrainerHeader1: ; 59487 (16:5487) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7d5 ; flag's byte + dw wd7d5 ; flag's byte dw Route11BattleText2 ; 0x5517 TextBeforeBattle dw Route11AfterBattleText2 ; 0x5521 TextAfterBattle dw Route11EndBattleText2 ; 0x551c TextEndBattle @@ -47,7 +47,7 @@ Route11TrainerHeader1: ; 59487 (16:5487) Route11TrainerHeader2: ; 59493 (16:5493) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7d5 ; flag's byte + dw wd7d5 ; flag's byte dw Route11BattleText3 ; 0x5530 TextBeforeBattle dw Route11AfterBattleText3 ; 0x553a TextAfterBattle dw Route11EndBattleText3 ; 0x5535 TextEndBattle @@ -56,7 +56,7 @@ Route11TrainerHeader2: ; 59493 (16:5493) Route11TrainerHeader3: ; 5949f (16:549f) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7d5 ; flag's byte + dw wd7d5 ; flag's byte dw Route11BattleText4 ; 0x5549 TextBeforeBattle dw Route11AfterBattleText4 ; 0x5553 TextAfterBattle dw Route11EndBattleText4 ; 0x554e TextEndBattle @@ -65,7 +65,7 @@ Route11TrainerHeader3: ; 5949f (16:549f) Route11TrainerHeader4: ; 594ab (16:54ab) db $5 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d5 ; flag's byte + dw wd7d5 ; flag's byte dw Route11BattleText5 ; 0x5562 TextBeforeBattle dw Route11AfterBattleText5 ; 0x556c TextAfterBattle dw Route11EndBattleText5 ; 0x5567 TextEndBattle @@ -74,7 +74,7 @@ Route11TrainerHeader4: ; 594ab (16:54ab) Route11TrainerHeader5: ; 594b7 (16:54b7) db $6 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7d5 ; flag's byte + dw wd7d5 ; flag's byte dw Route11BattleText6 ; 0x557b TextBeforeBattle dw Route11AfterBattleText6 ; 0x5585 TextAfterBattle dw Route11EndBattleText6 ; 0x5580 TextEndBattle @@ -83,7 +83,7 @@ Route11TrainerHeader5: ; 594b7 (16:54b7) Route11TrainerHeader6: ; 594c3 (16:54c3) db $7 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7d5 ; flag's byte + dw wd7d5 ; flag's byte dw Route11BattleText7 ; 0x5594 TextBeforeBattle dw Route11AfterBattleText7 ; 0x559e TextAfterBattle dw Route11EndBattleText7 ; 0x5599 TextEndBattle @@ -92,7 +92,7 @@ Route11TrainerHeader6: ; 594c3 (16:54c3) Route11TrainerHeader7: ; 594cf (16:54cf) db $8 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d5 ; flag's byte + dw wd7d5 ; flag's byte dw Route11BattleText8 ; 0x55ad TextBeforeBattle dw Route11AfterBattleText8 ; 0x55b7 TextAfterBattle dw Route11EndBattleText8 ; 0x55b2 TextEndBattle @@ -101,7 +101,7 @@ Route11TrainerHeader7: ; 594cf (16:54cf) Route11TrainerHeader8: ; 594db (16:54db) db $9 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7d5 ; flag's byte + dw wd7d5 ; flag's byte dw Route11BattleText9 ; 0x55c6 TextBeforeBattle dw Route11AfterBattleText9 ; 0x55d0 TextAfterBattle dw Route11EndBattleText9 ; 0x55cb TextEndBattle @@ -110,7 +110,7 @@ Route11TrainerHeader8: ; 594db (16:54db) Route11TrainerHeader9: ; 594e7 (16:54e7) db $a ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d5 ; flag's byte + dw wd7d5 ; flag's byte dw Route11BattleText10 ; 0x55df TextBeforeBattle dw Route11AfterBattleText10 ; 0x55e9 TextAfterBattle dw Route11EndBattleText10 ; 0x55e4 TextEndBattle diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm index e03331ca..e6d7eba9 100755 --- a/scripts/route11gateupstairs.asm +++ b/scripts/route11gateupstairs.asm @@ -18,18 +18,18 @@ asm_49469: ; 49469 (12:5469) Route11GateUpstairsText2: ; 4946c (12:546c) db $8 - ld a, [$d7d6] + ld a, [wd7d6] add a jr c, .asm_4949b ; 0x49471 $28 ld a, 30 ; pokemon needed ld [$ffdb], a ld a, ITEMFINDER ; oak's aide reward ld [$ffdc], a - ld [$d11e], a + ld [wd11e], a call GetItemName ld h, d ld l, e - ld de, $cc5b + ld de, wcc5b ld bc, $000d call CopyData ld a, $62 @@ -37,7 +37,7 @@ Route11GateUpstairsText2: ; 4946c (12:546c) ld a, [$ffdb] dec a jr nz, .asm_494a1 ; 0x49494 $b - ld hl, $d7d6 + ld hl, wd7d6 set 7, [hl] .asm_4949b ld hl, Route11GateUpstairsText_494a3 @@ -51,10 +51,10 @@ Route11GateUpstairsText_494a3: ; 494a3 (12:54a3) Route11GateUpstairsText3: ; 494a8 (12:54a8) db $08 ; asm - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] cp $4 jp nz, Route12GateUpstairsScript_495c9 - ld a, [$d7d8] + ld a, [wd7d8] bit 7, a ; fought snorlax? ld hl, BinocularsSnorlaxText jr z, .print diff --git a/scripts/route12.asm b/scripts/route12.asm index 7d7ddff0..db743662 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -21,7 +21,7 @@ Route12ScriptPointers: ; 59611 (16:5611) dw Route12Script3 Route12Script0: ; 59619 (16:5619) - ld hl, $d7d8 + ld hl, wd7d8 bit 7, [hl] jp nz, CheckFightingMapTrainers bit 6, [hl] @@ -31,11 +31,11 @@ Route12Script0: ; 59619 (16:5619) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID ld a, SNORLAX - ld [W_CUROPPONENT], a ; $d059 + ld [W_CUROPPONENT], a ; wd059 ld a, 30 - ld [W_CURENEMYLVL], a ; $d127 + ld [W_CURENEMYLVL], a ; W_CURENEMYLVL ld a, $1d - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) ld a, $3 @@ -44,18 +44,18 @@ Route12Script0: ; 59619 (16:5619) ret Route12Script3: ; 5964c (16:564c) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jr z, Route12Script_59606 call UpdateSprites - ld a, [$cf0b] + ld a, [wcf0b] cp $2 jr z, .asm_59664 ld a, $e ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID .asm_59664 - ld hl, $d7d8 + ld hl, wd7d8 set 7, [hl] call Delay3 ld a, $0 @@ -83,7 +83,7 @@ Route12TrainerHeaders: ; 59691 (16:5691) Route12TrainerHeader0: ; 59691 (16:5691) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d7 ; flag's byte + dw wd7d7 ; flag's byte dw Route12BattleText1 ; 0x56ff TextBeforeBattle dw Route12AfterBattleText1 ; 0x5709 TextAfterBattle dw Route12EndBattleText1 ; 0x5704 TextEndBattle @@ -92,7 +92,7 @@ Route12TrainerHeader0: ; 59691 (16:5691) Route12TrainerHeader1: ; 5969d (16:569d) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d7 ; flag's byte + dw wd7d7 ; flag's byte dw Route12BattleText2 ; 0x5718 TextBeforeBattle dw Route12AfterBattleText2 ; 0x5722 TextAfterBattle dw Route12EndBattleText2 ; 0x571d TextEndBattle @@ -101,7 +101,7 @@ Route12TrainerHeader1: ; 5969d (16:569d) Route12TrainerHeader2: ; 596a9 (16:56a9) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d7 ; flag's byte + dw wd7d7 ; flag's byte dw Route12BattleText3 ; 0x5731 TextBeforeBattle dw Route12AfterBattleText3 ; 0x573b TextAfterBattle dw Route12EndBattleText3 ; 0x5736 TextEndBattle @@ -110,7 +110,7 @@ Route12TrainerHeader2: ; 596a9 (16:56a9) Route12TrainerHeader3: ; 596b5 (16:56b5) db $5 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d7 ; flag's byte + dw wd7d7 ; flag's byte dw Route12BattleText4 ; 0x574a TextBeforeBattle dw Route12AfterBattleText4 ; 0x5754 TextAfterBattle dw Route12EndBattleText4 ; 0x574f TextEndBattle @@ -119,7 +119,7 @@ Route12TrainerHeader3: ; 596b5 (16:56b5) Route12TrainerHeader4: ; 596c1 (16:56c1) db $6 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d7 ; flag's byte + dw wd7d7 ; flag's byte dw Route12BattleText5 ; 0x5763 TextBeforeBattle dw Route12AfterBattleText5 ; 0x576d TextAfterBattle dw Route12EndBattleText5 ; 0x5768 TextEndBattle @@ -128,7 +128,7 @@ Route12TrainerHeader4: ; 596c1 (16:56c1) Route12TrainerHeader5: ; 596cd (16:56cd) db $7 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d7 ; flag's byte + dw wd7d7 ; flag's byte dw Route12BattleText6 ; 0x577c TextBeforeBattle dw Route12AfterBattleText6 ; 0x5786 TextAfterBattle dw Route12EndBattleText6 ; 0x5781 TextEndBattle @@ -137,7 +137,7 @@ Route12TrainerHeader5: ; 596cd (16:56cd) Route12TrainerHeader6: ; 596d9 (16:56d9) db $8 ; flag's bit db ($1 << 4) ; trainer's view range - dw $d7d7 ; flag's byte + dw wd7d7 ; flag's byte dw Route12BattleText7 ; 0x5795 TextBeforeBattle dw Route12AfterBattleText7 ; 0x579f TextAfterBattle dw Route12EndBattleText7 ; 0x579a TextEndBattle diff --git a/scripts/route12gateupstairs.asm b/scripts/route12gateupstairs.asm index 97da1b58..94a4f9a2 100755 --- a/scripts/route12gateupstairs.asm +++ b/scripts/route12gateupstairs.asm @@ -8,7 +8,7 @@ Route12GateUpstairsTextPointers: ; 49563 (12:5563) Route12GateUpstairsText1: ; 49569 (12:5569) db $08 ; asm - ld a, [$d7d7] + ld a, [wd7d7] rrca jr c, .asm_0ad3c ; 0x4956e ld hl, TM39PreReceiveText @@ -18,7 +18,7 @@ Route12GateUpstairsText1: ; 49569 (12:5569) jr nc, .BagFull ld hl, ReceivedTM39Text call PrintText - ld hl, $d7d7 + ld hl, wd7d7 set 0, [hl] jr .asm_4ba56 ; 0x49589 .BagFull @@ -66,7 +66,7 @@ Route12GateUpstairsText_495c4: ; 495c4 (12:55c4) db "@" Route12GateUpstairsScript_495c9: ; 495c9 (12:55c9) - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] cp $4 jr z, .asm_495d4 ; 0x495ce $4 ld a, $1 @@ -75,5 +75,5 @@ Route12GateUpstairsScript_495c9: ; 495c9 (12:55c9) call PrintText xor a .asm_495d8 - ld [$cc3c], a + ld [wcc3c], a jp TextScriptEnd diff --git a/scripts/route12house.asm b/scripts/route12house.asm index 6b2f5e52..44667b24 100755 --- a/scripts/route12house.asm +++ b/scripts/route12house.asm @@ -6,19 +6,19 @@ Route12HouseTextPointers: ; 56482 (15:6482) Route12HouseText1: ; 56484 (15:6484) db $08 ; asm - ld a, [$d728] + ld a, [wd728] bit 5, a jr nz, .asm_b4cad ld hl, Route12HouseText_564c0 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_a2d76 ld bc, (SUPER_ROD << 8) | 1 call GiveItem jr nc, .BagFull - ld hl, $d728 + ld hl, wd728 set 5, [hl] ld hl, Route12HouseText_564c5 jr .asm_df984 diff --git a/scripts/route13.asm b/scripts/route13.asm index 3c2fea04..b78b7cb2 100755 --- a/scripts/route13.asm +++ b/scripts/route13.asm @@ -31,7 +31,7 @@ Route13TrainerHeaders: ; 55851 (15:5851) Route13TrainerHeader0: ; 55851 (15:5851) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7d9 ; flag's byte + dw wd7d9 ; flag's byte dw Route13BattleText2 ; 0x58d4 TextBeforeBattle dw Route13AfterBattleText2 ; 0x58de TextAfterBattle dw Route13EndBattleText2 ; 0x58d9 TextEndBattle @@ -40,7 +40,7 @@ Route13TrainerHeader0: ; 55851 (15:5851) Route13TrainerHeader2: ; 5585d (15:585d) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7d9 ; flag's byte + dw wd7d9 ; flag's byte dw Route13BattleText3 ; 0x58ed TextBeforeBattle dw Route13AfterBattleText3 ; 0x58f7 TextAfterBattle dw Route13EndBattleText3 ; 0x58f2 TextEndBattle @@ -49,7 +49,7 @@ Route13TrainerHeader2: ; 5585d (15:585d) Route13TrainerHeader3: ; 55869 (15:5869) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7d9 ; flag's byte + dw wd7d9 ; flag's byte dw Route13BattleText4 ; 0x5906 TextBeforeBattle dw Route13AfterBattleText4 ; 0x5910 TextAfterBattle dw Route13EndBattleText4 ; 0x590b TextEndBattle @@ -58,7 +58,7 @@ Route13TrainerHeader3: ; 55869 (15:5869) Route13TrainerHeader4: ; 55875 (15:5875) db $4 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7d9 ; flag's byte + dw wd7d9 ; flag's byte dw Route13BattleText5 ; 0x591f TextBeforeBattle dw Route13AfterBattleText5 ; 0x5929 TextAfterBattle dw Route13EndBattleText5 ; 0x5924 TextEndBattle @@ -67,7 +67,7 @@ Route13TrainerHeader4: ; 55875 (15:5875) Route13TrainerHeader5: ; 55881 (15:5881) db $5 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d9 ; flag's byte + dw wd7d9 ; flag's byte dw Route13BattleText6 ; 0x5938 TextBeforeBattle dw Route13AfterBattleText6 ; 0x5942 TextAfterBattle dw Route13EndBattleText6 ; 0x593d TextEndBattle @@ -76,7 +76,7 @@ Route13TrainerHeader5: ; 55881 (15:5881) Route13TrainerHeader6: ; 5588d (15:588d) db $6 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7d9 ; flag's byte + dw wd7d9 ; flag's byte dw Route13BattleText7 ; 0x5951 TextBeforeBattle dw Route13AfterBattleText7 ; 0x595b TextAfterBattle dw Route13EndBattleText7 ; 0x5956 TextEndBattle @@ -85,7 +85,7 @@ Route13TrainerHeader6: ; 5588d (15:588d) Route13TrainerHeader7: ; 55899 (15:5899) db $7 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d9 ; flag's byte + dw wd7d9 ; flag's byte dw Route13BattleText8 ; 0x596a TextBeforeBattle dw Route13AfterBattleText8 ; 0x5974 TextAfterBattle dw Route13EndBattleText8 ; 0x596f TextEndBattle @@ -94,7 +94,7 @@ Route13TrainerHeader7: ; 55899 (15:5899) Route13TrainerHeader8: ; 558a5 (15:58a5) db $8 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7d9 ; flag's byte + dw wd7d9 ; flag's byte dw Route13BattleText9 ; 0x5983 TextBeforeBattle dw Route13AfterBattleText9 ; 0x598d TextAfterBattle dw Route13EndBattleText9 ; 0x5988 TextEndBattle @@ -103,7 +103,7 @@ Route13TrainerHeader8: ; 558a5 (15:58a5) Route13TrainerHeader9: ; 558b1 (15:58b1) db $9 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7d9 ; flag's byte + dw wd7d9 ; flag's byte dw Route13BattleText10 ; 0x599c TextBeforeBattle dw Route13AfterBattleText10 ; 0x59a6 TextAfterBattle dw Route13EndBattleText10 ; 0x59a1 TextEndBattle @@ -112,7 +112,7 @@ Route13TrainerHeader9: ; 558b1 (15:58b1) Route13TrainerHeader10: ; 558bd (15:58bd) db $a ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7d9 ; flag's byte + dw wd7d9 ; flag's byte dw Route13BattleText11 ; 0x59b5 TextBeforeBattle dw Route13AfterBattleText11 ; 0x59bf TextAfterBattle dw Route13EndBattleText11 ; 0x59ba TextEndBattle diff --git a/scripts/route14.asm b/scripts/route14.asm index 0f9b49cf..9d8d8fcb 100755 --- a/scripts/route14.asm +++ b/scripts/route14.asm @@ -29,7 +29,7 @@ Route14TrainerHeaders: ; 55a02 (15:5a02) Route14TrainerHeader0: ; 55a02 (15:5a02) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7db ; flag's byte + dw wd7db ; flag's byte dw Route14BattleText1 ; 0x5a85 TextBeforeBattle dw Route14AfterBattleText1 ; 0x5a8f TextAfterBattle dw Route14EndBattleText1 ; 0x5a8a TextEndBattle @@ -38,7 +38,7 @@ Route14TrainerHeader0: ; 55a02 (15:5a02) Route14TrainerHeader1: ; 55a0e (15:5a0e) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7db ; flag's byte + dw wd7db ; flag's byte dw Route14BattleText2 ; 0x5a9e TextBeforeBattle dw Route14AfterBattleText2 ; 0x5aa8 TextAfterBattle dw Route14EndBattleText2 ; 0x5aa3 TextEndBattle @@ -47,7 +47,7 @@ Route14TrainerHeader1: ; 55a0e (15:5a0e) Route14TrainerHeader2: ; 55a1a (15:5a1a) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7db ; flag's byte + dw wd7db ; flag's byte dw Route14BattleText3 ; 0x5ab7 TextBeforeBattle dw Route14AfterBattleText3 ; 0x5ac1 TextAfterBattle dw Route14EndBattleText3 ; 0x5abc TextEndBattle @@ -56,7 +56,7 @@ Route14TrainerHeader2: ; 55a1a (15:5a1a) Route14TrainerHeader3: ; 55a26 (15:5a26) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7db ; flag's byte + dw wd7db ; flag's byte dw Route14BattleText4 ; 0x5ad0 TextBeforeBattle dw Route14AfterBattleText4 ; 0x5ada TextAfterBattle dw Route14EndBattleText4 ; 0x5ad5 TextEndBattle @@ -65,7 +65,7 @@ Route14TrainerHeader3: ; 55a26 (15:5a26) Route14TrainerHeader4: ; 55a32 (15:5a32) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7db ; flag's byte + dw wd7db ; flag's byte dw Route14BattleText5 ; 0x5ae9 TextBeforeBattle dw Route14AfterBattleText5 ; 0x5af3 TextAfterBattle dw Route14EndBattleText5 ; 0x5aee TextEndBattle @@ -74,7 +74,7 @@ Route14TrainerHeader4: ; 55a32 (15:5a32) Route14TrainerHeader5: ; 55a3e (15:5a3e) db $6 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7db ; flag's byte + dw wd7db ; flag's byte dw Route14BattleText6 ; 0x5b02 TextBeforeBattle dw Route14AfterBattleText6 ; 0x5b0c TextAfterBattle dw Route14EndBattleText6 ; 0x5b07 TextEndBattle @@ -83,7 +83,7 @@ Route14TrainerHeader5: ; 55a3e (15:5a3e) Route14TrainerHeader6: ; 55a4a (15:5a4a) db $7 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7db ; flag's byte + dw wd7db ; flag's byte dw Route14BattleText7 ; 0x5b1b TextBeforeBattle dw Route14AfterBattleText7 ; 0x5b25 TextAfterBattle dw Route14EndBattleText7 ; 0x5b20 TextEndBattle @@ -92,7 +92,7 @@ Route14TrainerHeader6: ; 55a4a (15:5a4a) Route14TrainerHeader7: ; 55a56 (15:5a56) db $8 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7db ; flag's byte + dw wd7db ; flag's byte dw Route14BattleText8 ; 0x5b34 TextBeforeBattle dw Route14AfterBattleText8 ; 0x5b3e TextAfterBattle dw Route14EndBattleText8 ; 0x5b39 TextEndBattle @@ -101,7 +101,7 @@ Route14TrainerHeader7: ; 55a56 (15:5a56) Route14TrainerHeader8: ; 55a62 (15:5a62) db $9 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7db ; flag's byte + dw wd7db ; flag's byte dw Route14BattleText9 ; 0x5b4d TextBeforeBattle dw Route14AfterBattleText9 ; 0x5b57 TextAfterBattle dw Route14EndBattleText9 ; 0x5b52 TextEndBattle @@ -110,7 +110,7 @@ Route14TrainerHeader8: ; 55a62 (15:5a62) Route14TrainerHeader9: ; 55a6e (15:5a6e) db $a ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7db ; flag's byte + dw wd7db ; flag's byte dw Route14BattleText10 ; 0x5b66 TextBeforeBattle dw Route14AfterBattleText10 ; 0x5b70 TextAfterBattle dw Route14EndBattleText10 ; 0x5b6b TextEndBattle diff --git a/scripts/route15.asm b/scripts/route15.asm index f7eaa758..789ace21 100755 --- a/scripts/route15.asm +++ b/scripts/route15.asm @@ -30,7 +30,7 @@ Route15TrainerHeaders: ; 597df (16:57df) Route15TrainerHeader0: ; 597df (16:57df) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7dd ; flag's byte + dw wd7dd ; flag's byte dw Route15BattleText1 ; 0x5898 TextBeforeBattle dw Route15AfterBattleText1 ; 0x58a2 TextAfterBattle dw Route15EndBattleText1 ; 0x589d TextEndBattle @@ -39,7 +39,7 @@ Route15TrainerHeader0: ; 597df (16:57df) Route15TrainerHeader1: ; 597eb (16:57eb) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7dd ; flag's byte + dw wd7dd ; flag's byte dw Route15BattleText2 ; 0x58a7 TextBeforeBattle dw Route15AfterBattleText2 ; 0x58b1 TextAfterBattle dw Route15EndBattleText2 ; 0x58ac TextEndBattle @@ -48,7 +48,7 @@ Route15TrainerHeader1: ; 597eb (16:57eb) Route15TrainerHeader2: ; 597f7 (16:57f7) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7dd ; flag's byte + dw wd7dd ; flag's byte dw Route15BattleText3 ; 0x58b6 TextBeforeBattle dw Route15AfterBattleText3 ; 0x58c0 TextAfterBattle dw Route15EndBattleText3 ; 0x58bb TextEndBattle @@ -57,7 +57,7 @@ Route15TrainerHeader2: ; 597f7 (16:57f7) Route15TrainerHeader3: ; 59803 (16:5803) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7dd ; flag's byte + dw wd7dd ; flag's byte dw Route15BattleText4 ; 0x58c5 TextBeforeBattle dw Route15AfterBattleText4 ; 0x58cf TextAfterBattle dw Route15EndBattleText4 ; 0x58ca TextEndBattle @@ -66,7 +66,7 @@ Route15TrainerHeader3: ; 59803 (16:5803) Route15TrainerHeader4: ; 5980f (16:580f) db $5 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7dd ; flag's byte + dw wd7dd ; flag's byte dw Route15BattleText5 ; 0x58d4 TextBeforeBattle dw Route15AfterBattleText5 ; 0x58de TextAfterBattle dw Route15EndBattleText5 ; 0x58d9 TextEndBattle @@ -75,7 +75,7 @@ Route15TrainerHeader4: ; 5980f (16:580f) Route15TrainerHeader5: ; 5981b (16:581b) db $6 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7dd ; flag's byte + dw wd7dd ; flag's byte dw Route15BattleText6 ; 0x58e3 TextBeforeBattle dw Route15AfterBattleText6 ; 0x58ed TextAfterBattle dw Route15EndBattleText6 ; 0x58e8 TextEndBattle @@ -84,7 +84,7 @@ Route15TrainerHeader5: ; 5981b (16:581b) Route15TrainerHeader6: ; 59827 (16:5827) db $7 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7dd ; flag's byte + dw wd7dd ; flag's byte dw Route15BattleText7 ; 0x58f2 TextBeforeBattle dw Route15AfterBattleText7 ; 0x58fc TextAfterBattle dw Route15EndBattleText7 ; 0x58f7 TextEndBattle @@ -93,7 +93,7 @@ Route15TrainerHeader6: ; 59827 (16:5827) Route15TrainerHeader7: ; 59833 (16:5833) db $8 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7dd ; flag's byte + dw wd7dd ; flag's byte dw Route15BattleText8 ; 0x5901 TextBeforeBattle dw Route15AfterBattleText8 ; 0x590b TextAfterBattle dw Route15EndBattleText8 ; 0x5906 TextEndBattle @@ -102,7 +102,7 @@ Route15TrainerHeader7: ; 59833 (16:5833) Route15TrainerHeader8: ; 5983f (16:583f) db $9 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7dd ; flag's byte + dw wd7dd ; flag's byte dw Route15BattleText9 ; 0x5910 TextBeforeBattle dw Route15AfterBattleText9 ; 0x591a TextAfterBattle dw Route15EndBattleText9 ; 0x5915 TextEndBattle @@ -111,7 +111,7 @@ Route15TrainerHeader8: ; 5983f (16:583f) Route15TrainerHeader9: ; 5984b (16:584b) db $a ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7dd ; flag's byte + dw wd7dd ; flag's byte dw Route15BattleText10 ; 0x591f TextBeforeBattle dw Route15AfterBattleText10 ; 0x5929 TextAfterBattle dw Route15EndBattleText10 ; 0x5924 TextEndBattle diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm index fde968bb..88b6576f 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/route15gateupstairs.asm @@ -7,17 +7,17 @@ Route15GateUpstairsTextPointers: ; 4964d (12:564d) Route15GateUpstairsText1: ; 49651 (12:5651) db $8 - ld a, [$d7dd] + ld a, [wd7dd] bit 0, a jr nz, .asm_49683 ; 0x49657 $2a ld a, 50 ; pokemon needed ld [$ffdb], a ld a, EXP__ALL ; oak's aide reward ld [$ffdc], a - ld [$d11e], a + ld [wd11e], a call GetItemName - ld hl, $cd6d - ld de, $cc5b + ld hl, wcd6d + ld de, wcc5b ld bc, $000d call CopyData ld a, $62 @@ -25,7 +25,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651) ld a, [$ffdb] cp $1 jr nz, .asm_49689 ; 0x4967c $b - ld hl, $d7dd + ld hl, wd7dd set 0, [hl] .asm_49683 ld hl, Route15GateUpstairsText_4968c diff --git a/scripts/route16.asm b/scripts/route16.asm index cddc99bb..68474c3f 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -21,7 +21,7 @@ Route16ScriptPointers: ; 59951 (16:5951) dw Route16Script3 Route16Script0: ; 59959 (16:5959) - ld hl, $d7e0 + ld hl, wd7e0 bit 1, [hl] jp nz, CheckFightingMapTrainers bit 0, [hl] @@ -31,11 +31,11 @@ Route16Script0: ; 59959 (16:5959) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID ld a, SNORLAX - ld [W_CUROPPONENT], a ; $d059 + ld [W_CUROPPONENT], a ; wd059 ld a, 30 - ld [W_CURENEMYLVL], a ; $d127 + ld [W_CURENEMYLVL], a ; W_CURENEMYLVL ld a, $21 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) call UpdateSprites @@ -45,18 +45,18 @@ Route16Script0: ; 59959 (16:5959) ret Route16Script3: ; 5998f (16:598f) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, Func_59946 call UpdateSprites - ld a, [$cf0b] + ld a, [wcf0b] cp $2 jr z, .asm_599a8 ld a, $b ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID .asm_599a8 - ld hl, $d7e0 + ld hl, wd7e0 set 1, [hl] call Delay3 ld a, $0 @@ -81,7 +81,7 @@ Route16TrainerHeaders: ; 599cf (16:59cf) Route16TrainerHeader0: ; 599cf (16:59cf) db $1 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7df ; flag's byte + dw wd7df ; flag's byte dw Route16BattleText1 ; 0x5a22 TextBeforeBattle dw Route16AfterBattleText1 ; 0x5a2c TextAfterBattle dw Route16EndBattleText1 ; 0x5a27 TextEndBattle @@ -90,7 +90,7 @@ Route16TrainerHeader0: ; 599cf (16:59cf) Route16TrainerHeader1: ; 599db (16:59db) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7df ; flag's byte + dw wd7df ; flag's byte dw Route16BattleText2 ; 0x5a3b TextBeforeBattle dw Route16AfterBattleText2 ; 0x5a45 TextAfterBattle dw Route16EndBattleText2 ; 0x5a40 TextEndBattle @@ -99,7 +99,7 @@ Route16TrainerHeader1: ; 599db (16:59db) Route16TrainerHeader2: ; 599e7 (16:59e7) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7df ; flag's byte + dw wd7df ; flag's byte dw Route16BattleText3 ; 0x5a54 TextBeforeBattle dw Route16AfterBattleText3 ; 0x5a5e TextAfterBattle dw Route16EndBattleText3 ; 0x5a59 TextEndBattle @@ -108,7 +108,7 @@ Route16TrainerHeader2: ; 599e7 (16:59e7) Route16TrainerHeader3: ; 599f3 (16:59f3) db $4 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7df ; flag's byte + dw wd7df ; flag's byte dw Route16BattleText4 ; 0x5a6d TextBeforeBattle dw Route16AfterBattleText4 ; 0x5a77 TextAfterBattle dw Route16EndBattleText4 ; 0x5a72 TextEndBattle @@ -117,7 +117,7 @@ Route16TrainerHeader3: ; 599f3 (16:59f3) Route16TrainerHeader4: ; 599ff (16:59ff) db $5 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7df ; flag's byte + dw wd7df ; flag's byte dw Route16BattleText5 ; 0x5a86 TextBeforeBattle dw Route16AfterBattleText5 ; 0x5a90 TextAfterBattle dw Route16EndBattleText5 ; 0x5a8b TextEndBattle @@ -126,7 +126,7 @@ Route16TrainerHeader4: ; 599ff (16:59ff) Route16TrainerHeader5: ; 59a0b (16:5a0b) db $6 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7df ; flag's byte + dw wd7df ; flag's byte dw Route16BattleText6 ; 0x5a9f TextBeforeBattle dw Route16AfterBattleText6 ; 0x5aa9 TextAfterBattle dw Route16EndBattleText6 ; 0x5aa4 TextEndBattle diff --git a/scripts/route16gate.asm b/scripts/route16gate.asm index ce1f6f3d..eb85ac22 100755 --- a/scripts/route16gate.asm +++ b/scripts/route16gate.asm @@ -1,5 +1,5 @@ Route16GateScript: ; 496be (12:56be) - ld hl, $d732 + ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing ld a, [W_ROUTE16GATECURSCRIPT] @@ -23,16 +23,16 @@ Route16GateScript0: ; 496d7 (12:56d7) call DisplayTextID xor a ld [hJoyHeld], a - ld a, [$cd3d] + ld a, [wWhichTrade] cp $1 jr z, .asm_4970e ; 0x496f1 $1b - ld a, [$cd3d] + ld a, [wWhichTrade] dec a - ld [$cd38], a + ld [wcd38], a ld b, $0 ld c, a ld a, $40 - ld hl, $ccd3 + ld hl, wccd3 call FillMemory call Func_3486 ld a, $1 @@ -51,7 +51,7 @@ CoordsData_49714: ; 49714 (12:5714) db $FF Route16GateScript1: ; 4971d (12:571d) - ld a, [$cd38] + ld a, [wcd38] and a ret nz ld a, $f0 @@ -62,21 +62,21 @@ Route16GateScript2: ; 49727 (12:5727) ld [H_SPRITEHEIGHT], a call DisplayTextID ld a, $1 - ld [$cd38], a + ld [wcd38], a ld a, $10 - ld [$ccd3], a + ld [wccd3], a call Func_3486 ld a, $3 ld [W_ROUTE16GATECURSCRIPT], a ret Route16GateScript3: ; 49741 (12:5741) - ld a, [$cd38] + ld a, [wcd38] and a ret nz xor a ld [wJoyIgnore], a - ld hl, $d730 + ld hl, wd730 res 7, [hl] ld a, $0 ld [W_ROUTE16GATECURSCRIPT], a diff --git a/scripts/route16house.asm b/scripts/route16house.asm index 21c21b79..9a189757 100755 --- a/scripts/route16house.asm +++ b/scripts/route16house.asm @@ -7,7 +7,7 @@ Route16HouseTextPointers: ; 1e5fb (7:65fb) Route16HouseText1: ; 1e5ff (7:65ff) db $08 ; asm - ld a, [$d7e0] + ld a, [wd7e0] bit 6, a ld hl, HM02ExplanationText jr nz, .asm_13616 ; 0x1e608 @@ -16,7 +16,7 @@ Route16HouseText1: ; 1e5ff (7:65ff) ld bc, (HM_02 << 8) | 1 call GiveItem jr nc, .BagFull - ld hl, $d7e0 + ld hl, wd7e0 set 6, [hl] ld hl, ReceivedHM02Text jr .asm_13616 ; 0x1e620 diff --git a/scripts/route17.asm b/scripts/route17.asm index 976d4236..78ceb2ae 100755 --- a/scripts/route17.asm +++ b/scripts/route17.asm @@ -34,7 +34,7 @@ Route17TrainerHeaders: ; 55bb3 (15:5bb3) Route17TrainerHeader0: ; 55bb3 (15:5bb3) db $1 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7e1 ; flag's byte + dw wd7e1 ; flag's byte dw Route17BattleText1 ; 0x5c36 TextBeforeBattle dw Route17AfterBattleText1 ; 0x5c40 TextAfterBattle dw Route17EndBattleText1 ; 0x5c3b TextEndBattle @@ -43,7 +43,7 @@ Route17TrainerHeader0: ; 55bb3 (15:5bb3) Route17TrainerHeader1: ; 55bbf (15:5bbf) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e1 ; flag's byte + dw wd7e1 ; flag's byte dw Route17BattleText2 ; 0x5c4f TextBeforeBattle dw Route17AfterBattleText2 ; 0x5c59 TextAfterBattle dw Route17EndBattleText2 ; 0x5c54 TextEndBattle @@ -52,7 +52,7 @@ Route17TrainerHeader1: ; 55bbf (15:5bbf) Route17TrainerHeader2: ; 55bcb (15:5bcb) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e1 ; flag's byte + dw wd7e1 ; flag's byte dw Route17BattleText3 ; 0x5c68 TextBeforeBattle dw Route17AfterBattleText3 ; 0x5c72 TextAfterBattle dw Route17EndBattleText3 ; 0x5c6d TextEndBattle @@ -61,7 +61,7 @@ Route17TrainerHeader2: ; 55bcb (15:5bcb) Route17TrainerHeader3: ; 55bd7 (15:5bd7) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e1 ; flag's byte + dw wd7e1 ; flag's byte dw Route17BattleText4 ; 0x5c81 TextBeforeBattle dw Route17AfterBattleText4 ; 0x5c8b TextAfterBattle dw Route17EndBattleText4 ; 0x5c86 TextEndBattle @@ -70,7 +70,7 @@ Route17TrainerHeader3: ; 55bd7 (15:5bd7) Route17TrainerHeader4: ; 55be3 (15:5be3) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7e1 ; flag's byte + dw wd7e1 ; flag's byte dw Route17BattleText5 ; 0x5c9a TextBeforeBattle dw Route17AfterBattleText5 ; 0x5ca4 TextAfterBattle dw Route17EndBattleText5 ; 0x5c9f TextEndBattle @@ -79,7 +79,7 @@ Route17TrainerHeader4: ; 55be3 (15:5be3) Route17TrainerHeader5: ; 55bef (15:5bef) db $6 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7e1 ; flag's byte + dw wd7e1 ; flag's byte dw Route17BattleText6 ; 0x5cb3 TextBeforeBattle dw Route17AfterBattleText6 ; 0x5cbd TextAfterBattle dw Route17EndBattleText6 ; 0x5cb8 TextEndBattle @@ -88,7 +88,7 @@ Route17TrainerHeader5: ; 55bef (15:5bef) Route17TrainerHeader6: ; 55bfb (15:5bfb) db $7 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e1 ; flag's byte + dw wd7e1 ; flag's byte dw Route17BattleText7 ; 0x5ccc TextBeforeBattle dw Route17AfterBattleText7 ; 0x5cd6 TextAfterBattle dw Route17EndBattleText7 ; 0x5cd1 TextEndBattle @@ -97,7 +97,7 @@ Route17TrainerHeader6: ; 55bfb (15:5bfb) Route17TrainerHeader7: ; 55c07 (15:5c07) db $8 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7e1 ; flag's byte + dw wd7e1 ; flag's byte dw Route17BattleText8 ; 0x5ce5 TextBeforeBattle dw Route17AfterBattleText8 ; 0x5cef TextAfterBattle dw Route17EndBattleText8 ; 0x5cea TextEndBattle @@ -106,7 +106,7 @@ Route17TrainerHeader7: ; 55c07 (15:5c07) Route17TrainerHeader8: ; 55c13 (15:5c13) db $9 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7e1 ; flag's byte + dw wd7e1 ; flag's byte dw Route17BattleText9 ; 0x5cfe TextBeforeBattle dw Route17AfterBattleText9 ; 0x5d08 TextAfterBattle dw Route17EndBattleText9 ; 0x5d03 TextEndBattle @@ -115,7 +115,7 @@ Route17TrainerHeader8: ; 55c13 (15:5c13) Route17TrainerHeader9: ; 55c1f (15:5c1f) db $a ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e1 ; flag's byte + dw wd7e1 ; flag's byte dw Route17BattleText10 ; 0x5d17 TextBeforeBattle dw Route17AfterBattleText10 ; 0x5d21 TextAfterBattle dw Route17EndBattleText10 ; 0x5d1c TextEndBattle diff --git a/scripts/route18.asm b/scripts/route18.asm index b15f5e42..a0e4487a 100755 --- a/scripts/route18.asm +++ b/scripts/route18.asm @@ -23,7 +23,7 @@ Route18TrainerHeaders: ; 59aea (16:5aea) Route18TrainerHeader0: ; 59aea (16:5aea) db $1 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7e3 ; flag's byte + dw wd7e3 ; flag's byte dw Route18BattleText1 ; 0x5b19 TextBeforeBattle dw Route18AfterBattleText1 ; 0x5b23 TextAfterBattle dw Route18EndBattleText1 ; 0x5b1e TextEndBattle @@ -32,7 +32,7 @@ Route18TrainerHeader0: ; 59aea (16:5aea) Route18TrainerHeader1: ; 59af6 (16:5af6) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7e3 ; flag's byte + dw wd7e3 ; flag's byte dw Route18BattleText2 ; 0x5b32 TextBeforeBattle dw Route18AfterBattleText2 ; 0x5b3c TextAfterBattle dw Route18EndBattleText2 ; 0x5b37 TextEndBattle @@ -41,7 +41,7 @@ Route18TrainerHeader1: ; 59af6 (16:5af6) Route18TrainerHeader2: ; 59b02 (16:5b02) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e3 ; flag's byte + dw wd7e3 ; flag's byte dw Route18BattleText3 ; 0x5b4b TextBeforeBattle dw Route18AfterBattleText3 ; 0x5b55 TextAfterBattle dw Route18EndBattleText3 ; 0x5b50 TextEndBattle diff --git a/scripts/route18gate.asm b/scripts/route18gate.asm index 8ad85458..bc64f8ca 100755 --- a/scripts/route18gate.asm +++ b/scripts/route18gate.asm @@ -1,5 +1,5 @@ Route18GateScript: ; 49876 (12:5876) - ld hl, $d732 + ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing ld a, [W_ROUTE18GATECURSCRIPT] @@ -23,16 +23,16 @@ Route18GateScript0: ; 4988f (12:588f) call DisplayTextID xor a ld [hJoyHeld], a - ld a, [$cd3d] + ld a, [wWhichTrade] cp $1 jr z, .asm_498c6 ; 0x498a9 $1b - ld a, [$cd3d] + ld a, [wWhichTrade] dec a - ld [$cd38], a + ld [wcd38], a ld b, $0 ld c, a ld a, $40 - ld hl, $ccd3 + ld hl, wccd3 call FillMemory call Func_3486 ld a, $1 @@ -51,7 +51,7 @@ CoordsData_498cc: ; 498cc (12:58cc) db $FF Route18GateScript1: ; 498d5 (12:58d5) - ld a, [$cd38] + ld a, [wcd38] and a ret nz ld a, $f0 @@ -62,21 +62,21 @@ Route18GateScript2: ; 498df (12:58df) ld [H_SPRITEHEIGHT], a call DisplayTextID ld a, $1 - ld [$cd38], a + ld [wcd38], a ld a, $10 - ld [$ccd3], a + ld [wccd3], a call Func_3486 ld a, $3 ld [W_ROUTE18GATECURSCRIPT], a ret Route18GateScript3: ; 498f9 (12:58f9) - ld a, [$cd38] + ld a, [wcd38] and a ret nz xor a ld [wJoyIgnore], a - ld hl, $d730 + ld hl, wd730 res 7, [hl] ld a, $0 ld [W_ROUTE18GATECURSCRIPT], a diff --git a/scripts/route19.asm b/scripts/route19.asm index 8bc641ff..6c749b03 100755 --- a/scripts/route19.asm +++ b/scripts/route19.asm @@ -29,7 +29,7 @@ Route19TrainerHeaders: ; 55d73 (15:5d73) Route19TrainerHeader0: ; 55d73 (15:5d73) db $1 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e5 ; flag's byte + dw wd7e5 ; flag's byte dw Route19BattleText1 ; 0x5e50 TextBeforeBattle dw Route19AfterBattleText1 ; 0x5e5a TextAfterBattle dw Route19EndBattleText1 ; 0x5e55 TextEndBattle @@ -38,7 +38,7 @@ Route19TrainerHeader0: ; 55d73 (15:5d73) Route19TrainerHeader1: ; 55d7f (15:5d7f) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7e5 ; flag's byte + dw wd7e5 ; flag's byte dw Route19BattleText2 ; 0x5e5f TextBeforeBattle dw Route19AfterBattleText2 ; 0x5e69 TextAfterBattle dw Route19EndBattleText2 ; 0x5e64 TextEndBattle @@ -47,7 +47,7 @@ Route19TrainerHeader1: ; 55d7f (15:5d7f) Route19TrainerHeader2: ; 55d8b (15:5d8b) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7e5 ; flag's byte + dw wd7e5 ; flag's byte dw Route19BattleText3 ; 0x5e6e TextBeforeBattle dw Route19AfterBattleText3 ; 0x5e78 TextAfterBattle dw Route19EndBattleText3 ; 0x5e73 TextEndBattle @@ -56,7 +56,7 @@ Route19TrainerHeader2: ; 55d8b (15:5d8b) Route19TrainerHeader3: ; 55d97 (15:5d97) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e5 ; flag's byte + dw wd7e5 ; flag's byte dw Route19BattleText4 ; 0x5e7d TextBeforeBattle dw Route19AfterBattleText4 ; 0x5e87 TextAfterBattle dw Route19EndBattleText4 ; 0x5e82 TextEndBattle @@ -65,7 +65,7 @@ Route19TrainerHeader3: ; 55d97 (15:5d97) Route19TrainerHeader4: ; 55da3 (15:5da3) db $5 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e5 ; flag's byte + dw wd7e5 ; flag's byte dw Route19BattleText5 ; 0x5e8c TextBeforeBattle dw Route19AfterBattleText5 ; 0x5e96 TextAfterBattle dw Route19EndBattleText5 ; 0x5e91 TextEndBattle @@ -74,7 +74,7 @@ Route19TrainerHeader4: ; 55da3 (15:5da3) Route19TrainerHeader5: ; 55daf (15:5daf) db $6 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e5 ; flag's byte + dw wd7e5 ; flag's byte dw Route19BattleText6 ; 0x5e9b TextBeforeBattle dw Route19AfterBattleText6 ; 0x5ea5 TextAfterBattle dw Route19EndBattleText6 ; 0x5ea0 TextEndBattle @@ -83,7 +83,7 @@ Route19TrainerHeader5: ; 55daf (15:5daf) Route19TrainerHeader6: ; 55dbb (15:5dbb) db $7 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7e5 ; flag's byte + dw wd7e5 ; flag's byte dw Route19BattleText7 ; 0x5eaa TextBeforeBattle dw Route19AfterBattleText7 ; 0x5eb4 TextAfterBattle dw Route19EndBattleText7 ; 0x5eaf TextEndBattle @@ -92,7 +92,7 @@ Route19TrainerHeader6: ; 55dbb (15:5dbb) Route19TrainerHeader7: ; 55dc7 (15:5dc7) db $8 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e5 ; flag's byte + dw wd7e5 ; flag's byte dw Route19BattleText8 ; 0x5eb9 TextBeforeBattle dw Route19AfterBattleText8 ; 0x5ec3 TextAfterBattle dw Route19EndBattleText8 ; 0x5ebe TextEndBattle @@ -101,7 +101,7 @@ Route19TrainerHeader7: ; 55dc7 (15:5dc7) Route19TrainerHeader8: ; 55dd3 (15:5dd3) db $9 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e5 ; flag's byte + dw wd7e5 ; flag's byte dw Route19BattleText9 ; 0x5ec8 TextBeforeBattle dw Route19AfterBattleText9 ; 0x5ed2 TextAfterBattle dw Route19EndBattleText9 ; 0x5ecd TextEndBattle @@ -110,7 +110,7 @@ Route19TrainerHeader8: ; 55dd3 (15:5dd3) Route19TrainerHeader9: ; 55ddf (15:5ddf) db $a ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e5 ; flag's byte + dw wd7e5 ; flag's byte dw Route19BattleText10 ; 0x5ed7 TextBeforeBattle dw Route19AfterBattleText10 ; 0x5ee1 TextAfterBattle dw Route19EndBattleText10 ; 0x5edc TextEndBattle diff --git a/scripts/route20.asm b/scripts/route20.asm index 2d5f3077..ef2652c0 100755 --- a/scripts/route20.asm +++ b/scripts/route20.asm @@ -1,5 +1,5 @@ Route20Script: ; 50ca9 (14:4ca9) - ld hl, $d7e7 + ld hl, wd7e7 bit 0, [hl] res 0, [hl] call nz, Route20Script_50cc6 @@ -12,7 +12,7 @@ Route20Script: ; 50ca9 (14:4ca9) ret Route20Script_50cc6: ; 50cc6 (14:4cc6) - ld a, [$d880] + ld a, [wd880] and $3 cp $3 jr z, .asm_50cef @@ -34,7 +34,7 @@ Route20Script_50cc6: ; 50cc6 (14:4cc6) db $D9,$DA,$DB,$DC,$DF,$E0,$FF .asm_50cef - ld a, [$d881] + ld a, [wd881] and $3 cp $3 ret z @@ -49,12 +49,12 @@ Route20Script_50cc6: ; 50cc6 (14:4cc6) ret Route20Script_50d0c: ; 50d0c (14:4d0c) - ld [$cc4d], a + ld [wcc4d], a ld a, $15 jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) Route20Script_50d14: ; 50d14 (14:4d14) - ld [$cc4d], a + ld [wcc4d], a ld a, $11 jp Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) @@ -81,7 +81,7 @@ Route20TrainerHeaders: ; 50d3a (14:4d3a) Route20TrainerHeader0: ; 50d3a (14:4d3a) db $1 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e7 ; flag's byte + dw wd7e7 ; flag's byte dw Route20BattleText1 ; 0x4e17 TextBeforeBattle dw Route20AfterBattleText1 ; 0x4e21 TextAfterBattle dw Route20EndBattleText1 ; 0x4e1c TextEndBattle @@ -90,7 +90,7 @@ Route20TrainerHeader0: ; 50d3a (14:4d3a) Route20TrainerHeader2: ; 50d46 (14:4d46) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e7 ; flag's byte + dw wd7e7 ; flag's byte dw Route20BattleText2 ; 0x4e26 TextBeforeBattle dw Route20AfterBattleText2 ; 0x4e30 TextAfterBattle dw Route20EndBattleText2 ; 0x4e2b TextEndBattle @@ -99,7 +99,7 @@ Route20TrainerHeader2: ; 50d46 (14:4d46) Route20TrainerHeader3: ; 50d52 (14:4d52) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7e7 ; flag's byte + dw wd7e7 ; flag's byte dw Route20BattleText3 ; 0x4e35 TextBeforeBattle dw Route20AfterBattleText3 ; 0x4e3f TextAfterBattle dw Route20EndBattleText3 ; 0x4e3a TextEndBattle @@ -108,7 +108,7 @@ Route20TrainerHeader3: ; 50d52 (14:4d52) Route20TrainerHeader4: ; 50d5e (14:4d5e) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e7 ; flag's byte + dw wd7e7 ; flag's byte dw Route20BattleText4 ; 0x4e44 TextBeforeBattle dw Route20AfterBattleText4 ; 0x4e4e TextAfterBattle dw Route20EndBattleText4 ; 0x4e49 TextEndBattle @@ -117,7 +117,7 @@ Route20TrainerHeader4: ; 50d5e (14:4d5e) Route20TrainerHeader5: ; 50d6a (14:4d6a) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7e7 ; flag's byte + dw wd7e7 ; flag's byte dw Route20BattleText5 ; 0x4e53 TextBeforeBattle dw Route20AfterBattleText5 ; 0x4e5d TextAfterBattle dw Route20EndBattleText5 ; 0x4e58 TextEndBattle @@ -126,7 +126,7 @@ Route20TrainerHeader5: ; 50d6a (14:4d6a) Route20TrainerHeader6: ; 50d76 (14:4d76) db $6 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e7 ; flag's byte + dw wd7e7 ; flag's byte dw Route20BattleText6 ; 0x4e62 TextBeforeBattle dw Route20AfterBattleText6 ; 0x4e6c TextAfterBattle dw Route20EndBattleText6 ; 0x4e67 TextEndBattle @@ -135,7 +135,7 @@ Route20TrainerHeader6: ; 50d76 (14:4d76) Route20TrainerHeader7: ; 50d82 (14:4d82) db $7 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7e7 ; flag's byte + dw wd7e7 ; flag's byte dw Route20BattleText7 ; 0x4e71 TextBeforeBattle dw Route20AfterBattleText7 ; 0x4e7b TextAfterBattle dw Route20EndBattleText7 ; 0x4e76 TextEndBattle @@ -144,7 +144,7 @@ Route20TrainerHeader7: ; 50d82 (14:4d82) Route20TrainerHeader8: ; 50d8e (14:4d8e) db $8 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e7 ; flag's byte + dw wd7e7 ; flag's byte dw Route20BattleText8 ; 0x4e80 TextBeforeBattle dw Route20AfterBattleText8 ; 0x4e8a TextAfterBattle dw Route20EndBattleText8 ; 0x4e85 TextEndBattle @@ -153,7 +153,7 @@ Route20TrainerHeader8: ; 50d8e (14:4d8e) Route20TrainerHeader9: ; 50d9a (14:4d9a) db $9 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7e7 ; flag's byte + dw wd7e7 ; flag's byte dw Route20BattleText9 ; 0x4e8f TextBeforeBattle dw Route20AfterBattleText9 ; 0x4e99 TextAfterBattle dw Route20EndBattleText9 ; 0x4e94 TextEndBattle @@ -162,7 +162,7 @@ Route20TrainerHeader9: ; 50d9a (14:4d9a) Route20TrainerHeader10: ; 50da6 (14:4da6) db $a ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e7 ; flag's byte + dw wd7e7 ; flag's byte dw Route20BattleText10 ; 0x4e9e TextBeforeBattle dw Route20AfterBattleText10 ; 0x4ea8 TextAfterBattle dw Route20EndBattleText10 ; 0x4ea3 TextEndBattle diff --git a/scripts/route21.asm b/scripts/route21.asm index 2332d2c8..034282f8 100755 --- a/scripts/route21.asm +++ b/scripts/route21.asm @@ -27,7 +27,7 @@ Route21TrainerHeaders: ; 55f16 (15:5f16) Route21TrainerHeader0: ; 55f16 (15:5f16) db $1 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d7e9 ; flag's byte + dw wd7e9 ; flag's byte dw Route21BattleText1 ; 0x5fdd TextBeforeBattle dw Route21AfterBattleText1 ; 0x5fe7 TextAfterBattle dw Route21EndBattleText1 ; 0x5fe2 TextEndBattle @@ -36,7 +36,7 @@ Route21TrainerHeader0: ; 55f16 (15:5f16) Route21TrainerHeader1: ; 55f22 (15:5f22) db $2 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d7e9 ; flag's byte + dw wd7e9 ; flag's byte dw Route21BattleText2 ; 0x5fec TextBeforeBattle dw Route21AfterBattleText2 ; 0x5ff6 TextAfterBattle dw Route21EndBattleText2 ; 0x5ff1 TextEndBattle @@ -45,7 +45,7 @@ Route21TrainerHeader1: ; 55f22 (15:5f22) Route21TrainerHeader2: ; 55f2e (15:5f2e) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e9 ; flag's byte + dw wd7e9 ; flag's byte dw Route21BattleText3 ; 0x5ffb TextBeforeBattle dw Route21AfterBattleText3 ; 0x6005 TextAfterBattle dw Route21EndBattleText3 ; 0x6000 TextEndBattle @@ -54,7 +54,7 @@ Route21TrainerHeader2: ; 55f2e (15:5f2e) Route21TrainerHeader3: ; 55f3a (15:5f3a) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e9 ; flag's byte + dw wd7e9 ; flag's byte dw Route21BattleText4 ; 0x600a TextBeforeBattle dw Route21AfterBattleText4 ; 0x6014 TextAfterBattle dw Route21EndBattleText4 ; 0x600f TextEndBattle @@ -63,7 +63,7 @@ Route21TrainerHeader3: ; 55f3a (15:5f3a) Route21TrainerHeader4: ; 55f46 (15:5f46) db $5 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e9 ; flag's byte + dw wd7e9 ; flag's byte dw Route21BattleText5 ; 0x6019 TextBeforeBattle dw Route21AfterBattleText5 ; 0x6023 TextAfterBattle dw Route21EndBattleText5 ; 0x601e TextEndBattle @@ -72,7 +72,7 @@ Route21TrainerHeader4: ; 55f46 (15:5f46) Route21TrainerHeader5: ; 55f52 (15:5f52) db $6 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7e9 ; flag's byte + dw wd7e9 ; flag's byte dw Route21BattleText6 ; 0x6028 TextBeforeBattle dw Route21AfterBattleText6 ; 0x6032 TextAfterBattle dw Route21EndBattleText6 ; 0x602d TextEndBattle @@ -81,7 +81,7 @@ Route21TrainerHeader5: ; 55f52 (15:5f52) Route21TrainerHeader6: ; 55f5e (15:5f5e) db $7 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7e9 ; flag's byte + dw wd7e9 ; flag's byte dw Route21BattleText7 ; 0x6037 TextBeforeBattle dw Route21AfterBattleText7 ; 0x6041 TextAfterBattle dw Route21EndBattleText7 ; 0x603c TextEndBattle @@ -90,7 +90,7 @@ Route21TrainerHeader6: ; 55f5e (15:5f5e) Route21TrainerHeader7: ; 55f6a (15:5f6a) db $8 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d7e9 ; flag's byte + dw wd7e9 ; flag's byte dw Route21BattleText8 ; 0x6046 TextBeforeBattle dw Route21AfterBattleText8 ; 0x6050 TextAfterBattle dw Route21EndBattleText8 ; 0x604b TextEndBattle @@ -99,7 +99,7 @@ Route21TrainerHeader7: ; 55f6a (15:5f6a) Route21TrainerHeader8: ; 55f76 (15:5f76) db $9 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d7e9 ; flag's byte + dw wd7e9 ; flag's byte dw Route21BattleText9 ; 0x6055 TextBeforeBattle dw Route21AfterBattleText9 ; 0x605f TextAfterBattle dw Route21EndBattleText9 ; 0x605a TextEndBattle diff --git a/scripts/route22.asm b/scripts/route22.asm index 4fd93b3d..fa225415 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -22,7 +22,7 @@ Route22Script7: ; 50ed5 (14:4ed5) ret Route22Script_50ed6: ; 50ed6 (14:4ed6) - ld a, [W_RIVALSTARTER] ; $d715 + ld a, [W_RIVALSTARTER] ; wd715 ld b, a .asm_50eda ld a, [hli] @@ -32,12 +32,12 @@ Route22Script_50ed6: ; 50ed6 (14:4ed6) jr .asm_50eda .asm_50ee1 ld a, [hl] - ld [W_TRAINERNO], a ; $d05d + ld [W_TRAINERNO], a ; wd05d ret Route22MoveRivalSprite: ; 50ee6 (14:4ee6) ld de, Route22RivalMovementData ; $4efb - ld a, [$cf0d] + ld a, [wcf0d] cp $1 jr z, .asm_50ef1 inc de @@ -51,21 +51,21 @@ Route22RivalMovementData: ; 50efb (14:4efb) db $C0,$C0,$C0,$C0,$FF ; move right 4 times Route22Script0: ; 50f00 (14:4f00) - ld a, [$d7eb] + ld a, [wd7eb] bit 7, a ret z ld hl, .Route22RivalBattleCoords ; $4f2d call ArePlayerCoordsInArray ret nc - ld a, [$cd3d] - ld [$cf0d], a + ld a, [wWhichTrade] + ld [wcf0d], a xor a ld [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a ld a, $2 - ld [$d528], a - ld a, [$d7eb] + ld [wd528], a + ld a, [wd7eb] bit 0, a ; is this the rival battle at the beginning of the game? jr nz, .firstRivalBattle ; 0x50f25 $b bit 1, a ; is this the rival at the end of the game? @@ -79,16 +79,16 @@ Route22Script0: ; 50f00 (14:4f00) .firstRivalBattle ld a, $1 - ld [$cd4f], a + ld [wcd4f], a xor a - ld [$cd50], a + ld [wcd50], a ld a, $4c call Predef - ld a, [$d700] + ld a, [wd700] and a jr z, .asm_50f4e ; 0x50f44 $8 ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound .asm_50f4e ld c, BANK(Music_MeetRival) @@ -102,14 +102,14 @@ Route22Script0: ; 50f00 (14:4f00) ret Route22Script1: ; 50f62 (14:4f62) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz - ld a, [$cf0d] + ld a, [wcf0d] cp $1 jr nz, .asm_50f78 ; 0x50f6d $9 ld a, $4 - ld [$d528], a + ld [wd528], a ld a, $4 jr .asm_50f7a ; 0x50f76 $2 .asm_50f78 @@ -124,7 +124,7 @@ Route22Script1: ; 50f62 (14:4f62) ld a, $1 ld [$ff8c], a call DisplayTextID - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, Route22RivalDefeatedText1 @@ -145,10 +145,10 @@ StarterMons_50faf: ; 50faf (14:4faf) db STARTER1,$06 Route22Script2: ; 50fb5 (14:4fb5) - ld a, [$d057] + ld a, [W_ISINBATTLE] cp $ff jp z, Route22Script_50ece - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] and a jr nz, .asm_50fc7 ; 0x50fc1 $4 ld a, $4 @@ -162,16 +162,16 @@ Route22Script2: ; 50fb5 (14:4fb5) call Func_34a6 ld a, $f0 ld [wJoyIgnore], a - ld hl, $d7eb + ld hl, wd7eb set 5, [hl] ld a, $1 ld [$ff8c], a call DisplayTextID ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound callba Music_RivalAlternateStart - ld a, [$cf0d] + ld a, [wcf0d] cp $1 jr nz, .asm_50fff ; 0x50ff8 $5 call Route22Script_51008 @@ -201,17 +201,17 @@ Route22RivalExitMovementData2: ; 5101f (14:501f) db $40,$C0,$C0,$C0,$00,$00,$00,$00,$00,$00,$FF Route22Script3: ; 5102a (14:502a) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz xor a ld [wJoyIgnore], a ld a, $22 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef call Func_2307 - ld hl, $d7eb + ld hl, wd7eb res 0, [hl] res 7, [hl] ld a, $0 @@ -220,20 +220,20 @@ Route22Script3: ; 5102a (14:502a) Route22Script_5104e: ; 5104e (14:504e) ld a, $2 - ld [$cd4f], a + ld [wcd4f], a xor a - ld [$cd50], a + ld [wcd50], a ld a, $4c call Predef ; indirect jump to PrintEmotionBubble (17c47 (5:7c47)) - ld a, [$d700] + ld a, [wd700] and a jr z, .skipYVisibilityTesta ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound .skipYVisibilityTesta ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound callba Music_RivalAlternateTempo ld a, $2 @@ -244,21 +244,21 @@ Route22Script_5104e: ; 5104e (14:504e) ret Route22Script4: ; 51087 (14:5087) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $2 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c - ld a, [$cf0d] + ld a, [wcf0d] cp $1 jr nz, .asm_510a1 ld a, $4 - ld [$d528], a + ld [wd528], a ld a, $4 jr .asm_510a8 .asm_510a1 ld a, $2 - ld [$d528], a + ld [wd528], a ld a, $c .asm_510a8 ld [$ff8d], a @@ -268,14 +268,14 @@ Route22Script4: ; 51087 (14:5087) ld a, $2 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, Route22RivalDefeatedText2 ; $51cb ld de, Route22Text_511d0 ; $51d0 call PreBattleSaveRegisters ld a, SONY2 + $c8 - ld [W_CUROPPONENT], a ; $d059 + ld [W_CUROPPONENT], a ; wd059 ld hl, StarterMons_510d9 ; $50d9 call Route22Script_50ed6 ld a, $5 @@ -288,37 +288,37 @@ StarterMons_510d9: ; 510d9 (14:50d9) db STARTER1,$0c Route22Script5: ; 510df (14:50df) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, Route22Script_50ece ld a, $2 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c - ld a, [$cf0d] + ld a, [wcf0d] cp $1 jr nz, .asm_510fb ld a, $4 - ld [$d528], a + ld [wd528], a ld a, $4 jr .asm_51102 .asm_510fb ld a, $2 - ld [$d528], a + ld [wd528], a ld a, $c .asm_51102 ld [$ff8d], a call Func_34a6 ld a, $f0 ld [wJoyIgnore], a - ld hl, $d7eb + ld hl, wd7eb set 6, [hl] ld a, $2 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound callba Music_RivalAlternateStartAndTempo - ld a, [$cf0d] + ld a, [wcf0d] cp $1 jr nz, .asm_51134 call Route22Script_5113d @@ -348,17 +348,17 @@ MovementData_5114d: ; 5114d (14:514d) db $80,$80,$80,$FF ; left x3 Route22Script6: ; 51151 (14:5151) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz xor a ld [wJoyIgnore], a ld a, $23 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) call Func_2307 - ld hl, $d7eb + ld hl, wd7eb res 1, [hl] res 7, [hl] ld a, $7 @@ -372,7 +372,7 @@ Route22TextPointers: ; 51175 (14:5175) Route22Text1: ; 5117b (14:517b) db $08 ; asm - ld a, [$d7eb] + ld a, [wd7eb] bit 5, a jr z, .asm_a88cf ; 0x51181 ld hl, Route22RivalAfterBattleText1 @@ -386,7 +386,7 @@ Route22Text1: ; 5117b (14:517b) Route22Text2: ; 51194 (14:5194) db $08 ; asm - ld a, [$d7eb] + ld a, [wd7eb] bit 6, a jr z, .asm_58c0a ; 0x5119a ld hl, Route22RivalAfterBattleText2 diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 7dd876e6..107926cf 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -34,15 +34,15 @@ Route22GateScriptCoords: ; 1e6b5 (7:66b5) Route22GateScript_1e6ba: ; 1e6ba (7:66ba) ld a, $1 - ld [$cd38], a + ld [wcd38], a ld a, $80 - ld [$ccd3], a - ld [$c109], a + ld [wccd3], a + ld [wSpriteStateData1 + 9], a ld [wJoyIgnore], a jp Func_3486 Route22GateScript1: ; 1e6cd (7:66cd) - ld a, [$cd38] + ld a, [wcd38] and a ret nz xor a diff --git a/scripts/route23.asm b/scripts/route23.asm index 28a811f7..b5e0c0f8 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -6,22 +6,22 @@ Route23Script: ; 511da (14:51da) jp CallFunctionInTable Route23Script_511e9: ; 511e9 (14:51e9) - ld hl, $d126 + ld hl, wd126 bit 6, [hl] res 6, [hl] ret z - ld hl, $d7ee + ld hl, wd7ee res 0, [hl] res 7, [hl] - ld hl, $d813 + ld hl, wd813 res 0, [hl] res 6, [hl] ld a, $7a - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) ld a, $60 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 jp Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) @@ -53,9 +53,9 @@ Route23Script0: ; 51219 (14:5219) ld a, e ld [$ff8c], a ld a, c - ld [$cd3d], a + ld [wWhichTrade], a ld b, $2 - ld hl, $d7ed + ld hl, wd7ed ld a, $10 call Predef ld a, c @@ -72,7 +72,7 @@ YCoordsData_51255: ; 51255 (14:5255) Route23Script_5125d: ; 5125d (14:525d) ld hl, BadgeTextPointers ; $5276 - ld a, [wWhichTrade] ; $cd3d + ld a, [wWhichTrade] ; wWhichTrade ld c, a ld b, $0 add hl, bc @@ -80,7 +80,7 @@ Route23Script_5125d: ; 5125d (14:525d) ld a, [hli] ld h, [hl] ld l, a - ld de, $cd6d + ld de, wcd6d .asm_5126e ld a, [hli] ld [de], a @@ -121,16 +121,16 @@ CascadeBadgeText: ; 512cb (14:52cb) Route23Script_512d8: ; 512d8 (14:52d8) ld a, $1 - ld [$cd38], a + ld [wcd38], a ld a, $80 - ld [$ccd3], a + ld [wccd3], a xor a - ld [$c109], a + ld [wSpriteStateData1 + 9], a ld [wJoyIgnore], a jp Func_3486 Route23Script1: ; 512ec (14:52ec) - ld a, [$cd38] + ld a, [wcd38] and a ret nz Route23Script2: ; 512f1 (14:52f1) @@ -191,9 +191,9 @@ Route23Text7: ; 5133d (14:533d) jp TextScriptEnd Route23Script_51346: ; 51346 (14:5346) - ld [wWhichTrade], a ; $cd3d + ld [wWhichTrade], a ; wWhichTrade call Route23Script_5125d - ld a, [wWhichTrade] ; $cd3d + ld a, [wWhichTrade] ; wWhichTrade inc a ld c, a ld b, $2 @@ -212,10 +212,10 @@ Route23Script_51346: ; 51346 (14:5346) .asm_5136e ld hl, VictoryRoadGuardText2 call PrintText - ld a, [wWhichTrade] ; $cd3d + ld a, [wWhichTrade] ; wWhichTrade ld c, a ld b, $1 - ld hl, $d7ed + ld hl, wd7ed ld a, $10 ; FlagActionPredef call Predef ld a, $2 diff --git a/scripts/route24.asm b/scripts/route24.asm index 46d528ec..cafb3f8e 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -22,7 +22,7 @@ Route24ScriptPointers: ; 513cb (14:53cb) dw Route24Script4 Route24Script0: ; 513d5 (14:53d5) - ld a, [$d7ef] + ld a, [wd7ef] bit 0, a jp nz, CheckFightingMapTrainers ld hl, CoordsData_5140e ; $540e @@ -33,14 +33,14 @@ Route24Script0: ; 513d5 (14:53d5) ld a, $1 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d7f0 + ld hl, wd7f0 bit 1, [hl] res 1, [hl] ret z ld a, $80 - ld [$ccd3], a + ld [wccd3], a ld a, $1 - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $4 ld [W_ROUTE24CURSCRIPT], a @@ -51,7 +51,7 @@ CoordsData_5140e: ; 5140e (14:540e) db $0F,$0A,$FF Route24Script4: ; 51411 (14:5411) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 @@ -61,13 +61,13 @@ Route24Script4: ; 51411 (14:5411) ret Route24Script3: ; 51422 (14:5422) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, Route24Script_513c0 call UpdateSprites ld a, $f0 ld [wJoyIgnore], a - ld hl, $d7ef + ld hl, wd7ef set 1, [hl] ld a, $1 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c @@ -93,7 +93,7 @@ Route24TrainerHeaders: ; 5145b (14:545b) Route24TrainerHeader0: ; 5145b (14:545b) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7ef ; flag's byte + dw wd7ef ; flag's byte dw Route24BattleText1 ; 0x5571 TextBeforeBattle dw Route24AfterBattleText1 ; 0x557b TextAfterBattle dw Route24EndBattleText1 ; 0x5576 TextEndBattle @@ -102,7 +102,7 @@ Route24TrainerHeader0: ; 5145b (14:545b) Route24TrainerHeader2: ; 51467 (14:5467) db $3 ; flag's bit db ($1 << 4) ; trainer's view range - dw $d7ef ; flag's byte + dw wd7ef ; flag's byte dw Route24BattleText2 ; 0x5580 TextBeforeBattle dw Route24AfterBattleText2 ; 0x558a TextAfterBattle dw Route24EndBattleText2 ; 0x5585 TextEndBattle @@ -111,7 +111,7 @@ Route24TrainerHeader2: ; 51467 (14:5467) Route24TrainerHeader3: ; 51473 (14:5473) db $4 ; flag's bit db ($1 << 4) ; trainer's view range - dw $d7ef ; flag's byte + dw wd7ef ; flag's byte dw Route24BattleText3 ; 0x558f TextBeforeBattle dw Route24AfterBattleText3 ; 0x5599 TextAfterBattle dw Route24EndBattleText3 ; 0x5594 TextEndBattle @@ -120,7 +120,7 @@ Route24TrainerHeader3: ; 51473 (14:5473) Route24TrainerHeader4: ; 5147f (14:547f) db $5 ; flag's bit db ($1 << 4) ; trainer's view range - dw $d7ef ; flag's byte + dw wd7ef ; flag's byte dw Route24BattleText4 ; 0x559e TextBeforeBattle dw Route24AfterBattleText4 ; 0x55a8 TextAfterBattle dw Route24EndBattleText4 ; 0x55a3 TextEndBattle @@ -129,7 +129,7 @@ Route24TrainerHeader4: ; 5147f (14:547f) Route24TrainerHeader5: ; 5148b (14:548b) db $6 ; flag's bit db ($1 << 4) ; trainer's view range - dw $d7ef ; flag's byte + dw wd7ef ; flag's byte dw Route24BattleText5 ; 0x55ad TextBeforeBattle dw Route24AfterBattleText5 ; 0x55b7 TextAfterBattle dw Route24EndBattleText5 ; 0x55b2 TextEndBattle @@ -138,7 +138,7 @@ Route24TrainerHeader5: ; 5148b (14:548b) Route24TrainerHeader6: ; 51497 (14:5497) db $7 ; flag's bit db ($1 << 4) ; trainer's view range - dw $d7ef ; flag's byte + dw wd7ef ; flag's byte dw Route24BattleText6 ; 0x55bc TextBeforeBattle dw Route24AfterBattleText6 ; 0x55c6 TextAfterBattle dw Route24EndBattleText6 ; 0x55c1 TextEndBattle @@ -148,9 +148,9 @@ Route24TrainerHeader6: ; 51497 (14:5497) Route24Text1: ; 514a4 (14:54a4) db $8 - ld hl, $d7f0 + ld hl, wd7f0 res 1, [hl] - ld a, [$d7ef] + ld a, [wd7ef] bit 0, a jr nz, .asm_a03f5 ; 0x514af $48 ld hl, Route24Text_51510 @@ -158,20 +158,20 @@ Route24Text1: ; 514a4 (14:54a4) ld bc, (NUGGET << 8) | 1 call GiveItem jr nc, .BagFull - ld hl, $d7ef + ld hl, wd7ef set 0, [hl] ld hl, Route24Text_5151a call PrintText ld hl, Route24Text_51526 call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, Route24Text_5152b ld de, Route24Text_5152b call PreBattleSaveRegisters ld a, [$ff8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters xor a @@ -187,7 +187,7 @@ Route24Text1: ; 514a4 (14:54a4) .BagFull ld hl, Route24Text_51521 call PrintText - ld hl, $d7f0 + ld hl, wd7f0 set 1, [hl] jp TextScriptEnd diff --git a/scripts/route25.asm b/scripts/route25.asm index 7c5543c7..04035065 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -9,18 +9,18 @@ Route25Script: ; 515cb (14:55cb) ret Route25Script_515e1: ; 515e1 (14:55e1) - ld hl, $d126 + ld hl, wd126 bit 6, [hl] res 6, [hl] ret z - ld hl, $d7f2 + ld hl, wd7f2 bit 7, [hl] ret nz bit 5, [hl] jr nz, .asm_515ff res 6, [hl] ld a, $61 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) .asm_515ff @@ -28,15 +28,15 @@ Route25Script_515e1: ; 515e1 (14:55e1) ret z set 7, [hl] ld a, $24 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) ld a, $62 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) ld a, $63 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) @@ -62,7 +62,7 @@ Route25TrainerHeaders: ; 5163e (14:563e) Route25TrainerHeader0: ; 5163e (14:563e) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7f1 ; flag's byte + dw wd7f1 ; flag's byte dw Route25BattleText1 ; 0x5705 TextBeforeBattle dw Route25AfterBattleText1 ; 0x570f TextAfterBattle dw Route25EndBattleText1 ; 0x570a TextEndBattle @@ -71,7 +71,7 @@ Route25TrainerHeader0: ; 5163e (14:563e) Route25TrainerHeader2: ; 5164a (14:564a) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7f1 ; flag's byte + dw wd7f1 ; flag's byte dw Route25BattleText2 ; 0x5714 TextBeforeBattle dw Route25AfterBattleText2 ; 0x571e TextAfterBattle dw Route25EndBattleText2 ; 0x5719 TextEndBattle @@ -80,7 +80,7 @@ Route25TrainerHeader2: ; 5164a (14:564a) Route25TrainerHeader3: ; 51656 (14:5656) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7f1 ; flag's byte + dw wd7f1 ; flag's byte dw Route25BattleText3 ; 0x5723 TextBeforeBattle dw Route25AfterBattleText3 ; 0x572d TextAfterBattle dw Route25EndBattleText3 ; 0x5728 TextEndBattle @@ -89,7 +89,7 @@ Route25TrainerHeader3: ; 51656 (14:5656) Route25TrainerHeader4: ; 51662 (14:5662) db $4 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7f1 ; flag's byte + dw wd7f1 ; flag's byte dw Route25BattleText4 ; 0x5732 TextBeforeBattle dw Route25AfterBattleText4 ; 0x573c TextAfterBattle dw Route25EndBattleText4 ; 0x5737 TextEndBattle @@ -98,7 +98,7 @@ Route25TrainerHeader4: ; 51662 (14:5662) Route25TrainerHeader5: ; 5166e (14:566e) db $5 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7f1 ; flag's byte + dw wd7f1 ; flag's byte dw Route25BattleText5 ; 0x5741 TextBeforeBattle dw Route25AfterBattleText5 ; 0x574b TextAfterBattle dw Route25EndBattleText5 ; 0x5746 TextEndBattle @@ -107,7 +107,7 @@ Route25TrainerHeader5: ; 5166e (14:566e) Route25TrainerHeader6: ; 5167a (14:567a) db $6 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7f1 ; flag's byte + dw wd7f1 ; flag's byte dw Route25BattleText6 ; 0x5750 TextBeforeBattle dw Route25AfterBattleText6 ; 0x575a TextAfterBattle dw Route25EndBattleText6 ; 0x5755 TextEndBattle @@ -116,7 +116,7 @@ Route25TrainerHeader6: ; 5167a (14:567a) Route25TrainerHeader7: ; 51686 (14:5686) db $7 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7f1 ; flag's byte + dw wd7f1 ; flag's byte dw Route25BattleText7 ; 0x575f TextBeforeBattle dw Route25AfterBattleText7 ; 0x5769 TextAfterBattle dw Route25EndBattleText7 ; 0x5764 TextEndBattle @@ -125,7 +125,7 @@ Route25TrainerHeader7: ; 51686 (14:5686) Route25TrainerHeader8: ; 51692 (14:5692) db $8 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7f1 ; flag's byte + dw wd7f1 ; flag's byte dw Route25BattleText8 ; 0x576e TextBeforeBattle dw Route25AfterBattleText8 ; 0x5778 TextAfterBattle dw Route25EndBattleText8 ; 0x5773 TextEndBattle @@ -134,7 +134,7 @@ Route25TrainerHeader8: ; 51692 (14:5692) Route25TrainerHeader9: ; 5169e (14:569e) db $9 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7f1 ; flag's byte + dw wd7f1 ; flag's byte dw Route25BattleText9 ; 0x577d TextBeforeBattle dw Route25AfterBattleText9 ; 0x5787 TextAfterBattle dw Route25EndBattleText9 ; 0x5782 TextEndBattle diff --git a/scripts/route2gate.asm b/scripts/route2gate.asm index 0885812e..b6e00b51 100755 --- a/scripts/route2gate.asm +++ b/scripts/route2gate.asm @@ -7,17 +7,17 @@ Route2GateTextPointers: ; 5d5d7 (17:55d7) Route2GateText1: ; 5d5db (17:55db) db $08 ; asm - ld a, [$d7c2] + ld a, [wd7c2] bit 0, a jr nz, .asm_6592c ; 0x5d5e1 ld a, 10 ; pokemon needed ldh [$db], a ld a, HM_05 ; oak's aide reward ldh [$dc], a - ld [$d11e], a + ld [wd11e], a call GetItemName ; $2fcf - ld hl, $cd6d - ld de, $cc5b + ld hl, wcd6d + ld de, wcc5b ld bc, $000d call CopyData ld a, $62 @@ -25,7 +25,7 @@ Route2GateText1: ; 5d5db (17:55db) ldh a, [$db] cp $1 jr nz, .asm_ad646 ; 0x5d606 - ld hl, $d7c2 + ld hl, wd7c2 set 0, [hl] .asm_6592c ; 0x5d60d ld hl, Route2GateText_5d616 diff --git a/scripts/route3.asm b/scripts/route3.asm index 1ff29f5b..5cd35fd9 100755 --- a/scripts/route3.asm +++ b/scripts/route3.asm @@ -28,7 +28,7 @@ Route3TrainerHeaders: ; 55525 (15:5525) Route3TrainerHeader0: ; 55525 (15:5525) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7c3 ; flag's byte + dw wd7c3 ; flag's byte dw Route3BattleText1 ; 0x5595 TextBeforeBattle dw Route3AfterBattleText1 ; 0x559f TextAfterBattle dw Route3EndBattleText1 ; 0x559a TextEndBattle @@ -37,7 +37,7 @@ Route3TrainerHeader0: ; 55525 (15:5525) Route3TrainerHeader2: ; 55531 (15:5531) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7c3 ; flag's byte + dw wd7c3 ; flag's byte dw Route3BattleText2 ; 0x55ae TextBeforeBattle dw Route3AfterBattleText2 ; 0x55b8 TextAfterBattle dw Route3EndBattleText2 ; 0x55b3 TextEndBattle @@ -46,7 +46,7 @@ Route3TrainerHeader2: ; 55531 (15:5531) Route3TrainerHeader3: ; 5553d (15:553d) db $4 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7c3 ; flag's byte + dw wd7c3 ; flag's byte dw Route3BattleText3 ; 0x55c7 TextBeforeBattle dw Route3AfterBattleText3 ; 0x55d1 TextAfterBattle dw Route3EndBattleText3 ; 0x55cc TextEndBattle @@ -55,7 +55,7 @@ Route3TrainerHeader3: ; 5553d (15:553d) Route3TrainerHeader4: ; 55549 (15:5549) db $5 ; flag's bit db ($1 << 4) ; trainer's view range - dw $d7c3 ; flag's byte + dw wd7c3 ; flag's byte dw Route3BattleText4 ; 0x55e0 TextBeforeBattle dw Route3AfterBattleText4 ; 0x55ea TextAfterBattle dw Route3EndBattleText4 ; 0x55e5 TextEndBattle @@ -64,7 +64,7 @@ Route3TrainerHeader4: ; 55549 (15:5549) Route3TrainerHeader5: ; 55555 (15:5555) db $6 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7c3 ; flag's byte + dw wd7c3 ; flag's byte dw Route3BattleText5 ; 0x55f9 TextBeforeBattle dw Route3AfterBattleText5 ; 0x5603 TextAfterBattle dw Route3EndBattleText5 ; 0x55fe TextEndBattle @@ -73,7 +73,7 @@ Route3TrainerHeader5: ; 55555 (15:5555) Route3TrainerHeader6: ; 55561 (15:5561) db $7 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7c3 ; flag's byte + dw wd7c3 ; flag's byte dw Route3BattleText6 ; 0x5612 TextBeforeBattle dw Route3AfterBattleText6 ; 0x561c TextAfterBattle dw Route3EndBattleText6 ; 0x5617 TextEndBattle @@ -82,7 +82,7 @@ Route3TrainerHeader6: ; 55561 (15:5561) Route3TrainerHeader7: ; 5556d (15:556d) db $8 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7c3 ; flag's byte + dw wd7c3 ; flag's byte dw Route3BattleText7 ; 0x562b TextBeforeBattle dw Route3AfterBattleText7 ; 0x5635 TextAfterBattle dw Route3EndBattleText7 ; 0x5630 TextEndBattle @@ -91,7 +91,7 @@ Route3TrainerHeader7: ; 5556d (15:556d) Route3TrainerHeader8: ; 55579 (15:5579) db $9 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7c3 ; flag's byte + dw wd7c3 ; flag's byte dw Route3BattleText8 ; 0x5644 TextBeforeBattle dw Route3AfterBattleText8 ; 0x564e TextAfterBattle dw Route3EndBattleText8 ; 0x5649 TextEndBattle diff --git a/scripts/route4.asm b/scripts/route4.asm index 69ec7424..fa234590 100755 --- a/scripts/route4.asm +++ b/scripts/route4.asm @@ -24,7 +24,7 @@ Route4TrainerHeaders: ; 5567d (15:567d) Route4TrainerHeader0: ; 5567d (15:567d) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7c5 ; flag's byte + dw wd7c5 ; flag's byte dw Route4BattleText1 ; 0x5699 TextBeforeBattle dw Route4AfterBattleText1 ; 0x56a3 TextAfterBattle dw Route4EndBattleText1 ; 0x569e TextEndBattle diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index df714afb..1c3bd3c7 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -10,20 +10,20 @@ Route5GateScriptPointers: ; 1df3f (7:5f3f) Route5GateScript_1df43: ; 1df43 (7:5f43) ld a, $40 - ld [$ccd3], a + ld [wccd3], a ld a, $1 - ld [$cd38], a + ld [wcd38], a jp Func_3486 Route5GateScript0: ; 1df50 (7:5f50) - ld a, [$d728] + ld a, [wd728] bit 6, a ret nz ld hl, CoordsData_1df8f call ArePlayerCoordsInArray ret nc ld a, $2 - ld [$d528], a + ld [wd528], a xor a ld [hJoyHeld], a callba RemoveGuardDrink @@ -41,7 +41,7 @@ Route5GateScript0: ; 1df50 (7:5f50) ld a, $3 ld [$ff00+$8c], a call DisplayTextID - ld hl, $d728 + ld hl, wd728 set 6, [hl] ret @@ -51,7 +51,7 @@ CoordsData_1df8f: ; 1df8f (7:5f8f) db $ff Route5GateScript1: ; 1df94 (7:5f94) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 @@ -70,7 +70,7 @@ Route7GateText1: ; 1dfaa (7:5faa) Route6GateText1: ; 1dfaa (7:5faa) Route5GateText1: ; 1dfaa (7:5faa) db $8 - ld a, [$d728] + ld a, [wd728] bit 6, a jr nz, .asm_88856 ; 0x1dfb0 $2c callba RemoveGuardDrink @@ -86,7 +86,7 @@ Route5GateText1: ; 1dfaa (7:5faa) .asm_768a2 ; 0x1dfd0 ld hl, Route5GateText3 call PrintText - ld hl, $d728 + ld hl, wd728 set 6, [hl] jp TextScriptEnd .asm_88856 ; 0x1dfde diff --git a/scripts/route6.asm b/scripts/route6.asm index a1cf52a8..018c1b80 100755 --- a/scripts/route6.asm +++ b/scripts/route6.asm @@ -25,7 +25,7 @@ Route6TrainerHeaders: ; 590d7 (16:50d7) Route6TrainerHeader0: ; 590d7 (16:50d7) db $1 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d7c9 ; flag's byte + dw wd7c9 ; flag's byte dw Route6BattleText1 ; 0x512a TextBeforeBattle dw Route6AfterBattleText1 ; 0x5134 TextAfterBattle dw Route6EndBattleText1 ; 0x512f TextEndBattle @@ -34,7 +34,7 @@ Route6TrainerHeader0: ; 590d7 (16:50d7) Route6TrainerHeader1: ; 590e3 (16:50e3) db $2 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d7c9 ; flag's byte + dw wd7c9 ; flag's byte dw Route6BattleText2 ; 0x5143 TextBeforeBattle dw Route6AfterBattleText1 ; 0x5134 TextAfterBattle dw Route6EndBattleText2 ; 0x5148 TextEndBattle @@ -43,7 +43,7 @@ Route6TrainerHeader1: ; 590e3 (16:50e3) Route6TrainerHeader2: ; 590ef (16:50ef) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7c9 ; flag's byte + dw wd7c9 ; flag's byte dw Route6BattleText3 ; 0x5157 TextBeforeBattle dw Route6AfterBattleText3 ; 0x5161 TextAfterBattle dw Route6EndBattleText3 ; 0x515c TextEndBattle @@ -52,7 +52,7 @@ Route6TrainerHeader2: ; 590ef (16:50ef) Route6TrainerHeader3: ; 590fb (16:50fb) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7c9 ; flag's byte + dw wd7c9 ; flag's byte dw Route6BattleText4 ; 0x5170 TextBeforeBattle dw Route6AfterBattleText4 ; 0x517a TextAfterBattle dw Route6EndBattleText4 ; 0x5175 TextEndBattle @@ -61,7 +61,7 @@ Route6TrainerHeader3: ; 590fb (16:50fb) Route6TrainerHeader4: ; 59107 (16:5107) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7c9 ; flag's byte + dw wd7c9 ; flag's byte dw Route6BattleText5 ; 0x5189 TextBeforeBattle dw Route6AfterBattleText5 ; 0x5193 TextAfterBattle dw Route6EndBattleText5 ; 0x518e TextEndBattle @@ -70,7 +70,7 @@ Route6TrainerHeader4: ; 59107 (16:5107) Route6TrainerHeader5: ; 59113 (16:5113) db $6 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7c9 ; flag's byte + dw wd7c9 ; flag's byte dw Route6BattleText6 ; 0x51a2 TextBeforeBattle dw Route6AfterBattleText6 ; 0x51ac TextAfterBattle dw Route6EndBattleText6 ; 0x51a7 TextEndBattle diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm index b0c12975..9945f80f 100755 --- a/scripts/route6gate.asm +++ b/scripts/route6gate.asm @@ -10,14 +10,14 @@ Route6GateScriptPointers: ; 1e04a (7:604a) dw Route6GateScript1 Route6GateScript0: ; 1e04e (7:604e) - ld a, [$d728] + ld a, [wd728] bit 6, a ret nz ld hl, CoordsData_1e08c call ArePlayerCoordsInArray ret nc ld a, $1 - ld [$d528], a + ld [wd528], a xor a ld [hJoyHeld], a callba RemoveGuardDrink @@ -32,7 +32,7 @@ Route6GateScript0: ; 1e04e (7:604e) ld [W_ROUTE6GATECURSCRIPT], a ret .asm_1e080 - ld hl, $d728 + ld hl, wd728 set 6, [hl] ld a, $3 ld [$ff8c], a @@ -43,7 +43,7 @@ CoordsData_1e08c: ; 1e08c (7:608c) db $02,$04,$FF Route6GateScript1: ; 1e091 (7:6091) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 @@ -53,15 +53,15 @@ Route6GateScript1: ; 1e091 (7:6091) ret Route6GateScript_1e0a1: ; 1e0a1 (7:60a1) - ld hl, $d730 + ld hl, wd730 set 7, [hl] ld a, $80 - ld [$ccd3], a + ld [wccd3], a ld a, $1 - ld [$cd38], a + ld [wcd38], a xor a - ld [$c206], a - ld [$cd3b], a + ld [wSpriteStateData2 + $06], a + ld [wcd3b], a ret Route6GateTextPointers: ; 1e0b8 (7:60b8) diff --git a/scripts/route7gate.asm b/scripts/route7gate.asm index 08e7bc4c..c9599706 100755 --- a/scripts/route7gate.asm +++ b/scripts/route7gate.asm @@ -10,26 +10,26 @@ Route7GateScriptPointers: ; 1e10d (7:610d) dw Route7GateScript1 Route7GateScript_1e111: ; 1e111 (7:6111) - ld hl, $d730 + ld hl, wd730 set 7, [hl] ld a, $20 - ld [$ccd3], a + ld [wccd3], a ld a, $1 - ld [$cd38], a + ld [wcd38], a xor a - ld [$c206], a - ld [$cd3b], a + ld [wSpriteStateData2 + $06], a + ld [wcd3b], a ret Route7GateScript0: ; 1e128 (7:6128) - ld a, [$d728] + ld a, [wd728] bit 6, a ret nz ld hl, CoordsData_1e167 call ArePlayerCoordsInArray ret nc ld a, $8 - ld [$d528], a + ld [wd528], a xor a ld [hJoyHeld], a callba RemoveGuardDrink @@ -47,7 +47,7 @@ Route7GateScript0: ; 1e128 (7:6128) ld a, $3 ld [$ff8c], a call DisplayTextID - ld hl, $d728 + ld hl, wd728 set 6, [hl] ret @@ -57,7 +57,7 @@ CoordsData_1e167: ; 1e167 (7:6167) db $ff Route7GateScript1: ; 1e16c (7:616c) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 diff --git a/scripts/route8.asm b/scripts/route8.asm index eebc96ff..bf41b5ae 100755 --- a/scripts/route8.asm +++ b/scripts/route8.asm @@ -28,7 +28,7 @@ Route8TrainerHeaders: ; 591e3 (16:51e3) Route8TrainerHeader0: ; 591e3 (16:51e3) db $1 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7cd ; flag's byte + dw wd7cd ; flag's byte dw Route8BattleText1 ; 0x525a TextBeforeBattle dw Route8AfterBattleText1 ; 0x5264 TextAfterBattle dw Route8EndBattleText1 ; 0x525f TextEndBattle @@ -37,7 +37,7 @@ Route8TrainerHeader0: ; 591e3 (16:51e3) Route8TrainerHeader1: ; 591ef (16:51ef) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7cd ; flag's byte + dw wd7cd ; flag's byte dw Route8BattleText2 ; 0x5273 TextBeforeBattle dw Route8AfterBattleText2 ; 0x527d TextAfterBattle dw Route8EndBattleText2 ; 0x5278 TextEndBattle @@ -46,7 +46,7 @@ Route8TrainerHeader1: ; 591ef (16:51ef) Route8TrainerHeader2: ; 591fb (16:51fb) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7cd ; flag's byte + dw wd7cd ; flag's byte dw Route8BattleText3 ; 0x528c TextBeforeBattle dw Route8AfterBattleText3 ; 0x5296 TextAfterBattle dw Route8EndBattleText3 ; 0x5291 TextEndBattle @@ -55,7 +55,7 @@ Route8TrainerHeader2: ; 591fb (16:51fb) Route8TrainerHeader3: ; 59207 (16:5207) db $4 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7cd ; flag's byte + dw wd7cd ; flag's byte dw Route8BattleText4 ; 0x52a5 TextBeforeBattle dw Route8AfterBattleText4 ; 0x52af TextAfterBattle dw Route8EndBattleText4 ; 0x52aa TextEndBattle @@ -64,7 +64,7 @@ Route8TrainerHeader3: ; 59207 (16:5207) Route8TrainerHeader4: ; 59213 (16:5213) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7cd ; flag's byte + dw wd7cd ; flag's byte dw Route8BattleText5 ; 0x52be TextBeforeBattle dw Route8AfterBattleText5 ; 0x52c8 TextAfterBattle dw Route8EndBattleText5 ; 0x52c3 TextEndBattle @@ -73,7 +73,7 @@ Route8TrainerHeader4: ; 59213 (16:5213) Route8TrainerHeader5: ; 5921f (16:521f) db $6 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7cd ; flag's byte + dw wd7cd ; flag's byte dw Route8BattleText6 ; 0x52d7 TextBeforeBattle dw Route8AfterBattleText6 ; 0x52e1 TextAfterBattle dw Route8EndBattleText6 ; 0x52dc TextEndBattle @@ -82,7 +82,7 @@ Route8TrainerHeader5: ; 5921f (16:521f) Route8TrainerHeader6: ; 5922b (16:522b) db $7 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7cd ; flag's byte + dw wd7cd ; flag's byte dw Route8BattleText7 ; 0x52f0 TextBeforeBattle dw Route8AfterBattleText7 ; 0x52fa TextAfterBattle dw Route8EndBattleText7 ; 0x52f5 TextEndBattle @@ -91,7 +91,7 @@ Route8TrainerHeader6: ; 5922b (16:522b) Route8TrainerHeader7: ; 59237 (16:5237) db $8 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7cd ; flag's byte + dw wd7cd ; flag's byte dw Route8BattleText8 ; 0x5309 TextBeforeBattle dw Route8AfterBattleText8 ; 0x5313 TextAfterBattle dw Route8EndBattleText8 ; 0x530e TextEndBattle @@ -100,7 +100,7 @@ Route8TrainerHeader7: ; 59237 (16:5237) Route8TrainerHeader8: ; 59243 (16:5243) db $9 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7cd ; flag's byte + dw wd7cd ; flag's byte dw Route8BattleText9 ; 0x5322 TextBeforeBattle dw Route8AfterBattleText9 ; 0x532c TextAfterBattle dw Route8EndBattleText9 ; 0x5327 TextEndBattle diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm index 0dfa1e78..aff001b4 100755 --- a/scripts/route8gate.asm +++ b/scripts/route8gate.asm @@ -9,26 +9,26 @@ Route8GateScriptPointers: ; 1e1d3 (7:61d3) dw Route8GateScript1 Route8GateScript_1e1d7: ; 1e1d7 (7:61d7) - ld hl, $d730 + ld hl, wd730 set 7, [hl] ld a, $10 - ld [$ccd3], a + ld [wccd3], a ld a, $1 - ld [$cd38], a + ld [wcd38], a xor a - ld [$c206], a - ld [$cd3b], a + ld [wSpriteStateData2 + $06], a + ld [wcd3b], a ret Route8GateScript0: ; 1e1ee (7:61ee) - ld a, [$d728] + ld a, [wd728] bit 6, a ret nz ld hl, CoordsData_1e22c call ArePlayerCoordsInArray ret nc ld a, $2 - ld [$d528], a + ld [wd528], a xor a ld [hJoyHeld], a callba RemoveGuardDrink @@ -43,7 +43,7 @@ Route8GateScript0: ; 1e1ee (7:61ee) ld [W_ROUTE8GATECURSCRIPT], a ret .asm_1e220 - ld hl, $d728 + ld hl, wd728 set 6, [hl] ld a, $3 ld [$ff8c], a @@ -55,7 +55,7 @@ CoordsData_1e22c: ; 1e22c (7:622c) db $ff Route8GateScript1: ; 1e231 (7:6231) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 diff --git a/scripts/route9.asm b/scripts/route9.asm index 852c09b2..f14abef8 100755 --- a/scripts/route9.asm +++ b/scripts/route9.asm @@ -29,7 +29,7 @@ Route9TrainerHeaders: ; 556eb (15:56eb) Route9TrainerHeader0: ; 556eb (15:56eb) db $1 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7cf ; flag's byte + dw wd7cf ; flag's byte dw Route9BattleText1 ; 0x5792 TextBeforeBattle dw Route9AfterBattleText1 ; 0x579c TextAfterBattle dw Route9EndBattleText1 ; 0x5797 TextEndBattle @@ -38,7 +38,7 @@ Route9TrainerHeader0: ; 556eb (15:56eb) Route9TrainerHeader2: ; 556f7 (15:56f7) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7cf ; flag's byte + dw wd7cf ; flag's byte dw Route9BattleText2 ; 0x57a1 TextBeforeBattle dw Route9AfterBattleText2 ; 0x57ab TextAfterBattle dw Route9EndBattleText2 ; 0x57a6 TextEndBattle @@ -47,7 +47,7 @@ Route9TrainerHeader2: ; 556f7 (15:56f7) Route9TrainerHeader3: ; 55703 (15:5703) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7cf ; flag's byte + dw wd7cf ; flag's byte dw Route9BattleText3 ; 0x57b0 TextBeforeBattle dw Route9AfterBattleText3 ; 0x57ba TextAfterBattle dw Route9EndBattleText3 ; 0x57b5 TextEndBattle @@ -56,7 +56,7 @@ Route9TrainerHeader3: ; 55703 (15:5703) Route9TrainerHeader4: ; 5570f (15:570f) db $4 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7cf ; flag's byte + dw wd7cf ; flag's byte dw Route9BattleText4 ; 0x57bf TextBeforeBattle dw Route9AfterBattleText4 ; 0x57c9 TextAfterBattle dw Route9EndBattleText4 ; 0x57c4 TextEndBattle @@ -65,7 +65,7 @@ Route9TrainerHeader4: ; 5570f (15:570f) Route9TrainerHeader5: ; 5571b (15:571b) db $5 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7cf ; flag's byte + dw wd7cf ; flag's byte dw Route9BattleText5 ; 0x57ce TextBeforeBattle dw Route9AfterBattleText5 ; 0x57d8 TextAfterBattle dw Route9EndBattleText5 ; 0x57d3 TextEndBattle @@ -74,7 +74,7 @@ Route9TrainerHeader5: ; 5571b (15:571b) Route9TrainerHeader6: ; 55727 (15:5727) db $6 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7cf ; flag's byte + dw wd7cf ; flag's byte dw Route9BattleText6 ; 0x57dd TextBeforeBattle dw Route9AfterBattleText6 ; 0x57e7 TextAfterBattle dw Route9EndBattleText6 ; 0x57e2 TextEndBattle @@ -83,7 +83,7 @@ Route9TrainerHeader6: ; 55727 (15:5727) Route9TrainerHeader7: ; 55733 (15:5733) db $7 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7cf ; flag's byte + dw wd7cf ; flag's byte dw Route9BattleText7 ; 0x57ec TextBeforeBattle dw Route9AfterBattleText7 ; 0x57f6 TextAfterBattle dw Route9EndBattleText7 ; 0x57f1 TextEndBattle @@ -92,7 +92,7 @@ Route9TrainerHeader7: ; 55733 (15:5733) Route9TrainerHeader8: ; 5573f (15:573f) db $8 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7cf ; flag's byte + dw wd7cf ; flag's byte dw Route9BattleText8 ; 0x57fb TextBeforeBattle dw Route9AfterBattleText8 ; 0x5805 TextAfterBattle dw Route9EndBattleText8 ; 0x5800 TextEndBattle @@ -101,7 +101,7 @@ Route9TrainerHeader8: ; 5573f (15:573f) Route9TrainerHeader9: ; 5574b (15:574b) db $9 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d7cf ; flag's byte + dw wd7cf ; flag's byte dw Route9BattleText9 ; 0x580a TextBeforeBattle dw Route9AfterBattleText9 ; 0x5814 TextAfterBattle dw Route9EndBattleText9 ; 0x580f TextEndBattle diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index d02bbd48..b560c53d 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -25,8 +25,8 @@ SafariZoneEntranceScript0: ; 751e7 (1d:51e7) xor a ld [hJoyHeld], a ld a, $c - ld [$c109], a - ld a, [$cd3d] + ld [wSpriteStateData1 + 9], a + ld a, [wWhichTrade] cp $1 jr z, .asm_7520f ; 0x75207 $6 ld a, $2 @@ -73,8 +73,8 @@ SafariZoneEntranceScript3: ; 75240 (1d:5240) SafariZoneEntranceScript5: ; 7524e (1d:524e) ld a, $4 - ld [$d528], a - ld hl, $d790 + ld [wd528], a + ld hl, wd790 bit 6, [hl] res 6, [hl] jr z, .asm_7527f ; 0x7525a $23 @@ -86,7 +86,7 @@ SafariZoneEntranceScript5: ; 7524e (1d:524e) ld [$ff8c], a call DisplayTextID xor a - ld [$da47], a + ld [W_NUMSAFARIBALLS], a ld a, $80 ld c, $3 call SafariZoneEntranceScript_752a3 @@ -113,7 +113,7 @@ SafariZoneEntranceScript6: ; 75295 (1d:5295) call SafariZoneEntranceScript_752b4 ret nz call Delay3 - ld a, [$cf0d] + ld a, [wcf0d] ld [W_SAFARIZONEENTRANCECURSCRIPT], a ret @@ -121,14 +121,14 @@ SafariZoneEntranceScript_752a3: ; 752a3 (1d:52a3) push af ld b, $0 ld a, c - ld [$cd38], a - ld hl, $ccd3 + ld [wcd38], a + ld hl, wccd3 pop af call FillMemory jp Func_3486 SafariZoneEntranceScript_752b4: ; 752b4 (1d:52b4) - ld a, [$cd38] + ld a, [wcd38] and a ret @@ -149,10 +149,10 @@ SafariZoneEntranceText4: ; 752ca (1d:52ca) TX_FAR SafariZoneEntranceText_9e6e4 ; 0x9e6e4 db $8 ld a, $13 - ld [$d125], a + ld [wd125], a call DisplayTextBoxID call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jp nz, .asm_75346 xor a @@ -168,23 +168,23 @@ SafariZoneEntranceText4: ; 752ca (1d:52ca) jr .asm_7534c ; 0x752f7 $53 .asm_752f9 xor a - ld [$cd3d], a + ld [wWhichTrade], a ld a, $5 - ld [$cd3e], a + ld [wTrainerEngageDistance], a ld a, $0 - ld [$cd3f], a - ld hl, $cd3f - ld de, $d349 + ld [wTrainerFacingDirection], a + ld hl, wTrainerFacingDirection + ld de, wPlayerMoney + 2 ld c, $3 ld a, $c ; SubtractBCDPredef call Predef ld a, $13 - ld [$d125], a + ld [wd125], a call DisplayTextBoxID ld hl, SafariZoneEntranceText_7535b call PrintText ld a, $1e - ld [$da47], a + ld [W_NUMSAFARIBALLS], a ld a, 502 / $100 ld [wSafariSteps], a ld a, 502 % $100 @@ -192,7 +192,7 @@ SafariZoneEntranceText4: ; 752ca (1d:52ca) ld a, $40 ld c, $3 call SafariZoneEntranceScript_752a3 - ld hl, $d790 + ld hl, wd790 set 7, [hl] res 6, [hl] ld a, $3 @@ -230,32 +230,32 @@ SafariZoneEntranceText5: ; 7536f (1d:536f) TX_FAR SafariZoneEntranceText_9e814 ; 0x9e814 db $8 call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_7539c ; 0x7537b $1f ld hl, SafariZoneEntranceText_753bb call PrintText xor a - ld [$c109], a + ld [wSpriteStateData1 + 9], a ld a, $80 ld c, $3 call SafariZoneEntranceScript_752a3 - ld hl, $d790 + ld hl, wd790 res 6, [hl] res 7, [hl] ld a, $0 - ld [$cf0d], a + ld [wcf0d], a jr .asm_753b3 ; 0x7539a $17 .asm_7539c ld hl, SafariZoneEntranceText_753c0 call PrintText ld a, $4 - ld [$c109], a + ld [wSpriteStateData1 + 9], a ld a, $40 ld c, $1 call SafariZoneEntranceScript_752a3 ld a, $5 - ld [$cf0d], a + ld [wcf0d], a .asm_753b3 ld a, $6 ld [W_SAFARIZONEENTRANCECURSCRIPT], a @@ -278,7 +278,7 @@ SafariZoneEntranceText2: ; 753ca (1d:53ca) ld hl, SafariZoneEntranceText_753e6 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a ld hl, SafariZoneEntranceText_753f0 jr nz, .asm_278a6 ; 0x753db diff --git a/scripts/safarizonesecrethouse.asm b/scripts/safarizonesecrethouse.asm index 39b7c393..28aae7c4 100755 --- a/scripts/safarizonesecrethouse.asm +++ b/scripts/safarizonesecrethouse.asm @@ -6,7 +6,7 @@ SafariZoneSecretHouseTextPointers: ; 4a31a (12:631a) SafariZoneSecretHouseText1: ; 4a31c (12:631c) db $08 ; asm - ld a, [$d857] + ld a, [wd857] bit 0, a jr nz, .asm_20a9b ; 0x4a322 ld hl, SafariZoneSecretHouseText_4a350 @@ -16,7 +16,7 @@ SafariZoneSecretHouseText1: ; 4a31c (12:631c) jr nc, .BagFull ld hl, ReceivedHM03Text call PrintText - ld hl, $d857 + ld hl, wd857 set 0, [hl] jr .asm_8f1fc ; 0x4a33d .BagFull diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 6d56c19d..336d40e9 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -1,5 +1,5 @@ SaffronGymScript: ; 5d00d (17:500d) - ld hl, $d126 + ld hl, wd126 bit 6, [hl] res 6, [hl] call nz, .extra @@ -36,7 +36,7 @@ SaffronGymScriptPointers: ; 5d053 (17:5053) dw SaffronGymScript3 SaffronGymScript3: ; 5d05b (17:505b) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, SaffronGymText_5d048 ld a, $f0 @@ -46,7 +46,7 @@ SaffronGymText_5d068: ; 5d068 (17:5068) ld a, $a ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d7b3 + ld hl, wd7b3 set 1, [hl] ld bc, (TM_46 << 8) | 1 call GiveItem @@ -54,7 +54,7 @@ SaffronGymText_5d068: ; 5d068 (17:5068) ld a, $b ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d7b3 + ld hl, wd7b3 set 0, [hl] jr .asm_5d091 .BagFull @@ -64,14 +64,14 @@ SaffronGymText_5d068: ; 5d068 (17:5068) .asm_5d091 ld hl, W_OBTAINEDBADGES set 5, [hl] - ld hl, $d72a + ld hl, wd72a set 5, [hl] ; deactivate gym trainers - ld a, [$d7b3] + ld a, [wd7b3] or %11111100 - ld [$d7b3], a - ld hl, $d7b4 + ld [wd7b3], a + ld hl, wd7b4 set 0, [hl] jp SaffronGymText_5d048 @@ -94,7 +94,7 @@ SaffronGymTrainerHeaders: ; 5d0c3 (17:50c3) SaffronGymTrainerHeader0: ; 5d0c3 (17:50c3) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7b3 ; flag's byte + dw wd7b3 ; flag's byte dw SaffronGymBattleText1 ; 0x51f0 TextBeforeBattle dw SaffronGymAfterBattleText1 ; 0x51fa TextAfterBattle dw SaffronGymEndBattleText1 ; 0x51f5 TextEndBattle @@ -103,7 +103,7 @@ SaffronGymTrainerHeader0: ; 5d0c3 (17:50c3) SaffronGymTrainerHeader1: ; 5d0cf (17:50cf) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7b3 ; flag's byte + dw wd7b3 ; flag's byte dw SaffronGymBattleText2 ; 0x51ff TextBeforeBattle dw SaffronGymAfterBattleText2 ; 0x5209 TextAfterBattle dw SaffronGymEndBattleText2 ; 0x5204 TextEndBattle @@ -112,7 +112,7 @@ SaffronGymTrainerHeader1: ; 5d0cf (17:50cf) SaffronGymTrainerHeader2: ; 5d0db (17:50db) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7b3 ; flag's byte + dw wd7b3 ; flag's byte dw SaffronGymBattleText3 ; 0x520e TextBeforeBattle dw SaffronGymAfterBattleText3 ; 0x5218 TextAfterBattle dw SaffronGymEndBattleText3 ; 0x5213 TextEndBattle @@ -121,7 +121,7 @@ SaffronGymTrainerHeader2: ; 5d0db (17:50db) SaffronGymTrainerHeader3: ; 5d0e7 (17:50e7) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7b3 ; flag's byte + dw wd7b3 ; flag's byte dw SaffronGymBattleText4 ; 0x521d TextBeforeBattle dw SaffronGymAfterBattleText4 ; 0x5227 TextAfterBattle dw SaffronGymEndBattleText4 ; 0x5222 TextEndBattle @@ -130,7 +130,7 @@ SaffronGymTrainerHeader3: ; 5d0e7 (17:50e7) SaffronGymTrainerHeader4: ; 5d0f3 (17:50f3) db $6 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7b3 ; flag's byte + dw wd7b3 ; flag's byte dw SaffronGymBattleText5 ; 0x522c TextBeforeBattle dw SaffronGymAfterBattleText5 ; 0x5236 TextAfterBattle dw SaffronGymEndBattleText5 ; 0x5231 TextEndBattle @@ -139,7 +139,7 @@ SaffronGymTrainerHeader4: ; 5d0f3 (17:50f3) SaffronGymTrainerHeader5: ; 5d0ff (17:50ff) db $7 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7b3 ; flag's byte + dw wd7b3 ; flag's byte dw SaffronGymBattleText6 ; 0x523b TextBeforeBattle dw SaffronGymAfterBattleText6 ; 0x5245 TextAfterBattle dw SaffronGymEndBattleText6 ; 0x5240 TextEndBattle @@ -148,7 +148,7 @@ SaffronGymTrainerHeader5: ; 5d0ff (17:50ff) SaffronGymTrainerHeader6: ; 5d10b (17:510b) db $8 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7b3 ; flag's byte + dw wd7b3 ; flag's byte dw SaffronGymBattleText7 ; 0x524a TextBeforeBattle dw SaffronGymAfterBattleText7 ; 0x5254 TextAfterBattle dw SaffronGymEndBattleText7 ; 0x524f TextEndBattle @@ -158,7 +158,7 @@ SaffronGymTrainerHeader6: ; 5d10b (17:510b) SaffronGymText1: ; 5d118 (17:5118) db $08 ; asm - ld a, [$d7b3] + ld a, [wd7b3] bit 1, a jr z, .asm_e3544 ; 0x5d11e bit 0, a @@ -173,18 +173,18 @@ SaffronGymText1: ; 5d118 (17:5118) .asm_e3544 ; 0x5d134 ld hl, SaffronGymText_5d162 call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, SaffronGymText_5d167 ld de, SaffronGymText_5d167 call PreBattleSaveRegisters ldh a, [$8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $6 - ld [$d05c], a + ld [W_GYMLEADERNO], a ld a, $3 ld [W_SAFFRONGYMCURSCRIPT], a .asm_34c2c ; 0x5d15f @@ -262,7 +262,7 @@ SaffronGymText8: ; 5d1c3 (17:51c3) SaffronGymText9: ; 5d1cd (17:51cd) db $08 ; asm - ld a, [$d7b3] + ld a, [wd7b3] bit 1, a jr nz, .asm_13f3c ; 0x5d1d3 ld hl, SaffronGymText_5d1e6 diff --git a/scripts/saffronhouse2.asm b/scripts/saffronhouse2.asm index a48ec3f6..727fd981 100755 --- a/scripts/saffronhouse2.asm +++ b/scripts/saffronhouse2.asm @@ -6,7 +6,7 @@ SaffronHouse2TextPointers: ; 1de3f (7:5e3f) SaffronHouse2Text1: ; 1de41 (7:5e41) db $08 ; asm - ld a, [$d7bd] + ld a, [wd7bd] bit 0, a jr nz, .asm_9e72b ; 0x1de47 ld hl, TM29PreReceiveText @@ -16,7 +16,7 @@ SaffronHouse2Text1: ; 1de41 (7:5e41) jr nc, .BagFull ld hl, ReceivedTM29Text call PrintText - ld hl, $d7bd + ld hl, wd7bd set 0, [hl] jr .asm_fe4e1 ; 0x1de62 .BagFull diff --git a/scripts/seafoamislands1.asm b/scripts/seafoamislands1.asm index 3d20a653..3558226b 100755 --- a/scripts/seafoamislands1.asm +++ b/scripts/seafoamislands1.asm @@ -1,6 +1,6 @@ SeafoamIslands1Script: ; 447e9 (11:47e9) call EnableAutoTextBoxDrawing - ld hl, $d7e7 + ld hl, wd7e7 set 0, [hl] ld hl, wFlags_0xcd60 bit 7, [hl] @@ -9,34 +9,34 @@ SeafoamIslands1Script: ; 447e9 (11:47e9) ld hl, Seafoam1HolesCoords call CheckBoulderCoords ret nc - ld hl, $d7e8 - ld a, [$cd3d] + ld hl, wd7e8 + ld a, [wWhichTrade] cp $1 jr nz, .asm_44819 ; 0x44809 $e set 6, [hl] ld a, $d7 - ld [$d079], a + ld [wd079], a ld a, $d9 - ld [$d07a], a + ld [wd07a], a jr .asm_44825 ; 0x44817 $c .asm_44819 set 7, [hl] ld a, $d8 - ld [$d079], a + ld [wd079], a ld a, $da - ld [$d07a], a + ld [wd07a], a .asm_44825 - ld a, [$d079] - ld [$cc4d], a + ld a, [wd079] + ld [wcc4d], a ld a, $11 call Predef - ld a, [$d07a] - ld [$cc4d], a + ld a, [wd07a] + ld [wcc4d], a ld a, $15 jp Predef .asm_4483b ld a, $9f - ld [$d71d], a + ld [wd71d], a ld hl, Seafoam1HolesCoords jp Func_46981 diff --git a/scripts/seafoamislands2.asm b/scripts/seafoamislands2.asm index a20bf497..9ee8fd28 100755 --- a/scripts/seafoamislands2.asm +++ b/scripts/seafoamislands2.asm @@ -7,34 +7,34 @@ SeafoamIslands2Script: ; 46315 (11:6315) ld hl, Seafoam2HolesCoords call CheckBoulderCoords ret nc - ld hl, $d87f - ld a, [$cd3d] + ld hl, wd87f + ld a, [wWhichTrade] cp $1 jr nz, .asm_46340 ; 0x46330 $e set 0, [hl] ld a, $d9 - ld [$d079], a + ld [wd079], a ld a, $db - ld [$d07a], a + ld [wd07a], a jr .asm_4634c ; 0x4633e $c .asm_46340 set 1, [hl] ld a, $da - ld [$d079], a + ld [wd079], a ld a, $dc - ld [$d07a], a + ld [wd07a], a .asm_4634c - ld a, [$d079] - ld [$cc4d], a + ld a, [wd079] + ld [wcc4d], a ld a, $11 call Predef - ld a, [$d07a] - ld [$cc4d], a + ld a, [wd07a] + ld [wcc4d], a ld a, $15 jp Predef .asm_46362 ld a, $a0 - ld [$d71d], a + ld [wd71d], a ld hl, Seafoam2HolesCoords jp Func_46981 diff --git a/scripts/seafoamislands3.asm b/scripts/seafoamislands3.asm index a6e00936..46f9a74e 100755 --- a/scripts/seafoamislands3.asm +++ b/scripts/seafoamislands3.asm @@ -7,34 +7,34 @@ SeafoamIslands3Script: ; 46451 (11:6451) ld hl, Seafoam3HolesCoords call CheckBoulderCoords ret nc - ld hl, $d880 - ld a, [$cd3d] + ld hl, wd880 + ld a, [wWhichTrade] cp $1 jr nz, .asm_4647c ; 0x4646c $e set 0, [hl] ld a, $db - ld [$d079], a + ld [wd079], a ld a, $df - ld [$d07a], a + ld [wd07a], a jr .asm_46488 ; 0x4647a $c .asm_4647c set 1, [hl] ld a, $dc - ld [$d079], a + ld [wd079], a ld a, $e0 - ld [$d07a], a + ld [wd07a], a .asm_46488 - ld a, [$d079] - ld [$cc4d], a + ld a, [wd079] + ld [wcc4d], a ld a, $11 call Predef - ld a, [$d07a] - ld [$cc4d], a + ld a, [wd07a] + ld [wcc4d], a ld a, $15 jp Predef .asm_4649e ld a, $a1 - ld [$d71d], a + ld [wd71d], a ld hl, Seafoam3HolesCoords jp Func_46981 diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm index c7be0f44..3c2be99c 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/seafoamislands4.asm @@ -7,38 +7,38 @@ SeafoamIslands4Script: ; 4658d (11:658d) ld hl, Seafoam4HolesCoords call CheckBoulderCoords ret nc - ld hl, $d881 - ld a, [$cd3d] + ld hl, wd881 + ld a, [wWhichTrade] cp $1 jr nz, .asm_465b8 ; 0x465a8 $e set 0, [hl] ld a, $dd - ld [$d079], a + ld [wd079], a ld a, $e1 - ld [$d07a], a + ld [wd07a], a jr .asm_465c4 ; 0x465b6 $c .asm_465b8 set 1, [hl] ld a, $de - ld [$d079], a + ld [wd079], a ld a, $e2 - ld [$d07a], a + ld [wd07a], a .asm_465c4 - ld a, [$d079] - ld [$cc4d], a + ld a, [wd079] + ld [wcc4d], a ld a, $11 call Predef - ld a, [$d07a] - ld [$cc4d], a + ld a, [wd07a] + ld [wcc4d], a ld a, $15 call Predef jr .asm_465ed ; 0x465da $11 .asm_465dc ld a, $a2 - ld [$d71d], a + ld [wd71d], a ld hl, Seafoam4HolesCoords call Func_46981 - ld a, [$d732] + ld a, [wd732] bit 4, a ret nz .asm_465ed @@ -58,7 +58,7 @@ SeafoamIslands4ScriptPointers: ; 465fb (11:65fb) dw SeafoamIslands4Script3 SeafoamIslands4Script0: ; 46603 (11:6603) - ld a, [$d880] + ld a, [wd880] and $3 cp $3 ret z @@ -68,11 +68,11 @@ SeafoamIslands4Script0: ; 46603 (11:6603) ld a, [W_XCOORD] cp $f ret nz - ld hl, $ccd3 + ld hl, wccd3 ld de, RLEMovement46632 call DecodeRLEList dec a - ld [$cd38], a + ld [wcd38], a call Func_3486 ld hl, W_FLAGS_D733 set 2, [hl] @@ -87,7 +87,7 @@ RLEMovement46632: ; 46632 (11:6632) db $ff SeafoamIslands4Script1: ; 46639 (11:6639) - ld a, [$cd38] + ld a, [wcd38] and a ret nz ld a, $0 @@ -95,7 +95,7 @@ SeafoamIslands4Script1: ; 46639 (11:6639) ret SeafoamIslands4Script2: ; 46644 (11:6644) - ld a, [$d880] + ld a, [wd880] and $3 cp $3 ret z @@ -110,13 +110,13 @@ SeafoamIslands4Script2: ; 46644 (11:6644) .asm_4665e ld de, RLEData_46688 .asm_46661 - ld hl, $ccd3 + ld hl, wccd3 call DecodeRLEList dec a - ld [$cd38], a + ld [wcd38], a xor a - ld [$c206], a - ld hl, $d730 + ld [wSpriteStateData2 + $06], a + ld hl, wd730 set 7, [hl] ld hl, W_FLAGS_D733 set 2, [hl] @@ -132,7 +132,7 @@ RLEData_46688: ; 46688 (11:6688) db $80,$06,$10,$02,$80,$04,$FF SeafoamIslands4Script3: ; 4668f (11:668f) - ld a, [$cd38] + ld a, [wcd38] and a ret nz ld a, $0 diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm index 3ddff929..bea63321 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/seafoamislands5.asm @@ -27,26 +27,26 @@ SeafoamIslands5Script4: ; 467b7 (11:67b7) ret SeafoamIslands5Script0: ; 467c7 (11:67c7) - ld a, [$d880] + ld a, [wd880] and $3 cp $3 ret z ld hl, CoordsData_467fe call ArePlayerCoordsInArray ret nc - ld a, [$cd3d] + ld a, [wWhichTrade] cp $3 jr nc, .asm_467e6 ld a, $40 - ld [$ccd4], a + ld [wccd4], a ld a, $2 jr .asm_467e8 .asm_467e6 ld a, $1 .asm_467e8 - ld [$cd38], a + ld [wcd38], a ld a, $40 - ld [$ccd3], a + ld [wccd3], a call Func_3486 ld hl, W_FLAGS_D733 res 2, [hl] @@ -62,7 +62,7 @@ CoordsData_467fe: ; 467fe (11:67fe) db $FF SeafoamIslands5Script1: ; 46807 (11:6807) - ld a, [$cd38] + ld a, [wcd38] and a ret nz xor a @@ -72,7 +72,7 @@ SeafoamIslands5Script1: ; 46807 (11:6807) ret SeafoamIslands5Script2: ; 46816 (11:6816) - ld a, [$d881] + ld a, [wd881] and $3 cp $3 ld a, $0 @@ -81,7 +81,7 @@ SeafoamIslands5Script2: ; 46816 (11:6816) call ArePlayerCoordsInArray ld a, $0 jr nc, .asm_46849 - ld a, [$cd3d] + ld a, [wWhichTrade] cp $1 jr nz, .asm_46837 ld de, RLEMovementData_46859 @@ -89,10 +89,10 @@ SeafoamIslands5Script2: ; 46816 (11:6816) .asm_46837 ld de, RLEMovementData_46852 .asm_4683a - ld hl, $ccd3 + ld hl, wccd3 call DecodeRLEList dec a - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $3 .asm_46849 @@ -117,7 +117,7 @@ RLEMovementData_46859: ; 46859 (11:6859) db $FF SeafoamIslands5Script3: ; 46860 (11:6860) - ld a, [$cd38] + ld a, [wcd38] ld b, a cp $1 call z, SeaFoamIslands5Script_46872 @@ -130,8 +130,8 @@ SeafoamIslands5Script3: ; 46860 (11:6860) SeaFoamIslands5Script_46872: ; 46872 (11:6872) xor a - ld [$d700], a - ld [$d11a], a + ld [wd700], a + ld [wd11a], a jp ForceBikeOrSurf SeafoamIslands5TextPointers: ; 4687c (11:687c) @@ -145,7 +145,7 @@ SeafoamIslands5TrainerHeaders: ; 46886 (11:6886) SeafoamIslands5TrainerHeader0: ; 46886 (11:6886) db $2 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d882 ; flag's byte + dw wd882 ; flag's byte dw SeafoamIslands5BattleText2 ; 0x68a2 TextBeforeBattle dw SeafoamIslands5BattleText2 ; 0x68a2 TextAfterBattle dw SeafoamIslands5BattleText2 ; 0x68a2 TextEndBattle diff --git a/scripts/silphco1.asm b/scripts/silphco1.asm index 64f93cdc..0ac616c0 100755 --- a/scripts/silphco1.asm +++ b/scripts/silphco1.asm @@ -1,14 +1,14 @@ SilphCo1Script: ; 5d44e (17:544e) call EnableAutoTextBoxDrawing - ld a, [$d838] + ld a, [wd838] bit 7, a ret z - ld hl, $d7b9 + ld hl, wd7b9 bit 7, [hl] set 7, [hl] ret nz ld a, $4c - ld [$cc4d], a + ld [wcc4d], a ld a, $15 jp Predef diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index ede60acc..3b541391 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -9,18 +9,18 @@ SilphCo10Script: ; 5a139 (16:6139) ret SilphCo10Script_5a14f: ; 5a14f (16:614f) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z ld hl, DataTable_5a173 ; $6173 call SilphCo2Script_59d43 call SilphCo10Text_5a176 - ld a, [$d836] + ld a, [wd836] bit 0, a ret nz ld a, $54 - ld [$d09f], a + ld [wd09f], a ld bc, $405 ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -32,7 +32,7 @@ SilphCo10Text_5a176: ; 5a176 (16:6176) ld a, [$ffe0] and a ret z - ld hl, $d836 + ld hl, wd836 set 0, [hl] ret @@ -53,7 +53,7 @@ SilphCo10TrainerHeaders: ; 5a192 (16:6192) SilphCo10TrainerHeader0: ; 5a192 (16:6192) db $1 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d835 ; flag's byte + dw wd835 ; flag's byte dw SilphCo10BattleText1 ; 0x61dd TextBeforeBattle dw SilphCo10AfterBattleText1 ; 0x61e7 TextAfterBattle dw SilphCo10EndBattleText1 ; 0x61e2 TextEndBattle @@ -62,7 +62,7 @@ SilphCo10TrainerHeader0: ; 5a192 (16:6192) SilphCo10TrainerHeader1: ; 5a19e (16:619e) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d835 ; flag's byte + dw wd835 ; flag's byte dw SilphCo10BattleText2 ; 0x61ec TextBeforeBattle dw SilphCo10AfterBattleText2 ; 0x61f6 TextAfterBattle dw SilphCo10EndBattleText2 ; 0x61f1 TextEndBattle @@ -84,7 +84,7 @@ SilphCo10Text2: ; 5a1b5 (16:61b5) SilphCo10Text3: ; 5a1bf (16:61bf) db $08 ; asm - ld a, [$d838] + ld a, [wd838] bit 7, a ld hl, SilphCo10Text_5a1d8 jr nz, .asm_cf85f diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index d4bd6ba0..5d1186da 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -9,18 +9,18 @@ SilphCo11Script: ; 620fa (18:60fa) ret SilphCo11Script_62110: ; 62110 (18:6110) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z ld hl, DataTable_62134 ; $6134 call SilphCo11Script_62137 call SilphCo11Script_62163 - ld a, [$d838] + ld a, [wd838] bit 0, a ret nz ld a, $20 - ld [$d09f], a + ld [wd09f], a ld bc, $603 ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -30,7 +30,7 @@ DataTable_62134: ; 62134 (18:6134) SilphCo11Script_62137: ; 62137 (18:6137) push hl - ld hl, $d73f + ld hl, wd73f ld a, [hli] ld b, a ld a, [hl] @@ -54,7 +54,7 @@ SilphCo11Script_62137: ; 62137 (18:6137) ld a, [hli] cp c jr nz, .asm_62143 - ld hl, $d73f + ld hl, wd73f xor a ld [hli], a ld [hl], a @@ -68,7 +68,7 @@ SilphCo11Script_62163: ; 62163 (18:6163) ld a, [$ffe0] and a ret z - ld hl, $d838 + ld hl, wd838 set 0, [hl] ret @@ -79,7 +79,7 @@ SilphCo11Script_6216d: ; 6216d (18:616d) cp $ff jr z, .asm_62181 push hl - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) pop hl @@ -91,7 +91,7 @@ SilphCo11Script_6216d: ; 6216d (18:616d) cp $ff ret z push hl - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) pop hl @@ -126,14 +126,14 @@ SilphCo11ScriptPointers: ; 621cf (18:61cf) dw SilphCo11Script5 SilphCo11Script0: ; 621db (18:61db) - ld a, [$d838] + ld a, [wd838] bit 7, a ret nz ld hl, CoordsData_62211 ; $6211 call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers - ld a, [wWhichTrade] ; $cd3d - ld [$cf0d], a + ld a, [wWhichTrade] ; wWhichTrade + ld [wcf0d], a xor a ld [hJoyHeld], a ld a, $f0 @@ -158,7 +158,7 @@ MovementData_62216: ; 62216 (18:6216) db $00,$00,$00,$FF SilphCo11Script_6221a: ; 6221a (18:621a) - ld [$d528], a + ld [wd528], a ld a, $3 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld a, b @@ -166,10 +166,10 @@ SilphCo11Script_6221a: ; 6221a (18:621a) jp Func_34a6 SilphCo11Script5: ; 62227 (18:6227) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, SilphCo11Script_621c4 - ld a, [$cf0d] + ld a, [wcf0d] cp $1 jr z, .asm_6223c ld a, $2 @@ -190,20 +190,20 @@ SilphCo11Script5: ; 62227 (18:6227) call UpdateSprites call Delay3 call GBFadeOut1 - ld hl, $d838 + ld hl, wd838 set 7, [hl] xor a ld [wJoyIgnore], a jp SilphCo11Script_621c8 SilphCo11Script3: ; 6226a (18:626a) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $3 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call SetSpriteMovementBytesToFF - ld a, [$cf0d] + ld a, [wcf0d] cp $1 jr z, .asm_62284 ld a, $2 @@ -219,14 +219,14 @@ SilphCo11Script3: ; 6226a (18:626a) jp SilphCo11Script_621c8 SilphCo11Script4: ; 62293 (18:6293) - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, SilphCo10Text_62330 ; $6330 ld de, SilphCo10Text_62330 ; $6330 call PreBattleSaveRegisters ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters xor a @@ -246,7 +246,7 @@ SilphCo11TrainerHeaders: ; 622c3 (18:62c3) SilphCo11TrainerHeader0: ; 622c3 (18:62c3) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d837 ; flag's byte + dw wd837 ; flag's byte dw SilphCo11BattleText1 ; 0x6344 TextBeforeBattle dw SilphCo11AfterBattleText1 ; 0x634e TextAfterBattle dw SilphCo11EndBattleText1 ; 0x6349 TextEndBattle @@ -255,7 +255,7 @@ SilphCo11TrainerHeader0: ; 622c3 (18:62c3) SilphCo11TrainerHeader1: ; 622cf (18:62cf) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d837 ; flag's byte + dw wd837 ; flag's byte dw SilphCo11BattleText2 ; 0x635d TextBeforeBattle dw SilphCo11AfterBattleText2 ; 0x6367 TextAfterBattle dw SilphCo11EndBattleText2 ; 0x6362 TextEndBattle @@ -265,7 +265,7 @@ SilphCo11TrainerHeader1: ; 622cf (18:62cf) SilphCo11Text1: ; 622dc (18:62dc) db $08 ; asm - ld a, [$d838] + ld a, [wd838] bit 5, a jp nz, .asm_62308 ld hl, SilphCoPresidentText @@ -275,7 +275,7 @@ SilphCo11Text1: ; 622dc (18:62dc) jr nc, .BagFull ld hl, ReceivedSilphCoMasterBallText call PrintText - ld hl, $d838 + ld hl, wd838 set 5, [hl] jr .asm_fd405 ; 0x622fe .BagFull diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index da59cc4c..755b5138 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -9,19 +9,19 @@ SilphCo2Script: ; 59cf1 (16:5cf1) ret SilphCo2Script_59d07: ; 59d07 (16:5d07) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z ld hl, DataTable_59d3e call SilphCo2Script_59d43 call SilphCo2Script_59d6f - ld a, [$d826] + ld a, [wd826] bit 5, a jr nz, .asm_59d2e push af ld a, $54 - ld [$d09f], a + ld [wd09f], a ld bc, $0202 ld a, $17 call Predef @@ -30,7 +30,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07) bit 6, a ret nz ld a, $54 - ld [$d09f], a + ld [wd09f], a ld bc, $0502 ld a, $17 jp Predef @@ -40,7 +40,7 @@ DataTable_59d3e: ; 59d3e (16:5d3e) SilphCo2Script_59d43: ; 59d43 (16:5d43) push hl - ld hl, $d73f + ld hl, wd73f ld a, [hli] ld b, a ld a, [hl] @@ -64,7 +64,7 @@ SilphCo2Script_59d43: ; 59d43 (16:5d43) ld a, [hli] cp c jr nz, .asm_59d4f - ld hl, $d73f + ld hl, wd73f xor a ld [hli], a ld [hl], a @@ -75,7 +75,7 @@ SilphCo2Script_59d43: ; 59d43 (16:5d43) ret SilphCo2Script_59d6f: ; 59d6f (16:5d6f) - ld hl, $d826 + ld hl, wd826 ld a, [$ffe0] and a ret z @@ -103,7 +103,7 @@ SilphCo2TrainerHeaders: ; 59d90 (16:5d90) SilphCo2TrainerHeader0: ; 59d90 (16:5d90) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d825 ; flag's byte + dw wd825 ; flag's byte dw SilphCo2BattleText1 ; 0x5e2a TextBeforeBattle dw SilphCo2AfterBattleText1 ; 0x5e34 TextAfterBattle dw SilphCo2EndBattleText1 ; 0x5e2f TextEndBattle @@ -112,7 +112,7 @@ SilphCo2TrainerHeader0: ; 59d90 (16:5d90) SilphCo2TrainerHeader1: ; 59d9c (16:5d9c) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d825 ; flag's byte + dw wd825 ; flag's byte dw SilphCo2BattleText2 ; 0x5e39 TextBeforeBattle dw SilphCo2AfterBattleText2 ; 0x5e43 TextAfterBattle dw SilphCo2EndBattleText2 ; 0x5e3e TextEndBattle @@ -121,7 +121,7 @@ SilphCo2TrainerHeader1: ; 59d9c (16:5d9c) SilphCo2TrainerHeader2: ; 59da8 (16:5da8) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d825 ; flag's byte + dw wd825 ; flag's byte dw SilphCo2BattleText3 ; 0x5e48 TextBeforeBattle dw SilphCo2AfterBattleText3 ; 0x5e52 TextAfterBattle dw SilphCo2EndBattleText3 ; 0x5e4d TextEndBattle @@ -130,7 +130,7 @@ SilphCo2TrainerHeader2: ; 59da8 (16:5da8) SilphCo2TrainerHeader3: ; 59db4 (16:5db4) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d825 ; flag's byte + dw wd825 ; flag's byte dw SilphCo2BattleText4 ; 0x5e57 TextBeforeBattle dw SilphCo2AfterBattleText4 ; 0x5e61 TextAfterBattle dw SilphCo2EndBattleText4 ; 0x5e5c TextEndBattle @@ -140,7 +140,7 @@ SilphCo2TrainerHeader3: ; 59db4 (16:5db4) SilphCo2Text1: ; 59dc1 (16:5dc1) db $08 ; asm - ld a, [$d826] + ld a, [wd826] bit 7, a jr nz, asm_b8a0d ; 0x59dc7 ld hl, SilphCo2Text_59ded @@ -149,7 +149,7 @@ SilphCo2Text1: ; 59dc1 (16:5dc1) call GiveItem ld hl, TM36NoRoomText jr nc, asm_2c1e0 ; 0x59dd8 - ld hl, $d826 + ld hl, wd826 set 7, [hl] ld hl, ReceivedTM36Text jr asm_2c1e0 ; 0x59de2 diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index a7ba1bee..b63b59d6 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -9,19 +9,19 @@ SilphCo3Script: ; 59f5b (16:5f5b) ret SilphCo3Script_59f71: ; 59f71 (16:5f71) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z ld hl, DataTable_59fa8 ; $5fa8 call SilphCo2Script_59d43 call SilphCo3Script_59fad - ld a, [$d828] + ld a, [wd828] bit 0, a jr nz, .asm_59f98 push af ld a, $5f - ld [$d09f], a + ld [wd09f], a ld bc, $404 ld a, $17 call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -30,7 +30,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) bit 1, a ret nz ld a, $5f - ld [$d09f], a + ld [wd09f], a ld bc, $408 ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -39,7 +39,7 @@ DataTable_59fa8: ; 59fa8 (16:5fa8) db $04,$04,$04,$08,$FF SilphCo3Script_59fad: ; 59fad (16:5fad) - ld hl, $d828 + ld hl, wd828 ld a, [$ffe0] and a ret z @@ -66,7 +66,7 @@ SilphCo3TrainerHeaders: ; 59fcc (16:5fcc) SilphCo3TrainerHeader0: ; 59fcc (16:5fcc) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d827 ; flag's byte + dw wd827 ; flag's byte dw SilphCo3BattleText1 ; 0x600d TextBeforeBattle dw SilphCo3AfterBattleText1 ; 0x6017 TextAfterBattle dw SilphCo3EndBattleText1 ; 0x6012 TextEndBattle @@ -75,7 +75,7 @@ SilphCo3TrainerHeader0: ; 59fcc (16:5fcc) SilphCo3TrainerHeader1: ; 59fd8 (16:5fd8) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d827 ; flag's byte + dw wd827 ; flag's byte dw SilphCo3BattleText2 ; 0x6026 TextBeforeBattle dw SilphCo3AfterBattleText2 ; 0x6030 TextAfterBattle dw SilphCo3EndBattleText2 ; 0x602b TextEndBattle @@ -85,7 +85,7 @@ SilphCo3TrainerHeader1: ; 59fd8 (16:5fd8) SilphCo3Text1: ; 59fe5 (16:5fe5) db $08 ; asm - ld a, [$d838] + ld a, [wd838] bit 7, a ld hl, SilphCo3Text_59ffe jr nz, asm_8c56f ; 0x59fee diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index 1777ff8c..7b6992fa 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -9,19 +9,19 @@ SilphCo4Script: ; 19d0b (6:5d0b) ret SilphCo4Script_19d21: ; 19d21 (6:5d21) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z ld hl, SilphCo4Data19d58 call SilphCo4Script_19d5d call SilphCo4Script_19d89 - ld a, [$d82a] + ld a, [wd82a] bit 0, a jr nz, .asm_19d48 push af ld a, $54 - ld [$d09f], a + ld [wd09f], a ld bc, $0602 ld a, $17 call Predef @@ -30,7 +30,7 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21) bit 1, a ret nz ld a, $54 - ld [$d09f], a + ld [wd09f], a ld bc, $0406 ld a, $17 jp Predef @@ -40,7 +40,7 @@ SilphCo4Data19d58: ; 19d58 (6:5d58) SilphCo4Script_19d5d: ; 19d5d (6:5d5d) push hl - ld hl, $d73f + ld hl, wd73f ld a, [hli] ld b, a ld a, [hl] @@ -64,7 +64,7 @@ SilphCo4Script_19d5d: ; 19d5d (6:5d5d) ld a, [hli] cp c jr nz, .asm_19d69 ; 0x19d7c $eb - ld hl, $d73f + ld hl, wd73f xor a ld [hli], a ld [hl], a @@ -75,7 +75,7 @@ SilphCo4Script_19d5d: ; 19d5d (6:5d5d) ret SilphCo4Script_19d89: ; 19d89 (6:5d89) - ld hl, $d82a + ld hl, wd82a ld a, [$ffe0] and a ret z @@ -105,7 +105,7 @@ SilphCo4TrainerHeaders: ; 19dae (6:5dae) SilphCo4TrainerHeader0: ; 19dae (6:5dae) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d829 ; flag's byte + dw wd829 ; flag's byte dw SilphCo4BattleText2 ; 0x5df4 TextBeforeBattle dw SilphCo4AfterBattleText2 ; 0x5dfe TextAfterBattle dw SilphCo4EndBattleText2 ; 0x5df9 TextEndBattle @@ -114,7 +114,7 @@ SilphCo4TrainerHeader0: ; 19dae (6:5dae) SilphCo4TrainerHeader2: ; 19dba (6:5dba) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d829 ; flag's byte + dw wd829 ; flag's byte dw SilphCo4BattleText3 ; 0x5e0d TextBeforeBattle dw SilphCo4AfterBattleText3 ; 0x5e17 TextAfterBattle dw SilphCo4EndBattleText3 ; 0x5e12 TextEndBattle @@ -123,7 +123,7 @@ SilphCo4TrainerHeader2: ; 19dba (6:5dba) SilphCo4TrainerHeader3: ; 19dc6 (6:5dc6) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d829 ; flag's byte + dw wd829 ; flag's byte dw SilphCo4BattleText4 ; 0x5e26 TextBeforeBattle dw SilphCo4AfterBattleText4 ; 0x5e30 TextAfterBattle dw SilphCo4EndBattleText4 ; 0x5e2b TextEndBattle diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index c4efc16b..d586ae94 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -9,19 +9,19 @@ SilphCo5Script: ; 19f37 (6:5f37) ret SilphCo5Script_19f4d: ; 19f4d (6:5f4d) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z ld hl, SilphCo5Coords call SilphCo4Script_19d5d call SilphCo5Script_19f9e - ld a, [$d82c] + ld a, [wd82c] bit 0, a jr nz, .asm_19f74 ; 0x19f63 $f push af ld a, $5f - ld [$d09f], a + ld [wd09f], a ld bc, $0203 ld a, $17 call Predef @@ -31,7 +31,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) jr nz, .asm_19f87 ; 0x19f76 $f push af ld a, $5f - ld [$d09f], a + ld [wd09f], a ld bc, $0603 ld a, $17 call Predef @@ -40,7 +40,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) bit 2, a ret nz ld a, $5f - ld [$d09f], a + ld [wd09f], a ld bc, $0507 ld a, $17 jp Predef @@ -49,7 +49,7 @@ SilphCo5Coords: ; 19f97 (6:5f97) ; coords? db $02, $03, $06, $03, $05, $07, $ff SilphCo5Script_19f9e: ; 19f9e (6:5f9e) - ld hl, $d82c + ld hl, wd82c ld a, [$ffe0] and a ret z @@ -88,7 +88,7 @@ SilphCo5TrainerHeaders: ; 19fd2 (6:5fd2) Silphco5TrainerHeader0: ; 19fd2 (6:5fd2) db $2 ; flag's bit db ($1 << 4) ; trainer's view range - dw $d82b ; flag's byte + dw wd82b ; flag's byte dw SilphCo5BattleText2 ; 0x6024 TextBeforeBattle dw SilphCo5AfterBattleText2 ; 0x602e TextAfterBattle dw SilphCo5EndBattleText2 ; 0x6029 TextEndBattle @@ -97,7 +97,7 @@ Silphco5TrainerHeader0: ; 19fd2 (6:5fd2) Silphco5TrainerHeader2: ; 19fde (6:5fde) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d82b ; flag's byte + dw wd82b ; flag's byte dw SilphCo5BattleText3 ; 0x603d TextBeforeBattle dw SilphCo5AfterBattleText3 ; 0x6047 TextAfterBattle dw SilphCo5EndBattleText3 ; 0x6042 TextEndBattle @@ -106,7 +106,7 @@ Silphco5TrainerHeader2: ; 19fde (6:5fde) Silphco5TrainerHeader3: ; 19fea (6:5fea) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d82b ; flag's byte + dw wd82b ; flag's byte dw SilphCo5BattleText4 ; 0x6056 TextBeforeBattle dw SilphCo5AfterBattleText4 ; 0x6060 TextAfterBattle dw SilphCo5EndBattleText4 ; 0x605b TextEndBattle @@ -115,7 +115,7 @@ Silphco5TrainerHeader3: ; 19fea (6:5fea) Silphco5TrainerHeader4: ; 19ff6 (6:5ff6) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d82b ; flag's byte + dw wd82b ; flag's byte dw SilphCo5BattleText5 ; 0x606f TextBeforeBattle dw SilphCo5AfterBattleText5 ; 0x6079 TextAfterBattle dw SilphCo5EndBattleText5 ; 0x6074 TextEndBattle diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index 2b5b7ebf..5bea4eae 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -9,18 +9,18 @@ SilphCo6Script: ; 1a1a9 (6:61a9) ret SilphCo6Script_1a1bf: ; 1a1bf (6:61bf) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z ld hl, SilphCo6Coords1 call SilphCo4Script_19d5d call SilphCo6Script_1a1e6 - ld a, [$d82e] + ld a, [wd82e] bit 7, a ret nz ld a, $5f - ld [$d09f], a + ld [wd09f], a ld bc, $0602 ld a, $17 jp Predef @@ -33,7 +33,7 @@ SilphCo6Script_1a1e6: ; 1a1e6 (6:61e6) ld a, [$ffe0] and a ret z - ld hl, $d82e + ld hl, wd82e set 7, [hl] ret @@ -58,7 +58,7 @@ SilphCo6TrainerHeaders: ; 1a20a (6:620a) SilphCo6TrainerHeader0: ; 1a20a (6:620a) db $6 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d82d ; flag's byte + dw wd82d ; flag's byte dw SilphCo6BattleText2 ; 0x62ba TextBeforeBattle dw SilphCo6AfterBattleText2 ; 0x62c4 TextAfterBattle dw SilphCo6EndBattleText2 ; 0x62bf TextEndBattle @@ -67,7 +67,7 @@ SilphCo6TrainerHeader0: ; 1a20a (6:620a) SilphCo6TrainerHeader2: ; 1a216 (6:6216) db $7 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d82d ; flag's byte + dw wd82d ; flag's byte dw SilphCo6BattleText3 ; 0x62d3 TextBeforeBattle dw SilphCo6AfterBattleText3 ; 0x62dd TextAfterBattle dw SilphCo6EndBattleText3 ; 0x62d8 TextEndBattle @@ -76,7 +76,7 @@ SilphCo6TrainerHeader2: ; 1a216 (6:6216) SilphCo6TrainerHeader3: ; 1a222 (6:6222) db $8 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d82d ; flag's byte + dw wd82d ; flag's byte dw SilphCo6BattleText4 ; 0x62ec TextBeforeBattle dw SilphCo6AfterBattleText4 ; 0x62f6 TextAfterBattle dw SilphCo6EndBattleText4 ; 0x62f1 TextEndBattle @@ -85,7 +85,7 @@ SilphCo6TrainerHeader3: ; 1a222 (6:6222) db $ff SilphCo6Script_1a22f: ; 1a22f (6:622f) - ld a, [$d838] + ld a, [wd838] bit 7, a jr nz, .asm_1a238 ; 0x1a234 $2 jr .asm_1a23a ; 0x1a236 $2 diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 6e3b81aa..0854242b 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -9,19 +9,19 @@ SilphCo7Script: ; 51b61 (14:5b61) ret SilphCo7Script_51b77: ; 51b77 (14:5b77) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z ld hl, DataTable_51bc1 ; $5bc1 call SilphCo7Text_51bc8 call SilphCo7Text_51bf4 - ld a, [$d830] + ld a, [wd830] bit 4, a jr nz, .asm_51b9e push af ld a, $54 - ld [$d09f], a + ld [wd09f], a ld bc, $305 ld a, $17 call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -31,7 +31,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) jr nz, .asm_51bb1 push af ld a, $54 - ld [$d09f], a + ld [wd09f], a ld bc, $20a ld a, $17 call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -40,7 +40,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) bit 6, a ret nz ld a, $54 - ld [$d09f], a + ld [wd09f], a ld bc, $60a ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -50,7 +50,7 @@ DataTable_51bc1: ; 51bc1 (14:5bc1) SilphCo7Text_51bc8: ; 51bc8 (14:5bc8) push hl - ld hl, $d73f + ld hl, wd73f ld a, [hli] ld b, a ld a, [hl] @@ -74,7 +74,7 @@ SilphCo7Text_51bc8: ; 51bc8 (14:5bc8) ld a, [hli] cp c jr nz, .asm_51bd4 - ld hl, $d73f + ld hl, wd73f xor a ld [hli], a ld [hl], a @@ -85,7 +85,7 @@ SilphCo7Text_51bc8: ; 51bc8 (14:5bc8) ret SilphCo7Text_51bf4: ; 51bf4 (14:5bf4) - ld hl, $d830 + ld hl, wd830 ld a, [$ffe0] and a ret z @@ -120,7 +120,7 @@ SilphCo7ScriptPointers: ; 51c17 (14:5c17) dw SilphCo7Script5 SilphCo7Script0: ; 51c23 (14:5c23) - ld a, [$d82f] + ld a, [wd82f] bit 0, a jp nz, CheckFightingMapTrainers ld hl, CoordsData_51c78 @@ -131,9 +131,9 @@ SilphCo7Script0: ; 51c23 (14:5c23) ld a, $f0 ld [wJoyIgnore], a ld a, $4 - ld [$d528], a + ld [wd528], a ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -145,8 +145,8 @@ SilphCo7Script0: ; 51c23 (14:5c23) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call SetSpriteMovementBytesToFF ld de, MovementData_51c7d - ld a, [wWhichTrade] ; $cd3d - ld [$cf0d], a + ld a, [wWhichTrade] ; wWhichTrade + ld [wcf0d], a cp $1 jr z, .asm_51c6c inc de @@ -166,7 +166,7 @@ MovementData_51c7d: ; 51c7d (14:5c7d) db $40,$40,$40,$40,$FF SilphCo7Script3: ; 51c82 (14:5c82) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz xor a @@ -175,15 +175,15 @@ SilphCo7Script3: ; 51c82 (14:5c82) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID call Delay3 - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, SilphCo7Text14 ; $5ec8 ld de, SilphCo7Text_51ecd ; $5ecd call PreBattleSaveRegisters ld a, SONY2 + $c8 - ld [W_CUROPPONENT], a ; $d059 - ld a, [W_RIVALSTARTER] ; $d715 + ld [W_CUROPPONENT], a ; wd059 + ld a, [W_RIVALSTARTER] ; wd715 cp STARTER2 jr nz, .asm_51cb6 ld a, $7 @@ -196,20 +196,20 @@ SilphCo7Script3: ; 51c82 (14:5c82) .asm_51cbe ld a, $9 .asm_51cc0 - ld [W_TRAINERNO], a ; $d05d + ld [W_TRAINERNO], a ; wd05d ld a, $4 jp SilphCo7Text_51c10 SilphCo7Script4: ; 51cc8 (14:5cc8) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, SilphCo7Text_51c0c ld a, $f0 ld [wJoyIgnore], a - ld hl, $d82f + ld hl, wd82f set 0, [hl] ld a, $4 - ld [$d528], a + ld [wd528], a ld a, $9 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld a, $4 @@ -219,11 +219,11 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound callba Music_RivalAlternateStart ld de, MovementData_51d1d - ld a, [$cf0d] + ld a, [wcf0d] cp $1 jr nz, .asm_51d0e ld de, MovementData_51d1a @@ -241,11 +241,11 @@ MovementData_51d1d: ; 51d1d (14:5d1d) db $80,$40,$40,$C0,$C0,$C0,$00,$FF SilphCo7Script5: ; 51d25 (14:5d25) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $a7 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) call Func_2307 @@ -274,7 +274,7 @@ SilphCo7TrainerHeaders: ; 51d5d (14:5d5d) SilphCo7TrainerHeader0: ; 51d5d (14:5d5d) db $5 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d82f ; flag's byte + dw wd82f ; flag's byte dw SilphCo7BattleText1 ; 0x5e5a TextBeforeBattle dw SilphCo7AfterBattleText1 ; 0x5e64 TextAfterBattle dw SilphCo7EndBattleText1 ; 0x5e5f TextEndBattle @@ -283,7 +283,7 @@ SilphCo7TrainerHeader0: ; 51d5d (14:5d5d) SilphCo7TrainerHeader2: ; 51d69 (14:5d69) db $6 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d82f ; flag's byte + dw wd82f ; flag's byte dw SilphCo7BattleText2 ; 0x5e73 TextBeforeBattle dw SilphCo7AfterBattleText2 ; 0x5e7d TextAfterBattle dw SilphCo7EndBattleText2 ; 0x5e78 TextEndBattle @@ -292,7 +292,7 @@ SilphCo7TrainerHeader2: ; 51d69 (14:5d69) SilphCo7TrainerHeader3: ; 51d75 (14:5d75) db $7 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d82f ; flag's byte + dw wd82f ; flag's byte dw SilphCo7BattleText3 ; 0x5e8c TextBeforeBattle dw SilphCo7AfterBattleText3 ; 0x5e96 TextAfterBattle dw SilphCo7EndBattleText3 ; 0x5e91 TextEndBattle @@ -301,7 +301,7 @@ SilphCo7TrainerHeader3: ; 51d75 (14:5d75) SilphCo7TrainerHeader4: ; 51d81 (14:5d81) db $8 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d82f ; flag's byte + dw wd82f ; flag's byte dw SilphCo7BattleText4 ; 0x5ea5 TextBeforeBattle dw SilphCo7AfterBattleText4 ; 0x5eaf TextAfterBattle dw SilphCo7EndBattleText4 ; 0x5eaa TextEndBattle @@ -312,10 +312,10 @@ SilphCo7TrainerHeader4: ; 51d81 (14:5d81) SilphCo7Text1: ; lapras guy db $08 ; asm - ld a, [$d72e] + ld a, [wd72e] bit 0, a ; got lapras? jr z, .givelapras - ld a, [$d838] + ld a, [wd838] bit 7, a ; saved silph? jr nz, .savedsilph ld hl, .LaprasGuyText @@ -327,13 +327,13 @@ SilphCo7Text1: ld bc, (LAPRAS << 8) | 15 call GivePokemon jr nc, .done - ld a, [$ccd3] + ld a, [wccd3] and a call z, WaitForTextScrollButtonPress call EnableAutoTextBoxDrawing ld hl, .HeresYourLaprasText call PrintText - ld hl, $d72e + ld hl, wd72e set 0, [hl] jr .done .savedsilph @@ -360,7 +360,7 @@ SilphCo7Text1: SilphCo7Text2: db $8 - ld a, [$d838] + ld a, [wd838] bit 7, a ; saved silph? jr nz, .savedsilph ld hl, .rockettext @@ -382,7 +382,7 @@ SilphCo7Text2: SilphCo7Text3: db $08 ; asm - ld a, [$d838] + ld a, [wd838] bit 7, a ; saved silph? jr nz, .savedsilph ld hl, .rockettext @@ -404,7 +404,7 @@ SilphCo7Text3: SilphCo7Text4: db $08 ; asm - ld a, [$d838] + ld a, [wd838] bit 7, a ; saved silph? jr nz, .savedsilph ld hl, .rockettext diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm index 19cae4ac..5a954cbb 100755 --- a/scripts/silphco8.asm +++ b/scripts/silphco8.asm @@ -9,18 +9,18 @@ SilphCo8Script: ; 56504 (15:6504) ret SilphCo8Script_5651a: ; 5651a (15:651a) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z ld hl, DataTable_5653e ; $653e call SilphCo8Script_56541 call SilphCo8Script_5656d - ld a, [$d832] + ld a, [wd832] bit 0, a ret nz ld a, $5f - ld [$d09f], a + ld [wd09f], a ld bc, $403 ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -30,7 +30,7 @@ DataTable_5653e: ; 5653e (15:653e) SilphCo8Script_56541: ; 56541 (15:6541) push hl - ld hl, $d73f + ld hl, wd73f ld a, [hli] ld b, a ld a, [hl] @@ -54,7 +54,7 @@ SilphCo8Script_56541: ; 56541 (15:6541) ld a, [hli] cp c jr nz, .asm_5654d - ld hl, $d73f + ld hl, wd73f xor a ld [hli], a ld [hl], a @@ -68,7 +68,7 @@ SilphCo8Script_5656d: ; 5656d (15:656d) ld a, [$ffe0] and a ret z - ld hl, $d832 + ld hl, wd832 set 0, [hl] ret @@ -87,7 +87,7 @@ SilphCo8TrainerHeaders: ; 56585 (15:6585) SilphCo8TrainerHeader0: ; 56585 (15:6585) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d831 ; flag's byte + dw wd831 ; flag's byte dw SilphCo8BattleText1 ; 0x65e6 TextBeforeBattle dw SilphCo8AfterBattleText1 ; 0x65f0 TextAfterBattle dw SilphCo8EndBattleText1 ; 0x65eb TextEndBattle @@ -96,7 +96,7 @@ SilphCo8TrainerHeader0: ; 56585 (15:6585) SilphCo8TrainerHeader1: ; 56591 (15:6591) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d831 ; flag's byte + dw wd831 ; flag's byte dw SilphCo8BattleText2 ; 0x65f5 TextBeforeBattle dw SilphCo8AfterBattleText2 ; 0x65ff TextAfterBattle dw SilphCo8EndBattleText2 ; 0x65fa TextEndBattle @@ -105,7 +105,7 @@ SilphCo8TrainerHeader1: ; 56591 (15:6591) SilphCo8TrainerHeader2: ; 5659d (15:659d) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d831 ; flag's byte + dw wd831 ; flag's byte dw SilphCo8BattleText3 ; 0x6604 TextBeforeBattle dw SilphCo8AfterBattleText3 ; 0x660e TextAfterBattle dw SilphCo8EndBattleText3 ; 0x6609 TextEndBattle @@ -115,7 +115,7 @@ SilphCo8TrainerHeader2: ; 5659d (15:659d) SilphCo8Text1: ; 565aa (15:65aa) db $08 ; asm - ld a, [$d838] + ld a, [wd838] bit 7, a ld hl, SilphCo8Text_565c3 jr nz, asm_a468f ; 0x565b3 diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index ee6e6fdc..e93e8601 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -9,19 +9,19 @@ SilphCo9Script: ; 5d7bb (17:57bb) ret SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z ld hl, DataTable_5d82e ; $582e call SilphCo9Script_5d837 call SilphCo9Script_5d863 - ld a, [$d834] + ld a, [wd834] bit 0, a jr nz, .asm_5d7f8 push af ld a, $5f - ld [$d09f], a + ld [wd09f], a ld bc, $401 ld a, $17 call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -31,7 +31,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) jr nz, .asm_5d80b push af ld a, $54 - ld [$d09f], a + ld [wd09f], a ld bc, $209 ld a, $17 call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -41,7 +41,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) jr nz, .asm_5d81e push af ld a, $54 - ld [$d09f], a + ld [wd09f], a ld bc, $509 ld a, $17 call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -50,7 +50,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) bit 3, a ret nz ld a, $5f - ld [$d09f], a + ld [wd09f], a ld bc, $605 ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -60,7 +60,7 @@ DataTable_5d82e: ; 5d82e (17:582e) SilphCo9Script_5d837: ; 5d837 (17:5837) push hl - ld hl, $d73f + ld hl, wd73f ld a, [hli] ld b, a ld a, [hl] @@ -84,7 +84,7 @@ SilphCo9Script_5d837: ; 5d837 (17:5837) ld a, [hli] cp c jr nz, .asm_5d843 - ld hl, $d73f + ld hl, wd73f xor a ld [hli], a ld [hl], a @@ -95,7 +95,7 @@ SilphCo9Script_5d837: ; 5d837 (17:5837) ret SilphCo9Script_5d863: ; 5d863 (17:5863) - ld hl, $d834 + ld hl, wd834 ld a, [$ffe0] and a ret z @@ -134,7 +134,7 @@ SilphCo9TrainerHeaders: ; 5d893 (17:5893) SilphCo9TrainerHeader0: ; 5d893 (17:5893) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d833 ; flag's byte + dw wd833 ; flag's byte dw SilphCo9BattleText1 ; 0x5912 TextBeforeBattle dw SilphCo9AfterBattleText1 ; 0x591c TextAfterBattle dw SilphCo9EndBattleText1 ; 0x5917 TextEndBattle @@ -143,7 +143,7 @@ SilphCo9TrainerHeader0: ; 5d893 (17:5893) SilphCo9TrainerHeader1: ; 5d89f (17:589f) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d833 ; flag's byte + dw wd833 ; flag's byte dw SilphCo9BattleText2 ; 0x5921 TextBeforeBattle dw SilphCo9AfterBattleText2 ; 0x592b TextAfterBattle dw SilphCo9EndBattleText2 ; 0x5926 TextEndBattle @@ -152,7 +152,7 @@ SilphCo9TrainerHeader1: ; 5d89f (17:589f) SilphCo9TrainerHeader2: ; 5d8ab (17:58ab) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d833 ; flag's byte + dw wd833 ; flag's byte dw SilphCo9BattleText3 ; 0x5930 TextBeforeBattle dw SilphCo9AfterBattleText3 ; 0x593a TextAfterBattle dw SilphCo9EndBattleText3 ; 0x5935 TextEndBattle @@ -162,7 +162,7 @@ SilphCo9TrainerHeader2: ; 5d8ab (17:58ab) SilphCo9Text1: ; 5d8b8 (17:58b8) db $08 ; asm - ld a, [$d838] + ld a, [wd838] bit 7, a jr nz, .asm_a14c3 ; 0x5d8be ld hl, SilphCo9Text_5d8e5 diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index c6442ca9..64240c26 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -1,5 +1,5 @@ SilphCoElevatorScript: ; 457c0 (11:57c0) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] push hl @@ -9,16 +9,16 @@ SilphCoElevatorScript: ; 457c0 (11:57c0) res 7, [hl] call nz, SilphCoElevatorScript_45827 xor a - ld [$cf0c], a + ld [wcf0c], a inc a - ld [$cc3c], a + ld [wcc3c], a ret SilphCoElevatorScript_457dc: ; 457dc (11:57dc) - ld hl, $d3af - ld a, [$d73b] + ld hl, wd3af + ld a, [wd73b] ld b, a - ld a, [$d73c] + ld a, [wd73c] ld c, a call SilphCoElevatorScript_457ea @@ -35,7 +35,7 @@ SilphCoElevatorScript_457f1: ; 457f1 (11:57f1) ld hl, SilphCoElavatorFloors ; $5804 call LoadItemList ld hl, SilphCoElevatorWarpMaps ; $5811 - ld de, $cc5b + ld de, wcc5b ld bc, $16 call CopyData ret diff --git a/scripts/ssanne10.asm b/scripts/ssanne10.asm index eaef6de3..60eb28f2 100755 --- a/scripts/ssanne10.asm +++ b/scripts/ssanne10.asm @@ -29,7 +29,7 @@ SSAnne10TrainerHeaders: ; 61d84 (18:5d84) SSAnne10TrainerHeader0: ; 61d84 (18:5d84) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d809 ; flag's byte + dw wd809 ; flag's byte dw SSAnne10BattleText1 ; 0x5e16 TextBeforeBattle dw SSAnne10AfterBattleText1 ; 0x5e20 TextAfterBattle dw SSAnne10EndBattleText1 ; 0x5e1b TextEndBattle @@ -38,7 +38,7 @@ SSAnne10TrainerHeader0: ; 61d84 (18:5d84) SSAnne10TrainerHeader1: ; 61d90 (18:5d90) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d809 ; flag's byte + dw wd809 ; flag's byte dw SSAnne10BattleText2 ; 0x5e25 TextBeforeBattle dw SSAnne10AfterBattleText2 ; 0x5e2f TextAfterBattle dw SSAnne10EndBattleText2 ; 0x5e2a TextEndBattle @@ -47,7 +47,7 @@ SSAnne10TrainerHeader1: ; 61d90 (18:5d90) SSAnne10TrainerHeader2: ; 61d9c (18:5d9c) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d809 ; flag's byte + dw wd809 ; flag's byte dw SSAnne10BattleText3 ; 0x5e34 TextBeforeBattle dw SSAnne10AfterBattleText3 ; 0x5e3e TextAfterBattle dw SSAnne10EndBattleText3 ; 0x5e39 TextEndBattle @@ -56,7 +56,7 @@ SSAnne10TrainerHeader2: ; 61d9c (18:5d9c) SSAnne10TrainerHeader3: ; 61da8 (18:5da8) db $4 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d809 ; flag's byte + dw wd809 ; flag's byte dw SSAnne10BattleText4 ; 0x5e43 TextBeforeBattle dw SSAnne10AfterBattleText4 ; 0x5e4d TextAfterBattle dw SSAnne10EndBattleText4 ; 0x5e48 TextEndBattle @@ -65,7 +65,7 @@ SSAnne10TrainerHeader3: ; 61da8 (18:5da8) SSAnne10TrainerHeader4: ; 61db4 (18:5db4) db $5 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d809 ; flag's byte + dw wd809 ; flag's byte dw SSAnne10BattleText5 ; 0x5e52 TextBeforeBattle dw SSAnne10AfterBattleText5 ; 0x5e5c TextAfterBattle dw SSAnne10EndBattleText5 ; 0x5e57 TextEndBattle @@ -74,7 +74,7 @@ SSAnne10TrainerHeader4: ; 61db4 (18:5db4) SSAnne10TrainerHeader5: ; 61dc0 (18:5dc0) db $6 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d809 ; flag's byte + dw wd809 ; flag's byte dw SSAnne10BattleText6 ; 0x5e61 TextBeforeBattle dw SSAnne10AfterBattleText6 ; 0x5e6b TextAfterBattle dw SSAnne10EndBattleText6 ; 0x5e66 TextEndBattle diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index b8f53b2b..22e4408f 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -25,15 +25,15 @@ SSAnne2Script0: ; 613be (18:53be) call ArePlayerCoordsInArray ret nc ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld a, [$cd3d] + ld a, [wWhichTrade] ld [$ffdb], a ld a, $71 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef call Delay3 @@ -67,11 +67,11 @@ CoordsData_61411: ; 61411 (18:5411) db $08,$24,$08,$25,$FF SSAnne2Script_61416: ; 61416 (18:5416) - ld a, [W_XCOORD] ; $d362 + ld a, [W_XCOORD] ; wd362 cp $25 jr nz, .asm_61426 ld a, $2 - ld [$d528], a + ld [wd528], a ld a, $c jr .asm_61427 .asm_61426 @@ -83,7 +83,7 @@ SSAnne2Script_61416: ; 61416 (18:5416) jp Func_34a6 SSAnne2Script1: ; 61430 (18:5430) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz call SSAnne2Script_61416 @@ -118,7 +118,7 @@ SSAnne2Script1: ; 61430 (18:5430) ret SSAnne2Script2: ; 6146d (18:546d) - ld a, [$d057] + ld a, [W_ISINBATTLE] cp $ff jp z, SSAnne2Script_613ab call SSAnne2Script_61416 @@ -142,7 +142,7 @@ SSAnne2Script2: ; 6146d (18:546d) ld [$ff8c], a call MoveSprite ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound callba Music_RivalAlternateStart ld a, $3 @@ -156,13 +156,13 @@ MovementData_614b9: ; 614b9 (18:54b9) db $00,$00,$00,$00,$FF SSAnne2Script3: ; 614be (18:54be) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz xor a ld [wJoyIgnore], a ld a, $71 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef call Func_2307 @@ -183,7 +183,7 @@ SSAnne2Text2: ; 614e6 (18:54e6) db $8 ld hl, SSAnneRivalBeforeBattleText call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, SSAnneRivalDefeatedText diff --git a/scripts/ssanne5.asm b/scripts/ssanne5.asm index 034dd26a..ea7ff282 100755 --- a/scripts/ssanne5.asm +++ b/scripts/ssanne5.asm @@ -23,7 +23,7 @@ SSAnne5TrainerHeaders: ; 616d1 (18:56d1) SSAnne5TrainerHeader0: ; 616d1 (18:56d1) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7ff ; flag's byte + dw wd7ff ; flag's byte dw SSAnne5BattleText1 ; 0x5703 TextBeforeBattle dw SSAnne5AfterBattleText1 ; 0x570d TextAfterBattle dw SSAnne5EndBattleText1 ; 0x5708 TextEndBattle @@ -32,7 +32,7 @@ SSAnne5TrainerHeader0: ; 616d1 (18:56d1) SSAnne5TrainerHeader1: ; 616dd (18:56dd) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7ff ; flag's byte + dw wd7ff ; flag's byte dw SSAnne5BattleText2 ; 0x571c TextBeforeBattle dw SSAnne5AfterBattleText2 ; 0x5726 TextAfterBattle dw SSAnne5EndBattleText2 ; 0x5721 TextEndBattle diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm index 8e88417f..b708b4fd 100755 --- a/scripts/ssanne7.asm +++ b/scripts/ssanne7.asm @@ -3,10 +3,10 @@ SSAnne7Script: ; 61895 (18:5895) jp EnableAutoTextBoxDrawing SSAnne7Script_6189b: ; 6189b (18:589b) - ld a, [$d803] + ld a, [wd803] bit 1, a ret nz - ld hl, $d72d + ld hl, wd72d set 5, [hl] ret @@ -17,7 +17,7 @@ SSAnne7TextPointers: ; 618a7 (18:58a7) SSAnne7Text1: ; 618ad (18:58ad) db $08 ; asm - ld a, [$d803] + ld a, [wd803] bit 0, a jr nz, .asm_797c4 ; 0x618b3 ld hl, SSAnne7RubText @@ -29,13 +29,13 @@ SSAnne7Text1: ; 618ad (18:58ad) jr nc, .BagFull ld hl, ReceivedHM01Text call PrintText - ld hl, $d803 + ld hl, wd803 set 0, [hl] jr .asm_0faf5 ; 0x618d4 .BagFull ld hl, HM01NoRoomText call PrintText - ld hl, $d72d + ld hl, wd72d set 5, [hl] jr .asm_0faf5 ; 0x618e1 .asm_797c4 ; 0x618e3 @@ -47,27 +47,27 @@ SSAnne7Text1: ; 618ad (18:58ad) SSAnne7RubText: ; 618ec (18:58ec) TX_FAR _SSAnne7RubText db $8 - ld a, [$c0ef] + ld a, [wc0ef] cp $1f - ld [$c0f0], a + ld [wc0f0], a jr nz, .asm_61908 ; 0x618f9 $d ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound ld a, Bank(Func_9876) - ld [$c0ef], a + ld [wc0ef], a .asm_61908 ld a, MUSIC_PKMN_HEALED - ld [$c0ee], a + ld [wc0ee], a call PlaySound .asm_61910 - ld a, [$c026] + ld a, [wc026] cp MUSIC_PKMN_HEALED jr z, .asm_61910 ; 0x61915 $f9 call Func_2307 - ld hl, $d803 + ld hl, wd803 set 1, [hl] - ld hl, $d72d + ld hl, wd72d res 5, [hl] jp TextScriptEnd diff --git a/scripts/ssanne8.asm b/scripts/ssanne8.asm index 0f1b8c7e..a2abb4bb 100755 --- a/scripts/ssanne8.asm +++ b/scripts/ssanne8.asm @@ -29,7 +29,7 @@ SSAnne8TrainerHeaders: ; 619a5 (18:59a5) SSAnne8TrainerHeader0: ; 619a5 (18:59a5) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d805 ; flag's byte + dw wd805 ; flag's byte dw SSAnne8BattleText1 ; 0x5a0b TextBeforeBattle dw SSAnne8AfterBattleText1 ; 0x5a15 TextAfterBattle dw SSAnne8EndBattleText1 ; 0x5a10 TextEndBattle @@ -38,7 +38,7 @@ SSAnne8TrainerHeader0: ; 619a5 (18:59a5) SSAnne8TrainerHeader1: ; 619b1 (18:59b1) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d805 ; flag's byte + dw wd805 ; flag's byte dw SSAnne8BattleText2 ; 0x5a1a TextBeforeBattle dw SSAnne8AfterBattleText2 ; 0x5a24 TextAfterBattle dw SSAnne8EndBattleText2 ; 0x5a1f TextEndBattle @@ -47,7 +47,7 @@ SSAnne8TrainerHeader1: ; 619b1 (18:59b1) SSAnne8TrainerHeader2: ; 619bd (18:59bd) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d805 ; flag's byte + dw wd805 ; flag's byte dw SSAnne8BattleText3 ; 0x5a29 TextBeforeBattle dw SSAnne8AfterBattleText3 ; 0x5a33 TextAfterBattle dw SSAnne8EndBattleText3 ; 0x5a2e TextEndBattle @@ -56,7 +56,7 @@ SSAnne8TrainerHeader2: ; 619bd (18:59bd) SSAnne8TrainerHeader3: ; 619c9 (18:59c9) db $4 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d805 ; flag's byte + dw wd805 ; flag's byte dw SSAnne8BattleText4 ; 0x5a38 TextBeforeBattle dw SSAnne8AfterBattleText4 ; 0x5a42 TextAfterBattle dw SSAnne8EndBattleText4 ; 0x5a3d TextEndBattle diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm index 9b055e3f..2ec0f28c 100755 --- a/scripts/ssanne9.asm +++ b/scripts/ssanne9.asm @@ -1,8 +1,8 @@ SSAnne9Script: ; 61b4b (18:5b4b) ld a, $1 - ld [$cf0c], a + ld [wcf0c], a xor a - ld [$cc3c], a + ld [wcc3c], a ld hl, SSAnne9TrainerHeaders ld de, SSAnne9ScriptPointers ld a, [W_SSANNE9CURSCRIPT] @@ -34,7 +34,7 @@ SSAnne9TrainerHeaders: ; 61b84 (18:5b84) SSAnne9TrainerHeader0: ; 61b84 (18:5b84) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d807 ; flag's byte + dw wd807 ; flag's byte dw SSAnne9BattleText1 ; 0x5c51 TextBeforeBattle dw SSAnne9AfterBattleText1 ; 0x5c5b TextAfterBattle dw SSAnne9EndBattleText1 ; 0x5c56 TextEndBattle @@ -43,7 +43,7 @@ SSAnne9TrainerHeader0: ; 61b84 (18:5b84) SSAnne9TrainerHeader1: ; 61b90 (18:5b90) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d807 ; flag's byte + dw wd807 ; flag's byte dw SSAnne9BattleText2 ; 0x5c60 TextBeforeBattle dw SSAnne9AfterBattleText2 ; 0x5c6a TextAfterBattle dw SSAnne9EndBattleText2 ; 0x5c65 TextEndBattle @@ -52,7 +52,7 @@ SSAnne9TrainerHeader1: ; 61b90 (18:5b90) SSAnne9TrainerHeader2: ; 61b9c (18:5b9c) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d807 ; flag's byte + dw wd807 ; flag's byte dw SSAnne9BattleText3 ; 0x5c6f TextBeforeBattle dw SSAnne9AfterBattleText3 ; 0x5c79 TextAfterBattle dw SSAnne9EndBattleText3 ; 0x5c74 TextEndBattle @@ -61,7 +61,7 @@ SSAnne9TrainerHeader2: ; 61b9c (18:5b9c) SSAnne9TrainerHeader3: ; 61ba8 (18:5ba8) db $4 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d807 ; flag's byte + dw wd807 ; flag's byte dw SSAnne9BattleText4 ; 0x5c7e TextBeforeBattle dw SSAnne9AfterBattleText4 ; 0x5c88 TextAfterBattle dw SSAnne9EndBattleText4 ; 0x5c83 TextEndBattle diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm index b765ef56..2ca624a8 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/unknowndungeon3.asm @@ -21,7 +21,7 @@ UnknownDungeon3TrainerHeaders: ; 45f0f (11:5f0f) UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f) db $1 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d85f ; flag's byte + dw wd85f ; flag's byte dw UnknownDungeon3MewtwoText ; 0x5f26 TextBeforeBattle dw UnknownDungeon3MewtwoText ; 0x5f26 TextAfterBattle dw UnknownDungeon3MewtwoText ; 0x5f26 TextEndBattle diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 62fd9fce..06143eab 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -1,6 +1,6 @@ VermilionCityScript: ; 197a1 (6:57a1) call EnableAutoTextBoxDrawing - ld hl, $d126 + ld hl, wd126 bit 6, [hl] res 6, [hl] push hl @@ -17,11 +17,11 @@ VermilionCityScript_197c0: ; 197c0 (6:57c0) call Random ld a, [$ffd4] and $e - ld [$d743], a + ld [wd743], a ret VermilionCityScript_197cb: ; 197cb (6:57cb) - ld hl, $d803 + ld hl, wd803 bit 2, [hl] ret z bit 3, [hl] @@ -39,7 +39,7 @@ VermilionCityScriptPointers: ; 197dc (6:57dc) dw VermilionCityScript4 VermilionCityScript0: ; 197e6 (6:57e6) - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] and a ret nz ld hl, CoordsData_19823 @@ -47,11 +47,11 @@ VermilionCityScript0: ; 197e6 (6:57e6) ret nc xor a ld [hJoyHeld], a - ld [$cf0d], a + ld [wcf0d], a ld a, $3 ld [$ff8c], a call DisplayTextID - ld a, [$d803] + ld a, [wd803] bit 2, a jr nz, .asm_19810 ; 0x19804 $a ld b, $3f @@ -62,9 +62,9 @@ VermilionCityScript0: ; 197e6 (6:57e6) ret nz .asm_19810 ld a, $40 - ld [$ccd3], a + ld [wccd3], a ld a, $1 - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $1 ld [W_VERMILIONCITYCURSCRIPT], a @@ -86,17 +86,17 @@ VermilionCityScript2: ; 19833 (6:5833) ld a, $ff ld [wJoyIgnore], a ld a, $40 - ld [$ccd3], a - ld [$ccd4], a + ld [wccd3], a + ld [wccd4], a ld a, $2 - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $3 ld [W_VERMILIONCITYCURSCRIPT], a ret VermilionCityScript3: ; 1984e (6:584e) - ld a, [$cd38] + ld a, [wcd38] and a ret nz xor a @@ -107,7 +107,7 @@ VermilionCityScript3: ; 1984e (6:584e) ret VermilionCityScript1: ; 1985f (6:585f) - ld a, [$cd38] + ld a, [wcd38] and a ret nz ld c, $a @@ -137,7 +137,7 @@ VermilionCityText1: ; 19889 (6:5889) VermilionCityText2: ; 1988e (6:588e) db $08 ; asm - ld a, [$d803] + ld a, [wd803] bit 2, a jr nz, .asm_359bd ; 0x19894 ld hl, VermilionCityText_198a7 @@ -159,10 +159,10 @@ VermilionCityText_198ac: ; 198ac (6:58ac) VermilionCityText3: ; 198b1 (6:58b1) db $08 ; asm - ld a, [$d803] + ld a, [wd803] bit 2, a jr nz, .asm_3e0e9 ; 0x198b7 - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] cp $c jr z, .asm_07af3 ; 0x198be ld hl, VermilionCityCoords1 diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index a490f61d..b094878c 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -1,36 +1,36 @@ VermilionDockScript: ; 1db52 (7:5b52) call EnableAutoTextBoxDrawing - ld hl, $d803 + ld hl, wd803 bit 4, [hl] jr nz, .asm_1db8d ; 0x1db5a $31 bit 0, [hl] ret z - ld a, [$d42f] + ld a, [wd42f] cp $1 ret nz bit 2, [hl] jp z, VermilionDock_1db9b set 4, [hl] call Delay3 - ld hl, $d730 + ld hl, wd730 set 7, [hl] - ld hl, $ccd3 + ld hl, wccd3 ld a, $40 ld [hli], a ld [hli], a ld [hl], a ld a, $3 - ld [$cd38], a + ld [wcd38], a xor a - ld [$c206], a - ld [$cd3b], a + ld [wSpriteStateData2 + $06], a + ld [wcd3b], a dec a ld [wJoyIgnore], a ret .asm_1db8d bit 5, [hl] ret nz - ld a, [$cd38] + ld a, [wcd38] and a ret nz ld [wJoyIgnore], a @@ -41,19 +41,19 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) set 2, [hl] ld a, $ff ld [wJoyIgnore], a - ld [$c0ee], a + ld [wc0ee], a call PlaySound ld c, BANK(Music_Surfing) ld a, MUSIC_SURFING call PlayMusic callba LoadSmokeTileFourTimes xor a - ld [$c102], a + ld [wSpriteStateData1 + 2], a ld c, $78 call DelayFrames ld b, $9c call CopyScreenTileBufferToVRAM - FuncCoord 0, 10 ; $c468 + FuncCoord 0, 10 ld hl, Coord ld bc, $0078 ld a, $14 @@ -63,11 +63,11 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) call Delay3 xor a ld [$ffba], a - ld [$cd3d], a + ld [wWhichTrade], a ld [$ff49], a ld a, $58 - ld [$cd3e], a - ld hl, $d526 + ld [wTrainerEngageDistance], a + ld hl, wd526 ld c, [hl] inc hl ld b, [hl] @@ -76,16 +76,16 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) ld a, (SFX_02_54 - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent ld a, $ff - ld [$cfcb], a + ld [wcfcb], a ld d, $0 ld e, $8 .asm_1dbfa ld hl, $0002 add hl, bc ld a, l - ld [$d526], a + ld [wd526], a ld a, h - ld [$d527], a + ld [wd527], a push hl push de call ScheduleEastColumnRedraw @@ -112,22 +112,22 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) ld a, $90 ld [$ffb0], a ld a, $1 - ld [$cfcb], a + ld [wcfcb], a pop hl pop bc ld [hl], b dec hl ld [hl], c call LoadPlayerSpriteGraphics - ld hl, $d3ae + ld hl, wd3ae dec [hl] ret VermilionDock_1dc42: ; 1dc42 (7:5c42) push bc push de - ld hl, $c311 - ld a, [$cd3d] + ld hl, wOAMBuffer + $11 + ld a, [wWhichTrade] swap a ld c, a ld de, $0004 @@ -142,14 +142,14 @@ VermilionDock_1dc42: ; 1dc42 (7:5c42) ret VermilionDock_1dc59: ; 1dc59 (7:5c59) - ld a, [$cd3e] + ld a, [wTrainerEngageDistance] sub $10 - ld [$cd3e], a + ld [wTrainerEngageDistance], a ld c, a ld b, $64 - ld a, [$cd3d] + ld a, [wWhichTrade] inc a - ld [$cd3d], a + ld [wWhichTrade], a ld a, $1 ld de, VermilionDockOAMBlock call WriteOAMBlock @@ -180,15 +180,15 @@ VermilionDock_1dc7c: ; 1dc7c (7:5c7c) ret VermilionDock_1dc94: ; 1dc94 (7:5c94) - ld hl, $cc5b + ld hl, wcc5b ld bc, $00b4 ld a, $14 call FillMemory ld hl, $9940 - ld de, $cc5b + ld de, wcc5b ld bc, $000c call CopyVideoData - ld hl, $c754 + ld hl, wOverworldMap + 10 + 7 * VERMILION_DOCK_WIDTH ; 10, 7 ld a, $d ld [hli], a ld [hli], a diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 2da613f9..f1cb42ff 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -1,5 +1,5 @@ VermilionGymScript: ; 5ca26 (17:4a26) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] push hl @@ -28,7 +28,7 @@ Gym3LeaderName: ; 5ca64 (17:4a64) db "LT.SURGE@" VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) - ld a, [$d773] + ld a, [wd773] bit 0, a jr nz, .asm_5ca78 ld a, $24 @@ -38,7 +38,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) call PlaySound ld a, $5 .asm_5ca7f - ld [$d09f], a + ld [wd09f], a ld bc, $202 ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -57,7 +57,7 @@ VermilionGymScriptPointers: ; 5ca95 (17:4a95) dw VermilionGymScript3 VermilionGymScript3: ; 5ca9d (17:4a9d) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, VermilionGymScript_5ca8a ld a, $f0 @@ -67,7 +67,7 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa) ld a, $6 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d773 + ld hl, wd773 set 7, [hl] ld bc, (TM_24 << 8) | 1 call GiveItem @@ -75,7 +75,7 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa) ld a, $7 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d773 + ld hl, wd773 set 6, [hl] jr .asm_5cad3 .BagFull @@ -85,13 +85,13 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa) .asm_5cad3 ld hl, W_OBTAINEDBADGES set 2, [hl] - ld hl, $d72a + ld hl, wd72a set 2, [hl] ; deactivate gym trainers - ld a, [$d773] + ld a, [wd773] or %00011100 - ld [$d773], a + ld [wd773], a jp VermilionGymScript_5ca8a @@ -109,7 +109,7 @@ VermilionGymTrainerHeaders: ; 5caf8 (17:4af8) VermilionGymTrainerHeader0: ; 5caf8 (17:4af8) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d773 ; flag's byte + dw wd773 ; flag's byte dw VermilionGymBattleText1 ; 0x4b9a TextBeforeBattle dw VermilionGymAfterBattleText1 ; 0x4ba4 TextAfterBattle dw VermilionGymEndBattleText1 ; 0x4b9f TextEndBattle @@ -118,7 +118,7 @@ VermilionGymTrainerHeader0: ; 5caf8 (17:4af8) VermilionGymTrainerHeader1: ; 5cb04 (17:4b04) db $3 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d773 ; flag's byte + dw wd773 ; flag's byte dw VermilionGymBattleText2 ; 0x4bb3 TextBeforeBattle dw VermilionGymAfterBattleText2 ; 0x4bbd TextAfterBattle dw VermilionGymEndBattleText2 ; 0x4bb8 TextEndBattle @@ -127,7 +127,7 @@ VermilionGymTrainerHeader1: ; 5cb04 (17:4b04) VermilionGymTrainerHeader2: ; 5cb10 (17:4b10) db $4 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d773 ; flag's byte + dw wd773 ; flag's byte dw VermilionGymBattleText3 ; 0x4bcc TextBeforeBattle dw VermilionGymAfterBattleText3 ; 0x4bd6 TextAfterBattle dw VermilionGymEndBattleText3 ; 0x4bd1 TextEndBattle @@ -137,7 +137,7 @@ VermilionGymTrainerHeader2: ; 5cb10 (17:4b10) VermilionGymText1: ; 5cb1d (17:4b1d) db $08 ; asm - ld a, [$d773] + ld a, [wd773] bit 7, a jr z, .asm_7cc29 ; 0x5cb23 bit 6, a @@ -152,18 +152,18 @@ VermilionGymText1: ; 5cb1d (17:4b1d) .asm_7cc29 ; 0x5cb39 ld hl, VermilionGymText_5cb6d call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, ReceivedThunderbadgeText ld de, ReceivedThunderbadgeText call PreBattleSaveRegisters ldh a, [$8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 - ld [$d05c], a + ld [W_GYMLEADERNO], a xor a ldh [$b4], a ld a, $3 @@ -254,7 +254,7 @@ VermilionGymAfterBattleText3: ; 5cbd6 (17:4bd6) VermilionGymText5: ; 5cbdb (17:4bdb) db $08 ; asm - ld a, [$d72a] + ld a, [wd72a] bit 2, a jr nz, .asm_13b67 ; 0x5cbe1 ld hl, VermilionGymText_5cbf4 diff --git a/scripts/vermilionhouse2.asm b/scripts/vermilionhouse2.asm index 9efb8200..7c06c6e9 100755 --- a/scripts/vermilionhouse2.asm +++ b/scripts/vermilionhouse2.asm @@ -6,19 +6,19 @@ VermilionHouse2TextPointers: ; 56073 (15:6073) VermilionHouse2Text1: ; 56075 (15:6075) db $08 ; asm - ld a, [$d728] + ld a, [wd728] bit 3, a jr nz, .asm_03ef5 ld hl, VermilionHouse2Text_560b1 call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_eb1b7 ld bc, (OLD_ROD << 8) | 1 call GiveItem jr nc, .BagFull - ld hl, $d728 + ld hl, wd728 set 3, [hl] ld hl, VermilionHouse2Text_560b6 jr .asm_5dd95 diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index b9b946ad..1dc62af8 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -1,5 +1,5 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] call nz, .next @@ -11,11 +11,11 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) ld [W_VICTORYROAD1CURSCRIPT], a ret .next - ld a, [$d869] + ld a, [wd869] bit 7, a ret z ld a, $1d - ld [$d09f], a + ld [wd09f], a ld bc, $604 ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -26,15 +26,15 @@ VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a) dw EndTrainerBattle VictoryRoad1Script0: ; 5da40 (17:5a40) - ld a, [$d869] + ld a, [wd869] bit 7, a jp nz, CheckFightingMapTrainers ld hl, CoordsData_5da5c ; $5a5c call CheckBoulderCoords jp nc, CheckFightingMapTrainers - ld hl, $d126 + ld hl, wd126 set 5, [hl] - ld hl, $d869 + ld hl, wd869 set 7, [hl] ret @@ -54,7 +54,7 @@ VictoryRoad1TrainerHeaders: ; 5da6d (17:5a6d) VictoryRoad1TrainerHeader0: ; 5da6d (17:5a6d) db $1 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d869 ; flag's byte + dw wd869 ; flag's byte dw VictoryRoad1BattleText1 ; 0x5a9a TextBeforeBattle dw VictoryRoad1AfterBattleText1 ; 0x5aa4 TextAfterBattle dw VictoryRoad1EndBattleText1 ; 0x5a9f TextEndBattle @@ -63,7 +63,7 @@ VictoryRoad1TrainerHeader0: ; 5da6d (17:5a6d) VictoryRoad1TrainerHeader1: ; 5da79 (17:5a79) db $2 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d869 ; flag's byte + dw wd869 ; flag's byte dw VictoryRoad1BattleText2 ; 0x5aa9 TextBeforeBattle dw VictoryRoad1AfterBattleText2 ; 0x5ab3 TextAfterBattle dw VictoryRoad1EndBattleText2 ; 0x5aae TextEndBattle diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index 6270a858..071af611 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -1,9 +1,9 @@ VictoryRoad2Script: ; 5179d (14:579d) - ld hl, $d126 + ld hl, wd126 bit 6, [hl] res 6, [hl] call nz, VictoryRoad2Script_517c4 - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] call nz, VictoryRoad2Script_517c9 @@ -16,11 +16,11 @@ VictoryRoad2Script: ; 5179d (14:579d) ret VictoryRoad2Script_517c4: ; 517c4 (14:57c4) - ld hl, $d869 + ld hl, wd869 res 7, [hl] VictoryRoad2Script_517c9: ; 517c9 (14:57c9) - ld a, [$d7ee] + ld a, [wd7ee] bit 0, a jr z, .asm_517da push af @@ -35,7 +35,7 @@ VictoryRoad2Script_517c9: ; 517c9 (14:57c9) ld bc, $70b VictoryRoad2Script_517e2: ; 517e2 (14:57e2) - ld [$d09f], a + ld [wd09f], a ld a, $17 call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) ret @@ -49,8 +49,8 @@ VictoryRoad2Script0: ; 517f1 (14:57f1) ld hl, CoordsData_51816 ; $5816 call CheckBoulderCoords jp nc, CheckFightingMapTrainers - ld hl, $d7ee - ld a, [wWhichTrade] ; $cd3d + ld hl, wd7ee + ld a, [wWhichTrade] ; wWhichTrade cp $2 jr z, .asm_5180b bit 0, [hl] @@ -62,7 +62,7 @@ VictoryRoad2Script0: ; 517f1 (14:57f1) set 7, [hl] ret nz .asm_51810 - ld hl, $d126 + ld hl, wd126 set 5, [hl] ret @@ -90,7 +90,7 @@ VictoryRoad2TrainerHeaders: ; 51835 (14:5835) VictoryRoad2TrainerHeader0: ; 51835 (14:5835) db $1 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7ee ; flag's byte + dw wd7ee ; flag's byte dw VictoryRoad2BattleText1 ; 0x58ca TextBeforeBattle dw VictoryRoad2AfterBattleText1 ; 0x58d4 TextAfterBattle dw VictoryRoad2EndBattleText1 ; 0x58cf TextEndBattle @@ -99,7 +99,7 @@ VictoryRoad2TrainerHeader0: ; 51835 (14:5835) VictoryRoad2TrainerHeader2: ; 51841 (14:5841) db $2 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7ee ; flag's byte + dw wd7ee ; flag's byte dw VictoryRoad2BattleText2 ; 0x58d9 TextBeforeBattle dw VictoryRoad2AfterBattleText2 ; 0x58e3 TextAfterBattle dw VictoryRoad2EndBattleText2 ; 0x58de TextEndBattle @@ -108,7 +108,7 @@ VictoryRoad2TrainerHeader2: ; 51841 (14:5841) VictoryRoad2TrainerHeader3: ; 5184d (14:584d) db $3 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7ee ; flag's byte + dw wd7ee ; flag's byte dw VictoryRoad2BattleText3 ; 0x58e8 TextBeforeBattle dw VictoryRoad2AfterBattleText3 ; 0x58f2 TextAfterBattle dw VictoryRoad2EndBattleText3 ; 0x58ed TextEndBattle @@ -117,7 +117,7 @@ VictoryRoad2TrainerHeader3: ; 5184d (14:584d) VictoryRoad2TrainerHeader4: ; 51859 (14:5859) db $4 ; flag's bit db ($1 << 4) ; trainer's view range - dw $d7ee ; flag's byte + dw wd7ee ; flag's byte dw VictoryRoad2BattleText4 ; 0x58f7 TextBeforeBattle dw VictoryRoad2AfterBattleText4 ; 0x5901 TextAfterBattle dw VictoryRoad2EndBattleText4 ; 0x58fc TextEndBattle @@ -126,7 +126,7 @@ VictoryRoad2TrainerHeader4: ; 51859 (14:5859) VictoryRoad2TrainerHeader5: ; 51865 (14:5865) db $5 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d7ee ; flag's byte + dw wd7ee ; flag's byte dw VictoryRoad2BattleText5 ; 0x5906 TextBeforeBattle dw VictoryRoad2AfterBattleText5 ; 0x5910 TextAfterBattle dw VictoryRoad2EndBattleText5 ; 0x590b TextEndBattle @@ -135,7 +135,7 @@ VictoryRoad2TrainerHeader5: ; 51865 (14:5865) VictoryRoad2TrainerHeader6: ; 51871 (14:5871) db $6 ; flag's bit db ($0 << 4) ; trainer's view range - dw $d7ee ; flag's byte + dw wd7ee ; flag's byte dw VictoryRoad2BattleText6 ; 0x58ba TextBeforeBattle dw VictoryRoad2BattleText6 ; 0x58ba TextAfterBattle dw VictoryRoad2BattleText6 ; 0x58ba TextEndBattle diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index f2e08ca4..9c27ebc1 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -9,15 +9,15 @@ VictoryRoad3Script: ; 44980 (11:4980) ret VictoryRoad3Script_44996: ; 44996 (11:4996) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] ret z - ld hl, $d813 + ld hl, wd813 bit 0, [hl] ret z ld a, $1d - ld [$d09f], a + ld [wd09f], a ld bc, $503 ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) @@ -35,25 +35,25 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) ld hl, .coordsData_449f9 ; $49f9 call CheckBoulderCoords jp nc, .asm_449fe - ld a, [wWhichTrade] ; $cd3d + ld a, [wWhichTrade] ; wWhichTrade cp $1 jr nz, .asm_449dc - ld hl, $d126 + ld hl, wd126 set 5, [hl] - ld hl, $d813 + ld hl, wd813 set 0, [hl] ret .asm_449dc - ld hl, $d813 + ld hl, wd813 bit 6, [hl] set 6, [hl] jr nz, .asm_449fe ld a, $7a - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) ld a, $60 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) @@ -64,19 +64,19 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) .asm_449fe ld a, $c2 - ld [$d71d], a + ld [wd71d], a ld hl, .coordsData_449f9 ; $49f9 call Func_46981 - ld a, [wWhichTrade] ; $cd3d + ld a, [wWhichTrade] ; wWhichTrade cp $1 jr nz, .asm_44a1b - ld hl, $d72d + ld hl, wd72d res 4, [hl] - ld hl, $d732 + ld hl, wd732 res 4, [hl] ret .asm_44a1b - ld a, [$d72d] + ld a, [wd72d] bit 4, a jp z, CheckFightingMapTrainers ret @@ -97,7 +97,7 @@ VictoryRoad3TrainerHeaders: ; 44a38 (11:4a38) VictoryRoad3TrainerHeader0: ; 44a38 (11:4a38) db $1 ; flag's bit db ($1 << 4) ; trainer's view range - dw $d813 ; flag's byte + dw wd813 ; flag's byte dw VictoryRoad3BattleText2 ; 0x4a91 TextBeforeBattle dw VictoryRoad3AfterBattleText2 ; 0x4a9b TextAfterBattle dw VictoryRoad3EndBattleText2 ; 0x4a96 TextEndBattle @@ -106,7 +106,7 @@ VictoryRoad3TrainerHeader0: ; 44a38 (11:4a38) VictoryRoad3TrainerHeader2: ; 44a44 (11:4a44) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d813 ; flag's byte + dw wd813 ; flag's byte dw VictoryRoad3BattleText3 ; 0x4aa0 TextBeforeBattle dw VictoryRoad3AfterBattleText3 ; 0x4aaa TextAfterBattle dw VictoryRoad3EndBattleText3 ; 0x4aa5 TextEndBattle @@ -115,7 +115,7 @@ VictoryRoad3TrainerHeader2: ; 44a44 (11:4a44) VictoryRoad3TrainerHeader3: ; 44a50 (11:4a50) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d813 ; flag's byte + dw wd813 ; flag's byte dw VictoryRoad3BattleText4 ; 0x4aaf TextBeforeBattle dw VictoryRoad3AfterBattleText4 ; 0x4ab9 TextAfterBattle dw VictoryRoad3EndBattleText4 ; 0x4ab4 TextEndBattle @@ -124,7 +124,7 @@ VictoryRoad3TrainerHeader3: ; 44a50 (11:4a50) VictoryRoad3TrainerHeader4: ; 44a5c (11:4a5c) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d813 ; flag's byte + dw wd813 ; flag's byte dw VictoryRoad3BattleText5 ; 0x4abe TextBeforeBattle dw VictoryRoad3AfterBattleText5 ; 0x4ac8 TextAfterBattle dw VictoryRoad3EndBattleText5 ; 0x4ac3 TextEndBattle diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index 541bb76d..7a769280 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -15,13 +15,13 @@ ViridianCityScript0: ; 19005 (6:5005) jp ViridianCityScript_1903d ViridianCityScript_1900b: ; 1900b (6:500b) - ld a, [$d74c] + ld a, [wd74c] bit 0, a ret nz ld a, [W_OBTAINEDBADGES] cp %01111111 jr nz, .asm_1901e ; 0x19016 $6 - ld hl, $d74c + ld hl, wd74c set 0, [hl] ret .asm_1901e @@ -42,7 +42,7 @@ ViridianCityScript_1900b: ; 1900b (6:500b) ret ViridianCityScript_1903d: ; 1903d (6:503d) - ld a, [$d74b] + ld a, [wd74b] bit 5, a ret nz ld a, [W_YCOORD] @@ -62,13 +62,13 @@ ViridianCityScript_1903d: ; 1903d (6:503d) ret ViridianCityScript1: ; 19062 (6:5062) - ld a, [$c134] + ld a, [wSpriteStateData1 + $34] ld [$ffeb], a - ld a, [$c136] + ld a, [wSpriteStateData1 + $36] ld [$ffec], a - ld a, [$c234] + ld a, [wSpriteStateData2 + $34] ld [$ffed], a - ld a, [$c235] + ld a, [wSpriteStateData2 + $35] ld [$ffee], a xor a ld [wListScrollOffset], a @@ -86,13 +86,13 @@ ViridianCityScript1: ; 19062 (6:5062) ViridianCityScript2: ; 1908f (6:508f) ld a, [$ffeb] - ld [$c134], a + ld [wSpriteStateData1 + $34], a ld a, [$ffec] - ld [$c136], a + ld [wSpriteStateData1 + $36], a ld a, [$ffed] - ld [$c234], a + ld [wSpriteStateData2 + $34], a ld a, [$ffee] - ld [$c235], a + ld [wSpriteStateData2 + $35], a call UpdateSprites call Delay3 xor a @@ -108,7 +108,7 @@ ViridianCityScript2: ; 1908f (6:508f) ret ViridianCityScript3: ; 190c1 (6:50c1) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 @@ -119,11 +119,11 @@ ViridianCityScript3: ; 190c1 (6:50c1) ViridianCityScript_190cf: ; 190cf (6:50cf) call Func_3486 ld a, $1 - ld [$cd38], a + ld [wcd38], a ld a, $80 - ld [$ccd3], a + ld [wccd3], a xor a - ld [$c109], a + ld [wSpriteStateData1 + 9], a ld [wJoyIgnore], a ret @@ -154,7 +154,7 @@ ViridianCityText2: ; 19107 (6:5107) cp %01111111 ld hl, ViridianCityText_19127 jr z, .asm_ae9fe ; 0x19110 - ld a, [$d751] + ld a, [wd751] bit 1, a jr nz, .asm_ae9fe ; 0x19117 ld hl, ViridianCityText_19122 @@ -175,7 +175,7 @@ ViridianCityText3: ; 1912c (6:512c) ld hl, ViridianCityText_1914d call PrintText call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr nz, .asm_6dfea ; 0x1913a ld hl, ViridianCityText_19157 @@ -201,7 +201,7 @@ ViridianCityText_19157: ; 19157 (6:5157) ViridianCityText4: ; 1915c (6:515c) db $08 ; asm - ld a, [$d74b] + ld a, [wd74b] bit 5, a jr nz, .asm_83894 ; 0x19162 ld hl, ViridianCityText_19175 @@ -236,7 +236,7 @@ ViridianCityText_19191: ; 19191 (6:5191) ViridianCityText6: ; 19196 (6:5196) db $08 ; asm - ld a, [$d74c] + ld a, [wd74c] bit 1, a jr nz, .asm_4e5a0 ; 0x1919c ld hl, ViridianCityText_191ca @@ -246,7 +246,7 @@ ViridianCityText6: ; 19196 (6:5196) jr nc, .BagFull ld hl, ReceivedTM42Text call PrintText - ld hl, $d74c + ld hl, wd74c set 1, [hl] jr .asm_3c73c ; 0x191b7 .BagFull @@ -282,7 +282,7 @@ ViridianCityText7: ; 191df (6:51df) ld c, $2 call DelayFrames call YesNoChoice - ld a, [$cc26] + ld a, [wCurrentMenuItem] and a jr z, .asm_42f68 ; 0x191f2 ld hl, ViridianCityText_1920f diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm index 4e55733b..3744fc78 100755 --- a/scripts/viridianforest.asm +++ b/scripts/viridianforest.asm @@ -32,7 +32,7 @@ ViridianForestTrainerHeaders: ; 61142 (18:5142) ViridianForestTrainerHeader0: ; 61142 (18:5142) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7f3 ; flag's byte + dw wd7f3 ; flag's byte dw ViridianForestBattleText1 ; 0x518a TextBeforeBattle dw ViridianForestAfterBattleText1 ; 0x5194 TextAfterBattle dw ViridianForestEndBattleText1 ; 0x518f TextEndBattle @@ -41,7 +41,7 @@ ViridianForestTrainerHeader0: ; 61142 (18:5142) ViridianForestTrainerHeader1: ; 6114e (18:514e) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d7f3 ; flag's byte + dw wd7f3 ; flag's byte dw ViridianForestBattleText2 ; 0x5199 TextBeforeBattle dw ViridianForestAfterBattleText2 ; 0x51a3 TextAfterBattle dw ViridianForestEndBattleText2 ; 0x519e TextEndBattle @@ -50,7 +50,7 @@ ViridianForestTrainerHeader1: ; 6114e (18:514e) ViridianForestTrainerHeader2: ; 6115a (18:515a) db $4 ; flag's bit db ($1 << 4) ; trainer's view range - dw $d7f3 ; flag's byte + dw wd7f3 ; flag's byte dw ViridianForestBattleText3 ; 0x51a8 TextBeforeBattle dw ViridianForestAfterBattleText3 ; 0x51b2 TextAfterBattle dw ViridianForestEndBattleText3 ; 0x51ad TextEndBattle diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 9639140f..9034cc06 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -30,16 +30,16 @@ ViridianGymScriptPointers: ; 748e1 (1d:48e1) dw ViridianGymScript4 ViridianGymScript0: ; 748eb (1d:48eb) - ld a, [W_YCOORD] ; $d361 + ld a, [W_YCOORD] ; wd361 ld b, a - ld a, [W_XCOORD] ; $d362 + ld a, [W_XCOORD] ; wd362 ld c, a ld hl, ViridianGymArrowTilePlayerMovement call Func_3442 cp $ff jp z, CheckFightingMapTrainers call Func_3486 - ld hl, $d736 + ld hl, wd736 set 7, [hl] ld a, (SFX_02_52 - SFX_Headers_02) / 3 call PlaySound @@ -121,12 +121,12 @@ ViridianGymArrowMovement12: ; 74968 (1d:4968) db $20,$0C,$FF ViridianGymScript4: ; 7496b (1d:496b) - ld a, [$cd38] + ld a, [wcd38] and a jr nz, .asm_74980 xor a ld [wJoyIgnore], a - ld hl, $d736 + ld hl, wd736 res 7, [hl] ld a, $0 ld [W_CURMAPSCRIPT], a @@ -137,7 +137,7 @@ ViridianGymScript4: ; 7496b (1d:496b) jp Bankswitch ViridianGymScript3: ; 74988 (1d:4988) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff jp z, ViridianGymScript_748d6 ld a, $f0 @@ -146,7 +146,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) ld a, $c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d751 + ld hl, wd751 set 1, [hl] ld bc, (TM_27 << 8) | 1 call GiveItem @@ -154,7 +154,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) ld a, $d ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID - ld hl, $d751 + ld hl, wd751 set 0, [hl] jr .asm_749be .BagFull @@ -164,22 +164,22 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) .asm_749be ld hl, W_OBTAINEDBADGES set 7, [hl] - ld hl, $d72a + ld hl, wd72a set 7, [hl] ; deactivate gym trainers - ld a, [$d751] + ld a, [wd751] or %11111100 - ld [$d751], a - ld a, [$d752] + ld [wd751], a + ld a, [wd752] or %00000011 - ld [$d752], a + ld [wd752], a ld a, $23 - ld [$cc4d], a + ld [wcc4d], a ld a, $15 call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8)) - ld hl, $d7eb + ld hl, wd7eb set 1, [hl] set 7, [hl] jp ViridianGymScript_748d6 @@ -204,7 +204,7 @@ ViridianGymTrainerHeaders: ; 74a08 (1d:4a08) ViridianGymTrainerHeader0: ; 74a08 (1d:4a08) db $2 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d751 ; flag's byte + dw wd751 ; flag's byte dw ViridianGymBattleText1 ; 0x4afd TextBeforeBattle dw ViridianGymAfterBattleText1 ; 0x4b07 TextAfterBattle dw ViridianGymEndBattleText1 ; 0x4b02 TextEndBattle @@ -213,7 +213,7 @@ ViridianGymTrainerHeader0: ; 74a08 (1d:4a08) ViridianGymTrainerHeader1: ; 74a14 (1d:4a14) db $3 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d751 ; flag's byte + dw wd751 ; flag's byte dw ViridianGymBattleText2 ; 0x4b16 TextBeforeBattle dw ViridianGymAfterBattleText2 ; 0x4b20 TextAfterBattle dw ViridianGymEndBattleText2 ; 0x4b1b TextEndBattle @@ -222,7 +222,7 @@ ViridianGymTrainerHeader1: ; 74a14 (1d:4a14) ViridianGymTrainerHeader2: ; 74a20 (1d:4a20) db $4 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d751 ; flag's byte + dw wd751 ; flag's byte dw ViridianGymBattleText3 ; 0x4b2f TextBeforeBattle dw ViridianGymAfterBattleText3 ; 0x4b39 TextAfterBattle dw ViridianGymEndBattleText3 ; 0x4b34 TextEndBattle @@ -231,7 +231,7 @@ ViridianGymTrainerHeader2: ; 74a20 (1d:4a20) ViridianGymTrainerHeader3: ; 74a2c (1d:4a2c) db $5 ; flag's bit db ($2 << 4) ; trainer's view range - dw $d751 ; flag's byte + dw wd751 ; flag's byte dw ViridianGymBattleText4 ; 0x4b48 TextBeforeBattle dw ViridianGymAfterBattleText4 ; 0x4b52 TextAfterBattle dw ViridianGymEndBattleText4 ; 0x4b4d TextEndBattle @@ -240,7 +240,7 @@ ViridianGymTrainerHeader3: ; 74a2c (1d:4a2c) ViridianGymTrainerHeader4: ; 74a38 (1d:4a38) db $6 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d751 ; flag's byte + dw wd751 ; flag's byte dw ViridianGymBattleText5 ; 0x4b61 TextBeforeBattle dw ViridianGymAfterBattleText5 ; 0x4b6b TextAfterBattle dw ViridianGymEndBattleText5 ; 0x4b66 TextEndBattle @@ -249,7 +249,7 @@ ViridianGymTrainerHeader4: ; 74a38 (1d:4a38) ViridianGymTrainerHeader5: ; 74a44 (1d:4a44) db $7 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d751 ; flag's byte + dw wd751 ; flag's byte dw ViridianGymBattleText6 ; 0x4b7a TextBeforeBattle dw ViridianGymAfterBattleText6 ; 0x4b84 TextAfterBattle dw ViridianGymEndBattleText6 ; 0x4b7f TextEndBattle @@ -258,7 +258,7 @@ ViridianGymTrainerHeader5: ; 74a44 (1d:4a44) ViridianGymTrainerHeader6: ; 74a50 (1d:4a50) db $8 ; flag's bit db ($3 << 4) ; trainer's view range - dw $d751 ; flag's byte + dw wd751 ; flag's byte dw ViridianGymBattleText7 ; 0x4b93 TextBeforeBattle dw ViridianGymAfterBattleText7 ; 0x4b9d TextAfterBattle dw ViridianGymEndBattleText7 ; 0x4b98 TextEndBattle @@ -267,7 +267,7 @@ ViridianGymTrainerHeader6: ; 74a50 (1d:4a50) ViridianGymTrainerHeader7: ; 74a5c (1d:4a5c) db $9 ; flag's bit db ($4 << 4) ; trainer's view range - dw $d751 ; flag's byte + dw wd751 ; flag's byte dw ViridianGymBattleText8 ; 0x4bac TextBeforeBattle dw ViridianGymAfterBattleText8 ; 0x4bb6 TextAfterBattle dw ViridianGymEndBattleText8 ; 0x4bb1 TextEndBattle @@ -277,7 +277,7 @@ ViridianGymTrainerHeader7: ; 74a5c (1d:4a5c) ViridianGymText1: ; 74a69 (1d:4a69) db $08 ; asm - ld a, [$d751] + ld a, [wd751] bit 1, a jr z, .asm_6de66 ; 0x74a6f bit 0, a @@ -287,12 +287,12 @@ ViridianGymText1: ; 74a69 (1d:4a69) jr .asm_6dff7 ; 0x74a7b .asm_9fc95 ; 0x74a7d ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld hl, ViridianGymText_74ad9 call PrintText call GBFadeIn1 ld a, $32 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef call UpdateSprites @@ -302,18 +302,18 @@ ViridianGymText1: ; 74a69 (1d:4a69) .asm_6de66 ; 0x74aa0 ld hl, ViridianGymText_74ace call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, ViridianGymText_74ad3 ld de, ViridianGymText_74ad3 call PreBattleSaveRegisters ldh a, [$8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $8 - ld [$d05c], a + ld [W_GYMLEADERNO], a ld a, $3 ld [W_VIRIDIANGYMCURSCRIPT], a .asm_6dff7 ; 0x74acb @@ -493,7 +493,7 @@ ViridianGymAfterBattleText8: ; 74bb6 (1d:4bb6) ViridianGymText10: ; 74bbb (1d:4bbb) db $08 ; asm - ld a, [$d751] + ld a, [wd751] bit 1, a jr nz, .asm_1abd1 ; 0x74bc1 ld hl, ViridianGymText_74bd4 diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 1c53a5a3..a02231f8 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -6,7 +6,7 @@ ViridianMartScript: ; 1d46e (7:546e) jp CallFunctionInTable ViridianMartScript_1d47d: ; 1d47d (7:547d) - ld a, [$d74e] + ld a, [wd74e] bit 0, a jr nz, .asm_1d489 ; 0x1d482 $5 ld hl, ViridianMartTextPointers ; $54e0 @@ -30,11 +30,11 @@ ViridianMartScript0: ; 1d49b (7:549b) ld a, $4 ld [$ff8c], a call DisplayTextID - ld hl, $ccd3 + ld hl, wccd3 ld de, RLEMovement1d4bb call DecodeRLEList dec a - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $1 ld [W_VIRIDIANMARKETCURSCRIPT], a @@ -46,7 +46,7 @@ RLEMovement1d4bb: ; 1d4bb (7:54bb) db $ff ViridianMartScript1: ; 1d4c0 (7:54c0) - ld a, [$cd38] + ld a, [wcd38] and a ret nz call Delay3 @@ -55,7 +55,7 @@ ViridianMartScript1: ; 1d4c0 (7:54c0) call DisplayTextID ld bc, (OAKS_PARCEL << 8) + 1 call GiveItem - ld hl, $d74e + ld hl, wd74e set 1, [hl] ld a, $2 ld [W_VIRIDIANMARKETCURSCRIPT], a -- cgit v1.2.3 From 89be95cdeda1bf2b4eccc2164d835236bd89bba1 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Wed, 28 May 2014 15:30:06 -0400 Subject: TM_28 in Cerulean script --- scripts/ceruleancity.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 0ebd70a1..c2ecf26c 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -291,7 +291,7 @@ CeruleanCityText2: ; 1967c (6:567c) .asm_4ca20 ; 0x196ad ld hl, CeruleanCityText_196f3 call PrintText - ld bc, $e401 + ld bc, (TM_28 << 8) + 1 call GiveItem jr c, .Success ld hl, TM28NoRoomText -- cgit v1.2.3 From da0a72cdbf45fa624b2d1151afe94a98d7da2ae0 Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 29 May 2014 01:31:46 -0700 Subject: Use VRAM constants where applicable. --- scripts/rockethideout2.asm | 120 ++++++++++++++------------------------------- scripts/vermiliondock.asm | 2 +- 2 files changed, 38 insertions(+), 84 deletions(-) (limited to 'scripts') diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index a476f060..aa8d31a4 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -329,9 +329,9 @@ LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) ld [wSpriteStateData1 + 2], a ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET cp FACILITY - ld hl, SpinnerArrowTilePointers1 ; $5023 + ld hl, FacilitySpinnerArrows ; $5023 jr z, .asm_44ff6 - ld hl, SpinnerArrowTilePointers2 ; $5053 + ld hl, GymSpinnerArrows ; $5053 .asm_44ff6 ld a, [wcd38] bit 0, a @@ -368,87 +368,41 @@ LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) jr nz, .asm_45006 ret -SpinnerArrowTilePointers1: ; 45023 (11:5023) - dw SpinnerArrowAnimTiles ;address from within tileset graphics - db 1 ;number of tiles to copy? - db BANK(SpinnerArrowAnimTiles) ;bank of tileset graphics - dw $9200 ;where to load in VRAM - - dw SpinnerArrowAnimTiles + $10 - db 1 - db BANK(SpinnerArrowAnimTiles) - dw $9210 - - dw SpinnerArrowAnimTiles + $20 - db 1 - db BANK(SpinnerArrowAnimTiles) - dw $9300 - - dw SpinnerArrowAnimTiles + $30 - db 1 - db BANK(SpinnerArrowAnimTiles) - dw $9310 - - dw Facility_GFX + $200 - db 1 - db BANK(Facility_GFX) - dw $9200 - - dw Facility_GFX + $210 - db 1 - db BANK(Facility_GFX) - dw $9210 - - dw Facility_GFX + $300 - db 1 - db BANK(Facility_GFX) - dw $9300 - - dw Facility_GFX + $310 - db 1 - db BANK(Facility_GFX) - dw $9310 - -SpinnerArrowTilePointers2: ; 45053 (11:5053) - dw SpinnerArrowAnimTiles + $10 - db 1 - db BANK(SpinnerArrowAnimTiles) - dw $93C0 - - dw SpinnerArrowAnimTiles + $30 - db 1 - db BANK(SpinnerArrowAnimTiles) - dw $93D0 - - dw SpinnerArrowAnimTiles - db 1 - db BANK(SpinnerArrowAnimTiles) - dw $94C0 - - dw SpinnerArrowAnimTiles + $20 - db 1 - db BANK(SpinnerArrowAnimTiles) - dw $94D0 - - dw Gym_GFX + $3C0 - db 1 - db BANK(Facility_GFX) - dw $93C0 - - dw Gym_GFX + $3D0 - db 1 - db BANK(Facility_GFX) - dw $93D0 - - dw Gym_GFX + $4C0 - db 1 - db BANK(Facility_GFX) - dw $94C0 - - dw Gym_GFX + $4D0 - db 1 - db BANK(Facility_GFX) - dw $94D0 +spinner: MACRO +; \1: source +; \2: offset (BANK() chokes on literals) +; \3: length +; \4: dest + dw \1 + \2 + db \3, BANK(\1) + dw \4 +ENDM + +FacilitySpinnerArrows: +FACILITY_SPINNER EQU $20 * $10 +vFacilitySpinner EQU vTileset + FACILITY_SPINNER + + spinner SpinnerArrowAnimTiles, $00, 1, vFacilitySpinner + spinner SpinnerArrowAnimTiles, $10, 1, vFacilitySpinner + $10 + spinner SpinnerArrowAnimTiles, $20, 1, vFacilitySpinner + $100 + spinner SpinnerArrowAnimTiles, $30, 1, vFacilitySpinner + $110 + spinner Facility_GFX, FACILITY_SPINNER + $000, 1, vFacilitySpinner + spinner Facility_GFX, FACILITY_SPINNER + $010, 1, vFacilitySpinner + $10 + spinner Facility_GFX, FACILITY_SPINNER + $100, 1, vFacilitySpinner + $100 + spinner Facility_GFX, FACILITY_SPINNER + $110, 1, vFacilitySpinner + $110 + +GymSpinnerArrows: +GYM_SPINNER EQU $3c * $10 +vGymSpinner EQU vTileset + GYM_SPINNER + + spinner SpinnerArrowAnimTiles, $10, 1, vGymSpinner + spinner SpinnerArrowAnimTiles, $30, 1, vGymSpinner + $10 + spinner SpinnerArrowAnimTiles, $00, 1, vGymSpinner + $100 + spinner SpinnerArrowAnimTiles, $20, 1, vGymSpinner + $110 + spinner Gym_GFX, GYM_SPINNER + $000, 1, vGymSpinner + spinner Gym_GFX, GYM_SPINNER + $010, 1, vGymSpinner + $10 + spinner Gym_GFX, GYM_SPINNER + $100, 1, vGymSpinner + $100 + spinner Gym_GFX, GYM_SPINNER + $110, 1, vGymSpinner + $110 SpinnerPlayerFacingDirections: ; 45083 (11:5083) ; This isn't the order of the facing directions. Rather, it's a list of diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index b094878c..215bf467 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -184,7 +184,7 @@ VermilionDock_1dc94: ; 1dc94 (7:5c94) ld bc, $00b4 ld a, $14 call FillMemory - ld hl, $9940 + ld hl, vBGMap0 + 10 * 32 ld de, wcc5b ld bc, $000c call CopyVideoData -- cgit v1.2.3 From 32de1b269468f48d073a8e6d52843877baff0ba4 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Sat, 31 May 2014 10:35:46 -0400 Subject: Relabel a few missed map scripts and TheEndTextString --- scripts/pokemontower6.asm | 4 ++-- scripts/route16.asm | 4 ++-- scripts/route16gate.asm | 6 +++--- scripts/route18gate.asm | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'scripts') diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index b7be3941..fe33ce29 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -7,7 +7,7 @@ PokemonTower6Script: ; 60aef (18:4aef) ld [W_POKEMONTOWER6CURSCRIPT], a ret -Func_60b02: ; 60b02 (18:4b02) +PokemonTower6Script_60b02: ; 60b02 (18:4b02) xor a ld [wJoyIgnore], a ld [W_POKEMONTOWER6CURSCRIPT], a @@ -48,7 +48,7 @@ CoordsData_60b45: ; 60b45 (18:4b45) PokemonTower6Script4: ; 60b48 (18:4b48) ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff - jp z, Func_60b02 + jp z, PokemonTower6Script_60b02 ld a, $ff ld [wJoyIgnore], a ld a, [wd72d] diff --git a/scripts/route16.asm b/scripts/route16.asm index 68474c3f..39c3f477 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -7,7 +7,7 @@ Route16Script: ; 59933 (16:5933) ld [W_ROUTE16CURSCRIPT], a ret -Func_59946: ; 59946 (16:5946) +Route16Script_59946: ; 59946 (16:5946) xor a ld [wJoyIgnore], a ld [W_ROUTE16CURSCRIPT], a @@ -47,7 +47,7 @@ Route16Script0: ; 59959 (16:5959) Route16Script3: ; 5998f (16:598f) ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff - jp z, Func_59946 + jp z, Route16Script_59946 call UpdateSprites ld a, [wcf0b] cp $2 diff --git a/scripts/route16gate.asm b/scripts/route16gate.asm index eb85ac22..e7179ea7 100755 --- a/scripts/route16gate.asm +++ b/scripts/route16gate.asm @@ -13,7 +13,7 @@ Route16GateScriptPointers: ; 496cf (12:56cf) dw Route16GateScript3 Route16GateScript0: ; 496d7 (12:56d7) - call Func_49755 + call Route16GateScript_49755 ret nz ld hl, CoordsData_49714 call ArePlayerCoordsInArray @@ -82,7 +82,7 @@ Route16GateScript3: ; 49741 (12:5741) ld [W_ROUTE16GATECURSCRIPT], a ret -Func_49755: ; 49755 (12:5755) +Route16GateScript_49755: ; 49755 (12:5755) ld b, BICYCLE jp IsItemInBag @@ -93,7 +93,7 @@ Route16GateTextPointers: ; 4975a (12:575a) Route16GateText1: ; 49760 (12:5760) db $08 ; asm - call Func_49755 + call Route16GateScript_49755 jr z, .asm_0bdf3 ; 0x49764 ld hl, Route16GateText_4977c call PrintText diff --git a/scripts/route18gate.asm b/scripts/route18gate.asm index bc64f8ca..03c4b921 100755 --- a/scripts/route18gate.asm +++ b/scripts/route18gate.asm @@ -13,7 +13,7 @@ Route18GateScriptPointers: ; 49887 (12:5887) dw Route18GateScript3 Route18GateScript0: ; 4988f (12:588f) - call Func_49755 + call Route16GateScript_49755 ret nz ld hl, CoordsData_498cc call ArePlayerCoordsInArray @@ -88,7 +88,7 @@ Route18GateTextPointers: ; 4990d (12:590d) Route18GateText1: ; 49911 (12:5911) db $08 ; asm - call Func_49755 + call Route16GateScript_49755 jr z, .asm_3c84d ; 0x49915 ld hl, Route18GateText_4992d call PrintText -- cgit v1.2.3 From b83acb03e50c4314e082e642bdb429346892d040 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 9 Jun 2014 16:58:02 -0400 Subject: Clean up white space --- scripts/route22.asm | 2 +- scripts/route5gate.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/route22.asm b/scripts/route22.asm index fa225415..f9f38e79 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -72,7 +72,7 @@ Route22Script0: ; 50f00 (14:4f00) jp nz, Route22Script_5104e ret -.Route22RivalBattleCoords +.Route22RivalBattleCoords db $04, $1D db $05, $1D db $FF diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index 1c3bd3c7..d7abeff5 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -59,7 +59,7 @@ Route5GateScript1: ; 1df94 (7:5f94) ld [wJoyIgnore], a ld [W_ROUTE5GATECURSCRIPT], a ret - + Route5GateTextPointers: ; 1dfa4 (7:5fa4) dw Route5GateText1 dw Route5GateText2 -- cgit v1.2.3 From 53ae0e93fad9f4c3eaef92f102b1eeb531e59d68 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 14 Jun 2014 04:12:40 -0700 Subject: Use monster struct macros in wram. Rename related labels for consistency. --- scripts/daycarem.asm | 20 ++++++++++---------- scripts/namerater.asm | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'scripts') diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index d2a07418..d2a70578 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -17,7 +17,7 @@ DayCareMText1: ; 56254 (15:6254) and a ld hl, DayCareMText_5643b jp nz, DayCareMScript_56409 - ld a, [W_NUMINPARTY] + ld a, [wPartyCount] dec a ld hl, DayCareMText_56445 jp z, DayCareMScript_56409 @@ -41,7 +41,7 @@ DayCareMText1: ; 56254 (15:6254) xor a ld [wcc2b], a ld a, [wWhichPokemon] - ld hl, W_PARTYMON1NAME + ld hl, wPartyMonNicks call GetPartyMonName ld hl, DayCareMText_56419 call PrintText @@ -71,7 +71,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) jr c, .asm_56315 ld d, $64 callab CalcExperience - ld hl, wda6d + ld hl, wDayCareMonExp ld a, [H_NUMTOPRINT] ld [hli], a ld a, [$ff97] @@ -83,7 +83,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) .asm_56315 xor a ld [wTrainerEngageDistance], a - ld hl, wda62 + ld hl, wDayCareMonBoxLevel ld a, [hl] ld [wTrainerSpriteOffset], a cp d @@ -99,7 +99,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) .asm_56333 call PrintText - ld a, [W_NUMINPARTY] + ld a, [wPartyCount] cp $6 ld hl, DayCareMText_56440 jp z, .asm_56403 @@ -168,14 +168,14 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld a, $2 ld [wcf95], a call Func_3a68 - ld a, [W_DAYCAREMONDATA] + ld a, [wDayCareMonSpecies] ld [wcf91], a - ld a, [W_NUMINPARTY] + ld a, [wPartyCount] dec a push af ld bc, $002c push bc - ld hl, W_PARTYMON1_MOVE1 + ld hl, wPartyMon1Moves call AddNTimes ld d, h ld e, l @@ -185,7 +185,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) call Predef pop bc pop af - ld hl, W_PARTYMON1_HP + ld hl, wPartyMon1HP call AddNTimes ld d, h ld e, l @@ -203,7 +203,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) .asm_56403 ld a, [wTrainerSpriteOffset] - ld [wda62], a + ld [wDayCareMonBoxLevel], a DayCareMScript_56409: ; 56409 (15:6409) call PrintText diff --git a/scripts/namerater.asm b/scripts/namerater.asm index 31bb5fcb..ca357ad1 100755 --- a/scripts/namerater.asm +++ b/scripts/namerater.asm @@ -9,15 +9,15 @@ NameRaterScript_1da15: ; 1da15 (7:5a15) ret NameRaterScript_1da20: ; 1da20 (7:5a20) - ld hl, W_PARTYMON1OT + ld hl, wPartyMonOT ld bc, $000b ld a, [wWhichPokemon] call AddNTimes - ld de, W_PLAYERNAME + ld de, wPlayerName ld c, $b call .asm_1da47 jr c, .asm_1da52 ; 0x1da34 $1c - ld hl, W_PARTYMON1_OTID + ld hl, wPartyMon1OTID ld bc, $002c ld a, [wWhichPokemon] call AddNTimes -- cgit v1.2.3 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. --- 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 +- 29 files changed, 48 insertions(+), 48 deletions(-) (limited to 'scripts') 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.2.3 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. --- scripts/celadongamecorner.asm | 2 +- scripts/daycarem.asm | 2 +- scripts/mtmoonpokecenter.asm | 2 +- scripts/museum1f.asm | 2 +- scripts/oakslab.asm | 4 ++-- scripts/safarizoneentrance.asm | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts') 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.2.3 From d10108a066c102bf2d167ac656d79308e41f304e Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 16 Jun 2014 13:25:46 -0700 Subject: Use macros to define predefs. --- scripts/redshouse1f.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm index 4bab98fe..0e3e331b 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/redshouse1f.asm @@ -27,7 +27,7 @@ MomHealPokemon: ; 4818a (12:418a) call PrintText call GBFadeOut2 call ReloadMapData - PREDEF HealPartyPredef + predef HealParty ld a, MUSIC_PKMN_HEALED ld [wc0ee], a call PlaySound ; play sound? -- cgit v1.2.3 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. --- 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 ++-- 73 files changed, 164 insertions(+), 328 deletions(-) (limited to 'scripts') 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.2.3 From bd533aa79bbe1998fd2b699bd7205da2de4fe55c Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Wed, 25 Jun 2014 16:58:27 -0400 Subject: Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses --- scripts/bikeshop.asm | 6 ++---- scripts/celadongamecorner.asm | 24 ++++++++---------------- scripts/celadonmartroof.asm | 3 +-- scripts/vermiliondock.asm | 3 +-- 4 files changed, 12 insertions(+), 24 deletions(-) (limited to 'scripts') diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index c30829e9..4bd26a7e 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -56,12 +56,10 @@ BikeShopText1: ; 1d745 (7:5745) ld c, $f call TextBoxBorder call UpdateSprites - FuncCoord 2, 2 - ld hl, Coord + hlCoord 2, 2 ld de, BikeShopMenuText call PlaceString - FuncCoord 8, 3 - ld hl, Coord + hlCoord 8, 3 ld de, BikeShopMenuPrice call PlaceString ld hl, BikeShopText_1d815 diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 2d638044..9746f54e 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -467,40 +467,32 @@ CeladonGameCornerText_48f19: ; 48f19 (12:4f19) CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) ld hl, wd730 set 6, [hl] - FuncCoord 11, 0 - ld hl, Coord + hlCoord 11, 0 ld b, $5 ld c, $7 call TextBoxBorder call UpdateSprites - FuncCoord 12, 1 - ld hl, Coord + hlCoord 12, 1 ld b, $4 ld c, $7 call ClearScreenArea - FuncCoord 12, 2 - ld hl, Coord + hlCoord 12, 2 ld de, GameCornerMoneyText call PlaceString - FuncCoord 12, 3 - ld hl, Coord + hlCoord 12, 3 ld de, GameCornerBlankText1 call PlaceString - FuncCoord 12, 3 - ld hl, Coord + hlCoord 12, 3 ld de, wPlayerMoney ld c, $a3 call PrintBCDNumber - FuncCoord 12, 4 - ld hl, Coord + hlCoord 12, 4 ld de, GameCornerCoinText call PlaceString - FuncCoord 12, 5 - ld hl, Coord + hlCoord 12, 5 ld de, GameCornerBlankText2 call PlaceString - FuncCoord 15, 5 - ld hl, Coord + hlCoord 15, 5 ld de, wPlayerCoins ld c, $82 call PrintBCDNumber diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index 02f2959d..37025525 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -200,8 +200,7 @@ CeladonMartRoofScript_48532: ; 48532 (12:4532) push hl ld [wd11e], a call GetItemName - FuncCoord 2, 2 - ld hl, Coord + hlCoord 2, 2 ld a, [$ffdb] ld bc, $28 call AddNTimes diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index 215bf467..03dc4377 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -53,8 +53,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) call DelayFrames ld b, $9c call CopyScreenTileBufferToVRAM - FuncCoord 0, 10 - ld hl, Coord + hlCoord 0, 10 ld bc, $0078 ld a, $14 call FillMemory -- cgit v1.2.3