mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-23 06:54:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_player_lib: Part 2 (#938)

Browse Source 
* preparations

* import data

* PLAYER_STATE1

* PLAYER_STATE2

* PLAYER_STATE3

* import bss

* format stuff

* bss cleanup

* more cleaning and some naming

* face

* cleaning up link human object a bit

* Remove PHYSICAL_TO_VIRTUAL2

* Update src/code/z_player_lib.c

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

* review

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

* format

* /* CAT */

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* naming some stuff on objects

* format

* invert flags endian

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* format

* drawmask

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* naming

* another round of human object naming

* enum renames

* sActionModelGroups and use enum as types

* PlayerAnimType

* PLAYER_MODELTYPE_

* determined ranges of PlayerModelType

* name PLAYER_MODELGROUP_DEFAULT

* format

* sheath

* dlist groups placeholder namse

* PLAYER_MODELGROUP_BOTTLE

* Some fierce deity naming

* Right hands

* zora skel dlists

* deku limb dlists

* left hands

* name most modelgroups

* more hand naming

* regs as dec

* fix in horse

* Use BUTTON_ITEM_EQUIP macro

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* reformat D_801AED58

* Sword sheaths

* swords and shields

* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* playerForm on Player_DrawImpl

* fomat

* Update src/code/z_player_lib.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update assets/xml/objects/gameplay_keep.xml

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(gEffBubble1Tex))

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* singular limb enum names

* fix bss

* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* name goron shielding limbs

* name limb

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* bss

* bss

* format

* namefixer

* bss

* bss

* bss

* bss

* format

* bss

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* fix bss

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
Anghelo Carvajal
2022-10-15 19:12:01 -03:00
committed by GitHub
parent 638f5062cb
commit bd373940ac
139 changed files with 2323 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/variables.h
+9 -150
View File
@@ -1,5 +1,5 @@
#ifndef _VARIABLES_H_
#define _VARIABLES_H_
#ifndef VARIABLES_H
#define VARIABLES_H
#include "z64.h"
#include "segment_symbols.h"
@@ -412,7 +412,6 @@ extern EffectSsOverlay gParticleOverlayTable[39];
extern f32 actorMovementScale;
extern TargetRangeParams gTargetRanges[];
extern s16 D_801AED48[8];
// extern UNK_TYPE4 D_801AED58;
extern Color_RGBA8 actorDefaultHitColor;
// extern UNK_TYPE1 D_801AED8C;
// extern UNK_TYPE4 D_801AED98;
@@ -773,141 +772,12 @@ extern UNK_PTR D_801BF5C0;
// extern UNK_TYPE1 D_801BFD94;
// extern UNK_TYPE2 D_801BFD98;
// extern UNK_TYPE1 D_801BFDD0;
// extern UNK_TYPE1 D_801BFE00;
// extern UNK_TYPE1 D_801BFE14;
// extern UNK_TYPE2 D_801BFF34;
// extern UNK_TYPE1 D_801BFF90;
extern u8 gPlayerModelTypes[][5];
// extern UNK_TYPE1 D_801BFFFC;
// extern UNK_TYPE1 D_801C0024;
// extern UNK_TYPE1 D_801C0034;
// extern UNK_TYPE1 D_801C005C;
// extern UNK_TYPE1 D_801C0084;
// extern UNK_TYPE1 D_801C00AC;
// extern UNK_TYPE1 D_801C00BC;
// extern UNK_TYPE1 D_801C00D4;
// extern UNK_TYPE1 D_801C00EC;
// extern UNK_TYPE1 D_801C0114;
// extern UNK_TYPE1 D_801C013C;
// extern UNK_TYPE1 D_801C0164;
// extern UNK_TYPE1 D_801C018C;
// extern UNK_TYPE1 D_801C01A4;
// extern UNK_TYPE1 D_801C01CC;
// extern UNK_TYPE1 D_801C01F4;
// extern UNK_TYPE1 D_801C021C;
// extern UNK_TYPE1 D_801C0244;
// extern UNK_TYPE1 D_801C026C;
// extern UNK_TYPE1 D_801C0294;
// extern UNK_TYPE1 D_801C02A8;
// extern UNK_TYPE1 D_801C02BC;
// extern UNK_TYPE1 D_801C02D0;
// extern UNK_TYPE1 D_801C02E4;
// extern UNK_TYPE1 D_801C0340;
// extern UNK_TYPE1 D_801C0368;
// extern UNK_TYPE1 D_801C03A0;
// extern UNK_TYPE1 D_801C03C0;
// extern UNK_TYPE1 D_801C03E0;
// extern UNK_TYPE1 D_801C0410;
// extern UNK_TYPE1 D_801C0428;
// extern UNK_TYPE1 D_801C0460;
// extern UNK_TYPE1 D_801C0490;
// extern UNK_TYPE1 D_801C0510;
// extern UNK_TYPE1 D_801C0538;
// extern UNK_TYPE1 D_801C0560;
// extern UNK_TYPE1 D_801C0580;
// extern UNK_TYPE1 D_801C05A8;
// extern UNK_TYPE1 D_801C05C8;
// extern UNK_TYPE1 D_801C05D8;
// extern UNK_TYPE1 D_801C05F0;
// extern UNK_TYPE1 D_801C0608;
// extern UNK_TYPE1 D_801C0628;
// extern UNK_TYPE1 D_801C0678;
// extern UNK_TYPE1 D_801C0698;
// extern UNK_TYPE1 D_801C06B8;
// extern UNK_TYPE1 D_801C06E0;
// extern UNK_TYPE1 D_801C06F8;
// extern UNK_TYPE1 D_801C0718;
// extern UNK_TYPE1 D_801C0730;
// extern UNK_TYPE1 D_801C0740;
// extern UNK_TYPE1 D_801C0750;
// extern UNK_TYPE1 D_801C0778;
// extern UNK_TYPE1 D_801C0784;
// extern UNK_TYPE1 D_801C07AC;
// extern UNK_TYPE1 D_801C07C0;
// extern UNK_TYPE1 D_801C07F0;
// extern UNK_TYPE1 D_801C0820;
// extern UNK_TYPE1 D_801C0838;
extern Gfx D_801C0850[];
// extern UNK_TYPE1 D_801C0860;
extern UNK_PTR D_801C0870;
// extern UNK_TYPE1 D_801C0890;
// extern UNK_TYPE1 D_801C08A0;
// extern UNK_TYPE1 D_801C08C0;
// extern UNK_TYPE1 D_801C08FC;
// extern UNK_TYPE1 D_801C0910;
// extern UNK_TYPE1 D_801C0924;
// extern UNK_TYPE1 D_801C0938;
// extern UNK_TYPE1 D_801C094C;
// extern UNK_TYPE4 D_801C0958;
extern UNK_PTR D_801C095C;
// extern UNK_TYPE1 D_801C0964;
// extern UNK_TYPE1 D_801C096C;
// extern UNK_TYPE1 D_801C0970;
// extern UNK_TYPE4 D_801C0994;
// extern UNK_TYPE1 D_801C09B8;
// extern UNK_TYPE1 D_801C09DC;
// extern UNK_TYPE1 D_801C0A00;
// extern UNK_TYPE1 D_801C0A24;
// extern UNK_TYPE1 D_801C0A48;
// extern UNK_TYPE1 D_801C0A6C;
// extern UNK_TYPE1 D_801C0A90;
// extern UNK_TYPE1 D_801C0AB4;
// extern UNK_TYPE1 D_801C0ABC;
// extern UNK_TYPE1 D_801C0AC4;
// extern UNK_TYPE1 D_801C0ADC;
extern UNK_PTR D_801C0AF4;
extern UNK_PTR D_801C0AFC;
extern UNK_PTR D_801C0B04;
extern UNK_PTR D_801C0B0C;
// extern UNK_TYPE1 D_801C0B14;
// extern UNK_TYPE1 D_801C0B1C;
// extern UNK_TYPE1 D_801C0B20;
// extern UNK_TYPE1 D_801C0B90;
// extern UNK_TYPE4 D_801C0BA8;
// extern UNK_TYPE1 D_801C0BB4;
// extern UNK_TYPE1 D_801C0BC0;
// extern UNK_TYPE1 D_801C0BD0;
// extern UNK_TYPE4 D_801C0BE0;
// extern UNK_TYPE4 D_801C0BEC;
// extern UNK_TYPE1 D_801C0BF8;
// extern UNK_TYPE1 D_801C0BFC;
// extern UNK_TYPE1 D_801C0C00;
// extern UNK_TYPE4 D_801C0C0C;
// extern UNK_TYPE1 D_801C0C30;
// extern UNK_TYPE1 D_801C0C54;
// extern UNK_TYPE1 D_801C0CA8;
// extern UNK_TYPE4 D_801C0CE8;
// extern UNK_TYPE1 D_801C0D24;
// extern UNK_TYPE1 D_801C0D60;
// extern UNK_TYPE1 D_801C0D6C;
// extern UNK_TYPE1 D_801C0D78;
// extern UNK_TYPE4 D_801C0D94;
// extern UNK_TYPE4 D_801C0D98;
// extern UNK_TYPE4 D_801C0D9C;
// extern UNK_TYPE4 D_801C0DA0;
// extern UNK_TYPE1 D_801C0DA8;
// extern UNK_TYPE1 D_801C0DD8;
// extern UNK_TYPE1 D_801C0DE4;
// extern UNK_TYPE4 D_801C0DF0;
// extern UNK_TYPE1 D_801C0E04;
// extern UNK_TYPE4 D_801C0E2C;
// extern UNK_TYPE4 D_801C0E40;
// extern UNK_TYPE1 D_801C0E7C;
// extern UNK_TYPE1 D_801C0E94;
// extern UNK_TYPE1 D_801C0EA0;
// extern UNK_TYPE1 D_801C0EAC;
// extern UNK_TYPE1 D_801C0EB8;
extern FlexSkeletonHeader* gPlayerSkeletons[PLAYER_FORM_MAX];
extern PlayerModelIndices gPlayerModelTypes[];
extern struct_80124618 D_801C03A0[];
extern struct_80124618 D_801C0490[];
extern Gfx gCullBackDList[];
extern Gfx gCullFrontDList[];
extern Gfx sSetupDL[438];
extern Gfx sFillSetupDL[12];
@@ -2750,18 +2620,7 @@ extern s16 D_801F4E7A;
// extern UNK_TYPE1 D_801F57B4;
// extern UNK_TYPE1 D_801F5834;
// extern NmiBuff* gNMIBuffer;
// extern UNK_TYPE1 sPostmanTimerInput;
// extern UNK_TYPE1 D_801F58B0;
// extern UNK_TYPE1 D_801F59AC;
// extern UNK_TYPE1 D_801F59B0;
// extern UNK_TYPE1 D_801F59C8;
// extern UNK_TYPE1 D_801F59D0;
// extern UNK_TYPE1 D_801F59DC;
// extern UNK_TYPE1 D_801F59E0;
// extern UNK_TYPE1 D_801F59E4;
// extern UNK_TYPE1 D_801F59E8;
// extern UNK_TYPE1 D_801F59F4;
// extern UNK_TYPE1 D_801F59F8;
// extern UNK_TYPE1 sSkyboxDrawMatrix;
// extern UNK_TYPE1 D_801F6AF0;
// extern UNK_TYPE1 D_801F6AF2;