From 28c6eb83418c0bb7ade8c564406dbb710428f0fd Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 27 Feb 2018 14:24:29 +0100 Subject: [PATCH] Use data/items/pocket_names.asm --- engine/overworld/scripting.asm | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index f65f2f9c0..e2918a45b 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -613,7 +613,7 @@ GetPocketName: farcall CheckItemPocket ld a, [wItemAttributeParamBuffer] dec a - ld hl, .Pockets + ld hl, ItemPocketNames maskbits NUM_POCKETS add a ld e, a @@ -626,20 +626,7 @@ GetPocketName: call CopyName2 ret -.Pockets: - dw .Item - dw .Key - dw .Ball - dw .TM - -.Item: - db "ITEM POCKET@" -.Key: - db "KEY POCKET@" -.Ball: - db "BALL POCKET@" -.TM: - db "TM POCKET@" +INCLUDE "data/items/pocket_names.asm" CurItemName: ld a, [wCurItem]