diff --git a/src/game/game_013260.c b/src/game/game_013260.c index 06aa96d51..787c62017 100644 --- a/src/game/game_013260.c +++ b/src/game/game_013260.c @@ -28,6 +28,24 @@ glabel func0f013260 /* f01329c: 00000000 */ sll $zero,$zero,0x0 ); +// Mismatch because the lui %hi instructions are swapped +//void func0f013260(void) +//{ +// struct gvars800a3fc8 *current; +// struct gvars800a3fc8 *end; +// var800a3fc0 = 0; +// end = &var800a3fc8[10]; +// current = &var800a3fc8[0]; +// +// while (current != end) { +// current->unk08 = 0; +// current++; +// } +// +// var800a4130 = 0; +// var8007f0b8 = 0; +//} + GLOBAL_ASM( glabel func0f0132a0 /* f0132a0: 3c038008 */ lui $v1,%hi(var8007f0c0) diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index 2273f267d..0fd4b0ee0 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -23470,96 +23470,7 @@ u32 var800a3fb8 = 0; u32 var800a3fbc = 0; u32 var800a3fc0 = 0; u32 var800a3fc4 = 0; -u32 var800a3fc8 = 0; -u32 var800a3fcc = 0; -u32 var800a3fd0 = 0; -u32 var800a3fd4 = 0; -u32 var800a3fd8 = 0; -u32 var800a3fdc = 0; -u32 var800a3fe0 = 0; -u32 var800a3fe4 = 0; -u32 var800a3fe8 = 0; -u32 var800a3fec = 0; -u32 var800a3ff0 = 0; -u32 var800a3ff4 = 0; -u32 var800a3ff8 = 0; -u32 var800a3ffc = 0; -u32 var800a4000 = 0; -u32 var800a4004 = 0; -u32 var800a4008 = 0; -u32 var800a400c = 0; -u32 var800a4010 = 0; -u32 var800a4014 = 0; -u32 var800a4018 = 0; -u32 var800a401c = 0; -u32 var800a4020 = 0; -u32 var800a4024 = 0; -u32 var800a4028 = 0; -u32 var800a402c = 0; -u32 var800a4030 = 0; -u32 var800a4034 = 0; -u32 var800a4038 = 0; -u32 var800a403c = 0; -u32 var800a4040 = 0; -u32 var800a4044 = 0; -u32 var800a4048 = 0; -u32 var800a404c = 0; -u32 var800a4050 = 0; -u32 var800a4054 = 0; -u32 var800a4058 = 0; -u32 var800a405c = 0; -u32 var800a4060 = 0; -u32 var800a4064 = 0; -u32 var800a4068 = 0; -u32 var800a406c = 0; -u32 var800a4070 = 0; -u32 var800a4074 = 0; -u32 var800a4078 = 0; -u32 var800a407c = 0; -u32 var800a4080 = 0; -u32 var800a4084 = 0; -u32 var800a4088 = 0; -u32 var800a408c = 0; -u32 var800a4090 = 0; -u32 var800a4094 = 0; -u32 var800a4098 = 0; -u32 var800a409c = 0; -u32 var800a40a0 = 0; -u32 var800a40a4 = 0; -u32 var800a40a8 = 0; -u32 var800a40ac = 0; -u32 var800a40b0 = 0; -u32 var800a40b4 = 0; -u32 var800a40b8 = 0; -u32 var800a40bc = 0; -u32 var800a40c0 = 0; -u32 var800a40c4 = 0; -u32 var800a40c8 = 0; -u32 var800a40cc = 0; -u32 var800a40d0 = 0; -u32 var800a40d4 = 0; -u32 var800a40d8 = 0; -u32 var800a40dc = 0; -u32 var800a40e0 = 0; -u32 var800a40e4 = 0; -u32 var800a40e8 = 0; -u32 var800a40ec = 0; -u32 var800a40f0 = 0; -u32 var800a40f4 = 0; -u32 var800a40f8 = 0; -u32 var800a40fc = 0; -u32 var800a4100 = 0; -u32 var800a4104 = 0; -u32 var800a4108 = 0; -u32 var800a410c = 0; -u32 var800a4110 = 0; -u32 var800a4114 = 0; -u32 var800a4118 = 0; -u32 var800a411c = 0; -u32 var800a4120 = 0; -u32 var800a4124 = 0; -u32 var800a4128 = 0; -u32 var800a412c = 0; +struct gvars800a3fc8 var800a3fc8[10] = {0}; u32 var800a4130 = 0; u32 var800a4134 = 0; u32 var800a4138 = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index d70209685..6f5545021 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -726,8 +726,10 @@ extern u32 var800a3444; extern u32 var800a3448; extern u32 var800a3488; extern u32 var800a34d0; -extern u32 var800a3fc0; -extern u32 var800a3fc8; + +extern u32 var800a3fc0; // likely a count of 800a3fc8 +extern struct gvars800a3fc8 var800a3fc8[]; + extern u32 var800a4130; extern u32 var800a4154; extern u32 var800a4158; diff --git a/src/include/types.h b/src/include/types.h index 8ffc4ba47..433e58d91 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -1141,4 +1141,16 @@ struct credit { u16 text2; }; +struct gvars800a3fc8 { + u32 unk00; + u32 unk04; + u32 unk08; + u32 unk0c; + u32 unk10; + u32 unk14; + u32 unk18; + u32 unk1c; + u32 unk20; +}; + #endif