summaryrefslogtreecommitdiff
path: root/scripts/CeladonMansion3F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/CeladonMansion3F.asm')
-rwxr-xr-xscripts/CeladonMansion3F.asm16
1 files changed, 7 insertions, 9 deletions
diff --git a/scripts/CeladonMansion3F.asm b/scripts/CeladonMansion3F.asm
index b2d40b44..f8972793 100755
--- a/scripts/CeladonMansion3F.asm
+++ b/scripts/CeladonMansion3F.asm
@@ -25,32 +25,30 @@ WriterText:
DirectorText:
text_asm
-
- ; check pokédex
ld hl, wPokedexOwned
ld b, wPokedexOwnedEnd - wPokedexOwned
call CountSetBits
ld a, [wNumSetBits]
- cp 150
- jr nc, .CompletedDex
- ld hl, .GameDesigner
+ cp NUM_POKEMON - 1 ; discount Mew
+ jr nc, .completed_dex
+ ld hl, .GameDesignerText
jr .done
-.CompletedDex
+.completed_dex
ld hl, .CompletedDexText
.done
call PrintText
jp TextScriptEnd
-.GameDesigner
+.GameDesignerText:
text_far _GameDesignerText
text_end
-.CompletedDexText
+.CompletedDexText:
text_far _CompletedDexText
text_promptbutton
text_asm
callfar DisplayDiploma
- ld a, $1
+ ld a, TRUE
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
jp TextScriptEnd