Decompile objTick

This commit is contained in:
Ryan Dwyer 2020-06-09 00:18:44 +10:00
parent d5aaeaf5d8
commit 5fe352f037
27 changed files with 921 additions and 1578 deletions

View File

@ -127,7 +127,7 @@ u32 props[] = {
vent_fan(0x0100, MODEL_DD_FANROOF, 0x008a, 0x000204e8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000444, 0x00000000, 0x00000002, 0x01000000)
vent_fan(0x0100, MODEL_DD_FANWALL, 0x008b, 0x000204e8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000222, 0x00000000, 0x00000002, 0x01000000)
tag(0x0b, 1)
armed_vehicle(0x004c, MODEL_DD_HOVERCOPTER, 0x0190, 0x20000008, 0x00000110, 0x00008000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, AILIST_HOVERCOPTER, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
chopper(0x004c, MODEL_DD_HOVERCOPTER, 0x0190, 0x20000008, 0x00000110, 0x00008000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, AILIST_HOVERCOPTER, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
tag(0x10, 1)
stdobject(0x0100, MODEL_DDJUMPSHIP, 0xffff, 0x00021501, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000)
tag(0x0c, 2)

View File

@ -331,11 +331,11 @@ u32 props[] = {
tag(0x55, 1)
hoverbike(0x0100, MODEL_HOVBIKE, 0x037a, 0x05120101, 0x00304300, 0x02000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x01010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
tag(0x02, 1)
armed_vehicle(0x0a00, MODEL_A51INTERCEPTOR, 0x0359, 0x20000108, 0x00080000, 0x00008200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x0000040c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
chopper(0x0a00, MODEL_A51INTERCEPTOR, 0x0359, 0x20000108, 0x00080000, 0x00008200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x0000040c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
tag(0x03, 1)
armed_vehicle(0x0a00, MODEL_A51INTERCEPTOR, 0x036c, 0x20000108, 0x00080000, 0x00008200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x0000040c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
chopper(0x0a00, MODEL_A51INTERCEPTOR, 0x036c, 0x20000108, 0x00080000, 0x00008200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x0000040c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
tag(0x04, 1)
armed_vehicle(0x0a00, MODEL_A51INTERCEPTOR, 0x034e, 0x20000108, 0x00080000, 0x00008200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x0000040a, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
chopper(0x0a00, MODEL_A51INTERCEPTOR, 0x034e, 0x20000108, 0x00080000, 0x00008200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x0000040a, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
tag(0x05, 1)
singlemonitor(0x0100, MODEL_MODEMBOX, 0x0409, 0x10000002, 0x00000800, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffff12)
tag(0x08, 1)
@ -1693,7 +1693,7 @@ u8 func1001_objectives_failed_msg[] = {
u8 func040a_top_interceptor[] = {
set_chr_maxdamage(CHR_SELF, 5000)
set_object_flag(OBJ_INTERCEPTOR3, OBJFLAG_INTERCEPTOR_DISABLED)
set_object_flag(OBJ_INTERCEPTOR3, OBJFLAG_CHOPPER_INACTIVE)
restart_timer
beginloop(0x03)
@ -1704,7 +1704,7 @@ u8 func040a_top_interceptor[] = {
endloop(0x03)
label(0x06)
unset_object_flag(OBJ_INTERCEPTOR3, OBJFLAG_INTERCEPTOR_DISABLED)
unset_object_flag(OBJ_INTERCEPTOR3, OBJFLAG_CHOPPER_INACTIVE)
chopper_arm_weapons
begin_hovercar_path(0x22)
set_chr_maxdamage(CHR_SELF, 5000)
@ -1758,8 +1758,8 @@ u8 func040a_top_interceptor[] = {
u8 func040c_init_bottom_interceptors[] = {
set_chr_maxdamage(CHR_SELF, 5000)
set_object_flag(OBJ_INTERCEPTOR1, OBJFLAG_INTERCEPTOR_DISABLED)
set_object_flag(OBJ_INTERCEPTOR2, OBJFLAG_INTERCEPTOR_DISABLED)
set_object_flag(OBJ_INTERCEPTOR1, OBJFLAG_CHOPPER_INACTIVE)
set_object_flag(OBJ_INTERCEPTOR2, OBJFLAG_CHOPPER_INACTIVE)
beginloop(0x04)
endloop(0x04)

View File

@ -1440,7 +1440,7 @@ void currentPlayerUpdateVerticalMovement(void)
if (moveamount > 0
|| lift == NULL
|| lift->obj == NULL
|| (lift->obj->flags & OBJFLAG_INTERCEPTOR_DISABLED) == 0
|| (lift->obj->flags & OBJFLAG_CHOPPER_INACTIVE) == 0
|| currentPlayerHasGapToCeiling(moveamount) == true) {
// Going up
g_Vars.currentplayer->vv_manground += moveamount;

View File

@ -1228,8 +1228,8 @@ glabel var7f1a8720
/* f01f3d8: a7a000ea */ sh $zero,0xea($sp)
/* f01f3dc: e7a600dc */ swc1 $f6,0xdc($sp)
/* f01f3e0: 8d2a0020 */ lw $t2,0x20($t1)
/* f01f3e4: 3c198006 */ lui $t9,%hi(var8005f00c)
/* f01f3e8: 8f39f00c */ lw $t9,%lo(var8005f00c)($t9)
/* f01f3e4: 3c198006 */ lui $t9,%hi(g_Anims)
/* f01f3e8: 8f39f00c */ lw $t9,%lo(g_Anims)($t9)
/* f01f3ec: 854b0000 */ lh $t3,0x0($t2)
/* f01f3f0: 8d060034 */ lw $a2,0x34($t0)
/* f01f3f4: c50c0044 */ lwc1 $f12,0x44($t0)
@ -4030,8 +4030,8 @@ glabel func0f0220ec
/* f02213c: 50400015 */ beqzl $v0,.L0f022194
/* f022140: 8ce20018 */ lw $v0,0x18($a3)
/* f022144: 844a0000 */ lh $t2,0x0($v0)
/* f022148: 3c098006 */ lui $t1,%hi(var8005f00c)
/* f02214c: 8d29f00c */ lw $t1,%lo(var8005f00c)($t1)
/* f022148: 3c098006 */ lui $t1,%hi(g_Anims)
/* f02214c: 8d29f00c */ lw $t1,%lo(g_Anims)($t1)
/* f022150: 000a5880 */ sll $t3,$t2,0x2
/* f022154: 016a5823 */ subu $t3,$t3,$t2
/* f022158: 000b5880 */ sll $t3,$t3,0x2
@ -5154,8 +5154,8 @@ glabel var7f1a87d8
/* f0235dc: 10400029 */ beqz $v0,.L0f023684
/* f0235e0: 00000000 */ sll $zero,$zero,0x0
/* f0235e4: 84440000 */ lh $a0,0x0($v0)
/* f0235e8: 3c188006 */ lui $t8,%hi(var8005f00c)
/* f0235ec: 8f18f00c */ lw $t8,%lo(var8005f00c)($t8)
/* f0235e8: 3c188006 */ lui $t8,%hi(g_Anims)
/* f0235ec: 8f18f00c */ lw $t8,%lo(g_Anims)($t8)
/* f0235f0: 00047880 */ sll $t7,$a0,0x2
/* f0235f4: 01e47823 */ subu $t7,$t7,$a0
/* f0235f8: 000f7880 */ sll $t7,$t7,0x2
@ -5514,8 +5514,8 @@ glabel var7f1a87d8
/* f023b0c: 10400029 */ beqz $v0,.L0f023bb4
/* f023b10: 00000000 */ sll $zero,$zero,0x0
/* f023b14: 84440000 */ lh $a0,0x0($v0)
/* f023b18: 3c0c8006 */ lui $t4,%hi(var8005f00c)
/* f023b1c: 8d8cf00c */ lw $t4,%lo(var8005f00c)($t4)
/* f023b18: 3c0c8006 */ lui $t4,%hi(g_Anims)
/* f023b1c: 8d8cf00c */ lw $t4,%lo(g_Anims)($t4)
/* f023b20: 00045880 */ sll $t3,$a0,0x2
/* f023b24: 01645823 */ subu $t3,$t3,$a0
/* f023b28: 000b5880 */ sll $t3,$t3,0x2

View File

@ -11384,7 +11384,7 @@ glabel chrGoToPos
//
// if ((!same2 || same) &&
// g_Vars.normmplayerisrunning == 0 &&
// (prop->flags & (PROPFLAG_80 | PROPFLAG_40 | PROPFLAG_REDBOXABLE)) == 0 &&
// (prop->flags & (PROPFLAG_80 | PROPFLAG_40 | PROPFLAG_02)) == 0 &&
// func0f036c08(chr, &auStack52[0], &auStack68[0]) &&
// chr->unk32c_00 >= 0) {
// func0f036ee4(chr, &chr->act_gopos.unk068, &auStack52[0], &prevpos);

View File

@ -4618,7 +4618,7 @@ u32 var8005effc = 0x00000000;
u32 var8005f000 = 0x00000000;
u32 var8005f004 = 0x00000000;
u32 var8005f008 = 0x00000000;
u32 var8005f00c = 0x00000000;
struct animheader *g_Anims = NULL;
u32 var8005f010 = 0x00000000;
u32 var8005f014 = 0x00000000;
u32 var8005f018 = 0x000000b0;

View File

@ -9,307 +9,6 @@
#include "stagesetup.h"
#include "types.h"
// f8f0
u32 g_TintedGlassEnabled = 0;
// f8f4
s32 g_AlarmTimer = 0;
struct audiohandle *g_AlarmAudioHandle = NULL;
f32 g_AlarmSpeakerWeight = 64;
f32 g_AlarmSpeakerDirection = 1;
f32 var800698e4 = 0;
u32 var800698e8 = 0x00000000;
u32 var800698ec = 0x00000000;
u32 var800698f0 = 0x00000000;
u32 var800698f4 = 0x00000000;
u32 var800698f8 = 0x00000000;
u32 var800698fc = 0x00000000;
u32 var80069900 = 0x00000000;
u32 g_CountdownTimerVisible = 1; // 80069904
bool g_CountdownTimerRunning = false; // 80069908
f32 g_CountdownTimerValue = 0; // 8006990c
u32 var80069910 = 0x00000000;
u32 var80069914 = 0x00000000;
u32 var80069918 = 0x00000000;
u32 var8006991c = 0x00000000;
u32 var80069920 = 0x00000000;
u32 var80069924 = 0x00000000;
u32 var80069928 = 0x00000000;
u32 var8006992c = 0x00000000;
u32 var80069930 = 0x00000000;
u32 var80069934 = 0x00000000;
u32 var80069938 = 0x00000000;
u32 var8006993c = 0x00000000;
u32 var80069940 = 0x00000000;
u32 var80069944 = 0x00000000;
u32 var80069948 = 0x3f800000;
u32 var8006994c = 0x3f800000;
u32 var80069950 = 0x3f800000;
u32 var80069954 = 0x3f800000;
u32 var80069958 = 0x3f800000;
f32 g_AmmoMultiplier = 1;
u32 var80069960 = 0x00000000;
u32 var80069964 = 0xffffffff;
struct autogunobj *g_ThrownLaptops = NULL;
u32 var8006996c = 0x00000000;
u32 var80069970 = 0x00000000;
u32 var80069974 = 0x00000000;
u32 var80069978 = 0x00000000;
u32 var8006997c = 0x00000000;
u32 var80069980 = 0x0100000f;
u32 var80069984 = 0x0000ffff;
u32 var80069988 = 0x00000001;
u32 var8006998c = 0x00000000;
u32 var80069990 = 0x00000000;
u32 var80069994 = 0x00000000;
u32 var80069998 = 0x00000000;
u32 var8006999c = 0x3f800000;
u32 var800699a0 = 0x00000000;
u32 var800699a4 = 0x00000000;
u32 var800699a8 = 0x00000000;
u32 var800699ac = 0x3f800000;
u32 var800699b0 = 0x00000000;
u32 var800699b4 = 0x00000000;
u32 var800699b8 = 0x00000000;
u32 var800699bc = 0x3f800000;
u32 var800699c0 = 0x00000000;
u32 var800699c4 = 0x00000000;
u32 var800699c8 = 0x00000000;
u32 var800699cc = 0x000003e8;
u32 var800699d0 = 0xffffff00;
u32 var800699d4 = 0xffffff00;
u32 var800699d8 = 0x0fff0000;
u32 var800699dc = 0x00000000;
u32 var800699e0 = 0x00000000;
u32 var800699e4 = 0x00000000;
u32 var800699e8 = 0x00000000;
u32 var800699ec = 0x00000000;
u32 var800699f0 = 0x00000000;
u32 var800699f4 = 0x80748074;
u32 var800699f8 = 0x80740000;
u32 var800699fc = 0x00000000;
u32 var80069a00 = 0xc1200000;
u32 var80069a04 = 0x00000000;
u32 var80069a08 = 0x00000000;
u32 var80069a0c = 0x00000001;
u32 var80069a10 = 0x00000003;
u32 var80069a14 = 0x00000000;
u32 var80069a18 = 0x00000000;
u32 var80069a1c = 0x00000000;
u32 var80069a20 = 0x00000000;
u32 var80069a24 = 0x00000000;
u32 var80069a28 = 0x00000000;
u32 var80069a2c = 0x00000000;
u32 var80069a30 = 0x00000000;
u32 var80069a34 = 0x00000000;
u32 var80069a38 = 0x00000000;
u32 var80069a3c = 0x00000000;
u32 var80069a40 = 0x00000000;
u32 var80069a44 = 0x00000000;
struct prop *g_Lifts[MAX_LIFTS] = {NULL};
u32 var80069a70 = 0x42b40000;
u32 var80069a74 = 0x3f800000;
u32 var80069a78 = 0x40000000;
u32 var80069a7c = 0x3a83126f;
u32 var80069a80 = 0x3f800000;
u32 var80069a84 = 0x3bcddaca;
u32 var80069a88 = 0x3bcddaca;
u32 var80069a8c = 0x372fa9a2;
u32 var80069a90 = 0x39a4af08;
u32 var80069a94 = 0x3bcddaca;
u32 var80069a98 = 0x3bcddaca;
u32 var80069a9c = 0x372fa9a2;
u32 var80069aa0 = 0x39a4af08;
u32 var80069aa4 = 0x42a00000;
u32 var80069aa8 = 0x3f800000;
u32 var80069aac = 0x40400000;
u32 var80069ab0 = 0x3b23d70a;
u32 var80069ab4 = 0x3dcccccd;
u32 var80069ab8 = 0x3c4ddaca;
u32 var80069abc = 0x3c9a6417;
u32 var80069ac0 = 0x37afa9a2;
u32 var80069ac4 = 0x3a24af08;
u32 var80069ac8 = 0x3c4ddaca;
u32 var80069acc = 0x3c9a6417;
u32 var80069ad0 = 0x37afa9a2;
u32 var80069ad4 = 0x3a24af08;
u32 var80069ad8 = 0x428c0000;
u32 var80069adc = 0x40000000;
u32 var80069ae0 = 0x40800000;
u32 var80069ae4 = 0x3a83126f;
u32 var80069ae8 = 0x3f800000;
u32 var80069aec = 0x3bcddaca;
u32 var80069af0 = 0x3c4ddaca;
u32 var80069af4 = 0x372fa9a2;
u32 var80069af8 = 0x39a4af08;
u32 var80069afc = 0x3bcddaca;
u32 var80069b00 = 0x3c4ddaca;
u32 var80069b04 = 0x372fa9a2;
u32 var80069b08 = 0x39a4af08;
u32 var80069b0c = 0x432a0000;
u32 var80069b10 = 0x40000000;
u32 var80069b14 = 0x40000000;
u32 var80069b18 = 0x3a83126f;
u32 var80069b1c = 0x3f800000;
u32 var80069b20 = 0x3b4ddaca;
u32 var80069b24 = 0x3b4ddaca;
u32 var80069b28 = 0x36afa9a2;
u32 var80069b2c = 0x39459ed6;
u32 var80069b30 = 0x3b4ddaca;
u32 var80069b34 = 0x3b4ddaca;
u32 var80069b38 = 0x36afa9a2;
u32 var80069b3c = 0x39459ed6;
u32 var80069b40 = 0x432a0000;
u32 var80069b44 = 0x40000000;
u32 var80069b48 = 0x40000000;
u32 var80069b4c = 0x3a83126f;
u32 var80069b50 = 0x3f800000;
u32 var80069b54 = 0x3b4ddaca;
u32 var80069b58 = 0x3b4ddaca;
u32 var80069b5c = 0x36afa9a2;
u32 var80069b60 = 0x39459ed6;
u32 var80069b64 = 0x3b4ddaca;
u32 var80069b68 = 0x3b4ddaca;
u32 var80069b6c = 0x36afa9a2;
u32 var80069b70 = 0x39459ed6;
u32 var80069b74 = 0x00000000;
u32 var80069b78 = 0x00000000;
u32 var80069b7c = 0x00000000;
u32 var80069b80 = 0x00000000;
u32 var80069b84 = 0x00000000;
u32 var80069b88 = 0x00000000;
u32 var80069b8c = 0x00000000;
u32 var80069b90 = 0x00000000;
u32 var80069b94 = 0x00000000;
u32 var80069b98 = 0x00000000;
u32 var80069b9c = 0x00000000;
u32 var80069ba0 = 0x00000000;
u32 var80069ba4 = 0x00000000;
u32 var80069ba8 = 0x00000000;
u32 var80069bac = 0x3f800000;
u32 var80069bb0 = 0x00000000;
u32 var80069bb4 = 0x3f800000;
u32 var80069bb8 = 0x00000000;
u32 var80069bbc = 0x00270028;
u32 var80069bc0 = 0x0029002a;
u32 var80069bc4 = 0x00000000;
u32 var80069bc8 = 0x00000003;
u32 var80069bcc = 0x00000014;
u32 var80069bd0 = 0x00000078;
u32 g_DebugDoor = 0;
u32 var80069bd8 = 0x00000000;
u32 var80069bdc = 0xc4bfff5c;
u32 var80069be0 = 0xc3ff8000;
u32 var80069be4 = 0xc5a45171;
u32 var80069be8 = 0x00000029;
u32 var80069bec = 0xc4bfff5c;
u32 var80069bf0 = 0xc3fce148;
u32 var80069bf4 = 0xc5a22371;
u32 var80069bf8 = 0x00000095;
u32 var80069bfc = 0xc4bfff5c;
u32 var80069c00 = 0xc3fc651f;
u32 var80069c04 = 0xc59c8600;
u32 var80069c08 = 0x000002ba;
u32 var80069c0c = 0xc4bfff5c;
u32 var80069c10 = 0xc2c9d1ec;
u32 var80069c14 = 0xc58396e1;
u32 var80069c18 = 0x000002f7;
u32 var80069c1c = 0xc4bfff5c;
u32 var80069c20 = 0xc2c5c7ae;
u32 var80069c24 = 0xc5806cf6;
u32 var80069c28 = 0x00000320;
u32 var80069c2c = 0xc4bfff5c;
u32 var80069c30 = 0xc2cc0000;
u32 var80069c34 = 0xc57c70f6;
u32 var80069c38 = 0xffffffff;
u32 var80069c3c = 0x00000000;
u32 var80069c40 = 0x00000000;
u32 var80069c44 = 0x00000000;
u32 var80069c48 = 0x00000000;
u32 var80069c4c = 0xc4f188a4;
u32 var80069c50 = 0xc2cc0000;
u32 var80069c54 = 0xc56f0948;
u32 var80069c58 = 0x00000029;
u32 var80069c5c = 0xc4fa5a8f;
u32 var80069c60 = 0xc2c5c7ae;
u32 var80069c64 = 0xc56f0948;
u32 var80069c68 = 0x00000066;
u32 var80069c6c = 0xc503811f;
u32 var80069c70 = 0xc2c9d1ec;
u32 var80069c74 = 0xc56f0948;
u32 var80069c78 = 0x0000028b;
u32 var80069c7c = 0xc5355f5c;
u32 var80069c80 = 0xc3fc651f;
u32 var80069c84 = 0xc56f0948;
u32 var80069c88 = 0x000002f7;
u32 var80069c8c = 0xc5409a3d;
u32 var80069c90 = 0xc3fce148;
u32 var80069c94 = 0xc56f0948;
u32 var80069c98 = 0x00000320;
u32 var80069c9c = 0xc544f63d;
u32 var80069ca0 = 0xc3ff8000;
u32 var80069ca4 = 0xc56f0948;
u32 var80069ca8 = 0xffffffff;
u32 var80069cac = 0x00000000;
u32 var80069cb0 = 0x00000000;
u32 var80069cb4 = 0x00000000;
u32 var80069cb8 = 0x2b000000;
u32 var80069cbc = 0x0e000001;
u32 var80069cc0 = 0x00000000;
u32 var80069cc4 = 0x00000000;
u32 var80069cc8 = 0x00000001;
u32 var80069ccc = 0x00000003;
u32 var80069cd0 = 0x00000000;
u32 var80069cd4 = 0x00000000;
u32 var80069cd8 = 0x00000000;
u32 var80069cdc = 0x00000000;
u32 var80069ce0 = 0x00000000;
u32 var80069ce4 = 0x00000000;
u32 var80069ce8 = 0x00000000;
u32 var80069cec = 0x00000000;
u32 var80069cf0 = 0x00000000;
u32 var80069cf4 = 0x00000000;
u32 var80069cf8 = 0x00000000;
u32 var80069cfc = 0x00000000;
u32 var80069d00 = 0x00000000;
u32 var80069d04 = 0x00000000;
u32 var80069d08 = 0x00000001;
u32 var80069d0c = 0x00000003;
u32 var80069d10 = 0x00000000;
u32 var80069d14 = 0x00000000;
u32 var80069d18 = 0x00000000;
u32 var80069d1c = 0x00000000;
u32 var80069d20 = 0x00000000;
u32 var80069d24 = 0x00000000;
u32 var80069d28 = 0x00000000;
u32 var80069d2c = 0x00000000;
u32 var80069d30 = 0x00000000;
u32 var80069d34 = 0x00000000;
u32 var80069d38 = 0x00000000;
u32 var80069d3c = 0x00000000;
u32 var80069d40 = 0x00000000;
u32 var80069d44 = 0x00000000;
u32 var80069d48 = 0x00000001;
u32 var80069d4c = 0x00000003;
u32 var80069d50 = 0x00000000;
u32 var80069d54 = 0x00000000;
u32 var80069d58 = 0x00000000;
u32 var80069d5c = 0x00000000;
u32 var80069d60 = 0x00000000;
u32 var80069d64 = 0x00000000;
u32 var80069d68 = 0x00000000;
u32 var80069d6c = 0x00000000;
u32 var80069d70 = 0x00000000;
u32 var80069d74 = 0x00000000;
u32 var80069d78 = 0x00000000;
u32 var80069d7c = 0x00000000;
u32 var80069d80 = 0x00000000;
u32 var80069d84 = 0x00000000;
u32 var80069d88 = 0x00000000;
u32 var80069d8c = 0x00000000;
u32 var80069d90 = 0x00000007;
u32 var80069d94 = 0x0000001d;
u32 var80069d98 = 0x0000000d;

View File

@ -3813,7 +3813,7 @@ glabel func0f06302c
/* f063558: 54610006 */ bnel $v1,$at,.L0f063574
/* f06355c: 24010007 */ addiu $at,$zero,0x7
.L0f063560:
/* f063560: 0fc1f9d6 */ jal func0f07e758
/* f063560: 0fc1f9d6 */ jal objTick
/* f063564: 02002025 */ or $a0,$s0,$zero
/* f063568: 10000017 */ beqz $zero,.L0f0635c8
/* f06356c: 00403025 */ or $a2,$v0,$zero
@ -3965,7 +3965,7 @@ glabel func0f06302c
/* f06377c: 93189884 */ lbu $t8,%lo(var80069884)($t8)
/* f063780: 57000006 */ bnezl $t8,.L0f06379c
/* f063784: 860d0002 */ lh $t5,0x2($s0)
/* f063788: 0fc1f9d6 */ jal func0f07e758
/* f063788: 0fc1f9d6 */ jal objTick
/* f06378c: 02002025 */ or $a0,$s0,$zero
/* f063790: 10000027 */ beqz $zero,.L0f063830
/* f063794: 00403025 */ or $a2,$v0,$zero

View File

@ -4622,12 +4622,12 @@ glabel var7f1ad5dc
/* f0ba340: 8c680000 */ lw $t0,0x0($v1)
/* f0ba344: 8e690034 */ lw $t1,0x34($s3)
/* f0ba348: 86460000 */ lh $a2,0x0($s2)
/* f0ba34c: 3c0d8006 */ lui $t5,%hi(var8005f00c)
/* f0ba34c: 3c0d8006 */ lui $t5,%hi(g_Anims)
/* f0ba350: 01095021 */ addu $t2,$t0,$t1
/* f0ba354: 000a6083 */ sra $t4,$t2,0x2
/* f0ba358: ac6a0000 */ sw $t2,0x0($v1)
/* f0ba35c: ae0c0000 */ sw $t4,0x0($s0)
/* f0ba360: 8dadf00c */ lw $t5,%lo(var8005f00c)($t5)
/* f0ba360: 8dadf00c */ lw $t5,%lo(g_Anims)($t5)
/* f0ba364: 00067080 */ sll $t6,$a2,0x2
/* f0ba368: 01c67023 */ subu $t6,$t6,$a2
/* f0ba36c: 000e7080 */ sll $t6,$t6,0x2
@ -13806,7 +13806,7 @@ glabel func0f0c1ff4
*/
void propPlayerGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin)
{
u32 playernum = propGetPlayerNum(prop);
s32 playernum = propGetPlayerNum(prop);
*width = g_Vars.players[playernum]->bond2.width;
*ymin = g_Vars.currentplayer->vv_manground + 30;

View File

@ -736,7 +736,7 @@ bool threatCheckCmpFollow(struct threat *threat, s32 index)
}
}
if ((threat->prop->flags & PROPFLAG_REDBOXABLE)
if ((threat->prop->flags & PROPFLAG_02)
&& (chr->chrflags & CHRCFLAG_NOAUTOAIM) == 0) {
struct model *model = chr->model;
sp72 = -1;
@ -752,7 +752,7 @@ bool threatCheckCmpFollow(struct threat *threat, s32 index)
return false;
case PROPTYPE_OBJ:
case PROPTYPE_WEAPON:
if (threat->prop->flags & PROPFLAG_REDBOXABLE) {
if (threat->prop->flags & PROPFLAG_02) {
struct defaultobj *obj = threat->prop->obj;
struct model *model = obj->model;
sp72 = -1;
@ -1115,7 +1115,7 @@ glabel var7f1b784c
// }
//
// if (prop->obj
// && (prop->flags & PROPFLAG_REDBOXABLE)
// && (prop->flags & PROPFLAG_02)
// && (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_WEAPON)
// && condition) {
// pass = false;
@ -1429,7 +1429,7 @@ glabel func0f168f24
//
// for (i = 0; i != 4; i++) {
// if (g_Vars.currentplayer->cmpfollowprops[i].prop == prop
// && (prop->flags & PROPFLAG_REDBOXABLE)) {
// && (prop->flags & PROPFLAG_02)) {
// model = NULL;
//
// if (prop->type == PROPTYPE_OBJ

File diff suppressed because it is too large Load Diff

View File

@ -632,6 +632,8 @@
#define GAILIST_INIT_SEARCH 0x002c // unused
#define GAILIST_INVINCIBLE_AND_IDLE 0x002d
#define GEOTYPE_2 2
#define HANGARBIO_INSTITUTE 0
#define HANGARBIO_DDTOWER 1
#define HANGARBIO_LABBASEMENT 2
@ -1872,38 +1874,38 @@
#define NUM_WEAPONS 94
// obj->flags
#define OBJFLAG_00000001 0x00000001 // Editor: "Fall to Ground"
#define OBJFLAG_00000002 0x00000002 // Editor: "In Air Rotated 90 Deg Upside-Down"
#define OBJFLAG_00000004 0x00000004 // Editor: "In Air Upside-Down"
#define OBJFLAG_00000008 0x00000008 // Editor: "In Air"
#define OBJFLAG_00000010 0x00000010 // Editor: "Scale to Pad Bounds"
#define OBJFLAG_00000020 0x00000020 // Editor: "X to Pad Bounds"
#define OBJFLAG_00000040 0x00000040 // Editor: "Y to Pad Bounds"
#define OBJFLAG_00000080 0x00000080 // Editor: "Z to Pad Bounds"
#define OBJFLAG_00000100 0x00000100 // G5 mines, Air Base brown door, AF1 grate and escape door, Defense shuttle, Ruins mines, MBR lift door. Editor suggests "Force Collisions" but this seems wrong
#define OBJFLAG_00000200 0x00000200 // Editor: "Special Environment Mapping"
#define OBJFLAG_ILLUMINATED 0x00000400
#define OBJFLAG_00000800 0x00000800 // Editor: "Free Standing Glass"
#define OBJFLAG_00001000 0x00001000 // Editor: "Absolute Position"
#define OBJFLAG_00002000 0x00002000 // AF1 commhubs. Editor suggests "Weapon Not Dropped"
#define OBJFLAG_00004000 0x00004000 // Editor: "Assigned to Actor"
#define OBJFLAG_00008000 0x00008000 // Editor: "Embedded Object"
#define OBJFLAG_00010000 0x00010000 // Not used in scripts
#define OBJFLAG_INVINCIBLE 0x00020000
#define OBJFLAG_COLLECTABLE 0x00040000
#define OBJFLAG_00080000 0x00080000 // Thrown laptop?
#define OBJFLAG_UNCOLLECTABLE 0x00100000
#define OBJFLAG_00200000 0x00200000 // Editor: "Bounce and Destroy If Shot"
#define OBJFLAG_00400000 0x00400000 // Not used in scripts
#define OBJFLAG_00800000 0x00800000 // Not used in scripts
#define OBJFLAG_01000000 0x01000000 // Editor: "Embedded Object"
#define OBJFLAG_CANNOT_ACTIVATE 0x02000000 // Makes it do nothing if player presses B on object. Used mostly for doors.
#define OBJFLAG_04000000 0x04000000 // Editor: "AI Sees Through Door/Object"
#define OBJFLAG_08000000 0x08000000 // Not used in scripts
#define OBJFLAG_DEACTIVATED 0x10000000
#define OBJFLAG_20000000 0x20000000 // Editor: "Door Opens Backwards/Special Function/Conceal Weapon"
#define OBJFLAG_DOORKEEPOPEN 0x40000000 // Editor: "Door open by default/Empty weapon"
#define OBJFLAG_INTERCEPTOR_DISABLED 0x80000000 // Or lift disabled
#define OBJFLAG_00000001 0x00000001 // Editor: "Fall to Ground"
#define OBJFLAG_00000002 0x00000002 // Editor: "In Air Rotated 90 Deg Upside-Down"
#define OBJFLAG_00000004 0x00000004 // Editor: "In Air Upside-Down"
#define OBJFLAG_00000008 0x00000008 // Editor: "In Air"
#define OBJFLAG_00000010 0x00000010 // Editor: "Scale to Pad Bounds"
#define OBJFLAG_00000020 0x00000020 // Editor: "X to Pad Bounds"
#define OBJFLAG_00000040 0x00000040 // Editor: "Y to Pad Bounds"
#define OBJFLAG_00000080 0x00000080 // Editor: "Z to Pad Bounds"
#define OBJFLAG_00000100 0x00000100 // G5 mines, Air Base brown door, AF1 grate and escape door, Defense shuttle, Ruins mines, MBR lift door. Editor suggests "Force Collisions" but this seems wrong
#define OBJFLAG_00000200 0x00000200 // Editor: "Special Environment Mapping"
#define OBJFLAG_ILLUMINATED 0x00000400
#define OBJFLAG_00000800 0x00000800 // Editor: "Free Standing Glass"
#define OBJFLAG_00001000 0x00001000 // Editor: "Absolute Position"
#define OBJFLAG_00002000 0x00002000 // AF1 commhubs. Editor suggests "Weapon Not Dropped"
#define OBJFLAG_00004000 0x00004000 // Editor: "Assigned to Actor"
#define OBJFLAG_00008000 0x00008000 // Editor: "Embedded Object"
#define OBJFLAG_00010000 0x00010000 // Not used in scripts
#define OBJFLAG_INVINCIBLE 0x00020000
#define OBJFLAG_COLLECTABLE 0x00040000
#define OBJFLAG_00080000 0x00080000 // Thrown laptop?
#define OBJFLAG_UNCOLLECTABLE 0x00100000
#define OBJFLAG_00200000 0x00200000 // Editor: "Bounce and Destroy If Shot"
#define OBJFLAG_00400000 0x00400000 // Not used in scripts
#define OBJFLAG_00800000 0x00800000 // Not used in scripts
#define OBJFLAG_01000000 0x01000000 // Editor: "Embedded Object"
#define OBJFLAG_CANNOT_ACTIVATE 0x02000000 // Makes it do nothing if player presses B on object. Used mostly for doors.
#define OBJFLAG_04000000 0x04000000 // Editor: "AI Sees Through Door/Object"
#define OBJFLAG_08000000 0x08000000 // Not used in scripts
#define OBJFLAG_DEACTIVATED 0x10000000
#define OBJFLAG_20000000 0x20000000 // Editor: "Door Opens Backwards/Special Function/Conceal Weapon"
#define OBJFLAG_DOORKEEPOPEN 0x40000000 // Editor: "Door open by default/Empty weapon"
#define OBJFLAG_CHOPPER_INACTIVE 0x80000000 // Or lift disabled
// obj->flags2
#define OBJFLAG2_00000001 0x00000001 // Used only in CI Training
@ -1975,9 +1977,11 @@
// obj->hidden
#define OBJHFLAG_00000004 0x00000004
#define OBJHFLAG_00000008 0x00000008
#define OBJHFLAG_00000010 0x00000010
#define OBJHFLAG_00000040 0x00000040
#define OBJHFLAG_00000080 0x00000080
#define OBJHFLAG_00000100 0x00000100
#define OBJHFLAG_00000200 0x00000200
#define OBJHFLAG_00000400 0x00000400
#define OBJHFLAG_00000800 0x00000800
@ -2177,10 +2181,11 @@
#define PORTALMODE_SHOW 0
#define PORTALMODE_HIDE 1
#define PROPFLAG_REDBOXABLE 0x02
#define PROPFLAG_HIDDEN 0x04
#define PROPFLAG_40 0x40
#define PROPFLAG_80 0x80
#define PROPFLAG_02 0x02
#define PROPFLAG_HIDDEN 0x04
#define PROPFLAG_08 0x08
#define PROPFLAG_40 0x40
#define PROPFLAG_80 0x80
#define PROPTYPE_OBJ 1
#define PROPTYPE_DOOR 2

View File

@ -135,7 +135,7 @@ extern u32 var8005efd0;
extern u32 var8005efe0;
extern u32 var8005efec;
extern u32 var8005f008;
extern u32 var8005f00c;
extern struct animheader *g_Anims;
extern u32 var8005f010;
extern u32 var8005f014;
extern u32 var8005f018;

View File

@ -52,7 +52,7 @@ u32 func0f065d1c(void);
u32 func0f065dd8(void);
u32 func0f065dfc(void);
void func0f065e74(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms);
u32 func0f065e98(void);
void func0f065e98(struct coord *pos, s16 *rooms, struct coord *pos2, s16 *rooms2);
void roomGetProps(s16 *room, s16 *propnums, u32 size);
u32 func0f066054(void);
void propGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin);

View File

@ -7,7 +7,7 @@ u32 xorBaffbeff(u32 value);
u32 xorBabeffff(u32 value);
u32 xorBoobless(u32 value);
void func0f0953cc(void);
u32 func0f095560(void);
s32 func0f095560(struct defaultobj *obj);
s32 objectiveGetCount(void);
u32 objectiveGetDifficultyBits(s32 index);
u32 objectiveGetStatus(u32 arg0);

View File

@ -11,6 +11,6 @@ void modelFree(struct model *model);
struct model *func0f0b3280(void *modelfiledata);
u32 func0f0b32a0(void);
struct anim *func0f0b32e4(void);
u32 func0f0b3338(void);
void func0f0b3338(struct anim *anim);
#endif

View File

@ -8,7 +8,7 @@ void playersUnrefAll(void);
void playersAllocate(s32 count);
void playerAllocate(u32 index);
void currentPlayerCalculateAiBuddyNums(void);
u32 propGetPlayerNum(struct prop *prop);
s32 propGetPlayerNum(struct prop *prop);
void currentPlayerSetViewSize(s32 viewx, s32 viewy);
void currentPlayerSetViewPosition(s32 viewleft, s32 viewtop);
void currentPlayerSetFovY(f32 fovy);

View File

@ -24,7 +24,7 @@ u32 func0f167964(void);
u32 func0f167998(void);
u32 func0f1679b0(void);
u32 func0f1679cc(void);
void func0f1679f4(s32 arg0);
struct model0c *func0f1679f4(s32 arg0);
u32 func0f167a18(void);
#endif

View File

@ -74,8 +74,8 @@ u32 func0f068b14(void);
u32 func0f068c04(void);
u32 func0f068fc8(void);
void func0f069144(struct prop *prop, u8 *nextcol, u16 floorcol);
u32 func0f069630(void);
void func0f069710(u8 *gunshadecol, u8 *nextcol);
void func0f069630(struct prop *prop, u8 *nextcol, u16 floorcol);
void func0f069710(u8 *shadecol, u8 *nextcol);
u32 func0f069750(void);
u32 func0f069850(void);
u32 func0f069b4c(void);
@ -88,7 +88,7 @@ u32 func0f06a1ec(void);
u32 func0f06a52c(void);
u32 func0f06a550(void);
u32 func0f06a580(void);
u32 func0f06a620(void);
f32 func0f06a620(struct defaultobj *obj);
void func0f06a730(struct defaultobj *obj, struct pad *newpad, f32 *matrix, s16 *arg3, struct pad *arg4);
u32 func0f06ab60(void);
void func0f06ac40(struct defaultobj *obj);
@ -118,10 +118,10 @@ u32 func0f06f0a0(void);
u32 func0f06f314(void);
u32 func0f06f504(void);
u32 func0f06f54c(void);
u32 func0f07063c(void);
u32 func0f070698(void);
u32 func0f0706f8(void);
u32 func0f07079c(void);
void func0f07063c(struct prop *prop, bool arg1);
void func0f070698(struct prop *prop, bool arg1);
void func0f0706f8(struct prop *prop, bool arg1);
void func0f07079c(struct prop *prop, bool arg1);
u32 func0f07092c(void);
u32 func0f070a1c(void);
u32 func0f070bd0(void);
@ -129,14 +129,14 @@ u32 func0f070ca0(void);
void liftActivate(struct prop *prop, u8 liftnum);
struct prop *liftFindByPad(s16 padnum);
u32 func0f070eac(void);
u32 func0f070f08(void);
void func0f070f08(struct liftobj *lift, u32 arg0);
void liftGoToStop(struct liftobj *lift, s32 stopnum);
u32 func0f071360(void);
u32 func0f0713e4(void);
void func0f0713e4(struct defaultobj *obj, struct hov *hov, struct coord *coord, s16 *rooms, f32 *matrix);
u32 func0f0714b8(void);
u32 func0f0720b4(void);
f32 func0f0720d8(struct defaultobj *obj);
u32 func0f072110(void);
void func0f072110(struct defaultobj *obj, f32 angle);
u32 func0f072144(void);
u32 func0f072650(void);
u32 func0f0726ec(void);
@ -146,20 +146,20 @@ u32 func0f072adc(void);
u32 func0f0732d4(void);
u32 func0f073478(void);
u32 func0f073ae8(void);
u32 func0f073c6c(void);
u32 func0f073c6c(struct defaultobj *obj, bool *arg1);
void doorTick(struct prop *doorprop);
u32 func0f07731c(void);
void func0f07731c(struct prop *door, s32 playercount);
u32 func0f077448(void);
u32 func0f07766c(void);
u32 func0f077c10(void);
u32 func0f078094(void);
u32 func0f0782ac(void);
void cameraTick(struct prop *camera);
u32 func0f078930(void);
u32 func0f078a2c(void);
u32 func0f078be0(void);
u32 func0f078c78(void);
void ventfanTick(struct prop *ventfan);
void func0f078be0(struct prop *ventfan);
void autogunTick(struct prop *autogun);
u32 func0f079ca4(void);
u32 func0f079f1c(void);
void func0f079f1c(struct prop *autogun);
u32 func0f07accc(void);
struct chopperobj *chopperFromHovercar(struct chopperobj *obj);
bool chopperCheckTargetInFov(struct chopperobj *hovercar, u8 param_2);
@ -175,21 +175,21 @@ u32 func0f07b164(void);
u32 chopperFireRocket(struct chopperobj *obj, u32 arg1);
u32 func0f07b3f0(void);
u32 func0f07ba38(void);
u32 func0f07c12c(void);
u32 func0f07c7b0(void);
u32 func0f07c830(void);
u32 func0f07cacc(void);
u32 func0f07d1e4(void);
u32 func0f07df74(void);
u32 func0f07dfd0(void);
u32 func0f07e058(void);
u32 func0f07e0b8(void);
void chopperTickAttackMode2(struct prop *chopper);
void func0f07c7b0(struct prop *chopper);
void chopperTickAttackMode0(struct prop *chopper);
void chopperTickAttackMode1(struct prop *chopper);
void hovercarTick(struct prop *hovercar);
void hoverpropTick(struct prop *hoverprop, s32 arg1);
void hoverbikeTick(struct prop *hoverbike, s32 arg1);
void func0f07e058(struct prop *prop);
void func0f07e0b8(struct prop *glass, s32 playercount, u32 *arg2);
u32 func0f07e184(void);
u32 func0f07e1fc(void);
u32 func0f07e2cc(void);
void func0f07e2cc(struct prop *prop);
u32 func0f07e468(void);
u32 func0f07e474(void);
u32 func0f07e758(void);
s32 objTick(struct prop *prop);
u32 func0f07f6d0(void);
u32 func0f07f918(void);
u32 imageSlotSetImage(struct image *image, u32 arg1, struct defaultobj *obj);
@ -231,7 +231,7 @@ u32 func0f0869cc(void);
bool currentPlayerTryMountHoverbike(struct prop *prop);
bool propobjInteract(struct prop *prop);
void propObjSetOrUnsetHiddenFlag00400000(struct prop *prop, bool enable);
u32 func0f087458(void);
bool func0f087458(struct prop *prop, struct geo **geos, u32 *arg2);
void propObjGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin);
void ammotypeGetPickedUpText(char *dst);
void ammotypeGetDeterminer(char *dst, s32 ammotype, s32 qty);
@ -313,7 +313,7 @@ s32 doorIsOpen(struct doorobj *door);
u32 func0f08e5a8(void);
u32 func0f08e6bc(void);
u32 func0f08e794(void);
u32 func0f08e8ac(void);
bool func0f08e8ac(struct prop *prop, struct coord *coord, f32 arg2, u32 arg3);
bool func0f08e9e4(struct coord *arg);
void func0f08ea50(struct doorobj *door);
bool func0f08ed74(struct doorobj *door);

View File

@ -5,13 +5,13 @@
void func000159b0(f32 *matrix);
void func000159fc(f32 *matrix, f32 *arg1);
u32 func00015a00(void);
void func00015a00(f32 *matrix, f32 *arg1, f32 *arg2);
void func00015b10(f32 *matrix, struct coord *coord);
void func00015b14(f32 *matrix, struct coord *coord, s32 arg2);
void func00015b64(f32 *arg0, struct coord *coord);
void func00015b68(f32 *matrix, f32 *arg1, struct coord *arg2);
void func00015be0(f32 *matrix1, f32 *matrix2);
u32 func00015be4(void);
void func00015be4(u32 arg0, struct model0c *model0c, f32 *arg2);
u32 func00015cd8(void);
u32 func00015d18(void);
void func00015d54(f32 *realrot, f32 *matrix);

View File

@ -32,7 +32,7 @@ u32 func0001af98(void);
f32 func0001afe8(f32 arg0, f32 distance, f32 arg2);
u32 func0001b07c(void);
u32 func0001b0e8(void);
u32 func0001b3bc(void);
void func0001b3bc(struct model *model);
u32 func0001b400(void);
u32 func0001b80c(void);
u32 func0001bc14(void);
@ -45,11 +45,11 @@ u32 func0001c81c(void);
u32 func0001c868(void);
u32 func0001c924(void);
u32 func0001c950(void);
u32 func0001cb0c(void);
void func0001cb0c(struct model *model, struct model08_00 *arg1);
u32 func0001cc20(void);
u32 func0001cd18(void);
u32 func0001ce64(void);
u32 func0001cebc(void);
void func0001cebc(struct objticksp476 *arg0, struct model *model);
u32 modelGetAnimNum(struct model *model);
bool modelIsFlipped(struct model *model);
f32 modelGetCurAnimFrame(struct model *model);
@ -76,7 +76,7 @@ u32 func0001e14c(void);
u32 func0001e29c(void);
u32 func0001e2a8(void);
u32 func0001e2b4(void);
u32 func0001ee18(void);
void func0001ee18(struct model *model, s32 lvupdate240, bool arg2);
u32 func0001f314(void);
u32 func0001f7e0(void);
u32 func0001f890(void);

View File

@ -10,17 +10,17 @@ s32 modelGetNumAnimFrames(s16 anim_id);
u32 func00023794(void);
u32 func000237dc(void);
u32 func000237e8(void);
u32 func0002384c(void);
s32 func0002384c(s32 animnum, s32 frame);
u32 func00023908(void);
u32 func000239e0(void);
u32 func00023ab0(void);
u32 func00023d0c(void);
u32 func00023d38(void);
void func00023d38(s32 animnum);
u32 func00023f50(void);
u32 func00023fe0(void);
u32 func00024050(void);
u32 func0002485c(void);
u32 func00024b64(void);
f32 func00024b64(u32 arg0, u32 arg1, struct stagethinglist *arg2, s32 animnum, u32 arg4, struct coord *coord, u32 arg6);
u32 func00024c14(void);
u32 func00024e40(void);
void func00024e4c(struct coord *arg0, struct coord *arg1, u32 line, char *file);
@ -78,8 +78,8 @@ f32 func000296a0(u32 *arg0, struct coord *pos, struct tilething **arg2, f32 widt
bool func00029ffc(struct coord *pos, f32 width, f32 foreheadheight, f32 inversefeettoeyesheight, s16 *rooms, u32 arg5, struct coord *laddernormal);
u32 func0002a13c(void);
f32 coordFindGroundY(struct coord *pos, f32 width, s16 *rooms, u16 *floorcol, u8 *floortype, u16 *floorflags, s16 *floorroom, s32 *inlift, struct prop **lift);
f32 func0002a330(struct coord *pos, f32 width, s16 *rooms, s32 arg3, s32 arg4);
f32 func0002a36c(struct coord *coord, s16 *arg1, s32 arg2, s32 arg3);
f32 func0002a330(struct coord *pos, f32 width, s16 *rooms, u16 *floorcol, s32 arg4);
f32 func0002a36c(struct coord *coord, s16 *rooms, u16 *floorcol, s32 arg3);
u32 func0002a400(void);
u32 func0002a440(void);
u32 func0002a4d0(void);
@ -120,7 +120,7 @@ u32 func0002deac(void);
u32 func0002ded8(void);
u32 func0002dffc(void);
u32 func0002e278(void);
u32 func0002e4c4(void);
bool func0002e4c4(struct geo *geo, s16 *rooms, u32 arg2);
u32 func0002e680(void);
u32 func0002e82c(void);
u32 func0002e9d8(void);

View File

@ -278,7 +278,7 @@
effect, \
pad,
#define armed_vehicle(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34, u35, u36, u37, u38, u39, u40, u41, u42, u43, u44, u45, u46, u47, u48, u49, u50, u51, u52, u53, u54) \
#define chopper(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34, u35, u36, u37, u38, u39, u40, u41, u42, u43, u44, u45, u46, u47, u48, u49, u50, u51, u52, u53, u54) \
_generic_object(0x39, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
u20, u21, u22, u23, \
u24, u25, u26, u27, \

View File

@ -91,8 +91,8 @@ struct anim {
/*0x0b*/ u8 average;
/*0x0c*/ f32 frame;
/*0x10*/ u32 frac;
/*0x14*/ u16 framea;
/*0x16*/ u16 frameb;
/*0x14*/ s16 framea;
/*0x16*/ s16 frameb;
/*0x18*/ u32 endrame;
/*0x1c*/ u32 speed;
/*0x20*/ u32 newspeed;
@ -133,11 +133,33 @@ struct stagethinglist {
struct model08_00 {
u16 unk00;
u32 unk04;
};
struct model08 {
struct model08_00 *unk00;
struct stagethinglist *unk04;
u32 unk08;
u16 unk0c;
s16 unk0e;
};
struct model0c {
/*0x00*/ u32 unk00;
/*0x04*/ u32 unk04;
/*0x08*/ u32 unk08;
/*0x0c*/ u32 unk0c;
/*0x10*/ u32 unk10;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x24*/ u32 unk24;
/*0x28*/ u32 unk28;
/*0x2c*/ u32 unk2c;
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ f32 unk38;
};
struct model10 {
@ -150,7 +172,7 @@ struct model {
/*0x01*/ u8 unk01;
/*0x04*/ struct chrdata *chr;
/*0x08*/ struct model08 *unk08;
/*0x0c*/ u32 unk0c;
/*0x0c*/ struct model0c *unk0c;
/*0x10*/ struct model10 *unk10;
/*0x14*/ f32 unk14;
/*0x18*/ u32 unk18;
@ -560,7 +582,7 @@ struct act_skjump {
};
struct geo {
/*0x134*/ s8 type;
/*0x134*/ u8 type;
/*0x135*/ u8 unk01;
/*0x136*/ u16 unk136;
/*0x138*/ f32 ymax;
@ -810,7 +832,7 @@ struct obj48 {
/*0x07c*/ u32 unk07c;
/*0x080*/ u32 unk080;
/*0x084*/ u32 unk084;
/*0x088*/ u32 unk088;
/*0x088*/ struct prop *unk088;
/*0x08c*/ u32 unk08c;
/*0x090*/ u32 unk090;
/*0x094*/ u32 unk094;
@ -842,21 +864,22 @@ struct obj48 {
/*0x105*/ u8 unk105;
};
// I get the feeling this struct might be a regular f32 matrix...
struct hov {
/*0x00*/ u32 unk00;
/*0x04*/ u32 unk04;
/*0x04*/ f32 unk04;
/*0x08*/ u32 unk08;
/*0x0c*/ u32 unk0c;
/*0x0c*/ f32 unk0c;
/*0x10*/ f32 unk10;
/*0x14*/ f32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x1c*/ f32 unk1c;
/*0x20*/ f32 unk20;
/*0x24*/ u32 unk24;
/*0x28*/ u32 unk28;
/*0x28*/ f32 unk28;
/*0x2c*/ u32 unk2c;
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x30*/ f32 unk30;
/*0x34*/ f32 unk34;
/*0x38*/ u32 unk38;
/*0x3c*/ u32 unk3c;
};
@ -878,8 +901,8 @@ struct defaultobj {
/*0x48*/ struct obj48 *unk48;
/*0x4c*/ s16 damage;
/*0x4e*/ s16 maxdamage;
/*0x50*/ u32 shadecol;
/*0x54*/ u32 nextcol;
/*0x50*/ u8 shadecol[4];
/*0x54*/ u8 nextcol[4];
/*0x58*/ u16 floorcol;
/*0x5a*/ u8 numtiles;
};
@ -914,7 +937,7 @@ struct doorobj { // objtype 0x01
/*0xb8*/ u32 unkb8;
/*0xbc*/ struct doorobj *sibling;
/*0xc0*/ s32 lastopen60;
/*0xc4*/ s16 portal;
/*0xc4*/ s16 portalnum;
/*0xc6*/ s8 soundtype;
/*0xc7*/ s8 fadetime60;
/*0xc8*/ s32 lastcalc60;
@ -1053,6 +1076,13 @@ struct heliobj {
/*0x7c*/ f32 speedtime60;
};
struct tintedglassobj { // objtype 2f
struct defaultobj base;
/*0x5c*/ u32 unk5c;
/*0x60*/ u16 unk60;
/*0x62*/ s16 portalnum;
};
struct liftobj { // objtype 30
struct defaultobj base;
/*0x5c*/ s16 pads[4];
@ -1135,6 +1165,8 @@ struct chopperobj {
/*0xd4*/ f32 gunrotx;
/*0xd8*/ f32 barrelrotspeed;
/*0xdc*/ f32 barrelrot;
/*0xdc*/ u32 unke0;
/*0xe4*/ bool dead;
};
struct tag {
@ -5802,4 +5834,40 @@ struct modelthing {
/*0x16*/ u16 unk16;
};
struct g_Anims {
u32 unk00;
u32 unk04;
u16 unk08;
u8 unk0a;
u8 unk0b;
};
struct animheader {
/*0x00*/ u16 numframes;
/*0x02*/ u16 framelen; // in bytes
/*0x04*/ u8 *data;
/*0x08*/ u16 initialposbytes;
/*0x0a*/ u8 initiaposbitsperentry;
/*0x0b*/ u8 flags;
};
struct objticksp476 {
/*0x00*/ f32 *matrix;
/*0x04*/ u32 unk04;
/*0x08*/ u32 unk08;
/*0x0c*/ u32 unk0c;
/*0x10*/ struct model0c *model0c;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x24*/ u32 unk24;
/*0x28*/ u32 unk28;
/*0x2c*/ u32 unk2c;
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ u32 unk38;
/*0x3c*/ u32 unk3c;
};
#endif

View File

@ -2707,8 +2707,8 @@ glabel func00018680
/* 18744: 000b5880 */ sll $t3,$t3,0x2
/* 18748: 018b6020 */ add $t4,$t4,$t3
/* 1874c: 8d8a0000 */ lw $t2,0x0($t4)
/* 18750: 3c0c8006 */ lui $t4,%hi(var8005f00c)
/* 18754: 258cf00c */ addiu $t4,$t4,%lo(var8005f00c)
/* 18750: 3c0c8006 */ lui $t4,%hi(g_Anims)
/* 18754: 258cf00c */ addiu $t4,$t4,%lo(g_Anims)
/* 18758: 8d8c0000 */ lw $t4,0x0($t4)
/* 1875c: 000d6880 */ sll $t5,$t5,0x2
/* 18760: 01ad7020 */ add $t6,$t5,$t5
@ -2760,8 +2760,8 @@ glabel func00018680
/* 18814: 000b5880 */ sll $t3,$t3,0x2
/* 18818: 018b6020 */ add $t4,$t4,$t3
/* 1881c: 8d8a0000 */ lw $t2,0x0($t4)
/* 18820: 3c0c8006 */ lui $t4,%hi(var8005f00c)
/* 18824: 258cf00c */ addiu $t4,$t4,%lo(var8005f00c)
/* 18820: 3c0c8006 */ lui $t4,%hi(g_Anims)
/* 18824: 258cf00c */ addiu $t4,$t4,%lo(g_Anims)
/* 18828: 8d8c0000 */ lw $t4,0x0($t4)
/* 1882c: 000d6880 */ sll $t5,$t5,0x2
/* 18830: 01ad7020 */ add $t6,$t5,$t5
@ -2802,8 +2802,8 @@ glabel func00018680
/* 188b8: 000b5880 */ sll $t3,$t3,0x2
/* 188bc: 018b6020 */ add $t4,$t4,$t3
/* 188c0: 8d8a0000 */ lw $t2,0x0($t4)
/* 188c4: 3c0c8006 */ lui $t4,%hi(var8005f00c)
/* 188c8: 258cf00c */ addiu $t4,$t4,%lo(var8005f00c)
/* 188c4: 3c0c8006 */ lui $t4,%hi(g_Anims)
/* 188c8: 258cf00c */ addiu $t4,$t4,%lo(g_Anims)
/* 188cc: 8d8c0000 */ lw $t4,0x0($t4)
/* 188d0: 000d6880 */ sll $t5,$t5,0x2
/* 188d4: 01ad7020 */ add $t6,$t5,$t5
@ -2847,8 +2847,8 @@ glabel func00018680
/* 1896c: 000b5880 */ sll $t3,$t3,0x2
/* 18970: 018b6020 */ add $t4,$t4,$t3
/* 18974: 8d8a0000 */ lw $t2,0x0($t4)
/* 18978: 3c0c8006 */ lui $t4,%hi(var8005f00c)
/* 1897c: 258cf00c */ addiu $t4,$t4,%lo(var8005f00c)
/* 18978: 3c0c8006 */ lui $t4,%hi(g_Anims)
/* 1897c: 258cf00c */ addiu $t4,$t4,%lo(g_Anims)
/* 18980: 8d8c0000 */ lw $t4,0x0($t4)
/* 18984: 000d6880 */ sll $t5,$t5,0x2
/* 18988: 01ad7020 */ add $t6,$t5,$t5

View File

@ -1612,9 +1612,9 @@ glabel func0001b400
/* 1b634: 860d0000 */ lh $t5,0x0($s0)
.L0001b638:
/* 1b638: 2403000c */ addiu $v1,$zero,0xc
/* 1b63c: 3c028006 */ lui $v0,%hi(var8005f00c)
/* 1b63c: 3c028006 */ lui $v0,%hi(g_Anims)
/* 1b640: 01a30019 */ multu $t5,$v1
/* 1b644: 8c42f00c */ lw $v0,%lo(var8005f00c)($v0)
/* 1b644: 8c42f00c */ lw $v0,%lo(g_Anims)($v0)
/* 1b648: 27a40124 */ addiu $a0,$sp,0x124
/* 1b64c: 00007012 */ mflo $t6
/* 1b650: 004e7821 */ addu $t7,$v0,$t6
@ -1670,8 +1670,8 @@ glabel func0001b400
/* 1b70c: 27a501d8 */ addiu $a1,$sp,0x1d8
/* 1b710: 86180000 */ lh $t8,0x0($s0)
.L0001b714:
/* 1b714: 3c0f8006 */ lui $t7,%hi(var8005f00c)
/* 1b718: 8deff00c */ lw $t7,%lo(var8005f00c)($t7)
/* 1b714: 3c0f8006 */ lui $t7,%hi(g_Anims)
/* 1b718: 8deff00c */ lw $t7,%lo(g_Anims)($t7)
/* 1b71c: 0018c880 */ sll $t9,$t8,0x2
/* 1b720: 0338c823 */ subu $t9,$t9,$t8
/* 1b724: 0019c880 */ sll $t9,$t9,0x2
@ -2292,7 +2292,7 @@ glabel func0001bfa8
/* 1bfd0: 52000154 */ beqzl $s0,.L0001c524
/* 1bfd4: 8dc50008 */ lw $a1,0x8($t6)
/* 1bfd8: 95f9000c */ lhu $t9,0xc($t7)
/* 1bfdc: 3c098006 */ lui $t1,%hi(var8005f00c)
/* 1bfdc: 3c098006 */ lui $t1,%hi(g_Anims)
/* 1bfe0: 27b80144 */ addiu $t8,$sp,0x144
/* 1bfe4: afb90154 */ sw $t9,0x154($sp)
/* 1bfe8: 8ca20008 */ lw $v0,0x8($a1)
@ -2303,7 +2303,7 @@ glabel func0001bfa8
/* 1bffc: 27a80138 */ addiu $t0,$sp,0x138
/* 1c000: 10e0004e */ beqz $a3,.L0001c13c
/* 1c004: 00075080 */ sll $t2,$a3,0x2
/* 1c008: 8d29f00c */ lw $t1,%lo(var8005f00c)($t1)
/* 1c008: 8d29f00c */ lw $t1,%lo(g_Anims)($t1)
/* 1c00c: 01475023 */ subu $t2,$t2,$a3
/* 1c010: 000a5080 */ sll $t2,$t2,0x2
/* 1c014: 012a5821 */ addu $t3,$t1,$t2
@ -3715,11 +3715,11 @@ glabel func0001d320
/* 1d344: afa40020 */ sw $a0,0x20($sp)
/* 1d348: 3c188006 */ lui $t8,%hi(var8005efbc)
/* 1d34c: 8f18efbc */ lw $t8,%lo(var8005efbc)($t8)
/* 1d350: 3c198006 */ lui $t9,%hi(var8005f00c)
/* 1d350: 3c198006 */ lui $t9,%hi(g_Anims)
/* 1d354: 000f4080 */ sll $t0,$t7,0x2
/* 1d358: 17000008 */ bnez $t8,.L0001d37c
/* 1d35c: 00052400 */ sll $a0,$a1,0x10
/* 1d360: 8f39f00c */ lw $t9,%lo(var8005f00c)($t9)
/* 1d360: 8f39f00c */ lw $t9,%lo(g_Anims)($t9)
/* 1d364: 010f4023 */ subu $t0,$t0,$t7
/* 1d368: 00084080 */ sll $t0,$t0,0x2
/* 1d36c: 03284821 */ addu $t1,$t9,$t0
@ -3789,11 +3789,11 @@ glabel func0001d320
/* 1d454: 54200025 */ bnezl $at,.L0001d4ec
/* 1d458: 8fbf0014 */ lw $ra,0x14($sp)
/* 1d45c: 8d4aefbc */ lw $t2,%lo(var8005efbc)($t2)
/* 1d460: 3c0b8006 */ lui $t3,%hi(var8005f00c)
/* 1d460: 3c0b8006 */ lui $t3,%hi(g_Anims)
/* 1d464: 00056080 */ sll $t4,$a1,0x2
/* 1d468: 15400008 */ bnez $t2,.L0001d48c
/* 1d46c: 00052400 */ sll $a0,$a1,0x10
/* 1d470: 8d6bf00c */ lw $t3,%lo(var8005f00c)($t3)
/* 1d470: 8d6bf00c */ lw $t3,%lo(g_Anims)($t3)
/* 1d474: 01856023 */ subu $t4,$t4,$a1
/* 1d478: 000c6080 */ sll $t4,$t4,0x2
/* 1d47c: 016c6821 */ addu $t5,$t3,$t4
@ -3986,13 +3986,13 @@ glabel func0001d62c
/* 1d71c: 8d860004 */ lw $a2,0x4($t4)
/* 1d720: ac610000 */ sw $at,0x0($v1)
/* 1d724: 8db80004 */ lw $t8,0x4($t5)
/* 1d728: 3c198006 */ lui $t9,%hi(var8005f00c)
/* 1d728: 3c198006 */ lui $t9,%hi(g_Anims)
/* 1d72c: 00408025 */ or $s0,$v0,$zero
/* 1d730: ac780004 */ sw $t8,0x4($v1)
/* 1d734: 8da10008 */ lw $at,0x8($t5)
/* 1d738: ac610008 */ sw $at,0x8($v1)
/* 1d73c: 86270000 */ lh $a3,0x0($s1)
/* 1d740: 8f39f00c */ lw $t9,%lo(var8005f00c)($t9)
/* 1d740: 8f39f00c */ lw $t9,%lo(g_Anims)($t9)
/* 1d744: 00074080 */ sll $t0,$a3,0x2
/* 1d748: 01074023 */ subu $t0,$t0,$a3
/* 1d74c: 00084080 */ sll $t0,$t0,0x2
@ -4328,8 +4328,8 @@ glabel func0001dbfc
/* 1dc28: 50600016 */ beqzl $v1,.L0001dc84
/* 1dc2c: 8fad0038 */ lw $t5,0x38($sp)
/* 1dc30: 00650019 */ multu $v1,$a1
/* 1dc34: 3c028006 */ lui $v0,%hi(var8005f00c)
/* 1dc38: 8c42f00c */ lw $v0,%lo(var8005f00c)($v0)
/* 1dc34: 3c028006 */ lui $v0,%hi(g_Anims)
/* 1dc38: 8c42f00c */ lw $v0,%lo(g_Anims)($v0)
/* 1dc3c: 87a80026 */ lh $t0,0x26($sp)
/* 1dc40: 00007012 */ mflo $t6
/* 1dc44: 004e7821 */ addu $t7,$v0,$t6
@ -4387,8 +4387,8 @@ glabel func0001dccc
/* 1dcf8: 50600016 */ beqzl $v1,.L0001dd54
/* 1dcfc: 8fa50034 */ lw $a1,0x34($sp)
/* 1dd00: 00650019 */ multu $v1,$a1
/* 1dd04: 3c028006 */ lui $v0,%hi(var8005f00c)
/* 1dd08: 8c42f00c */ lw $v0,%lo(var8005f00c)($v0)
/* 1dd04: 3c028006 */ lui $v0,%hi(g_Anims)
/* 1dd08: 8c42f00c */ lw $v0,%lo(g_Anims)($v0)
/* 1dd0c: 87a80026 */ lh $t0,0x26($sp)
/* 1dd10: 00007012 */ mflo $t6
/* 1dd14: 004e7821 */ addu $t7,$v0,$t6
@ -4943,8 +4943,8 @@ glabel func0001e2b4
/* 1e454: 00403825 */ or $a3,$v0,$zero
.L0001e458:
/* 1e458: 86390000 */ lh $t9,0x0($s1)
/* 1e45c: 3c188006 */ lui $t8,%hi(var8005f00c)
/* 1e460: 8f18f00c */ lw $t8,%lo(var8005f00c)($t8)
/* 1e45c: 3c188006 */ lui $t8,%hi(g_Anims)
/* 1e460: 8f18f00c */ lw $t8,%lo(g_Anims)($t8)
/* 1e464: 00194080 */ sll $t0,$t9,0x2
/* 1e468: 01194023 */ subu $t0,$t0,$t9
/* 1e46c: 00084080 */ sll $t0,$t0,0x2
@ -5470,8 +5470,8 @@ glabel func0001e2b4
/* 1ec04: 13000066 */ beqz $t8,.L0001eda0
/* 1ec08: 00000000 */ sll $zero,$zero,0x0
/* 1ec0c: 86290000 */ lh $t1,0x0($s1)
/* 1ec10: 3c088006 */ lui $t0,%hi(var8005f00c)
/* 1ec14: 8d08f00c */ lw $t0,%lo(var8005f00c)($t0)
/* 1ec10: 3c088006 */ lui $t0,%hi(g_Anims)
/* 1ec14: 8d08f00c */ lw $t0,%lo(g_Anims)($t0)
/* 1ec18: 00096880 */ sll $t5,$t1,0x2
/* 1ec1c: 01a96823 */ subu $t5,$t5,$t1
/* 1ec20: 000d6880 */ sll $t5,$t5,0x2

View File

@ -66,9 +66,9 @@ glabel func000233c0
/* 23434: 24a5a898 */ addiu $a1,$a1,%lo(var8009a898)
/* 23438: 246c0004 */ addiu $t4,$v1,0x4
/* 2343c: acac0000 */ sw $t4,0x0($a1)
/* 23440: 3c018006 */ lui $at,%hi(var8005f00c)
/* 23440: 3c018006 */ lui $at,%hi(g_Anims)
/* 23444: a52b0000 */ sh $t3,0x0($t1)
/* 23448: ac2cf00c */ sw $t4,%lo(var8005f00c)($at)
/* 23448: ac2cf00c */ sw $t4,%lo(g_Anims)($at)
/* 2344c: 85280000 */ lh $t0,0x0($t1)
/* 23450: 3c078006 */ lui $a3,%hi(var8005f018)
/* 23454: 3c108006 */ lui $s0,%hi(var8005f01c)
@ -80,8 +80,8 @@ glabel func000233c0
/* 2346c: ace60000 */ sw $a2,0x0($a3)
/* 23470: 00083080 */ sll $a2,$t0,0x2
/* 23474: 00c83023 */ subu $a2,$a2,$t0
/* 23478: 3c038006 */ lui $v1,%hi(var8005f00c)
/* 2347c: 8c63f00c */ lw $v1,%lo(var8005f00c)($v1)
/* 23478: 3c038006 */ lui $v1,%hi(g_Anims)
/* 2347c: 8c63f00c */ lw $v1,%lo(g_Anims)($v1)
/* 23480: 00063080 */ sll $a2,$a2,0x2
/* 23484: 00002025 */ or $a0,$zero,$zero
.L00023488:
@ -279,8 +279,8 @@ glabel func0002373c
/* 23748: 8defa898 */ lw $t7,%lo(var8009a898)($t7)
/* 2374c: 3c018006 */ lui $at,%hi(var8005f008)
/* 23750: a42ef008 */ sh $t6,%lo(var8005f008)($at)
/* 23754: 3c018006 */ lui $at,%hi(var8005f00c)
/* 23758: ac2ff00c */ sw $t7,%lo(var8005f00c)($at)
/* 23754: 3c018006 */ lui $at,%hi(g_Anims)
/* 23758: ac2ff00c */ sw $t7,%lo(g_Anims)($at)
/* 2375c: 3c018006 */ lui $at,%hi(var8005f020)
/* 23760: 03e00008 */ jr $ra
/* 23764: ac20f020 */ sw $zero,%lo(var8005f020)($at)
@ -290,8 +290,8 @@ GLOBAL_ASM(
glabel modelGetNumAnimFrames
/* 23768: 00047400 */ sll $t6,$a0,0x10
/* 2376c: 000e7c03 */ sra $t7,$t6,0x10
/* 23770: 3c188006 */ lui $t8,%hi(var8005f00c)
/* 23774: 8f18f00c */ lw $t8,%lo(var8005f00c)($t8)
/* 23770: 3c188006 */ lui $t8,%hi(g_Anims)
/* 23774: 8f18f00c */ lw $t8,%lo(g_Anims)($t8)
/* 23778: 000fc880 */ sll $t9,$t7,0x2
/* 2377c: 032fc823 */ subu $t9,$t9,$t7
/* 23780: 0019c880 */ sll $t9,$t9,0x2
@ -310,8 +310,8 @@ glabel func00023794
/* 237a4: 01f8102a */ slt $v0,$t7,$t8
/* 237a8: 1040000a */ beqz $v0,.L000237d4
/* 237ac: afa40000 */ sw $a0,0x0($sp)
/* 237b0: 3c198006 */ lui $t9,%hi(var8005f00c)
/* 237b4: 8f39f00c */ lw $t9,%lo(var8005f00c)($t9)
/* 237b0: 3c198006 */ lui $t9,%hi(g_Anims)
/* 237b4: 8f39f00c */ lw $t9,%lo(g_Anims)($t9)
/* 237b8: 000f4080 */ sll $t0,$t7,0x2
/* 237bc: 010f4023 */ subu $t0,$t0,$t7
/* 237c0: 00084080 */ sll $t0,$t0,0x2
@ -369,10 +369,10 @@ glabel func0002384c
/* 23854: 00047400 */ sll $t6,$a0,0x10
/* 23858: 000e7c03 */ sra $t7,$t6,0x10
/* 2385c: afa40000 */ sw $a0,0x0($sp)
/* 23860: 3c188006 */ lui $t8,%hi(var8005f00c)
/* 23860: 3c188006 */ lui $t8,%hi(g_Anims)
/* 23864: 016f6021 */ addu $t4,$t3,$t7
/* 23868: 918d0000 */ lbu $t5,0x0($t4)
/* 2386c: 8f18f00c */ lw $t8,%lo(var8005f00c)($t8)
/* 2386c: 8f18f00c */ lw $t8,%lo(g_Anims)($t8)
/* 23870: 000fc880 */ sll $t9,$t7,0x2
/* 23874: 3c0a800a */ lui $t2,%hi(var8009a888)
/* 23878: 8d4aa888 */ lw $t2,%lo(var8009a888)($t2)
@ -424,10 +424,10 @@ glabel func00023908
/* 23914: 000e7c03 */ sra $t7,$t6,0x10
/* 23918: afa40000 */ sw $a0,0x0($sp)
/* 2391c: afa60008 */ sw $a2,0x8($sp)
/* 23920: 3c188006 */ lui $t8,%hi(var8005f00c)
/* 23920: 3c188006 */ lui $t8,%hi(g_Anims)
/* 23924: 016f6021 */ addu $t4,$t3,$t7
/* 23928: 918d0000 */ lbu $t5,0x0($t4)
/* 2392c: 8f18f00c */ lw $t8,%lo(var8005f00c)($t8)
/* 2392c: 8f18f00c */ lw $t8,%lo(g_Anims)($t8)
/* 23930: 000fc880 */ sll $t9,$t7,0x2
/* 23934: 3c0a800a */ lui $t2,%hi(var8009a888)
/* 23938: 8d4aa888 */ lw $t2,%lo(var8009a888)($t2)
@ -484,10 +484,10 @@ glabel func000239e0
/* 239e8: 00047400 */ sll $t6,$a0,0x10
/* 239ec: 000e7c03 */ sra $t7,$t6,0x10
/* 239f0: afa40000 */ sw $a0,0x0($sp)
/* 239f4: 3c188006 */ lui $t8,%hi(var8005f00c)
/* 239f4: 3c188006 */ lui $t8,%hi(g_Anims)
/* 239f8: 012f5021 */ addu $t2,$t1,$t7
/* 239fc: 914b0000 */ lbu $t3,0x0($t2)
/* 23a00: 8f18f00c */ lw $t8,%lo(var8005f00c)($t8)
/* 23a00: 8f18f00c */ lw $t8,%lo(g_Anims)($t8)
/* 23a04: 000fc880 */ sll $t9,$t7,0x2
/* 23a08: 3c08800a */ lui $t0,%hi(var8009a888)
/* 23a0c: 8d08a888 */ lw $t0,%lo(var8009a888)($t0)
@ -591,7 +591,7 @@ glabel func00023ab0
/* 23b64: 00477021 */ addu $t6,$v0,$a3
/* 23b68: 91cf0000 */ lbu $t7,0x0($t6)
/* 23b6c: 00047403 */ sra $t6,$a0,0x10
/* 23b70: 3c0c8006 */ lui $t4,%hi(var8005f00c)
/* 23b70: 3c0c8006 */ lui $t4,%hi(g_Anims)
/* 23b74: 11e0000c */ beqz $t7,.L00023ba8
/* 23b78: 01c02025 */ or $a0,$t6,$zero
/* 23b7c: 24e70001 */ addiu $a3,$a3,0x1
@ -608,7 +608,7 @@ glabel func00023ab0
/* 23ba0: 5540fff7 */ bnezl $t2,.L00023b80
/* 23ba4: 24e70001 */ addiu $a3,$a3,0x1
.L00023ba8:
/* 23ba8: 8d8cf00c */ lw $t4,%lo(var8005f00c)($t4)
/* 23ba8: 8d8cf00c */ lw $t4,%lo(g_Anims)($t4)
/* 23bac: 01314823 */ subu $t1,$t1,$s1
/* 23bb0: 00094880 */ sll $t1,$t1,0x2
/* 23bb4: 01891821 */ addu $v1,$t4,$t1
@ -621,8 +621,8 @@ glabel func00023ab0
/* 23bd0: afa7003c */ sw $a3,0x3c($sp)
/* 23bd4: 0c008e42 */ jal func00023908
/* 23bd8: afa90028 */ sw $t1,0x28($sp)
/* 23bdc: 3c0f8006 */ lui $t7,%hi(var8005f00c)
/* 23be0: 8deff00c */ lw $t7,%lo(var8005f00c)($t7)
/* 23bdc: 3c0f8006 */ lui $t7,%hi(g_Anims)
/* 23be0: 8deff00c */ lw $t7,%lo(g_Anims)($t7)
/* 23be4: 8fa90028 */ lw $t1,0x28($sp)
/* 23be8: 3c08800a */ lui $t0,%hi(var8009a87c)
/* 23bec: 2508a87c */ addiu $t0,$t0,%lo(var8009a87c)
@ -793,7 +793,7 @@ glabel func00023d38
/* 23e34: 3c19800a */ lui $t9,%hi(var8009a88c)
/* 23e38: 8f39a88c */ lw $t9,%lo(var8009a88c)($t9)
/* 23e3c: 00071840 */ sll $v1,$a3,0x1
/* 23e40: 3c0e8006 */ lui $t6,%hi(var8005f00c)
/* 23e40: 3c0e8006 */ lui $t6,%hi(g_Anims)
/* 23e44: 03236021 */ addu $t4,$t9,$v1
/* 23e48: 85820000 */ lh $v0,0x0($t4)
/* 23e4c: 3c198006 */ lui $t9,%hi(var8005f01c)
@ -803,7 +803,7 @@ glabel func00023d38
/* 23e5c: a1b80000 */ sb $t8,0x0($t5)
.L00023e60:
/* 23e60: 8f39f01c */ lw $t9,%lo(var8005f01c)($t9)
/* 23e64: 8dcef00c */ lw $t6,%lo(var8005f00c)($t6)
/* 23e64: 8dcef00c */ lw $t6,%lo(g_Anims)($t6)
/* 23e68: 00107880 */ sll $t7,$s0,0x2
/* 23e6c: 00f90019 */ multu $a3,$t9
/* 23e70: 01f07823 */ subu $t7,$t7,$s0
@ -968,8 +968,8 @@ glabel func00024050
/* 240a0: 91f90001 */ lbu $t9,0x1($t7)
/* 240a4: afb90068 */ sw $t9,0x68($sp)
.L000240a8:
/* 240a8: 3c188006 */ lui $t8,%hi(var8005f00c)
/* 240ac: 8f18f00c */ lw $t8,%lo(var8005f00c)($t8)
/* 240a8: 3c188006 */ lui $t8,%hi(g_Anims)
/* 240ac: 8f18f00c */ lw $t8,%lo(g_Anims)($t8)
/* 240b0: 00074080 */ sll $t0,$a3,0x2
/* 240b4: 01074023 */ subu $t0,$t0,$a3
/* 240b8: 00084080 */ sll $t0,$t0,0x2
@ -1774,9 +1774,9 @@ glabel func00024c14
/* 24c54: afac0024 */ sw $t4,0x24($sp)
/* 24c58: 00ae7821 */ addu $t7,$a1,$t6
/* 24c5c: 91f80000 */ lbu $t8,0x0($t7)
/* 24c60: 3c0b8006 */ lui $t3,%hi(var8005f00c)
/* 24c60: 3c0b8006 */ lui $t3,%hi(g_Anims)
/* 24c64: 8dada888 */ lw $t5,%lo(var8009a888)($t5)
/* 24c68: 8d6bf00c */ lw $t3,%lo(var8005f00c)($t3)
/* 24c68: 8d6bf00c */ lw $t3,%lo(g_Anims)($t3)
/* 24c6c: 00056080 */ sll $t4,$a1,0x2
/* 24c70: 01856023 */ subu $t4,$t4,$a1
/* 24c74: 000c6080 */ sll $t4,$t4,0x2