1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 22:44:30 +00:00

object_hidan_objects OK (#695)

* xml

Signed-off-by: angie <angheloalf95@gmail.com>

* add to spec and remove repetaed entries

Signed-off-by: Angie <angheloalf95@gmail.com>

* add some dlists

Signed-off-by: Angie <angheloalf95@gmail.com>

* add a few offsets

Signed-off-by: Angie <angheloalf95@gmail.com>

* fireballs textures

Signed-off-by: Angie <angheloalf95@gmail.com>

* add some unused dlists

Signed-off-by: Angie <angheloalf95@gmail.com>

* change the references in decompiled objects

Signed-off-by: angie <angheloalf95@gmail.com>

* change the references from non matching actors

Signed-off-by: angie <angheloalf95@gmail.com>

* add blob

Signed-off-by: angie <angheloalf95@gmail.com>

* changes requested by @Zelllll

Signed-off-by: angie <angheloalf95@gmail.com>

* why is this object so big?

Signed-off-by: angie <angheloalf95@gmail.com>

* rename a lot of stuff

Signed-off-by: Angie <angheloalf95@gmail.com>

* this object never ends

Signed-off-by: angie <angheloalf95@gmail.com>

* Some floats

Signed-off-by: angie <angheloalf95@gmail.com>

* stones blocks

Signed-off-by: angie <angheloalf95@gmail.com>

* rename fireball and stuff

Signed-off-by: Angie <angheloalf95@gmail.com>

* Stationary flame thrower

Signed-off-by: Angie <angheloalf95@gmail.com>

* SpinningFlamethrower

Signed-off-by: Angie <angheloalf95@gmail.com>

* Rename the lasts textures

Signed-off-by: Angie <angheloalf95@gmail.com>

* some random renamings

Signed-off-by: Angie <angheloalf95@gmail.com>

* run format

Signed-off-by: Angie <angheloalf95@gmail.com>

* Remove .gitkeep

Signed-off-by: angie <angheloalf95@gmail.com>
This commit is contained in:
Anghelo Carvajal 2021-03-18 04:23:59 -03:00 committed by GitHub
parent 6b9a44e5a0
commit e48e565ffe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 239 additions and 188 deletions

View file

@ -50,8 +50,8 @@ glabel BgHidanSekizou_Draw
/* 010B0 8088DF70 17000009 */ bne $t8, $zero, .L8088DF98
/* 010B4 8088DF74 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014
/* 010B8 8088DF78 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0
/* 010BC 8088DF7C 3C090601 */ lui $t1, %hi(D_0600B0F8) ## $t1 = 06010000
/* 010C0 8088DF80 2529B0F8 */ addiu $t1, $t1, %lo(D_0600B0F8) ## $t1 = 0600B0F8
/* 010BC 8088DF7C 3C090601 */ lui $t1, %hi(gFireTempleStationaryFlamethrowerShortDL) ## $t1 = 06010000
/* 010C0 8088DF80 2529B0F8 */ addiu $t1, $t1, %lo(gFireTempleStationaryFlamethrowerShortDL) ## $t1 = 0600B0F8
/* 010C4 8088DF84 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008
/* 010C8 8088DF88 AE7902C0 */ sw $t9, 0x02C0($s3) ## 000002C0
/* 010CC 8088DF8C AC490004 */ sw $t1, 0x0004($v0) ## 00000004
@ -59,8 +59,8 @@ glabel BgHidanSekizou_Draw
/* 010D4 8088DF94 AC480000 */ sw $t0, 0x0000($v0) ## 00000000
.L8088DF98:
/* 010D8 8088DF98 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0
/* 010DC 8088DF9C 3C0C0601 */ lui $t4, %hi(D_0600ABC8) ## $t4 = 06010000
/* 010E0 8088DFA0 258CABC8 */ addiu $t4, $t4, %lo(D_0600ABC8) ## $t4 = 0600ABC8
/* 010DC 8088DF9C 3C0C0601 */ lui $t4, %hi(gFireTempleStationaryFlamethrowerTallDL) ## $t4 = 06010000
/* 010E0 8088DFA0 258CABC8 */ addiu $t4, $t4, %lo(gFireTempleStationaryFlamethrowerTallDL) ## $t4 = 0600ABC8
/* 010E4 8088DFA4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008
/* 010E8 8088DFA8 AE6A02C0 */ sw $t2, 0x02C0($s3) ## 000002C0
/* 010EC 8088DFAC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004

View file

@ -59,8 +59,8 @@ glabel BgHidanSekizou_Init
/* 0048C 8088D34C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001
/* 00490 8088D350 1612FFF3 */ bne $s0, $s2, .L8088D320
/* 00494 8088D354 00000000 */ nop
/* 00498 8088D358 3C040601 */ lui $a0, %hi(D_0600CC90) ## $a0 = 06010000
/* 0049C 8088D35C 2484CC90 */ addiu $a0, $a0, %lo(D_0600CC90) ## $a0 = 0600CC90
/* 00498 8088D358 3C040601 */ lui $a0, %hi(gFireTempleStationaryFlamethrowerCol) ## $a0 = 06010000
/* 0049C 8088D35C 2484CC90 */ addiu $a0, $a0, %lo(gFireTempleStationaryFlamethrowerCol) ## $a0 = 0600CC90
/* 004A0 8088D360 0C010620 */ jal CollisionHeader_GetVirtual
/* 004A4 8088D364 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFF0

View file

@ -38,7 +38,7 @@ glabel func_8088D9F4
/* 00B84 8088DA44 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024
/* 00B88 8088DA48 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000
/* 00B8C 8088DA4C 468021A0 */ cvt.s.w $f6, $f4
/* 00B90 8088DA50 3C048089 */ lui $a0, %hi(D_8088E27C) ## $a0 = 80890000
/* 00B90 8088DA50 3C048089 */ lui $a0, %hi(sFireballsTexs) ## $a0 = 80890000
/* 00B94 8088DA54 3C198016 */ lui $t9, %hi(gSegments)
/* 00B98 8088DA58 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000
/* 00B9C 8088DA5C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF
@ -55,7 +55,7 @@ glabel func_8088D9F4
/* 00BC8 8088DA88 87AB0062 */ lh $t3, 0x0062($sp)
/* 00BCC 8088DA8C 000B6080 */ sll $t4, $t3, 2
/* 00BD0 8088DA90 008C2021 */ addu $a0, $a0, $t4
/* 00BD4 8088DA94 8C84E27C */ lw $a0, %lo(D_8088E27C)($a0)
/* 00BD4 8088DA94 8C84E27C */ lw $a0, %lo(sFireballsTexs)($a0)
/* 00BD8 8088DA98 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000
/* 00BDC 8088DA9C 358C0001 */ ori $t4, $t4, 0x0001 ## $t4 = FA000001
/* 00BE0 8088DAA0 00047100 */ sll $t6, $a0, 4
@ -157,10 +157,10 @@ glabel func_8088D9F4
/* 00D54 8088DC14 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000
/* 00D58 8088DC18 8FA8002C */ lw $t0, 0x002C($sp)
/* 00D5C 8088DC1C 8FA30064 */ lw $v1, 0x0064($sp)
/* 00D60 8088DC20 3C0A0601 */ lui $t2, %hi(D_0600DC30) ## $t2 = 06010000
/* 00D60 8088DC20 3C0A0601 */ lui $t2, %hi(gFireTempleFireballDL) ## $t2 = 06010000
/* 00D64 8088DC24 AD020004 */ sw $v0, 0x0004($t0) ## 00000004
/* 00D68 8088DC28 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000
/* 00D6C 8088DC2C 254ADC30 */ addiu $t2, $t2, %lo(D_0600DC30) ## $t2 = 0600DC30
/* 00D6C 8088DC2C 254ADC30 */ addiu $t2, $t2, %lo(gFireTempleFireballDL) ## $t2 = 0600DC30
/* 00D70 8088DC30 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000
/* 00D74 8088DC34 AC490000 */ sw $t1, 0x0000($v0) ## 00000000
/* 00D78 8088DC38 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004