summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2017-01-01 22:39:54 -0800
committerYamaArashi <shadow962@live.com>2017-01-01 22:41:17 -0800
commit80e95a204723eea4bb5fe914dd44f78a66552c03 (patch)
tree23b93bd1548b79f54c9aad7a7a6cadb503952a72 /src
parent8ce0fb4b20793da19ae57bff14b63c4c1aa90a54 (diff)
braille puzzle stuff
Diffstat (limited to 'src')
-rw-r--r--src/fldeff_strength.c6
-rw-r--r--src/pokedex.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 3cc33e3c1..4da04326a 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -20,7 +20,7 @@ extern u8 UseStrengthScript[];
bool8 SetUpFieldMove_Strength(void)
{
- if (sub_81474C8())
+ if (ShouldDoBrailleStrengthEffect())
{
gScriptResult = gUnknown_03005CE0;
gUnknown_0300485C = sub_808AB90;
@@ -62,9 +62,9 @@ bool8 FldEff_UseStrength(void)
static void sub_811AA9C(void)
{
- if (sub_81474C8())
+ if (ShouldDoBrailleStrengthEffect())
{
- sub_8147514();
+ DoBrailleStrengthEffect();
}
else
{
diff --git a/src/pokedex.c b/src/pokedex.c
index 54fa5912c..a37bed24e 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -109,7 +109,7 @@ extern void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBi
extern bool8 BeginNormalPaletteFade(u32, s8, u8, u8, u16);
extern void remove_some_task(void);
extern u8 sub_8091E3C(void);
-extern void sub_80690C8(void);
+extern void LockNationalPokedex(void);
extern void sub_805469C(void);
extern u16 HoennToNationalOrder(u16);
extern u16 NationalToHoennOrder(u16);
@@ -144,7 +144,7 @@ void sub_808C02C(void)
gSaveBlock2.pokedex.unownPersonality = 0;
gSaveBlock2.pokedex.spindaPersonality = 0;
gSaveBlock2.pokedex.unknown3 = 0;
- sub_80690C8();
+ LockNationalPokedex();
for(i = 0; i <= 51; i++)
{
gSaveBlock2.pokedex.owned[i] = 0;
@@ -3186,4 +3186,4 @@ void sub_8090750(u8 taskId)
break;
}
}
-*/ \ No newline at end of file
+*/