Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tileset swapPalettes can now use palette 12 for swapping.

Browse Source 
Fixed Slateport Fan Club lights.
This commit is contained in:
Ariel A 2022-07-15 19:02:34 -04:00
parent 8e436e3add
commit b4cc3ca7b7
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/tilesets/headers.inc
View File

@ -1,6 +1,6 @@
.align 2 .align 2
gTileset_General:: gTileset_General::
.byte 0x41 @ is compressed, swapPalettes 4 .byte 0x21 @ is compressed, swapPalettes 4
.byte FALSE @ is secondary tileset .byte FALSE @ is secondary tileset
.2byte 0x10 @ lightPalettes 4 .2byte 0x10 @ lightPalettes 4
.4byte gTilesetTiles_General .4byte gTilesetTiles_General
@ -11,7 +11,7 @@ gTileset_General::
.align 2 .align 2
gTileset_Petalburg:: gTileset_Petalburg::
.byte 0x21 @ is compressed, swapPalettes 9 .byte 0x11 @ is compressed, swapPalettes 9
.byte TRUE @ is secondary tileset .byte TRUE @ is secondary tileset
.2byte 0x00B @ lightPalettes 6,7,9, custom 9 .2byte 0x00B @ lightPalettes 6,7,9, custom 9
.4byte gTilesetTiles_Petalburg .4byte gTilesetTiles_Petalburg
@ -44,9 +44,9 @@ gTileset_Dewford::
.align 2 .align 2
gTileset_Slateport:: gTileset_Slateport::
.byte 5 @ is compressed, swapPalettes 6 .byte 3 @ is compressed, swapPalettes 6
.byte TRUE @ is secondary tileset .byte TRUE @ is secondary tileset
.2byte 0x1 @ lightPalettes 6 .2byte 0x41 @ lightPalettes 6,12
.4byte gTilesetTiles_Slateport .4byte gTilesetTiles_Slateport
.4byte gTilesetPalettes_Slateport .4byte gTilesetPalettes_Slateport
.4byte gMetatiles_Slateport .4byte gMetatiles_Slateport
@ -77,7 +77,7 @@ gTileset_Lavaridge::
.align 2 .align 2
gTileset_Fallarbor:: gTileset_Fallarbor::
.byte 9 @ is compressed, swapPalettes 7 .byte 5 @ is compressed, swapPalettes 7
.byte TRUE @ is secondary tileset .byte TRUE @ is secondary tileset
.2byte 2 @ lightPalettes 7 .2byte 2 @ lightPalettes 7
.4byte gTilesetTiles_Fallarbor .4byte gTilesetTiles_Fallarbor
@ -99,7 +99,7 @@ gTileset_Fortree::
.align 2 .align 2
gTileset_Lilycove:: gTileset_Lilycove::
.byte 5 @ is compressed, swapPalettes 6 .byte 3 @ is compressed, swapPalettes 6
.byte TRUE @ is secondary tileset .byte TRUE @ is secondary tileset
.2byte 0x01 @ lightPalettes 6 .2byte 0x01 @ lightPalettes 6
.4byte gTilesetTiles_Lilycove .4byte gTilesetTiles_Lilycove
@ -111,7 +111,7 @@ gTileset_Lilycove::
.align 2 .align 2
gTileset_Mossdeep:: gTileset_Mossdeep::
.byte 0x11 @ is compressed, swapPalettes 8 .byte 0x09 @ is compressed, swapPalettes 8
.byte TRUE @ is secondary tileset .byte TRUE @ is secondary tileset
.2byte 0x4 @ lightPalettes 8 .2byte 0x4 @ lightPalettes 8
.4byte gTilesetTiles_Mossdeep .4byte gTilesetTiles_Mossdeep
@ -134,7 +134,7 @@ gTileset_EverGrande::
.align 2 .align 2
gTileset_Pacifidlog:: gTileset_Pacifidlog::
.byte 0x21 @ is compressed, swapPalettes 9 .byte 0x11 @ is compressed, swapPalettes 9
.byte TRUE @ is secondary tileset .byte TRUE @ is secondary tileset
.2byte 8 @ lightPalettes 9 .2byte 8 @ lightPalettes 9
.4byte gTilesetTiles_Pacifidlog .4byte gTilesetTiles_Pacifidlog
@ -145,7 +145,7 @@ gTileset_Pacifidlog::
.align 2 .align 2
gTileset_Sootopolis:: gTileset_Sootopolis::
.byte 5 @ is compressed, swapPalettes 6 .byte 3 @ is compressed, swapPalettes 6
.byte TRUE @ is secondary tileset .byte TRUE @ is secondary tileset
.2byte 0x101 @ lightPalettes 6, customLights 6 .2byte 0x101 @ lightPalettes 6, customLights 6
.4byte gTilesetTiles_Sootopolis .4byte gTilesetTiles_Sootopolis

4
include/global.fieldmap.h
View File

@ -32,8 +32,8 @@ typedef void (*TilesetCB)(void);
struct Tileset struct Tileset
{ {
/*0x00*/ u8 isCompressed:2; /*0x00*/ u8 isCompressed:1;
/*0x00*/ u8 swapPalettes:6; // bitmask determining whether palette has an alternate, night-time palette /*0x00*/ u8 swapPalettes:7; // bitmask determining whether palette has an alternate, night-time palette
/*0x01*/ bool8 isSecondary; /*0x01*/ bool8 isSecondary;
/*0x02*/ u8 lightPalettes; // Bitmask determining whether a palette should be time-blended as a light /*0x02*/ u8 lightPalettes; // Bitmask determining whether a palette should be time-blended as a light
/*0x03*/ u8 customLightColor; // Bitmask determining which light palettes have custom light colors (color 15) /*0x03*/ u8 customLightColor; // Bitmask determining which light palettes have custom light colors (color 15)