diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index 4fdc4b4a..b62fa9ef 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -1692,7 +1692,7 @@ segments: - [0x105CD40, .data, ch/napper] - [0x105CD70, .data, code_DC0] - [0x105CDB0, .data, ch/motzhand] - - [0x105CDF0, bin, data_56E0] #.data, code_16B0] + - [0x105CDF0, .data, code_16B0] - [0x105CF00, .data, code_2040] - [0x105D150, .data, code_2F60] - [0x105D240, .data, code_3420] diff --git a/src/MMM/code_16B0.c b/src/MMM/code_16B0.c index 75e29482..1858bca9 100644 --- a/src/MMM/code_16B0.c +++ b/src/MMM/code_16B0.c @@ -12,19 +12,13 @@ void func_80388028(Actor *this); Actor *func_80387AA0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); /* .data */ -extern ActorInfo D_8038BAD0 = { +ActorInfo D_8038BAD0 = { MARKER_254_PORTRAIT_CHOMPA_A, ACTOR_381_PORTRAIT_CHOMPA, ASSET_521_MODEL_PORTRAIT_CHOMPA, 0x0, NULL, func_80388028, NULL, func_80387AA0, 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 */ Actor *func_80387AA0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) { 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) { + 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; 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) { + 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; pCtrl = partEmitList_pushNew(count);