summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-20 10:06:37 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-20 10:06:37 -0400
commitf57a61eb44e68fa2b1092f97727930fe5f002730 (patch)
tree882306d7dfc37fdb813da348ad2c76ac96771ef1 /main.asm
parent1b4991c001c8621364c397e2e3ffceb5690278f1 (diff)
engine/sine.asm; tileset palettes
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm13
1 files changed, 6 insertions, 7 deletions
diff --git a/main.asm b/main.asm
index 33cb1cb5..a4b59b19 100644
--- a/main.asm
+++ b/main.asm
@@ -311,16 +311,15 @@ ScrollBGMapPalettes:: ; 804f (2:404f)
jr nz, .asm_8055
ret
-Unknown8097:
- dr $8097, $85d7
+INCLUDE "tilesets/palette_maps.asm"
+
Unknown85d7:
- dr $85d7, $85f1
+ rept 26
+ db PAL_BG_ROOF
+ endr
INCLUDE "engine/player_object.asm"
-
-Sine_e::
- dr $8ac9, $8b3b
-
+INCLUDE "engine/sine.asm"
INCLUDE "engine/predef.asm"
Predef_LoadSGBLayout: