atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed getting weight/height, cry and area

Browse source
This commit is contained in:
Eduardo Quezada 2022-10-17 15:22:41 -03:00
parent 0c34b6cdcb
commit 993e1072e1
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/battle_script_commands.c
View file

@ -14042,7 +14042,7 @@ static void Cmd_handleballthrow(void)
ballMultiplier = 400; ballMultiplier = 400;
break; break;
case ITEM_HEAVY_BALL: case ITEM_HEAVY_BALL:
i = GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1); i = GetPokedexHeightWeight(gBattleMons[gBattlerTarget].species, 1);
#if B_HEAVY_BALL_MODIFIER >= GEN_7 #if B_HEAVY_BALL_MODIFIER >= GEN_7
if (i < 1000) if (i < 1000)
ballAddition = -20; ballAddition = -20;

2
src/battle_util.c
View file

@ -7999,7 +7999,7 @@ u8 GetBattleMonMoveSlot(struct BattlePokemon *battleMon, u16 move)
u32 GetBattlerWeight(u8 battlerId) u32 GetBattlerWeight(u8 battlerId)
{ {
u32 i; u32 i;
u32 weight = GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[battlerId].species), 1); u32 weight = GetPokedexHeightWeight(gBattleMons[battlerId].species, 1);
u32 ability = GetBattlerAbility(battlerId); u32 ability = GetBattlerAbility(battlerId);
u32 holdEffect = GetBattlerHoldEffect(battlerId, TRUE); u32 holdEffect = GetBattlerHoldEffect(battlerId, TRUE);

8
src/pokedex.c
View file

@ -3411,7 +3411,7 @@ static void Task_LoadInfoScreen(u8 taskId)
if (!gTasks[taskId].tSkipCry) if (!gTasks[taskId].tSkipCry)
{ {
StopCryAndClearCrySongs(); StopCryAndClearCrySongs();
PlayCry_NormalNoDucking(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL); PlayCry_NormalNoDucking(sPokedexListItem->seenSpecies, 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL);
} }
else else
{ {
@ -3591,7 +3591,7 @@ static void Task_LoadAreaScreen(u8 taskId)
gMain.state++; gMain.state++;
break; break;
case 2: case 2:
ShowPokedexAreaScreen(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), &sPokedexView->screenSwitchState); ShowPokedexAreaScreen(sPokedexListItem->seenSpecies, &sPokedexView->screenSwitchState);
SetVBlankCallback(gPokedexVBlankCB); SetVBlankCallback(gPokedexVBlankCB);
sPokedexView->screenSwitchState = 0; sPokedexView->screenSwitchState = 0;
gMain.state = 0; gMain.state = 0;
@ -3740,7 +3740,7 @@ static void Task_HandleCryScreenInput(u8 taskId)
if (JOY_NEW(A_BUTTON)) if (JOY_NEW(A_BUTTON))
{ {
LoadPlayArrowPalette(TRUE); LoadPlayArrowPalette(TRUE);
CryScreenPlayButton(NationalPokedexNumToSpecies(sPokedexListItem->dexNum)); CryScreenPlayButton(sPokedexListItem->seenSpecies);
return; return;
} }
else if (!gPaletteFade.active) else if (!gPaletteFade.active)
@ -4162,7 +4162,7 @@ static void Task_ExitCaughtMonPage(u8 taskId)
if (buffer) if (buffer)
Free(buffer); Free(buffer);
species = NationalPokedexNumToSpecies(gTasks[taskId].tDexNum); species = gTasks[taskId].tSpecies;
otId = ((u16)gTasks[taskId].tOtIdHi << 16) | (u16)gTasks[taskId].tOtIdLo; otId = ((u16)gTasks[taskId].tOtIdHi << 16) | (u16)gTasks[taskId].tOtIdLo;
personality = ((u16)gTasks[taskId].tPersonalityHi << 16) | (u16)gTasks[taskId].tPersonalityLo; personality = ((u16)gTasks[taskId].tPersonalityHi << 16) | (u16)gTasks[taskId].tPersonalityLo;
paletteNum = gSprites[gTasks[taskId].tMonSpriteId].oam.paletteNum; paletteNum = gSprites[gTasks[taskId].tMonSpriteId].oam.paletteNum;