summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_setup.c6
-rw-r--r--src/field_map_obj_helpers.c (renamed from src/map_obj_80643A4.c)32
-rw-r--r--src/field_player_avatar.c2
-rw-r--r--src/map_obj_lock.c12
-rw-r--r--src/rom4.c2
-rw-r--r--src/scrcmd.c4
-rw-r--r--src/start_menu.c2
7 files changed, 30 insertions, 30 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 9210a3f04..fa0bf4ba1 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -162,7 +162,7 @@ void CheckForSafariZoneAndProceed(void)
void StartBattle_StandardWild(void)
{
ScriptContext2_Enable();
- player_bitmagic();
+ FreezeMapObjects();
sub_80597F4();
gMain.field_8 = HandleWildBattleEnd;
gBattleTypeFlags = 0;
@@ -174,7 +174,7 @@ void StartBattle_StandardWild(void)
void StartBattle_Roamer(void)
{
ScriptContext2_Enable();
- player_bitmagic();
+ FreezeMapObjects();
sub_80597F4();
gMain.field_8 = HandleWildBattleEnd;
gBattleTypeFlags = BATTLE_TYPE_ROAMER;
@@ -186,7 +186,7 @@ void StartBattle_Roamer(void)
void StartBattle_Safari(void)
{
ScriptContext2_Enable();
- player_bitmagic();
+ FreezeMapObjects();
sub_80597F4();
gMain.field_8 = sub_80C824C;
gBattleTypeFlags = BATTLE_TYPE_SAFARI;
diff --git a/src/map_obj_80643A4.c b/src/field_map_obj_helpers.c
index 20c5303c4..6e835d744 100644
--- a/src/map_obj_80643A4.c
+++ b/src/field_map_obj_helpers.c
@@ -17,7 +17,7 @@ extern u8 gUnknown_083761E2[];
extern s16 gUnknown_083761E6[];
extern u8 gUnknown_083761EC[];
-bool8 sub_80643A4(struct MapObject *mapObject)
+bool8 FreezeMapObject(struct MapObject *mapObject)
{
if (mapObject->mapobj_bit_6 || mapObject->mapobj_bit_8)
{
@@ -34,23 +34,23 @@ bool8 sub_80643A4(struct MapObject *mapObject)
}
}
-void player_bitmagic()
+void FreezeMapObjects()
{
u8 i;
for (i = 0; i < 16; i++)
if (gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
- sub_80643A4(&gMapObjects[i]);
+ FreezeMapObject(&gMapObjects[i]);
}
-void sub_8064470(u8 a1)
+void FreezeMapObjectsExceptOne(u8 a1)
{
u8 i;
for (i = 0; i < 16; i++)
if (i != a1 && gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
- sub_80643A4(&gMapObjects[i]);
+ FreezeMapObject(&gMapObjects[i]);
}
-void npc_sync_anim_pause_bits(struct MapObject *mapObject)
+void UnfreezeMapObject(struct MapObject *mapObject)
{
if (mapObject->active && mapObject->mapobj_bit_8)
{
@@ -60,39 +60,39 @@ void npc_sync_anim_pause_bits(struct MapObject *mapObject)
}
}
-void sub_806451C(void)
+void UnfreezeMapObjects(void)
{
u8 i;
for (i = 0; i < 16; i++)
if (gMapObjects[i].active)
- npc_sync_anim_pause_bits(&gMapObjects[i]);
+ UnfreezeMapObject(&gMapObjects[i]);
}
-void little_step(struct Sprite *sprite, u8 dir)
+void Step1(struct Sprite *sprite, u8 dir)
{
sprite->pos1.x += gDirectionToVector[dir].x;
sprite->pos1.y += gDirectionToVector[dir].y;
}
-void sub_806456C(struct Sprite *sprite, u8 dir)
+void Step2(struct Sprite *sprite, u8 dir)
{
sprite->pos1.x += 2 * gDirectionToVector[dir].x;
sprite->pos1.y += 2 * gDirectionToVector[dir].y;
}
-void sub_8064590(struct Sprite *sprite, u8 dir)
+void Step3(struct Sprite *sprite, u8 dir)
{
sprite->pos1.x += 2 * gDirectionToVector[dir].x + gDirectionToVector[dir].x;
sprite->pos1.y += 2 * gDirectionToVector[dir].y + gDirectionToVector[dir].y;
}
-void sub_80645B8(struct Sprite *sprite, u8 dir)
+void Step4(struct Sprite *sprite, u8 dir)
{
sprite->pos1.x += 4 * gDirectionToVector[dir].x;
sprite->pos1.y += 4 * gDirectionToVector[dir].y;
}
-void sub_80645DC(struct Sprite *sprite, u8 dir)
+void Step8(struct Sprite *sprite, u8 dir)
{
sprite->pos1.x += 8 * gDirectionToVector[dir].x;
sprite->pos1.y += 8 * gDirectionToVector[dir].y;
@@ -131,7 +131,7 @@ bool8 sub_806468C(struct Sprite *sprite)
{
if (!(sprite->data4 & 1))
{
- little_step(sprite, sprite->data3);
+ Step1(sprite, sprite->data3);
sprite->data5++;
}
@@ -168,7 +168,7 @@ u8 sub_8064704(struct Sprite *sprite)
v2 = 0;
if (sprite->data4)
- little_step(sprite, sprite->data3);
+ Step1(sprite, sprite->data3);
sprite->pos2.y = sub_80646C8(sprite->data6 >> v6[sprite->data4], sprite->data5);
@@ -198,7 +198,7 @@ u8 sub_806478C(struct Sprite *sprite)
v2 = 0;
if (sprite->data4 && !(sprite->data6 & 1))
- little_step(sprite, sprite->data3);
+ Step1(sprite, sprite->data3);
sprite->pos2.y = sub_80646C8(sprite->data6 >> v6[sprite->data4], sprite->data5);
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index cfb16bf28..97c04f8e5 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -1558,7 +1558,7 @@ u8 Fishing16(struct Task *task)
{
gPlayerAvatar.unk6 = 0;
ScriptContext2_Disable();
- sub_806451C();
+ UnfreezeMapObjects();
MenuZeroFillScreen();
sub_80BE97C(0);
DestroyTask(FindTaskIdByFunc(Task_Fishing));
diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c
index cc2befa6d..fc9882ce2 100644
--- a/src/map_obj_lock.c
+++ b/src/map_obj_lock.c
@@ -38,7 +38,7 @@ bool8 sub_8064CFC(void)
void sub_8064D20(void)
{
- player_bitmagic();
+ FreezeMapObjects();
CreateTask(sub_8064CDC, 80);
}
@@ -53,7 +53,7 @@ void sub_8064D38(u8 taskId)
}
if (!task->data[1] && !gMapObjects[gSelectedMapObject].mapobj_bit_1)
{
- sub_80643A4(&gMapObjects[gSelectedMapObject]);
+ FreezeMapObject(&gMapObjects[gSelectedMapObject]);
task->data[1] = 1;
}
if (task->data[0] && task->data[1])
@@ -76,11 +76,11 @@ bool8 sub_8064DB4(void)
void sub_8064DD8(void)
{
u8 taskId;
- sub_8064470(gSelectedMapObject);
+ FreezeMapObjectsExceptOne(gSelectedMapObject);
taskId = CreateTask(sub_8064D38, 80);
if (!gMapObjects[gSelectedMapObject].mapobj_bit_1)
{
- sub_80643A4(&gMapObjects[gSelectedMapObject]);
+ FreezeMapObject(&gMapObjects[gSelectedMapObject]);
gTasks[taskId].data[1] = 1;
}
}
@@ -90,7 +90,7 @@ void sub_8064E2C(void)
u8 objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
sub_80A2178();
- sub_806451C();
+ UnfreezeMapObjects();
}
void unref_sub_8064E5C(void)
@@ -102,7 +102,7 @@ void unref_sub_8064E5C(void)
objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
sub_80A2178();
- sub_806451C();
+ UnfreezeMapObjects();
}
void sub_8064EAC(void)
diff --git a/src/rom4.c b/src/rom4.c
index a837b4dfb..f35ad9834 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -1264,7 +1264,7 @@ void CB2_ContinueSavedGame(void)
ResetSafariZoneFlag_();
sub_805338C();
sub_8053198();
- sub_806451C();
+ UnfreezeMapObjects();
DoTimeBasedEvents();
sub_805308C();
sub_8055FC0();
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 1b9bc7c35..644001c7c 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1102,7 +1102,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
sub_80A2178();
- sub_806451C();
+ UnfreezeMapObjects();
return FALSE;
}
@@ -1116,7 +1116,7 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
sub_80A2178();
- sub_806451C();
+ UnfreezeMapObjects();
return FALSE;
}
diff --git a/src/start_menu.c b/src/start_menu.c
index eebdd27fc..1e828eed1 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -280,7 +280,7 @@ void sub_8071310(void)
{
if(!is_c1_link_related_active())
{
- player_bitmagic();
+ FreezeMapObjects();
sub_80594C0();
sub_80597F4();
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 05:09:15 +0000