mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-21 14:07:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve documentation for object_do_animation

Browse Source
This commit is contained in:
Ryan Dwyer
2020-02-19 23:24:36 +10:00
parent ae8e7a821d
commit e6c99d2bba
28 changed files with 182 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/chr/chraction.c
+8 -8
View File
@@ -4960,7 +4960,7 @@ glabel func0f0319a8
/* f03239c: 1000000f */ beqz $zero,.L0f0323dc
/* f0323a0: 8e180018 */ lw $t8,0x18($s0)
.L0f0323a4:
/* f0323a4: 0c008dda */ jal func00023768
/* f0323a4: 0c008dda */ jal animGetNumFrames
/* f0323a8: 84640000 */ lh $a0,0x0($v1)
/* f0323ac: 2459ffff */ addiu $t9,$v0,-1
/* f0323b0: 44994000 */ mtc1 $t9,$f8
@@ -5662,7 +5662,7 @@ glabel func0f032ac4
/* f032dc8: 1000000f */ beqz $zero,.L0f032e08
/* f032dcc: 24080001 */ addiu $t0,$zero,0x1
.L0f032dd0:
/* f032dd0: 0c008dda */ jal func00023768
/* f032dd0: 0c008dda */ jal animGetNumFrames
/* f032dd4: 85040000 */ lh $a0,0x0($t0)
/* f032dd8: 2449ffff */ addiu $t1,$v0,-1
/* f032ddc: 44893000 */ mtc1 $t1,$f6
@@ -5782,7 +5782,7 @@ glabel func0f032ac4
/* f032f94: 1000000f */ beqz $zero,.L0f032fd4
/* f032f98: 8fbf002c */ lw $ra,0x2c($sp)
.L0f032f9c:
/* f032f9c: 0c008dda */ jal func00023768
/* f032f9c: 0c008dda */ jal animGetNumFrames
/* f032fa0: 85040000 */ lh $a0,0x0($t0)
/* f032fa4: 244dffff */ addiu $t5,$v0,-1
/* f032fa8: 448d9000 */ mtc1 $t5,$f18
@@ -15956,7 +15956,7 @@ glabel func0f03c138
/* f03c404: e7a80010 */ swc1 $f8,0x10($sp)
/* f03c408: 0c007733 */ jal func0001dccc
/* f03c40c: e7aa0014 */ swc1 $f10,0x14($sp)
/* f03c410: 0c008dda */ jal func00023768
/* f03c410: 0c008dda */ jal animGetNumFrames
/* f03c414: 2404006b */ addiu $a0,$zero,0x6b
/* f03c418: 244dffff */ addiu $t5,$v0,-1
/* f03c41c: 448d8000 */ mtc1 $t5,$f16
@@ -15985,7 +15985,7 @@ glabel func0f03c138
/* f03c470: e7b20010 */ swc1 $f18,0x10($sp)
/* f03c474: 0c007733 */ jal func0001dccc
/* f03c478: e7a40014 */ swc1 $f4,0x14($sp)
/* f03c47c: 0c008dda */ jal func00023768
/* f03c47c: 0c008dda */ jal animGetNumFrames
/* f03c480: 24040028 */ addiu $a0,$zero,0x28
/* f03c484: 2459ffff */ addiu $t9,$v0,-1
/* f03c488: 44993000 */ mtc1 $t9,$f6
@@ -16013,7 +16013,7 @@ glabel func0f03c138
/* f03c4dc: e7a80010 */ swc1 $f8,0x10($sp)
/* f03c4e0: 0c007733 */ jal func0001dccc
/* f03c4e4: e7aa0014 */ swc1 $f10,0x14($sp)
/* f03c4e8: 0c008dda */ jal func00023768
/* f03c4e8: 0c008dda */ jal animGetNumFrames
/* f03c4ec: 24040392 */ addiu $a0,$zero,0x392
/* f03c4f0: 244bffff */ addiu $t3,$v0,-1
/* f03c4f4: 448b8000 */ mtc1 $t3,$f16
@@ -17278,7 +17278,7 @@ glabel func0f03d0b0
/* f03d740: 0c007457 */ jal func0001d15c
/* f03d744: 8fa400ac */ lw $a0,0xac($sp)
/* f03d748: 2c500001 */ sltiu $s0,$v0,0x1
/* f03d74c: 0c008dda */ jal func00023768
/* f03d74c: 0c008dda */ jal animGetNumFrames
/* f03d750: 2404003c */ addiu $a0,$zero,0x3c
/* f03d754: 44828000 */ mtc1 $v0,$f16
/* f03d758: 3c017f1b */ lui $at,%hi(var7f1a8f1c)
@@ -17294,7 +17294,7 @@ glabel func0f03d0b0
/* f03d780: e7aa0010 */ swc1 $f10,0x10($sp)
/* f03d784: 0c007733 */ jal func0001dccc
/* f03d788: e7a80014 */ swc1 $f8,0x14($sp)
/* f03d78c: 0c008dda */ jal func00023768
/* f03d78c: 0c008dda */ jal animGetNumFrames
/* f03d790: 2404003c */ addiu $a0,$zero,0x3c
/* f03d794: 44823000 */ mtc1 $v0,$f6
/* f03d798: 3c01424c */ lui $at,0x424c
src/game/chr/chraicommands.c
+2 -2
View File
@@ -427,7 +427,7 @@ bool aiChrDoAnimation(void)
if (startframe == 0xffff) {
fstartframe = 0;
} else if (startframe == 0xfffe) {
fstartframe = func00023768(anim_id) - 1;
fstartframe = animGetNumFrames(anim_id) - 1;
} else {
fstartframe = startframe;
}
@@ -5450,7 +5450,7 @@ bool aiObjectDoAnimation(void)
if (startframe == 0xffff) {
fstartframe = 0;
} else if (startframe == 0xfffe) {
fstartframe = func00023768(anim_id) - 2;
fstartframe = animGetNumFrames(anim_id) - 2;
if (fstartframe < 0) {
fstartframe = 0;
src/game/data/ailists.c
+5 -5
View File
@@ -95,7 +95,7 @@ u8 func0006_unalerted[] = {
dprint 'N','O','G','U','N','2','\n',0,
dprint 'A','N','I','M',' ','O','B','J','E','C','T',' ','N','O','W','\n',0,
set_chr_maxdamage(CHR_SELF, 40)
object_do_animation(0x025a, 0xff, 0x02ff, 0xff)
object_do_animation(0x025a, 0xff, 0x02, 0xffff)
chr_do_animation(ANIM_STAND_UP_FROM_SITTING, 0, -1, 0x02, 0x10, CHR_SELF, 2)
unset_self_flag_bankx(CHRFLAG1_DOINGIDLEANIMATION, BANK_1)
set_chr_special_death_animation(CHR_SELF, 0)
@@ -821,12 +821,12 @@ u8 func0008_wakeup[] = {
label(0x15)
set_chr_maxdamage(CHR_SELF, 40)
chr_do_animation(ANIM_STAND_UP_FROM_SITTING, 0, -1, 0x02, 0x10, CHR_SELF, 2)
object_do_animation(0x025a, 0xff, 0x02ff, 0xff)
object_do_animation(0x025a, 0xff, 0x02, 0xffff)
goto_next(0x0c)
// Unreachable - nothing jumps here
label(0x16)
object_do_animation(0x027b, 0xff, 0x02ff, 0xff)
object_do_animation(0x027b, 0xff, 0x02, 0xffff)
// Wait for stand up animation to finish
label(0x0c)
@@ -2710,7 +2710,7 @@ u8 func000a_do_idle_animation[] = {
// Stand up
label(0x13)
chr_do_animation(ANIM_STAND_UP_FROM_SITTING, 0, -1, 0x02, 0x10, CHR_SELF, 2)
object_do_animation(0x025a, 0xff, 0x02ff, 0xff)
object_do_animation(0x025a, 0xff, 0x02, 0xffff)
beginloop(0x06)
if_chr_stopped(/*goto*/ 0x13)
@@ -2822,7 +2822,7 @@ u8 func000d_init_combat[] = {
label(0x05)
set_chr_maxdamage(CHR_SELF, 40)
chr_do_animation(ANIM_STAND_UP_FROM_SITTING, 0, -1, 0x02, 0x10, CHR_SELF, 2)
object_do_animation(0x025a, 0xff, 0x02ff, 0xff)
object_do_animation(0x025a, 0xff, 0x02, 0xffff)
beginloop(0x0c)
if_chr_stopped(/*goto*/ 0x13)
src/game/game_000130.c
+2 -2
View File
@@ -360,14 +360,14 @@ glabel func0f0005c0
/* f0005c0: 27bdffe0 */ addiu $sp,$sp,-32
/* f0005c4: afbf0014 */ sw $ra,0x14($sp)
/* f0005c8: afa40020 */ sw $a0,0x20($sp)
/* f0005cc: 0c008dda */ jal func00023768
/* f0005cc: 0c008dda */ jal animGetNumFrames
/* f0005d0: 87a40022 */ lh $a0,0x22($sp)
/* f0005d4: 87a40022 */ lh $a0,0x22($sp)
/* f0005d8: 00002825 */ or $a1,$zero,$zero
/* f0005dc: 0fc000d6 */ jal func0f000358
/* f0005e0: 2446ffff */ addiu $a2,$v0,-1
/* f0005e4: afa20018 */ sw $v0,0x18($sp)
/* f0005e8: 0c008dda */ jal func00023768
/* f0005e8: 0c008dda */ jal animGetNumFrames
/* f0005ec: 87a40022 */ lh $a0,0x22($sp)
/* f0005f0: 8fae0018 */ lw $t6,0x18($sp)
/* f0005f4: 44824000 */ mtc1 $v0,$f8
src/game/game_0b63b0.c
+3 -3
View File
@@ -4160,7 +4160,7 @@ void func0f0ba010(void)
var8009de2c = -1;
var80070764 = 1;
func0f11dcb0(1);
g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_6 && var8009de10 < func00023768(var8009de18) - 1;
g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_6 && var8009de10 < animGetNumFrames(var8009de18) - 1;
g_Vars.unk0004e2 = 0;
}
@@ -4227,7 +4227,7 @@ glabel func0f0ba190
/* f0ba198: ac24de2c */ sw $a0,-0x21d4($at)
/* f0ba19c: afbf0024 */ sw $ra,0x24($sp)
/* f0ba1a0: 3c04800a */ lui $a0,0x800a
/* f0ba1a4: 0c008dda */ jal func00023768
/* f0ba1a4: 0c008dda */ jal animGetNumFrames
/* f0ba1a8: 8484de18 */ lh $a0,-0x21e8($a0)
/* f0ba1ac: 244effff */ addiu $t6,$v0,-1
/* f0ba1b0: 3c04800a */ lui $a0,0x800a
@@ -4322,7 +4322,7 @@ glabel func0f0ba29c
/* f0ba2fc: 2652de18 */ addiu $s2,$s2,%lo(var8009de18)
/* f0ba300: 0c008f4e */ jal func00023d38
/* f0ba304: 86440000 */ lh $a0,0x0($s2)
/* f0ba308: 0c008dda */ jal func00023768
/* f0ba308: 0c008dda */ jal animGetNumFrames
/* f0ba30c: 86440000 */ lh $a0,0x0($s2)
/* f0ba310: 8e780290 */ lw $t8,0x290($s3)
/* f0ba314: 2444ffff */ addiu $a0,$v0,-1
src/game/game_167ae0.c
+1 -1
View File
@@ -2929,7 +2929,7 @@ glabel func0f169374
/* f16a378: 00008025 */ or $s0,$zero,$zero
/* f16a37c: 44800000 */ mtc1 $zero,$f0
/* f16a380: 8484de18 */ lh $a0,-0x21e8($a0)
/* f16a384: 0c008dda */ jal func00023768
/* f16a384: 0c008dda */ jal animGetNumFrames
/* f16a388: e7a000c4 */ swc1 $f0,0xc4($sp)
/* f16a38c: 3c03800a */ lui $v1,0x800a
/* f16a390: 8c63de10 */ lw $v1,-0x21f0($v1)