summaryrefslogtreecommitdiff
path: root/maps/OaksLab.asm
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-05-15 09:51:36 -0400
committerentrpntr <entrpntr@gmail.com>2020-05-15 09:57:37 -0400
commit05b591cd95f3fd62e84b33eb56d25f197b17a96c (patch)
tree57635b441bb8b2a208a359126c5dc9b8df7abfa6 /maps/OaksLab.asm
parent82c33aacb036428bf9861e7f97914c7bb675fa07 (diff)
Remove remaining legacy macros from current code.
Diffstat (limited to 'maps/OaksLab.asm')
-rw-r--r--maps/OaksLab.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index b5b7015e..d16fac60 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -23,10 +23,10 @@ Oak:
promptbutton
setevent EVENT_TALKED_TO_OAK_IN_KANTO
.CheckBadges:
- checkcode VAR_BADGES
+ readvar VAR_BADGES
ifequal NUM_BADGES, .OpenMtSilver
ifequal NUM_JOHTO_BADGES, .Complain
- jump .AhGood
+ sjump .AhGood
.CheckPokedex:
writetext OakLabDexCheckText
@@ -41,17 +41,17 @@ Oak:
writetext OakOpenMtSilverText
promptbutton
setevent EVENT_OPENED_MT_SILVER
- jump .CheckPokedex
+ sjump .CheckPokedex
.Complain:
writetext OakNoKantoBadgesText
promptbutton
- jump .CheckPokedex
+ sjump .CheckPokedex
.AhGood:
writetext OakYesKantoBadgesText
promptbutton
- jump .CheckPokedex
+ sjump .CheckPokedex
OaksAssistant1Script:
jumptextfaceplayer OaksAssistant1Text