diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 36 | ||||
| -rw-r--r-- | include/credits.h | 3 | ||||
| -rw-r--r-- | include/event_object_movement.h | 1 | ||||
| -rw-r--r-- | include/menu.h | 3 | ||||
| -rw-r--r-- | include/party_menu.h | 93 | ||||
| -rwxr-xr-x | include/pokemon_summary_screen.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 46 |
7 files changed, 134 insertions, 50 deletions
diff --git a/include/battle.h b/include/battle.h index 52c4ee8ae..c5c747137 100644 --- a/include/battle.h +++ b/include/battle.h @@ -302,11 +302,10 @@ struct BattleResults u8 playerSwitchesCounter; // 0x2 u8 unk3; // 0x3 u8 unk4; // 0x4 - u8 playerMonWasDamaged:1; // 0x5 + u8 playerMonWasDamaged:1; // 0x5 u8 usedMasterBall:1; // 0x5 u8 caughtMonBall:4; // 0x5 u8 shinyWildMon:1; // 0x5 - u8 unk5_7:1; // 0x5 u16 playerMon1Species; // 0x6 u8 playerMon1Name[POKEMON_NAME_LENGTH + 1]; // 0x8 u8 battleTurnCounter; // 0x13 @@ -411,12 +410,12 @@ struct BattleStruct { u8 turnEffectsTracker; u8 turnEffectsBattlerId; - u8 filler2; + u8 unused_0; u8 turnCountersTracker; u8 wrappedMove[MAX_BATTLERS_COUNT * 2]; // Leftover from Ruby's ewram access. u8 moveTarget[MAX_BATTLERS_COUNT]; u8 expGetterMonId; - u8 field_11; + u8 unused_1; u8 wildVictorySong; u8 dynamicMoveType; u8 wrappedBy[MAX_BATTLERS_COUNT]; @@ -437,28 +436,25 @@ struct BattleStruct u8 field_60[4][3]; u8 runTries; u8 caughtMonNick[POKEMON_NAME_LENGTH + 1]; - u8 field_78; + u8 unused_2; u8 safariGoNearCounter; u8 safariPkblThrowCounter; u8 safariEscapeFactor; u8 safariCatchFactor; - u8 field_7D; - u8 field_7E; + u8 field_7D; // unknown spriteId + u8 field_7E; // unknown spriteId u8 formToChangeInto; u8 chosenMovePositions[MAX_BATTLERS_COUNT]; u8 stateIdAfterSelScript[MAX_BATTLERS_COUNT]; - u8 field_88; - u8 field_89; - u8 field_8A; - u8 field_8B; - u8 field_8C; - u8 field_8D; + u8 unused_3[3]; + u8 field_8B; // related to player's pokemon switching + u8 unused_4[2]; u8 stringMoveType; u8 expGetterBattlerId; - u8 field_90; - u8 field_91; - u8 field_92; - u8 field_93; + u8 unused_5; + u8 field_91; // related to gAbsentBattlerFlags, possibly absent flags turn ago? + u8 field_92; // battle palace related + u8 field_93; // related to choosing pokemon? u8 wallyBattleState; u8 wallyMovesState; u8 wallyWaitFrames; @@ -481,11 +477,11 @@ struct BattleStruct u8 switchInItemsCounter; u8 arenaTurnCounter; u8 turnSideTracker; - u8 fillerDC[0xDF-0xDC]; + u8 unused_6[3]; u8 givenExpMons; // Bits for enemy party's pokemon that gave exp to player's party. u8 lastTakenMoveFrom[MAX_BATTLERS_COUNT * MAX_BATTLERS_COUNT * 2]; // a 3-D array [target][attacker][byte] u16 castformPalette[MAX_BATTLERS_COUNT][16]; - u8 field_180; + u8 field_180; // weird field, used in battle_main.c, once accessed as an array of u32 overwriting the field below u8 field_181; u8 field_182; u8 field_183; @@ -496,7 +492,7 @@ struct BattleStruct u8 atkCancellerTracker; struct BattleTvMovePoints tvMovePoints; struct BattleTv tv; - u8 notSureWhatFieldLol[0x28]; + u8 unused_7[0x28]; u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT]; s8 arenaMindPoints[2]; s8 arenaSkillPoints[2]; diff --git a/include/credits.h b/include/credits.h index faad1058a..e7e58415b 100644 --- a/include/credits.h +++ b/include/credits.h @@ -7,5 +7,6 @@ extern EWRAM_DATA bool8 gHasHallOfFameRecords; // Exported ROM declarations +void sub_8175620(void); -#endif //GUARD_CREDITS_H +#endif // GUARD_CREDITS_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 4d0c21f98..284bbe8db 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -60,6 +60,7 @@ struct LockedAnimEventObjects extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[]; extern const struct OamData gEventObjectBaseOam_32x8; +extern const struct OamData gEventObjectBaseOam_32x32; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; extern const u8 gReflectionEffectPaletteMap[]; diff --git a/include/menu.h b/include/menu.h index 04677ae40..9b2341e58 100644 --- a/include/menu.h +++ b/include/menu.h @@ -95,5 +95,8 @@ s8 Menu_ProcessInputGridLayout(void); u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, bool8 APressMuted); s8 Menu_ProcessInputNoWrapAround_other(void); void sub_8199CBC(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height); +u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile); +void sub_8198314(void); +void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram); #endif // GUARD_MENU_H diff --git a/include/party_menu.h b/include/party_menu.h index 27a043cb6..46f71c165 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -26,7 +26,8 @@ enum PARTY_GIVE_ITEM, }; -struct Struct203CEC8 { +struct Struct203CEC8 +{ MainCallback exitCallback; TaskFunc unk4; u8 unk8_0:4; @@ -41,42 +42,76 @@ struct Struct203CEC8 { }; extern struct Struct203CEC8 gUnknown_0203CEC8; +extern u8 gUnknown_0203CEE8; +extern u8 gUnknown_0203CEE9; +extern MainCallback gPostMenuFieldCallback; +extern u8 gSelectedOrderFromParty[4]; +extern u8 gUnknown_0203CF00[3]; extern const u16 gUnknown_0861500C[]; // tutor table -bool8 pokemon_has_move(struct Pokemon *, u16); -void sub_81B58A8(void); -void DoWallyTutorialBagMenu(void); -u8 pokemon_ailments_get_primary(u32 status); -u8 *GetMonNickname(struct Pokemon *mon, u8 *dst); +void sub_81B0FCC(u8 slot, u8 b); +bool8 IsMultiBattle(void); u8 GetCursorSelectionMonId(void); +u8 sub_81B1360(void); +void sub_81B1370(u8 taskId); +u8* GetMonNickname(struct Pokemon *mon, u8 *dest); +u8 sub_81B1B5C(const u8* str, u8 b); +bool8 sub_81B1BD4(void); +void sub_81B1F18(u8 taskId, u8 slot, s8 c, s16 HPDifference, TaskFunc func); +u8 pokemon_ailments_get_primary(u32 status); +u8 sub_81B205C(struct Pokemon *mon); +void display_pokemon_menu_message(u32 stringID); +void sub_81B47E0(u8 taskId); bool8 FieldCallback_PrepareFadeInFromMenu(void); +bool8 sub_81B5820(void); +bool8 sub_81B5884(void); +void sub_81B58A8(void); +bool8 hm_prepare_waterfall(void); +bool8 sub_81B5974(void); +void LoadHeldItemIcons(void); +void sub_81B5D4C(u8 *a, u8 *b, u8 c); +void sub_81B617C(void); +void ItemUseCB_Medicine(u8 taskId, TaskFunc task); +void sub_81B67C8(u8 taskId, TaskFunc task); +void dp05_ether(u8 taskId, TaskFunc task); +void dp05_pp_up(u8 taskId, TaskFunc task); +u16 ItemIdToBattleMoveId(u16 item); +bool8 sub_81B6D14(u16 move); +bool8 pokemon_has_move(struct Pokemon *mon, u16 move); +void sub_81B6DC4(u8 taskId, TaskFunc task); +void dp05_rare_candy(u8 taskId, TaskFunc task); +void sub_81B79E8(u8 taskId, TaskFunc task); +void sub_81B7C74(u8 taskId, TaskFunc task); +u8 GetItemEffectType(u16 item); +void CB2_PartyMenuFromStartMenu(void); void sub_81B7F60(void); - -void sub_81B0FCC(u8 partyIdx, u8 a); -void sub_81B1370(u8 taskId); -void display_pokemon_menu_message(u32 windowId); -void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func); -u8 sub_81B1B5C(const u8 *a, u8 b); -u8 sub_81B1BD4(void); void sub_81B8448(void); void sub_81B8518(u8 unused); -u8 sub_81B1360(void); -void sub_81B8904(u8 arg0, void (*callback)(void)); -void OpenPartyMenuInBattle(u8 caseId); -u16 ItemIdToBattleMoveId(u16 itemId); -u8 sub_81B205C(struct Pokemon* a); -void sub_81B617C(void); -u8 sub_81B6D14(u16 a); +void sub_81B8558(void); +void sub_81B8904(u8 initArg, MainCallback callback); +void sub_81B892C(void); +void sub_81B8958(void); +void OpenPartyMenuInBattle(u8 arg); +void sub_81B89F0(void); +void sub_81B8C68(void); +void sub_81B8D64(u8 battlerId, u8 multiplayerFlag); +void sub_81B8E80(u8 battlerId, u8 unk, u8 arrayIndex); +void sub_81B8FB0(u8 slot, u8 slot2); +u8 pokemon_order_func(u8 slot); +void sub_81B9150(void); +void sub_81B9328(void); bool8 hm_add_c3_without_phase_2(void); - -extern void dp05_ether(u8, TaskFunc); -extern void dp05_pp_up(u8, TaskFunc); -extern void dp05_rare_candy(u8, TaskFunc); - -extern void sub_81B67C8(u8, TaskFunc); -extern void sub_81B79E8(u8, TaskFunc); -extern void sub_81B6DC4(u8, TaskFunc); -extern void sub_81B7C74(u8, TaskFunc); +void sub_81B9404(void); +void sub_81B94B0(void); +void sub_81B951C(void); +void sub_81B9620(void); +void sub_81B95E0(void); +void sub_81B98DC(void); +void sub_81B9918(void); +void sub_81B9770(void); +void sub_81B9718(void); +void sub_81B96D0(void); +void sub_81B968C(void); #endif // GUARD_PARTY_MENU_H diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 34f7934e1..e2226b1e1 100755 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -8,6 +8,8 @@ void sub_81C4F98(u8, void(*)(void)); void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16); void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); u8 sub_81C1B94(void); +void SummaryScreen_SetUnknownTaskId(u8 a0); +void SummaryScreen_DestroyUnknownTask(void); // The Pokemon Summary Screen can operate in different modes. Certain features, // such as move re-ordering, are available in the different modes. diff --git a/include/strings.h b/include/strings.h index eff40d8f2..706fd116e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1875,4 +1875,50 @@ extern const u8 gText_PartyFull[]; extern const u8 gText_Box[]; extern const u8 gText_JustOnePkmn[]; +// battle main +extern const u8 gText_LinkStandby3[]; +extern const u8 gText_BattleRecordCouldntBeSaved[]; +extern const u8 gText_Poison[]; +extern const u8 gText_Sleep[]; +extern const u8 gText_Paralysis[]; +extern const u8 gText_Burn[]; +extern const u8 gText_Ice[]; +extern const u8 gText_Confusion[]; +extern const u8 gText_Love[]; + +// battle message +extern const u8 gText_PkmnBoxSomeonesPCFull[]; +extern const u8 gText_PkmnBoxLanettesPCFull[]; +extern const u8 gText_PkmnTransferredSomeonesPC[]; +extern const u8 gText_PkmnTransferredLanettesPC[]; + +// hall of fame +extern const u8 gText_SavingDontTurnOffPower[]; +extern const u8 gText_LeagueChamp[]; +extern const u8 gText_HOFNumber[]; +extern const u8 gText_PickNextCancel[]; +extern const u8 gText_PickCancel[]; +extern const u8 gText_UnkCtrlF800Exit[]; +extern const u8 gText_HOFCorrupted[]; +extern const u8 gText_WelcomeToHOF[]; +extern const u8 gText_Number[]; +extern const u8 gText_Level[]; +extern const u8 gText_IDNumber[]; +extern const u8 gText_Name[]; +extern const u8 gText_MainMenuTime[]; + +// daycare +extern const u8 gText_MaleSymbol4[]; +extern const u8 gText_FemaleSymbol4[]; +extern const u8 gText_GenderlessSymbol[]; +extern const u8 gText_NewLine2[]; +extern const u8 gText_Exit4[]; +extern const u8 gText_Lv[]; +extern const u8 gExpandedPlaceholder_Empty[]; +extern const u8 gText_Exit[]; +extern const u8 gDaycareText_GetAlongVeryWell[]; +extern const u8 gDaycareText_GetAlong[]; +extern const u8 gDaycareText_DontLikeOther[]; +extern const u8 gDaycareText_PlayOther[]; + #endif //GUARD_STRINGS_H |