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

Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2

Browse Source
This commit is contained in:
Greenphx9 2024-08-25 17:54:28 +10:00
commit ad969c968c
152 changed files with 2340 additions and 578 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/event.inc
View File

@ -1800,9 +1800,11 @@
@ Equivalent to fadescreen but copies gPlttBufferUnfaded to gDecompressionBuffer on the fade out
@ and the reverse on the fade in, in effect saving gPlttBufferUnfaded to restore it.
.macro fadescreenswapbuffers mode:req
@ If nowait set, does not wait for the fade to complete
.macro fadescreenswapbuffers mode:req, nowait=0
.byte 0xdc
.byte \mode
.byte \nowait
.endm
@ Buffers the specified trainer's class name to the given string var.

4
data/event_scripts.s
View File

@ -752,12 +752,12 @@ Common_EventScript_PlayGymBadgeFanfare::
return
Common_EventScript_OutOfCenterPartyHeal::
fadescreen FADE_TO_BLACK
fadescreenswapbuffers FADE_TO_BLACK
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
callnative UpdateFollowingPokemon
fadescreen FADE_FROM_BLACK
fadescreenswapbuffers FADE_FROM_BLACK
return
EventScript_RegionMap::

2
data/layouts/LavaridgeTown/map.bin
View File

@ -1,3 +1,3 @@
qqqq{ttttt|qqqqqqq66{tttzq2®2®2®2®2xttttttttr{™š››œ2<C593>tž2|qqqNKLOq6rr¡£2¼2£2£2¥JHIMyy0123rr¡»233»2¥PQRS2289:;Æ4Æ4rr©ª2£2¼2¬2­XYZ[Ö5×5`ABCÆ4Æ4rr±²³³´µ`abcæ5ç50 1"1044rrº2¨2¨2¨2¹2Š20 1"10000 1"1000rr¨2˜2¨2˜2Œ2’20 1"1000 1"1000rr¨ B¨ BŠ00 1!11111!1!1111rr‘2‘‘2‘’200(1)1)1)1)1)1)1)1)1)1)1rrª1«1«1«1«1¬1000000000000rr²³³³³´0000 0 0
qqqq{ttttt|qqqqqqq66{tttzq2®2®2®2®2xttttttttr{™š››œ2<C593>tž2|qqqNKLOq6rr¡£2¼2£2£2¥JHIMyy0123rr¡»2£2£2»2¥PQRS2289:;Æ4Æ4rr©ª2£2¼2¬2­XYZ[Ö5×5`ABCÆ4Æ4rr±²³³´µ`abcæ5ç50 1"1044rrº2¨2¨2¨2¹2Š20 1"10000 1"1000rr¨2˜2¨2˜2Œ2’20 1"1000 1"1000rr¨ B¨ BŠ00 1!11111!1!1111rr‘2‘‘2‘’200(1)1)1)1)1)1)1)1)1)1)1rrª1«1«1«1«1¬1000000000000rr²³³³³´0000 0 0
00 0 0
00rrё№єі»ј0000rrАБВЕГџ000  Ж4rrИ1Й1КНЛ§000 !" !"Ж4rr00000000000040000Ж4m000000000000000Ж4Ж4qqrm0000000000000044qqllllllllllllllll

1
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View File

@ -476,6 +476,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects::
call BattleFrontier_EventScript_SetBrainObjectGfx
setobjectxyperm LOCALID_OPPONENT, 13, 9
removeobject LOCALID_OPPONENT
delay 1
addobject LOCALID_OPPONENT
applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisibleFacingUp
BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects::

13
data/maps/DewfordTown/map.json
View File

@ -89,6 +89,19 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_EventScript_TrendyPhraseBoy",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 4,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

16
data/maps/EverGrandeCity/map.json
View File

@ -19,7 +19,21 @@
"direction": "left"
}
],
"object_events": [],
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 29,
"y": 48,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [
{
"x": 18,

2
data/maps/LavaridgeTown/map.json
View File

@ -77,7 +77,7 @@
"x": 4,
"y": 4,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT",
"movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",

13
data/maps/LilycoveCity/map.json
View File

@ -310,6 +310,19 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_EventScript_FatMan",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 26,
"y": 14,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

26
data/maps/MauvilleCity/map.json
View File

@ -177,6 +177,32 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "FLAG_HIDE_MAUVILLE_CITY_SCOTT"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 24,
"y": 5,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 25,
"y": 14,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

26
data/maps/MossdeepCity/map.json
View File

@ -250,6 +250,32 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_EventScript_BlackBelt",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 30,
"y": 16,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 39,
"y": 18,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

4
data/maps/MtChimney/scripts.inc
View File

@ -54,13 +54,13 @@ MtChimney_EventScript_Maxie::
msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT
closemessage
delay 30
fadescreen FADE_TO_BLACK
fadescreenswapbuffers FADE_TO_BLACK
removeobject LOCALID_MAXIE
removeobject LOCALID_MAGMA_GRUNT_1
removeobject LOCALID_TABITHA
removeobject LOCALID_MAGMA_GRUNT_2
setflag FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
fadescreen FADE_FROM_BLACK
fadescreenswapbuffers FADE_FROM_BLACK
setobjectxyperm LOCALID_ARCHIE, 10, 12
addobject LOCALID_ARCHIE
call_if_eq VAR_FACING, DIR_EAST, MtChimney_EventScript_ArchieApproachPlayerEast

5
data/maps/MtPyre_Summit/scripts.inc
View File

@ -49,7 +49,7 @@ MtPyre_Summit_EventScript_TeamAquaExits::
call_if_eq VAR_0x8008, 2, MtPyre_Summit_EventScript_ArchieFacePlayer2
msgbox MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo, MSGBOX_DEFAULT
closemessage
fadescreen FADE_TO_BLACK
fadescreenswapbuffers FADE_TO_BLACK
removeobject LOCALID_ARCHIE
removeobject LOCALID_GRUNT_1
removeobject LOCALID_GRUNT_2
@ -58,7 +58,7 @@ MtPyre_Summit_EventScript_TeamAquaExits::
setflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE
setflag FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
fadedefaultbgm
fadescreen FADE_FROM_BLACK
fadescreenswapbuffers FADE_FROM_BLACK
delay 20
setvar VAR_MT_PYRE_STATE, 1
call_if_eq VAR_0x8008, 0, MtPyre_Summit_EventScript_OldLadyApproachPlayer0
@ -622,4 +622,3 @@ MtPyre_Summit_Text_HoennTrioTale:
.string "becalmed the two enraged POKéMON.\p"
.string "Then, its duty done, the green POKéMON\n"
.string "flew off into the wild blue yonder…$"

17
data/maps/PacifidlogTown/map.json
View File

@ -63,6 +63,19 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_EventScript_NinjaBoy",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 10,
"y": 15,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [
@ -109,7 +122,9 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

26
data/maps/PetalburgCity/map.json
View File

@ -141,6 +141,32 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "FLAG_HIDE_PETALBURG_CITY_SCOTT"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 22,
"y": 16,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 27,
"y": 12,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

21
data/maps/Route102/map.json
View File

@ -141,10 +141,27 @@
"trainer_sight_or_berry_tree_id": "3",
"script": "Route102_EventScript_Allen",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": -3,
"y": 2,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"warp_events": [
],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

221
data/maps/RustboroCity/map.json
View File

@ -237,6 +237,227 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_EventScript_Boy1",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 19,
"y": 37,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 22,
"y": 37,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 19,
"y": 30,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 22,
"y": 30,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 19,
"y": 23,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 22,
"y": 23,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 22,
"y": 44,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 19,
"y": 44,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 29,
"y": 48,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 14,
"y": 19,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 15,
"y": 17,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 9,
"y": 19,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 8,
"y": 17,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 19,
"y": 15,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 22,
"y": 15,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 14,
"y": 54,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 17,
"y": 54,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

26
data/maps/SlateportCity/map.json
View File

@ -484,6 +484,32 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "FLAG_HIDE_SLATEPORT_CITY_SCOTT"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 21,
"y": 19,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 15,
"y": 26,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

2
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
View File

@ -48,6 +48,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom::
factory_setopponentgfx
setobjectxyperm LOCALID_OPPONENT, 5, 1
removeobject LOCALID_OPPONENT
delay 1
addobject LOCALID_OPPONENT
applymovement LOCALID_OPPONENT, SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter
waitmovement 0
@ -102,4 +103,3 @@ SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter:
walk_down
walk_in_place_faster_left
step_end

26
data/maps/VerdanturfTown/map.json
View File

@ -76,6 +76,32 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "VerdanturfTown_EventScript_Camper",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 18,
"y": 3,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 14,
"y": 3,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

BIN
data/tilesets/primary/general/metatile_attributes.bin
View File

Binary file not shown.

BIN
data/tilesets/primary/general/metatiles.bin
View File

Binary file not shown.

14
data/tilesets/primary/general/palettes/04.pal
View File

@ -1,14 +1,14 @@
JASC-PAL
0100
16
24 41 82
255 255 255
0 0 0
216 224 232
222 230 238
255 0 255
255 0 255
255 0 255
184 200 224
152 176 216
112 184 240
156 164 189
82 106 213
80 104 208
65 90 189
57 82 156
41 65 139
@ -16,4 +16,4 @@ JASC-PAL
139 164 222
106 131 213
82 106 213
115 197 164
96 168 232

6
data/tilesets/primary/general/palettes/04.pla Normal file
View File

@ -0,0 +1,6 @@
# Color indices to set high bit
1
3
4
5
15

32
data/tilesets/primary/general/palettes/13.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
232 0 128
232 228 216
222 230 238
224 214 184
216 200 152
244 226 171
156 164 189
80 104 208
65 90 189
57 82 156
41 65 139
172 197 230
139 164 222
106 131 213
82 106 213
221 205 143

BIN
data/tilesets/primary/general/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
data/tilesets/secondary/dewford/metatile_attributes.bin
View File

Binary file not shown.

BIN
data/tilesets/secondary/dewford/metatiles.bin
View File

Binary file not shown.

BIN
data/tilesets/secondary/dewford/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

24
data/tilesets/secondary/ever_grande/palettes/01.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
24 41 82
255 255 255
222 230 238
189 205 230
156 180 222
0 197 0
246 197 123
238 156 90
205 115 41
164 90 49
131 131 139
98 98 123
65 74 106
41 49 90
115 189 246
98 172 238
255 189 131
238 148 115
222 106 98
205 65 82
115 197 164
224 226 171
216 200 152
255 255 238
222 222 197
197 197 164
164 172 123
255 255 115

2
data/tilesets/secondary/ever_grande/palettes/08.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
24 41 82
0 0 0
246 197 123
238 156 90
205 115 41

3
data/tilesets/secondary/ever_grande/palettes/08.pla Normal file
View File

@ -0,0 +1,3 @@
# Color indices to set high bit
9
10

26
data/tilesets/secondary/fallarbor/palettes/00.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 255 255
222 230 238
189 205 230
156 180 222
0 192 0
222 230 164
180 197 115
148 156 82
123 131 65
131 131 139
98 98 123
65 74 106
189 189 131
115 189 246
98 172 238
115 189 246
98 164 222
82 139 197
74 115 172
115 197 164
88 168 168
221 205 143
244 226 171
255 205 82
230 156 49
222 123 32
156 98 41
128 192 216

6
data/tilesets/secondary/fallarbor/palettes/07.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
24 41 82
0 0 0
222 230 164
180 197 115
148 156 82
@ -9,11 +9,11 @@ JASC-PAL
131 131 139
98 98 123
65 74 106
41 49 90
88 168 168
90 172 172
131 197 222
255 205 82
230 156 49
222 123 32
156 98 41
115 197 164
128 192 216

3
data/tilesets/secondary/fallarbor/palettes/07.pla Normal file
View File

@ -0,0 +1,3 @@
# Color indices to set high bit
9
10

BIN
data/tilesets/secondary/fallarbor/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
data/tilesets/secondary/fortree/metatiles.bin
View File

Binary file not shown.

4
data/tilesets/secondary/fortree/palettes/08.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
255 255 255
176 184 200
255 255 255
246 238 189
230 213 172
@ -16,4 +16,4 @@ JASC-PAL
0 0 0
172 180 197
123 123 123
115 197 164
176 184 200

6
data/tilesets/secondary/fortree/palettes/08.pla Normal file
View File

@ -0,0 +1,6 @@
# Color indices to set high bit
0
8
9
11
15

BIN
data/tilesets/secondary/fortree/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
data/tilesets/secondary/lavaridge/metatiles.bin
View File

Binary file not shown.

32
data/tilesets/secondary/lavaridge/palettes/06.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
0 0 0
65 74 106
197 205 0
230 238 238
255 255 255
255 115 65
230 115 65
180 98 90
164 82 82
205 49 0
148 49 0
246 24 24
246 148 0
148 164 65
106 123 139
222 222 0
224 40 0
64 72 104
192 200 0
224 232 232
248 248 248
248 112 64
224 112 64
176 96 88
160 80 80
200 48 0
144 48 0
240 24 24
240 144 0
144 160 64
104 120 136
224 40 0

7
data/tilesets/secondary/lavaridge/palettes/06.pla Normal file
View File

@ -0,0 +1,7 @@
# Color indices to set high bit
0
9
10
11
12
15

BIN
data/tilesets/secondary/lavaridge/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
data/tilesets/secondary/lilycove/metatile_attributes.bin
View File

Binary file not shown.

BIN
data/tilesets/secondary/lilycove/metatiles.bin
View File

Binary file not shown.

22
data/tilesets/secondary/lilycove/palettes/06.pal
View File

@ -2,17 +2,17 @@ JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
168 184 240
112 144 208
115 148 213
90 115 189
131 131 139
216 208 216
65 74 106
222 213 222
112 144 208
131 197 213
248 248 248
0 0 0
0 0 0
0 0 0

6
data/tilesets/secondary/lilycove/palettes/06.pla Normal file
View File

@ -0,0 +1,6 @@
# Color indices to set high bit
1
2
6
9
10

30
data/tilesets/secondary/lilycove/palettes/15.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 213 180
255 197 148
222 148 115
123 65 65
57 74 123
41 57 98
24 41 82
16 32 57
222 230 238
255 197 90
189 156 90
255 98 90
197 65 65
255 255 255
24 200 0
244 226 171
221 205 143
115 148 213
90 115 189
131 131 139
232 228 216
65 74 106
222 213 222
221 205 143
244 226 171
248 248 248
0 0 0
0 0 0
0 0 0
0 0 0

BIN
data/tilesets/secondary/lilycove/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
data/tilesets/secondary/mauville/metatiles.bin
View File

Binary file not shown.

4
data/tilesets/secondary/mauville/palettes/07.pal
View File

@ -9,11 +9,11 @@ JASC-PAL
131 131 139
98 98 123
65 74 106
41 49 90
40 48 88
213 213 213
164 164 172
230 197 246
213 139 222
197 115 164
148 98 106
172 205 230
168 200 224

3
data/tilesets/secondary/mauville/palettes/07.pla Normal file
View File

@ -0,0 +1,3 @@
# Color indices to set high bit
1
15

10
data/tilesets/secondary/mauville/palettes/08.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
123 180 189
115 189 246
0 248 0
131 197 98
57 139 49
57 82 0
255 255 98
255 255 255
222 230 238
189 205 230
0 248 0
255 172 222
230 131 180
213 90 139
164 213 197
0 248 0
115 197 164
65 180 131
24 164 106
0 248 0
0 248 0

12
data/tilesets/secondary/mauville/palettes/09.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
123 180 189
255 255 255
248 0 248
131 197 98
57 139 49
57 82 0
255 255 98
172 197 230
139 164 222
106 131 213
248 0 248
248 0 248
255 230 148
238 197 115
230 172 82
248 0 248
164 213 197
115 197 164
65 180 131
24 164 106
248 0 248
248 0 248

4
data/tilesets/secondary/mauville/palettes/10.pal
View File

@ -9,9 +9,9 @@ JASC-PAL
131 131 139
98 98 123
65 74 106
41 49 90
144 216 248
246 197 98
148 222 255
144 216 248
230 172 238
213 139 222
197 115 164

4
data/tilesets/secondary/mauville/palettes/10.pla Normal file
View File

@ -0,0 +1,4 @@
# Color indices to set high bit
1
9
10

2
data/tilesets/secondary/mauville/palettes/11.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
172 180 139
123 180 189
255 255 255
222 230 238
164 180 197

3
data/tilesets/secondary/mauville/palettes/11.pla Normal file
View File

@ -0,0 +1,3 @@
# Color indices to set high bit
7
8

BIN
data/tilesets/secondary/mauville/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
data/tilesets/secondary/mossdeep/metatiles.bin
View File

Binary file not shown.

24
data/tilesets/secondary/mossdeep/palettes/01.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
131 197 98
0 192 0
255 255 255
222 230 238
189 205 230
156 180 222
131 131 139
205 205 197
180 180 164
180 189 222
139 139 148
98 98 123
65 74 106
41 49 90
115 189 246
98 172 238
255 189 131
238 148 115
222 106 98
205 65 82
115 197 164
255 248 180
224 217 159
255 213 49
238 148 16
205 213 131
148 148 74
90 82 8

32
data/tilesets/secondary/mossdeep/palettes/02.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
24 41 82
180 255 131
131 197 98
57 139 49
57 82 0
222 148 115
106 90 90
164 98 90
65 57 49
255 197 148
222 106 98
205 65 82
164 213 197
115 197 164
65 180 131
24 164 106
0 32 0
248 248 248
248 0 248
224 0 232
64 128 96
120 120 144
96 96 120
64 72 104
255 227 148
184 184 192
160 160 152
240 216 152
208 144 112
184 80 80
128 56 64
240 144 48

2
data/tilesets/secondary/mossdeep/palettes/08.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
131 197 98
0 0 0
255 255 255
205 205 197
180 180 164

3
data/tilesets/secondary/mossdeep/palettes/08.pla Normal file
View File

@ -0,0 +1,3 @@
# Color indices to set high bit
9
10

32
data/tilesets/secondary/mossdeep/palettes/09.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
131 197 98
255 255 255
139 205 123
98 172 98
65 131 98
123 123 148
98 98 123
65 74 106
41 49 90
189 189 197
164 164 156
246 222 156
213 148 115
189 82 82
131 57 65
246 148 49
0 32 0
248 248 248
248 0 248
224 0 232
64 128 96
120 120 144
96 96 120
64 72 104
80 72 104
184 184 192
160 160 152
240 216 152
208 144 112
184 80 80
128 56 64
240 144 48

BIN
data/tilesets/secondary/mossdeep/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

32
data/tilesets/secondary/pacifidlog/palettes/02.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
24 41 82
180 255 131
131 197 98
57 139 49
57 82 0
222 148 115
106 90 90
164 98 90
65 57 49
255 197 148
222 106 98
205 65 82
164 213 197
115 197 164
65 180 131
24 164 106
0 0 128
222 230 164
180 189 123
156 164 98
131 139 74
90 98 41
98 98 123
65 74 106
32 32 82
238 230 164
238 197 98
205 156 57
164 123 24
131 82 49
131 131 139
244 226 171

2
data/tilesets/secondary/pacifidlog/palettes/09.pal
View File

@ -16,4 +16,4 @@ JASC-PAL
164 123 24
131 82 49
131 131 139
82 106 213
64 72 104

2
data/tilesets/secondary/pacifidlog/palettes/09.pla Normal file
View File

@ -0,0 +1,2 @@
# Color indices to set high bit
15

BIN
data/tilesets/secondary/pacifidlog/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
data/tilesets/secondary/petalburg/metatiles.bin
View File

Binary file not shown.

32
data/tilesets/secondary/petalburg/palettes/02.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
24 41 82
180 255 131
131 197 98
57 139 49
57 82 0
222 148 115
106 90 90
164 98 90
65 57 49
255 197 148
222 106 98
205 65 82
164 213 197
115 197 164
65 180 131
24 164 106
0 192 0
232 224 200
208 200 144
200 176 120
168 136 120
128 128 136
96 96 120
64 72 104
40 48 88
244 226 171
221 205 143
248 224 176
248 184 168
240 160 128
200 136 104
248 192 32

4
data/tilesets/secondary/petalburg/palettes/06.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
24 41 82
0 0 0
255 255 255
230 222 222
213 213 197
@ -16,4 +16,4 @@ JASC-PAL
205 197 123
180 164 123
164 139 98
115 197 164
248 224 120

3
data/tilesets/secondary/petalburg/palettes/06.pla Normal file
View File

@ -0,0 +1,3 @@
# Color indices to set high bit
9
10

26
data/tilesets/secondary/petalburg/palettes/07.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
0 0 0
213 222 172
0 0 0
189 189 131
164 172 123
131 131 139
98 106 123
65 74 106
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
164 213 230
106 189 197
112 192 160
205 213 238
156 156 180
115 172 57
248 224 120

3
data/tilesets/secondary/petalburg/palettes/07.pla Normal file
View File

@ -0,0 +1,3 @@
# Color indices to set high bit
9
10

32
data/tilesets/secondary/petalburg/palettes/09.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
24 41 82
238 230 205
213 205 148
205 180 123
172 139 123
131 131 139
98 98 123
65 74 106
41 49 90
156 205 246
98 156 238
255 230 180
255 189 172
246 164 131
205 139 106
115 197 164
0 0 0
232 224 200
208 200 144
200 176 120
168 136 120
128 128 136
96 96 120
64 72 104
40 48 88
152 200 240
120 152 232
248 224 176
248 184 168
240 160 128
200 136 104
248 192 32

3
data/tilesets/secondary/petalburg/palettes/09.pla Normal file
View File

@ -0,0 +1,3 @@
# Color indices to set high bit
9
10

BIN
data/tilesets/secondary/petalburg/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
data/tilesets/secondary/rustboro/metatiles.bin
View File

Binary file not shown.

26
data/tilesets/secondary/rustboro/palettes/06.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
115 197 164
255 255 255
216 224 232
184 200 224
136 144 152
131 131 139
98 98 123
64 72 104
40 48 88
205 213 230
139 180 213
128 128 136
216 224 232
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
248 224 120

7
data/tilesets/secondary/rustboro/palettes/06.pla Normal file
View File

@ -0,0 +1,7 @@
# Colors in palette to set high (alpha) bit
2
3
4
5
9
10

2
data/tilesets/secondary/rustboro/palettes/10.pal
View File

@ -5,7 +5,7 @@ JASC-PAL
255 255 255
222 222 222
172 180 189
139 148 156
136 144 152
131 131 139
98 98 123
65 74 106

BIN
data/tilesets/secondary/rustboro/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
data/tilesets/secondary/slateport/metatile_attributes.bin
View File

Binary file not shown.

BIN
data/tilesets/secondary/slateport/metatiles.bin
View File

Binary file not shown.

4
data/tilesets/secondary/slateport/palettes/06.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
24 41 82
0 0 0
255 255 255
230 230 238
205 205 222
@ -16,4 +16,4 @@ JASC-PAL
197 180 189
164 156 164
131 106 172
115 197 164
112 192 160

2
data/tilesets/secondary/slateport/palettes/06.pla Normal file
View File

@ -0,0 +1,2 @@
# Color indices to set high bit
8

24
data/tilesets/secondary/slateport/palettes/12.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
0 0 0
222 205 148
184 168 80
168 224 200
216 216 176
148 148 156
98 98 123
64 72 104
184 184 152
0 0 0
148 205 255
184 224 216
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
248 224 120

6
data/tilesets/secondary/slateport/palettes/12.pla Normal file
View File

@ -0,0 +1,6 @@
# Color indices to set high bit
3
4
8
10
11

30
data/tilesets/secondary/slateport/palettes/15.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 213 180
255 197 148
222 148 115
123 65 65
57 74 123
41 57 98
24 41 82
16 32 57
222 230 238
255 197 90
189 156 90
255 98 90
197 65 65
0 32 0
255 255 255
0 0 0
230 230 238
205 205 222
197 180 222
123 131 156
98 98 123
65 74 106
255 231 138
205 205 148
172 148 90
222 213 238
197 180 189
164 156 164
131 106 172
112 192 160

BIN
data/tilesets/secondary/slateport/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

8
data/tilesets/secondary/sootopolis/palettes/06.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
115 197 164
248 240 176
255 255 255
238 238 213
222 222 180
@ -10,10 +10,10 @@ JASC-PAL
98 98 123
65 74 106
41 49 90
0 0 0
0 0 0
64 72 104
80 88 80
156 164 156
123 131 123
98 106 98
82 90 82
0 0 0
248 240 176

5
data/tilesets/secondary/sootopolis/palettes/06.pla Normal file
View File

@ -0,0 +1,5 @@
# Color indices to set high bit
0
9
10
15

4
data/tilesets/secondary/sootopolis/palettes/10.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
115 197 164
246 74 65
139 115 106
115 90 82
90 65 65
@ -16,4 +16,4 @@ JASC-PAL
148 74 41
82 139 197
74 115 172
0 0 0
246 74 65

8
data/tilesets/secondary/sootopolis/palettes/10.pla Normal file
View File

@ -0,0 +1,8 @@
# Color indices to set high bit
0
8
9
10
11
12
15

30
data/tilesets/secondary/sootopolis/palettes/15.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 213 180
255 197 148
222 148 115
123 65 65
57 74 123
41 57 98
24 41 82
16 32 57
222 230 238
255 197 90
189 156 90
255 98 90
197 65 65
0 192 0
255 255 255
0 0 0
238 238 213
222 222 180
180 180 148
131 131 139
98 98 123
65 74 106
41 49 90
244 226 171
221 205 143
156 164 156
123 131 123
98 106 98
82 90 82
248 240 176

BIN
data/tilesets/secondary/sootopolis/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 13 KiB

2
dev_scripts/followers/follower_emotions.py
View File

@ -47,4 +47,4 @@ def export_messages(infile, outfile, n=None, indent=0, start=0):
if __name__ == '__main__':
export_messages('emotions.txt', 'emotions.h', n=1, start=7)
export_messages('emotions.txt', 'emotions.h', n=4, start=42)

25
gflib/sprite.c
View File

@ -1463,7 +1463,7 @@ u16 LoadSpriteSheet(const struct SpriteSheet *sheet)
}
// Like LoadSpriteSheet, but checks if already loaded, and uses template image frames
u16 LoadSpriteSheetByTemplate(const struct SpriteTemplate *template, u32 frame, s32 offset)
u16 LoadSpriteSheetByTemplateWithOffset(const struct SpriteTemplate *template, u32 frame, s32 offset)
{
u16 tileStart;
struct SpriteSheet sheet;
@ -1477,6 +1477,20 @@ u16 LoadSpriteSheetByTemplate(const struct SpriteTemplate *template, u32 frame,
sheet.tag = template->tileTag;
return LoadSpriteSheetWithOffset(&sheet, offset);
}
// Like LoadSpriteSheet, but checks if already, and uses template image frames
u16 LoadSpriteSheetByTemplate(const struct SpriteTemplate *template, u8 frame) {
u16 tileStart;
struct SpriteSheet tempSheet;
// error if template is null or tile tag or images not set
if (!template || template->tileTag == TAG_NONE || !template->images)
return 0xFFFF;
if ((tileStart = GetSpriteTileStartByTag(template->tileTag)) != 0xFFFF) // return if already loaded
return tileStart;
tempSheet.data = template->images[frame].data;
tempSheet.size = template->images[frame].size;
tempSheet.tag = template->tileTag;
return LoadSpriteSheet(&tempSheet);
}
void LoadSpriteSheets(const struct SpriteSheet *sheets)
{
@ -1594,9 +1608,16 @@ void LoadSpritePalettes(const struct SpritePalette *palettes)
break;
}
u8 LoadSpritePaletteInSlot(const struct SpritePalette *palette, u8 paletteNum) {
paletteNum = min(15, paletteNum);
sSpritePaletteTags[paletteNum] = palette->tag;
DoLoadSpritePalette(palette->data, paletteNum * 16);
return paletteNum;
}
void DoLoadSpritePalette(const u16 *src, u16 paletteOffset)
{
LoadPalette(src, OBJ_PLTT_OFFSET + paletteOffset, PLTT_SIZE_4BPP);
LoadPaletteFast(src, paletteOffset + OBJ_PLTT_OFFSET, PLTT_SIZE_4BPP);
}
u8 AllocSpritePalette(u16 tag)

Some files were not shown because too many files have changed in this diff Show More