diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-04 14:02:11 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-04 14:02:11 -0500 |
| commit | cf5d726b7f00633acad3cdf0c25178bde5fc14fb (patch) | |
| tree | 5d9f14a2f93b4ff09e264f7352920efcb3a01127 /event | |
| parent | 94c720832a577be03a471de6db27eba09a96e946 (diff) | |
Mon submenu, engine/menu.asm
Diffstat (limited to 'event')
| -rw-r--r-- | event/buena.asm | 4 | ||||
| -rw-r--r-- | event/kurt.asm | 4 | ||||
| -rw-r--r-- | event/mom.asm | 2 | ||||
| -rw-r--r-- | event/move_deleter.asm | 2 | ||||
| -rw-r--r-- | event/unown.asm | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/event/buena.asm b/event/buena.asm index 8ae1094c8..0fabb81ac 100644 --- a/event/buena.asm +++ b/event/buena.asm @@ -201,7 +201,7 @@ Function8b09e: ; 8b09e ld [hBGMapMode], a ld hl, MenuDataHeader_0x8b0d1 call CopyMenuDataHeader - call Function1cbb + call MenuBox call UpdateSprites call GetMemTileCoord ld bc, $0015 @@ -255,7 +255,7 @@ Function8b0e2: ; 8b0e2 call Function350c ld a, [MenuSelection] ld c, a - ld a, [wcfa9] + ld a, [MenuSelection2] ld [MenuSelection], a ld a, [wcf73] cp $2 diff --git a/event/kurt.asm b/event/kurt.asm index 4924fdf6a..bf46fae11 100644 --- a/event/kurt.asm +++ b/event/kurt.asm @@ -40,7 +40,7 @@ Special_SelectApricornForKurt: ; 88018 and a jr z, .done ld [CurItem], a - ld a, [wcfa9] + ld a, [MenuSelection2] ld c, a push bc call Kurt_PrintTextHowMany @@ -135,7 +135,7 @@ Kurt_SelectQuantity: ; 880c2 .loop xor a ld [hBGMapMode], a - call Function1cbb + call MenuBox call UpdateSprites call .PlaceApricornName call PlaceApricornQuantity diff --git a/event/mom.asm b/event/mom.asm index c6bf0da52..9f8c5d543 100644 --- a/event/mom.asm +++ b/event/mom.asm @@ -109,7 +109,7 @@ endr call InterpretMenu2 call WriteBackup jr c, .cancel - ld a, [wcfa9] + ld a, [MenuSelection2] cp $1 jr z, .withdraw cp $2 diff --git a/event/move_deleter.asm b/event/move_deleter.asm index c9ec76345..98391edcb 100644 --- a/event/move_deleter.asm +++ b/event/move_deleter.asm @@ -25,7 +25,7 @@ MoveDeletion: call Function2b74 pop af jr c, .asm_2c5c3 - ld a, [wcfa9] + ld a, [MenuSelection2] push af ld a, [CurSpecies] ld [wd265], a diff --git a/event/unown.asm b/event/unown.asm index b39eba371..ef4dc0eaf 100644 --- a/event/unown.asm +++ b/event/unown.asm @@ -122,7 +122,7 @@ Special_DisplayUnownWords: ; 8ae68 call LoadMenuDataHeader xor a ld [hBGMapMode], a - call Function1cbb + call MenuBox call UpdateSprites call Function321c call GetMemTileCoord |