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

Reverted ld_hl_pointer macro

Browse Source
This commit is contained in:
PikalaxALT
2015-07-20 22:18:18 -04:00
parent d1e11f77e5
commit 471492b775
60 changed files with 1538 additions and 1079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
audio/engine.asm
View File

@@ -413,10 +413,9 @@ UpdateChannels: ; e8125
; hl << 4
; each wavepattern is $0f bytes long
; so seeking is done in $10s
rept 4
add hl, hl
add hl, hl
add hl, hl
add hl, hl
endr
ld de, WaveSamples
add hl, de
; load wavepattern into $ff30-$ff3f
@@ -1292,8 +1291,9 @@ GetNoiseSample: ; e86c5
ld d, $00
; load ptr to noise sample set in hl
ld hl, Drumkits
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -1306,8 +1306,9 @@ GetNoiseSample: ; e86c5
; use 'pitch' to seek noise sample set
ld e, a
ld d, $00
rept 2
add hl, de
add hl, de
endr
; load sample pointer into NoiseSampleAddress
ld a, [hli]
ld [NoiseSampleAddressLo], a
@@ -1328,8 +1329,9 @@ ParseMusicCommand: ; e870f
ld d, $00
; seek command pointer
ld hl, MusicCommands
rept 2
add hl, de
add hl, de
endr
; jump to the new pointer
ld a, [hli]
ld h, [hl]
@@ -1572,8 +1574,9 @@ MusicFB: ; e8817
inc hl
ld d, [hl]
; skip pointer
rept 2
inc de
inc de
endr
; update address
ld [hl], d
dec hl
@@ -1623,8 +1626,9 @@ MusicEE; e883e
inc hl
ld d, [hl]
; skip pointer
rept 2
inc de
inc de
endr
; update address
ld [hl], d
dec hl
@@ -2378,9 +2382,9 @@ _PlayCryHeader:: ; e8b79
; 3-byte pointers (bank, address)
ld hl, Cries
rept 3
add hl, de
add hl, de
add hl, de
endr
ld a, [hli]
ld [MusicBank], a
@@ -2595,9 +2599,9 @@ PlayStereoSFX:: ; e8ca6
; get sfx ptr
ld hl, SFX
rept 3
add hl, de
add hl, de
add hl, de
endr
; bank
ld a, [hli]
@@ -2692,8 +2696,9 @@ LoadChannel: ; e8d1b
ld c, a
ld b, $00
ld hl, ChannelPointers
rept 2
add hl, bc
add hl, bc
endr
ld c, [hl]
inc hl
ld b, [hl] ; bc = channel pointer
@@ -3157,8 +3162,9 @@ ClearChannels:: ; e8fe9
; doesn't seem to be used, but functionally identical to SoundRestart
ld hl, rNR50
xor a
rept 2
ld [hli], a
ld [hli], a
endr
ld a, $80
ld [hli], a
ld hl, rNR10

3
audio/music/goldenrodcity.asm
View File

@@ -275,8 +275,9 @@ Music_GoldenrodCity_Ch3: ; eb584
vibrato $8, $23
notetype $c, $25
Music_GoldenrodCity_branch_eb58c: ; eb58c
rept 2
callchannel Music_GoldenrodCity_branch_eb5aa
callchannel Music_GoldenrodCity_branch_eb5aa
endr
callchannel Music_GoldenrodCity_branch_eb5d2
note __, 3
octave 3

3
audio/music/johtowildbattle.asm
View File

@@ -492,8 +492,9 @@ Music_JohtoWildBattle_branch_f5fdb: ; f5fdb
note G_, 2
loopchannel 7, Music_JohtoWildBattle_branch_f5fdb
note F#, 4
rept 2
callchannel Music_JohtoWildBattle_branch_f6055
callchannel Music_JohtoWildBattle_branch_f6055
endr
Music_JohtoWildBattle_branch_f5fe8: ; f5fe8
note D_, 2
note G_, 2

17
audio/music/kantowildbattle.asm
View File

@@ -325,22 +325,25 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
note F_, 1
note F#, 1
notetype $6, $b7
rept 2
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
endr
forceoctave $1
rept 2
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
endr
forceoctave $0
rept 4
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
endr
forceoctave $1
rept 2
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
endr
forceoctave $0
rept 2
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
endr
note __, 16
octave 3
note A#, 16

7
battle/ai/items.asm
View File

@@ -193,9 +193,9 @@ AI_TryItem: ; 38105
jr z, .has_item
dec de
rept 3
inc hl
inc hl
inc hl
endr
jr .loop
.has_item
@@ -213,8 +213,9 @@ AI_TryItem: ; 38105
pop de
pop hl
rept 2
inc hl
inc hl
endr
jr c, .loop
.used_item

190
battle/ai/scoring.asm
View File

File diff suppressed because it is too large Load Diff

41
battle/anim_commands.asm
View File

@@ -265,9 +265,9 @@ Functioncc23d: ; cc23d
ld a, [hl]
and $f0
ld [hli], a
rept 3
inc hl
inc hl
inc hl
endr
dec c
jr nz, .asm_cc249
ret
@@ -341,8 +341,9 @@ Functioncc293: ; cc293
ld e, a
ld d, 0
ld hl, BattleAnimCommands
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
@@ -488,8 +489,9 @@ BattleAnimCmd_FD: ; cc348 (33:4348)
ld e, [hl]
inc hl
ld d, [hl]
rept 2
inc de
inc de
endr
ld [hl], d
dec hl
ld [hl], e
@@ -517,8 +519,9 @@ BattleAnimCmd_EF: ; cc383 (33:4383)
ld e, [hl]
inc hl
ld d, [hl]
rept 2
inc de
inc de
endr
ld [hl], d
dec hl
ld [hl], e
@@ -544,8 +547,9 @@ BattleAnimCmd_FB: ; cc3b2 (33:43b2)
ld e, [hl]
inc hl
ld d, [hl]
rept 2
inc de
inc de
endr
ld [hl], d
dec hl
ld [hl], e
@@ -572,8 +576,9 @@ BattleAnimCmd_F8: ; cc3d6 (33:43d6)
ld e, [hl]
inc hl
ld d, [hl]
rept 2
inc de
inc de
endr
ld [hl], d
dec hl
ld [hl], e
@@ -601,8 +606,9 @@ BattleAnimCmd_EE: ; cc3fa (33:43fa)
ld e, [hl]
inc hl
ld d, [hl]
rept 2
inc de
inc de
endr
ld [hl], d
dec hl
ld [hl], e
@@ -700,10 +706,9 @@ BattleAnimCmd_D5: ; cc485 (33:4485)
push hl
ld l, a
ld h, $0
rept 4
add hl, hl
add hl, hl
add hl, hl
add hl, hl
endr
ld de, $8310
add hl, de
ld a, [BattleAnimByte]
@@ -797,8 +802,9 @@ BattleAnimCmd_D9: ; cc52c (33:452c)
ld a, [hl]
and a
jr z, .asm_cc537
rept 2
inc hl
inc hl
endr
jr .asm_cc52f
.asm_cc537
@@ -852,8 +858,9 @@ BattleAnimCmd_DA: ; cc57e (33:457e)
ld a, [hl]
and a
jr z, .asm_cc589
rept 2
inc hl
inc hl
endr
jr .asm_cc581
.asm_cc589
@@ -1243,10 +1250,9 @@ BattleAnimCmd_E1: ; cc807 (33:4807)
ld e, a
ld d, 0
ld hl, Datacc871
rept 4
add hl, de
add hl, de
add hl, de
add hl, de
endr
ld a, [rSVBK] ; $ff00+$70
push af
@@ -1392,8 +1398,9 @@ Functioncc8d3: ; cc8d3
inc hl
ld d, [hl]
ld hl, BattleAnimations
rept 2
add hl, de
add hl, de
endr
call Function3ae1
call BattleAnimAssignPals
call BattleAnimDelayFrame

111
battle/anim_objects.asm
View File

@@ -36,12 +36,9 @@ Functioncc9c4: ; cc9c4 (33:49c4)
ld e, a
ld d, 0
ld hl, BattleAnimObjects
rept 6
add hl, de
add hl, de
add hl, de
add hl, de
add hl, de
add hl, de
endr
ld e, l
ld d, h
ld hl, $0
@@ -71,8 +68,9 @@ Functioncc9c4: ; cc9c4 (33:49c4)
ld a, [BattleAnimTemps + 2]
ld [hli], a
xor a
rept 2
ld [hli], a
ld [hli], a
endr
ld a, [BattleAnimTemps + 3]
ld [hli], a
xor a
@@ -80,8 +78,9 @@ Functioncc9c4: ; cc9c4 (33:49c4)
dec a
ld [hli], a
xor a
rept 2
ld [hli], a
ld [hli], a
endr
ld [hl], a
ret
@@ -516,8 +515,9 @@ Functionccfbe: ; ccfbe
ld e, [hl]
ld d, 0
ld hl, Jumptable_ccfce
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -670,10 +670,9 @@ Functioncd0a6: ; cd0a6 (33:50a6)
ld hl, $f
add hl, bc
ld a, [hl]
rept 4
inc [hl]
inc [hl]
inc [hl]
inc [hl]
endr
ld d, $10
push af
push de
@@ -937,8 +936,9 @@ Functioncd232: ; cd232 (33:5232)
ld [hl], a
ld hl, $7
add hl, bc
rept 2
dec [hl]
dec [hl]
endr
ret
.asm_cd245
call Functioncc9bd
@@ -1739,8 +1739,9 @@ Functioncd687: ; cd687 (33:5687)
ld [hl], a
ld hl, $f
add hl, bc
rept 2
inc [hl]
inc [hl]
endr
Functioncd6c5: ; cd6c5 (33:56c5)
ret
@@ -1760,8 +1761,9 @@ Functioncd6d6: ; cd6d6 (33:56d6)
call Functioncc9bd
ret
asm_cd6da: ; cd6da (33:56da)
rept 2
inc a
inc a
endr
ld [hl], a
sub $10
ret c
@@ -2128,8 +2130,9 @@ Functioncd8cc: ; cd8cc (33:58cc)
call Functionce7bf
ld hl, $f
add hl, bc
rept 2
inc [hl]
inc [hl]
endr
ld a, [hl]
and $1f
ret nz
@@ -2550,8 +2553,9 @@ Functioncdb28: ; cdb28 (33:5b28)
ld a, [hl]
cp $98
ret nc
rept 2
inc [hl]
inc [hl]
endr
ld hl, $1
add hl, bc
set 0, [hl]
@@ -2587,8 +2591,9 @@ Functioncdb65: ; cdb65 (33:5b65)
ld a, [hl]
cp $98
ret nc
rept 2
inc [hl]
inc [hl]
endr
ld hl, $f
add hl, bc
ld a, [hl]
@@ -2722,8 +2727,9 @@ Functioncdc27: ; cdc27 (33:5c27)
ld hl, $f
add hl, bc
ld a, [hl]
rept 2
inc [hl]
inc [hl]
endr
ld d, $2
call Functionce734
ld hl, $9
@@ -2871,8 +2877,9 @@ Functioncdcfe: ; cdcfe (33:5cfe)
ld hl, $10
add hl, bc
ld a, [hl]
rept 2
inc [hl]
inc [hl]
endr
ld d, $10
call Functionce734
ld d, a
@@ -3083,8 +3090,9 @@ Functioncde28: ; cde28 (33:5e28)
ld hl, $f
add hl, bc
ld a, [hl]
rept 2
inc [hl]
inc [hl]
endr
ld d, $4
call Functionce734
ld hl, $9
@@ -3112,8 +3120,9 @@ Functioncde54: ; cde54 (33:5e54)
ld hl, $f
add hl, bc
ld a, [hl]
rept 2
dec [hl]
dec [hl]
endr
ld d, $10
call Functionce734
ld hl, $a
@@ -3353,8 +3362,9 @@ Functioncdf8c: ; cdf8c (33:5f8c)
ld [hl], a
ld hl, $b
add hl, bc
rept 2
inc [hl]
inc [hl]
endr
ld a, [hl]
and $7
ret nz
@@ -3394,8 +3404,9 @@ Functioncdfcb: ; cdfcb (33:5fcb)
ld [hl], a
ld hl, $b
add hl, bc
rept 2
inc [hl]
inc [hl]
endr
ld a, [hl]
and $3
ret nz
@@ -3404,8 +3415,9 @@ Functioncdfcb: ; cdfcb (33:5fcb)
ld a, [hl]
cp $d0
jr z, .asm_ce007
rept 2
dec [hl]
dec [hl]
endr
ret
.asm_ce007
call Functioncc9bd
@@ -3930,8 +3942,9 @@ Functionce2cc: ; ce2cc (33:62cc)
ld [hl], a
ld hl, $10
add hl, bc
rept 2
dec [hl]
dec [hl]
endr
ret
Functionce2fd: ; ce2fd (33:62fd)
@@ -4077,8 +4090,9 @@ Functionce3b4: ; ce3b4 (33:63b4)
ld hl, $f
add hl, bc
ld a, [hl]
rept 2
inc [hl]
inc [hl]
endr
push af
ld d, $2
call Functionce734
@@ -4317,8 +4331,9 @@ Functionce508: ; ce508 (33:6508)
ld a, [hl]
cp $10
jr nc, .asm_ce52e
rept 2
inc [hl]
inc [hl]
endr
ld d, a
ld hl, $b
add hl, bc
@@ -4428,12 +4443,14 @@ Functionce59a: ; ce59a (33:659a)
jr c, .asm_ce5b0
ld hl, $7
add hl, bc
rept 2
dec [hl]
dec [hl]
endr
ld hl, $8
add hl, bc
rept 2
inc [hl]
inc [hl]
endr
ret
.asm_ce5b0
call Functioncc9bd
@@ -4446,8 +4463,9 @@ Functionce5b4: ; ce5b4 (33:65b4)
ld hl, $b
add hl, bc
ld a, [hl]
rept 2
inc [hl]
inc [hl]
endr
push af
push de
call Functionce734
@@ -4474,10 +4492,9 @@ Functionce5dc: ; ce5dc (33:65dc)
ld a, [hl]
cp $d0
jr z, .asm_ce5ea
rept 4
dec [hl]
dec [hl]
dec [hl]
dec [hl]
endr
ret
.asm_ce5ea
call Functioncc9bd
@@ -4510,10 +4527,9 @@ Functionce60a: ; ce60a (33:660a)
ld a, [hl]
cp $4
jr z, Functionce618
rept 4
inc [hl]
inc [hl]
inc [hl]
inc [hl]
endr
ret
Functionce618: ; ce618 (33:6618)
@@ -4529,10 +4545,9 @@ Functionce622: ; ce622 (33:6622)
ld a, [hl]
cp $d8
ret z
rept 4
dec [hl]
dec [hl]
dec [hl]
dec [hl]
endr
ret
Functionce62f: ; ce62f (33:662f)
@@ -4567,8 +4582,9 @@ Functionce648: ; ce648 (33:6648)
ld [hl], a
ld hl, $9
add hl, bc
rept 2
inc [hl]
inc [hl]
endr
ret
Functionce65c: ; ce65c (33:665c)
@@ -4754,8 +4770,9 @@ Functionce749: ; ce749 (33:6749)
ld a, d
ld d, 0
ld hl, Unknown_ce77f
rept 2
add hl, de
add hl, de
endr
ld e, [hl]
inc hl
ld d, [hl]
@@ -4864,8 +4881,9 @@ Functionce7d1: ; ce7d1
ld [hl], a
ld hl, $000d
add hl, bc
rept 2
dec [hl]
dec [hl]
endr
jr .asm_ce7d1
.asm_ce815
@@ -4886,8 +4904,9 @@ Functionce823: ; ce823
ld e, [hl]
ld d, 0
ld hl, Unknown_ce85e
rept 2
add hl, de
add hl, de
endr
ld e, [hl]
inc hl
ld d, [hl]
@@ -4904,8 +4923,9 @@ Functionce83c: ; ce83c
ld l, a
ld h, 0
ld de, Unknown_ceeae
rept 2
add hl, hl
add hl, hl
endr
add hl, de
ret
; ce846
@@ -4915,8 +4935,9 @@ Functionce846: ; ce846 (33:6846)
push hl
ld l, a
ld h, 0
rept 2
add hl, hl
add hl, hl
endr
ld de, AnimObjGFX
add hl, de
ld c, [hl]

29
battle/bg_effects.asm
View File

@@ -61,8 +61,9 @@ Functionc804a: ; c804a (32:404a)
ld e, [hl]
ld d, 0
ld hl, BattleBGEffects
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -708,9 +709,9 @@ Functionc83fa: ; c83fa (32:43fa)
ld l, a
ld a, [BattleAnimTemps + 2]
ld h, a
rept 3
add hl, de
add hl, de
add hl, de
endr
ld a, [hl]
cp $ff
jr z, Functionc8434
@@ -756,8 +757,9 @@ Functionc843b: ; c843b (32:443b)
ld e, [hl]
ld d, 0
ld hl, Unknown_c849c
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -771,9 +773,9 @@ Functionc8458: ; c8458 (32:4458)
ld e, [hl]
ld d, 0
ld hl, Unknown_c84a8
rept 3
add hl, de
add hl, de
add hl, de
endr
ld a, [hli]
ld b, a
and $f
@@ -793,8 +795,9 @@ Functionc8458: ; c8458 (32:4458)
ld e, [hl]
ld d, 0
ld hl, Unknown_c849c
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -1012,8 +1015,9 @@ Functionc85ce: ; c85ce (32:45ce)
ld a, [hl]
cp $20
jr nc, .asm_c85fc
rept 2
inc [hl]
inc [hl]
endr
call Functionc8f9a
ret
.asm_c85fc
@@ -1388,8 +1392,9 @@ Functionc87de: ; c87de (32:47de)
call Functionc901b
ld hl, $2
add hl, bc
rept 2
inc [hl]
inc [hl]
endr
ret
Functionc8801: ; c8801 (32:4801)
@@ -1792,8 +1797,9 @@ Functionc8a14: ; c8a14 (32:4a14)
call Functionc901b
ld hl, $3
add hl, bc
rept 2
inc [hl]
inc [hl]
endr
ret
Functionc8a36: ; c8a36 (32:4a36)
@@ -1877,8 +1883,9 @@ Functionc8a9a: ; c8a9a (32:4a9a)
ld h, $d2
.asm_c8aa5
ld [hl], e
rept 2
inc hl
inc hl
endr
dec a
jr nz, .asm_c8aa5
ret

83
battle/core.asm
View File

@@ -1840,8 +1840,9 @@ HandleWeather: ; 3cb9e
dec a
ld c, a
ld b, 0
rept 2
add hl, bc
add hl, bc
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -2552,8 +2553,9 @@ Function3d02b: ; 3d02b
dec a
ld c, a
ld b, 0
rept 2
add hl, bc
add hl, bc
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -2591,8 +2593,9 @@ Function3d099: ; 3d099
rl [hl]
ret nc
ld a, $ff
rept 2
ld [hli], a
ld [hli], a
endr
ld [hl], a
ret
; 3d0ab
@@ -3756,10 +3759,9 @@ NewEnemyMonStatus: ; 3d834
ld [LastPlayerCounterMove], a
ld [LastEnemyMove], a
ld hl, EnemySubStatus1
rept 4
ld [hli], a
ld [hli], a
ld [hli], a
ld [hli], a
endr
ld [hl], a
ld [EnemyDisableCount], a
ld [EnemyFuryCutterCount], a
@@ -4033,9 +4035,9 @@ Function3da0d: ; 3da0d
ld de, BattleMonDVs
ld bc, 2 + NUM_MOVES + 1 ; DVs, PP, happiness ; BattleMonLevel - BattleMonDVs
call CopyBytes
rept 3
inc hl
inc hl
inc hl
endr
ld de, BattleMonLevel
ld bc, 1 + 1 + 1 + 2 + 2 * 6 ; level, status, unused, stats
call CopyBytes
@@ -4125,9 +4127,9 @@ Function3dabd: ; 3dabd
ld de, EnemyMonDVs
ld bc, 2 + NUM_MOVES + 1
call CopyBytes
rept 3
inc hl
inc hl
inc hl
endr
ld de, EnemyMonLevel
ld bc, 1 + 1 + 1 + 2 + 2 * 6
call CopyBytes
@@ -4250,15 +4252,14 @@ NewBattleMonStatus: ; 3dbde
ld [LastPlayerCounterMove], a
ld [LastPlayerMove], a
ld hl, PlayerSubStatus1
rept 4
ld [hli], a
ld [hli], a
ld [hli], a
ld [hli], a
endr
ld [hl], a
ld hl, PlayerUsedMoves
rept 3
ld [hli], a
ld [hli], a
ld [hli], a
endr
ld [hl], a
ld [PlayerDisableCount], a
ld [PlayerFuryCutterCount], a
@@ -4694,16 +4695,18 @@ Function3deb6: ; 3deb6
ld a, [hli]
cp $ff
jr z, .asm_3def9
rept 2
inc hl
inc hl
endr
cp b
jr nz, .asm_3dec7
pop bc
ld a, [bc]
ld [wd265], a
push bc
rept 2
dec hl
dec hl
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -5769,8 +5772,9 @@ Function3e4bc: ; 3e4bc
ld a, [wcfa9]
ld b, a
ld a, [wd0eb]
rept 2
inc a
inc a
endr
cp b
jp nz, .asm_3e57a
ld a, $1
@@ -5953,8 +5957,9 @@ Function3e75f: ; 3e75f
ld bc, $0102
call PrintNum
pop hl
rept 2
inc hl
inc hl
endr
ld [hl], "/"
inc hl
ld de, wd265
@@ -6583,9 +6588,9 @@ LoadEnemyMon: ; 3e8eb
xor a
ld h, d
ld l, e
rept 3
ld [hli], a
ld [hli], a
ld [hli], a
endr
ld [hl], a
; Make sure the predef knows this isn't a partymon
ld [MagikarpLength], a
@@ -6758,8 +6763,9 @@ CheckUnownLetter: ; 3eb75
.next
; Make sure we haven't gone past the end of the table
rept 2
inc e
inc e
endr
ld a, e
cp a, .Set1 - .LetterSets
jr c, .loop
@@ -7109,8 +7115,9 @@ BadgeStatBoosts: ; 3ed45
; Swap badges 3 (PlainBadge) and 5 (MineralBadge).
ld d, a
and %00000100
rept 2
add a
add a
endr
ld b, a
ld a, d
and %00010000
@@ -7129,8 +7136,9 @@ BadgeStatBoosts: ; 3ed45
ld a, b
srl b
call c, BoostStat
rept 2
inc hl
inc hl
endr
; Check every other badge.
srl b
dec c
@@ -7259,8 +7267,9 @@ _BattleRandom:: ; 3edd8
; a * 5 + 1
ld c, a
rept 2
add a
add a
endr
add c
inc a
@@ -7392,8 +7401,9 @@ Function3ee3b: ; 3ee3b
ld [de], a
.asm_3eea9
rept 2
inc de
inc de
endr
dec c
jr nz, .asm_3ee7c
xor a
@@ -7468,8 +7478,9 @@ Function3ee3b: ; 3ee3b
inc [hl]
jr nz, .asm_3ef3d
ld a, $ff
rept 2
ld [hli], a
ld [hli], a
endr
ld [hl], a
.asm_3ef3d
@@ -7797,8 +7808,9 @@ Function3f136: ; 3f136
inc [hl]
jr nz, .asm_3f186
ld a, $ff
rept 2
ld [hli], a
ld [hli], a
endr
ld [hl], a
.asm_3f186
@@ -8690,8 +8702,9 @@ Function3f71d: ; 3f71d
rl [hl]
jr nc, .asm_3f73d
ld a, $ff
rept 2
ld [hli], a
ld [hli], a
endr
ld [hl], a
.asm_3f73d
@@ -9083,11 +9096,13 @@ Function3fa42: ; 3fa42
ld d, $5
.asm_3fa62
push hl
rept 2
inc hl
inc hl
endr
ld a, [hl]
rept 2
dec hl
dec hl
endr
and a
jr z, .asm_3fa85
push de
@@ -9187,16 +9202,18 @@ Function3fac8: ; 3fac8
ld c, $1
.asm_3faed
ld a, b
rept 2
add b
add b
endr
ld e, a
ld d, $0
ld hl, DefaultFlypoint
add hl, de
push hl
ld a, c
rept 2
add c
add c
endr
ld e, a
ld d, $0
ld hl, DefaultFlypoint

92
battle/effect_commands.asm
View File

@@ -50,8 +50,9 @@ DoMove: ; 3402c
ld c, a
ld b, 0
ld hl, MoveEffectsPointers
rept 2
add hl, bc
add hl, bc
endr
ld a, BANK(MoveEffectsPointers)
call GetFarHalfword
@@ -100,8 +101,9 @@ DoMove: ; 3402c
ld c, a
ld b, 0
ld hl, BattleCommandPointers
rept 2
add hl, bc
add hl, bc
endr
pop bc
ld a, BANK(BattleCommandPointers)
@@ -1062,8 +1064,9 @@ BattleCommand04: ; 34555
jp nz, EndMoveEffect
; SubStatus5
rept 2
inc de
inc de
endr
ld a, [de]
bit SUBSTATUS_TRANSFORMED, a
@@ -1259,8 +1262,9 @@ BattleCommand05: ; 34631
jr nc, .ScopeLens
; +2 critical level
rept 2
inc c
inc c
endr
.ScopeLens
push bc
@@ -1500,8 +1504,9 @@ BattleCommand07: ; 346d2
pop hl
.asm_347b3
rept 2
inc hl
inc hl
endr
jr .asm_34743
.end
@@ -1746,11 +1751,9 @@ Function348de: ; 348de
jr c, .loop
; neutral
rept 5
inc c
inc c
inc c
inc c
inc c
endr
cp 10
jr z, .loop
@@ -2239,8 +2242,9 @@ Function34b77: ; 34b77
ld b, [hl]
inc hl
ld c, [hl]
rept 2
inc hl
inc hl
endr
srl c
rl b
srl c
@@ -3344,8 +3348,9 @@ EndMoveEffect: ; 352a3
ld a, [BattleScriptBufferLoc + 1]
ld h, a
ld a, $ff
rept 2
ld [hli], a
ld [hli], a
endr
ld [hl], a
ret
; 352b1
@@ -3983,9 +3988,9 @@ Function355dd: ; 355dd
sla c
rl b
.asm_35604
rept 3
dec hl
dec hl
dec hl
endr
ld a, [hli]
ld l, [hl]
ld h, a
@@ -4039,8 +4044,9 @@ BattleCommand62: ; 35612
xor a
ld hl, hDividend
rept 2
ld [hli], a
ld [hli], a
endr
ld [hl], a
; Level * 2
@@ -4061,8 +4067,9 @@ BattleCommand62: ; 35612
pop bc
; + 2
rept 2
inc [hl]
inc [hl]
endr
; * bp
inc hl
@@ -4523,9 +4530,9 @@ BattleCommand41: ; 35864
set SUBSTATUS_ENCORED, [hl]
call BattleRandom
and $3
rept 3
inc a
inc a
inc a
endr
ld [de], a
call Function36abf
jr nz, .asm_3591a
@@ -4650,8 +4657,9 @@ BattleCommand42: ; 35926
ld [wd1ec], a
ld a, [hl]
ld [wd1ed], a
rept 2
dec de
dec de
endr
ld a, [de]
dec de
add b
@@ -4664,12 +4672,12 @@ BattleCommand42: ; 35926
ld a, [CurDamage + 1]
rr a
ld [CurDamage + 1], a
rept 3
inc hl
inc hl
inc hl
inc de
inc de
endr
rept 3
inc de
endr
; fallthrough
; 359ac
@@ -5142,8 +5150,9 @@ BattleCommand4a: ; 35c0f
call GetMoveName
call BattleRandom
and 3
rept 2
inc a
inc a
endr
ld b, a
ld a, [hl]
and $3f
@@ -6854,8 +6863,9 @@ Function3661d: ; 3661d
dec c
ld b, 0
ld hl, Table0x364e6
rept 2
add hl, bc
add hl, bc
endr
xor a
ld [hMultiplicand], a
@@ -7009,8 +7019,9 @@ BattleCommand22: ; 366e5
ld [wEnemyMoveStruct + MOVE_EFFECT], a
call BattleRandom
and 1
rept 2
inc a
inc a
endr
ld [bc], a
ld a, 1
ld [wc689], a
@@ -7046,8 +7057,9 @@ BattleCommand3e: ; 3671a
set 7, [hl]
call BattleRandom
and $1
rept 2
inc a
inc a
endr
inc de
ld [de], a
.asm_3674c
@@ -7885,9 +7897,9 @@ BattleCommand3b: ; 36c2d
ret nz
call BattleRandom
and 3
rept 3
inc a
inc a
inc a
endr
ld [hl], a
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
@@ -7899,8 +7911,9 @@ BattleCommand3b: ; 36c2d
ld a, [hli]
cp b
jr z, .asm_36c69
rept 2
inc hl
inc hl
endr
jr .asm_36c61
.asm_36c69
@@ -7981,8 +7994,9 @@ BattleCommand27: ; 36cb2
ld [Buffer2], a
ld a, [hl]
ld [Buffer1], a
rept 2
dec hl
dec hl
endr
ld a, [hl]
ld [wd1ec], a
sub c
@@ -8083,8 +8097,9 @@ Function36d70: ; 36d70
set SUBSTATUS_CONFUSED, [hl]
call BattleRandom
and 3
rept 2
inc a
inc a
endr
ld [bc], a
ld a, BATTLE_VARS_MOVE_EFFECT
@@ -8263,8 +8278,9 @@ BattleCommand31: ; 36e7c
rr b
srl a
rr b
rept 2
dec hl
dec hl
endr
ld a, b
ld [de], a
ld a, [hld]
@@ -8853,8 +8869,9 @@ BattleCommand2d: ; 371cd
ld a, [hli]
ld [de], a
inc hl
rept 2
inc de
inc de
endr
ld bc, NUM_MOVES
call CopyBytes
ld a, [hBattleTurn]
@@ -9655,8 +9672,9 @@ BattleCommand66: ; 37991
ld a, [hli]
cp b
jr nc, .ok
rept 2
inc hl
inc hl
endr
jr .loop
.ok
ld d, [hl]
@@ -10045,14 +10063,16 @@ BattleCommand6a6c: ; 37b7e
inc c
cp WEATHER_SUN
jr z, .Heal
rept 2
dec c
dec c
endr
.Heal
ld b, 0
ld hl, .Multipliers
rept 2
add hl, bc
add hl, bc
endr
ld a, [hli]
ld h, [hl]

6
battle/hidden_power.asm
View File

@@ -45,8 +45,9 @@ HiddenPowerDamage: ; fbced
; Multiply by 5
ld b, a
rept 2
add a
add a
endr
add b
; Add Special & 3
@@ -74,8 +75,9 @@ HiddenPowerDamage: ; fbced
ld a, [hl]
and 3 << 4
swap a
rept 2
add a
add a
endr
or b
; Skip Normal

3
battle/magikarp_length.asm
View File

@@ -141,8 +141,9 @@ CalcMagikarpLength: ; fbbfc
; hl = de * 10
ld h, d
ld l, e
rept 2
add hl, hl
add hl, hl
endr
add hl, de
add hl, hl

7
data/wild/fish.asm
View File

@@ -60,9 +60,9 @@ endr
jr c, .ReadMon
; Next monster...
rept 3
inc hl
inc hl
inc hl
endr
jr .CheckEncounter
.ReadMon
@@ -98,8 +98,9 @@ endr
and 3
cp NITE
jr c, .TimeSpecies
rept 2
inc hl
inc hl
endr
.TimeSpecies
ld d, [hl]

67
engine/color.asm
View File

@@ -262,10 +262,9 @@ Function8bc6:
bit 7, a
jr z, .asm_8bd7
and $7f
rept 4
inc hl
inc hl
inc hl
inc hl
endr
.asm_8bd7
asm_8bd7
@@ -361,8 +360,9 @@ Function8c43: ; 8c43
.asm_8c5a
ld l, c
ld h, $0
rept 2
add hl, hl
add hl, hl
endr
ld bc, Palettes_a8be
add hl, bc
ld bc, $0004
@@ -398,8 +398,9 @@ Function8c8a: ; 8c8a
ld hl, Unknown_8f6a
ld b, 0
dec c
rept 2
add hl, bc
add hl, bc
endr
ld a, [rSVBK]
push af
ld a, $5
@@ -420,9 +421,9 @@ Function8c8a: ; 8c8a
Function8cb4: ; 8cb4
ld l, e
ld h, 0
rept 3
add hl, hl
add hl, hl
add hl, hl
endr
ld de, Palettes_8d05
add hl, de
call CheckCGB
@@ -433,8 +434,9 @@ Function8cb4: ; 8cb4
ld bc, $0010
call CopyBytes
pop hl
rept 2
inc hl
inc hl
endr
ld a, [hli]
ld [wcda9 + 3], a
ld a, [hli]
@@ -556,9 +558,9 @@ Function9615: ; 9615
Function9625: ; 9625
ld l, a
ld h, $0
rept 3
add hl, hl
add hl, hl
add hl, hl
endr
ld bc, Palettes_9df6
add hl, bc
ret
@@ -639,15 +641,13 @@ Function9673: ; 9673
ld c, $8
.asm_9683
ld a, $ff
rept 4
ld [hli], a
ld [hli], a
ld [hli], a
ld [hli], a
endr
xor a
rept 4
ld [hli], a
ld [hli], a
ld [hli], a
ld [hli], a
endr
dec c
jr nz, .asm_9683
pop af
@@ -897,9 +897,9 @@ Function97e5: ; 97e5
Function97ee: ; 97ee
ld l, a
ld h, $0
rept 3
add hl, hl
add hl, hl
add hl, hl
endr
ld bc, PokemonPalettes
add hl, bc
ret
@@ -913,10 +913,9 @@ Function97f9: ; 97f9
call CheckShininess
pop hl
ret nc
rept 4
inc hl
inc hl
inc hl
inc hl
endr
ret
; 9809
@@ -1140,8 +1139,9 @@ Function994a: ; 994a
jr nz, .asm_99a6
ld a, $20
ld [rJOYP], a
rept 2
ld a, [rJOYP]
ld a, [rJOYP]
endr
call Function9a7a
call Function9a7a
ld a, $30
@@ -1150,19 +1150,16 @@ Function994a: ; 994a
call Function9a7a
ld a, $10
ld [rJOYP], a
rept 6
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
endr
call Function9a7a
call Function9a7a
ld a, $30
ld [rJOYP], a
rept 3
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
endr
call Function9a7a
call Function9a7a
ld a, [rJOYP]
@@ -1949,16 +1946,17 @@ Functionb1de: ; b1de
ld e, a
ld d, 0
ld hl, Unknown_b279
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
ld a, [TimeOfDayPal]
and 3
rept 3
add a
add a
add a
endr
ld e, a
ld d, 0
add hl, de
@@ -2027,10 +2025,9 @@ endr
and 3
cp NITE
jr c, .asm_b26d
rept 4
inc hl
inc hl
inc hl
inc hl
endr
.asm_b26d
ld de, Unkn1Pals + 8 * 6 + 2
ld bc, 4

17
engine/credits.asm
View File

@@ -260,8 +260,9 @@ Function109926: ; 109926
ld e, a
ld d, 0
ld hl, Jumptable_109937
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -326,8 +327,9 @@ Function109986: ; 109986 (42:5986)
cp $30
jr c, Function109986
ld a, [wcf66]
rept 2
dec a
dec a
endr
ld [wcf66], a
ld hl, LYOverrides + $1f
call Function1099a3
@@ -397,8 +399,9 @@ ParseCredits: ; 1099aa
ld e, a
ld d, 0
ld hl, CreditsStrings
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld d, [hl]
ld e, a
@@ -582,10 +585,9 @@ Function109aff: ; 109aff (42:5aff)
dec c
jr nz, .asm_109b08
pop hl
rept 4
inc hl
inc hl
inc hl
inc hl
endr
dec b
jr nz, .asm_109b01
ret
@@ -735,8 +737,9 @@ Function109bca: ; 109bca (42:5bca)
ld [hl], a
ld a, [wcf65]
and 3
rept 2
add a
add a
endr
add e
add a
ld e, a

3
engine/events.asm
View File

@@ -794,8 +794,9 @@ TryReadSign: ; 96a38
push hl
call PlayTalkObject
pop hl
rept 2
inc hl
inc hl
endr
call GetMapScriptHeaderBank
call GetFarHalfword
call GetMapScriptHeaderBank

4
engine/events_2.asm
View File

@@ -439,9 +439,9 @@ Function97e79: ; 97e79
ld e, a
ld d, 0
ld hl, Table97e94
rept 3
add hl, de
add hl, de
add hl, de
endr
ld a, [hli]
push af
ld a, [hli]

4
engine/fruit_trees.asm
View File

@@ -66,9 +66,9 @@ PickedFruitTree: ; 4405f
ResetFruitTrees: ; 4406a
xor a
ld hl, FruitTreeFlags
rept 3
ld [hli], a
ld [hli], a
ld [hli], a
endr
ld [hl], a
ld hl, DailyFlags
set 4, [hl]

6
engine/landmarks.asm
View File

@@ -3,8 +3,9 @@ GetLandmarkCoords: ; 0x1ca896
push hl
ld l, e
ld h, 0
rept 2
add hl, hl
add hl, hl
endr
ld de, Landmarks
add hl, de
ld a, [hli]
@@ -23,8 +24,9 @@ GetLandmarkName:: ; 0x1ca8a5
ld l, e
ld h, 0
rept 2
add hl, hl
add hl, hl
endr
ld de, Landmarks + 2
add hl, de
ld a, [hli]

Some files were not shown because too many files have changed in this diff Show More