From e1659ecd41dfac70eb021c0f5fe983ed6f043433 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Tue, 3 Jul 2018 17:07:05 -0400 Subject: Introduce linkerscript. Addresses of sections will now be added to the linkerscript via `org`, and the section name will be the path/to/file. If there is more than one section in the file, then add a @SectionName after the path/to/file to describe the section. --- engine/items/inventory.asm | 8 ++++---- engine/items/item_effects.asm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'engine/items') diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm index c30e5c0..a11bcec 100755 --- a/engine/items/inventory.asm +++ b/engine/items/inventory.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Inventory", ROMX[$4AA1], BANK[$03] +SECTION "engine/items/inventory.asm@Inventory", ROMX _ReceiveItem: ; 03:4AA1 call DoesHLEqualwNumBagItems @@ -588,7 +588,7 @@ GetNumberedTMHM: ; 03:4D1A and a ret -SECTION "GetItemAmount", ROMX[$4e10], BANK[$03] +SECTION "engine/items/inventory.asm@GetItemAmount", ROMX ; Returns carry if user has the item ; and the amount in b @@ -634,7 +634,7 @@ CheckAmountInKeyItems: ; 03:4E2B scf ret -SECTION "_CheckTossableItem", ROMX[$53AD], BANK[$03] +SECTION "engine/items/inventory.asm@_CheckTossableItem", ROMX ; Return 1 in wItemAttributeParamBuffer and ; carry if wCurItem can't be removed from the bag. @@ -720,4 +720,4 @@ GetItemPrice: ; 03:540C ld d, a pop bc pop hl - ret + ret \ No newline at end of file diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 7f886f1..6f854f0 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "ApplyPPUp", ROMX[$78f6], BANK[$03] +SECTION "engine/items/item_effects.asm", ROMX ApplyPPUp: ; 03:78f6 ld a, MON_MOVES @@ -76,4 +76,4 @@ ComputeMaxPP: ; 03:792B .no_pp_up ld [hl], b pop bc - ret + ret \ No newline at end of file -- cgit v1.2.3