diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-24 15:23:48 -0400 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-24 15:23:48 -0400 |
commit | faf8130585a19ec0394295dc26dcc8dd2a9f7bbd (patch) | |
tree | d91dff9bc29ac4bd7c91db1d259e75853695432e /data | |
parent | 21b8fb4fbd85796df30c7211b98a2c557c35a69e (diff) |
Sync shared_secret_base.inc
Diffstat (limited to 'data')
53 files changed, 261 insertions, 288 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 6b904fbd3..bb4b87130 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -51,11 +51,11 @@ gSpecialVars:: gStdScripts:: .4byte Std_ObtainItem .4byte Std_FindItem - .4byte Std_2 - .4byte Std_3 - .4byte Std_4 - .4byte Std_5 - .4byte Std_6 + .4byte Std_MsgboxNPC + .4byte Std_MsgboxSign + .4byte Std_MsgboxDefault + .4byte Std_MsgboxYesNo + .4byte Std_MsgboxAutoclose .4byte Std_ObtainDecoration gStdScripts_End:: @@ -375,198 +375,7 @@ gStdScripts_End:: .include "data/maps/ShoalCave_LowTideIceRoom/scripts.inc" .include "data/maps/SkyPillar_5F/scripts.inc" .include "data/maps/SkyPillar_Top/scripts.inc" - .include "data/maps/SecretBase_BlueCave1/scripts.inc" - .include "data/maps/SecretBase_BlueCave2/scripts.inc" - .include "data/maps/SecretBase_BlueCave3/scripts.inc" - .include "data/maps/SecretBase_BlueCave4/scripts.inc" - .include "data/maps/SecretBase_BrownCave1/scripts.inc" - .include "data/maps/SecretBase_BrownCave2/scripts.inc" - .include "data/maps/SecretBase_BrownCave3/scripts.inc" - .include "data/maps/SecretBase_BrownCave4/scripts.inc" - .include "data/maps/SecretBase_RedCave1/scripts.inc" - .include "data/maps/SecretBase_RedCave2/scripts.inc" - .include "data/maps/SecretBase_RedCave3/scripts.inc" - .include "data/maps/SecretBase_RedCave4/scripts.inc" - .include "data/maps/SecretBase_Shrub1/scripts.inc" - .include "data/maps/SecretBase_Shrub2/scripts.inc" - .include "data/maps/SecretBase_Shrub3/scripts.inc" - .include "data/maps/SecretBase_Shrub4/scripts.inc" - .include "data/maps/SecretBase_Tree1/scripts.inc" - .include "data/maps/SecretBase_Tree2/scripts.inc" - .include "data/maps/SecretBase_Tree3/scripts.inc" - .include "data/maps/SecretBase_Tree4/scripts.inc" - .include "data/maps/SecretBase_YellowCave1/scripts.inc" - .include "data/maps/SecretBase_YellowCave2/scripts.inc" - .include "data/maps/SecretBase_YellowCave3/scripts.inc" - .include "data/maps/SecretBase_YellowCave4/scripts.inc" - -gUnknown_0815F36C:: @ 815F36C - lockall - playse SE_PC_LOGON - message UnknownString_81A3A72 - dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON - waitstate - waitmessage - waitbuttonpress - playse SE_SELECT - goto EventScript_15F384 - end - -EventScript_15F384: - message UnknownString_81A3A87 - waitmessage - goto_if_set FLAG_DECORATION_16, EventScript_15F3A0 - goto EventScript_15F3E2 - end - -gUnknown_0815F399:: @ 815F399 - lockall - goto EventScript_15F384 - end - -EventScript_15F3A0: - multichoice 0, 0, 6, 0 - switch VAR_RESULT - case 0, EventScript_15F432 - case 1, EventScript_15F419 - case 2, EventScript_15F436 - case 3, EventScript_15F51D - case 127, EventScript_15F51D - end - -EventScript_15F3E2: - multichoice 0, 0, 5, 0 - switch VAR_RESULT - case 0, EventScript_15F432 - case 1, EventScript_15F419 - case 2, EventScript_15F51D - case 127, EventScript_15F51D - end - -EventScript_15F419: - msgbox UnknownString_81A38FB, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq EventScript_15F384 - closemessage - special SecretBasePC_PackUp - releaseall - end - -EventScript_15F432: - special SecretBasePC_Decoration - end - -EventScript_15F436: - special SecretBasePC_Registry - end - -gUnknown_0815F43A:: @ 815F43A - lockall - message UnknownString_81A3A72 - playse SE_PC_LOGON - dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON - waitstate - waitmessage - waitbuttonpress - playse SE_SELECT - goto EventScript_15F452 - end - -EventScript_15F452: - message UnknownString_81A3A87 - waitmessage - multichoice 0, 0, 7, 0 - switch VAR_RESULT - case 0, EventScript_15F4A1 - case 1, EventScript_15F436 - case 2, EventScript_15F511 - case 3, EventScript_15F51D - case 127, EventScript_15F51D - end - -gUnknown_0815F49A:: @ 815F49A - lockall - goto EventScript_15F452 - end - -EventScript_15F4A1: - special sub_80BC56C - compare VAR_RESULT, 1 - goto_if_eq EventScript_15F4E0 - compare VAR_RESULT, 2 - goto_if_eq EventScript_15F503 - special BufferSecretBaseOwnerName - msgbox UnknownString_81A3958, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq EventScript_15F452 - msgbox UnknownString_81A3A22, MSGBOX_SIGN - special sub_80BC5BC - special DoSecretBasePCTurnOffEffect - releaseall - end - -EventScript_15F4E0: - msgbox UnknownString_81A3982, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq EventScript_15F452 - msgbox UnknownString_81A3A3A, MSGBOX_SIGN - special sub_80BC5BC - special DoSecretBasePCTurnOffEffect - releaseall - end - -EventScript_15F503: - msgbox UnknownString_81A39C0, MSGBOX_SIGN - special DoSecretBasePCTurnOffEffect - closemessage - releaseall - end - -EventScript_15F511: - message UnknownString_81A3AA2 - waitmessage - goto EventScript_15F452 - end - -EventScript_15F51D: - special DoSecretBasePCTurnOffEffect - closemessage - releaseall - end - -gUnknown_0815F523:: @ 815F523 - dofieldeffect FLDEFF_SAND_PILLAR - waitstate - end - -gUnknown_0815F528:: @ 815F528 - special GetShieldToyTVDecorationInfo - compare VAR_RESULT, 0 - goto_if_eq EventScript_15F558 - compare VAR_RESULT, 1 - goto_if_eq EventScript_15F561 - compare VAR_RESULT, 2 - goto_if_eq EventScript_15F56A - compare VAR_RESULT, 3 - goto_if_eq EventScript_15F573 - end - -EventScript_15F558: - msgbox UnknownString_81A3B5B, MSGBOX_SIGN - end - -EventScript_15F561: - msgbox UnknownString_81A3BA4, MSGBOX_SIGN - end - -EventScript_15F56A: - msgbox UnknownString_81A3BE8, MSGBOX_SIGN - end - -EventScript_15F573: - msgbox UnknownString_81A3C31, MSGBOX_SIGN - end - + .include "data/scripts/shared_secret_base.inc" .include "data/maps/SingleBattleColosseum/scripts.inc" .include "data/maps/TradeCenter/scripts.inc" .include "data/maps/RecordCorner/scripts.inc" @@ -901,7 +710,7 @@ UnknownString_819C21F: @ 819C21F .include "data/maps/Route124_DivingTreasureHuntersHouse/text.inc" -Std_2: +Std_MsgboxNPC: lock faceplayer message 0x0 @@ -910,7 +719,7 @@ Std_2: release return -Std_3: +Std_MsgboxSign: lockall message 0x0 waitmessage @@ -918,13 +727,13 @@ Std_3: releaseall return -Std_4: +Std_MsgboxDefault: message 0x0 waitmessage waitbuttonpress return -Std_5: +Std_MsgboxYesNo: message 0x0 waitmessage yesnobox 20, 8 @@ -1069,7 +878,7 @@ EventScript_19F934: EventScript_19F936: gotobeatenscript -Std_6:: +Std_MsgboxAutoclose:: message 0x0 waitmessage waitbuttonpress @@ -3713,21 +3522,21 @@ EventScript_1A2DAA: EventScript_1A2DB8: closemessage playse SE_KAIDAN - setvar VAR_0x4097, 0 + setvar VAR_INIT_SECRET_BASE, 0 setflag FLAG_DECORATION_1 special sub_80BB8CC special sub_80BBAF0 setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 special sub_80BBDD0 - setvar VAR_0x4089, 1 + setvar VAR_SECRET_BASE_INITIALIZED, 1 waitstate end -SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE +SecretBase_EventScript_FirstEntrance:: @ 81A2DDE applymovement 255, SecretBase_RedCave1_Movement_1A2E11 waitmovement 0 - setvar VAR_0x4097, 1 + setvar VAR_INIT_SECRET_BASE, 1 msgbox SecretBase_RedCave1_Text_198F89, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 @@ -3750,21 +3559,21 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 gUnknown_081A2E14:: @ 81A2E14 lockall - setvar VAR_0x4097, 1 + setvar VAR_INIT_SECRET_BASE, 1 playse SE_KAIDAN special sub_80BC114 compare VAR_RESULT, 0 goto_if_eq EventScript_1A2E38 clearflag FLAG_DECORATION_1 special sub_80BBAF0 - setvar VAR_0x4089, 0 + setvar VAR_SECRET_BASE_INITIALIZED, 0 waitstate end EventScript_1A2E38: setflag FLAG_DECORATION_1 special sub_80BBAF0 - setvar VAR_0x4089, 0 + setvar VAR_SECRET_BASE_INITIALIZED, 0 waitstate end @@ -3779,7 +3588,7 @@ AskToMoveSecretBase: msgbox UnknownString_81A3C71, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_1A2F3A - msgbox UnknownString_81A38FB, MSGBOX_YESNO + msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_1A2F3A fadescreen 1 @@ -3829,9 +3638,7 @@ EventScript_1A2F3A:: releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D:: @ 81A2F3D -LittlerootTown_MaysHouse_2F_EventScript_1A2F3D:: @ 81A2F3D -SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D +SecretBase_EventScript_SetDecorationFlags:: @ 81A2F3D setflag FLAG_DECORATION_2 setflag FLAG_DECORATION_3 setflag FLAG_DECORATION_4 @@ -3848,13 +3655,11 @@ SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D setflag FLAG_DECORATION_15 return -LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68 -LittlerootTown_MaysHouse_2F_EventScript_1A2F68:: @ 81A2F68 -SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68 +SecretBase_EventScript_InitDecorations:: @ 81A2F68 setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 special sub_80BBDD0 - setvar VAR_0x4089, 1 + setvar VAR_SECRET_BASE_INITIALIZED, 1 end gUnknown_081A2F7B:: @ 81A2F7B @@ -4286,59 +4091,59 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A .include "data/text/secret_power_tm.inc" .include "data/scripts/secret_power_tm.inc" -UnknownString_81A38FB: @ 81A38FB +SecretBase_Text_AllDecorationsWillBeReturned: @ 81A38FB .string "All decorations and furniture in your\n" .string "SECRET BASE will be returned to your PC.\p" .string "Is that okay?$" -UnknownString_81A3958: @ 81A3958 +SecretBase_Text_WantToRegisterSecretBase: @ 81A3958 .string "Do you want to register\n" .string "{STR_VAR_1}'s SECRET BASE?$" -UnknownString_81A3982: @ 81A3982 +SecretBase_Text_AlreadyRegisteredDelete: @ 81A3982 .string "This data is already registered.\n" .string "Would you like to delete it?$" -UnknownString_81A39C0: @ 81A39C0 +SecretBase_Text_TooManyBasesDeleteSome: @ 81A39C0 .string "Up to 10 locations can be registered.\p" .string "Delete a location if you want to\n" .string "register another location.$" -UnknownString_81A3A22: @ 81A3A22 +SecretBase_Text_RegistrationCompleted: @ 81A3A22 .string "Registration completed.$" -UnknownString_81A3A3A: @ 81A3A3A +SecretBase_Text_DataUnregistered: @ 81A3A3A .string "Data has been unregistered.$" UnknownString_81A3A56: @ 81A3A56 .string "There are no decorations...$" -UnknownString_81A3A72: @ 81A3A72 +SecretBase_Text_BootUpPC: @ 81A3A72 .string "{PLAYER} booted up the PC.$" -UnknownString_81A3A87: @ 81A3A87 +SecretBase_Text_WhatWouldYouLikeToDo: @ 81A3A87 .string "What would you like to do?$" -UnknownString_81A3AA2: @ 81A3AA2 +SecretBase_Text_RegistryInfo: @ 81A3AA2 .string "The registered SECRET BASE will remain\n" .string "unless the owner moves away.\p" .string "If it is removed from the registry,\n" .string "another SECRET BASE may take its place.\p" .string "Up to ten locations can be registered.{PAUSE_UNTIL_PRESS}$" -UnknownString_81A3B5B: @ 81A3B5B +SecretBase_Text_BattleTowerShield: @ 81A3B5B .string "A shield of {STR_VAR_2} that marks winning\n" .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" -UnknownString_81A3BA4: @ 81A3BA4 +SecretBase_Text_ToyTV: @ 81A3BA4 .string "A realistic toy TV. It could be easily\n" .string "mistaken for the real thing.$" -UnknownString_81A3BE8: @ 81A3BE8 +SecretBase_Text_SeedotTV: @ 81A3BE8 .string "A toy TV shaped like a SEEDOT.\n" .string "It looks ready to roll away on its own...$" -UnknownString_81A3C31: @ 81A3C31 +SecretBase_Text_SkittyTV: @ 81A3C31 .string "A toy TV shaped like a SKITTY.\n" .string "It looks ready to stroll away...$" diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 133163ac5..bac89c25e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -7,8 +7,8 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_2F_EventScript_1527CE compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6950 - call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D - setvar VAR_0x4089, 0 + call SecretBase_EventScript_SetDecorationFlags + setvar VAR_SECRET_BASE_INITIALIZED, 0 end LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE @@ -17,13 +17,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE return LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA - map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4 + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4 .2byte 0 LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 checkplayergender compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 + goto_if_eq SecretBase_EventScript_InitDecorations end @ 81527F1 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index a71baa3f5..7a176908b 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -7,8 +7,8 @@ LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950 - call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D - setvar VAR_0x4089, 0 + call SecretBase_EventScript_SetDecorationFlags + setvar VAR_SECRET_BASE_INITIALIZED, 0 end LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A @@ -17,13 +17,13 @@ LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A return LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 - map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90 + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90 .2byte 0 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 checkplayergender compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 + goto_if_eq SecretBase_EventScript_InitDecorations end LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 1100ada56..cafc327b2 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BLUE_CAVE1", "name": "SecretBase_BlueCave1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BlueCave1/scripts.inc b/data/maps/SecretBase_BlueCave1/scripts.inc deleted file mode 100644 index bca6bee55..000000000 --- a/data/maps/SecretBase_BlueCave1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index 8b3b35721..f3e9d8062 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BLUE_CAVE2", "name": "SecretBase_BlueCave2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BlueCave2/scripts.inc b/data/maps/SecretBase_BlueCave2/scripts.inc deleted file mode 100644 index 4fc579fb9..000000000 --- a/data/maps/SecretBase_BlueCave2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 11ab94ef5..2304dd2a5 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BLUE_CAVE3", "name": "SecretBase_BlueCave3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BlueCave3/scripts.inc b/data/maps/SecretBase_BlueCave3/scripts.inc deleted file mode 100644 index 0a8199f19..000000000 --- a/data/maps/SecretBase_BlueCave3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index ce0338ac4..dedff942d 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BLUE_CAVE4", "name": "SecretBase_BlueCave4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BlueCave4/scripts.inc b/data/maps/SecretBase_BlueCave4/scripts.inc deleted file mode 100644 index 72c1e9612..000000000 --- a/data/maps/SecretBase_BlueCave4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 4df7c9b36..6f6d65d57 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BROWN_CAVE1", "name": "SecretBase_BrownCave1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BrownCave1/scripts.inc b/data/maps/SecretBase_BrownCave1/scripts.inc deleted file mode 100644 index ddbf182e4..000000000 --- a/data/maps/SecretBase_BrownCave1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index f96c7ac37..f335e4198 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BROWN_CAVE2", "name": "SecretBase_BrownCave2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BrownCave2/scripts.inc b/data/maps/SecretBase_BrownCave2/scripts.inc deleted file mode 100644 index 06dcb6335..000000000 --- a/data/maps/SecretBase_BrownCave2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index b1c136f37..a228d136e 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BROWN_CAVE3", "name": "SecretBase_BrownCave3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BrownCave3/scripts.inc b/data/maps/SecretBase_BrownCave3/scripts.inc deleted file mode 100644 index a0a85dc11..000000000 --- a/data/maps/SecretBase_BrownCave3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index 348b19024..740e16515 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BROWN_CAVE4", "name": "SecretBase_BrownCave4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BrownCave4/scripts.inc b/data/maps/SecretBase_BrownCave4/scripts.inc deleted file mode 100644 index 12d931e9e..000000000 --- a/data/maps/SecretBase_BrownCave4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index 8ef1182dc..46ff6b973 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_RED_CAVE1", "name": "SecretBase_RedCave1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_RedCave1/scripts.inc b/data/maps/SecretBase_RedCave1/scripts.inc deleted file mode 100644 index 77b99daec..000000000 --- a/data/maps/SecretBase_RedCave1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index 9746434b2..b610dbbb7 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_RED_CAVE2", "name": "SecretBase_RedCave2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_RedCave2/scripts.inc b/data/maps/SecretBase_RedCave2/scripts.inc deleted file mode 100644 index 735d386fc..000000000 --- a/data/maps/SecretBase_RedCave2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index 4ea1ae21f..23522278a 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_RED_CAVE3", "name": "SecretBase_RedCave3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_RedCave3/scripts.inc b/data/maps/SecretBase_RedCave3/scripts.inc deleted file mode 100644 index c9b72ca30..000000000 --- a/data/maps/SecretBase_RedCave3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index 458d8e469..3f9c09a84 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_RED_CAVE4", "name": "SecretBase_RedCave4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_RedCave4/scripts.inc b/data/maps/SecretBase_RedCave4/scripts.inc deleted file mode 100644 index 6d2402f03..000000000 --- a/data/maps/SecretBase_RedCave4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index 4b314b856..3ee8d9072 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_SHRUB1", "name": "SecretBase_Shrub1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Shrub1/scripts.inc b/data/maps/SecretBase_Shrub1/scripts.inc deleted file mode 100644 index 79116a0cf..000000000 --- a/data/maps/SecretBase_Shrub1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 10463cf97..bdbdf0407 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_SHRUB2", "name": "SecretBase_Shrub2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Shrub2/scripts.inc b/data/maps/SecretBase_Shrub2/scripts.inc deleted file mode 100644 index 49835f7f3..000000000 --- a/data/maps/SecretBase_Shrub2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index cbbf64305..0da13143a 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_SHRUB3", "name": "SecretBase_Shrub3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Shrub3/scripts.inc b/data/maps/SecretBase_Shrub3/scripts.inc deleted file mode 100644 index 0aeb7bdf9..000000000 --- a/data/maps/SecretBase_Shrub3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 487c0f09f..b2926c167 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_SHRUB4", "name": "SecretBase_Shrub4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Shrub4/scripts.inc b/data/maps/SecretBase_Shrub4/scripts.inc deleted file mode 100644 index f131b308d..000000000 --- a/data/maps/SecretBase_Shrub4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 9fcb78bc3..f7831972b 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE1", "name": "SecretBase_Tree1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Tree1/scripts.inc b/data/maps/SecretBase_Tree1/scripts.inc deleted file mode 100644 index 7345c3bbb..000000000 --- a/data/maps/SecretBase_Tree1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index b7c0da914..5285269d7 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE2", "name": "SecretBase_Tree2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Tree2/scripts.inc b/data/maps/SecretBase_Tree2/scripts.inc deleted file mode 100644 index 0f2976a8c..000000000 --- a/data/maps/SecretBase_Tree2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 349e340eb..f17d16851 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE3", "name": "SecretBase_Tree3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Tree3/scripts.inc b/data/maps/SecretBase_Tree3/scripts.inc deleted file mode 100644 index cb80b0d25..000000000 --- a/data/maps/SecretBase_Tree3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index c6c0856cf..b907de4da 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE4", "name": "SecretBase_Tree4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Tree4/scripts.inc b/data/maps/SecretBase_Tree4/scripts.inc deleted file mode 100644 index 0a6771740..000000000 --- a/data/maps/SecretBase_Tree4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index ab18d10de..02a0256ac 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_YELLOW_CAVE1", "name": "SecretBase_YellowCave1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_YellowCave1/scripts.inc b/data/maps/SecretBase_YellowCave1/scripts.inc deleted file mode 100644 index b76a5f44e..000000000 --- a/data/maps/SecretBase_YellowCave1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_YellowCave1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 07481867c..011080f51 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_YELLOW_CAVE2", "name": "SecretBase_YellowCave2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_YellowCave2/scripts.inc b/data/maps/SecretBase_YellowCave2/scripts.inc deleted file mode 100644 index 0bc1fc354..000000000 --- a/data/maps/SecretBase_YellowCave2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_YellowCave2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index d1060d26d..5bbb30751 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_YELLOW_CAVE3", "name": "SecretBase_YellowCave3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_YellowCave3/scripts.inc b/data/maps/SecretBase_YellowCave3/scripts.inc deleted file mode 100644 index 137f04316..000000000 --- a/data/maps/SecretBase_YellowCave3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_YellowCave3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index f717b2c88..0732d6282 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_YELLOW_CAVE4", "name": "SecretBase_YellowCave4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc deleted file mode 100644 index 4f93a99d7..000000000 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave4_MapScripts:: @ 815F337 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_15F358 - map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_15F34F - map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_15F362 - map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_15F34C - .byte 0 - -SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C - setstepcallback 6 - end - -SecretBase_RedCave1_MapScript1_15F34F:: @ 815F34F - call SecretBase_RedCave1_EventScript_1A2F3D - special sub_80BBFA4 - end - -SecretBase_RedCave1_MapScript2_15F358:: @ 815F358 - map_script_2 0x4089, 0, SecretBase_RedCave1_EventScript_1A2F68 - .2byte 0 - -SecretBase_RedCave1_MapScript2_15F362:: @ 815F362 - map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE - .2byte 0 diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc new file mode 100644 index 000000000..e3b87f1ea --- /dev/null +++ b/data/scripts/shared_secret_base.inc @@ -0,0 +1,190 @@ +SecretBase_MapScripts:: @ 815F337 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_OnWarp + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_OnFrame + map_script MAP_SCRIPT_ON_RESUME, SecretBase_OnResume + .byte 0 + +SecretBase_OnResume:: @ 815F34C + setstepcallback 6 + end + +SecretBase_OnTransition:: @ 815F34F + call SecretBase_EventScript_SetDecorationFlags + special SetSecretBaseOwnerGfxId + end + +SecretBase_OnWarp:: @ 815F358 + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, SecretBase_EventScript_InitDecorations + .2byte 0 + +SecretBase_OnFrame:: @ 815F362 + map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_EventScript_FirstEntrance + .2byte 0 + +SecretBase_EventScript_PC:: @ 815F36C + lockall + playse SE_PC_LOGON + message SecretBase_Text_BootUpPC + dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON + waitstate + waitmessage + waitbuttonpress + playse SE_SELECT + goto SecretBase_EventScript_PCShowMainMenu + end + +SecretBase_EventScript_PCShowMainMenu: + message SecretBase_Text_WhatWouldYouLikeToDo + waitmessage + goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, SecretBase_EventScript_PCMainMenuWithRegister + goto SecretBase_EventScript_PCMainMenuWithoutRegister + end + +SecretBase_EventScript_PCCancel:: @ 815F399 + lockall + goto SecretBase_EventScript_PCShowMainMenu + end + +SecretBase_EventScript_PCMainMenuWithRegister: + multichoice 0, 0, 6, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCDecorationMenu + case 1, SecretBase_EventScript_PCPackUp + case 2, SecretBase_EventScript_PCRegistryMenu + case 3, SecretBase_EventScript_PCTurnOff + case 127, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_PCMainMenuWithoutRegister: + multichoice 0, 0, 5, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCDecorationMenu + case 1, SecretBase_EventScript_PCPackUp + case 2, SecretBase_EventScript_PCTurnOff + case 127, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_PCPackUp: + msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_PCShowMainMenu + closemessage + special MoveOutOfSecretBase + releaseall + end + +SecretBase_EventScript_PCDecorationMenu: + special SecretBasePC_Decoration + end + +SecretBase_EventScript_PCRegistryMenu: + special SecretBasePC_Registry + end + +SecretBase_EventScript_RecordMixingPC:: @ 815F43A + lockall + message SecretBase_Text_BootUpPC + playse SE_PC_LOGON + dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON + waitstate + waitmessage + waitbuttonpress + playse SE_SELECT + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCRegisterMenu: + message SecretBase_Text_WhatWouldYouLikeToDo + waitmessage + multichoice 0, 0, 7, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCRegister + case 1, SecretBase_EventScript_PCRegistryMenu + case 2, SecretBase_EventScript_PCRegistryInfo + case 3, SecretBase_EventScript_PCTurnOff + case 127, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_ShowRegisterMenu:: @ 815F49A + lockall + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCRegister: + special GetCurSecretBaseRegistrationValidity + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_AlreadyRegistered + compare VAR_RESULT, 2 + goto_if_eq SecretBase_EventScript_CantRegisterTooManyBases + special BufferSecretBaseOwnerName + msgbox SecretBase_Text_WantToRegisterSecretBase, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_PCRegisterMenu + msgbox SecretBase_Text_RegistrationCompleted, MSGBOX_SIGN + special ToggleCurSecretBaseRegistry + special DoSecretBasePCTurnOffEffect + releaseall + end + +SecretBase_EventScript_AlreadyRegistered: + msgbox SecretBase_Text_AlreadyRegisteredDelete, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_PCRegisterMenu + msgbox SecretBase_Text_DataUnregistered, MSGBOX_SIGN + special ToggleCurSecretBaseRegistry + special DoSecretBasePCTurnOffEffect + releaseall + end + +SecretBase_EventScript_CantRegisterTooManyBases: + msgbox SecretBase_Text_TooManyBasesDeleteSome, MSGBOX_SIGN + special DoSecretBasePCTurnOffEffect + closemessage + releaseall + end + +SecretBase_EventScript_PCRegistryInfo: + message SecretBase_Text_RegistryInfo + waitmessage + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCTurnOff: + special DoSecretBasePCTurnOffEffect + closemessage + releaseall + end + +SecretBase_EventScript_SandOrnament:: @ 815F523 + dofieldeffect FLDEFF_SAND_PILLAR + waitstate + end + +SecretBase_EventScript_ShieldOrToyTV:: @ 815F528 + special GetShieldToyTVDecorationInfo + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_BattleTowerShield + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_ToyTV + compare VAR_RESULT, 2 + goto_if_eq SecretBase_EventScript_SeedotTV + compare VAR_RESULT, 3 + goto_if_eq SecretBase_EventScript_SkittyTV + end + +SecretBase_EventScript_BattleTowerShield: + msgbox SecretBase_Text_BattleTowerShield, MSGBOX_SIGN + end + +SecretBase_EventScript_ToyTV: + msgbox SecretBase_Text_ToyTV, MSGBOX_SIGN + end + +SecretBase_EventScript_SeedotTV: + msgbox SecretBase_Text_SeedotTV, MSGBOX_SIGN + end + +SecretBase_EventScript_SkittyTV: + msgbox SecretBase_Text_SkittyTV, MSGBOX_SIGN + end diff --git a/data/specials.inc b/data/specials.inc index 86e62455c..d3a20bda8 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -18,10 +18,10 @@ gSpecials:: def_special CheckPlayerHasSecretBase def_special sub_80BBAF0 def_special sub_80BC440 - def_special SecretBasePC_PackUp + def_special MoveOutOfSecretBase def_special sub_80BC114 - def_special sub_80BC56C - def_special sub_80BC5BC + def_special GetCurSecretBaseRegistrationValidity + def_special ToggleCurSecretBaseRegistry def_special SecretBasePC_Decoration def_special SecretBasePC_Registry def_special sub_80BCE1C @@ -30,7 +30,7 @@ gSpecials:: def_special sub_80FF474 def_special sub_8100B20 def_special sub_80BB70C - def_special sub_80BBFA4 + def_special SetSecretBaseOwnerGfxId def_special sub_8100A7C def_special sub_80BBC78 def_special sub_80BCE4C |