summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s59
-rw-r--r--data/field_move_scripts.inc2
-rw-r--r--data/scripts/cable_club.inc6
-rw-r--r--data/scripts/maps/BattleTower_Lobby.inc2
-rw-r--r--data/scripts/maps/LilycoveCity_ContestLobby.inc2
-rw-r--r--data/scripts/maps/MossdeepCity_GameCorner_1F.inc2
-rw-r--r--data/scripts/pokeblocks.inc2
-rw-r--r--data/specials.inc4
8 files changed, 37 insertions, 42 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 3ea5cee24..171581dd9 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -918,13 +918,8 @@ Std_5:
@ 819F805
return
-BattleTower_Lobby_EventScript_19F806:: @ 819F806
-FallarborTown_ContestLobby_EventScript_19F806:: @ 819F806
-LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806
-MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806
-OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806
-SecretBase_RedCave1_EventScript_19F806:: @ 819F806
- special InitSaveDialog
+S_DoSaveDialog:: @ 819F806
+ special ScrSpecial_DoSaveDialog
waitstate
return
@@ -1437,16 +1432,16 @@ SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
lock
faceplayer
- msgbox OldaleTown_PokemonCenter_1F_Text_1A0A7D, 5
+ msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO
compare RESULT, 1
- jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FD7C
+ jumpeq do_heal_party
compare RESULT, 0
- jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDC7
+ jumpeq dont_heal_party
end
-OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
+do_heal_party:: @ 819FD7C
inccounter GAME_STAT_USED_POKECENTER
- message OldaleTown_PokemonCenter_1F_Text_1A1245
+ message gText_NurseJoy_OkayIllTakeYourPokemon
waittext
move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F
waitmove 0
@@ -1461,16 +1456,16 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
end
OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0
- message OldaleTown_PokemonCenter_1F_Text_1A0B14
+ message gText_NurseJoy_ThankYouForWaiting
waittext
move 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4
waitmove 0
- message OldaleTown_PokemonCenter_1F_Text_1A0AFA
+ message gText_NurseJoy_WeHopeToSeeYouAgain
waittext
return
-OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7
- message OldaleTown_PokemonCenter_1F_Text_1A0AFA
+dont_heal_party:: @ 819FDC7
+ message gText_NurseJoy_WeHopeToSeeYouAgain
waittext
return
@@ -1483,7 +1478,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
end
OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
- message OldaleTown_PokemonCenter_1F_Text_1A1275
+ message gText_NurseJoy_Pokerus
waittext
setflag 273
return
@@ -2985,17 +2980,17 @@ UnknownString_81A0A54: @ 81A0A54
UnknownString_81A0A66: @ 81A0A66
.string "Accessed LANETTE’s PC.$"
-OldaleTown_PokemonCenter_1F_Text_1A0A7D:: @ 81A0A7D
+gText_NurseJoy_Welcome:: @ 81A0A7D
.string "Hello, and welcome to the POKéMON\n"
.string "CENTER.\p"
.string "We restore your tired POKéMON to\n"
.string "full health.\p"
.string "Would you like to rest your POKéMON?$"
-OldaleTown_PokemonCenter_1F_Text_1A0AFA:: @ 81A0AFA
+gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA
.string "We hope to see you again!$"
-OldaleTown_PokemonCenter_1F_Text_1A0B14:: @ 81A0B14
+gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14
.string "Thank you for waiting.\p"
.string "We’ve restored your POKéMON to\n"
.string "full health.$"
@@ -3209,11 +3204,11 @@ SlateportCity_Text_1A116E:: @ 81A116E
.string "We’ll accept you as a member and sell\n"
.string "you good stuff in secrecy.$"
-OldaleTown_PokemonCenter_1F_Text_1A1245:: @ 81A1245
+gText_NurseJoy_OkayIllTakeYourPokemon:: @ 81A1245
.string "Okay, I’ll take your POKéMON for a\n"
.string "few seconds.$"
-OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275
+gText_NurseJoy_Pokerus:: @ 81A1275
.string "Your POKéMON may be infected with\n"
.string "POKéRUS.\p"
.string "Little is known about the POKéRUS\n"
@@ -3949,7 +3944,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
jumpeq SecretBase_RedCave1_EventScript_1A308F
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A308F
hidebox 0, 0, 15, 10
@@ -3984,7 +3979,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
jumpeq SecretBase_RedCave1_EventScript_1A310B
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A310B
hidebox 0, 0, 15, 10
@@ -4019,7 +4014,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
jumpeq SecretBase_RedCave1_EventScript_1A3187
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3187
hidebox 0, 0, 15, 10
@@ -4054,7 +4049,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
jumpeq SecretBase_RedCave1_EventScript_1A3203
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3203
hidebox 0, 0, 15, 10
@@ -4089,7 +4084,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
jumpeq SecretBase_RedCave1_EventScript_1A327F
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A327F
hidebox 0, 0, 15, 10
@@ -4124,7 +4119,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
jumpeq SecretBase_RedCave1_EventScript_1A32FB
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A32FB
hidebox 0, 0, 15, 10
@@ -4159,7 +4154,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
jumpeq SecretBase_RedCave1_EventScript_1A3377
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A3377
hidebox 0, 0, 15, 10
@@ -4194,7 +4189,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
jumpeq SecretBase_RedCave1_EventScript_1A33F3
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A33F3
hidebox 0, 0, 15, 10
@@ -4229,7 +4224,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
jumpeq SecretBase_RedCave1_EventScript_1A346F
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A346F
hidebox 0, 0, 15, 10
@@ -4264,7 +4259,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
jumpeq SecretBase_RedCave1_EventScript_1A34EB
setvar RESULT, 1
special sub_80BCE4C
- call SecretBase_RedCave1_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq SecretBase_RedCave1_EventScript_1A34EB
hidebox 0, 0, 15, 10
diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc
index 315217055..acf5e9e17 100644
--- a/data/field_move_scripts.inc
+++ b/data/field_move_scripts.inc
@@ -90,7 +90,7 @@ DoRockSmashMovement: @ 81B0F0C
specialval RESULT, sub_810F5BC
compare RESULT, 1
jumpeq DoRockSmashMovement_Done
- special RockSmashWildEncounter
+ special ScrSpecial_RockSmashWildEncounter
compare RESULT, 0
jumpeq DoRockSmashMovement_Done
waitstate
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 4a919c597..5728b52d8 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -191,7 +191,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC
case 127, OldaleTown_PokemonCenter_2F_EventScript_1A4319
OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2
- call OldaleTown_PokemonCenter_2F_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF
@@ -361,7 +361,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA
call OldaleTown_PokemonCenter_2F_EventScript_1A41BB
compare RESULT, 0
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
- call OldaleTown_PokemonCenter_2F_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
message OldaleTown_PokemonCenter_2F_Text_1A490C
@@ -455,7 +455,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4229
OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229
- call OldaleTown_PokemonCenter_2F_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
message OldaleTown_PokemonCenter_2F_Text_1A490C
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index 8cd3639a5..a1570ac13 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -242,7 +242,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587
special LoadPlayerParty
closebutton
pause 2
- call BattleTower_Lobby_EventScript_19F806
+ call S_DoSaveDialog
setvar 0x4000, 5
hidebox 0, 0, 15, 10
compare RESULT, 0
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 3c8cc5bdf..6bdcf55e2 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -330,7 +330,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4
msgbox LilycoveCity_ContestLobby_Text_188521, 5
compare RESULT, 0
jumpeq LilycoveCity_ContestLobby_EventScript_158C35
- call LilycoveCity_ContestLobby_EventScript_19F806
+ call S_DoSaveDialog
hidebox 0, 0, 15, 9
compare RESULT, 0
jumpeq LilycoveCity_ContestLobby_EventScript_158C35
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
index 14836f3e0..59669596a 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
@@ -103,7 +103,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
compare RESULT, 0
callif 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8
special LoadPlayerParty
- call MossdeepCity_GameCorner_1F_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8
hidebox 0, 0, 15, 10
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index e1add8734..852acd292 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -235,7 +235,7 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897
end
FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1
- call FallarborTown_ContestLobby_EventScript_19F806
+ call S_DoSaveDialog
compare RESULT, 0
jumpeq FallarborTown_ContestLobby_EventScript_1B7936
message FallarborTown_ContestLobby_Text_1B7304
diff --git a/data/specials.inc b/data/specials.inc
index 99a4a218c..1baa55442 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -100,7 +100,7 @@ gSpecials::
def_special sub_80C5044
def_special GiveMonArtistRibbon
def_special sub_808363C
- def_special InitSaveDialog
+ def_special ScrSpecial_DoSaveDialog
def_special DoWateringBerryTreeAnim
def_special sub_80E60D8
def_special sub_80EB7C4
@@ -178,7 +178,7 @@ gSpecials::
def_special sub_810FF48
def_special sub_810FAA0
def_special sub_810FF60
- def_special RockSmashWildEncounter
+ def_special ScrSpecial_RockSmashWildEncounter
def_special GabbyAndTyGetBattleNum
def_special sub_80BDC14
def_special GabbyAndTyBeforeInterview
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 02:59:18 +0000