diff options
Diffstat (limited to 'scripts/ceruleancity.asm')
| -rwxr-xr-x | scripts/ceruleancity.asm | 73 |
1 files changed, 35 insertions, 38 deletions
diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 61157bbb..419dbd8c 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -6,12 +6,11 @@ CeruleanCityScript: ; 19480 (6:5480) CeruleanCityScript_1948c: ; 1948c (6:548c) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_CERULEANCITYCURSCRIPT], a ld a, $5 - ld [$cc4d], a - ld a, $11 - jp Predef + ld [wcc4d], a + predef_jump HideObject CeruleanCityScriptPointers: ; 1949d (6:549d) dw CeruleanCityScript0 @@ -25,25 +24,25 @@ CeruleanCityScript4: ; 194a7 (6:54a7) cp $ff jp z, CeruleanCityScript_1948c ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a - ld hl, $d75b + ld [wJoyIgnore], a + ld hl, wd75b set 7, [hl] ld a, $2 ld [$ff8c], a call DisplayTextID xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_CERULEANCITYCURSCRIPT], a ret CeruleanCityScript0: ; 194c8 (6:54c8) - ld a, [$d75b] + ld a, [wd75b] bit 7, a jr nz, .asm_194f7 ; 0x194cd $28 ld hl, CeruleanCityCoords1 call ArePlayerCoordsInArray jr nc, .asm_194f7 ; 0x194d5 $20 - ld a, [$cd3d] + ld a, [wWhichTrade] cp $1 ld a, $8 ld b, $0 @@ -51,34 +50,34 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld a, $4 ld b, $4 .asm_194e6 - ld [$d528], a + ld [wd528], a ld a, b - ld [$c129], a + ld [wSpriteStateData1 + $29], a call Delay3 ld a, $2 ld [$ff8c], a jp DisplayTextID .asm_194f7 - ld a, [$d75a] + ld a, [wd75a] bit 0, a ret nz ld hl, CeruleanCityCoords2 call ArePlayerCoordsInArray ret nc - ld a, [$d700] + ld a, [wd700] and a jr z, .asm_19512 ; 0x19508 $8 ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound .asm_19512 ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, [W_XCOORD] cp $14 jr z, .asm_19535 ; 0x19526 $d @@ -90,9 +89,8 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld [hl], $19 .asm_19535 ld a, $5 - ld [$cc4d], a - ld a, $15 - call Predef + ld [wcc4d], a + predef ShowObject ld de, CeruleanCityMovement1 ld a, $1 ld [$ff8c], a @@ -122,15 +120,15 @@ CeruleanCityScript_1955d: ; 1955d (6:555d) jp Func_34a6 ; face object CeruleanCityScript1: ; 19567 (6:5567) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $1 ld [$ff8c], a call DisplayTextID - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, CeruleanCityText_1966d @@ -156,26 +154,26 @@ CeruleanCityScript1: ; 19567 (6:5567) ld [W_TRAINERNO], a xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a call CeruleanCityScript_1955d ld a, $2 ld [W_CERULEANCITYCURSCRIPT], a ret CeruleanCityScript2: ; 195b1 (6:55b1) - ld a, [$d057] + ld a, [W_ISINBATTLE] cp $ff jp z, CeruleanCityScript_1948c call CeruleanCityScript_1955d ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a - ld hl, $d75a + ld [wJoyIgnore], a + ld hl, wd75a set 0, [hl] ld a, $1 ld [$ff8c], a call DisplayTextID ld a, $ff - ld [$c0ee], a + ld [wc0ee], a call PlaySound callba Music_RivalAlternateStart ld a, $1 @@ -203,15 +201,14 @@ CeruleanCityMovement4: ; 19608 (6:5608) db $c0,$00,$00,$00,$00,$00,$00,$FF CeruleanCityScript3: ; 19610 (6:5610) - ld a, [$d730] + ld a, [wd730] bit 0, a ret nz ld a, $5 - ld [$cc4d], a - ld a, $11 - call Predef + ld [wcc4d], a + predef HideObject xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a call Func_2307 ld a, $0 ld [W_CERULEANCITYCURSCRIPT], a @@ -238,7 +235,7 @@ CeruleanCityTextPointers: ; 1962d (6:562d) CeruleanCityText1: ; 1964f (6:564f) db $08 ; asm - ld a, [$d75a] ; rival battle flag + ld a, [wd75a] ; rival battle flag bit 0, a ; do pre-battle text jr z, .PreBattleText @@ -270,19 +267,19 @@ CeruleanCityText_19677: ; 19677 (6:5677) CeruleanCityText2: ; 1967c (6:567c) db $8 - ld a, [$d75b] + ld a, [wd75b] bit 7, a jr nz, .asm_4ca20 ; 0x19682 $29 ld hl, CeruleanCityText_196d9 call PrintText - ld hl, $d72d + ld hl, wd72d set 6, [hl] set 7, [hl] ld hl, CeruleanCityText_196ee ld de, CeruleanCityText_196ee call PreBattleSaveRegisters ld a, [$ff8c] - ld [$cf13], a + ld [wcf13], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $4 @@ -291,7 +288,7 @@ CeruleanCityText2: ; 1967c (6:567c) .asm_4ca20 ; 0x196ad ld hl, CeruleanCityText_196f3 call PrintText - ld bc, $e401 + ld bc, (TM_28 << 8) + 1 call GiveItem jr c, .Success ld hl, TM28NoRoomText @@ -299,7 +296,7 @@ CeruleanCityText2: ; 1967c (6:567c) jr .Done .Success ld a, $1 - ld [$cc3c], a + ld [wcc3c], a ld hl, ReceivedTM28Text call PrintText callba Func_74872 |