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. --- data/types/names.asm | 4 ++-- data/types/search_strings.asm | 4 ++-- data/types/search_types.asm | 4 ++-- data/types/type_matchups.asm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'data/types') diff --git a/data/types/names.asm b/data/types/names.asm index 07ebec7..7036847 100644 --- a/data/types/names.asm +++ b/data/types/names.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "TypeNames", ROMX[$40DD], BANK[$14] +SECTION "data/types/names.asm", ROMX TypeNames:: dw .Normal ; NORMAL @@ -50,4 +50,4 @@ TypeNames:: .Ghost: db "ゴースト@" .Metal: db "メタル@" .Dragon: db "ドラゴン@" -.Dark: db "あく@" +.Dark: db "あく@" \ No newline at end of file diff --git a/data/types/search_strings.asm b/data/types/search_strings.asm index c36a249..905f478 100644 --- a/data/types/search_strings.asm +++ b/data/types/search_strings.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "PokedexTypeSearchStrings", ROMX[$4ECC], BANK[$10] +SECTION "data/types/search_strings.asm", ROMX PokedexTypeSearchStrings:: db "ノーマル@" ; NORMAL @@ -17,4 +17,4 @@ PokedexTypeSearchStrings:: db "むし  @" ; BUG db "いわ  @" ; ROCK db "ゴースト@" ; GHOST - db "ドラゴン@" ; DRAGON + db "ドラゴン@" ; DRAGON \ No newline at end of file diff --git a/data/types/search_types.asm b/data/types/search_types.asm index fbaa70d..ed41650 100644 --- a/data/types/search_types.asm +++ b/data/types/search_types.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "PokedexTypeSearchConversionTable", ROMX[$5068], BANK[$10] +SECTION "data/types/search_types.asm", ROMX PokedexTypeSearchConversionTable:: db TYPE_NORMAL @@ -17,4 +17,4 @@ PokedexTypeSearchConversionTable:: db TYPE_BUG db TYPE_ROCK db TYPE_GHOST - db TYPE_DRAGON + db TYPE_DRAGON \ No newline at end of file diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm index 8923a80..e23227a 100644 --- a/data/types/type_matchups.asm +++ b/data/types/type_matchups.asm @@ -1,6 +1,6 @@ INCLUDE "constants.asm" -SECTION "Type Matchups", ROMX[$506D], BANK[$0D] +SECTION "data/types/type_matchups.asm", ROMX TypeMatchups: ; 3506d ; attacker, defender, *= @@ -110,4 +110,4 @@ TypeMatchups: ; 3506d db TYPE_NORMAL, TYPE_GHOST, NO_EFFECT db -1 ; end -; 3519b +; 3519b \ No newline at end of file -- cgit v1.2.3