diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-11 12:06:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-11 12:06:00 -0400 |
| commit | b1603bba92dac95fd1621978f21ee9bf107f7b6a (patch) | |
| tree | 9d86f2a2aed82e2dcbefebe7c5dbdecf3aed607e /src/field_effect.c | |
| parent | 44dc1a473c8a4ff1c73b776889f2002136c7787d (diff) | |
| parent | 4767019e4f541a19577a9bfd09851a94b2e3c745 (diff) | |
Merge remote-tracking branch 'origin/master' into modern_ld
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 5942e68fd..c2b507882 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -59,10 +59,10 @@ static void SpriteCB_PokeballGlow(struct Sprite * sprite); static void SpriteCB_PokecenterMonitor(struct Sprite * sprite); static void SpriteCB_HallOfFameMonitor(struct Sprite * sprite); -static const u16 sNewGameOakObjectSpriteTiles[] = INCBIN_U16("graphics/field_effects/unk_83CA770.4bpp"); -static const u16 sNewGameOakObjectPals[] = INCBIN_U16("graphics/field_effects/unk_83CAF70.gbapal"); -static const u16 sUnknown_83CAF90[] = INCBIN_U16("graphics/field_effects/unk_83CAF90.4bpp"); -static const u16 sUnknown_83CAFB0[] = INCBIN_U16("graphics/field_effects/unk_83CAFB0.gbapal"); +static const u16 sNewGameOakObjectSpriteTiles[] = INCBIN_U16("graphics/field_effects/new_game_oak.4bpp"); +static const u16 sNewGameOakObjectPals[] = INCBIN_U16("graphics/field_effects/new_game_oak.gbapal"); +static const u16 sPokeballGfx[] = INCBIN_U16("graphics/field_effects/pokeball.4bpp"); +static const u16 sPokeballPal[] = INCBIN_U16("graphics/field_effects/pokeball.gbapal"); static const u16 sUnknown_83CAFD0[] = INCBIN_U16("graphics/field_effects/unk_83CAFD0.4bpp"); static const u16 sUnknown_83CB3D0[] = INCBIN_U16("graphics/field_effects/unk_83CB3D0.gbapal"); static const u16 sUnknown_83CB3F0[] = INCBIN_U16("graphics/field_effects/unk_83CB3F0.4bpp"); @@ -161,7 +161,7 @@ static const struct SpriteTemplate sNewGameOakObjectTemplate = { }; const struct SpritePalette gUnknown_83CBE9C = { - sUnknown_83CAFB0, 4103 + sPokeballPal, 4103 }; const struct SpritePalette gUnknown_83CBEA4 = { @@ -185,7 +185,7 @@ static const struct OamData sOamData_83CBEAC = { }; static const struct SpriteFrameImage sUnknown_83CBEB4[] = { - {sUnknown_83CAF90, 0x20} + {sPokeballGfx, 0x20} }; static const struct SpriteFrameImage sUnknown_83CBEBC[] = { |