More sScratch.

This commit is contained in:
yenatch 2015-08-20 23:00:59 -07:00
parent 70f9c27aac
commit a0aadb33e7
3 changed files with 13 additions and 13 deletions

View File

@ -1075,7 +1075,7 @@ GetMinimizePic: ; cc6e7 (33:46e7)
and a and a
jr z, .player jr z, .player
ld de, $a1a0 ld de, sScratch + $1a0
call CopyMinimizePic call CopyMinimizePic
ld hl, $9000 ld hl, $9000
ld de, sScratch ld de, sScratch
@ -1083,7 +1083,7 @@ GetMinimizePic: ; cc6e7 (33:46e7)
ret ret
.player .player
ld de, $a160 ld de, sScratch + $160
call CopyMinimizePic call CopyMinimizePic
ld hl, $9310 ld hl, $9310
ld de, sScratch ld de, sScratch

View File

@ -2543,17 +2543,17 @@ Function41a24: ; 41a24
; 41a2c ; 41a2c
Function41a2c: ; 41a2c Function41a2c: ; 41a2c
ld a, $0 ld a, BANK(sScratch)
call GetSRAMBank call GetSRAMBank
ld hl, UnownFont ld hl, UnownFont
ld de, $a188 ld de, sScratch + $188
ld bc, $270 ld bc, $270
ld a, BANK(UnownFont) ld a, BANK(UnownFont)
call FarCopyBytes call FarCopyBytes
ld hl, $a188 ld hl, sScratch + $188
ld bc, $1b0 ld bc, $1b0
call Function41504 call Function41504
ld de, $a188 ld de, sScratch + $188
ld hl, $9400 ld hl, $9400
lb bc, BANK(Function41a2c), $1b lb bc, BANK(Function41a2c), $1b
call Request2bpp call Request2bpp

View File

@ -314,9 +314,9 @@ Special_KrissHousePC: ; c2e7
; c2f6 ; c2f6
Special_CheckMysteryGift: ; c2f6 Special_CheckMysteryGift: ; c2f6
ld a, $0 ld a, BANK(s0_abe2)
call GetSRAMBank call GetSRAMBank
ld a, [$abe2] ld a, [s0_abe2]
and a and a
jr z, .no jr z, .no
inc a inc a
@ -328,9 +328,9 @@ Special_CheckMysteryGift: ; c2f6
; c309 ; c309
Special_GetMysteryGiftItem: ; c309 Special_GetMysteryGiftItem: ; c309
ld a, $0 ld a, BANK(s0_abe2)
call GetSRAMBank call GetSRAMBank
ld a, [$abe2] ld a, [s0_abe2]
ld [CurItem], a ld [CurItem], a
ld a, $1 ld a, $1
ld [wd10c], a ld [wd10c], a
@ -338,7 +338,7 @@ Special_GetMysteryGiftItem: ; c309
call ReceiveItem call ReceiveItem
jr nc, .asm_c33d jr nc, .asm_c33d
xor a xor a
ld [$abe2], a ld [s0_abe2], a
call CloseSRAM call CloseSRAM
ld a, [CurItem] ld a, [CurItem]
ld [wd265], a ld [wd265], a
@ -639,8 +639,8 @@ Functionc4ac: ; c4ac
; c4b9 ; c4b9
SpecialTrainerHouse: ; 0xc4b9 SpecialTrainerHouse: ; 0xc4b9
ld a, 0 ld a, BANK(s0_abfd)
call GetSRAMBank call GetSRAMBank
ld a, [$abfd] ; XXX what is this memory location? ld a, [s0_abfd]
ld [ScriptVar], a ld [ScriptVar], a
jp CloseSRAM jp CloseSRAM