mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-24 01:31:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into z_en_tk

Browse Source
This commit is contained in:
glank
2020-03-21 12:31:29 +01:00
parent 8e5c9e78e4 af62b0e7d7
commit fa4c848cad
72 changed files with 994 additions and 2402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/code_8006C360.data.s
-11
View File
@@ -1,11 +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 purposee registers
.section .data
glabel D_8011F3F0
.incbin "baserom.z64", 0xB96590, 0x440
data/overlays/actors/z_en_lightbox.data.s
-16
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 purposee registers
.section .data
glabel En_Lightbox_InitVars
.word 0x007C0600, 0x00000010, 0x00810000, 0x00000164
.word EnLightbox_Init
.word EnLightbox_Destroy
.word EnLightbox_Update
.word EnLightbox_Draw
data/overlays/actors/z_en_lightbox.reloc.s
-11
View File
@@ -1,11 +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 purposee registers
.section .rodata
glabel D_80A9EE10
.incbin "baserom/ovl_En_Lightbox", 0x440, 0x00000030
data/overlays/actors/z_en_lightbox.rodata.s
-13
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 purposee registers
.section .rodata
glabel D_80A9EE00
.word 0x3F333333, 0x00000000, 0x00000000, 0x00000000
data/overlays/actors/z_obj_bombiwa.data.s
-26
View File
@@ -1,26 +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 purposee registers
.section .data
glabel Obj_Bombiwa_InitVars
.word 0x01270600, 0x00000000, 0x01630000, 0x00000198
.word ObjBombiwa_Init
.word ObjBombiwa_Destroy
.word ObjBombiwa_Update
.word ObjBombiwa_Draw
glabel D_80B91AA0
.word 0x0C000D39, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x4FC1FFFE, 0x00000000, 0x00010100, 0x00370046, 0x00000000, 0x00000000
glabel D_80B91ACC
.word 0x0000000C, 0x003CFF00
glabel D_80B91AD4
.word 0xC8500064, 0xB0F407D0, 0xB0F8015E, 0x30FC03E8
glabel D_80B91AE4
.word 0x0011000E, 0x000A0008, 0x00070005, 0x00030002
glabel D_80B91AF4
.word 0x00000000, 0x00000000, 0x00000000
data/overlays/actors/z_obj_bombiwa.reloc.s
-11
View File
@@ -1,11 +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 purposee registers
.section .rodata
glabel D_80B91B00
.incbin "baserom/ovl_Obj_Bombiwa", 0x510, 0x00000060
data/overlays/gamestates/z_title.data.s
-15
View File
@@ -1,15 +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 purposee registers
.section .data
glabel D_808009A0
.word 0x00000000, 0x00000000
glabel D_808009A8
.word 0x64646400, 0x64646400
glabel D_808009B0
.word 0xFFFFFF00, 0xFFFFFF00, 0x45454500, 0x00000000
data/overlays/gamestates/z_title.reloc.s
-11
View File
@@ -1,11 +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 purposee registers
.section .rodata
glabel D_80800AB0
.incbin "baserom/ovl_title", 0xAB0, 0x000000E0
data/z_debug.bss.s
-20
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 purposee registers
.section .bss
glabel gGameInfo
.space 0x8
glabel D_8015FA98
.space 0x3
glabel D_8015FA9B
.space 0x17D
glabel D_8015FC18
.space 0x98
data/z_debug.data.s
-20
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 purposee registers
.section .data
glabel D_8011E0B0
.incbin "baserom.z64", 0xB95250, 0x4
glabel D_8011E0B4
.incbin "baserom.z64", 0xB95254, 0x20
glabel D_8011E0D4
.incbin "baserom.z64", 0xB95274, 0x74
glabel D_8011E148
.incbin "baserom.z64", 0xB952E8, 0x28