summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.inc14
-rw-r--r--data/scripts/contest_hall.inc4
-rw-r--r--data/scripts/players_house.inc4
-rw-r--r--data/scripts/pokeblocks.inc2
-rw-r--r--data/scripts/secret_base.inc20
5 files changed, 22 insertions, 22 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index b73d7e1fa..79747540d 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -425,7 +425,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55
end
OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60
- call OldaleTown_PokemonCenter_2F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
message gText_PleaseWaitForLink
@@ -527,7 +527,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2
call OldaleTown_PokemonCenter_2F_EventScript_277199
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
- call OldaleTown_PokemonCenter_2F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
message gText_PleaseWaitForLink
@@ -602,7 +602,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD
OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB
copyvar VAR_0x8007, VAR_LAST_TALKED
- call OldaleTown_PokemonCenter_2F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
message gText_PleaseWaitForLink
@@ -1023,7 +1023,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
call OldaleTown_PokemonCenter_2F_EventScript_277626
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
- call OldaleTown_PokemonCenter_2F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT
@@ -1234,7 +1234,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923
end
OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931
- call OldaleTown_PokemonCenter_2F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
switch VAR_0x8004
@@ -1513,7 +1513,7 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9
waitstate
compare VAR_0x8004, 6
goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9
- call MossdeepCity_GameCorner_1F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9
setvar VAR_0x8004, 4
@@ -1532,7 +1532,7 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35
waitstate
compare VAR_0x8004, 6
goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9
- call MossdeepCity_GameCorner_1F_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9
setvar VAR_0x8004, 6
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index f85ebd3d2..fa09c5e15 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -35,7 +35,7 @@ LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C
end
LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B
- call LilycoveCity_ContestLobby_EventScript_27205E
+ call Common_EventScript_BagIsFull
msgbox LilycoveCity_ContestLobby_Text_27B6E7, MSGBOX_DEFAULT
release
end
@@ -1215,7 +1215,7 @@ LinkContestRoom1_EventScript_27AC77:: @ 827AC77
LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8
lockall
- call LinkContestRoom1_EventScript_27205E
+ call Common_EventScript_BagIsFull
msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT
releaseall
setvar VAR_0x408A, 4
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index eb29ef6e0..985a2f93a 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -355,7 +355,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT
giveitem_std ITEM_AMULET_COIN
compare VAR_RESULT, 0
- goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_272054
+ goto_if_eq Common_EventScript_ShowBagIsFull
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT
setflag FLAG_MOM_SAYS_GOODBYE
release
@@ -373,7 +373,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94
LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E
closemessage
- call LittlerootTown_BrendansHouse_1F_EventScript_272083
+ call Common_EventScript_OutOfCenterPartyHeal
incrementgamestat 16
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT
release
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index c2a580a61..7b8b52cd0 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -602,7 +602,7 @@ EventScript_PblocLink_NoBerries: @ 82940B1
end
EventScript_PblocLink_TryConnect: @ 82940BB
- call LilycoveCity_ContestLobby_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq EventScript_PblocLink_End
specialvar VAR_RESULT, IsWirelessAdapterConnected
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index db8aece85..770bc9a5b 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -660,7 +660,7 @@ SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6
goto_if_eq SecretBase_RedCave1_EventScript_275E2F
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_275E2F
msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT
@@ -696,7 +696,7 @@ SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E
goto_if_eq SecretBase_RedCave1_EventScript_275EA7
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_275EA7
msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT
@@ -732,7 +732,7 @@ SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6
goto_if_eq SecretBase_RedCave1_EventScript_275F1F
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_275F1F
msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT
@@ -768,7 +768,7 @@ SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E
goto_if_eq SecretBase_RedCave1_EventScript_275F97
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_275F97
msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT
@@ -804,7 +804,7 @@ SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6
goto_if_eq SecretBase_RedCave1_EventScript_27600F
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_27600F
msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT
@@ -840,7 +840,7 @@ SecretBase_RedCave1_EventScript_27602E:: @ 827602E
goto_if_eq SecretBase_RedCave1_EventScript_276087
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_276087
msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT
@@ -876,7 +876,7 @@ SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6
goto_if_eq SecretBase_RedCave1_EventScript_2760FF
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_2760FF
msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT
@@ -912,7 +912,7 @@ SecretBase_RedCave1_EventScript_27611E:: @ 827611E
goto_if_eq SecretBase_RedCave1_EventScript_276177
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_276177
msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT
@@ -948,7 +948,7 @@ SecretBase_RedCave1_EventScript_276196:: @ 8276196
goto_if_eq SecretBase_RedCave1_EventScript_2761EF
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_2761EF
msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT
@@ -984,7 +984,7 @@ SecretBase_RedCave1_EventScript_27620E:: @ 827620E
goto_if_eq SecretBase_RedCave1_EventScript_276267
setvar VAR_RESULT, 1
special sub_80EA30C
- call SecretBase_RedCave1_EventScript_27134F
+ call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SecretBase_RedCave1_EventScript_276267
msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 12:13:57 +0000