mirror of
https://github.com/HackerN64/HackerOoT.git
synced 2026-01-21 10:37:37 -08:00
Fix Sheik typo (#867)
This commit is contained in:
mzxrules
GitHub
@@ -1,32 +1,32 @@
|
||||
<Root>
|
||||
<File Name="object_xc" Segment="6">
|
||||
<Skeleton Name="gShiekSkel" Type="Flex" LimbType="Standard" Offset="0x12AF0"/>
|
||||
<Animation Name="gShiekPlayingHarpAnim" Offset="0xB6C"/>
|
||||
<Animation Name="gShiekShowingTriforceOnHandAnim" Offset="0x1A08"/>
|
||||
<Animation Name="gShiekShowingTriforceOnHandIdleAnim" Offset="0x1D14"/>
|
||||
<Animation Name="gShiekPlayingHarp2Anim" Offset="0x289C"/>
|
||||
<Animation Name="gShiekPlayingHarp3Anim" Offset="0x35C8"/>
|
||||
<Animation Name="gShiekPlayingHarp4Anim" Offset="0x4570"/>
|
||||
<Animation Name="gShiekIdleAnim" Offset="0x4828"/>
|
||||
<Animation Name="gShiekWalkingAnim" Offset="0x12FD0"/>
|
||||
<Animation Name="gShiekArmsCrossedIdleAnim" Offset="0x13AA4"/>
|
||||
<Animation Name="gShiekFallingFromContortionsAnim" Offset="0x149E4"/>
|
||||
<Animation Name="gShiekContortionsAnim" Offset="0x169E8"/>
|
||||
<Animation Name="gShiekPlayingHarp5Anim" Offset="0x177F8"/>
|
||||
<Animation Name="gShiekInitialHarpAnim" Offset="0x17C54"/>
|
||||
<Animation Name="gShiekDefenseStanceAnim" Offset="0x18B00"/>
|
||||
<Animation Name="gShiekThrowingNutAnim" Offset="0x19598"/>
|
||||
<Animation Name="gShiekKneelingAnim" Offset="0x19C30"/>
|
||||
<Animation Name="gShiekHittingGroundAnim" Offset="0x19F78"/>
|
||||
<Animation Name="gShiekAnim_01A048" Offset="0x1A048"/>
|
||||
<Animation Name="gShiekPullingOutHarpAnim" Offset="0x1B19C"/>
|
||||
<Animation Name="gShiekFallingFromSkyAnim" Offset="0x1C0E8"/>
|
||||
<Texture Name="gShiekEyeOpenTex" OutName="shiek_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4CC0"/>
|
||||
<Texture Name="gShiekEyeHalfClosedTex" OutName="shiek_eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x50C0"/>
|
||||
<Texture Name="gShiekEyeShutTex" OutName="shiek_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x54C0"/>
|
||||
<Texture Name="gShiekEyeSquintingTex" OutName="shiek_eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x58C0"/>
|
||||
<DList Name="gShiekHarpDL" Offset="0x11150"/>
|
||||
<DList Name="gShiekDL_011620" Offset="0x11620"/>
|
||||
<DList Name="gShiekDL_012970" Offset="0x12970"/>
|
||||
<Skeleton Name="gSheikSkel" Type="Flex" LimbType="Standard" Offset="0x12AF0"/>
|
||||
<Animation Name="gSheikPlayingHarpAnim" Offset="0xB6C"/>
|
||||
<Animation Name="gSheikShowingTriforceOnHandAnim" Offset="0x1A08"/>
|
||||
<Animation Name="gSheikShowingTriforceOnHandIdleAnim" Offset="0x1D14"/>
|
||||
<Animation Name="gSheikPlayingHarp2Anim" Offset="0x289C"/>
|
||||
<Animation Name="gSheikPlayingHarp3Anim" Offset="0x35C8"/>
|
||||
<Animation Name="gSheikPlayingHarp4Anim" Offset="0x4570"/>
|
||||
<Animation Name="gSheikIdleAnim" Offset="0x4828"/>
|
||||
<Animation Name="gSheikWalkingAnim" Offset="0x12FD0"/>
|
||||
<Animation Name="gSheikArmsCrossedIdleAnim" Offset="0x13AA4"/>
|
||||
<Animation Name="gSheikFallingFromContortionsAnim" Offset="0x149E4"/>
|
||||
<Animation Name="gSheikContortionsAnim" Offset="0x169E8"/>
|
||||
<Animation Name="gSheikPlayingHarp5Anim" Offset="0x177F8"/>
|
||||
<Animation Name="gSheikInitialHarpAnim" Offset="0x17C54"/>
|
||||
<Animation Name="gSheikDefenseStanceAnim" Offset="0x18B00"/>
|
||||
<Animation Name="gSheikThrowingNutAnim" Offset="0x19598"/>
|
||||
<Animation Name="gSheikKneelingAnim" Offset="0x19C30"/>
|
||||
<Animation Name="gSheikHittingGroundAnim" Offset="0x19F78"/>
|
||||
<Animation Name="gSheikAnim_01A048" Offset="0x1A048"/>
|
||||
<Animation Name="gSheikPullingOutHarpAnim" Offset="0x1B19C"/>
|
||||
<Animation Name="gSheikFallingFromSkyAnim" Offset="0x1C0E8"/>
|
||||
<Texture Name="gSheikEyeOpenTex" OutName="sheik_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4CC0"/>
|
||||
<Texture Name="gSheikEyeHalfClosedTex" OutName="sheik_eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x50C0"/>
|
||||
<Texture Name="gSheikEyeShutTex" OutName="sheik_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x54C0"/>
|
||||
<Texture Name="gSheikEyeSquintingTex" OutName="sheik_eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x58C0"/>
|
||||
<DList Name="gSheikHarpDL" Offset="0x11150"/>
|
||||
<DList Name="gSheikDL_011620" Offset="0x11620"/>
|
||||
<DList Name="gSheikDL_012970" Offset="0x12970"/>
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -10,109 +10,109 @@ typedef void (*EnXcActionFunc)(struct EnXc*, GlobalContext*);
|
||||
typedef void (*EnXcDrawFunc)(struct Actor*, GlobalContext*);
|
||||
|
||||
typedef enum {
|
||||
/* 0 */ SHIEK_TYPE_0,
|
||||
/* 1 */ SHIEK_TYPE_1,
|
||||
/* 2 */ SHIEK_TYPE_2,
|
||||
/* 3 */ SHIEK_TYPE_3,
|
||||
/* 4 */ SHIEK_TYPE_4,
|
||||
/* 5 */ SHIEK_TYPE_5,
|
||||
/* 6 */ SHIEK_TYPE_MINUET,
|
||||
/* 7 */ SHIEK_TYPE_BOLERO,
|
||||
/* 8 */ SHIEK_TYPE_SERENADE,
|
||||
/* 9 */ SHIEK_TYPE_9
|
||||
/* 0 */ SHEIK_TYPE_0,
|
||||
/* 1 */ SHEIK_TYPE_1,
|
||||
/* 2 */ SHEIK_TYPE_2,
|
||||
/* 3 */ SHEIK_TYPE_3,
|
||||
/* 4 */ SHEIK_TYPE_4,
|
||||
/* 5 */ SHEIK_TYPE_5,
|
||||
/* 6 */ SHEIK_TYPE_MINUET,
|
||||
/* 7 */ SHEIK_TYPE_BOLERO,
|
||||
/* 8 */ SHEIK_TYPE_SERENADE,
|
||||
/* 9 */ SHEIK_TYPE_9
|
||||
} EnXcType;
|
||||
|
||||
typedef enum {
|
||||
/* 0 */ SHIEK_DRAW_NOTHING,
|
||||
/* 1 */ SHIEK_DRAW_DEFAULT,
|
||||
/* 2 */ SHIEK_DRAW_PULLING_OUT_HARP,
|
||||
/* 3 */ SHIEK_DRAW_HARP,
|
||||
/* 4 */ SHIEK_DRAW_TRIFORCE,
|
||||
/* 5 */ SHIEK_DRAW_SQUINT
|
||||
/* 0 */ SHEIK_DRAW_NOTHING,
|
||||
/* 1 */ SHEIK_DRAW_DEFAULT,
|
||||
/* 2 */ SHEIK_DRAW_PULLING_OUT_HARP,
|
||||
/* 3 */ SHEIK_DRAW_HARP,
|
||||
/* 4 */ SHEIK_DRAW_TRIFORCE,
|
||||
/* 5 */ SHEIK_DRAW_SQUINT
|
||||
} EnXcDrawMode;
|
||||
|
||||
typedef enum {
|
||||
/* 00 */ SHIEK_ACTION_INIT,
|
||||
/* 01 */ SHIEK_ACTION_WAIT,
|
||||
/* 02 */ SHIEK_ACTION_GRACEFUL_FALL,
|
||||
/* 03 */ SHIEK_ACTION_ACCEL,
|
||||
/* 04 */ SHIEK_ACTION_WALK,
|
||||
/* 05 */ SHIEK_ACTION_HALT,
|
||||
/* 06 */ SHIEK_ACTION_STOPPED,
|
||||
/* 07 */ SHIEK_ACTION_7,
|
||||
/* 08 */ SHIEK_ACTION_HARP_READY,
|
||||
/* 09 */ SHIEK_PLAYING_HARP,
|
||||
/* 10 */ SHIEK_ACTION_10,
|
||||
/* 11 */ SHIEK_ACTION_PUT_HARP_AWAY,
|
||||
/* 12 */ SHIEK_ACTION_12,
|
||||
/* 13 */ SHIEK_ACTION_13,
|
||||
/* 14 */ SHIEK_ACTION_REVERSE_ACCEL,
|
||||
/* 15 */ SHIEK_ACTION_REVERSE_WALK,
|
||||
/* 16 */ SHIEK_ACTION_REVERSE_HALT,
|
||||
/* 17 */ SHIEK_ACTION_THROW_NUT,
|
||||
/* 18 */ SHIEK_ACTION_DELETE,
|
||||
/* 19 */ SHIEK_ACTION_FADE,
|
||||
/* 20 */ SHIEK_ACTION_20,
|
||||
/* 21 */ SHIEK_ACTION_21,
|
||||
/* 22 */ SHIEK_ACTION_22,
|
||||
/* 23 */ SHIEK_ACTION_23,
|
||||
/* 24 */ SHIEK_ACTION_24,
|
||||
/* 25 */ SHIEK_ACTION_25,
|
||||
/* 26 */ SHIEK_ACTION_26,
|
||||
/* 27 */ SHIEK_ACTION_27,
|
||||
/* 28 */ SHIEK_ACTION_28,
|
||||
/* 29 */ SHIEK_ACTION_SERENADE,
|
||||
/* 30 */ SHIEK_ACTION_30,
|
||||
/* 31 */ SHIEK_ACTION_31,
|
||||
/* 32 */ SHIEK_ACTION_32,
|
||||
/* 33 */ SHIEK_ACTION_33,
|
||||
/* 34 */ SHIEK_ACTION_34,
|
||||
/* 35 */ SHIEK_ACTION_35,
|
||||
/* 36 */ SHIEK_ACTION_36,
|
||||
/* 37 */ SHIEK_ACTION_37,
|
||||
/* 38 */ SHIEK_ACTION_38,
|
||||
/* 39 */ SHIEK_ACTION_39,
|
||||
/* 40 */ SHIEK_ACTION_40,
|
||||
/* 41 */ SHIEK_ACTION_41,
|
||||
/* 42 */ SHIEK_ACTION_42,
|
||||
/* 43 */ SHIEK_ACTION_43,
|
||||
/* 44 */ SHIEK_ACTION_44,
|
||||
/* 45 */ SHIEK_ACTION_45,
|
||||
/* 46 */ SHIEK_ACTION_46,
|
||||
/* 47 */ SHIEK_ACTION_47,
|
||||
/* 48 */ SHIEK_ACTION_48,
|
||||
/* 49 */ SHIEK_ACTION_49,
|
||||
/* 50 */ SHIEK_SHIEK_KNEEL,
|
||||
/* 51 */ SHIEK_ACTION_51,
|
||||
/* 52 */ SHIEK_ACTION_52,
|
||||
/* 53 */ SHIEK_ACTION_53,
|
||||
/* 54 */ SHIEK_ACTION_54,
|
||||
/* 55 */ SHIEK_ACTION_SHOW_TRIFORCE,
|
||||
/* 56 */ SHIEK_ACTION_SHOW_TRIFORCE_IDLE,
|
||||
/* 57 */ SHIEK_ACTION_NOCTURNE_INIT,
|
||||
/* 58 */ SHIEK_ACTION_NOCTURNE_IDLE,
|
||||
/* 59 */ SHIEK_ACTION_DEFENSE_STANCE,
|
||||
/* 60 */ SHIEK_ACTION_CONTORT,
|
||||
/* 61 */ SHIEK_ACTION_NOCTURNE_FALL,
|
||||
/* 62 */ SHIEK_ACTION_NOCTURNE_HIT_GROUND,
|
||||
/* 63 */ SHIEK_ACTION_63,
|
||||
/* 64 */ SHIEK_ACTION_NOCTURNE_KNEEL,
|
||||
/* 65 */ SHIEK_ACTION_65,
|
||||
/* 66 */ SHIEK_ACTION_66,
|
||||
/* 67 */ SHIEK_ACTION_67,
|
||||
/* 68 */ SHIEK_ACTION_68,
|
||||
/* 69 */ SHIEK_ACTION_69,
|
||||
/* 70 */ SHIEK_ACTION_70,
|
||||
/* 71 */ SHIEK_ACTION_71,
|
||||
/* 72 */ SHIEK_ACTION_72,
|
||||
/* 73 */ SHIEK_ACTION_NOCTURNE_REVERSE_ACCEL,
|
||||
/* 74 */ SHIEK_ACTION_NOCTURNE_REVERSE_WALK,
|
||||
/* 75 */ SHIEK_ACTION_NOCTURNE_REVERSE_HALT,
|
||||
/* 76 */ SHIEK_ACTION_NOCTURNE_THROW_NUT,
|
||||
/* 77 */ SHIEK_ACTION_77,
|
||||
/* 78 */ SHIEK_ACTION_78,
|
||||
/* 79 */ SHIEK_ACTION_BLOCK_PEDESTAL,
|
||||
/* 80 */ SHIEK_ACTION_IN_DIALOGUE
|
||||
/* 00 */ SHEIK_ACTION_INIT,
|
||||
/* 01 */ SHEIK_ACTION_WAIT,
|
||||
/* 02 */ SHEIK_ACTION_GRACEFUL_FALL,
|
||||
/* 03 */ SHEIK_ACTION_ACCEL,
|
||||
/* 04 */ SHEIK_ACTION_WALK,
|
||||
/* 05 */ SHEIK_ACTION_HALT,
|
||||
/* 06 */ SHEIK_ACTION_STOPPED,
|
||||
/* 07 */ SHEIK_ACTION_7,
|
||||
/* 08 */ SHEIK_ACTION_HARP_READY,
|
||||
/* 09 */ SHEIK_PLAYING_HARP,
|
||||
/* 10 */ SHEIK_ACTION_10,
|
||||
/* 11 */ SHEIK_ACTION_PUT_HARP_AWAY,
|
||||
/* 12 */ SHEIK_ACTION_12,
|
||||
/* 13 */ SHEIK_ACTION_13,
|
||||
/* 14 */ SHEIK_ACTION_REVERSE_ACCEL,
|
||||
/* 15 */ SHEIK_ACTION_REVERSE_WALK,
|
||||
/* 16 */ SHEIK_ACTION_REVERSE_HALT,
|
||||
/* 17 */ SHEIK_ACTION_THROW_NUT,
|
||||
/* 18 */ SHEIK_ACTION_DELETE,
|
||||
/* 19 */ SHEIK_ACTION_FADE,
|
||||
/* 20 */ SHEIK_ACTION_20,
|
||||
/* 21 */ SHEIK_ACTION_21,
|
||||
/* 22 */ SHEIK_ACTION_22,
|
||||
/* 23 */ SHEIK_ACTION_23,
|
||||
/* 24 */ SHEIK_ACTION_24,
|
||||
/* 25 */ SHEIK_ACTION_25,
|
||||
/* 26 */ SHEIK_ACTION_26,
|
||||
/* 27 */ SHEIK_ACTION_27,
|
||||
/* 28 */ SHEIK_ACTION_28,
|
||||
/* 29 */ SHEIK_ACTION_SERENADE,
|
||||
/* 30 */ SHEIK_ACTION_30,
|
||||
/* 31 */ SHEIK_ACTION_31,
|
||||
/* 32 */ SHEIK_ACTION_32,
|
||||
/* 33 */ SHEIK_ACTION_33,
|
||||
/* 34 */ SHEIK_ACTION_34,
|
||||
/* 35 */ SHEIK_ACTION_35,
|
||||
/* 36 */ SHEIK_ACTION_36,
|
||||
/* 37 */ SHEIK_ACTION_37,
|
||||
/* 38 */ SHEIK_ACTION_38,
|
||||
/* 39 */ SHEIK_ACTION_39,
|
||||
/* 40 */ SHEIK_ACTION_40,
|
||||
/* 41 */ SHEIK_ACTION_41,
|
||||
/* 42 */ SHEIK_ACTION_42,
|
||||
/* 43 */ SHEIK_ACTION_43,
|
||||
/* 44 */ SHEIK_ACTION_44,
|
||||
/* 45 */ SHEIK_ACTION_45,
|
||||
/* 46 */ SHEIK_ACTION_46,
|
||||
/* 47 */ SHEIK_ACTION_47,
|
||||
/* 48 */ SHEIK_ACTION_48,
|
||||
/* 49 */ SHEIK_ACTION_49,
|
||||
/* 50 */ SHEIK_ACTION_KNEEL,
|
||||
/* 51 */ SHEIK_ACTION_51,
|
||||
/* 52 */ SHEIK_ACTION_52,
|
||||
/* 53 */ SHEIK_ACTION_53,
|
||||
/* 54 */ SHEIK_ACTION_54,
|
||||
/* 55 */ SHEIK_ACTION_SHOW_TRIFORCE,
|
||||
/* 56 */ SHEIK_ACTION_SHOW_TRIFORCE_IDLE,
|
||||
/* 57 */ SHEIK_ACTION_NOCTURNE_INIT,
|
||||
/* 58 */ SHEIK_ACTION_NOCTURNE_IDLE,
|
||||
/* 59 */ SHEIK_ACTION_DEFENSE_STANCE,
|
||||
/* 60 */ SHEIK_ACTION_CONTORT,
|
||||
/* 61 */ SHEIK_ACTION_NOCTURNE_FALL,
|
||||
/* 62 */ SHEIK_ACTION_NOCTURNE_HIT_GROUND,
|
||||
/* 63 */ SHEIK_ACTION_63,
|
||||
/* 64 */ SHEIK_ACTION_NOCTURNE_KNEEL,
|
||||
/* 65 */ SHEIK_ACTION_65,
|
||||
/* 66 */ SHEIK_ACTION_66,
|
||||
/* 67 */ SHEIK_ACTION_67,
|
||||
/* 68 */ SHEIK_ACTION_68,
|
||||
/* 69 */ SHEIK_ACTION_69,
|
||||
/* 70 */ SHEIK_ACTION_70,
|
||||
/* 71 */ SHEIK_ACTION_71,
|
||||
/* 72 */ SHEIK_ACTION_72,
|
||||
/* 73 */ SHEIK_ACTION_NOCTURNE_REVERSE_ACCEL,
|
||||
/* 74 */ SHEIK_ACTION_NOCTURNE_REVERSE_WALK,
|
||||
/* 75 */ SHEIK_ACTION_NOCTURNE_REVERSE_HALT,
|
||||
/* 76 */ SHEIK_ACTION_NOCTURNE_THROW_NUT,
|
||||
/* 77 */ SHEIK_ACTION_77,
|
||||
/* 78 */ SHEIK_ACTION_78,
|
||||
/* 79 */ SHEIK_ACTION_BLOCK_PEDESTAL,
|
||||
/* 80 */ SHEIK_ACTION_IN_DIALOGUE
|
||||
} EnXcAction;
|
||||
|
||||
typedef struct EnXc {
|
||||
|
||||
Reference in New Issue
Block a user