Skip to content

Comments

Finish documenting the Battle Castle Apps (Overlay 107)#968

Merged
lhearachel merged 3 commits intopret:mainfrom
VicSevenT:battle_castle_app_4
Feb 23, 2026
Merged

Finish documenting the Battle Castle Apps (Overlay 107)#968
lhearachel merged 3 commits intopret:mainfrom
VicSevenT:battle_castle_app_4

Conversation

@VicSevenT
Copy link
Contributor

Final continuation of #956.

Looks like git isn't recognizing the renaming of some of the files in the full PR view, but if you look at just the first commit of this PR you can see what was all changed in those files without seeing it as a delete+new file.

Copy link
Collaborator

@lhearachel lhearachel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for splitting this up to make it easier to review.

app->frontier = SaveData_GetBattleFrontier(app->saveData);

for (int v0 = 0; v0 < 3; v0++) {
app->unk_437[v0] = 1;
for (int i = 0; i < 3; i++) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

polish: Set a constant here that can be applied to the struct-definition as well, so the ranks are always updated in case a modder changes them.

if ((Pokemon_GetValue(v7, MON_DATA_HP, NULL) == Pokemon_GetValue(v7, MON_DATA_MAX_HP, NULL)) && (ov107_02245210(v7) == 0)) {
param0->printerID = PrintMessageAndCopyToVRAM(param0, BattleCastleSelfApp_Text_NoBenefit, FONT_MESSAGE);
param0->subState = 7;
if ((Pokemon_GetValue(mon, MON_DATA_HP, NULL) == Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL)) && (!IsMonMissingPP(mon))) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

polish: Remove unnecessary parens.

param0->printerID = PrintMessageAndCopyToVRAM(param0, BattleCastleSelfApp_Text_RentalRankTooLow, FONT_MESSAGE);
param0->subState = 14;
return 0;
if (rank == 1) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thought: Do we not have constants for these ranks?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think constants would do much. The rank is just a number that increments from 1 to 3. And I don't think they have any special names in-game beside the number.

@lhearachel lhearachel merged commit 4ca3e1a into pret:main Feb 23, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants