ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Realign comments, clean tables in pokemon_animation.c and use SPECIES_OLD_UNOWN_ defines

Browse Source
This commit is contained in:
nullableVoidPtr 2018-12-07 20:16:19 +08:00
parent f9ff7316d5
commit 4fc3fa9e44
7 changed files with 978 additions and 976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/data/item_icon_table.h
View File

@ -311,64 +311,64 @@ const u32 *const gItemIconTable[][2] =
[ITEM_CLAW_FOSSIL] = {gItemIcon_ClawFossil, gItemIconPalette_HoennFossil}, [ITEM_CLAW_FOSSIL] = {gItemIcon_ClawFossil, gItemIconPalette_HoennFossil},
[ITEM_DEVON_SCOPE] = {gItemIcon_DevonScope, gItemIconPalette_DevonScope}, [ITEM_DEVON_SCOPE] = {gItemIcon_DevonScope, gItemIconPalette_DevonScope},
// TMs / HMs // TMs / HMs
[ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM01 [ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
[ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM}, // TM02 [ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM},
[ITEM_TM03] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, // TM03 [ITEM_TM03] = {gItemIcon_TM, gItemIconPalette_WaterTMHM},
[ITEM_TM04] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM04 [ITEM_TM04] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM05] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM05 [ITEM_TM05] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM06] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, // TM06 [ITEM_TM06] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM},
[ITEM_TM07] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM07 [ITEM_TM07] = {gItemIcon_TM, gItemIconPalette_IceTMHM},
[ITEM_TM08] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM08 [ITEM_TM08] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
[ITEM_TM09] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM09 [ITEM_TM09] = {gItemIcon_TM, gItemIconPalette_GrassTMHM},
[ITEM_TM10] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM10 [ITEM_TM10] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM11] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM11 [ITEM_TM11] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
[ITEM_TM12] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM12 [ITEM_TM12] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
[ITEM_TM13] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM13 [ITEM_TM13] = {gItemIcon_TM, gItemIconPalette_IceTMHM},
[ITEM_TM14] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM14 [ITEM_TM14] = {gItemIcon_TM, gItemIconPalette_IceTMHM},
[ITEM_TM15] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM15 [ITEM_TM15] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM16] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM16 [ITEM_TM16] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM17] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM17 [ITEM_TM17] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM18] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, // TM18 [ITEM_TM18] = {gItemIcon_TM, gItemIconPalette_WaterTMHM},
[ITEM_TM19] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM19 [ITEM_TM19] = {gItemIcon_TM, gItemIconPalette_GrassTMHM},
[ITEM_TM20] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM20 [ITEM_TM20] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM21] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM21 [ITEM_TM21] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM22] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM22 [ITEM_TM22] = {gItemIcon_TM, gItemIconPalette_GrassTMHM},
[ITEM_TM23] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, // TM23 [ITEM_TM23] = {gItemIcon_TM, gItemIconPalette_SteelTMHM},
[ITEM_TM24] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM24 [ITEM_TM24] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM},
[ITEM_TM25] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM25 [ITEM_TM25] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM},
[ITEM_TM26] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, // TM26 [ITEM_TM26] = {gItemIcon_TM, gItemIconPalette_GroundTMHM},
[ITEM_TM27] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM27 [ITEM_TM27] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM28] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, // TM28 [ITEM_TM28] = {gItemIcon_TM, gItemIconPalette_GroundTMHM},
[ITEM_TM29] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM29 [ITEM_TM29] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM30] = {gItemIcon_TM, gItemIconPalette_GhostTMHM}, // TM30 [ITEM_TM30] = {gItemIcon_TM, gItemIconPalette_GhostTMHM},
[ITEM_TM31] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM31 [ITEM_TM31] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
[ITEM_TM32] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM32 [ITEM_TM32] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM33] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM33 [ITEM_TM33] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM34] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM34 [ITEM_TM34] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM},
[ITEM_TM35] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM35 [ITEM_TM35] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
[ITEM_TM36] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, // TM36 [ITEM_TM36] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM},
[ITEM_TM37] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, // TM37 [ITEM_TM37] = {gItemIcon_TM, gItemIconPalette_RockTMHM},
[ITEM_TM38] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM38 [ITEM_TM38] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
[ITEM_TM39] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, // TM39 [ITEM_TM39] = {gItemIcon_TM, gItemIconPalette_RockTMHM},
[ITEM_TM40] = {gItemIcon_TM, gItemIconPalette_FlyingTMHM}, // TM40 [ITEM_TM40] = {gItemIcon_TM, gItemIconPalette_FlyingTMHM},
[ITEM_TM41] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM41 [ITEM_TM41] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
[ITEM_TM42] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM42 [ITEM_TM42] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM43] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM43 [ITEM_TM43] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM44] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM44 [ITEM_TM44] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM45] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM45 [ITEM_TM45] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM46] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM46 [ITEM_TM46] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
[ITEM_TM47] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, // TM47 [ITEM_TM47] = {gItemIcon_TM, gItemIconPalette_SteelTMHM},
[ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM48 [ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM49 [ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
[ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM50 [ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
[ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM01 [ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
[ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM}, // HM02 [ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM},
[ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM03 [ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
[ITEM_HM04] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM04 [ITEM_HM04] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
[ITEM_HM05] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM05 [ITEM_HM05] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
[ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM}, // HM06 [ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM},
[ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM07 [ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
[ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM08 [ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
// ???????? // ????????
[ITEM_15B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, [ITEM_15B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_15C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, [ITEM_15C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},

50
src/data/pokemon_graphics/enemy_mon_elevation.h
View File

@ -256,31 +256,31 @@ const u8 gEnemyMonElevation[] =
[SPECIES_LUGIA] = 6, [SPECIES_LUGIA] = 6,
[SPECIES_HO_OH] = 6, [SPECIES_HO_OH] = 6,
[SPECIES_CELEBI] = 15, [SPECIES_CELEBI] = 15,
[252] = 0, [SPECIES_OLD_UNOWN_B] = 0,
[253] = 0, [SPECIES_OLD_UNOWN_C] = 0,
[254] = 0, [SPECIES_OLD_UNOWN_D] = 0,
[255] = 0, [SPECIES_OLD_UNOWN_E] = 0,
[256] = 0, [SPECIES_OLD_UNOWN_F] = 0,
[257] = 0, [SPECIES_OLD_UNOWN_G] = 0,
[258] = 0, [SPECIES_OLD_UNOWN_H] = 0,
[259] = 0, [SPECIES_OLD_UNOWN_I] = 0,
[260] = 0, [SPECIES_OLD_UNOWN_J] = 0,
[261] = 0, [SPECIES_OLD_UNOWN_K] = 0,
[262] = 0, [SPECIES_OLD_UNOWN_L] = 0,
[263] = 0, [SPECIES_OLD_UNOWN_M] = 0,
[264] = 0, [SPECIES_OLD_UNOWN_N] = 0,
[265] = 0, [SPECIES_OLD_UNOWN_O] = 0,
[266] = 0, [SPECIES_OLD_UNOWN_P] = 0,
[267] = 0, [SPECIES_OLD_UNOWN_Q] = 0,
[268] = 0, [SPECIES_OLD_UNOWN_R] = 0,
[269] = 0, [SPECIES_OLD_UNOWN_S] = 0,
[270] = 0, [SPECIES_OLD_UNOWN_T] = 0,
[271] = 0, [SPECIES_OLD_UNOWN_U] = 0,
[272] = 0, [SPECIES_OLD_UNOWN_V] = 0,
[273] = 0, [SPECIES_OLD_UNOWN_W] = 0,
[274] = 0, [SPECIES_OLD_UNOWN_X] = 0,
[275] = 0, [SPECIES_OLD_UNOWN_Y] = 0,
[276] = 0, [SPECIES_OLD_UNOWN_Z] = 0,
[SPECIES_TREECKO] = 0, [SPECIES_TREECKO] = 0,
[SPECIES_GROVYLE] = 0, [SPECIES_GROVYLE] = 0,
[SPECIES_SCEPTILE] = 0, [SPECIES_SCEPTILE] = 0,

1646
src/pokemon.c
View File

File diff suppressed because it is too large Load Diff

48
src/pokemon_animation.c
View File

@ -786,30 +786,30 @@ static const u8 sBackAnimationIds[] =
static const u8 sBackAnimNatureModTable[] = static const u8 sBackAnimNatureModTable[] =
{ {
0x00, // NATURE_HARDY [NATURE_HARDY] = 0x00,
0x02, // NATURE_LONELY [NATURE_LONELY] = 0x02,
0x00, // NATURE_BRAVE [NATURE_BRAVE] = 0x00,
0x00, // NATURE_ADAMANT [NATURE_ADAMANT] = 0x00,
0x00, // NATURE_NAUGHTY [NATURE_NAUGHTY] = 0x00,
0x01, // NATURE_BOLD [NATURE_BOLD] = 0x01,
0x01, // NATURE_DOCILE [NATURE_DOCILE] = 0x01,
0x01, // NATURE_RELAXED [NATURE_RELAXED] = 0x01,
0x00, // NATURE_IMPISH [NATURE_IMPISH] = 0x00,
0x01, // NATURE_LAX [NATURE_LAX] = 0x01,
0x02, // NATURE_TIMID [NATURE_TIMID] = 0x02,
0x00, // NATURE_HASTY [NATURE_HASTY] = 0x00,
0x01, // NATURE_SERIOUS [NATURE_SERIOUS] = 0x01,
0x00, // NATURE_JOLLY [NATURE_JOLLY] = 0x00,
0x00, // NATURE_NAIVE [NATURE_NAIVE] = 0x00,
0x02, // NATURE_MODEST [NATURE_MODEST] = 0x02,
0x02, // NATURE_MILD [NATURE_MILD] = 0x02,
0x02, // NATURE_QUIET [NATURE_QUIET] = 0x02,
0x02, // NATURE_BASHFUL [NATURE_BASHFUL] = 0x02,
0x01, // NATURE_RASH [NATURE_RASH] = 0x01,
0x01, // NATURE_CALM [NATURE_CALM] = 0x01,
0x02, // NATURE_GENTLE [NATURE_GENTLE] = 0x02,
0x01, // NATURE_SASSY [NATURE_SASSY] = 0x01,
0x02, // NATURE_CAREFUL [NATURE_CAREFUL] = 0x02,
0x01, // NATURE_QUIRKY 0x01, // NATURE_QUIRKY
}; };