izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Object_Kankyo (1 non-matching) (#445)

Browse Source 
* Object_Kankyo

* Removing permuter

* PR

* Re-add description

* PR
This commit is contained in:
Maide
2022-01-04 04:24:35 +00:00
committed by GitHub
parent 22a759a923
commit f66a9f8d0e
6 changed files with 702 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -1256,7 +1256,7 @@ s16 Camera_ClearFlags(Camera* camera, s16 flags);
// void func_800E0238(void);
void func_800E02AC(Camera* camera, Actor* actor);
void func_800E0308(Camera* camera, Actor* actor);
// void func_800E031C(void);
f32 func_800E031C(Camera* camera);
void func_800E0348(Camera* camera);
DamageTable* DamageTable_Get(s32 index);
void DamageTable_Clear(DamageTable* damageTable);
include/variables.h
+2 -1
View File
@@ -3981,6 +3981,7 @@ extern Gfx D_0406AB30[];
extern UNK_TYPE D_0406B730;
extern UNK_TYPE D_0406BB0C;
extern UNK_TYPE D_0406F380;
extern Gfx D_040706E0[];
extern UNK_TYPE D_04073F00;
extern UNK_TYPE D_04075400;
extern Gfx D_04075A40[];
@@ -4025,7 +4026,7 @@ extern UNK_TYPE D_0502324C;
// other segments
extern GfxMasterList D_0E000000;
extern Mtx D_01000000;
extern UNK_TYPE D_0F000000;
spec
+4 -2
View File
@@ -1196,9 +1196,11 @@ beginseg
name "ovl_Object_Kankyo"
compress
include "build/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.o"
include "build/data/ovl_Object_Kankyo/ovl_Object_Kankyo.data.o"
include "build/data/ovl_Object_Kankyo/ovl_Object_Kankyo.bss.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_Object_Kankyo/ovl_Object_Kankyo_reloc.o"
#else
include "build/data/ovl_Object_Kankyo/ovl_Object_Kankyo.reloc.o"
#endif
endseg
beginseg
src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
+679 -21
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
+16 -1
View File
@@ -7,9 +7,24 @@ struct ObjectKankyo;
typedef void (*ObjectKankyoActionFunc)(struct ObjectKankyo*, GlobalContext*);
typedef struct {
/* 0x00 */ f32 unk_00;
/* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08;
/* 0x0C */ f32 unk_0C;
/* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14;
/* 0x18 */ f32 unk_18;
/* 0x1C */ u8 unk_1C;
} ObjectKankyoStruct; // size = 0x20
typedef struct ObjectKankyo {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x100C];
/* 0x0144 */ f32 unk_144;
/* 0x0148 */ f32 unk_148;
/* 0x014C */ ObjectKankyoStruct unk_14C[128];
/* 0x114C */ u16 unk_114C;
/* 0x114E */ u8 unk_114E;
/* 0x1150 */ ObjectKankyoActionFunc actionFunc;
} ObjectKankyo; // size = 0x1154
src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
-2
View File
@@ -20,8 +20,6 @@ const EffectSsInit Effect_Ss_Dead_Dd_InitVars = {
#endif
extern UNK_TYPE D_01000000;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Init.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Draw.s")