|
@@ -194,7 +194,7 @@ static void splash_anim(uint8_t *hiwater) NONBANKED {
|
194
|
194
|
|
195
|
195
|
if (++frame >= 60) {
|
196
|
196
|
frame = 0;
|
197
|
|
- if (++state >= 10) {
|
|
197
|
+ if (++state >= 12) {
|
198
|
198
|
state = 0;
|
199
|
199
|
}
|
200
|
200
|
}
|
|
@@ -204,50 +204,61 @@ static void splash_anim(uint8_t *hiwater) NONBANKED {
|
204
|
204
|
int32_t score = 0;
|
205
|
205
|
obj_do(&spd_off_x, &spd_off_y, &score, hiwater, 1);
|
206
|
206
|
|
207
|
|
- switch (state) {
|
208
|
|
- case 0:
|
209
|
|
- case 2:
|
210
|
|
- spr_draw(SPR_SHIP, FLIP_NONE, -4, -42 - 1, 4, hiwater);
|
211
|
|
- break;
|
|
207
|
+ /*
|
|
208
|
+ * 0: right
|
|
209
|
+ * 1: right shoot
|
|
210
|
+ * 2: right
|
|
211
|
+ * 3: top-right (add)
|
|
212
|
+ * 4: top
|
|
213
|
+ * 5: top-left
|
|
214
|
+ * 6: left
|
|
215
|
+ * 7: left shoot
|
|
216
|
+ * 8: left
|
|
217
|
+ * 9: top-left (add)
|
|
218
|
+ * 10: top
|
|
219
|
+ * 11: top-right
|
|
220
|
+ */
|
212
|
221
|
|
|
222
|
+ switch (state) {
|
213
|
223
|
case 1:
|
214
|
|
- spr_draw(SPR_SHIP, FLIP_NONE, -4, -42 - 1, 4, hiwater);
|
215
|
224
|
if (frame == 0) {
|
216
|
225
|
obj_add(SPR_SHOT, SHIP_OFF, -42, SHOT_SPEED, 0);
|
217
|
226
|
sample_play(SFX_SHOT);
|
218
|
227
|
}
|
|
228
|
+ case 0:
|
|
229
|
+ case 2:
|
|
230
|
+ spr_draw(SPR_SHIP, FLIP_NONE, -4, -42 - 1, 4, hiwater);
|
219
|
231
|
break;
|
220
|
232
|
|
221
|
233
|
case 3:
|
222
|
234
|
if (frame == 30) {
|
223
|
235
|
obj_add(SPR_LIGHT, 42, -42, 0, 0);
|
224
|
236
|
}
|
225
|
|
- spr_draw(SPR_SHIP, FLIP_NONE, -1, -42 + 4, 0, hiwater);
|
|
237
|
+ case 11:
|
|
238
|
+ spr_draw(SPR_SHIP, FLIP_NONE, 1, -42 - 1, 2, hiwater);
|
226
|
239
|
break;
|
227
|
240
|
|
228
|
|
- case 8:
|
|
241
|
+ case 9:
|
229
|
242
|
if (frame == 30) {
|
230
|
243
|
obj_add(SPR_DARK, -42, -42, 0, 0);
|
231
|
244
|
}
|
232
|
|
- spr_draw(SPR_SHIP, FLIP_NONE, -1, -42 + 4, 0, hiwater);
|
|
245
|
+ case 5:
|
|
246
|
+ spr_draw(SPR_SHIP, FLIP_X, -1, -42 - 1, 2, hiwater);
|
233
|
247
|
break;
|
234
|
248
|
|
235
|
249
|
case 4:
|
236
|
|
- case 9:
|
|
250
|
+ case 10:
|
237
|
251
|
spr_draw(SPR_SHIP, FLIP_NONE, -1, -42 + 4, 0, hiwater);
|
238
|
252
|
break;
|
239
|
253
|
|
240
|
|
- case 5:
|
241
|
254
|
case 7:
|
242
|
|
- spr_draw(SPR_SHIP, FLIP_X, 4, -42, 4, hiwater);
|
243
|
|
- break;
|
244
|
|
-
|
245
|
|
- case 6:
|
246
|
|
- spr_draw(SPR_SHIP, FLIP_X, 4, -42, 4, hiwater);
|
247
|
255
|
if (frame == 0) {
|
248
|
256
|
obj_add(SPR_SHOT, -SHIP_OFF, -42, -SHOT_SPEED, 0);
|
249
|
257
|
sample_play(SFX_SHOT);
|
250
|
258
|
}
|
|
259
|
+ case 6:
|
|
260
|
+ case 8:
|
|
261
|
+ spr_draw(SPR_SHIP, FLIP_X, 4, -42, 4, hiwater);
|
251
|
262
|
break;
|
252
|
263
|
}
|
253
|
264
|
}
|