summaryrefslogtreecommitdiff
path: root/scripts/cinnabargym.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-05-25 10:51:53 -0700
committeryenatch <yenatch@gmail.com>2014-05-25 10:53:09 -0700
commit031e33957dfaf9a5e29fb67aaf600ec809b8e35f (patch)
treeaded26de93eacbb34d4556bd1ea512a7e515c88b /scripts/cinnabargym.asm
parent1ee8de792ba5bf45290a4cb49b6bc3ee6aa539f3 (diff)
Rename joypad registers.
Diffstat (limited to 'scripts/cinnabargym.asm')
-rwxr-xr-xscripts/cinnabargym.asm8
1 files changed, 4 insertions, 4 deletions
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