diff options
76 files changed, 170 insertions, 334 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 1966ca9b8..f96aaa140 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -841,84 +841,25 @@ EventScript_BackupMrBrineyLocation:: @ 81A010C .include "data/scripts/dynamic_npc_graphics.inc" .include "data/scripts/set_gym_trainers.inc" -DewfordTown_Gym_EventScript_1A029B:: @ 81A029B -DewfordTown_Hall_EventScript_1A029B:: @ 81A029B -FallarborTown_House1_EventScript_1A029B:: @ 81A029B -FortreeCity_Gym_EventScript_1A029B:: @ 81A029B -FortreeCity_House2_EventScript_1A029B:: @ 81A029B -FortreeCity_House4_EventScript_1A029B:: @ 81A029B -LavaridgeTown_Gym_1F_EventScript_1A029B:: @ 81A029B -LavaridgeTown_HerbShop_EventScript_1A029B:: @ 81A029B -LilycoveCity_EventScript_1A029B:: @ 81A029B -LilycoveCity_House2_EventScript_1A029B:: @ 81A029B -LittlerootTown_BrendansHouse_1F_EventScript_1A029B:: @ 81A029B -MauvilleCity_EventScript_1A029B:: @ 81A029B -MauvilleCity_Gym_EventScript_1A029B:: @ 81A029B -MossdeepCity_EventScript_1A029B:: @ 81A029B -MossdeepCity_Gym_EventScript_1A029B:: @ 81A029B -MossdeepCity_SpaceCenter_1F_EventScript_1A029B:: @ 81A029B -MtPyre_1F_EventScript_1A029B:: @ 81A029B -PacifidlogTown_House2_EventScript_1A029B:: @ 81A029B -PetalburgCity_Gym_EventScript_1A029B:: @ 81A029B -PetalburgWoods_EventScript_1A029B:: @ 81A029B -Route104_EventScript_1A029B:: @ 81A029B -Route104_PrettyPetalFlowerShop_EventScript_1A029B:: @ 81A029B -Route109_EventScript_1A029B:: @ 81A029B -Route111_EventScript_1A029B:: @ 81A029B -Route111_WinstrateFamilysHouse_EventScript_1A029B:: @ 81A029B -Route114_EventScript_1A029B:: @ 81A029B -Route114_FossilManiacsHouse_EventScript_1A029B:: @ 81A029B -Route120_EventScript_1A029B:: @ 81A029B -Route123_BerryMastersHouse_EventScript_1A029B:: @ 81A029B -Route123_EventScript_1A029B:: @ 81A029B -RustboroCity_DevonCorp_3F_EventScript_1A029B:: @ 81A029B -RustboroCity_Flat2_2F_EventScript_1A029B:: @ 81A029B -RustboroCity_Gym_EventScript_1A029B:: @ 81A029B -RustboroCity_PokemonSchool_EventScript_1A029B:: @ 81A029B -SSTidalRooms_EventScript_1A029B:: @ 81A029B -ShoalCave_LowTideEntranceRoom_EventScript_1A029B:: @ 81A029B -ShoalCave_LowTideInnerRoom_EventScript_1A029B:: @ 81A029B -ShoalCave_LowTideLowerRoom_EventScript_1A029B:: @ 81A029B -ShoalCave_LowTideStairsRoom_EventScript_1A029B:: @ 81A029B -SlateportCity_ContestHall_EventScript_1A029B:: @ 81A029B -SlateportCity_Harbor_EventScript_1A029B:: @ 81A029B -SlateportCity_PokemonFanClub_EventScript_1A029B:: @ 81A029B -SootopolisCity_EventScript_1A029B:: @ 81A029B -SootopolisCity_Gym_1F_EventScript_1A029B:: @ 81A029B -VerdanturfTown_ContestLobby_EventScript_1A029B:: @ 81A029B - msgbox MauvilleCity_Text_1A0CC2, MSGBOX_DEFAULT +Common_EventScript_ShowBagIsFull:: @ 81A029B + msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_1A02A5:: @ 81A02A5 -Route110_TrickHouseEnd_EventScript_1A02A5:: @ 81A02A5 -Route110_TrickHouseEntrance_EventScript_1A02A5:: @ 81A02A5 -Route113_GlassWorkshop_EventScript_1A02A5:: @ 81A02A5 - msgbox MauvilleCity_GameCorner_Text_1A0CC2, MSGBOX_DEFAULT +Common_EventScript_BagIsFull:: @ 81A02A5 + msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT return -Route114_LanettesHouse_EventScript_1A02AE:: @ 81A02AE - msgbox Route114_LanettesHouse_Text_1A0CEF, MSGBOX_DEFAULT +Common_EventScript_ShowNoRoomForDecor:: @ 81A02AE + msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT release end -LilycoveCity_LilycoveMuseum_2F_EventScript_1A02B8:: @ 81A02B8 -MauvilleCity_GameCorner_EventScript_1A02B8:: @ 81A02B8 -Route110_TrickHouseEnd_EventScript_1A02B8:: @ 81A02B8 -Route110_TrickHouseEntrance_EventScript_1A02B8:: @ 81A02B8 -Route113_GlassWorkshop_EventScript_1A02B8:: @ 81A02B8 - msgbox MauvilleCity_GameCorner_Text_1A0CEF, MSGBOX_DEFAULT +Common_EventScript_NoRoomForDecor:: @ 81A02B8 + msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT return -EverGrandeCity_EventScript_1A02C1:: @ 81A02C1 -LilycoveCity_EventScript_1A02C1:: @ 81A02C1 -MossdeepCity_EventScript_1A02C1:: @ 81A02C1 -Route124_EventScript_1A02C1:: @ 81A02C1 -Route125_EventScript_1A02C1:: @ 81A02C1 -Route126_EventScript_1A02C1:: @ 81A02C1 -Route127_EventScript_1A02C1:: @ 81A02C1 -Route128_EventScript_1A02C1:: @ 81A02C1 -SootopolisCity_EventScript_1A02C1:: @ 81A02C1 +Common_EventScript_SetLegendaryWeather:: @ 81A02C1 .ifdef SAPPHIRE setweather WEATHER_RAIN_HEAVY .else @@ -926,23 +867,12 @@ SootopolisCity_EventScript_1A02C1:: @ 81A02C1 .endif return -DewfordTown_Gym_EventScript_1A02C5:: @ 81A02C5 -FortreeCity_Gym_EventScript_1A02C5:: @ 81A02C5 -LavaridgeTown_Gym_1F_EventScript_1A02C5:: @ 81A02C5 -LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5:: @ 81A02C5 -MauvilleCity_Gym_EventScript_1A02C5:: @ 81A02C5 -MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5 -PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5 -RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5 -SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5 +Common_EventScript_PlayGymBadgeFanfare:: @ 81A02C5 playfanfare MUS_ME_BACHI waitfanfare return -LittlerootTown_BrendansHouse_1F_EventScript_1A02CA:: @ 81A02CA -Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA -Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA -SSTidalRooms_EventScript_1A02CA:: @ 81A02CA +Common_EventScript_OutOfCenterPartyHeal:: @ 81A02CA fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare @@ -950,26 +880,22 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA fadescreen FADE_FROM_BLACK return -Event_WorldMap:: @ 81A02D6 +EventScript_RegionMap:: @ 81A02D6 lockall - msgbox UnknownString_817303D, MSGBOX_DEFAULT + msgbox Text_LookCloserAtMap, MSGBOX_DEFAULT fadescreen FADE_TO_BLACK special FieldShowRegionMap waitstate releaseall end -DewfordTown_EventScript_1A02E7:: @ 81A02E7 -Route104_EventScript_1A02E7:: @ 81A02E7 -Route109_EventScript_1A02E7:: @ 81A02E7 - setflag FLAG_SPECIAL_FLAG_1 +Common_EventScript_PlayBrineysBoatMusic:: @ 81A02E7 + setflag FLAG_DONT_TRANSITION_MUSIC playbgm MUS_M_BOAT, FALSE return -DewfordTown_EventScript_1A02EF:: @ 81A02EF -Route104_EventScript_1A02EF:: @ 81A02EF -Route109_EventScript_1A02EF:: @ 81A02EF - clearflag FLAG_SPECIAL_FLAG_1 +Common_EventScript_StopBrineysBoatMusic:: @ 81A02EF + clearflag FLAG_DONT_TRANSITION_MUSIC fadedefaultbgm return @@ -1623,22 +1549,14 @@ Message_PutAwayItem: @ 81A0C8C Message_FoundOneItem: @ 81A0CB1 .string "{PLAYER} hat {STR_VAR_2} gefunden!$" -MauvilleCity_GameCorner_Text_1A0CC2:: @ 81A0CC2 -MauvilleCity_Text_1A0CC2:: @ 81A0CC2 -MtChimney_Text_1A0CC2:: @ 81A0CC2 -OldaleTown_Text_1A0CC2:: @ 81A0CC2 -Route109_SeashoreHouse_Text_1A0CC2:: @ 81A0CC2 -Message_BagFull: +Text_TooBadBagIsFull: .string "Zu schade!\n" .string "Der BEUTEL ist voll...$" Message_ObtainedDecoration: @ 81A0CDE .string "{STR_VAR_2} erhalten.$" -BattleTower_Lobby_Text_1A0CEF:: @ 81A0CEF -MauvilleCity_GameCorner_Text_1A0CEF:: @ 81A0CEF -Route114_LanettesHouse_Text_1A0CEF:: @ 81A0CEF -SootopolisCity_House6_Text_1A0CEF:: @ 81A0CEF +Text_NoRoomLeftForAnother:: @ 81A0CEF .string "Zu schade! Es ist kein Platz für\n" .string "{STR_VAR_2}...$" diff --git a/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc b/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc index 102eb6664..61fe3a85a 100644 --- a/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc +++ b/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc @@ -29,7 +29,7 @@ LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A .string "Speichere den Fortschritt mit SICHERN.\p" .string "Die übrigen Seiten sind leer.$" -UnknownString_817303D: @ 817303D +Text_LookCloserAtMap: @ 817303D .string "{PLAYER} schaut sich die Karte der\n" .string "HOENN-Region genauer an.$" diff --git a/data/event_scripts.s b/data/event_scripts.s index d1e393858..0a595ef4b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -840,84 +840,25 @@ EventScript_BackupMrBrineyLocation:: @ 81A010C .include "data/scripts/dynamic_npc_graphics.inc" .include "data/scripts/set_gym_trainers.inc" -DewfordTown_Gym_EventScript_1A029B:: @ 81A029B -DewfordTown_Hall_EventScript_1A029B:: @ 81A029B -FallarborTown_House1_EventScript_1A029B:: @ 81A029B -FortreeCity_Gym_EventScript_1A029B:: @ 81A029B -FortreeCity_House2_EventScript_1A029B:: @ 81A029B -FortreeCity_House4_EventScript_1A029B:: @ 81A029B -LavaridgeTown_Gym_1F_EventScript_1A029B:: @ 81A029B -LavaridgeTown_HerbShop_EventScript_1A029B:: @ 81A029B -LilycoveCity_EventScript_1A029B:: @ 81A029B -LilycoveCity_House2_EventScript_1A029B:: @ 81A029B -LittlerootTown_BrendansHouse_1F_EventScript_1A029B:: @ 81A029B -MauvilleCity_EventScript_1A029B:: @ 81A029B -MauvilleCity_Gym_EventScript_1A029B:: @ 81A029B -MossdeepCity_EventScript_1A029B:: @ 81A029B -MossdeepCity_Gym_EventScript_1A029B:: @ 81A029B -MossdeepCity_SpaceCenter_1F_EventScript_1A029B:: @ 81A029B -MtPyre_1F_EventScript_1A029B:: @ 81A029B -PacifidlogTown_House2_EventScript_1A029B:: @ 81A029B -PetalburgCity_Gym_EventScript_1A029B:: @ 81A029B -PetalburgWoods_EventScript_1A029B:: @ 81A029B -Route104_EventScript_1A029B:: @ 81A029B -Route104_PrettyPetalFlowerShop_EventScript_1A029B:: @ 81A029B -Route109_EventScript_1A029B:: @ 81A029B -Route111_EventScript_1A029B:: @ 81A029B -Route111_WinstrateFamilysHouse_EventScript_1A029B:: @ 81A029B -Route114_EventScript_1A029B:: @ 81A029B -Route114_FossilManiacsHouse_EventScript_1A029B:: @ 81A029B -Route120_EventScript_1A029B:: @ 81A029B -Route123_BerryMastersHouse_EventScript_1A029B:: @ 81A029B -Route123_EventScript_1A029B:: @ 81A029B -RustboroCity_DevonCorp_3F_EventScript_1A029B:: @ 81A029B -RustboroCity_Flat2_2F_EventScript_1A029B:: @ 81A029B -RustboroCity_Gym_EventScript_1A029B:: @ 81A029B -RustboroCity_PokemonSchool_EventScript_1A029B:: @ 81A029B -SSTidalRooms_EventScript_1A029B:: @ 81A029B -ShoalCave_LowTideEntranceRoom_EventScript_1A029B:: @ 81A029B -ShoalCave_LowTideInnerRoom_EventScript_1A029B:: @ 81A029B -ShoalCave_LowTideLowerRoom_EventScript_1A029B:: @ 81A029B -ShoalCave_LowTideStairsRoom_EventScript_1A029B:: @ 81A029B -SlateportCity_ContestHall_EventScript_1A029B:: @ 81A029B -SlateportCity_Harbor_EventScript_1A029B:: @ 81A029B -SlateportCity_PokemonFanClub_EventScript_1A029B:: @ 81A029B -SootopolisCity_EventScript_1A029B:: @ 81A029B -SootopolisCity_Gym_1F_EventScript_1A029B:: @ 81A029B -VerdanturfTown_ContestLobby_EventScript_1A029B:: @ 81A029B - msgbox MauvilleCity_Text_1A0CC2, MSGBOX_DEFAULT +Common_EventScript_ShowBagIsFull:: @ 81A029B + msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_1A02A5:: @ 81A02A5 -Route110_TrickHouseEnd_EventScript_1A02A5:: @ 81A02A5 -Route110_TrickHouseEntrance_EventScript_1A02A5:: @ 81A02A5 -Route113_GlassWorkshop_EventScript_1A02A5:: @ 81A02A5 - msgbox MauvilleCity_GameCorner_Text_1A0CC2, MSGBOX_DEFAULT +Common_EventScript_BagIsFull:: @ 81A02A5 + msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT return -Route114_LanettesHouse_EventScript_1A02AE:: @ 81A02AE - msgbox Route114_LanettesHouse_Text_1A0CEF, MSGBOX_DEFAULT +Common_EventScript_ShowNoRoomForDecor:: @ 81A02AE + msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT release end -LilycoveCity_LilycoveMuseum_2F_EventScript_1A02B8:: @ 81A02B8 -MauvilleCity_GameCorner_EventScript_1A02B8:: @ 81A02B8 -Route110_TrickHouseEnd_EventScript_1A02B8:: @ 81A02B8 -Route110_TrickHouseEntrance_EventScript_1A02B8:: @ 81A02B8 -Route113_GlassWorkshop_EventScript_1A02B8:: @ 81A02B8 - msgbox MauvilleCity_GameCorner_Text_1A0CEF, MSGBOX_DEFAULT +Common_EventScript_NoRoomForDecor:: @ 81A02B8 + msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT return -EverGrandeCity_EventScript_1A02C1:: @ 81A02C1 -LilycoveCity_EventScript_1A02C1:: @ 81A02C1 -MossdeepCity_EventScript_1A02C1:: @ 81A02C1 -Route124_EventScript_1A02C1:: @ 81A02C1 -Route125_EventScript_1A02C1:: @ 81A02C1 -Route126_EventScript_1A02C1:: @ 81A02C1 -Route127_EventScript_1A02C1:: @ 81A02C1 -Route128_EventScript_1A02C1:: @ 81A02C1 -SootopolisCity_EventScript_1A02C1:: @ 81A02C1 +Common_EventScript_SetLegendaryWeather:: @ 81A02C1 .ifdef SAPPHIRE setweather WEATHER_RAIN_HEAVY .else @@ -925,23 +866,12 @@ SootopolisCity_EventScript_1A02C1:: @ 81A02C1 .endif return -DewfordTown_Gym_EventScript_1A02C5:: @ 81A02C5 -FortreeCity_Gym_EventScript_1A02C5:: @ 81A02C5 -LavaridgeTown_Gym_1F_EventScript_1A02C5:: @ 81A02C5 -LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5:: @ 81A02C5 -MauvilleCity_Gym_EventScript_1A02C5:: @ 81A02C5 -MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5 -PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5 -RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5 -SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5 +Common_EventScript_PlayGymBadgeFanfare:: @ 81A02C5 playfanfare MUS_ME_BACHI waitfanfare return -LittlerootTown_BrendansHouse_1F_EventScript_1A02CA:: @ 81A02CA -Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA -Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA -SSTidalRooms_EventScript_1A02CA:: @ 81A02CA +Common_EventScript_OutOfCenterPartyHeal:: @ 81A02CA fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare @@ -949,26 +879,22 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA fadescreen FADE_FROM_BLACK return -Event_WorldMap:: @ 81A02D6 +EventScript_RegionMap:: @ 81A02D6 lockall - msgbox UnknownString_817303D, MSGBOX_DEFAULT + msgbox Text_LookCloserAtMap, MSGBOX_DEFAULT fadescreen FADE_TO_BLACK special FieldShowRegionMap waitstate releaseall end -DewfordTown_EventScript_1A02E7:: @ 81A02E7 -Route104_EventScript_1A02E7:: @ 81A02E7 -Route109_EventScript_1A02E7:: @ 81A02E7 - setflag FLAG_SPECIAL_FLAG_1 +Common_EventScript_PlayBrineysBoatMusic:: @ 81A02E7 + setflag FLAG_DONT_TRANSITION_MUSIC playbgm MUS_M_BOAT, FALSE return -DewfordTown_EventScript_1A02EF:: @ 81A02EF -Route104_EventScript_1A02EF:: @ 81A02EF -Route109_EventScript_1A02EF:: @ 81A02EF - clearflag FLAG_SPECIAL_FLAG_1 +Common_EventScript_StopBrineysBoatMusic:: @ 81A02EF + clearflag FLAG_DONT_TRANSITION_MUSIC fadedefaultbgm return @@ -1624,22 +1550,14 @@ Message_PutAwayItem: Message_FoundOneItem: .string "{PLAYER} found one {STR_VAR_2}!$" -MauvilleCity_GameCorner_Text_1A0CC2:: @ 81A0CC2 -MauvilleCity_Text_1A0CC2:: @ 81A0CC2 -MtChimney_Text_1A0CC2:: @ 81A0CC2 -OldaleTown_Text_1A0CC2:: @ 81A0CC2 -Route109_SeashoreHouse_Text_1A0CC2:: @ 81A0CC2 -Message_BagFull: +Text_TooBadBagIsFull: .string "Too bad!\n" .string "The BAG is full...$" Message_ObtainedDecoration: @ 81A0CDE .string "Obtained the {STR_VAR_2}.$" -BattleTower_Lobby_Text_1A0CEF:: @ 81A0CEF -MauvilleCity_GameCorner_Text_1A0CEF:: @ 81A0CEF -Route114_LanettesHouse_Text_1A0CEF:: @ 81A0CEF -SootopolisCity_House6_Text_1A0CEF:: @ 81A0CEF +Text_NoRoomLeftForAnother:: @ 81A0CEF .string "Too bad! There's no room left for\n" .string "another {STR_VAR_2}...$" diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc index 63b2889ab..e30502fb6 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -413,7 +413,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 BattleTower_Lobby_EventScript_1607AF:: @ 81607AF bufferdecorationname 1, VAR_0x8008 - msgbox BattleTower_Lobby_Text_1A0CEF, MSGBOX_DEFAULT + msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT msgbox BattleTower_Lobby_Text_19ABED, MSGBOX_DEFAULT release end diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 5c181ca0d..51df11d88 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -124,12 +124,12 @@ DewfordTown_EventScript_14E151:: @ 814E151 applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E402 waitmovement 0 hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN - call DewfordTown_EventScript_1A02E7 + call Common_EventScript_PlayBrineysBoatMusic applymovement 4, DewfordTown_Movement_14E293 applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E293 waitmovement 0 showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 - call DewfordTown_EventScript_1A02EF + call Common_EventScript_StopBrineysBoatMusic applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E405 waitmovement 0 showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 @@ -156,11 +156,11 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E402 waitmovement 0 hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN - call DewfordTown_EventScript_1A02E7 + call Common_EventScript_PlayBrineysBoatMusic applymovement 4, DewfordTown_Movement_14E356 applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E356 waitmovement 0 - call DewfordTown_EventScript_1A02EF + call Common_EventScript_StopBrineysBoatMusic showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E409 waitmovement 0 diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index ee08ccbde..30f7b2b6d 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -105,7 +105,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 call DewfordTown_Gym_EventScript_153117 message DewfordTown_Gym_Text_1752BB waitmessage - call DewfordTown_Gym_EventScript_1A02C5 + call Common_EventScript_PlayGymBadgeFanfare msgbox DewfordTown_Gym_Text_1752E6, MSGBOX_DEFAULT setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET @@ -120,7 +120,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 giveitem ITEM_TM08_BULK_UP compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Gym_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull msgbox DewfordTown_Gym_Text_1753BF, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM08 release diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 39c3c82dc..cfed2c8b1 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D msgbox DewfordTown_Hall_Text_175E13, MSGBOX_DEFAULT giveitem ITEM_TM36_SLUDGE_BOMB compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Hall_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM36 release end diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 9e20d9622..c49486ddd 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5 .byte 0 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB - call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather end EverGrandeCity_EventScript_14D4E5:: @ 814D4E5 diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index ed79272f3..f8b990423 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -24,7 +24,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA msgbox FallarborTown_House1_Text_1778C4, MSGBOX_DEFAULT giveitem ITEM_TM27_RETURN compare VAR_RESULT, 0 - goto_if_eq FallarborTown_House1_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_1A067F setflag FLAG_RECEIVED_TM27 diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index ab94d7e19..5501546d1 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -25,7 +25,7 @@ FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 FortreeCity_Gym_EventScript_157F15:: @ 8157F15 message FortreeCity_Gym_Text_185E48 waitmessage - call FortreeCity_Gym_EventScript_1A02C5 + call Common_EventScript_PlayGymBadgeFanfare msgbox FortreeCity_Gym_Text_185E73, MSGBOX_DEFAULT setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET @@ -37,7 +37,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E giveitem ITEM_TM40_AERIAL_ACE compare VAR_RESULT, 0 - goto_if_eq FortreeCity_Gym_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull msgbox FortreeCity_Gym_Text_185F4A, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 release diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 0284e8201..815c98f60 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -21,7 +21,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 msgbox FortreeCity_House2_Text_1864C6, MSGBOX_DEFAULT giveitem ITEM_TM10_HIDDEN_POWER compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM10 msgbox FortreeCity_House2_Text_18652F, MSGBOX_DEFAULT release diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 2ae998d40..3e3d0948e 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -33,7 +33,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 msgbox FortreeCity_House4_Text_186881, MSGBOX_DEFAULT giveitem ITEM_MENTAL_HERB compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House4_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MENTAL_HERB releaseall end diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 913c233c3..cc0707fc5 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -68,7 +68,7 @@ LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 message LavaridgeTown_Gym_1F_Text_176A62 waitmessage - call LavaridgeTown_Gym_1F_EventScript_1A02C5 + call Common_EventScript_PlayGymBadgeFanfare msgbox LavaridgeTown_Gym_1F_Text_176A8C, MSGBOX_DEFAULT setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag FLAG_BADGE04_GET @@ -85,7 +85,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 giveitem ITEM_TM50_OVERHEAT compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull msgbox LavaridgeTown_Gym_1F_Text_176B8F, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM50 release diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index 22a0a7e80..2791885d7 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 msgbox LavaridgeTown_HerbShop_Text_1761A2, MSGBOX_DEFAULT giveitem ITEM_CHARCOAL compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CHARCOAL release end diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 6667ecd5f..38fbd3472 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE - call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather call Common_EventScript_SetupEvilTeamGfxIds call Common_EventScript_SetupRivalGfxId end @@ -67,7 +67,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 addvar VAR_RESULT, ITEM_CHERI_BERRY giveitem VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE msgbox LilycoveCity_Text_1C5B1D, MSGBOX_DEFAULT release diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index f1222843f..1b48e4b4d 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -26,7 +26,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD message LilycoveCity_CoveLilyMotel_2F_Text_18708F waitmessage - call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5 + call Common_EventScript_PlayGymBadgeFanfare special ScrSpecial_ShowDiploma waitstate release diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 704da6693..ae37152fa 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 msgbox LilycoveCity_House2_Text_18B83C, MSGBOX_DEFAULT giveitem ITEM_TM44_REST compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_House2_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM44 msgbox LilycoveCity_House2_Text_18B883, MSGBOX_DEFAULT release diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index dba71e658..8c6d9a72b 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -127,7 +127,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C end LilycoveCity_LilycoveMuseum_2F_EventScript_158783:: @ 8158783 - call LilycoveCity_LilycoveMuseum_2F_EventScript_1A02B8 + call Common_EventScript_NoRoomForDecor msgbox LilycoveCity_LilycoveMuseum_2F_Text_188166, MSGBOX_DEFAULT closemessage releaseall diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/text.inc b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc index a2dce3b4e..8ef358560 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/text.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc @@ -28,7 +28,7 @@ LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A .string "Record your progress with SAVE.\p" .string "The remaining pages are blank...$" -UnknownString_817303D: @ 817303D +Text_LookCloserAtMap: @ 817303D .string "{PLAYER} took a closer look at the\n" .string "HOENN region map.$" diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 712785396..efbb52755 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -300,7 +300,7 @@ MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, MSGBOX_DEFAULT giveitem ITEM_TM24_THUNDERBOLT compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM24 msgbox MauvilleCity_Text_166488, MSGBOX_DEFAULT release diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index fccbee66f..3e439332f 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -206,7 +206,7 @@ MauvilleCity_GameCorner_EventScript_156CF4:: @ 8156CF4 end MauvilleCity_GameCorner_EventScript_156D02:: @ 8156D02 - call MauvilleCity_GameCorner_EventScript_1A02B8 + call Common_EventScript_NoRoomForDecor goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -368,7 +368,7 @@ MauvilleCity_GameCorner_EventScript_156F5E:: @ 8156F5E end MauvilleCity_GameCorner_EventScript_156F6C:: @ 8156F6C - call MauvilleCity_GameCorner_EventScript_1A02A5 + call Common_EventScript_BagIsFull goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -433,7 +433,7 @@ MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F end MauvilleCity_GameCorner_EventScript_157059:: @ 8157059 - call MauvilleCity_GameCorner_EventScript_1A02B8 + call Common_EventScript_NoRoomForDecor msgbox MauvilleCity_GameCorner_Text_181F97, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index a4692820a..f7af8e1d0 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -77,7 +77,7 @@ MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB message MauvilleCity_Gym_Text_180DAF waitmessage - call MauvilleCity_Gym_EventScript_1A02C5 + call Common_EventScript_PlayGymBadgeFanfare msgbox MauvilleCity_Gym_Text_180DDA, MSGBOX_DEFAULT setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET @@ -95,7 +95,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB MauvilleCity_Gym_EventScript_15661D:: @ 815661D giveitem ITEM_TM34_SHOCK_WAVE compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_Gym_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull msgbox MauvilleCity_Gym_Text_180E76, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM34 release diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index ccbed407a..470c95630 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -7,7 +7,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather end MossdeepCity_EventScript_14CFAE:: @ 814CFAE @@ -74,7 +74,7 @@ MossdeepCity_EventScript_14D027:: @ 814D027 msgbox MossdeepCity_Text_169117, MSGBOX_DEFAULT giveitem ITEM_KINGS_ROCK compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_KINGS_ROCK release end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 77a2080d2..bc86b3ead 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -54,7 +54,7 @@ MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B MossdeepCity_Gym_EventScript_15A594:: @ 815A594 message MossdeepCity_Gym_Text_18D0F9 waitmessage - call MossdeepCity_Gym_EventScript_1A02C5 + call Common_EventScript_PlayGymBadgeFanfare msgbox MossdeepCity_Gym_Text_18D128, MSGBOX_DEFAULT setflag FLAG_DEFEATED_MOSSDEEP_GYM setflag FLAG_BADGE07_GET @@ -69,7 +69,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 giveitem ITEM_TM04_CALM_MIND compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_Gym_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull msgbox MossdeepCity_Gym_Text_18D1CF, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 release diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 439d74035..02e1a8660 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -36,7 +36,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, MSGBOX_DEFAULT giveitem ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, MSGBOX_DEFAULT release diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index e360c6cd2..24ae13050 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -35,7 +35,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95 end MtChimney_EventScript_15CFF3:: @ 815CFF3 - msgbox MtChimney_Text_1A0CC2, MSGBOX_DEFAULT + msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox 0, 0 release end diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index a456033fc..8c2757f3a 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -8,7 +8,7 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 msgbox MtPyre_1F_Text_196151, MSGBOX_DEFAULT giveitem ITEM_CLEANSE_TAG compare VAR_RESULT, 0 - goto_if_eq MtPyre_1F_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CLEANSE_TAG release end diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index d8643b228..ba3a1868e 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -85,7 +85,7 @@ OldaleTown_EventScript_14DE79:: @ 814DE79 end OldaleTown_EventScript_14DE83:: @ 814DE83 - msgbox OldaleTown_Text_1A0CC2, MSGBOX_DEFAULT + msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT fadedefaultbgm release end diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index f9b2a8460..8e20d83a6 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -43,7 +43,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, MSGBOX_DEFAULT giveitem ITEM_TM27_RETURN compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_House2_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_179283, MSGBOX_DEFAULT @@ -59,7 +59,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, MSGBOX_DEFAULT giveitem ITEM_TM21_FRUSTRATION compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_House2_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_179283, MSGBOX_DEFAULT diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 4c12ed21e..7c02a67f7 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -43,7 +43,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 clearflag FLAG_SPECIAL_FLAG_0 setvar VAR_PETALBURG_STATE, 3 fadedefaultbgm - clearflag FLAG_SPECIAL_FLAG_1 + clearflag FLAG_DONT_TRANSITION_MUSIC special LoadPlayerParty setvar VAR_PETALBURG_GYM_STATE, 1 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 452415dce..90c24740d 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -186,7 +186,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 call_if_eq PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, MSGBOX_DEFAULT closemessage - setflag FLAG_SPECIAL_FLAG_1 + setflag FLAG_DONT_TRANSITION_MUSIC playbgm MUS_TSURETEK, FALSE compare VAR_0x8008, 0 call_if_eq PetalburgCity_Gym_EventScript_154835 @@ -375,7 +375,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 giveitem ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 release end @@ -385,7 +385,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 trainerbattle_no_intro TRAINER_NORMAN, PetalburgCity_Gym_Text_17A77A message PetalburgCity_Gym_Text_17A7DD waitmessage - call PetalburgCity_Gym_EventScript_1A02C5 + call Common_EventScript_PlayGymBadgeFanfare msgbox PetalburgCity_Gym_Text_17A805, MSGBOX_DEFAULT setflag FLAG_DEFEATED_PETALBURG_GYM setvar VAR_PETALBURG_GYM_STATE, 7 @@ -404,7 +404,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C giveitem ITEM_TM42_FACADE compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM42 msgbox PetalburgCity_Gym_Text_17A8CF, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_17A976, MSGBOX_DEFAULT diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 1d984675c..4762d29c8 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -245,7 +245,7 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC msgbox PetalburgWoods_Text_19549E, MSGBOX_DEFAULT giveitem ITEM_MIRACLE_SEED compare VAR_RESULT, 0 - goto_if_eq PetalburgWoods_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MIRACLE_SEED release end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index b90029c21..d00f4141c 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -33,7 +33,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 msgbox Route104_Text_1C55B9, MSGBOX_DEFAULT giveitem ITEM_CHESTO_BERRY compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 msgbox Route104_Text_1C5665, MSGBOX_DEFAULT release @@ -51,7 +51,7 @@ Route104_EventScript_14EF09:: @ 814EF09 msgbox Route104_Text_16DD91, MSGBOX_DEFAULT giveitem ITEM_WHITE_HERB compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WHITE_HERB release end @@ -104,7 +104,7 @@ Route104_EventScript_14EF93:: @ 814EF93 msgbox Route104_Text_16DC5F, MSGBOX_DEFAULT giveitem ITEM_TM09_BULLET_SEED compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM09 release end @@ -127,13 +127,13 @@ Route104_EventScript_14EFD5:: @ 814EFD5 applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_14F162 waitmovement 0 hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 - call Route104_EventScript_1A02E7 + call Common_EventScript_PlayBrineysBoatMusic applymovement 7, Route104_Movement_14F09F applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_14F09F waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_14F166 waitmovement 0 - call Route104_EventScript_1A02EF + call Common_EventScript_StopBrineysBoatMusic showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_14F168 waitmovement 0 @@ -145,7 +145,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD - call Route104_EventScript_1A02EF + call Common_EventScript_StopBrineysBoatMusic setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 copyvar VAR_BRINEY_LOCATION, VAR_0x8008 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index f63bee4af..734ff2180 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -91,7 +91,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA addvar VAR_RESULT, ITEM_CHERI_BERRY giveitem VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, MSGBOX_DEFAULT release diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index d4e300a35..a0099f5ec 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -34,11 +34,11 @@ Route109_EventScript_14F538:: @ 814F538 Route109_EventScript_14F548:: @ 814F548 hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 - call Route109_EventScript_1A02E7 + call Common_EventScript_PlayBrineysBoatMusic applymovement 1, Route109_Movement_14F5BF applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F5BF waitmovement 0 - call Route109_EventScript_1A02EF + call Common_EventScript_StopBrineysBoatMusic showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F670 waitmovement 0 @@ -331,7 +331,7 @@ Route109_EventScript_14F725:: @ 814F725 msgbox Route109_Text_16E433, MSGBOX_DEFAULT giveitem ITEM_SOFT_SAND compare VAR_RESULT, 0 - goto_if_eq Route109_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 43cf18088..436152b3e 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -70,7 +70,7 @@ Route109_SeashoreHouse_EventScript_160E9E:: @ 8160E9E end Route109_SeashoreHouse_EventScript_160EAB:: @ 8160EAB - msgbox Route109_SeashoreHouse_Text_1A0CC2, MSGBOX_DEFAULT + msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox 0, 0 release end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 2bc94ee14..683637648 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -190,13 +190,13 @@ Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E return Route110_TrickHouseEnd_EventScript_161C4E:: @ 8161C4E - call Route110_TrickHouseEnd_EventScript_1A02A5 + call Common_EventScript_BagIsFull msgbox Route110_TrickHouseEnd_Text_19C92E, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_161C61:: @ 8161C61 - call Route110_TrickHouseEnd_EventScript_1A02B8 + call Common_EventScript_NoRoomForDecor msgbox Route110_TrickHouseEnd_Text_19C7D7, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 75e2b22ec..794237957 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -365,7 +365,7 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT releaseall end @@ -375,7 +375,7 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT releaseall end @@ -385,7 +385,7 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT releaseall end @@ -395,7 +395,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT releaseall end @@ -405,7 +405,7 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT releaseall end @@ -415,7 +415,7 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT releaseall end @@ -425,7 +425,7 @@ Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT releaseall end @@ -450,7 +450,7 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_1A02B8 + call_if_eq Common_EventScript_NoRoomForDecor msgbox Route110_TrickHouseEntrance_Text_19C18D, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index dcf0b8f32..163fe11da 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -123,7 +123,7 @@ Route111_EventScript_1500C5:: @ 81500C5 msgbox Route111_Text_1C56F0, MSGBOX_DEFAULT giveitem ITEM_RAZZ_BERRY compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 special GetPlayerBigGuyGirlString msgbox Route111_Text_1C5781, MSGBOX_DEFAULT diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index c3860300b..1c45aad70 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -19,7 +19,7 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC msgbox Route111_OldLadysRestStop_Text_192423, MSGBOX_DEFAULT closemessage - call Route111_OldLadysRestStop_EventScript_1A02CA + call Common_EventScript_OutOfCenterPartyHeal msgbox Route111_OldLadysRestStop_Text_19244D, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index b05451651..16d745166 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A msgbox Route111_WinstrateFamilysHouse_Text_19208A, MSGBOX_DEFAULT giveitem ITEM_MACHO_BRACE compare VAR_RESULT, 0 - goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MACHO_BRACE goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 121da2bd1..ec30e004c 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -222,13 +222,13 @@ Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 return Route113_GlassWorkshop_EventScript_1638B4:: @ 81638B4 - call Route113_GlassWorkshop_EventScript_1A02A5 + call Common_EventScript_BagIsFull msgbox Route113_GlassWorkshop_Text_19EA06, MSGBOX_DEFAULT release end Route113_GlassWorkshop_EventScript_1638C3:: @ 81638C3 - call Route113_GlassWorkshop_EventScript_1A02B8 + call Common_EventScript_NoRoomForDecor msgbox Route113_GlassWorkshop_Text_19EA64, MSGBOX_DEFAULT release end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index c31ddeb83..266693259 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -12,7 +12,7 @@ Route114_EventScript_150733:: @ 8150733 addvar VAR_RESULT, 133 giveitem VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route114_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 msgbox Route114_Text_1C5861, MSGBOX_DEFAULT release @@ -30,7 +30,7 @@ Route114_EventScript_150782:: @ 8150782 msgbox Route114_Text_170154, MSGBOX_DEFAULT giveitem ITEM_TM05_ROAR compare VAR_RESULT, 0 - goto_if_eq Route114_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1701C5, MSGBOX_DEFAULT release diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index 45ac7d969..de16363c8 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 msgbox Route114_FossilManiacsHouse_Text_1925E1, MSGBOX_DEFAULT giveitem ITEM_TM28_DIG compare VAR_RESULT, 0 - goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM28 release end diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 440527682..e2dd975cb 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -18,7 +18,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 givedecoration DECOR_SEEDOT_DOLL .endif compare VAR_RESULT, 0 - goto_if_eq Route114_LanettesHouse_EventScript_1A02AE + goto_if_eq Common_EventScript_ShowNoRoomForDecor setflag FLAG_RECEIVED_DOLL_LANETTE release end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 894f05286..c97e25e29 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -40,7 +40,7 @@ Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83 lockall msgbox Route119_WeatherInstitute_1F_Text_19EE8B, MSGBOX_DEFAULT closemessage - call Route119_WeatherInstitute_1F_EventScript_1A02CA + call Common_EventScript_OutOfCenterPartyHeal releaseall end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 56a0c2930..b0949e9d8 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -157,7 +157,7 @@ Route120_EventScript_151808:: @ 8151808 Route120_EventScript_151813:: @ 8151813 giveitem VAR_0x8004 compare VAR_RESULT, 0 - goto_if_eq Route120_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 msgbox Route120_Text_1C5A0B, MSGBOX_DEFAULT release diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 4408f9061..557d7099a 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -17,7 +17,7 @@ Route123_EventScript_151C5D:: @ 8151C5D msgbox Route123_Text_171DC2, MSGBOX_DEFAULT giveitem ITEM_TM19_GIGA_DRAIN compare VAR_RESULT, 0 - goto_if_eq Route123_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM19 msgbox Route123_Text_171E34, MSGBOX_DEFAULT release diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 06334c76b..fc96eda9e 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar VAR_RESULT, 133 giveitem VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER msgbox Route123_BerryMastersHouse_Text_1C5C66, MSGBOX_DEFAULT random 10 @@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar VAR_RESULT, 133 giveitem VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull msgbox Route123_BerryMastersHouse_Text_1C5C83, MSGBOX_DEFAULT release end @@ -78,7 +78,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 addvar VAR_RESULT, ITEM_CHERI_BERRY giveitem VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull goto Route123_BerryMastersHouse_EventScript_163C1D release end @@ -88,7 +88,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT giveitem ITEM_SPELON_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SPELON_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end @@ -98,7 +98,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT giveitem ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PAMTRE_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end @@ -108,7 +108,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT giveitem ITEM_WATMEL_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WATMEL_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end @@ -118,7 +118,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT giveitem ITEM_DURIN_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_DURIN_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end @@ -128,7 +128,7 @@ Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT giveitem ITEM_BELUE_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_BELUE_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 73e2379ed..cd713ce88 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 8151DDF .byte 0 Route124_MapScript1_151DE5:: @ 8151DE5 - call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather end Route124_EventScript_151DEF:: @ 8151DEF diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index cd0dd9bbe..39bc4527d 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -3,7 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather end Route125_EventScript_151F2E:: @ 8151F2E diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 847d842ad..c3c598777 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -3,7 +3,7 @@ Route126_MapScripts:: @ 8151FFE .byte 0 Route126_MapScript1_152004:: @ 8152004 - call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather end Route126_EventScript_15200E:: @ 815200E diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 11d720bb9..db0e4cc99 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -3,7 +3,7 @@ Route127_MapScripts:: @ 815206A .byte 0 Route127_MapScript1_152070:: @ 8152070 - call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather end Route127_EventScript_15207A:: @ 815207A diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 8a8e18747..add8883cd 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -4,7 +4,7 @@ Route128_MapScripts:: @ 815211B .byte 0 Route128_MapScript1_152126:: @ 8152126 - call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather call Common_EventScript_SetupEvilTeamGfxIds end diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index ccd704108..0a2cd2117 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -159,7 +159,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, MSGBOX_DEFAULT giveitem ITEM_EXP_SHARE compare VAR_RESULT, 0 - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_1835B3, MSGBOX_DEFAULT closemessage diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index 2f46e710a..223438560 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 msgbox RustboroCity_Flat2_2F_Text_185461, MSGBOX_DEFAULT giveitem ITEM_PREMIER_BALL compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO release end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index c0d910b4a..831613f71 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -11,7 +11,7 @@ RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 RustboroCity_Gym_EventScript_1578FE:: @ 81578FE message RustboroCity_Gym_Text_1840AB waitmessage - call RustboroCity_Gym_EventScript_1A02C5 + call Common_EventScript_PlayGymBadgeFanfare msgbox RustboroCity_Gym_Text_1840D5, MSGBOX_DEFAULT setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET @@ -27,7 +27,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE RustboroCity_Gym_EventScript_15793C:: @ 815793C giveitem ITEM_TM39_ROCK_TOMB compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Gym_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM39 msgbox RustboroCity_Gym_Text_184170, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index f5da355e2..dd266e21f 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -85,7 +85,7 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE msgbox RustboroCity_PokemonSchool_Text_1846A2, MSGBOX_DEFAULT giveitem ITEM_QUICK_CLAW compare VAR_RESULT, 0 - goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index d4c10ad31..99431543b 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -8,7 +8,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 msgbox SSTidalRooms_Text_199B65, MSGBOX_DEFAULT giveitem ITEM_TM49_SNATCH compare VAR_RESULT, 0 - goto_if_eq SSTidalRooms_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM49 msgbox SSTidalRooms_Text_199C1A, MSGBOX_DEFAULT release @@ -23,7 +23,7 @@ SSTidalRooms_EventScript_15FF47:: @ 815FF47 lockall msgbox SSTidalRooms_Text_19956B, MSGBOX_DEFAULT closemessage - call SSTidalRooms_EventScript_1A02CA + call Common_EventScript_OutOfCenterPartyHeal call SSTidalRooms_EventScript_15FD64 releaseall end diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index ce4c765e8..025c33550 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -39,7 +39,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 removeitem ITEM_SHOAL_SHELL, 4 giveitem ITEM_SHELL_BELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 96e876930..e98e8d107 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -64,7 +64,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 @@ -81,7 +81,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 @@ -93,7 +93,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 @@ -105,7 +105,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 @@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_1 @@ -134,7 +134,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_2 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 9de2557ca..b6ae3388c 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -19,7 +19,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 18, 2, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_4 @@ -38,7 +38,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F msgbox ShoalCave_LowTideLowerRoom_Text_198200, MSGBOX_DEFAULT giveitem ITEM_FOCUS_BAND compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FOCUS_BAND release end diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index e911e838e..1a13594ed 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -19,7 +19,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_3 diff --git a/data/maps/SlateportCity_ContestHall/scripts.inc b/data/maps/SlateportCity_ContestHall/scripts.inc index 1fb6f046d..851078443 100644 --- a/data/maps/SlateportCity_ContestHall/scripts.inc +++ b/data/maps/SlateportCity_ContestHall/scripts.inc @@ -16,7 +16,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E msgbox SlateportCity_ContestHall_Text_17CCE2, MSGBOX_DEFAULT giveitem ITEM_TM41_TORMENT compare VAR_RESULT, 0 - goto_if_eq SlateportCity_ContestHall_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM41 msgbox SlateportCity_ContestHall_Text_17CE28, MSGBOX_DEFAULT release diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 07df5e087..a47ef248c 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -331,7 +331,7 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull removeitem ITEM_SCANNER msgbox SlateportCity_Harbor_Text_18046B, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER @@ -344,7 +344,7 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull removeitem ITEM_SCANNER msgbox SlateportCity_Harbor_Text_18046B, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index d2f43976f..04a86af1f 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -203,7 +203,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A msgbox SlateportCity_PokemonFanClub_Text_17DF57, MSGBOX_DEFAULT giveitem ITEM_SOOTHE_BELL compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SOOTHE_BELL release end diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 8b13ebefe..a438e2d22 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -37,7 +37,7 @@ SootopolisCity_MapScript1_14D10D:: @ 814D10D end SootopolisCity_EventScript_14D123:: @ 814D123 - call SootopolisCity_EventScript_1A02C1 + call Common_EventScript_SetLegendaryWeather setobjectxyperm 1, 29, 19 setobjectxyperm 2, 33, 19 compare VAR_SOOTOPOLIS_STATE, 1 @@ -93,7 +93,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F addvar VAR_RESULT, ITEM_CHERI_BERRY giveitem VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS msgbox SootopolisCity_Text_1C64D0, MSGBOX_DEFAULT random 2 @@ -106,7 +106,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F SootopolisCity_EventScript_14D1FF:: @ 814D1FF giveitem ITEM_FIGY_BERRY compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Text_1C650B, MSGBOX_DEFAULT release end @@ -114,7 +114,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF SootopolisCity_EventScript_14D220:: @ 814D220 giveitem ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Text_1C650B, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 7d82e96fa..7013df88d 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -96,7 +96,7 @@ SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D message SootopolisCity_Gym_1F_Text_18F342 waitmessage - call SootopolisCity_Gym_1F_EventScript_1A02C5 + call Common_EventScript_PlayGymBadgeFanfare msgbox SootopolisCity_Gym_1F_Text_18F36B, MSGBOX_DEFAULT setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET @@ -108,7 +108,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 giveitem ITEM_TM03_WATER_PULSE compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Gym_1F_Text_18F466, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 release diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index 74a7778cf..6d3173638 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 bufferdecorationname 1, DECOR_WAILMER_DOLL - msgbox SootopolisCity_House6_Text_1A0CEF, MSGBOX_DEFAULT + msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT msgbox SootopolisCity_House6_Text_18FF28, MSGBOX_DEFAULT release end diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc index 1f658a4c6..8eb1c0bcd 100644 --- a/data/maps/VerdanturfTown_ContestLobby/scripts.inc +++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc @@ -105,7 +105,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 msgbox VerdanturfTown_ContestLobby_Text_177DEC, MSGBOX_DEFAULT giveitem ITEM_TM45_ATTRACT compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM45 release end diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 0dced2de8..5cd27302a 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -126,7 +126,7 @@ EventScript_PickUpItem: @ 819FF52 EventScript_NoRoomToPickUpItem: @ 819FF65 msgbox Message_ObtainedItem - msgbox Message_BagFull + msgbox Text_TooBadBagIsFull setvar VAR_RESULT, FALSE return @@ -155,7 +155,7 @@ EventScript_PickUpHiddenItem: EventScript_NoRoomToPickUpHiddenItem: msgbox Message_FoundOneItem - msgbox Message_BagFull + msgbox Text_TooBadBagIsFull setvar VAR_RESULT, FALSE releaseall end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 63cfd18dc..2b746dbe0 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -275,7 +275,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D msgbox LittlerootTown_BrendansHouse_1F_Text_172782, MSGBOX_DEFAULT giveitem ITEM_AMULET_COIN compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, MSGBOX_DEFAULT setflag FLAG_RECEIVED_AMULET_COIN release @@ -293,7 +293,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C80:: @ 81B6C80 LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A:: @ 81B6C8A closemessage - call LittlerootTown_BrendansHouse_1F_EventScript_1A02CA + call Common_EventScript_OutOfCenterPartyHeal incrementgamestat GAME_STAT_RESTED_AT_HOME msgbox LittlerootTown_BrendansHouse_1F_Text_17276B, MSGBOX_DEFAULT release diff --git a/include/constants/flags.h b/include/constants/flags.h index 158a74491..0fadd7d93 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -901,6 +901,6 @@ // SPECIAL FLAGS (unknown purpose) #define FLAG_SPECIAL_FLAG_0 0x4000 -#define FLAG_SPECIAL_FLAG_1 0x4001 +#define FLAG_DONT_TRANSITION_MUSIC 0x4001 #endif // GUARD_CONSTANTS_FLAGS_H diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 081d506ab..1775801ed 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -59,7 +59,7 @@ extern u8 ClosedSootopolisDoorScript[]; extern u8 gUnknown_081A4363[]; extern u8 gUnknown_081C346A[]; extern u8 gUnknown_081616E1[]; -extern u8 Event_WorldMap[]; +extern u8 EventScript_RegionMap[]; extern u8 S_RunningShoesManual[]; extern u8 PictureBookShelfScript[]; extern u8 BookshelfScript[]; @@ -465,7 +465,7 @@ static u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 metatile if (MetatileBehavior_IsTrickHousePuzzleDoor(metatileBehavior) == TRUE) return gUnknown_081616E1; if (MetatileBehavior_IsRegionMap(metatileBehavior) == TRUE) - return Event_WorldMap; + return EventScript_RegionMap; if (MetatileBehavior_IsRunningShoesManual(metatileBehavior) == TRUE) return S_RunningShoesManual; if (MetatileBehavior_IsPictureBookShelf(metatileBehavior) == TRUE) diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 78c425bc5..343830f25 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -338,7 +338,7 @@ void Task_HandlePorthole(u8 taskId) } break; case EXIT_PORTHOLE: // exit porthole. - FlagClear(FLAG_SPECIAL_FLAG_1); + FlagClear(FLAG_DONT_TRANSITION_MUSIC); FlagClear(FLAG_SPECIAL_FLAG_0); copy_saved_warp2_bank_and_enter_x_to_warp1(0); sp13E_warp_to_last_warp(); @@ -375,7 +375,7 @@ void sub_80C791C(void) void sub_80C7958(void) { FlagSet(FLAG_SYS_CRUISE_MODE); - FlagSet(FLAG_SPECIAL_FLAG_1); + FlagSet(FLAG_DONT_TRANSITION_MUSIC); FlagSet(FLAG_SPECIAL_FLAG_0); saved_warp2_set(0, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1); sub_80C7754(); diff --git a/src/overworld.c b/src/overworld.c index 40525db5e..f46396c25 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -926,7 +926,7 @@ void Overworld_ClearSavedMusic(void) void sub_8053F0C(void) { - if (FlagGet(FLAG_SPECIAL_FLAG_1) != TRUE) + if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE) { u16 newMusic = GetWarpDestinationMusic(); u16 currentMusic = GetCurrentMapMusic(); @@ -973,7 +973,7 @@ u8 GetMapMusicFadeoutSpeed(void) void TryFadeOutOldMapMusic(void) { u16 music = GetWarpDestinationMusic(); - if (FlagGet(FLAG_SPECIAL_FLAG_1) != TRUE && music != GetCurrentMapMusic()) + if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE && music != GetCurrentMapMusic()) { u8 speed = GetMapMusicFadeoutSpeed(); FadeOutMapMusic(speed); |