diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-11 12:27:51 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-11 12:27:51 -0600 |
| commit | c681b482c2ab0a4281cb6ad5927ce8ca565a3692 (patch) | |
| tree | f921b45edbf2dfc050524dd48b1e0cf1bb6d45e9 /src/berry_blender.c | |
| parent | 19fbf024ff7e5bedc0f297a44c7df298a9bd0ef4 (diff) | |
convert more constants
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index 2d3c38810..b1d36e2d9 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -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); |