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

Decompiled ovl_En_Ma2 (#93)

Browse source 
* first steps

* some more

* fixing merge

* more progress

* progs

* Decompiled ovl_En_Ma1

* newline

* Pr suggestion

* 2 to go

* Makefile machinery work

* Updating Jenkinsfile

* Initial setup for OSX repo support

* Adding ido7 to repo

* Makefile reversion

* Iniital Dockerfile

* iconv fix

* Docker stuff

* Dun

* Fixing stuff

* Updating Dockerfile

* Update README-OSX.md

* Restore functions.h

* Formatting

* Defining some funcs

* Renaming funcs

* Removing unnecessary README-OSX

* Addressing PR comments
This commit is contained in:
Ethan Roseman 2020-05-01 06:08:39 -04:00 • committed by GitHub
parent 4932e93ba2
commit 363d5d4194
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 397 additions and 1133 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
View file

@ -37,7 +37,7 @@ const ActorInit En_Ma1_InitVars = {
(ActorFunc)EnMa1_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 } },