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/vermilioncity.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/vermilioncity.asm')
| -rwxr-xr-x | scripts/vermilioncity.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index de721a2f..d1516b6a 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -1,6 +1,6 @@ VermilionCityScript: ; 197a1 (6:57a1) call EnableAutoTextBoxDrawing - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] push hl @@ -10,7 +10,7 @@ VermilionCityScript: ; 197a1 (6:57a1) res 5, [hl] call nz, VermilionCityScript_197c0 ld hl, VermilionCityScriptPointers - ld a, [W_VERMILIONCITYCURSCRIPT] + ld a, [wVermilionCityCurScript] jp CallFunctionInTable VermilionCityScript_197c0: ; 197c0 (6:57c0) @@ -27,7 +27,7 @@ VermilionCityScript_197cb: ; 197cb (6:57cb) SetEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT ret nz ld a, $2 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScriptPointers: ; 197dc (6:57dc) @@ -52,8 +52,8 @@ VermilionCityScript0: ; 197e6 (6:57e6) call DisplayTextID CheckEvent EVENT_SS_ANNE_LEFT jr nz, .asm_19810 - ld b, S_S__TICKET - predef IsItemInBag_ + ld b, S_S_TICKET + predef GetQuantityOfItemInBag ld a, b and a ret nz @@ -64,7 +64,7 @@ VermilionCityScript0: ; 197e6 (6:57e6) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret CoordsData_19823: ; 19823 (6:5823) @@ -76,7 +76,7 @@ VermilionCityScript4: ; 19826 (6:5826) call ArePlayerCoordsInArray ret c ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript2: ; 19833 (6:5833) @@ -89,7 +89,7 @@ VermilionCityScript2: ; 19833 (6:5833) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript3: ; 1984e (6:584e) @@ -100,7 +100,7 @@ VermilionCityScript3: ; 1984e (6:584e) ld [wJoyIgnore], a ld [hJoyHeld], a ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript1: ; 1985f (6:585f) @@ -110,7 +110,7 @@ VermilionCityScript1: ; 1985f (6:585f) ld c, 10 call DelayFrames ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityTextPointers: ; 1986f (6:586f) @@ -170,8 +170,8 @@ VermilionCityText3: ; 198b1 (6:58b1) .asm_198d0 ld hl, SSAnneWelcomeText9 call PrintText - ld b, S_S__TICKET - predef IsItemInBag_ + ld b, S_S_TICKET + predef GetQuantityOfItemInBag ld a, b and a jr nz, .asm_198e9 @@ -182,7 +182,7 @@ VermilionCityText3: ; 198b1 (6:58b1) ld hl, SSAnneFlashedTicketText call PrintText ld a, $4 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a jr .asm_198fc .asm_198f6 ld hl, SSAnneNotHereText |