document remainder of secret_base scripts, delete unneeded scripts.incs

2019-09-06 02:12:00 -04:00
parent 8c6b5648d4
commit 9fbcd552de
40 changed files with 1270 additions and 1328 deletions
--- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
@@ -10,7 +10,7 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE
 	call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A
 	compare VAR_LITTLEROOT_INTRO_STATE, 4
 	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE
-	call LittlerootTown_BrendansHouse_2F_EventScript_275CE1
+	call SecretBase_EventScript_SetDecorationFlags
 	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	end

@@ -50,7 +50,7 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A
 LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474
 	checkplayergender
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_275D0C
+	goto_if_eq SecretBase_EventScript_InitDecorations
 	end

 LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481
--- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -10,7 +10,7 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
 	call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD
 	compare VAR_LITTLEROOT_INTRO_STATE, 4
 	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE
-	call LittlerootTown_MaysHouse_2F_EventScript_275CE1
+	call SecretBase_EventScript_SetDecorationFlags
 	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	end

@@ -51,7 +51,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
 LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
 	checkplayergender
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_275D0C
+	goto_if_eq SecretBase_EventScript_InitDecorations
 	end

 LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334
--- a/data/maps/SecretBase_BlueCave1/scripts.inc
+++ b/data/maps/SecretBase_BlueCave1/scripts.inc
@@ -1 +0,0 @@
-SecretBase_BlueCave1_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_BlueCave2/scripts.inc
+++ b/data/maps/SecretBase_BlueCave2/scripts.inc
@@ -1 +0,0 @@
-SecretBase_BlueCave2_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_BlueCave3/scripts.inc
+++ b/data/maps/SecretBase_BlueCave3/scripts.inc
@@ -1 +0,0 @@
-SecretBase_BlueCave3_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_BlueCave4/scripts.inc
+++ b/data/maps/SecretBase_BlueCave4/scripts.inc
@@ -1 +0,0 @@
-SecretBase_BlueCave4_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_BrownCave1/scripts.inc
+++ b/data/maps/SecretBase_BrownCave1/scripts.inc
@@ -1 +0,0 @@
-SecretBase_BrownCave1_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_BrownCave2/scripts.inc
+++ b/data/maps/SecretBase_BrownCave2/scripts.inc
@@ -1 +0,0 @@
-SecretBase_BrownCave2_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_BrownCave3/scripts.inc
+++ b/data/maps/SecretBase_BrownCave3/scripts.inc
@@ -1 +0,0 @@
-SecretBase_BrownCave3_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_BrownCave4/scripts.inc
+++ b/data/maps/SecretBase_BrownCave4/scripts.inc
@@ -1 +0,0 @@
-SecretBase_BrownCave4_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_RedCave1/scripts.inc
+++ b/data/maps/SecretBase_RedCave1/scripts.inc
@@ -1 +0,0 @@
-SecretBase_RedCave1_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_RedCave2/scripts.inc
+++ b/data/maps/SecretBase_RedCave2/scripts.inc
@@ -1 +0,0 @@
-SecretBase_RedCave2_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_RedCave3/scripts.inc
+++ b/data/maps/SecretBase_RedCave3/scripts.inc
@@ -1 +0,0 @@
-SecretBase_RedCave3_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_RedCave4/scripts.inc
+++ b/data/maps/SecretBase_RedCave4/scripts.inc
@@ -1 +0,0 @@
-SecretBase_RedCave4_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_Shrub1/scripts.inc
+++ b/data/maps/SecretBase_Shrub1/scripts.inc
@@ -1 +0,0 @@
-SecretBase_Shrub1_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_Shrub2/scripts.inc
+++ b/data/maps/SecretBase_Shrub2/scripts.inc
@@ -1 +0,0 @@
-SecretBase_Shrub2_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_Shrub3/scripts.inc
+++ b/data/maps/SecretBase_Shrub3/scripts.inc
@@ -1 +0,0 @@
-SecretBase_Shrub3_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_Shrub4/scripts.inc
+++ b/data/maps/SecretBase_Shrub4/scripts.inc
@@ -1 +0,0 @@
-SecretBase_Shrub4_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_Tree1/scripts.inc
+++ b/data/maps/SecretBase_Tree1/scripts.inc
@@ -1 +0,0 @@
-SecretBase_Tree1_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_Tree2/scripts.inc
+++ b/data/maps/SecretBase_Tree2/scripts.inc
@@ -1 +0,0 @@
-SecretBase_Tree2_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_Tree3/scripts.inc
+++ b/data/maps/SecretBase_Tree3/scripts.inc
@@ -1 +0,0 @@
-SecretBase_Tree3_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_Tree4/scripts.inc
+++ b/data/maps/SecretBase_Tree4/scripts.inc
@@ -1 +0,0 @@
-SecretBase_Tree4_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_YellowCave1/scripts.inc
+++ b/data/maps/SecretBase_YellowCave1/scripts.inc
@@ -1 +0,0 @@
-SecretBase_YellowCave1_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_YellowCave2/scripts.inc
+++ b/data/maps/SecretBase_YellowCave2/scripts.inc
@@ -1 +0,0 @@
-SecretBase_YellowCave2_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_YellowCave3/scripts.inc
+++ b/data/maps/SecretBase_YellowCave3/scripts.inc
@@ -1 +0,0 @@
-SecretBase_YellowCave3_MapScripts:: @ 823B483
--- a/data/maps/SecretBase_YellowCave4/scripts.inc
+++ b/data/maps/SecretBase_YellowCave4/scripts.inc
@@ -1,24 +0,0 @@
-SecretBase_YellowCave4_MapScripts:: @ 823B483
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_23B498
-	map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_23B4AE
-	map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_23B4B8
-	.byte 0
-
-SecretBase_RedCave1_MapScript2_23B498: @ 823B498
-	map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, EventScript_275D0C
-	.2byte 0
-
-SecretBase_RedCave1_OnTransition: @ 823B4A2
-	call SecretBase_RedCave1_EventScript_275CE1
-	special SetSecretBaseOwnerGfxId
-	special sub_80EB1AC
-	end
-
-SecretBase_RedCave1_MapScript2_23B4AE: @ 823B4AE
-	map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_RedCave1_EventScript_275B81
-	.2byte 0
-
-SecretBase_RedCave1_MapScript1_23B4B8: @ 823B4B8
-	setstepcallback 6
-	end
				`@@ -1 +0,0 @@`
				`SecretBase_BlueCave1_MapScripts:: @ 823B483`
				`@@ -1 +0,0 @@`
				`SecretBase_BlueCave2_MapScripts:: @ 823B483`
				`@@ -1 +0,0 @@`
				`SecretBase_BlueCave3_MapScripts:: @ 823B483`
				`@@ -1 +0,0 @@`
				`SecretBase_BlueCave4_MapScripts:: @ 823B483`
				`@@ -1 +0,0 @@`
				`SecretBase_BrownCave1_MapScripts:: @ 823B483`
				`@@ -1 +0,0 @@`
				`SecretBase_BrownCave2_MapScripts:: @ 823B483`
				`@@ -1 +0,0 @@`
				`SecretBase_BrownCave3_MapScripts:: @ 823B483`
				`@@ -1 +0,0 @@`
				`SecretBase_BrownCave4_MapScripts:: @ 823B483`
				`@@ -1 +0,0 @@`
				`SecretBase_YellowCave1_MapScripts:: @ 823B483`
				`@@ -1 +0,0 @@`
				`SecretBase_YellowCave2_MapScripts:: @ 823B483`