Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)

2018-12-25 11:02:41 -06:00
parent c7971ecb20
commit dcbc8db6a3
31 changed files with 1055 additions and 1301 deletions
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1088,7 +1088,7 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
 	setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL
-	setflag FLAG_HIDE_ROUTE_111_DESERT_RIVAL
+	setflag FLAG_HIDE_ROUTE_111_PLAYER_DESCENT
 	setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
 	setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
--- a/data/layouts.inc
+++ b/data/layouts.inc
@@ -389,7 +389,7 @@
 	.include "data/layouts/DesertUnderpass/layout.inc"
 	.include "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc"
 	.include "data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc"
-	.include "data/layouts/UnknownMap_08470BD8/layout.inc"
+	.include "data/layouts/Route111_NoMirageTower/layout.inc"
 	.include "data/layouts/UnionRoom/layout.inc"
 	.include "data/layouts/SafariZone_Northeast/layout.inc"
 	.include "data/layouts/SafariZone_Southeast/layout.inc"
--- a/data/layouts/Route111_NoMirageTower/border.bin
+++ b/data/layouts/Route111_NoMirageTower/border.bin
--- a/data/layouts/Route111_NoMirageTower/layout.inc
+++ b/data/layouts/Route111_NoMirageTower/layout.inc
@@ -0,0 +1,14 @@
+Route111_NoMirageTower_MapBorder::
+	.incbin "data/layouts/Route111_NoMirageTower/border.bin"
+
+Route111_NoMirageTower_MapBlockdata::
+	.incbin "data/layouts/Route111_NoMirageTower/map.bin"
+
+	.align 2
+Route111_NoMirageTower_Layout::
+	.4byte 0x28
+	.4byte 0x8C
+	.4byte Route111_NoMirageTower_MapBorder
+	.4byte Route111_NoMirageTower_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
--- a/data/layouts/Route111_NoMirageTower/map.bin
+++ b/data/layouts/Route111_NoMirageTower/map.bin
--- a/data/layouts/UnknownMap_08470BD8/layout.inc
+++ b/data/layouts/UnknownMap_08470BD8/layout.inc
@@ -1,15 +0,0 @@
-UnknownMap_08470BD8_MapBorder::
-	.incbin "data/layouts/UnknownMap_08470BD8/border.bin"
-
-UnknownMap_08470BD8_MapBlockdata::
-	.incbin "data/layouts/UnknownMap_08470BD8/map.bin"
-
-	.align 2
-UnknownMap_08470BD8_Layout::
-	.4byte 0x28
-	.4byte 0x8C
-	.4byte UnknownMap_08470BD8_MapBorder
-	.4byte UnknownMap_08470BD8_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
--- a/data/layouts_table.inc
+++ b/data/layouts_table.inc
@@ -391,7 +391,7 @@ gMapLayouts::
 	.4byte DesertUnderpass_Layout
 	.4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout
 	.4byte BattleFrontier_BattleTowerCorridor2_Layout
-	.4byte UnknownMap_08470BD8_Layout
+	.4byte Route111_NoMirageTower_Layout
 	.4byte UnionRoom_Layout
 	.4byte SafariZone_Northeast_Layout
 	.4byte SafariZone_Southeast_Layout
--- a/data/maps/MauvilleCity/scripts.inc
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -4,7 +4,7 @@ MauvilleCity_MapScripts:: @ 81DF385

 MauvilleCity_MapScript1_1DF38B: @ 81DF38B
 	setflag FLAG_VISITED_MAUVILLE_CITY
-	clearflag FLAG_0x09D
+	clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
 	clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
 	setflag FLAG_SYS_TV_START
 	clearflag FLAG_0x063
--- a/data/maps/MirageTower_1F/scripts.inc
+++ b/data/maps/MirageTower_1F/scripts.inc
@@ -4,7 +4,7 @@ MirageTower_1F_MapScripts:: @ 823AD01

 MirageTower_1F_MapScript1_23AD07: @ 823AD07
 	setflag FLAG_0x8DC
-	setflag FLAG_0x09D
+	setflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
 	setflag FLAG_LANDMARK_MIRAGE_TOWER
 	end

--- a/data/maps/MirageTower_4F/scripts.inc
+++ b/data/maps/MirageTower_4F/scripts.inc
@@ -50,7 +50,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
 	setvar VAR_0x8007, 2
 	special sub_8139560
 	waitstate
-	special sub_81BE994
+	special DoMirageTowerCeilingCrumble
 	waitstate
 	setvar VAR_0x40CB, 1
 	clearflag FLAG_LANDMARK_MIRAGE_TOWER
--- a/data/maps/Route111/events.inc
+++ b/data/maps/Route111/events.inc
@@ -43,7 +43,7 @@ Route111_EventObjects: @ 85291F0
 	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, FLAG_ITEM_ROUTE_111_ELIXIR
 	object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 0, 0, Route111_EventScript_1F119B, 0
 	object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_FOSSIL
-	object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_RIVAL
+	object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_PLAYER_DESCENT
 	object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY

 Route111_MapWarps: @ 8529640
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -39,8 +39,8 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4

 Route111_MapScript1_1F0D87: @ 81F0D87
 	setvar VAR_0x40D6, 0
-	special sub_81BE79C
-	call_if_unset FLAG_0x14E, Route111_EventScript_1F0E3C
+	special SetMirageTowerVisibility
+	call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C
 	compare VAR_0x40CB, 1
 	call_if_eq Route111_EventScript_1F0DC2
 	compare VAR_0x40CB, 2
@@ -118,21 +118,21 @@ Route111_MapScript2_1F0E56: @ 81F0E56

 Route111_EventScript_1F0E60:: @ 81F0E60
 	lockall
-	special sub_81BEB68
+	special StartMirageTowerShake
 	waitstate
 	delay 24
 	playse SE_RU_HYUU
 	addobject 45
-	special sub_81BE7F4
+	special StartPlayerDescendMirageTower
 	waitstate
 	showobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
 	removeobject 45
 	delay 16
 	turnobject EVENT_OBJ_ID_PLAYER, 2
 	delay 16
-	special sub_81BEB54
+	special StartMirageTowerDisintegration
 	waitstate
-	special sub_81BEB7C
+	special StartMirageTowerFossilFallAndSink
 	waitstate
 	setvar VAR_0x40CB, 2
 	clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
@@ -415,7 +415,7 @@ Route111_EventScript_1F119B:: @ 81F119B
 	goto_if_eq Route111_EventScript_1F11C6
 	compare VAR_0x40CB, 2
 	goto_if_eq Route111_EventScript_1F11D0
-	goto_if_set FLAG_0x14E, Route111_EventScript_1F11DA
+	goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA
 	msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT
 	release
 	end
--- a/data/maps/Route112/scripts.inc
+++ b/data/maps/Route112/scripts.inc
@@ -3,7 +3,7 @@ Route112_MapScripts:: @ 81F1DA8
 	.byte 0

 Route112_MapScript1_1F1DAE: @ 81F1DAE
-	clearflag FLAG_0x09D
+	clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
 	setvar VAR_0x40BD, 0
 	end

--- a/data/maps/Route113/scripts.inc
+++ b/data/maps/Route113/scripts.inc
@@ -8,7 +8,7 @@ Route113_MapScript1_1F215E: @ 81F215E
 	end

 Route113_MapScript1_1F2161: @ 81F2161
-	clearflag FLAG_0x09D
+	clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
 	call Route113_EventScript_1F216A
 	end

--- a/data/specials.inc
+++ b/data/specials.inc
@@ -419,9 +419,9 @@ gSpecials:: @ 81DBA64
 	def_special ShouldTryGetTrainerScript
 	def_special ShowMapNamePopup
 	def_special ShowMapNamePopup
-	def_special sub_81BE994
-	def_special sub_81BE79C
-	def_special sub_81BE7F4
+	def_special DoMirageTowerCeilingCrumble
+	def_special SetMirageTowerVisibility
+	def_special StartPlayerDescendMirageTower
 	def_special sub_81398C0
 	def_special IsWirelessAdapterConnected
 	def_special BerryBlenderLinkBecomeLeader
@@ -491,9 +491,9 @@ gSpecials:: @ 81DBA64
 	def_special sub_813AFC8
 	def_special sub_813B1D0
 	def_special CreateObedientEnemyMon
-	def_special sub_81BEB54
-	def_special sub_81BEB68
-	def_special sub_81BEB7C
+	def_special StartMirageTowerDisintegration
+	def_special StartMirageTowerShake
+	def_special StartMirageTowerFossilFallAndSink
 	def_special ChangeBoxPokemonNickname
 	def_special get_unknown_box_id
 	def_special sub_813B21C