diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-27 13:15:30 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-27 13:17:45 -0400 |
| commit | 2e74b9c2eb0f80b81f91933fbb58ff6995b55e42 (patch) | |
| tree | 8f8ff410905ebc282227244a7211507e3df313b6 /data/scripts | |
| parent | faf8130585a19ec0394295dc26dcc8dd2a9f7bbd (diff) | |
Sync std_msgbox.inc
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cable_club.inc | 6 | ||||
| -rw-r--r-- | data/scripts/pokeblocks.inc | 2 | ||||
| -rw-r--r-- | data/scripts/std_msgbox.inc | 36 |
3 files changed, 40 insertions, 4 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 365992fb3..1da7d0dda 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -190,7 +190,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC case 127, OldaleTown_PokemonCenter_2F_EventScript_1A4319 OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 - call S_DoSaveDialog + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF @@ -359,7 +359,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA call OldaleTown_PokemonCenter_2F_EventScript_1A41BB compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - call S_DoSaveDialog + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C @@ -452,7 +452,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 - call S_DoSaveDialog + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index bd3323024..1b1f3a333 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -233,7 +233,7 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 end FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 - call S_DoSaveDialog + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc new file mode 100644 index 000000000..912f88fa1 --- /dev/null +++ b/data/scripts/std_msgbox.inc @@ -0,0 +1,36 @@ +Std_MsgboxNPC: + lock + faceplayer + message 0x0 + waitmessage + waitbuttonpress + release + return + +Std_MsgboxSign: + lockall + message 0x0 + waitmessage + waitbuttonpress + releaseall + return + +Std_MsgboxDefault: + message 0x0 + waitmessage + waitbuttonpress + return + +Std_MsgboxYesNo: + message 0x0 + waitmessage + yesnobox 20, 8 + return + +EventScript_UnusedReturn: @ 819F805 + return + +Common_EventScript_SaveGame:: @ 819F806 + special SaveGame + waitstate + return |