diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/scripts/contest_hall.inc | 4 | ||||
| -rw-r--r-- | data/scripts/maps/LilycoveCity_ContestLobby.inc | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 382d7c880..d70145f6a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -27,7 +27,7 @@ gSpecialVars:: .4byte gScriptItemId .4byte gScriptLastTalked .4byte gSpecialVar_0x8010 - .4byte gSpecialVar_0x8011 + .4byte gScriptContestCategory .include "data/specials.inc" diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 14e684cb9..9e1c8a9d9 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -142,7 +142,7 @@ FallarborTown_ContestLobby_EventScript_1A5097:: @ 81A5097 switch RESULT case 5, FallarborTown_ContestLobby_EventScript_1A503E case 127, FallarborTown_ContestLobby_EventScript_1A503E - copyvar 0x8011, RESULT + copyvar CONTEST_CATEGORY, RESULT jump FallarborTown_ContestLobby_EventScript_1A5048 end @@ -231,7 +231,7 @@ LinkContestRoom1_EventScript_1A51E4:: @ 81A51E4 return LinkContestRoom1_EventScript_1A51EA:: @ 81A51EA - switch 0x8011 + switch CONTEST_CATEGORY case 0, LinkContestRoom1_EventScript_1A5227 case 1, LinkContestRoom1_EventScript_1A522D case 2, LinkContestRoom1_EventScript_1A5233 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index ed12473b9..576e13d84 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -117,7 +117,7 @@ LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6 return LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA - switch 0x8011 + switch CONTEST_CATEGORY case 0, LilycoveCity_ContestLobby_EventScript_158A27 case 1, LilycoveCity_ContestLobby_EventScript_158A2B case 2, LilycoveCity_ContestLobby_EventScript_158A2F @@ -410,7 +410,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA switch RESULT case 5, LilycoveCity_ContestLobby_EventScript_158C35 case 127, LilycoveCity_ContestLobby_EventScript_158C35 - copyvar 0x8011, RESULT + copyvar CONTEST_CATEGORY, RESULT jump LilycoveCity_ContestLobby_EventScript_158C42 end @@ -593,7 +593,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 end LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 - switch 0x8011 + switch CONTEST_CATEGORY case 0, LilycoveCity_ContestLobby_EventScript_158F45 case 1, LilycoveCity_ContestLobby_EventScript_158F52 case 2, LilycoveCity_ContestLobby_EventScript_158F5F |