diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-23 15:31:23 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-23 15:31:23 -0400 |
| commit | 661e5d92217c0b40146b35e7b023a28fd567b406 (patch) | |
| tree | 0bf026238d8b965dcb863a7c959a46561685d921 /data/maps | |
| parent | 6e36c229200e083ca005cbc448e99210d111f3b2 (diff) | |
field_specials through Task_AnimateElevatorWindowView
Diffstat (limited to 'data/maps')
28 files changed, 76 insertions, 76 deletions
diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index b69ad021a..258846f29 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -34,7 +34,7 @@ EventScript_16C418:: @ 816C418 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 - special sub_80CA618 + special Special_ShowDiploma waitstate release end diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index c4d07baff..0e2673614 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -7,11 +7,11 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 checkflag FLAG_TEMP_2 call_if FALSE, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special sub_80CB580 + special Special_DrawElevatorCurrentFloorWindow message Text_1A535C waitmessage setvar VAR_0x8004, 3 - specialvar VAR_RESULT, sub_80CB328 + specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos switch VAR_RESULT case 0, EventScript_16C1B7 case 1, EventScript_16C1C3 @@ -109,15 +109,15 @@ EventScript_16C2E6:: @ 816C2E6 end EventScript_16C30E:: @ 816C30E - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow releaseall end EventScript_16C313:: @ 816C313 - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow closemessage waitse - special sub_80CB498 + special Special_AnimateElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 7a95e7bf7..f79ffb046 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -273,7 +273,7 @@ EventScript_16C96C:: @ 816C96C setfieldeffectarg 2, 14 dofieldeffect 64 waitfieldeffect 64 - specialvar VAR_RESULT, sub_80CAABC + specialvar VAR_RESULT, Special_GetRandomSlotMachine playslotmachine VAR_RESULT releaseall end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 18a6d0b14..46a900b93 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -10,16 +10,16 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE faceplayer checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_172043 - compare_var_to_value VAR_STORAGE_UNKNOWN, 65535 + compare_var_to_value VAR_RESORT_GOREGOUS_REQUESTED_MON, 0xFFFF goto_if eq, EventScript_171F0B - compare_var_to_value VAR_STORAGE_UNKNOWN, 0 + compare_var_to_value VAR_RESORT_GOREGOUS_REQUESTED_MON, SPECIES_NONE goto_if ne, EventScript_171F19 msgbox gUnknown_81A42A0 goto EventScript_171EFE end EventScript_171EFE:: @ 8171EFE - special sub_80CB0A8 + special Special_SampleResortGorgeousMonAndReward msgbox gUnknown_81A4315 release end @@ -30,15 +30,15 @@ EventScript_171F0B:: @ 8171F0B end EventScript_171F19:: @ 8171F19 - copyvar VAR_0x8004, VAR_STORAGE_UNKNOWN - specialvar VAR_RESULT, sub_80CC48C + copyvar VAR_0x8004, VAR_RESORT_GOREGOUS_REQUESTED_MON + specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_171F34 goto EventScript_171EFE end EventScript_171F34:: @ 8171F34 - special sub_80CB0A8 + special Special_SampleResortGorgeousMonAndReward msgbox gUnknown_81A43F7 addobject 2 applymovement 2, Movement_172060 @@ -62,11 +62,11 @@ EventScript_171F34:: @ 8171F34 call_if eq, EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E - giveitem VAR_0x403B + giveitem VAR_RESORT_GOREGOUS_REWARD compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_172025 setflag FLAG_TEMP_2 - setvar VAR_STORAGE_UNKNOWN, 0 + setvar VAR_RESORT_GOREGOUS_REQUESTED_MON, 0 release end @@ -104,7 +104,7 @@ EventScript_172025:: @ 8172025 textcolor 1 msgbox gUnknown_81A461B setflag FLAG_TEMP_2 - setvar VAR_STORAGE_UNKNOWN, 0 + setvar VAR_RESORT_GOREGOUS_REQUESTED_MON, 0 release end diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index 979486b7c..437df0fe8 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -13,7 +13,7 @@ FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E checkflag FLAG_NO_ROOM_FOR_TOGEPI_EGG goto_if TRUE, EventScript_16892C msgbox gUnknown_818A80D - specialvar VAR_RESULT, sub_80CA76C + specialvar VAR_RESULT, Special_GetLeadMonFriendship compare_var_to_value VAR_RESULT, 6 goto_if eq, EventScript_1688AC msgbox gUnknown_818A88F diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 3ef1f2054..68788f93a 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -133,7 +133,7 @@ EventScript_167E19:: @ 8167E19 special GetDaycareMonNicknames msgbox gUnknown_81BF789 special SetDaycareCompatibilityString - special sub_80CA68C + special Special_ShowStringVar4AsFieldMessage waitmessage waitbuttonpress release diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index e1031e737..16b796efe 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -157,7 +157,7 @@ EventScript_16D462:: @ 816D462 countpokemon compare_var_to_value VAR_RESULT, 6 goto_if ne, EventScript_1A77A9 - specialvar VAR_RESULT, sub_80CABD0 + specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A77A9 msgbox gUnknown_81BFEAC diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 213e84754..046530258 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -27,14 +27,14 @@ EventScript_16B2AA:: @ 816B2AA end EventScript_16B2B4:: @ 816B2B4 - specialvar VAR_RESULT, sub_80CAD54 + specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 compare_var_to_value VAR_RESULT, SPECIES_EGG goto_if eq, EventScript_16B307 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16B311 - specialvar VAR_RESULT, sub_80CAD7C + specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16B311 diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 98bb6f920..28b7996d4 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -46,14 +46,14 @@ NavelRock_Base_EventScript_165134:: @ 8165134 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 2 - special sub_80CAC28 + special Special_ShakeScreen delay 30 playse SE_T_AME_E setvar VAR_0x8004, 0 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 2 - special sub_80CAC28 + special Special_ShakeScreen delay 30 delay 50 waitse diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 7900d62e8..42c7d44ad 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -61,7 +61,7 @@ EventScript_168DB9:: @ 8168DB9 faceplayer compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_168E3C - specialvar VAR_RESULT, sub_80CAD54 + specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 compare_var_to_value VAR_RESULT, SPECIES_EGG goto_if eq, EventScript_168E32 msgbox gUnknown_818D8CC @@ -88,7 +88,7 @@ EventScript_168E3C:: @ 8168E3C EventScript_168E46:: @ 8168E46 msgbox gUnknown_818D9A5 - specialvar VAR_RESULT, sub_80CA76C + specialvar VAR_RESULT, Special_GetLeadMonFriendship switch VAR_RESULT case 0, EventScript_168EA6 case 1, EventScript_168EB0 diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 80249e6c4..b7938f2ca 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -38,7 +38,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 setvar VAR_0x8004, 32 special Special_SetSomeVariable setvar VAR_0x8004, 1 - special sub_80CA86C + special Special_AnimatePcTurnOn playse SE_PC_ON msgbox gUnknown_81A5420 special sub_80EB6AC @@ -50,7 +50,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17 setvar VAR_0x8004, 1 playse SE_PC_OFF - special sub_80CA9A8 + special Special_AnimatePcTurnOff special sub_812B35C releaseall end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index c83bc7fd9..c6a199a52 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -9,11 +9,11 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 checkflag FLAG_TEMP_2 call_if FALSE, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special sub_80CB580 + special Special_DrawElevatorCurrentFloorWindow message Text_1A535C waitmessage setvar VAR_0x8004, 2 - specialvar VAR_RESULT, sub_80CB328 + specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos switch VAR_RESULT case 0, EventScript_161530 case 1, EventScript_16153C @@ -87,15 +87,15 @@ EventScript_161608:: @ 8161608 end EventScript_161609:: @ 8161609 - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow releaseall end EventScript_16160E:: @ 816160E - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow closemessage waitse - special sub_80CB498 + special Special_AnimateElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 927bc3bea..9f0255568 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -36,7 +36,7 @@ EventScript_16FF7F:: @ 816FF7F goto_if eq, EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP - specialvar VAR_RESULT, sub_80CC48C + specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_16FFF5 special sub_80A096C diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index b20a716ca..0bc8d6c8a 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -27,7 +27,7 @@ Route16_MapScript3_168113:: @ 8168113 .2byte 0 EventScript_16811D:: @ 816811D - special sub_80CA630 + special Special_ForcePlayerOntoBike end Route16_EventScript_168121:: @ 8168121 diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index dfc5f8578..cc6d11221 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -17,7 +17,7 @@ Route18_MapScript2_168211:: @ 8168211 .2byte 0 EventScript_16821B:: @ 816821B - special sub_80CA630 + special Special_ForcePlayerOntoBike end Route18_EventScript_16821F:: @ 816821F diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 70813ddba..2f7e63cfb 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -90,7 +90,7 @@ EventScript_17097D:: @ 817097D EventScript_170987:: @ 8170987 special SavePlayerParty - special sub_80CAAAC + special Special_BufferEReaderTrainerName5 msgbox gUnknown_81A0598, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_170A11 diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index d77eda077..2cbb7d1db 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -46,14 +46,14 @@ EventScript_170AFE:: @ 8170AFE EventScript_170B0C:: @ 8170B0C setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 - special sub_80CA68C + special Special_ShowStringVar4AsFieldMessage waitmessage waitbuttonpress return EventScript_170B17:: @ 8170B17 setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 - special sub_80CA68C + special Special_ShowStringVar4AsFieldMessage waitmessage waitbuttonpress return diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index f8c9c1a1f..d5735302c 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -1,6 +1,6 @@ { "id": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", - "name": "SevenIsland_SeavaultCanyon_TanobyKey", + "name": "SevenIsland_SevaultCanyon_TanobyKey", "layout": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_TANOBY_KEY", @@ -122,7 +122,7 @@ "elevation": 3, "var": "VAR_0x4001", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39" }, { "type": "trigger", @@ -131,7 +131,7 @@ "elevation": 3, "var": "VAR_0x4007", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B" }, { "type": "trigger", @@ -140,7 +140,7 @@ "elevation": 3, "var": "VAR_0x4006", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8" }, { "type": "trigger", @@ -149,7 +149,7 @@ "elevation": 3, "var": "VAR_0x4005", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5" }, { "type": "trigger", @@ -158,7 +158,7 @@ "elevation": 3, "var": "VAR_0x4004", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2" }, { "type": "trigger", @@ -167,7 +167,7 @@ "elevation": 3, "var": "VAR_0x4003", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F" }, { "type": "trigger", @@ -176,7 +176,7 @@ "elevation": 3, "var": "VAR_0x4002", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C" } ], "bg_events": [] diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 44dd71179..ce843d9e4 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -1,8 +1,8 @@ -SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC - map_script 3, SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2 +SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC + map_script 3, SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2 .byte 0 -SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 +SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS call_if TRUE, EventScript_164E07 @@ -26,7 +26,7 @@ EventScript_164E07:: @ 8164E07 setobjectxyperm 7, 9, 8 return -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall compare_var_to_value VAR_0x4001, 100 goto_if eq, EventScript_164F8A @@ -37,7 +37,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 releaseall end -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C lockall compare_var_to_value VAR_0x4002, 100 goto_if eq, EventScript_164F8A @@ -48,7 +48,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C releaseall end -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F lockall compare_var_to_value VAR_0x4003, 100 goto_if eq, EventScript_164F8A @@ -59,7 +59,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F releaseall end -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 lockall compare_var_to_value VAR_0x4004, 100 goto_if eq, EventScript_164F8A @@ -70,7 +70,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 releaseall end -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 lockall compare_var_to_value VAR_0x4005, 100 goto_if eq, EventScript_164F8A @@ -81,7 +81,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 releaseall end -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 lockall compare_var_to_value VAR_0x4006, 100 goto_if eq, EventScript_164F8A @@ -92,7 +92,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 releaseall end -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B lockall compare_var_to_value VAR_0x4007, 100 goto_if eq, EventScript_164F8A @@ -110,7 +110,7 @@ EventScript_164F2E:: @ 8164F2E setvar VAR_0x8005, 1 setvar VAR_0x8006, 8 setvar VAR_0x8007, 3 - special sub_80CAC28 + special Special_ShakeScreen delay 60 return @@ -119,13 +119,13 @@ EventScript_164F51:: @ 8164F51 setvar VAR_0x8005, 2 setvar VAR_0x8006, 10 setvar VAR_0x8007, 3 - special sub_80CAC28 + special Special_ShakeScreen delay 60 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 setvar VAR_0x8006, 12 setvar VAR_0x8007, 2 - special sub_80CAC28 + special Special_ShakeScreen delay 60 playse SE_FU_ZUZUZU waitse diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc index c6f137869..c6f137869 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index b1fc46abd..a415190da 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -9,11 +9,11 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 checkflag FLAG_TEMP_2 call_if FALSE, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special sub_80CB580 + special Special_DrawElevatorCurrentFloorWindow message Text_1A535C waitmessage setvar VAR_0x8004, 6 - specialvar VAR_RESULT, sub_80CB328 + specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos switch VAR_RESULT case 0, EventScript_164B46 case 1, EventScript_164B52 @@ -44,7 +44,7 @@ EventScript_164B90:: @ 8164B90 goto_if eq, EventScript_164BD3 call EventScript_164BD8 setvar VAR_ELEVATOR_FLOOR, 3 - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow delay 25 applymovement 255, Movement_164BE5 waitmovement 0 @@ -58,15 +58,15 @@ EventScript_164BCD:: @ 8164BCD end EventScript_164BD3:: @ 8164BD3 - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow releaseall end EventScript_164BD8:: @ 8164BD8 - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow closemessage waitse - special sub_80CB498 + special Special_AnimateElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 9338e5c6e..3202bdeb8 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -7,11 +7,11 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F checkflag FLAG_TEMP_2 call_if FALSE, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special sub_80CB580 + special Special_DrawElevatorCurrentFloorWindow message Text_1A535C waitmessage setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_80CB328 + specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos special sub_80CB7C4 waitstate switch VAR_RESULT @@ -163,15 +163,15 @@ EventScript_1621E6:: @ 81621E6 end EventScript_1621E7:: @ 81621E7 - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow releaseall end EventScript_1621EC:: @ 81621EC - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow closemessage waitse - special sub_80CB498 + special Special_AnimateElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index bf2e1eb6d..5d6fcfe53 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -28,7 +28,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 setvar VAR_0x8005, 0 setvar VAR_0x8006, 12 setvar VAR_0x8007, 3 - special sub_80CAC28 + special Special_ShakeScreen delay 60 compare_var_to_value VAR_FACING, 2 call_if eq, EventScript_164325 diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index be9e12915..08efbc6fc 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -9,7 +9,7 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D goto_if eq, EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS - specialvar VAR_RESULT, sub_80CC48C + specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1720E5 special sub_80A0918 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 739b926b0..3119a1d44 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -32,7 +32,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 giveitem ITEM_IAPAPA_BERRY compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_163D19 - special sub_80CA6DC + special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_817AF3B closemessage setflag FLAG_RESCUED_LOSTELLE diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc index 29952137a..7738d2e5c 100644 --- a/data/maps/ThreeIsland_House1/scripts.inc +++ b/data/maps/ThreeIsland_House1/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_House1_MapScripts:: @ 8171819 ThreeIsland_House1_EventScript_17181A:: @ 817181A lock faceplayer - special sub_80CA6DC + special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_81A2F3E release end diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 7d4bb6684..798435eaf 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -37,7 +37,7 @@ EventScript_171435:: @ 8171435 textcolor 0 msgbox gUnknown_81A28B2 textcolor 1 - special sub_80CA6DC + special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_81A2931 closemessage applymovement 3, Movement_1A75ED diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 3bf3c6982..8619c19ad 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -212,7 +212,7 @@ "SevenIsland_TanobyRuins_RixyChamber", "SevenIsland_TanobyRuins_ViapoisChamber", "ThreeIsland_DunsparceTunnel", - "SevenIsland_SeavaultCanyon_TanobyKey", + "SevenIsland_SevaultCanyon_TanobyKey", "NavelRock_1F", "NavelRock_Summit", "NavelRock_Base", |
