mirror of
https://github.com/zeldaret/oot
synced 2026-09-01 01:41:47 -04:00
Fixed merge conflict
This commit is contained in:
Lucas Shaw
@@ -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 Bg_Gate_Shutter_InitVars
|
||||
.word 0x01000700, 0x00000000, 0x01810000, 0x0000017C
|
||||
.word BgGateShutter_Init
|
||||
.word BgGateShutter_Destroy
|
||||
.word BgGateShutter_Update
|
||||
.word BgGateShutter_Draw
|
||||
|
||||
@@ -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_80878630
|
||||
|
||||
.incbin "baserom/ovl_Bg_Gate_Shutter", 0x4D0, 0x00000090
|
||||
@@ -1,35 +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_808785B0
|
||||
.word 0x0A0A0000
|
||||
glabel D_808785B4
|
||||
|
||||
.asciz "[32m ☆☆☆☆☆ 柵でたなぁ ☆☆☆☆☆ \n[m"
|
||||
.balign 4
|
||||
|
||||
glabel D_808785E0
|
||||
|
||||
.asciz "../z_bg_gate_shutter.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_808785F8
|
||||
|
||||
.asciz "../z_bg_gate_shutter.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_80878610
|
||||
|
||||
.asciz "../z_bg_gate_shutter.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_80878628
|
||||
.word 0xC4ABE000, 0x00000000
|
||||
|
||||
|
||||
@@ -1,42 +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_Tk_InitVars
|
||||
.word 0x00850400, 0x00000009, 0x00890000, 0x00000770
|
||||
.word EnTk_Init
|
||||
.word EnTk_Destroy
|
||||
.word EnTk_Update
|
||||
.word EnTk_Draw
|
||||
glabel D_80B1D4D0
|
||||
.word 0x040539B0, 0x040535B0, 0x040531B0, 0x04052DB0, 0x040529B0, 0x040525B0, 0x040521B0, 0x04051DB0
|
||||
glabel D_80B1D4F0
|
||||
.word 0x00000000, 0x00000000, 0x00000000
|
||||
glabel D_80B1D4FC
|
||||
.word 0x00000000, 0x3E99999A, 0x00000000
|
||||
glabel D_80B1D508
|
||||
.word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x001E0034, 0x00000000, 0x00000000
|
||||
glabel D_80B1D534
|
||||
.word 0x00000000, 0x00000000, 0xFF000000
|
||||
glabel D_80B1D540
|
||||
.word 0x42100000, 0x41200000
|
||||
glabel D_80B1D548
|
||||
.word 0x00000000, 0x00000000, 0x00000000
|
||||
glabel D_80B1D554
|
||||
.word 0x00000000, 0x00000000, 0x00000000
|
||||
glabel D_80B1D560
|
||||
.word 0x00000000, 0x3E99999A, 0x00000000
|
||||
glabel D_80B1D56C
|
||||
.word 0x00000000, 0x00000001, 0x00000002, 0x00000014, 0x00000006
|
||||
glabel D_80B1D580
|
||||
.word 0x00000000, 0x00000000, 0x458FC000
|
||||
glabel D_80B1D58C
|
||||
.word 0x00000000, 0x00000000, 0x00000000
|
||||
glabel D_80B1D598
|
||||
.word 0x06003B40, 0x06004340, 0x06004B40, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
@@ -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_80B1D690
|
||||
|
||||
.incbin "baserom/ovl_En_Tk", 0x1D90, 0x00000200
|
||||
@@ -1,70 +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_80B1D5B0
|
||||
.asciz "../z_en_tk_eff.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_80B1D5C4
|
||||
.asciz "../z_en_tk_eff.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_80B1D5D8
|
||||
.asciz "../z_en_tk_eff.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_80B1D5EC
|
||||
.asciz "../z_en_tk.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_80B1D5FC
|
||||
.asciz "../z_en_tk.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_80B1D60C
|
||||
.asciz "../z_en_tk.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_80B1D61C
|
||||
.asciz "../z_en_tk.c"
|
||||
.balign 4
|
||||
|
||||
glabel D_80B1D62C
|
||||
.word 0x3E4CCCCD
|
||||
glabel D_80B1D630
|
||||
.word 0x3ECCCCCD
|
||||
glabel D_80B1D634
|
||||
.word 0x461C4000
|
||||
glabel D_80B1D638
|
||||
.word 0x452AAAAB
|
||||
glabel D_80B1D63C
|
||||
.word 0x4622F983
|
||||
glabel jtbl_80B1D640
|
||||
.word L80B1C724
|
||||
.word L80B1C724
|
||||
.word L80B1C5EC
|
||||
.word L80B1C724
|
||||
.word L80B1C614
|
||||
.word L80B1C6E4
|
||||
.word L80B1C724
|
||||
.word L80B1C724
|
||||
.word L80B1C724
|
||||
.word L80B1C724
|
||||
glabel D_80B1D668
|
||||
.word 0x3ECCCCCD, 0x00000000
|
||||
glabel D_80B1D670
|
||||
.word 0x3FE66666, 0x66666666
|
||||
glabel D_80B1D678
|
||||
.word 0x3FECCCCC, 0xCCCCCCCD
|
||||
glabel D_80B1D680
|
||||
.word 0x3DCCCCCD
|
||||
glabel D_80B1D684
|
||||
.word 0xBDCCCCCD, 0x00000000, 0x00000000
|
||||
|
||||
|
||||
Reference in New Issue
Block a user