summaryrefslogtreecommitdiff
path: root/data/items
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-07-03 17:07:05 -0400
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-07-03 17:07:05 -0400
commite1659ecd41dfac70eb021c0f5fe983ed6f043433 (patch)
tree86ec6137c666650168716247fa63241e79b1788b /data/items
parentf3f0e711bf4f4205fd29f2b448c93ff5597507e5 (diff)
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.
Diffstat (limited to 'data/items')
-rw-r--r--data/items/attributes.asm4
-rw-r--r--data/items/names.asm12
2 files changed, 8 insertions, 8 deletions
diff --git a/data/items/attributes.asm b/data/items/attributes.asm
index 4308b44..1e54451 100644
--- a/data/items/attributes.asm
+++ b/data/items/attributes.asm
@@ -7,7 +7,7 @@ item_attribute: MACRO
dn \6, \7
ENDM
-SECTION "Item Attributes", ROMX [$68f3], BANK [$01]
+SECTION "data/items/attributes.asm", ROMX
ItemAttributes:: ; 68f3
; ITEM_MASTER_BALL
@@ -517,4 +517,4 @@ ItemAttributes:: ; 68f3
; ITEM_HM06
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_PARTY
; ITEM_HM07
- item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_PARTY
+ item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_PARTY \ No newline at end of file
diff --git a/data/items/names.asm b/data/items/names.asm
index 942af41..0036cd6 100644
--- a/data/items/names.asm
+++ b/data/items/names.asm
@@ -1,10 +1,10 @@
INCLUDE "constants.asm"
-if DEBUG
-SECTION "ItemNames", ROMX[$6FEC], BANK[$01]
-else
-SECTION "ItemNames", ROMX[$6FE9], BANK[$01]
-endc
+; if DEBUG
+SECTION "data/items/names.asm", ROMX
+; else
+; SECTION "ItemNames", ROMX[$6FE9], BANK[$01]
+; endc
ItemNames::
db "マスターボール@" ; MASTER_BALL
@@ -261,4 +261,4 @@ ItemNames::
db "ひでんマシン05@" ; HM05
db "ひでんマシン06@" ; HM06
db "ひでんマシン07@" ; HM07
- db "しようきんし@" ; FF
+ db "しようきんし@" ; FF \ No newline at end of file