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

En_Tite OK (#555)

Browse source 
* EnTite_Update matching

* Fixes to update

* made good progress, func_80B1A2A0 is in a good place to be matching soon

* Merge stuff

* func_80B19E94 done, func_80B18CC4 done

* EnTite_Destroy and EnTite_Init done

* Commenting out sDamageTable and EnTite_Init until all the data matches

* Some more small functions done

* more progress

* func_80B19918 done

* func_80B18E7C done

* func_80B19524 done

* more progress

* EnTite_Draw equiv but nonmatching, file otherwise done

* Found some unstaged changed on old laptop

* Draw matching: File fully matching!

* Documentation

* finished documentation

* deleted data files

* update spec

* fixed waterY -> yDistToWater rename after merge

* ran format.sh

* fixing accidental renames in camera

* Fixed some obvious number/comment formatting issues

* Removed unecessary prototypes

* merge

* running format.sh

* suggestions

* more pr comment changes

* format to push

* one more change

* more renames (see pr comments)

* merge

* renames

* format.sh

* fix renames

* function comment formatting

* merge + format

* endless merge fixes

* merge fixes until  die

* yet again a merge fix

* pr suggestions
This commit is contained in:
AdamKiddle 2020-12-31 20:00:30 +00:00 • committed by GitHub
parent 5a2bd7a035
commit 600bad1f20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
147 changed files with 1431 additions and 3642 deletions
Download patch file Download diff file Expand all files Collapse all files

33
data/overlays/actors/z_en_tite.data.s
View file

@ -1,33 +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_Tite_InitVars
.word 0x001B0500, 0x00000015, 0x00160000, 0x00000378
.word EnTite_Init
.word EnTite_Destroy
.word EnTite_Update
.word EnTite_Draw
glabel D_80B1B5D0
.word 0x00000000, 0xFFCFFFFF, 0x00080000, 0xFFCFFFFF, 0x00000000, 0x01050100, 0x00000000, 0x05DC0000, 0x00140064
glabel D_80B1B5F4
.word 0x06110939, 0x10000000, 0x00000001
.word D_80B1B5D0
glabel D_80B1B604
.word 0x10020102, 0x10020210, 0x01020402, 0xF4020202, 0x02E0F3E0, 0x00000104, 0x02020804, 0x00000400
glabel D_80B1B624
.word 0x89170045, 0xB04C07D0, 0xB070FFD8, 0x386CFC18
glabel D_80B1B634
.word 0x0600083C, 0x060004F8, 0x0600069C, 0x00000000, 0x00000000, 0x00000000
glabel D_80B1B64C
.word 0x452F0000, 0xC3480000, 0x00000000
glabel D_80B1B658
.word 0x41A00000, 0x41A00000, 0x00000000, 0x41200000, 0x42200000, 0x41200000, 0xC1200000, 0x42200000, 0x41200000, 0xC1A00000, 0x41A00000, 0x00000000, 0x41200000, 0x42200000, 0xC1200000, 0xC1200000, 0x42200000, 0xC1200000, 0x00000000, 0x41A00000, 0xC1A00000, 0x41200000, 0x00000000, 0x41200000, 0x41200000, 0x00000000, 0xC1200000, 0x00000000, 0x41A00000, 0x41A00000, 0xC1200000, 0x00000000, 0x41200000, 0xC1200000, 0x00000000, 0xC1200000, 0x00000000, 0x00000000

13
data/overlays/actors/z_en_tite.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_80B1B750
.incbin "baserom/ovl_En_Tite", 0x2CD0, 0x000001B0