Aug sept 2024 #211
Aug sept 2024 #211
Conversation
SethBarberee
force-pushed
the
aug_sept_2024
branch
2 times, most recently
from
b68f22e
to
ce53537
Compare
SethBarberee
force-pushed
the
aug_sept_2024
branch
from
aa6ea42
to
9d99557
Compare
|
Ready for review |
| KECLEON_STORE_BUY_ITEM_MENU = 16, | ||
| KECLEON_STORE_BUY_ITEM_RECEIPT, | ||
| KECLEON_STORE_BUY_ITEM_INFO = 21, | ||
| KECLEON_STORE_BUY_ITEM, |
There was a problem hiding this comment.
There are enough skips with the enum number values that it may be easier to define all of them explicitly.
src/code_806FDF4.c
Outdated
| { | ||
| if(pokemon->info->isNotTeamMember) | ||
| { | ||
| info->shopkeeper = 2; |
There was a problem hiding this comment.
These values can use the ShopkeeperMode enum in structs/dungeon_entity.h.
src/code_806FDF4.c
Outdated
| iVar4 = DungeonRandInt(1000); | ||
| recruitRate = GetRecruitRate(targetInfo->id); | ||
| if (recruitRate != -999) { | ||
| if (HasHeldItem(pokemon,0x2e)) { // FRIEND_BOW |
There was a problem hiding this comment.
Swap the number out for the ITEM_FRIEND_BOW macro.
src/code_80718D8.c
Outdated
| info->maxHPStat += leveldata.gainHP; | ||
| info->HP += leveldata.gainHP; | ||
|
|
||
| if(info->maxHPStat > 0x3E6) |
There was a problem hiding this comment.
These hex values are equal to 998 and 999 in decimal. Since these numbers are directly visible to the player, using decimal would be easier to read here.
src/thank_you_wonder_mail.c
Outdated
| CANCEL_ACTION, | ||
| SEND_THANK_YOU_MAIL_ACTION, | ||
| GET_THANK_YOU_MAIL_ACTION, | ||
| // 3 - GAME_LINK |
There was a problem hiding this comment.
If some of these missing enums are known, perhaps they can be added even if they aren't used yet.
| u8 spAtk; | ||
| u8 def; | ||
| u8 spDef; | ||
| // NOTE: cannot re-use offense struct as it pads. |
There was a problem hiding this comment.
Can't we make it a packed struct then?
| targetInfo = target->info; | ||
| iVar8 = -1; | ||
| size = GetBodySize(targetInfo->apparentID); | ||
| if ((1 < ((u16)(gDungeon->bossBattleIndex - 4))) && (gDungeon->bossBattleIndex != 9) && (gDungeon->bossBattleIndex != 0xf)) { |
There was a problem hiding this comment.
This comparison has broken me. I no longer know what kind of horrendous comparison macros they could have used.
| (targetInfo->id != 0x19e) && | ||
| (targetInfo->id != 0x195) && | ||
| (targetInfo->id != 0x196) && | ||
| (targetInfo->id != 0x197)) || (HasRecruitedMon(targetInfo->id) == 0)) && |
There was a problem hiding this comment.
These are MONSTER_ constants
| {NULL, 0x0}, | ||
| {"Confirm", CONFIRM_ACTION}, | ||
| {"Info", INFO_ACTION}, | ||
| {NULL, CANCEL_ACTION}, |
There was a problem hiding this comment.
I wonder if it doesn't make more sense to make these last terminator entries use empty {} initializers.
There was a problem hiding this comment.
While doing that, the explicit array size could be removed.
Getting better about doing this more in the open so people know what I'm working on..