diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/LilycoveCity_ContestLobby/scripts.inc | 10 | ||||
| -rw-r--r-- | data/scripts/contest_hall.inc | 26 | ||||
| -rw-r--r-- | data/specials.inc | 20 |
3 files changed, 28 insertions, 28 deletions
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index b9297628a..8b098ed64 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -68,7 +68,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 incrementgamestat GAME_STAT_RECEIVED_RIBBONS - special sub_80C4858 + special ScrSpecial_GetContestWinnerNick applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E waitmovement 0 playse SE_PIN @@ -240,7 +240,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 incrementgamestat GAME_STAT_RECEIVED_RIBBONS - special sub_80C4858 + special ScrSpecial_GetContestWinnerNick applymovement 11, LilycoveCity_ContestLobby_Movement_158B78 waitmovement 0 playse SE_PIN @@ -360,7 +360,7 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 choosecontestmon compare VAR_SPECIAL_4, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA - special sub_80C43F4 + special ScrSpecial_CheckSelectedMonAndInitContest compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96 compare RESULT, 1 @@ -466,7 +466,7 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 end LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 - special sub_80C496C + special ScrSpecial_GetContestPlayerMonIdx addvar VAR_SPECIAL_4, 1 buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 @@ -478,7 +478,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE call LilycoveCity_ContestLobby_EventScript_158E0B setvar VAR_LINK_CONTEST_ROOM_STATE, 1 - special sub_80C4F70 + special ScrSpecial_SetLinkContestTrainerGfxIdx setvar VAR_CONTEST_LOCATION, 5 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_158F08 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index c5b4cf660..165cc4409 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -120,7 +120,7 @@ FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 choosecontestmon compare VAR_SPECIAL_4, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 - special sub_80C43F4 + special ScrSpecial_CheckSelectedMonAndInitContest compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50C8 compare RESULT, 1 @@ -428,7 +428,7 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 return LinkContestRoom1_EventScript_1A5455:: @ 81A5455 - special sub_80C47A0 + special ScrSpecial_GetMonCondition compare VAR_CONTEST_LOCATION, 1 call_if_eq LinkContestRoom1_EventScript_1A555A compare VAR_CONTEST_LOCATION, 2 @@ -855,7 +855,7 @@ LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2 return LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC - special sub_80C47C0 + special ScrSpecial_GetContestWinnerIdx switch VAR_SPECIAL_5 case 0, LinkContestRoom1_EventScript_1A5A31 case 1, LinkContestRoom1_EventScript_1A5A37 @@ -880,8 +880,8 @@ LinkContestRoom1_EventScript_1A5A43:: @ 81A5A43 return LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 - special sub_80C47F0 - special sub_80C4858 + special ScrSpecial_GetContestWinnerTrainerName + special ScrSpecial_GetContestWinnerNick addvar VAR_SPECIAL_5, 1 buffernumberstring 1, VAR_SPECIAL_5 addvar VAR_SPECIAL_5, -1 @@ -1018,13 +1018,13 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 return LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12 - specialvar RESULT, sub_80C4440 + specialvar RESULT, ScrSpecial_CanMonParticipateInSelectedLinkContest compare RESULT, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C23 return LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23 - special sub_80C47C0 + special ScrSpecial_GetContestWinnerIdx compare VAR_SPECIAL_5, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C32 return @@ -1060,8 +1060,8 @@ LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 return LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A - special sub_80C496C - special sub_80C47C0 + special ScrSpecial_GetContestPlayerMonIdx + special ScrSpecial_GetContestWinnerIdx compare VAR_SPECIAL_4, VAR_SPECIAL_5 goto_if_eq LinkContestRoom1_EventScript_1A5C7C return @@ -1107,7 +1107,7 @@ LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 return LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 - special sub_80C47C0 + special ScrSpecial_GetContestWinnerIdx compare VAR_SPECIAL_5, 3 goto_if_eq LinkContestRoom1_EventScript_1A5CFC msgbox LinkContestRoom1_Text_1A6DF1, 3 @@ -1117,7 +1117,7 @@ LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC compare VAR_CONTEST_LOCATION, 2 call_if_eq LinkContestRoom1_EventScript_1A5C42 incrementgamestat GAME_STAT_WON_CONTEST - specialvar RESULT, sub_80C4440 + specialvar RESULT, ScrSpecial_CanMonParticipateInSelectedLinkContest compare RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D5B compare CONTEST_RANK, 3 @@ -1138,7 +1138,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B return LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B - special sub_80C44C0 + special ScrSpecial_GiveContestRibbon incrementgamestat GAME_STAT_RECEIVED_RIBBONS setflag FLAG_SYS_RIBBON_GET lockall @@ -1146,7 +1146,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B playfanfare MUS_FANFA4 msgbox LinkContestRoom1_Text_1A6D96, 4 waitfanfare - special sub_80C4858 + special ScrSpecial_GetContestWinnerNick msgbox LinkContestRoom1_Text_1A6DAC, 4 releaseall return diff --git a/data/specials.inc b/data/specials.inc index db77f74a9..a59cae339 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -84,20 +84,20 @@ gSpecials:: def_special CheckForBigMovieOrEmergencyNewsOnTV def_special GetMomOrDadStringForTVMessage def_special ResetTVShowState - def_special sub_80C47C0 - def_special sub_80C496C + def_special ScrSpecial_GetContestWinnerIdx + def_special ScrSpecial_GetContestPlayerMonIdx def_special sub_80C4C28 - def_special sub_80C47F0 - def_special sub_80C4858 + def_special ScrSpecial_GetContestWinnerTrainerName + def_special ScrSpecial_GetContestWinnerNick def_special sub_80C4C64 - def_special sub_80C4758 + def_special ScrSpecial_CountContestMonsWithBetterCondition def_special SetContestTrainerGfxIds - def_special sub_80C43F4 + def_special ScrSpecial_CheckSelectedMonAndInitContest def_special sub_80C4D80 - def_special sub_80C4F70 - def_special sub_80C47A0 - def_special sub_80C4440 - def_special sub_80C44C0 + def_special ScrSpecial_SetLinkContestTrainerGfxIdx + def_special ScrSpecial_GetMonCondition + def_special ScrSpecial_CanMonParticipateInSelectedLinkContest + def_special ScrSpecial_GiveContestRibbon def_special sub_80C5044 def_special GiveMonArtistRibbon def_special sub_808363C |