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

Use {hl,de,bc}coord macros wherever possible.

Browse Source
This commit is contained in:
yenatch 2014-06-04 01:10:56 -07:00
parent b17553218b
commit fd8804472d
12 changed files with 1154 additions and 1154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
battle/bg_effects.asm
View File

@ -353,11 +353,11 @@ Functionc81c0: ; c81c0 (32:41c0)
push bc
call Functionc9038
jr nz, .asm_c81d1
ld hl, $c4ac
hlcoord 12, 0
ld bc, $707
jr .asm_c81d7
.asm_c81d1
ld hl, $c51a
hlcoord 2, 6
ld bc, $606
.asm_c81d7
call ClearBox
@ -458,11 +458,11 @@ Functionc825a: ; c825a (32:425a)
push bc
call Functionc9038
jr nz, .asm_c826b
ld hl, $c524
hlcoord 12, 6
ld bc, $107
jr .asm_c8271
.asm_c826b
ld hl, $c51a
hlcoord 2, 6
ld bc, $106
.asm_c8271
call ClearBox
@ -529,11 +529,11 @@ Functionc82c7: ; c82c7 (32:42c7)
push bc
call Functionc9038
jr nz, .asm_c82d8
ld hl, $c510
hlcoord 12, 5
ld bc, $207
jr .asm_c82de
.asm_c82d8
ld hl, $c51a
hlcoord 2, 6
ld bc, $206
.asm_c82de
call ClearBox
@ -594,7 +594,7 @@ Functionc831d: ; c831d (32:431d)
ld a, [hl]
and a
jr z, .asm_c833e
ld hl, $c518
hlcoord 0, 6
ld de, $806
.asm_c832b
push de
@ -613,7 +613,7 @@ Functionc831d: ; c831d (32:431d)
jr nz, .asm_c832b
jr .asm_c8355
.asm_c833e
ld hl, $c4b3
hlcoord 19, 0
ld de, $807
.asm_c8344
push de

96
battle/core.asm
View File

@ -82,7 +82,7 @@ Function3c000: ; 3c000
ld a, [hl]
ld [CurPartySpecies], a
ld [TempBattleMonSpecies], a
ld hl, $c505
hlcoord 1, 5
ld a, $9
call Function3d490
call Function309d
@ -2063,12 +2063,12 @@ Function3cd36: ; 3cd36
Function3cd3c: ; 3cd3c
ld hl, $c55e
hlcoord 10, 9
ld a, [hBattleTurn]
and a
ld a, $1
jr z, .asm_3cd4a
ld hl, $c4ca
hlcoord 2, 2
xor a
.asm_3cd4a
@ -2146,7 +2146,7 @@ Function3cdca: ; 3cdca
cp $1
jr z, .asm_3cde6
call ClearSprites
ld hl, $c4a1
hlcoord 1, 0
ld bc, $040a
call ClearBox
call Function3d2b3
@ -2330,7 +2330,7 @@ Function3cef1: ; 3cef1
ld a, [BattleMonSpecies]
call Function37b6
call Function3d43b
ld hl, $c535
hlcoord 9, 7
ld bc, $050b
call ClearBox
ld hl, BattleText_0x80a75
@ -3140,14 +3140,14 @@ LostBattle: ; 3d38e
Function3d432: ; 3d432
ld hl, $c510
ld de, $c524
hlcoord 12, 5
decoord 12, 6
jp Function3d444
; 3d43b
Function3d43b: ; 3d43b
ld hl, $c569
ld de, $c57d
hlcoord 1, 10
decoord 1, 11
jp Function3d444
; 3d444
@ -3348,7 +3348,7 @@ Function3d557: ; 3d557
ld [$c6e6], a
xor a
ld [$c730], a
ld hl, $c4b2
hlcoord 18, 0
ld a, $8
call Function3d490
call EmptyBattleTextBox
@ -3675,7 +3675,7 @@ Function3d7a0: ; 3d7a0
ld [hBGMapMode], a
call Function1c07
call ClearSprites
ld hl, $c4a1
hlcoord 1, 0
ld bc, $040a
call ClearBox
call WaitBGMap
@ -3718,7 +3718,7 @@ Function3d7c7: ; 3d7c7
jr c, .asm_3d82c
callba CheckBattleScene
jr c, .asm_3d821
ld hl, $c4ac
hlcoord 12, 0
ld d, $0
ld e, $0
ld a, $47
@ -4180,7 +4180,7 @@ Function3db5f: ; 3db5f
ld hl, BattleMonAtkDefDV
ld a, $2d
call Predef
ld hl, $c505
hlcoord 1, 5
ld b, $7
ld c, $8
call ClearBox
@ -4496,9 +4496,9 @@ Function3dd2f: ; 3dd2f
ld a, [hBattleTurn]
ld [$d10a], a
and a
ld hl, $c4ca
hlcoord 2, 2
jr z, .asm_3dda4
ld hl, $c55e
hlcoord 10, 9
.asm_3dda4
ld [$d10a], a
@ -4885,9 +4885,9 @@ PrintPlayerHUD: ; 3dfbf
ld a, $f5
.asm_3e013
ld hl, $c551
hlcoord 17, 8
ld [hl], a
ld hl, $c54e
hlcoord 14, 8
push af
push hl
ld de, BattleMonStatus
@ -4922,7 +4922,7 @@ Function3e036:: ; 3e036
Function3e043: ; 3e043
xor a
ld [hBGMapMode], a
ld hl, $c4a1
hlcoord 1, 0
ld bc, $040b
call ClearBox
callba Function2c0c5
@ -4931,7 +4931,7 @@ Function3e043: ; 3e043
ld [CurPartySpecies], a
call GetBaseData
ld de, EnemyMonNick
ld hl, $c4a1
hlcoord 1, 0
call Function3e138
call PlaceString
ld h, b
@ -4960,9 +4960,9 @@ Function3e043: ; 3e043
ld a, $f5
.asm_3e09a
ld hl, $c4bd
hlcoord 9, 1
ld [hl], a
ld hl, $c4ba
hlcoord 6, 1
push af
push hl
ld de, EnemyMonStatus
@ -5041,7 +5041,7 @@ Function3e043: ; 3e043
.asm_3e11a
xor a
ld [$d10a], a
ld hl, $c4ca
hlcoord 2, 2
ld b, $0
call DrawHPBar
ret
@ -5552,23 +5552,23 @@ Function3e4bc: ; 3e4bc
call CopyBytes
xor a
ld [hBGMapMode], a
ld hl, $c594
hlcoord 4, 12
ld b, $4
ld c, $e
ld a, [$d235]
cp $2
jr nz, .asm_3e503
ld hl, $c544
hlcoord 4, 8
ld b, $4
ld c, $e
.asm_3e503
call TextBox
ld hl, $c5aa
hlcoord 6, 13
ld a, [$d235]
cp $2
jr nz, .asm_3e513
ld hl, $c55a
hlcoord 6, 9
.asm_3e513
ld a, $14
@ -5630,7 +5630,7 @@ Function3e4bc: ; 3e4bc
jr z, .asm_3e58e
dec a
jr nz, .asm_3e5a3
ld hl, $c5c3
hlcoord 11, 14
ld de, .string_3e61c
call PlaceString
jr .asm_3e5a3
@ -5640,7 +5640,7 @@ Function3e4bc: ; 3e4bc
ld a, [$d0e3]
and a
jr z, .asm_3e5a3
ld hl, $c5a9
hlcoord 5, 13
ld bc, $0014
dec a
call AddNTimes
@ -6796,7 +6796,7 @@ Function3ebd8: ; 3ebd8
ld [TrainerClass], a
ld de, VTiles2
callab Function5120d
ld hl, $c4b3
hlcoord 19, 0
ld c, $0
.asm_3ebf3
inc c
@ -7610,11 +7610,11 @@ Function3ee3b: ; 3ee3b
ld [MonType], a
ld a, $1f
call Predef
ld hl, $c4a9
hlcoord 9, 0
ld b, $a
ld c, $9
call TextBox
ld hl, $c4bf
hlcoord 11, 1
ld bc, $0004
ld a, $28
call Predef
@ -7896,7 +7896,7 @@ Function3f22c: ; 3f22c
inc b
push bc
push de
ld hl, $c58d
hlcoord 17, 11
call Function3f41c
pop de
ld a, $1
@ -7912,7 +7912,7 @@ Function3f22c: ; 3f22c
inc b
push bc
push de
ld hl, $c58d
hlcoord 17, 11
call Function3f41c
pop de
ld a, $1
@ -8479,7 +8479,7 @@ Function3f594: ; 3f594
ld [$ffad], a
dec a
ld [$c6e6], a
ld hl, $c4ac
hlcoord 12, 0
ld bc, $0707
ld a, $13
call Predef
@ -8547,7 +8547,7 @@ Function3f607: ; 3f607
xor a
ld [TrainerClass], a
ld [$ffad], a
ld hl, $c4ac
hlcoord 12, 0
ld bc, $0707
ld a, $13
call Predef
@ -8749,7 +8749,7 @@ Function3f77c: ; 3f77c
jr .asm_3f7c3
.asm_3f7c3
ld hl, $c546
hlcoord 6, 8
call PlaceString
callba Function106187
ld c, $c8
@ -8782,7 +8782,7 @@ Function3f77c: ; 3f77c
Function3f80f: ; 3f80f
ld hl, $c546
hlcoord 6, 8
ld de, .Invalid
call PlaceString
ld c, $c8
@ -8827,7 +8827,7 @@ Function3f85f: ; 3f85f
call ClearTileMap
call ClearSprites
call .asm_3f8e0
ld hl, $c540
hlcoord 0, 8
ld b, $5
ld de, $b268
.asm_3f870
@ -8896,19 +8896,19 @@ Function3f85f: ; 3f85f
ret
.asm_3f8e0
ld hl, $c4a1
hlcoord 1, 0
ld de, .Record
call PlaceString
ld hl, $c518
hlcoord 0, 6
ld de, .Result
call PlaceString
ld hl, $c4c8
hlcoord 0, 2
ld de, .Total
call PlaceString
ld hl, $c4f6
hlcoord 6, 4
ld de, $b260
call .asm_3f92b
jr c, .asm_3f92a
@ -8916,14 +8916,14 @@ Function3f85f: ; 3f85f
ld bc, $0204
call PrintNum
ld hl, $c4fb
hlcoord 11, 4
ld de, $b262
call .asm_3f92b
ld bc, $0204
call PrintNum
ld hl, $c500
hlcoord 16, 4
ld de, $b264
call .asm_3f92b
@ -9278,12 +9278,12 @@ Function3fb54: ; 3fb54
Function3fb6c: ; 3fb6c
call Function3fbf8
ld hl, $c590
hlcoord 0, 12
ld b, $4
ld c, $12
call TextBox
callba MobileTextBorder
ld hl, $c505
hlcoord 1, 5
ld bc, $0307
call ClearBox
call Functione51
@ -9303,7 +9303,7 @@ Function3fb6c: ; 3fb6c
ld [hBGMapMode], a
ld a, $31
ld [$ffad], a
ld hl, $c51a
hlcoord 2, 6
ld bc, $0606
ld a, $13
call Predef
@ -9399,7 +9399,7 @@ Function3fc30: ; 3fc30
call Function3fc5b
ld a, $31
ld [$ffad], a
ld hl, $c51a
hlcoord 2, 6
ld bc, $0606
ld a, $13
call Predef

20
battle/effect_commands.asm
View File

@ -4657,7 +4657,7 @@ BattleCommand42: ; 35926
call .asm_3597d
ld a, $1
ld [$d10a], a
ld hl, $c55e
hlcoord 10, 9
ld a, $b
call Predef
ld hl, EnemyMonHPHi
@ -4673,7 +4673,7 @@ BattleCommand42: ; 35926
xor a
ld [$d10a], a
call ResetDamage
ld hl, $c4ca
hlcoord 2, 2
ld a, $b
call Predef
callba Function178000
@ -5383,7 +5383,7 @@ Function35d1c: ; 35d1c
ld [$d1ef], a
ld a, [hl]
ld [$d1ee], a
ld hl, $c4ca
hlcoord 2, 2
xor a
ld [$d10a], a
ld a, $b
@ -5441,7 +5441,7 @@ Function35d7e: ; 35d7e
ld [$d1eb], a
ld a, [hl]
ld [$d1ea], a
ld hl, $c55e
hlcoord 10, 9
ld a, $1
ld [$d10a], a
ld a, $b
@ -5884,10 +5884,10 @@ Function36011: ; 36011
.asm_36070
ld a, [hBattleTurn]
and a
ld hl, $c55e
hlcoord 10, 9
ld a, $1
jr z, .asm_3607e ; 0x36078 $4
ld hl, $c4ca
hlcoord 2, 2
xor a
.asm_3607e
ld [$d10a], a
@ -7268,7 +7268,7 @@ BattleCommand23: ; 3680f
call AnimateCurrentMove
ld c, $14
call DelayFrames
ld hl, $c4a1
hlcoord 1, 0
ld bc, $040a
call ClearBox
ld c, $14
@ -7362,7 +7362,7 @@ BattleCommand23: ; 3680f
call AnimateCurrentMove
ld c, $14
call DelayFrames
ld hl, $c535
hlcoord 9, 7
ld bc, $050b
call ClearBox
ld c, $14
@ -8029,12 +8029,12 @@ BattleCommand27: ; 36cb2
ld [hli], a
ld [hl], a
.asm_36cfe
ld hl, $c55e
hlcoord 10, 9
ld a, [hBattleTurn]
and a
ld a, $1
jr z, .asm_36d0c ; 36d06 $4
ld hl, $c4ca
hlcoord 2, 2
xor a
.asm_36d0c
ld [$d10a], a

10
engine/credits.asm
View File

@ -537,13 +537,13 @@ Function109a95: ; 109a95 (42:5a95)
ld bc, $168
call ByteFill
ld a, $7f
ld hl, $c4f0
hlcoord 0, 4
ld bc, $118
call ByteFill
ld hl, $c4f0
hlcoord 0, 4
ld a, $24
call Function109b1d
ld hl, $c5f4
hlcoord 0, 17
ld a, $20
call Function109b1d
ld hl, AttrMap ; $cdd9
@ -787,9 +787,9 @@ CreditsMonsFrames: ; 109bf1
; known jump sources: 109a1b (42:5a1b)
Function109c11: ; 109c11 (42:5c11)
ld a, $40
ld hl, $c55a
hlcoord 6, 9
call Function109c1c
ld hl, $c56e
hlcoord 6, 10
; known jump sources: 109c16 (42:5c16)
Function109c1c: ; 109c1c (42:5c1c)

8
engine/title.asm
View File

@ -115,15 +115,15 @@ _TitleScreen: ; 10ed67
call ByteFill
; Draw Pokemon logo
ld hl, $c4dc ; TileMap(0,3)
ld bc, $0714 ; 20x7
hlcoord 0, 3
lb bc, 7, 20
ld d, $80
ld e, $14
call DrawTitleGraphic
; Draw copyright text
ld hl, $9c03 ; BGMap1(3,0)
ld bc, $010d ; 13x1
lb bc, 1, 13
ld d, $c
ld e, $10
call DrawTitleGraphic
@ -262,7 +262,7 @@ Unknown_10eece: ; 10eece
Function10eed2: ; 10eed2
ld hl, $c596
hlcoord 6, 12
ld b, $6
.asm_10eed7
ld c, $8

2
gfx/pics/animation.asm
View File

@ -2,7 +2,7 @@
Functiond0000: ; d0000
ld hl, $c4ac
hlcoord 12, 0
ld a, [IsInBattle]
cp $1
jr z, .asm_d0012

2
home.asm
View File

@ -2350,7 +2350,7 @@ Function3eea:: ; 3eea
Function3efd:: ; 3efd
push hl
ld hl, $c590
hlcoord 0, 12
ld b, $4
ld c, $12
call Function3f0d

6
home/map.asm
View File

@ -1219,7 +1219,7 @@ Function272a:: ; 272a
; 2748
Function2748:: ; 2748
ld hl, $c5e0
hlcoord 0, 16
ld de, BGMapBuffer
call Function27b7
ld c, $28
@ -1258,7 +1258,7 @@ Function2771:: ; 2771
; 278f
Function278f:: ; 278f
ld hl, $c4b2
hlcoord 18, 0
ld de, BGMapBuffer
call Function27c0
ld c, $24
@ -1987,7 +1987,7 @@ Function2b74:: ; 0x2b74
call WhiteBGMap
call ClearSprites
call Function2bae
ld hl, $c590 ; tile 0, 12
hlcoord 0, 12
ld bc, $0412
call TextBox
ld hl, VramState

10
home/text.asm
View File

@ -605,13 +605,13 @@ Function12f2:: ; 12f2
.asm_1301
call Function13b6
call Functionaaf
ld hl, $c5b9
hlcoord 1, 14
ld bc, $0312
call ClearBox
call Function13cd
ld c, $14
call DelayFrames
ld hl, $c5b9
hlcoord 1, 14
pop de
jp NextChar
; 131f
@ -704,8 +704,8 @@ Function1383:: ; 1383
; 138c
Function138c:: ; 138c
ld hl, $c5b9
ld de, $c5a5
hlcoord 1, 14
decoord 1, 13
ld a, $3
.asm_1394
push af
@ -723,7 +723,7 @@ Function138c:: ; 138c
pop af
dec a
jr nz, .asm_1394
ld hl, $c5e1
hlcoord 1, 16
ld a, $7f
ld bc, $0012
call ByteFill

6
items/item_effects.asm
View File

@ -1408,12 +1408,12 @@ RareCandy: ; ef14
ld a, $1f
call Predef
ld hl, $c4a9
hlcoord 9, 0
ld b, 10
ld c, 9
call TextBox
ld hl, $c4bf
hlcoord 11, 1
ld bc, $0004
ld a, $28
call Predef
@ -1829,7 +1829,7 @@ Functionf1db: ; f1db (3:71db)
call WaitPlaySFX
pop de
ld a, [CurPartyMon] ; $d109
ld hl, $c4ab
hlcoord 11, 0
ld bc, $28
call AddNTimes
ld a, $2

2122
main.asm
View File

File diff suppressed because it is too large Load Diff

10
misc/crystal_misc.asm
View File

@ -481,10 +481,10 @@ Function17a964: ; 17a964 (5e:6964)
; known jump sources: 17a75b (5e:675b)
Function17a97b: ; 17a97b (5e:697b)
ld hl, $c4b5
hlcoord 1, 1
ld bc, $212
call ClearBox
ld hl, $c4cb
hlcoord 3, 2
ld de, Buffer1 ; $d1ea (aliases: MagikarpLength)
ld a, [$d08c]
and a
@ -505,11 +505,11 @@ Function17a97b: ; 17a97b (5e:697b)
; known jump sources: 17a92f (5e:692f)
Function17a99e: ; 17a99e (5e:699e)
ld hl, $c590
hlcoord 0, 12
ld b, $4
ld c, $12
call Function17ac46
ld hl, $c5ba
hlcoord 2, 14
ld de, $69b2
call PlaceString
ret
@ -784,7 +784,7 @@ Function17ac0c: ; 17ac0c (5e:6c0c)
; known jump sources: 17a7e3 (5e:67e3), 17a804 (5e:6804), 17a826 (5e:6826), 17ac0c (5e:6c0c)
Function17ac1d: ; 17ac1d (5e:6c1d)
ld hl, $6cd5
ld de, $c4f0
decoord 0, 4
ld bc, $118
call CopyBytes
ret