summaryrefslogtreecommitdiff
path: root/src/cable_car.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cable_car.c')
-rw-r--r--src/cable_car.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cable_car.c b/src/cable_car.c
index acd0bc7a5..733d10436 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -246,7 +246,7 @@ void CableCar(void)
{
ScriptContext2_Enable();
CreateTask(Task_LoadCableCar, 1);
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
+ BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB(0, 0, 0));
}
static void CB2_LoadCableCar(void)
@@ -350,7 +350,7 @@ static void CB2_LoadCableCar(void)
gMain.state++;
break;
case 8:
- BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0));
+ BeginNormalPaletteFade(PALETTES_ALL, 3, 16, 0, RGB(0, 0, 0));
FadeInNewBGM(MUS_CABLE_CAR, 1);
SetBgRegs(TRUE);
gMain.state++;
@@ -468,7 +468,7 @@ static void Task_CableCar(u8 taskId)
if (sCableCar->timer == 570)
{
sCableCar->state = 3;
- BeginNormalPaletteFade(0xFFFFFFFF, 3, 0, 16, RGB(0, 0, 0));
+ BeginNormalPaletteFade(PALETTES_ALL, 3, 0, 16, RGB(0, 0, 0));
FadeOutBGM(4);
}
break;
@@ -684,7 +684,7 @@ static void SpriteCB_HikerGoingUp(struct Sprite *sprite)
break;
}
- if (sprite->pos1.y > 160)
+ if (sprite->pos1.y > DISPLAY_HEIGHT)
DestroySprite(sprite);
}
}