diff options
Diffstat (limited to 'engine/overworld/scripting.asm')
| -rw-r--r-- | engine/overworld/scripting.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 0ca066f3..b72b6099 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -137,7 +137,7 @@ ScriptCommandTable: dw Script_opentext ; 47 dw Script_refreshscreen ; 48 dw Script_closetext ; 49 - dw Script_writeunusedbytebuffer ; 4a + dw Script_writeunusedbyte ; 4a dw Script_farwritetext ; 4b dw Script_writetext ; 4c dw Script_repeattext ; 4d @@ -415,7 +415,7 @@ Script__2dmenu: ld a, [wScriptBank] ld hl, _2DMenu rst FarCall - ld a, [wMenuCursorBuffer] + ld a, [wMenuCursorPosition] jr nc, .ok xor a .ok @@ -472,7 +472,7 @@ Script_pocketisfull: Script_specialsound: farcall CheckItemPocket - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] cp TM_HM ld de, SFX_GET_TM jr z, .play @@ -484,7 +484,7 @@ Script_specialsound: GetPocketName: farcall CheckItemPocket - ld a, [wItemAttributeParamBuffer] + ld a, [wItemAttributeValue] dec a ld hl, ItemPocketNames maskbits NUM_POCKETS @@ -503,7 +503,7 @@ INCLUDE "data/items/pocket_names.asm" CurItemName: ld a, [wCurItem] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName ret @@ -1483,7 +1483,7 @@ Script_getmonname: jr nz, .gotit ld a, [wScriptVar] .gotit - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld de, wStringBuffer1 @@ -1507,7 +1507,7 @@ Script_getitemname: jr nz, .ok ld a, [wScriptVar] .ok - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetItemName ld de, wStringBuffer1 jr GetStringBuffer @@ -1612,7 +1612,7 @@ Script_giveitem: .ok ld [wCurItem], a call GetScriptByte - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld hl, wNumItems call ReceiveItem jr nc, .full @@ -1630,7 +1630,7 @@ Script_takeitem: call GetScriptByte ld [wCurItem], a call GetScriptByte - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld a, -1 ld [wCurItemQuantity], a ld hl, wNumItems @@ -2082,9 +2082,9 @@ Script_refreshscreen: call GetScriptByte ret -Script_writeunusedbytebuffer: +Script_writeunusedbyte: call GetScriptByte - ld [wUnusedScriptByteBuffer], a + ld [wUnusedScriptByte], a ret UnusedClosetextScript: ; unreferenced |