diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/intro_menu.asm | 4 | ||||
| -rwxr-xr-x | engine/items.asm | 2 | ||||
| -rw-r--r-- | engine/scripting.asm | 4 | ||||
| -rwxr-xr-x | engine/selectmenu.asm | 2 | ||||
| -rw-r--r-- | engine/spawn_points.asm | 4 | ||||
| -rwxr-xr-x | engine/startmenu.asm | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 2da478ede..c576e4526 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -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 diff --git a/engine/items.asm b/engine/items.asm index 81c080dda..0124489e5 100755 --- a/engine/items.asm +++ b/engine/items.asm @@ -331,7 +331,7 @@ ReceiveKeyItem: ; d35a ret TossKeyItem: ; d374 - ld a, [wd107] + ld a, [CurItemQuantity] ld e, a ld d, 0 ld hl, NumKeyItems diff --git a/engine/scripting.asm b/engine/scripting.asm index b5fb027ab..3ff22599b 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -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 diff --git a/engine/selectmenu.asm b/engine/selectmenu.asm index 838438a4c..5d3b5ff0a 100755 --- a/engine/selectmenu.asm +++ b/engine/selectmenu.asm @@ -94,7 +94,7 @@ CheckRegisteredItem: ; 13345 dec a cp [hl] jr nc, .NotEnoughItems - ld [wd107], a + ld [CurItemQuantity], a and a ret diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm index 69b91446e..8dda255a1 100644 --- a/engine/spawn_points.asm +++ b/engine/spawn_points.asm @@ -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 diff --git a/engine/startmenu.asm b/engine/startmenu.asm index 32999cacb..2a567bf4f 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -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 |