Add end-of-ROM stadium data, fix Burned Tower script labels/constants.

7 files changed, 35 insertions, 25 deletions

diff --git a/data/stadium/stadium_gold.bin b/data/stadium/stadium_gold.bin
new file mode 100644
index 00000000..1b690363
--- /dev/null
+++ b/data/stadium/stadium_gold.bin
@@ -0,0 +1 @@
+N64PS3�nZ���[��0�5�iBu�Q]0U`�5
Ѷ*L�P%'g�ER^]������@jtY����i��O8���SX����Xx�����DT�.�*���œ�6�3�4V�_�U��-N7���Ke��R���1ܦz�)�������^�@
��K��9�����������������{mu�Ũ����������bq����G�6_W�*Y��'.�E����������)g���y���yYk�iu�%��H��Km���B>A�a����0����ѥ���扟&#\�Rյ�&U+y:;��$��i��-�C)=>���X������ʷi�*=������e/���l���Y��i���A���I_����7��
���by��\j��<^���a��r}����i������������k쵩�1rh��������:������Д��m���Ԯ���>7ᅂ��������������������������������������������������������������������U%
\ No newline at end of file
diff --git a/data/stadium/stadium_silver.bin b/data/stadium/stadium_silver.bin
new file mode 100644
index 00000000..7e092ab1
--- /dev/null
+++ b/data/stadium/stadium_silver.bin
@@ -0,0 +1,2 @@
+N64PS3yPZ��1VB���|���<%v1Pe0-`�5
Ѷ*L�P%'g�E2^]�������@jtY��Բi��8$��SX����4������Cd�.h#�V�6�6Q��2)�w�hd��˘�%
+�嗫e���Q<p�`��$(z�){������^?��K��r�����������������{mu�Ũ����������b����G�6_W�*U��'.�C����������)g���y���yK�)}��%��H��Km���B>A�a����0����ѥ���扟&#\�Rյ�&U+y:;��$��i��-�C)=>���X������ʷi�*=������e/���l���Y��i���A���I_����7��
���by��\j��<^���a��r}����i������������k쵩�1rh��������"����������{��Ԯ���>7ᅂ��������������������������������������������������������������������R�
\ No newline at end of file
diff --git a/layout.link b/layout.link
index 59cc54c9..4088524c 100644
--- a/layout.link
+++ b/layout.link
@@ -262,7 +262,7 @@ ROMX $70
 	"bank70"
 ROMX $7f
 	org $7df8
-	"bank7f"
+	"Stadium Data"
 WRAM0
 	org $c000
 	"Audio RAM"
diff --git a/main.asm b/main.asm
index e9a4bfa4..685dd394 100644
--- a/main.asm
+++ b/main.asm
@@ -989,6 +989,10 @@ IF DEF(_SILVER)
 ENDC
 
 
-SECTION "bank7f", ROMX
+SECTION "Stadium Data", ROMX
 
-	dr $1ffdf8, $200000
+IF DEF(_GOLD)
+INCBIN "data/stadium/stadium_gold.bin"
+ELIF DEF(_SILVER)
+INCBIN "data/stadium/stadium_silver.bin"
+ENDC
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index f359bef6..97f790b7 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -1,10 +1,12 @@
-	const_def 2 ; object constants
+	object_const_def ; object constants
 	const BURNEDTOWER1F_FIREBREATHER_DICK
-	const BURNEDTOWER1F_MORTY
-	const BURNEDTOWER1F_POKE_BALL
-	const BURNEDTOWER1F_EUSINE
+	const BURNEDTOWER1F_FIREBREATHER_NED
+	const BURNEDTOWER1F_ROCK1
+	const BURNEDTOWER1F_ROCK2
 	const BURNEDTOWER1F_SILVER
 	const BURNEDTOWER1F_FIREBREATHER_DICK_ASHES
+	const BURNEDTOWER1F_POKE_BALL1
+	const BURNEDTOWER1F_POKE_BALL2
 
 BurnedTower1F_MapScripts:
 	db 3 ; scene scripts
@@ -96,7 +98,7 @@ FirebreatherDickFight:
 	writetext FirebreatherDickBeforeText
 	waitbutton
 	closetext
-	winlosstext FirebreatherDickBattleWinText, -1
+	winlosstext FirebreatherDickBeatenText, -1
 	setlasttalked BURNEDTOWER1F_FIREBREATHER_DICK
 	loadtrainer FIREBREATHER, DICK
 	startbattle
@@ -116,18 +118,18 @@ FirebreatherDickFight:
 FirebreatherDickPostBattle:
 	faceplayer
 	opentext
-	writetext BurnedTower1FEusineText
+	writetext FirebreatherDickAfterText
 	waitbutton
 	closetext
 	end
 
 TrainerFirebreatherNed:
-	trainer FIREBREATHER, NED, EVENT_BEAT_FIREBREATHER_NED, BurnedTower1FMortyText, Text2, 0, .LossScript
+	trainer FIREBREATHER, NED, EVENT_BEAT_FIREBREATHER_NED, FirebreatherNedSeenText, FirebreatherNedBeatenText, 0, .Script
 
-.LossScript
+.Script
 	endifjustbattled
 	opentext
-	writetext Text3
+	writetext FirebreatherNedAfterText
 	waitbutton
 	closetext
 	end
@@ -232,12 +234,12 @@ FirebreatherDickBeforeText:
 	line "by looking!"
 	done
 
-FirebreatherDickBattleWinText:
+FirebreatherDickBeatenText:
 	text "I burned down to"
 	line "white ashes…"
 	done
 
-BurnedTower1FEusineText:
+FirebreatherDickAfterText:
 	text "I was so into my"
 	line "training that I"
 
@@ -245,7 +247,7 @@ BurnedTower1FEusineText:
 	line "hole."
 	done
 
-BurnedTower1FMortyText:
+FirebreatherNedSeenText:
 	text "My soul is on"
 	line "fire. I'll show"
 
@@ -253,12 +255,12 @@ BurnedTower1FMortyText:
 	line "burns!"
 	done
 
-Text2:
+FirebreatherNedBeatenText:
 	text "Still not hot"
 	line "enough…"
 	done
 
-Text3:
+FirebreatherNedAfterText:
 	text "In the past, there"
 	line "were these #MON"
 
@@ -304,7 +306,7 @@ BurnedTower1F_MapEvents:
 	object_event 16, 8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherNed, -1
 	object_event 4, 3, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
 	object_event 16, 13, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
-	object_event 9, 12, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, $2812, EVENT_RIVAL_BURNED_TOWER
-	object_event 8, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, $4ef6, EVENT_BURNED_TOWER_FIREBREATHER_DICK_ASHES
+	object_event 9, 12, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
+	object_event 8, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, FirebreatherDickPostBattle, EVENT_BURNED_TOWER_FIREBREATHER_DICK_ASHES
 	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FBurnHeal, EVENT_BURNED_TOWER_1F_X_SPEED
 	object_event 7, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FXSpeed, EVENT_BURNED_TOWER_1F_BURN_HEAL
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 374d3632..b2c58474 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -1,4 +1,4 @@
-	const_def 2 ; object constants
+	object_const_def ; object constants
 	const BURNEDTOWERB1F_BOULDER
 	const BURNEDTOWERB1F_RAIKOU1
 	const BURNEDTOWERB1F_ENTEI1
@@ -6,8 +6,8 @@
 	const BURNEDTOWERB1F_RAIKOU2
 	const BURNEDTOWERB1F_ENTEI2
 	const BURNEDTOWERB1F_SUICUNE2
-	const BURNEDTOWERB1F_POKE_BALL
-	const BURNEDTOWERB1F_EUSINE
+	const BURNEDTOWERB1F_POKE_BALL1
+	const BURNEDTOWERB1F_POKE_BALL2
 
 BurnedTowerB1F_MapScripts:
 	db 2 ; scene scripts
@@ -65,8 +65,9 @@ ReleaseTheBeasts:
 	special InitRoamMons
 	end
 
+UnusedEnteiScript:
 	opentext
-	writetext BurnedTowerB1FEusineText
+	writetext UnusedEnteiText
 	cry ENTEI
 	waitbutton
 	closetext
@@ -120,7 +121,7 @@ BurnedTowerSuicuneMovement:
 	remove_sliding
 	step_end
 
-BurnedTowerB1FEusineText:
+UnusedEnteiText:
 	text "ENTEI: Bufuu!"
 	done
 
diff --git a/tools/unused_sources.sh b/tools/unused_sources.sh
index 6a441e32..0af6397f 100755
--- a/tools/unused_sources.sh
+++ b/tools/unused_sources.sh
@@ -4,7 +4,7 @@
 # top-level sources listed in Makefile
 toplevel='audio.asm data/text/common.asm data/pokemon/dex_entries.asm wram.asm
 main.asm home.asm gfx/sprites.asm gfx/pics_gold.asm gfx/pics_silver.asm
-data/maps/map_data.asm engine/overworld/events.asm'
+data/maps/map_data.asm engine/overworld/events.asm rgbdscheck.asm'
 
 for asm in $toplevel; do
 	echo "$asm"