mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +00:00
Code Issues Projects Releases Wiki Activity

Decompiled A LOT of objects (#815)

Browse source 
* .

* remove tools/ZAP2 from origin master

* object_spot04_objects

* remove accidentally added xml

* object_spot00_objects

* object_bombf ok

* object_dy_obj

* object_masterzoora

* object_mastergolon and object_masterkokirihead

* object_aob

* object_gt

* object_gt

* object_geff

* object_mag kinda

* object_gjyo_objects OK

* object_ani OK

* object_door_gerudo

* object_md and object_trap

* object_js OK

* object_goroiwa

* object_gs

* object_nwc

* object_niw

* object_ane

* object_os_anime OK

* object_d_hsblock OK

* object_fz OK

* object_ru2 OK

* fixed object_mag

* object_cow OK

* object_spot01_objects OK

* object_spot15_obj

* object_umajump OK

* object_spot18_obj

* object_spot12_obj

* fix symbols in z_item_b_heart

* object_bdan_objects & object_bowl

* object_ddan_objects

* object_owl OK

* object_spot01_matoyab.xml OK

* object_haka OK

* object_heavy_object

* object_ingate and objet_menkuri_objects

* objet_spot00_break & object_relay_objects OK

* object_spot01_matoya OK

* object_spot06_objects OK

* undefined_syms

* object_spot08_obj OK

* object_efc_doughnut & object_zg

* object_ik OK

* object_vm

* object_ei OK

* object_ds OK

* updated spec

* map_48x85_static OK

* object_zl1 & object_peehat ok

* some z_parameter naming and other undefined symbol stuff, object_yukabyun OK

* object_bubble & object_fw ok

* object_shopnuts

* restore delete file

* object_timeblock OK

* object_d_lift OK

* object_kibako2 OK

* object_mamenoki OK

* matches

* remove unused asm

* object_mag ok now

* fixed object_ani

* done for now, im tired

* object_bdan_objects fixed up

* fix bdan

* object_bombf fixed

* object_bowl fixed up

* object_cow fixed

* did more, im tired

* fixed some stuff in object_ddan_objects

* fix object_ddan_object

* object_door_gerudo fixed

* object_ds fix

* object_dy progress

* fixed great fairy

* some more

* more

* object_haka fix

* progress

* ingo_gate fixed

* object_js

* forgot collision

* object_relay_objects fixed

* object_kibako2

* object_mag fixed

* u64* to void*

* more u64* to void*

* object_mamenoki fix

* object_mastergolon & object_masterkokirihead fix

* mido is weird

* fixed build

* fix object_menkuri_objects

* add missing textures in object_menkuri_objects

* object_ms

* fixed object_peehat

* some cleanup stuff

* object_zg fix

* object_spot00_break fix

* object_niw fix

* object_nwc fixed

* object_ru2 object_rr and some of object_owl fix

* object_spot15_obj fix

* business scrub

* object_spot01_matoya fixed

* object_spot18_obj fix

* object_spot01_objects fix

* object_spot04_objects fix

* object_spot04_objects actually fixed

* object_spot12_obj fix

* object_timeblock fix

* object_spot06_objects fixed

* object_spot08_obj fix

* spot01_matoyab fix

* object_trap fix

* object_umajump fix

* object_vm fix

* z_en_niw_lady fix

* object_yukabyun fix

* object_zl1 fixed

* added offsets to object_os_anime

* object_md fix

* object_ane fix

* object_aob fix

* add palette comment

* object_spot00_objects fix

* spot00 fix

* remove unused asm

* updates

* Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815

* Updated object_bdan_objects, ran format.sh

* Change rgb5a1 to rgba16 in my object xmls

* Addressed Anghelo's comments

* review

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
Lucas Shaw 2021-08-05 08:53:58 -07:00 • committed by GitHub
parent bb4babbe15
commit 0f644b7545
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
162 changed files with 2973 additions and 1386 deletions
Download patch file Download diff file Expand all files Collapse all files

4
asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s
View file

@ -3,10 +3,10 @@ glabel ObjLift_Draw
/* 008A8 80B96978 AFA40018 */ sw $a0, 0x0018($sp)
/* 008AC 80B9697C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 008B0 80B96980 AFBF0014 */ sw $ra, 0x0014($sp)
/* 008B4 80B96984 3C050600 */ lui $a1, %hi(D_06000140) ## $a1 = 06000000
/* 008B4 80B96984 3C050600 */ lui $a1, %hi(gCollapsingPlatformDL) ## $a1 = 06000000
/* 008B8 80B96988 0C00D498 */ jal Gfx_DrawDListOpa
/* 008BC 80B9698C 24A50140 */ addiu $a1, $a1, %lo(D_06000140) ## $a1 = 06000140
/* 008BC 80B9698C 24A50140 */ addiu $a1, $a1, %lo(gCollapsingPlatformDL) ## $a1 = 06000140
/* 008C0 80B96990 8FBF0014 */ lw $ra, 0x0014($sp)
/* 008C4 80B96994 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 008C8 80B96998 03E00008 */ jr $ra

4
asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Init.s
View file

@ -16,10 +16,10 @@ glabel ObjLift_Init
/* 00314 80B963E4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0
/* 00318 80B963E8 AFBF001C */ sw $ra, 0x001C($sp)
/* 0031C 80B963EC AFB00018 */ sw $s0, 0x0018($sp)
/* 00320 80B963F0 3C060600 */ lui $a2, %hi(D_060003D0) ## $a2 = 06000000
/* 00320 80B963F0 3C060600 */ lui $a2, %hi(gCollapsingPlatformCol) ## $a2 = 06000000
/* 00324 80B963F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000
/* 00328 80B963F8 AFA50024 */ sw $a1, 0x0024($sp)
/* 0032C 80B963FC 24C603D0 */ addiu $a2, $a2, %lo(D_060003D0) ## $a2 = 060003D0
/* 0032C 80B963FC 24C603D0 */ addiu $a2, $a2, %lo(gCollapsingPlatformCol) ## $a2 = 060003D0
/* 00330 80B96400 0C2E5836 */ jal func_80B960D8
/* 00334 80B96404 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001
/* 00338 80B96408 8605001C */ lh $a1, 0x001C($s0) ## 0000001C

4
asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s
View file

@ -28,14 +28,14 @@ glabel func_80B96160
/* 000E4 80B961B4 F7B40048 */ sdc1 $f20, 0x0048($sp)
/* 000E8 80B961B8 3C0180B9 */ lui $at, %hi(D_80B96A94) ## $at = 80B90000
/* 000EC 80B961BC 3C1080B9 */ lui $s0, %hi(D_80B969D0) ## $s0 = 80B90000
/* 000F0 80B961C0 3C160600 */ lui $s6, %hi(D_06000140) ## $s6 = 06000000
/* 000F0 80B961C0 3C160600 */ lui $s6, %hi(gCollapsingPlatformDL) ## $s6 = 06000000
/* 000F4 80B961C4 3C1780B9 */ lui $s7, %hi(D_80B969F4) ## $s7 = 80B90000
/* 000F8 80B961C8 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000
/* 000FC 80B961CC 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000
/* 00100 80B961D0 AFBF0094 */ sw $ra, 0x0094($sp)
/* 00104 80B961D4 AFB10074 */ sw $s1, 0x0074($sp)
/* 00108 80B961D8 26F769F4 */ addiu $s7, $s7, %lo(D_80B969F4) ## $s7 = 80B969F4
/* 0010C 80B961DC 26D60140 */ addiu $s6, $s6, %lo(D_06000140) ## $s6 = 06000140
/* 0010C 80B961DC 26D60140 */ addiu $s6, $s6, %lo(gCollapsingPlatformDL) ## $s6 = 06000140
/* 00110 80B961E0 261069D0 */ addiu $s0, $s0, %lo(D_80B969D0) ## $s0 = 80B969D0
/* 00114 80B961E4 C4346A94 */ lwc1 $f20, %lo(D_80B96A94)($at)
/* 00118 80B961E8 24930024 */ addiu $s3, $a0, 0x0024 ## $s3 = 00000024