ref: 6af65df2fcc0b8018f3e9e81de25a76425ff0c3e
parent: 323895af6dada7e1949ff79855970f75ad4b65b2
author: YamaArashi <shadow962@live.com>
date: Thu Jul 23 17:00:30 EDT 2015
named function
--- a/engine/predefs.asm
+++ b/engine/predefs.asm
@@ -149,5 +149,5 @@
add_predef LoadMovePPs
add_predef DrawHP ; 5F
add_predef DrawHP2
- add_predef Func_1c9c6
+ add_predef DisplayElevatorFloorMenu
add_predef OaksAideScript
--- a/engine/predefs7.asm
+++ b/engine/predefs7.asm
@@ -1,4 +1,4 @@
-Func_1c9c6: ; 1c9c6 (7:49c6)
+DisplayElevatorFloorMenu: ; 1c9c6 (7:49c6)
ld hl, WhichFloorText
call PrintText
ld hl, wItemList
@@ -12,7 +12,7 @@
ld [wCurrentMenuItem], a
ld [wListScrollOffset], a
ld [wPrintItemPrices], a
- ld a, $4
+ ld a, SPECIALLISTMENU
ld [wListMenuID], a
call DisplayListMenuID
pop bc
@@ -24,7 +24,7 @@
ld hl, wcc5b
ld a, [wWhichPokemon]
add a
- ld d, $0
+ ld d, 0
ld e, a
add hl, de
ld a, [hli]
@@ -32,15 +32,15 @@
ld a, [hl]
ld c, a
ld hl, wWarpEntries
- call Func_1ca0d
+ call .UpdateWarp
-Func_1ca0d: ; 1ca0d (7:4a0d)
+.UpdateWarp
inc hl
inc hl
ld a, b
- ld [hli], a
+ ld [hli], a ; destination warp ID
ld a, c
- ld [hli], a
+ ld [hli], a ; destination map ID
ret
WhichFloorText: ; 1ca14 (7:4a14)
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/celadonmartelevator.asm
@@ -64,5 +64,5 @@
TX_ASM
call CeladonMartElevatorScript_48631
ld hl, CeldaonMartElevatorWarpMaps
- predef Func_1c9c6
+ predef DisplayElevatorFloorMenu
jp TextScriptEnd
--- a/scripts/rockethideoutelevator.asm
+++ b/scripts/rockethideoutelevator.asm
@@ -68,7 +68,7 @@
jr z, .asm_45782
call RocketHideoutElevatorScript_45741
ld hl, RocketHideoutElevatorWarpMaps
- predef Func_1c9c6
+ predef DisplayElevatorFloorMenu
jr .asm_45788
.asm_45782
ld hl, RocketHideoutElevatorText_4578b
--- a/scripts/silphcoelevator.asm
+++ b/scripts/silphcoelevator.asm
@@ -73,5 +73,5 @@
TX_ASM
call SilphCoElevatorScript_457f1
ld hl, SilphCoElevatorWarpMaps
- predef Func_1c9c6
+ predef DisplayElevatorFloorMenu
jp TextScriptEnd