diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-29 15:35:10 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-29 15:35:25 -0400 |
| commit | 6f0a4b22152bcefac4bcd5f2532d8452583973d0 (patch) | |
| tree | ab26c0a41eb010d12d96e15b1982b707f337041b | |
| parent | 788dc307d403794f5e6eda65ebcc5d864827145d (diff) | |
Use fadescreen constants, sync common scripts after pc.inc
58 files changed, 221 insertions, 270 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index e15639067..48eb569ad 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -18,6 +18,7 @@ #include "constants/pokemon.h" #include "constants/berry.h" #include "constants/script_menu.h" +#include "constants/field_weather.h" .include "include/macros.inc" .include "include/macros/event.inc" .include "constants/constants.inc" @@ -805,70 +806,32 @@ EventScript_SetBrineyLocation_Route109:: @ 819FD55 .include "data/scripts/record_mix.inc" .include "data/scripts/pc.inc" -FallarborTown_EventScript_1A00E1:: @ 81A00E1 -FortreeCity_EventScript_1A00E1:: @ 81A00E1 -LavaridgeTown_EventScript_1A00E1:: @ 81A00E1 -MauvilleCity_EventScript_1A00E1:: @ 81A00E1 -MossdeepCity_EventScript_1A00E1:: @ 81A00E1 -OldaleTown_EventScript_1A00E1:: @ 81A00E1 -PetalburgCity_EventScript_1A00E1:: @ 81A00E1 -RustboroCity_EventScript_1A00E1:: @ 81A00E1 -SlateportCity_EventScript_1A00E1:: @ 81A00E1 -SootopolisCity_EventScript_1A00E1:: @ 81A00E1 -VerdanturfTown_EventScript_1A00E1:: @ 81A00E1 - msgbox PetalburgCity_Text_1A0D41, MSGBOX_SIGN - end - -DewfordTown_EventScript_1A00EA:: @ 81A00EA -EverGrandeCity_EventScript_1A00EA:: @ 81A00EA -FallarborTown_EventScript_1A00EA:: @ 81A00EA -FortreeCity_EventScript_1A00EA:: @ 81A00EA -LavaridgeTown_EventScript_1A00EA:: @ 81A00EA -LilycoveCity_EventScript_1A00EA:: @ 81A00EA -MauvilleCity_EventScript_1A00EA:: @ 81A00EA -MossdeepCity_EventScript_1A00EA:: @ 81A00EA -OldaleTown_EventScript_1A00EA:: @ 81A00EA -PacifidlogTown_EventScript_1A00EA:: @ 81A00EA -PetalburgCity_EventScript_1A00EA:: @ 81A00EA -RustboroCity_EventScript_1A00EA:: @ 81A00EA -SlateportCity_EventScript_1A00EA:: @ 81A00EA -SootopolisCity_EventScript_1A00EA:: @ 81A00EA -VerdanturfTown_EventScript_1A00EA:: @ 81A00EA - msgbox PetalburgCity_Text_1A0D75, MSGBOX_SIGN - end - -BattleTower_Lobby_EventScript_1A00F3:: @ 81A00F3 -DewfordTown_EventScript_1A00F3:: @ 81A00F3 -FallarborTown_ContestLobby_EventScript_1A00F3:: @ 81A00F3 -MauvilleCity_PokemonCenter_1F_EventScript_1A00F3:: @ 81A00F3 -PetalburgCity_PokemonCenter_1F_EventScript_1A00F3:: @ 81A00F3 -Route111_EventScript_1A00F3:: @ 81A00F3 -Route123_BerryMastersHouse_EventScript_1A00F3:: @ 81A00F3 -SlateportCity_OceanicMuseum_1F_EventScript_1A00F3:: @ 81A00F3 -SlateportCity_PokemonFanClub_EventScript_1A00F3:: @ 81A00F3 - fadescreen 1 - special sub_80E60D8 - fadescreen 0 - return - -DewfordTown_Gym_EventScript_1A00FB:: @ 81A00FB -LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB -MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB -RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB +Common_EventScript_PokemartSign:: @ 81A00E1 + msgbox Text_PokemartSign, MSGBOX_SIGN + end + +Common_EventScript_PokemonCenterSign:: @ 81A00EA + msgbox Text_PokemonCenterSign, MSGBOX_SIGN + end + +Common_EventScript_ShowEasyChatScreen:: @ 81A00F3 + fadescreen FADE_TO_BLACK + special ShowEasyChatScreen + fadescreen FADE_FROM_BLACK + return + +Common_EventScript_ReadyPetalburgGymForBattle:: @ 81A00FB clearflag FLAG_HIDE_PETALBURG_GYM_GUIDE setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return -DewfordTown_EventScript_1A0102:: @ 81A0102 -DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 +Common_EventScript_BufferTrendyPhrase:: @ 81A0102 dotimebasedevents setvar VAR_0x8004, 0 special BufferTrendyPhraseString return -DewfordTown_EventScript_1A010C:: @ 81A010C -Route104_MrBrineysHouse_EventScript_1A010C:: @ 81A010C -Route109_EventScript_1A010C:: @ 81A010C +EventScript_BackupMrBrineyLocation:: @ 81A010C copyvar VAR_0x8008, VAR_BRINEY_LOCATION setvar VAR_BRINEY_LOCATION, 0 return @@ -1167,17 +1130,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_1A02CA:: @ 81A02CA Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA SSTidalRooms_EventScript_1A02CA:: @ 81A02CA - fadescreen 1 + fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare special ScrSpecial_HealPlayerParty - fadescreen 0 + fadescreen FADE_FROM_BLACK return Event_WorldMap:: @ 81A02D6 lockall msgbox UnknownString_817303D, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special FieldShowRegionMap waitstate releaseall @@ -1591,7 +1554,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1A0678:: @ 81A0678 MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678 SlateportCity_House1_EventScript_1A0678:: @ 81A0678 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChangePokemonNickname waitstate return @@ -1870,12 +1833,12 @@ Message_TransferredToPC: @ 81A0D1F .string "{STR_VAR_2} wurde auf den PC\n" .string "übertragen.$" -PetalburgCity_Text_1A0D41:: @ 81A0D41 +Text_PokemartSign:: @ 81A0D41 .string "“Ausgewählte Items für Ihren\n" .string "Gebrauch!”\l" .string "POKéMON-SUPERMARKT$" -PetalburgCity_Text_1A0D75:: @ 81A0D75 +Text_PokemonCenterSign:: @ 81A0D75 .string "“Erfrische deine müden Partner!”\n" .string "POKéMON-CENTER$" @@ -2043,7 +2006,7 @@ EventScript_1A14CA:: waitbuttonpress special sub_8081924 waitstate - fadescreen 1 + fadescreen FADE_TO_BLACK special sp0C8_whiteout_maybe waitstate end @@ -2570,10 +2533,10 @@ AskToMoveSecretBase: msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_1A2F3A - fadescreen 1 + fadescreen FADE_TO_BLACK special MoveSecretBase closemessage - fadescreen 0 + fadescreen FADE_FROM_BLACK msgbox UnknownString_81A3CC9, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_1A2F3A @@ -3182,7 +3145,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84 setvar VAR_0x8004, 5 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 1 - call SlateportCity_PokemonFanClub_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3237,7 +3200,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44 setvar VAR_0x8004, 5 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 - call SlateportCity_OceanicMuseum_1F_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3309,14 +3272,14 @@ SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A setvar VAR_0x8004, 7 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 - call SlateportCity_PokemonFanClub_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A852D, MSGBOX_DEFAULT setvar VAR_0x8006, 1 - call SlateportCity_PokemonFanClub_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -3361,7 +3324,7 @@ FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8 setvar VAR_0x8004, 11 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 - call FallarborTown_ContestLobby_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3382,7 +3345,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 setvar VAR_0x8004, 11 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 1 - call FallarborTown_ContestLobby_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -3464,7 +3427,7 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 msgbox BattleTower_Lobby_Text_1A79EB, MSGBOX_DEFAULT setvar VAR_0x8004, 12 copyvar VAR_0x8005, VAR_0x8009 - call BattleTower_Lobby_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/event_scripts.s b/data/event_scripts.s index 3d99e49df..ead3f2d25 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -18,6 +18,7 @@ #include "constants/pokemon.h" #include "constants/berry.h" #include "constants/script_menu.h" +#include "constants/field_weather.h" .include "include/macros.inc" .include "include/macros/event.inc" .include "constants/constants.inc" @@ -804,70 +805,32 @@ EventScript_SetBrineyLocation_Route109:: @ 819FD55 .include "data/scripts/record_mix.inc" .include "data/scripts/pc.inc" -FallarborTown_EventScript_1A00E1:: @ 81A00E1 -FortreeCity_EventScript_1A00E1:: @ 81A00E1 -LavaridgeTown_EventScript_1A00E1:: @ 81A00E1 -MauvilleCity_EventScript_1A00E1:: @ 81A00E1 -MossdeepCity_EventScript_1A00E1:: @ 81A00E1 -OldaleTown_EventScript_1A00E1:: @ 81A00E1 -PetalburgCity_EventScript_1A00E1:: @ 81A00E1 -RustboroCity_EventScript_1A00E1:: @ 81A00E1 -SlateportCity_EventScript_1A00E1:: @ 81A00E1 -SootopolisCity_EventScript_1A00E1:: @ 81A00E1 -VerdanturfTown_EventScript_1A00E1:: @ 81A00E1 - msgbox PetalburgCity_Text_1A0D41, MSGBOX_SIGN - end - -DewfordTown_EventScript_1A00EA:: @ 81A00EA -EverGrandeCity_EventScript_1A00EA:: @ 81A00EA -FallarborTown_EventScript_1A00EA:: @ 81A00EA -FortreeCity_EventScript_1A00EA:: @ 81A00EA -LavaridgeTown_EventScript_1A00EA:: @ 81A00EA -LilycoveCity_EventScript_1A00EA:: @ 81A00EA -MauvilleCity_EventScript_1A00EA:: @ 81A00EA -MossdeepCity_EventScript_1A00EA:: @ 81A00EA -OldaleTown_EventScript_1A00EA:: @ 81A00EA -PacifidlogTown_EventScript_1A00EA:: @ 81A00EA -PetalburgCity_EventScript_1A00EA:: @ 81A00EA -RustboroCity_EventScript_1A00EA:: @ 81A00EA -SlateportCity_EventScript_1A00EA:: @ 81A00EA -SootopolisCity_EventScript_1A00EA:: @ 81A00EA -VerdanturfTown_EventScript_1A00EA:: @ 81A00EA - msgbox PetalburgCity_Text_1A0D75, MSGBOX_SIGN - end - -BattleTower_Lobby_EventScript_1A00F3:: @ 81A00F3 -DewfordTown_EventScript_1A00F3:: @ 81A00F3 -FallarborTown_ContestLobby_EventScript_1A00F3:: @ 81A00F3 -MauvilleCity_PokemonCenter_1F_EventScript_1A00F3:: @ 81A00F3 -PetalburgCity_PokemonCenter_1F_EventScript_1A00F3:: @ 81A00F3 -Route111_EventScript_1A00F3:: @ 81A00F3 -Route123_BerryMastersHouse_EventScript_1A00F3:: @ 81A00F3 -SlateportCity_OceanicMuseum_1F_EventScript_1A00F3:: @ 81A00F3 -SlateportCity_PokemonFanClub_EventScript_1A00F3:: @ 81A00F3 - fadescreen 1 - special sub_80E60D8 - fadescreen 0 - return - -DewfordTown_Gym_EventScript_1A00FB:: @ 81A00FB -LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB -MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB -RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB +Common_EventScript_PokemartSign:: @ 81A00E1 + msgbox Text_PokemartSign, MSGBOX_SIGN + end + +Common_EventScript_PokemonCenterSign:: @ 81A00EA + msgbox Text_PokemonCenterSign, MSGBOX_SIGN + end + +Common_EventScript_ShowEasyChatScreen:: @ 81A00F3 + fadescreen FADE_TO_BLACK + special ShowEasyChatScreen + fadescreen FADE_FROM_BLACK + return + +Common_EventScript_ReadyPetalburgGymForBattle:: @ 81A00FB clearflag FLAG_HIDE_PETALBURG_GYM_GUIDE setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return -DewfordTown_EventScript_1A0102:: @ 81A0102 -DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 +Common_EventScript_BufferTrendyPhrase:: @ 81A0102 dotimebasedevents setvar VAR_0x8004, 0 special BufferTrendyPhraseString return -DewfordTown_EventScript_1A010C:: @ 81A010C -Route104_MrBrineysHouse_EventScript_1A010C:: @ 81A010C -Route109_EventScript_1A010C:: @ 81A010C +EventScript_BackupMrBrineyLocation:: @ 81A010C copyvar VAR_0x8008, VAR_BRINEY_LOCATION setvar VAR_BRINEY_LOCATION, 0 return @@ -1166,17 +1129,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_1A02CA:: @ 81A02CA Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA SSTidalRooms_EventScript_1A02CA:: @ 81A02CA - fadescreen 1 + fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare special ScrSpecial_HealPlayerParty - fadescreen 0 + fadescreen FADE_FROM_BLACK return Event_WorldMap:: @ 81A02D6 lockall msgbox UnknownString_817303D, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special FieldShowRegionMap waitstate releaseall @@ -1590,7 +1553,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1A0678:: @ 81A0678 MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678 SlateportCity_House1_EventScript_1A0678:: @ 81A0678 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChangePokemonNickname waitstate return @@ -1871,11 +1834,11 @@ Message_TransferredToPC: @ 81A0D1F .string "The {STR_VAR_2} was transferred\n" .string "to the PC.$" -PetalburgCity_Text_1A0D41:: @ 81A0D41 +Text_PokemartSign:: @ 81A0D41 .string "“Selected items for your convenience!”\n" .string "POKéMON MART$" -PetalburgCity_Text_1A0D75:: @ 81A0D75 +Text_PokemonCenterSign:: @ 81A0D75 .string "“Rejuvenate your tired partners!”\n" .string "POKéMON CENTER$" @@ -2038,7 +2001,7 @@ EventScript_1A14CA:: waitbuttonpress special sub_8081924 waitstate - fadescreen 1 + fadescreen FADE_TO_BLACK special sp0C8_whiteout_maybe waitstate end @@ -2554,10 +2517,10 @@ AskToMoveSecretBase: msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_1A2F3A - fadescreen 1 + fadescreen FADE_TO_BLACK special MoveSecretBase closemessage - fadescreen 0 + fadescreen FADE_FROM_BLACK msgbox UnknownString_81A3CC9, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_1A2F3A @@ -3155,7 +3118,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84 setvar VAR_0x8004, 5 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 1 - call SlateportCity_PokemonFanClub_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3210,7 +3173,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44 setvar VAR_0x8004, 5 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 - call SlateportCity_OceanicMuseum_1F_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3282,14 +3245,14 @@ SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A setvar VAR_0x8004, 7 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 - call SlateportCity_PokemonFanClub_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A852D, MSGBOX_DEFAULT setvar VAR_0x8006, 1 - call SlateportCity_PokemonFanClub_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -3334,7 +3297,7 @@ FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8 setvar VAR_0x8004, 11 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 - call FallarborTown_ContestLobby_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -3355,7 +3318,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 setvar VAR_0x8004, 11 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 1 - call FallarborTown_ContestLobby_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 @@ -3437,7 +3400,7 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 msgbox BattleTower_Lobby_Text_1A79EB, MSGBOX_DEFAULT setvar VAR_0x8004, 12 copyvar VAR_0x8005, VAR_0x8009 - call BattleTower_Lobby_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc index 293cc74c5..99cbf517d 100644 --- a/data/maps/BattleTower_BattleRoom/scripts.inc +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -115,7 +115,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 msgbox BattleTower_BattleRoom_Text_1C6D05, MSGBOX_DEFAULT BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1 - fadescreen 1 + fadescreen FADE_TO_BLACK special BattleTower_SoftReset end diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc index a7107c278..63b2889ab 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -214,7 +214,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA copyvar VAR_0x8006, VAR_RESULT special SetBattleTowerProperty msgbox BattleTower_Lobby_Text_19A07B, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseBattleTowerPlayerParty waitstate compare VAR_RESULT, 0 @@ -342,7 +342,7 @@ BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 BattleTower_Lobby_EventScript_1606CC:: @ 81606CC msgbox BattleTower_Lobby_Text_19A7C3, MSGBOX_DEFAULT setvar VAR_0x8004, 1 - call BattleTower_Lobby_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 9fe0e921d..8f11c657c 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -149,7 +149,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -157,7 +157,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 2cd04bf48..5c181ca0d 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -115,7 +115,7 @@ DewfordTown_EventScript_14E147:: @ 814E147 end DewfordTown_EventScript_14E151:: @ 814E151 - call DewfordTown_EventScript_1A010C + call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority 255, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_14E40E @@ -147,7 +147,7 @@ DewfordTown_EventScript_14E151:: @ 814E151 end DewfordTown_EventScript_14E1D8:: @ 814E1D8 - call DewfordTown_EventScript_1A010C + call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority 255, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_14E40E @@ -593,7 +593,7 @@ DewfordTown_Movement_14E410:: @ 814E410 DewfordTown_EventScript_14E413:: @ 814E413 lock faceplayer - call DewfordTown_EventScript_1A0102 + call Common_EventScript_BufferTrendyPhrase msgbox DewfordTown_Text_16B9CE, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq DewfordTown_EventScript_14E439 @@ -609,7 +609,7 @@ DewfordTown_EventScript_14E439:: @ 814E439 DewfordTown_EventScript_14E443:: @ 814E443 msgbox DewfordTown_Text_16BADC, MSGBOX_DEFAULT setvar VAR_0x8004, 9 - call DewfordTown_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 5348b86f3..5575b646f 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -111,7 +111,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 setflag FLAG_BADGE02_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if_eq DewfordTown_Gym_EventScript_1A00FB + call_if_eq Common_EventScript_ReadyPetalburgGymForBattle setvar VAR_0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 goto DewfordTown_Gym_EventScript_1531B5 diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 40fbd3238..39c3c82dc 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -4,7 +4,7 @@ DewfordTown_Hall_MapScripts:: @ 8153292 DewfordTown_Hall_EventScript_153293:: @ 8153293 lock faceplayer - call DewfordTown_Hall_EventScript_1A0102 + call Common_EventScript_BufferTrendyPhrase special TrendyPhraseIsOld compare VAR_RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532B2 @@ -20,7 +20,7 @@ DewfordTown_Hall_EventScript_1532B2:: @ 81532B2 DewfordTown_Hall_EventScript_1532BC:: @ 81532BC lock faceplayer - call DewfordTown_Hall_EventScript_1A0102 + call Common_EventScript_BufferTrendyPhrase msgbox DewfordTown_Hall_Text_17559E, MSGBOX_DEFAULT release end @@ -28,7 +28,7 @@ DewfordTown_Hall_EventScript_1532BC:: @ 81532BC DewfordTown_Hall_EventScript_1532CD:: @ 81532CD lock faceplayer - call DewfordTown_Hall_EventScript_1A0102 + call Common_EventScript_BufferTrendyPhrase special BufferRandomHobbyOrLifestyleString msgbox DewfordTown_Hall_Text_1755F9, MSGBOX_YESNO compare VAR_RESULT, YES @@ -50,7 +50,7 @@ DewfordTown_Hall_EventScript_153300:: @ 8153300 DewfordTown_Hall_EventScript_15330A:: @ 815330A lock faceplayer - call DewfordTown_Hall_EventScript_1A0102 + call Common_EventScript_BufferTrendyPhrase msgbox DewfordTown_Hall_Text_17570D, MSGBOX_DEFAULT closemessage applymovement 4, Common_Movement_WalkInPlaceFastestUp @@ -61,7 +61,7 @@ DewfordTown_Hall_EventScript_15330A:: @ 815330A DewfordTown_Hall_EventScript_153326:: @ 8153326 lock faceplayer - call DewfordTown_Hall_EventScript_1A0102 + call Common_EventScript_BufferTrendyPhrase msgbox DewfordTown_Hall_Text_17574C, MSGBOX_DEFAULT closemessage applymovement 5, Common_Movement_WalkInPlaceFastestUp @@ -72,21 +72,21 @@ DewfordTown_Hall_EventScript_153326:: @ 8153326 DewfordTown_Hall_EventScript_153342:: @ 8153342 lock faceplayer - call DewfordTown_Hall_EventScript_1A0102 + call Common_EventScript_BufferTrendyPhrase msgbox DewfordTown_Hall_Text_175779, MSGBOX_DEFAULT release end DewfordTown_Hall_EventScript_153353:: @ 8153353 lockall - call DewfordTown_Hall_EventScript_1A0102 + call Common_EventScript_BufferTrendyPhrase msgbox DewfordTown_Hall_Text_175842, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_153363:: @ 8153363 lockall - call DewfordTown_Hall_EventScript_1A0102 + call Common_EventScript_BufferTrendyPhrase special GetDewfordHallPaintingNameIndex switch VAR_RESULT case 0, DewfordTown_Hall_EventScript_1533CA @@ -132,7 +132,7 @@ DewfordTown_Hall_EventScript_1533FE:: @ 81533FE end DewfordTown_Hall_EventScript_15340A:: @ 815340A - call DewfordTown_Hall_EventScript_1A0102 + call Common_EventScript_BufferTrendyPhrase special GetDewfordHallPaintingNameIndex switch VAR_RESULT case 0, DewfordTown_Hall_EventScript_153470 @@ -251,7 +251,7 @@ DewfordTown_Hall_Movement_15359B:: @ 815359B DewfordTown_Hall_EventScript_15359D:: @ 815359D lock faceplayer - call DewfordTown_Hall_EventScript_1A0102 + call Common_EventScript_BufferTrendyPhrase goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, MSGBOX_DEFAULT giveitem ITEM_TM36_SLUDGE_BOMB diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 643d4db3d..06fb9c275 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -163,7 +163,7 @@ "y": 48, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "EverGrandeCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -187,7 +187,7 @@ "y": 48, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "EverGrandeCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" } ] } diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 0d37b1514..423cd11fc 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -120,7 +120,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -128,7 +128,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -144,7 +144,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -160,7 +160,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc index 585ff4ab9..f9a2cccce 100644 --- a/data/maps/FallarborTown_ContestLobby/scripts.inc +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -106,7 +106,7 @@ FallarborTown_ContestLobby_EventScript_153AB2:: @ 8153AB2 FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 2 releaseall end diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 79177c4c6..2802ae84d 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -195,7 +195,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -203,7 +203,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -219,7 +219,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -227,7 +227,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" } ] } diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 5f3efd98d..64958c3ba 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -213,7 +213,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -229,7 +229,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -237,7 +237,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -245,7 +245,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "hidden_item", diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 19bd45e1e..bb794692e 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -74,7 +74,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 setflag FLAG_BADGE04_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if_eq LavaridgeTown_Gym_1F_EventScript_1A00FB + call_if_eq Common_EventScript_ReadyPetalburgGymForBattle setvar VAR_0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 678e72a1f..ced85adc0 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -367,7 +367,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LilycoveCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -383,7 +383,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LilycoveCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 54eec2697..dc3031bda 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -26,7 +26,7 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_18890F, MSGBOX_DEFAULT lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO @@ -200,7 +200,7 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_18890F, MSGBOX_DEFAULT lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO compare VAR_RESULT, YES @@ -729,21 +729,21 @@ LilycoveCity_ContestLobby_EventScript_15905D:: @ 815905D LilycoveCity_ContestLobby_EventScript_159066:: @ 8159066 lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 6 releaseall end LilycoveCity_ContestLobby_EventScript_15906D:: @ 815906D lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 7 releaseall end LilycoveCity_ContestLobby_EventScript_159074:: @ 8159074 lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 8 releaseall end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index b637b3c1a..dba71e658 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -186,35 +186,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158817:: @ 8158817 LilycoveCity_LilycoveMuseum_2F_EventScript_158820:: @ 8158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 9 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_15882E:: @ 815882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 10 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_15883C:: @ 815883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 11 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_15884A:: @ 815884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 12 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_158858:: @ 8158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 13 releaseall end diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index c6cdc00bc..39ab9984a 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -25,9 +25,9 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE compare VAR_RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special SelectMove - fadescreen 0 + fadescreen FADE_FROM_BLACK compare VAR_0x8005, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index deef6ac38..c460496cc 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -209,7 +209,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -225,7 +225,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -233,7 +233,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -241,7 +241,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index e3e9ab5d9..b45fc3ca8 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -83,7 +83,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB setflag FLAG_BADGE03_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if_eq MauvilleCity_Gym_EventScript_1A00FB + call_if_eq Common_EventScript_ReadyPetalburgGymForBattle setvar VAR_0x8008, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 392e7ebd4..e47b7dfcb 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -278,7 +278,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -286,7 +286,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -302,7 +302,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -310,7 +310,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index 1eb31d636..d8f69554c 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -130,7 +130,7 @@ MossdeepCity_GameCorner_1F_EventScript_15ADE8:: @ 815ADE8 MossdeepCity_GameCorner_1F_EventScript_15ADF5:: @ 815ADF5 msgbox MossdeepCity_GameCorner_1F_Text_18E6DA, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80C5568 waitstate return diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 665291edc..74fac73d6 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -42,14 +42,14 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 msgbox MtPyre_Summit_Text_1B5EEC, MSGBOX_DEFAULT .endif closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 removeobject 4 removeobject 5 removeobject 6 setflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT setflag FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT - fadescreen 0 + fadescreen FADE_FROM_BLACK delay 20 call MtPyre_Summit_EventScript_15D57A compare VAR_0x8008, 0 diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 55c96ca33..831b27d2b 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -163,7 +163,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -171,7 +171,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -179,7 +179,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -187,7 +187,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" } ] } diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index e2d2c51e0..b03db44ca 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -114,7 +114,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PacifidlogTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -130,7 +130,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PacifidlogTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" } ] } diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index f9e9029a1..c4cb13fc1 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -237,7 +237,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -245,7 +245,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -261,7 +261,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -269,7 +269,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index c5084fe7b..9c1f249a3 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -219,7 +219,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F faceplayer setflag FLAG_SYS_POKEMON_GET setflag FLAG_RESCUED_BIRCH - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 4 setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 13918fce6..3bcafcadc 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -74,7 +74,7 @@ Route104_MrBrineysHouse_EventScript_15BDA1:: @ 815BDA1 Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB msgbox Route104_MrBrineysHouse_Text_191BFD, MSGBOX_DEFAULT - call Route104_MrBrineysHouse_EventScript_1A010C + call EventScript_BackupMrBrineyLocation setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1 clearflag FLAG_HIDE_MR_BRINEY_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE diff --git a/data/maps/Route104_Prototype/scripts.inc b/data/maps/Route104_Prototype/scripts.inc index 014637336..91ef90261 100644 --- a/data/maps/Route104_Prototype/scripts.inc +++ b/data/maps/Route104_Prototype/scripts.inc @@ -44,7 +44,7 @@ Route104_Prototype_EventScript_160CF1:: @ 8160CF1 Route104_Prototype_EventScript_160CFB:: @ 8160CFB closemessage delay 60 - fadescreen 1 + fadescreen FADE_TO_BLACK delay 60 special DoSoftReset waitstate diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 3782a9dcb..d4e300a35 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -2,7 +2,7 @@ Route109_MapScripts:: @ 814F4D2 .byte 0 Route109_EventScript_14F4D3:: @ 814F4D3 - call Route109_EventScript_1A010C + call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_ROUTE109, 0 setobjectpriority 255, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_14F67B diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 8a402f7eb..121da2bd1 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -196,10 +196,10 @@ Route113_GlassWorkshop_EventScript_163845:: @ 8163845 Route113_GlassWorkshop_EventScript_163851:: @ 8163851 msgbox Route113_GlassWorkshop_Text_19E827, MSGBOX_DEFAULT closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK playse SE_SELECT delay 30 - fadescreen 0 + fadescreen FADE_FROM_BLACK msgbox Route113_GlassWorkshop_Text_19E9D7, MSGBOX_DEFAULT compare VAR_0x8009, 0 call_if_eq Route113_GlassWorkshop_EventScript_163889 diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 33234f030..5ed894433 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -41,12 +41,12 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F fadedefaultbgm - fadescreen 1 + fadescreen FADE_TO_BLACK setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE removeobject 1 removeobject 2 removeobject 3 - fadescreen 0 + fadescreen FADE_FROM_BLACK applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8 waitmovement 0 moveobjectoffscreen 5 diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index ba3389c7b..06334c76b 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -42,7 +42,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE, Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, MSGBOX_DEFAULT setvar VAR_0x8004, 13 - call Route123_BerryMastersHouse_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index f08944375..2c1ed7a03 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -438,7 +438,7 @@ "y": 45, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -446,7 +446,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -462,7 +462,7 @@ "y": 45, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -470,7 +470,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 443472dc7..5090bb256 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -20,7 +20,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE setvar VAR_0x8008, 1 call RustboroCity_Gym_EventScript_1A01C0 compare VAR_PETALBURG_GYM_STATE, 6 - call_if_eq RustboroCity_Gym_EventScript_1A00FB + call_if_eq Common_EventScript_ReadyPetalburgGymForBattle goto RustboroCity_Gym_EventScript_15793C end diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 537b4fbd3..fdfb341d8 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -526,7 +526,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -534,7 +534,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -542,7 +542,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -558,7 +558,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc index 1c85cba81..f484e8a57 100644 --- a/data/maps/SlateportCity_ContestLobby/scripts.inc +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -116,7 +116,7 @@ SlateportCity_ContestLobby_EventScript_155526:: @ 8155526 SlateportCity_ContestLobby_EventScript_15552F:: @ 815552F lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 3 releaseall end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index a9195b18c..7d918f540 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -68,11 +68,11 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, MSGBOX_DEFAULT .endif closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 removeobject 3 removeobject 4 - fadescreen 0 + fadescreen FADE_FROM_BLACK delay 30 setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 6a7d8bda2..8184c79cb 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -267,7 +267,7 @@ "y": 29, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -275,7 +275,7 @@ "y": 31, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -283,7 +283,7 @@ "y": 31, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -291,7 +291,7 @@ "y": 29, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index c79294e3a..f3ac91f52 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -134,7 +134,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -150,7 +150,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -166,7 +166,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -174,7 +174,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc index 5c367f366..1f658a4c6 100644 --- a/data/maps/VerdanturfTown_ContestLobby/scripts.inc +++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc @@ -89,7 +89,7 @@ VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35 VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37 lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 1 releaseall end diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index c47cb9bee..f7952540c 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -39,7 +39,7 @@ BerryTree_EventScript_1A1558:: @ 81A1558 end BerryTree_EventScript_1A1577:: @ 81A1577 - fadescreen 1 + fadescreen FADE_TO_BLACK closemessage special Berry_FadeAndGoToBerryBagMenu waitstate diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index e700547da..0d84f3972 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -613,7 +613,7 @@ SingleBattleColosseum_EventScript_1A4379:: @ 81A4379 end DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383 - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80C5568 waitstate compare VAR_RESULT, 0 @@ -624,7 +624,7 @@ DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383 end DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80C5568 waitstate compare VAR_RESULT, 0 @@ -635,7 +635,7 @@ DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E end DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9 - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80C5568 waitstate compare VAR_RESULT, 0 @@ -646,7 +646,7 @@ DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9 end DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4 - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80C5568 waitstate compare VAR_RESULT, 0 @@ -727,7 +727,7 @@ TradeRoom_ReadTrainerCard1:: @ 81A4479 message CableClub_LookAtTrainerCard1 waitmessage waitbuttonpress - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_8083BDC waitstate end @@ -736,7 +736,7 @@ TradeRoom_ReadTrainerCard2:: @ 81A4487 message CableClub_LookAtTrainerCard2 waitmessage waitbuttonpress - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_8083BDC waitstate end diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 7c12343d4..2eb32cc71 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -100,7 +100,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C compare VAR_RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseSendDaycareMon waitstate compare VAR_0x8004, 255 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 60852bf2f..cb5e230b9 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -302,7 +302,7 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, MSGBOX_DEFAULT setvar VAR_0x8004, 10 - call Route111_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index a5b0c77bf..70e91f09b 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -57,12 +57,12 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .endif closemessage delay 30 - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 removeobject 3 removeobject 22 setflag FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - fadescreen 0 + fadescreen FADE_FROM_BLACK setobjectxyperm 1, 10, 12 addobject 1 compare VAR_FACING, 4 diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index cadab787d..b3a91702b 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -53,7 +53,7 @@ prompt_write_lyrics: write_lyrics: setvar VAR_0x8004, 6 - call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, NO diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 2aef98d27..0577cad57 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -25,7 +25,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A msgbox PetalburgCity_PokemonCenter_1F_Text_1B1F7B, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 0 - call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_0x8004, 1 @@ -79,7 +79,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 msgbox PetalburgCity_PokemonCenter_1F_Text_1B207F, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 0 - call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_0x8004, 1 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 473db0e30..63cfd18dc 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -105,14 +105,14 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 LittlerootTown_BrendansHouse_2F_EventScript_1B6A91:: @ 81B6A91 incrementgamestat GAME_STAT_CHECKED_CLOCK - fadescreen 1 + fadescreen FADE_TO_BLACK special ScrSpecial_ViewWallClock waitstate releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B:: @ 81B6A9B - fadescreen 1 + fadescreen FADE_TO_BLACK special StartWallClock waitstate return diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index b764a2274..8d4a92cf4 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -92,7 +92,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 copyvar VAR_0x8004, VAR_0x8009 - fadescreen 1 + fadescreen FADE_TO_BLACK special DoBerryBlending waitstate releaseall @@ -269,7 +269,7 @@ FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D setvar VAR_0x8004, 0 - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 240 removeobject 239 removeobject 238 @@ -318,7 +318,7 @@ FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973 end FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 - fadescreen 1 + fadescreen FADE_TO_BLACK specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 @@ -327,7 +327,7 @@ FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 end FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A - fadescreen 0 + fadescreen FADE_FROM_BLACK switch VAR_0x8008 case 2, FallarborTown_ContestLobby_EventScript_1B78F3 case 3, FallarborTown_ContestLobby_EventScript_1B7901 diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index aad2e3237..68efec328 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -52,7 +52,7 @@ gUnknown_081C346A:: @ 81C346A end EventScript_1C348E: - fadescreen 1 + fadescreen FADE_TO_BLACK special OpenPokeblockCaseOnFeeder waitstate compare VAR_RESULT, 0xFFFF diff --git a/data/specials.inc b/data/specials.inc index 0f6a22bce..a9298ba42 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -103,7 +103,7 @@ gSpecials:: def_special sub_808363C def_special SaveGame def_special DoWateringBerryTreeAnim - def_special sub_80E60D8 + def_special ShowEasyChatScreen def_special sub_80EB7C4 def_special ScrSpecial_GetCurrentMauvilleMan def_special ScrSpecial_HasBardSongBeenChanged diff --git a/include/constants/field_weather.h b/include/constants/field_weather.h new file mode 100644 index 000000000..e84dbc48c --- /dev/null +++ b/include/constants/field_weather.h @@ -0,0 +1,24 @@ +#ifndef GUARD_CONSTANTS_FIELD_WEATHER_H +#define GUARD_CONSTANTS_FIELD_WEATHER_H + +#define MAX_RAIN_SPRITES 24 +#define NUM_CLOUD_SPRITES 3 +#define NUM_FOG_HORIZONTAL_SPRITES 20 +#define NUM_ASH_SPRITES 20 +#define NUM_FOG_DIAGONAL_SPRITES 20 +#define NUM_SANDSTORM_SPRITES 20 +#define NUM_SWIRL_SANDSTORM_SPRITES 5 + +// Controls how the weather should be changing the screen palettes. +#define WEATHER_PAL_STATE_CHANGING_WEATHER 0 +#define WEATHER_PAL_STATE_SCREEN_FADING_IN 1 +#define WEATHER_PAL_STATE_SCREEN_FADING_OUT 2 +#define WEATHER_PAL_STATE_IDLE 3 + +// Modes for FadeScreen +#define FADE_FROM_BLACK 0 +#define FADE_TO_BLACK 1 +#define FADE_FROM_WHITE 2 +#define FADE_TO_WHITE 3 + +#endif // GUARD_CONSTANTS_FIELD_WEATHER_H diff --git a/include/easy_chat.h b/include/easy_chat.h index b86b166aa..729bc0b62 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -117,7 +117,7 @@ struct Shared1000 // const pointer to shared1000. easy_chat might be two separate files. extern struct Shared1000 *const gEasyChatStruct; -void sub_80E60D8(void); +void ShowEasyChatScreen(void); void sub_80E62A0(u8 arg0, u16 *arg1, void (*arg2)(void), u8 arg3); u16 sub_80EB72C(u16 group); void sub_80EB6FC(u16 *, u16); diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index aa3c1d993..0b3afa28d 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -262,7 +262,7 @@ bool8 debug_sub_8090880(void) { if (!UpdatePaletteFade()) { - sub_80E60D8(); + ShowEasyChatScreen(); return TRUE; } diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index 4f5c71518..ba2fded16 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -197,7 +197,7 @@ u8 *sub_80EB218(u8 *, u16, u16); u16 sub_80EB2D4(); bool8 sub_80EB680(u16 *, u16, u16, u16); -void sub_80E60D8(void) +void ShowEasyChatScreen(void) { u8 r4 = 3; u16 *r1; diff --git a/src/field_weather.c b/src/field_weather.c index 340445fd2..eb802ae84 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -15,6 +15,7 @@ #include "task.h" #include "trig.h" #include "ewram.h" +#include "constants/field_weather.h" #define MACRO1(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00)) diff --git a/src/mail.c b/src/mail.c index 9a56d73cc..65c85e39b 100644 --- a/src/mail.c +++ b/src/mail.c @@ -868,7 +868,7 @@ u8 debug_sub_810CEA4(void) if (!gPaletteFade.active) { gSpecialVar_0x8004 = 4; - sub_80E60D8(); + ShowEasyChatScreen(); return 1; } return 0; |