pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

add char 4b and cleanup surrounding chars

Browse Source
This commit is contained in:
yenatch
2013-05-14 13:25:30 -04:00
parent 14567c2bee
commit ea8bfe03b6
1 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
main.asm
View File

@@ -1281,7 +1281,7 @@ CheckDict: ; 1087
cp $15 cp $15
jp z, $117b jp z, $117b
cp $4f cp $4f
jp z, Char4f jp z, Char4F
cp $4e cp $4e
jp z, $12a7 jp z, $12a7
cp $16 cp $16
@@ -1291,7 +1291,7 @@ CheckDict: ; 1087
cp $4c cp $4c
jp z, $1337 jp z, $1337
cp $4b cp $4b
jp z, $131f jp z, Char4B
cp $51 ; Player name cp $51 ; Player name
jp z, $12f2 jp z, $12f2
cp $49 cp $49
@@ -1395,7 +1395,7 @@ CheckDict: ; 1087
INCBIN "baserom.gbc", $117b, $1203 - $117b INCBIN "baserom.gbc", $117b, $1203 - $117b
Char5D: Char5D: ; 1203
ld a, [hBattleTurn] ld a, [hBattleTurn]
push de push de
and a and a
@@ -1473,36 +1473,63 @@ Char5AText: ; 0x1295
INCBIN "baserom.gbc", $129c, $12ea - $129c INCBIN "baserom.gbc", $129c, $12ea - $129c
Char4f: ; 12ea Char4F: ; 12ea
pop hl pop hl
ld hl, $c5e1 hlcoord 1, 16
push hl push hl
jp NextChar jp NextChar
; 0x12f2 ; 0x12f2
INCBIN "baserom.gbc", $12f2, $1345 - $12f2 INCBIN "baserom.gbc", $12f2, $131f - $12f2
Char4B: ; 131f
ld a, [InLinkBattle]
or a
jr nz, .asm_1328
call $13c7
.asm_1328
call $13b6
Char55: ; $1345
push de push de
ld de, $1354 call $aaf
pop de
ld a, [InLinkBattle]
or a
call z, $13cd
push de
call $138c
call $138c
hlcoord 1, 16
pop de
jp NextChar
; 1345
Char55: ; 1345
push de
ld de, .text_1354
ld b, h ld b, h
ld c, l ld c, l
call $1078 call PlaceString
ld h, b ld h, b
ld l, c ld l, c
pop de pop de
jp NextChar jp NextChar
; 0x1354
; ??? .text_1354
ld c, e db $4b, "@"
ld d, b ; 1356
Char5F: ; 0x1356
Char5F: ; 1356
; ends a Pokédex entry ; ends a Pokédex entry
ld [hl], "." ld [hl], "."
pop hl pop hl
ret ret
; 135a
INCBIN "baserom.gbc", $135a, $15d8 - $135a INCBIN "baserom.gbc", $135a, $15d8 - $135a