diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-05-15 09:51:36 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-05-15 09:57:37 -0400 |
| commit | 05b591cd95f3fd62e84b33eb56d25f197b17a96c (patch) | |
| tree | 57635b441bb8b2a208a359126c5dc9b8df7abfa6 /maps/Route35NationalParkGate.asm | |
| parent | 82c33aacb036428bf9861e7f97914c7bb675fa07 (diff) | |
Remove remaining legacy macros from current code.
Diffstat (limited to 'maps/Route35NationalParkGate.asm')
| -rw-r--r-- | maps/Route35NationalParkGate.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index aed30ee9..435e48ce 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -20,7 +20,7 @@ Route35NationalParkGate_MapScripts: end .LeaveContestEarly: - priorityjump .LeavingContestEarly + prioritysjump .LeavingContestEarly end .CheckIfContestRunning: @@ -34,7 +34,7 @@ Route35NationalParkGate_MapScripts: return .CheckIfContestAvailable: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal TUESDAY, .SetContestOfficer ifequal THURSDAY, .SetContestOfficer ifequal SATURDAY, .SetContestOfficer @@ -55,9 +55,9 @@ Route35NationalParkGate_MapScripts: applymovement PLAYER, MovementData_0x6a2e2 turnobject ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT opentext - checkcode VAR_CONTESTMINUTES - addvar 1 - vartomem STRING_BUFFER_3 + readvar VAR_CONTESTMINUTES + addval 1 + getnum STRING_BUFFER_3 writetext UnknownText_0x6a79a yesorno iffalse .GoBackToContest @@ -78,7 +78,7 @@ Route35NationalParkGate_MapScripts: end Route35OfficerScriptContest: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal SUNDAY, Route35NationalParkGate_NoContestToday ifequal MONDAY, Route35NationalParkGate_NoContestToday ifequal WEDNESDAY, Route35NationalParkGate_NoContestToday @@ -91,7 +91,7 @@ Route35OfficerScriptContest: writetext UnknownText_0x6a2eb yesorno iffalse Route35NationalParkGate_DeclinedToParticipate - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifgreater 1, Route35NationalParkGate_LeaveTheRestBehind special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER @@ -116,7 +116,7 @@ Route35NationalParkGate_OkayToProceed: end Route35NationalParkGate_EnterContest: - checkcode VAR_FACING + readvar VAR_FACING ifequal LEFT, Route35NationalParkGate_FacingLeft applymovement PLAYER, MovementData_0x6a2e5 end @@ -126,9 +126,9 @@ Route35NationalParkGate_FacingLeft: end Route35NationalParkGate_LeaveTheRestBehind: - checkcode VAR_PARTYCOUNT + readvar VAR_PARTYCOUNT ifless PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty - checkcode VAR_BOXSPACE + readvar VAR_BOXSPACE ifequal 0, Route35NationalParkGate_NoRoomInBox Route35NationalParkGate_LessThanFullParty: @@ -146,7 +146,7 @@ Route35NationalParkGate_LessThanFullParty: playsound SFX_GOT_SAFARI_BALLS waitsfx promptbutton - jump Route35NationalParkGate_OkayToProceed + sjump Route35NationalParkGate_OkayToProceed Route35NationalParkGate_DeclinedToParticipate: writetext UnknownText_0x6a5dc |