diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 4a10ff1849..2d3ecbd365 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -1299,14 +1299,14 @@ .short 235 .endm - .macro ScrCmd_0EC arg0 + .macro ScrCmd_0EC destVarID .short 236 - .short \arg0 + .short \destVarID .endm - .macro ScrCmd_0ED arg0 + .macro ScrCmd_0ED destVarID .short 237 - .short \arg0 + .short \destVarID .endm .macro ScrCmd_0EE arg0 @@ -3788,9 +3788,9 @@ .short 699 .endm - .macro ScrCmd_2BC arg0 + .macro ScrCmd_2BC destVarID .short 700 - .short \arg0 + .short \destVarID .endm .macro ScrCmd_2BD arg0, arg1 diff --git a/include/script_manager.h b/include/script_manager.h index db8472f087..0a7cff258f 100644 --- a/include/script_manager.h +++ b/include/script_manager.h @@ -39,7 +39,7 @@ enum ScriptManagerMember { SCRIPT_MANAGER_DATA_PTR = 20, SCRIPT_MANAGER_PLAYER_TASK = 22, - SCRIPT_MANAGER_PLAYER_WON_BATTLE, + SCRIPT_MANAGER_BATTLE_RESULT, SCRIPT_MANAGER_TRAINER_0_SIGHT_RANGE, SCRIPT_MANAGER_TRAINER_0_DIRECTION, SCRIPT_MANAGER_TRAINER_0_SCRIPT_ID, @@ -114,7 +114,7 @@ typedef struct ScriptManager { u8 isMsgBoxOpen; u8 numActiveContexts; u16 scriptID; - BOOL playerWonBattle; + BOOL battleResult; UnkStruct_ov5_021DC1A4 *unk_10; // appears to be used for multichoice windows Window window; UIControlData *ctrlUI; diff --git a/include/unk_02048614.h b/include/unk_02048614.h index 8488f9a7d7..218e086c03 100644 --- a/include/unk_02048614.h +++ b/include/unk_02048614.h @@ -15,9 +15,9 @@ BOOL ScrCmd_0E8(ScriptContext *param0); BOOL ScrCmd_0E9(ScriptContext *param0); BOOL ScrCmd_0EA(ScriptContext *param0); BOOL ScrCmd_0EB(ScriptContext *param0); -BOOL ScrCmd_0EC(ScriptContext *param0); -BOOL ScrCmd_0ED(ScriptContext *param0); -BOOL ScrCmd_2BC(ScriptContext *param0); +BOOL ScrCmd_CheckWonBattle(ScriptContext *ctx); +BOOL ScrCmd_CheckLostBattle(ScriptContext *ctx); +BOOL ScrCmd_CheckDidNotCapture(ScriptContext *ctx); BOOL ScrCmd_0EE(ScriptContext *param0); BOOL ScrCmd_0EF(ScriptContext *param0); BOOL ScrCmd_0F0(ScriptContext *param0); diff --git a/src/scrcmd.c b/src/scrcmd.c index a5db69b391..7d390efb65 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1004,8 +1004,8 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_0E9, ScrCmd_0EA, ScrCmd_0EB, - ScrCmd_0EC, - ScrCmd_0ED, + ScrCmd_CheckWonBattle, + ScrCmd_CheckLostBattle, ScrCmd_0EE, ScrCmd_0EF, ScrCmd_0F0, @@ -1468,7 +1468,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_2B9, ScrCmd_2BA, ScrCmd_2BB, - ScrCmd_2BC, + ScrCmd_CheckDidNotCapture, ScrCmd_2BD, ScrCmd_2BE, ScrCmd_2BF, @@ -5046,7 +5046,7 @@ static BOOL ScrCmd_123(ScriptContext *ctx) static BOOL ScrCmd_124(ScriptContext *ctx) { - BOOL *v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL *v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); u16 v1 = ScriptContext_GetVar(ctx); u8 v2 = (u8)ScriptContext_GetVar(ctx); @@ -5057,7 +5057,7 @@ static BOOL ScrCmd_124(ScriptContext *ctx) static BOOL ScrCmd_2BD(ScriptContext *ctx) { - BOOL *v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL *v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); u16 v1 = ScriptContext_GetVar(ctx); u8 v2 = (u8)ScriptContext_GetVar(ctx); @@ -5068,7 +5068,7 @@ static BOOL ScrCmd_2BD(ScriptContext *ctx) static BOOL ScrCmd_319(ScriptContext *ctx) { - BOOL *v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL *v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); u16 v1 = ScriptContext_GetVar(ctx); u8 v2 = (u8)ScriptContext_GetVar(ctx); @@ -5078,7 +5078,7 @@ static BOOL ScrCmd_319(ScriptContext *ctx) static BOOL ScrCmd_318(ScriptContext *ctx) { - BOOL *v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL *v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); u16 v1 = ScriptContext_GetVar(ctx); u8 v2 = (u8)ScriptContext_GetVar(ctx); @@ -5089,7 +5089,7 @@ static BOOL ScrCmd_318(ScriptContext *ctx) static BOOL ScrCmd_125(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; - BOOL *v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL *v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); u16 v2 = ScriptContext_GetVar(ctx); sub_02051480(ctx->taskManager, v2, 11, v1); @@ -5122,7 +5122,7 @@ static BOOL ScrCmd_128(ScriptContext *ctx) static BOOL ScrCmd_129(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; - BOOL *v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL *v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); sub_0205120C(ctx->taskManager, v1); return 1; diff --git a/src/script_manager.c b/src/script_manager.c index 9544cc2ef6..f8223a02e5 100644 --- a/src/script_manager.c +++ b/src/script_manager.c @@ -360,8 +360,8 @@ void *ScriptManager_GetMemberPtr(ScriptManager *scriptManager, u32 member) return &scriptManager->unk_B0; case SCRIPT_MANAGER_PLAYER_TASK: return &scriptManager->playerTask; - case SCRIPT_MANAGER_PLAYER_WON_BATTLE: - return &scriptManager->playerWonBattle; + case SCRIPT_MANAGER_BATTLE_RESULT: + return &scriptManager->battleResult; case SCRIPT_MANAGER_TRAINER_0_SIGHT_RANGE: trainer = &scriptManager->trainers[0]; return &trainer->sightRange; diff --git a/src/unk_02048614.c b/src/unk_02048614.c index 19b05683d8..21c421c6c1 100644 --- a/src/unk_02048614.c +++ b/src/unk_02048614.c @@ -35,9 +35,6 @@ BOOL ScrCmd_0E8(ScriptContext *param0); BOOL ScrCmd_0E9(ScriptContext *param0); BOOL ScrCmd_0EA(ScriptContext *param0); BOOL ScrCmd_0EB(ScriptContext *param0); -BOOL ScrCmd_0EC(ScriptContext *param0); -BOOL ScrCmd_0ED(ScriptContext *param0); -BOOL ScrCmd_2BC(ScriptContext *param0); BOOL ScrCmd_0EE(ScriptContext *param0); BOOL ScrCmd_0EF(ScriptContext *param0); BOOL ScrCmd_0F0(ScriptContext *param0); @@ -144,7 +141,7 @@ BOOL ScrCmd_0E5(ScriptContext *param0) u32 v0; FieldSystem *fieldSystem = param0->fieldSystem; u16 *v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_SCRIPT_ID); - BOOL *v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL *v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); u16 v4 = ScriptContext_GetVar(param0); u16 v5 = ScriptContext_GetVar(param0); u16 v6; @@ -162,7 +159,7 @@ BOOL ScrCmd_0E5(ScriptContext *param0) BOOL ScrCmd_2A0(ScriptContext *param0) { FieldSystem *fieldSystem = param0->fieldSystem; - BOOL *v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL *v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_GetVar(param0); @@ -264,31 +261,31 @@ BOOL ScrCmd_0EB(ScriptContext *param0) return 1; } -BOOL ScrCmd_0EC(ScriptContext *param0) +BOOL ScrCmd_CheckWonBattle(ScriptContext *ctx) { - BOOL *v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); - u16 *v1 = ScriptContext_GetVarPointer(param0); + BOOL *battleResult = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); + u16 *destVar = ScriptContext_GetVarPointer(ctx); - *v1 = sub_02052868(*v0); - return 1; + *destVar = sub_02052868(*battleResult); + return TRUE; } -BOOL ScrCmd_0ED(ScriptContext *param0) +BOOL ScrCmd_CheckLostBattle(ScriptContext *ctx) { - BOOL *v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); - u16 *v1 = ScriptContext_GetVarPointer(param0); + BOOL *battleResult = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); + u16 *destVar = ScriptContext_GetVarPointer(ctx); - *v1 = sub_02052878(*v0); - return 1; + *destVar = sub_02052878(*battleResult); + return TRUE; } -BOOL ScrCmd_2BC(ScriptContext *param0) +BOOL ScrCmd_CheckDidNotCapture(ScriptContext *ctx) { - BOOL *v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); - u16 *v1 = ScriptContext_GetVarPointer(param0); + BOOL *battleResult = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); + u16 *destVar = ScriptContext_GetVarPointer(ctx); - *v1 = sub_02052888(*v0); - return 1; + *destVar = sub_02052888(*battleResult); + return TRUE; } BOOL ScrCmd_0EE(ScriptContext *param0) @@ -302,7 +299,7 @@ BOOL ScrCmd_0EE(ScriptContext *param0) BOOL ScrCmd_0EF(ScriptContext *param0) { FieldSystem *fieldSystem = param0->fieldSystem; - BOOL *v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL *v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); sub_020515CC(param0->taskManager, 1, 0, 0, 11, v1); @@ -341,7 +338,7 @@ BOOL ScrCmd_0F1(ScriptContext *param0) BOOL ScrCmd_314(ScriptContext *param0) { - BOOL *v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_PLAYER_WON_BATTLE); + BOOL *v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT); u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = *v0; diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index 4e74c5e6d9..8d668ee7c6 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -3,6 +3,7 @@ #include #include +#include "constants/battle.h" #include "constants/pokemon.h" #include "struct_decls/pokedexdata_decl.h" @@ -534,35 +535,38 @@ void sub_0205285C(BattleParams *param0) param0->unk_12C = 7; } -BOOL sub_02052868(u32 param0) +// BattleParams_PlayerWon +BOOL sub_02052868(u32 battleResult) { - switch (param0) { - case 0x2: - case 0x3: - return 0; + switch (battleResult) { + case BATTLE_RESULT_LOSE: + case BATTLE_RESULT_DRAW: + return FALSE; default: - return 1; + return TRUE; } } -BOOL sub_02052878(u32 param0) +// BattleParams_PlayerLost +BOOL sub_02052878(u32 battleResult) { - switch (param0) { - case 0x1: - case 0x4: - return 0; + switch (battleResult) { + case BATTLE_RESULT_WIN: + case BATTLE_RESULT_CAPTURED_MON: + return FALSE; default: - return 1; + return TRUE; } } -BOOL sub_02052888(u32 param0) +// BattleParams_PlayerDidNotCapture +BOOL sub_02052888(u32 battleResult) { - switch (param0) { - case 0x4: - return 0; + switch (battleResult) { + case BATTLE_RESULT_CAPTURED_MON: + return FALSE; default: - return 1; + return TRUE; } }