Area 6 decomp, Object_408 -> boss, more overlay symbols in main (#70)

* 408

* more stuff

* brutal matches

* data and such

* gPlayer

* names and boss and such

* cat

* forgot something
This commit is contained in:
petrie911
2024-01-06 19:39:23 -03:00
committed by GitHub
parent c36c713da5
commit a0ec7a5516
35 changed files with 4997 additions and 1818 deletions
-1
View File
@@ -81,7 +81,6 @@ D_800D503C = 0x800D503C; // force_migration:True
D_800D5248 = 0x800D5248; // force_migration:True
D_800D525C = 0x800D525C; // force_migration:True
D_800D8560 = 0x800D8560; // force_migration:True
D_800D55E4_fake = 0x800D55E4; // force_migration:True
D_800D8570 = 0x800D8570; // force_migration:True
D_800D8594 = 0x800D8594; // force_migration:True
D_800C93EC = 0x800C93EC; // force_migration:True
+5 -5
View File
@@ -198,7 +198,7 @@ Object_80_Draw = 0x8005D654;
Object_4C_Draw = 0x8005D8B8;
Object_2F4_Draw2 = 0x8005D954;
Object_2F4_Draw1 = 0x8005DBC0;
Object_408_Draw = 0x8005E1B8;
Boss_Draw = 0x8005E1B8;
Object_8C_Draw1 = 0x8005E454;
Object_8C_Draw2 = 0x8005E538;
Item_Draw = 0x8005E7B8;
@@ -227,13 +227,13 @@ Object_SetInfo = 0x800612B8;
Object_80_Initialize = 0x80061364;
Object_4C_Initialize = 0x80061394;
Object_2F4_Initialize = 0x800613C4;
Object_408_Initialize = 0x80061404;
Boss_Initialize = 0x80061404;
Item_Initialize = 0x80061444;
Object_8C_Initialize = 0x80061474;
Object_80_Load = 0x800614B4;
Object_4C_Load = 0x800615A0;
Object_2F4_Load = 0x8006168C;
Object_408_Load = 0x80061778;
Boss_Load = 0x80061778;
Item_Load = 0x80061864;
func_80061958 = 0x80061958;
func_80061A4C = 0x80061A4C;
@@ -305,7 +305,7 @@ func_80069858 = 0x80069858;
func_80069924 = 0x80069924;
func_80069A10 = 0x80069A10;
Object_2F4_Update = 0x80069AAC;
Object_408_Update = 0x80069CBC;
Boss_Update = 0x80069CBC;
Object_80_Update = 0x80069DF4;
Object_4C_Update = 0x80069E88;
Item_Update = 0x80069F30;
@@ -381,7 +381,7 @@ D_80161AB8 = 0x80161AB8;
gObjects80 = 0x80161B00; //size:0x1900
gObjects4C = 0x80163400; //size:0xBE0
gObjects2F4 = 0x80163FE0; //size:0xB130
gObjects408 = 0x8016F110; //size:0x1020
gBosses = 0x8016F110; //size:0x1020
gObjects8C = 0x80170130; //size:0x36B0
gItems = 0x801737E0; //size:0x870
gPlayerShots = 0x80174050; //size:0x700
@@ -49,6 +49,47 @@ func_E16C50_801915A4 = 0x801915A4;
func_E16C50_80191BB8 = 0x80191BB8;
D_E16C50_801C2240 = 0x801C2240;
D_E16C50_801C4188 = 0x801C4188;
D_E16C50_801C2250 = 0x801C2250;//size:0xA0 segment:ovl_E16C50
D_E16C50_801C22F0 = 0x801C22F0;//size:0x40 segment:ovl_E16C50
D_E16C50_801BF1F0 = 0x801BF1F0;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801BF220 = 0x801BF220;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801BF250 = 0x801BF250;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801BF280 = 0x801BF280;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801BF2B0 = 0x801BF2B0;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801BF2E0 = 0x801BF2E0;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801BF8AC = 0x801BF8AC;//size:0xC type:Vec3f segment:ovl_E16C50
D_E16C50_801BF8B8 = 0x801BF8B8;//size:0xC type:Vec3f segment:ovl_E16C50
D_E16C50_801BF8C4 = 0x801BF8C4;//size:0x8 type:f32 segment:ovl_E16C50
D_E16C50_801BED10 = 0x801BED10;//size:0xC type:Vec3f segment:ovl_E16C50
D_E16C50_801BED1C = 0x801BED1C;//size:0xC type:Vec3f segment:ovl_E16C50
D_E16C50_801BED70 = 0x801BED70;//size:0x90 type:Vec3f segment:ovl_E16C50
D_E16C50_801BEE00 = 0x801BEE00;//size:0x90 type:Vec3f segment:ovl_E16C50
D_E16C50_801BEEF0 = 0x801BEEF0;//size:0x90 type:Vec3f segment:ovl_E16C50
D_E16C50_801BEF80 = 0x801BEF80;//size:0x90 type:Vec3f segment:ovl_E16C50
D_E16C50_801BF070 = 0x801BF070;//size:0x90 type:Vec3f segment:ovl_E16C50
D_E16C50_801BF100 = 0x801BF100;//size:0x90 type:Vec3f segment:ovl_E16C50
D_E16C50_801BF190 = 0x801BF190;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801C2330 = 0x801C2330;//segment:ovl_E16C50 type:s32 size:0xA0
D_E16C50_801C23D0 = 0x801C23D0;//segment:ovl_E16C50 type:s32 size:0x118
D_E16C50_801C24E8 = 0x801C24E8;//segment:ovl_E16C50 type:f32 size:0x258
D_E16C50_801C27C8 = 0x801C27C8; //segment:ovl_E16C50 size:0x12C0
D_E16C50_801C3A88 = 0x801C3A88; //segment:ovl_E16C50 size:0x700
D_E16C50_801C4190 = 0x801C4190; //segment:ovl_E16C50 size:0x28
D_E16C50_801C41B8 = 0x801C41B8; //segment:ovl_E16C50 size:0x78
D_E16C50_801C4230 = 0x801C4230; //segment:ovl_E16C50 size:0x70
D_E16C50_801C42A0 = 0x801C42A0; //segment:ovl_E16C50 size:0x68
D_E16C50_801C4308 = 0x801C4308; //segment:ovl_E16C50 size:0x148
D_E16C50_801C0060 = 0x801C0060; //segment:ovl_E16C50 type:f32
D_E16C50_801BFE14 = 0x801BFE14; //segment:ovl_E16C50 type:s32
D_E16C50_801C0264 = 0x801C0264; //segment:ovl_E16C50 type:s32
D_E16C50_801C02C8 = 0x801C02C8; //segment:ovl_E16C50 type:f32
D_E16C50_801C02D0 = 0x801C02D0; //segment:ovl_E16C50 type:s32
D_E16C50_801C0130 = 0x801C0130; //segment:ovl_E16C50 ignore:True
D_E16C50_801C2740 = 0x801C2740; //segment:ovl_E16C50 size:0x28
D_E16C50_801C2768 = 0x801C2768; //segment:ovl_E16C50 size:0x38
D_E16C50_801C27A0 = 0x801C27A0; //segment:ovl_E16C50 size:0x20
func_E51970_80198594 = 0x80198594;
func_E51970_80193CA4 = 0x80193CA4;