mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-03 18:03:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

ovl_En_Ma_Yto: Cremia OK and mostly documented (#209)

Browse Source 
* EnMaYto_Update

* init

* func_80B8E84C

* CURRENT_DAY and run format

* a few other functions

* symlink to diff.py

* identify lots of functions

* and more functions

* small

* and a bunch more

* Another bunch

* small

* another bunch of functions

* And so on

* Another bunch

* func_80B8E6E0

* func_80B8E938

* func_80B8EA38

* Fix conflicts

* Another bunch

* two functions

* func_80B9083C

* func_80B8FA14

* OK

* Import data

* params and a bit of function renaming

* Minor reorder in object_script

* Fix merge issues and warnings

* Rename a few stuff

* fix merge issues

* And more renames

* More renames

* And moreeee

* Almost everything renamed

* Clock time and reformat

* Fix merge issues and add some undeclared functions

* Reorder alphabetically

* run format

* Minor styling stuff

* review changes

* Update src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Kenix's suggestions

* engineer's suggestions

* Run formatter

* whoops

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal
2021-07-21 21:58:57 -04:00
committed by GitHub
parent 39eeb67200
commit 1a58b590f0
15 changed files with 1627 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -924,7 +924,7 @@ void func_800BE03C(GlobalContext* globalCtx, Gfx* dl);
// void func_800BE0B8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
// void func_800BE184(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
u8 func_800BE22C(Actor* actor);
// void func_800BE258(void);
void func_800BE258(Actor* actor, UNK_PTR arg1);
// void func_800BE2B8(void);
// void func_800BE33C(void);
// void func_800BE3D0(void);
include/macros.h
+2 -2
View File
@@ -21,7 +21,7 @@
#define SET_NEXT_GAMESTATE(curState, newInit, newStruct) \
(curState)->nextGameStateInit = (GameStateFunc)newInit; \
(curState)->nextGameStateSize = sizeof(newStruct);
(curState)->nextGameStateSize = sizeof(newStruct)
#define PLAYER ((Player*)globalCtx->actorCtx.actorList[ACTORCAT_PLAYER].first)
@@ -72,7 +72,7 @@ extern GraphicsContext* __gfxCtx;
#define OPEN_DISPS(gfxCtx) \
{ \
GraphicsContext* __gfxCtx = gfxCtx; \
s32 __dispPad;
s32 __dispPad
#define CLOSE_DISPS(gfxCtx) \
} \
include/z64item.h
+2
View File
@@ -33,6 +33,7 @@ typedef enum {
/* 0x38 */ ITEM_MASK_ALL_NIGHT = 0x38,
/* 0x3A */ ITEM_MASK_KEATON = 0x3A,
/* 0x3B */ ITEM_MASK_GARO,
/* 0x3C */ ITEM_MASK_ROMANIS,
/* 0x46 */ ITEM_MASK_BREMEN = 0x46,
/* 0x4D */ ITEM_SWORD_KOKIRI = 0x4D,
/* 0x4E */ ITEM_SWORD_RAZOR,
@@ -101,6 +102,7 @@ typedef enum {
/* 0x60 */ GI_MILK_BOTTLE = 0x60,
/* 0x7E */ GI_MASK_ALL_NIGHT = 0x7E,
/* 0x80 */ GI_MASK_KEATON = 0x80,
/* 0x82 */ GI_MASK_ROMANIS = 0x82,
/* 0x8C */ GI_MASK_BREMEN = 0x8C,
/* 0x9B */ GI_SWORD_GREAT_FAIRY = 0x9B,
/* 0x9C */ GI_SWORD_KOKIRI,