1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 06:40:15 +00:00

35/37 Functions Decompiled in ovl_En_Heishi2 (#117)

* started

* did more work

* did some more

* Update

* Merged master

* EnHeishi2_Update OK

* func_80A549E8 OK

* func_80A54954 OK

* EnHeishi2_Draw OK

* Removed unused asm

* func_80A543A0 OK

* func_80A53638 OK. Fixed type of func_8008F08C

* done for rn, will work on it later

* func_80A53850 OK

* func_80A53F30 OK

* func_80A53D0C OK

* Made cylinderInit in En_Ma3 static

* Made suggested changes. Removed return from functions by adding else

* Made suggested changes. Removed a.out file that accidentally got added

* Made suggested changes

* moved #include <vt.h> from header to c file

* fixed formatting

* added line break

* Made suggested changes

* ran format

* Fixed unk_2F2
This commit is contained in:
Lucas Shaw 2020-05-10 16:44:04 -07:00 committed by GitHub
parent 7d7c851289
commit 8e7ca2d497
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 899 additions and 2271 deletions

View file

@ -1,7 +1,7 @@
/*
* File: z_en_ma3.c
* Overlay: En_Ma3
* Description:
* Description: Adult Malon (Ranch)
*/
#include "z_en_ma3.h"
@ -37,7 +37,7 @@ const ActorInit En_Ma3_InitVars = {
(ActorFunc)EnMa3_Draw,
};
ColliderCylinderInit cylinderInit = {
static ColliderCylinderInit cylinderInit = {
{ COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER },
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 },
{ 18, 46, 0, { 0, 0, 0 } },