diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-07-22 09:20:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-22 09:20:33 -0400 |
| commit | a586811e197d2a28d3a08dff03548fb69342da96 (patch) | |
| tree | d5eec033243b0031afd3a82d47bbe1b7779d1675 /data/items | |
| parent | 5ec276e7c77244befe0b6c9931cda191aa3818b6 (diff) | |
| parent | 5b4ef99f4bfec7a1cf41cd3eab601d355bb0fadf (diff) | |
Merge pull request #38 from luckytyphlosion/section-reorg
Add linkerscript to replace completely anonymous sections.
Diffstat (limited to 'data/items')
| -rw-r--r-- | data/items/attributes.asm | 4 | ||||
| -rw-r--r-- | data/items/names.asm | 12 |
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 "ひでんマシン０５@" ; HM05 db "ひでんマシン０６@" ; HM06 db "ひでんマシン０７@" ; HM07 - db "しようきんし@" ; FF + db "しようきんし@" ; FF
\ No newline at end of file |