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

Fix wVirtualOAM labels, part 1.

Browse Source
This commit is contained in:
luckytyphlosion 2018-01-30 14:47:14 -05:00
parent 3203ad7d50
commit 3c7ba37de7
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/battle_anims/functions.asm
View File

@ -1611,7 +1611,7 @@ Functioncd913: ; cd913 (33:5913)
ld hl, BATTLEANIMSTRUCT_10 ld hl, BATTLEANIMSTRUCT_10
add hl, bc add hl, bc
ld e, [hl] ld e, [hl]
ld hl, hPushOAM ; $ff80 ld hl, hTransferVirtualOAM ; $ff80
add hl, de add hl, de
ld e, l ld e, l
ld d, h ld d, h
@ -2104,7 +2104,7 @@ asm_cdbfa: ; cdbfa (33:5bfa)
ld hl, BATTLEANIMSTRUCT_0F ld hl, BATTLEANIMSTRUCT_0F
add hl, bc add hl, bc
ld e, [hl] ld e, [hl]
ld hl, hPushOAM ; $ff80 ld hl, hTransferVirtualOAM ; $ff80
add hl, de add hl, de
ld e, l ld e, l
ld d, h ld d, h
@ -3332,7 +3332,7 @@ Functionce306: ; ce306 (33:6306)
ld hl, BATTLEANIMSTRUCT_0F ld hl, BATTLEANIMSTRUCT_0F
add hl, bc add hl, bc
ld e, [hl] ld e, [hl]
ld hl, hPushOAM ; $ff80 ld hl, hTransferVirtualOAM ; $ff80
add hl, de add hl, de
ld e, l ld e, l
ld d, h ld d, h

4
engine/routines/loadpushoam.asm
View File

@ -1,5 +1,5 @@
LoadPushOAM:: ; 4031 WriteOAMDMACodeToHRAM:: ; 4031
ld c, hPushOAM - $ff00 ld c, hTransferVirtualOAM - $ff00
ld b, .PushOAMEnd - .PushOAM ld b, .PushOAMEnd - .PushOAM
ld hl, .PushOAM ld hl, .PushOAM
.loop .loop

4
home/init.asm
View File

@ -103,10 +103,10 @@ Init:: ; 17d
call ClearsScratch call ClearsScratch
ld a, BANK(LoadPushOAM) ld a, BANK(WriteOAMDMACodeToHRAM)
rst Bankswitch rst Bankswitch
call LoadPushOAM call WriteOAMDMACodeToHRAM
xor a xor a
ld [hMapAnims], a ld [hMapAnims], a

8
home/vblank.asm
View File

@ -113,7 +113,7 @@ VBlank0:: ; 2b1
ld a, [hOAMUpdate] ld a, [hOAMUpdate]
and a and a
jr nz, .done_oam jr nz, .done_oam
call hPushOAM call hTransferVirtualOAM
.done_oam .done_oam
@ -192,7 +192,7 @@ VBlank1:: ; 337
call UpdateBGMap call UpdateBGMap
call Serve2bppRequest_VBlank call Serve2bppRequest_VBlank
call hPushOAM call hTransferVirtualOAM
.done .done
xor a xor a
@ -282,7 +282,7 @@ VBlank3:: ; 396
call UpdateBGMap call UpdateBGMap
call Serve2bppRequest_VBlank call Serve2bppRequest_VBlank
call hPushOAM call hTransferVirtualOAM
.done .done
xor a xor a
@ -338,7 +338,7 @@ VBlank4:: ; 3df
call UpdateBGMap call UpdateBGMap
call Serve2bppRequest call Serve2bppRequest
call hPushOAM call hTransferVirtualOAM
call Joypad call Joypad

2
hram.asm
View File

@ -2,7 +2,7 @@
; "ld a, [hAddress]" and "ld [hAddress], a" will ; "ld a, [hAddress]" and "ld [hAddress], a" will
; use the more efficient "ldh" instruction. ; use the more efficient "ldh" instruction.
hPushOAM EQU $ff80 ; 10 bytes hTransferVirtualOAM EQU $ff80 ; 10 bytes
hROMBankBackup EQU $ff8a hROMBankBackup EQU $ff8a
hBuffer EQU $ff8b hBuffer EQU $ff8b