From b333b18dbde658cd7e4299f8206d1d52c532b87a Mon Sep 17 00:00:00 2001 From: yenatch Date: Fri, 30 Aug 2013 23:07:08 -0400 Subject: Function2f79 is PickUpItem --- engine/scripting.asm | 2 +- main.asm | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/engine/scripting.asm b/engine/scripting.asm index d497f9a4e..5d44d1a8e 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -2363,7 +2363,7 @@ Script_checkitem: ; 0x97812 call GetScriptByte ld [$d106], a ld hl, $d892 - call Function2f79 + call PickUpItem ret nc ld a, $1 ld [$c2dd], a diff --git a/main.asm b/main.asm index 64ec02a0c..0b848c4e0 100644 --- a/main.asm +++ b/main.asm @@ -5549,20 +5549,20 @@ Function2f66: ; 2f66 ret ; 2f79 -Function2f79: ; 2f79 +PickUpItem: ; 2f79 push hl push de push bc ld a, [hROMBank] push af - ld a, BANK(Functiond244) + ld a, BANK(_PickUpItem) rst Bankswitch - call Functiond244 + call _PickUpItem + pop bc ld a, b rst Bankswitch - pop bc pop de pop hl @@ -20275,7 +20275,7 @@ Functiond20d: ; d20d jp Functiond2ff ; d244 -Functiond244: ; d244 +_PickUpItem: ; d244 call Functiond27b jr nz, .asm_d278 push hl @@ -32235,7 +32235,7 @@ Function24c64: ; 24c64 push hl ld [CurItem], a ld hl, NumItems - call Function2f79 + call PickUpItem pop hl jr nc, .asm_24c89 ld a, [hl] @@ -55485,7 +55485,7 @@ Function8adef: ; 8adef ld a, WATER_STONE ld [CurItem], a ld hl, NumItems - call Function2f79 + call PickUpItem jr c, .asm_8ae24 ld a, [PartyCount] -- cgit v1.2.3