Skip to content

Commit c6329b9

Browse files
committed
Fix: Pupil's battle animation. #10.
1 parent 042d2aa commit c6329b9

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

content/battle_animation/pupil_magic.S

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pupil_magic_mode_1:
7474
@4 p- 022.png
7575
.word ANINS_SHOW_FRAME(23, pupil_magic_sheet_1, pupil_magic_frame_r_23 - pupil_magic_frames_r, 4)
7676
.word ANINS_COMMAND_85(0x05)
77-
.word ANINS_COMMAND_85(0x47)
77+
@Loop start
7878
@3 p- 023.png
7979
.word ANINS_SHOW_FRAME(24, pupil_magic_sheet_1, pupil_magic_frame_r_24 - pupil_magic_frames_r, 3)
8080
@3 p- 024.png
@@ -85,7 +85,7 @@ pupil_magic_mode_1:
8585
.word ANINS_SHOW_FRAME(27, pupil_magic_sheet_1, pupil_magic_frame_r_27 - pupil_magic_frames_r, 3)
8686
@3 p- 027.png
8787
.word ANINS_SHOW_FRAME(28, pupil_magic_sheet_1, pupil_magic_frame_r_28 - pupil_magic_frames_r, 3)
88-
.word ANINS_COMMAND_85(0x01)
88+
.word ANINS_COMMAND_LOOP(5)
8989
@3 p- 025.png
9090
.word ANINS_SHOW_FRAME(26, pupil_magic_sheet_1, pupil_magic_frame_r_26 - pupil_magic_frames_r, 3)
9191
@6 p- 028.png
@@ -156,7 +156,7 @@ pupil_magic_mode_2:
156156
@4 p- 022.png
157157
.word ANINS_SHOW_FRAME(0, pupil_magic_sheet_0, pupil_magic_frame_r_0 - pupil_magic_frames_r, 4)
158158
.word ANINS_COMMAND_85(0x05)
159-
.word ANINS_COMMAND_85(0x47)
159+
@Loop begin
160160
@3 p- 023.png
161161
.word ANINS_SHOW_FRAME(0, pupil_magic_sheet_0, pupil_magic_frame_r_0 - pupil_magic_frames_r, 3)
162162
@3 p- 024.png
@@ -249,7 +249,7 @@ pupil_magic_mode_3:
249249
@4 p- 022.png
250250
.word ANINS_SHOW_FRAME(23, pupil_magic_sheet_1, pupil_magic_frame_r_23 - pupil_magic_frames_r, 4)
251251
.word ANINS_COMMAND_85(0x05)
252-
.word ANINS_COMMAND_85(0x47)
252+
@Loop start
253253
@3 p- 023.png
254254
.word ANINS_SHOW_FRAME(24, pupil_magic_sheet_1, pupil_magic_frame_r_24 - pupil_magic_frames_r, 3)
255255
@3 p- 024.png
@@ -260,7 +260,7 @@ pupil_magic_mode_3:
260260
.word ANINS_SHOW_FRAME(27, pupil_magic_sheet_1, pupil_magic_frame_r_27 - pupil_magic_frames_r, 3)
261261
@3 p- 027.png
262262
.word ANINS_SHOW_FRAME(28, pupil_magic_sheet_1, pupil_magic_frame_r_28 - pupil_magic_frames_r, 3)
263-
.word ANINS_COMMAND_85(0x01)
263+
.word ANINS_COMMAND_LOOP(5)
264264
@3 p- 025.png
265265
.word ANINS_SHOW_FRAME(26, pupil_magic_sheet_1, pupil_magic_frame_r_26 - pupil_magic_frames_r, 3)
266266
@6 p- 028.png
@@ -342,7 +342,7 @@ pupil_magic_mode_4:
342342
@4 p- 022.png
343343
.word ANINS_SHOW_FRAME(0, pupil_magic_sheet_0, pupil_magic_frame_r_0 - pupil_magic_frames_r, 4)
344344
.word ANINS_COMMAND_85(0x05)
345-
.word ANINS_COMMAND_85(0x47)
345+
@Loop begin
346346
@3 p- 023.png
347347
.word ANINS_SHOW_FRAME(0, pupil_magic_sheet_0, pupil_magic_frame_r_0 - pupil_magic_frames_r, 3)
348348
@3 p- 024.png
@@ -423,7 +423,7 @@ pupil_magic_mode_5:
423423
@4 p- 022.png
424424
.word ANINS_SHOW_FRAME(23, pupil_magic_sheet_1, pupil_magic_frame_r_23 - pupil_magic_frames_r, 4)
425425
.word ANINS_COMMAND_85(0x05)
426-
.word ANINS_COMMAND_85(0x47)
426+
@Loop start
427427
@3 p- 023.png
428428
.word ANINS_SHOW_FRAME(24, pupil_magic_sheet_1, pupil_magic_frame_r_24 - pupil_magic_frames_r, 3)
429429
@3 p- 024.png
@@ -434,7 +434,7 @@ pupil_magic_mode_5:
434434
.word ANINS_SHOW_FRAME(27, pupil_magic_sheet_1, pupil_magic_frame_r_27 - pupil_magic_frames_r, 3)
435435
@3 p- 027.png
436436
.word ANINS_SHOW_FRAME(28, pupil_magic_sheet_1, pupil_magic_frame_r_28 - pupil_magic_frames_r, 3)
437-
.word ANINS_COMMAND_85(0x01)
437+
.word ANINS_COMMAND_LOOP(5)
438438
@3 p- 025.png
439439
.word ANINS_SHOW_FRAME(26, pupil_magic_sheet_1, pupil_magic_frame_r_26 - pupil_magic_frames_r, 3)
440440
@6 p- 028.png
@@ -515,7 +515,7 @@ pupil_magic_mode_6:
515515
@4 p- 022.png
516516
.word ANINS_SHOW_FRAME(23, pupil_magic_sheet_1, pupil_magic_frame_r_23 - pupil_magic_frames_r, 4)
517517
.word ANINS_COMMAND_85(0x05)
518-
.word ANINS_COMMAND_85(0x47)
518+
@Loop start
519519
@3 p- 023.png
520520
.word ANINS_SHOW_FRAME(24, pupil_magic_sheet_1, pupil_magic_frame_r_24 - pupil_magic_frames_r, 3)
521521
@3 p- 024.png
@@ -526,7 +526,7 @@ pupil_magic_mode_6:
526526
.word ANINS_SHOW_FRAME(27, pupil_magic_sheet_1, pupil_magic_frame_r_27 - pupil_magic_frames_r, 3)
527527
@3 p- 027.png
528528
.word ANINS_SHOW_FRAME(28, pupil_magic_sheet_1, pupil_magic_frame_r_28 - pupil_magic_frames_r, 3)
529-
.word ANINS_COMMAND_85(0x01)
529+
.word ANINS_COMMAND_LOOP(5)
530530
@3 p- 025.png
531531
.word ANINS_SHOW_FRAME(26, pupil_magic_sheet_1, pupil_magic_frame_r_26 - pupil_magic_frames_r, 3)
532532
@6 p- 028.png
@@ -645,7 +645,7 @@ pupil_magic_mode_12:
645645
@4 p- 022.png
646646
.word ANINS_SHOW_FRAME(23, pupil_magic_sheet_1, pupil_magic_frame_r_23 - pupil_magic_frames_r, 4)
647647
.word ANINS_COMMAND_85(0x05)
648-
.word ANINS_COMMAND_85(0x47)
648+
@Loop start
649649
@3 p- 023.png
650650
.word ANINS_SHOW_FRAME(24, pupil_magic_sheet_1, pupil_magic_frame_r_24 - pupil_magic_frames_r, 3)
651651
@3 p- 024.png
@@ -656,7 +656,7 @@ pupil_magic_mode_12:
656656
.word ANINS_SHOW_FRAME(27, pupil_magic_sheet_1, pupil_magic_frame_r_27 - pupil_magic_frames_r, 3)
657657
@3 p- 027.png
658658
.word ANINS_SHOW_FRAME(28, pupil_magic_sheet_1, pupil_magic_frame_r_28 - pupil_magic_frames_r, 3)
659-
.word ANINS_COMMAND_85(0x01)
659+
.word ANINS_COMMAND_LOOP(5)
660660
@3 p- 025.png
661661
.word ANINS_SHOW_FRAME(26, pupil_magic_sheet_1, pupil_magic_frame_r_26 - pupil_magic_frames_r, 3)
662662
@6 p- 028.png

content/battle_animation/pupil_magic/script.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ C1B
2929
4 p- 021.png
3030
4 p- 022.png
3131
C05
32-
C47
32+
L
3333
3 p- 023.png
3434
3 p- 024.png
3535
3 p- 025.png
@@ -83,7 +83,7 @@ C1B
8383
4 p- 021.png
8484
4 p- 022.png
8585
C05
86-
C47
86+
L
8787
3 p- 023.png
8888
3 p- 024.png
8989
3 p- 025.png
@@ -129,7 +129,7 @@ C1B
129129
4 p- 021.png
130130
4 p- 022.png
131131
C05
132-
C47
132+
L
133133
3 p- 023.png
134134
3 p- 024.png
135135
3 p- 025.png
@@ -182,7 +182,7 @@ C1B
182182
4 p- 021.png
183183
4 p- 022.png
184184
C05
185-
C47
185+
L
186186
3 p- 023.png
187187
3 p- 024.png
188188
3 p- 025.png
@@ -261,7 +261,7 @@ C1B
261261
4 p- 021.png
262262
4 p- 022.png
263263
C05
264-
C47
264+
L
265265
3 p- 023.png
266266
3 p- 024.png
267267
3 p- 025.png

0 commit comments

Comments
 (0)