diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-26 18:11:55 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-26 19:22:27 -0500 |
| commit | 2bd45ca574aab251b91c24837b102c9c2a5e76a0 (patch) | |
| tree | bd8c568b9e43f7467ff4822080c6228c29bca2b9 /maps/Route34.asm | |
| parent | f485a45cda5f84e6909997147b1e6c9a9a538d9b (diff) | |
Move effects; no more reloadmapmusic, returnafterbattle
Diffstat (limited to 'maps/Route34.asm')
| -rw-r--r-- | maps/Route34.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/Route34.asm b/maps/Route34.asm index c5c1aee86..d17dea61c 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -145,7 +145,7 @@ TrainerCamperTodd1: .LoadFight0 loadtrainer CAMPER, TODD1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wToddFightCount, 1 clearflag ENGINE_TODD end @@ -153,7 +153,7 @@ TrainerCamperTodd1: .LoadFight1 loadtrainer CAMPER, TODD2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wToddFightCount, 2 clearflag ENGINE_TODD end @@ -161,7 +161,7 @@ TrainerCamperTodd1: .LoadFight2 loadtrainer CAMPER, TODD3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wToddFightCount, 3 clearflag ENGINE_TODD end @@ -169,7 +169,7 @@ TrainerCamperTodd1: .LoadFight3 loadtrainer CAMPER, TODD4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wToddFightCount, 4 clearflag ENGINE_TODD end @@ -177,7 +177,7 @@ TrainerCamperTodd1: .LoadFight4 loadtrainer CAMPER, TODD5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_TODD end @@ -270,7 +270,7 @@ TrainerPicnickerGina1: .LoadFight0 loadtrainer PICNICKER, GINA1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wGinaFightCount, 1 clearflag ENGINE_GINA end @@ -278,7 +278,7 @@ TrainerPicnickerGina1: .LoadFight1 loadtrainer PICNICKER, GINA2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wGinaFightCount, 2 clearflag ENGINE_GINA end @@ -286,7 +286,7 @@ TrainerPicnickerGina1: .LoadFight2 loadtrainer PICNICKER, GINA3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wGinaFightCount, 3 clearflag ENGINE_GINA end @@ -294,7 +294,7 @@ TrainerPicnickerGina1: .LoadFight3 loadtrainer PICNICKER, GINA4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wGinaFightCount, 4 clearflag ENGINE_GINA end @@ -302,7 +302,7 @@ TrainerPicnickerGina1: .LoadFight4 loadtrainer PICNICKER, GINA5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_GINA end @@ -367,7 +367,7 @@ OfficerKeithScript: winlosstext OfficerKeithWinText, 0 loadtrainer OFFICER, KEITH startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_OFFICER_KEITH closetext end |