summaryrefslogtreecommitdiff
path: root/data/pokemon
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/pokemon
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/pokemon')
-rw-r--r--data/pokemon/base_stats.asm4
-rw-r--r--data/pokemon/dex_order_alpha.asm4
-rw-r--r--data/pokemon/evos_attacks.asm4
-rw-r--r--data/pokemon/names.asm4
4 files changed, 8 insertions, 8 deletions
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index 7b3a07e..6da691e 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Base Data", ROMX[$4F10], BANK[$14]
+SECTION "data/pokemon/base_stats.asm", ROMX
tmhm: MACRO
; used in data/pokemon/base_stats/*.asm
@@ -288,4 +288,4 @@ BaseStats_Houou:: INCLUDE "data/pokemon/base_stats/houou.inc"
BaseStats_Togepy:: INCLUDE "data/pokemon/base_stats/togepy.inc"
BaseStats_Bulu:: INCLUDE "data/pokemon/base_stats/bulu.inc"
BaseStats_Tail:: INCLUDE "data/pokemon/base_stats/tail.inc"
-BaseStats_Leafy:: INCLUDE "data/pokemon/base_stats/leafy.inc"
+BaseStats_Leafy:: INCLUDE "data/pokemon/base_stats/leafy.inc" \ No newline at end of file
diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm
index 1e6a6b5..6f0b804 100644
--- a/data/pokemon/dex_order_alpha.asm
+++ b/data/pokemon/dex_order_alpha.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Alphabetical Pokedex Order", ROMX[$4943], BANK[$10]
+SECTION "data/pokemon/dex_order_alpha.asm", ROMX
; Every Pokémon sorted alphabetically by name (gojūon order).
@@ -255,4 +255,4 @@ AlphabeticalPokedexOrder: ; 0x40943
db DEX_ROKON
db DEX_WARWOLF
db DEX_WATANEKO
- db DEX_WANRIKY
+ db DEX_WANRIKY \ No newline at end of file
diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm
index c18757b..fb94284 100644
--- a/data/pokemon/evos_attacks.asm
+++ b/data/pokemon/evos_attacks.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "Evolutions and Attacks", ROMX[$6493], BANK[$10]
+SECTION "data/pokemon/evos_attacks.asm", ROMX
; Evolutions for Pokémon available in the demo were removed,
; and have been left in comments.
@@ -3296,4 +3296,4 @@ LeafyEvosAttacks: ; 43aa4
db 49, MOVE_MORNING_SUN
db 56, MOVE_WRAP
db 63, MOVE_SOLARBEAM
- db 0 ; no more level-up moves
+ db 0 ; no more level-up moves \ No newline at end of file
diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm
index 54d5263..15475c9 100644
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@@ -1,6 +1,6 @@
INCLUDE "constants.asm"
-SECTION "PokemonNames", ROMX[$6D75], BANK[$14]
+SECTION "data/pokemon/names.asm", ROMX
PokemonNames::
db "フシギダネ" ; FUSHIGIDANE
@@ -253,4 +253,4 @@ PokemonNames::
db "トゲピー@" ; TOGEPY
db "ブルー@@" ; BULU
db "テイル@@" ; TAIL
- db "りーフィ@" ; LEAFY
+ db "りーフィ@" ; LEAFY \ No newline at end of file