Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim

This commit is contained in:
GriffinR
2022-08-23 10:47:07 -04:00
33 changed files with 777 additions and 433 deletions
+1 -1
View File
@@ -950,7 +950,7 @@ const u32 gBattleAnimSpritePal_Meteor[] = INCBIN_U32("graphics/battle_anims/spri
const u32 gBattleAnimSpriteGfx_FlatRock[] = INCBIN_U32("graphics/battle_anims/sprites/flat_rock.4bpp.lz");
const u32 gBattleAnimSpritePal_FlatRock[] = INCBIN_U32("graphics/battle_anims/sprites/flat_rock.gbapal.lz");
const u16 gUnknown_8D2FBB4[] = INCBIN_U16("graphics/interface/unk_8D2FBB4.gbapal");
const u16 gPPTextPalette[] = INCBIN_U16("graphics/interface/text_pp.gbapal");
#include "data/graphics/pokemon.h"
#include "data/graphics/trainers.h"