mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity
oot/undefined_syms.txt

1293 lines
26 KiB
Text
Raw Normal View History

First proper commit.
2020-03-17 04:31:30 +00:00
// libultra OS symbols
D_80000000 = 0x80000000;
Fix all RAM pointers in overlays (#81)
2020-04-19 15:57:38 +00:00
D_80000002 = 0x80000002;
First proper commit.
2020-03-17 04:31:30 +00:00
D_80000004 = 0x80000004;
D_80000008 = 0x80000008;
D_8000000C = 0x8000000C;
D_80000010 = 0x80000010;
D_80000020 = 0x80000020;
osTvType = 0x80000300;
osRomBase = 0x80000308;
osResetType = 0x8000030C;
osMemSize = 0x80000318;
osAppNmiBuffer = 0x8000031C;
// OS hardware registers
D_A4040004 = 0xA4040004;
D_A4040008 = 0xA4040008;
D_A404000C = 0xA404000C;
D_A4040010 = 0xA4040010;
D_A4300008 = 0xA4300008;
D_A430000C = 0xA430000C;
D_A4400004 = 0xA4400004;
D_A4400008 = 0xA4400008;
D_A440000C = 0xA440000C;
D_A4400010 = 0xA4400010;
D_A4400014 = 0xA4400014;
D_A4400018 = 0xA4400018;
D_A440001C = 0xA440001C;
D_A4400020 = 0xA4400020;
D_A4400024 = 0xA4400024;
D_A4400028 = 0xA4400028;
D_A440002C = 0xA440002C;
D_A4400030 = 0xA4400030;
D_A4400034 = 0xA4400034;
D_A4500004 = 0xA4500004;
D_A4500008 = 0xA4500008;
D_A450000C = 0xA450000C;
D_A4500010 = 0xA4500010;
D_A4500014 = 0xA4500014;
D_A4600004 = 0xA4600004;
D_A4600005 = 0xA4600005;
D_A4600006 = 0xA4600006;
D_A4600007 = 0xA4600007;
D_A4600008 = 0xA4600008;
D_A460000C = 0xA460000C;
D_A4600010 = 0xA4600010;
D_A4600014 = 0xA4600014;
D_A4600018 = 0xA4600018;
D_A460001C = 0xA460001C;
D_A4600020 = 0xA4600020;
D_A4600024 = 0xA4600024;
D_A4600028 = 0xA4600028;
D_A460002C = 0xA460002C;
D_A4600030 = 0xA4600030;
Partially format header files
2020-03-22 21:50:11 +00:00
D_A4800000 = 0xA4800000; // SI_DRAM_ADDR_REG
D_A4800004 = 0xA4800004; // SI_PIF_ADDR_RD64B_REG
D_A4800010 = 0xA4800010; // SI_PIF_ADDR_WR64B_REG
D_A4800018 = 0xA4800018; // SI_STATUS_REG
First proper commit.
2020-03-17 04:31:30 +00:00
// segment addresses
D_02000000 = 0x02000000;
D_02000400 = 0x02000400;
D_02000500 = 0x02000500;
D_02000900 = 0x02000900;
D_02000A00 = 0x02000A00;
D_02001E00 = 0x02001E00;
D_02001F00 = 0x02001F00;
D_02002000 = 0x02002000;
D_02002100 = 0x02002100;
D_02002500 = 0x02002500;
D_02002580 = 0x02002580;
D_02002600 = 0x02002600;
D_02002900 = 0x02002900;
D_02002E40 = 0x02002E40;
D_02002FC0 = 0x02002FC0;
D_02003040 = 0x02003040;
D_020035C0 = 0x020035C0;
D_020038C0 = 0x020038C0;
D_02003940 = 0x02003940;
D_02003AC0 = 0x02003AC0;
D_0201DA50 = 0x0201DA50;
D_0300AA48 = 0x0300AA48;
D_03012B20 = 0x03012B20;
Decompile Player (#387) * Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-09-19 01:45:39 +00:00
D_04002040 = 0x04002040;
First proper commit.
2020-03-17 04:31:30 +00:00
D_040020D0 = 0x040020D0;
D_04002160 = 0x04002160;
Decompile Player (#387) * Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-09-19 01:45:39 +00:00
D_040021F0 = 0x040021F0;
First proper commit.
2020-03-17 04:31:30 +00:00
D_04002280 = 0x04002280;
Decompile Player (#387) * Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-09-19 01:45:39 +00:00
D_04002340 = 0x04002340;
D_04002378 = 0x04002378;
D_04002400 = 0x04002400;
D_04002408 = 0x04002408;
D_04002420 = 0x04002420;
D_04002428 = 0x04002428;
D_04002430 = 0x04002430;
D_04002468 = 0x04002468;
D_040024E8 = 0x040024E8;
D_040024F8 = 0x040024F8;
D_04002538 = 0x04002538;
D_040025F8 = 0x040025F8;
D_04002600 = 0x04002600;
D_04002608 = 0x04002608;
D_04002618 = 0x04002618;
D_04002620 = 0x04002620;
D_04002628 = 0x04002628;
D_04002630 = 0x04002630;
D_04002638 = 0x04002638;
D_04002650 = 0x04002650;
D_04002660 = 0x04002660;
D_04002668 = 0x04002668;
D_04002670 = 0x04002670;
D_04002688 = 0x04002688;
D_04002698 = 0x04002698;
D_040026A0 = 0x040026A0;
D_040026B0 = 0x040026B0;
D_040026B8 = 0x040026B8;
D_040026E8 = 0x040026E8;
D_04002700 = 0x04002700;
D_04002708 = 0x04002708;
D_04002770 = 0x04002770;
D_04002780 = 0x04002780;
D_04002788 = 0x04002788;
D_040027D0 = 0x040027D0;
D_04002830 = 0x04002830;
D_04002838 = 0x04002838;
D_04002860 = 0x04002860;
D_04002878 = 0x04002878;
D_04002908 = 0x04002908;
D_04002AC8 = 0x04002AC8;
D_04002C00 = 0x04002C00;
D_04002C08 = 0x04002C08;
D_04002C10 = 0x04002C10;
D_04002C18 = 0x04002C18;
D_04002C20 = 0x04002C20;
D_04002C28 = 0x04002C28;
D_04002C30 = 0x04002C30;
D_04002C38 = 0x04002C38;
D_04002C90 = 0x04002C90;
D_04002C98 = 0x04002C98;
D_04002CA0 = 0x04002CA0;
D_04002D28 = 0x04002D28;
D_04002D38 = 0x04002D38;
D_04002D40 = 0x04002D40;
D_04002D48 = 0x04002D48;
D_04002D68 = 0x04002D68;
D_04002D80 = 0x04002D80;
D_04002D88 = 0x04002D88;
D_04002DA0 = 0x04002DA0;
D_04002DA8 = 0x04002DA8;
D_04002DB0 = 0x04002DB0;
D_04002DB8 = 0x04002DB8;
D_04002DC0 = 0x04002DC0;
D_04002DD0 = 0x04002DD0;
D_04002DF0 = 0x04002DF0;
D_04002DF8 = 0x04002DF8;
D_04002E10 = 0x04002E10;
D_04002E48 = 0x04002E48;
D_04002E90 = 0x04002E90;
D_04002EC8 = 0x04002EC8;
D_04002F00 = 0x04002F00;
D_04002F08 = 0x04002F08;
D_04002F10 = 0x04002F10;
D_04002F28 = 0x04002F28;
D_04002F30 = 0x04002F30;
D_04002F40 = 0x04002F40;
D_04002F58 = 0x04002F58;
D_04002F60 = 0x04002F60;
D_04002F68 = 0x04002F68;
D_04002F98 = 0x04002F98;
D_04002FA0 = 0x04002FA0;
D_04002FD0 = 0x04002FD0;
D_04002FE0 = 0x04002FE0;
D_04003000 = 0x04003000;
D_04003020 = 0x04003020;
D_04003040 = 0x04003040;
D_04003048 = 0x04003048;
D_04003050 = 0x04003050;
D_04003060 = 0x04003060;
D_04003068 = 0x04003068;
D_04003070 = 0x04003070;
D_04003098 = 0x04003098;
D_040030A0 = 0x040030A0;
D_040030A8 = 0x040030A8;
D_040030E0 = 0x040030E0;
D_040030F0 = 0x040030F0;
D_040030F8 = 0x040030F8;
D_04003100 = 0x04003100;
D_04003108 = 0x04003108;
D_04003120 = 0x04003120;
D_04003128 = 0x04003128;
D_04003148 = 0x04003148;
D_04003150 = 0x04003150;
D_04003158 = 0x04003158;
D_04003160 = 0x04003160;
D_040031A0 = 0x040031A0;
D_040031A8 = 0x040031A8;
First proper commit.
2020-03-17 04:31:30 +00:00
D_04003238 = 0x04003238;
Decompile Player (#387) * Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-09-19 01:45:39 +00:00
D_04003298 = 0x04003298;
D_040032B0 = 0x040032B0;
D_040032B8 = 0x040032B8;
D_040032C0 = 0x040032C0;
D_040032C8 = 0x040032C8;
D_040032D0 = 0x040032D0;
D_040032D8 = 0x040032D8;
D_040032E0 = 0x040032E0;
D_040032E8 = 0x040032E8;
D_040032F0 = 0x040032F0;
D_04003300 = 0x04003300;
D_04003308 = 0x04003308;
D_04003310 = 0x04003310;
D_04003318 = 0x04003318;
D_04003320 = 0x04003320;
D_04003328 = 0x04003328;
D_04003330 = 0x04003330;
D_04003380 = 0x04003380;
D_04003390 = 0x04003390;
D_040033A0 = 0x040033A0;
D_040033B0 = 0x040033B0;
D_040033B8 = 0x040033B8;
D_040033C8 = 0x040033C8;
First proper commit.
2020-03-17 04:31:30 +00:00
D_04004298 = 0x04004298;
D_04006020 = 0x04006020;
D_0400C808 = 0x0400C808;
D_0400C820 = 0x0400C820;
D_0400CB70 = 0x0400CB70;
D_04010130 = 0x04010130;
D_04015720 = 0x04015720;
D_04015760 = 0x04015760;
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
D_040184B0 = 0x040184B0;
First proper commit.
2020-03-17 04:31:30 +00:00
D_0401A0B0 = 0x0401A0B0;
D_0401E370 = 0x0401E370;
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
D_04021770 = 0x04021770;
First proper commit.
2020-03-17 04:31:30 +00:00
D_0402CF30 = 0x0402CF30;
Decompile Player (#387) * Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-09-19 01:45:39 +00:00
D_04033EE0 = 0x04033EE0;
First proper commit.
2020-03-17 04:31:30 +00:00
D_04037730 = 0x04037730;
Decompile Player (#387) * Setup player decomp * Decompile z_player.c and z_player_lib.c * Decompile remaining z_player.c functions * Various player improvements * Player progress (some non matchings and .data migrated) * Player progress (reposition data and fix some non matchings) * Cleanup, improve and document parts of z_player_lib.c/z_player.c * Fix player renames in z_en_st.c * Fix missing open/close disps in z_player.c * Minor player fixes * Address player comments
2020-09-19 01:45:39 +00:00
D_04037E30 = 0x04037E30;
First proper commit.
2020-03-17 04:31:30 +00:00
D_04038F00 = 0x04038F00;
D_04038FB0 = 0x04038FB0;
D_0403B030 = 0x0403B030;
D_0403BBA0 = 0x0403BBA0;
D_0403BCD8 = 0x0403BCD8;
D_0403F070 = 0x0403F070;
D_04042440 = 0x04042440;
D_04048160 = 0x04048160;
D_04048180 = 0x04048180;
D_04049210 = 0x04049210;
D_04049AD0 = 0x04049AD0;
D_0404D1C0 = 0x0404D1C0;
D_0404D450 = 0x0404D450;
D_05001390 = 0x05001390;
D_05001390 = 0x05001390;
D_0500CA70 = 0x0500CA70;
D_06001220 = 0x06001220;
D_06001220 = 0x06001220;
D_06001290 = 0x06001290;
D_06001290 = 0x06001290;
D_06001438 = 0x06001438;
D_06001438 = 0x06001438;
D_06001470 = 0x06001470;
D_06001470 = 0x06001470;
D_06001C40 = 0x06001C40;
D_06006CC0 = 0x06006CC0;
D_06016118 = 0x06016118;
D_06025218 = 0x06025218;
D_060252D8 = 0x060252D8;
D_06025438 = 0x06025438;
D_06025598 = 0x06025598;
D_06025658 = 0x06025658;
D_060257B8 = 0x060257B8;
D_0602A738 = 0x0602A738;
D_0602CB48 = 0x0602CB48;
Arms_Hook OK (#210) * Arms_Hook OK * cleanup * decr * remove redundant include * missed some things * rename things Co-authored-by: dark-samus <mathmcclintic@gmail.com>
2020-06-17 19:44:22 +00:00
D_0602B288 = 0x0602B288;
D_0602AFF0 = 0x0602AFF0;
First proper commit.
2020-03-17 04:31:30 +00:00
D_070380D4 = 0x070380D4;
D_0703811C = 0x0703811C;
D_080895C0 = 0x080895C0;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
// z_skelanime
link_animetion_segment = 0x07000000;
Decompiled ovl_En_Cow (#113) * Beginning the Cow * Decompiled ovl_En_Cow * Giving the cow milk
2020-05-04 16:11:37 +00:00
// z_en_cow
D_060001CC = 0x060001CC;
D_06004010 = 0x06004010;
D_06004264 = 0x06004264;
D_06004348 = 0x06004348;
D_06004C30 = 0x06004C30;
D_06004E98 = 0x06004E98;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_en_tubo_trap
Fix and cleanup ovl_En_Tubo_Trap (4/7 matched)
2020-03-18 20:22:00 +00:00
D_05017870 = 0x05017870;
D_05017A60 = 0x05017A60;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_en_vase
Actor Cleanups (#177) * rename init chains, colchkinfo, colider inits, damage tables * actor cleanups * fix collider init script names * small fixes * ichain arg name * change dynapoly types and names * revert enru1 data name * and the type * pr suggestions
2020-05-31 09:55:48 +00:00
D_06000000 = 0x06000000;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_door_toki
Actor Cleanups (#177) * rename init chains, colchkinfo, colider inits, damage tables * actor cleanups * fix collider init script names * small fixes * ichain arg name * change dynapoly types and names * revert enru1 data name * and the type * pr suggestions
2020-05-31 09:55:48 +00:00
D_06007888 = 0x06007888;
First proper commit.
2020-03-17 04:31:30 +00:00
Ovl_Bg_Spot01_Idomizu OK (#303) * Init OK (with weird goto) * func_808ABB84 matching * BgSpot01Idomizu_Destroy matching * Run ./format.sh * BgSpot01Idomizu_Update matching * Remove Init's goto * BgSpot01Idomizu_Draw matching * Delete BgSpot01Idomizu asm files * Variable naming and cleanup * Update spec * Delete unused ASM * Address review feedback * Fix fake match in Draw caused by not doing dispRefs[4]
2020-08-14 04:17:25 +00:00
// z_bg_spot01_idomizu
D_060007D0 = 0x060007D0;
Decompiles z_bg_spot01_objects2.c (#357) * Starts z_bg_spot01_objects2 * z_bg_spot01_objects2.c almost finished * Finishes z_bg_spot01_objects2.c * Removes unused asm * PR comments and rebased to master * Addresses PR comments #2 Co-authored-by: i82orbom <i82orbom i82orbom@github> Co-authored-by: i82orbom <i82orbom@github.com>
2020-09-04 22:28:45 +00:00
// z_bg_spot01_objects2
D_06001A38 = 0x06001A38;
D_06001C58 = 0x06001C58;
Almost done
2020-03-23 21:33:12 +00:00
// z_bg_spot09_obj
D_06008010 = 0x06008010;
Decompiles z_bg_spot11_bakudankabe.c (#355) * Starts z_bg_spot11_bakudankabe * BgSpot11Bakudankabe_Init * BgSpot11Bakudankabe_Destroy * BgSpot11Bakudankabe_Update * BgSpot11Bakudankabe_Draw * func_808B2180 * func_808B2218 WIP * Finishes z_bg_spot11_bakudankabe.c * Removes forward declared function * Addresses PR comments Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-29 01:14:20 +00:00
// z_bg_spot11_bakudankabe
D_06001A58 = 0x06001A58;
D_06001980 = 0x06001980;
D_0500A880 = 0x0500A880;
Decompiled ovl_Bg_Spot12_Gate
2020-03-25 01:42:07 +00:00
// z_bg_spot12_gate
D_06001080 = 0x06001080;
D_060011EC = 0x060011EC;
Decompiled ovl_Bg_Spot12_Saku
2020-04-05 02:48:30 +00:00
// z_bg_spot12_saku
D_06002260 = 0x06002260;
D_0600238C = 0x0600238C;
z_bg_spot15_rrbox OK (#375) * Initial work on spot15_rrbox * Few functions done with OK * Added destroy function * Fixed up struct, made actionFunc and completed more functions * Another function * Another function * Another function * Another function * Another function * Another function * Another function * Another function * Another function * Another function * Another function * Another function * File entirely working * Replaced padding with better variables * Replaced more padding * Ran format script and some other minor layout changes * Removed assembly files * Made update function consistent with other base functions * Renamed variable * Removed data file * Updated reloc location in spec * Removed old reloc file * Made init chain static * Minor fixes * Fixed various minor issues * More minor cleanup * Even more minor cleanup * Minor cleanup * More minor cleanup * Minor fix * Fixed up more variable names * Apply suggestions from code review Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * More cleanup Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-09-27 00:06:26 +00:00
// z_bg_spot15_rrbox
D_06000348 = 0x06000348;
D_06000180 = 0x06000180;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_spot18_futa
Actor Cleanups (#177) * rename init chains, colchkinfo, colider inits, damage tables * actor cleanups * fix collider init script names * small fixes * ichain arg name * change dynapoly types and names * revert enru1 data name * and the type * pr suggestions
2020-05-31 09:55:48 +00:00
D_06000368 = 0x06000368;
D_06000150 = 0x06000150;
First proper commit.
2020-03-17 04:31:30 +00:00
Decompiled ovl_Bg_Spot18_Shutter (#395) * Decompiled ovl_Bg_Spot18_Shutter * formatting * PR fix
2020-09-20 16:14:32 +00:00
// z_bg_spot18_shutter
D_06000534 = 0x06000534;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_umajump
D_06001438 = 0x06001438;
D_06001220 = 0x06001220;
// z_item_b_heart
D_06001290 = 0x06001290;
D_06001470 = 0x06001470;
// z_door_ana
D_05001390 = 0x05001390;
// z_bg_bdan_switch
D_06005CF8 = 0x06005CF8;
D_060061A0 = 0x060061A0;
D_06005A20 = 0x06005A20;
// z_bg_elevator
D_06000360 = 0x06000360;
D_06000180 = 0x06000180;
ovl_Bg_Hidan_Dalm OK (#367) * ovl_Bg_Hidan_Dalm OK, except _Init * names and style changes * OK, names, style
2020-09-07 12:29:58 +00:00
// z_bg_hidan_dalm
D_0600BBF0 = 0x0600BBF0;
D_0600BDF0 = 0x0600BDF0;
D_0600DA10 = 0x0600DA10;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_hidan_fslift
D_0600B630 = 0x0600B630;
D_0600E1E8 = 0x0600E1E8;
// z_bg_hidan_syoku
D_0600A7E0 = 0x0600A7E0;
D_0600E568 = 0x0600E568;
Bg jya1flift (#269) * Update ZAP2 * BgJya1flift progress * BgJya1flift Progress * Rename unknown variables * BgJya1flift Progress * Finish Decomp for BgJya1flift FInished decomp and added missing functions to functions.h * Fix struct padding * PR fixes * PR fixes * Pr Fixes
2020-07-22 07:48:31 +00:00
// z_bg_jya_1flift
D_060004A8 = 0x060004A8;
D_060001F0 = 0x060001F0;
Decomp BgJyaBombiwa (#294) * Decomp BgJyaBombiwa * Delete z_bg_jya_bombiwa.data.s * Delete z_bg_jya_bombiwa.reloc.s * PR fixes * Delete cur_list.txt * Delete old_data_list.txt * Delete data_list.txt * Delete old_list.txt * PR fixes * PR fixes
2020-08-04 18:01:40 +00:00
// z_bg_jya_bombiwa
D_0600E490 = 0x0600E490;
D_0600EDC0 = 0x0600EDC0;
D_0600E710 = 0x0600E710;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_jya_amishutter
D_0600C0A0 = 0x0600C0A0;
D_0600C4C8 = 0x0600C4C8;
Decompiled ovl_Bg_Jya_Block (#286) * Decompiled ovl_Bg_Jya_Block * PR comments
2020-07-23 03:44:18 +00:00
// z_bg_jya_block
D_05004350 = 0x05004350;
D_05004CD0 = 0x05004CD0;
D_05004E98 = 0x05004E98;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_jya_kanaami
D_0600F000 = 0x0600F000;
D_0600F208 = 0x0600F208;
Decomp BgJyaLift (#216) * Re upload * Decomp BgJyaLift * Fixed issues Fixed issues from review * Edits after review * Review Fixes Made some fixes and also changed an unknown variable name * Fixes to file Fixed some styling things and renamed the last function * Added fixes Added roman's fixes * Delete filemap.pyc * Fixes Removed ctx.c and replaced tabs with spaces spec.
2020-06-24 22:34:31 +00:00
// z_bg_jya_lift
D_0600D7E8 = 0x0600D7E8;
D_0600CCE0 = 0x0600CCE0;
Decompiled ovl_Bg_Jya_Zurerukabe (#424) * Decompiled ovl_Bg_Jya_Zurerukabe * PR suggestions, cleanup * PR suggestion
2020-09-30 20:09:52 +00:00
// z_bg_jya_zurerukabe
D_06012340 = 0x06012340;
D_06012508 = 0x06012508;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_menkuri_kaiten
D_060038D0 = 0x060038D0;
D_060042D8 = 0x060042D8;
// z_bg_spot01_idosoko
D_06003B20 = 0x06003B20;
D_06003C64 = 0x06003C64;
// z_bg_mizu_uzu
D_060074EC = 0x060074EC;
BgMizuWater OK (#359) * BgMizuWater OK * Renaming * Fix formatting * Cleanup, use new gfx functions * Fix stack issue * PR fixes * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR fixes * More PR fixes * Fix formatting Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-27 01:06:30 +00:00
// z_bg_mizu_water
D_06004B20 = 0x06004B20;
Bg mori elevator one non matching (#293) * BgMoriElevator Progress * Decomp Progress * Progress * Progress * Progress * Progress * Progress * Finish Decomp for MoriElevator * Test * Update spec * Update z_bg_mori_elevator.c * PR fixes * PR fixes * PR fixes * PR fixes * Fixed a non matching * Delete func_808A1800.s * PR fixes * PR fixes * PR fixes * PR fixes * Run Clang-Format * Change PlaceInGround to WaitAfterInit * PR fixes * Change a variable
2020-08-21 01:53:43 +00:00
// z_bg_mori_elevator
D_060035F8 = 0x060035F8;
D_06002AD0 = 0x06002AD0;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_spot07_taki
D_060038FC = 0x060038FC;
D_06002590 = 0x06002590;
Decompiles z_bg_spot08_bakudankabe.c (#348) * func_808B02D0 * BgSpot08Bakudankabe_Init * BgSpot08Bakudankabe_Destroy * BgSpot08Bakudankabe_Update * Finishes z_bg_spot08_bakudankabe * Update src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: i82orbom <i82orbom i82orbom@github> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-27 19:25:22 +00:00
// z_bg_spot08_bakudankabe
D_060039D4 = 0x060039D4;
BgMizuWater OK (#359) * BgMizuWater OK * Renaming * Fix formatting * Cleanup, use new gfx functions * Fix stack issue * PR fixes * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR fixes * More PR fixes * Fix formatting Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-27 01:06:30 +00:00
D_06003898 = 0x06003898;
Decompiles z_bg_spot08_bakudankabe.c (#348) * func_808B02D0 * BgSpot08Bakudankabe_Init * BgSpot08Bakudankabe_Destroy * BgSpot08Bakudankabe_Update * Finishes z_bg_spot08_bakudankabe * Update src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: i82orbom <i82orbom i82orbom@github> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-27 19:25:22 +00:00
D_0500A880 = 0x0500A880;
Decomp BgYdanHasi (#263) * Decomp BgYdanHasi * PR fixes. * More PR fixes * FIx issue with missing Extern
2020-07-19 03:06:26 +00:00
// z_bg_ydan_hasi
D_06005780 = 0x06005780;
D_06007798 = 0x06007798;
D_06005DE0 = 0x06005DE0;
Decomp BgYdanMaruta (#338) * Fix * fix * Fixed upstream * PR fixes * PR fixes * Fix ZAP2. Hopefully
2020-08-23 10:44:22 +00:00
// z_bg_ydan_maruta
D_060066A8 = 0x060066A8;
D_06008D88 = 0x06008D88;
D_06006570 = 0x06006570;
Decompile En_Mag (#406) * Decompile En_Mag * Document En_Mag * Address some review comments
2020-09-27 14:14:25 +00:00
// z_en_mag
D_06000000 = 0x06000000;
D_06019A00 = 0x06019A00;
D_0601A400 = 0x0601A400;
D_06024800 = 0x06024800;
D_06024C00 = 0x06024C00;
D_06024E40 = 0x06024E40;
Decompiled ovl_En_Ma1 (#83) * first steps * some more * fixing merge * more progress * progs * Decompiled ovl_En_Ma1 * newline * Pr suggestion * Fixing some small things * Update src/overlays/actors/ovl_En_Ma1/z_en_ma1.c Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com> * Removing padding * Fixing script * Fixing some things Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-04-27 05:47:35 +00:00
// z_en_ma1
D_06000820 = 0x06000820;
D_06008460 = 0x06008460;
D_06008D64 = 0x06008D64;
Decompiled ovl_En_Ma2 (#93) * first steps * some more * fixing merge * more progress * progs * Decompiled ovl_En_Ma1 * newline * Pr suggestion * 2 to go * Makefile machinery work * Updating Jenkinsfile * Initial setup for OSX repo support * Adding ido7 to repo * Makefile reversion * Iniital Dockerfile * iconv fix * Docker stuff * Dun * Fixing stuff * Updating Dockerfile * Update README-OSX.md * Restore functions.h * Formatting * Defining some funcs * Renaming funcs * Removing unnecessary README-OSX * Addressing PR comments
2020-05-01 10:08:39 +00:00
// z_en_ma2
D_06005420 = 0x06005420;
D_06008D90 = 0x06008D90;
D_060093BC = 0x060093BC;
D_06009EE0 = 0x06009EE0;
Decompiled z_en_md.c (#246) * Decompile z_bg_haka_trap.c * Update spec delete old .reloc.s file Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * Deleted reloc.s and made style changes to function pointers and local vars * Renamed timer field, added more useful temp names * Implemented Roman's suggestions, including moving enum to header file, moving some static variables inside functions, removing unnecessary casts, removing unnecessary temps, and fixing a few style issues * Commented dual purpose of unk_16A and formatted file again * Decompiled z_en_md.c decompiled EnMd_Init Decompiled EnMd_Draw Decompiled EnMd_Destroy and EnMd_Update Decompiled func_80AAC104 Decompiled func_80AAA92C Decompiled func_80AAA93C Decompiled func_80AAA274 Decompiled func_80AAA308 Decompiled func_80AAA39C Decompiled func_80AAA474 Decompiled func_80AAA508 Decompiled func_80AAA5A4 Decompiled func_80AAA638 Decompiled func_80AAA6D4 Decompiled func_80AAA768 Decompiled func_80AAA7FC Decompiled func_80AAA890 Decompiled func_80AAA93C Decompiled func_80AAA250 Decompiled func_80AAB874 Decompile func_80AAAA24 Decompiled func_80AABD0C Decompiled func_80AAB8F8 Decompiled func_80AAAE94 Decompiled func_80AAACF8 Decompiled func_80AAADE0 Decompiled func_80AAAE14 Decompiled func_80AAB03C Decompiled func_80AAB0E0 Decompiled func_80AAB370 Decompiled func_80AAB4DC Decompiled func_80AAB5A4 Decompiled func_80AABC10 Decompiled func_80AAAC78 Decompiled func_80AABEF0 Decompiled func_80AAB158 Decompiled func_80AAAF04 Decompiled func_80AAB948 Migrated data into C file Commented out data file (migrated data) Removed data file from spec about to try changing alpha type cleaned up functions except for last two fixed player and player2 issue Decompiled z_en_md.c * updated actor field names to match upstream changes * deleted old asm nonmatchings (whoops) * Update src/overlays/actors/ovl_En_Md/z_en_md.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * removed unnecessary forward declarations * got rid of unnecessary temps in path functions, added names based on strong copy paste similarity with en_kz, minor formatting changes * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * pass EnMd* to appropriate functions instead of Actor* * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * finish renaming limb draw funcs * inlined vector data and moved static data * Update src/overlays/actors/ovl_En_Md/z_en_md.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * ran formatter and completed name change in PostLimbDraw * removed address-of array for sAnimations Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-14 19:59:45 +00:00
// z_en_md
D_06007FB8 = 0x06007FB8;
D_060002C8 = 0x060002C8;
Partially format header files
2020-03-22 21:50:11 +00:00
// z_en_ms
First proper commit.
2020-03-17 04:31:30 +00:00
D_060005EC = 0x060005EC;
D_06003DC0 = 0x06003DC0;
Decompiled ovl_En_Zl1 (#169) * Some progress * progs * More * 1 more * Init * Slightly better score on one function * 1 down! * some progress * Prep for PR * PR suggestions * OK! * Formatting * formatting again * PR comments * updating ZAP2
2020-05-30 13:33:29 +00:00
// z_en_zl1
D_06000438 = 0x06000438;
D_06008848 = 0x06008848;
D_06008C48 = 0x06008C48;
D_0600F5D8 = 0x0600F5D8;
D_06010B38 = 0x06010B38;
D_06011348 = 0x06011348;
D_060116E4 = 0x060116E4;
D_06011B88 = 0x06011B88;
D_06012118 = 0x06012118;
D_060132D8 = 0x060132D8;
D_060138E0 = 0x060138E0;
D_06013F10 = 0x06013F10;
D_060143A8 = 0x060143A8;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_spot17_funen
D_06000B40 = 0x06000B40;
Decompiles z_bg_spot17_bakudankabe.c (#347) * Decompiles z_bg_spot17_bakudankabe.c * More progress, BgSpot17Bakudankabe_Draw * * func_808B6BC0 start * Some progress *func_808B6BC0 * func_808B6BC0 almost there * Cleanup and finished z_bg_spot17_bakudankabe.c * Addresses PR comments * Adds description to z_bg_spot17_bakudankabe * Renames some variables Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-27 19:41:18 +00:00
// z_bg_spot17_bakudankabe
D_06000A38 = 0x06000A38;
D_060008A0 = 0x060008A0;
D_06000960 = 0x06000960;
D_0500A880 = 0x0500A880;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_spot00_break
D_06000908 = 0x06000908;
D_06000AF0 = 0x06000AF0;
D_06000440 = 0x06000440;
D_06000980 = 0x06000980;
Decompiled ovl_Bg_Spot01_Idohashira (1 non-matching) (#213) * Almost done * one non-matching * PR suggestions * Further suggestions * minor correction
2020-06-21 21:50:01 +00:00
// z_bg_spot01_idohashira
D_06000420 = 0x06000420;
D_0600075C = 0x0600075C;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_spot15_saku
D_060004D0 = 0x060004D0;
// z_door_gerudo
D_06000040 = 0x06000040;
D_06000170 = 0x06000170;
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
// z_eff_ss_kirakira
First proper commit.
2020-03-17 04:31:30 +00:00
D_04037880 = 0x04037880;
ovl_en_hs2 OK (#423) * Decompiled ovl_en_hs2 * Replaced skelAnime pointer with pad, changed some values to hex, replaced early return with else statment, removed unnecessary padding in the header, removed unneeded & on a function pointer * Replaced a tab with whitespace, removed address operator in front of ActorShadow_DrawFunc_Circle, moved vec3f inside the PostLimbDraw function * Changed 0xFFFE to ~1
2020-10-01 11:49:47 +00:00
// z_en_hs2
D_060005C0 = 0x60005C0;
D_06006260 = 0x6006260;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_en_bird
D_0600006C = 0x0600006C;
D_06002190 = 0x06002190;
Decompiled ovl_En_Blkobj (#242) * Decompiled ovl_En_Blkobj * PR suggestions * gfx commands
2020-07-14 05:15:43 +00:00
// z_en_blkobj
D_060014E0 = 0x060014E0;
D_060053D0 = 0x060053D0;
D_06007564 = 0x06007564;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_en_lightbox
D_06001F10 = 0x06001F10;
D_06000B70 = 0x06000B70;
Decompiled ovl_En_Rd (1 nonmatching) (#390) * Initial progress * Broken but almost * Final attempt at the last function * Fixing struct def * PR updates * PR stuff * baby commit * PR comments * Error handling
2020-09-27 01:16:28 +00:00
// z_en_rd
D_06004268 = 0x06004268;
D_060046F8 = 0x060046F8;
D_06004ADC = 0x06004ADC;
D_06004F94 = 0x06004F94;
D_060057AC = 0x060057AC;
D_06005D98 = 0x06005D98;
D_06006E88 = 0x06006E88;
D_060074F0 = 0x060074F0;
D_06008040 = 0x06008040;
D_060087D0 = 0x060087D0;
D_0600E778 = 0x0600E778;
D_0600EFDC = 0x0600EFDC;
D_06003DD8 = 0x06003DD8;
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
// z_eff_ss_extra
First proper commit.
2020-03-17 04:31:30 +00:00
D_06000DC0 = 0x06000DC0;
Decompiled ovl_Bg_Gate_Shutter
2020-03-22 21:56:08 +00:00
// z_bg_gate_shutter
D_06001CD0 = 0x06001CD0;
D_06001DA8 = 0x06001DA8;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_gjyo_bridge
D_06000600 = 0x06000600;
D_06000DB8 = 0x06000DB8;
D_02002640 = 0x02002640;
// z_bg_spot09_obj
D_06008010 = 0x06008010;
// z_bg_spot15_saku
D_060003C0 = 0x060003C0;
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
// z_eff_ss_ice_smoke
First proper commit.
2020-03-17 04:31:30 +00:00
D_060030A0 = 0x060030A0;
D_06003158 = 0x06003158;
Decompiled ovl_Bg_Haka (#346) * Progress * match func_8087B7E8 * combine into else if * match func_8087B938 * reorder condition to be more readable * SFX macros * clang fmt * func_8087BAAC and func_8087BAE4 * match BgHaka_Draw * attempt to remove dependency on asm data * match file and remove asm * reorder comparison * clang format * use bitwise not * merge upstream * fix ZAP2 * Update src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * implement fig's suggestions Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-27 15:48:38 +00:00
// z_bg_haka
D_06000428 = 0x06000428;
D_060001B0 = 0x060001B0;
D_060002A8 = 0x060002A8;
Almost done
2020-03-23 05:31:03 +00:00
// z_bg_haka_megane
D_06001250 = 0x06001250;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_haka_meganebg
D_06005334 = 0x06005334;
D_06009168 = 0x06009168;
D_06000118 = 0x06000118;
Decompile z_bg_haka_trap.c (#201) * Decompile z_bg_haka_trap.c * Update spec delete old .reloc.s file Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * Deleted reloc.s and made style changes to function pointers and local vars * Renamed timer field, added more useful temp names * Implemented Roman's suggestions, including moving enum to header file, moving some static variables inside functions, removing unnecessary casts, removing unnecessary temps, and fixing a few style issues * Commented dual purpose of unk_16A and formatted file again Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
2020-06-11 21:39:47 +00:00
// z_bg_haka_trap
D_060081D0 = 0x60081D0;
D_06008D10 = 0x6008D10;
D_06009CD0 = 0x6009CD0;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_spot01_fusya
D_06000100 = 0x06000100;
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
// z_eff_ss_g_ripple
First proper commit.
2020-03-17 04:31:30 +00:00
D_040254B0 = 0x040254B0;
D_040244B0 = 0x040244B0;
Decomp EnNiwGirl (#306) * Fix Repo * Update z_en_niw.h * PR fixes * Update z_en_niw_girl.c Add all masks to switch at 142 * Added currentMask enum * Small fixes * Cleaned up a lot of little things * PR fixes
2020-08-15 23:37:26 +00:00
// z_en_niw_girl
D_06009948 = 0x06009948;
D_06000378 = 0x06000378;
D_06009C78 = 0x06009C78;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_title
D_01002720 = 0x01002720;
D_01001800 = 0x01001800;
Decompiled z_title.c `z_title.c` : matching
2020-03-19 22:29:33 +00:00
D_01000000 = 0x01000000;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_shot_sun
D_02007020 = 0x02007020;
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109) Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 04:05:44 +00:00
// z_eff_ss_g_splash
First proper commit.
2020-03-17 04:31:30 +00:00
D_04027DF0 = 0x04027DF0;
More
2020-03-20 00:06:46 +00:00
// z_demo_geff
D_06000EA0 = 0x06000EA0;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_demo_go
D_060029A8 = 0x060029A8;
D_06004930 = 0x06004930;
D_0600E680 = 0x0600E680;
D_0600FEF0 = 0x0600FEF0;
Decompiled ovl_Demo_Im (#296) * First steps * more * more * clean * Decompiled ovl_Demo_Im * fixes * comment update * consistency * PR comments
2020-08-15 18:07:28 +00:00
// z_demo_im
D_02002524 = 0x02002524;
D_06000710 = 0x06000710;
D_06000AFC = 0x06000AFC;
D_0600EDE8 = 0x0600EDE8;
D_060014E4 = 0x060014E4;
D_06001868 = 0x06001868;
D_0600FB10 = 0x0600FB10;
D_0600F788 = 0x0600F788;
D_060101C8 = 0x060101C8;
D_06010EE0 = 0x06010EE0;
D_0601182C = 0x0601182C;
D_06011C08 = 0x06011C08;
D_06012218 = 0x06012218;
Decompiled ovl_Demo_Sa (#231) * Decompiled ovl_Demo_Sa * PR suggestions * ff -> alpha * PR suggestions * Reverting cutscene data
2020-07-08 23:40:09 +00:00
// z_demo_sa
D_06001334 = 0x06001334;
D_060021D8 = 0x060021D8;
D_06007B80 = 0x06007B80;
D_0600B1A0 = 0x0600B1A0;
D_0600DF80 = 0x0600DF80;
D_0600E500 = 0x0600E500;
D_0600F580 = 0x0600F580;
D_0600FCE0 = 0x0600FCE0;
D_0600FFD4 = 0x0600FFD4;
D_0601113C = 0x0601113C;
D_060135EC = 0x060135EC;
D_06013CD8 = 0x06013CD8;
D_060140BC = 0x060140BC;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_en_test
D_0600316C = 0x0600316C;
D_06007C28 = 0x06007C28;
D_0600C438 = 0x0600C438;
D_06001C20 = 0x06001C20;
D_060081B4 = 0x060081B4;
D_060026D4 = 0x060026D4;
D_0600E2B0 = 0x0600E2B0;
D_0600B00C = 0x0600B00C;
D_0600B4E4 = 0x0600B4E4;
D_0600BE4C = 0x0600BE4C;
D_06001978 = 0x06001978;
D_0600A324 = 0x0600A324;
D_0600A99C = 0x0600A99C;
D_0600A324 = 0x0600A324;
D_0600A99C = 0x0600A99C;
D_06000444 = 0x06000444;
D_06008604 = 0x06008604;
D_06001420 = 0x06001420;
D_06009A90 = 0x06009A90;
ovl_En_Tk OK
2020-03-18 19:42:43 +00:00
// z_en_tk
D_04051DB0 = 0x04051DB0;
D_040521B0 = 0x040521B0;
D_040525B0 = 0x040525B0;
D_040529B0 = 0x040529B0;
D_04052DB0 = 0x04052DB0;
D_040531B0 = 0x040531B0;
D_040535B0 = 0x040535B0;
D_040539B0 = 0x040539B0;
D_06001144 = 0x06001144;
D_06001FA8 = 0x06001FA8;
D_06002F84 = 0x06002F84;
D_0600ACE0 = 0x0600ACE0;
D_0600BC90 = 0x0600BC90;
D_0600BCA0 = 0x0600BCA0;
D_0600BE40 = 0x0600BE40;
Decompiled ovl_En_Zl2 (2 nonmatchings) (#223) * Almost dun * 3 more, progress... * 2 more * Fixing field rename * improvement * 1 more * progress * more * work * Preparing for PR * Comments * tidbits * more tidbits * fixes * PR comments * Nonmatching reloc * PR suggestions * PR suggestions
2020-07-04 12:34:51 +00:00
// z_en_zl2
D_0600325C = 0x0600325C;
D_060003BC = 0x060003BC;
D_06000A50 = 0x06000A50;
D_06000EB0 = 0x06000EB0;
D_06001010 = 0x06001010;
D_060013A0 = 0x060013A0;
D_06001670 = 0x06001670;
D_06001B48 = 0x06001B48;
D_060022D0 = 0x060022D0;
D_06002750 = 0x06002750;
D_06002B14 = 0x06002B14;
D_06002F30 = 0x06002F30;
D_06003538 = 0x06003538;
D_06004900 = 0x06004900;
D_06005F40 = 0x06005F40;
D_06006778 = 0x06006778;
D_06007D0C = 0x06007D0C;
D_060087B8 = 0x060087B8;
D_060090D8 = 0x060090D8;
D_06009AD4 = 0x06009AD4;
D_0600A15C = 0x0600A15C;
D_0600A79C = 0x0600A79C;
D_0600AAD4 = 0x0600AAD4;
D_0600AFE0 = 0x0600AFE0;
D_0600B224 = 0x0600B224;
D_0600B5FC = 0x0600B5FC;
D_0600BAE8 = 0x0600BAE8;
D_06010D70 = 0x06010D70;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_arms_hook
D_0602B288 = 0x0602B288;
D_0602AFF0 = 0x0602AFF0;
// z_bg_bdan_objects
D_060038E8 = 0x060038E8;
Decompiled ovl_Bg_Bdan_Objects (#66) * Decompiled ovl_Bg_Bdan_Objects * Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com> * Header update * formatting * Update include/z64.h Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com> * Fixing structs Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-04-12 16:04:14 +00:00
D_06005048 = 0x06005048;
D_06005580 = 0x06005580;
D_06008CE0 = 0x06008CE0;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_bombwall
D_050041B0 = 0x050041B0;
D_05003FC0 = 0x05003FC0;
D_05004088 = 0x05004088;
// z_bg_bom_guard
D_06001C40 = 0x06001C40;
// z_bg_bowl_wall
D_06001B00 = 0x06001B00;
D_06000CB8 = 0x06000CB8;
D_06000610 = 0x06000610;
D_06001390 = 0x06001390;
// z_bg_ddan_jd
D_06003CE0 = 0x06003CE0;
D_060037B8 = 0x060037B8;
// z_bg_dodoago
D_06001DDC = 0x06001DDC;
Decompiles z_bg_dodoago.c (#334) * Starts decompiling z_bg_dodoago.c * Removes data * * BgDodoago_SetupAction * * BgDodoago_Destroy * * func_80872288 * * BgDodoago_Draw * * func_80871A08 * * BgDodoago_Init * WIP * * func_80871CF4 * * func_80871CF4 * WIP * * BgDodoago_Update * Finishes z_bg_dodoago * Addresses PR comments * Addresses PR comments #2 * Removes Setup forward declared function * Addresses PR comments #3 Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-24 03:17:47 +00:00
D_60013500 = 0x06001350;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_dy_yoseizo
D_02000160 = 0x02000160;
D_02001020 = 0x02001020;
D_02001F40 = 0x02001F40;
D_02000130 = 0x02000130;
D_020013E0 = 0x020013E0;
D_020025D0 = 0x020025D0;
D_06008698 = 0x06008698;
D_0601C450 = 0x0601C450;
D_060031C0 = 0x060031C0;
D_0601D514 = 0x0601D514;
D_06001DF0 = 0x06001DF0;
D_060069E8 = 0x060069E8;
D_06007CA8 = 0x06007CA8;
D_06004344 = 0x06004344;
D_06005E60 = 0x06005E60;
D_0600092C = 0x0600092C;
D_060058D8 = 0x060058D8;
D_06005860 = 0x06005860;
D_06005810 = 0x06005810;
// z_obj_elevator
D_06000180 = 0x06000180;
D_06000360 = 0x06000360;
ovl_Obj_Lightswitch OK and documented (#373) * ovl_Obj_Lightswitch OK * ovl_Obj_Lightswitch documented * Removed unneeded prototypes * Minor cleanup * Cleanup, names * Use color array for more sane SetEnvColor * enum styling Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * more enum styling * globalCtx2 meme * XxxInit -> SetupXxx Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-27 14:35:52 +00:00
// z_obj_lightswitch
D_06000260 = 0x06000260;
D_06000398 = 0x06000398;
D_06000408 = 0x06000408;
D_06000420 = 0x06000420;
D_06000C20 = 0x06000C20;
D_06001420 = 0x06001420;
ovl_En_Part (#383) * ovl_En_Part * PR review * PR review * Rebase * PR review * Oversight * Rebase * PR review
2020-10-01 22:51:05 +00:00
// z_en_part
D_06001300 = 0x06001300;
D_06001700 = 0x06001700;
D_06001900 = 0x06001900;
D_06001F00 = 0x06001F00;
D_06002100 = 0x06002100;
D_06002FF0 = 0x06002FF0;
D_06015380 = 0x06015380;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_en_pu_box
D_06000380 = 0x06000380;
D_060006D0 = 0x060006D0;
// z_bg_pushbox
D_06000000 = 0x06000000;
D_06000350 = 0x06000350;
Decompiled ovl_En_Ru1 (#72) * Decompiled ovl_En_Ru1 * Formatting * Actor/TransitionDrawTable struct fixes * addressing PR comments * addressing PR comments (2)
2020-04-18 08:50:41 +00:00
// z_en_ru1
D_06000690 = 0x06000690;
D_06000E54 = 0x06000E54;
D_06001488 = 0x06001488;
D_06002058 = 0x06002058;
D_06002990 = 0x06002990;
D_06002EC0 = 0x06002EC0;
D_06003608 = 0x06003608;
D_06003784 = 0x06003784;
D_06004074 = 0x06004074;
D_06004350 = 0x06004350;
D_06004648 = 0x06004648;
D_06004BF0 = 0x06004BF0;
D_060063F4 = 0x060063F4;
D_06006B9C = 0x06006B9C;
D_06007534 = 0x06007534;
D_060078E4 = 0x060078E4;
D_06008100 = 0x06008100;
D_06008AA8 = 0x06008AA8;
D_06009060 = 0x06009060;
D_060097B8 = 0x060097B8;
D_06012700 = 0x06012700;
D_06012E94 = 0x06012E94;
D_06013A64 = 0x06013A64;
Beginning
2020-03-21 23:05:38 +00:00
// z_en_ru2
D_060004CC = 0x060004CC;
5 to go
2020-03-22 20:40:08 +00:00
D_06000F20 = 0x06000F20;
D_060022E0 = 0x060022E0;
D_06002AE0 = 0x06002AE0;
Beginning
2020-03-21 23:05:38 +00:00
D_0600C700 = 0x0600C700;
D_0600D3DC = 0x0600D3DC;
D_0600DCAC = 0x0600DCAC;
D_06000DE8 = 0x06000DE8;
D_0600E630 = 0x0600E630;
D_0600F03C = 0x0600F03C;
D_0600F8B8 = 0x0600F8B8;
First proper commit.
2020-03-17 04:31:30 +00:00
// z_bg_mjin
D_06000140 = 0x06000140;
D_06000330 = 0x06000330;
Actor Cleanups (#177) * rename init chains, colchkinfo, colider inits, damage tables * actor cleanups * fix collider init script names * small fixes * ichain arg name * change dynapoly types and names * revert enru1 data name * and the type * pr suggestions
2020-05-31 09:55:48 +00:00
D_06000330_ = 0x06000330;
First proper commit.
2020-03-17 04:31:30 +00:00
D_06000658 = 0x06000658;
// z_en_wallmas
D_0600299C = 0x0600299C;
D_06008FB0 = 0x06008FB0;
D_06009DB0 = 0x06009DB0;
D_060019CC = 0x060019CC;
D_06009520 = 0x06009520;
D_06000EA4 = 0x06000EA4;
D_06000590 = 0x06000590;
D_06009244 = 0x06009244;
D_060041F4 = 0x060041F4;
D_0600A054 = 0x0600A054;
D_06008688 = 0x06008688;
Decompile Obj_Bombiwa
2020-03-20 00:50:20 +00:00
Decompiled ovl_En_Lightbox
2020-03-19 01:12:13 +00:00
// z_en_lightbox
D_06000B70 = 0x06000B70;
merge and change scene thing
2020-03-20 12:17:48 +00:00
D_06001F10 = 0x06001F10;
move en_dog progress from old repo
2020-03-17 08:38:46 +00:00
// z_en_dog
en_dog OK
2020-03-20 12:04:35 +00:00
D_06007290 = 0x06007290;
D_06001368 = 0x06001368;
D_06000D78 = 0x06000D78;
merge and change scene thing
2020-03-20 12:17:48 +00:00
D_06000278 = 0x06000278;
Decompile Obj_Bombiwa
2020-03-20 00:50:20 +00:00
// z_obj_bombiwa
started ovl_bg_toki_swd
2020-03-21 18:54:45 +00:00
D_060009E0 = 0x060009E0;
Decompiled ovl_Bg_Treemouth (#168) * Almost done * header * Decompiled ovl_Bg_Treemouth * fixing undefined sims * PR suggestions * PR suggestions
2020-05-29 21:08:40 +00:00
// z_bg_treemouth
D_060009D0 = 0x060009D0;
D_06000E94 = 0x06000E94;
started ovl_bg_toki_swd
2020-03-21 18:54:45 +00:00
// z_bg_toki_swd
fixed merge conflict
2020-03-22 01:13:55 +00:00
D_06001BD0 = 0x06001BD0;
ovl_Bg_Zg OK
2020-03-23 05:55:05 +00:00
// z_bg_zg
D_060011D4 = 0x060011D4;
D_06001080 = 0x06001080;
readd merge conflicts
2020-03-24 16:57:01 +00:00
Decompiled ovl_En_Ds
2020-03-27 14:32:46 +00:00
// z_en_ds
D_06004768 = 0x06004768;
Decompiled ovl_Bg_Spot05_Soko
2020-04-02 00:28:00 +00:00
D_0600039C = 0x0600039C;
z_en_kakasi3.c OK (#430) * Decompiles z_en_kakasi3.c * EnKakasi3_Init * Some more progress * 2 remaining * func_80A918E4 * z_en_kakasi3.c OK * PR suggestions * Additional PR fixes * Removes not needed var in z_en_kakasi3.h struct * Another PR rev round Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-04 14:39:21 +00:00
// z_en_kakasi3
D_060065B0 = 0x060065B0;
D_06000214 = 0x06000214;
En_Kz OK (#176) * start kz * remove irrelevant file * kz progress * en_kz progress * match kz switch * progress * kz OK * kz OK * sync * kz done * delete asm files * pr suggestions 1
2020-05-29 21:20:00 +00:00
// z_en_kz
D_060086D0 = 0x060086D0;
Decompiled ovl_Bg_Spot05_Soko
2020-04-02 00:28:00 +00:00
// z_bg_spot05_soko
D_06000918 = 0x06000918;
Fixed merge conflict
2020-04-02 16:40:01 +00:00
D_060012C0 = 0x060012C0;
Decompiled ovl_Obj_Comb
2020-03-31 01:56:36 +00:00
// z_obj_comb
D_050095B0 = 0x050095B0;
Fixed merge conflict
2020-04-02 16:40:01 +00:00
D_05009940 = 0x05009940;
matching
2020-04-07 14:57:04 +00:00
all functions match, now learning how to do data/rodata
2020-04-05 09:02:55 +00:00
// z_bg_hidan_firewall
D_0600DA80 = 0x0600DA80;
merged from master
2020-04-07 22:00:34 +00:00
matching
2020-04-07 14:57:04 +00:00
// z_en_ani
cleaned up a bit
2020-04-07 23:42:33 +00:00
D_060000F0 = 0x060000F0;
matching
2020-04-07 14:57:04 +00:00
D_060067B8 = 0x060067B8;
D_060076EC = 0x060076EC;
cleaned up a bit
2020-04-07 23:42:33 +00:00
D_060070F0 = 0x060070F0;
Decompile most of ovl_En_Horse_Ganon (#108) * Work on horse ganon * Match destroy, init matches but need mv data -> .c * Match EnHorseGanon_Draw and func_80A68E14 * Move some data to .c * Decomp func_80A68870 * EnHorseGanon_Update nearly matches * func_80A68FA8 and func_80A686A8 match * Fix EnHorseGanon_Init, start on func_80A68B20 * match func_80A68B20 * Migrate data but something doesn't match * Matches with migrated data, fix most warnings * Rename some variables, some clean up * A little more cleanup before PR * Move commented out code to NON_MATCHING blocks * Run formatter and delete unused line, char -> u8 * Update function was matched Also imports another type from z_skin.Seeing as they are somewhat tentative I decided not to put them in any global file. * Update src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * PR Changes * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR Changes round 2 Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-05-04 15:43:04 +00:00
Bg_Heavy_Block and Eff_Ss_Dust (#258) * heavy_rock progress * heavy block progress, 2 functions left * progress * progress * heavy_block OK * comments * heavy block done * eff ss dust ok * naming * done i think * comment * clean up dust usages * remove docs * remove reloc * move enum and rename flag * effect enum
2020-07-19 13:54:24 +00:00
// z_bg_heavy_block
D_0600169C = 0x0600169C;
D_060013C0 = 0x060013C0;
D_06001A30 = 0x06001A30;
D_060018A0 = 0x060018A0;
35/37 Functions Decompiled in ovl_En_Heishi2 (#117) * started * did more work * did some more * Update * Merged master * EnHeishi2_Update OK * func_80A549E8 OK * func_80A54954 OK * EnHeishi2_Draw OK * Removed unused asm * func_80A543A0 OK * func_80A53638 OK. Fixed type of func_8008F08C * done for rn, will work on it later * func_80A53850 OK * func_80A53F30 OK * func_80A53D0C OK * Made cylinderInit in En_Ma3 static * Made suggested changes. Removed return from functions by adding else * Made suggested changes. Removed a.out file that accidentally got added * Made suggested changes * moved #include <vt.h> from header to c file * fixed formatting * added line break * Made suggested changes * ran format * Fixed unk_2F2
2020-05-10 23:44:04 +00:00
// z_en_heishi2
D_06005C30 = 0x06005C30;
D_06005500 = 0x06005500;
D_0600BAC8 = 0x0600BAC8;
D_0602B060 = 0x0602B060;
D_06002C10 = 0x06002C10;
Decompiled ovl_Bg_Ddan_Kd (#110) * Decompiled ovl_Bg_Ddan_Kd * ovl_Bg_Ddan_Kd renamed arguments
2020-05-04 18:29:53 +00:00
// z_bg_ddan_kd
D_06004F30 = 0x06004F30;
D_060048A8 = 0x060048A8;
Decompile most of ovl_En_Horse_Ganon (#108) * Work on horse ganon * Match destroy, init matches but need mv data -> .c * Match EnHorseGanon_Draw and func_80A68E14 * Move some data to .c * Decomp func_80A68870 * EnHorseGanon_Update nearly matches * func_80A68FA8 and func_80A686A8 match * Fix EnHorseGanon_Init, start on func_80A68B20 * match func_80A68B20 * Migrate data but something doesn't match * Matches with migrated data, fix most warnings * Rename some variables, some clean up * A little more cleanup before PR * Move commented out code to NON_MATCHING blocks * Run formatter and delete unused line, char -> u8 * Update function was matched Also imports another type from z_skin.Seeing as they are somewhat tentative I decided not to put them in any global file. * Update src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * PR Changes * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR Changes round 2 Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-05-04 15:43:04 +00:00
// z_en_horse_ganon
D_06008668 = 0x06008668;
D_06004AA4 = 0x06004AA4;
En_Floormas OK (#97) * EnFloorMas wip * floormaster formatting * floormaster wip * ovl_En_Floormas OK * pr recommendations * pr updates
2020-05-07 23:18:09 +00:00
En_Skjneedle OK (#162) * En_Skjneedle OK * fix * file deletions * file deletions 2 * fix extern * fix * cleanup
2020-05-26 14:53:27 +00:00
// z_en_skjneedle
D_06000EB0 = 0x06000EB0;
ovl_En_Heishi3 OK (#121) * almost done with heishi3 * heishi3 ok * Added function names to heishi3 * EnHeishi3 OK * Made some suggested changes. Still have questions about others * Made suggsted changes * fixed formatting * fixed formatting
2020-05-10 23:19:27 +00:00
// z_en_heishi3
D_0600BAC8 = 0x0600BAC8;
D_06005C30 = 0x06005C30;
D_06005880 = 0x06005880;
Decomp Heishi4 All OK (#364) * Fixed upstream * Migrate data, fix header, and begin Init function * Lots of progress * Almost done * One non matching left * Decomp EnHeishi4 All OK * PR fixes * PR fixes
2020-09-05 14:18:02 +00:00
// z_en_heishi4
D_0600BAC8 = 0x0600BAC8;
D_0600C444 = 0x0600C444;
D_06005C30 = 0x06005C30;
D_0600C6C8 = 0x0600C6C8;
D_0600C374 = 0x0600C374;
En_Floormas OK (#97) * EnFloorMas wip * floormaster formatting * floormaster wip * ovl_En_Floormas OK * pr recommendations * pr updates
2020-05-07 23:18:09 +00:00
// z_en_floormas
D_06002158 = 0x06002158;
D_060039B0 = 0x060039B0;
Decompile z_oceff_wipe (#122) * Decompile z_oceff_wipe - z_oceff_wipe: OK - z_oceff_wipe2: OK - z_oceff_wipe3: OK - z_oceff_wipe4: OK - Add patched libmalloc to ido 7 to prevent segfaults - Add CUR_CAM macro * Rename CUR_CAM to ACTIVE_CAM * Fixes in PR #122
2020-05-09 20:58:02 +00:00
en_fu OK (#126) * 1 function left * 1 function left * en_fu OK, still need to document * en_fu OK * spec comment * remove asm files * clang and final fixes * fix floormas formatting things * pr suggestions * pr suggestions 2
2020-05-14 01:18:45 +00:00
// z_en_fu
D_0600057C = 0x0600057C;
D_06000B04 = 0x06000B04;
D_06006C90 = 0x06006C90;
D_0200E080 = 0x0200E080;
Decompile z_oceff_wipe (#122) * Decompile z_oceff_wipe - z_oceff_wipe: OK - z_oceff_wipe2: OK - z_oceff_wipe3: OK - z_oceff_wipe4: OK - Add patched libmalloc to ido 7 to prevent segfaults - Add CUR_CAM macro * Rename CUR_CAM to ACTIVE_CAM * Fixes in PR #122
2020-05-09 20:58:02 +00:00
// z_oceff_wipe4
D_04032C90 = 0x04032C90;
Decompile the remaining Oceff actors + Add ichaindis.py (#125) * Decompile the remaining Oceff actors + Add ichaindis.py - z_oceff_spot.c: OK - z_oceff_storm.c : 1 non-matching left - Add ichaindis.py * Rename SetActionFunc to SetupAction + Add Actor descriptions * Minor fixes in PR #125
2020-05-10 17:09:26 +00:00
// z_oceff_storm
D_04032490 = 0x04032490;
D_04032890 = 0x04032890;
Decompile remaining z_vis... files (#131) * Decompile z_vismono.c / code_800AD920.c - z_vismono.c: OK - code_800AD920.c: OK * Minor fixes in PR #131
2020-05-15 09:02:39 +00:00
EnBx (#266) * EnBx * Memes * PR * PR
2020-07-20 06:49:42 +00:00
// z_en_bx
D_060022F0 = 0x060022F0;
Decompile remaining z_vis... files (#131) * Decompile z_vismono.c / code_800AD920.c - z_vismono.c: OK - code_800AD920.c: OK * Minor fixes in PR #131
2020-05-15 09:02:39 +00:00
// code_800AD920
D_0E000000 = 0x0E000000;
// z_vismono
Decompile En_Dha (#130) * Decompile En_Dha * Removed original reloc data and fixed actor struct * Update z_en_dha.c - Removed unnecessary line breaks - Changed `colliderSphere` to `collider` and `colliderSphereItem` to `colliderItem` - Removed unnecessary & pointers - Renamed various functions * Update z_en_dha.h Changed collider names * Fixed all issues with `En_Dha` * Update src/overlays/actors/ovl_En_Dha/z_en_dha.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dha/z_en_dha.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dha/z_en_dha.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dha/z_en_dha.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dha/z_en_dha.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dha/z_en_dha.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * All suggested changes applied * Update z_en_dha.c Fixed unresolved changes that were marked as resolved. Whoops! Co-authored-by: Zelllll <elijah@DESKTOP-QDIECM7.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-05-18 08:34:34 +00:00
D_0F000000 = 0x0F000000;
en_reeba OK (#434) * leever progress * leever progress * leever progress * 2 non matchings * test * merge master, match two functions * progress * OK * revert permissions change * remove unwanted file * review * use decr * merge * merge and review * early return * vt
2020-10-04 13:17:44 +00:00
// en_reeba
D_060001E4 = 0x060001E4;
D_06001EE8 = 0x06001EE8;
Decompile En_Dha (#130) * Decompile En_Dha * Removed original reloc data and fixed actor struct * Update z_en_dha.c - Removed unnecessary line breaks - Changed `colliderSphere` to `collider` and `colliderSphereItem` to `colliderItem` - Removed unnecessary & pointers - Renamed various functions * Update z_en_dha.h Changed collider names * Fixed all issues with `En_Dha` * Update src/overlays/actors/ovl_En_Dha/z_en_dha.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dha/z_en_dha.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dha/z_en_dha.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dha/z_en_dha.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dha/z_en_dha.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dha/z_en_dha.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * All suggested changes applied * Update z_en_dha.c Fixed unresolved changes that were marked as resolved. Whoops! Co-authored-by: Zelllll <elijah@DESKTOP-QDIECM7.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-05-18 08:34:34 +00:00
// z_en_dha
D_06000BD8 = 0x06000BD8;
D_060015B0 = 0x060015B0;
Decompile en_guest (#151) * Start work on ovl_En_Guest * Match func_80A5046C and func_80A50518 * Everything but func_80A509D4 matches * Match last function, cleanup, rename stuff * Run formatter * Temp didn't need to be used * I should have ran the formatter again * Use tcrf translation for debug string * Apply suggestions from code review Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com> * Rename references to function and fix semicolon * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com> * PR Suggestions * More comments Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com>
2020-05-23 02:21:36 +00:00
EnHata OK (#155) * EnHata OK * made/attempted suggested changes. still havent been able to fix the THIS in Update
2020-05-27 00:05:09 +00:00
// z_en_hata
D_060000C0 = 0x060000C0;
D_06000444 = 0x06000444;
D_06002FD0 = 0x06002FD0;
en_sb OK (#159) * en_sb OK * en_sb done * remove asm * remove diff.txt * pr changes * pr changes 2 * merge master and add description
2020-05-26 15:57:54 +00:00
// z_en_sb
D_0600004C = 0x0600004C;
D_060000B4 = 0x060000B4;
D_06000124 = 0x06000124;
D_06000194 = 0x06000194;
D_06002BF0 = 0x06002BF0;
D_06002C8C = 0x06002C8C;
Attack_Niw (#272) * Attack! * Decimal indexes * a * PR * PR * PR * Why break it
2020-08-20 02:17:42 +00:00
// z_en_attack_niw
D_06002530 = 0x06002530;
D_060000E8 = 0x060000E8;
EnHintnuts OK (#154) * merged from upstream * matching * named functions * made suggested changes
2020-05-24 08:30:24 +00:00
// z_en_hintnuts
D_06000168 = 0x06000168;
D_060014E0 = 0x060014E0;
D_060023B8 = 0x060023B8;
D_060024CC = 0x060024CC;
D_060026C4 = 0x060026C4;
D_06002894 = 0x06002894;
D_060029BC = 0x060029BC;
D_06002B90 = 0x06002B90;
D_06002E84 = 0x06002E84;
D_06002F7C = 0x06002F7C;
D_06003128 = 0x06003128;
Decompile en_guest (#151) * Start work on ovl_En_Guest * Match func_80A5046C and func_80A50518 * Everything but func_80A509D4 matches * Match last function, cleanup, rename stuff * Run formatter * Temp didn't need to be used * I should have ran the formatter again * Use tcrf translation for debug string * Apply suggestions from code review Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com> * Rename references to function and fix semicolon * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com> * PR Suggestions * More comments Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com>
2020-05-23 02:21:36 +00:00
// z_en_guest
D_060042AC = 0x060042AC;
D_060059B0 = 0x060059B0;
ovl_End_Title OK (#161) * One non matching left in ovl_End_Title * ovl_End_Title OK * formatting * removed unused asm files * changed 0xFF to 255 * updated dlist * made suggested changes
2020-05-27 15:51:11 +00:00
ovl_En_Goroiwa OK (#376) * merge upstream * Merge upstream * Add block comment to c * EnGoroiwa_Init * Remove casts in EnGoroiwa_Init * Matched named functions * Add one prototype * func_80A4BD04 * func_80A4BCA0 * func_80A4BD70 and fix incompatible pointer * func_80A4BD8C and func_80A4BE54 * Remove forward declaration * Order variable by address * Cleanup warnings * func_80A4C188 * Remove func_80A4C188 forward declaration * Progress * Rename unk_1CE to waypoint * func_80A4C264 * func_80A4D5E0 * func_80A4C27C * Separate necessary forward declarations from temporary * func_80A4BE10 * func_80A4C080 * func_80A4C134 and func_80A4C164 * func_80A4D074 * Work on some (nonmatching) * func_80A4D944 * func_80A4D9DC * Progress * func_80A4DB90 and func_80A4DC00 * func_80A4D8CC * func_80A4CA50 * func_80A4C6C8 * work on func_80A4CED8 * Work on func_80A4CED8 * func_80A4CED8 * Use temp to avoid unused error * Clarify comment * Work on func_80A4C3A4 * func_80A4C3A4 * Clarify comment better * func_80A4C594 * Angles * Improve regalloc * func_80A4BF28 * Cleanup point access * Work on func_80A4C814 * func_80A4C814 * Use *= * Work on func_80A4CB78 * Work on func_80A4D0FC * Work on func_80A4CB78 * More on func_80A4CB78 * Implement dubious permuter suggestion * Make janky hack less janky * Update issue comment * Move ptr func_80A4CB78 * func_80A4CB78 * Cleanup func_80A4CB78 * Various cleanup * Add undefined sym * Work on func_80A4D0FC * Work more on func_80A4D0FC * Work on func_80A4D624 * func_80A4D0FC * Work on func_80A4D624 * Fix stack * Wrap in NON_MATCHING ifdef to remember which function is not done * Collapse goto * Use -- for unk_1C4 * Collapse else if * Add translation for 'Player ぶっ飛ばし' * func_80A4D624 * Migrate data section * Clang format * Actually add unused note * Name timers accordingly * Remove & from sInitChain * Give timer descriptive names * Rename idleTimer to waitTimer * Rename to sWaitDurations * Name effect data * Add s prefix (oops) * Move some data into functions * Rename params for func_80029E8C * Unify whitespace for bool returns * Name colliderHeightOffset * Name duplicate of colliderHeightOffset and clang format everything * Reorder vector assignments * Rename params to pathIdx * Rename temp to yawDiff * Add 'f's because floating point * Name a lot of stuff * Name posDiff * Nuke the bool * Remove unnecessary return Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Remove useless forward declarations and use list[0] * Clang format again * Use switch statement * Use hex for normalizing angle * Use hex because angle * Small fixes * Small fixes * Move function arrays out of function * Correct colliderItems * Don't separate static vars from others * Clang format Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-09-28 10:03:39 +00:00
// z_en_goroiwa
D_0400D340 = 0x0400D340;
En_Heishi1 and Eff_Ss_Solder_Srch_Ball OK (#234) * progress * init ok and merge master * enheishi1 and srchball OK * cleanup * cleanup * cleanup * more cleanup * done * more comments * add file headers * some review comments * move vectors * more review comments * angle in decimal * add prototype * semicolon would be good * fix * make unset actor ids 0 * reword comment * no &
2020-07-09 19:12:03 +00:00
// z_en_heishi1
D_06005880 = 0x06005880;
D_06005C30 = 0x06005C30;
D_0600BAC8 = 0x0600BAC8;
En_Bom and En_Bombf (#264) * data migrated * progress * progress * enbom ok * cleanup * progress * still have stack issues * bombf done * done i think * review comments 1 * add type enums * move enums and use -1 * remove unwanted file
2020-07-19 18:04:30 +00:00
// z_en_bom
D_04007A50 = 0x04007A50;
D_04007860 = 0x04007860;
// z_en_bombf
D_06000340 = 0x06000340;
D_06000408 = 0x06000408;
D_06000530 = 0x06000530;
ovl_En_Box OK, documented (#356) * ovl_En_Box OK, documented * Update spec * Removed useless union * renames, remove comments, move internal enums from header * stylistic changes * Remove unneeded prototypes and use documentation format for doc comments * Misread git's merge solution * EnBox_SetupAction and Actor_SpawnAsChild * Cleanup * Merge effects, defines for movement flags, swap dList and dListHead, cleanup...
2020-10-03 22:42:10 +00:00
// z_en_box
D_06000128 = 0x06000128;
D_0600024C = 0x0600024C;
D_0600043C = 0x0600043C;
D_060006F0 = 0x060006F0;
D_06000AE8 = 0x06000AE8;
D_060010C0 = 0x060010C0;
D_06001678 = 0x06001678;
D_060047D8 = 0x060047D8;
D_06005FC8 = 0x06005FC8;
Bg_Heavy_Block and Eff_Ss_Dust (#258) * heavy_rock progress * heavy block progress, 2 functions left * progress * progress * heavy_block OK * comments * heavy block done * eff ss dust ok * naming * done i think * comment * clean up dust usages * remove docs * remove reloc * move enum and rename flag * effect enum
2020-07-19 13:54:24 +00:00
// z_eff_ss_dust
D_04010050 = 0x04010050;
Bg_Spot16_Bombstone (#405) * First working function * Syncing up * Not OK - something wrong with data elements * Not OK - syncing files * OK now. Fixed data issue * Not OK - data issue * Not OK - syncing files * OK - added another function and commented out init for now * OK - another function * Not OK - working on function * OK - Added working functions back * OK - another function * Not OK - syncing files * Not OK - updating undefined syms * OK - Draw function * Not OK - slightly closer on 5950 * OK - another function * OK - another function * OK - another function * OK - another function * OK - finally fixed init * Lots of cleanup and renaming * Removed data files * Minor cleanup * Removed commented out line * Minor cleanup * More minor cleanup * More minor cleanup * More cleanup * Removed unneeded dereferences * Minor cleanup * Minor cleanup * More cleanup * Update src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * More cleanup * More cleanup * Removed structs * Minor cleanup * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Changed EnBombf to Actor Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-27 01:26:21 +00:00
// z_Bg_Spot16_Bombstone
D_06000C20 = 0x06000C20;
D_060009E0 = 0x060009E0;
Decompile ovl_Bg_Spot16_Doughnut (#187) * Decompile ovl_Bg_Spot16_Doughnut * Ran formatter * Shorten float values Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Fix last float values * Rename Update2 and Draw2 Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-06-07 14:54:44 +00:00
// z_Bg_Spot16_Doughnut
D_06000660 = 0x06000660;
D_06000FC0 = 0x06000FC0;
Decompile ovl_En_Fhg_Fire (#248) * Decomp EnFhgFire_Init and EnFhgFire_SetActorFunc * Decomp EnFhgFire_Destroy * Decomp func_80A0F6F8 * Run format * Decomp func_80A0FA90 * Decomp func_80A0FC48 * Decomp func_80A0FD8C * Decomp EffectSsFhgFlash_Spawn ex func_80029CF0 * Decomp EffectSsFhgFlash_Spawn2 ex func_80029D5C * Decomp EnFhgFire_Update * Decomp EnFhgFire_Draw, not matching * Decomp func_80A10F18 * Move InitVars * PR fixes Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-16 10:02:27 +00:00
En_Syateki_Niw (#270) * All matching, apart from the ones that aren't. * Fix conflcit and 1 func * Bugz * Conflict 2 * Header * Remove asm * PR * PR * undefined syms * PR
2020-08-20 22:34:18 +00:00
// z_en_syateki_niw
D_060000E8 = 0x060000E8;
D_060023B0 = 0x060023B0;
D_06002428 = 0x06002428;
D_06002530 = 0x06002530;
Bomb Related Effect Overlays (#283) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * match bomb2 * asm file * pr review
2020-07-28 19:49:00 +00:00
// z_eff_ss_blast
D_0401A0B0 = 0x0401A0B0;
// z_eff_ss_g_spk
D_04025550 = 0x04025550;
// z_eff_ss_bomb
D_0400BF80 = 0x0400BF80;
// z_eff_ss_bomb2
D_0400BF80 = 0x0400BF80;
D_0400BFE8 = 0x0400BFE8;
D_0400C040 = 0x0400C040;
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * EffectSsStick OK * progress * fix conflicting name * progress * splash OK * uname fields * progress * lightning OK * remove unwanted files * kirakira ok * kirakira done * magma OK * remove files * ss_g_fire OK * name funcs * progress * progress * magma2 and kakera OK * eff_ss_dead_dd OK * fcircle OK * stone1 OK * sibuki2 OK * dt_bubble OK * deaddb OK * sibuki OK * dead_ds OK * ice_smoke OK * hitmark OK * hahen OK * k_fire OK * en_fire OK * starting colors * color changes 1 * color switch done * init file data migrated * data cleanup * ice_piece OK * en_ice OK * progress * progress * docs progress * fix blast color names * documentation pass 1 * progress * cleanup pass 2 * touchups * added to functions.h * small changes * fix functions.h * renaming progress * name progress * color enum * more cleanups * enice changes * final cleanups * remove unwanted file * lightning -> shock * pr suggestions * fix comment * remove unwanted comments
2020-09-30 00:18:46 +00:00
// z_eff_ss_bubble
D_04055EB0 = 0x04055EB0;
D_04055DB0 = 0x04055DB0;
D_0401A160 = 0x0401A160;
// z_eff_ss_lightning
D_0402CF30 = 0x0402CF30;
// z_eff_ss_d_fire
D_060098A0 = 0x060098A0;
// z_eff_ss_g_magma
D_04024410 = 0x04024410;
// z_eff_ss_g_fire
D_0401C220 = 0x0401C220;
// z_eff_ss_g_magma2
D_06025A90 = 0x06025A90;
// z_eff_ss_dead_dd
D_01000000 = 0x01000000;
// z_eff_ss_fire_tail
D_0404D5A0 = 0x0404D5A0;
D_0404D4E0 = 0x0404D4E0;
// z_eff_ss_stone1
D_04029E90 = 0x04029E90;
// z_eff_ss_sibuki
D_04055EB0 = 0x04055EB0;
D_04055DB0 = 0x04055DB0;
D_0401A160 = 0x0401A160;
// z_eff_ss_sibuki2
D_0401E2C0 = 0x0401E2C0;
// z_eff_ss_dt_bubble
D_04055DB0 = 0x04055DB0;
D_04055EB0 = 0x04055EB0;
D_0401A160 = 0x0401A160;
// z_eff_ss_dead_db
D_04031FE0 = 0x04031FE0;
// z_eff_ss_dead_ds
D_04037730 = 0x04037730;
// z_eff_ss_ice_smoke
D_060030A0 = 0x060030A0;
D_06003158 = 0x06003158;
// z_eff_ss_hahen
D_0400C0D0 = 0x0400C0D0;
D_0400CD80 = 0x0400CD80;
// z_eff_ss_k_fire
D_0404D4E0 = 0x0404D4E0;
// z_eff_ss_en_fire
D_0404D5A0 = 0x0404D5A0;
D_0404D4E0 = 0x0404D4E0;
// z_eff_ss_ice_piece
D_04033720 = 0x04033720;
// z_eff_ss_en_ice
D_04033818 = 0x04033818;
Bomb Related Effect Overlays (#283) * fix colliderinit typo * dead sound done * deadsound documentation * blast done * progress * spk init * progress * spark done * ss bomb ok * bomb done * cleanup * progress * progress * almost done with bomb2 * clean up gossip stone * more * cleanup and format * remove unused asm file * nonmatching reloc * done i think * mistakes * fix headers * idk how that got in here * match bomb2 * asm file * pr review
2020-07-28 19:49:00 +00:00
// z_en_fhg_fire
Decompile ovl_En_Fhg_Fire (#248) * Decomp EnFhgFire_Init and EnFhgFire_SetActorFunc * Decomp EnFhgFire_Destroy * Decomp func_80A0F6F8 * Run format * Decomp func_80A0FA90 * Decomp func_80A0FC48 * Decomp func_80A0FD8C * Decomp EffectSsFhgFlash_Spawn ex func_80029CF0 * Decomp EffectSsFhgFlash_Spawn2 ex func_80029D5C * Decomp EnFhgFire_Update * Decomp EnFhgFire_Draw, not matching * Decomp func_80A10F18 * Move InitVars * PR fixes Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-16 10:02:27 +00:00
D_0600FAA0 = 0x0600FAA0;
D_0600FCF8 = 0x0600FCF8;
D_060105E0 = 0x060105E0;
D_06012160 = 0x06012160;
Decompile ovl_En_Insect (#244) * Start decompiling bugs * Decomp func_80A7BFA0 * Match 4 functions * Match a few functions, really close on another * Consolidate if statements * Progress on func_80A7C86C * Decompile a few small functions * func_80A7CEC0 still needs stack and regalloc work * Finish up func_80A7CEC0, do a couple functions * Start on func_80A7D460 * func_80A7D460 is mostly down to regalloc * Match update and draw, more work on func_80A7D460 * func_80A7D460 is really close to matching * func_80A7D460 matches * Cleanup * Run formatter * Missed reversing a couple flout comparisons * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR Comments * PR Comments #2 * Missed one Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-18 21:40:27 +00:00
Kibako (#420) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * box * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * kakera macros * kakera macros * names * one more rename Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-10-04 15:16:21 +00:00
// z_obj_kibako
D_05005290 = 0x05005290;
D_05005380 = 0x05005380;
z_en_bg_hidan_rsekizou (#282) * RSekizou 4/5 * func_8088C70C on its way. * ROM got shifted? * RSekizou is OK * Cleanup * Removed unused ASM. Jenkins! * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Tidy Roman-ization. ;) * UNK_TYPE array instead of illegal UNK_PTR array. * Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-22 21:12:47 +00:00
// z_en_bg_hidan_rsekizou
D_0600AD00 = 0x0600AD00;
D_0600D5C0 = 0x0600D5C0;
D_0600DC30 = 0x0600DC30;
Gossip Stone, 1 nonmatching (#251) * Gossip Stone, 1 nonmatching * Appease the Fig * spec * Fix last function ordering * Ethan Review 1 * a * Hidden PR notes QQ * a * Fixed now?? * a
2020-07-19 00:35:12 +00:00
// z_en_gs
D_0404D4E0 = 0x0404D4E0;
D_06000950 = 0x06000950;
D_060009D0 = 0x060009D0;
D_06000A60 = 0x06000A60;
Decompile ovl_En_Insect (#244) * Start decompiling bugs * Decomp func_80A7BFA0 * Match 4 functions * Match a few functions, really close on another * Consolidate if statements * Progress on func_80A7C86C * Decompile a few small functions * func_80A7CEC0 still needs stack and regalloc work * Finish up func_80A7CEC0, do a couple functions * Start on func_80A7D460 * func_80A7D460 is mostly down to regalloc * Match update and draw, more work on func_80A7D460 * func_80A7D460 is really close to matching * func_80A7D460 matches * Cleanup * Run formatter * Missed reversing a couple flout comparisons * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR Comments * PR Comments #2 * Missed one Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-18 21:40:27 +00:00
// z_en_insect
D_04035590 = 0x04035590;
D_040341FC = 0x040341FC;
ovl_En_Okarina_Tag OK (#273) * started okarinatag * did more * z_en_okarina_tag OK * finished okarinatag * Made suggested changes
2020-07-19 21:41:59 +00:00
ovl_Obj_Dekujr OK (#276) * started dekujr * ovl_Obj_Dekujr OK * cleanup * Made suggested changes
2020-07-20 22:06:04 +00:00
// z_obj_dekujr
D_060030D0 = 0x060030D0;
D_060032D8 = 0x060032D8;
En_Light OK (#332) * fix colliderinit typo * en_light OK * format * remove asm * cleanup * pr review * no U * few changes
2020-08-20 02:57:31 +00:00
// z_en_light
D_0404D4E0 = 0x0404D4E0;
D_05000440 = 0x05000440;
ovl_En_Okarina_Tag OK (#273) * started okarinatag * did more * z_en_okarina_tag OK * finished okarinatag * Made suggested changes
2020-07-19 21:41:59 +00:00
// z_en_okarina_Tag
D_02003C80 = 0x02003C80;
D_02005020 = 0x02005020;
D_020024A0 = 0x020024A0;
Decompile ovl_Bg_Haka_Tubo (#280) * Bg_Haka_Tubo OK * Ran formatter * Review suggestions * Fix commented field offsets in header Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Fix other field offset Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Named data and made static Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-20 23:57:02 +00:00
Ovl_Bg_Jya_Megami OK (#284) * merge from upstream * one non-matching in bg_jya_megami * deleted asm files * renamed unk_1D0 * some suggested changes * megami OK, zero non-matchings * deleted old reloc.s * using a define rather than ARRAY_COUNT * suggested changes * some requested changes * Setup -> Init
2020-08-27 22:00:36 +00:00
// z_bg_jya_megami
D_06005C4C = 0x06005C4C;
D_06005780 = 0x06005780;
D_0600B9F8 = 0x0600B9F8;
ovl_Bg_Mori_Hineri OK (#279) * bg_mori_hineri OK * added description and removed reloc * made suggested changes from fig * made suggested changes * Named a few functions in ovl_Bg_Mori_Hineri
2020-07-23 10:51:02 +00:00
// z_bg_mori_hineri
D_060054B8 = 0x060054B8;
D_06003490 = 0x06003490;
D_060043D0 = 0x060043D0;
D_06006078 = 0x06006078;
D_04049FE0 = 0x04049FE0;
D_06000AE8 = 0x06000AE8;
D_06001678 = 0x06001678;
BgMizuWater OK (#359) * BgMizuWater OK * Renaming * Fix formatting * Cleanup, use new gfx functions * Fix stack issue * PR fixes * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR fixes * More PR fixes * Fix formatting Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-27 01:06:30 +00:00
Decompile ovl_Bg_Haka_Tubo (#280) * Bg_Haka_Tubo OK * Ran formatter * Review suggestions * Fix commented field offsets in header Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Fix other field offset Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Named data and made static Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-20 23:57:02 +00:00
// z_bg_haka_tubo
D_060108B8 = 0x060108B8;
D_0600FE40 = 0x0600FE40;
D_0400CD80 = 0x0400CD80;
D_040184B0 = 0x040184B0;
Decompiles z_bg_ingate (#301) * Decompiles z_bg_ingate * BgIngate_SetupAction * BgIngate_Init * BgIngate_Destroy * BgIngate_Update * func_80892990 * func_80892890 * BgIngate_Draw Removes unused asm's Formats z_bg_ingate.c * Addresses PR comments * Fixes usage of cutscene id instead of regular scene * Addresses PR comments
2020-08-04 18:30:46 +00:00
BgPoSyokudai (#382) * BgPoSyokudai: decomp Init() * BgPoSyokudai: decomp Destroy() * BgPoSyokudai: decomp Update() * BgPoSyokudai: decomp Draw() * BgPoSyokudai: remove data.s and reloc.s * BgPoSyokudai: clarify switch flags 1D to 1F * BgPoSyokudai: format following codestyle and remove macros
2020-09-21 07:30:58 +00:00
// z_bg_po_syokudai
D_060003A0 = 0x060003A0;
D_0404D4E0 = 0x0404D4E0;
ovl_Item_Ocarina OK (#299) * first commit * fixes * remove unwanted file Co-authored-by: fig02 <fig02srl@gmail.com>
2020-08-28 18:35:35 +00:00
// z_item_ocarina
D_0200F870 = 0x0200F870;
ovl_Bg_Ice_Shutter (#377) * Starting work on Bg_Ice_Shutter, want to commit before attempting to use the permuter. * Forgot to use the new UNK_TPYE in DynaPolyInfo_Alloc * Resolving last asm issues by re-ordering and updating .c file. * Attempting to match by reordering things, removing no longer used .s files from spec file. * Adding in proper include path for _reloc file * Removing unneeded parens and casts * Removing extra space. * Updated with review fixes * Another round of review comments. * Adding description to comment to clarify what these are. * Adding in newline before draw function
2020-09-19 19:12:42 +00:00
//z_bg_ice_shutter
D_06002854 = 0x6002854;
D_06002740 = 0x6002740;
Decompiles z_bg_ingate (#301) * Decompiles z_bg_ingate * BgIngate_SetupAction * BgIngate_Init * BgIngate_Destroy * BgIngate_Update * func_80892990 * func_80892890 * BgIngate_Draw Removes unused asm's Formats z_bg_ingate.c * Addresses PR comments * Fixes usage of cutscene id instead of regular scene * Addresses PR comments
2020-08-04 18:30:46 +00:00
// z_bg_ingate
D_060011B8 = 0x060011B8;
z_en_yukabyun decompiled (#318) * Decomped Yukabyun (flying floor tiles) * z_en_yukabyun * Ran the formatting script, plus fixed negative number stuff in the Update function * Changed unk_152 to unsigned to get rid of cast * Made all the suggested changes. * Update undefined_syms.txt Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-18 17:52:44 +00:00
D_06001040 = 0x06001040;
BgHakaWater OK (#302) * BgHakaWater OK * minor style fixups * made requested changes * use true/false for isLowered
2020-09-09 02:48:35 +00:00
// z_bg_haka_water
D_06001E50 = 0x06001E50;
D_06002010 = 0x06002010;
z_en_yukabyun decompiled (#318) * Decomped Yukabyun (flying floor tiles) * z_en_yukabyun * Ran the formatting script, plus fixed negative number stuff in the Update function * Changed unk_152 to unsigned to get rid of cast * Made all the suggested changes. * Update undefined_syms.txt Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-18 17:52:44 +00:00
// z_en_yukabyun
D_06000A60 = 0x06000A60;
D_06000970 = 0x06000970;
Decompiles z_bg_jya_goroiwa (#307) * Decompiles z_bg_jya_goroiwa * BgJyaGoroiwa_Init * func_808979C0 * BgJyaGoroiwa_Destroy * func_80897970 * func_80897A2C * BgJyaGoroiwa_Draw * func_80897DF0 * func_80897DDC * BgJyaGoroiwa_Update * func_80897B48 * Adds description header to z_bg_jya_goroiwa.c * Addresses PR comments * Addresses PR comments #2 * Addresses PR comments (padding) * PR comments, change paddings to s32 Co-authored-by: i82orbom <i82orbom@github> Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-21 01:53:00 +00:00
// z_bg_jya_goroiwa
D_060006B0 = 0x060006B0;
z_en_js OK (#336) * Initial commit for en_js * More work on decomping en_js * More en_js work * z_en_js OK * Made requested changes/improvements * Renamed arg in func_80A88F64 * Fixed undefined_symbols.txt * Fixed undefined_symbols.txt * Fixed undefined_symbols.txt
2020-08-22 06:24:07 +00:00
BgMizuWater OK (#359) * BgMizuWater OK * Renaming * Fix formatting * Cleanup, use new gfx functions * Fix stack issue * PR fixes * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR fixes * More PR fixes * Fix formatting Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-27 01:06:30 +00:00
// z_en_js
z_en_js OK (#336) * Initial commit for en_js * More work on decomping en_js * More en_js work * z_en_js OK * Made requested changes/improvements * Renamed arg in func_80A88F64 * Fixed undefined_symbols.txt * Fixed undefined_symbols.txt * Fixed undefined_symbols.txt
2020-08-22 06:24:07 +00:00
D_0600045C = 0x0600045C;
D_06005EA0 = 0x06005EA0;
D_0600018C = 0x0600018C;
En_Dy_Extra OK and matching (#351) * Almost done with en_dy_extra * All matching other than draw function, which just has some stack issues + possibly a localGfxCtx issue. * OK, one non-matching. * z_en_dy_extra OK and matching * Deleted asm and updated spec * Changed colors to decimal and got rid of padding in the u8 array * Ran format script again to clean up after last commit * All requested fixes * Made further requested changes
2020-08-28 06:30:09 +00:00
Darkmeiro decompilation (#320) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * forgot to remove ASM * Now with better formatting * removed some stray thisx * Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * one more cleanup * cleanup as per discussion * fancy new names * sfx * ZAP * more cleanup * more cleanup * and a little more * renaming some stuff * a little more tidying up * bug comment Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
2020-09-14 20:53:57 +00:00
// z_bg_gnd_darkmeiro
D_0600C080 = 0x0600C080;
D_060088B0 = 0x060088B0;
D_0600BEC0 = 0x0600BEC0;
Rakkatenjo (#419) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * bonk * static var cleanup * one more rename
2020-10-04 12:58:33 +00:00
// z_bg_mori_rakkatenjo
D_06007690 = 0x06007690;
D_060087AC = 0x060087AC;
Bg_Mori_Kaitenkabe (#410) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * spinny wall * cleanup * wait for mori tex * merge and better (?) names
2020-10-04 02:18:41 +00:00
// z_bg_mori_kaitenkabe
D_060056B0 = 0x060056B0;
D_060063B8 = 0x060063B8;
Decompiles ovl_En_St (#349) * decompile and match En_St * document ovl_En_St * Implement OPEN_DISPS, and remove useless comments * styling updates, inline some declarations * PR suggestions as well as changing the BlureInit colors to u8 arrays over RGBA types * remove pointer from EnSt_SetupAction
2020-09-14 16:17:34 +00:00
// z_en_st
D_06005298 = 0x06005298;
D_06000304 = 0x06000304;
D_06005B98 = 0x06005B98;
D_060055A8 = 0x060055A8;
Bg_Hidan_Curtain (#411) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * flame circles * merge and description * Update src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * formatting and other cleanup * names Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-04 12:48:48 +00:00
// z_bg_hidan_curtain
D_040184B0 = 0x040184B0;
En_Dy_Extra OK and matching (#351) * Almost done with en_dy_extra * All matching other than draw function, which just has some stack issues + possibly a localGfxCtx issue. * OK, one non-matching. * z_en_dy_extra OK and matching * Deleted asm and updated spec * Changed colors to decimal and got rid of padding in the u8 array * Ran format script again to clean up after last commit * All requested fixes * Made further requested changes
2020-08-28 06:30:09 +00:00
// z_en_dy_extra
D_0601BFB0 = 0x0601BFB0;
D_0601C160 = 0x0601C160;
z_bg_menkuri_eye OK (#374) * z_bg_menkuri_eye OK * Fixed up a few things in Update * Made all requested fixes.
2020-09-14 20:27:23 +00:00
En_Rl OK (#378) * Approx. half of en_rl matched * More En_Rl work * 5 functions left * One function left * En_Rl OK and all matching * Formatted and cleaned up style things. * Deleted asm and fixed spec * Forgot to delete the stuff in the data folder again * Made all requested changes. * Forgot one requested change * Implemented dragorn's documentation suggestions * Implemented dragorn's documentation suggestions * Made further requested changes Co-authored-by: fig02 <fig02srl@gmail.com>
2020-10-04 14:09:20 +00:00
// z_en_rl
D_06007B38 = 0x06007B38;
D_06000A3C = 0x06000A3C;
D_06000830 = 0x06000830;
D_0600040C = 0x0600040C;
z_en_takara_man OK (#380) * started * Decompiled z_en_takara_man, added CHOICE_NO and CHOICE_YES defines * use generated reloc * Removed choice index define due to inconsistencies * Made suggested changes
2020-09-27 01:09:17 +00:00
// z_en_takara_man
D_06004FE0 = 0x06004FE0;
D_06000498 = 0x06000498;
z_bg_menkuri_eye OK (#374) * z_bg_menkuri_eye OK * Fixed up a few things in Update * Made all requested fixes.
2020-09-14 20:27:23 +00:00
// z_bg_menkuri_eye
D_06002D20 = 0x06002D20;
Hashira (#384) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * Hashira4 done * forgot some names * minor cleanup * .gitignore reverted * merge and rename * merge and cleanup * needs a description * dlists * wait for mori tex
2020-09-27 01:10:20 +00:00
BgSpot03Taki (#414) * Migrate data, fix header, add undefined symbol, decompile Init function * Decompiled Destroy function * Decompiled func_808ADEF0 and adjusted struct some * Decompiled Update function * Fixed sInitChain stuff * Preliminary Draw function decompilation * Replaced code with OPEN_DISPS and CLOSE_DISPS and some hex with decimal * Working on Draw function still * More permuter test stuff * Got Draw matching except for one little TwoTex issue * Added NON_MATCHING * Removed false alarm * Got most of the functions decompiled; 1 non-matching, 1 not started * Ran format.sh on file * These two symbols should be arrays * Got func_808ADAE0 mostly decompiled * Got func_808ADAE0 fully decompiled! * Removed necessary files (except _Draw) * Successfully decompiled Draw function * Decompiled Draw function + Added proper includes to spec * Removed Draw function assembly * Moved func_800F46E0 prototype to functions.h * Renamed unk_174 to bufferIndex * Replaced state constants with enum * Renamed func_808ADAE0 to BgSpot03Taki_ApplyOpeningAlpha * Renamed func_808ADAE0 to BgSpot03Taki_ApplyOpeningAlpha * Made changes as per pull request comments Co-authored-by: fig02 <fig02srl@gmail.com>
2020-10-04 14:14:28 +00:00
// z_bg_spot03_taki
D_06000C98 = 0x06000C98;
D_06000800 = 0x06000800;
D_06000990 = 0x06000990;
D_06000B20 = 0x06000B20;
D_06000BC0 = 0x06000BC0;
D_06001580 = 0x06001580;
Po event (#368) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * and now for poe sister stuff * more matches * awful control flow still needed * complex control is comples * matched and documented * also remove .s * ZAP * .s files never die * more cleaning * a little more cleanup * data cleanup * merge and fix * removing globalCtx2 * dlists * forgot this * now with ColHeader * a little more * one last name change
2020-10-04 12:45:23 +00:00
// z_bg_po_event
D_06007860 = 0x06007860;
D_060075A0 = 0x060075A0;
D_060079E0 = 0x060079E0;
D_06006830 = 0x06006830;
D_06006D60 = 0x06006D60;
D_06007230 = 0x06007230;
Bg_Mori_Idomizu (#401) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * matching * merge and cleanup * wait for mori tex * name
2020-09-28 11:11:58 +00:00
// z_bg_mori_idomizu
D_060049D0 = 0x060049D0;
Bg_Mori_Hashigo (#400) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * All but one * OK * merge and cleanup * wait for mori tex
2020-09-28 05:03:26 +00:00
// z_bg_mori_hashigo
D_060037D8 = 0x060037D8;
D_060036B0 = 0x060036B0;
D_06004770 = 0x06004770;
mori_bigst (#392) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * mori_bigst matched and documented * forgot the .s files again * Update src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * one .s got away * more cleanup * one more thing * wait for mori tex * cleanup * Update z_bg_mori_bigst.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-09-27 01:28:27 +00:00
// z_bg_mori_bigst
D_0600221C = 0x0600221C;
D_06001E50 = 0x06001E50;
Hashira (#384) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * Hashira4 done * forgot some names * minor cleanup * .gitignore reverted * merge and rename * merge and cleanup * needs a description * dlists * wait for mori tex
2020-09-27 01:10:20 +00:00
// z_bg_mori_hashira4
D_06001AF8 = 0x06001AF8;
D_060089E0 = 0x060089E0;
Match and fully document bg_ddan_jd (#386) * match and fully document bg_ddan_jd * fix comment * implemented suggested changes, minor fixes * more changes * implement requested changes, tweak wording on ySpeed comments * more minor tweaks
2020-09-28 05:18:47 +00:00
// z_bg_ddan_jd
D_06003CE0 = 0x06003CE0;
D_060037B8 = 0x060037B8;
Reference in a new issue Copy permalink