Update to rgbds v0.8.0 (#57)

* First test commit

* XIL: All changes for pokepinball to work with rgbds v0.8.0
This commit is contained in:
Xillicis 2024-12-22 16:53:44 -07:00 committed by GitHub
parent 306cfa01a5
commit fb7aa4b2e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
22 changed files with 502 additions and 502 deletions

View File

@ -22,7 +22,7 @@ endif
%.o: dep = $(shell tools/scan_includes $(@D)/$*.asm)
%.o: %.asm $$(dep)
rgbasm -h -Wunmapped-char=0 -l -o $@ $<
rgbasm -Wunmapped-char=0 -o $@ $<
$(ROM): $(OBJS) contents/contents.link
rgblink -n $(ROM:.gbc=.sym) -m $(ROM:.gbc=.map) -l contents/contents.link -o $@ $(OBJS)

View File

@ -365,9 +365,9 @@ Func_3c180: ; 0x3c180
jp nz, .asm_3c18f
call Func_3c40d
ld a, [wde98]
ld [rNR50], a
ldh [rNR50], a
ld a, [wde99]
ld [rNR51], a
ldh [rNR51], a
ret
Func_3c24d: ; 0x3c24d
@ -399,7 +399,7 @@ Func_3c26e: ; 0x3c26e
bit 3, [hl]
jr z, .asm_3c27b
ld a, [wde9a]
ld [rNR10], a
ldh [rNR10], a
.asm_3c27b
bit 5, [hl]
jr nz, .asm_3c2ba
@ -410,53 +410,53 @@ Func_3c26e: ; 0x3c26e
bit 1, [hl]
jr z, .asm_3c295
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ld a, [wde94]
ld [rNR14], a
ldh [rNR14], a
.asm_3c295
bit 2, [hl]
jr z, .asm_3c2a5
ld a, [wde92]
ld [rNR12], a
ldh [rNR12], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
.asm_3c2a5
bit 0, [hl]
ret z
ld a, [wde91]
ld d, a
ld a, [rNR11]
ldh a, [rNR11]
and $3f
or d
ld [rNR11], a
ldh [rNR11], a
ret
.asm_3c2b4
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ret
.asm_3c2ba
ld a, $8
ld [rNR12], a
ldh [rNR12], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
ret
.asm_3c2c6
ld hl, wde91
ld a, $3f
or [hl]
ld [rNR11], a
ldh [rNR11], a
ld a, [wde92]
ld [rNR12], a
ldh [rNR12], a
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
ret
Func_3c2e0: ; 0x3c2e0
@ -471,53 +471,53 @@ Func_3c2e0: ; 0x3c2e0
bit 1, [hl]
jr z, .asm_3c2fe
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ld a, [wde94]
ld [rNR24], a
ldh [rNR24], a
.asm_3c2fe
bit 2, [hl]
jr z, .asm_3c30e
ld a, [wde92]
ld [rNR22], a
ldh [rNR22], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
.asm_3c30e
bit 0, [hl]
ret z
ld a, [wde91]
ld d, a
ld a, [rNR21]
ldh a, [rNR21]
and $3f
or d
ld [rNR21], a
ldh [rNR21], a
ret
.asm_3c31d
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ret
.asm_3c323
ld a, $8
ld [rNR22], a
ldh [rNR22], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
ret
.asm_3c32f
ld hl, wde91
ld a, $3f
or [hl]
ld [rNR21], a
ldh [rNR21], a
ld a, [wde92]
ld [rNR22], a
ldh [rNR22], a
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
ret
Func_3c349: ; 0x3c349
@ -532,47 +532,47 @@ Func_3c349: ; 0x3c349
bit 1, [hl]
jr z, .asm_3c367
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
ld [rNR34], a
ldh [rNR34], a
.asm_3c367
bit 2, [hl]
ret z
xor a
ld [rNR30], a
ldh [rNR30], a
call LoadWavePattern_BankF
ld a, $80
ld [rNR30], a
ldh [rNR30], a
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
or $80
ld [rNR34], a
ldh [rNR34], a
ret
.asm_3c381
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ret
.asm_3c387
xor a
ld [rNR30], a
ldh [rNR30], a
ret
.asm_3c38b
ld a, $3f
ld [rNR31], a
ldh [rNR31], a
xor a
ld [rNR30], a
ldh [rNR30], a
call LoadWavePattern_BankF
ld a, $80
ld [rNR30], a
ldh [rNR30], a
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
or $80
ld [rNR34], a
ldh [rNR34], a
ret
LoadWavePattern_BankF: ; 0x3c3a6
@ -601,7 +601,7 @@ LoadWavePattern_BankF: ; 0x3c3a6
ld a, [wde92]
and $f0
sla a
ld [rNR32], a ; set volume of wave channel
ldh [rNR32], a ; set volume of wave channel
ret
Func_3c3cf: ; 0x3c3cf
@ -614,32 +614,32 @@ Func_3c3cf: ; 0x3c3cf
bit 1, [hl]
jr z, .asm_3c3e4
ld a, [wde93]
ld [rNR43], a
ldh [rNR43], a
.asm_3c3e4
bit 2, [hl]
ret z
ld a, [wde92]
ld [rNR42], a
ldh [rNR42], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
.asm_3c3f1
ld a, $8
ld [rNR42], a
ldh [rNR42], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
.asm_3c3fa
ld a, $3f
ld [rNR41], a
ldh [rNR41], a
ld a, [wde92]
ld [rNR42], a
ldh [rNR42], a
ld a, [wde93]
ld [rNR43], a
ldh [rNR43], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
Func_3c40d: ; 0x3c40d
@ -1133,7 +1133,7 @@ Func_3c670: ; 0x3c670
cp $4
jr nz, .asm_3c6f6
xor a
ld [rNR10], a
ldh [rNR10], a
ld [wde9a], a
.asm_3c6f6
ld hl, $0002
@ -1834,7 +1834,7 @@ Func_3cb06: ; 0x3cb06
cp $0
ret nz
xor a
ld [rNR10], a
ldh [rNR10], a
ld [wde9a], a
ret

View File

@ -360,9 +360,9 @@ Func_40180:
jp nz, .asm_4018f
call Func_4040d
ld a, [wde98]
ld [rNR50], a
ldh [rNR50], a
ld a, [wde99]
ld [rNR51], a
ldh [rNR51], a
ret
Func_4024d:
@ -394,7 +394,7 @@ Func_4026e:
bit 3, [hl]
jr z, .asm_4027b
ld a, [wde9a]
ld [rNR10], a
ldh [rNR10], a
.asm_4027b
bit 5, [hl]
jr nz, .asm_402ba
@ -405,53 +405,53 @@ Func_4026e:
bit 1, [hl]
jr z, .asm_40295
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ld a, [wde94]
ld [rNR14], a
ldh [rNR14], a
.asm_40295
bit 2, [hl]
jr z, .asm_402a5
ld a, [wde92]
ld [rNR12], a
ldh [rNR12], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
.asm_402a5
bit 0, [hl]
ret z
ld a, [wde91]
ld d, a
ld a, [rNR11]
ldh a, [rNR11]
and $3f
or d
ld [rNR11], a
ldh [rNR11], a
ret
.asm_402b4
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ret
.asm_402ba
ld a, $8
ld [rNR12], a
ldh [rNR12], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
ret
.asm_402c6
ld hl, wde91
ld a, $3f
or [hl]
ld [rNR11], a
ldh [rNR11], a
ld a, [wde92]
ld [rNR12], a
ldh [rNR12], a
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
ret
Func_402e0:
@ -466,53 +466,53 @@ Func_402e0:
bit 1, [hl]
jr z, .asm_402fe
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ld a, [wde94]
ld [rNR24], a
ldh [rNR24], a
.asm_402fe
bit 2, [hl]
jr z, .asm_4030e
ld a, [wde92]
ld [rNR22], a
ldh [rNR22], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
.asm_4030e
bit 0, [hl]
ret z
ld a, [wde91]
ld d, a
ld a, [rNR21]
ldh a, [rNR21]
and $3f
or d
ld [rNR21], a
ldh [rNR21], a
ret
.asm_4031d
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ret
.asm_40323
ld a, $8
ld [rNR22], a
ldh [rNR22], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
ret
.asm_4032f
ld hl, wde91
ld a, $3f
or [hl]
ld [rNR21], a
ldh [rNR21], a
ld a, [wde92]
ld [rNR22], a
ldh [rNR22], a
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
ret
Func_40349:
@ -527,47 +527,47 @@ Func_40349:
bit 1, [hl]
jr z, .asm_40367
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
ld [rNR34], a
ldh [rNR34], a
.asm_40367
bit 2, [hl]
ret z
xor a
ld [rNR30], a
ldh [rNR30], a
call LoadWavePattern_Bank10
ld a, $80
ld [rNR30], a
ldh [rNR30], a
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
or $80
ld [rNR34], a
ldh [rNR34], a
ret
.asm_40381
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ret
.asm_40387
xor a
ld [rNR30], a
ldh [rNR30], a
ret
.asm_4038b
ld a, $3f
ld [rNR31], a
ldh [rNR31], a
xor a
ld [rNR30], a
ldh [rNR30], a
call LoadWavePattern_Bank10
ld a, $80
ld [rNR30], a
ldh [rNR30], a
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
or $80
ld [rNR34], a
ldh [rNR34], a
ret
LoadWavePattern_Bank10:
@ -596,7 +596,7 @@ LoadWavePattern_Bank10:
ld a, [wde92]
and $f0
sla a
ld [rNR32], a ; set volume of wave channel
ldh [rNR32], a ; set volume of wave channel
ret
Func_403cf:
@ -609,32 +609,32 @@ Func_403cf:
bit 1, [hl]
jr z, .asm_403e4
ld a, [wde93]
ld [rNR43], a
ldh [rNR43], a
.asm_403e4
bit 2, [hl]
ret z
ld a, [wde92]
ld [rNR42], a
ldh [rNR42], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
.asm_403f1
ld a, $8
ld [rNR42], a
ldh [rNR42], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
.asm_403fa
ld a, $3f
ld [rNR41], a
ldh [rNR41], a
ld a, [wde92]
ld [rNR42], a
ldh [rNR42], a
ld a, [wde93]
ld [rNR43], a
ldh [rNR43], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
Func_4040d:
@ -1128,7 +1128,7 @@ Func_40670:
cp $4
jr nz, .asm_406f6
xor a
ld [rNR10], a
ldh [rNR10], a
ld [wde9a], a
.asm_406f6
ld hl, $0002
@ -1829,7 +1829,7 @@ Func_40b06:
cp $0
ret nz
xor a
ld [rNR10], a
ldh [rNR10], a
ld [wde9a], a
ret

View File

@ -360,9 +360,9 @@ Func_44180:
jp nz, .asm_4418f
call Func_4440d
ld a, [wde98]
ld [rNR50], a
ldh [rNR50], a
ld a, [wde99]
ld [rNR51], a
ldh [rNR51], a
ret
Func_4424d:
@ -394,7 +394,7 @@ Func_4426e:
bit 3, [hl]
jr z, .asm_4427b
ld a, [wde9a]
ld [rNR10], a
ldh [rNR10], a
.asm_4427b
bit 5, [hl]
jr nz, .asm_442ba
@ -405,53 +405,53 @@ Func_4426e:
bit 1, [hl]
jr z, .asm_44295
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ld a, [wde94]
ld [rNR14], a
ldh [rNR14], a
.asm_44295
bit 2, [hl]
jr z, .asm_442a5
ld a, [wde92]
ld [rNR12], a
ldh [rNR12], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
.asm_442a5
bit 0, [hl]
ret z
ld a, [wde91]
ld d, a
ld a, [rNR11]
ldh a, [rNR11]
and $3f
or d
ld [rNR11], a
ldh [rNR11], a
ret
.asm_442b4
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ret
.asm_442ba
ld a, $8
ld [rNR12], a
ldh [rNR12], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
ret
.asm_442c6
ld hl, wde91
ld a, $3f
or [hl]
ld [rNR11], a
ldh [rNR11], a
ld a, [wde92]
ld [rNR12], a
ldh [rNR12], a
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
ret
Func_442e0:
@ -466,53 +466,53 @@ Func_442e0:
bit 1, [hl]
jr z, .asm_442fe
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ld a, [wde94]
ld [rNR24], a
ldh [rNR24], a
.asm_442fe
bit 2, [hl]
jr z, .asm_4430e
ld a, [wde92]
ld [rNR22], a
ldh [rNR22], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
.asm_4430e
bit 0, [hl]
ret z
ld a, [wde91]
ld d, a
ld a, [rNR21]
ldh a, [rNR21]
and $3f
or d
ld [rNR21], a
ldh [rNR21], a
ret
.asm_4431d
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ret
.asm_44323
ld a, $8
ld [rNR22], a
ldh [rNR22], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
ret
.asm_4432f
ld hl, wde91
ld a, $3f
or [hl]
ld [rNR21], a
ldh [rNR21], a
ld a, [wde92]
ld [rNR22], a
ldh [rNR22], a
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
ret
Func_44349:
@ -527,47 +527,47 @@ Func_44349:
bit 1, [hl]
jr z, .asm_44367
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
ld [rNR34], a
ldh [rNR34], a
.asm_44367
bit 2, [hl]
ret z
xor a
ld [rNR30], a
ldh [rNR30], a
call LoadWavePattern_Bank11
ld a, $80
ld [rNR30], a
ldh [rNR30], a
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
or $80
ld [rNR34], a
ldh [rNR34], a
ret
.asm_44381
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ret
.asm_44387
xor a
ld [rNR30], a
ldh [rNR30], a
ret
.asm_4438b
ld a, $3f
ld [rNR31], a
ldh [rNR31], a
xor a
ld [rNR30], a
ldh [rNR30], a
call LoadWavePattern_Bank11
ld a, $80
ld [rNR30], a
ldh [rNR30], a
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
or $80
ld [rNR34], a
ldh [rNR34], a
ret
LoadWavePattern_Bank11:
@ -596,7 +596,7 @@ LoadWavePattern_Bank11:
ld a, [wde92]
and $f0
sla a
ld [rNR32], a ; set volume of wave channel
ldh [rNR32], a ; set volume of wave channel
ret
Func_443cf:
@ -609,32 +609,32 @@ Func_443cf:
bit 1, [hl]
jr z, .asm_443e4
ld a, [wde93]
ld [rNR43], a
ldh [rNR43], a
.asm_443e4
bit 2, [hl]
ret z
ld a, [wde92]
ld [rNR42], a
ldh [rNR42], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
.asm_443f1
ld a, $8
ld [rNR42], a
ldh [rNR42], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
.asm_443fa
ld a, $3f
ld [rNR41], a
ldh [rNR41], a
ld a, [wde92]
ld [rNR42], a
ldh [rNR42], a
ld a, [wde93]
ld [rNR43], a
ldh [rNR43], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
Func_4440d:
@ -1128,7 +1128,7 @@ Func_44670:
cp $4
jr nz, .asm_446f6
xor a
ld [rNR10], a
ldh [rNR10], a
ld [wde9a], a
.asm_446f6
ld hl, $0002
@ -1829,7 +1829,7 @@ Func_44b06:
cp $0
ret nz
xor a
ld [rNR10], a
ldh [rNR10], a
ld [wde9a], a
ret

View File

@ -360,9 +360,9 @@ Func_48180:
jp nz, .asm_4818f
call Func_4840d
ld a, [wde98]
ld [rNR50], a
ldh [rNR50], a
ld a, [wde99]
ld [rNR51], a
ldh [rNR51], a
ret
Func_4824d:
@ -394,7 +394,7 @@ Func_4826e:
bit 3, [hl]
jr z, .asm_4827b
ld a, [wde9a]
ld [rNR10], a
ldh [rNR10], a
.asm_4827b
bit 5, [hl]
jr nz, .asm_482ba
@ -405,53 +405,53 @@ Func_4826e:
bit 1, [hl]
jr z, .asm_48295
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ld a, [wde94]
ld [rNR14], a
ldh [rNR14], a
.asm_48295
bit 2, [hl]
jr z, .asm_482a5
ld a, [wde92]
ld [rNR12], a
ldh [rNR12], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
.asm_482a5
bit 0, [hl]
ret z
ld a, [wde91]
ld d, a
ld a, [rNR11]
ldh a, [rNR11]
and $3f
or d
ld [rNR11], a
ldh [rNR11], a
ret
.asm_482b4
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ret
.asm_482ba
ld a, $8
ld [rNR12], a
ldh [rNR12], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
ret
.asm_482c6
ld hl, wde91
ld a, $3f
or [hl]
ld [rNR11], a
ldh [rNR11], a
ld a, [wde92]
ld [rNR12], a
ldh [rNR12], a
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
ret
Func_482e0:
@ -466,53 +466,53 @@ Func_482e0:
bit 1, [hl]
jr z, .asm_482fe
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ld a, [wde94]
ld [rNR24], a
ldh [rNR24], a
.asm_482fe
bit 2, [hl]
jr z, .asm_4830e
ld a, [wde92]
ld [rNR22], a
ldh [rNR22], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
.asm_4830e
bit 0, [hl]
ret z
ld a, [wde91]
ld d, a
ld a, [rNR21]
ldh a, [rNR21]
and $3f
or d
ld [rNR21], a
ldh [rNR21], a
ret
.asm_4831d
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ret
.asm_48323
ld a, $8
ld [rNR22], a
ldh [rNR22], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
ret
.asm_4832f
ld hl, wde91
ld a, $3f
or [hl]
ld [rNR21], a
ldh [rNR21], a
ld a, [wde92]
ld [rNR22], a
ldh [rNR22], a
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
ret
Func_48349:
@ -527,47 +527,47 @@ Func_48349:
bit 1, [hl]
jr z, .asm_48367
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
ld [rNR34], a
ldh [rNR34], a
.asm_48367
bit 2, [hl]
ret z
xor a
ld [rNR30], a
ldh [rNR30], a
call LoadWavePattern_Bank12
ld a, $80
ld [rNR30], a
ldh [rNR30], a
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
or $80
ld [rNR34], a
ldh [rNR34], a
ret
.asm_48381
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ret
.asm_48387
xor a
ld [rNR30], a
ldh [rNR30], a
ret
.asm_4838b
ld a, $3f
ld [rNR31], a
ldh [rNR31], a
xor a
ld [rNR30], a
ldh [rNR30], a
call LoadWavePattern_Bank12
ld a, $80
ld [rNR30], a
ldh [rNR30], a
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
or $80
ld [rNR34], a
ldh [rNR34], a
ret
LoadWavePattern_Bank12:
@ -596,7 +596,7 @@ LoadWavePattern_Bank12:
ld a, [wde92]
and $f0
sla a
ld [rNR32], a ; set volume of wave channel
ldh [rNR32], a ; set volume of wave channel
ret
Func_483cf:
@ -609,32 +609,32 @@ Func_483cf:
bit 1, [hl]
jr z, .asm_483e4
ld a, [wde93]
ld [rNR43], a
ldh [rNR43], a
.asm_483e4
bit 2, [hl]
ret z
ld a, [wde92]
ld [rNR42], a
ldh [rNR42], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
.asm_483f1
ld a, $8
ld [rNR42], a
ldh [rNR42], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
.asm_483fa
ld a, $3f
ld [rNR41], a
ldh [rNR41], a
ld a, [wde92]
ld [rNR42], a
ldh [rNR42], a
ld a, [wde93]
ld [rNR43], a
ldh [rNR43], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
Func_4840d:
@ -1128,7 +1128,7 @@ Func_48670:
cp $4
jr nz, .asm_486f6
xor a
ld [rNR10], a
ldh [rNR10], a
ld [wde9a], a
.asm_486f6
ld hl, $0002
@ -1829,7 +1829,7 @@ Func_48b06:
cp $0
ret nz
xor a
ld [rNR10], a
ldh [rNR10], a
ld [wde9a], a
ret

View File

@ -360,9 +360,9 @@ Func_4c180:
jp nz, .asm_4c18f
call Func_4c40d
ld a, [wde98]
ld [rNR50], a
ldh [rNR50], a
ld a, [wde99]
ld [rNR51], a
ldh [rNR51], a
ret
Func_4c24d:
@ -394,7 +394,7 @@ Func_4c26e:
bit 3, [hl]
jr z, .asm_4c27b
ld a, [wde9a]
ld [rNR10], a
ldh [rNR10], a
.asm_4c27b
bit 5, [hl]
jr nz, .asm_4c2ba
@ -405,53 +405,53 @@ Func_4c26e:
bit 1, [hl]
jr z, .asm_4c295
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ld a, [wde94]
ld [rNR14], a
ldh [rNR14], a
.asm_4c295
bit 2, [hl]
jr z, .asm_4c2a5
ld a, [wde92]
ld [rNR12], a
ldh [rNR12], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
.asm_4c2a5
bit 0, [hl]
ret z
ld a, [wde91]
ld d, a
ld a, [rNR11]
ldh a, [rNR11]
and $3f
or d
ld [rNR11], a
ldh [rNR11], a
ret
.asm_4c2b4
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ret
.asm_4c2ba
ld a, $8
ld [rNR12], a
ldh [rNR12], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
ret
.asm_4c2c6
ld hl, wde91
ld a, $3f
or [hl]
ld [rNR11], a
ldh [rNR11], a
ld a, [wde92]
ld [rNR12], a
ldh [rNR12], a
ld a, [wde93]
ld [rNR13], a
ldh [rNR13], a
ld a, [wde94]
or $80
ld [rNR14], a
ldh [rNR14], a
ret
Func_4c2e0:
@ -466,53 +466,53 @@ Func_4c2e0:
bit 1, [hl]
jr z, .asm_4c2fe
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ld a, [wde94]
ld [rNR24], a
ldh [rNR24], a
.asm_4c2fe
bit 2, [hl]
jr z, .asm_4c30e
ld a, [wde92]
ld [rNR22], a
ldh [rNR22], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
.asm_4c30e
bit 0, [hl]
ret z
ld a, [wde91]
ld d, a
ld a, [rNR21]
ldh a, [rNR21]
and $3f
or d
ld [rNR21], a
ldh [rNR21], a
ret
.asm_4c31d
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ret
.asm_4c323
ld a, $8
ld [rNR22], a
ldh [rNR22], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
ret
.asm_4c32f
ld hl, wde91
ld a, $3f
or [hl]
ld [rNR21], a
ldh [rNR21], a
ld a, [wde92]
ld [rNR22], a
ldh [rNR22], a
ld a, [wde93]
ld [rNR23], a
ldh [rNR23], a
ld a, [wde94]
or $80
ld [rNR24], a
ldh [rNR24], a
ret
Func_4c349:
@ -527,47 +527,47 @@ Func_4c349:
bit 1, [hl]
jr z, .asm_4c367
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
ld [rNR34], a
ldh [rNR34], a
.asm_4c367
bit 2, [hl]
ret z
xor a
ld [rNR30], a
ldh [rNR30], a
call LoadWavePattern_Bank13
ld a, $80
ld [rNR30], a
ldh [rNR30], a
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
or $80
ld [rNR34], a
ldh [rNR34], a
ret
.asm_4c381
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ret
.asm_4c387
xor a
ld [rNR30], a
ldh [rNR30], a
ret
.asm_4c38b
ld a, $3f
ld [rNR31], a
ldh [rNR31], a
xor a
ld [rNR30], a
ldh [rNR30], a
call LoadWavePattern_Bank13
ld a, $80
ld [rNR30], a
ldh [rNR30], a
ld a, [wde93]
ld [rNR33], a
ldh [rNR33], a
ld a, [wde94]
or $80
ld [rNR34], a
ldh [rNR34], a
ret
LoadWavePattern_Bank13:
@ -596,7 +596,7 @@ LoadWavePattern_Bank13:
ld a, [wde92]
and $f0
sla a
ld [rNR32], a ; set volume of wave channel
ldh [rNR32], a ; set volume of wave channel
ret
Func_4c3cf:
@ -609,32 +609,32 @@ Func_4c3cf:
bit 1, [hl]
jr z, .asm_4c3e4
ld a, [wde93]
ld [rNR43], a
ldh [rNR43], a
.asm_4c3e4
bit 2, [hl]
ret z
ld a, [wde92]
ld [rNR42], a
ldh [rNR42], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
.asm_4c3f1
ld a, $8
ld [rNR42], a
ldh [rNR42], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
.asm_4c3fa
ld a, $3f
ld [rNR41], a
ldh [rNR41], a
ld a, [wde92]
ld [rNR42], a
ldh [rNR42], a
ld a, [wde93]
ld [rNR43], a
ldh [rNR43], a
ld a, $80
ld [rNR44], a
ldh [rNR44], a
ret
Func_4c40d:
@ -1128,7 +1128,7 @@ Func_4c670:
cp $4
jr nz, .asm_4c6f6
xor a
ld [rNR10], a
ldh [rNR10], a
ld [wde9a], a
.asm_4c6f6
ld hl, $0002
@ -1829,7 +1829,7 @@ Func_4cb06:
cp $0
ret nz
xor a
ld [rNR10], a
ldh [rNR10], a
ld [wde9a], a
ret

View File

@ -12,64 +12,64 @@ PlayPikachuSoundClip: ; 0x50000
di
ld b, $4
.asm_50010
ld a, [rLY]
ldh a, [rLY]
and a
jr nz, .asm_50010
dec b
jr nz, .asm_50010
xor a
ld [rNR50], a
ld [rNR51], a
ldh [rNR50], a
ldh [rNR51], a
ld a, $80
ld [rNR52], a
ldh [rNR52], a
xor a
ld [rNR30], a
ldh [rNR30], a
ld hl, wd84b
ld c, $30
ld b, $10
.asm_5002b
ld a, [$ff00+c]
ldh a, [$ff00+c]
ld [hli], a
ld a, $ff
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
dec b
jr nz, .asm_5002b
ld a, $80
ld [rNR30], a
ldh [rNR30], a
ld a, $ff
ld [rNR31], a
ldh [rNR31], a
ld a, $20
ld [rNR32], a
ldh [rNR32], a
ld a, $ff
ld [rNR33], a
ldh [rNR33], a
ld a, $87
ld [rNR34], a
ldh [rNR34], a
ld a, $77
ld [rNR50], a
ldh [rNR50], a
ld a, $44
ld [rNR51], a
ldh [rNR51], a
pop hl
call PlayPikachuPCM
xor a
ld [rNR50], a
ld [rNR51], a
ld [rNR52], a
ldh [rNR50], a
ldh [rNR51], a
ldh [rNR52], a
ld hl, wd84b
ld c, $30
ld b, $10
.asm_50062
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
dec b
jr nz, .asm_50062
ld a, $77
ld [rNR50], a
ldh [rNR50], a
ld a, $ff
ld [rNR51], a
ldh [rNR51], a
ld a, $80
ld [rNR52], a
ldh [rNR52], a
ei
ret
@ -129,7 +129,7 @@ LoadNextSoundClipSample: ; 0x51f94
and $80
srl a
srl a
ld [rNR32], a
ldh [rNR32], a
sla d
ret

View File

@ -406,7 +406,7 @@ Func_cd6c: ; 0xcd6c
call PlaySoundEffect
.asm_cdc6
xor a
ld [rRP], a
ldh [rRP], a
ld hl, wScreenState
dec [hl]
ret
@ -544,7 +544,7 @@ Func_cdce: ; 0xcdce
ret
Func_ceca: ; 0xceca
ld a, [rLY]
ldh a, [rLY]
and a
jr nz, Func_ceca
ei
@ -573,7 +573,7 @@ SendHighScores: ; 0xced1
.asm_cefa
ld b, $2
ld c, $56
ld a, [$ff00+c]
ldh a, [$ff00+c]
and b
jr z, .asm_cf09
ldh a, [hNumFramesSinceLastVBlank]

View File

@ -66,7 +66,7 @@ Func_19033: ; 0x19033
.asm_19036
call Func_19070
jr nc, .asm_19042
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
jr z, .asm_19036
ret
@ -165,7 +165,7 @@ Func_190c6: ; 0x190c6
.asm_190c9
call Func_19104
jr nc, .asm_190d5
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
jr z, .asm_190c9
ret
@ -278,7 +278,7 @@ Func_1918c: ; 0x1918c
.asm_1918f
call Func_191cb
jr nc, .asm_1919b
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
jr z, .asm_1918f
ret

View File

@ -26,11 +26,11 @@ UnusedFunc_84fd:
and a
jr z, .not_cgb
ld a, $1
ld [rVBK], a
ldh [rVBK], a
xor a
call .FillAttrsOrBGMap
xor a
ld [rVBK], a
ldh [rVBK], a
.not_cgb
ld a, $81
call .FillAttrsOrBGMap

View File

@ -139,16 +139,16 @@ CheckLeftFlipperCollision:
ld hl, wBallXPos
ld c, (hBallXPos & $ff)
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [wPreviousLeftFlipperState]
ldh [hPreviousFlipperState], a
@ -171,18 +171,18 @@ CheckRightFlipperCollision: ; 0xe226
ld a, [hli] ; Invert the ball's x position, so that the flipper collision bytes are mirrored.
sub $1
cpl
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [hli]
sbc 160
cpl
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [wPreviousRightFlipperState]
ldh [hPreviousFlipperState], a

View File

@ -3,7 +3,7 @@ InitializeCurrentStage: ; 0x8311
ld bc, $0a00
call ClearData
ld a, $1
ld [rVBK], a
ldh [rVBK], a
ld a, [wd805]
and a
jr nz, .asm_8331
@ -20,7 +20,7 @@ InitializeCurrentStage: ; 0x8311
call __memset_8
.asm_833c
xor a
ld [rVBK], a
ldh [rVBK], a
call ResetDataForStageInitialization
ld a, [wCurrentStage]
call CallInFollowingTable

View File

@ -4,12 +4,12 @@ Func_18000: ; 0x18000
ld bc, $0a00
call ClearData
ld a, $1
ld [rVBK], a
ldh [rVBK], a
hlCoord 0, 0, vBGWin
ld bc, $0400
call ClearData
xor a
ld [rVBK], a
ldh [rVBK], a
ld hl, wWhichVoltorb
ld bc, $032e
call ClearData

View File

@ -453,14 +453,14 @@ Func_282e9: ; 0x282e9
ld bc, $0200
call LoadVRAMData
ld a, $1
ld [rVBK], a
ldh [rVBK], a
ld a, BANK(PokedexBGAttributes)
ld hl, PokedexBGAttributes
ld de, vBGWin
ld bc, $0200
call LoadVRAMData
xor a
ld [rVBK], a
ldh [rVBK], a
call Func_28972
call Func_28a8a
call Func_28ad1
@ -1552,7 +1552,7 @@ Func_28a15: ; 0x28a15
inc de
inc de
hlCoord 16, 7, vBGMap
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
jr nz, .asm_28a7a
ld a, [de]
@ -1788,7 +1788,7 @@ Func_28bf5: ; 0x28bf5
.asm_28c04
push bc
ld a, $1
ld [rVBK], a
ldh [rVBK], a
ld hl, MonAnimatedPicPointers
add hl, bc
ld a, Bank(MonAnimatedPicPointers)
@ -1807,7 +1807,7 @@ Func_28bf5: ; 0x28bf5
ld bc, $0300
call LoadOrCopyVRAMData
xor a
ld [rVBK], a
ldh [rVBK], a
pop bc
push bc
ld a, [wCurPokedexIndex]
@ -2046,7 +2046,7 @@ Func_28d71: ; 0x28d71
Func_28d88: ; 0x28d88
push af
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
jr nz, .asm_28d92
pop af

View File

@ -48,12 +48,12 @@ InitSelectGameboyTargetMenu: ; 0x800a
LoadGameboyTargetMenuGfx: ; 0x8049
ld a, $1
ld [rVBK], a
ldh [rVBK], a
ld c, $ff
call FillTilesVRAM
call FillBackgroundsVRAM
xor a
ld [rVBK], a
ldh [rVBK], a
ld c, $0
call FillTilesVRAM
call FillBackgroundsVRAM

154
home.asm
View File

@ -47,33 +47,33 @@ Start: ; 0x150
ld sp, hGameBoyColorFlag
di
xor a
ld [rIF], a
ld a, [rLCDC] ; LCD Control
ldh [rIF], a
ldh a, [rLCDC] ; LCD Control
bit 7, a ; Check if LCD Display is enabled
jr nz, .LCDDisplayEnabled
set 7, a
ld [rLCDC], a
ldh [rLCDC], a
.LCDDisplayEnabled
ld bc, $0002
call SGBWait1750
.waitForVBlank
ld a, [rLY] ; LY register (LCDC Y-Coordinate)
ldh a, [rLY] ; LY register (LCDC Y-Coordinate)
cp 145 ; > 144 means V-Blank
jr c, .waitForVBlank
ld a, $81
ld [rLCDC], a ; Enable LCD Display
ldh [rLCDC], a ; Enable LCD Display
xor a
ld [rBGP], a ; Clear Palette Data
ld [rOBP0], a
ld [rOBP1], a
ldh [rBGP], a ; Clear Palette Data
ldh [rOBP0], a
ldh [rOBP1], a
ld bc, $0002
call SGBWait1750
.waitForVBlank2
ld a, [rLY] ; LY register (LCDC Y-Coordinate)
ldh a, [rLY] ; LY register (LCDC Y-Coordinate)
cp 145 ; > 144 means V-Blank
jr c, .waitForVBlank2
xor a
ld [rLCDC], a ; Disable LCD Display
ldh [rLCDC], a ; Disable LCD Display
ld hl, wc000
ld bc, $2000
call ClearData ; Clear WRAM Bank 0
@ -144,7 +144,7 @@ Start: ; 0x150
ld [wd917], a
.asm_222
ld a, $1
ld [rIE], a ; Only enable LCD Status interrupt
ldh [rIE], a ; Only enable LCD Status interrupt
ei
ld a, $ff
ld [wRNGModulus], a
@ -173,7 +173,7 @@ SoftReset:
di
ld sp, hGameBoyColorFlag
xor a
ld [rIF], a
ldh [rIF], a
ld bc, $2
call SGBWait1750
ld hl, wc000
@ -233,7 +233,7 @@ SoftReset:
ld [wd917], a
.asm_02d5
ld a, $1
ld [rIE], a
ldh [rIE], a
ei
ld a, $ff
ld [wRNGModulus], a
@ -254,42 +254,42 @@ VBlank: ; 0x2f2
push hl
call hPushSprite ; sprite DMA transfer
ldh a, [hLCDC]
ld [rLCDC], a
ldh [rLCDC], a
call Func_113a
ei
ld a, [rLY]
ldh a, [rLY]
cp $90
jr c, .asm_328
ld hl, hSTAT
ld c, rSTAT - $ff00
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
inc c
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
inc c
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
inc c
ld a, [hli] ;hWY
ld [$ff00+c], a ;into FF4A
ldh [$ff00+c], a ;into FF4A
inc c
ld a, [hli]
ld [$ff00+c], a
ldh [$ff00+c], a
.asm_328
ldh a, [hLYC]
ldh [hLastLYC], a
@ -345,13 +345,13 @@ VBlank: ; 0x2f2
ld a, $1
ld [wUpdateAudioEngineUsingTimerInterrupt], a
ld a, -68
ld [rTMA], a
ldh [rTMA], a
ld a, $0
ld [rTAC], a
ldh [rTAC], a
ld hl, rIE
set 2, [hl]
ld a, $4
ld [rTAC], a ; Timer interrupt will fire ~60 times per second
ldh [rTAC], a ; Timer interrupt will fire ~60 times per second
.skipTimerToggle
ld hl, MBC5SRamBank
ld a, [wd917]
@ -378,7 +378,7 @@ VBlank: ; 0x2f2
reti
FadeAndSoftReset:
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
jr z, .LCD_disabled
call FadeOut
@ -391,10 +391,10 @@ FadeAndSoftReset:
res 1, [hl] ; disable STAT interrupt
xor a
ld [MBC5SRamEnable], a
ld [rSB], a
ld [rSC], a
ld [rIE], a
ld [rNR52], a
ldh [rSB], a
ldh [rSC], a
ldh [rIE], a
ldh [rNR52], a
ldh a, [hGameBoyColorFlagBackup]
ldh [hGameBoyColorFlag], a
jp SoftReset
@ -455,7 +455,7 @@ Timer: ; 0x418
ld [wUpdateAudioEngineUsingTimerInterrupt], a
; disable timer
ld a, $0
ld [rTAC], a
ldh [rTAC], a
ld hl, rIE
res 2, [hl]
.skipTimer
@ -494,7 +494,7 @@ Joypad: ; 0x467
reti
DelayFrame: ; 0x468
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
ret z
ld hl, hNumFramesSinceLastVBlank
@ -595,14 +595,14 @@ BankSwitch: ; 0x54f
jp hl
DisableLCD: ; 0x576
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
ret z
ldh a, [hLCDC]
res 7, a
ldh [hLCDC], a
.asm_581
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
jr nz, .asm_581
ret
@ -613,7 +613,7 @@ EnableLCD: ; 0x588
call nz, .UpdatePals
ldh a, [hLCDC]
set 7, a
ld [rLCDC], a
ldh [rLCDC], a
ldh [hLCDC], a
ret
@ -674,15 +674,15 @@ GreyscalePalette:
RGB 0, 0, 0
VBlankIntDisable:
ld a, [rIE]
ldh a, [rIE]
res 0, a
ld [rIE], a
ldh [rIE], a
ret
VBlankIntEnable:
ld a, [rIE]
ldh a, [rIE]
set 0, a
ld [rIE], a
ldh [rIE], a
ret
WriteDMACodeToHRAM: ; 0x5f7
@ -703,7 +703,7 @@ WriteDMACodeToHRAM: ; 0x5f7
DMARoutine:
; This routine is initially loaded into hPushSprite by WriteDMACodeToHRAM.
ld a, (wSpriteBuffer >> 8)
ld [rDMA], a ; start DMA
ldh [rDMA], a ; start DMA
ld a, $28
.waitLoop ; wait for DMA to finish
dec a
@ -714,7 +714,7 @@ DMARoutine:
WaitForLCD: ; 0x60f
; Wait for LCD controller to stop reading from both OAM and VRAM because
; CPU can't access OAM, VRAM, or palette data ($ff69, $ff6b) during this time.
ld a, [rSTAT] ; LCDC Status register
ldh a, [rSTAT] ; LCDC Status register
and $3
jr nz, WaitForLCD
ld a, $a
@ -924,11 +924,11 @@ DrawBottomMessageBox: ; 0xe69
; Draws the current scrolling bottom message box to VRAM during V-Blank.
; Note, this only applies to the 1-tile high message bar. When it displays, things like Ball Bonus summary, and
; the Save/Cancel menu, this is not used to draw the message buffer.
ld a, [rLY]
ldh a, [rLY]
cp $90
jr nc, DrawBottomMessageBox ; ensure we're in V-Blank
.asm_e6f
ld a, [rSTAT]
ldh a, [rSTAT]
and $3
jr nz, .asm_e6f
ld a, $a
@ -1001,7 +1001,7 @@ Load4BottomMessageBytes: ; 0xeef
ret
Write4BottomMessageBytes: ; 0xef8
ld a, [rSTAT]
ldh a, [rSTAT]
and $3
jr nz, Write4BottomMessageBytes
ld a, b
@ -1029,7 +1029,7 @@ StatIntrTogglePinballWindow:
; gameplay.
ld hl, hLastLYC
ld c, [hl]
ld a, [rLY]
ldh a, [rLY]
cp c
jp c, StatIntrDone
inc c
@ -1047,10 +1047,10 @@ StatIntrTogglePinballWindow:
ld a, [hl]
and $3
jr nz, .waitForHBlank
ld a, [rLCDC]
ldh a, [rLCDC]
and $80 ; enable LCD display
or c
ld [rLCDC], a
ldh [rLCDC], a
jp StatIntrDone
StatIntrTogglePokedexWindow: ; 0xfea
@ -1058,7 +1058,7 @@ StatIntrTogglePokedexWindow: ; 0xfea
ldh a, [hLYCSub]
cp [hl]
jr nz, .asm_1015
ld a, [rLY]
ldh a, [rLY]
cp [hl]
jp nz, StatIntrDone
ldh a, [hLCDC]
@ -1071,16 +1071,16 @@ StatIntrTogglePokedexWindow: ; 0xfea
ld a, [hl]
and $3
jr nz, .waitForHBlank
ld a, [rLCDC]
ldh a, [rLCDC]
and $80 ; enable LCD display
or c
ld [rLCDC], a
ldh [rLCDC], a
ld a, b
ld [rSCY], a
ldh [rSCY], a
jp StatIntrDone
.asm_1015
ld a, [rLY]
ldh a, [rLY]
cp [hl]
jr nz, .asm_1037
ldh a, [hLastLYC]
@ -1096,14 +1096,14 @@ StatIntrTogglePokedexWindow: ; 0xfea
and $3
jr nz, .waitForHBlank_2
ld a, c
ld [rSCY], a
ldh [rSCY], a
ld a, b
ld [rLYC], a
ldh [rLYC], a
jp StatIntrDone
.asm_1037
ld hl, hLYCSub
ld a, [rLY]
ldh a, [rLY]
cp [hl]
jp nz, StatIntrDone
ldh a, [hLCDC]
@ -1116,17 +1116,17 @@ StatIntrTogglePokedexWindow: ; 0xfea
ld a, [hl]
and $3
jr nz, .waitForHBlank_3
ld a, [rLCDC]
ldh a, [rLCDC]
and $80
or c
ld [rLCDC], a
ldh [rLCDC], a
ld a, b
ld [rSCY], a
ldh [rSCY], a
jp StatIntrDone
StatIntrToggleHighScoresWindow:
ld hl, hLastLYC
ld a, [rLY]
ldh a, [rLY]
cp [hl]
jr z, .asm_1069
dec a
@ -1143,14 +1143,14 @@ StatIntrToggleHighScoresWindow:
and $3
jr nz, .waitForHBlank
ld a, b
ld [rSCY], a
ldh [rSCY], a
ld a, c
ld [rLYC], a
ldh [rLYC], a
jp StatIntrDone
.asm_1080
ld hl, hLYCSub
ld a, [rLY]
ldh a, [rLY]
cp [hl]
jr z, .asm_108d
dec a
@ -1165,7 +1165,7 @@ StatIntrToggleHighScoresWindow:
and $3
jr nz, .waitForHBlank_2
ld a, b
ld [rSCY], a
ldh [rSCY], a
jp StatIntrDone
StatIntrNothing2: ; 0x109e
@ -1220,11 +1220,11 @@ QueueGraphicsToLoadWithFunc: ; 0x10c5
; hl: pointer to data
; a: bank of data
push af
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
jr z, .skip_wait_ly
.wait_ly
ld a, [rLY]
ldh a, [rLY]
cp $88
jr nc, .wait_ly
.skip_wait_ly
@ -1272,16 +1272,16 @@ QueueGraphicsToLoadWithFunc: ; 0x10c5
ld [hl], e
ld hl, wd7fb
inc [hl]
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
ret nz
ld a, [rIE]
ldh a, [rIE]
push af
res 0, a
ld [rIE], a
ldh [rIE], a
call Func_113a
pop af
ld [rIE], a
ldh [rIE], a
ret
Func_1129: ; 0x1129
@ -1372,10 +1372,10 @@ LoadTileLists: ; 0x117b
LoadTileListsBank1: ; 0x118d
ld a, $1
ld [rVBK], a
ldh [rVBK], a
call LoadTileLists
xor a
ld [rVBK], a
ldh [rVBK], a
ret
Func_1198:
@ -1430,10 +1430,10 @@ Func_11b5: ; 11b5 (0:11b5)
Func_11c7:
ld a, $1
ld [rVBK], a
ldh [rVBK], a
call Func_11b5
xor a
ld [rVBK], a
ldh [rVBK], a
ret
Func_11d2:
@ -1521,7 +1521,7 @@ Func_11d2:
Func_122e:
ld a, $1
ld [rVBK], a
ldh [rVBK], a
ld h, d
ld l, e
ldh a, [hLoadedROMBank]
@ -1531,7 +1531,7 @@ Func_122e:
and a
jr nz, .asm_1240
xor a
ld [rVBK], a
ldh [rVBK], a
ret
.asm_1240

View File

@ -1,17 +1,17 @@
Func_61b: ; 0x61b
ld a, [rLY] ; LY register (LCDC Y-Coordinate)
ldh a, [rLY] ; LY register (LCDC Y-Coordinate)
cp $40
jr c, .asm_625
cp $80
jr c, .asm_63d
.asm_625
ld a, [rLY] ; LY register (LCDC Y-Coordinate)
ldh a, [rLY] ; LY register (LCDC Y-Coordinate)
cp $40
jr c, .asm_625
cp $80
jr nc, .asm_625
.asm_62f
ld a, [rSTAT]
ldh a, [rSTAT]
and $3
jr nz, .asm_62f ; wait for lcd controller to finish transferring data
ld a, $15
@ -189,7 +189,7 @@ LoadVideoData: ; 0x6a4
rr c
rl a
and $1 ; checks bit 1 of the last word in the data struct
ld [rVBK], a ; set VRAM Bank
ldh [rVBK], a ; set VRAM Bank
.copyByte
ld a, [hli]
ld [de], a
@ -199,7 +199,7 @@ LoadVideoData: ; 0x6a4
or b ; does bc = 0?
jr nz, .copyByte
xor a
ld [rVBK], a ; set VRAM Bank to Bank 0
ldh [rVBK], a ; set VRAM Bank to Bank 0
pop af
ldh [hLoadedROMBank], a
ld [MBC5RomBank], a ; reload the previous ROM Bank
@ -281,7 +281,7 @@ LoadVRAMData: ; 0x73f
.loop
call Func_61b
.waitForHBlank
ld a, [rSTAT]
ldh a, [rSTAT]
and $3
jr nz, .waitForHBlank
ld a, [hli]
@ -416,7 +416,7 @@ Func_7dc: ; 0x7dc
.asm_80e
call Func_61b
.asm_811
ld a, [rSTAT]
ldh a, [rSTAT]
and $3
jr nz, .asm_811
ld a, [hli]
@ -473,7 +473,7 @@ PutTileInVRAM: ; 0x848
call WaitForLCD
call Func_61b
.asm_84f
ld a, [rSTAT]
ldh a, [rSTAT]
and $3
jr nz, .asm_84f ; wait for lcd controller to finish transferring data
pop af
@ -485,15 +485,15 @@ Func_858: ; 0x858
call WaitForLCD
call Func_61b
.asm_85f
ld a, [rSTAT]
ldh a, [rSTAT]
and $3
jr nz, .asm_85f
ld a, $1
ld [rVBK], a
ldh [rVBK], a
pop af
ld [hl], a
xor a
ld [rVBK], a
ldh [rVBK], a
ret
LoadBillboardPaletteMap: ; 0x86f
@ -504,11 +504,11 @@ LoadBillboardPaletteMap: ; 0x86f
ldh a, [hROMBankBuffer]
ldh [hLoadedROMBank], a
ld [MBC5RomBank], a
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
jr nz, .asm_8ac
ld a, $1
ld [rVBK], a
ldh [rVBK], a
ld b, $4
.loop
push bc
@ -536,7 +536,7 @@ LoadBillboardPaletteMap: ; 0x86f
dec b
jr nz, .loop
xor a
ld [rVBK], a
ldh [rVBK], a
pop af
ldh [hLoadedROMBank], a
ld [MBC5RomBank], a
@ -586,7 +586,7 @@ Func_8e1: ; 0x8e1
ldh a, [hROMBankBuffer]
ldh [hLoadedROMBank], a
ld [MBC5RomBank], a
ld a, [rLCDC]
ldh a, [rLCDC]
bit 7, a
jr nz, .asm_902
ld a, c

View File

@ -1,6 +1,6 @@
Func_1be3: ; 0x1be3
ld a, $c0
ld [rRP], a
ldh [rRP], a
ld a, $ff
ld [wd8ea], a
xor a
@ -11,7 +11,7 @@ Func_1be3: ; 0x1be3
inc b
jr nz, .loop
ld hl, wd8eb
ld a, [rKEY1]
ldh a, [rKEY1]
bit 7, a
jr z, .normalSpeed
ld [hl], $e
@ -40,7 +40,7 @@ Func_1be3: ; 0x1be3
Func_1c1b: ; 0x1c1b
inc d
ret z
ld a, [$ff00+c]
ldh a, [$ff00+c]
bit 1, a
jr z, Func_1c1b
ret
@ -48,14 +48,14 @@ Func_1c1b: ; 0x1c1b
Func_1c23: ; 0x1c23
inc d
ret z
ld a, [$ff00+c]
ldh a, [$ff00+c]
bit 1, a
jr nz, Func_1c23
ret
Func_1c2b: ; 0x1c2b
ld a, $c1
ld [$ff00+c], a
ldh [$ff00+c], a
.asm_1c2e
dec d
jr nz, .asm_1c2e
@ -63,7 +63,7 @@ Func_1c2b: ; 0x1c2b
Func_1c32: ; 0x1c32
ld a, $c0
ld [$ff00+c], a
ldh [$ff00+c], a
.asm_1c35
dec d
jr nz, .asm_1c35
@ -77,7 +77,7 @@ Func_1c39:
.asm_1c41
ld b, $2
ld c, rRP % $100
ld a, [$ff00+c]
ldh a, [$ff00+c]
and b
jr z, Func_1c50
ldh a, [hNumFramesSinceLastVBlank]
@ -171,7 +171,7 @@ Func_1ca1: ; 0x1ca1
Func_1cef:
xor a
ld [rRP], a
ldh [rRP], a
ld a, $ff
ld [wd8ea], a
ret

View File

@ -4,28 +4,28 @@ ReadJoypad: ; 0xab8
; some registers the game uses during gameplay. It remembers the joypad state
; from the current frame, previous frame, and two frames ago.
ld a, $20
ld [rJOYP], a
ld a, [rJOYP]
ld a, [rJOYP]
ldh [rJOYP], a
ldh a, [rJOYP]
ldh a, [rJOYP]
and $f
swap a
ld b, a
ld a, $30
ld [rJOYP], a
ldh [rJOYP], a
ld a, $10
ld [rJOYP], a
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ldh [rJOYP], a
ldh a, [rJOYP]
ldh a, [rJOYP]
ldh a, [rJOYP]
ldh a, [rJOYP]
ldh a, [rJOYP]
ldh a, [rJOYP]
and $f
or b
cpl ; a contains currently-pressed buttons
ldh [hJoypadState], a
ld a, $30
ld [rJOYP], a
ldh [rJOYP], a
ldh a, [hJoypadState]
ld hl, hPreviousJoypadState
xor [hl] ; a contains buttons that are different from previous frame

View File

@ -16,14 +16,14 @@ SetAllPalettesWhite: ; 0xb66
ld c, $20
.asm_b7d
ld a, b
ld [rBGPI], a
ldh [rBGPI], a
inc b
ld a, [rBGPD]
ldh a, [rBGPD]
ld [hli], a
ld a, b
ld [rBGPI], a
ldh [rBGPI], a
inc b
ld a, [rBGPD]
ldh a, [rBGPD]
ld [hli], a
dec c
jr nz, .asm_b7d
@ -31,14 +31,14 @@ SetAllPalettesWhite: ; 0xb66
ld c, $20
.asm_b92
ld a, b
ld [rOBPI], a
ldh [rOBPI], a
inc b
ld a, [rOBPD]
ldh a, [rOBPD]
ld [hli], a
ld a, b
ld [rOBPI], a
ldh [rOBPI], a
inc b
ld a, [rOBPD]
ldh a, [rOBPD]
ld [hli], a
dec c
jr nz, .asm_b92
@ -369,16 +369,16 @@ FadeOutStep: ; 0xd11
SetFadedPalettes: ; 0d61
; Sets the current palette data to the faded palettes.
ld a, [rIE]
ldh a, [rIE]
res 0, a
ld [rIE], a
ldh [rIE], a
ld hl, wFadeBGPaletteData
ld de, rBGPI
ld a, $80
ld [de], a
inc de
.waitForVBlank
ld a, [rLY]
ldh a, [rLY]
cp $90
jr c, .waitForVBlank
ld b, $10
@ -409,9 +409,9 @@ SetFadedPalettes: ; 0d61
ld [de], a
dec b
jr nz, .loadOBJColorsLoop
ld a, [rIE]
ldh a, [rIE]
set 0, a
ld [rIE], a
ldh [rIE], a
ret
LoadCurrentPalettesIntoFadePalettes: ; 0xd9d
@ -424,27 +424,27 @@ LoadCurrentPalettesIntoFadePalettes: ; 0xd9d
.asm_da4
call Func_61b
.asm_da7
ld a, [rSTAT]
ldh a, [rSTAT]
and $3
jr nz, .asm_da7 ; wait for lcd controller to finish transferring data
ld a, b
ld [de], a
ld a, [$ff00+c]
ldh a, [$ff00+c]
ld [hli], a
inc b
ld a, b
ld [de], a
ld a, [$ff00+c]
ldh a, [$ff00+c]
ld [hli], a
inc b
ld a, b
ld [de], a
ld a, [$ff00+c]
ldh a, [$ff00+c]
ld [hli], a
inc b
ld a, b
ld [de], a
ld a, [$ff00+c]
ldh a, [$ff00+c]
ld [hli], a
inc b
nop

View File

@ -41,11 +41,11 @@ Func_1502: ; 1502 (0:1502)
ld hl, SerialTranfserData_18ff
add hl, bc
ld a, [hl]
ld [rSB], a
ldh [rSB], a
ld a, $1
ld [rSC], a
ldh [rSC], a
ld a, $81
ld [rSC], a
ldh [rSC], a
ld a, [wd8b9]
cp $2
ret nz
@ -65,10 +65,10 @@ Func_1527: ; 1527 (0:1527)
ld a, [wd8bc]
ld h, a
add hl, bc
ld a, [rSB]
ldh a, [rSB]
ld [wd8c8 + 1], a
ld a, [hl]
ld [rSB], a
ldh [rSB], a
ld l, a
ld a, [wd8c3]
add l
@ -77,9 +77,9 @@ Func_1527: ; 1527 (0:1527)
adc $0
ld [wd8c4], a
ld a, $1
ld [rSC], a
ldh [rSC], a
ld a, $81
ld [rSC], a
ldh [rSC], a
ld hl, wd8b9
inc [hl]
jr nz, .asm_1560
@ -159,24 +159,24 @@ Func_15e1: ; 15e1 (0:15e1)
ld hl, wd8c3
add hl, bc
ld a, [hl]
ld [rSB], a
ldh [rSB], a
ld a, $1
ld [rSC], a
ldh [rSC], a
ld a, $81
ld [rSC], a
ldh [rSC], a
ld hl, wd8b2
inc [hl]
ret
Func_15f8: ; 15f8 (0:15f8)
ld a, [rSB]
ldh a, [rSB]
ld [wd8c8], a
xor a
ld [rSB], a
ldh [rSB], a
ld a, $1
ld [rSC], a
ldh [rSC], a
ld a, $81
ld [rSC], a
ldh [rSC], a
ld hl, wd8c6
inc [hl]
ld a, [hl]
@ -193,7 +193,7 @@ Func_1612: ; 1612 (0:1612)
jr z, .asm_1625
ld [wd86e + 1], a
.asm_1625
ld a, [rSB]
ldh a, [rSB]
ld [wd8c7], a
cp $ff
jr nz, .asm_163a
@ -229,13 +229,13 @@ Func_165f: ; 165f (0:165f)
Func_1660:
xor a
ld [rSC], a
ldh [rSC], a
Func_1663: ; 1663 (0:1663)
ret
Func_1664:
push af
ld a, [rSC]
ldh a, [rSC]
bit 7, a
jr nz, .asm_1679
push bc
@ -273,14 +273,14 @@ Func_167b: ; 0x167b
Func_169d:
xor a
ld [rSC], a
ld [rSB], a
ldh [rSC], a
ldh [rSB], a
; fallthrough
Func_16a2: ; 0x16a2
xor a
ld [rSB], a
ld [rSC], a
ldh [rSB], a
ldh [rSC], a
ld [wd8ad], a
dec a
ld [wd8c7], a
@ -805,10 +805,10 @@ Func_19e5: ; 0x19e5
ld [wd8b9], a
ld [wd8db], a
ld a, [SerialTranfserData_18ff]
ld [rSB], a
ldh [rSB], a
ld a, $1
ld [rSC], a
ldh [rSC], a
ld a, $81
ld [rSC], a
ldh [rSC], a
ld a, $f0
ret

View File

@ -14,9 +14,9 @@ FarSendSGBPackets: ; 0x12a1
.loop
push bc
ld a, $0
ld [$ff00+c], a
ldh [$ff00+c], a
ld a, $30
ld [$ff00+c], a
ldh [$ff00+c], a
ld b, $10
.inner_loop
ld e, $8
@ -28,18 +28,18 @@ FarSendSGBPackets: ; 0x12a1
jr nz, .got_data
ld a, $20
.got_data
ld [$ff00+c], a
ldh [$ff00+c], a
ld a, $30
ld [$ff00+c], a
ldh [$ff00+c], a
rr d
dec e
jr nz, .innermost_loop
dec b
jr nz, .inner_loop
ld a, $20
ld [$ff00+c], a
ldh [$ff00+c], a
ld a, $30
ld [$ff00+c], a
ldh [$ff00+c], a
pop bc
dec b
jr z, .quit
@ -69,30 +69,30 @@ InitSGB: ; 0x12f8
ld hl, Data_38010
call FarSendSGBPackets
call SGBWait7000
ld a, [rJOYP]
ldh a, [rJOYP]
and $3
cp $3
jr nz, .asm_1346
ld a, $20
ld [rJOYP], a
ld a, [rJOYP]
ld a, [rJOYP]
ldh [rJOYP], a
ldh a, [rJOYP]
ldh a, [rJOYP]
ld a, $30
ld [rJOYP], a
ldh [rJOYP], a
ld a, $10
ld [rJOYP], a
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ldh [rJOYP], a
ldh a, [rJOYP]
ldh a, [rJOYP]
ldh a, [rJOYP]
ldh a, [rJOYP]
ldh a, [rJOYP]
ldh a, [rJOYP]
ld a, $30
ld [rJOYP], a
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ldh [rJOYP], a
ldh a, [rJOYP]
ldh a, [rJOYP]
ldh a, [rJOYP]
ldh a, [rJOYP]
and $3
cp $3
jr nz, .asm_1346
@ -121,7 +121,7 @@ FarSendSGBPacket_BGMapRows: ; 0x1353
push af
push hl
ld a, $e4
ld [rBGP], a
ldh [rBGP], a
ld de, $0010
add hl, de
ld de, vTilesSH ; tiles
@ -141,7 +141,7 @@ FarSendSGBPacket_BGMapRows: ; 0x1353
dec c
jr nz, .row
ld a, $81
ld [rLCDC], a
ldh [rLCDC], a
ld bc, $0005
call SGBWait1750
pop hl
@ -150,9 +150,9 @@ FarSendSGBPacket_BGMapRows: ; 0x1353
ld bc, $0006
call SGBWait1750
ldh a, [hBGP]
ld [rBGP], a
ldh [rBGP], a
ldh a, [hLCDC]
ld [rLCDC], a
ldh [rLCDC], a
pop af
ldh [hLoadedROMBank], a
ld [MBC5RomBank], a