fox_co decomp, Object_2F4 rename to Actor with work buffers (#79)

* first few functions

* funcs so far - messy

* only large funcs left

* func_DF4260_8018F880 and func_DF4260_80191160

* func_DF4260_8018C19C

* func_DF4260_8018F880 player

* build post merge

* first cleanup pass

* add work buffers to Object_2F4

* halfway through data import

* finish data import

* cleanup and add non_matching

* bss complete

* actor rename

* post merge cleanup

* file rename

* arg rename

* other object variables rename

* hex cleanup for func_DF4260_80189058

* format

* revert note_data

* suggestions

* format suggestions
This commit is contained in:
inspectredc
2024-01-13 22:45:37 +00:00
committed by GitHub
parent 262a0bede2
commit 31bfc1ecdd
32 changed files with 8044 additions and 4948 deletions
+1
View File
@@ -86,6 +86,7 @@ D_800D8594 = 0x800D8594; // force_migration:True
D_800C93EC = 0x800C93EC; // force_migration:True
D_DF4260_8019B1EC = 0x8019B1EC; // force_migration:True segment:ovl_DF4260
D_DF4260_8019B6D8 = 0x8019B6D8; // size:0x110 segment:ovl_DF4260
D_E16C50_801C171C = 0x801C171C; // force_migration:True segment:ovl_E16C50
D_E16C50_801C1728 = 0x801C1728; // force_migration:True segment:ovl_E16C50
D_E16C50_801C1730 = 0x801C1730; // force_migration:True segment:ovl_E16C50
+6 -6
View File
@@ -201,8 +201,8 @@ func_8005D1F0 = 0x8005D1F0;
func_8005D3CC = 0x8005D3CC;
Object_80_Draw = 0x8005D654;
Object_4C_Draw = 0x8005D8B8;
Object_2F4_Draw2 = 0x8005D954;
Object_2F4_Draw1 = 0x8005DBC0;
Actor_Draw2 = 0x8005D954;
Actor_Draw1 = 0x8005DBC0;
Boss_Draw = 0x8005E1B8;
Effect_Draw1 = 0x8005E454;
Effect_Draw2 = 0x8005E538;
@@ -231,13 +231,13 @@ func_80061148 = 0x80061148;
Object_SetInfo = 0x800612B8;
Object_80_Initialize = 0x80061364;
Object_4C_Initialize = 0x80061394;
Object_2F4_Initialize = 0x800613C4;
Actor_Initialize = 0x800613C4;
Boss_Initialize = 0x80061404;
Item_Initialize = 0x80061444;
Effect_Initialize = 0x80061474;
Object_80_Load = 0x800614B4;
Object_4C_Load = 0x800615A0;
Object_2F4_Load = 0x8006168C;
Actor_Load = 0x8006168C;
Boss_Load = 0x80061778;
Item_Load = 0x80061864;
func_80061958 = 0x80061958;
@@ -309,7 +309,7 @@ func_800696F8 = 0x800696F8;
func_80069858 = 0x80069858;
func_80069924 = 0x80069924;
func_80069A10 = 0x80069A10;
Object_2F4_Update = 0x80069AAC;
Actor_Update = 0x80069AAC;
Boss_Update = 0x80069CBC;
Object_80_Update = 0x80069DF4;
Object_4C_Update = 0x80069E88;
@@ -385,7 +385,7 @@ gLaserStrength = 0x80161AA8;//size:0x10
D_80161AB8 = 0x80161AB8;
gObjects80 = 0x80161B00; //size:0x1900
gObjects4C = 0x80163400; //size:0xBE0
gObjects2F4 = 0x80163FE0; //size:0xB130
gActors = 0x80163FE0; //size:0xB130
gBosses = 0x8016F110; //size:0x1020
gEffects = 0x80170130; //size:0x36B0
gItems = 0x801737E0; //size:0x870