diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.inc.h | 4 | ||||
| -rw-r--r-- | include/menu.h | 2 | ||||
| -rw-r--r-- | include/text.h | 4 | ||||
| -rw-r--r-- | include/trainer_card.h | 91 |
4 files changed, 25 insertions, 76 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index 2f9b511b6..f533d8729 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -237,6 +237,7 @@ void objc_exclamation_mark_probably(struct Sprite *sprite); // asm/rom_80859BC.o u8 CreateTrainerSprite_BirchSpeech(u8, u16, u16, u8, void *); +void LoadTrainerGfx_TrainerCard(u8 gender, int, void *); u8 CreateBirchSprite(u8, u8, u8); void remove_some_task(void); void dp12_8087EA4(void); @@ -292,6 +293,7 @@ void DoNamingScreen(u8 r0, struct SaveBlock2 *r1, u16 r2, u16 r3, u8 s0, MainCal bool8 IsEnoughMoney(u32, u32); void sub_80B79B8(u32 *, u32); void sub_80B79E0(u32 *, u32); +void sub_80B7AEC(u32, u8 left, u8 top); void sub_80B7BEC(u32, u8, u8); void sub_80B7C14(u32, u8, u8); void RemoveMoneyLabelObject(u8, u8); @@ -360,6 +362,7 @@ void sub_80E6084(); // asm/easy_chat.o void sub_80E6764(void); +void sub_80EB3FC(u8 *, u16); u8 ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16); u16 sub_80EB72C(u16); @@ -394,7 +397,6 @@ void sub_8106630(u32); // asm/rom6.o bool8 npc_before_player_of_type(u8); u8 oei_task_add(void); - void sub_810C994(void); void sub_810CA6C(s32); s16 sub_810CAE4(u8, struct Pokeblock *); diff --git a/include/menu.h b/include/menu.h index 28710b7b9..9592fc291 100644 --- a/include/menu.h +++ b/include/menu.h @@ -15,7 +15,7 @@ bool32 MultistepInitMenuWindowContinue(void); void unref_sub_8071DA4(struct WindowConfig *, u16); void MenuLoadTextWindowGraphics_OverrideFrameType(u8); void MenuLoadTextWindowGraphics(void); -void BasicInitMenuWindow(struct WindowConfig *); +void BasicInitMenuWindow(const struct WindowConfig *); void MenuPrint(u8 *, u8, u8); void MenuZeroFillWindowRect(u8, u8, u8, u8); void MenuFillWindowRectWithBlankTile(u8, u8, u8, u8); diff --git a/include/text.h b/include/text.h index ad5313eed..d0d418eab 100644 --- a/include/text.h +++ b/include/text.h @@ -86,8 +86,8 @@ extern const struct WindowConfig gWindowConfig_81E6D54; extern const struct WindowConfig gWindowConfig_81E6D70; extern const struct WindowConfig gWindowConfig_81E6D8C; extern const struct WindowConfig gWindowConfig_81E6DA8; -extern const struct WindowConfig gWindowConfig_81E6DC4; -extern const struct WindowConfig gWindowConfig_81E6DE0; +extern const struct WindowConfig WindowConfig_TrainerCard_Back_Values; +extern const struct WindowConfig WindowConfig_TrainerCard_Back_Labels; extern const struct WindowConfig gWindowConfig_81E6DFC; extern const struct WindowConfig gWindowConfig_81E6E18; extern const struct WindowConfig gWindowConfig_81E6E34; diff --git a/include/trainer_card.h b/include/trainer_card.h index aca964151..7269c0b20 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -3,7 +3,7 @@ struct TrainerCard { /*0x00*/ u8 gender; - /*0x01*/ u8 var_1; + /*0x01*/ u8 stars; /*0x02*/ bool8 hasPokedex; /*0x03*/ bool8 var_3; /*0x04*/ bool8 var_4; @@ -17,8 +17,8 @@ struct TrainerCard { /*0x12*/ u16 playTimeMinutes; /*0x14*/ u16 linkBattleWins; /*0x16*/ u16 linkBattleLosses; - /*0x18*/ u16 var_18; - /*0x1A*/ u16 var_1A; + /*0x18*/ u16 battleTowerWins; + /*0x1A*/ u16 battleTowerLosses; /*0x1C*/ u16 contestsWithFriends; /*0x1E*/ u16 pokeblocksWithFriends; /*0x20*/ u16 pokemonTrades; @@ -30,76 +30,23 @@ struct TrainerCard { void sub_8093110(void (*)(void)); void sub_8093130(u8, void (*)(void)); -void sub_8093324(void); void sub_8093390(struct TrainerCard *); u8 sub_80934C4(u8 id); -void sub_8093598(void); -void sub_80935EC(void); -void sub_8093610(void); -void sub_8093688(void); -// sub_80936D4 -void sub_80937A4(void); -void sub_80937BC(void); -void sub_80937D8(void); -void sub_80937F0(void); -void nullsub_15(void); -void sub_8093800(void); -// sub_809380C -// sub_809382C -// sub_8093864 -// sub_80938A8 -// sub_80938CC -// sub_8093918 -// sub_8093938 -// sub_8093954 -// sub_8093980 -// sub_80939A4 -// sub_80939C0 -// sub_80939DC -// sub_8093A28 -// sub_8093A48 -// sub_8093A68 -// sub_8093AA0 -// sub_8093AF0 -// sub_8093C0C -// sub_8093C38 -// sub_8093D50 -// sub_8093D7C -// sub_8093DAC -// sub_8093DC8 -// sub_8093DEC -// sub_8093E04 -// sub_8093E28 -// sub_8093EA0 -// sub_8093EF8 -// sub_8093F14 -// sub_8093F48 -// sub_8093F64 -// sub_8093F80 -// sub_8093FD0 -// sub_8094038 -// sub_80940E4 -// sub_8094110 -// sub_8094140 -// sub_8094188 -// sub_80941D8 -// sub_8094200 -// sub_8094218 -// sub_8094250 -// sub_809429C -// sub_80942F8 -// sub_8094334 -// sub_8094354 -// sub_80943C4 -// sub_80943E4 -// sub_8094428 -// sub_8094448 -// sub_8094498 -// sub_80944B8 -// sub_80944E8 -// sub_8094508 -// sub_8094538 -// sub_8094558 -// unref_sub_8094588 + +// gUnknown_083B5EBC:: @ 83B5EBC +bool8 sub_8093864(); +bool8 sub_80938A8(); +bool8 sub_80938CC(); +bool8 sub_8093918(); +bool8 sub_8093938(); +bool8 sub_8093954(); +bool8 sub_8093980(); + +// gUnknown_083B5ED8:: @ 83B5ED8 +bool8 sub_8093AA0(); +bool8 sub_8093AF0(); +bool8 sub_8093C0C(struct TrainerCard *trainerCard); +bool8 sub_8093C38(); +bool8 sub_8093D50(void); #endif // GUARD_TRAINER_CARD_H |