mirror of https://github.com/zeldaret/mm.git
object_bal & EnBal OK and documented (#1317)
* object_bal and z_en_bal initial push * Formatting, updated named audio funcs * Cleanup, labeled some week events * trying to fix merge issues * Merge, misc cleanup * Fix buildability after merge * Fixed formatting issues * static variable name fixes * Cleanup & object item renames * Formatting * Additional name cleanup * Name & comment tidying * Updated function names referenced by EnBal
This commit is contained in:
Blythe
GitHub
parent
affb1eaf0f
commit
f0ca606cd2
|
|
@ -1,81 +1,94 @@
|
|||
<Root>
|
||||
<!-- Object file for Tingle -->
|
||||
<File Name="object_bal" Segment="6">
|
||||
<Animation Name="object_bal_Anim_0005FC" Offset="0x5FC" /> <!-- Original name is "bal_fly" -->
|
||||
<Animation Name="object_bal_Anim_000840" Offset="0x840" /> <!-- Original name is "bal_fly2" -->
|
||||
<Animation Name="object_bal_Anim_000C78" Offset="0xC78" /> <!-- Original name is "bal_kaiten" ("rotation; revolution; turn; spin") -->
|
||||
<Animation Name="object_bal_Anim_001804" Offset="0x1804" /> <!-- Original name is "bal_kami" ("paper") -->
|
||||
<DList Name="object_bal_DL_004000" Offset="0x4000" />
|
||||
<DList Name="object_bal_DL_004108" Offset="0x4108" />
|
||||
<DList Name="object_bal_DL_0041E8" Offset="0x41E8" />
|
||||
<DList Name="object_bal_DL_0042A8" Offset="0x42A8" />
|
||||
<DList Name="object_bal_DL_004368" Offset="0x4368" />
|
||||
<DList Name="object_bal_DL_004448" Offset="0x4448" />
|
||||
<DList Name="object_bal_DL_004508" Offset="0x4508" />
|
||||
<DList Name="object_bal_DL_0045C8" Offset="0x45C8" />
|
||||
<DList Name="object_bal_DL_004980" Offset="0x4980" />
|
||||
<DList Name="object_bal_DL_004BA0" Offset="0x4BA0" />
|
||||
<DList Name="object_bal_DL_004CA0" Offset="0x4CA0" />
|
||||
<DList Name="object_bal_DL_004D58" Offset="0x4D58" />
|
||||
<DList Name="object_bal_DL_004E40" Offset="0x4E40" />
|
||||
<DList Name="object_bal_DL_004F00" Offset="0x4F00" />
|
||||
<DList Name="object_bal_DL_005000" Offset="0x5000" />
|
||||
<DList Name="object_bal_DL_0050F8" Offset="0x50F8" />
|
||||
<DList Name="object_bal_DL_0051E0" Offset="0x51E0" />
|
||||
<DList Name="object_bal_DL_0052A0" Offset="0x52A0" />
|
||||
<Texture Name="object_bal_TLUT_0053B0" OutName="tlut_0053B0" Format="rgba16" Width="4" Height="4" Offset="0x53B0" />
|
||||
<Texture Name="object_bal_Tex_0053D0" OutName="tex_0053D0" Format="rgba16" Width="16" Height="16" Offset="0x53D0" />
|
||||
<Texture Name="object_bal_Tex_0055D0" OutName="tex_0055D0" Format="rgba16" Width="32" Height="32" Offset="0x55D0" />
|
||||
<Texture Name="object_bal_Tex_005DD0" OutName="tex_005DD0" Format="rgba16" Width="16" Height="16" Offset="0x5DD0" />
|
||||
<Texture Name="object_bal_Tex_005FD0" OutName="tex_005FD0" Format="rgba16" Width="8" Height="8" Offset="0x5FD0" />
|
||||
<Texture Name="object_bal_Tex_006050" OutName="tex_006050" Format="rgba16" Width="32" Height="64" Offset="0x6050" />
|
||||
<Texture Name="object_bal_Tex_007050" OutName="tex_007050" Format="rgba16" Width="8" Height="8" Offset="0x7050" />
|
||||
<Texture Name="object_bal_Tex_0070D0" OutName="tex_0070D0" Format="rgba16" Width="16" Height="16" Offset="0x70D0" />
|
||||
<Texture Name="object_bal_Tex_0072D0" OutName="tex_0072D0" Format="rgba16" Width="64" Height="32" Offset="0x72D0" />
|
||||
<Texture Name="object_bal_Tex_0082D0" OutName="tex_0082D0" Format="rgba16" Width="16" Height="32" Offset="0x82D0" />
|
||||
<Texture Name="object_bal_Tex_0086D0" OutName="tex_0086D0" Format="rgba16" Width="32" Height="16" Offset="0x86D0" />
|
||||
<Texture Name="object_bal_Tex_008AD0" OutName="tex_008AD0" Format="rgba16" Width="16" Height="16" Offset="0x8AD0" />
|
||||
<Texture Name="object_bal_Tex_008CD0" OutName="tex_008CD0" Format="ci4" Width="64" Height="64" Offset="0x8CD0" />
|
||||
<Texture Name="object_bal_Tex_0094D0" OutName="tex_0094D0" Format="rgba16" Width="32" Height="64" Offset="0x94D0" />
|
||||
<Limb Name="object_bal_Standardlimb_00A4D0" Type="Standard" EnumName="OBJECT_BAL_LIMB_01" Offset="0xA4D0" />
|
||||
<Limb Name="object_bal_Standardlimb_00A4DC" Type="Standard" EnumName="OBJECT_BAL_LIMB_02" Offset="0xA4DC" />
|
||||
<Limb Name="object_bal_Standardlimb_00A4E8" Type="Standard" EnumName="OBJECT_BAL_LIMB_03" Offset="0xA4E8" />
|
||||
<Limb Name="object_bal_Standardlimb_00A4F4" Type="Standard" EnumName="OBJECT_BAL_LIMB_04" Offset="0xA4F4" />
|
||||
<Limb Name="object_bal_Standardlimb_00A500" Type="Standard" EnumName="OBJECT_BAL_LIMB_05" Offset="0xA500" />
|
||||
<Limb Name="object_bal_Standardlimb_00A50C" Type="Standard" EnumName="OBJECT_BAL_LIMB_06" Offset="0xA50C" />
|
||||
<Limb Name="object_bal_Standardlimb_00A518" Type="Standard" EnumName="OBJECT_BAL_LIMB_07" Offset="0xA518" />
|
||||
<Limb Name="object_bal_Standardlimb_00A524" Type="Standard" EnumName="OBJECT_BAL_LIMB_08" Offset="0xA524" />
|
||||
<Limb Name="object_bal_Standardlimb_00A530" Type="Standard" EnumName="OBJECT_BAL_LIMB_09" Offset="0xA530" />
|
||||
<Limb Name="object_bal_Standardlimb_00A53C" Type="Standard" EnumName="OBJECT_BAL_LIMB_0A" Offset="0xA53C" />
|
||||
<Limb Name="object_bal_Standardlimb_00A548" Type="Standard" EnumName="OBJECT_BAL_LIMB_0B" Offset="0xA548" />
|
||||
<Limb Name="object_bal_Standardlimb_00A554" Type="Standard" EnumName="OBJECT_BAL_LIMB_0C" Offset="0xA554" />
|
||||
<Limb Name="object_bal_Standardlimb_00A560" Type="Standard" EnumName="OBJECT_BAL_LIMB_0D" Offset="0xA560" />
|
||||
<Limb Name="object_bal_Standardlimb_00A56C" Type="Standard" EnumName="OBJECT_BAL_LIMB_0E" Offset="0xA56C" />
|
||||
<Limb Name="object_bal_Standardlimb_00A578" Type="Standard" EnumName="OBJECT_BAL_LIMB_0F" Offset="0xA578" />
|
||||
<Limb Name="object_bal_Standardlimb_00A584" Type="Standard" EnumName="OBJECT_BAL_LIMB_10" Offset="0xA584" />
|
||||
<Limb Name="object_bal_Standardlimb_00A590" Type="Standard" EnumName="OBJECT_BAL_LIMB_11" Offset="0xA590" />
|
||||
<Limb Name="object_bal_Standardlimb_00A59C" Type="Standard" EnumName="OBJECT_BAL_LIMB_12" Offset="0xA59C" />
|
||||
<Limb Name="object_bal_Standardlimb_00A5A8" Type="Standard" EnumName="OBJECT_BAL_LIMB_13" Offset="0xA5A8" />
|
||||
<Limb Name="object_bal_Standardlimb_00A5B4" Type="Standard" EnumName="OBJECT_BAL_LIMB_14" Offset="0xA5B4" />
|
||||
<Limb Name="object_bal_Standardlimb_00A5C0" Type="Standard" EnumName="OBJECT_BAL_LIMB_15" Offset="0xA5C0" />
|
||||
<Limb Name="object_bal_Standardlimb_00A5CC" Type="Standard" EnumName="OBJECT_BAL_LIMB_16" Offset="0xA5CC" />
|
||||
<Limb Name="object_bal_Standardlimb_00A5D8" Type="Standard" EnumName="OBJECT_BAL_LIMB_17" Offset="0xA5D8" />
|
||||
<Limb Name="object_bal_Standardlimb_00A5E4" Type="Standard" EnumName="OBJECT_BAL_LIMB_18" Offset="0xA5E4" />
|
||||
<Limb Name="object_bal_Standardlimb_00A5F0" Type="Standard" EnumName="OBJECT_BAL_LIMB_19" Offset="0xA5F0" />
|
||||
<Limb Name="object_bal_Standardlimb_00A5FC" Type="Standard" EnumName="OBJECT_BAL_LIMB_1A" Offset="0xA5FC" />
|
||||
<Limb Name="object_bal_Standardlimb_00A608" Type="Standard" EnumName="OBJECT_BAL_LIMB_1B" Offset="0xA608" />
|
||||
<Limb Name="object_bal_Standardlimb_00A614" Type="Standard" EnumName="OBJECT_BAL_LIMB_1C" Offset="0xA614" />
|
||||
<Limb Name="object_bal_Standardlimb_00A620" Type="Standard" EnumName="OBJECT_BAL_LIMB_1D" Offset="0xA620" />
|
||||
<Limb Name="object_bal_Standardlimb_00A62C" Type="Standard" EnumName="OBJECT_BAL_LIMB_1E" Offset="0xA62C" />
|
||||
<Limb Name="object_bal_Standardlimb_00A638" Type="Standard" EnumName="OBJECT_BAL_LIMB_1F" Offset="0xA638" />
|
||||
<Limb Name="object_bal_Standardlimb_00A644" Type="Standard" EnumName="OBJECT_BAL_LIMB_20" Offset="0xA644" />
|
||||
<Skeleton Name="object_bal_Skel_00A6D0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BAL_LIMB_NONE" LimbMax="OBJECT_BAL_LIMB_MAX" EnumName="ObjectBalLimb" Offset="0xA6D0" />
|
||||
<Animation Name="object_bal_Anim_00A7DC" Offset="0xA7DC" /> <!-- Original name is "bal_put" -->
|
||||
<Animation Name="object_bal_Anim_00B1E8" Offset="0xB1E8" /> <!-- Original name is "bal_talk" -->
|
||||
<Animation Name="object_bal_Anim_00B604" Offset="0xB604" /> <!-- Original name is "bal_talk2" -->
|
||||
<Animation Name="object_bal_Anim_00C498" Offset="0xC498" /> <!-- Original name is "bal_talk3" -->
|
||||
<Animation Name="object_bal_Anim_00C8D8" Offset="0xC8D8" /> <!-- Original name is "bal_talk4" -->
|
||||
<Animation Name="object_bal_Anim_00CB78" Offset="0xCB78" /> <!-- Original name is "bal_tereru" ("to be shy; to be bashful") -->
|
||||
<Animation Name="object_bal_Anim_00D530" Offset="0xD530" /> <!-- Original name is "bal_wait" -->
|
||||
|
||||
<!-- Animations 1 -->
|
||||
<Animation Name="gTingleFloatIdleAnim" Offset="0x5FC" /> <!-- Original name is "bal_fly"-->
|
||||
<Animation Name="gTingleFallAnim" Offset="0x840" /> <!-- Original name is "bal_fly2"-->
|
||||
<Animation Name="gTingleSpinAnim" Offset="0xC78" /> <!-- Original name is "bal_kaiten" ("rotation; revolution; turn; spin") -->
|
||||
<Animation Name="gTingleFloatThrowConfettiAnim" Offset="0x1804" /> <!-- Original name is "bal_kami" ("paper")-->
|
||||
|
||||
<!-- Model Pieces -->
|
||||
<DList Name="gTinglePelvisDL" Offset="0x4000" />
|
||||
<DList Name="gTingleLeftFootDL" Offset="0x4108" />
|
||||
<DList Name="gTingleLeftShinDL" Offset="0x41E8" />
|
||||
<DList Name="gTingleLeftThighDL" Offset="0x42A8" />
|
||||
<DList Name="gTingleRightFootDL" Offset="0x4368" />
|
||||
<DList Name="gTingleRightShinDL" Offset="0x4448" />
|
||||
<DList Name="gTingleRightThighDL" Offset="0x4508" />
|
||||
<DList Name="gTingleHeadDL" Offset="0x45C8" />
|
||||
<DList Name="gTingleTorsoDL" Offset="0x4980" />
|
||||
<DList Name="gTingleLeftHandDL" Offset="0x4BA0" />
|
||||
<DList Name="gTingleMapDL" Offset="0x4CA0" />
|
||||
<DList Name="gTingleLeftForearmDL" Offset="0x4D58" />
|
||||
<DList Name="gTingleLeftUpperArmDL" Offset="0x4E40" />
|
||||
<DList Name="gTingleRightHandDL" Offset="0x4F00" />
|
||||
<DList Name="gTinglePenDL" Offset="0x5000" />
|
||||
<DList Name="gTingleRightForearmDL" Offset="0x50F8" />
|
||||
<DList Name="gTingleRightUpperArmDL" Offset="0x51E0" />
|
||||
<DList Name="gTingleBalloonDL" Offset="0x52A0" />
|
||||
|
||||
<!-- Textures -->
|
||||
<Texture Name="gTingleMapTLUT" OutName="tingle_map_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53B0" />
|
||||
<Texture Name="gTingleBriefsTex" OutName="tingle_briefs" Format="rgba16" Width="16" Height="16" Offset="0x53D0" />
|
||||
<Texture Name="gTingleTopFrontTex" OutName="tingle_top" Format="rgba16" Width="32" Height="32" Offset="0x55D0" />
|
||||
<Texture Name="gTingleBalloonTex" OutName="tingle_balloon" Format="rgba16" Width="16" Height="16" Offset="0x5DD0" />
|
||||
<Texture Name="gTingleBackpackTex" OutName="tingle_backpack" Format="rgba16" Width="8" Height="8" Offset="0x5FD0" />
|
||||
<Texture Name="gTingleEyeOpenTex" OutName="tingle_eye_open" Format="rgba16" Width="32" Height="64" Offset="0x6050" />
|
||||
<Texture Name="gTingleBodysuitTex" OutName="tingle_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x7050" />
|
||||
<Texture Name="gTingleNostrilTex" OutName="tingle_nostril" Format="rgba16" Width="16" Height="16" Offset="0x70D0" />
|
||||
<Texture Name="gTingleMouthTex" OutName="tingle_mouth" Format="rgba16" Width="64" Height="32" Offset="0x72D0" />
|
||||
<Texture Name="gTingleNoseSideTex" OutName="tingle_nose" Format="rgba16" Width="16" Height="32" Offset="0x82D0" />
|
||||
<Texture Name="gTingleHandTex" OutName="tingle_hand" Format="rgba16" Width="32" Height="16" Offset="0x86D0" />
|
||||
<Texture Name="gTinglePenTopTex" OutName="tingle_pen_top" Format="rgba16" Width="16" Height="16" Offset="0x8AD0" />
|
||||
<Texture Name="gTingleMapTex" OutName="tingle_map" Format="ci4" Width="64" Height="64" Offset="0x8CD0" />
|
||||
<Texture Name="gTingleEyeClosedTex" OutName="tingle_eye_closed" Format="rgba16" Width="32" Height="64" Offset="0x94D0" />
|
||||
|
||||
<!-- Skeleton -->
|
||||
<Limb Name="gTingleRootLimb" Type="Standard" EnumName="TINGLE_LIMB_ROOT" Offset="0xA4D0" />
|
||||
<Limb Name="gTinglePelvisLimb" Type="Standard" EnumName="TINGLE_LIMB_PELVIS" Offset="0xA4DC" />
|
||||
<Limb Name="gTingleUpperBodyRootLimb" Type="Standard" EnumName="TINGLE_LIMB_UPPER_BODY_ROOT" Offset="0xA4E8" />
|
||||
<Limb Name="gTingleUpperBodyWrapperLimb" Type="Standard" EnumName="TINGLE_LIMB_UPPER_BODY_WRAPPER" Offset="0xA4F4" />
|
||||
<Limb Name="gTingleBalloonRootLimb" Type="Standard" EnumName="TINGLE_LIMB_BALLOON_ROOT" Offset="0xA500" />
|
||||
<Limb Name="gTingleBalloonLimb" Type="Standard" EnumName="TINGLE_LIMB_BALLOON" Offset="0xA50C" />
|
||||
<Limb Name="gTingleRightArmRootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_ARM_ROOT" Offset="0xA518" />
|
||||
<Limb Name="gTingleRightArmWrapperLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_ARM_WRAPPER" Offset="0xA524" />
|
||||
<Limb Name="gTingleRightUpperArmLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_UPPER_ARM" Offset="0xA530" />
|
||||
<Limb Name="gTingleRightForearmLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_FOREARM" Offset="0xA53C" />
|
||||
<Limb Name="gTingleRightHandRootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_HAND_ROOT" Offset="0xA548" />
|
||||
<Limb Name="gTingleRightHandLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_HAND" Offset="0xA554" />
|
||||
<Limb Name="gTingleHeldPenLimb" Type="Standard" EnumName="TINGLE_LIMB_HELD_PEN" Offset="0xA560" />
|
||||
<Limb Name="gTingleLeftArmRootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_ARM_ROOT" Offset="0xA56C" />
|
||||
<Limb Name="gTingleLeftArmWrapperLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_ARM_WRAPPER" Offset="0xA578" />
|
||||
<Limb Name="gTingleLeftUpperArmLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_UPPER_ARM" Offset="0xA584" />
|
||||
<Limb Name="gTingleLeftForearmLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_FOREARM" Offset="0xA590" />
|
||||
<Limb Name="gTingleLeftHandRootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_HAND_ROOT" Offset="0xA59C" />
|
||||
<Limb Name="gTingleLeftHandLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_HAND" Offset="0xA5A8" />
|
||||
<Limb Name="gTingleHeldMapLimb" Type="Standard" EnumName="TINGLE_LIMB_HELD_MAP" Offset="0xA5B4" />
|
||||
<Limb Name="gTingleTorsoLimb" Type="Standard" EnumName="TINGLE_LIMB_TORSO" Offset="0xA5C0" />
|
||||
<Limb Name="gTingleHeadLimb" Type="Standard" EnumName="TINGLE_LIMB_HEAD" Offset="0xA5CC" />
|
||||
<Limb Name="gTingleRightLegRootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_LEG_ROOT" Offset="0xA5D8" />
|
||||
<Limb Name="gTingleRightThighLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_THIGH" Offset="0xA5E4" />
|
||||
<Limb Name="gTingleRightLowerLegRootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_LOWER_LEG_ROOT" Offset="0xA5F0" />
|
||||
<Limb Name="gTingleRightShinLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_SHIN" Offset="0xA5FC" />
|
||||
<Limb Name="gTingleRightFootLimb" Type="Standard" EnumName="TINGLE_LIMB_RIGHT_FOOT" Offset="0xA608" />
|
||||
<Limb Name="gTingleLeftLegRootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_LEG_ROOT" Offset="0xA614" />
|
||||
<Limb Name="gTingleLeftThighLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_THIGH" Offset="0xA620" />
|
||||
<Limb Name="gTingleLeftLowerLegRootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_LOWER_LEG_ROOT" Offset="0xA62C" />
|
||||
<Limb Name="gTingleLeftShinLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_SHIN" Offset="0xA638" />
|
||||
<Limb Name="gTingleLeftFootLimb" Type="Standard" EnumName="TINGLE_LIMB_LEFT_FOOT" Offset="0xA644" />
|
||||
<Skeleton Name="gTingleSkel" Type="Flex" LimbType="Standard" LimbNone="TINGLE_LIMB_NONE" LimbMax="TINGLE_LIMB_MAX" EnumName="TingleLimb" Offset="0xA6D0" />
|
||||
|
||||
<!-- Animations 2 -->
|
||||
<Animation Name="gTingleLandAnim" Offset="0xA7DC" /> <!-- Original name is "bal_put"-->
|
||||
<Animation Name="gTingleTwistAnim" Offset="0xB1E8" /> <!-- Original name is "bal_talk" -->
|
||||
<Animation Name="gTingleTalkAnim" Offset="0xB604" /> <!-- Original name is "bal_talk2" -->
|
||||
<Animation Name="gTingleThrowConfettiAnim" Offset="0xC498" /> <!-- Original name is "bal_talk3" -->
|
||||
<Animation Name="gTingleHappyDanceAnim" Offset="0xC8D8" /> <!-- Original name is "bal_talk4" -->
|
||||
<Animation Name="gTingleFloatHideFaceAnim" Offset="0xCB78" /> <!-- Original name is "bal_tereru" ("to be shy; to be bashful") -->
|
||||
<Animation Name="gTingleIdleAnim" Offset="0xD530" /> <!-- Original name is "bal_wait" -->
|
||||
|
||||
<!-- Misc. -->
|
||||
<DList Name="gTingleConfettiDL" Offset="0xD5A0" /> <!-- Original name is "bal_cube32_model" -->
|
||||
</File>
|
||||
</Root>
|
||||
|
|
|
|||
|
|
@ -622,7 +622,7 @@ typedef enum {
|
|||
#define WEEKEVENTREG_09_20 PACK_WEEKEVENTREG_FLAG(9, 0x20)
|
||||
#define WEEKEVENTREG_09_40 PACK_WEEKEVENTREG_FLAG(9, 0x40)
|
||||
#define WEEKEVENTREG_09_80 PACK_WEEKEVENTREG_FLAG(9, 0x80)
|
||||
#define WEEKEVENTREG_10_01 PACK_WEEKEVENTREG_FLAG(10, 0x01)
|
||||
#define WEEKEVENTREG_TALKED_TINGLE PACK_WEEKEVENTREG_FLAG(10, 0x01)
|
||||
#define WEEKEVENTREG_10_02 PACK_WEEKEVENTREG_FLAG(10, 0x02)
|
||||
#define WEEKEVENTREG_10_04 PACK_WEEKEVENTREG_FLAG(10, 0x04)
|
||||
#define WEEKEVENTREG_10_08 PACK_WEEKEVENTREG_FLAG(10, 0x08)
|
||||
|
|
@ -888,17 +888,20 @@ typedef enum {
|
|||
// Cremia did Milk Run alone. Player didn't interact or didn't accept the ride
|
||||
#define WEEKEVENTREG_34_80 PACK_WEEKEVENTREG_FLAG(34, 0x80)
|
||||
|
||||
#define WEEKEVENTREG_35_01 PACK_WEEKEVENTREG_FLAG(35, 0x01)
|
||||
#define WEEKEVENTREG_35_02 PACK_WEEKEVENTREG_FLAG(35, 0x02)
|
||||
#define WEEKEVENTREG_35_04 PACK_WEEKEVENTREG_FLAG(35, 0x04)
|
||||
#define WEEKEVENTREG_35_08 PACK_WEEKEVENTREG_FLAG(35, 0x08)
|
||||
#define WEEKEVENTREG_35_10 PACK_WEEKEVENTREG_FLAG(35, 0x10)
|
||||
#define WEEKEVENTREG_35_20 PACK_WEEKEVENTREG_FLAG(35, 0x20)
|
||||
// Bought each possible map from Tingle
|
||||
#define WEEKEVENTREG_TINGLE_MAP_BOUGHT_CLOCK_TOWN PACK_WEEKEVENTREG_FLAG(35, 0x01)
|
||||
#define WEEKEVENTREG_TINGLE_MAP_BOUGHT_WOODFALL PACK_WEEKEVENTREG_FLAG(35, 0x02)
|
||||
#define WEEKEVENTREG_TINGLE_MAP_BOUGHT_SNOWHEAD PACK_WEEKEVENTREG_FLAG(35, 0x04)
|
||||
#define WEEKEVENTREG_TINGLE_MAP_BOUGHT_ROMANI_RANCH PACK_WEEKEVENTREG_FLAG(35, 0x08)
|
||||
#define WEEKEVENTREG_TINGLE_MAP_BOUGHT_GREAT_BAY PACK_WEEKEVENTREG_FLAG(35, 0x10)
|
||||
#define WEEKEVENTREG_TINGLE_MAP_BOUGHT_STONE_TOWER PACK_WEEKEVENTREG_FLAG(35, 0x20)
|
||||
|
||||
#define WEEKEVENTREG_35_40 PACK_WEEKEVENTREG_FLAG(35, 0x40)
|
||||
|
||||
// Obtained Heart Piece from Five Frogs of the Frog Choir
|
||||
#define WEEKEVENTREG_35_80 PACK_WEEKEVENTREG_FLAG(35, 0x80)
|
||||
|
||||
// Player has spoken to certain shrine gorons in the winter
|
||||
#define WEEKEVENTREG_36_01 PACK_WEEKEVENTREG_FLAG(36, 0x01)
|
||||
#define WEEKEVENTREG_36_02 PACK_WEEKEVENTREG_FLAG(36, 0x02)
|
||||
#define WEEKEVENTREG_36_04 PACK_WEEKEVENTREG_FLAG(36, 0x04)
|
||||
|
|
@ -910,6 +913,7 @@ typedef enum {
|
|||
#define WEEKEVENTREG_37_01 PACK_WEEKEVENTREG_FLAG(37, 0x01)
|
||||
#define WEEKEVENTREG_37_02 PACK_WEEKEVENTREG_FLAG(37, 0x02)
|
||||
#define WEEKEVENTREG_37_04 PACK_WEEKEVENTREG_FLAG(37, 0x04)
|
||||
|
||||
#define WEEKEVENTREG_37_08 PACK_WEEKEVENTREG_FLAG(37, 0x08)
|
||||
#define WEEKEVENTREG_37_10 PACK_WEEKEVENTREG_FLAG(37, 0x10)
|
||||
#define WEEKEVENTREG_37_20 PACK_WEEKEVENTREG_FLAG(37, 0x20)
|
||||
|
|
@ -1095,8 +1099,12 @@ typedef enum {
|
|||
#define WEEKEVENTREG_64_01 PACK_WEEKEVENTREG_FLAG(64, 0x01)
|
||||
#define WEEKEVENTREG_64_02 PACK_WEEKEVENTREG_FLAG(64, 0x02)
|
||||
#define WEEKEVENTREG_64_04 PACK_WEEKEVENTREG_FLAG(64, 0x04)
|
||||
#define WEEKEVENTREG_64_08 PACK_WEEKEVENTREG_FLAG(64, 0x08)
|
||||
#define WEEKEVENTREG_64_10 PACK_WEEKEVENTREG_FLAG(64, 0x10)
|
||||
|
||||
// Two-bit field storing player form when first talked to Tingle that cycle
|
||||
// 0 - Zora, 1 - Deku, 2 - Goron, 3 - Human
|
||||
#define WEEKEVENTREG_TINGLE_RECOGNIZED_PLAYER_FORM_LOW_BIT PACK_WEEKEVENTREG_FLAG(64, 0x08)
|
||||
#define WEEKEVENTREG_TINGLE_RECOGNIZED_PLAYER_FORM_HIGH_BIT PACK_WEEKEVENTREG_FLAG(64, 0x10)
|
||||
|
||||
#define WEEKEVENTREG_64_20 PACK_WEEKEVENTREG_FLAG(64, 0x20)
|
||||
#define WEEKEVENTREG_64_40 PACK_WEEKEVENTREG_FLAG(64, 0x40)
|
||||
#define WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_DAY_1 PACK_WEEKEVENTREG_FLAG(64, 0x80)
|
||||
|
|
|
|||
3
spec
3
spec
|
|
@ -2810,8 +2810,7 @@ beginseg
|
|||
name "ovl_En_Bal"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_En_Bal/z_en_bal.o"
|
||||
include "build/data/ovl_En_Bal/ovl_En_Bal.data.o"
|
||||
include "build/data/ovl_En_Bal/ovl_En_Bal.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_Bal/ovl_En_Bal_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
|
|
|||
|
|
@ -117,9 +117,12 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
|
|||
/* 33 */ 0,
|
||||
/* 34 */ 0,
|
||||
/* 35 */
|
||||
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_35_01) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_35_02) |
|
||||
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_35_04) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_35_08) |
|
||||
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_35_10) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_35_20) |
|
||||
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_CLOCK_TOWN) |
|
||||
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_WOODFALL) |
|
||||
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_SNOWHEAD) |
|
||||
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_ROMANI_RANCH) |
|
||||
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_GREAT_BAY) |
|
||||
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_STONE_TOWER) |
|
||||
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_35_80),
|
||||
/* 36 */ 0,
|
||||
/* 37 */ 0,
|
||||
|
|
|
|||
|
|
@ -30,40 +30,41 @@ ActorInit Dm_Bal_InitVars = {
|
|||
(ActorFunc)DmBal_Draw,
|
||||
};
|
||||
|
||||
// These animations are the same and in the same order as in the main NPC actor EnBal
|
||||
typedef enum {
|
||||
/* -1 */ DMBAL_ANIM_NONE = -1,
|
||||
/* 0x0 */ DMBAL_ANIM_0,
|
||||
/* 0x1 */ DMBAL_ANIM_1,
|
||||
/* 0x2 */ DMBAL_ANIM_2,
|
||||
/* 0x3 */ DMBAL_ANIM_3,
|
||||
/* 0x4 */ DMBAL_ANIM_4,
|
||||
/* 0x5 */ DMBAL_ANIM_5,
|
||||
/* 0x6 */ DMBAL_ANIM_6,
|
||||
/* 0x7 */ DMBAL_ANIM_7,
|
||||
/* 0x8 */ DMBAL_ANIM_8,
|
||||
/* 0x9 */ DMBAL_ANIM_9,
|
||||
/* 0xA */ DMBAL_ANIM_10,
|
||||
/* 0xB */ DMBAL_ANIM_11,
|
||||
/* 0xC */ DMBAL_ANIM_12,
|
||||
/* 0xD */ DMBAL_ANIM_13,
|
||||
/* 0xE */ DMBAL_ANIM_MAX
|
||||
} DmBalAnimation;
|
||||
/* -1 */ TINGLE_CS_ANIM_NONE = -1,
|
||||
/* 0x0 */ TINGLE_CS_ANIM_FLOAT_IDLE,
|
||||
/* 0x1 */ TINGLE_CS_ANIM_FALL_LOOP,
|
||||
/* 0x2 */ TINGLE_CS_ANIM_FALL_ONCE,
|
||||
/* 0x3 */ TINGLE_CS_ANIM_LAND,
|
||||
/* 0x4 */ TINGLE_CS_ANIM_TWIST,
|
||||
/* 0x5 */ TINGLE_CS_ANIM_TALK,
|
||||
/* 0x6 */ TINGLE_CS_ANIM_MAGIC,
|
||||
/* 0x7 */ TINGLE_CS_ANIM_HAPPY_DANCE_LOOP,
|
||||
/* 0x8 */ TINGLE_CS_ANIM_HAPPY_DANCE_ONCE,
|
||||
/* 0x9 */ TINGLE_CS_ANIM_MAGIC_REVERSE,
|
||||
/* 0xA */ TINGLE_CS_ANIM_IDLE,
|
||||
/* 0xB */ TINGLE_CS_ANIM_SPIN,
|
||||
/* 0xC */ TINGLE_CS_ANIM_HIDE_FACE,
|
||||
/* 0xD */ TINGLE_CS_ANIM_CONFETTI,
|
||||
/* 0xE */ TINGLE_CS_ANIM_MAX
|
||||
} TingleCsAnimation;
|
||||
|
||||
static AnimationInfo sAnimationInfo[DMBAL_ANIM_MAX] = {
|
||||
{ &object_bal_Anim_0005FC, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f }, // DMBAL_ANIM_0
|
||||
{ &object_bal_Anim_000840, 1.5f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f }, // DMBAL_ANIM_1
|
||||
{ &object_bal_Anim_000840, 1.5f, 0.0f, 0.0f, ANIMMODE_ONCE, -4.0f }, // DMBAL_ANIM_2
|
||||
{ &object_bal_Anim_00A7DC, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -4.0f }, // DMBAL_ANIM_3
|
||||
{ &object_bal_Anim_00B1E8, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f }, // DMBAL_ANIM_4
|
||||
{ &object_bal_Anim_00B604, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f }, // DMBAL_ANIM_5
|
||||
{ &object_bal_Anim_00C498, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -8.0f }, // DMBAL_ANIM_6
|
||||
{ &object_bal_Anim_00C8D8, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f }, // DMBAL_ANIM_7
|
||||
{ &object_bal_Anim_00C8D8, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -8.0f }, // DMBAL_ANIM_8
|
||||
{ &object_bal_Anim_00C498, 1.0f, 23.0f, 0.0f, ANIMMODE_ONCE, -8.0f }, // DMBAL_ANIM_9
|
||||
{ &object_bal_Anim_00D530, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f }, // DMBAL_ANIM_10
|
||||
{ &object_bal_Anim_000C78, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -2.0f }, // DMBAL_ANIM_11
|
||||
{ &object_bal_Anim_00CB78, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -2.0f }, // DMBAL_ANIM_12
|
||||
{ &object_bal_Anim_001804, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -2.0f }, // DMBAL_ANIM_13
|
||||
static AnimationInfo sAnimationInfo[TINGLE_CS_ANIM_MAX] = {
|
||||
{ &gTingleFloatIdleAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f }, // TINGLE_CS_ANIM_FLOAT_IDLE
|
||||
{ &gTingleFallAnim, 1.5f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f }, // TINGLE_CS_ANIM_FALL_LOOP
|
||||
{ &gTingleFallAnim, 1.5f, 0.0f, 0.0f, ANIMMODE_ONCE, -4.0f }, // TINGLE_CS_ANIM_FALL_ONCE
|
||||
{ &gTingleLandAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -4.0f }, // TINGLE_CS_ANIM_LAND
|
||||
{ &gTingleTwistAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f }, // TINGLE_CS_ANIM_TWIST
|
||||
{ &gTingleTalkAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f }, // TINGLE_CS_ANIM_TALK
|
||||
{ &gTingleThrowConfettiAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -8.0f }, // TINGLE_CS_ANIM_MAGIC
|
||||
{ &gTingleHappyDanceAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f }, // TINGLE_CS_ANIM_HAPPY_DANCE_LOOP
|
||||
{ &gTingleHappyDanceAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -8.0f }, // TINGLE_CS_ANIM_HAPPY_DANCE_ONCE
|
||||
{ &gTingleThrowConfettiAnim, 1.0f, 23.0f, 0.0f, ANIMMODE_ONCE, -8.0f }, // TINGLE_CS_ANIM_MAGIC_REVERSE
|
||||
{ &gTingleIdleAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f }, // TINGLE_CS_ANIM_IDLE
|
||||
{ &gTingleSpinAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -2.0f }, // TINGLE_CS_ANIM_SPIN
|
||||
{ &gTingleFloatHideFaceAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -2.0f }, // TINGLE_CS_ANIM_HIDE_FACE
|
||||
{ &gTingleFloatThrowConfettiAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -2.0f }, // TINGLE_CS_ANIM_CONFETTI
|
||||
};
|
||||
|
||||
void DmBal_Init(Actor* thisx, PlayState* play) {
|
||||
|
|
@ -73,8 +74,8 @@ void DmBal_Init(Actor* thisx, PlayState* play) {
|
|||
this->actor.uncullZoneForward = 3000.0f;
|
||||
Actor_SetScale(&this->actor, 0.02f);
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
|
||||
SkelAnime_InitFlex(play, &this->skelAnime, &object_bal_Skel_00A6D0, &object_bal_Anim_0005FC, this->jointTable,
|
||||
this->morphTable, OBJECT_BAL_LIMB_MAX);
|
||||
SkelAnime_InitFlex(play, &this->skelAnime, &gTingleSkel, &gTingleFloatIdleAnim, this->jointTable, this->morphTable,
|
||||
TINGLE_LIMB_MAX);
|
||||
Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_4);
|
||||
this->timer = 60;
|
||||
this->eyeIndex = 0;
|
||||
|
|
@ -105,16 +106,16 @@ void DmBal_HandleCutscene(DmBal* this, PlayState* play) {
|
|||
case 1:
|
||||
this->keepEyesShut = false;
|
||||
this->eyeIndex = 0;
|
||||
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, DMBAL_ANIM_0);
|
||||
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, TINGLE_CS_ANIM_FLOAT_IDLE);
|
||||
break;
|
||||
|
||||
case 2:
|
||||
this->keepEyesShut = true;
|
||||
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, DMBAL_ANIM_12);
|
||||
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, TINGLE_CS_ANIM_HIDE_FACE);
|
||||
break;
|
||||
|
||||
case 3:
|
||||
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, DMBAL_ANIM_13);
|
||||
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, TINGLE_CS_ANIM_CONFETTI);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -176,7 +177,7 @@ void DmBal_Update(Actor* thisx, PlayState* play) {
|
|||
DmBal* this = THIS;
|
||||
|
||||
// Throw confetti
|
||||
if (Animation_OnFrame(&this->skelAnime, 29.0f) && (this->skelAnime.animation == &object_bal_Anim_001804)) {
|
||||
if (Animation_OnFrame(&this->skelAnime, 29.0f) && (this->skelAnime.animation == &gTingleFloatThrowConfettiAnim)) {
|
||||
Vec3f pos = this->actor.world.pos;
|
||||
Vec3f vel = { 0.0f, 9.0f, 0.0f };
|
||||
|
||||
|
|
@ -199,7 +200,7 @@ s32 DmBal_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p
|
|||
DmBal* this = THIS;
|
||||
Vec3s rots;
|
||||
|
||||
if (limbIndex == OBJECT_BAL_LIMB_06) {
|
||||
if (limbIndex == TINGLE_LIMB_BALLOON) {
|
||||
rots.x = Math_SinS(this->unk_33A) * (0x10000 / 18);
|
||||
rots.z = Math_CosS(this->unk_33A) * (0x10000 / 18);
|
||||
Matrix_RotateZYX(rots.x, 0, rots.z, MTXMODE_APPLY);
|
||||
|
|
@ -213,7 +214,7 @@ s32 DmBal_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p
|
|||
void DmBal_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
|
||||
}
|
||||
|
||||
static TexturePtr sEyeTextures[] = { object_bal_Tex_006050, object_bal_Tex_0094D0 };
|
||||
static TexturePtr sEyeTextures[] = { gTingleEyeOpenTex, gTingleEyeClosedTex };
|
||||
|
||||
void DmBal_Draw(Actor* thisx, PlayState* play) {
|
||||
DmBal* this = THIS;
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ typedef struct DmBal {
|
|||
/* 0x188 */ DmBalActionFunc actionFunc;
|
||||
/* 0x18C */ Vec3f scale;
|
||||
/* 0x198 */ s32 eyeIndex;
|
||||
/* 0x262 */ Vec3s jointTable[OBJECT_BAL_LIMB_MAX];
|
||||
/* 0x19C */ Vec3s morphTable[OBJECT_BAL_LIMB_MAX];
|
||||
/* 0x262 */ Vec3s jointTable[TINGLE_LIMB_MAX];
|
||||
/* 0x19C */ Vec3s morphTable[TINGLE_LIMB_MAX];
|
||||
/* 0x328 */ UNK_TYPE1 pad_328[12];
|
||||
/* 0x334 */ s16 timer;
|
||||
/* 0x336 */ s16 keepEyesShut;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -3,6 +3,9 @@
|
|||
|
||||
#include "global.h"
|
||||
#include "z64snap.h"
|
||||
#include "objects/object_bal/object_bal.h"
|
||||
|
||||
#define TINGLE_GET_MAP_ID(thisx) ((thisx)->params & 0xFF)
|
||||
|
||||
struct EnBal;
|
||||
|
||||
|
|
@ -10,9 +13,30 @@ typedef void (*EnBalActionFunc)(struct EnBal*, PlayState*);
|
|||
|
||||
typedef struct EnBal {
|
||||
/* 0x000 */ PictoActor picto;
|
||||
/* 0x148 */ char unk_148[0x44];
|
||||
/* 0x148 */ SkelAnime skelAnime;
|
||||
/* 0x18C */ EnBalActionFunc actionFunc;
|
||||
/* 0x190 */ char unk_190[0x224];
|
||||
} EnBal; // size = 0x3B4
|
||||
/* 0x190 */ ColliderJntSph collider;
|
||||
/* 0x1B0 */ ColliderJntSphElement colliderElements[1];
|
||||
/* 0x1F0 */ Vec3f balloonScale;
|
||||
/* 0x1FC */ s32 eyeTexIndex;
|
||||
/* 0x200 */ Vec3s jointTable[TINGLE_LIMB_MAX];
|
||||
/* 0x2C6 */ Vec3s morphTable[TINGLE_LIMB_MAX];
|
||||
/* 0x38C */ Vec3s headRot;
|
||||
/* 0x392 */ Vec3s torsoRot;
|
||||
/* 0x398 */ s16 eyeTimer;
|
||||
/* 0x39A */ s16 forceEyesShut;
|
||||
/* 0x39C */ s16 watchTarget;
|
||||
/* 0x39E */ s16 skyFloatPhase;
|
||||
/* 0x3A0 */ s16 textId;
|
||||
/* 0x3A2 */ UNK_TYPE1 unk3A2[0x2];
|
||||
/* 0x3A4 */ s16 balloonAction;
|
||||
/* 0x3A6 */ s16 idleAnimStage;
|
||||
/* 0x3A8 */ s16 timer;
|
||||
/* 0x3AA */ UNK_TYPE1 unk3AA[0x2];
|
||||
/* 0x3AC */ s16 purchaseMapId;
|
||||
/* 0x3AE */ s16 locationMapId;
|
||||
/* 0x3B0 */ s16 inflateEarly;
|
||||
/* 0x3B2 */ u8 isTalking;
|
||||
} EnBal; /* size = 0x3B4 */
|
||||
|
||||
#endif // Z_EN_BAL_H
|
||||
|
|
|
|||
|
|
@ -10758,42 +10758,42 @@
|
|||
0x80A614C4:("EnDyExtra_Draw",),
|
||||
0x80A61810:("EnBal_Init",),
|
||||
0x80A619EC:("EnBal_Destroy",),
|
||||
0x80A61A18:("func_80A61A18",),
|
||||
0x80A61A44:("func_80A61A44",),
|
||||
0x80A61A18:("EnBal_SetMainColliderToBalloon",),
|
||||
0x80A61A44:("EnBal_SetMainColliderToHead",),
|
||||
0x80A61A6C:("EnBal_ValidatePictograph",),
|
||||
0x80A61ADC:("func_80A61ADC",),
|
||||
0x80A61B5C:("func_80A61B5C",),
|
||||
0x80A61C9C:("func_80A61C9C",),
|
||||
0x80A61CE4:("func_80A61CE4",),
|
||||
0x80A61DF8:("func_80A61DF8",),
|
||||
0x80A61E5C:("func_80A61E5C",),
|
||||
0x80A62128:("func_80A62128",),
|
||||
0x80A621C4:("func_80A621C4",),
|
||||
0x80A62260:("func_80A62260",),
|
||||
0x80A622A0:("func_80A622A0",),
|
||||
0x80A623CC:("func_80A623CC",),
|
||||
0x80A624DC:("func_80A624DC",),
|
||||
0x80A62818:("func_80A62818",),
|
||||
0x80A62830:("func_80A62830",),
|
||||
0x80A629C4:("func_80A629C4",),
|
||||
0x80A62AC4:("func_80A62AC4",),
|
||||
0x80A62B30:("func_80A62B30",),
|
||||
0x80A62B78:("func_80A62B78",),
|
||||
0x80A62CF0:("func_80A62CF0",),
|
||||
0x80A62DCC:("func_80A62DCC",),
|
||||
0x80A62ED0:("func_80A62ED0",),
|
||||
0x80A62FAC:("func_80A62FAC",),
|
||||
0x80A63158:("func_80A63158",),
|
||||
0x80A634B4:("func_80A634B4",),
|
||||
0x80A634C8:("func_80A634C8",),
|
||||
0x80A635DC:("func_80A635DC",),
|
||||
0x80A635F0:("func_80A635F0",),
|
||||
0x80A636AC:("func_80A636AC",),
|
||||
0x80A637FC:("func_80A637FC",),
|
||||
0x80A63884:("func_80A63884",),
|
||||
0x80A61ADC:("EnBal_SetupFloatIdle",),
|
||||
0x80A61B5C:("EnBal_FloatIdle",),
|
||||
0x80A61C9C:("EnBal_SetupPopBalloon",),
|
||||
0x80A61CE4:("EnBal_PopBalloon",),
|
||||
0x80A61DF8:("EnBal_SetupFall",),
|
||||
0x80A61E5C:("EnBal_Fall",),
|
||||
0x80A62128:("EnBal_SetupInflateBalloon",),
|
||||
0x80A621C4:("EnBal_InflateBalloon",),
|
||||
0x80A62260:("EnBal_SetupFloatUp",),
|
||||
0x80A622A0:("EnBal_FloatUp",),
|
||||
0x80A623CC:("EnBal_SetupGroundIdle",),
|
||||
0x80A624DC:("EnBal_GroundIdle",),
|
||||
0x80A62818:("EnBal_SetupTalk",),
|
||||
0x80A62830:("EnBal_Talk",),
|
||||
0x80A629C4:("EnBal_UpdateShadow",),
|
||||
0x80A62AC4:("EnBal_SetRecognizedPlayerForm",),
|
||||
0x80A62B30:("EnBal_GetRecognizedPlayerForm",),
|
||||
0x80A62B78:("EnBal_ThrowMagicSparkles",),
|
||||
0x80A62CF0:("EnBal_EmitDustPuff",),
|
||||
0x80A62DCC:("EnBal_CheckIfMapUnlocked",),
|
||||
0x80A62ED0:("EnBal_UnlockSelectedAreaMap",),
|
||||
0x80A62FAC:("EnBal_TryPurchaseMap",),
|
||||
0x80A63158:("EnBal_HandleConversation",),
|
||||
0x80A634B4:("EnBal_SetupOfferGetItem",),
|
||||
0x80A634C8:("EnBal_OfferGetItem",),
|
||||
0x80A635DC:("EnBal_SetupThankYou",),
|
||||
0x80A635F0:("EnBal_ThankYou",),
|
||||
0x80A636AC:("EnBal_UpdateHead",),
|
||||
0x80A637FC:("EnBal_UpdateCollision",),
|
||||
0x80A63884:("EnBal_TryBalloonPopped",),
|
||||
0x80A63914:("EnBal_Update",),
|
||||
0x80A63A10:("func_80A63A10",),
|
||||
0x80A63B94:("func_80A63B94",),
|
||||
0x80A63A10:("EnBal_OverrideLimbDraw",),
|
||||
0x80A63B94:("EnBal_PostLimbDraw",),
|
||||
0x80A63BEC:("EnBal_Draw",),
|
||||
0x80A644A0:("EnGinkoMan_Init",),
|
||||
0x80A64544:("EnGinkoMan_Destroy",),
|
||||
|
|
|
|||
|
|
@ -11779,30 +11779,25 @@
|
|||
0x80A61794:("D_80A61794","f32","",0x4),
|
||||
0x80A61798:("D_80A61798","f32","",0x4),
|
||||
0x80A6179C:("D_80A6179C","f32","",0x4),
|
||||
0x80A63CC0:("En_Bal_InitVars","UNK_TYPE1","",0x1),
|
||||
0x80A63CE0:("D_80A63CE0","UNK_TYPE1","",0x1),
|
||||
0x80A63D00:("D_80A63D00","UNK_PTR","",0x4),
|
||||
0x80A63D0C:("D_80A63D0C","UNK_TYPE1","",0x1),
|
||||
0x80A63D30:("D_80A63D30","UNK_TYPE1","",0x1),
|
||||
0x80A63D40:("D_80A63D40","UNK_TYPE1","",0x1),
|
||||
0x80A63D58:("D_80A63D58","UNK_PTR","",0x4),
|
||||
0x80A63EA8:("D_80A63EA8","UNK_TYPE4","",0x4),
|
||||
0x80A63EB4:("D_80A63EB4","f32","",0x4),
|
||||
0x80A63EB8:("D_80A63EB8","f32","",0x4),
|
||||
0x80A63EBC:("D_80A63EBC","f32","",0x4),
|
||||
0x80A63EC0:("D_80A63EC0","UNK_TYPE1","",0x1),
|
||||
0x80A63EC4:("D_80A63EC4","f32","",0x4),
|
||||
0x80A63ECC:("D_80A63ECC","UNK_TYPE1","",0x1),
|
||||
0x80A63ED0:("D_80A63ED0","UNK_TYPE1","",0x1),
|
||||
0x80A63ED4:("D_80A63ED4","f32","",0x4),
|
||||
0x80A63ED8:("D_80A63ED8","f32","",0x4),
|
||||
0x80A63EDC:("D_80A63EDC","f32","",0x4),
|
||||
0x80A63EE0:("D_80A63EE0","UNK_TYPE1","",0x1),
|
||||
0x80A63EEC:("D_80A63EEC","UNK_TYPE1","",0x1),
|
||||
0x80A63EF0:("D_80A63EF0","UNK_TYPE1","",0x1),
|
||||
0x80A63EF4:("D_80A63EF4","UNK_TYPE4","",0x4),
|
||||
0x80A63EF8:("D_80A63EF8","UNK_TYPE1","",0x1),
|
||||
0x80A63F04:("D_80A63F04","UNK_TYPE1","",0x1),
|
||||
0x80A63CC0:("En_Bal_InitVars","ActorInit","",0x1),
|
||||
0x80A63CE0:("sDamageTable","DamageTable","",0x1),
|
||||
0x80A63D00:("sColChkInfoInit","CollisionCheckInfoInit2","",0x1),
|
||||
0x80A63D0C:("sJntSphElementsInit","ColliderJntSphElementInit","",0x1),
|
||||
0x80A63D30:("sJntSphInit","ColliderJntSphInit","",0x1),
|
||||
0x80A63D40:("sBuyMapOptions","s16","",0xC),
|
||||
0x80A63D58:("sAnimationInfo","AnimationInfo","",0xE),
|
||||
0x80A63EA8:("sInitBalloonScale","Vec3f","",0x1),
|
||||
0x80A63EB4:("sSparkleVelocity","Vec3f","",0x1),
|
||||
0x80A63EC0:("sSparkleAccel","Vec3f","",0x1),
|
||||
0x80A63ECC:("sSparklePrimColor","Color_RGBA8","",0x1),
|
||||
0x80A63ED0:("sSparkleEnvColor","Color_RGBA8","",0x1),
|
||||
0x80A63ED4:("sDustVelocity","Vec3f","",0x1),
|
||||
0x80A63EE0:("sDustAccel","Vec3f","",0x1),
|
||||
0x80A63EEC:("sDustPrimColor","Color_RGBA8","",0x1),
|
||||
0x80A63EF0:("sDustEnvColor","Color_RGBA8","",0x1),
|
||||
0x80A63EF4:("sGetItemPending","s32","",0x1),
|
||||
0x80A63EF8:("sFocusPosMultiplier","Vec3f","",0x1),
|
||||
0x80A63F04:("sEyeTextures","TexturePtr","",0x2),
|
||||
0x80A63F10:("D_80A63F10","f32","",0x4),
|
||||
0x80A63F14:("D_80A63F14","f32","",0x4),
|
||||
0x80A63F18:("D_80A63F18","f32","",0x4),
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ weekEventReg = {
|
|||
( 9 << 8) | 0x20: "WEEKEVENTREG_09_20",
|
||||
( 9 << 8) | 0x40: "WEEKEVENTREG_09_40",
|
||||
( 9 << 8) | 0x80: "WEEKEVENTREG_09_80",
|
||||
(10 << 8) | 0x01: "WEEKEVENTREG_10_01",
|
||||
(10 << 8) | 0x01: "WEEKEVENTREG_TALKED_TINGLE",
|
||||
(10 << 8) | 0x02: "WEEKEVENTREG_10_02",
|
||||
(10 << 8) | 0x04: "WEEKEVENTREG_10_04",
|
||||
(10 << 8) | 0x08: "WEEKEVENTREG_10_08",
|
||||
|
|
@ -284,12 +284,12 @@ weekEventReg = {
|
|||
(34 << 8) | 0x20: "WEEKEVENTREG_34_20",
|
||||
(34 << 8) | 0x40: "WEEKEVENTREG_RECEIVED_MASK_OF_TRUTH",
|
||||
(34 << 8) | 0x80: "WEEKEVENTREG_34_80",
|
||||
(35 << 8) | 0x01: "WEEKEVENTREG_35_01",
|
||||
(35 << 8) | 0x02: "WEEKEVENTREG_35_02",
|
||||
(35 << 8) | 0x04: "WEEKEVENTREG_35_04",
|
||||
(35 << 8) | 0x08: "WEEKEVENTREG_35_08",
|
||||
(35 << 8) | 0x10: "WEEKEVENTREG_35_10",
|
||||
(35 << 8) | 0x20: "WEEKEVENTREG_35_20",
|
||||
(35 << 8) | 0x01: "WEEKEVENTREG_TINGLE_MAP_BOUGHT_CLOCK_TOWN",
|
||||
(35 << 8) | 0x02: "WEEKEVENTREG_TINGLE_MAP_BOUGHT_WOODFALL",
|
||||
(35 << 8) | 0x04: "WEEKEVENTREG_TINGLE_MAP_BOUGHT_SNOWHEAD",
|
||||
(35 << 8) | 0x08: "WEEKEVENTREG_TINGLE_MAP_BOUGHT_ROMANI_RANCH",
|
||||
(35 << 8) | 0x10: "WEEKEVENTREG_TINGLE_MAP_BOUGHT_GREAT_BAY",
|
||||
(35 << 8) | 0x20: "WEEKEVENTREG_TINGLE_MAP_BOUGHT_STONE_TOWER",
|
||||
(35 << 8) | 0x40: "WEEKEVENTREG_35_40",
|
||||
(35 << 8) | 0x80: "WEEKEVENTREG_35_80",
|
||||
(36 << 8) | 0x01: "WEEKEVENTREG_36_01",
|
||||
|
|
@ -519,8 +519,8 @@ weekEventReg = {
|
|||
(64 << 8) | 0x01: "WEEKEVENTREG_64_01",
|
||||
(64 << 8) | 0x02: "WEEKEVENTREG_64_02",
|
||||
(64 << 8) | 0x04: "WEEKEVENTREG_64_04",
|
||||
(64 << 8) | 0x08: "WEEKEVENTREG_64_08",
|
||||
(64 << 8) | 0x10: "WEEKEVENTREG_64_10",
|
||||
(64 << 8) | 0x08: "WEEKEVENTREG_TINGLE_RECOGNIZED_PLAYER_FORM_LOW_BIT",
|
||||
(64 << 8) | 0x10: "WEEKEVENTREG_TINGLE_RECOGNIZED_PLAYER_FORM_HIGH_BIT",
|
||||
(64 << 8) | 0x20: "WEEKEVENTREG_64_20",
|
||||
(64 << 8) | 0x40: "WEEKEVENTREG_64_40",
|
||||
(64 << 8) | 0x80: "WEEKEVENTREG_TALKED_DOGGY_RACETRACK_OWNER_DAY_1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue