summaryrefslogtreecommitdiff
path: root/src/field_effect.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/field_effect.c')
-rw-r--r--src/field_effect.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/field_effect.c b/src/field_effect.c
index 7daa00bf1..280eb20bc 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -772,7 +772,7 @@ void PokeballGlowEffect_0(struct Sprite *sprite)
gSprites[endSpriteId].data[0] = sprite->data[7];
sprite->data[2]++;
sprite->data[6]--;
- PlaySE(SE_BOWA);
+ PlaySE(SE_BALL);
}
if (sprite->data[6] == 0)
{
@@ -791,7 +791,7 @@ void PokeballGlowEffect_1(struct Sprite *sprite)
sprite->data[3] = 0;
if (sprite->data[5])
{
- PlayFanfare(MUS_ME_ASA);
+ PlayFanfare(MUS_HEAL);
}
}
}
@@ -888,7 +888,7 @@ u8 PokecenterHealEffectHelper(s16 x, s16 y)
spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_839F220, x, y, 0);
sprite = &gSprites[spriteIdAtEnd];
sprite->oam.priority = 2;
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
SetSubspriteTables(sprite, &gUnknown_0839F1A0);
return spriteIdAtEnd;
}
@@ -898,7 +898,7 @@ void SpriteCB_PokecenterMonitor(struct Sprite *sprite)
if (sprite->data[0] != 0)
{
sprite->data[0] = 0;
- sprite->invisible = 0;
+ sprite->invisible = FALSE;
StartSpriteAnim(sprite, 1);
}
if (sprite->animEnded)
@@ -918,7 +918,7 @@ void HallOfFameRecordEffectHelper(s16 a0, s16 a1, s16 a2, u8 a3)
{
spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_839F250, a1, a2, 0);
}
- gSprites[spriteIdAtEnd].invisible = 1;
+ gSprites[spriteIdAtEnd].invisible = TRUE;
gSprites[spriteIdAtEnd].data[0] = a0;
}
@@ -992,7 +992,7 @@ void mapldr_08084390(void)
Overworld_PlaySpecialMapMusic();
pal_fill_black();
CreateTask(c3_080843F8, 0);
- gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1;
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
if (gPlayerAvatar.flags & 0x08)
{
ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST);
@@ -1051,7 +1051,7 @@ bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[0]
playerObject = &gObjectEvents[gPlayerAvatar.objectEventId];
playerSprite = &gSprites[gPlayerAvatar.spriteId];
CameraObjectReset2();
- gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1;
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
gPlayerAvatar.preventStep = TRUE;
ObjectEventSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
task->data[4] = playerSprite->subspriteMode;
@@ -1080,8 +1080,8 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2]
sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
task->data[1] = 1;
task->data[2] = 0;
- gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0;
- PlaySE(SE_RU_HYUU);
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE;
+ PlaySE(SE_FALL);
task->data[0]++;
return FALSE;
}
@@ -1111,7 +1111,7 @@ bool8 sub_80868E4(struct Task *task)
}
if (sprite->pos2.y >= 0)
{
- PlaySE(SE_W070);
+ PlaySE(SE_M_STRENGTH);
objectEvent->triggerGroundEffectsOnStop = 1;
objectEvent->landingJump = 1;
sprite->pos2.y = 0;
@@ -1210,7 +1210,7 @@ bool8 sub_8086AC0(struct Task *task)
{
task->data[0] = 4;
}
- PlaySE(SE_ESUKA);
+ PlaySE(SE_ESCALATOR);
}
return FALSE;
}
@@ -1588,7 +1588,7 @@ bool8 sub_8087298(struct Task *task, struct ObjectEvent *objectEvent, struct Spr
gFieldEffectArguments[2] = sprite->subpriority - 1;
gFieldEffectArguments[3] = sprite->oam.priority;
FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP);
- PlaySE(SE_W153);
+ PlaySE(SE_M_EXPLOSION);
task->data[0]++;
return TRUE;
}
@@ -1677,7 +1677,7 @@ bool8 sub_80874CC(struct Task *task, struct ObjectEvent *objectEvent, struct Spr
CameraObjectReset2();
FreezeObjectEvents();
gPlayerAvatar.preventStep = TRUE;
- objectEvent->invisible = 1;
+ objectEvent->invisible = TRUE;
task->data[0]++;
return FALSE;
}
@@ -1702,9 +1702,9 @@ bool8 sub_8087548(struct Task *task, struct ObjectEvent *objectEvent, struct Spr
if (sprite->animCmdIndex > 1)
{
task->data[0]++;
- objectEvent->invisible = 0;
+ objectEvent->invisible = FALSE;
CameraObjectReset1();
- PlaySE(SE_W091);
+ PlaySE(SE_M_DIG);
ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST));
}
return FALSE;
@@ -1781,7 +1781,7 @@ bool8 sub_80876F8(struct Task *task, struct ObjectEvent *objectEvent, struct Spr
{
task->data[1]++;
ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection));
- PlaySE(SE_FU_ZUZUZU);
+ PlaySE(SE_LAVARIDGE_FALL_WARP);
}
}
return FALSE;
@@ -1791,7 +1791,7 @@ bool8 sub_8087774(struct Task *task, struct ObjectEvent *objectEvent, struct Spr
{
if (gSprites[task->data[1]].animCmdIndex == 2)
{
- objectEvent->invisible = 1;
+ objectEvent->invisible = TRUE;
task->data[0]++;
}
return FALSE;
@@ -1914,7 +1914,7 @@ void mapldr_080859D4(void)
ScriptContext2_Enable();
FreezeObjectEvents();
gFieldCallback = NULL;
- gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1;
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
CreateTask(sub_8087A74, 0);
}
@@ -1944,7 +1944,7 @@ void sub_8087AC8(struct Task *task)
}
if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection())
{
- objectEvent->invisible = 0;
+ objectEvent->invisible = FALSE;
ScriptContext2_Disable();
UnfreezeObjectEvents();
DestroyTask(FindTaskIdByFunc(sub_8087A74));
@@ -2009,7 +2009,7 @@ static void TeleportFieldEffectTask2(struct Task *task)
task->data[1] = 4;
task->data[2] = 8;
task->data[3] = 1;
- PlaySE(SE_TK_WARPIN);
+ PlaySE(SE_WARP_IN);
}
}
@@ -2062,7 +2062,7 @@ static void mapldr_08085D88(void)
ScriptContext2_Enable();
FreezeObjectEvents();
gFieldCallback = NULL;
- gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1;
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
CameraObjectReset2();
CreateTask(sub_8087E1C, 0);
}
@@ -2087,13 +2087,13 @@ void sub_8087E4C(struct Task *task)
sprite = &gSprites[gPlayerAvatar.spriteId];
centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
- gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0;
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE;
task->data[0]++;
task->data[1] = 8;
task->data[2] = 1;
task->data[14] = sprite->subspriteMode;
task->data[15] = GetPlayerFacingDirection();
- PlaySE(SE_TK_WARPIN);
+ PlaySE(SE_WARP_IN);
}
}
@@ -2581,7 +2581,7 @@ u8 FldEff_UseSurf(void)
taskId = CreateTask(sub_8088954, 0xff);
gTasks[taskId].data[15] = gFieldEffectArguments[0];
Overworld_ClearSavedMusic();
- Overworld_ChangeMusicTo(MUS_NAMINORI);
+ Overworld_ChangeMusicTo(MUS_SURF);
return FALSE;
}
@@ -2679,7 +2679,7 @@ u8 FldEff_NPCFlyOut(void)
sprite->oam.priority = 1;
sprite->callback = sub_8088BC4;
sprite->data[1] = gFieldEffectArguments[0];
- PlaySE(SE_W019);
+ PlaySE(SE_M_FLY);
return spriteId;
}
@@ -2799,7 +2799,7 @@ void sub_8088DD8(struct Task *task)
if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent))
{
task->data[0]++;
- PlaySE(SE_W019);
+ PlaySE(SE_M_FLY);
sub_8088FC0(task->data[1]);
}
}
@@ -3001,7 +3001,7 @@ void sub_808914C(struct Sprite *sprite)
sprite->data[7]++;
sprite->oam.affineMode = 0;
FreeOamMatrix(sprite->oam.matrixNum);
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
}
}
}
@@ -3054,7 +3054,7 @@ void sub_80892A0(struct Task *task)
CameraObjectReset2();
ObjectEventTurn(objectEvent, DIR_WEST);
StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16);
- objectEvent->invisible = 0;
+ objectEvent->invisible = FALSE;
task->data[1] = sub_8088F60();
sub_8088FC0(task->data[1]);
sub_8088FFC(task->data[1], objectEvent->spriteId);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 14:02:32 +0000