From cd9191b074ad1f0cc76375f535a2e487b0451532 Mon Sep 17 00:00:00 2001 From: pfero Date: Wed, 30 May 2018 22:53:12 +0200 Subject: 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. --- data/trainers/class_names.asm | 4 ++++ data/trainers/parties.asm | 5 ++--- data/trainers/party_pointers.asm | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'data/trainers') 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 -- cgit v1.2.3