diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /scripts/SilphCo6F.asm | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/SilphCo6F.asm')
| -rw-r--r-- | scripts/SilphCo6F.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/SilphCo6F.asm b/scripts/SilphCo6F.asm index ad8e83f4..0352f5b4 100644 --- a/scripts/SilphCo6F.asm +++ b/scripts/SilphCo6F.asm @@ -56,7 +56,7 @@ SilphCo6F_TextPointers: SilphCo6TrainerHeaders: def_trainers 6 SilphCo6TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_0, 2, SilphCo6FRocket1BattleText, SilphCo6Rocket1EndBattleText, SilphCo6Rocket1AfterBattleText + trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_0, 2, SilphCo6FRocket1BattleText, SilphCo6FRocket1EndBattleText, SilphCo6FRocket1AfterBattleText SilphCo6TrainerHeader1: trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_1, 3, SilphCo6FScientistBattleText, SilphCo6FScientistEndBattleText, SilphCo6FScientistAfterBattleText SilphCo6TrainerHeader2: @@ -158,12 +158,12 @@ SilphCo6FRocket1BattleText: text_far _SilphCo6FRocket1BattleText text_end -SilphCo6Rocket1EndBattleText: - text_far _SilphCo6Rocket1EndBattleText +SilphCo6FRocket1EndBattleText: + text_far _SilphCo6FRocket1EndBattleText text_end -SilphCo6Rocket1AfterBattleText: - text_far _SilphCo6Rocket1AfterBattleText +SilphCo6FRocket1AfterBattleText: + text_far _SilphCo6FRocket1AfterBattleText text_end SilphCo6FScientistText: |