diff options
| author | dannye <33dannye@gmail.com> | 2024-09-25 00:45:00 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-09-25 00:45:00 -0500 |
| commit | a02a98ee7ada1a658e28698484058be2796dc0df (patch) | |
| tree | 945986054565bd8b5212fc755415096050d1d3a8 /scripts/ViridianCity.asm | |
| parent | Use long option flags for rgbgfx, same as tools/gfx (diff) | |
| parent | Use `const_skip` (diff) | |
| download | pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.gz pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.xz pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/ViridianCity.asm')
| -rw-r--r-- | scripts/ViridianCity.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm index 0219fc91..9ffe0950 100644 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm @@ -46,7 +46,7 @@ ViridianCityCheckGymOpenScript: cp 32 ret nz ld a, TEXT_VIRIDIANCITY_GYM_LOCKED - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID call StartSimulatingJoypadStates ld a, $1 @@ -78,7 +78,7 @@ ViridianCityCheckSleepingOldMan: cp 19 ret nz ld a, TEXT_VIRIDIANCITY_OLD_MAN_SLEEPY - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID xor a ldh [hJoyHeld], a @@ -101,7 +101,7 @@ ViridianCityOldManStartCatchTrainingScript: ld a, BATTLE_TYPE_OLD_MAN ld [wBattleType], a ld a, 5 - ld [wCurEnemyLVL], a + ld [wCurEnemyLevel], a ld a, RATTATA ld [wCurOpponent], a ret @@ -125,7 +125,7 @@ ViridianCityOldManEndCatchTrainingScript: xor a ld [wJoyIgnore], a ld a, TEXT_VIRIDIANCITY_OLD_MAN_YOU_NEED_TO_WEAKEN_THE_TARGET - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID xor a ld [wBattleType], a @@ -175,14 +175,14 @@ ViridianCityCheckWaitingOldMan: cp 19 ret nz ld a, VIRIDIANCITY_OLD_MAN2 - ldh [hSpriteIndexOrTextID], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_RIGHT ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, SPRITE_FACING_LEFT ld [wSpritePlayerStateData1FacingDirection], a ld a, TEXT_VIRIDIANCITY_OLD_MAN2 - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID ld a, D_UP | D_DOWN | D_LEFT | D_RIGHT | START | SELECT ld [wJoyIgnore], a @@ -206,7 +206,7 @@ ViridianCityOldManEndInitialCatchTrainingScript: ld a, D_UP | D_DOWN | D_LEFT | D_RIGHT | START | SELECT ld [wJoyIgnore], a ld a, TEXT_VIRIDIANCITY_OLD_MAN2 - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID xor a ld [wBattleType], a @@ -225,7 +225,7 @@ ViridianCityPostInitialCatchTraining: ld de, ViridianCityOldManMovementData1 .move_old_man ld a, VIRIDIANCITY_OLD_MAN2 - ldh [hSpriteIndexOrTextID], a + ldh [hSpriteIndex], a call MoveSprite ld a, SCRIPT_VIRIDIANCITY_OLD_MAN_MOVING_DOWN ld [wViridianCityCurScript], a @@ -243,8 +243,8 @@ ViridianCityOldManMovementData2: db $ff ViridianCityOldManMovingDownScript: - ld a, [wd730] - bit 0, a + ld a, [wStatusFlags5] + bit BIT_SCRIPTED_NPC_MOVEMENT, a ret nz ld a, HS_OLD_MAN_2 ld [wMissableObjectIndex], a |