-
Notifications
You must be signed in to change notification settings - Fork 161
Document Battle Castle App setup functions #941
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #ifndef POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_OPPONENT_MAIN_H | ||
| #define POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_OPPONENT_MAIN_H | ||
|
|
||
| #include "overlay_manager.h" | ||
|
|
||
| BOOL BattleCastleOpponentApp_Init(ApplicationManager *appMan, int *state); | ||
| BOOL BattleCastleOpponentApp_Main(ApplicationManager *appMan, int *state); | ||
| BOOL BattleCastleOpponentApp_Exit(ApplicationManager *appMan, int *state); | ||
| void ov107_02248910(int param0, int param1, void *param2, void *param3); | ||
| void ov107_02248978(int param0, int param1, void *param2, void *param3); | ||
| void ov107_022489E0(int param0, int param1, void *param2, void *param3); | ||
| void ov107_02248A10(int param0, int param1, void *param2, void *param3); | ||
|
|
||
| #endif // POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_OPPONENT_MAIN_H |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #ifndef POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_SELF_MAIN_H | ||
| #define POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_SELF_MAIN_H | ||
|
|
||
| #include "overlay_manager.h" | ||
|
|
||
| BOOL BattleCastleSelfApp_Init(ApplicationManager *appMan, int *state); | ||
| BOOL BattleCastleSelfApp_Main(ApplicationManager *appMan, int *state); | ||
| BOOL BattleCastleSelfApp_Exit(ApplicationManager *appMan, int *state); | ||
| void ov107_02245338(int param0, int param1, void *param2, void *param3); | ||
| void ov107_022453A0(int param0, int param1, void *param2, void *param3); | ||
| void ov107_02245408(int param0, int param1, void *param2, void *param3); | ||
| void ov107_02245438(int param0, int param1, void *param2, void *param3); | ||
|
|
||
| #endif // POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_SELF_MAIN_H |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,7 @@ u8 ov104_0223B7DC(u8 param0, BOOL param1); | |
| FieldBattleDTO *ov104_0223B810(UnkStruct_ov104_0223BA10 *param0, UnkStruct_ov104_02230BE4 *param1); | ||
| static u32 ov104_0223B9E4(u8 param0); | ||
| u8 ov104_0223BA10(UnkStruct_ov104_0223BA10 *param0); | ||
| BOOL ov104_0223BA14(u8 param0); | ||
| BOOL BattleCastle_IsMultiPlayerChallenge(u8 param0); | ||
|
||
| void ov104_0223BA24(Party *param0); | ||
| void ov104_0223BAB8(UnkStruct_ov104_0223BA10 *param0); | ||
| void ov104_0223BA7C(UnkStruct_ov104_0223BA10 *param0, Pokemon *param1); | ||
|
|
@@ -252,15 +252,9 @@ u8 ov104_0223BA10(UnkStruct_ov104_0223BA10 *param0) | |
| return 50; | ||
| } | ||
|
|
||
| BOOL ov104_0223BA14(u8 param0) | ||
| BOOL BattleCastle_IsMultiPlayerChallenge(u8 challengeType) | ||
| { | ||
| switch (param0) { | ||
| case 2: | ||
| case 3: | ||
| return 1; | ||
| } | ||
|
|
||
| return 0; | ||
| return challengeType == 2 || challengeType == 3; | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. question: If we know these indicate multiplayer challenges, can we document the constants at this point?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, I am planning on documenting these, but I'd like to leave that out of this PR for now. I've been waiting because I wasn't sure what "3" corresponded to ("2" is for multi-battles as initiated from inside the Battle Castle). I now am reasonably sure that "3" is for multi-battle started through the Wi-fi club, but want to handle this separately in a dedicated PR as I think the Battle Hall, and probably all the non-Tower facilities use the same values. |
||
| } | ||
|
|
||
| void ov104_0223BA24(Party *param0) | ||
|
|
@@ -355,7 +349,7 @@ u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 *param0) | |
| { | ||
| u16 v0 = param0->unk_16; | ||
|
|
||
| if (ov104_0223BA14(param0->unk_10) == 1) { | ||
| if (BattleCastle_IsMultiPlayerChallenge(param0->unk_10) == 1) { | ||
| if (param0->unk_A12 > param0->unk_16) { | ||
| v0 = param0->unk_A12; | ||
| } | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
polish:
param0->challengeType