diff options
Diffstat (limited to 'data')
107 files changed, 697 insertions, 705 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 55bbb7618..1175c8d00 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,6 +1,7 @@ #include "constants/global.h" #include "constants/battle_frontier.h" #include "constants/battle_setup.h" +#include "constants/easy_chat.h" #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" @@ -16,6 +17,8 @@ #include "constants/trainers.h" #include "constants/vars.h" #include "constants/weather.h" +#include "constants/trainer_hill.h" +#include "constants/battle.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" @@ -46,7 +49,7 @@ gSpecialVars:: @ 81DBA0C .4byte gSpecialVar_ContestCategory .4byte gSpecialVar_MonBoxId .4byte gSpecialVar_MonBoxPos - .4byte gSpecialVar_0x8014 + .4byte gSpecialVar_Unused_0x8014 .4byte gTrainerBattleOpponent_A .include "data/specials.inc" @@ -1093,7 +1096,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 special sub_81AFDD0 setflag FLAG_IS_CHAMPION call EverGrandeCity_HallOfFame_EventScript_271829 - compare VAR_0x40CC, 0 + compare VAR_FOSSIL_MANIAC_STATE, 0 call_if_eq EverGrandeCity_HallOfFame_EventScript_271839 clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS call EverGrandeCity_HallOfFame_EventScript_2718CC @@ -1126,7 +1129,7 @@ EverGrandeCity_HallOfFame_EventScript_271829:: @ 8271829 return EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839 - setvar VAR_0x40CC, 1 + setvar VAR_FOSSIL_MANIAC_STATE, 1 return EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F @@ -1145,19 +1148,19 @@ EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851 EventScript_WhiteOut:: @ 8271857 call EverGrandeCity_HallOfFame_EventScript_2718CC - goto EventScript_271862 + goto EventScript_ResetMrBriney end -EventScript_271862:: @ 8271862 +EventScript_ResetMrBriney:: @ 8271862 compare VAR_BRINEY_LOCATION, 1 - goto_if_eq EverGrandeCity_HallOfFame_EventScript_271884 + goto_if_eq EventScript_MoveMrBrineyToHouse compare VAR_BRINEY_LOCATION, 2 - goto_if_eq EverGrandeCity_HallOfFame_EventScript_27189A + goto_if_eq EventScript_MoveMrBrineyToDewford compare VAR_BRINEY_LOCATION, 3 - goto_if_eq EverGrandeCity_HallOfFame_EventScript_2718B3 + goto_if_eq EventScript_MoveMrBrineyToRoute108 end -EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884 +EventScript_MoveMrBrineyToHouse:: @ 8271884 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setflag FLAG_HIDE_ROUTE_108_MR_BRINEY @@ -1167,7 +1170,7 @@ EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884 clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO end -EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A +EventScript_MoveMrBrineyToDewford:: @ 827189A setflag FLAG_HIDE_ROUTE_108_MR_BRINEY setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_ROUTE_104_MR_BRINEY @@ -1178,7 +1181,7 @@ EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN end -EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3 +EventScript_MoveMrBrineyToRoute108:: @ 82718B3 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY @@ -1596,7 +1599,7 @@ EventScript_271D5E:: @ 8271D5E goto EventScript_271D89 EventScript_271D83:: @ 8271D83 - special sub_80E6BE8 + special RecordMixingPlayerSpotTriggered waitstate lock faceplayer @@ -1683,18 +1686,9 @@ Common_EventScript_ShowPokemonCenterSign:: @ 8271E73 msgbox gText_PokemonCenterSign, MSGBOX_SIGN end -BattleFrontier_BattleTowerLobby_EventScript_271E7C:: @ 8271E7C -DewfordTown_EventScript_271E7C:: @ 8271E7C -LilycoveCity_ContestLobby_EventScript_271E7C:: @ 8271E7C -LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C:: @ 8271E7C -MauvilleCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C -PetalburgCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C -Route111_EventScript_271E7C:: @ 8271E7C -Route123_BerryMastersHouse_EventScript_271E7C:: @ 8271E7C -SlateportCity_OceanicMuseum_1F_EventScript_271E7C:: @ 8271E7C -SlateportCity_PokemonFanClub_EventScript_271E7C:: @ 8271E7C +Common_ShowEasyChatScreen:: @ 8271E7C fadescreen 1 - special easy_chat_input_maybe + special ShowEasyChatScreen fadescreen 0 return @@ -2707,10 +2701,10 @@ gUnknown_08273594:: @ 8273594 gUnknown_082735F2:: @ 82735F2 .string "It appears to be for use at\nthe LILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -gUnknown_08273656:: @ 8273656 +gText_UnusualWeatherEnded_Rain:: @ 8273656 .string "The massive downpour appears to\nhave stopped…$" -gUnknown_08273684:: @ 8273684 +gText_UnusualWeatherEnded_Sun:: @ 8273684 .string "The intense sunshine appears to\nhave subsided…$" EventScript_2736B3:: @ 82736B3 @@ -2758,7 +2752,7 @@ EventScript_2736F8:: @ 82736F8 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - setvar VAR_0x8004, 10 + setvar VAR_0x8004, TRAINER_HILL_FUNC_10 special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_1F_EventScript_2C83C9 @@ -2941,8 +2935,8 @@ EventScript_Questionnaire:: @ 827381B msgbox gUnknown_0827339F, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_2738FD - setvar VAR_0x8004, 20 - call MauvilleCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE + call Common_ShowEasyChatScreen lock faceplayer specialvar VAR_0x8008, sub_813B490 @@ -2999,47 +2993,47 @@ EventScript_2738FF:: @ 82738FF releaseall end -Route114_EventScript_273913:: @ 8273913 +UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913 setmetatile 7, 3, 839, 1 setmetatile 7, 4, 847, 0 return -Route114_EventScript_273926:: @ 8273926 +UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926 setmetatile 6, 45, 601, 1 setmetatile 6, 46, 609, 0 return -Route115_EventScript_273939:: @ 8273939 +UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939 setmetatile 21, 5, 601, 1 setmetatile 21, 6, 609, 0 return -Route115_EventScript_27394C:: @ 827394C +UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C setmetatile 36, 9, 601, 1 setmetatile 36, 10, 609, 0 return -Route116_EventScript_27395F:: @ 827395F +UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F setmetatile 59, 12, 159, 1 setmetatile 59, 13, 167, 0 return -Route116_EventScript_273972:: @ 8273972 +UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972 setmetatile 79, 5, 159, 1 setmetatile 79, 6, 167, 0 return -Route118_EventScript_273985:: @ 8273985 +UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985 setmetatile 42, 5, 159, 1 setmetatile 42, 6, 167, 0 return -Route118_EventScript_273998:: @ 8273998 +UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998 setmetatile 9, 5, 159, 1 setmetatile 9, 6, 167, 0 return -Route105_EventScript_2739AB:: @ 82739AB +UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB setmetatile 10, 28, 334, 0 setmetatile 11, 28, 334, 0 setmetatile 9, 29, 334, 0 @@ -3054,7 +3048,7 @@ Route105_EventScript_2739AB:: @ 82739AB setmetatile 11, 31, 334, 0 return -Route105_EventScript_273A18:: @ 8273A18 +UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18 setmetatile 20, 53, 334, 0 setmetatile 21, 53, 334, 0 setmetatile 19, 54, 334, 0 @@ -3069,7 +3063,7 @@ Route105_EventScript_273A18:: @ 8273A18 setmetatile 21, 56, 334, 0 return -Route125_EventScript_273A85:: @ 8273A85 +UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85 setmetatile 8, 16, 334, 0 setmetatile 9, 16, 334, 0 setmetatile 7, 17, 334, 0 @@ -3084,7 +3078,7 @@ Route125_EventScript_273A85:: @ 8273A85 setmetatile 9, 19, 334, 0 return -Route125_EventScript_273AF2:: @ 8273AF2 +UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2 setmetatile 53, 18, 334, 0 setmetatile 54, 18, 334, 0 setmetatile 52, 19, 334, 0 @@ -3099,7 +3093,7 @@ Route125_EventScript_273AF2:: @ 8273AF2 setmetatile 54, 21, 334, 0 return -Route127_EventScript_273B5F:: @ 8273B5F +UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F setmetatile 57, 9, 334, 0 setmetatile 58, 9, 334, 0 setmetatile 56, 10, 334, 0 @@ -3114,7 +3108,7 @@ Route127_EventScript_273B5F:: @ 8273B5F setmetatile 58, 12, 334, 0 return -Route127_EventScript_273BCC:: @ 8273BCC +UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC setmetatile 61, 30, 334, 0 setmetatile 62, 30, 334, 0 setmetatile 60, 31, 334, 0 @@ -3129,7 +3123,7 @@ Route127_EventScript_273BCC:: @ 8273BCC setmetatile 62, 33, 334, 0 return -Route129_EventScript_273C39:: @ 8273C39 +UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39 setmetatile 16, 14, 334, 0 setmetatile 17, 14, 334, 0 setmetatile 15, 15, 334, 0 @@ -3144,7 +3138,7 @@ Route129_EventScript_273C39:: @ 8273C39 setmetatile 17, 17, 334, 0 return -Route129_EventScript_273CA6:: @ 8273CA6 +UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 setmetatile 42, 19, 334, 0 setmetatile 43, 19, 334, 0 setmetatile 41, 20, 334, 0 @@ -3170,114 +3164,106 @@ Route129_EventScript_273D13:: @ 8273D13 setflag FLAG_SPECIAL_FLAG_0x4000 return -Route105_EventScript_273D17:: @ 8273D17 -Route125_EventScript_273D17:: @ 8273D17 -Route127_EventScript_273D17:: @ 8273D17 -Route129_EventScript_273D17:: @ 8273D17 +UnusualWeather_StartKyogreWeather:: @ 8273D17 setweather WEATHER_RAIN_HEAVY return -Route114_EventScript_273D1B:: @ 8273D1B -Route115_EventScript_273D1B:: @ 8273D1B -Route116_EventScript_273D1B:: @ 8273D1B -Route118_EventScript_273D1B:: @ 8273D1B +UnusualWeather_StartGroudonWeather:: @ 8273D1B setweather WEATHER_DROUGHT return -gUnknown_08273D1F:: @ 8273D1F - -gUnknown_08273D1F:: @ 8273D1F +UnusualWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F lockall - compare VAR_0x4037, 9 - goto_if_ge Route105_EventScript_273D51 - goto Route105_EventScript_273D5F + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START + goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage + goto UnusualWeather_EventScript_ShowSunEndedMessage end -Route105_EventScript_273D31:: @ 8273D31 +UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 closemessage fadescreenswapbuffers 1 setweather WEATHER_SUNNY doweather - call Route105_EventScript_273D6D + call UnusualWeather_EventScript_CleanupMapTiles special DrawWholeMapView - setvar VAR_0x4037, 0 - setvar VAR_0x4039, 0 + setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0 clearflag FLAG_SPECIAL_FLAG_0x4000 fadescreenswapbuffers 0 releaseall end -Route105_EventScript_273D51:: @ 8273D51 - msgbox gUnknown_08273656, MSGBOX_DEFAULT - goto Route105_EventScript_273D31 +UnusualWeather_EventScript_ShowRainEndedMessage:: @ 8273D51 + msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT + goto UnusualWeather_EventScript_EndEventAndCleanup_2 end -Route105_EventScript_273D5F:: @ 8273D5F - msgbox gUnknown_08273684, MSGBOX_DEFAULT - goto Route105_EventScript_273D31 +UnusualWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F + msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT + goto UnusualWeather_EventScript_EndEventAndCleanup_2 end -Route105_EventScript_273D6D:: @ 8273D6D - switch VAR_0x4037 - case 1, Route105_EventScript_273E23 - case 2, Route105_EventScript_273E36 - case 3, Route105_EventScript_273E49 - case 4, Route105_EventScript_273E5C - case 5, Route105_EventScript_273E6F - case 6, Route105_EventScript_273E82 - case 7, Route105_EventScript_273E95 - case 8, Route105_EventScript_273EA8 - case 9, Route105_EventScript_273EBB - case 10, Route105_EventScript_273F28 - case 11, Route105_EventScript_273F95 - case 12, Route105_EventScript_274002 - case 13, Route105_EventScript_27406F - case 14, Route105_EventScript_2740DC - case 15, Route105_EventScript_274149 - case 16, Route105_EventScript_2741B6 +UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D + switch VAR_UNUSUAL_WEATHER_LOCATION + case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North + case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South + case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West + case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East + case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North + case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South + case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East + case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West + case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North + case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South + case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West + case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East + case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North + case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South + case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West + case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East return -Route105_EventScript_273E23:: @ 8273E23 +UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23 setmetatile 7, 3, 617, 1 setmetatile 7, 4, 617, 1 return -Route105_EventScript_273E36:: @ 8273E36 +UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36 setmetatile 6, 45, 613, 1 setmetatile 6, 46, 613, 1 return -Route105_EventScript_273E49:: @ 8273E49 +UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49 setmetatile 21, 5, 613, 1 setmetatile 21, 6, 613, 1 return -Route105_EventScript_273E5C:: @ 8273E5C +UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C setmetatile 36, 9, 613, 1 setmetatile 36, 10, 613, 1 return -Route105_EventScript_273E6F:: @ 8273E6F +UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F setmetatile 59, 12, 124, 1 setmetatile 59, 13, 124, 1 return -Route105_EventScript_273E82:: @ 8273E82 +UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82 setmetatile 79, 5, 124, 1 setmetatile 79, 6, 124, 1 return -Route105_EventScript_273E95:: @ 8273E95 +UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95 setmetatile 42, 5, 124, 1 setmetatile 42, 6, 121, 1 return -Route105_EventScript_273EA8:: @ 8273EA8 +UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8 setmetatile 9, 5, 124, 1 setmetatile 9, 6, 121, 1 return -Route105_EventScript_273EBB:: @ 8273EBB +UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB setmetatile 10, 28, 368, 0 setmetatile 11, 28, 368, 0 setmetatile 9, 29, 368, 0 @@ -3292,7 +3278,7 @@ Route105_EventScript_273EBB:: @ 8273EBB setmetatile 11, 31, 368, 0 return -Route105_EventScript_273F28:: @ 8273F28 +UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28 setmetatile 20, 53, 368, 0 setmetatile 21, 53, 368, 0 setmetatile 19, 54, 368, 0 @@ -3307,7 +3293,7 @@ Route105_EventScript_273F28:: @ 8273F28 setmetatile 21, 56, 368, 0 return -Route105_EventScript_273F95:: @ 8273F95 +UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95 setmetatile 8, 16, 368, 0 setmetatile 9, 16, 368, 0 setmetatile 7, 17, 368, 0 @@ -3322,7 +3308,7 @@ Route105_EventScript_273F95:: @ 8273F95 setmetatile 9, 19, 368, 0 return -Route105_EventScript_274002:: @ 8274002 +UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002 setmetatile 53, 18, 368, 0 setmetatile 54, 18, 368, 0 setmetatile 52, 19, 368, 0 @@ -3337,7 +3323,7 @@ Route105_EventScript_274002:: @ 8274002 setmetatile 54, 21, 368, 0 return -Route105_EventScript_27406F:: @ 827406F +UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F setmetatile 57, 9, 368, 0 setmetatile 58, 9, 368, 0 setmetatile 56, 10, 368, 0 @@ -3352,7 +3338,7 @@ Route105_EventScript_27406F:: @ 827406F setmetatile 58, 12, 368, 0 return -Route105_EventScript_2740DC:: @ 82740DC +UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC setmetatile 61, 30, 368, 0 setmetatile 62, 30, 368, 0 setmetatile 60, 31, 368, 0 @@ -3367,7 +3353,7 @@ Route105_EventScript_2740DC:: @ 82740DC setmetatile 62, 33, 368, 0 return -Route105_EventScript_274149:: @ 8274149 +UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149 setmetatile 16, 14, 368, 0 setmetatile 17, 14, 368, 0 setmetatile 15, 15, 368, 0 @@ -3382,7 +3368,7 @@ Route105_EventScript_274149:: @ 8274149 setmetatile 17, 17, 368, 0 return -Route105_EventScript_2741B6:: @ 82741B6 +UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6 setmetatile 42, 19, 368, 0 setmetatile 43, 19, 368, 0 setmetatile 41, 20, 368, 0 @@ -3397,50 +3383,47 @@ Route105_EventScript_2741B6:: @ 82741B6 setmetatile 43, 22, 368, 0 return -Underwater3_EventScript_274223:: @ 8274223 -Underwater5_EventScript_274223:: @ 8274223 -Underwater6_EventScript_274223:: @ 8274223 -Underwater7_EventScript_274223:: @ 8274223 - switch VAR_0x4037 - case 9, Underwater3_EventScript_274281 - case 10, Underwater3_EventScript_27428A - case 11, Underwater3_EventScript_274293 - case 12, Underwater3_EventScript_27429C - case 13, Underwater3_EventScript_2742A5 - case 14, Underwater3_EventScript_2742AE - case 15, Underwater3_EventScript_2742B7 - case 16, Underwater3_EventScript_2742C0 +UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223 + switch VAR_UNUSUAL_WEATHER_LOCATION + case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North + case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South + case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West + case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East + case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North + case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South + case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West + case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East return -Underwater3_EventScript_274281:: @ 8274281 +UnusualWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281 setescapewarp MAP_ROUTE105, 255, 11, 29 return -Underwater3_EventScript_27428A:: @ 827428A +UnusualWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A setescapewarp MAP_ROUTE105, 255, 21, 54 return -Underwater3_EventScript_274293:: @ 8274293 +UnusualWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293 setescapewarp MAP_ROUTE125, 255, 9, 17 return -Underwater3_EventScript_27429C:: @ 827429C +UnusualWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C setescapewarp MAP_ROUTE125, 255, 54, 19 return -Underwater3_EventScript_2742A5:: @ 82742A5 +UnusualWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5 setescapewarp MAP_ROUTE127, 255, 58, 10 return -Underwater3_EventScript_2742AE:: @ 82742AE +UnusualWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE setescapewarp MAP_ROUTE127, 255, 62, 31 return -Underwater3_EventScript_2742B7:: @ 82742B7 +UnusualWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7 setescapewarp MAP_ROUTE129, 255, 17, 15 return -Underwater3_EventScript_2742C0:: @ 82742C0 +UnusualWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0 setescapewarp MAP_ROUTE129, 255, 43, 20 return @@ -3769,10 +3752,10 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT - setvar VAR_0x8004, 5 + setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, 1 - call SlateportCity_PokemonFanClub_EventScript_271E7C + setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3824,10 +3807,10 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT - setvar VAR_0x8004, 5 + setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, 0 - call SlateportCity_OceanicMuseum_1F_EventScript_271E7C + setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3896,17 +3879,17 @@ SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF end SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED - setvar VAR_0x8004, 7 + setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 - call SlateportCity_PokemonFanClub_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT setvar VAR_0x8006, 1 - call SlateportCity_PokemonFanClub_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -3945,10 +3928,10 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 - call LilycoveCity_ContestLobby_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3966,10 +3949,10 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA setvar VAR_0x8004, 24 special SetContestCategoryStringVarForInterview msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT - setvar VAR_0x8004, 11 + setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 1 - call LilycoveCity_ContestLobby_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -4034,9 +4017,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT - setvar VAR_0x8004, 12 + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW copyvar VAR_0x8005, VAR_0x8009 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -4506,7 +4489,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C special sub_818E3BC compare VAR_0x8004, 0 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C - compare VAR_0x8004, 15 + compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635 @@ -6936,16 +6919,16 @@ TrainerHill_3F_MapScript1_2C8336: @ 82C8336 TrainerHill_4F_MapScript1_2C8336: @ 82C8336 TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER special CallTrainerHillFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special CallFrontierUtilFunc - compare VAR_RESULT, 2 + compare VAR_RESULT, B_OUTCOME_LOST goto_if_eq TrainerHill_1F_EventScript_2C83C9 - compare VAR_RESULT, 3 + compare VAR_RESULT, B_OUTCOME_DREW goto_if_eq TrainerHill_1F_EventScript_2C83C9 - compare VAR_RESULT, 9 + compare VAR_RESULT, B_OUTCOME_FORFEITED goto_if_eq TrainerHill_1F_EventScript_2C83C9 end @@ -6969,7 +6952,7 @@ TrainerHill_Roof_MapScript2_2C8381: @ 82C8381 EventScript_TrainerHillTimer:: @ 82C8393 lockall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, TRAINER_HILL_FUNC_7 special CallTrainerHillFunction msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT releaseall @@ -6977,7 +6960,7 @@ EventScript_TrainerHillTimer:: @ 82C8393 TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, 9 + setvar VAR_0x8004, TRAINER_HILL_FUNC_9 special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_1F_EventScript_2C83BF @@ -6989,9 +6972,9 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF end TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, TRAINER_HILL_FUNC_12 special CallTrainerHillFunction - setvar VAR_0x8004, 5 + setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST special CallTrainerHillFunction setvar VAR_TEMP_1, 1 end @@ -7009,7 +6992,7 @@ TrainerHill_1F_Movement_2C83EE:: @ 82C83EE EventScript_2C83F0:: @ 82C83F0 trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText - setvar VAR_0x8004, 11 + setvar VAR_0x8004, TRAINER_HILL_FUNC_11 special CallTrainerHillFunction waitmessage waitbuttonpress diff --git a/data/io_reg.s b/data/io_reg.s index e6315cd89..9c5f64f58 100644 --- a/data/io_reg.s +++ b/data/io_reg.s @@ -24,11 +24,11 @@ gUnref_82EC784:: @ 82EC784 .4byte 0x02000100 .4byte 0x08000400 -gUnknown_82EC7C4:: @ 82EC7C4 - .2byte 0x0100 - .2byte 0x0200 - .2byte 0x0400 - .2byte 0x0800 +gOverworldBackgroundLayerFlags:: @ 82EC7C4 + .2byte 0x0100 /* BLDCNT_TGT2_BG0 */ + .2byte 0x0200 /* BLDCNT_TGT2_BG1 */ + .2byte 0x0400 /* BLDCNT_TGT2_BG2 */ + .2byte 0x0800 /* BLDCNT_TGT2_BG3 */ gUnknown_82EC7CC:: @ 82EC7CC .2byte 0x0001 diff --git a/data/map_events.s b/data/map_events.s index cd42bfe75..ceaa72837 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -8,6 +8,7 @@ #include "constants/secret_bases.h" #include "constants/vars.h" #include "constants/weather.h" +#include "constants/trainer_hill.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps.s b/data/maps.s index 3334fd103..beb28ddec 100644 --- a/data/maps.s +++ b/data/maps.s @@ -4,7 +4,7 @@ #include "constants/weather.h" #include "constants/region_map_sections.h" #include "constants/songs.h" -#include "constants/weather.h" +#include "constants/trainer_hill.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 8d407ac1d..6d53a33e1 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -572,8 +572,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7 BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT - setvar VAR_0x8004, 1 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_START + call Common_ShowEasyChatScreen lock faceplayer goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A @@ -581,8 +581,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT - setvar VAR_0x8004, 2 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_WON + call Common_ShowEasyChatScreen lock faceplayer goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A @@ -590,8 +590,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT - setvar VAR_0x8004, 3 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_LOST + call Common_ShowEasyChatScreen lock faceplayer goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 574415c4c..8ce438d75 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -8,12 +8,12 @@ BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5 end BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9 - map_script_2 VAR_0x40D0, 0, BattleFrontier_ReceptionGate_EventScript_2661F3 + map_script_2 VAR_HAS_ENTERED_BATTLE_FRONTIER, 0, BattleFrontier_ReceptionGate_EventScript_2661F3 .2byte 0 BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 lockall - setvar VAR_0x40D0, 1 + setvar VAR_HAS_ENTERED_BATTLE_FRONTIER, 1 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark waitmovement 0 diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 9278252e6..52863d474 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -184,11 +184,11 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT - compare VAR_0x40D1, 13 + compare VAR_SCOTT_STATE, 13 goto_if_eq BattleFrontier_ScottsHouse_EventScript_2639BC - compare VAR_0x40D1, 9 + compare VAR_SCOTT_STATE, 9 goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639CB - compare VAR_0x40D1, 6 + compare VAR_SCOTT_STATE, 6 goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639DA goto BattleFrontier_ScottsHouse_EventScript_2639E9 end diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index c36b60111..0e554a945 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -52,7 +52,7 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D playse SE_KAIDAN fadescreenspeed 1, 4 setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR - setvar VAR_0x405E, 3 + setvar VAR_RAYQUAZA_STATE, 3 removeobject 1 clearflag FLAG_HIDE_SKY_PILLAR_WALLACE fadescreen 0 diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index d1f382e36..ed8acea17 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -608,8 +608,8 @@ DewfordTown_EventScript_1E9948:: @ 81E9948 DewfordTown_EventScript_1E9952:: @ 81E9952 msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT - setvar VAR_0x8004, 9 - call DewfordTown_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 3b39fc5d0..eb8183585 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -187,7 +187,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 closemessage delay 30 setflag FLAG_ENABLE_BRAWLY_MATCH_CALL - setvar VAR_0x40F4, 0 + setvar VAR_ROXANNE_CALL_STEP_COUNTER, 0 setflag FLAG_ENABLE_ROXANNE_FIRST_CALL release end diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json index 7480e36c1..172bb3fdc 100644 --- a/data/maps/DoubleBattleColosseum/map.json +++ b/data/maps/DoubleBattleColosseum/map.json @@ -52,7 +52,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "gUnknown_08277388" + "script": "EventScript_DoubleBattleColosseum_PlayerSpot0" }, { "type": "trigger", @@ -61,7 +61,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "gUnknown_082773BE" + "script": "EventScript_DoubleBattleColosseum_PlayerSpot2" }, { "type": "trigger", @@ -70,7 +70,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "gUnknown_082773A3" + "script": "EventScript_DoubleBattleColosseum_PlayerSpot1" }, { "type": "trigger", @@ -79,7 +79,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "gUnknown_082773D9" + "script": "EventScript_DoubleBattleColosseum_PlayerSpot3" } ], "bg_events": [] diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 827c08e54..12c6bbb77 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -40,7 +40,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 compare VAR_FACING, 3 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_EVERGRANDE playse SE_KAIDAN waitse diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 6d7ea6be5..f6b7e1097 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -296,7 +296,7 @@ FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 faceplayer goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_200245 msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_FALLARBOR release end diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index 7051d376c..bee33ae07 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -38,7 +38,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E return FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 - setvar VAR_0x403A, 0 + setvar VAR_NEVER_READ_0x403A, 0 setvar VAR_TEMP_1, 1 call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86 end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 30cf8736a..8192e2039 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -43,7 +43,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD closemessage delay 30 setflag FLAG_ENABLE_WINONA_MATCH_CALL - setvar VAR_0x40F3, 0 + setvar VAR_WINONA_CALL_STEP_COUNTER, 0 setflag FLAG_REGISTER_WINONA_POKENAV release end diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index 1b9c5471d..3ec89fce6 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -184,7 +184,7 @@ "x": 21, "y": 15, "elevation": 3, - "var": "VAR_0x40C8", + "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", "script": "JaggedPass_EventScript_2306BB" }, @@ -193,7 +193,7 @@ "x": 22, "y": 20, "elevation": 3, - "var": "VAR_0x40C8", + "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", "script": "JaggedPass_EventScript_2306BB" }, @@ -202,7 +202,7 @@ "x": 21, "y": 20, "elevation": 3, - "var": "VAR_0x40C8", + "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", "script": "JaggedPass_EventScript_2306BB" }, @@ -211,7 +211,7 @@ "x": 14, "y": 15, "elevation": 3, - "var": "VAR_0x40C8", + "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", "script": "JaggedPass_EventScript_2306BB" }, @@ -220,7 +220,7 @@ "x": 13, "y": 15, "elevation": 3, - "var": "VAR_0x40C8", + "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", "script": "JaggedPass_EventScript_2306BB" } diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 3df62fc7d..c51a5ec26 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -6,7 +6,7 @@ JaggedPass_MapScripts:: @ 8230656 JaggedPass_MapScript1_230666: @ 8230666 setstepcallback 1 - compare VAR_0x40C8, 0 + compare VAR_JAGGED_PASS_STATE, 0 call_if_eq JaggedPass_EventScript_230674 end @@ -17,7 +17,7 @@ JaggedPass_EventScript_230674:: @ 8230674 return JaggedPass_EventScript_230685:: @ 8230685 - setvar VAR_0x40C8, 1 + setvar VAR_JAGGED_PASS_STATE, 1 return JaggedPass_MapScript1_23068B: @ 823068B @@ -31,7 +31,7 @@ JaggedPass_EventScript_230697:: @ 8230697 return JaggedPass_MapScript1_23069C: @ 823069C - compare VAR_0x40C8, 1 + compare VAR_JAGGED_PASS_STATE, 1 goto_if_le JaggedPass_EventScript_2306A8 end @@ -61,7 +61,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB setmetatile 16, 18, 606, 0 special DrawWholeMapView delay 30 - setvar VAR_0x40C8, 2 + setvar VAR_JAGGED_PASS_STATE, 2 waitse releaseall end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 4a761a706..fd6aa34bd 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -57,7 +57,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D faceplayer goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_LILYCOVE release end diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index ec1d89b66..1e01fc168 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -9,7 +9,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C lock faceplayer dotimebasedevents - compare VAR_POKELOT_PRIZE, 0 + compare VAR_POKELOT_PRIZE_ITEM, 0 goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_21F78D msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO @@ -100,8 +100,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7D4:: @ 821F7D4 return LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD - copyvar VAR_0x404D, VAR_0x8004 - copyvar VAR_POKELOT_PRIZE, VAR_0x8005 + copyvar VAR_POKELOT_PRIZE_PLACE, VAR_0x8004 + copyvar VAR_POKELOT_PRIZE_ITEM, VAR_0x8005 goto LilycoveCity_DepartmentStore_1F_EventScript_21F7ED end @@ -112,14 +112,14 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, MSGBOX_DEFAULT - giveitem_std VAR_POKELOT_PRIZE + giveitem_std VAR_POKELOT_PRIZE_ITEM compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED - copyvar VAR_0x8004, VAR_0x404D - copyvar VAR_0x8005, VAR_POKELOT_PRIZE + copyvar VAR_0x8004, VAR_POKELOT_PRIZE_PLACE + copyvar VAR_0x8005, VAR_POKELOT_PRIZE_ITEM special sub_80EE2CC - setvar VAR_POKELOT_PRIZE, 0 - setvar VAR_0x404D, 0 + setvar VAR_POKELOT_PRIZE_ITEM, 0 + setvar VAR_POKELOT_PRIZE_PLACE, 0 release end diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index e62537422..7cab0f1fa 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -3,9 +3,9 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A .byte 0 LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80 - map_script_2 VAR_0x405E, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A - map_script_2 VAR_0x405E, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A - map_script_2 VAR_0x405E, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A + map_script_2 VAR_RAYQUAZA_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A + map_script_2 VAR_RAYQUAZA_STATE, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A + map_script_2 VAR_RAYQUAZA_STATE, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A .2byte 0 LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A @@ -125,9 +125,9 @@ LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 lockall applymovement 7, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 0 + compare VAR_RAYQUAZA_STATE, 0 goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_22009C goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7 end diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index f65d901bb..f83be42b9 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -512,9 +512,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 setvar VAR_0x8004, 8 special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT - setvar VAR_0x8004, 14 + setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION copyvar VAR_0x8005, VAR_0x800A - call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -542,9 +542,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 setvar VAR_0x8004, 8 special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT - setvar VAR_0x8004, 14 + setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION copyvar VAR_0x8005, VAR_0x800A - call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 87e0e58cc..b553cf65b 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -11,7 +11,7 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 - setvar VAR_0x4089, 0 + setvar VAR_SECRET_BASE_INITIALIZED, 0 end LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A @@ -44,7 +44,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464 return LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A - map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474 + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474 .2byte 0 LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index e11d2a991..49a9523e0 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -11,7 +11,7 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE call LittlerootTown_MaysHouse_2F_EventScript_275CE1 - setvar VAR_0x4089, 0 + setvar VAR_SECRET_BASE_INITIALIZED, 0 end LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD @@ -45,7 +45,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317 return LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D - map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327 + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327 .2byte 0 LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 88b1c6929..c02381982 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -195,7 +195,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL setvar VAR_0x40D3, 2 - setvar VAR_0x40F5, 0 + setvar VAR_SCOTT_CALL_STEP_COUNTER, 0 setflag FLAG_SCOTT_CALL_NATIONAL_DEX releaseall end @@ -570,7 +570,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC setflag FLAG_SYS_POKEDEX_GET special sub_81AFDA0 setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH - setvar VAR_0x40CD, 1 + setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1 return LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4 diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index 036fa7724..028075648 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -47,13 +47,13 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B goto_if_eq MarineCave_End_EventScript_23B092 compare VAR_RESULT, 5 goto_if_eq MarineCave_End_EventScript_23B092 - setvar VAR_0x4039, 1 + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_KYOGRE releaseall end MarineCave_End_EventScript_23B084:: @ 823B084 - setvar VAR_0x4039, 1 + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_KYOGRE goto MarineCave_End_EventScript_27376D end diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 120fc9f51..61839d108 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -158,7 +158,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE setflag FLAG_DEFEATED_WALLY_MAUVILLE - setvar VAR_0x40F2, 0 + setvar VAR_WALLY_CALL_STEP_COUNTER, 0 setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL compare VAR_FACING, 2 call_if_eq MauvilleCity_EventScript_1DF5F3 @@ -168,7 +168,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 waitmovement 0 msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 compare VAR_FACING, 2 call_if_eq MauvilleCity_EventScript_1DF616 compare VAR_FACING, 4 diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index de4bd0ddf..e23d48332 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -90,7 +90,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B waitmessage call Common_EventScript_PlayGymBadgeFanfare msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT - setvar VAR_0x40D2, 3 + setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3 clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index 312852586..3d8dd80d0 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -52,7 +52,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA waitstate special DoMirageTowerCeilingCrumble waitstate - setvar VAR_0x40CB, 1 + setvar VAR_ROUTE_111_STATE, 1 clearflag FLAG_LANDMARK_MIRAGE_TOWER warp MAP_ROUTE111, 255, 19, 59 waitstate diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 952ff253c..99d7ae01c 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -366,7 +366,7 @@ "x": 42, "y": 21, "elevation": 5, - "var": "VAR_0x405D", + "var": "VAR_MOSSDEEP_STATE", "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, @@ -375,7 +375,7 @@ "x": 41, "y": 22, "elevation": 5, - "var": "VAR_0x405D", + "var": "VAR_MOSSDEEP_STATE", "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, @@ -384,7 +384,7 @@ "x": 41, "y": 23, "elevation": 5, - "var": "VAR_0x405D", + "var": "VAR_MOSSDEEP_STATE", "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, @@ -393,7 +393,7 @@ "x": 41, "y": 24, "elevation": 5, - "var": "VAR_0x405D", + "var": "VAR_MOSSDEEP_STATE", "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, @@ -402,7 +402,7 @@ "x": 40, "y": 25, "elevation": 5, - "var": "VAR_0x405D", + "var": "VAR_MOSSDEEP_STATE", "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" }, @@ -411,7 +411,7 @@ "x": 40, "y": 26, "elevation": 5, - "var": "VAR_0x405D", + "var": "VAR_MOSSDEEP_STATE", "var_value": "1", "script": "MossdeepCity_EventScript_1E4B41" } diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index b01e9cae8..493cded0a 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -94,7 +94,7 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41 removeobject 12 removeobject 13 delay 30 - setvar VAR_0x405D, 2 + setvar VAR_MOSSDEEP_STATE, 2 setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA releaseall end @@ -259,7 +259,7 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85 call_if_eq MossdeepCity_EventScript_1E4CB0 compare VAR_FACING, 4 call_if_eq MossdeepCity_EventScript_1E4CC2 - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 removeobject 16 release end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 7638f6119..7fc98dc54 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -71,9 +71,9 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN - setvar VAR_0x405D, 1 + setvar VAR_MOSSDEEP_STATE, 1 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN - setvar VAR_0x409F, 1 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1 call MossdeepCity_Gym_EventScript_22095B closemessage delay 30 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 43bd56d3a..13bf111ba 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -4,7 +4,7 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 .byte 0 MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 end @@ -18,11 +18,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 setobjectxyperm 1, 3, 4 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT - compare VAR_0x409E, 1 + compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA - compare VAR_0x409E, 2 + compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2 - compare VAR_0x409E, 3 + compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA end @@ -39,7 +39,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA end MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_222FCE end @@ -50,7 +50,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 lock faceplayer - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 dotimebasedevents specialvar VAR_RESULT, GetWeekCount @@ -98,7 +98,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 lock faceplayer - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT release @@ -114,7 +114,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E lock faceplayer - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_2230D0 msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT @@ -155,9 +155,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_223154 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_223154 goto MossdeepCity_SpaceCenter_1F_EventScript_22315E end @@ -176,9 +176,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_22318F - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_22318F goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4 end @@ -242,7 +242,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F case 3, MossdeepCity_SpaceCenter_1F_EventScript_223289 applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2 waitmovement 0 - setvar VAR_0x409E, 2 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2 release end @@ -254,14 +254,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E MossdeepCity_SpaceCenter_1F_EventScript_223278:: @ 8223278 applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329A waitmovement 0 - setvar VAR_0x409E, 1 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1 release end MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289 applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329E waitmovement 0 - setvar VAR_0x409E, 3 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index d9727235f..41f8af97c 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -4,9 +4,9 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 .byte 0 MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A - compare VAR_0x409F, 2 + compare VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2 call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D9F end @@ -27,7 +27,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F return MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 - map_script_2 VAR_0x409F, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF + map_script_2 VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF .2byte 0 MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF @@ -69,7 +69,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89 waitmovement 0 - setvar VAR_0x409F, 2 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2 moveobjectoffscreen 5 moveobjectoffscreen 7 moveobjectoffscreen 6 @@ -98,9 +98,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EB4 goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE end @@ -119,9 +119,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EEF - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EEF goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9 end @@ -140,9 +140,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223F2A - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 - compare VAR_0x405D, 2 + compare VAR_MOSSDEEP_STATE, 2 goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223F2A goto MossdeepCity_SpaceCenter_2F_EventScript_223F34 end @@ -248,7 +248,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C waitmovement 0 special SavePlayerParty fadescreen 1 - special sub_80F9438 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_224032 @@ -287,10 +287,10 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 delay 20 msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT closemessage - setvar VAR_0x405D, 3 + setvar VAR_MOSSDEEP_STATE, 3 fadedefaultbgm fadescreen 1 - setvar VAR_0x409F, 3 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 3 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 3d09ae706..6a9a6b33d 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -229,7 +229,7 @@ "x": 4, "y": 10, "elevation": 3, - "var": "VAR_0x40C9", + "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", "script": "PetalburgCity_EventScript_1DC691" }, @@ -238,7 +238,7 @@ "x": 4, "y": 11, "elevation": 3, - "var": "VAR_0x40C9", + "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", "script": "PetalburgCity_EventScript_1DC6A7" }, @@ -247,7 +247,7 @@ "x": 4, "y": 12, "elevation": 3, - "var": "VAR_0x40C9", + "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", "script": "PetalburgCity_EventScript_1DC6BD" }, @@ -256,7 +256,7 @@ "x": 4, "y": 13, "elevation": 3, - "var": "VAR_0x40C9", + "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", "script": "PetalburgCity_EventScript_1DC6D3" } diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index e2f5d2a86..5a652ab15 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -551,7 +551,7 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 - setvar VAR_0x40D1, 1 + setvar VAR_SCOTT_STATE, 1 msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT closemessage applymovement 9, Common_Movement_WalkInPlaceRight @@ -572,7 +572,7 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 call_if_eq PetalburgCity_EventScript_1DC7B2 compare VAR_0x8008, 3 call_if_eq PetalburgCity_EventScript_1DC7C4 - setvar VAR_0x40C9, 1 + setvar VAR_SCOTT_PETALBURG_ENCOUNTER, 1 removeobject 9 releaseall end diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 1f0fdd91c..a256a6547 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -60,7 +60,7 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955 return PetalburgCity_Gym_EventScript_20495D:: @ 820495D - setorcopyvar VAR_0x8015, 269 + setorcopyvar VAR_TRAINER_BATTLE_OPPONENT_A, 269 specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_204985 diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 4777472d2..d34ad4903 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -66,7 +66,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "gUnknown_0827741D" + "script": "EventScript_RecordCenter_Spot0" }, { "type": "trigger", @@ -75,7 +75,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "gUnknown_08277447" + "script": "EventScript_RecordCenter_Spot2" }, { "type": "trigger", @@ -84,7 +84,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "gUnknown_08277432" + "script": "EventScript_RecordCenter_Spot1" }, { "type": "trigger", @@ -93,7 +93,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "gUnknown_0827745C" + "script": "EventScript_RecordCenter_Spot3" } ], "bg_events": [] diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 6ad11bc52..2b8ebe305 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -6,10 +6,10 @@ Route105_MapScripts:: @ 81EE1DB Route105_MapScript1_1EE1EB: @ 81EE1EB call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_1EE20B - compare VAR_0x4037, 9 - call_if_eq Route105_EventScript_2739AB - compare VAR_0x4037, 10 - call_if_eq Route105_EventScript_273A18 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South end Route105_EventScript_1EE20B:: @ 81EE20B @@ -18,16 +18,16 @@ Route105_EventScript_1EE20B:: @ 81EE20B return Route105_MapScript1_1EE21E: @ 81EE21E - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route105_EventScript_273D13 - compare VAR_0x4037, 9 - call_if_eq Route105_EventScript_273D17 - compare VAR_0x4037, 10 - call_if_eq Route105_EventScript_273D17 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH + call_if_eq UnusualWeather_StartKyogreWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH + call_if_eq UnusualWeather_StartKyogreWeather end Route105_MapScript2_1EE240: @ 81EE240 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route105_EventScript_1EE24A:: @ 81EE24A diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 754369014..3755ee5e4 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -7,7 +7,7 @@ Route111_MapScripts:: @ 81F0CA7 Route111_MapScript1_1F0CBC: @ 81F0CBC call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1 - compare VAR_0x40CB, 1 + compare VAR_ROUTE_111_STATE, 1 call_if_eq Route111_EventScript_1F0CE4 end @@ -38,12 +38,12 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4 return Route111_MapScript1_1F0D87: @ 81F0D87 - setvar VAR_0x40D6, 0 + setvar VAR_TRAINER_HILL_IS_ACTIVE, 0 special SetMirageTowerVisibility call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C - compare VAR_0x40CB, 1 + compare VAR_ROUTE_111_STATE, 1 call_if_eq Route111_EventScript_1F0DC2 - compare VAR_0x40CB, 2 + compare VAR_ROUTE_111_STATE, 2 call_if_eq Route111_EventScript_1F0E40 call Route111_EventScript_1F0DE6 call Route111_EventScript_28CCC7 @@ -101,11 +101,11 @@ Route111_EventScript_1F0E3C:: @ 81F0E3C return Route111_EventScript_1F0E40:: @ 81F0E40 - setvar VAR_0x40CB, 3 + setvar VAR_ROUTE_111_STATE, 3 return Route111_MapScript2_1F0E46: @ 81F0E46 - map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E50 + map_script_2 VAR_ROUTE_111_STATE, 1, Route111_EventScript_1F0E50 .2byte 0 Route111_EventScript_1F0E50:: @ 81F0E50 @@ -113,7 +113,7 @@ Route111_EventScript_1F0E50:: @ 81F0E50 end Route111_MapScript2_1F0E56: @ 81F0E56 - map_script_2 VAR_0x40CB, 1, Route111_EventScript_1F0E60 + map_script_2 VAR_ROUTE_111_STATE, 1, Route111_EventScript_1F0E60 .2byte 0 Route111_EventScript_1F0E60:: @ 81F0E60 @@ -134,7 +134,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60 waitstate special StartMirageTowerFossilFallAndSink waitstate - setvar VAR_0x40CB, 2 + setvar VAR_ROUTE_111_STATE, 2 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7 msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT @@ -411,9 +411,9 @@ Route111_EventScript_1F1192:: @ 81F1192 Route111_EventScript_1F119B:: @ 81F119B lock faceplayer - compare VAR_0x40CB, 3 + compare VAR_ROUTE_111_STATE, 3 goto_if_eq Route111_EventScript_1F11C6 - compare VAR_0x40CB, 2 + compare VAR_ROUTE_111_STATE, 2 goto_if_eq Route111_EventScript_1F11D0 goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index d4327a2f4..b03a2f228 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -5,23 +5,23 @@ Route114_MapScripts:: @ 81F252F .byte 0 Route114_MapScript1_1F253F: @ 81F253F - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route114_EventScript_273D13 - compare VAR_0x4037, 1 - call_if_eq Route114_EventScript_273D1B - compare VAR_0x4037, 2 - call_if_eq Route114_EventScript_273D1B + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH + call_if_eq UnusualWeather_StartGroudonWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH + call_if_eq UnusualWeather_StartGroudonWeather end Route114_MapScript1_1F2561: @ 81F2561 - compare VAR_0x4037, 1 - call_if_eq Route114_EventScript_273913 - compare VAR_0x4037, 2 - call_if_eq Route114_EventScript_273926 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South end Route114_MapScript2_1F2578: @ 81F2578 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route114_EventScript_1F2582:: @ 81F2582 diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index 0582198db..d0992f8fa 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -57,7 +57,7 @@ "x": 5, "y": 4, "elevation": 3, - "var": "VAR_0x40CC", + "var": "VAR_FOSSIL_MANIAC_STATE", "var_value": "1", "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" }, @@ -66,7 +66,7 @@ "x": 6, "y": 4, "elevation": 3, - "var": "VAR_0x40CC", + "var": "VAR_FOSSIL_MANIAC_STATE", "var_value": "1", "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" } diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 1a84082ab..8ab83a441 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -27,7 +27,7 @@ Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT - setvar VAR_0x40CC, 2 + setvar VAR_FOSSIL_MANIAC_STATE, 2 releaseall end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 9cb3ea2e0..259cd5904 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -5,23 +5,23 @@ Route115_MapScripts:: @ 81F2920 .byte 0 Route115_MapScript1_1F2930: @ 81F2930 - compare VAR_0x4037, 3 - call_if_eq Route115_EventScript_273939 - compare VAR_0x4037, 4 - call_if_eq Route115_EventScript_27394C + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115West + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115East end Route115_MapScript1_1F2947: @ 81F2947 - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route115_EventScript_273D13 - compare VAR_0x4037, 3 - call_if_eq Route115_EventScript_273D1B - compare VAR_0x4037, 4 - call_if_eq Route115_EventScript_273D1B + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST + call_if_eq UnusualWeather_StartGroudonWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST + call_if_eq UnusualWeather_StartGroudonWeather end Route115_MapScript2_1F2969: @ 81F2969 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route115_EventScript_1F2973:: @ 81F2973 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 90ae29f5b..454201307 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -6,12 +6,12 @@ Route116_MapScripts:: @ 81F2C0C Route116_MapScript1_1F2C1C: @ 81F2C1C call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47 - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route116_EventScript_273D13 - compare VAR_0x4037, 5 - call_if_eq Route116_EventScript_273D1B - compare VAR_0x4037, 6 - call_if_eq Route116_EventScript_273D1B + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH + call_if_eq UnusualWeather_StartGroudonWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH + call_if_eq UnusualWeather_StartGroudonWeather end Route116_EventScript_1F2C47:: @ 81F2C47 @@ -19,14 +19,14 @@ Route116_EventScript_1F2C47:: @ 81F2C47 return Route116_MapScript1_1F2C4F: @ 81F2C4F - compare VAR_0x4037, 5 - call_if_eq Route116_EventScript_27395F - compare VAR_0x4037, 6 - call_if_eq Route116_EventScript_273972 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South end Route116_MapScript2_1F2C66: @ 81F2C66 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route116_EventScript_1F2C70:: @ 81F2C70 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 758804137..9c1ec46ca 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -6,23 +6,23 @@ Route118_MapScripts:: @ 81F3DBC Route118_MapScript1_1F3DCC: @ 81F3DCC call Route118_EventScript_28CCC7 - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route118_EventScript_273D13 - compare VAR_0x4037, 7 - call_if_eq Route118_EventScript_273D1B - compare VAR_0x4037, 8 - call_if_eq Route118_EventScript_273D1B + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST + call_if_eq UnusualWeather_StartGroudonWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST + call_if_eq UnusualWeather_StartGroudonWeather end Route118_MapScript1_1F3DF3: @ 81F3DF3 - compare VAR_0x4037, 7 - call_if_eq Route118_EventScript_273985 - compare VAR_0x4037, 8 - call_if_eq Route118_EventScript_273998 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West end Route118_MapScript2_1F3E0A: @ 81F3E0A - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route118_EventScript_1F3E14:: @ 81F3E14 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 83ff4707f..22a73b74b 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -167,7 +167,7 @@ Route119_EventScript_1F460F:: @ 81F460F addobject 43 applymovement 43, Route119_Movement_1F4752 waitmovement 0 - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 @@ -491,7 +491,7 @@ Route119_EventScript_1F49EC:: @ 81F49EC pokenavcall Route119_Text_1F4FBA waitmessage clearflag FLAG_REGISTER_WINONA_POKENAV - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 releaseall end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 7d557fdef..fa2664d68 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -131,41 +131,43 @@ Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA end Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 - goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_27010A + goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather msgbox Route119_WeatherInstitute_2F_Text_27077E, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A +Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather:: @ 827010A + @ This code uses VAR_0x8004 to count the number of legendaries the player has defeated + @ already. setvar VAR_0x8004, 0 - call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_270160 - call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_270160 + call_if_set FLAG_DEFEATED_KYOGRE, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount + call_if_set FLAG_DEFEATED_GROUDON, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount compare VAR_0x8004, 2 - goto_if_eq Route119_WeatherInstitute_2F_EventScript_270166 - call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_270159 - specialvar VAR_RESULT, sub_813B374 + goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated + call_if_unset FLAG_TEMP_2, WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather + specialvar VAR_RESULT, GetUnusualWeatherMapNameAndType compare VAR_RESULT, 1 - goto_if_eq Route119_WeatherInstitute_2F_EventScript_27014F - msgbox Route119_WeatherInstitute_2F_Text_2707F1, MSGBOX_DEFAULT + goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage + msgbox WeatherInstitute_UnusualWeather_GroudonWeatherText, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F - msgbox Route119_WeatherInstitute_2F_Text_270873, MSGBOX_DEFAULT +WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage:: @ 827014F + msgbox WeatherInstitute_UnusualWeather_KyogreWeatherText, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_2F_EventScript_270159:: @ 8270159 - special sub_813B2E4 +WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather:: @ 8270159 + special CreateUnusualWeatherEvent setflag FLAG_TEMP_2 return -Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160 +WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount:: @ 8270160 addvar VAR_0x8004, 1 return -Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166 - msgbox Route119_WeatherInstitute_2F_Text_2708FC, MSGBOX_DEFAULT +WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated:: @ 8270166 + msgbox WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText, MSGBOX_DEFAULT release end @@ -309,7 +311,7 @@ Route119_WeatherInstitute_2F_Text_27077E: @ 827077E .string "years, but it's ridiculous to think that\l" .string "humans can freely change the weather.$" -Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1 +WeatherInstitute_UnusualWeather_GroudonWeatherText: @ 82707F1 .string "I track weather patterns over\n" .string "the HOENN region.\p" .string "Presently, a drought has been recorded\n" @@ -317,7 +319,7 @@ Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1 .string "Could that mean, somewhere near\n" .string "{STR_VAR_1}…$" -Route119_WeatherInstitute_2F_Text_270873: @ 8270873 +WeatherInstitute_UnusualWeather_KyogreWeatherText: @ 8270873 .string "I track weather patterns over\n" .string "the HOENN region.\p" .string "Presently, heavy rainfall has been\n" @@ -325,7 +327,7 @@ Route119_WeatherInstitute_2F_Text_270873: @ 8270873 .string "Could that mean, somewhere near\n" .string "{STR_VAR_1}…$" -Route119_WeatherInstitute_2F_Text_2708FC: @ 82708FC +WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText: @ 82708FC .string "Abnormal weather conditions are\n" .string "no longer being reported.\p" .string "The occasional rainfall is a blessing,\n" diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 6d4afa30a..31158782d 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -41,8 +41,8 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 dotimebasedevents goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT - setvar VAR_0x8004, 13 - call Route123_BerryMastersHouse_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 7169a0299..c1a22a2d0 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 8071cf244..0ce520fdd 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_125", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 4812b9691..8abcbe787 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -6,23 +6,23 @@ Route125_MapScripts:: @ 81F6748 Route125_MapScript1_1F6758: @ 81F6758 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route125_EventScript_273D13 - compare VAR_0x4037, 11 - call_if_eq Route125_EventScript_273D17 - compare VAR_0x4037, 12 - call_if_eq Route125_EventScript_273D17 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST + call_if_eq UnusualWeather_StartKyogreWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST + call_if_eq UnusualWeather_StartKyogreWeather end Route125_MapScript1_1F6783: @ 81F6783 - compare VAR_0x4037, 11 - call_if_eq Route125_EventScript_273A85 - compare VAR_0x4037, 12 - call_if_eq Route125_EventScript_273AF2 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125West + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125East end Route125_MapScript2_1F679A: @ 81F679A - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route125_EventScript_1F67A4:: @ 81F67A4 diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 1e886a083..ea63eb80d 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_126", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 1b30f7d55..e4a68c3e1 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_127", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 7d5eee844..91fab2b61 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -6,23 +6,23 @@ Route127_MapScripts:: @ 81F69D9 Route127_MapScript1_1F69E9: @ 81F69E9 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route127_EventScript_273D13 - compare VAR_0x4037, 13 - call_if_eq Route127_EventScript_273D17 - compare VAR_0x4037, 14 - call_if_eq Route127_EventScript_273D17 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH + call_if_eq UnusualWeather_StartKyogreWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH + call_if_eq UnusualWeather_StartKyogreWeather end Route127_MapScript1_1F6A14: @ 81F6A14 - compare VAR_0x4037, 13 - call_if_eq Route127_EventScript_273B5F - compare VAR_0x4037, 14 - call_if_eq Route127_EventScript_273BCC + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127North + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127South end Route127_MapScript2_1F6A2B: @ 81F6A2B - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route127_EventScript_1F6A35:: @ 81F6A35 diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index 826290ff3..58246c247 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_128", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index b3e45b227..3183f9821 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_129", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 8aec4bc28..25aa675a6 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -5,21 +5,21 @@ Route129_MapScripts:: @ 81F7284 .byte 0 Route129_MapScript1_1F7294: @ 81F7294 - compare VAR_0x4037, 15 - call_if_eq Route129_EventScript_273C39 - compare VAR_0x4037, 16 - call_if_eq Route129_EventScript_273CA6 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129East end Route129_MapScript1_1F72AB: @ 81F72AB - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route129_EventScript_273D13 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_ge Route129_EventScript_1F72D8 - compare VAR_0x4037, 15 - call_if_eq Route129_EventScript_273D17 - compare VAR_0x4037, 16 - call_if_eq Route129_EventScript_273D17 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST + call_if_eq UnusualWeather_StartKyogreWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST + call_if_eq UnusualWeather_StartKyogreWeather end Route129_EventScript_1F72D8:: @ 81F72D8 @@ -27,7 +27,7 @@ Route129_EventScript_1F72D8:: @ 81F72D8 return Route129_MapScript2_1F72E2: @ 81F72E2 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route129_EventScript_1F72EC:: @ 81F72EC diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 0a68d442c..18d168b17 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_130", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 18dce324d..cdcc61550 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -3,7 +3,7 @@ Route130_MapScripts:: @ 81F735F .byte 0 Route130_MapScript1_1F7365: @ 81F7365 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_ge Route130_EventScript_1F73B5 specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index 3a48042f9..379b15b3d 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_131", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 7f50b2273..0d178e969 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -3,7 +3,7 @@ Route131_MapScripts:: @ 81F7404 .byte 0 Route131_MapScript1_1F740A: @ 81F740A - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_ge Route131_EventScript_1F741F call Route131_EventScript_1F741B end diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index ae04ff62d..15c0de83d 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_132", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index 2a8941e12..eed30d7ee 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_133", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 1e9123efe..8b3a9518e 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -6,7 +6,7 @@ "region_map_section": "MAPSEC_ROUTE_134", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_6", + "map_type": "MAP_TYPE_OCEAN_ROUTE", "allow_bike": true, "allow_escape_rope": false, "allow_running": true, diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 74394f9a5..ff52ee5ac 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -170,7 +170,7 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_21406F goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082 msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_RUSTBORO release end @@ -192,7 +192,7 @@ RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090 end RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE release end diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index ededf1e5f..ec231ccdd 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -3,7 +3,7 @@ SSTidalCorridor_MapScripts:: @ 823BFCF .byte 0 SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 - map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219 + map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_23C219 map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015 map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067 @@ -216,7 +216,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 waitmovement 0 delay 30 setflag FLAG_MET_SCOTT_ON_SS_TIDAL - setvar VAR_0x40D4, 1 + setvar VAR_SS_TIDAL_SCOTT_STATE, 1 releaseall end diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 045c0e065..1bf570549 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -9,7 +9,7 @@ SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 lockall - compare VAR_0x40D9, 1 + compare VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1 goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED waitse playse SE_PIN @@ -25,7 +25,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 compare VAR_FACING, 2 call_if_eq SeafloorCavern_Entrance_EventScript_234539 delay 30 - setvar VAR_0x40D9, 1 + setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1 moveobjectoffscreen 1 msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 7fe6386c3..38a10a004 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -119,7 +119,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 waitmovement 0 msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT setvar VAR_ROUTE128_STATE, 1 - setvar VAR_0x405E, 1 + setvar VAR_RAYQUAZA_STATE, 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN clearflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc index cb26f924e..805d7e299 100644 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -6,7 +6,7 @@ SecretBase_YellowCave4_MapScripts:: @ 823B483 .byte 0 SecretBase_RedCave1_MapScript2_23B498: @ 823B498 - map_script_2 VAR_0x4089, 0, EventScript_275D0C + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, EventScript_275D0C .2byte 0 SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2 @@ -16,7 +16,7 @@ SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2 end SecretBase_RedCave1_MapScript2_23B4AE: @ 823B4AE - map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_275B81 + map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_RedCave1_EventScript_275B81 .2byte 0 SecretBase_RedCave1_MapScript1_23B4B8: @ 823B4B8 diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index 167344e61..a7ad50f1b 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -52,7 +52,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "gUnknown_08277374" + "script": "EventScript_SingleBattleColosseum_PlayerSpot0" }, { "type": "trigger", @@ -61,7 +61,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "gUnknown_0827737E" + "script": "EventScript_SingleBattleColosseum_PlayerSpot1" } ], "bg_events": [] diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index b1ec3b74a..18ec43ad6 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -3,7 +3,7 @@ SkyPillar_1F_MapScripts:: @ 8239615 .byte 0 SkyPillar_1F_MapScript1_23961B: @ 823961B - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_1F_EventScript_239627 end diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index 8c1424fd9..9059bd246 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -5,7 +5,7 @@ SkyPillar_2F_MapScripts:: @ 823962B .byte 0 SkyPillar_2F_MapScript1_23963B: @ 823963B - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_2F_EventScript_23964C copyvar VAR_ICE_STEP_COUNT, 0x1 end diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index 9bc7eda27..ba6a5128d 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -3,7 +3,7 @@ SkyPillar_3F_MapScripts:: @ 823965B .byte 0 SkyPillar_3F_MapScript1_239661: @ 8239661 - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_3F_EventScript_23966D end diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 254d61a59..355530fdc 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -5,7 +5,7 @@ SkyPillar_4F_MapScripts:: @ 8239671 .byte 0 SkyPillar_4F_MapScript1_239681: @ 8239681 - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_4F_EventScript_239692 copyvar VAR_ICE_STEP_COUNT, 0x1 end diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index af5a5ffe1..ba35e16f2 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -3,7 +3,7 @@ SkyPillar_5F_MapScripts:: @ 82396A2 .byte 0 SkyPillar_5F_MapScript1_2396A8: @ 82396A8 - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_5F_EventScript_2396B4 return diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index c68dc03e3..93d4e42c3 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -5,9 +5,9 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 .byte 0 SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 - compare VAR_0x405E, 3 + compare VAR_RAYQUAZA_STATE, 3 call_if_eq SkyPillar_Outside_EventScript_2392CF - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_ge SkyPillar_Outside_EventScript_2392D3 end @@ -29,7 +29,7 @@ SkyPillar_Outside_EventScript_2392E7:: @ 82392E7 return SkyPillar_Outside_MapScript2_2392FA: @ 82392FA - map_script_2 VAR_0x405E, 3, SkyPillar_Outside_EventScript_239304 + map_script_2 VAR_RAYQUAZA_STATE, 3, SkyPillar_Outside_EventScript_239304 .2byte 0 SkyPillar_Outside_EventScript_239304:: @ 8239304 @@ -82,7 +82,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 playse SE_KAIDAN fadescreenswapbuffers 1 clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x405E, 4 + setvar VAR_RAYQUAZA_STATE, 4 removeobject 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE fadescreenswapbuffers 0 diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 5cb6a1a69..2d1a6fa1a 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -56,7 +56,7 @@ "x": 14, "y": 9, "elevation": 3, - "var": "VAR_0x40D7", + "var": "VAR_SKY_PILLAR_RAQUAZA_CRY_DONE", "var_value": "0", "script": "SkyPillar_Top_EventScript_23979A" } diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 3d031293d..d08b0b554 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -16,9 +16,9 @@ SkyPillar_Top_EventScript_2396D2:: @ 82396D2 return SkyPillar_Top_MapScript1_2396E6: @ 82396E6 - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_Top_EventScript_2396FD - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_ge SkyPillar_Top_EventScript_239705 end @@ -36,7 +36,7 @@ SkyPillar_Top_EventScript_23970F:: @ 823970F return SkyPillar_Top_MapScript2_239713: @ 8239713 - map_script_2 VAR_0x40CA, 0, SkyPillar_Top_EventScript_23971D + map_script_2 VAR_SKY_PILLAR_STATE, 0, SkyPillar_Top_EventScript_23971D .2byte 0 SkyPillar_Top_EventScript_23971D:: @ 823971D @@ -130,9 +130,9 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_23985C waitmovement 0 special RemoveCameraObject - setvar VAR_0x405E, 5 - setvar VAR_0x40CA, 1 - setvar VAR_0x40D7, 1 + setvar VAR_RAYQUAZA_STATE, 5 + setvar VAR_SKY_PILLAR_STATE, 1 + setvar VAR_SKY_PILLAR_RAQUAZA_CRY_DONE, 1 releaseall end diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 126519096..f548b7349 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -571,7 +571,7 @@ "x": 10, "y": 13, "elevation": 3, - "var": "VAR_0x40D2", + "var": "VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE", "var_value": "2", "script": "SlateportCity_EventScript_1DD5DC" } diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 9f4310c4a..acf66d2bd 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -8,7 +8,7 @@ SlateportCity_MapScript1_1DCC6C: @ 81DCC6C call SlateportCity_EventScript_1DCC8D compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCC99 - compare VAR_0x40D2, 1 + compare VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1 call_if_eq SlateportCity_EventScript_1DCCE7 end @@ -50,7 +50,7 @@ SlateportCity_EventScript_1DCD06:: @ 81DCD06 return SlateportCity_MapScript2_1DCD12: @ 81DCD12 - map_script_2 VAR_0x40D2, 1, SlateportCity_EventScript_1DCD1C + map_script_2 VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1, SlateportCity_EventScript_1DCD1C .2byte 0 SlateportCity_EventScript_1DCD1C:: @ 81DCD1C @@ -84,8 +84,8 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C setobjectxyperm 35, 10, 12 setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x40D2, 2 - addvar VAR_0x40D1, 1 + setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2 + addvar VAR_SCOTT_STATE, 1 releaseall end @@ -901,8 +901,8 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC applymovement 35, SlateportCity_Movement_1DD63A waitmovement 0 removeobject 35 - addvar VAR_0x40D1, 1 - setvar VAR_0x40D2, 3 + addvar VAR_SCOTT_STATE, 1 + setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3 releaseall end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 641c4dd86..96ae96685 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -86,7 +86,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 setflag FLAG_DELIVERED_DEVON_GOODS clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE - setvar VAR_0x40D2, 1 + setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1 fadescreen 0 release end diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 98c9af1ee..dbfe923f0 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -33,31 +33,31 @@ SootopolisCity_EventScript_1E56E5:: @ 81E56E5 SootopolisCity_MapScript1_1E56EF: @ 81E56EF setflag FLAG_VISITED_SOOTOPOLIS_CITY - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 call_if_eq SootopolisCity_EventScript_1E5781 - compare VAR_0x40CA, 1 + compare VAR_SKY_PILLAR_STATE, 1 call_if_eq SootopolisCity_EventScript_1E5781 call SootopolisCity_EventScript_1E5805 call SootopolisCity_EventScript_1E57B2 - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 call_if_eq SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 2 + compare VAR_RAYQUAZA_STATE, 2 call_if_eq SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 3 + compare VAR_RAYQUAZA_STATE, 3 call_if_eq SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_eq SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 call_if_eq SootopolisCity_EventScript_1E5785 - compare VAR_0x405E, 2 + compare VAR_RAYQUAZA_STATE, 2 call_if_eq SootopolisCity_EventScript_1E5842 - compare VAR_0x405E, 3 + compare VAR_RAYQUAZA_STATE, 3 call_if_eq SootopolisCity_EventScript_1E5842 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 call_if_eq SootopolisCity_EventScript_1E585B - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 call_if_eq SootopolisCity_EventScript_1E5871 - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 call_if_eq SootopolisCity_EventScript_1E58D3 end @@ -77,19 +77,19 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785 return SootopolisCity_EventScript_1E57B2:: @ 81E57B2 - compare VAR_0x405E, 0 + compare VAR_RAYQUAZA_STATE, 0 goto_if_eq SootopolisCity_EventScript_1E5800 - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E5800 - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 goto_if_eq SootopolisCity_EventScript_1E5801 - compare VAR_0x405E, 2 + compare VAR_RAYQUAZA_STATE, 2 goto_if_eq SootopolisCity_EventScript_1E5801 - compare VAR_0x405E, 3 + compare VAR_RAYQUAZA_STATE, 3 goto_if_eq SootopolisCity_EventScript_1E5801 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 goto_if_eq SootopolisCity_EventScript_1E5801 - compare VAR_0x40CA, 1 + compare VAR_SKY_PILLAR_STATE, 1 goto_if_le SootopolisCity_EventScript_1E5801 return @@ -101,15 +101,15 @@ SootopolisCity_EventScript_1E5801:: @ 81E5801 return SootopolisCity_EventScript_1E5805:: @ 81E5805 - compare VAR_0x405E, 0 + compare VAR_RAYQUAZA_STATE, 0 goto_if_eq SootopolisCity_EventScript_1E583D - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E583D - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 goto_if_eq SootopolisCity_EventScript_1E583E - compare VAR_0x40CA, 1 + compare VAR_SKY_PILLAR_STATE, 1 goto_if_eq SootopolisCity_EventScript_1E583E - compare VAR_0x40CA, 1 + compare VAR_SKY_PILLAR_STATE, 1 goto_if_le Common_EventScript_SetWeather15 return @@ -140,11 +140,11 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871 setobjectxyperm 7, 29, 33 setobjectxyperm 16, 33, 35 setobjectxyperm 17, 34, 35 - compare VAR_0x40D8, 0 + compare VAR_SOOTOPOLIS_STATE, 0 call_if_eq SootopolisCity_EventScript_1E58AF - compare VAR_0x40D8, 1 + compare VAR_SOOTOPOLIS_STATE, 1 call_if_eq SootopolisCity_EventScript_1E58BB - compare VAR_0x40D8, 2 + compare VAR_SOOTOPOLIS_STATE, 2 call_if_eq SootopolisCity_EventScript_1E58C7 return @@ -168,13 +168,13 @@ SootopolisCity_EventScript_1E58D3:: @ 81E58D3 return SootopolisCity_MapScript2_1E58DB: @ 81E58DB - map_script_2 VAR_0x405E, 5, SootopolisCity_EventScript_1E58E5 + map_script_2 VAR_RAYQUAZA_STATE, 5, SootopolisCity_EventScript_1E58E5 .2byte 0 SootopolisCity_EventScript_1E58E5:: @ 81E58E5 - compare VAR_0x40CA, 1 + compare VAR_SKY_PILLAR_STATE, 1 call_if_eq SootopolisCity_EventScript_1E58FC - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 call_if_eq SootopolisCity_EventScript_1E5901 end @@ -184,7 +184,7 @@ SootopolisCity_EventScript_1E58FC:: @ 81E58FC SootopolisCity_EventScript_1E5901:: @ 81E5901 turnobject EVENT_OBJ_ID_PLAYER, 2 - setvar VAR_0x40CA, 3 + setvar VAR_SKY_PILLAR_STATE, 3 return SootopolisCity_MapScript1_1E590B: @ 81E590B @@ -192,8 +192,8 @@ SootopolisCity_MapScript1_1E590B: @ 81E590B end SootopolisCity_MapScript2_1E5914: @ 81E5914 - map_script_2 VAR_0x405E, 1, SootopolisCity_EventScript_1E5926 - map_script_2 VAR_0x40CA, 1, SootopolisCity_EventScript_1E5BFE + map_script_2 VAR_RAYQUAZA_STATE, 1, SootopolisCity_EventScript_1E5926 + map_script_2 VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_1E5BFE .2byte 0 SootopolisCity_EventScript_1E5926:: @ 81E5926 @@ -271,7 +271,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A75 waitmovement 0 special RemoveCameraObject - setvar VAR_0x405E, 2 + setvar VAR_RAYQUAZA_STATE, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall end @@ -371,7 +371,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BAE waitmovement 0 special RemoveCameraObject - setvar VAR_0x405E, 2 + setvar VAR_RAYQUAZA_STATE, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall end @@ -540,7 +540,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL - setvar VAR_0x40CA, 3 + setvar VAR_SKY_PILLAR_STATE, 3 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS fadenewbgm MUS_RUNECITY delay 120 @@ -593,7 +593,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL - setvar VAR_0x40CA, 2 + setvar VAR_SKY_PILLAR_STATE, 2 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS fadenewbgm MUS_NAMINORI delay 120 @@ -694,11 +694,11 @@ SootopolisCity_Movement_1E5E7F: @ 81E5E7F SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D lock faceplayer - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E5EC4 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E5ECE - compare VAR_0x405E, 2 + compare VAR_RAYQUAZA_STATE, 2 goto_if_ge SootopolisCity_EventScript_1E5EBA msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT release @@ -722,11 +722,11 @@ SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 lock faceplayer - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 goto_if_le SootopolisCity_EventScript_1E5F1B - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E5F1B - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E5F10 msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT closemessage @@ -794,7 +794,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 lockall applymovement 2, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E600D msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT closemessage @@ -811,7 +811,7 @@ SootopolisCity_EventScript_1E600D:: @ 81E600D SootopolisCity_EventScript_1E6017:: @ 81E6017 lock faceplayer - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E602E msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT release @@ -825,11 +825,11 @@ SootopolisCity_EventScript_1E602E:: @ 81E602E SootopolisCity_EventScript_1E6038:: @ 81E6038 lock faceplayer - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E607A - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E6084 - compare VAR_0x405E, 2 + compare VAR_RAYQUAZA_STATE, 2 goto_if_ge SootopolisCity_EventScript_1E6065 msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT release @@ -857,11 +857,11 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E lockall applymovement 4, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E60D9 - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E60CF - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 goto_if_le SootopolisCity_EventScript_1E60CF msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT closemessage @@ -884,12 +884,12 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 lockall applymovement 5, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E612D goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_1E6137 - compare VAR_0x405E, 6 + compare VAR_RAYQUAZA_STATE, 6 goto_if_ge SootopolisCity_EventScript_1E6141 - compare VAR_0x405E, 1 + compare VAR_RAYQUAZA_STATE, 1 goto_if_le SootopolisCity_EventScript_1E6141 msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT closemessage @@ -930,11 +930,11 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166 applymovement 7, Common_Movement_FacePlayer waitmovement 0 call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC - compare VAR_0x405E, 2 + compare VAR_RAYQUAZA_STATE, 2 goto_if_eq SootopolisCity_EventScript_1E61AE - compare VAR_0x405E, 3 + compare VAR_RAYQUAZA_STATE, 3 goto_if_eq SootopolisCity_EventScript_1E61C2 - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 goto_if_eq SootopolisCity_EventScript_1E61C2 goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E61B8 msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT @@ -1263,7 +1263,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D lockall applymovement 15, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E6388 msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT closemessage @@ -1280,7 +1280,7 @@ SootopolisCity_EventScript_1E6388:: @ 81E6388 SootopolisCity_EventScript_1E6393:: @ 81E6393 lockall - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E63C7 msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT closemessage @@ -1304,7 +1304,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB lockall applymovement 13, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E6406 msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT closemessage @@ -1323,7 +1323,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411 lockall applymovement 12, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E643C msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT closemessage @@ -1340,7 +1340,7 @@ SootopolisCity_EventScript_1E643C:: @ 81E643C SootopolisCity_EventScript_1E6446:: @ 81E6446 lock faceplayer - compare VAR_0x405E, 4 + compare VAR_RAYQUAZA_STATE, 4 goto_if_eq SootopolisCity_EventScript_1E64D8 goto_if_set FLAG_RECEIVED_HM07, SootopolisCity_EventScript_1E64E2 goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E646F @@ -1367,14 +1367,14 @@ SootopolisCity_EventScript_1E64B2:: @ 81E64B2 applymovement 18, SootopolisCity_Movement_1E64EC waitmovement 0 moveobjectoffscreen 18 - setvar VAR_0x40D8, 1 + setvar VAR_SOOTOPOLIS_STATE, 1 return SootopolisCity_EventScript_1E64C5:: @ 81E64C5 applymovement 18, SootopolisCity_Movement_1E64EF waitmovement 0 moveobjectoffscreen 18 - setvar VAR_0x40D8, 2 + setvar VAR_SOOTOPOLIS_STATE, 2 return SootopolisCity_EventScript_1E64D8:: @ 81E64D8 @@ -1399,7 +1399,7 @@ SootopolisCity_Movement_1E64EF: @ 81E64EF SootopolisCity_EventScript_1E64F2:: @ 81E64F2 lockall - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E6509 msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT closemessage @@ -1415,7 +1415,7 @@ SootopolisCity_EventScript_1E6509:: @ 81E6509 SootopolisCity_EventScript_1E651F:: @ 81E651F lockall - compare VAR_0x405E, 5 + compare VAR_RAYQUAZA_STATE, 5 goto_if_eq SootopolisCity_EventScript_1E6536 msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 06bc91f21..b9abdf656 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -106,7 +106,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE - setvar VAR_0x405E, 6 + setvar VAR_RAYQUAZA_STATE, 6 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 setvar VAR_0x8008, 8 call SootopolisCity_Gym_1F_EventScript_271F43 diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index 4a152bcf0..fe0270d62 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -28,7 +28,7 @@ SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 lock faceplayer - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 goto_if_ge SootopolisCity_Mart_EventScript_2267E2 goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_2267E2 msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT @@ -43,7 +43,7 @@ SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2 SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC lock faceplayer - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 goto_if_ge SootopolisCity_Mart_EventScript_22680C goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_22680C msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index d107037d4..c7ceb0a4f 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -129,7 +129,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2 SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, MSGBOX_DEFAULT fadescreen 1 - special sub_80F9438 + special ChooseHalfPartyForBattle waitstate return diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 96f766f7b..97cb2d4d7 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -18,7 +18,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500 SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E lock faceplayer - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_22652E goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_22652E msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT @@ -33,7 +33,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 lock faceplayer - compare VAR_0x40CA, 2 + compare VAR_SKY_PILLAR_STATE, 2 goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_226558 goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_226558 msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index a24bc772f..958c5f546 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -15,9 +15,9 @@ SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A return SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E - compare VAR_0x40D5, 0 + compare VAR_ROAMER_POKEMON, 0 call_if_eq SouthernIsland_Interior_EventScript_242A8A - compare VAR_0x40D5, 0 + compare VAR_ROAMER_POKEMON, 0 call_if_ne SouthernIsland_Interior_EventScript_242A95 call SouthernIsland_Interior_EventScript_242AA0 end @@ -77,9 +77,9 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 delay 50 special RemoveCameraObject setvar VAR_LAST_TALKED, 2 - compare VAR_0x40D5, 0 + compare VAR_ROAMER_POKEMON, 0 call_if_eq SouthernIsland_Interior_EventScript_242BA4 - compare VAR_0x40D5, 0 + compare VAR_ROAMER_POKEMON, 0 call_if_ne SouthernIsland_Interior_EventScript_242BB7 setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLatiBattle diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 3f892315d..b5a664a76 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -47,13 +47,13 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC goto_if_eq TerraCave_End_EventScript_23B163 compare VAR_RESULT, 5 goto_if_eq TerraCave_End_EventScript_23B163 - setvar VAR_0x4039, 1 + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_GROUDON releaseall end TerraCave_End_EventScript_23B155:: @ 823B155 - setvar VAR_0x4039, 1 + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_GROUDON goto TerraCave_End_EventScript_27376D end diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 257c7d1c8..1c409132d 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -52,7 +52,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "gUnknown_082773F5" + "script": "EventScript_TradeCenter_Chair0" }, { "type": "trigger", @@ -61,7 +61,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "gUnknown_082773FF" + "script": "EventScript_TradeCenter_Chair1" } ], "bg_events": [] diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index 4b12b1c80..42f1daa9d 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -109,7 +109,7 @@ "x": 9, "y": 6, "elevation": 3, - "var": "VAR_0x40D6", + "var": "VAR_TRAINER_HILL_IS_ACTIVE", "var_value": "0", "script": "TrainerHill_Entrance_EventScript_268229" } diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 5339f49e3..63e067a9a 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -15,10 +15,10 @@ TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF end TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER special CallTrainerHillFunction setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, 9 + setvar VAR_0x8004, TRAINER_HILL_FUNC_9 special CallTrainerHillFunction compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_2680FF @@ -27,7 +27,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 end TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF - setvar VAR_0x8004, 16 + setvar VAR_0x8004, TRAINER_HILL_FUNC_16 special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_Entrance_EventScript_26811A @@ -74,12 +74,12 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160 TrainerHill_Entrance_EventScript_268182:: @ 8268182 setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 6 + setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS special CallTrainerHillFunction switch VAR_RESULT - case 0, TrainerHill_Entrance_EventScript_2681B5 - case 1, TrainerHill_Entrance_EventScript_2681CA - case 2, TrainerHill_Entrance_EventScript_2681EE + case TRAINER_HILL_PLAYER_STATUS_LOST, TrainerHill_Entrance_EventScript_2681B5 + case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_2681CA + case TRAINER_HILL_PLAYER_STATUS_NORMAL, TrainerHill_Entrance_EventScript_2681EE TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5 lockall @@ -96,7 +96,7 @@ TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA closemessage applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381 waitmovement 0 - setvar VAR_0x40D6, 0 + setvar VAR_TRAINER_HILL_IS_ACTIVE, 0 special HealPlayerParty releaseall @@ -114,7 +114,7 @@ TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD lock faceplayer - setvar VAR_0x8004, 10 + setvar VAR_0x8004, TRAINER_HILL_FUNC_10 special CallTrainerHillFunction compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_26821F @@ -133,11 +133,11 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT - setvar VAR_0x8004, 13 + setvar VAR_0x8004, TRAINER_HILL_FUNC_13 special CallTrainerHillFunction compare VAR_RESULT, 0 call_if_eq TrainerHill_Entrance_EventScript_26832E - setvar VAR_0x8004, 8 + setvar VAR_0x8004, TRAINER_HILL_FUNC_8 special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_Entrance_EventScript_268275 @@ -168,14 +168,14 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 switch VAR_RESULT case 4, TrainerHill_Entrance_EventScript_268314 case 127, TrainerHill_Entrance_EventScript_268314 - setvar VAR_0x8004, 17 + setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_TAG copyvar VAR_0x8005, VAR_RESULT special CallTrainerHillFunction - setvar VAR_0x40D6, 1 + setvar VAR_TRAINER_HILL_IS_ACTIVE, 1 setvar VAR_TEMP_5, 0 special HealPlayerParty msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT - setvar VAR_0x8004, 0 + setvar VAR_0x8004, TRAINER_HILL_FUNC_START special CallTrainerHillFunction releaseall end @@ -191,18 +191,18 @@ TrainerHill_Entrance_EventScript_268314:: @ 8268314 TrainerHill_Entrance_EventScript_26832E:: @ 826832E msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT - setvar VAR_0x8004, 14 + setvar VAR_0x8004, TRAINER_HILL_FUNC_14 special CallTrainerHillFunction setvar VAR_TEMP_5, 1 call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_26835C - setvar VAR_0x8004, 14 + setvar VAR_0x8004, TRAINER_HILL_FUNC_14 special CallTrainerHillFunction return TrainerHill_Entrance_EventScript_26835C:: @ 826835C - setvar VAR_0x8004, 15 + setvar VAR_0x8004, TRAINER_HILL_FUNC_15 special CallTrainerHillFunction goto TrainerHill_Entrance_EventScript_268314 end diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index fc1ca200f..bf467e100 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -4,11 +4,11 @@ TrainerHill_Roof_MapScripts:: @ 8268FA7 .byte 0 TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, TRAINER_HILL_FUNC_12 special CallTrainerHillFunction lock faceplayer - setvar VAR_0x8004, 1 + setvar VAR_0x8004, TRAINER_HILL_FUNC_1 special CallTrainerHillFunction switch VAR_RESULT case 0, TrainerHill_Roof_EventScript_268FEA @@ -19,7 +19,7 @@ TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA msgbox TrainerHill_Roof_Text_268986, MSGBOX_DEFAULT TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, TRAINER_HILL_FUNC_2 special CallTrainerHillFunction switch VAR_RESULT case 0, TrainerHill_Roof_EventScript_269020 @@ -41,7 +41,7 @@ TrainerHill_Roof_EventScript_269037:: @ 8269037 goto TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269054:: @ 8269054 - setvar VAR_0x8004, 3 + setvar VAR_0x8004, TRAINER_HILL_FUNC_3 special CallTrainerHillFunction switch VAR_RESULT case 0, TrainerHill_Roof_EventScript_269082 diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc index 99f0efcf0..53b80053f 100644 --- a/data/maps/Underwater3/scripts.inc +++ b/data/maps/Underwater3/scripts.inc @@ -3,6 +3,6 @@ Underwater3_MapScripts:: @ 81F7724 .byte 0 Underwater3_MapScript1_1F772A: @ 81F772A - call Underwater3_EventScript_274223 + call UnusualWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc index ea37514eb..fe068207e 100644 --- a/data/maps/Underwater5/scripts.inc +++ b/data/maps/Underwater5/scripts.inc @@ -3,6 +3,6 @@ Underwater5_MapScripts:: @ 81F7731 .byte 0 Underwater5_MapScript1_1F7737: @ 81F7737 - call Underwater5_EventScript_274223 + call UnusualWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc index fee91dc75..d5a11c1bf 100644 --- a/data/maps/Underwater6/scripts.inc +++ b/data/maps/Underwater6/scripts.inc @@ -3,6 +3,6 @@ Underwater6_MapScripts:: @ 81F773D .byte 0 Underwater6_MapScript1_1F7743: @ 81F7743 - call Underwater6_EventScript_274223 + call UnusualWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc index a0eba386a..c3bee154e 100644 --- a/data/maps/Underwater7/scripts.inc +++ b/data/maps/Underwater7/scripts.inc @@ -3,6 +3,6 @@ Underwater7_MapScripts:: @ 81F7749 .byte 0 Underwater7_MapScript1_1F774F: @ 81F774F - call Underwater7_EventScript_274223 + call UnusualWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index f6bb194a3..daaaaea1b 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -307,7 +307,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0 faceplayer goto_if_set FLAG_MET_SCOTT_IN_VERDANTURF, VerdanturfTown_BattleTentLobby_EventScript_201AED msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_VERDANTURF release end diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index ac4bd1979..d6713cde4 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -269,8 +269,8 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: apprentice_msg TRUE, 11 setvar VAR_0x8004, 25 special CallApprenticeFunction - setvar VAR_0x8004, 19 - call BattleFrontier_BattleTowerLobby_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE + call Common_ShowEasyChatScreen lock faceplayer setvar VAR_0x8004, 21 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 0858dfabb..1914fee4f 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -74,7 +74,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 msgbox gUnknown_08273594, MSGBOX_DEFAULT giveitem_std ITEM_EON_TICKET setflag FLAG_SYS_HAS_EON_TICKET - setvar VAR_0x403F, 0 + setvar VAR_ALWAYS_ZERO_0x403F, 0 msgbox gUnknown_082735F2, MSGBOX_DEFAULT release end @@ -197,7 +197,7 @@ RustboroCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B - map_script_2 VAR_0x40CD, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0 + map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0 map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85 map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85 map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85 @@ -336,7 +336,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 waitmovement 0 delay 30 msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT - setvar VAR_0x40CD, 2 + setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 2 releaseall end @@ -791,116 +791,118 @@ EventScript_CableBoxResults:: @ 8277365 releaseall end -gUnknown_08277374:: @ 8277374 +EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374 setvar VAR_0x8005, 0 - special sub_80B3968 + special ColosseumPlayerSpotTriggered waitstate end -gUnknown_0827737E:: @ 827737E +EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E setvar VAR_0x8005, 1 - special sub_80B3968 + special ColosseumPlayerSpotTriggered waitstate end -gUnknown_08277388:: @ 8277388 +EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388 fadescreen 1 - special sub_80F9438 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger setvar VAR_0x8005, 0 - special sub_80B3968 + special ColosseumPlayerSpotTriggered waitstate end -gUnknown_082773A3:: @ 82773A3 +EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3 fadescreen 1 - special sub_80F9438 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger setvar VAR_0x8005, 1 - special sub_80B3968 + special ColosseumPlayerSpotTriggered waitstate end -gUnknown_082773BE:: @ 82773BE +EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE fadescreen 1 - special sub_80F9438 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger setvar VAR_0x8005, 2 - special sub_80B3968 + special ColosseumPlayerSpotTriggered waitstate end -gUnknown_082773D9:: @ 82773D9 +EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9 fadescreen 1 - special sub_80F9438 + special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger setvar VAR_0x8005, 3 - special sub_80B3968 + special ColosseumPlayerSpotTriggered waitstate end -DoubleBattleColosseum_EventScript_2773F4:: @ 82773F4 +EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4 end -gUnknown_082773F5:: @ 82773F5 +EventScript_TradeCenter_Chair0:: @ 82773F5 setvar VAR_0x8005, 0 - special sub_80B3924 + special PlayerEnteredTradeSeat waitstate end -gUnknown_082773FF:: @ 82773FF +EventScript_TradeCenter_Chair1:: @ 82773FF setvar VAR_0x8005, 1 - special sub_80B3924 + special PlayerEnteredTradeSeat waitstate end -gUnknown_08277409:: @ 8277409 +/* Never used */ +EventScript_TradeCenter_Chair2:: @ 8277409 setvar VAR_0x8005, 2 - special sub_80B3924 + special PlayerEnteredTradeSeat waitstate end -gUnknown_08277413:: @ 8277413 +/* Never used */ +EventScript_TradeCenter_Chair3:: @ 8277413 setvar VAR_0x8005, 3 - special sub_80B3924 + special PlayerEnteredTradeSeat waitstate end -gUnknown_0827741D:: @ 827741D +EventScript_RecordCenter_Spot0:: @ 827741D setvar VAR_0x8005, 0 - special sub_80E6BE8 + special RecordMixingPlayerSpotTriggered waitstate compare VAR_TEMP_1, 0 goto_if_ne RecordCorner_EventScript_277471 end -gUnknown_08277432:: @ 8277432 +EventScript_RecordCenter_Spot1:: @ 8277432 setvar VAR_0x8005, 1 - special sub_80E6BE8 + special RecordMixingPlayerSpotTriggered waitstate compare VAR_TEMP_1, 0 goto_if_ne RecordCorner_EventScript_277471 end -gUnknown_08277447:: @ 8277447 +EventScript_RecordCenter_Spot2:: @ 8277447 setvar VAR_0x8005, 2 - special sub_80E6BE8 + special RecordMixingPlayerSpotTriggered waitstate compare VAR_TEMP_1, 0 goto_if_ne RecordCorner_EventScript_277471 end -gUnknown_0827745C:: @ 827745C +EventScript_RecordCenter_Spot3:: @ 827745C setvar VAR_0x8005, 3 - special sub_80E6BE8 + special RecordMixingPlayerSpotTriggered waitstate compare VAR_TEMP_1, 0 goto_if_ne RecordCorner_EventScript_277471 @@ -914,21 +916,21 @@ RecordCorner_EventScript_277471:: @ 8277471 releaseall end -EventScript_TradeRoom_ReadTrainerCard1:: @ 827747E +gEventScript_TradeRoom_ReadTrainerCard_NoColor:: @ 827747E msgbox Text_278452, MSGBOX_DEFAULT fadescreen 1 special sp02A_crash_sound waitstate end -EventScript_TradeRoom_ReadTrainerCard2:: @ 827748D +gEventScript_TradeRoom_ReadTrainerCard_Normal:: @ 827748D msgbox Text_27847B, MSGBOX_DEFAULT fadescreen 1 special sp02A_crash_sound waitstate end -EventScript_TradeRoom_TooBusyToNotice:: @ 827749C +gEventScript_TradeRoom_TooBusyToNotice:: @ 827749C msgbox Text_27842E, MSGBOX_DEFAULT closemessage end @@ -967,22 +969,22 @@ RecordCorner_EventScript_2774E0:: @ 82774E0 closemessage end -gUnknown_082774EF:: @ 82774EF - msgbox Text_2783A8, MSGBOX_YESNO +EventScript_ConfirmLeaveTradeRoom:: @ 82774EF + msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq gUnknown_08277509 + goto_if_eq EventScript_TerminateLink erasebox 0, 0, 29, 19 releaseall end -gUnknown_08277509:: @ 8277509 - messageautoscroll Text_2783E9 +EventScript_TerminateLink:: @ 8277509 + messageautoscroll Text_TerminateLinkPleaseWait waitmessage - special sub_80B371C + special ExitLinkRoom end -EventScript_277513:: @ 8277513 - special sub_80B36EC +EventScript_DoLinkRoomExit:: @ 8277513 + special CleanupLinkRoomState special sub_80AF9F8 waitstate end @@ -1736,11 +1738,11 @@ OldaleTown_PokemonCenter_2F_Text_278372: @ 8278372 .string "Please confirm the number of\n" .string "players and start again.$" -Text_2783A8: @ 82783A8 +Text_TerminateLinkConfirmation: @ 82783A8 .string "The link will be terminated if you\n" .string "leave the room. Is that okay?$" -Text_2783E9: @ 82783E9 +Text_TerminateLinkPleaseWait: @ 82783E9 .string "Terminating link…\n" .string "You will be escorted out of\l" .string "the room. Please wait.$" diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index ee0e533bc..31000539c 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -313,8 +313,8 @@ Route111_EventScript_28D0A7:: @ 828D0A7 compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B433, MSGBOX_DEFAULT - setvar VAR_0x8004, 10 - call Route111_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 2791e5d9f..0ab47ea80 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -43,8 +43,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4 end MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 - setvar VAR_0x8004, 6 - call MauvilleCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index ea805edc4..cc189a96b 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -24,8 +24,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591 PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 0 - call PetalburgCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -76,8 +76,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642 PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 0 - call PetalburgCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 306157561..c4a5ffe86 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -510,7 +510,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 multichoice 22, 8, 108, 1 copyvar VAR_0x8004, VAR_RESULT special InitRoamer - copyvar VAR_0x40D5, VAR_RESULT + copyvar VAR_ROAMER_POKEMON, VAR_RESULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_HOUSES_STATE, 4 @@ -518,6 +518,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 releaseall end +@ Never called. LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72 setflag FLAG_SYS_TV_LATIAS_LATIOS return diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 770bc9a5b..6302a33a8 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -430,21 +430,21 @@ EventScript_275B4D:: @ 8275B4D EventScript_275B5B:: @ 8275B5B closemessage playse SE_KAIDAN - setvar VAR_0x4097, 0 + setvar VAR_INIT_SECRET_BASE, 0 setflag FLAG_DECORATION_0 special sub_80E8E18 special sub_80E9068 setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 special sub_80E933C - setvar VAR_0x4089, 1 + setvar VAR_SECRET_BASE_INITIALIZED, 1 waitstate end SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4 waitmovement 0 - setvar VAR_0x4097, 1 + setvar VAR_INIT_SECRET_BASE, 1 msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_275BAB @@ -467,21 +467,21 @@ SecretBase_RedCave1_Movement_275BB4: @ 8275BB4 EventScript_275BB7:: @ 8275BB7 lockall - setvar VAR_0x4097, 1 + setvar VAR_INIT_SECRET_BASE, 1 playse SE_KAIDAN special sub_80E9744 compare VAR_RESULT, 0 goto_if_eq EventScript_275BDB clearflag FLAG_DECORATION_0 special sub_80E9068 - setvar VAR_0x4089, 0 + setvar VAR_SECRET_BASE_INITIALIZED, 0 waitstate end EventScript_275BDB:: @ 8275BDB setflag FLAG_DECORATION_0 special sub_80E9068 - setvar VAR_0x4089, 0 + setvar VAR_SECRET_BASE_INITIALIZED, 0 waitstate end @@ -570,7 +570,7 @@ EventScript_275D0C:: @ 8275D0C setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 special sub_80E933C - setvar VAR_0x4089, 1 + setvar VAR_SECRET_BASE_INITIALIZED, 1 end EventScript_275D1F:: @ 8275D1F diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index acc75f76a..4a276ffc0 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -42,6 +42,9 @@ EventScript_27EE9A:: @ 827EE9A EventScript_27EEA4:: @ 827EEA4 msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT + @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and + @ It's called again when Mom actually asks for the color, overwriting + @ whatever it does here. special InitRoamer clearflag FLAG_SYS_TV_LATIAS_LATIOS setflag FLAG_LATIOS_OR_LATIAS_ROAMING diff --git a/data/slot_machine.s b/data/slot_machine.s index 4a354d71c..a3d502dcc 100644..100755 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -10,7 +10,7 @@ gUnknown_085A7A3C:: @ 85A7A3C .2byte 0 .2byte 0 .2byte 0 - + gUnknown_085A7A44:: @ 85A7A44 .2byte 0x8000 .2byte 0 @@ -22,13 +22,13 @@ gUnknown_085A7A4C:: @ 85A7A4C .2byte 0x4000 .2byte 0 .2byte 0 - + gUnknown_085A7A54:: @ 85A7A54 .2byte 0x8000 .2byte 0x8000 .2byte 0 .2byte 0 - + gUnknown_085A7A5C:: @ 85A7A5C .2byte 0 .2byte 0x8000 @@ -40,7 +40,7 @@ gUnknown_085A7A64:: @ 85A7A64 .2byte 0xC000 .2byte 0 .2byte 0 - + gUnknown_085A7A6C:: @ 85A7A6C .2byte 0x4000 .2byte 0xC000 @@ -95,7 +95,7 @@ gUnknown_085A7ACC:: @ 85A7ACC .4byte gSlotMachineReelTimePikaAura .2byte 0x400 .2byte 0 - + gUnknown_085A7AD4:: @ 85A7CD4 .4byte gSlotMachineReelTimeExplosion0 .2byte 0x200 @@ -111,7 +111,7 @@ gUnknown_085A7AE4:: @ 85A7AE4 gUnknown_085A7AEC:: @ 85A7AEC .4byte gSlotMachineReelTimeSmoke .4byte 0x80 - + gUnknown_085A7AF4:: @ 85A7AF4 .4byte gSlotMachineReelTimeBolt .4byte 32 @@ -123,7 +123,7 @@ gUnknown_085A7AFC:: @ 85A7AFC gUnknown_085A7B04:: @ 85A7B04 obj_image_anim_frame 0, 1 obj_image_anim_jump 0 - + gUnknown_085A7B0C:: @ 85A7B0C obj_image_anim_frame 0, 16 obj_image_anim_end @@ -258,18 +258,18 @@ gUnknown_085A7C30:: @ 85A7C30 gUnknown_085A7C34:: @ 85A7C34 .4byte gUnknown_085A7B88 - + gUnknown_085A7C38:: @ 85A7C38 .4byte gUnknown_085A7B94 .4byte gUnknown_085A7BA0 - + gUnknown_085A7C40:: @ 85A7C40 .4byte gUnknown_085A7BA8 - + gUnknown_085A7C44:: @ 85A7C44 .4byte gUnknown_085A7BB4 .4byte gUnknown_085A7BC8 - + gUnknown_085A7C4C:: @ 85A7C4C .4byte gUnknown_085A7BD0 .4byte gUnknown_085A7BD8 @@ -283,7 +283,7 @@ gUnknown_085A7C60:: @ 85A7C60 obj_rot_scal_anim_frame 1, 1, 0, 1 obj_rot_scal_anim_loop 0xFF obj_rot_scal_anim_end - + gUnknown_085A7C88:: @ 85A7C88 .4byte gUnknown_085A7C60 @@ -301,7 +301,7 @@ gUnknown_085A7C8C:: @ 85A7C8C gUnknown_085A7CDC:: @ 85A7CDC .4byte gUnknown_085A7C8C - + gSpriteTemplate_83ED414:: @ 85A7CE0 spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_8104F18 @@ -346,52 +346,52 @@ gSpriteTemplate_83ED54C:: @ 85A7E18 gSpriteTemplate_83ED564:: @ 85A7E30 spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_8105A38 - + gUnknown_085A7E48:: @ 85A7E48 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7E60:: @ 85A7E60 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7E78:: @ 85A7E78 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7E90:: @ 85A7E90 spr_template 18, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7EA8:: @ 85A7EA8 spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7EC0:: @ 85A7EC0 spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7ED8:: @ 85A7ED8 spr_template 19, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7EF0:: @ 85A7EF0 spr_template 20, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F08:: @ 85A7F08 spr_template 21, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F20:: @ 85A7F20 spr_template 0xFFFF, 6, gUnknown_085A7A5C, gUnknown_085A7C38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F38:: @ 85A7F38 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F50:: @ 85A7F50 spr_template 0xFFFF, 6, gUnknown_085A7A4C, gUnknown_085A7C4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F68:: @ 85A7F68 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F80:: @ 85A7F80 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gSpriteTemplate_83ED6CC:: @ 85A7F98 spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_8105B70 - + gUnknown_085A7FB0:: @ 85A7FB0 subsprite -64, -64, 3, 0, 64x64 subsprite 0, -64, 3, 0, 64x64 @@ -400,7 +400,7 @@ gUnknown_085A7FB0:: @ 85A7FB0 gSubspriteTables_83ED704:: @ 85A7FC0 .4byte 4, gUnknown_085A7FB0 - + gUnknown_085A7FC8:: @ 85A7FC8 subsprite -32, -12, 1, 0, 32x8 subsprite 0, -12, 1, 4, 32x8 @@ -416,7 +416,7 @@ gUnknown_085A7FE8:: @ 85A7FE8 subsprite -32, -20, 1, 0, 64x32 subsprite -32, 12, 1, 32, 32x8 subsprite 0, 12, 1, 36, 32x8 - + gSubspriteTables_83ED75C:: @ 85A7FF4 .4byte 3, gUnknown_085A7FE8 @@ -426,10 +426,10 @@ gUnknown_085A7FFC:: @ 85A7FFC subsprite 0, 8, 1, 36, 32x8 subsprite -32, 16, 1, 40, 32x8 subsprite 0, 16, 1, 44, 32x8 - + gSubspriteTables_83ED78C:: @ 85A8010 .4byte 5, gUnknown_085A7FFC - + gUnknown_085A8018:: @ 85A8018 subsprite -32, -8, 1, 0, 32x8 subsprite 0, -8, 1, 4, 32x8 @@ -438,7 +438,7 @@ gUnknown_085A8018:: @ 85A8018 gSubspriteTables_83ED7B4:: @ 85A8028 .4byte 4, gUnknown_085A8018 - + gUnknown_085A8030:: @ 85A8030 subsprite -8, -12, 1, 0, 16x8 subsprite -8, -4, 1, 0, 16x8 @@ -474,7 +474,7 @@ gUnknown_085A8078:: @ 85A8078 gUnknown_085A8088:: @ 85A8088 .4byte 4, gUnknown_085A8078 - + gUnknown_085A8090:: @ 85A8090 subsprite -32, -8, 3, 0, 32x8 subsprite 0, -8, 3, 4, 32x8 @@ -483,7 +483,7 @@ gUnknown_085A8090:: @ 85A8090 gUnknown_085A80A0:: @ 85A80A0 .4byte 4, gUnknown_085A8090 - + gUnknown_085A80A8:: @ 85A80A8 subsprite -32, -12, 3, 0, 32x8 subsprite 0, -12, 3, 4, 32x8 @@ -494,19 +494,19 @@ gUnknown_085A80A8:: @ 85A80A8 gUnknown_085A80C0:: @ 85A80C0 .4byte 6, gUnknown_085A80A8 - + gUnknown_085A80C8:: @ 85A80C8 subsprite -16, -16, 3, 0, 32x32 - + gUnknown_085A80CC:: @ 85A80CC subsprite -8, -8, 3, 16, 16x16 gUnknown_085A80D0:: @ 85A80D0 .4byte 1, gUnknown_085A80C8 - + gUnknown_085A80D8:: @ 85A80D8 .4byte 1, gUnknown_085A80CC - + gUnknown_085A80E0:: @ 85A80E0 subsprite -24, -24, 3, 0, 32x8 subsprite 8, -24, 3, 4, 16x8 @@ -523,78 +523,78 @@ gUnknown_085A80E0:: @ 85A80E0 gUnknown_085A8110:: @ 85A8110 .4byte 12, gUnknown_085A80E0 - + gUnknown_085A8118:: @ 85A8118 subsprite -16, -12, 3, 0, 32x16 subsprite -16, 4, 3, 8, 16x8 subsprite 0, 4, 3, 10, 16x8 - + gUnknown_085A8124:: @ 85A8124 .4byte 3, gUnknown_085A8118 - + gUnknown_085A812C:: @ 85A812C subsprite -8, -8, 3, 0, 16x8 subsprite -8, 0, 3, 8, 16x8 - + gUnknown_085A8134:: @ 85A8134 .4byte 2, gUnknown_085A812C - + gUnknown_085A813C:: @ 85A813C subsprite -8, -8, 3, 2, 16x8 subsprite -8, 0, 3, 10, 16x8 - + gUnknown_085A8144:: @ 85A8144 .4byte 2, gUnknown_085A813C - + gUnknown_085A814C:: @ 85A814C subsprite -8, -8, 3, 4, 16x8 subsprite -8, 0, 3, 12, 16x8 - + gUnknown_085A8154:: @ 85A8154 .4byte 2, gUnknown_085A814C - + gUnknown_085A815C:: @ 85A815C subsprite -8, -8, 3, 6, 16x8 subsprite -8, 0, 3, 14, 16x8 - + gUnknown_085A8164:: @ 85A8164 .4byte 2, gUnknown_085A815C - + gUnknown_085A816C:: @ 85A816C subsprite -8, -8, 3, 0, 16x8 subsprite -8, 0, 3, 8, 16x8 - + gUnknown_085A8174:: @ 85A8174 .4byte 2, gUnknown_085A816C - + gUnknown_085A817C:: @ 85A817C subsprite -4, -8, 3, 2, 8x8 subsprite -4, 0, 3, 10, 8x8 - + gUnknown_085A8184:: @ 85A8184 .4byte 2, gUnknown_085A817C - + gUnknown_085A818C:: @ 85A818C subsprite -8, -8, 3, 3, 16x8 subsprite -8, 0, 3, 11, 16x8 - + gUnknown_085A8194:: @ 85A8194 .4byte 2, gUnknown_085A818C - + gUnknown_085A819C:: @ 85A819C subsprite -4, -8, 3, 5, 8x8 subsprite -4, 0, 3, 13, 8x8 - + gUnknown_085A81A4:: @ 85A81A4 .4byte 2, gUnknown_085A819C - + gUnknown_085A81AC:: @ 85A81AC subsprite -8, -8, 3, 6, 16x8 subsprite -8, 0, 3, 14, 16x8 - + gUnknown_085A81B4:: @ 85A81B4 .4byte 2, gUnknown_085A81AC - + gUnknown_085A81BC:: @ 85A81BC subsprite -12, -12, 3, 0, 16x8 subsprite 4, -12, 3, 2, 8x8 @@ -602,18 +602,18 @@ gUnknown_085A81BC:: @ 85A81BC subsprite 4, -4, 3, 10, 8x8 subsprite -12, 4, 3, 16, 16x8 subsprite 4, 4, 3, 18, 8x8 - + gUnknown_085A81D4:: @ 85A81D4 .4byte 6, gUnknown_085A81BC - + gUnknown_085A81DC:: @ 85A81DC subsprite -8, -12, 3, 3, 16x8 subsprite -8, -4, 3, 11, 16x8 subsprite -8, 4, 3, 19, 16x8 - + gUnknown_085A81E8:: @ 85A81E8 .4byte 3, gUnknown_085A81DC - + gUnknown_085A81F0:: @ 85A81F0 subsprite -12, -12, 3, 5, 16x8 subsprite 4, -12, 3, 7, 8x8 @@ -621,10 +621,10 @@ gUnknown_085A81F0:: @ 85A81F0 subsprite 4, -4, 3, 15, 8x8 subsprite -12, 4, 3, 21, 16x8 subsprite 4, 4, 3, 0x17, 8x8 - + gUnknown_085A8208:: @ 85A8208 .4byte 6, gUnknown_085A81F0 - + gUnknown_085A8210:: @ 85A8210 subsprite -12, -12, 3, 0, 16x8 subsprite 4, -12, 3, 2, 8x8 @@ -632,18 +632,18 @@ gUnknown_085A8210:: @ 85A8210 subsprite 4, -4, 3, 10, 8x8 subsprite -12, 4, 3, 16, 16x8 subsprite 4, 4, 3, 18, 8x8 - + gUnknown_085A8228:: @ 85A8228 .4byte 6, gUnknown_085A8210 - + gUnknown_085A822C:: @ 85A822C subsprite -8, -12, 3, 3, 16x8 subsprite -8, -4, 3, 11, 16x8 subsprite -8, 4, 3, 19, 16x8 - + gUnknown_085A823C:: @ 85A823C .4byte 3, gUnknown_085A822C - + gUnknown_085A8244:: @ 85A8244 subsprite -12, -12, 3, 5, 16x8 subsprite 4, -12, 3, 7, 8x8 @@ -651,7 +651,7 @@ gUnknown_085A8244:: @ 85A8244 subsprite 4, -4, 3, 15, 8x8 subsprite -12, 4, 3, 21, 16x8 subsprite 4, 4, 3, 23, 8x8 - + gUnknown_085A825C:: @ 85A825C .4byte 6, gUnknown_085A8244 @@ -712,7 +712,7 @@ gUnknown_083EDBC4:: @ 85A82CC .4byte NULL .align 2 -sSlotMachineSpriteSheets:: @ 85A8334 +gSlotMachineSpriteSheets:: @ 85A8334 obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000 obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001 obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002 @@ -738,19 +738,19 @@ gUnknown_083EDCDC:: @ 85A83E4 .4byte gUnknown_08DD19F8 @ might be a palette idk .byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1 - -gUnknown_085A83FC:: @ 85A83FC + +gUnknown_085A83FC:: @ 85A83FC .byte 0x91, 0x7F - -gUnknown_085A83FE:: @ 85A83FE + +gUnknown_085A83FE:: @ 85A83FE .byte 0xBF, 0x43 gUnknown_085A8400:: @ 85A8400 .byte 0xBF, 0x43 - + gUnknown_085A8402:: @ 85A8402 .byte 0xBF, 0x4A - + gUnknown_085A8404:: @ 85A8404 .byte 0xBF, 0x4A, 0, 0 @@ -771,20 +771,20 @@ gUnknown_083EDD1C:: @ 85A841C gUnknown_083EDD30:: @ 85A8430 .byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D -gUnknown_083EDD35:: @ 85A8435 +gBettingTilesId:: @ 85A8435 .byte 0, 0 .byte 1, 2 .byte 3, 4 -gUnknown_083EDD3B:: @ 85A843B +gNumberBettingTiles:: @ 85A843B .byte 1, 2, 2 - + gUnknown_085A843E:: @ 85A843E .incbin "graphics/slot_machine/85A843E.gbapal" - + gUnknown_085A845E:: @ 85A845E .incbin "graphics/slot_machine/85A845E.gbapal" - + gUnknown_085A847E:: @ 85A847E .incbin "graphics/slot_machine/85A847E.gbapal" @@ -796,13 +796,13 @@ gUnknown_083EDDA0:: @ 85A84A0 gUnknown_083EDDAC:: @ 85A84AC .4byte gSlotMachineMenu_Pal + 0x20 - + gUnknown_085A84B0:: @ 85A84B0 .incbin "graphics/slot_machine/85A84B0.gbapal" - + gUnknown_085A84D0:: @ 85A84D0 .incbin "graphics/slot_machine/85A84D0.gbapal" - + gUnknown_085A84F0:: @ 85A84F0 .incbin "graphics/slot_machine/85A84F0.gbapal" @@ -830,10 +830,10 @@ gSlotMachineSpritePalettes:: @ 85A8544 obj_pal gUnknown_08DCF1F0, 7 null_obj_pal -sReelTimeGfx:: @ 85A858C +gReelTimeGfx:: @ 85A858C .incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz" -sReelTimeWindowTilemap:: @ 85A96E0 +gReelTimeWindowTilemap:: @ 85A96E0 @if anyone knows what this tilemap is please do share .incbin "graphics/slot_machine/85A96E0.bin" diff --git a/data/specials.inc b/data/specials.inc index 965bef117..d57c76bde 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -12,8 +12,8 @@ gSpecials:: @ 81DBA64 def_special SetCableClubWarp def_special sub_80AF948 def_special sub_80AF9F8 - def_special sub_80B36EC - def_special sub_80B371C + def_special CleanupLinkRoomState + def_special ExitLinkRoom def_special sub_80E8E18 def_special sub_80E8BC8 def_special sub_80E9068 @@ -35,14 +35,14 @@ gSpecials:: @ 81DBA64 def_special sub_80E91F8 def_special sub_80EA30C def_special DoSecretBasePCTurnOffEffect - def_special sub_80E6BE8 + def_special RecordMixingPlayerSpotTriggered def_special sub_80B2DA4 def_special sub_80B2E4C def_special sub_80B2E74 def_special sub_80B2EA8 def_special CloseLink - def_special sub_80B3968 - def_special sub_80B3924 + def_special ColosseumPlayerSpotTriggered + def_special PlayerEnteredTradeSeat def_special nullsub_37 def_special sub_80B3254 def_special sub_80B2FD8 @@ -50,7 +50,7 @@ gSpecials:: @ 81DBA64 def_special SpawnLinkPartnerEventObject def_special SavePlayerParty def_special LoadPlayerParty - def_special sub_80F9438 + def_special ChooseHalfPartyForBattle def_special sp02A_crash_sound def_special EventObjectInteractionGetBerryTreeData def_special EventObjectInteractionGetBerryName @@ -106,7 +106,7 @@ gSpecials:: @ 81DBA64 def_special sub_80B3000 def_special SaveGame def_special DoWateringBerryTreeAnim - def_special easy_chat_input_maybe + def_special ShowEasyChatScreen def_special sub_811EECC def_special ScrSpecial_GetCurrentMauvilleMan def_special ScrSpecial_HasBardSongBeenChanged @@ -499,8 +499,8 @@ gSpecials:: @ 81DBA64 def_special sub_813B21C def_special SetMatchCallRegisteredFlag def_special sub_8175280 - def_special sub_813B2E4 - def_special sub_813B374 + def_special CreateUnusualWeatherEvent + def_special GetUnusualWeatherMapNameAndType def_special sub_813B490 def_special sub_80A08CC def_special Unused_SetWeatherSunny |