Skip to content

Commit

Permalink
Merge pull request #154 from red031000/master
Browse files Browse the repository at this point in the history
literally three comments
  • Loading branch information
adrienntindall committed Jun 12, 2023
2 parents 3645265 + a01695c commit a5ae0ca
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions include/unk_0203E348.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ static inline PCBoxAppData *PCBoxAppData_New(ScriptContext *ctx) {
return ret;
}

//todo convert these to an enum
#define NAMINGSCREEN_PLAYER 0
#define NAMINGSCREEN_POKEMON 1
#define NAMINGSCREEN_BOX 2
Expand Down
4 changes: 2 additions & 2 deletions src/scrcmd_c.c
Original file line number Diff line number Diff line change
Expand Up @@ -2052,7 +2052,7 @@ BOOL ScrCmd_ChooseStarter(ScriptContext *ctx) {
return TRUE;
}

BOOL ScrCmd_333(ScriptContext *ctx) { //todo: bag screen
BOOL ScrCmd_333(ScriptContext *ctx) { //todo: bag select screen
void **p_work;
u8 r4 = ScriptReadByte(ctx) != 0 ? 1 : 0;
p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA);
Expand All @@ -2062,7 +2062,7 @@ BOOL ScrCmd_333(ScriptContext *ctx) { //todo: bag screen
return TRUE;
}

BOOL ScrCmd_334(ScriptContext *ctx) { //todo: bag select screen
BOOL ScrCmd_334(ScriptContext *ctx) { //todo: bag select screen result
u16 *r5 = ScriptGetVarPointer(ctx);
void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA);
GF_ASSERT(*p_work != NULL);
Expand Down

0 comments on commit a5ae0ca

Please sign in to comment.