mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 21:04:43 +00:00
Code Issues Projects Releases Wiki Activity
2efeeff7c7
oot/undefined_syms.txt

2201 lines
45 KiB
Plaintext
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;
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_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;
Decompile z_kanfont (#443) * Decompile z_kanfont.c * Cleanups * off -> offset * Kanfont -> Font , Keep so-far unused Font fields as padding, Remove MessageData sub-struct
2020-10-12 21:42:17 +00:00
D_07000000 = 0x07000000;
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_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;
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;
z_bg_spot18_basket (#417) * OK - data transferred and two functions done * Not OK * Not OK * OK - several more functions * OK - another function * OK - 2 more functions * OK - another function * OK - one function lefet * Cleaned up file and removed ASM files * Removed unneeded forward declaration * Some cleanup * More cleanup * Minor cleanup * Minor cleanup * Minor cleanup * Addressed a few issues * Changed include statement format * Changed numbers to hex * Changed another number to hex
2020-11-22 11:05:35 +00:00
// z_Bg_spot18_basket
D_06002154 = 0x06002154;
D_060018B0 = 0x060018B0;
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;
z_bgcheck.c, 800430A0.c, 80043480.c (#256) * beginning of migrating changes * got matching * changed order a bit * clean up bgcheck * fix conflict * fix conflict again * first stab at identifying types, some oks * Clean up most bad structs/pointer math, move relevant structs to z64bgcheck.h, get some OKs * more OKs, z_bgcheck.bss migration, update some sys_math3d.c args * couple more OKs * pushing some OKs * fix compilation issues * code_800430A0.c OK, more files decomp'd * 8003A3E0 big OK :) * Decomp most of func_8003C614, decomp helper funcs * Decomp SurfaceType, CamData, and WaterBox property related functions * more OKs, big OK in 8003C078 * more OKs, more progress, move a function definition in z_collision_check to functions.h * more clean-ups, more OKs, dyn_vtx is now defined as u8* * 8003A5B8, 8003A7D8, 8003C614, 8003DD6C OK, document function args better * data migrated, more OKs * 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled * func_80040284, 800409A8 non_matching, add IS_ZERO macro * All asm files have C representations, some big OKs, lots of minor tweaks * More OKs, non-matching code cleanup * 8003FBF4 and 80040BE4 OK, improve codegen for most functions * format z_bgcheck.c * fix warnings, compile errors on NON_MATCHING * func_8003EE80 is now NON_MATCHING * begin documenting some functions * formatting * more documentation, func_8003A95C OK * fix PHYSICAL_TO_VIRTUAL changes * fix var rename * More documentation, functions 80040E40, 80041648 OK, change types to not be compatible with ZAP * func_8004239C ok, more NON_MATCHING improvements, more documentation * Implement most suggested changes * Convert comments to slower comments * /** * Implement ZAP2 changes * my anti-virus ate my format.sh results * Rename a couple hundred functions, fix minor stuff * rename var so that clang formats correctly * run format.sh * implement Petrie's matches/suggestions * format * matches * and the asm * slight error * Add SSList * two more matches * stuff * implement code changes * clean up Petrie's matchings Co-authored-by: Arthur <arthurtilly413@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-08 11:12:58 +00:00
// z_bg_spot18_obj
D_06002FE4 = 0x06002FE4;
D_0600261C = 0x0600261C;
D_06002BC0 = 0x06002BC0;
D_06002370 = 0x06002370;
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_bg_bdan_switch
D_06005CF8 = 0x06005CF8;
D_060061A0 = 0x060061A0;
D_06005A20 = 0x06005A20;
// z_bg_elevator
D_06000360 = 0x06000360;
D_06000180 = 0x06000180;
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
// z_bg_hidan_dalm
D_0600BBF0 = 0x0600BBF0;
D_0600BDF0 = 0x0600BDF0;
D_0600DA10 = 0x0600DA10;
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
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
// z_bg_hidan_fslift
D_0600B630 = 0x0600B630;
D_0600E1E8 = 0x0600E1E8;
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
// z_bg_hidan_syoku
D_0600A7E0 = 0x0600A7E0;
D_0600E568 = 0x0600E568;
Decompiled ovl_Bg_Jya_Zurerukabe (#424) * Decompiled ovl_Bg_Jya_Zurerukabe * PR suggestions, cleanup * PR suggestion
2020-09-30 20:09:52 +00:00
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;
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
Gohma (ovl_Boss_Goma) (#397) * ovl_Boss_Goma OK, except func_80917D98 * ovl_Boss_Goma OK and documented * Minor cleanup: shorten enums, use named constants... * Floats with .0f, less useless static usage, details on oversight about spawning child gohmas, cleanup... * More documentation, hopefully less weird about documenting setups and actions * fix fhg_fire * remove warnings * formatting things * newlines * review Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-03 20:58:33 +00:00
// z_bg_ydan_hasi
D_06005780 = 0x06005780;
D_06007798 = 0x06007798;
D_06005DE0 = 0x06005DE0;
// z_bg_ydan_maruta
D_060066A8 = 0x060066A8;
D_06008D88 = 0x06008D88;
D_06006570 = 0x06006570;
// z_boss_goma
D_06000AE8 = 0x06000AE8;
D_0600193C = 0x0600193C;
D_06002360 = 0x06002360;
D_060029F0 = 0x060029F0;
D_06004318 = 0x06004318;
D_06004A20 = 0x06004A20;
D_06005330 = 0x06005330;
D_060058C0 = 0x060058C0;
D_06005F28 = 0x06005F28;
D_060066DC = 0x060066DC;
D_06006E60 = 0x06006E60;
D_0600B2FC = 0x0600B2FC;
D_0600C468 = 0x0600C468;
D_0600CCD8 = 0x0600CCD8;
D_0600F70C = 0x0600F70C;
D_06010918 = 0x06010918;
D_060113BC = 0x060113BC;
D_06012678 = 0x06012678;
D_060183A8 = 0x060183A8;
D_060185A8 = 0x060185A8;
D_060187A8 = 0x060187A8;
D_060189A8 = 0x060189A8;
D_060191A8 = 0x060191A8;
D_060193A8 = 0x060193A8;
D_06019BA8 = 0x06019BA8;
D_0601DCF8 = 0x0601DCF8;
D_0601EB4C = 0x0601EB4C;
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;
Decompile King Dodongo and his fire effect (#744) * Fixed upstream * move .data * match init * mathc func_808C1D00 * match func_808C32F4, func_808C2B38, func_808C3224, func_808C2AB0 * match func_808C30F4, func_808C2A40, func_808C3704, func_808C3704 * func_808C18B0 * match another chain of functions * Match func_808C29B0, Draw, and most of OverrideLimbDraw * start update * Really close * Almost match update, match Override Limb Draw * start the big switch * Make a little progress on the big switch function * Test * chip away at the big one some more * test * progress * More progress * Add * Finished another chain of functions * Decomp effect functions * Get the whole file in C * Move data to its own C file * Start the effect file en_bdfire.c * Messed up expected * Finish EnBdfire.c * A little clean up * done as far as I can get it * Delete scenes directory * Delete graphs directory * Delete graphovl.py * match and such * Delete BossDodongo_Update.s * PR fixes * restore old IDO * Color Filter * PR fixes (Roman) * Fixed added assets * remove asm * PR fixes (Roman) * quick format change * remove unwanted files Co-authored-by: Louis <5883445+louist103@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-11 16:38:22 +00:00
// z_en_dodongo
D_06008318 = 0x06008318;
D_06004C20 = 0x06004C20;
D_06008B1C = 0x06008B1C;
D_060028F0 = 0x060028F0;
D_06003088 = 0x06003088;
D_060013C4 = 0x060013C4;
D_06001A44 = 0x06001A44;
D_060042C4 = 0x060042C4;
D_06003B14 = 0x06003B14;
D_06015890 = 0x06015890;
D_06017210 = 0x06017210;
D_06015D90 = 0x06015D90;
D_06016390 = 0x06016390;
D_06016590 = 0x06016590;
D_06016790 = 0x06016790;
D_06015990 = 0x06015990;
D_06015F90 = 0x06015F90;
D_06016990 = 0x06016990;
D_06016E10 = 0x06016E10;
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;
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
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;
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;
ovl_Bg_Ganon_Otyuka (#488) * merge upstream * Merge upstream * BgGanonOtyuka_Init * Migrate data * Use texture symbol in dlist * Split gfx into another file * Cool data stuff * Cleanup more data * Name some more stuff * Add newline * BgGanonOtyuka_Destroy * Rename shockwave to flash * Work on BgGanonOtyuka_Draw * Work more on draw * More progress * More BgGanonOtyuka_Draw * Stuff * Terrible match BgGanonOtyuka_Draw * BgGanonOtyuka_Update * func_808760DC * Cleanup BgGanonOtyuka_Draw * Cleanup * More cleanup * Work on func_80875A0C * Rename to color * func_80875C88 * func_80875A0C * Stuff * Stuff * Name top and bottom dlists * Name some verts * Add back in accidentally removed D_808772E0 * Name side dlist * Name dlists * Name flash verts * Only add unk_198 to BossGanon * Name drop timer * Name isFalling * Name stuff * Name stuff relating to sides * Use Side enum * Use cardinal directions for sides * More naming / cleanup * Rename to SIDE_ALL * Replace enum with defines * Flash state * Reorder add * Rename to flashHeight * Revert "Rename to flashHeight" This reverts commit fa1ca87630aa4991e700bf9a8830ad786ba9aeb8. * Correct sides * Rename to unwalledSides * Put f32 on 0x8000 * Cleanup * Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Cleanup Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-29 10:05:30 +00:00
// z_bg_ganon_otyuka
D_08000000 = 0x08000000;
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_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;
// z_bg_haka_meganebg
Decompiled ovl_Bg_Haka_MeganeBG (#448)
2020-10-13 00:44:22 +00:00
D_06000118 = 0x06000118;
First proper commit.
2020-03-17 04:31:30 +00:00
D_06005334 = 0x06005334;
Decompiled ovl_Bg_Haka_MeganeBG (#448)
2020-10-13 00:44:22 +00:00
D_06008EB0 = 0x06008EB0;
First proper commit.
2020-03-17 04:31:30 +00:00
D_06009168 = 0x06009168;
Decompiled ovl_Bg_Haka_MeganeBG (#448)
2020-10-13 00:44:22 +00:00
D_0600A7F4 = 0x0600A7F4;
First proper commit.
2020-03-17 04:31:30 +00:00
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;
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
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;
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;
z_demo_gt.c, 2/112 non matching (#480) * Z_demo_gt.c * More progress * More progress * Some more progress * Mooore progress * Removes unused asm * Additional progress * More progress * 36 remaining * More progress?? * 19 remaining * some progress? * First draw function decompiled * func_80981694 * func_8097F508 * func_8097FF9C * WIP * func_80981E84 * func_80982244 * func_80981AA0 cannot believe it matched * func_8097D7D8 * Rand functions matched * Changes after rebase of GFX macros * func_8097F280 * func_8097FDDC * func_8097E824 some more progress, 2 left * Removes unused ASM * Cleanup / Function renaming * More cleanup / Renaming * review * review * format Co-authored-by: i82orbom <i82orbom i82orbom@github> Co-authored-by: fig <fig02srl@gmail.com>
2020-12-05 21:19:48 +00:00
// z_demo_gt
D_06005CB8 = 0x06005CB8;
D_060091E4 = 0x060091E4;
D_06009970 = 0x06009970;
D_06007630 = 0x06007630;
D_06004F90 = 0x06004F90;
D_06000EA0 = 0x06000EA0;
D_06009610 = 0x06009610;
D_06002910 = 0x06002910;
D_060041A0 = 0x060041A0;
D_06009B08 = 0x06009B80;
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;
Decompile DemoEc 1 non matching (#479) * Fixed upstream * Migrate data and Decomp Init * Decomp a few more functions * Small change before starting * Back to this file * Match action func chains, func_8096DE94, func_8096DF9C, func_8096E0A4 * Match all except 1 function in first back of actionFuncs * matched a bunch in bank D_8097053C * Match the first few draw functions * match a few more draws and start one * All matched but one. All equivalent * Name setup funcs * finish naming functions * Fix Gfx stuff * Remove 'expectedc' * General clean up * fix * progress * cleanup * remove reloc * review 2 * fix awful function pointer thing Co-authored-by: fig <fig02srl@gmail.com>
2020-12-06 02:02:55 +00:00
// z_demo_ec
D_06013B88 = 0x06013B88;
D_060048F4 = 0x060048F4;
D_0600BD38 = 0x0600BD38;
D_0600B7B8 = 0x0600B7B8;
D_06006C90 = 0x06006C90;
D_0600196C = 0x0600196C;
D_060000F0 = 0x060000F0;
D_06005670 = 0x06005670;
D_06005EA8 = 0x06005EA8;
D_06007150 = 0x06007150;
D_0600164C = 0x0600164C;
D_06007958 = 0x06007958;
D_0600164C = 0x0600164C;
D_0600513C = 0x0600513C;
D_06000330 = 0x06000330;
D_06002254 = 0x06002254;
D_0600BFA8 = 0x0600BFA8;
D_0600C918 = 0x0600C918;
D_060086D0 = 0x060086D0;
D_06006C40 = 0x06006C40;
D_06007FB8 = 0x06007FB8;
D_060095DC = 0x060095DC;
D_06002530 = 0x06002530;
D_06009BB4 = 0x06009BB4;
D_0600A07C = 0x0600A07C;
D_0600A474 = 0x0600A474;
D_06000CD8 = 0x06000CD8;
D_06004258 = 0x06004258;
D_0600AFE0 = 0x0600AFE0;
D_06004658 = 0x06004658;
D_0600AFE0 = 0x0600AFE0;
D_060085F8 = 0x060085F8;
D_06004868 = 0x06004868;
D_0600FEF0 = 0x0600FEF0;
D_06002FA0 = 0x06002FA0;
D_06003A98 = 0x06003A98;
D_06002FA0 = 0x06002FA0;
D_060002B8 = 0x060002B8;
D_06008D90 = 0x06008D90;
D_06009EE0 = 0x06009EE0;
D_06006930 = 0x06006930;
D_06006220 = 0x06006220;
D_06008D1C = 0x06008D1C;
D_06009234 = 0x06009234;
D_06004390 = 0x06004390;
D_06004350 = 0x06004350;
D_060076C0 = 0x060076C0;
D_06007AC0 = 0x06007AC0;
D_06005F20 = 0x06005F20;
D_06006920 = 0x06006920;
D_060004C8 = 0x060004C8;
D_06005BD0 = 0x06005BD0;
D_06005AC0 = 0x06005AC0;
D_06005990 = 0x06005990;
D_06005880 = 0x06005880;
D_06009198 = 0x06009198;
D_06009430 = 0x06009430;
D_06009690 = 0x06009690;
D_060035D8 = 0x060035D8;
D_060074C8 = 0x060074C8;
D_0600DE80 = 0x0600DE80;
D_06003770 = 0x06003770;
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_06001144 = 0x06001144;
D_06001FA8 = 0x06001FA8;
D_06002F84 = 0x06002F84;
D_0600ACE0 = 0x0600ACE0;
D_0600BC90 = 0x0600BC90;
D_0600BCA0 = 0x0600BCA0;
D_0600BE40 = 0x0600BE40;
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_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_bg_pushbox
D_06000000 = 0x06000000;
D_06000350 = 0x06000350;
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;
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;
ovl_En_Daiku OK and documented (#422) * ovl_En_Daiku OK, except func_809E3068 * ovl_En_Daiku documented * `ACTORTYPE_ENEMY` Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Nonmatching reloc, better #include path, defines for state flags, enum values, `hair` -> `hairDLists` * asm and format * review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 21:58:05 +00:00
// z_en_daiku
D_06007958 = 0x06007958;
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;
ovl_En_Owl (#573) * begin En_Owl * EnOwl wip * fix conflicts * owl wip * wip * cleanup * more cleanup * remove unused asm * run formatter * match EnOwl_Init * formatting * pr updates * forgot the enum values in WaitZoraRiver * merge fixes * Fix merge issues * review changes + more * name Co-authored-by: fig <fig02srl@gmail.com>
2021-01-14 20:17:03 +00:00
// z_en_owl
D_0600C1C4 = 0x0600C1C4;
D_0201E6A0 = 0x0201E6A0;
D_0201B0C0 = 0x0201B0C0;
D_06001168 = 0x06001168;
D_06003F18 = 0x06003F18;
D_060100B0 = 0x060100B0;
D_060015CC = 0x060015CC;
D_0600C8A0 = 0x0600C8A0;
D_0600C684 = 0x0600C684;
z_en_kakasi.c OK (#428) * Starts decompiling z_en_kakasi * Destroy * EnKakasi_Init * func_80A8F660 * func_80A8F75C * func_80A8F28C * func_80A8F320 equivalent, non matching due to regalloc * EnKakasi_Draw * func_80A8FBB8 * func_80A8FAA4 * func_80A8F9C8 * z_en_kakasi.c OK (1 equivalent, 1 non-matching) * Fixed one non matching * z_en_kakasi.c OK * Removes unused asm * Some fixes * Additional fixes * PR fixes * Rename angle reference to yaw * Change low rotation values to decimal Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-04 16:17:54 +00:00
// z_en_kakasi
z_en_kakasi2.c (#427) * Decompiles z_en_kakasi2 - EnKakasi2_Init * Destroy * func_80A90264 * Finishes z_en_kakasi2 * Remove unused data/reloc * Some hex fixes * Some fixes * Addresses PR comments * Rename temp to be more generic * More var renaming, timer modulo * Change low rotation values to decimal Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-04 16:15:01 +00:00
// z_en_kakasi2
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;
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_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 and mostly document EnSkj, EnSkjNeedle, and OBJECT_SKJ. One NON_MATCHING (#750) * match a few * delete ASM * Almost done * One reg swap left * GlobalCtx2 YEP * Start object SKJ * Start some documentation * Big doc pass * Name the first batch of functions * Done * fix some issues real quick * lets try this again * remove left over doc tools and add 3 textures * Finish object_skj docs * PR fixes * PR fixes * Delete BuildInfo.ha * PR fixes (Roman) * PR fixes (Roman)
2021-04-10 15:39:25 +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
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
// z_en_floormas
D_06002158 = 0x06002158;
D_060039B0 = 0x060039B0;
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
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;
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;
ovl_Door_Shutter OK (#413) * Initial progress * Some more progress * Fix merge * OK * Small improvements * Further improvements * Some documentation, ran formatter * Small fix * Several review suggestions Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Further review changes * Space out declarations, better boolean comparisons Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Some ands to modulos * Swap condition Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Fix merge, PR suggestions * review Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 21:55:01 +00:00
// z_door_shutter
D_0601EDD0 = 0x0601EDD0;
D_06012FD0 = 0x06012FD0;
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
Decompile Gameplay_Keep and fix all existing decompiled objects (#595) * First batch of files * Add missing folders back * Fix missing folders again * Finish fixing existing texture files * Gameplay_Keep XML finished * Most actor gameplay_keep undefined syms removed * Only ~200 gkeep symbols remain * All gkeep symbols that ZAP supports are fixed * Cleanup, and make gkeep names more accurate * Starting to figure out what some unknown blobs are, merge zeldaret in * fix a few more things * refactor gkeep * Change how gitkeep is handled * gkeep xml cleanup * Gkeep finished, now just waiting up ZAP updates * 100 link animations finished * 150 link animations finished * 200 link animations finished * 250 link animations finished * 350 link animations finished * 400 link animations finished * 450 link animations finished * 500 link animations finished * 550 link animations finished * All Link animations finished cannot build yet because ZAP doesn't have LinkAnimationHeader yet * xml changes for new zap stuff * finish gameplay_keep * fixing existing objects * ready for pr besides zap padding issue * mostly ready for pr * format all c files * all conflicts fixed * make changes that roman requested * fix thing i didn't mean to change * some animation symbols renamed * fixed roman's stuff * lifemeter hardcoded pointers removed * fix issue with incorrect data in gameplay_keep * removed unused asm * fixed most of fig's comments * fix all of fig's comments * reformat files * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * fixed stuff * fixed most of roman's comments * remove leading zeroes * should build now * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "f84d8337b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "f84d8337b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * all of gkeep symbols fixed * compiler error fixed * format files * final changes Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-25 00:36:40 +00:00
D_060006B0 = 0x060006B0;
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
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
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_bombf
D_06000340 = 0x06000340;
D_06000408 = 0x06000408;
D_06000530 = 0x06000530;
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
Poe Actor Decomps (#463) * Poe actors progress * Some more progress, En_Poh almost matching * Further progress * Fix merge * Decompile data * Actor struct cleanups * More functions OK * Progress * Last function decompiled, some nonmatchings left * Few more OK, skelanime_init definition changes * Progress * Style improvements, OPEN/CLOSE_DISPS, few more OK * Few more style improvements, function prototype additions/changes, another function OK * Remove unused asm, begin documentation * Use generated reloc * Cleanup, format * Remove a few no longer needed comments * PR suggestions * DISP macros * Missed some FrameUpdateMatrix != 0 replacements * EnPoField_InteractWithSoul -> EnPoField_SoulInteract, eyeImageIdx -> eyeTextureIdx * Fix merge, reformat * Review Suggestions Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Further review suggestions * Ran formatter * Less DECR usage Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-05 00:34:27 +00:00
// z_en_poh
D_060001A8 = 0x060001A8;
D_0600020C = 0x0600020C;
D_060004EC = 0x060004EC;
D_06000570 = 0x06000570;
D_06000FE4 = 0x06000FE4;
D_060011C4 = 0x060011C4;
D_06006F90 = 0x06006F90;
D_060009DC = 0x060009DC;
D_060050D0 = 0x060050D0;
D_06000A60 = 0x06000A60;
D_06004638 = 0x06004638;
D_06004498 = 0x06004498;
D_06004530 = 0x06004530;
D_06004530 = 0x06004530;
D_06004498 = 0x06004498;
D_06004498 = 0x06004498;
D_06004530 = 0x06004530;
// z_en_po_field
D_06000924 = 0x06000924;
D_06006A30 = 0x06006A30;
D_06000F9C = 0x06000F9C;
D_06000608 = 0x06000608;
D_06000454 = 0x06000454;
D_06001360 = 0x06001360;
D_06004BA0 = 0x06004BA0;
D_060059F0 = 0x060059F0;
D_06005900 = 0x06005900;
D_06005620 = 0x06005620;
D_060066D0 = 0x060066D0;
D_06004CC0 = 0x06004CC0;
D_060023B0 = 0x060023B0;
// z_en_po_desert
D_06006A30 = 0x06006A30;
D_06000924 = 0x06000924;
D_06001360 = 0x06001360;
D_06004BA0 = 0x06004BA0;
D_06004CC0 = 0x06004CC0;
// z_en_po_sisters
D_060065C8 = 0x060065C8;
D_060014CC = 0x060014CC;
D_06000D40 = 0x06000D40;
D_06000114 = 0x06000114;
D_060008C0 = 0x060008C0;
D_06000A54 = 0x06000A54;
D_0600119C = 0x0600119C;
D_06000680 = 0x06000680;
D_060027B0 = 0x060027B0;
D_060046E0 = 0x060046E0;
// z_en_po_relay
D_0600BE40 = 0x0600BE40;
D_06003768 = 0x06003768;
D_0600B838 = 0x0600B838;
D_0600BBA0 = 0x0600BBA0;
ovl_En_Nb Decompiled (#298) * started nabooru * more work on nabooru * did more * file name * almost done with z_en_nb * did some more * most of en_nb decomp * data migrated en_nb * did more * almost finished * started some documentation on ovl_en_nb * did more documentation on en_nb * did some more * one non matching in en_nb * ran format.sh * update * updated undefined_syms * updated descriptions * use DISP macros, delete japanese files. NABOORU IS 100% MATCHING POGGERS * made suggested changes and removed reloc file * Made some suggetsed changes * Made some updates * review 3 Co-authored-by: fig <fig02srl@gmail.com>
2020-12-02 19:57:54 +00:00
// z_en_nb
D_060181C8 = 0x060181C8;
D_06009694 = 0x06009694;
D_0600274C = 0x0600274C;
D_06002B4C = 0x06002B4C;
D_06000410 = 0x06000410;
D_06001E7C = 0x06001E7C;
D_06001350 = 0x06001350;
D_06001104 = 0x06001104;
D_06008BD0 = 0x06008BD0;
D_060046A8 = 0x060046A8;
D_06003954 = 0x06003954;
D_06004030 = 0x06004030;
D_06002DBC = 0x06002DBC;
D_060035A8 = 0x060035A8;
D_06006320 = 0x06006320;
D_0600D8E8 = 0x0600D8E8;
D_06013158 = 0x06013158;
D_06000BC0 = 0x06000BC0;
D_06005CA4 = 0x06005CA4;
D_06005614 = 0x06005614;
D_06004BB4 = 0x06004BB4;
D_06006E78 = 0x06006E78;
D_06004E60 = 0x06004E60;
D_06004BB4 = 0x06004BB4;
D_06009238 = 0x06009238;
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;
En_Nwc (#475) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * chicks, man * slight change * formatted everything * Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:29:51 +00:00
// z_en_nwc
D_06000840 = 0x06000840;
D_060008B0 = 0x060008B0;
D_06000BF0 = 0x06000BF0;
D_06000C68 = 0x06000C68;
D_06000C88 = 0x06000C88;
D_06000CE0 = 0x06000CE0;
D_06000D10 = 0x06000D10;
D_06000D50 = 0x06000D50;
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_g_magma2
D_06025A90 = 0x06025A90;
// z_eff_ss_dead_dd
D_01000000 = 0x01000000;
// z_eff_ss_ice_smoke
D_060030A0 = 0x060030A0;
D_06003158 = 0x06003158;
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
Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * It's Phantom Ganon time * Fhg_Fire matched * small touch up * more documentation * starting naming fire * renaming * cleanup * hooray for new names * merge * first pass * camera status * bgcheck * object 1 * object 2 * .s * .s * fig's comments * implementing zel's suggestions and a few other things * the work begins * work continues * docs, shifts, cleanup * cleanup * texture names * addressing the rest of the notes Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-29 19:35:46 +00:00
//z_en_fHG
D_060059A0 = 0x060059A0;
D_0600B098 = 0x0600B098;
D_0600B4C8 = 0x0600B4C8;
D_0600B9D0 = 0x0600B9D0;
D_0600C65C = 0x0600C65C;
D_0600CB1C = 0x0600CB1C;
D_0600DDB8 = 0x0600DDB8;
D_0600E8A0 = 0x0600E8A0;
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;
En_GeldB (#516) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * woo watch out * data and such * stuff * more decomp * another match * match and docs * more docs * little more cleanup * SFX macros * little more * more attempts to match * naming things * I give up on the match * also spec * changes * hex * Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-10 20:00:17 +00:00
// z_en_geldb
D_0600ADF8 = 0x0600ADF8;
D_0600B6D4 = 0x0600B6D4;
D_0600A458 = 0x0600A458;
D_06001390 = 0x06001390;
D_060024E8 = 0x060024E8;
D_0600A814 = 0x0600A814;
D_060003CC = 0x060003CC;
D_06000F5C = 0x06000F5C;
D_06002280 = 0x06002280;
D_06001E10 = 0x06001E10;
D_0600ADF8 = 0x0600ADF8;
D_06001578 = 0x06001578;
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_06000950 = 0x06000950;
D_060009D0 = 0x060009D0;
D_06000A60 = 0x06000A60;
ovl_En_Ik (#461) * merge upstream * Merge upstream * Progress * Progress * Fixes * Migrate bss for now ig * func_80A772EC * Use rom reloc * Cleanup * Correct prototype * Rename to _PlayBGM * Eh revert to _StartMusic * Match func_80A74398 more * Fixes * Work on func_80A74398 * Work on func_80A74398 * Match func_80A74398 * Use thisx * Name, static, and move some stuff * Match some graphics functions * Rename asm for named functions * Forgot one * More graphics stuff * Progress * More progress * Fix jump table * Figure out types for a lot of data * Fix data * Type remaining data * Work on func_80A7492C * Ugly match for func_80A7492C * Fix func_80A7492C * Match some interesting stuff * Move and remove forward declarations * Sort declarations * Progress * Use quotes for vt import * Slightly better diff * Better diff again * Fix stack on func_80A74BA4 * match func_80A74BA4 * func_80A74674 * Progress * Progress * Progress * Progress * Eh early return probably makes more sense here * Progress * Progress * Progress * Autocomplete sucks * Name stuff in func_80A76E2C * Work a bit on func_80A75C38 * Ugly match func_80A75FA0 * Name it prevInvincibilityTimer * EnIk_PostLimbDraw3 * Use hex for line numbers in EnIk_PostLimbDraw3 * EnIk_PostLimbDraw2 * EnIk_PostLimbDraw1 * Use hex for line numbers in EnIk_PostLimbDraw1 * Use ACTORTYPE_ENEMY * Progress * Possible fake match of func_80A75C38 * Update spec and remove asm * Cleanup forward declarations * Move data to fun places * Move data into func_80A76E2C * Move data into func_80A75A38 * Make D_80A7847C an array * Remove struct padding * Revert "Remove struct padding" This reverts commit 87b0bd73da689beb65242e95fc81290c522a06f8. * Name colliders * Use else * Name shieldColliderItems * Use new graphics macros * Cleanup
2020-11-23 13:53:21 +00:00
// z_en_ik
D_02003F80 = 0x02003F80;
D_06001C28 = 0x06001C28;
D_06002538 = 0x06002538;
D_060029FC = 0x060029FC;
D_060033C4 = 0x060033C4;
D_06003DBC = 0x06003DBC;
D_060045BC = 0x060045BC;
D_0600485C = 0x0600485C;
D_06005944 = 0x06005944;
D_06006194 = 0x06006194;
D_06006734 = 0x06006734;
D_0600C114 = 0x0600C114;
D_0600CD70 = 0x0600CD70;
D_0600DD50 = 0x0600DD50;
D_0600ED24 = 0x0600ED24;
D_06016BE0 = 0x06016BE0;
D_06016CD8 = 0x06016CD8;
D_06016D88 = 0x06016D88;
D_06016EE8 = 0x06016EE8;
D_06016F88 = 0x06016F88;
D_06018E78 = 0x06018E78;
D_06019100 = 0x06019100;
D_06019E08 = 0x06019E08;
D_0601E178 = 0x0601E178;
D_060203D8 = 0x060203D8;
D_060205C0 = 0x060205C0;
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
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
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
// z_en_okuta
D_06000344 = 0x06000344;
D_060008FC = 0x060008FC;
D_06000AC0 = 0x06000AC0;
D_06000DDC = 0x06000DDC;
D_06003380 = 0x06003380;
D_06003660 = 0x06003660;
D_06003910 = 0x06003910;
D_06003C64 = 0x06003C64;
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
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_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
En_Rr (#472) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * Many likes alike * matched * merge ZAP * now with names * merge and small cleanup * removed commends * got formatter to behave * move static array * fixed variable names * fixes * pedantic comments
2020-12-02 19:59:45 +00:00
// z_en_rr
D_06000470 = 0x06000470;
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;
En_Elf Decompiled (#432) * init matched * everything but navi OK * progress * 4 left * remove asm * progress * progress * asm and spec * remove comment * suggestion * review1 * use type enum * name func * overridelimbdraw * review 2 * forgot one * merge master * format
2020-10-28 17:02:35 +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;
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;
Shabom OK (#571) * 2 nonmatchings left * shabom OK * suggested changes * more suggested changes
2021-01-02 00:56:57 +00:00
// z_en_bubble
D_06001000 = 0x06001000;
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;
// 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
Decomp En_Niw_Lady, All OK (#462) * Fixed upstream * Migrate .data * Start functions * Decomp func_80AB9F24 * Add files via upload Decomp: func_80ABB228(Draw),EnNiwLady_OverrideLimbDraw,func_80ABB0A0 * Matched a few more * matched more * progress * All matched up. Whole file OK * Format, use reloc, deletet ASM * Fixed a fake match and removed padding from struct * Small cleanup * Small cleanup * Cleanup and some name changes * Small cleanup * Add POLY_OPA_DISP macro * Fix issue in Draw * Fix ZAP. hopefully * PR fixes * PR fixes * PR fixes Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
2020-12-01 18:59:02 +00:00
// z_en_niw_lady
D_060000F0 = 0x060000F0;
D_0600A630 = 0x0600A630;
D_060007D0 = 0x060007D0;
D_06000718 = 0x06000718;
D_06009F94 = 0x06009F94;
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;
En_Torch2 (#486) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * Oh boy more giant functions * now functional, but not equivalent * Now only non-matching * cleaned up illusion room * much closer. static variables still suck though * much closer. static variables still suck though * some docs and cleanup. matching is horrible. * static varaibles are a troublesome lot * ifdef * merge ZAP * merge again * small cleanup * small fixes * swordstate * resolve conflict * comments and such Co-authored-by: fig <fig02srl@gmail.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 01:56:24 +00:00
// z_en_torch2
D_06004764 = 0x06004764;
En_Ssh (House of Skulltula spiders) (#485) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * eek spiders * now with names * fixes and formatting * expanded enum * void* limb draw
2020-12-02 19:58:21 +00:00
// z_en_ssh
D_06000304 = 0x06000304;
D_060052E0 = 0x060052E0;
D_060046C0 = 0x060046C0;
D_06004080 = 0x06004080;
D_06004DE8 = 0x06004DE8;
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;
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
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
// z_en_crow
D_060010C0 = 0x060010C0;
D_060000F0 = 0x060000F0;
Decomp EnMb (#445) * Fixed upstream * Initial commit * Matched init but broke something else * All fixed. Matched Init OK * Progress * Lots of progress * Progress * progress * Progress * progress * fix struct size * commit * progress * progress * add comment * merge master * fix undefined syms * progress * progress * progress * Progress * progress * Finish * Remove asm * Clean up * Delete some ASM * Fix spec * Update z_en_mb.h * Match a few more and move func_80AA7938 to non equivilent * asm * no more non equiv * matched * asm * review Co-authored-by: Louis <5883445+louist103@users.noreply.github.com> Co-authored-by: fig <fig02srl@gmail.com>
2020-12-04 00:25:36 +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;
En_Dh (#474) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * Is this where I make a Mr Hands joke? * Manos: the Hands of Fate * cleanup * and format
2020-12-02 19:58:57 +00:00
// z_en_dh
D_06007E88 = 0x06007E88;
D_06005880 = 0x06005880;
D_06003A8C = 0x06003A8C;
D_06004658 = 0x06004658;
D_06002148 = 0x06002148;
D_06003D6C = 0x06003D6C;
D_060032BC = 0x060032BC;
D_06001A3C = 0x06001A3C;
D_0600375C = 0x0600375C;
D_06007FC0 = 0x06007FC0;
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
Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * It's Phantom Ganon time * Fhg_Fire matched * small touch up * more documentation * starting naming fire * renaming * cleanup * hooray for new names * merge * first pass * camera status * bgcheck * object 1 * object 2 * .s * .s * fig's comments * implementing zel's suggestions and a few other things * the work begins * work continues * docs, shifts, cleanup * cleanup * texture names * addressing the rest of the notes Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-03-29 19:35:46 +00:00
// z_boss_ganondrof
D_06004EC0 = 0x06004EC0;
D_0600C710 = 0x0600C710;
D_06003CA4 = 0x06003CA4;
D_06001144 = 0x06001144;
D_06002684 = 0x06002684;
D_060019A4 = 0x060019A4;
D_0600D99C = 0x0600D99C;
D_0600DF80 = 0x0600DF80;
D_0600189C = 0x0600189C;
D_06001AB0 = 0x06001AB0;
D_060108D8 = 0x060108D8;
D_06000D84 = 0x06000D84;
D_0600090C = 0x0600090C;
D_0600FAC8 = 0x0600FAC8;
D_06011BCC = 0x06011BCC;
D_06010060 = 0x06010060;
D_06011F44 = 0x06011F44;
D_0601267C = 0x0601267C;
D_06003080 = 0x06003080;
D_0600EC94 = 0x0600EC94;
D_06010344 = 0x06010344;
D_060129E0 = 0x060129E0;
D_0600F48C = 0x0600F48C;
D_0600B380 = 0x0600B380;
D_06003DB0 = 0x06003DB0;
z_en_fd, z_en_fd_fire, and z_en_fw (#415) * EnFd OK * decompile En_Fd_Fire, document some of En_Fd * fw wip * match a few more of ovl_en_fw, properly organize data * Ovl_En_Fw OK * Documentation, formatting. * change Color_RGBA8_n to Color_RGBA8 * PR updates * fix errors with merge * review * dunno why jenkins failed * review Co-authored-by: fig <fig02srl@gmail.com>
2020-12-04 19:35:28 +00:00
// z_en_fd
D_060079F8 = 0x060079F8;
D_06007A78 = 0x06007A78;
D_06007928 = 0x06007928;
D_06007938 = 0x06007938;
D_06005810 = 0x06005810;
// z_en_fw
D_06007C30 = 0x06007C30;
D_06006CF8 = 0x06006CF8;
ovl_En_Gm OK (#407) * im tired so done for tonight * decompiled * z_en_gm remove reloc * added description * weird formatting fixed * MTXMODE_APPLY * Made suggested changes * update * review 2 Co-authored-by: fig <fig02srl@gmail.com>
2020-12-02 20:00:24 +00:00
// z_en_gm
D_060002B8 = 0x060002B8;
D_0600FEF0 = 0x0600FEF0;
D_0600DE80 = 0x0600DE80;
Decompile En_Vm (Beamos) (#416) * Decompile En_Vm * various Beamos fixes * Beamos fixes * Cleanup Beamos * Update src/overlays/actors/ovl_En_Vm/z_en_vm.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Vm/z_en_vm.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Vm/z_en_vm.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Vm/z_en_vm.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Updated En_Vm * Update Beamos * Update src/overlays/actors/ovl_En_Vm/z_en_vm.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update En_Vm Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-25 19:20:02 +00:00
// z_en_vm
D_06003F60 = 0x06003F60;
D_06000068 = 0x06000068;
D_06002728 = 0x06002728;
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;
ObjTimeblock OK (#421) * ObjTimeblock: move data in source file * ObjTimeblock: decomp Init() * ObjTimeblock: decomp Destroy() * ObjTimeblock: decomp func_80BA0058()/spawnDemoEffect() * ObjTimeblock: decomp func_80B9FFA0() * ObjTimeblock: decomp func_80BA040C()/mainActionFunc() * ObjTimeblock: decomp func_80BA032C() * ObjTimeblock: decomp func_80BA0480() * ObjTimeblock: decomp func_80BA0514() * ObjTimeblock: decomp func_80BA0524() * ObjTimeblock: decomp func_80BA00CC()/toggleSceneSwitch() * ObjTimeblock: decomp func_80BA04F8() * ObjTimeblock: decomp func_80BA0508()/doNothing() * ObjTimeblock: decomp func_80BA0758() * ObjTimeblock: decomp func_80BA0768() * ObjTimeblock: decomp func_80BA06AC() * ObjTimeblock: decomp func_80BA083C() * ObjTimeblock: decomp func_80BA084C() * ObjTimeblock: decomp ObjTimeblock_Update() * ObjTimeblock: decomp ObjTimeblock_Draw() * ObjTimeblock: document the most obvious * ObjTimeblock: use compiled reloc data * ObjTimeblock: apply suggestions from mzxrules * review Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 21:52:26 +00:00
// z_obj_timeblock
D_06000980 = 0x06000980;
D_06000B30 = 0x06000B30;
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;
En_Niw (Cucco) OK (#429) * Cucco progress * Cucco decompiled, one non-matching * Update z_en_niw.c * Update z_en_niw.h * Update z_en_niw.c * Delete EnNiw_Destroy.s * Delete EnNiw_Draw.s * Delete EnNiw_Init.s * Delete EnNiw_Update.s * Delete func_80AB5BF8.s * Delete func_80AB5FA0.s * Delete func_80AB6100.s * Delete func_80AB627C.s * Delete func_80AB6324.s * Delete func_80AB63A8.s * Delete func_80AB840C.s * Delete func_80AB70F8.s * Delete func_80AB6D08.s * Delete func_80AB6BF8.s * Delete func_80AB6A38.s * Delete func_80AB7F60.s * Delete func_80AB6F04.s * Delete func_80AB6570.s * Delete func_80AB7204.s * Delete func_80AB714C.s * Delete func_80AB7328.s * Delete func_80AB7290.s * Delete func_80AB7420.s * Delete func_80AB747C.s * Delete func_80AB8168.s * Delete func_80AB8258.s * Delete func_80AB6EB4.s * Delete func_80AB70A0.s * Delete func_80AB6450.s * Delete z_en_niw.data.s * Delete z_en_niw.reloc.s * Update undefined_syms.txt * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Add boolean suggestion * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Made suggested changes * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Most suggested changes made * More changes made, fixed compiler error * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Cleaned up En_Niw * Cleaned up En_Niw * Cleaned up En_Niw * Merged Cucco conflicts * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Made requested changes (Cucco) * Added actor description * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Made requested En_Niw changes * Removed DECR from En_Niw * Reduced number of if (1)'s * Update EnNiw * Some Cucco documentation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-10-28 17:20:10 +00:00
z_bgcheck.c, 800430A0.c, 80043480.c (#256) * beginning of migrating changes * got matching * changed order a bit * clean up bgcheck * fix conflict * fix conflict again * first stab at identifying types, some oks * Clean up most bad structs/pointer math, move relevant structs to z64bgcheck.h, get some OKs * more OKs, z_bgcheck.bss migration, update some sys_math3d.c args * couple more OKs * pushing some OKs * fix compilation issues * code_800430A0.c OK, more files decomp'd * 8003A3E0 big OK :) * Decomp most of func_8003C614, decomp helper funcs * Decomp SurfaceType, CamData, and WaterBox property related functions * more OKs, big OK in 8003C078 * more OKs, more progress, move a function definition in z_collision_check to functions.h * more clean-ups, more OKs, dyn_vtx is now defined as u8* * 8003A5B8, 8003A7D8, 8003C614, 8003DD6C OK, document function args better * data migrated, more OKs * 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled * func_80040284, 800409A8 non_matching, add IS_ZERO macro * All asm files have C representations, some big OKs, lots of minor tweaks * More OKs, non-matching code cleanup * 8003FBF4 and 80040BE4 OK, improve codegen for most functions * format z_bgcheck.c * fix warnings, compile errors on NON_MATCHING * func_8003EE80 is now NON_MATCHING * begin documenting some functions * formatting * more documentation, func_8003A95C OK * fix PHYSICAL_TO_VIRTUAL changes * fix var rename * More documentation, functions 80040E40, 80041648 OK, change types to not be compatible with ZAP * func_8004239C ok, more NON_MATCHING improvements, more documentation * Implement most suggested changes * Convert comments to slower comments * /** * Implement ZAP2 changes * my anti-virus ate my format.sh results * Rename a couple hundred functions, fix minor stuff * rename var so that clang formats correctly * run format.sh * implement Petrie's matches/suggestions * format * matches * and the asm * slight error * Add SSList * two more matches * stuff * implement code changes * clean up Petrie's matchings Co-authored-by: Arthur <arthurtilly413@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-08 11:12:58 +00:00
// z_en_a_keep or en_a_obj
D_040394B0 = 0x040394B0;
D_0403A120 = 0x0403A120;
D_0403A480 = 0x0403A480;
D_0403A7F0 = 0x0403A7F0;
D_06000730 = 0x06000730;
en_kusa (#494) * starting the decomp for en_kusa -> the bushes * in the bushes of love * maybe the init_function is done? * The functions that call functions never end * more progress. almost matches init * fig helped a bunch...ty fig * moving things along * yikes * more things matching * moar matches! fixed casting issues on some data * progress * progress * One function left to go * yeah, idk....its close though * closer * Ok * En_Kusa: Ok * removing the asm files * fixed suggestions * small fixes I forgot * messed things up, had to go back, back to being OK * named a couple more functions and fixed some logic * fixing some names I guessed wrong on * fixed suggested changes Co-authored-by: fig <fig02srl@gmail.com>
2020-12-05 20:28:39 +00:00
// z_en_kusa
D_060002E0 = 0x60002E0;
Decompiled and documentedKarebaba (withered Deku Baba enemy), all functions OK (#391) * Renamed functions based on decomp * Update function name changes * Karebaba decomp and documentation with one non-matching function * Cleaned up some messiness * Forgot a file * Addressing code review * Updated based on code review * Unnecessary define * This function is going down * Removed remaining asm, renamed symbols as recommended, and added comments to give context around the display lists * Forgot a file * Fix renamed function * Addressed issues raised in code review * Minor cleanup * Addressed issues identified in code review * Addressed the issues betterer * Updated to use poly disp macros * review 2 Co-authored-by: fig <fig02srl@gmail.com>
2020-12-03 21:05:32 +00:00
// z_en_karebaba
D_060002B8 = 0x060002B8;
D_060010F0 = 0x060010F0;
D_06001330 = 0x06001330;
D_06001628 = 0x06001628;
D_06001828 = 0x06001828;
D_06002A40 = 0x06002A40;
D_06003070 = 0x06003070;
En_Niw (Cucco) OK (#429) * Cucco progress * Cucco decompiled, one non-matching * Update z_en_niw.c * Update z_en_niw.h * Update z_en_niw.c * Delete EnNiw_Destroy.s * Delete EnNiw_Draw.s * Delete EnNiw_Init.s * Delete EnNiw_Update.s * Delete func_80AB5BF8.s * Delete func_80AB5FA0.s * Delete func_80AB6100.s * Delete func_80AB627C.s * Delete func_80AB6324.s * Delete func_80AB63A8.s * Delete func_80AB840C.s * Delete func_80AB70F8.s * Delete func_80AB6D08.s * Delete func_80AB6BF8.s * Delete func_80AB6A38.s * Delete func_80AB7F60.s * Delete func_80AB6F04.s * Delete func_80AB6570.s * Delete func_80AB7204.s * Delete func_80AB714C.s * Delete func_80AB7328.s * Delete func_80AB7290.s * Delete func_80AB7420.s * Delete func_80AB747C.s * Delete func_80AB8168.s * Delete func_80AB8258.s * Delete func_80AB6EB4.s * Delete func_80AB70A0.s * Delete func_80AB6450.s * Delete z_en_niw.data.s * Delete z_en_niw.reloc.s * Update undefined_syms.txt * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Add boolean suggestion * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Made suggested changes * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Most suggested changes made * More changes made, fixed compiler error * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Cleaned up En_Niw * Cleaned up En_Niw * Cleaned up En_Niw * Merged Cucco conflicts * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Made requested changes (Cucco) * Added actor description * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Niw/z_en_niw.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Made requested En_Niw changes * Removed DECR from En_Niw * Reduced number of if (1)'s * Update EnNiw * Some Cucco documentation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-10-28 17:20:10 +00:00
// z_en_niw
D_06002530 = 0x06002530;
D_060000E8 = 0x060000E8;
D_060023B0 = 0x060023B0;
D_06002428 = 0x06002428;
ovl_bg_ice_turara OK (#467) * ovl_Bg_Ice_Turara.c OK * =Updated z_bg_ice_turara.c to address comments * Params and all functions named * remove unnecessary linebreak * Update src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Changed enum names Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-23 23:32:57 +00:00
// z_bg_ice_turara
D_060023D0 = 0x060023D0;
D_06002594 = 0x06002594;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
// z_bg_breakwall
D_02014F80 = 0x02014F80;
// z_bg_dy_yoseizo
D_02000130 = 0x02000130;
D_02000160 = 0x02000160;
D_02001020 = 0x02001020;
D_020013E0 = 0x020013E0;
D_02001F40 = 0x02001F40;
D_020025D0 = 0x020025D0;
D_0600092C = 0x0600092C;
D_06001DF0 = 0x06001DF0;
D_060031C0 = 0x060031C0;
D_06004344 = 0x06004344;
D_06005810 = 0x06005810;
D_06005860 = 0x06005860;
D_06005868 = 0x06005868;
D_060058D8 = 0x060058D8;
D_06005E60 = 0x06005E60;
D_060069E8 = 0x060069E8;
D_06007CA8 = 0x06007CA8;
D_06008698 = 0x06008698;
D_0601C450 = 0x0601C450;
D_0601D514 = 0x0601D514;
// z_bg_gnd_firemeiro
D_0600E210 = 0x0600E210;
D_0600ECD8 = 0x0600ECD8;
// z_bg_gnd_iceblock
D_06004420 = 0x06004420;
D_06004618 = 0x06004618;
// z_bg_haka_gate
D_0600F1B0 = 0x0600F1B0;
D_06010A10 = 0x06010A10;
D_06010C10 = 0x06010C10;
D_06010E10 = 0x06010E10;
D_060131C4 = 0x060131C4;
Decompile Gameplay_Keep and fix all existing decompiled objects (#595) * First batch of files * Add missing folders back * Fix missing folders again * Finish fixing existing texture files * Gameplay_Keep XML finished * Most actor gameplay_keep undefined syms removed * Only ~200 gkeep symbols remain * All gkeep symbols that ZAP supports are fixed * Cleanup, and make gkeep names more accurate * Starting to figure out what some unknown blobs are, merge zeldaret in * fix a few more things * refactor gkeep * Change how gitkeep is handled * gkeep xml cleanup * Gkeep finished, now just waiting up ZAP updates * 100 link animations finished * 150 link animations finished * 200 link animations finished * 250 link animations finished * 350 link animations finished * 400 link animations finished * 450 link animations finished * 500 link animations finished * 550 link animations finished * All Link animations finished cannot build yet because ZAP doesn't have LinkAnimationHeader yet * xml changes for new zap stuff * finish gameplay_keep * fixing existing objects * ready for pr besides zap padding issue * mostly ready for pr * format all c files * all conflicts fixed * make changes that roman requested * fix thing i didn't mean to change * some animation symbols renamed * fixed roman's stuff * lifemeter hardcoded pointers removed * fix issue with incorrect data in gameplay_keep * removed unused asm * fixed most of fig's comments * fix all of fig's comments * reformat files * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * fixed stuff * fixed most of roman's comments * remove leading zeroes * should build now * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "f84d8337b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "f84d8337b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * all of gkeep symbols fixed * compiler error fixed * format files * final changes Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-25 00:36:40 +00:00
D_0600A938 = 0x0600A938;
Bg_Haka_Gate (#557) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * match * sfx fix * should be good to go * comments and such * Matrix macros escape me * format * fix bubble * remove comments Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig <fig02srl@gmail.com>
2020-12-30 00:39:30 +00:00
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
// z_bg_haka_sgami
D_0600BF20 = 0x0600BF20;
Bg_Haka_Sgami OK (#532) * spinning scythe trap, 4/6 matching * fixed typo * Almost matched sgami init * Matched sgami Init * starting to clean up func_8087E858 * func_8087E858 half-way done * Scythe matched * update scythe * Removed asm files * Delete z_bg_haka_sgami.reloc.s * Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update z_bg_haka_sgami.c Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-19 09:59:35 +00:00
D_060021F0 = 0x060021F0;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
// z_bg_haka_ship
D_06005A70 = 0x06005A70;
D_0600D330 = 0x0600D330;
D_0600E408 = 0x0600E408;
D_0600E910 = 0x0600E910;
D_0600ED7C = 0x0600ED7C;
// z_bg_haka_zou
D_06005E30 = 0x06005E30;
D_06006F70 = 0x06006F70;
// z_bg_ice_objects
D_06000190 = 0x06000190;
D_060003F0 = 0x060003F0;
// z_bg_ice_shelter
D_060006F0 = 0x060006F0;
D_060012A0 = 0x060012A0;
D_06001C1C = 0x06001C1C;
D_06002640 = 0x06002640;
D_06002920 = 0x06002920;
// z_bg_jya_haheniron
D_06000880 = 0x06000880;
// z_bg_jya_ironobj
D_06000880 = 0x06000880;
// z_bg_relay_objects
D_060001A0 = 0x060001A0;
D_060003C4 = 0x060003C4;
D_06001AB0 = 0x06001AB0;
D_060025FC = 0x060025FC;
// z_bg_spot00_hanebasi
D_060000C0 = 0x060000C0;
D_06000280 = 0x06000280;
D_06000430 = 0x06000430;
D_060005E0 = 0x060005E0;
// z_bg_spot02_objects
D_060013F0 = 0x060013F0;
D_060126F0 = 0x060126F0;
D_060128D8 = 0x060128D8;
D_06012BA4 = 0x06012BA4;
D_06012D30 = 0x06012D30;
D_060133EC = 0x060133EC;
// z_bg_spot06_objects
D_06000120 = 0x06000120;
D_06000470 = 0x06000470;
D_06000E10 = 0x06000E10;
D_06000EE8 = 0x06000EE8;
D_06001160 = 0x06001160;
D_06001238 = 0x06001238;
D_06002490 = 0x06002490;
// z_bg_spot07_taki
D_06000460 = 0x06000460;
D_06000BE0 = 0x06000BE0;
D_06001CF0 = 0x06001CF0;
D_06001F68 = 0x06001F68;
D_06002590 = 0x06002590;
D_06003210 = 0x06003210;
D_060032D8 = 0x060032D8;
D_060038FC = 0x060038FC;
// z_bg_spot08_iceblock
D_06000DE0 = 0x06000DE0;
D_06002BD0 = 0x06002BD0;
D_06002FD8 = 0x06002FD8;
Undefined Symbols in the ASM (#527) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * now with more symbols
2020-12-12 19:22:33 +00:00
D_06001904 = 0x06001904;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
// z_bg_toki_hikari
D_06000880 = 0x06000880;
D_060009C0 = 0x060009C0;
D_06000A10 = 0x06000A10;
D_06007E20 = 0x06007E20;
D_06007EE0 = 0x06007EE0;
D_06008190 = 0x06008190;
// z_boss_dodongo
D_030021D8 = 0x030021D8;
D_06001074 = 0x06001074;
D_06002D0C = 0x06002D0C;
D_06003CF8 = 0x06003CF8;
D_060042A8 = 0x060042A8;
D_06004E0C = 0x06004E0C;
D_060061D4 = 0x060061D4;
D_06008EEC = 0x06008EEC;
D_06009D10 = 0x06009D10;
D_06009D50 = 0x06009D50;
D_06009DD0 = 0x06009DD0;
D_0600DF38 = 0x0600DF38;
D_0600E848 = 0x0600E848;
D_0600F0D8 = 0x0600F0D8;
D_06015890 = 0x06015890;
D_06015990 = 0x06015990;
D_06015D90 = 0x06015D90;
D_06015F90 = 0x06015F90;
D_06016390 = 0x06016390;
D_06016590 = 0x06016590;
D_06016790 = 0x06016790;
D_06016990 = 0x06016990;
D_06016E10 = 0x06016E10;
D_06017210 = 0x06017210;
D_06017410 = 0x06017410;
D_0601B310 = 0x0601B310;
D_0601CAE0 = 0x0601CAE0;
D_0601D934 = 0x0601D934;
// z_boss_ganon
D_02006C18 = 0x02006C18;
D_02007418 = 0x02007418;
D_06000540 = 0x06000540;
D_06000FE8 = 0x06000FE8;
D_06001440 = 0x06001440;
D_06001B0C = 0x06001B0C;
D_06001F58 = 0x06001F58;
D_06001FF8 = 0x06001FF8;
D_06002D2C = 0x06002D2C;
D_06003018 = 0x06003018;
D_0600343C = 0x0600343C;
D_06003D40 = 0x06003D40;
D_06004304 = 0x06004304;
D_06004884 = 0x06004884;
D_06004DA8 = 0x06004DA8;
D_06004F64 = 0x06004F64;
D_060058C4 = 0x060058C4;
D_06005FFC = 0x06005FFC;
D_06006028 = 0x06006028;
D_060063CC = 0x060063CC;
D_060069A0 = 0x060069A0;
D_06006AF4 = 0x06006AF4;
D_06007268 = 0x06007268;
D_0600738C = 0x0600738C;
D_06007A64 = 0x06007A64;
D_06008128 = 0x06008128;
D_060089F8 = 0x060089F8;
D_06008A88 = 0x06008A88;
D_06008F44 = 0x06008F44;
D_060096B0 = 0x060096B0;
D_06009A14 = 0x06009A14;
D_06009A20 = 0x06009A20;
D_06009D5C = 0x06009D5C;
D_0600A598 = 0x0600A598;
D_0600AA24 = 0x0600AA24;
D_0600ADDC = 0x0600ADDC;
D_0600B668 = 0x0600B668;
D_0600BE38 = 0x0600BE38;
D_0600BE90 = 0x0600BE90;
D_0600C9E8 = 0x0600C9E8;
D_0600CF00 = 0x0600CF00;
D_0600EA00 = 0x0600EA00;
D_0600F19C = 0x0600F19C;
D_06010298 = 0x06010298;
D_06010514 = 0x06010514;
D_060114E8 = 0x060114E8;
// z_boss_ganon2
D_06000BFC = 0x06000BFC;
D_06000EA0 = 0x06000EA0;
D_06002168 = 0x06002168;
D_060028A8 = 0x060028A8;
D_06002E6C = 0x06002E6C;
D_06003754 = 0x06003754;
D_06003B1C = 0x06003B1C;
D_06003F38 = 0x06003F38;
D_06007288 = 0x06007288;
D_06008EB8 = 0x06008EB8;
D_0600A8E0 = 0x0600A8E0;
D_0600ADD0 = 0x0600ADD0;
D_0600BE90 = 0x0600BE90;
D_0600CAF8 = 0x0600CAF8;
D_0600DFF0 = 0x0600DFF0;
D_0600E8EC = 0x0600E8EC;
D_0600FFE4 = 0x0600FFE4;
D_06010380 = 0x06010380;
D_060114E8 = 0x060114E8;
D_060147E0 = 0x060147E0;
D_06021A90 = 0x06021A90;
D_06025970 = 0x06025970;
D_06026510 = 0x06026510;
D_06026AF4 = 0x06026AF4;
D_06027824 = 0x06027824;
D_0602A848 = 0x0602A848;
D_060334F8 = 0x060334F8;
D_06034278 = 0x06034278;
D_060353C0 = 0x060353C0;
object_zl2, object_zl2_anime1 & object_zl2_anime2 OK (#694) * xml Signed-off-by: Angie <angheloalf95@gmail.com> * add xmls of anime1 and anime2 Signed-off-by: Angie <angheloalf95@gmail.com> * add unaccounted data from animes Signed-off-by: Angie <angheloalf95@gmail.com> * add all unaccounted data and a bit of renaming Signed-off-by: Angie <angheloalf95@gmail.com> * add to spec and change the pointer to the decompiled names Signed-off-by: Angie <angheloalf95@gmail.com> * add palettes Signed-off-by: angie <angheloalf95@gmail.com> * delete gitkeep Signed-off-by: angie <angheloalf95@gmail.com> * run format Signed-off-by: angie <angheloalf95@gmail.com> * change palette to Tlut Signed-off-by: angie <angheloalf95@gmail.com> * change `Tlut` to `TLUT` Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-28 02:24:28 +00:00
// z_boss_mo
D_06001010 = 0x06001010;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
// z_boss_tw
D_060004A4 = 0x060004A4;
D_06000AAC = 0x06000AAC;
D_060012A4 = 0x060012A4;
D_060017E0 = 0x060017E0;
D_06001D10 = 0x06001D10;
D_0600230C = 0x0600230C;
D_06003614 = 0x06003614;
D_06003E34 = 0x06003E34;
D_06004548 = 0x06004548;
D_0600578C = 0x0600578C;
D_06006530 = 0x06006530;
D_06006F28 = 0x06006F28;
D_060070E0 = 0x060070E0;
D_06007688 = 0x06007688;
D_06007CA8 = 0x06007CA8;
D_060088C8 = 0x060088C8;
D_06009398 = 0x06009398;
D_0600E6C4 = 0x0600E6C4;
D_06012B38 = 0x06012B38;
D_06012CE0 = 0x06012CE0;
D_06013310 = 0x06013310;
D_060134B8 = 0x060134B8;
D_06013AE8 = 0x06013AE8;
D_06013D68 = 0x06013D68;
D_06013E98 = 0x06013E98;
D_06013F98 = 0x06013F98;
D_06014070 = 0x06014070;
D_06014158 = 0x06014158;
D_06018FC0 = 0x06018FC0;
D_06019938 = 0x06019938;
D_06019D40 = 0x06019D40;
D_0601A430 = 0x0601A430;
D_0601A438 = 0x0601A438;
D_0601A528 = 0x0601A528;
D_0601A5A8 = 0x0601A5A8;
D_0601A790 = 0x0601A790;
D_0601A998 = 0x0601A998;
D_0601AA50 = 0x0601AA50;
D_0601AB00 = 0x0601AB00;
D_0601AB08 = 0x0601AB08;
D_0601BC00 = 0x0601BC00;
D_0601C1C0 = 0x0601C1C0;
D_0601CEE0 = 0x0601CEE0;
D_0601DBE8 = 0x0601DBE8;
D_0601DDF0 = 0x0601DDF0;
D_0601E020 = 0x0601E020;
D_0601E0E0 = 0x0601E0E0;
D_0601E2C0 = 0x0601E2C0;
D_0601E3A0 = 0x0601E3A0;
D_0601E9F0 = 0x0601E9F0;
D_0601EC68 = 0x0601EC68;
D_0601EEB0 = 0x0601EEB0;
D_0601F238 = 0x0601F238;
D_0601F390 = 0x0601F390;
D_0601F608 = 0x0601F608;
D_0601F888 = 0x0601F888;
D_060216DC = 0x060216DC;
D_06022700 = 0x06022700;
D_06023750 = 0x06023750;
D_06024374 = 0x06024374;
D_060244B4 = 0x060244B4;
D_0602D890 = 0x0602D890;
D_0602D940 = 0x0602D940;
D_0602E170 = 0x0602E170;
D_06032020 = 0x06032020;
D_06032BF8 = 0x06032BF8;
D_060338F0 = 0x060338F0;
D_060343B4 = 0x060343B4;
D_06035030 = 0x06035030;
D_06035988 = 0x06035988;
D_06036FBC = 0x06036FBC;
D_06038E2C = 0x06038E2C;
D_0603A2D0 = 0x0603A2D0;
// z_boss_va
D_06000024 = 0x06000024;
D_06000FA0 = 0x06000FA0;
D_06001230 = 0x06001230;
D_06004E70 = 0x06004E70;
D_06005184 = 0x06005184;
D_06008BB8 = 0x06008BB8;
D_06008D70 = 0x06008D70;
D_06008F08 = 0x06008F08;
D_06008F70 = 0x06008F70;
D_06009430 = 0x06009430;
D_06009468 = 0x06009468;
D_0600948C = 0x0600948C;
D_06011738 = 0x06011738;
D_06011768 = 0x06011768;
D_060128B8 = 0x060128B8;
D_06012948 = 0x06012948;
D_06012BA0 = 0x06012BA0;
D_06012C50 = 0x06012C50;
D_060135B0 = 0x060135B0;
D_06013638 = 0x06013638;
D_060156A0 = 0x060156A0;
D_06015710 = 0x06015710;
D_06015B18 = 0x06015B18;
D_060162AC = 0x060162AC;
D_060164B0 = 0x060164B0;
D_060166A8 = 0x060166A8;
D_06017498 = 0x06017498;
D_06017694 = 0x06017694;
D_060177F4 = 0x060177F4;
D_06017FC8 = 0x06017FC8;
D_06018150 = 0x06018150;
D_06018870 = 0x06018870;
D_06018A68 = 0x06018A68;
D_06018B90 = 0x06018B90;
D_06018D18 = 0x06018D18;
D_060199A0 = 0x060199A0;
// z_demo_6k
D_06001040 = 0x06001040;
D_06001190 = 0x06001190;
D_060022B0 = 0x060022B0;
D_060035E0 = 0x060035E0;
D_060039D0 = 0x060039D0;
// z_demo_ext
D_0600FAA0 = 0x0600FAA0;
// z_demo_ik
D_0600035C = 0x0600035C;
D_06000380 = 0x06000380;
D_06000634 = 0x06000634;
D_06000660 = 0x06000660;
D_060008DC = 0x060008DC;
D_06000C6C = 0x06000C6C;
D_06000C90 = 0x06000C90;
D_06000F0C = 0x06000F0C;
D_06016BE0 = 0x06016BE0;
D_06016CD8 = 0x06016CD8;
D_06016F88 = 0x06016F88;
D_06017028 = 0x06017028;
D_06017170 = 0x06017170;
Undefined Symbols in the ASM (#527) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * now with more symbols
2020-12-12 19:22:33 +00:00
D_0601EE60 = 0x0601EE60;
D_06000F30 = 0x06000F30;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
D_0601EB14 = 0x0601EB14;
D_0601EB40 = 0x0601EB40;
D_0601EE34 = 0x0601EE34;
Undefined Symbols in the ASM (#527) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * now with more symbols
2020-12-12 19:22:33 +00:00
D_06000900 = 0x06000900;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
// z_demo_kankyo
D_06000080 = 0x06000080;
D_06000DE0 = 0x06000DE0;
D_06007440 = 0x06007440;
D_06007578 = 0x06007578;
D_06008390 = 0x06008390;
// z_demo_kekkai
D_06004930 = 0x06004930;
D_06004F00 = 0x06004F00;
D_06005A30 = 0x06005A30;
D_06005CB0 = 0x06005CB0;
// z_door_killer
D_06001BC8 = 0x06001BC8;
// z_efc_erupc
D_06001720 = 0x06001720;
D_06002570 = 0x06002570;
D_06002760 = 0x06002760;
D_060027D8 = 0x060027D8;
// z_en_am
D_06000118 = 0x06000118;
D_06000238 = 0x06000238;
D_0600033C = 0x0600033C;
D_06005948 = 0x06005948;
D_06005B3C = 0x06005B3C;
// z_en_ba
D_06000890 = 0x06000890;
D_06001D80 = 0x06001D80;
// z_en_bb
D_06000184 = 0x06000184;
D_06000444 = 0x06000444;
D_06001A30 = 0x06001A30;
// z_en_bdfire
D_0601D950 = 0x0601D950;
// z_en_bigokuta
D_06000444 = 0x06000444;
D_06000A74 = 0x06000A74;
D_06000D1C = 0x06000D1C;
D_060014B8 = 0x060014B8;
D_06001CA4 = 0x06001CA4;
D_06006BC0 = 0x06006BC0;
// z_en_bili
D_06000024 = 0x06000024;
D_06000064 = 0x06000064;
D_060000A4 = 0x060000A4;
D_06005848 = 0x06005848;
// z_en_brob
D_06000290 = 0x06000290;
D_060015D8 = 0x060015D8;
D_06001678 = 0x06001678;
D_06001750 = 0x06001750;
D_06001958 = 0x06001958;
D_06001A70 = 0x06001A70;
// z_en_bubble
D_06001000 = 0x06001000;
// z_en_bw
D_06000228 = 0x06000228;
D_060020F0 = 0x060020F0;
D_060021A0 = 0x060021A0;
D_06002250 = 0x06002250;
// z_en_cs
D_0602AF70 = 0x0602AF70;
// z_en_daiku_kakariko
D_06007958 = 0x06007958;
// z_en_dekubaba
D_06000208 = 0x06000208;
D_060002B8 = 0x060002B8;
D_060010F0 = 0x060010F0;
D_06001330 = 0x06001330;
D_06001828 = 0x06001828;
D_06002A40 = 0x06002A40;
D_06003070 = 0x06003070;
// z_en_diving_game
D_0600219C = 0x0600219C;
D_06002FE8 = 0x06002FE8;
D_0600BFA8 = 0x0600BFA8;
// z_en_dnt_jiji
D_06000560 = 0x06000560;
D_06000944 = 0x06000944;
D_06000A70 = 0x06000A70;
D_06000BD0 = 0x06000BD0;
D_06000DF8 = 0x06000DF8;
D_060012B0 = 0x060012B0;
D_06002310 = 0x06002310;
D_060033E0 = 0x060033E0;
D_060037C0 = 0x060037C0;
// z_en_dnt_nomal
D_06000168 = 0x06000168;
D_0600031C = 0x0600031C;
D_06000430 = 0x06000430;
D_060006CC = 0x060006CC;
D_06000894 = 0x06000894;
D_06000B70 = 0x06000B70;
D_060014E0 = 0x060014E0;
D_06001B00 = 0x06001B00;
D_060023B8 = 0x060023B8;
D_060024CC = 0x060024CC;
D_060026C4 = 0x060026C4;
Forest Stage and related actors and objects (#618) * starting out * match demo * full match * cleanup * more names * more names * headers * dist from link * docs * objects * format * organization of xmls * merge actor * Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-02-12 22:25:02 +00:00
D_06002AF0 = 0x06002AF0;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
D_06002E1C = 0x06002E1C;
D_06002E84 = 0x06002E84;
D_06003128 = 0x06003128;
// z_en_dodojr
D_060004A0 = 0x060004A0;
D_060005F0 = 0x060005F0;
D_06000724 = 0x06000724;
D_06000860 = 0x06000860;
D_060009D4 = 0x060009D4;
D_060020E0 = 0x060020E0;
// z_en_eiyer
D_06000288 = 0x06000288;
D_060004C4 = 0x060004C4;
D_06000704 = 0x06000704;
D_06000FC0 = 0x06000FC0;
D_060012AC = 0x060012AC;
D_06003410 = 0x06003410;
// z_en_encount2
D_06000DE0 = 0x06000DE0;
// z_en_fire_rock
D_06000DE0 = 0x06000DE0;
// z_en_fr
D_060011C0 = 0x060011C0;
D_06001534 = 0x06001534;
D_0600B498 = 0x0600B498;
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
D_060007BC = 0x060007BC;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
// z_en_fz
D_060030A0 = 0x060030A0;
D_060030A8 = 0x060030A8;
D_06003158 = 0x06003158;
D_06003160 = 0x06003160;
// z_en_gb
D_0600049C = 0x0600049C;
D_0600C0B0 = 0x0600C0B0;
D_0600C220 = 0x0600C220;
D_0600C2D0 = 0x0600C2D0;
D_0600C8EC = 0x0600C8EC;
// z_en_ge1
D_06000228 = 0x06000228;
D_06000330 = 0x06000330;
D_0600A048 = 0x0600A048;
D_0600A498 = 0x0600A498;
// z_en_ge2
D_06008968 = 0x06008968;
D_06009ED4 = 0x06009ED4;
// z_en_ge3
D_0600A458 = 0x0600A458;
D_0600B07C = 0x0600B07C;
// z_en_geldb
D_060003CC = 0x060003CC;
D_06000F5C = 0x06000F5C;
D_06001390 = 0x06001390;
D_06001578 = 0x06001578;
D_06001E10 = 0x06001E10;
D_06002280 = 0x06002280;
D_060024E8 = 0x060024E8;
D_0600A458 = 0x0600A458;
D_0600A814 = 0x0600A814;
D_0600ADF8 = 0x0600ADF8;
D_0600B6D4 = 0x0600B6D4;
// z_en_go
D_06004930 = 0x06004930;
D_0600BD80 = 0x0600BD80;
D_0600C140 = 0x0600C140;
D_0600CE80 = 0x0600CE80;
D_0600DE80 = 0x0600DE80;
D_0600FD40 = 0x0600FD40;
D_0600FD50 = 0x0600FD50;
D_0600FEF0 = 0x0600FEF0;
D_06010590 = 0x06010590;
// z_en_go2
D_06000750 = 0x06000750;
D_06000D5C = 0x06000D5C;
Gorons: En_Go & En_Go2 OK (#556) * moved en_go rodata * EnGo 20/45 functions decompiled * EnGo 25/45 functions decompiled * EnGo 28/45 functions decompiled * EnGo 32/45 functions decompiled * minor attempts * init Goron 2 6/98 decompiled (baby functions) * Goron2 14/98 func decompiled * Goron2 30/98 func decompiled * EnGo 34/45 functions decompiled * EnGo 38/45 functions decompiled * Goron2 44/98 functions decompiled * Goron2 58/98 functions decompiled * Merged EnGo and EnGo2: 38/45, 58/98 functions decompiled * EnGo EnGo2: 38/45, 65/98 functions decompiled * EnGo EnGo2: 38/45, 70/98 functions decompiled * EnGo EnGo2: 39/45, 72/98 functions decompiled * EnGo EnGo2: 39/45, 80/98 functions decompiled * EnGo EnGo2: 39/45, 88/98 functions decompiled * EnGo EnGo2: 39/45, 92/98 functions decompiled * typo in GoronType * EnGo EnGo2: 40/45, 93/98 functions decompiled * EnGo EnGo2: 45/45, 93/98 functions decompiled * EnGo EnGo2 fully decomped * begin cleanup * the cleanup continues * continue cleaning * Documentation and renaming attempt * more cleanup * more cleanup * Apply suggestions from code review Committing suggestions Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> * more pr suggestions * more pr and gns feedback * fixed comment * cleanup * update math & skelAnime names * goron1 * goron2 * relocs * review Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: fig <fig02srl@gmail.com>
2021-01-31 18:02:28 +00:00
D_0600161C = 0x0600161C;
D_06001A00 = 0x06001A00;
D_060021D0 = 0x060021D0;
D_060029A8 = 0x060029A8;
D_06002D80 = 0x06002D80;
D_06003768 = 0x06003768;
D_060038E4 = 0x060038E4;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
D_06004930 = 0x06004930;
D_0600BD80 = 0x0600BD80;
D_0600C140 = 0x0600C140;
Gorons: En_Go & En_Go2 OK (#556) * moved en_go rodata * EnGo 20/45 functions decompiled * EnGo 25/45 functions decompiled * EnGo 28/45 functions decompiled * EnGo 32/45 functions decompiled * minor attempts * init Goron 2 6/98 decompiled (baby functions) * Goron2 14/98 func decompiled * Goron2 30/98 func decompiled * EnGo 34/45 functions decompiled * EnGo 38/45 functions decompiled * Goron2 44/98 functions decompiled * Goron2 58/98 functions decompiled * Merged EnGo and EnGo2: 38/45, 58/98 functions decompiled * EnGo EnGo2: 38/45, 65/98 functions decompiled * EnGo EnGo2: 38/45, 70/98 functions decompiled * EnGo EnGo2: 39/45, 72/98 functions decompiled * EnGo EnGo2: 39/45, 80/98 functions decompiled * EnGo EnGo2: 39/45, 88/98 functions decompiled * EnGo EnGo2: 39/45, 92/98 functions decompiled * typo in GoronType * EnGo EnGo2: 40/45, 93/98 functions decompiled * EnGo EnGo2: 45/45, 93/98 functions decompiled * EnGo EnGo2 fully decomped * begin cleanup * the cleanup continues * continue cleaning * Documentation and renaming attempt * more cleanup * more cleanup * Apply suggestions from code review Committing suggestions Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> * more pr suggestions * more pr and gns feedback * fixed comment * cleanup * update math & skelAnime names * goron1 * goron2 * relocs * review Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: fig <fig02srl@gmail.com>
2021-01-31 18:02:28 +00:00
D_0600CE80 = 0x0600CE80;
D_0600D280 = 0x0600D280;
D_0600D680 = 0x0600D680;
D_0600DA80 = 0x0600DA80;
D_0600DE80 = 0x0600DE80;
D_0600E680 = 0x0600E680;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
D_0600FD40 = 0x0600FD40;
D_0600FD50 = 0x0600FD50;
D_0600FEF0 = 0x0600FEF0;
Gorons: En_Go & En_Go2 OK (#556) * moved en_go rodata * EnGo 20/45 functions decompiled * EnGo 25/45 functions decompiled * EnGo 28/45 functions decompiled * EnGo 32/45 functions decompiled * minor attempts * init Goron 2 6/98 decompiled (baby functions) * Goron2 14/98 func decompiled * Goron2 30/98 func decompiled * EnGo 34/45 functions decompiled * EnGo 38/45 functions decompiled * Goron2 44/98 functions decompiled * Goron2 58/98 functions decompiled * Merged EnGo and EnGo2: 38/45, 58/98 functions decompiled * EnGo EnGo2: 38/45, 65/98 functions decompiled * EnGo EnGo2: 38/45, 70/98 functions decompiled * EnGo EnGo2: 39/45, 72/98 functions decompiled * EnGo EnGo2: 39/45, 80/98 functions decompiled * EnGo EnGo2: 39/45, 88/98 functions decompiled * EnGo EnGo2: 39/45, 92/98 functions decompiled * typo in GoronType * EnGo EnGo2: 40/45, 93/98 functions decompiled * EnGo EnGo2: 45/45, 93/98 functions decompiled * EnGo EnGo2 fully decomped * begin cleanup * the cleanup continues * continue cleaning * Documentation and renaming attempt * more cleanup * more cleanup * Apply suggestions from code review Committing suggestions Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> * more pr suggestions * more pr and gns feedback * fixed comment * cleanup * update math & skelAnime names * goron1 * goron2 * relocs * review Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: fig <fig02srl@gmail.com>
2021-01-31 18:02:28 +00:00
D_06010590 = 0x06010590;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
// z_en_goma
D_0600017C = 0x0600017C;
D_06000334 = 0x06000334;
D_06000544 = 0x06000544;
D_06000838 = 0x06000838;
D_06000B78 = 0x06000B78;
D_06000E4C = 0x06000E4C;
D_06001548 = 0x06001548;
D_06002A70 = 0x06002A70;
D_06003B40 = 0x06003B40;
D_06003D78 = 0x06003D78;
// z_en_g_switch
D_060017C0 = 0x060017C0;
D_06001960 = 0x06001960;
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
// z_en_horse
D_02000230 = 0x02000230;
D_02002AC0 = 0x02002AC0;
D_06006530 = 0x06006530;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
// z_en_hs
D_06000304 = 0x06000304;
D_06000528 = 0x06000528;
D_060005C0 = 0x060005C0;
D_06006260 = 0x06006260;
// z_en_hy
D_06000BFC = 0x06000BFC;
D_06000FE4 = 0x06000FE4;
D_060012E8 = 0x060012E8;
D_06002160 = 0x06002160;
D_0600265C = 0x0600265C;
D_060033B4 = 0x060033B4;
D_06005BC8 = 0x06005BC8;
// z_en_in
D_060003B4 = 0x060003B4;
D_06001BE0 = 0x06001BE0;
D_060034D0 = 0x060034D0;
D_06007A20 = 0x06007A20;
D_06007BF8 = 0x06007BF8;
D_06013B88 = 0x06013B88;
D_06013D60 = 0x06013D60;
D_06014CA8 = 0x06014CA8;
D_06015814 = 0x06015814;
D_0601646C = 0x0601646C;
D_06018C38 = 0x06018C38;
// z_en_kanban
D_06000C30 = 0x06000C30;
D_06001630 = 0x06001630;
// z_en_ko
D_06006A60 = 0x06006A60;
D_06007830 = 0x06007830;
D_06007D94 = 0x06007D94;
D_0600879C = 0x0600879C;
D_06008F6C = 0x06008F6C;
// z_en_mk
D_06000368 = 0x06000368;
D_06000724 = 0x06000724;
D_06000AC0 = 0x06000AC0;
D_06000D88 = 0x06000D88;
D_06005DF0 = 0x06005DF0;
// z_en_mm
D_06005E18 = 0x06005E18;
D_0602CA38 = 0x0602CA38;
// z_en_mm2
D_06005E18 = 0x06005E18;
// z_en_mu
D_060003F4 = 0x060003F4;
D_06004F70 = 0x06004F70;
EnNy OK (#624) * get data in * Match Init and one other * match some more * match a bunch more * merge master * OK * Some naming done * OBJECT_NY almost done. waiting on ZAP changes * Remove ASM * Cleanup * Commit before merge * fix damage table * Change comment
2021-01-31 20:32:55 +00:00
// z_en_m_thunder
D_04012570 = 0x04012570;
D_04012690 = 0x04012690;
D_04012AF0 = 0x04012AF0;
D_04012C10 = 0x04012C10;
D_04013610 = 0x04013610;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
// z_en_ossan
D_060000F0 = 0x060000F0;
D_060000FC = 0x060000FC;
D_060002E4 = 0x060002E4;
D_06000338 = 0x06000338;
D_060004A8 = 0x060004A8;
D_0600065C = 0x0600065C;
D_0600078C = 0x0600078C;
D_06002820 = 0x06002820;
D_06004258 = 0x06004258;
D_06004658 = 0x06004658;
D_06004868 = 0x06004868;
D_06009B38 = 0x06009B38;
D_0600BFA8 = 0x0600BFA8;
D_0600DE80 = 0x0600DE80;
D_0600FEF0 = 0x0600FEF0;
// z_en_owl
D_0201B0C0 = 0x0201B0C0;
D_0201E6A0 = 0x0201E6A0;
D_06001168 = 0x06001168;
D_060015CC = 0x060015CC;
D_0600C0E8 = 0x0600C0E8;
D_0600C1C4 = 0x0600C1C4;
D_0600C684 = 0x0600C684;
D_0600C8A0 = 0x0600C8A0;
D_060100B0 = 0x060100B0;
// z_en_peehat
D_06000350 = 0x06000350;
D_060005C4 = 0x060005C4;
D_06000844 = 0x06000844;
D_060009C4 = 0x060009C4;
D_06001C80 = 0x06001C80;
// z_en_sa
D_02005730 = 0x02005730;
D_02010E20 = 0x02010E20;
// z_en_shopnuts
D_060001EC = 0x060001EC;
D_0600039C = 0x0600039C;
D_06000764 = 0x06000764;
D_06000BA0 = 0x06000BA0;
D_0600139C = 0x0600139C;
D_06003B68 = 0x06003B68;
D_060041A8 = 0x060041A8;
D_06004574 = 0x06004574;
// z_en_stream
D_06000950 = 0x06000950;
// z_en_sw
D_06000304 = 0x06000304;
D_06003FB0 = 0x06003FB0;
D_060043D8 = 0x060043D8;
D_060045C0 = 0x060045C0;
D_06004658 = 0x06004658;
D_060046F0 = 0x060046F0;
D_06004788 = 0x06004788;
D_06004820 = 0x06004820;
D_060048B8 = 0x060048B8;
D_06004950 = 0x06004950;
D_060049E8 = 0x060049E8;
D_06005298 = 0x06005298;
// z_en_syateki_man
D_06000338 = 0x06000338;
D_06007E28 = 0x06007E28;
D_06009B38 = 0x06009B38;
// z_en_ta
D_060017E8 = 0x060017E8;
D_06001C94 = 0x06001C94;
D_06006DC0 = 0x06006DC0;
D_0600B7B8 = 0x0600B7B8;
D_0600BF38 = 0x0600BF38;
D_0600C48C = 0x0600C48C;
D_0600C858 = 0x0600C858;
D_0600CD50 = 0x0600CD50;
D_0600CF28 = 0x0600CF28;
D_0600E3D8 = 0x0600E3D8;
// z_en_tg
D_06005040 = 0x06005040;
D_0600AE40 = 0x0600AE40;
// z_en_tite
D_0600083C = 0x0600083C;
D_06000A14 = 0x06000A14;
D_06000C70 = 0x06000C70;
D_060012E4 = 0x060012E4;
D_06001300 = 0x06001300;
D_06001700 = 0x06001700;
D_06001900 = 0x06001900;
D_06001B00 = 0x06001B00;
D_06001F00 = 0x06001F00;
D_06002100 = 0x06002100;
D_06003A20 = 0x06003A20;
// z_en_toryo
D_06007150 = 0x06007150;
// z_en_tp
D_06000000 = 0x06000000;
D_060008D0 = 0x060008D0;
D_06000C68 = 0x06000C68;
// z_en_tr
D_060013CC = 0x060013CC;
D_06001CDC = 0x06001CDC;
D_060035CC = 0x060035CC;
D_06003FC8 = 0x06003FC8;
D_060049C8 = 0x060049C8;
D_0600C530 = 0x0600C530;
D_06011688 = 0x06011688;
// z_en_trap
D_06001400 = 0x06001400;
// z_en_vali
D_06000710 = 0x06000710;
D_06000854 = 0x06000854;
D_06000B34 = 0x06000B34;
D_060014AC = 0x060014AC;
D_06002610 = 0x06002610;
D_06002740 = 0x06002740;
D_060027D8 = 0x060027D8;
D_06004848 = 0x06004848;
// z_en_viewer
D_01000000 = 0x01000000;
D_06000450 = 0x06000450;
D_060005B4 = 0x060005B4;
D_060008A0 = 0x060008A0;
D_06000BC8 = 0x06000BC8;
D_06000F54 = 0x06000F54;
D_06001410 = 0x06001410;
D_060014F4 = 0x060014F4;
D_06001D28 = 0x06001D28;
D_06002574 = 0x06002574;
D_06002928 = 0x06002928;
D_060029CC = 0x060029CC;
D_06003284 = 0x06003284;
D_06003428 = 0x06003428;
D_06003D84 = 0x06003D84;
D_0600420C = 0x0600420C;
En_Viewer (one non-matching) (#570) * init commit * en_viewer 20/24 functions decompiled * en_viewer 22/24 functions decompiled * EnViewer 1 func non-matching, down to stack * cleanup, 1 non-matching * ran formatter * remove extra space in undefined_syms.txt * remove data.s * update math & skelAnime names * pr feedback * review * semicolon Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-16 17:33:37 +00:00
D_06004260 = 0x06004260;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
D_06004534 = 0x06004534;
D_060048B0 = 0x060048B0;
D_060048FC = 0x060048FC;
D_0600504C = 0x0600504C;
D_060050A8 = 0x060050A8;
D_06007210 = 0x06007210;
D_0600A4E0 = 0x0600A4E0;
D_0600BE90 = 0x0600BE90;
D_0600D0D8 = 0x0600D0D8;
D_0600E1A8 = 0x0600E1A8;
D_0600F178 = 0x0600F178;
D_0600F378 = 0x0600F378;
D_0600F578 = 0x0600F578;
D_0600F778 = 0x0600F778;
En_Viewer (one non-matching) (#570) * init commit * en_viewer 20/24 functions decompiled * en_viewer 22/24 functions decompiled * EnViewer 1 func non-matching, down to stack * cleanup, 1 non-matching * ran formatter * remove extra space in undefined_syms.txt * remove data.s * update math & skelAnime names * pr feedback * review * semicolon Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-16 17:33:37 +00:00
D_0600F788 = 0x0600F788;
D_06011348 = 0x06011348;
D_060114E8 = 0x060114E8;
D_060119E8 = 0x060119E8;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
// z_en_weiyer
D_06000288 = 0x06000288;
D_06000FC0 = 0x06000FC0;
D_060012AC = 0x060012AC;
D_06003410 = 0x06003410;
// z_en_wf
D_06004638 = 0x06004638;
D_06004AD0 = 0x06004AD0;
D_06004CA4 = 0x06004CA4;
D_06005430 = 0x06005430;
D_060057A0 = 0x060057A0;
D_06009690 = 0x06009690;
D_060098C8 = 0x060098C8;
D_06009B20 = 0x06009B20;
D_0600A4AC = 0x0600A4AC;
// z_en_wood02
D_06000700 = 0x06000700;
// z_en_zf
D_06006690 = 0x06006690;
D_06008138 = 0x06008138;
D_06008C6C = 0x06008C6C;
D_06009530 = 0x06009530;
D_0600A3D4 = 0x0600A3D4;
D_0600B10C = 0x0600B10C;
D_0600E198 = 0x0600E198;
D_06010060 = 0x06010060;
D_060104B8 = 0x060104B8;
D_060119F4 = 0x060119F4;
D_0601366C = 0x0601366C;
D_06014E60 = 0x06014E60;
D_060157F8 = 0x060157F8;
D_06016388 = 0x06016388;
// z_en_zl4
D_02000104 = 0x02000104;
D_02000444 = 0x02000444;
D_02003994 = 0x02003994;
D_0600E038 = 0x0600E038;
D_0600F0A4 = 0x0600F0A4;
D_0600F894 = 0x0600F894;
D_06010DF8 = 0x06010DF8;
D_060125E4 = 0x060125E4;
D_06012E58 = 0x06012E58;
D_06015F14 = 0x06015F14;
D_060169B4 = 0x060169B4;
D_06016D08 = 0x06016D08;
D_0601805C = 0x0601805C;
D_06018898 = 0x06018898;
D_0601910C = 0x0601910C;
D_0601A2FC = 0x0601A2FC;
D_0601AAE0 = 0x0601AAE0;
D_0601B874 = 0x0601B874;
D_0601BCF0 = 0x0601BCF0;
D_0601CE08 = 0x0601CE08;
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
// z_en_zo
D_06000598 = 0x06000598;
D_06000D48 = 0x06000D48;
D_060022F0 = 0x060022F0;
D_06002350 = 0x06002350;
D_060024A0 = 0x060024A0;
D_06002510 = 0x06002510;
D_06002F10 = 0x06002F10;
D_0600BFA8 = 0x0600BFA8;
D_0600BFC0 = 0x0600BFC0;
D_0600C028 = 0x0600C028;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
// z_fishing
D_0600007C = 0x0600007C;
D_060029C0 = 0x060029C0;
D_06003230 = 0x06003230;
D_06003460 = 0x06003460;
D_060034C0 = 0x060034C0;
D_06003610 = 0x06003610;
D_06003680 = 0x06003680;
D_06003710 = 0x06003710;
D_06003760 = 0x06003760;
D_060039A8 = 0x060039A8;
D_06003A18 = 0x06003A18;
D_0600453C = 0x0600453C;
D_06007350 = 0x06007350;
D_060074C8 = 0x060074C8;
D_060085F8 = 0x060085F8;
D_06008610 = 0x06008610;
D_06008678 = 0x06008678;
D_060088C0 = 0x060088C0;
D_06008970 = 0x06008970;
D_0600B950 = 0x0600B950;
D_0600B9C0 = 0x0600B9C0;
D_0600C220 = 0x0600C220;
D_0600C298 = 0x0600C298;
D_0600CFE0 = 0x0600CFE0;
D_06011058 = 0x06011058;
D_06011170 = 0x06011170;
D_06011270 = 0x06011270;
D_060113D0 = 0x060113D0;
D_06011410 = 0x06011410;
D_06012160 = 0x06012160;
D_060121F0 = 0x060121F0;
Undefined Symbols in the ASM (#527) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * now with more symbols
2020-12-12 19:22:33 +00:00
D_06011070 = 0x06011070;
Add remaining undefined syms (#500) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * syms * Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 02:50:35 +00:00
D_06013330 = 0x06013330;
D_060133B0 = 0x060133B0;
D_06013590 = 0x06013590;
D_06013610 = 0x06013610;
D_06013F50 = 0x06013F50;
D_06013FD0 = 0x06013FD0;
D_06014030 = 0x06014030;
D_060140B0 = 0x060140B0;
D_060153D0 = 0x060153D0;
D_06015470 = 0x06015470;
// z_item_shield
D_060224F8 = 0x060224F8;
// z_object_kankyo
D_01000000 = 0x01000000;
D_06005FF0 = 0x06005FF0;
D_06009620 = 0x06009620;
// z_obj_bean
D_06000090 = 0x06000090;
D_060001B0 = 0x060001B0;
D_060003F0 = 0x060003F0;
D_060005DC = 0x060005DC;
D_06000650 = 0x06000650;
// z_obj_kibako2
D_06000960 = 0x06000960;
D_06000B70 = 0x06000B70;
D_06001000 = 0x06001000;
// z_obj_lift
D_06000140 = 0x06000140;
D_060003D0 = 0x060003D0;
// z_obj_warp2block
D_06000980 = 0x06000980;
D_06000B30 = 0x06000B30;
ovl_Magic_Dark (#495) * merge upstream * Merge upstream * Small formatting * Data section * MagicDark_Draw * Gross match of func_80B874E4 * Add func_8005A9CC to functions.h * Work on func_80B87A18 * func_80B8772C * Remove comment * Work on func_80B87A18 * Correct fp constant * Add regalloc comment ;( * Move negatives to numbers * Stupid casts >:( * Use this->actor when possible * It's so close * Use cast + 0xFF * func_80B87A18 * Delete asm and replace globalCtx2 * Update spec * static everything * Name scale * Use decimal for alpha * Name some stuff * Delete reloc * Name orbOffset * Name some functions * Make unused data colors (because it probably is) * Change >= to > * Use clamps * Name MagicDark_DimLighting * Name gfx * Rename prototype params * Cleanup * Funny cast Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2020-12-02 02:36:39 +00:00
En_Dns OK (#477) * En_Dns OK All functions matching, several named. I left unnamed the really short ones that just do purchase checks, and the string of action functions near the end where the purposes are somewhat opaque. * Addressed all comments (with the exception of one that didn't match) * missed the header * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * else if review comment addressed Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-02 00:07:38 +00:00
// z_en_dns
D_060041A8 = 0x060041A8;
D_060009A0 = 0x060009A0;
D_06004404 = 0x06004404;
z_en_peehat (#660) * decomp most of En_Peehat * z_en_peehat code decomp'd and OK * complete data migration * first pass at documentation * minor code clean-up * documentation pass * fix spec (hopefully), implement some of petrie's suggestions * implement requested changes * fix compiler warnings * implement fig's changes * implement roman's changes
2021-02-21 14:25:53 +00:00
// z_en_peehat
D_06001C80 = 0x06001C80;
D_060009C4 = 0x060009C4;
D_06000844 = 0x06000844;
D_060005C4 = 0x060005C4;
D_06000350 = 0x06000350;
Volvagia (ovl_Boss_Fd) and related actors (#352) * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * Lots of functions matched. Some big ones are close. * Five left unmatched, one close. * Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched. * Three unmatched, one essentially matched, the rest matched. * More fixes. * Documented more of the structure and cleaned up a bit. * BossFd2, BgVbSima, and EnVbBall matched and documented * Also removed unneeded .s files * And need to name EnVbBall's functions * give this a shot * fix conflict * one more try * removing darkmeiro changes * and again * now OK from make clean * minor cleanup * One more matching function for BossFd * which means it doesn't need its .s * splitting * splitting * splitting * forgot some .s * fancy new names * fancy new names * trying again * sneaky .s files * sound effects and some hex to decimal conversions * Sound effects and static variable cleanup * format.sh and clean up static variables * sfx and formatting * ZAP and cleanup * small cleanup * cleanup and ZAP * ZAP * looking at the giant function again * looking at the giant function again * Only the big function left. * Those .s files aren't mine, officer * float literals might be fixed. regalloc still a nightmare * almost done with the big function * should make now * not much of a change * all functions match. rodata somehow doesn't. * forgot some things * lots of cleanup * and a little more * small error * large cleanup. Also BossFd has function names and inlined variable declarations * still more cleanup * the quest for 0.1f continues * forgot to put NON_MATCHING back in * Data structures fully documented. Still more cleanup. * DECR now works with BossFd2 * should match now * cleanup * small cleanup * cleanup and names * tiny thing * particles and headers and stuff * now with more enums * merge * test * end test * update * cleanup * object 2 * object 1 * doc object_fd2 * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * formatting * .s * merge actor * vertex arrays * a little more * formatting * merge opd * fixed damage check * cleanup * fixes * effect struct * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: fig02 <fig02srl@gmail.com>
2021-04-17 17:12:46 +00:00
// z_bg_haka
D_06000428 = 0x06000428;
D_060001B0 = 0x060001B0;
D_060002A8 = 0x060002A8;
Reference in New Issue Copy Permalink