duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean-up ActNpc340

Browse source
This commit is contained in:
Clownacy 2019-11-14 02:31:49 +00:00
parent 58bd3533d9
commit d79a8c801a
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/NpcAct340.cpp
View file

@ -28,9 +28,9 @@ void ActNpc340(NPCHAR *npc)
npc->cond = 0x80; npc->cond = 0x80;
npc->exp = 1; npc->exp = 1;
npc->direct = 0; npc->direct = 0;
npc->y -= 0xC00; npc->y -= 6 * 0x200;
npc->damage = 0; npc->damage = 0;
SetNpChar(341, npc->x, npc->y - 0x2000, 0, 0, 0, npc, 0x100); SetNpChar(341, npc->x, npc->y - (16 * 0x200), 0, 0, 0, npc, 0x100);
break; break;
case 10: case 10:
@ -129,7 +129,7 @@ void ActNpc340(NPCHAR *npc)
if (++npc->act_wait > 20) if (++npc->act_wait > 20)
{ {
if (gMC.y < npc->y + 0x1800) if (gMC.y < npc->y + (12 * 0x200))
npc->act_no = 220; npc->act_no = 220;
else else
npc->act_no = 230; npc->act_no = 230;
@ -181,7 +181,7 @@ void ActNpc340(NPCHAR *npc)
PlaySoundObject(26, 1); PlaySoundObject(26, 1);
} }
if (npc->count1 < 4 && gMC.x > npc->x - 0x2000 && gMC.x < npc->x + 0x2000) if (npc->count1 < 4 && gMC.x > npc->x - (16 * 0x200) && gMC.x < npc->x + (16 * 0x200))
npc->act_no = 201; npc->act_no = 201;
break; break;
@ -219,9 +219,9 @@ void ActNpc340(NPCHAR *npc)
else else
npc->ani_no = 9; npc->ani_no = 9;
if (npc->y < 0x6000) if (npc->y < (48 * 0x200))
{ {
npc->y = 0x6000; npc->y = (48 * 0x200);
npc->ym = 0; npc->ym = 0;
npc->act_no = 222; npc->act_no = 222;
npc->act_wait = 0; npc->act_wait = 0;
@ -230,16 +230,16 @@ void ActNpc340(NPCHAR *npc)
for (i = 0; i < 8; ++i) for (i = 0; i < 8; ++i)
{ {
x = npc->x + (Random(-0x10, 0x10) * 0x200); x = npc->x + (Random(-0x10, 0x10) * 0x200);
SetNpChar(4, x, npc->y - 0x1400, 0, 0, 0, 0, 0x100); SetNpChar(4, x, npc->y - (10 * 0x200), 0, 0, 0, NULL, 0x100);
} }
SetNpChar(332, npc->x - 0x1800, npc->y - 0x1800, 0, 0, 0, 0, 0x100); SetNpChar(332, npc->x - (12 * 0x200), npc->y - (12 * 0x200), 0, 0, 0, NULL, 0x100);
SetNpChar(332, npc->x + 0x1800, npc->y - 0x1800, 0, 0, 2, 0, 0x100); SetNpChar(332, npc->x + (12 * 0x200), npc->y - (12 * 0x200), 0, 0, 2, NULL, 0x100);
SetQuake2(10); SetQuake2(10);
PlaySoundObject(26, 1); PlaySoundObject(26, 1);
} }
if (npc->count1 < 4 && gMC.y > npc->y - 0x2000 && gMC.y < npc->y + 0x2000) if (npc->count1 < 4 && gMC.y > npc->y - (16 * 0x200) && gMC.y < npc->y + (16 * 0x200))
npc->act_no = 201; npc->act_no = 201;
break; break;
@ -291,16 +291,16 @@ void ActNpc340(NPCHAR *npc)
for (i = 0; i < 8; ++i) for (i = 0; i < 8; ++i)
{ {
x = npc->x + (Random(-0x10, 0x10) * 0x200); x = npc->x + (Random(-0x10, 0x10) * 0x200);
SetNpChar(4, x, npc->y + 0x1400, 0, 0, 0, 0, 0x100); SetNpChar(4, x, npc->y + (10 * 0x200), 0, 0, 0, NULL, 0x100);
} }
SetNpChar(332, npc->x - 0x1800, npc->y + 0x1800, 0, 0, 0, 0, 0x100); SetNpChar(332, npc->x - (12 * 0x200), npc->y + (12 * 0x200), 0, 0, 0, NULL, 0x100);
SetNpChar(332, npc->x + 0x1800, npc->y + 0x1800, 0, 0, 2, 0, 0x100); SetNpChar(332, npc->x + (12 * 0x200), npc->y + (12 * 0x200), 0, 0, 2, NULL, 0x100);
SetQuake2(10); SetQuake2(10);
PlaySoundObject(26, 1); PlaySoundObject(26, 1);
} }
if (npc->count1 < 4 && gMC.y > npc->y - 0x2000 && gMC.y < npc->y + 0x2000) if (npc->count1 < 4 && gMC.y > npc->y - (16 * 0x200) && gMC.y < npc->y + (16 * 0x200))
npc->act_no = 201; npc->act_no = 201;
break; break;
@ -362,17 +362,17 @@ void ActNpc340(NPCHAR *npc)
npc->act_wait = 0; npc->act_wait = 0;
npc->ym = -0x600; npc->ym = -0x600;
if (npc->x > 0x28000) if (npc->x > 320 * 0x200)
{ {
npc->direct = 2; npc->direct = 2;
npc->tgt_x = gMC.x; npc->tgt_x = gMC.x;
npc->tgt_y = 0x16000; npc->tgt_y = 176 * 0x200;
} }
else else
{ {
npc->direct = 0; npc->direct = 0;
npc->tgt_x = gMC.x; npc->tgt_x = gMC.x;
npc->tgt_y = 0x16000; npc->tgt_y = 176 * 0x200;
} }
npc->ani_wait = 0; npc->ani_wait = 0;
@ -413,7 +413,7 @@ void ActNpc340(NPCHAR *npc)
if (npc->act_wait > 200 && npc->act_wait % 40 == 1) if (npc->act_wait > 200 && npc->act_wait % 40 == 1)
{ {
npc->ani_wait = 0; npc->ani_wait = 0;
SetNpChar(333, gMC.x, 0x26000, 0, 0, 0, 0, 0x100); SetNpChar(333, gMC.x, 304 * 0x200, 0, 0, 0, NULL, 0x100);
} }
if (npc->act_wait > 480) if (npc->act_wait > 480)
@ -435,7 +435,7 @@ void ActNpc340(NPCHAR *npc)
if (npc->act_wait > 50 && npc->act_wait % 10 == 1) if (npc->act_wait > 50 && npc->act_wait % 10 == 1)
{ {
x = ((4 * npc->act_wait - 200) / 10 + 2) * 0x200 * 0x10; x = ((4 * npc->act_wait - 200) / 10 + 2) * 0x200 * 0x10;
SetNpChar(333, x, 0x26000, 0, 0, 0, 0, 0x100); SetNpChar(333, x, 304 * 0x200, 0, 0, 0, NULL, 0x100);
} }
if (npc->act_wait > 140) if (npc->act_wait > 140)