soft reset

This commit is contained in:
PikalaxALT
2015-10-04 14:14:51 -04:00
parent 726c4bc1d6
commit 2770cfc354
19 changed files with 716 additions and 663 deletions

View File

@@ -186,8 +186,8 @@ SpecialsPointers:: ; c029
add_special Function4ae12
add_special LoadMapPalettes
add_special Function4a927
add_special Function90a54
add_special Function90a88
add_special Special_InitialSetDSTFlag
add_special Special_InitialClearDSTFlag
add_special SpecialNone
; c224
@@ -314,9 +314,9 @@ Special_KrissHousePC: ; c2e7
; c2f6
Special_CheckMysteryGift: ; c2f6
ld a, BANK(s0_abe2)
ld a, BANK(sMysteryGiftItem)
call GetSRAMBank
ld a, [s0_abe2]
ld a, [sMysteryGiftItem]
and a
jr z, .no
inc a
@@ -328,9 +328,9 @@ Special_CheckMysteryGift: ; c2f6
; c309
Special_GetMysteryGiftItem: ; c309
ld a, BANK(s0_abe2)
ld a, BANK(sMysteryGiftItem)
call GetSRAMBank
ld a, [s0_abe2]
ld a, [sMysteryGiftItem]
ld [CurItem], a
ld a, $1
ld [wd10c], a
@@ -338,12 +338,12 @@ Special_GetMysteryGiftItem: ; c309
call ReceiveItem
jr nc, .asm_c33d
xor a
ld [s0_abe2], a
ld [sMysteryGiftItem], a
call CloseSRAM
ld a, [CurItem]
ld [wd265], a
call GetItemName
ld hl, UnknownText_0xc345
ld hl, .ReceiveItemText
call PrintText
ld a, $1
ld [ScriptVar], a
@@ -356,7 +356,7 @@ Special_GetMysteryGiftItem: ; c309
ret
; c345
UnknownText_0xc345: ; 0xc345
.ReceiveItemText: ; 0xc345
; received item
text_jump UnknownText_0x1bd3be
db "@"
@@ -639,8 +639,8 @@ Functionc4ac: ; c4ac
; c4b9
SpecialTrainerHouse: ; 0xc4b9
ld a, BANK(s0_abfd)
ld a, BANK(sMysteryGiftTrainerHouseFlag)
call GetSRAMBank
ld a, [s0_abfd]
ld a, [sMysteryGiftTrainerHouseFlag]
ld [ScriptVar], a
jp CloseSRAM

View File

@@ -297,21 +297,21 @@ Function11548: ; 11548
; 11586
Function11586: ; 11586
cp $ff
jr z, .asm_11595
cp -1
jr z, .skip
ld c, a
ld a, [hl]
sub c
jr nc, .asm_11590
jr nc, .ok
xor a
.asm_11590
.ok
ld [hl], a
jr z, .asm_11595
jr z, .skip
xor a
ret
.asm_11595
.skip
xor a
ld [hl], a
scf