named function

This commit is contained in:
YamaArashi 2015-07-23 21:00:30 -07:00
parent 323895af6d
commit 6af65df2fc
5 changed files with 11 additions and 11 deletions

View file

@ -149,5 +149,5 @@ PredefPointers:: ; 4fe79 (13:7e79)
add_predef LoadMovePPs add_predef LoadMovePPs
add_predef DrawHP ; 5F add_predef DrawHP ; 5F
add_predef DrawHP2 add_predef DrawHP2
add_predef Func_1c9c6 add_predef DisplayElevatorFloorMenu
add_predef OaksAideScript add_predef OaksAideScript

View file

@ -1,4 +1,4 @@
Func_1c9c6: ; 1c9c6 (7:49c6) DisplayElevatorFloorMenu: ; 1c9c6 (7:49c6)
ld hl, WhichFloorText ld hl, WhichFloorText
call PrintText call PrintText
ld hl, wItemList ld hl, wItemList
@ -12,7 +12,7 @@ Func_1c9c6: ; 1c9c6 (7:49c6)
ld [wCurrentMenuItem], a ld [wCurrentMenuItem], a
ld [wListScrollOffset], a ld [wListScrollOffset], a
ld [wPrintItemPrices], a ld [wPrintItemPrices], a
ld a, $4 ld a, SPECIALLISTMENU
ld [wListMenuID], a ld [wListMenuID], a
call DisplayListMenuID call DisplayListMenuID
pop bc pop bc
@ -24,7 +24,7 @@ Func_1c9c6: ; 1c9c6 (7:49c6)
ld hl, wcc5b ld hl, wcc5b
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
add a add a
ld d, $0 ld d, 0
ld e, a ld e, a
add hl, de add hl, de
ld a, [hli] ld a, [hli]
@ -32,15 +32,15 @@ Func_1c9c6: ; 1c9c6 (7:49c6)
ld a, [hl] ld a, [hl]
ld c, a ld c, a
ld hl, wWarpEntries ld hl, wWarpEntries
call Func_1ca0d call .UpdateWarp
Func_1ca0d: ; 1ca0d (7:4a0d) .UpdateWarp
inc hl inc hl
inc hl inc hl
ld a, b ld a, b
ld [hli], a ld [hli], a ; destination warp ID
ld a, c ld a, c
ld [hli], a ld [hli], a ; destination map ID
ret ret
WhichFloorText: ; 1ca14 (7:4a14) WhichFloorText: ; 1ca14 (7:4a14)

View file

@ -64,5 +64,5 @@ CeladonMartElevatorText1: ; 4865e (12:465e)
TX_ASM TX_ASM
call CeladonMartElevatorScript_48631 call CeladonMartElevatorScript_48631
ld hl, CeldaonMartElevatorWarpMaps ld hl, CeldaonMartElevatorWarpMaps
predef Func_1c9c6 predef DisplayElevatorFloorMenu
jp TextScriptEnd jp TextScriptEnd

View file

@ -68,7 +68,7 @@ RocketHideoutElevatorText1: ; 4576d (11:576d)
jr z, .asm_45782 jr z, .asm_45782
call RocketHideoutElevatorScript_45741 call RocketHideoutElevatorScript_45741
ld hl, RocketHideoutElevatorWarpMaps ld hl, RocketHideoutElevatorWarpMaps
predef Func_1c9c6 predef DisplayElevatorFloorMenu
jr .asm_45788 jr .asm_45788
.asm_45782 .asm_45782
ld hl, RocketHideoutElevatorText_4578b ld hl, RocketHideoutElevatorText_4578b

View file

@ -73,5 +73,5 @@ SilphCoElevatorText1: ; 45835 (11:5835)
TX_ASM TX_ASM
call SilphCoElevatorScript_457f1 call SilphCoElevatorScript_457f1
ld hl, SilphCoElevatorWarpMaps ld hl, SilphCoElevatorWarpMaps
predef Func_1c9c6 predef DisplayElevatorFloorMenu
jp TextScriptEnd jp TextScriptEnd