diff options
Diffstat (limited to 'scripts/ViridianCity.asm')
| -rwxr-xr-x | scripts/ViridianCity.asm | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm index 6dc68d4f..d960b9cb 100755 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm @@ -33,11 +33,11 @@ ViridianCityScript_1905b: CheckEvent EVENT_VIRIDIAN_GYM_OPEN ret nz ld a, [wObtainedBadges] - cp %01111111 - jr nz, .gymClosed + cp $ff ^ (1 << BIT_EARTHBADGE) + jr nz, .gym_closed SetEvent EVENT_VIRIDIAN_GYM_OPEN ret -.gymClosed +.gym_closed ld a, [wYCoord] cp 8 ret nz @@ -45,7 +45,7 @@ ViridianCityScript_1905b: cp 32 ret nz ld a, $f - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call StartSimulatingJoypadStates ld a, $1 @@ -55,7 +55,7 @@ ViridianCityScript_1905b: xor a ld [wSpritePlayerStateData1FacingDirection], a ld [wJoyIgnore], a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $6 ld [wViridianCityCurScript], a ret @@ -77,10 +77,10 @@ ViridianCityScript_190ab: cp 19 ret nz ld a, $5 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a call ViridianCityScript_1914d ld a, $5 ld [wViridianCityCurScript], a @@ -106,14 +106,14 @@ ViridianCityScript_190db: ret ViridianCityScript_190ef: - ld a, [wSpriteStateData1 + 3 * $10 + 4] - ld [$ffeb], a - ld a, [wSpriteStateData1 + 3 * $10 + 6] - ld [$ffec], a - ld a, [wSpriteStateData2 + 3 * $10 + 4] - ld [$ffed], a - ld a, [wSpriteStateData2 + 3 * $10 + 5] - ld [$ffee], a + ld a, [wSprite03StateData1YPixels] + ldh [hSpriteScreenYCoord], a + ld a, [wSprite03StateData1XPixels] + ldh [hSpriteScreenXCoord], a + ld a, [wSprite03StateData2MapY] + ldh [hSpriteMapYCoord], a + ld a, [wSprite03StateData2MapX] + ldh [hSpriteMapXCoord], a ret ViridianCityScript4: @@ -124,7 +124,7 @@ ViridianCityScript4: xor a ld [wJoyIgnore], a ld a, $10 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wBattleType], a @@ -134,14 +134,14 @@ ViridianCityScript4: ret ViridianCityScript_1912a: - ld a, [$ffeb] - ld [wSpriteStateData1 + 3 * $10 + 4], a - ld a, [$ffec] - ld [wSpriteStateData1 + 3 * $10 + 6], a - ld a, [$ffed] - ld [wSpriteStateData2 + 3 * $10 + 4], a - ld a, [$ffee] - ld [wSpriteStateData2 + 3 * $10 + 5], a + ldh a, [hSpriteScreenYCoord] + ld [wSprite03StateData1YPixels], a + ldh a, [hSpriteScreenXCoord] + ld [wSprite03StateData1XPixels], a + ldh a, [hSpriteMapYCoord] + ld [wSprite03StateData2MapY], a + ldh a, [hSpriteMapXCoord] + ld [wSprite03StateData2MapX], a ret ViridianCityScript5: @@ -174,14 +174,14 @@ ViridianCityScript_19162: cp 19 ret nz ld a, $8 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a ld a, SPRITE_FACING_RIGHT - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $8 ld [wSpritePlayerStateData1FacingDirection], a ld a, $8 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, D_UP | D_DOWN | D_LEFT | D_RIGHT | START | SELECT ld [wJoyIgnore], a @@ -205,7 +205,7 @@ ViridianCityScript8: ld a, D_UP | D_DOWN | D_LEFT | D_RIGHT | START | SELECT ld [wJoyIgnore], a ld a, $8 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wBattleType], a @@ -220,11 +220,11 @@ ViridianCityScript9: ld a, [wXCoord] cp 19 jr z, .asm_191e4 - callab Func_f1a01 + callfar Func_f1a01 ld de, ViridianCityOldManMovementData1 .asm_191e4 ld a, $8 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call MoveSprite ld a, $a ld [wViridianCityCurScript], a @@ -273,46 +273,46 @@ ViridianCity_TextPointers: dw ViridianCityText_13 ViridianCityText_0: - TX_ASM - callba Func_f18bb + text_asm + farcall Func_f18bb jp TextScriptEnd ViridianCityText_1: - TX_ASM - callba Func_f18c7 + text_asm + farcall Func_f18c7 jp TextScriptEnd ViridianCityText_2: - TX_ASM - callba Func_f18e9 + text_asm + farcall Func_f18e9 jp TextScriptEnd ViridianCityText_3: - TX_ASM - callba Func_f1911 + text_asm + farcall Func_f1911 jp TextScriptEnd ViridianCityText_4: - TX_ASM - callba Func_f192c + text_asm + farcall Func_f192c jp TextScriptEnd ViridianCityText_5: - TX_ASM - callba Func_f194a + text_asm + farcall Func_f194a jp TextScriptEnd ViridianCityText_6: - TX_ASM - callba Func_f198e + text_asm + farcall Func_f198e jp TextScriptEnd ViridianCityText_13: - TX_FAR _ViridianCityText_19219 - db "@" + text_far _ViridianCityText_19219 + text_end ViridianCityText_7: - TX_ASM + text_asm CheckEvent EVENT_02D jr nz, .asm_192a6 ld hl, ViridianCityText_192af @@ -330,34 +330,34 @@ ViridianCityText_7: jp TextScriptEnd ViridianCityText_192af: - TX_FAR _ViridianCityText_1920a - db "@" + text_far _ViridianCityText_1920a + text_end ViridianCityText_192b4: - TX_FAR _OldManTextAfterBattle - db "@" + text_far _OldManTextAfterBattle + text_end ViridianCityText_8: - TX_ASM - callba Func_f19c5 + text_asm + farcall Func_f19c5 jp TextScriptEnd ViridianCityText_9: - TX_ASM - callba Func_f19d1 + text_asm + farcall Func_f19d1 jp TextScriptEnd ViridianCityText_10: - TX_ASM - callba Func_f19dd + text_asm + farcall Func_f19dd jp TextScriptEnd ViridianCityText_11: - TX_ASM - callba Func_f19e9 + text_asm + farcall Func_f19e9 jp TextScriptEnd ViridianCityText_12: - TX_ASM - callba Func_f19f5 + text_asm + farcall Func_f19f5 jp TextScriptEnd |