pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make town map pals more intuitive in source

Browse Source
This commit is contained in:
pikalaxalt
2016-04-02 09:28:46 -04:00
parent 93e12d2003
commit a8fe0c13d4
3 changed files with 147 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

364
engine/color.asm
View File

File diff suppressed because it is too large Load Diff

2
engine/map_setup.asm
View File

@@ -248,7 +248,7 @@ MapSetupCommands: ; 15440
dba EnterMapMusic ; 07 dba EnterMapMusic ; 07
dba ForceMapMusic ; 08 dba ForceMapMusic ; 08
dba FadeInMusic ; 09 dba FadeInMusic ; 09
dba LoadBlockData ; 0a dba LoadBlockData ; 0a (callback 1)
dba LoadNeighboringBlockData ; 0b dba LoadNeighboringBlockData ; 0b
dba SaveScreen ; 0c dba SaveScreen ; 0c
dba BufferScreen ; 0d dba BufferScreen ; 0d

23
engine/pokegear.asm
View File

@@ -2841,7 +2841,7 @@ TownMapPals: ; 91f13
; The palette data is condensed to nybbles, ; The palette data is condensed to nybbles,
; least-significant first. ; least-significant first.
ld hl, TownMapPalMap ld hl, .PalMap
srl a srl a
jr c, .odd jr c, .odd
; Even-numbered tile ids take the bottom nybble... ; Even-numbered tile ids take the bottom nybble...
@@ -2878,13 +2878,20 @@ TownMapPals: ; 91f13
jr nz, .loop jr nz, .loop
ret ret
TownMapPalMap: .PalMap
dn 1, 1, 2, 1, 2, 2, 0, 0, 1, 1, 1, 3, 5, 4, 5, 4 townmappals: MACRO
dn 1, 1, 2, 1, 2, 2, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0 rept _NARG / 2
dn 1, 1, 2, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 dn \2, \1
dn 0, 0, 0, 0, 4, 4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0 shift
dn 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3 shift
dn 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0 endr
endm
townmappals 1, 1, 1, 2, 2, 2, 0, 0, 1, 1, 3, 1, 4, 5, 4, 5
townmappals 1, 1, 1, 2, 2, 2, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0
townmappals 1, 1, 1, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
townmappals 0, 0, 0, 0, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0
townmappals 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0
townmappals 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0
; 91f7b ; 91f7b
TownMapMon: ; 91f7b TownMapMon: ; 91f7b