diff --git a/src/npc/mountainMinish.c b/src/npc/mountainMinish.c index c21deb5f..224b4972 100644 --- a/src/npc/mountainMinish.c +++ b/src/npc/mountainMinish.c @@ -5,18 +5,46 @@ #include "flags.h" #include "npc.h" -const u8 gUnk_08111284[][0x20]; -const u8 gUnk_08111304[]; -const u16 gUnk_0811130E[][4]; -const SpriteLoadData gUnk_08111358[]; -void (*const MountainMinish_Actions[])(Entity*); -const u16 gUnk_08111374[]; -const u16 gUnk_0811137A[]; +const u8 gUnk_08111284[][0x20] = { + { 0x8, 0x1, 0x9, 0x1, 0xa, 0x1, 0xb, 0x83, 0xc, 0x83, 0xd, 0x83, 0xe, 0x83, 0xf, 0x80, + 0, 0x80, 0x1, 0x80, 0x2, 0x82, 0x3, 0x82, 0x4, 0x82, 0x5, 0x82, 0x6, 0x1, 0x7, 0x1 }, + { 0x8, 0x81, 0x9, 0x81, 0xa, 0x3, 0xb, 0x3, 0xc, 0x3, 0xd, 0x3, 0xe, 0x3, 0xf, 0x80, + 0, 0x80, 0x1, 0x80, 0x2, 0x80, 0x3, 0x82, 0x4, 0x82, 0x5, 0x82, 0x6, 0x81, 0x7, 0x81 }, + { 0x8, 0x81, 0x9, 0x81, 0xa, 0x83, 0xb, 0x83, 0xc, 0x83, 0xd, 0x83, 0xe, 0x0, 0xf, 0x0, + 0, 0x0, 0x1, 0x0, 0x2, 0x0, 0x3, 0x82, 0x4, 0x82, 0x5, 0x82, 0x6, 0x82, 0x7, 0x81 }, + { 0x8, 0x81, 0x9, 0x81, 0xa, 0x81, 0xb, 0x83, 0xc, 0x83, 0xd, 0x83, 0xe, 0x80, 0xf, 0x80, + 0, 0x80, 0x1, 0x80, 0x2, 0x2, 0x3, 0x2, 0x4, 0x2, 0x5, 0x2, 0x6, 0x2, 0x7, 0x81 }, +}; + +const u8 gUnk_08111304[] = { + 10, 10, 3, 1, 0, 0, 0, 0, 0, 0, +}; + +const u16 gUnk_0811130E[][4] = { + { 0x120b, 0x120b, 0x120b, 0x120b }, { 0x120c, 0x120c, 0x120c, 0x120c }, { 0x120d, 0x120e, 0x120e, 0x121f }, + { 0x120f, 0x120f, 0x120f, 0x120f }, { 0x1210, 0x1211, 0x1216, 0x1225 }, { 0x1212, 0x1212, 0x1217, 0x1217 }, + { 0x1213, 0x1213, 0x1217, 0x1217 }, { 0x122b, 0x122b, 0x122b, 0x122b }, { 0x1231, 0x1231, 0x1231, 0x1231 }, +}; + +const SpriteLoadData gUnk_08111358[] = { + { 0xb4, 0x1b, 0x4 }, + { 0x30b4, 0x1b, 0x4 }, + { 0x60b4, 0x1c, 0x4 }, + { 0x0, 0x0, 0x0 }, +}; void sub_08067EF0(Entity*); void sub_08068190(Entity*); +void sub_08067E60(Entity*); +void sub_08067E88(Entity*); +void sub_08067EE8(Entity*); void MountainMinish(Entity* this) { + static void (*const MountainMinish_Actions[])(Entity*) = { + sub_08067E60, + sub_08067E88, + sub_08067EE8, + }; if ((this->flags & ENT_SCRIPTED) == 0) { MountainMinish_Actions[this->action](this); sub_0806ED78(this); @@ -62,6 +90,17 @@ void sub_08067EE8(Entity* this) { } void sub_08067EF0(Entity* this) { + static const u16 gUnk_08111374[] = { + SFX_HAMMER1, + SFX_HAMMER2, + SFX_HAMMER3, + }; + + static const u16 gUnk_0811137A[] = { + SFX_HAMMER4, + SFX_HAMMER5, + SFX_HAMMER6, + }; Entity* fxEnt; switch (this->action) { @@ -234,49 +273,3 @@ void MountainMinish_Fusion(Entity* this) { GetNextFrame(this); } } - -const u8 gUnk_08111284[][0x20] = { - { 0x8, 0x1, 0x9, 0x1, 0xa, 0x1, 0xb, 0x83, 0xc, 0x83, 0xd, 0x83, 0xe, 0x83, 0xf, 0x80, - 0, 0x80, 0x1, 0x80, 0x2, 0x82, 0x3, 0x82, 0x4, 0x82, 0x5, 0x82, 0x6, 0x1, 0x7, 0x1 }, - { 0x8, 0x81, 0x9, 0x81, 0xa, 0x3, 0xb, 0x3, 0xc, 0x3, 0xd, 0x3, 0xe, 0x3, 0xf, 0x80, - 0, 0x80, 0x1, 0x80, 0x2, 0x80, 0x3, 0x82, 0x4, 0x82, 0x5, 0x82, 0x6, 0x81, 0x7, 0x81 }, - { 0x8, 0x81, 0x9, 0x81, 0xa, 0x83, 0xb, 0x83, 0xc, 0x83, 0xd, 0x83, 0xe, 0x0, 0xf, 0x0, - 0, 0x0, 0x1, 0x0, 0x2, 0x0, 0x3, 0x82, 0x4, 0x82, 0x5, 0x82, 0x6, 0x82, 0x7, 0x81 }, - { 0x8, 0x81, 0x9, 0x81, 0xa, 0x81, 0xb, 0x83, 0xc, 0x83, 0xd, 0x83, 0xe, 0x80, 0xf, 0x80, - 0, 0x80, 0x1, 0x80, 0x2, 0x2, 0x3, 0x2, 0x4, 0x2, 0x5, 0x2, 0x6, 0x2, 0x7, 0x81 }, -}; - -const u8 gUnk_08111304[] = { - 10, 10, 3, 1, 0, 0, 0, 0, 0, 0, -}; - -const u16 gUnk_0811130E[][4] = { - { 0x120b, 0x120b, 0x120b, 0x120b }, { 0x120c, 0x120c, 0x120c, 0x120c }, { 0x120d, 0x120e, 0x120e, 0x121f }, - { 0x120f, 0x120f, 0x120f, 0x120f }, { 0x1210, 0x1211, 0x1216, 0x1225 }, { 0x1212, 0x1212, 0x1217, 0x1217 }, - { 0x1213, 0x1213, 0x1217, 0x1217 }, { 0x122b, 0x122b, 0x122b, 0x122b }, { 0x1231, 0x1231, 0x1231, 0x1231 }, -}; - -const SpriteLoadData gUnk_08111358[] = { - { 0xb4, 0x1b, 0x4 }, - { 0x30b4, 0x1b, 0x4 }, - { 0x60b4, 0x1c, 0x4 }, - { 0x0, 0x0, 0x0 }, -}; - -void (*const MountainMinish_Actions[])(Entity*) = { - sub_08067E60, - sub_08067E88, - sub_08067EE8, -}; - -const u16 gUnk_08111374[] = { - SFX_HAMMER1, - SFX_HAMMER2, - SFX_HAMMER3, -}; - -const u16 gUnk_0811137A[] = { - SFX_HAMMER4, - SFX_HAMMER5, - SFX_HAMMER6, -};