dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325

Browse Source 
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
This commit is contained in:
nullableVoidPtr
2018-11-29 19:24:28 +08:00
parent 1b33ad6c26
commit 3909b6408c
148 changed files with 1116 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/learn_move.c
+10 -10
View File
@@ -9,7 +9,7 @@
#include "gpu_regs.h"
#include "learn_move.h"
#include "list_menu.h"
#include "malloc.h"
#include "alloc.h"
#include "menu.h"
#include "menu_helpers.h"
#include "overworld.h"
@@ -381,7 +381,7 @@ static void LearnMoveMain(void)
if (selection == 0)
{
if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != 0xFFFF)
if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != INVALID_U16)
{
sub_816084C(gText_PkmnLearnedMove4);
gSpecialVar_0x8004 = 1;
@@ -727,12 +727,12 @@ static void CreateHearts(void)
static void AddScrollArrows(void)
{
if (sLearnMoveStruct->scrollArrowTaskId2 == 0xFF)
if (sLearnMoveStruct->scrollArrowTaskId2 == INVALID_U8)
{
sLearnMoveStruct->scrollArrowTaskId2 = AddScrollIndicatorArrowPair(&gUnknown_085CEBC0, &sLearnMoveStruct->scrollOffset);
}
if (sLearnMoveStruct->scrollArrowTaskId1 == 0xFF)
if (sLearnMoveStruct->scrollArrowTaskId1 == INVALID_U8)
{
gTempScrollArrowTemplate = gUnknown_085CEBD0;
gTempScrollArrowTemplate.fullyDownThreshold = sLearnMoveStruct->numMenuChoices - sLearnMoveStruct->numToShowAtOnce;
@@ -742,16 +742,16 @@ static void AddScrollArrows(void)
static void RemoveScrollArrows(void)
{
if (sLearnMoveStruct->scrollArrowTaskId2 != 0xFF)
if (sLearnMoveStruct->scrollArrowTaskId2 != INVALID_U8)
{
RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId2);
sLearnMoveStruct->scrollArrowTaskId2 = 0xFF;
sLearnMoveStruct->scrollArrowTaskId2 = INVALID_U8;
}
if (sLearnMoveStruct->scrollArrowTaskId1 != 0xFF)
if (sLearnMoveStruct->scrollArrowTaskId1 != INVALID_U8)
{
RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId1);
sLearnMoveStruct->scrollArrowTaskId1 = 0xFF;
sLearnMoveStruct->scrollArrowTaskId1 = INVALID_U8;
}
}
@@ -792,7 +792,7 @@ void ShowHideHearts(s32 item)
{
numHearts = (u8)(gContestEffects[gContestMoves[item].effect].appeal / 10);
if (numHearts == 0xFF)
if (numHearts == INVALID_U8)
{
numHearts = 0;
}
@@ -812,7 +812,7 @@ void ShowHideHearts(s32 item)
numHearts = (u8)(gContestEffects[gContestMoves[item].effect].jam / 10);
if (numHearts == 0xFF)
if (numHearts == INVALID_U8)
{
numHearts = 0;
}