Move effects; no more reloadmapmusic, returnafterbattle

2025-09-08 08:13:02 -07:00 · 2015-12-26 18:11:55 -05:00
parent f485a45cda
commit 2bd45ca574
96 changed files with 1281 additions and 1078 deletions
--- 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
--- 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:
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More