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

Merge branch 'master' into trainers

Browse Source
This commit is contained in:
PikalaxALT committed 2019-10-17 21:26:00 -04:00
2 parents 2435bcc09d 75f1c808cc
commit 2f0ae810f7
143 files changed
+2223 -1552
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/pokemon.c
+2 -2
View File
@@ -1527,7 +1527,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.paletteTag = 0,
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gTrainerBackPicTable_RubySapphireBrendan,
.images = gTrainerBackPicTable_RSBrendan,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
@@ -1536,7 +1536,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.paletteTag = 0,
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gTrainerBackPicTable_RubySapphireMay,
.images = gTrainerBackPicTable_RSMay,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},