diff options
Diffstat (limited to 'scripts')
56 files changed, 196 insertions, 196 deletions
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 |