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

6
src/evolution_scene.c
View File

@@ -2,7 +2,7 @@
#include "evolution_scene.h"
#include "evolution_graphics.h"
#include "sprite.h"
#include "malloc.h"
#include "alloc.h"
#include "task.h"
#include "palette.h"
#include "main.h"
@@ -748,7 +748,7 @@ static void Task_EvolutionScene(u8 taskID)
GetMonData(mon, MON_DATA_NICKNAME, text);
StringCopy10(gBattleTextBuff1, text);
if (var == 0xFFFF) // no place to learn it
if (var == INVALID_U16) // no place to learn it
gTasks[taskID].tState = 22;
else if (var == 0xFFFE) // it already knows that move
break;
@@ -1105,7 +1105,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
GetMonData(mon, MON_DATA_NICKNAME, text);
StringCopy10(gBattleTextBuff1, text);
if (var == 0xFFFF)
if (var == INVALID_U16)
gTasks[taskID].tState = 20;
else if (var == 0xFFFE)
break;