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

en_mm and object_mm OK (#735)

Browse source 
* almost done

* progress

* OK

* update mm2

* delete asm

* whitespace

* Update assets/xml/objects/object_mm.xml

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

* Update src/overlays/actors/ovl_En_Mm/z_en_mm.c

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

* name data

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
fig02 2021-03-28 19:18:41 -04:00 • committed by GitHub
parent 11e5be77d5
commit 7f3be6e37f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 648 additions and 1515 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
View file

@ -92,7 +92,7 @@ static ColliderCylinderInit sCylinderInit = {
{ 10, 44, 0, { 0, 0, 0 } },
};
CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
typedef enum {
/* 0 */ ZL4_ANIM_0,
@ -131,7 +131,7 @@ typedef enum {
/* 33 */ ZL4_ANIM_33
} EnZl4Animation;
struct_80034EC0_Entry sAnimationEntries[] = {
static struct_80034EC0_Entry sAnimationEntries[] = {
/* 0 */ /* standing idle */ { &gChildZeldaAnim_000654, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
/* 1 */ /* moves to introduce herself */ { &gChildZeldaAnim_00E5C8, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -1.0f },
/* 2 */ /* introducing herself */ { &gChildZeldaAnim_00EBC4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -1.0f },