diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/ai/items.asm | 80 | ||||
| -rw-r--r-- | battle/ai/scoring.asm | 40 | ||||
| -rw-r--r-- | battle/anim_commands.asm | 240 | ||||
| -rw-r--r-- | battle/anim_objects.asm | 80 | ||||
| -rw-r--r-- | battle/bg_effects.asm | 188 | ||||
| -rw-r--r-- | battle/core.asm | 702 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 580 | ||||
| -rw-r--r-- | battle/effects/curse.asm | 2 | ||||
| -rw-r--r-- | battle/effects/metronome.asm | 4 | ||||
| -rw-r--r-- | battle/effects/mirror_move.asm | 6 | ||||
| -rw-r--r-- | battle/effects/rollout.asm | 2 | ||||
| -rw-r--r-- | battle/effects/thief.asm | 8 | ||||
| -rw-r--r-- | battle/magikarp_length.asm | 8 |
13 files changed, 970 insertions, 970 deletions
diff --git a/battle/ai/items.asm b/battle/ai/items.asm index 73362eb63..3a880a00c 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -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 diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 52112faf6..4d25c837f 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -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 diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index f9c841274..e37daf8c4 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -77,7 +77,7 @@ Functioncc11c: ; cc11c call BattleAnimRestoreHuds .asm_cc141 - ld a, [$cfca] + ld a, [wcfca] and a jr z, .asm_cc15f @@ -135,7 +135,7 @@ Functioncc163: ; cc163 call BattleAnimDelayFrame .asm_cc196 - ld a, [$d40f] + ld a, [BattleAnimFlags] bit 0, a jr z, .playframe @@ -191,13 +191,13 @@ BattleAnimRequestPals: ; cc1e2 ld a, [rBGP] ld b, a - ld a, [$cfc7] + ld a, [wcfc7] cp b call nz, Functioncc91a ld a, [rOBP0] ld b, a - ld a, [$cfc8] + ld a, [wcfc8] cp b call nz, Functioncc94b ret @@ -255,7 +255,7 @@ Functioncc220: ; cc220 Functioncc23d: ; cc23d - ld a, [$d40f] + ld a, [BattleAnimFlags] bit 3, a jr z, .asm_cc254 @@ -291,12 +291,12 @@ Functioncc25f: ; cc25f ; cc267 Functioncc267: ; cc267 - ld a, [$d412] + ld a, [BattleAnimDuration] and a jr z, .asm_cc273 dec a - ld [$d412], a + ld [BattleAnimDuration], a and a ret @@ -313,7 +313,7 @@ Functioncc275: ; cc275 jr nz, .asm_cc286 ; Return from a subroutine. - ld hl, $d40f + ld hl, BattleAnimFlags bit 1, [hl] jr nz, .asm_cc28e @@ -324,7 +324,7 @@ Functioncc275: ; cc275 cp $d0 jr nc, .asm_cc28e - ld [$d412], a + ld [BattleAnimDuration], a ret .asm_cc28e @@ -334,8 +334,8 @@ Functioncc275: ; cc275 ; cc293 Functioncc293: ; cc293 -; Execute battle animation command in [$d417]. - ld a, [$d417] +; Execute battle animation command in [BattleAnimByte]. + ld a, [BattleAnimByte] sub $d0 ld e, a @@ -409,13 +409,13 @@ BattleAnimCmd_ED: ; cc304 (33:4304) ret BattleAnimCmd_FF: ; cc305 (33:4305) - ld hl, $d40f + ld hl, BattleAnimFlags res 1, [hl] - ld hl, $d413 + ld hl, BattleAnimParent ld e, [hl] inc hl ld d, [hl] - ld hl, $d410 + ld hl, BattleAnimAddress ld [hl], e inc hl ld [hl], d @@ -427,20 +427,20 @@ BattleAnimCmd_FE: ; cc317 (33:4317) call GetBattleAnimByte ld d, a push de - ld hl, $d410 + ld hl, BattleAnimAddress ld e, [hl] inc hl ld d, [hl] - ld hl, $d413 + ld hl, BattleAnimParent ld [hl], e inc hl ld [hl], d pop de - ld hl, $d410 + ld hl, BattleAnimAddress ld [hl], e inc hl ld [hl], d - ld hl, $d40f + ld hl, BattleAnimFlags set 1, [hl] ret @@ -449,7 +449,7 @@ BattleAnimCmd_FC: ; cc339 (33:4339) ld e, a call GetBattleAnimByte ld d, a - ld hl, $d410 + ld hl, BattleAnimAddress ld [hl], e inc hl ld [hl], d @@ -457,16 +457,16 @@ BattleAnimCmd_FC: ; cc339 (33:4339) BattleAnimCmd_FD: ; cc348 (33:4348) call GetBattleAnimByte - ld hl, $d40f + ld hl, BattleAnimFlags bit 2, [hl] jr nz, .asm_cc35b and a jr z, .asm_cc363 dec a set 2, [hl] - ld [$d415], a + ld [BattleAnimLoops], a .asm_cc35b - ld hl, $d415 + ld hl, BattleAnimLoops ld a, [hl] and a jr z, .asm_cc372 @@ -476,15 +476,15 @@ BattleAnimCmd_FD: ; cc348 (33:4348) ld e, a call GetBattleAnimByte ld d, a - ld hl, $d410 + ld hl, BattleAnimAddress ld [hl], e inc hl ld [hl], d ret .asm_cc372 - ld hl, $d40f + ld hl, BattleAnimFlags res 2, [hl] - ld hl, $d410 + ld hl, BattleAnimAddress ld e, [hl] inc hl ld d, [hl] @@ -496,7 +496,7 @@ BattleAnimCmd_FD: ; cc348 (33:4348) ret BattleAnimCmd_EF: ; cc383 (33:4383) - ld hl, $c689 + ld hl, wc689 ld a, [hl] and a jr z, .asm_cc39a @@ -506,14 +506,14 @@ BattleAnimCmd_EF: ; cc383 (33:4383) ld e, a call GetBattleAnimByte ld d, a - ld hl, $d410 + ld hl, BattleAnimAddress ld [hl], e inc hl ld [hl], d ret .asm_cc39a - ld hl, $d410 + ld hl, BattleAnimAddress ld e, [hl] inc hl ld d, [hl] @@ -526,21 +526,21 @@ BattleAnimCmd_EF: ; cc383 (33:4383) BattleAnimCmd_F9: ; cc3a6 (33:43a6) call GetBattleAnimByte - ld [$d416], a + ld [BattleAnimVar], a ret BattleAnimCmd_FA: ; cc3ad (33:43ad) - ld hl, $d416 + ld hl, BattleAnimVar inc [hl] ret BattleAnimCmd_FB: ; cc3b2 (33:43b2) call GetBattleAnimByte - ld hl, $d416 + ld hl, BattleAnimVar cp [hl] jr z, .jump - ld hl, $d410 + ld hl, BattleAnimAddress ld e, [hl] inc hl ld d, [hl] @@ -556,7 +556,7 @@ BattleAnimCmd_FB: ; cc3b2 (33:43b2) ld e, a call GetBattleAnimByte ld d, a - ld hl, $d410 + ld hl, BattleAnimAddress ld [hl], e inc hl ld [hl], d @@ -564,11 +564,11 @@ BattleAnimCmd_FB: ; cc3b2 (33:43b2) BattleAnimCmd_F8: ; cc3d6 (33:43d6) call GetBattleAnimByte - ld hl, $c689 + ld hl, wc689 cp [hl] jr z, .jump - ld hl, $d410 + ld hl, BattleAnimAddress ld e, [hl] inc hl ld d, [hl] @@ -584,7 +584,7 @@ BattleAnimCmd_F8: ; cc3d6 (33:43d6) ld e, a call GetBattleAnimByte ld d, a - ld hl, $d410 + ld hl, BattleAnimAddress ld [hl], e inc hl ld [hl], d @@ -593,11 +593,11 @@ BattleAnimCmd_F8: ; cc3d6 (33:43d6) BattleAnimCmd_EE: ; cc3fa (33:43fa) call GetBattleAnimByte ld e, a - ld a, [$c689] + ld a, [wc689] and e jr nz, .jump - ld hl, $d410 + ld hl, BattleAnimAddress ld e, [hl] inc hl ld d, [hl] @@ -612,7 +612,7 @@ BattleAnimCmd_EE: ; cc3fa (33:43fa) ld e, a call GetBattleAnimByte ld d, a - ld hl, $d410 + ld hl, BattleAnimAddress ld [hl], e inc hl ld [hl], d @@ -620,41 +620,41 @@ BattleAnimCmd_EE: ; cc3fa (33:43fa) BattleAnimCmd_D0: ; cc41f (33:441f) call GetBattleAnimByte - ld [$d419], a + ld [BattleAnimTemps], a call GetBattleAnimByte - ld [$d41a], a + ld [BattleAnimTemps + 1], a call GetBattleAnimByte - ld [$d41b], a + ld [BattleAnimTemps + 2], a call GetBattleAnimByte - ld [$d41c], a + ld [BattleAnimTemps + 3], a call Functioncc9a1 ret BattleAnimCmd_F0: ; cc43b (33:443b) call GetBattleAnimByte - ld [$d419], a + ld [BattleAnimTemps], a call GetBattleAnimByte - ld [$d41a], a + ld [BattleAnimTemps + 1], a call GetBattleAnimByte - ld [$d41b], a + ld [BattleAnimTemps + 2], a call GetBattleAnimByte - ld [$d41c], a + ld [BattleAnimTemps + 3], a call Functionccb4f ret BattleAnimCmd_F1: ; cc457 (33:4457) call GetBattleAnimByte - ld [$cfc7], a + ld [wcfc7], a ret BattleAnimCmd_F2: ; cc45e (33:445e) call GetBattleAnimByte - ld [$cfc8], a + ld [wcfc8], a ret BattleAnimCmd_F3: ; cc465 (33:4465) call GetBattleAnimByte - ld [$cfc9], a + ld [wcfc9], a ret BattleAnimCmd_DF: ; cc46c (33:446c) @@ -664,11 +664,11 @@ BattleAnimCmd_DF: ; cc46c (33:446c) jr z, .asm_cc475 ld a, $f0 .asm_cc475 - ld [$cfc8], a + ld [wcfc8], a ret BattleAnimCmd_E5: ; cc479 (33:4479) - ld hl, $d30a + ld hl, OTPartyMon3HP ld a, $a0 .asm_cc47e ld [hl], $0 @@ -682,19 +682,19 @@ BattleAnimCmd_D2: BattleAnimCmd_D3: BattleAnimCmd_D4: BattleAnimCmd_D5: ; cc485 (33:4485) - ld a, [$d417] + ld a, [BattleAnimByte] and $f ld c, a - ld hl, $d300 + ld hl, wd300 xor a - ld [$d419], a + ld [BattleAnimTemps], a .asm_cc492 - ld a, [$d419] + ld a, [BattleAnimTemps] cp $4f ret nc call GetBattleAnimByte ld [hli], a - ld a, [$d419] + ld a, [BattleAnimTemps] ld [hli], a push bc push hl @@ -706,11 +706,11 @@ BattleAnimCmd_D5: ; cc485 (33:4485) add hl, hl ld de, $8310 add hl, de - ld a, [$d417] + ld a, [BattleAnimByte] call Functionce846 - ld a, [$d419] + ld a, [BattleAnimTemps] add c - ld [$d419], a + ld [BattleAnimTemps], a pop hl pop bc dec c @@ -720,12 +720,12 @@ BattleAnimCmd_D5: ; cc485 (33:4485) BattleAnimCmd_D6: ; cc4c0 (33:44c0) call GetBattleAnimByte ld e, $a - ld bc, $d30a + ld bc, OTPartyMon3HP .asm_cc4c8 ld hl, $0 add hl, bc ld d, [hl] - ld a, [$d417] + ld a, [BattleAnimByte] cp d jr z, .asm_cc4dd ld hl, $18 @@ -744,12 +744,12 @@ BattleAnimCmd_D6: ; cc4c0 (33:44c0) BattleAnimCmd_D8: ; cc4e3 (33:44e3) call GetBattleAnimByte ld e, $5 - ld bc, $d3fa + ld bc, ActiveBGEffects .asm_cc4eb ld hl, $0 add hl, bc ld d, [hl] - ld a, [$d417] + ld a, [BattleAnimByte] cp d jr z, .asm_cc500 ld hl, $4 @@ -768,12 +768,12 @@ BattleAnimCmd_D8: ; cc4e3 (33:44e3) BattleAnimCmd_D7: ; cc506 (33:4506) call GetBattleAnimByte ld e, $a - ld bc, $d30a + ld bc, OTPartyMon3HP .asm_cc50e ld hl, $0 add hl, bc ld d, [hl] - ld a, [$d417] + ld a, [BattleAnimByte] cp d jr z, .asm_cc523 ld hl, $18 @@ -792,7 +792,7 @@ BattleAnimCmd_D7: ; cc506 (33:4506) BattleAnimCmd_D9: ; cc52c (33:452c) - ld hl, $d300 + ld hl, wd300 .asm_cc52f ld a, [hl] and a @@ -814,12 +814,12 @@ BattleAnimCmd_D9: ; cc52c (33:452c) ld hl, $8730 ld de, $9060 ld a, $70 - ld [$d419], a + ld [BattleAnimTemps], a ld a, $7 call Functioncc561 ld de, $9310 ld a, $60 - ld [$d419], a + ld [BattleAnimTemps], a ld a, $6 call Functioncc561 ret @@ -831,7 +831,7 @@ Functioncc561: ; cc561 (33:4561) ld bc, $3301 call Request2bpp pop de - ld a, [$d419] + ld a, [BattleAnimTemps] ld l, a ld h, $0 add hl, de @@ -847,7 +847,7 @@ Functioncc561: ; cc561 (33:4561) BattleAnimCmd_DA: ; cc57e (33:457e) - ld hl, $d300 + ld hl, wd300 .asm_cc581 ld a, [hl] and a @@ -869,12 +869,12 @@ BattleAnimCmd_DA: ; cc57e (33:457e) ld hl, $8660 ld de, $9050 ld a, $70 - ld [$d419], a + ld [BattleAnimTemps], a ld a, $7 call Functioncc5b3 ld de, $9310 ld a, $60 - ld [$d419], a + ld [BattleAnimTemps], a ld a, $6 call Functioncc5b3 ret @@ -886,7 +886,7 @@ Functioncc5b3: ; cc5b3 (33:45b3) ld bc, $3302 call Request2bpp pop de - ld a, [$d419] + ld a, [BattleAnimTemps] ld l, a ld h, $0 add hl, de @@ -903,7 +903,7 @@ Functioncc5b3: ; cc5b3 (33:45b3) BattleAnimCmd_DB: ; cc5d0 (33:45d0) callab GetPokeBallWobble ld a, c - ld [$d416], a + ld [BattleAnimVar], a ret BattleAnimCmd_E7: ; cc5db (33:45db) @@ -914,32 +914,32 @@ BattleAnimCmd_DC: ; cc5dc (33:45dc) push af ld a, 1 ld [rSVBK], a ; $ff00+$70 - ld a, [CurPartySpecies] ; $d108 + ld a, [CurPartySpecies] ; CurPartySpecies push af ld a, [hBattleTurn] ; $ff00+$e4 and a jr z, .player - ld a, [TempBattleMonSpecies] ; $d205 - ld [CurPartySpecies], a ; $d108 - ld hl, BattleMonDVs ; $c632 + ld a, [TempBattleMonSpecies] ; TempBattleMonSpecies + ld [CurPartySpecies], a ; CurPartySpecies + ld hl, BattleMonDVs ; BattleMonDVs predef GetUnownLetter ld de, $8000 predef GetFrontpic jr .done .player - ld a, [TempEnemyMonSpecies] ; $d204 - ld [CurPartySpecies], a ; $d108 - ld hl, EnemyMonDVs ; $d20c + ld a, [TempEnemyMonSpecies] ; TempEnemyMonSpecies + ld [CurPartySpecies], a ; CurPartySpecies + ld hl, EnemyMonDVs ; EnemyMonDVs predef GetUnownLetter ld de, $8000 predef GetBackpic .done pop af - ld [CurPartySpecies], a ; $d108 + ld [CurPartySpecies], a ; CurPartySpecies pop af ld [rSVBK], a ; $ff00+$70 ret @@ -1116,7 +1116,7 @@ BattleAnimCmd_DE: ; cc750 (33:4750) ld a, $1 ld [rSVBK], a ; $ff00+$70 - ld a, [CurPartySpecies] ; $d108 + ld a, [CurPartySpecies] ; CurPartySpecies push af ld a, [hBattleTurn] ; $ff00+$e4 and a @@ -1130,7 +1130,7 @@ BattleAnimCmd_DE: ; cc750 (33:4750) .done pop af - ld [CurPartySpecies], a ; $d108 + ld [CurPartySpecies], a ; CurPartySpecies pop af ld [rSVBK], a ; $ff00+$70 ret @@ -1140,31 +1140,31 @@ BattleAnimCmd_E6: ; cc776 (33:4776) push af ld a, $1 ld [rSVBK], a ; $ff00+$70 - ld a, [CurPartySpecies] ; $d108 + ld a, [CurPartySpecies] ; CurPartySpecies push af - ld a, [$c689] - ld [CurPartySpecies], a ; $d108 + ld a, [wc689] + ld [CurPartySpecies], a ; CurPartySpecies ld a, [hBattleTurn] ; $ff00+$e4 and a jr z, .player - ld hl, BattleMonDVs ; $c632 + ld hl, BattleMonDVs ; BattleMonDVs predef GetUnownLetter ld de, $9000 predef GetFrontpic jr .done .player - ld hl, EnemyMonDVs ; $d20c + ld hl, EnemyMonDVs ; EnemyMonDVs predef GetUnownLetter ld de, $9310 predef GetBackpic .done pop af - ld [CurPartySpecies], a ; $d108 + ld [CurPartySpecies], a ; CurPartySpecies ld b, $1 call GetSGBLayout pop af @@ -1182,7 +1182,7 @@ BattleAnimCmd_E4: ; cc7bf (33:47bf) ret BattleAnimCmd_F4: ; cc7c4 (33:47c4) - ld hl, $d40f + ld hl, BattleAnimFlags set 3, [hl] ret @@ -1200,17 +1200,17 @@ BattleAnimCmd_E0: ; cc7cd (33:47cd) ld e, a srl a srl a - ld [$c2be], a + ld [wc2be], a call Functioncc7fc and 3 - ld [CryTracks], a ; $c2bd + ld [CryTracks], a ; CryTracks ld e, a ld d, 0 ld hl, Datacc7f8 add hl, de ld a, [hl] - ld [$c2bc], a + ld [wc2bc], a call GetBattleAnimByte ld e, a @@ -1258,14 +1258,14 @@ BattleAnimCmd_E1: ; cc807 (33:4807) jr nz, .enemy ld a, $f0 - ld [CryTracks], a ; $c2bd - ld a, [BattleMonSpecies] ; $c62c + ld [CryTracks], a ; CryTracks + ld a, [BattleMonSpecies] ; BattleMonSpecies jr .asm_cc834 .enemy ld a, $0f - ld [CryTracks], a ; $c2bd - ld a, [EnemyMonSpecies] ; $d206 + ld [CryTracks], a ; CryTracks + ld a, [EnemyMonSpecies] ; EnemyMon .asm_cc834 push hl @@ -1293,18 +1293,18 @@ BattleAnimCmd_E1: ; cc807 (33:4807) ld a, [hli] ld c, a ld b, [hl] - ld hl, CryLength ; $c2b2 + ld hl, CryLength ; CryLength ld a, [hli] ld h, [hl] ld l, a add hl, bc ld a, l - ld [CryLength], a ; $c2b2 + ld [CryLength], a ; CryLength ld a, h ld [CryLength + 1], a ld a, 1 - ld [$c2bc], a + ld [wc2bc], a callab _PlayCryHeader @@ -1324,7 +1324,7 @@ Datacc871: ; cc871 Functioncc881: ; cc881 - ld a, [$cfca] + ld a, [wcfca] cp $1 jr z, .asm_cc88b cp $4 @@ -1360,17 +1360,17 @@ BattleAnimAssignPals: ; cc8a4 ld a, $f0 .asm_cc8b2 - ld [$cfc8], a + ld [wcfc8], a ld a, $e4 - ld [$cfc7], a - ld [$cfc9], a + ld [wcfc7], a + ld [wcfc9], a ret .asm_cc8be ld a, $e4 - ld [$cfc7], a - ld [$cfc8], a - ld [$cfc9], a + ld [wcfc7], a + ld [wcfc8], a + ld [wcfc9], a call DmgToCgbBGPals ld de, $e4e4 call DmgToCgbObjPals @@ -1403,9 +1403,9 @@ Functioncc8d3: ; cc8d3 Functioncc8f6: ; cc8f6 call WaitTop ld a, $e4 - ld [$cfc7], a - ld [$cfc8], a - ld [$cfc9], a + ld [wcfc7], a + ld [wcfc8], a + ld [wcfc9], a call DmgToCgbBGPals ld de, $e4e4 call DmgToCgbObjPals @@ -1427,13 +1427,13 @@ Functioncc91a: ; cc91a push af ld a, $5 ld [rSVBK], a - ld hl, $d080 - ld de, $d000 + ld hl, BGPals + ld de, wd000 ld a, [rBGP] ld b, a ld c, $7 call CopyPals - ld hl, $d0c0 + ld hl, OBPals ld de, MartPointer ld a, [rBGP] ld b, a @@ -1455,8 +1455,8 @@ Functioncc94b: ; cc94b push af ld a, $5 ld [rSVBK], a - ld hl, $d0d0 - ld de, $d050 + ld hl, OBPals + $10 + ld de, Unkn2Pals + $10 ld a, [rOBP0] ld b, a ld c, $2 @@ -1470,8 +1470,8 @@ Functioncc94b: ; cc94b Functioncc96e: ; cc96e ld a, $0 - ld [$d418], a - ld hl, $d30a + ld [wd418], a + ld hl, OTPartyMon3HP ld e, $a .asm_cc978 ld a, [hl] @@ -1492,7 +1492,7 @@ Functioncc96e: ; cc96e add hl, bc dec e jr nz, .asm_cc978 - ld a, [$d418] + ld a, [wd418] ld l, a ld h, $c4 .asm_cc997 diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm index 0546ccd46..d988ad026 100644 --- a/battle/anim_objects.asm +++ b/battle/anim_objects.asm @@ -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 diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index e26667967..c182aad33 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -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 diff --git a/battle/core.asm b/battle/core.asm index f778bb74a..d35b444a1 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -5,12 +5,12 @@ BattleCore: Function3c000: ; 3c000 xor a - ld [$c664], a - ld [$c6fc], a - ld [$d0ec], a + ld [wc664], a + ld [wc6fc], a + ld [wd0ec], a ld [BattleEnded], a inc a - ld [$d264], a + ld [wd264], a ld hl, OTPartyMon1HP ld bc, OTPartyMon2 - (OTPartyMon1 + 1) ld d, NUM_MOVES - 1 @@ -38,7 +38,7 @@ Function3c000: ; 3c000 dec a jr z, .asm_3c047 xor a - ld [$c718], a + ld [wc718], a call NewEnemyMonStatus call ResetEnemyStatLevels call BreakAttraction @@ -71,7 +71,7 @@ Function3c000: ; 3c000 .asm_3c076 ld a, [CurBattleMon] - ld [$c71a], a + ld [wc71a], a ld a, [CurPartyMon] ld [CurBattleMon], a inc a @@ -104,7 +104,7 @@ Function3c000: ; 3c000 cp $2 jr nz, .asm_3c0df xor a - ld [$c718], a + ld [wc718], a call NewEnemyMonStatus call ResetEnemyStatLevels call BreakAttraction @@ -123,21 +123,21 @@ Function3c000: ; 3c000 Function3c0e5: ; 3c0e5 call Function30b4 - ld a, [$d0ee] + ld a, [wd0ee] and $c0 add $2 - ld [$d0ee], a + ld [wd0ee], a ld a, [InLinkBattle] and a ld hl, BattleText_0x807bd jr z, .asm_3c115 - ld a, [$d0ee] + ld a, [wd0ee] and $c0 - ld [$d0ee], a + ld [wd0ee], a ld hl, BattleText_0x807cf call Function3d2e0 jr nc, .asm_3c115 - ld hl, $cd2a + ld hl, wcd2a bit 4, [hl] jr nz, .asm_3c118 ld hl, BattleText_0x81863 @@ -169,9 +169,9 @@ Function3c12f: ; 3c12f xor a ld [wPlayerIsSwitching], a ld [wEnemyIsSwitching], a - ld [$d264], a - ld [$c73f], a - ld [$c740], a + ld [wd264], a + ld [wc73f], a + ld [wc740], a ld [CurDamage], a ld [CurDamage + 1], a @@ -195,7 +195,7 @@ Function3c12f: ; 3c12f ld a, [BattleEnded] and a jr nz, .quit - ld a, [$d232] ; roared/whirlwinded/teleported + ld a, [wd232] ; roared/whirlwinded/teleported and a jr nz, .quit .asm_3c18a @@ -215,7 +215,7 @@ Function3c12f: ; 3c12f call Function3d2e0 jr c, .quit - ld a, [$d232] + ld a, [wd232] and a jr nz, .quit @@ -387,7 +387,7 @@ Function3c27c: ; 3c27c push bc callab GetUserItem ld a, [hl] - ld [$d265], a + ld [wd265], a sub BERSERK_GENE pop bc pop de @@ -425,7 +425,7 @@ Function3c27c: ; 3c27c bit SUBSTATUS_CONFUSED, a ret nz xor a - ld [$cfca], a + ld [wcfca], a ld de, ANIM_CONFUSED call Function3ee0f call SwitchTurnCore @@ -462,7 +462,7 @@ Function3c314: ; 3c314 jr z, .asm_3c35b sub NUM_MOVES jr c, .asm_3c35b - ld a, [$d0ec] + ld a, [wd0ec] cp $2 jr nz, .asm_3c34c ld a, [$ffcb] @@ -486,7 +486,7 @@ Function3c314: ; 3c314 jp Function3c3f3 .asm_3c35b - ld a, [$d0ec] + ld a, [wd0ec] and a jp nz, .asm_3c3f1 call CompareMovePriority @@ -577,13 +577,13 @@ Function3c3f5: ; 3c3f5 ld a, [BattleType] cp BATTLETYPE_CONTEST jr nz, .asm_3c40e - ld a, [$dc79] + ld a, [wdc79] and a jr nz, .asm_3c40e - ld a, [$d0ee] + ld a, [wd0ee] and $c0 add $2 - ld [$d0ee], a + ld [wd0ee], a scf ret @@ -629,7 +629,7 @@ Function3c434: ; 3c434 jr .asm_3c47c .asm_3c449 - ld a, [$d0ec] + ld a, [wd0ec] cp $2 jr z, .asm_3c4ce and a @@ -638,7 +638,7 @@ Function3c434: ; 3c434 and 1 << SUBSTATUS_BIDE jr nz, .asm_3c4ba xor a - ld [$d235], a + ld [wd235], a inc a ; POUND ld [FXAnimIDLo], a call Function3e4bc @@ -660,7 +660,7 @@ Function3c434: ; 3c434 call SetPlayerTurn callab UpdateMoveData xor a - ld [$c732], a + ld [wc732], a ld a, [wPlayerMoveStruct + MOVE_EFFECT] cp EFFECT_FURY_CUTTER jr z, .asm_3c494 @@ -674,7 +674,7 @@ Function3c434: ; 3c434 ld hl, PlayerSubStatus4 res SUBSTATUS_RAGE, [hl] xor a - ld [$c72b], a + ld [wc72b], a .asm_3c4a4 ld a, [wPlayerMoveStruct + MOVE_EFFECT] @@ -694,7 +694,7 @@ Function3c434: ; 3c434 xor a ld [PlayerFuryCutterCount], a ld [PlayerProtectCount], a - ld [$c72b], a + ld [wc72b], a ld hl, PlayerSubStatus4 res SUBSTATUS_RAGE, [hl] @@ -707,7 +707,7 @@ Function3c434: ; 3c434 xor a ld [PlayerFuryCutterCount], a ld [PlayerProtectCount], a - ld [$c72b], a + ld [wc72b], a ld hl, PlayerSubStatus4 res SUBSTATUS_RAGE, [hl] xor a @@ -782,7 +782,7 @@ Function3c543: ; 3c543 bit SUBSTATUS_CANT_RUN, a jr nz, .Stay - ld a, [$c731] + ld a, [wc731] and a jr nz, .Stay @@ -938,13 +938,13 @@ Function3c5fe: ; 3c5fe jp c, Function3c0e5 call SetEnemyTurn ld a, $1 - ld [$c70f], a + ld [wc70f], a callab Function38000 jr c, .asm_3c62f call Function3c6de call Function3d2e0 ret c - ld a, [$d232] + ld a, [wd232] and a ret nz call HasPlayerFainted @@ -960,7 +960,7 @@ Function3c5fe: ; 3c5fe call Function3c6cf call Function3d2e0 ret c - ld a, [$d232] + ld a, [wd232] and a ret nz call HasEnemyFainted @@ -972,19 +972,19 @@ Function3c5fe: ; 3c5fe jp z, Function3d14e call RefreshBattleHuds xor a - ld [$d0ec], a + ld [wd0ec], a ret ; 3c664 Function3c664: ; 3c664 xor a - ld [$c70f], a + ld [wc70f], a call SetEnemyTurn callab Function38000 push af call Function3c6cf pop bc - ld a, [$d232] + ld a, [wd232] and a ret nz call Function3d2e0 @@ -1008,7 +1008,7 @@ Function3c664: ; 3c664 call Function3c6de call Function3d2e0 ret c - ld a, [$d232] + ld a, [wd232] and a ret nz call HasPlayerFainted @@ -1022,7 +1022,7 @@ Function3c664: ; 3c664 jp z, Function3cd55 call RefreshBattleHuds xor a - ld [$d0ec], a + ld [wd0ec], a ret ; 3c6cf @@ -1101,7 +1101,7 @@ ResidualDamage: ; 3c716 pop de xor a - ld [$cfca], a + ld [wcfca], a call Function3ee0f call GetEighthMaxHP ld de, PlayerToxicCount @@ -1141,7 +1141,7 @@ ResidualDamage: ; 3c716 call SwitchTurnCore xor a - ld [$cfca], a + ld [wcfca], a ld de, ANIM_SAP ld a, BATTLE_VARS_SUBSTATUS3_OPP call GetBattleVar @@ -1166,7 +1166,7 @@ ResidualDamage: ; 3c716 bit SUBSTATUS_NIGHTMARE, [hl] jr z, .asm_3c7c5 xor a - ld [$cfca], a + ld [wcfca], a ld de, ANIM_IN_NIGHTMARE call Function3ee0f call GetQuarterMaxHP @@ -1184,7 +1184,7 @@ ResidualDamage: ; 3c716 jr z, .asm_3c7e9 xor a - ld [$cfca], a + ld [wcfca], a ld de, ANIM_IN_NIGHTMARE call Function3ee0f call GetQuarterMaxHP @@ -1239,7 +1239,7 @@ Function3c801: ; 3c801 ret z dec [hl] ld a, [hl] - ld [$d265], a + ld [wd265], a push af ld hl, PerishCountText call StdBattleTextBox @@ -1294,13 +1294,13 @@ Function3c874: ; 3c874 call .asm_3c88f call SetPlayerTurn .asm_3c88f - ld hl, $c730 - ld de, $c72e + ld hl, wc730 + ld de, wc72e ld a, [hBattleTurn] and a jr z, .asm_3c8a0 - ld hl, $c731 - ld de, $c72f + ld hl, wc731 + ld de, wc72f .asm_3c8a0 ld a, [hl] @@ -1311,7 +1311,7 @@ Function3c874: ; 3c874 bit SUBSTATUS_SUBSTITUTE, a ret nz ld a, [de] - ld [$d265], a + ld [wd265], a ld [FXAnimIDLo], a call GetMoveName dec [hl] @@ -1322,7 +1322,7 @@ Function3c874: ; 3c874 jr nz, .asm_3c8d3 call SwitchTurnCore xor a - ld [$cfca], a + ld [wcfca], a ld [FXAnimIDHi], a predef PlayBattleAnim call SwitchTurnCore @@ -1363,7 +1363,7 @@ Function3c8eb: ; 3c8eb .asm_3c906 callab GetUserItem ld a, [hl] - ld [$d265], a + ld [wd265], a call GetItemName ld a, b cp HELD_LEFTOVERS @@ -1423,8 +1423,8 @@ Function3c93c: ; 3c93c ld a, [hBattleTurn] and a jr z, .asm_3c99b - ld de, $c739 - ld hl, $c735 + ld de, wc739 + ld hl, wc735 ld a, [IsInBattle] dec a jr z, .asm_3c99b @@ -1470,7 +1470,7 @@ Function3c93c: ; 3c93c push bc push bc ld a, [hl] - ld [$d265], a + ld [wd265], a ld de, BattleMonMoves - 1 ld hl, BattleMonPP ld a, [hBattleTurn] @@ -1490,7 +1490,7 @@ Function3c93c: ; 3c93c pop de pop bc - ld a, [$d265] + ld a, [wd265] cp [hl] jr nz, .asm_3c9f5 ld a, [hBattleTurn] @@ -1507,7 +1507,7 @@ Function3c93c: ; 3c93c .asm_3c9f5 callab GetUserItem ld a, [hl] - ld [$d265], a + ld [wd265], a xor a ld [hl], a call Function3df12 @@ -1546,11 +1546,11 @@ Function3ca26: ; 3ca26 call .asm_3ca41 call SetPlayerTurn .asm_3ca41 - ld hl, $c71d + ld hl, wc71d ld a, [hBattleTurn] and a jr z, .asm_3ca4c - ld hl, $c71e + ld hl, wc71e .asm_3ca4c ld a, [hl] @@ -1603,7 +1603,7 @@ Function3ca8f: ; 3ca8f ld a, [BattleMonStatus] bit FRZ, a ret z - ld a, [$c73f] + ld a, [wc73f] and a ret nz call BattleRandom @@ -1624,7 +1624,7 @@ Function3ca8f: ; 3ca8f ld a, [EnemyMonStatus] bit FRZ, a ret z - ld a, [$c740] + ld a, [wc740] and a ret nz call BattleRandom @@ -1661,7 +1661,7 @@ Function3cafb: ; 3cafb ld a, [PlayerScreens] bit SCREENS_SAFEGUARD, a ret z - ld hl, $c701 + ld hl, PlayerSafeguardCount dec [hl] ret nz res SCREENS_SAFEGUARD, a @@ -1673,7 +1673,7 @@ Function3cafb: ; 3cafb ld a, [EnemyScreens] bit SCREENS_SAFEGUARD, a ret z - ld hl, $c705 + ld hl, EnemySafeguardCount dec [hl] ret nz res SCREENS_SAFEGUARD, a @@ -1818,7 +1818,7 @@ HandleWeather: ; 3cb9e call SwitchTurnCore xor a - ld [$cfca], a + ld [wcfca], a ld de, ANIM_IN_SANDSTORM call Function3ee17 call SwitchTurnCore @@ -1878,25 +1878,25 @@ Function3cc45: ; 3cc45 .ok inc hl ld a, [hl] - ld [$d1ec], a + ld [wd1ec], a sub c ld [hld], a - ld [$d1ee], a + ld [wd1ee], a ld a, [hl] - ld [$d1ed], a + ld [wd1ed], a sbc b ld [hl], a - ld [$d1ef], a + ld [wd1ef], a ret nc - ld a, [$d1ec] + ld a, [wd1ec] ld c, a - ld a, [$d1ed] + ld a, [wd1ed] ld b, a xor a ld [hli], a ld [hl], a - ld [$d1ee], a - ld [$d1ef], a + ld [wd1ee], a + ld [wd1ef], a ret ; 3cc76 @@ -2085,7 +2085,7 @@ Function3cd3c: ; 3cd3c xor a .ok push bc - ld [$d10a], a + ld [wd10a], a predef Functionc6e0 pop bc ret @@ -2098,7 +2098,7 @@ Function3cd55: ; 3cd55 or [hl] call z, Function3cef1 xor a - ld [$c6f7], a + ld [wc6f7], a call Function3ce01 call Function3d873 ld a, d @@ -2145,18 +2145,18 @@ Function3cd55: ; 3cd55 jp c, Function3c0e5 ld a, $1 - ld [$d0ec], a + ld [wd0ec], a call Function3cf4a jp z, Function3c0e5 jr Function3cdca .asm_3cdba ld a, $1 - ld [$d0ec], a + ld [wd0ec], a call Function3cf4a jp z, Function3c0e5 xor a - ld [$d0ec], a + ld [wd0ec], a ret ; 3cdca @@ -2186,7 +2186,7 @@ Function3cdca: ; 3cdca .asm_3cdfc xor a - ld [$d0ec], a + ld [wd0ec], a ret ; 3ce01 @@ -2219,14 +2219,14 @@ Function3ce01: ; 3ce01 .asm_3ce2f call Function3ceec ld a, $1 - ld [$c6fd], a + ld [wc6fd], a .asm_3ce37 ld hl, BattleMonHP ld a, [hli] or [hl] jr nz, .asm_3ce47 - ld a, [$c6f7] + ld a, [wc6f7] and a jr nz, .asm_3ce47 call Function3d1aa @@ -2241,9 +2241,9 @@ Function3ce01: ; 3ce01 call z, Function3d0ea call EmptyBattleTextBox call Function309d - ld a, [$d0ee] + ld a, [wd0ee] and $c0 - ld [$d0ee], a + ld [wd0ee], a call Function3ceaa jr z, .asm_3ce72 ld hl, EnemyMonBaseStats @@ -2256,27 +2256,27 @@ Function3ce01: ; 3ce01 .asm_3ce72 ld hl, EnemyMonBaseStats - ld de, $c720 + ld de, wc720 ld bc, $0007 call CopyBytes xor a - ld [$c71f], a + ld [wc71f], a call Function3ee3b call Function3ceaa ret z - ld a, [$c664] + ld a, [wc664] push af ld a, d - ld [$c664], a - ld hl, $c720 + ld [wc664], a + ld hl, wc720 ld de, EnemyMonBaseStats ld bc, $0007 call CopyBytes ld a, $1 - ld [$c71f], a + ld [wc71f], a call Function3ee3b pop af - ld [$c664], a + ld [wc664], a ret ; 3ceaa @@ -2419,7 +2419,7 @@ Function3cf4a: ; 3cf4a EnemyPartyMonEntrance: ; 3cf78 push af xor a - ld [$c718], a + ld [wc718], a call NewEnemyMonStatus call ResetEnemyStatLevels call BreakAttraction @@ -2438,7 +2438,7 @@ EnemyPartyMonEntrance: ; 3cf78 call SpikesDamage xor a ld [wEnemyMoveStruct + MOVE_ANIM], a - ld [$d0ec], a + ld [wd0ec], a inc a ret ; 3cfa4 @@ -2446,7 +2446,7 @@ EnemyPartyMonEntrance: ; 3cf78 Function3cfa4: ; 3cfa4 call Function3ceec ld a, $1 - ld [$c6fd], a + ld [wc6fd], a ld [BattleEnded], a ld a, [InLinkBattle] and a @@ -2460,7 +2460,7 @@ Function3cfa4: ; 3cfa4 ld a, [InLinkBattle] and a ret nz - ld a, [$cfc0] + ld a, [wcfc0] bit 0, a jr nz, .asm_3d006 call Function3ebd8 @@ -2471,7 +2471,7 @@ Function3cfa4: ; 3cfa4 jr nz, .asm_3cfe8 predef Functionc658 .asm_3cfe8 - ld a, [$c2cc] + ld a, [wc2cc] bit 0, a jr nz, .asm_3cff2 call Function3718 @@ -2507,7 +2507,7 @@ Function3cfa4: ; 3cfa4 ; 3d02b Function3d02b: ; 3d02b - ld a, [$c73d] + ld a, [wc73d] and a call nz, Function3d099 call Function3d0b1 @@ -2566,7 +2566,7 @@ Function3d02b: ; 3d02b Function3d081: ; 3d081 push bc - ld hl, $c688 + ld hl, wc688 ld de, wMomsMoney + 2 call Function3d0be pop bc @@ -2575,7 +2575,7 @@ Function3d081: ; 3d081 Function3d08d: ; 3d08d push bc - ld hl, $c688 + ld hl, wc688 ld de, Money + 2 call Function3d0be pop bc @@ -2583,7 +2583,7 @@ Function3d08d: ; 3d08d ; 3d099 Function3d099: ; 3d099 - ld hl, $c688 + ld hl, wc688 sla [hl] dec hl rl [hl] @@ -2667,7 +2667,7 @@ Function3d0ea: ; 3d0ea ld a, [hli] or [hl] jr nz, .asm_3d11e - ld a, [$c664] + ld a, [wc664] and a jr z, .asm_3d121 jr .asm_3d11e @@ -2749,7 +2749,7 @@ Function3d14e: ; 3d14e or [hl] call z, Function3cf14 ld a, $1 - ld [$c6f7], a + ld [wc6f7], a call Function3d1aa call Function3d873 ld a, d @@ -2786,7 +2786,7 @@ Function3d14e: ; 3d14e and a ret nz ld a, $1 - ld [$d0ec], a + ld [wd0ec], a call Function3cf4a jp z, Function3c0e5 jp Function3cdca @@ -2795,7 +2795,7 @@ Function3d14e: ; 3d14e Function3d1aa: ; 3d1aa ld a, [CurBattleMon] ld c, a - ld hl, $c664 + ld hl, wc664 ld b, $0 predef FlagPredef ld hl, EnemySubStatus3 @@ -2820,11 +2820,11 @@ Function3d1aa: ; 3d1aa ld a, [CurBattleMon] ld [CurPartyMon], a callab ChangeHappiness - ld a, [$d0ee] + ld a, [wd0ee] and $c0 add $1 - ld [$d0ee], a - ld a, [$c6f7] + ld [wd0ee], a + ld a, [wc6f7] and a ret z ret @@ -2842,13 +2842,13 @@ Function3d1f8: ; 3d1f8 .asm_3d20a lb bc, 1, 7 call PlaceYesNoBox - ld a, [$cfa9] + ld a, [wcfa9] jr c, .asm_3d217 and a ret .asm_3d217 - ld a, [$cfa9] + ld a, [wcfa9] cp $1 jr z, .asm_3d20a ld hl, PartyMon1Speed @@ -2865,12 +2865,12 @@ Function3d227: ; 3d227 and a jr z, .asm_3d241 ld a, $1 - ld [$d0ec], a + ld [wd0ec], a call Function3e8e4 .asm_3d241 xor a - ld [$d0ec], a + ld [wd0ec], a call Function3d2e0 jr c, .asm_3d251 ld hl, EnemyMonHP @@ -2894,7 +2894,7 @@ Function3d227: ; 3d227 .asm_3d26c call ClearSprites ld a, [CurBattleMon] - ld [$c71a], a + ld [wc71a], a ld a, [CurPartyMon] ld [CurBattleMon], a call Function3d581 @@ -2922,7 +2922,7 @@ Function3d227: ; 3d227 Function3d2b3: ; 3d2b3 ld a, [CurBattleMon] - ld [$c71a], a + ld [wc71a], a ld a, [CurPartyMon] ld [CurBattleMon], a call Function3d581 @@ -2943,7 +2943,7 @@ Function3d2e0: ; 3d2e0 ld a, [InLinkBattle] cp $4 jr nz, .asm_3d2ef - ld a, [$cd2b] + ld a, [wcd2b] and a jr z, .asm_3d2ef scf @@ -3064,7 +3064,7 @@ LostBattle: ; 3d38e ld a, 1 ld [BattleEnded], a - ld a, [$cfc0] + ld a, [wcfc0] bit 0, a jr nz, .asm_3d3bd @@ -3081,7 +3081,7 @@ LostBattle: ; 3d38e ld c, 40 call DelayFrames - ld a, [$c2cc] + ld a, [wc2cc] bit 0, a jr nz, .asm_3d3bc call Function3718 @@ -3122,10 +3122,10 @@ LostBattle: ; 3d38e call Function3cf35 jr nz, .asm_3d40a ld hl, TiedAgainstText - ld a, [$d0ee] + ld a, [wd0ee] and $c0 add 2 - ld [$d0ee], a + ld [wd0ee], a jr .text .asm_3d40a @@ -3170,10 +3170,10 @@ Function3d43b: ; 3d43b ; 3d444 Function3d444: ; 3d444 - ld a, [$cfbe] + ld a, [wcfbe] push af set 6, a - ld [$cfbe], a + ld [wcfbe], a ld b, $7 .asm_3d44f push bc @@ -3212,7 +3212,7 @@ Function3d444: ; 3d444 dec b jr nz, .asm_3d44f pop af - ld [$cfbe], a + ld [wcfbe], a ret ; 3d488 @@ -3270,7 +3270,7 @@ Function3d4ae: ; 3d4ae Function3d4c3: ; 3d4c3 call Function3d557 - ld a, [$c718] + ld a, [wc718] dec a ld b, a call Function3d6ca @@ -3301,9 +3301,9 @@ Function3d4e1: ; 3d4e1 pop af ret c xor a - ld [$c664], a - ld [$c6fc], a - ld [$d0ec], a + ld [wc664], a + ld [wc6fc], a + ld [wd0ec], a inc a ld [wEnemyIsSwitching], a call Function309d @@ -3335,7 +3335,7 @@ Function3d533: ; 3d533 jr .asm_3d555 .asm_3d541 - ld a, [$c718] + ld a, [wc718] and a jr z, .asm_3d54b dec a @@ -3343,7 +3343,7 @@ Function3d533: ; 3d533 jr .asm_3d555 .asm_3d54b - ld a, [$d264] + ld a, [wd264] and a ld b, $0 jr nz, .asm_3d555 @@ -3362,9 +3362,9 @@ Function3d557: ; 3d557 ld [LastEnemyMove], a ld [CurEnemyMove], a dec a - ld [$c6e6], a + ld [wc6e6], a xor a - ld [$c730], a + ld [wc730], a hlcoord 18, 0 ld a, $8 call Function3d490 @@ -3374,17 +3374,17 @@ Function3d557: ; 3d557 Function3d57a: ; 3d57a xor a - ld [$c664], a - ld [$c6fc], a + ld [wc664], a + ld [wc6fc], a Function3d581: ; 3d581 ld a, [CurBattleMon] ld c, a - ld hl, $c664 + ld hl, wc664 ld b, SET_FLAG push bc predef FlagPredef pop bc - ld hl, $c6fc + ld hl, wc6fc predef_jump FlagPredef ; 3d599 @@ -3453,7 +3453,7 @@ Function3d5d7: ; 3d5d7 pop bc pop de pop hl - ld a, [$d265] + ld a, [wd265] cp 10 + 1 ; 1.0 + 0.1 jr c, .loop ld hl, Buffer1 @@ -3484,13 +3484,13 @@ Function3d618: ; 3d618 ld [wPlayerMoveStruct + MOVE_TYPE], a call SetPlayerTurn callab Function347c8 - ld a, [$d265] + ld a, [wd265] cp 10 + 1 ; 1.0 + 0.1 jr nc, .asm_3d663 ld a, [BattleMonType2] ld [wPlayerMoveStruct + MOVE_TYPE], a callab Function347c8 - ld a, [$d265] + ld a, [wd265] cp 10 + 1 ; 1.0 + 0.1 jr nc, .asm_3d663 pop bc @@ -3595,24 +3595,24 @@ Function3d6ca: ; 3d6ca ld a, [CurPartySpecies] cp UNOWN jr nz, .asm_3d708 - ld a, [$def4] + ld a, [wdef4] and a jr nz, .asm_3d708 ld hl, EnemyMonDVs predef GetUnownLetter ld a, [UnownLetter] - ld [$def4], a + ld [wdef4], a .asm_3d708 ld hl, EnemyMonHP ld a, [hli] - ld [$c6ea], a + ld [wc6ea], a ld a, [hl] - ld [$c6eb], a + ld [wc6eb], a ret ; 3d714 Function3d714: ; 3d714 - ld a, [$d264] + ld a, [wd264] dec a jp z, .asm_3d749 ld a, [PartyCount] @@ -3649,14 +3649,14 @@ Function3d74b: ; 3d74b call StdBattleTextBox lb bc, 1, 7 call PlaceYesNoBox - ld a, [$cfa9] + ld a, [wcfa9] dec a jr nz, .asm_3d79a call Function3d2f7 call PickSwitchMonInBattle jr c, .asm_3d791 ld a, [CurBattleMon] - ld [$c71a], a + ld [wc71a], a ld a, [CurPartyMon] ld [CurBattleMon], a call ClearPalettes @@ -3712,8 +3712,8 @@ Function3d7c7: ; 3d7c7 call Function3f47c xor a - ld [$cfca], a - ld [$c689], a + ld [wcfca], a + ld [wc689], a call SetEnemyTurn ld de, ANIM_SEND_OUT_MON call Function3ee17 @@ -3721,7 +3721,7 @@ Function3d7c7: ; 3d7c7 call Function3da79 jr nc, .asm_3d800 ld a, 1 ; shiny anim - ld [$c689], a + ld [wc689], a ld de, ANIM_SEND_OUT_MON call Function3ee17 .asm_3d800 @@ -3764,11 +3764,11 @@ NewEnemyMonStatus: ; 3d834 ld [EnemyDisableCount], a ld [EnemyFuryCutterCount], a ld [EnemyProtectCount], a - ld [$c72c], a + ld [wc72c], a ld [EnemyDisabledMove], a - ld [$c6fa], a - ld [$c730], a - ld [$c731], a + ld [wc6fa], a + ld [wc730], a + ld [wc731], a ld [EnemyTurnsTaken], a ld hl, PlayerSubStatus5 res SUBSTATUS_CANT_RUN, [hl] @@ -3811,7 +3811,7 @@ Function3d887: ; 3d887 ld a, [hli] or [hl] ret nz - ld a, [$d264] + ld a, [wd264] and a jr nz, .asm_3d8b1 ld hl, PartySpecies @@ -3861,14 +3861,14 @@ Function3d8b3: ; 3d8b3 bit SUBSTATUS_CANT_RUN, a jp nz, .asm_3d98d - ld a, [$c730] + ld a, [wc730] and a jp nz, .asm_3d98d push hl push de ld a, [BattleMonItem] - ld [$d265], a + ld [wd265], a ld b, a callab GetItem ld a, b @@ -3884,9 +3884,9 @@ Function3d8b3: ; 3d8b3 jp .asm_3d9a2 .asm_3d916 - ld a, [$d267] + ld a, [wd267] inc a - ld [$d267], a + ld [wd267], a ld a, [hli] ld [$ffb5], a ld a, [hl] @@ -3926,7 +3926,7 @@ Function3d8b3: ; 3d8b3 ld a, [$ffb5] and a jr nz, .asm_3d9a2 - ld a, [$d267] + ld a, [wd267] ld c, a .asm_3d96c dec c @@ -3945,7 +3945,7 @@ Function3d8b3: ; 3d8b3 cp b jr nc, .asm_3d9a2 ld a, $1 - ld [$d0ec], a + ld [wd0ec], a ld hl, BattleText_0x80b3b jr .asm_3d995 @@ -3959,7 +3959,7 @@ Function3d8b3: ; 3d8b3 .asm_3d995 call StdBattleTextBox ld a, $1 - ld [$d266], a + ld [wd266], a call Function309d and a ret @@ -3971,7 +3971,7 @@ Function3d8b3: ; 3d8b3 jr z, .asm_3d9cf call Function309d xor a - ld [$d0ec], a + ld [wd0ec], a ld a, $f ld [CurMoveNum], a xor a @@ -3989,10 +3989,10 @@ Function3d8b3: ; 3d8b3 dec a .asm_3d9cf ld b, a - ld a, [$d0ee] + ld a, [wd0ee] and $c0 add b - ld [$d0ee], a + ld [wd0ee], a call Function3ceec push de ld de, SFX_RUN @@ -4008,7 +4008,7 @@ Function3d8b3: ; 3d8b3 .asm_3d9f5 call Function3ceec - ld hl, $cd2a + ld hl, wcd2a bit 4, [hl] jr nz, .asm_3da05 ld hl, BattleText_0x81863 @@ -4092,7 +4092,7 @@ Function3da97: ; 3da97 ld a, [EnemySubStatus5] bit SUBSTATUS_TRANSFORMED, a ret z - ld hl, $c6f2 + ld hl, wc6f2 ld a, [IsInBattle] dec a ret z @@ -4170,7 +4170,7 @@ Function3dabd: ; 3dabd Function3db32: ; 3db32 call ClearSprites ld a, [CurBattleMon] - ld [$c71a], a + ld [wc71a], a ld a, [CurPartyMon] ld [CurBattleMon], a call Function3d581 @@ -4201,7 +4201,7 @@ Function3db5f: ; 3db5f call Function3f43d xor a ld [$ffad], a - ld [$d0d2], a + ld [wd0d2], a ld [CurMoveNum], a ld [TypeModifier], a ld [wPlayerMoveStruct + MOVE_ANIM], a @@ -4211,17 +4211,17 @@ Function3db5f: ; 3db5f call CheckAmuletCoin call Function3ee27 xor a - ld [$c731], a + ld [wc731], a call SetPlayerTurn xor a - ld [$cfca], a - ld [$c689], a + ld [wcfca], a + ld [wc689], a ld de, ANIM_SEND_OUT_MON call Function3ee17 call Function3da74 jr nc, .asm_3dbbc ld a, $1 - ld [$c689], a + ld [wc689], a ld de, ANIM_SEND_OUT_MON call Function3ee17 @@ -4263,11 +4263,11 @@ NewBattleMonStatus: ; 3dbde ld [PlayerDisableCount], a ld [PlayerFuryCutterCount], a ld [PlayerProtectCount], a - ld [$c72b], a + ld [wc72b], a ld [DisabledMove], a - ld [$c6fe], a - ld [$c731], a - ld [$c730], a + ld [wc6fe], a + ld [wc731], a + ld [wc730], a ld [PlayerTurnsTaken], a ld hl, EnemySubStatus5 res SUBSTATUS_CANT_RUN, [hl] @@ -4340,7 +4340,7 @@ Function3dc5b: ; 3dc5b and a jr z, .asm_3dc7e ld hl, DoEnemyTurn - ld a, [$c71a] + ld a, [wc71a] ld [CurBattleMon], a .asm_3dc7e ld a, BANK(DoPlayerTurn) @@ -4358,7 +4358,7 @@ Function3dc5b: ; 3dc5b and a jr z, .asm_3dcc0 - ld a, [$c71a] + ld a, [wc71a] call Function399f ld hl, BattleMonHP ld a, [hli] @@ -4369,9 +4369,9 @@ Function3dc5b: ; 3dc5b ld [CryTracks], a ld a, [BattleMonSpecies] call PlayStereoCry - ld a, [$c71a] + ld a, [wc71a] ld c, a - ld hl, $c664 + ld hl, wc664 ld b, $0 predef FlagPredef call Function3d43b @@ -4408,7 +4408,7 @@ Function3dce6: ; 3dce6 push af xor a ld [hBattleTurn], a - ld [$cfca], a + ld [wcfca], a ld de, ANIM_RETURN_MON call Function3ee17 pop af @@ -4450,19 +4450,19 @@ Function3dd2f: ; 3dd2f ld a, [hBattleTurn] and a jr z, .asm_3dd4a - ld de, $c63d + ld de, BattleMonHP + 1 ld hl, BattleMonMaxHP .asm_3dd4a push bc ld a, [de] - ld [$d1ec], a + ld [wd1ec], a add a ld c, a dec de ld a, [de] inc de - ld [$d1ed], a + ld [wd1ed], a adc a ld b, a ld a, b @@ -4487,12 +4487,12 @@ Function3dd2f: ; 3dd2f ld [Buffer1], a ld a, [de] add c - ld [$d1ee], a + ld [wd1ee], a ld c, a dec de ld a, [de] adc $0 - ld [$d1ef], a + ld [wd1ef], a ld b, a ld a, [hld] cp c @@ -4500,31 +4500,31 @@ Function3dd2f: ; 3dd2f sbc b jr nc, .asm_3dd8d ld a, [hli] - ld [$d1ef], a + ld [wd1ef], a ld a, [hl] - ld [$d1ee], a + ld [wd1ee], a .asm_3dd8d - ld a, [$d1ef] + ld a, [wd1ef] ld [de], a inc de - ld a, [$d1ee] + ld a, [wd1ee] ld [de], a ld a, [hBattleTurn] - ld [$d10a], a + ld [wd10a], a and a hlcoord 2, 2 jr z, .asm_3dda4 hlcoord 10, 9 .asm_3dda4 - ld [$d10a], a + ld [wd10a], a predef Functionc6e0 Function3ddac: call RefreshBattleHuds callab GetOpponentItem ld a, [hl] - ld [$d265], a + ld [wd265], a call GetItemName callab Function27192 ld hl, RecoveredUsingText @@ -4541,7 +4541,7 @@ Function3ddc8: ; 3ddc8 ld [FXAnimIDLo], a call SwitchTurnCore xor a - ld [$cfca], a + ld [wcfca], a ld [FXAnimIDHi], a predef PlayBattleAnim call SwitchTurnCore @@ -4631,7 +4631,7 @@ Function3de51: ; 3de51 .asm_3de67 ld a, [hl] - ld [$d265], a + ld [wd265], a ld a, BATTLE_VARS_SUBSTATUS3_OPP call GetBattleVarAddr res SUBSTATUS_CONFUSED, [hl] @@ -4700,7 +4700,7 @@ Function3deb6: ; 3deb6 jr nz, .asm_3dec7 pop bc ld a, [bc] - ld [$d265], a + ld [wd265], a push bc dec hl dec hl @@ -4837,7 +4837,7 @@ CheckDanger: ; 3df9e ld a, [hli] or [hl] jr z, .no_danger - ld a, [$c6fd] + ld a, [wc6fd] and a jr nz, .done ld a, [PlayerHPPal] @@ -4959,7 +4959,7 @@ DrawEnemyHUD: ; 3e043 ld a, [EnemySubStatus5] bit SUBSTATUS_TRANSFORMED, a jr z, .ok - ld hl, $c6f2 + ld hl, wc6f2 .ok ld a, [hli] ld [de], a @@ -5057,7 +5057,7 @@ DrawEnemyHUD: ; 3e043 .asm_3e11a xor a - ld [$d10a], a + ld [wd10a], a hlcoord 2, 2 ld b, 0 call DrawHPBar @@ -5120,7 +5120,7 @@ BattleMenu: ; 3e139 .next ld a, $1 ld [hBGMapMode], a - ld a, [$d0d2] + ld a, [wd0d2] cp $1 jp z, BattleMenu_Fight cp $3 @@ -5134,7 +5134,7 @@ BattleMenu: ; 3e139 BattleMenu_Fight: ; 3e192 xor a - ld [$d267], a + ld [wd267], a call Function30b4 and a ret @@ -5150,11 +5150,11 @@ LoadBattleMenu2: ; 3e19b .mobile callba Function100b12 - ld a, [$cd2b] + ld a, [wcd2b] and a ret z - ld hl, $cd2a + ld hl, wcd2a bit 4, [hl] jr nz, .error ld hl, BattleText_0x81863 @@ -5171,7 +5171,7 @@ BattleMenu_Pack: ; 3e1c7 and a jp nz, ItemsCantBeUsed - ld a, [$cfc0] + ld a, [wcfc0] and a jp nz, ItemsCantBeUsed @@ -5184,7 +5184,7 @@ BattleMenu_Pack: ; 3e1c7 jr z, .contest callba BattlePack - ld a, [$d0ec] + ld a, [wd0ec] and a jr z, .asm_3e20d jr .asm_3e209 @@ -5225,11 +5225,11 @@ ItemsCantBeUsed: ; 3e22b ; 3e234 Function3e234: ; 3e234 - ld a, [$c64e] + ld a, [wc64e] and a jr nz, .asm_3e279 callab CheckItemPocket - ld a, [$d142] + ld a, [wd142] cp $3 jr z, .asm_3e24a call WhiteBGMap @@ -5247,7 +5247,7 @@ Function3e234: ; 3e234 .asm_3e25d call Function3f47c ld a, $1 - ld [$cfa9], a + ld [wcfa9], a call Function1c07 call Function3df2c call WaitBGMap @@ -5259,10 +5259,10 @@ Function3e234: ; 3e234 .asm_3e279 xor a - ld [$c64e], a - ld a, [$d0ee] + ld [wc64e], a + ld a, [wd0ee] and $c0 - ld [$d0ee], a + ld [wd0ee], a call Function1fbf call Function32f9 scf @@ -5287,7 +5287,7 @@ Function3e299: call Function3e2f5 jr c, .asm_3e2c8 call Function1bee - ld a, [$cfa9] + ld a, [wcfa9] cp $1 jp z, Function3e358 cp $2 @@ -5372,7 +5372,7 @@ Function3e358: ; 3e358 jp Function3e299 .asm_3e36b - ld a, [$c730] + ld a, [wc730] and a jr nz, .asm_3e378 ld a, [EnemySubStatus5] @@ -5388,9 +5388,9 @@ Function3e358: ; 3e358 call Function3d887 jp z, Function3e299 ld a, [CurBattleMon] - ld [$c71a], a + ld [wc71a], a ld a, $2 - ld [$d0ec], a + ld [wd0ec], a call ClearPalettes call DelayFrame call ClearSprites @@ -5492,7 +5492,7 @@ BattleMonEntrance: ; 3e40b call SetPlayerTurn call SpikesDamage ld a, $2 - ld [$cfa9], a + ld [wcfa9], a ret ; 3e459 @@ -5509,7 +5509,7 @@ PassedBattleMonEntrance: ; 3e459 call Function3d581 call Function3da0d xor a - ld [$d265], a + ld [wd265], a call Function3ecab call Function3db5f call EmptyBattleTextBox @@ -5522,14 +5522,14 @@ PassedBattleMonEntrance: ; 3e459 BattleMenu_Run: ; 3e489 call Function30b4 ld a, $3 - ld [$cfa9], a + ld [wcfa9], a ld hl, BattleMonSpeed ld de, EnemyMonSpeed call Function3d8b3 ld a, $0 - ld [$d266], a + ld [wd266], a ret c - ld a, [$d0ec] + ld a, [wd0ec] and a ret nz jp BattleMenu @@ -5544,7 +5544,7 @@ CheckAmuletCoin: ; 3e4a8 cp HELD_AMULET_COIN ret nz ld a, 1 - ld [$c73d], a + ld [wc73d], a ret ; 3e4bc @@ -5556,7 +5556,7 @@ Function3e4bc: ; 3e4bc .asm_3e4c8 ld hl, EnemyMonMoves - ld a, [$d235] + ld a, [wd235] dec a jr z, .asm_3e4e2 dec a @@ -5571,7 +5571,7 @@ Function3e4bc: ; 3e4bc call GetPartyParamLocation .asm_3e4e2 - ld de, $d25e + ld de, wd25e ld bc, NUM_MOVES call CopyBytes xor a @@ -5580,7 +5580,7 @@ Function3e4bc: ; 3e4bc hlcoord 4, 17 - NUM_MOVES - 1 ld b, 4 ld c, 14 - ld a, [$d235] + ld a, [wd235] cp $2 jr nz, .asm_3e503 hlcoord 4, 17 - NUM_MOVES - 1 - 4 @@ -5590,7 +5590,7 @@ Function3e4bc: ; 3e4bc call TextBox hlcoord 6, 17 - NUM_MOVES - ld a, [$d235] + ld a, [wd235] cp $2 jr nz, .asm_3e513 hlcoord 6, 17 - NUM_MOVES - 4 @@ -5600,7 +5600,7 @@ Function3e4bc: ; 3e4bc predef ListMoves ld b, 5 - ld a, [$d235] + ld a, [wd235] cp $2 ld a, 17 - NUM_MOVES jr nz, .asm_3e52c @@ -5608,26 +5608,26 @@ Function3e4bc: ; 3e4bc ld a, 17 - NUM_MOVES - 4 .asm_3e52c - ld [$cfa1], a + ld [wcfa1], a ld a, b - ld [$cfa2], a - ld a, [$d235] + ld [wcfa2], a + ld a, [wd235] cp $1 jr z, .asm_3e53e ld a, [CurMoveNum] inc a .asm_3e53e - ld [$cfa9], a + ld [wcfa9], a ld a, $1 - ld [$cfaa], a - ld a, [$d0eb] + ld [wcfaa], a + ld a, [wd0eb] inc a - ld [$cfa3], a + ld [wcfa3], a ld a, $1 - ld [$cfa4], a + ld [wcfa4], a ld c, $2c - ld a, [$d235] + ld a, [wd235] dec a ld b, $c1 jr z, .asm_3e569 @@ -5641,15 +5641,15 @@ Function3e4bc: ; 3e4bc .asm_3e569 ld a, b - ld [$cfa8], a + ld [wcfa8], a ld a, c - ld [$cfa5], a + ld [wcfa5], a xor a - ld [$cfa6], a + ld [wcfa6], a ld a, $10 - ld [$cfa7], a + ld [wcfa7], a .asm_3e57a - ld a, [$d235] + ld a, [wd235] and a jr z, .asm_3e58e dec a @@ -5661,7 +5661,7 @@ Function3e4bc: ; 3e4bc .asm_3e58e call MoveInfoBox - ld a, [$d0e3] + ld a, [wd0e3] and a jr z, .asm_3e5a3 hlcoord 5, 13 @@ -5684,12 +5684,12 @@ Function3e4bc: ; 3e4bc push af xor a - ld [$d0e3], a - ld a, [$cfa9] + ld [wd0e3], a + ld a, [wcfa9] dec a - ld [$cfa9], a + ld [wcfa9], a ld b, a - ld a, [$d235] + ld a, [wd235] dec a jr nz, .asm_3e5d0 @@ -5710,7 +5710,7 @@ Function3e4bc: ; 3e4bc ret nz ld hl, BattleMonPP - ld a, [$cfa9] + ld a, [wcfa9] ld c, a ld b, 0 add hl, bc @@ -5723,10 +5723,10 @@ Function3e4bc: ; 3e4bc dec a cp c jr z, .asm_3e60b - ld a, [$c6e1] + ld a, [wc6e1] and a jr nz, .asm_3e606 - ld a, [$cfa9] + ld a, [wcfa9] ld hl, BattleMonMoves ld c, a ld b, 0 @@ -5756,30 +5756,30 @@ Function3e4bc: ; 3e4bc ; 3e61d .asm_3e61d - ld a, [$cfa9] + ld a, [wcfa9] and a jp nz, .asm_3e57a - ld a, [$d0eb] + ld a, [wd0eb] inc a - ld [$cfa9], a + ld [wcfa9], a jp .asm_3e57a ; 3e62e .asm_3e62e ; 3e62e - ld a, [$cfa9] + ld a, [wcfa9] ld b, a - ld a, [$d0eb] + ld a, [wd0eb] inc a inc a cp b jp nz, .asm_3e57a ld a, $1 - ld [$cfa9], a + ld [wcfa9], a jp .asm_3e57a ; 3e643 .asm_3e643 ; 3e643 - ld a, [$d0e3] + ld a, [wd0e3] and a jr z, .asm_3e6bf ld hl, BattleMonMoves @@ -5791,26 +5791,26 @@ Function3e4bc: ; 3e4bc swap a and $f ld b, a - ld a, [$cfa9] + ld a, [wcfa9] cp b jr nz, .asm_3e671 ld a, [hl] and $f ld b, a - ld a, [$d0e3] + ld a, [wd0e3] swap a add b ld [hl], a jr .asm_3e682 .asm_3e671 - ld a, [$d0e3] + ld a, [wd0e3] cp b jr nz, .asm_3e682 ld a, [hl] and $f ld b, a - ld a, [$cfa9] + ld a, [wcfa9] swap a add b ld [hl], a @@ -5831,12 +5831,12 @@ Function3e4bc: ; 3e4bc .asm_3e69e xor a - ld [$d0e3], a + ld [wd0e3], a jp Function3e4bc .asm_3e6a5 push hl - ld a, [$d0e3] + ld a, [wd0e3] dec a ld c, a ld b, 0 @@ -5844,7 +5844,7 @@ Function3e4bc: ; 3e4bc ld d, h ld e, l pop hl - ld a, [$cfa9] + ld a, [wcfa9] dec a ld c, a ld b, 0 @@ -5857,8 +5857,8 @@ Function3e4bc: ; 3e4bc ret .asm_3e6bf - ld a, [$cfa9] - ld [$d0e3], a + ld a, [wcfa9] + ld [wd0e3], a jp Function3e4bc ; 3e6c8 @@ -5879,7 +5879,7 @@ MoveInfoBox: ; 3e6c8 swap a and $f ld b, a - ld a, [$cfa9] + ld a, [wcfa9] cp b jr nz, .asm_3e6f4 @@ -5889,11 +5889,11 @@ MoveInfoBox: ; 3e6c8 jr .done .asm_3e6f4 - ld hl, $cfa9 + ld hl, wcfa9 dec [hl] call SetPlayerTurn ld hl, BattleMonMoves - ld a, [$cfa9] + ld a, [wcfa9] ld c, a ld b, 0 add hl, bc @@ -5906,7 +5906,7 @@ MoveInfoBox: ; 3e6c8 ld [MonType], a callab Functionf8ec - ld hl, $cfa9 + ld hl, wcfa9 ld c, [hl] inc [hl] ld b, 0 @@ -5957,7 +5957,7 @@ Function3e75f: ; 3e75f inc hl ld [hl], "/" inc hl - ld de, $d265 + ld de, wd265 ld bc, $0102 call PrintNum ret @@ -6021,7 +6021,7 @@ Function3e7c1: ; 3e7c1 jr z, .asm_3e817 call EmptyBattleTextBox call Function309d - ld a, [$d0ec] + ld a, [wd0ec] and a call z, Function3e8e4 call Function30b4 @@ -6128,7 +6128,7 @@ Function3e7c1: ; 3e7c1 call Function3e8d1 jr nz, .asm_3e894 xor a - ld [$c733], a + ld [wc733], a .asm_3e894 ld a, [wEnemyMoveStruct + MOVE_EFFECT] @@ -6144,7 +6144,7 @@ Function3e7c1: ; 3e7c1 ld hl, EnemySubStatus4 res SUBSTATUS_RAGE, [hl] xor a - ld [$c72c], a + ld [wc72c], a .asm_3e8af ld a, [wEnemyMoveStruct + MOVE_EFFECT] @@ -6165,7 +6165,7 @@ Function3e8c1: ; 3e8c1 xor a ld [EnemyFuryCutterCount], a ld [EnemyProtectCount], a - ld [$c72c], a + ld [wc72c], a ld hl, EnemySubStatus4 res SUBSTATUS_RAGE, [hl] ret @@ -6208,7 +6208,7 @@ LoadEnemyMon: ; 3e8eb and a jp nz, Function3dabd - ld a, [$cfc0] ; ???? + ld a, [wcfc0] ; ???? bit 0, a jp nz, Function3dabd @@ -6283,7 +6283,7 @@ LoadEnemyMon: ; 3e8eb jr z, .InitDVs ; Unknown - ld hl, $c6f2 + ld hl, wc6f2 ld de, EnemyMonDVs ld a, [hli] ld [de], a @@ -6472,7 +6472,7 @@ LoadEnemyMon: ; 3e8eb ; Fill stats ld de, EnemyMonMaxHP ld b, $00 - ld hl, $d201 ; ? + ld hl, LinkBattleRNs + 7 ; ? predef Functione167 ; If we're in a trainer battle, @@ -6633,7 +6633,7 @@ LoadEnemyMon: ; 3e8eb ld [de], a ld a, [TempEnemyMonSpecies] - ld [$d265], a + ld [wd265], a call GetPokemonName @@ -6887,7 +6887,7 @@ Function3ec39: ; 3ec39 ld a, [BattleMonStatus] and 1 << PAR ret z - ld hl, $c645 + ld hl, BattleMonSpeed + 1 ld a, [hld] ld b, a ld a, [hl] @@ -6908,7 +6908,7 @@ Function3ec39: ; 3ec39 ld a, [EnemyMonStatus] and 1 << PAR ret z - ld hl, $d21f + ld hl, EnemyMonSpeed + 1 ld a, [hld] ld b, a ld a, [hl] @@ -6933,7 +6933,7 @@ Function3ec76: ; 3ec76 ld a, [BattleMonStatus] and 1 << BRN ret z - ld hl, $c641 + ld hl, BattleMonAttack + 1 ld a, [hld] ld b, a ld a, [hl] @@ -6952,7 +6952,7 @@ Function3ec76: ; 3ec76 ld a, [EnemyMonStatus] and 1 << BRN ret z - ld hl, $d21b + ld hl, EnemyMonAttack + 1 ld a, [hld] ld b, a ld a, [hl] @@ -6982,7 +6982,7 @@ Function3ecab: ; 3ecab Function3ecb7: ; 3ecb7 push bc push bc - ld a, [$d265] + ld a, [wd265] and a ld a, c ld hl, BattleMonAttack @@ -7100,7 +7100,7 @@ BadgeStatBoosts: ; 3ed45 and a ret nz - ld a, [$cfc0] + ld a, [wcfc0] and a ret nz @@ -7318,7 +7318,7 @@ Function3ee3b: ; 3ee3b ld a, [InLinkBattle] and a ret nz - ld a, [$cfc0] + ld a, [wcfc0] bit 0, a ret nz call Function3f0d4 @@ -7333,7 +7333,7 @@ Function3ee3b: ; 3ee3b or [hl] jp z, .asm_3f0b9 push bc - ld hl, $c664 + ld hl, wc664 ld a, [CurPartyMon] ld c, a ld b, $2 @@ -7415,7 +7415,7 @@ Function3ee3b: ; 3ee3b cp [hl] jr nz, .asm_3eedd inc hl - ld a, [$d47c] + ld a, [PlayerID + 1] cp [hl] ld a, $0 jr z, .asm_3eee2 @@ -7425,7 +7425,7 @@ Function3ee3b: ; 3ee3b ld a, $1 .asm_3eee2 - ld [$d088], a + ld [StringBuffer2 + 2], a ld a, [IsInBattle] dec a call nz, DoubleExp @@ -7436,7 +7436,7 @@ Function3ee3b: ; 3ee3b cp LUCKY_EGG call z, DoubleExp ld a, [$ffb6] - ld [$d087], a + ld [StringBuffer2 + 1], a ld a, [$ffb5] ld [StringBuffer2], a ld a, [CurPartyMon] @@ -7444,7 +7444,7 @@ Function3ee3b: ; 3ee3b call GetNick ld hl, UnknownText_0x3f11b call BattleTextBox - ld a, [$d087] + ld a, [StringBuffer2 + 1] ld [$ffb6], a ld a, [StringBuffer2] ld [$ffb5], a @@ -7521,7 +7521,7 @@ Function3ee3b: ; 3ee3b jp nc, .asm_3f0b9 cp d jp z, .asm_3f0b9 - ld [$c719], a + ld [wc719], a ld a, [CurPartyLevel] push af ld a, d @@ -7531,7 +7531,7 @@ Function3ee3b: ; 3ee3b add hl, bc ld a, [hl] ld [CurSpecies], a - ld [$d265], a + ld [wd265], a call GetBaseData ld hl, $0025 add hl, bc @@ -7596,7 +7596,7 @@ Function3ee3b: ; 3ee3b .asm_3f012 xor a - ld [$d265], a + ld [wd265], a call Function3ecab callab Function3ec2c callab BadgeStatBoosts @@ -7638,11 +7638,11 @@ Function3ee3b: ; 3ee3b xor a ld [MonType], a ld a, [CurSpecies] - ld [$d265], a + ld [wd265], a ld a, [CurPartyLevel] push af ld c, a - ld a, [$c719] + ld a, [wc719] ld b, a .asm_3f093 @@ -7684,7 +7684,7 @@ Function3ee3b: ; 3ee3b ; 3f0d4 Function3f0d4: ; 3f0d4 - ld a, [$c664] + ld a, [wc664] ld b, a ld c, $6 ld d, $0 @@ -7697,7 +7697,7 @@ Function3f0d4: ; 3f0d4 jr nz, .asm_3f0dc cp $2 ret c - ld [$d265], a + ld [wd265], a ld hl, EnemyMonBaseStats ld c, $7 .asm_3f0ef @@ -7705,7 +7705,7 @@ Function3f0d4: ; 3f0d4 ld [hProduct], a ld a, [hl] ld [hMultiplicand], a - ld a, [$d265] + ld a, [wd265] ld [hMultiplier], a ld b, $2 call Divide @@ -7737,7 +7737,7 @@ UnknownText_0x3f11b: ; 3f11b text_jump UnknownText_0x1c029c start_asm ld hl, UnknownText_0x3f131 - ld a, [$d088] ; IsTradedMon + ld a, [StringBuffer2 + 2] ; IsTradedMon and a ret z ld hl, UnknownText_0x3f12c @@ -7769,10 +7769,10 @@ Function3f136: ; 3f136 jp nc, .asm_3f219 ld a, [$ffb6] - ld [$d004], a + ld [wd004], a push af ld a, [$ffb5] - ld [$d003], a + ld [wd003], a push af xor a ld [DefaultFlypoint], a @@ -7783,14 +7783,14 @@ Function3f136: ; 3f136 ld b, a ld e, a push de - ld de, $d118 + ld de, TempMonExp + 2 call Function3f39c push bc - ld hl, $d118 - ld a, [$d004] + ld hl, TempMonExp + 2 + ld a, [wd004] add [hl] ld [hld], a - ld a, [$d003] + ld a, [wd003] adc [hl] ld [hld], a jr nc, .asm_3f186 @@ -7810,7 +7810,7 @@ Function3f136: ; 3f136 ld c, a ld a, [$ffb6] ld d, a - ld hl, $d118 + ld hl, TempMonExp + 2 ld a, [hld] sub d ld a, [hld] @@ -7870,7 +7870,7 @@ Function3f136: ; 3f136 .asm_3f1ff push bc ld b, d - ld de, $d118 + ld de, TempMonExp + 2 call Function3f39c ld a, b pop bc @@ -7956,7 +7956,7 @@ Function3f26d: ; 3f26d and a jr z, .asm_3f27c ld hl, UnknownText_0x3f2d1 - ld a, [$d264] + ld a, [wd264] and a jr nz, .asm_3f2ce @@ -7970,10 +7970,10 @@ Function3f26d: ; 3f26d ld [hMultiplicand], a ld hl, EnemyMonHP ld a, [hli] - ld [$c6ea], a + ld [wc6ea], a ld [$ffb5], a ld a, [hl] - ld [$c6eb], a + ld [wc6eb], a ld [$ffb6], a ld a, $19 ld [hMultiplier], a @@ -8054,7 +8054,7 @@ Function3f2ff: ; 3f2ff push de push bc ld hl, EnemyMonHP + 1 - ld de, $c6eb + ld de, wc6eb ld b, [hl] dec hl ld a, [de] @@ -8122,7 +8122,7 @@ UnknownText_0x3f35b: ; 3f35b Function3f360: ; 3f360 - ld hl, $c6f0 + ld hl, wc6f0 ld a, [hl] and a jr z, .asm_3f36d @@ -8294,7 +8294,7 @@ Function3f43d: ; 3f43d jr nz, Function3f46f Function3f447: ; 3f447 - ld a, [$c6fe] + ld a, [wc6fe] and a ld hl, BattleAnimCmd_E2 jr nz, Function3f46f @@ -8330,7 +8330,7 @@ Function3f47c: ; 3f47c jr nz, Function3f4b4 Function3f486: ; 3f486 - ld a, [$c6fa] + ld a, [wc6fa] and a ld hl, BattleAnimCmd_E2 jr nz, Function3f4b4 @@ -8389,7 +8389,7 @@ Function3f4dd: ; 3f4dd call Function3f54e xor a ld [TempBattleMonSpecies], a - ld [$d0d2], a + ld [wd0d2], a xor a ld [$ffde], a callba PlayBattleMusic @@ -8429,7 +8429,7 @@ Function3f54e: ; 3f54e ld a, [OtherTrainerClass] and a jr nz, .asm_3f55a - ld a, [$d22e] + ld a, [wd22e] ld [CurPartySpecies], a .asm_3f55a @@ -8449,7 +8449,7 @@ Function3f568: ; 3f568 push af ld a, $6 ld [rSVBK], a - ld hl, $d000 + ld hl, wd000 ld bc, $400 ld a, $2 call ByteFill @@ -8457,7 +8457,7 @@ Function3f568: ; 3f568 push af ld a, $1 ld [rVBK], a - ld de, $d000 + ld de, wd000 ld hl, VBGMap0 ld bc, $0f40 call Request2bpp @@ -8488,7 +8488,7 @@ Function3f594: ; 3f594 xor a ld [$ffad], a dec a - ld [$c6e6], a + ld [wc6e6], a hlcoord 12, 0 lb bc, 7, 7 predef FillBox @@ -8529,11 +8529,11 @@ Function3f607: ; 3f607 callba Function10605d call LoadEnemyMon ld hl, EnemyMonMoves - ld de, $c735 + ld de, wc735 ld bc, NUM_MOVES call CopyBytes ld hl, EnemyMonPP - ld de, $c739 + ld de, wc739 ld bc, NUM_MOVES call CopyBytes ld hl, EnemyMonDVs @@ -8541,11 +8541,11 @@ Function3f607: ; 3f607 ld a, [CurPartySpecies] cp UNOWN jr nz, .asm_3f648 - ld a, [$def4] + ld a, [wdef4] and a jr nz, .asm_3f648 ld a, [UnownLetter] - ld [$def4], a + ld [wdef4], a .asm_3f648 ld de, VTiles2 predef Function5108b @@ -8560,7 +8560,7 @@ Function3f607: ; 3f607 Function3f662: ; 3f662 ld hl, EnemyMonMoves - ld de, $d25e + ld de, wd25e ld b, NUM_MOVES .loop ld a, [de] @@ -8628,12 +8628,12 @@ Function3f6a5: ; 3f6a5 ret .asm_3f6b7 - ld a, [$d0ee] + ld a, [wd0ee] and $f ret nz call Function3f71d xor a - ld [$d1e9], a + ld [wd1e9], a predef Function421e6 callba Function2ed44 ret @@ -8646,22 +8646,22 @@ Function3f6d0: ; 3f6d0 ld [IsInBattle], a ld [BattleType], a ld [AttackMissed], a - ld [$d22e], a + ld [wd22e], a ld [OtherTrainerClass], a - ld [$d266], a - ld [$d267], a - ld [$d232], a - ld [$d0d8], a - ld [$d0da], a - ld [$d0d9], a - ld [$d0d2], a + ld [wd266], a + ld [wd267], a + ld [wd232], a + ld [wd0d8], a + ld [wd0da], a + ld [wd0d9], a + ld [wd0d2], a ld [CurMoveNum], a - ld [$d0db], a - ld [$d0d6], a - ld [$d0e4], a - ld [$d0e0], a - ld [$d0df], a - ld [$d0e1], a + ld [wd0db], a + ld [wd0d6], a + ld [wd0e4], a + ld [wd0e0], a + ld [wd0df], a + ld [wd0e1], a ld hl, PlayerSubStatus1 ld b, $18 .loop @@ -8679,7 +8679,7 @@ Function3f71d: ; 3f71d inc hl or [hl] ret z - ld a, [$c73d] + ld a, [wc73d] and a jr z, .asm_3f73d ld hl, wPayDayMoney + 2 @@ -8700,7 +8700,7 @@ Function3f71d: ; 3f71d call Function3d0be ld hl, BattleText_0x80730 call StdBattleTextBox - ld a, [$cfc0] + ld a, [wcfc0] bit 0, a ret z call ClearTileMap @@ -8726,13 +8726,13 @@ Function3f77c: ; 3f77c jp c, Function3f80f call Function3f830 jr nz, .asm_3f797 - ld hl, $cd2a + ld hl, wcd2a bit 4, [hl] jr z, .asm_3f797 callba Function2b930 .asm_3f797 - ld a, [$d0ee] + ld a, [wd0ee] and $f cp $1 jr c, .asm_3f7ad @@ -8840,7 +8840,7 @@ Function3f85f: ; 3f85f ld a, [de] and a jr z, .asm_3f8c9 - ld a, [$d4b4] + ld a, [wd4b4] and a jr z, .asm_3f8c9 push hl @@ -8862,20 +8862,20 @@ Function3f85f: ; 3f85f ld de, $001a add hl, de push hl - ld de, $d00d + ld de, wd00d ld bc, $0204 call PrintNum pop hl ld de, $0005 add hl, de push hl - ld de, $d00f + ld de, wd00f ld bc, $0204 call PrintNum pop hl ld de, $0005 add hl, de - ld de, $d011 + ld de, wd011 ld bc, $0204 call PrintNum jr .asm_3f8cf @@ -8937,7 +8937,7 @@ Function3f85f: ; 3f85f ret .asm_3f92b - ld a, [$d4b4] + ld a, [wd4b4] and a ret nz ld de, .Scores @@ -8965,7 +8965,7 @@ Function3f998: ; 3f998 ld a, [BattleType] cp BATTLETYPE_ROAMING jr nz, .asm_3f9c4 - ld a, [$d0ee] + ld a, [wd0ee] and $f jr z, .asm_3f9af call GetRoamMonHP @@ -9070,11 +9070,11 @@ GetRoamMonSpecies: ; 3fa31 Function3fa42: ; 3fa42 - ld hl, $d276 + ld hl, wd276 ld de, StringBuffer1 ld bc, $0002 call CopyBytes - ld hl, $d26b + ld hl, wd26b ld bc, $000a call CopyBytes ld hl, $b254 @@ -9127,7 +9127,7 @@ Function3fa42: ; 3fa42 ; 3faa0 Function3faa0: ; 3faa0 - ld a, [$d0ee] + ld a, [wd0ee] and $f cp $1 ld bc, $000d @@ -9329,11 +9329,11 @@ Function3fbd6: ; 3fbd6 push af ld a, $6 ld [rSVBK], a - ld hl, $d000 + ld hl, wd000 ld bc, $400 ld a, $7f call ByteFill - ld de, $d000 + ld de, wd000 ld hl, VBGMap0 lb bc, BANK(Function3fbd6), $40 call Request2bpp @@ -9360,7 +9360,7 @@ GetBattleBackpic: ; 3fbff jr z, .Decompress ; What gender are we? - ld a, [$d45b] + ld a, [wd45b] bit 2, a jr nz, .Chris ld a, [PlayerGender] @@ -9465,11 +9465,11 @@ BattleStartMessage: ; 3fc8b jr nc, .asm_3fcc2 xor a - ld [$cfca], a + ld [wcfca], a ld a, 1 ld [hBattleTurn], a ld a, 1 - ld [$c689], a + ld [wc689], a ld de, ANIM_SEND_OUT_MON call Function3ee17 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 21d005bc6..f23ea0900 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -1,7 +1,7 @@ DoPlayerTurn: ; 34000 call SetPlayerTurn - ld a, [$d0ec] + ld a, [wd0ec] and a ret nz @@ -30,12 +30,12 @@ DoTurn: ; 3401d ; Read in and execute the user's move effects for this turn. xor a - ld [$c6b4], a + ld [wc6b4], a ; Effect command checkturn is called for every move. call CheckTurn - ld a, [$c6b4] + ld a, [wc6b4] and a ret nz @@ -131,10 +131,10 @@ BattleCommand01: ; 34084 xor a ld [AttackMissed], a ld [EffectFailed], a - ld [$c689], a + ld [wc689], a ld [AlreadyDisobeyed], a ld [AlreadyFailed], a - ld [$c73e], a + ld [wc73e], a ld a, 10 ; 1.0 ld [TypeModifier], a @@ -170,7 +170,7 @@ CheckPlayerTurn: jr z, .woke_up xor a - ld [$cfca], a + ld [wcfca], a ld de, ANIM_SLP call FarPlayBattleAnimation jr .fast_asleep @@ -274,7 +274,7 @@ CheckPlayerTurn: ld hl, IsConfusedText call StdBattleTextBox xor a - ld [$cfca], a + ld [wcfca], a ld de, ANIM_CONFUSED call FarPlayBattleAnimation @@ -303,7 +303,7 @@ CheckPlayerTurn: ld hl, InLoveWithText call StdBattleTextBox xor a - ld [$cfca], a + ld [wcfca], a ld de, ANIM_IN_LOVE call FarPlayBattleAnimation @@ -418,7 +418,7 @@ CheckEnemyTurn: ; 3421f ld hl, FastAsleepText call StdBattleTextBox xor a - ld [$cfca], a + ld [wcfca], a ld de, ANIM_SLP call FarPlayBattleAnimation jr .fast_asleep @@ -503,7 +503,7 @@ CheckEnemyTurn: ; 3421f add a ; bit SUBSTATUS_CONFUSED jr nc, .not_confused - ld hl, $c67b + ld hl, EnemyConfuseCount dec [hl] jr nz, .confused @@ -519,7 +519,7 @@ CheckEnemyTurn: ; 3421f call StdBattleTextBox xor a - ld [$cfca], a + ld [wcfca], a ld de, ANIM_CONFUSED call FarPlayBattleAnimation @@ -540,7 +540,7 @@ CheckEnemyTurn: ; 3421f call BattleCommand62 call BattleCommand0a xor a - ld [$cfca], a + ld [wcfca], a ; Flicker the monster pic unless flying or underground. ld de, ANIM_HIT_CONFUSION @@ -565,7 +565,7 @@ CheckEnemyTurn: ; 3421f ld hl, InLoveWithText call StdBattleTextBox xor a - ld [$cfca], a + ld [wcfca], a ld de, ANIM_IN_LOVE call FarPlayBattleAnimation @@ -619,7 +619,7 @@ CheckEnemyTurn: ; 3421f Function34385: ; 34385 ld a, $1 - ld [$c6b4], a + ld [wc6b4], a jp ResetDamage ; 3438d @@ -633,7 +633,7 @@ MoveDisabled: ; 3438d ld a, BATTLE_VARS_MOVE call GetBattleVar - ld [$d265], a + ld [wd265], a call GetMoveName ld hl, DisabledMoveText @@ -654,7 +654,7 @@ HitConfusion: ; 343a5 call BattleCommand0a xor a - ld [$cfca], a + ld [wcfca], a ; Flicker the monster pic unless flying or underground. ld de, ANIM_HIT_CONFUSION @@ -698,7 +698,7 @@ BattleCommand02: ; 343db and a ret nz - ld a, [$cfc0] + ld a, [wcfc0] and a ret nz @@ -910,7 +910,7 @@ BattleCommand02: ; 343db ld a, 1 ld [AlreadyDisobeyed], a - ld a, [$cfa3] + ld a, [wcfa3] ld b, a ; Save the move we originally picked for afterward. @@ -1015,9 +1015,9 @@ Function34548: ; 34548 ld a, [hBattleTurn] and a - ld a, [$c732] ; player + ld a, [wc732] ; player jr z, .end - ld a, [$c733] ; enemy + ld a, [wc733] ; enemy .end and a ret @@ -1118,14 +1118,14 @@ BattleCommand04: ; 34555 ld a, [hl] cp MIMIC jr z, .asm_345dc - ld hl, $c735 + ld hl, wc735 add hl, bc ld a, [hl] cp MIMIC ret z .asm_345dc - ld hl, $c739 + ld hl, wc739 call .asm_345ad ret @@ -1296,7 +1296,7 @@ BattleCommand05: ; 34631 BattleCommand4e: ; 346b2 ; triplekick - ld a, [$c689] + ld a, [wc689] ld b, a inc b ld hl, CurDamage + 1 @@ -1326,7 +1326,7 @@ BattleCommand4e: ; 346b2 BattleCommand4f: ; 346cd ; kickcounter - ld hl, $c689 + ld hl, wc689 inc [hl] ret ; 346d2 @@ -1364,7 +1364,7 @@ BattleCommand07: ; 346d2 .go ld a, BATTLE_VARS_MOVE_TYPE call GetBattleVarAddr - ld [$d265], a + ld [wd265], a push hl push de @@ -1380,7 +1380,7 @@ BattleCommand07: ; 346d2 pop bc pop de - ld a, [$d265] + ld a, [wd265] cp b jr z, .stab cp c @@ -1506,7 +1506,7 @@ BattleCommand07: ; 346d2 .end call Function347c8 - ld a, [$d265] + ld a, [wd265] ld b, a ld a, [TypeModifier] and $80 @@ -1538,7 +1538,7 @@ Function347d3: ; 347d3 inc hl ld c, [hl] ld a, 10 ; 1.0 - ld [$d265], a + ld [wd265], a ld hl, TypeMatchup .asm_347e7 ld a, [hli] @@ -1572,7 +1572,7 @@ Function347d3: ; 347d3 ld [$ffb5], a ld a, [hli] ld [$ffb6], a - ld a, [$d265] + ld a, [wd265] ld [hMultiplier], a call Multiply ld a, 10 @@ -1582,7 +1582,7 @@ Function347d3: ; 347d3 call Divide pop bc ld a, [$ffb6] - ld [$d265], a + ld [wd265], a jr .asm_347e7 .asm_3482f @@ -1595,7 +1595,7 @@ Function347d3: ; 347d3 BattleCommanda3: ; 34833 call Function347c8 - ld a, [$d265] + ld a, [wd265] and a ld a, 10 ; 1.0 jr nz, .asm_3484a @@ -1606,7 +1606,7 @@ BattleCommanda3: ; 34833 ld [AttackMissed], a ret .asm_3484a - ld [$d265], a + ld [wd265], a ret ; 3484e @@ -1616,7 +1616,7 @@ Function3484e: ; 3484e push de push bc ld a, 10 - ld [$c716], a + ld [wc716], a ld hl, PlayerUsedMoves ld a, [hl] and a @@ -1639,7 +1639,7 @@ Function3484e: ; 3484e call GetMoveByte ld hl, EnemyMonType call Function347d3 - ld a, [$d265] + ld a, [wd265] cp 10 + 1 ; 1.0 + 0.1 jr nc, .super_effective and a @@ -1684,7 +1684,7 @@ Function3484e: ; 3484e ld b, a ld hl, EnemyMonType1 call Function347d3 - ld a, [$d265] + ld a, [wd265] cp 10 + 1 ; 1.0 + 0.1 jr c, .ok call Function34931 @@ -1693,7 +1693,7 @@ Function3484e: ; 3484e cp b jr z, .ok2 call Function347d3 - ld a, [$d265] + ld a, [wd265] cp 10 + 1 ; 1.0 + 0.1 jr c, .ok2 call Function34931 @@ -1713,7 +1713,7 @@ Function348de: ; 348de ld b, NUM_MOVES + 1 ld c, 0 - ld a, [$d265] + ld a, [wd265] push af .loop dec b @@ -1735,7 +1735,7 @@ Function348de: ; 348de ld hl, BattleMonType1 call Function347d3 - ld a, [$d265] + ld a, [wd265] ; immune and a jr z, .loop @@ -1760,7 +1760,7 @@ Function348de: ; 348de .exit pop af - ld [$d265], a + ld [wd265], a ld a, c and a @@ -1779,24 +1779,24 @@ Function348de: ; 348de Function34931: ; 34931 - ld a, [$c716] + ld a, [wc716] dec a - ld [$c716], a + ld [wc716], a ret ; 34939 Function34939: ; 34939 - ld a, [$c716] + ld a, [wc716] inc a - ld [$c716], a + ld [wc716], a ret ; 34941 Function34941: ; 34941 xor a - ld [$c717], a + ld [wc717], a call CountEnemyAliveMons ret c @@ -1819,9 +1819,9 @@ Function34941: ; 34941 cp 2 jr nz, .asm_34971 - ld a, [$c716] + ld a, [wc716] add $30 - ld [$c717], a + ld [wc717], a ret .asm_34971 @@ -1837,13 +1837,13 @@ Function34941: ; 34941 ld a, b add $30 - ld [$c717], a + ld [wc717], a ret .no_perish call Function3484e - ld a, [$c716] + ld a, [wc716] cp 11 ret nc @@ -1852,13 +1852,13 @@ Function34941: ; 34941 jr z, .asm_349d2 call Function34a2a - ld a, [$c716] + ld a, [wc716] and a jr z, .asm_349d2 ld c, a call Function34aa7 - ld a, [$c716] + ld a, [wc716] cp $ff ret z @@ -1868,19 +1868,19 @@ Function34941: ; 34941 jr z, .asm_349be call Function3484e - ld a, [$c716] + ld a, [wc716] cp 10 ret nc ld a, b add $10 - ld [$c717], a + ld [wc717], a ret .asm_349be ld c, $10 call Function3484e - ld a, [$c716] + ld a, [wc716] cp 10 jr nc, .asm_349cc ld c, $20 @@ -1888,12 +1888,12 @@ Function34941: ; 34941 .asm_349cc ld a, b add c - ld [$c717], a + ld [wc717], a ret .asm_349d2 call Function3484e - ld a, [$c716] + ld a, [wc716] cp 10 ret nc @@ -1906,9 +1906,9 @@ Function34941: ; 34941 cp $2 ret nz - ld a, [$c716] + ld a, [wc716] add $10 - ld [$c717], a + ld [wc717], a ret ; 349f4 @@ -1972,7 +1972,7 @@ Function34a2a: ; 34a2a ld c, 1 << (PARTY_LENGTH - 1) ld d, 0 xor a - ld [$c716], a + ld [wc716], a .asm_34a39 ld a, [CurOTMon] @@ -2002,15 +2002,15 @@ Function34a2a: ; 34a2a inc hl call GetMoveByte - ld hl, $d23d + ld hl, BaseType call Function347d3 - ld a, [$d265] + ld a, [wd265] and a jr nz, .asm_34a77 - ld a, [$c716] + ld a, [wc716] or c - ld [$c716], a + ld [wc716], a .asm_34a77 pop hl dec b @@ -2064,7 +2064,7 @@ Function34a85: ; 34a85 Function34aa7: ; 34aa7 ld a, $ff - ld [$c716], a + ld [wc716], a ld hl, OTPartyMon1Moves ld b, 1 << (PARTY_LENGTH - 1) ld d, 0 @@ -2094,7 +2094,7 @@ Function34aa7: ; 34aa7 call GetMoveByte ld hl, BattleMonType1 call Function347d3 - ld a, [$d265] + ld a, [wd265] cp 10 jr c, .asm_34ae9 @@ -2153,7 +2153,7 @@ Function34aa7: ; 34aa7 jr nc, .asm_34b15 ld a, c - ld [$c716], a + ld [wc716], a pop bc ret ; 34b20 @@ -2189,17 +2189,17 @@ Function34b20: ; 34b20 .asm_34b4a ld a, [BattleMonType1] - ld hl, $d23d + ld hl, BaseType call Function347d3 - ld a, [$d265] + ld a, [wd265] cp $b jr nc, .asm_34b6d ld a, [BattleMonType2] .asm_34b5d - ld hl, $d23d + ld hl, BaseType call Function347d3 - ld a, [$d265] + ld a, [wd265] cp $b jr nc, .asm_34b6d @@ -2723,10 +2723,10 @@ BattleCommand0a: ; 34eee jr c, .asm_34f36 xor a - ld [$cfca], a + ld [wcfca], a ld [FXAnimIDHi], a inc a - ld [$c689], a + ld [wc689], a ld a, SUBSTITUTE jp Function37e44 @@ -2747,10 +2747,10 @@ BattleCommand0a: ; 34eee ret .asm_34f4d - ld a, [$c73e] + ld a, [wc73e] and a ld a, 0 - ld [$c73e], a + ld [wc73e], a ret ; 34f57 @@ -2777,7 +2777,7 @@ BattleCommand0b: ; 34f60 ld a, 4 .asm_34f76 - ld [$cfca], a + ld [wcfca], a ld a, BATTLE_VARS_MOVE_EFFECT call GetBattleVar cp EFFECT_MULTI_HIT @@ -2791,7 +2791,7 @@ BattleCommand0b: ; 34f60 cp EFFECT_TRIPLE_KICK jr z, .asm_34f96 xor a - ld [$c689], a + ld [wc689], a .asm_34f96 @@ -2812,10 +2812,10 @@ BattleCommand0b: ; 34f60 ; clear sprite jp Function37ec7 .asm_34fb0 - ld a, [$c689] + ld a, [wc689] and 1 xor 1 - ld [$c689], a + ld [wc689], a ld a, [de] cp $1 push af @@ -2826,7 +2826,7 @@ BattleCommand0b: ; 34f60 pop af jp z, PlayFXAnimID xor a - ld [$cfca], a + ld [wcfca], a jp PlayFXAnimID ; 34fd1 @@ -2857,9 +2857,9 @@ BattleCommand91: ; 34fdb BattleCommand91_92: ; 34feb - ld [$cfca], a + ld [wcfca], a xor a - ld [$c689], a + ld [wc689], a ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar ld e, a @@ -2891,10 +2891,10 @@ BattleCommand0c: ; 35004 jp c, BattleCommanda6 xor a - ld [$cfca], a + ld [wcfca], a ld [FXAnimIDHi], a ld a, $2 - ld [$c689], a + ld [wc689], a ld a, SUBSTITUTE jp Function37e44 ; 35023 @@ -2993,7 +2993,7 @@ BattleCommand0e: ; 3505e .asm_350ab call GetOpponentItem ld a, [hl] - ld [$d265], a + ld [wd265], a call GetItemName ld hl, HungOnText @@ -3080,7 +3080,7 @@ Function350e4: ; 350e4 ld hl, CrashedText call StdBattleTextBox ld a, $1 - ld [$c689], a + ld [wc689], a call Function37e36 ld c, $1 ld a, [hBattleTurn] @@ -3222,21 +3222,21 @@ BattleCommand11: ; 351c0 ld a, 1 .asm_351f2 - ld [$d10a], a + ld [wd10a], a ld a, [hld] - ld [$d1ea], a + ld [Buffer1], a ld a, [hld] - ld [$d1eb], a + ld [Buffer2], a ld a, [hl] - ld [$d1ec], a + ld [wd1ec], a xor a ld [hld], a ld a, [hl] - ld [$d1ed], a + ld [wd1ed], a xor a ld [hl], a - ld [$d1ee], a - ld [$d1ef], a + ld [wd1ee], a + ld [wd1ef], a ld h, b ld l, c predef Functionc6e0 @@ -3244,10 +3244,10 @@ BattleCommand11: ; 351c0 call SwitchTurn xor a - ld [$cfca], a + ld [wcfca], a ld [FXAnimIDHi], a inc a - ld [$c689], a + ld [wc689], a ld a, $c2 call Function37e44 call SwitchTurn @@ -3290,11 +3290,11 @@ BattleCommand12: ; 35250 bit SUBSTATUS_RAGE, a ret z - ld de, $c72c + ld de, wc72c ld a, [hBattleTurn] and a jr z, .asm_3526b - ld de, $c72b + ld de, wc72b .asm_3526b ld a, [de] inc a @@ -3319,9 +3319,9 @@ BattleCommanda2: ; 3527b ld c, a ld a, [hBattleTurn] and a - ld a, [$c72b] + ld a, [wc72b] jr z, .asm_35290 - ld a, [$c72c] + ld a, [wc72c] .asm_35290 and a jr z, .asm_3529a @@ -3432,7 +3432,7 @@ PlayerAttackDamage: ; 352e2 call GetDamageStatsCritical jr c, .thickclub - ld hl, $c6c3 + ld hl, EnemyStats + 2 ld a, [hli] ld b, a ld c, [hl] @@ -3689,7 +3689,7 @@ EnemyAttackDamage: ; 353f6 call GetDamageStatsCritical jr c, .thickclub - ld hl, $c6b8 + ld hl, PlayerStats + 2 ld a, [hli] ld b, a ld c, [hl] @@ -3712,11 +3712,11 @@ EnemyAttackDamage: ; 353f6 ld hl, EnemyMonSpclAtk call GetDamageStatsCritical jr c, .lightball - ld hl, $c6be + ld hl, PlayerStats + 8 ld a, [hli] ld b, a ld c, [hl] - ld hl, $c6c7 + ld hl, EnemyStats + 6 .lightball call LightBallBoost @@ -3753,7 +3753,7 @@ BattleCommanda1: ; 35461 xor a ld [PlayerRolloutCount], a ld [DefaultFlypoint], a - ld [$c72d], a + ld [wc72d], a jr .asm_3548d .asm_35482 ld a, [PlayerRolloutCount] @@ -3783,13 +3783,13 @@ BattleCommanda1: ; 35461 and a jp nz, Function355b0 ld a, $1 - ld [$c72d], a + ld [wc72d], a ld hl, BeatUpAttackText call StdBattleTextBox ld a, [EnemyMonSpecies] ld [CurSpecies], a call GetBaseData - ld a, [$d239] + ld a, [BaseDefense] ld c, a push bc ld a, $0 @@ -3797,7 +3797,7 @@ BattleCommanda1: ; 35461 ld a, [hl] ld [CurSpecies], a call GetBaseData - ld a, [$d238] + ld a, [BaseAttack] pop bc ld b, a push bc @@ -3818,7 +3818,7 @@ BattleCommanda1: ; 35461 xor a ld [EnemyRolloutCount], a ld [DefaultFlypoint], a - ld [$c72d], a + ld [wc72d], a jr .asm_3550d .asm_35502 @@ -3836,7 +3836,7 @@ BattleCommanda1: ; 35461 and a jr nz, .asm_35532 - ld a, [$cfc0] + ld a, [wcfc0] and a jr nz, .asm_35532 @@ -3846,7 +3846,7 @@ BattleCommanda1: ; 35461 ld hl, OTPartySpecies add hl, bc ld a, [hl] - ld [$d265], a + ld [wd265], a call GetPokemonName jr .asm_35544 @@ -3878,12 +3878,12 @@ BattleCommanda1: ; 35461 jr nz, Function355b0 ld a, $1 - ld [$c72d], a + ld [wc72d], a jr .asm_3557d .asm_3556b ld a, [EnemyMonSpecies] - ld [$d265], a + ld [wd265], a call GetPokemonName ld hl, BeatUpAttackText call StdBattleTextBox @@ -3894,7 +3894,7 @@ BattleCommanda1: ; 35461 ld a, [BattleMonSpecies] ld [CurSpecies], a call GetBaseData - ld a, [$d239] + ld a, [BaseDefense] ld c, a push bc ld a, $0 @@ -3902,7 +3902,7 @@ BattleCommanda1: ; 35461 ld a, [hl] ld [CurSpecies], a call GetBaseData - ld a, [$d238] + ld a, [BaseAttack] pop bc ld b, a push bc @@ -3924,7 +3924,7 @@ Function355b0: ; 355b0 BattleCommanda8: ; 355b5 - ld a, [$c72d] + ld a, [wc72d] and a ret nz jp PrintButItFailed @@ -4436,7 +4436,7 @@ BattleCommand40: ; 35813 ret z call BattleCommanda3 - ld a, [$d265] + ld a, [wd265] and a ret z @@ -4449,11 +4449,11 @@ BattleCommand40: ; 35813 ld de, StringBuffer1 call GetMoveData - ld a, [$d075] + ld a, [StringBuffer1 + 2] and a ret z - ld a, [$d076] + ld a, [StringBuffer1 + 3] cp SPECIAL ret nc @@ -4613,25 +4613,25 @@ BattleCommand42: ; 35926 call CheckSubstituteOpp jp nz, Function359cd call AnimateCurrentMove - ld hl, $c63f + ld hl, BattleMonMaxHP + 1 ld de, EnemyMonMaxHP + 1 call .asm_3597d ld a, $1 - ld [$d10a], a + ld [wd10a], a hlcoord 10, 9 predef Functionc6e0 ld hl, EnemyMonHP ld a, [hli] - ld [$d1ed], a + ld [wd1ed], a ld a, [hli] - ld [$d1ec], a + ld [wd1ec], a ld a, [hli] - ld [$d1eb], a + ld [Buffer2], a ld a, [hl] - ld [$d1ea], a + ld [Buffer1], a call Function359ac xor a - ld [$d10a], a + ld [wd10a], a call ResetDamage hlcoord 2, 2 predef Functionc6e0 @@ -4642,28 +4642,28 @@ BattleCommand42: ; 35926 .asm_3597d ld a, [hld] - ld [$d1ea], a + ld [Buffer1], a ld a, [hld] - ld [$d1eb], a + ld [Buffer2], a ld a, [hld] ld b, a - ld [$d1ec], a + ld [wd1ec], a ld a, [hl] - ld [$d1ed], a + ld [wd1ed], a dec de dec de ld a, [de] dec de add b - ld [$d257], a + ld [CurDamage + 1], a ld b, [hl] ld a, [de] adc b srl a ld [CurDamage], a - ld a, [$d257] + ld a, [CurDamage + 1] rr a - ld [$d257], a + ld [CurDamage + 1], a inc hl inc hl inc hl @@ -4678,7 +4678,7 @@ BattleCommand42: ; 35926 Function359ac: ; 359ac ld c, [hl] dec hl - ld a, [$d257] + ld a, [CurDamage + 1] sub c ld b, [hl] dec hl @@ -4688,15 +4688,15 @@ Function359ac: ; 359ac ld a, [CurDamage] ld b, a - ld a, [$d257] + ld a, [CurDamage + 1] ld c, a .asm_359c2 ld a, c ld [hld], a - ld [$d1ee], a + ld [wd1ee], a ld a, b ld [hli], a - ld [$d1ef], a + ld [wd1ef], a ret ; 359cd @@ -4770,13 +4770,13 @@ BattleCommand44: ; 359e6 pop af ld [hl], a pop hl - ld a, [$d265] + ld a, [wd265] cp $a jr nc, .asm_35a13 call SwitchTurn ld a, [hl] - ld [$d265], a + ld [wd265], a predef GetTypeName ld hl, TransformedTypeText jp StdBattleTextBox @@ -4842,7 +4842,7 @@ BattleCommand46: ; 35a74 .asm_35aa5 ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP call GetBattleVar - ld [$d265], a + ld [wd265], a ld b, a and a jr z, .asm_35b10 @@ -4883,11 +4883,11 @@ BattleCommand46: ; 35a74 jr nz, .asm_35af6 ld a, [hl] push bc - ld hl, $c739 + ld hl, wc739 ld b, 0 add hl, bc ld [hl], a - ld hl, $c735 + ld hl, wc735 add hl, bc pop bc ld [hl], b @@ -4999,11 +4999,11 @@ BattleCommand48: ; 35b33 ld [hl], a call Function34548 jr nz, .asm_35b9a - ld a, [$c689] + ld a, [wc689] push af call BattleCommand0a pop af - ld [$c689], a + ld [wc689], a .asm_35b9a call Function37e36 call UpdateMoveData @@ -5128,7 +5128,7 @@ BattleCommand4a: ; 35c0f ld a, [hli] cp b jr nz, .asm_35c33 - ld [$d265], a + ld [wd265], a dec hl ld b, 0 push bc @@ -5172,7 +5172,7 @@ BattleCommand4a: ; 35c0f ld a, [IsInBattle] dec a jr nz, .asm_35c81 - ld hl, $c739 + ld hl, wc739 add hl, bc .asm_35c81 ld [hl], e @@ -5181,7 +5181,7 @@ BattleCommand4a: ; 35c0f call AnimateCurrentMove pop de ld a, d - ld [$d265], a + ld [wd265], a ld hl, SpiteEffectText jp StdBattleTextBox .asm_35c91 @@ -5315,20 +5315,20 @@ Function35d1c: ; 35d1c ld a, [hld] ld b, a ld a, [EnemyMonHP + 1] - ld [$d1ec], a + ld [wd1ec], a sub b ld [EnemyMonHP + 1], a ld a, [hl] ld b, a ld a, [EnemyMonHP] - ld [$d1ec + 1], a + ld [wd1ec + 1], a sbc b ld [EnemyMonHP], a jr nc, .asm_35d59 - ld a, [$d1ed] + ld a, [wd1ed] ld [hli], a - ld a, [$d1ec] + ld a, [wd1ec] ld [hl], a xor a @@ -5339,17 +5339,17 @@ Function35d1c: ; 35d1c .asm_35d59 ld hl, EnemyMonMaxHP ld a, [hli] - ld [$d1eb], a + ld [Buffer2], a ld a, [hl] - ld [$d1ea], a + ld [Buffer1], a ld hl, EnemyMonHP ld a, [hli] - ld [$d1ef], a + ld [wd1ef], a ld a, [hl] - ld [$d1ee], a + ld [wd1ee], a hlcoord 2, 2 xor a - ld [$d10a], a + ld [wd10a], a predef Functionc6e0 .asm_35d7b jp RefreshBattleHuds @@ -5375,40 +5375,40 @@ Function35d7e: ; 35d7e ld a, [hld] ld b, a ld a, [BattleMonHP + 1] - ld [$d1ec], a + ld [wd1ec], a sub b ld [BattleMonHP + 1], a - ld [$d1ee], a + ld [wd1ee], a ld b, [hl] ld a, [BattleMonHP] - ld [$d1ec + 1], a + ld [wd1ec + 1], a sbc b ld [BattleMonHP], a - ld [$d1ee + 1], a + ld [wd1ee + 1], a jr nc, .asm_35dc5 - ld a, [$d1ec + 1] + ld a, [wd1ec + 1] ld [hli], a - ld a, [$d1ec] + ld a, [wd1ec] ld [hl], a xor a ld hl, BattleMonHP ld [hli], a ld [hl], a - ld hl, $d1ee + ld hl, wd1ee ld [hli], a ld [hl], a .asm_35dc5 ld hl, BattleMonMaxHP ld a, [hli] - ld [$d1eb], a + ld [Buffer2], a ld a, [hl] - ld [$d1ea], a + ld [Buffer1], a hlcoord 10, 9 ld a, $1 - ld [$d10a], a + ld [wd10a], a predef Functionc6e0 .asm_35ddd jp RefreshBattleHuds @@ -5484,8 +5484,8 @@ UpdateMoveData: ; 35e40 ld a, BATTLE_VARS_MOVE call GetBattleVar - ld [$cf60], a ; not CurSpecies - ld [$d265], a + ld [CurSpecies], a ; not CurSpecies + ld [wd265], a dec a call GetMoveData @@ -5503,7 +5503,7 @@ BattleCommand14: ; 35e5c jr nz, .asm_35e70 ld a, [hl] - ld [$d265], a + ld [wd265], a call GetItemName ld hl, ProtectedByText jr .asm_35ec6 @@ -5535,7 +5535,7 @@ BattleCommand14: ; 35e5c call AnimateCurrentMove ld b, $7 - ld a, [$cfc0] + ld a, [wcfc0] and a jr z, .asm_35ea4 ld b, $3 @@ -5578,7 +5578,7 @@ Function35ece: ; 35ece and a jr nz, .asm_35eec - ld a, [$cfc0] + ld a, [wcfc0] and a jr nz, .asm_35eec @@ -5656,7 +5656,7 @@ BattleCommand2f: ; 35f2c cp HELD_PREVENT_POISON jr nz, .asm_35f5f ld a, [hl] - ld [$d265], a + ld [wd265], a call GetItemName ld hl, ProtectedByText jr .asm_35fb8 @@ -5673,7 +5673,7 @@ BattleCommand2f: ; 35f2c ld a, [InLinkBattle] and a jr nz, .asm_35f89 - ld a, [$cfc0] + ld a, [wcfc0] and a jr nz, .asm_35f89 ld a, [PlayerSubStatus5] @@ -5804,7 +5804,7 @@ Function36011: ; 36011 ld hl, EnemyMonHP ld de, EnemyMonMaxHP .asm_36037 - ld bc, $d1ed + ld bc, wd1ed ld a, [hli] ld [bc], a ld a, [hl] @@ -5821,12 +5821,12 @@ Function36011: ; 36011 ld b, [hl] add b ld [hld], a - ld [$d1ee], a + ld [wd1ee], a ld a, [$ffb3] ld b, [hl] adc b ld [hli], a - ld [$d1ef], a + ld [wd1ef], a jr c, .asm_36064 ; 0x36056 $c ld a, [hld] ld b, a @@ -5842,11 +5842,11 @@ Function36011: ; 36011 .asm_36064 ld a, [de] ld [hld], a - ld [$d1ee], a + ld [wd1ee], a dec de ld a, [de] ld [hli], a - ld [$d1ef], a + ld [wd1ef], a inc de .asm_36070 ld a, [hBattleTurn] @@ -5857,7 +5857,7 @@ Function36011: ; 36011 hlcoord 2, 2 xor a .asm_3607e - ld [$d10a], a + ld [wd10a], a predef Functionc6e0 call RefreshBattleHuds jp UpdateBattleMonInParty @@ -5868,7 +5868,7 @@ BattleCommand17: ; 3608c ; burntarget xor a - ld [$cfca], a + ld [wcfca], a call CheckSubstituteOpp ret nz ld a, BATTLE_VARS_STATUS_OPP @@ -5938,7 +5938,7 @@ BattleCommand18: ; 36102 ; freezetarget xor a - ld [$cfca], a + ld [wcfca], a call CheckSubstituteOpp ret nz ld a, BATTLE_VARS_STATUS_OPP @@ -5977,11 +5977,11 @@ BattleCommand18: ; 36102 ret nz call Function34216 call EndRechargeOpp - ld hl, $c740 + ld hl, wc740 ld a, [hBattleTurn] and a jr z, .asm_36162 - ld hl, $c73f + ld hl, wc73f .asm_36162 ld [hl], $1 ret @@ -5992,7 +5992,7 @@ BattleCommand19: ; 36165 ; paralyzetarget xor a - ld [$cfca], a + ld [wcfca], a call CheckSubstituteOpp ret nz ld a, BATTLE_VARS_STATUS_OPP @@ -6131,12 +6131,12 @@ Function361ef: ; 361ef ld a, c cp $5 jr nc, .asm_36268 ; 0x36230 $36 - ld hl, $c641 + ld hl, BattleMonStats + 1 ld de, PlayerStats ld a, [hBattleTurn] and a jr z, .asm_36243 ; 0x3623b $6 - ld hl, $d21b + ld hl, EnemyMonStats + 1 ld de, EnemyStats .asm_36243 push bc @@ -6196,12 +6196,12 @@ Function3627b: ; 3627b Function36281: ; 36281 - ld bc, $c6fe + ld bc, wc6fe ld hl, Function3f447 ld a, [hBattleTurn] and a jr z, .asm_36292 ; 0x3628a $6 - ld bc, $c6fa + ld bc, wc6fa ld hl, Function3f486 .asm_36292 ld a, BATTLE_VARS_MOVE_ANIM @@ -6318,7 +6318,7 @@ BattleCommand1d: ; 362e3 and a jr nz, .DidntMiss - ld a, [$cfc0] + ld a, [wcfc0] and a jr nz, .DidntMiss @@ -6700,12 +6700,12 @@ Function36532: ; 36532 jr nc, .asm_36576 push hl - ld hl, $c641 + ld hl, BattleMonStats + 1 ld de, PlayerStats ld a, [hBattleTurn] and a jr z, .asm_36570 - ld hl, $d21b + ld hl, EnemyMonStats + 1 ld de, EnemyStats .asm_36570 @@ -6943,12 +6943,12 @@ BattleCommand21: ; 36671 ld a, 1 ld [hl], a ld hl, PlayerDamageTaken + 1 - ld de, $c732 + ld de, wc732 ld a, [hBattleTurn] and a jr z, .asm_366ad ld hl, EnemyDamageTaken + 1 - ld de, $c733 + ld de, wc733 .asm_366ad ld a, [hld] add a @@ -6990,12 +6990,12 @@ BattleCommand21: ; 36671 BattleCommand22: ; 366e5 ; unleashenergy - ld de, $c682 + ld de, PlayerDamageTaken ld bc, PlayerRolloutCount ld a, [hBattleTurn] and a jr z, .asm_366f6 - ld de, $c684 + ld de, EnemyDamageTaken ld bc, EnemyRolloutCount .asm_366f6 ld a, BATTLE_VARS_SUBSTATUS3 @@ -7013,7 +7013,7 @@ BattleCommand22: ; 366e5 inc a ld [bc], a ld a, 1 - ld [$c689], a + ld [wc689], a call AnimateCurrentMove jp EndMoveEffect ; 3671a @@ -7079,7 +7079,7 @@ BattleCommand3d: ; 36751 inc a ld [de], a ld a, 1 - ld [$c73e], a + ld [wc73e], a ret ; 36778 @@ -7107,7 +7107,7 @@ BattleCommanda0: ; 36778 ld a, [IsInBattle] dec a jr nz, .failed - ld a, [$d143] + ld a, [CurPartyLevel] ld b, a ld a, [BattleMonLevel] cp b @@ -7134,7 +7134,7 @@ BattleCommanda0: ; 36778 jr nz, .failed ld a, [BattleMonLevel] ld b, a - ld a, [$d143] + ld a, [CurPartyLevel] cp b jr nc, .asm_367df ; 367cd $10 add b @@ -7151,10 +7151,10 @@ BattleCommanda0: ; 36778 .asm_367df call UpdateBattleMonInParty xor a - ld [$cfca], a + ld [wcfca], a inc a - ld [$d232], a - ld [$c689], a + ld [wd232], a + ld [wc689], a call Function36804 call BattleCommand0a call Function37e36 @@ -7168,10 +7168,10 @@ BattleCommanda0: ; 36778 Function36804: ; 36804 - ld a, [$d0ee] + ld a, [wd0ee] and $c0 or $2 - ld [$d0ee], a + ld [wd0ee], a ret ; 3680f @@ -7197,7 +7197,7 @@ BattleCommand23: ; 3680f ld a, [IsInBattle] dec a jr nz, .asm_36869 ; 36836 $31 - ld a, [$d143] + ld a, [CurPartyLevel] ld b, a ld a, [BattleMonLevel] cp b @@ -7218,21 +7218,21 @@ BattleCommand23: ; 3680f .asm_36855 call UpdateBattleMonInParty xor a - ld [$cfca], a + ld [wcfca], a inc a - ld [$d232], a + ld [wd232], a call Function36804 ld a, [wPlayerMoveStruct + MOVE_ANIM] jp .asm_36975 .asm_36869 call CountEnemyAliveMons jr c, .asm_368ca ; 3686c $5c - ld a, [$c70f] + ld a, [wc70f] and a jr z, .asm_368ca ; 36872 $56 call UpdateEnemyMonInParty ld a, $1 - ld [$c689], a + ld [wc689], a call AnimateCurrentMove ld c, $14 call DelayFrames @@ -7263,7 +7263,7 @@ BattleCommand23: ; 3680f jr z, .asm_3689a ; 368b1 $e7 ld a, d inc a - ld [$c718], a + ld [wc718], a callab Function3d4c3 ld hl, DraggedOutText @@ -7286,7 +7286,7 @@ BattleCommand23: ; 3680f ld a, [BattleMonLevel] ld b, a - ld a, [$d143] + ld a, [CurPartyLevel] cp b jr nc, .asm_368f5 @@ -7309,9 +7309,9 @@ BattleCommand23: ; 3680f .asm_368f5 call UpdateBattleMonInParty xor a - ld [$cfca], a + ld [wcfca], a inc a - ld [$d232], a + ld [wd232], a call Function36804 ld a, [wEnemyMoveStruct + MOVE_ANIM] jr .asm_36975 @@ -7320,13 +7320,13 @@ BattleCommand23: ; 3680f call Function36994 jr c, .asm_36969 - ld a, [$c70f] + ld a, [wc70f] cp $1 jr z, .asm_368ca call UpdateBattleMonInParty ld a, $1 - ld [$c689], a + ld [wc689], a call AnimateCurrentMove ld c, $14 call DelayFrames @@ -7379,7 +7379,7 @@ BattleCommand23: ; 3680f push af call Function36804 ld a, $1 - ld [$c689], a + ld [wc689], a call AnimateCurrentMove ld c, $14 call DelayFrames @@ -7431,12 +7431,12 @@ BattleCommand24: ; 369b6 ; Loop back to the command before 'critical'. ld de, PlayerRolloutCount - ld bc, $c682 + ld bc, PlayerDamageTaken ld a, [hBattleTurn] and a jr z, .asm_369c7 ld de, EnemyRolloutCount - ld bc, $c684 + ld bc, EnemyDamageTaken .asm_369c7 ld a, BATTLE_VARS_SUBSTATUS3 @@ -7611,7 +7611,7 @@ Function36ab5: ; 36ab5 Function36abf: ; 36abf push bc - ld a, [$c70f] + ld a, [wc70f] ld b, a ld a, [hBattleTurn] xor b @@ -7738,9 +7738,9 @@ BattleCommand39: ; 36b4d call BattleCommand0a xor a - ld [$cfca], a + ld [wcfca], a inc a - ld [$c689], a + ld [wc689], a call Function37e36 ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar @@ -7867,13 +7867,13 @@ BattleCommand3b: ; 36c2d ld a, [AttackMissed] and a ret nz - ld hl, $c731 - ld de, $c72f + ld hl, wc731 + ld de, wc72f ld a, [hBattleTurn] and a jr z, .asm_36c43 - ld hl, $c730 - ld de, $c72e + ld hl, wc730 + ld de, wc72e .asm_36c43 ld a, [hl] @@ -7978,26 +7978,26 @@ BattleCommand27: ; 36cb2 inc c .asm_36cd8 ld a, [hli] - ld [$d1eb], a + ld [Buffer2], a ld a, [hl] - ld [$d1ea], a + ld [Buffer1], a dec hl dec hl ld a, [hl] - ld [$d1ec], a + ld [wd1ec], a sub c ld [hld], a - ld [$d1ee], a + ld [wd1ee], a ld a, [hl] - ld [$d1ed], a + ld [wd1ed], a sbc b ld [hl], a - ld [$d1ef], a + ld [wd1ef], a jr nc, .asm_36cfe xor a ld [hli], a ld [hl], a - ld hl, $d1ee + ld hl, wd1ee ld [hli], a ld [hl], a .asm_36cfe @@ -8009,7 +8009,7 @@ BattleCommand27: ; 36cb2 hlcoord 2, 2 xor a .asm_36d0c - ld [$d10a], a + ld [wd10a], a predef Functionc6e0 call RefreshBattleHuds ld hl, RecoilText @@ -8046,7 +8046,7 @@ BattleCommand2a: ; 36d3b cp HELD_PREVENT_CONFUSE jr nz, .asm_36d53 ld a, [hl] - ld [$d265], a + ld [wd265], a call GetItemName call AnimateFailedMove ld hl, ProtectedByText @@ -8143,7 +8143,7 @@ BattleCommand30: ; 36dc7 cp HELD_PREVENT_PARALYZE jr nz, .asm_36def ld a, [hl] - ld [$d265], a + ld [wd265], a call GetItemName call AnimateFailedMove ld hl, ProtectedByText @@ -8156,7 +8156,7 @@ BattleCommand30: ; 36dc7 ld a, [InLinkBattle] and a jr nz, .asm_36e0e - ld a, [$cfc0] + ld a, [wcfc0] and a jr nz, .asm_36e0e ld a, [PlayerSubStatus5] @@ -8285,13 +8285,13 @@ BattleCommand31: ; 36e7c call GetBattleVarAddr set SUBSTATUS_SUBSTITUTE, [hl] - ld hl, $c730 - ld de, $c72e + ld hl, wc730 + ld de, wc72e ld a, [hBattleTurn] and a jr z, .asm_36ecf - ld hl, $c731 - ld de, $c72f + ld hl, wc731 + ld de, wc72f .asm_36ecf xor a @@ -8301,9 +8301,9 @@ BattleCommand31: ; 36e7c jr c, .asm_36ee8 xor a - ld [$cfca], a + ld [wcfca], a ld [FXAnimIDHi], a - ld [$c689], a + ld [wc689], a ld a, SUBSTITUTE call Function37e44 jr .asm_36eeb @@ -8432,7 +8432,7 @@ BattleCommand33: ; 36f46 ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP call GetBattleVar ld [hl], a - ld [$d265], a + ld [wd265], a ld bc, BattleMonPP - BattleMonMoves add hl, bc ld [hl], 5 @@ -8560,7 +8560,7 @@ BattleCommand37: ; 36fed ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP call GetBattleVar ld [hl], a - ld [$d265], a + ld [wd265], a call GetMoveName ld hl, WasDisabledText jp StdBattleTextBox @@ -8687,7 +8687,7 @@ BattleCommand1f: ; 3707f ld [de], a inc de ld [de], a - ld [$d265], a + ld [wd265], a callba GetTypeName call AnimateCurrentMove ld hl, TransformedTypeText @@ -8821,10 +8821,10 @@ BattleCommand2d: ; 371cd call CheckHiddenOpponent jp nz, Function372d2 xor a - ld [$cfca], a + ld [wcfca], a ld [FXAnimIDHi], a ld a, $1 - ld [$c689], a + ld [wc689], a ld a, BATTLE_VARS_SUBSTATUS4 call GetBattleVarAddr bit SUBSTATUS_SUBSTITUTE, [hl] @@ -8861,10 +8861,10 @@ BattleCommand2d: ; 371cd and a jr z, .asm_3723a ld a, [de] - ld [$c6f2], a + ld [wc6f2], a inc de ld a, [de] - ld [$c6f3], a + ld [wc6f2 + 1], a dec de .asm_3723a ld a, [hli] @@ -8908,7 +8908,7 @@ BattleCommand2d: ; 371cd jr nz, .asm_3725f pop hl ld a, [hl] - ld [$d265], a + ld [wd265], a call GetPokemonName ld hl, EnemyStats ld de, PlayerStats @@ -8922,9 +8922,9 @@ BattleCommand2d: ; 371cd jr c, .asm_372a8 ld a, [hBattleTurn] and a - ld a, [$c6fe] + ld a, [wc6fe] jr z, .asm_372a0 - ld a, [$c6fa] + ld a, [wc6fa] .asm_372a0 and a jr nz, .asm_372a8 @@ -8935,10 +8935,10 @@ BattleCommand2d: ; 371cd call BattleCommanda6 .asm_372ae xor a - ld [$cfca], a + ld [wcfca], a ld [FXAnimIDHi], a ld a, $2 - ld [$c689], a + ld [wc689], a pop af ld a, SUBSTITUTE call nz, Function37e44 @@ -9124,7 +9124,7 @@ CheckSubstituteOpp: ; 37378 BattleCommand1a: ; 37380 callba Function10610d ld a, $4 - ld [$cfca], a + ld [wcfca], a ld c, $3 call DelayFrames ld a, BATTLE_VARS_STATUS @@ -9135,7 +9135,7 @@ BattleCommand1a: ; 37380 ld [hli], a ld [hl], a ld a, $1 - ld [$c689], a + ld [wc689], a call BattleCommand0a call Function37e36 ld a, BATTLE_VARS_SUBSTATUS4 @@ -9185,11 +9185,11 @@ CheckUserMove: ; 37462 ResetTurn: ; 3747b - ld hl, $c732 + ld hl, wc732 ld a, [hBattleTurn] and a jr z, .asm_37486 - ld hl, $c733 + ld hl, wc733 .asm_37486 ld [hl], 1 @@ -9403,12 +9403,12 @@ Function377f5: ; 377f5 ld a, [EnemySubStatus5] bit SUBSTATUS_TRANSFORMED, a jr z, .asm_37829 - ld hl, $c6f2 + ld hl, wc6f2 .asm_37829 ld a, [hli] - ld [$d123], a + ld [TempMonDVs], a ld a, [hl] - ld [$d124], a + ld [TempMonDVs + 1], a ld a, 3 ld [MonType], a callba GetGender @@ -9479,7 +9479,7 @@ BattleCommand61: ; 37874 pop bc .asm_37889 - ld a, [$d265] + ld a, [wd265] and a jp z, AnimateFailedMove ld a, [AttackMissed] @@ -9503,7 +9503,7 @@ BattleCommand61: ; 37874 .asm_378ad ld a, c - ld [$c689], a + ld [wc689], a call Function37de9 ld d, [hl] pop bc @@ -9512,7 +9512,7 @@ BattleCommand61: ; 37874 .asm_378b7 pop bc ld a, $3 - ld [$c689], a + ld [wc689], a call AnimateCurrentMove call SwitchTurn ld hl, AICheckPlayerMaxHP @@ -9663,7 +9663,7 @@ BattleCommand66: ; 37991 push de inc hl ld a, [hl] - ld [$d265], a + ld [wd265], a call BattleCommandaa ld hl, MagnitudeText call StdBattleTextBox @@ -9751,13 +9751,13 @@ BattleCommand67: ; 379c9 ; Passed enemy PartyMon entrance xor a - ld [$c718], a + ld [wc718], a ld hl, Function3d517 call CallBattleCore ld hl, Function3d57a call CallBattleCore ld a, 1 - ld [$d265], a + ld [wd265], a ld hl, Function3ecab call CallBattleCore @@ -9774,7 +9774,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67 ret z ld a, 1 - ld [$d0ec], a + ld [wd0ec], a call Function1d6e ld hl, Function3e8e4 @@ -9782,7 +9782,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67 call Function1c17 xor a - ld [$d0ec], a + ld [wd0ec], a ret ; 37a82 @@ -9855,8 +9855,8 @@ ResetBatonPassStatus: ; 37ab1 ld [hl], 0 xor a - ld [$c730], a - ld [$c731], a + ld [wc730], a + ld [wc731], a ret ; 37ae9 @@ -9959,12 +9959,12 @@ BattleCommand69: ; 37b39 .asm_37b4a ld hl, PlayerScreens - ld de, $c730 + ld de, wc730 ld a, [hBattleTurn] and a jr z, .asm_37b5b ; 37b53 $6 ld hl, EnemyScreens - ld de, $c731 + ld de, wc731 .asm_37b5b bit SCREENS_SPIKES, [hl] jr z, .asm_37b69 ; 37b5d $a @@ -10221,7 +10221,7 @@ BattleCommand9a: ; 37c95 ret z call BattleCommanda3 - ld a, [$d265] + ld a, [wd265] and a ret z @@ -10234,11 +10234,11 @@ BattleCommand9a: ; 37c95 ld de, StringBuffer1 call GetMoveData - ld a, [$d075] + ld a, [StringBuffer1 + 2] and a ret z - ld a, [$d076] + ld a, [StringBuffer1 + 3] cp SPECIAL ret c @@ -10268,11 +10268,11 @@ BattleCommand9a: ; 37c95 BattleCommand9d: ; 37ce6 ; doubleminimizedamage - ld hl, $c6fa + ld hl, wc6fa ld a, [hBattleTurn] and a jr z, .ok - ld hl, $c6fe + ld hl, wc6fe .ok ld a, [hl] and a @@ -10302,13 +10302,13 @@ BattleCommand9e: ; 37d02 BattleCommand9b: ; 37d0d ; checkfuturesight - ld hl, $c71d - ld de, $c727 + ld hl, wc71d + ld de, wc727 ld a, [hBattleTurn] and a jr z, .ok - ld hl, $c71e - ld de, $c729 + ld hl, wc71e + ld de, wc729 .ok ld a, [hl] @@ -10342,11 +10342,11 @@ BattleCommand9c: ; 37d34 call GetBattleVarAddr ld [hl], b .asm_37d4b - ld hl, $c71d + ld hl, wc71d ld a, [hBattleTurn] and a jr z, .asm_37d56 ; 37d51 $3 - ld hl, $c71e + ld hl, wc71e .asm_37d56 ld a, [hl] and a @@ -10358,11 +10358,11 @@ BattleCommand9c: ; 37d34 ld hl, ForesawAttackText call StdBattleTextBox call BattleCommand0c - ld de, $c727 + ld de, wc727 ld a, [hBattleTurn] and a jr z, .asm_37d77 ; 37d72 $3 - ld de, $c729 + ld de, wc729 .asm_37d77 ld hl, CurDamage ld a, [hl] @@ -10462,11 +10462,11 @@ Function37de9: ; 37de9 push hl push de push bc - ld a, [$c689] + ld a, [wc689] push af call BattleCommand0a pop af - ld [$c689], a + ld [wc689], a call Function37e19 call BattleCommand0c pop bc @@ -10480,11 +10480,11 @@ AnimateCurrentMove: ; 37e01 push hl push de push bc - ld a, [$c689] + ld a, [wc689] push af call BattleCommand0a pop af - ld [$c689], a + ld [wc689], a call Function37e36 call BattleCommand0c pop bc @@ -10512,7 +10512,7 @@ Function37e19: ; 37e19 ld a, 4 .asm_37e30 - ld [$cfca], a + ld [wcfca], a jp Function37e47 ; 37e36 @@ -10520,7 +10520,7 @@ Function37e19: ; 37e19 Function37e36: ; 37e36 xor a - ld [$cfca], a + ld [wcfca], a ld [FXAnimIDHi], a ld a, BATTLE_VARS_MOVE_ANIM @@ -10558,7 +10558,7 @@ Function37e54: ; 37e54 ld a, d ld [FXAnimIDHi], a xor a - ld [$cfca], a + ld [wcfca], a push hl push de diff --git a/battle/effects/curse.asm b/battle/effects/curse.asm index 27f821ffc..f117c5108 100644 --- a/battle/effects/curse.asm +++ b/battle/effects/curse.asm @@ -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 diff --git a/battle/effects/metronome.asm b/battle/effects/metronome.asm index 97052a66c..213892945 100644 --- a/battle/effects/metronome.asm +++ b/battle/effects/metronome.asm @@ -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 diff --git a/battle/effects/mirror_move.asm b/battle/effects/mirror_move.asm index a9dfa7931..2a32e7e81 100644 --- a/battle/effects/mirror_move.asm +++ b/battle/effects/mirror_move.asm @@ -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 diff --git a/battle/effects/rollout.asm b/battle/effects/rollout.asm index d3a765de5..f709c7988 100644 --- a/battle/effects/rollout.asm +++ b/battle/effects/rollout.asm @@ -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] diff --git a/battle/effects/thief.asm b/battle/effects/thief.asm index 617e73e37..83b954eaf 100644 --- a/battle/effects/thief.asm +++ b/battle/effects/thief.asm @@ -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 diff --git a/battle/magikarp_length.asm b/battle/magikarp_length.asm index b4e20c288..991e78b27 100644 --- a/battle/magikarp_length.asm +++ b/battle/magikarp_length.asm @@ -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 |