diff --git a/include/common_structs.h b/include/common_structs.h index a40e52d87c..442e8eb13a 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -69,6 +69,11 @@ typedef struct Vec2f { /* 0x04 */ f32 y; } Vec2f; // size = 0x08 +typedef struct Vec2XZf { + /* 0x00 */ f32 x; + /* 0x04 */ f32 z; +} Vec2XZf; // size = 0x08 + typedef struct Vec3f { /* 0x00 */ f32 x; /* 0x04 */ f32 y; @@ -247,29 +252,32 @@ typedef struct PlayerData { /* 0x28E */ s8 maxStarPower; /* 0x28F */ char unk_28F; /* 0x290 */ s16 specialBarsFilled; - /* 0x292 */ s8 unk_292; - /* 0x293 */ char unk_293[0x1]; - /* 0x294 */ u16 otherHitsTaken; - /* 0x296 */ s16 unk_296; + /* 0x292 */ s8 starBeamLevel; + /* 0x293 */ char unk_293; + /* 0x294 */ u16 actionCommandAttempts; + /* 0x296 */ s16 actionCommandSuccesses; /* 0x298 */ u16 hitsTaken; /* 0x29A */ u16 hitsBlocked; /* 0x29C */ s16 playerFirstStrikes; /* 0x29E */ s16 enemyFirstStrikes; /* 0x2A0 */ u16 powerBounces; /* 0x2A2 */ u16 battlesCount; - /* 0x2A4 */ s16 unk_2A4[4]; - /* 0x2AC */ s32 unk_2AC; - /* 0x2B0 */ s32 unk_2B0; + /* 0x2A4 */ s16 battlesWon; + /* 0x2A6 */ s16 unk_2A6; + /* 0x2A8 */ s16 battlesFled; + /* 0x2AA */ s16 trainingsDone; + /* 0x2AC */ s32 walkingStepsTaken; + /* 0x2B0 */ s32 runningStepsTaken; /* 0x2B4 */ u32 totalCoinsEarned; /* 0x2B8 */ s16 idleFrameCounter; /* frames with no inputs, overflows ever ~36 minutes of idling */ /* 0x2BA */ char unk_2BA[2]; /* 0x2BC */ u32 frameCounter; /* increases by 2 per frame */ /* 0x2C0 */ s16 quizzesAnswered; /* 0x2C2 */ s16 quizzesCorrect; - /* 0x2C4 */ s32 unk_2C4[12]; - /* 0x2F4 */ s32 unk_2F4[12]; + /* 0x2C4 */ s32 partnerUnlockedTime[12]; + /* 0x2F4 */ s32 partnerUsedTime[12]; /* 0x324 */ s32 tradeEventStartTime; - /* 0x328 */ s32 unk_328; + /* 0x328 */ s32 droTreeOrbitTime; /* 0x32C */ s16 starPiecesCollected; /* 0x32E */ s16 jumpGamePlays; /* 0x330 */ s32 jumpGameTotal; /* all-time winnings, max = 99999 */ @@ -397,16 +405,18 @@ typedef struct struct802E2BA4 { } struct802E2BA4; // from 102c80, size unknown. -typedef struct struct802E1400 { - /* 0x000 */ Vec3f unk_00; +typedef struct SwitchData { + /* 0x000 */ f32 fallVelocity; + /* 0x004 */ f32 deltaScaleX; + /* 0x008 */ f32 deltaScaleY; /* 0x00C */ char unk_0C[4]; - /* 0x010 */ s8 unk_10; - /* 0x011 */ s8 unk_11; - /* 0x014 */ Vec3f unk_14; - /* 0x020 */ u16 unk_20; - /* 0x022 */ s16 unk_22; - /* 0x024 */ s16 unk_24; - /* 0x028 */ struct Entity* attachedEntity; + /* 0x010 */ s8 animStateScaleX; + /* 0x011 */ s8 animStateScaleY; + /* 0x014 */ Vec3f baseScale; + /* 0x020 */ u16 areaFlagIndex; + /* 0x022 */ s16 greenMotionTimer; + /* 0x024 */ s16 scaleAnimTimer; + /* 0x028 */ struct Entity* linkedSwitch; /* a hidden switch can be linked to a visible one and automatically trigger it on hit */ /* 0x02C */ char unk_2C[8]; /* 0x034 */ struct802E2BA4* unk_34; /* 0x038 */ f32 unk_38; @@ -415,16 +425,16 @@ typedef struct struct802E1400 { /* */ s8 b[2]; } unk_3C; /* 0x03E */ char unk_3E[0x4D]; - /* 0x08B */ u8 unk_8B[24]; + /* 0x08B */ u8 fragmentRotX[24]; // scaled to map [0,255] -> [0,360] /* 0x0A3 */ char unk_A3; // padding? - /* 0x0A4 */ u8 unk_A4[24]; + /* 0x0A4 */ u8 fragmentRotY[24]; // scaled to map [0,255] -> [0,360] /* 0x0BC */ char unk_BC[4]; - /* 0x0C0 */ f32 unk_C0[24]; + /* 0x0C0 */ f32 fragmentPosX[24]; /* 0x120 */ char unk_120[4]; - /* 0x124 */ f32 unk_124[24]; + /* 0x124 */ f32 fragmentPosY[24]; /* 0x184 */ char unk_184[4]; - /* 0x188 */ f32 unk_188[24]; -} struct802E1400; + /* 0x188 */ f32 fragmentPosZ[24]; +} SwitchData; // from 104940_len_dc0, size unknown // appears to belong to the hammer blocks(?) @@ -490,6 +500,54 @@ typedef struct SuperBlockContentData { /* 0x12C */ s32* unk_12C; } SuperBlockContentData; +// size unknown +typedef struct HeartBlockContentData { + /* 0x000 */ u8 parentEntityIndex; // for block entities spawned by other block entities + /* 0x001 */ u8 state; + /* 0x002 */ s8 sparkleTimer; + /* 0x003 */ s8 sparkleTrailTimer; + /* 0x004 */ f32 sparkleTrailPosY; + /* 0x008 */ char heartbeatTimer; + /* 0x009 */ u8 unk_09; + /* 0x00A */ u8 sparkleEffectType; + /* 0x00B */ char unk_0B; // padding? + /* 0x00C */ s32 unk_0C; + /* 0x010 */ s32 unk_10; + /* 0x014 */ f32 riseVelocity; + /* 0x018 */ f32 sparkleTrailAngle; + /* 0x01C */ f32 sparkleTrailRadius; + /* 0x020 */ f32 bouncePhase; + /* 0x024 */ u16 yawBufferPos; + /* 0x024 */ s16 unk_26; + /* 0x028 */ f32 yawBuffer[10]; + /* 0x050 */ f32 unk_50; + /* 0x054 */ f32 rotationRate; + /* 0x058 */ char unk_58[0x78]; + /* 0x0D0 */ u16 yawBufferPosX; + /* 0x0D4 */ f32 yawBufferX[20]; + /* 0x124 */ s32 unk_124; + /* 0x128 */ s32* unk_128; + /* 0x12C */ s32* unk_12C; +} HeartBlockContentData; + +typedef struct WoodenCrateData { + /* 0x000 */ s32 itemID; + /* 0x004 */ u16 globalFlagIndex; + /* 0x006 */ u8 unk_06[2]; + /* 0x008 */ u8* fragmentsGfx; //TODO type when more WoodenCrate.c is done + /* 0x00C */ f32 basePosY; + /* 0x010 */ u8 fragmentScale[36]; + /* 0x034 */ s8 fragmentMoveAngle[36]; // X,Z plane -- scaled to map [0,255] -> [0,360] + /* 0x058 */ u8 fragmentRotX[36]; // scaled to map [0,255] -> [0,360] + /* 0x07C */ u8 fragmentRotY[36]; // scaled to map [0,255] -> [0,360] + /* 0x0A0 */ u8 fragmentLateralSpeed[36]; + /* 0x0C4 */ f32 fragmentFallSpeed[36]; + /* 0x154 */ f32 fragmentPosX[36]; + /* 0x1E4 */ f32 fragmentPosY[36]; + /* 0x274 */ f32 fragmentPosZ[36]; + /* 0x304 */ f32 unk_304[36]; +} WoodenCrateData; + // size unknown typedef struct ChestData { /* 0x00 */ u16 gameFlagIndex; @@ -521,6 +579,10 @@ typedef struct BlueWarpPipeData { /* 0x18 */ f32 finalPosY; } BlueWarpPipeData; +typedef struct SimpleSpringData { + /* 0x00 */ s32 launchVelocity; +} SimpleSpringData; + // END ENTITY-SPECIFIC STRUCTS typedef s32 (*EntityCallback)(struct Entity*); @@ -564,12 +626,16 @@ typedef struct Entity { /* 0x3C */ UNK_PTR renderSetupFunc; // pointer to draw func(?) /* 0x40 */ union { s32* any; + SwitchData* swtch; BlockData* block; ItemBlockData* itemBlock; SaveBlockData* saveBlock; + WoodenCrateData* crate; ChestData* chest; BlueWarpPipeData* bluePipe; + HeartBlockContentData* heartBlockContent; SuperBlockContentData* superBlockContent; + SimpleSpringData* simpleSpring; s32* unk; } dataBuf; /* 0x44 */ Mtx* vertexData; @@ -1388,7 +1454,7 @@ typedef struct GameStatus { /* 0x07D */ s8 keepUsingPartnerOnMapChange; /* 0x07E */ u8 peachFlags; /* (1 = isPeach, 2 = isTransformed, 4 = hasUmbrella) */ /* 0x07F */ s8 peachDisguise; /* (1 = koopatrol, 2 = hammer bros, 3 = clubba) */ - /* 0x080 */ u8 peachAnimIdx; ///< @see world_action_idle_peachAnims + /* 0x080 */ u8 peachCookingIngredient; ///< @see enum CookingIngredient /* 0x081 */ s8 unk_81; /* 0x082 */ s8 unk_82; /* 0x083 */ s8 unk_83; @@ -1939,38 +2005,37 @@ typedef struct FontData { typedef struct PlayerStatus { /* 0x000 */ s32 flags; // PlayerStatusFlags /* 0x004 */ u32 animFlags; - /* 0x008 */ s16 framesOnGround; /* Number of frames since last jump landed */ + /* 0x008 */ s16 currentStateTime; /* 0x00A */ s8 unk_0A; /* 0x00B */ char unk_0B; /* 0x00C */ s8 peachDisguise; /* 0x00D */ s8 unk_0D; /* 0x00E */ u8 alpha1; /* 0x00F */ u8 alpha2; - /* 0x010 */ s16 unk_10; + /* 0x010 */ s16 blinkTimer; /* 0x012 */ s16 moveFrames; /* 0x014 */ s8 enableCollisionOverlapsCheck; - /* 0x015 */ s8 statusMenuCounterinputEnabledCounter; /* whether the C-up menu can appear */ + /* 0x015 */ s8 inputEnabledCounter; /* whether the C-up menu can appear */ /* 0x016 */ Vec3s lastGoodPosition; /* 0x01C */ Vec3f extraVelocity; /* 0x028 */ Vec3f position; - /* 0x034 */ char unk_34[8]; - /* 0x03C */ f32 unk_3C; - /* 0x040 */ f32 unk_40; - /* 0x044 */ f32 decorationPos[2]; - /* 0x04C */ f32 unk_4C; + /* 0x034 */ Vec2f groundAnglesXZ; /* angles along X/Z axes of ground beneath player */ + /* 0x03C */ Vec2XZf jumpFromPos; + /* 0x044 */ Vec2XZf landPos; + /* 0x04C */ f32 jumpFromHeight; /* 0x050 */ f32 jumpApexHeight; /* 0x054 */ f32 currentSpeed; /* 0x058 */ f32 walkSpeed; /* 0x05C */ f32 runSpeed; /* 0x060 */ s32 unk_60; - /* 0x064 */ f32 unk_64; - /* 0x068 */ f32 normalPitch; - /* 0x06C */ f32 unk_6C; + /* 0x064 */ f32 overlapPushAmount; + /* 0x068 */ f32 groundNormalPitch; + /* 0x06C */ f32 maxJumpSpeed; /* 0x070 */ f32 gravityIntegrator[4]; /* 0x080 */ f32 targetYaw; /* 0x084 */ f32 currentYaw; - /* 0x088 */ f32 unk_88; - /* 0x08C */ f32 unk_8C; + /* 0x088 */ f32 overlapPushYaw; + /* 0x08C */ f32 pitch; /* 0x090 */ f32 unk_90; /* 0x094 */ s32 unk_94; /* 0x098 */ s32 unk_98; @@ -1993,11 +2058,11 @@ typedef struct PlayerStatus { /* 0x0C2 */ s16 unk_C2; /* 0x0C4 */ char unk_C4; /* 0x0C5 */ s8 unk_C5; - /* 0x0C6 */ s16 unk_C6; - /* 0x0C8 */ Npc* unk_C8; + /* 0x0C6 */ s16 interactingWithID; + /* 0x0C8 */ Npc* encounteredNPC; /* 0x0CC */ s32 shadowID; /* 0x0D0 */ f32* unk_D0; - /* 0x0D4 */ f32 unk_D4; + /* 0x0D4 */ f32 spinRate; /* 0x0D8 */ UNK_PTR** unk_D8; /* 0x0DC */ s32 currentButtons; /* 0x0E0 */ s32 pressedButtons; @@ -2228,6 +2293,16 @@ typedef struct PlayerSpinState { /* 0x30 */ s32 spinSoundID; } PlayerSpinState; // size = 0x34 +typedef struct TweesterPhysics { + /* 0x00 */ s32 countdown; + /* 0x04 */ s32 state; + /* 0x08 */ s32 prevFlags; ///< Partner npc flags before contact with Tweester + /* 0x0C */ f32 radius; + /* 0x10 */ f32 angle; + /* 0x14 */ f32 angularVelocity; + /* 0x18 */ f32 liftoffVelocityPhase; +} TweesterPhysics; // size = 0x1C + typedef struct PartnerActionStatus { /* 0x000 */ union { /* */ s32 i; @@ -2350,16 +2425,6 @@ typedef struct PopupMessage { /* 0x18 */ Message* message; } PopupMessage; // size = 0x1C -typedef struct unkPartnerStruct { - /* 0x000 */ s32 unk_00; - /* 0x004 */ s32 unk_04; - /* 0x008 */ s32 flags; - /* 0x00c */ f32 unk_0C; - /* 0x010 */ f32 unk_10; - /* 0x014 */ f32 unk_14; - /* 0x018 */ f32 unk_18; -} unkPartnerStruct; // size = 0x1C - typedef struct struct8015A578 { /* 0x00 */ u8 unk_00; /* 0x01 */ u8 unk_01; @@ -2369,11 +2434,11 @@ typedef struct struct8015A578 { } struct8015A578; // size = 0x0C typedef struct SaveMetadata { - /* 0x00 */ s32 unk_00; - /* 0x04 */ u8 unk_04; + /* 0x00 */ s32 timePlayed; + /* 0x04 */ u8 spiritsRescued; /* 0x05 */ char unk_05[0x1]; - /* 0x06 */ s8 unk_06; - /* 0x07 */ s8 unk_07[8]; + /* 0x06 */ s8 level; + /* 0x07 */ char filename[8]; /* 0x0F */ char unk_0F[0x1]; /* 0x10 */ s32 unk_10; /* 0x14 */ s32 unk_14; diff --git a/include/enums.h b/include/enums.h index c0481f4a95..ace3c82c0a 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1479,7 +1479,7 @@ enum ActionStates { ACTION_STATE_USE_SNEAKY_PARASOL = 0x00000019, ACTION_STATE_SPIN = 0x0000001A, ACTION_STATE_ENEMY_FIRST_STRIKE = 0x0000001B, - ACTION_STATE_GET_STAR_SPIRIT = 0x0000001C, + ACTION_STATE_RAISE_ARMS = 0x0000001C, ACTION_STATE_USE_SPINNING_FLOWER = 0x0000001D, ACTION_STATE_USE_MUNCHLESIA = 0x0000001E, ///< Set by the jan_09 squishy flower entity; throws the player in the air. ACTION_STATE_USE_TWEESTER = 0x0000001F, @@ -1492,6 +1492,36 @@ enum ActionStates { ACTION_STATE_USE_SPRING = 0x00000026, }; +/* (1 = isPeach, 2 = isTransformed, 4 = hasUmbrella) */ +enum PeachStatusFlags { + PEACH_STATUS_FLAG_IS_PEACH = 0x01, + PEACH_STATUS_FLAG_DISGUISED = 0x02, + PEACH_STATUS_FLAG_HAS_PARASOL = 0x04, + PEACH_STATUS_FLAG_HAS_INGREDIENT = 0x10 +}; + +enum CookingIngredients { + PEACH_COOKING_NONE = 0x00, + PEACH_COOKING_CREAM = 0x01, + PEACH_COOKING_STRAWBERRY = 0x02, + PEACH_COOKING_BUTTER = 0x03, + PEACH_COOKING_CLEANSER = 0x04, + PEACH_COOKING_WATER = 0x05, + PEACH_COOKING_MILK = 0x06, + PEACH_COOKING_FLOUR = 0x07, + PEACH_COOKING_EGG = 0x08, + PEACH_COOKING_COMPLETE_CAKE = 0x09, + PEACH_COOKING_CAKE_BOWL = 0x0A, + PEACH_COOKING_CAKE_MIXED = 0x0B, + PEACH_COOKING_CAKE_PAN = 0x0C, + PEACH_COOKING_CAKE_BATTER = 0x0D, + PEACH_COOKING_CAKE_BARE = 0x0E, + PEACH_COOKING_SALT = 0x0F, + PEACH_COOKING_SUGAR = 0x10, + PEACH_COOKING_CAKE_WITH_ICING = 0x11, + PEACH_COOKING_CAKE_WITH_BERRIES = 0x12, +}; + // Requires decimals enum NpcIDs { NPC_SELF = -1, @@ -1602,14 +1632,15 @@ enum EntityFlags { }; enum EntityCollisionFlags { - ENTITY_COLLISION_FLAGS_1 = 0x00000001, + ENTITY_COLLISION_PLAYER_TOUCH_FLOOR = 0x00000001, ENTITY_COLLISION_FLAGS_2 = 0x00000002, - ENTITY_COLLISION_FLAGS_4 = 0x00000004, - ENTITY_COLLISION_FLAGS_8 = 0x00000008, - ENTITY_COLLISION_FLAGS_10 = 0x00000010, + ENTITY_COLLISION_PLAYER_TOUCH_CEILING = 0x00000004, + ENTITY_COLLISION_PLAYER_TOUCH_WALL = 0x00000008, + ENTITY_COLLISION_PLAYER_PUSHING_AGAINST = 0x00000010, ENTITY_COLLISION_FLAGS_20 = 0x00000020, - ENTITY_COLLISION_FLAGS_40 = 0x00000040, - ENTITY_COLLISION_FLAGS_80 = 0x00000080 + ENTITY_COLLISION_PLAYER_HAMMER = 0x00000040, + ENTITY_COLLISION_BLOCK_HIT = 0x00000080, + ENTITY_COLLISION_PLAYER_LAST_FLOOR = 0x00000100 }; enum TriggerFlags { @@ -1634,6 +1665,10 @@ enum TriggerFlags { TRIGGER_SCRIPT_BOUND = 0x01000000 }; +enum ItemEntityFlags { + ITEM_ENTITY_FLAGS_TINY = 0x00004000, +}; + enum Buttons { BUTTON_C_RIGHT = 0x00000001, BUTTON_C_LEFT = 0x00000002, @@ -1826,7 +1861,7 @@ enum NpcFlags { enum PlayerStatusFlags { PLAYER_STATUS_FLAGS_JUMPING = 0x00000002, PLAYER_STATUS_FLAGS_FALLING = 0x00000004, - PLAYER_STATUS_FLAGS_8 = 0x00000008, + PLAYER_STATUS_FLAGS_FLYING = 0x00000008, PLAYER_STATUS_FLAGS_10 = 0x00000010, PLAYER_STATUS_FLAGS_20 = 0x00000020, PLAYER_STATUS_FLAGS_80 = 0x00000080, @@ -1841,11 +1876,15 @@ enum PlayerStatusFlags { PLAYER_STATUS_FLAGS_20000 = 0x00020000, PLAYER_STATUS_FLAGS_40000 = 0x00040000, PLAYER_STATUS_FLAGS_80000 = 0x00080000, + PLAYER_STATUS_FLAGS_100000 = 0x00100000, + PLAYER_STATUS_FLAGS_200000 = 0x00200000, // using hammer? PLAYER_STATUS_FLAGS_800000 = 0x00800000, + PLAYER_STATUS_FLAGS_1000000 = 0x01000000, PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC = 0x02000000, PLAYER_STATUS_FLAGS_CAMERA_DOESNT_FOLLOW = 0x04000000, PLAYER_STATUS_FLAGS_8000000 = 0x08000000, PLAYER_STATUS_FLAGS_10000000 = 0x10000000, + PLAYER_STATUS_FLAGS_20000000 = 0x20000000, // done hammer? PLAYER_STATUS_FLAGS_40000000 = 0x40000000, PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED = 0x80000000, }; @@ -1855,13 +1894,13 @@ enum PlayerStatusAnimFlags { PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT = 0x00000001, PLAYER_STATUS_ANIM_FLAGS_2 = 0x00000002, PLAYER_STATUS_ANIM_FLAGS_4 = 0x00000004, - PLAYER_STATUS_ANIM_FLAGS_8 = 0x00000008, + PLAYER_STATUS_ANIM_FLAGS_8 = 0x00000008, ///< triggers partner use when set PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE = 0x00000010, ///< ! prompt PLAYER_STATUS_ANIM_FLAGS_SPEECH_PROMPT_AVAILABLE = 0x00000020, ///< (...) prompt PLAYER_STATUS_ANIM_FLAGS_40 = 0x00000040, PLAYER_STATUS_ANIM_FLAGS_USING_PULSE_STONE = 0x00000080, PLAYER_STATUS_ANIM_FLAGS_100 = 0x00000100, - PLAYER_STATUS_ANIM_FLAGS_GET_STAR_SPIRIT = 0x00000200, ///< Sets action state to ACTION_STATE_GET_STAR_SPIRIT on idle + PLAYER_STATUS_ANIM_FLAGS_RAISED_ARMS = 0x00000200, ///< Sets action state to ACTION_STATE_RAISE_ARMS on idle PLAYER_STATUS_ANIM_FLAGS_SHIVERING = 0x00000400, PLAYER_STATUS_ANIM_FLAGS_800 = 0x00000800, PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS = 0x00001000, @@ -2610,10 +2649,10 @@ enum MusicSettingsFlags { }; enum ColliderFlags { - COLLIDER_FLAGS_1 = 0x00000001, - COLLIDER_FLAGS_2 = 0x00000002, - COLLIDER_FLAGS_4 = 0x00000004, - COLLIDER_FLAGS_8 = 0x00000008, + COLLIDER_FLAGS_WATER_FLOOR = 0x00000001, + COLLIDER_FLAGS_LAVA_FLOOR = 0x00000002, + COLLIDER_FLAGS_SUSHIE_DOCK_WALL = 0x00000004, + COLLIDER_FLAGS_SNOW_FLOOR = 0x00000008, COLLIDER_FLAGS_10 = 0x00000010, COLLIDER_FLAGS_20 = 0x00000020, COLLIDER_FLAGS_40 = 0x00000040, @@ -2625,8 +2664,8 @@ enum ColliderFlags { COLLIDER_FLAGS_1000 = 0x00001000, COLLIDER_FLAGS_2000 = 0x00002000, COLLIDER_FLAGS_4000 = 0x00004000, - COLLIDER_FLAGS_8000 = 0x00008000, - COLLIDER_FLAGS_10000 = 0x00010000, + COLLIDER_FLAGS_IGNORE_SHELL = 0x00008000, + COLLIDER_FLAGS_IGNORE_PLAYER = 0x00010000, COLLIDER_FLAGS_20000 = 0x00020000, COLLIDER_FLAGS_40000 = 0x00040000, COLLIDER_FLAGS_80000 = 0x00080000, @@ -3378,4 +3417,42 @@ enum RushFlags { RUSH_FLAG_POWER = 2, }; +enum FileMenuMessages { + FILE_MESSAGE_NONE = 0, + FILE_MESSAGE_SELECT_FILE_TO_START = 1, // Select file to start:[End] + FILE_MESSAGE_SELECT_FILE_TO_DELETE = 2, // Select file to delete:[End] + FILE_MESSAGE_SELECT_FILE_TO_SAVE = 3, // Select file to save[End] + FILE_MESSAGE_COPY_WHICH_FILE = 4, // Copy which file?[End] + FILE_MESSAGE_COPY_TO_WHICH_FILE = 5, // Copy to which file?[End] + FILE_MESSAGE_NEW = 6, // NEW[End] + FILE_MESSAGE_LEVEL = 7, // Level[End] + FILE_MESSAGE_PLAY_TIME = 8, // Play Time[End] + FILE_MESSAGE_DELETE_FILE = 9, // Delete File[End] + FILE_MESSAGE_CANCEL = 10, // Cancel[End] + FILE_MESSAGE_COPY_FILE = 11, // Copy File[End] + FILE_MESSAGE_FIRST_PLAY = 12, // First Play[End] + FILE_MESSAGE_PERIOD_13 = 13, // .[End] + FILE_MESSAGE_YES = 14, // Yes[End] + FILE_MESSAGE_NO = 15, // No[End] + FILE_MESSAGE_DELETE = 16, // Delete[End] + FILE_MESSAGE_OVERRIDE_TO_NEW_DATA = 17, // Override to New Data[End] + FILE_MESSAGE_SAVE_OK = 18, // Save OK?[End] + FILE_MESSAGE_FILE_NAME_IS = 19, // File name is :[End] + FILE_MESSAGE_PERIOD_20 = 20, // .[End] + FILE_MESSAGE_OK = 21, // OK?[End] + FILE_MESSAGE_FILE_22 = 22, // File[End] + FILE_MESSAGE_WILL_BE_DELETED = 23, // will be deleted.[End] + FILE_MESSAGE_OK_TO_COPY_TO_THIS_FILE = 24, // OK to copy to this file?[End] + FILE_MESSAGE_START_GAME_WITH = 25, // Start game with[End] + FILE_MESSAGE_FILE_26 = 26, // File[End] + FILE_MESSAGE_HAS_BEEN_DELETED = 27, // has been deleted.[End] + FILE_MESSAGE_28 = 28, // [End] + FILE_MESSAGE_COPY_FROM = 29, // Copy from[End] + FILE_MESSAGE_TO = 30, // to[End] + FILE_MESSAGE_HAS_BEEN_CREATED = 31, // has been created.[End] + FILE_MESSAGE_ENTER_A_FILE_NAME = 32, // Enter a file name![End] + FILE_MESSAGE_QUESTION = 33, // ?[End] + FILE_MESSAGE_PERIOD_34 = 34, // .[End] +}; + #endif diff --git a/include/macros.h b/include/macros.h index e50ab2e887..501ebb1986 100644 --- a/include/macros.h +++ b/include/macros.h @@ -74,6 +74,11 @@ #define BATTLE_ENTITY_ID_MASK 0x800 +#define COLLISION_WITH_NPC_BIT 0x2000 +#define COLLISION_WITH_ENTITY_BIT 0x4000 +#define COLLISION_IGNORE_ENTITIES 0x40000 +#define COLLISION_ONLY_ENTITIES 0x100000 + #define PACK_FILL_COLOR(r, g, b, a) (GPACK_RGBA5551(r, g, b, a) << 0x10) | GPACK_RGBA5551(r, g, b, a) #define SQ(x) (x*x) diff --git a/include/script_api/common.h b/include/script_api/common.h index f5b0e7dcaa..816ca6bfb8 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -237,7 +237,7 @@ ApiStatus CountFortessKeys(Evt* script, s32 isInitialCall); ApiStatus RemoveFortressKeys(Evt* script, s32 isInitialCall); ApiStatus MakeItemEntity(Evt* script, s32 isInitialCall); ApiStatus DropItemEntity(Evt* script, s32 isInitialCall); -ApiStatus DropItemEntityB(Evt* script, s32 isInitialCall); +ApiStatus DropTinyItemEntity(Evt* script, s32 isInitialCall); ApiStatus RemoveItemEntity(Evt* script, s32 isInitialCall); ApiStatus AddBadge(Evt* script, s32 isInitialCall); ApiStatus RemoveBadge(Evt* script, s32 isInitialCall); diff --git a/include/variables.h b/include/variables.h index e1d0c743a1..a0d3e30604 100644 --- a/include/variables.h +++ b/include/variables.h @@ -76,7 +76,7 @@ extern s32 gCurrentCameraID; extern CollisionData gCollisionData; extern s8 D_800A0900; -extern f32 D_800F7B60[]; +extern f32 GravityParamsStartFall[]; extern s16 D_800F7B80; extern EncounterStatus gCurrentEncounter; extern u8* D_801512F0; @@ -100,16 +100,16 @@ extern MessagePrintState* D_802DB268; extern ShadowBlueprint CircularShadowA; extern ShadowBlueprint CircularShadowB; extern ShadowBlueprint SquareShadow; -extern s32 SaveBlockTutorialMessagePrinterClosed; -extern s32 SaveBlockResultMessagePrinterClosed; -extern MessagePrintState* SaveBlockTutorialMessagePrinter; -extern MessagePrintState* SaveBlockResultMessagePrinter; +extern s32 SaveBlockTutorialPrinterClosed; +extern s32 SaveBlockResultPrinterClosed; +extern MessagePrintState* SaveBlockTutorialPrinter; +extern MessagePrintState* SaveBlockResultPrinter; extern s32 D_802E99DC; -extern Entity* D_802EB3A0; +extern Entity* SwitchToLink; extern s32 CreateEntityVarArgBuffer[3]; // not size 3 -extern f32 D_800F7B70[4]; +extern f32 DefaultMoveSpeeds[4]; extern TempSetZoneEnabled* D_800D91D4; @@ -201,7 +201,7 @@ extern s8 D_8014C248[]; extern UNK_FUN_PTR(D_8010C920); extern UNK_FUN_PTR(D_8010C940); -extern Entity* D_8010C954; +extern Entity* TweesterTouchingPartner; extern UNK_FUN_PTR(D_8010C958); extern s32 D_8010C95C; extern s32 D_8010C96C; @@ -294,8 +294,8 @@ extern s32 D_80292110[]; extern s32 D_8029FBD0; -extern s32 D_800F7BE8[]; -extern s32 D_800F7BBC[]; +extern s32 KoopatrolDisguiseExtraAnims[]; +extern s32 HammerBroDisguiseExtraAnims[]; //various extern s32 D_802C05CC; diff --git a/src/104730.c b/src/104730.c index e6c25686c1..ab170ae3cc 100644 --- a/src/104730.c +++ b/src/104730.c @@ -227,7 +227,8 @@ void entity_shattering_block_init(Entity* entity) { void* a2 = NULL; void* a1 = NULL; - ((struct802E1400*)entity->dataBuf.unk)->unk_38 = entity->position.y; + //TODO must be HAMMER BLOCK TYPE! + entity->dataBuf.swtch->unk_38 = entity->position.y; type = get_entity_type((u8)entity->listIndex); if ((type - 24) < 3) { diff --git a/src/163400.c b/src/163400.c index 344b8bed97..e675f9c059 100644 --- a/src/163400.c +++ b/src/163400.c @@ -676,9 +676,9 @@ void filemenu_draw_cursor(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 if (temp_a1 > 255) { temp_a1 = 255; } - set_hud_element_alpha(filemenu_cursorHudElemID[0], temp_a1); - set_hud_element_render_pos(filemenu_cursorHudElemID[0], baseX + D_80249B94, baseY + D_80249B98); - draw_hud_element_3(filemenu_cursorHudElemID[0]); + hud_element_set_alpha(filemenu_cursorHudElemID[0], temp_a1); + hud_element_set_render_pos(filemenu_cursorHudElemID[0], baseX + D_80249B94, baseY + D_80249B98); + hud_element_draw_without_clipping(filemenu_cursorHudElemID[0]); } } @@ -692,7 +692,7 @@ void filemenu_cleanup(void) { s32 i; for (i = 0; i < ARRAY_COUNT(filemenu_cursorHudElemID); i++) { - free_hud_element(filemenu_cursorHudElemID[i]); + hud_element_free(filemenu_cursorHudElemID[i]); } panelIt = filemenu_menus; diff --git a/src/165490.c b/src/165490.c index f27600b262..b4cc088c8d 100644 --- a/src/165490.c +++ b/src/165490.c @@ -4,10 +4,10 @@ #include "audio.h" #include "fio.h" -extern SaveMetadata D_800779C4[4]; -extern u8 D_80077A24[4]; -extern HudScript* D_80249E20[14]; -extern MenuWindowBP D_80249EA0[14]; +extern SaveMetadata gSaveSlotMetadata[4]; +extern u8 gSaveSlotHasData[4]; +extern HudScript* filemenu_hudElemScripts[14]; +extern MenuWindowBP filemenu_windowBPs[14]; extern s8 D_8024C090; @@ -23,28 +23,28 @@ void filemenu_draw_contents_title( switch (menu->page) { case 0: - msgIdx = 1; + msgIdx = FILE_MESSAGE_SELECT_FILE_TO_START; xOffset = 9; yOffset = 4; break; case 1: - msgIdx = 2; + msgIdx = FILE_MESSAGE_SELECT_FILE_TO_DELETE; xOffset = 8; yOffset = 4; break; case 3: - msgIdx = 4; + msgIdx = FILE_MESSAGE_COPY_WHICH_FILE; xOffset = 25; yOffset = 4; break; case 4: - msgIdx = 5; + msgIdx = FILE_MESSAGE_COPY_TO_WHICH_FILE; xOffset = 16; yOffset = 4; break; case 2: default: - msgIdx = 3; + msgIdx = FILE_MESSAGE_SELECT_FILE_TO_SAVE; xOffset = 10; yOffset = 4; break; @@ -60,11 +60,11 @@ void filemenu_draw_contents_stereo( s32 opacity, s32 darkening ) { if (gGameStatusPtr->soundOutputMode == SOUND_OUT_STEREO) { - set_hud_element_render_pos(filemenu_hudElemIDs[18], baseX + 34, baseY + 10); - draw_hud_element_3(filemenu_hudElemIDs[18]); + hud_element_set_render_pos(filemenu_hudElemIDs[18], baseX + 34, baseY + 10); + hud_element_draw_without_clipping(filemenu_hudElemIDs[18]); } else { - set_hud_element_render_pos(filemenu_hudElemIDs[19], baseX + 34, baseY + 10); - draw_hud_element_3(filemenu_hudElemIDs[19]); + hud_element_set_render_pos(filemenu_hudElemIDs[19], baseX + 34, baseY + 10); + hud_element_draw_without_clipping(filemenu_hudElemIDs[19]); } } @@ -75,11 +75,11 @@ void filemenu_draw_contents_mono( s32 opacity, s32 darkening ) { if (gGameStatusPtr->soundOutputMode == SOUND_OUT_MONO) { - set_hud_element_render_pos(filemenu_hudElemIDs[16], baseX + 34, baseY + 10); - draw_hud_element_3(filemenu_hudElemIDs[16]); + hud_element_set_render_pos(filemenu_hudElemIDs[16], baseX + 34, baseY + 10); + hud_element_draw_without_clipping(filemenu_hudElemIDs[16]); } else { - set_hud_element_render_pos(filemenu_hudElemIDs[17], baseX + 34, baseY + 10); - draw_hud_element_3(filemenu_hudElemIDs[17]); + hud_element_set_render_pos(filemenu_hudElemIDs[17], baseX + 34, baseY + 10); + hud_element_draw_without_clipping(filemenu_hudElemIDs[17]); } } @@ -93,7 +93,7 @@ void filemenu_draw_contents_option_left( if (menu->col == 0 && menu->row == 2) { filemenu_set_cursor_goal_pos(53, baseX, baseY + 8); } - filemenu_draw_message(filemenu_get_menu_message(9), baseX + 8, baseY + 2, 255, 0, 1); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_DELETE_FILE), baseX + 8, baseY + 2, 255, 0, 1); } } @@ -112,7 +112,7 @@ void filemenu_draw_contents_option_center( case 2: case 3: case 4: - msgIdx = 10; + msgIdx = FILE_MESSAGE_CANCEL; xOffset = 18; yOffset = 0; if (menu->col == 1 && menu->row == 2) { @@ -120,7 +120,7 @@ void filemenu_draw_contents_option_center( } break; default: - msgIdx = 11; + msgIdx = FILE_MESSAGE_COPY_FILE; xOffset = 14; yOffset = 0; if (menu->col == 1 && menu->row == 2) { @@ -142,11 +142,11 @@ void filemenu_draw_contents_option_right( if (menu->col == 2 && menu->row == 2) { filemenu_set_cursor_goal_pos(55, baseX + 8, baseY + 8); } - filemenu_draw_message(filemenu_get_menu_message(10), baseX + 20, baseY + 2, 255, 0, 1); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_CANCEL), baseX + 20, baseY + 2, 255, 0, 1); } } -void filemenu_draw_contents_file_info(s32 arg0, +void filemenu_draw_contents_file_info(s32 fileIdx, MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, @@ -160,51 +160,52 @@ void filemenu_draw_contents_file_info(s32 arg0, s32 temp_s3; s32 id; s32 i; + const int MAX_DISPLAYED_TIME = 100*60*60*60 - 1; // 100 hours minus one frame at 60 fps - if (D_80077A24[arg0] == 0) { - filemenu_draw_message(filemenu_get_menu_message(6), baseX + 50, baseY + 20, 0xFF, 0xA, 0); + if (!gSaveSlotHasData[fileIdx]) { + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_NEW), baseX + 50, baseY + 20, 0xFF, 0xA, 0); return; } - save = &D_800779C4[arg0]; - if (save->unk_00 == 0) { - filemenu_draw_message(filemenu_get_menu_message(0xC), baseX + 30, baseY + 20, 0xFF, 0xA, 0); + save = &gSaveSlotMetadata[fileIdx]; + if (save->timePlayed == 0) { + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FIRST_PLAY), baseX + 30, baseY + 20, 0xFF, 0xA, 0); return; } - filemenu_draw_message(filemenu_get_menu_message(7), baseX + 0x22, baseY + 10, 0xFF, 0xA, 1); - temp_s3_2 = save->unk_06; + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_LEVEL), baseX + 0x22, baseY + 10, 0xFF, 0xA, 1); + temp_s3_2 = save->level; temp_s3 = temp_s3_2; temp_s0 = temp_s3 / 10; draw_number(temp_s0, baseX + 79, baseY + 10, 1, 0xA, 0xFF, 2); draw_number(temp_s3 - (temp_s0 * 10), baseX + 88, baseY + 10, 1, 0xA, 0xFF, 2); - filemenu_draw_message(filemenu_get_menu_message(8), baseX + 11, baseY + 24, 0xFF, 0xA, 1); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_PLAY_TIME), baseX + 11, baseY + 24, 0xFF, 0xA, 1); - temp_s3_2 = save->unk_00; - if (temp_s3_2 > 21599999) { - temp_s3_2 = 21599999; + temp_s3_2 = save->timePlayed; + if (temp_s3_2 > MAX_DISPLAYED_TIME) { + temp_s3_2 = MAX_DISPLAYED_TIME; } draw_number((temp_s3_2 / 2160000) % 10, baseX + 76, baseY + 24, 1, 0xA, 0xFF, 2); temp_s1_2 = temp_s3_2 / 216000; draw_number(temp_s1_2 - ((temp_s3_2 / 2160000) * 10), baseX + 85, baseY + 24, 1, 0xA, 0xFF, 2); - filemenu_draw_message(filemenu_get_menu_message(0xD), baseX + 95, baseY + 23, 0xFF, 0xA, 1); - filemenu_draw_message(filemenu_get_menu_message(0xD), baseX + 95, baseY + 18, 0xFF, 0xA, 1); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_PERIOD_13), baseX + 95, baseY + 23, 0xFF, 0xA, 1); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_PERIOD_13), baseX + 95, baseY + 18, 0xFF, 0xA, 1); temp_s0_3 = temp_s3_2 / 36000; draw_number(temp_s0_3 - (temp_s1_2 * 6), baseX + 100, baseY + 24, 1, 0xA, 0xFF, 2); draw_number((temp_s3_2 / 3600) - (temp_s0_3 * 10), baseX + 109, baseY + 24, 1, 0xA, 0xFF, 2); for (i = 0; i < 7; i++) { - if (i < D_800779C4[arg0].unk_04) { + if (i < gSaveSlotMetadata[fileIdx].spiritsRescued) { id = filemenu_hudElemIDs[i]; } else { id = filemenu_hudElemIDs[i + 7]; } - set_hud_element_render_pos(id, baseX + 17 + (i * 16), baseY + 44); + hud_element_set_render_pos(id, baseX + 17 + (i * 16), baseY + 44); if (i == 0) { - draw_hud_element_3(id); + hud_element_draw_without_clipping(id); } else { - draw_hud_element_2(id); + hud_element_draw_next(id); } } } @@ -220,13 +221,13 @@ void filemenu_draw_contents_file_title( filemenu_set_cursor_goal_pos(fileIdx + 60, baseX - 3, baseY + 8); } - filemenu_draw_message(filemenu_get_menu_message(26), baseX + 5, baseY + 1, 255, 0, 1); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_26), baseX + 5, baseY + 1, 255, 0, 1); - if (D_80077A24[fileIdx] == 0) { + if (!gSaveSlotHasData[fileIdx]) { draw_number(fileIdx + 1, baseX + 33, baseY + 1, 1, 0, 255, 2); } else { draw_number(fileIdx + 1, baseX + 33, baseY + 1, 1, 0, 255, 2); - filemenu_draw_file_name(D_800779C4[fileIdx].unk_07, 8, baseX + 46, baseY + 1, 255, 0, 1, 9); + filemenu_draw_file_name(gSaveSlotMetadata[fileIdx].filename, 8, baseX + 46, baseY + 1, 255, 0, 1, 9); } } @@ -310,15 +311,15 @@ void filemenu_main_init(MenuPanel* menu) { s32 i; for (i = 0; i < ARRAY_COUNT(filemenu_hudElemIDs); i++) { - filemenu_hudElemIDs[i] = create_hud_element(D_80249E20[i]); - set_hud_element_flags(filemenu_hudElemIDs[i], HUD_ELEMENT_FLAGS_80); + filemenu_hudElemIDs[i] = hud_element_create(filemenu_hudElemScripts[i]); + hud_element_set_flags(filemenu_hudElemIDs[i], HUD_ELEMENT_FLAGS_80); } - for (i = 0; i < ARRAY_COUNT(D_80249EA0); i++) { - D_80249EA0[i].tab = menu; + for (i = 0; i < ARRAY_COUNT(filemenu_windowBPs); i++) { + filemenu_windowBPs[i].tab = menu; } - setup_pause_menu_tab(D_80249EA0, ARRAY_COUNT(D_80249EA0)); + setup_pause_menu_tab(filemenu_windowBPs, ARRAY_COUNT(filemenu_windowBPs)); menu->selected = menu->gridData[(menu->page * menu->numCols * menu->numRows) + (menu->numCols * menu->row) + menu->col]; @@ -485,7 +486,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { switch (menu->page) { case 0: - if (menu->selected < 4 && D_80077A24[menu->selected] == 0) { + if (menu->selected < 4 && !gSaveSlotHasData[menu->selected] == 0) { cond = TRUE; } @@ -586,7 +587,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { set_window_update(0x37, filemenu_update_show_options_bottom); filemenu_set_selected(menu, 0, 2); } else if (menu->selected < 4) { - if (D_80077A24[menu->selected] != 0) { + if (gSaveSlotHasData[menu->selected] != 0) { sfx_play_sound(SOUND_MENU_NEXT); set_window_update(0x32, filemenu_update_show_name_confirm); gWindows[50].pos.y = 121; @@ -618,7 +619,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { set_window_update(0x37, filemenu_update_show_options_bottom); filemenu_set_selected(menu, 0, 1); } else if (menu->selected < 4) { - if (D_80077A24[menu->selected] != 0) { + if (gSaveSlotHasData[menu->selected] != 0) { sfx_play_sound(SOUND_MENU_NEXT); menu->page = 4; filemenu_loadedFileIdx = menu->selected; @@ -637,7 +638,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { sfx_play_sound(SOUND_MENU_ERROR); } else { filemenu_iterFileIdx = menu->selected; - if (D_80077A24[menu->selected] == 0) { + if (gSaveSlotHasData[menu->selected] == 0) { sfx_play_sound(SOUND_MENU_NEXT); filemenu_8024C098 = 2; filemenu_menus[filemenu_8024C098]->page = 2; @@ -651,9 +652,9 @@ void filemenu_main_handle_input(MenuPanel* menu) { set_window_update(0x2F, 1); set_window_update(0x32, 2); fio_load_game(filemenu_loadedFileIdx); - D_800779C4[filemenu_iterFileIdx] = D_800779C4[filemenu_loadedFileIdx]; + gSaveSlotMetadata[filemenu_iterFileIdx] = gSaveSlotMetadata[filemenu_loadedFileIdx]; fio_save_game(filemenu_iterFileIdx); - D_80077A24[filemenu_iterFileIdx] = 1; + gSaveSlotHasData[filemenu_iterFileIdx] = 1; } else { sfx_play_sound(SOUND_MENU_NEXT); set_window_update(0x32, filemenu_update_show_name_confirm); @@ -681,7 +682,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { sfx_play_sound(SOUND_MENU_NEXT); set_game_mode(0xD); } else if (menu->selected < 4) { - if (D_80077A24[menu->selected] == 0) { + if (gSaveSlotHasData[menu->selected] == 0) { sfx_play_sound(SOUND_MENU_NEXT); filemenu_8024C098 = 2; filemenu_menus[filemenu_8024C098]->page = 1; @@ -689,7 +690,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { set_window_update(0x2F, 1); set_window_update(0x32, 2); fio_save_game(menu->selected); - D_80077A24[menu->selected] = 1; + gSaveSlotHasData[menu->selected] = 1; } else { sfx_play_sound(SOUND_MENU_NEXT); set_window_update(0x32, filemenu_update_show_name_confirm); @@ -787,6 +788,6 @@ void filemenu_main_cleanup(void) { s32 i; for (i = 0; i < ARRAY_COUNT(filemenu_hudElemIDs); i++) { - free_hud_element(filemenu_hudElemIDs[i]); + hud_element_free(filemenu_hudElemIDs[i]); } } diff --git a/src/167570.c b/src/167570.c index 1c512c02a0..7108692748 100644 --- a/src/167570.c +++ b/src/167570.c @@ -44,8 +44,8 @@ void filemenu_yesno_draw_options_contents(MenuPanel* tab, s32 posX, s32 posY) { break; } - filemenu_draw_message(filemenu_get_menu_message(0xE), posX + xOffset1, posY + yOffset1, 0xFF, 0, 0); - filemenu_draw_message(filemenu_get_menu_message(0xF), posX + xOffset2, posY + yOffset2, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_YES), posX + xOffset1, posY + yOffset1, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_NO), posX + xOffset2, posY + yOffset2, 0xFF, 0, 0); if (filemenu_8024C098 == 1) { if (tab->selected == 0) { @@ -65,23 +65,23 @@ void filemenu_yesno_draw_prompt_contents(MenuPanel* tab, s32 posX, s32 posY) { switch (tab->page) { case 0: - filemenu_draw_message(filemenu_get_menu_message(0x10), posX + 10, posY + 4, 0xFF, 0, 0); - filemenu_draw_message(filemenu_get_menu_message(0x16), posX + 60, posY + 4, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_DELETE), posX + 10, posY + 4, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_22), posX + 60, posY + 4, 0xFF, 0, 0); draw_number(filemenu_menus[0]->selected + 1, posX + 98, posY + 6, 0, 0, 0xFF, 3); - filemenu_draw_message(filemenu_get_menu_message(0x21), posX + 99, posY + 4, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_QUESTION), posX + 99, posY + 4, 0xFF, 0, 0); break; case 3: - filemenu_draw_message(filemenu_get_menu_message(0x16), posX + 10, posY + 4, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_22), posX + 10, posY + 4, 0xFF, 0, 0); draw_number(filemenu_menus[0]->selected + 1, posX + 48, posY + 6, 0, 0, 0xFF, 3); - filemenu_draw_message(filemenu_get_menu_message(0x17), posX + 49, posY + 4, 0xFF, 0, 0); - filemenu_draw_message(filemenu_get_menu_message(0x18), posX + 10, posY + 18, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_WILL_BE_DELETED), posX + 49, posY + 4, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_OK_TO_COPY_TO_THIS_FILE), posX + 10, posY + 18, 0xFF, 0, 0); break; case 1: - filemenu_draw_message(filemenu_get_menu_message(0x11), posX + 10, posY + 4, 0xFF, 0, 0); - filemenu_draw_message(filemenu_get_menu_message(0x12), posX + 10, posY + 18, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_OVERRIDE_TO_NEW_DATA), posX + 10, posY + 4, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_SAVE_OK), posX + 10, posY + 18, 0xFF, 0, 0); break; case 2: - filemenu_draw_message(filemenu_get_menu_message(0x13), posX + 10, posY + 6, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_NAME_IS), posX + 10, posY + 6, 0xFF, 0, 0); for (i = ARRAY_COUNT(filemenu_8024C110) - 1; i >= 0; i--) { if (filemenu_8024C110[i] != 0xF7) { @@ -92,14 +92,14 @@ void filemenu_yesno_draw_prompt_contents(MenuPanel* tab, s32 posX, s32 posY) { xOffset = (147 - (i * 11)) / 2; filemenu_draw_file_name(&filemenu_8024C110, i + 1, posX + xOffset, posY + 22, 0xFF, 0, 8, 0xB); xOffset += (i + 1) * 11; - filemenu_draw_message(filemenu_get_menu_message(0x14), posX + xOffset, posY + 22, 0xFF, 0, 0); - filemenu_draw_message(filemenu_get_menu_message(0x15), posX + 70, posY + 38, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_PERIOD_20), posX + xOffset, posY + 22, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_OK), posX + 70, posY + 38, 0xFF, 0, 0); break; case 4: - filemenu_draw_message(filemenu_get_menu_message(0x19), posX + 10, posY + 4, 0xFF, 0, 0); - filemenu_draw_message(filemenu_get_menu_message(0x16), posX + 127, posY + 4, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_START_GAME_WITH), posX + 10, posY + 4, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_22), posX + 127, posY + 4, 0xFF, 0, 0); draw_number(filemenu_menus[0]->selected + 1, posX + 165, posY + 6, 0, 0, 0xFF, 3); - filemenu_draw_message(filemenu_get_menu_message(0x21), posX + 162, posY + 4, 0xFF, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_QUESTION), posX + 162, posY + 4, 0xFF, 0, 0); break; } } diff --git a/src/168590.c b/src/168590.c index 9463a1d1fd..56c91c139a 100644 --- a/src/168590.c +++ b/src/168590.c @@ -12,26 +12,26 @@ void filemenu_info_draw_message_contents(MenuPanel* menu, s32 baseX, s32 baseY) switch (page) { case 0: - filemenu_draw_message(filemenu_get_menu_message(0x1A), baseX + 10, baseY + 4, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_26), baseX + 10, baseY + 4, 255, 0, 0); draw_number(filemenu_menus[0]->selected + 1, baseX + 48, baseY + 6, 0, 0, 255, 3); - filemenu_draw_message(filemenu_get_menu_message(0x1B), baseX + 49, baseY + 4, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_HAS_BEEN_DELETED), baseX + 49, baseY + 4, 255, 0, 0); break; case 2: - filemenu_draw_message(filemenu_get_menu_message(0x1D), baseX + 10, baseY + 4, 255, 0, 0); - filemenu_draw_message(filemenu_get_menu_message(0x1A), baseX + 84, baseY + 4, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_COPY_FROM), baseX + 10, baseY + 4, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_26), baseX + 84, baseY + 4, 255, 0, 0); draw_number(filemenu_loadedFileIdx + 1, baseX + 122, baseY + 6, 0, 0, 255, 3); - filemenu_draw_message(filemenu_get_menu_message(0x1E), baseX + 10, baseY + 18, 255, 0, 0); - filemenu_draw_message(filemenu_get_menu_message(0x1A), baseX + 30, baseY + 18, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_TO), baseX + 10, baseY + 18, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_26), baseX + 30, baseY + 18, 255, 0, 0); draw_number(filemenu_iterFileIdx + 1, baseX + 68, baseY + 20, 0, 0, 255, 3); - filemenu_draw_message(filemenu_get_menu_message(0x22), baseX + 65, baseY + 18, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_PERIOD_34), baseX + 65, baseY + 18, 255, 0, 0); break; case 1: - filemenu_draw_message(filemenu_get_menu_message(0x1C), baseX + 10, baseY + 4, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_28), baseX + 10, baseY + 4, 255, 0, 0); break; case 3: - filemenu_draw_message(filemenu_get_menu_message(0x1A), baseX + 10, baseY + 4, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_FILE_26), baseX + 10, baseY + 4, 255, 0, 0); draw_number(filemenu_menus[0]->selected + 1, baseX + 48, baseY + 6, 0, 0, 255, page); - filemenu_draw_message(filemenu_get_menu_message(0x1F), baseX + 49, baseY + 4, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_HAS_BEEN_CREATED), baseX + 49, baseY + 4, 255, 0, 0); break; } filemenu_set_cursor_alpha(0); @@ -103,16 +103,16 @@ void filemenu_draw_contents_file_create_header(MenuPanel* menu, s32 baseX, s32 b s32 i; s32 tempAmt; - filemenu_draw_message(filemenu_get_menu_message(0x20), baseX + 10, baseY + 6, 255, 0, 0); + filemenu_draw_message(filemenu_get_menu_message(FILE_MESSAGE_ENTER_A_FILE_NAME), baseX + 10, baseY + 6, 255, 0, 0); filemenu_draw_file_name(filemenu_8024C110, 8, baseX + 36, baseY + 22, 255, 0, 0, 0xB); xOffset = 41; for (i = 0; i < 8; i++) { - set_hud_element_render_pos(D_8024C100_C09980[1], baseX + 42 + (i * 11), baseY + xOffset); + hud_element_set_render_pos(D_8024C100_C09980[1], baseX + 42 + (i * 11), baseY + xOffset); if (i == 0) { - draw_hud_element_3(D_8024C100_C09980[1]); + hud_element_draw_without_clipping(D_8024C100_C09980[1]); } else { - draw_hud_element_2(D_8024C100_C09980[1]); + hud_element_draw_next(D_8024C100_C09980[1]); } } @@ -123,8 +123,8 @@ void filemenu_draw_contents_file_create_header(MenuPanel* menu, s32 baseX, s32 b if (D_8024C090 != tempAmt) { phi_v0 = (D_8024C090 * 0xB) + 45; } - set_hud_element_render_pos(D_8024C100_C09980[0], baseX + phi_v0, baseY + 45); - draw_hud_element_2(D_8024C100_C09980[0]); + hud_element_set_render_pos(D_8024C100_C09980[0], baseX + phi_v0, baseY + 45); + hud_element_draw_next(D_8024C100_C09980[0]); } } @@ -141,6 +141,6 @@ void filemenu_choose_name_cleanup(void) { s32 i; for (i = 0; i < ARRAY_COUNT(D_8024C100_C09980); i++) { - free_hud_element(D_8024C100_C09980[i]); + hud_element_free(D_8024C100_C09980[i]); } } diff --git a/src/16F740.c b/src/16F740.c index 0e97e193f7..beff1f6f4d 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -410,8 +410,8 @@ void btl_state_update_victory(void) { if (gBattleStatus.flags1 & BS_FLAGS1_1000000) { gBattleStatus.flags1 &= ~BS_FLAGS1_40000; } - if ((u16) playerData->unk_2A4[0] < 0x270F) { - playerData->unk_2A4[0]++; + if ((u16) playerData->battlesWon < 9999) { + playerData->battlesWon++; } if (gBattleStatus.flags1 & BS_FLAGS1_40000) { currentEncounter->battleOutcome = OUTCOME_ENEMY_FLED; diff --git a/src/16c8e0.c b/src/16c8e0.c index c957d881cc..c2a1ef8cd3 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -198,25 +198,25 @@ void initialize_battle(void) { func_8024EDC0(); func_80268E88(); set_windows_visible(WINDOW_GROUP_1); - D_8029EFBC = create_hud_element(HudScript_HPBar); - set_hud_element_flags(D_8029EFBC, HUD_ELEMENT_FLAGS_80); + D_8029EFBC = hud_element_create(HudScript_HPBar); + hud_element_set_flags(D_8029EFBC, HUD_ELEMENT_FLAGS_80); for (i = 0; i < ARRAY_COUNT(D_8029EFC0); i++) { - hudElemID = D_8029EFC0[i] = create_hud_element(HudScript_Item_StarPoint); - set_hud_element_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_depth(hudElemID, 20); + hudElemID = D_8029EFC0[i] = hud_element_create(HudScript_Item_StarPoint); + hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_depth(hudElemID, 20); } for (i = 0; i < ARRAY_COUNT(D_8029EFE8); i++) { - hudElemID = D_8029EFE8[i] = create_hud_element(HudScript_StatusSPShine); - set_hud_element_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_depth(hudElemID, 20); + hudElemID = D_8029EFE8[i] = hud_element_create(HudScript_StatusSPShine); + hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_depth(hudElemID, 20); } for (i = 0; i < ARRAY_COUNT(D_8029F010); i++) { - hudElemID = D_8029F010[i] = create_hud_element(HudScript_Item_SmallStarPoint); - set_hud_element_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_depth(hudElemID, 20); + hudElemID = D_8029F010[i] = hud_element_create(HudScript_Item_SmallStarPoint); + hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_depth(hudElemID, 20); } tattleCam->fpDoPreRender = func_8023F088; @@ -770,10 +770,10 @@ void btl_draw_enemy_health_bars(void) { get_screen_coords(1, x, y, z, &screenX, &screenY, &screenZ); screenY += 16; id = D_8029EFBC; - set_hud_element_render_depth(id, 10); - set_hud_element_anim(id, &HudScript_HPBar); - set_hud_element_render_pos(id, screenX, screenY); - draw_hud_element_clipped(id); + hud_element_set_render_depth(id, 10); + hud_element_set_script(id, &HudScript_HPBar); + hud_element_set_render_pos(id, screenX, screenY); + hud_element_draw_clipped(id); temp = currentHP / 10; ones = currentHP % 10; @@ -781,20 +781,20 @@ void btl_draw_enemy_health_bars(void) { // tens digit if (temp > 0) { id = D_8029EFBC; - set_hud_element_render_depth(id, 10); - set_hud_element_anim(id, bHPDigitHudScripts[temp]); + hud_element_set_render_depth(id, 10); + hud_element_set_script(id, bHPDigitHudScripts[temp]); btl_draw_prim_quad(0, 0, 0, 0, screenX, screenY + 2, 8, 8); - set_hud_element_render_pos(id, screenX + 4, screenY + 6); - draw_hud_element_2(id); + hud_element_set_render_pos(id, screenX + 4, screenY + 6); + hud_element_draw_next(id); } // ones digit id = D_8029EFBC; - set_hud_element_render_depth(id, 10); - set_hud_element_anim(id, bHPDigitHudScripts[ones]); + hud_element_set_render_depth(id, 10); + hud_element_set_script(id, bHPDigitHudScripts[ones]); btl_draw_prim_quad(0, 0, 0, 0, screenX + 6, screenY + 2, 8, 8); - set_hud_element_render_pos(id, screenX + 10, screenY + 6); - draw_hud_element_2(id); + hud_element_set_render_pos(id, screenX + 10, screenY + 6); + hud_element_draw_next(id); temp = enemy->hpFraction; temp = 25 - temp; @@ -883,26 +883,26 @@ void btl_update_starpoints_display(void) { for (i = 0; i < tens; i++) { id = D_8029EFC0[i]; - if (get_hud_element_anim(id) != HudScript_Item_StarPoint) { - set_hud_element_anim(id, HudScript_Item_StarPoint); + if (hud_element_get_script(id) != HudScript_Item_StarPoint) { + hud_element_set_script(id, HudScript_Item_StarPoint); } - clear_hud_element_flags(id, 2); - set_hud_element_render_pos(id, posX, posY); - draw_hud_element_clipped(id); + hud_element_clear_flags(id, 2); + hud_element_set_render_pos(id, posX, posY); + hud_element_draw_clipped(id); id = D_8029EFE8[i]; - if (get_hud_element_anim(id) != HudScript_StatusSPShine) { - set_hud_element_anim(id, HudScript_StatusSPShine); + if (hud_element_get_script(id) != HudScript_StatusSPShine) { + hud_element_set_script(id, HudScript_StatusSPShine); } - clear_hud_element_flags(id, 2); - set_hud_element_render_pos(id, posX, posY - 5); - draw_hud_element_clipped(id); + hud_element_clear_flags(id, 2); + hud_element_set_render_pos(id, posX, posY - 5); + hud_element_draw_clipped(id); posX -= (one * 20.0f); } for (; i < ARRAY_COUNT(D_8029EFC0); i++) { - set_hud_element_flags(D_8029EFC0[i], 2); - set_hud_element_flags(D_8029EFE8[i], 2); + hud_element_set_flags(D_8029EFC0[i], 2); + hud_element_set_flags(D_8029EFE8[i], 2); } posX = D_8029DA40; @@ -916,17 +916,17 @@ void btl_update_starpoints_display(void) { for (i = 0; i < ones; i++) { id = D_8029F010[i]; - if (get_hud_element_anim(id) != HudScript_Item_SmallStarPoint) { - set_hud_element_anim(id, HudScript_Item_SmallStarPoint); + if (hud_element_get_script(id) != HudScript_Item_SmallStarPoint) { + hud_element_set_script(id, HudScript_Item_SmallStarPoint); } - clear_hud_element_flags(id, 2); - set_hud_element_render_pos(id, posX, posY); - draw_hud_element_clipped(id); + hud_element_clear_flags(id, 2); + hud_element_set_render_pos(id, posX, posY); + hud_element_draw_clipped(id); posX -= one * 10.0f; } for (; i < ARRAY_COUNT(D_8029F010); i++) { - set_hud_element_flags(D_8029F010[i], 2); + hud_element_set_flags(D_8029F010[i], 2); } } } diff --git a/src/18C790.c b/src/18C790.c index d0ff360097..a8cfe7018a 100644 --- a/src/18C790.c +++ b/src/18C790.c @@ -302,60 +302,60 @@ void btl_state_update_celebration(void) { set_background_color_blend(0, 0, 0, ((10 - D_8029FB4C) * 0x10) & 0xF0); } } else { - id = create_hud_element(&D_802A9F0C); + id = hud_element_create(&D_802A9F0C); D_8029FA80[0] = id; - set_hud_element_render_pos(id, 310, 140); - set_hud_element_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_render_pos(id, 310, 140); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); - id = create_hud_element(&D_802A9F5C); + id = hud_element_create(&D_802A9F5C); D_8029FA80[1] = id; - set_hud_element_render_pos(id, 158, 340); - set_hud_element_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_render_pos(id, 158, 340); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); - id = create_hud_element(&D_802A9F84); + id = hud_element_create(&D_802A9F84); D_8029FA80[3] = id; - set_hud_element_render_pos(id, 158, 340); - set_hud_element_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_render_pos(id, 158, 340); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); - id = create_hud_element(&D_802A9FAC); + id = hud_element_create(&D_802A9FAC); D_8029FA80[2] = id; - set_hud_element_render_pos(id, 6, 140); - set_hud_element_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_render_pos(id, 6, 140); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); - id = create_hud_element(D_802841B4); + id = hud_element_create(D_802841B4); D_8029FA90[0][0] = id; - set_hud_element_render_pos(id, 160, 317); - set_hud_element_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_render_pos(id, 160, 317); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); for (i = 1; i < ARRAY_COUNT(D_8029FA90[0]); i++) { - id = create_hud_element(D_802841C0[0][0]); + id = hud_element_create(D_802841C0[0][0]); D_8029FA90[0][i] = id; - set_hud_element_render_pos(id, 160, 317); - set_hud_element_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, 160, 317); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); } - id = create_hud_element(D_802841B8); + id = hud_element_create(D_802841B8); D_8029FA90[0][7] = id; - set_hud_element_render_pos(id, 312, 117); - set_hud_element_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_render_pos(id, 312, 117); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); for (i = 1; i < ARRAY_COUNT(D_8029FA90[0]); i++) { - id = create_hud_element(D_802841C0[1][0]); + id = hud_element_create(D_802841C0[1][0]); D_8029FA90[1][i] = id; - set_hud_element_render_pos(id, 312, 117); - set_hud_element_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, 312, 117); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); } - id = create_hud_element(D_802841BC); + id = hud_element_create(D_802841BC); D_8029FA90[2][0] = id; - set_hud_element_render_pos(id, 8, 117); - set_hud_element_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_render_pos(id, 8, 117); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); for (i = 1; i < ARRAY_COUNT(D_8029FA90[20]); i++) { - id = create_hud_element(D_802841C0[2][0]); + id = hud_element_create(D_802841C0[2][0]); D_8029FA90[2][i] = id; - set_hud_element_render_pos(id, 8, 117); - set_hud_element_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, 8, 117); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); } D_8029FB60[0] = 0; @@ -366,67 +366,67 @@ void btl_state_update_celebration(void) { fpTens = playerData->curMaxFP / 10; fpOnes = playerData->curMaxFP % 10; id = D_8029FA90[0][1]; - set_hud_element_anim(id, D_80284238[0][fpTens]); + hud_element_set_script(id, D_80284238[0][fpTens]); if (fpTens != 0) { - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); } - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x - 14, y + 46); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x - 14, y + 46); id = D_8029FA90[0][2]; - set_hud_element_anim(id, D_80284238[0][fpOnes]); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x - 8, y + 46); + hud_element_set_script(id, D_80284238[0][fpOnes]); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x - 8, y + 46); id = D_8029FA90[0][3]; - set_hud_element_anim(id, &D_802AA320); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x - 3, y + 46); + hud_element_set_script(id, &D_802AA320); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x - 3, y + 46); fpTens = (playerData->curMaxFP + 5) / 10; fpOnes = (playerData->curMaxFP + 5) % 10; id = D_8029FA90[0][4]; - set_hud_element_anim(id, D_802841C0[0][fpTens]); + hud_element_set_script(id, D_802841C0[0][fpTens]); if (fpTens != 0) { - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); } - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x + 3, y + 46); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x + 3, y + 46); id = D_8029FA90[0][5]; - set_hud_element_anim(id, D_802841C0[0][fpOnes]); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x + 10, y + 46); + hud_element_set_script(id, D_802841C0[0][fpOnes]); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x + 10, y + 46); } else { id = D_8029FA90[0][4]; fpTens = playerData->curMaxFP / 10; fpOnes = playerData->curMaxFP % 10; - set_hud_element_anim(id, D_802841C0[0][fpTens]); + hud_element_set_script(id, D_802841C0[0][fpTens]); if (fpTens != 0) { - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); } - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x - 6, y + 46); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x - 6, y + 46); id = D_8029FA90[0][5]; - set_hud_element_anim(id, D_802841C0[0][fpOnes]); - clear_hud_element_flags(id, 2); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x + 2, y + 46); + hud_element_set_script(id, D_802841C0[0][fpOnes]); + hud_element_clear_flags(id, 2); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x + 2, y + 46); D_8029FB60[1] = 1; } - if (is_ability_active(0xC)) { + if (is_ability_active(ABILITY_FP_PLUS)) { id = D_8029FAA8; - set_hud_element_anim(id, gItemHudScripts[gItemTable[248].iconID].enabled); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_scale(id, 0.5f); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x + 17, y + 46); + hud_element_set_script(id, gItemHudScripts[gItemTable[248].iconID].enabled); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_scale(id, 0.5f); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x + 17, y + 46); } if (playerData->hardMaxHP != 50) { @@ -434,68 +434,68 @@ void btl_state_update_celebration(void) { fpOnes = playerData->curMaxHP % 10; id = D_8029FA90[1][1]; - set_hud_element_anim(id, D_80284238[1][fpTens]); + hud_element_set_script(id, D_80284238[1][fpTens]); if (fpTens != 0) { - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); } - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x - 14, y + 46); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x - 14, y + 46); id = D_8029FA90[1][2]; - set_hud_element_anim(id, D_80284238[1][fpOnes]); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x - 8, y + 46); + hud_element_set_script(id, D_80284238[1][fpOnes]); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x - 8, y + 46); id = D_8029FA90[1][3]; - set_hud_element_anim(id, &D_802AA694); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x - 3, y + 46); + hud_element_set_script(id, &D_802AA694); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x - 3, y + 46); fpTens = (playerData->curMaxHP + 5) / 10; fpOnes = (playerData->curMaxHP + 5) % 10; id = D_8029FA90[1][4]; - set_hud_element_anim(id, D_802841C0[1][fpTens]); + hud_element_set_script(id, D_802841C0[1][fpTens]); if (fpTens != 0) { - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); } - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x + 3, y + 46); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x + 3, y + 46); id = D_8029FA90[1][5]; - set_hud_element_anim(id, D_802841C0[1][fpOnes]); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x + 10, y + 46); + hud_element_set_script(id, D_802841C0[1][fpOnes]); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x + 10, y + 46); } else { fpTens = playerData->curMaxHP / 10; fpOnes = playerData->curMaxHP % 10; id = D_8029FA90[1][4]; - set_hud_element_anim(id, D_802841C0[1][fpTens]); + hud_element_set_script(id, D_802841C0[1][fpTens]); if (fpTens != 0) { - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); } - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x - 6, y + 46); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x - 6, y + 46); id = D_8029FA90[1][5]; - set_hud_element_anim(id, D_802841C0[1][fpOnes]); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x + 2, y + 46); + hud_element_set_script(id, D_802841C0[1][fpOnes]); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x + 2, y + 46); D_8029FB60[0] = 1; } - if (is_ability_active(4)) { + if (is_ability_active(ABILITY_HP_PLUS)) { id = D_8029FAC4; - set_hud_element_anim(id, gItemHudScripts[gItemTable[231].iconID].enabled); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_scale(id, 0.5f); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x + 17, y + 46); + hud_element_set_script(id, gItemHudScripts[gItemTable[231].iconID].enabled); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_scale(id, 0.5f); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x + 17, y + 46); } if (playerData->maxBP != 30) { @@ -503,69 +503,69 @@ void btl_state_update_celebration(void) { fpOnes = playerData->maxBP % 10; id = D_8029FA90[2][1]; - set_hud_element_anim(id, D_80284238[2][fpTens]); + hud_element_set_script(id, D_80284238[2][fpTens]); if (fpTens != 0) { - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); } - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x - 14, y + 46); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x - 14, y + 46); id = D_8029FA90[2][2]; - set_hud_element_anim(id, D_80284238[2][fpOnes]); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x - 8, y + 46); + hud_element_set_script(id, D_80284238[2][fpOnes]); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x - 8, y + 46); id = D_8029FA90[2][3]; - set_hud_element_anim(id, &D_802AAA08); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x - 3, y + 46); + hud_element_set_script(id, &D_802AAA08); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x - 3, y + 46); fpTens = (playerData->maxBP + 3) / 10; fpOnes = (playerData->maxBP + 3) % 10; id = D_8029FA90[2][4]; - set_hud_element_anim(id, D_802841C0[2][fpTens]); + hud_element_set_script(id, D_802841C0[2][fpTens]); if (fpTens != 0) { - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); } - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x + 3, y + 46); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x + 3, y + 46); id = D_8029FA90[2][5]; - set_hud_element_anim(id, D_802841C0[2][fpOnes]); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x + 10, y + 46); + hud_element_set_script(id, D_802841C0[2][fpOnes]); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x + 10, y + 46); } else { id = D_8029FA90[2][4]; - set_hud_element_anim(id, D_802841C0[2][3]); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x - 6, y + 46); + hud_element_set_script(id, D_802841C0[2][3]); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x - 6, y + 46); id = D_8029FA90[2][5]; - set_hud_element_anim(id, D_802841C0[2][0]); - clear_hud_element_flags(id, HUD_ELEMENT_FLAGS_DISABLED); - get_hud_element_render_pos(id, &x, &y); - set_hud_element_render_pos(id, x + 2, y + 46); + hud_element_set_script(id, D_802841C0[2][0]); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_get_render_pos(id, &x, &y); + hud_element_set_render_pos(id, x + 2, y + 46); D_8029FB60[2] = 1; } - D_8029FAE8 = id = create_hud_element(&HudScript_ProjectorBeam); - create_hud_element_transform_B(id); - set_hud_element_render_pos(id, 156, 13); - set_hud_element_tint(id, 255, 255, 255); - set_hud_element_transform_rotation_pivot(id, 0, -35); - set_hud_element_transform_rotation(id, 0.0f, 0.0f, 180.0f); - set_hud_element_transform_scale(id, 1.0f, 1.5f, 1.0f); - set_hud_element_alpha(id, 200); - set_hud_element_flags(id, HUD_ELEMENT_FLAGS_8000 | HUD_ELEMENT_FLAGS_80); + D_8029FAE8 = id = hud_element_create(&HudScript_ProjectorBeam); + hud_element_create_transform_B(id); + hud_element_set_render_pos(id, 156, 13); + hud_element_set_tint(id, 255, 255, 255); + hud_element_set_transform_rotation_pivot(id, 0, -35); + hud_element_set_transform_rotation(id, 0.0f, 0.0f, 180.0f); + hud_element_set_transform_scale(id, 1.0f, 1.5f, 1.0f); + hud_element_set_alpha(id, 200); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); - D_8029FB48 = id = create_hud_element(&D_802AAA30); - set_hud_element_render_pos(id, 0, 0); - set_hud_element_flags(id, HUD_ELEMENT_FLAGS_80); + D_8029FB48 = id = hud_element_create(&D_802AAA30); + hud_element_set_render_pos(id, 0, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); battleStatus->currentSubmenu = 1; D_8029FB4C = 10; gBattleState2 = BATTLE_STATE2_UNK_7; @@ -573,49 +573,49 @@ void btl_state_update_celebration(void) { break; case BATTLE_STATE2_UNK_7: id = D_8029FA80[0]; - get_hud_element_render_pos(id, &x, &y); + hud_element_get_render_pos(id, &x, &y); x -= 20; - set_hud_element_render_pos(id, x, y); + hud_element_set_render_pos(id, x, y); for (i = 0; i < ARRAY_COUNT(D_8029FA90[1]); i++) { id = D_8029FA90[1][i]; - get_hud_element_render_pos(id, &x, &y); + hud_element_get_render_pos(id, &x, &y); x -= 20; - set_hud_element_render_pos(id, x, y); + hud_element_set_render_pos(id, x, y); } id = D_8029FA80[1]; - get_hud_element_render_pos(id, &x, &y); + hud_element_get_render_pos(id, &x, &y); y -= 20; - set_hud_element_render_pos(id, x, y); + hud_element_set_render_pos(id, x, y); id = D_8029FA80[3]; - get_hud_element_render_pos(id, &x, &y); + hud_element_get_render_pos(id, &x, &y); y -= 20; - set_hud_element_render_pos(id, x, y); + hud_element_set_render_pos(id, x, y); for (i = 0; i < ARRAY_COUNT(D_8029FA90[0]); i++) { id = D_8029FA90[0][i]; - get_hud_element_render_pos(id, &x, &y); + hud_element_get_render_pos(id, &x, &y); y -= 20; - set_hud_element_render_pos(id, x, y); + hud_element_set_render_pos(id, x, y); } id = D_8029FA88; - get_hud_element_render_pos(id, &x, &y); + hud_element_get_render_pos(id, &x, &y); x += 20; - set_hud_element_render_pos(id, x, y); + hud_element_set_render_pos(id, x, y); for (i = 0; i < ARRAY_COUNT(D_8029FA90[2]); i++) { id = D_8029FA90[2][i]; - get_hud_element_render_pos(id, &x, &y); + hud_element_get_render_pos(id, &x, &y); x += 20; - set_hud_element_render_pos(id, x, y); + hud_element_set_render_pos(id, x, y); } D_8029FB4C--; if (D_8029FB4C == 0) { - set_hud_element_tint(id, 128, 128, 128); + hud_element_set_tint(id, 128, 128, 128); x = 20; y = 186; set_window_properties(8, 20, 186, 280, 32, 20, func_80260948, NULL, -1); @@ -661,7 +661,7 @@ void btl_state_update_celebration(void) { } break; case BATTLE_STATE2_UNK_9: - free_hud_element(D_8029FAE8); + hud_element_free(D_8029FAE8); set_window_update(8, WINDOW_UPDATE_HIDE); switch (battleStatus->currentSubmenu) { @@ -715,27 +715,27 @@ void btl_state_update_celebration(void) { if ((gGameStatusPtr->frameCounter % 2) != 0) { switch (battleStatus->currentSubmenu) { case 0: - set_hud_element_flags(D_8029FA80[0], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(D_8029FA80[0], HUD_ELEMENT_FLAGS_DISABLED); break; case 1: - set_hud_element_flags(D_8029FA80[1], HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_flags(D_8029FA80[3], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(D_8029FA80[1], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(D_8029FA80[3], HUD_ELEMENT_FLAGS_DISABLED); break; case 2: - set_hud_element_flags(D_8029FA88, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(D_8029FA88, HUD_ELEMENT_FLAGS_DISABLED); break; } } else { switch (battleStatus->currentSubmenu) { case 0: - clear_hud_element_flags(D_8029FA80[0], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(D_8029FA80[0], HUD_ELEMENT_FLAGS_DISABLED); break; case 1: - clear_hud_element_flags(D_8029FA80[1], HUD_ELEMENT_FLAGS_DISABLED); - clear_hud_element_flags(D_8029FA80[3], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(D_8029FA80[1], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(D_8029FA80[3], HUD_ELEMENT_FLAGS_DISABLED); break; case 2: - clear_hud_element_flags(D_8029FA88, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(D_8029FA88, HUD_ELEMENT_FLAGS_DISABLED); break; } } @@ -749,18 +749,18 @@ void btl_state_update_celebration(void) { } break; case BATTLE_STATE2_UNK_B: - free_hud_element(D_8029FA80[0]); - free_hud_element(D_8029FA80[1]); - free_hud_element(D_8029FA80[3]); - free_hud_element(D_8029FA80[2]); + hud_element_free(D_8029FA80[0]); + hud_element_free(D_8029FA80[1]); + hud_element_free(D_8029FA80[3]); + hud_element_free(D_8029FA80[2]); for (i = 0; i < ARRAY_COUNT(D_8029FA90); i++) { for (j = 0; j < ARRAY_COUNT(D_8029FA90[0]); j++) { - free_hud_element(D_8029FA90[i][j]); + hud_element_free(D_8029FA90[i][j]); } } - free_hud_element(D_8029FB48); + hud_element_free(D_8029FB48); set_background_color_blend(0, 0, 0, 0); btl_set_state(0x20); gBattleState2 = BATTLE_STATE2_UNK_2; @@ -880,13 +880,13 @@ void btl_draw_upgrade_windows(s32 arg0) { break; } - get_hud_element_render_pos(D_8029FA80[0], &x, &y); + hud_element_get_render_pos(D_8029FA80[0], &x, &y); draw_box(0, 0xF, x - 22, y - 22, 0, 44, 44, 255, d1, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); - get_hud_element_render_pos(D_8029FA80[3], &x, &y); + hud_element_get_render_pos(D_8029FA80[3], &x, &y); draw_box(0, 0xF, x - 22, y - 22, 0, 44, 44, 255, d2, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); - get_hud_element_render_pos(D_8029FA80[2], &x, &y); + hud_element_get_render_pos(D_8029FA80[2], &x, &y); draw_box(0, 0xF, x - 22, y - 22, 0, 44, 44, 255, d3, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); } @@ -905,24 +905,24 @@ void btl_state_draw_celebration(void) { case BATTLE_STATE2_UNK_7: btl_draw_upgrade_windows(0); id = D_8029FA80[0]; - set_hud_element_tint(id, 128, 128, 128); - draw_hud_element_clipped(id); + hud_element_set_tint(id, 128, 128, 128); + hud_element_draw_clipped(id); id = D_8029FA80[3]; - set_hud_element_tint(id, 128, 128, 128); - draw_hud_element_clipped(id); + hud_element_set_tint(id, 128, 128, 128); + hud_element_draw_clipped(id); id = D_8029FA80[1]; - set_hud_element_tint(id, 128, 128, 128); - draw_hud_element_clipped(id); + hud_element_set_tint(id, 128, 128, 128); + hud_element_draw_clipped(id); id = D_8029FA80[2]; - set_hud_element_tint(id, 128, 128, 128); - draw_hud_element_clipped(id); + hud_element_set_tint(id, 128, 128, 128); + hud_element_draw_clipped(id); for (j = 0; j < ARRAY_COUNT(D_8029FA90); j++) { for (i = 0; i < ARRAY_COUNT(D_8029FA90[0]); i++) { id = D_8029FA90[j][i]; - set_hud_element_tint(id, 128, 128, 128); - draw_hud_element_clipped(id); + hud_element_set_tint(id, 128, 128, 128); + hud_element_draw_clipped(id); } } break; @@ -932,127 +932,127 @@ void btl_state_draw_celebration(void) { switch (battleStatus->currentSubmenu) { case 0: rotZ = 152; - set_hud_element_tint(D_8029FA80[0], 255, 255, 255); - set_hud_element_tint(D_8029FA80[3], 128, 128, 128); - set_hud_element_tint(D_8029FA80[1], 128, 128, 128); - set_hud_element_tint(D_8029FA80[2], 128, 128, 128); + hud_element_set_tint(D_8029FA80[0], 255, 255, 255); + hud_element_set_tint(D_8029FA80[3], 128, 128, 128); + hud_element_set_tint(D_8029FA80[1], 128, 128, 128); + hud_element_set_tint(D_8029FA80[2], 128, 128, 128); for (i = 0; i < ARRAY_COUNT(D_8029FA90[0]); i++) { id = D_8029FA90[0][i]; - set_hud_element_tint(id, 128, 128, 128); + hud_element_set_tint(id, 128, 128, 128); } for (i = 0; i < ARRAY_COUNT(D_8029FA90[1]); i++) { id = D_8029FA90[1][i]; - set_hud_element_tint(id, 255, 255, 255); + hud_element_set_tint(id, 255, 255, 255); } for (i = 0; i < ARRAY_COUNT(D_8029FA90[2]); i++) { id = D_8029FA90[2][i]; - set_hud_element_tint(id, 128, 128, 128); + hud_element_set_tint(id, 128, 128, 128); } id = D_8029FA80[0]; - if (get_hud_element_anim(id) != &D_802A9F34) { - set_hud_element_anim(id, &D_802A9F34); + if (hud_element_get_script(id) != &D_802A9F34) { + hud_element_set_script(id, &D_802A9F34); } id = D_8029FA80[3]; - if (get_hud_element_anim(id) != &D_802A9F84) { - set_hud_element_anim(id, &D_802A9F84); + if (hud_element_get_script(id) != &D_802A9F84) { + hud_element_set_script(id, &D_802A9F84); } id = D_8029FA80[1]; - if (get_hud_element_anim(id) != &D_802A9F5C) { - set_hud_element_anim(id, &D_802A9F5C); + if (hud_element_get_script(id) != &D_802A9F5C) { + hud_element_set_script(id, &D_802A9F5C); } id = D_8029FA80[2]; - if (get_hud_element_anim(id) != &D_802A9FAC) { - set_hud_element_anim(id, &D_802A9FAC); + if (hud_element_get_script(id) != &D_802A9FAC) { + hud_element_set_script(id, &D_802A9FAC); } break; case 1: rotZ = 180; - set_hud_element_tint(D_8029FA80[0], 128, 128, 128); - set_hud_element_tint(D_8029FA80[3], 255, 255, 255); - set_hud_element_tint(D_8029FA80[1], 255, 255, 255); - set_hud_element_tint(D_8029FA80[2], 128, 128, 128); + hud_element_set_tint(D_8029FA80[0], 128, 128, 128); + hud_element_set_tint(D_8029FA80[3], 255, 255, 255); + hud_element_set_tint(D_8029FA80[1], 255, 255, 255); + hud_element_set_tint(D_8029FA80[2], 128, 128, 128); for (i = 0; i < ARRAY_COUNT(D_8029FA90[0]); i++) { id = D_8029FA90[0][i]; - set_hud_element_tint(id, 255, 255, 255); + hud_element_set_tint(id, 255, 255, 255); } for (i = 0; i < ARRAY_COUNT(D_8029FA90[1]); i++) { id = D_8029FA90[1][i]; - set_hud_element_tint(id, 128, 128, 128); + hud_element_set_tint(id, 128, 128, 128); } for (i = 0; i < ARRAY_COUNT(D_8029FA90[2]); i++) { id = D_8029FA90[2][i]; - set_hud_element_tint(id, 128, 128, 128); + hud_element_set_tint(id, 128, 128, 128); } break; case 2: default: rotZ = 208; - set_hud_element_tint(D_8029FA80[0], 128, 128, 128); - set_hud_element_tint(D_8029FA80[3], 128, 128, 128); - set_hud_element_tint(D_8029FA80[1], 128, 128, 128); - set_hud_element_tint(D_8029FA80[2], 255, 255, 255); + hud_element_set_tint(D_8029FA80[0], 128, 128, 128); + hud_element_set_tint(D_8029FA80[3], 128, 128, 128); + hud_element_set_tint(D_8029FA80[1], 128, 128, 128); + hud_element_set_tint(D_8029FA80[2], 255, 255, 255); for (i = 0; i < ARRAY_COUNT(D_8029FA90[0]); i++) { id = D_8029FA90[0][i]; - set_hud_element_tint(id, 128, 128, 128); + hud_element_set_tint(id, 128, 128, 128); } for (i = 0; i < ARRAY_COUNT(D_8029FA90[1]); i++) { id = D_8029FA90[1][i]; - set_hud_element_tint(id, 128, 128, 128); + hud_element_set_tint(id, 128, 128, 128); } for (i = 0; i < ARRAY_COUNT(D_8029FA90[2]); i++) { id = D_8029FA90[2][i]; - set_hud_element_tint(id, 255, 255, 255); + hud_element_set_tint(id, 255, 255, 255); } break; } btl_draw_upgrade_windows(1); - draw_hud_element_clipped(D_8029FA80[0]); - draw_hud_element_clipped(D_8029FA80[3]); - draw_hud_element_clipped(D_8029FA80[1]); - draw_hud_element_clipped(D_8029FA80[2]); + hud_element_draw_clipped(D_8029FA80[0]); + hud_element_draw_clipped(D_8029FA80[3]); + hud_element_draw_clipped(D_8029FA80[1]); + hud_element_draw_clipped(D_8029FA80[2]); for (j = 0; j < ARRAY_COUNT(D_8029FA90); j++) { for (i = 0; i < ARRAY_COUNT(D_8029FA90[0]); i++) { - draw_hud_element_clipped(D_8029FA90[j][i]); + hud_element_draw_clipped(D_8029FA90[j][i]); } } func_80144218(-1); id = D_8029FAE8; - set_hud_element_transform_rotation(id, 0.0f, 0.0f, rotZ); + hud_element_set_transform_rotation(id, 0.0f, 0.0f, rotZ); func_80144238(id); break; case BATTLE_STATE2_UNK_9: case BATTLE_STATE2_PLAYER_DEFEATED: btl_draw_upgrade_windows(1); - draw_hud_element_clipped(D_8029FA80[0]); - draw_hud_element_clipped(D_8029FA80[3]); - draw_hud_element_clipped(D_8029FA80[1]); - draw_hud_element_clipped(D_8029FA80[2]); + hud_element_draw_clipped(D_8029FA80[0]); + hud_element_draw_clipped(D_8029FA80[3]); + hud_element_draw_clipped(D_8029FA80[1]); + hud_element_draw_clipped(D_8029FA80[2]); for (j = 0; j < ARRAY_COUNT(D_8029FA90); j++) { for (i = 0; i < ARRAY_COUNT(D_8029FA90[0]); i++) { - draw_hud_element_clipped(D_8029FA90[j][i]); + hud_element_draw_clipped(D_8029FA90[j][i]); } } @@ -1079,8 +1079,8 @@ void btl_state_draw_celebration(void) { D_8029FB8C = -D_8029FB8C / 3; } id = D_8029FB48; - set_hud_element_render_pos(id, D_8029FB88 - 43, 176); - draw_hud_element_clipped(id); + hud_element_set_render_pos(id, D_8029FB88 - 43, 176); + hud_element_draw_clipped(id); break; case BATTLE_STATE2_PLAYER_DEFEATED: D_8029FB8C += 4; @@ -1089,8 +1089,8 @@ void btl_state_draw_celebration(void) { D_8029FB88 = 500; } id = D_8029FB48; - set_hud_element_render_pos(id, D_8029FB88 - 43, 176); - draw_hud_element_clipped(id); + hud_element_set_render_pos(id, D_8029FB88 - 43, 176); + hud_element_draw_clipped(id); break; } } diff --git a/src/18F340.c b/src/18F340.c index 6785f77765..d68bca169c 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -135,8 +135,8 @@ ApiStatus N(GiveRefund)(Evt* script, s32 isInitialCall) { posY = player->currentPos.y; posZ = player->currentPos.z; get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); - D_8029FBA0 = create_hud_element(HudScript_Refund); - set_hud_element_render_pos(D_8029FBA0, iconPosX + 36, iconPosY - 63); + D_8029FBA0 = hud_element_create(HudScript_Refund); + hud_element_set_render_pos(D_8029FBA0, iconPosX + 36, iconPosY - 63); } script->varTable[0] = sleepTime; @@ -148,7 +148,7 @@ ApiStatus N(GiveRefundCleanup)(Evt* script, s32 isInitialCall) { s32 sellValue = gItemTable[gBattleStatus.selectedItemID].sellValue; if (player_team_is_ability_active(gBattleStatus.playerActor, ABILITY_REFUND) && sellValue > 0) { - free_hud_element(D_8029FBA0); + hud_element_free(D_8029FBA0); } return ApiStatus_DONE2; @@ -407,24 +407,24 @@ ApiStatus func_802619E8(Evt* script, s32 isInitialCall) { screenY -= 19; if (script->varTable[10] > 0) { - D_8029FBAC = create_hud_element(HudScript_HPDrain); - set_hud_element_render_pos(D_8029FBAC, screenX, screenY); + D_8029FBAC = hud_element_create(HudScript_HPDrain); + hud_element_set_render_pos(D_8029FBAC, screenX, screenY); screenY += 9; } if (script->varTable[11] > 0 || script->varTable[12] > 0) { - D_8029FBA8 = create_hud_element(HudScript_Happy); - set_hud_element_render_pos(D_8029FBA8, screenX, screenY); + D_8029FBA8 = hud_element_create(HudScript_Happy); + hud_element_set_render_pos(D_8029FBA8, screenX, screenY); } return ApiStatus_DONE2; } ApiStatus func_80261B40(Evt* script, s32 isInitialCall) { if (script->varTable[10] > 0) { - free_hud_element(D_8029FBAC); + hud_element_free(D_8029FBAC); } if (script->varTable[11] > 0 || script->varTable[12] > 0) { - free_hud_element(D_8029FBA8); + hud_element_free(D_8029FBA8); } return ApiStatus_DONE2; } diff --git a/src/196AA0.c b/src/196AA0.c index 210790e6ff..6107231e5e 100644 --- a/src/196AA0.c +++ b/src/196AA0.c @@ -318,8 +318,8 @@ void func_80269118(void) { ActionCommandStatus *actionCommandStatus = &gActionCommandStatus; if (!actionCommandStatus->autoSucceed) { - if (playerData->otherHitsTaken < 9999) { - playerData->otherHitsTaken++; + if (playerData->actionCommandAttempts < 9999) { + playerData->actionCommandAttempts++; actionCommandStatus->hitsTakenIsMax = FALSE; } else { actionCommandStatus->hitsTakenIsMax = TRUE; @@ -331,7 +331,7 @@ void func_80269160(void) { PlayerData* playerData = &gPlayerData; if (!gActionCommandStatus.autoSucceed && gActionCommandStatus.hitsTakenIsMax) { - playerData->unk_296++; + playerData->actionCommandSuccesses++; } } diff --git a/src/19FAF0.c b/src/19FAF0.c index 21a15c7bc0..b9a5fd19aa 100644 --- a/src/19FAF0.c +++ b/src/19FAF0.c @@ -203,14 +203,14 @@ s32 calc_player_test_enemy(void) { sfx_play_sound_at_position(SOUND_IMMUNE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); return 8; } else if ((battleStatus->currentAttackElement & DAMAGE_TYPE_JUMP) && (part->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP) && - !player_team_is_ability_active(player, 2)) + !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD)) { sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); return 4; } else if (!(battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_JUMP)) && (part->eventFlags & ACTOR_EVENT_FLAG_SPIKY_FRONT) && (!(battleStatus->currentAttackEventSuppression & 4) && - !player_team_is_ability_active(player, 2))) + !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD))) { sfx_play_sound_at_position(SOUND_108, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_player_1(1, EVENT_SPIKE_CONTACT); diff --git a/src/1AC760.c b/src/1AC760.c index feed1faa80..ad5faae74a 100644 --- a/src/1AC760.c +++ b/src/1AC760.c @@ -77,7 +77,7 @@ s32 calc_partner_test_enemy(void) { if (!(battleStatus->currentAttackElement & (0x10000000 | 0x80)) && (actorPart->eventFlags & 0x10000) && !(battleStatus->currentAttackEventSuppression & 4) && - !(player_team_is_ability_active(state, 2))) { + !(player_team_is_ability_active(state, ABILITY_SPIKE_SHIELD))) { sfx_play_sound_at_position(0x108, 0, partner->state.currentPos.x, partner->state.currentPos.y, partner->state.currentPos.z); dispatch_damage_event_partner_1(1, 0x2A); diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c index 0b8004747b..760990e7c3 100644 --- a/src/1a1f0_len_5390.c +++ b/src/1a1f0_len_5390.c @@ -697,7 +697,7 @@ s32 check_conversation_trigger(void) { f32 xTemp, yTemp, zTemp; s32 i, j; - playerStatus->unk_C8 = NULL; + playerStatus->encounteredNPC = NULL; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC; playerColliderHeight = playerStatus->colliderHeight; playerColliderRadius = playerStatus->colliderDiameter / 2; @@ -796,7 +796,7 @@ s32 check_conversation_trigger(void) { } if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) && npc != NULL && !is_picking_up_item()) { - playerStatus->unk_C8 = npc; + playerStatus->encounteredNPC = npc; playerStatus->flags |= PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC; if (playerStatus->pressedButtons & BUTTON_A) { close_status_menu(); diff --git a/src/415D90.c b/src/415D90.c index 3f17babe87..e4ee0a6b66 100644 --- a/src/415D90.c +++ b/src/415D90.c @@ -282,18 +282,18 @@ void func_802A10B8(void) { s32* icons1 = D_802AD010; s32* icons2 = D_802AD028; - free_hud_element(icons1[i]); - free_hud_element(icons2[i]); + hud_element_free(icons1[i]); + hud_element_free(icons2[i]); } - free_hud_element(D_802AD040); - free_hud_element(D_802AD044); - free_hud_element(D_802AD048); - free_hud_element(D_802AD04C); - free_hud_element(D_802AD05C); - free_hud_element(D_802AD050); - free_hud_element(D_802AD054); - free_hud_element(D_802AD058); + hud_element_free(D_802AD040); + hud_element_free(D_802AD044); + hud_element_free(D_802AD048); + hud_element_free(D_802AD04C); + hud_element_free(D_802AD05C); + hud_element_free(D_802AD050); + hud_element_free(D_802AD054); + hud_element_free(D_802AD058); } INCLUDE_ASM(s32, "415D90", func_802A11B0); @@ -362,16 +362,16 @@ void func_802A27E4(void) { set_window_update(8, WINDOW_UPDATE_HIDE); for (i = 0; i < battle_menu_moveOptionCount; i++) { - free_hud_element(battle_menu_moveOptionIconIDs[i]); + hud_element_free(battle_menu_moveOptionIconIDs[i]); } - free_hud_element(battle_menu_moveCursorIcon); - free_hud_element(battle_menu_moveUpArrowIcon); - free_hud_element(battle_menu_moveDownArrowIcon); - free_hud_element(battle_menu_moveTitleIcon); + hud_element_free(battle_menu_moveCursorIcon); + hud_element_free(battle_menu_moveUpArrowIcon); + hud_element_free(battle_menu_moveDownArrowIcon); + hud_element_free(battle_menu_moveTitleIcon); for (i = 0; i < battle_menu_moveOptionCount; i++) { - free_hud_element(battle_menu_moveOptionCostUnitIconIDs[i]); + hud_element_free(battle_menu_moveOptionCostUnitIconIDs[i]); } } @@ -383,21 +383,21 @@ void func_802A2910(void) { moveOptionIconIDs = battle_menu_moveOptionIconIDs; for (i = 0; i < battle_menu_moveOptionCount; i++) { - set_hud_element_tint(moveOptionIconIDs[i], 255, 255, 255); + hud_element_set_tint(moveOptionIconIDs[i], 255, 255, 255); } - set_hud_element_tint(battle_menu_moveCursorIcon, 255, 255, 255); - set_hud_element_tint(battle_menu_moveUpArrowIcon, 255, 255, 255); - set_hud_element_tint(battle_menu_moveDownArrowIcon, 255, 255, 255); - set_hud_element_tint(battle_menu_moveTitleIcon, 255, 255, 255); + hud_element_set_tint(battle_menu_moveCursorIcon, 255, 255, 255); + hud_element_set_tint(battle_menu_moveUpArrowIcon, 255, 255, 255); + hud_element_set_tint(battle_menu_moveDownArrowIcon, 255, 255, 255); + hud_element_set_tint(battle_menu_moveTitleIcon, 255, 255, 255); moveOptionCostUnitIconIDs = battle_menu_moveOptionCostUnitIconIDs; for (i = 0; i < battle_menu_moveOptionCount; i++) { - set_hud_element_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255); + hud_element_set_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255); } - set_hud_element_anim(battle_menu_moveCursorIcon, HudScript_AnimatedHandPointer); + hud_element_set_script(battle_menu_moveCursorIcon, HudScript_AnimatedHandPointer); set_window_update(1, WINDOW_UPDATE_TRANSPARENT); if (!battle_menu_hasSpiritsMenu) { @@ -434,21 +434,21 @@ void func_802A2AB8(void) { moveOptionIconIDs = battle_menu_moveOptionIconIDs; for (i = 0; i < battle_menu_moveOptionCount; i++) { - set_hud_element_tint(moveOptionIconIDs[i], 255, 255, 255); + hud_element_set_tint(moveOptionIconIDs[i], 255, 255, 255); } - set_hud_element_tint(battle_menu_moveCursorIcon, 255, 255, 255); - set_hud_element_tint(battle_menu_moveUpArrowIcon, 255, 255, 255); - set_hud_element_tint(battle_menu_moveDownArrowIcon, 255, 255, 255); - set_hud_element_tint(battle_menu_moveTitleIcon, 255, 255, 255); + hud_element_set_tint(battle_menu_moveCursorIcon, 255, 255, 255); + hud_element_set_tint(battle_menu_moveUpArrowIcon, 255, 255, 255); + hud_element_set_tint(battle_menu_moveDownArrowIcon, 255, 255, 255); + hud_element_set_tint(battle_menu_moveTitleIcon, 255, 255, 255); moveOptionCostUnitIconIDs = battle_menu_moveOptionCostUnitIconIDs; for (i = 0; i < battle_menu_moveOptionCount; i++) { - set_hud_element_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255); + hud_element_set_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255); } - set_hud_element_anim(battle_menu_moveCursorIcon, HudScript_AnimatedHandPointer); + hud_element_set_script(battle_menu_moveCursorIcon, HudScript_AnimatedHandPointer); battle_menu_moveTextColor = 10; D_802AD10F = 1; battle_menu_moveState = 20; @@ -489,9 +489,9 @@ void func_802A43DC(s32 arg0, s32 x, s32 y) { void func_802A4448(s32 arg0, s32 x, s32 y) { s32 icon = battle_menu_moveTitleIcon; - set_hud_element_render_pos(icon, x + 16, y + 15); - set_hud_element_alpha(icon, battle_menu_moveTextOpacity); - draw_hud_element_clipped(icon); + hud_element_set_render_pos(icon, x + 16, y + 15); + hud_element_set_alpha(icon, battle_menu_moveTextOpacity); + hud_element_draw_clipped(icon); } void func_802A4494(s32 arg0, s32 x, s32 y) { @@ -581,25 +581,25 @@ void func_802A472C(void) { set_window_update(8, WINDOW_UPDATE_HIDE); for (i = 0; i < D_802AD66C; i++) { - free_hud_element(D_802AD628[i]); + hud_element_free(D_802AD628[i]); } - free_hud_element(D_802AD618); - free_hud_element(D_802AD61C); - free_hud_element(D_802AD620); + hud_element_free(D_802AD618); + hud_element_free(D_802AD61C); + hud_element_free(D_802AD620); } void func_802A47E0(void) { s32 i; for (i = 0; i < D_802AD66C; i++) { - set_hud_element_tint(D_802AD628[i], 0xFF, 0xFF, 0xFF); + hud_element_set_tint(D_802AD628[i], 0xFF, 0xFF, 0xFF); } - set_hud_element_tint(D_802AD618, 0xFF, 0xFF, 0xFF); - set_hud_element_tint(D_802AD61C, 0xFF, 0xFF, 0xFF); - set_hud_element_tint(D_802AD620, 0xFF, 0xFF, 0xFF); - set_hud_element_anim(D_802AD618, HudScript_AnimatedHandPointer); + hud_element_set_tint(D_802AD618, 0xFF, 0xFF, 0xFF); + hud_element_set_tint(D_802AD61C, 0xFF, 0xFF, 0xFF); + hud_element_set_tint(D_802AD620, 0xFF, 0xFF, 0xFF); + hud_element_set_script(D_802AD618, HudScript_AnimatedHandPointer); set_window_update(6, WINDOW_UPDATE_TRANSPARENT); set_window_update(7, WINDOW_UPDATE_TRANSPARENT); set_window_update(8, WINDOW_UPDATE_SHOW); @@ -617,13 +617,13 @@ void func_802A48FC(void) { set_window_update(8, WINDOW_UPDATE_SHOW); for (i = 0; i < D_802AD66C; i++) { - set_hud_element_tint(D_802AD628[i], 0xFF, 0xFF, 0xFF); + hud_element_set_tint(D_802AD628[i], 0xFF, 0xFF, 0xFF); } - set_hud_element_tint(D_802AD618, 0xFF, 0xFF, 0xFF); - set_hud_element_tint(D_802AD61C, 0xFF, 0xFF, 0xFF); - set_hud_element_tint(D_802AD620, 0xFF, 0xFF, 0xFF); - set_hud_element_anim(D_802AD618, HudScript_AnimatedHandPointer); + hud_element_set_tint(D_802AD618, 0xFF, 0xFF, 0xFF); + hud_element_set_tint(D_802AD61C, 0xFF, 0xFF, 0xFF); + hud_element_set_tint(D_802AD620, 0xFF, 0xFF, 0xFF); + hud_element_set_script(D_802AD618, HudScript_AnimatedHandPointer); D_802AD614 = 10; D_802AD60B = 1; D_802AD604 = 20; @@ -698,9 +698,9 @@ void func_802A5290(s32 arg0, s32 x, s32 y) { for (i = 0; i < D_802AD66C; i++, phi_s1_2 += 0xD) { iconIndex = D_802AD628[i]; - set_hud_element_render_pos(iconIndex, xTemp, phi_s1_2); - set_hud_element_alpha(iconIndex, D_802AD624); - draw_hud_element_3(iconIndex); + hud_element_set_render_pos(iconIndex, xTemp, phi_s1_2); + hud_element_set_alpha(iconIndex, D_802AD624); + hud_element_draw_without_clipping(iconIndex); } temp_s1_3 = (D_802AD605 - D_802AD608) * 13; @@ -712,22 +712,22 @@ void func_802A5290(s32 arg0, s32 x, s32 y) { } iconIndex = D_802AD618; - set_hud_element_render_pos(iconIndex, x + 10, y + (D_802AD60E + 26)); - set_hud_element_alpha(iconIndex, D_802AD624); - draw_hud_element_clipped(iconIndex); + hud_element_set_render_pos(iconIndex, x + 10, y + (D_802AD60E + 26)); + hud_element_set_alpha(iconIndex, D_802AD624); + hud_element_draw_clipped(iconIndex); if (D_802AD608 > 0) { iconIndex = D_802AD61C; - set_hud_element_render_pos(iconIndex, x + 67, y + 16); - set_hud_element_alpha(iconIndex, D_802AD624); - draw_hud_element_clipped(iconIndex); + hud_element_set_render_pos(iconIndex, x + 67, y + 16); + hud_element_set_alpha(iconIndex, D_802AD624); + hud_element_draw_clipped(iconIndex); } if (D_802AD609 < D_802AD66C) { iconIndex = D_802AD620; - set_hud_element_render_pos(iconIndex, x + 67, y + 100); - set_hud_element_alpha(iconIndex, D_802AD624); - draw_hud_element_clipped(iconIndex); + hud_element_set_render_pos(iconIndex, x + 67, y + 100); + hud_element_set_alpha(iconIndex, D_802AD624); + hud_element_draw_clipped(iconIndex); } break; diff --git a/src/77480.c b/src/77480.c index 6988af6305..5c30434db3 100644 --- a/src/77480.c +++ b/src/77480.c @@ -13,7 +13,7 @@ void func_800F0C9C(void); extern UNK_FUN_PTR(D_8010C93C); -extern s32 D_802BDF60; +extern s32 GoombarioGetTattleID; extern s8 D_8015A57A; extern s32 D_800F7B4C; @@ -221,7 +221,7 @@ s32 player_raycast_down(f32* x, f32* y, f32* z, f32* length) { entity->unk_07 = 4; entity->flags |= ENTITY_FLAGS_CONTINUOUS_COLLISION; } else { - ret = entityID | 0x4000; + ret = entityID | COLLISION_WITH_ENTITY_BIT; } } @@ -358,7 +358,7 @@ s32 player_raycast_up_corner(f32* x, f32* y, f32* z, f32* length) { sz = sz2; if (hitID >= 0 && *length > hitDepth) { get_entity_by_index(hitID); - ret = hitID | 0x4000; + ret = hitID | COLLISION_WITH_ENTITY_BIT; *length = hitDepth; *x = sx; *y = sy; @@ -451,17 +451,17 @@ s32 player_raycast_general(s32 mode, f32 startX, f32 startY, f32 startZ, f32 dir entity->unk_07 = 0; entity->flags |= ENTITY_FLAGS_CONTINUOUS_COLLISION; } else { - ret = entityID | 0x4000; + ret = entityID | COLLISION_WITH_ENTITY_BIT; } } else if (mode == 3) { - ret = test_ray_colliders(0x8000, startX, startY, startZ, dirX, dirY, dirZ, hitX, hitY, hitZ, hitDepth, + ret = test_ray_colliders(COLLIDER_FLAGS_IGNORE_SHELL, startX, startY, startZ, dirX, dirY, dirZ, hitX, hitY, hitZ, hitDepth, hitNx, hitNy, hitNz); } if (mode == 1 || mode == 3) return ret; - ignoreFlags = 0x10000; + ignoreFlags = COLLIDER_FLAGS_IGNORE_PLAYER; if (mode == 4) { ignoreFlags = 0x80000; } @@ -705,13 +705,13 @@ void check_input_use_partner(void) { u32 actionState = playerStatus->actionState; if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO)) { - if (playerStatus->animFlags & 8 || playerStatus->statusMenuCounterinputEnabledCounter == 0) { + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8 || playerStatus->inputEnabledCounter == 0) { if (playerStatus->pressedButtons & BUTTON_C_DOWN && !(playerStatus->flags & PLAYER_STATUS_FLAGS_80) && !(playerStatus->pressedButtons & BUTTON_B) && !(playerStatus->animFlags & PLAYER_STATUS_FLAGS_1000) && actionState <= ACTION_STATE_RUN) { if (playerData->currentPartner == PARTNER_GOOMBARIO) { - D_802BDF60 = playerStatus->unk_C6; + GoombarioGetTattleID = playerStatus->interactingWithID; } partner_use_ability(); } @@ -847,7 +847,7 @@ s32 get_overriding_player_anim(s32 anim) { } else if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE)) { anim = ANIM_C0010; } else { - peach_set_disguise_anim(world_actions_peachDisguises[playerStatus->peachDisguise].unk_14); + peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].hold); return -1; } } else if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) { @@ -863,31 +863,31 @@ s32 get_overriding_player_anim(s32 anim) { return anim; } -void suggest_player_anim_clearUnkFlag(s32 arg0) { +void suggest_player_anim_clearUnkFlag(s32 anim) { PlayerStatus* playerStatus = &gPlayerStatus; - s32 temp_v0 = get_overriding_player_anim(arg0); + s32 newAnim = get_overriding_player_anim(anim); - if (temp_v0 != -1) { - playerStatus->anim = temp_v0; + if (newAnim != -1) { + playerStatus->anim = newAnim; playerStatus->unk_BC = 0; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_10000000; } } -void force_player_anim(s32 arg0) { +void force_player_anim(s32 anim) { PlayerStatus* playerStatus = &gPlayerStatus; - playerStatus->anim = arg0; + playerStatus->anim = anim; playerStatus->unk_BC = 0; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_10000000; } -void suggest_player_anim_setUnkFlag(s32 arg0) { +void suggest_player_anim_setUnkFlag(s32 anim) { PlayerStatus* playerStatus = &gPlayerStatus; - s32 temp_v0 = get_overriding_player_anim(arg0); + s32 newAnim = get_overriding_player_anim(anim); - if (temp_v0 != -1) { - playerStatus->anim = temp_v0; + if (newAnim != -1) { + playerStatus->anim = newAnim; playerStatus->unk_BC = 0; playerStatus->flags |= PLAYER_STATUS_FLAGS_10000000; } @@ -903,8 +903,8 @@ void update_player_blink(void) { phi_a2 = gPartnerActionStatus.actionState.b[0] != 0; } - if (playerStatus->unk_10 > 0) { - playerStatus->unk_10--; + if (playerStatus->blinkTimer > 0) { + playerStatus->blinkTimer--; alpha = &playerStatus->alpha1; if (!(gGameStatusPtr->frameCounter & 1)) { if (phi_a2) { @@ -917,7 +917,7 @@ void update_player_blink(void) { } *alpha = phi_v1; - if (!playerStatus->unk_10) { + if (!playerStatus->blinkTimer) { if (phi_a2) { playerStatus->alpha1 = 0x80; playerStatus->flags |= PLAYER_STATUS_FLAGS_8000; @@ -968,18 +968,18 @@ s32 disable_player_input(void) { PlayerStatus* playerStatus = &gPlayerStatus; playerStatus->flags |= PLAYER_STATUS_FLAGS_INPUT_DISABLED; - playerStatus->statusMenuCounterinputEnabledCounter++; - return playerStatus->statusMenuCounterinputEnabledCounter; + playerStatus->inputEnabledCounter++; + return playerStatus->inputEnabledCounter; } s32 enable_player_input(void) { PlayerStatus* playerStatus = &gPlayerStatus; - playerStatus->statusMenuCounterinputEnabledCounter--; - if (playerStatus->statusMenuCounterinputEnabledCounter == 0) { + playerStatus->inputEnabledCounter--; + if (playerStatus->inputEnabledCounter == 0) { playerStatus->flags &= ~PLAYER_STATUS_FLAGS_INPUT_DISABLED; } - return playerStatus->statusMenuCounterinputEnabledCounter; + return playerStatus->inputEnabledCounter; } void func_800E01DC(void) { @@ -1059,7 +1059,7 @@ void check_for_pulse_stone(void) { return; } - if (gPlayerStatus.flags & PLAYER_STATUS_FLAGS_20 || gPlayerStatus.statusMenuCounterinputEnabledCounter) { + if (gPlayerStatus.flags & PLAYER_STATUS_FLAGS_20 || gPlayerStatus.inputEnabledCounter) { return; } @@ -1087,11 +1087,11 @@ void func_800E0514(void) { s32 has_valid_conversation_npc(void) { PlayerStatus* playerStatus = &gPlayerStatus; - Npc* unk_C8 = playerStatus->unk_C8; - s32 ret = 0; + Npc* npc = playerStatus->encounteredNPC; + s32 ret = FALSE; s32 cond; - if (unk_C8 != NULL && !(unk_C8->flags & 0x10000000)) { + if (npc != NULL && !(npc->flags & 0x10000000)) { cond = (playerStatus->flags & (PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC | PLAYER_STATUS_FLAGS_INPUT_DISABLED)) == PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC; ret = cond; @@ -1105,7 +1105,7 @@ void check_for_conversation_prompt(void) { } if (D_8010C940 == NULL) { - if (gPlayerStatus.statusMenuCounterinputEnabledCounter || gPlayerStatus.flags & PLAYER_STATUS_FLAGS_20) { + if (gPlayerStatus.inputEnabledCounter || gPlayerStatus.flags & PLAYER_STATUS_FLAGS_20) { return; } @@ -1141,11 +1141,11 @@ void func_800E06C0(s32 arg0) { s32 func_800E06D8(void) { PlayerStatus* playerStatus = &gPlayerStatus; - Npc* npc = playerStatus->unk_C8; - s32 temp = playerStatus->unk_C6; + Npc* npc = playerStatus->encounteredNPC; + s32 temp = playerStatus->interactingWithID; s32 wall; - if (playerStatus->decorationList || playerStatus->statusMenuCounterinputEnabledCounter) { + if (playerStatus->decorationList || playerStatus->inputEnabledCounter) { return FALSE; } if (gCollisionStatus.currentWall == -1) { @@ -1153,17 +1153,17 @@ s32 func_800E06D8(void) { } if (playerStatus->flags & PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC && !(playerStatus->flags & PLAYER_STATUS_FLAGS_INPUT_DISABLED) && npc != NULL && npc->flags & NPC_FLAG_10000000) { - playerStatus->unk_C6 = -1; + playerStatus->interactingWithID = -1; return TRUE; } wall = gCollisionStatus.currentWall; - if (!(wall & 0x4000)) { + if (!(wall & COLLISION_WITH_ENTITY_BIT)) { if (!should_collider_allow_interact(wall)) { return FALSE; } } else if (!phys_can_player_interact()) { - playerStatus->unk_C6 = -1; + playerStatus->interactingWithID = -1; return FALSE; } else if (get_entity_type(wall) == 0xC) { return FALSE; @@ -1176,7 +1176,7 @@ s32 func_800E06D8(void) { } else { playerStatus->flags &= ~PLAYER_STATUS_FLAGS_8000000; } - playerStatus->unk_C6 = -1; + playerStatus->interactingWithID = -1; return TRUE; } @@ -1185,7 +1185,7 @@ static const f32 pad[1] = { 0.0f}; void check_for_interactables(void) { PlayerStatus* playerStatus = &gPlayerStatus; - Npc* npc = gPlayerStatus.unk_C8; + Npc* npc = gPlayerStatus.encounteredNPC; s32 phi_s2; if ((playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_100) || D_8010C940 || D_8010C920) { @@ -1193,11 +1193,11 @@ void check_for_interactables(void) { } if (D_8010C958 == NULL) { - s32 phi_s0 = gCollisionStatus.currentWall; + s32 curInteraction = gCollisionStatus.currentWall; - if (playerStatus->statusMenuCounterinputEnabledCounter != 0) { - if (gPlayerStatus.unk_C6 != phi_s0) { - gPlayerStatus.unk_C6 = phi_s0; + if (playerStatus->inputEnabledCounter != 0) { + if (gPlayerStatus.interactingWithID != curInteraction) { + gPlayerStatus.interactingWithID = curInteraction; } return; } @@ -1206,12 +1206,12 @@ void check_for_interactables(void) { return; } - if (phi_s0 == -1) { + if (curInteraction == -1) { s32 floor = gCollisionStatus.currentFloor; - if ((floor >= 0) && (floor & 0x4000)) { + if ((floor >= 0) && (floor & COLLISION_WITH_ENTITY_BIT)) { phi_s2 = 1; - phi_s0 = floor; + curInteraction = floor; switch (get_entity_type(floor)) { case ENTITY_TYPE_PADLOCK: case ENTITY_TYPE_PADLOCK_RED_FRAME: @@ -1220,27 +1220,27 @@ void check_for_interactables(void) { case ENTITY_TYPE_PUSH_BLOCK: case ENTITY_TYPE_CHEST: case ENTITY_TYPE_SIGNPOST: - phi_s0 = -1; + curInteraction = -1; break; } } else if (((playerStatus->flags & (PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC | PLAYER_STATUS_FLAGS_INPUT_DISABLED)) == PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC) && (npc != NULL) && (npc->flags & NPC_FLAG_10000000)) { - phi_s0 = npc->npcID | 0x2000; - if (playerStatus->unk_C6 == phi_s0) { + curInteraction = npc->npcID | COLLISION_WITH_NPC_BIT; + if (playerStatus->interactingWithID == curInteraction) { return; } phi_s2 = 0; } else { - playerStatus->unk_C6 = -1; + playerStatus->interactingWithID = -1; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_8000000; return; } } else { - if (!(phi_s0 & 0x4000)) { + if (!(curInteraction & COLLISION_WITH_ENTITY_BIT)) { phi_s2 = 0; - if (!(phi_s0 & 0x2000)) { - if (!should_collider_allow_interact(phi_s0)) { - playerStatus->unk_C6 = -1; + if (!(curInteraction & COLLISION_WITH_NPC_BIT)) { + if (!should_collider_allow_interact(curInteraction)) { + playerStatus->interactingWithID = -1; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_8000000; return; } @@ -1248,14 +1248,14 @@ void check_for_interactables(void) { } else { if (!phys_can_player_interact()) { phi_s2 = 1; - playerStatus->unk_C6 = -1; + playerStatus->interactingWithID = -1; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_8000000; return; } phi_s2 = 1; } } - if (playerStatus->unk_C6 == phi_s0) { + if (playerStatus->interactingWithID == curInteraction) { if ((playerStatus->flags & PLAYER_STATUS_FLAGS_8000000)) { return; } @@ -1263,8 +1263,8 @@ void check_for_interactables(void) { playerStatus->flags &= ~PLAYER_STATUS_FLAGS_8000000; } - playerStatus->unk_C6 = phi_s0; - if ((phi_s2 == 0) || phi_s0 >= 0 && get_entity_by_index(phi_s0)->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) { + playerStatus->interactingWithID = curInteraction; + if ((phi_s2 == 0) || curInteraction >= 0 && get_entity_by_index(curInteraction)->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) { if (playerStatus->actionState == ACTION_STATE_IDLE || playerStatus->actionState == ACTION_STATE_WALK || playerStatus->actionState == ACTION_STATE_RUN) { playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE; func_800EF3D4(2); @@ -1308,9 +1308,9 @@ void update_partner_timers(void) { if (!gGameStatusPtr->isBattle) { s32 i; - for (i = 1; i < ARRAY_COUNT(playerData->unk_2C4); i++) { + for (i = 1; i < ARRAY_COUNT(playerData->partnerUnlockedTime); i++) { if (playerData->partners[i].enabled) { - playerData->unk_2C4[i] += 1; + playerData->partnerUnlockedTime[i] += 1; } } } @@ -1400,7 +1400,7 @@ void appendGfx_player(void* data) { spr_draw_player_sprite(0, 0, 0, 0, sp20); } else { guRotateF(spA0, temp_f0, 0.0f, -1.0f, 0.0f); - guRotateF(sp20, clamp_angle(playerStatus->unk_8C), 0.0f, 0.0f, 1.0f); + guRotateF(sp20, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f); guMtxCatF(spA0, sp20, sp20); guTranslateF(sp60, 0.0f, -playerStatus->colliderHeight * 0.5f, 0.0f); guMtxCatF(sp60, sp20, sp20); @@ -1485,7 +1485,7 @@ void appendGfx_player_spin(void* data) { func_802DDFF8(0, 6, tint, tint, tint, 255, 0); guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f); - guRotateF(mtx, clamp_angle(playerStatus->unk_8C), 0.0f, 0.0f, 1.0f); + guRotateF(mtx, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f); guMtxCatF(rotation, mtx, mtx); px = playerStatus->position.x; py = playerStatus->position.y; diff --git a/src/7B440.c b/src/7B440.c index d281aa1488..2fdc003f6a 100644 --- a/src/7B440.c +++ b/src/7B440.c @@ -45,7 +45,7 @@ void reset_player_status(void) { f32* floatsTemp; D_8010C96C = -1; - D_8010C954 = 0; + TweesterTouchingPartner = NULL; D_8010C920 = 0; D_8010C940 = 0; D_8010C958 = 0; @@ -82,7 +82,7 @@ void reset_player_status(void) { } // This grossness is needed for matching - floatsTemp = &D_800F7B70[0]; + floatsTemp = &DefaultMoveSpeeds[0]; playerStatus->walkSpeed = *(floatsTemp++) * one; playerStatus->runSpeed = *(floatsTemp++) * one; playerStatus->unk_6C = *(floatsTemp++) * one; @@ -157,26 +157,26 @@ void player_input_to_move_vector(f32* angle, f32* magnitude) { *magnitude = mag; } -void game_input_to_move_vector(f32* arg0, f32* arg1) { +void game_input_to_move_vector(f32* outAngle, f32* outMagnitude) { PlayerStatus* playerStatus = &gPlayerStatus; f32 stickX = gGameStatusPtr->stickX; f32 stickY = -gGameStatusPtr->stickY; - f32 tempMax = 70.0f; - f32 temp1; - f32 temp2; + f32 maxRadius = 70.0f; + f32 magnitude; + f32 angle; - temp1 = dist2D(0.0f, 0.0f, stickX, stickY); - if (temp1 >= tempMax) { - temp1 = tempMax; + magnitude = dist2D(0.0f, 0.0f, stickX, stickY); + if (magnitude >= maxRadius) { + magnitude = maxRadius; } - temp2 = clamp_angle(atan2(0.0f, 0.0f, stickX, stickY) + gCameras[CAM_DEFAULT].currentYaw); - if (temp1 == 0.0f) { - temp2 = playerStatus->targetYaw; + angle = clamp_angle(atan2(0.0f, 0.0f, stickX, stickY) + gCameras[CAM_DEFAULT].currentYaw); + if (magnitude == 0.0f) { + angle = playerStatus->targetYaw; } - *arg0 = temp2; - *arg1 = temp1; + *outAngle = angle; + *outMagnitude = magnitude; } void func_800E24F8(void) { diff --git a/src/7E9D0.c b/src/7E9D0.c index c883793771..f981a16024 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -78,22 +78,22 @@ void phys_peach_update(void) { } if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { - action = &D_800F7C8C[playerStatus->actionState]; + action = &PlayerActionsTable[playerStatus->actionState]; if (action->flag) { if (action->dmaStart != NULL && action->dmaStart != D_8010C924) { D_8010C924 = action->dmaStart; // TODO: This needs to be a defined linker define for full shiftability - dma_copy(D_8010C924, D_800F7C8C[playerStatus->actionState].dmaEnd, (void* )0x802B6000); + dma_copy(D_8010C924, PlayerActionsTable[playerStatus->actionState].dmaEnd, (void* )0x802B6000); } - if (D_800F7C8C[playerStatus->actionState].flag) { - D_800F7C8C[playerStatus->actionState].update(); + if (PlayerActionsTable[playerStatus->actionState].flag) { + PlayerActionsTable[playerStatus->actionState].update(); } } } else { - if (D_800F7C8C[playerStatus->actionState].flag) { - D_800F7C8C[playerStatus->actionState].update(); + if (PlayerActionsTable[playerStatus->actionState].flag) { + PlayerActionsTable[playerStatus->actionState].update(); } } } while (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED); @@ -367,10 +367,10 @@ Npc* peach_make_disguise_npc(s32 peachDisguise) { playerStatus->peachDisguise = gGameStatusPtr->peachDisguise = peachDisguise; blueprint.flags = NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_100 | NPC_FLAG_40000; - blueprint.initialAnim = world_actions_peachDisguises[playerStatus->peachDisguise].idle; + blueprint.initialAnim = BasicPeachDisguiseAnims[playerStatus->peachDisguise].idle; blueprint.onRender = NULL; blueprint.onUpdate = NULL; - D_8010C96C = _create_npc_standard(&blueprint, &D_800F7C7C[playerStatus->peachDisguise]); + D_8010C96C = _create_npc_standard(&blueprint, &PeachDisguiseExtraAnims[playerStatus->peachDisguise]); npc = get_npc_by_index(D_8010C96C); disable_npc_shadow(npc); diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index f5989d0226..894bbe8a57 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -62,7 +62,7 @@ INCLUDE_ASM(s32, "7bb60_len_41b0", phys_update_jump); #ifdef NON_EQUIVALENT // Rodata issue. -extern s32 D_800F7B50; +extern s32 GravityParamsStartJump; void phys_init_integrator_for_current_state(void) { f32* temp_a0; @@ -84,7 +84,7 @@ void phys_init_integrator_for_current_state(void) { case 13: case 18: case 20: - temp_a0 = &D_800F7B50 ; + temp_a0 = &GravityParamsStartJump ; if ((playerStatus->flags & 0x40000) == 0) { playerStatus->gravityIntegrator[0] = *temp_a0++; playerStatus->gravityIntegrator[1] = *temp_a0++; @@ -107,7 +107,7 @@ INCLUDE_ASM(void, "7bb60_len_41b0", phys_init_integrator_for_current_state, void // This function is wack. This weird stuff is needed to match void gravity_use_fall_parms(void) { - f32* floats = D_800F7B60; + f32* floats = GravityParamsStartFall; PlayerStatus* playerStatus; do {} while (0); playerStatus = &gPlayerStatus; @@ -268,25 +268,25 @@ s32 func_800E4404(s32 arg0, s32 arg1, f32 arg2, f32* outX, f32* outY, f32* outZ) void collision_check_player_overlaps(void) { PlayerStatus* playerStatus = &gPlayerStatus; - f32 temp_64 = playerStatus->unk_64; + f32 overlapPush = playerStatus->overlapPushAmount; - if (temp_64 != 0.0f) { + if (overlapPush != 0.0f) { f32 x = playerStatus->position.x; f32 y = playerStatus->position.y; f32 z = playerStatus->position.z; - player_test_lateral_overlap(0, &gPlayerStatus, &x, &y, &z, temp_64, playerStatus->unk_88); + player_test_lateral_overlap(0, &gPlayerStatus, &x, &y, &z, overlapPush, playerStatus->overlapPushYaw); - temp_64 -= playerStatus->runSpeed / 10.0f; + overlapPush -= playerStatus->runSpeed / 10.0f; playerStatus->position.x = x; playerStatus->position.y = y; playerStatus->position.z = z; - if (temp_64 < 0.0f) { - temp_64 = 0.0f; + if (overlapPush < 0.0f) { + overlapPush = 0.0f; } - playerStatus->unk_64 = temp_64; + playerStatus->overlapPushAmount = overlapPush; } } diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index 187f6b0a16..6ff03d1dc5 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -43,7 +43,7 @@ void clear_player_data(void) { playerData->merleeTurnCount = -1; playerData->maxStarPower = 0; playerData->specialBarsFilled = 0; - playerData->unk_292 = 0; + playerData->starBeamLevel = 0; playerData->currentPartner = 0; for (i = 0; i < ARRAY_COUNT(playerData->partners); i++) { @@ -74,32 +74,32 @@ void clear_player_data(void) { playerData->storedItems[i] = ITEM_NONE; } - playerData->otherHitsTaken = 0; - playerData->unk_296 = 0; + playerData->actionCommandAttempts = 0; + playerData->actionCommandSuccesses = 0; playerData->hitsTaken = 0; playerData->hitsBlocked = 0; playerData->playerFirstStrikes = 0; playerData->enemyFirstStrikes = 0; playerData->powerBounces = 0; playerData->battlesCount = 0; - playerData->unk_2A4[0] = 0; - playerData->unk_2A4[1] = 0; - playerData->unk_2A4[2] = 0; - playerData->unk_2A4[3] = 0; - playerData->unk_2AC = 0; - playerData->unk_2B0 = 0; + playerData->battlesWon = 0; + playerData->unk_2A6 = 0; + playerData->battlesFled = 0; + playerData->trainingsDone = 0; + playerData->walkingStepsTaken = 0; + playerData->runningStepsTaken = 0; playerData->idleFrameCounter = 0; playerData->totalCoinsEarned = 0; playerData->frameCounter = 0; playerData->quizzesAnswered = 0; playerData->quizzesCorrect = 0; - for (i = 0; i < ARRAY_COUNT(playerData->unk_2C4); i++) { - playerData->unk_2C4[i] = 0; - playerData->unk_2F4[i] = 0; + for (i = 0; i < ARRAY_COUNT(playerData->partnerUnlockedTime); i++) { + playerData->partnerUnlockedTime[i] = 0; + playerData->partnerUsedTime[i] = 0; } - playerData->unk_328 = 0; + playerData->droTreeOrbitTime = 0; playerData->starPiecesCollected = 0; playerData->jumpGamePlays = 0; playerData->jumpGameTotal = 0; @@ -266,7 +266,7 @@ s32 get_stored_empty_count(void) { void enforce_hpfp_limits(void) { PlayerData* playerData = &gPlayerData; - playerData->curMaxHP = playerData->hardMaxHP + (is_ability_active(4) * 5); + playerData->curMaxHP = playerData->hardMaxHP + (is_ability_active(ABILITY_HP_PLUS) * 5); if (playerData->curMaxHP > 75) { playerData->curMaxHP = 75; } @@ -274,7 +274,7 @@ void enforce_hpfp_limits(void) { playerData->curHP = playerData->curMaxHP; } - playerData->curMaxFP = playerData->hardMaxFP + (is_ability_active(12) * 5); + playerData->curMaxFP = playerData->hardMaxFP + (is_ability_active(ABILITY_FP_PLUS) * 5); if (playerData->curMaxFP > 75) { playerData->curMaxFP = 75; } @@ -330,71 +330,71 @@ void initialize_status_menu(void) { close_status_menu(); - iconIndex = create_hud_element(HudScript_StatusHP); + iconIndex = hud_element_create(HudScript_StatusHP); uiStatus->hpIconIndices[0] = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); - iconIndex = create_hud_element(HudScript_StatusHeart); + iconIndex = hud_element_create(HudScript_StatusHeart); uiStatus->hpIconIndices[1] = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); - iconIndex = create_hud_element(HudScript_StatusFP); + iconIndex = hud_element_create(HudScript_StatusFP); uiStatus->fpIconIndices[0] = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); - iconIndex = create_hud_element(HudScript_StatusFlower); + iconIndex = hud_element_create(HudScript_StatusFlower); uiStatus->fpIconIndices[1] = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); - iconIndex = create_hud_element(HudScript_StatusCoin); + iconIndex = hud_element_create(HudScript_StatusCoin); uiStatus->coinIconIndex = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); - iconIndex = create_hud_element(HudScript_Item_CoinSparkleRandom); + iconIndex = hud_element_create(HudScript_Item_CoinSparkleRandom); uiStatus->coinSparkleIconIndex = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); - iconIndex = create_hud_element(HudScript_StatusStarPoint); + iconIndex = hud_element_create(HudScript_StatusStarPoint); uiStatus->starpointsIconIndex = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); - iconIndex = create_hud_element(HudScript_StatusSPShine); + iconIndex = hud_element_create(HudScript_StatusSPShine); uiStatus->starpointsShineIconIndex = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); - newVar = create_hud_element(HudScript_StatusTimes); + newVar = hud_element_create(HudScript_StatusTimes); iconIndex = newVar; uiStatus->iconIndex8 = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); - iconIndex = create_hud_element(HudScript_StatusTimes); + iconIndex = hud_element_create(HudScript_StatusTimes); uiStatus->iconIndex9 = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); - iconIndex = create_hud_element(HudScript_StatusTimes); + iconIndex = hud_element_create(HudScript_StatusTimes); uiStatus->iconIndexA = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); - iconIndex = create_hud_element(HudScript_StatusTimes); + iconIndex = hud_element_create(HudScript_StatusTimes); uiStatus->iconIndexB = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); - iconIndex = create_hud_element(HudScript_StatusStar1); + iconIndex = hud_element_create(HudScript_StatusStar1); uiStatus->starIconIndex = iconIndex; - set_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - clear_hud_element_flags(iconIndex, HUD_ELEMENT_FLAGS_8000); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); func_800F0D5C(); } @@ -409,12 +409,12 @@ void status_menu_draw_number(s32 iconID, s32 x, s32 y, s32 value, s32 numDigits) s32 digit; s32 place; - set_hud_element_anim(iconID, TimesHudScript); + hud_element_set_script(iconID, TimesHudScript); x += 8; y2 = y + 8; - set_hud_element_render_pos(iconID, x, y + 7); - clear_hud_element_flags(iconID, HUD_ELEMENT_FLAGS_DISABLED); - draw_hud_element_2(iconID); + hud_element_set_render_pos(iconID, x, y + 7); + hud_element_clear_flags(iconID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_draw_next(iconID); // Write each digit of the input number into the digits array for (i = 0; i < numDigits; i++) { @@ -434,10 +434,10 @@ void status_menu_draw_number(s32 iconID, s32 x, s32 y, s32 value, s32 numDigits) // Once we have encountered our first non-zero digit, we need to keep drawing the remaining digits if (digit != 0 || keepDrawing || (i == numDigits - 1)) { keepDrawing = TRUE; - set_hud_element_anim(iconID, DigitHudScripts[digit]); - set_hud_element_render_pos(iconID, x, y2); - clear_hud_element_flags(iconID, HUD_ELEMENT_FLAGS_DISABLED); - draw_hud_element_2(iconID); + hud_element_set_script(iconID, DigitHudScripts[digit]); + hud_element_set_render_pos(iconID, x, y2); + hud_element_clear_flags(iconID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_draw_next(iconID); } } } @@ -458,12 +458,12 @@ void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) { } iconIndex = uiStatus->iconIndex10; - set_hud_element_render_pos(iconIndex, posX + 27, posY + 11); - draw_hud_element_clipped(iconIndex); + hud_element_set_render_pos(iconIndex, posX + 27, posY + 11); + hud_element_draw_clipped(iconIndex); iconIndex = uiStatus->iconIndex11; - set_hud_element_render_pos(iconIndex, posX + 15, posY + 11); - draw_hud_element_clipped(iconIndex); + hud_element_set_render_pos(iconIndex, posX + 15, posY + 11); + hud_element_draw_clipped(iconIndex); draw_number(uiStatus->displayCoins, posX + 58, posY + 4, 1, 10, 255, 3); } @@ -477,8 +477,8 @@ void update_coin_counter(void) { if (uiStatus->unk_6C[1] != 0) { uiStatus->unk_6C[1] -= 1; if (((uiStatus->unk_6C[1] << 24) == 0) && (uiStatus->iconIndex12 >= 0)) { - free_hud_element(uiStatus->iconIndex12); - free_hud_element(uiStatus->iconIndex13); + hud_element_free(uiStatus->iconIndex12); + hud_element_free(uiStatus->iconIndex13); uiStatus->iconIndex12 = -1; } D_8010CD12 = 0; @@ -515,8 +515,8 @@ void show_coin_counter(void) { if ((D_8010CD10 != 0) || (D_8010CD12 != 0)) { set_window_update(20, WINDOW_UPDATE_HIDE); if (uiStatus->iconIndex12 > -1) { - free_hud_element(uiStatus->iconIndex10); - free_hud_element(uiStatus->iconIndex11); + hud_element_free(uiStatus->iconIndex10); + hud_element_free(uiStatus->iconIndex11); uiStatus->iconIndex12 = -1; } uiStatus->unk_6C[0] = 0; @@ -528,14 +528,14 @@ void show_coin_counter(void) { if (uiStatus->unk_6C[0] == 0) { set_window_properties(0x14, 32, 164, 64, 20, 0x15, coin_counter_draw_content, 0, -1); set_window_update(20, (s32)basic_window_update); - index = create_hud_element(HudScript_MenuTimes); + index = hud_element_create(HudScript_MenuTimes); uiStatus->iconIndex10 = index; - set_hud_element_flags(index, HUD_ELEMENT_FLAGS_80); - set_hud_element_tint(index, 255, 255, 255); - index = create_hud_element(HudScript_StatusCoin); + hud_element_set_flags(index, HUD_ELEMENT_FLAGS_80); + hud_element_set_tint(index, 255, 255, 255); + index = hud_element_create(HudScript_StatusCoin); uiStatus->iconIndex11 = index; - set_hud_element_flags(index, HUD_ELEMENT_FLAGS_80); - set_hud_element_tint(index, 255, 255, 255); + hud_element_set_flags(index, HUD_ELEMENT_FLAGS_80); + hud_element_set_tint(index, 255, 255, 255); uiStatus->unk_6C[0] = 0; if (uiStatus->unk_6C[2] < 0) { diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c index 8ab7637fc6..4e9a3a82b7 100644 --- a/src/8a860_len_3f30.c +++ b/src/8a860_len_3f30.c @@ -91,28 +91,28 @@ void func_800F4D28(PopupMessage* popup, s32 x, s32 y); INCLUDE_ASM(s32, "8a860_len_3f30", hide_popup_menu); void destroy_popup_menu(void) { - free_hud_element(D_8010D65C); - free_hud_element(D_8010D678); - free_hud_element(D_8010D66C); - free_hud_element(D_8010D670); - free_hud_element(D_8010D674); + hud_element_free(D_8010D65C); + hud_element_free(D_8010D678); + hud_element_free(D_8010D66C); + hud_element_free(D_8010D670); + hud_element_free(D_8010D674); if (gPopupMenu->popupType == POPUP_TYPE_TRADE_FOR_BADGE) { - free_hud_element(D_8010D660); - free_hud_element(D_8010D664); + hud_element_free(D_8010D660); + hud_element_free(D_8010D664); } if (gPopupMenu->popupType == POPUP_TYPE_UPGRADE_PARTNER) { - free_hud_element(D_8010D660); - free_hud_element(D_8010D664); + hud_element_free(D_8010D660); + hud_element_free(D_8010D664); } if (gPopupMenu->popupType == POPUP_TYPE_SWITCH_PARTNER || gPopupMenu->popupType == POPUP_TYPE_UPGRADE_PARTNER) { - free_hud_element(D_8010D668); + hud_element_free(D_8010D668); } if (gPopupMenu->popupType == POPUP_TYPE_SELL_ITEM) { - free_hud_element(D_8010D660); + hud_element_free(D_8010D660); } if ((gPopupMenu->popupType <= POPUP_TYPE_USE_ITEM || @@ -161,61 +161,61 @@ s32 popup_menu_update(void) { D_8010D67E = 62; } D_8010D68C = 0; - elementID = create_hud_element(HudScript_EmptyBar); + elementID = hud_element_create(HudScript_EmptyBar); D_8010D65C = elementID; - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80); - set_hud_element_tint(elementID, 255, 255, 255); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_tint(elementID, 255, 255, 255); if (gPopupMenu->popupType != 2) { - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); } one = 1; // required to match (why is 1 loaded so early?) - elementID = create_hud_element(gPopupMenu->ptrIcon[0]); + elementID = hud_element_create(gPopupMenu->ptrIcon[0]); D_8010D678 = elementID; - set_hud_element_scale(elementID, 0.45f); - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_8000 | HUD_ELEMENT_FLAGS_80); + hud_element_set_scale(elementID, 0.45f); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); - elementID = create_hud_element(HudScript_AnimatedHandPointer); + elementID = hud_element_create(HudScript_AnimatedHandPointer); D_8010D66C = elementID; - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); - elementID = create_hud_element(HudScript_GreenArrowUp); + elementID = hud_element_create(HudScript_GreenArrowUp); D_8010D670 = elementID; - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); - elementID = create_hud_element(HudScript_GreenArrowDown); + elementID = hud_element_create(HudScript_GreenArrowDown); D_8010D674 = elementID; - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); if (gPopupMenu->popupType == 3) { - D_8010D660 = create_hud_element(HudScript_StatusStarPiece); + D_8010D660 = hud_element_create(HudScript_StatusStarPiece); elementID = D_8010D660; - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80); - set_hud_element_tint(elementID, 255, 255, 255); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_tint(elementID, 255, 255, 255); } if (gPopupMenu->popupType == 4) { - D_8010D660 = create_hud_element(HudScript_StatusStarPiece); + D_8010D660 = hud_element_create(HudScript_StatusStarPiece); elementID = D_8010D660; - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_8000 | HUD_ELEMENT_FLAGS_80); - set_hud_element_tint(elementID, 255, 255, 255); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_tint(elementID, 255, 255, 255); } if (gPopupMenu->popupType == 5) { - D_8010D660 = create_hud_element(HudScript_StatusCoin); + D_8010D660 = hud_element_create(HudScript_StatusCoin); elementID = D_8010D660; - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80); - set_hud_element_tint(elementID, 255, 255, 255); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_tint(elementID, 255, 255, 255); } if (gPopupMenu->popupType == 3 || gPopupMenu->popupType == 4) { - D_8010D664 = create_hud_element(HudScript_MenuTimes); + D_8010D664 = hud_element_create(HudScript_MenuTimes); elementID = D_8010D664; - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80); - set_hud_element_tint(elementID, 255, 255, 255); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_tint(elementID, 255, 255, 255); } if (gPopupMenu->popupType == one || gPopupMenu->popupType == 4) { - D_8010D668 = create_hud_element(D_80109890[0]); + D_8010D668 = hud_element_create(D_80109890[0]); elementID = D_8010D668; - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80); - set_hud_element_tint(elementID, 255, 255, 255); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_tint(elementID, 255, 255, 255); } D_8010D65A = -200; @@ -598,25 +598,25 @@ s32 popup_menu_update(void) { } break; case -1: - set_hud_element_tint(D_8010D65C, 160, 160, 160); - set_hud_element_tint(D_8010D678, 160, 160, 160); - set_hud_element_tint(D_8010D66C, 160, 160, 160); - set_hud_element_tint(D_8010D670, 160, 160, 160); - set_hud_element_tint(D_8010D674, 160, 160, 160); - set_hud_element_anim(D_8010D66C, HudScript_HandPointer); + hud_element_set_tint(D_8010D65C, 160, 160, 160); + hud_element_set_tint(D_8010D678, 160, 160, 160); + hud_element_set_tint(D_8010D66C, 160, 160, 160); + hud_element_set_tint(D_8010D670, 160, 160, 160); + hud_element_set_tint(D_8010D674, 160, 160, 160); + hud_element_set_script(D_8010D66C, HudScript_HandPointer); if (gPopupMenu->popupType == 3) { - set_hud_element_tint(D_8010D660, 160, 160, 160); - set_hud_element_tint(D_8010D664, 160, 160, 160); + hud_element_set_tint(D_8010D660, 160, 160, 160); + hud_element_set_tint(D_8010D664, 160, 160, 160); } if (gPopupMenu->popupType == 4) { - set_hud_element_tint(D_8010D660, 160, 160, 160); - set_hud_element_tint(D_8010D664, 160, 160, 160); + hud_element_set_tint(D_8010D660, 160, 160, 160); + hud_element_set_tint(D_8010D664, 160, 160, 160); } if (gPopupMenu->popupType == 1 || gPopupMenu->popupType == 4) { - set_hud_element_tint(D_8010D668, 160, 160, 160); + hud_element_set_tint(D_8010D668, 160, 160, 160); } if (gPopupMenu->popupType == 5) { - set_hud_element_tint(D_8010D660, 160, 160, 160); + hud_element_set_tint(D_8010D660, 160, 160, 160); } D_8010D690 = 0xD; @@ -717,26 +717,26 @@ s32 popup_menu_update(void) { gPopupMenu->result = 0; break; case 100: - set_hud_element_tint(D_8010D65C, 160, 160, 160); - set_hud_element_tint(D_8010D678, 160, 160, 160); - set_hud_element_tint(D_8010D66C, 160, 160, 160); - set_hud_element_tint(D_8010D670, 160, 160, 160); - set_hud_element_tint(D_8010D674, 160, 160, 160); - set_hud_element_anim(D_8010D66C, HudScript_HandPointer); + hud_element_set_tint(D_8010D65C, 160, 160, 160); + hud_element_set_tint(D_8010D678, 160, 160, 160); + hud_element_set_tint(D_8010D66C, 160, 160, 160); + hud_element_set_tint(D_8010D670, 160, 160, 160); + hud_element_set_tint(D_8010D674, 160, 160, 160); + hud_element_set_script(D_8010D66C, HudScript_HandPointer); if (gPopupMenu->popupType == 3) { - set_hud_element_tint(D_8010D660, 160, 160, 160); - set_hud_element_tint(D_8010D664, 160, 160, 160); + hud_element_set_tint(D_8010D660, 160, 160, 160); + hud_element_set_tint(D_8010D664, 160, 160, 160); } if (gPopupMenu->popupType == 4) { - set_hud_element_tint(D_8010D660, 160, 160, 160); - set_hud_element_tint(D_8010D664, 160, 160, 160); + hud_element_set_tint(D_8010D660, 160, 160, 160); + hud_element_set_tint(D_8010D664, 160, 160, 160); } if (gPopupMenu->popupType == 1 || gPopupMenu->popupType == 4) { - set_hud_element_tint(D_8010D668, 160, 160, 160); + hud_element_set_tint(D_8010D668, 160, 160, 160); } if (gPopupMenu->popupType == 5) { - set_hud_element_tint(D_8010D660, 160, 160, 160); + hud_element_set_tint(D_8010D660, 160, 160, 160); } switch (gPopupMenu->popupType) { @@ -794,26 +794,26 @@ s32 popup_menu_update(void) { D_8010D640 = -3; break; case 103: - set_hud_element_tint(D_8010D65C, 255, 255, 255); - set_hud_element_tint(D_8010D678, 255, 255, 255); - set_hud_element_tint(D_8010D66C, 255, 255, 255); - set_hud_element_tint(D_8010D670, 255, 255, 255); - set_hud_element_tint(D_8010D674, 255, 255, 255); + hud_element_set_tint(D_8010D65C, 255, 255, 255); + hud_element_set_tint(D_8010D678, 255, 255, 255); + hud_element_set_tint(D_8010D66C, 255, 255, 255); + hud_element_set_tint(D_8010D670, 255, 255, 255); + hud_element_set_tint(D_8010D674, 255, 255, 255); if (gPopupMenu->popupType == 3) { - set_hud_element_tint(D_8010D660, 160, 160, 160); - set_hud_element_tint(D_8010D664, 160, 160, 160); + hud_element_set_tint(D_8010D660, 160, 160, 160); + hud_element_set_tint(D_8010D664, 160, 160, 160); } if (gPopupMenu->popupType == 4) { - set_hud_element_tint(D_8010D660, 160, 160, 160); - set_hud_element_tint(D_8010D664, 160, 160, 160); + hud_element_set_tint(D_8010D660, 160, 160, 160); + hud_element_set_tint(D_8010D664, 160, 160, 160); } if (gPopupMenu->popupType == 1 || gPopupMenu->popupType == 4) { - set_hud_element_tint(D_8010D668, 160, 160, 160); + hud_element_set_tint(D_8010D668, 160, 160, 160); } if (gPopupMenu->popupType == 5) { - set_hud_element_tint(D_8010D660, 160, 160, 160); + hud_element_set_tint(D_8010D660, 160, 160, 160); } - set_hud_element_anim(D_8010D66C, HudScript_HandPointer); + hud_element_set_script(D_8010D66C, HudScript_HandPointer); switch (gPopupMenu->popupType) { case 0: @@ -888,9 +888,9 @@ void func_800F4C6C(PopupMessage* popup, s32 x, s32 y) { return; } - set_hud_element_render_pos(hudElement, xPos, yPos); - set_hud_element_alpha(hudElement, D_8010D650); - draw_hud_element_clipped(hudElement); + hud_element_set_render_pos(hudElement, xPos, yPos); + hud_element_set_alpha(hudElement, D_8010D650); + hud_element_draw_clipped(hudElement); } void func_800F4CF0(PopupMessage* popup, s32 x, s32 y) { @@ -904,19 +904,19 @@ void func_800F4D28(PopupMessage* popup, s32 x, s32 y) { s32 yPos = y + 9; s32 type; - set_hud_element_alpha(hudElement, D_8010D650); + hud_element_set_alpha(hudElement, D_8010D650); if (gPopupMenu->popupType == POPUP_TYPE_TRADE_FOR_BADGE) { - set_hud_element_render_pos(hudElement, xPos, yPos); + hud_element_set_render_pos(hudElement, xPos, yPos); } else { - set_hud_element_render_pos(hudElement, xPos, y + 10); + hud_element_set_render_pos(hudElement, xPos, y + 10); } - draw_hud_element_clipped(hudElement); + hud_element_draw_clipped(hudElement); hudElement = D_8010D664; - set_hud_element_render_pos(hudElement, x + 26, y + 11); - set_hud_element_alpha(hudElement, D_8010D650); - draw_hud_element_clipped(hudElement); + hud_element_set_render_pos(hudElement, x + 26, y + 11); + hud_element_set_alpha(hudElement, D_8010D650); + hud_element_draw_clipped(hudElement); type = gPopupMenu->popupType; if (type == POPUP_TYPE_TRADE_FOR_BADGE) { diff --git a/src/E20110.c b/src/E20110.c index 501545b279..f44affe0e3 100644 --- a/src/E20110.c +++ b/src/E20110.c @@ -58,9 +58,9 @@ INCLUDE_ASM(s32, "E20110", func_802B7728_E20838); void func_802B79C8_E20AD8(void) { func_802B75E8_E206F8(); - gPlayerStatusPtr->unk_C6 = -1; + gPlayerStatusPtr->interactingWithID = -1; D_8010C958 = 0; - gPlayerStatusPtr->unk_C8 = NULL; + gPlayerStatusPtr->encounteredNPC = NULL; gPlayerStatusPtr->animFlags &= ~0x10; func_800EF3D4(0); repartner_set_tether_distance(); diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 32dcf98963..3e7b1d81fa 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -1585,45 +1585,45 @@ void _delete_shadow(s32 shadowIndex) { s32 entity_get_collision_flags(Entity* entity) { u32 listIndex = entity->listIndex; - s32 ret = 0; + s32 entityFlags = 0; u32 flag; if (entity->flags & ENTITY_FLAGS_BLOCK_BEING_HIT) { - ret = 0x80; + entityFlags = ENTITY_COLLISION_BLOCK_HIT; entity->flags &= ~ENTITY_FLAGS_BLOCK_BEING_HIT; } flag = gCollisionStatus.currentFloor; - if (flag != -1 && (flag & 0x4000) && listIndex == (u8)flag) { - ret |= 1; + if (flag != -1 && (flag & COLLISION_WITH_ENTITY_BIT) && listIndex == (u8)flag) { + entityFlags |= ENTITY_COLLISION_PLAYER_TOUCH_FLOOR; } flag = gCollisionStatus.lastTouchedFloor; - if (flag != -1 && (flag & 0x4000) && listIndex == (u8)flag) { - ret |= 0x100; + if (flag != -1 && (flag & COLLISION_WITH_ENTITY_BIT) && listIndex == (u8)flag) { + entityFlags |= ENTITY_COLLISION_PLAYER_LAST_FLOOR; } flag = gCollisionStatus.currentCeiling; - if (flag != -1 && (flag & 0x4000) && listIndex == (u8)flag) { - ret |= 0x4; + if (flag != -1 && (flag & COLLISION_WITH_ENTITY_BIT) && listIndex == (u8)flag) { + entityFlags |= ENTITY_COLLISION_PLAYER_TOUCH_CEILING; } flag = gCollisionStatus.pushingAgainstWall; - if (flag != -1 && (flag & 0x4000) && listIndex == (u8)flag) { - ret |= 0x10; + if (flag != -1 && (flag & COLLISION_WITH_ENTITY_BIT) && listIndex == (u8)flag) { + entityFlags |= ENTITY_COLLISION_PLAYER_PUSHING_AGAINST; } flag = gCollisionStatus.lastWallHammered; - if (flag != -1 && (flag & 0x4000) && listIndex == (u8)flag) { - ret |= 0x40; + if (flag != -1 && (flag & COLLISION_WITH_ENTITY_BIT) && listIndex == (u8)flag) { + entityFlags |= ENTITY_COLLISION_PLAYER_HAMMER; } flag = gCollisionStatus.currentWall; - if (flag != -1 && (flag & 0x4000) && listIndex == (u8)flag && gPlayerStatusPtr->pressedButtons & 0x8000) { - ret |= 8; + if (flag != -1 && (flag & COLLISION_WITH_ENTITY_BIT) && listIndex == (u8)flag && gPlayerStatusPtr->pressedButtons & 0x8000) { + entityFlags |= ENTITY_COLLISION_PLAYER_TOUCH_WALL; } - return ret; + return entityFlags; } INCLUDE_ASM(s32, "a5dd0_len_114e0", entity_interacts_with_current_partner); @@ -2131,7 +2131,7 @@ s32 entity_raycast_down(f32* x, f32* y, f32* z, f32* hitYaw, f32* hitPitch, f32* ret = FALSE; if ((entityID >= 0) && ((get_entity_type(entityID) != 0xC) || (hitNx == 0.0f && hitNz == 0.0f && hitNy == 1.0))) { - hitID = entityID | 0x4000; + hitID = entityID | COLLISION_WITH_ENTITY_BIT; } colliderID = test_ray_colliders(0x10000, *x, *y, *z, 0.0f, -1.0f, 0.0f, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, diff --git a/src/battle/action_cmd/07.c b/src/battle/action_cmd/07.c index 6614da95df..987fc60300 100644 --- a/src/battle/action_cmd/07.c +++ b/src/battle/action_cmd/07.c @@ -31,28 +31,28 @@ ApiStatus func_802A9000_425B50(Evt* script, s32 isInitialCall) { D_802A9620 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); + hud_element_set_render_depth(hudElement, 0); // Weird use of an extra temp settles regalloc here. - hudElementTemp = create_hud_element(HudScript_BlueMeter); + hudElementTemp = hud_element_create(HudScript_BlueMeter); hudElement = hudElementTemp; actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_RunAwayOK); + hudElement = hud_element_create(HudScript_RunAwayOK); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); battleStatus->flags1 &= ~0x8000; @@ -90,10 +90,10 @@ void func_802A94D8_426028(void) { s32 hudY; s32 hudElement1; - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); + hud_element_draw_clipped(actionCommandStatus->hudElements[0]); hudElement1 = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElement1); - get_hud_element_render_pos(hudElement1, &hudX, &hudY); + hud_element_draw_clipped(hudElement1); + hud_element_get_render_pos(hudElement1, &hudX, &hudY); if (D_802A9620 == 0) { func_80268798(hudX, hudY, actionCommandStatus->barFillLevel / 100, 1); @@ -101,7 +101,7 @@ void func_802A94D8_426028(void) { func_80268798(hudX, hudY, actionCommandStatus->barFillLevel / 100, 2); } - draw_hud_element_clipped(actionCommandStatus->hudElements[2]); + hud_element_draw_clipped(actionCommandStatus->hudElements[2]); } #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/0A.c b/src/battle/action_cmd/0A.c index ceaf1ed3ef..ebc20b2ec2 100644 --- a/src/battle/action_cmd/0A.c +++ b/src/battle/action_cmd/0A.c @@ -36,23 +36,23 @@ ApiStatus func_802A9000_4273B0(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_100pct); + hudElement = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/air_lift.c b/src/battle/action_cmd/air_lift.c index 823f774d1a..228f3869e1 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -38,23 +38,23 @@ ApiStatus func_802A9000_428A70(Evt* script, s32 isInitialCall) { air_lift_bss_0 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_100pct); + hudElement = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -98,12 +98,12 @@ void func_802A96EC_42915C(void) { s32 hudElement1; if (gBattleStatus.unk_83 != 0) { - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); + hud_element_draw_clipped(actionCommandStatus->hudElements[0]); } hudElement1 = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElement1); - get_hud_element_render_pos(hudElement1, &hudX, &hudY); + hud_element_draw_clipped(hudElement1); + hud_element_get_render_pos(hudElement1, &hudX, &hudY); if (air_lift_bss_0 == 0) { func_80268798(hudX, hudY, actionCommandStatus->barFillLevel / 100, 1); @@ -113,7 +113,7 @@ void func_802A96EC_42915C(void) { func_80268834(hudX, hudY, actionCommandStatus->barFillLevel / 100, 4); } - draw_hud_element_clipped(actionCommandStatus->hudElements[2]); + hud_element_draw_clipped(actionCommandStatus->hudElements[2]); } #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index ac788c54f1..bae85d00d8 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -37,23 +37,23 @@ ApiStatus func_802A9000_429320(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_StickNeutral); + hudElement = hud_element_create(HudScript_StickNeutral); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_100pct); + hudElement = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/body_slam.c b/src/battle/action_cmd/body_slam.c index fe64e8ee7f..22fd391a12 100644 --- a/src/battle/action_cmd/body_slam.c +++ b/src/battle/action_cmd/body_slam.c @@ -34,29 +34,29 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_FillGaugeResult); + hudElement = hud_element_create(HudScript_FillGaugeResult); actionCommandStatus->hudElements[3] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_TimingWait); + hudElement = hud_element_create(HudScript_TimingWait); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX + 41, actionCommandStatus->hudElementY + 22); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX + 41, actionCommandStatus->hudElementY + 22); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); return ApiStatus_DONE2; } @@ -68,18 +68,18 @@ void N(draw_hud_elements)(void) { s32 x, y; s32 hudElement; - draw_hud_element_clipped(gActionCommandStatus.hudElements[0]); + hud_element_draw_clipped(gActionCommandStatus.hudElements[0]); hudElement = gActionCommandStatus.hudElements[1]; - draw_hud_element_clipped(hudElement); - get_hud_element_render_pos(hudElement, &x, &y); - draw_hud_element_clipped(gActionCommandStatus.hudElements[3]); + hud_element_draw_clipped(hudElement); + hud_element_get_render_pos(hudElement, &x, &y); + hud_element_draw_clipped(gActionCommandStatus.hudElements[3]); func_80268770(x, y, gActionCommandStatus.barFillLevel / 100); - draw_hud_element_clipped(gActionCommandStatus.hudElements[2]); + hud_element_draw_clipped(gActionCommandStatus.hudElements[2]); } void N(free_hud_elements)(void) { - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); - free_hud_element(gActionCommandStatus.hudElements[2]); - free_hud_element(gActionCommandStatus.hudElements[3]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[2]); + hud_element_free(gActionCommandStatus.hudElements[3]); } diff --git a/src/battle/action_cmd/bomb.c b/src/battle/action_cmd/bomb.c index cf24801245..02830295fd 100644 --- a/src/battle/action_cmd/bomb.c +++ b/src/battle/action_cmd/bomb.c @@ -53,23 +53,23 @@ ApiStatus func_802A9000_427A70(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_100pct); + hudElement = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -86,15 +86,15 @@ void func_802A928C_427CFC(void) { case 0: btl_set_popup_duration(99); hudElement = actionCommandStatus->hudElements[0]; - set_hud_element_alpha(hudElement, 255); + hud_element_set_alpha(hudElement, 255); if (actionCommandStatus->unk_61) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } hudElement = actionCommandStatus->hudElements[1]; - set_hud_element_alpha(hudElement, 255); + hud_element_set_alpha(hudElement, 255); if (actionCommandStatus->unk_61) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } actionCommandStatus->state = 1; @@ -107,9 +107,9 @@ void func_802A928C_427CFC(void) { actionCommandStatus->hudElementX = 50; } - set_hud_element_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); break; case 10: @@ -120,7 +120,7 @@ void func_802A928C_427CFC(void) { break; } - set_hud_element_anim(actionCommandStatus->hudElements[0], &HudScript_MashAButton); + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_MashAButton); actionCommandStatus->barFillLevel = 0; actionCommandStatus->unk_54 = actionCommandStatus->unk_52; sfx_play_sound_with_params(0x80000041, 0, 0, 0); @@ -161,9 +161,9 @@ void func_802A928C_427CFC(void) { hudElement = actionCommandStatus->hudElements[2]; actionCommandStatus->barFillLevel = 10000; actionCommandStatus->unk_68 = TRUE; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX + 50, + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY + 28); - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } battleStatus->unk_84 = actionCommandStatus->barFillLevel / 100; diff --git a/src/battle/action_cmd/break_free.c b/src/battle/action_cmd/break_free.c index 7a8c2960da..382bbc4a47 100644 --- a/src/battle/action_cmd/break_free.c +++ b/src/battle/action_cmd/break_free.c @@ -35,29 +35,29 @@ ApiStatus func_802A9000_4233F0(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_RunningAway); + hudElement = hud_element_create(HudScript_RunningAway); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_RunAwayOK); + hudElement = hud_element_create(HudScript_RunAwayOK); actionCommandStatus->hudElements[3] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -112,27 +112,27 @@ void func_802A96B8_423AA8(void) { // Putting 31 into a variable manually fixes regalloc, so perhaps this was a constant defined somewhere? thirtyOne = 31; - set_hud_element_render_pos(hudElements[3], actionCommandStatus->hudElementX - (hudX - thirtyOne), + hud_element_set_render_pos(hudElements[3], actionCommandStatus->hudElementX - (hudX - thirtyOne), actionCommandStatus->hudElementY + 17); - set_hud_element_render_pos(hudElements[2], actionCommandStatus->hudElementX - (hudX - thirtyOne), + hud_element_set_render_pos(hudElements[2], actionCommandStatus->hudElementX - (hudX - thirtyOne), actionCommandStatus->hudElementY - 1); if (actionCommandStatus->unk_6A == 0) { - draw_hud_element_clipped(hudElements[0]); + hud_element_draw_clipped(hudElements[0]); } hudElement = hudElements[1]; - draw_hud_element_clipped(hudElement); - get_hud_element_render_pos(hudElement, &hudX, &hudY); + hud_element_draw_clipped(hudElement); + hud_element_get_render_pos(hudElement, &hudX, &hudY); func_80268770(hudX, hudY, actionCommandStatus->barFillLevel / 100); - draw_hud_element_clipped(hudElements[2]); - draw_hud_element_clipped(hudElements[3]); + hud_element_draw_clipped(hudElements[2]); + hud_element_draw_clipped(hudElements[3]); } void func_802A97FC_423BEC(void) { - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); - free_hud_element(gActionCommandStatus.hudElements[2]); - free_hud_element(gActionCommandStatus.hudElements[3]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[2]); + hud_element_free(gActionCommandStatus.hudElements[3]); } diff --git a/src/battle/action_cmd/common/UnkActionCommandFunc1.inc.c b/src/battle/action_cmd/common/UnkActionCommandFunc1.inc.c index ace19f2331..27f89dbb08 100644 --- a/src/battle/action_cmd/common/UnkActionCommandFunc1.inc.c +++ b/src/battle/action_cmd/common/UnkActionCommandFunc1.inc.c @@ -8,11 +8,11 @@ void N(UnkActionCommandFunc1)(void) { s32 hudElement; s32 barFillLevel; - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); + hud_element_draw_clipped(actionCommandStatus->hudElements[0]); hudElement = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElement); - get_hud_element_render_pos(hudElement, &hudX, &hudY); + hud_element_draw_clipped(hudElement); + hud_element_get_render_pos(hudElement, &hudX, &hudY); if (actionCommandStatus->unk_68 == 0) { func_80268770(hudX, hudY, actionCommandStatus->barFillLevel / 100); @@ -20,5 +20,5 @@ void N(UnkActionCommandFunc1)(void) { func_8026880C(hudX, hudY, actionCommandStatus->barFillLevel / 100); } - draw_hud_element_clipped(actionCommandStatus->hudElements[2]); + hud_element_draw_clipped(actionCommandStatus->hudElements[2]); } diff --git a/src/battle/action_cmd/dizzy_shell.c b/src/battle/action_cmd/dizzy_shell.c index 3108f2f147..5dcfab87e0 100644 --- a/src/battle/action_cmd/dizzy_shell.c +++ b/src/battle/action_cmd/dizzy_shell.c @@ -34,23 +34,23 @@ ApiStatus func_802A9000_426170(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_100pct); + hudElement = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/fire_shell.c b/src/battle/action_cmd/fire_shell.c index 831618dbf8..17f85b14c5 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -35,23 +35,23 @@ ApiStatus func_802A9000_4269D0(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_StickNeutral); + hudElement = hud_element_create(HudScript_StickNeutral); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_100pct); + hudElement = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/flee.c b/src/battle/action_cmd/flee.c index 8eb211db25..b43ec91378 100644 --- a/src/battle/action_cmd/flee.c +++ b/src/battle/action_cmd/flee.c @@ -38,39 +38,39 @@ ApiStatus func_802A9000_422AD0(Evt* script, s32 isInitialCall) { D_802A9920 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_RunningAway); + hudElement = hud_element_create(HudScript_RunningAway); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_RunAwayOK); + hudElement = hud_element_create(HudScript_RunAwayOK); actionCommandStatus->hudElements[3] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); xOffset = 29 - ((100 - actionCommandStatus->unk_46) * 60) / 100; - set_hud_element_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX - xOffset, actionCommandStatus->hudElementY + 17); - set_hud_element_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX - xOffset, actionCommandStatus->hudElementY - 1); + hud_element_set_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX - xOffset, actionCommandStatus->hudElementY + 17); + hud_element_set_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX - xOffset, actionCommandStatus->hudElementY - 1); - hudElement = create_hud_element(HudScript_100pct); + hudElement = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[4] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -103,27 +103,27 @@ void func_802A9378_422E48(void) { switch (actionCommandStatus->state) { case 0: hudElement = actionCommandStatus->hudElements[0]; - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_alpha(hudElement, 0xFF); if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } hudElement = actionCommandStatus->hudElements[1]; - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_alpha(hudElement, 0xFF); if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } hudElement = actionCommandStatus->hudElements[2]; - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_alpha(hudElement, 0xFF); if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } hudElement = actionCommandStatus->hudElements[3]; - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_alpha(hudElement, 0xFF); if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } actionCommandStatus->state = 1; @@ -133,8 +133,8 @@ void func_802A9378_422E48(void) { if (actionCommandStatus->hudElementX > 50) { actionCommandStatus->hudElementX = 50; } - set_hud_element_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); break; case 10: if (actionCommandStatus->unk_4E != 0) { @@ -142,7 +142,7 @@ void func_802A9378_422E48(void) { break; } - set_hud_element_anim(actionCommandStatus->hudElements[0], HudScript_MashAButton); + hud_element_set_script(actionCommandStatus->hudElements[0], HudScript_MashAButton); D_802A9920 = 1; actionCommandStatus->state = 11; actionCommandStatus->unk_54 = actionCommandStatus->unk_52; @@ -154,8 +154,8 @@ void func_802A9378_422E48(void) { hudElement = actionCommandStatus->hudElements[4]; actionCommandStatus->barFillLevel = 10000; actionCommandStatus->unk_68 = 1; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY + 28); - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY + 28); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } battleStatus->actionSuccess = actionCommandStatus->barFillLevel / 100; @@ -217,16 +217,16 @@ void func_802A96F4_4231C4(void) { x = 60 - temp_v1 / 100; temp_a1 = x - 31; - set_hud_element_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX - temp_a1, actionCommandStatus->hudElementY + 17); - set_hud_element_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX + 31 - x, actionCommandStatus->hudElementY - 1); + hud_element_set_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX - temp_a1, actionCommandStatus->hudElementY + 17); + hud_element_set_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX + 31 - x, actionCommandStatus->hudElementY - 1); if (battleStatus->unk_83 != 0) { - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); + hud_element_draw_clipped(actionCommandStatus->hudElements[0]); } hudElement = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElement); - get_hud_element_render_pos(hudElement, &x, &y); + hud_element_draw_clipped(hudElement); + hud_element_get_render_pos(hudElement, &x, &y); if (D_802A9920 == 0) { func_80268798(x, y, actionCommandStatus->barFillLevel / 100, 1); @@ -238,15 +238,15 @@ void func_802A96F4_4231C4(void) { } } - draw_hud_element_clipped(actionCommandStatus->hudElements[2]); - draw_hud_element_clipped(actionCommandStatus->hudElements[3]); - draw_hud_element_clipped(actionCommandStatus->hudElements[4]); + hud_element_draw_clipped(actionCommandStatus->hudElements[2]); + hud_element_draw_clipped(actionCommandStatus->hudElements[3]); + hud_element_draw_clipped(actionCommandStatus->hudElements[4]); } void func_802A9894_423364(void) { - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); - free_hud_element(gActionCommandStatus.hudElements[2]); - free_hud_element(gActionCommandStatus.hudElements[3]); - free_hud_element(gActionCommandStatus.hudElements[4]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[2]); + hud_element_free(gActionCommandStatus.hudElements[3]); + hud_element_free(gActionCommandStatus.hudElements[4]); } diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index 6d90c8cfec..4432ec19c6 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -36,48 +36,48 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { actionCommandStatus->unk_60 = 0; actionCommandStatus->hudElementY = 96; - hudElement = create_hud_element(HudScript_TimingBar1Chance); + hudElement = hud_element_create(HudScript_TimingBar1Chance); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 10); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 10); - hudElement = create_hud_element(HudScript_TimingWait); + hudElement = hud_element_create(HudScript_TimingWait); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); - hudElement = create_hud_element(HudScript_TimingCharge4a); + hudElement = hud_element_create(HudScript_TimingCharge4a); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); - hudElement = create_hud_element(HudScript_TimingCharge4b); + hudElement = hud_element_create(HudScript_TimingCharge4b); actionCommandStatus->hudElements[3] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); - hudElement = create_hud_element(HudScript_TimingCharge4c); + hudElement = hud_element_create(HudScript_TimingCharge4c); actionCommandStatus->hudElements[4] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); - hudElement = create_hud_element(HudScript_StickHoldLeft); + hudElement = hud_element_create(HudScript_StickHoldLeft); actionCommandStatus->hudElements[5] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); - hudElement = create_hud_element(HudScript_RightOn); + hudElement = hud_element_create(HudScript_RightOn); actionCommandStatus->hudElements[6] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_alpha(hudElement, 0xFF); return ApiStatus_DONE2; } @@ -118,21 +118,21 @@ ApiStatus func_802A9258_422258(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "battle/action_cmd/hammer", func_802A936C_42236C); void N(draw_hud_elements)(void) { - draw_hud_element_clipped(gActionCommandStatus.hudElements[0]); - draw_hud_element_clipped(gActionCommandStatus.hudElements[1]); - draw_hud_element_clipped(gActionCommandStatus.hudElements[2]); - draw_hud_element_clipped(gActionCommandStatus.hudElements[3]); - draw_hud_element_clipped(gActionCommandStatus.hudElements[4]); - draw_hud_element_clipped(gActionCommandStatus.hudElements[5]); - draw_hud_element_clipped(gActionCommandStatus.hudElements[6]); + hud_element_draw_clipped(gActionCommandStatus.hudElements[0]); + hud_element_draw_clipped(gActionCommandStatus.hudElements[1]); + hud_element_draw_clipped(gActionCommandStatus.hudElements[2]); + hud_element_draw_clipped(gActionCommandStatus.hudElements[3]); + hud_element_draw_clipped(gActionCommandStatus.hudElements[4]); + hud_element_draw_clipped(gActionCommandStatus.hudElements[5]); + hud_element_draw_clipped(gActionCommandStatus.hudElements[6]); } void N(free_hud_elements)(void) { - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); - free_hud_element(gActionCommandStatus.hudElements[2]); - free_hud_element(gActionCommandStatus.hudElements[3]); - free_hud_element(gActionCommandStatus.hudElements[4]); - free_hud_element(gActionCommandStatus.hudElements[5]); - free_hud_element(gActionCommandStatus.hudElements[6]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[2]); + hud_element_free(gActionCommandStatus.hudElements[3]); + hud_element_free(gActionCommandStatus.hudElements[4]); + hud_element_free(gActionCommandStatus.hudElements[5]); + hud_element_free(gActionCommandStatus.hudElements[6]); } diff --git a/src/battle/action_cmd/hurricane.c b/src/battle/action_cmd/hurricane.c index 7d5e9f3194..f85589c4c2 100644 --- a/src/battle/action_cmd/hurricane.c +++ b/src/battle/action_cmd/hurricane.c @@ -33,29 +33,29 @@ ApiStatus func_802A9000_42F6E0(void) { actionCommandStatus->unk_68 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); - hudElement = create_hud_element(HudScript_BButton); + hudElement = hud_element_create(HudScript_BButton); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_100pct); + hudElement = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[4] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -99,12 +99,12 @@ void func_802A97AC_42FE8C(void) { s32 hudX; s32 hudElement; - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); - draw_hud_element_clipped(actionCommandStatus->hudElements[2]); + hud_element_draw_clipped(actionCommandStatus->hudElements[0]); + hud_element_draw_clipped(actionCommandStatus->hudElements[2]); hudElement = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElement); - get_hud_element_render_pos(hudElement, &hudX, &hudY); + hud_element_draw_clipped(hudElement); + hud_element_get_render_pos(hudElement, &hudX, &hudY); if (actionCommandStatus->unk_68 == 0) { func_80268770(hudX, hudY, actionCommandStatus->barFillLevel / 100); @@ -112,12 +112,12 @@ void func_802A97AC_42FE8C(void) { func_8026880C(hudX, hudY, actionCommandStatus->barFillLevel / 100); } - draw_hud_element_clipped(actionCommandStatus->hudElements[4]); + hud_element_draw_clipped(actionCommandStatus->hudElements[4]); } void func_802A9894_42FF74(void) { - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); - free_hud_element(gActionCommandStatus.hudElements[2]); - free_hud_element(gActionCommandStatus.hudElements[4]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[2]); + hud_element_free(gActionCommandStatus.hudElements[4]); } diff --git a/src/battle/action_cmd/jump.c b/src/battle/action_cmd/jump.c index c961c5dbf4..9ef4b61a08 100644 --- a/src/battle/action_cmd/jump.c +++ b/src/battle/action_cmd/jump.c @@ -30,19 +30,19 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { actionCommandStatus->unk_60 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_alpha(hudElement, 0xFF); - hudElement = create_hud_element(HudScript_RightOn); + hudElement = hud_element_create(HudScript_RightOn); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_alpha(hudElement, 0xFF); return ApiStatus_DONE2; } @@ -69,9 +69,9 @@ ApiStatus func_802A9120_421B10(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = 50; battleStatus->flags1 &= ~0x8000; battleStatus->flags1 &= ~0x2000; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } actionCommandStatus->state = 10; @@ -105,16 +105,16 @@ void N(update)(void) { } hudElement = actionCommandStatus->hudElements[0]; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); if (actionCommandStatus->unk_61) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } if (actionCommandStatus->autoSucceed) { hudElement = actionCommandStatus->hudElements[1]; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY); if (actionCommandStatus->unk_61) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); break; } } @@ -126,7 +126,7 @@ void N(update)(void) { temp_s0_3 = battleStatus->unk_434[actionCommandStatus->unk_50]; if (((actionCommandStatus->unk_4E - temp_s0_3) - 2) <= 0) { - set_hud_element_anim(actionCommandStatus->hudElements[0], HudScript_AButtonDown); + hud_element_set_script(actionCommandStatus->hudElements[0], HudScript_AButtonDown); } if (((battleStatus->currentButtonsPressed & 0x8000) != 0) && (actionCommandStatus->autoSucceed == 0)) { actionCommandStatus->unk_60 = 1; @@ -152,7 +152,7 @@ void N(update)(void) { if (battleStatus->actionSuccess >= 0) { hudElement = actionCommandStatus->hudElements[0]; if (actionCommandStatus->unk_61 != 0) { - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } } } @@ -191,13 +191,13 @@ void N(update)(void) { } void N(draw_hud_elements)(void) { - draw_hud_element_clipped(gActionCommandStatus.hudElements[0]); + hud_element_draw_clipped(gActionCommandStatus.hudElements[0]); if (!(gGameStatusPtr->demoFlags & 1)) { - draw_hud_element_clipped(gActionCommandStatus.hudElements[1]); + hud_element_draw_clipped(gActionCommandStatus.hudElements[1]); } } void N(free_hud_elements)(void) { - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); } diff --git a/src/battle/action_cmd/mega_shock.c b/src/battle/action_cmd/mega_shock.c index 09ff89121e..d5709668b8 100644 --- a/src/battle/action_cmd/mega_shock.c +++ b/src/battle/action_cmd/mega_shock.c @@ -49,29 +49,29 @@ ApiStatus func_802A9000_42DA10(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -0x30; actionCommandStatus->hudElementY = 0x50; - elementID = create_hud_element(HudScript_AButton); + elementID = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = elementID; - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(elementID, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(elementID, 0); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(elementID, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(elementID, 0); - elementID = create_hud_element(HudScript_BButton); + elementID = hud_element_create(HudScript_BButton); actionCommandStatus->hudElements[2] = elementID; - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(elementID, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(elementID, 0); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(elementID, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(elementID, 0); - elementID = create_hud_element(HudScript_BlueMeter); + elementID = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = elementID; - set_hud_element_render_pos(elementID, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 0x1C); - set_hud_element_render_depth(elementID, 0); - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(elementID, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 0x1C); + hud_element_set_render_depth(elementID, 0); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - elementID = create_hud_element(HudScript_100pct); + elementID = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[4] = elementID; - set_hud_element_render_pos(elementID, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 0x1C); - set_hud_element_render_depth(elementID, 0); - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(elementID, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 0x1C); + hud_element_set_render_depth(elementID, 0); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -132,20 +132,20 @@ void func_802A92A0_42DCB0(void) { hudElement = actionCommandStatus->hudElements[0]; if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } - set_hud_element_alpha(hudElement, 255); + hud_element_set_alpha(hudElement, 255); hudElement = actionCommandStatus->hudElements[2]; if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } - set_hud_element_alpha(hudElement, 255); + hud_element_set_alpha(hudElement, 255); hudElement = actionCommandStatus->hudElements[1]; - set_hud_element_alpha(hudElement, 255); + hud_element_set_alpha(hudElement, 255); if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } actionCommandStatus->state = 1; @@ -162,11 +162,11 @@ void func_802A92A0_42DCB0(void) { actionCommandStatus->hudElementX = 50; } - set_hud_element_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX - 17, + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX - 17, actionCommandStatus->hudElementY); - set_hud_element_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX + 23, + hud_element_set_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX + 23, actionCommandStatus->hudElementY); - set_hud_element_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); break; case 10: @@ -175,8 +175,8 @@ void func_802A92A0_42DCB0(void) { actionCommandStatus->unk_4E--; break; } - set_hud_element_anim(actionCommandStatus->hudElements[0], &HudScript_MashAButton); - set_hud_element_anim(actionCommandStatus->hudElements[2], &HudScript_MashBButton1); + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_MashAButton); + hud_element_set_script(actionCommandStatus->hudElements[2], &HudScript_MashBButton1); actionCommandStatus->barFillLevel = 0; actionCommandStatus->unk_5C = 0; actionCommandStatus->unk_54 = actionCommandStatus->unk_52; @@ -267,9 +267,9 @@ void func_802A92A0_42DCB0(void) { hudElement = actionCommandStatus->hudElements[4]; actionCommandStatus->barFillLevel = 10000; actionCommandStatus->unk_68 = 1; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX + 50, + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY + 28); - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } adjustedFillLevel = actionCommandStatus->barFillLevel / 100; @@ -340,12 +340,12 @@ void func_802A97F8_42E208(void) { s32 hudElementX; s32 hudElementY; - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); - draw_hud_element_clipped(actionCommandStatus->hudElements[2]); + hud_element_draw_clipped(actionCommandStatus->hudElements[0]); + hud_element_draw_clipped(actionCommandStatus->hudElements[2]); hudElement = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElement); - get_hud_element_render_pos(hudElement, &hudElementX, &hudElementY); + hud_element_draw_clipped(hudElement); + hud_element_get_render_pos(hudElement, &hudElementX, &hudElementY); if (actionCommandStatus->unk_68 == 0) { func_80268770(hudElementX, hudElementY, actionCommandStatus->barFillLevel / 100); @@ -353,12 +353,12 @@ void func_802A97F8_42E208(void) { func_8026880C(hudElementX, hudElementY, actionCommandStatus->barFillLevel / 100); } - draw_hud_element_clipped(actionCommandStatus->hudElements[4]); + hud_element_draw_clipped(actionCommandStatus->hudElements[4]); } void func_802A98E0_42E2F0(void) { - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); - free_hud_element(gActionCommandStatus.hudElements[2]); - free_hud_element(gActionCommandStatus.hudElements[4]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[2]); + hud_element_free(gActionCommandStatus.hudElements[4]); } diff --git a/src/battle/action_cmd/power_shock.c b/src/battle/action_cmd/power_shock.c index 354964fbfb..4b7a8056e0 100644 --- a/src/battle/action_cmd/power_shock.c +++ b/src/battle/action_cmd/power_shock.c @@ -42,34 +42,34 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { D_802A9B00 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_100pct); + hudElement = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[3] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_RunAwayOK); + hudElement = hud_element_create(HudScript_RunAwayOK); actionCommandStatus->hudElements[4] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); temp_v1 = (100 - actionCommandStatus->unk_46) * 60; temp_v1 /= 100; temp_v1 = 29 - temp_v1; - set_hud_element_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX - temp_v1, actionCommandStatus->hudElementY + 17); + hud_element_set_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX - temp_v1, actionCommandStatus->hudElementY + 17); return ApiStatus_DONE2; } @@ -115,18 +115,18 @@ void func_802A9310_42D220(void) { btl_set_popup_duration(99); hudElement = actionCommandStatus->hudElements[0]; if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_alpha(hudElement, 0xFF); hudElement = actionCommandStatus->hudElements[1]; - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_alpha(hudElement, 0xFF); if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } hudElement = actionCommandStatus->hudElements[4]; - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_alpha(hudElement, 0xFF); if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } actionCommandStatus->state = 1; break; @@ -139,18 +139,18 @@ void func_802A9310_42D220(void) { if (actionCommandStatus->hudElementX > 50) { actionCommandStatus->hudElementX = 50; } - set_hud_element_render_pos( + hud_element_set_render_pos( actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_pos( + hud_element_set_render_pos( actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); temp_v0_2 = (((100 - actionCommandStatus->unk_46) * 60) / 100); temp_v0_2 = 29 - temp_v0_2; - set_hud_element_render_pos( + hud_element_set_render_pos( actionCommandStatus->hudElements[4], actionCommandStatus->hudElementX - temp_v0_2, actionCommandStatus->hudElementY + 17); @@ -162,7 +162,7 @@ void func_802A9310_42D220(void) { actionCommandStatus->unk_4E--; break; } - set_hud_element_anim(actionCommandStatus->hudElements[0], HudScript_MashAButton); + hud_element_set_script(actionCommandStatus->hudElements[0], HudScript_MashAButton); actionCommandStatus->unk_44 = 0; actionCommandStatus->unk_5C = 0; D_802A9B00 = 1; @@ -204,11 +204,11 @@ void func_802A9310_42D220(void) { hudElement = actionCommandStatus->hudElements[3]; actionCommandStatus->unk_44 = 10000; actionCommandStatus->unk_68 = 1; - set_hud_element_render_pos( + hud_element_set_render_pos( hudElement, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY + 28); - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } battleStatus->unk_84 = actionCommandStatus->unk_44 / 100; @@ -298,14 +298,14 @@ void N(draw_hud_elements)(void) { temp_v0 = actionCommandStatus->unk_46 * 60; x = 60 - temp_v0 / 100; temp_a1 = x - 31; - set_hud_element_render_pos(actionCommandStatus->hudElements[4], actionCommandStatus->hudElementX - temp_a1, actionCommandStatus->hudElementY + 17); - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); + hud_element_set_render_pos(actionCommandStatus->hudElements[4], actionCommandStatus->hudElementX - temp_a1, actionCommandStatus->hudElementY + 17); + hud_element_draw_clipped(actionCommandStatus->hudElements[0]); hudElement = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElement); - get_hud_element_render_pos(hudElement, &x, &y); + hud_element_draw_clipped(hudElement); + hud_element_get_render_pos(hudElement, &x, &y); // Redundant call, but needed to match. - get_hud_element_render_pos(hudElement, &x, &y); + hud_element_get_render_pos(hudElement, &x, &y); if (D_802A9B00 == 0) { func_80268798(x, y, actionCommandStatus->barFillLevel / 100, 1); @@ -315,12 +315,12 @@ void N(draw_hud_elements)(void) { func_80268834(x, y, actionCommandStatus->barFillLevel / 100, 4); } hudElement = actionCommandStatus->hudElements[3]; - draw_hud_element_clipped(hudElement); + hud_element_draw_clipped(hudElement); } void N(free_hud_elements)(void) { - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); - free_hud_element(gActionCommandStatus.hudElements[3]); - free_hud_element(gActionCommandStatus.hudElements[4]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[3]); + hud_element_free(gActionCommandStatus.hudElements[4]); } diff --git a/src/battle/action_cmd/smack.c b/src/battle/action_cmd/smack.c index eadb7d2401..3ccbb3376a 100644 --- a/src/battle/action_cmd/smack.c +++ b/src/battle/action_cmd/smack.c @@ -65,23 +65,23 @@ ApiStatus func_802A9000_42E3A0(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_StickNeutral); + hudElement = hud_element_create(HudScript_StickNeutral); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_100pct); + hudElement = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -100,14 +100,14 @@ void func_802A9298_42E638(void) { case 0: btl_set_popup_duration(99); hudElement = actionCommandStatus->hudElements[0]; - set_hud_element_alpha(hudElement, 255); + hud_element_set_alpha(hudElement, 255); if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } hudElement = actionCommandStatus->hudElements[1]; - set_hud_element_alpha(hudElement, 255); + hud_element_set_alpha(hudElement, 255); if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } actionCommandStatus->state = 1; break; @@ -123,9 +123,9 @@ void func_802A9298_42E638(void) { actionCommandStatus->hudElementX = 50; } - set_hud_element_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); break; case 10: @@ -134,7 +134,7 @@ void func_802A9298_42E638(void) { actionCommandStatus->unk_4E--; break; } - set_hud_element_anim(actionCommandStatus->hudElements[0], HudScript_StickMashLeft); + hud_element_set_script(actionCommandStatus->hudElements[0], HudScript_StickMashLeft); actionCommandStatus->barFillLevel = 0; battleStatus->unk_85 = 0; actionCommandStatus->unk_5C = 0; @@ -186,9 +186,9 @@ void func_802A9298_42E638(void) { hudElement = actionCommandStatus->hudElements[2]; actionCommandStatus->barFillLevel = 10000; actionCommandStatus->unk_68 = 1; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX + 50, + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY + 28); - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } battleStatus->unk_84 = actionCommandStatus->barFillLevel / 100; diff --git a/src/battle/action_cmd/spiny_surge.c b/src/battle/action_cmd/spiny_surge.c index 86965bbbad..bdbd4df27e 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -35,23 +35,23 @@ ApiStatus func_802A9000_42EE20(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_StickNeutral); + hudElement = hud_element_create(HudScript_StickNeutral); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_100pct); + hudElement = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/spook.c b/src/battle/action_cmd/spook.c index 1da0198035..648dab410c 100644 --- a/src/battle/action_cmd/spook.c +++ b/src/battle/action_cmd/spook.c @@ -34,23 +34,23 @@ ApiStatus func_802A9000_430020(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_StickNeutral); + hudElement = hud_element_create(HudScript_StickNeutral); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(HudScript_100pct); + hudElement = hud_element_create(HudScript_100pct); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index b52a2c86cd..5fcb23c113 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -30,17 +30,17 @@ ApiStatus func_802A9000_429D20(void) { actionCommandStatus->unk_5C = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -78,10 +78,10 @@ void func_802A9634_42A354(void) { s32 hudElement; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); + hud_element_draw_clipped(actionCommandStatus->hudElements[0]); hudElement = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElement); - get_hud_element_render_pos(hudElement, &x, &y); + hud_element_draw_clipped(hudElement); + hud_element_get_render_pos(hudElement, &x, &y); if (actionCommandStatus->unk_5C == 0) { func_80268798(x, y, actionCommandStatus->barFillLevel / 100, 1); } else { @@ -91,6 +91,6 @@ void func_802A9634_42A354(void) { void func_802A9720_42A440(void) { sfx_stop_sound(0x80000041); - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); } diff --git a/src/battle/action_cmd/stop_leech.c b/src/battle/action_cmd/stop_leech.c index 061a20b5ea..a06ab0ae14 100644 --- a/src/battle/action_cmd/stop_leech.c +++ b/src/battle/action_cmd/stop_leech.c @@ -29,17 +29,17 @@ ApiStatus func_802A9000_425590(Evt* script, s32 isInitialCall) { actionCommandStatus->unk_48 = 0; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -80,13 +80,13 @@ void func_802A91F8_425788(void) { btl_set_popup_duration(99); hudElement = actionCommandStatus->hudElements[0]; if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_alpha(hudElement, 0xFF); hudElement = actionCommandStatus->hudElements[1]; - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_alpha(hudElement, 0xFF); if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } actionCommandStatus->state = 1; break; @@ -97,8 +97,8 @@ void func_802A91F8_425788(void) { if (hudElementX > 50) { actionCommandStatus->hudElementX = 50; } - set_hud_element_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); break; case 10: btl_set_popup_duration(99); @@ -106,7 +106,7 @@ void func_802A91F8_425788(void) { actionCommandStatus->unk_4E -= 1; break; } - set_hud_element_anim(actionCommandStatus->hudElements[0], HudScript_MashAButton); + hud_element_set_script(actionCommandStatus->hudElements[0], HudScript_MashAButton); actionCommandStatus->barFillLevel = 0; actionCommandStatus->state = 11; actionCommandStatus->unk_54 = actionCommandStatus->unk_52; @@ -152,16 +152,16 @@ void func_802A94A4_425A34(void) { s32 hudElement; if (actionCommandStatus->unk_6A == 0) { - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); + hud_element_draw_clipped(actionCommandStatus->hudElements[0]); } hudElement = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElement); - get_hud_element_render_pos(hudElement, &x, &y); + hud_element_draw_clipped(hudElement); + hud_element_get_render_pos(hudElement, &x, &y); func_80268798(x, y, actionCommandStatus->barFillLevel / 100, 2); } void func_802A9544_425AD4(void) { - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); } diff --git a/src/battle/action_cmd/tidal_wave.c b/src/battle/action_cmd/tidal_wave.c index e218078fc8..daf77425f9 100644 --- a/src/battle/action_cmd/tidal_wave.c +++ b/src/battle/action_cmd/tidal_wave.c @@ -33,18 +33,18 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); for (i = 1; i < ARRAY_COUNT(actionCommandStatus->hudElements); i++) { - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[i] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); } return ApiStatus_DONE2; @@ -95,9 +95,9 @@ void N(update)(void) { btl_set_popup_duration(99); hudElement = actionCommandStatus->hudElements[0]; if (actionCommandStatus->unk_61 != 0) { - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); } - set_hud_element_alpha(hudElement, 0xFF); + hud_element_set_alpha(hudElement, 0xFF); actionCommandStatus->state = 1; break; case 1: @@ -106,7 +106,7 @@ void N(update)(void) { if (actionCommandStatus->hudElementX > 50) { actionCommandStatus->hudElementX = 50; } - set_hud_element_render_pos( + hud_element_set_render_pos( actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX + 21, actionCommandStatus->hudElementY + 28); @@ -134,13 +134,13 @@ void N(update)(void) { } while (oldButton == newButton); hudElement = actionCommandStatus->hudElements[actionCommandStatus->unk_5D]; - set_hud_element_anim( + hud_element_set_script( hudElement, D_802A97C0_42CEB0[newButton]); - set_hud_element_render_pos( + hud_element_set_render_pos( hudElement, actionCommandStatus->hudElementX + ((actionCommandStatus->unk_5D - 1) * 20) + 16, actionCommandStatus->hudElementY); - clear_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); sfx_play_sound(0x233); actionCommandStatus->unk_70 = 1; actionCommandStatus->state = 12; @@ -251,9 +251,9 @@ void N(update)(void) { if (success) { // Correct; shrink button, set up next button press, etc. hudElement = actionCommandStatus->hudElements[actionCommandStatus->unk_5D]; - set_hud_element_anim(hudElement, D_802A97CC_42CEBC[actionCommandStatus->unk_5C]); - set_hud_element_scale(hudElement, 0.5f); - set_hud_element_render_pos( + hud_element_set_script(hudElement, D_802A97CC_42CEBC[actionCommandStatus->unk_5C]); + hud_element_set_scale(hudElement, 0.5f); + hud_element_set_render_pos( hudElement, actionCommandStatus->hudElementX + ((actionCommandStatus->unk_5D - 1) * 20), actionCommandStatus->hudElementY + 7); @@ -301,16 +301,16 @@ void N(draw_hud_elements)(void) { s32 i; for (i = 1; i < 15; i++) { - draw_hud_element_clipped(gActionCommandStatus.hudElements[i]); + hud_element_draw_clipped(gActionCommandStatus.hudElements[i]); } } void N(free_hud_elements)(void) { s32 i; - free_hud_element(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[0]); for (i = 1; i < 15; i++) { - free_hud_element(gActionCommandStatus.hudElements[i]); + hud_element_free(gActionCommandStatus.hudElements[i]); } } diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c index d41f756d71..0b6f130410 100644 --- a/src/battle/action_cmd/water_block.c +++ b/src/battle/action_cmd/water_block.c @@ -42,37 +42,37 @@ void func_802AA014_42B504(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); - draw_hud_element_clipped(actionCommandStatus->hudElements[1]); - draw_hud_element_clipped(actionCommandStatus->hudElements[2]); - draw_hud_element_clipped(actionCommandStatus->hudElements[3]); - draw_hud_element_clipped(actionCommandStatus->hudElements[4]); - draw_hud_element_clipped(actionCommandStatus->hudElements[6]); - draw_hud_element_clipped(actionCommandStatus->hudElements[7]); - draw_hud_element_clipped(actionCommandStatus->hudElements[8]); - draw_hud_element_clipped(actionCommandStatus->hudElements[13]); + hud_element_draw_clipped(actionCommandStatus->hudElements[0]); + hud_element_draw_clipped(actionCommandStatus->hudElements[1]); + hud_element_draw_clipped(actionCommandStatus->hudElements[2]); + hud_element_draw_clipped(actionCommandStatus->hudElements[3]); + hud_element_draw_clipped(actionCommandStatus->hudElements[4]); + hud_element_draw_clipped(actionCommandStatus->hudElements[6]); + hud_element_draw_clipped(actionCommandStatus->hudElements[7]); + hud_element_draw_clipped(actionCommandStatus->hudElements[8]); + hud_element_draw_clipped(actionCommandStatus->hudElements[13]); hudElement = actionCommandStatus->hudElements[10]; - if (get_hud_element_anim(hudElement) != D_802AB180_42C670[battleStatus->unk_84]) { - set_hud_element_anim(hudElement, D_802AB180_42C670[battleStatus->unk_84]); + if (hud_element_get_script(hudElement) != D_802AB180_42C670[battleStatus->unk_84]) { + hud_element_set_script(hudElement, D_802AB180_42C670[battleStatus->unk_84]); } - draw_hud_element_clipped(hudElement); - draw_hud_element_clipped(actionCommandStatus->hudElements[11]); - draw_hud_element_clipped(actionCommandStatus->hudElements[12]); + hud_element_draw_clipped(hudElement); + hud_element_draw_clipped(actionCommandStatus->hudElements[11]); + hud_element_draw_clipped(actionCommandStatus->hudElements[12]); } void func_802AA0D8_42B5C8(void) { - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); - free_hud_element(gActionCommandStatus.hudElements[2]); - free_hud_element(gActionCommandStatus.hudElements[3]); - free_hud_element(gActionCommandStatus.hudElements[4]); - free_hud_element(gActionCommandStatus.hudElements[6]); - free_hud_element(gActionCommandStatus.hudElements[7]); - free_hud_element(gActionCommandStatus.hudElements[8]); - free_hud_element(gActionCommandStatus.hudElements[10]); - free_hud_element(gActionCommandStatus.hudElements[11]); - free_hud_element(gActionCommandStatus.hudElements[12]); - free_hud_element(gActionCommandStatus.hudElements[13]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[2]); + hud_element_free(gActionCommandStatus.hudElements[3]); + hud_element_free(gActionCommandStatus.hudElements[4]); + hud_element_free(gActionCommandStatus.hudElements[6]); + hud_element_free(gActionCommandStatus.hudElements[7]); + hud_element_free(gActionCommandStatus.hudElements[8]); + hud_element_free(gActionCommandStatus.hudElements[10]); + hud_element_free(gActionCommandStatus.hudElements[11]); + hud_element_free(gActionCommandStatus.hudElements[12]); + hud_element_free(gActionCommandStatus.hudElements[13]); } diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c index d558bebb67..e62063a5c1 100644 --- a/src/battle/action_cmd/whirlwind.c +++ b/src/battle/action_cmd/whirlwind.c @@ -35,29 +35,29 @@ ApiStatus func_802A9000_423C70(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = create_hud_element(HudScript_AButton); + hudElement = hud_element_create(HudScript_AButton); actionCommandStatus->hudElements[0] = hudElement; - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - set_hud_element_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(hudElement, 0); - hudElement = create_hud_element(HudScript_BlueMeter); + hudElement = hud_element_create(HudScript_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(&D_802AA7F0_425460); + hudElement = hud_element_create(&D_802AA7F0_425460); actionCommandStatus->hudElements[2] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX + 54, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX + 54, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = create_hud_element(&D_802AA818_425488); + hudElement = hud_element_create(&D_802AA818_425488); actionCommandStatus->hudElements[3] = hudElement; - set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX + 60, actionCommandStatus->hudElementY + 28); - set_hud_element_render_depth(hudElement, 0); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX + 60, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(hudElement, 0); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -80,30 +80,30 @@ void func_802A9744_4243B4(void) { s32 hudElement; if (actionCommandStatus->unk_6A == 0) { - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); + hud_element_draw_clipped(actionCommandStatus->hudElements[0]); } hudElement = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElement); - get_hud_element_render_pos(hudElement, &x, &y); + hud_element_draw_clipped(hudElement); + hud_element_get_render_pos(hudElement, &x, &y); func_80268798(x, y, (s16) actionCommandStatus->barFillLevel / 100, 1); - draw_hud_element_clipped(actionCommandStatus->hudElements[3]); + hud_element_draw_clipped(actionCommandStatus->hudElements[3]); hudElement = actionCommandStatus->hudElements[2]; if (actionCommandStatus->unk_64 == 0) { - if (D_802AA888_4254F8[battleStatus->unk_84] != get_hud_element_anim(hudElement)) { - set_hud_element_anim(hudElement, D_802AA888_4254F8[battleStatus->unk_84]); + if (D_802AA888_4254F8[battleStatus->unk_84] != hud_element_get_script(hudElement)) { + hud_element_set_script(hudElement, D_802AA888_4254F8[battleStatus->unk_84]); } } else { - if (D_802AA8A0_425510[battleStatus->unk_84] != get_hud_element_anim(hudElement)) { - set_hud_element_anim(hudElement, D_802AA8A0_425510[battleStatus->unk_84]); + if (D_802AA8A0_425510[battleStatus->unk_84] != hud_element_get_script(hudElement)) { + hud_element_set_script(hudElement, D_802AA8A0_425510[battleStatus->unk_84]); } } - draw_hud_element_clipped(hudElement); + hud_element_draw_clipped(hudElement); } void func_802A9898_424508(void) { - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); - free_hud_element(gActionCommandStatus.hudElements[2]); - free_hud_element(gActionCommandStatus.hudElements[3]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[2]); + hud_element_free(gActionCommandStatus.hudElements[3]); } diff --git a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c index 80d6295067..f350d9454c 100644 --- a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c @@ -545,11 +545,11 @@ ApiStatus func_802189DC_447E1C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; f32 posX = evt_get_float_variable(script, *args++); f32 posY = evt_get_float_variable(script, *args++); - s32 icon = create_hud_element(HudScript_AnimatedHandPointer); + s32 icon = hud_element_create(HudScript_AnimatedHandPointer); - set_hud_element_render_pos(icon, posX, posY); - set_hud_element_scale(icon, 1.5f); - clear_hud_element_flags(icon, HUD_ELEMENT_FLAGS_200000 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(icon, posX, posY); + hud_element_set_scale(icon, 1.5f); + hud_element_clear_flags(icon, HUD_ELEMENT_FLAGS_200000 | HUD_ELEMENT_FLAGS_DISABLED); evt_set_variable(script, *args++, icon); load_tattle_flags(0x8B); return ApiStatus_DONE2; diff --git a/src/battle/battle.c b/src/battle/battle.c index 43c210f852..ff645bd8fb 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -386,7 +386,7 @@ void setup_demo_player(void) { playerData->merleeTurnCount = 0; playerData->maxStarPower = 0; playerData->specialBarsFilled = 0; - playerData->unk_292 = 0; + playerData->starBeamLevel = 0; } void load_demo_battle(u32 index) { @@ -407,7 +407,7 @@ void load_demo_battle(u32 index) { clear_animator_list(); clear_entity_models(); clear_npcs(); - clear_hud_element_cache(); + hud_element_clear_cache(); clear_trigger_data(); clear_model_data(); clear_sprite_shading_data(); diff --git a/src/battle/item/ItemRefund.inc.c b/src/battle/item/ItemRefund.inc.c index 84488554af..15b6b89ec6 100644 --- a/src/battle/item/ItemRefund.inc.c +++ b/src/battle/item/ItemRefund.inc.c @@ -40,8 +40,8 @@ ApiStatus N(GiveRefund)(Evt* script, s32 isInitialCall) { posZ = player->currentPos.z; get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconX, &iconY, &iconZ); - itemIcon = create_hud_element(HudScript_Refund); - set_hud_element_render_pos(itemIcon, iconX + 36, iconY - 63); + itemIcon = hud_element_create(HudScript_Refund); + hud_element_set_render_pos(itemIcon, iconX + 36, iconY - 63); } script->varTable[0] = sleepTime; @@ -54,7 +54,7 @@ ApiStatus N(GiveRefundCleanup)(Evt* script, s32 isInitialCall) { s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; if (player_team_is_ability_active(battleStatus->playerActor, ABILITY_REFUND) && sellValue > 0) { - free_hud_element(itemIcon); + hud_element_free(itemIcon); } return ApiStatus_DONE2; diff --git a/src/battle/item/mystery.c b/src/battle/item/mystery.c index 0a8c42f29e..833bd80826 100644 --- a/src/battle/item/mystery.c +++ b/src/battle/item/mystery.c @@ -28,14 +28,14 @@ void N(func_802A123C_72C7EC)(void) { var2 = *ptr; var = (D_802A25EC / 100) - 0x68; ptr++; - set_hud_element_render_pos(var2, 0x7C, (i * 0x1A) - var); - draw_hud_element_3(var2); + hud_element_set_render_pos(var2, 0x7C, (i * 0x1A) - var); + hud_element_draw_without_clipping(var2); } var2 = D_802A25C8; var = (D_802A25EC / 100) - 0x68; - set_hud_element_render_pos(var2, 0x7C, (i * 0x1A) - var); - draw_hud_element_3(var2); + hud_element_set_render_pos(var2, 0x7C, (i * 0x1A) - var); + hud_element_draw_without_clipping(var2); } } } @@ -92,9 +92,9 @@ ApiStatus N(func_802A13E4_72C994)(Evt* script, s32 isInitialCall) { itemTable = gItemTable; iconPtr = &D_802A25C8; for (; i < 7; i++, iconPtr++) { - icon = create_hud_element(ic[itemTable[D_802A25FC[i]].iconID].iconId); + icon = hud_element_create(ic[itemTable[D_802A25FC[i]].iconID].iconId); *iconPtr = icon; - set_hud_element_flags(icon, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(icon, HUD_ELEMENT_FLAGS_80); } D_802A25E4 = 1; } @@ -199,7 +199,7 @@ ApiStatus N(func_802A13E4_72C994)(Evt* script, s32 isInitialCall) { script->varTable[0] = g; free_generic_entity(D_802A25F8); for (i = 0; i < 7; i++) { - free_hud_element(*iconPtr++); + hud_element_free(*iconPtr++); } } return ApiStatus_DONE2; diff --git a/src/battle/item/strange_cake.c b/src/battle/item/strange_cake.c index fcb1579e7c..d2ddb6db42 100644 --- a/src/battle/item/strange_cake.c +++ b/src/battle/item/strange_cake.c @@ -29,14 +29,14 @@ ApiStatus N(func_802A123C_73153C)(Evt* script, s32 isInitialCall) { var2 = *ptr; var = (D_802A2DD8 / 100) - 0x68; ptr++; - set_hud_element_render_pos(var2, 0x7C, (i * 0x1A) - var); - draw_hud_element_3(var2); + hud_element_set_render_pos(var2, 0x7C, (i * 0x1A) - var); + hud_element_draw_without_clipping(var2); } var2 = D_802A2DF4; var = (D_802A2DD8 / 100) - 0x68; - set_hud_element_render_pos(var2, 0x7C, (i * 0x1A) - var); - draw_hud_element_3(var2); + hud_element_set_render_pos(var2, 0x7C, (i * 0x1A) - var); + hud_element_draw_without_clipping(var2); } } } @@ -84,10 +84,10 @@ ApiStatus N(func_802A13E4_7316E4)(Evt* script, s32 isInitialCall) { for (i = 0; i < 5; i++) { s32* B48Ptr = &N(D_802A2848_732B48); s32* B58Ptr = &N(D_802A2858_732B58); - HudElement* icon = create_hud_element(*(B48Ptr + * (B58Ptr + i))); + HudElement* icon = hud_element_create(*(B48Ptr + * (B58Ptr + i))); *(&D_802A2DD8 + i) = icon; - set_hud_element_flags(icon, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(icon, HUD_ELEMENT_FLAGS_80); } D_802A2DEC = 1; } @@ -192,7 +192,7 @@ ApiStatus N(func_802A13E4_7316E4)(Evt* script, s32 isInitialCall) { script->varTable[0] = g; free_generic_entity(D_802A2E00); for (i = 0; i < 5; i++) { - free_hud_element(*iconPtr++); + hud_element_free(*iconPtr++); } } return ApiStatus_DONE2; diff --git a/src/bss2.c b/src/bss2.c index 72c16b23c6..395a2974b2 100644 --- a/src/bss2.c +++ b/src/bss2.c @@ -13,7 +13,7 @@ BSS void* D_8010C924; BSS s32 D_8010C928; BSS s32 D_8010C92C; BSS s32 wPartnerNpc; -BSS s32 D_8010C934; +BSS s32* TweesterTouchingPlayer; BSS s32 D_8010C938; BSS s32 D_8010C93C; BSS s32 D_8010C940; @@ -21,7 +21,7 @@ BSS s32 gSpinHistoryBufferPos; BSS char D_8010C948[0x4]; BSS s32 D_8010C94C; BSS s32 D_8010C950; -BSS s32 D_8010C954; +BSS s32 TweesterTouchingPartner; BSS s32 D_8010C958; BSS s32 D_8010C95C; BSS s32 D_8010C960; diff --git a/src/common/FreeIcon.inc.c b/src/common/FreeIcon.inc.c index d1138c17b1..0113b07435 100644 --- a/src/common/FreeIcon.inc.c +++ b/src/common/FreeIcon.inc.c @@ -2,6 +2,6 @@ #include "npc.h" ApiStatus N(FreeIcon)(Evt* script, s32 isInitialCall) { - free_hud_element(evt_get_variable(script, *script->ptrReadPos)); + hud_element_free(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } diff --git a/src/common/free_hud_elements.inc.c b/src/common/free_hud_elements.inc.c index 0c492af885..1aeb3a20c7 100644 --- a/src/common/free_hud_elements.inc.c +++ b/src/common/free_hud_elements.inc.c @@ -1,8 +1,8 @@ #include "common.h" void N(free_hud_elements)(void) { - free_hud_element(gActionCommandStatus.hudElements[0]); - free_hud_element(gActionCommandStatus.hudElements[1]); - free_hud_element(gActionCommandStatus.hudElements[2]); + hud_element_free(gActionCommandStatus.hudElements[0]); + hud_element_free(gActionCommandStatus.hudElements[1]); + hud_element_free(gActionCommandStatus.hudElements[2]); } diff --git a/src/entity/Block.c b/src/entity/Block.c index 6795be66eb..43a9f65ad3 100644 --- a/src/entity/Block.c +++ b/src/entity/Block.c @@ -57,15 +57,15 @@ void entity_block_hit_animate_scale(Entity* entity) { INCLUDE_ASM(s32, "entity/Block", entity_base_block_update_slow_sinking); s32 entity_base_block_idle(Entity* entity) { - BlockData* temp = entity->dataBuf.block; + BlockData* data = entity->dataBuf.block; s32 ret = 0; if (is_block_on_ground(entity) != 0) { if (entity->flags & ENTITY_FLAGS_200000) { ret = 1; entity_base_block_update_slow_sinking(entity); - if (temp->itemEntityIndex != -1) { - ItemEntity* itemEntity = get_item_entity(temp->itemEntityIndex); + if (data->itemEntityIndex != -1) { + ItemEntity* itemEntity = get_item_entity(data->itemEntityIndex); itemEntity->position.y = entity->position.y + 4.0f; } } @@ -75,58 +75,57 @@ s32 entity_base_block_idle(Entity* entity) { } void entity_base_block_init(Entity* entity) { - BlockData* temp = entity->dataBuf.block; - f32 posY; + BlockData* data = entity->dataBuf.block; - temp->itemEntityIndex = -1; - temp->initialY = entity->position.y; - temp->unk_0E = -1; + data->itemEntityIndex = -1; + data->initialY = entity->position.y; + data->unk_0E = -1; entity->flags &= ~ENTITY_FLAGS_200000; } void entity_inactive_block_hit_init(Entity* entity) { - BlockData* temp = entity->dataBuf.block; + BlockData* data = entity->dataBuf.block; - temp->recoilInterpPhase = 90.0f; + data->recoilInterpPhase = 90.0f; } void entity_inactive_block_hit_anim(Entity* entity) { - f64 temp_f20; - BlockData* temp = entity->dataBuf.block; + BlockData* data = entity->dataBuf.block; + f64 currentY; entity_MulticoinBlock_update_timer(entity); - temp_f20 = entity->position.y; - entity->position.y = temp_f20 + ((f64)sin_rad((temp->recoilInterpPhase * 6.28318f) / 360.0f) * 2); - temp->recoilInterpPhase += 60.0f; - if (temp->recoilInterpPhase > 450.0f) { - temp->recoilInterpPhase = clamp_angle(temp->recoilInterpPhase); + currentY = entity->position.y; + entity->position.y = currentY + ((f64)sin_rad((data->recoilInterpPhase * 6.28318f) / 360.0f) * 2); + data->recoilInterpPhase += 60.0f; + if (data->recoilInterpPhase > 450.0f) { + data->recoilInterpPhase = clamp_angle(data->recoilInterpPhase); exec_entity_commandlist(entity); } } void entity_inactive_block_recoil_anim(Entity* entity) { + BlockData* data = entity->dataBuf.block; f64 currentY; - BlockData* temp = entity->dataBuf.block; entity_MulticoinBlock_update_timer(entity); currentY = entity->position.y; - entity->position.y = currentY + ((f64)sin_rad((temp->recoilInterpPhase * 6.28318f) / 360.0f)); - temp->recoilInterpPhase += 60.0f; - if (temp->recoilInterpPhase >= 360.0f) { - temp->recoilInterpPhase = 0.0f; - entity->position.y = temp->initialY; + entity->position.y = currentY + ((f64)sin_rad((data->recoilInterpPhase * 6.28318f) / 360.0f)); + data->recoilInterpPhase += 60.0f; + if (data->recoilInterpPhase >= 360.0f) { + data->recoilInterpPhase = 0.0f; + entity->position.y = data->initialY; exec_entity_commandlist(entity); } } void entity_MulticoinBlock_init(Entity* entity) { - BlockData* temp; + BlockData* data; entity_base_block_init(entity); - temp = entity->dataBuf.block; - temp->coinsLeft = MULTICOIN_BLOCK_MAX_COINS; - temp->timeLeft = 123; - temp->gameFlagIndex = 0xFFFF; + data = entity->dataBuf.block; + data->coinsLeft = MULTICOIN_BLOCK_MAX_COINS; + data->timeLeft = 123; + data->gameFlagIndex = 0xFFFF; } extern s32 D_802E9E54; @@ -175,7 +174,7 @@ void entity_MulticoinBlock_update_timer(Entity* entity) { void entity_MulticoinBlock_idle(Entity* entity) { BlockData* data = entity->dataBuf.block; - if ((entity->collisionFlags & ENTITY_COLLISION_FLAGS_80) != 0) { + if ((entity->collisionFlags & ENTITY_COLLISION_BLOCK_HIT) != 0) { exec_entity_commandlist(entity); return; } @@ -324,7 +323,6 @@ void entity_init_Hammer1Block_normal(Entity* entity) { } s32 entity_init_HammerBlock_small(Entity* entity) { - s32 temp_v0; BlockData* data = entity->dataBuf.block; data->itemEntityIndex = -1; diff --git a/src/entity/BlueWarpPipe.c b/src/entity/BlueWarpPipe.c index 3876d9814d..e3917a04ea 100644 --- a/src/entity/BlueWarpPipe.c +++ b/src/entity/BlueWarpPipe.c @@ -53,7 +53,7 @@ void entity_BlueWarpPipe_wait_for_player_to_get_off(Entity* entity) { void entity_BlueWarpPipe_idle(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - if ((entity->collisionFlags & ENTITY_COLLISION_FLAGS_1) != 0) { + if ((entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) != 0) { gOverrideFlags |= GLOBAL_OVERRIDES_40; if (!(playerStatus->flags & (PLAYER_STATUS_FLAGS_1000 | PLAYER_STATUS_FLAGS_INPUT_DISABLED))) { diff --git a/src/entity/Chest.c b/src/entity/Chest.c index 58bae572fc..c52c4efd09 100644 --- a/src/entity/Chest.c +++ b/src/entity/Chest.c @@ -58,10 +58,10 @@ void entity_Chest_idle(Entity* entity) { rotation = clamp_angle(180.0f - entity->rotation.y); angle = fabsf(rotation - clamp_angle(atan2(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z))); if ((!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT)) && - (!(entity->collisionFlags & ENTITY_COLLISION_FLAGS_1)) && + (!(entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR)) && ((angle <= 40.0f) || (angle >= 320.0f))) { entity->flags |= ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; - if ((playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & ENTITY_COLLISION_FLAGS_8)) { + if ((playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_WALL)) { exec_entity_commandlist(entity); data = entity->dataBuf.chest; data->state = 0; @@ -230,22 +230,22 @@ void entity_GiantChest_give_equipment(Entity* entity) { s32 flag; switch (data->itemID) { - case 1: + case ITEM_JUMP: gPlayerData.bootsLevel = 0; break; - case 2: + case ITEM_SPIN_JUMP: gPlayerData.bootsLevel = 1; break; - case 3: + case ITEM_TORNADO_JUMP: gPlayerData.bootsLevel = 2; break; - case 4: + case ITEM_HAMMER: gPlayerData.hammerLevel = 0; break; - case 5: + case ITEM_SUPER_HAMMER: gPlayerData.hammerLevel = 1; break; - case 6: + case ITEM_ULTRA_HAMMER: gPlayerData.hammerLevel = 2; break; } diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c index e7fa44e086..21c4182641 100644 --- a/src/entity/HeartBlock.c +++ b/src/entity/HeartBlock.c @@ -4,15 +4,15 @@ extern u32* D_802EA728; extern u32* D_802EA760; extern EntityBlueprint Entity_HeartBlockContent; -extern UNK_TYPE D_802EB3C0; +extern u32 HeartBlockPrinterClosed; extern s32 D_802EA744; // -f32 entity_HeartBlockContent_get_previous_yaw(SuperBlockContentData* data, s32 arg1) { - s32 temp = data->unk_24 - arg1; - if (temp < 0) { - temp += 10; +f32 entity_HeartBlockContent_get_previous_yaw(HeartBlockContentData* data, s32 lagTime) { + s32 bufIdx = data->yawBufferPos - lagTime; + if (bufIdx < 0) { + bufIdx += ARRAY_COUNT(data->yawBuffer); } - return data->unk_28[temp]; + return data->yawBuffer[bufIdx]; } INCLUDE_ASM(s32, "entity/HeartBlock", entity_HeartBlockContent__setupGfx); @@ -22,7 +22,7 @@ void entity_HeartBlockContent_setupGfx(s32 entityIndex) { } void entity_HeartBlockContent_set_initial_pos(Entity* entity) { - SuperBlockContentData* temp = entity->dataBuf.superBlockContent; + HeartBlockContentData* temp = entity->dataBuf.heartBlockContent; Entity* entityTemp = get_entity_by_index(temp->parentEntityIndex); entity->position.x = entityTemp->position.x; @@ -31,21 +31,21 @@ void entity_HeartBlockContent_set_initial_pos(Entity* entity) { } void entity_HeartBlockContent__reset(Entity* entity) { - SuperBlockContentData* data; + HeartBlockContentData* data; Entity* someEntity; entity->renderSetupFunc = entity_HeartBlockContent_setupGfx; entity->alpha = 255; - data = entity->dataBuf.superBlockContent; + data = entity->dataBuf.heartBlockContent; entity->flags |= ENTITY_FLAGS_ALWAYS_FACE_CAMERA; someEntity = get_entity_by_index(data->parentEntityIndex); if (data->unk_09 == 0) { data->unk_09 = 1; - data->unk_01 = 2; + data->state = 2; entity->scale.x = 1.0f; } else { - data->unk_01 = 0; + data->state = 0; entity->scale.x = 0.0f; } @@ -61,14 +61,14 @@ void entity_HeartBlockContent__reset(Entity* entity) { } void entity_HeartBlockContent_anim_idle(Entity* entity, s32 arg1) { - SuperBlockContentData* data = entity->dataBuf.superBlockContent; - switch (data->unk_01) { + HeartBlockContentData* data = entity->dataBuf.heartBlockContent; + switch (data->state) { case 0: entity->scale.x = 0.0f; entity->scale.y = 0.0f; entity->scale.z = 0.0f; if (arg1 == 0) { - data->unk_01++; + data->state++; break; } return; @@ -76,23 +76,23 @@ void entity_HeartBlockContent_anim_idle(Entity* entity, s32 arg1) { entity->scale.x += 0.01; if (entity->scale.x >= 1.0) { entity->scale.x = 1.0f; - data->unk_02 = 0; - data->unk_01++; + data->sparkleTimer = 0; + data->state++; } entity->scale.z = entity->scale.x; entity->scale.y = entity->scale.x; break; case 2: entity_HeartBlockContent_set_initial_pos(entity); - data->unk_01++; + data->state++; // fallthrough case 3: if (gOverrideFlags == 0) { // create an effect every 50 frames - data->unk_02--; - if (data->unk_02 <= 0) { - data->unk_02 = 50; - fx_stars_shimmer(data->unk_0A, entity->position.x, entity->position.y, entity->position.z, 22.0f, 8.0f, 4, 20); + data->sparkleTimer--; + if (data->sparkleTimer <= 0) { + data->sparkleTimer = 50; + fx_stars_shimmer(data->sparkleEffectType, entity->position.x, entity->position.y, entity->position.z, 22.0f, 8.0f, 4, 20); } } break; @@ -102,16 +102,16 @@ void entity_HeartBlockContent_anim_idle(Entity* entity, s32 arg1) { exec_entity_commandlist(entity); disable_player_input(); gPlayerStatus.currentSpeed = 0; - gPlayerStatus.animFlags |= 0x200; + gPlayerStatus.animFlags |= PLAYER_STATUS_ANIM_FLAGS_RAISED_ARMS; set_time_freeze_mode(1); gOverrideFlags |= GLOBAL_OVERRIDES_40; } } void func_802E4DE0(Entity* entity) { - SuperBlockContentData* temp = entity->dataBuf.superBlockContent; + HeartBlockContentData* temp = entity->dataBuf.heartBlockContent; - temp->unk_01 = 0; + temp->state = 0; entity->scale.x = 1.0f; entity->scale.y = 1.0f; entity->scale.z = 1.0f; @@ -120,107 +120,107 @@ void func_802E4DE0(Entity* entity) { void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) { PlayerStatus* playerStatus = &gPlayerStatus; - SuperBlockContentData* data = entity->dataBuf.superBlockContent; + HeartBlockContentData* data = entity->dataBuf.heartBlockContent; f32 offsetX, offsetY, offsetZ; - switch (data->unk_01) { + switch (data->state) { case 0: fx_sparkles(0, entity->position.x, entity->position.y, entity->position.z, 2.0f); - data->unk_20 = 0.0f; - data->unk_01++; - data->unk_14 = 6.0f; + data->bouncePhase = 0.0f; + data->state++; + data->riseVelocity = 6.0f; break; case 1: - entity->position.y = entity->position.y + data->unk_14; - data->unk_14 -= 1.0f; - if (data->unk_14 <= 2.0f) { - data->unk_01++; + entity->position.y = entity->position.y + data->riseVelocity; + data->riseVelocity -= 1.0f; + if (data->riseVelocity <= 2.0f) { + data->state++; entity->flags &= ~ENTITY_FLAGS_ALWAYS_FACE_CAMERA; - data->unk_54 = -10.0f; + data->rotationRate = -10.0f; entity_set_render_script(entity, &D_802EA744); entity->renderSetupFunc = &entity_HeartBlockContent_setupGfx; } break; case 2: - entity->position.y += sin_rad((data->unk_20 * TAU) / 360.0f) * 0.5f; - data->unk_20 -= 30.0f; - if (data->unk_20 < 0.0f) { - data->unk_20 += 360.0f; + entity->position.y += sin_rad((data->bouncePhase * TAU) / 360.0f) * 0.5f; + data->bouncePhase -= 30.0f; + if (data->bouncePhase < 0.0f) { + data->bouncePhase += 360.0f; } - entity->rotation.y += data->unk_54; - data->unk_54 += 2.0f; - if (data->unk_54 >= 0.0f) { - data->unk_18 = 0.0f; - data->unk_1C = 0.0f; - data->unk_01++; - data->unk_04 = playerStatus->colliderHeight + 5; - data->unk_03 = 0; + entity->rotation.y += data->rotationRate; + data->rotationRate += 2.0f; + if (data->rotationRate >= 0.0f) { + data->sparkleTrailAngle = 0.0f; + data->sparkleTrailRadius = 0.0f; + data->state++; + data->sparkleTrailPosY = playerStatus->colliderHeight + 5; + data->sparkleTrailTimer = 0; recover_hp(-1); recover_fp(-1); sfx_play_sound(0x131); } - data->unk_28[data->unk_24] = entity->rotation.y; - data->unk_24++; - if (data->unk_24 >= 11) { - data->unk_24 = 0; + data->yawBuffer[data->yawBufferPos] = entity->rotation.y; + data->yawBufferPos++; + if (data->yawBufferPos > ARRAY_COUNT(data->yawBuffer)) { + data->yawBufferPos = 0; } break; case 3: - data->unk_1C += 2.0; - if (data->unk_1C >= 10.0f) { - data->unk_1C = 10.0f; + data->sparkleTrailRadius += 2.0; + if (data->sparkleTrailRadius >= 10.0f) { + data->sparkleTrailRadius = 10.0f; } - data->unk_18 += 18.0f; - if (data->unk_18 >= 360.0f) { - data->unk_18 -= 360.0f; + data->sparkleTrailAngle += 18.0f; + if (data->sparkleTrailAngle >= 360.0f) { + data->sparkleTrailAngle -= 360.0f; } - offsetX = data->unk_1C * sin_rad((data->unk_18 * TAU) / 360.0f); - offsetZ = data->unk_1C * cos_rad((data->unk_18 * TAU) / 360.0f); - offsetY = data->unk_04; + offsetX = data->sparkleTrailRadius * sin_rad((data->sparkleTrailAngle * TAU) / 360.0f); + offsetZ = data->sparkleTrailRadius * cos_rad((data->sparkleTrailAngle * TAU) / 360.0f); + offsetY = data->sparkleTrailPosY; - data->unk_04 -= 0.7; + data->sparkleTrailPosY -= 0.7; - if ((data->unk_03++ & 1) != 0) { + if ((data->sparkleTrailTimer++ & 1) != 0) { fx_sparkles(3, playerStatus->position.x + offsetX, playerStatus->position.y + offsetY, playerStatus->position.z - offsetZ, 8.0f ); } - if (data->unk_04 < 20.0f) { - data->unk_04 = 20.0f; - data->unk_01++; + if (data->sparkleTrailPosY < 20.0f) { + data->sparkleTrailPosY = 20.0f; + data->state++; } // fallthrough case 4: - entity->position.y += sin_rad((data->unk_20 * TAU) / 360.0f) * 0.5f; - data->unk_20 -= 30.0f; - if (data->unk_20 < 0.0f) { - data->unk_20 += 360.0f; + entity->position.y += sin_rad((data->bouncePhase * TAU) / 360.0f) * 0.5f; + data->bouncePhase -= 30.0f; + if (data->bouncePhase < 0.0f) { + data->bouncePhase += 360.0f; } - data->unk_54 += 1.0; - if (data->unk_54 > 30.0f) { - data->unk_54 = 30.0f; + data->rotationRate += 1.0; + if (data->rotationRate > 30.0f) { + data->rotationRate = 30.0f; } - entity->rotation.y += data->unk_54; + entity->rotation.y += data->rotationRate; if (entity->rotation.y >= 360.0f) { entity->rotation.y -= 360.0f; } entity->alpha -= 5; if (entity->alpha < 7) { entity->alpha = 5; - if (data->unk_01 == 4) { - data->unk_01++; + if (data->state == 4) { + data->state++; } } - data->unk_28[data->unk_24] = entity->rotation.y; - data->unk_24++; - if (data->unk_24 >= 11) { - data->unk_24 = 0; + data->yawBuffer[data->yawBufferPos] = entity->rotation.y; + data->yawBufferPos++; + if (data->yawBufferPos > ARRAY_COUNT(data->yawBuffer)) { + data->yawBufferPos = 0; } break; case 5: - playerStatus->animFlags &= ~0x200; + playerStatus->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_RAISED_ARMS; enable_player_input(); set_time_freeze_mode(0); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; @@ -259,9 +259,8 @@ void entity_HeartBlock_change_render_script(Entity* entity) { void entity_HeartBlock_show_tutorial_message(Entity* entity) { if ((!gPlayerData.partners[1].enabled) && get_global_flag(EVT_SAVE_FLAG(96)) == 0) { - UNK_TYPE* ptr = &D_802EB3C0; - *ptr = 0; - msg_get_printer_for_msg(0x1D0001, ptr); + HeartBlockPrinterClosed = FALSE; + msg_get_printer_for_msg(0x1D0001, &HeartBlockPrinterClosed); set_time_freeze_mode(TIME_FREEZE_PARTIAL); gOverrideFlags |= GLOBAL_OVERRIDES_40; disable_player_input(); @@ -272,7 +271,7 @@ void entity_HeartBlock_show_tutorial_message(Entity* entity) { } void entity_HeartBlock_wait_for_close_tutorial(Entity* entity) { - if (D_802EB3C0) { + if (HeartBlockPrinterClosed) { exec_entity_commandlist(entity); set_time_freeze_mode(TIME_FREEZE_NORMAL); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; @@ -280,21 +279,21 @@ void entity_HeartBlock_wait_for_close_tutorial(Entity* entity) { } } -s8 entity_HeartBlock_create_child_entity(Entity* entity, EntityBlueprint* data) { - s32 temp_s2 = CreateEntityVarArgBuffer[0]; - Entity* someEntity; - SuperBlockContentData* temp_v1; +s8 entity_HeartBlock_create_child_entity(Entity* entity, EntityBlueprint* bp) { + s32 useAltSparkleType = CreateEntityVarArgBuffer[0]; + Entity* childEntity; + HeartBlockContentData* data; entity_base_block_init(entity); - someEntity = get_entity_by_index(create_entity(data, entity->position.x, entity->position.y, entity->position.z, 0.0f, + childEntity = get_entity_by_index(create_entity(bp, entity->position.x, entity->position.y, entity->position.z, 0.0f, 0x80000000)); - temp_v1 = someEntity->dataBuf.superBlockContent; - temp_v1->parentEntityIndex = entity->listIndex; + data = childEntity->dataBuf.heartBlockContent; + data->parentEntityIndex = entity->listIndex; - if (temp_s2 == 0) { - temp_v1->unk_0A = 3; + if (useAltSparkleType == FALSE) { + data->sparkleEffectType = 3; } else { - temp_v1->unk_0A = 6; + data->sparkleEffectType = 6; } } diff --git a/src/entity/ItemBlock.c b/src/entity/ItemBlock.c index 4977c53afb..f2acdfc836 100644 --- a/src/entity/ItemBlock.c +++ b/src/entity/ItemBlock.c @@ -82,7 +82,7 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { s32 childEntityIndex; s32 isBlockOnGround; s32 parentEntityType; - ItemBlockData* temp; + ItemBlockData* childData; Entity* childEntity; Shadow* shadow; @@ -130,8 +130,8 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { childEntity->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; } - temp = childEntity->dataBuf.unk; - temp->childEntityIndex = childEntityIndex; + childData = childEntity->dataBuf.itemBlock; + childData->childEntityIndex = childEntityIndex; if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) { childEntity->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; diff --git a/src/entity/SaveBlock.c b/src/entity/SaveBlock.c index 4044f79b11..27a136bf31 100644 --- a/src/entity/SaveBlock.c +++ b/src/entity/SaveBlock.c @@ -46,8 +46,8 @@ void entity_SaveBlock_save_data(void) { void entity_SaveBlock_show_tutorial_message(Entity* entity) { if (!get_global_flag(EVT_SAVE_FLAG(95))) { - SaveBlockTutorialMessagePrinterClosed = FALSE; - msg_get_printer_for_msg(0x1D0000, &SaveBlockTutorialMessagePrinterClosed); + SaveBlockTutorialPrinterClosed = FALSE; + msg_get_printer_for_msg(0x1D0000, &SaveBlockTutorialPrinterClosed); set_global_flag(EVT_SAVE_FLAG(95)); return; } @@ -57,37 +57,37 @@ void entity_SaveBlock_show_tutorial_message(Entity* entity) { } void entity_SaveBlock_wait_for_close_tutorial(Entity* entity) { - if (SaveBlockTutorialMessagePrinterClosed) { + if (SaveBlockTutorialPrinterClosed) { exec_entity_commandlist(entity); } } void entity_SaveBlock_show_choice_message(void) { - SaveBlockTutorialMessagePrinterClosed = FALSE; - SaveBlockResultMessagePrinterClosed = FALSE; - SaveBlockResultMessagePrinter = msg_get_printer_for_msg(0x1D0004, &SaveBlockResultMessagePrinterClosed); - SaveBlockTutorialMessagePrinter = msg_get_printer_for_msg(0x1E000A, &SaveBlockTutorialMessagePrinterClosed); + SaveBlockTutorialPrinterClosed = FALSE; + SaveBlockResultPrinterClosed = FALSE; + SaveBlockResultPrinter = msg_get_printer_for_msg(0x1D0004, &SaveBlockResultPrinterClosed); + SaveBlockTutorialPrinter = msg_get_printer_for_msg(0x1E000A, &SaveBlockTutorialPrinterClosed); } void entity_SaveBlock_show_result_message(void) { - msg_printer_load_msg(0x1D0005, SaveBlockResultMessagePrinter); + msg_printer_load_msg(0x1D0005, SaveBlockResultPrinter); sfx_play_sound(0x10); } void entity_SaveBlock_wait_for_close_result(Entity* entity) { - if (SaveBlockResultMessagePrinterClosed) { + if (SaveBlockResultPrinterClosed) { exec_entity_commandlist(entity); } } void entity_SaveBlock_wait_for_close_choice(Entity* entity) { - if (SaveBlockTutorialMessagePrinterClosed) { - if (SaveBlockTutorialMessagePrinter->currentOption == 1) { + if (SaveBlockTutorialPrinterClosed) { + if (SaveBlockTutorialPrinter->currentOption == 1) { set_entity_commandlist(entity, &D_802E99DC); } else { exec_entity_commandlist(entity); } - close_message(SaveBlockResultMessagePrinter); + close_message(SaveBlockResultPrinter); } } diff --git a/src/entity/Signpost.c b/src/entity/Signpost.c index 14a37a3b3c..6023352e36 100644 --- a/src/entity/Signpost.c +++ b/src/entity/Signpost.c @@ -12,6 +12,6 @@ void entity_Signpost_idle(Entity* entity) { } } else { entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; - playerStatus->unk_C6 = -1; + playerStatus->interactingWithID = -1; } } diff --git a/src/entity/SimpleSpring.c b/src/entity/SimpleSpring.c index 61c60a3491..5a384b0e14 100644 --- a/src/entity/SimpleSpring.c +++ b/src/entity/SimpleSpring.c @@ -34,12 +34,12 @@ INCLUDE_ASM(s32, "entity/SimpleSpring", entity_SimpleSpring_idle); #endif void entity_SimpleSpring_set_jump_params(Entity* ent) { - s32* data = ent->dataBuf.unk; + SimpleSpringData* data = ent->dataBuf.simpleSpring; set_action_state(ACTION_STATE_LAUNCH); gPlayerStatus.gravityIntegrator[1] = 0; gPlayerStatus.gravityIntegrator[0] = 15.0f; - gPlayerStatus.gravityIntegrator[2] = (f32)*data; + gPlayerStatus.gravityIntegrator[2] = (f32)data->launchVelocity; gPlayerStatus.gravityIntegrator[3] = ent->position.y; } @@ -51,7 +51,7 @@ void entity_ScriptSpring_init(void) { } void entity_SimpleSpring_init(Entity* ent) { - ent->dataBuf.unk[0] = *CreateEntityVarArgBuffer; + ent->dataBuf.simpleSpring->launchVelocity = *CreateEntityVarArgBuffer; } INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_setupGfx); diff --git a/src/entity/SuperBlock.c b/src/entity/SuperBlock.c index d1654ac3cd..00522a1eb6 100644 --- a/src/entity/SuperBlock.c +++ b/src/entity/SuperBlock.c @@ -5,13 +5,13 @@ extern EntityBlueprint Entity_SuperBlockContent; void entity_SuperBlockContent_setupGfx(); -f32 entity_SuperBlockContent_get_previous_yaw(SuperBlockContentData* data, s32 arg1) { - s32 idx = data->yawBufferPos - arg1; +f32 entity_SuperBlockContent_get_previous_yaw(SuperBlockContentData* data, s32 lagTime) { + s32 bufIdx = data->yawBufferPos - lagTime; - if (idx < 0) { - idx += 20; + if (bufIdx < 0) { + bufIdx += ARRAY_COUNT(data->yawBuffer); } - return data->yawBuffer[idx]; + return data->yawBuffer[bufIdx]; } void entity_upgrade_block_hide_content(s32 entityIndex) { diff --git a/src/entity/Switch.c b/src/entity/Switch.c index bca49baf6a..13186f9ad6 100644 --- a/src/entity/Switch.c +++ b/src/entity/Switch.c @@ -1,50 +1,53 @@ #include "common.h" #include "effects.h" +#define REFLECTED_SWITCH_LINKED 2 +#define REFLECTED_SWITCH_HIDDEN 1 + void entity_shattering_init_pieces(Entity* entity, void* arg1, void* arg2); void entity_GreenStompSwitch_idle(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; + SwitchData* data = entity->dataBuf.swtch; - if (entity->collisionFlags & 1) { + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { if ((playerStatus->actionState == ACTION_STATE_GROUND_POUND) || (playerStatus->actionState == ACTION_STATE_ULTRA_POUND)) { exec_entity_commandlist(entity); - temp->unk_22 = 8; + data->greenMotionTimer = 8; } } } void entity_GreenStompSwitch_retract(Entity* entity) { - struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; - u16 temp2 = temp->unk_22--; + SwitchData* data = entity->dataBuf.swtch; + u16 curTime = data->greenMotionTimer--; - if (temp2) { + if (curTime) { entity->position.y -= 1.8625; return; } entity_start_script(entity); exec_entity_commandlist(entity); - temp->unk_22 = 8; + data->greenMotionTimer = 8; } void entity_GreenStompSwitch_extend(Entity* entity) { - struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; - u16 temp2 = temp->unk_22--; + SwitchData* data = entity->dataBuf.swtch; + u16 curTime = data->greenMotionTimer--; - if (temp2) { + if (curTime) { entity->position.y += 1.8625; return; } exec_entity_commandlist(entity); - temp->unk_22 = 8; + data->greenMotionTimer = 8; } void entity_raycast_down(f32*, f32*, f32*, f32*, f32*, f32*); void entity_switch_fall_down(Entity* entity) { - struct802E1400* temp_s1 = (struct802E1400*) entity->dataBuf.unk; + SwitchData* data = entity->dataBuf.swtch; f32 hitDepth = 10.0f; f32 x = entity->position.x; f32 y = entity->position.y; @@ -55,9 +58,9 @@ void entity_switch_fall_down(Entity* entity) { entity_raycast_down(&x, &y, &z, &hitYaw, &hitPitch, &hitDepth); if ((entity->position.y != y) && (entity->position.y > y)) { - f32 var = temp_s1->unk_00.x; + f32 var = data->fallVelocity; var += 0.5; - temp_s1->unk_00.x = var; + data->fallVelocity = var; entity->position.y -= var; if (entity->position.y < y) { entity->position.y = y; @@ -68,7 +71,7 @@ void entity_switch_fall_down(Entity* entity) { void entity_HugeBlueSwitch_idle(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - if (entity->collisionFlags & 1) { + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { if ((playerStatus->actionState == ACTION_STATE_GROUND_POUND) || (playerStatus->actionState == ACTION_STATE_ULTRA_POUND)) { exec_entity_commandlist(entity); @@ -77,24 +80,24 @@ void entity_HugeBlueSwitch_idle(Entity* entity) { } void entity_small_switch_idle(Entity* entity) { - struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; + SwitchData* data = entity->dataBuf.swtch; PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; entity_switch_fall_down(entity); - if (entity->collisionFlags & 0x40) { + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_HAMMER) { if (playerStatus->actionState == ACTION_STATE_HAMMER) { if (gPlayerData.hammerLevel < 0) { return; } exec_entity_commandlist(entity); - if (temp->attachedEntity == NULL) { + if (data->linkedSwitch == NULL) { return; } - exec_entity_commandlist(temp->attachedEntity); + exec_entity_commandlist(data->linkedSwitch); return; } } @@ -115,11 +118,11 @@ void entity_small_switch_idle(Entity* entity) { exec_entity_commandlist(entity); - if (temp->attachedEntity == NULL) { + if (data->linkedSwitch == NULL) { return; } - exec_entity_commandlist(temp->attachedEntity); + exec_entity_commandlist(data->linkedSwitch); } void entity_RedSwitch_wait_and_reset(Entity* entity) { @@ -129,13 +132,13 @@ void entity_RedSwitch_wait_and_reset(Entity* entity) { } void entity_base_switch_anim_init(Entity* entity) { - struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; + SwitchData* temp = entity->dataBuf.swtch; - temp->unk_00.x = 1.0f; - temp->unk_00.y = 0.1f; - temp->unk_00.z = -0.1f; - temp->unk_10 = 0; - temp->unk_11 = 0; + temp->fallVelocity = 1.0f; + temp->deltaScaleX = 0.1f; + temp->deltaScaleY = -0.1f; + temp->animStateScaleX = 0; + temp->animStateScaleY = 0; } s32 entity_RedSwitch_animate_scale(Entity* entity) { @@ -143,79 +146,79 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { f32 temp_f2; f32 temp_f4; f32 temp_f6; - struct802E1400* temp_s0 = (struct802E1400*) entity->dataBuf.unk; + SwitchData* data = entity->dataBuf.swtch; f32 phi_f4; s32 phi_s2 = 0; - switch (temp_s0->unk_10) { + switch (data->animStateScaleX) { case 0: // switch 1 - temp_f6 = temp_s0->unk_14.z * 0.3; - temp_f4 = ((temp_s0->unk_14.x + temp_f6) - entity->scale.x) / 4.0; + temp_f6 = data->baseScale.z * 0.3; + temp_f4 = ((data->baseScale.x + temp_f6) - entity->scale.x) / 4.0; phi_f4 = temp_f4; if (temp_f4 < 0.01) { phi_f4 = 0.01f; } - temp_s0->unk_00.y += phi_f4; - entity->scale.x += temp_s0->unk_00.y; - if ((temp_s0->unk_14.x + temp_f6) <= entity->scale.x) { - temp_s0->unk_00.y = 0.0f; - temp_s0->unk_10++; + data->deltaScaleX += phi_f4; + entity->scale.x += data->deltaScaleX; + if ((data->baseScale.x + temp_f6) <= entity->scale.x) { + data->deltaScaleX = 0.0f; + data->animStateScaleX++; } break; case 1: // switch 1 - temp_f6 = temp_s0->unk_14.z * -0.2; - temp_f4 = ((temp_s0->unk_14.x + temp_f6) - entity->scale.x) / 6.0; + temp_f6 = data->baseScale.z * -0.2; + temp_f4 = ((data->baseScale.x + temp_f6) - entity->scale.x) / 6.0; phi_f4 = temp_f4; if (temp_f4 > -0.01) { phi_f4 = -0.01f; } - temp_s0->unk_00.y += phi_f4; - entity->scale.x += temp_s0->unk_00.y; - if (entity->scale.x <= (temp_s0->unk_14.x + temp_f6)) { - temp_s0->unk_00.y = 0.0f; - temp_s0->unk_10++; + data->deltaScaleX += phi_f4; + entity->scale.x += data->deltaScaleX; + if (entity->scale.x <= (data->baseScale.x + temp_f6)) { + data->deltaScaleX = 0.0f; + data->animStateScaleX++; } break; case 2: // switch 1 - temp_f6 = temp_s0->unk_14.z * 0.15; - temp_f4 = ((temp_s0->unk_14.x + temp_f6) - entity->scale.x) / 4.0; + temp_f6 = data->baseScale.z * 0.15; + temp_f4 = ((data->baseScale.x + temp_f6) - entity->scale.x) / 4.0; phi_f4 = temp_f4; if (temp_f4 < 0.01) { phi_f4 = 0.01f; } - temp_s0->unk_00.y += phi_f4; - entity->scale.x += temp_s0->unk_00.y; - if ((temp_s0->unk_14.x + temp_f6) <= entity->scale.x) { - temp_s0->unk_00.y = 0.0f; - temp_s0->unk_10++; + data->deltaScaleX += phi_f4; + entity->scale.x += data->deltaScaleX; + if ((data->baseScale.x + temp_f6) <= entity->scale.x) { + data->deltaScaleX = 0.0f; + data->animStateScaleX++; } break; case 3: // switch 1 - temp_f6 = temp_s0->unk_14.z * -0.1; - temp_f4 = ((temp_s0->unk_14.x + temp_f6) - entity->scale.x) / 6.0; + temp_f6 = data->baseScale.z * -0.1; + temp_f4 = ((data->baseScale.x + temp_f6) - entity->scale.x) / 6.0; phi_f4 = temp_f4; if (temp_f4 > -0.01) { phi_f4 = -0.01f; } - temp_s0->unk_00.y += phi_f4; - entity->scale.x += temp_s0->unk_00.y; - if (entity->scale.x <= (temp_s0->unk_14.x + temp_f6)) { - temp_s0->unk_00.y = 0.0f; - temp_s0->unk_10++; + data->deltaScaleX += phi_f4; + entity->scale.x += data->deltaScaleX; + if (entity->scale.x <= (data->baseScale.x + temp_f6)) { + data->deltaScaleX = 0.0f; + data->animStateScaleX++; } break; case 4: // switch 1 - temp_f4 = (temp_s0->unk_14.x - entity->scale.x) / 4.0; + temp_f4 = (data->baseScale.x - entity->scale.x) / 4.0; phi_f4 = temp_f4; if (temp_f4 < 0.01) { phi_f4 = 0.01f; } - temp_s0->unk_00.y += phi_f4; - entity->scale.x += temp_s0->unk_00.y; - if (temp_s0->unk_14.x <= entity->scale.x) { - entity->scale.x = temp_s0->unk_14.x; - temp_s0->unk_00.y = 0.0f; - temp_s0->unk_10++; + data->deltaScaleX += phi_f4; + entity->scale.x += data->deltaScaleX; + if (data->baseScale.x <= entity->scale.x) { + entity->scale.x = data->baseScale.x; + data->deltaScaleX = 0.0f; + data->animStateScaleX++; } break; case 5: // switch 1 @@ -225,76 +228,76 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { entity->scale.z = entity->scale.x; - switch (temp_s0->unk_11) { + switch (data->animStateScaleY) { case 0: // switch 2 - temp_f6 = temp_s0->unk_14.z * -0.5; - temp_f4 = ((temp_s0->unk_14.y + temp_f6) - entity->scale.y) / 5.0; + temp_f6 = data->baseScale.z * -0.5; + temp_f4 = ((data->baseScale.y + temp_f6) - entity->scale.y) / 5.0; phi_f4 = temp_f4; if (temp_f4 > -0.01) { phi_f4 = -0.01f; } - temp_s0->unk_00.z += phi_f4; - entity->scale.y += temp_s0->unk_00.z; - if (entity->scale.y <= (temp_s0->unk_14.y + temp_f6)) { - temp_s0->unk_00.z = 0.0f; - temp_s0->unk_11++; + data->deltaScaleY += phi_f4; + entity->scale.y += data->deltaScaleY; + if (entity->scale.y <= (data->baseScale.y + temp_f6)) { + data->deltaScaleY = 0.0f; + data->animStateScaleY++; } break; case 1: // switch 2 - temp_f6 = temp_s0->unk_14.z * 0.1; - temp_f4 = ((temp_s0->unk_14.y + temp_f6) - entity->scale.y) / 10.0; + temp_f6 = data->baseScale.z * 0.1; + temp_f4 = ((data->baseScale.y + temp_f6) - entity->scale.y) / 10.0; phi_f4 = temp_f4; if (temp_f4 < 0.01) { phi_f4 = 0.01f; } - temp_s0->unk_00.z += phi_f4; - entity->scale.y += temp_s0->unk_00.z; - if ((temp_s0->unk_14.y + temp_f6) <= entity->scale.y) { - temp_s0->unk_00.z = 0.0f; - temp_s0->unk_11++; + data->deltaScaleY += phi_f4; + entity->scale.y += data->deltaScaleY; + if ((data->baseScale.y + temp_f6) <= entity->scale.y) { + data->deltaScaleY = 0.0f; + data->animStateScaleY++; } break; case 2: // switch 2 - temp_f6 = temp_s0->unk_14.z * -0.3; - temp_f4 = ((temp_s0->unk_14.y + temp_f6) - entity->scale.y) / 5.0; + temp_f6 = data->baseScale.z * -0.3; + temp_f4 = ((data->baseScale.y + temp_f6) - entity->scale.y) / 5.0; phi_f4 = temp_f4; if (temp_f4 > -0.01) { phi_f4 = -0.01f; } - temp_s0->unk_00.z += phi_f4; - entity->scale.y += temp_s0->unk_00.z; - if (entity->scale.y <= (temp_s0->unk_14.y + temp_f6)) { - temp_s0->unk_00.z = 0.0f; - temp_s0->unk_11++; + data->deltaScaleY += phi_f4; + entity->scale.y += data->deltaScaleY; + if (entity->scale.y <= (data->baseScale.y + temp_f6)) { + data->deltaScaleY = 0.0f; + data->animStateScaleY++; } break; case 3: // switch 2 - temp_f6 = temp_s0->unk_14.z * 0.0; - temp_f4 = ((temp_s0->unk_14.y + temp_f6) - entity->scale.y) / 10.0; + temp_f6 = data->baseScale.z * 0.0; + temp_f4 = ((data->baseScale.y + temp_f6) - entity->scale.y) / 10.0; phi_f4 = temp_f4; if (temp_f4 < 0.01) { phi_f4 = 0.01f; } - temp_s0->unk_00.z += phi_f4; - entity->scale.y += temp_s0->unk_00.z; - if ((temp_s0->unk_14.y + temp_f6) <= entity->scale.y) { - temp_s0->unk_00.z = 0.0f; - temp_s0->unk_11++; + data->deltaScaleY += phi_f4; + entity->scale.y += data->deltaScaleY; + if ((data->baseScale.y + temp_f6) <= entity->scale.y) { + data->deltaScaleY = 0.0f; + data->animStateScaleY++; } break; case 4: // switch 2 - temp_f4 = (temp_s0->unk_14.y - entity->scale.y) / 5.0; + temp_f4 = (data->baseScale.y - entity->scale.y) / 5.0; phi_f4 = temp_f4; if (temp_f4 > -0.01) { phi_f4 = -0.01f; } - temp_s0->unk_00.z += phi_f4; - entity->scale.y += temp_s0->unk_00.z; - if (entity->scale.y <= temp_s0->unk_14.y) { - entity->scale.y = temp_s0->unk_14.y; - temp_s0->unk_00.z = 0.0f; - temp_s0->unk_11++; + data->deltaScaleY += phi_f4; + entity->scale.y += data->deltaScaleY; + if (entity->scale.y <= data->baseScale.y) { + entity->scale.y = data->baseScale.y; + data->deltaScaleY = 0.0f; + data->animStateScaleY++; } break; case 5: // switch 2 @@ -304,84 +307,84 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { entity_switch_fall_down(entity); if (phi_s2 == 2) { - temp_s0->unk_10 = 0; - temp_s0->unk_11 = 0; + data->animStateScaleX = 0; + data->animStateScaleY = 0; exec_entity_commandlist(entity); } } void entity_base_switch_start_bound_script(Entity* entity) { - struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; - set_area_flag(temp->unk_20); + SwitchData* data = entity->dataBuf.swtch; + set_area_flag(data->areaFlagIndex); entity_start_script(entity); } void entity_base_switch_animate_scale(Entity* entity) { f32 temp_f0; f32 temp_f4; - f32 temp_f6; - struct802E1400* temp_s0 = (struct802E1400*) entity->dataBuf.unk; + f32 scaleChange; + SwitchData* data = entity->dataBuf.swtch; f32 phi_f4; s32 phi_s2 = 0; - switch (temp_s0->unk_10) { + switch (data->animStateScaleX) { case 0: - temp_f6 = temp_s0->unk_14.z * 0.3; - temp_f4 = ((temp_s0->unk_14.x + temp_f6) - entity->scale.x) / 4.0; + scaleChange = data->baseScale.z * 0.3; + temp_f4 = ((data->baseScale.x + scaleChange) - entity->scale.x) / 4.0; phi_f4 = temp_f4; if (temp_f4 < 0.01) { phi_f4 = 0.01f; } - temp_s0->unk_00.y += phi_f4; - entity->scale.x += temp_s0->unk_00.y; - if ((temp_s0->unk_14.x + temp_f6) <= entity->scale.x) { - temp_s0->unk_00.y = 0.0f; - temp_s0->unk_10++; + data->deltaScaleX += phi_f4; + entity->scale.x += data->deltaScaleX; + if ((data->baseScale.x + scaleChange) <= entity->scale.x) { + data->deltaScaleX = 0.0f; + data->animStateScaleX++; } break; case 1: - temp_f6 = (temp_s0->unk_14.z * -0.2); - temp_f4 = ((temp_s0->unk_14.x + temp_f6) - entity->scale.x) / 6.0; + scaleChange = (data->baseScale.z * -0.2); + temp_f4 = ((data->baseScale.x + scaleChange) - entity->scale.x) / 6.0; phi_f4 = temp_f4; if (temp_f4 > -0.01) { phi_f4 = -0.01f; } - temp_s0->unk_00.y += phi_f4; - entity->scale.x += temp_s0->unk_00.y; - if (entity->scale.x <= (temp_s0->unk_14.x + temp_f6)) { - temp_s0->unk_00.y = 0.0f; - temp_s0->unk_10++; + data->deltaScaleX += phi_f4; + entity->scale.x += data->deltaScaleX; + if (entity->scale.x <= (data->baseScale.x + scaleChange)) { + data->deltaScaleX = 0.0f; + data->animStateScaleX++; } break; case 2: - temp_f6 = temp_s0->unk_14.z * 0.15; - temp_f4 = ((temp_s0->unk_14.x + temp_f6) - entity->scale.x) / 4.0; + scaleChange = data->baseScale.z * 0.15; + temp_f4 = ((data->baseScale.x + scaleChange) - entity->scale.x) / 4.0; phi_f4 = temp_f4; if (temp_f4 < 0.01) { phi_f4 = 0.01f; } - temp_s0->unk_00.y += phi_f4; - entity->scale.x += temp_s0->unk_00.y; - if ((temp_s0->unk_14.x + temp_f6) <= entity->scale.x) { - temp_s0->unk_00.y = 0.0f; - temp_s0->unk_10++; + data->deltaScaleX += phi_f4; + entity->scale.x += data->deltaScaleX; + if ((data->baseScale.x + scaleChange) <= entity->scale.x) { + data->deltaScaleX = 0.0f; + data->animStateScaleX++; } break; case 3: - temp_f6 = temp_s0->unk_14.z * -0.1; - temp_f4 = ((temp_s0->unk_14.x + temp_f6) - entity->scale.x) / 6.0; + scaleChange = data->baseScale.z * -0.1; + temp_f4 = ((data->baseScale.x + scaleChange) - entity->scale.x) / 6.0; phi_f4 = temp_f4; if (temp_f4 > -0.01) { phi_f4 = -0.01f; } - temp_s0->unk_00.y += phi_f4; - entity->scale.x += temp_s0->unk_00.y; - if (entity->scale.x <= (temp_s0->unk_14.x + temp_f6)) { - temp_s0->unk_00.y = 0.0f; - temp_s0->unk_10++; + data->deltaScaleX += phi_f4; + entity->scale.x += data->deltaScaleX; + if (entity->scale.x <= (data->baseScale.x + scaleChange)) { + data->deltaScaleX = 0.0f; + data->animStateScaleX++; } break; @@ -392,49 +395,49 @@ void entity_base_switch_animate_scale(Entity* entity) { entity->scale.z = entity->scale.x; - switch (temp_s0->unk_11) { + switch (data->animStateScaleY) { case 0: - temp_f6 = temp_s0->unk_14.z * -0.5; - temp_f4 = ((temp_s0->unk_14.y + temp_f6) - entity->scale.y) / 5.0; + scaleChange = data->baseScale.z * -0.5; + temp_f4 = ((data->baseScale.y + scaleChange) - entity->scale.y) / 5.0; phi_f4 = temp_f4; if (temp_f4 > -0.01) { phi_f4 = -0.01f; } - temp_s0->unk_00.z += phi_f4; - entity->scale.y += temp_s0->unk_00.z; - if (entity->scale.y <= (temp_s0->unk_14.y + temp_f6)) { - temp_s0->unk_00.z = 0.0f; - temp_s0->unk_11++; + data->deltaScaleY += phi_f4; + entity->scale.y += data->deltaScaleY; + if (entity->scale.y <= (data->baseScale.y + scaleChange)) { + data->deltaScaleY = 0.0f; + data->animStateScaleY++; } break; case 1: - temp_f6 = temp_s0->unk_14.z * 0.1; - temp_f4 = ((temp_s0->unk_14.y + temp_f6) - entity->scale.y) / 10.0; + scaleChange = data->baseScale.z * 0.1; + temp_f4 = ((data->baseScale.y + scaleChange) - entity->scale.y) / 10.0; phi_f4 = temp_f4; if (temp_f4 < 0.01) { phi_f4 = 0.01f; } - temp_s0->unk_00.z += phi_f4; - entity->scale.y += temp_s0->unk_00.z; - if ((temp_s0->unk_14.y + temp_f6) <= entity->scale.y) { - temp_s0->unk_00.z = 0.0f; - temp_s0->unk_11++; + data->deltaScaleY += phi_f4; + entity->scale.y += data->deltaScaleY; + if ((data->baseScale.y + scaleChange) <= entity->scale.y) { + data->deltaScaleY = 0.0f; + data->animStateScaleY++; } break; case 2: - temp_f6 = temp_s0->unk_14.z * -0.3; - temp_f4 = ((temp_s0->unk_14.y + temp_f6) - entity->scale.y) / 5.0; + scaleChange = data->baseScale.z * -0.3; + temp_f4 = ((data->baseScale.y + scaleChange) - entity->scale.y) / 5.0; phi_f4 = temp_f4; if (temp_f4 > -0.01) { phi_f4 = -0.01f; } - temp_s0->unk_00.z += phi_f4; - entity->scale.y += temp_s0->unk_00.z; - if (entity->scale.y <= (temp_s0->unk_14.y + temp_f6)) { - temp_s0->unk_00.z = 0.0f; - temp_s0->unk_11++; + data->deltaScaleY += phi_f4; + entity->scale.y += data->deltaScaleY; + if (entity->scale.y <= (data->baseScale.y + scaleChange)) { + data->deltaScaleY = 0.0f; + data->animStateScaleY++; } break; @@ -445,66 +448,64 @@ void entity_base_switch_animate_scale(Entity* entity) { entity_switch_fall_down(entity); if (phi_s2 == 2) { - temp_s0->unk_10 = 0; - temp_s0->unk_11 = 0; + data->animStateScaleX = 0; + data->animStateScaleY = 0; exec_entity_commandlist(entity); } - temp_s0->unk_24++; - if ((temp_s0->unk_24 == 10) && (temp_s0->attachedEntity == NULL)) { + data->scaleAnimTimer++; + if ((data->scaleAnimTimer == 10) && (data->linkedSwitch == NULL)) { fx_cold_breath(0, entity->position.x, entity->position.y, entity->position.z, 1.0f, 0x3C); } } void entity_base_switch_init(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; + SwitchData* data = entity->dataBuf.swtch; - playerStatus->animFlags |= 0x1000000; - temp->unk_14.x = 1.0f; - temp->unk_14.y = 1.0f; - temp->unk_14.z = 1.0f; + playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_1000000; + data->baseScale.x = 1.0f; + data->baseScale.y = 1.0f; + data->baseScale.z = 1.0f; } void entity_BlueSwitch_init(Entity* entity) { - Entity* temp_v0_2; - struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; + SwitchData* data = entity->dataBuf.swtch; entity_base_switch_init(entity); - if (CreateEntityVarArgBuffer[0] == 2) { - D_802EB3A0 = entity; + if (CreateEntityVarArgBuffer[0] == REFLECTED_SWITCH_LINKED) { + SwitchToLink = entity; return; } - if (CreateEntityVarArgBuffer[0] == 1) { - if (D_802EB3A0 != NULL) { - temp->attachedEntity = D_802EB3A0; + if (CreateEntityVarArgBuffer[0] == REFLECTED_SWITCH_HIDDEN) { + if (SwitchToLink != NULL) { + data->linkedSwitch = SwitchToLink; entity->flags |= ENTITY_FLAGS_HIDDEN; return; } } else { - D_802EB3A0 = NULL; + SwitchToLink = NULL; } } void entity_HugeBlueSwitch_init(Entity* entity) { - struct802E1400* temp; + SwitchData* data; entity_base_switch_init(entity); - temp = (struct802E1400*) entity->dataBuf.unk; + data = entity->dataBuf.swtch; entity->scale.x = 3.0f; entity->scale.y = 3.0f; entity->scale.z = 3.0f; - temp->unk_14.x = 3.0f; - temp->unk_14.y = 3.0f; - temp->unk_14.z = 3.0f; + data->baseScale.x = 3.0f; + data->baseScale.y = 3.0f; + data->baseScale.z = 3.0f; } void entity_BrickBlock_idle(Entity* entity) { entity_base_block_idle(entity); } - INCLUDE_ASM(void, "entity/Switch", entity_shattering_init_pieces, Entity* entity, void* arg1, void* arg2); INCLUDE_ASM(void, "entity/Switch", entity_shattering_idle, Entity* entity); @@ -513,7 +514,7 @@ INCLUDE_ASM(void, "entity/Switch", entity_shattering_idle, Entity* entity); // display list issues void entity_shattering_setupGfx(s32 entityIndex) { Gfx* temp_s2; - struct802E1400* temp_s4; + SwitchData* data; struct802E2BA4* phi_fp; Matrix4f subroutine_arg6; Matrix4f subroutine_arg16; @@ -533,25 +534,25 @@ void entity_shattering_setupGfx(s32 entityIndex) { threeSixty = 360.0f; someFloat = 0.00390625f; entity = get_entity_by_index(entityIndex); - temp_s4 = (struct802E1400*) entity->dataBuf.unk; + data = entity->dataBuf.swtch; x_inv = -entity->position.x; y_inv = -entity->position.y; z_inv = -entity->position.z; - phi_fp = temp_s4->renderYaw; + phi_fp = data->renderYaw; for (i = 0; i < 24; i++) { - if (temp_s4->unk_3C.s == 0xFF) { + if (data->unk_3C.s == 0xFF) { gDPSetRenderMode(temp_s2++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); gDPSetCombineMode(temp_s2++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { gDPSetCombineLERP(temp_s2++, 0, 0, 0, TEXEL0, SHADE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); - gDPSetPrimColor(temp_s2++, 0, 0, 0x00, 0x00, 0x00, temp_s4->unk_3C.b[1]) + gDPSetPrimColor(temp_s2++, 0, 0, 0x00, 0x00, 0x00, data->unk_3C.b[1]) } guTranslateF(&subroutine_arg6, x_inv, y_inv, z_inv); - guRotateF(&subroutine_arg36, temp_s4->unk_8B[i] * threeSixty * someFloat, 1.0f, 0.0f, 0.0f); - guRotateF(&subroutine_arg48, temp_s4->unk_A4[i] * threeSixty * someFloat, 0.0f, 1.0f, 0.0f); + guRotateF(&subroutine_arg36, data->unk_8B[i] * threeSixty * someFloat, 1.0f, 0.0f, 0.0f); + guRotateF(&subroutine_arg48, data->unk_A4[i] * threeSixty * someFloat, 0.0f, 1.0f, 0.0f); guMtxCatF(&subroutine_arg36, &subroutine_arg48, &subroutine_arg48); guMtxCatF(&subroutine_arg48, &subroutine_arg6, &subroutine_arg6); - guTranslateF(&subroutine_arg16, temp_s4->unk_C0[i], temp_s4->unk_124[i], temp_s4->unk_188[i]); + guTranslateF(&subroutine_arg16, data->unk_C0[i], data->unk_124[i], data->unk_188[i]); guMtxCatF(&subroutine_arg6, &subroutine_arg16, &subroutine_arg16); guMtxF2L(&subroutine_arg16, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(temp_s2++, &gDisplayContext->matrixStack[++gMatrixListPos], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); diff --git a/src/entity/WoodenCrate.c b/src/entity/WoodenCrate.c index 0b45d8ac2a..d574dc6494 100644 --- a/src/entity/WoodenCrate.c +++ b/src/entity/WoodenCrate.c @@ -1,46 +1,20 @@ #include "common.h" #include "npc.h" -typedef struct struct802E7DE0 { - /* 0x000 */ s32 unk_000; - /* 0x004 */ s32 unk_004; - /* 0x008 */ u8* unk_008; - /* 0x00C */ s32 unk_00C; - /* 0x010 */ u8 unk_010[36]; - /* 0x034 */ s8 unk_034[36]; - /* 0x058 */ u8 unk_058[36]; - /* 0x07C */ u8 unk_07C[36]; - /* 0x0A0 */ u8 unk_0A0[36]; - /* 0x0C4 */ f32 unk_0C4[36]; - /* 0x154 */ f32 unk_154[36]; - /* 0x1E4 */ f32 unk_1E4[36]; - /* 0x274 */ f32 unk_274[36]; - /* 0x304 */ f32 unk_304[36]; -} struct802E7DE0; - INCLUDE_ASM(s32, "entity/WoodenCrate", entity_WoodenCrate_init_fragments); -typedef struct struct802E7F40 { - /* 0x00 */ s32 unk_00; - /* 0x04 */ u16 unk_04; - /* 0x06 */ char unk_06[6]; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ char unk_10[4]; - /* 0x14 */ s32 unk_14; -} struct802E7F40; - void entity_WoodenCrate_init(Entity* entity) { - struct802E7F40* temp = entity->dataBuf.unk; + WoodenCrateData* data = entity->dataBuf.crate; entity->scale.y = 0.85714287f; - temp->unk_00 = CreateEntityVarArgBuffer[0]; - temp->unk_04 = 0xFFFF; + data->itemID = CreateEntityVarArgBuffer[0]; + data->globalFlagIndex = 0xFFFF; } void entity_WoodenCrate_reset_fragments(Entity* entity) { - struct802E7F40* temp = entity->dataBuf.unk; + WoodenCrateData* data = entity->dataBuf.crate; - temp->unk_0C = entity->position.y; + data->basePosY = entity->position.y; entity_WoodenCrate_init_fragments(entity, &D_0A004350, &D_0A0026F0); } @@ -50,17 +24,17 @@ INCLUDE_ASM(s32, "entity/WoodenCrate", entity_WoodenCrate_setupGfx); s32 entity_WoodenCrate_idle(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - s32 phi_a0 = FALSE; + s32 shouldBreak = FALSE; if (entity->collisionFlags & 1) { if ((playerStatus->actionState == ACTION_STATE_GROUND_POUND) || (playerStatus->actionState == ACTION_STATE_ULTRA_POUND)) { set_action_state(ACTION_STATE_FALLING); - phi_a0 = TRUE; + shouldBreak = TRUE; } } - if (phi_a0) { + if (shouldBreak) { entity_WoodenCrate_reset_fragments(entity); entity_set_render_script(entity, &D_802EAE7C); entity_start_script(entity); @@ -72,21 +46,21 @@ s32 entity_WoodenCrate_idle(Entity* entity) { f32 player_get_camera_facing_angle(void); void entity_WoodenCrate_shatter(Entity* entity, f32 arg1) { - struct802E7F40* temp = entity->dataBuf.unk; + WoodenCrateData* data = entity->dataBuf.crate; - if (temp->unk_00 != -1) { + if (data->itemID != -1) { s32 flag = FALSE; // can't do || here, or gcc realizes it can reuse the temp->unk_04 load - if (temp->unk_04 == 0xFFFF) { + if (data->globalFlagIndex == 0xFFFF) { flag = TRUE; - } else if (!get_global_flag(temp->unk_04)) { + } else if (!get_global_flag(data->globalFlagIndex)) { flag = TRUE; } if (flag) { - make_item_entity(temp->unk_00, entity->position.x, entity->position.y + 33.0, entity->position.z, 0xA, 0, - player_get_camera_facing_angle(), temp->unk_04); + make_item_entity(data->itemID, entity->position.x, entity->position.y + 33.0, entity->position.z, 0xA, 0, + player_get_camera_facing_angle(), data->globalFlagIndex); } } } diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 4ae38aed6e..400e5951d6 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -263,23 +263,23 @@ ApiStatus ShakeCam(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -void exec_ShakeCam1(s32 arg0, s32 arg1, s32 arg2) { +void exec_ShakeCam1(s32 camID, s32 mode, s32 duration) { Evt* script; script = start_script_in_group(&ShakeCam1, 1, 0, 4); - script->varTable[0] = arg0; - script->varTable[1] = arg1; - script->varTable[2] = arg2; + script->varTable[0] = camID; + script->varTable[1] = mode; + script->varTable[2] = duration; } -void exec_ShakeCamX(s32 arg0, s32 arg1, s32 arg2, f32 arg3) { +void exec_ShakeCamX(s32 camID, s32 mode, s32 duration, f32 magnitude) { Evt* script; script = start_script_in_group(&ShakeCamX, 1, 0, 4); - evt_set_variable(script, EVT_VAR(0), arg0); - evt_set_variable(script, EVT_VAR(1), arg1); - evt_set_variable(script, EVT_VAR(2), arg2); - evt_set_float_variable(script, EVT_VAR(3), arg3); + evt_set_variable(script, EVT_VAR(0), camID); + evt_set_variable(script, EVT_VAR(1), mode); + evt_set_variable(script, EVT_VAR(2), duration); + evt_set_float_variable(script, EVT_VAR(3), magnitude); } ApiStatus SetCamLeadPlayer(Evt* script, s32 isInitialCall) { diff --git a/src/evt/fa4c0_len_3bf0.c b/src/evt/fa4c0_len_3bf0.c index 2086ae5c8c..a34060cd48 100644 --- a/src/evt/fa4c0_len_3bf0.c +++ b/src/evt/fa4c0_len_3bf0.c @@ -394,7 +394,7 @@ ApiStatus DropItemEntity(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus DropItemEntityB(Evt* script, s32 isInitialCall) { +ApiStatus DropTinyItemEntity(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 itemID = evt_get_variable(script, *args++); s32 x = evt_get_variable(script, *args++); @@ -404,7 +404,7 @@ ApiStatus DropItemEntityB(Evt* script, s32 isInitialCall) { s32 pickupVar = evt_get_variable_index(script, *args++); script->varTable[0] = make_item_entity_nodelay(itemID, x, y, z, itemSpawnMode, pickupVar); - set_item_entity_flags(script->varTable[0], 0x4000); + set_item_entity_flags(script->varTable[0], ITEM_ENTITY_FLAGS_TINY); return ApiStatus_DONE2; } diff --git a/src/hud_element.c b/src/hud_element.c index be9f94c49a..e60d546287 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -16,7 +16,7 @@ typedef struct HudCacheEntry { /* 0x04 */ u8* data; } HudCacheEntry; // size = 0x08; -u8* gHudElementCacheNonWorld = NULL; +u8* gHudElementAuxCache = NULL; s32 gHudElementCacheCapacity = 0x11000; HudScript hud_element_defaultAnim = { @@ -126,7 +126,7 @@ extern u8* gHudElementCacheBuffer; s32 fold_appendGfx_component(s32 idx, FoldImageRecPart* image, u32 flagBits, Matrix4f mtx); void func_801413F8(void); -void load_hud_element(HudElement* hudElement, const HudScript* anim) { +void hud_element_load_script(HudElement* hudElement, const HudScript* anim) { s32* pos = (s32*)anim; s32 raster; s32 palette; @@ -263,7 +263,7 @@ void load_hud_element(HudElement* hudElement, const HudScript* anim) { } } -void draw_rect_hud_element(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s16 drawSizeX, s16 drawSizeY, +void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s16 drawSizeX, s16 drawSizeY, s16 offsetX, s16 offsetY, s32 clamp, s32 dropShadow) { u32 isFmtCI4; u32 isFmtIA8; @@ -391,7 +391,7 @@ void draw_rect_hud_element(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s break; } - if (hudElement->flags & HUD_ELEMENT_FLAGS_8000) { + if (hudElement->flags & HUD_ELEMENT_FLAGS_FILTER_TEX) { gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); } else { gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); @@ -586,7 +586,7 @@ void draw_rect_hud_element(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s break; } - if (hudElement->flags & HUD_ELEMENT_FLAGS_8000) { + if (hudElement->flags & HUD_ELEMENT_FLAGS_FILTER_TEX) { gSPScisTextureRectangle(gMasterGfxPos++, ulx * 4, uly * 4, lrx * 4, lry * 4, 0, texStartX * 32 + 16, texStartY * 32 + 16, widthScale, heightScale); } else { gSPScisTextureRectangle(gMasterGfxPos++, ulx * 4, uly * 4, lrx * 4, lry * 4, 0, texStartX * 32, texStartY * 32, widthScale, heightScale); @@ -609,7 +609,7 @@ void draw_rect_hud_element(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s gDPPipeSync(gMasterGfxPos++); } -void clear_hud_element_cache(void) { +void hud_element_clear_cache(void) { s32 i; HudCacheEntry* entryRaster; HudCacheEntry* entryPalette; @@ -638,11 +638,11 @@ void clear_hud_element_cache(void) { entryPalette[i].id = -1; } } else { - if (gHudElementCacheNonWorld == NULL) { + if (gHudElementAuxCache == NULL) { gHudElementCacheBuffer = general_heap_malloc(gHudElementCacheCapacity / 2); ASSERT(gHudElementCacheBuffer); } else { - gHudElementCacheBuffer = gHudElementCacheNonWorld; + gHudElementCacheBuffer = gHudElementAuxCache; } gHudElementCacheBufferBattle = gHudElementCacheBuffer; *gHudElementCacheSize = 0; @@ -707,7 +707,7 @@ void func_801413F8(void) { gCameras[CAM_CAM3].flags &= ~0x6; } -s32 create_hud_element(const HudScript* anim) { +s32 hud_element_create(const HudScript* anim) { HudElement* hudElement; s32 id; @@ -751,10 +751,10 @@ s32 create_hud_element(const HudScript* anim) { if (gGameStatusPtr->isBattle) { hudElement->flags |= HUD_ELEMENT_FLAGS_BATTLE; - id |= 0x800; + id |= HUD_ELEMENT_BATTLE_ID_MASK; } - load_hud_element(hudElement, hudElement->readPos); + hud_element_load_script(hudElement, hudElement->readPos); while (hud_element_update(hudElement) != 0); return id; @@ -769,7 +769,7 @@ void update_hud_elements(void) { if (elem != NULL && elem->flags && !(elem->flags & HUD_ELEMENT_FLAGS_DISABLED)) { if (elem->flags & HUD_ELEMENT_FLAGS_DELETE) { - free_hud_element(i); + hud_element_free(i); i++; } else if (elem->readPos != NULL) { elem->updateTimer--; @@ -1143,7 +1143,7 @@ s32 hud_element_update(HudElement* hudElement) { s1 = *nextPos++; newReadPos = (HudScript*)nextPos[rand_int(s1 - 1)]; hudElement->readPos = newReadPos; - load_hud_element(hudElement, newReadPos); + hud_element_load_script(hudElement, newReadPos); return TRUE; case HUD_ELEMENT_OP_PlaySound: arg2 = *nextPos++; @@ -1249,15 +1249,15 @@ void render_hud_elements_backUI(void) { } if (!(hudElement->flags & HUD_ELEMENT_FLAGS_REPEATED)) { - if (hudElement->flags & HUD_ELEMENT_FLAGS_SHADOW) { - draw_rect_hud_element(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, TRUE); + if (hudElement->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, TRUE); } - draw_rect_hud_element(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, FALSE); + hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, FALSE); } else { - if (hudElement->flags & HUD_ELEMENT_FLAGS_SHADOW) { - draw_rect_hud_element(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); + if (hudElement->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); } - draw_rect_hud_element(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); + hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); } } else { f32 xScaled, yScaled; @@ -1285,10 +1285,10 @@ void render_hud_elements_backUI(void) { hudElement->widthScale = X10(xScaled); hudElement->heightScale = X10(yScaled); - if (hudElement->flags & HUD_ELEMENT_FLAGS_SHADOW) { - draw_rect_hud_element(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); + if (hudElement->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); } - draw_rect_hud_element(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); + hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); } } } @@ -1364,15 +1364,15 @@ void render_hud_elements_frontUI(void) { } if (!(hudElement->flags & HUD_ELEMENT_FLAGS_REPEATED)) { - if (hudElement->flags & HUD_ELEMENT_FLAGS_SHADOW) { - draw_rect_hud_element(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, TRUE); + if (hudElement->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, TRUE); } - draw_rect_hud_element(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, FALSE); + hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, FALSE); } else { - if (hudElement->flags & HUD_ELEMENT_FLAGS_SHADOW) { - draw_rect_hud_element(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); + if (hudElement->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); } - draw_rect_hud_element(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); + hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); } } else { f32 xScaled, yScaled; @@ -1400,10 +1400,10 @@ void render_hud_elements_frontUI(void) { hudElement->widthScale = X10(xScaled); hudElement->heightScale = X10(yScaled); - if (hudElement->flags & HUD_ELEMENT_FLAGS_SHADOW) { - draw_rect_hud_element(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); + if (hudElement->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); } - draw_rect_hud_element(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); + hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); } } } @@ -1435,7 +1435,7 @@ void render_hud_element(HudElement* hudElement) { s32 ulx, uly, lrx, lry; Vtx* vtx; - if (hudElement->flags & HUD_ELEMENT_FLAGS_8000) { + if (hudElement->flags & HUD_ELEMENT_FLAGS_FILTER_TEX) { gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); } else { gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); @@ -1610,7 +1610,6 @@ void render_hud_element(HudElement* hudElement) { INCLUDE_ASM(void, "hud_element", render_hud_element, HudElement* hudElement); #endif - void render_hud_elements_world(void) { s32 i, count, j; s32 sortedElements[ARRAY_COUNT(*gHudElements)]; @@ -1783,7 +1782,7 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { if (elemID >= 0) { HudElement* elem; - elemID &= ~0x800; + elemID &= ~HUD_ELEMENT_BATTLE_ID_MASK; elem = (*gHudElements)[elemID]; if (elem != NULL) { @@ -1816,8 +1815,8 @@ void func_80144278(s32 arg0) { func_80143C48(arg0, 0, CAM_BATTLE); } -void draw_hud_element(s32 id, s32 clipMode) { - HudElement* elem = (*gHudElements)[id & ~0x800]; +void draw_hud_element_internal(s32 id, s32 clipMode) { + HudElement* elem = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; s32 texSizeX, texSizeY; s32 drawSizeX, drawSizeY; s32 offsetX, offsetY; @@ -1825,9 +1824,9 @@ void draw_hud_element(s32 id, s32 clipMode) { if (elem->flags && !(elem->flags & HUD_ELEMENT_FLAGS_DISABLED)) { if (!(elem->flags & (HUD_ELEMENT_FLAGS_200000 | HUD_ELEMENT_FLAGS_10000000)) && (elem->drawSizePreset >= 0)) { - if (clipMode != 1) { - if (clipMode == 0) { - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 12, 20, 308, 220); + if (clipMode != HUD_ELEMENT_DRAW_NEXT) { + if (clipMode == HUD_ELEMENT_DRAW_FIRST_WITH_CLIPPING) { + gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 12, 20, SCREEN_WIDTH - 12, SCREEN_HEIGHT - 20); } gDPPipeSync(gMasterGfxPos++); gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); @@ -1872,15 +1871,15 @@ void draw_hud_element(s32 id, s32 clipMode) { } while (0); // required to match if (!(elem->flags & HUD_ELEMENT_FLAGS_REPEATED)) { - if (elem->flags & HUD_ELEMENT_FLAGS_SHADOW) { - draw_rect_hud_element(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, TRUE); + if (elem->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + hud_element_draw_rect(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, TRUE); } - draw_rect_hud_element(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, FALSE); + hud_element_draw_rect(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, FALSE); } else { - if (elem->flags & HUD_ELEMENT_FLAGS_SHADOW) { - draw_rect_hud_element(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); + if (elem->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + hud_element_draw_rect(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); } - draw_rect_hud_element(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); + hud_element_draw_rect(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); } } else { f32 xScaled, yScaled; @@ -1909,29 +1908,29 @@ void draw_hud_element(s32 id, s32 clipMode) { elem->widthScale = X10(xScaled); elem->heightScale = X10(yScaled); - if (elem->flags & HUD_ELEMENT_FLAGS_SHADOW) { - draw_rect_hud_element(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); + if (elem->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + hud_element_draw_rect(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); } - draw_rect_hud_element(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); + hud_element_draw_rect(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); } } } } -void draw_hud_element_clipped(s32 id) { - draw_hud_element(id, 0); +void hud_element_draw_clipped(s32 id) { + draw_hud_element_internal(id, HUD_ELEMENT_DRAW_FIRST_WITH_CLIPPING); } -void draw_hud_element_2(s32 id) { - draw_hud_element(id, 1); +void hud_element_draw_next(s32 id) { + draw_hud_element_internal(id, HUD_ELEMENT_DRAW_NEXT); } -void draw_hud_element_3(s32 id) { - draw_hud_element(id, 2); +void hud_element_draw_without_clipping(s32 id) { + draw_hud_element_internal(id, HUD_ELEMENT_DRAW_FIRST_WITHOUT_CLIPPING); } -void set_hud_element_anim(s32 id, const HudScript* anim) { - HudElement* hudElement = (*gHudElements)[id & ~0x800]; +void hud_element_set_script(s32 id, const HudScript* anim) { + HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; if (anim == NULL) { anim = &hud_element_defaultAnim; @@ -1950,53 +1949,53 @@ void set_hud_element_anim(s32 id, const HudScript* anim) { hudElement->flags &= ~HUD_ELEMENT_FLAGS_ANIMATION_FINISHED; hudElement->uniformScale = 1.0f; hudElement->flags &= ~(HUD_ELEMENT_FLAGS_SCALED | HUD_ELEMENT_FLAGS_TRANSPARENT | HUD_ELEMENT_FLAGS_FIXEDSCALE | HUD_ELEMENT_FLAGS_REPEATED); - load_hud_element(hudElement, anim); + hud_element_load_script(hudElement, anim); while (hud_element_update(hudElement) != 0) {} } -HudScript* get_hud_element_anim(s32 id) { - return (*gHudElements)[id & ~0x800]->anim; +HudScript* hud_element_get_script(s32 id) { + return (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]->anim; } HudElement* get_hud_element(s32 id) { - return (*gHudElements)[id & ~0x800]; + return (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; } -void free_hud_element(s32 id) { - if ((*gHudElements)[id & ~0x800]->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { - free_hud_element_transform(id & ~0x800); +void hud_element_free(s32 id) { + if ((*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { + hud_element_free_transform(id & ~HUD_ELEMENT_BATTLE_ID_MASK); } - heap_free((*gHudElements)[id & ~0x800]); - (*gHudElements)[id & ~0x800] = NULL; + heap_free((*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]); + (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK] = NULL; gHudElementsNumber--; } -void set_hud_element_render_pos(s32 id, s32 x, s32 y) { - HudElement* hudElement = (*gHudElements)[id & ~0x800]; +void hud_element_set_render_pos(s32 id, s32 x, s32 y) { + HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; hudElement->renderPosX = x; hudElement->renderPosY = y; } -void get_hud_element_render_pos(s32 id, s32* x, s32* y) { - HudElement* hudElement = (*gHudElements)[id & ~0x800]; +void hud_element_get_render_pos(s32 id, s32* x, s32* y) { + HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; *x = hudElement->renderPosX; *y = hudElement->renderPosY; } -void set_hud_element_render_depth(s32 id, s32 z) { - (*gHudElements)[id & ~0x800]->worldPosOffset.z = z; +void hud_element_set_render_depth(s32 id, s32 z) { + (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]->worldPosOffset.z = z; } -void set_hud_element_flags(s32 id, s32 flags) { - (*gHudElements)[id & ~0x800]->flags |= flags; +void hud_element_set_flags(s32 id, s32 flags) { + (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]->flags |= flags; } -void clear_hud_element_flags(s32 id, s32 flags) { - (*gHudElements)[id & ~0x800]->flags &= ~flags; +void hud_element_clear_flags(s32 id, s32 flags) { + (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]->flags &= ~flags; } void ALT_clear_hud_element_cache(void) { @@ -2018,12 +2017,12 @@ void ALT_clear_hud_element_cache(void) { gHudElementCacheTablePaletteWorld[i].id = -1; } } else { - if (gHudElementCacheNonWorld == NULL) { + if (gHudElementAuxCache == NULL) { heap_free(gHudElementCacheBuffer); gHudElementCacheBuffer = heap_malloc(gHudElementCacheCapacity / 2); ASSERT(gHudElementCacheBuffer); } else { - gHudElementCacheBuffer = gHudElementCacheNonWorld; + gHudElementCacheBuffer = gHudElementAuxCache; } gHudElementCacheBufferBattle = gHudElementCacheBuffer; *gHudElementCacheSize = 0; @@ -2039,8 +2038,8 @@ void ALT_clear_hud_element_cache(void) { } } -void set_hud_element_scale(s32 index, f32 scale) { - HudElement* elem = (*gHudElements)[index & ~0x800]; +void hud_element_set_scale(s32 index, f32 scale) { + HudElement* elem = (*gHudElements)[index & ~HUD_ELEMENT_BATTLE_ID_MASK]; s32 drawSizeX; s32 drawSizeY; s32 imgSizeX; @@ -2074,8 +2073,8 @@ void set_hud_element_scale(s32 index, f32 scale) { elem->heightScale = X10(yScaled); } -void set_hud_element_size_preset(s32 id, s8 sizePreset) { - HudElement* hudElement = (*gHudElements)[id & ~0x800]; +void hud_element_use_preset_size(s32 id, s8 sizePreset) { + HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; hudElement->widthScale = X10(1.0f); hudElement->heightScale = X10(1.0f); @@ -2087,18 +2086,18 @@ void set_hud_element_size_preset(s32 id, s8 sizePreset) { } s32 func_80144E4C(s32 id) { - return ((*gHudElements)[id & ~0x800]->flags >> 24) & 0xF; + return ((*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]->flags >> 24) & 0xF; } void func_80144E74(s32 id, s32 arg1) { - HudElement* hudElement = (*gHudElements)[id & ~0x800]; + HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; hudElement->flags &= ~(HUD_ELEMENT_FLAGS_1000000 | HUD_ELEMENT_FLAGS_2000000 | HUD_ELEMENT_FLAGS_4000000 | HUD_ELEMENT_FLAGS_8000000); hudElement->flags |= arg1 << 24; } -void set_hud_element_alpha(s32 id, s32 opacity) { - HudElement* hudElement = (*gHudElements)[id & ~0x800]; +void hud_element_set_alpha(s32 id, s32 opacity) { + HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; hudElement->flags |= HUD_ELEMENT_FLAGS_TRANSPARENT; hudElement->opacity = opacity; @@ -2108,16 +2107,16 @@ void set_hud_element_alpha(s32 id, s32 opacity) { } } -void set_hud_element_tint(s32 id, s32 r, s32 g, s32 b) { - HudElement* hudElement = (*gHudElements)[id & ~0x800]; +void hud_element_set_tint(s32 id, s32 r, s32 g, s32 b) { + HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; hudElement->tint.r = r; hudElement->tint.g = g; hudElement->tint.b = b; } -void create_hud_element_transform_A(s32 id) { - HudElement* element = (*gHudElements)[id & ~0x800]; +void hud_element_create_transform_A(s32 id) { + HudElement* element = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* transform = general_heap_malloc(sizeof(HudTransform)); element->hudTransform = transform; @@ -2138,8 +2137,8 @@ void create_hud_element_transform_A(s32 id) { func_801413F8(); } -void create_hud_element_transform_B(s32 id) { - HudElement* element = (*gHudElements)[id & ~0x800]; +void hud_element_create_transform_B(s32 id) { + HudElement* element = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* transform = general_heap_malloc(sizeof(HudTransform)); element->hudTransform = transform; @@ -2158,8 +2157,8 @@ void create_hud_element_transform_B(s32 id) { func_801413F8(); } -void create_hud_element_transform_C(s32 id) { - HudElement* element = (*gHudElements)[id & ~0x800]; +void hud_element_create_transform_C(s32 id) { + HudElement* element = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* transform = general_heap_malloc(sizeof(HudTransform)); element->hudTransform = transform; @@ -2178,8 +2177,8 @@ void create_hud_element_transform_C(s32 id) { func_801413F8(); } -void free_hud_element_transform(s32 id) { - HudElement* hudElement = (*gHudElements)[id & ~0x800]; +void hud_element_free_transform(s32 id) { + HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* hudTransform = hudElement->hudTransform; if (!(hudElement->flags & HUD_ELEMENT_FLAGS_NO_FOLD)) { @@ -2191,8 +2190,8 @@ void free_hud_element_transform(s32 id) { hudElement->flags &= ~(HUD_ELEMENT_FLAGS_40000000 | HUD_ELEMENT_FLAGS_NO_FOLD | HUD_ELEMENT_FLAGS_TRANSFORM); } -void set_hud_element_transform_pos(s32 id, f32 x, f32 y, f32 z) { - HudElement* element = (*gHudElements)[id & ~0x800]; +void hud_element_set_transform_pos(s32 id, f32 x, f32 y, f32 z) { + HudElement* element = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* transform = element->hudTransform; if (element->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { @@ -2202,8 +2201,8 @@ void set_hud_element_transform_pos(s32 id, f32 x, f32 y, f32 z) { } } -void set_hud_element_transform_scale(s32 id, f32 x, f32 y, f32 z) { - HudElement* element = (*gHudElements)[id & ~0x800]; +void hud_element_set_transform_scale(s32 id, f32 x, f32 y, f32 z) { + HudElement* element = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* transform = element->hudTransform; if (element->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { @@ -2213,8 +2212,8 @@ void set_hud_element_transform_scale(s32 id, f32 x, f32 y, f32 z) { } } -void set_hud_element_transform_rotation(s32 id, f32 x, f32 y, f32 z) { - HudElement* element = (*gHudElements)[id & ~0x800]; +void hud_element_set_transform_rotation(s32 id, f32 x, f32 y, f32 z) { + HudElement* element = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* transform = element->hudTransform; if (element->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { @@ -2224,8 +2223,8 @@ void set_hud_element_transform_rotation(s32 id, f32 x, f32 y, f32 z) { } } -void set_hud_element_transform_rotation_pivot(s32 id, s32 dx, s32 dy) { - HudElement* element = (*gHudElements)[id & ~0x800]; +void hud_element_set_transform_rotation_pivot(s32 id, s32 dx, s32 dy) { + HudElement* element = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* transform = element->hudTransform; if (element->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { @@ -2235,11 +2234,11 @@ void set_hud_element_transform_rotation_pivot(s32 id, s32 dx, s32 dy) { } void copy_world_hud_element_ref_to_battle(s32 worldID, s32 battleID) { - gHudElementsBattle[battleID & ~0x800] = gHudElementsWorld[worldID & ~0x800]; + gHudElementsBattle[battleID & ~HUD_ELEMENT_BATTLE_ID_MASK] = gHudElementsWorld[worldID & ~HUD_ELEMENT_BATTLE_ID_MASK]; } -void set_hud_element_nonworld_cache(void* base, s32 size) { - gHudElementCacheNonWorld = (u8*)base; +void hud_element_set_aux_cache(void* base, s32 size) { + gHudElementAuxCache = (u8*)base; if (base == NULL) { gHudElementCacheCapacity = 0x11000; } else { diff --git a/src/hud_element.h b/src/hud_element.h index f7cf6c1d65..54c4ced029 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -3,6 +3,8 @@ #include "common.h" +#define HUD_ELEMENT_BATTLE_ID_MASK 0x800 + typedef enum { HUD_ELEMENT_OP_End, HUD_ELEMENT_OP_SetRGBA, @@ -78,7 +80,7 @@ enum HudElementFlags { HUD_ELEMENT_FLAGS_FLIPX = 0x00001000, HUD_ELEMENT_FLAGS_FLIPY = 0x00002000, HUD_ELEMENT_FLAGS_FMT_CI4 = 0x00004000, - HUD_ELEMENT_FLAGS_8000 = 0x00008000, + HUD_ELEMENT_FLAGS_FILTER_TEX = 0x00008000, HUD_ELEMENT_FLAGS_TRANSFORM = 0x00010000, HUD_ELEMENT_FLAGS_NO_FOLD = 0x00020000, HUD_ELEMENT_FLAGS_DELETE = 0x00040000, @@ -92,11 +94,17 @@ enum HudElementFlags { HUD_ELEMENT_FLAGS_4000000 = 0x04000000, HUD_ELEMENT_FLAGS_8000000 = 0x08000000, HUD_ELEMENT_FLAGS_10000000 = 0x10000000, - HUD_ELEMENT_FLAGS_SHADOW = 0x20000000, + HUD_ELEMENT_FLAGS_DROP_SHADOW = 0x20000000, HUD_ELEMENT_FLAGS_40000000 = 0x40000000, HUD_ELEMENT_FLAGS_80000000 = 0x80000000, }; +enum { + HUD_ELEMENT_DRAW_FIRST_WITH_CLIPPING = 0, + HUD_ELEMENT_DRAW_NEXT = 1, + HUD_ELEMENT_DRAW_FIRST_WITHOUT_CLIPPING = 2, +}; + typedef struct HudScriptPair { /* 0x00 */ HudScript* enabled; /* 0x04 */ HudScript* disabled; @@ -183,18 +191,18 @@ extern HudScript HudScript_MenuTimes[]; #define he_PlaySound(arg0) HUD_ELEMENT_OP_PlaySound, arg0 #define he_SetPivot(arg0, arg1) HUD_ELEMENT_OP_SetPivot, arg0, arg1 -void load_hud_element(HudElement* hudElement, const HudScript* anim); +void hud_element_load_script(HudElement* hudElement, const HudScript* anim); /// @param clamp 0 = repeat; 1 = clamp /// @param dropShadow Whether to render a drop shadow or not -void draw_rect_hud_element(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s16 drawSizeX, s16 drawSizeY, s16 offsetX, s16 offsetY, s32 clamp, s32 dropShadow); +void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s16 drawSizeX, s16 drawSizeY, s16 offsetX, s16 offsetY, s32 clamp, s32 dropShadow); -void clear_hud_element_cache(void); +void hud_element_clear_cache(void); void init_hud_element_list(void); /// Creates a new HUD element and returns its ID. -s32 create_hud_element(const HudScript* anim); +s32 hud_element_create(const HudScript* anim); void update_hud_elements(void); @@ -215,65 +223,65 @@ void func_80144238(s32 arg0); void func_80144258(s32 arg0); void func_80144278(s32 arg0); -void draw_hud_element(s32 id, s32 clipMode); -void draw_hud_element_clipped(s32 id); -void draw_hud_element_2(s32 id); -void draw_hud_element_3(s32 id); +void draw_hud_element_internal(s32 id, s32 clipMode); +void hud_element_draw_clipped(s32 id); +void hud_element_draw_next(s32 id); +void hud_element_draw_without_clipping(s32 id); -void set_hud_element_anim(s32 id, const HudScript* anim); +void hud_element_set_script(s32 id, const HudScript* anim); -HudScript* get_hud_element_anim(s32 id); +HudScript* hud_element_get_script(s32 id); HudElement* get_hud_element(s32 id); -void free_hud_element(s32 id); +void hud_element_free(s32 id); -void set_hud_element_render_pos(s32 id, s32 x, s32 y); +void hud_element_set_render_pos(s32 id, s32 x, s32 y); -void get_hud_element_render_pos(s32 id, s32* x, s32* y); +void hud_element_get_render_pos(s32 id, s32* x, s32* y); -void set_hud_element_render_depth(s32 id, s32 z); +void hud_element_set_render_depth(s32 id, s32 z); /// Turns on the given flags. -void set_hud_element_flags(s32 id, s32 flags); +void hud_element_set_flags(s32 id, s32 flags); /// Turns off the given flags. -void clear_hud_element_flags(s32 id, s32 flags); +void hud_element_clear_flags(s32 id, s32 flags); -/// @see clear_hud_element_cache +/// @see hud_element_clear_cache void ALT_clear_hud_element_cache(void); -void set_hud_element_scale(s32 index, f32 scale); +void hud_element_set_scale(s32 index, f32 scale); -void set_hud_element_size_preset(s32 id, s8 size); +void hud_element_use_preset_size(s32 id, s8 size); s32 func_80144E4C(s32 id); void func_80144E74(s32 id, s32 arg1); /// @param opacity 0 = invisible; 255 = opaque -void set_hud_element_alpha(s32 id, s32 opacity); +void hud_element_set_alpha(s32 id, s32 opacity); -void set_hud_element_tint(s32 id, s32 r, s32 g, s32 b); +void hud_element_set_tint(s32 id, s32 r, s32 g, s32 b); -void create_hud_element_transform_A(s32 id); +void hud_element_create_transform_A(s32 id); -void create_hud_element_transform_B(s32 id); +void hud_element_create_transform_B(s32 id); -void create_hud_element_transform_C(s32 id); +void hud_element_create_transform_C(s32 id); -void free_hud_element_transform(s32 id); +void hud_element_free_transform(s32 id); -void set_hud_element_transform_pos(s32 id, f32 x, f32 y, f32 z); +void hud_element_set_transform_pos(s32 id, f32 x, f32 y, f32 z); -void set_hud_element_transform_scale(s32 id, f32 x, f32 y, f32 z); +void hud_element_set_transform_scale(s32 id, f32 x, f32 y, f32 z); -void set_hud_element_transform_rotation(s32 id, f32 x, f32 y, f32 z); +void hud_element_set_transform_rotation(s32 id, f32 x, f32 y, f32 z); -void set_hud_element_transform_rotation_pivot(s32 id, s32 dx, s32 dy); +void hud_element_set_transform_rotation_pivot(s32 id, s32 dx, s32 dy); void copy_world_hud_element_ref_to_battle(s32 worldID, s32 battleID); -void set_hud_element_nonworld_cache(void* base, s32 size); +void hud_element_set_aux_cache(void* base, s32 size); #endif diff --git a/src/main_loop.c b/src/main_loop.c index 9966d93213..4a9d95c9e8 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -282,7 +282,7 @@ void load_engine_data(void) { clear_printers(); clear_game_modes(); clear_npcs(); - clear_hud_element_cache(); + hud_element_clear_cache(); clear_trigger_data(); clear_entity_data(0); clear_player_data(); diff --git a/src/npc_collision.c b/src/npc_collision.c index 884d4b8dc1..b7b474af9e 100644 --- a/src/npc_collision.c +++ b/src/npc_collision.c @@ -32,10 +32,10 @@ s32 npc_raycast_down(s32 ignoreFlags, f32* startX, f32* startY, f32* startZ, f32 sy = *startY; sz = *startZ; colliderID = test_ray_colliders(ignoreFlags, sx, sy, sz, 0.0f, -1.0f, 0.0f, &cHitX, &cHitY, &cHitZ, &cHitDepth, &cHitNx, &cHitNy, &cHitNz); - if ((ignoreFlags & 0x40000) == 0) { + if ((ignoreFlags & COLLISION_IGNORE_ENTITIES) == 0) { entityID = test_ray_entities(*startX, *startY, *startZ, 0.0f, -1.0f, 0.0f, &eHitX, &eHitY, &eHitZ, &eHitDepth, &eHitNx, &eHitNy, &eHitNz); if (entityID >= 0) { - colliderID = entityID | 0x4000; + colliderID = entityID | COLLISION_WITH_ENTITY_BIT; if (eHitDepth < cHitDepth) { cHitDepth = eHitDepth; cHitX = eHitX; @@ -297,9 +297,9 @@ s32 npc_raycast_up(s32 ignoreFlags, f32* startX, f32* startY, f32* startZ, f32* sz = *startZ; ret = test_ray_colliders(ignoreFlags, sx, sy, sz, 0.0f, 1.0f, 0.0f, &cHitX, &cHitY, &cHitZ, &cHitDepth, &cHitNx, &cHitNy, &cHitNz); colliderID = ret; - if ((ignoreFlags & 0x40000) == 0) { + if ((ignoreFlags & COLLISION_IGNORE_ENTITIES) == 0) { entityID = test_ray_entities(sx, sy, sz, 0.0f, 1.0f, 0.0f, &eHitX, &eHitY, &eHitZ, &eHitDepth, &eHitNx, &eHitNy, &eHitNz); - ret = entityID | 0x4000; + ret = entityID | COLLISION_WITH_ENTITY_BIT; if (entityID >= 0) { cHitDepth = eHitDepth; cHitX = eHitX; @@ -361,7 +361,7 @@ s32 npc_raycast_up_corner(s32 ignoreFlags, f32* x, f32* y, f32* z, f32* length) sy = sy2; sz = sz2; if (entityID >= 0 && *length > hitDepth) { - ret = entityID | 0x4000; + ret = entityID | COLLISION_WITH_ENTITY_BIT; *length = hitDepth; *x = sx; *y = sy; @@ -446,23 +446,23 @@ s32 npc_raycast_general(s32 flags, f32 startX, f32 startY, f32 startZ, f32 dirX, s32 entityID; ret = -1; - if (flags & 0x100000) { + if (flags & COLLISION_ONLY_ENTITIES) { entityID = test_ray_entities(startX, startY, startZ, dirX, dirY, dirZ, hitX, hitY, hitZ, outDepth, hitNx, hitNy, hitNz); if (entityID >= 0) { - ret = entityID | 0x4000; + ret = entityID | COLLISION_WITH_ENTITY_BIT; } } else { ret = test_ray_colliders(flags, startX, startY, startZ, dirX, dirY, dirZ, hitX, hitY, hitZ, outDepth, hitNx, hitNy, hitNz); - if (flags & 0x40000) { + if (flags & COLLISION_IGNORE_ENTITIES) { return ret; } entityID = test_ray_entities(startX, startY, startZ, dirX, dirY, dirZ, hitX, hitY, hitZ, outDepth, hitNx, hitNy, hitNz); if (entityID >= 0) { - ret = entityID | 0x4000; + ret = entityID | COLLISION_WITH_ENTITY_BIT; } // TODO required to match diff --git a/src/pause/pause_badges.c b/src/pause/pause_badges.c index 3b20fa6638..75662679a8 100644 --- a/src/pause/pause_badges.c +++ b/src/pause/pause_badges.c @@ -310,9 +310,9 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width currentBadgeRow = gPauseBadgesSelectedIndex % currentPage->numCols; draw_box(DRAW_FLAGS_CLIP, &gPauseWS_15, baseX + 84, baseY, 0, width - 84, height, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); - set_hud_element_render_pos(gPauseBadgesIconIDs[20], baseX + 241, baseY + 11); + hud_element_set_render_pos(gPauseBadgesIconIDs[20], baseX + 241, baseY + 11); palette = 10; - draw_hud_element_3(gPauseBadgesIconIDs[20]); + hud_element_draw_without_clipping(gPauseBadgesIconIDs[20]); x1 = baseX + 1; y1 = baseY + 14; @@ -436,31 +436,31 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width if (i == 1) { badgeIconElement = iconIDs[badgeIndex]; - clear_hud_element_flags(badgeIconElement, HUD_ELEMENT_FLAGS_SHADOW); - set_hud_element_flags(badgeIconElement, HUD_ELEMENT_FLAGS_8000); + hud_element_clear_flags(badgeIconElement, HUD_ELEMENT_FLAGS_DROP_SHADOW); + hud_element_set_flags(badgeIconElement, HUD_ELEMENT_FLAGS_FILTER_TEX); if (isNone) { badgeIconElement = gPauseBadgesIconIDs[21]; } else { if (isSelected) { - set_hud_element_flags(badgeIconElement, HUD_ELEMENT_FLAGS_SHADOW); + hud_element_set_flags(badgeIconElement, HUD_ELEMENT_FLAGS_DROP_SHADOW); gPauseCurrentDescIconScript = gItemHudScripts[gItemTable[badgeID].iconID].enabled; } if (!isEquipped && cannotBeEquipped) { - set_hud_element_anim(badgeIconElement, gItemHudScripts[gItemTable[badgeID].iconID].disabled); + hud_element_set_script(badgeIconElement, gItemHudScripts[gItemTable[badgeID].iconID].disabled); } else { - set_hud_element_anim(badgeIconElement, gItemHudScripts[gItemTable[badgeID].iconID].enabled); + hud_element_set_script(badgeIconElement, gItemHudScripts[gItemTable[badgeID].iconID].enabled); } - set_hud_element_scale(badgeIconElement, 0.670816f); + hud_element_set_scale(badgeIconElement, 0.670816f); } - set_hud_element_render_pos(badgeIconElement, baseX + 107 + pause_badges_scroll_offset_x(posX) + badgeEntryOffsetX, + hud_element_set_render_pos(badgeIconElement, baseX + 107 + pause_badges_scroll_offset_x(posX) + badgeEntryOffsetX, baseY + 23 + pause_badges_scroll_offset_y(posY) + badgeEntryOffsetY); if (badgeIndex == 0) { - draw_hud_element_3(badgeIconElement); + hud_element_draw_without_clipping(badgeIconElement); } else { - draw_hud_element_2(badgeIconElement); + hud_element_draw_next(badgeIconElement); } badgeIndex++; @@ -550,18 +550,18 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width if (gPauseMenuCurrentTab == 2 && gPauseBadgesLevel == 1) { if (gPauseBadgesCurrentPage > 0) { - set_hud_element_render_pos(gPauseBadgesIconIDs[17], baseX + 278, baseY + 14); - draw_hud_element_3(gPauseBadgesIconIDs[17]); + hud_element_set_render_pos(gPauseBadgesIconIDs[17], baseX + 278, baseY + 14); + hud_element_draw_without_clipping(gPauseBadgesIconIDs[17]); } if (gPauseBadgesPages[gPauseBadgesCurrentPage + 1].enabled) { - set_hud_element_render_pos(gPauseBadgesIconIDs[18], baseX + 278, baseY + 146); - draw_hud_element_3(gPauseBadgesIconIDs[18]); + hud_element_set_render_pos(gPauseBadgesIconIDs[18], baseX + 278, baseY + 146); + hud_element_draw_without_clipping(gPauseBadgesIconIDs[18]); } } - set_hud_element_render_pos(gPauseBadgesIconIDs[16], baseX + 43, baseY + 81); - draw_hud_element_3(gPauseBadgesIconIDs[16]); + hud_element_set_render_pos(gPauseBadgesIconIDs[16], baseX + 43, baseY + 81); + hud_element_draw_without_clipping(gPauseBadgesIconIDs[16]); draw_msg(pause_get_menu_msg(70), baseX + 16, baseY + 74, 255, 10, 1); draw_number(playerData->maxBP, baseX + 69, baseY + 74, 1, 10, 255, 3); bpAmount = playerData->maxBP - pause_get_total_equipped_bp_cost(); @@ -788,10 +788,10 @@ void pause_badges_init(MenuPanel* panel) { } for (i = 0; i < ARRAY_COUNT(gPauseBadgesIconIDs); i++) { - s32 iconID = create_hud_element(gPauseBadgesElements[i]); + s32 iconID = hud_element_create(gPauseBadgesElements[i]); gPauseBadgesIconIDs[i] = iconID; - set_hud_element_flags(iconID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(iconID, HUD_ELEMENT_FLAGS_80); } for (i = 0; i < ARRAY_COUNT(gPauseBadgesWindowBPs); i++) { @@ -989,6 +989,6 @@ void pause_badges_cleanup(MenuPanel* panel) { s32 i; for (i = 0; i < ARRAY_COUNT(gPauseBadgesIconIDs); i++) { - free_hud_element(gPauseBadgesIconIDs[i]); + hud_element_free(gPauseBadgesIconIDs[i]); } } diff --git a/src/pause/pause_items.c b/src/pause/pause_items.c index 44fbcd6c53..c27538f89a 100644 --- a/src/pause/pause_items.c +++ b/src/pause/pause_items.c @@ -226,26 +226,26 @@ void pause_items_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, if (i == 1) { itemIcon = iconIDs[totalItemIndex]; - clear_hud_element_flags(itemIcon, HUD_ELEMENT_FLAGS_SHADOW); - set_hud_element_flags(itemIcon, HUD_ELEMENT_FLAGS_8000); + hud_element_clear_flags(itemIcon, HUD_ELEMENT_FLAGS_DROP_SHADOW); + hud_element_set_flags(itemIcon, HUD_ELEMENT_FLAGS_FILTER_TEX); if (isNone) { itemIcon = gPauseItemsIconIDs[19]; } else { if (isSelected) { - set_hud_element_flags(itemIcon, HUD_ELEMENT_FLAGS_SHADOW); + hud_element_set_flags(itemIcon, HUD_ELEMENT_FLAGS_DROP_SHADOW); gPauseCurrentDescIconScript = gItemHudScripts[gItemTable[itemID].iconID].enabled; } - set_hud_element_anim(itemIcon, gItemHudScripts[gItemTable[itemID].iconID].enabled); - set_hud_element_scale(itemIcon, 0.670816f); + hud_element_set_script(itemIcon, gItemHudScripts[gItemTable[itemID].iconID].enabled); + hud_element_set_scale(itemIcon, 0.670816f); } - set_hud_element_render_pos(itemIcon, baseX + 105 + pause_items_scroll_offset_x(posX) + itemOffsetX, + hud_element_set_render_pos(itemIcon, baseX + 105 + pause_items_scroll_offset_x(posX) + itemOffsetX, baseY + 23 + pause_items_scroll_offset_y(posY) + itemOffsetY); if (totalItemIndex == 0) { - draw_hud_element_3(itemIcon); + hud_element_draw_without_clipping(itemIcon); } else { - draw_hud_element_2(itemIcon); + hud_element_draw_next(itemIcon); } totalItemIndex++; @@ -282,13 +282,13 @@ void pause_items_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, if (gPauseMenuCurrentTab == 3 && gPauseItemsLevel == 1) { if (gPauseItemsCurrentPage > 0) { - set_hud_element_render_pos(gPauseItemsIconIDs[16], baseX + 278, baseY + 14); - draw_hud_element_3(gPauseItemsIconIDs[16]); + hud_element_set_render_pos(gPauseItemsIconIDs[16], baseX + 278, baseY + 14); + hud_element_draw_without_clipping(gPauseItemsIconIDs[16]); } if (gPauseItemsPages [gPauseItemsCurrentPage + 1].enabled) { - set_hud_element_render_pos(gPauseItemsIconIDs[17], baseX + 278, baseY + 146); - draw_hud_element_3(gPauseItemsIconIDs[17]); + hud_element_set_render_pos(gPauseItemsIconIDs[17], baseX + 278, baseY + 146); + hud_element_draw_without_clipping(gPauseItemsIconIDs[17]); } } @@ -430,8 +430,8 @@ void pause_items_init(MenuPanel* panel) { pause_items_load_items(FALSE); for (i = 0; i < ARRAY_COUNT(gPauseItemsIconIDs); i++) { - gPauseItemsIconIDs[i] = create_hud_element(gPauseItemsElements[i]); - set_hud_element_flags(gPauseItemsIconIDs[i], HUD_ELEMENT_FLAGS_80); + gPauseItemsIconIDs[i] = hud_element_create(gPauseItemsElements[i]); + hud_element_set_flags(gPauseItemsIconIDs[i], HUD_ELEMENT_FLAGS_80); } for (i = 0; i < ARRAY_COUNT(gPauseItemsWindowBPs); i++) { @@ -587,6 +587,6 @@ void pause_items_cleanup(MenuPanel* panel) { s32 i; for (i = 0; i < ARRAY_COUNT(gPauseItemsIconIDs); i++) { - free_hud_element(gPauseItemsIconIDs[i]); + hud_element_free(gPauseItemsIconIDs[i]); } } diff --git a/src/pause/pause_main.c b/src/pause/pause_main.c index ce28b143ff..0428665225 100644 --- a/src/pause/pause_main.c +++ b/src/pause/pause_main.c @@ -444,9 +444,9 @@ void pause_draw_cursor(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 hei if (currentOpacity > 255) { currentOpacity = 255; } - set_hud_element_alpha(gPauseCommonIconIDs[0], currentOpacity); - set_hud_element_render_pos(gPauseCommonIconIDs[0], baseX + gPauseCursorPosX, baseY + gPauseCursorPosY); - draw_hud_element_3(gPauseCommonIconIDs[0]); + hud_element_set_alpha(gPauseCommonIconIDs[0], currentOpacity); + hud_element_set_render_pos(gPauseCommonIconIDs[0], baseX + gPauseCursorPosX, baseY + gPauseCursorPosY); + hud_element_draw_without_clipping(gPauseCommonIconIDs[0]); } } @@ -460,13 +460,13 @@ void pause_textbox_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 widt return; if (gPauseDescTextPos != 0) { - set_hud_element_render_pos(gPauseCommonIconIDs[1], baseX + width - 4, baseY + 4); - draw_hud_element_3(gPauseCommonIconIDs[1]); + hud_element_set_render_pos(gPauseCommonIconIDs[1], baseX + width - 4, baseY + 4); + hud_element_draw_without_clipping(gPauseCommonIconIDs[1]); } if (gPauseDescTextPos < gPauseDescTextMaxPos) { - set_hud_element_render_pos(gPauseCommonIconIDs[2], baseX + width - 4, baseY + height - 4); - draw_hud_element_3(gPauseCommonIconIDs[2]); + hud_element_set_render_pos(gPauseCommonIconIDs[2], baseX + width - 4, baseY + height - 4); + hud_element_draw_without_clipping(gPauseCommonIconIDs[2]); } gDPPipeSync(gMasterGfxPos++); @@ -474,12 +474,12 @@ void pause_textbox_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 widt draw_msg(msgID, baseX + 10, baseY - gPauseDescTextOffset, 255, 10, 0); if (gPauseShownDescIconScript != 0) { gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - set_hud_element_render_pos(gPauseCommonIconIDs[3], baseX - 4, baseY + 16); - set_hud_element_anim(gPauseCommonIconIDs[3], gPauseShownDescIconScript); - set_hud_element_flags(gPauseCommonIconIDs[3], HUD_ELEMENT_FLAGS_SHADOW); - clear_hud_element_flags(gPauseCommonIconIDs[3], HUD_ELEMENT_FLAGS_8000); - set_hud_element_scale(gPauseCommonIconIDs[3], 1.0f); - draw_hud_element_3(gPauseCommonIconIDs[3]); + hud_element_set_render_pos(gPauseCommonIconIDs[3], baseX - 4, baseY + 16); + hud_element_set_script(gPauseCommonIconIDs[3], gPauseShownDescIconScript); + hud_element_set_flags(gPauseCommonIconIDs[3], HUD_ELEMENT_FLAGS_DROP_SHADOW); + hud_element_clear_flags(gPauseCommonIconIDs[3], HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_scale(gPauseCommonIconIDs[3], 1.0f); + hud_element_draw_without_clipping(gPauseCommonIconIDs[3]); } } @@ -558,14 +558,14 @@ void pause_tutorial_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid get_msg_properties(pause_get_menu_msg(gPauseTutorialDescMessages[state]), &msgHeight2, &msgWidth2, &msgMaxLineChars2, &msgNumLines2, &msgMaxLinesPerPage2, NULL, 1); margin2 = (s32)(width - msgWidth2) >> 1; draw_msg(pause_get_menu_msg(gPauseTutorialDescMessages[state]), baseX + margin2, baseY + 13 + state * 140 - gPauseTutorialScrollPos, 255, 10, 1); - set_hud_element_render_pos(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]], baseX + width / 2 - 2, baseY + 52); - set_hud_element_flags(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]], HUD_ELEMENT_FLAGS_8000); - set_hud_element_scale(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]], 0.5f); - draw_hud_element_3(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]]); + hud_element_set_render_pos(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]], baseX + width / 2 - 2, baseY + 52); + hud_element_set_flags(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]], HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_scale(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]], 0.5f); + hud_element_draw_without_clipping(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]]); if (gPauseTutorialIconIDs[gPauseTutorialState] == 6) { - set_hud_element_render_pos(gPauseCommonIconIDs[7], baseX + width / 2 + 1, baseY + 50); - draw_hud_element_3(gPauseCommonIconIDs[7]); + hud_element_set_render_pos(gPauseCommonIconIDs[7], baseX + width / 2 + 1, baseY + 50); + hud_element_draw_without_clipping(gPauseCommonIconIDs[7]); } draw_msg(pause_get_menu_msg(gPauseTutorialCmdMessages[gPauseTutorialState]), baseX + width / 2 + 10, baseY + 44, 255, 10, 0); @@ -581,11 +581,11 @@ void pause_init(void) { dma_copy(_131340_ROM_START, _131340_ROM_END, _131340_VRAM); for (i = 0; i < ARRAY_COUNT(gPauseIconScripts); i++) { - gPauseCommonIconIDs[i] = create_hud_element(gPauseIconScripts[i]); + gPauseCommonIconIDs[i] = hud_element_create(gPauseIconScripts[i]); if (gPauseIconScripts[i] == HudScript_AnimatedCursorHand) { - set_hud_element_flags(gPauseCommonIconIDs[i], HUD_ELEMENT_FLAGS_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(gPauseCommonIconIDs[i], HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); } else { - set_hud_element_flags(gPauseCommonIconIDs[i], HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(gPauseCommonIconIDs[i], HUD_ELEMENT_FLAGS_80); } } @@ -769,7 +769,7 @@ void pause_cleanup(void) { MenuPanel** menuPanels; for (i = 0; i < ARRAY_COUNT(gPauseCommonIconIDs); i++) { - free_hud_element(gPauseCommonIconIDs[i]); + hud_element_free(gPauseCommonIconIDs[i]); } if (evt_get_variable(NULL, EVT_SAVE_FLAG(94))) { diff --git a/src/pause/pause_map.c b/src/pause/pause_map.c index 213f5297db..a1b657be26 100644 --- a/src/pause/pause_map.c +++ b/src/pause/pause_map.c @@ -299,8 +299,8 @@ void pause_map_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s mapULX = baseX + 26 + cameraX; mapULY = baseY + 22 + cameraY; - set_hud_element_render_pos(gPauseMapIconIDs[0], mapULX + gPauseMapMarioX, mapULY + gPauseMapMarioY - 7); - draw_hud_element_3(gPauseMapIconIDs[0]); + hud_element_set_render_pos(gPauseMapIconIDs[0], mapULX + gPauseMapMarioX, mapULY + gPauseMapMarioY - 7); + hud_element_draw_without_clipping(gPauseMapIconIDs[0]); currentTab = gPauseMenuCurrentTab; if (currentTab == 6) { @@ -385,8 +385,8 @@ void pause_map_init(MenuPanel* tab) { s32 i; for (i = 0; i < ARRAY_COUNT(gPauseMapIconScripts); i++) { - gPauseMapIconIDs[i] = create_hud_element(gPauseMapIconScripts[i]); - set_hud_element_flags(gPauseMapIconIDs[i], HUD_ELEMENT_FLAGS_80); + gPauseMapIconIDs[i] = hud_element_create(gPauseMapIconScripts[i]); + hud_element_set_flags(gPauseMapIconIDs[i], HUD_ELEMENT_FLAGS_80); } for (i = 0; i < ARRAY_COUNT(gPauseMapWindowBPs); i++) { @@ -563,6 +563,6 @@ void pause_map_cleanup(MenuPanel* tab) { s32 i; for (i = 0; i < ARRAY_COUNT(gPauseMapIconIDs); i++) { - free_hud_element(gPauseMapIconIDs[i]); + hud_element_free(gPauseMapIconIDs[i]); } } diff --git a/src/pause/pause_partners.c b/src/pause/pause_partners.c index 3f0a03cc81..85873d221e 100644 --- a/src/pause/pause_partners.c +++ b/src/pause/pause_partners.c @@ -418,13 +418,13 @@ void pause_partners_draw_title(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, draw_msg(msgID, baseX + ((width - offset - msgWidth) >> 1), baseY + 1, 255, 0, 0); if (level == 1) { - set_hud_element_render_pos(gPausePartnersIconIDs[2], baseX + 95, baseY + 10); - draw_hud_element_3(gPausePartnersIconIDs[2]); + hud_element_set_render_pos(gPausePartnersIconIDs[2], baseX + 95, baseY + 10); + hud_element_draw_without_clipping(gPausePartnersIconIDs[2]); } else if (level == 2) { - set_hud_element_render_pos(gPausePartnersIconIDs[2], baseX + 91, baseY + 10); - draw_hud_element_3(gPausePartnersIconIDs[2]); - set_hud_element_render_pos(gPausePartnersIconIDs[3], baseX + 101, baseY + 10); - draw_hud_element_3(gPausePartnersIconIDs[3]); + hud_element_set_render_pos(gPausePartnersIconIDs[2], baseX + 91, baseY + 10); + hud_element_draw_without_clipping(gPausePartnersIconIDs[2]); + hud_element_set_render_pos(gPausePartnersIconIDs[3], baseX + 101, baseY + 10); + hud_element_draw_without_clipping(gPausePartnersIconIDs[3]); } } @@ -467,16 +467,16 @@ void pause_partners_draw_movelist(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid } draw_msg(moveNameID, msgX, msgY, 255, 10, style); - set_hud_element_scale(gPausePartnersIconIDs[i + 4], 0.5f); + hud_element_set_scale(gPausePartnersIconIDs[i + 4], 0.5f); //TODO find better match - set_hud_element_render_pos(gPausePartnersIconIDs[i + 4], 12 - (-baseX), baseY + 28 + i * 13); - draw_hud_element_3(gPausePartnersIconIDs[i + 4]); + hud_element_set_render_pos(gPausePartnersIconIDs[i + 4], 12 - (-baseX), baseY + 28 + i * 13); + hud_element_draw_without_clipping(gPausePartnersIconIDs[i + 4]); if (costFP != 0) { draw_number(costFP, baseX + 125, baseY + 22 + i * 13, style, 10, 255, 3); if (costFP > 0) { - set_hud_element_render_pos(gPausePartnersIconIDs[0], baseX + 134, baseY + 29 + i * 13); - draw_hud_element_3(gPausePartnersIconIDs[0]); + hud_element_set_render_pos(gPausePartnersIconIDs[0], baseX + 134, baseY + 29 + i * 13); + hud_element_draw_without_clipping(gPausePartnersIconIDs[0]); } } } @@ -491,8 +491,8 @@ void pause_partners_draw_movelist_title(MenuPanel* menu, s32 baseX, s32 baseY, s } void pause_partners_draw_movelist_flower(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { - set_hud_element_render_pos(gPausePartnersIconIDs[1], baseX + 17, baseY + 16); - draw_hud_element_3(gPausePartnersIconIDs[1]); + hud_element_set_render_pos(gPausePartnersIconIDs[1], baseX + 17, baseY + 16); + hud_element_draw_without_clipping(gPausePartnersIconIDs[1]); } void pause_partners_init(MenuPanel* panel) { @@ -518,8 +518,8 @@ void pause_partners_init(MenuPanel* panel) { } for (i = 0; i < ARRAY_COUNT(gPausePartnersIconScripts); i++) { - gPausePartnersIconIDs[i] = create_hud_element(gPausePartnersIconScripts[i]); - set_hud_element_flags(gPausePartnersIconIDs[i], HUD_ELEMENT_FLAGS_80); + gPausePartnersIconIDs[i] = hud_element_create(gPausePartnersIconScripts[i]); + hud_element_set_flags(gPausePartnersIconIDs[i], HUD_ELEMENT_FLAGS_80); } for (i = 0; i < ARRAY_COUNT(gPausePartnersWindowBPs); i++) { @@ -690,7 +690,7 @@ void pause_partners_cleanup(MenuPanel* panel) { s32 i; for (i = 0; i < ARRAY_COUNT(gPausePartnersIconIDs); i++) { - free_hud_element(gPausePartnersIconIDs[i]); + hud_element_free(gPausePartnersIconIDs[i]); } for (i = 0; i < ARRAY_COUNT(gPausePartnersSpriteIDs); i++) { diff --git a/src/pause/pause_stats.c b/src/pause/pause_stats.c index f3134ef4a0..08bdeb81a4 100644 --- a/src/pause/pause_stats.c +++ b/src/pause/pause_stats.c @@ -98,10 +98,10 @@ void pause_stats_init(MenuPanel* panel) { s32 i; for (i = 0; i < ARRAY_COUNT(gPauseStatsIconIDs); i++) { - s32 iconID = create_hud_element(gStatsMenuElements[i]); + s32 iconID = hud_element_create(gStatsMenuElements[i]); gPauseStatsIconIDs[i] = iconID; - set_hud_element_flags(iconID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(iconID, HUD_ELEMENT_FLAGS_80); } for (i = 0; i < ARRAY_COUNT(gStatsMenuWindowBPs); i++) { @@ -220,6 +220,6 @@ void pause_stats_cleanup(MenuPanel* panel) { s32 i; for (i = 0; i < ARRAY_COUNT(gPauseStatsIconIDs); i++) { - free_hud_element(gPauseStatsIconIDs[i]); + hud_element_free(gPauseStatsIconIDs[i]); } } diff --git a/src/pause/pause_tabs.c b/src/pause/pause_tabs.c index 58f7f8f4d4..d0652cff4b 100644 --- a/src/pause/pause_tabs.c +++ b/src/pause/pause_tabs.c @@ -148,15 +148,15 @@ void pause_tabs_draw_invis(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 void pause_tabs_draw_stats(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { if (darkening != 0) { - set_hud_element_flags(gPauseTabsIconIDs[0], HUD_ELEMENT_FLAGS_TRANSPARENT); - set_hud_element_alpha(gPauseTabsIconIDs[0], 255.0 - darkening * 0.5); + hud_element_set_flags(gPauseTabsIconIDs[0], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_alpha(gPauseTabsIconIDs[0], 255.0 - darkening * 0.5); } else { - clear_hud_element_flags(gPauseTabsIconIDs[0], HUD_ELEMENT_FLAGS_TRANSPARENT); - set_hud_element_alpha(gPauseTabsIconIDs[0], 255); + hud_element_clear_flags(gPauseTabsIconIDs[0], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_alpha(gPauseTabsIconIDs[0], 255); } - set_hud_element_render_pos(gPauseTabsIconIDs[0], baseX + 22, baseY + 7); - draw_hud_element_3(gPauseTabsIconIDs[0]); + hud_element_set_render_pos(gPauseTabsIconIDs[0], baseX + 22, baseY + 7); + hud_element_draw_without_clipping(gPauseTabsIconIDs[0]); if (gPauseMenuCurrentTab == 0) { if (gPauseTabsWindowIDs[menu->col] == 25) { pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX, baseY + 6); @@ -166,15 +166,15 @@ void pause_tabs_draw_stats(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 void pause_tabs_draw_badges(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { if (darkening != 0) { - set_hud_element_flags(gPauseTabsIconIDs[1], HUD_ELEMENT_FLAGS_TRANSPARENT); - set_hud_element_alpha(gPauseTabsIconIDs[1], 255.0 - darkening * 0.5); + hud_element_set_flags(gPauseTabsIconIDs[1], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_alpha(gPauseTabsIconIDs[1], 255.0 - darkening * 0.5); } else { - clear_hud_element_flags(gPauseTabsIconIDs[1], HUD_ELEMENT_FLAGS_TRANSPARENT); - set_hud_element_alpha(gPauseTabsIconIDs[1], 255); + hud_element_clear_flags(gPauseTabsIconIDs[1], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_alpha(gPauseTabsIconIDs[1], 255); } - set_hud_element_render_pos(gPauseTabsIconIDs[1], baseX + 22, baseY + 7); - draw_hud_element_3(gPauseTabsIconIDs[1]); + hud_element_set_render_pos(gPauseTabsIconIDs[1], baseX + 22, baseY + 7); + hud_element_draw_without_clipping(gPauseTabsIconIDs[1]); if (gPauseMenuCurrentTab == 0) { if (gPauseTabsWindowIDs[menu->col] == 26) { pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX, baseY + 6); @@ -184,15 +184,15 @@ void pause_tabs_draw_badges(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s3 void pause_tabs_draw_items(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { if (darkening != 0) { - set_hud_element_flags(gPauseTabsIconIDs[2], HUD_ELEMENT_FLAGS_TRANSPARENT); - set_hud_element_alpha(gPauseTabsIconIDs[2], 255.0 - darkening * 0.5); + hud_element_set_flags(gPauseTabsIconIDs[2], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_alpha(gPauseTabsIconIDs[2], 255.0 - darkening * 0.5); } else { - clear_hud_element_flags(gPauseTabsIconIDs[2], HUD_ELEMENT_FLAGS_TRANSPARENT); - set_hud_element_alpha(gPauseTabsIconIDs[2], 255); + hud_element_clear_flags(gPauseTabsIconIDs[2], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_alpha(gPauseTabsIconIDs[2], 255); } - set_hud_element_render_pos(gPauseTabsIconIDs[2], baseX + 22, baseY + 7); - draw_hud_element_3(gPauseTabsIconIDs[2]); + hud_element_set_render_pos(gPauseTabsIconIDs[2], baseX + 22, baseY + 7); + hud_element_draw_without_clipping(gPauseTabsIconIDs[2]); if (gPauseMenuCurrentTab == 0) { if (gPauseTabsWindowIDs[menu->col] == 27) { pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX, baseY + 6); @@ -202,15 +202,15 @@ void pause_tabs_draw_items(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 void pause_tabs_draw_party(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { if (darkening != 0) { - set_hud_element_flags(gPauseTabsIconIDs[3], HUD_ELEMENT_FLAGS_TRANSPARENT); - set_hud_element_alpha(gPauseTabsIconIDs[3], 255.0 - darkening * 0.5); + hud_element_set_flags(gPauseTabsIconIDs[3], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_alpha(gPauseTabsIconIDs[3], 255.0 - darkening * 0.5); } else { - clear_hud_element_flags(gPauseTabsIconIDs[3], HUD_ELEMENT_FLAGS_TRANSPARENT); - set_hud_element_alpha(gPauseTabsIconIDs[3], 255); + hud_element_clear_flags(gPauseTabsIconIDs[3], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_alpha(gPauseTabsIconIDs[3], 255); } - set_hud_element_render_pos(gPauseTabsIconIDs[3], baseX + 22, baseY + 7); - draw_hud_element_3(gPauseTabsIconIDs[3]); + hud_element_set_render_pos(gPauseTabsIconIDs[3], baseX + 22, baseY + 7); + hud_element_draw_without_clipping(gPauseTabsIconIDs[3]); if (gPauseMenuCurrentTab == 0) { if (gPauseTabsWindowIDs[menu->col] == 28) { pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX, baseY + 6); @@ -220,15 +220,15 @@ void pause_tabs_draw_party(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 void pause_tabs_draw_spirits(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { if (darkening != 0) { - set_hud_element_flags(gPauseTabsIconIDs[4], HUD_ELEMENT_FLAGS_TRANSPARENT); - set_hud_element_alpha(gPauseTabsIconIDs[4], 255.0 - darkening * 0.5); + hud_element_set_flags(gPauseTabsIconIDs[4], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_alpha(gPauseTabsIconIDs[4], 255.0 - darkening * 0.5); } else { - clear_hud_element_flags(gPauseTabsIconIDs[4], HUD_ELEMENT_FLAGS_TRANSPARENT); - set_hud_element_alpha(gPauseTabsIconIDs[4], 255); + hud_element_clear_flags(gPauseTabsIconIDs[4], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_alpha(gPauseTabsIconIDs[4], 255); } - set_hud_element_render_pos(gPauseTabsIconIDs[4], baseX + 22, baseY + 7); - draw_hud_element_3(gPauseTabsIconIDs[4]); + hud_element_set_render_pos(gPauseTabsIconIDs[4], baseX + 22, baseY + 7); + hud_element_draw_without_clipping(gPauseTabsIconIDs[4]); if (gPauseMenuCurrentTab == 0) { if (gPauseTabsWindowIDs[menu->col] == 29) { pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX, baseY + 6); @@ -238,15 +238,15 @@ void pause_tabs_draw_spirits(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s void pause_tabs_draw_map(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { if (darkening != 0) { - set_hud_element_flags(gPauseTabsIconIDs[5], HUD_ELEMENT_FLAGS_TRANSPARENT); - set_hud_element_alpha(gPauseTabsIconIDs[5], 255.0 - darkening * 0.5); + hud_element_set_flags(gPauseTabsIconIDs[5], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_alpha(gPauseTabsIconIDs[5], 255.0 - darkening * 0.5); } else { - clear_hud_element_flags(gPauseTabsIconIDs[5], HUD_ELEMENT_FLAGS_TRANSPARENT); - set_hud_element_alpha(gPauseTabsIconIDs[5], 255); + hud_element_clear_flags(gPauseTabsIconIDs[5], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_alpha(gPauseTabsIconIDs[5], 255); } - set_hud_element_render_pos(gPauseTabsIconIDs[5], baseX + 23, baseY + 7); - draw_hud_element_3(gPauseTabsIconIDs[5]); + hud_element_set_render_pos(gPauseTabsIconIDs[5], baseX + 23, baseY + 7); + hud_element_draw_without_clipping(gPauseTabsIconIDs[5]); if (gPauseMenuCurrentTab == 0) { if (gPauseTabsWindowIDs[menu->col] == 30) { pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX, baseY + 6); @@ -258,8 +258,8 @@ void pause_tabs_init(MenuPanel* tab) { s32 i; for (i = 0; i < ARRAY_COUNT(gPauseTabsHudScripts); i++) { - gPauseTabsIconIDs[i] = create_hud_element(gPauseTabsHudScripts[i]); - set_hud_element_flags(gPauseTabsIconIDs[i], HUD_ELEMENT_FLAGS_80); + gPauseTabsIconIDs[i] = hud_element_create(gPauseTabsHudScripts[i]); + hud_element_set_flags(gPauseTabsIconIDs[i], HUD_ELEMENT_FLAGS_80); } for (i = 0; i < ARRAY_COUNT(gPauseTabsWindowBPs); i++) { @@ -400,6 +400,6 @@ void pause_tabs_cleanup(MenuPanel* tab) { s32 i; for (i = 0; i < ARRAY_COUNT(gPauseTabsIconIDs); i++) { - free_hud_element(gPauseTabsIconIDs[i]); + hud_element_free(gPauseTabsIconIDs[i]); } } diff --git a/src/state_battle.c b/src/state_battle.c index 497b49be93..4850e12acb 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -88,8 +88,8 @@ void state_step_battle(void) { clear_entity_models(); clear_animator_list(); clear_generic_entity_list(); - set_hud_element_nonworld_cache(NULL, 0); - clear_hud_element_cache(); + hud_element_set_aux_cache(NULL, 0); + hud_element_clear_cache(); reset_status_menu(); clear_item_entity_data(); clear_script_list(); @@ -164,7 +164,7 @@ void state_step_end_battle(void) { init_entity_models(); reset_animator_list(); init_generic_entity_list(); - set_hud_element_nonworld_cache(0, 0); + hud_element_set_aux_cache(0, 0); init_hud_element_list(); init_item_entity_list(); init_script_list(); diff --git a/src/state_demo.c b/src/state_demo.c index baa5590546..771cf3ceed 100644 --- a/src/state_demo.c +++ b/src/state_demo.c @@ -109,7 +109,7 @@ void state_step_demo(void) { clear_model_data(); clear_sprite_shading_data(); reset_background_settings(); - clear_hud_element_cache(); + hud_element_clear_cache(); clear_trigger_data(); clear_printers(); clear_entity_data(0); diff --git a/src/state_file_select.c b/src/state_file_select.c index 445e9177b1..dd991bb87d 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -37,8 +37,8 @@ void state_init_file_select(void) { disable_player_input(); set_time_freeze_mode(TIME_FREEZE_FULL); general_heap_create(); - set_hud_element_nonworld_cache(0, 0); - clear_hud_element_cache(); + hud_element_set_aux_cache(0, 0); + hud_element_clear_cache(); load_model_textures(0, 0, 0); gCameras[CAM_DEFAULT].updateMode = 6; gCameras[CAM_DEFAULT].unk_06 = 1; @@ -127,8 +127,8 @@ void state_step_language_select(void) { clear_entity_models(); clear_animator_list(); clear_generic_entity_list(); - set_hud_element_nonworld_cache(&D_80200000, 0x20000); - clear_hud_element_cache(); + hud_element_set_aux_cache(&D_80200000, 0x20000); + hud_element_clear_cache(); reset_status_menu(); clear_item_entity_data(); clear_script_list(); @@ -279,7 +279,7 @@ void state_step_exit_language_select(void) { init_entity_models(); reset_animator_list(); init_generic_entity_list(); - set_hud_element_nonworld_cache(0, 0); + hud_element_set_aux_cache(0, 0); init_hud_element_list(); init_item_entity_list(); init_script_list(); diff --git a/src/state_intro.c b/src/state_intro.c index ecc8e5eb6a..ada829ef59 100644 --- a/src/state_intro.c +++ b/src/state_intro.c @@ -153,7 +153,7 @@ void state_step_intro(void) { clear_model_data(); clear_sprite_shading_data(); reset_background_settings(); - clear_hud_element_cache(); + hud_element_clear_cache(); clear_trigger_data(); clear_printers(); clear_entity_data(0); diff --git a/src/state_logos.c b/src/state_logos.c index c0f1e1fa61..2b8b3b8950 100644 --- a/src/state_logos.c +++ b/src/state_logos.c @@ -69,7 +69,7 @@ void state_init_logos(void) { clear_animator_list(); clear_entity_models(); clear_npcs(); - clear_hud_element_cache(); + hud_element_clear_cache(); reset_background_settings(); clear_entity_data(1); clear_effect_data(); diff --git a/src/state_pause.c b/src/state_pause.c index ce7b30b850..0271d7e10a 100644 --- a/src/state_pause.c +++ b/src/state_pause.c @@ -69,8 +69,8 @@ void state_step_pause(void) { clear_entity_models(); clear_animator_list(); clear_generic_entity_list(); - set_hud_element_nonworld_cache(_3169F0_VRAM, 0x38000); - clear_hud_element_cache(); + hud_element_set_aux_cache(_3169F0_VRAM, 0x38000); + hud_element_clear_cache(); reset_status_menu(); clear_item_entity_data(); clear_script_list(); @@ -151,7 +151,7 @@ void state_step_unpause(void) { init_entity_models(); reset_animator_list(); init_generic_entity_list(); - set_hud_element_nonworld_cache(0, 0); + hud_element_set_aux_cache(0, 0); init_hud_element_list(); init_item_entity_list(); init_script_list(); diff --git a/src/state_startup.c b/src/state_startup.c index a0bdfd2957..092aeac258 100644 --- a/src/state_startup.c +++ b/src/state_startup.c @@ -42,8 +42,8 @@ void state_step_startup(void) { clear_model_data(); clear_sprite_shading_data(); reset_background_settings(); - set_hud_element_nonworld_cache(0, 0); - clear_hud_element_cache(); + hud_element_set_aux_cache(0, 0); + hud_element_clear_cache(); clear_trigger_data(); clear_printers(); clear_entity_data(0); diff --git a/src/state_title_screen.c b/src/state_title_screen.c index 88d47a0b39..7f5b0eddab 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -13,7 +13,7 @@ #define TITLE_POS_TOP 15 // Top edge of the texture on screen (with no offset) s16 D_800779C0[2] = {0, 0}; -s32 D_800779C4 = 0; +s32 gSaveSlotMetadata = 0; s8 D_800779C8[2] = {0, 0}; s8 D_800779CA = 0; s8 D_800779CB = 0x45; @@ -24,7 +24,7 @@ s32 D_800779D8[] = { 0x00000000, 0x00000000, 0x00000045, 0x52524F52, 0xF7F7F700, 0x00000045, 0x52524F52, 0xF7F7F700, 0x00000000, 0x00000000, 0x00000000, 0x00000045, 0x52524F52, 0xF7F7F700, 0x00000000, 0x00000000, }; -s32 D_80077A24 = 0x01010101; +s32 gSaveSlotHasData = 0x01010101; s32 D_80077A28 = 0; s32 D_80077A2C = 0; s32 D_80077A30 = 0; @@ -146,7 +146,7 @@ void state_init_title_screen(void) { clear_animator_list(); clear_entity_models(); clear_npcs(); - clear_hud_element_cache(); + hud_element_clear_cache(); reset_background_settings(); clear_entity_data(1); clear_effect_data(); @@ -265,7 +265,7 @@ void state_step_title_screen(void) { clear_entity_models(); clear_animator_list(); clear_npcs(); - clear_hud_element_cache(); + hud_element_clear_cache(); spr_init_sprites(0); clear_entity_data(1); clear_windows(); diff --git a/src/status_icons.c b/src/status_icons.c index a7d80efd2b..5396c86b59 100644 --- a/src/status_icons.c +++ b/src/status_icons.c @@ -310,35 +310,35 @@ void update_all_status_icons(PopupMessage* popup) { if (icon->status1.activeTask == STATUS_ICON_TASK_LOAD) { switch (icon->status1.active) { case STATUS_SLEEP: - elementID = icon->status1.activeElementID = create_hud_element(&HudScript_AsleepBegin); + elementID = icon->status1.activeElementID = hud_element_create(&HudScript_AsleepBegin); break; case STATUS_PARALYZE: - elementID = icon->status1.activeElementID = create_hud_element(&HudScript_ParalyzedBegin); + elementID = icon->status1.activeElementID = hud_element_create(&HudScript_ParalyzedBegin); break; case STATUS_DIZZY: - elementID = icon->status1.activeElementID = create_hud_element(&HudScript_DizzyBegin); + elementID = icon->status1.activeElementID = hud_element_create(&HudScript_DizzyBegin); break; case STATUS_FEAR: - elementID = icon->status1.activeElementID = create_hud_element(&HudScript_WeakenedLoop); + elementID = icon->status1.activeElementID = hud_element_create(&HudScript_WeakenedLoop); break; case STATUS_STOP: - elementID = icon->status1.activeElementID = create_hud_element(&HudScript_StoppedBegin); + elementID = icon->status1.activeElementID = hud_element_create(&HudScript_StoppedBegin); break; case STATUS_POISON: - elementID = icon->status1.activeElementID = create_hud_element(&HudScript_PoisonedBegin); + elementID = icon->status1.activeElementID = hud_element_create(&HudScript_PoisonedBegin); break; case STATUS_SHRINK: - elementID = icon->status1.activeElementID = create_hud_element(&HudScript_ShrunkBegin); + elementID = icon->status1.activeElementID = hud_element_create(&HudScript_ShrunkBegin); break; case STATUS_FROZEN: - elementID = icon->status1.activeElementID = create_hud_element(&HudScript_FrozenBegin); + elementID = icon->status1.activeElementID = hud_element_create(&HudScript_FrozenBegin); break; default: - elementID = icon->status1.activeElementID = create_hud_element(&HudScript_Item_Present); + elementID = icon->status1.activeElementID = hud_element_create(&HudScript_Item_Present); break; } - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); icon->status1.activeTask = STATUS_ICON_TASK_DRAW; } @@ -348,31 +348,31 @@ void update_all_status_icons(PopupMessage* popup) { case STATUS_ICON_TASK_LOAD: switch (icon->status1.removing) { case STATUS_SLEEP: - set_hud_element_anim(icon->status1.removingElementID, &HudScript_AsleepEnd); + hud_element_set_script(icon->status1.removingElementID, &HudScript_AsleepEnd); break; case STATUS_PARALYZE: - set_hud_element_anim(icon->status1.removingElementID, &HudScript_ParalyzedEnd); + hud_element_set_script(icon->status1.removingElementID, &HudScript_ParalyzedEnd); break; case STATUS_DIZZY: - set_hud_element_anim(icon->status1.removingElementID, &HudScript_DizzyEnd); + hud_element_set_script(icon->status1.removingElementID, &HudScript_DizzyEnd); break; case STATUS_FEAR: - set_hud_element_anim(icon->status1.removingElementID, &HudScript_WeakenedLoop); + hud_element_set_script(icon->status1.removingElementID, &HudScript_WeakenedLoop); break; case STATUS_STOP: - set_hud_element_anim(icon->status1.removingElementID, &HudScript_StoppedEnd); + hud_element_set_script(icon->status1.removingElementID, &HudScript_StoppedEnd); break; case STATUS_POISON: - set_hud_element_anim(icon->status1.removingElementID, &HudScript_PoisonedEnd); + hud_element_set_script(icon->status1.removingElementID, &HudScript_PoisonedEnd); break; case STATUS_SHRINK: - set_hud_element_anim(icon->status1.removingElementID, &HudScript_ShrunkEnd); + hud_element_set_script(icon->status1.removingElementID, &HudScript_ShrunkEnd); break; case STATUS_FROZEN: - set_hud_element_anim(icon->status1.removingElementID, &HudScript_FrozenEnd); + hud_element_set_script(icon->status1.removingElementID, &HudScript_FrozenEnd); break; default: - set_hud_element_anim(icon->status1.removingElementID, &HudScript_Item_Present); + hud_element_set_script(icon->status1.removingElementID, &HudScript_Item_Present); break; } @@ -385,7 +385,7 @@ void update_all_status_icons(PopupMessage* popup) { icon->status1.frameCounter--; } else { icon->status1.removing = 0; - free_hud_element(icon->status1.removingElementID); + hud_element_free(icon->status1.removingElementID); icon->status1.removingTask = STATUS_ICON_TASK_NONE; } break; @@ -394,15 +394,15 @@ void update_all_status_icons(PopupMessage* popup) { if (icon->status2.activeTask == STATUS_ICON_TASK_LOAD) { switch (icon->status2.active) { case STATUS_STATIC: - elementID = icon->status2.activeElementID = create_hud_element(&HudScript_ElectrifiedBegin); + elementID = icon->status2.activeElementID = hud_element_create(&HudScript_ElectrifiedBegin); break; default: - elementID = icon->status2.activeElementID = create_hud_element(&HudScript_Item_Present); + elementID = icon->status2.activeElementID = hud_element_create(&HudScript_Item_Present); break; } - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); icon->status2.activeTask = STATUS_ICON_TASK_DRAW; } @@ -412,10 +412,10 @@ void update_all_status_icons(PopupMessage* popup) { case STATUS_ICON_TASK_LOAD: switch (icon->status2.removing) { case STATUS_STATIC: - set_hud_element_anim(icon->status2.removingElementID, &HudScript_ElectrifiedEnd); + hud_element_set_script(icon->status2.removingElementID, &HudScript_ElectrifiedEnd); break; default: - set_hud_element_anim(icon->status2.removingElementID, &HudScript_Item_Present); + hud_element_set_script(icon->status2.removingElementID, &HudScript_Item_Present); break; } @@ -427,7 +427,7 @@ void update_all_status_icons(PopupMessage* popup) { icon->status2.frameCounter--; } else { icon->status2.removing = 0; - free_hud_element(icon->status2.removingElementID); + hud_element_free(icon->status2.removingElementID); icon->status2.removingTask = STATUS_ICON_TASK_NONE; } break; @@ -436,15 +436,15 @@ void update_all_status_icons(PopupMessage* popup) { if (icon->status3.activeTask == STATUS_ICON_TASK_LOAD) { switch (icon->status3.active) { case STATUS_E: - elementID = icon->status3.activeElementID = create_hud_element(&HudScript_TransparentBegin); + elementID = icon->status3.activeElementID = hud_element_create(&HudScript_TransparentBegin); break; default: - elementID = icon->status3.activeElementID = create_hud_element(&HudScript_Item_Present); + elementID = icon->status3.activeElementID = hud_element_create(&HudScript_Item_Present); break; } - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); icon->status3.activeTask = STATUS_ICON_TASK_DRAW; } @@ -454,10 +454,10 @@ void update_all_status_icons(PopupMessage* popup) { case STATUS_ICON_TASK_LOAD: switch (icon->status3.removing) { case STATUS_E: - set_hud_element_anim(icon->status3.removingElementID, &HudScript_TransparentEnd); + hud_element_set_script(icon->status3.removingElementID, &HudScript_TransparentEnd); break; default: - set_hud_element_anim(icon->status3.removingElementID, &HudScript_Item_Present); + hud_element_set_script(icon->status3.removingElementID, &HudScript_Item_Present); break; } @@ -469,16 +469,16 @@ void update_all_status_icons(PopupMessage* popup) { icon->status3.frameCounter--; } else { icon->status3.removing = 0; - free_hud_element(icon->status3.removingElementID); + hud_element_free(icon->status3.removingElementID); icon->status3.removingTask = STATUS_ICON_TASK_NONE; } break; } if (icon->status4.activeTask == STATUS_ICON_TASK_LOAD) { - elementID = icon->status4.activeElementID = create_hud_element(&HudScript_WeakenedBegin); - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_flags(elementID, HUD_ELEMENT_FLAGS_80); + elementID = icon->status4.activeElementID = hud_element_create(&HudScript_WeakenedBegin); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); icon->status4.activeTask = STATUS_ICON_TASK_DRAW; } @@ -486,7 +486,7 @@ void update_all_status_icons(PopupMessage* popup) { case STATUS_ICON_TASK_NONE: break; case STATUS_ICON_TASK_LOAD: - set_hud_element_anim(icon->status4.removingElementID, &HudScript_WeakenedEnd); + hud_element_set_script(icon->status4.removingElementID, &HudScript_WeakenedEnd); icon->status4.frameCounter = 20; icon->status4.removingTask = STATUS_ICON_TASK_DRAW; break; @@ -495,7 +495,7 @@ void update_all_status_icons(PopupMessage* popup) { icon->status4.frameCounter--; } else { icon->status4.removing = 0; - free_hud_element(icon->status4.removingElementID); + hud_element_free(icon->status4.removingElementID); icon->status4.removingTask = STATUS_ICON_TASK_NONE; } break; @@ -506,7 +506,7 @@ void update_all_status_icons(PopupMessage* popup) { s32 index = icon->prevIndexBoostJump; if (get_hud_element(index)->flags & HUD_ELEMENT_FLAGS_ANIMATION_FINISHED) { - free_hud_element(index); + hud_element_free(index); icon->boostJump.removing = 0; } } @@ -517,7 +517,7 @@ void update_all_status_icons(PopupMessage* popup) { s32 index = icon->prevIndexBoostHammer; if (get_hud_element(index)->flags & HUD_ELEMENT_FLAGS_ANIMATION_FINISHED) { - free_hud_element(index); + hud_element_free(index); icon->boostHammer.removing = 0; } } @@ -558,9 +558,9 @@ void draw_all_status_icons(PopupMessage* popup) { isActiveDrawn = 0; if (icon->status1.activeTask == STATUS_ICON_TASK_DRAW) { if (icon->flags & STATUS_ICON_FLAG_DEBUFF) { - set_hud_element_flags(icon->status1.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->status1.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - clear_hud_element_flags(icon->status1.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status1.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); x = icon->worldPos.x; y = icon->worldPos.y + icon->status1OffsetY; @@ -569,15 +569,15 @@ void draw_all_status_icons(PopupMessage* popup) { add_vec2D_polar(&x, &z, icon->status1Radius, clamp_angle(camera->currentYaw + 90)); get_screen_coords(gCurrentCameraID, x, y, z, &screenX, &screenY, &screenZ); elementId = icon->status1.activeElementID; - set_hud_element_render_pos(elementId, screenX - 8, screenY - 8); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX - 8, screenY - 8); + hud_element_draw_next(elementId); iconCounter = 1; isActiveDrawn = 1; } } if (icon->status1.removingTask == STATUS_ICON_TASK_DRAW && (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1)) { - clear_hud_element_flags(icon->status1.removingElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status1.removingElementID, HUD_ELEMENT_FLAGS_DISABLED); if (isActiveDrawn == 0) { iconCounter++; @@ -590,16 +590,16 @@ void draw_all_status_icons(PopupMessage* popup) { add_vec2D_polar(&x, &z, icon->status1Radius, clamp_angle(camera->currentYaw + 90)); get_screen_coords(gCurrentCameraID, x, y, z, &screenX, &screenY, &screenZ); elementId = icon->status1.removingElementID; - set_hud_element_render_pos(elementId, screenX - 8, screenY - 8); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX - 8, screenY - 8); + hud_element_draw_next(elementId); } isActiveDrawn = 0; if (icon->status2.activeTask == STATUS_ICON_TASK_DRAW) { if (icon->flags & STATUS_ICON_FLAG_STATIC) { - set_hud_element_flags(icon->status2.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->status2.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - clear_hud_element_flags(icon->status2.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status2.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); offsetY = 0; if (iconCounter == 0) { @@ -613,8 +613,8 @@ void draw_all_status_icons(PopupMessage* popup) { add_vec2D_polar(&x, &z, icon->status2Radius, clamp_angle(camera->currentYaw + 90)); get_screen_coords(gCurrentCameraID, x, y, z, &screenX, &screenY, &screenZ); elementId = icon->status2.activeElementID; - set_hud_element_render_pos(elementId, screenX - 8, screenY - 8); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX - 8, screenY - 8); + hud_element_draw_next(elementId); iconCounter++; isActiveDrawn = 1; @@ -622,7 +622,7 @@ void draw_all_status_icons(PopupMessage* popup) { } if (icon->status2.removingTask == STATUS_ICON_TASK_DRAW && (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1)) { - clear_hud_element_flags(icon->status2.removingElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status2.removingElementID, HUD_ELEMENT_FLAGS_DISABLED); offsetY = 0; if (iconCounter == 0) { @@ -639,16 +639,16 @@ void draw_all_status_icons(PopupMessage* popup) { add_vec2D_polar(&x, &z, icon->status2Radius, clamp_angle(camera->currentYaw + 90)); get_screen_coords(gCurrentCameraID, x, y, z, &screenX, &screenY, &screenZ); elementId = icon->status2.removingElementID; - set_hud_element_render_pos(elementId, screenX - 8, screenY - 8); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX - 8, screenY - 8); + hud_element_draw_next(elementId); } isActiveDrawn = 0; if (icon->status3.activeTask == STATUS_ICON_TASK_DRAW) { if (icon->flags & STATUS_ICON_FLAG_TRANSPARENT) { - set_hud_element_flags(icon->status3.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->status3.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - clear_hud_element_flags(icon->status3.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status3.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); offsetY = 0; if (iconCounter == 1) { @@ -664,15 +664,15 @@ void draw_all_status_icons(PopupMessage* popup) { add_vec2D_polar(&x, &z, icon->status3Radius, clamp_angle(camera->currentYaw + 90)); get_screen_coords(gCurrentCameraID, x, y, z, &screenX, &screenY, &screenZ); elementId = icon->status3.activeElementID; - set_hud_element_render_pos(elementId, screenX - 8, screenY - 8); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX - 8, screenY - 8); + hud_element_draw_next(elementId); iconCounter++; isActiveDrawn = 1; } } if (icon->status3.removingTask == STATUS_ICON_TASK_DRAW && (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1)) { - clear_hud_element_flags(icon->status3.removingElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status3.removingElementID, HUD_ELEMENT_FLAGS_DISABLED); offsetY = 0; if (iconCounter == 1) { @@ -692,16 +692,16 @@ void draw_all_status_icons(PopupMessage* popup) { add_vec2D_polar(&x, &z, icon->status3Radius, clamp_angle(camera->currentYaw + 90)); get_screen_coords(gCurrentCameraID, x, y, z, &screenX, &screenY, &screenZ); elementId = icon->status3.removingElementID; - set_hud_element_render_pos(elementId, screenX - 8, screenY - 8); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX - 8, screenY - 8); + hud_element_draw_next(elementId); } isActiveDrawn = 0; if (icon->status4.activeTask == STATUS_ICON_TASK_DRAW) { if (icon->flags & STATUS_ICON_FLAG_STATUS_CHILL_OUT) { - set_hud_element_flags(icon->status4.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->status4.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - clear_hud_element_flags(icon->status4.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status4.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); offsetY = 0; if (iconCounter == 2) { @@ -721,15 +721,15 @@ void draw_all_status_icons(PopupMessage* popup) { add_vec2D_polar(&x, &z, icon->status4Radius, clamp_angle(camera->currentYaw + 90)); get_screen_coords(gCurrentCameraID, x, y, z, &screenX, &screenY, &screenZ); elementId = icon->status4.activeElementID; - set_hud_element_render_pos(elementId, screenX - 8, screenY - 8); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX - 8, screenY - 8); + hud_element_draw_next(elementId); iconCounter++; isActiveDrawn = 1; } } if (icon->status4.removingTask == STATUS_ICON_TASK_DRAW && (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1)) { - clear_hud_element_flags(icon->status4.removingElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status4.removingElementID, HUD_ELEMENT_FLAGS_DISABLED); offsetY = 0; if (iconCounter == 2) { @@ -752,84 +752,84 @@ void draw_all_status_icons(PopupMessage* popup) { add_vec2D_polar(&x, &z, icon->status4Radius, clamp_angle(camera->currentYaw + 90)); get_screen_coords(gCurrentCameraID, x, y, z, &screenX, &screenY, &screenZ); elementId = icon->status4.removingElementID; - set_hud_element_render_pos(elementId, screenX - 8, screenY - 8); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX - 8, screenY - 8); + hud_element_draw_next(elementId); } do { if (icon->boostJump.active) { if (icon->flags & STATUS_ICON_FLAG_BOOST_JUMP) { - set_hud_element_flags(icon->boostJump.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->boostJump.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - clear_hud_element_flags(icon->boostJump.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->boostJump.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; get_screen_coords(gCurrentCameraID, x, icon->worldPos.y + icon->offsetY, z, &screenX, &screenY, &screenZ); elementId = icon->boostJump.activeElementID; - set_hud_element_render_pos(elementId, screenX + 2, screenY - 12); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX + 2, screenY - 12); + hud_element_draw_next(elementId); } } } while (0); if (icon->boostJump.removing) { - clear_hud_element_flags(icon->prevIndexBoostJump, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->prevIndexBoostJump, HUD_ELEMENT_FLAGS_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; get_screen_coords(gCurrentCameraID, x, icon->worldPos.y + icon->offsetY, z, &screenX, &screenY, &screenZ); elementId = icon->prevIndexBoostJump; - set_hud_element_render_pos(elementId, screenX + 2, screenY - 12); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX + 2, screenY - 12); + hud_element_draw_next(elementId); } do { if (icon->boostHammer.active) { if (icon->flags & STATUS_ICON_FLAG_BOOST_HAMMER) { - set_hud_element_flags(icon->boostHammer.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->boostHammer.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - clear_hud_element_flags(icon->boostHammer.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->boostHammer.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; get_screen_coords(gCurrentCameraID, x, icon->worldPos.y + icon->offsetY, z, &screenX, &screenY, &screenZ); elementId = icon->boostHammer.activeElementID; - set_hud_element_render_pos(elementId, screenX + 2, screenY - 12); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX + 2, screenY - 12); + hud_element_draw_next(elementId); } } } while (0); if (icon->boostHammer.removing) { - clear_hud_element_flags(icon->prevIndexBoostHammer, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->prevIndexBoostHammer, HUD_ELEMENT_FLAGS_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; get_screen_coords(gCurrentCameraID, x, icon->worldPos.y + icon->offsetY, z, &screenX, &screenY, &screenZ); elementId = icon->prevIndexBoostHammer; - set_hud_element_render_pos(elementId, screenX + 2, screenY - 12); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX + 2, screenY - 12); + hud_element_draw_next(elementId); } do { if (icon->boostPartner.active) { if (icon->flags & STATUS_ICON_FLAG_BOOST_PARTNER) { - set_hud_element_flags(icon->boostPartner.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->boostPartner.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - clear_hud_element_flags(icon->boostPartner.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->boostPartner.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; get_screen_coords(gCurrentCameraID, x, icon->worldPos.y + icon->offsetY, z, &screenX, &screenY, &screenZ); elementId = icon->boostPartner.activeElementID; - set_hud_element_render_pos(elementId, screenX + 2, screenY - 12); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX + 2, screenY - 12); + hud_element_draw_next(elementId); } } } while (0); @@ -837,17 +837,17 @@ void draw_all_status_icons(PopupMessage* popup) { do { if (icon->surprise.active) { if (icon->flags & STATUS_ICON_FLAG_SURPRISE) { - set_hud_element_flags(icon->surprise.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->surprise.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - clear_hud_element_flags(icon->surprise.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->surprise.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; get_screen_coords(gCurrentCameraID, x, icon->worldPos.y + icon->offsetY, z, &screenX, &screenY, &screenZ); elementId = icon->surprise.activeElementID; - set_hud_element_render_pos(elementId, screenX + 2, screenY - 15); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX + 2, screenY - 15); + hud_element_draw_next(elementId); } } } while (0); @@ -855,17 +855,17 @@ void draw_all_status_icons(PopupMessage* popup) { do { if (icon->peril.active) { if (icon->flags & STATUS_ICON_FLAG_PERIL) { - set_hud_element_flags(icon->peril.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->peril.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - clear_hud_element_flags(icon->peril.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->peril.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; get_screen_coords(gCurrentCameraID, x, icon->worldPos.y + icon->offsetY, z, &screenX, &screenY, &screenZ); elementId = icon->peril.activeElementID; - set_hud_element_render_pos(elementId, screenX + 2, screenY - 16); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX + 2, screenY - 16); + hud_element_draw_next(elementId); } } } while (0); @@ -873,17 +873,17 @@ void draw_all_status_icons(PopupMessage* popup) { do { if (icon->danger.active) { if (icon->flags & STATUS_ICON_FLAG_DANGER) { - set_hud_element_flags(icon->danger.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->danger.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - clear_hud_element_flags(icon->danger.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->danger.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; get_screen_coords(gCurrentCameraID, x, icon->worldPos.y + icon->offsetY, z, &screenX, &screenY, &screenZ); elementId = icon->danger.activeElementID; - set_hud_element_render_pos(elementId, screenX + 2, screenY - 16); - draw_hud_element_2(elementId); + hud_element_set_render_pos(elementId, screenX + 2, screenY - 16); + hud_element_draw_next(elementId); } } } while (0); @@ -1112,9 +1112,9 @@ void create_status_icon_boost_jump(s32 iconID) { statusIcon->flags &= ~STATUS_ICON_FLAG_BOOST_JUMP; if (!statusIcon->boostJump.active) { statusIcon->boostJump.active = TRUE; - hudElement = create_hud_element(&HudScript_BoostJumpBegin); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hudElement = hud_element_create(&HudScript_BoostJumpBegin); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); statusIcon->boostJump.activeElementID = hudElement; } } @@ -1127,7 +1127,7 @@ void remove_status_icon_boost_jump(s32 iconID) { statusIcon->boostJump.active = FALSE; statusIcon->boostJump.removing = TRUE; statusIcon->prevIndexBoostJump = hudElemIndex; - set_hud_element_anim(hudElemIndex, &HudScript_BoostJumpEnd); + hud_element_set_script(hudElemIndex, &HudScript_BoostJumpEnd); } } @@ -1144,9 +1144,9 @@ void create_status_icon_boost_hammer(s32 iconID) { statusIcon->flags &= ~STATUS_ICON_FLAG_BOOST_HAMMER; if (!statusIcon->boostHammer.active) { statusIcon->boostHammer.active = TRUE; - hudElement = create_hud_element(&HudScript_BoostHammerBegin); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hudElement = hud_element_create(&HudScript_BoostHammerBegin); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); statusIcon->boostHammer.activeElementID = hudElement; } } @@ -1159,7 +1159,7 @@ void remove_status_icon_boost_hammer(s32 iconID) { statusIcon->boostHammer.active = FALSE; statusIcon->boostHammer.removing = FALSE; statusIcon->prevIndexBoostHammer = hudElemIndex; - set_hud_element_anim(hudElemIndex, &HudScript_BoostHammerEnd); + hud_element_set_script(hudElemIndex, &HudScript_BoostHammerEnd); } } @@ -1176,9 +1176,9 @@ void create_status_icon_boost_partner(s32 iconID) { statusIcon->flags &= ~STATUS_ICON_FLAG_BOOST_PARTNER; if (!statusIcon->boostPartner.active) { statusIcon->boostPartner.active = TRUE; - hudElement = create_hud_element(&HudScript_BoostPartner); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hudElement = hud_element_create(&HudScript_BoostPartner); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); statusIcon->boostPartner.activeElementID = hudElement; } } @@ -1188,7 +1188,7 @@ void remove_status_icon_boost_partner(s32 iconID) { if (statusIcon->boostPartner.active) { statusIcon->boostPartner.active = FALSE; - free_hud_element(statusIcon->boostPartner.activeElementID); + hud_element_free(statusIcon->boostPartner.activeElementID); } } @@ -1205,9 +1205,9 @@ void create_status_icon_surprise(s32 iconID) { statusIcon->flags &= ~STATUS_ICON_FLAG_SURPRISE; if (!statusIcon->surprise.active) { statusIcon->surprise.active = TRUE; - hudElement = create_hud_element(&HudScript_Surprise); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hudElement = hud_element_create(&HudScript_Surprise); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); statusIcon->surprise.activeElementID = hudElement; } } @@ -1217,7 +1217,7 @@ void remove_status_icon_surprise(s32 iconID) { if (statusIcon->surprise.active) { statusIcon->surprise.active = FALSE; - free_hud_element(statusIcon->surprise.activeElementID); + hud_element_free(statusIcon->surprise.activeElementID); } } @@ -1234,9 +1234,9 @@ void create_status_icon_peril(s32 iconID) { statusIcon->flags &= ~STATUS_ICON_FLAG_PERIL; if (!statusIcon->peril.active) { statusIcon->peril.active = TRUE; - hudElement = create_hud_element(&HudScript_Peril); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hudElement = hud_element_create(&HudScript_Peril); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); statusIcon->peril.activeElementID = hudElement; } } @@ -1246,7 +1246,7 @@ void remove_status_icon_peril(s32 iconID) { if (statusIcon->peril.active) { statusIcon->peril.active = FALSE; - free_hud_element(statusIcon->peril.activeElementID); + hud_element_free(statusIcon->peril.activeElementID); } } @@ -1263,9 +1263,9 @@ void create_status_icon_danger(s32 iconID) { statusIcon->flags &= ~STATUS_ICON_FLAG_DANGER; if (!statusIcon->danger.active) { statusIcon->danger.active = TRUE; - hudElement = create_hud_element(&HudScript_Danger); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); - set_hud_element_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hudElement = hud_element_create(&HudScript_Danger); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); statusIcon->danger.activeElementID = hudElement; } } @@ -1275,7 +1275,7 @@ void remove_status_icon_danger(s32 iconID) { if (statusIcon->danger.active) { statusIcon->danger.active = FALSE; - free_hud_element(statusIcon->danger.activeElementID); + hud_element_free(statusIcon->danger.activeElementID); } } diff --git a/src/world/action/18.c b/src/world/action/18.c index c38f497464..36be40c186 100644 --- a/src/world/action/18.c +++ b/src/world/action/18.c @@ -1,10 +1,27 @@ #include "common.h" #include "world/actions.h" -s32 D_802B6300_E248D0[] = { - 0x000A0002, 0x000A002B, 0x000A002D, 0x000A002F, 0x000A0031, 0x000A0033, 0x000A0035, 0x000A0037, 0x000A0039, - 0x000A003B, 0x000A003D, 0x000A003F, 0x000A0041, 0x000A0043, 0x000A0045, 0x000A0047, 0x000A0049, 0x000A004B, - 0x000A004D +s32 State18PeachAnims[] = { + 0x000A0002, // none + 0x000A002B, // cream + 0x000A002D, // strawberry + 0x000A002F, // butter + 0x000A0031, // cleanser + 0x000A0033, // water + 0x000A0035, // milk + 0x000A0037, // flour + 0x000A0039, // egg + 0x000A003B, // complete cake + 0x000A003D, // cake bowl + 0x000A003F, // cake mixed + 0x000A0041, // cake pan + 0x000A0043, // cake batter + 0x000A0045, // cake bare + 0x000A0047, // salt + 0x000A0049, // sugar + 0x000A004B, // cake with icing + 0x000A004D, // cake with berries + 0x00000000 }; void func_802B6000_E245D0(void) { @@ -61,12 +78,12 @@ void func_802B6000_E245D0(void) { void func_802B6198_E24768(void) { if (!(gPlayerStatus.animFlags & 0x2000)) { if (!(gGameStatusPtr->peachFlags & 0x10)) { - suggest_player_anim_clearUnkFlag((D_802B6300_E248D0)[gGameStatusPtr->peachAnimIdx]); + suggest_player_anim_clearUnkFlag((State18PeachAnims)[gGameStatusPtr->peachCookingIngredient]); } else { suggest_player_anim_clearUnkFlag(0xD000D); // doood } } else { - peach_set_disguise_anim(world_actions_peachDisguises[gPlayerStatus.peachDisguise].unk_04); + peach_set_disguise_anim(BasicPeachDisguiseAnims[gPlayerStatus.peachDisguise].walk); } } @@ -76,12 +93,12 @@ void func_802B6230_E24800(void) { if (playerStatus->flags < 0) { playerStatus->flags &= ~0x80000000; suggest_player_anim_clearUnkFlag(0xA0005); - playerStatus->framesOnGround = 8; + playerStatus->currentStateTime = 8; } - if (playerStatus->framesOnGround != 0) { - playerStatus->framesOnGround--; - if (playerStatus->framesOnGround == 4) { + if (playerStatus->currentStateTime != 0) { + playerStatus->currentStateTime--; + if (playerStatus->currentStateTime == 4) { try_player_footstep_sounds(1); } } else { diff --git a/src/world/action/encounter.c b/src/world/action/encounter.c index 123e93b776..82681ef193 100644 --- a/src/world/action/encounter.c +++ b/src/world/action/encounter.c @@ -134,20 +134,20 @@ void func_802B6350_E28D80(void) { if (playerStatus->flags < 0) { playerStatus->flags &= ~(0x80000000 | 0x80000 | 0x8 | 0x4 | 0x2); playerStatus->fallState = 0; - playerStatus->framesOnGround = 0; + playerStatus->currentStateTime = 0; playerStatus->decorationList = 0; playerStatus->unk_C2 = 0; playerStatus->currentSpeed = 0.0f; - playerStatus->unk_8C = 0.0f; + playerStatus->pitch = 0.0f; if (playerStatus->animFlags & 0x1000) { return; } - playerStatus->framesOnGround = 5; + playerStatus->currentStateTime = 5; } - playerStatus->framesOnGround--; - if (playerStatus->framesOnGround == 0) { + playerStatus->currentStateTime--; + if (playerStatus->currentStateTime == 0) { set_action_state(ACTION_STATE_IDLE); } } @@ -161,13 +161,13 @@ void func_802B63D4_E28E04(void) { playerStatus->decorationList = 0; playerStatus->unk_C2 = 0; playerStatus->currentSpeed = 0.0f; - playerStatus->unk_8C = 0.0f; + playerStatus->pitch = 0.0f; suggest_player_anim_setUnkFlag(0x10017); - playerStatus->framesOnGround = 30; + playerStatus->currentStateTime = 30; } - if (playerStatus->framesOnGround != 0) { - playerStatus->framesOnGround--; + if (playerStatus->currentStateTime != 0) { + playerStatus->currentStateTime--; } else if (!gGameStatusPtr->isBattle) { set_action_state(ACTION_STATE_IDLE); } @@ -179,10 +179,10 @@ void func_802B6478_E28EA8(void) { if (playerStatus->flags < 0) { playerStatus->flags &= ~0x80000000; playerStatus->flags |= 0x80000; - playerStatus->framesOnGround = 0; + playerStatus->currentStateTime = 0; playerStatus->fallState = 0; playerStatus->currentSpeed = 0.0f; - playerStatus->unk_8C = 0.0f; + playerStatus->pitch = 0.0f; suggest_player_anim_setUnkFlag(0x1001F); } @@ -202,7 +202,7 @@ void func_802B6508_E28F38(void) { playerStatus->flags &= ~0x80000000; playerStatus->currentSpeed = 0.0f; playerStatus->unk_60 = 0; - playerStatus->framesOnGround = 5; + playerStatus->currentStateTime = 5; player_input_to_move_vector(&angle, &magnitude); if (((angle >= 45.0f) && (angle <= 135.0f)) || ((angle >= 225.0f) && (angle <= 315.0f))) { @@ -215,9 +215,9 @@ void func_802B6508_E28F38(void) { check_input_jump(); if (playerStatus->animFlags & 0x800000) { - if (playerStatus->framesOnGround != 0) { - playerStatus->framesOnGround--; - if (playerStatus->framesOnGround == 0) { + if (playerStatus->currentStateTime != 0) { + playerStatus->currentStateTime--; + if (playerStatus->currentStateTime == 0) { set_action_state(ACTION_STATE_IDLE); } } @@ -238,20 +238,20 @@ void func_802B6638_E29068(void) { if (!(playerStatus->animFlags & 0x2000)) { suggest_player_anim_setUnkFlag(0xC0000); } else { - peach_set_disguise_anim(world_actions_peachDisguises[playerStatus->peachDisguise].unk_0C); + peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].talk); } } - playerStatus->framesOnGround = 30; + playerStatus->currentStateTime = 30; } if (playerStatus->animFlags & 0x1000) { - if (playerStatus->framesOnGround != 0) { - playerStatus->framesOnGround--; + if (playerStatus->currentStateTime != 0) { + playerStatus->currentStateTime--; } else if (playerStatus->unk_C4 == 0) { if (!(playerStatus->animFlags & 0x2000)) { suggest_player_anim_setUnkFlag(0xA0001); } else { - peach_set_disguise_anim(world_actions_peachDisguises[playerStatus->peachDisguise].idle); + peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].idle); } } } diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c index 3add102189..dd5e19e398 100644 --- a/src/world/action/hammer.c +++ b/src/world/action/hammer.c @@ -1,62 +1,59 @@ #include "common.h" #include "effects.h" -typedef struct HammerUnk { - /* 0x00 */ Vec3f unk_00; +typedef struct HammerHitData { + /* 0x00 */ Vec3f hitPos; /* 0x0C */ s32 unk_0C; - /* 0x10 */ s32 unk_10; + /* 0x10 */ s32 hitID; /* 0x14 */ s32 unk_14; - /* 0x18 */ s32 unk_18; + /* 0x18 */ s32 timer; /* 0x1C */ s32 unk_1C; -} HammerUnk; +} HammerHitData; -extern HammerUnk* D_802B6DB0_E25C80; +extern HammerHitData* HammerHit; -s32 func_802B6000_E24ED0(s32 arg0) { - if (arg0 & 0x1000000) { +s32 action_hammer_is_swinging_away(s32 animID) { + if (animID & 0x1000000) { return TRUE; } - switch (arg0 + ~0x6000F) { - case 1: - case 3: - case 5: - case 7: - case 9: - case 11: + // away-facing swing anims + switch (animID) { + case 0x60011: + case 0x60013: + case 0x60015: + case 0x60017: + case 0x60019: + case 0x6001B: return TRUE; } return FALSE; } -void func_802B6048_E24F18(s32 arg0) { +void action_hammer_play_hit_fx(s32 hitID) { PlayerStatus* playerStatus = &gPlayerStatus; - f32 phi_f24; - s32 s2temp; - s32 phi_s1; + f32 shakeAmt; + s32 time; + s32 radius; s32 soundID; - f32 theta; - f32 sinTheta; - f32 cosTheta; - s32 phi_s3; - f32 xTemp; - f32 yTemp; - f32 zTemp; + f32 theta, sinTheta, cosTheta; + s32 numParticles; + f32 x, y, z; if (gPlayerData.hammerLevel == 2) { - phi_f24 = 1.2f; - s2temp = 1; - phi_s1 = 28; + shakeAmt = 1.2f; + time = 1; + radius = 28; soundID = 0x211A; } else if (gPlayerData.hammerLevel == 1) { - phi_f24 = 0.8f; - s2temp = 1; - phi_s1 = 16; + shakeAmt = 0.8f; + time = 1; + radius = 16; soundID = 0x2119; } else { - phi_f24 = 0.4f; - s2temp = 1; - phi_s1 = 4; + shakeAmt = 0.4f; + time = 1; + radius = 4; soundID = 0x2118; } @@ -64,21 +61,21 @@ void func_802B6048_E24F18(s32 arg0) { sinTheta = sin_rad(theta) * 25.0f; cosTheta = cos_rad(theta) * -25.0f; - if (arg0 < 0) { - phi_s3 = 6; - xTemp = playerStatus->position.x + sinTheta; - yTemp = playerStatus->position.y; - zTemp = playerStatus->position.z + cosTheta; + if (hitID < 0) { + numParticles = 6; + x = playerStatus->position.x + sinTheta; + y = playerStatus->position.y; + z = playerStatus->position.z + cosTheta; } else { - phi_s3 = 3; - xTemp = D_802B6DB0_E25C80->unk_00.x + sinTheta; - yTemp = D_802B6DB0_E25C80->unk_00.y + playerStatus->colliderHeight - 5.0f; - zTemp = D_802B6DB0_E25C80->unk_00.z + cosTheta; - phi_s1 = 1; + numParticles = 3; + x = HammerHit->hitPos.x + sinTheta; + y = HammerHit->hitPos.y + playerStatus->colliderHeight - 5.0f; + z = HammerHit->hitPos.z + cosTheta; + radius = 1; } - exec_ShakeCamX(0, 2, s2temp, phi_f24); - fx_smoke_impact(0, xTemp, yTemp, zTemp, phi_s1, phi_s3, 0, (s2temp + 3) * 3); + exec_ShakeCamX(0, 2, time, shakeAmt); + fx_smoke_impact(0, x, y, z, radius, numParticles, 0, (time + 3) * 3); switch (is_ability_active(ABILITY_ATTACK_FX)) { case 1: @@ -107,41 +104,41 @@ void func_802B6048_E24F18(s32 arg0) { INCLUDE_ASM(s32, "world/action/hammer", func_802B62A4_E25174); -void func_802B66A8_E25578(void) { +void action_hammer_update(void) { PlayerStatus* playerStatus = &gPlayerStatus; - D_802B6DB0_E25C80->unk_1C = 0; + HammerHit->unk_1C = 0; - if (playerStatus->flags < 0) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { s32 animID; s32 soundID; - playerStatus->flags &= ~0x80000000; - playerStatus->flags |= 0x200000; - D_802B6DB0_E25C80->unk_18 = 0; + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; + playerStatus->flags |= PLAYER_STATUS_FLAGS_200000; + HammerHit->timer = 0; playerStatus->fallState = 0; playerStatus->currentSpeed = 0.0f; playerStatus->unk_BC = 0; - D_802B6DB0_E25C80->unk_10 = func_802B62A4_E25174(D_802B6DB0_E25C80); + HammerHit->hitID = func_802B62A4_E25174(HammerHit); if (gPlayerData.hammerLevel == 2) { soundID = 0x2117; animID = 0x6001A; - if (D_802B6DB0_E25C80->unk_10 < 0) { - animID = 0x60018; + if (HammerHit->hitID < 0) { soundID = 0x2117; + animID = 0x60018; } } else if (gPlayerData.hammerLevel == 1) { soundID = 0x2116; animID = 0x60016; - if (D_802B6DB0_E25C80->unk_10 < 0) { + if (HammerHit->hitID < 0) { soundID = 0x2116; animID = 0x60014; } } else { soundID = 0x2115; animID = 0x60012; - if (D_802B6DB0_E25C80->unk_10 < 0) { + if (HammerHit->hitID < 0) { soundID = 0x2115; animID = 0x60010; } @@ -149,17 +146,17 @@ void func_802B66A8_E25578(void) { suggest_player_anim_clearUnkFlag(animID); sfx_play_sound_at_player(soundID, 0); - D_802B6DB0_E25C80->unk_0C = 0; - D_802B6DB0_E25C80->unk_14 = 0; + HammerHit->unk_0C = 0; + HammerHit->unk_14 = 0; } - playerStatus->flags &= ~0x1000000; - if (D_802B6DB0_E25C80->unk_18 < 3 && (playerStatus->flags & 0x40000)) { - playerStatus->flags |= 0x20000000; - } else if (D_802B6DB0_E25C80->unk_18 < 2) { - D_802B6DB0_E25C80->unk_18++; + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_1000000; + if (HammerHit->timer < 3 && (playerStatus->flags & PLAYER_STATUS_FLAGS_40000)) { + playerStatus->flags |= PLAYER_STATUS_FLAGS_20000000; + } else if (HammerHit->timer < 2) { + HammerHit->timer++; } else { - func_802B6820_E256F0(D_802B6DB0_E25C80); + func_802B6820_E256F0(HammerHit); } } diff --git a/src/world/action/hit_fire.c b/src/world/action/hit_fire.c index 8c9bc75800..c7ea34c397 100644 --- a/src/world/action/hit_fire.c +++ b/src/world/action/hit_fire.c @@ -8,10 +8,10 @@ void func_802B6000_E27C90(void) { f32 cosTheta; f32 speed; - if (playerStatus->flags < 0) { - playerStatus->flags &= ~0x80000000; - playerStatus->animFlags |= 4; - playerStatus->flags |= (0x800 | 0x8); + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; + playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_4; + playerStatus->flags |= (PLAYER_STATUS_FLAGS_800 | PLAYER_STATUS_FLAGS_FLYING); suggest_player_anim_setUnkFlag(0x10019); playerStatus->fallState = 0; playerStatus->gravityIntegrator[0] = 18.3473f; @@ -50,7 +50,7 @@ void func_802B6000_E27C90(void) { if (collider >= 0) { collider = get_collider_type_by_id(collider); set_action_state(ACTION_STATE_LAND); - playerStatus->unk_10 = 60; + playerStatus->blinkTimer = 60; playerStatus->unk_BF = 0; playerStatus->flags &= ~0x800; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; diff --git a/src/world/action/hit_lava.c b/src/world/action/hit_lava.c index 4d12dc74d3..13877d0384 100644 --- a/src/world/action/hit_lava.c +++ b/src/world/action/hit_lava.c @@ -25,7 +25,7 @@ void func_802B6000_E27F40(void) { playerStatus->flags |= 0x800; if (playerStatus->unk_BF == 1) { playerStatus->fallState = 0x14; - playerStatus->framesOnGround = 2; + playerStatus->currentStateTime = 2; } else { playerStatus->fallState = 0; } @@ -43,12 +43,12 @@ void func_802B6000_E27F40(void) { switch (playerStatus->fallState) { case 21: - if (--playerStatus->framesOnGround == -1) { + if (--playerStatus->currentStateTime == -1) { playerStatus->fallState = 0; } break; case 20: - if (--playerStatus->framesOnGround == -1) { + if (--playerStatus->currentStateTime == -1) { playerStatus->fallState = 0; } playerStatus->position.y -= 4.0f; @@ -62,17 +62,17 @@ void func_802B6000_E27F40(void) { playerStatus->decorationList = 0; playerStatus->unk_C2 = 0; playerStatus->fallState = 2; - playerStatus->framesOnGround = 1; + playerStatus->currentStateTime = 1; playerStatus->gravityIntegrator[0] = 20.0f; playerStatus->gravityIntegrator[2] = 250.0f; playerStatus->gravityIntegrator[3] = D_802B68BC; - playerStatus->unk_3C = playerStatus->position.x; - playerStatus->unk_40 = playerStatus->position.z; - playerStatus->unk_4C = playerStatus->position.y; + playerStatus->jumpFromPos.x = playerStatus->position.x; + playerStatus->jumpFromPos.z = playerStatus->position.z; + playerStatus->jumpFromHeight = playerStatus->position.y; playerStatus->flags |= 0x2; break; case 1: - if (--playerStatus->framesOnGround << 16 <= 0) { + if (--playerStatus->currentStateTime << 16 <= 0) { playerStatus->fallState++; } break; @@ -180,12 +180,12 @@ void func_802B6000_E27F40(void) { playerStatus->gravityIntegrator[0] = tempGravityIntegrator; playerStatus->position.y = player_check_collision_below(tempGravityIntegrator, &sp2C); if (sp2C >= 0) { - playerStatus->framesOnGround = 0xA; + playerStatus->currentStateTime = 0xA; playerStatus->fallState++; } break; case 8: - if (--playerStatus->framesOnGround << 16 <= 0) { + if (--playerStatus->currentStateTime << 16 <= 0) { set_action_state(ACTION_STATE_LAND); playerStatus->flags &= ~0x800000; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; diff --git a/src/world/action/idle.c b/src/world/action/idle.c index f9dfccf55a..211052efc3 100644 --- a/src/world/action/idle.c +++ b/src/world/action/idle.c @@ -1,40 +1,59 @@ #include "common.h" #include "../actions.h" -s32 world_action_idle_peachAnims[] = { - 0x000A0001, // Idle - - // Cooking: - 0x000A0007, 0x000A0009, 0x000A000B, 0x000A000D, 0x000A000F, 0x000A0011, 0x000A0013, - 0x000A0015, 0x000A0017, 0x000A0019, 0x000A001B, 0x000A001D, 0x000A001F, 0x000A0021, 0x000A0023, - 0x000A0025, 0x000A0027, 0x000A0029, 0x00000000, +s32 IdlePeachAnims[] = { + 0x000A0001, // none + 0x000A0007, // cream + 0x000A0009, // strawberry + 0x000A000B, // butter + 0x000A000D, // cleanser + 0x000A000F, // water + 0x000A0011, // milk + 0x000A0013, // flour + 0x000A0015, // egg + 0x000A0017, // complete cake + 0x000A0019, // cake bowl + 0x000A001B, // cake mixed + 0x000A001D, // cake pan + 0x000A001F, // cake batter + 0x000A0021, // cake bare + 0x000A0023, // salt + 0x000A0025, // sugar + 0x000A0027, // cake with icing + 0x000A0029, // cake with berries + 0x00000000, }; -void func_802B61E4_E23444(void); +void action_idle_update_peach(void); -void world_action_idle_update(void) { +void action_idle_update(void) { PlayerStatus* playerStatus = &gPlayerStatus; PlayerData* playerData = &gPlayerData; s32 wasMoving = FALSE; if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) { - func_802B61E4_E23444(); + action_idle_update_peach(); return; } - playerStatus->framesOnGround++; + playerStatus->currentStateTime++; - if (playerStatus->flags & 0x80000000) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { s32 anim; - playerStatus->flags &= ~0x8008000E; + playerStatus->flags &= + ~(PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED + | PLAYER_STATUS_FLAGS_80000 + | PLAYER_STATUS_FLAGS_JUMPING + | PLAYER_STATUS_FLAGS_FALLING + | PLAYER_STATUS_FLAGS_FLYING); wasMoving = TRUE; playerStatus->fallState = 0; - playerStatus->framesOnGround = 0; + playerStatus->currentStateTime = 0; playerStatus->decorationList = 0; playerStatus->unk_C2 = 0; playerStatus->currentSpeed = 0.0f; - playerStatus->unk_8C = 0.0f; + playerStatus->pitch = 0.0f; if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) { anim = 0x90002; @@ -48,8 +67,8 @@ void world_action_idle_update(void) { suggest_player_anim_clearUnkFlag(anim); } - if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_GET_STAR_SPIRIT) { - set_action_state(ACTION_STATE_GET_STAR_SPIRIT); + if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_RAISED_ARMS) { + set_action_state(ACTION_STATE_RAISE_ARMS); } else { f32 angle; f32 magnitude; @@ -65,72 +84,75 @@ void world_action_idle_update(void) { if (magnitude == 0.0f) { playerData->idleFrameCounter++; } else { - playerStatus->framesOnGround = 0; + playerStatus->currentStateTime = 0; set_action_state(ACTION_STATE_WALK); if (magnitude != 0.0f) { playerStatus->targetYaw = angle; - playerStatus->animFlags &= ~0x80000000; + playerStatus->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_80000000; } } } } } -void func_802B61E4_E23444(void) { +void action_idle_update_peach(void) { PlayerStatus* playerStatus = &gPlayerStatus; PlayerData* playerData = &gPlayerData; f32 angle; f32 magnitude; - if (playerStatus->flags & 0x80000000) { - playerStatus->flags &= ~0x80000000; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; playerStatus->fallState = 0; - playerStatus->framesOnGround = 0; + playerStatus->currentStateTime = 0; playerStatus->decorationList = 0; playerStatus->unk_C2 = 0; playerStatus->currentSpeed = 0.0f; - playerStatus->flags &= ~0xE; + playerStatus->flags &= + ~(PLAYER_STATUS_FLAGS_JUMPING + | PLAYER_STATUS_FLAGS_FALLING + | PLAYER_STATUS_FLAGS_FLYING); if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE)) { - if (!(gGameStatusPtr->peachFlags & 0x10)) { - suggest_player_anim_clearUnkFlag(world_action_idle_peachAnims[gGameStatusPtr->peachAnimIdx]); + if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { + suggest_player_anim_clearUnkFlag(IdlePeachAnims[gGameStatusPtr->peachCookingIngredient]); } else { suggest_player_anim_clearUnkFlag(0xC000E); } } else { - peach_set_disguise_anim(world_actions_peachDisguises[gPlayerStatus.peachDisguise].idle); + peach_set_disguise_anim(BasicPeachDisguiseAnims[gPlayerStatus.peachDisguise].idle); } } - if (!(playerStatus->animFlags & 0x2000)) { + if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE)) { switch (playerStatus->fallState) { case 0: - if (((playerStatus->flags & 0x3000) == 0) && (playerStatus->unk_C4 == 0)) { - if (playerStatus->framesOnGround > 1800) { + if (!(playerStatus->flags & (PLAYER_STATUS_FLAGS_1000 | PLAYER_STATUS_FLAGS_INPUT_DISABLED)) && (playerStatus->unk_C4 == 0)) { + if (playerStatus->currentStateTime > 1800) { playerStatus->fallState++; suggest_player_anim_clearUnkFlag(0xC0003); return; } - playerStatus->framesOnGround++; + playerStatus->currentStateTime++; } break; case 1: if (playerStatus->unk_BC != 0) { playerStatus->fallState++; - playerStatus->framesOnGround = 0; + playerStatus->currentStateTime = 0; suggest_player_anim_clearUnkFlag(0xA0001); } break; case 2: { - playerStatus->framesOnGround++; - if (playerStatus->framesOnGround > 200) { + playerStatus->currentStateTime++; + if (playerStatus->currentStateTime > 200) { playerStatus->fallState++; suggest_player_anim_clearUnkFlag(0xC0003); } break; } case 3: - if ((playerStatus->flags & 0x3000) != 0) { + if (playerStatus->flags & (PLAYER_STATUS_FLAGS_1000 | PLAYER_STATUS_FLAGS_INPUT_DISABLED)) { suggest_player_anim_clearUnkFlag(0xA0001); playerStatus->fallState = 0; } else if (playerStatus->unk_BC != 0) { @@ -144,7 +166,7 @@ void func_802B61E4_E23444(void) { phys_update_interact_collider(); if (magnitude != 0.0f) { - playerStatus->framesOnGround = 0; + playerStatus->currentStateTime = 0; playerStatus->targetYaw = angle; set_action_state(ACTION_STATE_WALK); } diff --git a/src/world/action/jump.c b/src/world/action/jump.c index 231164114d..8e4fe9d5bd 100644 --- a/src/world/action/jump.c +++ b/src/world/action/jump.c @@ -16,9 +16,9 @@ void func_802B6000_E24040(void) { playerStatus->unk_C2 = 0; playerStatus->flags &= ~0x80000008; playerStatus->flags |= 2; - playerStatus->unk_3C = playerStatus->position.x; - playerStatus->unk_40 = playerStatus->position.z; - playerStatus->unk_4C = playerStatus->position.y; + playerStatus->jumpFromPos.x = playerStatus->position.x; + playerStatus->jumpFromPos.z = playerStatus->position.z; + playerStatus->jumpFromHeight = playerStatus->position.y; phys_init_integrator_for_current_state(); diff --git a/src/world/action/land.c b/src/world/action/land.c index 47f238cdfc..1424bff3ad 100644 --- a/src/world/action/land.c +++ b/src/world/action/land.c @@ -22,15 +22,15 @@ void func_802B6000_E24920(void) { PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED | PLAYER_STATUS_FLAGS_800000 | PLAYER_STATUS_FLAGS_80000 | - PLAYER_STATUS_FLAGS_8 | + PLAYER_STATUS_FLAGS_FLYING | PLAYER_STATUS_FLAGS_FALLING | PLAYER_STATUS_FLAGS_JUMPING ); playerStatus->fallState = 0; playerStatus->decorationList = 0; playerStatus->unk_C2 = 0; - playerStatus->decorationPos[0] = playerStatus->position.x; - playerStatus->decorationPos[1] = playerStatus->position.z; + playerStatus->landPos.x = playerStatus->position.x; + playerStatus->landPos.z = playerStatus->position.z; if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) { phi_a0 = 0x90000; @@ -90,15 +90,15 @@ void func_802B61C0_E24AE0(void) { PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED | PLAYER_STATUS_FLAGS_800000 | PLAYER_STATUS_FLAGS_80000 | - PLAYER_STATUS_FLAGS_8 | + PLAYER_STATUS_FLAGS_FLYING | PLAYER_STATUS_FLAGS_FALLING | PLAYER_STATUS_FLAGS_JUMPING ); playerStatus->fallState = 0; playerStatus->decorationList = 0; playerStatus->unk_C2 = 0; - playerStatus->decorationPos[0] = playerStatus->position.x; - playerStatus->decorationPos[1] = playerStatus->position.z; + playerStatus->landPos.x = playerStatus->position.x; + playerStatus->landPos.z = playerStatus->position.z; if (!(currentCollisionStatus->currentFloor & 0x4000)) { phys_adjust_cam_on_landing(); @@ -133,9 +133,9 @@ void func_802B62CC_E24BEC(void) { playerStatus->fallState = 0; playerStatus->decorationList = 0; playerStatus->unk_C2 = 0; - playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_8 | PLAYER_STATUS_FLAGS_FALLING | PLAYER_STATUS_FLAGS_JUMPING); - playerStatus->decorationPos[0] = playerStatus->position.x; - playerStatus->decorationPos[1] = playerStatus->position.z; + playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_FLYING | PLAYER_STATUS_FLAGS_FALLING | PLAYER_STATUS_FLAGS_JUMPING); + playerStatus->landPos.x = playerStatus->position.x; + playerStatus->landPos.z = playerStatus->position.z; sfx_play_sound_at_player(0x148, 0); @@ -183,9 +183,9 @@ void func_802B644C_E24D6C(void) { playerStatus->fallState = 0; playerStatus->decorationList = 0; playerStatus->unk_C2 = 0; - playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_8 | PLAYER_STATUS_FLAGS_FALLING | PLAYER_STATUS_FLAGS_JUMPING); - playerStatus->decorationPos[0] = playerStatus->position.x; - playerStatus->decorationPos[1] = playerStatus->position.z; + playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_FLYING | PLAYER_STATUS_FLAGS_FALLING | PLAYER_STATUS_FLAGS_JUMPING); + playerStatus->landPos.x = playerStatus->position.x; + playerStatus->landPos.z = playerStatus->position.z; if (!(currentCollisionStatus->currentFloor & 0x4000)) { phys_adjust_cam_on_landing(); diff --git a/src/world/action/slide.c b/src/world/action/slide.c index cc848c159d..e13db437a0 100644 --- a/src/world/action/slide.c +++ b/src/world/action/slide.c @@ -118,7 +118,7 @@ void func_802B6060_E27570(void) { sfx_play_sound_at_player(SOUND_172, 0); suggest_player_anim_setUnkFlag(0x10031); playerStatus->fallState = 6; - playerStatus->framesOnGround = 15; + playerStatus->currentStateTime = 15; playerStatus->currentSpeed = 0.0f; playerStatus->position.y = sp2C; } @@ -170,7 +170,7 @@ void func_802B6060_E27570(void) { if (playerStatus->unk_BC != 0) { suggest_player_anim_setUnkFlag(0x10031); sfx_play_sound_at_player(SOUND_172, 0); - playerStatus->framesOnGround = 15; + playerStatus->currentStateTime = 15; playerStatus->fallState++; } break; @@ -179,7 +179,7 @@ void func_802B6060_E27570(void) { if (playerStatus->currentSpeed <= 0.0f) { playerStatus->currentSpeed = 0.0f; } - if (--playerStatus->framesOnGround == 0) { + if (--playerStatus->currentStateTime == 0) { playerStatus->fallState++; } break; diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c index c0d89d196d..b9acd938b6 100644 --- a/src/world/action/sneaky_parasol.c +++ b/src/world/action/sneaky_parasol.c @@ -71,7 +71,7 @@ void func_802B6120_E2A7D0(void) { playerStatus->decorationList = 0; playerStatus->unk_C2 = 0; playerStatus->currentSpeed = 0; - playerStatus->unk_8C = 0; + playerStatus->pitch = 0; phi_f4 = -2; if (playerStatus->spriteFacingAngle >= 90 && playerStatus->spriteFacingAngle < 270) { @@ -79,13 +79,13 @@ void func_802B6120_E2A7D0(void) { } *tempUnk_1C = phi_f4; if (!(playerStatus->animFlags & 0x2000)) { - playerStatus->framesOnGround = 20; + playerStatus->currentStateTime = 20; playerStatus->fallState = 0; parasolStruct->unk_08 = 0xF; parasolStruct->npc = func_802B6000_E2A6B0(); } else { playerStatus->fallState = 0x14; - playerStatus->framesOnGround = 40; + playerStatus->currentStateTime = 40; parasolStruct->unk_04 = 1; parasolStruct->unk_0C = 0xC; temp_v0 = get_npc_by_index(D_8010C96C); @@ -105,12 +105,12 @@ void func_802B6120_E2A7D0(void) { } else { suggest_player_anim_clearUnkFlag(0xC0027); playerStatus->fallState = 0x32; - playerStatus->framesOnGround = 10; + playerStatus->currentStateTime = 10; parasolStruct->unk_08 = 0; } } case 1: - if (--playerStatus->framesOnGround == 0) { + if (--playerStatus->currentStateTime == 0) { suggest_player_anim_clearUnkFlag(0xC0025); playerStatus->fallState = 2; if (parasolStruct->npc == NULL) { @@ -122,15 +122,15 @@ void func_802B6120_E2A7D0(void) { break; case 2: if (playerStatus->unk_BC != 0) { - playerStatus->framesOnGround = 12; + playerStatus->currentStateTime = 12; playerStatus->flags |= 0x100000; playerStatus->fallState++; sfx_play_sound_at_player(0xFD, 0); } break; case 3: - if (--playerStatus->framesOnGround == 0) { - playerStatus->framesOnGround = 10; + if (--playerStatus->currentStateTime == 0) { + playerStatus->currentStateTime = 10; parasolStruct->unk_0C = 0xA; playerStatus->fallState++; } @@ -140,7 +140,7 @@ void func_802B6120_E2A7D0(void) { temp_f20 = playerStatus->spriteFacingAngle; func_802B6CF0_E2B3A0(); playerStatus->targetYaw = clamp_angle((cam->currentYaw - playerStatus->spriteFacingAngle) - 90); - if (playerStatus->framesOnGround == 0) { + if (playerStatus->currentStateTime == 0) { phi_v0 = 0; if (parasolStruct->unk_1C > 0) { if (temp_f20 < 270 && playerStatus->spriteFacingAngle >= 270) { @@ -152,14 +152,14 @@ void func_802B6120_E2A7D0(void) { } if (phi_v0 != 0) { playerStatus->fallState = 6; - playerStatus->framesOnGround = 2; + playerStatus->currentStateTime = 2; if (peach_make_disguise_npc(playerStatus->unk_0D) != 0) { playerStatus->fallState = 5; peach_sync_disguise_npc(); } } } else { - playerStatus->framesOnGround--; + playerStatus->currentStateTime--; } break; case 5: @@ -168,7 +168,7 @@ void func_802B6120_E2A7D0(void) { gameStatus->peachFlags |= 2; playerStatus->fallState++; case 6: - if (--playerStatus->framesOnGround == 0) { + if (--playerStatus->currentStateTime == 0) { playerStatus->fallState++; } func_802B6CF0_E2B3A0(); @@ -178,7 +178,7 @@ void func_802B6120_E2A7D0(void) { parasolStruct->unk_20 -= 2.35; if (parasolStruct->unk_20 <= 0) { parasolStruct->unk_20 = 0; - playerStatus->framesOnGround = 10; + playerStatus->currentStateTime = 10; playerStatus->fallState++; playerStatus->spriteFacingAngle = 180; temp_v0 = get_npc_by_index(D_8010C96C); @@ -192,7 +192,7 @@ void func_802B6120_E2A7D0(void) { parasolStruct->unk_20 += 2.35; if (parasolStruct->unk_20 >= 0) { parasolStruct->unk_20 = 0; - playerStatus->framesOnGround = 10; + playerStatus->currentStateTime = 10; playerStatus->spriteFacingAngle = 0; playerStatus->fallState++; temp_v0 = get_npc_by_index(D_8010C96C); @@ -210,7 +210,7 @@ void func_802B6120_E2A7D0(void) { playerStatus->targetYaw = clamp_angle(phi_f12_2 - 90); break; case 8: - if (--playerStatus->framesOnGround == 0) { + if (--playerStatus->currentStateTime == 0) { set_time_freeze_mode(TIME_FREEZE_NORMAL); temp_v0 = get_npc_by_index(D_8010C96C); temp_v0->flags &= ~0x40000; @@ -220,7 +220,7 @@ void func_802B6120_E2A7D0(void) { } break; case 20: - if (--playerStatus->framesOnGround == 0) { + if (--playerStatus->currentStateTime == 0) { playerStatus->fallState++; } func_802B6CF0_E2B3A0(); @@ -230,7 +230,7 @@ void func_802B6120_E2A7D0(void) { temp_f20_2 = playerStatus->spriteFacingAngle; func_802B6CF0_E2B3A0(); playerStatus->targetYaw = clamp_angle((cam->currentYaw - playerStatus->spriteFacingAngle) - 90); - if (playerStatus->framesOnGround == 0) { + if (playerStatus->currentStateTime == 0) { phi_v0_2 = 0; if (parasolStruct->unk_1C > 0) { if (temp_f20_2 < 270 && playerStatus->spriteFacingAngle >= 270) { @@ -241,7 +241,7 @@ void func_802B6120_E2A7D0(void) { phi_v0_2 = 1; } if (phi_v0_2 != 0) { - playerStatus->framesOnGround = 2; + playerStatus->currentStateTime = 2; playerStatus->fallState++; gameStatus2 = gGameStatusPtr; playerStatus->animFlags &= -0x2001; @@ -252,11 +252,11 @@ void func_802B6120_E2A7D0(void) { playerStatus->colliderDiameter = 0x26; } } else { - playerStatus->framesOnGround--; + playerStatus->currentStateTime--; } break; case 22: - if (--playerStatus->framesOnGround == 0) { + if (--playerStatus->currentStateTime == 0) { playerStatus->fallState++; } func_802B6CF0_E2B3A0(); @@ -266,7 +266,7 @@ void func_802B6120_E2A7D0(void) { parasolStruct->unk_20 -= 2.35; if (parasolStruct->unk_20 <= 0) { parasolStruct->unk_20 = 0; - playerStatus->framesOnGround = 10; + playerStatus->currentStateTime = 10; playerStatus->fallState++; playerStatus->spriteFacingAngle = 180; D_8010C95C = 1; @@ -279,7 +279,7 @@ void func_802B6120_E2A7D0(void) { parasolStruct->unk_20 += 2.35; if (parasolStruct->unk_20 >= 0) { parasolStruct->unk_20 = 0; - playerStatus->framesOnGround = 10; + playerStatus->currentStateTime = 10; playerStatus->spriteFacingAngle = 0; playerStatus->fallState++; D_8010C95C = 0; @@ -294,7 +294,7 @@ void func_802B6120_E2A7D0(void) { playerStatus->targetYaw = clamp_angle(cam->currentYaw - temp_f0_3 - 90); break; case 24: - if (--playerStatus->framesOnGround == 0) { + if (--playerStatus->currentStateTime == 0) { set_time_freeze_mode(TIME_FREEZE_NORMAL); playerStatus->flags &= ~0x100000; set_action_state(ACTION_STATE_IDLE); @@ -312,7 +312,7 @@ void func_802B6120_E2A7D0(void) { } break; case 50: - if (--playerStatus->framesOnGround == 0) { + if (--playerStatus->currentStateTime == 0) { set_action_state(ACTION_STATE_IDLE); enable_player_static_collisions(); } diff --git a/src/world/action/super_boots.c b/src/world/action/super_boots.c index 9df3a27359..8a6c00dec0 100644 --- a/src/world/action/super_boots.c +++ b/src/world/action/super_boots.c @@ -34,9 +34,9 @@ void func_802B6000_E26DE0(void) { switch (playerStatus->fallState) { case 0: D_802B6730 = 40.0f; - playerStatus->unk_8C += 40.0f; - if (playerStatus->unk_8C >= 360.0f) { - playerStatus->unk_8C = 360.0f; + playerStatus->pitch += 40.0f; + if (playerStatus->pitch >= 360.0f) { + playerStatus->pitch = 360.0f; } if (playerStatus->gravityIntegrator[0] >= 0.0f) { playerStatus->gravityIntegrator[0] -= 0.54; @@ -49,9 +49,9 @@ void func_802B6000_E26DE0(void) { } } } - if (playerStatus->unk_8C == 360.0f) { + if (playerStatus->pitch == 360.0f) { if (playerStatus->gravityIntegrator[0] <= 0.0f) { - playerStatus->framesOnGround = 5; + playerStatus->currentStateTime = 5; playerStatus->fallState = 2; playerStatus->gravityIntegrator[0] = 2.0f; } @@ -65,16 +65,16 @@ void func_802B6000_E26DE0(void) { playerStatus->position.y += playerStatus->gravityIntegrator[0]; } } - if (--playerStatus->framesOnGround <= 0) { + if (--playerStatus->currentStateTime <= 0) { playerStatus->fallState++; } break; case 3: playerStatus->position.y = player_check_collision_below(0.0f, &sp10); D_802B6730 = 45.0f; - playerStatus->unk_8C += 45.0f; - if (playerStatus->unk_8C >= 360.0) { - playerStatus->unk_8C = 0.0f; + playerStatus->pitch += 45.0f; + if (playerStatus->pitch >= 360.0) { + playerStatus->pitch = 0.0f; playerStatus->fallState++; playerStatus->gravityIntegrator[1] = -3.4744f; playerStatus->gravityIntegrator[2] = 0.4704f; @@ -120,7 +120,7 @@ void func_802B6000_E26DE0(void) { playerStatus->actionState = ACTION_STATE_GROUND_POUND; playerStatus->decorationList = 0; playerStatus->unk_280 = 0xC; - playerStatus->unk_8C = 0.0f; + playerStatus->pitch = 0.0f; playerStatus->fallState++; exec_ShakeCam1(0, 0, 4); sfx_play_sound_at_player(0x149, 0); diff --git a/src/world/action/ultra_boots.c b/src/world/action/ultra_boots.c index ece23bae45..4cf6f19dec 100644 --- a/src/world/action/ultra_boots.c +++ b/src/world/action/ultra_boots.c @@ -38,16 +38,16 @@ void func_802B6000_E26710(void) { if (temp_f0 <= 180.0f) { phi_f4 = 60.0f; } - playerStatus->unk_D4 = phi_f4; + playerStatus->spinRate = phi_f4; } if (playerStatus->fallState < 4) { - if (playerStatus->unk_D4 >= 0.0f) { - playerStatus->spriteFacingAngle += playerStatus->unk_D4; + if (playerStatus->spinRate >= 0.0f) { + playerStatus->spriteFacingAngle += playerStatus->spinRate; if (playerStatus->spriteFacingAngle >= 360.0f) { playerStatus->spriteFacingAngle -= 360.0f; } } else { - playerStatus->spriteFacingAngle += playerStatus->unk_D4; + playerStatus->spriteFacingAngle += playerStatus->spinRate; if (playerStatus->spriteFacingAngle < 0.0f) { playerStatus->spriteFacingAngle += 360.0f; } @@ -78,7 +78,7 @@ void func_802B6000_E26710(void) { } if (temp_f20 <= 0.0f) { record_jump_apex(); - playerStatus->framesOnGround = 3; + playerStatus->currentStateTime = 3; playerStatus->flags |= 4; playerStatus->fallState++; sfx_play_sound_at_player(0x147, 0); @@ -89,7 +89,7 @@ void func_802B6000_E26710(void) { } break; case 1: - if (--playerStatus->framesOnGround <= 0) { + if (--playerStatus->currentStateTime <= 0) { playerStatus->fallState++; } break; @@ -136,7 +136,7 @@ void func_802B6000_E26710(void) { playerStatus->flags &= ~0x00020008; return; } - playerStatus->framesOnGround = 8; + playerStatus->currentStateTime = 8; playerStatus->decorationList = 0; playerStatus->actionState = 0x10; playerStatus->fallState++; @@ -151,7 +151,7 @@ void func_802B6000_E26710(void) { } break; case 3: - if (--playerStatus->framesOnGround == 0) { + if (--playerStatus->currentStateTime == 0) { playerStatus->fallState++; playerStatus->flags &= ~0x00020008; set_action_state(ACTION_STATE_LAND); diff --git a/src/world/action/use_munchlesia.c b/src/world/action/use_munchlesia.c index c58300a540..a484548836 100644 --- a/src/world/action/use_munchlesia.c +++ b/src/world/action/use_munchlesia.c @@ -61,13 +61,13 @@ void func_802B6000_E291A0(void) { if (playerStatus->unk_BC != 0) { suggest_player_anim_setUnkFlag(0x10030); playerStatus->fallState = 5; - playerStatus->framesOnGround = 15; + playerStatus->currentStateTime = 15; break; } break; case 5: - if (playerStatus->framesOnGround != 0) { - playerStatus->framesOnGround--; + if (playerStatus->currentStateTime != 0) { + playerStatus->currentStateTime--; break; } enable_player_static_collisions(); diff --git a/src/world/action/use_spinning_flower.c b/src/world/action/use_spinning_flower.c index 6c8ada3c03..f12f54d41c 100644 --- a/src/world/action/use_spinning_flower.c +++ b/src/world/action/use_spinning_flower.c @@ -49,7 +49,7 @@ void func_802B60A4_E29514(void) { gOverrideFlags |= GLOBAL_OVERRIDES_40; func_800EF300(); playerStatus->fallState = 1; - playerStatus->framesOnGround = 0; + playerStatus->currentStateTime = 0; D_802B6EE4 = 0.0f; D_802B6EE8 = 0.0f; D_802B6EF4 = playerStatus->position.y; @@ -80,8 +80,8 @@ void func_802B60A4_E29514(void) { D_802B6EE4 = 20.0f; } playerStatus->spriteFacingAngle = clamp_angle(playerStatus->spriteFacingAngle + D_802B6EE4); - if (playerStatus->framesOnGround < 10) { - playerStatus->framesOnGround++; + if (playerStatus->currentStateTime < 10) { + playerStatus->currentStateTime++; D_802B6EF4++; } D_802B6EE8 += 8.0f; @@ -115,7 +115,7 @@ void func_802B60A4_E29514(void) { gCameras->targetPos.z = playerStatus->position.z; sp20 = func_802B6000_E29470(); if (sp20 < 0 || !(sp20 & 0x4000)) { - playerStatus->framesOnGround = 20; + playerStatus->currentStateTime = 20; D_802B6EE8 = 0.0f; D_802B6EF4 = playerStatus->position.y; playerStatus->fallState++; @@ -125,7 +125,7 @@ void func_802B60A4_E29514(void) { if (gGameStatusPtr->pressedButtons & BUTTON_Z && !(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) { suggest_player_anim_setUnkFlag(0x10007); playerStatus->fallState = 3; - playerStatus->framesOnGround = 30; + playerStatus->currentStateTime = 30; D_802B6EE0 = 0.0f; gCollisionStatus.currentFloor = -1; exec_entity_commandlist(get_entity_by_index(D_802B6ED0)); @@ -184,8 +184,8 @@ void func_802B60A4_E29514(void) { gCameras->targetPos.z = playerStatus->position.z; gCameras->targetPos.x = playerStatus->position.x; gCameras->targetPos.y = playerStatus->position.y; - if (playerStatus->framesOnGround != 0) { - playerStatus->framesOnGround--; + if (playerStatus->currentStateTime != 0) { + playerStatus->currentStateTime--; D_802B6EE4 += 2.0f; if (D_802B6EE4 >= 45.0f) { D_802B6EE4 = 45.0f; @@ -194,7 +194,7 @@ void func_802B60A4_E29514(void) { break; } playerStatus->fallState++; - playerStatus->framesOnGround = 30; + playerStatus->currentStateTime = 30; phys_adjust_cam_on_landing(); break; case 1: @@ -219,24 +219,24 @@ void func_802B60A4_E29514(void) { playerStatus->fallState++; sp18 = atan2(playerStatus->position.x, playerStatus->position.z, D_802BCE34, D_802BCE32); sin_cos_rad(sp18 * TAU / 360.0f, &sp10, &sp14); - playerStatus->framesOnGround = 64; + playerStatus->currentStateTime = 64; D_802B6EEC = sp18; D_802B6ED4 = (sp10 * tempDistance) * 0.015625; D_802B6ED8 = (-sp14 * tempDistance) * 0.015625; } break; } - if (playerStatus->framesOnGround == 0) { + if (playerStatus->currentStateTime == 0) { playerStatus->fallState = 0xA; - playerStatus->framesOnGround = 20; + playerStatus->currentStateTime = 20; } else { - playerStatus->framesOnGround--; + playerStatus->currentStateTime--; } break; case 2: playerStatus->spriteFacingAngle = clamp_angle(playerStatus->spriteFacingAngle + D_802B6EE4); - if (playerStatus->framesOnGround != 0) { - playerStatus->framesOnGround--; + if (playerStatus->currentStateTime != 0) { + playerStatus->currentStateTime--; if (D_802B6EE0-- < 0.0f) { D_802B6EE0 = 0.0f; } @@ -262,8 +262,8 @@ void func_802B60A4_E29514(void) { } tempY = sin_rad(D_802B6EE0 * TAU / 360.0f) * 3.0f; playerStatus->position.y += tempY; - if (playerStatus->framesOnGround != 0) { - playerStatus->framesOnGround--; + if (playerStatus->currentStateTime != 0) { + playerStatus->currentStateTime--; break; } case 8: diff --git a/src/world/action/use_tweester.c b/src/world/action/use_tweester.c index 7f21fdec3a..b3e3e235af 100644 --- a/src/world/action/use_tweester.c +++ b/src/world/action/use_tweester.c @@ -2,70 +2,59 @@ #include "../partners.h" #include "npc.h" -typedef struct unkTweesterStruct{ - /* 0x000 */ s32 unk_00; - /* 0x004 */ char unk_04[8]; - /* 0x00C */ f32 unk_0C; - /* 0x010 */ f32 unk_10; - /* 0x014 */ f32 unk_14; - /* 0x018 */ f32 unk_18; -}unkTweesterStruct; - -extern s8* D_8010C934; -extern struct unkTweesterStruct* D_802B6350_E2A690; +extern Entity* TweesterTouchingPlayer; +extern struct TweesterPhysics* PlayerTweesterPhysics; void func_802B6000_E2A340(void) { PlayerStatus* playerStatus = &gPlayerStatus; + f32 sinAngle, cosAngle, liftoffVelocity; Entity* entity; - f32 sp10; - f32 sp14; - f32 tempY; - entity = D_8010C934; - if (playerStatus->flags & (1 << 31)) { - playerStatus->flags &= ~0x80000000; + entity = TweesterTouchingPlayer; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; disable_player_static_collisions(); disable_player_input(); - playerStatus->flags |= 0x100008; + playerStatus->flags |= (PLAYER_STATUS_FLAGS_100000 | PLAYER_STATUS_FLAGS_FLYING); suggest_player_anim_clearUnkFlag(0x8001F); playerStatus->fallState = 0; - mem_clear(D_802B6350_E2A690, sizeof(*D_802B6350_E2A690)); - D_802B6350_E2A690->unk_0C = fabsf(dist2D(playerStatus->position.x, playerStatus->position.z, entity->position.x, entity->position.z)); - D_802B6350_E2A690->unk_10 = atan2(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z); - D_802B6350_E2A690->unk_14 = 6.0f; - D_802B6350_E2A690->unk_18 = 50.0f; - D_802B6350_E2A690->unk_00 = 0x78; + mem_clear(PlayerTweesterPhysics, sizeof(TweesterPhysics)); + PlayerTweesterPhysics->radius = fabsf(dist2D(playerStatus->position.x, playerStatus->position.z, entity->position.x, entity->position.z)); + PlayerTweesterPhysics->angle = atan2(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z); + PlayerTweesterPhysics->angularVelocity = 6.0f; + PlayerTweesterPhysics->liftoffVelocityPhase = 50.0f; + PlayerTweesterPhysics->countdown = 0x78; sfx_play_sound_at_player(SOUND_2F6, 0); } switch (playerStatus->fallState) { case 0: - sin_cos_rad((D_802B6350_E2A690->unk_10 * TAU) / 360.0f, &sp10, &sp14); + sin_cos_rad((PlayerTweesterPhysics->angle * TAU) / 360.0f, &sinAngle, &cosAngle); - playerStatus->position.x = entity->position.x + (sp10 * D_802B6350_E2A690->unk_0C); - playerStatus->position.z = entity->position.z - (sp14 * D_802B6350_E2A690->unk_0C); + playerStatus->position.x = entity->position.x + (sinAngle * PlayerTweesterPhysics->radius); + playerStatus->position.z = entity->position.z - (cosAngle * PlayerTweesterPhysics->radius); - D_802B6350_E2A690->unk_10 = clamp_angle(D_802B6350_E2A690->unk_10 - D_802B6350_E2A690->unk_14); + PlayerTweesterPhysics->angle = clamp_angle(PlayerTweesterPhysics->angle - PlayerTweesterPhysics->angularVelocity); - if (D_802B6350_E2A690->unk_0C > 20.0f) { - D_802B6350_E2A690->unk_0C--; - } else if (D_802B6350_E2A690->unk_0C < 19.0f) { - D_802B6350_E2A690->unk_0C++; + if (PlayerTweesterPhysics->radius > 20.0f) { + PlayerTweesterPhysics->radius--; + } else if (PlayerTweesterPhysics->radius < 19.0f) { + PlayerTweesterPhysics->radius++; } - tempY = sin_rad((D_802B6350_E2A690->unk_18 * TAU) / 360.0f) * 3.0f; - D_802B6350_E2A690->unk_18 += 3.0f; - if (D_802B6350_E2A690->unk_18 > 150.0f) { - D_802B6350_E2A690->unk_18 = 150.0f; + liftoffVelocity = sin_rad((PlayerTweesterPhysics->liftoffVelocityPhase * TAU) / 360.0f) * 3.0f; + PlayerTweesterPhysics->liftoffVelocityPhase += 3.0f; + if (PlayerTweesterPhysics->liftoffVelocityPhase > 150.0f) { + PlayerTweesterPhysics->liftoffVelocityPhase = 150.0f; } - playerStatus->position.y += tempY; - playerStatus->spriteFacingAngle = clamp_angle(360.0f - D_802B6350_E2A690->unk_10); - D_802B6350_E2A690->unk_14 += 0.6; - if (D_802B6350_E2A690->unk_14 > 40.0f) { - D_802B6350_E2A690->unk_14 = 40.0f; + playerStatus->position.y += liftoffVelocity; + playerStatus->spriteFacingAngle = clamp_angle(360.0f - PlayerTweesterPhysics->angle); + PlayerTweesterPhysics->angularVelocity += 0.6; + if (PlayerTweesterPhysics->angularVelocity > 40.0f) { + PlayerTweesterPhysics->angularVelocity = 40.0f; } - if (--D_802B6350_E2A690->unk_00 == 0) { + if (--PlayerTweesterPhysics->countdown == 0) { playerStatus->fallState++; entity_start_script(entity); } @@ -73,10 +62,10 @@ void func_802B6000_E2A340(void) { case 1: disable_player_shadow(); disable_npc_shadow(wPartnerNpc); - playerStatus->unk_10 = 0x32; + playerStatus->blinkTimer = 0x32; enable_player_static_collisions(); enable_player_input(); - playerStatus->flags &= ~0x100008; + playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_100000 | PLAYER_STATUS_FLAGS_FLYING); set_action_state(ACTION_STATE_IDLE); break; } diff --git a/src/world/action/walk.c b/src/world/action/walk.c index fa9c54c008..7ea2303158 100644 --- a/src/world/action/walk.c +++ b/src/world/action/walk.c @@ -1,17 +1,36 @@ #include "common.h" #include "world/actions.h" -// TODO figure out these peach player animation IDs -s32 D_802B6910_E23FF0[] = {0x000A0002, 0x000A002B, 0x000A002D, 0x000A002F, 0x000A0031, 0x000A0033, 0x000A0035, 0x000A0037, 0x000A0039, 0x000A003B, 0x000A003D, 0x000A003F, - 0x000A0041, 0x000A0043, 0x000A0045, 0x000A0047, 0x000A0049, 0x000A004B, 0x000A004D, 0x00000000 }; +s32 WalkPeachAnims[] = { + 0x000A0002, // none + 0x000A002B, // cream + 0x000A002D, // strawberry + 0x000A002F, // butter + 0x000A0031, // cleanser + 0x000A0033, // water + 0x000A0035, // milk + 0x000A0037, // flour + 0x000A0039, // egg + 0x000A003B, // complete cake + 0x000A003D, // cake bowl + 0x000A003F, // cake mixed + 0x000A0041, // cake pan + 0x000A0043, // cake batter + 0x000A0045, // cake bare + 0x000A0047, // salt + 0x000A0049, // sugar + 0x000A004B, // cake with icing + 0x000A004D, // cake with berries + 0x00000000 +}; -void func_802B6738_E23E18(void); +void action_run_update_peach(void); // walk INCLUDE_ASM(void, "world/action/walk", func_802B6000_E236E0, void); // run -void func_802B6288_E23968(void) { +void action_run_update(void) { PlayerStatus* playerStatus = &gPlayerStatus; PlayerData* playerData = &gPlayerData; f32 moveX; @@ -23,7 +42,7 @@ void func_802B6288_E23968(void) { phi_s3 = 0; if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) { - func_802B6738_E23E18(); + action_run_update_peach(); return; } @@ -33,7 +52,7 @@ void func_802B6288_E23968(void) { playerStatus->unk_60 = 0; phi_s3 = 1; - if (!(playerStatus->flags & 0x00004000)) { + if (!(playerStatus->flags & PLAYER_STATUS_FLAGS_4000)) { playerStatus->currentSpeed = playerStatus->runSpeed; } if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) { @@ -103,20 +122,20 @@ void func_802B6288_E23968(void) { return; } try_player_footstep_sounds(4); - playerData->unk_2B0++; + playerData->runningStepsTaken++; } } void func_802B6550_E23C30(void) { if (!(gPlayerStatus.animFlags & PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE)) { if (!(gGameStatusPtr->peachFlags & 0x10)) { - suggest_player_anim_clearUnkFlag(D_802B6910_E23FF0[gGameStatusPtr->peachAnimIdx]); + suggest_player_anim_clearUnkFlag(WalkPeachAnims[gGameStatusPtr->peachCookingIngredient]); return; } suggest_player_anim_clearUnkFlag(0xD000D); return; } - peach_set_disguise_anim(world_actions_peachDisguises[gPlayerStatus.peachDisguise].unk_04); + peach_set_disguise_anim(BasicPeachDisguiseAnims[gPlayerStatus.peachDisguise].walk); } void func_802B65E8_E23CC8(void) { @@ -124,16 +143,16 @@ void func_802B65E8_E23CC8(void) { f32 magnitude; f32 angle; - if (playerStatus->flags & 0x80000000) { - playerStatus->flags &= ~0x80000000; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; playerStatus->unk_60 = 0; - if (!(playerStatus->flags & 0x4000)) { + if (!(playerStatus->flags & PLAYER_STATUS_FLAGS_4000)) { playerStatus->currentSpeed = playerStatus->walkSpeed; } func_802B6550_E23C30(); } - if (playerStatus->flags & 0x4000) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_4000) { playerStatus->targetYaw = playerStatus->heading; try_player_footstep_sounds(8); return; @@ -147,7 +166,7 @@ void func_802B65E8_E23CC8(void) { } playerStatus->targetYaw = angle; - if (gGameStatusPtr->peachAnimIdx == 0 && sqrtf(SQ(playerStatus->stickAxis[0]) + SQ(playerStatus->stickAxis[1])) > 55.0f) { + if (gGameStatusPtr->peachCookingIngredient == 0 && sqrtf(SQ(playerStatus->stickAxis[0]) + SQ(playerStatus->stickAxis[1])) > 55.0f) { set_action_state(ACTION_STATE_RUN); return; } @@ -155,36 +174,36 @@ void func_802B65E8_E23CC8(void) { try_player_footstep_sounds(8); } -void func_802B6738_E23E18(void) { +void action_run_update_peach(void) { PlayerStatus* playerStatus = &gPlayerStatus; GameStatus* gameStatus; f32 moveX; f32 moveY; - if (playerStatus->flags < 0) { - playerStatus->flags &= ~0x80000000; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; playerStatus->unk_60 = 0; - if (!(playerStatus->flags & 0x00004000)) { + if (!(playerStatus->flags & PLAYER_STATUS_FLAGS_4000)) { playerStatus->currentSpeed = playerStatus->runSpeed; } if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE)) { gameStatus = gGameStatusPtr; - if (!(gameStatus->peachFlags & 0x10)) { - if (!gameStatus->peachAnimIdx) { + if (!(gameStatus->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { + if (!gameStatus->peachCookingIngredient) { suggest_player_anim_clearUnkFlag(0xA0003); } else { - suggest_player_anim_clearUnkFlag(D_802B6910_E23FF0[gameStatus->peachAnimIdx]); + suggest_player_anim_clearUnkFlag(WalkPeachAnims[gameStatus->peachCookingIngredient]); } } else { suggest_player_anim_clearUnkFlag(0xD000D); } } else { - peach_set_disguise_anim(world_actions_peachDisguises[playerStatus->peachDisguise].unk_08); + peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].run); } } - if (playerStatus->flags & 0x00004000) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_4000) { playerStatus->targetYaw = playerStatus->heading; try_player_footstep_sounds(4); return; diff --git a/src/world/actions.c b/src/world/actions.c index 9fde10c958..5a8857b9e3 100644 --- a/src/world/actions.c +++ b/src/world/actions.c @@ -2,9 +2,9 @@ #include "ld_addrs.h" #include "actions.h" -void world_action_idle_update(void); +void action_idle_update(void); void func_802B6000_E24920(void); -void func_802B6288_E23968(void); +void action_run_update(void); void func_802B60B4_E240F4(void); void func_802B6198_E241D8(void); void func_802B6294_E242D4(void); @@ -12,7 +12,7 @@ void func_802B6348_E24388(void); void func_802B61C0_E24AE0(void); void func_802B6638_E29068(void); void func_802B6060_E27570(void); -void func_802B66A8_E25578(void); +void action_hammer_update(void); void func_802B6350_E28D80(void); void func_802B6508_E28F38(void); void func_802B6230_E24800(void); @@ -27,35 +27,32 @@ s32 D_800F7B44 = 0; f32 D_800F7B48 = 0.0f; s32 D_800F7B4C = 0; -s32 D_800F7B50[] = { 0x417C1B33, 0xC0EC5C14, 0x405C9AAA, 0xBF400000 }; -f32 D_800F7B60[] = { 0.154342994094f, -0.350080013275f, -0.182262003422f, 0.0115200001746f }; -f32 D_800F7B70[] = { 2.0f, 4.0f, 32.0f, -32.0f }; +s32 GravityParamsStartJump[] = { 0x417C1B33, 0xC0EC5C14, 0x405C9AAA, 0xBF400000 }; +f32 GravityParamsStartFall[] = { 0.154342994094f, -0.350080013275f, -0.182262003422f, 0.0115200001746f }; +f32 DefaultMoveSpeeds[] = { 2.0f, 4.0f, 32.0f, -32.0f }; // walk, run, max jump, ??? s16 D_800F7B80 = 0; s32 D_800F7B84[] = { 0, 0, 0}; f32 D_800F7B90 = 0.0; -// koopatrol animations -s32 D_800F7B94[] = { 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x00390005, 0x00390008, 0x00390007, 0x00390013, 0x00390014, ANIM_END }; +s32 ClubbaDisguiseExtraAnims[] = { 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x00390005, 0x00390008, 0x00390007, 0x00390013, 0x00390014, ANIM_END }; -// hammer bro animations -s32 D_800F7BBC[] = { 0x005A0000, 0x005A0002, 0x005A0003, 0x005A0004, 0x005A0006, 0x005A0007, 0x005A0009, 0x005A000A, 0x005A000B, 0x005A001A, ANIM_END }; +s32 HammerBroDisguiseExtraAnims[] = { 0x005A0000, 0x005A0002, 0x005A0003, 0x005A0004, 0x005A0006, 0x005A0007, 0x005A0009, 0x005A000A, 0x005A000B, 0x005A001A, ANIM_END }; -// clubba animations -s32 D_800F7BE8[] = { 0x00580000, 0x00580001, 0x00580002, 0x00580004, 0x00580005, 0x00580006, 0x00580007, 0x00580008, 0x00580009, 0x00580012, 0x00580014, 0x0058001B, ANIM_END }; +s32 KoopatrolDisguiseExtraAnims[] = { 0x00580000, 0x00580001, 0x00580002, 0x00580004, 0x00580005, 0x00580006, 0x00580007, 0x00580008, 0x00580009, 0x00580012, 0x00580014, 0x0058001B, ANIM_END }; -DisguiseAnims world_actions_peachDisguises[] = { - {0x00580001, 0x00580004, 0x00580006, 0x00580008, 0x00580000, 0x0058001B}, // not used +DisguiseAnims BasicPeachDisguiseAnims[] = { + {0x00580001, 0x00580004, 0x00580006, 0x00580008, 0x00580000, 0x0058001B}, {0x00580001, 0x00580004, 0x00580006, 0x00580008, 0x00580000, 0x0058001B}, {0x005A0003, 0x005A0006, 0x005A0009, 0x005A000B, 0x005A0000, 0x005A001A}, {0x00390002, 0x00390003, 0x00390004, 0x00390005, 0x00390000, 0x00390014}, }; -s32* D_800F7C7C[] = { &D_800F7BE8, &D_800F7BE8, &D_800F7BBC, &D_800F7B94 }; +s32* PeachDisguiseExtraAnims[] = { &KoopatrolDisguiseExtraAnims, &KoopatrolDisguiseExtraAnims, &HammerBroDisguiseExtraAnims, &ClubbaDisguiseExtraAnims }; -Action D_800F7C8C[39] = { - { world_action_idle_update, world_action_idle_ROM_START, world_action_idle_ROM_END, TRUE }, +Action PlayerActionsTable[] = { + { action_idle_update, world_action_idle_ROM_START, world_action_idle_ROM_END, TRUE }, { func_802B6000_E24920, world_action_walk_ROM_START, world_action_walk_ROM_END, TRUE }, - { func_802B6288_E23968, world_action_walk_ROM_START, world_action_walk_ROM_END, TRUE }, + { action_run_update, world_action_walk_ROM_START, world_action_walk_ROM_END, TRUE }, { func_802B60B4_E240F4, world_action_jump_ROM_START, world_action_jump_ROM_END, TRUE }, { func_802B60B4_E240F4, world_action_jump_ROM_START, world_action_jump_ROM_END, TRUE }, { func_802B60B4_E240F4, world_action_jump_ROM_START, world_action_jump_ROM_END, FALSE }, @@ -71,7 +68,7 @@ Action D_800F7C8C[39] = { { func_802B6000_E24920, world_action_ultra_boots_ROM_START, world_action_ultra_boots_ROM_END, FALSE }, { func_802B6000_E24920, world_action_ultra_boots_ROM_START, world_action_ultra_boots_ROM_END, FALSE }, { func_802B6060_E27570, world_action_slide_ROM_START, world_action_slide_ROM_END, FALSE }, - { func_802B66A8_E25578, world_action_hammer_ROM_START, world_action_hammer_ROM_END, FALSE }, + { action_hammer_update, world_action_hammer_ROM_START, world_action_hammer_ROM_END, FALSE }, { func_802B6350_E28D80, world_action_encounter_ROM_START, world_action_encounter_ROM_END, TRUE }, { func_802B6508_E28F38, world_action_encounter_ROM_START, world_action_encounter_ROM_END, FALSE }, { func_802B6000_E24920, world_action_hit_fire_ROM_START, world_action_hit_fire_ROM_END, FALSE }, diff --git a/src/world/actions.h b/src/world/actions.h index 57eb4f4b82..0e29e38811 100644 --- a/src/world/actions.h +++ b/src/world/actions.h @@ -12,17 +12,17 @@ typedef struct Action { typedef struct DisguiseAnims { /* 0x00 */ s32 idle; - /* 0x04 */ s32 unk_04; - /* 0x08 */ s32 unk_08; - /* 0x0C */ s32 unk_0C; - /* 0x10 */ s32 unk_10; - /* 0x14 */ s32 unk_14; + /* 0x04 */ s32 walk; + /* 0x08 */ s32 run; + /* 0x0C */ s32 talk; + /* 0x10 */ s32 still; + /* 0x14 */ s32 hold; } DisguiseAnims; // size = 0x18 extern f32 D_800F7B90; -extern Action D_800F7C8C[39]; +extern Action PlayerActionsTable[39]; -extern DisguiseAnims world_actions_peachDisguises[4]; -extern s32* D_800F7C7C[4]; +extern DisguiseAnims BasicPeachDisguiseAnims[4]; +extern s32* PeachDisguiseExtraAnims[4]; #endif diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 8b58ba245c..e3864c0669 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -3329,7 +3329,7 @@ ApiStatus N(func_80243058_95E258)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80243084_95E284)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - playerData->unk_328 = playerData->frameCounter; + playerData->droTreeOrbitTime = playerData->frameCounter; return ApiStatus_DONE2; } @@ -3359,7 +3359,7 @@ void N(func_802430C8_95E2C8)(Unk_Struct_1* ptr, s32 arg1) { ApiStatus N(func_802431B4_95E3B4)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - s32 val = (playerData->frameCounter - playerData->unk_328) / 3600; + s32 val = (playerData->frameCounter - playerData->droTreeOrbitTime) / 3600; if (val < 30) { script->varTable[0] = 1; diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index 10d3b620eb..67ba5ea1f4 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -53,7 +53,7 @@ ApiStatus func_80240688_E1EAE8(Evt* script, s32 isInitialCall) { clear_model_data(); clear_sprite_shading_data(); reset_background_settings(); - clear_hud_element_cache(); + hud_element_clear_cache(); clear_trigger_data(); clear_printers(); clear_entity_data(0); diff --git a/src/world/area_tst/tst_04/B1B570.c b/src/world/area_tst/tst_04/B1B570.c index 4d6e0ba06e..5c44fd693c 100644 --- a/src/world/area_tst/tst_04/B1B570.c +++ b/src/world/area_tst/tst_04/B1B570.c @@ -111,7 +111,7 @@ void func_80240360_B1B8D0(void* data) { Matrix4f scale; guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f); - guRotateF(main, clamp_angle(playerStatus->unk_8C), 0.0f, 0.0f, 1.0f); + guRotateF(main, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f); guMtxCatF(rotation, main, main); guRotateF(rotation, yaw, 0.0f, 1.0f, 0.0f); guMtxCatF(main, rotation, main); diff --git a/src/world/area_tst/tst_11/B1CA50.c b/src/world/area_tst/tst_11/B1CA50.c index ec7fddcb15..cc486e3cb0 100644 --- a/src/world/area_tst/tst_11/B1CA50.c +++ b/src/world/area_tst/tst_11/B1CA50.c @@ -45,7 +45,7 @@ void func_80240100_B1CB50(void* data) { Matrix4f scale; guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f); - guRotateF(main, clamp_angle(playerStatus->unk_8C), 0.0f, 0.0f, 1.0f); + guRotateF(main, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f); guMtxCatF(rotation, main, main); guRotateF(rotation, yaw, 0.0f, 1.0f, 0.0f); guMtxCatF(main, rotation, main); @@ -98,7 +98,7 @@ void func_802403B8_B1CE08(void* data) { Matrix4f spE0; guRotateF(spA0, yaw, 0.0f, -1.0f, 0.0f); - guRotateF(sp20, clamp_angle(playerStatus->unk_8C), 0.0f, 0.0f, 1.0f); + guRotateF(sp20, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f); guMtxCatF(spA0, sp20, sp20); guRotateF(spA0, yaw, 0.0f, 1.0f, 0.0f); guMtxCatF(sp20, spA0, sp20); @@ -110,7 +110,7 @@ void func_802403B8_B1CE08(void* data) { guMtxCatF(sp20, sp60, sp20); spr_draw_player_sprite(1, 0, 0, 0, sp20); guRotateF(spA0, yaw, 0.0f, -1.0f, 0.0f); - guRotateF(sp20, clamp_angle(playerStatus->unk_8C), 0.0f, 0.0f, 1.0f); + guRotateF(sp20, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f); guMtxCatF(spA0, sp20, sp20); guRotateF(spA0, yaw, 0.0f, 1.0f, 0.0f); guMtxCatF(sp20, spA0, sp20); diff --git a/src/world/common/UnkFunc11.inc.c b/src/world/common/UnkFunc11.inc.c index 2eab93c9e9..93cfb78039 100644 --- a/src/world/common/UnkFunc11.inc.c +++ b/src/world/common/UnkFunc11.inc.c @@ -7,7 +7,7 @@ ApiStatus N(UnkFunc11)(Evt* script, s32 isInitialCall) { CollisionStatus* collisionStatus = &gCollisionStatus; if (((collisionStatus->pushingAgainstWall != var) && (playerStatus->actionState == 20)) || - playerStatus->enableCollisionOverlapsCheck || playerStatus->statusMenuCounterinputEnabledCounter) { + playerStatus->enableCollisionOverlapsCheck || playerStatus->inputEnabledCounter) { set_action_state(0); script->varTable[0] = 0; return ApiStatus_DONE2; diff --git a/src/world/common/UnkFunc48.inc.c b/src/world/common/UnkFunc48.inc.c index 4f00a2e829..a33901f895 100644 --- a/src/world/common/UnkFunc48.inc.c +++ b/src/world/common/UnkFunc48.inc.c @@ -2,6 +2,6 @@ #include "npc.h" ApiStatus N(UnkFunc48)(Evt* script, s32 isInitialCall) { - gPlayerStatus.unk_8C = evt_get_variable(script, *script->ptrReadPos); + gPlayerStatus.pitch = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } diff --git a/src/world/common/reflection.inc.c b/src/world/common/reflection.inc.c index f03a0a6c27..fc6ef5038c 100644 --- a/src/world/common/reflection.inc.c +++ b/src/world/common/reflection.inc.c @@ -126,7 +126,7 @@ void N(reflection_render_wall)(PlayerStatus* playerStatus) { Matrix4f scale; guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f); - guRotateF(main, clamp_angle(playerStatus->unk_8C), 0.0f, 0.0f, 1.0f); + guRotateF(main, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f); guMtxCatF(rotation, main, main); guRotateF(rotation, yaw, 0.0f, 1.0f, 0.0f); guMtxCatF(main, rotation, main); @@ -208,7 +208,7 @@ void N(reflection_render_floor)(PlayerStatus* playerStatus) { s32 flags; guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f); - guRotateF(main, clamp_angle(playerStatus->unk_8C), 0.0f, 0.0f, 1.0f); + guRotateF(main, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f); guMtxCatF(rotation, main, main); guRotateF(rotation, yaw, 0.0f, 1.0f, 0.0f); guMtxCatF(main, rotation, main); @@ -270,7 +270,7 @@ void N(reflection_render_floor_fancy)(PlayerStatus* playerStatus) { func_802DDEE4(1, -1, 6, tint, tint, tint, 255, 0); guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f); - guRotateF(mtx, clamp_angle(playerStatus->unk_8C), 0.0f, 0.0f, 1.0f); + guRotateF(mtx, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f); guMtxCatF(rotation, mtx, mtx); px = playerStatus->position.x; py = playerStatus->position.y; diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c index 72a7c39554..31ca9bc39f 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -9,42 +9,42 @@ BSS s32 D_802BE930; BSS s32 D_802BE934; BSS s32 D_802BE938; BSS s32 D_802BE93C; -BSS unkPartnerStruct D_802BE940; +BSS TweesterPhysics BombetteTweesterPhysics; void entity_interacts_with_current_partner(s32 arg0); void func_802BD100_317E50(Npc* npc) { - f32 sp20, sp24, sp28; - f32 phi_f20 = 0.0f; + f32 x, y, z; + f32 angle = 0.0f; - while (phi_f20 < 360.0f) { - sp20 = npc->pos.x; - sp24 = npc->pos.y; - sp28 = npc->pos.z; - if (npc_test_move_taller_with_slipping(0x100000, &sp20, &sp24, &sp28, 30.0f, clamp_angle(npc->yaw + phi_f20), + while (angle < 360.0f) { + x = npc->pos.x; + y = npc->pos.y; + z = npc->pos.z; + if (npc_test_move_taller_with_slipping(0x100000, &x, &y, &z, 30.0f, clamp_angle(npc->yaw + angle), npc->collisionHeight, npc->collisionRadius) != 0) { break; } else { - phi_f20 += 45.0f; + angle += 45.0f; } } - if (phi_f20 >= 360.0f) { - phi_f20 = 0.0f; + if (angle >= 360.0f) { + angle = 0.0f; - while (phi_f20 < 360.0f) { - sp20 = npc->pos.x; - sp24 = npc->pos.y; - sp28 = npc->pos.z; - if (npc_test_move_taller_with_slipping(0x40000, &sp20, &sp24, &sp28, 30.0f, clamp_angle(npc->yaw + phi_f20), + while (angle < 360.0f) { + x = npc->pos.x; + y = npc->pos.y; + z = npc->pos.z; + if (npc_test_move_taller_with_slipping(0x40000, &x, &y, &z, 30.0f, clamp_angle(npc->yaw + angle), npc->collisionHeight, npc->collisionRadius) != 0) { break; } else { - phi_f20 += 45.0f; + angle += 45.0f; } } - if (!(phi_f20 >= 360.0f)) { + if (!(angle >= 360.0f)) { if (D_8010C978 >= 0 && (D_8010C978 & 0x4000) != 0) { entity_interacts_with_current_partner(D_8010C978 & ~0x4000); } @@ -79,23 +79,23 @@ EvtScript world_bombette_take_out = { EVT_END }; -unkPartnerStruct* D_802BE89C_3195EC = &D_802BE940; +TweesterPhysics* BombetteTweesterPhysicsPtr = &BombetteTweesterPhysics; ApiStatus func_802BD338_318088(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; Npc* bombette = script->owner2.npc; - f32 sp10, sp14, tempY; + f32 sinAngle, cosAngle, liftoffVelocity; Entity* entity; if (isInitialCall) { partner_walking_enable(bombette, 1); - mem_clear(D_802BE89C_3195EC, sizeof(*D_802BE89C_3195EC)); - D_8010C954 = 0; + mem_clear(BombetteTweesterPhysicsPtr, sizeof(TweesterPhysics)); + TweesterTouchingPartner = NULL; } - playerData->unk_2F4[3]++; + playerData->partnerUsedTime[PARTNER_BOMBETTE]++; bombette->flags |= NPC_FLAG_DIRTY_SHADOW; - entity = D_8010C954; + entity = TweesterTouchingPartner; if (entity == NULL) { partner_walking_update_player_tracking(bombette); @@ -103,62 +103,62 @@ ApiStatus func_802BD338_318088(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - switch (D_802BE89C_3195EC->unk_04) { + switch (BombetteTweesterPhysicsPtr->state) { case 0: - D_802BE89C_3195EC->unk_04 = 1; - D_802BE89C_3195EC->flags = bombette->flags; - D_802BE89C_3195EC->unk_0C = fabsf(dist2D(bombette->pos.x, bombette->pos.z, + BombetteTweesterPhysicsPtr->state = 1; + BombetteTweesterPhysicsPtr->prevFlags = bombette->flags; + BombetteTweesterPhysicsPtr->radius = fabsf(dist2D(bombette->pos.x, bombette->pos.z, entity->position.x, entity->position.z)); - D_802BE89C_3195EC->unk_10 = atan2(entity->position.x, entity->position.z, + BombetteTweesterPhysicsPtr->angle = atan2(entity->position.x, entity->position.z, bombette->pos.x, bombette->pos.z); - D_802BE89C_3195EC->unk_14 = 6.0f; - D_802BE89C_3195EC->unk_18 = 50.0f; - D_802BE89C_3195EC->unk_00 = 120; + BombetteTweesterPhysicsPtr->angularVelocity = 6.0f; + BombetteTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; + BombetteTweesterPhysicsPtr->countdown = 120; bombette->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_40 | NPC_FLAG_ENABLE_HIT_SCRIPT; bombette->flags &= ~NPC_FLAG_GRAVITY; case 1: - sin_cos_rad((D_802BE89C_3195EC->unk_10 * TAU) / 360.0f, &sp10, &sp14); - bombette->pos.x = entity->position.x + (sp10 * D_802BE89C_3195EC->unk_0C); - bombette->pos.z = entity->position.z - (sp14 * D_802BE89C_3195EC->unk_0C); - D_802BE89C_3195EC->unk_10 = clamp_angle(D_802BE89C_3195EC->unk_10 - D_802BE89C_3195EC->unk_14); + sin_cos_rad((BombetteTweesterPhysicsPtr->angle * TAU) / 360.0f, &sinAngle, &cosAngle); + bombette->pos.x = entity->position.x + (sinAngle * BombetteTweesterPhysicsPtr->radius); + bombette->pos.z = entity->position.z - (cosAngle * BombetteTweesterPhysicsPtr->radius); + BombetteTweesterPhysicsPtr->angle = clamp_angle(BombetteTweesterPhysicsPtr->angle - BombetteTweesterPhysicsPtr->angularVelocity); - if (D_802BE89C_3195EC->unk_0C > 20.0f) { - D_802BE89C_3195EC->unk_0C--; - } else if (D_802BE89C_3195EC->unk_0C < 19.0f) { - D_802BE89C_3195EC->unk_0C++; + if (BombetteTweesterPhysicsPtr->radius > 20.0f) { + BombetteTweesterPhysicsPtr->radius--; + } else if (BombetteTweesterPhysicsPtr->radius < 19.0f) { + BombetteTweesterPhysicsPtr->radius++; } - tempY = sin_rad((D_802BE89C_3195EC->unk_18 * TAU) / 360.0f) * 3.0f; - D_802BE89C_3195EC->unk_18 += 3.0f; + liftoffVelocity = sin_rad((BombetteTweesterPhysicsPtr->liftoffVelocityPhase * TAU) / 360.0f) * 3.0f; + BombetteTweesterPhysicsPtr->liftoffVelocityPhase += 3.0f; - if (D_802BE89C_3195EC->unk_18 > 150.0f) { - D_802BE89C_3195EC->unk_18 = 150.0f; + if (BombetteTweesterPhysicsPtr->liftoffVelocityPhase > 150.0f) { + BombetteTweesterPhysicsPtr->liftoffVelocityPhase = 150.0f; } - bombette->pos.y += tempY; - bombette->renderYaw = clamp_angle(360.0f - D_802BE89C_3195EC->unk_10); - D_802BE89C_3195EC->unk_14 += 0.8; + bombette->pos.y += liftoffVelocity; + bombette->renderYaw = clamp_angle(360.0f - BombetteTweesterPhysicsPtr->angle); + BombetteTweesterPhysicsPtr->angularVelocity += 0.8; - if (D_802BE89C_3195EC->unk_14 > 40.0f) { - D_802BE89C_3195EC->unk_14 = 40.0f; + if (BombetteTweesterPhysicsPtr->angularVelocity > 40.0f) { + BombetteTweesterPhysicsPtr->angularVelocity = 40.0f; } - if (--D_802BE89C_3195EC->unk_00 == 0) { - D_802BE89C_3195EC->unk_04++; + if (--BombetteTweesterPhysicsPtr->countdown == 0) { + BombetteTweesterPhysicsPtr->state++; } break; case 2: - bombette->flags = D_802BE89C_3195EC->flags; - D_802BE89C_3195EC->unk_00 = 0x1E; - D_802BE89C_3195EC->unk_04++; + bombette->flags = BombetteTweesterPhysicsPtr->prevFlags; + BombetteTweesterPhysicsPtr->countdown = 0x1E; + BombetteTweesterPhysicsPtr->state++; break; case 3: partner_walking_update_player_tracking(bombette); partner_walking_update_motion(bombette); - if (--D_802BE89C_3195EC->unk_00 == 0) { - D_802BE89C_3195EC->unk_04 = 0; - D_8010C954 = 0; + if (--BombetteTweesterPhysicsPtr->countdown == 0) { + BombetteTweesterPhysicsPtr->state = 0; + TweesterTouchingPartner = NULL; } break; } @@ -172,10 +172,10 @@ EvtScript world_bombette_update = { }; void func_802BD6DC_31842C(Npc* npc) { - if (D_8010C954 != NULL) { - D_8010C954 = NULL; - npc->flags = D_802BE89C_3195EC->flags; - D_802BE89C_3195EC->unk_04 = 0; + if (TweesterTouchingPartner != NULL) { + TweesterTouchingPartner = NULL; + npc->flags = BombetteTweesterPhysicsPtr->prevFlags; + BombetteTweesterPhysicsPtr->state = 0; partner_clear_player_tracking(npc); } } diff --git a/src/world/partner/bow.c b/src/world/partner/bow.c index 1eda21005b..0f1d2f1e9b 100644 --- a/src/world/partner/bow.c +++ b/src/world/partner/bow.c @@ -4,7 +4,7 @@ BSS s32 D_802BE0C0; BSS s32 D_802BE0C4; -BSS unkPartnerStruct D_802BE0C8; +BSS TweesterPhysics BowTweesterPhysics; BSS s32 D_802BE0E4; BSS s32 D_802BE0E8; BSS s32 D_802BE0EC; @@ -20,7 +20,7 @@ void world_bow_init(Npc* bow) { D_802BE0C0 = FALSE; } -ApiStatus func_802BD130_323A80(Evt* script, s32 isInitialCall) { +ApiStatus BowTakeOut(Evt* script, s32 isInitialCall) { Npc* bow = script->owner2.npc; if (isInitialCall) { @@ -31,27 +31,27 @@ ApiStatus func_802BD130_323A80(Evt* script, s32 isInitialCall) { } EvtScript world_bow_take_out = { - EVT_CALL(func_802BD130_323A80) + EVT_CALL(BowTakeOut) EVT_RETURN EVT_END }; -unkPartnerStruct* D_802BDFFC_32494C = &D_802BE0C8; +TweesterPhysics* BowTweesterPhysicsPtr = &BowTweesterPhysics; -ApiStatus func_802BD168_323AB8(Evt* script, s32 isInitialCall) { +ApiStatus BowUpdate(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; Npc* bow = script->owner2.npc; + f32 sinAngle, cosAngle, liftoffVelocity; Entity* entity; - f32 sp10, sp14, tempY; if (isInitialCall) { partner_flying_enable(bow, 1); - mem_clear(D_802BDFFC_32494C, sizeof(*D_802BDFFC_32494C)); - D_8010C954 = NULL; + mem_clear(BowTweesterPhysicsPtr, sizeof(TweesterPhysics)); + TweesterTouchingPartner = NULL; } - entity = D_8010C954; - playerData->unk_2F4[9]++; + entity = TweesterTouchingPartner; + playerData->partnerUsedTime[PARTNER_BOW]++; if (entity == NULL) { partner_flying_update_player_tracking(bow); @@ -59,58 +59,58 @@ ApiStatus func_802BD168_323AB8(Evt* script, s32 isInitialCall) { return 0; } - switch (D_802BDFFC_32494C->unk_04){ + switch (BowTweesterPhysicsPtr->state){ case 0: - D_802BDFFC_32494C->unk_04 = 1; - D_802BDFFC_32494C->flags = bow->flags; - D_802BDFFC_32494C->unk_0C = fabsf(dist2D(bow->pos.x, bow->pos.z, entity->position.x, entity->position.z)); - D_802BDFFC_32494C->unk_10 = atan2(entity->position.x, entity->position.z, bow->pos.x, bow->pos.z); - D_802BDFFC_32494C->unk_14 = 6.0f; - D_802BDFFC_32494C->unk_18 = 50.0f; - D_802BDFFC_32494C->unk_00 = 120; + BowTweesterPhysicsPtr->state = 1; + BowTweesterPhysicsPtr->prevFlags = bow->flags; + BowTweesterPhysicsPtr->radius = fabsf(dist2D(bow->pos.x, bow->pos.z, entity->position.x, entity->position.z)); + BowTweesterPhysicsPtr->angle = atan2(entity->position.x, entity->position.z, bow->pos.x, bow->pos.z); + BowTweesterPhysicsPtr->angularVelocity = 6.0f; + BowTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; + BowTweesterPhysicsPtr->countdown = 120; bow->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_40 | NPC_FLAG_ENABLE_HIT_SCRIPT; bow->flags &= ~NPC_FLAG_GRAVITY; case 1: - sin_cos_rad((D_802BDFFC_32494C->unk_10 * TAU) / 360.0f, &sp10, &sp14); - bow->pos.x = entity->position.x + (sp10 * D_802BDFFC_32494C->unk_0C); - bow->pos.z = entity->position.z - (sp14 * D_802BDFFC_32494C->unk_0C); - D_802BDFFC_32494C->unk_10 = clamp_angle(D_802BDFFC_32494C->unk_10 - D_802BDFFC_32494C->unk_14); - if (D_802BDFFC_32494C->unk_0C > 20.0f) { - D_802BDFFC_32494C->unk_0C -= 1.0f; - } else if (D_802BDFFC_32494C->unk_0C < 19.0f) { - D_802BDFFC_32494C->unk_0C++; + sin_cos_rad((BowTweesterPhysicsPtr->angle * TAU) / 360.0f, &sinAngle, &cosAngle); + bow->pos.x = entity->position.x + (sinAngle * BowTweesterPhysicsPtr->radius); + bow->pos.z = entity->position.z - (cosAngle * BowTweesterPhysicsPtr->radius); + BowTweesterPhysicsPtr->angle = clamp_angle(BowTweesterPhysicsPtr->angle - BowTweesterPhysicsPtr->angularVelocity); + if (BowTweesterPhysicsPtr->radius > 20.0f) { + BowTweesterPhysicsPtr->radius -= 1.0f; + } else if (BowTweesterPhysicsPtr->radius < 19.0f) { + BowTweesterPhysicsPtr->radius++; } - tempY = sin_rad((D_802BDFFC_32494C->unk_18 * TAU) / 360.0f) * 3.0f; - D_802BDFFC_32494C->unk_18 += 3.0f; + liftoffVelocity = sin_rad((BowTweesterPhysicsPtr->liftoffVelocityPhase * TAU) / 360.0f) * 3.0f; + BowTweesterPhysicsPtr->liftoffVelocityPhase += 3.0f; - if (D_802BDFFC_32494C->unk_18 > 150.0f) { - D_802BDFFC_32494C->unk_18 = 150.0f; + if (BowTweesterPhysicsPtr->liftoffVelocityPhase > 150.0f) { + BowTweesterPhysicsPtr->liftoffVelocityPhase = 150.0f; } - bow->pos.y += tempY; - bow->renderYaw = clamp_angle(360.0f - D_802BDFFC_32494C->unk_10); - D_802BDFFC_32494C->unk_14 += 0.8; + bow->pos.y += liftoffVelocity; + bow->renderYaw = clamp_angle(360.0f - BowTweesterPhysicsPtr->angle); + BowTweesterPhysicsPtr->angularVelocity += 0.8; - if (D_802BDFFC_32494C->unk_14 > 40.0f) { - D_802BDFFC_32494C->unk_14 = 40.0f; + if (BowTweesterPhysicsPtr->angularVelocity > 40.0f) { + BowTweesterPhysicsPtr->angularVelocity = 40.0f; } - if (--D_802BDFFC_32494C->unk_00 == 0) { - D_802BDFFC_32494C->unk_04++; + if (--BowTweesterPhysicsPtr->countdown == 0) { + BowTweesterPhysicsPtr->state++; } break; case 2: - bow->flags = D_802BDFFC_32494C->flags; - D_802BDFFC_32494C->unk_00 = 30; - D_802BDFFC_32494C->unk_04++; + bow->flags = BowTweesterPhysicsPtr->prevFlags; + BowTweesterPhysicsPtr->countdown = 30; + BowTweesterPhysicsPtr->state++; break; case 3: partner_flying_update_player_tracking(bow); partner_flying_update_motion(bow); - if (--D_802BDFFC_32494C->unk_00 == 0) { - D_802BDFFC_32494C->unk_04 = 0; - D_8010C954 = 0; + if (--BowTweesterPhysicsPtr->countdown == 0) { + BowTweesterPhysicsPtr->state = 0; + TweesterTouchingPartner = NULL; } break; } @@ -118,16 +118,16 @@ ApiStatus func_802BD168_323AB8(Evt* script, s32 isInitialCall) { } EvtScript world_bow_update = { - EVT_CALL(func_802BD168_323AB8) + EVT_CALL(BowUpdate) EVT_RETURN EVT_END }; void func_802BD4FC_323E4C(Npc* bow) { - if (D_8010C954 != NULL) { - D_8010C954 = NULL; - bow->flags = D_802BDFFC_32494C->flags; - D_802BDFFC_32494C->unk_04 = 0; + if (TweesterTouchingPartner != NULL) { + TweesterTouchingPartner = NULL; + bow->flags = BowTweesterPhysicsPtr->prevFlags; + BowTweesterPhysicsPtr->state = 0; partner_clear_player_tracking(bow); } } @@ -160,7 +160,7 @@ s32 func_802BD540_323E90(void) { INCLUDE_ASM(s32, "world/partner/bow", func_802BD540_323E90); #endif -ApiStatus func_802BD694_323FE4(Evt* script, s32 isInitialCall) { +ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; CollisionStatus* collisionStatus = &gCollisionStatus; @@ -189,7 +189,7 @@ ApiStatus func_802BD694_323FE4(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 40: - if (playerStatus->statusMenuCounterinputEnabledCounter) { + if (playerStatus->inputEnabledCounter) { return ApiStatus_DONE2; } @@ -201,7 +201,7 @@ ApiStatus func_802BD694_323FE4(Evt* script, s32 isInitialCall) { break; case 41: if ((func_800EA52C(9) == 0 || is_starting_conversation()) && - script->functionTemp[2] < playerStatus->statusMenuCounterinputEnabledCounter + script->functionTemp[2] < playerStatus->inputEnabledCounter && D_802BE0C4) { enable_player_input(); @@ -211,7 +211,7 @@ ApiStatus func_802BD694_323FE4(Evt* script, s32 isInitialCall) { } script->functionTemp[1]--; if (script->functionTemp[1] == 0) { - if (script->functionTemp[2] < playerStatus->statusMenuCounterinputEnabledCounter) { + if (script->functionTemp[2] < playerStatus->inputEnabledCounter) { if (D_802BE0C4) { enable_player_input(); D_802BE0C4 = FALSE; @@ -321,13 +321,13 @@ ApiStatus func_802BD694_323FE4(Evt* script, s32 isInitialCall) { if (func_802BD540_323E90() < 0) { script->functionTemp[0]++; script->functionTemp[1] = 3; - script->functionTemp[2] = playerStatus->statusMenuCounterinputEnabledCounter; + script->functionTemp[2] = playerStatus->inputEnabledCounter; } } break; case 3: if (script->functionTemp[1] == 0) { - if (script->functionTemp[2] < playerStatus->statusMenuCounterinputEnabledCounter) { + if (script->functionTemp[2] < playerStatus->inputEnabledCounter) { script->functionTemp[0] = 2; break; } @@ -344,7 +344,7 @@ ApiStatus func_802BD694_323FE4(Evt* script, s32 isInitialCall) { } EvtScript world_bow_use_ability = { - EVT_CALL(func_802BD694_323FE4) + EVT_CALL(BowUseAbility) EVT_RETURN EVT_END }; diff --git a/src/world/partner/goombaria.c b/src/world/partner/goombaria.c index 66e643c592..a1c9aded03 100644 --- a/src/world/partner/goombaria.c +++ b/src/world/partner/goombaria.c @@ -27,7 +27,7 @@ ApiStatus GoombariaUpdate(Evt* script, s32 isInitialCall) { partner_walking_update_player_tracking(goombaria); partner_walking_update_motion(goombaria); - playerData->unk_2F4[PARTNER_GOOMBARIA]++; + playerData->partnerUsedTime[PARTNER_GOOMBARIA]++; return ApiStatus_BLOCK; } diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index 284fb301d7..148f81eb82 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -7,9 +7,9 @@ BSS s32 D_802BDF30; BSS s32 D_802BDF34; BSS s32 D_802BDF38; BSS s32 D_802BDF3C; -BSS unkPartnerStruct D_802BDF40; +BSS TweesterPhysics GoombarioTweesterPhysics; BSS s32 D_802BDF5C; -BSS s32 D_802BDF60; +BSS s32 GoombarioGetTattleID; BSS s32 D_802BDF64; s32 D_802BDC40_317B60[] = { @@ -45,7 +45,7 @@ void world_goombario_init(Npc* goombario) { ApiStatus func_802BD188_3170A8(Evt* script, s32 isInitialCall) { Npc* goombario = script->owner2.npc; - D_802BDF60 = -1; + GoombarioGetTattleID = -1; if (isInitialCall) { partner_init_get_out(goombario); @@ -60,22 +60,22 @@ EvtScript world_goombario_take_out = { EVT_END }; -unkPartnerStruct* D_802BDD88_317CA8 = &D_802BDF40; +TweesterPhysics* GoombarioTweesterPhysicsPtr = &GoombarioTweesterPhysics; s32 func_802BD1D0_3170F0(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; Npc* npc = script->owner2.npc; + f32 sinAngle, cosAngle, liftoffVelocity; Entity* entity; - f32 sp10, sp14, tempY; if (isInitialCall) { partner_walking_enable(npc, 1); - mem_clear(D_802BDD88_317CA8, sizeof(*D_802BDD88_317CA8)); - D_8010C954 = 0; + mem_clear(GoombarioTweesterPhysicsPtr, sizeof(TweesterPhysics)); + TweesterTouchingPartner = NULL; } - playerData->unk_2F4[1]++; - entity = D_8010C954; + playerData->partnerUsedTime[PARTNER_GOOMBARIO]++; + entity = TweesterTouchingPartner; if (entity == NULL) { partner_walking_update_player_tracking(npc); @@ -83,62 +83,62 @@ s32 func_802BD1D0_3170F0(Evt* script, s32 isInitialCall) { return 0; } - switch (D_802BDD88_317CA8->unk_04) { + switch (GoombarioTweesterPhysicsPtr->state) { case 0: - D_802BDD88_317CA8->unk_04 = 1; - D_802BDD88_317CA8->flags = npc->flags; - D_802BDD88_317CA8->unk_0C = fabsf(dist2D(npc->pos.x, npc->pos.z, entity->position.x, entity->position.z)); - D_802BDD88_317CA8->unk_10 = atan2(entity->position.x, entity->position.z, npc->pos.x, npc->pos.z); - D_802BDD88_317CA8->unk_14 = 6.0f; - D_802BDD88_317CA8->unk_18 = 50.0f; - D_802BDD88_317CA8->unk_00 = 120; + GoombarioTweesterPhysicsPtr->state = 1; + GoombarioTweesterPhysicsPtr->prevFlags = npc->flags; + GoombarioTweesterPhysicsPtr->radius = fabsf(dist2D(npc->pos.x, npc->pos.z, entity->position.x, entity->position.z)); + GoombarioTweesterPhysicsPtr->angle = atan2(entity->position.x, entity->position.z, npc->pos.x, npc->pos.z); + GoombarioTweesterPhysicsPtr->angularVelocity = 6.0f; + GoombarioTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; + GoombarioTweesterPhysicsPtr->countdown = 120; npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_100 | NPC_FLAG_40000; npc->flags &= ~NPC_FLAG_GRAVITY; case 1: - sin_cos_rad((D_802BDD88_317CA8->unk_10 * TAU) / 360.0f, &sp10, &sp14); + sin_cos_rad((GoombarioTweesterPhysicsPtr->angle * TAU) / 360.0f, &sinAngle, &cosAngle); - npc->pos.x = entity->position.x + (sp10 * D_802BDD88_317CA8->unk_0C); - npc->pos.z = entity->position.z - (sp14 * D_802BDD88_317CA8->unk_0C); - D_802BDD88_317CA8->unk_10 = clamp_angle(D_802BDD88_317CA8->unk_10 - D_802BDD88_317CA8->unk_14); + npc->pos.x = entity->position.x + (sinAngle * GoombarioTweesterPhysicsPtr->radius); + npc->pos.z = entity->position.z - (cosAngle * GoombarioTweesterPhysicsPtr->radius); + GoombarioTweesterPhysicsPtr->angle = clamp_angle(GoombarioTweesterPhysicsPtr->angle - GoombarioTweesterPhysicsPtr->angularVelocity); - if (D_802BDD88_317CA8->unk_0C > 20.0f) { - D_802BDD88_317CA8->unk_0C--; - } else if (D_802BDD88_317CA8->unk_0C < 19.0f) { - D_802BDD88_317CA8->unk_0C++; + if (GoombarioTweesterPhysicsPtr->radius > 20.0f) { + GoombarioTweesterPhysicsPtr->radius--; + } else if (GoombarioTweesterPhysicsPtr->radius < 19.0f) { + GoombarioTweesterPhysicsPtr->radius++; } - tempY = sin_rad((D_802BDD88_317CA8->unk_18 * TAU) / 360.0f) * 3.0f; - D_802BDD88_317CA8->unk_18 += 3.0f; + liftoffVelocity = sin_rad((GoombarioTweesterPhysicsPtr->liftoffVelocityPhase * TAU) / 360.0f) * 3.0f; + GoombarioTweesterPhysicsPtr->liftoffVelocityPhase += 3.0f; - if (D_802BDD88_317CA8->unk_18 > 150.0f) { - D_802BDD88_317CA8->unk_18 = 150.0f; + if (GoombarioTweesterPhysicsPtr->liftoffVelocityPhase > 150.0f) { + GoombarioTweesterPhysicsPtr->liftoffVelocityPhase = 150.0f; } - npc->pos.y += tempY; + npc->pos.y += liftoffVelocity; - npc->renderYaw = clamp_angle(360.0f - D_802BDD88_317CA8->unk_10); - D_802BDD88_317CA8->unk_14 += 0.8; + npc->renderYaw = clamp_angle(360.0f - GoombarioTweesterPhysicsPtr->angle); + GoombarioTweesterPhysicsPtr->angularVelocity += 0.8; - if (D_802BDD88_317CA8->unk_14 > 40.0f) { - D_802BDD88_317CA8->unk_14 = 40.0f; + if (GoombarioTweesterPhysicsPtr->angularVelocity > 40.0f) { + GoombarioTweesterPhysicsPtr->angularVelocity = 40.0f; } - if (--D_802BDD88_317CA8->unk_00 == 0) { - D_802BDD88_317CA8->unk_04++; + if (--GoombarioTweesterPhysicsPtr->countdown == 0) { + GoombarioTweesterPhysicsPtr->state++; } break; case 2: - npc->flags = D_802BDD88_317CA8->flags; - D_802BDD88_317CA8->unk_00 = 30; - D_802BDD88_317CA8->unk_04++; + npc->flags = GoombarioTweesterPhysicsPtr->prevFlags; + GoombarioTweesterPhysicsPtr->countdown = 30; + GoombarioTweesterPhysicsPtr->state++; break; case 3: partner_walking_update_player_tracking(npc); partner_walking_update_motion(npc); - if (--D_802BDD88_317CA8->unk_00 == 0) { - D_802BDD88_317CA8->unk_04 = 0; - D_8010C954 = 0; + if (--GoombarioTweesterPhysicsPtr->countdown == 0) { + GoombarioTweesterPhysicsPtr->state = 0; + TweesterTouchingPartner = NULL; } break; } @@ -152,10 +152,10 @@ EvtScript world_goombario_update = { }; void func_802BD564_317484(Npc* goombario) { - if (D_8010C954) { - D_8010C954 = 0; - goombario->flags = D_802BDD88_317CA8->flags; - D_802BDD88_317CA8->unk_04 = 0; + if (TweesterTouchingPartner) { + TweesterTouchingPartner = NULL; + goombario->flags = GoombarioTweesterPhysicsPtr->prevFlags; + GoombarioTweesterPhysicsPtr->state = 0; partner_clear_player_tracking (goombario); } } diff --git a/src/world/partner/goompa.c b/src/world/partner/goompa.c index 027a57687a..08f8737354 100644 --- a/src/world/partner/goompa.c +++ b/src/world/partner/goompa.c @@ -25,24 +25,24 @@ EvtScript world_goompa_take_out = { EVT_END }; -BSS unkPartnerStruct D_802BD600; +BSS TweesterPhysics GoompaTweesterPhysics; -unkPartnerStruct* D_802BD58C_324E9C = &D_802BD600; +TweesterPhysics* GoompaTweesterPhysicsPtr = &GoompaTweesterPhysics; ApiStatus func_802BD14C_324A5C(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; Npc* goompa = script->owner2.npc; - f32 sp10, sp14, tempY; + f32 sinAngle, cosAngle, liftoffVelocity; Entity* entity; if (isInitialCall) { partner_walking_enable(goompa, 1); - mem_clear(D_802BD58C_324E9C, sizeof(*D_802BD58C_324E9C)); - D_8010C954 = 0; + mem_clear(GoompaTweesterPhysicsPtr, sizeof(TweesterPhysics)); + TweesterTouchingPartner = NULL; } - playerData->unk_2F4[5]++; - entity = D_8010C954; + playerData->partnerUsedTime[PARTNER_GOOMPA]++; + entity = TweesterTouchingPartner; if (entity == NULL) { partner_walking_update_player_tracking(goompa); @@ -50,61 +50,61 @@ ApiStatus func_802BD14C_324A5C(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - switch (D_802BD58C_324E9C->unk_04) { + switch (GoompaTweesterPhysicsPtr->state) { case 0: - D_802BD58C_324E9C->unk_04 = 1; - D_802BD58C_324E9C->flags = goompa->flags; - D_802BD58C_324E9C->unk_0C = fabsf(dist2D(goompa->pos.x, goompa->pos.z, + GoompaTweesterPhysicsPtr->state = 1; + GoompaTweesterPhysicsPtr->prevFlags = goompa->flags; + GoompaTweesterPhysicsPtr->radius = fabsf(dist2D(goompa->pos.x, goompa->pos.z, entity->position.x, entity->position.z)); - D_802BD58C_324E9C->unk_10 = atan2(entity->position.x, entity->position.z, goompa->pos.x, goompa->pos.z); - D_802BD58C_324E9C->unk_14 = 6.0f; - D_802BD58C_324E9C->unk_18 = 50.0f; - D_802BD58C_324E9C->unk_00 = 120; + GoompaTweesterPhysicsPtr->angle = atan2(entity->position.x, entity->position.z, goompa->pos.x, goompa->pos.z); + GoompaTweesterPhysicsPtr->angularVelocity = 6.0f; + GoompaTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; + GoompaTweesterPhysicsPtr->countdown = 120; goompa->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_100 | NPC_FLAG_40000; goompa->flags &= ~NPC_FLAG_GRAVITY; case 1: - sin_cos_rad((D_802BD58C_324E9C->unk_10 * TAU) / 360.0f, &sp10, &sp14); - goompa->pos.x = entity->position.x + (sp10 * D_802BD58C_324E9C->unk_0C); - goompa->pos.z = entity->position.z - (sp14 * D_802BD58C_324E9C->unk_0C); - D_802BD58C_324E9C->unk_10 = clamp_angle(D_802BD58C_324E9C->unk_10 - D_802BD58C_324E9C->unk_14); + sin_cos_rad((GoompaTweesterPhysicsPtr->angle * TAU) / 360.0f, &sinAngle, &cosAngle); + goompa->pos.x = entity->position.x + (sinAngle * GoompaTweesterPhysicsPtr->radius); + goompa->pos.z = entity->position.z - (cosAngle * GoompaTweesterPhysicsPtr->radius); + GoompaTweesterPhysicsPtr->angle = clamp_angle(GoompaTweesterPhysicsPtr->angle - GoompaTweesterPhysicsPtr->angularVelocity); - if (D_802BD58C_324E9C->unk_0C > 20.0f) { - D_802BD58C_324E9C->unk_0C--; - } else if (D_802BD58C_324E9C->unk_0C < 19.0f) { - D_802BD58C_324E9C->unk_0C++; + if (GoompaTweesterPhysicsPtr->radius > 20.0f) { + GoompaTweesterPhysicsPtr->radius--; + } else if (GoompaTweesterPhysicsPtr->radius < 19.0f) { + GoompaTweesterPhysicsPtr->radius++; } - tempY = sin_rad((D_802BD58C_324E9C->unk_18 * TAU) / 360.0f) * 3.0f; - D_802BD58C_324E9C->unk_18 += 3.0f; + liftoffVelocity = sin_rad((GoompaTweesterPhysicsPtr->liftoffVelocityPhase * TAU) / 360.0f) * 3.0f; + GoompaTweesterPhysicsPtr->liftoffVelocityPhase += 3.0f; - if (D_802BD58C_324E9C->unk_18 > 150.0f) { - D_802BD58C_324E9C->unk_18 = 150.0f; + if (GoompaTweesterPhysicsPtr->liftoffVelocityPhase > 150.0f) { + GoompaTweesterPhysicsPtr->liftoffVelocityPhase = 150.0f; } - goompa->pos.y += tempY; - goompa->renderYaw = clamp_angle(360.0f - D_802BD58C_324E9C->unk_10); - D_802BD58C_324E9C->unk_14 += 0.8; + goompa->pos.y += liftoffVelocity; + goompa->renderYaw = clamp_angle(360.0f - GoompaTweesterPhysicsPtr->angle); + GoompaTweesterPhysicsPtr->angularVelocity += 0.8; - if (D_802BD58C_324E9C->unk_14 > 40.0f) { - D_802BD58C_324E9C->unk_14 = 40.0f; + if (GoompaTweesterPhysicsPtr->angularVelocity > 40.0f) { + GoompaTweesterPhysicsPtr->angularVelocity = 40.0f; } - if (--D_802BD58C_324E9C->unk_00 == 0) { - D_802BD58C_324E9C->unk_04++; + if (--GoompaTweesterPhysicsPtr->countdown == 0) { + GoompaTweesterPhysicsPtr->state++; } break; case 2: - goompa->flags = D_802BD58C_324E9C->flags; - D_802BD58C_324E9C->unk_00 = 30; - D_802BD58C_324E9C->unk_04++; + goompa->flags = GoompaTweesterPhysicsPtr->prevFlags; + GoompaTweesterPhysicsPtr->countdown = 30; + GoompaTweesterPhysicsPtr->state++; break; case 3: partner_walking_update_player_tracking(goompa); partner_walking_update_motion(goompa); - if (--D_802BD58C_324E9C->unk_00 == 0) { - D_802BD58C_324E9C->unk_04 = 0; - D_8010C954 = 0; + if (--GoompaTweesterPhysicsPtr->countdown == 0) { + GoompaTweesterPhysicsPtr->state = 0; + TweesterTouchingPartner = NULL; } break; } @@ -118,10 +118,10 @@ EvtScript world_goompa_update = { }; void func_802BD4E0_324DF0(Npc* goompa) { - if (D_8010C954 != NULL) { - D_8010C954 = NULL; - goompa->flags = D_802BD58C_324E9C->flags; - D_802BD58C_324E9C->unk_04 = 0; + if (TweesterTouchingPartner != NULL) { + TweesterTouchingPartner = NULL; + goompa->flags = GoompaTweesterPhysicsPtr->prevFlags; + GoompaTweesterPhysicsPtr->state = 0; partner_clear_player_tracking(goompa); } } diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index e68551d263..3f40dff840 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -64,7 +64,7 @@ void world_kooper_init(Npc* kooper) { D_802BEC54 = 0; } -ApiStatus func_802BD228_31B248(Evt* script, s32 isInitialCall) { +ApiStatus KooperTakeOut(Evt* script, s32 isInitialCall) { Npc* kooper = script->owner2.npc; if (isInitialCall) { @@ -75,29 +75,29 @@ ApiStatus func_802BD228_31B248(Evt* script, s32 isInitialCall) { } EvtScript world_kooper_take_out = { - EVT_CALL(func_802BD228_31B248) + EVT_CALL(KooperTakeOut) EVT_RETURN EVT_END }; -BSS unkPartnerStruct D_802BEC80; +BSS TweesterPhysics KooperTweesterPhysics; -unkPartnerStruct* D_802BEB60_31CB80 = &D_802BEC80; +TweesterPhysics* KooperTweesterPhysicsPtr = &KooperTweesterPhysics; -ApiStatus func_802BD260_31B280(Evt* script, s32 isInitialCall) { +ApiStatus KooperUpdate(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - Entity* entity; Npc* kooper = script->owner2.npc; - f32 sp10, sp14, tempY; + f32 sinAngle, cosAngle, liftoffVelocity; + Entity* entity; if (isInitialCall) { partner_walking_enable(kooper, 1); - mem_clear(D_802BEB60_31CB80, sizeof(*D_802BEB60_31CB80)); - D_8010C954 = 0; + mem_clear(KooperTweesterPhysicsPtr, sizeof(TweesterPhysics)); + TweesterTouchingPartner = NULL; } - playerData->unk_2F4[2]++; - entity = D_8010C954; + playerData->partnerUsedTime[PARTNER_KOOPER]++; + entity = TweesterTouchingPartner; if (entity == NULL) { partner_walking_update_player_tracking(kooper); @@ -105,62 +105,62 @@ ApiStatus func_802BD260_31B280(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - switch (D_802BEB60_31CB80->unk_04) { + switch (KooperTweesterPhysicsPtr->state) { case 0: - D_802BEB60_31CB80->unk_04 = 1; - D_802BEB60_31CB80->flags = kooper->flags; - D_802BEB60_31CB80->unk_0C = fabsf(dist2D(kooper->pos.x, kooper->pos.z, + KooperTweesterPhysicsPtr->state = 1; + KooperTweesterPhysicsPtr->prevFlags = kooper->flags; + KooperTweesterPhysicsPtr->radius = fabsf(dist2D(kooper->pos.x, kooper->pos.z, entity->position.x, entity->position.z)); - D_802BEB60_31CB80->unk_10 = atan2(entity->position.x, entity->position.z, kooper->pos.x, kooper->pos.z); - D_802BEB60_31CB80->unk_14 = 6.0f; - D_802BEB60_31CB80->unk_18 = 50.0f; - D_802BEB60_31CB80->unk_00 = 120; + KooperTweesterPhysicsPtr->angle = atan2(entity->position.x, entity->position.z, kooper->pos.x, kooper->pos.z); + KooperTweesterPhysicsPtr->angularVelocity = 6.0f; + KooperTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; + KooperTweesterPhysicsPtr->countdown = 120; kooper->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_40 | NPC_FLAG_ENABLE_HIT_SCRIPT; kooper->flags &= ~NPC_FLAG_GRAVITY; case 1: - sin_cos_rad((D_802BEB60_31CB80->unk_10 * TAU) / 360.0f, &sp10, &sp14); + sin_cos_rad((KooperTweesterPhysicsPtr->angle * TAU) / 360.0f, &sinAngle, &cosAngle); - kooper->pos.x = entity->position.x + (sp10 * D_802BEB60_31CB80->unk_0C); - kooper->pos.z = entity->position.z - (sp14 * D_802BEB60_31CB80->unk_0C); + kooper->pos.x = entity->position.x + (sinAngle * KooperTweesterPhysicsPtr->radius); + kooper->pos.z = entity->position.z - (cosAngle * KooperTweesterPhysicsPtr->radius); - D_802BEB60_31CB80->unk_10 = clamp_angle(D_802BEB60_31CB80->unk_10 - D_802BEB60_31CB80->unk_14); - if (D_802BEB60_31CB80->unk_0C > 20.0f) { - D_802BEB60_31CB80->unk_0C--; - } else if (D_802BEB60_31CB80->unk_0C < 19.0f) { - D_802BEB60_31CB80->unk_0C++; + KooperTweesterPhysicsPtr->angle = clamp_angle(KooperTweesterPhysicsPtr->angle - KooperTweesterPhysicsPtr->angularVelocity); + if (KooperTweesterPhysicsPtr->radius > 20.0f) { + KooperTweesterPhysicsPtr->radius--; + } else if (KooperTweesterPhysicsPtr->radius < 19.0f) { + KooperTweesterPhysicsPtr->radius++; } - tempY = sin_rad((D_802BEB60_31CB80->unk_18 * TAU) / 360.0f) * 3.0f; + liftoffVelocity = sin_rad((KooperTweesterPhysicsPtr->liftoffVelocityPhase * TAU) / 360.0f) * 3.0f; - D_802BEB60_31CB80->unk_18 += 3.0f; + KooperTweesterPhysicsPtr->liftoffVelocityPhase += 3.0f; - if (D_802BEB60_31CB80->unk_18 > 150.0f) { - D_802BEB60_31CB80->unk_18 = 150.0f; + if (KooperTweesterPhysicsPtr->liftoffVelocityPhase > 150.0f) { + KooperTweesterPhysicsPtr->liftoffVelocityPhase = 150.0f; } - kooper->pos.y += tempY; + kooper->pos.y += liftoffVelocity; - kooper->renderYaw = clamp_angle(360.0f - D_802BEB60_31CB80->unk_10); - D_802BEB60_31CB80->unk_14 += 0.8; - if (D_802BEB60_31CB80->unk_14 > 40.0f) { - D_802BEB60_31CB80->unk_14 = 40.0f; + kooper->renderYaw = clamp_angle(360.0f - KooperTweesterPhysicsPtr->angle); + KooperTweesterPhysicsPtr->angularVelocity += 0.8; + if (KooperTweesterPhysicsPtr->angularVelocity > 40.0f) { + KooperTweesterPhysicsPtr->angularVelocity = 40.0f; } - if (--D_802BEB60_31CB80->unk_00 == 0) { - D_802BEB60_31CB80->unk_04++; + if (--KooperTweesterPhysicsPtr->countdown == 0) { + KooperTweesterPhysicsPtr->state++; } break; case 2: - kooper->flags = D_802BEB60_31CB80->flags; - D_802BEB60_31CB80->unk_00 = 30; - D_802BEB60_31CB80->unk_04++; + kooper->flags = KooperTweesterPhysicsPtr->prevFlags; + KooperTweesterPhysicsPtr->countdown = 30; + KooperTweesterPhysicsPtr->state++; break; case 3: partner_walking_update_player_tracking(kooper); partner_walking_update_motion(kooper); - if (--D_802BEB60_31CB80->unk_00 == 0) { - D_802BEB60_31CB80->unk_04 = 0; - D_8010C954 = 0; + if (--KooperTweesterPhysicsPtr->countdown == 0) { + KooperTweesterPhysicsPtr->state = 0; + TweesterTouchingPartner = NULL; } break; } @@ -168,16 +168,16 @@ ApiStatus func_802BD260_31B280(Evt* script, s32 isInitialCall) { } EvtScript world_kooper_update = { - EVT_CALL(func_802BD260_31B280) + EVT_CALL(KooperUpdate) EVT_RETURN EVT_END }; void func_802BD5F4_31B614(Npc* kooper) { - if (D_8010C954 != NULL) { - D_8010C954 = NULL; - kooper->flags = D_802BEB60_31CB80->flags; - D_802BEB60_31CB80->unk_04 = 0; + if (TweesterTouchingPartner != NULL) { + TweesterTouchingPartner = NULL; + kooper->flags = KooperTweesterPhysicsPtr->prevFlags; + KooperTweesterPhysicsPtr->state = 0; partner_clear_player_tracking(kooper); } } @@ -234,11 +234,11 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 20: - if (playerStatus->statusMenuCounterinputEnabledCounter == 0) { + if (playerStatus->inputEnabledCounter == 0) { if (playerStatus->decorationList == 0) { if (kooper->flags & 0x1000) { disable_player_input(); - script->functionTemp[2] = playerStatus->statusMenuCounterinputEnabledCounter; + script->functionTemp[2] = playerStatus->inputEnabledCounter; D_802BEC64 = 1; D_802BEB40_31CB60 = 0; D_802BEC6C = 0; @@ -289,7 +289,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { break; } disable_npc_blur(kooper); - if (script->functionTemp[2] < playerStatus->statusMenuCounterinputEnabledCounter) { + if (script->functionTemp[2] < playerStatus->inputEnabledCounter) { if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_100000)) { suggest_player_anim_clearUnkFlag(0x10002); } else { @@ -620,7 +620,7 @@ EvtScript world_kooper_use_ability = { EVT_END }; -ApiStatus func_802BE7E0_31C800(Evt* script, s32 isInitialCall) { +ApiStatus KooperPutAway(Evt* script, s32 isInitialCall) { Npc* kooper = script->owner2.npc; if (isInitialCall) { @@ -631,7 +631,7 @@ ApiStatus func_802BE7E0_31C800(Evt* script, s32 isInitialCall) { } EvtScript world_kooper_put_away = { - EVT_CALL(func_802BE7E0_31C800) + EVT_CALL(KooperPutAway) EVT_RETURN EVT_END }; diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index 632a26bbc8..29640588ad 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -16,7 +16,7 @@ BSS s32 D_802BFF20; BSS s32 D_802BFF24; BSS f32 D_802BFF28; BSS s32 D_802BFF2C; -BSS unkPartnerStruct D_802BFF30; +BSS TweesterPhysics LakilesterTweesterPhysics; void func_802BD100_320C50(void) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -78,25 +78,23 @@ EvtScript world_lakilester_take_out = { EVT_END }; -unkPartnerStruct* D_802BFE7C_3239CC = &D_802BFF30; +TweesterPhysics* LakilesterTweesterPhysicsPtr = &LakilesterTweesterPhysics; ApiStatus func_802BD2D4_320E24(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; Npc* lakilester = script->owner2.npc; + f32 sinAngle, cosAngle, liftoffVelocity; Entity* entity; - f32 sp10; - f32 sp14; - f32 tempY; if (isInitialCall) { partner_flying_enable(lakilester, 1); - mem_clear(D_802BFE7C_3239CC, sizeof(*D_802BFE7C_3239CC)); - D_8010C954 = NULL; + mem_clear(LakilesterTweesterPhysicsPtr, sizeof(TweesterPhysics)); + TweesterTouchingPartner = NULL; } - playerData->unk_2F4[8]++; + playerData->partnerUsedTime[PARTNER_LAKILESTER]++; lakilester->flags |= NPC_FLAG_DIRTY_SHADOW; - entity = D_8010C954; + entity = TweesterTouchingPartner; if (entity == NULL) { partner_flying_update_player_tracking(lakilester); @@ -104,60 +102,60 @@ ApiStatus func_802BD2D4_320E24(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - switch (D_802BFE7C_3239CC->unk_04) { + switch (LakilesterTweesterPhysicsPtr->state) { case 0: - D_802BFE7C_3239CC->unk_04 = 1; - D_802BFE7C_3239CC->flags = lakilester->flags; - D_802BFE7C_3239CC->unk_0C = fabsf(dist2D(lakilester->pos.x, lakilester->pos.z, entity->position.x, entity->position.z)); - D_802BFE7C_3239CC->unk_10 = atan2(entity->position.x, entity->position.z, lakilester->pos.x, lakilester->pos.z); - D_802BFE7C_3239CC->unk_14 = 6.0f; - D_802BFE7C_3239CC->unk_18 = 50.0f; - D_802BFE7C_3239CC->unk_00 = 120; + LakilesterTweesterPhysicsPtr->state = 1; + LakilesterTweesterPhysicsPtr->prevFlags = lakilester->flags; + LakilesterTweesterPhysicsPtr->radius = fabsf(dist2D(lakilester->pos.x, lakilester->pos.z, entity->position.x, entity->position.z)); + LakilesterTweesterPhysicsPtr->angle = atan2(entity->position.x, entity->position.z, lakilester->pos.x, lakilester->pos.z); + LakilesterTweesterPhysicsPtr->angularVelocity = 6.0f; + LakilesterTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; + LakilesterTweesterPhysicsPtr->countdown = 120; lakilester->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_40 | NPC_FLAG_ENABLE_HIT_SCRIPT; lakilester->flags &= ~NPC_FLAG_GRAVITY; case 1: - sin_cos_rad((D_802BFE7C_3239CC->unk_10 * TAU) / 360.0f, &sp10, &sp14); - lakilester->pos.x = entity->position.x + (sp10 * D_802BFE7C_3239CC->unk_0C); - lakilester->pos.z = entity->position.z - (sp14 * D_802BFE7C_3239CC->unk_0C); - D_802BFE7C_3239CC->unk_10 = clamp_angle(D_802BFE7C_3239CC->unk_10 - D_802BFE7C_3239CC->unk_14); + sin_cos_rad((LakilesterTweesterPhysicsPtr->angle * TAU) / 360.0f, &sinAngle, &cosAngle); + lakilester->pos.x = entity->position.x + (sinAngle * LakilesterTweesterPhysicsPtr->radius); + lakilester->pos.z = entity->position.z - (cosAngle * LakilesterTweesterPhysicsPtr->radius); + LakilesterTweesterPhysicsPtr->angle = clamp_angle(LakilesterTweesterPhysicsPtr->angle - LakilesterTweesterPhysicsPtr->angularVelocity); - if (D_802BFE7C_3239CC->unk_0C > 20.0f) { - D_802BFE7C_3239CC->unk_0C--; - } else if (D_802BFE7C_3239CC->unk_0C < 19.0f) { - D_802BFE7C_3239CC->unk_0C++; + if (LakilesterTweesterPhysicsPtr->radius > 20.0f) { + LakilesterTweesterPhysicsPtr->radius--; + } else if (LakilesterTweesterPhysicsPtr->radius < 19.0f) { + LakilesterTweesterPhysicsPtr->radius++; } - tempY = sin_rad((D_802BFE7C_3239CC->unk_18 * TAU) / 360.0f) * 3.0f; - D_802BFE7C_3239CC->unk_18 += 3.0f; + liftoffVelocity = sin_rad((LakilesterTweesterPhysicsPtr->liftoffVelocityPhase * TAU) / 360.0f) * 3.0f; + LakilesterTweesterPhysicsPtr->liftoffVelocityPhase += 3.0f; - if (D_802BFE7C_3239CC->unk_18 > 150.0f) { - D_802BFE7C_3239CC->unk_18 = 150.0f; + if (LakilesterTweesterPhysicsPtr->liftoffVelocityPhase > 150.0f) { + LakilesterTweesterPhysicsPtr->liftoffVelocityPhase = 150.0f; } - lakilester->pos.y += tempY; - lakilester->renderYaw = clamp_angle(360.0f - D_802BFE7C_3239CC->unk_10); - D_802BFE7C_3239CC->unk_14 += 0.8; + lakilester->pos.y += liftoffVelocity; + lakilester->renderYaw = clamp_angle(360.0f - LakilesterTweesterPhysicsPtr->angle); + LakilesterTweesterPhysicsPtr->angularVelocity += 0.8; - if (D_802BFE7C_3239CC->unk_14 > 40.0f) { - D_802BFE7C_3239CC->unk_14 = 40.0f; + if (LakilesterTweesterPhysicsPtr->angularVelocity > 40.0f) { + LakilesterTweesterPhysicsPtr->angularVelocity = 40.0f; } - if (--D_802BFE7C_3239CC->unk_00 == 0) { - D_802BFE7C_3239CC->unk_04++; + if (--LakilesterTweesterPhysicsPtr->countdown == 0) { + LakilesterTweesterPhysicsPtr->state++; } break; case 2: - lakilester->flags = D_802BFE7C_3239CC->flags; - D_802BFE7C_3239CC->unk_00 = 30; - D_802BFE7C_3239CC->unk_04++; + lakilester->flags = LakilesterTweesterPhysicsPtr->prevFlags; + LakilesterTweesterPhysicsPtr->countdown = 30; + LakilesterTweesterPhysicsPtr->state++; break; case 3: partner_flying_update_player_tracking(lakilester); partner_flying_update_motion(lakilester); - if (--D_802BFE7C_3239CC->unk_00 == 0) { - D_802BFE7C_3239CC->unk_04 = 0; - D_8010C954 = NULL; + if (--LakilesterTweesterPhysicsPtr->countdown == 0) { + LakilesterTweesterPhysicsPtr->state = 0; + TweesterTouchingPartner = NULL; } break; } @@ -171,32 +169,30 @@ EvtScript world_lakilester_update = { }; void func_802BD678_3211C8(Npc* npc) { - if (D_8010C954 != NULL) { - D_8010C954 = NULL; - npc->flags = D_802BFE7C_3239CC->flags; - D_802BFE7C_3239CC->unk_04 = 0; + if (TweesterTouchingPartner != NULL) { + TweesterTouchingPartner = NULL; + npc->flags = LakilesterTweesterPhysicsPtr->prevFlags; + LakilesterTweesterPhysicsPtr->state = 0; partner_clear_player_tracking(npc); } } -void func_802BD6BC_32120C(f32* arg0, f32* arg1) { +void func_802BD6BC_32120C(f32* outAngle, f32* outMagnitude) { PartnerActionStatus* lakilesterActionStatus = &gPartnerActionStatus; - f32 temp_f24 = lakilesterActionStatus->stickX; - f32 temp_f26 = lakilesterActionStatus->stickY; - f32 temp_f22 = -temp_f26; - f32 atan = atan2(0.0f, 0.0f, temp_f24, temp_f22); - f32 temp = clamp_angle(atan + gCameras->currentYaw); - f32 phi_f20 = 0.0f; + f32 stickX = lakilesterActionStatus->stickX; + f32 stickY = lakilesterActionStatus->stickY; + f32 angle = clamp_angle(atan2(0.0f, 0.0f, stickX, -stickY) + gCameras->currentYaw); + f32 magnitude = 0.0f; - if (dist2D(0.0f, 0.0f, temp_f24, temp_f22) >= 1.0) { - phi_f20 = 3.0f; - if (SQ(temp_f24) + SQ(temp_f26) > 3025.0f) { - phi_f20 = 6.0f; + if (dist2D(0.0f, 0.0f, stickX, -stickY) >= 1.0) { + magnitude = 3.0f; + if (SQ(stickX) + SQ(stickY) > 3025.0f) { + magnitude = 6.0f; } } - *arg0 = temp; - *arg1 = phi_f20; + *outAngle = angle; + *outMagnitude = magnitude; } s32 func_802BD7DC(void) { @@ -215,7 +211,7 @@ s32 func_802BD7DC(void) { return TRUE; } - ret = 0; + ret = FALSE; outLength = 16.0f; outY = npc->moveToPos.y + 7.0f; outX = playerStatus->position.x; @@ -624,12 +620,12 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { switch (D_802BFF14) { case 40: if (playerStatus->flags & PLAYER_STATUS_FLAGS_800 || - playerStatus->statusMenuCounterinputEnabledCounter) { + playerStatus->inputEnabledCounter) { playerStatus->flags &= ~NPC_FLAG_100; return ApiStatus_DONE2; } - + script->functionTemp[1] = 3; script->functionTemp[2] = disable_player_input(); D_802BFF04 = 1; @@ -646,7 +642,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { } if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_100000) { - if (script->functionTemp[2] < playerStatus->statusMenuCounterinputEnabledCounter) { + if (script->functionTemp[2] < playerStatus->inputEnabledCounter) { enable_player_input(); D_802BFF04 = 0; } @@ -655,7 +651,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { } if (script->functionTemp[1] == 0) { - if (script->functionTemp[2] < playerStatus->statusMenuCounterinputEnabledCounter) { + if (script->functionTemp[2] < playerStatus->inputEnabledCounter) { enable_player_input(); D_802BFF04 = 0; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_100; @@ -764,50 +760,50 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { case 104: if (playerStatus->flags & PLAYER_STATUS_ANIM_FLAGS_800) { D_802BFF14 = 10; + break; } else { npc->duration--; if (npc->duration != 0) { - if (partnerActionStatus->pressedButtons & (B_BUTTON | D_CBUTTONS) && - func_802BD7DC() != 0) { - + if (partnerActionStatus->pressedButtons & (B_BUTTON | D_CBUTTONS) && func_802BD7DC()) { D_802BFF14 = 3; } + break; } else { D_802BFF14 = 1; npc->flags |= NPC_FLAG_40; - case 1: - func_802BDDD8_321928(npc); - playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_400000; - D_802BFF18++; - npc->pos.y = npc->moveToPos.y + 2.0f; - - if (D_802BFF18 >= 10) { - D_802BFF18 = D_802BFF18 - 18; - } - - if (partnerActionStatus->inputDisabled == FALSE) { - playerStatus->targetYaw = npc->yaw; - } - - if (!(playerStatus->flags & PLAYER_STATUS_FLAGS_800)) { - if (partnerActionStatus->pressedButtons & (B_BUTTON | D_CBUTTONS)) { - if (func_802BD7DC() != 0) { - D_802BFF14 = 3; - } else { - if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_40000000)) { - sfx_play_sound_at_npc(SOUND_MENU_ERROR, 0, NPC_PARTNER); - } - playerStatus->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_40000000; - } - } - } else { - D_802BFF14 = 10; - break; - } } } + case 1: + func_802BDDD8_321928(npc); + playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_400000; + D_802BFF18++; + npc->pos.y = npc->moveToPos.y + 2.0f; + + if (D_802BFF18 >= 10) { + D_802BFF18 = D_802BFF18 - 18; + } + + if (partnerActionStatus->inputDisabled == FALSE) { + playerStatus->targetYaw = npc->yaw; + } + + if (!(playerStatus->flags & PLAYER_STATUS_FLAGS_800)) { + if (partnerActionStatus->pressedButtons & (B_BUTTON | D_CBUTTONS)) { + if (func_802BD7DC()) { + D_802BFF14 = 3; + } else { + if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_40000000)) { + sfx_play_sound_at_npc(SOUND_MENU_ERROR, 0, NPC_PARTNER); + } + playerStatus->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_40000000; + } + } + } else { + D_802BFF14 = 10; + break; + } break; - case 3: + case 3: npc->flags &= ~NPC_FLAG_40; playerStatus->flags |= NPC_FLAG_100; func_802BD7DC(); @@ -817,7 +813,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { } else { yaw = (0.0f + camYaw) - 90.0f; } - + npc->yaw = yaw; sp2C = dist2D(playerStatus->position.x, playerStatus->position.z, npc->moveToPos.x, npc->moveToPos.z); @@ -836,7 +832,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { suggest_player_anim_clearUnkFlag(0x10006); D_802BFF14 += 1; break; - case 4: + case 4: suggest_player_anim_clearUnkFlag(0x10007); D_802BFF14++; /* fallthrough */ @@ -909,7 +905,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { partnerActionStatus->actionState.b[3] = 0; partnerActionStatus->actionState.b[0] = 0; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_100; - + if (D_802BFF04 != 0) { D_802BFF04 = 0; enable_player_input(); diff --git a/src/world/partner/parakarry.c b/src/world/partner/parakarry.c index dea25711bf..8dac95d6b9 100644 --- a/src/world/partner/parakarry.c +++ b/src/world/partner/parakarry.c @@ -7,7 +7,7 @@ BSS s32 D_802BEBB8; BSS s32 D_802BEBBC; BSS s32 D_802BEBC0_31CBE0; BSS s32 D_802BEBC4; -BSS unkPartnerStruct D_802BEBC8; +BSS TweesterPhysics ParakarryTweesterPhysics; void world_parakarry_init(Npc* parakarry) { parakarry->collisionHeight = 37; @@ -20,7 +20,7 @@ void world_parakarry_init(Npc* parakarry) { D_802BEBC4 = 0; } -ApiStatus func_802BD148_3196B8(Evt* script, s32 isInitialCall) { +ApiStatus ParakarryTakeOut(Evt* script, s32 isInitialCall) { Npc* parakarry = script->owner2.npc; if (isInitialCall) { @@ -31,27 +31,27 @@ ApiStatus func_802BD148_3196B8(Evt* script, s32 isInitialCall) { } EvtScript world_parakarry_take_out = { - EVT_CALL(func_802BD148_3196B8) + EVT_CALL(ParakarryTakeOut) EVT_RETURN EVT_END }; -unkPartnerStruct* D_802BEAAC_31B01C = &D_802BEBC8; +TweesterPhysics* ParakarryTweesterPhysicsPtr = &ParakarryTweesterPhysics; -ApiStatus func_802BD180_3196F0(Evt* script, s32 isInitialCall) { +ApiStatus ParakarryUpdate(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - Entity* entity; Npc* parakarry = script->owner2.npc; - f32 sp10, sp14, tempY; + f32 sinAngle, cosAngle, liftoffVelocity; + Entity* entity; if (isInitialCall) { partner_flying_enable(parakarry, 1); - mem_clear(D_802BEAAC_31B01C, sizeof(*D_802BEAAC_31B01C)); - D_8010C954 = 0; + mem_clear(ParakarryTweesterPhysicsPtr, sizeof(TweesterPhysics)); + TweesterTouchingPartner = NULL; } - playerData->unk_2F4[4]++; - entity = D_8010C954; + playerData->partnerUsedTime[PARTNER_PARAKARRY]++; + entity = TweesterTouchingPartner; if (entity == NULL) { partner_flying_update_player_tracking(parakarry); @@ -59,62 +59,62 @@ ApiStatus func_802BD180_3196F0(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - switch (D_802BEAAC_31B01C->unk_04) { + switch (ParakarryTweesterPhysicsPtr->state) { case 0: - D_802BEAAC_31B01C->unk_04 = 1; - D_802BEAAC_31B01C->flags = parakarry->flags; - D_802BEAAC_31B01C->unk_0C = fabsf(dist2D(parakarry->pos.x, parakarry->pos.z, + ParakarryTweesterPhysicsPtr->state = 1; + ParakarryTweesterPhysicsPtr->prevFlags = parakarry->flags; + ParakarryTweesterPhysicsPtr->radius = fabsf(dist2D(parakarry->pos.x, parakarry->pos.z, entity->position.x, entity->position.z)); - D_802BEAAC_31B01C->unk_10 = atan2(entity->position.x, entity->position.z, + ParakarryTweesterPhysicsPtr->angle = atan2(entity->position.x, entity->position.z, parakarry->pos.x, parakarry->pos.z); - D_802BEAAC_31B01C->unk_14 = 6.0f; - D_802BEAAC_31B01C->unk_18 = 50.0f; - D_802BEAAC_31B01C->unk_00 = 120; + ParakarryTweesterPhysicsPtr->angularVelocity = 6.0f; + ParakarryTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; + ParakarryTweesterPhysicsPtr->countdown = 120; parakarry->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_40 | NPC_FLAG_ENABLE_HIT_SCRIPT; parakarry->flags &= ~NPC_FLAG_GRAVITY; case 1: - sin_cos_rad((D_802BEAAC_31B01C->unk_10 * TAU) / 360.0f, &sp10, &sp14); - parakarry->pos.x = entity->position.x + (sp10 * D_802BEAAC_31B01C->unk_0C); - parakarry->pos.z = entity->position.z - (sp14 * D_802BEAAC_31B01C->unk_0C); - D_802BEAAC_31B01C->unk_10 = clamp_angle(D_802BEAAC_31B01C->unk_10 - D_802BEAAC_31B01C->unk_14); + sin_cos_rad((ParakarryTweesterPhysicsPtr->angle * TAU) / 360.0f, &sinAngle, &cosAngle); + parakarry->pos.x = entity->position.x + (sinAngle * ParakarryTweesterPhysicsPtr->radius); + parakarry->pos.z = entity->position.z - (cosAngle * ParakarryTweesterPhysicsPtr->radius); + ParakarryTweesterPhysicsPtr->angle = clamp_angle(ParakarryTweesterPhysicsPtr->angle - ParakarryTweesterPhysicsPtr->angularVelocity); - if (D_802BEAAC_31B01C->unk_0C > 20.0f) { - D_802BEAAC_31B01C->unk_0C--; - } else if (D_802BEAAC_31B01C->unk_0C < 19.0f) { - D_802BEAAC_31B01C->unk_0C++; + if (ParakarryTweesterPhysicsPtr->radius > 20.0f) { + ParakarryTweesterPhysicsPtr->radius--; + } else if (ParakarryTweesterPhysicsPtr->radius < 19.0f) { + ParakarryTweesterPhysicsPtr->radius++; } - tempY = sin_rad((D_802BEAAC_31B01C->unk_18 * TAU) / 360.0f) * 3.0f; - D_802BEAAC_31B01C->unk_18 += 3.0f; + liftoffVelocity = sin_rad((ParakarryTweesterPhysicsPtr->liftoffVelocityPhase * TAU) / 360.0f) * 3.0f; + ParakarryTweesterPhysicsPtr->liftoffVelocityPhase += 3.0f; - if (D_802BEAAC_31B01C->unk_18 > 150.0f) { - D_802BEAAC_31B01C->unk_18 = 150.0f; + if (ParakarryTweesterPhysicsPtr->liftoffVelocityPhase > 150.0f) { + ParakarryTweesterPhysicsPtr->liftoffVelocityPhase = 150.0f; } - parakarry->pos.y += tempY; - parakarry->renderYaw = clamp_angle(360.0f - D_802BEAAC_31B01C->unk_10); - D_802BEAAC_31B01C->unk_14 += 0.8; + parakarry->pos.y += liftoffVelocity; + parakarry->renderYaw = clamp_angle(360.0f - ParakarryTweesterPhysicsPtr->angle); + ParakarryTweesterPhysicsPtr->angularVelocity += 0.8; - if (D_802BEAAC_31B01C->unk_14 > 40.0f) { - D_802BEAAC_31B01C->unk_14 = 40.0f; + if (ParakarryTweesterPhysicsPtr->angularVelocity > 40.0f) { + ParakarryTweesterPhysicsPtr->angularVelocity = 40.0f; } - if (--D_802BEAAC_31B01C->unk_00 == 0) { - D_802BEAAC_31B01C->unk_04++; + if (--ParakarryTweesterPhysicsPtr->countdown == 0) { + ParakarryTweesterPhysicsPtr->state++; } break; case 2: - parakarry->flags = D_802BEAAC_31B01C->flags; - D_802BEAAC_31B01C->unk_00 = 30; - D_802BEAAC_31B01C->unk_04++; + parakarry->flags = ParakarryTweesterPhysicsPtr->prevFlags; + ParakarryTweesterPhysicsPtr->countdown = 30; + ParakarryTweesterPhysicsPtr->state++; break; case 3: partner_flying_update_player_tracking(parakarry); partner_flying_update_motion(parakarry); - if (--D_802BEAAC_31B01C->unk_00 == 0) { - D_802BEAAC_31B01C->unk_04 = 0; - D_8010C954 = 0; + if (--ParakarryTweesterPhysicsPtr->countdown == 0) { + ParakarryTweesterPhysicsPtr->state = 0; + TweesterTouchingPartner = NULL; } break; } @@ -122,16 +122,16 @@ ApiStatus func_802BD180_3196F0(Evt* script, s32 isInitialCall) { } EvtScript world_parakarry_update = { - EVT_CALL(func_802BD180_3196F0) + EVT_CALL(ParakarryUpdate) EVT_RETURN EVT_END }; void func_802BD514_319A84(Npc* parakarry) { - if (D_8010C954) { - D_8010C954 = 0; - parakarry->flags = D_802BEAAC_31B01C->flags; - D_802BEAAC_31B01C->unk_04 = 0; + if (TweesterTouchingPartner) { + TweesterTouchingPartner = NULL; + parakarry->flags = ParakarryTweesterPhysicsPtr->prevFlags; + ParakarryTweesterPhysicsPtr->state = 0; partner_clear_player_tracking (parakarry); } } @@ -167,7 +167,7 @@ EvtScript world_parakarry_use_ability = { EVT_END }; -ApiStatus func_802BE8D4_31AE44(Evt* script, s32 isInitialCall) { +ApiStatus ParakarryPutAway(Evt* script, s32 isInitialCall) { Npc* parakarry = script->owner2.npc; if (isInitialCall) { @@ -178,7 +178,7 @@ ApiStatus func_802BE8D4_31AE44(Evt* script, s32 isInitialCall) { } EvtScript world_parakarry_put_away = { - EVT_CALL(func_802BE8D4_31AE44) + EVT_CALL(ParakarryPutAway) EVT_RETURN EVT_END }; diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c index 8147ed784b..ff61f3641c 100644 --- a/src/world/partner/sushie.c +++ b/src/world/partner/sushie.c @@ -19,7 +19,7 @@ BSS s32 bss_802BFF00; BSS s32 bss_802BFF04; BSS s32 bss_802BFF08; BSS s32 bss_802BFF0C; -BSS unkPartnerStruct D_802BFF10_320C80; +BSS TweesterPhysics SushieTweesterPhysics; f32 D_802BFDB0_320B20 = 0.0f; @@ -93,20 +93,20 @@ void func_802BD368_31E0D8(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 INCLUDE_ASM(s32, "world/partner/sushie", func_802BD414_31E184); -s32 func_802BE280_31EFF0(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg4, f32 arg5, f32* arg6) { - f32 sp38, sp3C, sp40, sp44, sp48, sp4C, sp50, sp54, sp58; - s32 colliderRayResult; +s32 func_802BE280_31EFF0(s32 arg0, f32* x, f32* y, f32* z, f32 length, f32 radius, f32* yaw) { + f32 sinAngle, cosAngle, hitX, hitY, hitZ, totalLength, hitNx, hitNy, hitNz; + s32 hitResult; - sin_cos_rad((*arg6 * TAU) / 360.0f, &sp38, &sp3C); - sp3C = -sp3C; - sp4C = arg5 + arg4; - colliderRayResult = test_ray_colliders(0x10000, *arg1, *arg2, *arg3, sp38, 0.0f, sp3C, &sp40, &sp44, &sp48, &sp4C, &sp50, &sp54, &sp58); + sin_cos_rad((*yaw * TAU) / 360.0f, &sinAngle, &cosAngle); + cosAngle = -cosAngle; + totalLength = radius + length; + hitResult = test_ray_colliders(0x10000, *x, *y, *z, sinAngle, 0.0f, cosAngle, &hitX, &hitY, &hitZ, &totalLength, &hitNx, &hitNy, &hitNz); - if (colliderRayResult >= 0) { - *arg6 = atan2(0.0f, 0.0f, sp50, sp58); + if (hitResult >= 0) { + *yaw = atan2(0.0f, 0.0f, hitNx, hitNz); } - return colliderRayResult; + return hitResult; } void func_802BE3A4_31F114(Npc*); @@ -129,7 +129,7 @@ void world_sushie_init(Npc* sushie) { bss_802BFEF4 = 0; } -s32 func_802BF568_3202D8(Evt* script, s32 isInitialCall) { +s32 SushieTakeOut(Evt* script, s32 isInitialCall) { Npc* sushie = script->owner2.npc; if (isInitialCall) { @@ -140,25 +140,25 @@ s32 func_802BF568_3202D8(Evt* script, s32 isInitialCall) { } EvtScript world_sushie_take_out = { - EVT_CALL(func_802BF568_3202D8) + EVT_CALL(SushieTakeOut) EVT_RETURN EVT_END }; -unkPartnerStruct* D_802BFDF8_320B68 = &D_802BFF10_320C80; +TweesterPhysics* SushieTweesterPhysicsPtr = &SushieTweesterPhysics; -ApiStatus func_802BF5A0_320310(Evt* script, s32 isInitialCall) { +ApiStatus SushieUpdate(Evt* script, s32 isInitialCall) { Npc* sushie = script->owner2.npc; + f32 sinAngle, cosAngle, liftoffVelocity; Entity* entity; - f32 sp10, sp14, tempY; if (isInitialCall) { partner_walking_enable(sushie, 1); - mem_clear(D_802BFDF8_320B68, sizeof(*D_802BFDF8_320B68)); - D_8010C954 = 0; + mem_clear(SushieTweesterPhysicsPtr, sizeof(TweesterPhysics)); + TweesterTouchingPartner = NULL; } - entity = D_8010C954; + entity = TweesterTouchingPartner; if (entity == NULL) { partner_walking_update_player_tracking(sushie); @@ -166,61 +166,61 @@ ApiStatus func_802BF5A0_320310(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - switch (D_802BFDF8_320B68->unk_04) { + switch (SushieTweesterPhysicsPtr->state) { case 0: - D_802BFDF8_320B68->unk_04 = 1; - D_802BFDF8_320B68->flags = sushie->flags; - D_802BFDF8_320B68->unk_0C = fabsf(dist2D(sushie->pos.x, sushie->pos.z, + SushieTweesterPhysicsPtr->state = 1; + SushieTweesterPhysicsPtr->prevFlags = sushie->flags; + SushieTweesterPhysicsPtr->radius = fabsf(dist2D(sushie->pos.x, sushie->pos.z, entity->position.x, entity->position.z)); - D_802BFDF8_320B68->unk_10 = atan2(entity->position.x, entity->position.z, sushie->pos.x, sushie->pos.z); - D_802BFDF8_320B68->unk_14 = 6.0f; - D_802BFDF8_320B68->unk_18 = 50.0f; - D_802BFDF8_320B68->unk_00 = 120; + SushieTweesterPhysicsPtr->angle = atan2(entity->position.x, entity->position.z, sushie->pos.x, sushie->pos.z); + SushieTweesterPhysicsPtr->angularVelocity = 6.0f; + SushieTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; + SushieTweesterPhysicsPtr->countdown = 120; sushie->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_40 | NPC_FLAG_ENABLE_HIT_SCRIPT; sushie->flags &= ~NPC_FLAG_GRAVITY; case 1: - sin_cos_rad((D_802BFDF8_320B68->unk_10 * TAU) / 360.0f, &sp10, &sp14); - sushie->pos.x = entity->position.x + (sp10 * D_802BFDF8_320B68->unk_0C); - sushie->pos.z = entity->position.z - (sp14 * D_802BFDF8_320B68->unk_0C); - D_802BFDF8_320B68->unk_10 = clamp_angle(D_802BFDF8_320B68->unk_10 - D_802BFDF8_320B68->unk_14); + sin_cos_rad((SushieTweesterPhysicsPtr->angle * TAU) / 360.0f, &sinAngle, &cosAngle); + sushie->pos.x = entity->position.x + (sinAngle * SushieTweesterPhysicsPtr->radius); + sushie->pos.z = entity->position.z - (cosAngle * SushieTweesterPhysicsPtr->radius); + SushieTweesterPhysicsPtr->angle = clamp_angle(SushieTweesterPhysicsPtr->angle - SushieTweesterPhysicsPtr->angularVelocity); - if (D_802BFDF8_320B68->unk_0C > 20.0f) { - D_802BFDF8_320B68->unk_0C--; - } else if (D_802BFDF8_320B68->unk_0C < 19.0f) { - D_802BFDF8_320B68->unk_0C++; + if (SushieTweesterPhysicsPtr->radius > 20.0f) { + SushieTweesterPhysicsPtr->radius--; + } else if (SushieTweesterPhysicsPtr->radius < 19.0f) { + SushieTweesterPhysicsPtr->radius++; } - tempY = sin_rad((D_802BFDF8_320B68->unk_18 * TAU) / 360.0f) * 3.0f; - D_802BFDF8_320B68->unk_18 += 3.0f; + liftoffVelocity = sin_rad((SushieTweesterPhysicsPtr->liftoffVelocityPhase * TAU) / 360.0f) * 3.0f; + SushieTweesterPhysicsPtr->liftoffVelocityPhase += 3.0f; - if (D_802BFDF8_320B68->unk_18 > 150.0f) { - D_802BFDF8_320B68->unk_18 = 150.0f; + if (SushieTweesterPhysicsPtr->liftoffVelocityPhase > 150.0f) { + SushieTweesterPhysicsPtr->liftoffVelocityPhase = 150.0f; } - sushie->pos.y += tempY; - sushie->renderYaw = clamp_angle(360.0f - D_802BFDF8_320B68->unk_10); - D_802BFDF8_320B68->unk_14 += 0.8; + sushie->pos.y += liftoffVelocity; + sushie->renderYaw = clamp_angle(360.0f - SushieTweesterPhysicsPtr->angle); + SushieTweesterPhysicsPtr->angularVelocity += 0.8; - if (D_802BFDF8_320B68->unk_14 > 40.0f) { - D_802BFDF8_320B68->unk_14 = 40.0f; + if (SushieTweesterPhysicsPtr->angularVelocity > 40.0f) { + SushieTweesterPhysicsPtr->angularVelocity = 40.0f; } - if (--D_802BFDF8_320B68->unk_00 == 0) { - D_802BFDF8_320B68->unk_04++; + if (--SushieTweesterPhysicsPtr->countdown == 0) { + SushieTweesterPhysicsPtr->state++; } break; case 2: - sushie->flags = D_802BFDF8_320B68->flags; - D_802BFDF8_320B68->unk_00 = 30; - D_802BFDF8_320B68->unk_04++; + sushie->flags = SushieTweesterPhysicsPtr->prevFlags; + SushieTweesterPhysicsPtr->countdown = 30; + SushieTweesterPhysicsPtr->state++; break; case 3: partner_walking_update_player_tracking(sushie); partner_walking_update_motion(sushie); - if (--D_802BFDF8_320B68->unk_00 == 0) { - D_802BFDF8_320B68->unk_04 = 0; - D_8010C954 = 0; + if (--SushieTweesterPhysicsPtr->countdown == 0) { + SushieTweesterPhysicsPtr->state = 0; + TweesterTouchingPartner = NULL; } break; } @@ -229,21 +229,21 @@ ApiStatus func_802BF5A0_320310(Evt* script, s32 isInitialCall) { } EvtScript world_sushie_update = { - EVT_CALL(func_802BF5A0_320310) + EVT_CALL(SushieUpdate) EVT_RETURN EVT_END }; void func_802BF920_320690(Npc* sushie) { - if (D_8010C954 != NULL) { - D_8010C954 = NULL; - sushie->flags = D_802BFDF8_320B68->flags; - D_802BFDF8_320B68->unk_04 = 0; + if (TweesterTouchingPartner != NULL) { + TweesterTouchingPartner = NULL; + sushie->flags = SushieTweesterPhysicsPtr->prevFlags; + SushieTweesterPhysicsPtr->state = 0; partner_clear_player_tracking(sushie); } } -s32 func_802BF964_3206D4(Evt* script, s32 isInitialCall) { +s32 SushiePutAway(Evt* script, s32 isInitialCall) { Npc* sushie = script->owner2.npc; if (isInitialCall) { @@ -255,7 +255,7 @@ s32 func_802BF964_3206D4(Evt* script, s32 isInitialCall) { } EvtScript world_sushie_put_away = { - EVT_CALL(func_802BF964_3206D4) + EVT_CALL(SushiePutAway) EVT_RETURN EVT_END }; diff --git a/src/world/partner/twink.c b/src/world/partner/twink.c index d145f901bb..4dd625a487 100644 --- a/src/world/partner/twink.c +++ b/src/world/partner/twink.c @@ -27,7 +27,7 @@ ApiStatus TwinkUpdate(Evt* script, s32 isInitialCall) { partner_flying_update_player_tracking(twink); partner_flying_update_motion(twink); - playerData->unk_2F4[PARTNER_TWINK]++; + playerData->partnerUsedTime[PARTNER_TWINK]++; return ApiStatus_BLOCK; } diff --git a/src/world/partner/watt.c b/src/world/partner/watt.c index 3e32876a85..2a223cb582 100644 --- a/src/world/partner/watt.c +++ b/src/world/partner/watt.c @@ -32,7 +32,7 @@ BSS s32 D_802BE308; BSS s32 D_802BE30C; BSS unk_802BE310* D_802BE310; BSS s32 D_802BE314; -BSS unkPartnerStruct D_802BE318; +BSS TweesterPhysics WattTweesterPhysics; s32 D_802BE250_31DDC0 = 0x18; @@ -87,28 +87,25 @@ EvtScript world_watt_take_out = { EVT_END }; -unkPartnerStruct* D_802BE274_31DDE4 = &D_802BE318; +TweesterPhysics* WattTweesterPhysicsPtr = &WattTweesterPhysics; s32 D_802BE278_31DDE8 = 0; -ApiStatus func_802BD2B4_31CE24(Evt* script, s32 isInitialCall) { +ApiStatus WattUpdate(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - Entity* entity; Npc* watt = script->owner2.npc; - f32 sp10, sp14; - f32 new_var; - f32 temp_f0; - + f32 sinAngle, cosAngle, liftoffVelocity; + Entity* entity; if (gPartnerActionStatus.actionState.b[1] == 0) { if (isInitialCall) { partner_flying_enable(watt, 1); - mem_clear(D_802BE274_31DDE4, sizeof(*D_802BE274_31DDE4)); - D_8010C954 = NULL; + mem_clear(WattTweesterPhysicsPtr, sizeof(TweesterPhysics)); + TweesterTouchingPartner = NULL; } - entity = D_8010C954; - playerData->unk_2F4[6]++; + entity = TweesterTouchingPartner; + playerData->partnerUsedTime[PARTNER_WATT]++; if (entity == NULL) { func_802BD100_31CC70(watt); @@ -135,61 +132,60 @@ ApiStatus func_802BD2B4_31CE24(Evt* script, s32 isInitialCall) { return 0; } - switch (D_802BE274_31DDE4->unk_04) { + switch (WattTweesterPhysicsPtr->state) { case 0: - D_802BE274_31DDE4->unk_04 = 1; - D_802BE274_31DDE4->flags = watt->flags; - D_802BE274_31DDE4->unk_0C = fabsf(dist2D(watt->pos.x, watt->pos.z, + WattTweesterPhysicsPtr->state = 1; + WattTweesterPhysicsPtr->prevFlags = watt->flags; + WattTweesterPhysicsPtr->radius = fabsf(dist2D(watt->pos.x, watt->pos.z, entity->position.x, entity->position.z)); - D_802BE274_31DDE4->unk_10 = atan2(entity->position.x, entity->position.z, watt->pos.x, watt->pos.z); - D_802BE274_31DDE4->unk_14 = 6.0f; - D_802BE274_31DDE4->unk_18 = 50.0f; - D_802BE274_31DDE4->unk_00 = 120; + WattTweesterPhysicsPtr->angle = atan2(entity->position.x, entity->position.z, watt->pos.x, watt->pos.z); + WattTweesterPhysicsPtr->angularVelocity = 6.0f; + WattTweesterPhysicsPtr->liftoffVelocityPhase = 50.0f; + WattTweesterPhysicsPtr->countdown = 120; watt->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_40 | NPC_FLAG_ENABLE_HIT_SCRIPT; watt->flags &= ~NPC_FLAG_GRAVITY; case 1: - sin_cos_rad((D_802BE274_31DDE4->unk_10 * TAU) / 360.0f, &sp10, &sp14); - watt->pos.x = (entity->position.x + (sp10 * D_802BE274_31DDE4->unk_0C)); - watt->pos.z = (entity->position.z - (sp14 * D_802BE274_31DDE4->unk_0C)); - D_802BE274_31DDE4->unk_10 = clamp_angle(D_802BE274_31DDE4->unk_10 - D_802BE274_31DDE4->unk_14); + sin_cos_rad((WattTweesterPhysicsPtr->angle * TAU) / 360.0f, &sinAngle, &cosAngle); + watt->pos.x = (entity->position.x + (sinAngle * WattTweesterPhysicsPtr->radius)); + watt->pos.z = (entity->position.z - (cosAngle * WattTweesterPhysicsPtr->radius)); + WattTweesterPhysicsPtr->angle = clamp_angle(WattTweesterPhysicsPtr->angle - WattTweesterPhysicsPtr->angularVelocity); - if (D_802BE274_31DDE4->unk_0C > 20.0f) { - D_802BE274_31DDE4->unk_0C--; - } else if (D_802BE274_31DDE4->unk_0C < 19.0f) { - D_802BE274_31DDE4->unk_0C++; + if (WattTweesterPhysicsPtr->radius > 20.0f) { + WattTweesterPhysicsPtr->radius--; + } else if (WattTweesterPhysicsPtr->radius < 19.0f) { + WattTweesterPhysicsPtr->radius++; } - temp_f0 = sin_rad(D_802BE274_31DDE4->unk_18 * TAU / 360.0f); - D_802BE274_31DDE4->unk_18 += 3.0f; - new_var = temp_f0 * 3.0f; + liftoffVelocity = sin_rad(WattTweesterPhysicsPtr->liftoffVelocityPhase * TAU / 360.0f) * 3.0f; + WattTweesterPhysicsPtr->liftoffVelocityPhase += 3.0f; - if (D_802BE274_31DDE4->unk_18 > 150.0f) { - D_802BE274_31DDE4->unk_18 = 150.0f; + if (WattTweesterPhysicsPtr->liftoffVelocityPhase > 150.0f) { + WattTweesterPhysicsPtr->liftoffVelocityPhase = 150.0f; } - watt->pos.y += new_var; - watt->renderYaw = clamp_angle(360.0f - D_802BE274_31DDE4->unk_10); - D_802BE274_31DDE4->unk_14 += 0.8; + watt->pos.y += liftoffVelocity; + watt->renderYaw = clamp_angle(360.0f - WattTweesterPhysicsPtr->angle); + WattTweesterPhysicsPtr->angularVelocity += 0.8; - if (D_802BE274_31DDE4->unk_14 > 40.0f) { - D_802BE274_31DDE4->unk_14 = 40.0f; + if (WattTweesterPhysicsPtr->angularVelocity > 40.0f) { + WattTweesterPhysicsPtr->angularVelocity = 40.0f; } - if (--D_802BE274_31DDE4->unk_00 == 0) { - D_802BE274_31DDE4->unk_04++; + if (--WattTweesterPhysicsPtr->countdown == 0) { + WattTweesterPhysicsPtr->state++; } break; case 2: - watt->flags = D_802BE274_31DDE4->flags; - D_802BE274_31DDE4->unk_00 = 30; - D_802BE274_31DDE4->unk_04++; + watt->flags = WattTweesterPhysicsPtr->prevFlags; + WattTweesterPhysicsPtr->countdown = 30; + WattTweesterPhysicsPtr->state++; break; case 3: partner_flying_update_player_tracking(watt); partner_flying_update_motion(watt); - if (--D_802BE274_31DDE4->unk_00 == 0) { - D_802BE274_31DDE4->unk_04 = 0; - D_8010C954 = NULL; + if (--WattTweesterPhysicsPtr->countdown == 0) { + WattTweesterPhysicsPtr->state = 0; + TweesterTouchingPartner = NULL; } break; } @@ -204,16 +200,16 @@ ApiStatus func_802BD2B4_31CE24(Evt* script, s32 isInitialCall) { } EvtScript world_watt_update = { - EVT_CALL(func_802BD2B4_31CE24) + EVT_CALL(WattUpdate) EVT_RETURN EVT_END }; void func_802BD710_31D280(Npc* watt) { - if (D_8010C954 != NULL) { - D_8010C954 = NULL; - watt->flags = D_802BE274_31DDE4->flags; - D_802BE274_31DDE4->unk_04 = 0; + if (TweesterTouchingPartner != NULL) { + TweesterTouchingPartner = NULL; + watt->flags = WattTweesterPhysicsPtr->prevFlags; + WattTweesterPhysicsPtr->state = 0; partner_clear_player_tracking(watt); } } @@ -227,7 +223,7 @@ EvtScript world_watt_use_ability = { EVT_END }; -s32 func_802BDD0C_31D87C(Evt* script, s32 isInitialCall) { +s32 WattPutAway(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* wattActionStatus = &gPartnerActionStatus; Npc* watt = script->owner2.npc; @@ -250,7 +246,7 @@ s32 func_802BDD0C_31D87C(Evt* script, s32 isInitialCall) { } EvtScript world_watt_put_away = { - EVT_CALL(func_802BDD0C_31D87C) + EVT_CALL(WattPutAway) EVT_RETURN EVT_END }; @@ -345,7 +341,7 @@ void func_802BE070_31DBE0(void) { Npc* new_var2; Camera* camera = gCameras; PlayerStatus* playerStatus; - f32 temp, temp_f20; + f32 temp, angle; f32 spriteFacingAngle; s32 phi_v1; @@ -369,16 +365,16 @@ void func_802BE070_31DBE0(void) { } } - temp_f20 = (camera->currentYaw + 270.0f - gPlayerStatusPtr->spriteFacingAngle + phi_v1) * TAU / 360.0f; + angle = (camera->currentYaw + 270.0f - gPlayerStatusPtr->spriteFacingAngle + phi_v1) * TAU / 360.0f; playerStatus = gPlayerStatusPtr; partnerNPC = wPartnerNpc; - partnerNPC->pos.x = playerStatus->position.x + (sin_rad(temp_f20) * gPlayerStatusPtr->colliderDiameter * temp); + partnerNPC->pos.x = playerStatus->position.x + (sin_rad(angle) * gPlayerStatusPtr->colliderDiameter * temp); new_var2 = wPartnerNpc; playerStatus = gPlayerStatusPtr; partnerNPC = new_var2; - partnerNPC->pos.z = playerStatus->position.z - (cos_rad(temp_f20) * gPlayerStatusPtr->colliderDiameter * temp); + partnerNPC->pos.z = playerStatus->position.z - (cos_rad(angle) * gPlayerStatusPtr->colliderDiameter * temp); wPartnerNpc->yaw = gPlayerStatusPtr->targetYaw; wPartnerNpc->pos.y = gPlayerStatusPtr->position.y + 5.0f; diff --git a/src/world/partners.c b/src/world/partners.c index 74ec28c274..327c0c77f3 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -482,7 +482,7 @@ void partner_create_npc(void) { npc->scale.z = 0.0f; } - D_8010C954 = 0; + TweesterTouchingPartner = NULL; } void partner_free_npc(void) { diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index aa8a27ee3e..0d424407bf 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -809,9 +809,9 @@ void draw_shop_items(void) { } if (i == shop->currentItemSlot) { - set_hud_element_render_pos(shop->costIconID, (xTemp + xOffset) - 6, yTemp + 5); - set_hud_element_scale(shop->costIconID, 0.7f); - draw_hud_element_clipped(shop->costIconID); + hud_element_set_render_pos(shop->costIconID, (xTemp + xOffset) - 6, yTemp + 5); + hud_element_set_scale(shop->costIconID, 0.7f); + hud_element_draw_clipped(shop->costIconID); } } } @@ -898,9 +898,9 @@ s32 MakeShop(Evt* script, s32 isInitialCall) { numShopItems++; } - shop->costIconID = create_hud_element(&HudScript_Item_Coin); - set_hud_element_flags(shop->costIconID, HUD_ELEMENT_FLAGS_80); - clear_hud_element_flags(shop->costIconID, HUD_ELEMENT_FLAGS_8000); + shop->costIconID = hud_element_create(&HudScript_Item_Coin); + hud_element_set_flags(shop->costIconID, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(shop->costIconID, HUD_ELEMENT_FLAGS_FILTER_TEX); get_generic_entity(create_generic_entity_frontUI(NULL, draw_shop_items)); set_window_properties(0xA, 100, 66, 120, 28, 0, shop_draw_item_name, NULL, -1); set_window_properties(0xB, 32, 184, 256, 32, 1, shop_draw_item_desc, NULL, -1); diff --git a/src/world/world.c b/src/world/world.c index ca4907a8c3..5e939ef2fb 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -126,7 +126,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { clear_animator_list(); clear_entity_models(); clear_npcs(); - clear_hud_element_cache(); + hud_element_clear_cache(); clear_trigger_data(); clear_model_data(); clear_sprite_shading_data(); diff --git a/tools/symz.txt b/tools/symz.txt index 114df9c2e8..f48cf1d12e 100644 --- a/tools/symz.txt +++ b/tools/symz.txt @@ -864,13 +864,13 @@ D_802E0C60 = 0x802E0C60; D_802E0C64 = 0x802E0C64; D_802E0C68 = 0x802E0C68; D_802E0C70 = 0x802E0C70; -SaveBlockTutorialMessagePrinterClosed = 0x802EB390; -SaveBlockResultMessagePrinterClosed = 0x802EB394; -SaveBlockTutorialMessagePrinter = 0x802EB398; -SaveBlockResultMessagePrinter = 0x802EB39C; -D_802EB3A0 = 0x802EB3A0; +SaveBlockTutorialPrinterClosed = 0x802EB390; +SaveBlockResultPrinterClosed = 0x802EB394; +SaveBlockTutorialPrinter = 0x802EB398; +SaveBlockResultPrinter = 0x802EB39C; +SwitchToLink = 0x802EB3A0; TriggerBlockVanishEffect = 0x802EB3B0; -D_802EB3C0 = 0x802EB3C0; +HeartBlockPrinterClosed = 0x802EB3C0; D_802ED970 = 0x802ED970; D_802EE8D0 = 0x802EE8D0; D_802F39D0 = 0x802F39D0; diff --git a/ver/us/asm/data/16A680.data.s b/ver/us/asm/data/16A680.data.s index cc20b1f5de..efaec0f190 100644 --- a/ver/us/asm/data/16A680.data.s +++ b/ver/us/asm/data/16A680.data.s @@ -2,13 +2,13 @@ .section .data -dlabel D_80249E20 +dlabel filemenu_hudElemScripts .word 0x802423DC, func_80242434_9D9454, 0x8024248C, 0x802424E4, D_8024253C_AB46AC, 0x80242594, dgb_16_npcGroup_802425EC, 0x80242408, flo_14_updateTexturePan_80242460, 0x802424B8, 0x80242510, D_80242568_A4EF88, 0x802425C0, D_80242618_9800E8, 0x802422D4, 0x80242300, mac_02_SetCamVfov, omo_09_UnkFunc61, func_80242384_833B84, D_802423B0 dlabel D_80249E70 .word 0x00000102, 0x02030405, 0x06000001, 0x02020306, 0x06060000, 0x01020203, 0x06060600, 0x00010202, 0x03060606, 0x00000102, 0x02030606, 0x06000000 -dlabel D_80249EA0 +dlabel filemenu_windowBPs .word 0x2D000000, 0x00000000, 0x00000000, filemenu_draw_contents_title, 0x00000000, 0x2C000000, filemenu_update_show_title, 0x00000000, D_8024BB08, 0x3300FFFE, 0x00060044, 0x00140000, filemenu_draw_contents_stereo, 0x00000000, 0x2C000000, filemenu_update_show_options_left, 0x00000000, D_8024BAD0, 0x340000DD, 0x00060044, 0x00140000, filemenu_draw_contents_mono, 0x00000000, 0x2C000000, filemenu_update_show_options_right, 0x00000000, D_8024BAD0, 0x35000005, 0x00AB0058, 0x00100000, filemenu_draw_contents_option_left, 0x00000000, 0x2C000000, filemenu_update_show_options_bottom, 0x00000000, D_8024BB40, 0x36000000, 0x00AB0058, 0x00100000, filemenu_draw_contents_option_center, 0x00000000, 0x2C000000, filemenu_update_show_options_bottom, 0x00000000, D_8024BB78, 0x370000C3, 0x00AB0058, 0x00100000, filemenu_draw_contents_option_right, 0x00000000, 0x2C000000, filemenu_update_show_options_bottom, 0x00000000, D_8024BBB0, 0x3A000009, 0x006E0082, 0x00360000, filemenu_draw_contents_file_2_info, 0x00000000, 0x2C000000, filemenu_update_show_options_left, 0x00000000, D_8024BC58, 0x3E000003, 0xFFF8007C, 0x000F0000, filemenu_draw_contents_file_2_title, 0x00000000, 0x3A000000, 0x00000001, 0x00000000, D_8024BD38, 0x3B000095, 0x006E0082, 0x00360000, filemenu_draw_contents_file_3_info, 0x00000000, 0x2C000000, filemenu_update_show_options_right, 0x00000000, D_8024BC90, 0x3F000003, 0xFFF8007C, 0x000F0000, filemenu_draw_contents_file_3_title, 0x00000000, 0x3B000000, 0x00000001, 0x00000000, D_8024BD70, 0x38000009, 0x00290082, 0x00360000, filemenu_draw_contents_file_0_info, 0x00000000, 0x2C000000, filemenu_update_show_options_left, 0x00000000, D_8024BBE8, 0x3C000003, 0xFFF8007C, 0x000F0000, filemenu_draw_contents_file_0_title, 0x00000000, 0x38000000, 0x00000001, 0x00000000, D_8024BCC8, 0x39000095, 0x00290082, 0x00360000, filemenu_draw_contents_file_1_info, 0x00000000, 0x2C000000, filemenu_update_show_options_right, 0x00000000, D_8024BC20, 0x3D000003, 0xFFF8007C, 0x000F0000, filemenu_draw_contents_file_1_title, 0x00000000, 0x39000000, 0x00000001, 0x00000000, D_8024BD00 dlabel D_8024A098 diff --git a/ver/us/asm/data/world/action/hammer.data.s b/ver/us/asm/data/world/action/hammer.data.s index 91c336f0cd..59b204bf61 100644 --- a/ver/us/asm/data/world/action/hammer.data.s +++ b/ver/us/asm/data/world/action/hammer.data.s @@ -2,5 +2,5 @@ .section .data -dlabel D_802B6DB0_E25C80 +dlabel HammerHit .word D_802B6E90_E2A300, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/action/use_tweester.data.s b/ver/us/asm/data/world/action/use_tweester.data.s index 0eac4622aa..cacd90d644 100644 --- a/ver/us/asm/data/world/action/use_tweester.data.s +++ b/ver/us/asm/data/world/action/use_tweester.data.s @@ -2,5 +2,5 @@ .section .data -dlabel D_802B6350_E2A690 +dlabel PlayerTweesterPhysics .word 0x802B6370, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s index 790d8114aa..8f0425fd3a 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s @@ -333,7 +333,7 @@ dlabel D_80250170_8C01E0 .word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0007, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000054, 0x00000045, 0x00000000, 0x00000046, 0x00000001, D_8024FFAC_8C001C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000000A, 0x00000030, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFD0, 0xFFFFFFC6, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000002A, 0xFFFFFF9A, 0x00000000, 0x00000046, 0x00000001, D_8024FFAC_8C001C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000085, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000088, 0x00000021, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000054, 0x00000045, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80250284_8C02F4 -.word 0x00000044, 0x00000001, D_80250170_8C01E0, 0x00000046, 0x00000001, D_80250048_8C00B8, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000D, 0xF24A8680, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x000000D2, 0x00000073, 0x00000046, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00040006, 0x00040001, 0x00000005, 0x0001000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00040002, 0x00000043, 0x00000008, NpcFlyTo, 0x0000000D, 0x0000002E, 0x0000000F, 0x00000042, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00040001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000002E, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000002E, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF245CA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000005, 0x00010010, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00040006, 0x00040001, 0x00000005, 0x00010011, 0x00000056, 0x00000000, 0x00000043, 0x00000007, DropItemEntityB, 0x00000054, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80243034_8B30A4, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFF4, 0x00000027, 0x00000002, 0xFE363C82, 0x00000004, 0x00000027, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x0000001E, 0x00000042, 0x00000014, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x0000002E, 0x00000042, 0x00000014, 0x00000043, 0x00000003, SetNpcYaw, 0x0000000D, 0x0000010E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000005, 0x00010012, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00040006, 0x00040001, 0x00000005, 0x00010013, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00040002, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000D, 0xF24A8680, 0x00000043, 0x00000008, NpcFlyTo, 0x0000000D, 0x000000D2, 0x00000073, 0x00000046, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000005, 0x00010014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000001CC, 0x00000136, 0x00000019, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF245CA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x0001000A, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000002E, 0x00000042, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000005, 0x00010015, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x0001000A, 0x0001000A, 0x00000005, 0x00010016, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, GotoMap, 0x80257EE8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000044, 0x00000001, D_80250170_8C01E0, 0x00000046, 0x00000001, D_80250048_8C00B8, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000D, 0xF24A8680, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x000000D2, 0x00000073, 0x00000046, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00040006, 0x00040001, 0x00000005, 0x0001000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00040002, 0x00000043, 0x00000008, NpcFlyTo, 0x0000000D, 0x0000002E, 0x0000000F, 0x00000042, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00040001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000002E, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000002E, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF245CA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000005, 0x00010010, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00040006, 0x00040001, 0x00000005, 0x00010011, 0x00000056, 0x00000000, 0x00000043, 0x00000007, DropTinyItemEntity, 0x00000054, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80243034_8B30A4, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFF4, 0x00000027, 0x00000002, 0xFE363C82, 0x00000004, 0x00000027, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x0000001E, 0x00000042, 0x00000014, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x0000002E, 0x00000042, 0x00000014, 0x00000043, 0x00000003, SetNpcYaw, 0x0000000D, 0x0000010E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000005, 0x00010012, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00040006, 0x00040001, 0x00000005, 0x00010013, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00040002, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000D, 0xF24A8680, 0x00000043, 0x00000008, NpcFlyTo, 0x0000000D, 0x000000D2, 0x00000073, 0x00000046, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000005, 0x00010014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000001CC, 0x00000136, 0x00000019, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF245CA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x0001000A, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000002E, 0x00000042, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000005, 0x00010015, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x0001000A, 0x0001000A, 0x00000005, 0x00010016, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, GotoMap, 0x80257EE8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80250990_8C0A00 .word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000003C, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000003C, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x0000000B, 0x00000000, 0x0000003F, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000054, 0x00000000, 0x00000045, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00000200, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80250284_8C02F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_09/BDCE10.data.s b/ver/us/asm/data/world/area_obk/obk_09/BDCE10.data.s index 274b1b5865..178dafd23b 100644 --- a/ver/us/asm/data/world/area_obk/obk_09/BDCE10.data.s +++ b/ver/us/asm/data/world/area_obk/obk_09/BDCE10.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242660_BDCE10 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFEE8, 0x000000EA, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFF79, 0x00000069, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00BF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF61, 0x0000009E, 0x00000032, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00BF0001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00BF0004, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00BF0001, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000007, DropItemEntityB, 0x00000054, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802403F0_BDABA0, 0x00000005, 0x00000001, 0x00000023, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFF0, 0x00000027, 0x00000002, 0xFE363C82, 0x00000004, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF6, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF54, 0x0000008F, 0x00000014, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFFFFFF61, 0x0000000A, 0x0000009E, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00050005, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00050001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0005000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, GotoMap, 0x802429F4, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFEE8, 0x000000EA, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFF79, 0x00000069, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00BF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF61, 0x0000009E, 0x00000032, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00BF0001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00BF0004, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00BF0001, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000007, DropTinyItemEntity, 0x00000054, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802403F0_BDABA0, 0x00000005, 0x00000001, 0x00000023, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFF0, 0x00000027, 0x00000002, 0xFE363C82, 0x00000004, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF6, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF54, 0x0000008F, 0x00000014, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFFFFFF61, 0x0000000A, 0x0000009E, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00050005, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00050001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0005000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, GotoMap, 0x802429F4, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s b/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s index e11c336ab3..c08db13a87 100644 --- a/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s +++ b/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241040_D38840 -.word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA5AC, 0x00000307, 0x0000021C, 0xFFFFFFCE, 0x00000000, 0x00000123, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406137, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF60, 0x0000012C, 0xFFFFFF92, 0x00000011, 0xF8406138, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000007, DropItemEntityB, 0x0000006C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, DropItemEntityB, 0x0000006C, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFC9, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF06, 0x00000366, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000302, 0x000004B0, 0xFFFFFF1F, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA5AC, 0x00000307, 0x0000021C, 0xFFFFFFCE, 0x00000000, 0x00000123, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406137, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF60, 0x0000012C, 0xFFFFFF92, 0x00000011, 0xF8406138, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000007, DropTinyItemEntity, 0x0000006C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, DropTinyItemEntity, 0x0000006C, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFC9, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF06, 0x00000366, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000302, 0x000004B0, 0xFFFFFF1F, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802411F0_D389F0 .word 0x00000028, 0xFFFFFF38, 0x0000002B, 0xFFFFFF1A, 0x0000002E, 0xFFFFFEFC, 0x00000031, 0xFFFFFEDE, 0x00000034, 0xFFFFFEC0, 0x00000037, 0xFFFFFEA2, 0x0000003A, 0xFFFFFE84, 0x0000003D, 0xFFFFFE66, 0x00000040, 0xFFFFFE48, 0x00000043, 0xFFFFFE2A, 0x00000046, 0xFFFFFDEE, 0x00000049, 0xFFFFFDD0, 0x0000004C, 0xFFFFFDB2, 0x0000004F, 0xFFFFFD94, 0x00000052, 0xFFFFFD76, 0x00000055, 0xFFFFFD58, 0x00000058, 0xFFFFFD3A, 0x0000005B, 0xFFFFFD1C, 0x0000005E, 0xFFFFFCFE, 0x00000061, 0xFFFFFCE0, 0x00000064, 0xFFFFFCA4, 0x00000067, 0xFFFFFC86, 0x0000006A, 0xFFFFFC68, 0x0000006D, 0xFFFFFC4A, 0x00000070, 0xFFFFFC2C, 0x00000073, 0xFFFFFC0E, 0x00000076, 0xFFFFFBF0, 0x00000079, 0xFFFFFBD2, 0x0000007C, 0xFFFFFBB4, 0x0000007F, 0xFFFFFB96 diff --git a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s index fe0a9e20f0..6c601c0298 100644 --- a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s +++ b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s @@ -276,7 +276,7 @@ dlabel D_8024A150_D44720 .word 0x00000008, D_80244EC8_D3F498, 0xC3C80000, 0x00000000, 0x43660000, 0x00402D09, D_80248CF4_D432C4, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00840101, 0x00840102, 0x00840103, 0x00840103, 0x00840101, 0x00840101, 0x00840106, 0x00840106, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00000000, 0x00000000, 0x00000000, 0x001A0003, 0x00000009, D_80244EC8_D3F498, 0xC3AF0000, 0x00000000, 0x43660000, 0x00402D09, D_80248D48_D43318, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00840101, 0x00840102, 0x00840103, 0x00840103, 0x00840101, 0x00840101, 0x00840106, 0x00840106, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00000000, 0x00000000, 0x00000000, 0x001A0004, 0x0000000A, D_80244EC8_D3F498, 0xC3BB8000, 0x00000000, 0x435C0000, 0x00402D09, D_80248D9C_D4336C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00840101, 0x00840102, 0x00840103, 0x00840103, 0x00840101, 0x00840101, 0x00840106, 0x00840106, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00000000, 0x00000000, 0x00000000, 0x001A0005 dlabel D_8024A720_D44CF0 -.word 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0x0000008C, 0x00000000, 0xFFFFFFD0, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0x0000004B, 0x00000000, 0xFFFFFFD0, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000067, 0x00000000, 0xFFFFFFA9, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0x0000002D, 0x00000000, 0xFFFFFFA9, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000C, 0xF24A8280, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000F, 0xF24A8280, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000D, 0xF24A8280, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000E, 0xF24A8280, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00020004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x00000094, 0xFFFFFFD0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x00000107, 0x0000001A, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x00000134, 0x0000001A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00020003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00B80002, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x00000094, 0xFFFFFFA9, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x00000107, 0xFFFFFFF3, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x0000014B, 0xFFFFFFF3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00B80001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00B80002, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0x00000094, 0xFFFFFFA9, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0x00000107, 0xFFFFFFF3, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0x0000011B, 0xFFFFFFF3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00B80001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00B60004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0x00000094, 0xFFFFFFD0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0x00000107, 0x0000001A, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0x00000166, 0x0000001A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00B60001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000C, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000C, 0x00B60008, 0x00B60001, 0x00000005, 0x00010017, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x0002000D, 0x00020003, 0x00000005, 0x00010018, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001C, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000020, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000C, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000010, 0xF24A8680, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0x0000008C, 0x00000073, 0x0000001A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00040006, 0x00040001, 0x00000005, 0x00010019, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000136, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000136, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF245CA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x00040002, 0x00000043, 0x00000008, NpcFlyTo, 0x00000010, 0x0000010E, 0x0000000F, 0x0000001A, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x00040001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x0002000D, 0x00020003, 0x00000005, 0x0001001A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00040006, 0x00040001, 0x00000005, 0x0001001B, 0x00000056, 0x00000000, 0x00000043, 0x00000007, DropItemEntityB, 0x00000054, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80241A6C_D3C03C, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000010, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000010, 0x00000027, 0x00000002, 0xFE363C82, 0x00000004, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000049, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000057, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x00000010, 0x00000118, 0x00000005, 0x0000001A, 0x00000014, 0xFFFFFFFB, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000008, NpcFlyTo, 0x00000010, 0x0000010E, 0x0000000F, 0x0000001A, 0x00000014, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00020013, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00020003, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x0002000D, 0x00020003, 0x00000005, 0x0001001C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000C, 0x00B60008, 0x00B60001, 0x00000005, 0x0001001D, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x0002000D, 0x00020003, 0x00000005, 0x0001001E, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00020011, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000F, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x0000004B, 0xFFFFFFD0, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00040006, 0x00040001, 0x00000005, 0x0001001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00B60007, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000C, 0xF24A8280, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000C, 0x00B60009, 0x00B60002, 0x00000005, 0x00010020, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000C, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0x0000004B, 0xFFFFFFD0, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000145, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000145, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2437280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x00040002, 0x00000043, 0x00000008, NpcFlyTo, 0x00000010, 0x000000B4, 0x00000073, 0x0000001A, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00B80002, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000D, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x00000067, 0xFFFFFFA9, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00B80002, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000E, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0x0000002D, 0xFFFFFFA9, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, GotoMap, 0x80251420, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0x0000008C, 0x00000000, 0xFFFFFFD0, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0x0000004B, 0x00000000, 0xFFFFFFD0, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000067, 0x00000000, 0xFFFFFFA9, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0x0000002D, 0x00000000, 0xFFFFFFA9, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000C, 0xF24A8280, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000F, 0xF24A8280, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000D, 0xF24A8280, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000E, 0xF24A8280, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00020004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x00000094, 0xFFFFFFD0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x00000107, 0x0000001A, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x00000134, 0x0000001A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00020003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00B80002, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x00000094, 0xFFFFFFA9, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x00000107, 0xFFFFFFF3, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x0000014B, 0xFFFFFFF3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00B80001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00B80002, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0x00000094, 0xFFFFFFA9, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0x00000107, 0xFFFFFFF3, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0x0000011B, 0xFFFFFFF3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00B80001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00B60004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0x00000094, 0xFFFFFFD0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0x00000107, 0x0000001A, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0x00000166, 0x0000001A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00B60001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000C, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000C, 0x00B60008, 0x00B60001, 0x00000005, 0x00010017, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x0002000D, 0x00020003, 0x00000005, 0x00010018, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001C, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000020, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000C, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000010, 0xF24A8680, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0x0000008C, 0x00000073, 0x0000001A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00040006, 0x00040001, 0x00000005, 0x00010019, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000136, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000136, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF245CA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x00040002, 0x00000043, 0x00000008, NpcFlyTo, 0x00000010, 0x0000010E, 0x0000000F, 0x0000001A, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x00040001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x0002000D, 0x00020003, 0x00000005, 0x0001001A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00040006, 0x00040001, 0x00000005, 0x0001001B, 0x00000056, 0x00000000, 0x00000043, 0x00000007, DropTinyItemEntity, 0x00000054, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80241A6C_D3C03C, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000010, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000010, 0x00000027, 0x00000002, 0xFE363C82, 0x00000004, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000049, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000057, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x00000010, 0x00000118, 0x00000005, 0x0000001A, 0x00000014, 0xFFFFFFFB, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000008, NpcFlyTo, 0x00000010, 0x0000010E, 0x0000000F, 0x0000001A, 0x00000014, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00020013, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00020003, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x0002000D, 0x00020003, 0x00000005, 0x0001001C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000C, 0x00B60008, 0x00B60001, 0x00000005, 0x0001001D, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x0002000D, 0x00020003, 0x00000005, 0x0001001E, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00020011, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000F, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x0000004B, 0xFFFFFFD0, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00040006, 0x00040001, 0x00000005, 0x0001001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00B60007, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000C, 0xF24A8280, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000C, 0x00B60009, 0x00B60002, 0x00000005, 0x00010020, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000C, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0x0000004B, 0xFFFFFFD0, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000145, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000145, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2437280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x00040002, 0x00000043, 0x00000008, NpcFlyTo, 0x00000010, 0x000000B4, 0x00000073, 0x0000001A, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000D, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00B80002, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000D, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x00000067, 0xFFFFFFA9, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00B80002, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000E, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0x0000002D, 0xFFFFFFA9, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, GotoMap, 0x80251420, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024B55C_D45B2C .word 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0x00000078, 0x00000000, 0x00000046, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0x00000078, 0x00000000, 0x00000046, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000078, 0x00000000, 0x00000046, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0x00000078, 0x00000000, 0x00000046, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000010, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000010, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000200, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024A720_D44CF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/163400/filemenu_init.s b/ver/us/asm/nonmatchings/163400/filemenu_init.s index 0f1a31143d..7fea5cb455 100644 --- a/ver/us/asm/nonmatchings/163400/filemenu_init.s +++ b/ver/us/asm/nonmatchings/163400/filemenu_init.s @@ -26,12 +26,12 @@ glabel filemenu_init .L80244934: /* 165194 80244934 8E240000 */ lw $a0, ($s1) /* 165198 80244938 26310004 */ addiu $s1, $s1, 4 -/* 16519C 8024493C 0C050529 */ jal create_hud_element +/* 16519C 8024493C 0C050529 */ jal hud_element_create /* 1651A0 80244940 26100001 */ addiu $s0, $s0, 1 /* 1651A4 80244944 0040202D */ daddu $a0, $v0, $zero /* 1651A8 80244948 3C052000 */ lui $a1, 0x2000 /* 1651AC 8024494C 34A50080 */ ori $a1, $a1, 0x80 -/* 1651B0 80244950 0C051280 */ jal set_hud_element_flags +/* 1651B0 80244950 0C051280 */ jal hud_element_set_flags /* 1651B4 80244954 AE440000 */ sw $a0, ($s2) /* 1651B8 80244958 1A00FFF6 */ blez $s0, .L80244934 /* 1651BC 8024495C 26520004 */ addiu $s2, $s2, 4 @@ -67,10 +67,10 @@ glabel filemenu_init /* 165228 802449C8 3C15800E */ lui $s5, %hi(gCurrentSaveFile) /* 16522C 802449CC 26B5ACC0 */ addiu $s5, $s5, %lo(gCurrentSaveFile) /* 165230 802449D0 24140001 */ addiu $s4, $zero, 1 -/* 165234 802449D4 3C118007 */ lui $s1, %hi(D_80077A24) -/* 165238 802449D8 26317A24 */ addiu $s1, $s1, %lo(D_80077A24) -/* 16523C 802449DC 3C128007 */ lui $s2, %hi(D_800779C4) -/* 165240 802449E0 265279C4 */ addiu $s2, $s2, %lo(D_800779C4) +/* 165234 802449D4 3C118007 */ lui $s1, %hi(gSaveSlotHasData) +/* 165238 802449D8 26317A24 */ addiu $s1, $s1, %lo(gSaveSlotHasData) +/* 16523C 802449DC 3C128007 */ lui $s2, %hi(gSaveSlotMetadata) +/* 165240 802449E0 265279C4 */ addiu $s2, $s2, %lo(gSaveSlotMetadata) .L802449E4: /* 165244 802449E4 0C00ACB4 */ jal fio_load_game /* 165248 802449E8 0200202D */ daddu $a0, $s0, $zero diff --git a/ver/us/asm/nonmatchings/165490/filemenu_main_handle_input.s b/ver/us/asm/nonmatchings/165490/filemenu_main_handle_input.s index e074baf8af..55365e0382 100644 --- a/ver/us/asm/nonmatchings/165490/filemenu_main_handle_input.s +++ b/ver/us/asm/nonmatchings/165490/filemenu_main_handle_input.s @@ -269,9 +269,9 @@ glabel filemenu_main_handle_input /* 166638 80245DD8 10400007 */ beqz $v0, .L80245DF8 /* 16663C 80245DDC 00000000 */ nop /* 166640 80245DE0 92620003 */ lbu $v0, 3($s3) -/* 166644 80245DE4 3C018007 */ lui $at, %hi(D_80077A24) +/* 166644 80245DE4 3C018007 */ lui $at, %hi(gSaveSlotHasData) /* 166648 80245DE8 00220821 */ addu $at, $at, $v0 -/* 16664C 80245DEC 90227A24 */ lbu $v0, %lo(D_80077A24)($at) +/* 16664C 80245DEC 90227A24 */ lbu $v0, %lo(gSaveSlotHasData)($at) /* 166650 80245DF0 50400001 */ beql $v0, $zero, .L80245DF8 /* 166654 80245DF4 24040001 */ addiu $a0, $zero, 1 .L80245DF8: @@ -569,9 +569,9 @@ glabel filemenu_main_handle_input /* 166AB4 80246254 104001A4 */ beqz $v0, .L802468E8 /* 166AB8 80246258 00000000 */ nop /* 166ABC 8024625C 92620003 */ lbu $v0, 3($s3) -/* 166AC0 80246260 3C018007 */ lui $at, %hi(D_80077A24) +/* 166AC0 80246260 3C018007 */ lui $at, %hi(gSaveSlotHasData) /* 166AC4 80246264 00220821 */ addu $at, $at, $v0 -/* 166AC8 80246268 90227A24 */ lbu $v0, %lo(D_80077A24)($at) +/* 166AC8 80246268 90227A24 */ lbu $v0, %lo(gSaveSlotHasData)($at) /* 166ACC 8024626C 1040007F */ beqz $v0, .L8024646C /* 166AD0 80246270 00000000 */ nop /* 166AD4 80246274 0C05272D */ jal sfx_play_sound @@ -673,9 +673,9 @@ glabel filemenu_main_handle_input /* 166C3C 802463DC 10400142 */ beqz $v0, .L802468E8 /* 166C40 802463E0 00000000 */ nop /* 166C44 802463E4 92620003 */ lbu $v0, 3($s3) -/* 166C48 802463E8 3C018007 */ lui $at, %hi(D_80077A24) +/* 166C48 802463E8 3C018007 */ lui $at, %hi(gSaveSlotHasData) /* 166C4C 802463EC 00220821 */ addu $at, $at, $v0 -/* 166C50 802463F0 90227A24 */ lbu $v0, %lo(D_80077A24)($at) +/* 166C50 802463F0 90227A24 */ lbu $v0, %lo(gSaveSlotHasData)($at) /* 166C54 802463F4 1040001D */ beqz $v0, .L8024646C /* 166C58 802463F8 00000000 */ nop /* 166C5C 802463FC 0C05272D */ jal sfx_play_sound @@ -717,9 +717,9 @@ glabel filemenu_main_handle_input /* 166CDC 8024647C 3C018025 */ lui $at, %hi(filemenu_iterFileIdx) /* 166CE0 80246480 AC23C080 */ sw $v1, %lo(filemenu_iterFileIdx)($at) /* 166CE4 80246484 92620003 */ lbu $v0, 3($s3) -/* 166CE8 80246488 3C018007 */ lui $at, %hi(D_80077A24) +/* 166CE8 80246488 3C018007 */ lui $at, %hi(gSaveSlotHasData) /* 166CEC 8024648C 00220821 */ addu $at, $at, $v0 -/* 166CF0 80246490 90227A24 */ lbu $v0, %lo(D_80077A24)($at) +/* 166CF0 80246490 90227A24 */ lbu $v0, %lo(gSaveSlotHasData)($at) /* 166CF4 80246494 14400066 */ bnez $v0, .L80246630 /* 166CF8 80246498 00000000 */ nop /* 166CFC 8024649C 0C05272D */ jal sfx_play_sound @@ -794,8 +794,8 @@ glabel filemenu_main_handle_input /* 166E00 802465A0 8E240000 */ lw $a0, ($s1) /* 166E04 802465A4 3C108025 */ lui $s0, %hi(filemenu_iterFileIdx) /* 166E08 802465A8 2610C080 */ addiu $s0, $s0, %lo(filemenu_iterFileIdx) -/* 166E0C 802465AC 3C068007 */ lui $a2, %hi(D_800779C4) -/* 166E10 802465B0 24C679C4 */ addiu $a2, $a2, %lo(D_800779C4) +/* 166E0C 802465AC 3C068007 */ lui $a2, %hi(gSaveSlotMetadata) +/* 166E10 802465B0 24C679C4 */ addiu $a2, $a2, %lo(gSaveSlotMetadata) /* 166E14 802465B4 8E040000 */ lw $a0, ($s0) /* 166E18 802465B8 8E250000 */ lw $a1, ($s1) /* 166E1C 802465BC 0080102D */ daddu $v0, $a0, $zero @@ -822,9 +822,9 @@ glabel filemenu_main_handle_input /* 166E70 80246610 AC690014 */ sw $t1, 0x14($v1) /* 166E74 80246614 8E030000 */ lw $v1, ($s0) /* 166E78 80246618 24020001 */ addiu $v0, $zero, 1 -/* 166E7C 8024661C 3C018007 */ lui $at, %hi(D_80077A24) +/* 166E7C 8024661C 3C018007 */ lui $at, %hi(gSaveSlotHasData) /* 166E80 80246620 00230821 */ addu $at, $at, $v1 -/* 166E84 80246624 A0227A24 */ sb $v0, %lo(D_80077A24)($at) +/* 166E84 80246624 A0227A24 */ sb $v0, %lo(gSaveSlotHasData)($at) /* 166E88 80246628 08091A3A */ j .L802468E8 /* 166E8C 8024662C 00000000 */ nop .L80246630: @@ -910,11 +910,11 @@ glabel filemenu_main_handle_input /* 166FB4 80246754 10400064 */ beqz $v0, .L802468E8 /* 166FB8 80246758 00000000 */ nop /* 166FBC 8024675C 92620003 */ lbu $v0, 3($s3) -/* 166FC0 80246760 3C018007 */ lui $at, %hi(D_80077A24) +/* 166FC0 80246760 3C018007 */ lui $at, %hi(gSaveSlotHasData) /* 166FC4 80246764 00220821 */ addu $at, $at, $v0 -/* 166FC8 80246768 90227A24 */ lbu $v0, %lo(D_80077A24)($at) -/* 166FCC 8024676C 3C118007 */ lui $s1, %hi(D_80077A24) -/* 166FD0 80246770 26317A24 */ addiu $s1, $s1, %lo(D_80077A24) +/* 166FC8 80246768 90227A24 */ lbu $v0, %lo(gSaveSlotHasData)($at) +/* 166FCC 8024676C 3C118007 */ lui $s1, %hi(gSaveSlotHasData) +/* 166FD0 80246770 26317A24 */ addiu $s1, $s1, %lo(gSaveSlotHasData) /* 166FD4 80246774 1440001B */ bnez $v0, .L802467E4 /* 166FD8 80246778 00000000 */ nop /* 166FDC 8024677C 0C05272D */ jal sfx_play_sound diff --git a/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s b/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s index d18a78208e..dfd762cbe3 100644 --- a/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s +++ b/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s @@ -185,8 +185,8 @@ glabel filemenu_yesno_handle_input /* 167CC0 80247460 0000202D */ daddu $a0, $zero, $zero /* 167CC4 80247464 3C028025 */ lui $v0, %hi(filemenu_menus) /* 167CC8 80247468 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) -/* 167CCC 8024746C 3C068007 */ lui $a2, %hi(D_800779C4) -/* 167CD0 80247470 24C679C4 */ addiu $a2, $a2, %lo(D_800779C4) +/* 167CCC 8024746C 3C068007 */ lui $a2, %hi(gSaveSlotMetadata) +/* 167CD0 80247470 24C679C4 */ addiu $a2, $a2, %lo(gSaveSlotMetadata) /* 167CD4 80247474 90500003 */ lbu $s0, 3($v0) /* 167CD8 80247478 240500F7 */ addiu $a1, $zero, 0xf7 /* 167CDC 8024747C 00101040 */ sll $v0, $s0, 1 @@ -201,8 +201,8 @@ glabel filemenu_yesno_handle_input /* 167CFC 8024749C 1440FFFB */ bnez $v0, .L8024748C /* 167D00 802474A0 00831021 */ addu $v0, $a0, $v1 /* 167D04 802474A4 0200202D */ daddu $a0, $s0, $zero -/* 167D08 802474A8 3C038007 */ lui $v1, %hi(D_800779C4) -/* 167D0C 802474AC 246379C4 */ addiu $v1, $v1, %lo(D_800779C4) +/* 167D08 802474A8 3C038007 */ lui $v1, %hi(gSaveSlotMetadata) +/* 167D0C 802474AC 246379C4 */ addiu $v1, $v1, %lo(gSaveSlotMetadata) /* 167D10 802474B0 00101040 */ sll $v0, $s0, 1 /* 167D14 802474B4 00501021 */ addu $v0, $v0, $s0 /* 167D18 802474B8 000210C0 */ sll $v0, $v0, 3 @@ -211,9 +211,9 @@ glabel filemenu_yesno_handle_input /* 167D24 802474C4 AC400000 */ sw $zero, ($v0) /* 167D28 802474C8 0C00AD0B */ jal fio_erase_game /* 167D2C 802474CC A0400004 */ sb $zero, 4($v0) -/* 167D30 802474D0 3C018007 */ lui $at, %hi(D_80077A24) +/* 167D30 802474D0 3C018007 */ lui $at, %hi(gSaveSlotHasData) /* 167D34 802474D4 00300821 */ addu $at, $at, $s0 -/* 167D38 802474D8 A0207A24 */ sb $zero, %lo(D_80077A24)($at) +/* 167D38 802474D8 A0207A24 */ sb $zero, %lo(gSaveSlotHasData)($at) /* 167D3C 802474DC 08091EEE */ j .L80247BB8 /* 167D40 802474E0 00000000 */ nop .L802474E4_167D44: @@ -288,8 +288,8 @@ glabel filemenu_yesno_handle_input /* 167E44 802475E4 8E240000 */ lw $a0, ($s1) /* 167E48 802475E8 3C108025 */ lui $s0, %hi(filemenu_iterFileIdx) /* 167E4C 802475EC 2610C080 */ addiu $s0, $s0, %lo(filemenu_iterFileIdx) -/* 167E50 802475F0 3C068007 */ lui $a2, %hi(D_800779C4) -/* 167E54 802475F4 24C679C4 */ addiu $a2, $a2, %lo(D_800779C4) +/* 167E50 802475F0 3C068007 */ lui $a2, %hi(gSaveSlotMetadata) +/* 167E54 802475F4 24C679C4 */ addiu $a2, $a2, %lo(gSaveSlotMetadata) /* 167E58 802475F8 8E040000 */ lw $a0, ($s0) /* 167E5C 802475FC 8E250000 */ lw $a1, ($s1) /* 167E60 80247600 0080102D */ daddu $v0, $a0, $zero @@ -387,8 +387,8 @@ glabel filemenu_yesno_handle_input /* 167FBC 8024775C 26109B84 */ addiu $s0, $s0, %lo(filemenu_menus) /* 167FC0 80247760 8E020000 */ lw $v0, ($s0) /* 167FC4 80247764 90420003 */ lbu $v0, 3($v0) -/* 167FC8 80247768 3C058007 */ lui $a1, %hi(D_800779C4) -/* 167FCC 8024776C 24A579C4 */ addiu $a1, $a1, %lo(D_800779C4) +/* 167FC8 80247768 3C058007 */ lui $a1, %hi(gSaveSlotMetadata) +/* 167FCC 8024776C 24A579C4 */ addiu $a1, $a1, %lo(gSaveSlotMetadata) /* 167FD0 80247770 00021840 */ sll $v1, $v0, 1 /* 167FD4 80247774 00621821 */ addu $v1, $v1, $v0 /* 167FD8 80247778 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -419,9 +419,9 @@ glabel filemenu_yesno_handle_input /* 16803C 802477DC 90430003 */ lbu $v1, 3($v0) /* 168040 802477E0 24020001 */ addiu $v0, $zero, 1 .L802477E4: -/* 168044 802477E4 3C018007 */ lui $at, %hi(D_80077A24) +/* 168044 802477E4 3C018007 */ lui $at, %hi(gSaveSlotHasData) /* 168048 802477E8 00230821 */ addu $at, $at, $v1 -/* 16804C 802477EC A0227A24 */ sb $v0, %lo(D_80077A24)($at) +/* 16804C 802477EC A0227A24 */ sb $v0, %lo(gSaveSlotHasData)($at) /* 168050 802477F0 08091EEE */ j .L80247BB8 /* 168054 802477F4 00000000 */ nop .L802477F8_168058: @@ -443,8 +443,8 @@ glabel filemenu_yesno_handle_input /* 168094 80247834 0000202D */ daddu $a0, $zero, $zero /* 168098 80247838 3C028025 */ lui $v0, %hi(filemenu_menus) /* 16809C 8024783C 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) -/* 1680A0 80247840 3C078007 */ lui $a3, %hi(D_800779C4) -/* 1680A4 80247844 24E779C4 */ addiu $a3, $a3, %lo(D_800779C4) +/* 1680A0 80247840 3C078007 */ lui $a3, %hi(gSaveSlotMetadata) +/* 1680A4 80247844 24E779C4 */ addiu $a3, $a3, %lo(gSaveSlotMetadata) /* 1680A8 80247848 90510003 */ lbu $s1, 3($v0) /* 1680AC 8024784C 3C068025 */ lui $a2, %hi(filemenu_8024C110) /* 1680B0 80247850 24C6C110 */ addiu $a2, $a2, %lo(filemenu_8024C110) @@ -467,9 +467,9 @@ glabel filemenu_yesno_handle_input /* 1680F0 80247890 3C108024 */ lui $s0, %hi(filemenu_update_hidden_name_input) /* 1680F4 80247894 26103628 */ addiu $s0, $s0, %lo(filemenu_update_hidden_name_input) /* 1680F8 80247898 24020001 */ addiu $v0, $zero, 1 -/* 1680FC 8024789C 3C018007 */ lui $at, %hi(D_80077A24) +/* 1680FC 8024789C 3C018007 */ lui $at, %hi(gSaveSlotHasData) /* 168100 802478A0 00310821 */ addu $at, $at, $s1 -/* 168104 802478A4 A0227A24 */ sb $v0, %lo(D_80077A24)($at) +/* 168104 802478A4 A0227A24 */ sb $v0, %lo(gSaveSlotHasData)($at) /* 168108 802478A8 0C051F9F */ jal set_window_update /* 16810C 802478AC 0200282D */ daddu $a1, $s0, $zero /* 168110 802478B0 24040031 */ addiu $a0, $zero, 0x31 diff --git a/ver/us/asm/nonmatchings/168590/filemenu_choose_name_init.s b/ver/us/asm/nonmatchings/168590/filemenu_choose_name_init.s index fd349180c7..c0746b5a20 100644 --- a/ver/us/asm/nonmatchings/168590/filemenu_choose_name_init.s +++ b/ver/us/asm/nonmatchings/168590/filemenu_choose_name_init.s @@ -17,11 +17,11 @@ glabel filemenu_choose_name_init .L80248AB0: /* 169310 80248AB0 8E240000 */ lw $a0, ($s1) /* 169314 80248AB4 26310004 */ addiu $s1, $s1, 4 -/* 169318 80248AB8 0C050529 */ jal create_hud_element +/* 169318 80248AB8 0C050529 */ jal hud_element_create /* 16931C 80248ABC 26100001 */ addiu $s0, $s0, 1 /* 169320 80248AC0 0040202D */ daddu $a0, $v0, $zero /* 169324 80248AC4 24050080 */ addiu $a1, $zero, 0x80 -/* 169328 80248AC8 0C051280 */ jal set_hud_element_flags +/* 169328 80248AC8 0C051280 */ jal hud_element_set_flags /* 16932C 80248ACC AE440000 */ sw $a0, ($s2) /* 169330 80248AD0 2A020003 */ slti $v0, $s0, 3 /* 169334 80248AD4 1440FFF6 */ bnez $v0, .L80248AB0 diff --git a/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_choose_name.s b/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_choose_name.s index 308158df7f..ddf18d05e6 100644 --- a/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_choose_name.s +++ b/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_choose_name.s @@ -215,11 +215,11 @@ glabel filemenu_draw_contents_choose_name /* 168E94 80248634 AFA9004C */ sw $t1, 0x4c($sp) /* 168E98 80248638 AFAA0050 */ sw $t2, 0x50($sp) /* 168E9C 8024863C 01723021 */ addu $a2, $t3, $s2 -/* 168EA0 80248640 0C051261 */ jal set_hud_element_render_pos +/* 168EA0 80248640 0C051261 */ jal hud_element_set_render_pos /* 168EA4 80248644 24C60008 */ addiu $a2, $a2, 8 /* 168EA8 80248648 3C048025 */ lui $a0, %hi(D_8024C108) /* 168EAC 8024864C 8C84C108 */ lw $a0, %lo(D_8024C108)($a0) -/* 168EB0 80248650 0C0511F8 */ jal draw_hud_element_3 +/* 168EB0 80248650 0C0511F8 */ jal hud_element_draw_without_clipping /* 168EB4 80248654 00000000 */ nop /* 168EB8 80248658 0000182D */ daddu $v1, $zero, $zero /* 168EBC 8024865C 8FAA0050 */ lw $t2, 0x50($sp) @@ -407,11 +407,11 @@ glabel filemenu_draw_contents_choose_name /* 169158 802488F8 24A50016 */ addiu $a1, $a1, 0x16 /* 16915C 802488FC AFA9004C */ sw $t1, 0x4c($sp) /* 169160 80248900 01723021 */ addu $a2, $t3, $s2 -/* 169164 80248904 0C051261 */ jal set_hud_element_render_pos +/* 169164 80248904 0C051261 */ jal hud_element_set_render_pos /* 169168 80248908 24C60008 */ addiu $a2, $a2, 8 /* 16916C 8024890C 3C048025 */ lui $a0, %hi(D_8024C108) /* 169170 80248910 8C84C108 */ lw $a0, %lo(D_8024C108)($a0) -/* 169174 80248914 0C0511F8 */ jal draw_hud_element_3 +/* 169174 80248914 0C0511F8 */ jal hud_element_draw_without_clipping /* 169178 80248918 00000000 */ nop /* 16917C 8024891C 0000182D */ daddu $v1, $zero, $zero /* 169180 80248920 8FA9004C */ lw $t1, 0x4c($sp) diff --git a/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s b/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s index d1b86a8d22..6b3a869e9d 100644 --- a/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s +++ b/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s @@ -235,38 +235,38 @@ glabel btl_update_starpoints_display /* 16EFFC 8024071C 2673EFC0 */ addiu $s3, $s3, %lo(D_8029EFC0) .L80240720: /* 16F000 80240720 8E700000 */ lw $s0, ($s3) -/* 16F004 80240724 0C05122C */ jal get_hud_element_anim +/* 16F004 80240724 0C05122C */ jal hud_element_get_script /* 16F008 80240728 0200202D */ daddu $a0, $s0, $zero /* 16F00C 8024072C 105E0004 */ beq $v0, $fp, .L80240740 /* 16F010 80240730 0200202D */ daddu $a0, $s0, $zero -/* 16F014 80240734 0C0511FF */ jal set_hud_element_anim +/* 16F014 80240734 0C0511FF */ jal hud_element_set_script /* 16F018 80240738 03C0282D */ daddu $a1, $fp, $zero /* 16F01C 8024073C 0200202D */ daddu $a0, $s0, $zero .L80240740: -/* 16F020 80240740 0C05128B */ jal clear_hud_element_flags +/* 16F020 80240740 0C05128B */ jal hud_element_clear_flags /* 16F024 80240744 24050002 */ addiu $a1, $zero, 2 /* 16F028 80240748 0200202D */ daddu $a0, $s0, $zero /* 16F02C 8024074C 0240282D */ daddu $a1, $s2, $zero -/* 16F030 80240750 0C051261 */ jal set_hud_element_render_pos +/* 16F030 80240750 0C051261 */ jal hud_element_set_render_pos /* 16F034 80240754 02A0302D */ daddu $a2, $s5, $zero -/* 16F038 80240758 0C0511EA */ jal draw_hud_element_clipped +/* 16F038 80240758 0C0511EA */ jal hud_element_draw_clipped /* 16F03C 8024075C 0200202D */ daddu $a0, $s0, $zero /* 16F040 80240760 8E900000 */ lw $s0, ($s4) -/* 16F044 80240764 0C05122C */ jal get_hud_element_anim +/* 16F044 80240764 0C05122C */ jal hud_element_get_script /* 16F048 80240768 0200202D */ daddu $a0, $s0, $zero /* 16F04C 8024076C 10570004 */ beq $v0, $s7, .L80240780 /* 16F050 80240770 0200202D */ daddu $a0, $s0, $zero -/* 16F054 80240774 0C0511FF */ jal set_hud_element_anim +/* 16F054 80240774 0C0511FF */ jal hud_element_set_script /* 16F058 80240778 02E0282D */ daddu $a1, $s7, $zero /* 16F05C 8024077C 0200202D */ daddu $a0, $s0, $zero .L80240780: -/* 16F060 80240780 0C05128B */ jal clear_hud_element_flags +/* 16F060 80240780 0C05128B */ jal hud_element_clear_flags /* 16F064 80240784 24050002 */ addiu $a1, $zero, 2 /* 16F068 80240788 0200202D */ daddu $a0, $s0, $zero /* 16F06C 8024078C 0240282D */ daddu $a1, $s2, $zero -/* 16F070 80240790 0C051261 */ jal set_hud_element_render_pos +/* 16F070 80240790 0C051261 */ jal hud_element_set_render_pos /* 16F074 80240794 26A6FFFB */ addiu $a2, $s5, -5 -/* 16F078 80240798 0C0511EA */ jal draw_hud_element_clipped +/* 16F078 80240798 0C0511EA */ jal hud_element_draw_clipped /* 16F07C 8024079C 0200202D */ daddu $a0, $s0, $zero /* 16F080 802407A0 3C0141A0 */ lui $at, 0x41a0 /* 16F084 802407A4 44810000 */ mtc1 $at, $f0 @@ -298,11 +298,11 @@ glabel btl_update_starpoints_display .L80240808: /* 16F0E8 80240808 8E040000 */ lw $a0, ($s0) /* 16F0EC 8024080C 26100004 */ addiu $s0, $s0, 4 -/* 16F0F0 80240810 0C051280 */ jal set_hud_element_flags +/* 16F0F0 80240810 0C051280 */ jal hud_element_set_flags /* 16F0F4 80240814 26310001 */ addiu $s1, $s1, 1 /* 16F0F8 80240818 24050002 */ addiu $a1, $zero, 2 /* 16F0FC 8024081C 8E440000 */ lw $a0, ($s2) -/* 16F100 80240820 0C051280 */ jal set_hud_element_flags +/* 16F100 80240820 0C051280 */ jal hud_element_set_flags /* 16F104 80240824 26520004 */ addiu $s2, $s2, 4 /* 16F108 80240828 2A22000A */ slti $v0, $s1, 0xa /* 16F10C 8024082C 1440FFF6 */ bnez $v0, .L80240808 @@ -367,21 +367,21 @@ glabel btl_update_starpoints_display /* 16F1EC 8024090C 2673F010 */ addiu $s3, $s3, %lo(D_8029F010) .L80240910: /* 16F1F0 80240910 8E700000 */ lw $s0, ($s3) -/* 16F1F4 80240914 0C05122C */ jal get_hud_element_anim +/* 16F1F4 80240914 0C05122C */ jal hud_element_get_script /* 16F1F8 80240918 0200202D */ daddu $a0, $s0, $zero /* 16F1FC 8024091C 10540004 */ beq $v0, $s4, .L80240930 /* 16F200 80240920 0200202D */ daddu $a0, $s0, $zero -/* 16F204 80240924 0C0511FF */ jal set_hud_element_anim +/* 16F204 80240924 0C0511FF */ jal hud_element_set_script /* 16F208 80240928 0280282D */ daddu $a1, $s4, $zero /* 16F20C 8024092C 0200202D */ daddu $a0, $s0, $zero .L80240930: -/* 16F210 80240930 0C05128B */ jal clear_hud_element_flags +/* 16F210 80240930 0C05128B */ jal hud_element_clear_flags /* 16F214 80240934 24050002 */ addiu $a1, $zero, 2 /* 16F218 80240938 0200202D */ daddu $a0, $s0, $zero /* 16F21C 8024093C 0240282D */ daddu $a1, $s2, $zero -/* 16F220 80240940 0C051261 */ jal set_hud_element_render_pos +/* 16F220 80240940 0C051261 */ jal hud_element_set_render_pos /* 16F224 80240944 02A0302D */ daddu $a2, $s5, $zero -/* 16F228 80240948 0C0511EA */ jal draw_hud_element_clipped +/* 16F228 80240948 0C0511EA */ jal hud_element_draw_clipped /* 16F22C 8024094C 0200202D */ daddu $a0, $s0, $zero /* 16F230 80240950 4614B082 */ mul.s $f2, $f22, $f20 /* 16F234 80240954 00000000 */ nop @@ -407,7 +407,7 @@ glabel btl_update_starpoints_display /* 16F27C 8024099C 8E040000 */ lw $a0, ($s0) /* 16F280 802409A0 24050002 */ addiu $a1, $zero, 2 /* 16F284 802409A4 26100004 */ addiu $s0, $s0, 4 -/* 16F288 802409A8 0C051280 */ jal set_hud_element_flags +/* 16F288 802409A8 0C051280 */ jal hud_element_set_flags /* 16F28C 802409AC 26310001 */ addiu $s1, $s1, 1 /* 16F290 802409B0 2A22000A */ slti $v0, $s1, 0xa /* 16F294 802409B4 1440FFF9 */ bnez $v0, .L8024099C diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s b/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s index cc6b633dda..2b5b1dbe73 100644 --- a/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s +++ b/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s @@ -117,22 +117,22 @@ glabel func_8024FB3C .L8024FC78_17E558: /* 17E558 8024FC78 3C048011 */ lui $a0, %hi(HudScript_StickNeutral) /* 17E55C 8024FC7C 24848E1C */ addiu $a0, $a0, %lo(HudScript_StickNeutral) -/* 17E560 8024FC80 0C050529 */ jal create_hud_element +/* 17E560 8024FC80 0C050529 */ jal hud_element_create /* 17E564 8024FC84 00000000 */ nop /* 17E568 8024FC88 00022400 */ sll $a0, $v0, 0x10 /* 17E56C 8024FC8C 00042403 */ sra $a0, $a0, 0x10 /* 17E570 8024FC90 34058080 */ ori $a1, $zero, 0x8080 /* 17E574 8024FC94 3C10802A */ lui $s0, %hi(D_8029F642) /* 17E578 8024FC98 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) -/* 17E57C 8024FC9C 0C051280 */ jal set_hud_element_flags +/* 17E57C 8024FC9C 0C051280 */ jal hud_element_set_flags /* 17E580 8024FCA0 A6020000 */ sh $v0, ($s0) /* 17E584 8024FCA4 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E588 8024FCA8 86040000 */ lh $a0, ($s0) -/* 17E58C 8024FCAC 0C051261 */ jal set_hud_element_render_pos +/* 17E58C 8024FCAC 0C051261 */ jal hud_element_set_render_pos /* 17E590 8024FCB0 00A0302D */ daddu $a2, $a1, $zero /* 17E594 8024FCB4 3C048029 */ lui $a0, %hi(HudScript_TimingReady) /* 17E598 8024FCB8 24842788 */ addiu $a0, $a0, %lo(HudScript_TimingReady) -/* 17E59C 8024FCBC 0C050529 */ jal create_hud_element +/* 17E59C 8024FCBC 0C050529 */ jal hud_element_create /* 17E5A0 8024FCC0 00000000 */ nop /* 17E5A4 8024FCC4 00022400 */ sll $a0, $v0, 0x10 /* 17E5A8 8024FCC8 00042403 */ sra $a0, $a0, 0x10 @@ -143,22 +143,22 @@ glabel func_8024FB3C .L8024FCDC_17E5BC: /* 17E5BC 8024FCDC 3C048011 */ lui $a0, %hi(HudScript_StickNeutral) /* 17E5C0 8024FCE0 24848E1C */ addiu $a0, $a0, %lo(HudScript_StickNeutral) -/* 17E5C4 8024FCE4 0C050529 */ jal create_hud_element +/* 17E5C4 8024FCE4 0C050529 */ jal hud_element_create /* 17E5C8 8024FCE8 00000000 */ nop /* 17E5CC 8024FCEC 00022400 */ sll $a0, $v0, 0x10 /* 17E5D0 8024FCF0 00042403 */ sra $a0, $a0, 0x10 /* 17E5D4 8024FCF4 34058080 */ ori $a1, $zero, 0x8080 /* 17E5D8 8024FCF8 3C10802A */ lui $s0, %hi(D_8029F642) /* 17E5DC 8024FCFC 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) -/* 17E5E0 8024FD00 0C051280 */ jal set_hud_element_flags +/* 17E5E0 8024FD00 0C051280 */ jal hud_element_set_flags /* 17E5E4 8024FD04 A6020000 */ sh $v0, ($s0) /* 17E5E8 8024FD08 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E5EC 8024FD0C 86040000 */ lh $a0, ($s0) -/* 17E5F0 8024FD10 0C051261 */ jal set_hud_element_render_pos +/* 17E5F0 8024FD10 0C051261 */ jal hud_element_set_render_pos /* 17E5F4 8024FD14 00A0302D */ daddu $a2, $a1, $zero /* 17E5F8 8024FD18 3C048029 */ lui $a0, %hi(HudScript_AimTarget) /* 17E5FC 8024FD1C 248436D4 */ addiu $a0, $a0, %lo(HudScript_AimTarget) -/* 17E600 8024FD20 0C050529 */ jal create_hud_element +/* 17E600 8024FD20 0C050529 */ jal hud_element_create /* 17E604 8024FD24 00000000 */ nop /* 17E608 8024FD28 00022400 */ sll $a0, $v0, 0x10 /* 17E60C 8024FD2C 00042403 */ sra $a0, $a0, 0x10 @@ -169,52 +169,52 @@ glabel func_8024FB3C .L8024FD40_17E620: /* 17E620 8024FD40 3C048029 */ lui $a0, %hi(HudScript_CUpButton) /* 17E624 8024FD44 2484259C */ addiu $a0, $a0, %lo(HudScript_CUpButton) -/* 17E628 8024FD48 0C050529 */ jal create_hud_element +/* 17E628 8024FD48 0C050529 */ jal hud_element_create /* 17E62C 8024FD4C 00000000 */ nop /* 17E630 8024FD50 00022400 */ sll $a0, $v0, 0x10 /* 17E634 8024FD54 00042403 */ sra $a0, $a0, 0x10 /* 17E638 8024FD58 34058080 */ ori $a1, $zero, 0x8080 /* 17E63C 8024FD5C 3C10802A */ lui $s0, %hi(D_8029F642) /* 17E640 8024FD60 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) -/* 17E644 8024FD64 0C051280 */ jal set_hud_element_flags +/* 17E644 8024FD64 0C051280 */ jal hud_element_set_flags /* 17E648 8024FD68 A6020000 */ sh $v0, ($s0) /* 17E64C 8024FD6C 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E650 8024FD70 86040000 */ lh $a0, ($s0) -/* 17E654 8024FD74 0C051261 */ jal set_hud_element_render_pos +/* 17E654 8024FD74 0C051261 */ jal hud_element_set_render_pos /* 17E658 8024FD78 00A0302D */ daddu $a2, $a1, $zero /* 17E65C 8024FD7C 3C048029 */ lui $a0, %hi(HudScript_CDownButton) /* 17E660 8024FD80 24842630 */ addiu $a0, $a0, %lo(HudScript_CDownButton) -/* 17E664 8024FD84 0C050529 */ jal create_hud_element +/* 17E664 8024FD84 0C050529 */ jal hud_element_create /* 17E668 8024FD88 00000000 */ nop /* 17E66C 8024FD8C 00022400 */ sll $a0, $v0, 0x10 /* 17E670 8024FD90 00042403 */ sra $a0, $a0, 0x10 /* 17E674 8024FD94 24050080 */ addiu $a1, $zero, 0x80 /* 17E678 8024FD98 3C10802A */ lui $s0, %hi(D_8029F644) /* 17E67C 8024FD9C 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) -/* 17E680 8024FDA0 0C051280 */ jal set_hud_element_flags +/* 17E680 8024FDA0 0C051280 */ jal hud_element_set_flags /* 17E684 8024FDA4 A6020000 */ sh $v0, ($s0) /* 17E688 8024FDA8 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E68C 8024FDAC 86040000 */ lh $a0, ($s0) -/* 17E690 8024FDB0 0C051261 */ jal set_hud_element_render_pos +/* 17E690 8024FDB0 0C051261 */ jal hud_element_set_render_pos /* 17E694 8024FDB4 00A0302D */ daddu $a2, $a1, $zero /* 17E698 8024FDB8 3C048029 */ lui $a0, %hi(HudScript_CLeftButton) /* 17E69C 8024FDBC 24842438 */ addiu $a0, $a0, %lo(HudScript_CLeftButton) -/* 17E6A0 8024FDC0 0C050529 */ jal create_hud_element +/* 17E6A0 8024FDC0 0C050529 */ jal hud_element_create /* 17E6A4 8024FDC4 00000000 */ nop /* 17E6A8 8024FDC8 00022400 */ sll $a0, $v0, 0x10 /* 17E6AC 8024FDCC 00042403 */ sra $a0, $a0, 0x10 /* 17E6B0 8024FDD0 24050080 */ addiu $a1, $zero, 0x80 /* 17E6B4 8024FDD4 3C10802A */ lui $s0, %hi(D_8029F646) /* 17E6B8 8024FDD8 2610F646 */ addiu $s0, $s0, %lo(D_8029F646) -/* 17E6BC 8024FDDC 0C051280 */ jal set_hud_element_flags +/* 17E6BC 8024FDDC 0C051280 */ jal hud_element_set_flags /* 17E6C0 8024FDE0 A6020000 */ sh $v0, ($s0) /* 17E6C4 8024FDE4 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E6C8 8024FDE8 86040000 */ lh $a0, ($s0) -/* 17E6CC 8024FDEC 0C051261 */ jal set_hud_element_render_pos +/* 17E6CC 8024FDEC 0C051261 */ jal hud_element_set_render_pos /* 17E6D0 8024FDF0 00A0302D */ daddu $a2, $a1, $zero /* 17E6D4 8024FDF4 3C048029 */ lui $a0, %hi(HudScript_CRightButton) /* 17E6D8 8024FDF8 248424CC */ addiu $a0, $a0, %lo(HudScript_CRightButton) -/* 17E6DC 8024FDFC 0C050529 */ jal create_hud_element +/* 17E6DC 8024FDFC 0C050529 */ jal hud_element_create /* 17E6E0 8024FE00 00000000 */ nop /* 17E6E4 8024FE04 00022400 */ sll $a0, $v0, 0x10 /* 17E6E8 8024FE08 00042403 */ sra $a0, $a0, 0x10 @@ -230,37 +230,37 @@ glabel func_8024FB3C .L8024FE2C_17E70C: /* 17E70C 8024FE2C 3C048011 */ lui $a0, %hi(HudScript_AButton) /* 17E710 8024FE30 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) -/* 17E714 8024FE34 0C050529 */ jal create_hud_element +/* 17E714 8024FE34 0C050529 */ jal hud_element_create /* 17E718 8024FE38 00000000 */ nop /* 17E71C 8024FE3C 00022400 */ sll $a0, $v0, 0x10 /* 17E720 8024FE40 00042403 */ sra $a0, $a0, 0x10 /* 17E724 8024FE44 34058080 */ ori $a1, $zero, 0x8080 /* 17E728 8024FE48 3C10802A */ lui $s0, %hi(D_8029F642) /* 17E72C 8024FE4C 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) -/* 17E730 8024FE50 0C051280 */ jal set_hud_element_flags +/* 17E730 8024FE50 0C051280 */ jal hud_element_set_flags /* 17E734 8024FE54 A6020000 */ sh $v0, ($s0) /* 17E738 8024FE58 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E73C 8024FE5C 86040000 */ lh $a0, ($s0) -/* 17E740 8024FE60 0C051261 */ jal set_hud_element_render_pos +/* 17E740 8024FE60 0C051261 */ jal hud_element_set_render_pos /* 17E744 8024FE64 00A0302D */ daddu $a2, $a1, $zero /* 17E748 8024FE68 3C048029 */ lui $a0, %hi(HudScript_BButton) /* 17E74C 8024FE6C 2484231C */ addiu $a0, $a0, %lo(HudScript_BButton) -/* 17E750 8024FE70 0C050529 */ jal create_hud_element +/* 17E750 8024FE70 0C050529 */ jal hud_element_create /* 17E754 8024FE74 00000000 */ nop /* 17E758 8024FE78 00022400 */ sll $a0, $v0, 0x10 /* 17E75C 8024FE7C 00042403 */ sra $a0, $a0, 0x10 /* 17E760 8024FE80 34058080 */ ori $a1, $zero, 0x8080 /* 17E764 8024FE84 3C10802A */ lui $s0, %hi(D_8029F644) /* 17E768 8024FE88 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) -/* 17E76C 8024FE8C 0C051280 */ jal set_hud_element_flags +/* 17E76C 8024FE8C 0C051280 */ jal hud_element_set_flags /* 17E770 8024FE90 A6020000 */ sh $v0, ($s0) /* 17E774 8024FE94 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E778 8024FE98 86040000 */ lh $a0, ($s0) -/* 17E77C 8024FE9C 0C051261 */ jal set_hud_element_render_pos +/* 17E77C 8024FE9C 0C051261 */ jal hud_element_set_render_pos /* 17E780 8024FEA0 00A0302D */ daddu $a2, $a1, $zero /* 17E784 8024FEA4 3C048029 */ lui $a0, %hi(HudScript_CDownButton) /* 17E788 8024FEA8 24842630 */ addiu $a0, $a0, %lo(HudScript_CDownButton) -/* 17E78C 8024FEAC 0C050529 */ jal create_hud_element +/* 17E78C 8024FEAC 0C050529 */ jal hud_element_create /* 17E790 8024FEB0 00000000 */ nop /* 17E794 8024FEB4 00022400 */ sll $a0, $v0, 0x10 /* 17E798 8024FEB8 00042403 */ sra $a0, $a0, 0x10 @@ -276,22 +276,22 @@ glabel func_8024FB3C .L8024FEDC_17E7BC: /* 17E7BC 8024FEDC 3C048029 */ lui $a0, %hi(HudScript_TimingReady) /* 17E7C0 8024FEE0 24842788 */ addiu $a0, $a0, %lo(HudScript_TimingReady) -/* 17E7C4 8024FEE4 0C050529 */ jal create_hud_element +/* 17E7C4 8024FEE4 0C050529 */ jal hud_element_create /* 17E7C8 8024FEE8 00000000 */ nop /* 17E7CC 8024FEEC 00022400 */ sll $a0, $v0, 0x10 /* 17E7D0 8024FEF0 00042403 */ sra $a0, $a0, 0x10 /* 17E7D4 8024FEF4 24050080 */ addiu $a1, $zero, 0x80 /* 17E7D8 8024FEF8 3C10802A */ lui $s0, %hi(D_8029F642) /* 17E7DC 8024FEFC 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) -/* 17E7E0 8024FF00 0C051280 */ jal set_hud_element_flags +/* 17E7E0 8024FF00 0C051280 */ jal hud_element_set_flags /* 17E7E4 8024FF04 A6020000 */ sh $v0, ($s0) /* 17E7E8 8024FF08 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E7EC 8024FF0C 86040000 */ lh $a0, ($s0) -/* 17E7F0 8024FF10 0C051261 */ jal set_hud_element_render_pos +/* 17E7F0 8024FF10 0C051261 */ jal hud_element_set_render_pos /* 17E7F4 8024FF14 00A0302D */ daddu $a2, $a1, $zero /* 17E7F8 8024FF18 3C048011 */ lui $a0, %hi(HudScript_AButton) /* 17E7FC 8024FF1C 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) -/* 17E800 8024FF20 0C050529 */ jal create_hud_element +/* 17E800 8024FF20 0C050529 */ jal hud_element_create /* 17E804 8024FF24 00000000 */ nop /* 17E808 8024FF28 00022400 */ sll $a0, $v0, 0x10 /* 17E80C 8024FF2C 00042403 */ sra $a0, $a0, 0x10 @@ -302,22 +302,22 @@ glabel func_8024FB3C .L8024FF40_17E820: /* 17E820 8024FF40 3C048011 */ lui $a0, %hi(HudScript_AButton) /* 17E824 8024FF44 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) -/* 17E828 8024FF48 0C050529 */ jal create_hud_element +/* 17E828 8024FF48 0C050529 */ jal hud_element_create /* 17E82C 8024FF4C 00000000 */ nop /* 17E830 8024FF50 00022400 */ sll $a0, $v0, 0x10 /* 17E834 8024FF54 00042403 */ sra $a0, $a0, 0x10 /* 17E838 8024FF58 34058080 */ ori $a1, $zero, 0x8080 /* 17E83C 8024FF5C 3C10802A */ lui $s0, %hi(D_8029F642) /* 17E840 8024FF60 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) -/* 17E844 8024FF64 0C051280 */ jal set_hud_element_flags +/* 17E844 8024FF64 0C051280 */ jal hud_element_set_flags /* 17E848 8024FF68 A6020000 */ sh $v0, ($s0) /* 17E84C 8024FF6C 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E850 8024FF70 86040000 */ lh $a0, ($s0) -/* 17E854 8024FF74 0C051261 */ jal set_hud_element_render_pos +/* 17E854 8024FF74 0C051261 */ jal hud_element_set_render_pos /* 17E858 8024FF78 00A0302D */ daddu $a2, $a1, $zero /* 17E85C 8024FF7C 3C048029 */ lui $a0, %hi(HudScript_BButton) /* 17E860 8024FF80 2484231C */ addiu $a0, $a0, %lo(HudScript_BButton) -/* 17E864 8024FF84 0C050529 */ jal create_hud_element +/* 17E864 8024FF84 0C050529 */ jal hud_element_create /* 17E868 8024FF88 00000000 */ nop /* 17E86C 8024FF8C 86040000 */ lh $a0, ($s0) /* 17E870 8024FF90 3C01802A */ lui $at, %hi(D_8029F644) @@ -327,22 +327,22 @@ glabel func_8024FB3C .L8024FFA0_17E880: /* 17E880 8024FFA0 3C048011 */ lui $a0, %hi(HudScript_AButton) /* 17E884 8024FFA4 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) -/* 17E888 8024FFA8 0C050529 */ jal create_hud_element +/* 17E888 8024FFA8 0C050529 */ jal hud_element_create /* 17E88C 8024FFAC 00000000 */ nop /* 17E890 8024FFB0 00022400 */ sll $a0, $v0, 0x10 /* 17E894 8024FFB4 00042403 */ sra $a0, $a0, 0x10 /* 17E898 8024FFB8 34058080 */ ori $a1, $zero, 0x8080 /* 17E89C 8024FFBC 3C10802A */ lui $s0, %hi(D_8029F642) /* 17E8A0 8024FFC0 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) -/* 17E8A4 8024FFC4 0C051280 */ jal set_hud_element_flags +/* 17E8A4 8024FFC4 0C051280 */ jal hud_element_set_flags /* 17E8A8 8024FFC8 A6020000 */ sh $v0, ($s0) /* 17E8AC 8024FFCC 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E8B0 8024FFD0 86040000 */ lh $a0, ($s0) -/* 17E8B4 8024FFD4 0C051261 */ jal set_hud_element_render_pos +/* 17E8B4 8024FFD4 0C051261 */ jal hud_element_set_render_pos /* 17E8B8 8024FFD8 00A0302D */ daddu $a2, $a1, $zero /* 17E8BC 8024FFDC 3C048029 */ lui $a0, %hi(HudScript_BButton) /* 17E8C0 8024FFE0 2484231C */ addiu $a0, $a0, %lo(HudScript_BButton) -/* 17E8C4 8024FFE4 0C050529 */ jal create_hud_element +/* 17E8C4 8024FFE4 0C050529 */ jal hud_element_create /* 17E8C8 8024FFE8 00000000 */ nop /* 17E8CC 8024FFEC 00022400 */ sll $a0, $v0, 0x10 /* 17E8D0 8024FFF0 00042403 */ sra $a0, $a0, 0x10 @@ -353,22 +353,22 @@ glabel func_8024FB3C .L80250004_17E8E4: /* 17E8E4 80250004 3C048029 */ lui $a0, %hi(HudScript_TimingReady) /* 17E8E8 80250008 24842788 */ addiu $a0, $a0, %lo(HudScript_TimingReady) -/* 17E8EC 8025000C 0C050529 */ jal create_hud_element +/* 17E8EC 8025000C 0C050529 */ jal hud_element_create /* 17E8F0 80250010 00000000 */ nop /* 17E8F4 80250014 00022400 */ sll $a0, $v0, 0x10 /* 17E8F8 80250018 00042403 */ sra $a0, $a0, 0x10 /* 17E8FC 8025001C 24050080 */ addiu $a1, $zero, 0x80 /* 17E900 80250020 3C10802A */ lui $s0, %hi(D_8029F642) /* 17E904 80250024 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) -/* 17E908 80250028 0C051280 */ jal set_hud_element_flags +/* 17E908 80250028 0C051280 */ jal hud_element_set_flags /* 17E90C 8025002C A6020000 */ sh $v0, ($s0) /* 17E910 80250030 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E914 80250034 86040000 */ lh $a0, ($s0) -/* 17E918 80250038 0C051261 */ jal set_hud_element_render_pos +/* 17E918 80250038 0C051261 */ jal hud_element_set_render_pos /* 17E91C 8025003C 00A0302D */ daddu $a2, $a1, $zero /* 17E920 80250040 3C048011 */ lui $a0, %hi(HudScript_AButtonDown) /* 17E924 80250044 24848B54 */ addiu $a0, $a0, %lo(HudScript_AButtonDown) -/* 17E928 80250048 0C050529 */ jal create_hud_element +/* 17E928 80250048 0C050529 */ jal hud_element_create /* 17E92C 8025004C 00000000 */ nop /* 17E930 80250050 00022400 */ sll $a0, $v0, 0x10 /* 17E934 80250054 00042403 */ sra $a0, $a0, 0x10 @@ -379,40 +379,40 @@ glabel func_8024FB3C .L80250068_17E948: /* 17E948 80250068 3C048011 */ lui $a0, %hi(HudScript_StickNeutral) /* 17E94C 8025006C 24848E1C */ addiu $a0, $a0, %lo(HudScript_StickNeutral) -/* 17E950 80250070 0C050529 */ jal create_hud_element +/* 17E950 80250070 0C050529 */ jal hud_element_create /* 17E954 80250074 00000000 */ nop /* 17E958 80250078 00022400 */ sll $a0, $v0, 0x10 /* 17E95C 8025007C 00042403 */ sra $a0, $a0, 0x10 /* 17E960 80250080 34058080 */ ori $a1, $zero, 0x8080 /* 17E964 80250084 3C10802A */ lui $s0, %hi(D_8029F642) /* 17E968 80250088 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) -/* 17E96C 8025008C 0C051280 */ jal set_hud_element_flags +/* 17E96C 8025008C 0C051280 */ jal hud_element_set_flags /* 17E970 80250090 A6020000 */ sh $v0, ($s0) /* 17E974 80250094 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E978 80250098 86040000 */ lh $a0, ($s0) -/* 17E97C 8025009C 0C051261 */ jal set_hud_element_render_pos +/* 17E97C 8025009C 0C051261 */ jal hud_element_set_render_pos /* 17E980 802500A0 00A0302D */ daddu $a2, $a1, $zero /* 17E984 802500A4 3C048029 */ lui $a0, %hi(HudScript_AimTarget) /* 17E988 802500A8 248436D4 */ addiu $a0, $a0, %lo(HudScript_AimTarget) -/* 17E98C 802500AC 0C050529 */ jal create_hud_element +/* 17E98C 802500AC 0C050529 */ jal hud_element_create /* 17E990 802500B0 00000000 */ nop /* 17E994 802500B4 00022400 */ sll $a0, $v0, 0x10 /* 17E998 802500B8 00042403 */ sra $a0, $a0, 0x10 /* 17E99C 802500BC 34058080 */ ori $a1, $zero, 0x8080 /* 17E9A0 802500C0 3C10802A */ lui $s0, %hi(D_8029F644) /* 17E9A4 802500C4 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) -/* 17E9A8 802500C8 0C051280 */ jal set_hud_element_flags +/* 17E9A8 802500C8 0C051280 */ jal hud_element_set_flags /* 17E9AC 802500CC A6020000 */ sh $v0, ($s0) /* 17E9B0 802500D0 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E9B4 802500D4 86040000 */ lh $a0, ($s0) -/* 17E9B8 802500D8 0C051261 */ jal set_hud_element_render_pos +/* 17E9B8 802500D8 0C051261 */ jal hud_element_set_render_pos /* 17E9BC 802500DC 00A0302D */ daddu $a2, $a1, $zero /* 17E9C0 802500E0 86040000 */ lh $a0, ($s0) -/* 17E9C4 802500E4 0C0513F6 */ jal create_hud_element_transform_B +/* 17E9C4 802500E4 0C0513F6 */ jal hud_element_create_transform_B /* 17E9C8 802500E8 00000000 */ nop /* 17E9CC 802500EC 3C048029 */ lui $a0, %hi(HudScript_AimReticle) /* 17E9D0 802500F0 2484369C */ addiu $a0, $a0, %lo(HudScript_AimReticle) -/* 17E9D4 802500F4 0C050529 */ jal create_hud_element +/* 17E9D4 802500F4 0C050529 */ jal hud_element_create /* 17E9D8 802500F8 00000000 */ nop /* 17E9DC 802500FC 00022400 */ sll $a0, $v0, 0x10 /* 17E9E0 80250100 00042403 */ sra $a0, $a0, 0x10 @@ -420,38 +420,38 @@ glabel func_8024FB3C /* 17E9E8 80250108 3C10802A */ lui $s0, %hi(D_8029F646) /* 17E9EC 8025010C 2610F646 */ addiu $s0, $s0, %lo(D_8029F646) .L80250110: -/* 17E9F0 80250110 0C051280 */ jal set_hud_element_flags +/* 17E9F0 80250110 0C051280 */ jal hud_element_set_flags /* 17E9F4 80250114 A6020000 */ sh $v0, ($s0) /* 17E9F8 80250118 2405FF9C */ addiu $a1, $zero, -0x64 /* 17E9FC 8025011C 86040000 */ lh $a0, ($s0) -/* 17EA00 80250120 0C051261 */ jal set_hud_element_render_pos +/* 17EA00 80250120 0C051261 */ jal hud_element_set_render_pos /* 17EA04 80250124 00A0302D */ daddu $a2, $a1, $zero /* 17EA08 80250128 86040000 */ lh $a0, ($s0) -/* 17EA0C 8025012C 0C0513F6 */ jal create_hud_element_transform_B +/* 17EA0C 8025012C 0C0513F6 */ jal hud_element_create_transform_B /* 17EA10 80250130 00000000 */ nop /* 17EA14 80250134 080941EB */ j .L802507AC /* 17EA18 80250138 24020001 */ addiu $v0, $zero, 1 .L8025013C_17EA1C: /* 17EA1C 8025013C 3C048011 */ lui $a0, %hi(HudScript_AButton) /* 17EA20 80250140 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) -/* 17EA24 80250144 0C050529 */ jal create_hud_element +/* 17EA24 80250144 0C050529 */ jal hud_element_create /* 17EA28 80250148 00000000 */ nop /* 17EA2C 8025014C 00022400 */ sll $a0, $v0, 0x10 /* 17EA30 80250150 00042403 */ sra $a0, $a0, 0x10 /* 17EA34 80250154 34058080 */ ori $a1, $zero, 0x8080 /* 17EA38 80250158 3C10802A */ lui $s0, %hi(D_8029F642) /* 17EA3C 8025015C 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) -/* 17EA40 80250160 0C051280 */ jal set_hud_element_flags +/* 17EA40 80250160 0C051280 */ jal hud_element_set_flags /* 17EA44 80250164 A6020000 */ sh $v0, ($s0) /* 17EA48 80250168 2405FF9C */ addiu $a1, $zero, -0x64 /* 17EA4C 8025016C 86040000 */ lh $a0, ($s0) -/* 17EA50 80250170 0C051261 */ jal set_hud_element_render_pos +/* 17EA50 80250170 0C051261 */ jal hud_element_set_render_pos /* 17EA54 80250174 00A0302D */ daddu $a2, $a1, $zero .L80250178_17EA58: /* 17EA58 80250178 3C048011 */ lui $a0, %hi(HudScript_AButton) /* 17EA5C 8025017C 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) .L80250180: -/* 17EA60 80250180 0C050529 */ jal create_hud_element +/* 17EA60 80250180 0C050529 */ jal hud_element_create /* 17EA64 80250184 00000000 */ nop /* 17EA68 80250188 00022400 */ sll $a0, $v0, 0x10 /* 17EA6C 8025018C 00042403 */ sra $a0, $a0, 0x10 @@ -513,7 +513,7 @@ glabel func_8024FB3C /* 17EB38 80250258 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EB3C 8025025C 3C058011 */ lui $a1, %hi(HudScript_StickTapLeft) /* 17EB40 80250260 24A58F90 */ addiu $a1, $a1, %lo(HudScript_StickTapLeft) -/* 17EB44 80250264 0C0511FF */ jal set_hud_element_anim +/* 17EB44 80250264 0C0511FF */ jal hud_element_set_script /* 17EB48 80250268 00000000 */ nop /* 17EB4C 8025026C 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EB50 80250270 8484F644 */ lh $a0, %lo(D_8029F644)($a0) @@ -526,7 +526,7 @@ glabel func_8024FB3C /* 17EB68 80250288 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EB6C 8025028C 3C058011 */ lui $a1, %hi(HudScript_StickTapLeft) /* 17EB70 80250290 24A58F90 */ addiu $a1, $a1, %lo(HudScript_StickTapLeft) -/* 17EB74 80250294 0C0511FF */ jal set_hud_element_anim +/* 17EB74 80250294 0C0511FF */ jal hud_element_set_script /* 17EB78 80250298 00000000 */ nop /* 17EB7C 8025029C 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EB80 802502A0 8484F644 */ lh $a0, %lo(D_8029F644)($a0) @@ -539,19 +539,19 @@ glabel func_8024FB3C /* 17EB98 802502B8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EB9C 802502BC 3C058029 */ lui $a1, %hi(HudScript_MashCUpButton) /* 17EBA0 802502C0 24A525F4 */ addiu $a1, $a1, %lo(HudScript_MashCUpButton) -/* 17EBA4 802502C4 0C0511FF */ jal set_hud_element_anim +/* 17EBA4 802502C4 0C0511FF */ jal hud_element_set_script /* 17EBA8 802502C8 00000000 */ nop /* 17EBAC 802502CC 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EBB0 802502D0 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17EBB4 802502D4 3C058029 */ lui $a1, %hi(HudScript_MashCDownButton1) /* 17EBB8 802502D8 24A52688 */ addiu $a1, $a1, %lo(HudScript_MashCDownButton1) -/* 17EBBC 802502DC 0C0511FF */ jal set_hud_element_anim +/* 17EBBC 802502DC 0C0511FF */ jal hud_element_set_script /* 17EBC0 802502E0 00000000 */ nop /* 17EBC4 802502E4 3C04802A */ lui $a0, %hi(D_8029F646) /* 17EBC8 802502E8 8484F646 */ lh $a0, %lo(D_8029F646)($a0) /* 17EBCC 802502EC 3C058029 */ lui $a1, %hi(HudScript_MashCLeftButton) /* 17EBD0 802502F0 24A52490 */ addiu $a1, $a1, %lo(HudScript_MashCLeftButton) -/* 17EBD4 802502F4 0C0511FF */ jal set_hud_element_anim +/* 17EBD4 802502F4 0C0511FF */ jal hud_element_set_script /* 17EBD8 802502F8 00000000 */ nop /* 17EBDC 802502FC 3C04802A */ lui $a0, %hi(D_8029F648) /* 17EBE0 80250300 8484F648 */ lh $a0, %lo(D_8029F648)($a0) @@ -571,13 +571,13 @@ glabel func_8024FB3C /* 17EC10 80250330 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EC14 80250334 3C058011 */ lui $a1, %hi(HudScript_PressAButton) /* 17EC18 80250338 24A58BBC */ addiu $a1, $a1, %lo(HudScript_PressAButton) -/* 17EC1C 8025033C 0C0511FF */ jal set_hud_element_anim +/* 17EC1C 8025033C 0C0511FF */ jal hud_element_set_script /* 17EC20 80250340 00000000 */ nop /* 17EC24 80250344 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EC28 80250348 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17EC2C 8025034C 3C058029 */ lui $a1, %hi(HudScript_PressBButton) /* 17EC30 80250350 24A523B0 */ addiu $a1, $a1, %lo(HudScript_PressBButton) -/* 17EC34 80250354 0C0511FF */ jal set_hud_element_anim +/* 17EC34 80250354 0C0511FF */ jal hud_element_set_script /* 17EC38 80250358 00000000 */ nop /* 17EC3C 8025035C 3C04802A */ lui $a0, %hi(D_8029F646) /* 17EC40 80250360 8484F646 */ lh $a0, %lo(D_8029F646)($a0) @@ -597,7 +597,7 @@ glabel func_8024FB3C /* 17EC70 80250390 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EC74 80250394 3C058029 */ lui $a1, %hi(HudScript_TimingBlink) /* 17EC78 80250398 24A527B4 */ addiu $a1, $a1, %lo(HudScript_TimingBlink) -/* 17EC7C 8025039C 0C0511FF */ jal set_hud_element_anim +/* 17EC7C 8025039C 0C0511FF */ jal hud_element_set_script /* 17EC80 802503A0 00000000 */ nop /* 17EC84 802503A4 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EC88 802503A8 8484F644 */ lh $a0, %lo(D_8029F644)($a0) @@ -610,7 +610,7 @@ glabel func_8024FB3C /* 17ECA0 802503C0 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17ECA4 802503C4 3C058011 */ lui $a1, %hi(HudScript_MashAButton) /* 17ECA8 802503C8 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 17ECAC 802503CC 0C0511FF */ jal set_hud_element_anim +/* 17ECAC 802503CC 0C0511FF */ jal hud_element_set_script /* 17ECB0 802503D0 00000000 */ nop /* 17ECB4 802503D4 3C04802A */ lui $a0, %hi(D_8029F644) /* 17ECB8 802503D8 8484F644 */ lh $a0, %lo(D_8029F644)($a0) @@ -623,7 +623,7 @@ glabel func_8024FB3C /* 17ECD0 802503F0 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17ECD4 802503F4 3C058011 */ lui $a1, %hi(HudScript_MashAButton) /* 17ECD8 802503F8 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 17ECDC 802503FC 0C0511FF */ jal set_hud_element_anim +/* 17ECDC 802503FC 0C0511FF */ jal hud_element_set_script /* 17ECE0 80250400 00000000 */ nop /* 17ECE4 80250404 3C04802A */ lui $a0, %hi(D_8029F644) /* 17ECE8 80250408 8484F644 */ lh $a0, %lo(D_8029F644)($a0) @@ -643,7 +643,7 @@ glabel func_8024FB3C /* 17ED18 80250438 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17ED1C 8025043C 3C058029 */ lui $a1, %hi(HudScript_TimingBlink) /* 17ED20 80250440 24A527B4 */ addiu $a1, $a1, %lo(HudScript_TimingBlink) -/* 17ED24 80250444 0C0511FF */ jal set_hud_element_anim +/* 17ED24 80250444 0C0511FF */ jal hud_element_set_script /* 17ED28 80250448 00000000 */ nop /* 17ED2C 8025044C 3C04802A */ lui $a0, %hi(D_8029F644) /* 17ED30 80250450 8484F644 */ lh $a0, %lo(D_8029F644)($a0) @@ -668,7 +668,7 @@ glabel func_8024FB3C /* 17ED70 80250490 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17ED74 80250494 3C058011 */ lui $a1, %hi(HudScript_PressAButton) /* 17ED78 80250498 24A58BBC */ addiu $a1, $a1, %lo(HudScript_PressAButton) -/* 17ED7C 8025049C 0C0511FF */ jal set_hud_element_anim +/* 17ED7C 8025049C 0C0511FF */ jal hud_element_set_script /* 17ED80 802504A0 00000000 */ nop .L802504A4_17ED84: /* 17ED84 802504A4 3C04802A */ lui $a0, %hi(D_8029F642) @@ -677,7 +677,7 @@ glabel func_8024FB3C /* 17ED8C 802504AC 3C058011 */ lui $a1, %hi(HudScript_PressAButton) /* 17ED90 802504B0 24A58BBC */ addiu $a1, $a1, %lo(HudScript_PressAButton) .L802504B4: -/* 17ED94 802504B4 0C0511FF */ jal set_hud_element_anim +/* 17ED94 802504B4 0C0511FF */ jal hud_element_set_script /* 17ED98 802504B8 00000000 */ nop .L802504BC: /* 17ED9C 802504BC 86230014 */ lh $v1, 0x14($s1) @@ -750,7 +750,7 @@ glabel func_8024FB3C .L802505B4_17EE94: /* 17EE94 802505B4 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EE98 802505B8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17EE9C 802505BC 0C05123D */ jal free_hud_element +/* 17EE9C 802505BC 0C05123D */ jal hud_element_free /* 17EEA0 802505C0 00000000 */ nop /* 17EEA4 802505C4 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EEA8 802505C8 8484F644 */ lh $a0, %lo(D_8029F644)($a0) @@ -759,11 +759,11 @@ glabel func_8024FB3C .L802505D4_17EEB4: /* 17EEB4 802505D4 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EEB8 802505D8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17EEBC 802505DC 0C05123D */ jal free_hud_element +/* 17EEBC 802505DC 0C05123D */ jal hud_element_free /* 17EEC0 802505E0 00000000 */ nop /* 17EEC4 802505E4 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EEC8 802505E8 8484F644 */ lh $a0, %lo(D_8029F644)($a0) -/* 17EECC 802505EC 0C05123D */ jal free_hud_element +/* 17EECC 802505EC 0C05123D */ jal hud_element_free /* 17EED0 802505F0 00000000 */ nop /* 17EED4 802505F4 3C04802A */ lui $a0, %hi(D_8029F646) /* 17EED8 802505F8 8484F646 */ lh $a0, %lo(D_8029F646)($a0) @@ -772,20 +772,20 @@ glabel func_8024FB3C .L80250604_17EEE4: /* 17EEE4 80250604 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EEE8 80250608 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17EEEC 8025060C 0C05123D */ jal free_hud_element +/* 17EEEC 8025060C 0C05123D */ jal hud_element_free /* 17EEF0 80250610 00000000 */ nop /* 17EEF4 80250614 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EEF8 80250618 8484F644 */ lh $a0, %lo(D_8029F644)($a0) -/* 17EEFC 8025061C 0C05123D */ jal free_hud_element +/* 17EEFC 8025061C 0C05123D */ jal hud_element_free /* 17EF00 80250620 00000000 */ nop /* 17EF04 80250624 3C04802A */ lui $a0, %hi(D_8029F646) /* 17EF08 80250628 8484F646 */ lh $a0, %lo(D_8029F646)($a0) -/* 17EF0C 8025062C 0C05123D */ jal free_hud_element +/* 17EF0C 8025062C 0C05123D */ jal hud_element_free /* 17EF10 80250630 00000000 */ nop /* 17EF14 80250634 3C04802A */ lui $a0, %hi(D_8029F648) /* 17EF18 80250638 8484F648 */ lh $a0, %lo(D_8029F648)($a0) .L8025063C: -/* 17EF1C 8025063C 0C05123D */ jal free_hud_element +/* 17EF1C 8025063C 0C05123D */ jal hud_element_free /* 17EF20 80250640 00000000 */ nop .L80250644: /* 17EF24 80250644 3C01802A */ lui $at, %hi(D_8029F64A) @@ -878,7 +878,7 @@ glabel func_8024FB3C /* 17F048 80250768 3C048008 */ lui $a0, %hi(HudScript_Item_Items) /* 17F04C 8025076C 248407C0 */ addiu $a0, $a0, %lo(HudScript_Item_Items) .L80250770: -/* 17F050 80250770 0C050529 */ jal create_hud_element +/* 17F050 80250770 0C050529 */ jal hud_element_create /* 17F054 80250774 00000000 */ nop /* 17F058 80250778 00022400 */ sll $a0, $v0, 0x10 /* 17F05C 8025077C 00042403 */ sra $a0, $a0, 0x10 @@ -889,11 +889,11 @@ glabel func_8024FB3C .L8025078C: /* 17F06C 8025078C A6020000 */ sh $v0, ($s0) .L80250790: -/* 17F070 80250790 0C051280 */ jal set_hud_element_flags +/* 17F070 80250790 0C051280 */ jal hud_element_set_flags /* 17F074 80250794 00000000 */ nop /* 17F078 80250798 2405FF9C */ addiu $a1, $zero, -0x64 /* 17F07C 8025079C 86040000 */ lh $a0, ($s0) -/* 17F080 802507A0 0C051261 */ jal set_hud_element_render_pos +/* 17F080 802507A0 0C051261 */ jal hud_element_set_render_pos /* 17F084 802507A4 00A0302D */ daddu $a2, $a1, $zero .L802507A8_17F088: /* 17F088 802507A8 24020001 */ addiu $v0, $zero, 1 @@ -911,7 +911,7 @@ glabel func_8024FB3C .L802507CC: /* 17F0AC 802507CC 3C04802A */ lui $a0, %hi(D_8029F642) /* 17F0B0 802507D0 8484F642 */ lh $a0, %lo(D_8029F642)($a0) -/* 17F0B4 802507D4 0C05123D */ jal free_hud_element +/* 17F0B4 802507D4 0C05123D */ jal hud_element_free /* 17F0B8 802507D8 24120001 */ addiu $s2, $zero, 1 .L802507DC: /* 17F0BC 802507DC 12400008 */ beqz $s2, .L80250800 diff --git a/ver/us/asm/nonmatchings/17D6A0/func_80250818.s b/ver/us/asm/nonmatchings/17D6A0/func_80250818.s index 93250d6422..e0bf15f23e 100644 --- a/ver/us/asm/nonmatchings/17D6A0/func_80250818.s +++ b/ver/us/asm/nonmatchings/17D6A0/func_80250818.s @@ -126,7 +126,7 @@ glabel func_80250818 /* 17F2A0 802509C0 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F2A4 802509C4 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F2A8 802509C8 86040000 */ lh $a0, ($s0) -/* 17F2AC 802509CC 0C051261 */ jal set_hud_element_render_pos +/* 17F2AC 802509CC 0C051261 */ jal hud_element_set_render_pos /* 17F2B0 802509D0 2626000E */ addiu $a2, $s1, 0xe /* 17F2B4 802509D4 0809439D */ j .L80250E74 /* 17F2B8 802509D8 00000000 */ nop @@ -188,23 +188,23 @@ glabel func_80250818 /* 17F384 80250AA4 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F388 80250AA8 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F38C 80250AAC 86040000 */ lh $a0, ($s0) -/* 17F390 80250AB0 0C051261 */ jal set_hud_element_render_pos +/* 17F390 80250AB0 0C051261 */ jal hud_element_set_render_pos /* 17F394 80250AB4 2626000E */ addiu $a2, $s1, 0xe /* 17F398 80250AB8 86040000 */ lh $a0, ($s0) /* 17F39C 80250ABC 3C053F19 */ lui $a1, 0x3f19 -/* 17F3A0 80250AC0 0C051308 */ jal set_hud_element_scale +/* 17F3A0 80250AC0 0C051308 */ jal hud_element_set_scale /* 17F3A4 80250AC4 34A5999A */ ori $a1, $a1, 0x999a /* 17F3A8 80250AC8 86040000 */ lh $a0, ($s0) -/* 17F3AC 80250ACC 0C0513AC */ jal set_hud_element_alpha +/* 17F3AC 80250ACC 0C0513AC */ jal hud_element_set_alpha /* 17F3B0 80250AD0 0280282D */ daddu $a1, $s4, $zero /* 17F3B4 80250AD4 86040000 */ lh $a0, ($s0) -/* 17F3B8 80250AD8 0C0511EA */ jal draw_hud_element_clipped +/* 17F3B8 80250AD8 0C0511EA */ jal hud_element_draw_clipped /* 17F3BC 80250ADC 00000000 */ nop /* 17F3C0 80250AE0 26450049 */ addiu $a1, $s2, 0x49 /* 17F3C4 80250AE4 3C10802A */ lui $s0, %hi(D_8029F644) /* 17F3C8 80250AE8 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) /* 17F3CC 80250AEC 86040000 */ lh $a0, ($s0) -/* 17F3D0 80250AF0 0C051261 */ jal set_hud_element_render_pos +/* 17F3D0 80250AF0 0C051261 */ jal hud_element_set_render_pos /* 17F3D4 80250AF4 2626001F */ addiu $a2, $s1, 0x1f /* 17F3D8 80250AF8 0809439A */ j .L80250E68 /* 17F3DC 80250AFC 00000000 */ nop @@ -227,7 +227,7 @@ glabel func_80250818 /* 17F414 80250B34 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F418 80250B38 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F41C 80250B3C 86040000 */ lh $a0, ($s0) -/* 17F420 80250B40 0C051261 */ jal set_hud_element_render_pos +/* 17F420 80250B40 0C051261 */ jal hud_element_set_render_pos /* 17F424 80250B44 2626000E */ addiu $a2, $s1, 0xe /* 17F428 80250B48 86040000 */ lh $a0, ($s0) /* 17F42C 80250B4C 3C053F19 */ lui $a1, 0x3f19 @@ -238,17 +238,17 @@ glabel func_80250818 /* 17F43C 80250B5C 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F440 80250B60 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F444 80250B64 86040000 */ lh $a0, ($s0) -/* 17F448 80250B68 0C051261 */ jal set_hud_element_render_pos +/* 17F448 80250B68 0C051261 */ jal hud_element_set_render_pos /* 17F44C 80250B6C 2626000D */ addiu $a2, $s1, 0xd /* 17F450 80250B70 86040000 */ lh $a0, ($s0) /* 17F454 80250B74 3C053F19 */ lui $a1, 0x3f19 -/* 17F458 80250B78 0C051308 */ jal set_hud_element_scale +/* 17F458 80250B78 0C051308 */ jal hud_element_set_scale /* 17F45C 80250B7C 34A5999A */ ori $a1, $a1, 0x999a /* 17F460 80250B80 86040000 */ lh $a0, ($s0) -/* 17F464 80250B84 0C0513AC */ jal set_hud_element_alpha +/* 17F464 80250B84 0C0513AC */ jal hud_element_set_alpha /* 17F468 80250B88 0280282D */ daddu $a1, $s4, $zero /* 17F46C 80250B8C 86040000 */ lh $a0, ($s0) -/* 17F470 80250B90 0C0511EA */ jal draw_hud_element_clipped +/* 17F470 80250B90 0C0511EA */ jal hud_element_draw_clipped /* 17F474 80250B94 00000000 */ nop /* 17F478 80250B98 26450092 */ addiu $a1, $s2, 0x92 /* 17F47C 80250B9C 3C10802A */ lui $s0, %hi(D_8029F644) @@ -262,35 +262,35 @@ glabel func_80250818 /* 17F498 80250BB8 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F49C 80250BBC 2631000D */ addiu $s1, $s1, 0xd /* 17F4A0 80250BC0 86040000 */ lh $a0, ($s0) -/* 17F4A4 80250BC4 0C051261 */ jal set_hud_element_render_pos +/* 17F4A4 80250BC4 0C051261 */ jal hud_element_set_render_pos /* 17F4A8 80250BC8 0220302D */ daddu $a2, $s1, $zero /* 17F4AC 80250BCC 3C013F00 */ lui $at, 0x3f00 /* 17F4B0 80250BD0 4481A000 */ mtc1 $at, $f20 /* 17F4B4 80250BD4 86040000 */ lh $a0, ($s0) /* 17F4B8 80250BD8 4405A000 */ mfc1 $a1, $f20 -/* 17F4BC 80250BDC 0C051308 */ jal set_hud_element_scale +/* 17F4BC 80250BDC 0C051308 */ jal hud_element_set_scale /* 17F4C0 80250BE0 00000000 */ nop /* 17F4C4 80250BE4 86040000 */ lh $a0, ($s0) -/* 17F4C8 80250BE8 0C0513AC */ jal set_hud_element_alpha +/* 17F4C8 80250BE8 0C0513AC */ jal hud_element_set_alpha /* 17F4CC 80250BEC 0280282D */ daddu $a1, $s4, $zero /* 17F4D0 80250BF0 86040000 */ lh $a0, ($s0) -/* 17F4D4 80250BF4 0C0511EA */ jal draw_hud_element_clipped +/* 17F4D4 80250BF4 0C0511EA */ jal hud_element_draw_clipped /* 17F4D8 80250BF8 00000000 */ nop /* 17F4DC 80250BFC 26450040 */ addiu $a1, $s2, 0x40 /* 17F4E0 80250C00 3C10802A */ lui $s0, %hi(D_8029F644) /* 17F4E4 80250C04 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) /* 17F4E8 80250C08 86040000 */ lh $a0, ($s0) -/* 17F4EC 80250C0C 0C051261 */ jal set_hud_element_render_pos +/* 17F4EC 80250C0C 0C051261 */ jal hud_element_set_render_pos /* 17F4F0 80250C10 0220302D */ daddu $a2, $s1, $zero /* 17F4F4 80250C14 86040000 */ lh $a0, ($s0) /* 17F4F8 80250C18 4405A000 */ mfc1 $a1, $f20 -/* 17F4FC 80250C1C 0C051308 */ jal set_hud_element_scale +/* 17F4FC 80250C1C 0C051308 */ jal hud_element_set_scale /* 17F500 80250C20 00000000 */ nop /* 17F504 80250C24 86040000 */ lh $a0, ($s0) -/* 17F508 80250C28 0C0513AC */ jal set_hud_element_alpha +/* 17F508 80250C28 0C0513AC */ jal hud_element_set_alpha /* 17F50C 80250C2C 0280282D */ daddu $a1, $s4, $zero /* 17F510 80250C30 86040000 */ lh $a0, ($s0) -/* 17F514 80250C34 0C0511EA */ jal draw_hud_element_clipped +/* 17F514 80250C34 0C0511EA */ jal hud_element_draw_clipped /* 17F518 80250C38 00000000 */ nop /* 17F51C 80250C3C 2645006C */ addiu $a1, $s2, 0x6c /* 17F520 80250C40 3C10802A */ lui $s0, %hi(D_8029F646) @@ -303,13 +303,13 @@ glabel func_80250818 /* 17F538 80250C58 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F53C 80250C5C 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F540 80250C60 86040000 */ lh $a0, ($s0) -/* 17F544 80250C64 0C051261 */ jal set_hud_element_render_pos +/* 17F544 80250C64 0C051261 */ jal hud_element_set_render_pos /* 17F548 80250C68 2626000D */ addiu $a2, $s1, 0xd /* 17F54C 80250C6C 86040000 */ lh $a0, ($s0) -/* 17F550 80250C70 0C0513AC */ jal set_hud_element_alpha +/* 17F550 80250C70 0C0513AC */ jal hud_element_set_alpha /* 17F554 80250C74 0280282D */ daddu $a1, $s4, $zero /* 17F558 80250C78 86040000 */ lh $a0, ($s0) -/* 17F55C 80250C7C 0C0511EA */ jal draw_hud_element_clipped +/* 17F55C 80250C7C 0C0511EA */ jal hud_element_draw_clipped /* 17F560 80250C80 00000000 */ nop /* 17F564 80250C84 26450041 */ addiu $a1, $s2, 0x41 /* 17F568 80250C88 3C10802A */ lui $s0, %hi(D_8029F644) @@ -323,19 +323,19 @@ glabel func_80250818 /* 17F584 80250CA4 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F588 80250CA8 2631000E */ addiu $s1, $s1, 0xe /* 17F58C 80250CAC 86040000 */ lh $a0, ($s0) -/* 17F590 80250CB0 0C051261 */ jal set_hud_element_render_pos +/* 17F590 80250CB0 0C051261 */ jal hud_element_set_render_pos /* 17F594 80250CB4 0220302D */ daddu $a2, $s1, $zero /* 17F598 80250CB8 3C013F00 */ lui $at, 0x3f00 /* 17F59C 80250CBC 4481A000 */ mtc1 $at, $f20 /* 17F5A0 80250CC0 86040000 */ lh $a0, ($s0) /* 17F5A4 80250CC4 4405A000 */ mfc1 $a1, $f20 -/* 17F5A8 80250CC8 0C051308 */ jal set_hud_element_scale +/* 17F5A8 80250CC8 0C051308 */ jal hud_element_set_scale /* 17F5AC 80250CCC 00000000 */ nop /* 17F5B0 80250CD0 86040000 */ lh $a0, ($s0) -/* 17F5B4 80250CD4 0C0513AC */ jal set_hud_element_alpha +/* 17F5B4 80250CD4 0C0513AC */ jal hud_element_set_alpha /* 17F5B8 80250CD8 0280282D */ daddu $a1, $s4, $zero /* 17F5BC 80250CDC 86040000 */ lh $a0, ($s0) -/* 17F5C0 80250CE0 0C0511EA */ jal draw_hud_element_clipped +/* 17F5C0 80250CE0 0C0511EA */ jal hud_element_draw_clipped /* 17F5C4 80250CE4 00000000 */ nop /* 17F5C8 80250CE8 26450054 */ addiu $a1, $s2, 0x54 /* 17F5CC 80250CEC 3C10802A */ lui $s0, %hi(D_8029F644) @@ -355,13 +355,13 @@ glabel func_80250818 /* 17F5FC 80250D1C 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F600 80250D20 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F604 80250D24 86040000 */ lh $a0, ($s0) -/* 17F608 80250D28 0C051261 */ jal set_hud_element_render_pos +/* 17F608 80250D28 0C051261 */ jal hud_element_set_render_pos /* 17F60C 80250D2C 2626001F */ addiu $a2, $s1, 0x1f /* 17F610 80250D30 86040000 */ lh $a0, ($s0) -/* 17F614 80250D34 0C0513AC */ jal set_hud_element_alpha +/* 17F614 80250D34 0C0513AC */ jal hud_element_set_alpha /* 17F618 80250D38 0280282D */ daddu $a1, $s4, $zero /* 17F61C 80250D3C 86040000 */ lh $a0, ($s0) -/* 17F620 80250D40 0C0511EA */ jal draw_hud_element_clipped +/* 17F620 80250D40 0C0511EA */ jal hud_element_draw_clipped /* 17F624 80250D44 00000000 */ nop /* 17F628 80250D48 26450035 */ addiu $a1, $s2, 0x35 /* 17F62C 80250D4C 3C10802A */ lui $s0, %hi(D_8029F644) @@ -374,34 +374,34 @@ glabel func_80250818 /* 17F644 80250D64 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F648 80250D68 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) /* 17F64C 80250D6C 86040000 */ lh $a0, ($s0) -/* 17F650 80250D70 0C051261 */ jal set_hud_element_render_pos +/* 17F650 80250D70 0C051261 */ jal hud_element_set_render_pos /* 17F654 80250D74 2626000D */ addiu $a2, $s1, 0xd /* 17F658 80250D78 86040000 */ lh $a0, ($s0) /* 17F65C 80250D7C 3C053F19 */ lui $a1, 0x3f19 /* 17F660 80250D80 34A5999A */ ori $a1, $a1, 0x999a -/* 17F664 80250D84 0C051308 */ jal set_hud_element_scale +/* 17F664 80250D84 0C051308 */ jal hud_element_set_scale /* 17F668 80250D88 2631000F */ addiu $s1, $s1, 0xf /* 17F66C 80250D8C 86040000 */ lh $a0, ($s0) -/* 17F670 80250D90 0C0513AC */ jal set_hud_element_alpha +/* 17F670 80250D90 0C0513AC */ jal hud_element_set_alpha /* 17F674 80250D94 0280282D */ daddu $a1, $s4, $zero /* 17F678 80250D98 86040000 */ lh $a0, ($s0) -/* 17F67C 80250D9C 0C0511EA */ jal draw_hud_element_clipped +/* 17F67C 80250D9C 0C0511EA */ jal hud_element_draw_clipped /* 17F680 80250DA0 00000000 */ nop /* 17F684 80250DA4 264500D2 */ addiu $a1, $s2, 0xd2 /* 17F688 80250DA8 3C10802A */ lui $s0, %hi(D_8029F644) /* 17F68C 80250DAC 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) /* 17F690 80250DB0 86040000 */ lh $a0, ($s0) -/* 17F694 80250DB4 0C051261 */ jal set_hud_element_render_pos +/* 17F694 80250DB4 0C051261 */ jal hud_element_set_render_pos /* 17F698 80250DB8 0220302D */ daddu $a2, $s1, $zero /* 17F69C 80250DBC 3C013F4C */ lui $at, 0x3f4c /* 17F6A0 80250DC0 3421CCCD */ ori $at, $at, 0xcccd /* 17F6A4 80250DC4 4481A000 */ mtc1 $at, $f20 /* 17F6A8 80250DC8 86040000 */ lh $a0, ($s0) /* 17F6AC 80250DCC 4405A000 */ mfc1 $a1, $f20 -/* 17F6B0 80250DD0 0C051308 */ jal set_hud_element_scale +/* 17F6B0 80250DD0 0C051308 */ jal hud_element_set_scale /* 17F6B4 80250DD4 00000000 */ nop /* 17F6B8 80250DD8 86040000 */ lh $a0, ($s0) -/* 17F6BC 80250DDC 0C0513AC */ jal set_hud_element_alpha +/* 17F6BC 80250DDC 0C0513AC */ jal hud_element_set_alpha /* 17F6C0 80250DE0 0280282D */ daddu $a1, $s4, $zero /* 17F6C4 80250DE4 86040000 */ lh $a0, ($s0) /* 17F6C8 80250DE8 0C051086 */ jal func_80144218 @@ -412,14 +412,14 @@ glabel func_80250818 /* 17F6DC 80250DFC 86040000 */ lh $a0, ($s0) /* 17F6E0 80250E00 0220302D */ daddu $a2, $s1, $zero .L80250E04: -/* 17F6E4 80250E04 0C051261 */ jal set_hud_element_render_pos +/* 17F6E4 80250E04 0C051261 */ jal hud_element_set_render_pos /* 17F6E8 80250E08 00000000 */ nop /* 17F6EC 80250E0C 86040000 */ lh $a0, ($s0) /* 17F6F0 80250E10 3C053F4C */ lui $a1, 0x3f4c -/* 17F6F4 80250E14 0C051308 */ jal set_hud_element_scale +/* 17F6F4 80250E14 0C051308 */ jal hud_element_set_scale /* 17F6F8 80250E18 34A5CCCD */ ori $a1, $a1, 0xcccd /* 17F6FC 80250E1C 86040000 */ lh $a0, ($s0) -/* 17F700 80250E20 0C0513AC */ jal set_hud_element_alpha +/* 17F700 80250E20 0C0513AC */ jal hud_element_set_alpha /* 17F704 80250E24 0280282D */ daddu $a1, $s4, $zero /* 17F708 80250E28 86040000 */ lh $a0, ($s0) /* 17F70C 80250E2C 0C051086 */ jal func_80144218 @@ -433,20 +433,20 @@ glabel func_80250818 /* 17F728 80250E48 86040000 */ lh $a0, ($s0) /* 17F72C 80250E4C 2626000D */ addiu $a2, $s1, 0xd .L80250E50: -/* 17F730 80250E50 0C051261 */ jal set_hud_element_render_pos +/* 17F730 80250E50 0C051261 */ jal hud_element_set_render_pos /* 17F734 80250E54 00000000 */ nop /* 17F738 80250E58 86040000 */ lh $a0, ($s0) /* 17F73C 80250E5C 3C053F00 */ lui $a1, 0x3f00 .L80250E60: -/* 17F740 80250E60 0C051308 */ jal set_hud_element_scale +/* 17F740 80250E60 0C051308 */ jal hud_element_set_scale /* 17F744 80250E64 00000000 */ nop .L80250E68: /* 17F748 80250E68 86040000 */ lh $a0, ($s0) -/* 17F74C 80250E6C 0C0513AC */ jal set_hud_element_alpha +/* 17F74C 80250E6C 0C0513AC */ jal hud_element_set_alpha /* 17F750 80250E70 0280282D */ daddu $a1, $s4, $zero .L80250E74: /* 17F754 80250E74 86040000 */ lh $a0, ($s0) -/* 17F758 80250E78 0C0511EA */ jal draw_hud_element_clipped +/* 17F758 80250E78 0C0511EA */ jal hud_element_draw_clipped /* 17F75C 80250E7C 00000000 */ nop .L80250E80_17F760: /* 17F760 80250E80 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/ver/us/asm/nonmatchings/18C790/btl_draw_upgrade_windows.s b/ver/us/asm/nonmatchings/18C790/btl_draw_upgrade_windows.s index 749a6e9bd9..be626f6bf8 100644 --- a/ver/us/asm/nonmatchings/18C790/btl_draw_upgrade_windows.s +++ b/ver/us/asm/nonmatchings/18C790/btl_draw_upgrade_windows.s @@ -50,7 +50,7 @@ glabel btl_draw_upgrade_windows /* 18E908 80260028 26B5FA80 */ addiu $s5, $s5, %lo(D_8029FA80) /* 18E90C 8026002C 27B40054 */ addiu $s4, $sp, 0x54 /* 18E910 80260030 8EA40000 */ lw $a0, ($s5) -/* 18E914 80260034 0C05126B */ jal get_hud_element_render_pos +/* 18E914 80260034 0C05126B */ jal hud_element_get_render_pos /* 18E918 80260038 0280302D */ daddu $a2, $s4, $zero /* 18E91C 8026003C 0000202D */ daddu $a0, $zero, $zero /* 18E920 80260040 2405000F */ addiu $a1, $zero, 0xf @@ -83,7 +83,7 @@ glabel btl_draw_upgrade_windows /* 18E98C 802600AC E7B40028 */ swc1 $f20, 0x28($sp) /* 18E990 802600B0 02C0282D */ daddu $a1, $s6, $zero /* 18E994 802600B4 8EA4000C */ lw $a0, 0xc($s5) -/* 18E998 802600B8 0C05126B */ jal get_hud_element_render_pos +/* 18E998 802600B8 0C05126B */ jal hud_element_get_render_pos /* 18E99C 802600BC 0280302D */ daddu $a2, $s4, $zero /* 18E9A0 802600C0 0000202D */ daddu $a0, $zero, $zero /* 18E9A4 802600C4 8FA60050 */ lw $a2, 0x50($sp) @@ -110,7 +110,7 @@ glabel btl_draw_upgrade_windows /* 18E9F8 80260118 24E7FFEA */ addiu $a3, $a3, -0x16 /* 18E9FC 8026011C 02C0282D */ daddu $a1, $s6, $zero /* 18EA00 80260120 8EA40008 */ lw $a0, 8($s5) -/* 18EA04 80260124 0C05126B */ jal get_hud_element_render_pos +/* 18EA04 80260124 0C05126B */ jal hud_element_get_render_pos /* 18EA08 80260128 0280302D */ daddu $a2, $s4, $zero /* 18EA0C 8026012C 0000202D */ daddu $a0, $zero, $zero /* 18EA10 80260130 8FA60050 */ lw $a2, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/415D90/btl_draw_menu_wheel.s b/ver/us/asm/nonmatchings/415D90/btl_draw_menu_wheel.s index 3c9054a0f5..56487045df 100644 --- a/ver/us/asm/nonmatchings/415D90/btl_draw_menu_wheel.s +++ b/ver/us/asm/nonmatchings/415D90/btl_draw_menu_wheel.s @@ -56,7 +56,7 @@ glabel btl_draw_menu_wheel /* 416A6C 802A1CDC 44050000 */ mfc1 $a1, $f0 /* 416A70 802A1CE0 0260202D */ daddu $a0, $s3, $zero /* 416A74 802A1CE4 00A0302D */ daddu $a2, $a1, $zero -/* 416A78 802A1CE8 0C051489 */ jal set_hud_element_transform_rotation +/* 416A78 802A1CE8 0C051489 */ jal hud_element_set_transform_rotation /* 416A7C 802A1CEC 00A0382D */ daddu $a3, $a1, $zero /* 416A80 802A1CF0 3C11802B */ lui $s1, %hi(D_802AD006) /* 416A84 802A1CF4 2631D006 */ addiu $s1, $s1, %lo(D_802AD006) @@ -71,7 +71,7 @@ glabel btl_draw_menu_wheel /* 416AA8 802A1D18 01051021 */ addu $v0, $t0, $a1 /* 416AAC 802A1D1C 000211C3 */ sra $v0, $v0, 7 /* 416AB0 802A1D20 00052FC3 */ sra $a1, $a1, 0x1f -/* 416AB4 802A1D24 0C0513AC */ jal set_hud_element_alpha +/* 416AB4 802A1D24 0C0513AC */ jal hud_element_set_alpha /* 416AB8 802A1D28 00452823 */ subu $a1, $v0, $a1 /* 416ABC 802A1D2C 0260202D */ daddu $a0, $s3, $zero /* 416AC0 802A1D30 3C10802B */ lui $s0, %hi(D_802AD00A) @@ -79,7 +79,7 @@ glabel btl_draw_menu_wheel /* 416AC8 802A1D38 86060000 */ lh $a2, ($s0) /* 416ACC 802A1D3C 24050F64 */ addiu $a1, $zero, 0xf64 /* 416AD0 802A1D40 00A62823 */ subu $a1, $a1, $a2 -/* 416AD4 802A1D44 0C051261 */ jal set_hud_element_render_pos +/* 416AD4 802A1D44 0C051261 */ jal hud_element_set_render_pos /* 416AD8 802A1D48 24C600D4 */ addiu $a2, $a2, 0xd4 /* 416ADC 802A1D4C 0C05108E */ jal func_80144238 /* 416AE0 802A1D50 0260202D */ daddu $a0, $s3, $zero @@ -95,13 +95,13 @@ glabel btl_draw_menu_wheel /* 416B08 802A1D78 01051021 */ addu $v0, $t0, $a1 /* 416B0C 802A1D7C 000211C3 */ sra $v0, $v0, 7 /* 416B10 802A1D80 00052FC3 */ sra $a1, $a1, 0x1f -/* 416B14 802A1D84 0C0513AC */ jal set_hud_element_alpha +/* 416B14 802A1D84 0C0513AC */ jal hud_element_set_alpha /* 416B18 802A1D88 00452823 */ subu $a1, $v0, $a1 /* 416B1C 802A1D8C 0260202D */ daddu $a0, $s3, $zero /* 416B20 802A1D90 86060000 */ lh $a2, ($s0) /* 416B24 802A1D94 24050028 */ addiu $a1, $zero, 0x28 /* 416B28 802A1D98 00A62823 */ subu $a1, $a1, $a2 -/* 416B2C 802A1D9C 0C051261 */ jal set_hud_element_render_pos +/* 416B2C 802A1D9C 0C051261 */ jal hud_element_set_render_pos /* 416B30 802A1DA0 24C600D4 */ addiu $a2, $a2, 0xd4 /* 416B34 802A1DA4 0C05108E */ jal func_80144238 /* 416B38 802A1DA8 0260202D */ daddu $a0, $s3, $zero @@ -240,14 +240,14 @@ glabel btl_draw_menu_wheel /* 416D30 802A1FA0 44063000 */ mfc1 $a2, $f6 /* 416D34 802A1FA4 0260202D */ daddu $a0, $s3, $zero /* 416D38 802A1FA8 E7A00024 */ swc1 $f0, 0x24($sp) -/* 416D3C 802A1FAC 0C051461 */ jal set_hud_element_transform_pos +/* 416D3C 802A1FAC 0C051461 */ jal hud_element_set_transform_pos /* 416D40 802A1FB0 AFA50020 */ sw $a1, 0x20($sp) /* 416D44 802A1FB4 0260202D */ daddu $a0, $s3, $zero /* 416D48 802A1FB8 0000282D */ daddu $a1, $zero, $zero -/* 416D4C 802A1FBC 0C051261 */ jal set_hud_element_render_pos +/* 416D4C 802A1FBC 0C051261 */ jal hud_element_set_render_pos /* 416D50 802A1FC0 00A0302D */ daddu $a2, $a1, $zero /* 416D54 802A1FC4 0260202D */ daddu $a0, $s3, $zero -/* 416D58 802A1FC8 0C0513AC */ jal set_hud_element_alpha +/* 416D58 802A1FC8 0C0513AC */ jal hud_element_set_alpha /* 416D5C 802A1FCC 02562823 */ subu $a1, $s2, $s6 /* 416D60 802A1FD0 3C014260 */ lui $at, 0x4260 /* 416D64 802A1FD4 44810000 */ mtc1 $at, $f0 @@ -261,7 +261,7 @@ glabel btl_draw_menu_wheel /* 416D84 802A1FF4 3C053FCC */ lui $a1, 0x3fcc /* 416D88 802A1FF8 34A5CCCD */ ori $a1, $a1, 0xcccd .L802A1FFC: -/* 416D8C 802A1FFC 0C051308 */ jal set_hud_element_scale +/* 416D8C 802A1FFC 0C051308 */ jal hud_element_set_scale /* 416D90 802A2000 0260202D */ daddu $a0, $s3, $zero /* 416D94 802A2004 0C05108E */ jal func_80144238 /* 416D98 802A2008 0260202D */ daddu $a0, $s3, $zero @@ -297,11 +297,11 @@ glabel btl_draw_menu_wheel /* 416E10 802A2080 44063000 */ mfc1 $a2, $f6 /* 416E14 802A2084 0260202D */ daddu $a0, $s3, $zero /* 416E18 802A2088 E7A00024 */ swc1 $f0, 0x24($sp) -/* 416E1C 802A208C 0C051461 */ jal set_hud_element_transform_pos +/* 416E1C 802A208C 0C051461 */ jal hud_element_set_transform_pos /* 416E20 802A2090 AFA50020 */ sw $a1, 0x20($sp) /* 416E24 802A2094 0260202D */ daddu $a0, $s3, $zero /* 416E28 802A2098 0000282D */ daddu $a1, $zero, $zero -/* 416E2C 802A209C 0C051261 */ jal set_hud_element_render_pos +/* 416E2C 802A209C 0C051261 */ jal hud_element_set_render_pos /* 416E30 802A20A0 00A0302D */ daddu $a2, $a1, $zero /* 416E34 802A20A4 00102900 */ sll $a1, $s0, 4 /* 416E38 802A20A8 00B02823 */ subu $a1, $a1, $s0 @@ -312,20 +312,20 @@ glabel btl_draw_menu_wheel /* 416E4C 802A20BC 01051021 */ addu $v0, $t0, $a1 /* 416E50 802A20C0 000211C3 */ sra $v0, $v0, 7 /* 416E54 802A20C4 00052FC3 */ sra $a1, $a1, 0x1f -/* 416E58 802A20C8 0C0513AC */ jal set_hud_element_alpha +/* 416E58 802A20C8 0C0513AC */ jal hud_element_set_alpha /* 416E5C 802A20CC 00452823 */ subu $a1, $v0, $a1 /* 416E60 802A20D0 3C053F99 */ lui $a1, 0x3f99 /* 416E64 802A20D4 34A5999A */ ori $a1, $a1, 0x999a -/* 416E68 802A20D8 0C051308 */ jal set_hud_element_scale +/* 416E68 802A20D8 0C051308 */ jal hud_element_set_scale /* 416E6C 802A20DC 0260202D */ daddu $a0, $s3, $zero /* 416E70 802A20E0 16E00005 */ bnez $s7, .L802A20F8 /* 416E74 802A20E4 0260202D */ daddu $a0, $s3, $zero -/* 416E78 802A20E8 0C051280 */ jal set_hud_element_flags +/* 416E78 802A20E8 0C051280 */ jal hud_element_set_flags /* 416E7C 802A20EC 24050002 */ addiu $a1, $zero, 2 /* 416E80 802A20F0 080A8840 */ j .L802A2100 /* 416E84 802A20F4 00000000 */ nop .L802A20F8: -/* 416E88 802A20F8 0C05128B */ jal clear_hud_element_flags +/* 416E88 802A20F8 0C05128B */ jal hud_element_clear_flags /* 416E8C 802A20FC 24050002 */ addiu $a1, $zero, 2 .L802A2100: /* 416E90 802A2100 0C05108E */ jal func_80144238 @@ -386,23 +386,23 @@ glabel btl_draw_menu_wheel /* 416F60 802A21D0 3C13802B */ lui $s3, %hi(D_802AD04C) /* 416F64 802A21D4 8E73D04C */ lw $s3, %lo(D_802AD04C)($s3) /* 416F68 802A21D8 4480A000 */ mtc1 $zero, $f20 -/* 416F6C 802A21DC 0C05149D */ jal set_hud_element_transform_rotation_pivot +/* 416F6C 802A21DC 0C05149D */ jal hud_element_set_transform_rotation_pivot /* 416F70 802A21E0 0260202D */ daddu $a0, $s3, $zero /* 416F74 802A21E4 4405A000 */ mfc1 $a1, $f20 /* 416F78 802A21E8 4406A000 */ mfc1 $a2, $f20 /* 416F7C 802A21EC 3C07C22C */ lui $a3, 0xc22c -/* 416F80 802A21F0 0C051489 */ jal set_hud_element_transform_rotation +/* 416F80 802A21F0 0C051489 */ jal hud_element_set_transform_rotation /* 416F84 802A21F4 0260202D */ daddu $a0, $s3, $zero /* 416F88 802A21F8 4405C000 */ mfc1 $a1, $f24 /* 416F8C 802A21FC 3C013F80 */ lui $at, 0x3f80 /* 416F90 802A2200 4481B000 */ mtc1 $at, $f22 -/* 416F94 802A2204 0C051308 */ jal set_hud_element_scale +/* 416F94 802A2204 0C051308 */ jal hud_element_set_scale /* 416F98 802A2208 0260202D */ daddu $a0, $s3, $zero /* 416F9C 802A220C 4405B000 */ mfc1 $a1, $f22 /* 416FA0 802A2210 3C063FE6 */ lui $a2, 0x3fe6 /* 416FA4 802A2214 34C66666 */ ori $a2, $a2, 0x6666 /* 416FA8 802A2218 4407B000 */ mfc1 $a3, $f22 -/* 416FAC 802A221C 0C051475 */ jal set_hud_element_transform_scale +/* 416FAC 802A221C 0C051475 */ jal hud_element_set_transform_scale /* 416FB0 802A2220 0260202D */ daddu $a0, $s3, $zero /* 416FB4 802A2224 00151040 */ sll $v0, $s5, 1 /* 416FB8 802A2228 0055B021 */ addu $s6, $v0, $s5 @@ -415,11 +415,11 @@ glabel btl_draw_menu_wheel /* 416FD4 802A2244 01051021 */ addu $v0, $t0, $a1 /* 416FD8 802A2248 000211C3 */ sra $v0, $v0, 7 /* 416FDC 802A224C 00052FC3 */ sra $a1, $a1, 0x1f -/* 416FE0 802A2250 0C0513AC */ jal set_hud_element_alpha +/* 416FE0 802A2250 0C0513AC */ jal hud_element_set_alpha /* 416FE4 802A2254 00452823 */ subu $a1, $v0, $a1 /* 416FE8 802A2258 0260202D */ daddu $a0, $s3, $zero /* 416FEC 802A225C 2405004F */ addiu $a1, $zero, 0x4f -/* 416FF0 802A2260 0C051261 */ jal set_hud_element_render_pos +/* 416FF0 802A2260 0C051261 */ jal hud_element_set_render_pos /* 416FF4 802A2264 240600B0 */ addiu $a2, $zero, 0xb0 /* 416FF8 802A2268 0C05108E */ jal func_80144238 /* 416FFC 802A226C 0260202D */ daddu $a0, $s3, $zero @@ -445,15 +445,15 @@ glabel btl_draw_menu_wheel /* 41704C 802A22BC 46200620 */ cvt.s.d $f24, $f0 /* 417050 802A22C0 4600C607 */ neg.s $f24, $f24 /* 417054 802A22C4 4407C000 */ mfc1 $a3, $f24 -/* 417058 802A22C8 0C051489 */ jal set_hud_element_transform_rotation +/* 417058 802A22C8 0C051489 */ jal hud_element_set_transform_rotation /* 41705C 802A22CC 0260202D */ daddu $a0, $s3, $zero /* 417060 802A22D0 0260202D */ daddu $a0, $s3, $zero /* 417064 802A22D4 24050012 */ addiu $a1, $zero, 0x12 -/* 417068 802A22D8 0C05149D */ jal set_hud_element_transform_rotation_pivot +/* 417068 802A22D8 0C05149D */ jal hud_element_set_transform_rotation_pivot /* 41706C 802A22DC 2406FFEC */ addiu $a2, $zero, -0x14 /* 417070 802A22E0 3C053F73 */ lui $a1, 0x3f73 /* 417074 802A22E4 34A53333 */ ori $a1, $a1, 0x3333 -/* 417078 802A22E8 0C051308 */ jal set_hud_element_scale +/* 417078 802A22E8 0C051308 */ jal hud_element_set_scale /* 41707C 802A22EC 0260202D */ daddu $a0, $s3, $zero /* 417080 802A22F0 001511C0 */ sll $v0, $s5, 7 /* 417084 802A22F4 00551023 */ subu $v0, $v0, $s5 @@ -466,7 +466,7 @@ glabel btl_draw_menu_wheel /* 4170A0 802A2310 001081C3 */ sra $s0, $s0, 7 /* 4170A4 802A2314 000217C3 */ sra $v0, $v0, 0x1f /* 4170A8 802A2318 02028023 */ subu $s0, $s0, $v0 -/* 4170AC 802A231C 0C0513AC */ jal set_hud_element_alpha +/* 4170AC 802A231C 0C0513AC */ jal hud_element_set_alpha /* 4170B0 802A2320 0200282D */ daddu $a1, $s0, $zero /* 4170B4 802A2324 0260202D */ daddu $a0, $s3, $zero /* 4170B8 802A2328 3C11802B */ lui $s1, %hi(D_802AD00A) @@ -474,22 +474,22 @@ glabel btl_draw_menu_wheel /* 4170C0 802A2330 86260000 */ lh $a2, ($s1) /* 4170C4 802A2334 24120028 */ addiu $s2, $zero, 0x28 /* 4170C8 802A2338 02462823 */ subu $a1, $s2, $a2 -/* 4170CC 802A233C 0C051261 */ jal set_hud_element_render_pos +/* 4170CC 802A233C 0C051261 */ jal hud_element_set_render_pos /* 4170D0 802A2340 24C600D4 */ addiu $a2, $a2, 0xd4 /* 4170D4 802A2344 0C05108E */ jal func_80144238 /* 4170D8 802A2348 0260202D */ daddu $a0, $s3, $zero /* 4170DC 802A234C 3C13802B */ lui $s3, %hi(D_802AD044) /* 4170E0 802A2350 8E73D044 */ lw $s3, %lo(D_802AD044)($s3) /* 4170E4 802A2354 0200282D */ daddu $a1, $s0, $zero -/* 4170E8 802A2358 0C0513AC */ jal set_hud_element_alpha +/* 4170E8 802A2358 0C0513AC */ jal hud_element_set_alpha /* 4170EC 802A235C 0260202D */ daddu $a0, $s3, $zero /* 4170F0 802A2360 86260000 */ lh $a2, ($s1) /* 4170F4 802A2364 0260202D */ daddu $a0, $s3, $zero /* 4170F8 802A2368 02462823 */ subu $a1, $s2, $a2 -/* 4170FC 802A236C 0C051261 */ jal set_hud_element_render_pos +/* 4170FC 802A236C 0C051261 */ jal hud_element_set_render_pos /* 417100 802A2370 24C600D4 */ addiu $a2, $a2, 0xd4 /* 417104 802A2374 4405B000 */ mfc1 $a1, $f22 -/* 417108 802A2378 0C051308 */ jal set_hud_element_scale +/* 417108 802A2378 0C051308 */ jal hud_element_set_scale /* 41710C 802A237C 0260202D */ daddu $a0, $s3, $zero /* 417110 802A2380 0C05108E */ jal func_80144238 /* 417114 802A2384 0260202D */ daddu $a0, $s3, $zero @@ -550,11 +550,11 @@ glabel btl_draw_menu_wheel /* 4171EC 802A245C 0220282D */ daddu $a1, $s1, $zero /* 4171F0 802A2460 8E530000 */ lw $s3, ($s2) /* 4171F4 802A2464 0200302D */ daddu $a2, $s0, $zero -/* 4171F8 802A2468 0C051261 */ jal set_hud_element_render_pos +/* 4171F8 802A2468 0C051261 */ jal hud_element_set_render_pos /* 4171FC 802A246C 0260202D */ daddu $a0, $s3, $zero /* 417200 802A2470 8FA80028 */ lw $t0, 0x28($sp) /* 417204 802A2474 0260202D */ daddu $a0, $s3, $zero -/* 417208 802A2478 0C0513AC */ jal set_hud_element_alpha +/* 417208 802A2478 0C0513AC */ jal hud_element_set_alpha /* 41720C 802A247C 03C82823 */ subu $a1, $fp, $t0 /* 417210 802A2480 3C02802B */ lui $v0, %hi(D_802AD06B) /* 417214 802A2484 8042D06B */ lb $v0, %lo(D_802AD06B)($v0) @@ -563,10 +563,10 @@ glabel btl_draw_menu_wheel /* 417220 802A2490 00431021 */ addu $v0, $v0, $v1 /* 417224 802A2494 16820003 */ bne $s4, $v0, .L802A24A4 /* 417228 802A2498 0260202D */ daddu $a0, $s3, $zero -/* 41722C 802A249C 0C0513AC */ jal set_hud_element_alpha +/* 41722C 802A249C 0C0513AC */ jal hud_element_set_alpha /* 417230 802A24A0 02A0282D */ daddu $a1, $s5, $zero .L802A24A4: -/* 417234 802A24A4 0C0511EA */ jal draw_hud_element_clipped +/* 417234 802A24A4 0C0511EA */ jal hud_element_draw_clipped /* 417238 802A24A8 0260202D */ daddu $a0, $s3, $zero /* 41723C 802A24AC 26520004 */ addiu $s2, $s2, 4 /* 417240 802A24B0 26940001 */ addiu $s4, $s4, 1 @@ -649,30 +649,30 @@ glabel btl_draw_menu_wheel /* 417364 802A25D4 01051021 */ addu $v0, $t0, $a1 /* 417368 802A25D8 000211C3 */ sra $v0, $v0, 7 /* 41736C 802A25DC 00052FC3 */ sra $a1, $a1, 0x1f -/* 417370 802A25E0 0C0513AC */ jal set_hud_element_alpha +/* 417370 802A25E0 0C0513AC */ jal hud_element_set_alpha /* 417374 802A25E4 00452823 */ subu $a1, $v0, $a1 -/* 417378 802A25E8 0C0511EA */ jal draw_hud_element_clipped +/* 417378 802A25E8 0C0511EA */ jal hud_element_draw_clipped /* 41737C 802A25EC 0260202D */ daddu $a0, $s3, $zero /* 417380 802A25F0 3C13802B */ lui $s3, %hi(D_802AD050) /* 417384 802A25F4 8E73D050 */ lw $s3, %lo(D_802AD050)($s3) /* 417388 802A25F8 02A0282D */ daddu $a1, $s5, $zero -/* 41738C 802A25FC 0C0513AC */ jal set_hud_element_alpha +/* 41738C 802A25FC 0C0513AC */ jal hud_element_set_alpha /* 417390 802A2600 0260202D */ daddu $a0, $s3, $zero -/* 417394 802A2604 0C0511EA */ jal draw_hud_element_clipped +/* 417394 802A2604 0C0511EA */ jal hud_element_draw_clipped /* 417398 802A2608 0260202D */ daddu $a0, $s3, $zero /* 41739C 802A260C 3C13802B */ lui $s3, %hi(D_802AD054) /* 4173A0 802A2610 8E73D054 */ lw $s3, %lo(D_802AD054)($s3) /* 4173A4 802A2614 02A0282D */ daddu $a1, $s5, $zero -/* 4173A8 802A2618 0C0513AC */ jal set_hud_element_alpha +/* 4173A8 802A2618 0C0513AC */ jal hud_element_set_alpha /* 4173AC 802A261C 0260202D */ daddu $a0, $s3, $zero -/* 4173B0 802A2620 0C0511EA */ jal draw_hud_element_clipped +/* 4173B0 802A2620 0C0511EA */ jal hud_element_draw_clipped /* 4173B4 802A2624 0260202D */ daddu $a0, $s3, $zero /* 4173B8 802A2628 3C13802B */ lui $s3, %hi(D_802AD058) /* 4173BC 802A262C 8E73D058 */ lw $s3, %lo(D_802AD058)($s3) /* 4173C0 802A2630 02A0282D */ daddu $a1, $s5, $zero -/* 4173C4 802A2634 0C0513AC */ jal set_hud_element_alpha +/* 4173C4 802A2634 0C0513AC */ jal hud_element_set_alpha /* 4173C8 802A2638 0260202D */ daddu $a0, $s3, $zero -/* 4173CC 802A263C 0C0511EA */ jal draw_hud_element_clipped +/* 4173CC 802A263C 0C0511EA */ jal hud_element_draw_clipped /* 4173D0 802A2640 0260202D */ daddu $a0, $s3, $zero .L802A2644_4173D4: /* 4173D4 802A2644 8FBF0054 */ lw $ra, 0x54($sp) diff --git a/ver/us/asm/nonmatchings/415D90/btl_state_draw_select_target.s b/ver/us/asm/nonmatchings/415D90/btl_state_draw_select_target.s index c0b82e4ab6..d20b1afa57 100644 --- a/ver/us/asm/nonmatchings/415D90/btl_state_draw_select_target.s +++ b/ver/us/asm/nonmatchings/415D90/btl_state_draw_select_target.s @@ -72,7 +72,7 @@ glabel btl_state_draw_select_target /* 41FB6C 802AADDC 10400008 */ beqz $v0, .L802AAE00 /* 41FB70 802AADE0 24140010 */ addiu $s4, $zero, 0x10 /* 41FB74 802AADE4 24130002 */ addiu $s3, $zero, 2 -/* 41FB78 802AADE8 0C05122C */ jal get_hud_element_anim +/* 41FB78 802AADE8 0C05122C */ jal hud_element_get_script /* 41FB7C 802AADEC 0200202D */ daddu $a0, $s0, $zero /* 41FB80 802AADF0 3C058008 */ lui $a1, %hi(HudScript_HandPointLeftLoop) /* 41FB84 802AADF4 24A50208 */ addiu $a1, $a1, %lo(HudScript_HandPointLeftLoop) @@ -81,14 +81,14 @@ glabel btl_state_draw_select_target .L802AAE00: /* 41FB90 802AAE00 24140005 */ addiu $s4, $zero, 5 /* 41FB94 802AAE04 2413FFF5 */ addiu $s3, $zero, -0xb -/* 41FB98 802AAE08 0C05122C */ jal get_hud_element_anim +/* 41FB98 802AAE08 0C05122C */ jal hud_element_get_script /* 41FB9C 802AAE0C 0200202D */ daddu $a0, $s0, $zero /* 41FBA0 802AAE10 3C058008 */ lui $a1, %hi(HudScript_HandPointDownLoop) /* 41FBA4 802AAE14 24A5FF20 */ addiu $a1, $a1, %lo(HudScript_HandPointDownLoop) .L802AAE18: /* 41FBA8 802AAE18 50450004 */ beql $v0, $a1, .L802AAE2C /* 41FBAC 802AAE1C 24040001 */ addiu $a0, $zero, 1 -/* 41FBB0 802AAE20 0C0511FF */ jal set_hud_element_anim +/* 41FBB0 802AAE20 0C0511FF */ jal hud_element_set_script /* 41FBB4 802AAE24 0200202D */ daddu $a0, $s0, $zero /* 41FBB8 802AAE28 24040001 */ addiu $a0, $zero, 1 .L802AAE2C: @@ -106,11 +106,11 @@ glabel btl_state_draw_select_target /* 41FBE8 802AAE58 8FA50050 */ lw $a1, 0x50($sp) /* 41FBEC 802AAE5C 8FA60054 */ lw $a2, 0x54($sp) /* 41FBF0 802AAE60 00B42821 */ addu $a1, $a1, $s4 -/* 41FBF4 802AAE64 0C051261 */ jal set_hud_element_render_pos +/* 41FBF4 802AAE64 0C051261 */ jal hud_element_set_render_pos /* 41FBF8 802AAE68 00D33021 */ addu $a2, $a2, $s3 /* 41FBFC 802AAE6C 3C05802B */ lui $a1, %hi(D_802ACC64) /* 41FC00 802AAE70 8CA5CC64 */ lw $a1, %lo(D_802ACC64)($a1) -/* 41FC04 802AAE74 0C0513AC */ jal set_hud_element_alpha +/* 41FC04 802AAE74 0C0513AC */ jal hud_element_set_alpha /* 41FC08 802AAE78 0200202D */ daddu $a0, $s0, $zero /* 41FC0C 802AAE7C 080AABED */ j .L802AAFB4 /* 41FC10 802AAE80 00000000 */ nop @@ -149,7 +149,7 @@ glabel btl_state_draw_select_target /* 41FC8C 802AAEFC 1040000A */ beqz $v0, .L802AAF28 /* 41FC90 802AAF00 24140010 */ addiu $s4, $zero, 0x10 /* 41FC94 802AAF04 24130002 */ addiu $s3, $zero, 2 -/* 41FC98 802AAF08 0C05122C */ jal get_hud_element_anim +/* 41FC98 802AAF08 0C05122C */ jal hud_element_get_script /* 41FC9C 802AAF0C 0200202D */ daddu $a0, $s0, $zero /* 41FCA0 802AAF10 3C098008 */ lui $t1, %hi(HudScript_HandPointLeftLoop) /* 41FCA4 802AAF14 25290208 */ addiu $t1, $t1, %lo(HudScript_HandPointLeftLoop) @@ -160,13 +160,13 @@ glabel btl_state_draw_select_target .L802AAF28: /* 41FCB8 802AAF28 24140005 */ addiu $s4, $zero, 5 /* 41FCBC 802AAF2C 2413FFF5 */ addiu $s3, $zero, -0xb -/* 41FCC0 802AAF30 0C05122C */ jal get_hud_element_anim +/* 41FCC0 802AAF30 0C05122C */ jal hud_element_get_script /* 41FCC4 802AAF34 0200202D */ daddu $a0, $s0, $zero /* 41FCC8 802AAF38 105E0004 */ beq $v0, $fp, .L802AAF4C /* 41FCCC 802AAF3C 03C0282D */ daddu $a1, $fp, $zero /* 41FCD0 802AAF40 0200202D */ daddu $a0, $s0, $zero .L802AAF44: -/* 41FCD4 802AAF44 0C0511FF */ jal set_hud_element_anim +/* 41FCD4 802AAF44 0C0511FF */ jal hud_element_set_script /* 41FCD8 802AAF48 00000000 */ nop .L802AAF4C: /* 41FCDC 802AAF4C 24040001 */ addiu $a0, $zero, 1 @@ -185,11 +185,11 @@ glabel btl_state_draw_select_target /* 41FD10 802AAF80 8FA50050 */ lw $a1, 0x50($sp) /* 41FD14 802AAF84 8FA60054 */ lw $a2, 0x54($sp) /* 41FD18 802AAF88 00B42821 */ addu $a1, $a1, $s4 -/* 41FD1C 802AAF8C 0C051261 */ jal set_hud_element_render_pos +/* 41FD1C 802AAF8C 0C051261 */ jal hud_element_set_render_pos /* 41FD20 802AAF90 00D33021 */ addu $a2, $a2, $s3 /* 41FD24 802AAF94 3C05802B */ lui $a1, %hi(D_802ACC64) /* 41FD28 802AAF98 8CA5CC64 */ lw $a1, %lo(D_802ACC64)($a1) -/* 41FD2C 802AAF9C 0C0513AC */ jal set_hud_element_alpha +/* 41FD2C 802AAF9C 0C0513AC */ jal hud_element_set_alpha /* 41FD30 802AAFA0 0200202D */ daddu $a0, $s0, $zero /* 41FD34 802AAFA4 8FA9005C */ lw $t1, 0x5c($sp) /* 41FD38 802AAFA8 0249102A */ slt $v0, $s2, $t1 diff --git a/ver/us/asm/nonmatchings/415D90/btl_state_update_select_target.s b/ver/us/asm/nonmatchings/415D90/btl_state_update_select_target.s index 8611c26f85..b3aa863df6 100644 --- a/ver/us/asm/nonmatchings/415D90/btl_state_update_select_target.s +++ b/ver/us/asm/nonmatchings/415D90/btl_state_update_select_target.s @@ -158,16 +158,16 @@ glabel btl_state_update_select_target .L802AA8BC: /* 41F64C 802AA8BC 3C048008 */ lui $a0, %hi(HudScript_HandPointDownLoop) /* 41F650 802AA8C0 2484FF20 */ addiu $a0, $a0, %lo(HudScript_HandPointDownLoop) -/* 41F654 802AA8C4 0C050529 */ jal create_hud_element +/* 41F654 802AA8C4 0C050529 */ jal hud_element_create /* 41F658 802AA8C8 26100001 */ addiu $s0, $s0, 1 /* 41F65C 802AA8CC 0040882D */ daddu $s1, $v0, $zero /* 41F660 802AA8D0 AE510000 */ sw $s1, ($s2) /* 41F664 802AA8D4 0220202D */ daddu $a0, $s1, $zero -/* 41F668 802AA8D8 0C051277 */ jal set_hud_element_render_depth +/* 41F668 802AA8D8 0C051277 */ jal hud_element_set_render_depth /* 41F66C 802AA8DC 0000282D */ daddu $a1, $zero, $zero /* 41F670 802AA8E0 0220202D */ daddu $a0, $s1, $zero /* 41F674 802AA8E4 0000282D */ daddu $a1, $zero, $zero -/* 41F678 802AA8E8 0C051261 */ jal set_hud_element_render_pos +/* 41F678 802AA8E8 0C051261 */ jal hud_element_set_render_pos /* 41F67C 802AA8EC 2406FF9C */ addiu $a2, $zero, -0x64 /* 41F680 802AA8F0 0213102A */ slt $v0, $s0, $s3 /* 41F684 802AA8F4 1440FFF1 */ bnez $v0, .L802AA8BC @@ -274,7 +274,7 @@ glabel btl_state_update_select_target /* 41F7EC 802AAA5C 3C058008 */ lui $a1, %hi(HudScript_HandPointDownLoop) /* 41F7F0 802AAA60 24A5FF20 */ addiu $a1, $a1, %lo(HudScript_HandPointDownLoop) .L802AAA64: -/* 41F7F4 802AAA64 0C0511FF */ jal set_hud_element_anim +/* 41F7F4 802AAA64 0C0511FF */ jal hud_element_set_script /* 41F7F8 802AAA68 00000000 */ nop /* 41F7FC 802AAA6C 0C05272D */ jal sfx_play_sound /* 41F800 802AAA70 240400C7 */ addiu $a0, $zero, 0xc7 @@ -307,7 +307,7 @@ glabel btl_state_update_select_target .L802AAAD4: /* 41F864 802AAAD4 8E240000 */ lw $a0, ($s1) /* 41F868 802AAAD8 26310004 */ addiu $s1, $s1, 4 -/* 41F86C 802AAADC 0C05123D */ jal free_hud_element +/* 41F86C 802AAADC 0C05123D */ jal hud_element_free /* 41F870 802AAAE0 26100001 */ addiu $s0, $s0, 1 /* 41F874 802AAAE4 0213102A */ slt $v0, $s0, $s3 /* 41F878 802AAAE8 1440FFFA */ bnez $v0, .L802AAAD4 @@ -368,7 +368,7 @@ glabel btl_state_update_select_target .L802AABA4: /* 41F934 802AABA4 8E240000 */ lw $a0, ($s1) /* 41F938 802AABA8 26310004 */ addiu $s1, $s1, 4 -/* 41F93C 802AABAC 0C05123D */ jal free_hud_element +/* 41F93C 802AABAC 0C05123D */ jal hud_element_free /* 41F940 802AABB0 26100001 */ addiu $s0, $s0, 1 /* 41F944 802AABB4 0213102A */ slt $v0, $s0, $s3 /* 41F948 802AABB8 1440FFFA */ bnez $v0, .L802AABA4 diff --git a/ver/us/asm/nonmatchings/415D90/func_802A11B0.s b/ver/us/asm/nonmatchings/415D90/func_802A11B0.s index 4b46d27826..8d4293ae93 100644 --- a/ver/us/asm/nonmatchings/415D90/func_802A11B0.s +++ b/ver/us/asm/nonmatchings/415D90/func_802A11B0.s @@ -99,45 +99,45 @@ glabel func_802A11B0 .L802A1318: /* 4160A8 802A1318 8E040000 */ lw $a0, ($s0) /* 4160AC 802A131C 26100004 */ addiu $s0, $s0, 4 -/* 4160B0 802A1320 0C050529 */ jal create_hud_element +/* 4160B0 802A1320 0C050529 */ jal hud_element_create /* 4160B4 802A1324 26730001 */ addiu $s3, $s3, 1 /* 4160B8 802A1328 0040882D */ daddu $s1, $v0, $zero /* 4160BC 802A132C 0220202D */ daddu $a0, $s1, $zero /* 4160C0 802A1330 24050005 */ addiu $a1, $zero, 5 -/* 4160C4 802A1334 0C051277 */ jal set_hud_element_render_depth +/* 4160C4 802A1334 0C051277 */ jal hud_element_set_render_depth /* 4160C8 802A1338 AE510000 */ sw $s1, ($s2) /* 4160CC 802A133C 0220202D */ daddu $a0, $s1, $zero -/* 4160D0 802A1340 0C051280 */ jal set_hud_element_flags +/* 4160D0 802A1340 0C051280 */ jal hud_element_set_flags /* 4160D4 802A1344 34058000 */ ori $a1, $zero, 0x8000 /* 4160D8 802A1348 0220202D */ daddu $a0, $s1, $zero -/* 4160DC 802A134C 0C051280 */ jal set_hud_element_flags +/* 4160DC 802A134C 0C051280 */ jal hud_element_set_flags /* 4160E0 802A1350 24050080 */ addiu $a1, $zero, 0x80 /* 4160E4 802A1354 0220202D */ daddu $a0, $s1, $zero -/* 4160E8 802A1358 0C051280 */ jal set_hud_element_flags +/* 4160E8 802A1358 0C051280 */ jal hud_element_set_flags /* 4160EC 802A135C 24050002 */ addiu $a1, $zero, 2 /* 4160F0 802A1360 0220202D */ daddu $a0, $s1, $zero /* 4160F4 802A1364 3C053F40 */ lui $a1, 0x3f40 -/* 4160F8 802A1368 0C051308 */ jal set_hud_element_scale +/* 4160F8 802A1368 0C051308 */ jal hud_element_set_scale /* 4160FC 802A136C 26520004 */ addiu $s2, $s2, 4 /* 416100 802A1370 3C048029 */ lui $a0, %hi(HudScript_ProjectorSpot) /* 416104 802A1374 24842C00 */ addiu $a0, $a0, %lo(HudScript_ProjectorSpot) -/* 416108 802A1378 0C050529 */ jal create_hud_element +/* 416108 802A1378 0C050529 */ jal hud_element_create /* 41610C 802A137C 00000000 */ nop /* 416110 802A1380 0040882D */ daddu $s1, $v0, $zero /* 416114 802A1384 0220202D */ daddu $a0, $s1, $zero -/* 416118 802A1388 0C0513F6 */ jal create_hud_element_transform_B +/* 416118 802A1388 0C0513F6 */ jal hud_element_create_transform_B /* 41611C 802A138C AE910000 */ sw $s1, ($s4) /* 416120 802A1390 0220202D */ daddu $a0, $s1, $zero -/* 416124 802A1394 0C051277 */ jal set_hud_element_render_depth +/* 416124 802A1394 0C051277 */ jal hud_element_set_render_depth /* 416128 802A1398 2405000A */ addiu $a1, $zero, 0xa /* 41612C 802A139C 0220202D */ daddu $a0, $s1, $zero -/* 416130 802A13A0 0C051280 */ jal set_hud_element_flags +/* 416130 802A13A0 0C051280 */ jal hud_element_set_flags /* 416134 802A13A4 24050080 */ addiu $a1, $zero, 0x80 /* 416138 802A13A8 0220202D */ daddu $a0, $s1, $zero -/* 41613C 802A13AC 0C051280 */ jal set_hud_element_flags +/* 41613C 802A13AC 0C051280 */ jal hud_element_set_flags /* 416140 802A13B0 34058000 */ ori $a1, $zero, 0x8000 /* 416144 802A13B4 0220202D */ daddu $a0, $s1, $zero -/* 416148 802A13B8 0C051280 */ jal set_hud_element_flags +/* 416148 802A13B8 0C051280 */ jal hud_element_set_flags /* 41614C 802A13BC 24050002 */ addiu $a1, $zero, 2 /* 416150 802A13C0 3C02802B */ lui $v0, %hi(main_menu_numOptions) /* 416154 802A13C4 8C42D0AC */ lw $v0, %lo(main_menu_numOptions)($v0) @@ -147,221 +147,221 @@ glabel func_802A11B0 .L802A13D4: /* 416164 802A13D4 3C048029 */ lui $a0, %hi(HudScript_ProjectorSpot) /* 416168 802A13D8 24842C00 */ addiu $a0, $a0, %lo(HudScript_ProjectorSpot) -/* 41616C 802A13DC 0C050529 */ jal create_hud_element +/* 41616C 802A13DC 0C050529 */ jal hud_element_create /* 416170 802A13E0 00000000 */ nop /* 416174 802A13E4 0040882D */ daddu $s1, $v0, $zero /* 416178 802A13E8 3C01802B */ lui $at, %hi(D_802AD040) /* 41617C 802A13EC AC31D040 */ sw $s1, %lo(D_802AD040)($at) -/* 416180 802A13F0 0C0513F6 */ jal create_hud_element_transform_B +/* 416180 802A13F0 0C0513F6 */ jal hud_element_create_transform_B /* 416184 802A13F4 0220202D */ daddu $a0, $s1, $zero /* 416188 802A13F8 0220202D */ daddu $a0, $s1, $zero -/* 41618C 802A13FC 0C051277 */ jal set_hud_element_render_depth +/* 41618C 802A13FC 0C051277 */ jal hud_element_set_render_depth /* 416190 802A1400 24050007 */ addiu $a1, $zero, 7 /* 416194 802A1404 0220202D */ daddu $a0, $s1, $zero -/* 416198 802A1408 0C051280 */ jal set_hud_element_flags +/* 416198 802A1408 0C051280 */ jal hud_element_set_flags /* 41619C 802A140C 24050080 */ addiu $a1, $zero, 0x80 /* 4161A0 802A1410 0220202D */ daddu $a0, $s1, $zero -/* 4161A4 802A1414 0C051280 */ jal set_hud_element_flags +/* 4161A4 802A1414 0C051280 */ jal hud_element_set_flags /* 4161A8 802A1418 34058000 */ ori $a1, $zero, 0x8000 /* 4161AC 802A141C 0220202D */ daddu $a0, $s1, $zero -/* 4161B0 802A1420 0C051280 */ jal set_hud_element_flags +/* 4161B0 802A1420 0C051280 */ jal hud_element_set_flags /* 4161B4 802A1424 24050002 */ addiu $a1, $zero, 2 /* 4161B8 802A1428 3C108029 */ lui $s0, %hi(HudScript_ProjectorReel) /* 4161BC 802A142C 26102BD8 */ addiu $s0, $s0, %lo(HudScript_ProjectorReel) -/* 4161C0 802A1430 0C050529 */ jal create_hud_element +/* 4161C0 802A1430 0C050529 */ jal hud_element_create /* 4161C4 802A1434 0200202D */ daddu $a0, $s0, $zero /* 4161C8 802A1438 0040882D */ daddu $s1, $v0, $zero /* 4161CC 802A143C 3C01802B */ lui $at, %hi(D_802AD044) /* 4161D0 802A1440 AC31D044 */ sw $s1, %lo(D_802AD044)($at) -/* 4161D4 802A1444 0C0513F6 */ jal create_hud_element_transform_B +/* 4161D4 802A1444 0C0513F6 */ jal hud_element_create_transform_B /* 4161D8 802A1448 0220202D */ daddu $a0, $s1, $zero /* 4161DC 802A144C 0220202D */ daddu $a0, $s1, $zero -/* 4161E0 802A1450 0C051277 */ jal set_hud_element_render_depth +/* 4161E0 802A1450 0C051277 */ jal hud_element_set_render_depth /* 4161E4 802A1454 0000282D */ daddu $a1, $zero, $zero /* 4161E8 802A1458 0220202D */ daddu $a0, $s1, $zero /* 4161EC 802A145C 24050028 */ addiu $a1, $zero, 0x28 -/* 4161F0 802A1460 0C051261 */ jal set_hud_element_render_pos +/* 4161F0 802A1460 0C051261 */ jal hud_element_set_render_pos /* 4161F4 802A1464 240600D4 */ addiu $a2, $zero, 0xd4 /* 4161F8 802A1468 0220202D */ daddu $a0, $s1, $zero /* 4161FC 802A146C 0000282D */ daddu $a1, $zero, $zero /* 416200 802A1470 2406005B */ addiu $a2, $zero, 0x5b -/* 416204 802A1474 0C0513BF */ jal set_hud_element_tint +/* 416204 802A1474 0C0513BF */ jal hud_element_set_tint /* 416208 802A1478 2407007F */ addiu $a3, $zero, 0x7f /* 41620C 802A147C 0220202D */ daddu $a0, $s1, $zero /* 416210 802A1480 24050010 */ addiu $a1, $zero, 0x10 -/* 416214 802A1484 0C05149D */ jal set_hud_element_transform_rotation_pivot +/* 416214 802A1484 0C05149D */ jal hud_element_set_transform_rotation_pivot /* 416218 802A1488 2406FFF0 */ addiu $a2, $zero, -0x10 /* 41621C 802A148C 0220202D */ daddu $a0, $s1, $zero -/* 416220 802A1490 0C051280 */ jal set_hud_element_flags +/* 416220 802A1490 0C051280 */ jal hud_element_set_flags /* 416224 802A1494 24050080 */ addiu $a1, $zero, 0x80 /* 416228 802A1498 0220202D */ daddu $a0, $s1, $zero -/* 41622C 802A149C 0C05128B */ jal clear_hud_element_flags +/* 41622C 802A149C 0C05128B */ jal hud_element_clear_flags /* 416230 802A14A0 34058000 */ ori $a1, $zero, 0x8000 /* 416234 802A14A4 0220202D */ daddu $a0, $s1, $zero -/* 416238 802A14A8 0C0513AC */ jal set_hud_element_alpha +/* 416238 802A14A8 0C0513AC */ jal hud_element_set_alpha /* 41623C 802A14AC 240500F0 */ addiu $a1, $zero, 0xf0 -/* 416240 802A14B0 0C050529 */ jal create_hud_element +/* 416240 802A14B0 0C050529 */ jal hud_element_create /* 416244 802A14B4 0200202D */ daddu $a0, $s0, $zero /* 416248 802A14B8 0040882D */ daddu $s1, $v0, $zero /* 41624C 802A14BC 3C01802B */ lui $at, %hi(D_802AD048) /* 416250 802A14C0 AC31D048 */ sw $s1, %lo(D_802AD048)($at) -/* 416254 802A14C4 0C0513F6 */ jal create_hud_element_transform_B +/* 416254 802A14C4 0C0513F6 */ jal hud_element_create_transform_B /* 416258 802A14C8 0220202D */ daddu $a0, $s1, $zero /* 41625C 802A14CC 0220202D */ daddu $a0, $s1, $zero -/* 416260 802A14D0 0C051277 */ jal set_hud_element_render_depth +/* 416260 802A14D0 0C051277 */ jal hud_element_set_render_depth /* 416264 802A14D4 24050002 */ addiu $a1, $zero, 2 /* 416268 802A14D8 0220202D */ daddu $a0, $s1, $zero /* 41626C 802A14DC 24050027 */ addiu $a1, $zero, 0x27 -/* 416270 802A14E0 0C051261 */ jal set_hud_element_render_pos +/* 416270 802A14E0 0C051261 */ jal hud_element_set_render_pos /* 416274 802A14E4 240600D4 */ addiu $a2, $zero, 0xd4 /* 416278 802A14E8 0220202D */ daddu $a0, $s1, $zero /* 41627C 802A14EC 0000282D */ daddu $a1, $zero, $zero /* 416280 802A14F0 2406005B */ addiu $a2, $zero, 0x5b -/* 416284 802A14F4 0C0513BF */ jal set_hud_element_tint +/* 416284 802A14F4 0C0513BF */ jal hud_element_set_tint /* 416288 802A14F8 2407007F */ addiu $a3, $zero, 0x7f /* 41628C 802A14FC 0220202D */ daddu $a0, $s1, $zero /* 416290 802A1500 24050010 */ addiu $a1, $zero, 0x10 -/* 416294 802A1504 0C05149D */ jal set_hud_element_transform_rotation_pivot +/* 416294 802A1504 0C05149D */ jal hud_element_set_transform_rotation_pivot /* 416298 802A1508 2406FFF0 */ addiu $a2, $zero, -0x10 /* 41629C 802A150C 0220202D */ daddu $a0, $s1, $zero -/* 4162A0 802A1510 0C051280 */ jal set_hud_element_flags +/* 4162A0 802A1510 0C051280 */ jal hud_element_set_flags /* 4162A4 802A1514 24050080 */ addiu $a1, $zero, 0x80 /* 4162A8 802A1518 0220202D */ daddu $a0, $s1, $zero -/* 4162AC 802A151C 0C05128B */ jal clear_hud_element_flags +/* 4162AC 802A151C 0C05128B */ jal hud_element_clear_flags /* 4162B0 802A1520 34058000 */ ori $a1, $zero, 0x8000 /* 4162B4 802A1524 0220202D */ daddu $a0, $s1, $zero -/* 4162B8 802A1528 0C0513AC */ jal set_hud_element_alpha +/* 4162B8 802A1528 0C0513AC */ jal hud_element_set_alpha /* 4162BC 802A152C 240500F0 */ addiu $a1, $zero, 0xf0 /* 4162C0 802A1530 3C048029 */ lui $a0, %hi(HudScript_ProjectorBeam) /* 4162C4 802A1534 24842C28 */ addiu $a0, $a0, %lo(HudScript_ProjectorBeam) -/* 4162C8 802A1538 0C050529 */ jal create_hud_element +/* 4162C8 802A1538 0C050529 */ jal hud_element_create /* 4162CC 802A153C 00000000 */ nop /* 4162D0 802A1540 0040882D */ daddu $s1, $v0, $zero /* 4162D4 802A1544 3C01802B */ lui $at, %hi(D_802AD04C) /* 4162D8 802A1548 AC31D04C */ sw $s1, %lo(D_802AD04C)($at) -/* 4162DC 802A154C 0C0513F6 */ jal create_hud_element_transform_B +/* 4162DC 802A154C 0C0513F6 */ jal hud_element_create_transform_B /* 4162E0 802A1550 0220202D */ daddu $a0, $s1, $zero /* 4162E4 802A1554 0220202D */ daddu $a0, $s1, $zero -/* 4162E8 802A1558 0C051277 */ jal set_hud_element_render_depth +/* 4162E8 802A1558 0C051277 */ jal hud_element_set_render_depth /* 4162EC 802A155C 24050014 */ addiu $a1, $zero, 0x14 /* 4162F0 802A1560 0220202D */ daddu $a0, $s1, $zero /* 4162F4 802A1564 2405004E */ addiu $a1, $zero, 0x4e -/* 4162F8 802A1568 0C051261 */ jal set_hud_element_render_pos +/* 4162F8 802A1568 0C051261 */ jal hud_element_set_render_pos /* 4162FC 802A156C 240600B2 */ addiu $a2, $zero, 0xb2 /* 416300 802A1570 0220202D */ daddu $a0, $s1, $zero /* 416304 802A1574 240500FF */ addiu $a1, $zero, 0xff /* 416308 802A1578 00A0302D */ daddu $a2, $a1, $zero -/* 41630C 802A157C 0C0513BF */ jal set_hud_element_tint +/* 41630C 802A157C 0C0513BF */ jal hud_element_set_tint /* 416310 802A1580 00A0382D */ daddu $a3, $a1, $zero /* 416314 802A1584 0220202D */ daddu $a0, $s1, $zero /* 416318 802A1588 0000282D */ daddu $a1, $zero, $zero -/* 41631C 802A158C 0C05149D */ jal set_hud_element_transform_rotation_pivot +/* 41631C 802A158C 0C05149D */ jal hud_element_set_transform_rotation_pivot /* 416320 802A1590 00A0302D */ daddu $a2, $a1, $zero /* 416324 802A1594 44800000 */ mtc1 $zero, $f0 /* 416328 802A1598 0220202D */ daddu $a0, $s1, $zero /* 41632C 802A159C 44050000 */ mfc1 $a1, $f0 /* 416330 802A15A0 3C07C234 */ lui $a3, 0xc234 -/* 416334 802A15A4 0C051489 */ jal set_hud_element_transform_rotation +/* 416334 802A15A4 0C051489 */ jal hud_element_set_transform_rotation /* 416338 802A15A8 00A0302D */ daddu $a2, $a1, $zero /* 41633C 802A15AC 0220202D */ daddu $a0, $s1, $zero -/* 416340 802A15B0 0C0513AC */ jal set_hud_element_alpha +/* 416340 802A15B0 0C0513AC */ jal hud_element_set_alpha /* 416344 802A15B4 240500C8 */ addiu $a1, $zero, 0xc8 /* 416348 802A15B8 0220202D */ daddu $a0, $s1, $zero -/* 41634C 802A15BC 0C051280 */ jal set_hud_element_flags +/* 41634C 802A15BC 0C051280 */ jal hud_element_set_flags /* 416350 802A15C0 24050080 */ addiu $a1, $zero, 0x80 /* 416354 802A15C4 0220202D */ daddu $a0, $s1, $zero -/* 416358 802A15C8 0C051280 */ jal set_hud_element_flags +/* 416358 802A15C8 0C051280 */ jal hud_element_set_flags /* 41635C 802A15CC 34058000 */ ori $a1, $zero, 0x8000 /* 416360 802A15D0 0220202D */ daddu $a0, $s1, $zero -/* 416364 802A15D4 0C051280 */ jal set_hud_element_flags +/* 416364 802A15D4 0C051280 */ jal hud_element_set_flags /* 416368 802A15D8 24050002 */ addiu $a1, $zero, 2 /* 41636C 802A15DC 3C048029 */ lui $a0, %hi(D_80292CF4) /* 416370 802A15E0 24842CF4 */ addiu $a0, $a0, %lo(D_80292CF4) -/* 416374 802A15E4 0C050529 */ jal create_hud_element +/* 416374 802A15E4 0C050529 */ jal hud_element_create /* 416378 802A15E8 00000000 */ nop /* 41637C 802A15EC 0040882D */ daddu $s1, $v0, $zero /* 416380 802A15F0 0220202D */ daddu $a0, $s1, $zero /* 416384 802A15F4 3C01802B */ lui $at, %hi(D_802AD05C) /* 416388 802A15F8 AC31D05C */ sw $s1, %lo(D_802AD05C)($at) -/* 41638C 802A15FC 0C051277 */ jal set_hud_element_render_depth +/* 41638C 802A15FC 0C051277 */ jal hud_element_set_render_depth /* 416390 802A1600 0000282D */ daddu $a1, $zero, $zero /* 416394 802A1604 0220202D */ daddu $a0, $s1, $zero /* 416398 802A1608 24050061 */ addiu $a1, $zero, 0x61 -/* 41639C 802A160C 0C051261 */ jal set_hud_element_render_pos +/* 41639C 802A160C 0C051261 */ jal hud_element_set_render_pos /* 4163A0 802A1610 240600D0 */ addiu $a2, $zero, 0xd0 /* 4163A4 802A1614 0220202D */ daddu $a0, $s1, $zero /* 4163A8 802A1618 240500FF */ addiu $a1, $zero, 0xff /* 4163AC 802A161C 00A0302D */ daddu $a2, $a1, $zero -/* 4163B0 802A1620 0C0513BF */ jal set_hud_element_tint +/* 4163B0 802A1620 0C0513BF */ jal hud_element_set_tint /* 4163B4 802A1624 00A0382D */ daddu $a3, $a1, $zero /* 4163B8 802A1628 0220202D */ daddu $a0, $s1, $zero -/* 4163BC 802A162C 0C051280 */ jal set_hud_element_flags +/* 4163BC 802A162C 0C051280 */ jal hud_element_set_flags /* 4163C0 802A1630 24050080 */ addiu $a1, $zero, 0x80 /* 4163C4 802A1634 0220202D */ daddu $a0, $s1, $zero -/* 4163C8 802A1638 0C05128B */ jal clear_hud_element_flags +/* 4163C8 802A1638 0C05128B */ jal hud_element_clear_flags /* 4163CC 802A163C 34058000 */ ori $a1, $zero, 0x8000 /* 4163D0 802A1640 0220202D */ daddu $a0, $s1, $zero -/* 4163D4 802A1644 0C0513AC */ jal set_hud_element_alpha +/* 4163D4 802A1644 0C0513AC */ jal hud_element_set_alpha /* 4163D8 802A1648 240500E6 */ addiu $a1, $zero, 0xe6 /* 4163DC 802A164C 3C048029 */ lui $a0, %hi(HudScript_SwapZ) /* 4163E0 802A1650 24842C50 */ addiu $a0, $a0, %lo(HudScript_SwapZ) -/* 4163E4 802A1654 0C050529 */ jal create_hud_element +/* 4163E4 802A1654 0C050529 */ jal hud_element_create /* 4163E8 802A1658 00000000 */ nop /* 4163EC 802A165C 0040882D */ daddu $s1, $v0, $zero /* 4163F0 802A1660 0220202D */ daddu $a0, $s1, $zero /* 4163F4 802A1664 3C01802B */ lui $at, %hi(D_802AD050) /* 4163F8 802A1668 AC31D050 */ sw $s1, %lo(D_802AD050)($at) -/* 4163FC 802A166C 0C051277 */ jal set_hud_element_render_depth +/* 4163FC 802A166C 0C051277 */ jal hud_element_set_render_depth /* 416400 802A1670 24050005 */ addiu $a1, $zero, 5 /* 416404 802A1674 0220202D */ daddu $a0, $s1, $zero -/* 416408 802A1678 0C05128B */ jal clear_hud_element_flags +/* 416408 802A1678 0C05128B */ jal hud_element_clear_flags /* 41640C 802A167C 34058000 */ ori $a1, $zero, 0x8000 /* 416410 802A1680 0220202D */ daddu $a0, $s1, $zero -/* 416414 802A1684 0C051280 */ jal set_hud_element_flags +/* 416414 802A1684 0C051280 */ jal hud_element_set_flags /* 416418 802A1688 24050080 */ addiu $a1, $zero, 0x80 /* 41641C 802A168C 0220202D */ daddu $a0, $s1, $zero /* 416420 802A1690 2405005E */ addiu $a1, $zero, 0x5e -/* 416424 802A1694 0C051261 */ jal set_hud_element_render_pos +/* 416424 802A1694 0C051261 */ jal hud_element_set_render_pos /* 416428 802A1698 240600D1 */ addiu $a2, $zero, 0xd1 /* 41642C 802A169C 3C048029 */ lui $a0, %hi(HudScript_SwapArrowLeft) /* 416430 802A16A0 24842C7C */ addiu $a0, $a0, %lo(HudScript_SwapArrowLeft) -/* 416434 802A16A4 0C050529 */ jal create_hud_element +/* 416434 802A16A4 0C050529 */ jal hud_element_create /* 416438 802A16A8 00000000 */ nop /* 41643C 802A16AC 0040882D */ daddu $s1, $v0, $zero /* 416440 802A16B0 0220202D */ daddu $a0, $s1, $zero /* 416444 802A16B4 3C01802B */ lui $at, %hi(D_802AD054) /* 416448 802A16B8 AC31D054 */ sw $s1, %lo(D_802AD054)($at) -/* 41644C 802A16BC 0C051277 */ jal set_hud_element_render_depth +/* 41644C 802A16BC 0C051277 */ jal hud_element_set_render_depth /* 416450 802A16C0 24050005 */ addiu $a1, $zero, 5 /* 416454 802A16C4 0220202D */ daddu $a0, $s1, $zero -/* 416458 802A16C8 0C05128B */ jal clear_hud_element_flags +/* 416458 802A16C8 0C05128B */ jal hud_element_clear_flags /* 41645C 802A16CC 34058000 */ ori $a1, $zero, 0x8000 /* 416460 802A16D0 0220202D */ daddu $a0, $s1, $zero -/* 416464 802A16D4 0C051280 */ jal set_hud_element_flags +/* 416464 802A16D4 0C051280 */ jal hud_element_set_flags /* 416468 802A16D8 24050080 */ addiu $a1, $zero, 0x80 /* 41646C 802A16DC 0220202D */ daddu $a0, $s1, $zero /* 416470 802A16E0 24050051 */ addiu $a1, $zero, 0x51 -/* 416474 802A16E4 0C051261 */ jal set_hud_element_render_pos +/* 416474 802A16E4 0C051261 */ jal hud_element_set_render_pos /* 416478 802A16E8 240600D2 */ addiu $a2, $zero, 0xd2 /* 41647C 802A16EC 3C048029 */ lui $a0, %hi(HudScript_SwapArrowRight) /* 416480 802A16F0 24842CB8 */ addiu $a0, $a0, %lo(HudScript_SwapArrowRight) -/* 416484 802A16F4 0C050529 */ jal create_hud_element +/* 416484 802A16F4 0C050529 */ jal hud_element_create /* 416488 802A16F8 00000000 */ nop /* 41648C 802A16FC 0040882D */ daddu $s1, $v0, $zero /* 416490 802A1700 0220202D */ daddu $a0, $s1, $zero /* 416494 802A1704 3C01802B */ lui $at, %hi(D_802AD058) /* 416498 802A1708 AC31D058 */ sw $s1, %lo(D_802AD058)($at) -/* 41649C 802A170C 0C051277 */ jal set_hud_element_render_depth +/* 41649C 802A170C 0C051277 */ jal hud_element_set_render_depth /* 4164A0 802A1710 24050005 */ addiu $a1, $zero, 5 /* 4164A4 802A1714 0220202D */ daddu $a0, $s1, $zero -/* 4164A8 802A1718 0C05128B */ jal clear_hud_element_flags +/* 4164A8 802A1718 0C05128B */ jal hud_element_clear_flags /* 4164AC 802A171C 34058000 */ ori $a1, $zero, 0x8000 /* 4164B0 802A1720 0220202D */ daddu $a0, $s1, $zero -/* 4164B4 802A1724 0C051280 */ jal set_hud_element_flags +/* 4164B4 802A1724 0C051280 */ jal hud_element_set_flags /* 4164B8 802A1728 24050080 */ addiu $a1, $zero, 0x80 /* 4164BC 802A172C 0220202D */ daddu $a0, $s1, $zero /* 4164C0 802A1730 24050066 */ addiu $a1, $zero, 0x66 -/* 4164C4 802A1734 0C051261 */ jal set_hud_element_render_pos +/* 4164C4 802A1734 0C051261 */ jal hud_element_set_render_pos /* 4164C8 802A1738 240600D2 */ addiu $a2, $zero, 0xd2 /* 4164CC 802A173C 3C03802B */ lui $v1, %hi(D_802AD100) /* 4164D0 802A1740 8C63D100 */ lw $v1, %lo(D_802AD100)($v1) @@ -407,7 +407,7 @@ glabel func_802A11B0 /* 41656C 802A17DC 00000000 */ nop /* 416570 802A17E0 3C04802B */ lui $a0, %hi(D_802AD04C) /* 416574 802A17E4 8C84D04C */ lw $a0, %lo(D_802AD04C)($a0) -/* 416578 802A17E8 0C05128B */ jal clear_hud_element_flags +/* 416578 802A17E8 0C05128B */ jal hud_element_clear_flags /* 41657C 802A17EC 24050002 */ addiu $a1, $zero, 2 .L802A17F0: /* 416580 802A17F0 92020000 */ lbu $v0, ($s0) @@ -465,22 +465,22 @@ glabel func_802A11B0 /* 416648 802A18B8 0240282D */ daddu $a1, $s2, $zero /* 41664C 802A18BC 4600018D */ trunc.w.s $f6, $f0 /* 416650 802A18C0 44103000 */ mfc1 $s0, $f6 -/* 416654 802A18C4 0C051261 */ jal set_hud_element_render_pos +/* 416654 802A18C4 0C051261 */ jal hud_element_set_render_pos /* 416658 802A18C8 0200302D */ daddu $a2, $s0, $zero /* 41665C 802A18CC 0220202D */ daddu $a0, $s1, $zero -/* 416660 802A18D0 0C05128B */ jal clear_hud_element_flags +/* 416660 802A18D0 0C05128B */ jal hud_element_clear_flags /* 416664 802A18D4 24050002 */ addiu $a1, $zero, 2 /* 416668 802A18D8 0240282D */ daddu $a1, $s2, $zero /* 41666C 802A18DC 0200302D */ daddu $a2, $s0, $zero /* 416670 802A18E0 8EB10000 */ lw $s1, ($s5) /* 416674 802A18E4 26B50004 */ addiu $s5, $s5, 4 -/* 416678 802A18E8 0C051261 */ jal set_hud_element_render_pos +/* 416678 802A18E8 0C051261 */ jal hud_element_set_render_pos /* 41667C 802A18EC 0220202D */ daddu $a0, $s1, $zero /* 416680 802A18F0 0220202D */ daddu $a0, $s1, $zero -/* 416684 802A18F4 0C0513AC */ jal set_hud_element_alpha +/* 416684 802A18F4 0C0513AC */ jal hud_element_set_alpha /* 416688 802A18F8 24050064 */ addiu $a1, $zero, 0x64 /* 41668C 802A18FC 0220202D */ daddu $a0, $s1, $zero -/* 416690 802A1900 0C05128B */ jal clear_hud_element_flags +/* 416690 802A1900 0C05128B */ jal hud_element_clear_flags /* 416694 802A1904 24050002 */ addiu $a1, $zero, 2 /* 416698 802A1908 3C02802B */ lui $v0, %hi(main_menu_numOptions) /* 41669C 802A190C 8C42D0AC */ lw $v0, %lo(main_menu_numOptions)($v0) @@ -521,17 +521,17 @@ glabel func_802A11B0 /* 416724 802A1994 44053000 */ mfc1 $a1, $f6 /* 416728 802A1998 4600018D */ trunc.w.s $f6, $f0 /* 41672C 802A199C 44063000 */ mfc1 $a2, $f6 -/* 416730 802A19A0 0C051261 */ jal set_hud_element_render_pos +/* 416730 802A19A0 0C051261 */ jal hud_element_set_render_pos /* 416734 802A19A4 0220202D */ daddu $a0, $s1, $zero /* 416738 802A19A8 0220202D */ daddu $a0, $s1, $zero -/* 41673C 802A19AC 0C0513AC */ jal set_hud_element_alpha +/* 41673C 802A19AC 0C0513AC */ jal hud_element_set_alpha /* 416740 802A19B0 240500B4 */ addiu $a1, $zero, 0xb4 /* 416744 802A19B4 3C053F59 */ lui $a1, 0x3f59 /* 416748 802A19B8 34A5999A */ ori $a1, $a1, 0x999a -/* 41674C 802A19BC 0C051308 */ jal set_hud_element_scale +/* 41674C 802A19BC 0C051308 */ jal hud_element_set_scale /* 416750 802A19C0 0220202D */ daddu $a0, $s1, $zero /* 416754 802A19C4 0220202D */ daddu $a0, $s1, $zero -/* 416758 802A19C8 0C05128B */ jal clear_hud_element_flags +/* 416758 802A19C8 0C05128B */ jal hud_element_clear_flags /* 41675C 802A19CC 24050002 */ addiu $a1, $zero, 2 /* 416760 802A19D0 24020002 */ addiu $v0, $zero, 2 /* 416764 802A19D4 3C01802B */ lui $at, %hi(D_802AD000) diff --git a/ver/us/asm/nonmatchings/415D90/func_802A2C84.s b/ver/us/asm/nonmatchings/415D90/func_802A2C84.s index aa8a65139c..b3efe0565a 100644 --- a/ver/us/asm/nonmatchings/415D90/func_802A2C84.s +++ b/ver/us/asm/nonmatchings/415D90/func_802A2C84.s @@ -164,16 +164,16 @@ glabel func_802A2C84 /* 417C4C 802A2EBC 00021080 */ sll $v0, $v0, 2 /* 417C50 802A2EC0 00541021 */ addu $v0, $v0, $s4 /* 417C54 802A2EC4 8C440000 */ lw $a0, ($v0) -/* 417C58 802A2EC8 0C050529 */ jal create_hud_element +/* 417C58 802A2EC8 0C050529 */ jal hud_element_create /* 417C5C 802A2ECC 26100001 */ addiu $s0, $s0, 1 /* 417C60 802A2ED0 0040902D */ daddu $s2, $v0, $zero /* 417C64 802A2ED4 3C053EE6 */ lui $a1, 0x3ee6 /* 417C68 802A2ED8 34A56666 */ ori $a1, $a1, 0x6666 /* 417C6C 802A2EDC 0240202D */ daddu $a0, $s2, $zero -/* 417C70 802A2EE0 0C051308 */ jal set_hud_element_scale +/* 417C70 802A2EE0 0C051308 */ jal hud_element_set_scale /* 417C74 802A2EE4 AE720000 */ sw $s2, ($s3) /* 417C78 802A2EE8 0240202D */ daddu $a0, $s2, $zero -/* 417C7C 802A2EEC 0C051280 */ jal set_hud_element_flags +/* 417C7C 802A2EEC 0C051280 */ jal hud_element_set_flags /* 417C80 802A2EF0 34058080 */ ori $a1, $zero, 0x8080 /* 417C84 802A2EF4 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) /* 417C88 802A2EF8 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) @@ -183,14 +183,14 @@ glabel func_802A2C84 .L802A2F08: /* 417C98 802A2F08 3C048010 */ lui $a0, %hi(HudScript_AnimatedHandPointer) /* 417C9C 802A2F0C 24844A28 */ addiu $a0, $a0, %lo(HudScript_AnimatedHandPointer) -/* 417CA0 802A2F10 0C050529 */ jal create_hud_element +/* 417CA0 802A2F10 0C050529 */ jal hud_element_create /* 417CA4 802A2F14 00000000 */ nop /* 417CA8 802A2F18 0040902D */ daddu $s2, $v0, $zero /* 417CAC 802A2F1C 0240202D */ daddu $a0, $s2, $zero /* 417CB0 802A2F20 3C052000 */ lui $a1, 0x2000 /* 417CB4 802A2F24 3C01802B */ lui $at, %hi(battle_menu_moveCursorIcon) /* 417CB8 802A2F28 AC32D118 */ sw $s2, %lo(battle_menu_moveCursorIcon)($at) -/* 417CBC 802A2F2C 0C051280 */ jal set_hud_element_flags +/* 417CBC 802A2F2C 0C051280 */ jal hud_element_set_flags /* 417CC0 802A2F30 34A50080 */ ori $a1, $a1, 0x80 /* 417CC4 802A2F34 3C11802B */ lui $s1, %hi(battle_menu_moveX) /* 417CC8 802A2F38 2631D1F0 */ addiu $s1, $s1, %lo(battle_menu_moveX) @@ -198,41 +198,41 @@ glabel func_802A2C84 /* 417CD0 802A2F40 2610D1F2 */ addiu $s0, $s0, %lo(battle_menu_moveY) /* 417CD4 802A2F44 86250000 */ lh $a1, ($s1) /* 417CD8 802A2F48 86060000 */ lh $a2, ($s0) -/* 417CDC 802A2F4C 0C051261 */ jal set_hud_element_render_pos +/* 417CDC 802A2F4C 0C051261 */ jal hud_element_set_render_pos /* 417CE0 802A2F50 0240202D */ daddu $a0, $s2, $zero /* 417CE4 802A2F54 3C048010 */ lui $a0, %hi(HudScript_GreenArrowUp) /* 417CE8 802A2F58 248477E4 */ addiu $a0, $a0, %lo(HudScript_GreenArrowUp) -/* 417CEC 802A2F5C 0C050529 */ jal create_hud_element +/* 417CEC 802A2F5C 0C050529 */ jal hud_element_create /* 417CF0 802A2F60 00000000 */ nop /* 417CF4 802A2F64 0040902D */ daddu $s2, $v0, $zero /* 417CF8 802A2F68 0240202D */ daddu $a0, $s2, $zero /* 417CFC 802A2F6C 3C052000 */ lui $a1, 0x2000 /* 417D00 802A2F70 3C01802B */ lui $at, %hi(battle_menu_moveUpArrowIcon) /* 417D04 802A2F74 AC32D11C */ sw $s2, %lo(battle_menu_moveUpArrowIcon)($at) -/* 417D08 802A2F78 0C051280 */ jal set_hud_element_flags +/* 417D08 802A2F78 0C051280 */ jal hud_element_set_flags /* 417D0C 802A2F7C 34A50080 */ ori $a1, $a1, 0x80 /* 417D10 802A2F80 0240202D */ daddu $a0, $s2, $zero /* 417D14 802A2F84 86250000 */ lh $a1, ($s1) /* 417D18 802A2F88 86060000 */ lh $a2, ($s0) /* 417D1C 802A2F8C 24A50027 */ addiu $a1, $a1, 0x27 -/* 417D20 802A2F90 0C051261 */ jal set_hud_element_render_pos +/* 417D20 802A2F90 0C051261 */ jal hud_element_set_render_pos /* 417D24 802A2F94 24C6FFF9 */ addiu $a2, $a2, -7 /* 417D28 802A2F98 3C048010 */ lui $a0, %hi(HudScript_GreenArrowDown) /* 417D2C 802A2F9C 24847798 */ addiu $a0, $a0, %lo(HudScript_GreenArrowDown) -/* 417D30 802A2FA0 0C050529 */ jal create_hud_element +/* 417D30 802A2FA0 0C050529 */ jal hud_element_create /* 417D34 802A2FA4 00000000 */ nop /* 417D38 802A2FA8 0040902D */ daddu $s2, $v0, $zero /* 417D3C 802A2FAC 0240202D */ daddu $a0, $s2, $zero /* 417D40 802A2FB0 3C052000 */ lui $a1, 0x2000 /* 417D44 802A2FB4 3C01802B */ lui $at, %hi(battle_menu_moveDownArrowIcon) /* 417D48 802A2FB8 AC32D120 */ sw $s2, %lo(battle_menu_moveDownArrowIcon)($at) -/* 417D4C 802A2FBC 0C051280 */ jal set_hud_element_flags +/* 417D4C 802A2FBC 0C051280 */ jal hud_element_set_flags /* 417D50 802A2FC0 34A50080 */ ori $a1, $a1, 0x80 /* 417D54 802A2FC4 0240202D */ daddu $a0, $s2, $zero /* 417D58 802A2FC8 86250000 */ lh $a1, ($s1) /* 417D5C 802A2FCC 86060000 */ lh $a2, ($s0) /* 417D60 802A2FD0 24A50027 */ addiu $a1, $a1, 0x27 -/* 417D64 802A2FD4 0C051261 */ jal set_hud_element_render_pos +/* 417D64 802A2FD4 0C051261 */ jal hud_element_set_render_pos /* 417D68 802A2FD8 24C6004E */ addiu $a2, $a2, 0x4e /* 417D6C 802A2FDC 3C02802B */ lui $v0, %hi(battle_menu_hasSpiritsMenu) /* 417D70 802A2FE0 8C42D4A0 */ lw $v0, %lo(battle_menu_hasSpiritsMenu)($v0) @@ -240,7 +240,7 @@ glabel func_802A2C84 /* 417D78 802A2FE8 00000000 */ nop /* 417D7C 802A2FEC 3C048011 */ lui $a0, %hi(HudScript_StatusFlower) /* 417D80 802A2FF0 24848538 */ addiu $a0, $a0, %lo(HudScript_StatusFlower) -/* 417D84 802A2FF4 0C050529 */ jal create_hud_element +/* 417D84 802A2FF4 0C050529 */ jal hud_element_create /* 417D88 802A2FF8 00000000 */ nop /* 417D8C 802A2FFC 0040902D */ daddu $s2, $v0, $zero /* 417D90 802A3000 3C01802B */ lui $at, %hi(battle_menu_moveTitleIcon) @@ -250,24 +250,24 @@ glabel func_802A2C84 .L802A3010: /* 417DA0 802A3010 3C048011 */ lui $a0, %hi(HudScript_MenuStarPower) /* 417DA4 802A3014 24848974 */ addiu $a0, $a0, %lo(HudScript_MenuStarPower) -/* 417DA8 802A3018 0C050529 */ jal create_hud_element +/* 417DA8 802A3018 0C050529 */ jal hud_element_create /* 417DAC 802A301C 00000000 */ nop /* 417DB0 802A3020 0040902D */ daddu $s2, $v0, $zero /* 417DB4 802A3024 3C053F40 */ lui $a1, 0x3f40 /* 417DB8 802A3028 3C01802B */ lui $at, %hi(battle_menu_moveTitleIcon) /* 417DBC 802A302C AC32D188 */ sw $s2, %lo(battle_menu_moveTitleIcon)($at) -/* 417DC0 802A3030 0C051308 */ jal set_hud_element_scale +/* 417DC0 802A3030 0C051308 */ jal hud_element_set_scale /* 417DC4 802A3034 0240202D */ daddu $a0, $s2, $zero /* 417DC8 802A3038 0240202D */ daddu $a0, $s2, $zero .L802A303C: -/* 417DCC 802A303C 0C051280 */ jal set_hud_element_flags +/* 417DCC 802A303C 0C051280 */ jal hud_element_set_flags /* 417DD0 802A3040 24050080 */ addiu $a1, $zero, 0x80 /* 417DD4 802A3044 0240202D */ daddu $a0, $s2, $zero /* 417DD8 802A3048 3C05802B */ lui $a1, %hi(battle_menu_moveX) /* 417DDC 802A304C 84A5D1F0 */ lh $a1, %lo(battle_menu_moveX)($a1) /* 417DE0 802A3050 3C06802B */ lui $a2, %hi(battle_menu_moveY) /* 417DE4 802A3054 84C6D1F2 */ lh $a2, %lo(battle_menu_moveY)($a2) -/* 417DE8 802A3058 0C051261 */ jal set_hud_element_render_pos +/* 417DE8 802A3058 0C051261 */ jal hud_element_set_render_pos /* 417DEC 802A305C 24A50038 */ addiu $a1, $a1, 0x38 /* 417DF0 802A3060 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) /* 417DF4 802A3064 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) @@ -324,7 +324,7 @@ glabel func_802A2C84 /* 417EA4 802A3114 3C048010 */ lui $a0, %hi(HudScript_POWCostReduced) /* 417EA8 802A3118 24847714 */ addiu $a0, $a0, %lo(HudScript_POWCostReduced) .L802A311C: -/* 417EAC 802A311C 0C050529 */ jal create_hud_element +/* 417EAC 802A311C 0C050529 */ jal hud_element_create /* 417EB0 802A3120 00000000 */ nop /* 417EB4 802A3124 0040902D */ daddu $s2, $v0, $zero /* 417EB8 802A3128 02351021 */ addu $v0, $s1, $s5 @@ -334,13 +334,13 @@ glabel func_802A2C84 /* 417EC4 802A3134 3C048010 */ lui $a0, %hi(HudScript_POWCostReducedTwice) /* 417EC8 802A3138 24847740 */ addiu $a0, $a0, %lo(HudScript_POWCostReducedTwice) .L802A313C: -/* 417ECC 802A313C 0C050529 */ jal create_hud_element +/* 417ECC 802A313C 0C050529 */ jal hud_element_create /* 417ED0 802A3140 00000000 */ nop /* 417ED4 802A3144 0040902D */ daddu $s2, $v0, $zero /* 417ED8 802A3148 AE720000 */ sw $s2, ($s3) .L802A314C: /* 417EDC 802A314C 0240202D */ daddu $a0, $s2, $zero -/* 417EE0 802A3150 0C051280 */ jal set_hud_element_flags +/* 417EE0 802A3150 0C051280 */ jal hud_element_set_flags /* 417EE4 802A3154 24050080 */ addiu $a1, $zero, 0x80 /* 417EE8 802A3158 0240202D */ daddu $a0, $s2, $zero /* 417EEC 802A315C 26730004 */ addiu $s3, $s3, 4 @@ -350,7 +350,7 @@ glabel func_802A2C84 /* 417EFC 802A316C 84A5D1F0 */ lh $a1, %lo(battle_menu_moveX)($a1) /* 417F00 802A3170 3C06802B */ lui $a2, %hi(battle_menu_moveY) /* 417F04 802A3174 84C6D1F2 */ lh $a2, %lo(battle_menu_moveY)($a2) -/* 417F08 802A3178 0C051261 */ jal set_hud_element_render_pos +/* 417F08 802A3178 0C051261 */ jal hud_element_set_render_pos /* 417F0C 802A317C 24A50038 */ addiu $a1, $a1, 0x38 /* 417F10 802A3180 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) /* 417F14 802A3184 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) @@ -626,7 +626,7 @@ glabel func_802A2C84 /* 418314 802A3584 00822021 */ addu $a0, $a0, $v0 /* 418318 802A3588 8C84D128 */ lw $a0, %lo(battle_menu_moveOptionIconIDs)($a0) /* 41831C 802A358C 3C053EE6 */ lui $a1, 0x3ee6 -/* 418320 802A3590 0C051308 */ jal set_hud_element_scale +/* 418320 802A3590 0C051308 */ jal hud_element_set_scale /* 418324 802A3594 34A56666 */ ori $a1, $a1, 0x6666 /* 418328 802A3598 0C05272D */ jal sfx_play_sound /* 41832C 802A359C 240400C7 */ addiu $a0, $zero, 0xc7 @@ -742,7 +742,7 @@ glabel func_802A2C84 /* 4184C4 802A3734 00A0302D */ daddu $a2, $a1, $zero /* 4184C8 802A3738 00A0382D */ daddu $a3, $a1, $zero /* 4184CC 802A373C 8E240000 */ lw $a0, ($s1) -/* 4184D0 802A3740 0C0513BF */ jal set_hud_element_tint +/* 4184D0 802A3740 0C0513BF */ jal hud_element_set_tint /* 4184D4 802A3744 26310004 */ addiu $s1, $s1, 4 /* 4184D8 802A3748 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) /* 4184DC 802A374C 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) @@ -755,25 +755,25 @@ glabel func_802A2C84 /* 4184F4 802A3764 00A0302D */ daddu $a2, $a1, $zero /* 4184F8 802A3768 3C04802B */ lui $a0, %hi(battle_menu_moveCursorIcon) /* 4184FC 802A376C 8C84D118 */ lw $a0, %lo(battle_menu_moveCursorIcon)($a0) -/* 418500 802A3770 0C0513BF */ jal set_hud_element_tint +/* 418500 802A3770 0C0513BF */ jal hud_element_set_tint /* 418504 802A3774 00A0382D */ daddu $a3, $a1, $zero /* 418508 802A3778 240500A0 */ addiu $a1, $zero, 0xa0 /* 41850C 802A377C 00A0302D */ daddu $a2, $a1, $zero /* 418510 802A3780 3C04802B */ lui $a0, %hi(battle_menu_moveUpArrowIcon) /* 418514 802A3784 8C84D11C */ lw $a0, %lo(battle_menu_moveUpArrowIcon)($a0) -/* 418518 802A3788 0C0513BF */ jal set_hud_element_tint +/* 418518 802A3788 0C0513BF */ jal hud_element_set_tint /* 41851C 802A378C 00A0382D */ daddu $a3, $a1, $zero /* 418520 802A3790 240500A0 */ addiu $a1, $zero, 0xa0 /* 418524 802A3794 00A0302D */ daddu $a2, $a1, $zero /* 418528 802A3798 3C04802B */ lui $a0, %hi(battle_menu_moveDownArrowIcon) /* 41852C 802A379C 8C84D120 */ lw $a0, %lo(battle_menu_moveDownArrowIcon)($a0) -/* 418530 802A37A0 0C0513BF */ jal set_hud_element_tint +/* 418530 802A37A0 0C0513BF */ jal hud_element_set_tint /* 418534 802A37A4 00A0382D */ daddu $a3, $a1, $zero /* 418538 802A37A8 240500A0 */ addiu $a1, $zero, 0xa0 /* 41853C 802A37AC 00A0302D */ daddu $a2, $a1, $zero /* 418540 802A37B0 3C04802B */ lui $a0, %hi(battle_menu_moveTitleIcon) /* 418544 802A37B4 8C84D188 */ lw $a0, %lo(battle_menu_moveTitleIcon)($a0) -/* 418548 802A37B8 0C0513BF */ jal set_hud_element_tint +/* 418548 802A37B8 0C0513BF */ jal hud_element_set_tint /* 41854C 802A37BC 00A0382D */ daddu $a3, $a1, $zero /* 418550 802A37C0 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) /* 418554 802A37C4 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) @@ -786,7 +786,7 @@ glabel func_802A2C84 /* 41856C 802A37DC 00A0302D */ daddu $a2, $a1, $zero /* 418570 802A37E0 00A0382D */ daddu $a3, $a1, $zero /* 418574 802A37E4 8E240000 */ lw $a0, ($s1) -/* 418578 802A37E8 0C0513BF */ jal set_hud_element_tint +/* 418578 802A37E8 0C0513BF */ jal hud_element_set_tint /* 41857C 802A37EC 26310004 */ addiu $s1, $s1, 4 /* 418580 802A37F0 3C02802B */ lui $v0, %hi(battle_menu_moveOptionCount) /* 418584 802A37F4 8C42D4A4 */ lw $v0, %lo(battle_menu_moveOptionCount)($v0) @@ -799,7 +799,7 @@ glabel func_802A2C84 /* 41859C 802A380C 8C84D118 */ lw $a0, %lo(battle_menu_moveCursorIcon)($a0) /* 4185A0 802A3810 3C058010 */ lui $a1, %hi(HudScript_HandPointer) /* 4185A4 802A3814 24A54A00 */ addiu $a1, $a1, %lo(HudScript_HandPointer) -/* 4185A8 802A3818 0C0511FF */ jal set_hud_element_anim +/* 4185A8 802A3818 0C0511FF */ jal hud_element_set_script /* 4185AC 802A381C 00000000 */ nop /* 4185B0 802A3820 24040001 */ addiu $a0, $zero, 1 /* 4185B4 802A3824 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/asm/nonmatchings/415D90/func_802A3C98.s b/ver/us/asm/nonmatchings/415D90/func_802A3C98.s index ecff0a3939..db2527095b 100644 --- a/ver/us/asm/nonmatchings/415D90/func_802A3C98.s +++ b/ver/us/asm/nonmatchings/415D90/func_802A3C98.s @@ -297,7 +297,7 @@ glabel func_802A3C98 /* 418E5C 802A40CC 0200202D */ daddu $a0, $s0, $zero /* 418E60 802A40D0 3C058010 */ lui $a1, %hi(HudScript_NotEnoughFP) /* 418E64 802A40D4 24A576BC */ addiu $a1, $a1, %lo(HudScript_NotEnoughFP) -/* 418E68 802A40D8 0C0511FF */ jal set_hud_element_anim +/* 418E68 802A40D8 0C0511FF */ jal hud_element_set_script /* 418E6C 802A40DC 0200202D */ daddu $a0, $s0, $zero /* 418E70 802A40E0 0200202D */ daddu $a0, $s0, $zero .L802A40E4: @@ -322,19 +322,19 @@ glabel func_802A3C98 /* 418EB8 802A4128 0200202D */ daddu $a0, $s0, $zero /* 418EBC 802A412C 3C058010 */ lui $a1, %hi(HudScript_NotEnoughPOW) /* 418EC0 802A4130 24A5776C */ addiu $a1, $a1, %lo(HudScript_NotEnoughPOW) -/* 418EC4 802A4134 0C0511FF */ jal set_hud_element_anim +/* 418EC4 802A4134 0C0511FF */ jal hud_element_set_script /* 418EC8 802A4138 0200202D */ daddu $a0, $s0, $zero /* 418ECC 802A413C 0200202D */ daddu $a0, $s0, $zero .L802A4140: /* 418ED0 802A4140 26A50066 */ addiu $a1, $s5, 0x66 .L802A4144: -/* 418ED4 802A4144 0C051261 */ jal set_hud_element_render_pos +/* 418ED4 802A4144 0C051261 */ jal hud_element_set_render_pos /* 418ED8 802A4148 26260007 */ addiu $a2, $s1, 7 /* 418EDC 802A414C 3C05802B */ lui $a1, %hi(battle_menu_moveTextOpacity) /* 418EE0 802A4150 84A5D116 */ lh $a1, %lo(battle_menu_moveTextOpacity)($a1) -/* 418EE4 802A4154 0C0513AC */ jal set_hud_element_alpha +/* 418EE4 802A4154 0C0513AC */ jal hud_element_set_alpha /* 418EE8 802A4158 0200202D */ daddu $a0, $s0, $zero -/* 418EEC 802A415C 0C0511F8 */ jal draw_hud_element_3 +/* 418EEC 802A415C 0C0511F8 */ jal hud_element_draw_without_clipping /* 418EF0 802A4160 0200202D */ daddu $a0, $s0, $zero /* 418EF4 802A4164 2631000D */ addiu $s1, $s1, 0xd .L802A4168: @@ -378,13 +378,13 @@ glabel func_802A3C98 /* 418F80 802A41F0 0220302D */ daddu $a2, $s1, $zero /* 418F84 802A41F4 8E500000 */ lw $s0, ($s2) /* 418F88 802A41F8 2631000D */ addiu $s1, $s1, 0xd -/* 418F8C 802A41FC 0C051261 */ jal set_hud_element_render_pos +/* 418F8C 802A41FC 0C051261 */ jal hud_element_set_render_pos /* 418F90 802A4200 0200202D */ daddu $a0, $s0, $zero /* 418F94 802A4204 3C05802B */ lui $a1, %hi(battle_menu_moveTextOpacity) /* 418F98 802A4208 84A5D116 */ lh $a1, %lo(battle_menu_moveTextOpacity)($a1) -/* 418F9C 802A420C 0C0513AC */ jal set_hud_element_alpha +/* 418F9C 802A420C 0C0513AC */ jal hud_element_set_alpha /* 418FA0 802A4210 0200202D */ daddu $a0, $s0, $zero -/* 418FA4 802A4214 0C0511F8 */ jal draw_hud_element_3 +/* 418FA4 802A4214 0C0511F8 */ jal hud_element_draw_without_clipping /* 418FA8 802A4218 0200202D */ daddu $a0, $s0, $zero .L802A421C: /* 418FAC 802A421C 26730001 */ addiu $s3, $s3, 1 @@ -428,14 +428,14 @@ glabel func_802A3C98 /* 41903C 802A42AC 3C01802B */ lui $at, %hi(D_802AD112) /* 419040 802A42B0 A428D112 */ sh $t0, %lo(D_802AD112)($at) /* 419044 802A42B4 01263021 */ addu $a2, $t1, $a2 -/* 419048 802A42B8 0C051261 */ jal set_hud_element_render_pos +/* 419048 802A42B8 0C051261 */ jal hud_element_set_render_pos /* 41904C 802A42BC 0200202D */ daddu $a0, $s0, $zero /* 419050 802A42C0 3C11802B */ lui $s1, %hi(battle_menu_moveTextOpacity) /* 419054 802A42C4 2631D116 */ addiu $s1, $s1, %lo(battle_menu_moveTextOpacity) /* 419058 802A42C8 86250000 */ lh $a1, ($s1) -/* 41905C 802A42CC 0C0513AC */ jal set_hud_element_alpha +/* 41905C 802A42CC 0C0513AC */ jal hud_element_set_alpha /* 419060 802A42D0 0200202D */ daddu $a0, $s0, $zero -/* 419064 802A42D4 0C0511F8 */ jal draw_hud_element_3 +/* 419064 802A42D4 0C0511F8 */ jal hud_element_draw_without_clipping /* 419068 802A42D8 0200202D */ daddu $a0, $s0, $zero /* 41906C 802A42DC 3C02802B */ lui $v0, %hi(battle_menu_moveScrollLine) /* 419070 802A42E0 8042D10C */ lb $v0, %lo(battle_menu_moveScrollLine)($v0) @@ -447,12 +447,12 @@ glabel func_802A3C98 /* 419088 802A42F8 25250048 */ addiu $a1, $t1, 0x48 /* 41908C 802A42FC 8FA90050 */ lw $t1, 0x50($sp) /* 419090 802A4300 0200202D */ daddu $a0, $s0, $zero -/* 419094 802A4304 0C051261 */ jal set_hud_element_render_pos +/* 419094 802A4304 0C051261 */ jal hud_element_set_render_pos /* 419098 802A4308 2526000F */ addiu $a2, $t1, 0xf /* 41909C 802A430C 86250000 */ lh $a1, ($s1) -/* 4190A0 802A4310 0C0513AC */ jal set_hud_element_alpha +/* 4190A0 802A4310 0C0513AC */ jal hud_element_set_alpha /* 4190A4 802A4314 0200202D */ daddu $a0, $s0, $zero -/* 4190A8 802A4318 0C0511EA */ jal draw_hud_element_clipped +/* 4190A8 802A4318 0C0511EA */ jal hud_element_draw_clipped /* 4190AC 802A431C 0200202D */ daddu $a0, $s0, $zero .L802A4320: /* 4190B0 802A4320 3C02802B */ lui $v0, %hi(D_802AD10D) @@ -468,12 +468,12 @@ glabel func_802A3C98 /* 4190D8 802A4348 25250048 */ addiu $a1, $t1, 0x48 /* 4190DC 802A434C 8FA90050 */ lw $t1, 0x50($sp) /* 4190E0 802A4350 0200202D */ daddu $a0, $s0, $zero -/* 4190E4 802A4354 0C051261 */ jal set_hud_element_render_pos +/* 4190E4 802A4354 0C051261 */ jal hud_element_set_render_pos /* 4190E8 802A4358 25260064 */ addiu $a2, $t1, 0x64 /* 4190EC 802A435C 86250000 */ lh $a1, ($s1) -/* 4190F0 802A4360 0C0513AC */ jal set_hud_element_alpha +/* 4190F0 802A4360 0C0513AC */ jal hud_element_set_alpha /* 4190F4 802A4364 0200202D */ daddu $a0, $s0, $zero -/* 4190F8 802A4368 0C0511EA */ jal draw_hud_element_clipped +/* 4190F8 802A4368 0C0511EA */ jal hud_element_draw_clipped /* 4190FC 802A436C 0200202D */ daddu $a0, $s0, $zero .L802A4370: /* 419100 802A4370 3C03802B */ lui $v1, %hi(battle_menu_moveState) diff --git a/ver/us/asm/nonmatchings/415D90/func_802A4A54.s b/ver/us/asm/nonmatchings/415D90/func_802A4A54.s index 9e7a27b3f3..2bdfc1031e 100644 --- a/ver/us/asm/nonmatchings/415D90/func_802A4A54.s +++ b/ver/us/asm/nonmatchings/415D90/func_802A4A54.s @@ -66,16 +66,16 @@ glabel func_802A4A54 .L802A4B28: /* 4198B8 802A4B28 8E040000 */ lw $a0, ($s0) /* 4198BC 802A4B2C 26100004 */ addiu $s0, $s0, 4 -/* 4198C0 802A4B30 0C050529 */ jal create_hud_element +/* 4198C0 802A4B30 0C050529 */ jal hud_element_create /* 4198C4 802A4B34 26310001 */ addiu $s1, $s1, 1 /* 4198C8 802A4B38 0040902D */ daddu $s2, $v0, $zero /* 4198CC 802A4B3C 3C053EE6 */ lui $a1, 0x3ee6 /* 4198D0 802A4B40 34A56666 */ ori $a1, $a1, 0x6666 /* 4198D4 802A4B44 0240202D */ daddu $a0, $s2, $zero -/* 4198D8 802A4B48 0C051308 */ jal set_hud_element_scale +/* 4198D8 802A4B48 0C051308 */ jal hud_element_set_scale /* 4198DC 802A4B4C AE720000 */ sw $s2, ($s3) /* 4198E0 802A4B50 0240202D */ daddu $a0, $s2, $zero -/* 4198E4 802A4B54 0C051280 */ jal set_hud_element_flags +/* 4198E4 802A4B54 0C051280 */ jal hud_element_set_flags /* 4198E8 802A4B58 34058080 */ ori $a1, $zero, 0x8080 /* 4198EC 802A4B5C 3C02802B */ lui $v0, %hi(D_802AD66C) /* 4198F0 802A4B60 8C42D66C */ lw $v0, %lo(D_802AD66C)($v0) @@ -85,14 +85,14 @@ glabel func_802A4A54 .L802A4B70: /* 419900 802A4B70 3C048010 */ lui $a0, %hi(HudScript_AnimatedHandPointer) /* 419904 802A4B74 24844A28 */ addiu $a0, $a0, %lo(HudScript_AnimatedHandPointer) -/* 419908 802A4B78 0C050529 */ jal create_hud_element +/* 419908 802A4B78 0C050529 */ jal hud_element_create /* 41990C 802A4B7C 00000000 */ nop /* 419910 802A4B80 0040902D */ daddu $s2, $v0, $zero /* 419914 802A4B84 0240202D */ daddu $a0, $s2, $zero /* 419918 802A4B88 3C052000 */ lui $a1, 0x2000 /* 41991C 802A4B8C 3C01802B */ lui $at, %hi(D_802AD618) /* 419920 802A4B90 AC32D618 */ sw $s2, %lo(D_802AD618)($at) -/* 419924 802A4B94 0C051280 */ jal set_hud_element_flags +/* 419924 802A4B94 0C051280 */ jal hud_element_set_flags /* 419928 802A4B98 34A50080 */ ori $a1, $a1, 0x80 /* 41992C 802A4B9C 3C10802B */ lui $s0, %hi(D_802AD63C) /* 419930 802A4BA0 2610D63C */ addiu $s0, $s0, %lo(D_802AD63C) @@ -100,41 +100,41 @@ glabel func_802A4A54 /* 419938 802A4BA8 2631D63E */ addiu $s1, $s1, %lo(D_802AD63E) /* 41993C 802A4BAC 86050000 */ lh $a1, ($s0) /* 419940 802A4BB0 86260000 */ lh $a2, ($s1) -/* 419944 802A4BB4 0C051261 */ jal set_hud_element_render_pos +/* 419944 802A4BB4 0C051261 */ jal hud_element_set_render_pos /* 419948 802A4BB8 0240202D */ daddu $a0, $s2, $zero /* 41994C 802A4BBC 3C048010 */ lui $a0, %hi(HudScript_GreenArrowUp) /* 419950 802A4BC0 248477E4 */ addiu $a0, $a0, %lo(HudScript_GreenArrowUp) -/* 419954 802A4BC4 0C050529 */ jal create_hud_element +/* 419954 802A4BC4 0C050529 */ jal hud_element_create /* 419958 802A4BC8 00000000 */ nop /* 41995C 802A4BCC 0040902D */ daddu $s2, $v0, $zero /* 419960 802A4BD0 0240202D */ daddu $a0, $s2, $zero /* 419964 802A4BD4 3C052000 */ lui $a1, 0x2000 /* 419968 802A4BD8 3C01802B */ lui $at, %hi(D_802AD61C) /* 41996C 802A4BDC AC32D61C */ sw $s2, %lo(D_802AD61C)($at) -/* 419970 802A4BE0 0C051280 */ jal set_hud_element_flags +/* 419970 802A4BE0 0C051280 */ jal hud_element_set_flags /* 419974 802A4BE4 34A50080 */ ori $a1, $a1, 0x80 /* 419978 802A4BE8 0240202D */ daddu $a0, $s2, $zero /* 41997C 802A4BEC 86050000 */ lh $a1, ($s0) /* 419980 802A4BF0 86260000 */ lh $a2, ($s1) /* 419984 802A4BF4 24A50027 */ addiu $a1, $a1, 0x27 -/* 419988 802A4BF8 0C051261 */ jal set_hud_element_render_pos +/* 419988 802A4BF8 0C051261 */ jal hud_element_set_render_pos /* 41998C 802A4BFC 24C6FFF9 */ addiu $a2, $a2, -7 /* 419990 802A4C00 3C048010 */ lui $a0, %hi(HudScript_GreenArrowDown) /* 419994 802A4C04 24847798 */ addiu $a0, $a0, %lo(HudScript_GreenArrowDown) -/* 419998 802A4C08 0C050529 */ jal create_hud_element +/* 419998 802A4C08 0C050529 */ jal hud_element_create /* 41999C 802A4C0C 00000000 */ nop /* 4199A0 802A4C10 0040902D */ daddu $s2, $v0, $zero /* 4199A4 802A4C14 0240202D */ daddu $a0, $s2, $zero /* 4199A8 802A4C18 3C052000 */ lui $a1, 0x2000 /* 4199AC 802A4C1C 3C01802B */ lui $at, %hi(D_802AD620) /* 4199B0 802A4C20 AC32D620 */ sw $s2, %lo(D_802AD620)($at) -/* 4199B4 802A4C24 0C051280 */ jal set_hud_element_flags +/* 4199B4 802A4C24 0C051280 */ jal hud_element_set_flags /* 4199B8 802A4C28 34A50080 */ ori $a1, $a1, 0x80 /* 4199BC 802A4C2C 0240202D */ daddu $a0, $s2, $zero /* 4199C0 802A4C30 86050000 */ lh $a1, ($s0) /* 4199C4 802A4C34 86260000 */ lh $a2, ($s1) /* 4199C8 802A4C38 24A50027 */ addiu $a1, $a1, 0x27 -/* 4199CC 802A4C3C 0C051261 */ jal set_hud_element_render_pos +/* 4199CC 802A4C3C 0C051261 */ jal hud_element_set_render_pos /* 4199D0 802A4C40 24C6004E */ addiu $a2, $a2, 0x4e /* 4199D4 802A4C44 24040006 */ addiu $a0, $zero, 6 /* 4199D8 802A4C48 24070090 */ addiu $a3, $zero, 0x90 @@ -276,7 +276,7 @@ glabel func_802A4A54 /* 419BDC 802A4E4C 00822021 */ addu $a0, $a0, $v0 /* 419BE0 802A4E50 8C84D628 */ lw $a0, %lo(D_802AD628)($a0) /* 419BE4 802A4E54 3C053EE6 */ lui $a1, 0x3ee6 -/* 419BE8 802A4E58 0C051308 */ jal set_hud_element_scale +/* 419BE8 802A4E58 0C051308 */ jal hud_element_set_scale /* 419BEC 802A4E5C 34A56666 */ ori $a1, $a1, 0x6666 /* 419BF0 802A4E60 0C05272D */ jal sfx_play_sound /* 419BF4 802A4E64 240400C7 */ addiu $a0, $zero, 0xc7 @@ -365,7 +365,7 @@ glabel func_802A4A54 /* 419D20 802A4F90 00A0302D */ daddu $a2, $a1, $zero /* 419D24 802A4F94 00A0382D */ daddu $a3, $a1, $zero /* 419D28 802A4F98 8E040000 */ lw $a0, ($s0) -/* 419D2C 802A4F9C 0C0513BF */ jal set_hud_element_tint +/* 419D2C 802A4F9C 0C0513BF */ jal hud_element_set_tint /* 419D30 802A4FA0 26100004 */ addiu $s0, $s0, 4 /* 419D34 802A4FA4 3C02802B */ lui $v0, %hi(D_802AD66C) /* 419D38 802A4FA8 8C42D66C */ lw $v0, %lo(D_802AD66C)($v0) @@ -379,24 +379,24 @@ glabel func_802A4A54 /* 419D54 802A4FC4 3C10802B */ lui $s0, %hi(D_802AD618) /* 419D58 802A4FC8 2610D618 */ addiu $s0, $s0, %lo(D_802AD618) /* 419D5C 802A4FCC 8E040000 */ lw $a0, ($s0) -/* 419D60 802A4FD0 0C0513BF */ jal set_hud_element_tint +/* 419D60 802A4FD0 0C0513BF */ jal hud_element_set_tint /* 419D64 802A4FD4 00A0382D */ daddu $a3, $a1, $zero /* 419D68 802A4FD8 240500A0 */ addiu $a1, $zero, 0xa0 /* 419D6C 802A4FDC 00A0302D */ daddu $a2, $a1, $zero /* 419D70 802A4FE0 3C04802B */ lui $a0, %hi(D_802AD61C) /* 419D74 802A4FE4 8C84D61C */ lw $a0, %lo(D_802AD61C)($a0) -/* 419D78 802A4FE8 0C0513BF */ jal set_hud_element_tint +/* 419D78 802A4FE8 0C0513BF */ jal hud_element_set_tint /* 419D7C 802A4FEC 00A0382D */ daddu $a3, $a1, $zero /* 419D80 802A4FF0 240500A0 */ addiu $a1, $zero, 0xa0 /* 419D84 802A4FF4 00A0302D */ daddu $a2, $a1, $zero /* 419D88 802A4FF8 3C04802B */ lui $a0, %hi(D_802AD620) /* 419D8C 802A4FFC 8C84D620 */ lw $a0, %lo(D_802AD620)($a0) -/* 419D90 802A5000 0C0513BF */ jal set_hud_element_tint +/* 419D90 802A5000 0C0513BF */ jal hud_element_set_tint /* 419D94 802A5004 00A0382D */ daddu $a3, $a1, $zero /* 419D98 802A5008 8E040000 */ lw $a0, ($s0) /* 419D9C 802A500C 3C058010 */ lui $a1, %hi(HudScript_HandPointer) /* 419DA0 802A5010 24A54A00 */ addiu $a1, $a1, %lo(HudScript_HandPointer) -/* 419DA4 802A5014 0C0511FF */ jal set_hud_element_anim +/* 419DA4 802A5014 0C0511FF */ jal hud_element_set_script /* 419DA8 802A5018 00000000 */ nop /* 419DAC 802A501C 24040006 */ addiu $a0, $zero, 6 /* 419DB0 802A5020 2402000D */ addiu $v0, $zero, 0xd diff --git a/ver/us/asm/nonmatchings/415D90/func_802A5290.s b/ver/us/asm/nonmatchings/415D90/func_802A5290.s index 99fda08519..bea3f8c273 100644 --- a/ver/us/asm/nonmatchings/415D90/func_802A5290.s +++ b/ver/us/asm/nonmatchings/415D90/func_802A5290.s @@ -198,13 +198,13 @@ glabel func_802A5290 /* 41A2EC 802A555C 2631000D */ addiu $s1, $s1, 0xd /* 41A2F0 802A5560 8E500000 */ lw $s0, ($s2) /* 41A2F4 802A5564 26730001 */ addiu $s3, $s3, 1 -/* 41A2F8 802A5568 0C051261 */ jal set_hud_element_render_pos +/* 41A2F8 802A5568 0C051261 */ jal hud_element_set_render_pos /* 41A2FC 802A556C 0200202D */ daddu $a0, $s0, $zero /* 41A300 802A5570 3C05802B */ lui $a1, %hi(D_802AD624) /* 41A304 802A5574 8CA5D624 */ lw $a1, %lo(D_802AD624)($a1) -/* 41A308 802A5578 0C0513AC */ jal set_hud_element_alpha +/* 41A308 802A5578 0C0513AC */ jal hud_element_set_alpha /* 41A30C 802A557C 0200202D */ daddu $a0, $s0, $zero -/* 41A310 802A5580 0C0511F8 */ jal draw_hud_element_3 +/* 41A310 802A5580 0C0511F8 */ jal hud_element_draw_without_clipping /* 41A314 802A5584 0200202D */ daddu $a0, $s0, $zero /* 41A318 802A5588 3C02802B */ lui $v0, %hi(D_802AD66C) /* 41A31C 802A558C 8C42D66C */ lw $v0, %lo(D_802AD66C)($v0) @@ -247,14 +247,14 @@ glabel func_802A5290 /* 41A3A4 802A5614 3C01802B */ lui $at, %hi(D_802AD60E) /* 41A3A8 802A5618 A428D60E */ sh $t0, %lo(D_802AD60E)($at) /* 41A3AC 802A561C 01263021 */ addu $a2, $t1, $a2 -/* 41A3B0 802A5620 0C051261 */ jal set_hud_element_render_pos +/* 41A3B0 802A5620 0C051261 */ jal hud_element_set_render_pos /* 41A3B4 802A5624 0200202D */ daddu $a0, $s0, $zero /* 41A3B8 802A5628 3C11802B */ lui $s1, %hi(D_802AD624) /* 41A3BC 802A562C 2631D624 */ addiu $s1, $s1, %lo(D_802AD624) /* 41A3C0 802A5630 8E250000 */ lw $a1, ($s1) -/* 41A3C4 802A5634 0C0513AC */ jal set_hud_element_alpha +/* 41A3C4 802A5634 0C0513AC */ jal hud_element_set_alpha /* 41A3C8 802A5638 0200202D */ daddu $a0, $s0, $zero -/* 41A3CC 802A563C 0C0511EA */ jal draw_hud_element_clipped +/* 41A3CC 802A563C 0C0511EA */ jal hud_element_draw_clipped /* 41A3D0 802A5640 0200202D */ daddu $a0, $s0, $zero /* 41A3D4 802A5644 3C02802B */ lui $v0, %hi(D_802AD608) /* 41A3D8 802A5648 8042D608 */ lb $v0, %lo(D_802AD608)($v0) @@ -264,12 +264,12 @@ glabel func_802A5290 /* 41A3E8 802A5658 3C10802B */ lui $s0, %hi(D_802AD61C) /* 41A3EC 802A565C 8E10D61C */ lw $s0, %lo(D_802AD61C)($s0) /* 41A3F0 802A5660 25260010 */ addiu $a2, $t1, 0x10 -/* 41A3F4 802A5664 0C051261 */ jal set_hud_element_render_pos +/* 41A3F4 802A5664 0C051261 */ jal hud_element_set_render_pos /* 41A3F8 802A5668 0200202D */ daddu $a0, $s0, $zero /* 41A3FC 802A566C 8E250000 */ lw $a1, ($s1) -/* 41A400 802A5670 0C0513AC */ jal set_hud_element_alpha +/* 41A400 802A5670 0C0513AC */ jal hud_element_set_alpha /* 41A404 802A5674 0200202D */ daddu $a0, $s0, $zero -/* 41A408 802A5678 0C0511EA */ jal draw_hud_element_clipped +/* 41A408 802A5678 0C0511EA */ jal hud_element_draw_clipped /* 41A40C 802A567C 0200202D */ daddu $a0, $s0, $zero .L802A5680: /* 41A410 802A5680 3C02802B */ lui $v0, %hi(D_802AD609) @@ -283,12 +283,12 @@ glabel func_802A5290 /* 41A430 802A56A0 3C10802B */ lui $s0, %hi(D_802AD620) /* 41A434 802A56A4 8E10D620 */ lw $s0, %lo(D_802AD620)($s0) /* 41A438 802A56A8 25260064 */ addiu $a2, $t1, 0x64 -/* 41A43C 802A56AC 0C051261 */ jal set_hud_element_render_pos +/* 41A43C 802A56AC 0C051261 */ jal hud_element_set_render_pos /* 41A440 802A56B0 0200202D */ daddu $a0, $s0, $zero /* 41A444 802A56B4 8E250000 */ lw $a1, ($s1) -/* 41A448 802A56B8 0C0513AC */ jal set_hud_element_alpha +/* 41A448 802A56B8 0C0513AC */ jal hud_element_set_alpha /* 41A44C 802A56BC 0200202D */ daddu $a0, $s0, $zero -/* 41A450 802A56C0 0C0511EA */ jal draw_hud_element_clipped +/* 41A450 802A56C0 0C0511EA */ jal hud_element_draw_clipped /* 41A454 802A56C4 0200202D */ daddu $a0, $s0, $zero .L802A56C8_41A458: /* 41A458 802A56C8 8FBF003C */ lw $ra, 0x3c($sp) diff --git a/ver/us/asm/nonmatchings/7B440/reset_player_status.s b/ver/us/asm/nonmatchings/7B440/reset_player_status.s index 868b17aa0f..e194fa6e4f 100644 --- a/ver/us/asm/nonmatchings/7B440/reset_player_status.s +++ b/ver/us/asm/nonmatchings/7B440/reset_player_status.s @@ -13,8 +13,8 @@ glabel reset_player_status /* 7B52C 800E207C AC22C96C */ sw $v0, %lo(D_8010C96C)($at) /* 7B530 800E2080 24020001 */ addiu $v0, $zero, 1 /* 7B534 800E2084 AFBF0014 */ sw $ra, 0x14($sp) -/* 7B538 800E2088 3C018011 */ lui $at, %hi(D_8010C954) -/* 7B53C 800E208C AC20C954 */ sw $zero, %lo(D_8010C954)($at) +/* 7B538 800E2088 3C018011 */ lui $at, %hi(TweesterTouchingPartner) +/* 7B53C 800E208C AC20C954 */ sw $zero, %lo(TweesterTouchingPartner)($at) /* 7B540 800E2090 3C018011 */ lui $at, %hi(D_8010C920) /* 7B544 800E2094 AC20C920 */ sw $zero, %lo(D_8010C920)($at) /* 7B548 800E2098 3C018011 */ lui $at, %hi(D_8010C940) @@ -78,8 +78,8 @@ glabel reset_player_status /* 7B62C 800E217C A60200B2 */ sh $v0, 0xb2($s0) /* 7B630 800E2180 A0800080 */ sb $zero, 0x80($a0) .L800E2184: -/* 7B634 800E2184 3C02800F */ lui $v0, %hi(D_800F7B70) -/* 7B638 800E2188 24427B70 */ addiu $v0, $v0, %lo(D_800F7B70) +/* 7B634 800E2184 3C02800F */ lui $v0, %hi(DefaultMoveSpeeds) +/* 7B638 800E2188 24427B70 */ addiu $v0, $v0, %lo(DefaultMoveSpeeds) /* 7B63C 800E218C C4400000 */ lwc1 $f0, ($v0) /* 7B640 800E2190 46020002 */ mul.s $f0, $f0, $f2 /* 7B644 800E2194 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/peach_make_disguise_npc.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/peach_make_disguise_npc.s index 6f4d148709..ef5291125c 100644 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/peach_make_disguise_npc.s +++ b/ver/us/asm/nonmatchings/7bb60_len_41b0/peach_make_disguise_npc.s @@ -29,16 +29,16 @@ glabel peach_make_disguise_npc /* 7FA88 800E65D8 00031040 */ sll $v0, $v1, 1 /* 7FA8C 800E65DC 00431021 */ addu $v0, $v0, $v1 /* 7FA90 800E65E0 000210C0 */ sll $v0, $v0, 3 -/* 7FA94 800E65E4 3C01800F */ lui $at, %hi(world_actions_peachDisguises) +/* 7FA94 800E65E4 3C01800F */ lui $at, %hi(BasicPeachDisguiseAnims) /* 7FA98 800E65E8 00220821 */ addu $at, $at, $v0 -/* 7FA9C 800E65EC 8C227C1C */ lw $v0, %lo(world_actions_peachDisguises)($at) +/* 7FA9C 800E65EC 8C227C1C */ lw $v0, %lo(BasicPeachDisguiseAnims)($at) /* 7FAA0 800E65F0 00031880 */ sll $v1, $v1, 2 /* 7FAA4 800E65F4 AFA00018 */ sw $zero, 0x18($sp) /* 7FAA8 800E65F8 AFA0001C */ sw $zero, 0x1c($sp) /* 7FAAC 800E65FC AFA20014 */ sw $v0, 0x14($sp) -/* 7FAB0 800E6600 3C05800F */ lui $a1, %hi(D_800F7C7C) +/* 7FAB0 800E6600 3C05800F */ lui $a1, %hi(PeachDisguiseExtraAnims) /* 7FAB4 800E6604 00A32821 */ addu $a1, $a1, $v1 -/* 7FAB8 800E6608 8CA57C7C */ lw $a1, %lo(D_800F7C7C)($a1) +/* 7FAB8 800E6608 8CA57C7C */ lw $a1, %lo(PeachDisguiseExtraAnims)($a1) /* 7FABC 800E660C 0C00E219 */ jal _create_npc_standard /* 7FAC0 800E6610 00C0202D */ daddu $a0, $a2, $zero /* 7FAC4 800E6614 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_init_integrator_for_current_state.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_init_integrator_for_current_state.s index 065330e28d..ee3333f90d 100644 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_init_integrator_for_current_state.s +++ b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_init_integrator_for_current_state.s @@ -39,8 +39,8 @@ glabel phys_init_integrator_for_current_state /* 7C478 800E2FC8 03E00008 */ jr $ra /* 7C47C 800E2FCC E4A6007C */ swc1 $f6, 0x7c($a1) .L800E2FD0_7C480: -/* 7C480 800E2FD0 3C04800F */ lui $a0, %hi(D_800F7B50) -/* 7C484 800E2FD4 24847B50 */ addiu $a0, $a0, %lo(D_800F7B50) +/* 7C480 800E2FD0 3C04800F */ lui $a0, %hi(GravityParamsStartJump) +/* 7C484 800E2FD4 24847B50 */ addiu $a0, $a0, %lo(GravityParamsStartJump) /* 7C488 800E2FD8 8CA20000 */ lw $v0, ($a1) /* 7C48C 800E2FDC 3C030004 */ lui $v1, 4 /* 7C490 800E2FE0 00431024 */ and $v0, $v0, $v1 diff --git a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_update_action_state.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_update_action_state.s index ea0ae31c86..c503aa86a6 100644 --- a/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_update_action_state.s +++ b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_update_action_state.s @@ -91,8 +91,8 @@ glabel phys_update_action_state .L800E5B6C: /* 7F01C 800E5B6C 3C138000 */ lui $s3, 0x8000 .L800E5B70: -/* 7F020 800E5B70 3C11800F */ lui $s1, %hi(D_800F7C8C) -/* 7F024 800E5B74 26317C8C */ addiu $s1, $s1, %lo(D_800F7C8C) +/* 7F020 800E5B70 3C11800F */ lui $s1, %hi(PlayerActionsTable) +/* 7F024 800E5B74 26317C8C */ addiu $s1, $s1, %lo(PlayerActionsTable) /* 7F028 800E5B78 3C128011 */ lui $s2, %hi(D_8010C924) /* 7F02C 800E5B7C 2652C924 */ addiu $s2, $s2, %lo(D_8010C924) .L800E5B80: diff --git a/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_number.s b/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_number.s index 2d7d5335e1..2f9602a92b 100644 --- a/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_number.s +++ b/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_number.s @@ -20,18 +20,18 @@ glabel status_menu_draw_number /* 81190 800E7CE0 AFBF003C */ sw $ra, 0x3c($sp) /* 81194 800E7CE4 AFBE0038 */ sw $fp, 0x38($sp) /* 81198 800E7CE8 AFB70034 */ sw $s7, 0x34($sp) -/* 8119C 800E7CEC 0C0511FF */ jal set_hud_element_anim +/* 8119C 800E7CEC 0C0511FF */ jal hud_element_set_script /* 811A0 800E7CF0 AFB60030 */ sw $s6, 0x30($sp) /* 811A4 800E7CF4 26310008 */ addiu $s1, $s1, 8 /* 811A8 800E7CF8 0280202D */ daddu $a0, $s4, $zero /* 811AC 800E7CFC 0220282D */ daddu $a1, $s1, $zero /* 811B0 800E7D00 26060007 */ addiu $a2, $s0, 7 -/* 811B4 800E7D04 0C051261 */ jal set_hud_element_render_pos +/* 811B4 800E7D04 0C051261 */ jal hud_element_set_render_pos /* 811B8 800E7D08 261E0008 */ addiu $fp, $s0, 8 /* 811BC 800E7D0C 0280202D */ daddu $a0, $s4, $zero -/* 811C0 800E7D10 0C05128B */ jal clear_hud_element_flags +/* 811C0 800E7D10 0C05128B */ jal hud_element_clear_flags /* 811C4 800E7D14 24050002 */ addiu $a1, $zero, 2 -/* 811C8 800E7D18 0C0511F1 */ jal draw_hud_element_2 +/* 811C8 800E7D18 0C0511F1 */ jal hud_element_draw_next /* 811CC 800E7D1C 0280202D */ daddu $a0, $s4, $zero /* 811D0 800E7D20 5AA00016 */ blezl $s5, .L800E7D7C /* 811D4 800E7D24 2631000D */ addiu $s1, $s1, 0xd @@ -79,16 +79,16 @@ glabel status_menu_draw_number /* 8126C 800E7DBC 00021080 */ sll $v0, $v0, 2 /* 81270 800E7DC0 00571021 */ addu $v0, $v0, $s7 /* 81274 800E7DC4 8C450000 */ lw $a1, ($v0) -/* 81278 800E7DC8 0C0511FF */ jal set_hud_element_anim +/* 81278 800E7DC8 0C0511FF */ jal hud_element_set_script /* 8127C 800E7DCC 0280202D */ daddu $a0, $s4, $zero /* 81280 800E7DD0 0280202D */ daddu $a0, $s4, $zero /* 81284 800E7DD4 0220282D */ daddu $a1, $s1, $zero -/* 81288 800E7DD8 0C051261 */ jal set_hud_element_render_pos +/* 81288 800E7DD8 0C051261 */ jal hud_element_set_render_pos /* 8128C 800E7DDC 03C0302D */ daddu $a2, $fp, $zero /* 81290 800E7DE0 0280202D */ daddu $a0, $s4, $zero -/* 81294 800E7DE4 0C05128B */ jal clear_hud_element_flags +/* 81294 800E7DE4 0C05128B */ jal hud_element_clear_flags /* 81298 800E7DE8 24050002 */ addiu $a1, $zero, 2 -/* 8129C 800E7DEC 0C0511F1 */ jal draw_hud_element_2 +/* 8129C 800E7DEC 0C0511F1 */ jal hud_element_draw_next /* 812A0 800E7DF0 0280202D */ daddu $a0, $s4, $zero /* 812A4 800E7DF4 26520001 */ addiu $s2, $s2, 1 .L800E7DF8: diff --git a/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_stat.s b/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_stat.s index 72c90f34cc..50b0a16167 100644 --- a/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_stat.s +++ b/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_stat.s @@ -25,16 +25,16 @@ glabel status_menu_draw_stat /* 81334 800E7E84 AFBF0044 */ sw $ra, 0x44($sp) /* 81338 800E7E88 AFBE0040 */ sw $fp, 0x40($sp) /* 8133C 800E7E8C AFB7003C */ sw $s7, 0x3c($sp) -/* 81340 800E7E90 0C0511FF */ jal set_hud_element_anim +/* 81340 800E7E90 0C0511FF */ jal hud_element_set_script /* 81344 800E7E94 AFA8001C */ sw $t0, 0x1c($sp) /* 81348 800E7E98 0280202D */ daddu $a0, $s4, $zero /* 8134C 800E7E9C 26050016 */ addiu $a1, $s0, 0x16 -/* 81350 800E7EA0 0C051261 */ jal set_hud_element_render_pos +/* 81350 800E7EA0 0C051261 */ jal hud_element_set_render_pos /* 81354 800E7EA4 26260009 */ addiu $a2, $s1, 9 /* 81358 800E7EA8 0280202D */ daddu $a0, $s4, $zero -/* 8135C 800E7EAC 0C05128B */ jal clear_hud_element_flags +/* 8135C 800E7EAC 0C05128B */ jal hud_element_clear_flags /* 81360 800E7EB0 02C0282D */ daddu $a1, $s6, $zero -/* 81364 800E7EB4 0C0511F1 */ jal draw_hud_element_2 +/* 81364 800E7EB4 0C0511F1 */ jal hud_element_draw_next /* 81368 800E7EB8 0280202D */ daddu $a0, $s4, $zero /* 8136C 800E7EBC 3C066666 */ lui $a2, 0x6666 /* 81370 800E7EC0 34C66667 */ ori $a2, $a2, 0x6667 @@ -80,16 +80,16 @@ glabel status_menu_draw_stat /* 81404 800E7F54 25087F80 */ addiu $t0, $t0, %lo(DigitHudScripts) /* 81408 800E7F58 00481021 */ addu $v0, $v0, $t0 /* 8140C 800E7F5C 8C450000 */ lw $a1, ($v0) -/* 81410 800E7F60 0C0511FF */ jal set_hud_element_anim +/* 81410 800E7F60 0C0511FF */ jal hud_element_set_script /* 81414 800E7F64 0280202D */ daddu $a0, $s4, $zero /* 81418 800E7F68 0280202D */ daddu $a0, $s4, $zero /* 8141C 800E7F6C 0200282D */ daddu $a1, $s0, $zero -/* 81420 800E7F70 0C051261 */ jal set_hud_element_render_pos +/* 81420 800E7F70 0C051261 */ jal hud_element_set_render_pos /* 81424 800E7F74 0260302D */ daddu $a2, $s3, $zero /* 81428 800E7F78 0280202D */ daddu $a0, $s4, $zero -/* 8142C 800E7F7C 0C05128B */ jal clear_hud_element_flags +/* 8142C 800E7F7C 0C05128B */ jal hud_element_clear_flags /* 81430 800E7F80 24050002 */ addiu $a1, $zero, 2 -/* 81434 800E7F84 0C0511F1 */ jal draw_hud_element_2 +/* 81434 800E7F84 0C0511F1 */ jal hud_element_draw_next /* 81438 800E7F88 0280202D */ daddu $a0, $s4, $zero /* 8143C 800E7F8C 26520001 */ addiu $s2, $s2, 1 .L800E7F90: @@ -144,16 +144,16 @@ glabel status_menu_draw_stat /* 814EC 800E803C 00021080 */ sll $v0, $v0, 2 /* 814F0 800E8040 005E1021 */ addu $v0, $v0, $fp /* 814F4 800E8044 8C450000 */ lw $a1, ($v0) -/* 814F8 800E8048 0C0511FF */ jal set_hud_element_anim +/* 814F8 800E8048 0C0511FF */ jal hud_element_set_script /* 814FC 800E804C 0280202D */ daddu $a0, $s4, $zero /* 81500 800E8050 0280202D */ daddu $a0, $s4, $zero /* 81504 800E8054 0200282D */ daddu $a1, $s0, $zero -/* 81508 800E8058 0C051261 */ jal set_hud_element_render_pos +/* 81508 800E8058 0C051261 */ jal hud_element_set_render_pos /* 8150C 800E805C 0260302D */ daddu $a2, $s3, $zero /* 81510 800E8060 0280202D */ daddu $a0, $s4, $zero -/* 81514 800E8064 0C05128B */ jal clear_hud_element_flags +/* 81514 800E8064 0C05128B */ jal hud_element_clear_flags /* 81518 800E8068 24050002 */ addiu $a1, $zero, 2 -/* 8151C 800E806C 0C0511F1 */ jal draw_hud_element_2 +/* 8151C 800E806C 0C0511F1 */ jal hud_element_draw_next /* 81520 800E8070 0280202D */ daddu $a0, $s4, $zero /* 81524 800E8074 26520001 */ addiu $s2, $s2, 1 .L800E8078: diff --git a/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s b/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s index 9695e97f6e..28b7d5c21e 100644 --- a/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s +++ b/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s @@ -475,18 +475,18 @@ glabel update_status_menu /* 81C34 800E8784 86660036 */ lh $a2, 0x36($s3) /* 81C38 800E8788 0240202D */ daddu $a0, $s2, $zero /* 81C3C 800E878C 24A50016 */ addiu $a1, $a1, 0x16 -/* 81C40 800E8790 0C051261 */ jal set_hud_element_render_pos +/* 81C40 800E8790 0C051261 */ jal hud_element_set_render_pos /* 81C44 800E8794 24C6000D */ addiu $a2, $a2, 0xd -/* 81C48 800E8798 0C0511F1 */ jal draw_hud_element_2 +/* 81C48 800E8798 0C0511F1 */ jal hud_element_draw_next /* 81C4C 800E879C 0240202D */ daddu $a0, $s2, $zero /* 81C50 800E87A0 8E720004 */ lw $s2, 4($s3) /* 81C54 800E87A4 86650034 */ lh $a1, 0x34($s3) /* 81C58 800E87A8 86660036 */ lh $a2, 0x36($s3) /* 81C5C 800E87AC 0240202D */ daddu $a0, $s2, $zero /* 81C60 800E87B0 24A50025 */ addiu $a1, $a1, 0x25 -/* 81C64 800E87B4 0C051261 */ jal set_hud_element_render_pos +/* 81C64 800E87B4 0C051261 */ jal hud_element_set_render_pos /* 81C68 800E87B8 24C6000D */ addiu $a2, $a2, 0xd -/* 81C6C 800E87BC 0C0511F1 */ jal draw_hud_element_2 +/* 81C6C 800E87BC 0C0511F1 */ jal hud_element_draw_next /* 81C70 800E87C0 0240202D */ daddu $a0, $s2, $zero /* 81C74 800E87C4 8E640020 */ lw $a0, 0x20($s3) /* 81C78 800E87C8 86650034 */ lh $a1, 0x34($s3) @@ -533,18 +533,18 @@ glabel update_status_menu /* 81D0C 800E885C 86660036 */ lh $a2, 0x36($s3) /* 81D10 800E8860 0240202D */ daddu $a0, $s2, $zero /* 81D14 800E8864 24A5006E */ addiu $a1, $a1, 0x6e -/* 81D18 800E8868 0C051261 */ jal set_hud_element_render_pos +/* 81D18 800E8868 0C051261 */ jal hud_element_set_render_pos /* 81D1C 800E886C 24C6000D */ addiu $a2, $a2, 0xd -/* 81D20 800E8870 0C0511F1 */ jal draw_hud_element_2 +/* 81D20 800E8870 0C0511F1 */ jal hud_element_draw_next /* 81D24 800E8874 0240202D */ daddu $a0, $s2, $zero /* 81D28 800E8878 8E72000C */ lw $s2, 0xc($s3) /* 81D2C 800E887C 86650034 */ lh $a1, 0x34($s3) /* 81D30 800E8880 86660036 */ lh $a2, 0x36($s3) /* 81D34 800E8884 0240202D */ daddu $a0, $s2, $zero /* 81D38 800E8888 24A5007D */ addiu $a1, $a1, 0x7d -/* 81D3C 800E888C 0C051261 */ jal set_hud_element_render_pos +/* 81D3C 800E888C 0C051261 */ jal hud_element_set_render_pos /* 81D40 800E8890 24C6000D */ addiu $a2, $a2, 0xd -/* 81D44 800E8894 0C0511F1 */ jal draw_hud_element_2 +/* 81D44 800E8894 0C0511F1 */ jal hud_element_draw_next /* 81D48 800E8898 0240202D */ daddu $a0, $s2, $zero /* 81D4C 800E889C 8E640024 */ lw $a0, 0x24($s3) /* 81D50 800E88A0 86650034 */ lh $a1, 0x34($s3) @@ -587,18 +587,18 @@ glabel update_status_menu /* 81DD4 800E8924 86660036 */ lh $a2, 0x36($s3) /* 81DD8 800E8928 0240202D */ daddu $a0, $s2, $zero /* 81DDC 800E892C 24A500C3 */ addiu $a1, $a1, 0xc3 -/* 81DE0 800E8930 0C051261 */ jal set_hud_element_render_pos +/* 81DE0 800E8930 0C051261 */ jal hud_element_set_render_pos /* 81DE4 800E8934 24C6000E */ addiu $a2, $a2, 0xe -/* 81DE8 800E8938 0C0511F1 */ jal draw_hud_element_2 +/* 81DE8 800E8938 0C0511F1 */ jal hud_element_draw_next /* 81DEC 800E893C 0240202D */ daddu $a0, $s2, $zero /* 81DF0 800E8940 8E72001C */ lw $s2, 0x1c($s3) /* 81DF4 800E8944 86650034 */ lh $a1, 0x34($s3) /* 81DF8 800E8948 86660036 */ lh $a2, 0x36($s3) /* 81DFC 800E894C 0240202D */ daddu $a0, $s2, $zero /* 81E00 800E8950 24A500C3 */ addiu $a1, $a1, 0xc3 -/* 81E04 800E8954 0C051261 */ jal set_hud_element_render_pos +/* 81E04 800E8954 0C051261 */ jal hud_element_set_render_pos /* 81E08 800E8958 24C60009 */ addiu $a2, $a2, 9 -/* 81E0C 800E895C 0C0511F1 */ jal draw_hud_element_2 +/* 81E0C 800E895C 0C0511F1 */ jal hud_element_draw_next /* 81E10 800E8960 0240202D */ daddu $a0, $s2, $zero /* 81E14 800E8964 8E640028 */ lw $a0, 0x28($s3) /* 81E18 800E8968 86650034 */ lh $a1, 0x34($s3) @@ -645,18 +645,18 @@ glabel update_status_menu /* 81EAC 800E89FC 86660036 */ lh $a2, 0x36($s3) /* 81EB0 800E8A00 0240202D */ daddu $a0, $s2, $zero /* 81EB4 800E8A04 24A500F4 */ addiu $a1, $a1, 0xf4 -/* 81EB8 800E8A08 0C051261 */ jal set_hud_element_render_pos +/* 81EB8 800E8A08 0C051261 */ jal hud_element_set_render_pos /* 81EBC 800E8A0C 24C6000E */ addiu $a2, $a2, 0xe -/* 81EC0 800E8A10 0C0511F1 */ jal draw_hud_element_2 +/* 81EC0 800E8A10 0C0511F1 */ jal hud_element_draw_next /* 81EC4 800E8A14 0240202D */ daddu $a0, $s2, $zero /* 81EC8 800E8A18 8E720014 */ lw $s2, 0x14($s3) /* 81ECC 800E8A1C 86650034 */ lh $a1, 0x34($s3) /* 81ED0 800E8A20 86660036 */ lh $a2, 0x36($s3) /* 81ED4 800E8A24 0240202D */ daddu $a0, $s2, $zero /* 81ED8 800E8A28 24A500F4 */ addiu $a1, $a1, 0xf4 -/* 81EDC 800E8A2C 0C051261 */ jal set_hud_element_render_pos +/* 81EDC 800E8A2C 0C051261 */ jal hud_element_set_render_pos /* 81EE0 800E8A30 24C6000E */ addiu $a2, $a2, 0xe -/* 81EE4 800E8A34 0C0511F1 */ jal draw_hud_element_2 +/* 81EE4 800E8A34 0C0511F1 */ jal hud_element_draw_next /* 81EE8 800E8A38 0240202D */ daddu $a0, $s2, $zero /* 81EEC 800E8A3C 8E64002C */ lw $a0, 0x2c($s3) /* 81EF0 800E8A40 86650034 */ lh $a1, 0x34($s3) @@ -878,15 +878,15 @@ glabel update_status_menu /* 82200 800E8D50 01229821 */ addu $s3, $t1, $v0 /* 82204 800E8D54 AFA90058 */ sw $t1, 0x58($sp) /* 82208 800E8D58 8E650000 */ lw $a1, ($s3) -/* 8220C 800E8D5C 0C0511FF */ jal set_hud_element_anim +/* 8220C 800E8D5C 0C0511FF */ jal hud_element_set_script /* 82210 800E8D60 26310001 */ addiu $s1, $s1, 1 /* 82214 800E8D64 0240202D */ daddu $a0, $s2, $zero /* 82218 800E8D68 3C05800F */ lui $a1, %hi(D_800F7FE8) /* 8221C 800E8D6C 8CA57FE8 */ lw $a1, %lo(D_800F7FE8)($a1) /* 82220 800E8D70 8FA6005C */ lw $a2, 0x5c($sp) -/* 82224 800E8D74 0C051261 */ jal set_hud_element_render_pos +/* 82224 800E8D74 0C051261 */ jal hud_element_set_render_pos /* 82228 800E8D78 02C52821 */ addu $a1, $s6, $a1 -/* 8222C 800E8D7C 0C0511F1 */ jal draw_hud_element_2 +/* 8222C 800E8D7C 0C0511F1 */ jal hud_element_draw_next /* 82230 800E8D80 0240202D */ daddu $a0, $s2, $zero /* 82234 800E8D84 0214102A */ slt $v0, $s0, $s4 /* 82238 800E8D88 104000A3 */ beqz $v0, .L800E9018 @@ -900,15 +900,15 @@ glabel update_status_menu .L800E8DA8: /* 82258 800E8DA8 0240202D */ daddu $a0, $s2, $zero /* 8225C 800E8DAC 8E650000 */ lw $a1, ($s3) -/* 82260 800E8DB0 0C0511FF */ jal set_hud_element_anim +/* 82260 800E8DB0 0C0511FF */ jal hud_element_set_script /* 82264 800E8DB4 26310001 */ addiu $s1, $s1, 1 /* 82268 800E8DB8 0240202D */ daddu $a0, $s2, $zero /* 8226C 800E8DBC 3C05800F */ lui $a1, %hi(D_800F7FEC) /* 82270 800E8DC0 8CA57FEC */ lw $a1, %lo(D_800F7FEC)($a1) /* 82274 800E8DC4 8FA6005C */ lw $a2, 0x5c($sp) -/* 82278 800E8DC8 0C051261 */ jal set_hud_element_render_pos +/* 82278 800E8DC8 0C051261 */ jal hud_element_set_render_pos /* 8227C 800E8DCC 02C52821 */ addu $a1, $s6, $a1 -/* 82280 800E8DD0 0C0511F1 */ jal draw_hud_element_2 +/* 82280 800E8DD0 0C0511F1 */ jal hud_element_draw_next /* 82284 800E8DD4 0240202D */ daddu $a0, $s2, $zero /* 82288 800E8DD8 0214102A */ slt $v0, $s0, $s4 /* 8228C 800E8DDC 1040008E */ beqz $v0, .L800E9018 @@ -922,15 +922,15 @@ glabel update_status_menu .L800E8DFC: /* 822AC 800E8DFC 0240202D */ daddu $a0, $s2, $zero /* 822B0 800E8E00 8E650000 */ lw $a1, ($s3) -/* 822B4 800E8E04 0C0511FF */ jal set_hud_element_anim +/* 822B4 800E8E04 0C0511FF */ jal hud_element_set_script /* 822B8 800E8E08 26310001 */ addiu $s1, $s1, 1 /* 822BC 800E8E0C 0240202D */ daddu $a0, $s2, $zero /* 822C0 800E8E10 3C05800F */ lui $a1, %hi(D_800F7FF0) /* 822C4 800E8E14 8CA57FF0 */ lw $a1, %lo(D_800F7FF0)($a1) /* 822C8 800E8E18 8FA6005C */ lw $a2, 0x5c($sp) -/* 822CC 800E8E1C 0C051261 */ jal set_hud_element_render_pos +/* 822CC 800E8E1C 0C051261 */ jal hud_element_set_render_pos /* 822D0 800E8E20 02C52821 */ addu $a1, $s6, $a1 -/* 822D4 800E8E24 0C0511F1 */ jal draw_hud_element_2 +/* 822D4 800E8E24 0C0511F1 */ jal hud_element_draw_next /* 822D8 800E8E28 0240202D */ daddu $a0, $s2, $zero /* 822DC 800E8E2C 0214102A */ slt $v0, $s0, $s4 /* 822E0 800E8E30 10400079 */ beqz $v0, .L800E9018 @@ -944,15 +944,15 @@ glabel update_status_menu .L800E8E50: /* 82300 800E8E50 0240202D */ daddu $a0, $s2, $zero /* 82304 800E8E54 8E650000 */ lw $a1, ($s3) -/* 82308 800E8E58 0C0511FF */ jal set_hud_element_anim +/* 82308 800E8E58 0C0511FF */ jal hud_element_set_script /* 8230C 800E8E5C 26310001 */ addiu $s1, $s1, 1 /* 82310 800E8E60 0240202D */ daddu $a0, $s2, $zero /* 82314 800E8E64 3C05800F */ lui $a1, %hi(D_800F7FF4) /* 82318 800E8E68 8CA57FF4 */ lw $a1, %lo(D_800F7FF4)($a1) /* 8231C 800E8E6C 8FA6005C */ lw $a2, 0x5c($sp) -/* 82320 800E8E70 0C051261 */ jal set_hud_element_render_pos +/* 82320 800E8E70 0C051261 */ jal hud_element_set_render_pos /* 82324 800E8E74 02C52821 */ addu $a1, $s6, $a1 -/* 82328 800E8E78 0C0511F1 */ jal draw_hud_element_2 +/* 82328 800E8E78 0C0511F1 */ jal hud_element_draw_next /* 8232C 800E8E7C 0240202D */ daddu $a0, $s2, $zero /* 82330 800E8E80 0214102A */ slt $v0, $s0, $s4 /* 82334 800E8E84 10400064 */ beqz $v0, .L800E9018 @@ -966,15 +966,15 @@ glabel update_status_menu .L800E8EA4: /* 82354 800E8EA4 0240202D */ daddu $a0, $s2, $zero /* 82358 800E8EA8 8E650000 */ lw $a1, ($s3) -/* 8235C 800E8EAC 0C0511FF */ jal set_hud_element_anim +/* 8235C 800E8EAC 0C0511FF */ jal hud_element_set_script /* 82360 800E8EB0 26310001 */ addiu $s1, $s1, 1 /* 82364 800E8EB4 0240202D */ daddu $a0, $s2, $zero /* 82368 800E8EB8 3C05800F */ lui $a1, %hi(D_800F7FF8) /* 8236C 800E8EBC 8CA57FF8 */ lw $a1, %lo(D_800F7FF8)($a1) /* 82370 800E8EC0 8FA6005C */ lw $a2, 0x5c($sp) -/* 82374 800E8EC4 0C051261 */ jal set_hud_element_render_pos +/* 82374 800E8EC4 0C051261 */ jal hud_element_set_render_pos /* 82378 800E8EC8 02C52821 */ addu $a1, $s6, $a1 -/* 8237C 800E8ECC 0C0511F1 */ jal draw_hud_element_2 +/* 8237C 800E8ECC 0C0511F1 */ jal hud_element_draw_next /* 82380 800E8ED0 0240202D */ daddu $a0, $s2, $zero /* 82384 800E8ED4 0214102A */ slt $v0, $s0, $s4 /* 82388 800E8ED8 1040004F */ beqz $v0, .L800E9018 @@ -988,15 +988,15 @@ glabel update_status_menu .L800E8EF8: /* 823A8 800E8EF8 0240202D */ daddu $a0, $s2, $zero /* 823AC 800E8EFC 8E650000 */ lw $a1, ($s3) -/* 823B0 800E8F00 0C0511FF */ jal set_hud_element_anim +/* 823B0 800E8F00 0C0511FF */ jal hud_element_set_script /* 823B4 800E8F04 26310001 */ addiu $s1, $s1, 1 /* 823B8 800E8F08 0240202D */ daddu $a0, $s2, $zero /* 823BC 800E8F0C 3C05800F */ lui $a1, %hi(D_800F7FFC) /* 823C0 800E8F10 8CA57FFC */ lw $a1, %lo(D_800F7FFC)($a1) /* 823C4 800E8F14 8FA6005C */ lw $a2, 0x5c($sp) -/* 823C8 800E8F18 0C051261 */ jal set_hud_element_render_pos +/* 823C8 800E8F18 0C051261 */ jal hud_element_set_render_pos /* 823CC 800E8F1C 02C52821 */ addu $a1, $s6, $a1 -/* 823D0 800E8F20 0C0511F1 */ jal draw_hud_element_2 +/* 823D0 800E8F20 0C0511F1 */ jal hud_element_draw_next /* 823D4 800E8F24 0240202D */ daddu $a0, $s2, $zero /* 823D8 800E8F28 0214102A */ slt $v0, $s0, $s4 /* 823DC 800E8F2C 1040003A */ beqz $v0, .L800E9018 @@ -1010,15 +1010,15 @@ glabel update_status_menu .L800E8F4C: /* 823FC 800E8F4C 0240202D */ daddu $a0, $s2, $zero /* 82400 800E8F50 8E650000 */ lw $a1, ($s3) -/* 82404 800E8F54 0C0511FF */ jal set_hud_element_anim +/* 82404 800E8F54 0C0511FF */ jal hud_element_set_script /* 82408 800E8F58 26310001 */ addiu $s1, $s1, 1 /* 8240C 800E8F5C 0240202D */ daddu $a0, $s2, $zero /* 82410 800E8F60 3C058010 */ lui $a1, %hi(D_800F8000) /* 82414 800E8F64 8CA58000 */ lw $a1, %lo(D_800F8000)($a1) /* 82418 800E8F68 8FA6005C */ lw $a2, 0x5c($sp) -/* 8241C 800E8F6C 0C051261 */ jal set_hud_element_render_pos +/* 8241C 800E8F6C 0C051261 */ jal hud_element_set_render_pos /* 82420 800E8F70 02C52821 */ addu $a1, $s6, $a1 -/* 82424 800E8F74 0C0511F1 */ jal draw_hud_element_2 +/* 82424 800E8F74 0C0511F1 */ jal hud_element_draw_next /* 82428 800E8F78 0240202D */ daddu $a0, $s2, $zero /* 8242C 800E8F7C 0214102A */ slt $v0, $s0, $s4 /* 82430 800E8F80 10400025 */ beqz $v0, .L800E9018 @@ -1039,15 +1039,15 @@ glabel update_status_menu /* 82468 800E8FB8 8FA90050 */ lw $t1, 0x50($sp) /* 8246C 800E8FBC 26D60014 */ addiu $s6, $s6, 0x14 /* 82470 800E8FC0 25290001 */ addiu $t1, $t1, 1 -/* 82474 800E8FC4 0C0511FF */ jal set_hud_element_anim +/* 82474 800E8FC4 0C0511FF */ jal hud_element_set_script /* 82478 800E8FC8 AFA90050 */ sw $t1, 0x50($sp) /* 8247C 800E8FCC 0240202D */ daddu $a0, $s2, $zero /* 82480 800E8FD0 8FA90060 */ lw $t1, 0x60($sp) /* 82484 800E8FD4 02A0302D */ daddu $a2, $s5, $zero /* 82488 800E8FD8 2525000C */ addiu $a1, $t1, 0xc -/* 8248C 800E8FDC 0C051261 */ jal set_hud_element_render_pos +/* 8248C 800E8FDC 0C051261 */ jal hud_element_set_render_pos /* 82490 800E8FE0 03C52821 */ addu $a1, $fp, $a1 -/* 82494 800E8FE4 0C0511F1 */ jal draw_hud_element_2 +/* 82494 800E8FE4 0C0511F1 */ jal hud_element_draw_next /* 82498 800E8FE8 0240202D */ daddu $a0, $s2, $zero /* 8249C 800E8FEC 8FA90060 */ lw $t1, 0x60($sp) /* 824A0 800E8FF0 0214102A */ slt $v0, $s0, $s4 @@ -1081,15 +1081,15 @@ glabel update_status_menu /* 82508 800E9058 26100001 */ addiu $s0, $s0, 1 /* 8250C 800E905C 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 82510 800E9060 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 82514 800E9064 0C0511FF */ jal set_hud_element_anim +/* 82514 800E9064 0C0511FF */ jal hud_element_set_script /* 82518 800E9068 0240202D */ daddu $a0, $s2, $zero /* 8251C 800E906C 0240202D */ daddu $a0, $s2, $zero /* 82520 800E9070 3C05800F */ lui $a1, %hi(D_800F7FE8) /* 82524 800E9074 8CA57FE8 */ lw $a1, %lo(D_800F7FE8)($a1) /* 82528 800E9078 26A6FFFE */ addiu $a2, $s5, -2 -/* 8252C 800E907C 0C051261 */ jal set_hud_element_render_pos +/* 8252C 800E907C 0C051261 */ jal hud_element_set_render_pos /* 82530 800E9080 02652821 */ addu $a1, $s3, $a1 -/* 82534 800E9084 0C0511F1 */ jal draw_hud_element_2 +/* 82534 800E9084 0C0511F1 */ jal hud_element_draw_next /* 82538 800E9088 0240202D */ daddu $a0, $s2, $zero /* 8253C 800E908C 0214102A */ slt $v0, $s0, $s4 /* 82540 800E9090 10400081 */ beqz $v0, .L800E9298 @@ -1101,14 +1101,14 @@ glabel update_status_menu /* 82554 800E90A4 02028021 */ addu $s0, $s0, $v0 /* 82558 800E90A8 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 8255C 800E90AC 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 82560 800E90B0 0C0511FF */ jal set_hud_element_anim +/* 82560 800E90B0 0C0511FF */ jal hud_element_set_script /* 82564 800E90B4 0240202D */ daddu $a0, $s2, $zero /* 82568 800E90B8 0240202D */ daddu $a0, $s2, $zero /* 8256C 800E90BC 8EC50004 */ lw $a1, 4($s6) /* 82570 800E90C0 26A6FFFE */ addiu $a2, $s5, -2 -/* 82574 800E90C4 0C051261 */ jal set_hud_element_render_pos +/* 82574 800E90C4 0C051261 */ jal hud_element_set_render_pos /* 82578 800E90C8 02652821 */ addu $a1, $s3, $a1 -/* 8257C 800E90CC 0C0511F1 */ jal draw_hud_element_2 +/* 8257C 800E90CC 0C0511F1 */ jal hud_element_draw_next /* 82580 800E90D0 0240202D */ daddu $a0, $s2, $zero /* 82584 800E90D4 0214102A */ slt $v0, $s0, $s4 /* 82588 800E90D8 1040006F */ beqz $v0, .L800E9298 @@ -1120,14 +1120,14 @@ glabel update_status_menu /* 8259C 800E90EC 26100001 */ addiu $s0, $s0, 1 /* 825A0 800E90F0 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 825A4 800E90F4 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 825A8 800E90F8 0C0511FF */ jal set_hud_element_anim +/* 825A8 800E90F8 0C0511FF */ jal hud_element_set_script /* 825AC 800E90FC 0240202D */ daddu $a0, $s2, $zero /* 825B0 800E9100 0240202D */ daddu $a0, $s2, $zero /* 825B4 800E9104 8EC50008 */ lw $a1, 8($s6) /* 825B8 800E9108 26A6FFFE */ addiu $a2, $s5, -2 -/* 825BC 800E910C 0C051261 */ jal set_hud_element_render_pos +/* 825BC 800E910C 0C051261 */ jal hud_element_set_render_pos /* 825C0 800E9110 02652821 */ addu $a1, $s3, $a1 -/* 825C4 800E9114 0C0511F1 */ jal draw_hud_element_2 +/* 825C4 800E9114 0C0511F1 */ jal hud_element_draw_next /* 825C8 800E9118 0240202D */ daddu $a0, $s2, $zero /* 825CC 800E911C 0214102A */ slt $v0, $s0, $s4 /* 825D0 800E9120 1040005D */ beqz $v0, .L800E9298 @@ -1139,14 +1139,14 @@ glabel update_status_menu /* 825E4 800E9134 26100001 */ addiu $s0, $s0, 1 /* 825E8 800E9138 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 825EC 800E913C 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 825F0 800E9140 0C0511FF */ jal set_hud_element_anim +/* 825F0 800E9140 0C0511FF */ jal hud_element_set_script /* 825F4 800E9144 0240202D */ daddu $a0, $s2, $zero /* 825F8 800E9148 0240202D */ daddu $a0, $s2, $zero /* 825FC 800E914C 8EC5000C */ lw $a1, 0xc($s6) /* 82600 800E9150 26A6FFFE */ addiu $a2, $s5, -2 -/* 82604 800E9154 0C051261 */ jal set_hud_element_render_pos +/* 82604 800E9154 0C051261 */ jal hud_element_set_render_pos /* 82608 800E9158 02652821 */ addu $a1, $s3, $a1 -/* 8260C 800E915C 0C0511F1 */ jal draw_hud_element_2 +/* 8260C 800E915C 0C0511F1 */ jal hud_element_draw_next /* 82610 800E9160 0240202D */ daddu $a0, $s2, $zero /* 82614 800E9164 0214102A */ slt $v0, $s0, $s4 /* 82618 800E9168 1040004B */ beqz $v0, .L800E9298 @@ -1158,14 +1158,14 @@ glabel update_status_menu /* 8262C 800E917C 26100001 */ addiu $s0, $s0, 1 /* 82630 800E9180 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 82634 800E9184 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 82638 800E9188 0C0511FF */ jal set_hud_element_anim +/* 82638 800E9188 0C0511FF */ jal hud_element_set_script /* 8263C 800E918C 0240202D */ daddu $a0, $s2, $zero /* 82640 800E9190 0240202D */ daddu $a0, $s2, $zero /* 82644 800E9194 8EC50010 */ lw $a1, 0x10($s6) /* 82648 800E9198 26A6FFFE */ addiu $a2, $s5, -2 -/* 8264C 800E919C 0C051261 */ jal set_hud_element_render_pos +/* 8264C 800E919C 0C051261 */ jal hud_element_set_render_pos /* 82650 800E91A0 02652821 */ addu $a1, $s3, $a1 -/* 82654 800E91A4 0C0511F1 */ jal draw_hud_element_2 +/* 82654 800E91A4 0C0511F1 */ jal hud_element_draw_next /* 82658 800E91A8 0240202D */ daddu $a0, $s2, $zero /* 8265C 800E91AC 0214102A */ slt $v0, $s0, $s4 /* 82660 800E91B0 10400039 */ beqz $v0, .L800E9298 @@ -1177,14 +1177,14 @@ glabel update_status_menu /* 82674 800E91C4 26100001 */ addiu $s0, $s0, 1 /* 82678 800E91C8 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 8267C 800E91CC 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 82680 800E91D0 0C0511FF */ jal set_hud_element_anim +/* 82680 800E91D0 0C0511FF */ jal hud_element_set_script /* 82684 800E91D4 0240202D */ daddu $a0, $s2, $zero /* 82688 800E91D8 0240202D */ daddu $a0, $s2, $zero /* 8268C 800E91DC 8EC50014 */ lw $a1, 0x14($s6) /* 82690 800E91E0 26A6FFFE */ addiu $a2, $s5, -2 -/* 82694 800E91E4 0C051261 */ jal set_hud_element_render_pos +/* 82694 800E91E4 0C051261 */ jal hud_element_set_render_pos /* 82698 800E91E8 02652821 */ addu $a1, $s3, $a1 -/* 8269C 800E91EC 0C0511F1 */ jal draw_hud_element_2 +/* 8269C 800E91EC 0C0511F1 */ jal hud_element_draw_next /* 826A0 800E91F0 0240202D */ daddu $a0, $s2, $zero /* 826A4 800E91F4 0214102A */ slt $v0, $s0, $s4 /* 826A8 800E91F8 10400027 */ beqz $v0, .L800E9298 @@ -1196,14 +1196,14 @@ glabel update_status_menu /* 826BC 800E920C 26100001 */ addiu $s0, $s0, 1 /* 826C0 800E9210 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 826C4 800E9214 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 826C8 800E9218 0C0511FF */ jal set_hud_element_anim +/* 826C8 800E9218 0C0511FF */ jal hud_element_set_script /* 826CC 800E921C 0240202D */ daddu $a0, $s2, $zero /* 826D0 800E9220 0240202D */ daddu $a0, $s2, $zero /* 826D4 800E9224 8EC50018 */ lw $a1, 0x18($s6) /* 826D8 800E9228 26A6FFFE */ addiu $a2, $s5, -2 -/* 826DC 800E922C 0C051261 */ jal set_hud_element_render_pos +/* 826DC 800E922C 0C051261 */ jal hud_element_set_render_pos /* 826E0 800E9230 02652821 */ addu $a1, $s3, $a1 -/* 826E4 800E9234 0C0511F1 */ jal draw_hud_element_2 +/* 826E4 800E9234 0C0511F1 */ jal hud_element_draw_next /* 826E8 800E9238 0240202D */ daddu $a0, $s2, $zero /* 826EC 800E923C 0214102A */ slt $v0, $s0, $s4 /* 826F0 800E9240 10400015 */ beqz $v0, .L800E9298 @@ -1215,13 +1215,13 @@ glabel update_status_menu /* 82704 800E9254 26100001 */ addiu $s0, $s0, 1 /* 82708 800E9258 3C058011 */ lui $a1, %hi(HudScript_StatusStarEmpty) /* 8270C 800E925C 24A584F0 */ addiu $a1, $a1, %lo(HudScript_StatusStarEmpty) -/* 82710 800E9260 0C0511FF */ jal set_hud_element_anim +/* 82710 800E9260 0C0511FF */ jal hud_element_set_script /* 82714 800E9264 0240202D */ daddu $a0, $s2, $zero /* 82718 800E9268 0240202D */ daddu $a0, $s2, $zero /* 8271C 800E926C 03D72821 */ addu $a1, $fp, $s7 -/* 82720 800E9270 0C051261 */ jal set_hud_element_render_pos +/* 82720 800E9270 0C051261 */ jal hud_element_set_render_pos /* 82724 800E9274 02A0302D */ daddu $a2, $s5, $zero -/* 82728 800E9278 0C0511F1 */ jal draw_hud_element_2 +/* 82728 800E9278 0C0511F1 */ jal hud_element_draw_next /* 8272C 800E927C 0240202D */ daddu $a0, $s2, $zero /* 82730 800E9280 0214102A */ slt $v0, $s0, $s4 /* 82734 800E9284 10400004 */ beqz $v0, .L800E9298 diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s index ab4c25dfe5..75fc0b2144 100644 --- a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s +++ b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s @@ -139,31 +139,31 @@ glabel func_800F16CC /* 8AD2C 800F187C 00A0302D */ daddu $a2, $a1, $zero /* 8AD30 800F1880 3C048011 */ lui $a0, %hi(D_8010D65C) /* 8AD34 800F1884 8C84D65C */ lw $a0, %lo(D_8010D65C)($a0) -/* 8AD38 800F1888 0C0513BF */ jal set_hud_element_tint +/* 8AD38 800F1888 0C0513BF */ jal hud_element_set_tint /* 8AD3C 800F188C 00A0382D */ daddu $a3, $a1, $zero /* 8AD40 800F1890 240500FF */ addiu $a1, $zero, 0xff /* 8AD44 800F1894 00A0302D */ daddu $a2, $a1, $zero /* 8AD48 800F1898 3C048011 */ lui $a0, %hi(D_8010D678) /* 8AD4C 800F189C 8C84D678 */ lw $a0, %lo(D_8010D678)($a0) -/* 8AD50 800F18A0 0C0513BF */ jal set_hud_element_tint +/* 8AD50 800F18A0 0C0513BF */ jal hud_element_set_tint /* 8AD54 800F18A4 00A0382D */ daddu $a3, $a1, $zero /* 8AD58 800F18A8 240500FF */ addiu $a1, $zero, 0xff /* 8AD5C 800F18AC 00A0302D */ daddu $a2, $a1, $zero /* 8AD60 800F18B0 3C048011 */ lui $a0, %hi(D_8010D66C) /* 8AD64 800F18B4 8C84D66C */ lw $a0, %lo(D_8010D66C)($a0) -/* 8AD68 800F18B8 0C0513BF */ jal set_hud_element_tint +/* 8AD68 800F18B8 0C0513BF */ jal hud_element_set_tint /* 8AD6C 800F18BC 00A0382D */ daddu $a3, $a1, $zero /* 8AD70 800F18C0 240500FF */ addiu $a1, $zero, 0xff /* 8AD74 800F18C4 00A0302D */ daddu $a2, $a1, $zero /* 8AD78 800F18C8 3C048011 */ lui $a0, %hi(D_8010D670) /* 8AD7C 800F18CC 8C84D670 */ lw $a0, %lo(D_8010D670)($a0) -/* 8AD80 800F18D0 0C0513BF */ jal set_hud_element_tint +/* 8AD80 800F18D0 0C0513BF */ jal hud_element_set_tint /* 8AD84 800F18D4 00A0382D */ daddu $a3, $a1, $zero /* 8AD88 800F18D8 240500FF */ addiu $a1, $zero, 0xff /* 8AD8C 800F18DC 00A0302D */ daddu $a2, $a1, $zero /* 8AD90 800F18E0 3C048011 */ lui $a0, %hi(D_8010D674) /* 8AD94 800F18E4 8C84D674 */ lw $a0, %lo(D_8010D674)($a0) -/* 8AD98 800F18E8 0C0513BF */ jal set_hud_element_tint +/* 8AD98 800F18E8 0C0513BF */ jal hud_element_set_tint /* 8AD9C 800F18EC 00A0382D */ daddu $a3, $a1, $zero /* 8ADA0 800F18F0 8E220000 */ lw $v0, ($s1) /* 8ADA4 800F18F4 8C420318 */ lw $v0, 0x318($v0) @@ -172,13 +172,13 @@ glabel func_800F16CC /* 8ADB0 800F1900 00A0302D */ daddu $a2, $a1, $zero /* 8ADB4 800F1904 3C048011 */ lui $a0, %hi(D_8010D660) /* 8ADB8 800F1908 8C84D660 */ lw $a0, %lo(D_8010D660)($a0) -/* 8ADBC 800F190C 0C0513BF */ jal set_hud_element_tint +/* 8ADBC 800F190C 0C0513BF */ jal hud_element_set_tint /* 8ADC0 800F1910 00A0382D */ daddu $a3, $a1, $zero /* 8ADC4 800F1914 240500FF */ addiu $a1, $zero, 0xff /* 8ADC8 800F1918 00A0302D */ daddu $a2, $a1, $zero /* 8ADCC 800F191C 3C048011 */ lui $a0, %hi(D_8010D664) /* 8ADD0 800F1920 8C84D664 */ lw $a0, %lo(D_8010D664)($a0) -/* 8ADD4 800F1924 0C0513BF */ jal set_hud_element_tint +/* 8ADD4 800F1924 0C0513BF */ jal hud_element_set_tint /* 8ADD8 800F1928 00A0382D */ daddu $a3, $a1, $zero .L800F192C: /* 8ADDC 800F192C 8E220000 */ lw $v0, ($s1) @@ -188,13 +188,13 @@ glabel func_800F16CC /* 8ADEC 800F193C 00A0302D */ daddu $a2, $a1, $zero /* 8ADF0 800F1940 3C048011 */ lui $a0, %hi(D_8010D660) /* 8ADF4 800F1944 8C84D660 */ lw $a0, %lo(D_8010D660)($a0) -/* 8ADF8 800F1948 0C0513BF */ jal set_hud_element_tint +/* 8ADF8 800F1948 0C0513BF */ jal hud_element_set_tint /* 8ADFC 800F194C 00A0382D */ daddu $a3, $a1, $zero /* 8AE00 800F1950 240500FF */ addiu $a1, $zero, 0xff /* 8AE04 800F1954 00A0302D */ daddu $a2, $a1, $zero /* 8AE08 800F1958 3C048011 */ lui $a0, %hi(D_8010D664) /* 8AE0C 800F195C 8C84D664 */ lw $a0, %lo(D_8010D664)($a0) -/* 8AE10 800F1960 0C0513BF */ jal set_hud_element_tint +/* 8AE10 800F1960 0C0513BF */ jal hud_element_set_tint /* 8AE14 800F1964 00A0382D */ daddu $a3, $a1, $zero .L800F1968: /* 8AE18 800F1968 8E220000 */ lw $v0, ($s1) @@ -209,7 +209,7 @@ glabel func_800F16CC /* 8AE38 800F1988 8C84D668 */ lw $a0, %lo(D_8010D668)($a0) /* 8AE3C 800F198C 240500FF */ addiu $a1, $zero, 0xff /* 8AE40 800F1990 00A0302D */ daddu $a2, $a1, $zero -/* 8AE44 800F1994 0C0513BF */ jal set_hud_element_tint +/* 8AE44 800F1994 0C0513BF */ jal hud_element_set_tint /* 8AE48 800F1998 00A0382D */ daddu $a3, $a1, $zero .L800F199C: /* 8AE4C 800F199C 3C028011 */ lui $v0, %hi(gPopupMenu) @@ -221,14 +221,14 @@ glabel func_800F16CC /* 8AE64 800F19B4 3C048011 */ lui $a0, %hi(D_8010D660) /* 8AE68 800F19B8 8C84D660 */ lw $a0, %lo(D_8010D660)($a0) /* 8AE6C 800F19BC 00A0302D */ daddu $a2, $a1, $zero -/* 8AE70 800F19C0 0C0513BF */ jal set_hud_element_tint +/* 8AE70 800F19C0 0C0513BF */ jal hud_element_set_tint /* 8AE74 800F19C4 00A0382D */ daddu $a3, $a1, $zero .L800F19C8: /* 8AE78 800F19C8 3C048011 */ lui $a0, %hi(D_8010D66C) /* 8AE7C 800F19CC 8C84D66C */ lw $a0, %lo(D_8010D66C)($a0) /* 8AE80 800F19D0 3C058010 */ lui $a1, %hi(HudScript_AnimatedHandPointer) /* 8AE84 800F19D4 24A54A28 */ addiu $a1, $a1, %lo(HudScript_AnimatedHandPointer) -/* 8AE88 800F19D8 0C0511FF */ jal set_hud_element_anim +/* 8AE88 800F19D8 0C0511FF */ jal hud_element_set_script /* 8AE8C 800F19DC 00000000 */ nop /* 8AE90 800F19E0 8FBF001C */ lw $ra, 0x1c($sp) /* 8AE94 800F19E4 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_menu_contents.s b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_menu_contents.s index 36369a672a..100daf8de5 100644 --- a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_menu_contents.s +++ b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_menu_contents.s @@ -271,11 +271,11 @@ glabel popup_menu_draw_menu_contents /* 8CED4 800F3A24 3C108011 */ lui $s0, %hi(D_8010D65C) /* 8CED8 800F3A28 8E10D65C */ lw $s0, %lo(D_8010D65C)($s0) /* 8CEDC 800F3A2C 25450049 */ addiu $a1, $t2, 0x49 -/* 8CEE0 800F3A30 0C051261 */ jal set_hud_element_render_pos +/* 8CEE0 800F3A30 0C051261 */ jal hud_element_set_render_pos /* 8CEE4 800F3A34 0200202D */ daddu $a0, $s0, $zero /* 8CEE8 800F3A38 3C058011 */ lui $a1, %hi(D_8010D650) /* 8CEEC 800F3A3C 8CA5D650 */ lw $a1, %lo(D_8010D650)($a1) -/* 8CEF0 800F3A40 0C0513AC */ jal set_hud_element_alpha +/* 8CEF0 800F3A40 0C0513AC */ jal hud_element_set_alpha /* 8CEF4 800F3A44 0200202D */ daddu $a0, $s0, $zero /* 8CEF8 800F3A48 8E420000 */ lw $v0, ($s2) /* 8CEFC 800F3A4C 3C038011 */ lui $v1, %hi(D_8010D68F) @@ -284,7 +284,7 @@ glabel popup_menu_draw_menu_contents /* 8CF08 800F3A58 0062182A */ slt $v1, $v1, $v0 /* 8CF0C 800F3A5C 10600003 */ beqz $v1, .L800F3A6C /* 8CF10 800F3A60 00000000 */ nop -/* 8CF14 800F3A64 0C0511F8 */ jal draw_hud_element_3 +/* 8CF14 800F3A64 0C0511F8 */ jal hud_element_draw_without_clipping /* 8CF18 800F3A68 0200202D */ daddu $a0, $s0, $zero .L800F3A6C: /* 8CF1C 800F3A6C 8FAB005C */ lw $t3, 0x5c($sp) @@ -569,7 +569,7 @@ glabel popup_menu_draw_menu_contents .L800F3E74: /* 8D324 800F3E74 8EA50000 */ lw $a1, ($s5) .L800F3E78: -/* 8D328 800F3E78 0C0511FF */ jal set_hud_element_anim +/* 8D328 800F3E78 0C0511FF */ jal hud_element_set_script /* 8D32C 800F3E7C 0200202D */ daddu $a0, $s0, $zero /* 8D330 800F3E80 3C028011 */ lui $v0, %hi(gPopupMenu) /* 8D334 800F3E84 8C42D69C */ lw $v0, %lo(gPopupMenu)($v0) @@ -586,7 +586,7 @@ glabel popup_menu_draw_menu_contents /* 8D35C 800F3EAC 2626000A */ addiu $a2, $s1, 0xa /* 8D360 800F3EB0 01772821 */ addu $a1, $t3, $s7 .L800F3EB4: -/* 8D364 800F3EB4 0C051261 */ jal set_hud_element_render_pos +/* 8D364 800F3EB4 0C051261 */ jal hud_element_set_render_pos /* 8D368 800F3EB8 00000000 */ nop /* 8D36C 800F3EBC 3C028011 */ lui $v0, %hi(gPopupMenu) /* 8D370 800F3EC0 8C42D69C */ lw $v0, %lo(gPopupMenu)($v0) @@ -595,7 +595,7 @@ glabel popup_menu_draw_menu_contents /* 8D37C 800F3ECC 0262102A */ slt $v0, $s3, $v0 /* 8D380 800F3ED0 50400004 */ beql $v0, $zero, .L800F3EE4 /* 8D384 800F3ED4 26F7000D */ addiu $s7, $s7, 0xd -/* 8D388 800F3ED8 0C0511F1 */ jal draw_hud_element_2 +/* 8D388 800F3ED8 0C0511F1 */ jal hud_element_draw_next /* 8D38C 800F3EDC 0200202D */ daddu $a0, $s0, $zero /* 8D390 800F3EE0 26F7000D */ addiu $s7, $s7, 0xd .L800F3EE4: @@ -710,22 +710,22 @@ glabel popup_menu_draw_menu_contents /* 8D514 800F4064 8E10D678 */ lw $s0, %lo(D_8010D678)($s0) /* 8D518 800F4068 00431021 */ addu $v0, $v0, $v1 /* 8D51C 800F406C 8C450000 */ lw $a1, ($v0) -/* 8D520 800F4070 0C0511FF */ jal set_hud_element_anim +/* 8D520 800F4070 0C0511FF */ jal hud_element_set_script /* 8D524 800F4074 0200202D */ daddu $a0, $s0, $zero /* 8D528 800F4078 0200202D */ daddu $a0, $s0, $zero /* 8D52C 800F407C 8FA50020 */ lw $a1, 0x20($sp) -/* 8D530 800F4080 0C051261 */ jal set_hud_element_render_pos +/* 8D530 800F4080 0C051261 */ jal hud_element_set_render_pos /* 8D534 800F4084 0220302D */ daddu $a2, $s1, $zero /* 8D538 800F4088 0200202D */ daddu $a0, $s0, $zero /* 8D53C 800F408C 3C058011 */ lui $a1, %hi(D_8010D650) /* 8D540 800F4090 8CA5D650 */ lw $a1, %lo(D_8010D650)($a1) -/* 8D544 800F4094 0C0513AC */ jal set_hud_element_alpha +/* 8D544 800F4094 0C0513AC */ jal hud_element_set_alpha /* 8D548 800F4098 2631000D */ addiu $s1, $s1, 0xd /* 8D54C 800F409C 3C053EE6 */ lui $a1, 0x3ee6 /* 8D550 800F40A0 34A56666 */ ori $a1, $a1, 0x6666 -/* 8D554 800F40A4 0C051308 */ jal set_hud_element_scale +/* 8D554 800F40A4 0C051308 */ jal hud_element_set_scale /* 8D558 800F40A8 0200202D */ daddu $a0, $s0, $zero -/* 8D55C 800F40AC 0C0511F8 */ jal draw_hud_element_3 +/* 8D55C 800F40AC 0C0511F8 */ jal hud_element_draw_without_clipping /* 8D560 800F40B0 0200202D */ daddu $a0, $s0, $zero /* 8D564 800F40B4 16400003 */ bnez $s2, .L800F40C4 /* 8D568 800F40B8 00000000 */ nop @@ -773,22 +773,22 @@ glabel popup_menu_draw_menu_contents /* 8D5FC 800F414C 8E10D678 */ lw $s0, %lo(D_8010D678)($s0) /* 8D600 800F4150 00431021 */ addu $v0, $v0, $v1 /* 8D604 800F4154 8C450000 */ lw $a1, ($v0) -/* 8D608 800F4158 0C0511FF */ jal set_hud_element_anim +/* 8D608 800F4158 0C0511FF */ jal hud_element_set_script /* 8D60C 800F415C 0200202D */ daddu $a0, $s0, $zero /* 8D610 800F4160 0200202D */ daddu $a0, $s0, $zero /* 8D614 800F4164 8FA50020 */ lw $a1, 0x20($sp) -/* 8D618 800F4168 0C051261 */ jal set_hud_element_render_pos +/* 8D618 800F4168 0C051261 */ jal hud_element_set_render_pos /* 8D61C 800F416C 0220302D */ daddu $a2, $s1, $zero /* 8D620 800F4170 0200202D */ daddu $a0, $s0, $zero /* 8D624 800F4174 3C058011 */ lui $a1, %hi(D_8010D650) /* 8D628 800F4178 8CA5D650 */ lw $a1, %lo(D_8010D650)($a1) -/* 8D62C 800F417C 0C0513AC */ jal set_hud_element_alpha +/* 8D62C 800F417C 0C0513AC */ jal hud_element_set_alpha /* 8D630 800F4180 2631000D */ addiu $s1, $s1, 0xd /* 8D634 800F4184 3C053EE6 */ lui $a1, 0x3ee6 /* 8D638 800F4188 34A56666 */ ori $a1, $a1, 0x6666 -/* 8D63C 800F418C 0C051308 */ jal set_hud_element_scale +/* 8D63C 800F418C 0C051308 */ jal hud_element_set_scale /* 8D640 800F4190 0200202D */ daddu $a0, $s0, $zero -/* 8D644 800F4194 0C0511F8 */ jal draw_hud_element_3 +/* 8D644 800F4194 0C0511F8 */ jal hud_element_draw_without_clipping /* 8D648 800F4198 0200202D */ daddu $a0, $s0, $zero /* 8D64C 800F419C 16400003 */ bnez $s2, .L800F41AC /* 8D650 800F41A0 00000000 */ nop @@ -836,22 +836,22 @@ glabel popup_menu_draw_menu_contents /* 8D6E4 800F4234 8E10D678 */ lw $s0, %lo(D_8010D678)($s0) /* 8D6E8 800F4238 00431021 */ addu $v0, $v0, $v1 /* 8D6EC 800F423C 8C450000 */ lw $a1, ($v0) -/* 8D6F0 800F4240 0C0511FF */ jal set_hud_element_anim +/* 8D6F0 800F4240 0C0511FF */ jal hud_element_set_script /* 8D6F4 800F4244 0200202D */ daddu $a0, $s0, $zero /* 8D6F8 800F4248 0200202D */ daddu $a0, $s0, $zero /* 8D6FC 800F424C 8FA50020 */ lw $a1, 0x20($sp) -/* 8D700 800F4250 0C051261 */ jal set_hud_element_render_pos +/* 8D700 800F4250 0C051261 */ jal hud_element_set_render_pos /* 8D704 800F4254 0220302D */ daddu $a2, $s1, $zero /* 8D708 800F4258 0200202D */ daddu $a0, $s0, $zero /* 8D70C 800F425C 3C058011 */ lui $a1, %hi(D_8010D650) /* 8D710 800F4260 8CA5D650 */ lw $a1, %lo(D_8010D650)($a1) -/* 8D714 800F4264 0C0513AC */ jal set_hud_element_alpha +/* 8D714 800F4264 0C0513AC */ jal hud_element_set_alpha /* 8D718 800F4268 2631000D */ addiu $s1, $s1, 0xd /* 8D71C 800F426C 3C053EE6 */ lui $a1, 0x3ee6 /* 8D720 800F4270 34A56666 */ ori $a1, $a1, 0x6666 -/* 8D724 800F4274 0C051308 */ jal set_hud_element_scale +/* 8D724 800F4274 0C051308 */ jal hud_element_set_scale /* 8D728 800F4278 0200202D */ daddu $a0, $s0, $zero -/* 8D72C 800F427C 0C0511F8 */ jal draw_hud_element_3 +/* 8D72C 800F427C 0C0511F8 */ jal hud_element_draw_without_clipping /* 8D730 800F4280 0200202D */ daddu $a0, $s0, $zero /* 8D734 800F4284 16400003 */ bnez $s2, .L800F4294 /* 8D738 800F4288 00000000 */ nop @@ -895,13 +895,13 @@ glabel popup_menu_draw_menu_contents /* 8D7C4 800F4314 0200202D */ daddu $a0, $s0, $zero .L800F4318: /* 8D7C8 800F4318 8FA50020 */ lw $a1, 0x20($sp) -/* 8D7CC 800F431C 0C051261 */ jal set_hud_element_render_pos +/* 8D7CC 800F431C 0C051261 */ jal hud_element_set_render_pos /* 8D7D0 800F4320 0220302D */ daddu $a2, $s1, $zero /* 8D7D4 800F4324 3C058011 */ lui $a1, %hi(D_8010D650) /* 8D7D8 800F4328 8CA5D650 */ lw $a1, %lo(D_8010D650)($a1) -/* 8D7DC 800F432C 0C0513AC */ jal set_hud_element_alpha +/* 8D7DC 800F432C 0C0513AC */ jal hud_element_set_alpha /* 8D7E0 800F4330 0200202D */ daddu $a0, $s0, $zero -/* 8D7E4 800F4334 0C0511F8 */ jal draw_hud_element_3 +/* 8D7E4 800F4334 0C0511F8 */ jal hud_element_draw_without_clipping /* 8D7E8 800F4338 0200202D */ daddu $a0, $s0, $zero /* 8D7EC 800F433C 8FAB005C */ lw $t3, 0x5c($sp) /* 8D7F0 800F4340 8FAA0060 */ lw $t2, 0x60($sp) @@ -1061,13 +1061,13 @@ glabel popup_menu_draw_menu_contents /* 8DA1C 800F456C 25450023 */ addiu $a1, $t2, 0x23 /* 8DA20 800F4570 8FAA0060 */ lw $t2, 0x60($sp) /* 8DA24 800F4574 0200202D */ daddu $a0, $s0, $zero -/* 8DA28 800F4578 0C051261 */ jal set_hud_element_render_pos +/* 8DA28 800F4578 0C051261 */ jal hud_element_set_render_pos /* 8DA2C 800F457C 2546FFFF */ addiu $a2, $t2, -1 /* 8DA30 800F4580 3C058011 */ lui $a1, %hi(D_8010D650) /* 8DA34 800F4584 8CA5D650 */ lw $a1, %lo(D_8010D650)($a1) -/* 8DA38 800F4588 0C0513AC */ jal set_hud_element_alpha +/* 8DA38 800F4588 0C0513AC */ jal hud_element_set_alpha /* 8DA3C 800F458C 0200202D */ daddu $a0, $s0, $zero -/* 8DA40 800F4590 0C0511F8 */ jal draw_hud_element_3 +/* 8DA40 800F4590 0C0511F8 */ jal hud_element_draw_without_clipping /* 8DA44 800F4594 0200202D */ daddu $a0, $s0, $zero .L800F4598: /* 8DA48 800F4598 3C028011 */ lui $v0, %hi(gPopupMenu) @@ -1094,13 +1094,13 @@ glabel popup_menu_draw_menu_contents /* 8DA9C 800F45EC 8FAB0060 */ lw $t3, 0x60($sp) /* 8DAA0 800F45F0 0200202D */ daddu $a0, $s0, $zero /* 8DAA4 800F45F4 01628821 */ addu $s1, $t3, $v0 -/* 8DAA8 800F45F8 0C051261 */ jal set_hud_element_render_pos +/* 8DAA8 800F45F8 0C051261 */ jal hud_element_set_render_pos /* 8DAAC 800F45FC 26260005 */ addiu $a2, $s1, 5 /* 8DAB0 800F4600 3C058011 */ lui $a1, %hi(D_8010D650) /* 8DAB4 800F4604 8CA5D650 */ lw $a1, %lo(D_8010D650)($a1) -/* 8DAB8 800F4608 0C0513AC */ jal set_hud_element_alpha +/* 8DAB8 800F4608 0C0513AC */ jal hud_element_set_alpha /* 8DABC 800F460C 0200202D */ daddu $a0, $s0, $zero -/* 8DAC0 800F4610 0C0511F8 */ jal draw_hud_element_3 +/* 8DAC0 800F4610 0C0511F8 */ jal hud_element_draw_without_clipping /* 8DAC4 800F4614 0200202D */ daddu $a0, $s0, $zero .L800F4618: /* 8DAC8 800F4618 8FBF0054 */ lw $ra, 0x54($sp) diff --git a/ver/us/asm/nonmatchings/C50A0/func_8013673C.s b/ver/us/asm/nonmatchings/C50A0/func_8013673C.s index f69d0e5af2..2a68adbf72 100644 --- a/ver/us/asm/nonmatchings/C50A0/func_8013673C.s +++ b/ver/us/asm/nonmatchings/C50A0/func_8013673C.s @@ -179,10 +179,10 @@ glabel func_8013673C /* CD094 80136994 3C108015 */ lui $s0, %hi(D_801568E0) /* CD098 80136998 261068E0 */ addiu $s0, $s0, %lo(D_801568E0) /* CD09C 8013699C 8E040000 */ lw $a0, ($s0) -/* CD0A0 801369A0 0C051261 */ jal set_hud_element_render_pos +/* CD0A0 801369A0 0C051261 */ jal hud_element_set_render_pos /* CD0A4 801369A4 26660014 */ addiu $a2, $s3, 0x14 /* CD0A8 801369A8 8E040000 */ lw $a0, ($s0) -/* CD0AC 801369AC 0C0511F1 */ jal draw_hud_element_2 +/* CD0AC 801369AC 0C0511F1 */ jal hud_element_draw_next /* CD0B0 801369B0 00000000 */ nop .L801369B4_CD0B4: /* CD0B4 801369B4 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s b/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s index 4de81b206f..3cb1427c71 100644 --- a/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s +++ b/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s @@ -143,17 +143,17 @@ glabel update_item_entity_temp /* CBFC0 801358C0 3C048009 */ lui $a0, %hi(gItemHudScripts) /* CBFC4 801358C4 00822021 */ addu $a0, $a0, $v0 /* CBFC8 801358C8 8C84A680 */ lw $a0, %lo(gItemHudScripts)($a0) -/* CBFCC 801358CC 0C050529 */ jal create_hud_element +/* CBFCC 801358CC 0C050529 */ jal hud_element_create /* CBFD0 801358D0 00000000 */ nop /* CBFD4 801358D4 0040202D */ daddu $a0, $v0, $zero /* CBFD8 801358D8 24050080 */ addiu $a1, $zero, 0x80 /* CBFDC 801358DC 3C108015 */ lui $s0, %hi(D_801568E0) /* CBFE0 801358E0 261068E0 */ addiu $s0, $s0, %lo(D_801568E0) -/* CBFE4 801358E4 0C051280 */ jal set_hud_element_flags +/* CBFE4 801358E4 0C051280 */ jal hud_element_set_flags /* CBFE8 801358E8 AE040000 */ sw $a0, ($s0) /* CBFEC 801358EC 2405FF9C */ addiu $a1, $zero, -0x64 /* CBFF0 801358F0 8E040000 */ lw $a0, ($s0) -/* CBFF4 801358F4 0C051261 */ jal set_hud_element_render_pos +/* CBFF4 801358F4 0C051261 */ jal hud_element_set_render_pos /* CBFF8 801358F8 00A0302D */ daddu $a2, $a1, $zero /* CBFFC 801358FC 24020002 */ addiu $v0, $zero, 2 /* CC000 80135900 3C108008 */ lui $s0, %hi(gItemTable) @@ -774,7 +774,7 @@ glabel update_item_entity_temp /* CC8D4 801361D4 8C420108 */ lw $v0, 0x108($v0) /* CC8D8 801361D8 3C108015 */ lui $s0, %hi(D_801568EC) /* CC8DC 801361DC 261068EC */ addiu $s0, $s0, %lo(D_801568EC) -/* CC8E0 801361E0 0C0511FF */ jal set_hud_element_anim +/* CC8E0 801361E0 0C0511FF */ jal hud_element_set_script /* CC8E4 801361E4 AE020000 */ sw $v0, ($s0) /* CC8E8 801361E8 8E040000 */ lw $a0, ($s0) /* CC8EC 801361EC 8E650028 */ lw $a1, 0x28($s3) @@ -872,7 +872,7 @@ glabel update_item_entity_temp /* CCA4C 8013634C 00651824 */ and $v1, $v1, $a1 /* CCA50 80136350 AC430000 */ sw $v1, ($v0) .L80136354: -/* CCA54 80136354 0C05123D */ jal free_hud_element +/* CCA54 80136354 0C05123D */ jal hud_element_free /* CCA58 80136358 00000000 */ nop /* CCA5C 8013635C 0C04CE4C */ jal remove_item_entity_by_reference /* CCA60 80136360 0220202D */ daddu $a0, $s1, $zero diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9228_425D78.s b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9228_425D78.s index 748938aec2..4f22bcae92 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9228_425D78.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9228_425D78.s @@ -26,30 +26,30 @@ dlabel L802A926C_425DBC /* 425DC8 802A9278 8E300004 */ lw $s0, 4($s1) /* 425DCC 802A927C 10400004 */ beqz $v0, .L802A9290 /* 425DD0 802A9280 0200202D */ daddu $a0, $s0, $zero -/* 425DD4 802A9284 0C05128B */ jal clear_hud_element_flags +/* 425DD4 802A9284 0C05128B */ jal hud_element_clear_flags /* 425DD8 802A9288 24050002 */ addiu $a1, $zero, 2 /* 425DDC 802A928C 0200202D */ daddu $a0, $s0, $zero .L802A9290: -/* 425DE0 802A9290 0C0513AC */ jal set_hud_element_alpha +/* 425DE0 802A9290 0C0513AC */ jal hud_element_set_alpha /* 425DE4 802A9294 240500FF */ addiu $a1, $zero, 0xff /* 425DE8 802A9298 8E300008 */ lw $s0, 8($s1) /* 425DEC 802A929C 240500FF */ addiu $a1, $zero, 0xff -/* 425DF0 802A92A0 0C0513AC */ jal set_hud_element_alpha +/* 425DF0 802A92A0 0C0513AC */ jal hud_element_set_alpha /* 425DF4 802A92A4 0200202D */ daddu $a0, $s0, $zero /* 425DF8 802A92A8 82220061 */ lb $v0, 0x61($s1) /* 425DFC 802A92AC 10400003 */ beqz $v0, .L802A92BC /* 425E00 802A92B0 0200202D */ daddu $a0, $s0, $zero -/* 425E04 802A92B4 0C05128B */ jal clear_hud_element_flags +/* 425E04 802A92B4 0C05128B */ jal hud_element_clear_flags /* 425E08 802A92B8 24050002 */ addiu $a1, $zero, 2 .L802A92BC: /* 425E0C 802A92BC 8E30000C */ lw $s0, 0xc($s1) /* 425E10 802A92C0 240500FF */ addiu $a1, $zero, 0xff -/* 425E14 802A92C4 0C0513AC */ jal set_hud_element_alpha +/* 425E14 802A92C4 0C0513AC */ jal hud_element_set_alpha /* 425E18 802A92C8 0200202D */ daddu $a0, $s0, $zero /* 425E1C 802A92CC 82220061 */ lb $v0, 0x61($s1) /* 425E20 802A92D0 10400003 */ beqz $v0, .L802A92E0 /* 425E24 802A92D4 0200202D */ daddu $a0, $s0, $zero -/* 425E28 802A92D8 0C05128B */ jal clear_hud_element_flags +/* 425E28 802A92D8 0C05128B */ jal hud_element_clear_flags /* 425E2C 802A92DC 24050002 */ addiu $a1, $zero, 2 .L802A92E0: /* 425E30 802A92E0 24020001 */ addiu $v0, $zero, 1 @@ -70,18 +70,18 @@ dlabel L802A92EC_425E3C .L802A9318: /* 425E68 802A9318 8E240004 */ lw $a0, 4($s1) /* 425E6C 802A931C 86250056 */ lh $a1, 0x56($s1) -/* 425E70 802A9320 0C051261 */ jal set_hud_element_render_pos +/* 425E70 802A9320 0C051261 */ jal hud_element_set_render_pos /* 425E74 802A9324 86260058 */ lh $a2, 0x58($s1) /* 425E78 802A9328 8E240008 */ lw $a0, 8($s1) /* 425E7C 802A932C 86260058 */ lh $a2, 0x58($s1) /* 425E80 802A9330 86250056 */ lh $a1, 0x56($s1) -/* 425E84 802A9334 0C051261 */ jal set_hud_element_render_pos +/* 425E84 802A9334 0C051261 */ jal hud_element_set_render_pos /* 425E88 802A9338 24C6001C */ addiu $a2, $a2, 0x1c /* 425E8C 802A933C 8E24000C */ lw $a0, 0xc($s1) /* 425E90 802A9340 86250056 */ lh $a1, 0x56($s1) /* 425E94 802A9344 86260058 */ lh $a2, 0x58($s1) /* 425E98 802A9348 24A5001F */ addiu $a1, $a1, 0x1f -/* 425E9C 802A934C 0C051261 */ jal set_hud_element_render_pos +/* 425E9C 802A934C 0C051261 */ jal hud_element_set_render_pos /* 425EA0 802A9350 24C6000E */ addiu $a2, $a2, 0xe /* 425EA4 802A9354 080AA531 */ j L802A94C4_426014 /* 425EA8 802A9358 00000000 */ nop @@ -98,7 +98,7 @@ dlabel L802A935C_425EAC /* 425ECC 802A937C 8E240004 */ lw $a0, 4($s1) /* 425ED0 802A9380 3C058011 */ lui $a1, %hi(HudScript_MashAButton) /* 425ED4 802A9384 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 425ED8 802A9388 0C0511FF */ jal set_hud_element_anim +/* 425ED8 802A9388 0C0511FF */ jal hud_element_set_script /* 425EDC 802A938C 00000000 */ nop /* 425EE0 802A9390 A2000081 */ sb $zero, 0x81($s0) /* 425EE4 802A9394 96230052 */ lhu $v1, 0x52($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A928C_42763C.s b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A928C_42763C.s index faf3762986..6621e08bf2 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A928C_42763C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A928C_42763C.s @@ -31,22 +31,22 @@ glabel func_802A928C_42763C /* 427688 802A92D8 24040063 */ addiu $a0, $zero, 0x63 /* 42768C 802A92DC 8E300004 */ lw $s0, 4($s1) /* 427690 802A92E0 240500FF */ addiu $a1, $zero, 0xff -/* 427694 802A92E4 0C0513AC */ jal set_hud_element_alpha +/* 427694 802A92E4 0C0513AC */ jal hud_element_set_alpha /* 427698 802A92E8 0200202D */ daddu $a0, $s0, $zero /* 42769C 802A92EC 82220061 */ lb $v0, 0x61($s1) /* 4276A0 802A92F0 10400003 */ beqz $v0, .L802A9300 /* 4276A4 802A92F4 0200202D */ daddu $a0, $s0, $zero -/* 4276A8 802A92F8 0C05128B */ jal clear_hud_element_flags +/* 4276A8 802A92F8 0C05128B */ jal hud_element_clear_flags /* 4276AC 802A92FC 24050002 */ addiu $a1, $zero, 2 .L802A9300: /* 4276B0 802A9300 8E300008 */ lw $s0, 8($s1) /* 4276B4 802A9304 240500FF */ addiu $a1, $zero, 0xff -/* 4276B8 802A9308 0C0513AC */ jal set_hud_element_alpha +/* 4276B8 802A9308 0C0513AC */ jal hud_element_set_alpha /* 4276BC 802A930C 0200202D */ daddu $a0, $s0, $zero /* 4276C0 802A9310 82220061 */ lb $v0, 0x61($s1) /* 4276C4 802A9314 10400003 */ beqz $v0, .L802A9324 /* 4276C8 802A9318 0200202D */ daddu $a0, $s0, $zero -/* 4276CC 802A931C 0C05128B */ jal clear_hud_element_flags +/* 4276CC 802A931C 0C05128B */ jal hud_element_clear_flags /* 4276D0 802A9320 24050002 */ addiu $a1, $zero, 2 .L802A9324: /* 4276D4 802A9324 24020001 */ addiu $v0, $zero, 1 @@ -67,12 +67,12 @@ glabel func_802A928C_42763C .L802A935C: /* 42770C 802A935C 8E240004 */ lw $a0, 4($s1) /* 427710 802A9360 86250056 */ lh $a1, 0x56($s1) -/* 427714 802A9364 0C051261 */ jal set_hud_element_render_pos +/* 427714 802A9364 0C051261 */ jal hud_element_set_render_pos /* 427718 802A9368 86260058 */ lh $a2, 0x58($s1) /* 42771C 802A936C 8E240008 */ lw $a0, 8($s1) /* 427720 802A9370 86260058 */ lh $a2, 0x58($s1) /* 427724 802A9374 86250056 */ lh $a1, 0x56($s1) -/* 427728 802A9378 0C051261 */ jal set_hud_element_render_pos +/* 427728 802A9378 0C051261 */ jal hud_element_set_render_pos /* 42772C 802A937C 24C6001C */ addiu $a2, $a2, 0x1c /* 427730 802A9380 080AA551 */ j .L802A9544_4278F4 /* 427734 802A9384 00000000 */ nop @@ -89,7 +89,7 @@ glabel func_802A928C_42763C /* 427758 802A93A8 8E240004 */ lw $a0, 4($s1) /* 42775C 802A93AC 3C058011 */ lui $a1, %hi(HudScript_MashAButton) /* 427760 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 427764 802A93B4 0C0511FF */ jal set_hud_element_anim +/* 427764 802A93B4 0C0511FF */ jal hud_element_set_script /* 427768 802A93B8 00000000 */ nop /* 42776C 802A93BC 96230052 */ lhu $v1, 0x52($s1) /* 427770 802A93C0 2402000B */ addiu $v0, $zero, 0xb @@ -127,10 +127,10 @@ glabel func_802A928C_42763C /* 4277E8 802A9438 A6220068 */ sh $v0, 0x68($s1) /* 4277EC 802A943C 0200202D */ daddu $a0, $s0, $zero /* 4277F0 802A9440 24A50032 */ addiu $a1, $a1, 0x32 -/* 4277F4 802A9444 0C051261 */ jal set_hud_element_render_pos +/* 4277F4 802A9444 0C051261 */ jal hud_element_set_render_pos /* 4277F8 802A9448 24C6001C */ addiu $a2, $a2, 0x1c /* 4277FC 802A944C 0200202D */ daddu $a0, $s0, $zero -/* 427800 802A9450 0C05128B */ jal clear_hud_element_flags +/* 427800 802A9450 0C05128B */ jal hud_element_clear_flags /* 427804 802A9454 24050002 */ addiu $a1, $zero, 2 /* 427808 802A9458 3C0451EB */ lui $a0, 0x51eb .L802A945C: diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s index 456f1dc570..3f3db79d85 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s @@ -25,22 +25,22 @@ dlabel L802A92C0_428D30 /* 428D34 802A92C4 24040063 */ addiu $a0, $zero, 0x63 /* 428D38 802A92C8 8E300004 */ lw $s0, 4($s1) /* 428D3C 802A92CC 240500FF */ addiu $a1, $zero, 0xff -/* 428D40 802A92D0 0C0513AC */ jal set_hud_element_alpha +/* 428D40 802A92D0 0C0513AC */ jal hud_element_set_alpha /* 428D44 802A92D4 0200202D */ daddu $a0, $s0, $zero /* 428D48 802A92D8 82220061 */ lb $v0, 0x61($s1) /* 428D4C 802A92DC 10400003 */ beqz $v0, .L802A92EC /* 428D50 802A92E0 0200202D */ daddu $a0, $s0, $zero -/* 428D54 802A92E4 0C05128B */ jal clear_hud_element_flags +/* 428D54 802A92E4 0C05128B */ jal hud_element_clear_flags /* 428D58 802A92E8 24050002 */ addiu $a1, $zero, 2 .L802A92EC: /* 428D5C 802A92EC 8E300008 */ lw $s0, 8($s1) /* 428D60 802A92F0 240500FF */ addiu $a1, $zero, 0xff -/* 428D64 802A92F4 0C0513AC */ jal set_hud_element_alpha +/* 428D64 802A92F4 0C0513AC */ jal hud_element_set_alpha /* 428D68 802A92F8 0200202D */ daddu $a0, $s0, $zero /* 428D6C 802A92FC 82220061 */ lb $v0, 0x61($s1) /* 428D70 802A9300 10400003 */ beqz $v0, .L802A9310 /* 428D74 802A9304 0200202D */ daddu $a0, $s0, $zero -/* 428D78 802A9308 0C05128B */ jal clear_hud_element_flags +/* 428D78 802A9308 0C05128B */ jal hud_element_clear_flags /* 428D7C 802A930C 24050002 */ addiu $a1, $zero, 2 .L802A9310: /* 428D80 802A9310 24020001 */ addiu $v0, $zero, 1 @@ -68,12 +68,12 @@ dlabel L802A931C_428D8C .L802A9360: /* 428DD0 802A9360 8E240004 */ lw $a0, 4($s1) /* 428DD4 802A9364 86250056 */ lh $a1, 0x56($s1) -/* 428DD8 802A9368 0C051261 */ jal set_hud_element_render_pos +/* 428DD8 802A9368 0C051261 */ jal hud_element_set_render_pos /* 428DDC 802A936C 86260058 */ lh $a2, 0x58($s1) /* 428DE0 802A9370 8E240008 */ lw $a0, 8($s1) /* 428DE4 802A9374 86260058 */ lh $a2, 0x58($s1) /* 428DE8 802A9378 86250056 */ lh $a1, 0x56($s1) -/* 428DEC 802A937C 0C051261 */ jal set_hud_element_render_pos +/* 428DEC 802A937C 0C051261 */ jal hud_element_set_render_pos /* 428DF0 802A9380 24C6001C */ addiu $a2, $a2, 0x1c /* 428DF4 802A9384 080AA5B5 */ j L802A96D4_429144 /* 428DF8 802A9388 00000000 */ nop @@ -90,7 +90,7 @@ dlabel L802A938C_428DFC /* 428E1C 802A93AC 8E240004 */ lw $a0, 4($s1) /* 428E20 802A93B0 3C058011 */ lui $a1, %hi(HudScript_MashAButton) /* 428E24 802A93B4 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 428E28 802A93B8 0C0511FF */ jal set_hud_element_anim +/* 428E28 802A93B8 0C0511FF */ jal hud_element_set_script /* 428E2C 802A93BC 00000000 */ nop /* 428E30 802A93C0 3C048000 */ lui $a0, 0x8000 /* 428E34 802A93C4 34840041 */ ori $a0, $a0, 0x41 @@ -213,10 +213,10 @@ dlabel L802A93F4_428E64 /* 428FE4 802A9574 A6220068 */ sh $v0, 0x68($s1) /* 428FE8 802A9578 0200202D */ daddu $a0, $s0, $zero /* 428FEC 802A957C 24A50032 */ addiu $a1, $a1, 0x32 -/* 428FF0 802A9580 0C051261 */ jal set_hud_element_render_pos +/* 428FF0 802A9580 0C051261 */ jal hud_element_set_render_pos /* 428FF4 802A9584 24C6001C */ addiu $a2, $a2, 0x1c /* 428FF8 802A9588 0200202D */ daddu $a0, $s0, $zero -/* 428FFC 802A958C 0C05128B */ jal clear_hud_element_flags +/* 428FFC 802A958C 0C05128B */ jal hud_element_clear_flags /* 429000 802A9590 24050002 */ addiu $a1, $zero, 2 /* 429004 802A9594 3C0451EB */ lui $a0, 0x51eb .L802A9598: diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9294_4295B4.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9294_4295B4.s index c0035479a3..588b4f2d47 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9294_4295B4.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9294_4295B4.s @@ -27,22 +27,22 @@ dlabel L802A92E4_429604 /* 429608 802A92E8 24040063 */ addiu $a0, $zero, 0x63 /* 42960C 802A92EC 8E300004 */ lw $s0, 4($s1) /* 429610 802A92F0 240500FF */ addiu $a1, $zero, 0xff -/* 429614 802A92F4 0C0513AC */ jal set_hud_element_alpha +/* 429614 802A92F4 0C0513AC */ jal hud_element_set_alpha /* 429618 802A92F8 0200202D */ daddu $a0, $s0, $zero /* 42961C 802A92FC 82220061 */ lb $v0, 0x61($s1) /* 429620 802A9300 10400003 */ beqz $v0, .L802A9310 /* 429624 802A9304 0200202D */ daddu $a0, $s0, $zero -/* 429628 802A9308 0C05128B */ jal clear_hud_element_flags +/* 429628 802A9308 0C05128B */ jal hud_element_clear_flags /* 42962C 802A930C 24050002 */ addiu $a1, $zero, 2 .L802A9310: /* 429630 802A9310 8E300008 */ lw $s0, 8($s1) /* 429634 802A9314 240500FF */ addiu $a1, $zero, 0xff -/* 429638 802A9318 0C0513AC */ jal set_hud_element_alpha +/* 429638 802A9318 0C0513AC */ jal hud_element_set_alpha /* 42963C 802A931C 0200202D */ daddu $a0, $s0, $zero /* 429640 802A9320 82220061 */ lb $v0, 0x61($s1) /* 429644 802A9324 10400003 */ beqz $v0, .L802A9334 /* 429648 802A9328 0200202D */ daddu $a0, $s0, $zero -/* 42964C 802A932C 0C05128B */ jal clear_hud_element_flags +/* 42964C 802A932C 0C05128B */ jal hud_element_clear_flags /* 429650 802A9330 24050002 */ addiu $a1, $zero, 2 .L802A9334: /* 429654 802A9334 24020001 */ addiu $v0, $zero, 1 @@ -70,12 +70,12 @@ dlabel L802A9340_429660 .L802A9384: /* 4296A4 802A9384 8E240004 */ lw $a0, 4($s1) /* 4296A8 802A9388 86250056 */ lh $a1, 0x56($s1) -/* 4296AC 802A938C 0C051261 */ jal set_hud_element_render_pos +/* 4296AC 802A938C 0C051261 */ jal hud_element_set_render_pos /* 4296B0 802A9390 86260058 */ lh $a2, 0x58($s1) /* 4296B4 802A9394 8E240008 */ lw $a0, 8($s1) /* 4296B8 802A9398 86260058 */ lh $a2, 0x58($s1) /* 4296BC 802A939C 86250056 */ lh $a1, 0x56($s1) -/* 4296C0 802A93A0 0C051261 */ jal set_hud_element_render_pos +/* 4296C0 802A93A0 0C051261 */ jal hud_element_set_render_pos /* 4296C4 802A93A4 24C6001C */ addiu $a2, $a2, 0x1c /* 4296C8 802A93A8 080AA60C */ j L802A9830_429B50 /* 4296CC 802A93AC 00000000 */ nop @@ -92,7 +92,7 @@ dlabel L802A93B0_4296D0 /* 4296F0 802A93D0 8E240004 */ lw $a0, 4($s1) /* 4296F4 802A93D4 3C058011 */ lui $a1, %hi(HudScript_StickMashLeft) /* 4296F8 802A93D8 24A58F30 */ addiu $a1, $a1, %lo(HudScript_StickMashLeft) -/* 4296FC 802A93DC 0C0511FF */ jal set_hud_element_anim +/* 4296FC 802A93DC 0C0511FF */ jal hud_element_set_script /* 429700 802A93E0 00000000 */ nop /* 429704 802A93E4 3C048000 */ lui $a0, 0x8000 /* 429708 802A93E8 34840041 */ ori $a0, $a0, 0x41 @@ -230,10 +230,10 @@ dlabel L802A9418_429738 /* 4298F8 802A95D8 A6220068 */ sh $v0, 0x68($s1) /* 4298FC 802A95DC 0200202D */ daddu $a0, $s0, $zero /* 429900 802A95E0 24A50032 */ addiu $a1, $a1, 0x32 -/* 429904 802A95E4 0C051261 */ jal set_hud_element_render_pos +/* 429904 802A95E4 0C051261 */ jal hud_element_set_render_pos /* 429908 802A95E8 24C6001C */ addiu $a2, $a2, 0x1c /* 42990C 802A95EC 0200202D */ daddu $a0, $s0, $zero -/* 429910 802A95F0 0C05128B */ jal clear_hud_element_flags +/* 429910 802A95F0 0C05128B */ jal hud_element_clear_flags /* 429914 802A95F4 24050002 */ addiu $a1, $zero, 2 /* 429918 802A95F8 3C0451EB */ lui $a0, 0x51eb .L802A95FC: diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s index 085900cac6..f7e6f503cc 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s @@ -24,42 +24,42 @@ dlabel L802A9318_4285F8 /* 4285FC 802A931C 24040063 */ addiu $a0, $zero, 0x63 /* 428600 802A9320 8E300004 */ lw $s0, 4($s1) /* 428604 802A9324 240500FF */ addiu $a1, $zero, 0xff -/* 428608 802A9328 0C0513AC */ jal set_hud_element_alpha +/* 428608 802A9328 0C0513AC */ jal hud_element_set_alpha /* 42860C 802A932C 0200202D */ daddu $a0, $s0, $zero /* 428610 802A9330 82220061 */ lb $v0, 0x61($s1) /* 428614 802A9334 10400003 */ beqz $v0, .L802A9344 /* 428618 802A9338 0200202D */ daddu $a0, $s0, $zero -/* 42861C 802A933C 0C05128B */ jal clear_hud_element_flags +/* 42861C 802A933C 0C05128B */ jal hud_element_clear_flags /* 428620 802A9340 24050002 */ addiu $a1, $zero, 2 .L802A9344: /* 428624 802A9344 8E300008 */ lw $s0, 8($s1) /* 428628 802A9348 240500FF */ addiu $a1, $zero, 0xff -/* 42862C 802A934C 0C0513AC */ jal set_hud_element_alpha +/* 42862C 802A934C 0C0513AC */ jal hud_element_set_alpha /* 428630 802A9350 0200202D */ daddu $a0, $s0, $zero /* 428634 802A9354 82220061 */ lb $v0, 0x61($s1) /* 428638 802A9358 10400003 */ beqz $v0, .L802A9368 /* 42863C 802A935C 0200202D */ daddu $a0, $s0, $zero -/* 428640 802A9360 0C05128B */ jal clear_hud_element_flags +/* 428640 802A9360 0C05128B */ jal hud_element_clear_flags /* 428644 802A9364 24050002 */ addiu $a1, $zero, 2 .L802A9368: /* 428648 802A9368 8E30000C */ lw $s0, 0xc($s1) /* 42864C 802A936C 240500FF */ addiu $a1, $zero, 0xff -/* 428650 802A9370 0C0513AC */ jal set_hud_element_alpha +/* 428650 802A9370 0C0513AC */ jal hud_element_set_alpha /* 428654 802A9374 0200202D */ daddu $a0, $s0, $zero /* 428658 802A9378 82220061 */ lb $v0, 0x61($s1) /* 42865C 802A937C 10400003 */ beqz $v0, .L802A938C /* 428660 802A9380 0200202D */ daddu $a0, $s0, $zero -/* 428664 802A9384 0C05128B */ jal clear_hud_element_flags +/* 428664 802A9384 0C05128B */ jal hud_element_clear_flags /* 428668 802A9388 24050002 */ addiu $a1, $zero, 2 .L802A938C: /* 42866C 802A938C 8E300010 */ lw $s0, 0x10($s1) /* 428670 802A9390 240500FF */ addiu $a1, $zero, 0xff -/* 428674 802A9394 0C0513AC */ jal set_hud_element_alpha +/* 428674 802A9394 0C0513AC */ jal hud_element_set_alpha /* 428678 802A9398 0200202D */ daddu $a0, $s0, $zero /* 42867C 802A939C 82220061 */ lb $v0, 0x61($s1) /* 428680 802A93A0 10400003 */ beqz $v0, .L802A93B0 /* 428684 802A93A4 0200202D */ daddu $a0, $s0, $zero -/* 428688 802A93A8 0C05128B */ jal clear_hud_element_flags +/* 428688 802A93A8 0C05128B */ jal hud_element_clear_flags /* 42868C 802A93AC 24050002 */ addiu $a1, $zero, 2 .L802A93B0: /* 428690 802A93B0 24020001 */ addiu $v0, $zero, 1 @@ -80,24 +80,24 @@ dlabel L802A93BC_42869C .L802A93E8: /* 4286C8 802A93E8 8E240004 */ lw $a0, 4($s1) /* 4286CC 802A93EC 86250056 */ lh $a1, 0x56($s1) -/* 4286D0 802A93F0 0C051261 */ jal set_hud_element_render_pos +/* 4286D0 802A93F0 0C051261 */ jal hud_element_set_render_pos /* 4286D4 802A93F4 86260058 */ lh $a2, 0x58($s1) /* 4286D8 802A93F8 8E240008 */ lw $a0, 8($s1) /* 4286DC 802A93FC 86260058 */ lh $a2, 0x58($s1) /* 4286E0 802A9400 86250056 */ lh $a1, 0x56($s1) -/* 4286E4 802A9404 0C051261 */ jal set_hud_element_render_pos +/* 4286E4 802A9404 0C051261 */ jal hud_element_set_render_pos /* 4286E8 802A9408 24C6001C */ addiu $a2, $a2, 0x1c /* 4286EC 802A940C 8E24000C */ lw $a0, 0xc($s1) /* 4286F0 802A9410 86250056 */ lh $a1, 0x56($s1) /* 4286F4 802A9414 86260058 */ lh $a2, 0x58($s1) /* 4286F8 802A9418 24A50029 */ addiu $a1, $a1, 0x29 -/* 4286FC 802A941C 0C051261 */ jal set_hud_element_render_pos +/* 4286FC 802A941C 0C051261 */ jal hud_element_set_render_pos /* 428700 802A9420 24C60016 */ addiu $a2, $a2, 0x16 /* 428704 802A9424 8E240010 */ lw $a0, 0x10($s1) /* 428708 802A9428 86250056 */ lh $a1, 0x56($s1) /* 42870C 802A942C 86260058 */ lh $a2, 0x58($s1) /* 428710 802A9430 24A5002A */ addiu $a1, $a1, 0x2a -/* 428714 802A9434 0C051261 */ jal set_hud_element_render_pos +/* 428714 802A9434 0C051261 */ jal hud_element_set_render_pos /* 428718 802A9438 24C60018 */ addiu $a2, $a2, 0x18 /* 42871C 802A943C 080AA594 */ j L802A9650_428930 /* 428720 802A9440 00000000 */ nop @@ -114,7 +114,7 @@ dlabel L802A9444_428724 /* 428744 802A9464 8E240004 */ lw $a0, 4($s1) /* 428748 802A9468 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) /* 42874C 802A946C 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) -/* 428750 802A9470 0C0511FF */ jal set_hud_element_anim +/* 428750 802A9470 0C0511FF */ jal hud_element_set_script /* 428754 802A9474 00000000 */ nop /* 428758 802A9478 3C048000 */ lui $a0, 0x8000 /* 42875C 802A947C 34840041 */ ori $a0, $a0, 0x41 @@ -150,12 +150,12 @@ dlabel L802A94A8_428788 /* 4287CC 802A94EC 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) /* 4287D0 802A94F0 8E24000C */ lw $a0, 0xc($s1) /* 4287D4 802A94F4 24022710 */ addiu $v0, $zero, 0x2710 -/* 4287D8 802A94F8 0C0511FF */ jal set_hud_element_anim +/* 4287D8 802A94F8 0C0511FF */ jal hud_element_set_script /* 4287DC 802A94FC A6220044 */ sh $v0, 0x44($s1) /* 4287E0 802A9500 8E240004 */ lw $a0, 4($s1) /* 4287E4 802A9504 3C058011 */ lui $a1, %hi(HudScript_AButton) /* 4287E8 802A9508 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) -/* 4287EC 802A950C 0C0511FF */ jal set_hud_element_anim +/* 4287EC 802A950C 0C0511FF */ jal hud_element_set_script /* 4287F0 802A9510 00000000 */ nop /* 4287F4 802A9514 86220068 */ lh $v0, 0x68($s1) /* 4287F8 802A9518 14400006 */ bnez $v0, .L802A9534 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s index 315be05f53..3c5ae7ef37 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s @@ -24,42 +24,42 @@ dlabel L802A9320_423710 /* 423714 802A9324 24040063 */ addiu $a0, $zero, 0x63 /* 423718 802A9328 8E300004 */ lw $s0, 4($s1) /* 42371C 802A932C 240500FF */ addiu $a1, $zero, 0xff -/* 423720 802A9330 0C0513AC */ jal set_hud_element_alpha +/* 423720 802A9330 0C0513AC */ jal hud_element_set_alpha /* 423724 802A9334 0200202D */ daddu $a0, $s0, $zero /* 423728 802A9338 82220061 */ lb $v0, 0x61($s1) /* 42372C 802A933C 10400003 */ beqz $v0, .L802A934C /* 423730 802A9340 0200202D */ daddu $a0, $s0, $zero -/* 423734 802A9344 0C05128B */ jal clear_hud_element_flags +/* 423734 802A9344 0C05128B */ jal hud_element_clear_flags /* 423738 802A9348 24050002 */ addiu $a1, $zero, 2 .L802A934C: /* 42373C 802A934C 8E300008 */ lw $s0, 8($s1) /* 423740 802A9350 240500FF */ addiu $a1, $zero, 0xff -/* 423744 802A9354 0C0513AC */ jal set_hud_element_alpha +/* 423744 802A9354 0C0513AC */ jal hud_element_set_alpha /* 423748 802A9358 0200202D */ daddu $a0, $s0, $zero /* 42374C 802A935C 82220061 */ lb $v0, 0x61($s1) /* 423750 802A9360 10400003 */ beqz $v0, .L802A9370 /* 423754 802A9364 0200202D */ daddu $a0, $s0, $zero -/* 423758 802A9368 0C05128B */ jal clear_hud_element_flags +/* 423758 802A9368 0C05128B */ jal hud_element_clear_flags /* 42375C 802A936C 24050002 */ addiu $a1, $zero, 2 .L802A9370: /* 423760 802A9370 8E30000C */ lw $s0, 0xc($s1) /* 423764 802A9374 240500FF */ addiu $a1, $zero, 0xff -/* 423768 802A9378 0C0513AC */ jal set_hud_element_alpha +/* 423768 802A9378 0C0513AC */ jal hud_element_set_alpha /* 42376C 802A937C 0200202D */ daddu $a0, $s0, $zero /* 423770 802A9380 82220061 */ lb $v0, 0x61($s1) /* 423774 802A9384 10400003 */ beqz $v0, .L802A9394 /* 423778 802A9388 0200202D */ daddu $a0, $s0, $zero -/* 42377C 802A938C 0C05128B */ jal clear_hud_element_flags +/* 42377C 802A938C 0C05128B */ jal hud_element_clear_flags /* 423780 802A9390 24050002 */ addiu $a1, $zero, 2 .L802A9394: /* 423784 802A9394 8E300010 */ lw $s0, 0x10($s1) /* 423788 802A9398 240500FF */ addiu $a1, $zero, 0xff -/* 42378C 802A939C 0C0513AC */ jal set_hud_element_alpha +/* 42378C 802A939C 0C0513AC */ jal hud_element_set_alpha /* 423790 802A93A0 0200202D */ daddu $a0, $s0, $zero /* 423794 802A93A4 82220061 */ lb $v0, 0x61($s1) /* 423798 802A93A8 10400003 */ beqz $v0, .L802A93B8 /* 42379C 802A93AC 0200202D */ daddu $a0, $s0, $zero -/* 4237A0 802A93B0 0C05128B */ jal clear_hud_element_flags +/* 4237A0 802A93B0 0C05128B */ jal hud_element_clear_flags /* 4237A4 802A93B4 24050002 */ addiu $a1, $zero, 2 .L802A93B8: /* 4237A8 802A93B8 24020001 */ addiu $v0, $zero, 1 @@ -80,24 +80,24 @@ dlabel L802A93C4_4237B4 .L802A93F0: /* 4237E0 802A93F0 8E240004 */ lw $a0, 4($s1) /* 4237E4 802A93F4 86250056 */ lh $a1, 0x56($s1) -/* 4237E8 802A93F8 0C051261 */ jal set_hud_element_render_pos +/* 4237E8 802A93F8 0C051261 */ jal hud_element_set_render_pos /* 4237EC 802A93FC 86260058 */ lh $a2, 0x58($s1) /* 4237F0 802A9400 8E240008 */ lw $a0, 8($s1) /* 4237F4 802A9404 86260058 */ lh $a2, 0x58($s1) /* 4237F8 802A9408 86250056 */ lh $a1, 0x56($s1) -/* 4237FC 802A940C 0C051261 */ jal set_hud_element_render_pos +/* 4237FC 802A940C 0C051261 */ jal hud_element_set_render_pos /* 423800 802A9410 24C6001C */ addiu $a2, $a2, 0x1c /* 423804 802A9414 8E24000C */ lw $a0, 0xc($s1) /* 423808 802A9418 86250056 */ lh $a1, 0x56($s1) /* 42380C 802A941C 86260058 */ lh $a2, 0x58($s1) /* 423810 802A9420 24A5001F */ addiu $a1, $a1, 0x1f -/* 423814 802A9424 0C051261 */ jal set_hud_element_render_pos +/* 423814 802A9424 0C051261 */ jal hud_element_set_render_pos /* 423818 802A9428 24C6FFFF */ addiu $a2, $a2, -1 /* 42381C 802A942C 8E240010 */ lw $a0, 0x10($s1) /* 423820 802A9430 86250056 */ lh $a1, 0x56($s1) /* 423824 802A9434 86260058 */ lh $a2, 0x58($s1) /* 423828 802A9438 24A5001F */ addiu $a1, $a1, 0x1f -/* 42382C 802A943C 0C051261 */ jal set_hud_element_render_pos +/* 42382C 802A943C 0C051261 */ jal hud_element_set_render_pos /* 423830 802A9440 24C60011 */ addiu $a2, $a2, 0x11 /* 423834 802A9444 080AA5A9 */ j L802A96A4_423A94 /* 423838 802A9448 00000000 */ nop @@ -114,7 +114,7 @@ dlabel L802A944C_42383C /* 42385C 802A946C 8E240004 */ lw $a0, 4($s1) /* 423860 802A9470 3C058011 */ lui $a1, %hi(HudScript_MashAButton) /* 423864 802A9474 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 423868 802A9478 0C0511FF */ jal set_hud_element_anim +/* 423868 802A9478 0C0511FF */ jal hud_element_set_script /* 42386C 802A947C 00000000 */ nop /* 423870 802A9480 96230052 */ lhu $v1, 0x52($s1) /* 423874 802A9484 2402000B */ addiu $v0, $zero, 0xb diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s index ba6e46ac7c..6a3d38673a 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s @@ -25,22 +25,22 @@ dlabel L802A92D4_426444 /* 426448 802A92D8 24040063 */ addiu $a0, $zero, 0x63 /* 42644C 802A92DC 8E300004 */ lw $s0, 4($s1) /* 426450 802A92E0 240500FF */ addiu $a1, $zero, 0xff -/* 426454 802A92E4 0C0513AC */ jal set_hud_element_alpha +/* 426454 802A92E4 0C0513AC */ jal hud_element_set_alpha /* 426458 802A92E8 0200202D */ daddu $a0, $s0, $zero /* 42645C 802A92EC 82220061 */ lb $v0, 0x61($s1) /* 426460 802A92F0 10400003 */ beqz $v0, .L802A9300 /* 426464 802A92F4 0200202D */ daddu $a0, $s0, $zero -/* 426468 802A92F8 0C05128B */ jal clear_hud_element_flags +/* 426468 802A92F8 0C05128B */ jal hud_element_clear_flags /* 42646C 802A92FC 24050002 */ addiu $a1, $zero, 2 .L802A9300: /* 426470 802A9300 8E300008 */ lw $s0, 8($s1) /* 426474 802A9304 240500FF */ addiu $a1, $zero, 0xff -/* 426478 802A9308 0C0513AC */ jal set_hud_element_alpha +/* 426478 802A9308 0C0513AC */ jal hud_element_set_alpha /* 42647C 802A930C 0200202D */ daddu $a0, $s0, $zero /* 426480 802A9310 82220061 */ lb $v0, 0x61($s1) /* 426484 802A9314 10400003 */ beqz $v0, .L802A9324 /* 426488 802A9318 0200202D */ daddu $a0, $s0, $zero -/* 42648C 802A931C 0C05128B */ jal clear_hud_element_flags +/* 42648C 802A931C 0C05128B */ jal hud_element_clear_flags /* 426490 802A9320 24050002 */ addiu $a1, $zero, 2 .L802A9324: /* 426494 802A9324 24020001 */ addiu $v0, $zero, 1 @@ -61,12 +61,12 @@ dlabel L802A9330_4264A0 .L802A935C: /* 4264CC 802A935C 8E240004 */ lw $a0, 4($s1) /* 4264D0 802A9360 86250056 */ lh $a1, 0x56($s1) -/* 4264D4 802A9364 0C051261 */ jal set_hud_element_render_pos +/* 4264D4 802A9364 0C051261 */ jal hud_element_set_render_pos /* 4264D8 802A9368 86260058 */ lh $a2, 0x58($s1) /* 4264DC 802A936C 8E240008 */ lw $a0, 8($s1) /* 4264E0 802A9370 86260058 */ lh $a2, 0x58($s1) /* 4264E4 802A9374 86250056 */ lh $a1, 0x56($s1) -/* 4264E8 802A9378 0C051261 */ jal set_hud_element_render_pos +/* 4264E8 802A9378 0C051261 */ jal hud_element_set_render_pos /* 4264EC 802A937C 24C6001C */ addiu $a2, $a2, 0x1c /* 4264F0 802A9380 080AA5B1 */ j L802A96C4_426834 /* 4264F4 802A9384 00000000 */ nop @@ -83,7 +83,7 @@ dlabel L802A9388_4264F8 /* 426518 802A93A8 8E240004 */ lw $a0, 4($s1) /* 42651C 802A93AC 3C058011 */ lui $a1, %hi(HudScript_MashAButton) /* 426520 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 426524 802A93B4 0C0511FF */ jal set_hud_element_anim +/* 426524 802A93B4 0C0511FF */ jal hud_element_set_script /* 426528 802A93B8 00000000 */ nop /* 42652C 802A93BC 3C048000 */ lui $a0, 0x8000 /* 426530 802A93C0 34840041 */ ori $a0, $a0, 0x41 @@ -201,10 +201,10 @@ dlabel L802A93E8_426558 /* 4266CC 802A955C A6220068 */ sh $v0, 0x68($s1) /* 4266D0 802A9560 0200202D */ daddu $a0, $s0, $zero /* 4266D4 802A9564 24A50032 */ addiu $a1, $a1, 0x32 -/* 4266D8 802A9568 0C051261 */ jal set_hud_element_render_pos +/* 4266D8 802A9568 0C051261 */ jal hud_element_set_render_pos /* 4266DC 802A956C 24C6001C */ addiu $a2, $a2, 0x1c /* 4266E0 802A9570 0200202D */ daddu $a0, $s0, $zero -/* 4266E4 802A9574 0C05128B */ jal clear_hud_element_flags +/* 4266E4 802A9574 0C05128B */ jal hud_element_clear_flags /* 4266E8 802A9578 24050002 */ addiu $a1, $zero, 2 /* 4266EC 802A957C 3C1051EB */ lui $s0, 0x51eb .L802A9580: diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s index 9f90d59e61..a3d3e3abe5 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s @@ -27,22 +27,22 @@ dlabel L802A92E4_426CB4 /* 426CB8 802A92E8 24040063 */ addiu $a0, $zero, 0x63 /* 426CBC 802A92EC 8E300004 */ lw $s0, 4($s1) /* 426CC0 802A92F0 240500FF */ addiu $a1, $zero, 0xff -/* 426CC4 802A92F4 0C0513AC */ jal set_hud_element_alpha +/* 426CC4 802A92F4 0C0513AC */ jal hud_element_set_alpha /* 426CC8 802A92F8 0200202D */ daddu $a0, $s0, $zero /* 426CCC 802A92FC 82220061 */ lb $v0, 0x61($s1) /* 426CD0 802A9300 10400003 */ beqz $v0, .L802A9310 /* 426CD4 802A9304 0200202D */ daddu $a0, $s0, $zero -/* 426CD8 802A9308 0C05128B */ jal clear_hud_element_flags +/* 426CD8 802A9308 0C05128B */ jal hud_element_clear_flags /* 426CDC 802A930C 24050002 */ addiu $a1, $zero, 2 .L802A9310: /* 426CE0 802A9310 8E300008 */ lw $s0, 8($s1) /* 426CE4 802A9314 240500FF */ addiu $a1, $zero, 0xff -/* 426CE8 802A9318 0C0513AC */ jal set_hud_element_alpha +/* 426CE8 802A9318 0C0513AC */ jal hud_element_set_alpha /* 426CEC 802A931C 0200202D */ daddu $a0, $s0, $zero /* 426CF0 802A9320 82220061 */ lb $v0, 0x61($s1) /* 426CF4 802A9324 10400003 */ beqz $v0, .L802A9334 /* 426CF8 802A9328 0200202D */ daddu $a0, $s0, $zero -/* 426CFC 802A932C 0C05128B */ jal clear_hud_element_flags +/* 426CFC 802A932C 0C05128B */ jal hud_element_clear_flags /* 426D00 802A9330 24050002 */ addiu $a1, $zero, 2 .L802A9334: /* 426D04 802A9334 24020001 */ addiu $v0, $zero, 1 @@ -63,12 +63,12 @@ dlabel L802A9340_426D10 .L802A936C: /* 426D3C 802A936C 8E240004 */ lw $a0, 4($s1) /* 426D40 802A9370 86250056 */ lh $a1, 0x56($s1) -/* 426D44 802A9374 0C051261 */ jal set_hud_element_render_pos +/* 426D44 802A9374 0C051261 */ jal hud_element_set_render_pos /* 426D48 802A9378 86260058 */ lh $a2, 0x58($s1) /* 426D4C 802A937C 8E240008 */ lw $a0, 8($s1) /* 426D50 802A9380 86260058 */ lh $a2, 0x58($s1) /* 426D54 802A9384 86250056 */ lh $a1, 0x56($s1) -/* 426D58 802A9388 0C051261 */ jal set_hud_element_render_pos +/* 426D58 802A9388 0C051261 */ jal hud_element_set_render_pos /* 426D5C 802A938C 24C6001C */ addiu $a2, $a2, 0x1c /* 426D60 802A9390 080AA606 */ j L802A9818_4271E8 /* 426D64 802A9394 00000000 */ nop @@ -85,7 +85,7 @@ dlabel L802A9398_426D68 /* 426D88 802A93B8 8E240004 */ lw $a0, 4($s1) /* 426D8C 802A93BC 3C058011 */ lui $a1, %hi(HudScript_StickMashLeft) /* 426D90 802A93C0 24A58F30 */ addiu $a1, $a1, %lo(HudScript_StickMashLeft) -/* 426D94 802A93C4 0C0511FF */ jal set_hud_element_anim +/* 426D94 802A93C4 0C0511FF */ jal hud_element_set_script /* 426D98 802A93C8 00000000 */ nop /* 426D9C 802A93CC 3C048000 */ lui $a0, 0x8000 /* 426DA0 802A93D0 34840041 */ ori $a0, $a0, 0x41 @@ -223,10 +223,10 @@ dlabel L802A9400_426DD0 /* 426F90 802A95C0 A6220068 */ sh $v0, 0x68($s1) /* 426F94 802A95C4 0200202D */ daddu $a0, $s0, $zero /* 426F98 802A95C8 24A50032 */ addiu $a1, $a1, 0x32 -/* 426F9C 802A95CC 0C051261 */ jal set_hud_element_render_pos +/* 426F9C 802A95CC 0C051261 */ jal hud_element_set_render_pos /* 426FA0 802A95D0 24C6001C */ addiu $a2, $a2, 0x1c /* 426FA4 802A95D4 0200202D */ daddu $a0, $s0, $zero -/* 426FA8 802A95D8 0C05128B */ jal clear_hud_element_flags +/* 426FA8 802A95D8 0C05128B */ jal hud_element_clear_flags /* 426FAC 802A95DC 24050002 */ addiu $a1, $zero, 2 /* 426FB0 802A95E0 3C0451EB */ lui $a0, 0x51eb .L802A95E4: diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s b/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s index e8ee4bcbe3..50024b3d9a 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s @@ -29,61 +29,61 @@ dlabel L802A93BC_4223BC /* 4223C8 802A93C8 8E300004 */ lw $s0, 4($s1) /* 4223CC 802A93CC 10400003 */ beqz $v0, .L802A93DC /* 4223D0 802A93D0 0200202D */ daddu $a0, $s0, $zero -/* 4223D4 802A93D4 0C05128B */ jal clear_hud_element_flags +/* 4223D4 802A93D4 0C05128B */ jal hud_element_clear_flags /* 4223D8 802A93D8 24050002 */ addiu $a1, $zero, 2 .L802A93DC: /* 4223DC 802A93DC 0200202D */ daddu $a0, $s0, $zero -/* 4223E0 802A93E0 0C0513AC */ jal set_hud_element_alpha +/* 4223E0 802A93E0 0C0513AC */ jal hud_element_set_alpha /* 4223E4 802A93E4 240500FF */ addiu $a1, $zero, 0xff /* 4223E8 802A93E8 82220061 */ lb $v0, 0x61($s1) /* 4223EC 802A93EC 8E300008 */ lw $s0, 8($s1) /* 4223F0 802A93F0 10400003 */ beqz $v0, .L802A9400 /* 4223F4 802A93F4 0200202D */ daddu $a0, $s0, $zero -/* 4223F8 802A93F8 0C05128B */ jal clear_hud_element_flags +/* 4223F8 802A93F8 0C05128B */ jal hud_element_clear_flags /* 4223FC 802A93FC 24050002 */ addiu $a1, $zero, 2 .L802A9400: /* 422400 802A9400 0200202D */ daddu $a0, $s0, $zero -/* 422404 802A9404 0C0513AC */ jal set_hud_element_alpha +/* 422404 802A9404 0C0513AC */ jal hud_element_set_alpha /* 422408 802A9408 240500FF */ addiu $a1, $zero, 0xff /* 42240C 802A940C 82220061 */ lb $v0, 0x61($s1) /* 422410 802A9410 8E30000C */ lw $s0, 0xc($s1) /* 422414 802A9414 10400003 */ beqz $v0, .L802A9424 /* 422418 802A9418 0200202D */ daddu $a0, $s0, $zero -/* 42241C 802A941C 0C05128B */ jal clear_hud_element_flags +/* 42241C 802A941C 0C05128B */ jal hud_element_clear_flags /* 422420 802A9420 24050002 */ addiu $a1, $zero, 2 .L802A9424: /* 422424 802A9424 0200202D */ daddu $a0, $s0, $zero -/* 422428 802A9428 0C0513AC */ jal set_hud_element_alpha +/* 422428 802A9428 0C0513AC */ jal hud_element_set_alpha /* 42242C 802A942C 240500FF */ addiu $a1, $zero, 0xff /* 422430 802A9430 82220061 */ lb $v0, 0x61($s1) /* 422434 802A9434 8E300010 */ lw $s0, 0x10($s1) /* 422438 802A9438 10400003 */ beqz $v0, .L802A9448 /* 42243C 802A943C 0200202D */ daddu $a0, $s0, $zero -/* 422440 802A9440 0C05128B */ jal clear_hud_element_flags +/* 422440 802A9440 0C05128B */ jal hud_element_clear_flags /* 422444 802A9444 24050002 */ addiu $a1, $zero, 2 .L802A9448: /* 422448 802A9448 0200202D */ daddu $a0, $s0, $zero -/* 42244C 802A944C 0C0513AC */ jal set_hud_element_alpha +/* 42244C 802A944C 0C0513AC */ jal hud_element_set_alpha /* 422450 802A9450 240500FF */ addiu $a1, $zero, 0xff /* 422454 802A9454 82220061 */ lb $v0, 0x61($s1) /* 422458 802A9458 8E300014 */ lw $s0, 0x14($s1) /* 42245C 802A945C 10400003 */ beqz $v0, .L802A946C /* 422460 802A9460 0200202D */ daddu $a0, $s0, $zero -/* 422464 802A9464 0C05128B */ jal clear_hud_element_flags +/* 422464 802A9464 0C05128B */ jal hud_element_clear_flags /* 422468 802A9468 24050002 */ addiu $a1, $zero, 2 .L802A946C: /* 42246C 802A946C 0200202D */ daddu $a0, $s0, $zero -/* 422470 802A9470 0C0513AC */ jal set_hud_element_alpha +/* 422470 802A9470 0C0513AC */ jal hud_element_set_alpha /* 422474 802A9474 240500FF */ addiu $a1, $zero, 0xff /* 422478 802A9478 82220061 */ lb $v0, 0x61($s1) /* 42247C 802A947C 8E300018 */ lw $s0, 0x18($s1) /* 422480 802A9480 10400003 */ beqz $v0, .L802A9490 /* 422484 802A9484 0200202D */ daddu $a0, $s0, $zero -/* 422488 802A9488 0C05128B */ jal clear_hud_element_flags +/* 422488 802A9488 0C05128B */ jal hud_element_clear_flags /* 42248C 802A948C 24050002 */ addiu $a1, $zero, 2 .L802A9490: /* 422490 802A9490 0200202D */ daddu $a0, $s0, $zero -/* 422494 802A9494 0C0513AC */ jal set_hud_element_alpha +/* 422494 802A9494 0C0513AC */ jal hud_element_set_alpha /* 422498 802A9498 240500FF */ addiu $a1, $zero, 0xff /* 42249C 802A949C 24020001 */ addiu $v0, $zero, 1 /* 4224A0 802A94A0 080AA66D */ j L802A99B4_4229B4 @@ -103,36 +103,36 @@ dlabel L802A94A8_4224A8 .L802A94D4: /* 4224D4 802A94D4 8E240004 */ lw $a0, 4($s1) /* 4224D8 802A94D8 86250056 */ lh $a1, 0x56($s1) -/* 4224DC 802A94DC 0C051261 */ jal set_hud_element_render_pos +/* 4224DC 802A94DC 0C051261 */ jal hud_element_set_render_pos /* 4224E0 802A94E0 86260058 */ lh $a2, 0x58($s1) /* 4224E4 802A94E4 8E240008 */ lw $a0, 8($s1) /* 4224E8 802A94E8 86250056 */ lh $a1, 0x56($s1) /* 4224EC 802A94EC 86260058 */ lh $a2, 0x58($s1) /* 4224F0 802A94F0 24A50015 */ addiu $a1, $a1, 0x15 -/* 4224F4 802A94F4 0C051261 */ jal set_hud_element_render_pos +/* 4224F4 802A94F4 0C051261 */ jal hud_element_set_render_pos /* 4224F8 802A94F8 24C6FFFD */ addiu $a2, $a2, -3 /* 4224FC 802A94FC 8E24000C */ lw $a0, 0xc($s1) /* 422500 802A9500 86250056 */ lh $a1, 0x56($s1) /* 422504 802A9504 86260058 */ lh $a2, 0x58($s1) /* 422508 802A9508 24A50005 */ addiu $a1, $a1, 5 -/* 42250C 802A950C 0C051261 */ jal set_hud_element_render_pos +/* 42250C 802A950C 0C051261 */ jal hud_element_set_render_pos /* 422510 802A9510 24C60001 */ addiu $a2, $a2, 1 /* 422514 802A9514 8E240010 */ lw $a0, 0x10($s1) /* 422518 802A9518 86250056 */ lh $a1, 0x56($s1) /* 42251C 802A951C 86260058 */ lh $a2, 0x58($s1) /* 422520 802A9520 24A5FFF9 */ addiu $a1, $a1, -7 -/* 422524 802A9524 0C051261 */ jal set_hud_element_render_pos +/* 422524 802A9524 0C051261 */ jal hud_element_set_render_pos /* 422528 802A9528 24C60001 */ addiu $a2, $a2, 1 /* 42252C 802A952C 8E240014 */ lw $a0, 0x14($s1) /* 422530 802A9530 86250056 */ lh $a1, 0x56($s1) /* 422534 802A9534 86260058 */ lh $a2, 0x58($s1) /* 422538 802A9538 24A5FFED */ addiu $a1, $a1, -0x13 -/* 42253C 802A953C 0C051261 */ jal set_hud_element_render_pos +/* 42253C 802A953C 0C051261 */ jal hud_element_set_render_pos /* 422540 802A9540 24C60001 */ addiu $a2, $a2, 1 /* 422544 802A9544 8E240018 */ lw $a0, 0x18($s1) /* 422548 802A9548 86260058 */ lh $a2, 0x58($s1) /* 42254C 802A954C 86250056 */ lh $a1, 0x56($s1) -/* 422550 802A9550 0C051261 */ jal set_hud_element_render_pos +/* 422550 802A9550 0C051261 */ jal hud_element_set_render_pos /* 422554 802A9554 24C6FFE9 */ addiu $a2, $a2, -0x17 /* 422558 802A9558 8222005E */ lb $v0, 0x5e($s1) /* 42255C 802A955C 10400115 */ beqz $v0, L802A99B4_4229B4 @@ -141,12 +141,12 @@ dlabel L802A94A8_4224A8 /* 422568 802A9568 86260058 */ lh $a2, 0x58($s1) /* 42256C 802A956C 86250056 */ lh $a1, 0x56($s1) /* 422570 802A9570 0200202D */ daddu $a0, $s0, $zero -/* 422574 802A9574 0C051261 */ jal set_hud_element_render_pos +/* 422574 802A9574 0C051261 */ jal hud_element_set_render_pos /* 422578 802A9578 24A50032 */ addiu $a1, $a1, 0x32 /* 42257C 802A957C 82220061 */ lb $v0, 0x61($s1) /* 422580 802A9580 1040010C */ beqz $v0, L802A99B4_4229B4 /* 422584 802A9584 0200202D */ daddu $a0, $s0, $zero -/* 422588 802A9588 0C05128B */ jal clear_hud_element_flags +/* 422588 802A9588 0C05128B */ jal hud_element_clear_flags /* 42258C 802A958C 24050002 */ addiu $a1, $zero, 2 /* 422590 802A9590 080AA66D */ j L802A99B4_4229B4 /* 422594 802A9594 00000000 */ nop @@ -158,22 +158,22 @@ dlabel L802A9598_422598 /* 4225A8 802A95A8 10400013 */ beqz $v0, .L802A95F8 /* 4225AC 802A95AC 00000000 */ nop /* 4225B0 802A95B0 8E240004 */ lw $a0, 4($s1) -/* 4225B4 802A95B4 0C0513AC */ jal set_hud_element_alpha +/* 4225B4 802A95B4 0C0513AC */ jal hud_element_set_alpha /* 4225B8 802A95B8 240500FF */ addiu $a1, $zero, 0xff /* 4225BC 802A95BC 8E240008 */ lw $a0, 8($s1) -/* 4225C0 802A95C0 0C0513AC */ jal set_hud_element_alpha +/* 4225C0 802A95C0 0C0513AC */ jal hud_element_set_alpha /* 4225C4 802A95C4 240500FF */ addiu $a1, $zero, 0xff /* 4225C8 802A95C8 8E24000C */ lw $a0, 0xc($s1) -/* 4225CC 802A95CC 0C0513AC */ jal set_hud_element_alpha +/* 4225CC 802A95CC 0C0513AC */ jal hud_element_set_alpha /* 4225D0 802A95D0 240500FF */ addiu $a1, $zero, 0xff /* 4225D4 802A95D4 8E240010 */ lw $a0, 0x10($s1) -/* 4225D8 802A95D8 0C0513AC */ jal set_hud_element_alpha +/* 4225D8 802A95D8 0C0513AC */ jal hud_element_set_alpha /* 4225DC 802A95DC 240500FF */ addiu $a1, $zero, 0xff /* 4225E0 802A95E0 8E240014 */ lw $a0, 0x14($s1) -/* 4225E4 802A95E4 0C0513AC */ jal set_hud_element_alpha +/* 4225E4 802A95E4 0C0513AC */ jal hud_element_set_alpha /* 4225E8 802A95E8 240500FF */ addiu $a1, $zero, 0xff /* 4225EC 802A95EC 8E240018 */ lw $a0, 0x18($s1) -/* 4225F0 802A95F0 0C0513AC */ jal set_hud_element_alpha +/* 4225F0 802A95F0 0C0513AC */ jal hud_element_set_alpha /* 4225F4 802A95F4 240500FF */ addiu $a1, $zero, 0xff .L802A95F8: /* 4225F8 802A95F8 8622004E */ lh $v0, 0x4e($s1) @@ -231,7 +231,7 @@ dlabel L802A9644_422644 /* 4226B8 802A96B8 8E240014 */ lw $a0, 0x14($s1) /* 4226BC 802A96BC 3C058029 */ lui $a1, %hi(HudScript_TimingCharge3) /* 4226C0 802A96C0 24A528CC */ addiu $a1, $a1, %lo(HudScript_TimingCharge3) -/* 4226C4 802A96C4 0C0511FF */ jal set_hud_element_anim +/* 4226C4 802A96C4 0C0511FF */ jal hud_element_set_script /* 4226C8 802A96C8 00000000 */ nop /* 4226CC 802A96CC 86220054 */ lh $v0, 0x54($s1) /* 4226D0 802A96D0 14400031 */ bnez $v0, .L802A9798 @@ -246,7 +246,7 @@ dlabel L802A9644_422644 /* 4226F0 802A96F0 8E240010 */ lw $a0, 0x10($s1) /* 4226F4 802A96F4 3C058029 */ lui $a1, %hi(HudScript_TimingCharge2) /* 4226F8 802A96F8 24A52874 */ addiu $a1, $a1, %lo(HudScript_TimingCharge2) -/* 4226FC 802A96FC 0C0511FF */ jal set_hud_element_anim +/* 4226FC 802A96FC 0C0511FF */ jal hud_element_set_script /* 422700 802A9700 00000000 */ nop /* 422704 802A9704 86220054 */ lh $v0, 0x54($s1) /* 422708 802A9708 24030001 */ addiu $v1, $zero, 1 @@ -269,7 +269,7 @@ dlabel L802A9644_422644 /* 422748 802A9748 8E24000C */ lw $a0, 0xc($s1) /* 42274C 802A974C 3C058029 */ lui $a1, %hi(HudScript_TimingCharge1) /* 422750 802A9750 24A5281C */ addiu $a1, $a1, %lo(HudScript_TimingCharge1) -/* 422754 802A9754 0C0511FF */ jal set_hud_element_anim +/* 422754 802A9754 0C0511FF */ jal hud_element_set_script /* 422758 802A9758 00000000 */ nop /* 42275C 802A975C 86220054 */ lh $v0, 0x54($s1) /* 422760 802A9760 24030002 */ addiu $v1, $zero, 2 @@ -299,12 +299,12 @@ dlabel L802A9644_422644 /* 4227B0 802A97B0 3C058029 */ lui $a1, %hi(HudScript_TimingReady) /* 4227B4 802A97B4 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) /* 4227B8 802A97B8 8E240008 */ lw $a0, 8($s1) -/* 4227BC 802A97BC 0C0511FF */ jal set_hud_element_anim +/* 4227BC 802A97BC 0C0511FF */ jal hud_element_set_script /* 4227C0 802A97C0 A2420084 */ sb $v0, 0x84($s2) /* 4227C4 802A97C4 8E240018 */ lw $a0, 0x18($s1) /* 4227C8 802A97C8 3C058011 */ lui $a1, %hi(HudScript_StickTapNeutral) /* 4227CC 802A97CC 24A58FF0 */ addiu $a1, $a1, %lo(HudScript_StickTapNeutral) -/* 4227D0 802A97D0 0C0511FF */ jal set_hud_element_anim +/* 4227D0 802A97D0 0C0511FF */ jal hud_element_set_script /* 4227D4 802A97D4 00000000 */ nop /* 4227D8 802A97D8 82220062 */ lb $v0, 0x62($s1) /* 4227DC 802A97DC 10400003 */ beqz $v0, .L802A97EC diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s index 0c4056d21c..60db7f34de 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s @@ -27,30 +27,30 @@ dlabel L802A92E8_42F9C8 /* 42F9D4 802A92F4 8E300004 */ lw $s0, 4($s1) /* 42F9D8 802A92F8 10400003 */ beqz $v0, .L802A9308 /* 42F9DC 802A92FC 0200202D */ daddu $a0, $s0, $zero -/* 42F9E0 802A9300 0C05128B */ jal clear_hud_element_flags +/* 42F9E0 802A9300 0C05128B */ jal hud_element_clear_flags /* 42F9E4 802A9304 24050002 */ addiu $a1, $zero, 2 .L802A9308: /* 42F9E8 802A9308 0200202D */ daddu $a0, $s0, $zero -/* 42F9EC 802A930C 0C0513AC */ jal set_hud_element_alpha +/* 42F9EC 802A930C 0C0513AC */ jal hud_element_set_alpha /* 42F9F0 802A9310 240500FF */ addiu $a1, $zero, 0xff /* 42F9F4 802A9314 82220061 */ lb $v0, 0x61($s1) /* 42F9F8 802A9318 8E30000C */ lw $s0, 0xc($s1) /* 42F9FC 802A931C 10400004 */ beqz $v0, .L802A9330 /* 42FA00 802A9320 0200202D */ daddu $a0, $s0, $zero -/* 42FA04 802A9324 0C05128B */ jal clear_hud_element_flags +/* 42FA04 802A9324 0C05128B */ jal hud_element_clear_flags /* 42FA08 802A9328 24050002 */ addiu $a1, $zero, 2 /* 42FA0C 802A932C 0200202D */ daddu $a0, $s0, $zero .L802A9330: -/* 42FA10 802A9330 0C0513AC */ jal set_hud_element_alpha +/* 42FA10 802A9330 0C0513AC */ jal hud_element_set_alpha /* 42FA14 802A9334 240500FF */ addiu $a1, $zero, 0xff /* 42FA18 802A9338 8E300008 */ lw $s0, 8($s1) /* 42FA1C 802A933C 240500FF */ addiu $a1, $zero, 0xff -/* 42FA20 802A9340 0C0513AC */ jal set_hud_element_alpha +/* 42FA20 802A9340 0C0513AC */ jal hud_element_set_alpha /* 42FA24 802A9344 0200202D */ daddu $a0, $s0, $zero /* 42FA28 802A9348 82220061 */ lb $v0, 0x61($s1) /* 42FA2C 802A934C 10400003 */ beqz $v0, .L802A935C /* 42FA30 802A9350 0200202D */ daddu $a0, $s0, $zero -/* 42FA34 802A9354 0C05128B */ jal clear_hud_element_flags +/* 42FA34 802A9354 0C05128B */ jal hud_element_clear_flags /* 42FA38 802A9358 24050002 */ addiu $a1, $zero, 2 .L802A935C: /* 42FA3C 802A935C 24020001 */ addiu $v0, $zero, 1 @@ -79,17 +79,17 @@ dlabel L802A9368_42FA48 /* 42FA8C 802A93AC 8E240004 */ lw $a0, 4($s1) /* 42FA90 802A93B0 86250056 */ lh $a1, 0x56($s1) /* 42FA94 802A93B4 86260058 */ lh $a2, 0x58($s1) -/* 42FA98 802A93B8 0C051261 */ jal set_hud_element_render_pos +/* 42FA98 802A93B8 0C051261 */ jal hud_element_set_render_pos /* 42FA9C 802A93BC 24A5FFEF */ addiu $a1, $a1, -0x11 /* 42FAA0 802A93C0 8E24000C */ lw $a0, 0xc($s1) /* 42FAA4 802A93C4 86250056 */ lh $a1, 0x56($s1) /* 42FAA8 802A93C8 86260058 */ lh $a2, 0x58($s1) -/* 42FAAC 802A93CC 0C051261 */ jal set_hud_element_render_pos +/* 42FAAC 802A93CC 0C051261 */ jal hud_element_set_render_pos /* 42FAB0 802A93D0 24A50017 */ addiu $a1, $a1, 0x17 /* 42FAB4 802A93D4 8E240008 */ lw $a0, 8($s1) /* 42FAB8 802A93D8 86260058 */ lh $a2, 0x58($s1) /* 42FABC 802A93DC 86250056 */ lh $a1, 0x56($s1) -/* 42FAC0 802A93E0 0C051261 */ jal set_hud_element_render_pos +/* 42FAC0 802A93E0 0C051261 */ jal hud_element_set_render_pos /* 42FAC4 802A93E4 24C6001C */ addiu $a2, $a2, 0x1c /* 42FAC8 802A93E8 080AA5E5 */ j L802A9794_42FE74 /* 42FACC 802A93EC 00000000 */ nop @@ -106,12 +106,12 @@ dlabel L802A93F0_42FAD0 /* 42FAF0 802A9410 8E240004 */ lw $a0, 4($s1) /* 42FAF4 802A9414 3C058011 */ lui $a1, %hi(HudScript_MashAButton) /* 42FAF8 802A9418 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 42FAFC 802A941C 0C0511FF */ jal set_hud_element_anim +/* 42FAFC 802A941C 0C0511FF */ jal hud_element_set_script /* 42FB00 802A9420 00000000 */ nop /* 42FB04 802A9424 8E24000C */ lw $a0, 0xc($s1) /* 42FB08 802A9428 3C058029 */ lui $a1, %hi(HudScript_MashBButton1) /* 42FB0C 802A942C 24A52374 */ addiu $a1, $a1, %lo(HudScript_MashBButton1) -/* 42FB10 802A9430 0C0511FF */ jal set_hud_element_anim +/* 42FB10 802A9430 0C0511FF */ jal hud_element_set_script /* 42FB14 802A9434 00000000 */ nop /* 42FB18 802A9438 96230052 */ lhu $v1, 0x52($s1) /* 42FB1C 802A943C 2402000B */ addiu $v0, $zero, 0xb @@ -265,10 +265,10 @@ dlabel L802A9450_42FB30 /* 42FD2C 802A964C A6220068 */ sh $v0, 0x68($s1) /* 42FD30 802A9650 0200202D */ daddu $a0, $s0, $zero /* 42FD34 802A9654 24A50032 */ addiu $a1, $a1, 0x32 -/* 42FD38 802A9658 0C051261 */ jal set_hud_element_render_pos +/* 42FD38 802A9658 0C051261 */ jal hud_element_set_render_pos /* 42FD3C 802A965C 24C6001C */ addiu $a2, $a2, 0x1c /* 42FD40 802A9660 0200202D */ daddu $a0, $s0, $zero -/* 42FD44 802A9664 0C05128B */ jal clear_hud_element_flags +/* 42FD44 802A9664 0C05128B */ jal hud_element_clear_flags /* 42FD48 802A9668 24050002 */ addiu $a1, $zero, 2 /* 42FD4C 802A966C 3C0451EB */ lui $a0, 0x51eb .L802A9670: diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s index b7be60f2f9..ac82a6f59e 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s @@ -34,30 +34,30 @@ glabel func_802A9310_42D220 /* 42D274 802A9364 8E300004 */ lw $s0, 4($s1) /* 42D278 802A9368 10400004 */ beqz $v0, .L802A937C /* 42D27C 802A936C 0200202D */ daddu $a0, $s0, $zero -/* 42D280 802A9370 0C05128B */ jal clear_hud_element_flags +/* 42D280 802A9370 0C05128B */ jal hud_element_clear_flags /* 42D284 802A9374 24050002 */ addiu $a1, $zero, 2 /* 42D288 802A9378 0200202D */ daddu $a0, $s0, $zero .L802A937C: -/* 42D28C 802A937C 0C0513AC */ jal set_hud_element_alpha +/* 42D28C 802A937C 0C0513AC */ jal hud_element_set_alpha /* 42D290 802A9380 240500FF */ addiu $a1, $zero, 0xff /* 42D294 802A9384 8E300008 */ lw $s0, 8($s1) /* 42D298 802A9388 240500FF */ addiu $a1, $zero, 0xff -/* 42D29C 802A938C 0C0513AC */ jal set_hud_element_alpha +/* 42D29C 802A938C 0C0513AC */ jal hud_element_set_alpha /* 42D2A0 802A9390 0200202D */ daddu $a0, $s0, $zero /* 42D2A4 802A9394 82220061 */ lb $v0, 0x61($s1) /* 42D2A8 802A9398 10400003 */ beqz $v0, .L802A93A8 /* 42D2AC 802A939C 0200202D */ daddu $a0, $s0, $zero -/* 42D2B0 802A93A0 0C05128B */ jal clear_hud_element_flags +/* 42D2B0 802A93A0 0C05128B */ jal hud_element_clear_flags /* 42D2B4 802A93A4 24050002 */ addiu $a1, $zero, 2 .L802A93A8: /* 42D2B8 802A93A8 8E300014 */ lw $s0, 0x14($s1) /* 42D2BC 802A93AC 240500FF */ addiu $a1, $zero, 0xff -/* 42D2C0 802A93B0 0C0513AC */ jal set_hud_element_alpha +/* 42D2C0 802A93B0 0C0513AC */ jal hud_element_set_alpha /* 42D2C4 802A93B4 0200202D */ daddu $a0, $s0, $zero /* 42D2C8 802A93B8 82220061 */ lb $v0, 0x61($s1) /* 42D2CC 802A93BC 10400003 */ beqz $v0, .L802A93CC /* 42D2D0 802A93C0 0200202D */ daddu $a0, $s0, $zero -/* 42D2D4 802A93C4 0C05128B */ jal clear_hud_element_flags +/* 42D2D4 802A93C4 0C05128B */ jal hud_element_clear_flags /* 42D2D8 802A93C8 24050002 */ addiu $a1, $zero, 2 .L802A93CC: /* 42D2DC 802A93CC 24020001 */ addiu $v0, $zero, 1 @@ -85,12 +85,12 @@ glabel func_802A9310_42D220 .L802A941C: /* 42D32C 802A941C 8E240004 */ lw $a0, 4($s1) /* 42D330 802A9420 86250056 */ lh $a1, 0x56($s1) -/* 42D334 802A9424 0C051261 */ jal set_hud_element_render_pos +/* 42D334 802A9424 0C051261 */ jal hud_element_set_render_pos /* 42D338 802A9428 86260058 */ lh $a2, 0x58($s1) /* 42D33C 802A942C 8E240008 */ lw $a0, 8($s1) /* 42D340 802A9430 86260058 */ lh $a2, 0x58($s1) /* 42D344 802A9434 86250056 */ lh $a1, 0x56($s1) -/* 42D348 802A9438 0C051261 */ jal set_hud_element_render_pos +/* 42D348 802A9438 0C051261 */ jal hud_element_set_render_pos /* 42D34C 802A943C 24C6001C */ addiu $a2, $a2, 0x1c /* 42D350 802A9440 3C0451EB */ lui $a0, 0x51eb /* 42D354 802A9444 3484851F */ ori $a0, $a0, 0x851f @@ -111,7 +111,7 @@ glabel func_802A9310_42D220 /* 42D390 802A9480 00621823 */ subu $v1, $v1, $v0 /* 42D394 802A9484 86220056 */ lh $v0, 0x56($s1) /* 42D398 802A9488 00A32823 */ subu $a1, $a1, $v1 -/* 42D39C 802A948C 0C051261 */ jal set_hud_element_render_pos +/* 42D39C 802A948C 0C051261 */ jal hud_element_set_render_pos /* 42D3A0 802A9490 00452823 */ subu $a1, $v0, $a1 /* 42D3A4 802A9494 080AA60E */ j .L802A9838_42D748 /* 42D3A8 802A9498 00000000 */ nop @@ -128,7 +128,7 @@ glabel func_802A9310_42D220 /* 42D3CC 802A94BC 8E240004 */ lw $a0, 4($s1) /* 42D3D0 802A94C0 3C058011 */ lui $a1, %hi(HudScript_MashAButton) /* 42D3D4 802A94C4 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 42D3D8 802A94C8 0C0511FF */ jal set_hud_element_anim +/* 42D3D8 802A94C8 0C0511FF */ jal hud_element_set_script /* 42D3DC 802A94CC 00000000 */ nop /* 42D3E0 802A94D0 3C048000 */ lui $a0, 0x8000 /* 42D3E4 802A94D4 34840041 */ ori $a0, $a0, 0x41 @@ -256,10 +256,10 @@ glabel func_802A9310_42D220 /* 42D5A8 802A9698 A6220068 */ sh $v0, 0x68($s1) /* 42D5AC 802A969C 0200202D */ daddu $a0, $s0, $zero /* 42D5B0 802A96A0 24A50032 */ addiu $a1, $a1, 0x32 -/* 42D5B4 802A96A4 0C051261 */ jal set_hud_element_render_pos +/* 42D5B4 802A96A4 0C051261 */ jal hud_element_set_render_pos /* 42D5B8 802A96A8 24C6001C */ addiu $a2, $a2, 0x1c /* 42D5BC 802A96AC 0200202D */ daddu $a0, $s0, $zero -/* 42D5C0 802A96B0 0C05128B */ jal clear_hud_element_flags +/* 42D5C0 802A96B0 0C05128B */ jal hud_element_clear_flags /* 42D5C4 802A96B4 24050002 */ addiu $a1, $zero, 2 /* 42D5C8 802A96B8 3C1051EB */ lui $s0, 0x51eb .L802A96BC: diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s index ec26749922..61b208c9ba 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s @@ -25,22 +25,22 @@ dlabel L802A929C_42F0BC /* 42F0C0 802A92A0 24040063 */ addiu $a0, $zero, 0x63 /* 42F0C4 802A92A4 8E300004 */ lw $s0, 4($s1) /* 42F0C8 802A92A8 240500FF */ addiu $a1, $zero, 0xff -/* 42F0CC 802A92AC 0C0513AC */ jal set_hud_element_alpha +/* 42F0CC 802A92AC 0C0513AC */ jal hud_element_set_alpha /* 42F0D0 802A92B0 0200202D */ daddu $a0, $s0, $zero /* 42F0D4 802A92B4 82220061 */ lb $v0, 0x61($s1) /* 42F0D8 802A92B8 10400003 */ beqz $v0, .L802A92C8 /* 42F0DC 802A92BC 0200202D */ daddu $a0, $s0, $zero -/* 42F0E0 802A92C0 0C05128B */ jal clear_hud_element_flags +/* 42F0E0 802A92C0 0C05128B */ jal hud_element_clear_flags /* 42F0E4 802A92C4 24050002 */ addiu $a1, $zero, 2 .L802A92C8: /* 42F0E8 802A92C8 8E300008 */ lw $s0, 8($s1) /* 42F0EC 802A92CC 240500FF */ addiu $a1, $zero, 0xff -/* 42F0F0 802A92D0 0C0513AC */ jal set_hud_element_alpha +/* 42F0F0 802A92D0 0C0513AC */ jal hud_element_set_alpha /* 42F0F4 802A92D4 0200202D */ daddu $a0, $s0, $zero /* 42F0F8 802A92D8 82220061 */ lb $v0, 0x61($s1) /* 42F0FC 802A92DC 10400003 */ beqz $v0, .L802A92EC /* 42F100 802A92E0 0200202D */ daddu $a0, $s0, $zero -/* 42F104 802A92E4 0C05128B */ jal clear_hud_element_flags +/* 42F104 802A92E4 0C05128B */ jal hud_element_clear_flags /* 42F108 802A92E8 24050002 */ addiu $a1, $zero, 2 .L802A92EC: /* 42F10C 802A92EC 24020001 */ addiu $v0, $zero, 1 @@ -68,12 +68,12 @@ dlabel L802A92F8_42F118 .L802A933C: /* 42F15C 802A933C 8E240004 */ lw $a0, 4($s1) /* 42F160 802A9340 86250056 */ lh $a1, 0x56($s1) -/* 42F164 802A9344 0C051261 */ jal set_hud_element_render_pos +/* 42F164 802A9344 0C051261 */ jal hud_element_set_render_pos /* 42F168 802A9348 86260058 */ lh $a2, 0x58($s1) /* 42F16C 802A934C 8E240008 */ lw $a0, 8($s1) /* 42F170 802A9350 86260058 */ lh $a2, 0x58($s1) /* 42F174 802A9354 86250056 */ lh $a1, 0x56($s1) -/* 42F178 802A9358 0C051261 */ jal set_hud_element_render_pos +/* 42F178 802A9358 0C051261 */ jal hud_element_set_render_pos /* 42F17C 802A935C 24C6001C */ addiu $a2, $a2, 0x1c /* 42F180 802A9360 080AA5C9 */ j L802A9724_42F544 /* 42F184 802A9364 00000000 */ nop @@ -90,7 +90,7 @@ dlabel L802A9368_42F188 /* 42F1A8 802A9388 8E240004 */ lw $a0, 4($s1) /* 42F1AC 802A938C 3C058011 */ lui $a1, %hi(HudScript_StickMashLeft) /* 42F1B0 802A9390 24A58F30 */ addiu $a1, $a1, %lo(HudScript_StickMashLeft) -/* 42F1B4 802A9394 0C0511FF */ jal set_hud_element_anim +/* 42F1B4 802A9394 0C0511FF */ jal hud_element_set_script /* 42F1B8 802A9398 00000000 */ nop /* 42F1BC 802A939C 3C048000 */ lui $a0, 0x8000 /* 42F1C0 802A93A0 34840041 */ ori $a0, $a0, 0x41 @@ -218,10 +218,10 @@ dlabel L802A93D0_42F1F0 /* 42F38C 802A956C A6220068 */ sh $v0, 0x68($s1) /* 42F390 802A9570 0200202D */ daddu $a0, $s0, $zero /* 42F394 802A9574 24A50032 */ addiu $a1, $a1, 0x32 -/* 42F398 802A9578 0C051261 */ jal set_hud_element_render_pos +/* 42F398 802A9578 0C051261 */ jal hud_element_set_render_pos /* 42F39C 802A957C 24C6001C */ addiu $a2, $a2, 0x1c /* 42F3A0 802A9580 0200202D */ daddu $a0, $s0, $zero -/* 42F3A4 802A9584 0C05128B */ jal clear_hud_element_flags +/* 42F3A4 802A9584 0C05128B */ jal hud_element_clear_flags /* 42F3A8 802A9588 24050002 */ addiu $a1, $zero, 2 .L802A958C: /* 42F3AC 802A958C 3C03802B */ lui $v1, %hi(D_802A98C0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s index 1edc229aec..0bcc77fdc8 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s @@ -25,22 +25,22 @@ dlabel L802A92E0_430300 /* 430304 802A92E4 24040063 */ addiu $a0, $zero, 0x63 /* 430308 802A92E8 8E300004 */ lw $s0, 4($s1) /* 43030C 802A92EC 240500FF */ addiu $a1, $zero, 0xff -/* 430310 802A92F0 0C0513AC */ jal set_hud_element_alpha +/* 430310 802A92F0 0C0513AC */ jal hud_element_set_alpha /* 430314 802A92F4 0200202D */ daddu $a0, $s0, $zero /* 430318 802A92F8 82220061 */ lb $v0, 0x61($s1) /* 43031C 802A92FC 10400003 */ beqz $v0, .L802A930C /* 430320 802A9300 0200202D */ daddu $a0, $s0, $zero -/* 430324 802A9304 0C05128B */ jal clear_hud_element_flags +/* 430324 802A9304 0C05128B */ jal hud_element_clear_flags /* 430328 802A9308 24050002 */ addiu $a1, $zero, 2 .L802A930C: /* 43032C 802A930C 8E300008 */ lw $s0, 8($s1) /* 430330 802A9310 240500FF */ addiu $a1, $zero, 0xff -/* 430334 802A9314 0C0513AC */ jal set_hud_element_alpha +/* 430334 802A9314 0C0513AC */ jal hud_element_set_alpha /* 430338 802A9318 0200202D */ daddu $a0, $s0, $zero /* 43033C 802A931C 82220061 */ lb $v0, 0x61($s1) /* 430340 802A9320 10400003 */ beqz $v0, .L802A9330 /* 430344 802A9324 0200202D */ daddu $a0, $s0, $zero -/* 430348 802A9328 0C05128B */ jal clear_hud_element_flags +/* 430348 802A9328 0C05128B */ jal hud_element_clear_flags /* 43034C 802A932C 24050002 */ addiu $a1, $zero, 2 .L802A9330: /* 430350 802A9330 24020001 */ addiu $v0, $zero, 1 @@ -61,12 +61,12 @@ dlabel L802A933C_43035C .L802A9368: /* 430388 802A9368 8E240004 */ lw $a0, 4($s1) /* 43038C 802A936C 86250056 */ lh $a1, 0x56($s1) -/* 430390 802A9370 0C051261 */ jal set_hud_element_render_pos +/* 430390 802A9370 0C051261 */ jal hud_element_set_render_pos /* 430394 802A9374 86260058 */ lh $a2, 0x58($s1) /* 430398 802A9378 8E240008 */ lw $a0, 8($s1) /* 43039C 802A937C 86260058 */ lh $a2, 0x58($s1) /* 4303A0 802A9380 86250056 */ lh $a1, 0x56($s1) -/* 4303A4 802A9384 0C051261 */ jal set_hud_element_render_pos +/* 4303A4 802A9384 0C051261 */ jal hud_element_set_render_pos /* 4303A8 802A9388 24C6001C */ addiu $a2, $a2, 0x1c /* 4303AC 802A938C 080AA5F9 */ j L802A97E4_430804 /* 4303B0 802A9390 00000000 */ nop @@ -83,7 +83,7 @@ dlabel L802A9394_4303B4 /* 4303D4 802A93B4 8E240004 */ lw $a0, 4($s1) /* 4303D8 802A93B8 3C058011 */ lui $a1, %hi(HudScript_StickMashLeft) /* 4303DC 802A93BC 24A58F30 */ addiu $a1, $a1, %lo(HudScript_StickMashLeft) -/* 4303E0 802A93C0 0C0511FF */ jal set_hud_element_anim +/* 4303E0 802A93C0 0C0511FF */ jal hud_element_set_script /* 4303E4 802A93C4 00000000 */ nop /* 4303E8 802A93C8 3C048000 */ lui $a0, 0x8000 /* 4303EC 802A93CC 34840041 */ ori $a0, $a0, 0x41 @@ -275,10 +275,10 @@ dlabel L802A93FC_43041C /* 43069C 802A967C A6220068 */ sh $v0, 0x68($s1) /* 4306A0 802A9680 0200202D */ daddu $a0, $s0, $zero /* 4306A4 802A9684 24A50032 */ addiu $a1, $a1, 0x32 -/* 4306A8 802A9688 0C051261 */ jal set_hud_element_render_pos +/* 4306A8 802A9688 0C051261 */ jal hud_element_set_render_pos /* 4306AC 802A968C 24C6001C */ addiu $a2, $a2, 0x1c /* 4306B0 802A9690 0200202D */ daddu $a0, $s0, $zero -/* 4306B4 802A9694 0C05128B */ jal clear_hud_element_flags +/* 4306B4 802A9694 0C05128B */ jal hud_element_clear_flags /* 4306B8 802A9698 24050002 */ addiu $a1, $zero, 2 /* 4306BC 802A969C 3C1051EB */ lui $s0, 0x51eb .L802A96A0: diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s index 71bba02798..f6ab3069b6 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s @@ -28,20 +28,20 @@ dlabel L802A9254_429F74 /* 429F80 802A9260 8E300004 */ lw $s0, 4($s1) /* 429F84 802A9264 10400004 */ beqz $v0, .L802A9278 /* 429F88 802A9268 0200202D */ daddu $a0, $s0, $zero -/* 429F8C 802A926C 0C05128B */ jal clear_hud_element_flags +/* 429F8C 802A926C 0C05128B */ jal hud_element_clear_flags /* 429F90 802A9270 24050002 */ addiu $a1, $zero, 2 /* 429F94 802A9274 0200202D */ daddu $a0, $s0, $zero .L802A9278: -/* 429F98 802A9278 0C0513AC */ jal set_hud_element_alpha +/* 429F98 802A9278 0C0513AC */ jal hud_element_set_alpha /* 429F9C 802A927C 240500FF */ addiu $a1, $zero, 0xff /* 429FA0 802A9280 8E300008 */ lw $s0, 8($s1) /* 429FA4 802A9284 240500FF */ addiu $a1, $zero, 0xff -/* 429FA8 802A9288 0C0513AC */ jal set_hud_element_alpha +/* 429FA8 802A9288 0C0513AC */ jal hud_element_set_alpha /* 429FAC 802A928C 0200202D */ daddu $a0, $s0, $zero /* 429FB0 802A9290 82220061 */ lb $v0, 0x61($s1) /* 429FB4 802A9294 10400003 */ beqz $v0, .L802A92A4 /* 429FB8 802A9298 0200202D */ daddu $a0, $s0, $zero -/* 429FBC 802A929C 0C05128B */ jal clear_hud_element_flags +/* 429FBC 802A929C 0C05128B */ jal hud_element_clear_flags /* 429FC0 802A92A0 24050002 */ addiu $a1, $zero, 2 .L802A92A4: /* 429FC4 802A92A4 24020001 */ addiu $v0, $zero, 1 @@ -62,12 +62,12 @@ dlabel L802A92B0_429FD0 .L802A92DC: /* 429FFC 802A92DC 8E240004 */ lw $a0, 4($s1) /* 42A000 802A92E0 86250056 */ lh $a1, 0x56($s1) -/* 42A004 802A92E4 0C051261 */ jal set_hud_element_render_pos +/* 42A004 802A92E4 0C051261 */ jal hud_element_set_render_pos /* 42A008 802A92E8 86260058 */ lh $a2, 0x58($s1) /* 42A00C 802A92EC 8E240008 */ lw $a0, 8($s1) /* 42A010 802A92F0 86260058 */ lh $a2, 0x58($s1) /* 42A014 802A92F4 86250056 */ lh $a1, 0x56($s1) -/* 42A018 802A92F8 0C051261 */ jal set_hud_element_render_pos +/* 42A018 802A92F8 0C051261 */ jal hud_element_set_render_pos /* 42A01C 802A92FC 24C6001C */ addiu $a2, $a2, 0x1c /* 42A020 802A9300 080AA586 */ j L802A9618_42A338 /* 42A024 802A9304 00000000 */ nop @@ -84,7 +84,7 @@ dlabel L802A9308_42A028 /* 42A048 802A9328 8E240004 */ lw $a0, 4($s1) /* 42A04C 802A932C 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) /* 42A050 802A9330 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) -/* 42A054 802A9334 0C0511FF */ jal set_hud_element_anim +/* 42A054 802A9334 0C0511FF */ jal hud_element_set_script /* 42A058 802A9338 00000000 */ nop /* 42A05C 802A933C 3C048000 */ lui $a0, 0x8000 /* 42A060 802A9340 34840041 */ ori $a0, $a0, 0x41 @@ -213,21 +213,21 @@ dlabel L802A936C_42A08C /* 42A230 802A9510 2A420050 */ slti $v0, $s2, 0x50 /* 42A234 802A9514 10400007 */ beqz $v0, .L802A9534 /* 42A238 802A9518 8E300004 */ lw $s0, 4($s1) -/* 42A23C 802A951C 0C05122C */ jal get_hud_element_anim +/* 42A23C 802A951C 0C05122C */ jal hud_element_get_script /* 42A240 802A9520 0200202D */ daddu $a0, $s0, $zero /* 42A244 802A9524 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) /* 42A248 802A9528 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) /* 42A24C 802A952C 080AA551 */ j .L802A9544 /* 42A250 802A9530 00000000 */ nop .L802A9534: -/* 42A254 802A9534 0C05122C */ jal get_hud_element_anim +/* 42A254 802A9534 0C05122C */ jal hud_element_get_script /* 42A258 802A9538 0200202D */ daddu $a0, $s0, $zero /* 42A25C 802A953C 3C058011 */ lui $a1, %hi(HudScript_PressAButton) /* 42A260 802A9540 24A58BBC */ addiu $a1, $a1, %lo(HudScript_PressAButton) .L802A9544: /* 42A264 802A9544 10450003 */ beq $v0, $a1, .L802A9554 /* 42A268 802A9548 00000000 */ nop -/* 42A26C 802A954C 0C0511FF */ jal set_hud_element_anim +/* 42A26C 802A954C 0C0511FF */ jal hud_element_set_script /* 42A270 802A9550 0200202D */ daddu $a0, $s0, $zero .L802A9554: /* 42A274 802A9554 86220054 */ lh $v0, 0x54($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s index ea82461202..5872192120 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s @@ -46,154 +46,154 @@ glabel func_802A9000_42A4F0 /* 42A590 802A90A0 2402FFD0 */ addiu $v0, $zero, -0x30 /* 42A594 802A90A4 A6420056 */ sh $v0, 0x56($s2) /* 42A598 802A90A8 24020050 */ addiu $v0, $zero, 0x50 -/* 42A59C 802A90AC 0C050529 */ jal create_hud_element +/* 42A59C 802A90AC 0C050529 */ jal hud_element_create /* 42A5A0 802A90B0 A6420058 */ sh $v0, 0x58($s2) /* 42A5A4 802A90B4 0040882D */ daddu $s1, $v0, $zero /* 42A5A8 802A90B8 0220202D */ daddu $a0, $s1, $zero /* 42A5AC 802A90BC 24050082 */ addiu $a1, $zero, 0x82 -/* 42A5B0 802A90C0 0C051280 */ jal set_hud_element_flags +/* 42A5B0 802A90C0 0C051280 */ jal hud_element_set_flags /* 42A5B4 802A90C4 AE510004 */ sw $s1, 4($s2) /* 42A5B8 802A90C8 86450056 */ lh $a1, 0x56($s2) /* 42A5BC 802A90CC 86460058 */ lh $a2, 0x58($s2) -/* 42A5C0 802A90D0 0C051261 */ jal set_hud_element_render_pos +/* 42A5C0 802A90D0 0C051261 */ jal hud_element_set_render_pos /* 42A5C4 802A90D4 0220202D */ daddu $a0, $s1, $zero /* 42A5C8 802A90D8 0220202D */ daddu $a0, $s1, $zero -/* 42A5CC 802A90DC 0C051277 */ jal set_hud_element_render_depth +/* 42A5CC 802A90DC 0C051277 */ jal hud_element_set_render_depth /* 42A5D0 802A90E0 0000282D */ daddu $a1, $zero, $zero /* 42A5D4 802A90E4 3C048029 */ lui $a0, %hi(HudScript_TimingBar3Chances) /* 42A5D8 802A90E8 24842AFC */ addiu $a0, $a0, %lo(HudScript_TimingBar3Chances) -/* 42A5DC 802A90EC 0C050529 */ jal create_hud_element +/* 42A5DC 802A90EC 0C050529 */ jal hud_element_create /* 42A5E0 802A90F0 00000000 */ nop /* 42A5E4 802A90F4 0040882D */ daddu $s1, $v0, $zero /* 42A5E8 802A90F8 86450056 */ lh $a1, 0x56($s2) /* 42A5EC 802A90FC 86460058 */ lh $a2, 0x58($s2) /* 42A5F0 802A9100 0220202D */ daddu $a0, $s1, $zero /* 42A5F4 802A9104 AE510008 */ sw $s1, 8($s2) -/* 42A5F8 802A9108 0C051261 */ jal set_hud_element_render_pos +/* 42A5F8 802A9108 0C051261 */ jal hud_element_set_render_pos /* 42A5FC 802A910C 24C6001C */ addiu $a2, $a2, 0x1c /* 42A600 802A9110 0220202D */ daddu $a0, $s1, $zero -/* 42A604 802A9114 0C051277 */ jal set_hud_element_render_depth +/* 42A604 802A9114 0C051277 */ jal hud_element_set_render_depth /* 42A608 802A9118 0000282D */ daddu $a1, $zero, $zero /* 42A60C 802A911C 0220202D */ daddu $a0, $s1, $zero -/* 42A610 802A9120 0C051280 */ jal set_hud_element_flags +/* 42A610 802A9120 0C051280 */ jal hud_element_set_flags /* 42A614 802A9124 24050082 */ addiu $a1, $zero, 0x82 /* 42A618 802A9128 3C108029 */ lui $s0, %hi(HudScript_TimingWait) /* 42A61C 802A912C 2610275C */ addiu $s0, $s0, %lo(HudScript_TimingWait) -/* 42A620 802A9130 0C050529 */ jal create_hud_element +/* 42A620 802A9130 0C050529 */ jal hud_element_create /* 42A624 802A9134 0200202D */ daddu $a0, $s0, $zero /* 42A628 802A9138 0040882D */ daddu $s1, $v0, $zero /* 42A62C 802A913C 86450056 */ lh $a1, 0x56($s2) /* 42A630 802A9140 86460058 */ lh $a2, 0x58($s2) /* 42A634 802A9144 0220202D */ daddu $a0, $s1, $zero /* 42A638 802A9148 AE51000C */ sw $s1, 0xc($s2) -/* 42A63C 802A914C 0C051261 */ jal set_hud_element_render_pos +/* 42A63C 802A914C 0C051261 */ jal hud_element_set_render_pos /* 42A640 802A9150 24C6001C */ addiu $a2, $a2, 0x1c /* 42A644 802A9154 0220202D */ daddu $a0, $s1, $zero -/* 42A648 802A9158 0C051277 */ jal set_hud_element_render_depth +/* 42A648 802A9158 0C051277 */ jal hud_element_set_render_depth /* 42A64C 802A915C 0000282D */ daddu $a1, $zero, $zero /* 42A650 802A9160 0220202D */ daddu $a0, $s1, $zero -/* 42A654 802A9164 0C051280 */ jal set_hud_element_flags +/* 42A654 802A9164 0C051280 */ jal hud_element_set_flags /* 42A658 802A9168 24050082 */ addiu $a1, $zero, 0x82 -/* 42A65C 802A916C 0C050529 */ jal create_hud_element +/* 42A65C 802A916C 0C050529 */ jal hud_element_create /* 42A660 802A9170 0200202D */ daddu $a0, $s0, $zero /* 42A664 802A9174 0040882D */ daddu $s1, $v0, $zero /* 42A668 802A9178 86450056 */ lh $a1, 0x56($s2) /* 42A66C 802A917C 86460058 */ lh $a2, 0x58($s2) /* 42A670 802A9180 0220202D */ daddu $a0, $s1, $zero /* 42A674 802A9184 AE510010 */ sw $s1, 0x10($s2) -/* 42A678 802A9188 0C051261 */ jal set_hud_element_render_pos +/* 42A678 802A9188 0C051261 */ jal hud_element_set_render_pos /* 42A67C 802A918C 24C6001C */ addiu $a2, $a2, 0x1c /* 42A680 802A9190 0220202D */ daddu $a0, $s1, $zero -/* 42A684 802A9194 0C051277 */ jal set_hud_element_render_depth +/* 42A684 802A9194 0C051277 */ jal hud_element_set_render_depth /* 42A688 802A9198 0000282D */ daddu $a1, $zero, $zero /* 42A68C 802A919C 0220202D */ daddu $a0, $s1, $zero -/* 42A690 802A91A0 0C051280 */ jal set_hud_element_flags +/* 42A690 802A91A0 0C051280 */ jal hud_element_set_flags /* 42A694 802A91A4 24050082 */ addiu $a1, $zero, 0x82 -/* 42A698 802A91A8 0C050529 */ jal create_hud_element +/* 42A698 802A91A8 0C050529 */ jal hud_element_create /* 42A69C 802A91AC 0200202D */ daddu $a0, $s0, $zero /* 42A6A0 802A91B0 0040882D */ daddu $s1, $v0, $zero /* 42A6A4 802A91B4 86450056 */ lh $a1, 0x56($s2) /* 42A6A8 802A91B8 86460058 */ lh $a2, 0x58($s2) /* 42A6AC 802A91BC 0220202D */ daddu $a0, $s1, $zero /* 42A6B0 802A91C0 AE510014 */ sw $s1, 0x14($s2) -/* 42A6B4 802A91C4 0C051261 */ jal set_hud_element_render_pos +/* 42A6B4 802A91C4 0C051261 */ jal hud_element_set_render_pos /* 42A6B8 802A91C8 24C6001C */ addiu $a2, $a2, 0x1c /* 42A6BC 802A91CC 0220202D */ daddu $a0, $s1, $zero -/* 42A6C0 802A91D0 0C051277 */ jal set_hud_element_render_depth +/* 42A6C0 802A91D0 0C051277 */ jal hud_element_set_render_depth /* 42A6C4 802A91D4 0000282D */ daddu $a1, $zero, $zero /* 42A6C8 802A91D8 0220202D */ daddu $a0, $s1, $zero -/* 42A6CC 802A91DC 0C051280 */ jal set_hud_element_flags +/* 42A6CC 802A91DC 0C051280 */ jal hud_element_set_flags /* 42A6D0 802A91E0 24050082 */ addiu $a1, $zero, 0x82 /* 42A6D4 802A91E4 3C108029 */ lui $s0, %hi(HudScript_TimingOK) /* 42A6D8 802A91E8 26102B54 */ addiu $s0, $s0, %lo(HudScript_TimingOK) -/* 42A6DC 802A91EC 0C050529 */ jal create_hud_element +/* 42A6DC 802A91EC 0C050529 */ jal hud_element_create /* 42A6E0 802A91F0 0200202D */ daddu $a0, $s0, $zero /* 42A6E4 802A91F4 0040882D */ daddu $s1, $v0, $zero /* 42A6E8 802A91F8 86450056 */ lh $a1, 0x56($s2) /* 42A6EC 802A91FC 86460058 */ lh $a2, 0x58($s2) /* 42A6F0 802A9200 0220202D */ daddu $a0, $s1, $zero -/* 42A6F4 802A9204 0C051261 */ jal set_hud_element_render_pos +/* 42A6F4 802A9204 0C051261 */ jal hud_element_set_render_pos /* 42A6F8 802A9208 AE51001C */ sw $s1, 0x1c($s2) /* 42A6FC 802A920C 0220202D */ daddu $a0, $s1, $zero -/* 42A700 802A9210 0C051277 */ jal set_hud_element_render_depth +/* 42A700 802A9210 0C051277 */ jal hud_element_set_render_depth /* 42A704 802A9214 0000282D */ daddu $a1, $zero, $zero /* 42A708 802A9218 0220202D */ daddu $a0, $s1, $zero -/* 42A70C 802A921C 0C051280 */ jal set_hud_element_flags +/* 42A70C 802A921C 0C051280 */ jal hud_element_set_flags /* 42A710 802A9220 24050082 */ addiu $a1, $zero, 0x82 -/* 42A714 802A9224 0C050529 */ jal create_hud_element +/* 42A714 802A9224 0C050529 */ jal hud_element_create /* 42A718 802A9228 0200202D */ daddu $a0, $s0, $zero /* 42A71C 802A922C 0040882D */ daddu $s1, $v0, $zero /* 42A720 802A9230 86450056 */ lh $a1, 0x56($s2) /* 42A724 802A9234 86460058 */ lh $a2, 0x58($s2) /* 42A728 802A9238 0220202D */ daddu $a0, $s1, $zero -/* 42A72C 802A923C 0C051261 */ jal set_hud_element_render_pos +/* 42A72C 802A923C 0C051261 */ jal hud_element_set_render_pos /* 42A730 802A9240 AE510020 */ sw $s1, 0x20($s2) /* 42A734 802A9244 0220202D */ daddu $a0, $s1, $zero -/* 42A738 802A9248 0C051277 */ jal set_hud_element_render_depth +/* 42A738 802A9248 0C051277 */ jal hud_element_set_render_depth /* 42A73C 802A924C 0000282D */ daddu $a1, $zero, $zero /* 42A740 802A9250 0220202D */ daddu $a0, $s1, $zero -/* 42A744 802A9254 0C051280 */ jal set_hud_element_flags +/* 42A744 802A9254 0C051280 */ jal hud_element_set_flags /* 42A748 802A9258 24050082 */ addiu $a1, $zero, 0x82 -/* 42A74C 802A925C 0C050529 */ jal create_hud_element +/* 42A74C 802A925C 0C050529 */ jal hud_element_create /* 42A750 802A9260 0200202D */ daddu $a0, $s0, $zero /* 42A754 802A9264 0040882D */ daddu $s1, $v0, $zero /* 42A758 802A9268 86450056 */ lh $a1, 0x56($s2) /* 42A75C 802A926C 86460058 */ lh $a2, 0x58($s2) /* 42A760 802A9270 0220202D */ daddu $a0, $s1, $zero -/* 42A764 802A9274 0C051261 */ jal set_hud_element_render_pos +/* 42A764 802A9274 0C051261 */ jal hud_element_set_render_pos /* 42A768 802A9278 AE510024 */ sw $s1, 0x24($s2) /* 42A76C 802A927C 0220202D */ daddu $a0, $s1, $zero -/* 42A770 802A9280 0C051277 */ jal set_hud_element_render_depth +/* 42A770 802A9280 0C051277 */ jal hud_element_set_render_depth /* 42A774 802A9284 0000282D */ daddu $a1, $zero, $zero /* 42A778 802A9288 0220202D */ daddu $a0, $s1, $zero -/* 42A77C 802A928C 0C051280 */ jal set_hud_element_flags +/* 42A77C 802A928C 0C051280 */ jal hud_element_set_flags /* 42A780 802A9290 24050082 */ addiu $a1, $zero, 0x82 /* 42A784 802A9294 3C04802B */ lui $a0, %hi(D_802AB184_42C674) -/* 42A788 802A9298 0C050529 */ jal create_hud_element +/* 42A788 802A9298 0C050529 */ jal hud_element_create /* 42A78C 802A929C 8C84B184 */ lw $a0, %lo(D_802AB184_42C674)($a0) /* 42A790 802A92A0 86450056 */ lh $a1, 0x56($s2) /* 42A794 802A92A4 86460058 */ lh $a2, 0x58($s2) /* 42A798 802A92A8 0040202D */ daddu $a0, $v0, $zero -/* 42A79C 802A92AC 0C051261 */ jal set_hud_element_render_pos +/* 42A79C 802A92AC 0C051261 */ jal hud_element_set_render_pos /* 42A7A0 802A92B0 AE44002C */ sw $a0, 0x2c($s2) /* 42A7A4 802A92B4 3C048029 */ lui $a0, %hi(HudScript_TimingCharge4c) /* 42A7A8 802A92B8 248428A0 */ addiu $a0, $a0, %lo(HudScript_TimingCharge4c) -/* 42A7AC 802A92BC 0C050529 */ jal create_hud_element +/* 42A7AC 802A92BC 0C050529 */ jal hud_element_create /* 42A7B0 802A92C0 00000000 */ nop /* 42A7B4 802A92C4 86450056 */ lh $a1, 0x56($s2) /* 42A7B8 802A92C8 86460058 */ lh $a2, 0x58($s2) /* 42A7BC 802A92CC 0040202D */ daddu $a0, $v0, $zero -/* 42A7C0 802A92D0 0C051261 */ jal set_hud_element_render_pos +/* 42A7C0 802A92D0 0C051261 */ jal hud_element_set_render_pos /* 42A7C4 802A92D4 AE440030 */ sw $a0, 0x30($s2) /* 42A7C8 802A92D8 3C048029 */ lui $a0, %hi(HudScript_TimingCharge4b) /* 42A7CC 802A92DC 24842848 */ addiu $a0, $a0, %lo(HudScript_TimingCharge4b) -/* 42A7D0 802A92E0 0C050529 */ jal create_hud_element +/* 42A7D0 802A92E0 0C050529 */ jal hud_element_create /* 42A7D4 802A92E4 00000000 */ nop /* 42A7D8 802A92E8 0040882D */ daddu $s1, $v0, $zero /* 42A7DC 802A92EC 86450056 */ lh $a1, 0x56($s2) /* 42A7E0 802A92F0 86460058 */ lh $a2, 0x58($s2) /* 42A7E4 802A92F4 0220202D */ daddu $a0, $s1, $zero -/* 42A7E8 802A92F8 0C051261 */ jal set_hud_element_render_pos +/* 42A7E8 802A92F8 0C051261 */ jal hud_element_set_render_pos /* 42A7EC 802A92FC AE510034 */ sw $s1, 0x34($s2) /* 42A7F0 802A9300 86430064 */ lh $v1, 0x64($s2) /* 42A7F4 802A9304 24020001 */ addiu $v0, $zero, 1 @@ -222,14 +222,14 @@ glabel func_802A9000_42A4F0 /* 42A840 802A9350 3C04802B */ lui $a0, %hi(D_802AB158_42C648) /* 42A844 802A9354 2484B158 */ addiu $a0, $a0, %lo(D_802AB158_42C648) .L802A9358: -/* 42A848 802A9358 0C050529 */ jal create_hud_element +/* 42A848 802A9358 0C050529 */ jal hud_element_create /* 42A84C 802A935C 00000000 */ nop /* 42A850 802A9360 AE420038 */ sw $v0, 0x38($s2) /* 42A854 802A9364 0040882D */ daddu $s1, $v0, $zero .L802A9368: /* 42A858 802A9368 86450056 */ lh $a1, 0x56($s2) /* 42A85C 802A936C 86460058 */ lh $a2, 0x58($s2) -/* 42A860 802A9370 0C051261 */ jal set_hud_element_render_pos +/* 42A860 802A9370 0C051261 */ jal hud_element_set_render_pos /* 42A864 802A9374 0220202D */ daddu $a0, $s1, $zero .L802A9378: /* 42A868 802A9378 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s index e967547bad..9a71e73291 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s @@ -26,90 +26,90 @@ dlabel L802A94D0_42A9C0 /* 42A9CC 802A94DC 8E300004 */ lw $s0, 4($s1) /* 42A9D0 802A94E0 10400004 */ beqz $v0, .L802A94F4 /* 42A9D4 802A94E4 0200202D */ daddu $a0, $s0, $zero -/* 42A9D8 802A94E8 0C05128B */ jal clear_hud_element_flags +/* 42A9D8 802A94E8 0C05128B */ jal hud_element_clear_flags /* 42A9DC 802A94EC 24050002 */ addiu $a1, $zero, 2 /* 42A9E0 802A94F0 0200202D */ daddu $a0, $s0, $zero .L802A94F4: -/* 42A9E4 802A94F4 0C0513AC */ jal set_hud_element_alpha +/* 42A9E4 802A94F4 0C0513AC */ jal hud_element_set_alpha /* 42A9E8 802A94F8 240500FF */ addiu $a1, $zero, 0xff /* 42A9EC 802A94FC 8E300008 */ lw $s0, 8($s1) /* 42A9F0 802A9500 240500FF */ addiu $a1, $zero, 0xff -/* 42A9F4 802A9504 0C0513AC */ jal set_hud_element_alpha +/* 42A9F4 802A9504 0C0513AC */ jal hud_element_set_alpha /* 42A9F8 802A9508 0200202D */ daddu $a0, $s0, $zero /* 42A9FC 802A950C 82220061 */ lb $v0, 0x61($s1) /* 42AA00 802A9510 10400003 */ beqz $v0, .L802A9520 /* 42AA04 802A9514 0200202D */ daddu $a0, $s0, $zero -/* 42AA08 802A9518 0C05128B */ jal clear_hud_element_flags +/* 42AA08 802A9518 0C05128B */ jal hud_element_clear_flags /* 42AA0C 802A951C 24050002 */ addiu $a1, $zero, 2 .L802A9520: /* 42AA10 802A9520 8E30000C */ lw $s0, 0xc($s1) /* 42AA14 802A9524 240500FF */ addiu $a1, $zero, 0xff -/* 42AA18 802A9528 0C0513AC */ jal set_hud_element_alpha +/* 42AA18 802A9528 0C0513AC */ jal hud_element_set_alpha /* 42AA1C 802A952C 0200202D */ daddu $a0, $s0, $zero /* 42AA20 802A9530 82220061 */ lb $v0, 0x61($s1) /* 42AA24 802A9534 10400003 */ beqz $v0, .L802A9544 /* 42AA28 802A9538 0200202D */ daddu $a0, $s0, $zero -/* 42AA2C 802A953C 0C05128B */ jal clear_hud_element_flags +/* 42AA2C 802A953C 0C05128B */ jal hud_element_clear_flags /* 42AA30 802A9540 24050002 */ addiu $a1, $zero, 2 .L802A9544: /* 42AA34 802A9544 8E300010 */ lw $s0, 0x10($s1) /* 42AA38 802A9548 240500FF */ addiu $a1, $zero, 0xff -/* 42AA3C 802A954C 0C0513AC */ jal set_hud_element_alpha +/* 42AA3C 802A954C 0C0513AC */ jal hud_element_set_alpha /* 42AA40 802A9550 0200202D */ daddu $a0, $s0, $zero /* 42AA44 802A9554 82220061 */ lb $v0, 0x61($s1) /* 42AA48 802A9558 10400003 */ beqz $v0, .L802A9568 /* 42AA4C 802A955C 0200202D */ daddu $a0, $s0, $zero -/* 42AA50 802A9560 0C05128B */ jal clear_hud_element_flags +/* 42AA50 802A9560 0C05128B */ jal hud_element_clear_flags /* 42AA54 802A9564 24050002 */ addiu $a1, $zero, 2 .L802A9568: /* 42AA58 802A9568 8E300014 */ lw $s0, 0x14($s1) /* 42AA5C 802A956C 240500FF */ addiu $a1, $zero, 0xff -/* 42AA60 802A9570 0C0513AC */ jal set_hud_element_alpha +/* 42AA60 802A9570 0C0513AC */ jal hud_element_set_alpha /* 42AA64 802A9574 0200202D */ daddu $a0, $s0, $zero /* 42AA68 802A9578 82220061 */ lb $v0, 0x61($s1) /* 42AA6C 802A957C 10400003 */ beqz $v0, .L802A958C /* 42AA70 802A9580 0200202D */ daddu $a0, $s0, $zero -/* 42AA74 802A9584 0C05128B */ jal clear_hud_element_flags +/* 42AA74 802A9584 0C05128B */ jal hud_element_clear_flags /* 42AA78 802A9588 24050002 */ addiu $a1, $zero, 2 .L802A958C: /* 42AA7C 802A958C 8E30002C */ lw $s0, 0x2c($s1) /* 42AA80 802A9590 240500FF */ addiu $a1, $zero, 0xff -/* 42AA84 802A9594 0C0513AC */ jal set_hud_element_alpha +/* 42AA84 802A9594 0C0513AC */ jal hud_element_set_alpha /* 42AA88 802A9598 0200202D */ daddu $a0, $s0, $zero /* 42AA8C 802A959C 82220061 */ lb $v0, 0x61($s1) /* 42AA90 802A95A0 10400003 */ beqz $v0, .L802A95B0 /* 42AA94 802A95A4 0200202D */ daddu $a0, $s0, $zero -/* 42AA98 802A95A8 0C05128B */ jal clear_hud_element_flags +/* 42AA98 802A95A8 0C05128B */ jal hud_element_clear_flags /* 42AA9C 802A95AC 24050002 */ addiu $a1, $zero, 2 .L802A95B0: /* 42AAA0 802A95B0 8E300030 */ lw $s0, 0x30($s1) /* 42AAA4 802A95B4 240500FF */ addiu $a1, $zero, 0xff -/* 42AAA8 802A95B8 0C0513AC */ jal set_hud_element_alpha +/* 42AAA8 802A95B8 0C0513AC */ jal hud_element_set_alpha /* 42AAAC 802A95BC 0200202D */ daddu $a0, $s0, $zero /* 42AAB0 802A95C0 82220061 */ lb $v0, 0x61($s1) /* 42AAB4 802A95C4 10400003 */ beqz $v0, .L802A95D4 /* 42AAB8 802A95C8 0200202D */ daddu $a0, $s0, $zero -/* 42AABC 802A95CC 0C05128B */ jal clear_hud_element_flags +/* 42AABC 802A95CC 0C05128B */ jal hud_element_clear_flags /* 42AAC0 802A95D0 24050002 */ addiu $a1, $zero, 2 .L802A95D4: /* 42AAC4 802A95D4 8E300034 */ lw $s0, 0x34($s1) /* 42AAC8 802A95D8 240500FF */ addiu $a1, $zero, 0xff -/* 42AACC 802A95DC 0C0513AC */ jal set_hud_element_alpha +/* 42AACC 802A95DC 0C0513AC */ jal hud_element_set_alpha /* 42AAD0 802A95E0 0200202D */ daddu $a0, $s0, $zero /* 42AAD4 802A95E4 82220061 */ lb $v0, 0x61($s1) /* 42AAD8 802A95E8 10400003 */ beqz $v0, .L802A95F8 /* 42AADC 802A95EC 0200202D */ daddu $a0, $s0, $zero -/* 42AAE0 802A95F0 0C05128B */ jal clear_hud_element_flags +/* 42AAE0 802A95F0 0C05128B */ jal hud_element_clear_flags /* 42AAE4 802A95F4 24050002 */ addiu $a1, $zero, 2 .L802A95F8: /* 42AAE8 802A95F8 8E300038 */ lw $s0, 0x38($s1) /* 42AAEC 802A95FC 240500FF */ addiu $a1, $zero, 0xff -/* 42AAF0 802A9600 0C0513AC */ jal set_hud_element_alpha +/* 42AAF0 802A9600 0C0513AC */ jal hud_element_set_alpha /* 42AAF4 802A9604 0200202D */ daddu $a0, $s0, $zero /* 42AAF8 802A9608 82220061 */ lb $v0, 0x61($s1) /* 42AAFC 802A960C 10400003 */ beqz $v0, .L802A961C /* 42AB00 802A9610 0200202D */ daddu $a0, $s0, $zero -/* 42AB04 802A9614 0C05128B */ jal clear_hud_element_flags +/* 42AB04 802A9614 0C05128B */ jal hud_element_clear_flags /* 42AB08 802A9618 24050002 */ addiu $a1, $zero, 2 .L802A961C: /* 42AB0C 802A961C 24020001 */ addiu $v0, $zero, 1 @@ -137,31 +137,31 @@ dlabel L802A9628_42AB18 .L802A966C: /* 42AB5C 802A966C 8E240004 */ lw $a0, 4($s1) /* 42AB60 802A9670 86250056 */ lh $a1, 0x56($s1) -/* 42AB64 802A9674 0C051261 */ jal set_hud_element_render_pos +/* 42AB64 802A9674 0C051261 */ jal hud_element_set_render_pos /* 42AB68 802A9678 86260058 */ lh $a2, 0x58($s1) /* 42AB6C 802A967C 8E240008 */ lw $a0, 8($s1) /* 42AB70 802A9680 86250056 */ lh $a1, 0x56($s1) /* 42AB74 802A9684 86260058 */ lh $a2, 0x58($s1) /* 42AB78 802A9688 24A5001C */ addiu $a1, $a1, 0x1c -/* 42AB7C 802A968C 0C051261 */ jal set_hud_element_render_pos +/* 42AB7C 802A968C 0C051261 */ jal hud_element_set_render_pos /* 42AB80 802A9690 24C6001C */ addiu $a2, $a2, 0x1c /* 42AB84 802A9694 8E24000C */ lw $a0, 0xc($s1) /* 42AB88 802A9698 86250056 */ lh $a1, 0x56($s1) /* 42AB8C 802A969C 86260058 */ lh $a2, 0x58($s1) /* 42AB90 802A96A0 24A50015 */ addiu $a1, $a1, 0x15 -/* 42AB94 802A96A4 0C051261 */ jal set_hud_element_render_pos +/* 42AB94 802A96A4 0C051261 */ jal hud_element_set_render_pos /* 42AB98 802A96A8 24C60018 */ addiu $a2, $a2, 0x18 /* 42AB9C 802A96AC 8E240010 */ lw $a0, 0x10($s1) /* 42ABA0 802A96B0 86250056 */ lh $a1, 0x56($s1) /* 42ABA4 802A96B4 86260058 */ lh $a2, 0x58($s1) /* 42ABA8 802A96B8 24A50029 */ addiu $a1, $a1, 0x29 -/* 42ABAC 802A96BC 0C051261 */ jal set_hud_element_render_pos +/* 42ABAC 802A96BC 0C051261 */ jal hud_element_set_render_pos /* 42ABB0 802A96C0 24C60018 */ addiu $a2, $a2, 0x18 /* 42ABB4 802A96C4 8E240014 */ lw $a0, 0x14($s1) /* 42ABB8 802A96C8 86250056 */ lh $a1, 0x56($s1) /* 42ABBC 802A96CC 86260058 */ lh $a2, 0x58($s1) /* 42ABC0 802A96D0 24A5003D */ addiu $a1, $a1, 0x3d -/* 42ABC4 802A96D4 0C051261 */ jal set_hud_element_render_pos +/* 42ABC4 802A96D4 0C051261 */ jal hud_element_set_render_pos /* 42ABC8 802A96D8 24C60018 */ addiu $a2, $a2, 0x18 /* 42ABCC 802A96DC 24020001 */ addiu $v0, $zero, 1 /* 42ABD0 802A96E0 86230064 */ lh $v1, 0x64($s1) @@ -193,26 +193,26 @@ dlabel L802A9628_42AB18 /* 42AC28 802A9738 24A5005B */ addiu $a1, $a1, 0x5b /* 42AC2C 802A973C 24C6000D */ addiu $a2, $a2, 0xd .L802A9740: -/* 42AC30 802A9740 0C051261 */ jal set_hud_element_render_pos +/* 42AC30 802A9740 0C051261 */ jal hud_element_set_render_pos /* 42AC34 802A9744 00000000 */ nop .L802A9748: /* 42AC38 802A9748 8E240030 */ lw $a0, 0x30($s1) /* 42AC3C 802A974C 86250056 */ lh $a1, 0x56($s1) /* 42AC40 802A9750 86260058 */ lh $a2, 0x58($s1) /* 42AC44 802A9754 24A5FFFB */ addiu $a1, $a1, -5 -/* 42AC48 802A9758 0C051261 */ jal set_hud_element_render_pos +/* 42AC48 802A9758 0C051261 */ jal hud_element_set_render_pos /* 42AC4C 802A975C 24C6001D */ addiu $a2, $a2, 0x1d /* 42AC50 802A9760 8E240034 */ lw $a0, 0x34($s1) /* 42AC54 802A9764 86250056 */ lh $a1, 0x56($s1) /* 42AC58 802A9768 86260058 */ lh $a2, 0x58($s1) /* 42AC5C 802A976C 24A50007 */ addiu $a1, $a1, 7 -/* 42AC60 802A9770 0C051261 */ jal set_hud_element_render_pos +/* 42AC60 802A9770 0C051261 */ jal hud_element_set_render_pos /* 42AC64 802A9774 24C6001D */ addiu $a2, $a2, 0x1d /* 42AC68 802A9778 8E240038 */ lw $a0, 0x38($s1) /* 42AC6C 802A977C 86250056 */ lh $a1, 0x56($s1) /* 42AC70 802A9780 86260058 */ lh $a2, 0x58($s1) /* 42AC74 802A9784 24A5005C */ addiu $a1, $a1, 0x5c -/* 42AC78 802A9788 0C051261 */ jal set_hud_element_render_pos +/* 42AC78 802A9788 0C051261 */ jal hud_element_set_render_pos /* 42AC7C 802A978C 24C60017 */ addiu $a2, $a2, 0x17 /* 42AC80 802A9790 080AA800 */ j L802AA000_42B4F0 /* 42AC84 802A9794 00000000 */ nop @@ -248,7 +248,7 @@ dlabel L802A97E4_42ACD4 /* 42ACEC 802A97FC 8E240030 */ lw $a0, 0x30($s1) /* 42ACF0 802A9800 3C058029 */ lui $a1, %hi(HudScript_TimingCharge3) /* 42ACF4 802A9804 24A528CC */ addiu $a1, $a1, %lo(HudScript_TimingCharge3) -/* 42ACF8 802A9808 0C0511FF */ jal set_hud_element_anim +/* 42ACF8 802A9808 0C0511FF */ jal hud_element_set_script /* 42ACFC 802A980C 00000000 */ nop /* 42AD00 802A9810 0C05272D */ jal sfx_play_sound /* 42AD04 802A9814 24040233 */ addiu $a0, $zero, 0x233 @@ -260,7 +260,7 @@ dlabel L802A97E4_42ACD4 /* 42AD18 802A9828 8E240034 */ lw $a0, 0x34($s1) /* 42AD1C 802A982C 3C058029 */ lui $a1, %hi(HudScript_TimingCharge2) /* 42AD20 802A9830 24A52874 */ addiu $a1, $a1, %lo(HudScript_TimingCharge2) -/* 42AD24 802A9834 0C0511FF */ jal set_hud_element_anim +/* 42AD24 802A9834 0C0511FF */ jal hud_element_set_script /* 42AD28 802A9838 00000000 */ nop /* 42AD2C 802A983C 0C05272D */ jal sfx_play_sound /* 42AD30 802A9840 24040233 */ addiu $a0, $zero, 0x233 @@ -272,12 +272,12 @@ dlabel L802A97E4_42ACD4 /* 42AD44 802A9854 8E24000C */ lw $a0, 0xc($s1) /* 42AD48 802A9858 3C058029 */ lui $a1, %hi(HudScript_TimingReady) /* 42AD4C 802A985C 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) -/* 42AD50 802A9860 0C0511FF */ jal set_hud_element_anim +/* 42AD50 802A9860 0C0511FF */ jal hud_element_set_script /* 42AD54 802A9864 00000000 */ nop /* 42AD58 802A9868 8E240004 */ lw $a0, 4($s1) /* 42AD5C 802A986C 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) /* 42AD60 802A9870 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) -/* 42AD64 802A9874 0C0511FF */ jal set_hud_element_anim +/* 42AD64 802A9874 0C0511FF */ jal hud_element_set_script /* 42AD68 802A9878 00000000 */ nop /* 42AD6C 802A987C 0C05272D */ jal sfx_play_sound /* 42AD70 802A9880 24040234 */ addiu $a0, $zero, 0x234 @@ -386,16 +386,16 @@ dlabel L802A98A8_42AD98 /* 42AED8 802A99E8 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) /* 42AEDC 802A99EC 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) .L802A99F0: -/* 42AEE0 802A99F0 0C0511FF */ jal set_hud_element_anim +/* 42AEE0 802A99F0 0C0511FF */ jal hud_element_set_script /* 42AEE4 802A99F4 00000000 */ nop /* 42AEE8 802A99F8 0200202D */ daddu $a0, $s0, $zero /* 42AEEC 802A99FC 86250056 */ lh $a1, 0x56($s1) /* 42AEF0 802A9A00 86260058 */ lh $a2, 0x58($s1) /* 42AEF4 802A9A04 24A5001C */ addiu $a1, $a1, 0x1c -/* 42AEF8 802A9A08 0C051261 */ jal set_hud_element_render_pos +/* 42AEF8 802A9A08 0C051261 */ jal hud_element_set_render_pos /* 42AEFC 802A9A0C 24C60026 */ addiu $a2, $a2, 0x26 /* 42AF00 802A9A10 0200202D */ daddu $a0, $s0, $zero -/* 42AF04 802A9A14 0C05128B */ jal clear_hud_element_flags +/* 42AF04 802A9A14 0C05128B */ jal hud_element_clear_flags /* 42AF08 802A9A18 24050002 */ addiu $a1, $zero, 2 .L802A9A1C: /* 42AF0C 802A9A1C 8223005D */ lb $v1, 0x5d($s1) @@ -414,21 +414,21 @@ dlabel L802A98A8_42AD98 /* 42AF3C 802A9A4C 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) /* 42AF40 802A9A50 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) .L802A9A54: -/* 42AF44 802A9A54 0C0511FF */ jal set_hud_element_anim +/* 42AF44 802A9A54 0C0511FF */ jal hud_element_set_script /* 42AF48 802A9A58 00000000 */ nop /* 42AF4C 802A9A5C 0200202D */ daddu $a0, $s0, $zero /* 42AF50 802A9A60 86250056 */ lh $a1, 0x56($s1) /* 42AF54 802A9A64 86260058 */ lh $a2, 0x58($s1) /* 42AF58 802A9A68 24A5001C */ addiu $a1, $a1, 0x1c -/* 42AF5C 802A9A6C 0C051261 */ jal set_hud_element_render_pos +/* 42AF5C 802A9A6C 0C051261 */ jal hud_element_set_render_pos /* 42AF60 802A9A70 24C60026 */ addiu $a2, $a2, 0x26 /* 42AF64 802A9A74 0200202D */ daddu $a0, $s0, $zero -/* 42AF68 802A9A78 0C05128B */ jal clear_hud_element_flags +/* 42AF68 802A9A78 0C05128B */ jal hud_element_clear_flags /* 42AF6C 802A9A7C 24050002 */ addiu $a1, $zero, 2 /* 42AF70 802A9A80 8E240004 */ lw $a0, 4($s1) /* 42AF74 802A9A84 3C058011 */ lui $a1, %hi(HudScript_AButton) /* 42AF78 802A9A88 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) -/* 42AF7C 802A9A8C 0C0511FF */ jal set_hud_element_anim +/* 42AF7C 802A9A8C 0C0511FF */ jal hud_element_set_script /* 42AF80 802A9A90 00000000 */ nop .L802A9A94: /* 42AF84 802A9A94 9222005D */ lbu $v0, 0x5d($s1) @@ -441,12 +441,12 @@ dlabel L802A98A8_42AD98 /* 42AFA0 802A9AB0 8E240010 */ lw $a0, 0x10($s1) /* 42AFA4 802A9AB4 3C058029 */ lui $a1, %hi(HudScript_TimingReady) /* 42AFA8 802A9AB8 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) -/* 42AFAC 802A9ABC 0C0511FF */ jal set_hud_element_anim +/* 42AFAC 802A9ABC 0C0511FF */ jal hud_element_set_script /* 42AFB0 802A9AC0 00000000 */ nop /* 42AFB4 802A9AC4 8E240004 */ lw $a0, 4($s1) /* 42AFB8 802A9AC8 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) /* 42AFBC 802A9ACC 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) -/* 42AFC0 802A9AD0 0C0511FF */ jal set_hud_element_anim +/* 42AFC0 802A9AD0 0C0511FF */ jal hud_element_set_script /* 42AFC4 802A9AD4 00000000 */ nop /* 42AFC8 802A9AD8 0C05272D */ jal sfx_play_sound /* 42AFCC 802A9ADC 24040234 */ addiu $a0, $zero, 0x234 @@ -559,16 +559,16 @@ dlabel L802A9B04_42AFF4 /* 42B140 802A9C50 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) /* 42B144 802A9C54 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) .L802A9C58: -/* 42B148 802A9C58 0C0511FF */ jal set_hud_element_anim +/* 42B148 802A9C58 0C0511FF */ jal hud_element_set_script /* 42B14C 802A9C5C 00000000 */ nop /* 42B150 802A9C60 0200202D */ daddu $a0, $s0, $zero /* 42B154 802A9C64 86250056 */ lh $a1, 0x56($s1) /* 42B158 802A9C68 86260058 */ lh $a2, 0x58($s1) /* 42B15C 802A9C6C 24A50030 */ addiu $a1, $a1, 0x30 -/* 42B160 802A9C70 0C051261 */ jal set_hud_element_render_pos +/* 42B160 802A9C70 0C051261 */ jal hud_element_set_render_pos /* 42B164 802A9C74 24C60026 */ addiu $a2, $a2, 0x26 /* 42B168 802A9C78 0200202D */ daddu $a0, $s0, $zero -/* 42B16C 802A9C7C 0C05128B */ jal clear_hud_element_flags +/* 42B16C 802A9C7C 0C05128B */ jal hud_element_clear_flags /* 42B170 802A9C80 24050002 */ addiu $a1, $zero, 2 .L802A9C84: /* 42B174 802A9C84 8223005D */ lb $v1, 0x5d($s1) @@ -587,21 +587,21 @@ dlabel L802A9B04_42AFF4 /* 42B1A4 802A9CB4 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) /* 42B1A8 802A9CB8 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) .L802A9CBC: -/* 42B1AC 802A9CBC 0C0511FF */ jal set_hud_element_anim +/* 42B1AC 802A9CBC 0C0511FF */ jal hud_element_set_script /* 42B1B0 802A9CC0 00000000 */ nop /* 42B1B4 802A9CC4 0200202D */ daddu $a0, $s0, $zero /* 42B1B8 802A9CC8 86250056 */ lh $a1, 0x56($s1) /* 42B1BC 802A9CCC 86260058 */ lh $a2, 0x58($s1) /* 42B1C0 802A9CD0 24A50030 */ addiu $a1, $a1, 0x30 -/* 42B1C4 802A9CD4 0C051261 */ jal set_hud_element_render_pos +/* 42B1C4 802A9CD4 0C051261 */ jal hud_element_set_render_pos /* 42B1C8 802A9CD8 24C60026 */ addiu $a2, $a2, 0x26 /* 42B1CC 802A9CDC 0200202D */ daddu $a0, $s0, $zero -/* 42B1D0 802A9CE0 0C05128B */ jal clear_hud_element_flags +/* 42B1D0 802A9CE0 0C05128B */ jal hud_element_clear_flags /* 42B1D4 802A9CE4 24050002 */ addiu $a1, $zero, 2 /* 42B1D8 802A9CE8 8E240004 */ lw $a0, 4($s1) /* 42B1DC 802A9CEC 3C058011 */ lui $a1, %hi(HudScript_AButton) /* 42B1E0 802A9CF0 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) -/* 42B1E4 802A9CF4 0C0511FF */ jal set_hud_element_anim +/* 42B1E4 802A9CF4 0C0511FF */ jal hud_element_set_script /* 42B1E8 802A9CF8 00000000 */ nop .L802A9CFC: /* 42B1EC 802A9CFC 9222005D */ lbu $v0, 0x5d($s1) @@ -614,12 +614,12 @@ dlabel L802A9B04_42AFF4 /* 42B208 802A9D18 8E240014 */ lw $a0, 0x14($s1) /* 42B20C 802A9D1C 3C058029 */ lui $a1, %hi(HudScript_TimingReady) /* 42B210 802A9D20 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) -/* 42B214 802A9D24 0C0511FF */ jal set_hud_element_anim +/* 42B214 802A9D24 0C0511FF */ jal hud_element_set_script /* 42B218 802A9D28 00000000 */ nop /* 42B21C 802A9D2C 8E240004 */ lw $a0, 4($s1) /* 42B220 802A9D30 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) /* 42B224 802A9D34 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) -/* 42B228 802A9D38 0C0511FF */ jal set_hud_element_anim +/* 42B228 802A9D38 0C0511FF */ jal hud_element_set_script /* 42B22C 802A9D3C 00000000 */ nop /* 42B230 802A9D40 0C05272D */ jal sfx_play_sound /* 42B234 802A9D44 24040234 */ addiu $a0, $zero, 0x234 @@ -737,16 +737,16 @@ dlabel L802A9D7C_42B26C /* 42B3B8 802A9EC8 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) /* 42B3BC 802A9ECC 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) .L802A9ED0: -/* 42B3C0 802A9ED0 0C0511FF */ jal set_hud_element_anim +/* 42B3C0 802A9ED0 0C0511FF */ jal hud_element_set_script /* 42B3C4 802A9ED4 00000000 */ nop /* 42B3C8 802A9ED8 0200202D */ daddu $a0, $s0, $zero /* 42B3CC 802A9EDC 86250056 */ lh $a1, 0x56($s1) /* 42B3D0 802A9EE0 86260058 */ lh $a2, 0x58($s1) /* 42B3D4 802A9EE4 24A50044 */ addiu $a1, $a1, 0x44 -/* 42B3D8 802A9EE8 0C051261 */ jal set_hud_element_render_pos +/* 42B3D8 802A9EE8 0C051261 */ jal hud_element_set_render_pos /* 42B3DC 802A9EEC 24C60026 */ addiu $a2, $a2, 0x26 /* 42B3E0 802A9EF0 0200202D */ daddu $a0, $s0, $zero -/* 42B3E4 802A9EF4 0C05128B */ jal clear_hud_element_flags +/* 42B3E4 802A9EF4 0C05128B */ jal hud_element_clear_flags /* 42B3E8 802A9EF8 24050002 */ addiu $a1, $zero, 2 /* 42B3EC 802A9EFC 2403FFFB */ addiu $v1, $zero, -5 .L802A9F00: @@ -766,21 +766,21 @@ dlabel L802A9D7C_42B26C /* 42B420 802A9F30 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) /* 42B424 802A9F34 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) .L802A9F38: -/* 42B428 802A9F38 0C0511FF */ jal set_hud_element_anim +/* 42B428 802A9F38 0C0511FF */ jal hud_element_set_script /* 42B42C 802A9F3C 00000000 */ nop /* 42B430 802A9F40 0200202D */ daddu $a0, $s0, $zero /* 42B434 802A9F44 86250056 */ lh $a1, 0x56($s1) /* 42B438 802A9F48 86260058 */ lh $a2, 0x58($s1) /* 42B43C 802A9F4C 24A50044 */ addiu $a1, $a1, 0x44 -/* 42B440 802A9F50 0C051261 */ jal set_hud_element_render_pos +/* 42B440 802A9F50 0C051261 */ jal hud_element_set_render_pos /* 42B444 802A9F54 24C60026 */ addiu $a2, $a2, 0x26 /* 42B448 802A9F58 0200202D */ daddu $a0, $s0, $zero -/* 42B44C 802A9F5C 0C05128B */ jal clear_hud_element_flags +/* 42B44C 802A9F5C 0C05128B */ jal hud_element_clear_flags /* 42B450 802A9F60 24050002 */ addiu $a1, $zero, 2 /* 42B454 802A9F64 8E240004 */ lw $a0, 4($s1) /* 42B458 802A9F68 3C058011 */ lui $a1, %hi(HudScript_AButton) /* 42B45C 802A9F6C 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) -/* 42B460 802A9F70 0C0511FF */ jal set_hud_element_anim +/* 42B460 802A9F70 0C0511FF */ jal hud_element_set_script /* 42B464 802A9F74 00000000 */ nop /* 42B468 802A9F78 24020010 */ addiu $v0, $zero, 0x10 /* 42B46C 802A9F7C 080AA800 */ j L802AA000_42B4F0 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s index 813e5ca3a2..d77a3222f1 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s @@ -51,39 +51,39 @@ glabel func_802A9000_423C70 /* 423D1C 802A90AC 2402FFD0 */ addiu $v0, $zero, -0x30 /* 423D20 802A90B0 A6220056 */ sh $v0, 0x56($s1) /* 423D24 802A90B4 24020050 */ addiu $v0, $zero, 0x50 -/* 423D28 802A90B8 0C050529 */ jal create_hud_element +/* 423D28 802A90B8 0C050529 */ jal hud_element_create /* 423D2C 802A90BC A6220058 */ sh $v0, 0x58($s1) /* 423D30 802A90C0 0040802D */ daddu $s0, $v0, $zero /* 423D34 802A90C4 0200202D */ daddu $a0, $s0, $zero /* 423D38 802A90C8 24050082 */ addiu $a1, $zero, 0x82 -/* 423D3C 802A90CC 0C051280 */ jal set_hud_element_flags +/* 423D3C 802A90CC 0C051280 */ jal hud_element_set_flags /* 423D40 802A90D0 AE300004 */ sw $s0, 4($s1) /* 423D44 802A90D4 86250056 */ lh $a1, 0x56($s1) /* 423D48 802A90D8 86260058 */ lh $a2, 0x58($s1) -/* 423D4C 802A90DC 0C051261 */ jal set_hud_element_render_pos +/* 423D4C 802A90DC 0C051261 */ jal hud_element_set_render_pos /* 423D50 802A90E0 0200202D */ daddu $a0, $s0, $zero /* 423D54 802A90E4 0200202D */ daddu $a0, $s0, $zero -/* 423D58 802A90E8 0C051277 */ jal set_hud_element_render_depth +/* 423D58 802A90E8 0C051277 */ jal hud_element_set_render_depth /* 423D5C 802A90EC 0000282D */ daddu $a1, $zero, $zero /* 423D60 802A90F0 3C048011 */ lui $a0, %hi(HudScript_BlueMeter) /* 423D64 802A90F4 24848AFC */ addiu $a0, $a0, %lo(HudScript_BlueMeter) -/* 423D68 802A90F8 0C050529 */ jal create_hud_element +/* 423D68 802A90F8 0C050529 */ jal hud_element_create /* 423D6C 802A90FC 00000000 */ nop /* 423D70 802A9100 0040802D */ daddu $s0, $v0, $zero /* 423D74 802A9104 86250056 */ lh $a1, 0x56($s1) /* 423D78 802A9108 86260058 */ lh $a2, 0x58($s1) /* 423D7C 802A910C 0200202D */ daddu $a0, $s0, $zero /* 423D80 802A9110 AE300008 */ sw $s0, 8($s1) -/* 423D84 802A9114 0C051261 */ jal set_hud_element_render_pos +/* 423D84 802A9114 0C051261 */ jal hud_element_set_render_pos /* 423D88 802A9118 24C6001C */ addiu $a2, $a2, 0x1c /* 423D8C 802A911C 0200202D */ daddu $a0, $s0, $zero -/* 423D90 802A9120 0C051277 */ jal set_hud_element_render_depth +/* 423D90 802A9120 0C051277 */ jal hud_element_set_render_depth /* 423D94 802A9124 0000282D */ daddu $a1, $zero, $zero /* 423D98 802A9128 0200202D */ daddu $a0, $s0, $zero -/* 423D9C 802A912C 0C051280 */ jal set_hud_element_flags +/* 423D9C 802A912C 0C051280 */ jal hud_element_set_flags /* 423DA0 802A9130 24050082 */ addiu $a1, $zero, 0x82 /* 423DA4 802A9134 3C04802B */ lui $a0, %hi(D_802AA7F0_425460) -/* 423DA8 802A9138 0C050529 */ jal create_hud_element +/* 423DA8 802A9138 0C050529 */ jal hud_element_create /* 423DAC 802A913C 2484A7F0 */ addiu $a0, $a0, %lo(D_802AA7F0_425460) /* 423DB0 802A9140 0040802D */ daddu $s0, $v0, $zero /* 423DB4 802A9144 86250056 */ lh $a1, 0x56($s1) @@ -91,16 +91,16 @@ glabel func_802A9000_423C70 /* 423DBC 802A914C 0200202D */ daddu $a0, $s0, $zero /* 423DC0 802A9150 AE30000C */ sw $s0, 0xc($s1) /* 423DC4 802A9154 24A50036 */ addiu $a1, $a1, 0x36 -/* 423DC8 802A9158 0C051261 */ jal set_hud_element_render_pos +/* 423DC8 802A9158 0C051261 */ jal hud_element_set_render_pos /* 423DCC 802A915C 24C6001C */ addiu $a2, $a2, 0x1c /* 423DD0 802A9160 0200202D */ daddu $a0, $s0, $zero -/* 423DD4 802A9164 0C051277 */ jal set_hud_element_render_depth +/* 423DD4 802A9164 0C051277 */ jal hud_element_set_render_depth /* 423DD8 802A9168 0000282D */ daddu $a1, $zero, $zero /* 423DDC 802A916C 0200202D */ daddu $a0, $s0, $zero -/* 423DE0 802A9170 0C051280 */ jal set_hud_element_flags +/* 423DE0 802A9170 0C051280 */ jal hud_element_set_flags /* 423DE4 802A9174 24050082 */ addiu $a1, $zero, 0x82 /* 423DE8 802A9178 3C04802B */ lui $a0, %hi(D_802AA818_425488) -/* 423DEC 802A917C 0C050529 */ jal create_hud_element +/* 423DEC 802A917C 0C050529 */ jal hud_element_create /* 423DF0 802A9180 2484A818 */ addiu $a0, $a0, %lo(D_802AA818_425488) /* 423DF4 802A9184 0040802D */ daddu $s0, $v0, $zero /* 423DF8 802A9188 86250056 */ lh $a1, 0x56($s1) @@ -108,13 +108,13 @@ glabel func_802A9000_423C70 /* 423E00 802A9190 0200202D */ daddu $a0, $s0, $zero /* 423E04 802A9194 AE300010 */ sw $s0, 0x10($s1) /* 423E08 802A9198 24A5003C */ addiu $a1, $a1, 0x3c -/* 423E0C 802A919C 0C051261 */ jal set_hud_element_render_pos +/* 423E0C 802A919C 0C051261 */ jal hud_element_set_render_pos /* 423E10 802A91A0 24C6001C */ addiu $a2, $a2, 0x1c /* 423E14 802A91A4 0200202D */ daddu $a0, $s0, $zero -/* 423E18 802A91A8 0C051277 */ jal set_hud_element_render_depth +/* 423E18 802A91A8 0C051277 */ jal hud_element_set_render_depth /* 423E1C 802A91AC 0000282D */ daddu $a1, $zero, $zero /* 423E20 802A91B0 0200202D */ daddu $a0, $s0, $zero -/* 423E24 802A91B4 0C051280 */ jal set_hud_element_flags +/* 423E24 802A91B4 0C051280 */ jal hud_element_set_flags /* 423E28 802A91B8 24050082 */ addiu $a1, $zero, 0x82 .L802A91BC: /* 423E2C 802A91BC 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s index f9f7ffbdef..1756b3431c 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s @@ -27,40 +27,40 @@ dlabel L802A9338_423FA8 /* 423FB4 802A9344 8E300004 */ lw $s0, 4($s1) /* 423FB8 802A9348 10400004 */ beqz $v0, .L802A935C /* 423FBC 802A934C 0200202D */ daddu $a0, $s0, $zero -/* 423FC0 802A9350 0C05128B */ jal clear_hud_element_flags +/* 423FC0 802A9350 0C05128B */ jal hud_element_clear_flags /* 423FC4 802A9354 24050002 */ addiu $a1, $zero, 2 /* 423FC8 802A9358 0200202D */ daddu $a0, $s0, $zero .L802A935C: -/* 423FCC 802A935C 0C0513AC */ jal set_hud_element_alpha +/* 423FCC 802A935C 0C0513AC */ jal hud_element_set_alpha /* 423FD0 802A9360 240500FF */ addiu $a1, $zero, 0xff /* 423FD4 802A9364 8E300008 */ lw $s0, 8($s1) /* 423FD8 802A9368 240500FF */ addiu $a1, $zero, 0xff -/* 423FDC 802A936C 0C0513AC */ jal set_hud_element_alpha +/* 423FDC 802A936C 0C0513AC */ jal hud_element_set_alpha /* 423FE0 802A9370 0200202D */ daddu $a0, $s0, $zero /* 423FE4 802A9374 82220061 */ lb $v0, 0x61($s1) /* 423FE8 802A9378 10400003 */ beqz $v0, .L802A9388 /* 423FEC 802A937C 0200202D */ daddu $a0, $s0, $zero -/* 423FF0 802A9380 0C05128B */ jal clear_hud_element_flags +/* 423FF0 802A9380 0C05128B */ jal hud_element_clear_flags /* 423FF4 802A9384 24050002 */ addiu $a1, $zero, 2 .L802A9388: /* 423FF8 802A9388 8E30000C */ lw $s0, 0xc($s1) /* 423FFC 802A938C 240500FF */ addiu $a1, $zero, 0xff -/* 424000 802A9390 0C0513AC */ jal set_hud_element_alpha +/* 424000 802A9390 0C0513AC */ jal hud_element_set_alpha /* 424004 802A9394 0200202D */ daddu $a0, $s0, $zero /* 424008 802A9398 82220061 */ lb $v0, 0x61($s1) /* 42400C 802A939C 10400003 */ beqz $v0, .L802A93AC /* 424010 802A93A0 0200202D */ daddu $a0, $s0, $zero -/* 424014 802A93A4 0C05128B */ jal clear_hud_element_flags +/* 424014 802A93A4 0C05128B */ jal hud_element_clear_flags /* 424018 802A93A8 24050002 */ addiu $a1, $zero, 2 .L802A93AC: /* 42401C 802A93AC 8E300010 */ lw $s0, 0x10($s1) /* 424020 802A93B0 240500FF */ addiu $a1, $zero, 0xff -/* 424024 802A93B4 0C0513AC */ jal set_hud_element_alpha +/* 424024 802A93B4 0C0513AC */ jal hud_element_set_alpha /* 424028 802A93B8 0200202D */ daddu $a0, $s0, $zero /* 42402C 802A93BC 82220061 */ lb $v0, 0x61($s1) /* 424030 802A93C0 10400003 */ beqz $v0, .L802A93D0 /* 424034 802A93C4 0200202D */ daddu $a0, $s0, $zero -/* 424038 802A93C8 0C05128B */ jal clear_hud_element_flags +/* 424038 802A93C8 0C05128B */ jal hud_element_clear_flags /* 42403C 802A93CC 24050002 */ addiu $a1, $zero, 2 .L802A93D0: /* 424040 802A93D0 24020001 */ addiu $v0, $zero, 1 @@ -81,24 +81,24 @@ dlabel L802A93DC_42404C .L802A9408: /* 424078 802A9408 8E240004 */ lw $a0, 4($s1) /* 42407C 802A940C 86250056 */ lh $a1, 0x56($s1) -/* 424080 802A9410 0C051261 */ jal set_hud_element_render_pos +/* 424080 802A9410 0C051261 */ jal hud_element_set_render_pos /* 424084 802A9414 86260058 */ lh $a2, 0x58($s1) /* 424088 802A9418 8E240008 */ lw $a0, 8($s1) /* 42408C 802A941C 86260058 */ lh $a2, 0x58($s1) /* 424090 802A9420 86250056 */ lh $a1, 0x56($s1) -/* 424094 802A9424 0C051261 */ jal set_hud_element_render_pos +/* 424094 802A9424 0C051261 */ jal hud_element_set_render_pos /* 424098 802A9428 24C6001C */ addiu $a2, $a2, 0x1c /* 42409C 802A942C 8E24000C */ lw $a0, 0xc($s1) /* 4240A0 802A9430 86250056 */ lh $a1, 0x56($s1) /* 4240A4 802A9434 86260058 */ lh $a2, 0x58($s1) /* 4240A8 802A9438 24A50036 */ addiu $a1, $a1, 0x36 -/* 4240AC 802A943C 0C051261 */ jal set_hud_element_render_pos +/* 4240AC 802A943C 0C051261 */ jal hud_element_set_render_pos /* 4240B0 802A9440 24C60017 */ addiu $a2, $a2, 0x17 /* 4240B4 802A9444 8E240010 */ lw $a0, 0x10($s1) /* 4240B8 802A9448 86250056 */ lh $a1, 0x56($s1) /* 4240BC 802A944C 86260058 */ lh $a2, 0x58($s1) /* 4240C0 802A9450 24A5003C */ addiu $a1, $a1, 0x3c -/* 4240C4 802A9454 0C051261 */ jal set_hud_element_render_pos +/* 4240C4 802A9454 0C051261 */ jal hud_element_set_render_pos /* 4240C8 802A9458 24C60017 */ addiu $a2, $a2, 0x17 /* 4240CC 802A945C 080AA5CB */ j L802A972C_42439C /* 4240D0 802A9460 00000000 */ nop @@ -115,7 +115,7 @@ dlabel L802A9464_4240D4 /* 4240F4 802A9484 8E240004 */ lw $a0, 4($s1) /* 4240F8 802A9488 3C058011 */ lui $a1, %hi(HudScript_MashAButton) /* 4240FC 802A948C 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 424100 802A9490 0C0511FF */ jal set_hud_element_anim +/* 424100 802A9490 0C0511FF */ jal hud_element_set_script /* 424104 802A9494 00000000 */ nop /* 424108 802A9498 96230052 */ lhu $v1, 0x52($s1) /* 42410C 802A949C 2402000B */ addiu $v0, $zero, 0xb diff --git a/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A123C_72C7EC.s b/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A123C_72C7EC.s index 9208a215dd..84be3b2c37 100644 --- a/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A123C_72C7EC.s +++ b/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A123C_72C7EC.s @@ -71,9 +71,9 @@ glabel battle_item_mystery_func_802A123C_72C7EC /* 72C8F0 802A1340 00083143 */ sra $a2, $t0, 5 /* 72C8F4 802A1344 00C23023 */ subu $a2, $a2, $v0 /* 72C8F8 802A1348 24C6FF98 */ addiu $a2, $a2, -0x68 -/* 72C8FC 802A134C 0C051261 */ jal set_hud_element_render_pos +/* 72C8FC 802A134C 0C051261 */ jal hud_element_set_render_pos /* 72C900 802A1350 02663023 */ subu $a2, $s3, $a2 -/* 72C904 802A1354 0C0511F8 */ jal draw_hud_element_3 +/* 72C904 802A1354 0C0511F8 */ jal hud_element_draw_without_clipping /* 72C908 802A1358 0200202D */ daddu $a0, $s0, $zero /* 72C90C 802A135C 2A220007 */ slti $v0, $s1, 7 /* 72C910 802A1360 1440FFED */ bnez $v0, .L802A1318 @@ -97,9 +97,9 @@ glabel battle_item_mystery_func_802A123C_72C7EC /* 72C958 802A13A8 00081143 */ sra $v0, $t0, 5 /* 72C95C 802A13AC 00431023 */ subu $v0, $v0, $v1 /* 72C960 802A13B0 2442FF98 */ addiu $v0, $v0, -0x68 -/* 72C964 802A13B4 0C051261 */ jal set_hud_element_render_pos +/* 72C964 802A13B4 0C051261 */ jal hud_element_set_render_pos /* 72C968 802A13B8 00C23023 */ subu $a2, $a2, $v0 -/* 72C96C 802A13BC 0C0511F8 */ jal draw_hud_element_3 +/* 72C96C 802A13BC 0C0511F8 */ jal hud_element_draw_without_clipping /* 72C970 802A13C0 0200202D */ daddu $a0, $s0, $zero .L802A13C4: /* 72C974 802A13C4 8FBF0064 */ lw $ra, 0x64($sp) diff --git a/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A13E4_72C994.s b/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A13E4_72C994.s index b622b86d6f..3ff92dd526 100644 --- a/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A13E4_72C994.s +++ b/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A13E4_72C994.s @@ -89,11 +89,11 @@ glabel battle_item_mystery_func_802A13E4_72C994 /* 72CAB4 802A1504 000210C0 */ sll $v0, $v0, 3 /* 72CAB8 802A1508 00531021 */ addu $v0, $v0, $s3 /* 72CABC 802A150C 8C440000 */ lw $a0, ($v0) -/* 72CAC0 802A1510 0C050529 */ jal create_hud_element +/* 72CAC0 802A1510 0C050529 */ jal hud_element_create /* 72CAC4 802A1514 26100001 */ addiu $s0, $s0, 1 /* 72CAC8 802A1518 0040202D */ daddu $a0, $v0, $zero /* 72CACC 802A151C 24050080 */ addiu $a1, $zero, 0x80 -/* 72CAD0 802A1520 0C051280 */ jal set_hud_element_flags +/* 72CAD0 802A1520 0C051280 */ jal hud_element_set_flags /* 72CAD4 802A1524 AE240000 */ sw $a0, ($s1) /* 72CAD8 802A1528 2A020007 */ slti $v0, $s0, 7 /* 72CADC 802A152C 1440FFED */ bnez $v0, .L802A14E4 @@ -315,7 +315,7 @@ glabel battle_item_mystery_func_802A13E4_72C994 .L802A1848: /* 72CDF8 802A1848 8E240000 */ lw $a0, ($s1) /* 72CDFC 802A184C 26310004 */ addiu $s1, $s1, 4 -/* 72CE00 802A1850 0C05123D */ jal free_hud_element +/* 72CE00 802A1850 0C05123D */ jal hud_element_free /* 72CE04 802A1854 26100001 */ addiu $s0, $s0, 1 /* 72CE08 802A1858 2A020007 */ slti $v0, $s0, 7 /* 72CE0C 802A185C 1440FFFA */ bnez $v0, .L802A1848 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A123C_73153C.s b/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A123C_73153C.s index 688c9c77a9..d3de0b8158 100644 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A123C_73153C.s +++ b/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A123C_73153C.s @@ -71,9 +71,9 @@ glabel battle_item_strange_cake_func_802A123C_73153C /* 731640 802A1340 00083143 */ sra $a2, $t0, 5 /* 731644 802A1344 00C23023 */ subu $a2, $a2, $v0 /* 731648 802A1348 24C6FF98 */ addiu $a2, $a2, -0x68 -/* 73164C 802A134C 0C051261 */ jal set_hud_element_render_pos +/* 73164C 802A134C 0C051261 */ jal hud_element_set_render_pos /* 731650 802A1350 02663023 */ subu $a2, $s3, $a2 -/* 731654 802A1354 0C0511F8 */ jal draw_hud_element_3 +/* 731654 802A1354 0C0511F8 */ jal hud_element_draw_without_clipping /* 731658 802A1358 0200202D */ daddu $a0, $s0, $zero /* 73165C 802A135C 2A220005 */ slti $v0, $s1, 5 /* 731660 802A1360 1440FFED */ bnez $v0, .L802A1318 @@ -97,9 +97,9 @@ glabel battle_item_strange_cake_func_802A123C_73153C /* 7316A8 802A13A8 00081143 */ sra $v0, $t0, 5 /* 7316AC 802A13AC 00431023 */ subu $v0, $v0, $v1 /* 7316B0 802A13B0 2442FF98 */ addiu $v0, $v0, -0x68 -/* 7316B4 802A13B4 0C051261 */ jal set_hud_element_render_pos +/* 7316B4 802A13B4 0C051261 */ jal hud_element_set_render_pos /* 7316B8 802A13B8 00C23023 */ subu $a2, $a2, $v0 -/* 7316BC 802A13BC 0C0511F8 */ jal draw_hud_element_3 +/* 7316BC 802A13BC 0C0511F8 */ jal hud_element_draw_without_clipping /* 7316C0 802A13C0 0200202D */ daddu $a0, $s0, $zero .L802A13C4: /* 7316C4 802A13C4 8FBF0064 */ lw $ra, 0x64($sp) diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A13E4_7316E4.s b/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A13E4_7316E4.s index 0db3d7a627..c1d7ec4446 100644 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A13E4_7316E4.s +++ b/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A13E4_7316E4.s @@ -57,11 +57,11 @@ glabel battle_item_strange_cake_func_802A13E4_7316E4 /* 73178C 802A148C 00021080 */ sll $v0, $v0, 2 /* 731790 802A1490 00531021 */ addu $v0, $v0, $s3 /* 731794 802A1494 8C440000 */ lw $a0, ($v0) -/* 731798 802A1498 0C050529 */ jal create_hud_element +/* 731798 802A1498 0C050529 */ jal hud_element_create /* 73179C 802A149C 26100001 */ addiu $s0, $s0, 1 /* 7317A0 802A14A0 0040202D */ daddu $a0, $v0, $zero /* 7317A4 802A14A4 24050080 */ addiu $a1, $zero, 0x80 -/* 7317A8 802A14A8 0C051280 */ jal set_hud_element_flags +/* 7317A8 802A14A8 0C051280 */ jal hud_element_set_flags /* 7317AC 802A14AC AE440000 */ sw $a0, ($s2) /* 7317B0 802A14B0 2A020005 */ slti $v0, $s0, 5 /* 7317B4 802A14B4 1440FFF3 */ bnez $v0, .L802A1484 @@ -284,7 +284,7 @@ glabel battle_item_strange_cake_func_802A13E4_7316E4 .L802A17D4: /* 731AD4 802A17D4 8E240000 */ lw $a0, ($s1) /* 731AD8 802A17D8 26310004 */ addiu $s1, $s1, 4 -/* 731ADC 802A17DC 0C05123D */ jal free_hud_element +/* 731ADC 802A17DC 0C05123D */ jal hud_element_free /* 731AE0 802A17E0 26100001 */ addiu $s0, $s0, 1 /* 731AE4 802A17E4 2A020005 */ slti $v0, $s0, 5 /* 731AE8 802A17E8 1440FFFA */ bnez $v0, .L802A17D4 diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_8023803C_70BD4C.s b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_8023803C_70BD4C.s index 40d9b5d060..93f710e961 100644 --- a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_8023803C_70BD4C.s +++ b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_8023803C_70BD4C.s @@ -44,28 +44,28 @@ glabel func_8023803C_70BD4C .L802380D0: /* 70BDE0 802380D0 3C048029 */ lui $a0, %hi(HudScript_AimReticle) /* 70BDE4 802380D4 2484369C */ addiu $a0, $a0, %lo(HudScript_AimReticle) -/* 70BDE8 802380D8 0C050529 */ jal create_hud_element +/* 70BDE8 802380D8 0C050529 */ jal hud_element_create /* 70BDEC 802380DC 0000902D */ daddu $s2, $zero, $zero /* 70BDF0 802380E0 0040202D */ daddu $a0, $v0, $zero /* 70BDF4 802380E4 3C018024 */ lui $at, %hi(D_8023D288) /* 70BDF8 802380E8 AC24D288 */ sw $a0, %lo(D_8023D288)($at) -/* 70BDFC 802380EC 0C051277 */ jal set_hud_element_render_depth +/* 70BDFC 802380EC 0C051277 */ jal hud_element_set_render_depth /* 70BE00 802380F0 2405000A */ addiu $a1, $zero, 0xa /* 70BE04 802380F4 3C048029 */ lui $a0, %hi(HudScript_AimTarget) /* 70BE08 802380F8 248436D4 */ addiu $a0, $a0, %lo(HudScript_AimTarget) -/* 70BE0C 802380FC 0C050529 */ jal create_hud_element +/* 70BE0C 802380FC 0C050529 */ jal hud_element_create /* 70BE10 80238100 00000000 */ nop /* 70BE14 80238104 0040202D */ daddu $a0, $v0, $zero /* 70BE18 80238108 2405000A */ addiu $a1, $zero, 0xa /* 70BE1C 8023810C 3C108024 */ lui $s0, %hi(D_8023D28C) /* 70BE20 80238110 2610D28C */ addiu $s0, $s0, %lo(D_8023D28C) -/* 70BE24 80238114 0C051277 */ jal set_hud_element_render_depth +/* 70BE24 80238114 0C051277 */ jal hud_element_set_render_depth /* 70BE28 80238118 AE040000 */ sw $a0, ($s0) /* 70BE2C 8023811C 3C148024 */ lui $s4, %hi(D_8023D2B8) /* 70BE30 80238120 2694D2B8 */ addiu $s4, $s4, %lo(D_8023D2B8) /* 70BE34 80238124 8E040000 */ lw $a0, ($s0) /* 70BE38 80238128 3C138024 */ lui $s3, %hi(D_8023AB80_70E890) -/* 70BE3C 8023812C 0C0513CA */ jal create_hud_element_transform_A +/* 70BE3C 8023812C 0C0513CA */ jal hud_element_create_transform_A /* 70BE40 80238130 2673AB80 */ addiu $s3, $s3, %lo(D_8023AB80_70E890) /* 70BE44 80238134 3C048011 */ lui $a0, %hi(HudScript_StickNeutral) /* 70BE48 80238138 24848E1C */ addiu $a0, $a0, %lo(HudScript_StickNeutral) @@ -76,26 +76,26 @@ glabel func_8023803C_70BD4C /* 70BE5C 8023814C 2610D2C4 */ addiu $s0, $s0, %lo(D_8023D2C4) /* 70BE60 80238150 AE220000 */ sw $v0, ($s1) /* 70BE64 80238154 24020046 */ addiu $v0, $zero, 0x46 -/* 70BE68 80238158 0C050529 */ jal create_hud_element +/* 70BE68 80238158 0C050529 */ jal hud_element_create /* 70BE6C 8023815C AE020000 */ sw $v0, ($s0) /* 70BE70 80238160 0040A82D */ daddu $s5, $v0, $zero /* 70BE74 80238164 8E250000 */ lw $a1, ($s1) /* 70BE78 80238168 8E060000 */ lw $a2, ($s0) /* 70BE7C 8023816C 3C018024 */ lui $at, %hi(D_8023D2BC) /* 70BE80 80238170 AC35D2BC */ sw $s5, %lo(D_8023D2BC)($at) -/* 70BE84 80238174 0C051261 */ jal set_hud_element_render_pos +/* 70BE84 80238174 0C051261 */ jal hud_element_set_render_pos /* 70BE88 80238178 02A0202D */ daddu $a0, $s5, $zero /* 70BE8C 8023817C 02A0202D */ daddu $a0, $s5, $zero -/* 70BE90 80238180 0C051277 */ jal set_hud_element_render_depth +/* 70BE90 80238180 0C051277 */ jal hud_element_set_render_depth /* 70BE94 80238184 0240282D */ daddu $a1, $s2, $zero .L80238188: /* 70BE98 80238188 8E640000 */ lw $a0, ($s3) /* 70BE9C 8023818C 26730004 */ addiu $s3, $s3, 4 -/* 70BEA0 80238190 0C050529 */ jal create_hud_element +/* 70BEA0 80238190 0C050529 */ jal hud_element_create /* 70BEA4 80238194 26520001 */ addiu $s2, $s2, 1 /* 70BEA8 80238198 0040202D */ daddu $a0, $v0, $zero /* 70BEAC 8023819C 2405000A */ addiu $a1, $zero, 0xa -/* 70BEB0 802381A0 0C051277 */ jal set_hud_element_render_depth +/* 70BEB0 802381A0 0C051277 */ jal hud_element_set_render_depth /* 70BEB4 802381A4 AE840000 */ sw $a0, ($s4) /* 70BEB8 802381A8 1A40FFF7 */ blez $s2, .L80238188 /* 70BEBC 802381AC 26940004 */ addiu $s4, $s4, 4 @@ -204,7 +204,7 @@ glabel func_8023803C_70BD4C /* 70C058 80238348 3C048024 */ lui $a0, %hi(D_8023D28C) /* 70C05C 8023834C 8C84D28C */ lw $a0, %lo(D_8023D28C)($a0) /* 70C060 80238350 44050000 */ mfc1 $a1, $f0 -/* 70C064 80238354 0C051308 */ jal set_hud_element_scale +/* 70C064 80238354 0C051308 */ jal hud_element_set_scale /* 70C068 80238358 00000000 */ nop /* 70C06C 8023835C 8FA90068 */ lw $t1, 0x68($sp) /* 70C070 80238360 24020001 */ addiu $v0, $zero, 1 @@ -236,7 +236,7 @@ glabel func_8023803C_70BD4C /* 70C0C8 802383B8 3C048024 */ lui $a0, %hi(D_8023D2BC) /* 70C0CC 802383BC 8C84D2BC */ lw $a0, %lo(D_8023D2BC)($a0) /* 70C0D0 802383C0 24020050 */ addiu $v0, $zero, 0x50 -/* 70C0D4 802383C4 0C0511FF */ jal set_hud_element_anim +/* 70C0D4 802383C4 0C0511FF */ jal hud_element_set_script /* 70C0D8 802383C8 AC620000 */ sw $v0, ($v1) /* 70C0DC 802383CC 44800000 */ mtc1 $zero, $f0 /* 70C0E0 802383D0 24040312 */ addiu $a0, $zero, 0x312 @@ -532,22 +532,22 @@ glabel func_8023803C_70BD4C .L8023880C: /* 70C51C 8023880C 3C048024 */ lui $a0, %hi(D_8023D28C) /* 70C520 80238810 8C84D28C */ lw $a0, %lo(D_8023D28C)($a0) -/* 70C524 80238814 0C05123D */ jal free_hud_element +/* 70C524 80238814 0C05123D */ jal hud_element_free /* 70C528 80238818 0000902D */ daddu $s2, $zero, $zero /* 70C52C 8023881C 3C048024 */ lui $a0, %hi(D_8023D288) /* 70C530 80238820 8C84D288 */ lw $a0, %lo(D_8023D288)($a0) -/* 70C534 80238824 0C05123D */ jal free_hud_element +/* 70C534 80238824 0C05123D */ jal hud_element_free /* 70C538 80238828 00000000 */ nop /* 70C53C 8023882C 3C048024 */ lui $a0, %hi(D_8023D2BC) /* 70C540 80238830 8C84D2BC */ lw $a0, %lo(D_8023D2BC)($a0) /* 70C544 80238834 3C108024 */ lui $s0, %hi(D_8023D2B8) /* 70C548 80238838 2610D2B8 */ addiu $s0, $s0, %lo(D_8023D2B8) -/* 70C54C 8023883C 0C05123D */ jal free_hud_element +/* 70C54C 8023883C 0C05123D */ jal hud_element_free /* 70C550 80238840 00000000 */ nop .L80238844: /* 70C554 80238844 8E040000 */ lw $a0, ($s0) /* 70C558 80238848 26100004 */ addiu $s0, $s0, 4 -/* 70C55C 8023884C 0C05123D */ jal free_hud_element +/* 70C55C 8023884C 0C05123D */ jal hud_element_free /* 70C560 80238850 26520001 */ addiu $s2, $s2, 1 /* 70C564 80238854 1A40FFFB */ blez $s2, .L80238844 /* 70C568 80238858 00000000 */ nop @@ -575,7 +575,7 @@ glabel func_8023803C_70BD4C /* 70C5BC 802388AC 8EB5D28C */ lw $s5, %lo(D_8023D28C)($s5) /* 70C5C0 802388B0 8FA50020 */ lw $a1, 0x20($sp) /* 70C5C4 802388B4 8FA60024 */ lw $a2, 0x24($sp) -/* 70C5C8 802388B8 0C051261 */ jal set_hud_element_render_pos +/* 70C5C8 802388B8 0C051261 */ jal hud_element_set_render_pos /* 70C5CC 802388BC 02A0202D */ daddu $a0, $s5, $zero /* 70C5D0 802388C0 02A0202D */ daddu $a0, $s5, $zero /* 70C5D4 802388C4 3C108024 */ lui $s0, %hi(D_8023D290) @@ -585,7 +585,7 @@ glabel func_8023803C_70BD4C /* 70C5E4 802388D4 468052A0 */ cvt.s.w $f10, $f10 /* 70C5E8 802388D8 44050000 */ mfc1 $a1, $f0 /* 70C5EC 802388DC 44075000 */ mfc1 $a3, $f10 -/* 70C5F0 802388E0 0C051489 */ jal set_hud_element_transform_rotation +/* 70C5F0 802388E0 0C051489 */ jal hud_element_set_transform_rotation /* 70C5F4 802388E4 00A0302D */ daddu $a2, $a1, $zero /* 70C5F8 802388E8 8E020000 */ lw $v0, ($s0) /* 70C5FC 802388EC 2442FFF6 */ addiu $v0, $v0, -0xa @@ -607,7 +607,7 @@ glabel func_8023803C_70BD4C /* 70C63C 8023892C 3C048024 */ lui $a0, %hi(D_8023D288) /* 70C640 80238930 8C84D288 */ lw $a0, %lo(D_8023D288)($a0) /* 70C644 80238934 8FA50020 */ lw $a1, 0x20($sp) -/* 70C648 80238938 0C051261 */ jal set_hud_element_render_pos +/* 70C648 80238938 0C051261 */ jal hud_element_set_render_pos /* 70C64C 8023893C 8FA60024 */ lw $a2, 0x24($sp) /* 70C650 80238940 8FA90068 */ lw $t1, 0x68($sp) /* 70C654 80238944 8D230070 */ lw $v1, 0x70($t1) @@ -631,7 +631,7 @@ glabel func_8023803C_70BD4C /* 70C698 80238988 8CA50000 */ lw $a1, ($a1) /* 70C69C 8023898C 3C068024 */ lui $a2, %hi(D_8023D2C4) /* 70C6A0 80238990 8CC6D2C4 */ lw $a2, %lo(D_8023D2C4)($a2) -/* 70C6A4 80238994 0C051261 */ jal set_hud_element_render_pos +/* 70C6A4 80238994 0C051261 */ jal hud_element_set_render_pos /* 70C6A8 80238998 00000000 */ nop .L8023899C: /* 70C6AC 8023899C 8FA80068 */ lw $t0, 0x68($sp) @@ -666,7 +666,7 @@ glabel func_8023803C_70BD4C /* 70C71C 80238A0C 8E040000 */ lw $a0, ($s0) /* 70C720 80238A10 8FA50020 */ lw $a1, 0x20($sp) /* 70C724 80238A14 8FA60024 */ lw $a2, 0x24($sp) -/* 70C728 80238A18 0C051261 */ jal set_hud_element_render_pos +/* 70C728 80238A18 0C051261 */ jal hud_element_set_render_pos /* 70C72C 80238A1C 26100004 */ addiu $s0, $s0, 4 /* 70C730 80238A20 1A40FFF0 */ blez $s2, .L802389E4 /* 70C734 80238A24 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/partner/parakarry/func_80238000_6FFD80.s b/ver/us/asm/nonmatchings/battle/partner/parakarry/func_80238000_6FFD80.s index c29d550fd8..37096850e9 100644 --- a/ver/us/asm/nonmatchings/battle/partner/parakarry/func_80238000_6FFD80.s +++ b/ver/us/asm/nonmatchings/battle/partner/parakarry/func_80238000_6FFD80.s @@ -45,194 +45,194 @@ glabel func_80238000_6FFD80 .L80238098: /* 6FFE18 80238098 3C048029 */ lui $a0, %hi(HudScript_AimMarkerF) /* 6FFE1C 8023809C 24843014 */ addiu $a0, $a0, %lo(HudScript_AimMarkerF) -/* 6FFE20 802380A0 0C050529 */ jal create_hud_element +/* 6FFE20 802380A0 0C050529 */ jal hud_element_create /* 6FFE24 802380A4 00000000 */ nop /* 6FFE28 802380A8 0040982D */ daddu $s3, $v0, $zero /* 6FFE2C 802380AC 0260202D */ daddu $a0, $s3, $zero /* 6FFE30 802380B0 2405000A */ addiu $a1, $zero, 0xa /* 6FFE34 802380B4 3C108024 */ lui $s0, %hi(D_8023BD78) /* 6FFE38 802380B8 2610BD78 */ addiu $s0, $s0, %lo(D_8023BD78) -/* 6FFE3C 802380BC 0C051277 */ jal set_hud_element_render_depth +/* 6FFE3C 802380BC 0C051277 */ jal hud_element_set_render_depth /* 6FFE40 802380C0 AE130000 */ sw $s3, ($s0) /* 6FFE44 802380C4 0260202D */ daddu $a0, $s3, $zero /* 6FFE48 802380C8 2405FF9C */ addiu $a1, $zero, -0x64 -/* 6FFE4C 802380CC 0C051261 */ jal set_hud_element_render_pos +/* 6FFE4C 802380CC 0C051261 */ jal hud_element_set_render_pos /* 6FFE50 802380D0 00A0302D */ daddu $a2, $a1, $zero /* 6FFE54 802380D4 3C048029 */ lui $a0, %hi(HudScript_AimMarkerE) /* 6FFE58 802380D8 24842F7C */ addiu $a0, $a0, %lo(HudScript_AimMarkerE) -/* 6FFE5C 802380DC 0C050529 */ jal create_hud_element +/* 6FFE5C 802380DC 0C050529 */ jal hud_element_create /* 6FFE60 802380E0 00000000 */ nop /* 6FFE64 802380E4 0040982D */ daddu $s3, $v0, $zero /* 6FFE68 802380E8 0260202D */ daddu $a0, $s3, $zero /* 6FFE6C 802380EC 2405000A */ addiu $a1, $zero, 0xa -/* 6FFE70 802380F0 0C051277 */ jal set_hud_element_render_depth +/* 6FFE70 802380F0 0C051277 */ jal hud_element_set_render_depth /* 6FFE74 802380F4 AE130004 */ sw $s3, 4($s0) /* 6FFE78 802380F8 0260202D */ daddu $a0, $s3, $zero /* 6FFE7C 802380FC 2405FF9C */ addiu $a1, $zero, -0x64 -/* 6FFE80 80238100 0C051261 */ jal set_hud_element_render_pos +/* 6FFE80 80238100 0C051261 */ jal hud_element_set_render_pos /* 6FFE84 80238104 00A0302D */ daddu $a2, $a1, $zero /* 6FFE88 80238108 3C048029 */ lui $a0, %hi(HudScript_AimMarkerD) /* 6FFE8C 8023810C 24842EE4 */ addiu $a0, $a0, %lo(HudScript_AimMarkerD) -/* 6FFE90 80238110 0C050529 */ jal create_hud_element +/* 6FFE90 80238110 0C050529 */ jal hud_element_create /* 6FFE94 80238114 00000000 */ nop /* 6FFE98 80238118 0040982D */ daddu $s3, $v0, $zero /* 6FFE9C 8023811C 0260202D */ daddu $a0, $s3, $zero /* 6FFEA0 80238120 2405000A */ addiu $a1, $zero, 0xa -/* 6FFEA4 80238124 0C051277 */ jal set_hud_element_render_depth +/* 6FFEA4 80238124 0C051277 */ jal hud_element_set_render_depth /* 6FFEA8 80238128 AE130008 */ sw $s3, 8($s0) /* 6FFEAC 8023812C 0260202D */ daddu $a0, $s3, $zero /* 6FFEB0 80238130 2405FF9C */ addiu $a1, $zero, -0x64 -/* 6FFEB4 80238134 0C051261 */ jal set_hud_element_render_pos +/* 6FFEB4 80238134 0C051261 */ jal hud_element_set_render_pos /* 6FFEB8 80238138 00A0302D */ daddu $a2, $a1, $zero /* 6FFEBC 8023813C 3C048029 */ lui $a0, %hi(HudScript_AimMarkerC) /* 6FFEC0 80238140 24842E4C */ addiu $a0, $a0, %lo(HudScript_AimMarkerC) -/* 6FFEC4 80238144 0C050529 */ jal create_hud_element +/* 6FFEC4 80238144 0C050529 */ jal hud_element_create /* 6FFEC8 80238148 00000000 */ nop /* 6FFECC 8023814C 0040982D */ daddu $s3, $v0, $zero /* 6FFED0 80238150 0260202D */ daddu $a0, $s3, $zero /* 6FFED4 80238154 2405000A */ addiu $a1, $zero, 0xa -/* 6FFED8 80238158 0C051277 */ jal set_hud_element_render_depth +/* 6FFED8 80238158 0C051277 */ jal hud_element_set_render_depth /* 6FFEDC 8023815C AE13000C */ sw $s3, 0xc($s0) /* 6FFEE0 80238160 0260202D */ daddu $a0, $s3, $zero /* 6FFEE4 80238164 2405FF9C */ addiu $a1, $zero, -0x64 -/* 6FFEE8 80238168 0C051261 */ jal set_hud_element_render_pos +/* 6FFEE8 80238168 0C051261 */ jal hud_element_set_render_pos /* 6FFEEC 8023816C 00A0302D */ daddu $a2, $a1, $zero /* 6FFEF0 80238170 3C048029 */ lui $a0, %hi(HudScript_AimMarkerB) /* 6FFEF4 80238174 24842DB4 */ addiu $a0, $a0, %lo(HudScript_AimMarkerB) -/* 6FFEF8 80238178 0C050529 */ jal create_hud_element +/* 6FFEF8 80238178 0C050529 */ jal hud_element_create /* 6FFEFC 8023817C 00000000 */ nop /* 6FFF00 80238180 0040982D */ daddu $s3, $v0, $zero /* 6FFF04 80238184 0260202D */ daddu $a0, $s3, $zero /* 6FFF08 80238188 2405000A */ addiu $a1, $zero, 0xa -/* 6FFF0C 8023818C 0C051277 */ jal set_hud_element_render_depth +/* 6FFF0C 8023818C 0C051277 */ jal hud_element_set_render_depth /* 6FFF10 80238190 AE130010 */ sw $s3, 0x10($s0) /* 6FFF14 80238194 0260202D */ daddu $a0, $s3, $zero /* 6FFF18 80238198 2405FF9C */ addiu $a1, $zero, -0x64 -/* 6FFF1C 8023819C 0C051261 */ jal set_hud_element_render_pos +/* 6FFF1C 8023819C 0C051261 */ jal hud_element_set_render_pos /* 6FFF20 802381A0 00A0302D */ daddu $a2, $a1, $zero /* 6FFF24 802381A4 3C048029 */ lui $a0, %hi(HudScript_AimMarkerA) /* 6FFF28 802381A8 24842D1C */ addiu $a0, $a0, %lo(HudScript_AimMarkerA) -/* 6FFF2C 802381AC 0C050529 */ jal create_hud_element +/* 6FFF2C 802381AC 0C050529 */ jal hud_element_create /* 6FFF30 802381B0 00000000 */ nop /* 6FFF34 802381B4 0040982D */ daddu $s3, $v0, $zero /* 6FFF38 802381B8 0260202D */ daddu $a0, $s3, $zero /* 6FFF3C 802381BC 2405000A */ addiu $a1, $zero, 0xa -/* 6FFF40 802381C0 0C051277 */ jal set_hud_element_render_depth +/* 6FFF40 802381C0 0C051277 */ jal hud_element_set_render_depth /* 6FFF44 802381C4 AE130014 */ sw $s3, 0x14($s0) /* 6FFF48 802381C8 0260202D */ daddu $a0, $s3, $zero /* 6FFF4C 802381CC 2405FF9C */ addiu $a1, $zero, -0x64 -/* 6FFF50 802381D0 0C051261 */ jal set_hud_element_render_pos +/* 6FFF50 802381D0 0C051261 */ jal hud_element_set_render_pos /* 6FFF54 802381D4 00A0302D */ daddu $a2, $a1, $zero /* 6FFF58 802381D8 3C048029 */ lui $a0, %hi(HudScript_AimReticle) /* 6FFF5C 802381DC 2484369C */ addiu $a0, $a0, %lo(HudScript_AimReticle) -/* 6FFF60 802381E0 0C050529 */ jal create_hud_element +/* 6FFF60 802381E0 0C050529 */ jal hud_element_create /* 6FFF64 802381E4 00000000 */ nop /* 6FFF68 802381E8 0040982D */ daddu $s3, $v0, $zero /* 6FFF6C 802381EC 0260202D */ daddu $a0, $s3, $zero /* 6FFF70 802381F0 2405000A */ addiu $a1, $zero, 0xa -/* 6FFF74 802381F4 0C051277 */ jal set_hud_element_render_depth +/* 6FFF74 802381F4 0C051277 */ jal hud_element_set_render_depth /* 6FFF78 802381F8 AE130018 */ sw $s3, 0x18($s0) /* 6FFF7C 802381FC 0260202D */ daddu $a0, $s3, $zero /* 6FFF80 80238200 2405FF9C */ addiu $a1, $zero, -0x64 -/* 6FFF84 80238204 0C051261 */ jal set_hud_element_render_pos +/* 6FFF84 80238204 0C051261 */ jal hud_element_set_render_pos /* 6FFF88 80238208 00A0302D */ daddu $a2, $a1, $zero /* 6FFF8C 8023820C 3C048029 */ lui $a0, %hi(HudScript_AimShimmerF) /* 6FFF90 80238210 248434D4 */ addiu $a0, $a0, %lo(HudScript_AimShimmerF) -/* 6FFF94 80238214 0C050529 */ jal create_hud_element +/* 6FFF94 80238214 0C050529 */ jal hud_element_create /* 6FFF98 80238218 00000000 */ nop /* 6FFF9C 8023821C 0040982D */ daddu $s3, $v0, $zero /* 6FFFA0 80238220 0260202D */ daddu $a0, $s3, $zero /* 6FFFA4 80238224 24050009 */ addiu $a1, $zero, 9 /* 6FFFA8 80238228 3C108024 */ lui $s0, %hi(D_8023BD98) /* 6FFFAC 8023822C 2610BD98 */ addiu $s0, $s0, %lo(D_8023BD98) -/* 6FFFB0 80238230 0C051277 */ jal set_hud_element_render_depth +/* 6FFFB0 80238230 0C051277 */ jal hud_element_set_render_depth /* 6FFFB4 80238234 AE130000 */ sw $s3, ($s0) /* 6FFFB8 80238238 0260202D */ daddu $a0, $s3, $zero /* 6FFFBC 8023823C 2405FF9C */ addiu $a1, $zero, -0x64 -/* 6FFFC0 80238240 0C051261 */ jal set_hud_element_render_pos +/* 6FFFC0 80238240 0C051261 */ jal hud_element_set_render_pos /* 6FFFC4 80238244 00A0302D */ daddu $a2, $a1, $zero /* 6FFFC8 80238248 3C048029 */ lui $a0, %hi(HudScript_AimShimmerE) /* 6FFFCC 8023824C 2484343C */ addiu $a0, $a0, %lo(HudScript_AimShimmerE) -/* 6FFFD0 80238250 0C050529 */ jal create_hud_element +/* 6FFFD0 80238250 0C050529 */ jal hud_element_create /* 6FFFD4 80238254 00000000 */ nop /* 6FFFD8 80238258 0040982D */ daddu $s3, $v0, $zero /* 6FFFDC 8023825C 0260202D */ daddu $a0, $s3, $zero /* 6FFFE0 80238260 24050009 */ addiu $a1, $zero, 9 -/* 6FFFE4 80238264 0C051277 */ jal set_hud_element_render_depth +/* 6FFFE4 80238264 0C051277 */ jal hud_element_set_render_depth /* 6FFFE8 80238268 AE130004 */ sw $s3, 4($s0) /* 6FFFEC 8023826C 0260202D */ daddu $a0, $s3, $zero /* 6FFFF0 80238270 2405FF9C */ addiu $a1, $zero, -0x64 -/* 6FFFF4 80238274 0C051261 */ jal set_hud_element_render_pos +/* 6FFFF4 80238274 0C051261 */ jal hud_element_set_render_pos /* 6FFFF8 80238278 00A0302D */ daddu $a2, $a1, $zero /* 6FFFFC 8023827C 3C048029 */ lui $a0, %hi(HudScript_AimShimmerD) /* 700000 80238280 248433A4 */ addiu $a0, $a0, %lo(HudScript_AimShimmerD) -/* 700004 80238284 0C050529 */ jal create_hud_element +/* 700004 80238284 0C050529 */ jal hud_element_create /* 700008 80238288 00000000 */ nop /* 70000C 8023828C 0040982D */ daddu $s3, $v0, $zero /* 700010 80238290 0260202D */ daddu $a0, $s3, $zero /* 700014 80238294 24050009 */ addiu $a1, $zero, 9 -/* 700018 80238298 0C051277 */ jal set_hud_element_render_depth +/* 700018 80238298 0C051277 */ jal hud_element_set_render_depth /* 70001C 8023829C AE130008 */ sw $s3, 8($s0) /* 700020 802382A0 0260202D */ daddu $a0, $s3, $zero /* 700024 802382A4 2405FF9C */ addiu $a1, $zero, -0x64 -/* 700028 802382A8 0C051261 */ jal set_hud_element_render_pos +/* 700028 802382A8 0C051261 */ jal hud_element_set_render_pos /* 70002C 802382AC 00A0302D */ daddu $a2, $a1, $zero /* 700030 802382B0 3C048029 */ lui $a0, %hi(HudScript_AimShimmerC) /* 700034 802382B4 2484330C */ addiu $a0, $a0, %lo(HudScript_AimShimmerC) -/* 700038 802382B8 0C050529 */ jal create_hud_element +/* 700038 802382B8 0C050529 */ jal hud_element_create /* 70003C 802382BC 00000000 */ nop /* 700040 802382C0 0040982D */ daddu $s3, $v0, $zero /* 700044 802382C4 0260202D */ daddu $a0, $s3, $zero /* 700048 802382C8 24050009 */ addiu $a1, $zero, 9 -/* 70004C 802382CC 0C051277 */ jal set_hud_element_render_depth +/* 70004C 802382CC 0C051277 */ jal hud_element_set_render_depth /* 700050 802382D0 AE13000C */ sw $s3, 0xc($s0) /* 700054 802382D4 0260202D */ daddu $a0, $s3, $zero /* 700058 802382D8 2405FF9C */ addiu $a1, $zero, -0x64 -/* 70005C 802382DC 0C051261 */ jal set_hud_element_render_pos +/* 70005C 802382DC 0C051261 */ jal hud_element_set_render_pos /* 700060 802382E0 00A0302D */ daddu $a2, $a1, $zero /* 700064 802382E4 3C048029 */ lui $a0, %hi(HudScript_AimShimmerB) /* 700068 802382E8 24843274 */ addiu $a0, $a0, %lo(HudScript_AimShimmerB) -/* 70006C 802382EC 0C050529 */ jal create_hud_element +/* 70006C 802382EC 0C050529 */ jal hud_element_create /* 700070 802382F0 00000000 */ nop /* 700074 802382F4 0040982D */ daddu $s3, $v0, $zero /* 700078 802382F8 0260202D */ daddu $a0, $s3, $zero /* 70007C 802382FC 24050009 */ addiu $a1, $zero, 9 -/* 700080 80238300 0C051277 */ jal set_hud_element_render_depth +/* 700080 80238300 0C051277 */ jal hud_element_set_render_depth /* 700084 80238304 AE130010 */ sw $s3, 0x10($s0) /* 700088 80238308 0260202D */ daddu $a0, $s3, $zero /* 70008C 8023830C 2405FF9C */ addiu $a1, $zero, -0x64 -/* 700090 80238310 0C051261 */ jal set_hud_element_render_pos +/* 700090 80238310 0C051261 */ jal hud_element_set_render_pos /* 700094 80238314 00A0302D */ daddu $a2, $a1, $zero /* 700098 80238318 3C048029 */ lui $a0, %hi(HudScript_AimShimmerA) /* 70009C 8023831C 248431DC */ addiu $a0, $a0, %lo(HudScript_AimShimmerA) -/* 7000A0 80238320 0C050529 */ jal create_hud_element +/* 7000A0 80238320 0C050529 */ jal hud_element_create /* 7000A4 80238324 00000000 */ nop /* 7000A8 80238328 0040982D */ daddu $s3, $v0, $zero /* 7000AC 8023832C 0260202D */ daddu $a0, $s3, $zero /* 7000B0 80238330 24050009 */ addiu $a1, $zero, 9 -/* 7000B4 80238334 0C051277 */ jal set_hud_element_render_depth +/* 7000B4 80238334 0C051277 */ jal hud_element_set_render_depth /* 7000B8 80238338 AE130014 */ sw $s3, 0x14($s0) /* 7000BC 8023833C 0260202D */ daddu $a0, $s3, $zero /* 7000C0 80238340 2405FF9C */ addiu $a1, $zero, -0x64 -/* 7000C4 80238344 0C051261 */ jal set_hud_element_render_pos +/* 7000C4 80238344 0C051261 */ jal hud_element_set_render_pos /* 7000C8 80238348 00A0302D */ daddu $a2, $a1, $zero /* 7000CC 8023834C 3C048029 */ lui $a0, %hi(HudScript_AimTarget) /* 7000D0 80238350 248436D4 */ addiu $a0, $a0, %lo(HudScript_AimTarget) -/* 7000D4 80238354 0C050529 */ jal create_hud_element +/* 7000D4 80238354 0C050529 */ jal hud_element_create /* 7000D8 80238358 00000000 */ nop /* 7000DC 8023835C 0040982D */ daddu $s3, $v0, $zero /* 7000E0 80238360 0260202D */ daddu $a0, $s3, $zero /* 7000E4 80238364 2405000A */ addiu $a1, $zero, 0xa /* 7000E8 80238368 3C128024 */ lui $s2, %hi(D_8023BDB4) /* 7000EC 8023836C 2652BDB4 */ addiu $s2, $s2, %lo(D_8023BDB4) -/* 7000F0 80238370 0C051277 */ jal set_hud_element_render_depth +/* 7000F0 80238370 0C051277 */ jal hud_element_set_render_depth /* 7000F4 80238374 AE530000 */ sw $s3, ($s2) /* 7000F8 80238378 8E440000 */ lw $a0, ($s2) -/* 7000FC 8023837C 0C0513CA */ jal create_hud_element_transform_A +/* 7000FC 8023837C 0C0513CA */ jal hud_element_create_transform_A /* 700100 80238380 00000000 */ nop /* 700104 80238384 0260202D */ daddu $a0, $s3, $zero /* 700108 80238388 2405FF9C */ addiu $a1, $zero, -0x64 -/* 70010C 8023838C 0C051261 */ jal set_hud_element_render_pos +/* 70010C 8023838C 0C051261 */ jal hud_element_set_render_pos /* 700110 80238390 00A0302D */ daddu $a2, $a1, $zero /* 700114 80238394 3C048011 */ lui $a0, %hi(HudScript_StickHoldLeft) /* 700118 80238398 24848E48 */ addiu $a0, $a0, %lo(HudScript_StickHoldLeft) @@ -243,17 +243,17 @@ glabel func_80238000_6FFD80 /* 70012C 802383AC 2610BDC8 */ addiu $s0, $s0, %lo(D_8023BDC8) /* 700130 802383B0 AE220000 */ sw $v0, ($s1) /* 700134 802383B4 24020050 */ addiu $v0, $zero, 0x50 -/* 700138 802383B8 0C050529 */ jal create_hud_element +/* 700138 802383B8 0C050529 */ jal hud_element_create /* 70013C 802383BC AE020000 */ sw $v0, ($s0) /* 700140 802383C0 0040982D */ daddu $s3, $v0, $zero /* 700144 802383C4 8E250000 */ lw $a1, ($s1) /* 700148 802383C8 8E060000 */ lw $a2, ($s0) /* 70014C 802383CC 3C018024 */ lui $at, %hi(D_8023BDC0) /* 700150 802383D0 AC33BDC0 */ sw $s3, %lo(D_8023BDC0)($at) -/* 700154 802383D4 0C051261 */ jal set_hud_element_render_pos +/* 700154 802383D4 0C051261 */ jal hud_element_set_render_pos /* 700158 802383D8 0260202D */ daddu $a0, $s3, $zero /* 70015C 802383DC 0260202D */ daddu $a0, $s3, $zero -/* 700160 802383E0 0C051277 */ jal set_hud_element_render_depth +/* 700160 802383E0 0C051277 */ jal hud_element_set_render_depth /* 700164 802383E4 0000282D */ daddu $a1, $zero, $zero /* 700168 802383E8 86A50428 */ lh $a1, 0x428($s5) /* 70016C 802383EC 82A60426 */ lb $a2, 0x426($s5) @@ -307,7 +307,7 @@ glabel func_80238000_6FFD80 /* 70022C 802384AC 44050000 */ mfc1 $a1, $f0 /* 700230 802384B0 3C013F80 */ lui $at, 0x3f80 /* 700234 802384B4 4481B000 */ mtc1 $at, $f22 -/* 700238 802384B8 0C051308 */ jal set_hud_element_scale +/* 700238 802384B8 0C051308 */ jal hud_element_set_scale /* 70023C 802384BC 00000000 */ nop /* 700240 802384C0 27B30028 */ addiu $s3, $sp, 0x28 /* 700244 802384C4 8EA60018 */ lw $a2, 0x18($s5) @@ -620,7 +620,7 @@ glabel func_80238000_6FFD80 .L80238938: /* 7006B8 80238938 8E040000 */ lw $a0, ($s0) /* 7006BC 8023893C 26100004 */ addiu $s0, $s0, 4 -/* 7006C0 80238940 0C05123D */ jal free_hud_element +/* 7006C0 80238940 0C05123D */ jal hud_element_free /* 7006C4 80238944 26310001 */ addiu $s1, $s1, 1 /* 7006C8 80238948 2A220007 */ slti $v0, $s1, 7 /* 7006CC 8023894C 1440FFFA */ bnez $v0, .L80238938 @@ -631,18 +631,18 @@ glabel func_80238000_6FFD80 .L80238960: /* 7006E0 80238960 8E040000 */ lw $a0, ($s0) /* 7006E4 80238964 26100004 */ addiu $s0, $s0, 4 -/* 7006E8 80238968 0C05123D */ jal free_hud_element +/* 7006E8 80238968 0C05123D */ jal hud_element_free /* 7006EC 8023896C 26310001 */ addiu $s1, $s1, 1 /* 7006F0 80238970 2A220006 */ slti $v0, $s1, 6 /* 7006F4 80238974 1440FFFA */ bnez $v0, .L80238960 /* 7006F8 80238978 00000000 */ nop /* 7006FC 8023897C 3C048024 */ lui $a0, %hi(D_8023BDB4) /* 700700 80238980 8C84BDB4 */ lw $a0, %lo(D_8023BDB4)($a0) -/* 700704 80238984 0C05123D */ jal free_hud_element +/* 700704 80238984 0C05123D */ jal hud_element_free /* 700708 80238988 00000000 */ nop /* 70070C 8023898C 3C048024 */ lui $a0, %hi(D_8023BDC0) /* 700710 80238990 8C84BDC0 */ lw $a0, %lo(D_8023BDC0)($a0) -/* 700714 80238994 0C05123D */ jal free_hud_element +/* 700714 80238994 0C05123D */ jal hud_element_free /* 700718 80238998 00000000 */ nop /* 70071C 8023899C 0C093EB1 */ jal btl_set_popup_duration /* 700720 802389A0 0000202D */ daddu $a0, $zero, $zero @@ -686,7 +686,7 @@ glabel func_80238000_6FFD80 /* 7007AC 80238A2C 3C058011 */ lui $a1, %hi(HudScript_StickHoldLeft) /* 7007B0 80238A30 24A58E48 */ addiu $a1, $a1, %lo(HudScript_StickHoldLeft) .L80238A34: -/* 7007B4 80238A34 0C0511FF */ jal set_hud_element_anim +/* 7007B4 80238A34 0C0511FF */ jal hud_element_set_script /* 7007B8 80238A38 00000000 */ nop /* 7007BC 80238A3C 3C058024 */ lui $a1, %hi(D_8023BDC4) /* 7007C0 80238A40 24A5BDC4 */ addiu $a1, $a1, %lo(D_8023BDC4) @@ -701,7 +701,7 @@ glabel func_80238000_6FFD80 /* 7007E0 80238A60 8CA50000 */ lw $a1, ($a1) /* 7007E4 80238A64 3C068024 */ lui $a2, %hi(D_8023BDC8) /* 7007E8 80238A68 8CC6BDC8 */ lw $a2, %lo(D_8023BDC8)($a2) -/* 7007EC 80238A6C 0C051261 */ jal set_hud_element_render_pos +/* 7007EC 80238A6C 0C051261 */ jal hud_element_set_render_pos /* 7007F0 80238A70 0260202D */ daddu $a0, $s3, $zero /* 7007F4 80238A74 27B50028 */ addiu $s5, $sp, 0x28 .L80238A78: @@ -720,7 +720,7 @@ glabel func_80238000_6FFD80 /* 700828 80238AA8 8E73BDB4 */ lw $s3, %lo(D_8023BDB4)($s3) /* 70082C 80238AAC 8FA50028 */ lw $a1, 0x28($sp) /* 700830 80238AB0 8FA6002C */ lw $a2, 0x2c($sp) -/* 700834 80238AB4 0C051261 */ jal set_hud_element_render_pos +/* 700834 80238AB4 0C051261 */ jal hud_element_set_render_pos /* 700838 80238AB8 0260202D */ daddu $a0, $s3, $zero /* 70083C 80238ABC 0260202D */ daddu $a0, $s3, $zero /* 700840 80238AC0 3C108024 */ lui $s0, %hi(D_8023BDB8) @@ -730,7 +730,7 @@ glabel func_80238000_6FFD80 /* 700850 80238AD0 46804220 */ cvt.s.w $f8, $f8 /* 700854 80238AD4 44050000 */ mfc1 $a1, $f0 /* 700858 80238AD8 44074000 */ mfc1 $a3, $f8 -/* 70085C 80238ADC 0C051489 */ jal set_hud_element_transform_rotation +/* 70085C 80238ADC 0C051489 */ jal hud_element_set_transform_rotation /* 700860 80238AE0 00A0302D */ daddu $a2, $a1, $zero /* 700864 80238AE4 8E020000 */ lw $v0, ($s0) /* 700868 80238AE8 2442FFF6 */ addiu $v0, $v0, -0xa @@ -803,14 +803,14 @@ glabel func_80238000_6FFD80 /* 700970 80238BF0 8E440000 */ lw $a0, ($s2) /* 700974 80238BF4 8FA50028 */ lw $a1, 0x28($sp) /* 700978 80238BF8 8FA6002C */ lw $a2, 0x2c($sp) -/* 70097C 80238BFC 0C051261 */ jal set_hud_element_render_pos +/* 70097C 80238BFC 0C051261 */ jal hud_element_set_render_pos /* 700980 80238C00 26310001 */ addiu $s1, $s1, 1 /* 700984 80238C04 3C048024 */ lui $a0, %hi(D_8023BD98) /* 700988 80238C08 00902021 */ addu $a0, $a0, $s0 /* 70098C 80238C0C 8C84BD98 */ lw $a0, %lo(D_8023BD98)($a0) /* 700990 80238C10 8FA50028 */ lw $a1, 0x28($sp) /* 700994 80238C14 8FA6002C */ lw $a2, 0x2c($sp) -/* 700998 80238C18 0C051261 */ jal set_hud_element_render_pos +/* 700998 80238C18 0C051261 */ jal hud_element_set_render_pos /* 70099C 80238C1C 26520004 */ addiu $s2, $s2, 4 /* 7009A0 80238C20 2A220006 */ slti $v0, $s1, 6 /* 7009A4 80238C24 1440FFD5 */ bnez $v0, .L80238B7C @@ -819,7 +819,7 @@ glabel func_80238000_6FFD80 /* 7009B0 80238C30 00822021 */ addu $a0, $a0, $v0 /* 7009B4 80238C34 8C84BD78 */ lw $a0, %lo(D_8023BD78)($a0) /* 7009B8 80238C38 8FA50028 */ lw $a1, 0x28($sp) -/* 7009BC 80238C3C 0C051261 */ jal set_hud_element_render_pos +/* 7009BC 80238C3C 0C051261 */ jal hud_element_set_render_pos /* 7009C0 80238C40 8FA6002C */ lw $a2, 0x2c($sp) /* 7009C4 80238C44 0C093EB1 */ jal btl_set_popup_duration /* 7009C8 80238C48 24040063 */ addiu $a0, $zero, 0x63 diff --git a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s index 6dfbd02ec2..907046293a 100644 --- a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s +++ b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s @@ -193,8 +193,8 @@ glabel func_802BBA60_E303B0 /* E30650 802BBD00 00431024 */ and $v0, $v0, $v1 /* E30654 802BBD04 10400003 */ beqz $v0, .L802BBD14 /* E30658 802BBD08 00000000 */ nop -/* E3065C 802BBD0C 3C018011 */ lui $at, %hi(D_8010C954) -/* E30660 802BBD10 AC31C954 */ sw $s1, %lo(D_8010C954)($at) +/* E3065C 802BBD0C 3C018011 */ lui $at, %hi(TweesterTouchingPartner) +/* E30660 802BBD10 AC31C954 */ sw $s1, %lo(TweesterTouchingPartner)($at) .L802BBD14: /* E30664 802BBD14 0C04D07A */ jal is_picking_up_item /* E30668 802BBD18 00000000 */ nop @@ -225,8 +225,8 @@ glabel func_802BBA60_E303B0 /* E306CC 802BBD7C 45000007 */ bc1f .L802BBD9C /* E306D0 802BBD80 2404001F */ addiu $a0, $zero, 0x1f /* E306D4 802BBD84 8E420004 */ lw $v0, 4($s2) -/* E306D8 802BBD88 3C018011 */ lui $at, %hi(D_8010C934) -/* E306DC 802BBD8C AC31C934 */ sw $s1, %lo(D_8010C934)($at) +/* E306D8 802BBD88 3C018011 */ lui $at, %hi(TweesterTouchingPlayer) +/* E306DC 802BBD8C AC31C934 */ sw $s1, %lo(TweesterTouchingPlayer)($at) /* E306E0 802BBD90 34420004 */ ori $v0, $v0, 4 /* E306E4 802BBD94 0C039769 */ jal set_action_state /* E306E8 802BBD98 AE420004 */ sw $v0, 4($s2) diff --git a/ver/us/asm/nonmatchings/fio/fio_deserialize_state.s b/ver/us/asm/nonmatchings/fio/fio_deserialize_state.s index 515b1bbd3a..d78bebabef 100644 --- a/ver/us/asm/nonmatchings/fio/fio_deserialize_state.s +++ b/ver/us/asm/nonmatchings/fio/fio_deserialize_state.s @@ -77,9 +77,9 @@ glabel fio_deserialize_state /* 69A4 8002B5A4 8CEA12F0 */ lw $t2, 0x12f0($a3) /* 69A8 8002B5A8 8CEB12F4 */ lw $t3, 0x12f4($a3) /* 69AC 8002B5AC 8CEC12F8 */ lw $t4, 0x12f8($a3) -/* 69B0 8002B5B0 3C018007 */ lui $at, %hi(D_800779C4) +/* 69B0 8002B5B0 3C018007 */ lui $at, %hi(gSaveSlotMetadata) /* 69B4 8002B5B4 00220821 */ addu $at, $at, $v0 -/* 69B8 8002B5B8 AC2979C4 */ sw $t1, %lo(D_800779C4)($at) +/* 69B8 8002B5B8 AC2979C4 */ sw $t1, %lo(gSaveSlotMetadata)($at) /* 69BC 8002B5BC 3C018007 */ lui $at, %hi(D_800779C8) /* 69C0 8002B5C0 00220821 */ addu $at, $at, $v0 /* 69C4 8002B5C4 AC2A79C8 */ sw $t2, %lo(D_800779C8)($at) diff --git a/ver/us/asm/nonmatchings/fio/fio_serialize_state.s b/ver/us/asm/nonmatchings/fio/fio_serialize_state.s index ddfc9eff28..9a0d114363 100644 --- a/ver/us/asm/nonmatchings/fio/fio_serialize_state.s +++ b/ver/us/asm/nonmatchings/fio/fio_serialize_state.s @@ -103,16 +103,16 @@ glabel fio_serialize_state /* 6BAC 8002B7AC 00431021 */ addu $v0, $v0, $v1 /* 6BB0 8002B7B0 8E2302BC */ lw $v1, 0x2bc($s1) /* 6BB4 8002B7B4 000210C0 */ sll $v0, $v0, 3 -/* 6BB8 8002B7B8 3C018007 */ lui $at, %hi(D_800779C4) +/* 6BB8 8002B7B8 3C018007 */ lui $at, %hi(gSaveSlotMetadata) /* 6BBC 8002B7BC 00220821 */ addu $at, $at, $v0 -/* 6BC0 8002B7C0 AC2379C4 */ sw $v1, %lo(D_800779C4)($at) +/* 6BC0 8002B7C0 AC2379C4 */ sw $v1, %lo(gSaveSlotMetadata)($at) /* 6BC4 8002B7C4 90830166 */ lbu $v1, 0x166($a0) /* 6BC8 8002B7C8 00031040 */ sll $v0, $v1, 1 /* 6BCC 8002B7CC 00431021 */ addu $v0, $v0, $v1 /* 6BD0 8002B7D0 000210C0 */ sll $v0, $v0, 3 -/* 6BD4 8002B7D4 3C088007 */ lui $t0, %hi(D_800779C4) +/* 6BD4 8002B7D4 3C088007 */ lui $t0, %hi(gSaveSlotMetadata) /* 6BD8 8002B7D8 01024021 */ addu $t0, $t0, $v0 -/* 6BDC 8002B7DC 8D0879C4 */ lw $t0, %lo(D_800779C4)($t0) +/* 6BDC 8002B7DC 8D0879C4 */ lw $t0, %lo(gSaveSlotMetadata)($t0) /* 6BE0 8002B7E0 3C098007 */ lui $t1, %hi(D_800779C8) /* 6BE4 8002B7E4 01224821 */ addu $t1, $t1, $v0 /* 6BE8 8002B7E8 8D2979C8 */ lw $t1, %lo(D_800779C8)($t1) diff --git a/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s index 8e5d842d11..42d311a8d6 100644 --- a/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s +++ b/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s @@ -22,10 +22,10 @@ glabel pause_stats_draw_contents /* 138D04 802459C4 AFA40080 */ sw $a0, 0x80($sp) /* 138D08 802459C8 AFA80050 */ sw $t0, 0x50($sp) /* 138D0C 802459CC 8E24000C */ lw $a0, 0xc($s1) -/* 138D10 802459D0 0C051261 */ jal set_hud_element_render_pos +/* 138D10 802459D0 0C051261 */ jal hud_element_set_render_pos /* 138D14 802459D4 27C6006D */ addiu $a2, $fp, 0x6d /* 138D18 802459D8 8E24000C */ lw $a0, 0xc($s1) -/* 138D1C 802459DC 0C0511F8 */ jal draw_hud_element_3 +/* 138D1C 802459DC 0C0511F8 */ jal hud_element_draw_without_clipping /* 138D20 802459E0 27D00065 */ addiu $s0, $fp, 0x65 /* 138D24 802459E4 0C093BA0 */ jal pause_get_menu_msg /* 138D28 802459E8 24040032 */ addiu $a0, $zero, 0x32 @@ -59,17 +59,17 @@ glabel pause_stats_draw_contents /* 138D98 80245A58 8FA80084 */ lw $t0, 0x84($sp) /* 138D9C 80245A5C 8E24002C */ lw $a0, 0x2c($s1) /* 138DA0 80245A60 251300F8 */ addiu $s3, $t0, 0xf8 -/* 138DA4 80245A64 0C051261 */ jal set_hud_element_render_pos +/* 138DA4 80245A64 0C051261 */ jal hud_element_set_render_pos /* 138DA8 80245A68 0260282D */ daddu $a1, $s3, $zero /* 138DAC 80245A6C 8E24002C */ lw $a0, 0x2c($s1) -/* 138DB0 80245A70 0C0511F8 */ jal draw_hud_element_3 +/* 138DB0 80245A70 0C0511F8 */ jal hud_element_draw_without_clipping /* 138DB4 80245A74 27D00056 */ addiu $s0, $fp, 0x56 /* 138DB8 80245A78 8FA50050 */ lw $a1, 0x50($sp) /* 138DBC 80245A7C 8E240010 */ lw $a0, 0x10($s1) -/* 138DC0 80245A80 0C051261 */ jal set_hud_element_render_pos +/* 138DC0 80245A80 0C051261 */ jal hud_element_set_render_pos /* 138DC4 80245A84 27C6005E */ addiu $a2, $fp, 0x5e /* 138DC8 80245A88 8E240010 */ lw $a0, 0x10($s1) -/* 138DCC 80245A8C 0C0511F8 */ jal draw_hud_element_3 +/* 138DCC 80245A8C 0C0511F8 */ jal hud_element_draw_without_clipping /* 138DD0 80245A90 27D5007B */ addiu $s5, $fp, 0x7b /* 138DD4 80245A94 0C093BA0 */ jal pause_get_menu_msg /* 138DD8 80245A98 24040033 */ addiu $a0, $zero, 0x33 @@ -95,17 +95,17 @@ glabel pause_stats_draw_contents /* 138E28 80245AE8 AFB20018 */ sw $s2, 0x18($sp) /* 138E2C 80245AEC 0260282D */ daddu $a1, $s3, $zero /* 138E30 80245AF0 8E24002C */ lw $a0, 0x2c($s1) -/* 138E34 80245AF4 0C051261 */ jal set_hud_element_render_pos +/* 138E34 80245AF4 0C051261 */ jal hud_element_set_render_pos /* 138E38 80245AF8 27C6005D */ addiu $a2, $fp, 0x5d /* 138E3C 80245AFC 8E24002C */ lw $a0, 0x2c($s1) -/* 138E40 80245B00 0C0511F8 */ jal draw_hud_element_3 +/* 138E40 80245B00 0C0511F8 */ jal hud_element_draw_without_clipping /* 138E44 80245B04 27D00074 */ addiu $s0, $fp, 0x74 /* 138E48 80245B08 8FA50050 */ lw $a1, 0x50($sp) /* 138E4C 80245B0C 8E240014 */ lw $a0, 0x14($s1) -/* 138E50 80245B10 0C051261 */ jal set_hud_element_render_pos +/* 138E50 80245B10 0C051261 */ jal hud_element_set_render_pos /* 138E54 80245B14 02A0302D */ daddu $a2, $s5, $zero /* 138E58 80245B18 8E240014 */ lw $a0, 0x14($s1) -/* 138E5C 80245B1C 0C0511F8 */ jal draw_hud_element_3 +/* 138E5C 80245B1C 0C0511F8 */ jal hud_element_draw_without_clipping /* 138E60 80245B20 00000000 */ nop /* 138E64 80245B24 0C093BA0 */ jal pause_get_menu_msg /* 138E68 80245B28 24040034 */ addiu $a0, $zero, 0x34 @@ -131,10 +131,10 @@ glabel pause_stats_draw_contents /* 138EB8 80245B78 AFB20018 */ sw $s2, 0x18($sp) /* 138EBC 80245B7C 0260282D */ daddu $a1, $s3, $zero /* 138EC0 80245B80 8E24002C */ lw $a0, 0x2c($s1) -/* 138EC4 80245B84 0C051261 */ jal set_hud_element_render_pos +/* 138EC4 80245B84 0C051261 */ jal hud_element_set_render_pos /* 138EC8 80245B88 02A0302D */ daddu $a2, $s5, $zero /* 138ECC 80245B8C 8E24002C */ lw $a0, 0x2c($s1) -/* 138ED0 80245B90 0C0511F8 */ jal draw_hud_element_3 +/* 138ED0 80245B90 0C0511F8 */ jal hud_element_draw_without_clipping /* 138ED4 80245B94 27D00033 */ addiu $s0, $fp, 0x33 /* 138ED8 80245B98 0000202D */ daddu $a0, $zero, $zero /* 138EDC 80245B9C 8FA80084 */ lw $t0, 0x84($sp) @@ -146,10 +146,10 @@ glabel pause_stats_draw_contents /* 138EF4 80245BB4 8FA80084 */ lw $t0, 0x84($sp) /* 138EF8 80245BB8 8E24001C */ lw $a0, 0x1c($s1) /* 138EFC 80245BBC 25150034 */ addiu $s5, $t0, 0x34 -/* 138F00 80245BC0 0C051261 */ jal set_hud_element_render_pos +/* 138F00 80245BC0 0C051261 */ jal hud_element_set_render_pos /* 138F04 80245BC4 02A0282D */ daddu $a1, $s5, $zero /* 138F08 80245BC8 8E24001C */ lw $a0, 0x1c($s1) -/* 138F0C 80245BCC 0C0511F8 */ jal draw_hud_element_3 +/* 138F0C 80245BCC 0C0511F8 */ jal hud_element_draw_without_clipping /* 138F10 80245BD0 00000000 */ nop /* 138F14 80245BD4 0C093BA0 */ jal pause_get_menu_msg /* 138F18 80245BD8 24040036 */ addiu $a0, $zero, 0x36 @@ -203,10 +203,10 @@ glabel pause_stats_draw_contents /* 138FD8 80245C98 27C60045 */ addiu $a2, $fp, 0x45 /* 138FDC 80245C9C 02A0282D */ daddu $a1, $s5, $zero /* 138FE0 80245CA0 8E240020 */ lw $a0, 0x20($s1) -/* 138FE4 80245CA4 0C051261 */ jal set_hud_element_render_pos +/* 138FE4 80245CA4 0C051261 */ jal hud_element_set_render_pos /* 138FE8 80245CA8 27C6005C */ addiu $a2, $fp, 0x5c /* 138FEC 80245CAC 8E240020 */ lw $a0, 0x20($s1) -/* 138FF0 80245CB0 0C0511F8 */ jal draw_hud_element_3 +/* 138FF0 80245CB0 0C0511F8 */ jal hud_element_draw_without_clipping /* 138FF4 80245CB4 27D00055 */ addiu $s0, $fp, 0x55 /* 138FF8 80245CB8 0C093BA0 */ jal pause_get_menu_msg /* 138FFC 80245CBC 24040037 */ addiu $a0, $zero, 0x37 @@ -254,10 +254,10 @@ glabel pause_stats_draw_contents /* 1390A4 80245D64 27C60067 */ addiu $a2, $fp, 0x67 /* 1390A8 80245D68 02A0282D */ daddu $a1, $s5, $zero /* 1390AC 80245D6C 8E240024 */ lw $a0, 0x24($s1) -/* 1390B0 80245D70 0C051261 */ jal set_hud_element_render_pos +/* 1390B0 80245D70 0C051261 */ jal hud_element_set_render_pos /* 1390B4 80245D74 27C6007E */ addiu $a2, $fp, 0x7e /* 1390B8 80245D78 8E240024 */ lw $a0, 0x24($s1) -/* 1390BC 80245D7C 0C0511F8 */ jal draw_hud_element_3 +/* 1390BC 80245D7C 0C0511F8 */ jal hud_element_draw_without_clipping /* 1390C0 80245D80 27D00077 */ addiu $s0, $fp, 0x77 /* 1390C4 80245D84 0C093BA0 */ jal pause_get_menu_msg /* 1390C8 80245D88 24040038 */ addiu $a0, $zero, 0x38 @@ -281,10 +281,10 @@ glabel pause_stats_draw_contents /* 139110 80245DD0 AFB20018 */ sw $s2, 0x18($sp) /* 139114 80245DD4 8FA50050 */ lw $a1, 0x50($sp) /* 139118 80245DD8 8E240018 */ lw $a0, 0x18($s1) -/* 13911C 80245DDC 0C051261 */ jal set_hud_element_render_pos +/* 13911C 80245DDC 0C051261 */ jal hud_element_set_render_pos /* 139120 80245DE0 27C6008C */ addiu $a2, $fp, 0x8c /* 139124 80245DE4 8E240018 */ lw $a0, 0x18($s1) -/* 139128 80245DE8 0C0511F8 */ jal draw_hud_element_3 +/* 139128 80245DE8 0C0511F8 */ jal hud_element_draw_without_clipping /* 13912C 80245DEC 27D50085 */ addiu $s5, $fp, 0x85 /* 139130 80245DF0 0C093BA0 */ jal pause_get_menu_msg /* 139134 80245DF4 24040035 */ addiu $a0, $zero, 0x35 @@ -473,10 +473,10 @@ glabel pause_stats_draw_contents /* 139404 802460C4 27C60015 */ addiu $a2, $fp, 0x15 /* 139408 802460C8 8FA80084 */ lw $t0, 0x84($sp) /* 13940C 802460CC 8EC40000 */ lw $a0, ($s6) -/* 139410 802460D0 0C051261 */ jal set_hud_element_render_pos +/* 139410 802460D0 0C051261 */ jal hud_element_set_render_pos /* 139414 802460D4 2505003D */ addiu $a1, $t0, 0x3d /* 139418 802460D8 8EC40000 */ lw $a0, ($s6) -/* 13941C 802460DC 0C0511F8 */ jal draw_hud_element_3 +/* 13941C 802460DC 0C0511F8 */ jal hud_element_draw_without_clipping /* 139420 802460E0 27D0000E */ addiu $s0, $fp, 0xe /* 139424 802460E4 0C093BA0 */ jal pause_get_menu_msg /* 139428 802460E8 24040043 */ addiu $a0, $zero, 0x43 @@ -550,16 +550,16 @@ glabel pause_stats_draw_contents /* 139528 802461E8 3C058025 */ lui $a1, %hi(gStatsBootsElements) /* 13952C 802461EC 00B02821 */ addu $a1, $a1, $s0 /* 139530 802461F0 8CA5F360 */ lw $a1, %lo(gStatsBootsElements)($a1) -/* 139534 802461F4 0C0511FF */ jal set_hud_element_anim +/* 139534 802461F4 0C0511FF */ jal hud_element_set_script /* 139538 802461F8 24140001 */ addiu $s4, $zero, 1 /* 13953C 802461FC 27C6001D */ addiu $a2, $fp, 0x1d /* 139540 80246200 8FA80084 */ lw $t0, 0x84($sp) /* 139544 80246204 8EC40004 */ lw $a0, 4($s6) /* 139548 80246208 251100A3 */ addiu $s1, $t0, 0xa3 -/* 13954C 8024620C 0C051261 */ jal set_hud_element_render_pos +/* 13954C 8024620C 0C051261 */ jal hud_element_set_render_pos /* 139550 80246210 0220282D */ daddu $a1, $s1, $zero /* 139554 80246214 8EC40004 */ lw $a0, 4($s6) -/* 139558 80246218 0C0511F8 */ jal draw_hud_element_3 +/* 139558 80246218 0C0511F8 */ jal hud_element_draw_without_clipping /* 13955C 8024621C 00000000 */ nop /* 139560 80246220 3C048025 */ lui $a0, %hi(gPauseStatsBootsMessages) /* 139564 80246224 00902021 */ addu $a0, $a0, $s0 @@ -580,14 +580,14 @@ glabel pause_stats_draw_contents /* 1395A0 80246260 3C058025 */ lui $a1, %hi(gStatsHammerElements) /* 1395A4 80246264 00B02821 */ addu $a1, $a1, $s0 /* 1395A8 80246268 8CA5F370 */ lw $a1, %lo(gStatsHammerElements)($a1) -/* 1395AC 8024626C 0C0511FF */ jal set_hud_element_anim +/* 1395AC 8024626C 0C0511FF */ jal hud_element_set_script /* 1395B0 80246270 0000982D */ daddu $s3, $zero, $zero /* 1395B4 80246274 0220282D */ daddu $a1, $s1, $zero /* 1395B8 80246278 8EC40008 */ lw $a0, 8($s6) -/* 1395BC 8024627C 0C051261 */ jal set_hud_element_render_pos +/* 1395BC 8024627C 0C051261 */ jal hud_element_set_render_pos /* 1395C0 80246280 27C60036 */ addiu $a2, $fp, 0x36 /* 1395C4 80246284 8EC40008 */ lw $a0, 8($s6) -/* 1395C8 80246288 0C0511F8 */ jal draw_hud_element_3 +/* 1395C8 80246288 0C0511F8 */ jal hud_element_draw_without_clipping /* 1395CC 8024628C 0260A82D */ daddu $s5, $s3, $zero /* 1395D0 80246290 3C048025 */ lui $a0, %hi(gPauseStatsHammerMessages) /* 1395D4 80246294 00902021 */ addu $a0, $a0, $s0 @@ -641,7 +641,7 @@ glabel pause_stats_draw_contents /* 139688 80246348 3C058025 */ lui $a1, %hi(gPauseStatsSPIncElements) /* 13968C 8024634C 00B02821 */ addu $a1, $a1, $s0 /* 139690 80246350 8CA5F434 */ lw $a1, %lo(gPauseStatsSPIncElements)($a1) -/* 139694 80246354 0C0511FF */ jal set_hud_element_anim +/* 139694 80246354 0C0511FF */ jal hud_element_set_script /* 139698 80246358 0220202D */ daddu $a0, $s1, $zero /* 13969C 8024635C 0220202D */ daddu $a0, $s1, $zero /* 1396A0 80246360 27C6004B */ addiu $a2, $fp, 0x4b @@ -652,16 +652,16 @@ glabel pause_stats_draw_contents /* 1396B4 80246374 3C058025 */ lui $a1, %hi(D_8024F46C) /* 1396B8 80246378 8CA5F46C */ lw $a1, %lo(D_8024F46C)($a1) /* 1396BC 8024637C 01108021 */ addu $s0, $t0, $s0 -/* 1396C0 80246380 0C051261 */ jal set_hud_element_render_pos +/* 1396C0 80246380 0C051261 */ jal hud_element_set_render_pos /* 1396C4 80246384 02052821 */ addu $a1, $s0, $a1 /* 1396C8 80246388 12800005 */ beqz $s4, .L802463A0 /* 1396CC 8024638C 00000000 */ nop -/* 1396D0 80246390 0C0511F8 */ jal draw_hud_element_3 +/* 1396D0 80246390 0C0511F8 */ jal hud_element_draw_without_clipping /* 1396D4 80246394 0220202D */ daddu $a0, $s1, $zero /* 1396D8 80246398 080918EA */ j .L802463A8 /* 1396DC 8024639C 0000A02D */ daddu $s4, $zero, $zero .L802463A0: -/* 1396E0 802463A0 0C0511F1 */ jal draw_hud_element_2 +/* 1396E0 802463A0 0C0511F1 */ jal hud_element_draw_next /* 1396E4 802463A4 0220202D */ daddu $a0, $s1, $zero .L802463A8: /* 1396E8 802463A8 0276102A */ slt $v0, $s3, $s6 @@ -672,7 +672,7 @@ glabel pause_stats_draw_contents /* 1396FC 802463BC 3C058025 */ lui $a1, %hi(gPauseStatsSPIncElements) /* 139700 802463C0 00B02821 */ addu $a1, $a1, $s0 /* 139704 802463C4 8CA5F434 */ lw $a1, %lo(gPauseStatsSPIncElements)($a1) -/* 139708 802463C8 0C0511FF */ jal set_hud_element_anim +/* 139708 802463C8 0C0511FF */ jal hud_element_set_script /* 13970C 802463CC 0220202D */ daddu $a0, $s1, $zero /* 139710 802463D0 0220202D */ daddu $a0, $s1, $zero /* 139714 802463D4 27C6004B */ addiu $a2, $fp, 0x4b @@ -683,16 +683,16 @@ glabel pause_stats_draw_contents /* 139728 802463E8 3C058025 */ lui $a1, %hi(D_8024F470) /* 13972C 802463EC 8CA5F470 */ lw $a1, %lo(D_8024F470)($a1) /* 139730 802463F0 01108021 */ addu $s0, $t0, $s0 -/* 139734 802463F4 0C051261 */ jal set_hud_element_render_pos +/* 139734 802463F4 0C051261 */ jal hud_element_set_render_pos /* 139738 802463F8 02052821 */ addu $a1, $s0, $a1 /* 13973C 802463FC 12800005 */ beqz $s4, .L80246414 /* 139740 80246400 00000000 */ nop -/* 139744 80246404 0C0511F8 */ jal draw_hud_element_3 +/* 139744 80246404 0C0511F8 */ jal hud_element_draw_without_clipping /* 139748 80246408 0220202D */ daddu $a0, $s1, $zero /* 13974C 8024640C 08091907 */ j .L8024641C /* 139750 80246410 0000A02D */ daddu $s4, $zero, $zero .L80246414: -/* 139754 80246414 0C0511F1 */ jal draw_hud_element_2 +/* 139754 80246414 0C0511F1 */ jal hud_element_draw_next /* 139758 80246418 0220202D */ daddu $a0, $s1, $zero .L8024641C: /* 13975C 8024641C 0276102A */ slt $v0, $s3, $s6 @@ -703,7 +703,7 @@ glabel pause_stats_draw_contents /* 139770 80246430 3C058025 */ lui $a1, %hi(gPauseStatsSPIncElements) /* 139774 80246434 00B02821 */ addu $a1, $a1, $s0 /* 139778 80246438 8CA5F434 */ lw $a1, %lo(gPauseStatsSPIncElements)($a1) -/* 13977C 8024643C 0C0511FF */ jal set_hud_element_anim +/* 13977C 8024643C 0C0511FF */ jal hud_element_set_script /* 139780 80246440 0220202D */ daddu $a0, $s1, $zero /* 139784 80246444 0220202D */ daddu $a0, $s1, $zero /* 139788 80246448 27C6004B */ addiu $a2, $fp, 0x4b @@ -714,16 +714,16 @@ glabel pause_stats_draw_contents /* 13979C 8024645C 3C058025 */ lui $a1, %hi(D_8024F474) /* 1397A0 80246460 8CA5F474 */ lw $a1, %lo(D_8024F474)($a1) /* 1397A4 80246464 01108021 */ addu $s0, $t0, $s0 -/* 1397A8 80246468 0C051261 */ jal set_hud_element_render_pos +/* 1397A8 80246468 0C051261 */ jal hud_element_set_render_pos /* 1397AC 8024646C 02052821 */ addu $a1, $s0, $a1 /* 1397B0 80246470 12800005 */ beqz $s4, .L80246488 /* 1397B4 80246474 00000000 */ nop -/* 1397B8 80246478 0C0511F8 */ jal draw_hud_element_3 +/* 1397B8 80246478 0C0511F8 */ jal hud_element_draw_without_clipping /* 1397BC 8024647C 0220202D */ daddu $a0, $s1, $zero /* 1397C0 80246480 08091924 */ j .L80246490 /* 1397C4 80246484 0000A02D */ daddu $s4, $zero, $zero .L80246488: -/* 1397C8 80246488 0C0511F1 */ jal draw_hud_element_2 +/* 1397C8 80246488 0C0511F1 */ jal hud_element_draw_next /* 1397CC 8024648C 0220202D */ daddu $a0, $s1, $zero .L80246490: /* 1397D0 80246490 0276102A */ slt $v0, $s3, $s6 @@ -734,7 +734,7 @@ glabel pause_stats_draw_contents /* 1397E4 802464A4 3C058025 */ lui $a1, %hi(gPauseStatsSPIncElements) /* 1397E8 802464A8 00B02821 */ addu $a1, $a1, $s0 /* 1397EC 802464AC 8CA5F434 */ lw $a1, %lo(gPauseStatsSPIncElements)($a1) -/* 1397F0 802464B0 0C0511FF */ jal set_hud_element_anim +/* 1397F0 802464B0 0C0511FF */ jal hud_element_set_script /* 1397F4 802464B4 0220202D */ daddu $a0, $s1, $zero /* 1397F8 802464B8 0220202D */ daddu $a0, $s1, $zero /* 1397FC 802464BC 27C6004B */ addiu $a2, $fp, 0x4b @@ -745,16 +745,16 @@ glabel pause_stats_draw_contents /* 139810 802464D0 3C058025 */ lui $a1, %hi(D_8024F478) /* 139814 802464D4 8CA5F478 */ lw $a1, %lo(D_8024F478)($a1) /* 139818 802464D8 01108021 */ addu $s0, $t0, $s0 -/* 13981C 802464DC 0C051261 */ jal set_hud_element_render_pos +/* 13981C 802464DC 0C051261 */ jal hud_element_set_render_pos /* 139820 802464E0 02052821 */ addu $a1, $s0, $a1 /* 139824 802464E4 12800005 */ beqz $s4, .L802464FC /* 139828 802464E8 00000000 */ nop -/* 13982C 802464EC 0C0511F8 */ jal draw_hud_element_3 +/* 13982C 802464EC 0C0511F8 */ jal hud_element_draw_without_clipping /* 139830 802464F0 0220202D */ daddu $a0, $s1, $zero /* 139834 802464F4 08091941 */ j .L80246504 /* 139838 802464F8 0000A02D */ daddu $s4, $zero, $zero .L802464FC: -/* 13983C 802464FC 0C0511F1 */ jal draw_hud_element_2 +/* 13983C 802464FC 0C0511F1 */ jal hud_element_draw_next /* 139840 80246500 0220202D */ daddu $a0, $s1, $zero .L80246504: /* 139844 80246504 0276102A */ slt $v0, $s3, $s6 @@ -765,7 +765,7 @@ glabel pause_stats_draw_contents /* 139858 80246518 3C058025 */ lui $a1, %hi(gPauseStatsSPIncElements) /* 13985C 8024651C 00B02821 */ addu $a1, $a1, $s0 /* 139860 80246520 8CA5F434 */ lw $a1, %lo(gPauseStatsSPIncElements)($a1) -/* 139864 80246524 0C0511FF */ jal set_hud_element_anim +/* 139864 80246524 0C0511FF */ jal hud_element_set_script /* 139868 80246528 0220202D */ daddu $a0, $s1, $zero /* 13986C 8024652C 0220202D */ daddu $a0, $s1, $zero /* 139870 80246530 27C6004B */ addiu $a2, $fp, 0x4b @@ -776,16 +776,16 @@ glabel pause_stats_draw_contents /* 139884 80246544 3C058025 */ lui $a1, %hi(D_8024F47C) /* 139888 80246548 8CA5F47C */ lw $a1, %lo(D_8024F47C)($a1) /* 13988C 8024654C 01108021 */ addu $s0, $t0, $s0 -/* 139890 80246550 0C051261 */ jal set_hud_element_render_pos +/* 139890 80246550 0C051261 */ jal hud_element_set_render_pos /* 139894 80246554 02052821 */ addu $a1, $s0, $a1 /* 139898 80246558 12800005 */ beqz $s4, .L80246570 /* 13989C 8024655C 00000000 */ nop -/* 1398A0 80246560 0C0511F8 */ jal draw_hud_element_3 +/* 1398A0 80246560 0C0511F8 */ jal hud_element_draw_without_clipping /* 1398A4 80246564 0220202D */ daddu $a0, $s1, $zero /* 1398A8 80246568 0809195E */ j .L80246578 /* 1398AC 8024656C 0000A02D */ daddu $s4, $zero, $zero .L80246570: -/* 1398B0 80246570 0C0511F1 */ jal draw_hud_element_2 +/* 1398B0 80246570 0C0511F1 */ jal hud_element_draw_next /* 1398B4 80246574 0220202D */ daddu $a0, $s1, $zero .L80246578: /* 1398B8 80246578 0276102A */ slt $v0, $s3, $s6 @@ -796,7 +796,7 @@ glabel pause_stats_draw_contents /* 1398CC 8024658C 3C058025 */ lui $a1, %hi(gPauseStatsSPIncElements) /* 1398D0 80246590 00B02821 */ addu $a1, $a1, $s0 /* 1398D4 80246594 8CA5F434 */ lw $a1, %lo(gPauseStatsSPIncElements)($a1) -/* 1398D8 80246598 0C0511FF */ jal set_hud_element_anim +/* 1398D8 80246598 0C0511FF */ jal hud_element_set_script /* 1398DC 8024659C 0220202D */ daddu $a0, $s1, $zero /* 1398E0 802465A0 0220202D */ daddu $a0, $s1, $zero /* 1398E4 802465A4 27C6004B */ addiu $a2, $fp, 0x4b @@ -807,16 +807,16 @@ glabel pause_stats_draw_contents /* 1398F8 802465B8 3C058025 */ lui $a1, %hi(D_8024F480) /* 1398FC 802465BC 8CA5F480 */ lw $a1, %lo(D_8024F480)($a1) /* 139900 802465C0 01108021 */ addu $s0, $t0, $s0 -/* 139904 802465C4 0C051261 */ jal set_hud_element_render_pos +/* 139904 802465C4 0C051261 */ jal hud_element_set_render_pos /* 139908 802465C8 02052821 */ addu $a1, $s0, $a1 /* 13990C 802465CC 12800005 */ beqz $s4, .L802465E4 /* 139910 802465D0 00000000 */ nop -/* 139914 802465D4 0C0511F8 */ jal draw_hud_element_3 +/* 139914 802465D4 0C0511F8 */ jal hud_element_draw_without_clipping /* 139918 802465D8 0220202D */ daddu $a0, $s1, $zero /* 13991C 802465DC 0809197B */ j .L802465EC /* 139920 802465E0 0000A02D */ daddu $s4, $zero, $zero .L802465E4: -/* 139924 802465E4 0C0511F1 */ jal draw_hud_element_2 +/* 139924 802465E4 0C0511F1 */ jal hud_element_draw_next /* 139928 802465E8 0220202D */ daddu $a0, $s1, $zero .L802465EC: /* 13992C 802465EC 0276102A */ slt $v0, $s3, $s6 @@ -827,7 +827,7 @@ glabel pause_stats_draw_contents /* 139940 80246600 3C058025 */ lui $a1, %hi(gPauseStatsSPIncElements) /* 139944 80246604 00B02821 */ addu $a1, $a1, $s0 /* 139948 80246608 8CA5F434 */ lw $a1, %lo(gPauseStatsSPIncElements)($a1) -/* 13994C 8024660C 0C0511FF */ jal set_hud_element_anim +/* 13994C 8024660C 0C0511FF */ jal hud_element_set_script /* 139950 80246610 0220202D */ daddu $a0, $s1, $zero /* 139954 80246614 0220202D */ daddu $a0, $s1, $zero /* 139958 80246618 27C6004B */ addiu $a2, $fp, 0x4b @@ -838,16 +838,16 @@ glabel pause_stats_draw_contents /* 13996C 8024662C 3C058025 */ lui $a1, %hi(D_8024F484) /* 139970 80246630 8CA5F484 */ lw $a1, %lo(D_8024F484)($a1) /* 139974 80246634 01108021 */ addu $s0, $t0, $s0 -/* 139978 80246638 0C051261 */ jal set_hud_element_render_pos +/* 139978 80246638 0C051261 */ jal hud_element_set_render_pos /* 13997C 8024663C 02052821 */ addu $a1, $s0, $a1 /* 139980 80246640 12800005 */ beqz $s4, .L80246658 /* 139984 80246644 00000000 */ nop -/* 139988 80246648 0C0511F8 */ jal draw_hud_element_3 +/* 139988 80246648 0C0511F8 */ jal hud_element_draw_without_clipping /* 13998C 8024664C 0220202D */ daddu $a0, $s1, $zero /* 139990 80246650 08091998 */ j .L80246660 /* 139994 80246654 0000A02D */ daddu $s4, $zero, $zero .L80246658: -/* 139998 80246658 0C0511F1 */ jal draw_hud_element_2 +/* 139998 80246658 0C0511F1 */ jal hud_element_draw_next /* 13999C 8024665C 0220202D */ daddu $a0, $s1, $zero .L80246660: /* 1399A0 80246660 0276102A */ slt $v0, $s3, $s6 @@ -858,7 +858,7 @@ glabel pause_stats_draw_contents /* 1399B4 80246674 3C058025 */ lui $a1, %hi(gPauseStatsStarElements) /* 1399B8 80246678 00B02821 */ addu $a1, $a1, $s0 /* 1399BC 8024667C 8CA5F450 */ lw $a1, %lo(gPauseStatsStarElements)($a1) -/* 1399C0 80246680 0C0511FF */ jal set_hud_element_anim +/* 1399C0 80246680 0C0511FF */ jal hud_element_set_script /* 1399C4 80246684 0220202D */ daddu $a0, $s1, $zero /* 1399C8 80246688 0220202D */ daddu $a0, $s1, $zero /* 1399CC 8024668C 02158021 */ addu $s0, $s0, $s5 @@ -866,16 +866,16 @@ glabel pause_stats_draw_contents /* 1399D4 80246694 26100098 */ addiu $s0, $s0, 0x98 /* 1399D8 80246698 8FA80084 */ lw $t0, 0x84($sp) /* 1399DC 8024669C 27C6004D */ addiu $a2, $fp, 0x4d -/* 1399E0 802466A0 0C051261 */ jal set_hud_element_render_pos +/* 1399E0 802466A0 0C051261 */ jal hud_element_set_render_pos /* 1399E4 802466A4 01102821 */ addu $a1, $t0, $s0 /* 1399E8 802466A8 12800005 */ beqz $s4, .L802466C0 /* 1399EC 802466AC 00000000 */ nop -/* 1399F0 802466B0 0C0511F8 */ jal draw_hud_element_3 +/* 1399F0 802466B0 0C0511F8 */ jal hud_element_draw_without_clipping /* 1399F4 802466B4 0220202D */ daddu $a0, $s1, $zero /* 1399F8 802466B8 080919B2 */ j .L802466C8 /* 1399FC 802466BC 0000A02D */ daddu $s4, $zero, $zero .L802466C0: -/* 139A00 802466C0 0C0511F1 */ jal draw_hud_element_2 +/* 139A00 802466C0 0C0511F1 */ jal hud_element_draw_next /* 139A04 802466C4 0220202D */ daddu $a0, $s1, $zero .L802466C8: /* 139A08 802466C8 0000902D */ daddu $s2, $zero, $zero @@ -901,7 +901,7 @@ glabel pause_stats_draw_contents /* 139A50 80246710 26730001 */ addiu $s3, $s3, 1 /* 139A54 80246714 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 139A58 80246718 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 139A5C 8024671C 0C0511FF */ jal set_hud_element_anim +/* 139A5C 8024671C 0C0511FF */ jal hud_element_set_script /* 139A60 80246720 0220202D */ daddu $a0, $s1, $zero /* 139A64 80246724 0220202D */ daddu $a0, $s1, $zero /* 139A68 80246728 27C6004B */ addiu $a2, $fp, 0x4b @@ -909,16 +909,16 @@ glabel pause_stats_draw_contents /* 139A70 80246730 3C028025 */ lui $v0, %hi(D_8024F46C) /* 139A74 80246734 8C42F46C */ lw $v0, %lo(D_8024F46C)($v0) /* 139A78 80246738 01102821 */ addu $a1, $t0, $s0 -/* 139A7C 8024673C 0C051261 */ jal set_hud_element_render_pos +/* 139A7C 8024673C 0C051261 */ jal hud_element_set_render_pos /* 139A80 80246740 00A22821 */ addu $a1, $a1, $v0 /* 139A84 80246744 12800005 */ beqz $s4, .L8024675C /* 139A88 80246748 00000000 */ nop -/* 139A8C 8024674C 0C0511F8 */ jal draw_hud_element_3 +/* 139A8C 8024674C 0C0511F8 */ jal hud_element_draw_without_clipping /* 139A90 80246750 0220202D */ daddu $a0, $s1, $zero /* 139A94 80246754 080919D9 */ j .L80246764 /* 139A98 80246758 0000A02D */ daddu $s4, $zero, $zero .L8024675C: -/* 139A9C 8024675C 0C0511F1 */ jal draw_hud_element_2 +/* 139A9C 8024675C 0C0511F1 */ jal hud_element_draw_next /* 139AA0 80246760 0220202D */ daddu $a0, $s1, $zero .L80246764: /* 139AA4 80246764 0276102A */ slt $v0, $s3, $s6 @@ -931,23 +931,23 @@ glabel pause_stats_draw_contents /* 139ABC 8024677C 02629821 */ addu $s3, $s3, $v0 /* 139AC0 80246780 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 139AC4 80246784 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 139AC8 80246788 0C0511FF */ jal set_hud_element_anim +/* 139AC8 80246788 0C0511FF */ jal hud_element_set_script /* 139ACC 8024678C 0220202D */ daddu $a0, $s1, $zero /* 139AD0 80246790 0220202D */ daddu $a0, $s1, $zero /* 139AD4 80246794 27C6004B */ addiu $a2, $fp, 0x4b /* 139AD8 80246798 8FA80084 */ lw $t0, 0x84($sp) /* 139ADC 8024679C 8EE20004 */ lw $v0, 4($s7) /* 139AE0 802467A0 01102821 */ addu $a1, $t0, $s0 -/* 139AE4 802467A4 0C051261 */ jal set_hud_element_render_pos +/* 139AE4 802467A4 0C051261 */ jal hud_element_set_render_pos /* 139AE8 802467A8 00A22821 */ addu $a1, $a1, $v0 /* 139AEC 802467AC 12800005 */ beqz $s4, .L802467C4 /* 139AF0 802467B0 00000000 */ nop -/* 139AF4 802467B4 0C0511F8 */ jal draw_hud_element_3 +/* 139AF4 802467B4 0C0511F8 */ jal hud_element_draw_without_clipping /* 139AF8 802467B8 0220202D */ daddu $a0, $s1, $zero /* 139AFC 802467BC 080919F3 */ j .L802467CC /* 139B00 802467C0 0000A02D */ daddu $s4, $zero, $zero .L802467C4: -/* 139B04 802467C4 0C0511F1 */ jal draw_hud_element_2 +/* 139B04 802467C4 0C0511F1 */ jal hud_element_draw_next /* 139B08 802467C8 0220202D */ daddu $a0, $s1, $zero .L802467CC: /* 139B0C 802467CC 0276102A */ slt $v0, $s3, $s6 @@ -960,23 +960,23 @@ glabel pause_stats_draw_contents /* 139B24 802467E4 26730001 */ addiu $s3, $s3, 1 /* 139B28 802467E8 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 139B2C 802467EC 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 139B30 802467F0 0C0511FF */ jal set_hud_element_anim +/* 139B30 802467F0 0C0511FF */ jal hud_element_set_script /* 139B34 802467F4 0220202D */ daddu $a0, $s1, $zero /* 139B38 802467F8 0220202D */ daddu $a0, $s1, $zero /* 139B3C 802467FC 27C6004B */ addiu $a2, $fp, 0x4b /* 139B40 80246800 8FA80084 */ lw $t0, 0x84($sp) /* 139B44 80246804 8EE20008 */ lw $v0, 8($s7) /* 139B48 80246808 01102821 */ addu $a1, $t0, $s0 -/* 139B4C 8024680C 0C051261 */ jal set_hud_element_render_pos +/* 139B4C 8024680C 0C051261 */ jal hud_element_set_render_pos /* 139B50 80246810 00A22821 */ addu $a1, $a1, $v0 /* 139B54 80246814 12800005 */ beqz $s4, .L8024682C /* 139B58 80246818 00000000 */ nop -/* 139B5C 8024681C 0C0511F8 */ jal draw_hud_element_3 +/* 139B5C 8024681C 0C0511F8 */ jal hud_element_draw_without_clipping /* 139B60 80246820 0220202D */ daddu $a0, $s1, $zero /* 139B64 80246824 08091A0D */ j .L80246834 /* 139B68 80246828 0000A02D */ daddu $s4, $zero, $zero .L8024682C: -/* 139B6C 8024682C 0C0511F1 */ jal draw_hud_element_2 +/* 139B6C 8024682C 0C0511F1 */ jal hud_element_draw_next /* 139B70 80246830 0220202D */ daddu $a0, $s1, $zero .L80246834: /* 139B74 80246834 0276102A */ slt $v0, $s3, $s6 @@ -989,23 +989,23 @@ glabel pause_stats_draw_contents /* 139B8C 8024684C 26730001 */ addiu $s3, $s3, 1 /* 139B90 80246850 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 139B94 80246854 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 139B98 80246858 0C0511FF */ jal set_hud_element_anim +/* 139B98 80246858 0C0511FF */ jal hud_element_set_script /* 139B9C 8024685C 0220202D */ daddu $a0, $s1, $zero /* 139BA0 80246860 0220202D */ daddu $a0, $s1, $zero /* 139BA4 80246864 27C6004B */ addiu $a2, $fp, 0x4b /* 139BA8 80246868 8FA80084 */ lw $t0, 0x84($sp) /* 139BAC 8024686C 8EE2000C */ lw $v0, 0xc($s7) /* 139BB0 80246870 01102821 */ addu $a1, $t0, $s0 -/* 139BB4 80246874 0C051261 */ jal set_hud_element_render_pos +/* 139BB4 80246874 0C051261 */ jal hud_element_set_render_pos /* 139BB8 80246878 00A22821 */ addu $a1, $a1, $v0 /* 139BBC 8024687C 12800005 */ beqz $s4, .L80246894 /* 139BC0 80246880 00000000 */ nop -/* 139BC4 80246884 0C0511F8 */ jal draw_hud_element_3 +/* 139BC4 80246884 0C0511F8 */ jal hud_element_draw_without_clipping /* 139BC8 80246888 0220202D */ daddu $a0, $s1, $zero /* 139BCC 8024688C 08091A27 */ j .L8024689C /* 139BD0 80246890 0000A02D */ daddu $s4, $zero, $zero .L80246894: -/* 139BD4 80246894 0C0511F1 */ jal draw_hud_element_2 +/* 139BD4 80246894 0C0511F1 */ jal hud_element_draw_next /* 139BD8 80246898 0220202D */ daddu $a0, $s1, $zero .L8024689C: /* 139BDC 8024689C 0276102A */ slt $v0, $s3, $s6 @@ -1018,23 +1018,23 @@ glabel pause_stats_draw_contents /* 139BF4 802468B4 26730001 */ addiu $s3, $s3, 1 /* 139BF8 802468B8 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 139BFC 802468BC 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 139C00 802468C0 0C0511FF */ jal set_hud_element_anim +/* 139C00 802468C0 0C0511FF */ jal hud_element_set_script /* 139C04 802468C4 0220202D */ daddu $a0, $s1, $zero /* 139C08 802468C8 0220202D */ daddu $a0, $s1, $zero /* 139C0C 802468CC 27C6004B */ addiu $a2, $fp, 0x4b /* 139C10 802468D0 8FA80084 */ lw $t0, 0x84($sp) /* 139C14 802468D4 8EE20010 */ lw $v0, 0x10($s7) /* 139C18 802468D8 01102821 */ addu $a1, $t0, $s0 -/* 139C1C 802468DC 0C051261 */ jal set_hud_element_render_pos +/* 139C1C 802468DC 0C051261 */ jal hud_element_set_render_pos /* 139C20 802468E0 00A22821 */ addu $a1, $a1, $v0 /* 139C24 802468E4 12800005 */ beqz $s4, .L802468FC /* 139C28 802468E8 00000000 */ nop -/* 139C2C 802468EC 0C0511F8 */ jal draw_hud_element_3 +/* 139C2C 802468EC 0C0511F8 */ jal hud_element_draw_without_clipping /* 139C30 802468F0 0220202D */ daddu $a0, $s1, $zero /* 139C34 802468F4 08091A41 */ j .L80246904 /* 139C38 802468F8 0000A02D */ daddu $s4, $zero, $zero .L802468FC: -/* 139C3C 802468FC 0C0511F1 */ jal draw_hud_element_2 +/* 139C3C 802468FC 0C0511F1 */ jal hud_element_draw_next /* 139C40 80246900 0220202D */ daddu $a0, $s1, $zero .L80246904: /* 139C44 80246904 0276102A */ slt $v0, $s3, $s6 @@ -1047,23 +1047,23 @@ glabel pause_stats_draw_contents /* 139C5C 8024691C 26730001 */ addiu $s3, $s3, 1 /* 139C60 80246920 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 139C64 80246924 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 139C68 80246928 0C0511FF */ jal set_hud_element_anim +/* 139C68 80246928 0C0511FF */ jal hud_element_set_script /* 139C6C 8024692C 0220202D */ daddu $a0, $s1, $zero /* 139C70 80246930 0220202D */ daddu $a0, $s1, $zero /* 139C74 80246934 27C6004B */ addiu $a2, $fp, 0x4b /* 139C78 80246938 8FA80084 */ lw $t0, 0x84($sp) /* 139C7C 8024693C 8EE20014 */ lw $v0, 0x14($s7) /* 139C80 80246940 01102821 */ addu $a1, $t0, $s0 -/* 139C84 80246944 0C051261 */ jal set_hud_element_render_pos +/* 139C84 80246944 0C051261 */ jal hud_element_set_render_pos /* 139C88 80246948 00A22821 */ addu $a1, $a1, $v0 /* 139C8C 8024694C 12800005 */ beqz $s4, .L80246964 /* 139C90 80246950 00000000 */ nop -/* 139C94 80246954 0C0511F8 */ jal draw_hud_element_3 +/* 139C94 80246954 0C0511F8 */ jal hud_element_draw_without_clipping /* 139C98 80246958 0220202D */ daddu $a0, $s1, $zero /* 139C9C 8024695C 08091A5B */ j .L8024696C /* 139CA0 80246960 0000A02D */ daddu $s4, $zero, $zero .L80246964: -/* 139CA4 80246964 0C0511F1 */ jal draw_hud_element_2 +/* 139CA4 80246964 0C0511F1 */ jal hud_element_draw_next /* 139CA8 80246968 0220202D */ daddu $a0, $s1, $zero .L8024696C: /* 139CAC 8024696C 0276102A */ slt $v0, $s3, $s6 @@ -1076,23 +1076,23 @@ glabel pause_stats_draw_contents /* 139CC4 80246984 26730001 */ addiu $s3, $s3, 1 /* 139CC8 80246988 3C058011 */ lui $a1, %hi(HudScript_StatusSPEmptyIncrement) /* 139CCC 8024698C 24A583B0 */ addiu $a1, $a1, %lo(HudScript_StatusSPEmptyIncrement) -/* 139CD0 80246990 0C0511FF */ jal set_hud_element_anim +/* 139CD0 80246990 0C0511FF */ jal hud_element_set_script /* 139CD4 80246994 0220202D */ daddu $a0, $s1, $zero /* 139CD8 80246998 0220202D */ daddu $a0, $s1, $zero /* 139CDC 8024699C 27C6004B */ addiu $a2, $fp, 0x4b /* 139CE0 802469A0 8FA80084 */ lw $t0, 0x84($sp) /* 139CE4 802469A4 8EE20018 */ lw $v0, 0x18($s7) /* 139CE8 802469A8 01102821 */ addu $a1, $t0, $s0 -/* 139CEC 802469AC 0C051261 */ jal set_hud_element_render_pos +/* 139CEC 802469AC 0C051261 */ jal hud_element_set_render_pos /* 139CF0 802469B0 00A22821 */ addu $a1, $a1, $v0 /* 139CF4 802469B4 12800005 */ beqz $s4, .L802469CC /* 139CF8 802469B8 00000000 */ nop -/* 139CFC 802469BC 0C0511F8 */ jal draw_hud_element_3 +/* 139CFC 802469BC 0C0511F8 */ jal hud_element_draw_without_clipping /* 139D00 802469C0 0220202D */ daddu $a0, $s1, $zero /* 139D04 802469C4 08091A75 */ j .L802469D4 /* 139D08 802469C8 0000A02D */ daddu $s4, $zero, $zero .L802469CC: -/* 139D0C 802469CC 0C0511F1 */ jal draw_hud_element_2 +/* 139D0C 802469CC 0C0511F1 */ jal hud_element_draw_next /* 139D10 802469D0 0220202D */ daddu $a0, $s1, $zero .L802469D4: /* 139D14 802469D4 0276102A */ slt $v0, $s3, $s6 @@ -1105,21 +1105,21 @@ glabel pause_stats_draw_contents /* 139D2C 802469EC 26730001 */ addiu $s3, $s3, 1 /* 139D30 802469F0 3C058011 */ lui $a1, %hi(HudScript_StatusStarEmpty) /* 139D34 802469F4 24A584F0 */ addiu $a1, $a1, %lo(HudScript_StatusStarEmpty) -/* 139D38 802469F8 0C0511FF */ jal set_hud_element_anim +/* 139D38 802469F8 0C0511FF */ jal hud_element_set_script /* 139D3C 802469FC 0220202D */ daddu $a0, $s1, $zero /* 139D40 80246A00 0220202D */ daddu $a0, $s1, $zero /* 139D44 80246A04 8FA80084 */ lw $t0, 0x84($sp) /* 139D48 80246A08 27C6004D */ addiu $a2, $fp, 0x4d -/* 139D4C 80246A0C 0C051261 */ jal set_hud_element_render_pos +/* 139D4C 80246A0C 0C051261 */ jal hud_element_set_render_pos /* 139D50 80246A10 01152821 */ addu $a1, $t0, $s5 /* 139D54 80246A14 12800005 */ beqz $s4, .L80246A2C /* 139D58 80246A18 00000000 */ nop -/* 139D5C 80246A1C 0C0511F8 */ jal draw_hud_element_3 +/* 139D5C 80246A1C 0C0511F8 */ jal hud_element_draw_without_clipping /* 139D60 80246A20 0220202D */ daddu $a0, $s1, $zero /* 139D64 80246A24 08091A8D */ j .L80246A34 /* 139D68 80246A28 0000A02D */ daddu $s4, $zero, $zero .L80246A2C: -/* 139D6C 80246A2C 0C0511F1 */ jal draw_hud_element_2 +/* 139D6C 80246A2C 0C0511F1 */ jal hud_element_draw_next /* 139D70 80246A30 0220202D */ daddu $a0, $s1, $zero .L80246A34: /* 139D74 80246A34 0276102A */ slt $v0, $s3, $s6 diff --git a/ver/us/asm/nonmatchings/world/action/hammer/func_802B62A4_E25174.s b/ver/us/asm/nonmatchings/world/action/hammer/func_802B62A4_E25174.s index 22cff4aa48..9238f40c2b 100644 --- a/ver/us/asm/nonmatchings/world/action/hammer/func_802B62A4_E25174.s +++ b/ver/us/asm/nonmatchings/world/action/hammer/func_802B62A4_E25174.s @@ -24,7 +24,7 @@ glabel func_802B62A4_E25174 /* E251A4 802B62D4 3C128011 */ lui $s2, %hi(gPlayerStatus) /* E251A8 802B62D8 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) /* E251AC 802B62DC 8E4400A4 */ lw $a0, 0xa4($s2) -/* E251B0 802B62E0 0C0AD800 */ jal func_802B6000_E24ED0 +/* E251B0 802B62E0 0C0AD800 */ jal action_hammer_is_swinging_away /* E251B4 802B62E4 46000586 */ mov.s $f22, $f0 /* E251B8 802B62E8 10400030 */ beqz $v0, .L802B63AC /* E251BC 802B62EC 27A50020 */ addiu $a1, $sp, 0x20 @@ -62,8 +62,8 @@ glabel func_802B62A4_E25174 /* E2523C 802B636C 080AD8EA */ j .L802B63A8 /* E25240 802B6370 4600B580 */ add.s $f22, $f22, $f0 .L802B6374: -/* E25244 802B6374 3C02802B */ lui $v0, %hi(D_802B6DB0_E25C80) -/* E25248 802B6378 8C426DB0 */ lw $v0, %lo(D_802B6DB0_E25C80)($v0) +/* E25244 802B6374 3C02802B */ lui $v0, %hi(HammerHit) +/* E25248 802B6378 8C426DB0 */ lw $v0, %lo(HammerHit)($v0) /* E2524C 802B637C C7A00028 */ lwc1 $f0, 0x28($sp) /* E25250 802B6380 C7A2002C */ lwc1 $f2, 0x2c($sp) /* E25254 802B6384 C7A40030 */ lwc1 $f4, 0x30($sp) @@ -133,7 +133,7 @@ glabel func_802B62A4_E25174 /* E25340 802B6470 0C0394D2 */ jal func_800E5348 /* E25344 802B6474 00000000 */ nop /* E25348 802B6478 8E4400A4 */ lw $a0, 0xa4($s2) -/* E2534C 802B647C 0C0AD800 */ jal func_802B6000_E24ED0 +/* E2534C 802B647C 0C0AD800 */ jal action_hammer_is_swinging_away /* E25350 802B6480 46000586 */ mov.s $f22, $f0 /* E25354 802B6484 14400030 */ bnez $v0, .L802B6548 /* E25358 802B6488 27A50020 */ addiu $a1, $sp, 0x20 @@ -171,8 +171,8 @@ glabel func_802B62A4_E25174 /* E253D8 802B6508 080AD951 */ j .L802B6544 /* E253DC 802B650C 4600B580 */ add.s $f22, $f22, $f0 .L802B6510: -/* E253E0 802B6510 3C02802B */ lui $v0, %hi(D_802B6DB0_E25C80) -/* E253E4 802B6514 8C426DB0 */ lw $v0, %lo(D_802B6DB0_E25C80)($v0) +/* E253E0 802B6510 3C02802B */ lui $v0, %hi(HammerHit) +/* E253E4 802B6514 8C426DB0 */ lw $v0, %lo(HammerHit)($v0) /* E253E8 802B6518 C7A00028 */ lwc1 $f0, 0x28($sp) /* E253EC 802B651C C7A2002C */ lwc1 $f2, 0x2c($sp) /* E253F0 802B6520 C7A40030 */ lwc1 $f4, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/world/action/hammer/func_802B6820_E256F0.s b/ver/us/asm/nonmatchings/world/action/hammer/func_802B6820_E256F0.s index 193faa49c4..31be606735 100644 --- a/ver/us/asm/nonmatchings/world/action/hammer/func_802B6820_E256F0.s +++ b/ver/us/asm/nonmatchings/world/action/hammer/func_802B6820_E256F0.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802B6820_E256F0 +glabel action_hammer_try_hit /* E256F0 802B6820 27BDFF88 */ addiu $sp, $sp, -0x78 /* E256F4 802B6824 AFB20040 */ sw $s2, 0x40($sp) /* E256F8 802B6828 3C128011 */ lui $s2, %hi(gPlayerStatus) @@ -21,7 +21,7 @@ glabel func_802B6820_E256F0 /* E25730 802B6860 0C0394D2 */ jal func_800E5348 /* E25734 802B6864 00000000 */ nop /* E25738 802B6868 8E4400A4 */ lw $a0, 0xa4($s2) -/* E2573C 802B686C 0C0AD800 */ jal func_802B6000_E24ED0 +/* E2573C 802B686C 0C0AD800 */ jal action_hammer_is_swinging_away /* E25740 802B6870 46000586 */ mov.s $f22, $f0 /* E25744 802B6874 10400024 */ beqz $v0, .L802B6908 /* E25748 802B6878 27A50020 */ addiu $a1, $sp, 0x20 @@ -103,8 +103,8 @@ glabel func_802B6820_E256F0 /* E25868 802B6998 E7B40014 */ swc1 $f20, 0x14($sp) /* E2586C 802B699C 0C037B01 */ jal player_test_lateral_overlap /* E25870 802B69A0 E7B60018 */ swc1 $f22, 0x18($sp) -/* E25874 802B69A4 3C03802B */ lui $v1, %hi(D_802B6DB0_E25C80) -/* E25878 802B69A8 8C636DB0 */ lw $v1, %lo(D_802B6DB0_E25C80)($v1) +/* E25874 802B69A4 3C03802B */ lui $v1, %hi(HammerHit) +/* E25878 802B69A8 8C636DB0 */ lw $v1, %lo(HammerHit)($v1) /* E2587C 802B69AC 8C630014 */ lw $v1, 0x14($v1) /* E25880 802B69B0 14600009 */ bnez $v1, .L802B69D8 /* E25884 802B69B4 0040802D */ daddu $s0, $v0, $zero @@ -130,7 +130,7 @@ glabel func_802B6820_E256F0 /* E258C8 802B69F8 0C0394D2 */ jal func_800E5348 /* E258CC 802B69FC 00000000 */ nop /* E258D0 802B6A00 8E4400A4 */ lw $a0, 0xa4($s2) -/* E258D4 802B6A04 0C0AD800 */ jal func_802B6000_E24ED0 +/* E258D4 802B6A04 0C0AD800 */ jal action_hammer_is_swinging_away /* E258D8 802B6A08 46000586 */ mov.s $f22, $f0 /* E258DC 802B6A0C 14400024 */ bnez $v0, .L802B6AA0 /* E258E0 802B6A10 27A50020 */ addiu $a1, $sp, 0x20 @@ -209,8 +209,8 @@ glabel func_802B6820_E256F0 /* E259F4 802B6B24 E7B40014 */ swc1 $f20, 0x14($sp) /* E259F8 802B6B28 0C037B01 */ jal player_test_lateral_overlap /* E259FC 802B6B2C E7B60018 */ swc1 $f22, 0x18($sp) -/* E25A00 802B6B30 3C03802B */ lui $v1, %hi(D_802B6DB0_E25C80) -/* E25A04 802B6B34 8C636DB0 */ lw $v1, %lo(D_802B6DB0_E25C80)($v1) +/* E25A00 802B6B30 3C03802B */ lui $v1, %hi(HammerHit) +/* E25A04 802B6B34 8C636DB0 */ lw $v1, %lo(HammerHit)($v1) /* E25A08 802B6B38 8C630014 */ lw $v1, 0x14($v1) /* E25A0C 802B6B3C 14600009 */ bnez $v1, .L802B6B64 /* E25A10 802B6B40 0040802D */ daddu $s0, $v0, $zero @@ -231,8 +231,8 @@ glabel func_802B6820_E256F0 /* E25A44 802B6B74 1440FFD8 */ bnez $v0, .L802B6AD8 /* E25A48 802B6B78 00000000 */ nop .L802B6B7C: -/* E25A4C 802B6B7C 3C02802B */ lui $v0, %hi(D_802B6DB0_E25C80) -/* E25A50 802B6B80 8C426DB0 */ lw $v0, %lo(D_802B6DB0_E25C80)($v0) +/* E25A4C 802B6B7C 3C02802B */ lui $v0, %hi(HammerHit) +/* E25A50 802B6B80 8C426DB0 */ lw $v0, %lo(HammerHit)($v0) /* E25A54 802B6B84 8C440018 */ lw $a0, 0x18($v0) /* E25A58 802B6B88 24020002 */ addiu $v0, $zero, 2 /* E25A5C 802B6B8C 14820032 */ bne $a0, $v0, .L802B6C58 @@ -250,9 +250,9 @@ glabel func_802B6820_E256F0 .L802B6BB8: /* E25A88 802B6BB8 0C052736 */ jal sfx_play_sound_at_player /* E25A8C 802B6BBC 0000282D */ daddu $a1, $zero, $zero -/* E25A90 802B6BC0 3C02802B */ lui $v0, %hi(D_802B6DB0_E25C80) -/* E25A94 802B6BC4 8C426DB0 */ lw $v0, %lo(D_802B6DB0_E25C80)($v0) -/* E25A98 802B6BC8 0C0AD812 */ jal func_802B6048_E24F18 +/* E25A90 802B6BC0 3C02802B */ lui $v0, %hi(HammerHit) +/* E25A94 802B6BC4 8C426DB0 */ lw $v0, %lo(HammerHit)($v0) +/* E25A98 802B6BC8 0C0AD812 */ jal action_hammer_play_hit_fx /* E25A9C 802B6BCC 8C440010 */ lw $a0, 0x10($v0) /* E25AA0 802B6BD0 86840014 */ lh $a0, 0x14($s4) /* E25AA4 802B6BD4 96820014 */ lhu $v0, 0x14($s4) @@ -265,8 +265,8 @@ glabel func_802B6820_E256F0 /* E25AC0 802B6BF0 080ADB03 */ j .L802B6C0C /* E25AC4 802B6BF4 A0400007 */ sb $zero, 7($v0) .L802B6BF8: -/* E25AC8 802B6BF8 3C02802B */ lui $v0, %hi(D_802B6DB0_E25C80) -/* E25ACC 802B6BFC 8C426DB0 */ lw $v0, %lo(D_802B6DB0_E25C80)($v0) +/* E25AC8 802B6BF8 3C02802B */ lui $v0, %hi(HammerHit) +/* E25ACC 802B6BFC 8C426DB0 */ lw $v0, %lo(HammerHit)($v0) /* E25AD0 802B6C00 8C420010 */ lw $v0, 0x10($v0) /* E25AD4 802B6C04 04410014 */ bgez $v0, .L802B6C58 /* E25AD8 802B6C08 00000000 */ nop @@ -275,8 +275,8 @@ glabel func_802B6820_E256F0 /* E25AE0 802B6C10 3C030100 */ lui $v1, 0x100 /* E25AE4 802B6C14 00431025 */ or $v0, $v0, $v1 /* E25AE8 802B6C18 AE420000 */ sw $v0, ($s2) -/* E25AEC 802B6C1C 3C02802B */ lui $v0, %hi(D_802B6DB0_E25C80) -/* E25AF0 802B6C20 8C426DB0 */ lw $v0, %lo(D_802B6DB0_E25C80)($v0) +/* E25AEC 802B6C1C 3C02802B */ lui $v0, %hi(HammerHit) +/* E25AF0 802B6C20 8C426DB0 */ lw $v0, %lo(HammerHit)($v0) /* E25AF4 802B6C24 8C420010 */ lw $v0, 0x10($v0) /* E25AF8 802B6C28 0441000B */ bgez $v0, .L802B6C58 /* E25AFC 802B6C2C 00000000 */ nop @@ -296,8 +296,8 @@ glabel func_802B6820_E256F0 /* E25B30 802B6C60 924300B6 */ lbu $v1, 0xb6($s2) /* E25B34 802B6C64 06000007 */ bltz $s0, .L802B6C84 /* E25B38 802B6C68 00000000 */ nop -/* E25B3C 802B6C6C 3C02802B */ lui $v0, %hi(D_802B6DB0_E25C80) -/* E25B40 802B6C70 8C426DB0 */ lw $v0, %lo(D_802B6DB0_E25C80)($v0) +/* E25B3C 802B6C6C 3C02802B */ lui $v0, %hi(HammerHit) +/* E25B40 802B6C70 8C426DB0 */ lw $v0, %lo(HammerHit)($v0) /* E25B44 802B6C74 8C420014 */ lw $v0, 0x14($v0) /* E25B48 802B6C78 14400002 */ bnez $v0, .L802B6C84 /* E25B4C 802B6C7C 24620001 */ addiu $v0, $v1, 1 @@ -311,8 +311,8 @@ glabel func_802B6820_E256F0 /* E25B68 802B6C98 24020002 */ addiu $v0, $zero, 2 /* E25B6C 802B6C9C A24200B6 */ sb $v0, 0xb6($s2) .L802B6CA0: -/* E25B70 802B6CA0 3C05802B */ lui $a1, %hi(D_802B6DB0_E25C80) -/* E25B74 802B6CA4 24A56DB0 */ addiu $a1, $a1, %lo(D_802B6DB0_E25C80) +/* E25B70 802B6CA0 3C05802B */ lui $a1, %hi(HammerHit) +/* E25B74 802B6CA4 24A56DB0 */ addiu $a1, $a1, %lo(HammerHit) /* E25B78 802B6CA8 8CA30000 */ lw $v1, ($a1) /* E25B7C 802B6CAC 8C620018 */ lw $v0, 0x18($v1) /* E25B80 802B6CB0 24420001 */ addiu $v0, $v0, 1 @@ -345,8 +345,8 @@ glabel func_802B6820_E256F0 /* E25BE4 802B6D14 54400001 */ bnel $v0, $zero, .L802B6D1C /* E25BE8 802B6D18 AC64001C */ sw $a0, 0x1c($v1) .L802B6D1C: -/* E25BEC 802B6D1C 3C03802B */ lui $v1, %hi(D_802B6DB0_E25C80) -/* E25BF0 802B6D20 8C636DB0 */ lw $v1, %lo(D_802B6DB0_E25C80)($v1) +/* E25BEC 802B6D1C 3C03802B */ lui $v1, %hi(HammerHit) +/* E25BF0 802B6D20 8C636DB0 */ lw $v1, %lo(HammerHit)($v1) /* E25BF4 802B6D24 8C62001C */ lw $v0, 0x1c($v1) /* E25BF8 802B6D28 14400006 */ bnez $v0, .L802B6D44 /* E25BFC 802B6D2C AC600014 */ sw $zero, 0x14($v1) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s index 59cfcb54af..3b328672ab 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s @@ -6,7 +6,7 @@ glabel func_802406A0_AF7FF0 /* AF7FF4 802406A4 8C846568 */ lw $a0, %lo(D_80246568_C8C018)($a0) /* AF7FF8 802406A8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AF7FFC 802406AC AFBF0010 */ sw $ra, 0x10($sp) -/* AF8000 802406B0 0C0511EA */ jal draw_hud_element_clipped +/* AF8000 802406B0 0C0511EA */ jal hud_element_draw_clipped /* AF8004 802406B4 00000000 */ nop /* AF8008 802406B8 8FBF0010 */ lw $ra, 0x10($sp) /* AF800C 802406BC 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s index e7bd70be3b..f038c6a6c1 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s @@ -85,7 +85,7 @@ glabel func_802406C4_AF8014 /* AF812C 802407DC AC600000 */ sw $zero, ($v1) /* AF8130 802407E0 AE220000 */ sw $v0, ($s1) /* AF8134 802407E4 24020040 */ addiu $v0, $zero, 0x40 -/* AF8138 802407E8 0C050529 */ jal create_hud_element +/* AF8138 802407E8 0C050529 */ jal hud_element_create /* AF813C 802407EC AE020000 */ sw $v0, ($s0) /* AF8140 802407F0 0040982D */ daddu $s3, $v0, $zero /* AF8144 802407F4 0260202D */ daddu $a0, $s3, $zero @@ -93,44 +93,44 @@ glabel func_802406C4_AF8014 /* AF814C 802407FC 8E060000 */ lw $a2, ($s0) /* AF8150 80240800 3C128024 */ lui $s2, %hi(D_80246568_C8C018) /* AF8154 80240804 26526568 */ addiu $s2, $s2, %lo(D_80246568_C8C018) -/* AF8158 80240808 0C051261 */ jal set_hud_element_render_pos +/* AF8158 80240808 0C051261 */ jal hud_element_set_render_pos /* AF815C 8024080C AE530000 */ sw $s3, ($s2) /* AF8160 80240810 0260202D */ daddu $a0, $s3, $zero -/* AF8164 80240814 0C051277 */ jal set_hud_element_render_depth +/* AF8164 80240814 0C051277 */ jal hud_element_set_render_depth /* AF8168 80240818 0000282D */ daddu $a1, $zero, $zero /* AF816C 8024081C 0260202D */ daddu $a0, $s3, $zero -/* AF8170 80240820 0C051280 */ jal set_hud_element_flags +/* AF8170 80240820 0C051280 */ jal hud_element_set_flags /* AF8174 80240824 24050082 */ addiu $a1, $zero, 0x82 /* AF8178 80240828 3C048011 */ lui $a0, %hi(HudScript_BlueMeter) /* AF817C 8024082C 24848AFC */ addiu $a0, $a0, %lo(HudScript_BlueMeter) -/* AF8180 80240830 0C050529 */ jal create_hud_element +/* AF8180 80240830 0C050529 */ jal hud_element_create /* AF8184 80240834 00000000 */ nop /* AF8188 80240838 0040982D */ daddu $s3, $v0, $zero /* AF818C 8024083C 8E250000 */ lw $a1, ($s1) /* AF8190 80240840 8E060000 */ lw $a2, ($s0) /* AF8194 80240844 0260202D */ daddu $a0, $s3, $zero /* AF8198 80240848 AE530004 */ sw $s3, 4($s2) -/* AF819C 8024084C 0C051261 */ jal set_hud_element_render_pos +/* AF819C 8024084C 0C051261 */ jal hud_element_set_render_pos /* AF81A0 80240850 24C6001C */ addiu $a2, $a2, 0x1c /* AF81A4 80240854 0260202D */ daddu $a0, $s3, $zero -/* AF81A8 80240858 0C051277 */ jal set_hud_element_render_depth +/* AF81A8 80240858 0C051277 */ jal hud_element_set_render_depth /* AF81AC 8024085C 0000282D */ daddu $a1, $zero, $zero /* AF81B0 80240860 0260202D */ daddu $a0, $s3, $zero -/* AF81B4 80240864 0C051280 */ jal set_hud_element_flags +/* AF81B4 80240864 0C051280 */ jal hud_element_set_flags /* AF81B8 80240868 24050082 */ addiu $a1, $zero, 0x82 /* AF81BC 8024086C 8E530000 */ lw $s3, ($s2) /* AF81C0 80240870 240500FF */ addiu $a1, $zero, 0xff -/* AF81C4 80240874 0C0513AC */ jal set_hud_element_alpha +/* AF81C4 80240874 0C0513AC */ jal hud_element_set_alpha /* AF81C8 80240878 0260202D */ daddu $a0, $s3, $zero /* AF81CC 8024087C 0260202D */ daddu $a0, $s3, $zero -/* AF81D0 80240880 0C05128B */ jal clear_hud_element_flags +/* AF81D0 80240880 0C05128B */ jal hud_element_clear_flags /* AF81D4 80240884 24050002 */ addiu $a1, $zero, 2 /* AF81D8 80240888 8E530004 */ lw $s3, 4($s2) /* AF81DC 8024088C 240500FF */ addiu $a1, $zero, 0xff -/* AF81E0 80240890 0C0513AC */ jal set_hud_element_alpha +/* AF81E0 80240890 0C0513AC */ jal hud_element_set_alpha /* AF81E4 80240894 0260202D */ daddu $a0, $s3, $zero /* AF81E8 80240898 0260202D */ daddu $a0, $s3, $zero -/* AF81EC 8024089C 0C05128B */ jal clear_hud_element_flags +/* AF81EC 8024089C 0C05128B */ jal hud_element_clear_flags /* AF81F0 802408A0 24050002 */ addiu $a1, $zero, 2 /* AF81F4 802408A4 24020001 */ addiu $v0, $zero, 1 /* AF81F8 802408A8 3C018024 */ lui $at, %hi(D_80246558_kkj_19) @@ -154,12 +154,12 @@ glabel func_802406C4_AF8014 /* AF8238 802408E8 26106560 */ addiu $s0, $s0, %lo(D_80246560_C8C010) /* AF823C 802408EC 8E240000 */ lw $a0, ($s1) /* AF8240 802408F0 8E450000 */ lw $a1, ($s2) -/* AF8244 802408F4 0C051261 */ jal set_hud_element_render_pos +/* AF8244 802408F4 0C051261 */ jal hud_element_set_render_pos /* AF8248 802408F8 8E060000 */ lw $a2, ($s0) /* AF824C 802408FC 8E240004 */ lw $a0, 4($s1) /* AF8250 80240900 8E060000 */ lw $a2, ($s0) /* AF8254 80240904 8E450000 */ lw $a1, ($s2) -/* AF8258 80240908 0C051261 */ jal set_hud_element_render_pos +/* AF8258 80240908 0C051261 */ jal hud_element_set_render_pos /* AF825C 8024090C 24C6001C */ addiu $a2, $a2, 0x1c /* AF8260 80240910 8EA20070 */ lw $v0, 0x70($s5) /* AF8264 80240914 10400003 */ beqz $v0, .L80240924 @@ -177,7 +177,7 @@ glabel func_802406C4_AF8014 /* AF828C 8024093C 8C846568 */ lw $a0, %lo(D_80246568_C8C018)($a0) /* AF8290 80240940 3C058011 */ lui $a1, %hi(HudScript_MashAButton) /* AF8294 80240944 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* AF8298 80240948 0C0511FF */ jal set_hud_element_anim +/* AF8298 80240948 0C0511FF */ jal hud_element_set_script /* AF829C 8024094C 00000000 */ nop /* AF82A0 80240950 2402000B */ addiu $v0, $zero, 0xb /* AF82A4 80240954 3C018024 */ lui $at, %hi(dgb_08_npcGroup_80246528) @@ -272,9 +272,9 @@ glabel func_802406C4_AF8014 /* AF83E4 80240A94 3C108024 */ lui $s0, %hi(D_80246568_C8C018) /* AF83E8 80240A98 26106568 */ addiu $s0, $s0, %lo(D_80246568_C8C018) /* AF83EC 80240A9C AEA20084 */ sw $v0, 0x84($s5) -/* AF83F0 80240AA0 0C05123D */ jal free_hud_element +/* AF83F0 80240AA0 0C05123D */ jal hud_element_free /* AF83F4 80240AA4 8E040000 */ lw $a0, ($s0) -/* AF83F8 80240AA8 0C05123D */ jal free_hud_element +/* AF83F8 80240AA8 0C05123D */ jal hud_element_free /* AF83FC 80240AAC 8E040004 */ lw $a0, 4($s0) /* AF8400 80240AB0 3C048024 */ lui $a0, %hi(D_80246554) /* AF8404 80240AB4 8C846554 */ lw $a0, %lo(D_80246554)($a0) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802401D0_E12930.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802401D0_E12930.s index 4d9400350a..f0afbb168b 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802401D0_E12930.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802401D0_E12930.s @@ -66,9 +66,9 @@ glabel func_802401D0_E12930 /* E12A1C 802402BC 8E300004 */ lw $s0, 4($s1) /* E12A20 802402C0 8E250014 */ lw $a1, 0x14($s1) /* E12A24 802402C4 0200202D */ daddu $a0, $s0, $zero -/* E12A28 802402C8 0C051261 */ jal set_hud_element_render_pos +/* E12A28 802402C8 0C051261 */ jal hud_element_set_render_pos /* E12A2C 802402CC 24A5000F */ addiu $a1, $a1, 0xf -/* E12A30 802402D0 0C0511EA */ jal draw_hud_element_clipped +/* E12A30 802402D0 0C0511EA */ jal hud_element_draw_clipped /* E12A34 802402D4 0200202D */ daddu $a0, $s0, $zero /* E12A38 802402D8 8E24000C */ lw $a0, 0xc($s1) /* E12A3C 802402DC 8E230010 */ lw $v1, 0x10($s1) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s index 2df30c95d2..225041a5e8 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s @@ -19,16 +19,16 @@ glabel func_802415EC_E13D4C /* E13D84 80241624 AE300080 */ sw $s0, 0x80($s1) /* E13D88 80241628 3C048011 */ lui $a0, %hi(HudScript_StatusCoin) /* E13D8C 8024162C 24848558 */ addiu $a0, $a0, %lo(HudScript_StatusCoin) -/* E13D90 80241630 0C050529 */ jal create_hud_element +/* E13D90 80241630 0C050529 */ jal hud_element_create /* E13D94 80241634 AE020000 */ sw $v0, ($s0) /* E13D98 80241638 0040202D */ daddu $a0, $v0, $zero /* E13D9C 8024163C 24050080 */ addiu $a1, $zero, 0x80 -/* E13DA0 80241640 0C051280 */ jal set_hud_element_flags +/* E13DA0 80241640 0C051280 */ jal hud_element_set_flags /* E13DA4 80241644 AE040004 */ sw $a0, 4($s0) /* E13DA8 80241648 240500FF */ addiu $a1, $zero, 0xff /* E13DAC 8024164C 00A0302D */ daddu $a2, $a1, $zero /* E13DB0 80241650 8E040004 */ lw $a0, 4($s0) -/* E13DB4 80241654 0C0513BF */ jal set_hud_element_tint +/* E13DB4 80241654 0C0513BF */ jal hud_element_set_tint /* E13DB8 80241658 00A0382D */ daddu $a3, $a1, $zero /* E13DBC 8024165C 24020141 */ addiu $v0, $zero, 0x141 /* E13DC0 80241660 AE020014 */ sw $v0, 0x14($s0) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241690_E13DF0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241690_E13DF0.s index 4226c0bdc6..15c9506c03 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241690_E13DF0.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241690_E13DF0.s @@ -10,7 +10,7 @@ glabel func_80241690_E13DF0 /* E13E04 802416A4 8C500080 */ lw $s0, 0x80($v0) /* E13E08 802416A8 0C048D70 */ jal free_generic_entity /* E13E0C 802416AC 8E040000 */ lw $a0, ($s0) -/* E13E10 802416B0 0C05123D */ jal free_hud_element +/* E13E10 802416B0 0C05123D */ jal hud_element_free /* E13E14 802416B4 8E040004 */ lw $a0, 4($s0) /* E13E18 802416B8 8FBF0014 */ lw $ra, 0x14($sp) /* E13E1C 802416BC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s index 2ab5857a56..ac1e60d7ab 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s @@ -28,16 +28,16 @@ glabel func_80240000_E15D80 /* E15DC0 80240040 2405005A */ addiu $a1, $zero, 0x5a /* E15DC4 80240044 8E50000C */ lw $s0, 0xc($s2) /* E15DC8 80240048 00A0302D */ daddu $a2, $a1, $zero -/* E15DCC 8024004C 0C051261 */ jal set_hud_element_render_pos +/* E15DCC 8024004C 0C051261 */ jal hud_element_set_render_pos /* E15DD0 80240050 0200202D */ daddu $a0, $s0, $zero -/* E15DD4 80240054 0C0511EA */ jal draw_hud_element_clipped +/* E15DD4 80240054 0C0511EA */ jal hud_element_draw_clipped /* E15DD8 80240058 0200202D */ daddu $a0, $s0, $zero /* E15DDC 8024005C 2405005A */ addiu $a1, $zero, 0x5a /* E15DE0 80240060 8E500010 */ lw $s0, 0x10($s2) /* E15DE4 80240064 24060078 */ addiu $a2, $zero, 0x78 -/* E15DE8 80240068 0C051261 */ jal set_hud_element_render_pos +/* E15DE8 80240068 0C051261 */ jal hud_element_set_render_pos /* E15DEC 8024006C 0200202D */ daddu $a0, $s0, $zero -/* E15DF0 80240070 0C0511EA */ jal draw_hud_element_clipped +/* E15DF0 80240070 0C0511EA */ jal hud_element_draw_clipped /* E15DF4 80240074 0200202D */ daddu $a0, $s0, $zero /* E15DF8 80240078 2404003E */ addiu $a0, $zero, 0x3e /* E15DFC 8024007C 24050074 */ addiu $a1, $zero, 0x74 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s index b4a9dd637f..336339958e 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s @@ -20,35 +20,35 @@ glabel func_80240468_E161E8 /* E16224 802404A4 3C118011 */ lui $s1, %hi(HudScript_AButton) /* E16228 802404A8 26318B28 */ addiu $s1, $s1, %lo(HudScript_AButton) /* E1622C 802404AC 0220202D */ daddu $a0, $s1, $zero -/* E16230 802404B0 0C050529 */ jal create_hud_element +/* E16230 802404B0 0C050529 */ jal hud_element_create /* E16234 802404B4 AE420000 */ sw $v0, ($s2) /* E16238 802404B8 0040802D */ daddu $s0, $v0, $zero /* E1623C 802404BC 0200202D */ daddu $a0, $s0, $zero /* E16240 802404C0 0000282D */ daddu $a1, $zero, $zero -/* E16244 802404C4 0C051277 */ jal set_hud_element_render_depth +/* E16244 802404C4 0C051277 */ jal hud_element_set_render_depth /* E16248 802404C8 AE50000C */ sw $s0, 0xc($s2) /* E1624C 802404CC 0200202D */ daddu $a0, $s0, $zero -/* E16250 802404D0 0C051280 */ jal set_hud_element_flags +/* E16250 802404D0 0C051280 */ jal hud_element_set_flags /* E16254 802404D4 24050080 */ addiu $a1, $zero, 0x80 /* E16258 802404D8 0200202D */ daddu $a0, $s0, $zero /* E1625C 802404DC 240500FF */ addiu $a1, $zero, 0xff /* E16260 802404E0 00A0302D */ daddu $a2, $a1, $zero -/* E16264 802404E4 0C0513BF */ jal set_hud_element_tint +/* E16264 802404E4 0C0513BF */ jal hud_element_set_tint /* E16268 802404E8 00A0382D */ daddu $a3, $a1, $zero /* E1626C 802404EC 0200202D */ daddu $a0, $s0, $zero -/* E16270 802404F0 0C0511FF */ jal set_hud_element_anim +/* E16270 802404F0 0C0511FF */ jal hud_element_set_script /* E16274 802404F4 0220282D */ daddu $a1, $s1, $zero /* E16278 802404F8 3C048011 */ lui $a0, %hi(HudScript_BlueMeter) /* E1627C 802404FC 24848AFC */ addiu $a0, $a0, %lo(HudScript_BlueMeter) -/* E16280 80240500 0C050529 */ jal create_hud_element +/* E16280 80240500 0C050529 */ jal hud_element_create /* E16284 80240504 00000000 */ nop /* E16288 80240508 0040802D */ daddu $s0, $v0, $zero /* E1628C 8024050C 0200202D */ daddu $a0, $s0, $zero /* E16290 80240510 0000282D */ daddu $a1, $zero, $zero -/* E16294 80240514 0C051277 */ jal set_hud_element_render_depth +/* E16294 80240514 0C051277 */ jal hud_element_set_render_depth /* E16298 80240518 AE500010 */ sw $s0, 0x10($s2) /* E1629C 8024051C 0200202D */ daddu $a0, $s0, $zero -/* E162A0 80240520 0C051280 */ jal set_hud_element_flags +/* E162A0 80240520 0C051280 */ jal hud_element_set_flags /* E162A4 80240524 24050080 */ addiu $a1, $zero, 0x80 .L80240528: /* E162A8 80240528 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s index 972b8b5ac5..15792d1e94 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s @@ -191,13 +191,13 @@ glabel func_80240BB0_E16930 /* E16BE0 80240E60 8EA4000C */ lw $a0, 0xc($s5) /* E16BE4 80240E64 3C058011 */ lui $a1, %hi(HudScript_AButton) /* E16BE8 80240E68 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) -/* E16BEC 80240E6C 0C0511FF */ jal set_hud_element_anim +/* E16BEC 80240E6C 0C0511FF */ jal hud_element_set_script /* E16BF0 80240E70 00000000 */ nop /* E16BF4 80240E74 8EA4000C */ lw $a0, 0xc($s5) -/* E16BF8 80240E78 0C0513AC */ jal set_hud_element_alpha +/* E16BF8 80240E78 0C0513AC */ jal hud_element_set_alpha /* E16BFC 80240E7C 240500A0 */ addiu $a1, $zero, 0xa0 /* E16C00 80240E80 8EA40010 */ lw $a0, 0x10($s5) -/* E16C04 80240E84 0C0513AC */ jal set_hud_element_alpha +/* E16C04 80240E84 0C0513AC */ jal hud_element_set_alpha /* E16C08 80240E88 240500A0 */ addiu $a1, $zero, 0xa0 /* E16C0C 80240E8C 8EA20028 */ lw $v0, 0x28($s5) /* E16C10 80240E90 0260202D */ daddu $a0, $s3, $zero @@ -404,13 +404,13 @@ glabel func_80240BB0_E16930 /* E16F30 802411B0 8EA4000C */ lw $a0, 0xc($s5) /* E16F34 802411B4 3C058011 */ lui $a1, %hi(HudScript_MashAButton) /* E16F38 802411B8 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* E16F3C 802411BC 0C0511FF */ jal set_hud_element_anim +/* E16F3C 802411BC 0C0511FF */ jal hud_element_set_script /* E16F40 802411C0 00000000 */ nop /* E16F44 802411C4 8EA4000C */ lw $a0, 0xc($s5) -/* E16F48 802411C8 0C0513AC */ jal set_hud_element_alpha +/* E16F48 802411C8 0C0513AC */ jal hud_element_set_alpha /* E16F4C 802411CC 240500FF */ addiu $a1, $zero, 0xff /* E16F50 802411D0 8EA40010 */ lw $a0, 0x10($s5) -/* E16F54 802411D4 0C0513AC */ jal set_hud_element_alpha +/* E16F54 802411D4 0C0513AC */ jal hud_element_set_alpha /* E16F58 802411D8 240500FF */ addiu $a1, $zero, 0xff /* E16F5C 802411DC 2402000F */ addiu $v0, $zero, 0xf /* E16F60 802411E0 080906CE */ j .L80241B38_E178B8 @@ -452,13 +452,13 @@ glabel func_80240BB0_E16930 /* E16FE8 80241268 8EA4000C */ lw $a0, 0xc($s5) /* E16FEC 8024126C 3C058011 */ lui $a1, %hi(HudScript_AButton) /* E16FF0 80241270 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) -/* E16FF4 80241274 0C0511FF */ jal set_hud_element_anim +/* E16FF4 80241274 0C0511FF */ jal hud_element_set_script /* E16FF8 80241278 2694001C */ addiu $s4, $s4, 0x1c /* E16FFC 8024127C 8EA4000C */ lw $a0, 0xc($s5) -/* E17000 80241280 0C0513AC */ jal set_hud_element_alpha +/* E17000 80241280 0C0513AC */ jal hud_element_set_alpha /* E17004 80241284 240500A0 */ addiu $a1, $zero, 0xa0 /* E17008 80241288 8EA40010 */ lw $a0, 0x10($s5) -/* E1700C 8024128C 0C0513AC */ jal set_hud_element_alpha +/* E1700C 8024128C 0C0513AC */ jal hud_element_set_alpha /* E17010 80241290 240500A0 */ addiu $a1, $zero, 0xa0 /* E17014 80241294 3C02002B */ lui $v0, 0x2b /* E17018 80241298 C660003C */ lwc1 $f0, 0x3c($s3) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802422D0_E18050.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802422D0_E18050.s index 5ebb2f34c2..72417cb033 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802422D0_E18050.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802422D0_E18050.s @@ -10,9 +10,9 @@ glabel func_802422D0_E18050 /* E18064 802422E4 8C50006C */ lw $s0, 0x6c($v0) /* E18068 802422E8 0C048D70 */ jal free_generic_entity /* E1806C 802422EC 8E040000 */ lw $a0, ($s0) -/* E18070 802422F0 0C05123D */ jal free_hud_element +/* E18070 802422F0 0C05123D */ jal hud_element_free /* E18074 802422F4 8E04000C */ lw $a0, 0xc($s0) -/* E18078 802422F8 0C05123D */ jal free_hud_element +/* E18078 802422F8 0C05123D */ jal hud_element_free /* E1807C 802422FC 8E040010 */ lw $a0, 0x10($s0) /* E18080 80242300 8FBF0014 */ lw $ra, 0x14($sp) /* E18084 80242304 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s index e6efde7ed5..d215cdc8f0 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s @@ -44,24 +44,24 @@ glabel func_80240A6C_BCF65C /* BCF6F0 80240B00 00000000 */ nop .L80240B04: /* BCF6F4 80240B04 8E30003C */ lw $s0, 0x3c($s1) -/* BCF6F8 80240B08 0C0513AC */ jal set_hud_element_alpha +/* BCF6F8 80240B08 0C0513AC */ jal hud_element_set_alpha /* BCF6FC 80240B0C 0200202D */ daddu $a0, $s0, $zero /* BCF700 80240B10 0200202D */ daddu $a0, $s0, $zero -/* BCF704 80240B14 0C05128B */ jal clear_hud_element_flags +/* BCF704 80240B14 0C05128B */ jal hud_element_clear_flags /* BCF708 80240B18 24050002 */ addiu $a1, $zero, 2 /* BCF70C 80240B1C 8E300040 */ lw $s0, 0x40($s1) /* BCF710 80240B20 240500FF */ addiu $a1, $zero, 0xff -/* BCF714 80240B24 0C0513AC */ jal set_hud_element_alpha +/* BCF714 80240B24 0C0513AC */ jal hud_element_set_alpha /* BCF718 80240B28 0200202D */ daddu $a0, $s0, $zero /* BCF71C 80240B2C 0200202D */ daddu $a0, $s0, $zero -/* BCF720 80240B30 0C05128B */ jal clear_hud_element_flags +/* BCF720 80240B30 0C05128B */ jal hud_element_clear_flags /* BCF724 80240B34 24050002 */ addiu $a1, $zero, 2 /* BCF728 80240B38 8E300044 */ lw $s0, 0x44($s1) /* BCF72C 80240B3C 240500FF */ addiu $a1, $zero, 0xff -/* BCF730 80240B40 0C0513AC */ jal set_hud_element_alpha +/* BCF730 80240B40 0C0513AC */ jal hud_element_set_alpha /* BCF734 80240B44 0200202D */ daddu $a0, $s0, $zero /* BCF738 80240B48 0200202D */ daddu $a0, $s0, $zero -/* BCF73C 80240B4C 0C05128B */ jal clear_hud_element_flags +/* BCF73C 80240B4C 0C05128B */ jal hud_element_clear_flags /* BCF740 80240B50 24050002 */ addiu $a1, $zero, 2 /* BCF744 80240B54 080903B7 */ j .L80240EDC /* BCF748 80240B58 AE320030 */ sw $s2, 0x30($s1) @@ -76,18 +76,18 @@ glabel func_80240A6C_BCF65C .L80240B78: /* BCF768 80240B78 8E24003C */ lw $a0, 0x3c($s1) /* BCF76C 80240B7C 8E250034 */ lw $a1, 0x34($s1) -/* BCF770 80240B80 0C051261 */ jal set_hud_element_render_pos +/* BCF770 80240B80 0C051261 */ jal hud_element_set_render_pos /* BCF774 80240B84 8E260038 */ lw $a2, 0x38($s1) /* BCF778 80240B88 8E240040 */ lw $a0, 0x40($s1) /* BCF77C 80240B8C 8E260038 */ lw $a2, 0x38($s1) /* BCF780 80240B90 8E250034 */ lw $a1, 0x34($s1) -/* BCF784 80240B94 0C051261 */ jal set_hud_element_render_pos +/* BCF784 80240B94 0C051261 */ jal hud_element_set_render_pos /* BCF788 80240B98 24C6001C */ addiu $a2, $a2, 0x1c /* BCF78C 80240B9C 8E240044 */ lw $a0, 0x44($s1) /* BCF790 80240BA0 8E250034 */ lw $a1, 0x34($s1) /* BCF794 80240BA4 8E260038 */ lw $a2, 0x38($s1) /* BCF798 80240BA8 24A50002 */ addiu $a1, $a1, 2 -/* BCF79C 80240BAC 0C051261 */ jal set_hud_element_render_pos +/* BCF79C 80240BAC 0C051261 */ jal hud_element_set_render_pos /* BCF7A0 80240BB0 24C6000E */ addiu $a2, $a2, 0xe /* BCF7A4 80240BB4 080903B7 */ j .L80240EDC /* BCF7A8 80240BB8 00000000 */ nop @@ -95,7 +95,7 @@ glabel func_80240A6C_BCF65C /* BCF7AC 80240BBC 8E24003C */ lw $a0, 0x3c($s1) /* BCF7B0 80240BC0 3C058011 */ lui $a1, %hi(HudScript_SlowlyMashAButton) /* BCF7B4 80240BC4 24A58C34 */ addiu $a1, $a1, %lo(HudScript_SlowlyMashAButton) -/* BCF7B8 80240BC8 0C0511FF */ jal set_hud_element_anim +/* BCF7B8 80240BC8 0C0511FF */ jal hud_element_set_script /* BCF7BC 80240BCC 00000000 */ nop /* BCF7C0 80240BD0 2402000B */ addiu $v0, $zero, 0xb /* BCF7C4 80240BD4 AE220030 */ sw $v0, 0x30($s1) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0_BCFCB0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0_BCFCB0.s index c405972c67..0f056af4d2 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0_BCFCB0.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0_BCFCB0.s @@ -8,14 +8,14 @@ glabel func_802410C0_BCFCB0 /* BCFCBC 802410CC 0C090150 */ jal func_80240540_BCF130 /* BCFCC0 802410D0 AFB00018 */ sw $s0, 0x18($sp) /* BCFCC4 802410D4 0040882D */ daddu $s1, $v0, $zero -/* BCFCC8 802410D8 0C0511EA */ jal draw_hud_element_clipped +/* BCFCC8 802410D8 0C0511EA */ jal hud_element_draw_clipped /* BCFCCC 802410DC 8E24003C */ lw $a0, 0x3c($s1) /* BCFCD0 802410E0 8E300040 */ lw $s0, 0x40($s1) -/* BCFCD4 802410E4 0C0511EA */ jal draw_hud_element_clipped +/* BCFCD4 802410E4 0C0511EA */ jal hud_element_draw_clipped /* BCFCD8 802410E8 0200202D */ daddu $a0, $s0, $zero /* BCFCDC 802410EC 0200202D */ daddu $a0, $s0, $zero /* BCFCE0 802410F0 27A50010 */ addiu $a1, $sp, 0x10 -/* BCFCE4 802410F4 0C05126B */ jal get_hud_element_render_pos +/* BCFCE4 802410F4 0C05126B */ jal hud_element_get_render_pos /* BCFCE8 802410F8 27A60014 */ addiu $a2, $sp, 0x14 /* BCFCEC 802410FC 8FA40010 */ lw $a0, 0x10($sp) /* BCFCF0 80241100 8FA50014 */ lw $a1, 0x14($sp) @@ -23,7 +23,7 @@ glabel func_802410C0_BCFCB0 /* BCFCF8 80241108 0C090284 */ jal func_80240A10_BCF600 /* BCFCFC 8024110C 24070002 */ addiu $a3, $zero, 2 /* BCFD00 80241110 8E240044 */ lw $a0, 0x44($s1) -/* BCFD04 80241114 0C0511EA */ jal draw_hud_element_clipped +/* BCFD04 80241114 0C0511EA */ jal hud_element_draw_clipped /* BCFD08 80241118 00000000 */ nop /* BCFD0C 8024111C 8FBF0020 */ lw $ra, 0x20($sp) /* BCFD10 80241120 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s index cef368adbb..89cfcc51a9 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s @@ -54,53 +54,53 @@ glabel func_80241168_BCFD58 /* BCFE18 80241228 AE2001CC */ sw $zero, 0x1cc($s1) /* BCFE1C 8024122C AE220038 */ sw $v0, 0x38($s1) /* BCFE20 80241230 E62001C4 */ swc1 $f0, 0x1c4($s1) -/* BCFE24 80241234 0C050529 */ jal create_hud_element +/* BCFE24 80241234 0C050529 */ jal hud_element_create /* BCFE28 80241238 E62001D0 */ swc1 $f0, 0x1d0($s1) /* BCFE2C 8024123C 0040802D */ daddu $s0, $v0, $zero /* BCFE30 80241240 8E250034 */ lw $a1, 0x34($s1) /* BCFE34 80241244 8E260038 */ lw $a2, 0x38($s1) /* BCFE38 80241248 0200202D */ daddu $a0, $s0, $zero -/* BCFE3C 8024124C 0C051261 */ jal set_hud_element_render_pos +/* BCFE3C 8024124C 0C051261 */ jal hud_element_set_render_pos /* BCFE40 80241250 AE30003C */ sw $s0, 0x3c($s1) /* BCFE44 80241254 0200202D */ daddu $a0, $s0, $zero -/* BCFE48 80241258 0C051277 */ jal set_hud_element_render_depth +/* BCFE48 80241258 0C051277 */ jal hud_element_set_render_depth /* BCFE4C 8024125C 0000282D */ daddu $a1, $zero, $zero /* BCFE50 80241260 0200202D */ daddu $a0, $s0, $zero -/* BCFE54 80241264 0C051280 */ jal set_hud_element_flags +/* BCFE54 80241264 0C051280 */ jal hud_element_set_flags /* BCFE58 80241268 24050082 */ addiu $a1, $zero, 0x82 /* BCFE5C 8024126C 3C048011 */ lui $a0, %hi(HudScript_BlueMeter) /* BCFE60 80241270 24848AFC */ addiu $a0, $a0, %lo(HudScript_BlueMeter) -/* BCFE64 80241274 0C050529 */ jal create_hud_element +/* BCFE64 80241274 0C050529 */ jal hud_element_create /* BCFE68 80241278 00000000 */ nop /* BCFE6C 8024127C 0040802D */ daddu $s0, $v0, $zero /* BCFE70 80241280 8E250034 */ lw $a1, 0x34($s1) /* BCFE74 80241284 8E260038 */ lw $a2, 0x38($s1) /* BCFE78 80241288 0200202D */ daddu $a0, $s0, $zero /* BCFE7C 8024128C AE300040 */ sw $s0, 0x40($s1) -/* BCFE80 80241290 0C051261 */ jal set_hud_element_render_pos +/* BCFE80 80241290 0C051261 */ jal hud_element_set_render_pos /* BCFE84 80241294 24C6001C */ addiu $a2, $a2, 0x1c /* BCFE88 80241298 0200202D */ daddu $a0, $s0, $zero -/* BCFE8C 8024129C 0C051277 */ jal set_hud_element_render_depth +/* BCFE8C 8024129C 0C051277 */ jal hud_element_set_render_depth /* BCFE90 802412A0 0000282D */ daddu $a1, $zero, $zero /* BCFE94 802412A4 0200202D */ daddu $a0, $s0, $zero -/* BCFE98 802412A8 0C051280 */ jal set_hud_element_flags +/* BCFE98 802412A8 0C051280 */ jal hud_element_set_flags /* BCFE9C 802412AC 24050082 */ addiu $a1, $zero, 0x82 /* BCFEA0 802412B0 3C048011 */ lui $a0, %hi(HudScript_RunAwayOK) /* BCFEA4 802412B4 24849244 */ addiu $a0, $a0, %lo(HudScript_RunAwayOK) -/* BCFEA8 802412B8 0C050529 */ jal create_hud_element +/* BCFEA8 802412B8 0C050529 */ jal hud_element_create /* BCFEAC 802412BC 00000000 */ nop /* BCFEB0 802412C0 0040802D */ daddu $s0, $v0, $zero /* BCFEB4 802412C4 8E250034 */ lw $a1, 0x34($s1) /* BCFEB8 802412C8 8E260038 */ lw $a2, 0x38($s1) /* BCFEBC 802412CC 0200202D */ daddu $a0, $s0, $zero /* BCFEC0 802412D0 AE300044 */ sw $s0, 0x44($s1) -/* BCFEC4 802412D4 0C051261 */ jal set_hud_element_render_pos +/* BCFEC4 802412D4 0C051261 */ jal hud_element_set_render_pos /* BCFEC8 802412D8 24C6001C */ addiu $a2, $a2, 0x1c /* BCFECC 802412DC 0200202D */ daddu $a0, $s0, $zero -/* BCFED0 802412E0 0C051277 */ jal set_hud_element_render_depth +/* BCFED0 802412E0 0C051277 */ jal hud_element_set_render_depth /* BCFED4 802412E4 0000282D */ daddu $a1, $zero, $zero /* BCFED8 802412E8 0200202D */ daddu $a0, $s0, $zero -/* BCFEDC 802412EC 0C051280 */ jal set_hud_element_flags +/* BCFEDC 802412EC 0C051280 */ jal hud_element_set_flags /* BCFEE0 802412F0 24050082 */ addiu $a1, $zero, 0x82 /* BCFEE4 802412F4 8FBF0018 */ lw $ra, 0x18($sp) /* BCFEE8 802412F8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802413D0_BCFFC0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802413D0_BCFFC0.s index 1afe88f5e3..c3e363e1f8 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802413D0_BCFFC0.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802413D0_BCFFC0.s @@ -15,12 +15,12 @@ glabel func_802413D0_BCFFC0 /* BCFFE8 802413F8 8CA20000 */ lw $v0, ($a1) /* BCFFEC 802413FC 8E04003C */ lw $a0, 0x3c($s0) /* BCFFF0 80241400 00431024 */ and $v0, $v0, $v1 -/* BCFFF4 80241404 0C05123D */ jal free_hud_element +/* BCFFF4 80241404 0C05123D */ jal hud_element_free /* BCFFF8 80241408 ACA20000 */ sw $v0, ($a1) /* BCFFFC 8024140C 8E040040 */ lw $a0, 0x40($s0) -/* BD0000 80241410 0C05123D */ jal free_hud_element +/* BD0000 80241410 0C05123D */ jal hud_element_free /* BD0004 80241414 00000000 */ nop -/* BD0008 80241418 0C05123D */ jal free_hud_element +/* BD0008 80241418 0C05123D */ jal hud_element_free /* BD000C 8024141C 8E040044 */ lw $a0, 0x44($s0) /* BD0010 80241420 0C048D70 */ jal free_generic_entity /* BD0014 80241424 8E04002C */ lw $a0, 0x2c($s0) diff --git a/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s b/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s index a3c37d6218..5e882c288e 100644 --- a/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s +++ b/ver/us/asm/nonmatchings/world/partner/goombario/func_802BD5D8_3174F8.s @@ -148,8 +148,8 @@ glabel func_802BD5D8_3174F8 .L802BD7C8: /* 3176E8 802BD7C8 AE330070 */ sw $s3, 0x70($s1) .L802BD7CC: -/* 3176EC 802BD7CC 3C04802C */ lui $a0, %hi(D_802BDF60) -/* 3176F0 802BD7D0 8C84DF60 */ lw $a0, %lo(D_802BDF60)($a0) +/* 3176EC 802BD7CC 3C04802C */ lui $a0, %hi(GoombarioGetTattleID) +/* 3176F0 802BD7D0 8C84DF60 */ lw $a0, %lo(GoombarioGetTattleID)($a0) /* 3176F4 802BD7D4 0480008A */ bltz $a0, .L802BDA00 /* 3176F8 802BD7D8 30824000 */ andi $v0, $a0, 0x4000 /* 3176FC 802BD7DC 10400070 */ beqz $v0, .L802BD9A0 @@ -247,8 +247,8 @@ glabel func_802BD5D8_3174F8 /* 317860 802BD940 3C10001B */ lui $s0, 0x1b /* 317864 802BD944 080AF65D */ j .L802BD974 /* 317868 802BD948 3610001E */ ori $s0, $s0, 0x1e -/* 31786C 802BD94C 3C04802C */ lui $a0, %hi(D_802BDF60) -/* 317870 802BD950 8C84DF60 */ lw $a0, %lo(D_802BDF60)($a0) +/* 31786C 802BD94C 3C04802C */ lui $a0, %hi(GoombarioGetTattleID) +/* 317870 802BD950 8C84DF60 */ lw $a0, %lo(GoombarioGetTattleID)($a0) /* 317874 802BD954 0C04417A */ jal get_entity_by_index /* 317878 802BD958 30843FFF */ andi $a0, $a0, 0x3fff /* 31787C 802BD95C 8C420040 */ lw $v0, 0x40($v0) @@ -269,8 +269,8 @@ glabel func_802BD5D8_3174F8 /* 3178B0 802BD990 1453FFA9 */ bne $v0, $s3, .L802BD838 /* 3178B4 802BD994 26520008 */ addiu $s2, $s2, 8 .L802BD998: -/* 3178B8 802BD998 3C04802C */ lui $a0, %hi(D_802BDF60) -/* 3178BC 802BD99C 8C84DF60 */ lw $a0, %lo(D_802BDF60)($a0) +/* 3178B8 802BD998 3C04802C */ lui $a0, %hi(GoombarioGetTattleID) +/* 3178BC 802BD99C 8C84DF60 */ lw $a0, %lo(GoombarioGetTattleID)($a0) .L802BD9A0: /* 3178C0 802BD9A0 04800017 */ bltz $a0, .L802BDA00 /* 3178C4 802BD9A4 30822000 */ andi $v0, $a0, 0x2000 @@ -305,8 +305,8 @@ glabel func_802BD5D8_3174F8 /* 317930 802BDA10 080AF6BF */ j .L802BDAFC /* 317934 802BDA14 34630025 */ ori $v1, $v1, 0x25 .L802BDA18: -/* 317938 802BDA18 3C04802C */ lui $a0, %hi(D_802BDF60) -/* 31793C 802BDA1C 8C84DF60 */ lw $a0, %lo(D_802BDF60)($a0) +/* 317938 802BDA18 3C04802C */ lui $a0, %hi(GoombarioGetTattleID) +/* 31793C 802BDA1C 8C84DF60 */ lw $a0, %lo(GoombarioGetTattleID)($a0) /* 317940 802BDA20 04800004 */ bltz $a0, .L802BDA34 /* 317944 802BDA24 0000282D */ daddu $a1, $zero, $zero /* 317948 802BDA28 0C0AF440 */ jal func_802BD100_317020 diff --git a/ver/us/asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s b/ver/us/asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s index 38e54f6296..52f1072481 100644 --- a/ver/us/asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s +++ b/ver/us/asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802BD754_31D2C4 +glabel WattUseAbility /* 31D2C4 802BD754 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 31D2C8 802BD758 AFB3001C */ sw $s3, 0x1c($sp) /* 31D2CC 802BD75C 0080982D */ daddu $s3, $a0, $zero diff --git a/ver/us/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s b/ver/us/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s index 755cd75e29..bb8facba6d 100644 --- a/ver/us/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s +++ b/ver/us/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s @@ -166,14 +166,14 @@ glabel MakeShop .L80281ACC: /* 7E294C 80281ACC 3C048008 */ lui $a0, %hi(HudScript_Item_Coin) /* 7E2950 80281AD0 24840868 */ addiu $a0, $a0, %lo(HudScript_Item_Coin) -/* 7E2954 80281AD4 0C050529 */ jal create_hud_element +/* 7E2954 80281AD4 0C050529 */ jal hud_element_create /* 7E2958 80281AD8 2410FFFF */ addiu $s0, $zero, -1 /* 7E295C 80281ADC 0040202D */ daddu $a0, $v0, $zero /* 7E2960 80281AE0 24050080 */ addiu $a1, $zero, 0x80 -/* 7E2964 80281AE4 0C051280 */ jal set_hud_element_flags +/* 7E2964 80281AE4 0C051280 */ jal hud_element_set_flags /* 7E2968 80281AE8 AE840020 */ sw $a0, 0x20($s4) /* 7E296C 80281AEC 8E840020 */ lw $a0, 0x20($s4) -/* 7E2970 80281AF0 0C05128B */ jal clear_hud_element_flags +/* 7E2970 80281AF0 0C05128B */ jal hud_element_clear_flags /* 7E2974 80281AF4 34058000 */ ori $a1, $zero, 0x8000 /* 7E2978 80281AF8 3C058028 */ lui $a1, %hi(draw_shop_items) /* 7E297C 80281AFC 24A51524 */ addiu $a1, $a1, %lo(draw_shop_items) diff --git a/ver/us/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s b/ver/us/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s index 754e51ad83..8016315be0 100644 --- a/ver/us/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s +++ b/ver/us/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s @@ -176,13 +176,13 @@ glabel draw_shop_items /* 7E263C 802817BC 02302821 */ addu $a1, $s1, $s0 /* 7E2640 802817C0 24A5FFFA */ addiu $a1, $a1, -6 /* 7E2644 802817C4 8E440020 */ lw $a0, 0x20($s2) -/* 7E2648 802817C8 0C051261 */ jal set_hud_element_render_pos +/* 7E2648 802817C8 0C051261 */ jal hud_element_set_render_pos /* 7E264C 802817CC 26660005 */ addiu $a2, $s3, 5 /* 7E2650 802817D0 8E440020 */ lw $a0, 0x20($s2) /* 7E2654 802817D4 3C053F33 */ lui $a1, 0x3f33 -/* 7E2658 802817D8 0C051308 */ jal set_hud_element_scale +/* 7E2658 802817D8 0C051308 */ jal hud_element_set_scale /* 7E265C 802817DC 34A53333 */ ori $a1, $a1, 0x3333 -/* 7E2660 802817E0 0C0511EA */ jal draw_hud_element_clipped +/* 7E2660 802817E0 0C0511EA */ jal hud_element_draw_clipped /* 7E2664 802817E4 8E440020 */ lw $a0, 0x20($s2) .L802817E8: /* 7E2668 802817E8 26F70001 */ addiu $s7, $s7, 1 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index cdb8f78a10..ebbf0c3e64 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -1385,7 +1385,7 @@ D_80077980 = 0x80077980; // type:data rom:0x52D80 D_8007798C = 0x8007798C; // type:data rom:0x52D8C D_800779B0 = 0x800779B0; // type:data rom:0x52DB0 D_800779C0 = 0x800779C0; // type:data rom:0x52DC0 -D_800779C4 = 0x800779C4; // type:data rom:0x52DC4 +gSaveSlotMetadata = 0x800779C4; // type:data rom:0x52DC4 D_800779C8 = 0x800779C8; // type:data rom:0x52DC8 D_800779CA = 0x800779CA; // type:data rom:0x52DCA D_800779CB = 0x800779CB; // type:data rom:0x52DCB @@ -1393,7 +1393,7 @@ D_800779CC = 0x800779CC; // type:data rom:0x52DCC D_800779D0 = 0x800779D0; // type:data rom:0x52DD0 D_800779D4 = 0x800779D4; // type:data rom:0x52DD4 D_800779D8 = 0x800779D8; // type:data rom:0x52DD8 -D_80077A24 = 0x80077A24; // type:data rom:0x52E24 +gSaveSlotHasData = 0x80077A24; // type:data rom:0x52E24 D_80077A28 = 0x80077A28; // type:data rom:0x52E28 D_80077A2C = 0x80077A2C; // type:data rom:0x52E2C D_80077A30 = 0x80077A30; // type:data rom:0x52E30 @@ -2205,18 +2205,18 @@ D_800F7B40 = 0x800F7B40; // type:data rom:0x90FF0 D_800F7B44 = 0x800F7B44; // type:data rom:0x90FF4 D_800F7B48 = 0x800F7B48; // type:data rom:0x90FF8 D_800F7B4C = 0x800F7B4C; // type:data rom:0x90FFC -D_800F7B50 = 0x800F7B50; // type:data rom:0x91000 -D_800F7B60 = 0x800F7B60; // type:data rom:0x91010 -D_800F7B70 = 0x800F7B70; // type:data rom:0x91020 +GravityParamsStartJump = 0x800F7B50; // type:data rom:0x91000 +GravityParamsStartFall = 0x800F7B60; // type:data rom:0x91010 +DefaultMoveSpeeds = 0x800F7B70; // type:data rom:0x91020 D_800F7B80 = 0x800F7B80; // type:data rom:0x91030 D_800F7B84 = 0x800F7B84; // type:data rom:0x91034 D_800F7B90 = 0x800F7B90; // type:data rom:0x91040 D_800F7B94 = 0x800F7B94; // type:data rom:0x91044 D_800F7BBC = 0x800F7BBC; // type:data rom:0x9106C D_800F7BE8 = 0x800F7BE8; // type:data rom:0x91098 -world_actions_peachDisguises = 0x800F7C1C; // type:data rom:0x910CC size:0x60 -D_800F7C7C = 0x800F7C7C; // type:data rom:0x9112C -D_800F7C8C = 0x800F7C8C; // type:data rom:0x9113C +BasicPeachDisguiseAnims = 0x800F7C1C; // type:data rom:0x910CC size:0x60 +PeachDisguiseExtraAnims = 0x800F7C7C; // type:data rom:0x9112C +PlayerActionsTable = 0x800F7C8C; // type:data rom:0x9113C wPartnerHudScripts = 0x800F7F00; // type:data rom:0x913B0 wDisabledPartnerHudScripts = 0x800F7F40; // type:data rom:0x913F0 DigitHudScripts = 0x800F7F80; // type:data rom:0x91430 @@ -2278,7 +2278,7 @@ D_8010C924 = 0x8010C924; // type:data rom:0xA5DD4 D_8010C928 = 0x8010C928; // type:data rom:0xA5DD8 D_8010C92C = 0x8010C92C; // type:data rom:0xA5DDC wPartnerNpc = 0x8010C930; // type:data rom:0xA5DE0 -D_8010C934 = 0x8010C934; // type:data rom:0xA5DE4 +TweesterTouchingPlayer = 0x8010C934; // type:data rom:0xA5DE4 D_8010C938 = 0x8010C938; // type:data rom:0xA5DE8 D_8010C93C = 0x8010C93C; // type:data rom:0xA5DEC D_8010C940 = 0x8010C940; // type:data rom:0xA5DF0 @@ -2286,7 +2286,7 @@ gSpinHistoryBufferPos = 0x8010C944; // type:data rom:0xA5DF4 D_8010C948 = 0x8010C948; // type:data rom:0xA5DF8 D_8010C94C = 0x8010C94C; // type:data rom:0xA5DFC D_8010C950 = 0x8010C950; // type:data rom:0xA5E00 -D_8010C954 = 0x8010C954; // type:data rom:0xA5E04 +TweesterTouchingPartner = 0x8010C954; // type:data rom:0xA5E04 D_8010C958 = 0x8010C958; // type:data rom:0xA5E08 D_8010C95C = 0x8010C95C; // type:data rom:0xA5E0C D_8010C960 = 0x8010C960; // type:data rom:0xA5E10 @@ -2836,12 +2836,12 @@ func_8013E904 = 0x8013E904; // type:func rom:0xD5004 func_8013EE48 = 0x8013EE48; // type:func rom:0xD5548 func_8013EE68 = 0x8013EE68; // type:func rom:0xD5568 func_8013F1F8 = 0x8013F1F8; // type:func rom:0xD58F8 -load_hud_element = 0x8013F350; // type:func rom:0xD5A50 -draw_rect_hud_element = 0x8013F704; // type:func rom:0xD5E04 -clear_hud_element_cache = 0x80141100; // type:func rom:0xD7800 +hud_element_load_script = 0x8013F350; // type:func rom:0xD5A50 +hud_element_draw_rect = 0x8013F704; // type:func rom:0xD5E04 +hud_element_clear_cache = 0x80141100; // type:func rom:0xD7800 init_hud_element_list = 0x80141300; // type:func rom:0xD7A00 func_801413F8 = 0x801413F8; // type:func rom:0xD7AF8 -create_hud_element = 0x801414A4; // type:func rom:0xD7BA4 +hud_element_create = 0x801414A4; // type:func rom:0xD7BA4 update_hud_elements = 0x80141610; // type:func rom:0xD7D10 hud_element_update = 0x80141704; // type:func rom:0xD7E04 render_hud_elements_backUI = 0x80142210; // type:func rom:0xD8910 @@ -2853,36 +2853,36 @@ func_80144218 = 0x80144218; // type:func rom:0xDA918 func_80144238 = 0x80144238; // type:func rom:0xDA938 func_80144258 = 0x80144258; // type:func rom:0xDA958 func_80144278 = 0x80144278; // type:func rom:0xDA978 -draw_hud_element = 0x80144298; // type:func rom:0xDA998 -draw_hud_element_clipped = 0x801447A8; // type:func rom:0xDAEA8 -draw_hud_element_2 = 0x801447C4; // type:func rom:0xDAEC4 -draw_hud_element_3 = 0x801447E0; // type:func rom:0xDAEE0 -set_hud_element_anim = 0x801447FC; // type:func rom:0xDAEFC -get_hud_element_anim = 0x801448B0; // type:func rom:0xDAFB0 +draw_hud_element_internal = 0x80144298; // type:func rom:0xDA998 +hud_element_draw_clipped = 0x801447A8; // type:func rom:0xDAEA8 +hud_element_draw_next = 0x801447C4; // type:func rom:0xDAEC4 +hud_element_draw_without_clipping = 0x801447E0; // type:func rom:0xDAEE0 +hud_element_set_script = 0x801447FC; // type:func rom:0xDAEFC +hud_element_get_script = 0x801448B0; // type:func rom:0xDAFB0 get_hud_element = 0x801448D4; // type:func rom:0xDAFD4 -free_hud_element = 0x801448F4; // type:func rom:0xDAFF4 -set_hud_element_render_pos = 0x80144984; // type:func rom:0xDB084 -get_hud_element_render_pos = 0x801449AC; // type:func rom:0xDB0AC -set_hud_element_render_depth = 0x801449DC; // type:func rom:0xDB0DC -set_hud_element_flags = 0x80144A00; // type:func rom:0xDB100 -clear_hud_element_flags = 0x80144A2C; // type:func rom:0xDB12C +hud_element_free = 0x801448F4; // type:func rom:0xDAFF4 +hud_element_set_render_pos = 0x80144984; // type:func rom:0xDB084 +hud_element_get_render_pos = 0x801449AC; // type:func rom:0xDB0AC +hud_element_set_render_depth = 0x801449DC; // type:func rom:0xDB0DC +hud_element_set_flags = 0x80144A00; // type:func rom:0xDB100 +hud_element_clear_flags = 0x80144A2C; // type:func rom:0xDB12C ALT_clear_hud_element_cache = 0x80144A5C; // type:func rom:0xDB15C -set_hud_element_scale = 0x80144C20; // type:func rom:0xDB320 -set_hud_element_size_preset = 0x80144DF4; // type:func rom:0xDB4F4 +hud_element_set_scale = 0x80144C20; // type:func rom:0xDB320 +hud_element_use_preset_size = 0x80144DF4; // type:func rom:0xDB4F4 func_80144E4C = 0x80144E4C; // type:func rom:0xDB54C func_80144E74 = 0x80144E74; // type:func rom:0xDB574 -set_hud_element_alpha = 0x80144EB0; // type:func rom:0xDB5B0 -set_hud_element_tint = 0x80144EFC; // type:func rom:0xDB5FC -create_hud_element_transform_A = 0x80144F28; // type:func rom:0xDB628 -create_hud_element_transform_B = 0x80144FD8; // type:func rom:0xDB6D8 -create_hud_element_transform_C = 0x80145070; // type:func rom:0xDB770 -free_hud_element_transform = 0x80145108; // type:func rom:0xDB808 -set_hud_element_transform_pos = 0x80145184; // type:func rom:0xDB884 -set_hud_element_transform_scale = 0x801451D4; // type:func rom:0xDB8D4 -set_hud_element_transform_rotation = 0x80145224; // type:func rom:0xDB924 -set_hud_element_transform_rotation_pivot = 0x80145274; // type:func rom:0xDB974 +hud_element_set_alpha = 0x80144EB0; // type:func rom:0xDB5B0 +hud_element_set_tint = 0x80144EFC; // type:func rom:0xDB5FC +hud_element_create_transform_A = 0x80144F28; // type:func rom:0xDB628 +hud_element_create_transform_B = 0x80144FD8; // type:func rom:0xDB6D8 +hud_element_create_transform_C = 0x80145070; // type:func rom:0xDB770 +hud_element_free_transform = 0x80145108; // type:func rom:0xDB808 +hud_element_set_transform_pos = 0x80145184; // type:func rom:0xDB884 +hud_element_set_transform_scale = 0x801451D4; // type:func rom:0xDB8D4 +hud_element_set_transform_rotation = 0x80145224; // type:func rom:0xDB924 +hud_element_set_transform_rotation_pivot = 0x80145274; // type:func rom:0xDB974 copy_world_hud_element_ref_to_battle = 0x801452B4; // type:func rom:0xDB9B4 -set_hud_element_nonworld_cache = 0x801452E8; // type:func rom:0xDB9E8 +hud_element_set_aux_cache = 0x801452E8; // type:func rom:0xDB9E8 clear_saved_variables = 0x80145320; // type:func rom:0xDBA20 clear_area_flags = 0x80145390; // type:func rom:0xDBA90 clear_global_flag = 0x801453E0; // type:func rom:0xDBAE0 @@ -3121,7 +3121,7 @@ D_8014EE60 = 0x8014EE60; // type:data rom:0xE5560 D_8014EE68 = 0x8014EE68; // type:data rom:0xE5568 D_8014EE98 = 0x8014EE98; // type:data rom:0xE5598 fold_groupOffsets = 0x8014EF64; // type:data rom:0xE5664 -gHudElementCacheNonWorld = 0x8014EFC0; // type:data rom:0xE56C0 +gHudElementAuxCache = 0x8014EFC0; // type:data rom:0xE56C0 gHudElementCacheCapacity = 0x8014EFC4; // type:data rom:0xE56C4 hud_element_defaultAnim = 0x8014EFC8; // type:data rom:0xE56C8 gHudElementSizes = 0x8014EFCC; // type:data rom:0xE56CC @@ -4029,7 +4029,7 @@ CountFortessKeys = 0x802D6C4C; // type:func rom:0xFB5FC RemoveFortressKeys = 0x802D6C94; // type:func rom:0xFB644 MakeItemEntity = 0x802D6CC0; // type:func rom:0xFB670 DropItemEntity = 0x802D6DC0; // type:func rom:0xFB770 -DropItemEntityB = 0x802D6EC0; // type:func rom:0xFB870 +DropTinyItemEntity = 0x802D6EC0; // type:func rom:0xFB870 RemoveItemEntity = 0x802D6FCC; // type:func rom:0xFB97C AddBadge = 0x802D6FF8; // type:func rom:0xFB9A8 RemoveBadge = 0x802D7050; // type:func rom:0xFBA00 @@ -5697,7 +5697,7 @@ D_802BDF38 = 0x802BDF38; // type:data rom:0x317E58 D_802BDF3C = 0x802BDF3C; // type:data rom:0x317E5C D_802BDF40 = 0x802BDF40; // type:data rom:0x317E60 D_802BDF5C = 0x802BDF5C; // type:data rom:0x317E7C -D_802BDF60 = 0x802BDF60; // type:data rom:0x317E80 +GoombarioGetTattleID = 0x802BDF60; // type:data rom:0x317E80 D_802BDF64 = 0x802BDF64; // type:data rom:0x317E84 world_bombette_init = 0x802BD2D8; // type:func rom:0x318028 func_802BD300_318050 = 0x802BD300; // type:func rom:0x318050 @@ -5783,14 +5783,14 @@ D_802BEC70 = 0x802BEC70; // type:data rom:0x31CC90 D_802BEC74 = 0x802BEC74; // type:data rom:0x31CC94 D_802BEC78 = 0x802BEC78; // type:data rom:0x31CC98 D_802BEC7C = 0x802BEC7C; // type:data rom:0x31CC9C -D_802BEC80 = 0x802BEC80; // type:data rom:0x31CCA0 +KooperTweesterPhysics = 0x802BEC80; // type:data rom:0x31CCA0 func_802BD180_31CCF0 = 0x802BD180; // type:func rom:0x31CCF0 func_802BD1AC_31CD1C = 0x802BD1AC; // type:func rom:0x31CD1C world_watt_init = 0x802BD23C; // type:func rom:0x31CDAC func_802BD27C_31CDEC = 0x802BD27C; // type:func rom:0x31CDEC func_802BD2B4_31CE24 = 0x802BD2B4; // type:func rom:0x31CE24 func_802BD710_31D280 = 0x802BD710; // type:func rom:0x31D280 -func_802BD754_31D2C4 = 0x802BD754; // type:func rom:0x31D2C4 +WattUseAbility = 0x802BD754; // type:func rom:0x31D2C4 func_802BDD0C_31D87C = 0x802BDD0C; // type:func rom:0x31D87C world_watt_pre_battle = 0x802BDD9C; // type:func rom:0x31D90C world_watt_post_battle = 0x802BDE10; // type:func rom:0x31D980 @@ -5832,7 +5832,7 @@ D_802BFDB8_320B28 = 0x802BFDB8; // type:data rom:0x320B28 D_802BFDBC_320B2C = 0x802BFDBC; // type:data rom:0x320B2C world_sushie_use_ability = 0x802BFDC0; // type:data rom:0x320B30 world_sushie_take_out = 0x802BFDDC; // type:data rom:0x320B4C -D_802BFDF8_320B68 = 0x802BFDF8; // type:data rom:0x320B68 +SushieTweesterPhysicsPtr = 0x802BFDF8; // type:data rom:0x320B68 world_sushie_update = 0x802BFDFC; // type:data rom:0x320B6C world_sushie_put_away = 0x802BFE18; // type:data rom:0x320B88 world_sushie_while_riding = 0x802BFE34; // type:data rom:0x320BA4 @@ -5853,7 +5853,7 @@ bss_802BFF00 = 0x802BFF00; // type:data rom:0x320C70 bss_802BFF04 = 0x802BFF04; // type:data rom:0x320C74 bss_802BFF08 = 0x802BFF08; // type:data rom:0x320C78 bss_802BFF0C = 0x802BFF0C; // type:data rom:0x320C7C -D_802BFF10_320C80 = 0x802BFF10; // type:data rom:0x320C80 +SushieTweesterPhysics = 0x802BFF10; // type:data rom:0x320C80 world_lakilester_init = 0x802BD21C; // type:func rom:0x320D6C func_802BD29C_320DEC = 0x802BD29C; // type:func rom:0x320DEC func_802BD2D4_320E24 = 0x802BD2D4; // type:func rom:0x320E24 @@ -18702,12 +18702,12 @@ func_802B6000_E24920 = 0x802B6000; // type:func rom:0xE24920 func_802B61C0_E24AE0 = 0x802B61C0; // type:func rom:0xE24AE0 func_802B62CC_E24BEC = 0x802B62CC; // type:func rom:0xE24BEC func_802B644C_E24D6C = 0x802B644C; // type:func rom:0xE24D6C -func_802B6000_E24ED0 = 0x802B6000; // type:func rom:0xE24ED0 -func_802B6048_E24F18 = 0x802B6048; // type:func rom:0xE24F18 +action_hammer_is_swinging_away = 0x802B6000; // type:func rom:0xE24ED0 +action_hammer_play_hit_fx = 0x802B6048; // type:func rom:0xE24F18 func_802B62A4_E25174 = 0x802B62A4; // type:func rom:0xE25174 func_802B66A8_E25578 = 0x802B66A8; // type:func rom:0xE25578 -func_802B6820_E256F0 = 0x802B6820; // type:func rom:0xE256F0 -D_802B6DB0_E25C80 = 0x802B6DB0; // type:data rom:0xE25C80 +action_hammer_try_hit = 0x802B6820; // type:func rom:0xE256F0 +HammerHit = 0x802B6DB0; // type:data rom:0xE25C80 D_802B6DC0_E25C90 = 0x802B6DC0; // type:data rom:0xE25C90 func_802B6000_E25D60 = 0x802B6000; // type:func rom:0xE25D60 D_802B69A0_E26700 = 0x802B69A0; // type:data rom:0xE26700 @@ -18743,7 +18743,7 @@ D_802B6E90_E2A300 = 0x802B6E90; // type:data rom:0xE2A300 D_802B6E98_E2A308 = 0x802B6E98; // type:data rom:0xE2A308 D_802B6EA0_E2A310 = 0x802B6EA0; // type:data rom:0xE2A310 func_802B6000_E2A340 = 0x802B6000; // type:func rom:0xE2A340 -D_802B6350_E2A690 = 0x802B6350; // type:data rom:0xE2A690 +PlayerTweesterPhysics = 0x802B6350; // type:data rom:0xE2A690 D_802B6360_E2A6A0 = 0x802B6360; // type:data rom:0xE2A6A0 func_802B6000_E2A6B0 = 0x802B6000; // type:func rom:0xE2A6B0 func_802B6120_E2A7D0 = 0x802B6120; // type:func rom:0xE2A7D0 @@ -19736,14 +19736,14 @@ D_8010C924 = 0x8010C924; // type:data D_8010C928 = 0x8010C928; // type:data D_8010C92C = 0x8010C92C; // type:data wPartnerNpc = 0x8010C930; // type:data -D_8010C934 = 0x8010C934; // type:data +TweesterTouchingPlayer = 0x8010C934; // type:data D_8010C938 = 0x8010C938; // type:data D_8010C93C = 0x8010C93C; // type:data D_8010C940 = 0x8010C940; // type:data gSpinHistoryBufferPos = 0x8010C944; // type:data D_8010C94C = 0x8010C94C; // type:data D_8010C950 = 0x8010C950; // type:data -D_8010C954 = 0x8010C954; // type:data +TweesterTouchingPartner = 0x8010C954; // type:data D_8010C958 = 0x8010C958; // type:data D_8010C95C = 0x8010C95C; // type:data D_8010C960 = 0x8010C960; // type:data @@ -21053,7 +21053,7 @@ D_802BCE20 = 0x802BCE20; // type:data D_802BCE30 = 0x802BCE30; // type:data D_802BCE32 = 0x802BCE32; // type:data D_802BCE34 = 0x802BCE34; // type:data -D_802BD600 = 0x802BD600; // type:data +GoompaTweesterPhysics = 0x802BD600; // type:data goompa_802BD600 = 0x802BD600; // type:data D_802BDF30 = 0x802BDF30; // type:data func_802BE070 = 0x802BE070; // @@ -21177,13 +21177,13 @@ D_802EAE7C = 0x802EAE7C; // type:data D_802EAFDC = 0x802EAFDC; // type:data D_802EB370 = 0x802EB370; // type:data D_802EB380 = 0x802EB380; // type:data -SaveBlockTutorialMessagePrinterClosed = 0x802EB390; // type:data -SaveBlockResultMessagePrinterClosed = 0x802EB394; // type:data -SaveBlockTutorialMessagePrinter = 0x802EB398; // type:data -SaveBlockResultMessagePrinter = 0x802EB39C; // type:data -D_802EB3A0 = 0x802EB3A0; // type:data +SaveBlockTutorialPrinterClosed = 0x802EB390; // type:data +SaveBlockResultPrinterClosed = 0x802EB394; // type:data +SaveBlockTutorialPrinter = 0x802EB398; // type:data +SaveBlockResultPrinter = 0x802EB39C; // type:data +SwitchToLink = 0x802EB3A0; // type:data TriggerBlockVanishEffect = 0x802EB3B0; // type:data -D_802EB3C0 = 0x802EB3C0; // type:data +HeartBlockPrinterClosed = 0x802EB3C0; // type:data D_802EB3D0 = 0x802EB3D0; // type:data gMsgCharsets = 0x802EB5A8; // type:data D_802EB5C0 = 0x802EB5C0; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index ce41f7c730..fb62cf9e11 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -1173,13 +1173,13 @@ D_802E0C60 = 0x802E0C60; D_802E0C64 = 0x802E0C64; D_802E0C68 = 0x802E0C68; D_802E0C70 = 0x802E0C70; -SaveBlockTutorialMessagePrinterClosed = 0x802EB390; -SaveBlockResultMessagePrinterClosed = 0x802EB394; -SaveBlockTutorialMessagePrinter = 0x802EB398; -SaveBlockResultMessagePrinter = 0x802EB39C; -D_802EB3A0 = 0x802EB3A0; +SaveBlockTutorialPrinterClosed = 0x802EB390; +SaveBlockResultPrinterClosed = 0x802EB394; +SaveBlockTutorialPrinter = 0x802EB398; +SaveBlockResultPrinter = 0x802EB39C; +SwitchToLink = 0x802EB3A0; TriggerBlockVanishEffect = 0x802EB3B0; -D_802EB3C0 = 0x802EB3C0; +HeartBlockPrinterClosed = 0x802EB3C0; D_802ED970 = 0x802ED970; D_802EE8D0 = 0x802EE8D0; D_802F39D0 = 0x802F39D0;