diff --git a/include/structs/str_dungeon.h b/include/structs/str_dungeon.h index bca5cf528..93c600c6e 100644 --- a/include/structs/str_dungeon.h +++ b/include/structs/str_dungeon.h @@ -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]; diff --git a/src/code_80140DC.c b/src/code_80140DC.c index 6abca692f..0f8abb678 100644 --- a/src/code_80140DC.c +++ b/src/code_80140DC.c @@ -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); +// } diff --git a/src/code_8066D04.c b/src/code_8066D04.c index c9d1e43af..ba178e6bf 100644 --- a/src/code_8066D04.c +++ b/src/code_8066D04.c @@ -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; diff --git a/src/code_80718D8.c b/src/code_80718D8.c index 4edd9ea35..a5028c42d 100644 --- a/src/code_80718D8.c +++ b/src/code_80718D8.c @@ -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; diff --git a/src/code_80958E8_1.c b/src/code_80958E8_1.c index 78318b1f5..623f9075a 100644 --- a/src/code_80958E8_1.c +++ b/src/code_80958E8_1.c @@ -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 { diff --git a/src/code_80972F4.c b/src/code_80972F4.c index d83670381..6090e4798 100644 --- a/src/code_80972F4.c +++ b/src/code_80972F4.c @@ -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; }