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

Merge branch 'mail' of github.com:PikalaxALT/pokefirered into mail

Browse Source
This commit is contained in:
PikalaxALT
2019-10-15 09:54:43 -04:00
parent 19df609026 28d2e6f312
commit 951bbcf64d
9 changed files with 2444 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data.c
+12
View File
@@ -0,0 +1,12 @@
#include "global.h"
#include "malloc.h"
#include "battle.h"
#include "data.h"
#include "graphics.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/battle_ai.h"
#include "data/pokemon_graphics/front_pic_coordinates.h"
src/data/pokemon_graphics/front_pic_coordinates.h
+2203
View File
File diff suppressed because it is too large Load Diff
src/pokemon.c
+12 -12
View File
@@ -1470,7 +1470,7 @@ const struct SpriteTemplate gUnknown_825DEF0[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_8234698,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1479,7 +1479,7 @@ const struct SpriteTemplate gUnknown_825DEF0[] =
.oam = &gUnknown_824F010,
.anims = NULL,
.images = gUnknown_82346B8,
.affineAnims = gUnknown_8234944,
.affineAnims = gSpriteAffineAnimTable_8234944,
.callback = oac_poke_opponent,
},
{
@@ -1488,7 +1488,7 @@ const struct SpriteTemplate gUnknown_825DEF0[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_82346D8,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1497,7 +1497,7 @@ const struct SpriteTemplate gUnknown_825DEF0[] =
.oam = &gUnknown_824F010,
.anims = NULL,
.images = gUnknown_82346F8,
.affineAnims = gUnknown_8234944,
.affineAnims = gSpriteAffineAnimTable_8234944,
.callback = oac_poke_opponent,
},
};
@@ -1510,7 +1510,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_8234718,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1519,7 +1519,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_8234740,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1528,7 +1528,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_82347A8,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1537,7 +1537,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_82347C8,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1546,7 +1546,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_8234768,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
{
@@ -1555,7 +1555,7 @@ const struct SpriteTemplate gUnknown_825DF50[] =
.oam = &gUnknown_824F018,
.anims = NULL,
.images = gUnknown_8234788,
.affineAnims = gUnknown_82348C8,
.affineAnims = gSpriteAffineAnimTable_82348C8,
.callback = sub_80120C4,
},
};
@@ -2698,7 +2698,7 @@ void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition)
}
}
gMultiuseSpriteTemplate.paletteTag = speciesTag;
gMultiuseSpriteTemplate.anims = gUnknown_82349BC;
gMultiuseSpriteTemplate.anims = gSpriteAnimTable_82349BC;
}
void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition)
@@ -6089,7 +6089,7 @@ static void OakSpeechNidoranFSetupTemplateDummy(struct OakSpeechNidoranFStruct *
for (j = 0; j < structPtr->frameCount; ++j)
structPtr->frameImages[i * structPtr->spriteCount + j].data = &structPtr->bufferPtrs[i][j * 0x800];
structPtr->templates[i].images = &structPtr->frameImages[i * structPtr->spriteCount]; // should be frameCount logically
structPtr->templates[i].anims = gUnknown_82349BC;
structPtr->templates[i].anims = gSpriteAnimTable_82349BC;
structPtr->templates[i].paletteTag = i;
}
}
src/trainer_pokemon_sprites.c
+2 -2
View File
@@ -14,7 +14,7 @@ extern const struct CompressedSpriteSheet gMonBackPicTable[];
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const union AnimCmd *const gUnknown_82349BC[];
extern const union AnimCmd *const gSpriteAnimTable_82349BC[];
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
// Static type declarations
@@ -138,7 +138,7 @@ void LoadPicPaletteBySlot(u16 species, u32 otId, u32 personality, u8 paletteSlot
void AssignSpriteAnimsTable(bool8 isTrainer)
{
if (!isTrainer)
sCreatingSpriteTemplate.anims = gUnknown_82349BC;
sCreatingSpriteTemplate.anims = gSpriteAnimTable_82349BC;
else
sCreatingSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[0];
}