diff options
author | dannye <corrnondacqb@yahoo.com> | 2015-08-30 21:38:41 -0500 |
---|---|---|
committer | dannye <corrnondacqb@yahoo.com> | 2015-08-30 21:38:41 -0500 |
commit | 38065a744de1065cc021a4cafe22476f8425448d (patch) | |
tree | a37a103d7c22f3cc5f62689e5062877961493caa /scripts/pewtergym.asm | |
parent | 1ee9fb408c47c3a15a38b1bb407d86ed1a5d2fcc (diff) |
No more W_
Diffstat (limited to 'scripts/pewtergym.asm')
-rwxr-xr-x | scripts/pewtergym.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 831403bb..58a74cd2 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -6,9 +6,9 @@ PewterGymScript: ; 5c387 (17:4387) call EnableAutoTextBoxDrawing ld hl, PewterGymTrainerHeaders ld de, PewterGymScriptPointers - ld a, [W_PEWTERGYMCURSCRIPT] + ld a, [wPewterGymCurScript] call ExecuteCurMapScriptInTable - ld [W_PEWTERGYMCURSCRIPT], a + ld [wPewterGymCurScript], a ret PewterGymScript_5c3a4: ; 5c3a4 (17:43a4) @@ -25,8 +25,8 @@ Gym1LeaderName: ; 5c3b9 (17:43b9) PewterGymScript_5c3bf: ; 5c3bf (17:43bf) xor a ld [wJoyIgnore], a - ld [W_PEWTERGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPewterGymCurScript], a + ld [wCurMapScript], a ret PewterGymScriptPointers: ; 5c3ca (17:43ca) @@ -36,7 +36,7 @@ PewterGymScriptPointers: ; 5c3ca (17:43ca) dw PewterGymScript3 PewterGymScript3: ; 5c3d2 (17:43d2) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, PewterGymScript_5c3bf ld a, $f0 @@ -60,7 +60,7 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5c408 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 0, [hl] ld hl, wBeatGymFlags set 0, [hl] @@ -126,12 +126,12 @@ PewterGymText1: ; 5c44e (17:444e) call EngageMapTrainer call InitBattleEnemyParameters ld a, $1 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a xor a ld [hJoyHeld], a ld a, $3 - ld [W_PEWTERGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPewterGymCurScript], a + ld [wCurMapScript], a .asm_5c49b jp TextScriptEnd |