mirror of
https://github.com/pret/pokefirered.git
synced 2026-05-13 15:59:12 -05:00
Rename palette tags and files
This commit is contained in:
PikalaxALT
parent
e07dd9507b
commit
a64b074e7d
Binary file not shown.
|
Before Width: | Height: | Size: 98 B After Width: | Height: | Size: 165 B |
Binary file not shown.
|
Before Width: | Height: | Size: 89 B After Width: | Height: | Size: 157 B |
Binary file not shown.
|
Before Width: | Height: | Size: 88 B After Width: | Height: | Size: 156 B |
Binary file not shown.
|
Before Width: | Height: | Size: 86 B After Width: | Height: | Size: 156 B |
|
|
@ -1,19 +0,0 @@
|
|||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
131 123 164
|
||||
172 123 65
|
||||
255 197 148
|
||||
222 148 115
|
||||
123 65 65
|
||||
65 65 213
|
||||
57 57 123
|
||||
115 164 197
|
||||
106 41 41
|
||||
238 238 255
|
||||
180 180 213
|
||||
255 106 74
|
||||
197 57 57
|
||||
255 222 90
|
||||
189 156 57
|
||||
0 0 0
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
197 255 246
|
||||
238 189 180
|
||||
255 255 230
|
||||
255 230 197
|
||||
205 148 148
|
||||
123 164 238
|
||||
115 131 197
|
||||
172 213 255
|
||||
172 123 98
|
||||
255 255 255
|
||||
222 222 255
|
||||
255 230 172
|
||||
255 172 172
|
||||
255 255 172
|
||||
230 205 115
|
||||
82 82 82
|
||||
|
|
@ -71,7 +71,7 @@ void LoadPlayerObjectReflectionPalette(u16, u8);
|
|||
void LoadSpecialObjectReflectionPalette(u16, u8);
|
||||
void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16);
|
||||
void PatchObjectPalette(u16, u8);
|
||||
void sub_805EDF0(s16, s16);
|
||||
void ReloadMapObjectsWithOffset(s16 x, s16 y);
|
||||
void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
|
||||
void sub_8063AD4(s16, s16, s16 *, s16 *);
|
||||
u8 GetFaceDirectionAnimNum(u8);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const u16 gObjectEventPal_Player[] = INCBIN_U16("graphics/object_events/palettes/0.gbapal");
|
||||
const u16 gObjectEventPal_Player[] = INCBIN_U16("graphics/object_events/palettes/player.gbapal");
|
||||
const u16 gUnknown_835B988[] = INCBIN_U16("graphics/object_events/palettes/unk_835B988.gbapal");
|
||||
const u16 gObjectEventPaletteNull1[16] = {};
|
||||
const u16 gObjectEventPaletteNull2[16] = {};
|
||||
|
|
@ -18,8 +18,8 @@ const u16 gObjectEventPic_RedNormal[] = INCBIN_U16("graphics/object_events/pics/
|
|||
const u16 gObjectEventPic_RedSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/red_surf_run.4bpp");
|
||||
const u16 gObjectEventPic_GreenNormal[] = INCBIN_U16("graphics/object_events/pics/people/green_normal.4bpp");
|
||||
const u16 gObjectEventPic_GreenSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/green_surf_run.4bpp");
|
||||
const u16 gObjectEventPal_9[] = INCBIN_U16("graphics/object_events/palettes/1.gbapal");
|
||||
const u16 gObjectEventPal_PlayerReflection[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal");
|
||||
const u16 gObjectEventPal_PlayerReflection[] = INCBIN_U16("graphics/object_events/palettes/player_reflection.gbapal");
|
||||
const u16 gObjectEventPal_PlayerReflectionDummy[] = INCBIN_U16("graphics/object_events/palettes/player_reflection_dummy.gbapal");
|
||||
const u16 gObjectEventPic_RedItem[] = INCBIN_U16("graphics/object_events/pics/people/red_item.4bpp");
|
||||
const u16 gObjectEventPic_GreenItem[] = INCBIN_U16("graphics/object_events/pics/people/green_item.4bpp");
|
||||
const u16 gObjectEventPic_RedSurf[] = INCBIN_U16("graphics/object_events/pics/people/red_surf.4bpp");
|
||||
|
|
@ -45,14 +45,14 @@ const u16 gObjectEventPic_Koga[] = INCBIN_U16("graphics/object_events/pics/peopl
|
|||
const u16 gObjectEventPic_Brock[] = INCBIN_U16("graphics/object_events/pics/people/brock.4bpp");
|
||||
const u16 gObjectEventPic_LtSurge[] = INCBIN_U16("graphics/object_events/pics/people/lt_surge.4bpp");
|
||||
const u16 gObjectEventPic_Bill[] = INCBIN_U16("graphics/object_events/pics/people/bill.4bpp");
|
||||
const u16 gObjectEventPal_NpcBlue[] = INCBIN_U16("graphics/object_events/palettes/3.gbapal");
|
||||
const u16 gObjectEventPal_NpcPink[] = INCBIN_U16("graphics/object_events/palettes/4.gbapal");
|
||||
const u16 gObjectEventPal_NpcGreen[] = INCBIN_U16("graphics/object_events/palettes/5.gbapal");
|
||||
const u16 gObjectEventPal_NpcWhite[] = INCBIN_U16("graphics/object_events/palettes/6.gbapal");
|
||||
const u16 gObjectEventPal_4[] = INCBIN_U16("graphics/object_events/palettes/7.gbapal");
|
||||
const u16 gObjectEventPal_5[] = INCBIN_U16("graphics/object_events/palettes/8.gbapal");
|
||||
const u16 gObjectEventPal_6[] = INCBIN_U16("graphics/object_events/palettes/9.gbapal");
|
||||
const u16 gObjectEventPal_7[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal");
|
||||
const u16 gObjectEventPal_NpcBlue[] = INCBIN_U16("graphics/object_events/palettes/npc_blue.gbapal");
|
||||
const u16 gObjectEventPal_NpcPink[] = INCBIN_U16("graphics/object_events/palettes/npc_pink.gbapal");
|
||||
const u16 gObjectEventPal_NpcGreen[] = INCBIN_U16("graphics/object_events/palettes/npc_green.gbapal");
|
||||
const u16 gObjectEventPal_NpcWhite[] = INCBIN_U16("graphics/object_events/palettes/npc_white.gbapal");
|
||||
const u16 gObjectEventPal_NpcBlueReflection[] = INCBIN_U16("graphics/object_events/palettes/npc_blue_reflection.gbapal");
|
||||
const u16 gObjectEventPal_NpcPinkReflection[] = INCBIN_U16("graphics/object_events/palettes/npc_pink_reflection.gbapal");
|
||||
const u16 gObjectEventPal_NpcGreenReflection[] = INCBIN_U16("graphics/object_events/palettes/npc_green_reflection.gbapal");
|
||||
const u16 gObjectEventPal_NpcWhiteReflection[] = INCBIN_U16("graphics/object_events/palettes/npc_white_reflection.gbapal");
|
||||
const u16 gObjectEventPic_LittleBoy[] = INCBIN_U16("graphics/object_events/pics/people/little_boy.4bpp");
|
||||
const u16 gObjectEventPic_LittleGirl[] = INCBIN_U16("graphics/object_events/pics/people/little_girl.4bpp");
|
||||
const u16 gObjectEventPic_SittingBoy[] = INCBIN_U16("graphics/object_events/pics/people/sitting_boy.4bpp");
|
||||
|
|
@ -175,12 +175,12 @@ const u16 gObjectEventPic_GymSign[] = INCBIN_U16("graphics/object_events/pics/mi
|
|||
const u16 gObjectEventPic_Sign[] = INCBIN_U16("graphics/object_events/pics/misc/sign.4bpp");
|
||||
const u16 gObjectEventPic_WoodenSign[] = INCBIN_U16("graphics/object_events/pics/misc/wooden_sign.4bpp");
|
||||
const u16 gObjectEventPic_Clipboard[] = INCBIN_U16("graphics/object_events/pics/misc/clipboard.4bpp");
|
||||
const u16 gObjectEventPal_Meteorite[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal");
|
||||
const u16 gObjectEventPal_Meteorite[] = INCBIN_U16("graphics/object_events/palettes/meteorite.gbapal");
|
||||
const u16 gObjectEventPic_BirthIslandStone[] = INCBIN_U16("graphics/object_events/pics/misc/birth_island_stone.4bpp");
|
||||
const u16 gObjectEventPic_LaprasDoll[] = INCBIN_U16("graphics/object_events/pics/misc/lapras_doll.4bpp");
|
||||
const u16 gObjectEventPal_Seagallop[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal");
|
||||
const u16 gObjectEventPal_Seagallop[] = INCBIN_U16("graphics/object_events/palettes/seagallop.gbapal");
|
||||
const u16 gObjectEventPic_Seagallop[] = INCBIN_U16("graphics/object_events/pics/misc/seagallop.4bpp");
|
||||
const u16 gObjectEventPal_SSAnne[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal");
|
||||
const u16 gObjectEventPal_SSAnne[] = INCBIN_U16("graphics/object_events/palettes/ss_anne.gbapal");
|
||||
const u16 gObjectEventPic_SSAnne[] = INCBIN_U16("graphics/object_events/pics/misc/ss_anne.4bpp");
|
||||
const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/misc/surf_blob.4bpp");
|
||||
const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp");
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_RedNormal, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_RedNormal, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_RedSurf, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Policeman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Policeman, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSBrendan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSBrendan, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSMay = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSMay, gDummySpriteAffineAnimTable};
|
||||
|
|
@ -67,11 +67,11 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableClubReception
|
|||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomReceptionist, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RockSmashRock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_RockSmashRock, gObjectEventPicTable_RockSmashRock, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_StrengthBoulder = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_StrengthBoulder, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_GreenNormal, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GreenBike, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_GreenNormal, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GreenBike, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_GreenSurf, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45F4 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45F4 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RocketM, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celio = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Celio, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Agatha = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Agatha, gDummySpriteAffineAnimTable};
|
||||
|
|
@ -88,12 +88,12 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Daisy = {SPRITE_IN
|
|||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lorelei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lorelei, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lance = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lance, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blue = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blue, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_RedFish, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_GreenFish, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_RedFish, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_GreenFish, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TownMap = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 32, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TownMap, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pokedex = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Pokedex, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GBAKid, gDummySpriteAffineAnimTable};
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ static void GetObjectEventMovingCameraOffset(s16 *, s16 *);
|
|||
static struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8, u8, u8);
|
||||
static void LoadObjectEventPalette(u16);
|
||||
static void RemoveObjectEventIfOutsideView(struct ObjectEvent *);
|
||||
static void sub_805EE3C(u8, s16, s16);
|
||||
static void ReloadMapObjectWithOffset(u8 objectEventId, s16 x, s16 y);
|
||||
static void SetPlayerAvatarObjectEventIdAndObjectId(u8, u8);
|
||||
static void sub_805EFF4(struct ObjectEvent *);
|
||||
static u8 TryLoadObjectPalette(const struct SpritePalette *spritePalette);
|
||||
|
|
@ -450,23 +450,23 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] =
|
|||
};
|
||||
|
||||
#define OBJ_EVENT_PAL_TAG_PLAYER_RED 0x1100
|
||||
#define OBJ_EVENT_PAL_TAG_9 0x1101
|
||||
#define OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION 0x1102
|
||||
#define OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION 0x1101
|
||||
#define OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY 0x1102
|
||||
#define OBJ_EVENT_PAL_TAG_NPC_BLUE 0x1103
|
||||
#define OBJ_EVENT_PAL_TAG_NPC_PINK 0x1104
|
||||
#define OBJ_EVENT_PAL_TAG_NPC_GREEN 0x1105
|
||||
#define OBJ_EVENT_PAL_TAG_NPC_WHITE 0x1106
|
||||
#define OBJ_EVENT_PAL_TAG_4 0x1107
|
||||
#define OBJ_EVENT_PAL_TAG_5 0x1108
|
||||
#define OBJ_EVENT_PAL_TAG_6 0x1109
|
||||
#define OBJ_EVENT_PAL_TAG_7 0x110A
|
||||
#define OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION 0x1107
|
||||
#define OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION 0x1108
|
||||
#define OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION 0x1109
|
||||
#define OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION 0x110A
|
||||
#define OBJ_EVENT_PAL_TAG_12 0x110B
|
||||
#define OBJ_EVENT_PAL_TAG_13 0x110C
|
||||
#define OBJ_EVENT_PAL_TAG_14 0x110D
|
||||
#define OBJ_EVENT_PAL_TAG_15 0x110E
|
||||
#define OBJ_EVENT_PAL_TAG_16 0x110F
|
||||
#define OBJ_EVENT_PAL_TAG_PLAYER_GREEN 0x1110
|
||||
#define OBJ_EVENT_PAL_TAG_18 0x1111
|
||||
#define OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION 0x1111
|
||||
#define OBJ_EVENT_PAL_TAG_19 0x1112
|
||||
#define OBJ_EVENT_PAL_TAG_METEORITE 0x1113
|
||||
#define OBJ_EVENT_PAL_TAG_SEAGALLOP 0x1114
|
||||
|
|
@ -496,39 +496,39 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] =
|
|||
#include "data/object_events/object_event_graphics_info.h"
|
||||
|
||||
static const struct SpritePalette sObjectEventSpritePalettes[] = {
|
||||
{gObjectEventPal_NpcBlue, OBJ_EVENT_PAL_TAG_NPC_BLUE},
|
||||
{gObjectEventPal_NpcPink, OBJ_EVENT_PAL_TAG_NPC_PINK},
|
||||
{gObjectEventPal_NpcGreen, OBJ_EVENT_PAL_TAG_NPC_GREEN},
|
||||
{gObjectEventPal_NpcWhite, OBJ_EVENT_PAL_TAG_NPC_WHITE},
|
||||
{gObjectEventPal_4, OBJ_EVENT_PAL_TAG_4},
|
||||
{gObjectEventPal_5, OBJ_EVENT_PAL_TAG_5},
|
||||
{gObjectEventPal_6, OBJ_EVENT_PAL_TAG_6},
|
||||
{gObjectEventPal_7, OBJ_EVENT_PAL_TAG_7},
|
||||
{gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_RED},
|
||||
{gObjectEventPal_9, OBJ_EVENT_PAL_TAG_9},
|
||||
{gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION},
|
||||
{gObjectEventPal_12, OBJ_EVENT_PAL_TAG_12},
|
||||
{gObjectEventPal_13, OBJ_EVENT_PAL_TAG_13},
|
||||
{gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_GREEN},
|
||||
{gObjectEventPal_9, OBJ_EVENT_PAL_TAG_18},
|
||||
{gObjectEventPal_Meteorite, OBJ_EVENT_PAL_TAG_METEORITE},
|
||||
{gObjectEventPal_SSAnne, OBJ_EVENT_PAL_TAG_SS_ANNE},
|
||||
{gObjectEventPal_Seagallop, OBJ_EVENT_PAL_TAG_SEAGALLOP},
|
||||
{gObjectEventPal_NpcBlue, OBJ_EVENT_PAL_TAG_NPC_BLUE},
|
||||
{gObjectEventPal_NpcPink, OBJ_EVENT_PAL_TAG_NPC_PINK},
|
||||
{gObjectEventPal_NpcGreen, OBJ_EVENT_PAL_TAG_NPC_GREEN},
|
||||
{gObjectEventPal_NpcWhite, OBJ_EVENT_PAL_TAG_NPC_WHITE},
|
||||
{gObjectEventPal_NpcBlueReflection, OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION},
|
||||
{gObjectEventPal_NpcPinkReflection, OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION},
|
||||
{gObjectEventPal_NpcGreenReflection, OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION},
|
||||
{gObjectEventPal_NpcWhiteReflection, OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION},
|
||||
{gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_RED},
|
||||
{gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION},
|
||||
{gObjectEventPal_PlayerReflectionDummy, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY},
|
||||
{gObjectEventPal_12, OBJ_EVENT_PAL_TAG_12},
|
||||
{gObjectEventPal_13, OBJ_EVENT_PAL_TAG_13},
|
||||
{gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_GREEN},
|
||||
{gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION},
|
||||
{gObjectEventPal_Meteorite, OBJ_EVENT_PAL_TAG_METEORITE},
|
||||
{gObjectEventPal_SSAnne, OBJ_EVENT_PAL_TAG_SS_ANNE},
|
||||
{gObjectEventPal_Seagallop, OBJ_EVENT_PAL_TAG_SEAGALLOP},
|
||||
{},
|
||||
};
|
||||
|
||||
const u16 gPlayerReflectionPaletteTags[] = {
|
||||
OBJ_EVENT_PAL_TAG_9,
|
||||
OBJ_EVENT_PAL_TAG_9,
|
||||
OBJ_EVENT_PAL_TAG_9,
|
||||
OBJ_EVENT_PAL_TAG_9,
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION,
|
||||
};
|
||||
|
||||
const u16 gUnusedPlayerReflectionPaletteTags[] = {
|
||||
OBJ_EVENT_PAL_TAG_18,
|
||||
OBJ_EVENT_PAL_TAG_18,
|
||||
OBJ_EVENT_PAL_TAG_18,
|
||||
OBJ_EVENT_PAL_TAG_18,
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION,
|
||||
};
|
||||
|
||||
const u16 gUnknownPaletteTags_83A5200[] = {
|
||||
|
|
@ -609,10 +609,10 @@ const u16 gUnknownPaletteTags_83A5268[] = {
|
|||
};
|
||||
|
||||
const u16 gUnknownPaletteTags_83A5270[] = {
|
||||
OBJ_EVENT_PAL_TAG_6,
|
||||
OBJ_EVENT_PAL_TAG_6,
|
||||
OBJ_EVENT_PAL_TAG_6,
|
||||
OBJ_EVENT_PAL_TAG_6,
|
||||
OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION,
|
||||
};
|
||||
|
||||
const struct PairedPalettes gSpecialObjectReflectionPaletteSets[] = {
|
||||
|
|
@ -633,15 +633,15 @@ const struct PairedPalettes gSpecialObjectReflectionPaletteSets[] = {
|
|||
|
||||
const u16 gUnknownPaletteTags_83A52E0[] = {
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_RED,
|
||||
OBJ_EVENT_PAL_TAG_9,
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_BLUE,
|
||||
OBJ_EVENT_PAL_TAG_NPC_PINK,
|
||||
OBJ_EVENT_PAL_TAG_NPC_GREEN,
|
||||
OBJ_EVENT_PAL_TAG_NPC_WHITE,
|
||||
OBJ_EVENT_PAL_TAG_4,
|
||||
OBJ_EVENT_PAL_TAG_5,
|
||||
OBJ_EVENT_PAL_TAG_6,
|
||||
OBJ_EVENT_PAL_TAG_7,
|
||||
OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION,
|
||||
};
|
||||
|
||||
const u16 gUnknownPaletteTags_83A52F4[] = {
|
||||
|
|
@ -651,36 +651,36 @@ const u16 gUnknownPaletteTags_83A52F4[] = {
|
|||
OBJ_EVENT_PAL_TAG_NPC_PINK,
|
||||
OBJ_EVENT_PAL_TAG_NPC_GREEN,
|
||||
OBJ_EVENT_PAL_TAG_NPC_WHITE,
|
||||
OBJ_EVENT_PAL_TAG_4,
|
||||
OBJ_EVENT_PAL_TAG_5,
|
||||
OBJ_EVENT_PAL_TAG_6,
|
||||
OBJ_EVENT_PAL_TAG_7,
|
||||
OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION,
|
||||
};
|
||||
|
||||
const u16 gUnknownPaletteTags_83A5308[] = {
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_RED,
|
||||
OBJ_EVENT_PAL_TAG_9,
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_BLUE,
|
||||
OBJ_EVENT_PAL_TAG_NPC_PINK,
|
||||
OBJ_EVENT_PAL_TAG_NPC_GREEN,
|
||||
OBJ_EVENT_PAL_TAG_NPC_WHITE,
|
||||
OBJ_EVENT_PAL_TAG_4,
|
||||
OBJ_EVENT_PAL_TAG_5,
|
||||
OBJ_EVENT_PAL_TAG_6,
|
||||
OBJ_EVENT_PAL_TAG_7,
|
||||
OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION,
|
||||
};
|
||||
|
||||
const u16 gUnknownPaletteTags_83A531C[] = {
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_RED,
|
||||
OBJ_EVENT_PAL_TAG_9,
|
||||
OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_BLUE,
|
||||
OBJ_EVENT_PAL_TAG_NPC_PINK,
|
||||
OBJ_EVENT_PAL_TAG_NPC_GREEN,
|
||||
OBJ_EVENT_PAL_TAG_NPC_WHITE,
|
||||
OBJ_EVENT_PAL_TAG_4,
|
||||
OBJ_EVENT_PAL_TAG_5,
|
||||
OBJ_EVENT_PAL_TAG_6,
|
||||
OBJ_EVENT_PAL_TAG_7,
|
||||
OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION,
|
||||
OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION,
|
||||
};
|
||||
|
||||
const u16 *const gObjectPaletteTagSets[] = {
|
||||
|
|
@ -1904,7 +1904,7 @@ static void RemoveObjectEventIfOutsideView(struct ObjectEvent *objectEvent)
|
|||
RemoveObjectEvent(objectEvent);
|
||||
}
|
||||
|
||||
void sub_805EDF0(s16 x, s16 y)
|
||||
void ReloadMapObjectsWithOffset(s16 x, s16 y)
|
||||
{
|
||||
u8 i;
|
||||
|
||||
|
|
@ -1913,13 +1913,13 @@ void sub_805EDF0(s16 x, s16 y)
|
|||
{
|
||||
if (gObjectEvents[i].active)
|
||||
{
|
||||
sub_805EE3C(i, x, y);
|
||||
ReloadMapObjectWithOffset(i, x, y);
|
||||
}
|
||||
}
|
||||
CreateReflectionEffectSprites();
|
||||
}
|
||||
|
||||
static void sub_805EE3C(u8 objectEventId, s16 x, s16 y)
|
||||
static void ReloadMapObjectWithOffset(u8 objectEventId, s16 x, s16 y)
|
||||
{
|
||||
u8 spriteId;
|
||||
struct Sprite *sprite;
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ static void InitOverworldGraphicsRegisters(void);
|
|||
static void sub_8057024(bool32 a0);
|
||||
static void sub_8057074(void);
|
||||
static void mli4_mapscripts_and_other(void);
|
||||
static void sub_8057100(void);
|
||||
static void ReloadObjectsAndRunReturnToFieldMapScript(void);
|
||||
static void sub_8057114(void);
|
||||
static void SetCameraToTrackGuestPlayer(void);
|
||||
static void SetCameraToTrackGuestPlayer_2(void);
|
||||
|
|
@ -1933,7 +1933,7 @@ static bool32 sub_8056CD8(u8 *state)
|
|||
InitOverworldBgs();
|
||||
QuestLog_InitPalettesBackup();
|
||||
sub_8057024(FALSE);
|
||||
sub_8057100();
|
||||
ReloadObjectsAndRunReturnToFieldMapScript();
|
||||
sub_8057114();
|
||||
(*state)++;
|
||||
break;
|
||||
|
|
@ -1971,7 +1971,7 @@ static bool32 map_loading_iteration_2_link(u8 *state)
|
|||
break;
|
||||
case 2:
|
||||
CreateLinkPlayerSprites();
|
||||
sub_8057100();
|
||||
ReloadObjectsAndRunReturnToFieldMapScript();
|
||||
SetCameraToTrackGuestPlayer_2();
|
||||
SetHelpContextForMap();
|
||||
(*state)++;
|
||||
|
|
@ -2141,9 +2141,9 @@ static void mli4_mapscripts_and_other(void)
|
|||
TryRunOnWarpIntoMapScript();
|
||||
}
|
||||
|
||||
static void sub_8057100(void)
|
||||
static void ReloadObjectsAndRunReturnToFieldMapScript(void)
|
||||
{
|
||||
sub_805EDF0(0, 0);
|
||||
ReloadMapObjectsWithOffset(0, 0);
|
||||
RunOnReturnToFieldMapScript();
|
||||
}
|
||||
|
||||
|
|
@ -2267,7 +2267,7 @@ static bool32 LoadMap_QLPlayback(u8 *state)
|
|||
(*state)++;
|
||||
break;
|
||||
case 3:
|
||||
sub_8057100();
|
||||
ReloadObjectsAndRunReturnToFieldMapScript();
|
||||
sub_8057114();
|
||||
(*state)++;
|
||||
break;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user