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

Merge remote-tracking branch 'origin/master' into GirlA

Browse source
This commit is contained in:
Kelebek1 2020-07-17 07:51:45 +01:00
commit 3be2c03098
555 changed files with 9698 additions and 20837 deletions
Download patch file Download diff file Expand all files Collapse all files

8
data/code_801014C0.bss.s → data/__libm_qnan_f.rodata.s
View file

@ -5,9 +5,7 @@
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .bss
.section .rodata
.balign 16
glabel D_80175860
.space 0x100
glabel __libm_qnan_f
.word 0x7F810000

16
data/code_80102420.data.s
View file

@ -1,16 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .data
.balign 16
glabel D_80134CF0
.incbin "baserom.z64", 0xBABE90, 0x4
glabel __osPfsInodeCacheBank
.incbin "baserom.z64", 0xBABE94, 0xC

13
data/code_80105CF0.data.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .data
.balign 16
glabel __osPfsLastChannel
.incbin "baserom.z64", 0xBABEC0, 0x10

9
data/db_camera.data.s
View file

@ -9,15 +9,6 @@
.balign 16
glabel D_8012CED0
.incbin "baserom.z64", 0xBA4070, 0x4
glabel D_8012CED4
.incbin "baserom.z64", 0xBA4074, 0x4
glabel D_8012CED8
.incbin "baserom.z64", 0xBA4078, 0x8
glabel D_8012CEE0
.word D_80143170

16
data/db_camera.rodata.s
View file

@ -9,22 +9,6 @@
.balign 16
glabel D_80143100
.asciz "shrink_window_setval(%d)\n"
.balign 4
glabel D_8014311C
.asciz "shrink_window_setnowval(%d)\n"
.balign 4
glabel D_8014313C
.asciz "shrink_window_init()\n"
.balign 4
glabel D_80143154
.asciz "shrink_window_cleanup()\n"
.balign 4
glabel D_80143170
.asciz "\x8Cｷ-ﾌﾚ-ﾑ\x8Dｶﾞ"
.balign 4

53
data/overlays/actors/z_demo_sa.data.s
View file

File diff suppressed because one or more lines are too long

13
data/overlays/actors/z_demo_sa.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_80990F40
.incbin "baserom/ovl_Demo_Sa", 0x2AE0, 0x000002F0

24
data/overlays/actors/z_en_blkobj.data.s
View file

@ -1,24 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .data
.balign 16
glabel En_Blkobj_InitVars
.word 0x01360600, 0x00000030, 0x01250000, 0x0000016C
.word EnBlkobj_Init
.word EnBlkobj_Destroy
.word EnBlkobj_Update
.word EnBlkobj_Draw
glabel D_809C2580
.word 0xC0500001, 0xB0F40320, 0xB0F800C8, 0x30FC012C
glabel D_809C2590
.word 0xE200001C, 0xC8112078, 0xDF000000, 0x00000000
glabel D_809C25A0
.word 0xE200001C, 0xC81049D8, 0xDF000000, 0x00000000

13
data/overlays/actors/z_en_blkobj.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_809C2620
.incbin "baserom/ovl_En_Blkobj", 0x5C0, 0x000000B0

6
data/overlays/actors/z_en_fhg_fire.data.s
View file

@ -9,12 +9,6 @@
.balign 16
glabel En_Fhg_Fire_InitVars
.word 0x00000900, 0x00000030, 0x005A0000, 0x00000204
.word EnFhgFire_Init
.word EnFhgFire_Destroy
.word EnFhgFire_Update
.word EnFhgFire_Draw
glabel D_80A11790
.word 0x0A110939, 0x10010000, 0x06000000, 0x00100700, 0x03200000, 0x0D900700, 0x00000000, 0x01010100, 0x0014001E, 0x000A0000, 0x00000000
glabel D_80A117BC

36
data/overlays/actors/z_en_heishi1.data.s
View file

@ -1,36 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .data
.balign 16
glabel D_80A527A0
.word 0x00000000
glabel En_Heishi1_InitVars
.word 0x00000400, 0x00000010, 0x00970000, 0x000002AC
.word EnHeishi1_Init
.word EnHeishi1_Destroy
.word EnHeishi1_Update
.word EnHeishi1_Draw
glabel D_80A527C4
.word 0x3F800000, 0xC1200000, 0x40400000, 0x3F000000, 0x447A0000, 0x43480000, 0x3E99999A, 0x447A0000, 0x40400000, 0xC0400000, 0x40C00000, 0x3F4CCCCD, 0x44FA0000, 0x43C80000, 0x3F000000, 0x44FA0000, 0x3F800000, 0xC1200000, 0x40400000, 0x3F000000, 0x447A0000, 0x43480000, 0x3E99999A, 0x447A0000, 0x40400000, 0xC0400000, 0x40C00000, 0x3F4CCCCD, 0x44FA0000, 0x43C80000, 0x3F000000, 0x44FA0000
glabel D_80A52844
.word 0x0014000A, 0x0014000A, 0x000D0000
glabel D_80A52850
.word 0x00000000, 0x00000000, 0x42B40000, 0xC25C0000, 0x00000000, 0x42B40000, 0xC25C0000, 0x00000000, 0x41F00000, 0xC25C0000, 0x00000000, 0xC1F00000, 0x00000000, 0x00000000, 0xC1F00000, 0x425C0000, 0x00000000, 0xC1F00000, 0x425C0000, 0x00000000, 0x41F00000, 0x425C0000, 0x00000000, 0x42B40000
glabel D_80A528B0
.word 0x00000007, 0x00000007, 0x00000002, 0x00000002, 0x00000002, 0x00000002, 0x00000003, 0x00000003, 0x00000004, 0x00000004, 0x00000005, 0x00000006, 0x00000004, 0x00000004, 0x00000005, 0x00000006
glabel D_80A528F0
.word 0x00000004, 0x00010005, 0x00020006, 0x00030007
glabel D_80A52900
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A5290C
.word 0x00000000, 0x00000000, 0x41A00000
glabel D_80A52918
.word 0x3E99999A, 0x3E99999A, 0x3E99999A, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_heishi1.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_80A52C50
.incbin "baserom/ovl_En_Heishi1", 0x1980, 0x00000250

13
data/overlays/actors/z_en_heishi2.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_80A55310
.incbin "baserom/ovl_En_Heishi2", 0x2470, 0x00000330

28
data/overlays/actors/z_en_md.data.s
View file

@ -1,28 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .data
.balign 16
glabel En_Md_InitVars
.word 0x016D0400, 0x02000019, 0x00FB0000, 0x00000324
.word EnMd_Init
.word EnMd_Destroy
.word EnMd_Update
.word EnMd_Draw
glabel D_80AAC310
.word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0024002E, 0x00000000, 0x00000000
glabel D_80AAC33C
.word 0x00000000, 0x00000000, 0xFF000000
glabel D_80AAC348
.word 0x060002C8, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x060002C8, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0xC1200000, 0x0600917C, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x06009E68, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x06009B1C, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x06008E84, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x060097F0, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x060092B0, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x0600A138, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x06008FC0, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x060002C8, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0xC1000000, 0x06008510, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000, 0x060095BC, 0x3F800000, 0x00000000, 0xBF800000, 0x02000000, 0xBF800000, 0x06008738, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xBF800000
glabel D_80AAC498
.word 0x43C80000, 0x00000000, 0x00000000
glabel D_80AAC4A4
.word 0x06004FF0, 0x06005930, 0x06005D30

13
data/overlays/actors/z_en_md.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_80AAC5A0
.incbin "baserom/ovl_En_Md", 0x2350, 0x00000360

23
data/overlays/actors/z_en_si.data.s
View file

@ -1,23 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .data
.balign 16
glabel D_80AFBAB0
.word 0x0A00093D, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000090, 0x00000000, 0x00050100, 0x00140012, 0x00020000, 0x00000000
glabel D_80AFBADC
.word 0x00000000, 0x00000000, 0xFF000000
glabel En_Si_InitVars
.word 0x019C0700, 0x00000201, 0x00240000, 0x000001A0
.word EnSi_Init
.word EnSi_Destroy
.word EnSi_Update
.word EnSi_Draw
.word 0x00000000, 0x00000000

13
data/overlays/actors/z_en_si.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_80AFBB10
.incbin "baserom/ovl_En_Si", 0x480, 0x00000070

65
data/overlays/actors/z_en_zl2.data.s
View file

@ -1,65 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .data
.balign 16
glabel D_80B52810
.word 0x060030C8, 0x06003C48, 0x06004048, 0x06004548, 0x06004948, 0x06004D48, 0x06005148, 0x06005D48, 0x06006148
glabel D_80B52834
.word 0x06003508, 0x06005548, 0x06005948
glabel D_80B52840
.word func_80B521A0
.word func_80B50BBC
.word func_80B50BEC
.word func_80B50C40
.word func_80B50CA8
.word func_80B50CFC
.word func_80B50D50
.word func_80B50D94
.word func_80B50DE8
.word func_80B50E3C
.word func_80B50E90
.word func_80B50EE4
.word func_80B50F38
.word func_80B50F8C
.word func_80B50FE8
.word func_80B51034
.word func_80B51080
.word func_80B510CC
.word func_80B51118
.word func_80B51164
.word func_80B511B0
.word func_80B511FC
.word func_80B51250
.word func_80B512B8
.word func_80B51310
.word func_80B51A5C
.word func_80B51A8C
.word func_80B51AE4
.word func_80B51B44
.word func_80B51BA8
.word func_80B51C0C
.word func_80B51C64
.word func_80B51CA8
.word func_80B52068
.word func_80B52098
.word func_80B52108
glabel D_80B528D0
.word func_80B4F45C
glabel D_80B528D4
.word func_80B523BC
.word func_80B523C8
.word func_80B525D4
glabel En_Zl2_InitVars
.word 0x004D0400, 0x00000010, 0x00600000, 0x00000280
.word EnZl2_Init
.word EnZl2_Destroy
.word EnZl2_Update
.word EnZl2_Draw

20
data/overlays/actors/z_shot_sun.data.s
View file

@ -1,20 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .data
.balign 16
glabel Shot_Sun_InitVars
.word 0x01830600, 0x00000009, 0x00010000, 0x000001A8
.word ShotSun_Init
.word ShotSun_Destroy
.word ShotSun_Update
.word 0x00000000
glabel D_80BAE2F0
.word 0x0A000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x00010100, 0x001E003C, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_shot_sun.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_80BAE380
.incbin "baserom/ovl_Shot_Sun", 0x6C0, 0x00000080

16
data/overlays/effects/z_eff_ss_solder_srch_ball.data.s
View file

@ -1,16 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .data
.balign 16
glabel Effect_Ss_Solder_Srch_Ball_InitVars
.word 0x00000018
.word func_809AC130
.word 0x00000000, 0x00000000

13
data/overlays/effects/z_eff_ss_solder_srch_ball.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_809AC2A0
.incbin "baserom/ovl_Effect_Ss_Solder_Srch_Ball", 0x170, 0x00000030

13
data/overlays/gamestates/z_select.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_80803620
.incbin "baserom/ovl_select", 0x2A90, 0x000005D0

16
data/sins.data.s
View file

@ -1,16 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .data
.balign 16
glabel D_801344D0
.incbin "baserom.z64", 0xBAB670, 0x7FE
glabel D_80134CCE
.incbin "baserom.z64", 0xBABE6E, 0x2

48
data/z_lifemeter.data.s
View file

@ -10,22 +10,10 @@
.balign 16
glabel D_8011FF10
.incbin "baserom.z64", 0xB970B0, 0x2
glabel D_8011FF12
.incbin "baserom.z64", 0xB970B2, 0x2
glabel D_8011FF14
.incbin "baserom.z64", 0xB970B4, 0x10
.incbin "baserom.z64", 0xB970B0, 0x14
glabel D_8011FF24
.incbin "baserom.z64", 0xB970C4, 0x2
glabel D_8011FF26
.incbin "baserom.z64", 0xB970C6, 0x2
glabel D_8011FF28
.incbin "baserom.z64", 0xB970C8, 0x10
.incbin "baserom.z64", 0xB970C4, 0x14
glabel D_8011FF38
.incbin "baserom.z64", 0xB970D8, 0x14
@ -34,40 +22,16 @@ glabel D_8011FF4C
.incbin "baserom.z64", 0xB970EC, 0x14
glabel D_8011FF60
.incbin "baserom.z64", 0xB97100, 0x2
glabel D_8011FF62
.incbin "baserom.z64", 0xB97102, 0x2
glabel D_8011FF64
.incbin "baserom.z64", 0xB97104, 0x10
.incbin "baserom.z64", 0xB97100, 0x14
glabel D_8011FF74
.incbin "baserom.z64", 0xB97114, 0x2
glabel D_8011FF76
.incbin "baserom.z64", 0xB97116, 0x2
glabel D_8011FF78
.incbin "baserom.z64", 0xB97118, 0x10
.incbin "baserom.z64", 0xB97114, 0x14
glabel D_8011FF88
.incbin "baserom.z64", 0xB97128, 0x2
glabel D_8011FF8A
.incbin "baserom.z64", 0xB9712A, 0x2
glabel D_8011FF8C
.incbin "baserom.z64", 0xB9712C, 0x10
.incbin "baserom.z64", 0xB97128, 0x14
glabel D_8011FF9C
.incbin "baserom.z64", 0xB9713C, 0x2
glabel D_8011FF9E
.incbin "baserom.z64", 0xB9713E, 0x2
glabel D_8011FFA0
.incbin "baserom.z64", 0xB97140, 0x10
.incbin "baserom.z64", 0xB9713C, 0x14
glabel D_8011FFB0
.incbin "baserom.z64", 0xB97150, 0x40