summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2018-05-29 19:35:36 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2018-05-29 19:35:36 -0400
commitb9d4178dad95a396b3a7ca9e2bc5c4fc4b81630e (patch)
tree883456b5f2bd69d6c2484f74088f10882d42aea7 /main.asm
parent71cb56a73e53fd8cb30b2bbd944d866cb6717e48 (diff)
Start decoding trainer parties
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm4
1 files changed, 3 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 8c789f3..7e58761 100644
--- a/main.asm
+++ b/main.asm
@@ -10,7 +10,7 @@ SECTION "Predef pointers", ROMX[$62B0],BANK[$01]
INCLUDE "engine/predef.asm"
SECTION "Font GFX", ROMX[$4362], BANK[$3e]
- INCBIN "gfx/font.1bpp"
+ INCBIN "gfx/font.1bpp"
SECTION "Main Menu Definition", ROMX[$5418], BANK[$01]
MainMenuHeader:
@@ -41,6 +41,8 @@ INCLUDE "data/moves/tmhm_moves.asm"
SECTION "Type Matchups", ROMX[$506D],BANK[$0D]
INCLUDE "data/types/type_matchups.asm"
+INCLUDE "data/trainers/parties.asm"
+
SECTION "Alphabetical Pokedex Order", ROMX[$4943],BANK[$10]
INCLUDE "data/pokemon/dex_order_alpha.asm"