summaryrefslogtreecommitdiff
path: root/src/script.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-02-16 11:28:03 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-02-16 11:28:03 -0500
commitfd0fc184d6d06e01e017ba88b06d3c1709e626de (patch)
tree56e7852cb2d20931985caf1e25003fdc43391025 /src/script.c
parent91844cdfb2e0c3c1fd00fae45d1cec2be763c522 (diff)
parent4e07002d13c97f90cb8885298c0db2c331dc2b07 (diff)
Merge branch 'master' of https://github.com/pret/pokefirered into doc-pokemonleague
Diffstat (limited to 'src/script.c')
-rw-r--r--src/script.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script.c b/src/script.c
index 0a4b69bac..4b8565589 100644
--- a/src/script.c
+++ b/src/script.c
@@ -406,7 +406,7 @@ u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag)
}
}
-void mapheader_run_script_with_tag_x1(void)
+void RunOnLoadMapScript(void)
{
mapheader_run_script_by_tag(1);
}
@@ -506,7 +506,7 @@ u8 *GetRamScript(u8 objectId, u8 *script)
}
}
-bool32 sub_8069DFC(void)
+bool32 ValidateRamScript(void)
{
struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
if (scriptData->magic != RAM_SCRIPT_MAGIC)