dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokefirered into various_documentation

Browse Source
This commit is contained in:
PikalaxALT
2020-04-07 07:50:06 -04:00
parent a7d74b1779 7693c90e67
commit 31ecdcdd0a
277 changed files with 430 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_specials.c
+32 -32
View File
@@ -2075,30 +2075,30 @@ void DaisyMassageServices(void)
}
static const u16 sEliteFourLightingPalettes[][16] = {
INCBIN_U16("data/field_specials/unk_83F5F50.gbapal"),
INCBIN_U16("data/field_specials/unk_83F5F70.gbapal"),
INCBIN_U16("data/field_specials/unk_83F5F90.gbapal"),
INCBIN_U16("data/field_specials/unk_83F5FB0.gbapal"),
INCBIN_U16("data/field_specials/unk_83F5FD0.gbapal"),
INCBIN_U16("data/field_specials/unk_83F5FF0.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6010.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6030.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6050.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6070.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6090.gbapal"),
INCBIN_U16("data/field_specials/unk_83F60B0.gbapal")
INCBIN_U16("graphics/field_specials/unk_83F5F50.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F5F70.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F5F90.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F5FB0.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F5FD0.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F5FF0.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6010.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6030.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6050.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6070.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6090.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F60B0.gbapal")
};
static const u16 sChampionRoomLightingPalettes[][16] = {
INCBIN_U16("data/field_specials/unk_83F60D0.gbapal"),
INCBIN_U16("data/field_specials/unk_83F60F0.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6110.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6130.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6150.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6170.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6190.gbapal"),
INCBIN_U16("data/field_specials/unk_83F61B0.gbapal"),
INCBIN_U16("data/field_specials/unk_83F61D0.gbapal")
INCBIN_U16("graphics/field_specials/unk_83F60D0.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F60F0.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6110.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6130.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6150.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6170.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6190.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F61B0.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F61D0.gbapal")
};
static const u8 sEliteFourLightingTimers[] = {
@@ -2317,17 +2317,17 @@ void CutMoveOpenDottedHoleDoor(void)
}
static const u16 sDeoxysObjectPals[][16] = {
INCBIN_U16("data/field_specials/unk_83F6206.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6226.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6246.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6266.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6286.gbapal"),
INCBIN_U16("data/field_specials/unk_83F62A6.gbapal"),
INCBIN_U16("data/field_specials/unk_83F62C6.gbapal"),
INCBIN_U16("data/field_specials/unk_83F62E6.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6306.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6326.gbapal"),
INCBIN_U16("data/field_specials/unk_83F6346.gbapal")
INCBIN_U16("graphics/field_specials/unk_83F6206.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6226.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6246.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6266.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6286.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F62A6.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F62C6.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F62E6.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6306.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6326.gbapal"),
INCBIN_U16("graphics/field_specials/unk_83F6346.gbapal")
};
static const u8 sDeoxysCoords[][2] = {