summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s28
-rw-r--r--data/maps/MossdeepCity_House4/scripts.inc2
-rw-r--r--data/maps/SecretBase_YellowCave4/scripts.inc2
-rw-r--r--data/scripts/secret_base.inc38
-rw-r--r--data/scripts/secret_power_tm.inc8
-rw-r--r--data/specials.inc46
6 files changed, 62 insertions, 62 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 5c3c408aa..2587c63d2 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -454,7 +454,7 @@ EventScript_SecretBasePC:: @ 823B4BB
EventScript_SecretBasePCShowMainMenu:: @ 823B4D3
message Text_SecretBasePCStartMenu
waitmessage
- goto_if_set FLAG_DECORATION_16, EventScript_SecretBasePCMainMenuChoice
+ goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, EventScript_SecretBasePCMainMenuChoice
goto EventScript_23B531
end
@@ -487,16 +487,16 @@ EventScript_23B568:: @ 823B568
compare VAR_RESULT, 0
goto_if_eq EventScript_SecretBasePCShowMainMenu
closemessage
- special sub_80E9AC0
+ special MoveOutOfSecretBase
releaseall
end
EventScript_23B581:: @ 823B581
- special sub_80E9C74
+ special ShowSecretBaseDecorationMenu
end
EventScript_23B585:: @ 823B585
- special sub_80E9C88
+ special ShowSecretBaseRegistryMenu
end
EventScript_RecordMixingSecretBasePC:: @ 823B589
@@ -529,17 +529,17 @@ gUnknown_0823B5E9:: @ 823B5E9
end
EventScript_23B5F0:: @ 823B5F0
- special sub_80E9BDC
+ special GetCurSecretBaseRegistrationValidity
compare VAR_RESULT, 1
goto_if_eq EventScript_23B62F
compare VAR_RESULT, 2
goto_if_eq EventScript_CantRegisterTooManyBases
- special sub_80E980C
- msgbox Text_276707, MSGBOX_YESNO
+ special CopyCurSecretBaseOwnerName_StrVar1
+ msgbox Text_WantToRegisterSecretBase, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_23B5A1
msgbox Text_2767D1, MSGBOX_SIGN
- special sub_80E9C2C
+ special ToggleCurSecretBaseRegistry
special DoSecretBasePCTurnOffEffect
releaseall
end
@@ -549,7 +549,7 @@ EventScript_23B62F:: @ 823B62F
compare VAR_RESULT, 0
goto_if_eq EventScript_23B5A1
msgbox Text_2767E9, MSGBOX_SIGN
- special sub_80E9C2C
+ special ToggleCurSecretBaseRegistry
special DoSecretBasePCTurnOffEffect
releaseall
end
@@ -573,23 +573,23 @@ EventScript_23B66E:: @ 823B66E
end
EventScript_23B674:: @ 823B674
- special sub_80EB498
+ special SetSecretBaseSecretsTvFlags_Poster
end
EventScript_23B678:: @ 823B678
- special sub_80EB56C
+ special SetSecretBaseSecretsTvFlags_MiscFurnature
end
EventScript_23B67C:: @ 823B67C
- special sub_80EB9E0
+ special SetSecretBaseSecretsTvFlags_LargeDecorationSpot
end
EventScript_23B680:: @ 823B680
- special sub_80EBB28
+ special SetSecretBaseSecretsTvFlags_SmallDecorationSpot
end
EventScript_SecretBaseSandOrnament:: @ 823B684
- special sub_80EBE7C
+ special SetSecretBaseSecretsTvFlags_SandOrnament
dofieldeffect FLDEFF_SAND_PILLAR
waitstate
end
diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc
index 1763a9c46..4505b1f03 100644
--- a/data/maps/MossdeepCity_House4/scripts.inc
+++ b/data/maps/MossdeepCity_House4/scripts.inc
@@ -17,7 +17,7 @@ MossdeepCity_House4_EventScript_222DED:: @ 8222DED
MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7
lock
faceplayer
- special sub_80E8BC8
+ special CheckPlayerHasSecretBase
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_House4_EventScript_222E14
special GetSecretBaseNearbyMapName
diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc
index 805d7e299..c4ddb3a9e 100644
--- a/data/maps/SecretBase_YellowCave4/scripts.inc
+++ b/data/maps/SecretBase_YellowCave4/scripts.inc
@@ -11,7 +11,7 @@ SecretBase_RedCave1_MapScript2_23B498: @ 823B498
SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2
call SecretBase_RedCave1_EventScript_275CE1
- special sub_80E95D4
+ special SetSecretBaseOwnerGfxId
special sub_80EB1AC
end
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 347513636..a20469345 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -310,8 +310,8 @@ SecretBase_RedCave1_Text_275944: @ 8275944
.string "Are you speechless?$"
EventScript_2759F1:: @ 82759F1
- special sub_80E8C98
- special sub_80E8BC8
+ special GetSecretBaseTypeInFrontOfPlayer
+ special CheckPlayerHasSecretBase
compare VAR_RESULT, 1
goto_if_eq EventScript_275BE8
checkpartymove MOVE_SECRET_POWER
@@ -432,11 +432,11 @@ EventScript_275B5B:: @ 8275B5B
playse SE_KAIDAN
setvar VAR_INIT_SECRET_BASE, 0
setflag FLAG_DECORATION_0
- special sub_80E8E18
- special sub_80E9068
+ special SetPlayerSecretBase
+ special EnterSecretBase
setvar VAR_0x8004, 0
setvar VAR_0x8005, 0
- special sub_80E933C
+ special InitSecretBaseDecorationSprites
setvar VAR_SECRET_BASE_INITIALIZED, 1
waitstate
end
@@ -450,13 +450,13 @@ SecretBase_RedCave1_EventScript_275B81:: @ 8275B81
goto_if_eq SecretBase_RedCave1_EventScript_275BAB
closemessage
playse SE_KAIDAN
- special sub_80E9A90
+ special ClearAndLeaveSecretBase
end
SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB
closemessage
setflag FLAG_RECEIVED_SECRET_POWER
- special sub_80E91F8
+ special EnterNewlyCreatedSecretBase
waitstate
end
@@ -469,18 +469,18 @@ EventScript_275BB7:: @ 8275BB7
lockall
setvar VAR_INIT_SECRET_BASE, 1
playse SE_KAIDAN
- special sub_80E9744
+ special IsCurSecretBaseOwnedByAnotherPlayer
compare VAR_RESULT, 0
goto_if_eq EventScript_275BDB
clearflag FLAG_DECORATION_0
- special sub_80E9068
+ special EnterSecretBase
setvar VAR_SECRET_BASE_INITIALIZED, 0
waitstate
end
EventScript_275BDB:: @ 8275BDB
setflag FLAG_DECORATION_0
- special sub_80E9068
+ special EnterSecretBase
setvar VAR_SECRET_BASE_INITIALIZED, 0
waitstate
end
@@ -500,7 +500,7 @@ EventScript_275BE8:: @ 8275BE8
compare VAR_RESULT, 0
goto_if_eq EventScript_275CDE
fadescreenswapbuffers 1
- special sub_80E9B70
+ special MoveOutOfSecretBaseFromOutside
closemessage
fadescreenswapbuffers 0
msgbox Text_276A95, MSGBOX_YESNO
@@ -569,7 +569,7 @@ SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1
EventScript_275D0C:: @ 8275D0C
setvar VAR_0x8004, 0
setvar VAR_0x8005, 0
- special sub_80E933C
+ special InitSecretBaseDecorationSprites
setvar VAR_SECRET_BASE_INITIALIZED, 1
end
@@ -626,7 +626,7 @@ SecretBase_YellowCave1_EventScript_275D64:: @ 8275D64
SecretBase_YellowCave2_EventScript_275D64:: @ 8275D64
SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64
SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64
- special sub_80EA354
+ special GetSecretBaseOwnerInteractionState
compare VAR_0x8004, 0
goto_if_eq SecretBase_RedCave1_EventScript_275DD6
compare VAR_0x8004, 1
@@ -1010,7 +1010,7 @@ SecretBase_RedCave1_EventScript_27627C:: @ 827627C
end
SecretBase_RedCave1_EventScript_276286:: @ 8276286
- special sub_80EA2E4
+ special PrepSecretBaseBattleFlags
setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE
setvar VAR_0x8005, 0
special DoSpecialTrainerBattle
@@ -1039,12 +1039,20 @@ SecretBase_RedCave1_EventScript_2762C5:: @ 82762C5
.include "data/scripts/secret_power_tm.inc"
+SecretBase_EventScript_DollInteract:: @ 82766A2
+ special sub_80EB290
+ end
+
+SecretBase_EventScript_CushionInteract:: @ 82766A6
+ special sub_80EB2C8
+ end
+
Text_2766AA: @ 82766AA
.string "All decorations and furniture in your\n"
.string "SECRET BASE will be returned to your PC.\p"
.string "Is that okay?$"
-Text_276707: @ 8276707
+Text_WantToRegisterSecretBase: @ 8276707
.string "Do you want to register\n"
.string "{STR_VAR_1}'s SECRET BASE?$"
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index ed7216357..647064829 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -103,11 +103,3 @@ Route111_Movement_276696: @ 8276696
walk_down
walk_down
step_end
-
-EventScript_SecretPower1:: @ 82766A2
- special sub_80EB290
- end
-
-EventScript_SecretPower2:: @ 82766A6
- special sub_80EB2C8
- end
diff --git a/data/specials.inc b/data/specials.inc
index e16b2753d..7a2b0f975 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -14,25 +14,25 @@ gSpecials:: @ 81DBA64
def_special sub_80AF9F8
def_special CleanupLinkRoomState
def_special ExitLinkRoom
- def_special sub_80E8E18
- def_special sub_80E8BC8
- def_special sub_80E9068
- def_special sub_80E9A90
- def_special sub_80E9AC0
- def_special sub_80E9744
- def_special sub_80E9BDC
- def_special sub_80E9C2C
- def_special sub_80E9C74
- def_special sub_80E9C88
- def_special sub_80EA2E4
- def_special sub_80EA354
- def_special sub_80E933C
+ def_special SetPlayerSecretBase
+ def_special CheckPlayerHasSecretBase
+ def_special EnterSecretBase
+ def_special ClearAndLeaveSecretBase
+ def_special MoveOutOfSecretBase
+ def_special IsCurSecretBaseOwnedByAnotherPlayer
+ def_special GetCurSecretBaseRegistrationValidity
+ def_special ToggleCurSecretBaseRegistry
+ def_special ShowSecretBaseDecorationMenu
+ def_special ShowSecretBaseRegistryMenu
+ def_special PrepSecretBaseBattleFlags
+ def_special GetSecretBaseOwnerInteractionState
+ def_special InitSecretBaseDecorationSprites
def_special sub_8127E18
def_special sub_81297AC
- def_special sub_80E8C98
- def_special sub_80E95D4
+ def_special GetSecretBaseTypeInFrontOfPlayer
+ def_special SetSecretBaseOwnerGfxId
def_special sub_8129708
- def_special sub_80E91F8
+ def_special EnterNewlyCreatedSecretBase
def_special sub_80EA30C
def_special DoSecretBasePCTurnOffEffect
def_special RecordMixingPlayerSpotTriggered
@@ -313,7 +313,7 @@ gSpecials:: @ 81DBA64
def_special sub_80AFC60
def_special PutZigzagoonInPlayerParty
def_special IsStarterInParty
- def_special sub_80E980C
+ def_special CopyCurSecretBaseOwnerName_StrVar1
def_special ScriptCheckFreePokemonStorageSpace
def_special DoSealedChamberShakingEffect1
def_special sub_8139B60
@@ -340,7 +340,7 @@ gSpecials:: @ 81DBA64
def_special ScriptGetPartyMonSpecies
def_special sub_81B98DC
def_special nullsub_54
- def_special sub_80E9B70
+ def_special MoveOutOfSecretBaseFromOutside
def_special LoadPlayerBag
def_special sub_80B05B4
def_special SetPacifidlogTMReceivedDay
@@ -361,17 +361,17 @@ gSpecials:: @ 81DBA64
def_special sub_80EED10
def_special sub_80EED34
def_special sub_80EB1AC
- def_special sub_80EBE7C
+ def_special SetSecretBaseSecretsTvFlags_SandOrnament
def_special sub_80EB300
def_special sub_80EB438
def_special sub_80EB368
def_special sub_80EB3D0
def_special sub_80EB290
def_special sub_80EB2C8
- def_special sub_80EB56C
- def_special sub_80EB9E0
- def_special sub_80EBB28
- def_special sub_80EB498
+ def_special SetSecretBaseSecretsTvFlags_MiscFurnature
+ def_special SetSecretBaseSecretsTvFlags_LargeDecorationSpot
+ def_special SetSecretBaseSecretsTvFlags_SmallDecorationSpot
+ def_special SetSecretBaseSecretsTvFlags_Poster
def_special sub_818D9C0
def_special sub_818DAEC
def_special sub_818DBE8
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 10:14:15 +0000