ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-20 10:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove Unown support for now

Browse Source
This commit is contained in:
DizzyEggg 2019-04-03 11:16:26 +02:00
parent 27bafdc04d
commit afb72fb442
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/battle_anim_mons.c
View File

@ -192,6 +192,7 @@ u8 GetBattlerYDelta(u8 battlerId, u16 species)
{ {
if (species == SPECIES_UNOWN) if (species == SPECIES_UNOWN)
{ {
/*
if (IsContest()) if (IsContest())
{ {
if (gContestResources->field_18->unk4_0) if (gContestResources->field_18->unk4_0)
@ -213,6 +214,7 @@ u8 GetBattlerYDelta(u8 battlerId, u16 species)
else else
coordSpecies = letter + SPECIES_UNOWN_B - 1; coordSpecies = letter + SPECIES_UNOWN_B - 1;
ret = gMonBackPicCoords[coordSpecies].y_offset; ret = gMonBackPicCoords[coordSpecies].y_offset;
*/
} }
else if (species == SPECIES_CASTFORM) else if (species == SPECIES_CASTFORM)
{ {
@ -231,6 +233,7 @@ u8 GetBattlerYDelta(u8 battlerId, u16 species)
{ {
if (species == SPECIES_UNOWN) if (species == SPECIES_UNOWN)
{ {
/*
spriteInfo = gBattleSpritesDataPtr->battlerData; spriteInfo = gBattleSpritesDataPtr->battlerData;
if (!spriteInfo[battlerId].transformSpecies) if (!spriteInfo[battlerId].transformSpecies)
personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_PERSONALITY); personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_PERSONALITY);
@ -242,6 +245,7 @@ u8 GetBattlerYDelta(u8 battlerId, u16 species)
else else
coordSpecies = letter + SPECIES_UNOWN_B - 1; coordSpecies = letter + SPECIES_UNOWN_B - 1;
ret = gMonFrontPicCoords[coordSpecies].y_offset; ret = gMonFrontPicCoords[coordSpecies].y_offset;
*/
} }
else if (species == SPECIES_CASTFORM) else if (species == SPECIES_CASTFORM)
{ {
@ -2118,12 +2122,14 @@ s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr)
} }
if (species == SPECIES_UNOWN) if (species == SPECIES_UNOWN)
{ {
/*
letter = GET_UNOWN_LETTER(personality); letter = GET_UNOWN_LETTER(personality);
if (!letter) if (!letter)
unownSpecies = SPECIES_UNOWN; unownSpecies = SPECIES_UNOWN;
else else
unownSpecies = letter + SPECIES_UNOWN_B - 1; unownSpecies = letter + SPECIES_UNOWN_B - 1;
coords = &gMonBackPicCoords[unownSpecies]; coords = &gMonBackPicCoords[unownSpecies];
*/
} }
else if (species == SPECIES_CASTFORM) else if (species == SPECIES_CASTFORM)
{ {
@ -2156,12 +2162,14 @@ s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr)
if (species == SPECIES_UNOWN) if (species == SPECIES_UNOWN)
{ {
/*
letter = GET_UNOWN_LETTER(personality); letter = GET_UNOWN_LETTER(personality);
if (!letter) if (!letter)
unownSpecies = SPECIES_UNOWN; unownSpecies = SPECIES_UNOWN;
else else
unownSpecies = letter + SPECIES_UNOWN_B - 1; unownSpecies = letter + SPECIES_UNOWN_B - 1;
coords = &gMonBackPicCoords[unownSpecies]; coords = &gMonBackPicCoords[unownSpecies];
*/
} }
else if (species > NUM_SPECIES) else if (species > NUM_SPECIES)
{ {
@ -2188,12 +2196,14 @@ s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr)
if (species == SPECIES_UNOWN) if (species == SPECIES_UNOWN)
{ {
/*
letter = GET_UNOWN_LETTER(personality); letter = GET_UNOWN_LETTER(personality);
if (!letter) if (!letter)
unownSpecies = SPECIES_UNOWN; unownSpecies = SPECIES_UNOWN;
else else
unownSpecies = letter + SPECIES_UNOWN_B - 1; unownSpecies = letter + SPECIES_UNOWN_B - 1;
coords = &gMonFrontPicCoords[unownSpecies]; coords = &gMonFrontPicCoords[unownSpecies];
*/
} }
else if (species == SPECIES_CASTFORM) else if (species == SPECIES_CASTFORM)
{ {

1
src/credits.c
View File

@ -9,6 +9,7 @@
#include "menu.h" #include "menu.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/species.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "m4a.h" #include "m4a.h"
#include "constants/rgb.h" #include "constants/rgb.h"

9
src/decompress.c
View File

@ -87,6 +87,7 @@ void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *des
void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic) void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic)
{ {
/*
if (species == SPECIES_UNOWN) if (species == SPECIES_UNOWN)
{ {
u16 i = (((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 3)) % 0x1C; u16 i = (((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 3)) % 0x1C;
@ -102,7 +103,7 @@ void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32
else else
LZ77UnCompWram(gMonFrontPicTable[i].data, dest); LZ77UnCompWram(gMonFrontPicTable[i].data, dest);
} }
else if (species > NUM_SPECIES) // is species unknown? draw the ? icon else*/ if (species > NUM_SPECIES) // is species unknown? draw the ? icon
LZ77UnCompWram(gMonFrontPicTable[0].data, dest); LZ77UnCompWram(gMonFrontPicTable[0].data, dest);
else else
LZ77UnCompWram(src->data, dest); LZ77UnCompWram(src->data, dest);
@ -508,6 +509,7 @@ void DecompressPicFromTable_2(const struct CompressedSpriteSheet *src, void* buf
void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic) // a copy of LoadSpecialPokePic void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic) // a copy of LoadSpecialPokePic
{ {
/*
if (species == SPECIES_UNOWN) if (species == SPECIES_UNOWN)
{ {
u16 i = (((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 3)) % 0x1C; u16 i = (((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 3)) % 0x1C;
@ -523,7 +525,7 @@ void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s
else else
LZ77UnCompWram(gMonFrontPicTable[i].data, dest); LZ77UnCompWram(gMonFrontPicTable[i].data, dest);
} }
else if (species > NUM_SPECIES) // is species unknown? draw the ? icon else*/ if (species > NUM_SPECIES) // is species unknown? draw the ? icon
LZ77UnCompWram(gMonFrontPicTable[0].data, dest); LZ77UnCompWram(gMonFrontPicTable[0].data, dest);
else else
LZ77UnCompWram(src->data, dest); LZ77UnCompWram(src->data, dest);
@ -566,6 +568,7 @@ void HandleLoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteShee
void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic) void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic)
{ {
/*
if (species == SPECIES_UNOWN) if (species == SPECIES_UNOWN)
{ {
u16 i = (((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 3)) % 0x1C; u16 i = (((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 3)) % 0x1C;
@ -581,7 +584,7 @@ void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src
else else
LZ77UnCompWram(gMonFrontPicTable[i].data, dest); LZ77UnCompWram(gMonFrontPicTable[i].data, dest);
} }
else if (species > NUM_SPECIES) // is species unknown? draw the ? icon else*/ if (species > NUM_SPECIES) // is species unknown? draw the ? icon
LZ77UnCompWram(gMonFrontPicTable[0].data, dest); LZ77UnCompWram(gMonFrontPicTable[0].data, dest);
else else
LZ77UnCompWram(src->data, dest); LZ77UnCompWram(src->data, dest);

6
src/hall_of_fame.c
View File

@ -40,8 +40,8 @@ struct HallofFameMon
{ {
u32 tid; u32 tid;
u32 personality; u32 personality;
u16 species:9; u16 species;
u16 lvl:7; u8 lvl;
u8 nick[POKEMON_NAME_LENGTH]; u8 nick[POKEMON_NAME_LENGTH];
}; };
@ -64,7 +64,7 @@ static EWRAM_DATA struct HofGfx *sHofGfxPtr = NULL;
extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
#define HALL_OF_FAME_MAX_TEAMS 50 #define HALL_OF_FAME_MAX_TEAMS 30
// this file's functions // this file's functions
static void ClearVramOamPltt_LoadHofPal(void); static void ClearVramOamPltt_LoadHofPal(void);