dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document trainer animations, correct unused table labelling

Browse Source
This commit is contained in:
Tetrable
2018-09-09 22:35:07 +01:00
parent 3a0c26887e
commit 044ef98309
5 changed files with 507 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/pokemon_graphics/unknown_anims.h
View File

@@ -1902,7 +1902,7 @@ const union AnimCmd *const gUnknown_0830064C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08300650[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08300654[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const *const gUnknownAnimationsSpriteAnimsPtrTable[] =
const union AnimCmd *const *const gUnusedTrainerFrontAnimsPtrTable[] =
{
gUnknown_082FFDCC,
gUnknown_082FFDD0,

64
src/data/trainer_graphics/back_pic_anims.h
View File

@@ -1,4 +1,4 @@
const union AnimCmd gUnknown_08305C24[] =
const union AnimCmd gAnimCmd_Brendan_1[] =
{
ANIMCMD_FRAME(0, 24),
ANIMCMD_FRAME(1, 9),
@@ -8,7 +8,7 @@ const union AnimCmd gUnknown_08305C24[] =
ANIMCMD_END,
};
const union AnimCmd gUnknown_08305C3C[] =
const union AnimCmd gAnimCmd_May_Steven_1[] =
{
ANIMCMD_FRAME(0, 24),
ANIMCMD_FRAME(1, 9),
@@ -18,7 +18,7 @@ const union AnimCmd gUnknown_08305C3C[] =
ANIMCMD_END,
};
const union AnimCmd gUnknown_08305C54[] =
const union AnimCmd gAnimCmd_Wally_1[] =
{
ANIMCMD_FRAME(0, 24),
ANIMCMD_FRAME(1, 9),
@@ -28,7 +28,7 @@ const union AnimCmd gUnknown_08305C54[] =
ANIMCMD_END,
};
const union AnimCmd gUnknown_08305C6C[] =
const union AnimCmd gAnimCmd_Red_1[] =
{
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(2, 6),
@@ -38,7 +38,7 @@ const union AnimCmd gUnknown_08305C6C[] =
ANIMCMD_END,
};
const union AnimCmd gUnknown_08305C84[] =
const union AnimCmd gAnimCmd_Leaf_1[] =
{
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(2, 6),
@@ -48,7 +48,7 @@ const union AnimCmd gUnknown_08305C84[] =
ANIMCMD_END,
};
const union AnimCmd gUnknown_08305C9C[] =
const union AnimCmd gAnimCmd_RubySapphireBrendan_1[] =
{
ANIMCMD_FRAME(0, 24),
ANIMCMD_FRAME(1, 9),
@@ -58,7 +58,7 @@ const union AnimCmd gUnknown_08305C9C[] =
ANIMCMD_END,
};
const union AnimCmd gUnknown_08305CB4[] =
const union AnimCmd gAnimCmd_RubySapphireMay_1[] =
{
ANIMCMD_FRAME(0, 24),
ANIMCMD_FRAME(1, 9),
@@ -68,62 +68,62 @@ const union AnimCmd gUnknown_08305CB4[] =
ANIMCMD_END,
};
const union AnimCmd *const gUnknown_08305CCC[] =
const union AnimCmd *const gTrainerBackAnims_Brendan[] =
{
AnimCmd_82FF540,
gUnknown_08305C24,
gAnimCmd_Brendan_1,
};
const union AnimCmd *const gUnknown_08305CD4[] =
const union AnimCmd *const gTrainerBackAnims_May[] =
{
AnimCmd_82FF540,
gUnknown_08305C3C,
gAnimCmd_May_Steven_1,
};
const union AnimCmd *const gUnknown_08305CDC[] =
const union AnimCmd *const gTrainerBackAnims_Red[] =
{
gAnimCmd_General_Frame0,
gUnknown_08305C6C,
gAnimCmd_Red_1,
};
const union AnimCmd *const gUnknown_08305CE4[] =
const union AnimCmd *const gTrainerBackAnims_Leaf[] =
{
gAnimCmd_General_Frame0,
gUnknown_08305C84,
gAnimCmd_Leaf_1,
};
const union AnimCmd *const gUnknown_08305CEC[] =
const union AnimCmd *const gTrainerBackAnims_RubySapphireBrendan[] =
{
AnimCmd_82FF540,
gUnknown_08305C9C,
gAnimCmd_RubySapphireBrendan_1,
};
const union AnimCmd *const gUnknown_08305CF4[] =
const union AnimCmd *const gTrainerBackAnims_RubySapphireMay[] =
{
AnimCmd_82FF540,
gUnknown_08305CB4,
gAnimCmd_RubySapphireMay_1,
};
const union AnimCmd *const gUnknown_08305CFC[] =
const union AnimCmd *const gTrainerBackAnims_Wally[] =
{
AnimCmd_82FF540,
gUnknown_08305C54,
gAnimCmd_Wally_1,
};
const union AnimCmd *const gUnknown_08305D04[] =
const union AnimCmd *const gTrainerBackAnims_Steven[] =
{
AnimCmd_82FF540,
gUnknown_08305C3C,
gAnimCmd_May_Steven_1,
};
const union AnimCmd *const *const gUnknown_08305D0C[] =
const union AnimCmd *const *const gTrainerBackAnimsPtrTable[] =
{
gUnknown_08305CCC,
gUnknown_08305CD4,
gUnknown_08305CDC,
gUnknown_08305CE4,
gUnknown_08305CEC,
gUnknown_08305CF4,
gUnknown_08305CFC,
gUnknown_08305D04,
gTrainerBackAnims_Brendan,
gTrainerBackAnims_May,
gTrainerBackAnims_Red,
gTrainerBackAnims_Leaf,
gTrainerBackAnims_RubySapphireBrendan,
gTrainerBackAnims_RubySapphireMay,
gTrainerBackAnims_Wally,
gTrainerBackAnims_Steven,
};

656
src/data/trainer_graphics/front_pic_anims.h
View File

@@ -1,190 +1,468 @@
const union AnimCmd *const gUnknown_083051F8[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083051FC[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305200[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305204[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305208[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830520C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305210[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305214[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305218[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830521C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305220[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305224[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305228[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830522C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305230[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305234[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305238[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830523C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305240[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305244[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305248[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830524C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305250[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305254[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305258[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830525C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305260[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305264[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305268[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830526C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305270[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305274[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305278[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830527C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305280[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305284[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305288[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830528C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305290[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305294[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305298[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830529C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052A0[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052A4[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052A8[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052AC[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052B0[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052B4[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052B8[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052BC[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052C0[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052C4[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052C8[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052CC[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052D0[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052D4[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052D8[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052DC[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052E0[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052E4[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052E8[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052EC[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052F0[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052F4[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052F8[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_083052FC[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305300[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305304[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305308[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830530C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305310[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305314[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305318[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830531C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305320[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305324[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305328[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830532C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305330[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305334[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305338[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830533C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305340[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305344[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305348[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830534C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305350[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305354[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305358[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_0830535C[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305360[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305364[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08305368[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const *const gUnknown_0830536C[] =
{
gUnknown_083051F8,
gUnknown_083051FC,
gUnknown_08305200,
gUnknown_08305204,
gUnknown_08305208,
gUnknown_0830520C,
gUnknown_08305210,
gUnknown_08305214,
gUnknown_08305218,
gUnknown_0830521C,
gUnknown_08305220,
gUnknown_08305224,
gUnknown_08305228,
gUnknown_0830522C,
gUnknown_08305230,
gUnknown_08305234,
gUnknown_08305238,
gUnknown_0830523C,
gUnknown_08305240,
gUnknown_08305244,
gUnknown_08305248,
gUnknown_0830524C,
gUnknown_08305250,
gUnknown_08305254,
gUnknown_08305258,
gUnknown_0830525C,
gUnknown_08305260,
gUnknown_08305264,
gUnknown_08305268,
gUnknown_0830526C,
gUnknown_08305270,
gUnknown_08305274,
gUnknown_08305278,
gUnknown_0830527C,
gUnknown_08305280,
gUnknown_08305284,
gUnknown_08305288,
gUnknown_0830528C,
gUnknown_08305290,
gUnknown_08305294,
gUnknown_08305298,
gUnknown_0830529C,
gUnknown_083052A0,
gUnknown_083052A4,
gUnknown_083052A8,
gUnknown_083052AC,
gUnknown_083052B0,
gUnknown_083052B4,
gUnknown_083052B8,
gUnknown_083052BC,
gUnknown_083052C0,
gUnknown_083052C4,
gUnknown_083052C8,
gUnknown_083052CC,
gUnknown_083052D0,
gUnknown_083052D4,
gUnknown_083052D8,
gUnknown_083052DC,
gUnknown_083052E0,
gUnknown_083052E4,
gUnknown_083052E8,
gUnknown_083052EC,
gUnknown_083052F0,
gUnknown_083052F4,
gUnknown_083052F8,
gUnknown_083052FC,
gUnknown_08305300,
gUnknown_08305304,
gUnknown_08305308,
gUnknown_0830530C,
gUnknown_08305310,
gUnknown_08305314,
gUnknown_08305318,
gUnknown_0830531C,
gUnknown_08305320,
gUnknown_08305324,
gUnknown_08305328,
gUnknown_0830532C,
gUnknown_08305330,
gUnknown_08305334,
gUnknown_08305338,
gUnknown_0830533C,
gUnknown_08305340,
gUnknown_08305344,
gUnknown_08305348,
gUnknown_0830534C,
gUnknown_08305350,
gUnknown_08305354,
gUnknown_08305358,
gUnknown_0830535C,
gUnknown_08305360,
gUnknown_08305364,
gUnknown_08305368,
const union AnimCmd *const gTrainerFrontAnims_Hiker[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_AquaGruntM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_PokemonBreederF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_CoolTrainerM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_BirdKeeper[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Collector[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_AquaGruntF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_SwimmerM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_MagmaGruntM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_ExpertM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_AquaAdminM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_BlackBelt[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_AquaAdminF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_AquaLeaderArchie[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_HexManiac[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_AromaLady[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_RuinManiac[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Interviewer[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_TuberF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_TuberM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_CoolTrainerF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Lady[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Beauty[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_RichBoy[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_ExpertF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Pokemaniac[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_MagmaGruntF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Guitarist[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Kindler[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Camper[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Picnicker[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_BugManiac[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_PokemonBreederM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_PsychicM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_PsychicF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Gentleman[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_EliteFourSidney[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_EliteFourPhoebe[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_EliteFourGlacia[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_EliteFourDrake[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_LeaderRoxanne[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_LeaderBrawly[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_LeaderWattson[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_LeaderFlannery[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_LeaderNorman[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_LeaderWinona[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_LeaderTateAndLiza[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_LeaderJuan[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_SchoolKidM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_SchoolKidF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_SrAndJr[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_WinstrateM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_WinstrateF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Youngster[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_ChampionWallace[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Fisherman[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_CyclingTriathleteM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_CyclingTriathleteF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_RunningTriathleteM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_RunningTriathleteF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_SwimmingTriathleteM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_SwimmingTriathleteF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_DragonTamer[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_NinjaBoy[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_BattleGirl[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_ParasolLady[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_SwimmerF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Twins[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Sailor[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_MagmaAdmin[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Wally[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Brendan[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_May[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_BugCatcher[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_PokemonRangerM[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_PokemonRangerF[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_MagmaLeaderMaxie[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Lass[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_YoungCouple[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_OldCouple[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_SisAndBro[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Steven[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_SalonMaidenAnabel[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_DomeAceTucker[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_PalaceMavenSpenser[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_ArenaTycoonGreta[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_FactoryHeadNoland[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_PikeQueenLucy[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_PyramidKingBrandon[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Red[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_Leaf[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_RubySapphireBrendan[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const gTrainerFrontAnims_RubySapphireMay[] ={
gAnimCmd_General_Frame0,
};
const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] =
{
gTrainerFrontAnims_Hiker, // TRAINER_PIC_HIKER
gTrainerFrontAnims_AquaGruntM, // TRAINER_PIC_AQUA_GRUNT_M
gTrainerFrontAnims_PokemonBreederF, // TRAINER_PIC_POKEMON_BREEDER_F
gTrainerFrontAnims_CoolTrainerM, // TRAINER_PIC_COOL_TRAINER_M
gTrainerFrontAnims_BirdKeeper, // TRAINER_PIC_BIRD_KEEPER
gTrainerFrontAnims_Collector, // TRAINER_PIC_COLLECTOR
gTrainerFrontAnims_AquaGruntF, // TRAINER_PIC_AQUA_GRUNT_F
gTrainerFrontAnims_SwimmerM, // TRAINER_PIC_SWIMMER_M
gTrainerFrontAnims_MagmaGruntM, // TRAINER_PIC_MAGMA_GRUNT_M
gTrainerFrontAnims_ExpertM, // TRAINER_PIC_EXPERT_M
gTrainerFrontAnims_AquaAdminM, // TRAINER_PIC_AQUA_ADMIN_M
gTrainerFrontAnims_BlackBelt, // TRAINER_PIC_BLACK_BELT
gTrainerFrontAnims_AquaAdminF, // TRAINER_PIC_AQUA_ADMIN_F
gTrainerFrontAnims_AquaLeaderArchie, // TRAINER_PIC_AQUA_LEADER_ARCHIE
gTrainerFrontAnims_HexManiac, // TRAINER_PIC_HEX_MANIAC
gTrainerFrontAnims_AromaLady, // TRAINER_PIC_AROMA_LADY
gTrainerFrontAnims_RuinManiac, // TRAINER_PIC_RUIN_MANIAC
gTrainerFrontAnims_Interviewer, // TRAINER_PIC_INTERVIEWER
gTrainerFrontAnims_TuberF, // TRAINER_PIC_TUBER_F
gTrainerFrontAnims_TuberM, // TRAINER_PIC_TUBER_M
gTrainerFrontAnims_CoolTrainerF, // TRAINER_PIC_COOL_TRAINER_F
gTrainerFrontAnims_Lady, // TRAINER_PIC_LADY
gTrainerFrontAnims_Beauty, // TRAINER_PIC_BEAUTY
gTrainerFrontAnims_RichBoy, // TRAINER_PIC_RICH_BOY
gTrainerFrontAnims_ExpertF, // TRAINER_PIC_EXPERT_F
gTrainerFrontAnims_Pokemaniac, // TRAINER_PIC_POKEMANIAC
gTrainerFrontAnims_MagmaGruntF, // TRAINER_PIC_MAGMA_GRUNT_F
gTrainerFrontAnims_Guitarist, // TRAINER_PIC_GUITARIST
gTrainerFrontAnims_Kindler, // TRAINER_PIC_KINDLER
gTrainerFrontAnims_Camper, // TRAINER_PIC_CAMPER
gTrainerFrontAnims_Picnicker, // TRAINER_PIC_PICNICKER
gTrainerFrontAnims_BugManiac, // TRAINER_PIC_BUG_MANIAC
gTrainerFrontAnims_PokemonBreederM, // TRAINER_PIC_POKEMON_BREEDER_M
gTrainerFrontAnims_PsychicM, // TRAINER_PIC_PSYCHIC_M
gTrainerFrontAnims_PsychicF, // TRAINER_PIC_PSYCHIC_F
gTrainerFrontAnims_Gentleman, // TRAINER_PIC_GENTLEMAN
gTrainerFrontAnims_EliteFourSidney, // TRAINER_PIC_ELITE_FOUR_SIDNEY
gTrainerFrontAnims_EliteFourPhoebe, // TRAINER_PIC_ELITE_FOUR_PHOEBE
gTrainerFrontAnims_EliteFourGlacia, // TRAINER_PIC_ELITE_FOUR_GLACIA
gTrainerFrontAnims_EliteFourDrake, // TRAINER_PIC_ELITE_FOUR_DRAKE
gTrainerFrontAnims_LeaderRoxanne, // TRAINER_PIC_LEADER_ROXANNE
gTrainerFrontAnims_LeaderBrawly, // TRAINER_PIC_LEADER_BRAWLY
gTrainerFrontAnims_LeaderWattson, // TRAINER_PIC_LEADER_WATTSON
gTrainerFrontAnims_LeaderFlannery, // TRAINER_PIC_LEADER_FLANNERY
gTrainerFrontAnims_LeaderNorman, // TRAINER_PIC_LEADER_NORMAN
gTrainerFrontAnims_LeaderWinona, // TRAINER_PIC_LEADER_WINONA
gTrainerFrontAnims_LeaderTateAndLiza, // TRAINER_PIC_LEADER_TATE_AND_LIZA
gTrainerFrontAnims_LeaderJuan, // TRAINER_PIC_LEADER_JUAN
gTrainerFrontAnims_SchoolKidM, // TRAINER_PIC_SCHOOL_KID_M
gTrainerFrontAnims_SchoolKidF, // TRAINER_PIC_SCHOOL_KID_F
gTrainerFrontAnims_SrAndJr, // TRAINER_PIC_SR_AND_JR
gTrainerFrontAnims_WinstrateM, // TRAINER_PIC_WINSTRATE_M
gTrainerFrontAnims_WinstrateF, // TRAINER_PIC_WINSTRATE_F
gTrainerFrontAnims_Youngster, // TRAINER_PIC_YOUNGSTER
gTrainerFrontAnims_ChampionWallace, // TRAINER_PIC_CHAMPION_WALLACE
gTrainerFrontAnims_Fisherman, // TRAINER_PIC_FISHERMAN
gTrainerFrontAnims_CyclingTriathleteM, // TRAINER_PIC_CYCLING_TRIATHLETE_M
gTrainerFrontAnims_CyclingTriathleteF, // TRAINER_PIC_CYCLING_TRIATHLETE_F
gTrainerFrontAnims_RunningTriathleteM, // TRAINER_PIC_RUNNING_TRIATHLETE_M
gTrainerFrontAnims_RunningTriathleteF, // TRAINER_PIC_RUNNING_TRIATHLETE_F
gTrainerFrontAnims_SwimmingTriathleteM, // TRAINER_PIC_SWIMMING_TRIATHLETE_M
gTrainerFrontAnims_SwimmingTriathleteF, // TRAINER_PIC_SWIMMING_TRIATHLETE_F
gTrainerFrontAnims_DragonTamer, // TRAINER_PIC_DRAGON_TAMER
gTrainerFrontAnims_NinjaBoy, // TRAINER_PIC_NINJA_BOY
gTrainerFrontAnims_BattleGirl, // TRAINER_PIC_BATTLE_GIRL
gTrainerFrontAnims_ParasolLady, // TRAINER_PIC_PARASOL_LADY
gTrainerFrontAnims_SwimmerF, // TRAINER_PIC_SWIMMER_F
gTrainerFrontAnims_Twins, // TRAINER_PIC_TWINS
gTrainerFrontAnims_Sailor, // TRAINER_PIC_SAILOR
gTrainerFrontAnims_MagmaAdmin, // TRAINER_PIC_MAGMA_ADMIN
gTrainerFrontAnims_Wally, // TRAINER_PIC_WALLY
gTrainerFrontAnims_Brendan, // TRAINER_PIC_BRENDAN
gTrainerFrontAnims_May, // TRAINER_PIC_MAY
gTrainerFrontAnims_BugCatcher, // TRAINER_PIC_BUG_CATCHER
gTrainerFrontAnims_PokemonRangerM, // TRAINER_PIC_POKEMON_RANGER_M
gTrainerFrontAnims_PokemonRangerF, // TRAINER_PIC_POKEMON_RANGER_F
gTrainerFrontAnims_MagmaLeaderMaxie, // TRAINER_PIC_MAGMA_LEADER_MAXIE
gTrainerFrontAnims_Lass, // TRAINER_PIC_LASS
gTrainerFrontAnims_YoungCouple, // TRAINER_PIC_YOUNG_COUPLE
gTrainerFrontAnims_OldCouple, // TRAINER_PIC_OLD_COUPLE
gTrainerFrontAnims_SisAndBro, // TRAINER_PIC_SIS_AND_BRO
gTrainerFrontAnims_Steven, // TRAINER_PIC_STEVEN
gTrainerFrontAnims_SalonMaidenAnabel, // TRAINER_PIC_SALON_MAIDEN_ANABEL
gTrainerFrontAnims_DomeAceTucker, // TRAINER_PIC_DOME_ACE_TUCKER
gTrainerFrontAnims_PalaceMavenSpenser, // TRAINER_PIC_PALACE_MAVEN_SPENSER
gTrainerFrontAnims_ArenaTycoonGreta, // TRAINER_PIC_ARENA_TYCOON_GRETA
gTrainerFrontAnims_FactoryHeadNoland, // TRAINER_PIC_FACTORY_HEAD_NOLAND
gTrainerFrontAnims_PikeQueenLucy, // TRAINER_PIC_PIKE_QUEEN_LUCY
gTrainerFrontAnims_PyramidKingBrandon, // TRAINER_PIC_PYRAMID_KING_BRANDON
gTrainerFrontAnims_Red, // TRAINER_PIC_RED
gTrainerFrontAnims_Leaf, // TRAINER_PIC_LEAF
gTrainerFrontAnims_RubySapphireBrendan, // TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN
gTrainerFrontAnims_RubySapphireMay, // TRAINER_PIC_RUBY_SAPPHIRE_MAY
};

10
src/pokemon.c
View File

@@ -66,8 +66,8 @@ extern const union AffineAnimCmd *const gUnknown_082FF618[];
extern const union AffineAnimCmd *const gUnknown_082FF694[];
extern const union AnimCmd *gPlayerMonSpriteAnimsTable[];
extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[];
extern const union AnimCmd *const *const gUnknown_08305D0C[];
extern const union AnimCmd *const *const gUnknown_0830536C[];
extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
extern const struct UnknownPokemonStruct3 gUnknown_08610970[];
extern const struct CompressedSpritePalette gMonPaletteTable[];
@@ -3831,7 +3831,7 @@ void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosit
if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT)
{
gMultiuseSpriteTemplate = gUnknown_08329DF8[trainerSpriteId];
gMultiuseSpriteTemplate.anims = gUnknown_08305D0C[trainerSpriteId];
gMultiuseSpriteTemplate.anims = gTrainerBackAnimsPtrTable[trainerSpriteId];
}
else
{
@@ -3839,7 +3839,7 @@ void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosit
gMultiuseSpriteTemplate = gMonSpritesGfxPtr->templates[battlerPosition];
else
gMultiuseSpriteTemplate = gUnknown_08329D98[battlerPosition];
gMultiuseSpriteTemplate.anims = gUnknown_0830536C[trainerSpriteId];
gMultiuseSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[trainerSpriteId];
}
}
@@ -3851,7 +3851,7 @@ void SetMultiuseSpriteTemplateToTrainerFront(u16 arg0, u8 battlerPosition)
gMultiuseSpriteTemplate = gUnknown_08329D98[battlerPosition];
gMultiuseSpriteTemplate.paletteTag = arg0;
gMultiuseSpriteTemplate.anims = gUnknown_0830536C[arg0];
gMultiuseSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[arg0];
}
static void EncryptBoxMon(struct BoxPokemon *boxMon)

4
src/trainer_pokemon_sprites.c
View File

@@ -19,7 +19,7 @@ extern const union AffineAnimCmd *const gUnknown_082FF618[];
extern const union AffineAnimCmd *const gUnknown_082FF694[];
extern const union AnimCmd *const gPlayerMonSpriteAnimsTable[];
extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[NUM_SPECIES];
extern const union AnimCmd *const *const gUnknown_0830536C[];
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
// Static type declarations
@@ -146,7 +146,7 @@ static void AssignSpriteAnimsTable(bool8 isTrainer)
if (!isTrainer)
sCreatingSpriteTemplate.anims = gPlayerMonSpriteAnimsTable;
else
sCreatingSpriteTemplate.anims = gUnknown_0830536C[0];
sCreatingSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[0];
}
static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer, bool8 ignoreDeoxys)