summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-20 10:29:56 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-20 10:29:56 -0400
commite274f6246737f66dc84c0ffdd340b9d25304e8f5 (patch)
treef41d103b74410c7dd8d2f0a2698926ec7868f77c /main.asm
parentf57a61eb44e68fa2b1092f97727930fe5f002730 (diff)
Split out color predef files
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm14
1 files changed, 2 insertions, 12 deletions
diff --git a/main.asm b/main.asm
index a4b59b19..831b94fd 100644
--- a/main.asm
+++ b/main.asm
@@ -314,24 +314,14 @@ ScrollBGMapPalettes:: ; 804f (2:404f)
INCLUDE "tilesets/palette_maps.asm"
Unknown85d7:
- rept 26
+ rept NUM_MAP_GROUPS
db PAL_BG_ROOF
endr
INCLUDE "engine/player_object.asm"
INCLUDE "engine/sine.asm"
INCLUDE "engine/predef.asm"
-
-Predef_LoadSGBLayout:
- dr $8c2d, $9072
-CheckContestMon:
- dr $9072, $91e5
-ApplyMonOrTrainerPals:
- dr $91e5, $9cc0
-InitSGBBorder:
- dr $9cc0, $9cfd
-InitCGBPals:: ; 9cfd
- dr $9cfd, $bc3a
+INCLUDE "engine/color.asm"
SECTION "bank3", ROMX, BANK[$3]
CheckTime::