kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

MMM .data defined

Browse Source
This commit is contained in:
Banjo Kazooie
2022-11-27 22:56:33 -06:00
parent 87ec8d0223
commit cedeb8ed4c
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
decompressed.us.v10.yaml
View File

@@ -1692,7 +1692,7 @@ segments:
- [0x105CD40, .data, ch/napper] - [0x105CD40, .data, ch/napper]
- [0x105CD70, .data, code_DC0] - [0x105CD70, .data, code_DC0]
- [0x105CDB0, .data, ch/motzhand] - [0x105CDB0, .data, ch/motzhand]
- [0x105CDF0, bin, data_56E0] #.data, code_16B0] - [0x105CDF0, .data, code_16B0]
- [0x105CF00, .data, code_2040] - [0x105CF00, .data, code_2040]
- [0x105D150, .data, code_2F60] - [0x105D150, .data, code_2F60]
- [0x105D240, .data, code_3420] - [0x105D240, .data, code_3420]

21
src/MMM/code_16B0.c
View File

@@ -12,19 +12,13 @@ void func_80388028(Actor *this);
Actor *func_80387AA0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); Actor *func_80387AA0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */ /* .data */
extern ActorInfo D_8038BAD0 = { ActorInfo D_8038BAD0 = {
MARKER_254_PORTRAIT_CHOMPA_A, ACTOR_381_PORTRAIT_CHOMPA, ASSET_521_MODEL_PORTRAIT_CHOMPA, MARKER_254_PORTRAIT_CHOMPA_A, ACTOR_381_PORTRAIT_CHOMPA, ASSET_521_MODEL_PORTRAIT_CHOMPA,
0x0, NULL, 0x0, NULL,
func_80388028, NULL, func_80387AA0, func_80388028, NULL, func_80387AA0,
0, 0, 0.0f, 0 0, 0, 0.0f, 0
}; };
extern s32 D_8038BAF4[3];
extern struct31s D_8038BB00;
extern struct43s D_8038BB28;
extern struct31s D_8038BB70;
extern struct43s D_8038BB98;
/* .code */ /* .code */
Actor *func_80387AA0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { Actor *func_80387AA0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
Actor* actor = marker_getActor(marker); Actor* actor = marker_getActor(marker);
@@ -122,6 +116,13 @@ void func_80387D48(ActorMarker *marker){
} }
void func_80387DF8(f32 position[3], s32 count, enum asset_e sprite_id) { void func_80387DF8(f32 position[3], s32 count, enum asset_e sprite_id) {
static s32 D_8038BAF4[3] = {0xB4, 0xFF, 0x8C};
static struct31s D_8038BB00 = {{0.2f, 0.4f}, {1.8f, 2.8f}, {0.0f, 0.15f}, {0.7f, 1.2f}, 0.0f, 0.01f};
static struct43s D_8038BB28 = {
{{-150.0f, 250.0f, -150.0f}, {150.0f, 300.0f, 150.0f}},
{{ 0.0f, -600.0f, 0.0f}, { 0.0f, -600.0f, 0.0f}},
{{ -50.0f, -50.0f, -50.0f}, { 50.0f, 50.0f, 50.0f}}
};
ParticleEmitter *pCtrl; ParticleEmitter *pCtrl;
pCtrl = partEmitList_pushNew(count); pCtrl = partEmitList_pushNew(count);
@@ -134,6 +135,12 @@ void func_80387DF8(f32 position[3], s32 count, enum asset_e sprite_id) {
} }
void func_80387E84(f32 position[3], s32 count, enum asset_e model_id) { void func_80387E84(f32 position[3], s32 count, enum asset_e model_id) {
static struct31s D_8038BB70 = {{1.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 0.0f}, {3.2f, 3.2f}, 0.0f, 0.45f};
static struct43s D_8038BB98 = {
{{-90.0f, 300.0f, -90.0f}, {90.0f, 660.0f, 90.0f}},
{{ 0.0f, -1200.0f, 0.0f}, { 0.0f, -1200.0f, 0.0f}},
{{-50.0f, 0.0f, -50.0f}, {50.0f, 50.0f, 50.0f}}
};
ParticleEmitter *pCtrl; ParticleEmitter *pCtrl;
pCtrl = partEmitList_pushNew(count); pCtrl = partEmitList_pushNew(count);