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

ovl_En_In OK (#545)

Browse source 
* Initial progress

* Further progress

* One nonmatching left

* Fix merge

* OK

* Cleanup

* Remove unused asm

* Use generated reloc

* nightFlag changes and requiredObject -> objectIdx

* Some suggestions

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Revert nightflag changes, early return after Actor_Kill, objectIdx -> ingoObjBankIndex

* Fix accidental nightFlag change in z_sram

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Tharo 2021-01-04 19:52:36 +00:00 • committed by GitHub
parent 8cd367c43b
commit 510b3c4bd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 959 additions and 3075 deletions
Download patch file Download diff file Expand all files Collapse all files

40
data/overlays/actors/z_en_in.data.s
View file

@ -1,40 +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_In_InitVars
.word 0x00CB0400, 0x00000019, 0x00C00000, 0x000003A8
.word EnIn_Init
.word EnIn_Destroy
.word EnIn_Update
.word EnIn_Draw
glabel D_80A7B840
.word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0012002E, 0x00000000, 0x00000000
glabel D_80A7B86C
.word 0x00000000, 0x00000000, 0xFF000000
glabel D_80A7B878
.word 0x06001CC0, 0x3F800000, 0x00000000, 0x00000000, 0x06001CC0, 0x3F800000, 0x00000000, 0xC1200000, 0x06013C6C, 0x3F800000, 0x00000000, 0x00000000, 0x06013C6C, 0x3F800000, 0x00000000, 0xC1200000, 0x06000CB0, 0x3F800000, 0x00000000, 0x00000000, 0x060003B4, 0x3F800000, 0x00000000, 0xC1200000, 0x06001BE0, 0x3F800000, 0x00000000, 0x00000000, 0x06013D60, 0x3F800000, 0x00000000, 0x00000000, 0x0601431C, 0x3F800000, 0x00000000, 0x00000000, 0x06014CA8, 0x3F800000, 0x00000000, 0x00000000
glabel D_80A7B918
.word 0x060151C8, 0x06015DF0, 0x06016B3C, 0x06015814, 0x0601646C, 0x060175D0, 0x06017B58, 0x06018C38
glabel D_80A7B938
.word 0x00000000, 0x00000000, 0x06013688, 0x060137C0, 0x06013910, 0x060132B8, 0x060133F0, 0x06013540, 0x06013100, 0x06011758, 0x06012AC0, 0x06012BF0, 0x06012D20, 0x06012480, 0x060125B0, 0x060126E0, 0x06011AD8, 0x06012350, 0x06012220, 0x06012120
glabel D_80A7B988
.word 0x055804CA, 0x01570000
glabel D_80A7B990
.word 0x00000000, 0x00000000
glabel D_80A7B998
.word 0x00000000
glabel D_80A7B99C
.word 0x00000000, 0x00000000, 0x00000000
glabel D_80A7B9A8
.word 0x44C80000, 0x00000000, 0x00000000
glabel D_80A7B9B4
.word 0x06003590, 0x060047D0, 0x06004BD0, 0x06004390, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_in.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_80A7BB00
.incbin "baserom/ovl_En_In", 0x2B50, 0x00000320