diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-11-29 19:24:28 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-06 09:44:08 +0800 |
| commit | 3909b6408c0125fe311d49a3029a2806993615f7 (patch) | |
| tree | a02365a6eb268dce08941968e11e319f3a7fe080 /src/evolution_scene.c | |
| parent | 1b33ad6c26fa83aa7b77055ddde59c61df03d0e4 (diff) | |
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
Diffstat (limited to 'src/evolution_scene.c')
| -rw-r--r-- | src/evolution_scene.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 0d2072a15..25d85a855 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -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; |