ref: dc4357b7fa120c47c1af9937eb809c1cc7ddbfd6
parent: 2d644f5077fa9ec43009ea5ec072e6ade9a1f61b
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Mon Dec 11 13:39:39 EST 2017
"Pic Pointers" and "Unown Pic Pointers" must start at the same address Use `|` not `+` to combine bitmasks
--- a/engine/phone.asm
+++ b/engine/phone.asm
@@ -165,7 +165,7 @@
callba CheckTime
pop af
- and MORN + DAY + NITE
+ and MORN | DAY | NITE
and c
pop de
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -1,20 +1,17 @@
INCLUDE "includes.asm"
-SECTION "Pic Pointers", ROMX
+; PicPointers and UnownPicPointers are assumed to start at the same address,
+; but in different banks. This is enforced in pokecrystal.link.
+SECTION "Pic Pointers", ROMX
PicPointers:: INCLUDE "gfx/pics/pic_pointers.asm"
-
SECTION "Unown Pic Pointers", ROMX
-
-; Unown pic pointers are assumed to start at the same address as PicPointers,
-; but in a different bank.
UnownPicPointers:: INCLUDE "gfx/pics/unown_pic_pointers.asm"
SECTION "Trainer Pic Pointers", ROMX
-
TrainerPicPointers:: INCLUDE "gfx/trainer_pic_pointers.asm"
--- a/pokecrystal.link
+++ b/pokecrystal.link
@@ -191,9 +191,11 @@
ROMX $47
"bank47"
ROMX $48
+ org $4000
"Pic Pointers"
"Pics 1"
ROMX $49
+ org $4000
"Unown Pic Pointers"
"Pics 2"
ROMX $4a