diff options
| author | Sylvie <35663410+Rangi42@users.noreply.github.com> | 2024-09-18 21:01:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-18 21:01:18 -0400 |
| commit | 613d34678b7e9da1a467ec48fff23bfa75209871 (patch) | |
| tree | c21669899a90df25aaac9b4b4d213ac525d6f277 /scripts/FightingDojo.asm | |
| parent | Use correct label in get_trainer_name.asm (#461) (diff) | |
| download | pokeyellow-613d34678b7e9da1a467ec48fff23bfa75209871.tar.gz pokeyellow-613d34678b7e9da1a467ec48fff23bfa75209871.tar.xz pokeyellow-613d34678b7e9da1a467ec48fff23bfa75209871.zip | |
Split `hSpriteIndexOrTextID` into `hSpriteIndex` and `hTextID` (#462)
Also identify `wPPUpCountAndMaxPP`
Diffstat (limited to 'scripts/FightingDojo.asm')
| -rw-r--r-- | scripts/FightingDojo.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index 4522b906..bffa4554 100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -49,7 +49,7 @@ FightingDojoDefaultScript: ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, TEXT_FIGHTINGDOJO_KARATE_MASTER - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID ret @@ -72,7 +72,7 @@ FightingDojoKarateMasterPostBattleScript: ld [wJoyIgnore], a SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 ld a, TEXT_FIGHTINGDOJO_KARATE_MASTER_I_WILL_GIVE_YOU_A_POKEMON - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID xor a ; SCRIPT_FIGHTINGDOJO_DEFAULT ld [wJoyIgnore], a @@ -117,7 +117,7 @@ FightingDojoKarateMasterText: ld hl, .DefeatedText ld de, .DefeatedText call SaveEndBattleTextPointers - ldh a, [hSpriteIndexOrTextID] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters |