summaryrefslogtreecommitdiff
path: root/maps/OaksLab.asm
diff options
context:
space:
mode:
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 17da0485d..d78641c28 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -4,7 +4,7 @@ const_value set 2
const OAKSLAB_SCIENTIST2
const OAKSLAB_SCIENTIST3
-OaksLab_MapScriptHeader:
+OaksLab_MapScripts:
.SceneScripts:
db 0
@@ -26,14 +26,14 @@ Oak:
setevent EVENT_TALKED_TO_OAK_IN_KANTO
.CheckBadges:
checkcode VAR_BADGES
- if_equal 16, .OpenMtSilver
- if_equal 8, .Complain
+ if_equal NUM_BADGES, .OpenMtSilver
+ if_equal NUM_JOHTO_BADGES, .Complain
jump .AhGood
.CheckPokedex:
writetext OakLabDexCheckText
waitbutton
- special ProfOaksPCBoot
+ special Special_ProfOaksPCBoot
writetext OakLabGoodbyeText
waitbutton
closetext
@@ -256,7 +256,7 @@ OaksLabPCText:
line "TOWN 8-)"
done
-OaksLab_MapEventHeader:
+OaksLab_MapEvents:
; filler
db 0, 0