diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ceruleancity.asm | 2 | ||||
| -rwxr-xr-x | scripts/gary.asm | 2 | ||||
| -rwxr-xr-x | scripts/oakslab.asm | 2 | ||||
| -rwxr-xr-x | scripts/pokemontower2.asm | 2 | ||||
| -rwxr-xr-x | scripts/route22.asm | 2 | ||||
| -rwxr-xr-x | scripts/silphco7.asm | 2 | ||||
| -rwxr-xr-x | scripts/ssanne2.asm | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 58c67e9d..55254adc 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -151,7 +151,7 @@ CeruleanCityScript1: ; 19567 (6:5567) .Charmander ld a, $9 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a xor a ld [hJoyHeld], a diff --git a/scripts/gary.asm b/scripts/gary.asm index 197ed93b..685e18fe 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -81,7 +81,7 @@ GaryScript2: ; 75f6a (1d:5f6a) .Charmander ld a, $3 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a xor a ld [hJoyHeld], a diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index d6494078..be254970 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -396,7 +396,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9) .Charmander ld a, $3 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a ld a, $1 ld [wSpriteIndex], a call GetSpritePosition1 diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index 078c0147..d498f88e 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -159,7 +159,7 @@ PokemonTower2Text1: ; 605df (18:45df) .Charmander ld a, $6 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a ld a, $1 ld [W_POKEMONTOWER2CURSCRIPT], a diff --git a/scripts/route22.asm b/scripts/route22.asm index ff506793..5c3d2b21 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -32,7 +32,7 @@ Route22Script_50ed6: ; 50ed6 (14:4ed6) jr .asm_50eda .asm_50ee1 ld a, [hl] - ld [W_TRAINERNO], a + ld [wTrainerNo], a ret Route22MoveRivalSprite: ; 50ee6 (14:4ee6) diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index d535c04b..0735d437 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -198,7 +198,7 @@ SilphCo7Script3: ; 51c82 (14:5c82) .asm_51cbe ld a, $9 .asm_51cc0 - ld [W_TRAINERNO], a + ld [wTrainerNo], a ld a, $4 jp SilphCo7Text_51c10 diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index 52b9792c..eea27ec9 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -114,7 +114,7 @@ SSAnne2Script1: ; 61430 (18:5430) .Charmander ld a, $3 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a call SSAnne2Script_61416 ld a, $2 |