diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
| commit | d2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch) | |
| tree | f581489b522fc647477d7b36dee072d553c44fd1 /scripts/celadonmansion3.asm | |
| parent | Make pokeyellow build to baserom. (diff) | |
| parent | Merge pull request #114 from YamaArashi/master (diff) | |
| download | pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.tar.gz pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.tar.xz pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.zip | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
Diffstat (limited to 'scripts/celadonmansion3.asm')
| -rwxr-xr-x | scripts/celadonmansion3.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/celadonmansion3.asm b/scripts/celadonmansion3.asm index 47190c92..11a8646d 100755 --- a/scripts/celadonmansion3.asm +++ b/scripts/celadonmansion3.asm @@ -24,13 +24,13 @@ WriterText: ; 487ad (12:47ad) db "@" DirectorText: ; 487b2 (12:47b2) - db $08 ; asm + 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 @@ -48,7 +48,7 @@ DirectorText: ; 487b2 (12:47b2) .CompletedDexText TX_FAR _CompletedDexText db $6 - db $8 ; asm + TX_ASM callab DisplayDiploma ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a |