From 3909b6408c0125fe311d49a3029a2806993615f7 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Thu, 29 Nov 2018 19:24:28 +0800 Subject: Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 Some of the INVALID_ are likely erroneously placed, due to lack of documentation --- src/battle_transition.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/battle_transition.c') diff --git a/src/battle_transition.c b/src/battle_transition.c index 94b9e78f9..f15514f50 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -7,7 +7,7 @@ #include "field_effect.h" #include "gpu_regs.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "overworld.h" #include "palette.h" #include "random.h" @@ -749,7 +749,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] = static const struct SpriteTemplate gUnknown_085C8E68 = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 4105, .oam = &gEventObjectBaseOam_32x32, .anims = sSpriteAnimTable_85C8E3C, @@ -798,7 +798,7 @@ static const union AnimCmd *const sSpriteAnimTable_85C8EA0[] = static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 4106, .oam = &gOamData_85C8E80, .anims = sSpriteAnimTable_85C8EA0, @@ -809,7 +809,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = static const struct SpriteTemplate sSpriteTemplate_85C8EBC = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 4106, .oam = &gOamData_85C8E80, .anims = sSpriteAnimTable_85C8EA0, @@ -998,7 +998,7 @@ static bool8 Transition_Phase1(struct Task *task) static bool8 Transition_WaitForPhase1(struct Task *task) { - if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == 0xFF) + if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == INVALID_U8) { task->tState++; return TRUE; @@ -1019,7 +1019,7 @@ static bool8 Transition_Phase2(struct Task *task) static bool8 Transition_WaitForPhase2(struct Task *task) { task->tTransitionDone = FALSE; - if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == 0xFF) + if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == INVALID_U8) task->tTransitionDone = TRUE; return FALSE; } @@ -3605,7 +3605,7 @@ static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) static bool8 IsPhase1Done(void) { - if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF) + if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == INVALID_U8) return TRUE; else return FALSE; -- cgit v1.2.3 From f9ff7316d5c7277eb7482e30121388cd65f4ecfc Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Wed, 5 Dec 2018 22:31:01 +0800 Subject: Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs --- src/battle_transition.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src/battle_transition.c') diff --git a/src/battle_transition.c b/src/battle_transition.c index f15514f50..f74102467 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -612,32 +612,32 @@ static const s16 gUnknown_085C8CF2[] = {4, 517, -1}; static const s16 *const gUnknown_085C8CF8[] = { - gUnknown_085C8C90, - gUnknown_085C8CA4, - gUnknown_085C8C98, - gUnknown_085C8C9E, - gUnknown_085C8CEA, - gUnknown_085C8CE4, - gUnknown_085C8CF2, - gUnknown_085C8CDE + gUnknown_085C8C90, + gUnknown_085C8CA4, + gUnknown_085C8C98, + gUnknown_085C8C9E, + gUnknown_085C8CEA, + gUnknown_085C8CE4, + gUnknown_085C8CF2, + gUnknown_085C8CDE }; static const s16 *const gUnknown_085C8D18[] = { - gUnknown_085C8CBC, - gUnknown_085C8CB0, - gUnknown_085C8CB6, - gUnknown_085C8CAA, - gUnknown_085C8CCA, - gUnknown_085C8CD8, - gUnknown_085C8CC4, - gUnknown_085C8CD2 + gUnknown_085C8CBC, + gUnknown_085C8CB0, + gUnknown_085C8CB6, + gUnknown_085C8CAA, + gUnknown_085C8CCA, + gUnknown_085C8CD8, + gUnknown_085C8CC4, + gUnknown_085C8CD2 }; static const s16 *const *const gUnknown_085C8D38[] = { - gUnknown_085C8CF8, - gUnknown_085C8D18 + gUnknown_085C8CF8, + gUnknown_085C8D18 }; static const TransitionStateFunc sPhase2_Groudon_Funcs[] = @@ -749,7 +749,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] = static const struct SpriteTemplate gUnknown_085C8E68 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4105, .oam = &gEventObjectBaseOam_32x32, .anims = sSpriteAnimTable_85C8E3C, @@ -798,7 +798,7 @@ static const union AnimCmd *const sSpriteAnimTable_85C8EA0[] = static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4106, .oam = &gOamData_85C8E80, .anims = sSpriteAnimTable_85C8EA0, @@ -809,7 +809,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = static const struct SpriteTemplate sSpriteTemplate_85C8EBC = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4106, .oam = &gOamData_85C8E80, .anims = sSpriteAnimTable_85C8EA0, @@ -998,7 +998,7 @@ static bool8 Transition_Phase1(struct Task *task) static bool8 Transition_WaitForPhase1(struct Task *task) { - if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == INVALID_U8) + if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == 0xFF) { task->tState++; return TRUE; @@ -1019,7 +1019,7 @@ static bool8 Transition_Phase2(struct Task *task) static bool8 Transition_WaitForPhase2(struct Task *task) { task->tTransitionDone = FALSE; - if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == INVALID_U8) + if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == 0xFF) task->tTransitionDone = TRUE; return FALSE; } @@ -3605,7 +3605,7 @@ static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) static bool8 IsPhase1Done(void) { - if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == INVALID_U8) + if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF) return TRUE; else return FALSE; -- cgit v1.2.3 From 4c23adb5f53a61d0e7426376aba9a04de5c8f2b3 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Dec 2018 19:05:03 +0100 Subject: Decompile field weather --- src/battle_transition.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_transition.c') diff --git a/src/battle_transition.c b/src/battle_transition.c index 94b9e78f9..aa8877148 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -59,7 +59,7 @@ typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite); extern const struct OamData gEventObjectBaseOam_32x32; -extern void sub_80AC3D0(void); +extern void SetWeatherScreenFadeOut(void); // this file's functions static void LaunchBattleTransitionTask(u8 transitionId); @@ -981,7 +981,7 @@ static void Task_BattleTransitionMain(u8 taskId) static bool8 Transition_Phase1(struct Task *task) { - sub_80AC3D0(); + SetWeatherScreenFadeOut(); CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); if (sPhase1_Tasks[task->tTransitionId] != NULL) { -- cgit v1.2.3