summaryrefslogtreecommitdiff
path: root/event
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-10-24 19:49:19 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-10-24 19:49:19 -0400
commit4d17f6e1f6d41b91f5a5de71984a7c6f2bd0041c (patch)
treef0e965465c782622f47a9394a03f25836c76f71a /event
parent69ee070021bfbc36cf30df446c802f3648b3d5fe (diff)
Address comments on PR 322
Diffstat (limited to 'event')
-rw-r--r--event/buena.asm2
-rw-r--r--event/kurt.asm2
-rw-r--r--event/mom.asm24
3 files changed, 14 insertions, 14 deletions
diff --git a/event/buena.asm b/event/buena.asm
index 038aea293..ada0002d6 100644
--- a/event/buena.asm
+++ b/event/buena.asm
@@ -247,7 +247,7 @@ Function8b0e2: ; 8b0e2
ld hl, .MenuDataHeader
call CopyMenuDataHeader
ld a, [MenuSelection]
- ld [wPocketPointerLocationBuffer], a
+ ld [wPocketCursorBuffer], a
xor a
ld [wcf76], a
ld [hBGMapMode], a
diff --git a/event/kurt.asm b/event/kurt.asm
index 9d53c4620..98c276e52 100644
--- a/event/kurt.asm
+++ b/event/kurt.asm
@@ -62,7 +62,7 @@ Kurt_SelectApricorn: ; 88055
ld hl, .MenuDataHeader
call CopyMenuDataHeader
ld a, [MenuSelection]
- ld [wPocketPointerLocationBuffer], a
+ ld [wPocketCursorBuffer], a
xor a
ld [hBGMapMode], a
call Function352f
diff --git a/event/mom.asm b/event/mom.asm
index 29d88e8f5..c3e407be3 100644
--- a/event/mom.asm
+++ b/event/mom.asm
@@ -4,9 +4,9 @@ Special_BankOfMom: ; 16218
ld a, $1
ld [hInMenu], a
xor a
- ld [wJumptableEntryIndexBuffer], a
+ ld [wJumptableIndex], a
.asm_16223
- ld a, [wJumptableEntryIndexBuffer]
+ ld a, [wJumptableIndex]
bit 7, a
jr nz, .asm_1622f
call Function16233
@@ -19,7 +19,7 @@ Special_BankOfMom: ; 16218
; 16233
Function16233: ; 16233
- ld a, [wJumptableEntryIndexBuffer]
+ ld a, [wJumptableIndex]
ld e, a
ld d, 0
ld hl, .jumptable
@@ -57,7 +57,7 @@ endr
ld a, $2
.done_0
- ld [wJumptableEntryIndexBuffer], a
+ ld [wJumptableIndex], a
ret
; 1626a
@@ -79,7 +79,7 @@ endr
ld hl, UnknownText_0x16653
call PrintText
ld a, $8
- ld [wJumptableEntryIndexBuffer], a
+ ld [wJumptableIndex], a
ret
; 16290
@@ -96,7 +96,7 @@ endr
ld a, $7
.done_2
- ld [wJumptableEntryIndexBuffer], a
+ ld [wJumptableIndex], a
ret
; 162a8
@@ -133,7 +133,7 @@ endr
ld a, $6
.done_3
- ld [wJumptableEntryIndexBuffer], a
+ ld [wJumptableIndex], a
ret
; 162e0
@@ -201,7 +201,7 @@ endr
ld a, $7
.done_4
- ld [wJumptableEntryIndexBuffer], a
+ ld [wJumptableIndex], a
ret
; 16373
@@ -269,7 +269,7 @@ endr
ld a, $7
.done_5
- ld [wJumptableEntryIndexBuffer], a
+ ld [wJumptableIndex], a
ret
; 16406
@@ -283,14 +283,14 @@ endr
ld hl, UnknownText_0x16685
call PrintText
ld a, $8
- ld [wJumptableEntryIndexBuffer], a
+ ld [wJumptableIndex], a
ret
.StopSavingMoney
ld a, $80
ld [wBankOfMomMode], a
ld a, $7
- ld [wJumptableEntryIndexBuffer], a
+ ld [wJumptableIndex], a
ret
; 1642d
@@ -299,7 +299,7 @@ endr
call PrintText
.JustDoWhatYouCan: ; 16433
- ld hl, wJumptableEntryIndexBuffer
+ ld hl, wJumptableIndex
set 7, [hl]
ret
; 16439