diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /scripts/ceruleancity.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/ceruleancity.asm')
| -rwxr-xr-x | scripts/ceruleancity.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 158a683d..1e8349bc 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -1,13 +1,13 @@ CeruleanCityScript: ; 19480 (6:5480) call EnableAutoTextBoxDrawing ld hl, CeruleanCityScriptPointers - ld a, [W_CERULEANCITYCURSCRIPT] + ld a, [wCeruleanCityCurScript] jp CallFunctionInTable CeruleanCityScript_1948c: ; 1948c (6:548c) xor a ld [wJoyIgnore], a - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ld a, HS_CERULEAN_RIVAL ld [wMissableObjectIndex], a predef_jump HideObject @@ -20,7 +20,7 @@ CeruleanCityScriptPointers: ; 1949d (6:549d) dw CeruleanCityScript4 CeruleanCityScript4: ; 194a7 (6:54a7) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeruleanCityScript_1948c ld a, $f0 @@ -31,7 +31,7 @@ CeruleanCityScript4: ; 194a7 (6:54a7) call DisplayTextID xor a ld [wJoyIgnore], a - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityScript0: ; 194c8 (6:54c8) @@ -65,7 +65,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) and a jr z, .asm_19512 ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound .asm_19512 ld c, BANK(Music_MeetRival) @@ -75,7 +75,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a - ld a, [W_XCOORD] + ld a, [wXCoord] cp $14 jr z, .asm_19535 ld a, $1 @@ -93,7 +93,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld [H_SPRITEINDEX], a call MoveSprite ld a, $1 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityCoords1: ; 1954f (6:554f) @@ -134,11 +134,11 @@ CeruleanCityScript1: ; 19567 (6:5567) ld hl, CeruleanCityText_1966d ld de, CeruleanCityText_19672 call SaveEndBattleTextPointers - ld a, SONY1 + $c8 - ld [W_CUROPPONENT], a + ld a, OPP_SONY1 + ld [wCurOpponent], a ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] cp STARTER2 jr nz, .NotSquirtle ld a, $7 @@ -151,17 +151,17 @@ CeruleanCityScript1: ; 19567 (6:5567) .Charmander ld a, $9 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a xor a ld [hJoyHeld], a call CeruleanCityScript_1955d ld a, $2 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityScript2: ; 195b1 (6:55b1) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeruleanCityScript_1948c call CeruleanCityScript_1955d @@ -172,13 +172,13 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff - ld [wc0ee], a + ld [wNewSoundID], a call PlaySound callba Music_RivalAlternateStart ld a, $1 ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF - ld a, [W_XCOORD] + ld a, [wXCoord] cp $14 jr nz, .asm_195f0 ld de, CeruleanCityMovement4 @@ -190,7 +190,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld [H_SPRITEINDEX], a call MoveSprite ld a, $3 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityMovement3: ; 19600 (6:5600) @@ -224,7 +224,7 @@ CeruleanCityScript3: ; 19610 (6:5610) ld [wJoyIgnore], a call PlayDefaultMusic ld a, $0 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityTextPointers: ; 1962d (6:562d) @@ -294,7 +294,7 @@ CeruleanCityText2: ; 1967c (6:567c) call EngageMapTrainer call InitBattleEnemyParameters ld a, $4 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a jp TextScriptEnd .asm_4ca20 ld hl, CeruleanCityText_196f3 |