summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/maps/LilycoveCity/scripts.inc2
-rw-r--r--data/maps/LilycoveCity_ContestLobby/scripts.inc6
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc2
-rw-r--r--data/scripts/contest_hall.inc8
-rw-r--r--data/specials.inc14
5 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index 22f980016..f7df3f4ab 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -164,7 +164,7 @@ LilycoveCity_EventScript_14CC79:: @ 814CC79
LilycoveCity_EventScript_14CC82:: @ 814CC82
lockall
- specialvar VAR_0x8004, sub_80C4D50
+ specialvar VAR_0x8004, CountPlayerMuseumPaintings
switch VAR_0x8004
case 0, LilycoveCity_EventScript_14CCA2
msgbox LilycoveCity_Text_168EA4, MSGBOX_DEFAULT
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 5dabc84a3..c3e83734a 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -40,7 +40,7 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898
LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE
msgbox LilycoveCity_ContestLobby_Text_188AE8, MSGBOX_DEFAULT
closemessage
- special sub_80C4CEC
+ special SaveMuseumContestPainting
setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
specialvar VAR_RESULT, GiveMonArtistRibbon
compare VAR_RESULT, 1
@@ -86,7 +86,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948
return
LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994
- specialvar VAR_0x8004, sub_80C4D50
+ specialvar VAR_0x8004, CountPlayerMuseumPaintings
switch VAR_0x8004
case 1, LilycoveCity_ContestLobby_EventScript_1589D6
case 2, LilycoveCity_ContestLobby_EventScript_1589DA
@@ -212,7 +212,7 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A
LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE
msgbox LilycoveCity_ContestLobby_Text_188AE8, MSGBOX_DEFAULT
closemessage
- special sub_80C4CEC
+ special SaveMuseumContestPainting
setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
specialvar VAR_RESULT, GiveMonArtistRibbon
compare VAR_RESULT, 1
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index 8c6d9a72b..b8c026a10 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -92,7 +92,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5
LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8
lockall
goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_158793
- specialvar VAR_0x8004, sub_80C4D50
+ specialvar VAR_0x8004, CountPlayerMuseumPaintings
switch VAR_0x8004
case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 465b0bfe8..5abc83c86 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -335,7 +335,7 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311
return
LinkContestRoom1_EventScript_1A5323:: @ 81A5323
- special sub_80C4C64
+ special BufferContestTrainerAndMonNames
addvar VAR_0x8006, 1
buffernumberstring 1, VAR_0x8006
lockall
@@ -1003,7 +1003,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB
setvar VAR_TEMP_1, 0
call LinkContestRoom1_EventScript_1A5A90
delay 30
- special sub_80C4CF8
+ special ShouldReadyContestArtist
compare VAR_0x8004, 1
goto_if_eq LinkContestRoom1_EventScript_1A5C46
return
@@ -1012,7 +1012,7 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6
incrementgamestat GAME_STAT_WON_CONTEST
msgbox LinkContestRoom1_Text_1A6DF1, MSGBOX_SIGN
delay 90
- special sub_80C4CF8
+ special ShouldReadyContestArtist
compare VAR_0x8004, 1
goto_if_eq LinkContestRoom1_EventScript_1A5C46
return
@@ -1049,7 +1049,7 @@ LinkContestRoom1_EventScript_1A5C46:: @ 81A5C46
LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C
delay 60
call LinkContestRoom1_EventScript_1A5C6A
- special sub_80C4CF8
+ special ShouldReadyContestArtist
compare VAR_0x8004, 1
goto_if_eq LinkContestRoom1_EventScript_1A5C64
closemessage
diff --git a/data/specials.inc b/data/specials.inc
index a511742e3..2e7ce8fc9 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -86,14 +86,14 @@ gSpecials::
def_special ResetTVShowState
def_special ScrSpecial_GetContestWinnerIdx
def_special ScrSpecial_GetContestPlayerMonIdx
- def_special sub_80C4C28
+ def_special GetNpcContestantLocalId
def_special ScrSpecial_GetContestWinnerTrainerName
def_special ScrSpecial_GetContestWinnerNick
- def_special sub_80C4C64
+ def_special BufferContestTrainerAndMonNames
def_special ScrSpecial_CountContestMonsWithBetterCondition
def_special SetContestTrainerGfxIds
def_special ScrSpecial_CheckSelectedMonAndInitContest
- def_special sub_80C4D80
+ def_special GetContestantNamesAtRank
def_special ScrSpecial_SetLinkContestTrainerGfxIdx
def_special ScrSpecial_GetMonCondition
def_special ScrSpecial_CanMonParticipateInSelectedLinkContest
@@ -142,10 +142,10 @@ gSpecials::
def_special CalculatePlayerPartyCount
def_special GetNumValidDaycarePartyMons
def_special CountAlivePartyMonsExceptSelectedOne
- def_special sub_80C4CF8
- def_special sub_80C4CEC
- def_special sub_80C4C78
- def_special sub_80C4D50
+ def_special ShouldReadyContestArtist
+ def_special SaveMuseumContestPainting
+ def_special DoesContestCategoryHaveMuseumPainting
+ def_special CountPlayerMuseumPaintings
def_special ShowContestWinner
def_special MauvilleGymSpecial2
def_special MauvilleGymSpecial1