format + small other change

This commit is contained in:
dark-samus 2021-01-16 15:22:09 -05:00
parent af694484f7
commit 7c07fbfa18

View File

@ -81,143 +81,143 @@ Gfx D_802E9828[] = {
// Entity "script" data; unknown if it's used or not.
s32 D_802E9830[8] = {
0x00000001, 0x0000003C, (s32)&D_802E9828, 0x00000002,
0x00000000, 0x00000000, 0x00000000, 0x00000000
};
0x00000001, 0x0000003C, (s32) &D_802E9828, 0x00000002,
0x00000000, 0x00000000, 0x00000000, 0x00000000
};
s32 D_802E9850[9] = {
0x00000005, 0x00000800, 0x00000004, 0x00000020,
0x00000001, 0x0000003C, (s32)&D_802E97D8, 0x00000002,
0x00000000
};
0x00000005, 0x00000800, 0x00000004, 0x00000020,
0x00000001, 0x0000003C, (s32) &D_802E97D8, 0x00000002,
0x00000000
};
s32 D_802E9874[9] = {
0x00000005, 0x00000800, 0x00000004, 0x00000020,
0x00000001, 0x0000003C, (s32)&D_802E97D8, 0x00000002,
0x00000000
};
0x00000005, 0x00000800, 0x00000004, 0x00000020,
0x00000001, 0x0000003C, (s32) &D_802E97D8, 0x00000002,
0x00000000
};
s32 D_802E9898[9] = {
0x00000005, 0x00000800, 0x00000004, 0x00000020,
0x00000001, 0x0000003C, &D_802E9788[10], 0x00000002,
0x00000000,
};
0x00000005, 0x00000800, 0x00000004, 0x00000020,
0x00000001, 0x0000003C, &D_802E9788[10], 0x00000002,
0x00000000,
};
s32 D_802E98BC[8] = {
0x00200000, (s32)&D_802E9850, 0x00000000, (s32)create_shadow_callback,
0x00000000, 0x00000000, 0x00000000, 0x00000000
};
0x00200000, (s32) &D_802E9850, 0x00000000, (s32)create_shadow_callback,
0x00000000, 0x00000000, 0x00000000, 0x00000000
};
s32 D_802E98DC[9] = {
0x01190A19, 0x00200000, (s32)&D_802E9874, 0x00000000,
(s32)create_shadow_callback, 0x00000000, 0x00000000, 0x00000000,
0x00000000
};
0x01190A19, 0x00200000, (s32) &D_802E9874, 0x00000000,
(s32)create_shadow_callback, 0x00000000, 0x00000000, 0x00000000,
0x00000000
};
s32 D_802E9900[9] = {
0x01190A19, 0x00200000, (s32)&D_802E9898, 0x00000000,
(s32)create_shadow_callback, 0x00000000, 0x00000000, 0x00000000,
0x00000000,
};
0x01190A19, 0x00200000, (s32) &D_802E9898, 0x00000000,
(s32)create_shadow_callback, 0x00000000, 0x00000000, 0x00000000,
0x00000000,
};
s32 D_802E9924[3] = {
0x01190A19, 0x00000000, 0x00000000
};
0x01190A19, 0x00000000, 0x00000000
};
s32 D_802E9930[51] = {
0x00000003, 0x00000000, (s32)func_802E10F4, 0x00000009,
0x0000014E, 0x00000002, (s32)func_802E114C, 0x00000002,
(s32)func_802E31EC, 0x00000003, 0x00000006, (s32)func_802E328C,
0x00000003, 0x00000002, 0x00000000, 0x00000002,
(s32)func_802E1204, 0x00000003, 0x00000000, (s32)func_802E1270,
0x00000003, 0x0000000E, 0x00000000, 0x00000002,
(s32)func_802E1298, 0x00000003, 0x00000000, (s32)func_802E1350,
0x00000002, (s32)save_game_at_player_position, 0x00000002, (s32)func_802E12F8,
0x00000003, 0x00000000, (s32)func_802E1328, 0x00000002,
(s32)func_802E117C, 0x00000003, 0x0000000C, 0x00000000,
0x00000004, 0x00000000, 0x00000000, 0x00000002,
(s32)func_802E117C, 0x00000003, 0x00000002, 0x00000000,
0x00000001, (s32)D_802E9930, 0x00000000,
};
0x00000003, 0x00000000, (s32)func_802E10F4, 0x00000009,
0x0000014E, 0x00000002, (s32)func_802E114C, 0x00000002,
(s32)func_802E31EC, 0x00000003, 0x00000006, (s32)func_802E328C,
0x00000003, 0x00000002, 0x00000000, 0x00000002,
(s32)func_802E1204, 0x00000003, 0x00000000, (s32)func_802E1270,
0x00000003, 0x0000000E, 0x00000000, 0x00000002,
(s32)func_802E1298, 0x00000003, 0x00000000, (s32)func_802E1350,
0x00000002, (s32)save_game_at_player_position, 0x00000002, (s32)func_802E12F8,
0x00000003, 0x00000000, (s32)func_802E1328, 0x00000002,
(s32)func_802E117C, 0x00000003, 0x0000000C, 0x00000000,
0x00000004, 0x00000000, 0x00000000, 0x00000002,
(s32)func_802E117C, 0x00000003, 0x00000002, 0x00000000,
0x00000001, (s32)D_802E9930, 0x00000000,
};
s32 D_802E99FC[7] = {
0x00000004, 0x00000022, 0x00000001, 0x0000003C,
&D_0A003508, 0x00000002, 0x00000000,
};
0x00000004, 0x00000022, 0x00000001, 0x0000003C,
&D_0A003508, 0x00000002, 0x00000000,
};
StaticEntityData D_802E9A18 = { 0x4200, 0x0020, &D_802E99FC, {0, 0, 0, 0}, func_802E13B8, &D_802E9930, func_802E3BA4, &D_00E4B2E0, &D_00E4E7F0, 32, {0x19, 0x19, 0x19}};
StaticEntityData D_802E9A18 = { 0x4200, 0x0020, &D_802E99FC, {0, 0, 0, 0}, func_802E13B8, &D_802E9930, func_802E3BA4, &D_00E4B2E0, &D_00E4E7F0, 32, {0x19, 0x19, 0x19}};
// potential file split(?)
s32 D_802E9A3C[1] = {
0x00000000
};
0x00000000
};
s32 D_802E9A40[18] = {
0x00000003, 0x00000000, (s32)func_802E1660, 0x00000009,
0x00000152, 0x00000002, (s32)func_802E1EA8, 0x00000002,
(s32)func_802E176C, 0x00000003, 0x00000000, (s32)func_802E17A8,
0x00000003, 0x00000000, (s32)func_802E1740, 0x00000004,
0x00000000, 0x00000000,
};
0x00000003, 0x00000000, (s32)func_802E1660, 0x00000009,
0x00000152, 0x00000002, (s32)func_802E1EA8, 0x00000002,
(s32)func_802E176C, 0x00000003, 0x00000000, (s32)func_802E17A8,
0x00000003, 0x00000000, (s32)func_802E1740, 0x00000004,
0x00000000, 0x00000000,
};
s32 D_802E9A88[15] = {
0x00000003, 0x00000000, (s32)func_802E1614, 0x00000009,
0x00000152, 0x00000002, (s32)func_802E1EA8, 0x00000002,
(s32)func_802E176C, 0x00000003, 0x00000000, (s32)func_802E1EDC,
0x00000007, 0x20000000, 0x00000000
};
0x00000003, 0x00000000, (s32)func_802E1614, 0x00000009,
0x00000152, 0x00000002, (s32)func_802E1EA8, 0x00000002,
(s32)func_802E176C, 0x00000003, 0x00000000, (s32)func_802E1EDC,
0x00000007, 0x20000000, 0x00000000
};
s32 D_802E9AC4[15] = {
0x00000003, 0x00000000, (s32)func_802E1660, 0x00000009,
0x00000152, 0x00000002, (s32)func_802E1EA8, 0x00000002,
(s32)func_802E176C, 0x00000003, 0x00000000, (s32)func_802E1EDC,
0x00000007, 0x20000000, 0x00000000
};
0x00000003, 0x00000000, (s32)func_802E1660, 0x00000009,
0x00000152, 0x00000002, (s32)func_802E1EA8, 0x00000002,
(s32)func_802E176C, 0x00000003, 0x00000000, (s32)func_802E1EDC,
0x00000007, 0x20000000, 0x00000000
};
s32 D_802E9B00[16] = {
0x00000003, 0x00000000, (s32)func_802E1400, 0x00000003,
0x00000000, (s32)func_802E1460, 0x00000009, 0x00000152,
0x00000003, 0x00000080, 0x00000000, 0x00000003,
0x00000000, (s32)func_802E14D8, 0x00000004, 0x00000000,
};
0x00000003, 0x00000000, (s32)func_802E1400, 0x00000003,
0x00000000, (s32)func_802E1460, 0x00000009, 0x00000152,
0x00000003, 0x00000080, 0x00000000, 0x00000003,
0x00000000, (s32)func_802E14D8, 0x00000004, 0x00000000,
};
s32 D_802E9B40[7] = {
0x00000004, 0x00000011, 0x00000001, 0x0000003C,
&D_0A000EF8, 0x00000002, 0x00000000,
};
0x00000004, 0x00000011, 0x00000001, 0x0000003C,
&D_0A000EF8, 0x00000002, 0x00000000,
};
s32 D_802E9B5C[7] = {
0x00000004, 0x00000011, 0x00000001, 0x0000003C,
(s32)&D_0A000EF8, 0x00000002, 0x00000000,
};
0x00000004, 0x00000011, 0x00000001, 0x0000003C,
(s32) &D_0A000EF8, 0x00000002, 0x00000000,
};
s32 D_802E9B78[7] = {
0x00000004, 0x00000011, 0x00000001, 0x0000003C,
(s32)&D_0A000EE8, 0x00000002, 0x00000000
};
0x00000004, 0x00000011, 0x00000001, 0x0000003C,
(s32) &D_0A000EE8, 0x00000002, 0x00000000
};
s32 D_802E9B94[7] = {
0x00000004, 0x00000001, 0x00000001, 0x0000003C,
(s32)&D_0A000740, 0x00000002, 0x00000000,
};
0x00000004, 0x00000001, 0x00000001, 0x0000003C,
(s32) &D_0A000740, 0x00000002, 0x00000000,
};
// TODO: resolve FILL_LATER
StaticEntityData D_802E9BB0 = { 0xA000, 0x002C, &D_802E9B78, {0, 0, 0, 0}, func_802E234C, &D_802E9A40, NULL, &D_00E62AC0, &D_00E639C0, 8, {0x16, 0x17, 0x16} };
StaticEntityData D_802E9BB0 = { 0xA000, 0x002C, &D_802E9B78, {0, 0, 0, 0}, func_802E234C, &D_802E9A40, NULL, &D_00E62AC0, &D_00E639C0, 8, {0x16, 0x17, 0x16} };
StaticEntityData D_802E9BD4 = { 0xAA04, 0x002C, &D_802E9B40, {0, 0, 0, 0}, entity_init_BlueSwitch, &D_802E9AC4, NULL, &D_00E639C0, &D_00E648D0, 7, {0x16, 0x17, 0x16} };
StaticEntityData D_802E9BF8 = { 0xAA04, 0x002C, &D_802E9B5C, {0, 0, 0, 0}, entity_init_HugeBlueSwitch, &D_802E9A88, NULL, &D_00E639C0, &D_00E648D0, 9, {0x42, 0x4B, 0x42} };
StaticEntityData D_802E9BF8 = { 0xAA04, 0x002C, &D_802E9B5C, {0, 0, 0, 0}, entity_init_HugeBlueSwitch, &D_802E9A88, NULL, &D_00E639C0, &D_00E648D0, 9, {0x42, 0x4B, 0x42} };
StaticEntityData D_802E9C1C = { 0xC000, 0x002C, &D_802E9B94, {0, 0, 0, 0}, func_802E234C, &D_802E9B00, NULL, &D_00E62370, &D_00E62AC0, 10, {0x32, 0x0F, 0x32} };
s32 D_802E9C40[] = {
0x00000007, 0x00000020, 0x00000003, 0x00000000,
func_802E263C, 0x00000007, 0x00000001, 0x00000007,
0x20000000, 0x00000000, 0x00000000, 0x00000000
};
s32 D_802E9C40[12] = {
0x00000007, 0x00000020, 0x00000003, 0x00000000,
func_802E263C, 0x00000007, 0x00000001, 0x00000007,
0x20000000, 0x00000000, 0x00000000, 0x00000000
};
s32 D_802E9C70[] = {
0x00000004, 0x00000011, 0x00000001, 0x0000003C,
(s32)&D_802E9828, 0x00000002, 0x00000000
};
s32 D_802E9C70[7] = {
0x00000004, 0x00000011, 0x00000001, 0x0000003C,
(s32) &D_802E9828, 0x00000002, 0x00000000
};
//ROM addrs; todo
extern UNK_TYPE D_00E32420;
@ -328,4 +328,4 @@ void func_802E2FD0(Entity* entity) {
}
create_entity(addr, entity->position.x, entity->position.y, entity->position.z, 0, 0x80000000);
}
}