-
Notifications
You must be signed in to change notification settings - Fork 111
battle_input.c #347
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
Open
adrienntindall
wants to merge
8
commits into
pret:main
Choose a base branch
from
adrienntindall:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
battle_input.c #347
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
28e8e81
rename battle_input.c
adrienntindall c93a3db
Add msg consts to battle_input.c
adrienntindall 0ee0e35
Begin documenting battle menu templates
adrienntindall 459f3a8
Deanonymize some variables
adrienntindall d297701
Rename some functions
adrienntindall b756262
Merge remote-tracking branch 'upstream/main' into main-adrienntindall
adrienntindall 667b1b8
Merge remote-tracking branch 'upstream/main' into main-adrienntindall
adrienntindall 4df8633
Merge 2
adrienntindall File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
#ifndef POKEPLATINUM_OV16_0226871C_H | ||
#define POKEPLATINUM_OV16_0226871C_H | ||
|
||
#include "constants/battle/battle_input.h" | ||
|
||
#include "struct_decls/battle_system.h" | ||
|
||
#include "battle/move_display_info.h" | ||
#include "battle/struct_ov16_02268A14_decl.h" | ||
|
||
#include "bg_window.h" | ||
#include "narc.h" | ||
|
||
void ov16_02268744(BgConfig *bgConfig); | ||
void ov16_022687A0(BgConfig *bgConfig); | ||
void *BattleInput_NewInit(NARC *param0, NARC *param1, BattleSystem *param2, int param3, u8 *param4); | ||
void BattleInput_Free(BattleInput *input); | ||
void ov16_02268A88(BattleInput *input); | ||
void ov16_02268B8C(BattleInput *input); | ||
void BattleInput_ChangeMenu(NARC *param0, NARC *param1, BattleInput *param2, int param3, int param4, void *param5); | ||
void BattleInput_CreateBallGagueObjects(NARC *param0, BattleInput *param1); | ||
void ov16_0226914C(BattleInput *input, const u8 *param1); | ||
void ov16_02269168(BattleInput *input, u8 param1[], u8 param2[]); | ||
void BattleInput_EnableBallGauge(BattleInput *input); | ||
void BattleInput_DisableBallGauge(BattleInput *input); | ||
int BattleInput_CheckTouch(BattleInput *input); | ||
BOOL BattleInput_CheckEffectEnded(BattleInput *input); | ||
int GetSelectedMonsFromMoveRange(int param0, int param1); | ||
void ov16_0226940C(BattleInput *input); | ||
void BattleInput_StartHorizontalScrollTask(BattleInput *input, int param1, int param2); | ||
void ov16_0226AC98(BattleInput *input, int param1, const MoveDisplayInfo *param2); | ||
void ov16_0226BCCC(BattleInput *input, int param1); | ||
BOOL ov16_0226BCD0(BattleInput *input); | ||
int BattleInput_GetCursorPressed(BattleInput *input); | ||
void BattleInput_SetCursorPressed(BattleInput *input, int param1); | ||
void BattleInput_PrintRecordingStopMessage(BattleInput *input, int param1); | ||
u8 BattleInput_GetRunCommandType(BattleInput *input); | ||
|
||
#endif // POKEPLATINUM_OV16_0226871C_H |
This file contains hidden or 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
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
|
||
#endif // POKEPLATINUM_STRUCT_OV16_02268A14_DECL_H |
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
#ifndef POKEPLATINUM_STRUCT_OV16_0226DC24_DECL_H | ||
#define POKEPLATINUM_STRUCT_OV16_0226DC24_DECL_H | ||
|
||
typedef struct UnkStruct_ov16_0226DC24_t UnkStruct_ov16_0226DC24; | ||
typedef struct UnkStruct_ov16_0226DC24_t BattleCursor; | ||
|
||
#endif // POKEPLATINUM_STRUCT_OV16_0226DC24_DECL_H |
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
#ifndef POKEPLATINUM_STRUCT_OV16_0226DEEC_DECL_H | ||
#define POKEPLATINUM_STRUCT_OV16_0226DEEC_DECL_H | ||
|
||
typedef struct UnkStruct_ov16_0226DEEC_t UnkStruct_ov16_0226DEEC; | ||
typedef struct CatchingTutorialFinger_t CatchingTutorialFinger; | ||
|
||
#endif // POKEPLATINUM_STRUCT_OV16_0226DEEC_DECL_H |
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#ifndef POKEPLATINUM_CONSTANTS_BATTLE_BATTLE_INPUT_H | ||
#define POKEPLATINUM_CONSTANTS_BATTLE_BATTLE_INPUT_H | ||
|
||
enum BattleInputRunCommandType { | ||
BI_RUNCMD_RUN = 0, | ||
BI_RUNCMD_CANCEL | ||
}; | ||
|
||
#endif // POKEPLATINUM_CONSTANTS_BATTLE_BATTLE_INPUT_H |
This file contains hidden or 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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -8,10 +8,10 @@ | |||||
|
||||||
UnkStruct_ov13_02228A50 *ov13_02228A38(u32 param0); | ||||||
void ov13_02228A50(UnkStruct_ov13_02228A50 *param0); | ||||||
UnkStruct_ov16_0226DC24 *ov13_02228A58(UnkStruct_ov13_02228A50 *param0); | ||||||
BattleCursor *ov13_02228A58(UnkStruct_ov13_02228A50 *param0); | ||||||
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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
void ov13_02228A68(UnkStruct_ov13_02228A50 *param0, u8 param1); | ||||||
void ov13_02228A90(UnkStruct_ov13_02228A50 *param0); | ||||||
void ov13_02228A9C(UnkStruct_ov13_02228A50 *param0, const ByteFlagSet *param1); | ||||||
|
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
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: Pull this (and other such structs named in this PR) out into the corresponding header, if possible.
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.
This one specifically is defined in the c file, I can default to just putting it in battle_input.h for now