summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-06-25 13:45:50 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-06-25 13:45:50 -0400
commit67152eab98f826c22d7ae1be1aa0310e81c3d77b (patch)
treee6ca47730f11a56621187bc7475b1fde420f2d5f /engine
parent1caa50a6474edd3896911409d548faa0731621b7 (diff)
Keep more data/ INCLUDEs with relevant routines
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/read_trainer_attributes.asm2
-rw-r--r--engine/battle/read_trainer_dvs.asm2
-rw-r--r--engine/battle/read_trainer_party.asm2
-rw-r--r--engine/items/print_item_description.asm2
-rw-r--r--engine/pokedex/pokedex_2.asm2
-rw-r--r--engine/printer/printer.asm2
6 files changed, 10 insertions, 2 deletions
diff --git a/engine/battle/read_trainer_attributes.asm b/engine/battle/read_trainer_attributes.asm
index 12554ebaf..6db8f4204 100644
--- a/engine/battle/read_trainer_attributes.asm
+++ b/engine/battle/read_trainer_attributes.asm
@@ -62,3 +62,5 @@ GetTrainerAttributes:
ld a, [hl]
ld [wEnemyTrainerBaseReward], a
ret
+
+INCLUDE "data/trainers/attributes.asm"
diff --git a/engine/battle/read_trainer_dvs.asm b/engine/battle/read_trainer_dvs.asm
index 67ea0fe3c..d35c9ea61 100644
--- a/engine/battle/read_trainer_dvs.asm
+++ b/engine/battle/read_trainer_dvs.asm
@@ -17,3 +17,5 @@ GetTrainerDVs:
pop hl
ret
+
+INCLUDE "data/trainers/dvs.asm"
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index 9775e1dcc..0a537b64e 100644
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -387,3 +387,5 @@ Function39990:
ld bc, NAME_LENGTH
pop de
ret
+
+INCLUDE "data/trainers/parties.asm"
diff --git a/engine/items/print_item_description.asm b/engine/items/print_item_description.asm
index b6ab6c957..b0a3a0b33 100644
--- a/engine/items/print_item_description.asm
+++ b/engine/items/print_item_description.asm
@@ -28,3 +28,5 @@ PrintItemDescription:
ld d, [hl]
pop hl
jp PlaceString
+
+INCLUDE "data/items/descriptions.asm"
diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm
index 21aea61b4..8105a080a 100644
--- a/engine/pokedex/pokedex_2.asm
+++ b/engine/pokedex/pokedex_2.asm
@@ -279,3 +279,5 @@ endr
ld e, l
pop hl
ret
+
+INCLUDE "data/pokemon/dex_entry_pointers.asm"
diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm
index e2b0f1af5..4dc74c6d2 100644
--- a/engine/printer/printer.asm
+++ b/engine/printer/printer.asm
@@ -1,5 +1,3 @@
-INCLUDE "engine/printer/printer_serial.asm"
-
SendScreenToPrinter:
.loop
call JoyTextDelay