mirror of https://github.com/zeldaret/oot.git
Initial progress on Door_Warp1
This commit is contained in:
parent
2f3f556bfb
commit
e96fbe4d20
|
@ -1,3 +1,22 @@
|
|||
.late_rodata
|
||||
.late_rodata_alignment 8
|
||||
glabel jtbl_8099C7F0
|
||||
.word L8099C550
|
||||
.word L8099C520
|
||||
.word L8099C540
|
||||
.word L8099C540
|
||||
.word L8099C540
|
||||
.word L8099C560
|
||||
.word L8099C540
|
||||
.word L8099C540
|
||||
.word L8099C540
|
||||
.word L8099C540
|
||||
.word L8099C540
|
||||
.word L8099C540
|
||||
.word L8099C540
|
||||
.word 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
.text
|
||||
glabel DoorWarp1_Draw
|
||||
/* 03D70 8099C4F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
|
||||
/* 03D74 8099C4F4 AFBF0014 */ sw $ra, 0x0014($sp)
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
.rdata
|
||||
glabel D_8099C5B0
|
||||
.asciz "\nBOSSWARP arg_data=[%d]"
|
||||
.balign 4
|
||||
|
||||
.text
|
||||
glabel DoorWarp1_Init
|
||||
/* 00008 80998788 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0
|
||||
/* 0000C 8099878C AFB10028 */ sw $s1, 0x0028($sp)
|
||||
|
|
|
@ -1,3 +1,38 @@
|
|||
.late_rodata
|
||||
glabel jtbl_8099C6D0
|
||||
.word L80998A0C
|
||||
.word L80998A5C
|
||||
.word L80998A28
|
||||
.word L80998A34
|
||||
.word L80998A0C
|
||||
.word L80998A0C
|
||||
.word L80998A0C
|
||||
|
||||
glabel D_8099C6EC
|
||||
.word 0x3E6B851F
|
||||
|
||||
glabel D_8099C6F0
|
||||
.word 0x3F19999A
|
||||
|
||||
glabel D_8099C6F4
|
||||
.word 0x3E99999A
|
||||
|
||||
glabel D_8099C6F8
|
||||
.word 0x3E99999A
|
||||
|
||||
glabel jtbl_8099C6FC
|
||||
.word L80998B6C
|
||||
.word L80998B6C
|
||||
.word L80998AA0
|
||||
.word L80998B6C
|
||||
.word L80998AA0
|
||||
.word L80998B6C
|
||||
.word L80998AA0
|
||||
.word L80998B6C
|
||||
.word L80998B6C
|
||||
.word L80998B6C
|
||||
|
||||
.text
|
||||
glabel func_8099898C
|
||||
/* 0020C 8099898C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8
|
||||
/* 00210 80998990 AFBF002C */ sw $ra, 0x002C($sp)
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
.late_rodata
|
||||
glabel D_8099C724
|
||||
.word 0x3E99999A
|
||||
|
||||
.text
|
||||
glabel func_80998C90
|
||||
/* 00510 80998C90 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8
|
||||
/* 00514 80998C94 AFB00028 */ sw $s0, 0x0028($sp)
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
.late_rodata
|
||||
glabel D_8099C728
|
||||
.word 0x3E99999A
|
||||
|
||||
.text
|
||||
glabel func_80998E5C
|
||||
/* 006DC 80998E5C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0
|
||||
/* 006E0 80998E60 AFB00024 */ sw $s0, 0x0024($sp)
|
||||
|
|
|
@ -1,3 +1,17 @@
|
|||
.late_rodata
|
||||
glabel D_8099C72C
|
||||
.word 0x3E99999A
|
||||
|
||||
glabel D_8099C730
|
||||
.word 0x3D4C63F1
|
||||
|
||||
glabel D_8099C734
|
||||
.word 0x3D9DB22D
|
||||
|
||||
glabel D_8099C738
|
||||
.word 0x3DB851EC
|
||||
|
||||
.text
|
||||
glabel func_80998FF4
|
||||
/* 00874 80998FF4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0
|
||||
/* 00878 80998FF8 AFB00028 */ sw $s0, 0x0028($sp)
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
.late_rodata
|
||||
glabel D_8099C73C
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
.text
|
||||
glabel func_80999214
|
||||
/* 00A94 80999214 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8
|
||||
/* 00A98 80999218 3C01809A */ lui $at, %hi(D_8099C73C) ## $at = 809A0000
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
.late_rodata
|
||||
glabel D_8099C740
|
||||
.word 0xBDCCCCCD
|
||||
|
||||
.text
|
||||
glabel func_80999348
|
||||
/* 00BC8 80999348 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0
|
||||
/* 00BCC 8099934C AFBF0024 */ sw $ra, 0x0024($sp)
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
.late_rodata
|
||||
glabel D_8099C744
|
||||
.word 0xBDCCCCCD
|
||||
|
||||
.text
|
||||
glabel func_80999410
|
||||
/* 00C90 80999410 AFA40000 */ sw $a0, 0x0000($sp)
|
||||
/* 00C94 80999414 3C01809A */ lui $at, %hi(D_8099C744) ## $at = 809A0000
|
||||
|
|
|
@ -1,3 +1,17 @@
|
|||
.late_rodata
|
||||
glabel D_8099C748
|
||||
.word 0x3A83126F
|
||||
|
||||
glabel D_8099C74C
|
||||
.word 0x3A83126F
|
||||
|
||||
glabel D_8099C750
|
||||
.word 0x3A83126F
|
||||
|
||||
glabel D_8099C754
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
.text
|
||||
glabel func_80999428
|
||||
/* 00CA8 80999428 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8
|
||||
/* 00CAC 8099942C AFBF0024 */ sw $ra, 0x0024($sp)
|
||||
|
|
|
@ -1,3 +1,21 @@
|
|||
.late_rodata
|
||||
.late_rodata_alignment 8
|
||||
glabel jtbl_8099C758
|
||||
.word L80999558
|
||||
.word L80999548
|
||||
.word L80999538
|
||||
.word L80999538
|
||||
.word L80999538
|
||||
.word L80999568
|
||||
.word L80999538
|
||||
.word L80999538
|
||||
.word L80999538
|
||||
.word L80999538
|
||||
.word L80999538
|
||||
.word L80999538
|
||||
.word L80999538
|
||||
|
||||
.text
|
||||
glabel func_80999508
|
||||
/* 00D88 80999508 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
|
||||
/* 00D8C 8099950C AFBF0014 */ sw $ra, 0x0014($sp)
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
.late_rodata
|
||||
glabel D_8099C78C
|
||||
.word 0x444EC000
|
||||
|
||||
glabel D_8099C790
|
||||
.word 0xC549C000
|
||||
|
||||
.text
|
||||
glabel func_809995D4
|
||||
/* 00E54 809995D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0
|
||||
/* 00E58 809995D8 AFBF002C */ sw $ra, 0x002C($sp)
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
.late_rodata
|
||||
glabel D_8099C794
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C798
|
||||
.word 0x3C23D70A
|
||||
|
||||
.text
|
||||
glabel func_80999724
|
||||
/* 00FA4 80999724 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8
|
||||
/* 00FA8 80999728 AFBF0024 */ sw $ra, 0x0024($sp)
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
.late_rodata
|
||||
glabel D_8099C79C
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7A0
|
||||
.word 0x3C23D70A
|
||||
|
||||
.text
|
||||
glabel func_809998A4
|
||||
/* 01124 809998A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0
|
||||
/* 01128 809998A8 AFBF001C */ sw $ra, 0x001C($sp)
|
||||
|
|
|
@ -1,3 +1,25 @@
|
|||
.rdata
|
||||
glabel D_8099C5C8
|
||||
# EUC-JP: じかんがきたからおーしまい | It’s time for me
|
||||
.asciz "\n\n\nじかんがきたからおーしまい fade_direction=[%d]"
|
||||
.balign 4
|
||||
|
||||
glabel D_8099C5FC
|
||||
# EUC-JP: おわりおわり | End 0A0A0AA4 AAA4EFA4 EAA4AAA4 EFA4EA00
|
||||
.asciz "\n\n\nおわりおわり"
|
||||
.balign 4
|
||||
|
||||
.late_rodata
|
||||
glabel D_8099C7A4
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C7A8
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7AC
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
.text
|
||||
glabel func_80999A68
|
||||
/* 012E8 80999A68 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8
|
||||
/* 012EC 80999A6C AFBF0034 */ sw $ra, 0x0034($sp)
|
||||
|
|
|
@ -1,3 +1,14 @@
|
|||
.late_rodata
|
||||
glabel D_8099C7B0
|
||||
.word 0x3CA3D70A
|
||||
|
||||
glabel D_8099C7B4
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7B8
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
.text
|
||||
glabel func_8099A098
|
||||
/* 01918 8099A098 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8
|
||||
/* 0191C 8099A09C AFBF0034 */ sw $ra, 0x0034($sp)
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
.late_rodata
|
||||
glabel D_8099C7BC
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C7C0
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
.text
|
||||
glabel func_8099A3A4
|
||||
/* 01C24 8099A3A4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8
|
||||
/* 01C28 8099A3A8 AFBF0024 */ sw $ra, 0x0024($sp)
|
||||
|
|
|
@ -1,3 +1,34 @@
|
|||
.rdata
|
||||
glabel D_8099C60C
|
||||
.asciz "\nparcent=[%f]"
|
||||
.balign 4
|
||||
|
||||
.late_rodata
|
||||
glabel D_8099C7C4
|
||||
.word 0x3C656041
|
||||
|
||||
glabel D_8099C7C8
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7CC
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7D0
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C7D4
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7D8
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7DC
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7E0
|
||||
.word 0x3C23D70A
|
||||
|
||||
.text
|
||||
glabel func_8099A5EC
|
||||
/* 01E6C 8099A5EC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8
|
||||
/* 01E70 8099A5F0 AFBF002C */ sw $ra, 0x002C($sp)
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
.late_rodata
|
||||
glabel D_8099C7E4
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C7E8
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
.text
|
||||
glabel func_8099B020
|
||||
/* 028A0 8099B020 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8
|
||||
/* 028A4 8099B024 3C01809A */ lui $at, %hi(D_8099C7E4) ## $at = 809A0000
|
||||
|
|
|
@ -1,3 +1,13 @@
|
|||
.rdata
|
||||
glabel D_8099C61C
|
||||
.asciz "../z_door_warp1.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_8099C630
|
||||
.asciz "../z_door_warp1.c"
|
||||
.balign 4
|
||||
|
||||
.text
|
||||
glabel func_8099B140
|
||||
/* 029C0 8099B140 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8
|
||||
/* 029C4 8099B144 AFBF002C */ sw $ra, 0x002C($sp)
|
||||
|
|
|
@ -1,3 +1,13 @@
|
|||
.rdata
|
||||
glabel D_8099C644
|
||||
.asciz "../z_door_warp1.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_8099C658
|
||||
.asciz "../z_door_warp1.c"
|
||||
.balign 4
|
||||
|
||||
.text
|
||||
glabel func_8099B33C
|
||||
/* 02BBC 8099B33C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90
|
||||
/* 02BC0 8099B340 AFBF0034 */ sw $ra, 0x0034($sp)
|
||||
|
|
|
@ -1,3 +1,29 @@
|
|||
.rdata
|
||||
glabel D_8099C66C
|
||||
.asciz "../z_door_warp1.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_8099C680
|
||||
.asciz "../z_door_warp1.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_8099C694
|
||||
.asciz "../z_door_warp1.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_8099C6A8
|
||||
.asciz "../z_door_warp1.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_8099C6BC
|
||||
.asciz "../z_door_warp1.c"
|
||||
.balign 4
|
||||
|
||||
.late_rodata
|
||||
glabel D_8099C7EC
|
||||
.word 0x3FD9999A
|
||||
|
||||
.text
|
||||
glabel func_8099B5EC
|
||||
/* 02E6C 8099B5EC 27BDFF08 */ addiu $sp, $sp, 0xFF08 ## $sp = FFFFFF08
|
||||
/* 02E70 8099B5F0 AFBF003C */ sw $ra, 0x003C($sp)
|
||||
|
|
|
@ -12,11 +12,15 @@ glabel D_8099C5B0
|
|||
.balign 4
|
||||
|
||||
glabel D_8099C5C8
|
||||
# EUC-JP: じかんがきたからおーしまい | It’s time for me
|
||||
.asciz "\n\n\nじかんがきたからおーしまい fade_direction=[%d]"
|
||||
.balign 4
|
||||
|
||||
glabel D_8099C5FC
|
||||
.word 0x0A0A0AA4, 0xAAA4EFA4, 0xEAA4AAA4, 0xEFA4EA00
|
||||
# EUC-JP: おわりおわり | End 0A0A0AA4 AAA4EFA4 EAA4AAA4 EFA4EA00
|
||||
.asciz "\n\n\nおわりおわり"
|
||||
.balign 4
|
||||
|
||||
glabel D_8099C60C
|
||||
.asciz "\nparcent=[%f]"
|
||||
.balign 4
|
||||
|
@ -65,14 +69,19 @@ glabel jtbl_8099C6D0
|
|||
.word L80998A0C
|
||||
.word L80998A0C
|
||||
.word L80998A0C
|
||||
|
||||
glabel D_8099C6EC
|
||||
.word 0x3E6B851F
|
||||
|
||||
glabel D_8099C6F0
|
||||
.word 0x3F19999A
|
||||
|
||||
glabel D_8099C6F4
|
||||
.word 0x3E99999A
|
||||
|
||||
glabel D_8099C6F8
|
||||
.word 0x3E99999A
|
||||
|
||||
glabel jtbl_8099C6FC
|
||||
.word L80998B6C
|
||||
.word L80998B6C
|
||||
|
@ -84,32 +93,46 @@ glabel jtbl_8099C6FC
|
|||
.word L80998B6C
|
||||
.word L80998B6C
|
||||
.word L80998B6C
|
||||
|
||||
glabel D_8099C724
|
||||
.word 0x3E99999A
|
||||
|
||||
glabel D_8099C728
|
||||
.word 0x3E99999A
|
||||
|
||||
glabel D_8099C72C
|
||||
.word 0x3E99999A
|
||||
|
||||
glabel D_8099C730
|
||||
.word 0x3D4C63F1
|
||||
|
||||
glabel D_8099C734
|
||||
.word 0x3D9DB22D
|
||||
|
||||
glabel D_8099C738
|
||||
.word 0x3DB851EC
|
||||
|
||||
glabel D_8099C73C
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C740
|
||||
.word 0xBDCCCCCD
|
||||
|
||||
glabel D_8099C744
|
||||
.word 0xBDCCCCCD
|
||||
|
||||
glabel D_8099C748
|
||||
.word 0x3A83126F
|
||||
|
||||
glabel D_8099C74C
|
||||
.word 0x3A83126F
|
||||
|
||||
glabel D_8099C750
|
||||
.word 0x3A83126F
|
||||
|
||||
glabel D_8099C754
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel jtbl_8099C758
|
||||
.word L80999558
|
||||
.word L80999548
|
||||
|
@ -124,56 +147,82 @@ glabel jtbl_8099C758
|
|||
.word L80999538
|
||||
.word L80999538
|
||||
.word L80999538
|
||||
|
||||
glabel D_8099C78C
|
||||
.word 0x444EC000
|
||||
|
||||
glabel D_8099C790
|
||||
.word 0xC549C000
|
||||
|
||||
glabel D_8099C794
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C798
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C79C
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7A0
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7A4
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C7A8
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7AC
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C7B0
|
||||
.word 0x3CA3D70A
|
||||
|
||||
glabel D_8099C7B4
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7B8
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C7BC
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C7C0
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C7C4
|
||||
.word 0x3C656041
|
||||
|
||||
glabel D_8099C7C8
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7CC
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7D0
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C7D4
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7D8
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7DC
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7E0
|
||||
.word 0x3C23D70A
|
||||
|
||||
glabel D_8099C7E4
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C7E8
|
||||
.word 0x3DCCCCCD
|
||||
|
||||
glabel D_8099C7EC
|
||||
.word 0x3FD9999A
|
||||
|
||||
glabel jtbl_8099C7F0
|
||||
.word L8099C550
|
||||
.word L8099C520
|
||||
|
@ -189,4 +238,3 @@ glabel jtbl_8099C7F0
|
|||
.word L8099C540
|
||||
.word L8099C540
|
||||
.word 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
|
|
|
@ -1171,7 +1171,7 @@ void func_800A46F8(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 skeleton,
|
|||
// ? func_800A49B0(?);
|
||||
s32 SkelAnime_FrameUpdateMatrix(SkelAnime* skelAnime);
|
||||
// ? func_800A4C58(?);
|
||||
// ? func_800A4FE4(?);
|
||||
void func_800A4FE4(SkelAnime*, u32, f32, f32, f32, u8, f32, u8);
|
||||
void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 unk0, f32 frameCount,
|
||||
u8 unk1, f32 transitionRate);
|
||||
void func_800A51E8(SkelAnime* skelAnime, u32 animation);
|
||||
|
|
|
@ -331,7 +331,9 @@ typedef struct {
|
|||
/* 0x0444 */ u8 action;
|
||||
/* 0x0445 */ char unk_445[0x003];
|
||||
/* 0x0448 */ Actor* unk_448;
|
||||
/* 0x0445 */ char unk_44C[0x01E];
|
||||
/* 0x044C */ char unk_44C[0x004];
|
||||
/* 0x0450 */ Vec3f unk_450;
|
||||
/* 0x045C */ char unk_45C[0x00E];
|
||||
/* 0x046A */ u16 unk_46A;
|
||||
/* 0x046C */ char unk_46C[0x6E];
|
||||
/* 0x04DA */ s16 unk_4DA;
|
||||
|
|
6
spec
6
spec
|
@ -1903,9 +1903,9 @@ endseg
|
|||
beginseg
|
||||
name "ovl_Door_Warp1"
|
||||
include "build/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.o"
|
||||
include "build/data/overlays/actors/z_door_warp1.data.o"
|
||||
include "build/data/overlays/actors/z_door_warp1.rodata.o"
|
||||
include "build/data/overlays/actors/z_door_warp1.bss.o"
|
||||
//include "build/data/overlays/actors/z_door_warp1.data.o"
|
||||
//include "build/data/overlays/actors/z_door_warp1.rodata.o"
|
||||
//include "build/data/overlays/actors/z_door_warp1.bss.o"
|
||||
include "build/data/overlays/actors/z_door_warp1.reloc.o"
|
||||
endseg
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -6,7 +6,29 @@
|
|||
|
||||
typedef struct {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0xA4];
|
||||
/* 0x014C */ SkelAnime skelAnime;
|
||||
/* 0x0190 */ char unk_190[0x2];
|
||||
/* 0x0192 */ u16 unk_192;
|
||||
/* 0x0194 */ f32 unk_194;
|
||||
/* 0x0198 */ f32 unk_198;
|
||||
/* 0x019C */ f32 unk_19C;
|
||||
/* 0x01A0 */ f32 unk_1A0;
|
||||
/* 0x01A4 */ f32 unk_1A4;
|
||||
/* 0x01A8 */ f32 unk_1A8;
|
||||
/* 0x01AC */ s16 unk_1AC;
|
||||
/* 0x01AE */ s16 unk_1AE;
|
||||
/* 0x01B0 */ s16 unk_1B0;
|
||||
/* 0x01B2 */ s16 unk_1B2;
|
||||
/* 0x01B4 */ f32 unk_1B4;
|
||||
/* 0x01B8 */ u16 unk_1B8;
|
||||
/* 0x01BA */ u16 unk_1BA;
|
||||
/* 0x01BC */ f32 unk_1BC;
|
||||
/* 0x01C0 */ ActorFunc actionFunc;
|
||||
/* 0x01C4 */ z_Light* unk_1C4;
|
||||
/* 0x01C8 */ LightInfoPositional unk_1C8;
|
||||
/* 0x01D8 */ z_Light* unk_1D8;
|
||||
/* 0x01DC */ LightInfoPositional unk_1DC;
|
||||
/* 0x01EC */ s32 unk_1EC;
|
||||
} DoorWarp1; // size = 0x01F0
|
||||
|
||||
extern const ActorInit Door_Warp1_InitVars;
|
||||
|
|
|
@ -436,3 +436,7 @@ D_060009E0 = 0x060009E0;
|
|||
// z_bg_toki_swd
|
||||
D_06001BD0 = 0x06001BD0;
|
||||
|
||||
// z_door_warp1
|
||||
D_060001A0 = 0x060001A0;
|
||||
D_06001374 = 0x06001374;
|
||||
D_06002CA8 = 0x06002CA8;
|
Loading…
Reference in New Issue