Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-23 21:19:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

address review comments

Browse Source
This commit is contained in:
Seth Barberee 2022-05-30 09:58:59 -07:00
parent 3a3a2b9c27
commit d1b3d794ab
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dungeon_entity.h
View File

@ -101,7 +101,7 @@ struct DungeonEntityData
/* 0x8C */ u8 IQSkillsSelected[4]; // IQ skills selected in the IQ skills menu.
/* 0x90 */ u8 IQSkillsEnabled[4];
/* 0x94 */ u8 tactic;
u8 fill9C[0xA4 - 0x95];
u8 fill95[0xA4 - 0x95];
/* 0xA4 */ u8 clientType;
u8 fillA5[0xA8 - 0xA5];
// Statuses are split into groups based on which ones can't overlap.

7
src/code_8069E0C.c
View File

@ -2,6 +2,7 @@
#include "constants/ability.h"
#include "constants/move_id.h"
#include "constants/type.h"
#include "constants/weather.h"
#include "dungeon_entity.h"
#include "dungeon_global_data.h"
#include "dungeon_pokemon_attributes.h"
@ -79,13 +80,13 @@ void TriggerWeatherAbilities(void)
uVar4 = gDungeonGlobalData->allPokemon[iVar5];
if (EntityExists(uVar4)) {
if (HasAbility(uVar4, ABILITY_DRIZZLE)) {
gDungeonGlobalData->startingWeather[4] = 1;
gDungeonGlobalData->startingWeather[WEATHER_RAIN] = 1;
}
else if (HasAbility(uVar4, ABILITY_SAND_STREAM)) {
gDungeonGlobalData->startingWeather[2] = 1;
gDungeonGlobalData->startingWeather[WEATHER_SANDSTORM] = 1;
}
else if (HasAbility(uVar4, ABILITY_DROUGHT)) {
gDungeonGlobalData->startingWeather[1] = 1;
gDungeonGlobalData->startingWeather[WEATHER_SUNNY] = 1;
}
if ((HasAbility(uVar4, ABILITY_AIR_LOCK)) || (HasAbility(uVar4, ABILITY_CLOUD_NINE))) {
gDungeonGlobalData->negateWeatherEffects = TRUE;

2
src/code_806CD90.c
View File

@ -105,7 +105,7 @@ u8 sub_806CEBC(struct DungeonEntity *param_1)
sleepStatus = iVar2->sleepStatus;
if ((sleepStatus == SLEEP_STATUS_SLEEP) || (sleepStatus == SLEEP_STATUS_NAPPING) || (sleepStatus == SLEEP_STATUS_NIGHTMARE)) {
if ((iVar3->transformSpecies != 0xb9) || (iVar3->sleepStatusTurnsLeft != 0x7f)) {
if ((iVar3->transformSpecies != SPECIES_SUDOWOODO) || (iVar3->sleepStatusTurnsLeft != 0x7f)) {
return 5;
}
else