pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of static rom addresses in home/text.asm.

Browse Source
This commit is contained in:
yenatch 2014-03-03 01:28:54 -05:00
parent ea2ec66d11
commit 9fb9a286ba
1 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
home/text.asm
View File

@ -209,7 +209,7 @@ CheckDict:: ; 1087
and a and a
jp z, Function1383 jp z, Function1383
cp $4c cp $4c
jp z, $1337 jp z, Function1337
cp $4b cp $4b
jp z, Char4B jp z, Char4B
cp $51 ; Player name cp $51 ; Player name
@ -249,7 +249,7 @@ CheckDict:: ; 1087
cp $56 cp $56
jp z, Function11d3 jp z, Function11d3
cp $57 cp $57
jp z, $137c jp z, Function137c
cp $58 cp $58
jp z, Function135a jp z, Function135a
cp $4a cp $4a
@ -269,9 +269,9 @@ CheckDict:: ; 1087
cp $5a cp $5a
jp z, Char5D jp z, Char5D
cp $3f cp $3f
jp z, $121b jp z, Function121b
cp $14 cp $14
jp z, $1252 jp z, Function1252
cp $e4 cp $e4
jr z, .asm_1174 ; 0x113d $35 jr z, .asm_1174 ; 0x113d $35
cp $e5 cp $e5
@ -322,103 +322,103 @@ Function117b:: ; 117b
Function1186:: ; 1186 Function1186:: ; 1186
push de push de
ld de, MomsName ld de, MomsName
jp $126a jp Function126a
; 118d ; 118d
Function118d:: ; 118d Function118d:: ; 118d
push de push de
ld de, PlayerName ld de, PlayerName
jp $126a jp Function126a
; 1194 ; 1194
Function1194:: ; 1194 Function1194:: ; 1194
push de push de
ld de, RivalName ld de, RivalName
jp $126a jp Function126a
; 119b ; 119b
Function119b:: ; 119b Function119b:: ; 119b
push de push de
ld de, RedsName ld de, RedsName
jp $126a jp Function126a
; 11a2 ; 11a2
Function11a2:: ; 11a2 Function11a2:: ; 11a2
push de push de
ld de, GreensName ld de, GreensName
jp $126a jp Function126a
; 11a9 ; 11a9
Function11a9:: ; 11a9 Function11a9:: ; 11a9
push de push de
ld de, Char5DText ld de, Char5DText
jp $126a jp Function126a
; 11b0 ; 11b0
Function11b0:: ; 11b0 Function11b0:: ; 11b0
push de push de
ld de, Char5CText ld de, Char5CText
jp $126a jp Function126a
; 11b7 ; 11b7
Function11b7:: ; 11b7 Function11b7:: ; 11b7
push de push de
ld de, Char5BText ld de, Char5BText
jp $126a jp Function126a
; 11be ; 11be
Function11be:: ; 11be Function11be:: ; 11be
push de push de
ld de, Char5EText ld de, Char5EText
jp $126a jp Function126a
; 11c5 ; 11c5
Function11c5:: ; 11c5 Function11c5:: ; 11c5
push de push de
ld de, Char54Text ld de, Char54Text
jp $126a jp Function126a
; 11cc ; 11cc
Function11cc:: ; 11cc Function11cc:: ; 11cc
push de push de
ld de, Char23Text ld de, Char23Text
jp $126a jp Function126a
; 11d3 ; 11d3
Function11d3:: ; 11d3 Function11d3:: ; 11d3
push de push de
ld de, $1292 ld de, Char56Text
jp $126a jp Function126a
; 11da ; 11da
Function11da:: ; 11da Function11da:: ; 11da
push de push de
ld de, Char4AText ld de, Char4AText
jp $126a jp Function126a
; 11e1 ; 11e1
Function11e1:: ; 11e1 Function11e1:: ; 11e1
push de push de
ld de, Char24Text ld de, Char24Text
jp $126a jp Function126a
; 11e8 ; 11e8
Function11e8:: ; 11e8 Function11e8:: ; 11e8
push de push de
ld de, Char37Text ld de, Char37Text
jp $126a jp Function126a
; 11ef ; 11ef
Function11ef:: ; 11ef Function11ef:: ; 11ef
push de push de
ld de, Char37Text ld de, Char37Text
jp $126a jp Function126a
; 11f6 ; 11f6
Function11f6:: ; 11f6 Function11f6:: ; 11f6
push de push de
ld de, Char37Text ld de, Char37Text
jp $126a jp Function126a
; 11fd ; 11fd
@ -437,22 +437,24 @@ Function1205:: ; 1205
and a and a
jr nz, .asm_120e ; 0x1207 $5 jr nz, .asm_120e ; 0x1207 $5
ld de, BattleMonNick ld de, BattleMonNick
jr .asm_126a ; 0x120c $5c jr Function126a ; 0x120c $5c
.asm_120e .asm_120e
ld de, Char5AText ; Enemy ld de, Char5AText ; Enemy
call PlaceString call PlaceString
ld h, b ld h, b
ld l, c ld l, c
ld de, EnemyMonNick ld de, EnemyMonNick
jr .asm_126a ; 0x1219 $4f jr Function126a ; 0x1219 $4f
Function121b:: ; 121b
push de push de
ld a, [InLinkBattle] ld a, [InLinkBattle]
and a and a
jr nz, .linkbattle jr nz, .linkbattle
ld a, [TrainerClass] ld a, [TrainerClass]
cp $9 cp RIVAL1
jr z, .asm_1248 ; 0x1227 $1f jr z, .asm_1248 ; 0x1227 $1f
cp $2a cp RIVAL2
jr z, .asm_1248 ; 0x122b $1b jr z, .asm_1248 ; 0x122b $1b
ld de, $c656 ld de, $c656
call PlaceString call PlaceString
@ -464,13 +466,15 @@ Function1205:: ; 1205
callab Function39939 callab Function39939
pop hl pop hl
ld de, StringBuffer1 ld de, StringBuffer1
jr .asm_126a ; 0x1246 $22 jr Function126a ; 0x1246 $22
.asm_1248 .asm_1248
ld de, RivalName ld de, RivalName
jr .asm_126a ; 0x124b $1d jr Function126a ; 0x124b $1d
.linkbattle .linkbattle
ld de, $c656 ld de, $c656
jr .asm_126a ; 0x1250 $18 jr Function126a ; 0x1250 $18
Function1252:: ; 1252
push de push de
ld de, PlayerName ld de, PlayerName
call PlaceString call PlaceString
@ -479,10 +483,11 @@ Function1205:: ; 1205
ld a, [PlayerGender] ld a, [PlayerGender]
bit 0, a bit 0, a
ld de, String12a5 ld de, String12a5
jr z, .asm_126a ; 0x1263 $5 jr z, Function126a ; 0x1263 $5
ld de, String12a6 ld de, String12a6
jr .asm_126a ; 0x1268 $0 jr Function126a ; 0x1268 $0
.asm_126a
Function126a:: ; 126a
call PlaceString call PlaceString
ld h, b ld h, b
ld l, c ld l, c
@ -629,6 +634,7 @@ Char4B:: ; 131f
or a or a
call z, Function13cd call z, Function13cd
Function1337:: ; 1337
push de push de
call Function138c call Function138c
call Function138c call Function138c
@ -675,12 +681,12 @@ Function135a:: ; 135a
call Functionaaf call Functionaaf
ld a, [InLinkBattle] ld a, [InLinkBattle]
cp $3 cp $3
jr z, .asm_137c jr z, Function137c
cp $4 cp $4
jr z, .asm_137c jr z, Function137c
call Function13cd call Function13cd
.asm_137c Function137c:: ; 137c
pop hl pop hl
ld de, .string_1382 ld de, .string_1382
dec de dec de
@ -770,10 +776,10 @@ Function13d4:: ; 13d4
; 13e0 ; 13e0
Function13e0:: ; 13e0 Function13e0:: ; 13e0
ld hl, $13e4 ld hl, String_13e4
ret ret
.string_13e4 String_13e4: ; 13e4
db "@" db "@"
; 13e5 ; 13e5