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

convert more constants

Browse Source
This commit is contained in:
camthesaxman
2017-12-11 12:27:51 -06:00
parent 19fbf024ff
commit c681b482c2
89 changed files with 13177 additions and 12922 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/berry_blender.c
+3 -3
View File
@@ -7,7 +7,7 @@
#include "task.h"
#include "sprite.h"
#include "sound.h"
#include "songs.h"
#include "constants/songs.h"
#include "m4a.h"
#include "bg.h"
#include "palette.h"
@@ -1068,7 +1068,7 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum)
sBerryBlenderData->playersNo = 2;
StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName);
if (!FlagGet(FLAG_340))
if (!FlagGet(FLAG_0x340))
StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MASTER]);
else
StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISTER]);
@@ -1592,7 +1592,7 @@ static void sub_80808D4(void)
if (gSpecialVar_0x8004 == 1)
{
if (!FlagGet(FLAG_340))
if (!FlagGet(FLAG_0x340))
sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10);
else
sBerryBlenderData->field_120[0] = CreateTask(sUnknown_083399EC[0], 10);