diff options
Diffstat (limited to 'data/scripts')
47 files changed, 90 insertions, 90 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index d20cfa799..07ed1b82d 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -67,7 +67,7 @@ Route117_EventScript_291CE8:: @ 8291CE8 special GetDaycareMonNicknames msgbox Route117_Text_292299, 4 special SetDaycareCompatibilityString - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress setvar VAR_0x8004, 0 diff --git a/data/scripts/maps/BattleFrontier_Lounge1.inc b/data/scripts/maps/BattleFrontier_Lounge1.inc index 5449fa8ee..ba8ca0cb6 100644 --- a/data/scripts/maps/BattleFrontier_Lounge1.inc +++ b/data/scripts/maps/BattleFrontier_Lounge1.inc @@ -30,7 +30,7 @@ BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6 return BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF - specialvar VAR_RESULT, sub_81396E0 + specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 goto_eq BattleFrontier_Lounge1_EventScript_25E7FF special sub_8139D98 diff --git a/data/scripts/maps/BattleFrontier_Lounge5.inc b/data/scripts/maps/BattleFrontier_Lounge5.inc index a06927424..bb1feceec 100644 --- a/data/scripts/maps/BattleFrontier_Lounge5.inc +++ b/data/scripts/maps/BattleFrontier_Lounge5.inc @@ -13,7 +13,7 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 faceplayer compare VAR_0x8004, 255 goto_eq BattleFrontier_Lounge5_EventScript_26460D - specialvar VAR_RESULT, sub_81396E0 + specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 goto_eq BattleFrontier_Lounge5_EventScript_264603 special sub_813A7B8 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 20192a4e6..5cb4ee7fd 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -53,7 +53,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 setrespawn 1 fadescreenspeed 1, 24 - special sub_8137734 + special GameClear waitstate releaseall end @@ -61,7 +61,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 setrespawn 2 fadescreenspeed 1, 24 - special sub_8137734 + special GameClear waitstate releaseall end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index ed34cd953..90769b550 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F message LilycoveCity_CoveLilyMotel_2F_Text_21881C waitmessage call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E - special sub_8137CB4 + special Special_ShowDiploma waitstate release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 3eb61ed91..8de2d5d6f 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -26,10 +26,10 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 waitmovement 0 playse SE_PC_ON - special sub_8138EC0 + special DoLotteryCornerComputerEffect special PickLotteryCornerTicket delay 220 - special sub_8138FAC + special EndLotteryCornerComputerEffect delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E waitmovement 0 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index e60eccbaa..0fcdc46d5 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034 end LittlerootTown_EventScript_1E805D:: @ 81E805D - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, 4 closemessage applymovement 1, LittlerootTown_Movement_2725A2 @@ -256,7 +256,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D end LittlerootTown_EventScript_1E807A:: @ 81E807A - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8CE3, 4 release end @@ -364,7 +364,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F waitmovement 0 applymovement 255, LittlerootTown_Movement_2725A4 waitmovement 0 - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, 4 closemessage applymovement 1, LittlerootTown_Movement_2725A2 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 112311462..0f3fa1a0e 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -98,7 +98,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 - special sub_8138B48 + special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, 4 setflag FLAG_0x057 setvar VAR_0x4082, 2 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index f1763753a..0e7ecbf22 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -256,7 +256,7 @@ gUnknown_081F860D:: @ 81F860D LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 setvar VAR_0x8004, 1 - special sp0D9_ComputerRelated + special DoPCTurnOnEffect playse SE_PC_ON msgbox gUnknown_08272D87, 4 special sub_816AE58 @@ -267,7 +267,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F setvar VAR_0x8004, 1 playse SE_PC_OFF - special sub_8138E20 + special DoPCTurnOffEffect releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 2fdf79b03..e0229b9ea 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -98,7 +98,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8 applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 - special sub_8138B48 + special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, 4 setflag FLAG_0x057 setvar VAR_0x408C, 2 @@ -124,7 +124,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 compare VAR_0x408D, 3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F - special sub_8138B48 + special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4 release end @@ -148,7 +148,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D:: @ 81F8A3D LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D lock faceplayer - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, 4 release end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 3a983cdd4..327112d2f 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -317,7 +317,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 setvar VAR_0x8004, 2 - special sp0D9_ComputerRelated + special DoPCTurnOnEffect playse SE_PC_ON msgbox gUnknown_08272D87, 4 special sub_816AE58 @@ -328,7 +328,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F setvar VAR_0x8004, 2 playse SE_PC_OFF - special sub_8138E20 + special DoPCTurnOffEffect releaseall end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 94da547d5..049833db0 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -49,30 +49,30 @@ MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4 MauvilleCity_Gym_EventScript_20DEAF:: @ 820DEAF setvar VAR_0x8004, 0 - special sub_81384F0 + special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_20DDBA end MauvilleCity_Gym_EventScript_20DEBD:: @ 820DEBD setvar VAR_0x8004, 1 - special sub_81384F0 + special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_20DDBA end MauvilleCity_Gym_EventScript_20DECB:: @ 820DECB setvar VAR_0x8004, 2 - special sub_81384F0 + special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_20DDBA end MauvilleCity_Gym_EventScript_20DED9:: @ 820DED9 setvar VAR_0x8004, 3 - special sub_81384F0 + special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_20DDBA end MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 - special sub_8138750 + special MauvilleGymSpecial3 end MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB @@ -102,7 +102,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B call_if 1, MauvilleCity_Gym_EventScript_271E84 setvar VAR_0x8008, 3 call MauvilleCity_Gym_EventScript_271F43 - special sub_8138750 + special MauvilleGymSpecial3 special DrawWholeMapView playse SE_KI_GASYAN call MauvilleCity_Gym_EventScript_20DFB1 @@ -189,8 +189,8 @@ MauvilleCity_Gym_EventScript_20E068:: @ 820E068 end MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D - special sub_8138540 - special sub_81384F0 + special MauvilleGymSpecial2 + special MauvilleGymSpecial1 special DrawWholeMapView playse SE_KI_GASYAN checkflag FLAG_0x063 diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index a06979ddf..b08d296c7 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -6,7 +6,7 @@ MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 faceplayer bufferleadmonspeciesname 0 msgbox MossdeepCity_House1_Text_22200F, 4 - specialvar VAR_RESULT, sub_81391D0 + specialvar VAR_RESULT, GetPokeblockNameByMonNature compare VAR_RESULT, 0 goto_eq MossdeepCity_House1_EventScript_221FFC msgbox MossdeepCity_House1_Text_22201D, 4 diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 0cd8ddf84..cb3cc0d16 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -21,7 +21,7 @@ MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 special sub_80E8BC8 compare VAR_RESULT, 0 goto_eq MossdeepCity_House4_EventScript_222E14 - special sub_8139200 + special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_222ECC, 4 release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 106dc5570..8fc55295f 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -53,7 +53,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 dodailyevents - specialvar VAR_RESULT, sub_8138BDC + specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012 @@ -75,7 +75,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 dodailyevents - specialvar VAR_RESULT, sub_8138BDC + specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 06621451e..1dd9c2725 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -47,7 +47,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C setvar VAR_0x8004, 1 setvar VAR_0x40A3, 2 incrementgamestat 48 - special sub_8138B8C + special CableCarWarp special sub_814FC9C waitstate release diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index bf671d01e..0e87677e6 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -13,10 +13,10 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 checkflag FLAG_0x12C call_if 0, PacifidlogTown_House2_EventScript_203801 setflag FLAG_0x12C - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_203816 - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_203845 goto PacifidlogTown_House2_EventScript_20384F diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index aa02cc017..ec97a639e 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -4,7 +4,7 @@ PacifidlogTown_House5_MapScripts:: @ 8204110 PacifidlogTown_House5_EventScript_204111:: @ 8204111 lock faceplayer - specialvar VAR_RESULT, sub_813793C + specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq PacifidlogTown_House5_EventScript_20412D msgbox PacifidlogTown_House5_Text_204140, 4 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 1f6de9966..0da686052 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -31,7 +31,7 @@ PetalburgCity_MapScript2_1DC31C: @ 81DC31C PetalburgCity_EventScript_1DC32E:: @ 81DC32E lockall special copy_player_party_to_sav1 - special sub_813946C + special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_1DC451 applymovement 255, PetalburgCity_Movement_1DC430 waitmovement 0 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index c07b89eec..060531c97 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -222,7 +222,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC clearflag FLAG_0x2D6 clearflag FLAG_0x362 setflag FLAG_0x379 - special sub_8137A0C + special InitBirchState warp PETALBURG_CITY, 255, 15, 8 waitstate release @@ -1204,12 +1204,12 @@ PetalburgCity_Gym_EventScript_205733:: @ 8205733 return PetalburgCity_Gym_EventScript_205746:: @ 8205746 - special sub_81388E4 + special PetalburgGymSpecial1 waitstate return PetalburgCity_Gym_EventScript_20574B:: @ 820574B - special sub_8138AA4 + special PetalburgGymSpecial2 return PetalburgCity_Gym_EventScript_20574F:: @ 820574F diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 8d5d79d73..f4a31854e 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -28,7 +28,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C lock faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, 4 - specialvar VAR_RESULT, sub_81394D8 + specialvar VAR_RESULT, IsStarterInParty compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 release diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 128888939..e672b7ad2 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -1035,14 +1035,14 @@ Route104_EventScript_1ED580:: @ 81ED580 Route104_EventScript_1ED597:: @ 81ED597 trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox Route104_Text_2952FE, 4 release end Route104_EventScript_1ED5B6:: @ 81ED5B6 trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox Route104_Text_29540D, 4 release end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index b8503593d..d708246de 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -328,7 +328,7 @@ Route109_EventScript_1EE99E:: @ 81EE99E Route109_EventScript_1EE9B5:: @ 81EE9B5 lock faceplayer - special sub_8138B10 + special GetPlayerBigGuyGirlString checkflag FLAG_0x118 goto_eq Route109_EventScript_1EE9F2 msgbox Route109_Text_1EEFDE, 4 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 210354444..3c743fb3c 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -5,7 +5,7 @@ Route110_MapScripts:: @ 81EF269 .byte 0 Route110_MapScript1_1EF279: @ 81EF279 - special sub_8137F44 + special UpdateCyclingRoadState end Route110_MapScript1_1EF27D: @ 81EF27D @@ -24,7 +24,7 @@ Route110_MapScript2_1EF297: @ 81EF297 .2byte 0 Route110_EventScript_1EF2A1:: @ 81EF2A1 - special sub_8137D0C + special Special_BeginCyclingRoadChallenge setvar VAR_0x40A9, 2 return @@ -130,7 +130,7 @@ Route110_EventScript_1EF389:: @ 81EF389 Route110_EventScript_1EF392:: @ 81EF392 lockall - specialvar VAR_RESULT, sub_8137EFC + specialvar VAR_RESULT, GetRecordedCyclingRoadResults compare VAR_RESULT, 0 goto_eq Route110_EventScript_1EF3AD msgbox Route110_Text_1F0A1E, 4 @@ -145,7 +145,7 @@ Route110_EventScript_1EF3AD:: @ 81EF3AD Route110_EventScript_1EF3B7:: @ 81EF3B7 lock faceplayer - specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation + specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF3E8 compare VAR_0x40A9, 0 @@ -326,7 +326,7 @@ Route110_EventScript_1EF661:: @ 81EF661 end Route110_EventScript_1EF673:: @ 81EF673 - special sub_8137E6C + special FinishCyclingRoadChallenge msgbox Route110_Text_1F03FF, 4 switch VAR_RESULT case 10, Route110_EventScript_1EF6FD diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc index 8772f96b8..053183b28 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc @@ -10,7 +10,7 @@ Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78:: @ 826EA78 Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84:: @ 826EA84 lockall - specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation + specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 0 goto_eq Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F setflag FLAG_SYS_CYCLING_ROAD diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc index ca7f558a8..602373825 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc @@ -22,7 +22,7 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4:: @ 826EBC4 Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0:: @ 826EBD0 lockall - specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation + specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 2 call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6 compare VAR_RESULT, 0 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index cafa9c827..a0aa5856c 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -13,7 +13,7 @@ Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0 setvar VAR_0x4001, 0 setvar VAR_0x4002, 0 - special sub_8138FD4 + special SetTrickHouseEndRoomFlag end Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE @@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 call_if 1, Route110_TrickHouseEnd_EventScript_26B002 msgbox Route110_TrickHouseEnd_Text_26B69A, 4 call Route110_TrickHouseEnd_EventScript_26AFCF - special sub_8138FEC + special ResetTrickHouseEndRoomFlag release end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 5a20d6d76..8e1672dfe 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -170,7 +170,7 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 compare VAR_RESULT, 0 goto_eq Route111_EventScript_272054 setflag FLAG_0x92C - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox Route111_Text_2A6F3D, 4 release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 4835dffa6..72c003d99 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -48,7 +48,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 setvar VAR_0x8004, 0 setvar VAR_0x40A3, 1 incrementgamestat 48 - special sub_8138B8C + special CableCarWarp special sub_814FC9C waitstate release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 53c2c14ff..72707186b 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -20,7 +20,7 @@ Route119_MapScript1_1F444D: @ 81F444D call Route119_EventScript_271EFB compare VAR_0x40B3, 1 call_if 1, Route119_EventScript_1F4466 - special sub_8139648 + special SetRoute119Weather end Route119_EventScript_1F4466:: @ 81F4466 diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index eb7032672..399692db3 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -15,7 +15,7 @@ Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 lock faceplayer - special sub_8138B10 + special GetPlayerBigGuyGirlString compare VAR_0x40B3, 0 goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index c1cc0c230..f89ac7e86 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -110,7 +110,7 @@ Route120_EventScript_1F5527:: @ 81F5527 call_if 1, Route120_EventScript_1F562F compare VAR_RESULT, 0 call_if 1, Route120_EventScript_1F5638 - specialvar VAR_RESULT, sub_8138AF0 + specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit switch VAR_RESULT case 0, Route120_EventScript_1F55CA case 5, Route120_EventScript_1F55CA diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 4b60f1428..1369b5721 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -91,7 +91,7 @@ Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF getpartysize compare VAR_RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9 - specialvar VAR_RESULT, sub_8139530 + specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index feec8adeb..f6d535e38 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -3,7 +3,7 @@ Route123_MapScripts:: @ 81F6147 .byte 0 Route123_MapScript1_1F614D: @ 81F614D - special sub_8139668 + special SetRoute123Weather end Route123_EventScript_1F6151:: @ 81F6151 @@ -12,7 +12,7 @@ Route123_EventScript_1F6151:: @ 81F6151 checkflag FLAG_0x0E8 goto_eq Route123_EventScript_1F61A0 msgbox Route123_Text_1F641E, 4 - special sub_81390E0 + special IsGrassTypeInParty compare VAR_RESULT, 0 goto_eq Route123_EventScript_1F619E msgbox Route123_Text_1F645D, 4 diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 0b9d85e30..26278cf50 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -5,7 +5,7 @@ Route130_MapScripts:: @ 81F735F Route130_MapScript1_1F7365: @ 81F7365 compare VAR_0x405E, 4 call_if 4, Route130_EventScript_1F73B5 - specialvar VAR_RESULT, sub_813793C + specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq Route130_EventScript_1F73B1 setflag FLAG_0x011 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index a3bf1ac36..ad10e2669 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -11,7 +11,7 @@ SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 .2byte 0 SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF - special sub_8137F90 + special SetSSTidalFlag setvar VAR_PORTHOLE, 2 lockall playse SE_PINPON @@ -28,14 +28,14 @@ SSTidalCorridor_EventScript_23C015:: @ 823C015 end SSTidalRooms_EventScript_23C028:: @ 823C028 - special sub_8137F90 + special SetSSTidalFlag setvar VAR_PORTHOLE, 7 playse SE_PINPON msgbox SSTidalRooms_Text_23C462, 4 return SSTidalRooms_EventScript_23C03C:: @ 823C03C - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 4 playse SE_PINPON msgbox SSTidalRooms_Text_23C553, 4 @@ -49,7 +49,7 @@ SSTidalCorridor_EventScript_23C050:: @ 823C050 end SSTidalCorridor_EventScript_23C067:: @ 823C067 - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 3 lockall playse SE_PINPON @@ -58,7 +58,7 @@ SSTidalCorridor_EventScript_23C067:: @ 823C067 end SSTidalCorridor_EventScript_23C07D:: @ 823C07D - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 8 lockall playse SE_PINPON @@ -67,7 +67,7 @@ SSTidalCorridor_EventScript_23C07D:: @ 823C07D end SSTidalRooms_EventScript_23C093:: @ 823C093 - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 8 playse SE_PINPON msgbox SSTidalRooms_Text_23C50F, 4 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 087459bbb..a2247286c 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -33,7 +33,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 special sub_80B05B4 waitstate msgbox SeafloorCavern_Room9_Text_235279, 4 - special sub_81379F8 + special WaitWeather waitstate setvar VAR_RESULT, 1 playse SE_W197 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index dcf29081a..f57a27c1d 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA .byte 0 ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 - special sub_8137988 + special UpdateShoalTideFlag checkflag FLAG_SYS_SHOAL_TIDE goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236DD1 goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/scripts/maps/SkyPillar_Outside.inc index aa0b51414..cced073aa 100644 --- a/data/scripts/maps/SkyPillar_Outside.inc +++ b/data/scripts/maps/SkyPillar_Outside.inc @@ -76,7 +76,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 setflag FLAG_SYS_WEATHER_CTRL setweather 15 doweather - special sub_81379F8 + special WaitWeather waitstate delay 30 msgbox SkyPillar_Outside_Text_23953A, 4 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 566c37a51..fe7cfc0fd 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -142,10 +142,10 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 faceplayer bufferleadmonspeciesname 0 msgbox SlateportCity_Text_1DD68A, 4 - specialvar VAR_RESULT, sub_8139348 + specialvar VAR_RESULT, LeadMonHasEffortRibbon compare VAR_RESULT, 1 call_if 1, SlateportCity_EventScript_1DCE38 - specialvar VAR_RESULT, sub_81393C8 + specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut compare VAR_RESULT, 0 call_if 1, SlateportCity_EventScript_1DCE2E msgbox SlateportCity_Text_1DD697, 4 @@ -153,7 +153,7 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 message SlateportCity_Text_1DD6E3 waitfanfare msgbox SlateportCity_Text_1DD702, 4 - special sub_8139370 + special GiveLeadMonEffortRibbon release end diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index f8ae54145..8ecc859f7 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -27,7 +27,7 @@ SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 end SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 - specialvar VAR_RESULT, sub_81396E0 + specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 goto_eq SlateportCity_House1_EventScript_209B46 special TV_CopyNicknameToStringVar1AndEnsureTerminated diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 19094db0d..192870003 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -144,7 +144,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 end SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF - specialvar VAR_RESULT, sub_8139004 + specialvar VAR_RESULT, CheckLeadMonCool compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A0F0 return @@ -154,7 +154,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 return SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 - specialvar VAR_RESULT, sub_8139030 + specialvar VAR_RESULT, CheckLeadMonBeauty compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A107 return @@ -164,7 +164,7 @@ SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 return SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D - specialvar VAR_RESULT, sub_813905C + specialvar VAR_RESULT, CheckLeadMonCute compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A11E return @@ -174,7 +174,7 @@ SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E return SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 - specialvar VAR_RESULT, sub_8139088 + specialvar VAR_RESULT, CheckLeadMonSmart compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A135 return @@ -184,7 +184,7 @@ SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 return SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B - specialvar VAR_RESULT, sub_81390B4 + specialvar VAR_RESULT, CheckLeadMonTough compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A14C return @@ -217,7 +217,7 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E checkflag FLAG_0x116 goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4 - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index a274d1f78..793b6f4fd 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -202,7 +202,7 @@ SootopolisCity_MapScript2_1E5914: @ 81E5914 SootopolisCity_EventScript_1E5926:: @ 81E5926 lockall - special sub_8138AD0 + special StorePlayerCoordsInVars compare VAR_0x8004, 43 goto_if 5, SootopolisCity_EventScript_1E5A82 compare VAR_0x8005, 32 @@ -492,7 +492,7 @@ SootopolisCity_Movement_1E5BF7: @ 81E5BF7 SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE lockall - special sub_8138AD0 + special StorePlayerCoordsInVars compare VAR_0x8004, 43 goto_if 5, SootopolisCity_EventScript_1E5CCE compare VAR_0x8005, 32 @@ -541,7 +541,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E applymovement 11, SootopolisCity_Movement_1E5E5B waitmovement 0 removeobject 11 - special sub_81379F8 + special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 3 @@ -594,7 +594,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE applymovement 11, SootopolisCity_Movement_1E5E5B waitmovement 0 removeobject 11 - special sub_81379F8 + special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 2 @@ -747,7 +747,7 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10 SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B dodailyevents - special sub_8138B10 + special GetPlayerBigGuyGirlString checkflag FLAG_0x932 goto_eq SootopolisCity_EventScript_1E5FBB msgbox SootopolisCity_Text_2A7BB0, 4 diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index f5b867405..78c7303ae 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -46,14 +46,14 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD setvar VAR_0x40C0, 1 - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8 setvar VAR_0x40C0, 2 - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index ee62be96e..28030d869 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -5,7 +5,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 lock faceplayer msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, 4 - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore switch VAR_RESULT case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094 case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_20309E diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 1597a66eb..327c0cbc6 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -816,7 +816,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 special sub_81203FC - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage yesnobox 20, 8 compare VAR_RESULT, 1 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 03ee0d510..0f705c841 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -680,7 +680,7 @@ LilycoveCity_ContestLobby_EventScript_29419D:: @ 829419D LilycoveCity_ContestLobby_EventScript_2941AA:: @ 82941AA fadescreen 1 - specialvar VAR_RESULT, sub_8138240 + specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 special SpawnLinkPartnerFieldObject |