diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-22 12:18:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-22 12:18:48 -0400 |
| commit | a180d2af49250b9cf005ce1635e5e59c7e6848c4 (patch) | |
| tree | a457673d0bbfe61da83b59a08b256dadaa4b4821 /data/specials.inc | |
| parent | 58b8d7c297576846aeef4173bbe8a6a71608ad98 (diff) | |
| parent | 9d4fc9234be10ccad76987e08512373bb097d8e0 (diff) | |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'data/specials.inc')
| -rw-r--r-- | data/specials.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/specials.inc b/data/specials.inc index fd5957356..fadf24d04 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -273,7 +273,7 @@ gSpecials:: @ 81DBA64 def_special ShowBerryBlenderRecordWindow def_special ResetTrickHouseEndRoomFlag def_special SetTrickHouseEndRoomFlag - def_special ScrSpecial_CreatePCMenu + def_special ScriptMenu_CreatePCMultichoice def_special AccessHallOfFamePC def_special Special_ShowDiploma def_special CheckLeadMonCool @@ -480,7 +480,7 @@ gSpecials:: @ 81DBA64 def_special ShowFrontierGamblerGoMessage def_special Script_DoRayquazaScene def_special sub_81C72A4 - def_special sp106_CreateStartMenu + def_special ScriptMenu_CreateStartMenuForPokenavTutorial def_special CountPlayerTrainerStars def_special BufferBattleFrontierTutorMoveName def_special CloseBattleFrontierTutorWindow @@ -508,8 +508,8 @@ gSpecials:: @ 81DBA64 def_special sub_813B4E0 def_special ShouldDoBrailleRegicePuzzle def_special EnableNationalPokedex - def_special sub_80E2548 - def_special sub_80E2878 + def_special ScriptMenu_CreateLilycoveSSTidalMultichoice + def_special GetLilycoveSSTidalSelection def_special TurnOnTVScreen def_special sub_81D4A90 def_special sub_813B514 |