diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-11 18:39:39 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-11 18:39:39 -0500 |
| commit | dc4357b7fa120c47c1af9937eb809c1cc7ddbfd6 (patch) | |
| tree | 8dbf2f7f389d3b76e55fe00fbad7ff3f4a4bef93 | |
| parent | 2d644f5077fa9ec43009ea5ec072e6ade9a1f61b (diff) | |
"Pic Pointers" and "Unown Pic Pointers" must start at the same address
Use `|` not `+` to combine bitmasks
| -rw-r--r-- | engine/phone.asm | 2 | ||||
| -rw-r--r-- | gfx/pics.asm | 9 | ||||
| -rw-r--r-- | pokecrystal.link | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/engine/phone.asm b/engine/phone.asm index ce9cfa081..5050c8044 100644 --- a/engine/phone.asm +++ b/engine/phone.asm @@ -165,7 +165,7 @@ CheckPhoneContactTimeOfDay: ; 900ad (24:40ad) callba CheckTime pop af - and MORN + DAY + NITE + and MORN | DAY | NITE and c pop de diff --git a/gfx/pics.asm b/gfx/pics.asm index 7e0aebb5c..8616265f0 100644 --- 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" diff --git a/pokecrystal.link b/pokecrystal.link index 555a61123..59fe55079 100644 --- a/pokecrystal.link +++ b/pokecrystal.link @@ -191,9 +191,11 @@ ROMX $46 ROMX $47 "bank47" ROMX $48 + org $4000 "Pic Pointers" "Pics 1" ROMX $49 + org $4000 "Unown Pic Pointers" "Pics 2" ROMX $4a |