$ffd1 $ffd2 -> hWX hWY

This commit is contained in:
yenatch 2013-08-19 18:42:26 -04:00
parent 084083add0
commit 449bda272a
2 changed files with 32 additions and 32 deletions

View File

@ -92,10 +92,10 @@ VBlank0: ; 2b1
ld a, [$ffd0] ld a, [$ffd0]
ld [rSCY], a ld [rSCY], a
; window y ; window y
ld a, [$ffd2] ld a, [hWY]
ld [rWY], a ld [rWY], a
; window x + 7 ; window x + 7
ld a, [$ffd1] ld a, [hWX]
ld [rWX], a ld [rWX], a
; some time management is in order ; some time management is in order

View File

@ -159,10 +159,10 @@ Init: ; 17d
ld a, $8 ld a, $8
ld [rSTAT], a ld [rSTAT], a
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
ld [rWY], a ld [rWY], a
ld a, $7 ld a, $7
ld [$ffd1], a ld [hWX], a
ld [rWX], a ld [rWX], a
ld a, $e3 ld a, $e3
ld [rLCDC], a ld [rLCDC], a
@ -8966,7 +8966,7 @@ Function2de2: ; 2de2
ld [hBGMapMode], a ld [hBGMapMode], a
call Function2e31 call Function2e31
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
call Functione4a call Functione4a
ld a, $2e ld a, $2e
ld hl, $4000 ld hl, $4000
@ -17849,17 +17849,17 @@ IntroFadePalettes: ; 0x617c
Function6182: ; 6182 Function6182: ; 6182
ld a, $77 ld a, $77
ld [$ffd1], a ld [hWX], a
call DelayFrame call DelayFrame
ld a, $e4 ld a, $e4
call DmgToCgbBGPals call DmgToCgbBGPals
.asm_618e .asm_618e
call DelayFrame call DelayFrame
ld a, [$ffd1] ld a, [hWX]
sub $8 sub $8
cp $ff cp $ff
ret z ret z
ld [$ffd1], a ld [hWX], a
jr .asm_618e jr .asm_618e
; 619c ; 619c
@ -17964,9 +17964,9 @@ Function620b: ; 620b
ld [$ffcf], a ld [$ffcf], a
ld [$ffd0], a ld [$ffd0], a
ld a, $7 ld a, $7
ld [$ffd1], a ld [hWX], a
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
ld b, $8 ld b, $8
call GetSGBLayout call GetSGBLayout
call Function485 call Function485
@ -18101,7 +18101,7 @@ TitleScreenEntrance: ; 62bc
call StartMusic call StartMusic
ld a, $88 ld a, $88
ld [$ffd2], a ld [hWY], a
ret ret
; 62f6 ; 62f6
@ -18295,7 +18295,7 @@ Function642e: ; 642e
ld [$ffcf], a ld [$ffcf], a
ld [$ffd0], a ld [$ffd0], a
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
call WaitBGMap call WaitBGMap
jp Function620b jp Function620b
; 6454 ; 6454
@ -18325,7 +18325,7 @@ Function6473: ; 6473
ld [hLCDStatCustom], a ld [hLCDStatCustom], a
ld [hBGMapMode], a ld [hBGMapMode], a
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
call Function2173 call Function2173
ld a, $9c ld a, $9c
call Function64b9 call Function64b9
@ -18340,7 +18340,7 @@ Function6473: ; 6473
ld [hCGBPalUpdate], a ld [hCGBPalUpdate], a
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld [$ffd2], a ld [hWY], a
ld a, $1 ld a, $1
ld hl, $64db ld hl, $64db
rst FarCall rst FarCall
@ -18378,7 +18378,7 @@ Function64bf: ; 64bf
Function64cd: ; 64cd Function64cd: ; 64cd
call Functione5f call Functione5f
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
call Function2e31 call Function2e31
call $0e51 call $0e51
ret ret
@ -26467,7 +26467,7 @@ Function11c51: ; 11c51
ld [hBGMapMode], a ld [hBGMapMode], a
ld [PlayerEvaLevel], a ld [PlayerEvaLevel], a
ld a, $7 ld a, $7
ld [$ffd1], a ld [hWX], a
ret ret
; 11cb7 ; 11cb7
@ -37949,7 +37949,7 @@ Function2ee2f: ; 2ee2f
call ClearTileMap call ClearTileMap
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld [$ffd2], a ld [hWY], a
ld [rWY], a ld [rWY], a
ld [$ffde], a ld [$ffde], a
ret ret
@ -48347,7 +48347,7 @@ Function3fb6c: ; 3fb6c
ld [$ffde], a ld [$ffde], a
ld [$ffd0], a ld [$ffd0], a
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
ld [rWY], a ld [rWY], a
call WaitBGMap call WaitBGMap
xor a xor a
@ -48364,7 +48364,7 @@ Function3fb6c: ; 3fb6c
ld a, $13 ld a, $13
call Predef call Predef
xor a xor a
ld [$ffd2], a ld [hWY], a
ld [rWY], a ld [rWY], a
call WaitBGMap call WaitBGMap
call HideSprites call HideSprites
@ -48372,7 +48372,7 @@ Function3fb6c: ; 3fb6c
call GetSGBLayout call GetSGBLayout
call Function32f9 call Function32f9
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
xor a xor a
ld [$ffcf], a ld [$ffcf], a
ret ret
@ -48606,9 +48606,9 @@ INCLUDE "battle/effect_command_pointers.asm"
SECTION "bank10",DATA,BANK[$10] SECTION "bank10",DATA,BANK[$10]
Function40000: ; 40000 Function40000: ; 40000
ld a, [$ffd1] ld a, [hWX]
ld l, a ld l, a
ld a, [$ffd2] ld a, [hWY]
ld h, a ld h, a
push hl push hl
ld a, [$ffcf] ld a, [$ffcf]
@ -48655,9 +48655,9 @@ Function40000: ; 40000
ld [$ffcf], a ld [$ffcf], a
pop hl pop hl
ld a, l ld a, l
ld [$ffd1], a ld [hWX], a
ld a, h ld a, h
ld [$ffd2], a ld [hWY], a
ret ret
; 40063 ; 40063
@ -60350,7 +60350,7 @@ Function91af3: ; 91af3
ld [$ffaa], a ld [$ffaa], a
call WhiteBGMap call WhiteBGMap
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
xor a xor a
ld [hBGMapAddress], a ld [hBGMapAddress], a
ld a, $98 ld a, $98
@ -64264,7 +64264,7 @@ Functionb800a: ; b800a
ld [$c2d8], a ld [$c2d8], a
ld a, $90 ld a, $90
ld [rWY], a ld [rWY], a
ld [$ffd2], a ld [hWY], a
xor a xor a
ld [hLCDStatCustom], a ld [hLCDStatCustom], a
ret ret
@ -66974,7 +66974,7 @@ Functione4579: ; e4579
ld [$ffcf], a ld [$ffcf], a
ld [$ffd0], a ld [$ffd0], a
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
call WaitBGMap call WaitBGMap
ld b, $19 ld b, $19
call GetSGBLayout call GetSGBLayout
@ -67065,7 +67065,7 @@ Functione45e8: ; e45e8
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
ld de, $e4e4 ld de, $e4e4
call DmgToCgbObjPals call DmgToCgbObjPals
ret ret
@ -67132,9 +67132,9 @@ Functione48ac: ; e48ac
ld [$ffcf], a ld [$ffcf], a
ld [$ffd0], a ld [$ffd0], a
ld a, $7 ld a, $7
ld [$ffd1], a ld [hWX], a
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
pop af pop af
ld [$ff9e], a ld [$ff9e], a
pop af pop af
@ -72335,9 +72335,9 @@ StartTitleScreen: ; 10ed67
ld a, $8 ld a, $8
ld [$ffd0], a ld [$ffd0], a
ld a, $7 ld a, $7
ld [$ffd1], a ld [hWX], a
ld a, $90 ld a, $90
ld [$ffd2], a ld [hWY], a
ld a, $1 ld a, $1
ld [hCGBPalUpdate], a ld [hCGBPalUpdate], a