diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/SSAnneBow.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/SSAnneBow.asm')
| -rw-r--r-- | scripts/SSAnneBow.asm | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/scripts/SSAnneBow.asm b/scripts/SSAnneBow.asm index 80d98668..2e3b5e00 100644 --- a/scripts/SSAnneBow.asm +++ b/scripts/SSAnneBow.asm @@ -8,69 +8,71 @@ SSAnneBow_Script: ret SSAnneBow_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_SSANNEBOW_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SSANNEBOW_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_SSANNEBOW_END_BATTLE SSAnneBow_TextPointers: - dw SSAnne5Text1 - dw SSAnne5Text2 - dw SSAnne5Text3 - dw SSAnne5Text4 - dw SSAnne5Text5 + def_text_pointers + dw_const SSAnneBowSuperNerdText, TEXT_SSANNEBOW_SUPER_NERD + dw_const SSAnneBowSailor1Text, TEXT_SSANNEBOW_SAILOR1 + dw_const SSAnneBowCooltrainerMText, TEXT_SSANNEBOW_COOLTRAINER_M + dw_const SSAnneBowSailor2Text, TEXT_SSANNEBOW_SAILOR2 + dw_const SSAnneBowSailor3Text, TEXT_SSANNEBOW_SAILOR3 SSAnne5TrainerHeaders: def_trainers 4 SSAnne5TrainerHeader0: - trainer EVENT_BEAT_SS_ANNE_5_TRAINER_0, 3, SSAnne5BattleText1, SSAnne5EndBattleText1, SSAnne5AfterBattleText1 + trainer EVENT_BEAT_SS_ANNE_5_TRAINER_0, 3, SSAnneBowSailor2BattleText, SSAnneBowSailor2EndBattleText, SSAnneBowSailor2AfterBattleText SSAnne5TrainerHeader1: - trainer EVENT_BEAT_SS_ANNE_5_TRAINER_1, 3, SSAnne5BattleText2, SSAnne5EndBattleText2, SSAnne5AfterBattleText2 + trainer EVENT_BEAT_SS_ANNE_5_TRAINER_1, 3, SSAnneBowSailor3BattleText, SSAnneBowSailor3EndBattleText, SSAnneBowSailor3AfterBattleText db -1 ; end -SSAnne5Text1: - text_far _SSAnne5Text1 +SSAnneBowSuperNerdText: + text_far _SSAnneBowSuperNerdText text_end -SSAnne5Text2: - text_far _SSAnne5Text2 +SSAnneBowSailor1Text: + text_far _SSAnneBowSailor1Text text_end -SSAnne5Text3: - text_far _SSAnne5Text3 +SSAnneBowCooltrainerMText: + text_far _SSAnneBowCooltrainerMText text_end -SSAnne5Text4: +SSAnneBowSailor2Text: text_asm ld hl, SSAnne5TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SSAnne5BattleText1: - text_far _SSAnne5BattleText1 +SSAnneBowSailor2BattleText: + text_far _SSAnneBowSailor2BattleText text_end -SSAnne5EndBattleText1: - text_far _SSAnne5EndBattleText1 +SSAnneBowSailor2EndBattleText: + text_far _SSAnneBowSailor2EndBattleText text_end -SSAnne5AfterBattleText1: - text_far _SSAnne5AfterBattleText1 +SSAnneBowSailor2AfterBattleText: + text_far _SSAnneBowSailor2AfterBattleText text_end -SSAnne5Text5: +SSAnneBowSailor3Text: text_asm ld hl, SSAnne5TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SSAnne5BattleText2: - text_far _SSAnne5BattleText2 +SSAnneBowSailor3BattleText: + text_far _SSAnneBowSailor3BattleText text_end -SSAnne5EndBattleText2: - text_far _SSAnne5EndBattleText2 +SSAnneBowSailor3EndBattleText: + text_far _SSAnneBowSailor3EndBattleText text_end -SSAnne5AfterBattleText2: - text_far _SSAnne5AfterBattleText2 +SSAnneBowSailor3AfterBattleText: + text_far _SSAnneBowSailor3AfterBattleText text_end |