Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-22 08:44:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

address review comments

Browse Source
This commit is contained in:
Seth Barberee
2023-12-10 13:18:48 -08:00
parent 5dce900d90
commit 5d34103ab7
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/structs/str_dungeon.h
View File

@@ -135,7 +135,7 @@ typedef struct Dungeon
/* 0x37FA */ bool8 minusIsActive[2]; // Index 0: Enemy , Index 1: Team
/* 0x37FC */ bool8 decoyActive;
u8 fill37FD;
/* 0x37FE */ u8 deoxysDefeat; // Flag set for deoxys in Meteor Cave
/* 0x37FE */ bool8 deoxysDefeat; // Flag set for deoxys in Meteor Cave
u8 fill37FF;
s16 unk3800;
u8 fill3802[0x3904 - 0x3802];

10
src/code_80140DC.c
View File

@@ -80,8 +80,8 @@ void sub_80141B4(const u8 *text, u32 param_2, OpenedFile **file, u16 param_4)
sub_8014248(text, param_2, -1, NULL, NULL, 3, 0, file, param_4);
}
//void sub_80141E0(const u8 *text, OpenedFile **file, u16 param_4)
//{
// sub_8014248(text, 0, -1, gUnknown_80D485C, NULL, 3, 0, file, param_4);
//}
// https://decomp.me/scratch/w4sX4
// void sub_80141E0(const u8 *text, OpenedFile **file, u16 param_4)
// {
// sub_8014248(text, 0, -1, gUnknown_80D485C, NULL, 3, 0, file, param_4);
// }

4
src/code_8066D04.c
View File

@@ -294,7 +294,11 @@ void sub_8066D04(Entity *param_1)
Item *item;
Tile *tile;
EntityInfo *info;
#ifndef NONMATCHING
register Entity *entity asm("r4");
#else
Entity *entity;
#endif
entity = param_1;

4
src/code_80718D8.c
View File

@@ -130,7 +130,7 @@ void sub_8071B48(void)
}
}
static inline bool8 sub_8071D4C_sub(EntityInfo *pokemonInfo)
static inline bool8 JoinLocationCannotUseItems(EntityInfo *pokemonInfo)
{
if (pokemonInfo->joinedAt == DUNGEON_JOIN_LOCATION_CLIENT_POKEMON)
{
@@ -153,7 +153,7 @@ void sub_8071D4C(Entity *pokemon, Entity *target, s32 exp)
info = target->info;
if (info->level != 100) {
if (!sub_8071D4C_sub(info)) {
if (!JoinLocationCannotUseItems(info)) {
newExp = info->exp + exp;
if (9999998 < newExp) {
newExp = 9999999;

4
src/code_80958E8_1.c
View File

@@ -227,7 +227,7 @@ void sub_8096488(void)
bool8 sub_80964B4(void)
{
if ((gUnknown_203B490->PKMNNewsReceived[0x35] == FALSE) && (sub_8096E80(0x35) == 0)) {
if ((!gUnknown_203B490->PKMNNewsReceived[0x35]) && (sub_8096E80(0x35) == 0)) {
return FALSE;
}
else {
@@ -237,7 +237,7 @@ bool8 sub_80964B4(void)
bool8 sub_80964E4(void)
{
if ((gUnknown_203B490->PKMNNewsReceived[0x36] == FALSE) && (sub_8096E80(0x36) == 0)) {
if ((!gUnknown_203B490->PKMNNewsReceived[0x36]) && (sub_8096E80(0x36) == 0)) {
return FALSE;
}
else {

2
src/code_80972F4.c
View File

@@ -87,7 +87,7 @@ u8 sub_8096E2C(void)
for(index = floor; index < 0x32; index++)
{
if(gUnknown_203B490->PKMNNewsReceived[index] == FALSE) return index;
if(!gUnknown_203B490->PKMNNewsReceived[index]) return index;
}
return 0x38;
}