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 | |
| parent | f485a45cda5f84e6909997147b1e6c9a9a538d9b (diff) | |
Move effects; no more reloadmapmusic, returnafterbattle
Diffstat (limited to 'maps')
65 files changed, 233 insertions, 234 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index b7cb3e67e..7714c0e02 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -25,7 +25,7 @@ BugsyScript: winlosstext BugsyText_ResearchIncomplete, 0 loadtrainer BUGSY, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_BUGSY opentext writetext Text_ReceivedHiveBadge diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 41a73eb53..5921b1f0e 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -74,8 +74,8 @@ AzaleaTownRivalBattleScript: setlasttalked AZALEATOWN_SILVER loadtrainer RIVAL1, RIVAL1_6 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump .AfterBattle .Totodile: @@ -83,8 +83,8 @@ AzaleaTownRivalBattleScript: setlasttalked AZALEATOWN_SILVER loadtrainer RIVAL1, RIVAL1_4 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump .AfterBattle .Chikorita: @@ -92,8 +92,8 @@ AzaleaTownRivalBattleScript: setlasttalked AZALEATOWN_SILVER loadtrainer RIVAL1, RIVAL1_5 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump .AfterBattle .AfterBattle: diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index d347a5c50..f51805859 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -43,7 +43,7 @@ BlackthornGymClairScript: winlosstext ClairWinText, 0 loadtrainer CLAIR, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_CLAIR opentext writetext ClairText_GoToDragonsDen diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index d7e487869..6fe8772ff 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -58,7 +58,7 @@ BrunoScript_0x1809c5: winlosstext UnknownText_0x180b23, 0 loadtrainer BRUNO, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_BRUNO opentext writetext UnknownText_0x180b3c diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index fa8b112da..3adb8f2de 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -75,8 +75,8 @@ BurnedTowerRivalBattleScript: setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_9 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump .returnfrombattle .totodile: @@ -84,8 +84,8 @@ BurnedTowerRivalBattleScript: setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_7 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump .returnfrombattle .chikorita: @@ -93,8 +93,8 @@ BurnedTowerRivalBattleScript: setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_8 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump .returnfrombattle .returnfrombattle: diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 9724442e6..8bedbffc4 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -24,7 +24,7 @@ ErikaScript_0x72a6a: winlosstext UnknownText_0x72c3e, 0 loadtrainer ERIKA, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ERIKA setevent EVENT_BEAT_LASS_MICHELLE setevent EVENT_BEAT_PICNICKER_TANYA diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 005880d2b..a5d826eba 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -71,7 +71,7 @@ MistyScript_0x188432: winlosstext UnknownText_0x18870c, 0 loadtrainer MISTY, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_MISTY setevent EVENT_BEAT_SWIMMERF_DIANA setevent EVENT_BEAT_SWIMMERF_BRIANA diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index c7beadb17..e3dc14c0a 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -128,7 +128,7 @@ CherrygroveSilverTriggerNorth: loadtrainer RIVAL1, RIVAL1_3 writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle - reloadmapmusic + dontrestartmapmusic reloadmap iftrue .AfterVictorious jump .AfterYourDefeat @@ -139,7 +139,7 @@ CherrygroveSilverTriggerNorth: loadtrainer RIVAL1, RIVAL1_1 writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle - reloadmapmusic + dontrestartmapmusic reloadmap iftrue .AfterVictorious jump .AfterYourDefeat @@ -150,7 +150,7 @@ CherrygroveSilverTriggerNorth: loadtrainer RIVAL1, RIVAL1_2 writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle - reloadmapmusic + dontrestartmapmusic reloadmap iftrue .AfterVictorious jump .AfterYourDefeat diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 70d44054d..c05109db4 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -70,8 +70,8 @@ UnknownScript_0x1a001e: setlasttalked CIANWOODCITY_EUSINE loadtrainer MYSTICALMAN, EUSINE startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle playmusic MUSIC_MYSTICALMAN_ENCOUNTER opentext writetext UnknownText_0x1a05c3 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index e8167cc9a..3d0a87751 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -42,7 +42,7 @@ ChuckScript_0x9d60f: winlosstext UnknownText_0x9d7f6, 0 loadtrainer CHUCK, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_CHUCK opentext writetext UnknownText_0x9d835 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index e31f9077b..43193217c 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -36,7 +36,7 @@ MortyScript_0x99d58: winlosstext UnknownText_0x9a00a, 0 loadtrainer MORTY, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_MORTY opentext writetext UnknownText_0x9a043 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index f7319f427..48a5d2684 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -25,7 +25,7 @@ JanineScript_0x195db9: winlosstext UnknownText_0x195fa1, 0 loadtrainer JANINE, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_JANINE setevent EVENT_BEAT_LASS_ALICE setevent EVENT_BEAT_LASS_LINDA @@ -78,13 +78,13 @@ UnknownScript_0x195e2c: loadtrainer LASS, ALICE startbattle iftrue UnknownScript_0x195e4a - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_LASS_ALICE end UnknownScript_0x195e4a: variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_JANINE - returnafterbattle + reloadmapafterbattle end UnknownScript_0x195e4f: @@ -112,13 +112,13 @@ UnknownScript_0x195e66: loadtrainer LASS, LINDA startbattle iftrue UnknownScript_0x195e84 - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_LASS_LINDA end UnknownScript_0x195e84: variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_JANINE - returnafterbattle + reloadmapafterbattle end UnknownScript_0x195e89: @@ -146,13 +146,13 @@ UnknownScript_0x195ea0: loadtrainer PICNICKER, CINDY startbattle iftrue UnknownScript_0x195ebe - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_PICNICKER_CINDY end UnknownScript_0x195ebe: variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_JANINE - returnafterbattle + reloadmapafterbattle end UnknownScript_0x195ec3: @@ -180,13 +180,13 @@ UnknownScript_0x195eda: loadtrainer CAMPER, BARRY startbattle iftrue UnknownScript_0x195ef8 - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_CAMPER_BARRY end UnknownScript_0x195ef8: variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_JANINE - returnafterbattle + reloadmapafterbattle end UnknownScript_0x195efd: diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 7441bdc9c..5704b54a9 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -34,7 +34,7 @@ WhitneyScript_0x5400c: winlosstext UnknownText_0x541a5, 0 loadtrainer WHITNEY, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_WHITNEY setevent EVENT_MADE_WHITNEY_CRY dotrigger $1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index fd8623a18..5e6ad9f2e 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -473,7 +473,7 @@ MapIlexForestSignpost4Script: special Special_CelebiShrineEvent loadwildmon CELEBI, 30 startbattle - returnafterbattle + reloadmapafterbattle pause 20 special CheckCaughtCelebi iffalse .DidntCatchCelebi diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index fccd88346..620008472 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -103,8 +103,8 @@ UnknownScript_0x1800ce: setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 6 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump UnknownScript_0x180113 UnknownScript_0x1800f3: @@ -112,8 +112,8 @@ UnknownScript_0x1800f3: setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 4 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump UnknownScript_0x180113 UnknownScript_0x180103: @@ -121,8 +121,8 @@ UnknownScript_0x180103: setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 5 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump UnknownScript_0x180113 UnknownScript_0x180113: diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index eb92f779a..035346da9 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -58,7 +58,7 @@ KarenScript_0x180bee: winlosstext UnknownText_0x180cf8, 0 loadtrainer KAREN, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_KAREN opentext writetext UnknownText_0x180d29 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index f9c4f70e8..47ab0ba7c 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -58,7 +58,7 @@ KogaScript_0x18075a: winlosstext UnknownText_0x1808a9, 0 loadtrainer KOGA, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_KOGA opentext writetext UnknownText_0x1808ca diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index eb7c827a4..c6dc28738 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -40,22 +40,21 @@ KrissHouse2F_MapScriptHeader: Doll1: - describedecoration $1 + describedecoration 1 Doll2: - describedecoration $2 + describedecoration 2 BigDoll: - describedecoration $3 + describedecoration 3 GameConsole: - describedecoration $4 + describedecoration 4 KrissHousePoster: - dw EVENT_KRISS_ROOM_POSTER ; event - dw .Script + dw EVENT_KRISS_ROOM_POSTER, .Script .Script - describedecoration $0 + describedecoration 0 KrissHouseRadio: checkevent EVENT_GOT_A_POKEMON_FROM_ELM @@ -70,7 +69,7 @@ KrissHouseRadio: pause 45 writetext KrisRadioText3 pause 45 - musicfadeout MUSIC_NEW_BARK_TOWN, $10 + musicfadeout MUSIC_NEW_BARK_TOWN, 16 writetext KrisRadioText4 pause 45 closetext diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index b23b313d1..20f7c0997 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -97,7 +97,7 @@ GyaradosScript_0x70063: if_equal $1, UnknownScript_0x7007a disappear LAKEOFRAGE_GYARADOS UnknownScript_0x7007a: - returnafterbattle + reloadmapafterbattle opentext giveitem RED_SCALE waitsfx diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index d3572ec37..db050db6d 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -66,8 +66,8 @@ LanceScript_0x180e7b: setlasttalked LANCESROOM_LANCE loadtrainer CHAMPION, LANCE startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle setevent EVENT_BEAT_CHAMPION_LANCE opentext writetext UnknownText_0x181132 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 070469ce3..ac52fa203 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -25,7 +25,7 @@ PryceScript_0x199a9e: winlosstext UnknownText_0x199cb3, 0 loadtrainer PRYCE, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_PRYCE opentext writetext UnknownText_0x199d3b diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index f633b9dce..5c1fdb985 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -38,8 +38,8 @@ MountMoon_MapScriptHeader: setlasttalked MOUNTMOON_SILVER loadtrainer RIVAL2, 3 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump .FinishBattle .Totodile: @@ -47,8 +47,8 @@ MountMoon_MapScriptHeader: setlasttalked MOUNTMOON_SILVER loadtrainer RIVAL2, 1 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump .FinishBattle .Chikorita: @@ -56,8 +56,8 @@ MountMoon_MapScriptHeader: setlasttalked MOUNTMOON_SILVER loadtrainer RIVAL2, 2 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump .FinishBattle .FinishBattle: diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index e9f7d44a4..e523f5fcd 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -27,7 +27,7 @@ BlackBeltScript_0x7e1f6: winlosstext UnknownText_0x7e2a9, 0 loadtrainer BLACKBELT_T, KIYO startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_BLACKBELT_KIYO opentext UnknownScript_0x7e217: diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index c15c589d4..81d7b0209 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -124,7 +124,7 @@ UnknownScript_0x5c088: .LoadFight0 loadtrainer SCHOOLBOY, JACK1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJackFightCount, 1 clearflag ENGINE_JACK end @@ -132,7 +132,7 @@ UnknownScript_0x5c088: .LoadFight1 loadtrainer SCHOOLBOY, JACK2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJackFightCount, 2 clearflag ENGINE_JACK end @@ -140,7 +140,7 @@ UnknownScript_0x5c088: .LoadFight2 loadtrainer SCHOOLBOY, JACK3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJackFightCount, 3 clearflag ENGINE_JACK end @@ -148,7 +148,7 @@ UnknownScript_0x5c088: .LoadFight3 loadtrainer SCHOOLBOY, JACK4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJackFightCount, 4 clearflag ENGINE_JACK end @@ -156,7 +156,7 @@ UnknownScript_0x5c088: .LoadFight4 loadtrainer SCHOOLBOY, JACK5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_JACK end diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 7c7b54c3a..bece5068c 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -20,7 +20,7 @@ JasmineScript_0x9c12f: winlosstext UnknownText_0x9c2bb, 0 loadtrainer JASMINE, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_JASMINE opentext writetext UnknownText_0x9c33a diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index d3095de7a..06b8a04ea 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -67,7 +67,7 @@ UnknownScript_0x5afc7: .LoadFight0 loadtrainer SAILOR, HUEY1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wHueyFightCount, 1 clearflag ENGINE_HUEY end @@ -75,7 +75,7 @@ UnknownScript_0x5afc7: .LoadFight1 loadtrainer SAILOR, HUEY2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wHueyFightCount, 2 clearflag ENGINE_HUEY end @@ -83,7 +83,7 @@ UnknownScript_0x5afc7: .LoadFight2 loadtrainer SAILOR, HUEY3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wHueyFightCount, 3 clearflag ENGINE_HUEY end @@ -91,7 +91,7 @@ UnknownScript_0x5afc7: .LoadFight3 loadtrainer SAILOR, HUEY4 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_HUEY checkevent EVENT_HUEY_PROTEIN iftrue UnknownScript_0x5b03f diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 57818a9d9..8fce69b13 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -21,7 +21,7 @@ BrockScript_0x1a2864: winlosstext UnknownText_0x1a29bb, 0 loadtrainer BROCK, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_BROCK setevent EVENT_BEAT_CAMPER_JERRY opentext diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index f157a4cff..eee02b34c 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -43,7 +43,7 @@ FakeDirectorScript: setlasttalked RADIOTOWER5F_DIRECTOR loadtrainer EXECUTIVEM, 3 startbattle - returnafterbattle + reloadmapafterbattle opentext writetext FakeDirectorTextAfter buttonsound @@ -92,7 +92,7 @@ RadioTower5FRocketBossTrigger: setlasttalked RADIOTOWER5F_ROCKET loadtrainer EXECUTIVEM, 1 startbattle - returnafterbattle + reloadmapafterbattle opentext writetext RadioTower5FRocketBossAfterText waitbutton diff --git a/maps/Route24.asm b/maps/Route24.asm index fc6b8a0c4..ef8570fe2 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -18,8 +18,8 @@ RocketScript_0x1adbfa: winlosstext UnknownText_0x1add67, -1 loadtrainer GRUNTM, 31 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle playmusic MUSIC_ROCKET_ENCOUNTER opentext writetext UnknownText_0x1addc0 diff --git a/maps/Route25.asm b/maps/Route25.asm index 7c2ecf6a2..48ef12917 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -176,7 +176,7 @@ UnknownScript_0x19efc7: winlosstext UnknownText_0x19f4fd, 0 loadtrainer COOLTRAINERM, KEVIN startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_COOLTRAINERM_KEVIN opentext UnknownScript_0x19efda: diff --git a/maps/Route26.asm b/maps/Route26.asm index 3f52254c4..f4ddbf8f6 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -71,7 +71,7 @@ UnknownScript_0x1a4d79: .LoadFight0 loadtrainer COOLTRAINERM, GAVEN3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wGavenFightCount, 1 clearflag ENGINE_GAVEN end @@ -79,7 +79,7 @@ UnknownScript_0x1a4d79: .LoadFight1 loadtrainer COOLTRAINERM, GAVEN1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wGavenFightCount, 2 clearflag ENGINE_GAVEN end @@ -87,7 +87,7 @@ UnknownScript_0x1a4d79: .LoadFight2 loadtrainer COOLTRAINERM, GAVEN2 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_GAVEN end @@ -175,7 +175,7 @@ UnknownScript_0x1a4e35: .LoadFight0 loadtrainer COOLTRAINERF, BETH1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wBethFightCount, 1 clearflag ENGINE_BETH end @@ -183,7 +183,7 @@ UnknownScript_0x1a4e35: .LoadFight1 loadtrainer COOLTRAINERF, BETH2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wBethFightCount, 2 clearflag ENGINE_BETH end @@ -191,7 +191,7 @@ UnknownScript_0x1a4e35: .LoadFight2 loadtrainer COOLTRAINERF, BETH3 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_BETH end diff --git a/maps/Route27.asm b/maps/Route27.asm index af849c443..fa199f2ad 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -108,7 +108,7 @@ UnknownScript_0x1a08ff: .LoadFight0 loadtrainer BIRD_KEEPER, JOSE2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJoseFightCount, 1 clearflag ENGINE_JOSE end @@ -116,7 +116,7 @@ UnknownScript_0x1a08ff: .LoadFight1 loadtrainer BIRD_KEEPER, JOSE1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJoseFightCount, 2 clearflag ENGINE_JOSE end @@ -124,7 +124,7 @@ UnknownScript_0x1a08ff: .LoadFight2 loadtrainer BIRD_KEEPER, JOSE3 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_JOSE end @@ -241,7 +241,7 @@ UnknownScript_0x1a09e9: .LoadFight0 loadtrainer COOLTRAINERF, REENA1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wReenaFightCount, 1 clearflag ENGINE_REENA end @@ -249,7 +249,7 @@ UnknownScript_0x1a09e9: .LoadFight1 loadtrainer COOLTRAINERF, REENA2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wReenaFightCount, 2 clearflag ENGINE_REENA end @@ -257,7 +257,7 @@ UnknownScript_0x1a09e9: .LoadFight2 loadtrainer COOLTRAINERF, REENA3 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_REENA end diff --git a/maps/Route30.asm b/maps/Route30.asm index 56f3cf298..e5ca13fe3 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -91,7 +91,7 @@ TrainerYoungsterJoey: .LoadFight0 loadtrainer YOUNGSTER, JOEY1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJoeyFightCount, 1 clearflag ENGINE_JOEY end @@ -99,7 +99,7 @@ TrainerYoungsterJoey: .LoadFight1 loadtrainer YOUNGSTER, JOEY2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJoeyFightCount, 2 clearflag ENGINE_JOEY end @@ -107,7 +107,7 @@ TrainerYoungsterJoey: .LoadFight2 loadtrainer YOUNGSTER, JOEY3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJoeyFightCount, 3 clearflag ENGINE_JOEY end @@ -115,7 +115,7 @@ TrainerYoungsterJoey: .LoadFight3 loadtrainer YOUNGSTER, JOEY4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJoeyFightCount, 4 clearflag ENGINE_JOEY end @@ -123,7 +123,7 @@ TrainerYoungsterJoey: .LoadFight4 loadtrainer YOUNGSTER, JOEY5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_JOEY checkevent EVENT_JOEY_HP_UP iftrue .GiveHPUp diff --git a/maps/Route31.asm b/maps/Route31.asm index 2b504797b..3309e292a 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -82,7 +82,7 @@ TrainerBug_catcherWade1: .LoadFight0 loadtrainer BUG_CATCHER, WADE1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wWadeFightCount, 1 clearflag ENGINE_WADE end @@ -90,7 +90,7 @@ TrainerBug_catcherWade1: .LoadFight1 loadtrainer BUG_CATCHER, WADE2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wWadeFightCount, 2 clearflag ENGINE_WADE end @@ -98,7 +98,7 @@ TrainerBug_catcherWade1: .LoadFight2 loadtrainer BUG_CATCHER, WADE3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wWadeFightCount, 3 clearflag ENGINE_WADE end @@ -106,7 +106,7 @@ TrainerBug_catcherWade1: .LoadFight3 loadtrainer BUG_CATCHER, WADE4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wWadeFightCount, 4 clearflag ENGINE_WADE end @@ -114,7 +114,7 @@ TrainerBug_catcherWade1: .LoadFight4 loadtrainer BUG_CATCHER, WADE5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_WADE end diff --git a/maps/Route32.asm b/maps/Route32.asm index 223745799..63f29e81c 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -225,7 +225,7 @@ TrainerFisherRalph1: .LoadFight0 loadtrainer FISHER, RALPH1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wRalphFightCount, 1 clearflag ENGINE_RALPH end @@ -233,7 +233,7 @@ TrainerFisherRalph1: .LoadFight1 loadtrainer FISHER, RALPH2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wRalphFightCount, 2 clearflag ENGINE_RALPH end @@ -241,7 +241,7 @@ TrainerFisherRalph1: .LoadFight2 loadtrainer FISHER, RALPH3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wRalphFightCount, 3 clearflag ENGINE_RALPH end @@ -249,7 +249,7 @@ TrainerFisherRalph1: .LoadFight3 loadtrainer FISHER, RALPH4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wRalphFightCount, 4 clearflag ENGINE_RALPH end @@ -257,7 +257,7 @@ TrainerFisherRalph1: .LoadFight4 loadtrainer FISHER, RALPH5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_RALPH end @@ -359,7 +359,7 @@ TrainerPicnickerLiz1: .LoadFight0 loadtrainer PICNICKER, LIZ1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wLizFightCount, 1 clearflag ENGINE_LIZ end @@ -367,7 +367,7 @@ TrainerPicnickerLiz1: .LoadFight1 loadtrainer PICNICKER, LIZ2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wLizFightCount, 2 clearflag ENGINE_LIZ end @@ -375,7 +375,7 @@ TrainerPicnickerLiz1: .LoadFight2 loadtrainer PICNICKER, LIZ3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wLizFightCount, 3 clearflag ENGINE_LIZ end @@ -383,7 +383,7 @@ TrainerPicnickerLiz1: .LoadFight3 loadtrainer PICNICKER, LIZ4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wLizFightCount, 4 clearflag ENGINE_LIZ end @@ -391,7 +391,7 @@ TrainerPicnickerLiz1: .LoadFight4 loadtrainer PICNICKER, LIZ5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_LIZ end diff --git a/maps/Route33.asm b/maps/Route33.asm index ad9d7d7d2..3d1db419c 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -68,7 +68,7 @@ TrainerHikerAnthony: .LoadFight0 loadtrainer HIKER, ANTHONY2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAnthonyFightCount, 1 clearflag ENGINE_ANTHONY end @@ -76,7 +76,7 @@ TrainerHikerAnthony: .LoadFight1 loadtrainer HIKER, ANTHONY1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAnthonyFightCount, 2 clearflag ENGINE_ANTHONY end @@ -84,7 +84,7 @@ TrainerHikerAnthony: .LoadFight2 loadtrainer HIKER, ANTHONY3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAnthonyFightCount, 3 clearflag ENGINE_ANTHONY end @@ -92,7 +92,7 @@ TrainerHikerAnthony: .LoadFight3 loadtrainer HIKER, ANTHONY4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAnthonyFightCount, 4 clearflag ENGINE_ANTHONY end @@ -100,7 +100,7 @@ TrainerHikerAnthony: .LoadFight4 loadtrainer HIKER, ANTHONY5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_ANTHONY end 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 diff --git a/maps/Route35.asm b/maps/Route35.asm index d0e37ef8a..68f00f694 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -183,7 +183,7 @@ UnknownScript_0x19c9bb: .LoadFight0 loadtrainer BUG_CATCHER, ARNIE1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wArnieFightCount, 1 clearflag ENGINE_ARNIE end @@ -191,7 +191,7 @@ UnknownScript_0x19c9bb: .LoadFight1 loadtrainer BUG_CATCHER, ARNIE2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wArnieFightCount, 2 clearflag ENGINE_ARNIE end @@ -199,7 +199,7 @@ UnknownScript_0x19c9bb: .LoadFight2 loadtrainer BUG_CATCHER, ARNIE3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wArnieFightCount, 3 clearflag ENGINE_ARNIE end @@ -207,7 +207,7 @@ UnknownScript_0x19c9bb: .LoadFight3 loadtrainer BUG_CATCHER, ARNIE4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wArnieFightCount, 4 clearflag ENGINE_ARNIE end @@ -215,7 +215,7 @@ UnknownScript_0x19c9bb: .LoadFight4 loadtrainer BUG_CATCHER, ARNIE5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_ARNIE end @@ -250,7 +250,7 @@ OfficerScript_0x19ca49: winlosstext UnknownText_0x19cf06, 0 loadtrainer OFFICER, DIRK startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_OFFICER_DIRK closetext end diff --git a/maps/Route36.asm b/maps/Route36.asm index aaa64ffe9..87e44c101 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -88,7 +88,7 @@ WateredWeirdTreeScript:: if_equal $2, UnknownScript_0x19407b disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN - returnafterbattle + reloadmapafterbattle end UnknownScript_0x194079: @@ -96,7 +96,7 @@ UnknownScript_0x194079: end UnknownScript_0x19407b: - returnafterbattle + reloadmapafterbattle applymovement ROUTE36_WEIRD_TREE, MovementData_0x19424b disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN @@ -227,7 +227,7 @@ UnknownScript_0x194140: .LoadFight0 loadtrainer SCHOOLBOY, ALAN1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAlanFightCount, 1 clearflag ENGINE_ALAN end @@ -235,7 +235,7 @@ UnknownScript_0x194140: .LoadFight1 loadtrainer SCHOOLBOY, ALAN2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAlanFightCount, 2 clearflag ENGINE_ALAN end @@ -243,7 +243,7 @@ UnknownScript_0x194140: .LoadFight2 loadtrainer SCHOOLBOY, ALAN3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAlanFightCount, 3 clearflag ENGINE_ALAN end @@ -251,7 +251,7 @@ UnknownScript_0x194140: .LoadFight3 loadtrainer SCHOOLBOY, ALAN4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAlanFightCount, 4 clearflag ENGINE_ALAN end @@ -259,7 +259,7 @@ UnknownScript_0x194140: .LoadFight4 loadtrainer SCHOOLBOY, ALAN5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_ALAN end diff --git a/maps/Route38.asm b/maps/Route38.asm index 5946ab582..14d7cf852 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -91,7 +91,7 @@ TrainerLassDana1: .LoadFight0 loadtrainer LASS, DANA1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wDanaFightCount, 1 clearflag ENGINE_DANA end @@ -99,7 +99,7 @@ TrainerLassDana1: .LoadFight1 loadtrainer LASS, DANA2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wDanaFightCount, 2 clearflag ENGINE_DANA end @@ -107,7 +107,7 @@ TrainerLassDana1: .LoadFight2 loadtrainer LASS, DANA3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wDanaFightCount, 3 clearflag ENGINE_DANA end @@ -115,7 +115,7 @@ TrainerLassDana1: .LoadFight3 loadtrainer LASS, DANA4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wDanaFightCount, 4 clearflag ENGINE_DANA end @@ -123,7 +123,7 @@ TrainerLassDana1: .LoadFight4 loadtrainer LASS, DANA5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_DANA end @@ -227,7 +227,7 @@ TrainerSchoolboyChad1: .LoadFight0 loadtrainer SCHOOLBOY, CHAD1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wChadFightCount, 1 clearflag ENGINE_CHAD end @@ -235,7 +235,7 @@ TrainerSchoolboyChad1: .LoadFight1 loadtrainer SCHOOLBOY, CHAD2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wChadFightCount, 2 clearflag ENGINE_CHAD end @@ -243,7 +243,7 @@ TrainerSchoolboyChad1: .LoadFight2 loadtrainer SCHOOLBOY, CHAD3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wChadFightCount, 3 clearflag ENGINE_CHAD end @@ -251,7 +251,7 @@ TrainerSchoolboyChad1: .LoadFight3 loadtrainer SCHOOLBOY, CHAD4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wChadFightCount, 4 clearflag ENGINE_CHAD end @@ -259,7 +259,7 @@ TrainerSchoolboyChad1: .LoadFight4 loadtrainer SCHOOLBOY, CHAD5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_CHAD end diff --git a/maps/Route39.asm b/maps/Route39.asm index bdd247829..bf8b1c772 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -150,7 +150,7 @@ PokefanFScript_0x1a5bbe: winlosstext UnknownText_0x1a5f17, 0 loadtrainer POKEFANF, JAIME startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_POKEFANF_JAIME closetext end diff --git a/maps/Route42.asm b/maps/Route42.asm index a85512ff4..a58e7c27b 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -89,7 +89,7 @@ UnknownScript_0x1a927f: .LoadFight0 loadtrainer FISHER, TULLY1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wTullyFightCount, 1 clearflag ENGINE_TULLY end @@ -97,7 +97,7 @@ UnknownScript_0x1a927f: .LoadFight1 loadtrainer FISHER, TULLY2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wTullyFightCount, 2 clearflag ENGINE_TULLY end @@ -105,7 +105,7 @@ UnknownScript_0x1a927f: .LoadFight2 loadtrainer FISHER, TULLY3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wTullyFightCount, 3 clearflag ENGINE_TULLY end @@ -113,7 +113,7 @@ UnknownScript_0x1a927f: .LoadFight3 loadtrainer FISHER, TULLY4 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_TULLY end diff --git a/maps/Route43.asm b/maps/Route43.asm index bb68bd59d..ddc2bfa1c 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -100,7 +100,7 @@ UnknownScript_0x19d0cf: .LoadFight0 loadtrainer POKEMANIAC, BRENT1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wBrentFightCount, 1 clearflag ENGINE_BRENT end @@ -108,7 +108,7 @@ UnknownScript_0x19d0cf: .LoadFight1 loadtrainer POKEMANIAC, BRENT2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wBrentFightCount, 2 clearflag ENGINE_BRENT end @@ -116,7 +116,7 @@ UnknownScript_0x19d0cf: .LoadFight2 loadtrainer POKEMANIAC, BRENT3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wBrentFightCount, 3 clearflag ENGINE_BRENT end @@ -124,7 +124,7 @@ UnknownScript_0x19d0cf: .LoadFight3 loadtrainer POKEMANIAC, BRENT4 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_BRENT end @@ -231,7 +231,7 @@ UnknownScript_0x19d1c1: .LoadFight0 loadtrainer PICNICKER, TIFFANY3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wTiffanyFightCount, 1 clearflag ENGINE_TIFFANY end @@ -239,7 +239,7 @@ UnknownScript_0x19d1c1: .LoadFight1 loadtrainer PICNICKER, TIFFANY1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wTiffanyFightCount, 2 clearflag ENGINE_TIFFANY end @@ -247,7 +247,7 @@ UnknownScript_0x19d1c1: .LoadFight2 loadtrainer PICNICKER, TIFFANY2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wTiffanyFightCount, 3 clearflag ENGINE_TIFFANY end @@ -255,7 +255,7 @@ UnknownScript_0x19d1c1: .LoadFight3 loadtrainer PICNICKER, TIFFANY4 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_TIFFANY end diff --git a/maps/Route44.asm b/maps/Route44.asm index a9eceb5b9..371099ab8 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -63,7 +63,7 @@ UnknownScript_0x19d86a: .LoadFight0 loadtrainer BIRD_KEEPER, VANCE1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wVanceFightCount, 1 clearflag ENGINE_VANCE end @@ -71,7 +71,7 @@ UnknownScript_0x19d86a: .LoadFight1 loadtrainer BIRD_KEEPER, VANCE2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wVanceFightCount, 2 clearflag ENGINE_VANCE end @@ -79,7 +79,7 @@ UnknownScript_0x19d86a: .LoadFight2 loadtrainer BIRD_KEEPER, VANCE3 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_VANCE checkevent EVENT_VANCE_CARBOS iftrue UnknownScript_0x19d8cb @@ -207,7 +207,7 @@ UnknownScript_0x19d96e: .LoadFight0 loadtrainer FISHER, WILTON1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wWiltonFightCount, 1 clearflag ENGINE_WILTON end @@ -215,7 +215,7 @@ UnknownScript_0x19d96e: .LoadFight1 loadtrainer FISHER, WILTON2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wWiltonFightCount, 2 clearflag ENGINE_WILTON end @@ -223,7 +223,7 @@ UnknownScript_0x19d96e: .LoadFight2 loadtrainer FISHER, WILTON3 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_WILTON end diff --git a/maps/Route45.asm b/maps/Route45.asm index 9d4fecbf1..d2ded8765 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -191,7 +191,7 @@ UnknownScript_0x19e1b8: .LoadFight0 loadtrainer HIKER, PARRY3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wParryFightCount, 1 clearflag ENGINE_PARRY end @@ -199,7 +199,7 @@ UnknownScript_0x19e1b8: .LoadFight1 loadtrainer HIKER, PARRY1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wParryFightCount, 2 clearflag ENGINE_PARRY end @@ -207,7 +207,7 @@ UnknownScript_0x19e1b8: .LoadFight2 loadtrainer HIKER, PARRY2 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_PARRY checkevent EVENT_PARRY_IRON iftrue UnknownScript_0x19e219 @@ -276,7 +276,7 @@ YoungsterScript_0x19e269: winlosstext UnknownText_0x19e899, 0 loadtrainer CAMPER, QUENTIN startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_CAMPER_QUENTIN closetext end diff --git a/maps/Route46.asm b/maps/Route46.asm index 00517f46c..ff7bcb463 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -69,7 +69,7 @@ UnknownScript_0x1a96da: .LoadFight0 loadtrainer PICNICKER, ERIN1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wErinFightCount, 1 clearflag ENGINE_ERIN end @@ -77,7 +77,7 @@ UnknownScript_0x1a96da: .LoadFight1 loadtrainer PICNICKER, ERIN2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wErinFightCount, 2 clearflag ENGINE_ERIN end @@ -85,7 +85,7 @@ UnknownScript_0x1a96da: .LoadFight2 loadtrainer PICNICKER, ERIN3 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_ERIN checkevent EVENT_ERIN_CALCIUM iftrue UnknownScript_0x1a973b diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 518e56fae..7ff9f504c 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -24,7 +24,7 @@ SabrinaScript_0x189c2e: winlosstext UnknownText_0x189df4, 0 loadtrainer SABRINA, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_SABRINA setevent EVENT_BEAT_MEDIUM_REBECCA setevent EVENT_BEAT_MEDIUM_DORIS diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 73d6f949b..82bfa156f 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -29,7 +29,7 @@ BlaineScript_0x1ab4fb: iftrue .ReturnAfterBattle appear SEAFOAMGYM_GYM_GUY .ReturnAfterBattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_BLAINE opentext writetext UnknownText_0x1ab683 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index b1187ab74..0a8933b67 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -18,8 +18,8 @@ RedScript_0x18c603: winlosstext UnknownText_0x18c63c, UnknownText_0x18c63c loadtrainer RED, 1 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle special Special_FadeOutMusic opentext writetext UnknownText_0x18c63f diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index ed798c12f..03c49ee0b 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -76,7 +76,7 @@ SageLiScript: winlosstext SageLiBeatenText, 0 loadtrainer SAGE, LI startbattle - returnafterbattle + reloadmapafterbattle opentext writetext UnknownText_0x184cc2 buttonsound diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 9a137ce56..de9012ab0 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -246,7 +246,7 @@ TrainerCameraGrunt1: loadtrainer GRUNTM, 20 startbattle disappear TEAMROCKETBASEB1F_ROCKET1 - returnafterbattle + reloadmapafterbattle end TrainerCameraGrunt2: @@ -259,7 +259,7 @@ TrainerCameraGrunt2: loadtrainer GRUNTM, 21 startbattle disappear TEAMROCKETBASEB1F_ROCKET1 - returnafterbattle + reloadmapafterbattle end PlaySecurityCameraSounds: @@ -280,7 +280,7 @@ ExplodingTrap1: checkevent EVENT_EXPLODING_TRAP_1 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_1 end @@ -288,7 +288,7 @@ ExplodingTrap2: checkevent EVENT_EXPLODING_TRAP_2 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_2 end @@ -296,7 +296,7 @@ ExplodingTrap3: checkevent EVENT_EXPLODING_TRAP_3 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_3 end @@ -304,7 +304,7 @@ ExplodingTrap4: checkevent EVENT_EXPLODING_TRAP_4 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_4 end @@ -312,7 +312,7 @@ ExplodingTrap5: checkevent EVENT_EXPLODING_TRAP_5 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_5 end @@ -320,7 +320,7 @@ ExplodingTrap6: checkevent EVENT_EXPLODING_TRAP_6 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_6 end @@ -328,7 +328,7 @@ ExplodingTrap7: checkevent EVENT_EXPLODING_TRAP_7 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_7 end @@ -336,7 +336,7 @@ ExplodingTrap8: checkevent EVENT_EXPLODING_TRAP_8 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_8 end @@ -344,7 +344,7 @@ ExplodingTrap9: checkevent EVENT_EXPLODING_TRAP_9 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_9 end @@ -352,7 +352,7 @@ ExplodingTrap10: checkevent EVENT_EXPLODING_TRAP_10 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_10 end @@ -360,7 +360,7 @@ ExplodingTrap11: checkevent EVENT_EXPLODING_TRAP_11 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_11 end @@ -368,7 +368,7 @@ ExplodingTrap12: checkevent EVENT_EXPLODING_TRAP_12 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_12 end @@ -376,7 +376,7 @@ ExplodingTrap13: checkevent EVENT_EXPLODING_TRAP_13 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_13 end @@ -384,7 +384,7 @@ ExplodingTrap14: checkevent EVENT_EXPLODING_TRAP_14 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_14 end @@ -392,7 +392,7 @@ ExplodingTrap15: checkevent EVENT_EXPLODING_TRAP_15 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_15 end @@ -400,7 +400,7 @@ ExplodingTrap16: checkevent EVENT_EXPLODING_TRAP_16 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_16 end @@ -408,7 +408,7 @@ ExplodingTrap17: checkevent EVENT_EXPLODING_TRAP_17 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_17 end @@ -416,7 +416,7 @@ ExplodingTrap18: checkevent EVENT_EXPLODING_TRAP_18 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_18 end @@ -424,7 +424,7 @@ ExplodingTrap19: checkevent EVENT_EXPLODING_TRAP_19 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_19 end @@ -432,7 +432,7 @@ ExplodingTrap20: checkevent EVENT_EXPLODING_TRAP_20 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_20 end @@ -440,7 +440,7 @@ ExplodingTrap21: checkevent EVENT_EXPLODING_TRAP_21 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_21 end @@ -448,7 +448,7 @@ ExplodingTrap22: checkevent EVENT_EXPLODING_TRAP_22 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_22 end diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 36377d5ea..3a675f92e 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -108,7 +108,7 @@ UnknownScript_0x6cfac: setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE setevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2 opentext writetext UnknownText_0x6d4c6 @@ -239,7 +239,7 @@ VoltorbScript_0x6d101: iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 - returnafterbattle + reloadmapafterbattle special PlayMapMusic applymovement PLAYER, MovementData_0x6d28c jump UnknownScript_0x6d184 @@ -257,7 +257,7 @@ VoltorbScript_0x6d12c: iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 - returnafterbattle + reloadmapafterbattle special PlayMapMusic applymovement PLAYER, MovementData_0x6d299 jump UnknownScript_0x6d184 @@ -275,13 +275,13 @@ VoltorbScript_0x6d157: iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 - returnafterbattle + reloadmapafterbattle special PlayMapMusic applymovement PLAYER, MovementData_0x6d2a4 jump UnknownScript_0x6d184 UnknownScript_0x6d182: - returnafterbattle + reloadmapafterbattle end UnknownScript_0x6d184: diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index c1cf917cd..a55e2c125 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -111,7 +111,7 @@ UnknownScript_0x6e056: setlasttalked TEAMROCKETBASEB3F_ROCKET1 loadtrainer EXECUTIVEM, 4 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4 opentext writetext UnknownText_0x6e548 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 6a373b638..b0164dc88 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -127,7 +127,7 @@ UnknownScript_0x1850d7: loadwildmon SUICUNE, 40 writecode VAR_BATTLETYPE, BATTLETYPE_SUICUNE startbattle - reloadmapmusic + dontrestartmapmusic disappear TINTOWER1F_SUICUNE setevent EVENT_FOUGHT_SUICUNE setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 @@ -138,7 +138,7 @@ UnknownScript_0x1850d7: domaptrigger CIANWOOD_CITY, $0 dotrigger $1 clearevent EVENT_SET_WHEN_FOUGHT_HO_OH - returnafterbattle + reloadmapafterbattle pause 20 spriteface PLAYER, DOWN playmusic MUSIC_MYSTICALMAN_ENCOUNTER diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index a24878415..61698aeae 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -39,7 +39,7 @@ HoOhScript_0x77244: loadwildmon HO_OH, 60 startbattle disappear TINTOWERROOF_HO_OH - returnafterbattle + reloadmapafterbattle setevent EVENT_SET_WHEN_FOUGHT_HO_OH end diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index c06c9ff41..bca44441c 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -50,14 +50,14 @@ TrainerHouseReceptionistScript: setlasttalked TRAINERHOUSEB1F_CHRIS loadtrainer CAL, CAL2 startbattle - returnafterbattle + reloadmapafterbattle iffalse .End .NoSpecialBattle: winlosstext TrainerHouseB1FCalBeatenText, 0 setlasttalked TRAINERHOUSEB1F_CHRIS loadtrainer CAL, CAL3 startbattle - returnafterbattle + reloadmapafterbattle .End: applymovement PLAYER, Movement_ExitTrainerHouseBattleRoom end diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 58e569e84..20a2a338d 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -180,8 +180,8 @@ UndergroundSilverBattleScript: setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER loadtrainer RIVAL1, RIVAL1_12 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump .FinishRivalBattle .Totodile: @@ -189,8 +189,8 @@ UndergroundSilverBattleScript: setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER loadtrainer RIVAL1, RIVAL1_10 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump .FinishRivalBattle .Chikorita: @@ -198,8 +198,8 @@ UndergroundSilverBattleScript: setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER loadtrainer RIVAL1, RIVAL1_11 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump .FinishRivalBattle .FinishRivalBattle: diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 86e6eacf3..0425c1d67 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -37,7 +37,7 @@ SurfScript_0x5a31f: startbattle disappear UNIONCAVEB2F_SURF setflag ENGINE_UNION_CAVE_LAPRAS - returnafterbattle + reloadmapafterbattle end TrainerCooltrainermNick: diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index b47f39693..90b18c6b7 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -61,7 +61,7 @@ UnknownScript_0x1aa9ab: startbattle disappear VERMILIONCITY_BIG_SNORLAX setevent EVENT_FOUGHT_SNORLAX - returnafterbattle + reloadmapafterbattle end VermilionGymBadgeGuy: diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 4040997e1..209986a0f 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -23,7 +23,7 @@ SurgeScript_0x1920a5: winlosstext UnknownText_0x192238, 0 loadtrainer LT_SURGE, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_LTSURGE setevent EVENT_BEAT_GENTLEMAN_GREGORY setevent EVENT_BEAT_GUITARIST_VINCENT diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index f4cf89575..1e4b4ab72 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -68,8 +68,8 @@ UnknownScript_0x744d4: setlasttalked VICTORYROAD_SILVER loadtrainer RIVAL1, RIVAL1_15 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump UnknownScript_0x7451f UnknownScript_0x744ff: @@ -77,8 +77,8 @@ UnknownScript_0x744ff: setlasttalked VICTORYROAD_SILVER loadtrainer RIVAL1, RIVAL1_13 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump UnknownScript_0x7451f UnknownScript_0x7450f: @@ -86,8 +86,8 @@ UnknownScript_0x7450f: setlasttalked VICTORYROAD_SILVER loadtrainer RIVAL1, RIVAL1_14 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump UnknownScript_0x7451f UnknownScript_0x7451f: diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 99dfcb184..28c1dd218 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -22,7 +22,7 @@ FalknerScript_0x683c2: winlosstext UnknownText_0x6854a, 0 loadtrainer FALKNER, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_FALKNER opentext writetext UnknownText_0x685af diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index fabb3b91d..b277f34b0 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -20,7 +20,7 @@ BlueScript_0x9aa26: winlosstext UnknownText_0x9abae, 0 loadtrainer BLUE, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_BLUE opentext writetext UnknownText_0x9ac0f diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 26d327faa..be55b8345 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -39,7 +39,7 @@ LugiaScript_0x18c518: loadwildmon LUGIA, 60 startbattle disappear WHIRLISLANDLUGIACHAMBER_LUGIA - returnafterbattle + reloadmapafterbattle end UnknownText_0x18c531: diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index b2eb59257..1ff5d3c40 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -58,7 +58,7 @@ WillScript_0x1804f8: winlosstext UnknownText_0x18062c, 0 loadtrainer WILL, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_WILL opentext writetext UnknownText_0x180644 |