summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/field_control_avatar.c2
-rw-r--r--src/field_specials.c2
-rw-r--r--src/fldeff_cut.c4
-rw-r--r--src/scrcmd.c8
4 files changed, 8 insertions, 8 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 85c3f13ae..e868a7b99 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -563,7 +563,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
}
if (ShouldDoBrailleRegicePuzzle() == TRUE)
{
- ScriptContext1_SetupScript(IslandCave_EventScript_238EAF);
+ ScriptContext1_SetupScript(IslandCave_EventScript_OpenRegiEntrance);
return TRUE;
}
if (ShouldDoWallyCall() == TRUE)
diff --git a/src/field_specials.c b/src/field_specials.c
index aa7ff4e42..2bf67dc25 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3481,7 +3481,7 @@ void IncrementBirthIslandRockStepCount(void)
}
}
-void sub_813B1D0(void)
+void SetDeoxysRockPalette(void)
{
LoadPalette(&sDeoxysRockPalettes[(u8)VarGet(VAR_DEOXYS_ROCK_LEVEL)], 0x1A0, 8);
BlendPalettes(0x04000000, 16, 0);
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 00eed7624..fe21ff060 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -25,7 +25,7 @@
extern struct MapPosition gPlayerFacingPosition;
extern const u8 EventScript_FldEffCut[];
-extern const u8 FarawayIsland_Interior_EventScript_267EDB[];
+extern const u8 FarawayIsland_Interior_EventScript_HideMewWhenGrassCut[];
extern const u8 gFieldEffectPic_CutGrass[];
extern const u16 gFieldEffectObjectPalette6[];
@@ -584,7 +584,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite)
ScriptContext2_Disable();
if (IsMewPlayingHideAndSeek() == TRUE)
- ScriptContext1_SetupScript(FarawayIsland_Interior_EventScript_267EDB);
+ ScriptContext1_SetupScript(FarawayIsland_Interior_EventScript_HideMewWhenGrassCut);
}
void FixLongGrassMetatilesWindowTop(s16 x, s16 y)
diff --git a/src/scrcmd.c b/src/scrcmd.c
index d97e3de47..f468ac83e 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -68,7 +68,7 @@ extern const SpecialFunc gSpecials[];
extern const u8 *gStdScripts[];
extern const u8 *gStdScripts_End[];
-void sub_809BDB4(void);
+static void CloseBrailleWindow(void);
// This is defined in here so the optimizer can't see its value when compiling
// script.c.
@@ -1528,9 +1528,9 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_cmdDA(struct ScriptContext *ctx)
+bool8 ScrCmd_closebraillemessage(struct ScriptContext *ctx)
{
- sub_809BDB4();
+ CloseBrailleWindow();
return FALSE;
}
@@ -2257,7 +2257,7 @@ bool8 ScrCmd_setmonmetlocation(struct ScriptContext *ctx)
return FALSE;
}
-void sub_809BDB4(void)
+static void CloseBrailleWindow(void)
{
ClearStdWindowAndFrame(gBrailleWindowId, 1);
RemoveWindow(gBrailleWindowId);