Finish documenting the Battle Castle Apps (Overlay 107)

include/applications/frontier/battle_castle/helpers.h

@@ -0,0 +1,18 @@
+#ifndef POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_HELPERS_H
+#define POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_HELPERS_H
+
+#include "savedata.h"
+#include "string_template.h"
+
+#define BATTLE_CASTLE_RANK_HEALING          0
+#define BATTLE_CASTLE_RANK_RENTALS          1
+#define BATTLE_CASTLE_RANK_OPPONENT_SUMMARY 2
+#define BATTLE_CASTLE_NUM_RANK_TYPES        3
+
+u8 BattleCastleApp_GetSelectedSlot(u8 numSlots, u8 slot);
+u8 BattleCastleApp_GetSlotFromSlotID(u8 exitSlot, u8 slotID);
+u8 BattleCastleApp_GetRank(SaveData *saveData, u8 challengeType, u8 rankType);
+void BattleCastleApp_PlaySound(u32 input, u16 seqID);
+void BattleCastleApp_SetPartnerName(StringTemplate *template, u32 idx);
+
+#endif // POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_HELPERS_H

include/overlay107/battle_castle_opponent_app.h → include/applications/frontier/battle_castle/opponent_app.h

@@ -6,9 +6,9 @@
 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);
+void BattleCastleOpponentApp_HandlePlayerInfoCmd(int netID, int unused, void *data, void *context);
+void BattleCastleOpponentApp_HandlePurchaseInfoCmd(int netID, int unused, void *data, void *context);
+void BattleCastleOpponentApp_HandleUpdateCursorCmd(int netID, int unused, void *data, void *context);
+void BattleCastleOpponentApp_HandleExitAppCmd(int netID, int unused, void *data, void *context);
 
 #endif // POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_OPPONENT_MAIN_H

include/overlay107/battle_castle_self_app.h → include/applications/frontier/battle_castle/self_app.h

@@ -6,9 +6,9 @@
 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);
+void BattleCastleSelfApp_HandlePlayerInfoCmd(int netID, int unused, void *data, void *context);
+void BattleCastleSelfApp_HandlePurchaseInfoCmd(int netID, int unused, void *data, void *context);
+void BattleCastleSelfApp_HandleUpdateCursorCmd(int netID, int unused, void *data, void *context);
+void BattleCastleSelfApp_HandleExitAppCmd(int netID, int unused, void *data, void *context);
 
 #endif // POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_SELF_MAIN_H

include/applications/frontier/battle_castle/sprites.h

@@ -0,0 +1,48 @@
+#ifndef POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_SPRITES_H
+#define POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_SPRITES_H
+
+#include "struct_defs/pokemon.h"
+
+#include "applications/frontier/battle_castle/sprite_manager.h"
+
+#include "sprite.h"
+
+#define ANIM_ID_EXIT_CURSOR           0
+#define ANIM_ID_MON_CURSOR            1
+#define ANIM_ID_PARTNER_MON_CURSOR    2
+#define ANIM_ID_ITEM_SELECT_CURSOR    3
+#define ANIM_ID_MENU_UP_ARROW         4
+#define ANIM_ID_MENU_DOWN_ARROW       5
+#define ANIM_ID_POKE_BALL             6
+#define ANIM_ID_SHAKING_POKE_BALL     7
+#define ANIM_ID_HEAL_SPARKLES         8
+#define ANIM_ID_LEVEL_UP_ARROW        9
+#define ANIM_ID_LEVEL_DOWN_ARROW      10
+#define ANIM_ID_OPEN_SUMMARY_SPARKLES 11
+#define ANIM_ID_FLAG                  12
+#define ANIM_ID_RED_BAR               13
+#define ANIM_ID_YELLOW_BAR            14
+#define ANIM_ID_GREEN_BAR             15
+#define ANIM_ID_RENTAL_SPARKLES       16
+#define ANIM_ID_PARTNER_EXIT_CURSOR   17
+
+typedef struct BattleCastleAppSprite {
+    s16 x;
+    s16 y;
+    Sprite *sprite;
+} BattleCastleAppSprite;
+
+BattleCastleAppSprite *BattleCastleAppSprite_New(BattleCastleAppSpriteManager *spriteMan, u32 charResourceID, u32 plttResourceID, u32 cellResourceID, u32 animID, s16 x, s16 y, int priority, const u8 *unused);
+void *BattleCastleAppSprite_Free(BattleCastleAppSprite *sprite);
+void BattleCastleAppSprite_SetDrawFlag(BattleCastleAppSprite *sprite, BOOL draw);
+void BattleCastleAppSprite_SetPosition(BattleCastleAppSprite *sprite, u16 x, u16 y);
+void BattleCastleAppSprite_SetAnim(BattleCastleAppSprite *sprite, u32 animID);
+void BattleCastleAppSprite_UpdatePalette(BattleCastleAppSprite *sprite, Pokemon *mon);
+void BattleCastleAppSprite_UpdateMonSpriteAnim(BattleCastleAppSprite *sprite, u8 animID);
+void BattleCastleAppSprite_UpdateMonPosition(BattleCastleAppSprite *sprite, u8 isSelected);
+BOOL BattleCastleAppSprite_IsAnimated(BattleCastleAppSprite *sprite);
+void BattleCastleAppSprite_SetPriority(BattleCastleAppSprite *sprite, u8 priority);
+void BattleCastleAppSprite_UpdateCoords(BattleCastleAppSprite *sprite, s16 x, s16 y);
+void BattleCastleAppSprite_PlaySparkleAnim(BattleCastleAppSprite *sprite, u16 x, u16 y);
+
+#endif // POKEPLATINUM_APPLICATIONS_BATTLE_CASTLE_SPRITES_H

include/overlay104/ov104_0222DCE0.h

@@ -21,10 +21,10 @@ u32 ov104_0222DD6C(FrontierPokemonDataDTO *param0, u16 param1, u32 param2, u32 p
 void ov104_0222DF40(const FrontierPokemonDataDTO *param0, Pokemon *param1, u8 param2);
 u16 BattleTower_GetObjectIDFromTrainerClass(u8 trainerClass);
 void ov104_0222E134(SaveData *saveData, Pokemon *param1);
-void ov104_0222E1C0(SaveData *saveData, Party *param1, Pokemon *param2);
-void ov104_0222E1D8(Sprite *param0, u8 param1);
-void ov104_0222E204(Sprite *param0, s16 param1, s16 param2, u8 param3);
-u8 ov104_0222E240(u16 param0, u16 param1);
+void ov104_0222E1C0(SaveData *saveData, Party *party, Pokemon *param2);
+void BattleCastle_UpdateMonSpriteAnimID(Sprite *sprite, u8 animID);
+void BattleCastle_UpdateMonSpritePosition(Sprite *sprite, s16 x, s16 y, u8 isSelected);
+u8 BattleCastle_GetPokeIconAnimID(u16 hp, u16 maxHp);
 void ov104_0222E278(FrontierDataDTO *param0, u16 param1, enum HeapID heapID, int param3);
 void ov104_0222E284(FieldBattleDTO *param0, FrontierTrainerDataDTO *param1, int param2, int battlerId, enum HeapID heapID);
 u32 ov104_0222E2F0(FrontierPokemonDataDTO *param0, u16 param1, int param2, u8 param3, u32 param4, int param5, int param6);

include/overlay104/ov104_0223B6F4.h

@@ -24,6 +24,6 @@ void ov104_0223BAB8(UnkStruct_ov104_0223BA10 *param0);
 u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 *param0);
 void ov104_0223BB84(BgConfig *param0, UnkStruct_ov104_0223BA10 *param1, u32 param2);
 u16 ov104_0223BC24(u16 param0);
-void ov104_0223BC2C(BattleFrontier *frontier, u8 param1, int param2);
+void ov104_0223BC2C(BattleFrontier *frontier, u8 challengeType, int castlePoints);
 
 #endif // POKEPLATINUM_OV104_0223B6F4_H

platinum.us/main.lsf

@@ -1591,15 +1591,15 @@ Overlay battle_hall_app
 	Object main.nef.p/src_applications_frontier_battle_hall_windows.c.o
 }
 
-Overlay overlay107
+Overlay battle_castle_app
 {
 	After overlay104
-	Object main.nef.p/src_overlay107_battle_castle_self_app.c.o
-	Object main.nef.p/src_overlay107_battle_castle_opponent_app.c.o
-	Object main.nef.p/src_overlay107_battle_castle_app_sprite_manager.c.o
-	Object main.nef.p/src_overlay107_battle_castle_app_sprite.c.o
-	Object main.nef.p/src_overlay107_ov107_02249C98.c.o
-	Object main.nef.p/src_overlay107_battle_castle_app_windows.c.o
+	Object main.nef.p/src_applications_frontier_battle_castle_self_app.c.o
+	Object main.nef.p/src_applications_frontier_battle_castle_opponent_app.c.o
+	Object main.nef.p/src_applications_frontier_battle_castle_sprite_manager.c.o
+	Object main.nef.p/src_applications_frontier_battle_castle_sprites.c.o
+	Object main.nef.p/src_applications_frontier_battle_castle_helpers.c.o
+	Object main.nef.p/src_applications_frontier_battle_castle_windows.c.o
 }
 
 Overlay overlay108

platinum.us/sbins_shared.sha1

@@ -104,7 +104,7 @@ de8a847bff8c343d69b853a215e6ee775ef2ef96 *dummy6.sbin
 a3f4dcf6634992ff3367fe5a377825fb913a39f6 *overlay104.sbin
 0e6e923a1a359b9482646b3dd0a7a2562e140672 *overlay105.sbin
 c3a66997e55fb3e761d521136a42f07f4761f5da *battle_hall_app.sbin
-f8d3fd65261098ff45b3a31319c904b520814fa2 *overlay107.sbin
+f8d3fd65261098ff45b3a31319c904b520814fa2 *battle_castle_app.sbin
 901f6afe6c1b0b54dc42af812f13560758814d2b *overlay108.sbin
 5acaa19b61120f72d546a83e36c361b2e383c0bd *overlay109.sbin
 1626b234bbd0915fc1bd57d0b67c59c86f1138bd *overlay110.sbin

res/text/battle_castle_self_app.json

@@ -6,19 +6,19 @@
       "en_US": "{STRVAR_1 3, 0, 0}"
     },
     {
-      "id": "pl_msg_00000199_00001",
+      "id": "BattleCastleSelfApp_Text_PartnerName",
       "en_US": "{STRVAR_1 3, 0, 0}"
     },
     {
-      "id": "pl_msg_00000199_00002",
+      "id": "BattleCastleSelfApp_Text_CastlePoints",
       "en_US": "{STRVAR_1 53, 0, 0} CP"
     },
     {
-      "id": "pl_msg_00000199_00003",
+      "id": "BattleCastleSelfApp_Text_PartnersCastlePoints",
       "en_US": "{STRVAR_1 53, 0, 0} CP"
     },
     {
-      "id": "BattleCastleSelfApp_Text_CastlePoints",
+      "id": "BattleCastleSelfApp_Text_CastlePointsItemSelect",
       "en_US": "{STRVAR_1 53, 0, 0} CP"
     },
     {

src/applications/frontier/battle_castle/helpers.c

@@ -0,0 +1,45 @@
+#include "applications/frontier/battle_castle/helpers.h"
+
+#include <nitro.h>
+
+#include "communication_information.h"
+#include "communication_system.h"
+#include "list_menu.h"
+#include "savedata.h"
+#include "sound_playback.h"
+#include "string_template.h"
+#include "trainer_info.h"
+#include "unk_0203061C.h"
+#include "unk_0205DFC4.h"
+
+u8 BattleCastleApp_GetSelectedSlot(u8 numSlots, u8 slot)
+{
+    return slot;
+}
+
+u8 BattleCastleApp_GetSlotFromSlotID(u8 exitSlot, u8 slotID)
+{
+    if (slotID < exitSlot) {
+        return slotID;
+    }
+
+    return slotID - exitSlot;
+}
+
+u8 BattleCastleApp_GetRank(SaveData *saveData, u8 challengeType, u8 rankType)
+{
+    return sub_02030698(SaveData_GetBattleFrontier(saveData), sub_0205E5B4(challengeType, rankType), sub_0205E6A8(sub_0205E5B4(challengeType, rankType)));
+}
+
+void BattleCastleApp_PlaySound(u32 input, u16 seqID)
+{
+    if (input != LIST_NOTHING_CHOSEN) {
+        Sound_PlayEffect(seqID);
+    }
+}
+
+void BattleCastleApp_SetPartnerName(StringTemplate *template, u32 idx)
+{
+    TrainerInfo *partner = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1);
+    StringTemplate_SetPlayerName(template, idx, partner);
+}