summaryrefslogtreecommitdiff
path: root/scripts/celadonmansion3.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/celadonmansion3.asm')
-rwxr-xr-xscripts/celadonmansion3.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/scripts/celadonmansion3.asm b/scripts/celadonmansion3.asm
index 47190c92..a1fe048b 100755
--- a/scripts/celadonmansion3.asm
+++ b/scripts/celadonmansion3.asm
@@ -1,7 +1,7 @@
-CeladonMansion3Script: ; 48790 (12:4790)
+CeladonMansion3Script:
jp EnableAutoTextBoxDrawing
-CeladonMansion3TextPointers: ; 48793 (12:4793)
+CeladonMansion3TextPointers:
dw ProgrammerText
dw GraphicArtistText
dw WriterText
@@ -11,26 +11,26 @@ CeladonMansion3TextPointers: ; 48793 (12:4793)
dw GameFreakPCText3
dw GameFreakSignText
-ProgrammerText: ; 487a3 (12:47a3)
+ProgrammerText:
TX_FAR _ProgrammerText
db "@"
-GraphicArtistText: ; 487a8 (12:47a8)
+GraphicArtistText:
TX_FAR _GraphicArtistText
db "@"
-WriterText: ; 487ad (12:47ad)
+WriterText:
TX_FAR _WriterText
db "@"
-DirectorText: ; 487b2 (12:47b2)
- db $08 ; asm
+DirectorText:
+ TX_ASM
; check pokédex
ld hl, wPokedexOwned
ld b, wPokedexOwnedEnd - wPokedexOwned
call CountSetBits
- ld a, [wd11e]
+ ld a, [wNumSetBits]
cp 150
jr nc, .CompletedDex
ld hl, .GameDesigner
@@ -41,31 +41,31 @@ DirectorText: ; 487b2 (12:47b2)
call PrintText
jp TextScriptEnd
-.GameDesigner ; 487d0 (12:47d0)
+.GameDesigner
TX_FAR _GameDesignerText
db "@"
.CompletedDexText
TX_FAR _CompletedDexText
- db $6
- db $8 ; asm
+ TX_BLINK
+ TX_ASM
callab DisplayDiploma
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
jp TextScriptEnd
-GameFreakPCText1: ; 487eb (12:47eb)
+GameFreakPCText1:
TX_FAR _CeladonMansion3Text5
db "@"
-GameFreakPCText2: ; 487f0 (12:47f0)
+GameFreakPCText2:
TX_FAR _CeladonMansion3Text6
db "@"
-GameFreakPCText3: ; 487f5 (12:47f5)
+GameFreakPCText3:
TX_FAR _CeladonMansion3Text7
db "@"
-GameFreakSignText: ; 487fa (12:47fa)
+GameFreakSignText:
TX_FAR _CeladonMansion3Text8
db "@"