diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-24 17:22:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-24 17:22:11 -0400 |
| commit | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (patch) | |
| tree | b8b08638a6d8ae195dbdc4b17d1e91a6d301b073 /data/maps | |
| parent | 6e36c229200e083ca005cbc448e99210d111f3b2 (diff) | |
| parent | 4fae71a4b0723fac867cbeb439feb3fc71664f0e (diff) | |
Merge pull request #132 from PikalaxALT/field_specials
Field specials
Diffstat (limited to 'data/maps')
49 files changed, 200 insertions, 200 deletions
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index f23c73615..0c20c59b8 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -5,7 +5,7 @@ BirthIsland_Exterior_MapScripts:: @ 8165203 .byte 0 BirthIsland_Exterior_MapScript3_165213:: @ 8165213 - special sub_80CD008 + special Special_SetDeoxysTriangleObjectPal end BirthIsland_Exterior_MapScript1_165217:: @ 8165217 @@ -50,7 +50,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - special sub_80CCDFC + special Special_DeoxysSound waitstate switch VAR_RESULT case 0, EventScript_1652BA @@ -92,7 +92,7 @@ EventScript_1652C0:: @ 81652C0 setvar VAR_0x8006, 0 special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special Special_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome 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/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index ad68f84bc..5c51d2601 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -41,7 +41,7 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 waitbuttonpress setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special Special_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome diff --git a/data/maps/CeruleanCity_House1/scripts.inc b/data/maps/CeruleanCity_House1/scripts.inc index 18bc90fb6..26995d532 100644 --- a/data/maps/CeruleanCity_House1/scripts.inc +++ b/data/maps/CeruleanCity_House1/scripts.inc @@ -8,7 +8,7 @@ CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0 message Text_191967 waitmessage setvar VAR_0x8004, 0 - special sub_80CB7C4 + special Special_ListMenu waitstate switch VAR_RESULT case 0, EventScript_16A8FB @@ -26,7 +26,7 @@ CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0 EventScript_16A87D:: @ 816A87D message Text_191967 waitmessage - special sub_80CBC5C + special Special_ReturnToListMenu waitstate switch VAR_RESULT case 0, EventScript_16A8FB diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 1f5d8899a..79cd75785 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -40,7 +40,7 @@ EventScript_16AEC8:: @ 816AEC8 message Text_1932F4 waitmessage setvar VAR_0x8004, 5 - special sub_80CB7C4 + special Special_ListMenu waitstate switch VAR_RESULT case 0, EventScript_16AF6C diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 6cf717fe5..8a7dc8df1 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -48,7 +48,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E faceplayer setvar VAR_0x8008, 7 copyvar VAR_0x8004, VAR_0x8008 - specialvar VAR_RESULT, sub_8053A9C + specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT checkflag FLAG_DID_TANGENY_TRADE goto_if TRUE, EventScript_16E3D4 @@ -61,14 +61,14 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_16E3BC copyvar VAR_0x8005, VAR_0x800A - specialvar VAR_RESULT, sub_8053D2C + specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16E3C6 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A - special sub_8053D68 - special sub_8054440 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate msgbox gUnknown_81A5B4A setflag FLAG_DID_TANGENY_TRADE diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 18a6d0b14..1d1610ace 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_GORGEOUS_REQUESTED_MON, 0xFFFF goto_if eq, EventScript_171F0B - compare_var_to_value VAR_STORAGE_UNKNOWN, 0 + compare_var_to_value VAR_RESORT_GORGEOUS_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_GORGEOUS_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_GORGEOUS_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_GORGEOUS_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_GORGEOUS_REQUESTED_MON, 0 release end diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index 979486b7c..a334ab2df 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 @@ -49,12 +49,12 @@ EventScript_1688BA:: @ 81688BA EventScript_1688E3:: @ 81688E3 getspeciesname 1, SPECIES_TOGEPI setvar VAR_0x8004, SPECIES_TOGEPI - specialvar VAR_RESULT, sub_80CD0F4 + specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_168895 getspeciesname 1, SPECIES_TOGETIC setvar VAR_0x8004, SPECIES_TOGETIC - specialvar VAR_RESULT, sub_80CD0F4 + specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_168895 msgbox gUnknown_818A9C0 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/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 7ca07b4ba..c91cc86e5 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -40,7 +40,7 @@ EventScript_171993:: @ 8171993 msgbox gUnknown_81BF860 waitmoncry special StoreSelectedPokemonInDaycare - incrementgamestat 47 + incrementgamestat GAME_STAT_USED_DAYCARE specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_171A01 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index d62d5252d..ea921b4d1 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -72,7 +72,7 @@ FuchsiaCity_EventScript_166E07:: @ 8166E07 FuchsiaCity_EventScript_166E1F:: @ 8166E1F lockall setvar VAR_0x8004, SPECIES_CHANSEY - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_CHANSEY, 10, 3 msgbox gUnknown_81807A9 erasemonpic @@ -82,7 +82,7 @@ FuchsiaCity_EventScript_166E1F:: @ 8166E1F FuchsiaCity_EventScript_166E38:: @ 8166E38 lockall setvar VAR_0x8004, SPECIES_VOLTORB - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_VOLTORB, 10, 3 msgbox gUnknown_81807D9 erasemonpic @@ -92,7 +92,7 @@ FuchsiaCity_EventScript_166E38:: @ 8166E38 FuchsiaCity_EventScript_166E51:: @ 8166E51 lockall setvar VAR_0x8004, SPECIES_KANGASKHAN - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_KANGASKHAN, 10, 3 msgbox gUnknown_8180806 erasemonpic @@ -102,7 +102,7 @@ FuchsiaCity_EventScript_166E51:: @ 8166E51 FuchsiaCity_EventScript_166E6A:: @ 8166E6A lockall setvar VAR_0x8004, SPECIES_SLOWPOKE - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_SLOWPOKE, 10, 3 msgbox gUnknown_8180859 erasemonpic @@ -112,7 +112,7 @@ FuchsiaCity_EventScript_166E6A:: @ 8166E6A FuchsiaCity_EventScript_166E83:: @ 8166E83 lockall setvar VAR_0x8004, SPECIES_LAPRAS - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_LAPRAS, 10, 3 msgbox gUnknown_8180887 erasemonpic @@ -124,7 +124,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C checkflag FLAG_GOT_DOME_FOSSIL goto_if TRUE, EventScript_166EBE setvar VAR_0x8004, SPECIES_KABUTO - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_KABUTO, 10, 3 msgbox gUnknown_81808FA erasemonpic @@ -133,7 +133,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C EventScript_166EBE:: @ 8166EBE setvar VAR_0x8004, SPECIES_OMANYTE - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_OMANYTE, 10, 3 msgbox gUnknown_81808AE erasemonpic diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index f08f9371d..da4f19e60 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -16,7 +16,7 @@ EventScript_16D8B0:: @ 816D8B0 waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_16D941 - special sub_80BFC14 + special IsSelectedMonEgg compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16D937 special ScrSpecial_CountPokemonMoves @@ -24,7 +24,7 @@ EventScript_16D8B0:: @ 816D8B0 goto_if eq, EventScript_16D92A msgbox gUnknown_8199445 fadescreen 1 - special Special_ChooseMoveToDelete + special SelectMove fadescreen 0 compare_var_to_value VAR_0x8005, 4 goto_if eq, EventScript_16D8B0 @@ -36,7 +36,7 @@ EventScript_16D8B0:: @ 816D8B0 end EventScript_16D919:: @ 816D919 - special Special_DeleteSelectedMove + special DeleteMonMove playfanfare MUS_ME_WASURE waitfanfare msgbox gUnknown_81994B1 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..cd9e5e8d7 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 @@ -58,7 +58,7 @@ EventScript_16B311:: @ 816B311 EventScript_16B31B:: @ 816B31B msgbox gUnknown_8193B36 call EventScript_1A74EB - specialvar VAR_RESULT, sub_80CBFA0 + specialvar VAR_RESULT, NameRaterWasNicknameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16B345 diff --git a/data/maps/MtEmber_RubyPath_B5F/scripts.inc b/data/maps/MtEmber_RubyPath_B5F/scripts.inc index c3d8b7320..53aec5282 100644 --- a/data/maps/MtEmber_RubyPath_B5F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B5F/scripts.inc @@ -7,31 +7,31 @@ MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB setvar VAR_0x8006, 0 braillemessage gUnknown_81A92C5 getbraillestringwidth gUnknown_81A92C5 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92D0 getbraillestringwidth gUnknown_81A92D0 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92DC getbraillestringwidth gUnknown_81A92DC - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92E6 getbraillestringwidth gUnknown_81A92E6 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92F2 getbraillestringwidth gUnknown_81A92F2 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92FE getbraillestringwidth gUnknown_81A92FE - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A930A getbraillestringwidth gUnknown_81A930A - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton braillemessage gUnknown_81A9316 waitbuttonpress releaseall diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 8287d1d93..3f8256837 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -41,7 +41,7 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special Special_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 98bb6f920..20cff0f8f 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 @@ -65,7 +65,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134 setvar VAR_0x8006, 0 special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special Special_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index f73aaf1ec..563ef520f 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -45,7 +45,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB special SpawnCameraObject setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 - special sub_80CD1B4 + special Special_LoopWingFlapSound applymovement 1, Movement_1650E0 applymovement 127, Movement_1650CD waitmovement 0 @@ -59,7 +59,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB delay 60 setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 - special sub_80CD1B4 + special Special_LoopWingFlapSound applymovement 127, Movement_1650D1 applymovement 1, Movement_1650D7 waitmovement 0 @@ -69,7 +69,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB setvar VAR_0x8006, 0 special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special Special_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE setvar VAR_LAST_TALKED, 1 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..dc90bc7bf 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -38,10 +38,10 @@ 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 + special BedroomPC waitstate special sub_812B35C releaseall @@ -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/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index ee40d071b..086f589de 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -9,7 +9,7 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE - special sub_807F904 + special ScrSpecial_StartMarowakBattle waitstate special sub_8112364 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index aa6fa42b0..aa16e1881 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -54,7 +54,7 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special Special_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome 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..0f0aa4f68 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -36,17 +36,17 @@ 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 + special GetMagikarpSizeRecordInfo msgbox gUnknown_819F2DB special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 compare_var_to_value VAR_RESULT, 6 goto_if ge, EventScript_16FFFF - special sub_80A0984 + special CompareMagikarpSize compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_170001 compare_var_to_value VAR_RESULT, 2 @@ -110,7 +110,7 @@ Route12_FishingHouse_EventScript_170067:: @ 8170067 end EventScript_17007B:: @ 817007B - special sub_80A096C + special GetMagikarpSizeRecordInfo msgbox gUnknown_819F4CF releaseall end diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 7ec851931..1b491d4e5 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -9,7 +9,7 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_ARTICUNO - special sub_80CBDCC + special Special_SetSeenMon releaseall end 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/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index b3c8e79ed..76be366f2 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -263,7 +263,7 @@ EventScript_17082B:: @ 817082B waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_EEVEE - special sub_80CBDCC + special Special_SetSeenMon goto EventScript_1707D8 end @@ -272,7 +272,7 @@ EventScript_170840:: @ 8170840 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_FLAREON - special sub_80CBDCC + special Special_SetSeenMon goto EventScript_1707D8 end @@ -281,7 +281,7 @@ EventScript_170855:: @ 8170855 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_JOLTEON - special sub_80CBDCC + special Special_SetSeenMon goto EventScript_1707D8 end @@ -290,7 +290,7 @@ EventScript_17086A:: @ 817086A waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_VAPOREON - special sub_80CBDCC + special Special_SetSeenMon goto EventScript_1707D8 end diff --git a/data/maps/SSAnne_2F_Room1/scripts.inc b/data/maps/SSAnne_2F_Room1/scripts.inc index f3dc1f136..9748777c7 100644 --- a/data/maps/SSAnne_2F_Room1/scripts.inc +++ b/data/maps/SSAnne_2F_Room1/scripts.inc @@ -7,7 +7,7 @@ SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97 message Text_173CE3 waitmessage setvar VAR_0x8004, SPECIES_SNORLAX - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_SNORLAX, 10, 3 waitbuttonpress erasemonpic diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 30d528791..426226422 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -78,37 +78,37 @@ SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 end EventScript_16F15B:: @ 816F15B - special sub_81132CC + special UpdateMovedSaffronFanClubMembers setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F207 setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F213 setvar VAR_0x8004, 2 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F21F setvar VAR_0x8004, 3 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F22B setvar VAR_0x8004, 4 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F237 setvar VAR_0x8004, 5 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F243 setvar VAR_0x8004, 6 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F24F setvar VAR_0x8004, 7 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F25B end @@ -165,13 +165,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 lock faceplayer setvar VAR_0x8004, 0 - special sub_81133A4 + special BufferStreakTrainerText compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F2EE - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F2C0 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F2E4 msgbox gUnknown_819C420 @@ -179,7 +179,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 end EventScript_16F2C0:: @ 816F2C0 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F2DA msgbox gUnknown_819C390 @@ -205,13 +205,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 lock faceplayer setvar VAR_0x8004, 3 - special sub_81133A4 + special BufferStreakTrainerText compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F365 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F337 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F35B msgbox gUnknown_819CBD3 @@ -219,7 +219,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 end EventScript_16F337:: @ 816F337 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F351 msgbox gUnknown_819CB32 @@ -245,13 +245,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F lock faceplayer setvar VAR_0x8004, 1 - special sub_81133A4 + special BufferStreakTrainerText compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F3DC - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F3AE - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F3D2 msgbox gUnknown_819C6BA @@ -259,7 +259,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F end EventScript_16F3AE:: @ 816F3AE - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F3C8 msgbox gUnknown_819C5A9 @@ -285,13 +285,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 lock faceplayer setvar VAR_0x8004, 2 - special sub_81133A4 + special BufferStreakTrainerText compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F453 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F425 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F449 msgbox gUnknown_819C986 @@ -299,7 +299,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 end EventScript_16F425:: @ 816F425 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F43F msgbox gUnknown_819C81E @@ -325,11 +325,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D lock faceplayer setvar VAR_0x8004, 5 - special sub_81133A4 - specialvar VAR_RESULT, sub_8113364 + special BufferStreakTrainerText + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F491 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F4B5 msgbox gUnknown_819D01F @@ -337,7 +337,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D end EventScript_16F491:: @ 816F491 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F4AB msgbox gUnknown_819CEDF @@ -358,11 +358,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF lock faceplayer setvar VAR_0x8004, 4 - special sub_81133A4 - specialvar VAR_RESULT, sub_8113364 + special BufferStreakTrainerText + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F4F3 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F517 msgbox gUnknown_819CDDA @@ -370,7 +370,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF end EventScript_16F4F3:: @ 816F4F3 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F50D msgbox gUnknown_819CCF3 @@ -391,11 +391,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 lock faceplayer setvar VAR_0x8004, 6 - special sub_81133A4 - specialvar VAR_RESULT, sub_8113364 + special BufferStreakTrainerText + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F555 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F579 msgbox gUnknown_819D1AE @@ -403,7 +403,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 end EventScript_16F555:: @ 816F555 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F56F msgbox gUnknown_819D0E3 @@ -424,11 +424,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 lock faceplayer setvar VAR_0x8004, 7 - special sub_81133A4 - specialvar VAR_RESULT, sub_8113364 + special BufferStreakTrainerText + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F5B7 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F5DB msgbox gUnknown_819D3D2 @@ -436,7 +436,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 end EventScript_16F5B7:: @ 816F5B7 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F5D1 msgbox gUnknown_819D2B4 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 3b618448c..8d69a4808 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -70,7 +70,7 @@ SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7 EventScript_1630F1:: @ 81630F1 turnobject 255, 2 - special sub_80CBD80 + special Special_ForcePlayerToStartSurfing end SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9 @@ -179,7 +179,7 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special Special_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 70813ddba..fd83fa051 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 @@ -105,7 +105,7 @@ EventScript_170987:: @ 8170987 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_170A11 special SavePlayerParty - special sub_80A03D8 + special ReducePlayerPartyToThree msgbox gUnknown_81A07C4 closemessage compare_var_to_value VAR_FACING, 2 diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index d77eda077..f2928f916 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_House_Room2_MapScripts:: @ 8170A7E .byte 0 SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89 - special sub_80E5E70 + special SetEReaderTrainerGfxId end SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D @@ -15,12 +15,12 @@ EventScript_170A97:: @ 8170A97 lockall applymovement 255, Movement_170B22 waitmovement 0 - special sub_80E7538 + special PrintEReaderTrainerGreeting msgbox gStringVar4 closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 - special sub_80E6900 + special StartSpecialBattle waitstate compare_var_to_value VAR_RESULT, 3 call_if eq, EventScript_170AFE @@ -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_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index ecc28a62d..cf4f14540 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -290,7 +290,7 @@ "x": 7, "y": 17, "elevation": 5, - "dest_map": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", "dest_warp_id": 0 }, { diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index f8c9c1a1f..4f492d72d 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", - "name": "SevenIsland_SeavaultCanyon_TanobyKey", - "layout": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", + "name": "SevenIsland_SevaultCanyon_TanobyKey", + "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_TANOBY_KEY", "requires_flash": false, @@ -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..442e13942 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -1,9 +1,9 @@ -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 - setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY +SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 + setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS call_if TRUE, EventScript_164E07 setvar VAR_0x4001, 0 @@ -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..4d75eec38 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -7,12 +7,12 @@ 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 - special sub_80CB7C4 + specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos + special Special_ListMenu waitstate switch VAR_RESULT case 0, EventScript_1621BF @@ -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..64ef24b72 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 @@ -241,63 +241,63 @@ SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F setvar VAR_0x8006, 0 braillemessage gUnknown_81A9321 getbraillestringwidth gUnknown_81A9321 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A932D getbraillestringwidth gUnknown_81A932D - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9338 getbraillestringwidth gUnknown_81A9338 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A933F getbraillestringwidth gUnknown_81A933F - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A934A getbraillestringwidth gUnknown_81A934A - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9356 getbraillestringwidth gUnknown_81A9356 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9362 getbraillestringwidth gUnknown_81A9362 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9368 getbraillestringwidth gUnknown_81A9368 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9374 getbraillestringwidth gUnknown_81A9374 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A937C getbraillestringwidth gUnknown_81A937C - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9387 getbraillestringwidth gUnknown_81A9387 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9393 getbraillestringwidth gUnknown_81A9393 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A939F getbraillestringwidth gUnknown_81A939F - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A93AB getbraillestringwidth gUnknown_81A93AB - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A93B4 getbraillestringwidth gUnknown_81A93B4 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton braillemessage gUnknown_81A93C0 waitbuttonpress releaseall diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index be9e12915..d38e40aac 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -9,17 +9,17 @@ 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 + special GetHeracrossSizeRecordInfo msgbox gUnknown_81A4A3F special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 compare_var_to_value VAR_RESULT, 6 goto_if ge, EventScript_1720EF - special sub_80A0930 + special CompareHeracrossSize compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1720F1 compare_var_to_value VAR_RESULT, 2 @@ -83,7 +83,7 @@ SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 end EventScript_17216B:: @ 817216B - special sub_80A0918 + special GetHeracrossSizeRecordInfo msgbox gUnknown_81A4C6E releaseall end 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_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 564ee8481..33f6d42fd 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -53,11 +53,11 @@ EventScript_1716A5:: @ 81716A5 EventScript_1716BE:: @ 81716BE msgbox gUnknown_81A2CC3 - special sub_80BF93C + special SelectMoveTutorMon waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_17179E - special sub_80BFC14 + special IsSelectedMonEgg compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_171790 compare_var_to_value VAR_0x8005, 0 @@ -67,7 +67,7 @@ EventScript_1716BE:: @ 81716BE EventScript_1716F4:: @ 81716F4 msgbox gUnknown_81A2CE1 - special sub_80E4634 + special DisplayMoveTutorMenu waitstate compare_var_to_value VAR_0x8004, 0 goto_if eq, EventScript_1716BE 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/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 5c5cebf82..24c38bfd7 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -151,7 +151,7 @@ EventScript_165A65:: @ 8165A65 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - special sub_807F888 + special ScrSpecial_StartOldManTutorialBattle waitstate release end @@ -246,7 +246,7 @@ EventScript_165B4C:: @ 8165B4C compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - special sub_807F888 + special ScrSpecial_StartOldManTutorialBattle waitstate lock faceplayer 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", |