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

Blindly use wram labels for everything except mobile, part 1.

Browse Source 
Wram banks and mobile make this tough, since any address can secretly be a ghost.

As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
This commit is contained in:
yenatch
2015-02-08 00:03:32 -08:00
parent 0683bc8770
commit 8e03321069
21 changed files with 10879 additions and 10151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
battle/ai/items.asm
View File

@@ -16,12 +16,12 @@ Function38000: ; 38000
bit SUBSTATUS_CANT_RUN, a
jr nz, DontSwitch
ld a, [$c731]
ld a, [wc731]
and a
jr nz, DontSwitch
ld hl, TrainerClassAttributes + 5
ld a, [$cfc0]
ld a, [wcfc0]
and a
jr nz, .ok
ld a, [TrainerClass]
@@ -44,7 +44,7 @@ DontSwitch: ; 38041
SwitchOften: ; 38045
callab Function34941
ld a, [$c717]
ld a, [wc717]
and $f0
jp z, DontSwitch
@@ -70,16 +70,16 @@ SwitchOften: ; 38045
jp c, DontSwitch
.switch
ld a, [$c717]
ld a, [wc717]
and $f
inc a
ld [$c718], a
ld [wc718], a
jp AI_TrySwitch
; 38083
SwitchRarely: ; 38083
callab Function34941
ld a, [$c717]
ld a, [wc717]
and $f0
jp z, DontSwitch
@@ -105,16 +105,16 @@ SwitchRarely: ; 38083
jp c, DontSwitch
.switch
ld a, [$c717]
ld a, [wc717]
and $f
inc a
ld [$c718], a
ld [wc718], a
jp AI_TrySwitch
; 380c1
SwitchSometimes: ; 380c1
callab Function34941
ld a, [$c717]
ld a, [wc717]
and $f0
jp z, DontSwitch
@@ -140,10 +140,10 @@ SwitchSometimes: ; 380c1
jp c, DontSwitch
.switch
ld a, [$c717]
ld a, [wc717]
and $f
inc a
ld [$c718], a
ld [wc718], a
jp AI_TrySwitch
; 380ff
@@ -156,13 +156,13 @@ Function380ff: ; 380ff
AI_TryItem: ; 38105
ld a, [$cfc0]
ld a, [wcfc0]
and a
ret nz
ld a, [$c650]
ld a, [wc650]
ld b, a
ld a, [$c651]
ld a, [wc651]
or b
ret z
@@ -177,7 +177,7 @@ AI_TryItem: ; 38105
ld b, h
ld c, l
ld hl, AI_Items
ld de, $c650
ld de, wc650
.loop
ld a, [hl]
and a
@@ -221,15 +221,15 @@ AI_TryItem: ; 38105
xor a
ld [de], a
inc a
ld [$c70f], a
ld [wc70f], a
ld hl, EnemySubStatus3
res SUBSTATUS_BIDE, [hl]
xor a
ld [EnemyFuryCutterCount], a
ld [$c681], a
ld [$c72c], a
ld [EnemyProtectCount], a
ld [wc72c], a
ld hl, EnemySubStatus4
res SUBSTATUS_RAGE, [hl]
@@ -545,7 +545,7 @@ AIUpdateHUD: ; 38387
callba UpdateEnemyHUD
ld a, $1
ld [hBGMapMode], a
ld hl, $c6e6
ld hl, wc6e6
dec [hl]
scf
ret
@@ -568,20 +568,20 @@ Function383a3: ; 383a3 (e:43a3)
Function383ae: ; 383ae (e:43ae)
ld a, MAX_POTION
ld [$d1f1], a
ld [wd1f1], a
jr asm_383c6
Function383b5: ; 383b5 (e:43b5)
call AI_HealStatus
ld a, FULL_RESTORE
ld [$d1f1], a
ld [wd1f1], a
ld hl, EnemySubStatus3
res SUBSTATUS_CONFUSED, [hl]
xor a
ld [EnemyConfuseCount], a
asm_383c6: ; 383c6
ld de, $d1ec
ld de, wd1ec
ld hl, EnemyMonHP + 1
ld a, [hld]
ld [de], a
@@ -617,20 +617,20 @@ Function383f4: ; 383f4 (e:43f4)
ld b, 200
Function383f8: ; 383f8
ld [$d1f1], a
ld [wd1f1], a
ld hl, EnemyMonHP + 1
ld a, [hl]
ld [$d1ec], a
ld [wd1ec], a
add b
ld [hld], a
ld [$d1ee], a
ld [wd1ee], a
ld a, [hl]
ld [$d1ec + 1], a
ld [$d1ee + 1], a
ld [wd1ec + 1], a
ld [wd1ee + 1], a
jr nc, .asm_38415
inc a
ld [hl], a
ld [$d1ee + 1], a
ld [wd1ee + 1], a
.asm_38415
inc hl
ld a, [hld]
@@ -650,17 +650,17 @@ Function383f8: ; 383f8
ld a, [de]
dec de
ld [hld], a
ld [$d1ee], a
ld [wd1ee], a
ld a, [de]
ld [hl], a
ld [$d1ef], a
ld [wd1ef], a
.asm_38436
Function38436: ; 38436
call Function38571
hlcoord 2, 2
xor a
ld [$d10a], a
ld [wd10a], a
call AIUsedItemSound
predef Functionc6e0
jp AIUpdateHUD
@@ -695,8 +695,8 @@ AI_TrySwitch: ; 3844b
AI_Switch: ; 3846c
ld a, $1
ld [$c711], a
ld [$c70f], a
ld [wEnemyIsSwitching], a
ld [wc70f], a
ld hl, EnemySubStatus4
res SUBSTATUS_RAGE, [hl]
xor a
@@ -718,7 +718,7 @@ AI_Switch: ; 3846c
call PrintText
.asm_384a3
ld a, $1
ld [$d264], a
ld [wd264], a
callab NewEnemyMonStatus
callab ResetEnemyStatLevels
ld hl, PlayerSubStatus1
@@ -726,7 +726,7 @@ AI_Switch: ; 3846c
callba Function3d4e1
callba Function3d57a
xor a
ld [$d264], a
ld [wd264], a
ld a, [InLinkBattle]
and a
ret nz
@@ -832,7 +832,7 @@ Function38553: ; 38553
ld a, X_SPECIAL
Function38557:
ld [$d1f1], a
ld [wd1f1], a
push bc
call Function38571
pop bc
@@ -842,17 +842,17 @@ Function38557:
Function38568: ; 38568
ld [$d1f1], a
ld [wd1f1], a
call Function38571
jp AIUpdateHUD
; 38571
Function38571: ; 38571
ld a, [$d1f1]
ld [$d265], a
ld a, [wd1f1]
ld [wd265], a
call GetItemName
ld hl, StringBuffer1
ld de, $d050
ld de, wd050
ld bc, ITEM_NAME_LENGTH
call CopyBytes
ld hl, UnknownText_0x3858c

40
battle/ai/scoring.asm
View File

@@ -179,7 +179,7 @@ AI_Types: ; 38635
pop bc
pop hl
ld a, [$d265]
ld a, [wd265]
and a
jr z, .immune
cp 10 ; 1.0
@@ -431,7 +431,7 @@ AI_Smart_LeechHit: ; 387f7
pop hl
; 60% chance to discourage this move if not very effective.
ld a, [$d265]
ld a, [wd265]
cp 10 ; 1.0
jr c, .asm_38815
@@ -509,7 +509,7 @@ AI_Smart_LockOn: ; 3881d
push hl
push bc
callba Function347c8
ld a, [$d265]
ld a, [wd265]
cp $a
pop bc
pop hl
@@ -969,7 +969,7 @@ AI_Smart_Whirlwind: ; 38a2a
push hl
callab Function3484e
ld a, [$c716]
ld a, [wc716]
cp 10 ; neutral
pop hl
ret c
@@ -1048,7 +1048,7 @@ AI_Smart_Bind: ; 38a71
; Bind, Wrap, Fire Spin, Clamp
; 50% chance to discourage this move if the player is already trapped.
ld a, [$c730]
ld a, [wc730]
and a
jr nz, .asm_38a8b
@@ -1325,11 +1325,11 @@ AI_Smart_Rage: ; 38b7f
; Encourage this move based on Rage's counter.
.asm_38b8c
ld a, [$c72c]
ld a, [wc72c]
cp $2
ret c
dec [hl]
ld a, [$c72c]
ld a, [wc72c]
cp $3
ret c
dec [hl]
@@ -1368,7 +1368,7 @@ AI_Smart_Mimic: ; 38ba8
ld [hBattleTurn], a
callab Function347c8
ld a, [$d265]
ld a, [wd265]
cp $a
pop hl
jr c, .asm_38bef
@@ -1489,7 +1489,7 @@ AI_Smart_Encore: ; 38c3b
predef Function347d3
pop hl
ld a, [$d265]
ld a, [wd265]
cp $a
jr nc, .asm_38c68
@@ -1811,7 +1811,7 @@ AI_Smart_Conversion2: ; 38d98
callab Function347c8
ld a, [$d265]
ld a, [wd265]
cp $a
pop hl
jr c, .asm_38dc9
@@ -1888,7 +1888,7 @@ AI_Smart_MeanLook: ; 38dfb
; Otherwise, discourage this move unless the player only has not very effective moves against the enemy.
push hl
callab Function3484e
ld a, [$c716]
ld a, [wc716]
cp $b ; not very effective
pop hl
ret nc
@@ -2051,7 +2051,7 @@ AI_Smart_Curse: ; 38e5c
AI_Smart_Protect: ; 38ed2
ld a, [$c681]
ld a, [EnemyProtectCount]
and a
jr nz, .asm_38f13
@@ -2146,7 +2146,7 @@ AI_Smart_PerishSong: ; 38f4a
push hl
callab Function3484e
ld a, [$c716]
ld a, [wc716]
cp 10 ; 1.0
pop hl
ret c
@@ -2218,7 +2218,7 @@ AI_Smart_Sandstorm: ; 38f7a
AI_Smart_Endure: ; 38fac
ld a, [$c681]
ld a, [EnemyProtectCount]
and a
jr nz, .asm_38fd8
@@ -2404,7 +2404,7 @@ AI_Smart_BatonPass: ; 39062
push hl
callab Function3484e
ld a, [$c716]
ld a, [wc716]
cp 10 ; neutral
pop hl
ret c
@@ -2437,7 +2437,7 @@ AI_Smart_RapidSpin: ; 39084
; 80% chance to greatly encourage this move if the enemy is
; trapped (Bind effect), seeded, or scattered with spikes.
ld a, [$c731]
ld a, [wc731]
and a
jr nz, .asm_39097
@@ -2470,7 +2470,7 @@ AI_Smart_HiddenPower: ; 3909e
pop hl
; Discourage Hidden Power if not very effective.
ld a, [$d265]
ld a, [wd265]
cp 10
jr c, .bad
@@ -2480,7 +2480,7 @@ AI_Smart_HiddenPower: ; 3909e
jr c, .bad
; Encourage Hidden Power if super-effective.
ld a, [$d265]
ld a, [wd265]
cp 11
jr nc, .good
@@ -2825,7 +2825,7 @@ AI_Smart_FutureSight: ; 391f3
AI_Smart_Stomp: ; 39200
; 80% chance to encourage this move if the player has used Minimize.
ld a, [$c6fe]
ld a, [wc6fe]
and a
ret z
@@ -3463,7 +3463,7 @@ AI_Status: ; 39453
pop bc
pop hl
ld a, [$d265]
ld a, [wd265]
and a
jr nz, .checkmove

240
battle/anim_commands.asm
View File

File diff suppressed because it is too large Load Diff

80
battle/anim_objects.asm
View File

@@ -2,7 +2,7 @@
Functioncc9a1: ; cc9a1 (33:49a1)
ld hl, $d30a
ld hl, OTPartyMon3HP
ld e, $a
.asm_cc9a6
ld a, [hl]
@@ -17,7 +17,7 @@ Functioncc9a1: ; cc9a1 (33:49a1)
.asm_cc9b3
ld c, l
ld b, h
ld hl, $d40e
ld hl, wd40e
inc [hl]
call Functioncc9c4
ret
@@ -32,7 +32,7 @@ Functioncc9bd: ; cc9bd
Functioncc9c4: ; cc9c4 (33:49c4)
ld a, [$d419]
ld a, [BattleAnimTemps]
ld e, a
ld d, 0
ld hl, BattleAnimObjects
@@ -46,7 +46,7 @@ Functioncc9c4: ; cc9c4 (33:49c4)
ld d, h
ld hl, $0
add hl, bc
ld a, [$d40e]
ld a, [wd40e]
ld [hli], a
ld a, [de]
inc de
@@ -66,14 +66,14 @@ Functioncc9c4: ; cc9c4 (33:49c4)
ld a, [de]
call Functionccb31
ld [hli], a
ld a, [$d41a]
ld a, [BattleAnimTemps + 1]
ld [hli], a
ld a, [$d41b]
ld a, [BattleAnimTemps + 2]
ld [hli], a
xor a
ld [hli], a
ld [hli], a
ld a, [$d41c]
ld a, [BattleAnimTemps + 3]
ld [hli], a
xor a
ld [hli], a
@@ -94,35 +94,35 @@ Functioncca09: ; cca09
cp $fc
jp z, .asm_ccaa2
push af
ld hl, $d419
ld a, [$d420]
ld hl, BattleAnimTemps
ld a, [BattleAnimTemps + 7]
xor [hl]
and $e0
ld [hl], a
pop af
push bc
call Functionce83c
ld a, [$d41b]
ld a, [BattleAnimTemps + 2]
add [hl]
ld [$d41b], a
ld [BattleAnimTemps + 2], a
inc hl
ld a, [hli]
ld c, a
ld a, [hli]
ld h, [hl]
ld l, a
ld a, [$d418]
ld a, [wd418]
ld e, a
ld d, $c4
.asm_cca3c
ld a, [$d41d]
ld a, [BattleAnimTemps + 4]
ld b, a
ld a, [$d41f]
ld a, [BattleAnimTemps + 6]
add b
ld b, a
push hl
ld a, [hl]
ld hl, $d419
ld hl, BattleAnimTemps
bit 6, [hl]
jr z, .asm_cca53
add $8
@@ -135,14 +135,14 @@ Functioncca09: ; cca09
ld [de], a
inc hl
inc de
ld a, [$d41c]
ld a, [BattleAnimTemps + 3]
ld b, a
ld a, [$d41e]
ld a, [BattleAnimTemps + 5]
add b
ld b, a
push hl
ld a, [hl]
ld hl, $d419
ld hl, BattleAnimTemps
bit 5, [hl]
jr z, .asm_cca6f
add $8
@@ -155,13 +155,13 @@ Functioncca09: ; cca09
ld [de], a
inc hl
inc de
ld a, [$d41b]
ld a, [BattleAnimTemps + 2]
add $31
add [hl]
ld [de], a
inc hl
inc de
ld a, [$d419]
ld a, [BattleAnimTemps]
ld b, a
ld a, [hl]
xor b
@@ -171,14 +171,14 @@ Functioncca09: ; cca09
and $10
or b
ld b, a
ld a, [$d421]
ld a, [BattleAnimTemps + 8]
and $f
or b
ld [de], a
inc hl
inc de
ld a, e
ld [$d418], a
ld [wd418], a
cp $a0
jr nc, .asm_ccaa7
dec c
@@ -204,36 +204,36 @@ Functionccaaa: ; ccaaa
add hl, bc
ld a, [hl]
and $80
ld [$d419], a
ld [BattleAnimTemps], a
xor a
ld [$d420], a
ld [BattleAnimTemps + 7], a
ld hl, $0005
add hl, bc
ld a, [hl]
ld [$d421], a
ld [BattleAnimTemps + 8], a
ld hl, $0002
add hl, bc
ld a, [hl]
ld [$d41a], a
ld [BattleAnimTemps + 1], a
ld hl, $0006
add hl, bc
ld a, [hli]
ld [$d41b], a
ld [BattleAnimTemps + 2], a
ld a, [hli]
ld [$d41c], a
ld [BattleAnimTemps + 3], a
ld a, [hli]
ld [$d41d], a
ld [BattleAnimTemps + 4], a
ld a, [hli]
ld [$d41e], a
ld [BattleAnimTemps + 5], a
ld a, [hli]
ld [$d41f], a
ld [BattleAnimTemps + 6], a
ld a, [hBattleTurn]
and a
ret z
ld hl, $0001
add hl, bc
ld a, [hl]
ld [$d419], a
ld [BattleAnimTemps], a
bit 0, [hl]
ret z
ld hl, $0007
@@ -242,10 +242,10 @@ Functionccaaa: ; ccaaa
ld d, a
ld a, $b4
sub d
ld [$d41c], a
ld [BattleAnimTemps + 3], a
ld a, [hli]
ld d, a
ld a, [$d41a]
ld a, [BattleAnimTemps + 1]
cp $ff
jr nz, .asm_ccb09
ld a, $28
@@ -275,11 +275,11 @@ Functionccaaa: ; ccaaa
pop af
.asm_ccb26
ld [$d41d], a
ld [BattleAnimTemps + 4], a
ld a, [hli]
xor $ff
inc a
ld [$d41e], a
ld [BattleAnimTemps + 5], a
ret
; ccb31
@@ -287,7 +287,7 @@ Functionccaaa: ; ccaaa
Functionccb31: ; ccb31 (33:4b31)
push hl
push bc
ld hl, $d300
ld hl, wd300
ld b, a
ld c, $5
.asm_ccb39
@@ -950,7 +950,7 @@ Functioncd249: ; cd249 (33:5249)
push af
ld a, $1
ld [rSVBK], a ; $ff00+$70
ld a, [CurItem] ; $d106
ld a, [CurItem] ; CurItem
ld e, a
pop af
ld [rSVBK], a ; $ff00+$70
@@ -3894,7 +3894,7 @@ Functionce29f: ; ce29f (33:629f)
ld hl, $f
add hl, bc
and [hl]
ld [$cfc8], a
ld [wcfc8], a
ret
; ce2c4 (33:62c4)
@@ -4853,7 +4853,7 @@ Functionce7d1: ; ce7d1
ld a, [hl]
and $c0
srl a
ld [$d420], a
ld [BattleAnimTemps + 7], a
pop af
ret

188
battle/bg_effects.asm
View File

@@ -1,7 +1,7 @@
; BG effects for use in battle animations.
Functionc8000: ; c8000 (32:4000)
ld hl, $d3fa
ld hl, ActiveBGEffects
ld e, $5
.asm_c8005
ld a, [hl]
@@ -22,7 +22,7 @@ Functionc8000: ; c8000 (32:4000)
ret
Functionc801a: ; c801a (32:401a)
ld hl, $d3fa
ld hl, ActiveBGEffects
ld e, $5
.asm_c801f
ld a, [hl]
@@ -39,13 +39,13 @@ Functionc801a: ; c801a (32:401a)
ld b, h
ld hl, $0
add hl, bc
ld a, [$d419]
ld a, [BattleAnimTemps]
ld [hli], a
ld a, [$d41a]
ld a, [BattleAnimTemps + 1]
ld [hli], a
ld a, [$d41b]
ld a, [BattleAnimTemps + 2]
ld [hli], a
ld a, [$d41c]
ld a, [BattleAnimTemps + 3]
ld [hl], a
ret
@@ -182,7 +182,7 @@ Functionc80f3: ; c80f3 (32:40f3)
Functionc80fb: ; c80fb (32:40fb)
ld a, $1
ld [$d419], a
ld [BattleAnimTemps], a
ld hl, $1
add hl, bc
ld a, [hl]
@@ -214,14 +214,14 @@ Functionc80fb: ; c80fb (32:40fb)
ld h, 0
add hl, de
ld a, [hl]
ld [$cfc7], a
ld [wcfc7], a
ret
Functionc812d: ; c812d (32:412d)
ld de, Unknown_c813d
call Functionc8d57
jr c, .asm_c8139
ld [$cfc7], a
ld [wcfc7], a
ret
.asm_c8139
call EndBattleBGEffect
@@ -236,7 +236,7 @@ Functionc8141: ; c8141 (32:4141)
ld de, Unknown_c8151
call Functionc8d57
jr c, .asm_c814d
ld [$cfc7], a
ld [wcfc7], a
ret
.asm_c814d
call EndBattleBGEffect
@@ -251,8 +251,8 @@ Functionc8155: ; c8155 (32:4155)
ld de, Unknown_c8168
call Functionc8d57
jr c, .asm_c8164
ld [$cfc7], a
ld [$cfc9], a
ld [wcfc7], a
ld [wcfc9], a
ret
.asm_c8164
call EndBattleBGEffect
@@ -272,7 +272,7 @@ Functionc8171: ; c8171 (32:4171)
ld de, Unknown_c8188
.asm_c817e
call Functionc8d57
ld [$cfc8], a
ld [wcfc8], a
ret
; c8185 (32:4185)
@@ -293,7 +293,7 @@ Functionc818b: ; c818b (32:418b)
ld de, Unknown_c81a2
.asm_c8198
call Functionc8d57
ld [$cfc8], a
ld [wcfc8], a
ret
; c819f (32:419f)
@@ -308,7 +308,7 @@ Unknown_c81a2:
Functionc81a5: ; c81a5 (32:41a5)
ld de, Unknown_c81af
call Functionc8d57
ld [$cfc7], a
ld [wcfc7], a
ret
; c81af (32:41af)
@@ -367,9 +367,9 @@ Functionc81ea: ; c81ea (32:41ea)
ld de, Unknown_c820c
.asm_c8200
ld a, e
ld [$d41a], a
ld [BattleAnimTemps + 1], a
ld a, d
ld [$d41b], a
ld [BattleAnimTemps + 2], a
call Functionc83ed
ret
; c820c (32:420c)
@@ -399,7 +399,7 @@ Jumptable_c8217: ; c8217 (32:4217)
Functionc8223: ; c8223 (32:4223)
call Functionc9042
jr z, .asm_c8230
ld hl, $d40e
ld hl, wd40e
inc [hl]
call EndBattleBGEffect
ret
@@ -409,19 +409,19 @@ Functionc8223: ; c8223 (32:4223)
call Functionc9038
jr nz, .asm_c8242
ld a, $b8
ld [$d419], a
ld [BattleAnimTemps], a
ld a, $84
jr .asm_c8249
.asm_c8242
ld a, $b9
ld [$d419], a
ld [BattleAnimTemps], a
ld a, $30
.asm_c8249
ld [$d41a], a
ld [BattleAnimTemps + 1], a
ld a, $40
ld [$d41b], a
ld [BattleAnimTemps + 2], a
xor a
ld [$d41c], a
ld [BattleAnimTemps + 3], a
call Functionc82ee
pop bc
ret
@@ -465,7 +465,7 @@ Jumptable_c8284: ; c8284 (32:4284)
Functionc8290: ; c8290 (32:4290)
call Functionc9042
jr z, .asm_c829d
ld hl, $d40e
ld hl, wd40e
inc [hl]
call EndBattleBGEffect
ret
@@ -475,19 +475,19 @@ Functionc8290: ; c8290 (32:4290)
call Functionc9038
jr nz, .asm_c82af
ld a, $ba
ld [$d419], a
ld [BattleAnimTemps], a
ld a, $84
jr .asm_c82b6
.asm_c82af
ld a, $bb
ld [$d419], a
ld [BattleAnimTemps], a
ld a, $30
.asm_c82b6
ld [$d41a], a
ld [BattleAnimTemps + 1], a
ld a, $40
ld [$d41b], a
ld [BattleAnimTemps + 2], a
xor a
ld [$d41c], a
ld [BattleAnimTemps + 3], a
call Functionc82ee
pop bc
ret
@@ -628,9 +628,9 @@ Functionc837b: ; c837b (32:437b)
ld de, Unknown_c8394
.asm_c8388
ld a, e
ld [$d41a], a
ld [BattleAnimTemps + 1], a
ld a, d
ld [$d41b], a
ld [BattleAnimTemps + 2], a
call Functionc83ed
ret
; c8394 (32:4394)
@@ -658,9 +658,9 @@ Functionc83a8: ; c83a8 (32:43a8)
ld de, Unknown_c83c1
.asm_c83b5
ld a, e
ld [$d41a], a
ld [BattleAnimTemps + 1], a
ld a, d
ld [$d41b], a
ld [BattleAnimTemps + 2], a
call Functionc83ed
ret
; c83c1 (32:43c1)
@@ -704,9 +704,9 @@ Functionc83fa: ; c83fa (32:43fa)
ld e, [hl]
ld d, $0
inc [hl]
ld a, [$d41a]
ld a, [BattleAnimTemps + 1]
ld l, a
ld a, [$d41b]
ld a, [BattleAnimTemps + 2]
ld h, a
add hl, de
add hl, de
@@ -788,7 +788,7 @@ Functionc8458: ; c8458 (32:4458)
pop hl
inc hl
ld a, [hli]
ld [$d419], a
ld [BattleAnimTemps], a
push de
ld e, [hl]
ld d, 0
@@ -802,7 +802,7 @@ Functionc8458: ; c8458 (32:4458)
.asm_c8484
push bc
push hl
ld a, [$d419]
ld a, [BattleAnimTemps]
ld b, a
.asm_c848a
ld a, [de]
@@ -912,8 +912,8 @@ Functionc8561: ; c8561 (32:4561)
ret
Functionc8565: ; c8565 (32:4565)
ld hl, $d422
ld de, $d423
ld hl, wd422
ld de, wd422 + 1
ld c, $3f
ld a, [hl]
push af
@@ -925,8 +925,8 @@ Functionc8565: ; c8565 (32:4565)
jr nz, .asm_c856f
pop af
ld [hl], a
ld de, $d200
ld hl, $d422
ld de, LYOverridesBackup
ld hl, wd422
ld bc, $0
.asm_c8580
ld a, [$ffc7]
@@ -1006,7 +1006,7 @@ Functionc85ce: ; c85ce (32:45ce)
ld hl, $1
add hl, bc
ld a, [hl]
ld [$d419], a
ld [BattleAnimTemps], a
ld hl, $2
add hl, bc
ld a, [hl]
@@ -1509,10 +1509,10 @@ Functionc8888: ; c8888 (32:4888)
Functionc88a5: ; c88a5 (32:48a5)
push af
ld a, [FXAnimIDHi] ; $cfc3
ld a, [FXAnimIDHi] ; FXAnimIDHi
or a
jr nz, .asm_c88b3
ld a, [FXAnimIDLo] ; $cfc2
ld a, [FXAnimIDLo] ; FXAnimID
cp ROLLOUT
jr z, .asm_c88b7
.asm_c88b3
@@ -1990,7 +1990,7 @@ Functionc8b22: ; c8b22 (32:4b22)
ld hl, Unknown_c8bd8
add hl, de
ld a, [hli]
ld [$cfc9], a
ld [wcfc9], a
ld d, a
ld e, [hl]
ld bc, $2f30
@@ -2001,7 +2001,7 @@ Functionc8b22: ; c8b22 (32:4b22)
ld d, [hl]
inc hl
ld a, [hl]
ld [$cfc9], a
ld [wcfc9], a
ld e, a
ld bc, $3728
.asm_c8b5b
@@ -2012,12 +2012,12 @@ Functionc8b22: ; c8b22 (32:4b22)
Functionc8b60: ; c8b60 (32:4b60)
call Functionc8f19
ld a, $e4
ld [$cfc7], a
ld [$cfc9], a
ld [wcfc7], a
ld [wcfc9], a
ret
Functionc8b6c: ; c8b6c (32:4b6c)
ld hl, $d200
ld hl, LYOverridesBackup
.asm_c8b6f
ld [hl], d
inc hl
@@ -2303,7 +2303,7 @@ Functionc8ce1: ; c8ce1 (32:4ce1)
ld [hSCY], a ; $ff00+$d0
xor $ff
inc a
ld [$d314], a
ld [OTPartyMon3SpclAtk], a
ret
Functionc8cf9: ; c8cf9 (32:4cf9)
@@ -2563,13 +2563,13 @@ Functionc8e52: ; c8e52 (32:4e52)
ld a, h
push bc
push af
ld hl, BGPals ; $d080
ld de, Unkn1Pals ; $d000
ld hl, BGPals ; BGPals
ld de, Unkn1Pals ; wd000
ld b, a
ld c, $1
call CopyPals
ld hl, $d0c8
ld de, $d048
ld hl, OBPals + 8
ld de, Unkn2Pals + 8
pop af
ld b, a
ld c, $1
@@ -2590,13 +2590,13 @@ Functionc8e7f: ; c8e7f (32:4e7f)
ld a, h
push bc
push af
ld hl, $d088
ld de, $d008
ld hl, BGPals + 8
ld de, Unkn1Pals + 8
ld b, a
ld c, $1
call CopyPals
ld hl, OBPals ; $d0c0
ld de, Unkn2Pals ; $d040
ld hl, OBPals ; OBPals
ld de, Unkn2Pals ; wd040
pop af
ld b, a
ld c, $1
@@ -2638,7 +2638,7 @@ Functionc8eca: ; c8eca (32:4eca)
xor a
Functionc8ecb: ; c8ecb (32:4ecb)
ld hl, LYOverrides ; $d100
ld hl, LYOverrides ; wd100
ld e, $99
.asm_c8ed0
ld [hli], a
@@ -2697,8 +2697,8 @@ Functionc8f19: ; c8f19 (32:4f19)
ld [hLCDStatCustom], a ; $ff00+$c6
ld a, $e4
ld [rBGP], a ; $ff00+$47
ld [$cfc7], a
ld [$cfc9], a
ld [wcfc7], a
ld [wcfc9], a
ld [$ffc7], a
ld [$ffc8], a
call Functionc8eca
@@ -2707,14 +2707,14 @@ Functionc8f19: ; c8f19 (32:4f19)
Functionc8f2e: ; c8f2e (32:4f2e)
push bc
xor a
ld [$d419], a
ld [BattleAnimTemps], a
ld a, e
ld [$d41a], a
ld [BattleAnimTemps + 1], a
ld a, d
ld [$d41b], a
ld [BattleAnimTemps + 2], a
ld a, $80
ld [$d41c], a
ld bc, $d200
ld [BattleAnimTemps + 3], a
ld bc, LYOverridesBackup
.asm_c8f43
ld a, [$ffc7]
cp c
@@ -2722,18 +2722,18 @@ Functionc8f2e: ; c8f2e (32:4f2e)
ld a, [$ffc8]
cp c
jr c, .asm_c8f58
ld a, [$d41b]
ld a, [BattleAnimTemps + 2]
ld d, a
ld a, [$d419]
ld a, [BattleAnimTemps]
call Functionc905d
ld [bc], a
.asm_c8f58
inc bc
ld a, [$d41a]
ld hl, $d419
ld a, [BattleAnimTemps + 1]
ld hl, BattleAnimTemps
add [hl]
ld [hl], a
ld hl, $d41c
ld hl, BattleAnimTemps + 3
dec [hl]
jr nz, .asm_c8f43
pop bc
@@ -2742,26 +2742,26 @@ Functionc8f2e: ; c8f2e (32:4f2e)
Functionc8f69: ; c8f69 (32:4f69)
push bc
xor a
ld [$d419], a
ld [BattleAnimTemps], a
ld a, e
ld [$d41a], a
ld [BattleAnimTemps + 1], a
ld a, d
ld [$d41b], a
ld [BattleAnimTemps + 2], a
ld a, $40
ld [$d41c], a
ld bc, $d422
ld [BattleAnimTemps + 3], a
ld bc, wd422
.asm_c8f7e
ld a, [$d41b]
ld a, [BattleAnimTemps + 2]
ld d, a
ld a, [$d419]
ld a, [BattleAnimTemps]
call Functionc905d
ld [bc], a
inc bc
ld a, [$d41a]
ld hl, $d419
ld a, [BattleAnimTemps + 1]
ld hl, BattleAnimTemps
add [hl]
ld [hl], a
ld hl, $d41c
ld hl, BattleAnimTemps + 3
dec [hl]
jr nz, .asm_c8f7e
pop bc
@@ -2769,26 +2769,26 @@ Functionc8f69: ; c8f69 (32:4f69)
Functionc8f9a: ; c8f9a (32:4f9a)
push bc
ld [$d41c], a
ld [BattleAnimTemps + 3], a
ld a, e
ld [$d41a], a
ld [BattleAnimTemps + 1], a
ld a, d
ld [$d41b], a
ld [BattleAnimTemps + 2], a
call Functionc8fe4
ld hl, $d200
ld hl, LYOverridesBackup
add hl, de
ld c, l
ld b, h
.asm_c8faf
ld a, [$d41c]
ld a, [BattleAnimTemps + 3]
and a
jr z, .asm_c8fe1
dec a
ld [$d41c], a
ld [BattleAnimTemps + 3], a
push af
ld a, [$d41b]
ld a, [BattleAnimTemps + 2]
ld d, a
ld a, [$d41a]
ld a, [BattleAnimTemps + 1]
push hl
call Functionc905d
ld e, a
@@ -2806,9 +2806,9 @@ Functionc8f9a: ; c8f9a (32:4f9a)
ld [hl], e
dec hl
.asm_c8fd6
ld a, [$d41a]
ld a, [BattleAnimTemps + 1]
add $4
ld [$d41a], a
ld [BattleAnimTemps + 1], a
pop af
jr .asm_c8faf
.asm_c8fe1
@@ -2819,7 +2819,7 @@ Functionc8f9a: ; c8f9a (32:4f9a)
Functionc8fe4: ; c8fe4 (32:4fe4)
ld a, [$ffc7]
ld e, a
ld a, [$d419]
ld a, [BattleAnimTemps]
add e
ld e, a
ld d, $0
@@ -2907,11 +2907,11 @@ Functionc9042: ; c9042 (32:5042)
and $1
xor [hl]
jr nz, .asm_c9053
ld a, [EnemySubStatus3] ; $c66f
ld a, [EnemySubStatus3] ; EnemySubStatus3
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
ret
.asm_c9053
ld a, [PlayerSubStatus3] ; $c66a
ld a, [PlayerSubStatus3] ; PlayerSubStatus3
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
ret

702
battle/core.asm
View File

File diff suppressed because it is too large Load Diff

580
battle/effect_commands.asm
View File

File diff suppressed because it is too large Load Diff

2
battle/effects/curse.asm
View File

@@ -40,7 +40,7 @@ BattleCommand54: ; 37588
; Raise Attack and Defense, and lower Speed.
ld a, $1
ld [$c689], a
ld [wc689], a
call AnimateCurrentMove
ld a, $2
call Function36532

4
battle/effects/metronome.asm
View File

@@ -5,11 +5,11 @@ BattleCommand34: ; 37418
call Function34548
jr nz, .asm_3742b
ld a, [$c689]
ld a, [wc689]
push af
call BattleCommand0a
pop af
ld [$c689], a
ld [wc689], a
.asm_3742b
call Function37e36

6
battle/effects/mirror_move.asm
View File

@@ -24,7 +24,7 @@ BattleCommand1b: ; 373c9
.use
ld a, b
ld [hl], a
ld [$d265], a
ld [wd265], a
push af
ld a, BATTLE_VARS_MOVE_ANIM
@@ -40,11 +40,11 @@ BattleCommand1b: ; 373c9
call Function34548
jr nz, .done
ld a, [$c689]
ld a, [wc689]
push af
call BattleCommand0a
pop af
ld [$c689], a
ld [wc689], a
.done
call BattleCommandaa

2
battle/effects/rollout.asm
View File

@@ -44,7 +44,7 @@ BattleCommand5c: ; 37734
and a
jr nz, .asm_37750
ld a, 1
ld [$c73e], a
ld [wc73e], a
.asm_37750
ld a, [AttackMissed]

8
battle/effects/thief.asm
View File

@@ -21,7 +21,7 @@ BattleCommand50: ; 37492
; Can't steal mail.
ld [$d265], a
ld [wd265], a
ld d, a
callba ItemIsMail
ret c
@@ -45,7 +45,7 @@ BattleCommand50: ; 37492
ld [de], a
call .playeritem
ld a, [$d265]
ld a, [wd265]
ld [hl], a
ld [de], a
jr .stole
@@ -69,7 +69,7 @@ BattleCommand50: ; 37492
; Can't steal mail!
ld [$d265], a
ld [wd265], a
ld d, a
callba ItemIsMail
ret c
@@ -87,7 +87,7 @@ BattleCommand50: ; 37492
ld [de], a
call .enemyitem
ld a, [$d265]
ld a, [wd265]
ld [hl], a
ld [de], a

8
battle/magikarp_length.asm
View File

@@ -82,7 +82,7 @@ CalcMagikarpLength: ; fbbfc
ld hl, .Lengths
ld a, 2
ld [$d265], a
ld [wd265], a
.read
ld a, [hli]
@@ -111,7 +111,7 @@ CalcMagikarpLength: ; fbbfc
ld [hMultiplicand + 1], a
ld a, 100
ld [hMultiplicand + 2], a
ld a, [$d265]
ld a, [wd265]
ld [hMultiplier], a
call Multiply
ld b, 0
@@ -125,9 +125,9 @@ CalcMagikarpLength: ; fbbfc
.next
inc hl ; align to next triplet
ld a, [$d265]
ld a, [wd265]
inc a
ld [$d265], a
ld [wd265], a
cp 16
jr c, .read