summaryrefslogtreecommitdiff
path: root/data/trainers
diff options
context:
space:
mode:
authorpfero <ohpee@loves.dicksinhisan.us>2018-05-30 22:53:12 +0200
committerpfero <ohpee@loves.dicksinhisan.us>2018-05-30 22:53:59 +0200
commitcd9191b074ad1f0cc76375f535a2e487b0451532 (patch)
treee11e3f8d679217ac4ecd747de6c06edad4cc6e86 /data/trainers
parent9ab9ea4ab59cc3c226a7fe15b4fcc92b4af57243 (diff)
Clean up Makefile
This makefile can now figure graphics dependencies on its own, creates dependency files for each compilation unit and compiles everything separately. This is a proposal. Please try it out, read the Makefile to see if you get what I'm trying to do, and propose any improvements you want.
Diffstat (limited to 'data/trainers')
-rw-r--r--data/trainers/class_names.asm4
-rw-r--r--data/trainers/parties.asm5
-rw-r--r--data/trainers/party_pointers.asm2
3 files changed, 8 insertions, 3 deletions
diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm
index 284876d..4fdbed0 100644
--- a/data/trainers/class_names.asm
+++ b/data/trainers/class_names.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "TrainerClassNames", ROMX[$4D90], BANK[$0E]
+
TrainerClassNames:: ; 38d90
db "ハヤト@"
db "アカネ@"
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 74b1129..c3861cf 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -1,3 +1,5 @@
+INCLUDE "constants.asm"
+
; Trainer data structure:
; - db "NAME@", TRAINERTYPE_* constant
; - 1 to 6 Pokémon:
@@ -10,9 +12,6 @@
; TODO: decode data from the beginning
-SECTION "TrainerGroups", ROMX[$5110],BANK[$E]
-INCLUDE "data/trainers/party_pointers.asm"
-
SECTION "HayatoGroup", ROMX[$518A],BANK[$E]
HayatoGroup::
diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm
index a23b165..f410435 100644
--- a/data/trainers/party_pointers.asm
+++ b/data/trainers/party_pointers.asm
@@ -1,3 +1,5 @@
+SECTION "TrainerGroups", ROMX[$5110],BANK[$E]
+
TrainerGroups: ; 0x039110
dw HayatoGroup
dw AkaneGroup