battle_input.c #347
Draft
battle_input.c #347
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lhearachel
reviewed
Jan 22, 2025
| @@ -1,6 +1,6 @@ | |||
| #ifndef POKEPLATINUM_STRUCT_OV16_02268A14_DECL_H | |||
| #define POKEPLATINUM_STRUCT_OV16_02268A14_DECL_H | |||
|
|
|||
| typedef struct UnkStruct_ov16_02268A14_t UnkStruct_ov16_02268A14; | |||
| typedef struct BattleInput_t BattleInput; | |||
There was a problem hiding this comment.
polish: Pull this (and other such structs named in this PR) out into the corresponding header, if possible.
There was a problem hiding this comment.
This one specifically is defined in the c file, I can default to just putting it in battle_input.h for now
| @@ -30,7 +30,7 @@ typedef struct { | |||
| u8 unk_31; | |||
| u8 unk_32; | |||
| UnkStruct_ov13_02228A50 *unk_34; | |||
| UnkStruct_ov16_0226DEEC *unk_38; | |||
| CatchingTutorialFinger *unk_38; | |||
There was a problem hiding this comment.
Suggested change
| CatchingTutorialFinger *unk_38; | |
| CatchingTutorialFinger *tutorialFinger; |
| u8 ov13_02228A5C(UnkStruct_ov13_02228A50 *param0); | ||
| void ov13_02228A60(UnkStruct_ov13_02228A50 *param0, u8 param1); | ||
| void ov13_02228A64(UnkStruct_ov13_02228A50 *param0, UnkStruct_ov16_0226DC24 *param1); | ||
| void ov13_02228A64(UnkStruct_ov13_02228A50 *param0, BattleCursor *param1); |
There was a problem hiding this comment.
Suggested change
| void ov13_02228A64(UnkStruct_ov13_02228A50 *param0, BattleCursor *param1); | |
| void ov13_02228A64(UnkStruct_ov13_02228A50 *param0, BattleCursor *battleCursor); |
| void BattleCursor_LoadResources(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7); | ||
| void BattleCursor_FreeResources(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); | ||
| BattleCursor *BattleCursor_New(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); | ||
| void BattleCursor_Free(BattleCursor *param0); |
There was a problem hiding this comment.
Suggested change
| void BattleCursor_Free(BattleCursor *param0); | |
| void BattleCursor_Free(BattleCursor *battleCursor); |
etc.
| @@ -460,7 +460,7 @@ static void BattleController_CommandSelectionInput(BattleSystem *battleSys, Batt | |||
| break; | |||
|
|
|||
| case PLAYER_INPUT_ITEM: | |||
| if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_NO_ITEMS) { | |||
| if (BattleSystem_GetBattleType(battleSys) & BATTLE_TYPE_NO_ITEMS) { | |||
| msg.id = 593; // "Items can’t be used here." | |||
| @@ -22,7 +22,7 @@ void ov16_02264798(BattlerData *param0, BattleSystem *param1) | |||
| return; | |||
| } | |||
|
|
|||
| if (BattleSystem_BattleType(param1) & (0x20 | 0x200)) { | |||
| if (BattleSystem_GetBattleType(param1) & (0x20 | 0x200)) { | |||
There was a problem hiding this comment.
polish: Use from constants/battle.h
| @@ -291,7 +291,7 @@ static void ov13_02224720(UnkStruct_ov13_022213F0 *param0) | |||
|
|
|||
| v0 = ov16_0223E010(param0->unk_00->unk_08); | |||
|
|
|||
| sub_0207C9B0(param0->unk_1E4, 3, v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 45065); | |||
| MoveTypeIcon_LoadPalette(param0->unk_1E4, 3, v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 45065); | |||
There was a problem hiding this comment.
question I think that I recall these being battle-specific... I could be wrong, though.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.