diff options
| author | Rangi42 <remy.oukaour+rangi42@gmail.com> | 2023-11-18 19:44:03 -0500 |
|---|---|---|
| committer | Rangi42 <remy.oukaour+rangi42@gmail.com> | 2023-11-18 19:44:03 -0500 |
| commit | 26a342b104e48bede16b9e2324c2f8f57df5bd50 (patch) | |
| tree | 47dc8ca18fa2bbc8aee0f52c99d710d50ef45bd6 /scripts/FightingDojo.asm | |
| parent | .calculateHPBarCoords incorrectly referenced OAM (diff) | |
| download | pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.tar.gz pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.tar.xz pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.zip | |
Identify more map script labels
Diffstat (limited to 'scripts/FightingDojo.asm')
| -rw-r--r-- | scripts/FightingDojo.asm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index fb9847d1..298c2fcb 100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -7,7 +7,7 @@ FightingDojo_Script: ld [wFightingDojoCurScript], a ret -FightingDojoScript_5cd70: +FightingDojoResetScripts: xor a ; SCRIPT_FIGHTINGDOJO_DEFAULT ld [wJoyIgnore], a ld [wFightingDojoCurScript], a @@ -56,10 +56,10 @@ FightingDojoDefaultScript: FightingDojoKarateMasterPostBattleScript: ld a, [wIsInBattle] cp $ff - jp z, FightingDojoScript_5cd70 + jp z, FightingDojoResetScripts ld a, [wcf0d] and a - jr z, .asm_5cde4 + jr z, .already_facing ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a ld a, FIGHTINGDOJO_KARATE_MASTER @@ -67,8 +67,7 @@ FightingDojoKarateMasterPostBattleScript: ld a, SPRITE_FACING_LEFT ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - -.asm_5cde4 +.already_facing ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 |