Further WRAM organization

This commit is contained in:
Remy Oukaour
2017-12-09 15:14:51 -05:00
parent 5a5df2ab87
commit e3c686f6df
13 changed files with 211 additions and 323 deletions

View File

@@ -111,8 +111,8 @@ _ResetWRAM: ; 5bae
xor a
call ByteFill
ld hl, wd000
ld bc, wGameData - wd000
ld hl, wRAM1Start
ld bc, wGameData - wRAM1Start
xor a
call ByteFill

View File

@@ -331,7 +331,7 @@ ReceiveKeyItem: ; d35a
ret
TossKeyItem: ; d374
ld a, [wd107]
ld a, [CurItemQuantity]
ld e, a
ld d, 0
ld hl, NumKeyItems

View File

@@ -2668,7 +2668,7 @@ Script_warp:
call GetScriptByte
ld [YCoord], a
ld a, -1
ld [wd001], a
ld [DefaultSpawnpoint], a
ld a, MAPSETUP_WARP
ld [hMapEntryMethod], a
ld a, 1
@@ -2681,7 +2681,7 @@ Script_warp:
call GetScriptByte
call GetScriptByte
ld a, -1
ld [wd001], a
ld [DefaultSpawnpoint], a
ld a, MAPSETUP_BADWARP
ld [hMapEntryMethod], a
ld a, 1

View File

@@ -94,7 +94,7 @@ CheckRegisteredItem: ; 13345
dec a
cp [hl]
jr nc, .NotEnoughItems
ld [wd107], a
ld [CurItemQuantity], a
and a
ret

View File

@@ -42,10 +42,10 @@ ENDM
LoadSpawnPoint: ; 1531f
; loads the spawn point in wd001
; loads the spawn point in DefaultSpawnpoint
push hl
push de
ld a, [wd001]
ld a, [DefaultSpawnpoint]
cp SPAWN_N_A
jr z, .spawn_n_a
ld l, a

View File

@@ -614,7 +614,7 @@ TossItemFromPC: ; 129f4
pop af
jr c, .quit
pop hl
ld a, [wd107]
ld a, [CurItemQuantity]
call TossItem
call PartyMonItemName
ld hl, .TossedThisMany