pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

"Pic Pointers" and "Unown Pic Pointers" must start at the same address

Browse Source 
Use `|` not `+` to combine bitmasks
This commit is contained in:
Remy Oukaour 2017-12-11 18:39:39 -05:00
parent 2d644f5077
commit dc4357b7fa
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/phone.asm
View File

@ -165,7 +165,7 @@ CheckPhoneContactTimeOfDay: ; 900ad (24:40ad)
callba CheckTime callba CheckTime
pop af pop af
and MORN + DAY + NITE and MORN | DAY | NITE
and c and c
pop de pop de

9
gfx/pics.asm
View File

@ -1,20 +1,17 @@
INCLUDE "includes.asm" 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" PicPointers:: INCLUDE "gfx/pics/pic_pointers.asm"
SECTION "Unown Pic Pointers", ROMX 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" UnownPicPointers:: INCLUDE "gfx/pics/unown_pic_pointers.asm"
SECTION "Trainer Pic Pointers", ROMX SECTION "Trainer Pic Pointers", ROMX
TrainerPicPointers:: INCLUDE "gfx/trainer_pic_pointers.asm" TrainerPicPointers:: INCLUDE "gfx/trainer_pic_pointers.asm"

2
pokecrystal.link
View File

@ -191,9 +191,11 @@ ROMX $46
ROMX $47 ROMX $47
"bank47" "bank47"
ROMX $48 ROMX $48
org $4000
"Pic Pointers" "Pic Pointers"
"Pics 1" "Pics 1"
ROMX $49 ROMX $49
org $4000
"Unown Pic Pointers" "Unown Pic Pointers"
"Pics 2" "Pics 2"
ROMX $4a ROMX $4a