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

Obj_Hunsui (#626)

Browse Source 
* Obj_Hunsui

* PR

* Merge

* Merge
This commit is contained in:
Maide
2022-02-28 02:38:36 +00:00
committed by GitHub
parent 84e13ff2a0
commit c9f64d3344
5 changed files with 676 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -3
View File
@@ -4436,9 +4436,7 @@ beginseg
name "ovl_Obj_Hunsui"
compress
include "build/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.o"
include "build/data/ovl_Obj_Hunsui/ovl_Obj_Hunsui.data.o"
include "build/data/ovl_Obj_Hunsui/ovl_Obj_Hunsui.bss.o"
include "build/data/ovl_Obj_Hunsui/ovl_Obj_Hunsui.reloc.o"
include "build/src/overlays/actors/ovl_Obj_Hunsui/ovl_Obj_Hunsui_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h
+2
View File
@@ -11,6 +11,8 @@ typedef void (*BgDblueMovebgActionFunc)(struct BgDblueMovebg*, GlobalContext*);
#define BGDBLUEMOVEBG_GET_FF0(thisx) (((thisx)->params >> 4) & 0xFF)
#define BGDBLUEMOVEBG_GET_F000(thisx) (((thisx)->params >> 0xC) & 0xF)
#define BGDBLUEMOVEBG_F_8 8
typedef struct BgDblueMovebg {
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ BgDblueMovebgActionFunc actionFunc;
src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c
+632 -22
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h
+41 -3
View File
@@ -2,18 +2,56 @@
#define Z_OBJ_HUNSUI_H
#include "global.h"
#include "overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h"
struct ObjHunsui;
typedef void (*ObjHunsuiActionFunc)(struct ObjHunsui*, GlobalContext*);
#define OBJHUNSUI_GET_7F(thisx) ((thisx)->params & 0x7F)
#define OBJHUNSUI_GET_F80(thisx) (((thisx)->params >> 7) & 0x1F)
#define OBJHUNSUI_GET_F000(thisx) (((thisx)->params >> 0xC) & 0xF)
enum {
/* 0 */ OBJHUNSUI_F000_0,
/* 1 */ OBJHUNSUI_F000_1,
/* 2 */ OBJHUNSUI_F000_2,
/* 3 */ OBJHUNSUI_F000_3,
/* 4 */ OBJHUNSUI_F000_4,
/* 5 */ OBJHUNSUI_F000_5,
/* 6 */ OBJHUNSUI_F000_6,
};
typedef struct ObjHunsui {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x18];
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ ObjHunsuiActionFunc actionFunc;
/* 0x0160 */ char unk_160[0x58];
/* 0x0160 */ s16 unk_160;
/* 0x0164 */ s32 unk_164;
/* 0x0168 */ s32 unk_168;
/* 0x016C */ s8 unk_16C;
/* 0x016D */ s8 unk_16D;
/* 0x016E */ s8 unk_16E;
/* 0x0170 */ s16 unk_170;
/* 0x0172 */ u16 unk_172;
/* 0x0174 */ f32 unk_174;
/* 0x0178 */ f32 unk_178;
/* 0x017C */ s16 unk_17C;
/* 0x0180 */ s32 unk_180;
/* 0x0184 */ s16 unk_184;
/* 0x0186 */ s16 unk_186;
/* 0x0188 */ s16 unk_188;
/* 0x018A */ s16 unk_18A;
/* 0x018C */ s16 unk_18C;
/* 0x0190 */ f32 unk_190;
/* 0x0194 */ f32 unk_194;
/* 0x0198 */ f32 unk_198;
/* 0x019C */ f32 unk_19C;
/* 0x01A0 */ f32 unk_1A0;
/* 0x01A4 */ s16 unk_1A4;
/* 0x0196 */ UNK_TYPE1 unk1A6[0x6];
/* 0x01AC */ f32 unk_1AC;
/* 0x01B0 */ f32 unk_1B0;
/* 0x01B4 */ BgDblueMovebg* unk_1B4;
} ObjHunsui; // size = 0x1B8
extern const ActorInit Obj_Hunsui_InitVars;
undefined_syms.txt
-8
View File
@@ -2043,14 +2043,6 @@ D_06002FC4 = 0x06002FC4;
D_06000080 = 0x06000080;
D_06000110 = 0x06000110;
// ovl_Obj_Hunsui
D_06000220 = 0x06000220;
D_06000BF0 = 0x06000BF0;
D_06000C74 = 0x06000C74;
D_06000EC0 = 0x06000EC0;
D_06001888 = 0x06001888;
// ovl_Obj_Jgame_Light
D_060003A0 = 0x060003A0;