Merge pull request #317 from Tetrable/master

Document trainer animations, correct unused table labelling
This commit is contained in:
Diegoisawesome authored and GitHub committed 2018-09-09 16:55:55 -05:00
commit 37edb063ba
5 files changed
+506 -228

No files matched your search

+1 -1
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_08300650[] = {gAnimCmd_General_Frame0};
const union AnimCmd *const gUnknown_08300654[] = {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_082FFDCC,
gUnknown_082FFDD0, gUnknown_082FFDD0,
+32 -32
View File
@@ -1,4 +1,4 @@
const union AnimCmd gUnknown_08305C24[] = const union AnimCmd gAnimCmd_Brendan_1[] =
{ {
ANIMCMD_FRAME(0, 24), ANIMCMD_FRAME(0, 24),
ANIMCMD_FRAME(1, 9), ANIMCMD_FRAME(1, 9),
@@ -8,7 +8,7 @@ const union AnimCmd gUnknown_08305C24[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_08305C3C[] = const union AnimCmd gAnimCmd_May_Steven_1[] =
{ {
ANIMCMD_FRAME(0, 24), ANIMCMD_FRAME(0, 24),
ANIMCMD_FRAME(1, 9), ANIMCMD_FRAME(1, 9),
@@ -18,7 +18,7 @@ const union AnimCmd gUnknown_08305C3C[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_08305C54[] = const union AnimCmd gAnimCmd_Wally_1[] =
{ {
ANIMCMD_FRAME(0, 24), ANIMCMD_FRAME(0, 24),
ANIMCMD_FRAME(1, 9), ANIMCMD_FRAME(1, 9),
@@ -28,7 +28,7 @@ const union AnimCmd gUnknown_08305C54[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_08305C6C[] = const union AnimCmd gAnimCmd_Red_1[] =
{ {
ANIMCMD_FRAME(1, 20), ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(2, 6), ANIMCMD_FRAME(2, 6),
@@ -38,7 +38,7 @@ const union AnimCmd gUnknown_08305C6C[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_08305C84[] = const union AnimCmd gAnimCmd_Leaf_1[] =
{ {
ANIMCMD_FRAME(1, 20), ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(2, 6), ANIMCMD_FRAME(2, 6),
@@ -48,7 +48,7 @@ const union AnimCmd gUnknown_08305C84[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_08305C9C[] = const union AnimCmd gAnimCmd_RubySapphireBrendan_1[] =
{ {
ANIMCMD_FRAME(0, 24), ANIMCMD_FRAME(0, 24),
ANIMCMD_FRAME(1, 9), ANIMCMD_FRAME(1, 9),
@@ -58,7 +58,7 @@ const union AnimCmd gUnknown_08305C9C[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gUnknown_08305CB4[] = const union AnimCmd gAnimCmd_RubySapphireMay_1[] =
{ {
ANIMCMD_FRAME(0, 24), ANIMCMD_FRAME(0, 24),
ANIMCMD_FRAME(1, 9), ANIMCMD_FRAME(1, 9),
@@ -68,62 +68,62 @@ const union AnimCmd gUnknown_08305CB4[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gUnknown_08305CCC[] = const union AnimCmd *const gTrainerBackAnims_Brendan[] =
{ {
AnimCmd_82FF540, AnimCmd_82FF540,
gUnknown_08305C24, gAnimCmd_Brendan_1,
}; };
const union AnimCmd *const gUnknown_08305CD4[] = const union AnimCmd *const gTrainerBackAnims_May[] =
{ {
AnimCmd_82FF540, AnimCmd_82FF540,
gUnknown_08305C3C, gAnimCmd_May_Steven_1,
}; };
const union AnimCmd *const gUnknown_08305CDC[] = const union AnimCmd *const gTrainerBackAnims_Red[] =
{ {
gAnimCmd_General_Frame0, gAnimCmd_General_Frame0,
gUnknown_08305C6C, gAnimCmd_Red_1,
}; };
const union AnimCmd *const gUnknown_08305CE4[] = const union AnimCmd *const gTrainerBackAnims_Leaf[] =
{ {
gAnimCmd_General_Frame0, gAnimCmd_General_Frame0,
gUnknown_08305C84, gAnimCmd_Leaf_1,
}; };
const union AnimCmd *const gUnknown_08305CEC[] = const union AnimCmd *const gTrainerBackAnims_RubySapphireBrendan[] =
{ {
AnimCmd_82FF540, AnimCmd_82FF540,
gUnknown_08305C9C, gAnimCmd_RubySapphireBrendan_1,
}; };
const union AnimCmd *const gUnknown_08305CF4[] = const union AnimCmd *const gTrainerBackAnims_RubySapphireMay[] =
{ {
AnimCmd_82FF540, AnimCmd_82FF540,
gUnknown_08305CB4, gAnimCmd_RubySapphireMay_1,
}; };
const union AnimCmd *const gUnknown_08305CFC[] = const union AnimCmd *const gTrainerBackAnims_Wally[] =
{ {
AnimCmd_82FF540, AnimCmd_82FF540,
gUnknown_08305C54, gAnimCmd_Wally_1,
}; };
const union AnimCmd *const gUnknown_08305D04[] = const union AnimCmd *const gTrainerBackAnims_Steven[] =
{ {
AnimCmd_82FF540, AnimCmd_82FF540,
gUnknown_08305C3C, gAnimCmd_May_Steven_1,
}; };
const union AnimCmd *const *const gUnknown_08305D0C[] = const union AnimCmd *const *const gTrainerBackAnimsPtrTable[] =
{ {
gUnknown_08305CCC, gTrainerBackAnims_Brendan,
gUnknown_08305CD4, gTrainerBackAnims_May,
gUnknown_08305CDC, gTrainerBackAnims_Red,
gUnknown_08305CE4, gTrainerBackAnims_Leaf,
gUnknown_08305CEC, gTrainerBackAnims_RubySapphireBrendan,
gUnknown_08305CF4, gTrainerBackAnims_RubySapphireMay,
gUnknown_08305CFC, gTrainerBackAnims_Wally,
gUnknown_08305D04, gTrainerBackAnims_Steven,
}; };
+466 -188
View File
@@ -1,190 +1,468 @@
const union AnimCmd *const gUnknown_083051F8[] = {gAnimCmd_General_Frame0}; const union AnimCmd *const gTrainerFrontAnims_Hiker[] ={
const union AnimCmd *const gUnknown_083051FC[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_AquaGruntM[] ={
const union AnimCmd *const gUnknown_0830520C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_PokemonBreederF[] ={
const union AnimCmd *const gUnknown_0830521C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_CoolTrainerM[] ={
const union AnimCmd *const gUnknown_0830522C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_BirdKeeper[] ={
const union AnimCmd *const gUnknown_0830523C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_Collector[] ={
const union AnimCmd *const gUnknown_0830524C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_AquaGruntF[] ={
const union AnimCmd *const gUnknown_0830525C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_SwimmerM[] ={
const union AnimCmd *const gUnknown_0830526C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_MagmaGruntM[] ={
const union AnimCmd *const gUnknown_0830527C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_ExpertM[] ={
const union AnimCmd *const gUnknown_0830528C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_AquaAdminM[] ={
const union AnimCmd *const gUnknown_0830529C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_BlackBelt[] ={
const union AnimCmd *const gUnknown_083052AC[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_AquaAdminF[] ={
const union AnimCmd *const gUnknown_083052BC[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_AquaLeaderArchie[] ={
const union AnimCmd *const gUnknown_083052CC[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_HexManiac[] ={
const union AnimCmd *const gUnknown_083052DC[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_AromaLady[] ={
const union AnimCmd *const gUnknown_083052EC[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_RuinManiac[] ={
const union AnimCmd *const gUnknown_083052FC[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_Interviewer[] ={
const union AnimCmd *const gUnknown_0830530C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_TuberF[] ={
const union AnimCmd *const gUnknown_0830531C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_TuberM[] ={
const union AnimCmd *const gUnknown_0830532C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_CoolTrainerF[] ={
const union AnimCmd *const gUnknown_0830533C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_Lady[] ={
const union AnimCmd *const gUnknown_0830534C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_Beauty[] ={
const union AnimCmd *const gUnknown_0830535C[] = {gAnimCmd_General_Frame0}; 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 gTrainerFrontAnims_RichBoy[] ={
gAnimCmd_General_Frame0,
const union AnimCmd *const *const gUnknown_0830536C[] = };
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[] =
{ {
gUnknown_083051F8, gTrainerFrontAnims_Hiker, // TRAINER_PIC_HIKER
gUnknown_083051FC, gTrainerFrontAnims_AquaGruntM, // TRAINER_PIC_AQUA_GRUNT_M
gUnknown_08305200, gTrainerFrontAnims_PokemonBreederF, // TRAINER_PIC_POKEMON_BREEDER_F
gUnknown_08305204, gTrainerFrontAnims_CoolTrainerM, // TRAINER_PIC_COOL_TRAINER_M
gUnknown_08305208, gTrainerFrontAnims_BirdKeeper, // TRAINER_PIC_BIRD_KEEPER
gUnknown_0830520C, gTrainerFrontAnims_Collector, // TRAINER_PIC_COLLECTOR
gUnknown_08305210, gTrainerFrontAnims_AquaGruntF, // TRAINER_PIC_AQUA_GRUNT_F
gUnknown_08305214, gTrainerFrontAnims_SwimmerM, // TRAINER_PIC_SWIMMER_M
gUnknown_08305218, gTrainerFrontAnims_MagmaGruntM, // TRAINER_PIC_MAGMA_GRUNT_M
gUnknown_0830521C, gTrainerFrontAnims_ExpertM, // TRAINER_PIC_EXPERT_M
gUnknown_08305220, gTrainerFrontAnims_AquaAdminM, // TRAINER_PIC_AQUA_ADMIN_M
gUnknown_08305224, gTrainerFrontAnims_BlackBelt, // TRAINER_PIC_BLACK_BELT
gUnknown_08305228, gTrainerFrontAnims_AquaAdminF, // TRAINER_PIC_AQUA_ADMIN_F
gUnknown_0830522C, gTrainerFrontAnims_AquaLeaderArchie, // TRAINER_PIC_AQUA_LEADER_ARCHIE
gUnknown_08305230, gTrainerFrontAnims_HexManiac, // TRAINER_PIC_HEX_MANIAC
gUnknown_08305234, gTrainerFrontAnims_AromaLady, // TRAINER_PIC_AROMA_LADY
gUnknown_08305238, gTrainerFrontAnims_RuinManiac, // TRAINER_PIC_RUIN_MANIAC
gUnknown_0830523C, gTrainerFrontAnims_Interviewer, // TRAINER_PIC_INTERVIEWER
gUnknown_08305240, gTrainerFrontAnims_TuberF, // TRAINER_PIC_TUBER_F
gUnknown_08305244, gTrainerFrontAnims_TuberM, // TRAINER_PIC_TUBER_M
gUnknown_08305248, gTrainerFrontAnims_CoolTrainerF, // TRAINER_PIC_COOL_TRAINER_F
gUnknown_0830524C, gTrainerFrontAnims_Lady, // TRAINER_PIC_LADY
gUnknown_08305250, gTrainerFrontAnims_Beauty, // TRAINER_PIC_BEAUTY
gUnknown_08305254, gTrainerFrontAnims_RichBoy, // TRAINER_PIC_RICH_BOY
gUnknown_08305258, gTrainerFrontAnims_ExpertF, // TRAINER_PIC_EXPERT_F
gUnknown_0830525C, gTrainerFrontAnims_Pokemaniac, // TRAINER_PIC_POKEMANIAC
gUnknown_08305260, gTrainerFrontAnims_MagmaGruntF, // TRAINER_PIC_MAGMA_GRUNT_F
gUnknown_08305264, gTrainerFrontAnims_Guitarist, // TRAINER_PIC_GUITARIST
gUnknown_08305268, gTrainerFrontAnims_Kindler, // TRAINER_PIC_KINDLER
gUnknown_0830526C, gTrainerFrontAnims_Camper, // TRAINER_PIC_CAMPER
gUnknown_08305270, gTrainerFrontAnims_Picnicker, // TRAINER_PIC_PICNICKER
gUnknown_08305274, gTrainerFrontAnims_BugManiac, // TRAINER_PIC_BUG_MANIAC
gUnknown_08305278, gTrainerFrontAnims_PokemonBreederM, // TRAINER_PIC_POKEMON_BREEDER_M
gUnknown_0830527C, gTrainerFrontAnims_PsychicM, // TRAINER_PIC_PSYCHIC_M
gUnknown_08305280, gTrainerFrontAnims_PsychicF, // TRAINER_PIC_PSYCHIC_F
gUnknown_08305284, gTrainerFrontAnims_Gentleman, // TRAINER_PIC_GENTLEMAN
gUnknown_08305288, gTrainerFrontAnims_EliteFourSidney, // TRAINER_PIC_ELITE_FOUR_SIDNEY
gUnknown_0830528C, gTrainerFrontAnims_EliteFourPhoebe, // TRAINER_PIC_ELITE_FOUR_PHOEBE
gUnknown_08305290, gTrainerFrontAnims_EliteFourGlacia, // TRAINER_PIC_ELITE_FOUR_GLACIA
gUnknown_08305294, gTrainerFrontAnims_EliteFourDrake, // TRAINER_PIC_ELITE_FOUR_DRAKE
gUnknown_08305298, gTrainerFrontAnims_LeaderRoxanne, // TRAINER_PIC_LEADER_ROXANNE
gUnknown_0830529C, gTrainerFrontAnims_LeaderBrawly, // TRAINER_PIC_LEADER_BRAWLY
gUnknown_083052A0, gTrainerFrontAnims_LeaderWattson, // TRAINER_PIC_LEADER_WATTSON
gUnknown_083052A4, gTrainerFrontAnims_LeaderFlannery, // TRAINER_PIC_LEADER_FLANNERY
gUnknown_083052A8, gTrainerFrontAnims_LeaderNorman, // TRAINER_PIC_LEADER_NORMAN
gUnknown_083052AC, gTrainerFrontAnims_LeaderWinona, // TRAINER_PIC_LEADER_WINONA
gUnknown_083052B0, gTrainerFrontAnims_LeaderTateAndLiza, // TRAINER_PIC_LEADER_TATE_AND_LIZA
gUnknown_083052B4, gTrainerFrontAnims_LeaderJuan, // TRAINER_PIC_LEADER_JUAN
gUnknown_083052B8, gTrainerFrontAnims_SchoolKidM, // TRAINER_PIC_SCHOOL_KID_M
gUnknown_083052BC, gTrainerFrontAnims_SchoolKidF, // TRAINER_PIC_SCHOOL_KID_F
gUnknown_083052C0, gTrainerFrontAnims_SrAndJr, // TRAINER_PIC_SR_AND_JR
gUnknown_083052C4, gTrainerFrontAnims_WinstrateM, // TRAINER_PIC_WINSTRATE_M
gUnknown_083052C8, gTrainerFrontAnims_WinstrateF, // TRAINER_PIC_WINSTRATE_F
gUnknown_083052CC, gTrainerFrontAnims_Youngster, // TRAINER_PIC_YOUNGSTER
gUnknown_083052D0, gTrainerFrontAnims_ChampionWallace, // TRAINER_PIC_CHAMPION_WALLACE
gUnknown_083052D4, gTrainerFrontAnims_Fisherman, // TRAINER_PIC_FISHERMAN
gUnknown_083052D8, gTrainerFrontAnims_CyclingTriathleteM, // TRAINER_PIC_CYCLING_TRIATHLETE_M
gUnknown_083052DC, gTrainerFrontAnims_CyclingTriathleteF, // TRAINER_PIC_CYCLING_TRIATHLETE_F
gUnknown_083052E0, gTrainerFrontAnims_RunningTriathleteM, // TRAINER_PIC_RUNNING_TRIATHLETE_M
gUnknown_083052E4, gTrainerFrontAnims_RunningTriathleteF, // TRAINER_PIC_RUNNING_TRIATHLETE_F
gUnknown_083052E8, gTrainerFrontAnims_SwimmingTriathleteM, // TRAINER_PIC_SWIMMING_TRIATHLETE_M
gUnknown_083052EC, gTrainerFrontAnims_SwimmingTriathleteF, // TRAINER_PIC_SWIMMING_TRIATHLETE_F
gUnknown_083052F0, gTrainerFrontAnims_DragonTamer, // TRAINER_PIC_DRAGON_TAMER
gUnknown_083052F4, gTrainerFrontAnims_NinjaBoy, // TRAINER_PIC_NINJA_BOY
gUnknown_083052F8, gTrainerFrontAnims_BattleGirl, // TRAINER_PIC_BATTLE_GIRL
gUnknown_083052FC, gTrainerFrontAnims_ParasolLady, // TRAINER_PIC_PARASOL_LADY
gUnknown_08305300, gTrainerFrontAnims_SwimmerF, // TRAINER_PIC_SWIMMER_F
gUnknown_08305304, gTrainerFrontAnims_Twins, // TRAINER_PIC_TWINS
gUnknown_08305308, gTrainerFrontAnims_Sailor, // TRAINER_PIC_SAILOR
gUnknown_0830530C, gTrainerFrontAnims_MagmaAdmin, // TRAINER_PIC_MAGMA_ADMIN
gUnknown_08305310, gTrainerFrontAnims_Wally, // TRAINER_PIC_WALLY
gUnknown_08305314, gTrainerFrontAnims_Brendan, // TRAINER_PIC_BRENDAN
gUnknown_08305318, gTrainerFrontAnims_May, // TRAINER_PIC_MAY
gUnknown_0830531C, gTrainerFrontAnims_BugCatcher, // TRAINER_PIC_BUG_CATCHER
gUnknown_08305320, gTrainerFrontAnims_PokemonRangerM, // TRAINER_PIC_POKEMON_RANGER_M
gUnknown_08305324, gTrainerFrontAnims_PokemonRangerF, // TRAINER_PIC_POKEMON_RANGER_F
gUnknown_08305328, gTrainerFrontAnims_MagmaLeaderMaxie, // TRAINER_PIC_MAGMA_LEADER_MAXIE
gUnknown_0830532C, gTrainerFrontAnims_Lass, // TRAINER_PIC_LASS
gUnknown_08305330, gTrainerFrontAnims_YoungCouple, // TRAINER_PIC_YOUNG_COUPLE
gUnknown_08305334, gTrainerFrontAnims_OldCouple, // TRAINER_PIC_OLD_COUPLE
gUnknown_08305338, gTrainerFrontAnims_SisAndBro, // TRAINER_PIC_SIS_AND_BRO
gUnknown_0830533C, gTrainerFrontAnims_Steven, // TRAINER_PIC_STEVEN
gUnknown_08305340, gTrainerFrontAnims_SalonMaidenAnabel, // TRAINER_PIC_SALON_MAIDEN_ANABEL
gUnknown_08305344, gTrainerFrontAnims_DomeAceTucker, // TRAINER_PIC_DOME_ACE_TUCKER
gUnknown_08305348, gTrainerFrontAnims_PalaceMavenSpenser, // TRAINER_PIC_PALACE_MAVEN_SPENSER
gUnknown_0830534C, gTrainerFrontAnims_ArenaTycoonGreta, // TRAINER_PIC_ARENA_TYCOON_GRETA
gUnknown_08305350, gTrainerFrontAnims_FactoryHeadNoland, // TRAINER_PIC_FACTORY_HEAD_NOLAND
gUnknown_08305354, gTrainerFrontAnims_PikeQueenLucy, // TRAINER_PIC_PIKE_QUEEN_LUCY
gUnknown_08305358, gTrainerFrontAnims_PyramidKingBrandon, // TRAINER_PIC_PYRAMID_KING_BRANDON
gUnknown_0830535C, gTrainerFrontAnims_Red, // TRAINER_PIC_RED
gUnknown_08305360, gTrainerFrontAnims_Leaf, // TRAINER_PIC_LEAF
gUnknown_08305364, gTrainerFrontAnims_RubySapphireBrendan, // TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN
gUnknown_08305368, gTrainerFrontAnims_RubySapphireMay, // TRAINER_PIC_RUBY_SAPPHIRE_MAY
}; };
+5 -5
View File
@@ -66,8 +66,8 @@ extern const union AffineAnimCmd *const gUnknown_082FF618[];
extern const union AffineAnimCmd *const gUnknown_082FF694[]; extern const union AffineAnimCmd *const gUnknown_082FF694[];
extern const union AnimCmd *gPlayerMonSpriteAnimsTable[]; extern const union AnimCmd *gPlayerMonSpriteAnimsTable[];
extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[]; extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[];
extern const union AnimCmd *const *const gUnknown_08305D0C[]; extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
extern const union AnimCmd *const *const gUnknown_0830536C[]; extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
extern const struct UnknownPokemonStruct3 gUnknown_08610970[]; extern const struct UnknownPokemonStruct3 gUnknown_08610970[];
extern const struct CompressedSpritePalette gMonPaletteTable[]; 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) if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT)
{ {
gMultiuseSpriteTemplate = gUnknown_08329DF8[trainerSpriteId]; gMultiuseSpriteTemplate = gUnknown_08329DF8[trainerSpriteId];
gMultiuseSpriteTemplate.anims = gUnknown_08305D0C[trainerSpriteId]; gMultiuseSpriteTemplate.anims = gTrainerBackAnimsPtrTable[trainerSpriteId];
} }
else else
{ {
@@ -3839,7 +3839,7 @@ void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosit
gMultiuseSpriteTemplate = gMonSpritesGfxPtr->templates[battlerPosition]; gMultiuseSpriteTemplate = gMonSpritesGfxPtr->templates[battlerPosition];
else else
gMultiuseSpriteTemplate = gUnknown_08329D98[battlerPosition]; 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 = gUnknown_08329D98[battlerPosition];
gMultiuseSpriteTemplate.paletteTag = arg0; gMultiuseSpriteTemplate.paletteTag = arg0;
gMultiuseSpriteTemplate.anims = gUnknown_0830536C[arg0]; gMultiuseSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[arg0];
} }
static void EncryptBoxMon(struct BoxPokemon *boxMon) static void EncryptBoxMon(struct BoxPokemon *boxMon)
+2 -2
View File
@@ -19,7 +19,7 @@ extern const union AffineAnimCmd *const gUnknown_082FF618[];
extern const union AffineAnimCmd *const gUnknown_082FF694[]; extern const union AffineAnimCmd *const gUnknown_082FF694[];
extern const union AnimCmd *const gPlayerMonSpriteAnimsTable[]; extern const union AnimCmd *const gPlayerMonSpriteAnimsTable[];
extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[NUM_SPECIES]; 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 // Static type declarations
@@ -146,7 +146,7 @@ static void AssignSpriteAnimsTable(bool8 isTrainer)
if (!isTrainer) if (!isTrainer)
sCreatingSpriteTemplate.anims = gPlayerMonSpriteAnimsTable; sCreatingSpriteTemplate.anims = gPlayerMonSpriteAnimsTable;
else 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) static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer, bool8 ignoreDeoxys)