diff --git a/include/common_structs.h b/include/common_structs.h index c0e46dd307..8d5f2df264 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -279,12 +279,12 @@ typedef struct PlayerData { /* 0x324 */ s32 tradeEventStartTime; /* 0x328 */ s32 droTreeOrbitTime; /* 0x32C */ s16 starPiecesCollected; - /* 0x32E */ s16 jumpGamePlays; - /* 0x330 */ s32 jumpGameTotal; /* all-time winnings, max = 99999 */ - /* 0x334 */ s16 jumpGameRecord; - /* 0x336 */ s16 smashGamePlays; - /* 0x338 */ s32 smashGameTotal; /* all-time winnings, max = 99999 */ - /* 0x33C */ s16 smashGameRecord; + /* 0x32E */ u16 jumpGamePlays; + /* 0x330 */ u32 jumpGameTotal; /* all-time winnings, max = 99999 */ + /* 0x334 */ u16 jumpGameRecord; + /* 0x336 */ u16 smashGamePlays; + /* 0x338 */ u32 smashGameTotal; /* all-time winnings, max = 99999 */ + /* 0x33C */ u16 smashGameRecord; /* 0x33E */ char unk_33E[2]; } PlayerData; // size = 0x340 @@ -307,7 +307,11 @@ typedef struct Trigger { /* 0x10 */ EvtScript* onTriggerEvt; /* 0x14 */ struct Evt* runningScript; /* 0x18 */ s32 priority; - /* 0x1C */ s32 scriptVars[3]; + /* 0x1C */ union { + /* */ s32 varTable[3]; + /* */ f32 varTableF[3]; + /* */ void* varTablePtr[3]; + /* */ }; /* 0x28 */ s32 itemList; /* 0x2C */ s32 unk_tr_2C; // related to Goombario somehow, custom tattle perhaps? /* 0x30 */ u8 hasPlayerInteractPrompt; @@ -354,15 +358,13 @@ typedef struct Evt { /* 0x070 */ union { /* */ s32 functionTemp[4]; /* */ f32 functionTempF[4]; - /* */ struct Npc* functionTempNpc[4]; - /* */ struct Actor* functionTempActor[4]; - /* */ struct ActorPart* functionTempActorPart[4]; + /* */ void* functionTempPtr[4]; /* */ }; /* 0x080 */ ApiFunc callFunction; /* 0x084 */ union { /* */ s32 varTable[16]; - /* */ struct Actor* varTableActor[4]; - /* */ struct Enemy* varTableEnemy[4]; + /* */ f32 varTableF[16]; + /* */ void* varTablePtr[16]; /* */ }; /* 0x0C4 */ s32 varFlags[3]; /* 0x0D0 */ s32 loopStartTable[8]; @@ -619,7 +621,7 @@ typedef struct Entity { /* 0x1C */ EntityCallback updateScriptCallback; /* 0x20 */ EntityCallback updateMatrixOverride; /* 0x24 */ Evt* boundScript; - /* 0x28 */ Bytecode* boundScriptBytecode; + /* 0x28 */ EvtScript* boundScriptBytecode; /* 0x2C */ s32* savedReadPos; /* 0x30 */ char unk_30[0x8]; /* 0x38 */ EntityBlueprint* blueprint; @@ -807,11 +809,11 @@ typedef struct Camera { /* 0x016 */ char unk_16[2]; /* 0x018 */ f32 vfov; /* 0x01C */ s16 unk_1C; - /* 0x01E */ s16 unk_1E; + /* 0x01E */ s16 auxBoomLength; /* 0x020 */ s16 unk_20; - /* 0x022 */ s16 unk_22; - /* 0x024 */ s16 unk_24; - /* 0x026 */ s16 unk_26; + /* 0x022 */ s16 auxBoomPitch; + /* 0x024 */ s16 auxBoomYaw; + /* 0x026 */ s16 auxBoomZOffset; /* 0x028 */ s16 unk_28; /* 0x02A */ s16 zoomPercent; /* 0x02C */ s16 bgColor[3]; @@ -820,9 +822,7 @@ typedef struct Camera { /* 0x03A */ char unk_3A[2]; /* 0x03C */ Vec3f lookAt_eye; /* 0x048 */ Vec3f lookAt_obj; - /* 0x054 */ f32 unk_54; // x-related - /* 0x058 */ f32 unk_58; // y-related - /* 0x05C */ f32 unk_5C; // z-related + /* 0x054 */ Vec3f auxPos; /* 0x060 */ Vec3f targetPos; /* 0x06C */ f32 currentYaw; /* 0x070 */ f32 unk_70; @@ -916,7 +916,11 @@ typedef struct FGModelData { typedef struct BattleStatus { /* 0x000 */ s32 flags1; /* 0x004 */ s32 flags2; - /* 0x008 */ s32 varTable[16]; + /* 0x008 */ union { + /* */ s32 varTable[16]; + /* */ f32 varTableF[16]; + /* */ void* varTablePtr[16]; + /* */ }; /* 0x048 */ s8 currentSubmenu; /* 0x049 */ char unk_49[3]; /* 0x04C */ s8 unk_4C[16]; @@ -1375,6 +1379,15 @@ typedef struct MesasgeFontGlyphData { /* 0xB */ s8 charHeight; } MesasgeFontGlyphData; // size = 0xC +typedef struct MessageImageData { + /* 0x00 */ s32* raster; + /* 0x04 */ s32* palette; + /* 0x08 */ u16 width; + /* 0x0A */ u16 height; + /* 0x0C */ s32 format; + /* 0x10 */ s32 bitDepth; +} MessageImageData; // size = 0x14 + typedef struct MessageNumber { /* 0x00 */ s32* rasters; /* 0x04 */ s8 texSize; @@ -1578,7 +1591,12 @@ typedef struct ActorPartMovement { /* 0x3A */ s16 unk_3A; /* 0x3C */ s32 unk_3C; /* 0x40 */ char unk_40[0xC]; - /* 0x4C */ s32 varTable[16]; + /* 0x4C */ union { + /* */ s32 varTable[16]; + /* */ f32 varTableF[16]; + /* */ void* varTablePtr[16]; + /* */ }; + } ActorPartMovement; // size = 0x8C typedef struct ActorPartBlueprint { @@ -1883,7 +1901,11 @@ typedef struct ActorState { // TODO: Make the first field of this an ActorMoveme /* 0x6B */ u8 jumpPartIndex; /* 0x6C */ ChompChainAnimationState* unk_6C; /* 0x70 */ char unk_70[12]; - /* 0x7C */ s32 varTable[16]; + /* 0x7C */ union { + /* */ s32 varTable[16]; + /* */ f32 varTableF[16]; + /* */ void* varTablePtr[16]; + /* */ }; } ActorState; // size = 0xBC; typedef struct Actor { diff --git a/include/enums.h b/include/enums.h index a4ed41a956..5f4340581f 100644 --- a/include/enums.h +++ b/include/enums.h @@ -537,6 +537,9 @@ enum SoundIDs { SOUND_172 = 0x00000172, SOUND_17B = 0x0000017B, SOUND_194 = 0x00000194, + SOUND_1A5 = 0x000001A5, + SOUND_1A6 = 0x000001A6, + SOUND_1A7 = 0x000001A7, SOUND_BASIC_DOOR_OPEN = 0x000001C1, SOUND_BASIC_DOOR_CLOSE = 0x000001C2, SOUND_METAL_DOOR_OPEN = 0x000001C3, @@ -549,7 +552,11 @@ enum SoundIDs { SOUND_METAL_GATE_CLOSE = 0x000001CA, SOUND_1CB = 0x000001CB, SOUND_1CC = 0x000001CC, + SOUND_211 = 0x00000211, + SOUND_213 = 0x00000213, + SOUND_214 = 0x00000214, SOUND_215 = 0x00000215, + SOUND_21C = 0x0000021C, SOUND_MENU_ERROR = 0x0000021D, SOUND_231 = 0x00000231, SOUND_246 = 0x00000246, @@ -559,6 +566,7 @@ enum SoundIDs { SOUND_25D = 0x0000025D, SOUND_262 = 0x00000262, SOUND_282 = 0x00000282, + SOUND_283 = 0x00000283, SOUND_BOW_SPOOK = 0x00000291, SOUND_295 = 0x00000295, SOUND_299 = 0x00000299, @@ -613,6 +621,8 @@ enum SoundIDs { SOUND_BOW_VANISH = 0x0000200E, SOUND_BOW_APPEAR = 0x0000200F, SOUND_2010 = 0x00002010, + SOUND_WATT_REPEL_DARKNESS = 0x00002011, + SOUND_WATT_RESUME_DARKNESS = 0x00002012, SOUND_CANNON1 = 0x00002016, SOUND_CANNON2 = 0x00002017, SOUND_CANNON3 = 0x00002018, @@ -666,6 +676,24 @@ enum Cams { CAM_CAM3 = 3, }; +enum CamShakeModes { + CAM_SHAKE_CONSTANT_VERTICAL = 0, + CAM_SHAKE_ANGULAR_HORIZONTAL = 1, + CAM_SHAKE_DECAYING_VERTICAL = 2 +}; + +// for use with func_8024E748 +enum AuxCameraParams { + AUX_CAM_PARAM_1 = 1, + AUX_CAM_BOOM_LENGTH = 2, + AUX_CAM_PARAM_3 = 3, + AUX_CAM_BOOM_PITCH = 4, + AUX_CAM_BOOM_YAW = 5, + AUX_CAM_BOOM_ZOFFSET = 6, + AUX_CAM_PARAM_7 = 7, + AUX_CAM_ZOOM_PERCENT = 8 +}; + #define LOOKUP_ITEM(itemID) gItemTable[itemID & ~0xF0000] enum ItemIDs { ITEM_NONE = 0x00000000, @@ -3290,24 +3318,6 @@ enum ItemTypeFlags { ITEM_TYPE_FLAGS_8000 = 0x8000, }; -enum MsgWindowStates { - MSG_WINDOW_STATE_DONE = 0x0, - MSG_WINDOW_STATE_INIT = 0x1, - MSG_WINDOW_STATE_OPENING = 0x2, - MSG_WINDOW_STATE_CLOSING = 0x3, - MSG_WINDOW_STATE_PRINTING = 0x4, - MSG_WINDOW_STATE_WAITING = 0x5, - MSG_WINDOW_STATE_SCROLLING = 0x6, - MSG_WINDOW_STATE_WAITING_FOR_CHOICE = 0x7, - MSG_WINDOW_STATE_SCROLLING_BACK = 0x8, - MSG_WINDOW_STATE_VIEWING_PREV = 0x9, - MSG_WINDOW_STATE_A = 0xA, - MSG_WINDOW_STATE_B = 0xB, - MSG_WINDOW_STATE_C = 0xC, - MSG_WINDOW_STATE_D = 0xD, - MSG_WINDOW_STATE_E = 0xE, -}; - enum FoldStateFlags { FOLD_STATE_FLAG_ENABLED = 0x00000001, FOLD_STATE_FLAG_G_CULL_BACK = 0x00000002, @@ -3478,4 +3488,494 @@ enum FileMenuMessages { FILE_MESSAGE_PERIOD_34 = 34, // .[End] }; +// specifically used with draw_msg, not to be confused with MsgStyles +enum DrawMsgStyleFlags { + DRAW_MSG_STYLE_MENU = 1, // slightly higher baseline with smaller fullspace widths + DRAW_MSG_STYLE_WAVY = 2, + DRAW_MSG_STYLE_RAINBOW = 4, + DRAW_MSG_STYLE_DROP_SHADOW = 8 +}; + +enum MsgPalettes { + MSG_PAL_WHITE = 0x00, + MSG_PAL_TEAL = 0x01, + MSG_PAL_BLUE = 0x02, + MSG_PAL_GREEN = 0x03, + MSG_PAL_LIME = 0x04, + MSG_PAL_YELLOW = 0x05, + MSG_PAL_ORANGE = 0x06, + MSG_PAL_RED = 0x07, + MSG_PAL_PURPLE = 0x08, + MSG_PAL_PINK = 0x09, + MSG_PAL_STANDARD = 0x0A, + MSG_PAL_0B = 0x0B, + MSG_PAL_0C = 0x0C, + MSG_PAL_0D = 0x0D, + MSG_PAL_0E = 0x0E, + MSG_PAL_0F = 0x0F, + MSG_PAL_10 = 0x10, + MSG_PAL_11 = 0x11, + MSG_PAL_12 = 0x12, + MSG_PAL_13 = 0x13, + MSG_PAL_14 = 0x14, + MSG_PAL_15 = 0x15, + MSG_PAL_16 = 0x16, + MSG_PAL_17 = 0x17, + MSG_PAL_18 = 0x18, + MSG_PAL_19 = 0x19, + MSG_PAL_1A = 0x1A, + MSG_PAL_1B = 0x1B, + MSG_PAL_1C = 0x1C, + MSG_PAL_1D = 0x1D, + MSG_PAL_1E = 0x1E, + MSG_PAL_1F = 0x1F, + MSG_PAL_20 = 0x20, + MSG_PAL_21 = 0x21, + MSG_PAL_22 = 0x22, + MSG_PAL_23 = 0x23, + MSG_PAL_24 = 0x24, + MSG_PAL_25 = 0x25, + MSG_PAL_26 = 0x26, + MSG_PAL_27 = 0x27, + MSG_PAL_28 = 0x28, + MSG_PAL_29 = 0x29, + MSG_PAL_2A = 0x2A, + MSG_PAL_2B = 0x2B, + MSG_PAL_2C = 0x2C, + MSG_PAL_2D = 0x2D, + MSG_PAL_2E = 0x2E, + MSG_PAL_2F = 0x2F, + MSG_PAL_30 = 0x30, + MSG_PAL_31 = 0x31, + MSG_PAL_32 = 0x32, + MSG_PAL_33 = 0x33, + MSG_PAL_34 = 0x34, + MSG_PAL_35 = 0x35, + MSG_PAL_36 = 0x36, + MSG_PAL_37 = 0x37, + MSG_PAL_38 = 0x38, + MSG_PAL_39 = 0x39, + MSG_PAL_3A = 0x3A, + MSG_PAL_3B = 0x3B, + MSG_PAL_3C = 0x3C, + MSG_PAL_3D = 0x3D, + MSG_PAL_3E = 0x3E, + MSG_PAL_3F = 0x3F, + MSG_PAL_40 = 0x40, + MSG_PAL_41 = 0x41, + MSG_PAL_42 = 0x42, + MSG_PAL_43 = 0x43, + MSG_PAL_44 = 0x44, + MSG_PAL_45 = 0x45, + MSG_PAL_46 = 0x46, + MSG_PAL_47 = 0x47, + MSG_PAL_48 = 0x48, + MSG_PAL_49 = 0x49, + MSG_PAL_4A = 0x4A, + MSG_PAL_4B = 0x4B, + MSG_PAL_4C = 0x4C, + MSG_PAL_4D = 0x4D, + MSG_PAL_4E = 0x4E, + MSG_PAL_4F = 0x4F, + MSG_PAL_50 = 0x50 +}; + +enum MsgChars { + MSG_CHAR_NOTE = 0x00, + MSG_CHAR_EXCLAMTION = 0x01, + MSG_CHAR_BACKSLASH = 0x02, + MSG_CHAR_HASH = 0x03, + MSG_CHAR_DOLLAR = 0x04, + MSG_CHAR_PERCENT = 0x05, + MSG_CHAR_AND = 0x06, + MSG_CHAR_APOSTROPHE = 0x07, + MSG_CHAR_LPAREN = 0x08, + MSG_CHAR_RPAREN = 0x09, + MSG_CHAR_TIMES = 0x0A, + MSG_CHAR_PLUS = 0x0B, + MSG_CHAR_COMMA = 0x0C, + MSG_CHAR_MINUS = 0x0D, + MSG_CHAR_PERIOD = 0x0E, + MSG_CHAR_FORWARDSLASH = 0x0F, + MSG_CHAR_DIGIT_0 = 0x10, + MSG_CHAR_DIGIT_1 = 0x11, + MSG_CHAR_DIGIT_2 = 0x12, + MSG_CHAR_DIGIT_3 = 0x13, + MSG_CHAR_DIGIT_4 = 0x14, + MSG_CHAR_DIGIT_5 = 0x15, + MSG_CHAR_DIGIT_6 = 0x16, + MSG_CHAR_DIGIT_7 = 0x17, + MSG_CHAR_DIGIT_8 = 0x18, + MSG_CHAR_DIGIT_9 = 0x19, + MSG_CHAR_COLON = 0x1A, + MSG_CHAR_SEMICOLON = 0x1B, + MSG_CHAR_LESS_THAN = 0x1C, + MSG_CHAR_EQUAL = 0x1D, + MSG_CHAR_GREATER_THAN = 0x1E, + MSG_CHAR_QUESTION = 0x1F, + MSG_CHAR_AT = 0x20, + MSG_CHAR_UPPER_A = 0x21, + MSG_CHAR_UPPER_B = 0x22, + MSG_CHAR_UPPER_C = 0x23, + MSG_CHAR_UPPER_D = 0x24, + MSG_CHAR_UPPER_E = 0x25, + MSG_CHAR_UPPER_F = 0x26, + MSG_CHAR_UPPER_G = 0x27, + MSG_CHAR_UPPER_H = 0x28, + MSG_CHAR_UPPER_I = 0x29, + MSG_CHAR_UPPER_J = 0x2A, + MSG_CHAR_UPPER_K = 0x2B, + MSG_CHAR_UPPER_L = 0x2C, + MSG_CHAR_UPPER_M = 0x2D, + MSG_CHAR_UPPER_N = 0x2E, + MSG_CHAR_UPPER_O = 0x2F, + MSG_CHAR_UPPER_P = 0x30, + MSG_CHAR_UPPER_Q = 0x31, + MSG_CHAR_UPPER_R = 0x32, + MSG_CHAR_UPPER_S = 0x33, + MSG_CHAR_UPPER_T = 0x34, + MSG_CHAR_UPPER_U = 0x35, + MSG_CHAR_UPPER_V = 0x36, + MSG_CHAR_UPPER_W = 0x37, + MSG_CHAR_UPPER_X = 0x38, + MSG_CHAR_UPPER_Y = 0x39, + MSG_CHAR_UPPER_Z = 0x3A, + MSG_CHAR_LBRACKET = 0x3B, + MSG_CHAR_YEN = 0x3C, + MSG_CHAR_RBRACKET = 0x3D, + MSG_CHAR_CARET = 0x3E, + MSG_CHAR_UNDERSCORE = 0x3F, + MSG_CHAR_BACKTICK = 0x40, + MSG_CHAR_LOWER_A = 0x41, + MSG_CHAR_LOWER_B = 0x42, + MSG_CHAR_LOWER_C = 0x43, + MSG_CHAR_LOWER_D = 0x44, + MSG_CHAR_LOWER_E = 0x45, + MSG_CHAR_LOWER_F = 0x46, + MSG_CHAR_LOWER_G = 0x47, + MSG_CHAR_LOWER_H = 0x48, + MSG_CHAR_LOWER_I = 0x49, + MSG_CHAR_LOWER_J = 0x4A, + MSG_CHAR_LOWER_K = 0x4B, + MSG_CHAR_LOWER_L = 0x4C, + MSG_CHAR_LOWER_M = 0x4D, + MSG_CHAR_LOWER_N = 0x4E, + MSG_CHAR_LOWER_O = 0x4F, + MSG_CHAR_LOWER_P = 0x50, + MSG_CHAR_LOWER_Q = 0x51, + MSG_CHAR_LOWER_R = 0x52, + MSG_CHAR_LOWER_S = 0x53, + MSG_CHAR_LOWER_T = 0x54, + MSG_CHAR_LOWER_U = 0x55, + MSG_CHAR_LOWER_V = 0x56, + MSG_CHAR_LOWER_W = 0x57, + MSG_CHAR_LOWER_X = 0x58, + MSG_CHAR_LOWER_Y = 0x59, + MSG_CHAR_LOWER_Z = 0x5A, + MSG_CHAR_LCURLY = 0x5B, + MSG_CHAR_PIPE = 0x5C, + MSG_CHAR_RCURLY = 0x5D, + MSG_CHAR_TILDA = 0x5E, + MSG_CHAR_DEGREE = 0x5F, + MSG_CHAR_UPPER_A_GRAVE = 0x60, + MSG_CHAR_UPPER_A_ACUTE = 0x61, + MSG_CHAR_UPPER_A_CIRCUMFLEX = 0x62, + MSG_CHAR_UPPER_A_UMLAUT = 0x63, + MSG_CHAR_UPPER_C_CEDILLA = 0x64, + MSG_CHAR_UPPER_E_GRAVE = 0x65, + MSG_CHAR_UPPER_E_ACUTE = 0x66, + MSG_CHAR_UPPER_E_CIRCUMFLEX = 0x67, + MSG_CHAR_UPPER_E_UMLAUT = 0x68, + MSG_CHAR_UPPER_I_GRAVE = 0x69, + MSG_CHAR_UPPER_I_ACUTE = 0x6A, + MSG_CHAR_UPPER_I_CIRCUMFLEX = 0x6B, + MSG_CHAR_UPPER_I_UMLAUT = 0x6C, + MSG_CHAR_UPPER_N_TILDE = 0x6D, + MSG_CHAR_UPPER_O_GRAVE = 0x6E, + MSG_CHAR_UPPER_O_ACUTE = 0x6F, + MSG_CHAR_UPPER_O_CIRCUMFLEX = 0x70, + MSG_CHAR_UPPER_O_UMLAUT = 0x71, + MSG_CHAR_UPPER_U_GRAVE = 0x72, + MSG_CHAR_UPPER_U_ACUTE = 0x73, + MSG_CHAR_UPPER_U_CIRCUMFLEX = 0x74, + MSG_CHAR_UPPER_U_UMLAUT = 0x75, + MSG_CHAR_SHARP_S = 0x76, + MSG_CHAR_LOWER_A_GRAVE = 0x77, + MSG_CHAR_LOWER_A_ACUTE = 0x78, + MSG_CHAR_LOWER_A_CIRCUMFLEX = 0x79, + MSG_CHAR_LOWER_A_UMLAUT = 0x7A, + MSG_CHAR_LOWER_C_CEDILLA = 0x7B, + MSG_CHAR_LOWER_E_GRAVE = 0x7C, + MSG_CHAR_LOWER_E_ACUTE = 0x7D, + MSG_CHAR_LOWER_E_CIRCUMFLEX = 0x7E, + MSG_CHAR_LOWER_E_UMLAUT = 0x7F, + MSG_CHAR_LOWER_I_GRAVE = 0x80, + MSG_CHAR_LOWER_I_ACUTE = 0x81, + MSG_CHAR_LOWER_I_CIRCUMFLEX = 0x82, + MSG_CHAR_LOWER_I_UMLAUT = 0x83, + MSG_CHAR_LOWER_N_TILDE = 0x84, + MSG_CHAR_LOWER_O_GRAVE = 0x85, + MSG_CHAR_LOWER_O_ACUTE = 0x86, + MSG_CHAR_LOWER_O_CIRCUMFLEX = 0x87, + MSG_CHAR_LOWER_O_UMLAUT = 0x88, + MSG_CHAR_LOWER_U_GRAVE = 0x89, + MSG_CHAR_LOWER_U_ACUTE = 0x8A, + MSG_CHAR_LOWER_U_CIRCUMFLEX = 0x8B, + MSG_CHAR_LOWER_U_UMLAUT = 0x8C, + MSG_CHAR_INVERTED_EXCLAMTION = 0x8D, + MSG_CHAR_INVERTED_QUESTION = 0x8E, + MSG_CHAR_FEM_ORDINAL = 0x8F, + MSG_CHAR_HEART = 0x90, + MSG_CHAR_STAR = 0x91, + MSG_CHAR_UP = 0x92, + MSG_CHAR_DOWN = 0x93, + MSG_CHAR_LEFT = 0x94, + MSG_CHAR_RIGHT = 0x95, + MSG_CHAR_CIRCLE = 0x96, + MSG_CHAR_CROSS = 0x97, + MSG_CHAR_BUTTON_A = 0x98, + MSG_CHAR_BUTTON_B = 0x99, + MSG_CHAR_BUTTON_L = 0x9A, + MSG_CHAR_BUTTON_R = 0x9B, + MSG_CHAR_BUTTON_Z = 0x9C, + MSG_CHAR_BUTTON_C_UP = 0x9D, + MSG_CHAR_BUTTON_C_DOWN = 0x9E, + MSG_CHAR_BUTTON_C_LEFT = 0x9F, + MSG_CHAR_BUTTON_C_RIGHT = 0xA0, + MSG_CHAR_BUTTON_START = 0xA1, + MSG_CHAR_DOUBLE_QUOTE_OPEN = 0xA2, + MSG_CHAR_DOUBLE_QUOTE_CLOSE = 0xA3, + MSG_CHAR_SINGLE_QUOTE_OPEN = 0xA4, + MSG_CHAR_SINGLE_QUOTE_CLOSE = 0xA5, + // 0xA6 to 0xEF are unused + + // special character codes used when reading from the source buffer + MSG_CHAR_READ_ENDL = 0xF0, + MSG_CHAR_READ_WAIT = 0xF1, + MSG_CHAR_READ_PAUSE = 0xF2, + MSG_CHAR_READ_VARIANT0 = 0xF3, + MSG_CHAR_READ_VARIANT1 = 0xF4, + MSG_CHAR_READ_VARIANT2 = 0xF5, + MSG_CHAR_READ_VARIANT3 = 0xF6, + MSG_CHAR_READ_SPACE = 0xF7, + MSG_CHAR_READ_FULL_SPACE = 0xF8, + MSG_CHAR_READ_HALF_SPACE = 0xF9, + MSG_CHAR_READ_UNK_CHAR_FA = 0xFA, + MSG_CHAR_READ_NEXT = 0xFB, + MSG_CHAR_READ_STYLE = 0xFC, + MSG_CHAR_READ_END = 0xFD, + // 0xFE unused + MSG_CHAR_READ_FUNCTION = 0xFF, + + // special character codes used when writing to the print buffer + MSG_CONTROL_CHAR = 0xF0, + MSG_CHAR_PRINT_ENDL = 0xF0, + MSG_CHAR_PRINT_VARIANT0 = 0xF1, + MSG_CHAR_PRINT_VARIANT1 = 0xF2, + MSG_CHAR_PRINT_VARIANT2 = 0xF3, + MSG_CHAR_PRINT_VARIANT3 = 0xF4, + MSG_CHAR_PRINT_SPACE = 0xF5, + MSG_CHAR_PRINT_FULL_SPACE = 0xF6, + MSG_CHAR_PRINT_HALF_SPACE = 0xF7, + MSG_CHAR_PRINT_STYLE = 0xF8, + MSG_CHAR_PRINT_UNK_CHAR_FA = 0xF9, + MSG_CHAR_PRINT_NEXT = 0xFA, + MSG_CHAR_PRINT_END = 0xFB, + // FC unused + // FD unused + // FE unused + MSG_CHAR_PRINT_FUNCTION = 0xFF +}; + +enum MsgFunctionCodes { + // function codes used when reading from the source buffer + MSG_READ_FUNC_FONT = 0x00, + MSG_READ_FUNC_VARIANT = 0x01, + MSG_READ_FUNC_SET_FRAME_PALETTE = 0x02, + MSG_READ_FUNC_RESET_GFX = 0x03, + MSG_READ_FUNC_YIELD = 0x04, + MSG_READ_FUNC_COLOR = 0x05, + MSG_READ_FUNC_NO_SKIP = 0x06, + MSG_READ_FUNC_INPUT_OFF = 0x07, + MSG_READ_FUNC_INPUT_ON = 0x08, + MSG_READ_FUNC_DELAY_OFF = 0x09, + MSG_READ_FUNC_DELAY_ON = 0x0A, + MSG_READ_FUNC_SPACING = 0x0B, + MSG_READ_FUNC_SCROLL = 0x0C, + MSG_READ_FUNC_SIZE = 0x0D, + MSG_READ_FUNC_SIZE_RESET = 0x0E, + MSG_READ_FUNC_SPEED = 0x0F, + MSG_READ_FUNC_SET_X = 0x10, + MSG_READ_FUNC_SET_Y = 0x11, + MSG_READ_FUNC_RIGHT = 0x12, + MSG_READ_FUNC_DOWN = 0x13, + MSG_READ_FUNC_UP = 0x14, + MSG_READ_FUNC_INLINE_IMAGE = 0x15, + MSG_READ_FUNC_ANIM_SPRITE = 0x16, + MSG_READ_FUNC_ITEM_ICON = 0x17, + MSG_READ_FUNC_IMAGE = 0x18, + MSG_READ_FUNC_HIDE_IMAGE = 0x19, + MSG_READ_FUNC_ANIM_DELAY = 0x1A, + MSG_READ_FUNC_ANIM_LOOP = 0x1B, + MSG_READ_FUNC_ANIM_DONE = 0x1C, + MSG_READ_FUNC_SET_CURSOR = 0x1D, + MSG_READ_FUNC_CURSOR = 0x1E, + MSG_READ_FUNC_END_CHOICE = 0x1F, + MSG_READ_FUNC_SET_CANCEL = 0x20, + MSG_READ_FUNC_OPTION = 0x21, + MSG_READ_FUNC_SAVE_POS = 0x22, + MSG_READ_FUNC_RESTORE_POS = 0x23, + MSG_READ_FUNC_SAVE_COLOR = 0x24, + MSG_READ_FUNC_RESTORE_COLOR = 0x25, + MSG_READ_FUNC_START_FX = 0x26, + MSG_READ_FUNC_END_FX = 0x27, + MSG_READ_FUNC_VAR = 0x28, + MSG_READ_FUNC_CENTER_X = 0x29, + MSG_READ_FUNC_SET_REWIND = 0x2A, + MSG_READ_FUNC_ENABLE_CDOWN_NEXT = 0x2B, + MSG_READ_FUNC_CUSTOM_VOICE = 0x2C, + MSG_READ_FUNC_VOLUME = 0x2E, + MSG_READ_FUNC_VOICE = 0x2F, + // function codes used when writing to the print buffer + MSG_PRINT_FUNC_FONT = 0x00, + MSG_PRINT_FUNC_VARIANT = 0x01, + MSG_PRINT_FUNC_SET_FRAME_PALETTE = 0x16, + MSG_PRINT_RESET_GFX = 0x17, + MSG_PRINT_FUNC_COLOR = 0x04, + MSG_PRINT_FUNC_SPACING = 0x05, + MSG_PRINT_FUNC_SCROLL = 0xFA, + MSG_PRINT_FUNC_SIZE = 0x06, + MSG_PRINT_FUNC_SIZE_RESET = 0x07, + MSG_PRINT_FUNC_SET_X = 0x08, + MSG_PRINT_FUNC_SET_Y = 0x09, + MSG_PRINT_FUNC_RIGHT = 0x0A, + MSG_PRINT_FUNC_DOWN = 0x0B, + MSG_PRINT_FUNC_UP = 0x0C, + MSG_PRINT_FUNC_INLINE_IMAGE = 0x0E, + MSG_PRINT_FUNC_ANIM_SPRITE = 0x0F, + MSG_PRINT_FUNC_ITEM_ICON = 0x10, + MSG_PRINT_FUNC_ANIM_DELAY = 0x11, + MSG_PRINT_FUNC_ANIM_LOOP = 0x12, + MSG_PRINT_FUNC_ANIM_DONE = 0x13, + MSG_PRINT_FUNC_CURSOR = 0x14, + MSG_PRINT_FUNC_OPTION = 0x15, + MSG_PRINT_FUNC_SAVE_POS = 0x18, + MSG_PRINT_FUNC_RESTORE_POS = 0x19, + MSG_PRINT_FUNC_SAVE_COLOR = 0x1A, + MSG_PRINT_FUNC_RESTORE_COLOR = 0x1B, + MSG_PRINT_FUNC_START_FX = 0x1C, + MSG_PRINT_FUNC_END_FX = 0x1D, + MSG_PRINT_FUNC_CENTER_X = 0x1E +}; + +enum MsgEffectCodes { + MSG_FX_SHAKE = 0x00, + MSG_FX_WAVE = 0x01, + MSG_FX_NOISE_OUTLINE = 0x02, + MSG_FX_STATIC = 0x03, + MSG_FX_BLUR = 0x05, + MSG_FX_RAINBOW = 0x06, + MSG_FX_DITHER_FADE = 0x07, + MSG_FX_GLOBAL_WAVE = 0x08, + MSG_FX_GLOBAL_RAINBOW = 0x09, + MSG_FX_RISE_PRINT = 0x0A, + MSG_FX_GROW_PRINT = 0x0B, + MSG_FX_SIZE_JITTER = 0x0C, + MSG_FX_SIZE_WAVE = 0x0D, + MSG_FX_DROP_SHADOW = 0x0E +}; + +enum MsgEffectFlags { + MSG_FX_FLAG_SHAKE = 0x00001, + MSG_FX_FLAG_WAVE = 0x00002, + MSG_FX_FLAG_NOISE_OUTLINE = 0x00004, + MSG_FX_FLAG_BLUR = 0x00020, + MSG_FX_FLAG_RAINBOW = 0x00040, + MSG_FX_FLAG_DITHER_FADE = 0x00080, + MSG_FX_FLAG_GLOBAL_WAVE = 0x00200, + MSG_FX_FLAG_GLOBAL_RAINBOW = 0x00400, + MSG_FX_FLAG_RISE_PRINT = 0x00800, + MSG_FX_FLAG_GROW_PRINT = 0x01000, + MSG_FX_FLAG_SIZE_JITTER = 0x02000, + MSG_FX_FLAG_SIZE_WAVE = 0x04000, + MSG_FX_FLAG_DROP_SHADOW = 0x08000, + MSG_FX_FLAG_STATIC = 0x10000 +}; + +enum MsgStyles { + MSG_STYLE_RIGHT = 0x01, + MSG_STYLE_LEFT = 0x02, + MSG_STYLE_CENTER = 0x03, + MSG_STYLE_TATTLE = 0x04, + MSG_STYLE_CHOICE = 0x05, + MSG_STYLE_INSPECT = 0x06, + MSG_STYLE_SIGN = 0x07, + MSG_STYLE_LAMPPOST = 0x08, + MSG_STYLE_POSTCARD = 0x09, + MSG_STYLE_POPUP = 0x0A, + MSG_STYLE_B = 0x0B, + MSG_STYLE_UPGRADE = 0x0C, + MSG_STYLE_NARRATE = 0x0D, + MSG_STYLE_EPILOGUE = 0x0E, + MSG_STYLE_F = 0x0F +}; + +enum MsgFonts { + MSG_FONT_NORMAL = 0, + MSG_FONT_MENU = 1, + MSG_FONT_TITLE = 3, + MSG_FONT_SUBTITLE = 4 +}; + +enum MsgVoices { + MSG_VOICE_NORMAL = 0, + MSG_VOICE_BOWSER = 1, + MSG_VOICE_STAR = 2 +}; + +enum MsgPrintModeFlags { + MSG_PRINT_FLAG_1 = 0x001, + MSG_PRINT_FLAG_2 = 0x002, + MSG_PRINT_FLAG_10 = 0x010, + MSG_PRINT_FLAG_20 = 0x020, + MSG_PRINT_FLAG_40 = 0x040, + MSG_PRINT_FLAG_80 = 0x080, + MSG_PRINT_FLAG_100 = 0x100, +}; + +enum MsgStateFlags { + MSG_STATE_FLAG_1 = 0x000001, + MSG_STATE_FLAG_2 = 0x000002, + MSG_STATE_FLAG_40 = 0x000040, + MSG_STATE_FLAG_4000 = 0x004000, + MSG_STATE_FLAG_8000 = 0x008000, + MSG_STATE_FLAG_10000 = 0x010000, + MSG_STATE_FLAG_20000 = 0x020000, + MSG_STATE_FLAG_800000 = 0x800000 +}; + +enum MsgDelayFlags { + MSG_DELAY_FLAG_1 = 0x000001, + MSG_DELAY_FLAG_2 = 0x000002, + MSG_DELAY_FLAG_4 = 0x000004, +}; + +enum MsgWindowStates { + MSG_WINDOW_STATE_DONE = 0x0, + MSG_WINDOW_STATE_INIT = 0x1, + MSG_WINDOW_STATE_OPENING = 0x2, + MSG_WINDOW_STATE_CLOSING = 0x3, + MSG_WINDOW_STATE_PRINTING = 0x4, + MSG_WINDOW_STATE_WAITING = 0x5, + MSG_WINDOW_STATE_SCROLLING = 0x6, + MSG_WINDOW_STATE_WAITING_FOR_CHOICE = 0x7, + MSG_WINDOW_STATE_SCROLLING_BACK = 0x8, + MSG_WINDOW_STATE_VIEWING_PREV = 0x9, + MSG_WINDOW_STATE_A = 0xA, + MSG_WINDOW_STATE_B = 0xB, + MSG_WINDOW_STATE_C = 0xC, + MSG_WINDOW_STATE_D = 0xD, + MSG_WINDOW_STATE_E = 0xE, +}; + #endif diff --git a/include/functions.h b/include/functions.h index e3dc7aaba6..9d26de8b8e 100644 --- a/include/functions.h +++ b/include/functions.h @@ -70,7 +70,7 @@ void exec_ShakeCamX(s32 arg0, s32 arg1, s32 arg2, f32 arg3); void exec_ShakeCam1(s32 arg0, s32 arg1, s32 arg2); f32 func_800E5348(void); -void draw_number(s32 value, s32 x, s32 y, s32 arg3, s32 palette, s32 opacity, s32 style); +void draw_number(s32 value, s32 x, s32 y, s32 variableWidthChars, s32 palette, s32 opacity, s32 style); void set_entity_model_render_command_list(s32 idx, u32* commandList); void set_entity_model_flags(s32 idx, s32 newFlags); @@ -203,8 +203,6 @@ s32 disable_player_input(void); void func_80027088(s32); void set_time_freeze_mode(s32); - - s32 get_map_IDs_by_name(const char* mapName, s16* areaID, s16* mapID); void get_dpad_input_radial(f32* angle, f32* magnitude); @@ -787,7 +785,7 @@ void func_800E9900(void); void show_coin_counter(void); s32 add_item(s32 itemID); s32 add_badge(s32 itemID); -void func_800E96C8(void); +void hide_coin_counter_immediately(void); void hide_popup_menu(void); void destroy_popup_menu(void); void func_800E98C4(void); diff --git a/include/npc.h b/include/npc.h index e76f0d79df..f45fc17570 100644 --- a/include/npc.h +++ b/include/npc.h @@ -261,7 +261,11 @@ typedef struct Enemy { /* 0x60 */ s32 defeatScriptID; /* 0x64 */ UNK_PTR unk_64; /* 0x68 */ char unk_68[4]; - /* 0x6C */ s32 varTable[16]; + /* 0x6C */ union { + /* */ s32 varTable[16]; + /* */ f32 varTableF[16]; + /* */ void* varTablePtr[16]; + /* */ }; /* 0xAC */ u8 unk_AC; /* 0xAD */ char unk_AD[3]; /* 0xB0 */ s32 unk_B0; diff --git a/include/script_api/battle.h b/include/script_api/battle.h index 8bfb128df9..da63607015 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -327,7 +327,7 @@ ApiStatus func_8026ED20(Evt* script, s32 isInitialCall); ApiStatus func_8026EBF8(Evt* script, s32 isInitialCall); ApiStatus SetupMashMeter(Evt* script, s32 isInitialCall); ApiStatus SetActionResult(Evt* script, s32 isInitialCall); -ApiStatus func_8024EB84(Evt* script, s32 isInitialCall); +ApiStatus BattleCamTargetActorPart(Evt* script, s32 isInitialCall); extern EvtScript PlayerScriptDispatcher; extern EvtScript PeachScriptDispatcher; diff --git a/src/1776B0.c b/src/1776B0.c index 804d8b22d3..5eb77cf937 100644 --- a/src/1776B0.c +++ b/src/1776B0.c @@ -2,36 +2,36 @@ #include "script_api/battle.h" // battle cam -extern f32 D_8029F270; // pos x -extern f32 D_8029F274; // pos y -extern f32 D_8029F278; // pos z -extern s16 D_8029F27C; // actor ID -extern s16 D_8029F27E; -extern s16 D_8029F280; // radial distance from target -extern s16 D_8029F282; // yaw -extern s16 D_8029F284; // pitch -extern s16 D_8029F286; +extern f32 BattleCam_PosX; +extern f32 BattleCam_PosY; +extern f32 BattleCam_PosZ; +extern s16 BattleCam_TargetActor; +extern s16 BattleCam_TargetActorPart; +extern s16 BattleCam_BoomLength; +extern s16 BattleCam_BoomYaw; +extern s16 BattleCam_BoomPitch; +extern s16 BattleCam_BoomZOffset; extern f32 D_8029F288; -extern f32 D_8029F28C; -extern f32 D_8029F290; -extern f32 D_8029F294; -extern f32 D_8029F298; -extern s8 D_8029F29C; -extern s16 D_8029F29E; -extern s16 D_8029F2A0; +extern f32 BattleCam_TargetBoomLength; +extern f32 BattleCam_TargetBoomYaw; +extern f32 BattleCam_TargetBoomPitch; +extern f32 BattleCam_TargetBoomZOffset; +extern s8 BattleCam_DoneMoving; +extern s16 BattleCam_MoveTimeLeft; +extern s16 BattleCam_MoveTimeTotal; extern s8 D_8029F2A2; extern s8 D_8029F2A3; extern s8 D_8029F2A4; -extern s8 D_8029F2A5; +extern s8 BattleCam_UseLinearInterp; extern s8 D_8029F2A6; extern s8 D_8029F2A7; -extern f32 D_8029F2A8; -extern f32 D_8029F2AC; -extern f32 D_8029F2B0; -extern EvtScript* D_8029F2B4; +extern f32 BattleCam_TargetPosX; +extern f32 BattleCam_TargetPosY; +extern f32 BattleCam_TargetPosZ; +extern EvtScript* BattleCam_ControlScript; -s8 D_80280CE0 = 0; -s32 D_80280CE4 = -1; +s8 BattleCam_IsFrozen = FALSE; +s32 BattleCam_CurrentPresetID = -1; EvtScript CamPreset_B = { EVT_CALL(func_80248DD0) @@ -137,7 +137,7 @@ EvtScript D_80280EB8 = { }; ApiStatus func_80248DD0(Evt* script, s32 isInitialCall) { - D_8029F29C = 1; + BattleCam_DoneMoving = TRUE; return ApiStatus_BLOCK; } @@ -153,47 +153,46 @@ INCLUDE_ASM(s32, "1776B0", func_8024AFE4); ApiStatus func_8024B5FC(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_BATTLE]; + f32 alpha, oneMinusAlpha; f32 x, y, z; - f32 invAngle; - f32 angle; - x = D_8029F270; - y = D_8029F274; - z = D_8029F278; + x = BattleCam_PosX; + y = BattleCam_PosY; + z = BattleCam_PosZ; if (isInitialCall) { - D_8029F28C = camera->unk_1E; - D_8029F294 = camera->unk_22; - D_8029F290 = camera->unk_24; - D_8029F298 = camera->unk_26 / 256; - D_8029F2A8 = camera->unk_54; - D_8029F2AC = camera->unk_58; - D_8029F2B0 = camera->unk_5C; - D_8029F2A0 = D_8029F29E; + BattleCam_TargetBoomLength = camera->auxBoomLength; + BattleCam_TargetBoomPitch = camera->auxBoomPitch; + BattleCam_TargetBoomYaw = camera->auxBoomYaw; + BattleCam_TargetBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_TargetPosX = camera->auxPos.x; + BattleCam_TargetPosY = camera->auxPos.y; + BattleCam_TargetPosZ = camera->auxPos.z; + BattleCam_MoveTimeTotal = BattleCam_MoveTimeLeft; } - if (D_8029F2A5 == 0) { - angle = D_8029F29E; - angle /= D_8029F2A0; - angle = 1.0f - sin_rad(sin_rad(sin_rad((1.0f - angle) * PI_S / 2) * PI_S / 2) * PI_S / 2); + if (!BattleCam_UseLinearInterp) { + alpha = BattleCam_MoveTimeLeft; + alpha /= BattleCam_MoveTimeTotal; + alpha = 1.0f - sin_rad(sin_rad(sin_rad((1.0f - alpha) * PI_S / 2) * PI_S / 2) * PI_S / 2); } else { - angle = D_8029F29E; - angle /= D_8029F2A0; + alpha = BattleCam_MoveTimeLeft; + alpha /= BattleCam_MoveTimeTotal; } - invAngle = 1.0f - angle; - camera->unk_54 = (D_8029F2A8 * angle) + (x * invAngle); - camera->unk_58 = (D_8029F2AC * angle) + (y * invAngle); - camera->unk_5C = (D_8029F2B0 * angle) + (z * invAngle); - camera->unk_26 = ((D_8029F298 * angle) + (D_8029F286 * invAngle)) * 256.0f; - camera->unk_1E = (D_8029F28C * angle) + (D_8029F280 * invAngle); - camera->unk_24 = (D_8029F290 * angle) + (D_8029F282 * invAngle); - camera->unk_22 = (D_8029F294 * angle) + (D_8029F284 * invAngle); + oneMinusAlpha = 1.0f - alpha; + camera->auxPos.x = (BattleCam_TargetPosX * alpha) + (x * oneMinusAlpha); + camera->auxPos.y = (BattleCam_TargetPosY * alpha) + (y * oneMinusAlpha); + camera->auxPos.z = (BattleCam_TargetPosZ * alpha) + (z * oneMinusAlpha); + camera->auxBoomZOffset = ((BattleCam_TargetBoomZOffset * alpha) + (BattleCam_BoomZOffset * oneMinusAlpha)) * 256.0f; + camera->auxBoomLength = (BattleCam_TargetBoomLength * alpha) + (BattleCam_BoomLength * oneMinusAlpha); + camera->auxBoomYaw = (BattleCam_TargetBoomYaw * alpha) + (BattleCam_BoomYaw * oneMinusAlpha); + camera->auxBoomPitch = (BattleCam_TargetBoomPitch * alpha) + (BattleCam_BoomPitch * oneMinusAlpha); - if (D_8029F29E == 0) { - D_8029F29C = 1; + if (BattleCam_MoveTimeLeft == 0) { + BattleCam_DoneMoving = TRUE; } else { - D_8029F29E--; + BattleCam_MoveTimeLeft--; } return ApiStatus_BLOCK; @@ -201,62 +200,61 @@ ApiStatus func_8024B5FC(Evt* script, s32 isInitialCall) { ApiStatus func_8024B9A0(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_BATTLE]; + f32 alpha, oneMinusAlpha; f32 x, y, z; - f32 invAngle; - f32 angle; if (isInitialCall) { - D_8029F270 = 0.0f; - D_8029F278 = 0.0f; - D_8029F282 = 0; - D_8029F284 = 8; - D_8029F286 = 0; - D_8029F274 = 60.0f; - if (D_8029F2A4 != 0) { - camera->unk_58 = 60.0f; - camera->unk_26 = 0; - camera->unk_24 = 0; - camera->unk_22 = 8; - camera->unk_54 = D_8029F270; - camera->unk_5C = D_8029F270; - camera->unk_1E = D_8029F280; + BattleCam_PosX = 0.0f; + BattleCam_PosZ = 0.0f; + BattleCam_BoomYaw = 0; + BattleCam_BoomPitch = 8; + BattleCam_BoomZOffset = 0; + BattleCam_PosY = 60.0f; + if (D_8029F2A4) { + camera->auxPos.y = 60.0f; + camera->auxBoomZOffset = 0; + camera->auxBoomYaw = 0; + camera->auxBoomPitch = 8; + camera->auxPos.x = BattleCam_PosX; + camera->auxPos.z = BattleCam_PosX; + camera->auxBoomLength = BattleCam_BoomLength; } - D_8029F28C = camera->unk_1E; - D_8029F294 = camera->unk_22; - D_8029F290 = camera->unk_24; - D_8029F298 = camera->unk_26 / 256; - D_8029F2A8 = camera->unk_54; - D_8029F2AC = camera->unk_58; - D_8029F2B0 = camera->unk_5C; - D_8029F2A0 = D_8029F29E; + BattleCam_TargetBoomLength = camera->auxBoomLength; + BattleCam_TargetBoomPitch = camera->auxBoomPitch; + BattleCam_TargetBoomYaw = camera->auxBoomYaw; + BattleCam_TargetBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_TargetPosX = camera->auxPos.x; + BattleCam_TargetPosY = camera->auxPos.y; + BattleCam_TargetPosZ = camera->auxPos.z; + BattleCam_MoveTimeTotal = BattleCam_MoveTimeLeft; } - x = D_8029F270; - y = D_8029F274; - z = D_8029F278; + x = BattleCam_PosX; + y = BattleCam_PosY; + z = BattleCam_PosZ; - if (D_8029F2A5 == 0) { - angle = D_8029F29E; - angle /= D_8029F2A0; - angle = 1.0f - sin_rad(sin_rad((1.0f - angle) * PI_S / 2) * PI_S / 2); + if (!BattleCam_UseLinearInterp) { + alpha = BattleCam_MoveTimeLeft; + alpha /= BattleCam_MoveTimeTotal; + alpha = 1.0f - sin_rad(sin_rad((1.0f - alpha) * PI_S / 2) * PI_S / 2); } else { - angle = D_8029F29E; - angle /= D_8029F2A0; + alpha = BattleCam_MoveTimeLeft; + alpha /= BattleCam_MoveTimeTotal; } - invAngle = 1.0f - angle; - camera->unk_54 = (D_8029F2A8 * angle) + (x * invAngle); - camera->unk_58 = (D_8029F2AC * angle) + (y * invAngle); - camera->unk_5C = (D_8029F2B0 * angle) + (z * invAngle); - camera->unk_26 = ((D_8029F298 * angle) + (D_8029F286 * invAngle)) * 256.0f; - camera->unk_1E = (D_8029F28C * angle) + (D_8029F280 * invAngle); - camera->unk_24 = (D_8029F290 * angle) + (D_8029F282 * invAngle); - camera->unk_22 = (D_8029F294 * angle) + (D_8029F284 * invAngle); + oneMinusAlpha = 1.0f - alpha; + camera->auxPos.x = (BattleCam_TargetPosX * alpha) + (x * oneMinusAlpha); + camera->auxPos.y = (BattleCam_TargetPosY * alpha) + (y * oneMinusAlpha); + camera->auxPos.z = (BattleCam_TargetPosZ * alpha) + (z * oneMinusAlpha); + camera->auxBoomZOffset = ((BattleCam_TargetBoomZOffset * alpha) + (BattleCam_BoomZOffset * oneMinusAlpha)) * 256.0f; + camera->auxBoomLength = (BattleCam_TargetBoomLength * alpha) + (BattleCam_BoomLength * oneMinusAlpha); + camera->auxBoomYaw = (BattleCam_TargetBoomYaw * alpha) + (BattleCam_BoomYaw * oneMinusAlpha); + camera->auxBoomPitch = (BattleCam_TargetBoomPitch * alpha) + (BattleCam_BoomPitch * oneMinusAlpha); - if (D_8029F29E == 0) { - D_8029F29C = 1; + if (BattleCam_MoveTimeLeft == 0) { + BattleCam_DoneMoving = TRUE; } else { - D_8029F29E--; + BattleCam_MoveTimeLeft--; } return ApiStatus_BLOCK; @@ -264,52 +262,51 @@ ApiStatus func_8024B9A0(Evt* script, s32 isInitialCall) { ApiStatus func_8024BDA4(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_BATTLE]; + f32 alpha, oneMinusAlpha; f32 x, y, z; - f32 invAngle; - f32 angle; if (isInitialCall) { - D_8029F284 = 8; - D_8029F270 = 35.0f; - D_8029F278 = 0.0f; - D_8029F282 = 0; - D_8029F274 = 60.0f; - D_8029F28C = camera->unk_1E; - D_8029F294 = camera->unk_22; - D_8029F290 = camera->unk_24; - D_8029F298 = camera->unk_26 / 256; - D_8029F2A8 = camera->unk_54; - D_8029F2AC = camera->unk_58; - D_8029F2B0 = camera->unk_5C; - D_8029F2A0 = D_8029F29E; + BattleCam_BoomPitch = 8; + BattleCam_PosX = 35.0f; + BattleCam_PosZ = 0.0f; + BattleCam_BoomYaw = 0; + BattleCam_PosY = 60.0f; + BattleCam_TargetBoomLength = camera->auxBoomLength; + BattleCam_TargetBoomPitch = camera->auxBoomPitch; + BattleCam_TargetBoomYaw = camera->auxBoomYaw; + BattleCam_TargetBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_TargetPosX = camera->auxPos.x; + BattleCam_TargetPosY = camera->auxPos.y; + BattleCam_TargetPosZ = camera->auxPos.z; + BattleCam_MoveTimeTotal = BattleCam_MoveTimeLeft; } - x = D_8029F270; - y = D_8029F274; - z = D_8029F278; + x = BattleCam_PosX; + y = BattleCam_PosY; + z = BattleCam_PosZ; - if (D_8029F2A5 == 0) { - angle = D_8029F29E; - angle /= D_8029F2A0; - angle = 1.0f - sin_rad(sin_rad(sin_rad((1.0f - angle) * PI_S / 2) * PI_S / 2) * PI_S / 2); + if (!BattleCam_UseLinearInterp) { + alpha = BattleCam_MoveTimeLeft; + alpha /= BattleCam_MoveTimeTotal; + alpha = 1.0f - sin_rad(sin_rad(sin_rad((1.0f - alpha) * PI_S / 2) * PI_S / 2) * PI_S / 2); } else { - angle = D_8029F29E; - angle /= D_8029F2A0; + alpha = BattleCam_MoveTimeLeft; + alpha /= BattleCam_MoveTimeTotal; } - invAngle = 1.0f - angle; - camera->unk_54 = (D_8029F2A8 * angle) + (x * invAngle); - camera->unk_58 = (D_8029F2AC * angle) + (y * invAngle); - camera->unk_5C = (D_8029F2B0 * angle) + (z * invAngle); - camera->unk_26 = ((D_8029F298 * angle) + (D_8029F286 * invAngle)) * 256.0f; - camera->unk_1E = (D_8029F28C * angle) + (D_8029F280 * invAngle); - camera->unk_24 = (D_8029F290 * angle) + (D_8029F282 * invAngle); - camera->unk_22 = (D_8029F294 * angle) + (D_8029F284 * invAngle); + oneMinusAlpha = 1.0f - alpha; + camera->auxPos.x = (BattleCam_TargetPosX * alpha) + (x * oneMinusAlpha); + camera->auxPos.y = (BattleCam_TargetPosY * alpha) + (y * oneMinusAlpha); + camera->auxPos.z = (BattleCam_TargetPosZ * alpha) + (z * oneMinusAlpha); + camera->auxBoomZOffset = ((BattleCam_TargetBoomZOffset * alpha) + (BattleCam_BoomZOffset * oneMinusAlpha)) * 256.0f; + camera->auxBoomLength = (BattleCam_TargetBoomLength * alpha) + (BattleCam_BoomLength * oneMinusAlpha); + camera->auxBoomYaw = (BattleCam_TargetBoomYaw * alpha) + (BattleCam_BoomYaw * oneMinusAlpha); + camera->auxBoomPitch = (BattleCam_TargetBoomPitch * alpha) + (BattleCam_BoomPitch * oneMinusAlpha); - if (D_8029F29E == 0) { - D_8029F29C = 1; + if (BattleCam_MoveTimeLeft == 0) { + BattleCam_DoneMoving = TRUE; } else { - D_8029F29E--; + BattleCam_MoveTimeLeft--; } return ApiStatus_BLOCK; @@ -317,55 +314,54 @@ ApiStatus func_8024BDA4(Evt* script, s32 isInitialCall) { ApiStatus func_8024C180(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_BATTLE]; + f32 alpha, oneMinusAlpha; f32 x, y, z; - f32 invAngle; - f32 angle; if (isInitialCall) { - D_8029F270 = 35.0f; - D_8029F274 = camera->unk_58; - if (D_8029F274 < 60.0f) { - D_8029F274 = 60.0f; + BattleCam_PosX = 35.0f; + BattleCam_PosY = camera->auxPos.y; + if (BattleCam_PosY < 60.0f) { + BattleCam_PosY = 60.0f; } - D_8029F284 = 8; - D_8029F278 = 0.0f; - D_8029F282 = 0; - D_8029F28C = camera->unk_1E; - D_8029F294 = camera->unk_22; - D_8029F290 = camera->unk_24; - D_8029F298 = camera->unk_26 / 256; - D_8029F2A8 = camera->unk_54; - D_8029F2AC = camera->unk_58; - D_8029F2B0 = camera->unk_5C; - D_8029F2A0 = D_8029F29E; + BattleCam_BoomPitch = 8; + BattleCam_PosZ = 0.0f; + BattleCam_BoomYaw = 0; + BattleCam_TargetBoomLength = camera->auxBoomLength; + BattleCam_TargetBoomPitch = camera->auxBoomPitch; + BattleCam_TargetBoomYaw = camera->auxBoomYaw; + BattleCam_TargetBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_TargetPosX = camera->auxPos.x; + BattleCam_TargetPosY = camera->auxPos.y; + BattleCam_TargetPosZ = camera->auxPos.z; + BattleCam_MoveTimeTotal = BattleCam_MoveTimeLeft; } - x = D_8029F270; - y = D_8029F274; - z = D_8029F278; + x = BattleCam_PosX; + y = BattleCam_PosY; + z = BattleCam_PosZ; - if (D_8029F2A5 == 0) { - angle = D_8029F29E; - angle /= D_8029F2A0; - angle = 1.0f - sin_rad(sin_rad(sin_rad((1.0f - angle) * PI_S / 2) * PI_S / 2) * PI_S / 2); + if (!BattleCam_UseLinearInterp) { + alpha = BattleCam_MoveTimeLeft; + alpha /= BattleCam_MoveTimeTotal; + alpha = 1.0f - sin_rad(sin_rad(sin_rad((1.0f - alpha) * PI_S / 2) * PI_S / 2) * PI_S / 2); } else { - angle = D_8029F29E; - angle /= D_8029F2A0; + alpha = BattleCam_MoveTimeLeft; + alpha /= BattleCam_MoveTimeTotal; } - invAngle = 1.0f - angle; - camera->unk_54 = (D_8029F2A8 * angle) + (x * invAngle); - camera->unk_58 = (D_8029F2AC * angle) + (y * invAngle); - camera->unk_5C = (D_8029F2B0 * angle) + (z * invAngle); - camera->unk_26 = ((D_8029F298 * angle) + (D_8029F286 * invAngle)) * 256.0f; - camera->unk_1E = (D_8029F28C * angle) + (D_8029F280 * invAngle); - camera->unk_24 = (D_8029F290 * angle) + (D_8029F282 * invAngle); - camera->unk_22 = (D_8029F294 * angle) + (D_8029F284 * invAngle); + oneMinusAlpha = 1.0f - alpha; + camera->auxPos.x = (BattleCam_TargetPosX * alpha) + (x * oneMinusAlpha); + camera->auxPos.y = (BattleCam_TargetPosY * alpha) + (y * oneMinusAlpha); + camera->auxPos.z = (BattleCam_TargetPosZ * alpha) + (z * oneMinusAlpha); + camera->auxBoomZOffset = ((BattleCam_TargetBoomZOffset * alpha) + (BattleCam_BoomZOffset * oneMinusAlpha)) * 256.0f; + camera->auxBoomLength = (BattleCam_TargetBoomLength * alpha) + (BattleCam_BoomLength * oneMinusAlpha); + camera->auxBoomYaw = (BattleCam_TargetBoomYaw * alpha) + (BattleCam_BoomYaw * oneMinusAlpha); + camera->auxBoomPitch = (BattleCam_TargetBoomPitch * alpha) + (BattleCam_BoomPitch * oneMinusAlpha); - if (D_8029F29E == 0) { - D_8029F29C = 1; + if (BattleCam_MoveTimeLeft == 0) { + BattleCam_DoneMoving = TRUE; } else { - D_8029F29E--; + BattleCam_MoveTimeLeft--; } return ApiStatus_BLOCK; @@ -373,52 +369,51 @@ ApiStatus func_8024C180(Evt* script, s32 isInitialCall) { ApiStatus func_8024C570(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_BATTLE]; + f32 alpha, oneMinusAlpha; f32 x, y, z; - f32 invAngle; - f32 angle; if (isInitialCall) { - if (D_8029F2A4 != 0) { - D_8029F270 = camera->unk_54; - D_8029F274 = camera->unk_58; - D_8029F278 = camera->unk_5C; + if (D_8029F2A4) { + BattleCam_PosX = camera->auxPos.x; + BattleCam_PosY = camera->auxPos.y; + BattleCam_PosZ = camera->auxPos.z; } - D_8029F28C = camera->unk_1E; - D_8029F294 = camera->unk_22; - D_8029F290 = camera->unk_24; - D_8029F298 = camera->unk_26 / 256; - D_8029F2A8 = camera->unk_54; - D_8029F2AC = camera->unk_58; - D_8029F2B0 = camera->unk_5C; - D_8029F2A0 = D_8029F29E; + BattleCam_TargetBoomLength = camera->auxBoomLength; + BattleCam_TargetBoomPitch = camera->auxBoomPitch; + BattleCam_TargetBoomYaw = camera->auxBoomYaw; + BattleCam_TargetBoomZOffset = camera->auxBoomZOffset / 256; + BattleCam_TargetPosX = camera->auxPos.x; + BattleCam_TargetPosY = camera->auxPos.y; + BattleCam_TargetPosZ = camera->auxPos.z; + BattleCam_MoveTimeTotal = BattleCam_MoveTimeLeft; } - x = D_8029F270; - y = D_8029F274; - z = D_8029F278; + x = BattleCam_PosX; + y = BattleCam_PosY; + z = BattleCam_PosZ; - if (D_8029F2A5 == 0) { - angle = D_8029F29E; - angle /= D_8029F2A0; - angle = 1.0f - sin_rad(sin_rad(sin_rad((1.0f - angle) * PI_S / 2) * PI_S / 2) * PI_S / 2); + if (!BattleCam_UseLinearInterp) { + alpha = BattleCam_MoveTimeLeft; + alpha /= BattleCam_MoveTimeTotal; + alpha = 1.0f - sin_rad(sin_rad(sin_rad((1.0f - alpha) * PI_S / 2) * PI_S / 2) * PI_S / 2); } else { - angle = D_8029F29E; - angle /= D_8029F2A0; + alpha = BattleCam_MoveTimeLeft; + alpha /= BattleCam_MoveTimeTotal; } - invAngle = 1.0f - angle; - camera->unk_54 = (D_8029F2A8 * angle) + (x * invAngle); - camera->unk_58 = (D_8029F2AC * angle) + (y * invAngle); - camera->unk_5C = (D_8029F2B0 * angle) + (z * invAngle); - camera->unk_26 = ((D_8029F298 * angle) + (D_8029F286 * invAngle)) * 256.0f; - camera->unk_1E = (D_8029F28C * angle) + (D_8029F280 * invAngle); - camera->unk_24 = (D_8029F290 * angle) + (D_8029F282 * invAngle); - camera->unk_22 = (D_8029F294 * angle) + (D_8029F284 * invAngle); + oneMinusAlpha = 1.0f - alpha; + camera->auxPos.x = (BattleCam_TargetPosX * alpha) + (x * oneMinusAlpha); + camera->auxPos.y = (BattleCam_TargetPosY * alpha) + (y * oneMinusAlpha); + camera->auxPos.z = (BattleCam_TargetPosZ * alpha) + (z * oneMinusAlpha); + camera->auxBoomZOffset = ((BattleCam_TargetBoomZOffset * alpha) + (BattleCam_BoomZOffset * oneMinusAlpha)) * 256.0f; + camera->auxBoomLength = (BattleCam_TargetBoomLength * alpha) + (BattleCam_BoomLength * oneMinusAlpha); + camera->auxBoomYaw = (BattleCam_TargetBoomYaw * alpha) + (BattleCam_BoomYaw * oneMinusAlpha); + camera->auxBoomPitch = (BattleCam_TargetBoomPitch * alpha) + (BattleCam_BoomPitch * oneMinusAlpha); - if (D_8029F29E == 0) { - D_8029F29C = 1; + if (BattleCam_MoveTimeLeft == 0) { + BattleCam_DoneMoving = TRUE; } else { - D_8029F29E--; + BattleCam_MoveTimeLeft--; } return ApiStatus_BLOCK; @@ -435,17 +430,17 @@ ApiStatus func_8024C944(Evt* script, s32 isInitialCall) { s32 actorClass; if (isInitialCall) { - D_8029F270 = camera->unk_54; - D_8029F274 = camera->unk_58; - D_8029F278 = camera->unk_5C; - D_8029F288 = camera->unk_1E; - D_8029F290 = camera->unk_24; - D_8029F294 = camera->unk_22; + BattleCam_PosX = camera->auxPos.x; + BattleCam_PosY = camera->auxPos.y; + BattleCam_PosZ = camera->auxPos.z; + D_8029F288 = camera->auxBoomLength; + BattleCam_TargetBoomYaw = camera->auxBoomYaw; + BattleCam_TargetBoomPitch = camera->auxBoomPitch; } y = 0.0f; - actorClass = D_8029F27C & ACTOR_CLASS_MASK; - actorID = D_8029F27C & 0xFF; + actorClass = BattleCam_TargetActor & ACTOR_CLASS_MASK; + actorID = BattleCam_TargetActor & 0xFF; switch (actorClass) { case ACTOR_CLASS_PLAYER: @@ -468,23 +463,23 @@ ApiStatus func_8024C944(Evt* script, s32 isInitialCall) { break; } - get_screen_coords(1, D_8029F270, y, D_8029F278, &screenX, &screenY, &screenZ); + get_screen_coords(1, BattleCam_PosX, y, BattleCam_PosZ, &screenX, &screenY, &screenZ); if (screenY < 100) { y += 25.0f; } - if (y < D_8029F274) { - y = D_8029F274; + if (y < BattleCam_PosY) { + y = BattleCam_PosY; } - deltaY = y - camera->unk_58; + deltaY = y - camera->auxPos.y; if (fabsf(deltaY) < 0.01) { if (deltaY != 0.0f) { - camera->unk_58 = y; + camera->auxPos.y = y; } } else { - camera->unk_58 += deltaY / 5.0f; + camera->auxPos.y += deltaY / 5.0f; } return ApiStatus_BLOCK; @@ -494,8 +489,8 @@ ApiStatus func_8024CB68(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_BATTLE]; BattleStatus* battleStatus = &gBattleStatus; PlayerStatus* playerStatus = &gPlayerStatus; - s32 actorClass = D_8029F27C & ACTOR_CLASS_MASK; - s32 actorID = D_8029F27C & 0xFF; + s32 actorClass = BattleCam_TargetActor & ACTOR_CLASS_MASK; + s32 actorID = BattleCam_TargetActor & 0xFF; f32 x, y, z; s32 screenX, screenY, screenZ; f32 temp; @@ -529,12 +524,12 @@ ApiStatus func_8024CB68(Evt* script, s32 isInitialCall) { } if (isInitialCall) { - D_8029F270 = camera->unk_54; - D_8029F274 = camera->unk_58; - D_8029F278 = camera->unk_5C; - D_8029F288 = camera->unk_1E; - D_8029F290 = camera->unk_24; - D_8029F294 = camera->unk_22; + BattleCam_PosX = camera->auxPos.x; + BattleCam_PosY = camera->auxPos.y; + BattleCam_PosZ = camera->auxPos.z; + D_8029F288 = camera->auxBoomLength; + BattleCam_TargetBoomYaw = camera->auxBoomYaw; + BattleCam_TargetBoomPitch = camera->auxBoomPitch; } get_screen_coords(1, x, y, z, &screenX, &screenY, &screenZ); @@ -542,45 +537,45 @@ ApiStatus func_8024CB68(Evt* script, s32 isInitialCall) { if (screenY < 100) { y += 25.0f; } - if (y < D_8029F274) { - y = D_8029F274; + if (y < BattleCam_PosY) { + y = BattleCam_PosY; } if (screenX < 100) { x -= 25.0f; } - if (x < D_8029F270) { - x = D_8029F270; + if (x < BattleCam_PosX) { + x = BattleCam_PosX; } if (screenX > 220) { x += 25.0f; } - temp = x - camera->unk_54; + temp = x - camera->auxPos.x; if (fabsf(temp) < 0.01) { if (temp != 0.0f) { - camera->unk_54 = x; + camera->auxPos.x = x; } } else { - camera->unk_54 += temp / 5.0f; + camera->auxPos.x += temp / 5.0f; } - temp = y - camera->unk_58; + temp = y - camera->auxPos.y; if (fabsf(temp) < 0.01) { if (temp != 0.0f) { - camera->unk_58 = y; + camera->auxPos.y = y; } } else { - camera->unk_58 += temp / 5.0f; + camera->auxPos.y += temp / 5.0f; } - temp = z - camera->unk_5C; + temp = z - camera->auxPos.z; if (fabsf(temp) < 0.01) { if (temp != 0.0f) { - camera->unk_5C = z; + camera->auxPos.z = z; } } else { - camera->unk_5C += temp / 5.0f; + camera->auxPos.z += temp / 5.0f; } return ApiStatus_BLOCK; @@ -589,15 +584,15 @@ ApiStatus func_8024CB68(Evt* script, s32 isInitialCall) { ApiStatus func_8024CE9C(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_BATTLE]; - D_8029F284 = 8; - camera->unk_24 = 0; - camera->unk_26 = 0; - D_8029F282 = D_8029F286 = 0; - D_80280CE0 = 0; + BattleCam_BoomPitch = 8; + camera->auxBoomYaw = 0; + camera->auxBoomZOffset = 0; + BattleCam_BoomYaw = BattleCam_BoomZOffset = 0; + BattleCam_IsFrozen = FALSE; D_8029F288 = camera->unk_1C; - D_8029F28C = camera->unk_1E; - D_8029F294 = camera->unk_22; - D_8029F298 = D_8029F290 = 0.0f; + BattleCam_TargetBoomLength = camera->auxBoomLength; + BattleCam_TargetBoomPitch = camera->auxBoomPitch; + BattleCam_TargetBoomZOffset = BattleCam_TargetBoomYaw = 0.0f; return ApiStatus_DONE2; } @@ -606,11 +601,11 @@ void btl_cam_use_preset(s32 id) { EvtScript* preset = NULL; Evt* newScript; - if (D_80280CE0 == 0) { + if (!BattleCam_IsFrozen) { D_8029F2A6 = 1; D_8029F2A2 = 0; D_8029F2A3 = 0; - D_8029F2A5 = 0; + BattleCam_UseLinearInterp = 0; D_8029F2A7 = 0; switch (id) { @@ -621,758 +616,758 @@ void btl_cam_use_preset(s32 id) { preset = &CamPreset_B; break; case BTL_CAM_PRESET_C: - if (D_80280CE4 != id) { - D_8029F280 = 500; - D_8029F29E = 30; + if (BattleCam_CurrentPresetID != id) { + BattleCam_BoomLength = 500; + BattleCam_MoveTimeLeft = 30; preset = &CamPreset_C; break; } return; case BTL_CAM_PRESET_D: - if (D_80280CE4 != id) { - D_8029F280 = 480; + if (BattleCam_CurrentPresetID != id) { + BattleCam_BoomLength = 480; preset = &CamPreset_D; - D_8029F29E = 20; - D_8029F286 = 0; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 0; break; } return; case BTL_CAM_PRESET_E: - if (D_80280CE4 != id) { - D_8029F280 = 500; + if (BattleCam_CurrentPresetID != id) { + BattleCam_BoomLength = 500; preset = &CamPreset_E; - D_8029F29E = 10; - D_8029F286 = 0; + BattleCam_MoveTimeLeft = 10; + BattleCam_BoomZOffset = 0; break; } return; case BTL_CAM_PRESET_F: - D_8029F280 = 300; - D_8029F29E = 20; + BattleCam_BoomLength = 300; + BattleCam_MoveTimeLeft = 20; preset = &CamPreset_F; D_8029F2A2 = 1; D_8029F2A3 = 1; break; case BTL_CAM_PRESET_G: - D_8029F280 = 300; - D_8029F29E = 20; + BattleCam_BoomLength = 300; + BattleCam_MoveTimeLeft = 20; preset = &CamPreset_G; D_8029F2A2 = 1; D_8029F2A3 = 1; break; case BTL_CAM_PRESET_H: - D_8029F280 = 300; - D_8029F29E = 20; + BattleCam_BoomLength = 300; + BattleCam_MoveTimeLeft = 20; preset = &CamPreset_H; break; case BTL_CAM_PRESET_I: - D_8029F280 = 300; - D_8029F29E = 20; + BattleCam_BoomLength = 300; + BattleCam_MoveTimeLeft = 20; preset = &CamPreset_I; D_8029F2A2 = 1; D_8029F2A3 = 1; break; case BTL_CAM_PRESET_9: - if (D_8029F2B4 != &CamPreset_C) { - D_8029F280 = 500; - D_8029F29E = 120; + if (BattleCam_ControlScript != &CamPreset_C) { + BattleCam_BoomLength = 500; + BattleCam_MoveTimeLeft = 120; preset = &CamPreset_C; break; } return; case BTL_CAM_PRESET_10: - D_8029F280 = 200; - D_8029F284 = 8; - D_8029F29E = 20; + BattleCam_BoomLength = 200; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; preset = &CamPreset_F; - D_8029F286 = 15; - D_8029F282 = 0; + BattleCam_BoomZOffset = 15; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; break; case BTL_CAM_PRESET_11: - D_8029F280 = 300; - D_8029F284 = 8; + BattleCam_BoomLength = 300; + BattleCam_BoomPitch = 8; preset = &CamPreset_F; - D_8029F29E = 20; - D_8029F286 = 16; - D_8029F282 = 0; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 16; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; break; case BTL_CAM_PRESET_12: - D_8029F280 = 400; - D_8029F284 = 8; - D_8029F29E = 20; + BattleCam_BoomLength = 400; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; preset = &CamPreset_F; - D_8029F286 = 30; - D_8029F282 = 0; + BattleCam_BoomZOffset = 30; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; break; case BTL_CAM_PRESET_13: - D_8029F280 = 200; - D_8029F284 = 8; - D_8029F29E = 20; + BattleCam_BoomLength = 200; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; preset = &CamPreset_I; - D_8029F286 = 15; - D_8029F282 = 0; + BattleCam_BoomZOffset = 15; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; break; case BTL_CAM_PRESET_14: - D_8029F280 = 300; - D_8029F284 = 8; + BattleCam_BoomLength = 300; + BattleCam_BoomPitch = 8; preset = &CamPreset_I; - D_8029F29E = 20; - D_8029F286 = 16; - D_8029F282 = 0; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 16; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; break; case BTL_CAM_PRESET_15: - D_8029F280 = 400; - D_8029F284 = 8; - D_8029F29E = 20; + BattleCam_BoomLength = 400; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; preset = &CamPreset_I; - D_8029F286 = 30; - D_8029F282 = 0; + BattleCam_BoomZOffset = 30; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; break; case BTL_CAM_PRESET_16: - D_8029F280 = 267; - D_8029F284 = 8; - D_8029F29E = 20; - D_8029F282 = 0; - D_8029F286 = 23; + BattleCam_BoomLength = 267; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 23; preset = &CamPreset_H; break; case BTL_CAM_PRESET_17: - D_8029F280 = 300; - D_8029F282 = 0; - D_8029F284 = 8; - D_8029F29E = 20; - D_8029F286 = 8; + BattleCam_BoomLength = 300; + BattleCam_BoomYaw = 0; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 8; preset = &CamPreset_H; break; case BTL_CAM_PRESET_18: - D_8029F280 = 400; - D_8029F284 = 8; - D_8029F282 = 0; + BattleCam_BoomLength = 400; + BattleCam_BoomPitch = 8; + BattleCam_BoomYaw = 0; preset = &CamPreset_H; - D_8029F29E = 20; - D_8029F286 = 0; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 0; break; case BTL_CAM_PRESET_19: - D_8029F29E = 20; + BattleCam_MoveTimeLeft = 20; preset = &CamPreset_J; break; case BTL_CAM_PRESET_20: preset = &CamPreset_K; - D_8029F29E = 20; - D_8029F286 = 0; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 0; break; case BTL_CAM_PRESET_21: preset = &CamPreset_L; - D_8029F29E = 20; - D_8029F286 = 0; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 0; break; case BTL_CAM_PRESET_25: - D_8029F280 = 266; - D_8029F284 = 8; - D_8029F282 = 0; - D_8029F286 = 40; + BattleCam_BoomLength = 266; + BattleCam_BoomPitch = 8; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 40; btl_cam_set_target_pos(-80.0f, 0.0f, 0.0f); - D_8029F29E = 20; - D_8029F27C = 0; + BattleCam_MoveTimeLeft = 20; + BattleCam_TargetActor = 0; preset = &CamPreset_J; break; case BTL_CAM_PRESET_24: - D_8029F280 = 250; - D_8029F284 = 8; - D_8029F29E = 20; - D_8029F286 = 14; - D_8029F282 = 0; + BattleCam_BoomLength = 250; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 14; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; D_8029F2A6 = 0; - D_8029F27C = 0; - D_80280CE0 = 1; + BattleCam_TargetActor = 0; + BattleCam_IsFrozen = TRUE; preset = &CamPreset_I; break; case BTL_CAM_PRESET_23: - D_8029F280 = 255; - D_8029F284 = 8; - D_8029F29E = 20; - D_8029F282 = 0; - D_8029F286 = 29; + BattleCam_BoomLength = 255; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 29; D_8029F2A2 = 0; D_8029F2A3 = 0; btl_cam_set_target_pos(-95.0f, 18.0f, 10.0f); - D_8029F27C = 0; + BattleCam_TargetActor = 0; preset = &CamPreset_J; break; case BTL_CAM_PRESET_22: - D_8029F280 = 230; - D_8029F284 = 8; - D_8029F282 = 0; - D_8029F29E = 20; - D_8029F286 = 0; - D_8029F27C = 0; + BattleCam_BoomLength = 230; + BattleCam_BoomPitch = 8; + BattleCam_BoomYaw = 0; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 0; + BattleCam_TargetActor = 0; preset = &CamPreset_J; break; case BTL_CAM_PRESET_26: - D_8029F280 = 310; - D_8029F284 = 8; - D_8029F29E = 30; - D_8029F286 = 0x10; - D_8029F282 = 0; - D_8029F27C = 0; + BattleCam_BoomLength = 310; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 30; + BattleCam_BoomZOffset = 16; + BattleCam_BoomYaw = 0; + BattleCam_TargetActor = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; D_8029F2A6 = 0; preset = &CamPreset_M; break; case BTL_CAM_PRESET_27: - D_8029F280 = 320; - D_8029F284 = 8; - D_8029F29E = 5; - D_8029F282 = 0; - D_8029F286 = 0; + BattleCam_BoomLength = 320; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 5; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 0; D_8029F2A2 = 1; D_8029F2A3 = 0; preset = &CamPreset_M; D_8029F2A6 = 0; - D_8029F27C = 0; + BattleCam_TargetActor = 0; break; case BTL_CAM_PRESET_28: - D_8029F280 = 340; - D_8029F284 = 8; - D_8029F29E = 5; - D_8029F282 = 0; - D_8029F286 = 0; + BattleCam_BoomLength = 340; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 5; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 0; D_8029F2A2 = 1; D_8029F2A3 = 0; - D_8029F27C = 0; + BattleCam_TargetActor = 0; D_8029F2A6 = 0; preset = &CamPreset_M; break; case BTL_CAM_PRESET_30: case BTL_CAM_PRESET_31: - D_8029F280 = 300; - D_8029F284 = 8; - D_8029F29E = 0xF; - D_8029F286 = -32; + BattleCam_BoomLength = 300; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 15; + BattleCam_BoomZOffset = -32; D_8029F2A7 = 20; - D_8029F282 = 0; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; - D_8029F27C = 0; + BattleCam_TargetActor = 0; preset = &CamPreset_I; break; case BTL_CAM_PRESET_32: - D_8029F280 = 300; - D_8029F284 = 8; - D_8029F282 = 0; - D_8029F29E = 0xA; + BattleCam_BoomLength = 300; + BattleCam_BoomPitch = 8; + BattleCam_BoomYaw = 0; + BattleCam_MoveTimeLeft = 10; preset = &CamPreset_N; - D_8029F286 = 0xA; + BattleCam_BoomZOffset = 10; D_8029F2A2 = 0; D_8029F2A3 = 0; - D_8029F278 = 0.0f; - D_8029F270 = -65.0f; - D_8029F274 = 30.0f; + BattleCam_PosZ = 0.0f; + BattleCam_PosX = -65.0f; + BattleCam_PosY = 30.0f; break; case BTL_CAM_PRESET_33: - D_8029F280 = 220; - D_8029F284 = 8; - D_8029F29E = 30; + BattleCam_BoomLength = 220; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 30; preset = &CamPreset_I; - D_8029F286 = 24; - D_8029F282 = 0; + BattleCam_BoomZOffset = 24; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; D_8029F2A6 = 0; - D_8029F27C = 0; + BattleCam_TargetActor = 0; break; case BTL_CAM_PRESET_34: - D_8029F280 = 280; - D_8029F284 = 8; - D_8029F29E = 30; - D_8029F286 = -4; - D_8029F282 = 0; + BattleCam_BoomLength = 280; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 30; + BattleCam_BoomZOffset = -4; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 0; - D_8029F27C = 0; + BattleCam_TargetActor = 0; D_8029F2A6 = 0; preset = &CamPreset_M; break; case BTL_CAM_PRESET_35: - D_8029F280 = 380; - D_8029F284 = 8; - D_8029F29E = 60; - D_8029F282 = 0; - D_8029F286 = 0; + BattleCam_BoomLength = 380; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 60; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 0; D_8029F2A2 = 1; D_8029F2A3 = 0; - D_8029F2A5 = 1; + BattleCam_UseLinearInterp = 1; preset = &CamPreset_M; D_8029F2A6 = 0; - D_8029F27C = 0; + BattleCam_TargetActor = 0; break; case BTL_CAM_PRESET_37: - D_8029F280 = 320; - D_8029F284 = 8; - D_8029F29E = 30; - D_8029F286 = -4; - D_8029F282 = 0; + BattleCam_BoomLength = 320; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 30; + BattleCam_BoomZOffset = -4; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 0; preset = &CamPreset_M; D_8029F2A6 = 0; - D_8029F27C = 0; + BattleCam_TargetActor = 0; break; case BTL_CAM_PRESET_36: - D_8029F280 = 300; - D_8029F284 = 8; - D_8029F29E = 60; - D_8029F282 = 0; - D_8029F286 = 0; + BattleCam_BoomLength = 300; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 60; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 0; D_8029F2A2 = 1; D_8029F2A3 = 0; - D_8029F2A5 = 1; + BattleCam_UseLinearInterp = 1; preset = &CamPreset_M; D_8029F2A6 = 0; - D_8029F27C = 0; + BattleCam_TargetActor = 0; break; case BTL_CAM_PRESET_38: - D_8029F280 = 320; - D_8029F284 = 8; - D_8029F29E = 30; - D_8029F286 = -4; - D_8029F282 = 0; + BattleCam_BoomLength = 320; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 30; + BattleCam_BoomZOffset = -4; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 0; preset = &CamPreset_M; D_8029F2A6 = 0; - D_8029F27C = 0; + BattleCam_TargetActor = 0; break; case BTL_CAM_PRESET_39: - D_8029F280 = 320; - D_8029F284 = 8; - D_8029F29E = 30; - D_8029F282 = 0; - D_8029F286 = 0; + BattleCam_BoomLength = 320; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 30; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 0; D_8029F2A2 = 1; D_8029F2A3 = 0; preset = &CamPreset_M; D_8029F2A6 = 0; - D_8029F27C = 0; + BattleCam_TargetActor = 0; break; case BTL_CAM_PRESET_40: - D_8029F280 = 360; - D_8029F284 = 8; - D_8029F29E = 20; + BattleCam_BoomLength = 360; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; preset = &CamPreset_M; - D_8029F286 = -4; - D_8029F282 = 0; + BattleCam_BoomZOffset = -4; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; D_8029F2A6 = 0; - D_8029F27C = 0; + BattleCam_TargetActor = 0; break; case BTL_CAM_PRESET_41: case BTL_CAM_PRESET_42: - D_8029F280 = 200; - D_8029F29E = 7; - D_8029F2A0 = 7; - D_8029F29C = 0; + BattleCam_BoomLength = 200; + BattleCam_MoveTimeLeft = 7; + BattleCam_MoveTimeTotal = 7; + BattleCam_DoneMoving = FALSE; D_8029F2A6 = 0; - preset = D_8029F2B4; + preset = BattleCam_ControlScript; break; case BTL_CAM_PRESET_43: - D_8029F280 = 214; - D_8029F284 = 8; - D_8029F29E = 20; - D_8029F286 = 0x10; + BattleCam_BoomLength = 214; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 16; D_8029F2A2 = -2; - D_8029F282 = 0; - D_8029F27C = 0; + BattleCam_BoomYaw = 0; + BattleCam_TargetActor = 0; D_8029F2A3 = 1; D_8029F2A6 = 0; preset = &CamPreset_M; break; case BTL_CAM_PRESET_44: - D_8029F280 = 300; - D_8029F284 = 8; - D_8029F29E = 8; - D_8029F286 = 0x10; - D_8029F282 = 0; - D_8029F27C = 0; + BattleCam_BoomLength = 300; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 8; + BattleCam_BoomZOffset = 16; + BattleCam_BoomYaw = 0; + BattleCam_TargetActor = 0; D_8029F2A2 = 0; D_8029F2A3 = 1; D_8029F2A6 = 0; preset = &CamPreset_M; break; case BTL_CAM_PRESET_45: - D_8029F280 = 430; - D_8029F284 = 8; - D_8029F29E = 0xA; - D_8029F282 = 0; - D_8029F286 = 0x10; - D_8029F27C = 0; + BattleCam_BoomLength = 430; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 10; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 16; + BattleCam_TargetActor = 0; preset = &CamPreset_N; D_8029F2A2 = 0; D_8029F2A3 = 0; - D_8029F278 = 0.0f; - D_8029F270 = 60.0f; - D_8029F274 = 40.0f; + BattleCam_PosZ = 0.0f; + BattleCam_PosX = 60.0f; + BattleCam_PosY = 40.0f; break; case BTL_CAM_PRESET_46: - D_8029F280 = 460; - D_8029F284 = 8; - D_8029F29E = 0xA; - D_8029F282 = 0; - D_8029F286 = 27; - D_8029F27C = 0; + BattleCam_BoomLength = 460; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 10; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 27; + BattleCam_TargetActor = 0; D_8029F2A2 = 0; preset = &CamPreset_N; - D_8029F278 = 0.0f; - D_8029F270 = 60.0f; - D_8029F274 = 40.0f; + BattleCam_PosZ = 0.0f; + BattleCam_PosX = 60.0f; + BattleCam_PosY = 40.0f; break; case BTL_CAM_PRESET_70: - D_8029F280 = 390; - D_8029F284 = 8; - D_8029F282 = 0; - D_8029F286 = 45; + BattleCam_BoomLength = 390; + BattleCam_BoomPitch = 8; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 45; btl_cam_set_target_pos(-70.0f, 0.0f, 0.0f); - D_8029F29E = 10; + BattleCam_MoveTimeLeft = 10; D_8029F2A6 = 0; preset = &CamPreset_J; break; case BTL_CAM_PRESET_71: - D_8029F280 = 500; - D_8029F284 = 8; - D_8029F282 = 0; - D_8029F286 = 45; + BattleCam_BoomLength = 500; + BattleCam_BoomPitch = 8; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 45; btl_cam_set_target_pos(0.0f, 0.0f, 0.0f); - D_8029F29E = 40; + BattleCam_MoveTimeLeft = 40; D_8029F2A6 = 0; preset = &CamPreset_J; break; case BTL_CAM_PRESET_69: case BTL_CAM_PRESET_72: - D_8029F280 = 300; - D_8029F284 = 8; - D_8029F282 = 0; - D_8029F286 = 45; + BattleCam_BoomLength = 300; + BattleCam_BoomPitch = 8; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 45; btl_cam_set_target_pos(-50.0f, 0.0f, 0.0f); - D_8029F29E = 20; + BattleCam_MoveTimeLeft = 20; D_8029F2A6 = 0; preset = &CamPreset_J; break; case BTL_CAM_PRESET_73: - D_8029F280 = 166; - D_8029F284 = 8; - D_8029F29E = 1; + BattleCam_BoomLength = 166; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 1; preset = &CamPreset_N; - D_8029F282 = 0; - D_8029F286 = 17; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 17; D_8029F2A2 = 0; D_8029F2A3 = 0; - D_8029F278 = 0.0f; - D_8029F270 = -75.0f; - D_8029F274 = 150.0f; + BattleCam_PosZ = 0.0f; + BattleCam_PosX = -75.0f; + BattleCam_PosY = 150.0f; break; case BTL_CAM_PRESET_47: - D_8029F280 = 310; - D_8029F284 = 8; - D_8029F29E = 30; - D_8029F286 = 0x10; + BattleCam_BoomLength = 310; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 30; + BattleCam_BoomZOffset = 16; D_8029F2A2 = 1; D_8029F2A3 = 1; preset = &CamPreset_M; - D_8029F282 = 0; - D_8029F27C = 256; + BattleCam_BoomYaw = 0; + BattleCam_TargetActor = 256; D_8029F2A6 = 0; break; case BTL_CAM_PRESET_48: - D_8029F280 = 250; - D_8029F284 = 8; - D_8029F29E = 120; - D_8029F286 = 0x10; + BattleCam_BoomLength = 250; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 120; + BattleCam_BoomZOffset = 16; D_8029F2A2 = 1; D_8029F2A3 = 1; - D_8029F2A5 = 1; + BattleCam_UseLinearInterp = 1; preset = &CamPreset_M; - D_8029F282 = 0; + BattleCam_BoomYaw = 0; D_8029F2A6 = 0; - D_8029F27C = 256; + BattleCam_TargetActor = 256; break; case BTL_CAM_PRESET_49: - D_8029F280 = 300; - D_8029F284 = 8; - D_8029F29E = 120; - D_8029F286 = 0x10; + BattleCam_BoomLength = 300; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 120; + BattleCam_BoomZOffset = 16; D_8029F2A2 = 1; D_8029F2A3 = 1; - D_8029F2A5 = 1; + BattleCam_UseLinearInterp = 1; preset = &CamPreset_I; - D_8029F282 = 0; + BattleCam_BoomYaw = 0; D_8029F2A6 = 0; - D_8029F27C = 256; + BattleCam_TargetActor = 256; break; case BTL_CAM_PRESET_50: - D_8029F280 = 320; - D_8029F284 = 8; - D_8029F29E = 5; + BattleCam_BoomLength = 320; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 5; D_8029F2A2 = 1; - D_8029F282 = 0; - D_8029F286 = 0; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 0; D_8029F2A3 = 0; preset = &CamPreset_M; - D_8029F27C = 256; + BattleCam_TargetActor = 256; D_8029F2A6 = 0; break; case BTL_CAM_PRESET_29: case BTL_CAM_PRESET_51: - D_8029F29E = 50; - D_8029F280 = 500; - D_8029F286 = 0; + BattleCam_MoveTimeLeft = 50; + BattleCam_BoomLength = 500; + BattleCam_BoomZOffset = 0; preset = &CamPreset_D; break; case BTL_CAM_PRESET_52: - D_8029F280 = 280; - D_8029F284 = 8; - D_8029F29E = 30; - D_8029F286 = -4; + BattleCam_BoomLength = 280; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 30; + BattleCam_BoomZOffset = -4; D_8029F2A2 = 1; - D_8029F282 = 0; + BattleCam_BoomYaw = 0; D_8029F2A3 = 0; preset = &CamPreset_M; D_8029F2A6 = 0; - D_8029F27C = 256; + BattleCam_TargetActor = 256; break; case BTL_CAM_PRESET_53: - D_8029F280 = 380; - D_8029F284 = 8; - D_8029F29E = 60; + BattleCam_BoomLength = 380; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 60; D_8029F2A2 = 1; - D_8029F2A5 = 1; - D_8029F282 = 0; - D_8029F286 = 0; + BattleCam_UseLinearInterp = 1; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 0; D_8029F2A3 = 0; preset = &CamPreset_M; D_8029F2A6 = 0; - D_8029F27C = 256; + BattleCam_TargetActor = 256; break; case BTL_CAM_PRESET_54: - D_8029F280 = 220; - D_8029F284 = 8; - D_8029F29E = 30; - D_8029F286 = 24; + BattleCam_BoomLength = 220; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 30; + BattleCam_BoomZOffset = 24; D_8029F2A2 = 1; D_8029F2A3 = 1; preset = &CamPreset_I; - D_8029F282 = 0; + BattleCam_BoomYaw = 0; D_8029F2A6 = 0; - D_8029F27C = 256; + BattleCam_TargetActor = 256; break; case BTL_CAM_PRESET_55: - D_8029F280 = 210; - D_8029F284 = 8; - D_8029F29E = 20; + BattleCam_BoomLength = 210; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; preset = &CamPreset_N; - D_8029F282 = 0; - D_8029F286 = 0xA; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 10; D_8029F2A2 = 0; D_8029F2A3 = 0; - D_8029F278 = 0.0f; - D_8029F270 = -95.0f; - D_8029F274 = 22.0f; + BattleCam_PosZ = 0.0f; + BattleCam_PosX = -95.0f; + BattleCam_PosY = 22.0f; break; case BTL_CAM_PRESET_56: - D_8029F280 = 320; - D_8029F284 = 8; - D_8029F29E = 30; - D_8029F286 = -4; + BattleCam_BoomLength = 320; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 30; + BattleCam_BoomZOffset = -4; D_8029F2A2 = 1; - D_8029F282 = 0; + BattleCam_BoomYaw = 0; D_8029F2A3 = 0; - D_8029F27C = 256; + BattleCam_TargetActor = 256; preset = &CamPreset_M; break; case BTL_CAM_PRESET_57: - D_8029F280 = 320; - D_8029F284 = 8; - D_8029F29E = 30; + BattleCam_BoomLength = 320; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 30; D_8029F2A2 = 1; - D_8029F282 = 0; - D_8029F286 = 0; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 0; D_8029F2A3 = 0; - D_8029F27C = 256; + BattleCam_TargetActor = 256; preset = &CamPreset_M; break; case BTL_CAM_PRESET_58: - D_8029F280 = 400; - D_8029F284 = 8; - D_8029F29E = 30; + BattleCam_BoomLength = 400; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 30; preset = &CamPreset_N; - D_8029F282 = 0; - D_8029F286 = 0xA; + BattleCam_BoomYaw = 0; + BattleCam_BoomZOffset = 10; D_8029F2A2 = 0; D_8029F2A3 = 0; - D_8029F278 = 0.0f; - D_8029F270 = 25.0f; - D_8029F274 = 60.0f; + BattleCam_PosZ = 0.0f; + BattleCam_PosX = 25.0f; + BattleCam_PosY = 60.0f; break; case BTL_CAM_PRESET_59: - D_8029F280 = 200; - D_8029F284 = 8; - D_8029F29E = 60; - D_8029F286 = 11; + BattleCam_BoomLength = 200; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 60; + BattleCam_BoomZOffset = 11; D_8029F2A2 = 1; D_8029F2A3 = 1; - D_8029F2A5 = 1; + BattleCam_UseLinearInterp = 1; preset = &CamPreset_I; - D_8029F282 = 0; - D_8029F27C = 256; + BattleCam_BoomYaw = 0; + BattleCam_TargetActor = 256; D_8029F2A6 = 0; break; case BTL_CAM_PRESET_60: - D_8029F280 = 300; - D_8029F284 = 8; - D_8029F29E = 8; - D_8029F286 = 0x10; - D_8029F282 = 0; - D_8029F27C = 256; + BattleCam_BoomLength = 300; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 8; + BattleCam_BoomZOffset = 16; + BattleCam_BoomYaw = 0; + BattleCam_TargetActor = 256; D_8029F2A2 = 0; D_8029F2A3 = 0; preset = &CamPreset_I; break; case BTL_CAM_PRESET_61: case BTL_CAM_PRESET_62: - D_8029F280 = 300; - D_8029F284 = 8; - D_8029F29E = 15; - D_8029F286 = -32; + BattleCam_BoomLength = 300; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 15; + BattleCam_BoomZOffset = -32; D_8029F2A7 = 20; D_8029F2A2 = 1; D_8029F2A3 = 1; - D_8029F282 = 0; - D_8029F27C = 256; + BattleCam_BoomYaw = 0; + BattleCam_TargetActor = 256; preset = &CamPreset_I; break; case BTL_CAM_PRESET_63: - D_8029F280 = 400; - D_8029F284 = 8; - D_8029F29E = 20; + BattleCam_BoomLength = 400; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; preset = &CamPreset_F; - D_8029F286 = 27; - D_8029F282 = 0; + BattleCam_BoomZOffset = 27; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; break; case BTL_CAM_PRESET_64: - D_8029F280 = 358; - D_8029F284 = 8; - D_8029F29E = 10; - D_8029F286 = 0x10; - D_8029F282 = 0; + BattleCam_BoomLength = 358; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 10; + BattleCam_BoomZOffset = 16; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 0; preset = &CamPreset_F; break; case BTL_CAM_PRESET_65: - D_8029F29E = 50; - D_8029F280 = 500; + BattleCam_MoveTimeLeft = 50; + BattleCam_BoomLength = 500; preset = &CamPreset_C; break; case BTL_CAM_PRESET_66: - D_8029F280 = 267; - D_8029F284 = 8; - D_8029F29E = 20; - D_8029F286 = 0x10; - D_8029F282 = 0; + BattleCam_BoomLength = 267; + BattleCam_BoomPitch = 8; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 16; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 0; preset = &CamPreset_F; break; case BTL_CAM_PRESET_67: - D_8029F280 = 214; - D_8029F284 = 8; + BattleCam_BoomLength = 214; + BattleCam_BoomPitch = 8; preset = &CamPreset_F; - D_8029F29E = 20; - D_8029F286 = 16; - D_8029F282 = 0; + BattleCam_MoveTimeLeft = 20; + BattleCam_BoomZOffset = 16; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; break; case BTL_CAM_PRESET_68: - D_8029F280 = 300; - D_8029F284 = 8; + BattleCam_BoomLength = 300; + BattleCam_BoomPitch = 8; preset = &CamPreset_F; - D_8029F29E = 4; - D_8029F286 = 16; - D_8029F282 = 0; + BattleCam_MoveTimeLeft = 4; + BattleCam_BoomZOffset = 16; + BattleCam_BoomYaw = 0; D_8029F2A2 = 1; D_8029F2A3 = 1; break; } - D_80280CE4 = id; + BattleCam_CurrentPresetID = id; if (battleStatus->camMovementScript != NULL) { kill_script_by_ID(battleStatus->camMovementScriptID); } - D_8029F2B4 = preset; + BattleCam_ControlScript = preset; newScript = start_script(preset, 0xA, 0x20); - D_8029F29C = 0; + BattleCam_DoneMoving = FALSE; battleStatus->camMovementScript = newScript; battleStatus->camMovementScriptID = newScript->id; } } void func_8024E3D8(s32 arg0) { - if (D_80280CE0 == 0) { - D_8029F2A4 = 1; + if (!BattleCam_IsFrozen) { + D_8029F2A4 = TRUE; btl_cam_use_preset(arg0); } } void func_8024E40C(s32 arg0) { - if (D_80280CE0 == 0) { - D_8029F2A4 = 0; + if (!BattleCam_IsFrozen) { + D_8029F2A4 = FALSE; btl_cam_use_preset(arg0); } } void btl_cam_target_actor(s32 actorID) { - if (D_80280CE0 == 0) { - D_8029F27C = actorID; + if (!BattleCam_IsFrozen) { + BattleCam_TargetActor = actorID; } } -void func_8024E45C(s32 actorID, s32 arg1) { - if (D_80280CE0 == 0) { - D_8029F27C = actorID; - D_8029F27E = arg1; +void btl_cam_target_actor_part(s32 actorID, s32 actorPartIndex) { + if (!BattleCam_IsFrozen) { + BattleCam_TargetActor = actorID; + BattleCam_TargetActorPart = actorPartIndex; } } void func_8024E484(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s32 arg4, s32 arg5, s32 arg6, s32 zoomPercent) { Camera* camera = &gCameras[CAM_BATTLE]; - if (D_80280CE0 == 0) { + if (!BattleCam_IsFrozen) { camera->unk_1C = arg0; - camera->unk_1E = arg1; + camera->auxBoomLength = arg1; camera->unk_20 = arg2; - camera->unk_22 = arg3; - camera->unk_24 = arg4; - camera->unk_26 = arg5 * 256; + camera->auxBoomPitch = arg3; + camera->auxBoomYaw = arg4; + camera->auxBoomZOffset = arg5 * 256; camera->unk_28 = arg6; camera->zoomPercent = zoomPercent; } @@ -1381,8 +1376,8 @@ void func_8024E484(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s32 arg4, s32 arg5, s void btl_cam_move(s16 arg0) { BattleStatus* battleStatus = &gBattleStatus; - if (D_80280CE0 == 0) { - D_8029F29E = arg0; + if (!BattleCam_IsFrozen) { + BattleCam_MoveTimeLeft = arg0; if (battleStatus->camMovementScript != NULL) { restart_script(battleStatus->camMovementScript); } @@ -1390,47 +1385,47 @@ void btl_cam_move(s16 arg0) { } void btl_cam_set_target_pos(f32 x, f32 y, f32 z) { - if (D_80280CE0 == 0) { - D_8029F270 = x; - D_8029F274 = y; - D_8029F278 = z; + if (!BattleCam_IsFrozen) { + BattleCam_PosX = x; + BattleCam_PosY = y; + BattleCam_PosZ = z; } } void func_8024E554(f32 arg0, f32 arg1, f32 arg2) { Camera* camera = &gCameras[CAM_BATTLE]; - if (D_80280CE0 == 0) { - camera->unk_54 = arg0; - camera->unk_58 = arg1; - camera->unk_5C = arg2; + if (!BattleCam_IsFrozen) { + camera->auxPos.x = arg0; + camera->auxPos.y = arg1; + camera->auxPos.z = arg2; } } s32 func_8024E584(void) { - return D_8029F29C; + return BattleCam_DoneMoving; } void btl_cam_set_zoom(s16 zoom) { - if (D_80280CE0 == 0) { - D_8029F280 = zoom; + if (!BattleCam_IsFrozen) { + BattleCam_BoomLength = zoom; } } void btl_cam_add_zoom(s32 zoom) { - if (D_80280CE0 == 0) { - D_8029F280 += zoom; + if (!BattleCam_IsFrozen) { + BattleCam_BoomLength += zoom; } } void btl_cam_set_zoffset(s16 zOffset) { - if (D_80280CE0 == 0) { - D_8029F286 = zOffset; + if (!BattleCam_IsFrozen) { + BattleCam_BoomZOffset = zOffset; } } void btl_cam_unfreeze(void) { - D_80280CE0 = 0; + BattleCam_IsFrozen = FALSE; } void func_8024E60C(void) { @@ -1441,12 +1436,12 @@ ApiStatus UseBattleCamPreset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 preset; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } preset = evt_get_variable(script, *args++); - D_8029F2A4 = 0; + D_8029F2A4 = FALSE; btl_cam_use_preset(preset); return ApiStatus_DONE2; @@ -1456,12 +1451,12 @@ ApiStatus func_8024E664(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 preset; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } preset = evt_get_variable(script, *args++); - D_8029F2A4 = 1; + D_8029F2A4 = TRUE; btl_cam_use_preset(preset); return ApiStatus_DONE2; @@ -1470,7 +1465,7 @@ ApiStatus func_8024E664(Evt* script, s32 isInitialCall) { ApiStatus func_8024E6B4(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } @@ -1498,7 +1493,7 @@ ApiStatus func_8024E748(Evt* script, s32 isInitialCall) { s32 mode; s32 val; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } @@ -1506,28 +1501,28 @@ ApiStatus func_8024E748(Evt* script, s32 isInitialCall) { val = evt_get_variable(script, *args++); switch (mode) { - case 1: + case AUX_CAM_PARAM_1: camera->unk_1C = val; break; - case 2: - camera->unk_1E = val; + case AUX_CAM_BOOM_LENGTH: + camera->auxBoomLength = val; break; - case 3: + case AUX_CAM_PARAM_3: camera->unk_20 = val; break; - case 4: - camera->unk_22 = val; + case AUX_CAM_BOOM_PITCH: + camera->auxBoomPitch = val; break; - case 5: - camera->unk_24 = val; + case AUX_CAM_BOOM_YAW: + camera->auxBoomYaw = val; break; - case 6: - camera->unk_26 = val * 256; + case AUX_CAM_BOOM_ZOFFSET: + camera->auxBoomZOffset = val * 256; break; - case 7: + case AUX_CAM_PARAM_7: camera->unk_28 = val; break; - case 8: + case AUX_CAM_ZOOM_PERCENT: camera->zoomPercent = val; break; } @@ -1538,16 +1533,16 @@ ApiStatus func_8024E820(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Camera* camera = &gCameras[CAM_BATTLE]; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } camera->unk_1C = evt_get_variable(script, *args++); - camera->unk_1E = evt_get_variable(script, *args++); + camera->auxBoomLength = evt_get_variable(script, *args++); camera->unk_20 = evt_get_variable(script, *args++); - camera->unk_22 = evt_get_variable(script, *args++); - camera->unk_24 = evt_get_variable(script, *args++); - camera->unk_26 = evt_get_variable(script, *args++) * 256; + camera->auxBoomPitch = evt_get_variable(script, *args++); + camera->auxBoomYaw = evt_get_variable(script, *args++); + camera->auxBoomZOffset = evt_get_variable(script, *args++) * 256; camera->unk_28 = evt_get_variable(script, *args++); camera->zoomPercent = evt_get_variable(script, *args++); @@ -1557,13 +1552,13 @@ ApiStatus func_8024E820(Evt* script, s32 isInitialCall) { ApiStatus SetBattleCamTarget(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } - D_8029F270 = evt_get_variable(script, *args++); - D_8029F274 = evt_get_variable(script, *args++); - D_8029F278 = evt_get_variable(script, *args++); + BattleCam_PosX = evt_get_variable(script, *args++); + BattleCam_PosY = evt_get_variable(script, *args++); + BattleCam_PosZ = evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -1571,13 +1566,13 @@ ApiStatus func_8024E9B0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Camera* camera = &gCameras[CAM_BATTLE]; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } - camera->unk_54 = evt_get_variable(script, *args++); - camera->unk_58 = evt_get_variable(script, *args++); - camera->unk_5C = evt_get_variable(script, *args++); + camera->auxPos.x = evt_get_variable(script, *args++); + camera->auxPos.y = evt_get_variable(script, *args++); + camera->auxPos.z = evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -1585,33 +1580,33 @@ ApiStatus func_8024E9B0(Evt* script, s32 isInitialCall) { ApiStatus SetBattleCamOffsetZ(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } - D_8029F286 = evt_get_variable(script, *args++); + BattleCam_BoomZOffset = evt_get_variable(script, *args++); return ApiStatus_DONE2; } ApiStatus AddBattleCamOffsetZ(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } - D_8029F286 += evt_get_variable(script, *args++); + BattleCam_BoomZOffset += evt_get_variable(script, *args++); return ApiStatus_DONE2; } ApiStatus SetBattleCamYaw(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } - D_8029F282 = evt_get_variable(script, *args++); + BattleCam_BoomYaw = evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -1619,7 +1614,7 @@ ApiStatus BattleCamTargetActor(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } @@ -1634,11 +1629,11 @@ ApiStatus BattleCamTargetActor(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_8024EB84(Evt* script, s32 isInitialCall) { +ApiStatus BattleCamTargetActorPart(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } @@ -1648,7 +1643,7 @@ ApiStatus func_8024EB84(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - func_8024E45C(actorID, evt_get_variable(script, *args++)); + btl_cam_target_actor_part(actorID, evt_get_variable(script, *args++)); return ApiStatus_DONE2; } @@ -1657,12 +1652,12 @@ ApiStatus MoveBattleCamOver(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } - D_8029F29E = evt_get_variable(script, *args++); - D_80280CE4 = 0; + BattleCam_MoveTimeLeft = evt_get_variable(script, *args++); + BattleCam_CurrentPresetID = 0; if (battleStatus->camMovementScript != NULL) { restart_script(battleStatus->camMovementScript); @@ -1674,40 +1669,40 @@ ApiStatus MoveBattleCamOver(Evt* script, s32 isInitialCall) { ApiStatus SetBattleCamZoom(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } - D_8029F280 = evt_get_variable(script, *args++); + BattleCam_BoomLength = evt_get_variable(script, *args++); return ApiStatus_DONE2; } ApiStatus AddBattleCamZoom(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } - D_8029F280 += evt_get_variable(script, *args++); + BattleCam_BoomLength += evt_get_variable(script, *args++); return ApiStatus_DONE2; } ApiStatus func_8024ECF8(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - if (D_80280CE0 != 0) { + if (BattleCam_IsFrozen) { return ApiStatus_DONE2; } D_8029F2A2 = evt_get_variable(script, *args++); D_8029F2A3 = evt_get_variable(script, *args++); - D_8029F2A5 = evt_get_variable(script, *args++); + BattleCam_UseLinearInterp = evt_get_variable(script, *args++); return ApiStatus_DONE2; } ApiStatus FreezeBattleCam(Evt* script, s32 isInitialCall) { - D_80280CE0 = evt_get_variable(script, *script->ptrReadPos); + BattleCam_IsFrozen = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } diff --git a/src/1A5830.c b/src/1A5830.c index a6b043c6fe..3df175bb93 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -758,7 +758,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; - script->varTableActor[3] = target; + script->varTablePtr[3] = target; sfx_play_sound_at_position(SOUND_HIT_ICE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_SHRINK) && statusInflicted) { @@ -766,7 +766,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; - script->varTableActor[3] = target; + script->varTablePtr[3] = target; sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } @@ -1029,14 +1029,14 @@ ApiStatus LandJump(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - script->functionTempActor[1] = actor; + script->functionTempPtr[1] = actor; actor->state.currentPos.x = actor->currentPos.x; actor->state.currentPos.y = actor->currentPos.y; actor->state.currentPos.z = actor->currentPos.z; script->functionTemp[0] = 1; } - actor = script->functionTempActor[1]; + actor = script->functionTempPtr[1]; actor->state.currentPos.y += actor->state.velocity; actor->state.velocity -= actor->state.acceleration; @@ -1084,8 +1084,8 @@ s32 LandJumpPart(Evt* script, s32 isInitialCall) { actor = get_actor(actorID); part = get_actor_part(actor, partIndex); - script->functionTempActor[1] = actor; - script->functionTempActorPart[2] = part; + script->functionTempPtr[1] = actor; + script->functionTempPtr[2] = part; movement = part->movement; movement->unk_00.x = part->absolutePosition.x; movement->unk_00.y = part->absolutePosition.y; @@ -1093,7 +1093,7 @@ s32 LandJumpPart(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 1; } - part = script->functionTempActorPart[2]; + part = script->functionTempPtr[2]; movement = part->movement; movement->unk_00.y += movement->unk_2C; movement->unk_2C -= movement->jumpScale; diff --git a/src/43F0.c b/src/43F0.c index f828bc9716..77e5efe212 100644 --- a/src/43F0.c +++ b/src/43F0.c @@ -728,8 +728,8 @@ f32 cos_deg(f32 angle) { } f32 update_lerp(s32 easing, f32 start, f32 end, s32 elapsed, s32 duration) { - s32 val1s; - f32 temp_f4; + s32 timeLeft; + f32 absMag; if (duration == 0) { return end; @@ -751,27 +751,27 @@ f32 update_lerp(s32 easing, f32 start, f32 end, s32 elapsed, s32 duration) { return end - (((end - start) * cos_rad((((f32)SQ(elapsed) / duration) * PI_D * 4.0) / 15.0) * (duration - elapsed) * (duration - elapsed)) / SQ((f32)duration)); case EASING_QUADRATIC_OUT: - val1s = duration - elapsed; - return (start + (end - start)) - ((SQ(val1s) * (end - start))) / SQ(duration); + timeLeft = duration - elapsed; + return (start + (end - start)) - ((SQ(timeLeft) * (end - start))) / SQ(duration); case EASING_CUBIC_OUT: - val1s = duration - elapsed; - return (start + (end - start)) - ((CUBE(val1s) * (end - start))) / CUBE(duration); + timeLeft = duration - elapsed; + return (start + (end - start)) - ((CUBE(timeLeft) * (end - start))) / CUBE(duration); case EASING_QUARTIC_OUT: - val1s = duration - elapsed; - return (start + (end - start)) - ((QUART(val1s) * (end - start))) / QUART(duration); + timeLeft = duration - elapsed; + return (start + (end - start)) - ((QUART(timeLeft) * (end - start))) / QUART(duration); case EASING_COS_BOUNCE: - temp_f4 = cos_rad((((f32)SQ(elapsed) / duration) * PI_D * 4.0) / 40.0) * (duration - elapsed) * + absMag = cos_rad((((f32)SQ(elapsed) / duration) * PI_D * 4.0) / 40.0) * (duration - elapsed) * (duration - elapsed) / SQ((f32)duration); - if (temp_f4 < 0.0f) { - temp_f4 = -temp_f4; + if (absMag < 0.0f) { + absMag = -absMag; } - return end - ((end - start) * temp_f4); + return end - ((end - start) * absMag); case EASING_COS_IN_OUT: return start + ((end - start) * (1.0 - cos_rad(((f32)elapsed * PI_D) / (f32)duration)) * 0.5); case EASING_SIN_OUT: - return start + ((end - start) * sin_rad(((f32)elapsed * 1.570796) / (f32)duration)); + return start + ((end - start) * sin_rad(((f32)elapsed * (PI_D / 2)) / (f32)duration)); case EASING_COS_IN: - return start + ((end - start) * (1.0 - cos_rad(((f32)elapsed * 1.570796) / (f32)duration))); + return start + ((end - start) * (1.0 - cos_rad(((f32)elapsed * (PI_D / 2)) / (f32)duration))); } return 0.0f; diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index 0671712e22..8ad9305586 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -555,7 +555,7 @@ void hide_coin_counter(void) { } } -void func_800E96C8(void) { +void hide_coin_counter_immediately(void) { UiStatus* uiStatus = &gUIStatus; if ((D_8010CD10 != 0) && (uiStatus->unk_6C[0] == 0)) { diff --git a/src/8800.c b/src/8800.c index 2b7ef591cf..037d4ae12d 100644 --- a/src/8800.c +++ b/src/8800.c @@ -373,9 +373,9 @@ Camera* initialize_next_camera(CameraInitData* initData) { camera->bgColor[1] = 0; camera->bgColor[2] = 0; camera->unk_C0 = 0; - camera->unk_54 = 0; - camera->unk_58 = 0; - camera->unk_5C = 0; + camera->auxPos.x = 0; + camera->auxPos.y = 0; + camera->auxPos.z = 0; camera->targetPos.x = 0; camera->targetPos.y = 0; camera->targetPos.z = 0; diff --git a/src/B0E0.c b/src/B0E0.c index 9ed7417b31..26b31da5ed 100644 --- a/src/B0E0.c +++ b/src/B0E0.c @@ -105,9 +105,9 @@ void update_camera_mode_5(Camera* camera) { f32 temp_f22 = (playerStatus->currentSpeed * 1.5f) + 1.0f; f32 temp_f20 = (playerStatus->currentSpeed * 0.05f) + 0.05f; - camera->unk_54 = camera->targetPos.x + camera->unk_550; - camera->unk_58 = camera->targetPos.y + camera->currentYOffset; - camera->unk_5C = camera->targetPos.z; + camera->auxPos.x = camera->targetPos.x + camera->unk_550; + camera->auxPos.y = camera->targetPos.y + camera->currentYOffset; + camera->auxPos.z = camera->targetPos.z; func_8003034C(camera); if (!(camera->moveFlags & 1)) { func_80030210(camera, temp_f20, temp_f22, 0); @@ -127,7 +127,7 @@ void update_camera_mode_5(Camera* camera) { } void func_80030210(Camera* camera, f32 arg1, f32 arg2, s32 arg3) { - f32 xDelta = (camera->unk_54 - camera->lookAt_obj.x) * arg1; + f32 xDelta = (camera->auxPos.x - camera->lookAt_obj.x) * arg1; f32 theta; f32 cosTheta; f32 sinTheta; @@ -143,12 +143,12 @@ void func_80030210(Camera* camera, f32 arg1, f32 arg2, s32 arg3) { theta = (camera->currentBoomYaw * TAU) / 360.0f; cosTheta = cos_rad(theta); - camera->lookAt_obj.z += (camera->unk_5C - camera->lookAt_obj.z) * arg1; + camera->lookAt_obj.z += (camera->auxPos.z - camera->lookAt_obj.z) * arg1; camera->lookAt_eye.z = camera->lookAt_obj.z + (camera->currentBoomLength * cosTheta); if (arg3 << 16 == 0) { sinTheta = sin_rad(theta); - camera->lookAt_obj.y += (camera->unk_58 - camera->lookAt_obj.y) * 0.125f; + camera->lookAt_obj.y += (camera->auxPos.y - camera->lookAt_obj.y) * 0.125f; camera->lookAt_eye.y = camera->lookAt_obj.y + (camera->currentBoomLength * sinTheta); } } @@ -549,8 +549,8 @@ void update_camera_zone_interp(Camera* camera) { camera->currentBoomLength = blendedCamSettings.boomLength; camera->currentBlendedYawNegated = -blendedCamSettings.boomYaw; camera->currentPitch = -blendedCamSettings.boomPitch - blendedCamSettings.viewPitch; - camera->unk_54 = camera->lookAt_obj.x; - camera->unk_58 = camera->lookAt_obj.y; - camera->unk_5C = camera->lookAt_obj.z; + camera->auxPos.x = camera->lookAt_obj.x; + camera->auxPos.y = camera->lookAt_obj.y; + camera->auxPos.z = camera->lookAt_obj.z; camera->currentYOffset = 0.0f; } diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 6fc1c28dc2..7959124efb 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -1824,36 +1824,36 @@ s32 MakeEntity(Evt* script, s32 isInitialCall) { EntityBlueprint* entityData; s32 x, y, z; s32 flags; - s32 temp_v0; + s32 nextArg; s32 entityIndex; - s32 t80000000; - s32* temp; + s32 endOfArgs; + s32* varArgBufPos; if (isInitialCall != TRUE) { return ApiStatus_DONE2; } entityData = (EntityBlueprint*)evt_get_variable(script, *args++); - temp = &CreateEntityVarArgBuffer[2]; - t80000000 = 0x80000000; + varArgBufPos = &CreateEntityVarArgBuffer[2]; + endOfArgs = MAKE_ENTITY_END; x = evt_get_variable(script, *args++); y = evt_get_variable(script, *args++); z = evt_get_variable(script, *args++); flags = evt_get_variable(script, *args++); - *temp-- = 0; - *temp-- = 0; - *temp = 0; + *varArgBufPos-- = 0; + *varArgBufPos-- = 0; + *varArgBufPos = 0; do { - temp_v0 = evt_get_variable(script, *args++); + nextArg = evt_get_variable(script, *args++); - if (temp_v0 != t80000000) { - *temp++ = temp_v0; + if (nextArg != endOfArgs) { + *varArgBufPos++ = nextArg; } - } while (temp_v0 != t80000000); + } while (nextArg != endOfArgs); - entityIndex = create_entity(entityData, x, y, z, flags, CreateEntityVarArgBuffer[0], CreateEntityVarArgBuffer[1], CreateEntityVarArgBuffer[2], t80000000); + entityIndex = create_entity(entityData, x, y, z, flags, CreateEntityVarArgBuffer[0], CreateEntityVarArgBuffer[1], CreateEntityVarArgBuffer[2], endOfArgs); gLastCreatedEntityIndex = entityIndex; script->varTable[0] = entityIndex; return ApiStatus_DONE2; @@ -1898,7 +1898,7 @@ ApiStatus AssignScript(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (isInitialCall == TRUE) { - Bytecode* toBind = (Bytecode*)evt_get_variable(script, *args++); + EvtScript* toBind = (EvtScript*)evt_get_variable(script, *args++); get_entity_by_index(gLastCreatedEntityIndex)->boundScriptBytecode = toBind; return ApiStatus_DONE2; diff --git a/src/actor_api.c b/src/actor_api.c index 18e31a21a3..5fa61ff6e5 100644 --- a/src/actor_api.c +++ b/src/actor_api.c @@ -2031,12 +2031,12 @@ ApiStatus SummonEnemy(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 0: - script->functionTempActor[1] = create_actor((struct FormationRow*)evt_get_variable(script, *args++)); + script->functionTempPtr[1] = create_actor((struct FormationRow*)evt_get_variable(script, *args++)); script->functionTemp[2] = evt_get_variable(script, *args++); script->functionTemp[0] = 1; break; case 1: - actor2 = script->functionTempActor[1]; + actor2 = script->functionTempPtr[1]; if (does_script_exist(actor2->takeTurnID) == FALSE) { enemyIDs = battleStatus->enemyIDs; if (battleStatus->nextEnemyIndex == 0) { @@ -3164,7 +3164,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) { } attackBoost = evt_get_variable(script, *args++); actor = get_actor(actorID); - script->functionTempActor[1] = actor; + script->functionTempPtr[1] = actor; script->functionTemp[2] = attackBoost; func_8024E40C(8); @@ -3181,7 +3181,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 1; } get_actor(script->owner1.actorID); - actor = script->functionTempActor[1]; + actor = script->functionTempPtr[1]; attackBoost = script->functionTemp[2]; flags = actor->flags; @@ -3287,7 +3287,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) { } defenseBoost = evt_get_variable(script, *args++); actor = get_actor(actorID); - script->functionTempActor[1] = actor; + script->functionTempPtr[1] = actor; script->functionTemp[2] = defenseBoost; func_8024E40C(8); @@ -3305,7 +3305,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 1; } get_actor(script->owner1.actorID); - actor = script->functionTempActor[1]; + actor = script->functionTempPtr[1]; defenseBoost = script->functionTemp[2]; flags = actor->flags; @@ -3427,7 +3427,7 @@ ApiStatus VanishActor(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 1; } get_actor(script->owner1.actorID); - actor = script->functionTempActor[1]; + actor = script->functionTempPtr[1]; vanished = script->functionTemp[2]; flags = actor->flags; @@ -3515,7 +3515,7 @@ ApiStatus ElectrifyActor(Evt* script, s32 isInitialCall) { } electrified = evt_get_variable(script, *args++); actor = get_actor(actorID); - script->functionTempActor[1] = actor; + script->functionTempPtr[1] = actor; script->functionTemp[2] = electrified; func_8024E40C(8); @@ -3533,7 +3533,7 @@ ApiStatus ElectrifyActor(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 1; } get_actor(script->owner1.actorID); - actor = script->functionTempActor[1]; + actor = script->functionTempPtr[1]; electrified = script->functionTemp[2]; flags = actor->flags; @@ -3625,7 +3625,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) { hpBoost = evt_get_variable(script, *args++); D_8029FBD0 = evt_get_variable(script, *args++); actor = get_actor(actorID); - script->functionTempActor[1] = actor; + script->functionTempPtr[1] = actor; script->functionTemp[2] = hpBoost; func_8024E40C(8); @@ -3639,7 +3639,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 1; } get_actor(script->owner1.enemyID); - actor = script->functionTempActor[1]; + actor = script->functionTempPtr[1]; hpBoost = script->functionTemp[2]; flags = actor->flags; diff --git a/src/battle/action_cmd/hurricane.c b/src/battle/action_cmd/hurricane.c index f85589c4c2..daa07df695 100644 --- a/src/battle/action_cmd/hurricane.c +++ b/src/battle/action_cmd/hurricane.c @@ -74,7 +74,7 @@ ApiStatus func_802A91A0_42F880(Evt* script, s32 isInitialCall) { actionCommandStatus->unk_4E = evt_get_variable(script, *args++); actionCommandStatus->unk_52 = evt_get_variable(script, *args++); - actionCommandStatus->unk_50 = evt_get_variable(script, *args++);; + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); actionCommandStatus->unk_64 = evt_get_variable(script, *args++); diff --git a/src/battle/area_isk_part_2/actor/tutankoopa.c b/src/battle/area_isk_part_2/actor/tutankoopa.c index 22725f1357..ec4984c53f 100644 --- a/src/battle/area_isk_part_2/actor/tutankoopa.c +++ b/src/battle/area_isk_part_2/actor/tutankoopa.c @@ -567,7 +567,7 @@ EvtScript N(8021D04C) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_15) EVT_CALL(SetBattleCamZoom, 320) EVT_CALL(SetBattleCamOffsetZ, 0) - EVT_CALL(func_8024EB84, ACTOR_SELF, LW(9)) + EVT_CALL(BattleCamTargetActorPart, ACTOR_SELF, LW(9)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_tutankoopa_Palette_00_Anim_2) EVT_CALL(GetPartOffset, ACTOR_SELF, LW(9), LW(0), LW(1), LW(2)) EVT_ADD(LW(0), 20) diff --git a/src/collision.c b/src/collision.c index d88ab6a877..e070d425ec 100644 --- a/src/collision.c +++ b/src/collision.c @@ -212,7 +212,7 @@ void load_hit_data(s32 idx, HitFile* hit) { break; } - assetBoundingBox = (u32*)((void*)hit + assetCollisionData->boundingBoxesOffset);; + assetBoundingBox = (u32*)((void*)hit + assetCollisionData->boundingBoxesOffset); collisionData->aabbs = collision_heap_malloc(assetCollisionData->boundingBoxesDataSize * 4); for (i = 0, boundingBox = (u32*)(collisionData->aabbs); i < assetCollisionData->boundingBoxesDataSize; assetBoundingBox++, boundingBox++, i++) { diff --git a/src/common/UnkEffect0FFuncs.inc.c b/src/common/UnkEffect0FFuncs.inc.c index 91850cde73..c998d13d35 100644 --- a/src/common/UnkEffect0FFuncs.inc.c +++ b/src/common/UnkEffect0FFuncs.inc.c @@ -19,8 +19,8 @@ ApiStatus N(UnkEffect0FFunc2)(Evt* script, s32 isInitialCall) { ApiStatus N(UnkEffect0FFunc)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; f32 yaw = gCameras[CAM_DEFAULT].currentYaw / 180.0f * PI; - f32 yawPlus = yaw + 1.570796; - f32 yawMinus = yaw - 1.570796; + f32 yawPlus = yaw + (PI_D / 2); + f32 yawMinus = yaw - (PI_D / 2); f32 temp_f30; f32 var1; f32 var2; @@ -50,8 +50,8 @@ ApiStatus N(UnkEffect0FFunc)(Evt* script, s32 isInitialCall) { ApiStatus N(UnkEffect0FFunc3)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; f32 yaw = gCameras[CAM_DEFAULT].currentYaw / 180.0f * PI; - f32 yawPlus = yaw + 1.570796; - f32 yawMinus = yaw - 1.570796; + f32 yawPlus = yaw + (PI_D / 2); + f32 yawMinus = yaw - (PI_D / 2); f32 temp_f30; f32 var1; f32 var2; @@ -84,8 +84,8 @@ ApiStatus N(UnkEffect0FFunc3)(Evt* script, s32 isInitialCall) { ApiStatus N(UnkEffect0FFunc4)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; f32 yaw = gCameras[CAM_DEFAULT].currentYaw / 180.0f * PI; - f32 yawPlus = yaw + 1.570796; - f32 yawMinus = yaw - 1.570796; + f32 yawPlus = yaw + (PI_D / 2); + f32 yawMinus = yaw - (PI_D / 2); f32 temp_f30; f32 var1; f32 var2; diff --git a/src/entity/104730.c b/src/entity/104730.c index fd9db07eb0..5bd087f5a6 100644 --- a/src/entity/104730.c +++ b/src/entity/104730.c @@ -339,5 +339,5 @@ void entity_breakable_block_create_shattering_entity(Entity* entity) { return; } - create_entity(bp, entity->position.x, entity->position.y, entity->position.z, 0, 0x80000000); + create_entity(bp, entity->position.x, entity->position.y, entity->position.z, 0, MAKE_ENTITY_END); } diff --git a/src/entity/Block.c b/src/entity/Block.c index 43a9f65ad3..eb3794e25e 100644 --- a/src/entity/Block.c +++ b/src/entity/Block.c @@ -1,6 +1,11 @@ #include "common.h" #include "effects.h" +extern s32 D_802E9E54; + +void entity_MulticoinBlock_update_timer(Entity* entity); +void entity_base_block_update_slow_sinking(Entity* entity); + #define MULTICOIN_BLOCK_MAX_COINS 10 void entity_base_block_setupGfx(s32 entityIndex) { @@ -128,9 +133,6 @@ void entity_MulticoinBlock_init(Entity* entity) { data->gameFlagIndex = 0xFFFF; } -extern s32 D_802E9E54; -extern EntityBlueprint Entity_InertYellowBlock; - void entity_MulticoinBlock_spawn_coin(Entity* entity) { BlockData* data = entity->dataBuf.block; s32 itemSpawnMode; @@ -150,9 +152,8 @@ void entity_MulticoinBlock_spawn_coin(Entity* entity) { if ((data->coinsLeft == 0) || (data->timeLeft == 0)) { data->empty = TRUE; - set_entity_commandlist(get_entity_by_index(create_entity(&Entity_InertYellowBlock, entity->position.x, entity->position.y, - entity->position.z, - entity->rotation.y, 0x80000000)), &D_802E9E54); + set_entity_commandlist(get_entity_by_index(create_entity(&Entity_InertYellowBlock, + entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, MAKE_ENTITY_END)), &D_802E9E54); entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); } } @@ -181,7 +182,7 @@ void entity_MulticoinBlock_idle(Entity* entity) { entity_MulticoinBlock_update_timer(entity); entity_base_block_idle(entity); if (data->empty) { - create_entity(&Entity_InertYellowBlock, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); + create_entity(&Entity_InertYellowBlock, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, MAKE_ENTITY_END); entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); } } @@ -191,7 +192,7 @@ void entity_MulticoinBlock_check_if_inactive(Entity* entity) { if (data->gameFlagIndex != 0xFFFF) { if (get_global_flag(data->gameFlagIndex) != 0) { - create_entity(&Entity_InertYellowBlock, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); + create_entity(&Entity_InertYellowBlock, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, MAKE_ENTITY_END); entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); } } diff --git a/src/entity/BlueWarpPipe.c b/src/entity/BlueWarpPipe.c index e3917a04ea..6a16974680 100644 --- a/src/entity/BlueWarpPipe.c +++ b/src/entity/BlueWarpPipe.c @@ -2,7 +2,7 @@ #include "npc.h" #include "sprite.h" -void entity_BlueWarpPipe_setupGfx(); +void entity_BlueWarpPipe_setupGfx(void* renderData); void entity_BlueWarpPipe_check_if_active(Entity* entity) { BlueWarpPipeData* pipeData; @@ -131,7 +131,7 @@ void entity_BlueWarpPipe_enter_pipe_update(Entity* entity) { } void entity_BlueWarpPipe_start_bound_script(Entity* entity) { - Bytecode* triggerScriptStart = entity->dataBuf.bluePipe->onEnterPipeEvt; + EvtScript* triggerScriptStart = entity->dataBuf.bluePipe->onEnterPipeEvt; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; entity->boundScriptBytecode = triggerScriptStart; @@ -142,22 +142,18 @@ INCLUDE_ASM(s32, "entity/BlueWarpPipe", entity_BlueWarpPipe_setupGfx); f32 entity_init_BlueWarpPipe(Entity* entity) { BlueWarpPipeData* data; - s32* args = &CreateEntityVarArgBuffer; - s32 entryID; - s32 enterPipeEvt; - s32 flagIndex; - f32* outPosY; + s32 entryID = CreateEntityVarArgBuffer[0]; + EvtScript* enterPipeEvt = (EvtScript*)CreateEntityVarArgBuffer[1]; + s32 flagIndex = CreateEntityVarArgBuffer[2]; - entryID = args[0]; - enterPipeEvt = args[1]; - flagIndex = args[2]; entity->renderSetupFunc = &entity_BlueWarpPipe_setupGfx; + data = entity->dataBuf.bluePipe; - outPosY = &entity->position.y; // required... wtf data->entryID = entryID; data->onEnterPipeEvt = enterPipeEvt; data->flagIndex = flagIndex; data->finalPosY = entity->position.y; data->isRaised = get_global_flag(data->flagIndex); - *outPosY = entity->position.y - (data->isRaised ? 15.0 : 52.0); + + entity->position.y -= (data->isRaised ? 15.0 : 52.0); } diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c index 21c4182641..601aae79b7 100644 --- a/src/entity/HeartBlock.c +++ b/src/entity/HeartBlock.c @@ -285,8 +285,7 @@ s8 entity_HeartBlock_create_child_entity(Entity* entity, EntityBlueprint* bp) { HeartBlockContentData* data; entity_base_block_init(entity); - childEntity = get_entity_by_index(create_entity(bp, entity->position.x, entity->position.y, entity->position.z, 0.0f, - 0x80000000)); + childEntity = get_entity_by_index(create_entity(bp, entity->position.x, entity->position.y, entity->position.z, 0.0f, MAKE_ENTITY_END)); data = childEntity->dataBuf.heartBlockContent; data->parentEntityIndex = entity->listIndex; diff --git a/src/entity/ItemBlock.c b/src/entity/ItemBlock.c index f2acdfc836..658248d7ab 100644 --- a/src/entity/ItemBlock.c +++ b/src/entity/ItemBlock.c @@ -60,14 +60,14 @@ void entity_ItemBlock_check_if_inactive(Entity* entity) { ItemBlockData* data = entity->dataBuf.itemBlock; if ((data->gameFlagIndex != 0xFFFF) && get_global_flag(data->gameFlagIndex)) { - UNK_PTR phi_a0; + UNK_PTR bp; if (get_entity_type(entity->listIndex) != ENTITY_TYPE_RED_BLOCK) { - phi_a0 = &Entity_InertYellowBlock; + bp = &Entity_InertYellowBlock; } else { - phi_a0 = &Entity_InertRedBlock; + bp = &Entity_InertRedBlock; } - create_entity(phi_a0, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); + create_entity(bp, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, MAKE_ENTITY_END); set_entity_commandlist(entity, &D_802EA310); } else { exec_entity_commandlist(entity); @@ -78,7 +78,7 @@ void entity_ItemBlock_check_if_inactive(Entity* entity) { // followed by an inert version of the block. void entity_ItemBlock_replace_with_inactive(Entity* entity) { s32 entityType = get_entity_type(entity->listIndex); - EntityBlueprint* entityBlueprint = &Entity_InertYellowBlock; + EntityBlueprint* bp = &Entity_InertYellowBlock; s32 childEntityIndex; s32 isBlockOnGround; s32 parentEntityType; @@ -87,14 +87,14 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { Shadow* shadow; if (entityType < ENTITY_TYPE_HAMMER1_BLOCK) { - entityBlueprint = &Entity_InertYellowBlock; + bp = &Entity_InertYellowBlock; if (entityType >= ENTITY_TYPE_HIDDEN_RED_BLOCK) { - entityBlueprint = &Entity_InertRedBlock; + bp = &Entity_InertRedBlock; } } // this child entity is the inert block - childEntityIndex = create_entity(entityBlueprint, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); + childEntityIndex = create_entity(bp, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, MAKE_ENTITY_END); childEntity = get_entity_by_index(childEntityIndex); childEntity->flags |= ENTITY_FLAGS_HIDDEN; @@ -112,15 +112,15 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { parentEntityType = get_entity_type(entity->listIndex); if (parentEntityType == ENTITY_TYPE_HIDDEN_RED_BLOCK || parentEntityType == ENTITY_TYPE_RED_BLOCK) { - entityBlueprint = &Entity_HitRedBlock; + bp = &Entity_HitRedBlock; } else if (isBlockOnGround != 0) { - entityBlueprint = &Entity_HitGroundedYellowBlock; + bp = &Entity_HitGroundedYellowBlock; } else { - entityBlueprint = &Entity_HitFloatingYellowBlock; + bp = &Entity_HitFloatingYellowBlock; } // child entity is now the animated block which appears before it turns inert - childEntity = get_entity_by_index(create_entity(entityBlueprint, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000)); + childEntity = get_entity_by_index(create_entity(bp, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, MAKE_ENTITY_END)); childEntity->alpha = entity->alpha; if ((entity->flags & ENTITY_FLAGS_HIDDEN) || (entity->alpha < 0xFF)) { childEntity->alpha = 0x20; diff --git a/src/entity/SuperBlock.c b/src/entity/SuperBlock.c index 00522a1eb6..1e31388f5a 100644 --- a/src/entity/SuperBlock.c +++ b/src/entity/SuperBlock.c @@ -36,8 +36,7 @@ void entity_upgrade_block_check_if_inactive(Entity* entity) { Entity* childEntity; SuperBlockContentData* childData; - parentData->childEntityIndex = create_entity(&Entity_SuperBlockContent, entity->position.x, entity->position.y, entity->position.z, 0.0f, - 0x80000000); + parentData->childEntityIndex = create_entity(&Entity_SuperBlockContent, entity->position.x, entity->position.y, entity->position.z, 0.0f, MAKE_ENTITY_END); childEntity = get_entity_by_index(parentData->childEntityIndex); childData = childEntity->dataBuf.superBlockContent; childData->parentEntityIndex = entity->listIndex; diff --git a/src/entity/jan_iwa/E2D730.c b/src/entity/jan_iwa/E2D730.c index f707765747..efe56de131 100644 --- a/src/entity/jan_iwa/E2D730.c +++ b/src/entity/jan_iwa/E2D730.c @@ -121,7 +121,7 @@ void func_802BB6E0_E2E010(Entity* entity) { s32 entityIndex; get_animator_by_index(entity->virtualModelIndex)->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - entityIndex = create_entity(&D_802BC7D0_E2F100, entity->position.x, entity->position.y, entity->position.z, 0, 0x80000000); + entityIndex = create_entity(&D_802BC7D0_E2F100, entity->position.x, entity->position.y, entity->position.z, 0, MAKE_ENTITY_END); data->unk_04.index = entityIndex; newEntity = get_entity_by_index(entityIndex); data = (structE2D730*)newEntity->dataBuf.unk; diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 4c54683112..9c86e42e45 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -77,27 +77,27 @@ ApiStatus func_802CA988(Evt* script, s32 isInitialCall) { Bytecode outVar2 = *args++; Bytecode outVar3 = *args++; Bytecode outVar4 = *args++; - f32 temp1, temp2, temp3; + f32 dx, dy, dz; gCameras[id].updateMode = 2; gCameras[id].unk_06 = 0; gCameras[id].unk_1C = -round(gCameras[id].currentPitch); - gCameras[id].unk_1E = -gCameras[id].currentBlendedYawNegated; + gCameras[id].auxBoomLength = -gCameras[id].currentBlendedYawNegated; - temp1 = gCameras[id].lookAt_obj.x - gCameras[id].lookAt_eye.x; - temp2 = gCameras[id].lookAt_obj.y - gCameras[id].lookAt_eye.y; - temp3 = gCameras[id].lookAt_obj.z - gCameras[id].lookAt_eye.z; + dx = gCameras[id].lookAt_obj.x - gCameras[id].lookAt_eye.x; + dy = gCameras[id].lookAt_obj.y - gCameras[id].lookAt_eye.y; + dz = gCameras[id].lookAt_obj.z - gCameras[id].lookAt_eye.z; - gCameras[id].unk_20 = round(sqrtf(SQ(temp1) + SQ(temp2) + SQ(temp3))); - gCameras[id].unk_22 = 0; - gCameras[id].unk_54 = gCameras[id].lookAt_obj.x; - gCameras[id].unk_58 = gCameras[id].lookAt_obj.y; - gCameras[id].unk_5C = gCameras[id].lookAt_obj.z; + gCameras[id].unk_20 = round(sqrtf(SQ(dx) + SQ(dy) + SQ(dz))); + gCameras[id].auxBoomPitch = 0; + gCameras[id].auxPos.x = gCameras[id].lookAt_obj.x; + gCameras[id].auxPos.y = gCameras[id].lookAt_obj.y; + gCameras[id].auxPos.z = gCameras[id].lookAt_obj.z; evt_set_variable(script, outVar1, gCameras[id].unk_1C); - evt_set_variable(script, outVar2, gCameras[id].unk_1E); + evt_set_variable(script, outVar2, gCameras[id].auxBoomLength); evt_set_variable(script, outVar3, gCameras[id].unk_20); - evt_set_variable(script, outVar4, gCameras[id].unk_22); + evt_set_variable(script, outVar4, gCameras[id].auxBoomPitch); return ApiStatus_DONE2; } @@ -122,9 +122,9 @@ ApiStatus func_802CABE8(Evt* script, s32 isInitialCall) { s16 value4 = evt_get_variable(script, *args++); Camera* camera = &gCameras[id]; - camera->unk_22 = value4; + camera->auxBoomPitch = value4; camera->unk_1C = value1; - camera->unk_1E = value2; + camera->auxBoomLength = value2; camera->unk_20 = value3; return ApiStatus_DONE2; } @@ -139,8 +139,8 @@ ApiStatus func_802CACC0(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[id]; camera->zoomPercent = zoomPercent; - camera->unk_24 = value1; - camera->unk_26 = value2; + camera->auxBoomYaw = value1; + camera->auxBoomZOffset = value2; camera->unk_28 = value3; return ApiStatus_DONE2; } @@ -167,9 +167,9 @@ ApiStatus func_802CAE50(Evt* script, s32 isInitialCall) { s32 value3 = evt_get_variable(script, *args++); Camera* camera = &gCameras[id]; - camera->unk_54 = value1; - camera->unk_58 = value2; - camera->unk_5C = value3; + camera->auxPos.x = value1; + camera->auxPos.y = value2; + camera->auxPos.z = value3; return ApiStatus_DONE2; } @@ -192,62 +192,61 @@ INCLUDE_ASM(s32, "evt/cam_api", func_802CB008, Evt* script, s32 isInitialCall); ApiStatus ShakeCam(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 camIndex = evt_get_variable(script, *args++); - s32 temp_s3 = evt_get_variable(script, *args++); - s32 temp_s4 = evt_get_variable(script, *args++); - f32 temp_f20 = 2.0f * evt_get_float_variable(script, *args++); + s32 shakeMode = evt_get_variable(script, *args++); + s32 duration = evt_get_variable(script, *args++); + f32 magnitude = 2.0f * evt_get_float_variable(script, *args++); Camera* camera = &gCameras[camIndex]; - f32 temp_f2; - f32 phi_f2; - s32 temp_a1; + f32 scale; + f32 rumbleMagnitude; + s32 rumbleDuration; if (isInitialCall) { - switch (temp_s3){ - case 0: - case 1: + switch (shakeMode){ + case CAM_SHAKE_CONSTANT_VERTICAL: + case CAM_SHAKE_ANGULAR_HORIZONTAL: break; - case 2: - temp_s4 *= 4; - break; - default: + case CAM_SHAKE_DECAYING_VERTICAL: + duration *= 4; break; } - *(f32*)&script->functionTemp[3] = 1.0f; - script->functionTemp[1] = temp_s4; + *(f32*)&script->functionTemp[3] = 1.0f; //TODO functionTempF ? + script->functionTemp[1] = duration; if (!gGameStatusPtr->isBattle) { - if (temp_f20 > 10.0f) { - temp_f20 = 10.0f; + if (magnitude > 10.0f) { + magnitude = 10.0f; } - phi_f2 = temp_f20; - if (temp_f20 > 6.0f) { - phi_f2 = 6.0f; + rumbleMagnitude = magnitude; + if (rumbleMagnitude > 6.0f) { + rumbleMagnitude = 6.0f; } - phi_f2 = phi_f2 * 32.0f + 64.0f; + rumbleMagnitude = rumbleMagnitude * 32.0f + 64.0f; - temp_a1 = temp_s4; - if (temp_a1 < 5) { - temp_a1 = 5; + rumbleDuration = duration; + + if (rumbleDuration < 5) { + rumbleDuration = 5; } - start_rumble(phi_f2, (temp_a1 & 0xFFFF) * 2); + start_rumble(rumbleMagnitude, (rumbleDuration & 0xFFFF) * 2); } } camera->flags |= CAM_FLAG_SHAKING; - temp_f2 = script->functionTempF[3]; - switch (temp_s3) { - case 0: - guTranslateF(camera->viewMtxShaking, 0.0f, -temp_f2 * temp_f20, 0.0f); + scale = script->functionTempF[3]; + switch (shakeMode) { + case CAM_SHAKE_CONSTANT_VERTICAL: + guTranslateF(camera->viewMtxShaking, 0.0f, -scale * magnitude, 0.0f); script->functionTempF[3] = -script->functionTempF[3]; break; - case 1: - guRotateF(camera->viewMtxShaking, temp_f2 * temp_f20, 0.0f, 0.0f, 1.0f); + case CAM_SHAKE_ANGULAR_HORIZONTAL: + guRotateF(camera->viewMtxShaking, scale * magnitude, 0.0f, 0.0f, 1.0f); script->functionTempF[3] = -script->functionTempF[3]; break; - case 2: - guTranslateF(camera->viewMtxShaking, 0.0f, -temp_f2 * temp_f20, 0.0f); - if ((script->functionTemp[1] < (temp_s4 * 2)) && (temp_s4 < script->functionTemp[1])) { + case CAM_SHAKE_DECAYING_VERTICAL: + guTranslateF(camera->viewMtxShaking, 0.0f, -scale * magnitude, 0.0f); + if ((script->functionTemp[1] < (duration * 2)) && (duration < script->functionTemp[1])) { script->functionTempF[3] = script->functionTempF[3] * -0.8; } else { script->functionTempF[3] = -script->functionTempF[3]; @@ -315,10 +314,10 @@ ApiStatus PanToTarget(Evt* script, s32 isInitialCall) { camera->unk_506 = 1; if (targetType != 0) { - camera->followPlayer = 1; + camera->followPlayer = TRUE; camera->panPhase = panPhase; } else { - camera->followPlayer = 0; + camera->followPlayer = FALSE; camera->panPhase = 0.0f; camera->moveSpeed = 1.0f; } diff --git a/src/evt/evt.c b/src/evt/evt.c index e63959a9e1..2ac515737c 100644 --- a/src/evt/evt.c +++ b/src/evt/evt.c @@ -977,9 +977,9 @@ s32 evt_trigger_on_activate_exec_script(Trigger* trigger) { script = start_script((EvtScript*)scriptStart, trigger->priority, 0x20); trigger->runningScript = script; trigger->runningScriptID = script->id; - script->varTable[0] = trigger->scriptVars[0]; - script->varTable[1] = trigger->scriptVars[1]; - script->varTable[2] = trigger->scriptVars[2]; + script->varTable[0] = trigger->varTable[0]; + script->varTable[1] = trigger->varTable[1]; + script->varTable[2] = trigger->varTable[2]; script->owner2.trigger = trigger; } @@ -1012,9 +1012,9 @@ ApiStatus evt_handle_bind(Evt* script) { trigger->onTriggerEvt = (EvtScript*)triggerScript; trigger->runningScript = NULL; trigger->priority = script->priority; - trigger->scriptVars[0] = evt_get_variable(script, script->varTable[0]); - trigger->scriptVars[1] = evt_get_variable(script, script->varTable[1]); - trigger->scriptVars[2] = evt_get_variable(script, script->varTable[2]); + trigger->varTable[0] = evt_get_variable(script, script->varTable[0]); + trigger->varTable[1] = evt_get_variable(script, script->varTable[1]); + trigger->varTable[2] = evt_get_variable(script, script->varTable[2]); if (triggerOut != 0) { evt_set_variable(script, triggerOut, (s32)trigger); @@ -1097,9 +1097,9 @@ s32 evt_trigger_on_activate_lock(Trigger* trigger) { Evt* newScript = start_script(trigger->onTriggerEvt, trigger->priority, 0x20); trigger->runningScript = newScript; trigger->runningScriptID = newScript->id; - newScript->varTable[0] = trigger->scriptVars[0]; - newScript->varTable[1] = trigger->scriptVars[1]; - newScript->varTable[2] = trigger->scriptVars[2]; + newScript->varTable[0] = trigger->varTable[0]; + newScript->varTable[1] = trigger->varTable[1]; + newScript->varTable[2] = trigger->varTable[2]; newScript->owner2.trigger = trigger; } @@ -1132,9 +1132,9 @@ ApiStatus evt_handle_bind_lock(Evt* script) { trigger->onTriggerEvt = (EvtScript*)triggerScript; trigger->runningScript = NULL; trigger->priority = script->priority; - trigger->scriptVars[0] = evt_get_variable(script, script->varTable[0]); - trigger->scriptVars[1] = evt_get_variable(script, script->varTable[1]); - trigger->scriptVars[2] = evt_get_variable(script, script->varTable[2]); + trigger->varTable[0] = evt_get_variable(script, script->varTable[0]); + trigger->varTable[1] = evt_get_variable(script, script->varTable[1]); + trigger->varTable[2] = evt_get_variable(script, script->varTable[2]); return ApiStatus_DONE2; } diff --git a/src/evt/npc_api.c b/src/evt/npc_api.c index b3e10332ad..6512c04c45 100644 --- a/src/evt/npc_api.c +++ b/src/evt/npc_api.c @@ -246,7 +246,7 @@ ApiStatus NpcMoveTo(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - script->functionTempNpc[1] = npc; + script->functionTempPtr[1] = npc; npc->moveToPos.x = goalX; npc->moveToPos.z = goalZ; npc->duration = duration; @@ -263,7 +263,7 @@ ApiStatus NpcMoveTo(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 1; } - npc = script->functionTempNpc[1]; + npc = script->functionTempPtr[1]; npc->yaw = atan2(npc->pos.x, npc->pos.z, npc->moveToPos.x, npc->moveToPos.z); npc_move_heading(npc, npc->moveSpeed, npc->yaw); @@ -309,7 +309,7 @@ ApiStatus _npc_jump_to(Evt* script, s32 isInitialCall, s32 snapYaw) { return ApiStatus_DONE2; } - script->functionTempNpc[1] = npc; + script->functionTempPtr[1] = npc; npc->moveToPos.x = goalX; npc->moveToPos.y = goalY; npc->moveToPos.z = goalZ; @@ -337,7 +337,7 @@ ApiStatus _npc_jump_to(Evt* script, s32 isInitialCall, s32 snapYaw) { script->functionTemp[0] =1; } - npc = script->functionTempNpc[1]; + npc = script->functionTempPtr[1]; npc_move_heading(npc, npc->moveSpeed, *yaw); npc->pos.y += npc->jumpVelocity; @@ -379,7 +379,7 @@ ApiStatus NpcFlyTo(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - script->functionTempNpc[1] = npc; + script->functionTempPtr[1] = npc; npc->moveToPos.x = evt_get_float_variable(script, *args++); npc->moveToPos.y = evt_get_float_variable(script, *args++); npc->moveToPos.z = evt_get_float_variable(script, *args++); @@ -401,7 +401,7 @@ ApiStatus NpcFlyTo(Evt* script, s32 isInitialCall) { } } - npc = script->functionTempNpc[1]; + npc = script->functionTempPtr[1]; npc->pos.x = update_lerp(script->functionTemp[3], *outX, npc->moveToPos.x, npc->duration, script->varTable[6]); npc->pos.y = update_lerp(script->functionTemp[3], *outY, npc->moveToPos.y, npc->duration, script->varTable[6]); npc->pos.z = update_lerp(script->functionTemp[3], *outZ, npc->moveToPos.z, npc->duration, script->varTable[6]); @@ -481,7 +481,7 @@ ApiStatus InterpNpcYaw(Evt* script, s32 isInitialCall) { *initialYaw = npc->yaw; *deltaYaw = evt_get_variable(script, *args++) - *initialYaw; - script->functionTempNpc[0] = npc; + script->functionTempPtr[0] = npc; *turnTime = evt_get_variable(script, *args++); if (*turnTime == 0) { @@ -499,7 +499,7 @@ ApiStatus InterpNpcYaw(Evt* script, s32 isInitialCall) { } } - npc = script->functionTempNpc[0]; + npc = script->functionTempPtr[0]; if (*turnTime > 0) { npc->duration++; npc->yaw = *initialYaw + ((*deltaYaw * npc->duration) / *turnTime); @@ -529,7 +529,7 @@ ApiStatus NpcFacePlayer(Evt* script, s32 isInitialCall) { *initialYaw = npc->yaw; *deltaYaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z) - *initialYaw; - script->functionTempNpc[0] = npc; + script->functionTempPtr[0] = npc; *turnTime = evt_get_variable(script, *args++); npc->duration = 0; @@ -541,7 +541,7 @@ ApiStatus NpcFacePlayer(Evt* script, s32 isInitialCall) { } } - npc = script->functionTempNpc[0]; + npc = script->functionTempPtr[0]; if (*turnTime > 0) { npc->duration++; npc->yaw = *initialYaw + ((*deltaYaw * npc->duration) / *turnTime); @@ -577,7 +577,7 @@ ApiStatus NpcFaceNpc(Evt* script, s32 isInitialCall) { *initialYaw = turningNpc->yaw; *deltaYaw = atan2(turningNpc->pos.x, turningNpc->pos.z, targetNpc->pos.x, targetNpc->pos.z) - *initialYaw; - script->functionTempNpc[0] = turningNpc; + script->functionTempPtr[0] = turningNpc; *turnTime = evt_get_variable(script, *args++); turningNpc->duration = 0; @@ -589,7 +589,7 @@ ApiStatus NpcFaceNpc(Evt* script, s32 isInitialCall) { } } - turningNpc = script->functionTempNpc[0]; + turningNpc = script->functionTempPtr[0]; if (*turnTime > 0) { turningNpc->duration++; turningNpc->yaw = *initialYaw + ((*deltaYaw * turningNpc->duration) / *turnTime); diff --git a/src/evt/script_list.c b/src/evt/script_list.c index 51c4e71f8b..673dba9636 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -671,8 +671,8 @@ Trigger* bind_trigger(EvtScript* script, s32 flags, s32 triggerFlagIndex, s32 tr trigger->onTriggerEvt = script; trigger->runningScript = NULL; trigger->priority = priority; - trigger->scriptVars[0] = triggerVar0; - trigger->scriptVars[1] = triggerVar1; + trigger->varTable[0] = triggerVar0; + trigger->varTable[1] = triggerVar1; return trigger; } diff --git a/src/hud_element.c b/src/hud_element.c index e60d546287..096b6064bb 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -694,15 +694,15 @@ void func_801413F8(void) { gCameras[CAM_CAM3].unk_20 = 0x3CBF; gCameras[CAM_CAM3].nearClip = 0x10; gCameras[CAM_CAM3].unk_1C = 0; - gCameras[CAM_CAM3].unk_1E = 0; - gCameras[CAM_CAM3].unk_22 = 0; - gCameras[CAM_CAM3].unk_5C = 0; + gCameras[CAM_CAM3].auxBoomLength = 0; + gCameras[CAM_CAM3].auxBoomPitch = 0; + gCameras[CAM_CAM3].auxPos.z = 0; gCameras[CAM_CAM3].farClip = 0x4000; gCameras[CAM_CAM3].bgColor[0] = 0; gCameras[CAM_CAM3].bgColor[1] = 0; gCameras[CAM_CAM3].bgColor[2] = 0; - gCameras[CAM_CAM3].unk_54 = 160.0f; - gCameras[CAM_CAM3].unk_58 = -120.0f; + gCameras[CAM_CAM3].auxPos.x = 160.0f; + gCameras[CAM_CAM3].auxPos.y = -120.0f; gCameras[CAM_CAM3].vfov = 1.0f; gCameras[CAM_CAM3].flags &= ~0x6; } diff --git a/src/msg.c b/src/msg.c index 1f2f7b7247..6e868603d5 100644 --- a/src/msg.c +++ b/src/msg.c @@ -10,16 +10,7 @@ typedef struct UnkMsgStruct8 { /* 0x02 */ char unk_02[0xE]; } UnkMsgStruct8; // size = 0x16 -typedef struct UnkImage14 { - /* 0x00 */ s32* raster; - /* 0x04 */ s32* palette; - /* 0x08 */ u16 width; - /* 0x0A */ u16 height; - /* 0x0C */ s32 format; - /* 0x10 */ s32 bitDepth; -} UnkImage14; // size = 0x14 - -typedef UnkImage14* UnkImage14List[1]; +typedef MessageImageData* MessageImageDataList[1]; extern s32 D_802EF0D0; @@ -123,7 +114,7 @@ extern s32 D_8015C7E0; // BSS extern s32 gMsgBGScrollAmtX; extern u16 gMsgGlobalWaveCounter; -extern UnkImage14List gMsgVarImages; +extern MessageImageDataList gMsgVarImages; extern s32 gMsgBGScrollAmtY; extern Gfx* D_80151338; extern char gMessageBuffers[][1024]; @@ -155,7 +146,6 @@ extern MessageCharset* gMsgCharsets[5]; extern s32 D_802F39D0; extern UnkMsgStruct8 D_802F4560[]; -void load_font(s32 font); s32 _update_message(MessagePrintState*); void initialize_printer(MessagePrintState* printer, s32 arg1, s32 arg2); MessagePrintState* _msg_get_printer_for_msg(s32 msgID, s32* donePrintingWriteback, s32 arg2); @@ -165,8 +155,6 @@ void msg_draw_choice_pointer(MessagePrintState* printer); void draw_message_window(MessagePrintState* printer); void appendGfx_message(MessagePrintState*, s16, s16, u16, u16, u16, u8); void appendGfx_msg_prim_rect(u8 r, u8 g, u8 b, u8 a, u16 ulX, u16 ulY, u16 lrX, u16 lrY); -void get_msg_properties(s32 msgID, s32* height, s32* width, s32* maxLineChars, s32* numLines, - s32* maxLinesPerPage, s32* arg6, s32 charset); void msg_reset_gfx_state(void); void msg_draw_char(MessagePrintState* printer, MessageDrawState* drawState, s32 charIndex, s32 palette, s32 posX, s32 posY); @@ -228,7 +216,7 @@ void update_messages(void) { } for (i = 0; i < ARRAY_COUNT(gMessagePrinters); i++) { - if (gMessagePrinters[i].stateFlags & 2) { + if (gMessagePrinters[i].stateFlags & MSG_STATE_FLAG_2) { _update_message(&gMessagePrinters[i]); } } @@ -250,7 +238,7 @@ void render_messages(void) { s32 i; for (i = 0; i < ARRAY_COUNT(gMessagePrinters); i++) { - if (gMessagePrinters[i].stateFlags & 0x2) { + if (gMessagePrinters[i].stateFlags & MSG_STATE_FLAG_2) { gSPViewport(gMasterGfxPos++, D_8014C280); guOrtho(matrix, 0.0f, 319.0f, -240.0f, 0.0f, -500.0f, 500.0f, 1.0f); gSPMatrix(gMasterGfxPos++, OS_K0_TO_PHYSICAL(matrix), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); @@ -264,17 +252,17 @@ void render_messages(void) { } for (i = 0; i < ARRAY_COUNT(gMessagePrinters); i++) { - if (gMessagePrinters[i].stateFlags & 0x2) { + if (gMessagePrinters[i].stateFlags & MSG_STATE_FLAG_2) { draw_message_window(&gMessagePrinters[i]); - if (gMessagePrinters[i].windowState == 5) { - if (!(gMessagePrinters[i].stateFlags & 0x8000) && !(gMessagePrinters[i].stateFlags & 0x40)) { + if (gMessagePrinters[i].windowState == MSG_WINDOW_STATE_WAITING) { + if (!(gMessagePrinters[i].stateFlags & MSG_STATE_FLAG_8000) && !(gMessagePrinters[i].stateFlags & MSG_STATE_FLAG_40)) { msg_update_rewind_arrow(i); } - } else if (gMessagePrinters[i].windowState == 0xC) { + } else if (gMessagePrinters[i].windowState == MSG_WINDOW_STATE_C) { msg_draw_rewind_arrow(i); - } else if (gMessagePrinters[i].windowState == 7 || gMessagePrinters[i].windowState == 8 || - gMessagePrinters[i].stateFlags & 0x10000 || gMessagePrinters[i].stateFlags & 0x20000) { + } else if (gMessagePrinters[i].windowState == MSG_WINDOW_STATE_WAITING_FOR_CHOICE || gMessagePrinters[i].windowState == MSG_WINDOW_STATE_SCROLLING_BACK || + gMessagePrinters[i].stateFlags & MSG_STATE_FLAG_10000 || gMessagePrinters[i].stateFlags & MSG_STATE_FLAG_20000) { msg_draw_choice_pointer(&gMessagePrinters[i]); } } @@ -286,11 +274,11 @@ void msg_play_speech_sound(MessagePrintState* printer, u8 character) { s16 volume; s32 pitchShift; s32 flag = 1; - s32 hundred = 100; + s32 baseShift = 100; - if (printer->stateFlags & 0x800000 && !(printer->delayFlags & 6) && printer->volume != 0) { + if (printer->stateFlags & MSG_STATE_FLAG_800000 && !(printer->delayFlags & (MSG_DELAY_FLAG_2 | MSG_DELAY_FLAG_4)) && printer->volume != 0) { volTemp = (f32)printer->volume / 100.0; - pitchShift = ((character % 20) * 10) + (printer->speechVolumePitch - hundred); + pitchShift = ((character % 20) * 10) + (printer->speechVolumePitch - baseShift); volume = ((rand_int(15) + 78) * volTemp); if (volume > 255) { @@ -311,7 +299,7 @@ void initialize_printer(MessagePrintState* printer, s32 arg1, s32 arg2) { s32 i; printer->printBufferSize = ARRAY_COUNT(printer->printBuffer); - printer->printBuffer[0] = 0xFB; // next (TODO: make enum for this) + printer->printBuffer[0] = MSG_CHAR_PRINT_END; printer->printDelayTime = 1; printer->charsPerChunk = 1; printer->unk_464 = 6; @@ -470,7 +458,7 @@ s32 msg_printer_load_msg(s32 msgID, MessagePrintState* printer) { printer->srcBuffer = buffer; printer->srcBufferPos = 0; - printer->stateFlags &= ~0x40; + printer->stateFlags &= ~MSG_STATE_FLAG_40; return 1; } @@ -493,15 +481,15 @@ void msg_printer_set_origin_pos(MessagePrintState* msgPrintState, s32 x, s32 y) } s32 cancel_message(MessagePrintState* msgPrintState) { - if ((msgPrintState->stateFlags & 2) == 0) { + if ((msgPrintState->stateFlags & MSG_STATE_FLAG_2) == 0) { return 0; } - msgPrintState->stateFlags |= 1; + msgPrintState->stateFlags |= MSG_STATE_FLAG_1; return 1; } -void set_message_images(UnkImage14List images) { +void set_message_images(MessageImageData* images) { *gMsgVarImages = images; } @@ -550,60 +538,98 @@ void set_message_value(s32 value, s32 index) { } gMessageMsgVars[index][i] = thisChar - 0x20; } - gMessageMsgVars[index][i] = 0xFD; + gMessageMsgVars[index][i] = MSG_CHAR_READ_END; } void close_message(MessagePrintState* msgPrintState) { - msgPrintState->stateFlags &= ~0x40; + msgPrintState->stateFlags &= ~MSG_STATE_FLAG_40; } -// so close, just some dumb control flow thing at the beginning -s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgScale, s32 overrideCharWidth, u8 flags); -#ifdef NON_EQUIVALENT s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgScale, s32 overrideCharWidth, u8 flags) { - u8* charWidthTable; - f32 baseWidth; - f64 charWidth; - f64 modifier; + f32 charWidth; + + if (character >= MSG_CONTROL_CHAR + && (character != MSG_CHAR_READ_SPACE + && character != MSG_CHAR_READ_FULL_SPACE + && character != MSG_CHAR_READ_HALF_SPACE)) { + return 0; + } + + if (overrideCharWidth != 0) { + charWidth = overrideCharWidth; + } else if (flags != 0) { + u8* charWidthTable = gMsgCharsets[charset]->rasters[variation].charWidthTable; + + if (charWidthTable != NULL + && character != MSG_CHAR_READ_SPACE + && character != MSG_CHAR_READ_FULL_SPACE + && character != MSG_CHAR_READ_HALF_SPACE) { + charWidth = charWidthTable[character]; + } else { + charWidth = gMsgCharsets[charset]->rasters[variation].monospaceWidth; + } + } else { + charWidth = gMsgCharsets[charset]->rasters[variation].monospaceWidth; + } - if (character < 0xF0 || (character == 0xF7 || character == 0xF8 || character == 0xF9)) { - if (overrideCharWidth != 0) { - baseWidth = overrideCharWidth; - } else if (flags != 0 && gMsgCharsets[charset]->rasters[variation].charWidthTable != NULL && - character != 0xF7 && character != 0xF8 && character != 0xF9) { - baseWidth = gMsgCharsets[charset]->rasters[variation].charWidthTable[character]; + if (character == MSG_CHAR_READ_SPACE) { + return charWidth * msgScale * 0.6; + } + if (character == MSG_CHAR_READ_FULL_SPACE) { + f64 retWidth = charWidth * msgScale; + return retWidth; + } + if (character == MSG_CHAR_READ_HALF_SPACE) { + return charWidth * msgScale * 0.5; + } + if (character >= MSG_CONTROL_CHAR) { + return 0; + } + return charWidth * msgScale; +} + +s32 msg_get_draw_char_width(s32 character, s32 charset, s32 variation, f32 msgScale, s32 overrideCharWidth, u16 flags) { + f32 baseWidth; + + if (character >= MSG_CONTROL_CHAR + && (character != MSG_CHAR_PRINT_SPACE + && character != MSG_CHAR_PRINT_FULL_SPACE + && character != MSG_CHAR_PRINT_HALF_SPACE)) { + return 0; + } + + if (overrideCharWidth != 0) { + baseWidth = overrideCharWidth; + } else if (flags & MSG_PRINT_FLAG_100) { + u8* charWidthTable = gMsgCharsets[charset]->rasters[variation].charWidthTable; + + if (charWidthTable != NULL + && character != MSG_CHAR_PRINT_SPACE + && character != MSG_CHAR_PRINT_FULL_SPACE + && character != MSG_CHAR_PRINT_HALF_SPACE) { + baseWidth = charWidthTable[character]; } else { baseWidth = gMsgCharsets[charset]->rasters[variation].monospaceWidth; } - - if (character == 0xF7) { - charWidth = baseWidth * msgScale; - modifier = 0.6; - return charWidth * modifier; - } - if (character == 0xF8) { - charWidth = baseWidth * msgScale; - return charWidth; - } - if (character == 0xF9) { - charWidth = baseWidth * msgScale; - modifier = 0.5; - return charWidth * modifier; - } - if (character < 0xF0) { - return baseWidth * msgScale; - } + } else { + baseWidth = gMsgCharsets[charset]->rasters[variation].monospaceWidth; } - return 0; -} -#else -INCLUDE_ASM(s32, "msg", msg_get_print_char_width, s32 character, s32 charset, s32 variation, f32 msgScale, - s32 overrideCharWidth, u8 flags); -#endif -s32 msg_get_draw_char_width(s32 character, s32 charset, s32 varaition, f32 msgScale, s32 overrideCharWidth, s32 flags); -INCLUDE_ASM(s32, "msg", msg_get_draw_char_width, s32 character, s32 charset, s32 varaition, f32 msgScale, - s32 overrideCharWidth, s32 flags); + if (character == MSG_CHAR_PRINT_SPACE) { + return baseWidth * msgScale * 0.6; + } + if (character == MSG_CHAR_PRINT_FULL_SPACE) { + f64 charWidth = baseWidth * msgScale; + return charWidth; + } + if (character == MSG_CHAR_PRINT_HALF_SPACE) { + return baseWidth * msgScale * 0.5; + } + if (character >= MSG_CONTROL_CHAR) { + return 0; + } + return baseWidth * msgScale; +} INCLUDE_ASM(void, "msg", get_msg_properties, s32 msgID, s32* height, s32* width, s32* maxLineChars, s32* numLines, s32* maxLinesPerPage, s32* arg6, s32 charset); @@ -622,24 +648,22 @@ s32 get_msg_lines(s32 msgID) { return numLines; } -// some weird stacky msgIDy stuff -#ifdef NON_EQUIVALENT void draw_msg(s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, u8 style) { - s32 width; MessagePrintState stackPrinter; MessagePrintState* printer; u16 bufferPos; - s32* mallocSpace; + s8* mallocSpace; s32 charset; - s32 flags; - + u16 flags; + s32 width; + flags = 0; bufferPos = 0; mallocSpace = NULL; charset = 0; if (msgID != 0) { - if (style & 1) { + if (style & DRAW_MSG_STYLE_MENU) { flags = 2; charset = 1; } @@ -652,54 +676,51 @@ void draw_msg(s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, u8 style) initialize_printer(printer, 1, 0); if (msgID < 0) { - printer = (MessagePrintState*)msgID; + printer->srcBuffer = (u8*)msgID; } else { mallocSpace = general_heap_malloc(0x400); dma_load_msg(msgID, mallocSpace); printer->srcBuffer = mallocSpace; - get_msg_properties(msgID, 0, &width, 0, 0, 0, 0, charset); + get_msg_properties((s32)printer->srcBuffer, 0, &width, 0, 0, 0, 0, charset); printer->msgWidth = width; } if (palette >= 0) { - printer->printBuffer[bufferPos++] = 0xFF; - printer->printBuffer[bufferPos++] = 4; + printer->printBuffer[bufferPos++] = MSG_CHAR_PRINT_FUNCTION; + printer->printBuffer[bufferPos++] = MSG_PRINT_FUNC_COLOR; printer->printBuffer[bufferPos++] = palette; printer->printBufferPos += 3; } - if (style & 2) { - printer->printBuffer[bufferPos++] = 0xFF; - printer->printBuffer[bufferPos++] = 0x1C; - printer->printBuffer[bufferPos++] = 8; + if (style & DRAW_MSG_STYLE_WAVY) { + printer->printBuffer[bufferPos++] = MSG_CHAR_PRINT_FUNCTION; + printer->printBuffer[bufferPos++] = MSG_PRINT_FUNC_START_FX; + printer->printBuffer[bufferPos++] = MSG_FX_GLOBAL_WAVE; printer->printBufferPos += 3; } - if (style & 4) { - printer->printBuffer[bufferPos++] = 0xFF; - printer->printBuffer[bufferPos++] = 0x1C; - printer->printBuffer[bufferPos++] = 9; + if (style & DRAW_MSG_STYLE_RAINBOW) { + printer->printBuffer[bufferPos++] = MSG_CHAR_PRINT_FUNCTION; + printer->printBuffer[bufferPos++] = MSG_PRINT_FUNC_START_FX; + printer->printBuffer[bufferPos++] = MSG_FX_GLOBAL_RAINBOW; printer->printBufferPos += 3; } - if (style & 8) { - printer->printBuffer[bufferPos++] = 0xFF; - printer->printBuffer[bufferPos++] = 0x1C; - printer->printBuffer[bufferPos++] = 0xE; + if (style & DRAW_MSG_STYLE_DROP_SHADOW) { + printer->printBuffer[bufferPos++] = MSG_CHAR_PRINT_FUNCTION; + printer->printBuffer[bufferPos++] = MSG_PRINT_FUNC_START_FX; + printer->printBuffer[bufferPos++] = MSG_FX_DROP_SHADOW; printer->printBufferPos += 3; } msg_copy_to_print_buffer(printer, 10000, 1); - appendGfx_message(printer, posX, posY, 0, 0, flags, opacity); + appendGfx_message(printer, (s16)posX, (s16)posY, 0, 0, flags, opacity & 0xFF); if (mallocSpace != NULL) { general_heap_free(mallocSpace); } } } -#else -INCLUDE_ASM(void, "msg", draw_msg, s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, s32 style); -#endif INCLUDE_ASM(s32, "msg", msg_update_rewind_arrow); @@ -707,8 +728,8 @@ void msg_draw_rewind_arrow(s32 printerIndex) { MessagePrintState* printer = &gMessagePrinters[printerIndex]; if (printer->rewindArrowBlinkCounter < 6) { - draw_ci_image_with_clipping(&D_802ED550, 0x18, 0x18, 2, 0, &D_802ED670, printer->rewindArrowPos.x, - printer->rewindArrowPos.y, 10, 10, 300, 220, 255); + draw_ci_image_with_clipping(&D_802ED550, 24, 24, G_IM_FMT_CI, G_IM_SIZ_4b, &D_802ED670, printer->rewindArrowPos.x, + printer->rewindArrowPos.y, 10, 10, SCREEN_WIDTH - 20, SCREEN_HEIGHT - 20, 255); } printer->rewindArrowBlinkCounter++; @@ -745,7 +766,7 @@ void draw_message_window(MessagePrintState* printer) { rotZ = -printer->fadeOutCounter; printer->fadeOutCounter++; if (D_8014C588[printer->fadeOutCounter] == 0) { - printer->stateFlags |= 1; + printer->stateFlags |= MSG_STATE_FLAG_1; } break; } @@ -768,7 +789,7 @@ void draw_message_window(MessagePrintState* printer) { void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 additionalOffsetX, u16 additionalOffsetY, u16 flag, u8 alpha) { - SpriteRasterInfo sp50; + SpriteRasterInfo sprRasterInfo; u16 sp80bool; s16 sp8E; s16 sp96; @@ -777,7 +798,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit s16 spAE; u16 spB6; u8 spB8; - f32 spBC; + f32 windowScaleX; s32* spC0; MessageCharset* msgCharset; f32 temp_f10; @@ -788,7 +809,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit f32 bubbleX; f32 bubbleY; f32 temp_f28; - f32 temp_f30; + f32 windowScaleY; f32 temp_f8; f32 temp_f8_5; f64 temp_f0; @@ -811,10 +832,10 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit s16 temp_s6; u32 temp_a0_49; s32 animIdx; - u8 temp_v0_27; - u8 temp_v0_28; - UnkImage14* msgVarImage; - UnkImage14* temp_t4; + u8 packedScaleX; + u8 packedScaleY; + MessageImageData* msgVarImage; + MessageImageData* msgImageData; s32 phi_a0; s32 straightWidth; s32 curveWidth; @@ -842,8 +863,8 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit s32 phi_s0_7; s32 phi_s1_8; s8 varImgHasBorder; - s16 t1; - s16 t2; + s16 imgDrawPosX; + s16 imgDrawPosY; f32 z1; f32 z2; f32 temp1; @@ -855,7 +876,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit if (gMasterGfxPos != D_80151338) { msg_reset_gfx_state(); } - msg_drawState->printModeFlags |= 0x100 | 1; + msg_drawState->printModeFlags |= (MSG_PRINT_FLAG_1 | MSG_PRINT_FLAG_100); sp8E = 255; if (flag & 1) { sp8E = alpha; @@ -880,7 +901,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit msg_drawState->font = 0; msg_drawState->effectFlags = 0; msg_drawState->nextCounter = 0; - msg_drawState->textColor = 0; + msg_drawState->textColor = MSG_PAL_WHITE; sp96 = 0xFF; spAE = 0xFF; spB6 = 0; @@ -900,39 +921,39 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit while (!sp80bool) { switch (msg_drawState->printBuffer[msg_drawState->drawBufferPos]) { - case 0xF0: + case MSG_CHAR_PRINT_ENDL: msg_drawState->nextPos[0] = 0; msg_drawState->nextPos[1] += (s32)((msg_drawState->msgScale.y * gMsgCharsets[msg_drawState->font]->newLineY) + D_802EB644[printer->style]); - if (msg_drawState->printModeFlags & 0x40) { - msg_drawState->printModeFlags |= 0x80; + if (msg_drawState->printModeFlags & MSG_PRINT_FLAG_40) { + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_80; } msg_drawState->drawBufferPos++; break; - case 0xF9: + case MSG_CHAR_PRINT_UNK_CHAR_FA: msg_drawState->drawBufferPos++; break; - case 0xF1: - case 0xF2: - case 0xF3: - case 0xF4: - msg_drawState->fontVariant = msg_drawState->printBuffer[msg_drawState->drawBufferPos] - 0xF1; + case MSG_CHAR_PRINT_VARIANT0: + case MSG_CHAR_PRINT_VARIANT1: + case MSG_CHAR_PRINT_VARIANT2: + case MSG_CHAR_PRINT_VARIANT3: + msg_drawState->fontVariant = msg_drawState->printBuffer[msg_drawState->drawBufferPos] - MSG_CHAR_PRINT_VARIANT0; msg_drawState->drawBufferPos++; break; - case 0xF5: - case 0xF6: - case 0xF7: + case MSG_CHAR_PRINT_SPACE: + case MSG_CHAR_PRINT_FULL_SPACE: + case MSG_CHAR_PRINT_HALF_SPACE: msg_drawState->nextPos[0] += msg_get_draw_char_width(msg_drawState->printBuffer[msg_drawState->drawBufferPos], msg_drawState->font, msg_drawState->fontVariant, msg_drawState->msgScale.x, msg_drawState->currentPosX, msg_drawState->printModeFlags); msg_drawState->drawBufferPos++; break; - case 0xF8: + case MSG_CHAR_PRINT_STYLE: switch (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]) { - case 1: - case 2: - case 3: - case 4: + case MSG_STYLE_RIGHT: + case MSG_STYLE_LEFT: + case MSG_STYLE_CENTER: + case MSG_STYLE_TATTLE: if (printer->windowState == MSG_WINDOW_STATE_OPENING && printer->fadeInCounter == 0) { printer->openStartPos.x = printer->initOpenPos.x; printer->openStartPos.y = printer->initOpenPos.y; @@ -941,10 +962,10 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit temp_s5 = printer->openStartPos.y; temp_s4 = printer->windowBasePos.x + (f32) printer->windowSize.x * 0.5; temp_s3 = printer->windowBasePos.y + (f32) printer->windowSize.y * 0.5; - msg_drawState->textColor = 10; - msg_drawState->printModeFlags |= 0x10; + msg_drawState->textColor = MSG_PAL_STANDARD; + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_10; - if (printer->style == 1 || printer->style == 2 || printer->style == 3) { + if (printer->style == MSG_STYLE_RIGHT || printer->style == MSG_STYLE_LEFT || printer->style == MSG_STYLE_CENTER) { straightWidth = 218; printer->windowBasePos.x = 22; printer->windowBasePos.y = 13; @@ -1006,8 +1027,8 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit if (temp_a2 < 18) { temp_a2 = 18; } - if (temp_a2 + printer->windowSize.x > 302) { - temp_a2 = 302 - printer->windowSize.x; + if (temp_a2 + printer->windowSize.x > SCREEN_WIDTH - 18) { + temp_a2 = SCREEN_WIDTH - 18 - printer->windowSize.x; } phi_a0 = printer->openStartPos.y - 38 - printer->windowSize.y; if (phi_a0 < 20) { @@ -1027,42 +1048,42 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit } if (printer->windowState == MSG_WINDOW_STATE_OPENING) { - spBC = update_lerp(0, 0.07f, 1.0f, printer->fadeInCounter, 7); - temp_f30 = update_lerp(0, 0.3f, 1.0f, printer->fadeInCounter, 7); - temp_f28 = update_lerp(0, 96.0f, 200.0f, printer->fadeInCounter, 7); - temp_f20 = update_lerp(11, temp_s5, temp_s3, printer->fadeInCounter, 7); - temp_f24 = update_lerp(11, temp_s6, temp_s4, printer->fadeInCounter, 7); - temp_f2_2 = printer->windowSize.x * spBC; - temp_f0_2 = printer->windowSize.y * temp_f30; + windowScaleX = update_lerp(EASING_LINEAR, 0.07f, 1.0f, printer->fadeInCounter, 7); + windowScaleY = update_lerp(EASING_LINEAR, 0.3f, 1.0f, printer->fadeInCounter, 7); + temp_f28 = update_lerp(EASING_LINEAR, 96.0f, 200.0f, printer->fadeInCounter, 7); + temp_f20 = update_lerp(EASING_SIN_OUT, temp_s5, temp_s3, printer->fadeInCounter, 7); + temp_f24 = update_lerp(EASING_SIN_OUT, temp_s6, temp_s4, printer->fadeInCounter, 7); + temp_f2_2 = printer->windowSize.x * windowScaleX; + temp_f0_2 = printer->windowSize.y * windowScaleY; bubbleX = (temp_f24 - temp_f2_2 * 0.5) + 0.5; bubbleY = (temp_f20 - temp_f0_2 * 0.5) + 0.5; - msg_draw_speech_bubble(printer, bubbleX, bubbleY, straightWidth, curveWidth, height, spBC, temp_f30, temp_f28, 1); + msg_draw_speech_bubble(printer, bubbleX, bubbleY, straightWidth, curveWidth, height, windowScaleX, windowScaleY, temp_f28, 1); printer->fadeInCounter++; if (printer->fadeInCounter == 7) { printer->windowState = MSG_WINDOW_STATE_PRINTING; } } else if (printer->windowState == MSG_WINDOW_STATE_CLOSING) { printer->fadeOutCounter++; - spBC = update_lerp(0, 1.0f, 0.6f, printer->fadeOutCounter, 5); - temp_f30 = update_lerp(0, 1.0f, 0.8f, printer->fadeOutCounter, 5); - temp_f2 = (printer->windowSize.x * spBC); - temp_f0 = (printer->windowSize.y * temp_f30); + windowScaleX = update_lerp(EASING_LINEAR, 1.0f, 0.6f, printer->fadeOutCounter, 5); + windowScaleY = update_lerp(EASING_LINEAR, 1.0f, 0.8f, printer->fadeOutCounter, 5); + temp_f2 = (printer->windowSize.x * windowScaleX); + temp_f0 = (printer->windowSize.y * windowScaleY); temp_f24 = temp_s4; temp_f20 = temp_s3; bubbleX = (temp_f24 - temp_f2 * 0.5) + 0.5; bubbleY = (temp_f20 - temp_f0 * 0.5) + 0.5; temp_f22_2 = (temp_f24 + temp_f2 * 0.5) - 0.5; temp_f20_3 = (temp_f20 + temp_f0 * 0.5) - 0.5; - temp_f28 = update_lerp(0, 255.0f, 64.0f, printer->fadeOutCounter, 5); + temp_f28 = update_lerp(EASING_LINEAR, 255.0f, 64.0f, printer->fadeOutCounter, 5); sp8E = temp_f28 * 0.35; spAE = temp_f28; msg_drawState->clipX[0] = bubbleX + msg_drawState->textStartPos[0]; msg_drawState->clipY[0] = bubbleY + msg_drawState->textStartPos[1]; msg_drawState->clipX[1] = temp_f22_2 - msg_drawState->textStartPos[0]; msg_drawState->clipY[1] = temp_f20_3 - msg_drawState->textStartPos[1]; - msg_draw_speech_bubble(printer, bubbleX, bubbleY, straightWidth, curveWidth, height, spBC, temp_f30, temp_f28, 1); + msg_draw_speech_bubble(printer, bubbleX, bubbleY, straightWidth, curveWidth, height, windowScaleX, windowScaleY, temp_f28, 1); if (printer->fadeOutCounter >= 5) { - printer->stateFlags |= 1; + printer->stateFlags |= MSG_STATE_FLAG_1; } } else { bubbleX = posX + printer->windowBasePos.x; @@ -1078,13 +1099,13 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit msg_drawState->clipX[0] = 20; msg_drawState->clipY[0] = printer->windowOffsetPos.y + printer->windowBasePos.y + msg_drawState->textStartPos[1]; - msg_drawState->clipX[1] = 300; + msg_drawState->clipX[1] = SCREEN_WIDTH - 20; msg_drawState->clipY[1] = msg_drawState->clipY[0] + printer->windowSize.y - 16; } msg_reset_gfx_state(); msg_drawState->drawBufferPos += 2; break; - case 5: + case MSG_STYLE_CHOICE: frameFading = 0; windowSizeX = printer->windowSize.x; windowSizeY = printer->windowSize.y; @@ -1123,7 +1144,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit } else if (printer->windowState == MSG_WINDOW_STATE_CLOSING) { printer->fadeOutCounter++; if (printer->fadeOutCounter >= 5) { - printer->stateFlags |= 1; + printer->stateFlags |= MSG_STATE_FLAG_1; } frameAlpha = ~(printer->fadeOutCounter * 0x2E); sp8E = ((u8)frameAlpha) * 0.6; @@ -1146,14 +1167,14 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit frameAlpha); msg_reset_gfx_state(); spAE = frameAlpha & 0xFF; - msg_drawState->textColor = 10; + msg_drawState->textColor = MSG_PAL_STANDARD; msg_drawState->drawBufferPos += 2; - msg_drawState->printModeFlags |= 0x10; + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_10; break; - case 6: - case 12: - case 13: - case 15: + case MSG_STYLE_INSPECT: + case MSG_STYLE_UPGRADE: + case MSG_STYLE_NARRATE: + case MSG_STYLE_F: fading = 0; msg_drawState->textStartPos[0] = 16; msg_drawState->textStartPos[1] = 3; @@ -1163,7 +1184,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit msg_drawState->clipY[1] = printer->windowBasePos.y + printer->windowSize.y - 5; printer->rewindArrowPos.x = msg_drawState->clipX[1] - 17; printer->rewindArrowPos.y = msg_drawState->clipY[1] - 17; - msg_drawState->textColor = 0; + msg_drawState->textColor = MSG_PAL_WHITE; phi_s0_5 = 0xFF; msg_draw_prim_rect(255, 32, 32, 0, printer->windowBasePos.x + 3, printer->windowBasePos.y - 1, printer->windowSize.x - 6, 1); @@ -1185,7 +1206,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit printer->fadeOutCounter++; fading = 1; if (printer->fadeOutCounter == 4) { - printer->stateFlags |= 1; + printer->stateFlags |= MSG_STATE_FLAG_1; } } @@ -1195,8 +1216,8 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit spAE = phi_s0_5 & 0xFF; msg_drawState->drawBufferPos += 2; break; - case 7: - case 8: + case MSG_STYLE_SIGN: + case MSG_STYLE_LAMPPOST: msg_drawState->textStartPos[0] = 18; msg_drawState->textStartPos[1] = 11; printer->windowBasePos.x = 20; @@ -1204,14 +1225,14 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit printer->windowSize.x = 280; msg_drawState->framePalette = 15; temp_s1_5 = 0xFF; - if (printer->style == 7) { + if (printer->style == MSG_STYLE_SIGN) { spC0 = &D_802EC770; printer->windowSize.y = 72; - msg_drawState->textColor = 24; + msg_drawState->textColor = MSG_PAL_18; phi_s6 = &D_802ECD10; } else { spC0 = &D_802EC7F0; - msg_drawState->textColor = 28; + msg_drawState->textColor = MSG_PAL_1C; phi_s6 = &D_802ECD30; } msg_drawState->clipX[0] = 34; @@ -1234,16 +1255,16 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit sp8E = (temp_s1_5 & 0xFF) - 0x30; printer->fadeOutCounter++; if (printer->fadeOutCounter == 3) { - printer->stateFlags |= 1; + printer->stateFlags |= MSG_STATE_FLAG_1; } } } spAE = (u8)temp_s1_5; - draw_ci_image_with_clipping(&D_802EC5F0, 16, 16, 2, 0, phi_s6, 20, 28, 10, 10, 310, 230, temp_s1_5); - draw_ci_image_with_clipping(&D_802EC670, 16, 16, 2, 0, phi_s6, 284, 28, 10, 10, 310, 230, temp_s1_5); - draw_ci_image_with_clipping(&D_802EC6F0, 16, 16, 2, 0, phi_s6, 20, printer->windowSize.y + 12, 10, 10, 310, 230, + draw_ci_image_with_clipping(&D_802EC5F0, 16, 16, G_IM_FMT_CI, G_IM_SIZ_4b, phi_s6, 20, 28, 10, 10, 310, 230, temp_s1_5); + draw_ci_image_with_clipping(&D_802EC670, 16, 16, G_IM_FMT_CI, G_IM_SIZ_4b, phi_s6, 284, 28, 10, 10, 310, 230, temp_s1_5); + draw_ci_image_with_clipping(&D_802EC6F0, 16, 16, G_IM_FMT_CI, G_IM_SIZ_4b, phi_s6, 20, printer->windowSize.y + 12, 10, 10, 310, 230, temp_s1_5); - draw_ci_image_with_clipping(spC0, 16, 16, 2, 0, phi_s6, 284, printer->windowSize.y + 12, 10, 10, 310, 230, temp_s1_5); + draw_ci_image_with_clipping(spC0, 16, 16, G_IM_FMT_CI, G_IM_SIZ_4b, phi_s6, 284, printer->windowSize.y + 12, 10, 10, 310, 230, temp_s1_5); gDPLoadTextureTile_4b(gMasterGfxPos++, D_802EC870, G_IM_FMT_CI, 32, 0, 0, 0, 31, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 4, G_TX_NOLOD, G_TX_NOLOD); gSPTextureRectangle(gMasterGfxPos++, 0x0090, 0x0070, 0x0470, 0x00B0, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); @@ -1266,9 +1287,9 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit msg_reset_gfx_state(); msg_drawState->drawBufferPos += 2; break; - case 9: + case MSG_STYLE_POSTCARD: phi_s2_4 = 0; - msg_drawState->textStartPos[0] = 0xC; + msg_drawState->textStartPos[0] = 12; msg_drawState->textStartPos[1] = 5; printer->windowBasePos.x = 40; printer->windowBasePos.y = 28; @@ -1279,7 +1300,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit printer->rewindArrowPos.x = msg_drawState->clipX[1] - 21; printer->rewindArrowPos.y = msg_drawState->clipY[1] - 20; msg_drawState->framePalette = 0; - msg_drawState->textColor = 0; + msg_drawState->textColor = MSG_PAL_WHITE; msg_draw_prim_rect(255, 32, 32, 0, 43, 27, 234, 1); msg_draw_prim_rect(32, 255, 32, 0, 43, 86, 234, 1); phi_s3_2 = 0xFF; @@ -1296,29 +1317,29 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit sp8E = (phi_s3_2 & 0xFF) - 0x30; printer->fadeOutCounter++; if (printer->fadeOutCounter == 3) { - printer->stateFlags |= 1; + printer->stateFlags |= MSG_STATE_FLAG_1; } phi_s2_4 = 1; } msg_draw_frame(40, 28, 240, 58, 6, msg_drawState->framePalette, phi_s2_4, phi_s3_2, phi_s3_2); - draw_ci_image_with_clipping(printer->letterBackgroundImg, 150, 105, 2, 0, + draw_ci_image_with_clipping(printer->letterBackgroundImg, 150, 105, G_IM_FMT_CI, G_IM_SIZ_4b, printer->letterBackgroundPal, 85, 97, 10, 10, 300, 220, phi_s3_2); - draw_ci_image_with_clipping(printer->letterContentImg, 70, 95, 2, 1, printer->letterContentPal, - 160, 102, 10, 10, 300, 220, phi_s3_2); + draw_ci_image_with_clipping(printer->letterContentImg, 70, 95, G_IM_FMT_CI, G_IM_SIZ_8b, + printer->letterContentPal, 160, 102, 10, 10, 300, 220, phi_s3_2); msg_reset_gfx_state(); spAE = phi_s3_2 & 0xFF; msg_drawState->drawBufferPos += 2; break; - case 10: - case 11: + case MSG_STYLE_POPUP: + case MSG_STYLE_B: msg_drawState->textStartPos[0] = 16; msg_drawState->textStartPos[1] = 4; msg_drawState->clipX[0] = 0; msg_drawState->clipX[1] = SCREEN_WIDTH - 1; msg_drawState->clipY[0] = 0; msg_drawState->clipY[1] = SCREEN_HEIGHT - 1; - msg_drawState->textColor = 0; - msg_drawState->printModeFlags |= 0x10; + msg_drawState->textColor = MSG_PAL_WHITE; + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_10; if (printer->windowState == MSG_WINDOW_STATE_D || printer->windowState == MSG_WINDOW_STATE_E) { printer->windowBasePos.x = 0; printer->windowBasePos.y = 0; @@ -1332,7 +1353,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit msg_reset_gfx_state(); msg_drawState->drawBufferPos += 2; break; - case 14: + case MSG_STYLE_EPILOGUE: printer->windowBasePos.x = 60; printer->windowBasePos.y = 110; printer->windowSize.x = 200; @@ -1350,7 +1371,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit break; } break; - case 0xFA: + case MSG_CHAR_PRINT_NEXT: if (printer->windowState == MSG_WINDOW_STATE_C) { if (msg_drawState->nextCounter >= printer->unkArraySize) { sp80bool = TRUE; @@ -1386,35 +1407,35 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit msg_drawState->nextCounter++; msg_drawState->drawBufferPos++; break; - case 0xFB: + case MSG_CHAR_PRINT_END: sp80bool = TRUE; break; - case 0xFF: + case MSG_CHAR_PRINT_FUNCTION: msg_drawState->drawBufferPos++; switch (msg_drawState->printBuffer[msg_drawState->drawBufferPos]) { - case 0: + case MSG_PRINT_FUNC_FONT: msg_drawState->font = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; msg_drawState->drawBufferPos += 2; - msg_drawState->printModeFlags |= 0x10; + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_10; break; - case 1: + case MSG_PRINT_FUNC_VARIANT: msg_drawState->fontVariant = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; msg_drawState->drawBufferPos += 2; break; - case 4: + case MSG_PRINT_FUNC_COLOR: msg_drawState->textColor = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; - msg_drawState->printModeFlags |= 0x10; + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_10; msg_drawState->drawBufferPos += 2; break; - case 5: + case MSG_PRINT_FUNC_SPACING: msg_drawState->currentPosX = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; msg_drawState->drawBufferPos += 2; break; - case 6: - temp_v0_27 = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; - msg_drawState->msgScale.x = (f32)(temp_v0_27 >> 4) + ((temp_v0_27 & 0xF) * 0.0625f); - temp_v0_28 = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2]; - msg_drawState->msgScale.y = (f32)(temp_v0_28 >> 4) + ((temp_v0_28 & 0xF) * 0.0625f); + case MSG_PRINT_FUNC_SIZE: + packedScaleX = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; + msg_drawState->msgScale.x = (f32)(packedScaleX >> 4) + ((packedScaleX & 0xF) * 0.0625f); + packedScaleY = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2]; + msg_drawState->msgScale.y = (f32)(packedScaleY >> 4) + ((packedScaleY & 0xF) * 0.0625f); msg_drawState->drawBufferPos += 3; if (msg_drawState->msgScale.x > 1.0 || msg_drawState->msgScale.y > 1.0) { gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); @@ -1422,90 +1443,90 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); } break; - case 7: + case MSG_PRINT_FUNC_SIZE_RESET: msg_drawState->msgScale.x = 1.0f; msg_drawState->msgScale.y = 1.0f; msg_drawState->drawBufferPos++; gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); break; - case 8: + case MSG_PRINT_FUNC_SET_X: msg_drawState->nextPos[0] = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] * 256 + (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2]); msg_drawState->drawBufferPos += 3; break; - case 9: + case MSG_PRINT_FUNC_SET_Y: msg_drawState->nextPos[1] = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; msg_drawState->drawBufferPos += 2; break; - case 10: + case MSG_PRINT_FUNC_RIGHT: msg_drawState->nextPos[0] += msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; msg_drawState->drawBufferPos += 2; break; - case 11: + case MSG_PRINT_FUNC_DOWN: msg_drawState->nextPos[1] += msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; msg_drawState->drawBufferPos += 2; break; - case 12: + case MSG_PRINT_FUNC_UP: msg_drawState->nextPos[1] -= msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; msg_drawState->drawBufferPos += 2; break; - case 14: - temp_t4 = &(*gMsgVarImages)[msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]]; + case MSG_PRINT_FUNC_INLINE_IMAGE: + msgImageData = &(*gMsgVarImages)[msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]]; phi_t5 = sp8E; if (sp8E < 0xFF) { phi_t5 = (s32)(sp8E * 0.7); } - t1 = (s16)((msg_drawState->nextPos[0] + (msg_drawState->textStartPos[0] + (printer->windowBasePos.x + posX))) - + imgDrawPosX = (s16)((msg_drawState->nextPos[0] + (msg_drawState->textStartPos[0] + (printer->windowBasePos.x + posX))) - additionalOffsetX); - t2 = (s16)((msg_drawState->nextPos[1] + (msg_drawState->textStartPos[1] + (printer->windowBasePos.y + posY))) - + imgDrawPosY = (s16)((msg_drawState->nextPos[1] + (msg_drawState->textStartPos[1] + (printer->windowBasePos.y + posY))) - additionalOffsetY); - draw_ci_image_with_clipping(temp_t4->raster, temp_t4->width, temp_t4->height, temp_t4->format, temp_t4->bitDepth, - temp_t4->palette, t1, t2, (s32) msg_drawState->clipX[0], (s32) msg_drawState->clipY[0], + draw_ci_image_with_clipping(msgImageData->raster, msgImageData->width, msgImageData->height, msgImageData->format, msgImageData->bitDepth, + msgImageData->palette, imgDrawPosX, imgDrawPosY, (s32) msg_drawState->clipX[0], (s32) msg_drawState->clipY[0], msg_drawState->clipX[1] - msg_drawState->clipX[0], msg_drawState->clipY[1] - msg_drawState->clipY[0], phi_t5); - msg_drawState->printModeFlags |= 0x10 | 0x2; + msg_drawState->printModeFlags |= (MSG_PRINT_FLAG_2 | MSG_PRINT_FLAG_10); msg_drawState->drawBufferPos += 2; break; - case 15: + case MSG_PRINT_FUNC_ANIM_SPRITE: phi_s0_6 = sp8E; if (sp8E < 0xFF) { phi_s0_6 = (s32)(sp8E * 0.7); } - if (spr_get_npc_raster_info(&sp50, (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] << 8) | + if (spr_get_npc_raster_info(&sprRasterInfo, (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] << 8) | msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2], msg_drawState->printBuffer[msg_drawState->drawBufferPos + 3]) != 0) { - t1 = (s16)((msg_drawState->nextPos[0] + (msg_drawState->textStartPos[0] + (printer->windowBasePos.x + posX))) - + imgDrawPosX = (s16)((msg_drawState->nextPos[0] + (msg_drawState->textStartPos[0] + (printer->windowBasePos.x + posX))) - additionalOffsetX); - t2 = (s16)((msg_drawState->nextPos[1] + (msg_drawState->textStartPos[1] + (printer->windowBasePos.y + posY))) - + imgDrawPosY = (s16)((msg_drawState->nextPos[1] + (msg_drawState->textStartPos[1] + (printer->windowBasePos.y + posY))) - additionalOffsetY); - draw_ci_image_with_clipping(sp50.raster, sp50.width, sp50.height, 2, 0, sp50.defaultPal, t1, t2, + draw_ci_image_with_clipping(sprRasterInfo.raster, sprRasterInfo.width, sprRasterInfo.height, G_IM_FMT_CI, G_IM_SIZ_4b, sprRasterInfo.defaultPal, imgDrawPosX, imgDrawPosY, msg_drawState->clipX[0], msg_drawState->clipY[0], msg_drawState->clipX[1] - msg_drawState->clipX[0], msg_drawState->clipY[1] - msg_drawState->clipY[0], phi_s0_6); - msg_drawState->printModeFlags |= 0x10; + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_10; } msg_drawState->drawBufferPos += 4; break; - case 16: + case MSG_PRINT_FUNC_ITEM_ICON: if (D_8015131C != 0) { phi_t3 = sp8E; if (sp8E < 0xFF) { phi_t3 = (s32)(sp8E * 0.7); } - t1 = (s16)((msg_drawState->nextPos[0] + (msg_drawState->textStartPos[0] + (printer->windowBasePos.x + posX))) - + imgDrawPosX = (s16)((msg_drawState->nextPos[0] + (msg_drawState->textStartPos[0] + (printer->windowBasePos.x + posX))) - additionalOffsetX); - t2 = (s16)((msg_drawState->nextPos[1] + (msg_drawState->textStartPos[1] + (printer->windowBasePos.y + posY))) - + imgDrawPosY = (s16)((msg_drawState->nextPos[1] + (msg_drawState->textStartPos[1] + (printer->windowBasePos.y + posY))) - additionalOffsetY); - draw_ci_image_with_clipping(&D_80159B50, 32, 32, 2, 0, &D_8015C7E0, t1, t2, msg_drawState->clipX[0], + draw_ci_image_with_clipping(&D_80159B50, 32, 32, G_IM_FMT_CI, G_IM_SIZ_4b, &D_8015C7E0, imgDrawPosX, imgDrawPosY, msg_drawState->clipX[0], msg_drawState->clipY[0], msg_drawState->clipX[1] - msg_drawState->clipX[0], msg_drawState->clipY[1] - msg_drawState->clipY[0], phi_t3); - msg_drawState->printModeFlags |= 0x10; + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_10; } msg_drawState->drawBufferPos++; break; - case 17: + case MSG_PRINT_FUNC_ANIM_DELAY: animIdx = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; if (printer->animTimers[animIdx] == -1) { printer->animTimers[animIdx] = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 3]; @@ -1516,8 +1537,8 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit dbPos = msg_drawState->drawBufferPos; while (TRUE) { - if ((msg_drawState->printBuffer[dbPos - 1] == 0xFF) && - (msg_drawState->printBuffer[dbPos] == 0x11) && + if ((msg_drawState->printBuffer[dbPos - 1] == MSG_CHAR_PRINT_FUNCTION) && + (msg_drawState->printBuffer[dbPos] == MSG_PRINT_FUNC_ANIM_DELAY) && (msg_drawState->printBuffer[dbPos + 1] == animIdx)) { if (msg_drawState->printBuffer[dbPos + 2] != printer->currentAnimFrame[animIdx]) { dbPos += 4; @@ -1525,8 +1546,8 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit break; } } else { - if ((msg_drawState->printBuffer[dbPos] == 0xFF) && - (msg_drawState->printBuffer[dbPos + 1] == 0x12) && + if ((msg_drawState->printBuffer[dbPos] == MSG_CHAR_PRINT_FUNCTION) && + (msg_drawState->printBuffer[dbPos + 1] == MSG_PRINT_FUNC_ANIM_LOOP) && (msg_drawState->printBuffer[dbPos + 2] == animIdx)) { if (printer->animTimers[animIdx] == 0) { @@ -1538,8 +1559,8 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit break; } } else { - if (msg_drawState->printBuffer[dbPos] == 0xFF && - msg_drawState->printBuffer[dbPos + 1] == 0x13) { + if (msg_drawState->printBuffer[dbPos] == MSG_CHAR_PRINT_FUNCTION && + msg_drawState->printBuffer[dbPos + 1] == MSG_PRINT_FUNC_ANIM_DONE) { if (msg_drawState->printBuffer[dbPos + 2] == animIdx) { dbPos++; break; @@ -1552,7 +1573,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit msg_drawState->drawBufferPos = dbPos; switch (msg_drawState->printBuffer[msg_drawState->drawBufferPos]) { - case 0x11: + case MSG_PRINT_FUNC_ANIM_DELAY: if (printer->animTimers[animIdx] == 0) { if (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 3] == 0) { printer->animTimers[animIdx] = -2; @@ -1562,80 +1583,80 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit } msg_drawState->drawBufferPos += 4; break; - case 0x12: + case MSG_PRINT_FUNC_ANIM_LOOP: msg_drawState->drawBufferPos += 3; break; - case 0x13: + case MSG_PRINT_FUNC_ANIM_DONE: msg_drawState->drawBufferPos += 2; break; } break; - case 18: + case MSG_PRINT_FUNC_ANIM_LOOP: msg_drawState->drawBufferPos += 3; break; - case 19: + case MSG_PRINT_FUNC_ANIM_DONE: msg_drawState->drawBufferPos += 2; break; - case 20: + case MSG_PRINT_FUNC_CURSOR: printer->cursorPosX[msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]] = msg_drawState->textStartPos[0] + msg_drawState->nextPos[0] - additionalOffsetX - 6; printer->cursorPosY[msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]] = msg_drawState->textStartPos[1] + msg_drawState->nextPos[1] - additionalOffsetY - 1; msg_drawState->drawBufferPos += 2; break; - case 21: + case MSG_PRINT_FUNC_OPTION: if (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] == 0xFF) { - msg_drawState->printModeFlags &= ~0x20; + msg_drawState->printModeFlags &= ~MSG_PRINT_FLAG_20; } else { msg_drawState->unk_2D = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; - msg_drawState->printModeFlags |= 0x20; - msg_drawState->nextPos[0] += 0xE; + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_20; + msg_drawState->nextPos[0] += 14; } msg_drawState->drawBufferPos += 2; break; - case 22: + case MSG_PRINT_FUNC_SET_FRAME_PALETTE: msg_drawState->framePalette = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; msg_drawState->drawBufferPos += 2; break; - case 23: + case MSG_PRINT_RESET_GFX: msg_reset_gfx_state(); msg_drawState->drawBufferPos++; break; - case 24: + case MSG_PRINT_FUNC_SAVE_POS: msg_drawState->savedPos[0] = msg_drawState->nextPos[0]; msg_drawState->savedPos[1] = msg_drawState->nextPos[1]; msg_drawState->drawBufferPos++; break; - case 25: + case MSG_PRINT_FUNC_RESTORE_POS: msg_drawState->nextPos[0] = msg_drawState->savedPos[0]; msg_drawState->nextPos[1] = msg_drawState->savedPos[1]; msg_drawState->drawBufferPos++; break; - case 26: + case MSG_PRINT_FUNC_SAVE_COLOR: msg_drawState->savedColor = msg_drawState->textColor; msg_drawState->drawBufferPos++; break; - case 27: + case MSG_PRINT_FUNC_RESTORE_COLOR: msg_drawState->textColor = msg_drawState->savedColor; msg_drawState->drawBufferPos++; break; - case 28: + case MSG_PRINT_FUNC_START_FX: switch (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]) { - case 0: - msg_drawState->effectFlags |= 1; + case MSG_FX_SHAKE: + msg_drawState->effectFlags |= MSG_FX_FLAG_SHAKE; msg_drawState->drawBufferPos += 2; break; - case 1: - msg_drawState->effectFlags |= 2; + case MSG_FX_WAVE: + msg_drawState->effectFlags |= MSG_FX_FLAG_WAVE; msg_drawState->drawBufferPos += 2; break; - case 2: - msg_drawState->effectFlags |= 4; + case MSG_FX_NOISE_OUTLINE: + msg_drawState->effectFlags |= MSG_FX_FLAG_NOISE_OUTLINE; gDPSetCombineLERP(gMasterGfxPos++, NOISE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, NOISE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0); msg_drawState->drawBufferPos += 2; break; - case 3: - msg_drawState->effectFlags |= 0x10000; + case MSG_FX_STATIC: + msg_drawState->effectFlags |= MSG_FX_FLAG_STATIC; gDPSetEnvColor(gMasterGfxPos++, msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2], msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2], @@ -1645,127 +1666,127 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit TEXEL0, 0, 0, 0, TEXEL0); msg_drawState->drawBufferPos += 3; break; - case 5: - msg_drawState->effectFlags |= 0x20; + case MSG_FX_BLUR: + msg_drawState->effectFlags |= MSG_FX_FLAG_BLUR; spB8 = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2]; msg_drawState->drawBufferPos += 3; break; - case 6: - msg_drawState->effectFlags |= 0x40; + case MSG_FX_RAINBOW: + msg_drawState->effectFlags |= MSG_FX_FLAG_RAINBOW; msg_drawState->drawBufferPos += 2; break; - case 7: - msg_drawState->effectFlags |= 0x80; + case MSG_FX_DITHER_FADE: + msg_drawState->effectFlags |= MSG_FX_FLAG_DITHER_FADE; spB6 = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2]; msg_drawState->drawBufferPos += 3; break; - case 8: - msg_drawState->effectFlags |= 0x200; + case MSG_FX_GLOBAL_WAVE: + msg_drawState->effectFlags |= MSG_FX_FLAG_GLOBAL_WAVE; msg_drawState->drawBufferPos += 2; break; - case 9: - msg_drawState->effectFlags |= 0x400; + case MSG_FX_GLOBAL_RAINBOW: + msg_drawState->effectFlags |= MSG_FX_FLAG_GLOBAL_RAINBOW; msg_drawState->drawBufferPos += 2; break; - case 10: - msg_drawState->effectFlags |= 0x800; + case MSG_FX_RISE_PRINT: + msg_drawState->effectFlags |= MSG_FX_FLAG_RISE_PRINT; msg_drawState->drawBufferPos += 2; break; - case 11: - msg_drawState->effectFlags |= 0x1000; + case MSG_FX_GROW_PRINT: + msg_drawState->effectFlags |= MSG_FX_FLAG_GROW_PRINT; msg_drawState->drawBufferPos += 2; break; - case 12: - msg_drawState->effectFlags |= 0x2000; + case MSG_FX_SIZE_JITTER: + msg_drawState->effectFlags |= MSG_FX_FLAG_SIZE_JITTER; msg_drawState->drawBufferPos += 2; break; - case 13: - msg_drawState->effectFlags |= 0x4000; + case MSG_FX_SIZE_WAVE: + msg_drawState->effectFlags |= MSG_FX_FLAG_SIZE_WAVE; msg_drawState->drawBufferPos += 2; break; - case 14: - msg_drawState->effectFlags |= 0x8000; + case MSG_FX_DROP_SHADOW: + msg_drawState->effectFlags |= MSG_FX_FLAG_DROP_SHADOW; msg_drawState->drawBufferPos += 2; break; } break; - case 29: + case MSG_PRINT_FUNC_END_FX: switch (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]) { - case 0: - msg_drawState->effectFlags &= ~0x1; + case MSG_FX_SHAKE: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_SHAKE; break; - case 1: - msg_drawState->effectFlags &= ~0x2; + case MSG_FX_WAVE: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_WAVE; break; - case 2: - msg_drawState->effectFlags &= ~0x4; + case MSG_FX_NOISE_OUTLINE: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_NOISE_OUTLINE; break; - case 3: - msg_drawState->effectFlags &= ~0x10000; + case MSG_FX_STATIC: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_STATIC; break; - case 5: - msg_drawState->effectFlags &= ~0x20; + case MSG_FX_BLUR: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_BLUR; break; - case 6: - msg_drawState->effectFlags &= ~0x40; - msg_drawState->printModeFlags |= 0x10; + case MSG_FX_RAINBOW: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_RAINBOW; + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_10; break; - case 7: - msg_drawState->effectFlags &= ~0x80; + case MSG_FX_DITHER_FADE: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_DITHER_FADE; break; - case 8: - msg_drawState->effectFlags &= ~0x200; + case MSG_FX_GLOBAL_WAVE: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_GLOBAL_WAVE; break; - case 9: - msg_drawState->effectFlags &= ~0x400; - msg_drawState->printModeFlags |= 0x10; + case MSG_FX_GLOBAL_RAINBOW: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_GLOBAL_RAINBOW; + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_10; break; - case 10: - msg_drawState->effectFlags &= ~0x800; + case MSG_FX_RISE_PRINT: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_RISE_PRINT; break; - case 11: - msg_drawState->effectFlags &= ~0x1000; + case MSG_FX_GROW_PRINT: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_GROW_PRINT; break; - case 12: - msg_drawState->effectFlags &= ~0x2000; + case MSG_FX_SIZE_JITTER: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_SIZE_JITTER; break; - case 13: - msg_drawState->effectFlags &= ~0x4000; + case MSG_FX_SIZE_WAVE: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_SIZE_WAVE; break; - case 14: - msg_drawState->effectFlags &= ~0x8000; + case MSG_FX_DROP_SHADOW: + msg_drawState->effectFlags &= ~MSG_FX_FLAG_DROP_SHADOW; break; } msg_drawState->drawBufferPos += 2; break; - case 30: + case MSG_PRINT_FUNC_CENTER_X: if (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] != 0) { msg_drawState->centerPos = msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1]; if (msg_drawState->centerPos == 0xFF) { msg_drawState->centerPos = printer->windowSize.x / 2; } - msg_drawState->printModeFlags |= 0xC0; + msg_drawState->printModeFlags |= (MSG_PRINT_FLAG_40 | MSG_PRINT_FLAG_80); } else { msg_drawState->nextPos[0] = 0; - msg_drawState->printModeFlags &= ~0xC0; + msg_drawState->printModeFlags &= ~(MSG_PRINT_FLAG_40 | MSG_PRINT_FLAG_80); } msg_drawState->drawBufferPos += 2; break; } break; default: - if (msg_drawState->printModeFlags & 2) { + if (msg_drawState->printModeFlags & MSG_PRINT_FLAG_2) { sp96 = 0xFF; gDPPipeSync(gMasterGfxPos++); gSPDisplayList(gMasterGfxPos++, D_8014C500); } msg_drawState->charScale.x = msg_drawState->msgScale.x; msg_drawState->charScale.y = msg_drawState->msgScale.y; - if (msg_drawState->printModeFlags & 0x80) { + if (msg_drawState->printModeFlags & MSG_PRINT_FLAG_80) { msg_drawState->nextPos[0] += msg_drawState->centerPos - printer->msgWidth / 2; - msg_drawState->printModeFlags &= ~0x80; + msg_drawState->printModeFlags &= ~MSG_PRINT_FLAG_80; } - if (msg_drawState->printModeFlags & 0x40) { + if (msg_drawState->printModeFlags & MSG_PRINT_FLAG_40) { charPosX = (u16) msg_drawState->nextPos[0] + ((u16) printer->windowBasePos.x + (u16) posX); } else { charPosX = (u16) msg_drawState->nextPos[0] + ((u16) msg_drawState->textStartPos[0] + ((u16) printer->windowBasePos.x + @@ -1785,54 +1806,54 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit D_802EB644[printer->style]))) { palette = msg_drawState->textColor; phi_s2_5 = sp8E; - if (msg_drawState->effectFlags & 0x20) { + if (msg_drawState->effectFlags & MSG_FX_FLAG_BLUR) { phi_s2_5 = (f32) phi_s2_5 * 0.35; } - if ((printer->windowState == MSG_WINDOW_STATE_WAITING_FOR_CHOICE) && (msg_drawState->printModeFlags & 0x20)) { + if ((printer->windowState == MSG_WINDOW_STATE_WAITING_FOR_CHOICE) && (msg_drawState->printModeFlags & MSG_PRINT_FLAG_20)) { if (msg_drawState->unk_2D == printer->currentOption) { - msg_drawState->effectFlags |= 0x8000 | 0x400 | 0x200; + msg_drawState->effectFlags |= MSG_FX_FLAG_DROP_SHADOW | MSG_FX_FLAG_GLOBAL_RAINBOW | MSG_FX_FLAG_GLOBAL_WAVE; } else { - msg_drawState->effectFlags &= ~0x400; - msg_drawState->effectFlags &= ~0x200; - msg_drawState->effectFlags &= ~0x8000; + msg_drawState->effectFlags &= ~MSG_FX_FLAG_GLOBAL_RAINBOW; + msg_drawState->effectFlags &= ~MSG_FX_FLAG_GLOBAL_WAVE; + msg_drawState->effectFlags &= ~MSG_FX_FLAG_DROP_SHADOW; palette = msg_drawState->textColor; - msg_drawState->printModeFlags |= 0x10; + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_10; } } - if (msg_drawState->effectFlags & 1) { + if (msg_drawState->effectFlags & MSG_FX_FLAG_SHAKE) { charPosX += rand_int(10000) % 2; charPosY += rand_int(10000) % 2; } - if (msg_drawState->effectFlags & 2) { + if (msg_drawState->effectFlags & MSG_FX_FLAG_WAVE) { temp_f2_3 = msg_drawState->msgScale.x - 1.0; temp_s0_7 = (printer->effectFrameCounter * (s32)(20.0 - (temp_f2_3 * 5.0))) - (msg_drawState->visiblePrintedCount * (s32)(45.0 - (temp_f2_3 * 15.0))); charPosX += cosine(temp_s0_7) * ((msg_drawState->msgScale.x - 1.0) + 1.6); charPosY += cosine((temp_s0_7 + 180.0 + 90.0)) * (msg_drawState->msgScale.y - 1.0 + 1.6); } - if (msg_drawState->effectFlags & 0x200) { + if (msg_drawState->effectFlags & MSG_FX_FLAG_GLOBAL_WAVE) { temp_s0_8 = (gMsgGlobalWaveCounter * (s32)(20.0 - ((msg_drawState->msgScale.x - 1.0) * 5.0))) - (msg_drawState->visiblePrintedCount * 45); charPosX += cosine(temp_s0_8) * ((msg_drawState->msgScale.x - 1.0) + 1.6); charPosY += cosine((temp_s0_8 + 180.0 + 90.0)) * ((msg_drawState->msgScale.y - 1.0) + 1.6); } - if (msg_drawState->effectFlags & 0x40) { + if (msg_drawState->effectFlags & MSG_FX_FLAG_RAINBOW) { palette = abs(msg_drawState->visiblePrintedCount - (u16)(printer->effectFrameCounter / 3)) % 10; } - if (msg_drawState->effectFlags & 0x400) { + if (msg_drawState->effectFlags & MSG_FX_FLAG_GLOBAL_RAINBOW) { palette = abs(msg_drawState->visiblePrintedCount - (u16)(gGameStatusPtr->frameCounter / 3)) % 10; } - if (msg_drawState->effectFlags & 0x80) { + if (msg_drawState->effectFlags & MSG_FX_FLAG_DITHER_FADE) { gDPSetAlphaDither(gMasterGfxPos++, G_AD_NOISE); gDPSetAlphaCompare(gMasterGfxPos++, G_AC_DITHER); phi_s2_5 = spB6 * (phi_s2_5 / 255.0); } - if ((msg_drawState->printModeFlags & 2) || (phi_s2_5 != sp96)) { + if ((msg_drawState->printModeFlags & MSG_PRINT_FLAG_2) || (phi_s2_5 != sp96)) { if ((sp96 < 0xFF) && (phi_s2_5 < 0xFF)) { gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, phi_s2_5); } else if ((sp96 == 0xFF) && (phi_s2_5 < 0xFF)) { gDPPipeSync(gMasterGfxPos++); - if (printer->stateFlags & 0x4000) { + if (printer->stateFlags & MSG_STATE_FLAG_4000) { gDPSetRenderMode(gMasterGfxPos++, IM_RD | CVG_DST_CLAMP | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), IM_RD | CVG_DST_CLAMP | ZMODE_XLU | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); @@ -1853,26 +1874,26 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit sp96 = phi_s2_5; } if (phi_s2_5 > 0) { - if (msg_drawState->effectFlags & 0x800) { - if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] != 0xF0) && - (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2] != 0xF0) && - (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 3] != 0xF0) && - (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 4] != 0xF0)) { - if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] == 0xFB) && + if (msg_drawState->effectFlags & MSG_FX_FLAG_RISE_PRINT) { + if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] != MSG_CHAR_PRINT_ENDL) && + (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2] != MSG_CHAR_PRINT_ENDL) && + (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 3] != MSG_CHAR_PRINT_ENDL) && + (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 4] != MSG_CHAR_PRINT_ENDL)) { + if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] == MSG_CHAR_PRINT_END) && (printer->windowState == MSG_WINDOW_STATE_PRINTING)) { msg_drawState->charScale.x = msg_drawState->msgScale.x * 1.7; msg_drawState->charScale.y = msg_drawState->msgScale.y * 1.7; temp_f8 = (msg_drawState->charScale.y / 1.7) * 6.0; charPosX -= temp_f8; charPosY -= temp_f8; - } else if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2] == 0xFB) && + } else if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2] == MSG_CHAR_PRINT_END) && (printer->windowState == MSG_WINDOW_STATE_PRINTING)) { msg_drawState->charScale.x = msg_drawState->msgScale.x * 1.4; msg_drawState->charScale.y = msg_drawState->msgScale.y * 1.4; temp_f8 = (msg_drawState->charScale.y / 1.4) * 3.0; charPosX -= temp_f8; charPosY -= temp_f8; - } else if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 3] == 0xFB) && + } else if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 3] == MSG_CHAR_PRINT_END) && (printer->windowState == MSG_WINDOW_STATE_PRINTING)) { msg_drawState->charScale.x = msg_drawState->msgScale.x * 1.2; msg_drawState->charScale.y = msg_drawState->msgScale.y * 1.2; @@ -1881,24 +1902,24 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit charPosY -= temp_f8; } } - } else if (msg_drawState->effectFlags & 0x1000) { - if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] != 0xF0) && - (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2] != 0xF0) && - (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 3] != 0xF0) && - (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 4] != 0xF0)) { - if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] == 0xFB) && + } else if (msg_drawState->effectFlags & MSG_FX_FLAG_GROW_PRINT) { + if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] != MSG_CHAR_PRINT_ENDL) && + (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2] != MSG_CHAR_PRINT_ENDL) && + (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 3] != MSG_CHAR_PRINT_ENDL) && + (msg_drawState->printBuffer[msg_drawState->drawBufferPos + 4] != MSG_CHAR_PRINT_ENDL)) { + if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 1] == MSG_CHAR_PRINT_END) && (printer->windowState == MSG_WINDOW_STATE_PRINTING)) { msg_drawState->charScale.x = msg_drawState->msgScale.x * 0.3; msg_drawState->charScale.y = msg_drawState->msgScale.y * 0.3; charPosX += 5; charPosY += 5; - } else if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2] == 0xFB) && + } else if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 2] == MSG_CHAR_PRINT_END) && (printer->windowState == MSG_WINDOW_STATE_PRINTING)) { msg_drawState->charScale.x = msg_drawState->msgScale.x * 0.5; msg_drawState->charScale.y = msg_drawState->msgScale.y * 0.5; charPosX += 3; charPosY += 3; - } else if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 3] == 0xFB) && + } else if ((msg_drawState->printBuffer[msg_drawState->drawBufferPos + 3] == MSG_CHAR_PRINT_END) && (printer->windowState == MSG_WINDOW_STATE_PRINTING)) { msg_drawState->charScale.x = msg_drawState->msgScale.x * 0.75; msg_drawState->charScale.y = msg_drawState->msgScale.y * 0.75; @@ -1906,7 +1927,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit charPosY += 2; } } - } else if (msg_drawState->effectFlags & 0x2000) { + } else if (msg_drawState->effectFlags & MSG_FX_FLAG_SIZE_JITTER) { temp_f8_5 = rand_int(10000) % 101; temp_f8_5 /= 100.0; temp_f8_5 = ((temp_f8_5 * 0.5) + 1.0) - 0.25; @@ -1922,7 +1943,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit charPosX += 8.0 - (temp_f8_5 * 16.0) * 0.5; charPosY += 8.0 - (temp_f8_5 * 16.0) * 0.5; } - } else if (msg_drawState->effectFlags & 0x4000) { + } else if (msg_drawState->effectFlags & MSG_FX_FLAG_SIZE_WAVE) { s32 mod360; temp_a0_49 = printer->effectFrameCounter * 15; @@ -1946,39 +1967,39 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit if ((printer->windowState == MSG_WINDOW_STATE_B || printer->windowState == MSG_WINDOW_STATE_C) && (printer->style == 1 || printer->style == 2 || printer->style == 3 || printer->style == 4)) { switch (palette) { - case 0: - case 7: - case 16: - case 17: - case 18: - case 19: - case 20: + case MSG_PAL_WHITE: + case MSG_PAL_RED: + case MSG_PAL_10: + case MSG_PAL_11: + case MSG_PAL_12: + case MSG_PAL_13: + case MSG_PAL_14: break; - case 10: - palette = 0x40; + case MSG_PAL_STANDARD: + palette = MSG_PAL_40; break; - case 32: - palette = 0x41; + case MSG_PAL_20: + palette = MSG_PAL_41; break; - case 34: - palette = 0x42; + case MSG_PAL_22: + palette = MSG_PAL_42; break; - case 35: - palette = 0x43; + case MSG_PAL_23: + palette = MSG_PAL_43; break; - case 37: - palette = 0x44; + case MSG_PAL_25: + palette = MSG_PAL_44; break; default: - palette = 0x40; + palette = MSG_PAL_40; break; } } if (palette != sp9E) { sp9E = palette; - msg_drawState->printModeFlags |= 0x10; + msg_drawState->printModeFlags |= MSG_PRINT_FLAG_10; } - if ((msg_drawState->effectFlags & 0x8000) && (phi_s2_5 == 0xFF)) { + if ((msg_drawState->effectFlags & MSG_FX_FLAG_DROP_SHADOW) && (phi_s2_5 == 0xFF)) { gDPPipeSync(gMasterGfxPos++); gDPSetRenderMode(gMasterGfxPos++, G_RM_XLU_SURF, G_RM_XLU_SURF2); gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, @@ -1992,7 +2013,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } - if (msg_drawState->effectFlags & 0x20) { + if (msg_drawState->effectFlags & MSG_FX_FLAG_BLUR) { for (i = 0; i < 5; i++) { phi_s0_7 = charPosX; phi_s1_8 = charPosY; @@ -2013,8 +2034,8 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit } } } - if (msg_drawState->printModeFlags & 0x2) { - msg_drawState->printModeFlags &= ~0x2; + if (msg_drawState->printModeFlags & MSG_PRINT_FLAG_2) { + msg_drawState->printModeFlags &= ~MSG_PRINT_FLAG_2; } msg_drawState->visiblePrintedCount += 1; msg_drawState->nextPos[0] += diff --git a/src/state_file_select.c b/src/state_file_select.c index dd991bb87d..ce1c84142f 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -51,19 +51,19 @@ void state_init_file_select(void) { gCameras[CAM_CAM3].flags |= CAM_FLAG_ENABLED; gCameras[CAM_DEFAULT].vfov = 25.0f; set_cam_viewport(0, 12, 28, 296, 184); - gCameras[CAM_DEFAULT].unk_1E = 40; + gCameras[CAM_DEFAULT].auxBoomLength = 40; gCameras[CAM_DEFAULT].lookAt_eye.x = 500.0f; gCameras[CAM_DEFAULT].lookAt_eye.y = 1000.0f; gCameras[CAM_DEFAULT].lookAt_eye.z = 1500.0f; - gCameras[CAM_DEFAULT].unk_5C = 150.0f; + gCameras[CAM_DEFAULT].auxPos.z = 150.0f; gCameras[CAM_DEFAULT].bgColor[0] = 0; gCameras[CAM_DEFAULT].bgColor[1] = 0; gCameras[CAM_DEFAULT].bgColor[2] = 0; - gCameras[CAM_DEFAULT].unk_54 = 25.0f; - gCameras[CAM_DEFAULT].unk_58 = 25.0f; + gCameras[CAM_DEFAULT].auxPos.x = 25.0f; + gCameras[CAM_DEFAULT].auxPos.y = 25.0f; gCameras[CAM_DEFAULT].unk_1C = 0; gCameras[CAM_DEFAULT].unk_20 = 100; - gCameras[CAM_DEFAULT].unk_22 = 0; + gCameras[CAM_DEFAULT].auxBoomPitch = 0; gOverrideFlags |= GLOBAL_OVERRIDES_WINDOWS_IN_FRONT_OF_CURTAINS; } diff --git a/src/state_logos.c b/src/state_logos.c index 2b8b3b8950..c4fe5edd29 100644 --- a/src/state_logos.c +++ b/src/state_logos.c @@ -49,19 +49,19 @@ void state_init_logos(void) { gCameras[CAM_TATTLE].flags |= CAM_FLAG_ENABLED; gCameras[CAM_CAM3].flags |= CAM_FLAG_ENABLED; set_cam_viewport(0, 12, 28, 296, 184); - gCameras[CAM_DEFAULT].unk_1E = 0x28; + gCameras[CAM_DEFAULT].auxBoomLength = 40; gCameras[CAM_DEFAULT].bgColor[0] = 0; gCameras[CAM_DEFAULT].bgColor[1] = 0; gCameras[CAM_DEFAULT].bgColor[2] = 0; - gCameras[CAM_DEFAULT].unk_54 = 25.0f; - gCameras[CAM_DEFAULT].unk_58 = 25.0f; + gCameras[CAM_DEFAULT].auxPos.x = 25.0f; + gCameras[CAM_DEFAULT].auxPos.y = 25.0f; gCameras[CAM_DEFAULT].unk_1C = 0; gCameras[CAM_DEFAULT].unk_20 = 100; - gCameras[CAM_DEFAULT].unk_22 = 0; + gCameras[CAM_DEFAULT].auxBoomPitch = 0; gCameras[CAM_DEFAULT].lookAt_eye.x = 500.0f; gCameras[CAM_DEFAULT].lookAt_eye.y = 1000.0f; gCameras[CAM_DEFAULT].lookAt_eye.z = 1500.0f; - gCameras[CAM_DEFAULT].unk_5C = 150.0f; + gCameras[CAM_DEFAULT].auxPos.z = 150.0f; clear_script_list(); clear_generic_entity_list(); clear_render_tasks(); diff --git a/src/state_title_screen.c b/src/state_title_screen.c index 7f5b0eddab..8631414b17 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -126,19 +126,19 @@ void state_init_title_screen(void) { gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_2; gCameras[CAM_CAM3].flags |= CAMERA_FLAGS_2; set_cam_viewport(0, 12, 28, 296, 184); - gCameras[CAM_DEFAULT].unk_1E = 40; + gCameras[CAM_DEFAULT].auxBoomLength = 40; gCameras[CAM_DEFAULT].bgColor[0] = 0; gCameras[CAM_DEFAULT].bgColor[1] = 0; gCameras[CAM_DEFAULT].bgColor[2] = 0; - gCameras[CAM_DEFAULT].unk_54 = 25.0f; - gCameras[CAM_DEFAULT].unk_58 = 25.0f; + gCameras[CAM_DEFAULT].auxPos.x = 25.0f; + gCameras[CAM_DEFAULT].auxPos.y = 25.0f; gCameras[CAM_DEFAULT].unk_1C = 0; gCameras[CAM_DEFAULT].unk_20 = 100; - gCameras[CAM_DEFAULT].unk_22 = 0; + gCameras[CAM_DEFAULT].auxBoomPitch = 0; gCameras[CAM_DEFAULT].lookAt_eye.x = 500.0f; gCameras[CAM_DEFAULT].lookAt_eye.y = 1000.0f; gCameras[CAM_DEFAULT].lookAt_eye.z = 1500.0f; - gCameras[CAM_DEFAULT].unk_5C = 150.0f; + gCameras[CAM_DEFAULT].auxPos.z = 150.0f; clear_script_list(); clear_generic_entity_list(); clear_render_tasks(); diff --git a/src/world/area_dro/dro_01/95E660.c b/src/world/area_dro/dro_01/95E660.c index cf442bbc4c..f80b7d33da 100644 --- a/src/world/area_dro/dro_01/95E660.c +++ b/src/world/area_dro/dro_01/95E660.c @@ -23,6 +23,6 @@ ApiStatus N(func_80243460_95E660)(Evt* script, s32 isInitialCall) { #define NAMESPACE dro_01 ApiStatus N(func_80243578_95E778)(Evt* script, s32 isInitialCall) { - func_800E96C8(); + hide_coin_counter_immediately(); return ApiStatus_DONE2; } diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c index 3b08ebc0d2..d926334888 100644 --- a/src/world/area_jan/jan_11/B70860.c +++ b/src/world/area_jan/jan_11/B70860.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "jan_09"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240000_B70860); +#include "world/common/DarkRoom.inc.c" #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" diff --git a/src/world/area_kgr/kgr_01/8A9A10.c b/src/world/area_kgr/kgr_01/8A9A10.c index 19b96f9e66..e7eebc882a 100644 --- a/src/world/area_kgr/kgr_01/8A9A10.c +++ b/src/world/area_kgr/kgr_01/8A9A10.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "kgr_02"; static char* N(exit_str_1) = "mac_05"; -INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9A10", func_80240000_8A9A10); +#include "world/common/DarkRoom.inc.c" diff --git a/src/world/area_kgr/kgr_01/8A9B70.c b/src/world/area_kgr/kgr_01/8A9B70.c index ef9d72a56c..f8a287cb33 100644 --- a/src/world/area_kgr/kgr_01/8A9B70.c +++ b/src/world/area_kgr/kgr_01/8A9B70.c @@ -1,9 +1,98 @@ #include "kgr_01.h" -INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9B70", func_80240160_8A9B70); +void mdl_get_copied_vertices(s32 copyIndex, Vtx** firstVertex, Vtx** copiedVertices, s32* numCopied); +Gfx* mdl_get_copied_gfx(s32 copyIndex); -INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9B70", func_80240354_8A9D64); +#define TONGUE_WIGGLE_RATE 10 -INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9B70", func_802403E0_8A9DF0); +extern u16 N(TongueWiggleTime); // tongue wiggle rate -INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9B70", func_80240500_8A9F10); +void N(add_tongue_deformation)(Vtx* src, Vtx* dest, s32 numVertices, s32 time) { + PlayerStatus* player = &gPlayerStatus; + Vtx_t* vs; + Vtx_t* vd; + s32 dx; + s32 dz; + s32 offset; + s32 pct; + s32 i; + + for (i = 0; i < numVertices; i++) { + vs = &src[i].v; + vd = &dest[i].v; + + // base y-offset goes from 0-5 based on radial distance to player, + // with 0 at the closest and 5 when distance squared > 1000. + // this creates the depression of the tongue where the player is standing. + dx = vd->ob[0] - player->position.x; + dz = vd->ob[2] - player->position.z; + offset = ((dx * dx) + (dz * dz)) / 100; + if (offset > 10) { + offset = 10; + } + offset /= 2; + + // space-based and time-based undulations are the second componet of the y-offset + // reuse of the pct variable is not ideal, but required to match + pct = 2.0f + 2.0f * sin_rad( + (f32)vd->ob[0] * 0.06 + + (f32)vd->ob[2] * 0.03f + + time * 0.01f); + offset += pct; + + // modulate y-offset based on vertex x-position + // this anchors the tongue in the back of the throat and makes the unudulations + // more prominent closer toward the tip of the tongue + pct = 200 - vd->ob[0]; + if (pct < 0) { + pct = 0; + } + if (pct > 100) { + pct = 100; + } + offset = offset * pct / 100; + + vd->ob[1] = vs->ob[1] + offset; + } +} + +// conforms to ModelCustomGfxBuilderFunc +void N(make_tongue_gfx)(s32 index) { + Vtx* vtxSrc; + Vtx* vtxCopy; + s32 numCopied; + + mdl_get_copied_vertices(1, &vtxSrc, &vtxCopy, &numCopied); + N(add_tongue_deformation)(vtxSrc, vtxCopy, numCopied, N(TongueWiggleTime)); + gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(1)); + + N(TongueWiggleTime) += TONGUE_WIGGLE_RATE; +} + +// stores the effective height offset of the tongue at a point given by Var0/Var1/Var2 +// in Var0. this value is the offset from a neutral position used for collision, +// ignoring minor undulations and deformation imposed by the player. +ApiStatus N(GetEffectiveTongueOffset)(Evt* script, s32 isInitialCall) { + f32 amplitude = 2.0f * sin_rad( + (f32)script->varTable[0] * 0.06 + + (f32)script->varTable[2] * 0.03f + + (f32)N(TongueWiggleTime) * 0.01f); + + f32 percent = 200.0f - (f32)script->varTable[0]; + if (percent < 0.0f){ + percent = 0.0f; + } + if (percent > 100.0f){ + percent = 100.0f; + } + amplitude = (amplitude * percent) / 100.0f; + script->varTable[0] = EVT_FIXED(amplitude); + return ApiStatus_DONE2; +} + +ApiStatus N(HasBombetteExploded)(Evt* script, s32 isInitialCall) { + if (gCollisionStatus.bombetteExploded >= 0) { + script->varTable[1] = TRUE; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_kgr/kgr_02/8AA450.c b/src/world/area_kgr/kgr_02/8AA450.c index 58dae0d722..7c014eef49 100644 --- a/src/world/area_kgr/kgr_02/8AA450.c +++ b/src/world/area_kgr/kgr_02/8AA450.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "kgr_01"; static char* N(exit_str_1) = "mac_05"; -INCLUDE_ASM(s32, "world/area_kgr/kgr_02/8AA450", func_80240000_8AA450); +#include "world/common/DarkRoom.inc.c" diff --git a/src/world/area_kgr/kgr_02/8AAB80.c b/src/world/area_kgr/kgr_02/8AAB80.c index 3e5e78d89c..6ecb80b4bf 100644 --- a/src/world/area_kgr/kgr_02/8AAB80.c +++ b/src/world/area_kgr/kgr_02/8AAB80.c @@ -1,7 +1,24 @@ #include "kgr_02.h" -INCLUDE_ASM(s32, "world/area_kgr/kgr_02/8AAB80", func_80240730_8AAB80); +ApiStatus func_80240730_8AAB80(Evt* script, s32 isInitialCall) { + if (gPartnerActionStatus.actionState.b[3] == 6) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} -INCLUDE_ASM(s32, "world/area_kgr/kgr_02/8AAB80", func_80240748_8AAB98); - -INCLUDE_ASM(s32, "world/area_kgr/kgr_02/8AAB80", func_80240760_8AABB0); +ApiStatus func_80240748_8AAB98(Evt* script, s32 isInitialCall) { + if (gPartnerActionStatus.actionState.b[3] != 6) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + + ApiStatus N(HasBombetteExploded)(Evt* script, s32 isInitialCall) { + if (gCollisionStatus.bombetteExploded >= 0) { + script->varTable[1] = TRUE; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_kmr/kmr_12/header.c b/src/world/area_kmr/kmr_12/header.c index 9647073b19..d89c18a6b4 100644 --- a/src/world/area_kmr/kmr_12/header.c +++ b/src/world/area_kmr/kmr_12/header.c @@ -21,6 +21,6 @@ EvtScript N(PlayMusic) = { }; ApiStatus GetGoomba(Evt* script, s32 isInitialCall) { - script->varTableEnemy[0] = get_enemy_safe(NPC_GOOMBA); + script->varTablePtr[0] = get_enemy_safe(NPC_GOOMBA); return ApiStatus_DONE2; } diff --git a/src/world/area_kpa/kpa_01/A46F60.c b/src/world/area_kpa/kpa_01/A46F60.c index a6a4f21662..6f4152d5df 100644 --- a/src/world/area_kpa/kpa_01/A46F60.c +++ b/src/world/area_kpa/kpa_01/A46F60.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "kpa_14"; static char* N(exit_str_1) = "kpa_03"; -INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A46F60", func_80240000_A46F60); +#include "world/common/DarkRoom.inc.c" diff --git a/src/world/area_kpa/kpa_03/A485C0.c b/src/world/area_kpa/kpa_03/A485C0.c index 2eb90ea418..f04a064739 100644 --- a/src/world/area_kpa/kpa_03/A485C0.c +++ b/src/world/area_kpa/kpa_03/A485C0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "kpa_01"; static char* N(exit_str_1) = "kpa_04"; -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A485C0", func_80240000_A485C0); +#include "world/common/DarkRoom.inc.c" diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index ce5d4bc6c9..f1d6a52842 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -41,4 +41,16 @@ static char* N(exit_str_3) = ""; #include "world/common/UnkNpcAIMainFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80241170_E0F910); +/* N(GetAvailableGamesCount) */ +ApiStatus func_80241170_E0F910(Evt* script, s32 isInitialCall) { + s32 numGames = 0; + + if (find_item(ITEM_GOLD_CREDIT) >= 0) { + numGames = 2; + } else if (find_item(ITEM_SILVER_CREDIT) >= 0) { + numGames = 1; + } + + evt_set_variable(script, LW(5), numGames); + return ApiStatus_DONE2; +} diff --git a/src/world/area_mgm/mgm_00/E0F980.c b/src/world/area_mgm/mgm_00/E0F980.c index ff7b8744ab..f92d6f2cc2 100644 --- a/src/world/area_mgm/mgm_00/E0F980.c +++ b/src/world/area_mgm/mgm_00/E0F980.c @@ -1,9 +1,139 @@ #include "mgm_00.h" -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0F980", func_802411E0_E0F980); +void snd_start_sound(s32 soundID, u8 volume, u8 pan); +void msg_draw_frame(s32 posX, s32 posY, s32 sizeX, s32 sizeY, s32 style, s32 palette, s32 fading, s32 bgAlpha, s32 frameAlpha); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0F980", func_80241540_E0FCE0); +extern Gfx D_80243C50_E123F0[]; -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0F980", func_802416C0_E0FE60); +#define RECORD_DISPLAY_MAP_VAR 0xA +#define MINIGAME_TYPE_SMASH 0 +#define MINIGAME_TYPE_JUMP 1 -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0F980", func_802416F8_E0FE98); +#define FADE_IN_TIME 5 +#define FADE_OUT_TIME 5 + +typedef enum RecordDisplayState { + RECORD_START_SHOW = 0, + RECORD_STATE_FADE_IN = 1, + RECORD_STATE_VISIBLE = 2, + RECORD_START_HIDE = 3, + RECORD_STATE_FADE_OUT = 4, + RECORD_STATE_DONE = 5 +} RecordDisplayState; + +typedef struct RecordDisplayData { + /* 0x00 */ RecordDisplayState state; + /* 0x04 */ s32 stateTimer; + /* 0x08 */ s32 gameType; + /* 0x0C */ s32 alpha; + /* 0x10 */ s32 curAlpha; + /* 0x14 */ s32 workerID; +} RecordDisplayData; /* size = 0x18 */ + +void N(draw_record_display)(RecordDisplayData* data, s32 alpha) { + if (alpha > 0) { + gSPDisplayList(gMasterGfxPos++, D_80243C50_E123F0); + gDPPipeSync(gMasterGfxPos++); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 16, 120, 24, alpha * 0.65); + gDPFillRectangle(gMasterGfxPos++, 48, 53, 272, 129); + gDPPipeSync(gMasterGfxPos++); + msg_draw_frame(45, 50, 230, 82, 6, 0, 1, (s32)(alpha * 0.55), alpha); // cast needed if signature isn't present + if (data->gameType == MINIGAME_TYPE_JUMP) { + draw_msg(MESSAGE_ID(0x8,0x1C), 66, 57, alpha, MSG_PAL_TEAL, 0); + draw_number(gPlayerData.jumpGamePlays, 219, 78, TRUE, MSG_PAL_WHITE, alpha, 3); + draw_number(gPlayerData.jumpGameTotal, 219, 93, TRUE, MSG_PAL_WHITE, alpha, 3); + draw_number(gPlayerData.jumpGameRecord, 219, 108, TRUE, MSG_PAL_WHITE, alpha, 3); + } else { + draw_msg(MESSAGE_ID(0x8,0x1D), 64, 57, alpha, MSG_PAL_TEAL, 0); + draw_number(gPlayerData.smashGamePlays, 219, 78, TRUE, MSG_PAL_WHITE, alpha, 3); + draw_number(gPlayerData.smashGameTotal, 219, 93, TRUE, MSG_PAL_WHITE, alpha, 3); + draw_number(gPlayerData.smashGameRecord, 219, 108, TRUE, MSG_PAL_WHITE, alpha, 3); + } + + draw_msg(MESSAGE_ID(0x8,0x1E), 58, 78, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MESSAGE_ID(0x8,0x23), 223, 78, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MESSAGE_ID(0x8,0x1F), 58, 93, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MESSAGE_ID(0x8,0x21), 223, 93, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MESSAGE_ID(0x8,0x20), 58, 108, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_msg(MESSAGE_ID(0x8,0x21), 223, 108, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + } +} + +void N(animate_and_draw_record)(void* renderData) { + RecordDisplayData* data = (RecordDisplayData*)evt_get_variable(NULL, GW(RECORD_DISPLAY_MAP_VAR)); + + switch (data->state) { + case RECORD_START_SHOW: + data->stateTimer = 0; + data->state = RECORD_STATE_FADE_IN; + snd_start_sound(SOUND_21C, 0, 0); + // fallthrough + case RECORD_STATE_FADE_IN: + data->stateTimer++; + data->alpha = update_lerp(EASING_LINEAR, 32.0f, 255.0f, data->stateTimer, FADE_IN_TIME); + data->curAlpha = data->alpha; + if (data->stateTimer >= FADE_IN_TIME) { + data->state = RECORD_STATE_VISIBLE; + data->alpha = 255; + data->curAlpha = 255; + } + break; + case RECORD_STATE_VISIBLE: + data->alpha = 255; + data->curAlpha = 255; + if (gGameStatusPtr->currentButtons & (BUTTON_A | BUTTON_B)) { + data->state = RECORD_START_HIDE; + } + if (data->state != RECORD_START_HIDE) { + break; + } + // fallthrough + case RECORD_START_HIDE: + data->stateTimer = 0; + data->state = RECORD_STATE_FADE_OUT; + snd_start_sound(SOUND_MENU_BACK, 0, 0); + // fallthrough + case RECORD_STATE_FADE_OUT: + data->stateTimer++; + data->alpha = update_lerp(EASING_LINEAR, data->curAlpha, 0.0f, data->stateTimer, FADE_OUT_TIME); + if (data->stateTimer >= FADE_OUT_TIME) { + data->state = RECORD_STATE_DONE; + } + break; + } + N(draw_record_display)(data, data->alpha); +} + +void N(work_draw_record)(void) { + RenderTask task; + + task.renderMode = RENDER_MODE_2D; + task.appendGfxArg = 0; + task.appendGfx = &N(animate_and_draw_record); + task.distance = 0; + + queue_render_task(&task); +} + +ApiStatus N(UpdateRecordDisplay)(Evt* script, s32 isInitialCall) { + RecordDisplayData* data; + Bytecode* args = script->ptrReadPos; + s32 gameType = evt_get_variable(script, *args++); + + if (isInitialCall) { + data = heap_malloc(sizeof(RecordDisplayData)); + script->functionTempPtr[0] = data; + data->state = RECORD_START_SHOW; + data->alpha = 255; + data->workerID = create_generic_entity_world(NULL, &N(work_draw_record)); + data->gameType = gameType; + evt_set_variable(script, GW(RECORD_DISPLAY_MAP_VAR), (s32)data); + } + data = script->functionTempPtr[0]; + if (data->state == RECORD_STATE_DONE) { + free_generic_entity(data->workerID); + heap_free(data); + return ApiStatus_DONE1; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/area_mgm/mgm_01/E12760.c b/src/world/area_mgm/mgm_01/E12760.c index 7951f1a3f9..cb8c0cd88d 100644 --- a/src/world/area_mgm/mgm_01/E12760.c +++ b/src/world/area_mgm/mgm_01/E12760.c @@ -1,3 +1,38 @@ #include "mgm_01.h" -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12760", func_80240000_E12760); +/* N(GetSpotlightPos) */ +ApiStatus func_80240000_E12760(Evt* script, s32 isInitialCall) { + SpriteShadingProfile* shading; + f32 spotLightPosX, spotLightPosZ; + f32 lightBeamRotX, lightBeamRotZ; + + spotLightPosX = gPlayerStatusPtr->position.x; + if (spotLightPosX < -95.0) { + spotLightPosX = -95.0; + } + if (spotLightPosX > 95.0) { + spotLightPosX = 95.0; + } + spotLightPosZ = gPlayerStatusPtr->position.z; + if (spotLightPosZ < -80.0) { + spotLightPosZ = -80.0; + } + if (spotLightPosZ > 80.0) { + spotLightPosZ = 80.0; + } + + lightBeamRotX = spotLightPosZ * -0.35 * 0.3; + lightBeamRotZ = spotLightPosX * 0.35; + + evt_set_float_variable(script, LW(0), spotLightPosX); + evt_set_float_variable(script, LW(1), spotLightPosZ); + evt_set_float_variable(script, LW(2), lightBeamRotX); + evt_set_float_variable(script, LW(3), lightBeamRotZ); + + shading = D_80151328; + shading->sources[0].pos.x = gPlayerStatusPtr->position.x * 0.8; + shading->sources[0].pos.y = 80.0f; + shading->sources[0].pos.z = gPlayerStatusPtr->position.z + 50.0f; + + return ApiStatus_DONE2; +} diff --git a/src/world/area_mgm/mgm_01/E12930.c b/src/world/area_mgm/mgm_01/E12930.c index e366d99245..b56be672cf 100644 --- a/src/world/area_mgm/mgm_01/E12930.c +++ b/src/world/area_mgm/mgm_01/E12930.c @@ -1,59 +1,691 @@ #include "mgm_01.h" +#include "hud_element.h" +#include "effects.h" -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_802401D0_E12930); +void delete_entity(s32 entityIndex); +void set_message_images(MessageImageData* images); -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_802403C4_E12B24); +#define SCOREKEEPER_ENEMY_IDX 0 +#define BROKEN_BLOCKS_VAR_IDX 2 +#define TOTAL_BLOCKS_VAR_IDX 4 +#define JUMP_DATA_VAR_IDX 5 -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_802403FC_E12B5C); +#define PLAY_COST 10 +#define NUM_BLOCKS 11 -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240438_E12B98); +typedef enum JumpGamePanelType { + PANEL_1_COIN = 0, + PANEL_5_COINS = 1, + PANEL_TIMES_5 = 2, + PANEL_BOWSER = 3 +} JumpGamePanelType; -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_8024045C_E12BBC); +typedef enum JumpGamePanelState { + PANEL_STATE_INIT = 0, + PANEL_STATE_START_ANIM = 1, + PANEL_STATE_EMERGE_INIT = 2, + PANEL_STATE_EMERGE_UPDATE = 3, + PANEL_STATE_HOLD_INIT = 4, + PANEL_STATE_HOLD_UPDATE = 5, + PANEL_STATE_TO_TALLY_INIT = 6, + PANEL_STATE_TO_TALLY_UPDATE = 7, + PANEL_STATE_STOP_ANIM = 8, + PANEL_STATE_DONE = 9 +} JumpGamePanelState; -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_8024050C_E12C6C); +// the panels found by breaking brick blocks +typedef struct JumpGamePanel { + /* 0x00 */ JumpGamePanelState state; + /* 0x04 */ s32 modelID; + /* 0x08 */ JumpGamePanelType type; + /* 0x0C */ s32 blockPosIndex; + /* 0x10 */ s32 tallyPosIndex; + /* 0x14 */ s32 entityIndex; + /* 0x18 */ s32 lerpElapsed; + /* 0x1C */ s32 lerpDuration; + /* 0x20 */ Vec3f curPos; + /* 0x2C */ Vec3f startPos; + /* 0x38 */ Vec3f endPos; + /* 0x44 */ f32 curAngle; + /* 0x48 */ f32 startAngle; + /* 0x4C */ f32 endAngle; + /* 0x50 */ f32 curScale; + /* 0x50 */ f32 startScale; + /* 0x50 */ f32 endScale; +} JumpGamePanel; /* size = 5C */ -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_8024058C_E12CEC); +typedef struct JumpGameData { + /* 0x000 */ s32 workerID; + /* 0x004 */ s32 hudElemID; + /* 0x008 */ s32 unk_08; // unused -- likely hudElemID for an unused/removed hud element + /* 0x00C */ s32 currentScore; + /* 0x010 */ s32 targetScore; + /* 0x014 */ s32 scoreWindowPosX; + /* 0x018 */ s32 scoreWindowPosY; // unused -- posY is hard-coded while drawing the box + /* 0x01C */ s32 type[NUM_BLOCKS]; + /* 0x048 */ s32 breakHistory[NUM_BLOCKS]; + /* 0x074 */ JumpGamePanel panels[NUM_BLOCKS]; +} JumpGameData; /* size = 0x468 */ -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_802406C4_E12E24); +extern EntityBlueprint D_802EA0C4; -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_802407E4_E12F44); +extern s32 MessagePlural; +extern s32 MessageSingular; +extern MessageImageData N(MsgImgs_Panels); -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_8024084C_E12FAC); +extern s8 N(BlockPosX)[NUM_BLOCKS]; +extern s8 N(BlockPosY)[NUM_BLOCKS]; +extern s8 N(BlockPosZ)[NUM_BLOCKS]; -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_802408EC_E1304C); +extern f32 N(TallyPosX)[NUM_BLOCKS]; +extern f32 N(TallyPosY)[NUM_BLOCKS]; -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240AAC_E1320C); +extern s32 N(PanelModelIDs)[NUM_BLOCKS]; +extern JumpGamePanelType N(PanelTypes)[NUM_BLOCKS]; -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240BF4_E13354); +extern JumpGamePanelType N(InitialConfigurations)[4][NUM_BLOCKS]; +extern EvtScript* D_802435E8_E15D48[NUM_BLOCKS]; -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240C54_E133B4); +extern EvtScript D_80242310; +extern EvtScript D_80242330; +extern EvtScript D_80242350; +extern EvtScript D_80242370; +extern EvtScript D_80242390; +extern EvtScript D_802423B0; +extern EvtScript D_802423D0; +extern EvtScript D_802423F0; +extern EvtScript D_80242410; +extern EvtScript D_80242430; +extern EvtScript D_80242450; -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240CD0_E13430); +void N(draw_score_display) (void* renderData) { + Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); + JumpGameData* data = (JumpGameData*)scorekeeper->varTable[JUMP_DATA_VAR_IDX]; + s32 hudElemID; + s32 diff; -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240D84_E134E4); + if (scorekeeper->varTable[BROKEN_BLOCKS_VAR_IDX] == -1) { + if (data->scoreWindowPosX < SCREEN_WIDTH + 1) { + data->scoreWindowPosX += 10; + if (data->scoreWindowPosX > SCREEN_WIDTH + 1) { + data->scoreWindowPosX = SCREEN_WIDTH + 1; + } + } + } else { + if (data->scoreWindowPosX > 220) { + data->scoreWindowPosX -= 10; + if (data->scoreWindowPosX < 220) { + data->scoreWindowPosX = 220; + } + } + } + + if (data->scoreWindowPosX < SCREEN_WIDTH + 1) { + draw_box(0, 9, data->scoreWindowPosX, 28, 0, 72, 20, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); + hudElemID = data->hudElemID; + hud_element_set_render_pos(hudElemID, data->scoreWindowPosX + 15, 39); + hud_element_draw_clipped(hudElemID); + if (data->currentScore > data->targetScore) { + data->currentScore = data->targetScore; + } else if (data->currentScore < data->targetScore) { + diff = data->targetScore - data->currentScore; + if (diff > 100) { + data->currentScore += 40; + } else if (diff > 75) { + data->currentScore += 35; + } else if (diff > 50) { + data->currentScore += 30; + } else if (diff > 30) { + data->currentScore += 20; + } else if (diff > 20) { + data->currentScore += 10; + } else if (diff > 10) { + data->currentScore += 5; + } else if (diff > 5) { + data->currentScore += 2; + } else { + data->currentScore++; + } + sfx_play_sound_with_params(SOUND_211, 0, 0x40, 0x32); -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240DB8_E13518); + } + draw_number(data->currentScore, data->scoreWindowPosX + 63, 32, 1, 0, 255, 3); + } +} -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240ECC_E1362C); +void N(work_draw_score)(void) { + RenderTask task; -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240F90_E136F0); + task.renderMode = RENDER_MODE_2D; + task.appendGfxArg = 0; + task.appendGfx = &mgm_01_draw_score_display; + task.distance = 0; -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80241090_E137F0); + queue_render_task(&task); +} -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80241234_E13994); +ApiStatus N(DisableMenus)(Evt* script, s32 isInitialCall) { + gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_MENUS; + func_800E9894(); + close_status_menu(); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80241510_E13C70); +ApiStatus N(EnableMenus)(Evt* script, s32 isInitialCall) { + gOverrideFlags &= ~GLOBAL_OVERRIDES_DISABLE_MENUS; + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80241574_E13CD4); +// arg0: index +ApiStatus N(GetPanelInfo)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_802415EC_E13D4C); + evt_set_variable(script, LW(0), data->panels[index].state); + evt_set_variable(script, LW(1), data->panels[index].modelID); + evt_set_variable(script, LW(2), data->panels[index].type); + evt_set_variable(script, LW(3), data->panels[index].tallyPosIndex); -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80241690_E13DF0); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_802416CC_E13E2C); +// arg0: index, arg1: newState +ApiStatus N(SetPanelState)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + s32 value = evt_get_variable(script, *args++); -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_802416F8_E13E58); + data->panels[index].state = value; -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80241760_E13EC0); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80241780_E13EE0); +// arg0: index, arg1: newState +ApiStatus N(InitPanelEmergeFromBlock)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + s32 blockPosIndex; + + data->panels[index].lerpElapsed = 0; + data->panels[index].lerpDuration = 5; + + blockPosIndex = data->panels[index].blockPosIndex; + + data->panels[index].curPos.x = N(BlockPosX)[blockPosIndex]; + data->panels[index].curPos.y = N(BlockPosY)[blockPosIndex] + 15.0; + data->panels[index].curPos.z = N(BlockPosZ)[blockPosIndex] + 12; + + data->panels[index].startPos.x = data->panels[index].curPos.x; + data->panels[index].startPos.y = data->panels[index].curPos.y; + data->panels[index].startPos.z = data->panels[index].curPos.z; + + data->panels[index].endPos.x = data->panels[index].curPos.x; + data->panels[index].endPos.y = data->panels[index].curPos.y + 35.0; + data->panels[index].endPos.z = data->panels[index].curPos.z; + + data->panels[index].curAngle = 0; + + data->panels[index].endScale = 2.0; + data->panels[index].curScale = 1.0; + data->panels[index].startScale = 1.0; + + return ApiStatus_DONE2; +} + +// arg0: index +ApiStatus N(UpdatePanelEmergeFromBlock)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + + data->panels[index].curPos.x = update_lerp(EASING_QUADRATIC_OUT, + data->panels[index].startPos.x, data->panels[index].endPos.x, + data->panels[index].lerpElapsed, data->panels[index].lerpDuration); + + data->panels[index].curPos.y = update_lerp(EASING_QUADRATIC_OUT, + data->panels[index].startPos.y, data->panels[index].endPos.y, + data->panels[index].lerpElapsed, data->panels[index].lerpDuration); + + data->panels[index].curPos.z = update_lerp(EASING_QUADRATIC_OUT, + data->panels[index].startPos.z, data->panels[index].endPos.z, + data->panels[index].lerpElapsed, data->panels[index].lerpDuration); + + data->panels[index].curScale = update_lerp(EASING_LINEAR, + data->panels[index].startScale, data->panels[index].endScale, + data->panels[index].lerpElapsed, data->panels[index].lerpDuration); + + data->panels[index].lerpElapsed++; + + if (data->panels[index].lerpElapsed >= data->panels[index].lerpDuration) { + evt_set_variable(script, LW(3), TRUE); + } else { + evt_set_variable(script, LW(3), FALSE); + } + + return ApiStatus_DONE2; +} + +// arg0: index +ApiStatus N(InitPanelHoldAboveBlock)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + + data->panels[index].lerpElapsed = 0; + data->panels[index].lerpDuration = 10; + + return ApiStatus_DONE2; +} + +// arg0: index +ApiStatus N(UpdatetPanelHoldAboveBlock)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + + data->panels[index].lerpElapsed++; + if (data->panels[index].lerpElapsed >= data->panels[index].lerpDuration) { + evt_set_variable(script, LW(3), TRUE); + } else { + evt_set_variable(script, LW(3), FALSE); + } + + return ApiStatus_DONE2; +} + +// arg0: index, arg1: newState +ApiStatus N(InitPanelMoveToTally)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + f32 dist; + + data->panels[index].lerpElapsed = 0; + data->panels[index].curAngle = 0; + data->panels[index].startAngle = 0; + data->panels[index].startPos.x = data->panels[index].curPos.x; + data->panels[index].startPos.y = data->panels[index].curPos.y; + data->panels[index].startPos.z = data->panels[index].curPos.z; + data->panels[index].startScale = data->panels[index].curScale; + + if (data->panels[index].type != PANEL_BOWSER) { + data->panels[index].endPos.x = N(TallyPosX)[data->panels[index].tallyPosIndex]; + data->panels[index].endPos.y = N(TallyPosY)[data->panels[index].tallyPosIndex]; + data->panels[index].endPos.z = 110.0f; + data->panels[index].endAngle = 360.0f; + data->panels[index].endScale = 1.0f; + } else { + data->panels[index].endPos.x = 0; + data->panels[index].endPos.y = 100.0f; + data->panels[index].endPos.z = 120.0f; + data->panels[index].endAngle = 720.0f; + data->panels[index].endScale = 4.0f; + } + + dist = dist3D( + data->panels[index].startPos.x, data->panels[index].startPos.y, data->panels[index].startPos.z, + data->panels[index].endPos.x, data->panels[index].endPos.y, data->panels[index].endPos.z); + if (data->panels[index].type != PANEL_BOWSER) { + data->panels[index].lerpDuration = (dist * 0.125) + 0.5; + } else { + data->panels[index].lerpDuration = (dist / 5.0) + 0.5; + } + + return ApiStatus_DONE2; +} + +// arg0: index +ApiStatus N(UpdatePanelMoveToTally)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + + data->panels[index].lerpElapsed++; + + data->panels[index].curPos.x = update_lerp(EASING_QUADRATIC_OUT, + data->panels[index].startPos.x, data->panels[index].endPos.x, + data->panels[index].lerpElapsed, data->panels[index].lerpDuration); + + data->panels[index].curPos.y = update_lerp(EASING_QUADRATIC_OUT, + data->panels[index].startPos.y, data->panels[index].endPos.y, + data->panels[index].lerpElapsed, data->panels[index].lerpDuration); + + data->panels[index].curPos.z = update_lerp(EASING_LINEAR, + data->panels[index].startPos.z, data->panels[index].endPos.z, + data->panels[index].lerpElapsed, data->panels[index].lerpDuration); + + data->panels[index].curAngle = update_lerp(EASING_LINEAR, + data->panels[index].startAngle, data->panels[index].endAngle, + data->panels[index].lerpElapsed, data->panels[index].lerpDuration); + + data->panels[index].curScale = update_lerp(EASING_LINEAR, + data->panels[index].startScale, data->panels[index].endScale, + data->panels[index].lerpElapsed, data->panels[index].lerpDuration); + + if (data->panels[index].lerpElapsed >= data->panels[index].lerpDuration) { + evt_set_variable(script, LW(3), TRUE); + } else { + evt_set_variable(script, LW(3), FALSE); + } + + return ApiStatus_DONE2; +} + +// arg0: index +ApiStatus N(EndPanelAnimation)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + + data->panels[index].curAngle = 0; + + return ApiStatus_DONE2; +} + +ApiStatus N(UpdateRecords)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + PlayerData* player = &gPlayerData; + + player->jumpGameTotal += data->currentScore; + if (player->jumpGameTotal > 99999) { + player->jumpGameTotal = 99999; + } + if (player->jumpGameRecord < data->currentScore) { + player->jumpGameRecord = data->currentScore; + } + set_message_value(data->currentScore, 0); + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveCoinReward)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + s32 coinsLeft = data->currentScore; + s32 increment; + + if (coinsLeft > 100) { + increment = 40; + } else if (coinsLeft > 75) { + increment = 35; + } else if (coinsLeft > 50) { + increment = 30; + } else if (coinsLeft > 30) { + increment = 10; + } else if (coinsLeft > 20) { + increment = 5; + } else if (coinsLeft > 10) { + increment = 2; + } else { + increment = 1; + } + + data->currentScore -= increment; + add_coins(increment); + data->targetScore = data->currentScore; + sfx_play_sound(SOUND_211); + + if (data->currentScore > 0) { + return ApiStatus_BLOCK; + } else { + return ApiStatus_DONE2; + } +} + +ApiStatus N(DoubleScore)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + s32 score = 2 * data->currentScore; + data->currentScore = score; + data->targetScore = score; + + return ApiStatus_DONE2; +} + +ApiStatus N(EndBowserPanelAnimation)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + s32 i; + + for (i = 0; i < ARRAY_COUNT(data->panels); i++) { + if (data->panels[i].type == PANEL_BOWSER && data->panels[i].state == PANEL_STATE_DONE) + break; + } + + data->panels[i].curPos.x = N(TallyPosX)[data->panels[i].tallyPosIndex]; + data->panels[i].curPos.y = N(TallyPosY)[data->panels[i].tallyPosIndex]; + data->panels[i].curPos.z = 110.0f; + + evt_set_variable(script, LW(1), data->panels[i].modelID); + evt_set_float_variable(script, LW(5), data->panels[i].curPos.x); + evt_set_float_variable(script, LW(6), data->panels[i].curPos.y); + evt_set_float_variable(script, LW(7), data->panels[i].curPos.z); + + return ApiStatus_DONE2; +} + +// arg0: index +ApiStatus N(GetPanelPos)(Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + + evt_set_float_variable(script, LW(5), data->panels[index].curPos.x); + evt_set_float_variable(script, LW(6), data->panels[index].curPos.y); + evt_set_float_variable(script, LW(7), data->panels[index].curPos.z); + evt_set_float_variable(script, LW(8), data->panels[index].curAngle); + evt_set_float_variable(script, LW(9), data->panels[index].curScale); + + return ApiStatus_DONE2; +} + +ApiStatus N(DestroyBlockEntities) (Evt* script, s32 isInitialCall) { + JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; + s32 i; + + for (i = 0; i < ARRAY_COUNT(data->panels); i++) { + if (data->panels[i].entityIndex >= 0) { + fx_walking_dust(1, N(BlockPosX)[i], N(BlockPosY)[i] + 13, N(BlockPosZ)[i] + 5, 0, 0); + delete_entity(data->panels[i].entityIndex); + } + } + + sfx_play_sound_with_params(SOUND_283, 0x50, 0, 0); + + return ApiStatus_DONE2; +} + +ApiStatus N(OnBreakBlock)(Evt* script, s32 isInitialCall) { + Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); + JumpGameData* data = (JumpGameData*)scorekeeper->varTable[JUMP_DATA_VAR_IDX]; + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + s32 blockType = data->type[index]; + s32 historyPos = scorekeeper->varTable[BROKEN_BLOCKS_VAR_IDX]; + s32 coins = 0; + s32 i; + + data->breakHistory[historyPos] = blockType; + data->panels[index].entityIndex = -1; + + for (i = 0; i < historyPos + 1; i++) { + switch (data->breakHistory[i]) { + case PANEL_1_COIN: coins += 1; break; + case PANEL_5_COINS: coins += 5; break; + case PANEL_TIMES_5: coins *= 5; break; + case PANEL_BOWSER: sfx_play_sound(SOUND_MENU_ERROR); coins = 0; break; + } + } + + data->targetScore = coins; + + for (i = 0; i < ARRAY_COUNT(data->panels); i++) { + if (blockType == data->panels[i].type && data->panels[i].state == PANEL_STATE_START_ANIM) { + data->panels[i].state = PANEL_STATE_EMERGE_INIT; + data->panels[i].blockPosIndex = index; + data->panels[i].tallyPosIndex = historyPos; + break; + } + } + + scorekeeper->varTable[BROKEN_BLOCKS_VAR_IDX]++; + + return ApiStatus_DONE2; +} + +ApiStatus N(CreateBlockEntities)(Evt* script, s32 isInitialCall) { + JumpGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[JUMP_DATA_VAR_IDX]; + s32 entityIndex; + s32 initialConfiguration; + s32 indexA, indexB; + s32 curBlockIdx; + s32 temp; + s32 i; + + EvtScript* scriptArray[] = { + &D_80242310, &D_80242330, &D_80242350, &D_80242370, &D_80242390, &D_802423B0, &D_802423D0, &D_802423F0, + &D_80242410, &D_80242430, &D_80242450 + }; + + if (isInitialCall) { + // choose one of four initial configurations at random + initialConfiguration = rand_int(1000) % ARRAY_COUNT(N(InitialConfigurations)); + for (i = 0; i < NUM_BLOCKS; i++) { + data->type[i] = N(InitialConfigurations)[initialConfiguration][i]; + } + + // randomly swap 1000 pairs + for (i = 0; i < 1000; i++) { + indexA = rand_int(10000) % NUM_BLOCKS; + indexB = rand_int(10000) % NUM_BLOCKS; + + if (indexA != indexB) { + temp = data->type[indexB]; + data->type[indexB] = data->type[indexA]; + data->type[indexA] = temp; + } + } + + script->functionTemp[0] = 0; + script->functionTemp[1] = 0; + } + + script->functionTemp[0]--; + if (script->functionTemp[0] <= 0) { + curBlockIdx = script->functionTemp[1]; + entityIndex = create_entity(&D_802EA0C4, + N(BlockPosX)[curBlockIdx], + N(BlockPosY)[curBlockIdx], + N(BlockPosZ)[curBlockIdx], + 0, 0, 0, 0, MAKE_ENTITY_END); + data->panels[curBlockIdx].entityIndex = entityIndex; + get_entity_by_index(entityIndex)->boundScriptBytecode = scriptArray[curBlockIdx]; + fx_sparkles(3, + N(BlockPosX)[curBlockIdx], + N(BlockPosY)[curBlockIdx] + 13, + N(BlockPosZ)[curBlockIdx] + 5, + 23.0f); + sfx_play_sound(SOUND_213); + script->functionTemp[0] = 3; + script->functionTemp[1]++; + } + + if (script->functionTemp[1] < NUM_BLOCKS) { + return ApiStatus_BLOCK; + } else { + return ApiStatus_DONE2; + } +} + +const char* mgm_01_str = "mgm_00"; + +ApiStatus N(TakeCoinCost)(Evt* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + + if (isInitialCall) { + playerData->jumpGamePlays++; + script->functionTemp[0] = 0; + } + add_coins(-1); + sfx_play_sound(SOUND_211); + + script->functionTemp[0]++; + + if (script->functionTemp[0] == PLAY_COST) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +ApiStatus N(InitializePanels)(Evt* script, s32 isInitialCall) { + JumpGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[JUMP_DATA_VAR_IDX]; + s32 i; + + data->currentScore = 0; + data->targetScore = 0; + + for (i = 0; i < ARRAY_COUNT(data->panels); i++) { + data->panels[i].state = PANEL_STATE_INIT; + data->panels[i].modelID = N(PanelModelIDs)[i]; + data->panels[i].type = N(PanelTypes)[i]; + data->panels[i].tallyPosIndex = -1; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(CreateMinigame)(Evt* script, s32 isInitialCall) { + Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); + JumpGameData* data = general_heap_malloc(sizeof(JumpGameData)); + s32 hudElemID; + + scorekeeper->varTablePtr[JUMP_DATA_VAR_IDX] = data; + data->workerID = create_generic_entity_world(NULL, &mgm_01_work_draw_score); + + hudElemID = hud_element_create(HudScript_StatusCoin); + data->hudElemID = hudElemID; + hud_element_set_flags(data->hudElemID, HUD_ELEMENT_FLAGS_80); + hud_element_set_tint(data->hudElemID, 255, 255, 255); + + data->scoreWindowPosX = SCREEN_WIDTH + 1; + data->scoreWindowPosY = 28; + func_800E9894(); + close_status_menu(); + + return ApiStatus_DONE2; +} + +ApiStatus N(DestroyMinigame) (Evt* script, s32 isInitialCall) { + JumpGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[JUMP_DATA_VAR_IDX]; + + free_generic_entity(data->workerID); + hud_element_free(data->hudElemID); + + return ApiStatus_DONE2; +} + +ApiStatus N(GetCoinCount)(Evt* script, s32 isInitialCall) { + evt_set_variable(script, LW(0xA), gPlayerData.coins); + return ApiStatus_DONE2; +} + +ApiStatus N(SetMsgVars_BlocksRemaining)(Evt* script, s32 isInitialCall) { + Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); + s32 remaining = (scorekeeper->varTable[TOTAL_BLOCKS_VAR_IDX] - scorekeeper->varTable[BROKEN_BLOCKS_VAR_IDX]) + 1; + + set_message_value(remaining, 0); + set_message_msg((remaining == 1) ? (s32)&MessageSingular : (s32)&MessagePlural, 1); + + return ApiStatus_DONE2; +} + +ApiStatus N(HideCoinCounter)(Evt* script, s32 isInitialCall) { + hide_coin_counter_immediately(); + return ApiStatus_DONE2; +} + +ApiStatus N(SetMsgImgs_Panels)(Evt* script, s32 isInitialCall) { + set_message_images(&N(MsgImgs_Panels)); + return ApiStatus_DONE2; +} diff --git a/src/world/area_mgm/mgm_02/E15D80.c b/src/world/area_mgm/mgm_02/E15D80.c index 6ae82a8e4c..a3a639cfb9 100644 --- a/src/world/area_mgm/mgm_02/E15D80.c +++ b/src/world/area_mgm/mgm_02/E15D80.c @@ -1,39 +1,1003 @@ #include "mgm_02.h" +#include "hud_element.h" +#include "effects.h" +#include "model.h" +#include "sprite/npc/bob_omb.h" +#include "sprite/npc/fuzzy.h" -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80240000_E15D80); +void startup_draw_prim_rect_COPY(s16 left, s16 top, s16 right, s16 bottom, u16 r, u16 g, u16 b, u16 a); +void delete_entity(s32); +void partner_enable_input(void); -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80240430_E161B0); +#define SCOREKEEPER_ENEMY_IDX 0 +#define SMASH_DATA_VAR_IDX 0 -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80240468_E161E8); +#define PLAY_COST 10 +#define PLAY_TIME 900 +#define NUM_BOXES 35 +#define NUM_PANELS 10 -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80240544_E162C4); +#define SMASH_DATA_VAR_IDX 0 +#define SMASH_DATA_VAR_IDX 0 -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80240580_E16300); +#define FUZZY_NPC_ID_BASE 0x0A +#define BOBOMB_NPC_ID_BASE 0x1E +#define LUIGI_NPC_ID_BASE 0x64 -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_802405A4_E16324); +extern HudScript HudScript_BlueMeter[]; +extern HudScript HudScript_AButton[]; +extern HudScript HudScript_MashAButton[]; -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_802405D0_E16350); +extern s32 mgm_02_InitialConfigurations[3][NUM_BOXES]; +extern s32 mgm_02_BoxModelIDs[NUM_BOXES]; +extern s32 mgm_02_BoxColliderIDs[NUM_BOXES]; +extern s32 mgm_02_PanelModelIDs[NUM_PANELS]; +extern s32 D_80248600[NUM_PANELS]; //TODO set name: mgm_02_PanelModelsAssigned -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80240644_E163C4); +extern s32 mgm_02_PeachPanelImg; +extern s32 mgm_02_PeachPanelPal; -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80240790_E16510); +extern EntityBlueprint D_802EAFDC; // SIGNPOST +extern EvtScript D_80242A3C_E187BC; // EVT_ReadSign + +typedef enum SmashGameBoxCotent { + BOX_CONTENT_FUZZY = 0, + BOX_CONTENT_BOMB = 1, + BOX_CONTENT_PEACH = 2, + BOX_CONTENT_EMPTY = 3 +} SmashGameBoxCotent; + +typedef enum SmashGameStunFlags { + STUN_FLAGS_STUNNED = 1, + STUN_FLAGS_CHANGED = 2, + STUN_FLAGS_GRABBED = 4 +} SmashGameStunFlags; + +typedef enum SmashGameBoxState { + BOX_STATE_FUZZY_INIT = 10, + BOX_STATE_FUZZY_IDLE = 11, + BOX_STATE_FUZZY_POPUP = 12, + BOX_STATE_FUZZY_HIT = 13, + BOX_STATE_FUZZY_ATTACH = 14, + BOX_STATE_FUZZY_GRAB = 15, + BOX_STATE_FUZZY_DETACH = 16, + BOX_STATE_FUZZY_DONE = 17, + BOX_STATE_FUZZY_END = 18, + + BOX_STATE_BOMB_INIT = 30, + BOX_STATE_BOMB_IDLE = 31, + BOX_STATE_BOMB_POPUP = 32, + BOX_STATE_BOMB_HIT = 33, + BOX_STATE_BOMB_ATTACK = 34, + BOX_STATE_BOMB_STUN = 35, + BOX_STATE_BOMB_DONE = 36, + BOX_STATE_BOMB_END = 37, + + BOX_STATE_EMPTY_INIT = 50, + BOX_STATE_EMPTY_IDLE = 51, + BOX_STATE_EMPTY_HIT = 52, + + BOX_STATE_PEACH_INIT = 70, + BOX_STATE_PEACH_IDLE = 71, + BOX_STATE_PEACH_POPUP = 72, + BOX_STATE_PEACH_HIT = 73, + BOX_STATE_PEACH_EMERGE = 74, + BOX_STATE_PEACH_DONE = 75 +} SmashGameBoxState; + +typedef struct SmashGameBoxData { + /* 0x00 */ SmashGameBoxState state; + /* 0x04 */ s32 stateTimer; + /* 0x08 */ s32 content; + /* 0x0C */ s32 modelID; + /* 0x10 */ s32 colliderID; + /* 0x14 */ s32 npcID; + /* 0x18 */ s32 peachPanelModelID; +} SmashGameBoxData; /* size = 0x1C */ + +typedef struct SmashGameData { + /* 0x000 */ s32 workerID; + /* 0x004 */ s32 found; + /* 0x008 */ s32 timeLeft; // num frames at 30fps + /* 0x00C */ s32 hudElemID_AButton; + /* 0x010 */ s32 hudElemID_Meter; + /* 0x014 */ s32 windowA_posX; + /* 0x018 */ s32 windowB_posX; + /* 0x01C */ s32 signpostEntity; + /* 0x020 */ s32 currentScore; + /* 0x024 */ s32 mashProgress; + /* 0x028 */ SmashGameStunFlags stunFlags; + /* 0x02C */ SmashGameBoxData box[NUM_BOXES]; +} SmashGameData; /* size = 0x400 */ + +void N(draw_score_display)(void* renderData) { + Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); + SmashGameData* data = scorekeeper->varTablePtr[SMASH_DATA_VAR_IDX]; + s32 hudElemA; + s32 hudElemMeter; + s32 timeLeft; + s32 seconds; + s32 deciseconds; + + // show mash meter while grabbed by a fuzzy + if (data->stunFlags & STUN_FLAGS_GRABBED) { + hudElemA = data->hudElemID_AButton; + hud_element_set_render_pos(hudElemA, 90, 90); + hud_element_draw_clipped(hudElemA); + hudElemMeter = data->hudElemID_Meter; + hud_element_set_render_pos(hudElemMeter, 90, 120); + hud_element_draw_clipped(hudElemMeter); + startup_draw_prim_rect_COPY(62, 116, 62 + (s32)(((f32)data->mashProgress / 12.0) * 59.0), 116 + 5, 0, 228, 134, 255); + } + + if (scorekeeper->varTable[3] == 0 || scorekeeper->varTable[3] >= 4) { + if (data->windowA_posX > -80) { + data->windowA_posX -= 10; + if (data->windowA_posX < -80) { + data->windowA_posX = -80; + } + } + } else { + if (data->windowA_posX < 23) { + data->windowA_posX += 10; + if (data->windowA_posX > 23) { + data->windowA_posX = 23; + } + } + } + + if (scorekeeper->varTable[3] == 0) { + if (data->windowB_posX < SCREEN_WIDTH) { + data->windowB_posX += 10; + if (data->windowB_posX > SCREEN_WIDTH) { + data->windowB_posX = SCREEN_WIDTH; + } + } + } else { + if (data->windowB_posX > 225) { + data->windowB_posX -= 10; + if (data->windowB_posX < 225) { + data->windowB_posX = 225; + } + } + } + + draw_box(0, 9, data->windowA_posX, 23, 0, 80, 38, 180, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); + draw_msg(MESSAGE_ID(0x8,0x47), data->windowA_posX + 42, 28, 255, MSG_PAL_WHITE, 0); + draw_number(NUM_PANELS - data->found, data->windowA_posX + 65, 43, TRUE, MSG_PAL_WHITE, 255, 3); + draw_ci_image_with_clipping(&mgm_02_PeachPanelImg, 32, 32, G_IM_FMT_CI, G_IM_SIZ_4b, &mgm_02_PeachPanelPal, + data->windowA_posX + 5, 26, 10, 20, 300, 200, 255); + + timeLeft = MIN(data->timeLeft, PLAY_TIME); + deciseconds = ((f32)(timeLeft % 30) * 10.0) / 30; + seconds = timeLeft / 30; + + draw_box(0, 0xB, data->windowB_posX, 27, 0, 60, 20, 180, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); + // draw whole seconds + draw_number(seconds, data->windowB_posX + 29, 31, TRUE, MSG_PAL_WHITE, 255, 3); + // draw tenths of seconds + draw_number(deciseconds, data->windowB_posX + 40, 31, TRUE, MSG_PAL_WHITE, 255, 0); + // draw dot + draw_msg(MESSAGE_ID(0x8,0x24), data->windowB_posX + 30, 29, 255, MSG_PAL_WHITE, 0); +} + +void N(work_draw_score)(void) { + RenderTask task; + + task.renderMode = RENDER_MODE_2D; + task.appendGfxArg = 0; + task.appendGfx = &mgm_02_draw_score_display; + task.distance = 0; + + queue_render_task(&task); +} + +ApiStatus N(CreateScoreDisplay)(Evt* script, s32 isInitialCall) { + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + s32 hudElemA, hudElemMeter; + + if (isInitialCall) { + data->workerID = create_generic_entity_world(NULL, &mgm_02_work_draw_score); + + hudElemA = hud_element_create(HudScript_AButton); + data->hudElemID_AButton = hudElemA; + hud_element_set_render_depth(hudElemA, 0); + hud_element_set_flags(hudElemA, HUD_ELEMENT_FLAGS_80); + hud_element_set_tint(hudElemA, 255, 255, 255); + hud_element_set_script(hudElemA, HudScript_AButton); + + hudElemMeter = hud_element_create(HudScript_BlueMeter); + data->hudElemID_Meter = hudElemMeter; + hud_element_set_render_depth(hudElemMeter, 0); + hud_element_set_flags(hudElemMeter, HUD_ELEMENT_FLAGS_80); + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(DisableMenus)(Evt* script, s32 isInitialCall) { + gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_MENUS; + func_800E9894(); + close_status_menu(); + return ApiStatus_DONE2; +} + +ApiStatus N(EnableMenus)(Evt* script, s32 isInitialCall) { + gOverrideFlags &= ~GLOBAL_OVERRIDES_DISABLE_MENUS; + return ApiStatus_DONE2; +} + +ApiStatus N(DestroySignpost)(Evt* script, s32 isInitialCall) { + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + delete_entity(data->signpostEntity); + return ApiStatus_DONE2; +} + +ApiStatus N(CreateSignpost)(void) { + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + s32 entityIndex = create_entity(&D_802EAFDC, 355, 20, -180, 0, 0, 0, 0, MAKE_ENTITY_END); + data->signpostEntity = entityIndex; + get_entity_by_index(entityIndex)->boundScriptBytecode = &D_80242A3C_E187BC; + + return ApiStatus_DONE2; +} + +ApiStatus N(OnHitBox)(Evt* script, s32 isInitialCall0) { + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + s32 hitModelID = evt_get_variable(script, LW(0xA)); + s32 hitColliderID = evt_get_variable(script, LW(0xB)); // unused + s32 i; + + for (i = 0; i < NUM_BOXES; i++) { + if (hitModelID == data->box[i].modelID) { + break; + } + } + + evt_set_variable(script, LW(0xC), data->box[i].content); + + switch (data->box[i].content) { + case BOX_CONTENT_FUZZY: + evt_set_variable(script, LW(0xD), data->box[i].npcID); + data->box[i].state = BOX_STATE_FUZZY_HIT; + break; + case BOX_CONTENT_BOMB: + evt_set_variable(script, LW(0xD), data->box[i].npcID); + data->box[i].state = BOX_STATE_BOMB_HIT; + break; + case BOX_CONTENT_EMPTY: + evt_set_variable(script, LW(0xD), data->box[i].npcID); + data->box[i].state = BOX_STATE_EMPTY_HIT; + break; + case BOX_CONTENT_PEACH: + data->found++; + data->box[i].state = BOX_STATE_PEACH_HIT; + break; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(SetBoxContents)(Evt* script, s32 isInitialCall) { + s32 initialConfiguration; + s32 configuration[NUM_BOXES]; + s32 indexA, indexB, temp; + s32 i, j; + + Enemy* enemy; + Npc* npc; + + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + data->found = 0; + data->timeLeft = PLAY_TIME + 10; + data->currentScore = 0; + data->mashProgress = 0; + data->stunFlags = 0; + + // choose one of three initial configurations at random + initialConfiguration = rand_int(1000) % ARRAY_COUNT(mgm_02_InitialConfigurations); + for (i = 0; i < NUM_BOXES; i++) { + configuration[i] = mgm_02_InitialConfigurations[initialConfiguration][i]; + } + + // randomly swap 10000 pairs + for (i = 0; i < 10000; i++) { + indexA = rand_int(1000) % NUM_BOXES; + indexB = rand_int(1000) % NUM_BOXES; + + if (indexA != indexB) { + temp = configuration[indexB]; + configuration[indexB] = configuration[indexA]; + configuration[indexA] = temp; + } + } + + for (i = 0; i < NUM_BOXES; i++) { + data->box[i].state = -1; + data->box[i].stateTimer = 0; + data->box[i].content = configuration[i]; + data->box[i].modelID = mgm_02_BoxModelIDs[i]; + data->box[i].colliderID = mgm_02_BoxColliderIDs[i]; + data->box[i].npcID = -1; + data->box[i].peachPanelModelID = -1; + } + + for (i = FUZZY_NPC_ID_BASE; i < FUZZY_NPC_ID_BASE + 5; i++) { + enemy = get_enemy(i); + enemy->varTable[0] = 0; + } + + for (i = BOBOMB_NPC_ID_BASE; i < BOBOMB_NPC_ID_BASE + 5; i++) { + enemy = get_enemy(i); + enemy->varTable[0] = 0; + } + + for (i = LUIGI_NPC_ID_BASE; i < LUIGI_NPC_ID_BASE + 10; i++) { + enemy = get_enemy(i); + enemy->varTable[0] = 0; + } + + for (i = 0; i < ARRAY_COUNT(D_80248600); i++) { + D_80248600[i] = FALSE; + } + + for (i = 0; i < NUM_BOXES; i++) { + switch (data->box[i].content) { + case BOX_CONTENT_FUZZY: + data->box[i].state = BOX_STATE_FUZZY_INIT; + for (j = FUZZY_NPC_ID_BASE; j < FUZZY_NPC_ID_BASE + 5; j++) { + enemy = get_enemy(j); + if (enemy->varTable[0] == 0) { + npc = get_npc_unsafe(enemy->npcID); + enemy->varTable[0] = 1; + data->box[i].npcID = j; + disable_npc_shadow(npc); + npc->flags |= NPC_FLAG_2; + break; + } + } + break; + case BOX_CONTENT_BOMB: + data->box[i].state = BOX_STATE_BOMB_INIT; + for (j = BOBOMB_NPC_ID_BASE; j < BOBOMB_NPC_ID_BASE + 5; j++) { + enemy = get_enemy(j); + if (enemy->varTable[0] == 0) { + npc = get_npc_unsafe(enemy->npcID); + enemy->varTable[0] = 1; + data->box[i].npcID = j; + disable_npc_shadow(npc); + npc->flags |= NPC_FLAG_2; + break; + } + } + break; + case BOX_CONTENT_PEACH: + data->box[i].state = BOX_STATE_PEACH_INIT; + for (j = LUIGI_NPC_ID_BASE; j < LUIGI_NPC_ID_BASE + 10; j++) { + enemy = get_enemy(j); + if (enemy->varTable[0] == 0) { + npc = get_npc_unsafe(enemy->npcID); + enemy->varTable[0] = 1; + data->box[i].npcID = j; + disable_npc_shadow(npc); + npc->flags |= NPC_FLAG_2; + break; + } + } + // ARRAY BOUNDS ERROR IN ORIGINAL CODE! + for (j = 0; j <= ARRAY_COUNT(D_80248600); j++) { + if (!D_80248600[j]) { + D_80248600[j] = TRUE; + data->box[i].peachPanelModelID = mgm_02_PanelModelIDs[j]; + break; + } + } + break; + case 3: + data->box[i].state = BOX_STATE_EMPTY_INIT; + break; + } + } + return ApiStatus_DONE2; +} + +ApiStatus N(RunMinigame)(Evt* script, s32 isInitialCall) { + SmashGameData* data; + Enemy* enemy; + + Npc* npc; + s32 writeback; + + Model* model; + Matrix4f mtx; + f32 centerX, centerY, centerZ; + f32 sizeX, sizeY, sizeZ; + s32 i; + + s32 gameFinished; + s32 hittingPeachBlock; + + gameFinished = FALSE; + hittingPeachBlock = FALSE; + data = get_enemy(0)->varTablePtr[0]; + + for (i = 0; i < NUM_BOXES; i++) { + if (data->box[i].npcID != -1) { + enemy = get_enemy(data->box[i].npcID); + npc = get_npc_unsafe(enemy->npcID); + switch (data->box[i].state) { + case BOX_STATE_FUZZY_INIT: + data->box[i].state = BOX_STATE_FUZZY_IDLE; + data->box[i].stateTimer = rand_int(210); + npc->pos.y = -1000.0f; + npc->flags &= -(NPC_FLAG_PASSIVE | NPC_FLAG_2); + disable_npc_shadow(npc); + // fallthrough + case BOX_STATE_FUZZY_IDLE: + data->box[i].stateTimer--; + if (data->box[i].stateTimer <= 0) { + npc->currentAnim.w = NPC_ANIM_fuzzy_Palette_00_Anim_2; + data->box[i].state = BOX_STATE_FUZZY_POPUP; + sfx_play_sound_at_position(enemy->varTable[8], 0x100000, npc->pos.x, npc->pos.y, npc->pos.z); + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + npc->jumpVelocity = 10.5f; + npc->pos.x = centerX; + npc->jumpScale = 1.5f; + npc->pos.y = centerY - 12.5; + npc->moveToPos.y = npc->pos.y; + npc->pos.z = centerZ + 2.0; + data->box[i].stateTimer = 0; + } + break; + case BOX_STATE_FUZZY_POPUP: + data->box[i].stateTimer++; + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + if ((npc->moveToPos.y + 20.0f) < npc->pos.y) { + enable_npc_shadow(npc); + } else { + disable_npc_shadow(npc); + } + if ((npc->jumpVelocity < 0.0) && (npc->pos.y <= npc->moveToPos.y)) { + data->box[i].state = BOX_STATE_FUZZY_IDLE; + data->box[i].stateTimer = rand_int(330) + 90; + npc->pos.y = -1000.0f; + if (rand_int(100) < 50) { + npc->yaw = 270.0f; + } else { + npc->yaw = 90.0f; + } + disable_npc_shadow(npc); + } + break; + case BOX_STATE_FUZZY_HIT: + hud_element_set_script(data->hudElemID_AButton, HudScript_AButton); + hud_element_set_alpha(data->hudElemID_AButton, 160); + hud_element_set_alpha(data->hudElemID_Meter, 160); + data->mashProgress = 0; + data->stunFlags |= STUN_FLAGS_GRABBED; + enable_npc_shadow(npc); + data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); + npc->duration = 8; + sfx_play_sound(enemy->varTable[8]); + data->box[i].state = BOX_STATE_FUZZY_ATTACH; + gPlayerStatusPtr->anim = ANIM_CROUCH_STILL; + npc->currentAnim.w = NPC_ANIM_fuzzy_Palette_00_Anim_3; + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + npc->pos.x = centerX; + npc->pos.y = centerY; + npc->pos.z = centerZ + 2.0; + npc->moveToPos.y = gPlayerStatusPtr->position.y + 35.0f; + npc->jumpVelocity = 10.5f; + npc->jumpScale = 1.5f; + + data->box[i].stateTimer = 0; + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 10, &writeback); + enemy->varTable[1] = npc->pos.x * 10.0f; + enemy->varTable[2] = npc->pos.y * 10.0f; + enemy->varTable[3] = npc->pos.z * 10.0f; + enemy->varTable[4] = gPlayerStatusPtr->position.x * 10.0f; + enemy->varTable[5] = (gPlayerStatusPtr->position.y + 28.0f) * 10.0f; + enemy->varTable[6] = (gPlayerStatusPtr->position.z + 2.0f) * 10.0f; + enemy->varTable[7] = 0; + break; + case BOX_STATE_FUZZY_ATTACH: + enemy->varTable[7]++; + npc->pos.x = update_lerp(EASING_LINEAR, (f32)enemy->varTable[1] / 10.0, (f32)enemy->varTable[4] / 10.0, enemy->varTable[7], 8); + npc->pos.y = update_lerp(EASING_LINEAR, (f32)enemy->varTable[2] / 10.0, (f32)enemy->varTable[5] / 10.0, enemy->varTable[7], 8); + npc->pos.z = update_lerp(EASING_LINEAR, (f32)enemy->varTable[3] / 10.0, (f32)enemy->varTable[6] / 10.0, enemy->varTable[7], 8); + gPlayerStatusPtr->anim = ANIM_CROUCH_STILL; + npc->duration--; + if (npc->duration <= 0) { + npc->currentAnim.w = NPC_ANIM_fuzzy_Palette_00_Anim_F; + gPlayerStatusPtr->anim = ANIM_RUN_PANIC; + data->mashProgress = 0; + npc->pos.x = gPlayerStatusPtr->position.x; + npc->pos.y = gPlayerStatusPtr->position.y + 28.0; + npc->pos.z = gPlayerStatusPtr->position.z + 2.0; + hud_element_set_script(data->hudElemID_AButton, HudScript_MashAButton); + hud_element_set_alpha(data->hudElemID_AButton, 255); + hud_element_set_alpha(data->hudElemID_Meter, 255); + data->box[i].state = BOX_STATE_FUZZY_GRAB; + } + break; + case BOX_STATE_FUZZY_GRAB: + gPlayerStatusPtr->anim = ANIM_RUN_PANIC; + if (gGameStatusPtr->pressedButtons & BUTTON_A) { + data->mashProgress++; + } + if (data->mashProgress >= 12) { + gPlayerStatusPtr->anim = ANIM_10002; + data->stunFlags &= ~STUN_FLAGS_STUNNED; + data->stunFlags |= STUN_FLAGS_CHANGED; + data->box[i].state = BOX_STATE_FUZZY_DETACH; + npc->duration = 10; + hud_element_set_script(data->hudElemID_AButton, HudScript_AButton); + hud_element_set_alpha(data->hudElemID_AButton, 160); + hud_element_set_alpha(data->hudElemID_Meter, 160); + npc->currentAnim.w = NPC_ANIM_fuzzy_Palette_00_Anim_8; + npc->pos.y += 3.0; + } + break; + case BOX_STATE_FUZZY_DETACH: + npc->duration--; + if (npc->duration == 8) { + data->stunFlags &= ~STUN_FLAGS_GRABBED; + } + if (npc->duration <= 0) { + data->box[i].state = BOX_STATE_FUZZY_DONE; + disable_npc_shadow(npc); + npc->flags |= NPC_FLAG_2; + fx_walking_dust(1, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z + 1.0f, 0, 0); + } + break; + case BOX_STATE_FUZZY_DONE: + break; + + case BOX_STATE_BOMB_INIT: + data->box[i].state = BOX_STATE_BOMB_IDLE; + data->box[i].stateTimer = rand_int(210); + npc->pos.y = -1000.0f; + disable_npc_shadow(npc); + npc->flags &= -(NPC_FLAG_PASSIVE | NPC_FLAG_2); + // fallthrough + case BOX_STATE_BOMB_IDLE: + data->box[i].stateTimer--; + if (data->box[i].stateTimer <= 0) { + data->box[i].state = BOX_STATE_BOMB_POPUP; + sfx_play_sound_at_position(enemy->varTable[8], 0x100000, npc->pos.x, npc->pos.y, npc->pos.z); + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + npc->jumpVelocity = 10.5f; + npc->pos.x = centerX; + npc->jumpScale = 1.5f; + npc->pos.y = centerY - 12.5; + npc->moveToPos.y = npc->pos.y; + npc->pos.z = centerZ + 2.0; + data->box[i].stateTimer = 0; + } + break; + case BOX_STATE_BOMB_POPUP: + data->box[i].stateTimer++; + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + if ((npc->moveToPos.y + 20.0f) < npc->pos.y) { + enable_npc_shadow(npc); + } else { + disable_npc_shadow(npc); + } + if ((npc->jumpVelocity < 0.0) && (npc->pos.y <= npc->moveToPos.y)) { + data->box[i].state = BOX_STATE_BOMB_IDLE; + data->box[i].stateTimer = rand_int(330) + 90; + npc->pos.y = -1000.0f; + if (rand_int(100) < 50) { + npc->yaw = 270.0f; + } else { + npc->yaw = 90.0f; + } + disable_npc_shadow(npc); + } + break; + case BOX_STATE_BOMB_HIT: + enable_npc_shadow(npc); + npc->duration = 15; + npc->currentAnim.w = NPC_ANIM_bob_omb_Palette_00_Anim_5; + data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); + data->box[i].state = BOX_STATE_BOMB_ATTACK; + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + npc->pos.x = centerX; + npc->pos.y = centerY - 10.0f; + npc->pos.z = centerZ + 8.0; + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 10, &writeback); + if (npc->pos.x > gPlayerStatusPtr->position.x) { + npc->yaw = 270.0f; + gPlayerStatusPtr->targetYaw = 95.0f; + } else { + npc->yaw = 90.0f; + gPlayerStatusPtr->targetYaw = 265.0f; + } + // rest of case could simply use fallthough, but wouldnt match + gPlayerStatusPtr->anim = ANIM_CROUCH_STILL; + npc->duration--; + if (npc->duration <= 0) { + fx_explosion(0, npc->pos.x, npc->pos.y, npc->pos.z + 1.0f); + npc->duration = 30; + npc->pos.y = -1000.0f; + data->box[i].state = BOX_STATE_BOMB_STUN; + sfx_play_sound(SOUND_BOMB_BLAST); + } + break; + case BOX_STATE_BOMB_ATTACK: + gPlayerStatusPtr->anim = ANIM_CROUCH_STILL; + npc->duration--; + if (npc->duration <= 0) { + fx_explosion(0, npc->pos.x, npc->pos.y, npc->pos.z + 1.0f); + npc->duration = 30; + npc->pos.y = -1000.0f; + data->box[i].state = BOX_STATE_BOMB_STUN; + sfx_play_sound(SOUND_BOMB_BLAST); + } + break; + case BOX_STATE_BOMB_STUN: + npc->duration--; + if (npc->duration == 25) { + gPlayerStatusPtr->anim = ANIM_CHARRED; + } + if (npc->duration <= 0) { + gPlayerStatusPtr->anim = ANIM_10002; + data->stunFlags &= ~STUN_FLAGS_STUNNED; + data->stunFlags |= STUN_FLAGS_CHANGED; + data->box[i].state = BOX_STATE_BOMB_DONE; + disable_npc_shadow(npc); + npc->flags |= NPC_FLAG_2; + } + break; + case BOX_STATE_BOMB_DONE: + break; + + case BOX_STATE_PEACH_INIT: + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + data->box[i].state = BOX_STATE_PEACH_IDLE; + data->box[i].stateTimer = rand_int(210); + npc->pos.x = centerX; + npc->pos.y = centerY; + npc->moveToPos.y = npc->pos.y; + npc->pos.z = centerZ + 2.0; + disable_npc_shadow(npc); + // fallthrough + case BOX_STATE_PEACH_IDLE: + data->box[i].stateTimer--; + if (data->box[i].stateTimer <= 0) { + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + data->box[i].state = BOX_STATE_PEACH_POPUP; + sfx_play_sound_at_position(SOUND_214, 0x200000, npc->pos.x, npc->pos.y, npc->pos.z); + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + npc->jumpVelocity = 10.0f; + npc->pos.y = npc->moveToPos.y; + npc->jumpScale = 1.1f; + data->box[i].stateTimer = 0; + model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); + model->flags &= -(MODEL_FLAGS_FLAG_1 | MODEL_FLAGS_ENABLED); + if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + guTranslateF(model->transformMatrix, npc->pos.x, npc->pos.y, npc->pos.z); + model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); + } + else { + guTranslateF(mtx, npc->pos.x, npc->pos.y, npc->pos.z); + guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); + } + } + break; + case BOX_STATE_PEACH_POPUP: + data->box[i].stateTimer++; + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); + if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + guTranslateF(model->transformMatrix, npc->pos.x, npc->pos.y, npc->pos.z); + model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); + } else { + guTranslateF(mtx, npc->pos.x, npc->pos.y, npc->pos.z); + guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); + } + if ((npc->moveToPos.y + 20.0f) < npc->pos.y) { + enable_npc_shadow(npc); + } else { + disable_npc_shadow(npc); + } + if ((npc->jumpVelocity < 0.0) && (npc->pos.y <= npc->moveToPos.y)) { + data->box[i].state = BOX_STATE_PEACH_IDLE; + data->box[i].stateTimer = rand_int(330) + 90; + disable_npc_shadow(npc); + model->flags |= MODEL_FLAGS_ENABLED; + } + break; + case BOX_STATE_PEACH_HIT: + sfx_play_sound(SOUND_21C); + model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); + enable_npc_shadow(npc); + npc->duration = 0; + data->box[i].state = BOX_STATE_PEACH_EMERGE; + model->flags &= -(MODEL_FLAGS_FLAG_1 | MODEL_FLAGS_ENABLED); + // fallthrough + case BOX_STATE_PEACH_EMERGE: + hittingPeachBlock = TRUE; + model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); + centerY = update_lerp(EASING_QUADRATIC_OUT, npc->moveToPos.y, npc->moveToPos.y + 30.0, npc->duration, 30); + if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + guTranslateF(model->transformMatrix, npc->pos.x, centerY, npc->pos.z); + model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); + } else { + guTranslateF(mtx, npc->pos.x, centerY, npc->pos.z); + guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); + } + npc->duration++; + if (npc->duration >= 30) { + data->box[i].state = BOX_STATE_PEACH_DONE; + disable_npc_shadow(npc); + model->flags |= MODEL_FLAGS_ENABLED; + } + break; + case BOX_STATE_PEACH_DONE: + break; + } + } else { + if (data->box[i].state == BOX_STATE_EMPTY_INIT) { + data->box[i].state = BOX_STATE_EMPTY_IDLE; + data->box[i].stateTimer = 0; + } + } + } + + if (data->timeLeft > 0) { + if (data->found < NUM_PANELS) { + data->timeLeft--; + if (data->timeLeft == 750) { + sfx_play_sound(SOUND_1A5); + } else if (data->timeLeft == 600) { + sfx_play_sound(SOUND_1A5); + } else if (data->timeLeft == 450) { + sfx_play_sound(SOUND_1A5); + } else if (data->timeLeft == 300) { + sfx_play_sound(SOUND_1A6); + } else if (data->timeLeft == 270) { + sfx_play_sound(SOUND_1A6); + } else if (data->timeLeft == 240) { + sfx_play_sound(SOUND_1A6); + } else if (data->timeLeft == 210) { + sfx_play_sound(SOUND_1A6); + } else if (data->timeLeft == 180) { + sfx_play_sound(SOUND_1A6); + } else if (data->timeLeft == 150) { + sfx_play_sound(SOUND_1A7); + } else if (data->timeLeft == 120) { + sfx_play_sound(SOUND_1A7); + } else if (data->timeLeft == 90) { + sfx_play_sound(SOUND_1A7); + } else if (data->timeLeft == 60) { + sfx_play_sound(SOUND_1A7); + } else if (data->timeLeft == 30) { + sfx_play_sound(SOUND_1A7); + } + } + if ((data->timeLeft > 0) && (data->found == NUM_PANELS)) { + if (!(data->stunFlags & STUN_FLAGS_STUNNED)) { + data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); + } + } + } + if ((data->timeLeft == 0) && hittingPeachBlock) { + if (!(data->stunFlags & STUN_FLAGS_STUNNED)) { + data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); + } + } + if (data->stunFlags & STUN_FLAGS_CHANGED) { + data->stunFlags &= ~STUN_FLAGS_CHANGED; + if (data->stunFlags & STUN_FLAGS_STUNNED) { + disable_player_input(); + partner_disable_input(); + } else { + enable_player_input(); + partner_enable_input(); + } + } + if (!hittingPeachBlock && ((data->found == 10) || ((data->timeLeft == 0) + && (gPlayerStatusPtr->actionState != ACTION_STATE_HAMMER)))) { + gameFinished = TRUE; + } + if (gameFinished) { + if (data->stunFlags & STUN_FLAGS_STUNNED) { + enable_player_input(); + partner_enable_input(); + } + data->stunFlags = 0; + + gPlayerStatusPtr->targetYaw = 180.0; + if (data->timeLeft == 0) { + sfx_play_sound(SOUND_MENU_ERROR); + gPlayerStatusPtr->anim = ANIM_10002; + } else { + sfx_play_sound(SOUND_D4); + gPlayerStatusPtr->anim = ANIM_10002; + } + + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80240BB0_E16930); static char* N(exit_str_0) = "mgm_00"; -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80241DCC_E17B4C); +ApiStatus N(UpdateRecords)(Evt* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + s32 seconds, deciseconds; + s32 outScore; -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80241F38_E17CB8); + seconds = data->timeLeft / 30; + deciseconds = ((f32)(data->timeLeft % 30) * 10.0) / 30; -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80241FE4_E17D64); + data->currentScore = (seconds * 10) + deciseconds; + playerData->smashGameTotal += data->currentScore; -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80242274_E17FF4); + if (playerData->smashGameTotal > 99999) { + playerData->smashGameTotal = 99999; + } + if (playerData->smashGameRecord < data->currentScore) { + playerData->smashGameRecord = data->currentScore; + } -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_802422D0_E18050); + set_message_value(seconds, 0); + set_message_value(deciseconds, 1); + set_message_value(data->currentScore, 2); -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80242314_E18094); + outScore = data->currentScore; + if (data->currentScore == 0 && data->found == NUM_PANELS) { + outScore = -1; + } + evt_set_variable(script, LW(0), outScore); -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80242340_E180C0); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_802423A4_E18124); +ApiStatus N(GiveCoinReward)(Evt* script, s32 isInitialCall) { + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + s32 coinsLeft = data->currentScore; + s32 increment; + + if (coinsLeft > 100) { + increment = 40; + } else if (coinsLeft > 75) { + increment = 35; + } else if (coinsLeft > 50) { + increment = 30; + } else if (coinsLeft > 30) { + increment = 10; + } else if (coinsLeft > 20) { + increment = 5; + } else if (coinsLeft > 10) { + increment = 2; + } else { + increment = 1; + } + + data->currentScore -= increment; + add_coins(increment); + sfx_play_sound(SOUND_211); + + return (data->currentScore > 0) ? ApiStatus_BLOCK : ApiStatus_DONE2; +} + +ApiStatus N(CleanupGame)(Evt* script, s32 isInitialCall) { + Enemy* enemy = get_enemy(SCOREKEEPER_ENEMY_IDX); + SmashGameData* data = enemy->varTablePtr[SMASH_DATA_VAR_IDX]; + Npc* npc; + u32 screenX, screenY,screenZ; + s32 writeback; + s32 i; + + if (enemy->varTable[3] == 4) { + for (i = 0; i < NUM_BOXES; i++) { + if (data->box[i].npcID == -1) { + continue; + } + enemy = get_enemy(data->box[i].npcID); + npc = get_npc_unsafe(enemy->npcID); + if ((npc->flags & NPC_FLAG_2)) { + continue; + } + + get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &screenX, &screenY, &screenZ); + if (screenX - 1 < SCREEN_WIDTH - 1) { + fx_walking_dust(1, npc->pos.x, npc->pos.y, npc->pos.z, 0, 0); + sfx_play_sound(SOUND_283); + } + npc->flags |= NPC_FLAG_2; + disable_npc_shadow(npc); + enemy->varTable[0] = 0; + } + return ApiStatus_DONE2; + } else { + for (i = 0; i < NUM_BOXES; i++) { + if (data->box[i].npcID == -1) { + continue; + } + enemy = get_enemy(data->box[i].npcID); + npc = get_npc_unsafe(enemy->npcID); + if ((npc->flags & NPC_FLAG_2)) { + continue; + } + + switch (data->box[i].content) { + case BOX_CONTENT_FUZZY: + if (data->box[i].state != BOX_STATE_FUZZY_END) { + data->box[i].state = BOX_STATE_FUZZY_END; + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 30, &writeback); + npc->currentAnim.w = NPC_ANIM_fuzzy_Palette_00_Anim_E; + enable_npc_shadow(npc); + } + break; + + case BOX_CONTENT_BOMB: + if (data->box[i].state != BOX_STATE_BOMB_END) { + data->box[i].state = BOX_STATE_BOMB_END; + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 30, &writeback); + npc->currentAnim.w = NPC_ANIM_bob_omb_Palette_00_Anim_1C; + enable_npc_shadow(npc); + } + break; + } + } + return ApiStatus_BLOCK; + } +} + +ApiStatus N(CreateMinigame)(Evt* script, s32 isInitialCall) { + Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); + SmashGameData* data = heap_malloc(sizeof(SmashGameData)); + scorekeeper->varTablePtr[SMASH_DATA_VAR_IDX] = data; + + data->windowA_posX = -80; + data->windowB_posX = SCREEN_WIDTH; + data->timeLeft = PLAY_TIME; + + func_800E9894(); + close_status_menu(); + + return ApiStatus_DONE2; +} + +ApiStatus N(DestroyMinigame)(Evt* script, s32 isInitialCall) { + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + + free_generic_entity(data->workerID); + hud_element_free(data->hudElemID_AButton); + hud_element_free(data->hudElemID_Meter); + + return ApiStatus_DONE2; +} + +ApiStatus N(GetCoinCount)(Evt* script, s32 isInitialCall) { + evt_set_variable(script, LW(0xA), gPlayerData.coins); + return ApiStatus_DONE2; +} + +ApiStatus N(TakeCoinCost)(Evt* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + + if (isInitialCall) { + playerData->smashGamePlays++; + script->functionTemp[0] = 0; + } + add_coins(-1); + sfx_play_sound(SOUND_211); + + script->functionTemp[0]++; + return (script->functionTemp[0] == PLAY_COST) ? ApiStatus_DONE2 : ApiStatus_BLOCK; +} + +ApiStatus N(HideCoinCounter)(Evt* script, s32 isInitialCall) { + hide_coin_counter_immediately(); + return ApiStatus_DONE2; +} diff --git a/src/world/area_mgm/mgm_02/E18150.c b/src/world/area_mgm/mgm_02/E18150.c index 0a6ada14b0..88ef7297c7 100644 --- a/src/world/area_mgm/mgm_02/E18150.c +++ b/src/world/area_mgm/mgm_02/E18150.c @@ -1,3 +1,10 @@ #include "mgm_02.h" -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E18150", func_802423D0_E18150); +void set_message_images(MessageImageData* images); + +extern MessageImageData N(MsgImg_PeachPanel); + +ApiStatus N(SetMsgImgs_Panel)(Evt* script, s32 isInitialCall) { + set_message_images(&N(MsgImg_PeachPanel)); + return ApiStatus_DONE2; +} diff --git a/src/world/area_nok/nok_04/9EDBF0.c b/src/world/area_nok/nok_04/9EDBF0.c index 1ea916e403..051bcb1ac9 100644 --- a/src/world/area_nok/nok_04/9EDBF0.c +++ b/src/world/area_nok/nok_04/9EDBF0.c @@ -163,7 +163,7 @@ ApiStatus func_80240574_9EE164(Evt* evt, s32 isInitialCall) { ApiStatus func_80240630_9EE220(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 evtVar = evt_get_variable(script, *args++); - Bytecode outVar = *args++;; + Bytecode outVar = *args++; evtVar %= 6; if (evtVar < 4) { diff --git a/src/world/area_omo/omo_12/DDF310.c b/src/world/area_omo/omo_12/DDF310.c index 28fe1df4ee..4fd85ec290 100644 --- a/src/world/area_omo/omo_12/DDF310.c +++ b/src/world/area_omo/omo_12/DDF310.c @@ -2,7 +2,7 @@ #include "world/common/UnkFunc41.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_80240184_DDF494); +#include "world/common/DarkRoom.inc.c" #include "world/common/SetCamera0Flag1000.inc.c" diff --git a/src/world/area_omo/omo_14/DE56B0.c b/src/world/area_omo/omo_14/DE56B0.c index b3775306a3..2f74633d1b 100644 --- a/src/world/area_omo/omo_14/DE56B0.c +++ b/src/world/area_omo/omo_14/DE56B0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "omo_02"; static char* N(exit_str_1) = "omo_15"; -INCLUDE_ASM(s32, "world/area_omo/omo_14/DE56B0", func_80240000_DE56B0); +#include "world/common/DarkRoom.inc.c" diff --git a/src/world/area_tst/tst_04/B1B570.c b/src/world/area_tst/tst_04/B1B570.c index 5c44fd693c..69005c7c78 100644 --- a/src/world/area_tst/tst_04/B1B570.c +++ b/src/world/area_tst/tst_04/B1B570.c @@ -33,45 +33,37 @@ ApiStatus func_80240000_B1B570(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// float shenanigans -#ifdef NON_EQUIVALENT -ApiStatus func_802400FC_B1B66C(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_safe(NPC_PARTNER); - f32 angle; +ApiStatus func_802400FC_B1B66C(Evt *script, s32 isInitialCall) +{ + Npc *npc = get_npc_safe(NPC_PARTNER); + f32 angle, sinAngle, cosAngle; f32 dist; - f32 product1; - f32 product2; - f32 cos1; - f32 sin1; - f32 sin2; - f32 cos2; - f32 var1; - + f32 x0, x1; + f32 z0, z1; + if (npc == NULL) { return ApiStatus_DONE2; } - + dist = dist2D(npc->pos.x, npc->pos.z, -250.0f, -100.0f); - - var1 = evt_get_variable(script, 0 - 30000000) - 1; - angle = var1 * TAU / 360.0f; - sin1 = sin_rad(angle); - cos1 = cos_rad(angle); - product1 = dist * cos1; - product2 = dist * -sin1; - - var1 = evt_get_variable(script, EVT_VAR(0)); - angle = (var1 * TAU) / 360.0f; - sin2 = sin_rad(angle); - cos2 = cos_rad(angle); - npc->pos.x += (dist * cos2) - product1; - npc->pos.z += (dist * -sin2) - product2; - + + angle = evt_get_variable(script, LW(0)) - 1; + sinAngle = sin_rad((angle * TAU) / 360.0f); + cosAngle = cos_rad((angle * TAU) / 360.0f); + x0 = dist * cosAngle; + z0 = dist * -sinAngle; + + angle = evt_get_variable(script, LW(0)); + sinAngle = sin_rad((angle * TAU) / 360.0f); + cosAngle = cos_rad((angle * TAU) / 360.0f); + x1 = dist * cosAngle; + z1 = dist * -sinAngle; + + npc->pos.x += x1 - x0; + npc->pos.z += z1 - z0; + return ApiStatus_DONE2; } -#else -INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_802400FC_B1B66C); -#endif ApiStatus func_80240260_B1B7D0(Evt* script, s32 isInitialCall) { script->array[0] = (s32) create_generic_entity_frontUI(NULL, func_8024029C_B1B80C); diff --git a/src/world/common/Bandit_DropCoin.inc.c b/src/world/common/Bandit_DropCoin.inc.c index 9e564ed30e..8df0e75a1d 100644 --- a/src/world/common/Bandit_DropCoin.inc.c +++ b/src/world/common/Bandit_DropCoin.inc.c @@ -21,12 +21,12 @@ ApiStatus N(Bandit_DropCoin)(Evt* script, s32 isInitialCall) { npc = (Npc*)npcID; } - script->functionTempNpc[0] = npc; + script->functionTempPtr[0] = npc; script->functionTemp[1] = itemEntityIndex; script->functionTemp[2] = areaFlag; } - npc = script->functionTempNpc[0]; + npc = script->functionTempPtr[0]; itemEntityIndex = script->functionTemp[1]; areaFlag = script->functionTemp[2]; diff --git a/src/world/common/DarkRoom.inc.c b/src/world/common/DarkRoom.inc.c new file mode 100644 index 0000000000..5fd2c07e41 --- /dev/null +++ b/src/world/common/DarkRoom.inc.c @@ -0,0 +1,44 @@ +#include "common.h" + +ApiStatus N(DarkRoomUpdate)(Evt* script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + PlayerData* playerData = &gPlayerData; + + if (isInitialCall) { + script->functionTemp[0] = 255; + script->functionTemp[1] = 0; + } + + set_screen_overlay_center_worldpos(1, 1, playerStatus->position.x, playerStatus->position.y + 8.0f, playerStatus->position.z); + + if (gPartnerActionStatus.actionState.b[0] != 0) { + if (playerData->currentPartner == PARTNER_WATT) { + if (script->functionTemp[1] == 0) { + script->functionTemp[1] = 1; + sfx_play_sound(SOUND_WATT_REPEL_DARKNESS); + } + script->functionTemp[0] -= 8; + if (script->functionTemp[0] < 90) { + script->functionTemp[0] = 90; + } + } + } else if (playerData->currentPartner == PARTNER_WATT) { + if (script->functionTemp[1] != 0) { + script->functionTemp[1] = 0; + if (script->functionTemp[0] < 255) { + sfx_play_sound(SOUND_WATT_RESUME_DARKNESS); + } + } + script->functionTemp[0] += 8; + if (script->functionTemp[0] >= 255) { + script->functionTemp[0] = 255; + } + } else { + script->functionTemp[0] = 255; + } + + set_screen_overlay_alpha(1, script->functionTemp[0]); + set_screen_overlay_params_back(0xB, 255.0f); + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/UnkFunc62.inc.c b/src/world/common/UnkFunc62.inc.c index 8cdd370794..da352929bd 100644 --- a/src/world/common/UnkFunc62.inc.c +++ b/src/world/common/UnkFunc62.inc.c @@ -110,7 +110,7 @@ ApiStatus N(UnkFunc62)(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 1: - if (state->velocity > 1.570795f) { + if (state->velocity > PI_S / 2) { set_animation(ACTOR_SELF, 1, state->animJumpFall); } oldActorX = actor->currentPos.x; diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index c758bb44de..fd4b369c2a 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -350,7 +350,7 @@ ApiStatus ShowShopPurchaseDialog(Evt* script, s32 isInitialCall) { shopOwnerScript = D_8028652C; if (shopOwnerScript == NULL || !does_script_exist(shopOwnerScript->id)) { decrement_status_menu_disabled(); - func_800E96C8(); + hide_coin_counter_immediately(); return ApiStatus_DONE1; } break; @@ -604,9 +604,9 @@ ApiStatus ShowShopOwnerDialog(Evt* script, s32 isInitialCall) { if (D_80286538->currentOption == 0) { script->functionTemp[1] = shop_owner_end_speech(); script->functionTemp[0] = 201; - func_800E96C8(); + hide_coin_counter_immediately(); } else { - func_800E96C8(); + hide_coin_counter_immediately(); script->functionTemp[1] = shop_owner_reset_speech(22); script->functionTemp[0] = 9; } diff --git a/tools/symz.txt b/tools/symz.txt index f48cf1d12e..a947d6266c 100644 --- a/tools/symz.txt +++ b/tools/symz.txt @@ -500,33 +500,33 @@ D_8029F258 = 0x8029F258; D_8029F25C = 0x8029F25C; D_8029F260 = 0x8029F260; D_8029F264 = 0x8029F264; -D_8029F270 = 0x8029F270; -D_8029F274 = 0x8029F274; -D_8029F278 = 0x8029F278; -D_8029F27C = 0x8029F27C; -D_8029F27E = 0x8029F27E; -D_8029F280 = 0x8029F280; -D_8029F282 = 0x8029F282; -D_8029F284 = 0x8029F284; -D_8029F286 = 0x8029F286; +BattleCam_PosX = 0x8029F270; +BattleCam_PosY = 0x8029F274; +BattleCam_PosZ = 0x8029F278; +BattleCam_TargetActor = 0x8029F27C; +BattleCam_TargetActorPart = 0x8029F27E; +BattleCam_BoomLength = 0x8029F280; +BattleCam_BoomYaw = 0x8029F282; +BattleCam_BoomPitch = 0x8029F284; +BattleCam_BoomZOffset = 0x8029F286; D_8029F288 = 0x8029F288; -D_8029F28C = 0x8029F28C; -D_8029F290 = 0x8029F290; -D_8029F294 = 0x8029F294; -D_8029F298 = 0x8029F298; -D_8029F29C = 0x8029F29C; -D_8029F29E = 0x8029F29E; -D_8029F2A0 = 0x8029F2A0; +BattleCam_TargetBoomLength = 0x8029F28C; +BattleCam_TargetBoomYaw = 0x8029F290; +BattleCam_TargetBoomPitch = 0x8029F294; +BattleCam_TargetBoomZOffset = 0x8029F298; +BattleCam_DoneMoving = 0x8029F29C; +BattleCam_MoveTimeLeft = 0x8029F29E; +BattleCam_MoveTimeTotal = 0x8029F2A0; D_8029F2A2 = 0x8029F2A2; D_8029F2A3 = 0x8029F2A3; D_8029F2A4 = 0x8029F2A4; -D_8029F2A5 = 0x8029F2A5; +BattleCam_UseLinearInterp = 0x8029F2A5; D_8029F2A6 = 0x8029F2A6; D_8029F2A7 = 0x8029F2A7; -D_8029F2A8 = 0x8029F2A8; -D_8029F2AC = 0x8029F2AC; -D_8029F2B0 = 0x8029F2B0; -D_8029F2B4 = 0x8029F2B4; +BattleCam_TargetPosX = 0x8029F2A8; +BattleCam_TargetPosY = 0x8029F2AC; +BattleCam_TargetPosZ = 0x8029F2B0; +BattleCam_ControlScript = 0x8029F2B4; popupMessages = 0x8029F2C0; D_8029F640 = 0x8029F640; D_8029F642 = 0x8029F642; diff --git a/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s b/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s index 80f82e7ec5..c3e4192951 100644 --- a/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240890_B710F0 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240000_B70860, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802410DC_B7193C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, jan_11_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802410DC_B7193C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802410DC_B7193C .word 0x00000043, 0x00000001, jan_11_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_11_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_11_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kgr/kgr_01/8A9F30.data.s b/ver/us/asm/data/world/area_kgr/kgr_01/8A9F30.data.s index 3f842ae93b..91bcff5639 100644 --- a/ver/us/asm/data/world/area_kgr/kgr_01/8A9F30.data.s +++ b/ver/us/asm/data/world/area_kgr/kgr_01/8A9F30.data.s @@ -6,7 +6,7 @@ dlabel D_80240520_8A9F30 .word 0xC0800000, 0x41000000, 0x00000000, 0x42B40000, 0x42A00000, 0x00000000, 0x41200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802406AC_8AA0BC, D_80240520_8A9F30, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900E9 dlabel D_80240580_8A9F90 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240000_8A9A10, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, kgr_01_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802405AC_8A9FBC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A20, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kgr/kgr_01/8AA1D0.data.s b/ver/us/asm/data/world/area_kgr/kgr_01/8AA1D0.data.s index 06019349a9..225edc94b4 100644 --- a/ver/us/asm/data/world/area_kgr/kgr_01/8AA1D0.data.s +++ b/ver/us/asm/data/world/area_kgr/kgr_01/8AA1D0.data.s @@ -2,8 +2,8 @@ .section .data -dlabel D_802407C0_8AA1D0 +dlabel kgr_01_TongueWiggleTime .short 0x0000, 0x0000 dlabel D_802407C4_8AA1D4 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_802403E0_8A9DF0, 0x00000043, 0x00000005, TranslateModel, 0x00002710, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, CloneModel, 0x00000004, 0x00002710, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000001, 0x00002710, 0x00000043, 0x00000003, EnableModel, 0x00002710, 0x00000000, 0x00000044, 0x00000001, D_802407C4_8AA1D4, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_80240354_8A9D64, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000004, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, kgr_01_GetEffectiveTongueOffset, 0x00000043, 0x00000005, TranslateModel, 0x00002710, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, CloneModel, 0x00000004, 0x00002710, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000001, 0x00002710, 0x00000043, 0x00000003, EnableModel, 0x00002710, 0x00000000, 0x00000044, 0x00000001, D_802407C4_8AA1D4, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, kgr_01_make_tongue_gfx, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000004, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kgr/kgr_01/8AA310.data.s b/ver/us/asm/data/world/area_kgr/kgr_01/8AA310.data.s index 332e1087d6..10a35bc7ab 100644 --- a/ver/us/asm/data/world/area_kgr/kgr_01/8AA310.data.s +++ b/ver/us/asm/data/world/area_kgr/kgr_01/8AA310.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240900_8AA310 -.word 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000012, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000023, 0x00000000, 0x00000043, 0x00000001, func_80240500_8A9F10, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00070099, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000012, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000023, 0x00000000, 0x00000043, 0x00000001, kgr_01_HasBombetteExploded, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00070099, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kgr/kgr_02/8AABD0.data.s b/ver/us/asm/data/world/area_kgr/kgr_02/8AABD0.data.s index 0df8880236..aec8bd28ab 100644 --- a/ver/us/asm/data/world/area_kgr/kgr_02/8AABD0.data.s +++ b/ver/us/asm/data/world/area_kgr/kgr_02/8AABD0.data.s @@ -6,7 +6,7 @@ dlabel D_80240780_8AABD0 .word 0xC32F0000, 0x41200000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240884_8AACD4, D_80240780_8AABD0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900EA dlabel D_802407D0_8AAC20 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240000_8AA450, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, kgr_02_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802407FC_8AAC4C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241B30, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kgr/kgr_02/8ABE60.data.s b/ver/us/asm/data/world/area_kgr/kgr_02/8ABE60.data.s index 770f410c12..7fd5356dbb 100644 --- a/ver/us/asm/data/world/area_kgr/kgr_02/8ABE60.data.s +++ b/ver/us/asm/data/world/area_kgr/kgr_02/8ABE60.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241A10_8ABE60 -.word 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000012, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000023, 0x00000000, 0x00000043, 0x00000001, func_80240760_8AABB0, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0007009A, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000012, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000023, 0x00000000, 0x00000043, 0x00000001, kgr_02_HasBombetteExploded, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0007009A, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_01/A47A60.data.s b/ver/us/asm/data/world/area_kpa/kpa_01/A47A60.data.s index c9699655c3..42aa3debdc 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_01/A47A60.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_01/A47A60.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240B00_A47A60 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240000_A46F60, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, kpa_01_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240B2C_A47A8C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000008, 0x00000024, 0x00000002, 0xFE363C82, 0x00000006, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802415F0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_03/A4A520.data.s b/ver/us/asm/data/world/area_kpa/kpa_03/A4A520.data.s index affcd2d79f..7859299702 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_03/A4A520.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_03/A4A520.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241F60_A4A520 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240000_A485C0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, kpa_03_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F8C_A4A54C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243870, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_00/E123E0.data.s b/ver/us/asm/data/world/area_mgm/mgm_00/E123E0.data.s index 25c6bb6327..945fb7a08a 100644 --- a/ver/us/asm/data/world/area_mgm/mgm_00/E123E0.data.s +++ b/ver/us/asm/data/world/area_mgm/mgm_00/E123E0.data.s @@ -9,7 +9,7 @@ dlabel D_80243C50_E123F0 .word 0xE3000A01, 0x00000000, 0xE200001C, 0x00504240, 0xFCFFFFFF, 0xFFFDF6FB, 0xE3001801, 0x000000C0, 0xE3001A01, 0x00000030, 0xE3001700, 0x00000000, 0xE2001E01, 0x00000000, 0x00000000, 0x00000000, 0xFA000000, 0xFF000000, 0xF64500CC, 0x000B00C4, 0xF60B8214, 0x000B00C4, 0xF6450214, 0x0044C0C4, 0xF6450214, 0x000B0210, 0xDF000000, 0x00000000 dlabel D_80243CC0_E12460 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, func_802416F8_E0FE98, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, mgm_00_UpdateRecordDisplay, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243D20_E124C0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, func_802416F8_E0FE98, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243CC0_E12460, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243D20_E124C0, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, mgm_00_UpdateRecordDisplay, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243CC0_E12460, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243D20_E124C0, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s b/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s index 2ae383b7d9..0c4b63c78e 100644 --- a/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s +++ b/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s @@ -5,41 +5,41 @@ dlabel D_80241A70_E141D0 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel D_80241AC8_E14228 +dlabel mgm_01_BlockPosX .byte 0x83, 0x9C, 0xB5, 0xCE, 0xE7, 0x00, 0x19, 0x32, 0x4B, 0x64, 0x7D, 0x00 -dlabel D_80241AD4_E14234 +dlabel mgm_01_BlockPosY .byte 0x38, 0x3C, 0x38, 0x3C, 0x38, 0x3C, 0x38, 0x3C, 0x38, 0x3C, 0x38, 0x00 -dlabel D_80241AE0_E14240 +dlabel mgm_01_BlockPosZ .byte 0x1E, 0xE2, 0x1E, 0xE2, 0x1E, 0xE2, 0x1E, 0xE2, 0x1E, 0xE2, 0x1E, 0x00 -dlabel D_80241AEC_E1424C +dlabel mgm_01_TallyPosX .float -105.0, -80.0, -55.0, -30.0, -5.0, -105.0, -80.0, -55.0, -30.0, -5.0, 20.0 -dlabel D_80241B18_E14278 +dlabel mgm_01_TallyPosY .float 157.0, 157.0, 157.0, 157.0, 157.0, 133.0, 133.0, 133.0, 133.0, 133.0, 133.0 -dlabel D_80241B44_E142A4 +dlabel mgm_01_PanelModelIDs .word 0x00000013, 0x00000011, 0x0000000F, 0x0000000D, 0x00000016, 0x00000018, 0x0000001A, 0x0000001D, 0x0000001F, 0x00000022, 0x00000024 -dlabel D_80241B70_E142D0 +dlabel mgm_01_PanelTypes .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000002, 0x00000002, 0x00000003, 0x00000003 -dlabel D_80241B9C_E142FC +dlabel mgm_01_InitialConfigurations .word 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000003, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000001, 0x00000003, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x00000003, 0x00000003, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000000 dlabel D_80241C4C_E143AC -.word 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000004, 0xFE363C8C, 0x00000005, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, func_8024045C_E12BBC, 0xFE363C8A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, func_8024050C_E12C6C, 0xFE363C8A, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_8024058C_E12CEC, 0xFE363C8A, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, func_8024050C_E12C6C, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000003, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802407E4_E12F44, 0xFE363C8A, 0x00000043, 0x00000003, func_8024050C_E12C6C, 0xFE363C8A, 0x00000005, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802408EC_E1304C, 0xFE363C8A, 0x00000043, 0x00000003, func_8024050C_E12C6C, 0xFE363C8A, 0x00000007, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000002, func_80240BF4_E13354, 0xFE363C8A, 0x00000043, 0x00000003, func_8024050C_E12C6C, 0xFE363C8A, 0x00000009, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406C4_E12E24, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, func_8024050C_E12C6C, 0xFE363C8A, 0x00000004, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000002, func_8024084C_E12FAC, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, func_8024050C_E12C6C, 0xFE363C8A, 0x00000006, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000002, func_80240AAC_E1320C, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, func_8024050C_E12C6C, 0xFE363C8A, 0x00000008, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000009, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, func_80240ECC_E1362C, 0xFE363C8A, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000006, RotateModel, 0xFE363C81, 0xFE363C88, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xFE363C89, 0xFE363C89, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000063, 0x00000043, 0x00000001, func_80240438_E12B98, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002017, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002017, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80240DB8_E13518, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080034, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xFE363C8C, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000001, func_80240C54_E133B4, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080035, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000001, func_80240C54_E133B4, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080036, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080037, 0x00000043, 0x00000001, func_80240D84_E134E4, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x000003FC, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_80240C54_E133B4, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080038, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80240CD0_E13430, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008003A, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80240F90_E136F0, 0x00000044, 0x00000001, D_80242470_E14BD0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241090_E137F0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241090_E137F0, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241090_E137F0, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241090_E137F0, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241090_E137F0, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241090_E137F0, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241090_E137F0, 0x00000006, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241090_E137F0, 0x00000007, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241090_E137F0, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241090_E137F0, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241090_E137F0, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000004, 0xFE363C8C, 0x00000005, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, mgm_01_GetPanelInfo, 0xFE363C8A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, mgm_01_InitPanelEmergeFromBlock, 0xFE363C8A, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000003, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mgm_01_InitPanelHoldAboveBlock, 0xFE363C8A, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000005, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000002, mgm_01_InitPanelMoveToTally, 0xFE363C8A, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000007, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000002, mgm_01_EndPanelAnimation, 0xFE363C8A, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000009, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, mgm_01_UpdatePanelEmergeFromBlock, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000004, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000002, mgm_01_UpdatetPanelHoldAboveBlock, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000006, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000002, mgm_01_UpdatePanelMoveToTally, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000008, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000009, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, mgm_01_GetPanelPos, 0xFE363C8A, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000006, RotateModel, 0xFE363C81, 0xFE363C88, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xFE363C89, 0xFE363C89, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000063, 0x00000043, 0x00000001, mgm_01_EnableMenus, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002017, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002017, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_01_EndBowserPanelAnimation, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080034, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xFE363C8C, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000001, mgm_01_UpdateRecords, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080035, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000001, mgm_01_UpdateRecords, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080036, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080037, 0x00000043, 0x00000001, mgm_01_DoubleScore, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x000003FC, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, mgm_01_UpdateRecords, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080038, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_01_GiveCoinReward, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008003A, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_01_DestroyBlockEntities, 0x00000044, 0x00000001, D_80242470_E14BD0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000006, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000007, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242470_E14BD0 -.word 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80241574_E13CD4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802415EC_E13D4C, 0x00000044, 0x00000001, D_80242470_E14BD0, 0x00000044, 0x00000001, D_80241C4C_E143AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000043, 0x00000001, mgm_01_InitializePanels, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mgm_01_CreateMinigame, 0x00000044, 0x00000001, D_80242470_E14BD0, 0x00000044, 0x00000001, D_80241C4C_E143AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802424D8_E14C38 -.word 0x00000043, 0x00000001, func_80241690_E13DF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, mgm_01_DestroyMinigame, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802424F4_E14C54 -.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF8405CED, 0x00000000, 0x00000043, 0x00000001, func_80241780_E13EE0, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008002D, 0x00000024, 0x00000002, 0xF8405CED, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008002E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000001, func_802416CC_E13E2C, 0x0000000C, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080039, 0x00000043, 0x00000001, func_80241760_E13EC0, 0x00000008, 0x00000001, 0x0000000C, 0x00000044, 0x00000001, D_802424D8_E14C38, 0x00000043, 0x00000003, GotoMap, 0x80243614, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E004E, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, func_80241760_E13EC0, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080032, 0x00000044, 0x00000001, D_802424D8_E14C38, 0x00000043, 0x00000003, GotoMap, 0x80243614, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000006, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000064, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0xFE363C81, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241510_E13C70, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000004, 0x00000004, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008002F, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000004, 0x00000006, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080030, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000004, 0x00000008, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080031, 0x00000016, 0x00000001, 0x00000003, 0x00000023, 0x00000000, 0x00000043, 0x00000001, func_80241760_E13EC0, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_80241234_E13994, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000003, PushSong, 0x00000085, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000001, func_802403FC_E12B5C, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000003, 0xFFFFFFFF, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802416F8_E13E58, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080033, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF8405CED, 0x00000000, 0x00000043, 0x00000001, mgm_01_SetMsgImgs_Panels, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008002D, 0x00000024, 0x00000002, 0xF8405CED, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008002E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000001, mgm_01_GetCoinCount, 0x0000000C, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080039, 0x00000043, 0x00000001, mgm_01_HideCoinCounter, 0x00000008, 0x00000001, 0x0000000C, 0x00000044, 0x00000001, D_802424D8_E14C38, 0x00000043, 0x00000003, GotoMap, 0x80243614, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E004E, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, mgm_01_HideCoinCounter, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080032, 0x00000044, 0x00000001, D_802424D8_E14C38, 0x00000043, 0x00000003, GotoMap, 0x80243614, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000006, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000064, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0xFE363C81, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, mgm_01_TakeCoinCost, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000004, 0x00000004, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008002F, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000004, 0x00000006, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080030, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000004, 0x00000008, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080031, 0x00000016, 0x00000001, 0x00000003, 0x00000023, 0x00000000, 0x00000043, 0x00000001, mgm_01_HideCoinCounter, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, mgm_01_CreateBlockEntities, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000003, PushSong, 0x00000085, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000001, mgm_01_DisableMenus, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000003, 0xFFFFFFFF, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000001, mgm_01_SetMsgVars_BlocksRemaining, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080033, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242998_E150F8 .word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000004B, 0xFFFFFFFF, 0x00000064, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802424F4_E14C54, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -48,4 +48,4 @@ dlabel D_80242A38_E15198 .word 0x00000000, D_80241A70_E141D0, 0x00000000, 0x00000000, 0xC1A00000, 0x00002D01, D_80242998_E150F8, 0x00000000, 0x00000000, 0x0000010E, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0061, 0x00000001, D_80242A38_E15198, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80242C40_E153A0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80241780_E13EE0, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0008003B, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0xFFFFFFC9, 0xFFFFFFFE, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242C40_E153A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, mgm_01_SetMsgImgs_Panels, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0008003B, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0xFFFFFFC9, 0xFFFFFFFE, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242C40_E153A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_01/E15440.data.s b/ver/us/asm/data/world/area_mgm/mgm_01/E15440.data.s index d84198c330..01bb1975b8 100644 --- a/ver/us/asm/data/world/area_mgm/mgm_01/E15440.data.s +++ b/ver/us/asm/data/world/area_mgm/mgm_01/E15440.data.s @@ -26,5 +26,5 @@ dlabel D_80243340_E15AA0 dlabel D_80243540_E15CA0 .word 0x00011007, 0x310948A1, 0x59852B01, 0xC9854403, 0xAA876B5B, 0xA2B9ACCF, 0xD4C7AD8F, 0xE697E739 -dlabel D_80243560_E15CC0 +dlabel mgm_01_MsgImgs_Panels .word D_80242CE0_E15440, D_80242EE0_E15640, 0x00200020, 0x00000002, 0x00000000, D_80242F00_E15660, D_80243100_E15860, 0x00200020, 0x00000002, 0x00000000, D_80243120_E15880, D_80243320_E15A80, 0x00200020, 0x00000002, 0x00000000, D_80243340_E15AA0, D_80243540_E15CA0, 0x00200020, 0x00000002, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_02/E183D0.data.s b/ver/us/asm/data/world/area_mgm/mgm_02/E183D0.data.s index 36cecd62bf..5d56246656 100644 --- a/ver/us/asm/data/world/area_mgm/mgm_02/E183D0.data.s +++ b/ver/us/asm/data/world/area_mgm/mgm_02/E183D0.data.s @@ -17,23 +17,23 @@ dlabel D_802426E4_E18464 dlabel D_80242710_E18490 .word 0x00000000, 0x00170014, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel D_8024273C_E184BC +dlabel mgm_02_InitialConfigurations .word 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000001, 0x00000002, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000001, 0x00000003, 0x00000003, 0x00000002, 0x00000002, 0x00000000, 0x00000002, 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000001, 0x00000003, 0x00000002, 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000001, 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000000, 0x00000003, 0x00000002, 0x00000002, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000001, 0x00000003, 0x00000003 -dlabel D_802428E0_E18660 +dlabel mgm_02_BoxModelIDs .word 0x00000009, 0x0000000F, 0x00000015, 0x0000001B, 0x00000021, 0x00000027, 0x0000002D, 0x0000000A, 0x00000010, 0x00000016, 0x0000001C, 0x00000022, 0x00000028, 0x0000002E, 0x0000000B, 0x00000011, 0x00000017, 0x0000001D, 0x00000023, 0x00000029, 0x0000002F, 0x0000000C, 0x00000012, 0x00000018, 0x0000001E, 0x00000024, 0x0000002A, 0x00000030, 0x0000000D, 0x00000013, 0x00000019, 0x0000001F, 0x00000025, 0x0000002B, 0x00000031 -dlabel D_8024296C_E186EC +dlabel mgm_02_BoxColliderIDs .word 0x00000009, 0x0000000F, 0x00000015, 0x0000001B, 0x00000021, 0x00000027, 0x0000002D, 0x0000000A, 0x00000010, 0x00000016, 0x0000001C, 0x00000022, 0x00000028, 0x0000002E, 0x0000000B, 0x00000011, 0x00000017, 0x0000001D, 0x00000023, 0x00000029, 0x0000002F, 0x0000000C, 0x00000012, 0x00000018, 0x0000001E, 0x00000024, 0x0000002A, 0x00000030, 0x0000000D, 0x00000013, 0x00000019, 0x0000001F, 0x00000025, 0x0000002B, 0x00000031 -dlabel D_802429F8_E18778 +dlabel mgm_02_PanelModelIDs .word 0x00000034, 0x00000036, 0x00000038, 0x0000003A, 0x0000003C, 0x0000003E, 0x00000040, 0x00000042, 0x00000044, 0x00000046 dlabel D_80242A20_E187A0 -.word 0x00000043, 0x00000001, func_80240468_E161E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, mgm_02_CreateScoreDisplay, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242A3C_E187BC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_802423D0_E18150, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00080046, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, mgm_02_SetMsgImgs_Panel, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00080046, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242A90_E18810 .word 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C81, 0x7FFFFE00, 0x00000043, 0x00000005, TranslateModel, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -60,25 +60,25 @@ dlabel D_80243E9C_E19C1C .word 0x00000043, 0x00000003, EnableModel, 0x00000034, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000036, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000040, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000042, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000044, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000046, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243F74_E19CF4 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, func_80240644_E163C4, 0x00000043, 0x00000002, GetColliderCenter, 0xFE363C8B, 0x00000014, 0x00000001, 0xFE363C8C, 0x00000016, 0x00000001, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFFFFFFF7, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFFFFFFEB, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000008, 0x00000001, 0x00000004, 0x00000028, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, mgm_02_OnHitBox, 0x00000043, 0x00000002, GetColliderCenter, 0xFE363C8B, 0x00000014, 0x00000001, 0xFE363C8C, 0x00000016, 0x00000001, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFFFFFFF7, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFFFFFFEB, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000008, 0x00000001, 0x00000004, 0x00000028, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802441E4_E19F64 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x00000009, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000013, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0x00000015, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000016, 0x00000024, 0x00000002, 0xFE363C81, 0x00000016, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000017, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000018, 0x00000024, 0x00000002, 0xFE363C81, 0x00000018, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000019, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001C, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001D, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001F, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000021, 0x00000024, 0x00000002, 0xFE363C81, 0x00000021, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000024, 0x00000002, 0xFE363C81, 0x00000022, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000024, 0x00000002, 0xFE363C81, 0x00000023, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000024, 0x00000024, 0x00000002, 0xFE363C81, 0x00000024, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000025, 0x00000024, 0x00000002, 0xFE363C81, 0x00000025, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000027, 0x00000024, 0x00000002, 0xFE363C81, 0x00000027, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000028, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000029, 0x00000024, 0x00000002, 0xFE363C81, 0x00000029, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002A, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002B, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002E, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002F, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000030, 0x00000024, 0x00000002, 0xFE363C81, 0x00000030, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000031, 0x00000024, 0x00000002, 0xFE363C81, 0x00000031, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244A28_E1A7A8 -.word 0x00000043, 0x00000001, func_80240790_E16510, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, mgm_02_SetBoxContents, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244A44_E1A7C4 -.word 0x00000043, 0x00000001, func_80241FE4_E17D64, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, mgm_02_CleanupGame, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244A60_E1A7E0 -.word 0x00000043, 0x00000001, func_80240544_E162C4, 0x00000043, 0x00000001, func_80240BB0_E16930, 0x00000043, 0x00000001, func_80240580_E16300, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000003, 0x00000043, 0x00000001, PopSong, 0x00000044, 0x00000001, D_80244A44_E1A7C4, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00080041, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000044, 0x00000001, D_80243E9C_E19C1C, 0x00000044, 0x00000001, D_80243274_E18FF4, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000166, 0xFFFFFFEC, 0x000000B9, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000166, 0xFFFFFFEC, 0x000000B9, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000001, func_802405D0_E16350, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0x00000163, 0x0000002D, 0xFFFFFF51, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000166, 0xFFFFFFEC, 0x000000B9, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0x00000166, 0x00000005, 0x000000BD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x19000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, GetDist2D, 0xFE363C8A, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C8A, 0x00000008, 0x0000000C, 0x00000002, 0xFE363C8A, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000003, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000014A, 0x000000B9, 0xFE363C8A, 0x00000043, 0x00000001, WaitForPlayerMoveToComplete, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000005, 0x00000043, 0x00000001, func_80241DCC_E17B4C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080043, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080044, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080042, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80241F38_E17CB8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080045, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2518280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80242274_E17FF4, 0x00000044, 0x00000001, D_80242C60_E189E0, 0x00000043, 0x00000001, func_802405D0_E16350, 0x00000044, 0x00000001, D_80242A20_E187A0, 0x00000044, 0x00000001, D_802441E4_E19F64, 0x00000044, 0x00000001, D_80243E9C_E19C1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, mgm_02_DisableMenus, 0x00000043, 0x00000001, mgm_02_RunMinigame, 0x00000043, 0x00000001, mgm_02_EnableMenus, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000003, 0x00000043, 0x00000001, PopSong, 0x00000044, 0x00000001, D_80244A44_E1A7C4, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00080041, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000044, 0x00000001, D_80243E9C_E19C1C, 0x00000044, 0x00000001, D_80243274_E18FF4, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000166, 0xFFFFFFEC, 0x000000B9, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000166, 0xFFFFFFEC, 0x000000B9, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000001, mgm_02_CreateSignpost, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0x00000163, 0x0000002D, 0xFFFFFF51, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000166, 0xFFFFFFEC, 0x000000B9, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0x00000166, 0x00000005, 0x000000BD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x19000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, GetDist2D, 0xFE363C8A, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C8A, 0x00000008, 0x0000000C, 0x00000002, 0xFE363C8A, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000003, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000014A, 0x000000B9, 0xFE363C8A, 0x00000043, 0x00000001, WaitForPlayerMoveToComplete, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000005, 0x00000043, 0x00000001, mgm_02_UpdateRecords, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080043, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080044, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080042, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_02_GiveCoinReward, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080045, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2518280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mgm_02_CreateMinigame, 0x00000044, 0x00000001, D_80242C60_E189E0, 0x00000043, 0x00000001, mgm_02_CreateSignpost, 0x00000044, 0x00000001, D_80242A20_E187A0, 0x00000044, 0x00000001, D_802441E4_E19F64, 0x00000044, 0x00000001, D_80243E9C_E19C1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024502C_E1ADAC -.word 0x00000043, 0x00000001, func_802422D0_E18050, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, mgm_02_DestroyMinigame, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245048_E1ADC8 -.word 0x0000000A, 0x00000002, 0xF8405CEF, 0x00000000, 0x00000043, 0x00000001, func_802423D0_E18150, 0x00000024, 0x00000002, 0xF8405CEF, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x0008003C, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x0008003D, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000001, func_80242314_E18094, 0x0000000C, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008003E, 0x00000043, 0x00000001, func_802423A4_E18124, 0x00000008, 0x00000001, 0x0000000C, 0x00000044, 0x00000001, D_8024502C_E1ADAC, 0x00000043, 0x00000003, GotoMap, 0x802485F0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E004F, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000004, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000064, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0xFE363C81, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80242340_E180C0, 0x00000057, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008003F, 0x00000043, 0x00000001, func_802423A4_E18124, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_802423A4_E18124, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080040, 0x00000044, 0x00000001, D_8024502C_E1ADAC, 0x00000043, 0x00000003, GotoMap, 0x802485F0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000001, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002108, 0x00000050, 0x00000044, 0x00000001, D_80243888_E19608, 0x00000044, 0x00000001, D_80244A28_E1A7A8, 0x00000008, 0x00000001, 0x00000019, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0x00000166, 0xFFFFFFF6, 0x000000B9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000166, 0x000001F4, 0x000000B9, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_802405A4_E16324, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0x00000163, 0x0000001E, 0xFFFFFF4C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000003, PushSong, 0x00000085, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000044, 0x00000001, D_80244A60_E1A7E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405CEF, 0x00000000, 0x00000043, 0x00000001, mgm_02_SetMsgImgs_Panel, 0x00000024, 0x00000002, 0xF8405CEF, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x0008003C, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x0008003D, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000001, mgm_02_GetCoinCount, 0x0000000C, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008003E, 0x00000043, 0x00000001, mgm_02_HideCoinCounter, 0x00000008, 0x00000001, 0x0000000C, 0x00000044, 0x00000001, D_8024502C_E1ADAC, 0x00000043, 0x00000003, GotoMap, 0x802485F0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E004F, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000004, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000064, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0xFE363C81, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, mgm_02_TakeCoinCost, 0x00000057, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008003F, 0x00000043, 0x00000001, mgm_02_HideCoinCounter, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, mgm_02_HideCoinCounter, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080040, 0x00000044, 0x00000001, D_8024502C_E1ADAC, 0x00000043, 0x00000003, GotoMap, 0x802485F0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000001, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002108, 0x00000050, 0x00000044, 0x00000001, D_80243888_E19608, 0x00000044, 0x00000001, D_80244A28_E1A7A8, 0x00000008, 0x00000001, 0x00000019, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0x00000166, 0xFFFFFFF6, 0x000000B9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000166, 0x000001F4, 0x000000B9, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000001, mgm_02_DestroySignpost, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0x00000163, 0x0000001E, 0xFFFFFF4C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000003, PushSong, 0x00000085, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000044, 0x00000001, D_80244A60_E1A7E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802454E0_E1B260 .word 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000166, 0xFFFFFFEC, 0x000000B9, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80245048_E1ADC8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_02/E1E020.data.s b/ver/us/asm/data/world/area_mgm/mgm_02/E1E020.data.s index a9966bb7de..870867d654 100644 --- a/ver/us/asm/data/world/area_mgm/mgm_02/E1E020.data.s +++ b/ver/us/asm/data/world/area_mgm/mgm_02/E1E020.data.s @@ -2,11 +2,11 @@ .section .data -dlabel D_802482A0_E1E020 +dlabel mgm_02_PeachPanelImg .word 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCC3, 0xC3333333, 0x33333333, 0x33333333, 0x33333C33, 0xC3333333, 0x3333030A, 0xA0303333, 0x33333C33, 0xC3311111, 0x111060AA, 0xAA060111, 0x11111C33, 0xC3311111, 0x11106AA8, 0x4AA60111, 0x11111C33, 0xC3311111, 0x111006A4, 0x4A600111, 0x11111C33, 0xC3311111, 0x100660AA, 0xAA066001, 0x11111C33, 0xC3311111, 0x06699666, 0x66699660, 0x11111C33, 0xC3310010, 0x66999996, 0x69999966, 0x01001C33, 0xC3306606, 0x69999999, 0x99999996, 0x60660C33, 0xC3306666, 0x69666999, 0x99966696, 0x66660C33, 0xC3306699, 0x96666699, 0x99666669, 0x99660C33, 0xC3310669, 0x96606669, 0x96660669, 0x96601C33, 0xC3311066, 0x620B0066, 0x6600B026, 0x66011C33, 0xC3300666, 0x20BEEB06, 0x60BEEB02, 0x66600C33, 0xC3306002, 0x60EEEEB0, 0x0BEEEE06, 0x20060C33, 0xC33100E0, 0x90EE50EE, 0xEE05EE09, 0x0E001C33, 0xC33110E0, 0x90EE5BEE, 0xEE0BEE09, 0x0E011C33, 0xC33110E0, 0x60BE50EE, 0xEE05EB06, 0x0E011C33, 0xC3310600, 0x00B99EEE, 0xEEE99B00, 0x00601C33, 0xC331066F, 0x12077EEE, 0xEEE7702F, 0x16601C33, 0xC3310661, 0x120EEE0E, 0xE0EEE021, 0x16601C33, 0xC3306000, 0x0240BEE0, 0x0EEB0420, 0x00060C33, 0xC3360888, 0x80440BEE, 0xEEB04408, 0x88806C33, 0xC3304888, 0x84844006, 0x60044848, 0x88840C33, 0xC3308888, 0x84888844, 0x44448848, 0x88880C33, 0xC3308888, 0x888888DD, 0xDD888888, 0x88880C33, 0xC3308888, 0x84888DF1, 0x1FD88848, 0x88880C33, 0xC3300444, 0x48888DF1, 0x1FD88884, 0x44400C33, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCC33, 0xC3333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333 -dlabel D_802484A0_E1E220 +dlabel mgm_02_PeachPanelPal .word 0x7A8B63ED, 0x934593C1, 0xB2CB9B93, 0xD509DC93, 0xD419DDD1, 0xD649D615, 0xF691ED61, 0xEF27E731 -dlabel D_802484C0_E1E240 -.word D_802482A0_E1E020, D_802484A0_E1E220, 0x00200020, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +dlabel mgm_02_MsgImg_PeachPanel +.word mgm_02_PeachPanelImg, mgm_02_PeachPanelPal, 0x00200020, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s b/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s index a73d29836a..ecf334a976 100644 --- a/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s +++ b/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s @@ -9,7 +9,7 @@ dlabel D_8024087C_DDFB8C .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 dlabel D_802408A8_DDFBB8 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240184_DDF494, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, omo_12_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802408D4_DDFBE4 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xF70F2E82, 0x00000027, 0x00000002, 0xFE363C83, 0x00000080, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xF70F2E82, 0x00000027, 0x00000002, 0xFE363C83, 0x00000080, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xF70F2E82, 0x00000027, 0x00000002, 0xFE363C83, 0x00000080, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000001, func_802403D8_DDF6E8, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C83, 0xF70F2E82, 0x00000027, 0x00000002, 0xFE363C83, 0x00000080, 0x00000043, 0x00000005, func_80240314_DDF624, 0x00000000, 0xFFFFFC18, 0x00000000, 0xFE363C83, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000016, 0x00000001, 0x00000006, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000005, 0x00000024, 0x00000002, 0xF70F2E82, 0x0000007F, 0x00000044, 0x00000001, D_802408D4_DDFBE4, 0x00000018, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000003, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000066, 0x00000044, 0x00000001, D_802408D4_DDFBE4, 0x0000001B, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802408A8_DDFBB8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000046, 0x00000014, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000F004E, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0x00000020, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000064, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006D0005, 0x006D0001, 0x00000000, 0x000F004F, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E82, 0xFFFFFFE4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006D0006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006D0001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006D0005, 0x006D0001, 0x00000000, 0x000F0050, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006D000F, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000A, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000004, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_14/DE5D00.data.s b/ver/us/asm/data/world/area_omo/omo_14/DE5D00.data.s index c898851491..af45b447fd 100644 --- a/ver/us/asm/data/world/area_omo/omo_14/DE5D00.data.s +++ b/ver/us/asm/data/world/area_omo/omo_14/DE5D00.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240650_DE5D00 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240000_DE56B0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, omo_14_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024067C_DE5D2C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802430B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/1776B0/func_80248DE4.s b/ver/us/asm/nonmatchings/1776B0/func_80248DE4.s index 5f49032edf..9c4379041f 100644 --- a/ver/us/asm/nonmatchings/1776B0/func_80248DE4.s +++ b/ver/us/asm/nonmatchings/1776B0/func_80248DE4.s @@ -15,8 +15,8 @@ glabel func_80248DE4 /* 1776D0 80248DF0 AFB00038 */ sw $s0, 0x38($sp) /* 1776D4 80248DF4 3C10800B */ lui $s0, %hi(gCameras+0x558) /* 1776D8 80248DF8 261022D8 */ addiu $s0, $s0, %lo(gCameras+0x558) -/* 1776DC 80248DFC 3C02802A */ lui $v0, %hi(D_8029F27C) -/* 1776E0 80248E00 9442F27C */ lhu $v0, %lo(D_8029F27C)($v0) +/* 1776DC 80248DFC 3C02802A */ lui $v0, %hi(BattleCam_TargetActor) +/* 1776E0 80248E00 9442F27C */ lhu $v0, %lo(BattleCam_TargetActor)($v0) /* 1776E4 80248E04 3C04800E */ lui $a0, %hi(gBattleStatus) /* 1776E8 80248E08 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) /* 1776EC 80248E0C AFBF0040 */ sw $ra, 0x40($sp) @@ -334,8 +334,8 @@ glabel func_80248DE4 /* 177B9C 802492BC 8042F2A6 */ lb $v0, %lo(D_8029F2A6)($v0) /* 177BA0 802492C0 10400029 */ beqz $v0, .L80249368 /* 177BA4 802492C4 00000000 */ nop -/* 177BA8 802492C8 3C01802A */ lui $at, %hi(D_8029F28C) -/* 177BAC 802492CC C422F28C */ lwc1 $f2, %lo(D_8029F28C)($at) +/* 177BA8 802492C8 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 177BAC 802492CC C422F28C */ lwc1 $f2, %lo(BattleCam_TargetBoomLength)($at) /* 177BB0 802492D0 3C0143FA */ lui $at, 0x43fa /* 177BB4 802492D4 44810000 */ mtc1 $at, $f0 /* 177BB8 802492D8 00000000 */ nop @@ -395,8 +395,8 @@ glabel func_80248DE4 /* 177C84 802493A4 45030001 */ bc1tl .L802493AC /* 177C88 802493A8 46000686 */ mov.s $f26, $f0 .L802493AC: -/* 177C8C 802493AC 3C03802A */ lui $v1, %hi(D_8029F280) -/* 177C90 802493B0 2463F280 */ addiu $v1, $v1, %lo(D_8029F280) +/* 177C8C 802493AC 3C03802A */ lui $v1, %hi(BattleCam_BoomLength) +/* 177C90 802493B0 2463F280 */ addiu $v1, $v1, %lo(BattleCam_BoomLength) /* 177C94 802493B4 84620000 */ lh $v0, ($v1) /* 177C98 802493B8 461AB080 */ add.s $f2, $f22, $f26 /* 177C9C 802493BC 44820000 */ mtc1 $v0, $f0 @@ -412,13 +412,13 @@ glabel func_80248DE4 /* 177CC4 802493E4 E61E0054 */ swc1 $f30, 0x54($s0) /* 177CC8 802493E8 E61C0058 */ swc1 $f28, 0x58($s0) /* 177CCC 802493EC C7B0001C */ lwc1 $f16, 0x1c($sp) -/* 177CD0 802493F0 3C02802A */ lui $v0, %hi(D_8029F286) -/* 177CD4 802493F4 8442F286 */ lh $v0, %lo(D_8029F286)($v0) -/* 177CD8 802493F8 3C03802A */ lui $v1, %hi(D_8029F282) -/* 177CDC 802493FC 9463F282 */ lhu $v1, %lo(D_8029F282)($v1) +/* 177CD0 802493F0 3C02802A */ lui $v0, %hi(BattleCam_BoomZOffset) +/* 177CD4 802493F4 8442F286 */ lh $v0, %lo(BattleCam_BoomZOffset)($v0) +/* 177CD8 802493F8 3C03802A */ lui $v1, %hi(BattleCam_BoomYaw) +/* 177CDC 802493FC 9463F282 */ lhu $v1, %lo(BattleCam_BoomYaw)($v1) /* 177CE0 80249400 A604001E */ sh $a0, 0x1e($s0) -/* 177CE4 80249404 3C04802A */ lui $a0, %hi(D_8029F284) -/* 177CE8 80249408 9484F284 */ lhu $a0, %lo(D_8029F284)($a0) +/* 177CE4 80249404 3C04802A */ lui $a0, %hi(BattleCam_BoomPitch) +/* 177CE8 80249408 9484F284 */ lhu $a0, %lo(BattleCam_BoomPitch)($a0) /* 177CEC 8024940C 00021200 */ sll $v0, $v0, 8 /* 177CF0 80249410 E610005C */ swc1 $f16, 0x5c($s0) /* 177CF4 80249414 A6020026 */ sh $v0, 0x26($s0) @@ -432,18 +432,18 @@ glabel func_80248DE4 /* 177D10 80249430 00000000 */ nop /* 177D14 80249434 46800020 */ cvt.s.w $f0, $f0 /* 177D18 80249438 86020022 */ lh $v0, 0x22($s0) -/* 177D1C 8024943C 3C01802A */ lui $at, %hi(D_8029F28C) -/* 177D20 80249440 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) +/* 177D1C 8024943C 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 177D20 80249440 E420F28C */ swc1 $f0, %lo(BattleCam_TargetBoomLength)($at) /* 177D24 80249444 44820000 */ mtc1 $v0, $f0 /* 177D28 80249448 00000000 */ nop /* 177D2C 8024944C 46800020 */ cvt.s.w $f0, $f0 -/* 177D30 80249450 3C01802A */ lui $at, %hi(D_8029F294) -/* 177D34 80249454 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) +/* 177D30 80249450 3C01802A */ lui $at, %hi(BattleCam_TargetBoomPitch) +/* 177D34 80249454 E420F294 */ swc1 $f0, %lo(BattleCam_TargetBoomPitch)($at) /* 177D38 80249458 44830000 */ mtc1 $v1, $f0 /* 177D3C 8024945C 00000000 */ nop /* 177D40 80249460 46800020 */ cvt.s.w $f0, $f0 -/* 177D44 80249464 3C01802A */ lui $at, %hi(D_8029F290) -/* 177D48 80249468 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) +/* 177D44 80249464 3C01802A */ lui $at, %hi(BattleCam_TargetBoomYaw) +/* 177D48 80249468 E420F290 */ swc1 $f0, %lo(BattleCam_TargetBoomYaw)($at) /* 177D4C 8024946C 04820001 */ bltzl $a0, .L80249474 /* 177D50 80249470 248400FF */ addiu $a0, $a0, 0xff .L80249474: @@ -451,30 +451,30 @@ glabel func_80248DE4 /* 177D58 80249478 C6020054 */ lwc1 $f2, 0x54($s0) /* 177D5C 8024947C C6040058 */ lwc1 $f4, 0x58($s0) /* 177D60 80249480 C606005C */ lwc1 $f6, 0x5c($s0) -/* 177D64 80249484 3C03802A */ lui $v1, %hi(D_8029F29E) -/* 177D68 80249488 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) +/* 177D64 80249484 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeLeft) +/* 177D68 80249488 9463F29E */ lhu $v1, %lo(BattleCam_MoveTimeLeft)($v1) /* 177D6C 8024948C 44820000 */ mtc1 $v0, $f0 /* 177D70 80249490 00000000 */ nop /* 177D74 80249494 46800020 */ cvt.s.w $f0, $f0 -/* 177D78 80249498 3C01802A */ lui $at, %hi(D_8029F298) -/* 177D7C 8024949C E420F298 */ swc1 $f0, %lo(D_8029F298)($at) -/* 177D80 802494A0 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 177D84 802494A4 E422F2A8 */ swc1 $f2, %lo(D_8029F2A8)($at) -/* 177D88 802494A8 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 177D8C 802494AC E424F2AC */ swc1 $f4, %lo(D_8029F2AC)($at) -/* 177D90 802494B0 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 177D94 802494B4 E426F2B0 */ swc1 $f6, %lo(D_8029F2B0)($at) -/* 177D98 802494B8 3C01802A */ lui $at, %hi(D_8029F2A0) -/* 177D9C 802494BC A423F2A0 */ sh $v1, %lo(D_8029F2A0)($at) +/* 177D78 80249498 3C01802A */ lui $at, %hi(BattleCam_TargetBoomZOffset) +/* 177D7C 8024949C E420F298 */ swc1 $f0, %lo(BattleCam_TargetBoomZOffset)($at) +/* 177D80 802494A0 3C01802A */ lui $at, %hi(BattleCam_TargetPosX) +/* 177D84 802494A4 E422F2A8 */ swc1 $f2, %lo(BattleCam_TargetPosX)($at) +/* 177D88 802494A8 3C01802A */ lui $at, %hi(BattleCam_TargetPosY) +/* 177D8C 802494AC E424F2AC */ swc1 $f4, %lo(BattleCam_TargetPosY)($at) +/* 177D90 802494B0 3C01802A */ lui $at, %hi(BattleCam_TargetPosZ) +/* 177D94 802494B4 E426F2B0 */ swc1 $f6, %lo(BattleCam_TargetPosZ)($at) +/* 177D98 802494B8 3C01802A */ lui $at, %hi(BattleCam_MoveTimeTotal) +/* 177D9C 802494BC A423F2A0 */ sh $v1, %lo(BattleCam_MoveTimeTotal)($at) .L802494C0: -/* 177DA0 802494C0 3C02802A */ lui $v0, %hi(D_8029F2A5) -/* 177DA4 802494C4 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) +/* 177DA0 802494C0 3C02802A */ lui $v0, %hi(BattleCam_UseLinearInterp) +/* 177DA4 802494C4 8042F2A5 */ lb $v0, %lo(BattleCam_UseLinearInterp)($v0) /* 177DA8 802494C8 14400027 */ bnez $v0, .L80249568 /* 177DAC 802494CC 00000000 */ nop -/* 177DB0 802494D0 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 177DB4 802494D4 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 177DB8 802494D8 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 177DBC 802494DC 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) +/* 177DB0 802494D0 3C02802A */ lui $v0, %hi(BattleCam_MoveTimeLeft) +/* 177DB4 802494D4 8442F29E */ lh $v0, %lo(BattleCam_MoveTimeLeft)($v0) +/* 177DB8 802494D8 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeTotal) +/* 177DBC 802494DC 8463F2A0 */ lh $v1, %lo(BattleCam_MoveTimeTotal)($v1) /* 177DC0 802494E0 3C013F80 */ lui $at, 0x3f80 /* 177DC4 802494E4 4481C000 */ mtc1 $at, $f24 /* 177DC8 802494E8 4482D000 */ mtc1 $v0, $f26 @@ -510,10 +510,10 @@ glabel func_80248DE4 /* 177E40 80249560 08092565 */ j .L80249594 /* 177E44 80249564 4600C681 */ sub.s $f26, $f24, $f0 .L80249568: -/* 177E48 80249568 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 177E4C 8024956C 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 177E50 80249570 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 177E54 80249574 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) +/* 177E48 80249568 3C02802A */ lui $v0, %hi(BattleCam_MoveTimeLeft) +/* 177E4C 8024956C 8442F29E */ lh $v0, %lo(BattleCam_MoveTimeLeft)($v0) +/* 177E50 80249570 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeTotal) +/* 177E54 80249574 8463F2A0 */ lh $v1, %lo(BattleCam_MoveTimeTotal)($v1) /* 177E58 80249578 4482D000 */ mtc1 $v0, $f26 /* 177E5C 8024957C 00000000 */ nop /* 177E60 80249580 4680D6A0 */ cvt.s.w $f26, $f26 @@ -522,20 +522,20 @@ glabel func_80248DE4 /* 177E6C 8024958C 46800020 */ cvt.s.w $f0, $f0 /* 177E70 80249590 4600D683 */ div.s $f26, $f26, $f0 .L80249594: -/* 177E74 80249594 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 177E78 80249598 C426F2A8 */ lwc1 $f6, %lo(D_8029F2A8)($at) +/* 177E74 80249594 3C01802A */ lui $at, %hi(BattleCam_TargetPosX) +/* 177E78 80249598 C426F2A8 */ lwc1 $f6, %lo(BattleCam_TargetPosX)($at) /* 177E7C 8024959C 461A3182 */ mul.s $f6, $f6, $f26 /* 177E80 802495A0 00000000 */ nop -/* 177E84 802495A4 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 177E88 802495A8 C428F2AC */ lwc1 $f8, %lo(D_8029F2AC)($at) +/* 177E84 802495A4 3C01802A */ lui $at, %hi(BattleCam_TargetPosY) +/* 177E88 802495A8 C428F2AC */ lwc1 $f8, %lo(BattleCam_TargetPosY)($at) /* 177E8C 802495AC 461A4202 */ mul.s $f8, $f8, $f26 /* 177E90 802495B0 00000000 */ nop -/* 177E94 802495B4 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 177E98 802495B8 C424F2B0 */ lwc1 $f4, %lo(D_8029F2B0)($at) +/* 177E94 802495B4 3C01802A */ lui $at, %hi(BattleCam_TargetPosZ) +/* 177E98 802495B8 C424F2B0 */ lwc1 $f4, %lo(BattleCam_TargetPosZ)($at) /* 177E9C 802495BC 461A2102 */ mul.s $f4, $f4, $f26 /* 177EA0 802495C0 00000000 */ nop -/* 177EA4 802495C4 3C01802A */ lui $at, %hi(D_8029F298) -/* 177EA8 802495C8 C422F298 */ lwc1 $f2, %lo(D_8029F298)($at) +/* 177EA4 802495C4 3C01802A */ lui $at, %hi(BattleCam_TargetBoomZOffset) +/* 177EA8 802495C8 C422F298 */ lwc1 $f2, %lo(BattleCam_TargetBoomZOffset)($at) /* 177EAC 802495CC 461A1082 */ mul.s $f2, $f2, $f26 /* 177EB0 802495D0 00000000 */ nop /* 177EB4 802495D4 3C013F80 */ lui $at, 0x3f80 @@ -546,8 +546,8 @@ glabel func_80248DE4 /* 177EC8 802495E8 00000000 */ nop /* 177ECC 802495EC 4616E382 */ mul.s $f14, $f28, $f22 /* 177ED0 802495F0 00000000 */ nop -/* 177ED4 802495F4 3C02802A */ lui $v0, %hi(D_8029F286) -/* 177ED8 802495F8 8442F286 */ lh $v0, %lo(D_8029F286)($v0) +/* 177ED4 802495F4 3C02802A */ lui $v0, %hi(BattleCam_BoomZOffset) +/* 177ED8 802495F8 8442F286 */ lh $v0, %lo(BattleCam_BoomZOffset)($v0) /* 177EDC 802495FC 44820000 */ mtc1 $v0, $f0 /* 177EE0 80249600 00000000 */ nop /* 177EE4 80249604 46800020 */ cvt.s.w $f0, $f0 @@ -604,33 +604,33 @@ glabel func_80248DE4 /* 177FB0 802496D0 00000000 */ nop /* 177FB4 802496D4 46020002 */ mul.s $f0, $f0, $f2 /* 177FB8 802496D8 00000000 */ nop -/* 177FBC 802496DC 3C01802A */ lui $at, %hi(D_8029F28C) -/* 177FC0 802496E0 C42AF28C */ lwc1 $f10, %lo(D_8029F28C)($at) +/* 177FBC 802496DC 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 177FC0 802496E0 C42AF28C */ lwc1 $f10, %lo(BattleCam_TargetBoomLength)($at) /* 177FC4 802496E4 461A5282 */ mul.s $f10, $f10, $f26 /* 177FC8 802496E8 00000000 */ nop -/* 177FCC 802496EC 3C01802A */ lui $at, %hi(D_8029F290) -/* 177FD0 802496F0 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) +/* 177FCC 802496EC 3C01802A */ lui $at, %hi(BattleCam_TargetBoomYaw) +/* 177FD0 802496F0 C428F290 */ lwc1 $f8, %lo(BattleCam_TargetBoomYaw)($at) /* 177FD4 802496F4 461A4202 */ mul.s $f8, $f8, $f26 /* 177FD8 802496F8 00000000 */ nop -/* 177FDC 802496FC 3C01802A */ lui $at, %hi(D_8029F294) -/* 177FE0 80249700 C424F294 */ lwc1 $f4, %lo(D_8029F294)($at) -/* 177FE4 80249704 3C02802A */ lui $v0, %hi(D_8029F280) -/* 177FE8 80249708 8442F280 */ lh $v0, %lo(D_8029F280)($v0) +/* 177FDC 802496FC 3C01802A */ lui $at, %hi(BattleCam_TargetBoomPitch) +/* 177FE0 80249700 C424F294 */ lwc1 $f4, %lo(BattleCam_TargetBoomPitch)($at) +/* 177FE4 80249704 3C02802A */ lui $v0, %hi(BattleCam_BoomLength) +/* 177FE8 80249708 8442F280 */ lh $v0, %lo(BattleCam_BoomLength)($v0) /* 177FEC 8024970C 461A2102 */ mul.s $f4, $f4, $f26 /* 177FF0 80249710 00000000 */ nop /* 177FF4 80249714 44821000 */ mtc1 $v0, $f2 /* 177FF8 80249718 00000000 */ nop /* 177FFC 8024971C 468010A0 */ cvt.s.w $f2, $f2 -/* 178000 80249720 3C02802A */ lui $v0, %hi(D_8029F282) -/* 178004 80249724 8442F282 */ lh $v0, %lo(D_8029F282)($v0) +/* 178000 80249720 3C02802A */ lui $v0, %hi(BattleCam_BoomYaw) +/* 178004 80249724 8442F282 */ lh $v0, %lo(BattleCam_BoomYaw)($v0) /* 178008 80249728 44823000 */ mtc1 $v0, $f6 /* 17800C 8024972C 00000000 */ nop /* 178010 80249730 468031A0 */ cvt.s.w $f6, $f6 /* 178014 80249734 46163182 */ mul.s $f6, $f6, $f22 /* 178018 80249738 00000000 */ nop /* 17801C 8024973C 46141080 */ add.s $f2, $f2, $f20 -/* 178020 80249740 3C02802A */ lui $v0, %hi(D_8029F284) -/* 178024 80249744 8442F284 */ lh $v0, %lo(D_8029F284)($v0) +/* 178020 80249740 3C02802A */ lui $v0, %hi(BattleCam_BoomPitch) +/* 178024 80249744 8442F284 */ lh $v0, %lo(BattleCam_BoomPitch)($v0) /* 178028 80249748 46001080 */ add.s $f2, $f2, $f0 /* 17802C 8024974C 44820000 */ mtc1 $v0, $f0 /* 178030 80249750 00000000 */ nop @@ -640,8 +640,8 @@ glabel func_80248DE4 /* 178040 80249760 46161082 */ mul.s $f2, $f2, $f22 /* 178044 80249764 00000000 */ nop /* 178048 80249768 46064200 */ add.s $f8, $f8, $f6 -/* 17804C 8024976C 3C04802A */ lui $a0, %hi(D_8029F29E) -/* 178050 80249770 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) +/* 17804C 8024976C 3C04802A */ lui $a0, %hi(BattleCam_MoveTimeLeft) +/* 178050 80249770 2484F29E */ addiu $a0, $a0, %lo(BattleCam_MoveTimeLeft) /* 178054 80249774 46002100 */ add.s $f4, $f4, $f0 /* 178058 80249778 4600440D */ trunc.w.s $f16, $f8 /* 17805C 8024977C 44028000 */ mfc1 $v0, $f16 @@ -661,8 +661,8 @@ glabel func_80248DE4 /* 178094 802497B4 14400006 */ bnez $v0, .L802497D0 /* 178098 802497B8 2462FFFF */ addiu $v0, $v1, -1 /* 17809C 802497BC 24020001 */ addiu $v0, $zero, 1 -/* 1780A0 802497C0 3C01802A */ lui $at, %hi(D_8029F29C) -/* 1780A4 802497C4 A022F29C */ sb $v0, %lo(D_8029F29C)($at) +/* 1780A0 802497C0 3C01802A */ lui $at, %hi(BattleCam_DoneMoving) +/* 1780A4 802497C4 A022F29C */ sb $v0, %lo(BattleCam_DoneMoving)($at) /* 1780A8 802497C8 080925F6 */ j .L802497D8 /* 1780AC 802497CC 0000102D */ daddu $v0, $zero, $zero .L802497D0: diff --git a/ver/us/asm/nonmatchings/1776B0/func_80249804.s b/ver/us/asm/nonmatchings/1776B0/func_80249804.s index d0be2aedec..860a249b9e 100644 --- a/ver/us/asm/nonmatchings/1776B0/func_80249804.s +++ b/ver/us/asm/nonmatchings/1776B0/func_80249804.s @@ -15,8 +15,8 @@ glabel func_80249804 /* 1780F0 80249810 AFB00038 */ sw $s0, 0x38($sp) /* 1780F4 80249814 3C10800B */ lui $s0, %hi(gCameras+0x558) /* 1780F8 80249818 261022D8 */ addiu $s0, $s0, %lo(gCameras+0x558) -/* 1780FC 8024981C 3C02802A */ lui $v0, %hi(D_8029F27C) -/* 178100 80249820 9442F27C */ lhu $v0, %lo(D_8029F27C)($v0) +/* 1780FC 8024981C 3C02802A */ lui $v0, %hi(BattleCam_TargetActor) +/* 178100 80249820 9442F27C */ lhu $v0, %lo(BattleCam_TargetActor)($v0) /* 178104 80249824 3C04800E */ lui $a0, %hi(gBattleStatus) /* 178108 80249828 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) /* 17810C 8024982C AFBF0040 */ sw $ra, 0x40($sp) @@ -334,8 +334,8 @@ glabel func_80249804 /* 1785BC 80249CDC 8042F2A6 */ lb $v0, %lo(D_8029F2A6)($v0) /* 1785C0 80249CE0 10400029 */ beqz $v0, .L80249D88 /* 1785C4 80249CE4 00000000 */ nop -/* 1785C8 80249CE8 3C01802A */ lui $at, %hi(D_8029F28C) -/* 1785CC 80249CEC C422F28C */ lwc1 $f2, %lo(D_8029F28C)($at) +/* 1785C8 80249CE8 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 1785CC 80249CEC C422F28C */ lwc1 $f2, %lo(BattleCam_TargetBoomLength)($at) /* 1785D0 80249CF0 3C0143FA */ lui $at, 0x43fa /* 1785D4 80249CF4 44810000 */ mtc1 $at, $f0 /* 1785D8 80249CF8 00000000 */ nop @@ -395,8 +395,8 @@ glabel func_80249804 /* 1786A4 80249DC4 45030001 */ bc1tl .L80249DCC /* 1786A8 80249DC8 46000686 */ mov.s $f26, $f0 .L80249DCC: -/* 1786AC 80249DCC 3C03802A */ lui $v1, %hi(D_8029F280) -/* 1786B0 80249DD0 2463F280 */ addiu $v1, $v1, %lo(D_8029F280) +/* 1786AC 80249DCC 3C03802A */ lui $v1, %hi(BattleCam_BoomLength) +/* 1786B0 80249DD0 2463F280 */ addiu $v1, $v1, %lo(BattleCam_BoomLength) /* 1786B4 80249DD4 84620000 */ lh $v0, ($v1) /* 1786B8 80249DD8 461AB080 */ add.s $f2, $f22, $f26 /* 1786BC 80249DDC 44820000 */ mtc1 $v0, $f0 @@ -412,13 +412,13 @@ glabel func_80249804 /* 1786E4 80249E04 E61E0054 */ swc1 $f30, 0x54($s0) /* 1786E8 80249E08 E61C0058 */ swc1 $f28, 0x58($s0) /* 1786EC 80249E0C C7B0001C */ lwc1 $f16, 0x1c($sp) -/* 1786F0 80249E10 3C02802A */ lui $v0, %hi(D_8029F286) -/* 1786F4 80249E14 8442F286 */ lh $v0, %lo(D_8029F286)($v0) -/* 1786F8 80249E18 3C03802A */ lui $v1, %hi(D_8029F282) -/* 1786FC 80249E1C 9463F282 */ lhu $v1, %lo(D_8029F282)($v1) +/* 1786F0 80249E10 3C02802A */ lui $v0, %hi(BattleCam_BoomZOffset) +/* 1786F4 80249E14 8442F286 */ lh $v0, %lo(BattleCam_BoomZOffset)($v0) +/* 1786F8 80249E18 3C03802A */ lui $v1, %hi(BattleCam_BoomYaw) +/* 1786FC 80249E1C 9463F282 */ lhu $v1, %lo(BattleCam_BoomYaw)($v1) /* 178700 80249E20 A604001E */ sh $a0, 0x1e($s0) -/* 178704 80249E24 3C04802A */ lui $a0, %hi(D_8029F284) -/* 178708 80249E28 9484F284 */ lhu $a0, %lo(D_8029F284)($a0) +/* 178704 80249E24 3C04802A */ lui $a0, %hi(BattleCam_BoomPitch) +/* 178708 80249E28 9484F284 */ lhu $a0, %lo(BattleCam_BoomPitch)($a0) /* 17870C 80249E2C 00021200 */ sll $v0, $v0, 8 /* 178710 80249E30 E610005C */ swc1 $f16, 0x5c($s0) /* 178714 80249E34 A6020026 */ sh $v0, 0x26($s0) @@ -432,18 +432,18 @@ glabel func_80249804 /* 178730 80249E50 00000000 */ nop /* 178734 80249E54 46800020 */ cvt.s.w $f0, $f0 /* 178738 80249E58 86020022 */ lh $v0, 0x22($s0) -/* 17873C 80249E5C 3C01802A */ lui $at, %hi(D_8029F28C) -/* 178740 80249E60 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) +/* 17873C 80249E5C 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 178740 80249E60 E420F28C */ swc1 $f0, %lo(BattleCam_TargetBoomLength)($at) /* 178744 80249E64 44820000 */ mtc1 $v0, $f0 /* 178748 80249E68 00000000 */ nop /* 17874C 80249E6C 46800020 */ cvt.s.w $f0, $f0 -/* 178750 80249E70 3C01802A */ lui $at, %hi(D_8029F294) -/* 178754 80249E74 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) +/* 178750 80249E70 3C01802A */ lui $at, %hi(BattleCam_TargetBoomPitch) +/* 178754 80249E74 E420F294 */ swc1 $f0, %lo(BattleCam_TargetBoomPitch)($at) /* 178758 80249E78 44830000 */ mtc1 $v1, $f0 /* 17875C 80249E7C 00000000 */ nop /* 178760 80249E80 46800020 */ cvt.s.w $f0, $f0 -/* 178764 80249E84 3C01802A */ lui $at, %hi(D_8029F290) -/* 178768 80249E88 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) +/* 178764 80249E84 3C01802A */ lui $at, %hi(BattleCam_TargetBoomYaw) +/* 178768 80249E88 E420F290 */ swc1 $f0, %lo(BattleCam_TargetBoomYaw)($at) /* 17876C 80249E8C 04820001 */ bltzl $a0, .L80249E94 /* 178770 80249E90 248400FF */ addiu $a0, $a0, 0xff .L80249E94: @@ -451,30 +451,30 @@ glabel func_80249804 /* 178778 80249E98 C6020054 */ lwc1 $f2, 0x54($s0) /* 17877C 80249E9C C6040058 */ lwc1 $f4, 0x58($s0) /* 178780 80249EA0 C606005C */ lwc1 $f6, 0x5c($s0) -/* 178784 80249EA4 3C03802A */ lui $v1, %hi(D_8029F29E) -/* 178788 80249EA8 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) +/* 178784 80249EA4 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeLeft) +/* 178788 80249EA8 9463F29E */ lhu $v1, %lo(BattleCam_MoveTimeLeft)($v1) /* 17878C 80249EAC 44820000 */ mtc1 $v0, $f0 /* 178790 80249EB0 00000000 */ nop /* 178794 80249EB4 46800020 */ cvt.s.w $f0, $f0 -/* 178798 80249EB8 3C01802A */ lui $at, %hi(D_8029F298) -/* 17879C 80249EBC E420F298 */ swc1 $f0, %lo(D_8029F298)($at) -/* 1787A0 80249EC0 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 1787A4 80249EC4 E422F2A8 */ swc1 $f2, %lo(D_8029F2A8)($at) -/* 1787A8 80249EC8 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 1787AC 80249ECC E424F2AC */ swc1 $f4, %lo(D_8029F2AC)($at) -/* 1787B0 80249ED0 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 1787B4 80249ED4 E426F2B0 */ swc1 $f6, %lo(D_8029F2B0)($at) -/* 1787B8 80249ED8 3C01802A */ lui $at, %hi(D_8029F2A0) -/* 1787BC 80249EDC A423F2A0 */ sh $v1, %lo(D_8029F2A0)($at) +/* 178798 80249EB8 3C01802A */ lui $at, %hi(BattleCam_TargetBoomZOffset) +/* 17879C 80249EBC E420F298 */ swc1 $f0, %lo(BattleCam_TargetBoomZOffset)($at) +/* 1787A0 80249EC0 3C01802A */ lui $at, %hi(BattleCam_TargetPosX) +/* 1787A4 80249EC4 E422F2A8 */ swc1 $f2, %lo(BattleCam_TargetPosX)($at) +/* 1787A8 80249EC8 3C01802A */ lui $at, %hi(BattleCam_TargetPosY) +/* 1787AC 80249ECC E424F2AC */ swc1 $f4, %lo(BattleCam_TargetPosY)($at) +/* 1787B0 80249ED0 3C01802A */ lui $at, %hi(BattleCam_TargetPosZ) +/* 1787B4 80249ED4 E426F2B0 */ swc1 $f6, %lo(BattleCam_TargetPosZ)($at) +/* 1787B8 80249ED8 3C01802A */ lui $at, %hi(BattleCam_MoveTimeTotal) +/* 1787BC 80249EDC A423F2A0 */ sh $v1, %lo(BattleCam_MoveTimeTotal)($at) .L80249EE0: -/* 1787C0 80249EE0 3C02802A */ lui $v0, %hi(D_8029F2A5) -/* 1787C4 80249EE4 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) +/* 1787C0 80249EE0 3C02802A */ lui $v0, %hi(BattleCam_UseLinearInterp) +/* 1787C4 80249EE4 8042F2A5 */ lb $v0, %lo(BattleCam_UseLinearInterp)($v0) /* 1787C8 80249EE8 14400027 */ bnez $v0, .L80249F88 /* 1787CC 80249EEC 00000000 */ nop -/* 1787D0 80249EF0 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 1787D4 80249EF4 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 1787D8 80249EF8 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 1787DC 80249EFC 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) +/* 1787D0 80249EF0 3C02802A */ lui $v0, %hi(BattleCam_MoveTimeLeft) +/* 1787D4 80249EF4 8442F29E */ lh $v0, %lo(BattleCam_MoveTimeLeft)($v0) +/* 1787D8 80249EF8 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeTotal) +/* 1787DC 80249EFC 8463F2A0 */ lh $v1, %lo(BattleCam_MoveTimeTotal)($v1) /* 1787E0 80249F00 3C013F80 */ lui $at, 0x3f80 /* 1787E4 80249F04 4481C000 */ mtc1 $at, $f24 /* 1787E8 80249F08 4482D000 */ mtc1 $v0, $f26 @@ -510,10 +510,10 @@ glabel func_80249804 /* 178860 80249F80 080927ED */ j .L80249FB4 /* 178864 80249F84 4600C681 */ sub.s $f26, $f24, $f0 .L80249F88: -/* 178868 80249F88 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 17886C 80249F8C 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 178870 80249F90 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 178874 80249F94 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) +/* 178868 80249F88 3C02802A */ lui $v0, %hi(BattleCam_MoveTimeLeft) +/* 17886C 80249F8C 8442F29E */ lh $v0, %lo(BattleCam_MoveTimeLeft)($v0) +/* 178870 80249F90 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeTotal) +/* 178874 80249F94 8463F2A0 */ lh $v1, %lo(BattleCam_MoveTimeTotal)($v1) /* 178878 80249F98 4482D000 */ mtc1 $v0, $f26 /* 17887C 80249F9C 00000000 */ nop /* 178880 80249FA0 4680D6A0 */ cvt.s.w $f26, $f26 @@ -522,20 +522,20 @@ glabel func_80249804 /* 17888C 80249FAC 46800020 */ cvt.s.w $f0, $f0 /* 178890 80249FB0 4600D683 */ div.s $f26, $f26, $f0 .L80249FB4: -/* 178894 80249FB4 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 178898 80249FB8 C426F2A8 */ lwc1 $f6, %lo(D_8029F2A8)($at) +/* 178894 80249FB4 3C01802A */ lui $at, %hi(BattleCam_TargetPosX) +/* 178898 80249FB8 C426F2A8 */ lwc1 $f6, %lo(BattleCam_TargetPosX)($at) /* 17889C 80249FBC 461A3182 */ mul.s $f6, $f6, $f26 /* 1788A0 80249FC0 00000000 */ nop -/* 1788A4 80249FC4 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 1788A8 80249FC8 C428F2AC */ lwc1 $f8, %lo(D_8029F2AC)($at) +/* 1788A4 80249FC4 3C01802A */ lui $at, %hi(BattleCam_TargetPosY) +/* 1788A8 80249FC8 C428F2AC */ lwc1 $f8, %lo(BattleCam_TargetPosY)($at) /* 1788AC 80249FCC 461A4202 */ mul.s $f8, $f8, $f26 /* 1788B0 80249FD0 00000000 */ nop -/* 1788B4 80249FD4 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 1788B8 80249FD8 C424F2B0 */ lwc1 $f4, %lo(D_8029F2B0)($at) +/* 1788B4 80249FD4 3C01802A */ lui $at, %hi(BattleCam_TargetPosZ) +/* 1788B8 80249FD8 C424F2B0 */ lwc1 $f4, %lo(BattleCam_TargetPosZ)($at) /* 1788BC 80249FDC 461A2102 */ mul.s $f4, $f4, $f26 /* 1788C0 80249FE0 00000000 */ nop -/* 1788C4 80249FE4 3C01802A */ lui $at, %hi(D_8029F298) -/* 1788C8 80249FE8 C422F298 */ lwc1 $f2, %lo(D_8029F298)($at) +/* 1788C4 80249FE4 3C01802A */ lui $at, %hi(BattleCam_TargetBoomZOffset) +/* 1788C8 80249FE8 C422F298 */ lwc1 $f2, %lo(BattleCam_TargetBoomZOffset)($at) /* 1788CC 80249FEC 461A1082 */ mul.s $f2, $f2, $f26 /* 1788D0 80249FF0 00000000 */ nop /* 1788D4 80249FF4 3C013F80 */ lui $at, 0x3f80 @@ -546,8 +546,8 @@ glabel func_80249804 /* 1788E8 8024A008 00000000 */ nop /* 1788EC 8024A00C 4616E382 */ mul.s $f14, $f28, $f22 /* 1788F0 8024A010 00000000 */ nop -/* 1788F4 8024A014 3C02802A */ lui $v0, %hi(D_8029F286) -/* 1788F8 8024A018 8442F286 */ lh $v0, %lo(D_8029F286)($v0) +/* 1788F4 8024A014 3C02802A */ lui $v0, %hi(BattleCam_BoomZOffset) +/* 1788F8 8024A018 8442F286 */ lh $v0, %lo(BattleCam_BoomZOffset)($v0) /* 1788FC 8024A01C 44820000 */ mtc1 $v0, $f0 /* 178900 8024A020 00000000 */ nop /* 178904 8024A024 46800020 */ cvt.s.w $f0, $f0 @@ -600,33 +600,33 @@ glabel func_80249804 /* 1789C0 8024A0E0 00000000 */ nop /* 1789C4 8024A0E4 46020002 */ mul.s $f0, $f0, $f2 /* 1789C8 8024A0E8 00000000 */ nop -/* 1789CC 8024A0EC 3C01802A */ lui $at, %hi(D_8029F28C) -/* 1789D0 8024A0F0 C42AF28C */ lwc1 $f10, %lo(D_8029F28C)($at) +/* 1789CC 8024A0EC 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 1789D0 8024A0F0 C42AF28C */ lwc1 $f10, %lo(BattleCam_TargetBoomLength)($at) /* 1789D4 8024A0F4 461A5282 */ mul.s $f10, $f10, $f26 /* 1789D8 8024A0F8 00000000 */ nop -/* 1789DC 8024A0FC 3C01802A */ lui $at, %hi(D_8029F290) -/* 1789E0 8024A100 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) +/* 1789DC 8024A0FC 3C01802A */ lui $at, %hi(BattleCam_TargetBoomYaw) +/* 1789E0 8024A100 C428F290 */ lwc1 $f8, %lo(BattleCam_TargetBoomYaw)($at) /* 1789E4 8024A104 461A4202 */ mul.s $f8, $f8, $f26 /* 1789E8 8024A108 00000000 */ nop -/* 1789EC 8024A10C 3C01802A */ lui $at, %hi(D_8029F294) -/* 1789F0 8024A110 C424F294 */ lwc1 $f4, %lo(D_8029F294)($at) -/* 1789F4 8024A114 3C02802A */ lui $v0, %hi(D_8029F280) -/* 1789F8 8024A118 8442F280 */ lh $v0, %lo(D_8029F280)($v0) +/* 1789EC 8024A10C 3C01802A */ lui $at, %hi(BattleCam_TargetBoomPitch) +/* 1789F0 8024A110 C424F294 */ lwc1 $f4, %lo(BattleCam_TargetBoomPitch)($at) +/* 1789F4 8024A114 3C02802A */ lui $v0, %hi(BattleCam_BoomLength) +/* 1789F8 8024A118 8442F280 */ lh $v0, %lo(BattleCam_BoomLength)($v0) /* 1789FC 8024A11C 461A2102 */ mul.s $f4, $f4, $f26 /* 178A00 8024A120 00000000 */ nop /* 178A04 8024A124 44821000 */ mtc1 $v0, $f2 /* 178A08 8024A128 00000000 */ nop /* 178A0C 8024A12C 468010A0 */ cvt.s.w $f2, $f2 -/* 178A10 8024A130 3C02802A */ lui $v0, %hi(D_8029F282) -/* 178A14 8024A134 8442F282 */ lh $v0, %lo(D_8029F282)($v0) +/* 178A10 8024A130 3C02802A */ lui $v0, %hi(BattleCam_BoomYaw) +/* 178A14 8024A134 8442F282 */ lh $v0, %lo(BattleCam_BoomYaw)($v0) /* 178A18 8024A138 44823000 */ mtc1 $v0, $f6 /* 178A1C 8024A13C 00000000 */ nop /* 178A20 8024A140 468031A0 */ cvt.s.w $f6, $f6 /* 178A24 8024A144 46163182 */ mul.s $f6, $f6, $f22 /* 178A28 8024A148 00000000 */ nop /* 178A2C 8024A14C 46141080 */ add.s $f2, $f2, $f20 -/* 178A30 8024A150 3C02802A */ lui $v0, %hi(D_8029F284) -/* 178A34 8024A154 8442F284 */ lh $v0, %lo(D_8029F284)($v0) +/* 178A30 8024A150 3C02802A */ lui $v0, %hi(BattleCam_BoomPitch) +/* 178A34 8024A154 8442F284 */ lh $v0, %lo(BattleCam_BoomPitch)($v0) /* 178A38 8024A158 46001080 */ add.s $f2, $f2, $f0 /* 178A3C 8024A15C 44820000 */ mtc1 $v0, $f0 /* 178A40 8024A160 00000000 */ nop @@ -636,8 +636,8 @@ glabel func_80249804 /* 178A50 8024A170 46161082 */ mul.s $f2, $f2, $f22 /* 178A54 8024A174 00000000 */ nop /* 178A58 8024A178 46064200 */ add.s $f8, $f8, $f6 -/* 178A5C 8024A17C 3C04802A */ lui $a0, %hi(D_8029F29E) -/* 178A60 8024A180 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) +/* 178A5C 8024A17C 3C04802A */ lui $a0, %hi(BattleCam_MoveTimeLeft) +/* 178A60 8024A180 2484F29E */ addiu $a0, $a0, %lo(BattleCam_MoveTimeLeft) /* 178A64 8024A184 46002100 */ add.s $f4, $f4, $f0 /* 178A68 8024A188 4600440D */ trunc.w.s $f16, $f8 /* 178A6C 8024A18C 44028000 */ mfc1 $v0, $f16 @@ -657,8 +657,8 @@ glabel func_80249804 /* 178AA4 8024A1C4 14400006 */ bnez $v0, .L8024A1E0 /* 178AA8 8024A1C8 2462FFFF */ addiu $v0, $v1, -1 /* 178AAC 8024A1CC 24020001 */ addiu $v0, $zero, 1 -/* 178AB0 8024A1D0 3C01802A */ lui $at, %hi(D_8029F29C) -/* 178AB4 8024A1D4 A022F29C */ sb $v0, %lo(D_8029F29C)($at) +/* 178AB0 8024A1D0 3C01802A */ lui $at, %hi(BattleCam_DoneMoving) +/* 178AB4 8024A1D4 A022F29C */ sb $v0, %lo(BattleCam_DoneMoving)($at) /* 178AB8 8024A1D8 0809287A */ j .L8024A1E8 /* 178ABC 8024A1DC 0000102D */ daddu $v0, $zero, $zero .L8024A1E0: diff --git a/ver/us/asm/nonmatchings/1776B0/func_8024A214.s b/ver/us/asm/nonmatchings/1776B0/func_8024A214.s index 8512629234..80a2287098 100644 --- a/ver/us/asm/nonmatchings/1776B0/func_8024A214.s +++ b/ver/us/asm/nonmatchings/1776B0/func_8024A214.s @@ -15,8 +15,8 @@ glabel func_8024A214 /* 178B00 8024A220 AFB10024 */ sw $s1, 0x24($sp) /* 178B04 8024A224 3C11800B */ lui $s1, %hi(gCameras+0x558) /* 178B08 8024A228 263122D8 */ addiu $s1, $s1, %lo(gCameras+0x558) -/* 178B0C 8024A22C 3C02802A */ lui $v0, %hi(D_8029F27C) -/* 178B10 8024A230 9442F27C */ lhu $v0, %lo(D_8029F27C)($v0) +/* 178B0C 8024A22C 3C02802A */ lui $v0, %hi(BattleCam_TargetActor) +/* 178B10 8024A230 9442F27C */ lhu $v0, %lo(BattleCam_TargetActor)($v0) /* 178B14 8024A234 3C04800E */ lui $a0, %hi(gBattleStatus) /* 178B18 8024A238 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) /* 178B1C 8024A23C AFBF002C */ sw $ra, 0x2c($sp) @@ -112,8 +112,8 @@ glabel func_8024A214 /* 178C70 8024A390 8C5000E0 */ lw $s0, 0xe0($v0) /* 178C74 8024A394 12000172 */ beqz $s0, .L8024A960 /* 178C78 8024A398 0000102D */ daddu $v0, $zero, $zero -/* 178C7C 8024A39C 3C05802A */ lui $a1, %hi(D_8029F27E) -/* 178C80 8024A3A0 84A5F27E */ lh $a1, %lo(D_8029F27E)($a1) +/* 178C7C 8024A39C 3C05802A */ lui $a1, %hi(BattleCam_TargetActorPart) +/* 178C80 8024A3A0 84A5F27E */ lh $a1, %lo(BattleCam_TargetActorPart)($a1) /* 178C84 8024A3A4 0C099117 */ jal get_actor_part /* 178C88 8024A3A8 0200202D */ daddu $a0, $s0, $zero /* 178C8C 8024A3AC C45A002C */ lwc1 $f26, 0x2c($v0) @@ -193,8 +193,8 @@ glabel func_8024A214 /* 178DA8 8024A4C8 8042F2A6 */ lb $v0, %lo(D_8029F2A6)($v0) /* 178DAC 8024A4CC 10400029 */ beqz $v0, .L8024A574 /* 178DB0 8024A4D0 00000000 */ nop -/* 178DB4 8024A4D4 3C01802A */ lui $at, %hi(D_8029F28C) -/* 178DB8 8024A4D8 C422F28C */ lwc1 $f2, %lo(D_8029F28C)($at) +/* 178DB4 8024A4D4 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 178DB8 8024A4D8 C422F28C */ lwc1 $f2, %lo(BattleCam_TargetBoomLength)($at) /* 178DBC 8024A4DC 3C0143FA */ lui $at, 0x43fa /* 178DC0 8024A4E0 44810000 */ mtc1 $at, $f0 /* 178DC4 8024A4E4 00000000 */ nop @@ -254,8 +254,8 @@ glabel func_8024A214 /* 178E90 8024A5B0 45030001 */ bc1tl .L8024A5B8 /* 178E94 8024A5B4 46000786 */ mov.s $f30, $f0 .L8024A5B8: -/* 178E98 8024A5B8 3C03802A */ lui $v1, %hi(D_8029F280) -/* 178E9C 8024A5BC 2463F280 */ addiu $v1, $v1, %lo(D_8029F280) +/* 178E98 8024A5B8 3C03802A */ lui $v1, %hi(BattleCam_BoomLength) +/* 178E9C 8024A5BC 2463F280 */ addiu $v1, $v1, %lo(BattleCam_BoomLength) /* 178EA0 8024A5C0 84620000 */ lh $v0, ($v1) /* 178EA4 8024A5C4 461EA080 */ add.s $f2, $f20, $f30 /* 178EA8 8024A5C8 44820000 */ mtc1 $v0, $f0 @@ -271,13 +271,13 @@ glabel func_8024A214 /* 178ED0 8024A5F0 E63A0054 */ swc1 $f26, 0x54($s1) /* 178ED4 8024A5F4 E63C0058 */ swc1 $f28, 0x58($s1) /* 178ED8 8024A5F8 C7AE0010 */ lwc1 $f14, 0x10($sp) -/* 178EDC 8024A5FC 3C02802A */ lui $v0, %hi(D_8029F286) -/* 178EE0 8024A600 8442F286 */ lh $v0, %lo(D_8029F286)($v0) -/* 178EE4 8024A604 3C03802A */ lui $v1, %hi(D_8029F282) -/* 178EE8 8024A608 9463F282 */ lhu $v1, %lo(D_8029F282)($v1) +/* 178EDC 8024A5FC 3C02802A */ lui $v0, %hi(BattleCam_BoomZOffset) +/* 178EE0 8024A600 8442F286 */ lh $v0, %lo(BattleCam_BoomZOffset)($v0) +/* 178EE4 8024A604 3C03802A */ lui $v1, %hi(BattleCam_BoomYaw) +/* 178EE8 8024A608 9463F282 */ lhu $v1, %lo(BattleCam_BoomYaw)($v1) /* 178EEC 8024A60C A624001E */ sh $a0, 0x1e($s1) -/* 178EF0 8024A610 3C04802A */ lui $a0, %hi(D_8029F284) -/* 178EF4 8024A614 9484F284 */ lhu $a0, %lo(D_8029F284)($a0) +/* 178EF0 8024A610 3C04802A */ lui $a0, %hi(BattleCam_BoomPitch) +/* 178EF4 8024A614 9484F284 */ lhu $a0, %lo(BattleCam_BoomPitch)($a0) /* 178EF8 8024A618 00021200 */ sll $v0, $v0, 8 /* 178EFC 8024A61C E62E005C */ swc1 $f14, 0x5c($s1) /* 178F00 8024A620 A6220026 */ sh $v0, 0x26($s1) @@ -291,18 +291,18 @@ glabel func_8024A214 /* 178F1C 8024A63C 00000000 */ nop /* 178F20 8024A640 46800020 */ cvt.s.w $f0, $f0 /* 178F24 8024A644 86220022 */ lh $v0, 0x22($s1) -/* 178F28 8024A648 3C01802A */ lui $at, %hi(D_8029F28C) -/* 178F2C 8024A64C E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) +/* 178F28 8024A648 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 178F2C 8024A64C E420F28C */ swc1 $f0, %lo(BattleCam_TargetBoomLength)($at) /* 178F30 8024A650 44820000 */ mtc1 $v0, $f0 /* 178F34 8024A654 00000000 */ nop /* 178F38 8024A658 46800020 */ cvt.s.w $f0, $f0 -/* 178F3C 8024A65C 3C01802A */ lui $at, %hi(D_8029F294) -/* 178F40 8024A660 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) +/* 178F3C 8024A65C 3C01802A */ lui $at, %hi(BattleCam_TargetBoomPitch) +/* 178F40 8024A660 E420F294 */ swc1 $f0, %lo(BattleCam_TargetBoomPitch)($at) /* 178F44 8024A664 44830000 */ mtc1 $v1, $f0 /* 178F48 8024A668 00000000 */ nop /* 178F4C 8024A66C 46800020 */ cvt.s.w $f0, $f0 -/* 178F50 8024A670 3C01802A */ lui $at, %hi(D_8029F290) -/* 178F54 8024A674 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) +/* 178F50 8024A670 3C01802A */ lui $at, %hi(BattleCam_TargetBoomYaw) +/* 178F54 8024A674 E420F290 */ swc1 $f0, %lo(BattleCam_TargetBoomYaw)($at) /* 178F58 8024A678 04820001 */ bltzl $a0, .L8024A680 /* 178F5C 8024A67C 248400FF */ addiu $a0, $a0, 0xff .L8024A680: @@ -310,30 +310,30 @@ glabel func_8024A214 /* 178F64 8024A684 C6220054 */ lwc1 $f2, 0x54($s1) /* 178F68 8024A688 C6240058 */ lwc1 $f4, 0x58($s1) /* 178F6C 8024A68C C626005C */ lwc1 $f6, 0x5c($s1) -/* 178F70 8024A690 3C03802A */ lui $v1, %hi(D_8029F29E) -/* 178F74 8024A694 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) +/* 178F70 8024A690 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeLeft) +/* 178F74 8024A694 9463F29E */ lhu $v1, %lo(BattleCam_MoveTimeLeft)($v1) /* 178F78 8024A698 44820000 */ mtc1 $v0, $f0 /* 178F7C 8024A69C 00000000 */ nop /* 178F80 8024A6A0 46800020 */ cvt.s.w $f0, $f0 -/* 178F84 8024A6A4 3C01802A */ lui $at, %hi(D_8029F298) -/* 178F88 8024A6A8 E420F298 */ swc1 $f0, %lo(D_8029F298)($at) -/* 178F8C 8024A6AC 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 178F90 8024A6B0 E422F2A8 */ swc1 $f2, %lo(D_8029F2A8)($at) -/* 178F94 8024A6B4 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 178F98 8024A6B8 E424F2AC */ swc1 $f4, %lo(D_8029F2AC)($at) -/* 178F9C 8024A6BC 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 178FA0 8024A6C0 E426F2B0 */ swc1 $f6, %lo(D_8029F2B0)($at) -/* 178FA4 8024A6C4 3C01802A */ lui $at, %hi(D_8029F2A0) -/* 178FA8 8024A6C8 A423F2A0 */ sh $v1, %lo(D_8029F2A0)($at) +/* 178F84 8024A6A4 3C01802A */ lui $at, %hi(BattleCam_TargetBoomZOffset) +/* 178F88 8024A6A8 E420F298 */ swc1 $f0, %lo(BattleCam_TargetBoomZOffset)($at) +/* 178F8C 8024A6AC 3C01802A */ lui $at, %hi(BattleCam_TargetPosX) +/* 178F90 8024A6B0 E422F2A8 */ swc1 $f2, %lo(BattleCam_TargetPosX)($at) +/* 178F94 8024A6B4 3C01802A */ lui $at, %hi(BattleCam_TargetPosY) +/* 178F98 8024A6B8 E424F2AC */ swc1 $f4, %lo(BattleCam_TargetPosY)($at) +/* 178F9C 8024A6BC 3C01802A */ lui $at, %hi(BattleCam_TargetPosZ) +/* 178FA0 8024A6C0 E426F2B0 */ swc1 $f6, %lo(BattleCam_TargetPosZ)($at) +/* 178FA4 8024A6C4 3C01802A */ lui $at, %hi(BattleCam_MoveTimeTotal) +/* 178FA8 8024A6C8 A423F2A0 */ sh $v1, %lo(BattleCam_MoveTimeTotal)($at) .L8024A6CC: -/* 178FAC 8024A6CC 3C02802A */ lui $v0, %hi(D_8029F2A5) -/* 178FB0 8024A6D0 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) +/* 178FAC 8024A6CC 3C02802A */ lui $v0, %hi(BattleCam_UseLinearInterp) +/* 178FB0 8024A6D0 8042F2A5 */ lb $v0, %lo(BattleCam_UseLinearInterp)($v0) /* 178FB4 8024A6D4 14400027 */ bnez $v0, .L8024A774 /* 178FB8 8024A6D8 00000000 */ nop -/* 178FBC 8024A6DC 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 178FC0 8024A6E0 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 178FC4 8024A6E4 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 178FC8 8024A6E8 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) +/* 178FBC 8024A6DC 3C02802A */ lui $v0, %hi(BattleCam_MoveTimeLeft) +/* 178FC0 8024A6E0 8442F29E */ lh $v0, %lo(BattleCam_MoveTimeLeft)($v0) +/* 178FC4 8024A6E4 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeTotal) +/* 178FC8 8024A6E8 8463F2A0 */ lh $v1, %lo(BattleCam_MoveTimeTotal)($v1) /* 178FCC 8024A6EC 3C013F80 */ lui $at, 0x3f80 /* 178FD0 8024A6F0 4481C000 */ mtc1 $at, $f24 /* 178FD4 8024A6F4 44822000 */ mtc1 $v0, $f4 @@ -369,10 +369,10 @@ glabel func_8024A214 /* 17904C 8024A76C 080929E8 */ j .L8024A7A0 /* 179050 8024A770 4600C101 */ sub.s $f4, $f24, $f0 .L8024A774: -/* 179054 8024A774 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 179058 8024A778 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 17905C 8024A77C 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 179060 8024A780 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) +/* 179054 8024A774 3C02802A */ lui $v0, %hi(BattleCam_MoveTimeLeft) +/* 179058 8024A778 8442F29E */ lh $v0, %lo(BattleCam_MoveTimeLeft)($v0) +/* 17905C 8024A77C 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeTotal) +/* 179060 8024A780 8463F2A0 */ lh $v1, %lo(BattleCam_MoveTimeTotal)($v1) /* 179064 8024A784 44822000 */ mtc1 $v0, $f4 /* 179068 8024A788 00000000 */ nop /* 17906C 8024A78C 46802120 */ cvt.s.w $f4, $f4 @@ -381,28 +381,28 @@ glabel func_8024A214 /* 179078 8024A798 46800020 */ cvt.s.w $f0, $f0 /* 17907C 8024A79C 46002103 */ div.s $f4, $f4, $f0 .L8024A7A0: -/* 179080 8024A7A0 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 179084 8024A7A4 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) +/* 179080 8024A7A0 3C01802A */ lui $at, %hi(BattleCam_TargetPosX) +/* 179084 8024A7A4 C434F2A8 */ lwc1 $f20, %lo(BattleCam_TargetPosX)($at) /* 179088 8024A7A8 4604A502 */ mul.s $f20, $f20, $f4 /* 17908C 8024A7AC 00000000 */ nop -/* 179090 8024A7B0 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 179094 8024A7B4 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) +/* 179090 8024A7B0 3C01802A */ lui $at, %hi(BattleCam_TargetPosY) +/* 179094 8024A7B4 C432F2AC */ lwc1 $f18, %lo(BattleCam_TargetPosY)($at) /* 179098 8024A7B8 46049482 */ mul.s $f18, $f18, $f4 /* 17909C 8024A7BC 00000000 */ nop -/* 1790A0 8024A7C0 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 1790A4 8024A7C4 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) +/* 1790A0 8024A7C0 3C01802A */ lui $at, %hi(BattleCam_TargetPosZ) +/* 1790A4 8024A7C4 C430F2B0 */ lwc1 $f16, %lo(BattleCam_TargetPosZ)($at) /* 1790A8 8024A7C8 46048402 */ mul.s $f16, $f16, $f4 /* 1790AC 8024A7CC 00000000 */ nop -/* 1790B0 8024A7D0 3C01802A */ lui $at, %hi(D_8029F298) -/* 1790B4 8024A7D4 C426F298 */ lwc1 $f6, %lo(D_8029F298)($at) +/* 1790B0 8024A7D0 3C01802A */ lui $at, %hi(BattleCam_TargetBoomZOffset) +/* 1790B4 8024A7D4 C426F298 */ lwc1 $f6, %lo(BattleCam_TargetBoomZOffset)($at) /* 1790B8 8024A7D8 46043182 */ mul.s $f6, $f6, $f4 /* 1790BC 8024A7DC 00000000 */ nop -/* 1790C0 8024A7E0 3C01802A */ lui $at, %hi(D_8029F28C) -/* 1790C4 8024A7E4 C42CF28C */ lwc1 $f12, %lo(D_8029F28C)($at) +/* 1790C0 8024A7E0 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 1790C4 8024A7E4 C42CF28C */ lwc1 $f12, %lo(BattleCam_TargetBoomLength)($at) /* 1790C8 8024A7E8 46046302 */ mul.s $f12, $f12, $f4 /* 1790CC 8024A7EC 00000000 */ nop -/* 1790D0 8024A7F0 3C01802A */ lui $at, %hi(D_8029F290) -/* 1790D4 8024A7F4 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) +/* 1790D0 8024A7F0 3C01802A */ lui $at, %hi(BattleCam_TargetBoomYaw) +/* 1790D4 8024A7F4 C428F290 */ lwc1 $f8, %lo(BattleCam_TargetBoomYaw)($at) /* 1790D8 8024A7F8 46044202 */ mul.s $f8, $f8, $f4 /* 1790DC 8024A7FC 00000000 */ nop /* 1790E0 8024A800 3C013F80 */ lui $at, 0x3f80 @@ -413,8 +413,8 @@ glabel func_8024A214 /* 1790F4 8024A814 00000000 */ nop /* 1790F8 8024A818 4602E602 */ mul.s $f24, $f28, $f2 /* 1790FC 8024A81C 00000000 */ nop -/* 179100 8024A820 3C02802A */ lui $v0, %hi(D_8029F286) -/* 179104 8024A824 8442F286 */ lh $v0, %lo(D_8029F286)($v0) +/* 179100 8024A820 3C02802A */ lui $v0, %hi(BattleCam_BoomZOffset) +/* 179104 8024A824 8442F286 */ lh $v0, %lo(BattleCam_BoomZOffset)($v0) /* 179108 8024A828 44820000 */ mtc1 $v0, $f0 /* 17910C 8024A82C 00000000 */ nop /* 179110 8024A830 46800020 */ cvt.s.w $f0, $f0 @@ -423,15 +423,15 @@ glabel func_8024A214 /* 17911C 8024A83C C7AE0010 */ lwc1 $f14, 0x10($sp) /* 179120 8024A840 46027582 */ mul.s $f22, $f14, $f2 /* 179124 8024A844 00000000 */ nop -/* 179128 8024A848 3C02802A */ lui $v0, %hi(D_8029F280) -/* 17912C 8024A84C 8442F280 */ lh $v0, %lo(D_8029F280)($v0) +/* 179128 8024A848 3C02802A */ lui $v0, %hi(BattleCam_BoomLength) +/* 17912C 8024A84C 8442F280 */ lh $v0, %lo(BattleCam_BoomLength)($v0) /* 179130 8024A850 44827000 */ mtc1 $v0, $f14 /* 179134 8024A854 00000000 */ nop /* 179138 8024A858 468073A0 */ cvt.s.w $f14, $f14 /* 17913C 8024A85C 46027382 */ mul.s $f14, $f14, $f2 /* 179140 8024A860 00000000 */ nop -/* 179144 8024A864 3C02802A */ lui $v0, %hi(D_8029F282) -/* 179148 8024A868 8442F282 */ lh $v0, %lo(D_8029F282)($v0) +/* 179144 8024A864 3C02802A */ lui $v0, %hi(BattleCam_BoomYaw) +/* 179148 8024A868 8442F282 */ lh $v0, %lo(BattleCam_BoomYaw)($v0) /* 17914C 8024A86C 44825000 */ mtc1 $v0, $f10 /* 179150 8024A870 00000000 */ nop /* 179154 8024A874 468052A0 */ cvt.s.w $f10, $f10 @@ -443,21 +443,21 @@ glabel func_8024A214 /* 17916C 8024A88C 00000000 */ nop /* 179170 8024A890 46003182 */ mul.s $f6, $f6, $f0 /* 179174 8024A894 00000000 */ nop -/* 179178 8024A898 3C01802A */ lui $at, %hi(D_8029F294) -/* 17917C 8024A89C C420F294 */ lwc1 $f0, %lo(D_8029F294)($at) +/* 179178 8024A898 3C01802A */ lui $at, %hi(BattleCam_TargetBoomPitch) +/* 17917C 8024A89C C420F294 */ lwc1 $f0, %lo(BattleCam_TargetBoomPitch)($at) /* 179180 8024A8A0 46040002 */ mul.s $f0, $f0, $f4 /* 179184 8024A8A4 00000000 */ nop /* 179188 8024A8A8 461AA500 */ add.s $f20, $f20, $f26 /* 17918C 8024A8AC 46189480 */ add.s $f18, $f18, $f24 /* 179190 8024A8B0 46168400 */ add.s $f16, $f16, $f22 -/* 179194 8024A8B4 3C02802A */ lui $v0, %hi(D_8029F284) -/* 179198 8024A8B8 8442F284 */ lh $v0, %lo(D_8029F284)($v0) +/* 179194 8024A8B4 3C02802A */ lui $v0, %hi(BattleCam_BoomPitch) +/* 179198 8024A8B8 8442F284 */ lh $v0, %lo(BattleCam_BoomPitch)($v0) /* 17919C 8024A8BC 460A4200 */ add.s $f8, $f8, $f10 /* 1791A0 8024A8C0 E7AE0018 */ swc1 $f14, 0x18($sp) /* 1791A4 8024A8C4 E6340054 */ swc1 $f20, 0x54($s1) /* 1791A8 8024A8C8 460E6300 */ add.s $f12, $f12, $f14 -/* 1791AC 8024A8CC 3C04802A */ lui $a0, %hi(D_8029F29E) -/* 1791B0 8024A8D0 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) +/* 1791AC 8024A8CC 3C04802A */ lui $a0, %hi(BattleCam_MoveTimeLeft) +/* 1791B0 8024A8D0 2484F29E */ addiu $a0, $a0, %lo(BattleCam_MoveTimeLeft) /* 1791B4 8024A8D4 44822000 */ mtc1 $v0, $f4 /* 1791B8 8024A8D8 00000000 */ nop /* 1791BC 8024A8DC 46802120 */ cvt.s.w $f4, $f4 @@ -487,8 +487,8 @@ glabel func_8024A214 /* 17921C 8024A93C 14400006 */ bnez $v0, .L8024A958 /* 179220 8024A940 2462FFFF */ addiu $v0, $v1, -1 /* 179224 8024A944 24020001 */ addiu $v0, $zero, 1 -/* 179228 8024A948 3C01802A */ lui $at, %hi(D_8029F29C) -/* 17922C 8024A94C A022F29C */ sb $v0, %lo(D_8029F29C)($at) +/* 179228 8024A948 3C01802A */ lui $at, %hi(BattleCam_DoneMoving) +/* 17922C 8024A94C A022F29C */ sb $v0, %lo(BattleCam_DoneMoving)($at) /* 179230 8024A950 08092A58 */ j .L8024A960 /* 179234 8024A954 0000102D */ daddu $v0, $zero, $zero .L8024A958: diff --git a/ver/us/asm/nonmatchings/1776B0/func_8024A990.s b/ver/us/asm/nonmatchings/1776B0/func_8024A990.s index b163923278..40d53c144f 100644 --- a/ver/us/asm/nonmatchings/1776B0/func_8024A990.s +++ b/ver/us/asm/nonmatchings/1776B0/func_8024A990.s @@ -13,8 +13,8 @@ glabel func_8024A990 /* 179274 8024A994 AFB00020 */ sw $s0, 0x20($sp) /* 179278 8024A998 3C10800B */ lui $s0, %hi(gCameras+0x558) /* 17927C 8024A99C 261022D8 */ addiu $s0, $s0, %lo(gCameras+0x558) -/* 179280 8024A9A0 3C02802A */ lui $v0, %hi(D_8029F27C) -/* 179284 8024A9A4 9442F27C */ lhu $v0, %lo(D_8029F27C)($v0) +/* 179280 8024A9A0 3C02802A */ lui $v0, %hi(BattleCam_TargetActor) +/* 179284 8024A9A4 9442F27C */ lhu $v0, %lo(BattleCam_TargetActor)($v0) /* 179288 8024A9A8 3C04800E */ lui $a0, %hi(gBattleStatus) /* 17928C 8024A9AC 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) /* 179290 8024A9B0 AFBF0024 */ sw $ra, 0x24($sp) @@ -113,8 +113,8 @@ glabel func_8024A990 /* 1793E4 8024AB04 8042F2A6 */ lb $v0, %lo(D_8029F2A6)($v0) /* 1793E8 8024AB08 10400029 */ beqz $v0, .L8024ABB0 /* 1793EC 8024AB0C 00000000 */ nop -/* 1793F0 8024AB10 3C01802A */ lui $at, %hi(D_8029F28C) -/* 1793F4 8024AB14 C422F28C */ lwc1 $f2, %lo(D_8029F28C)($at) +/* 1793F0 8024AB10 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 1793F4 8024AB14 C422F28C */ lwc1 $f2, %lo(BattleCam_TargetBoomLength)($at) /* 1793F8 8024AB18 3C0143FA */ lui $at, 0x43fa /* 1793FC 8024AB1C 44810000 */ mtc1 $at, $f0 /* 179400 8024AB20 00000000 */ nop @@ -180,15 +180,15 @@ glabel func_8024A990 /* 1794E0 8024AC00 44820000 */ mtc1 $v0, $f0 /* 1794E4 8024AC04 00000000 */ nop /* 1794E8 8024AC08 46800020 */ cvt.s.w $f0, $f0 -/* 1794EC 8024AC0C 3C01802A */ lui $at, %hi(D_8029F28C) -/* 1794F0 8024AC10 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) +/* 1794EC 8024AC0C 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 1794F0 8024AC10 E420F28C */ swc1 $f0, %lo(BattleCam_TargetBoomLength)($at) /* 1794F4 8024AC14 44830000 */ mtc1 $v1, $f0 /* 1794F8 8024AC18 00000000 */ nop /* 1794FC 8024AC1C 46800020 */ cvt.s.w $f0, $f0 -/* 179500 8024AC20 3C03802A */ lui $v1, %hi(D_8029F280) -/* 179504 8024AC24 2463F280 */ addiu $v1, $v1, %lo(D_8029F280) -/* 179508 8024AC28 3C01802A */ lui $at, %hi(D_8029F294) -/* 17950C 8024AC2C E420F294 */ swc1 $f0, %lo(D_8029F294)($at) +/* 179500 8024AC20 3C03802A */ lui $v1, %hi(BattleCam_BoomLength) +/* 179504 8024AC24 2463F280 */ addiu $v1, $v1, %lo(BattleCam_BoomLength) +/* 179508 8024AC28 3C01802A */ lui $at, %hi(BattleCam_TargetBoomPitch) +/* 17950C 8024AC2C E420F294 */ swc1 $f0, %lo(BattleCam_TargetBoomPitch)($at) /* 179510 8024AC30 84620000 */ lh $v0, ($v1) /* 179514 8024AC34 46083000 */ add.s $f0, $f6, $f8 /* 179518 8024AC38 44821000 */ mtc1 $v0, $f2 @@ -199,8 +199,8 @@ glabel func_8024A990 /* 17952C 8024AC4C 44820000 */ mtc1 $v0, $f0 /* 179530 8024AC50 00000000 */ nop /* 179534 8024AC54 46800020 */ cvt.s.w $f0, $f0 -/* 179538 8024AC58 3C01802A */ lui $at, %hi(D_8029F290) -/* 17953C 8024AC5C E420F290 */ swc1 $f0, %lo(D_8029F290)($at) +/* 179538 8024AC58 3C01802A */ lui $at, %hi(BattleCam_TargetBoomYaw) +/* 17953C 8024AC5C E420F290 */ swc1 $f0, %lo(BattleCam_TargetBoomYaw)($at) /* 179540 8024AC60 4600148D */ trunc.w.s $f18, $f2 /* 179544 8024AC64 44029000 */ mfc1 $v0, $f18 /* 179548 8024AC68 04810002 */ bgez $a0, .L8024AC74 @@ -211,30 +211,30 @@ glabel func_8024A990 /* 179558 8024AC78 C6020054 */ lwc1 $f2, 0x54($s0) /* 17955C 8024AC7C C6040058 */ lwc1 $f4, 0x58($s0) /* 179560 8024AC80 C606005C */ lwc1 $f6, 0x5c($s0) -/* 179564 8024AC84 3C03802A */ lui $v1, %hi(D_8029F29E) -/* 179568 8024AC88 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) +/* 179564 8024AC84 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeLeft) +/* 179568 8024AC88 9463F29E */ lhu $v1, %lo(BattleCam_MoveTimeLeft)($v1) /* 17956C 8024AC8C 44820000 */ mtc1 $v0, $f0 /* 179570 8024AC90 00000000 */ nop /* 179574 8024AC94 46800020 */ cvt.s.w $f0, $f0 -/* 179578 8024AC98 3C01802A */ lui $at, %hi(D_8029F298) -/* 17957C 8024AC9C E420F298 */ swc1 $f0, %lo(D_8029F298)($at) -/* 179580 8024ACA0 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 179584 8024ACA4 E422F2A8 */ swc1 $f2, %lo(D_8029F2A8)($at) -/* 179588 8024ACA8 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 17958C 8024ACAC E424F2AC */ swc1 $f4, %lo(D_8029F2AC)($at) -/* 179590 8024ACB0 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 179594 8024ACB4 E426F2B0 */ swc1 $f6, %lo(D_8029F2B0)($at) -/* 179598 8024ACB8 3C01802A */ lui $at, %hi(D_8029F2A0) -/* 17959C 8024ACBC A423F2A0 */ sh $v1, %lo(D_8029F2A0)($at) +/* 179578 8024AC98 3C01802A */ lui $at, %hi(BattleCam_TargetBoomZOffset) +/* 17957C 8024AC9C E420F298 */ swc1 $f0, %lo(BattleCam_TargetBoomZOffset)($at) +/* 179580 8024ACA0 3C01802A */ lui $at, %hi(BattleCam_TargetPosX) +/* 179584 8024ACA4 E422F2A8 */ swc1 $f2, %lo(BattleCam_TargetPosX)($at) +/* 179588 8024ACA8 3C01802A */ lui $at, %hi(BattleCam_TargetPosY) +/* 17958C 8024ACAC E424F2AC */ swc1 $f4, %lo(BattleCam_TargetPosY)($at) +/* 179590 8024ACB0 3C01802A */ lui $at, %hi(BattleCam_TargetPosZ) +/* 179594 8024ACB4 E426F2B0 */ swc1 $f6, %lo(BattleCam_TargetPosZ)($at) +/* 179598 8024ACB8 3C01802A */ lui $at, %hi(BattleCam_MoveTimeTotal) +/* 17959C 8024ACBC A423F2A0 */ sh $v1, %lo(BattleCam_MoveTimeTotal)($at) .L8024ACC0: -/* 1795A0 8024ACC0 3C02802A */ lui $v0, %hi(D_8029F2A5) -/* 1795A4 8024ACC4 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) +/* 1795A0 8024ACC0 3C02802A */ lui $v0, %hi(BattleCam_UseLinearInterp) +/* 1795A4 8024ACC4 8042F2A5 */ lb $v0, %lo(BattleCam_UseLinearInterp)($v0) /* 1795A8 8024ACC8 14400027 */ bnez $v0, .L8024AD68 /* 1795AC 8024ACCC 00000000 */ nop -/* 1795B0 8024ACD0 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 1795B4 8024ACD4 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 1795B8 8024ACD8 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 1795BC 8024ACDC 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) +/* 1795B0 8024ACD0 3C02802A */ lui $v0, %hi(BattleCam_MoveTimeLeft) +/* 1795B4 8024ACD4 8442F29E */ lh $v0, %lo(BattleCam_MoveTimeLeft)($v0) +/* 1795B8 8024ACD8 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeTotal) +/* 1795BC 8024ACDC 8463F2A0 */ lh $v1, %lo(BattleCam_MoveTimeTotal)($v1) /* 1795C0 8024ACE0 3C013F80 */ lui $at, 0x3f80 /* 1795C4 8024ACE4 4481C000 */ mtc1 $at, $f24 /* 1795C8 8024ACE8 4482A000 */ mtc1 $v0, $f20 @@ -270,10 +270,10 @@ glabel func_8024A990 /* 179640 8024AD60 08092B65 */ j .L8024AD94 /* 179644 8024AD64 4600C501 */ sub.s $f20, $f24, $f0 .L8024AD68: -/* 179648 8024AD68 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 17964C 8024AD6C 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 179650 8024AD70 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 179654 8024AD74 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) +/* 179648 8024AD68 3C02802A */ lui $v0, %hi(BattleCam_MoveTimeLeft) +/* 17964C 8024AD6C 8442F29E */ lh $v0, %lo(BattleCam_MoveTimeLeft)($v0) +/* 179650 8024AD70 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeTotal) +/* 179654 8024AD74 8463F2A0 */ lh $v1, %lo(BattleCam_MoveTimeTotal)($v1) /* 179658 8024AD78 4482A000 */ mtc1 $v0, $f20 /* 17965C 8024AD7C 00000000 */ nop /* 179660 8024AD80 4680A520 */ cvt.s.w $f20, $f20 @@ -286,8 +286,8 @@ glabel func_8024A990 /* 179678 8024AD98 8042F2A3 */ lb $v0, %lo(D_8029F2A3)($v0) /* 17967C 8024AD9C 10400013 */ beqz $v0, .L8024ADEC /* 179680 8024ADA0 00000000 */ nop -/* 179684 8024ADA4 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 179688 8024ADA8 C424F2A8 */ lwc1 $f4, %lo(D_8029F2A8)($at) +/* 179684 8024ADA4 3C01802A */ lui $at, %hi(BattleCam_TargetPosX) +/* 179688 8024ADA8 C424F2A8 */ lwc1 $f4, %lo(BattleCam_TargetPosX)($at) /* 17968C 8024ADAC 46142102 */ mul.s $f4, $f4, $f20 /* 179690 8024ADB0 00000000 */ nop /* 179694 8024ADB4 3C02802A */ lui $v0, %hi(D_8029F2A7) @@ -309,8 +309,8 @@ glabel func_8024A990 /* 1796D0 8024ADF0 8042F2A2 */ lb $v0, %lo(D_8029F2A2)($v0) /* 1796D4 8024ADF4 1040000E */ beqz $v0, .L8024AE30 /* 1796D8 8024ADF8 00000000 */ nop -/* 1796DC 8024ADFC 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 1796E0 8024AE00 C422F2AC */ lwc1 $f2, %lo(D_8029F2AC)($at) +/* 1796DC 8024ADFC 3C01802A */ lui $at, %hi(BattleCam_TargetPosY) +/* 1796E0 8024AE00 C422F2AC */ lwc1 $f2, %lo(BattleCam_TargetPosY)($at) /* 1796E4 8024AE04 46141082 */ mul.s $f2, $f2, $f20 /* 1796E8 8024AE08 00000000 */ nop /* 1796EC 8024AE0C 3C013F80 */ lui $at, 0x3f80 @@ -323,45 +323,45 @@ glabel func_8024A990 /* 179708 8024AE28 46001080 */ add.s $f2, $f2, $f0 /* 17970C 8024AE2C E6020058 */ swc1 $f2, 0x58($s0) .L8024AE30: -/* 179710 8024AE30 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 179714 8024AE34 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) +/* 179710 8024AE30 3C01802A */ lui $at, %hi(BattleCam_TargetPosZ) +/* 179714 8024AE34 C430F2B0 */ lwc1 $f16, %lo(BattleCam_TargetPosZ)($at) /* 179718 8024AE38 46148402 */ mul.s $f16, $f16, $f20 /* 17971C 8024AE3C 00000000 */ nop -/* 179720 8024AE40 3C01802A */ lui $at, %hi(D_8029F298) -/* 179724 8024AE44 C42CF298 */ lwc1 $f12, %lo(D_8029F298)($at) +/* 179720 8024AE40 3C01802A */ lui $at, %hi(BattleCam_TargetBoomZOffset) +/* 179724 8024AE44 C42CF298 */ lwc1 $f12, %lo(BattleCam_TargetBoomZOffset)($at) /* 179728 8024AE48 46146302 */ mul.s $f12, $f12, $f20 /* 17972C 8024AE4C 00000000 */ nop -/* 179730 8024AE50 3C01802A */ lui $at, %hi(D_8029F28C) -/* 179734 8024AE54 C42EF28C */ lwc1 $f14, %lo(D_8029F28C)($at) +/* 179730 8024AE50 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 179734 8024AE54 C42EF28C */ lwc1 $f14, %lo(BattleCam_TargetBoomLength)($at) /* 179738 8024AE58 46147382 */ mul.s $f14, $f14, $f20 /* 17973C 8024AE5C 00000000 */ nop -/* 179740 8024AE60 3C01802A */ lui $at, %hi(D_8029F290) -/* 179744 8024AE64 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) +/* 179740 8024AE60 3C01802A */ lui $at, %hi(BattleCam_TargetBoomYaw) +/* 179744 8024AE64 C428F290 */ lwc1 $f8, %lo(BattleCam_TargetBoomYaw)($at) /* 179748 8024AE68 46144202 */ mul.s $f8, $f8, $f20 /* 17974C 8024AE6C 00000000 */ nop -/* 179750 8024AE70 3C01802A */ lui $at, %hi(D_8029F294) -/* 179754 8024AE74 C426F294 */ lwc1 $f6, %lo(D_8029F294)($at) +/* 179750 8024AE70 3C01802A */ lui $at, %hi(BattleCam_TargetBoomPitch) +/* 179754 8024AE74 C426F294 */ lwc1 $f6, %lo(BattleCam_TargetBoomPitch)($at) /* 179758 8024AE78 46143182 */ mul.s $f6, $f6, $f20 /* 17975C 8024AE7C 00000000 */ nop /* 179760 8024AE80 3C013F80 */ lui $at, 0x3f80 /* 179764 8024AE84 44812000 */ mtc1 $at, $f4 -/* 179768 8024AE88 3C02802A */ lui $v0, %hi(D_8029F286) -/* 17976C 8024AE8C 8442F286 */ lh $v0, %lo(D_8029F286)($v0) +/* 179768 8024AE88 3C02802A */ lui $v0, %hi(BattleCam_BoomZOffset) +/* 17976C 8024AE8C 8442F286 */ lh $v0, %lo(BattleCam_BoomZOffset)($v0) /* 179770 8024AE90 46142101 */ sub.s $f4, $f4, $f20 /* 179774 8024AE94 44820000 */ mtc1 $v0, $f0 /* 179778 8024AE98 00000000 */ nop /* 17977C 8024AE9C 46800020 */ cvt.s.w $f0, $f0 /* 179780 8024AEA0 46040002 */ mul.s $f0, $f0, $f4 /* 179784 8024AEA4 00000000 */ nop -/* 179788 8024AEA8 3C02802A */ lui $v0, %hi(D_8029F280) -/* 17978C 8024AEAC 8442F280 */ lh $v0, %lo(D_8029F280)($v0) +/* 179788 8024AEA8 3C02802A */ lui $v0, %hi(BattleCam_BoomLength) +/* 17978C 8024AEAC 8442F280 */ lh $v0, %lo(BattleCam_BoomLength)($v0) /* 179790 8024AEB0 4604E702 */ mul.s $f28, $f28, $f4 /* 179794 8024AEB4 00000000 */ nop /* 179798 8024AEB8 44825000 */ mtc1 $v0, $f10 /* 17979C 8024AEBC 00000000 */ nop /* 1797A0 8024AEC0 468052A0 */ cvt.s.w $f10, $f10 -/* 1797A4 8024AEC4 3C02802A */ lui $v0, %hi(D_8029F282) -/* 1797A8 8024AEC8 8442F282 */ lh $v0, %lo(D_8029F282)($v0) +/* 1797A4 8024AEC4 3C02802A */ lui $v0, %hi(BattleCam_BoomYaw) +/* 1797A8 8024AEC8 8442F282 */ lh $v0, %lo(BattleCam_BoomYaw)($v0) /* 1797AC 8024AECC 44821000 */ mtc1 $v0, $f2 /* 1797B0 8024AED0 00000000 */ nop /* 1797B4 8024AED4 468010A0 */ cvt.s.w $f2, $f2 @@ -377,8 +377,8 @@ glabel func_8024A990 /* 1797DC 8024AEFC 44810000 */ mtc1 $at, $f0 /* 1797E0 8024AF00 00000000 */ nop /* 1797E4 8024AF04 4600F001 */ sub.s $f0, $f30, $f0 -/* 1797E8 8024AF08 3C02802A */ lui $v0, %hi(D_8029F284) -/* 1797EC 8024AF0C 8442F284 */ lh $v0, %lo(D_8029F284)($v0) +/* 1797E8 8024AF08 3C02802A */ lui $v0, %hi(BattleCam_BoomPitch) +/* 1797EC 8024AF0C 8442F284 */ lh $v0, %lo(BattleCam_BoomPitch)($v0) /* 1797F0 8024AF10 46005280 */ add.s $f10, $f10, $f0 /* 1797F4 8024AF14 44820000 */ mtc1 $v0, $f0 /* 1797F8 8024AF18 00000000 */ nop @@ -390,8 +390,8 @@ glabel func_8024A990 /* 179810 8024AF30 E7BC0018 */ swc1 $f28, 0x18($sp) /* 179814 8024AF34 461C8400 */ add.s $f16, $f16, $f28 /* 179818 8024AF38 46024200 */ add.s $f8, $f8, $f2 -/* 17981C 8024AF3C 3C04802A */ lui $a0, %hi(D_8029F29E) -/* 179820 8024AF40 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) +/* 17981C 8024AF3C 3C04802A */ lui $a0, %hi(BattleCam_MoveTimeLeft) +/* 179820 8024AF40 2484F29E */ addiu $a0, $a0, %lo(BattleCam_MoveTimeLeft) /* 179824 8024AF44 E610005C */ swc1 $f16, 0x5c($s0) /* 179828 8024AF48 46003180 */ add.s $f6, $f6, $f0 /* 17982C 8024AF4C 4600448D */ trunc.w.s $f18, $f8 @@ -416,8 +416,8 @@ glabel func_8024A990 /* 179878 8024AF98 14400006 */ bnez $v0, .L8024AFB4 /* 17987C 8024AF9C 2462FFFF */ addiu $v0, $v1, -1 /* 179880 8024AFA0 24020001 */ addiu $v0, $zero, 1 -/* 179884 8024AFA4 3C01802A */ lui $at, %hi(D_8029F29C) -/* 179888 8024AFA8 A022F29C */ sb $v0, %lo(D_8029F29C)($at) +/* 179884 8024AFA4 3C01802A */ lui $at, %hi(BattleCam_DoneMoving) +/* 179888 8024AFA8 A022F29C */ sb $v0, %lo(BattleCam_DoneMoving)($at) /* 17988C 8024AFAC 08092BEF */ j .L8024AFBC /* 179890 8024AFB0 0000102D */ daddu $v0, $zero, $zero .L8024AFB4: diff --git a/ver/us/asm/nonmatchings/1776B0/func_8024AFE4.s b/ver/us/asm/nonmatchings/1776B0/func_8024AFE4.s index 2b47724f79..6190b8fb0f 100644 --- a/ver/us/asm/nonmatchings/1776B0/func_8024AFE4.s +++ b/ver/us/asm/nonmatchings/1776B0/func_8024AFE4.s @@ -13,8 +13,8 @@ glabel func_8024AFE4 /* 1798C8 8024AFE8 AFB00020 */ sw $s0, 0x20($sp) /* 1798CC 8024AFEC 3C10800B */ lui $s0, %hi(gCameras+0x558) /* 1798D0 8024AFF0 261022D8 */ addiu $s0, $s0, %lo(gCameras+0x558) -/* 1798D4 8024AFF4 3C02802A */ lui $v0, %hi(D_8029F27C) -/* 1798D8 8024AFF8 9442F27C */ lhu $v0, %lo(D_8029F27C)($v0) +/* 1798D4 8024AFF4 3C02802A */ lui $v0, %hi(BattleCam_TargetActor) +/* 1798D8 8024AFF8 9442F27C */ lhu $v0, %lo(BattleCam_TargetActor)($v0) /* 1798DC 8024AFFC 3C04800E */ lui $a0, %hi(gBattleStatus) /* 1798E0 8024B000 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) /* 1798E4 8024B004 AFBF0024 */ sw $ra, 0x24($sp) @@ -144,8 +144,8 @@ glabel func_8024AFE4 /* 179AB4 8024B1D4 8042F2A6 */ lb $v0, %lo(D_8029F2A6)($v0) /* 179AB8 8024B1D8 10400029 */ beqz $v0, .L8024B280 /* 179ABC 8024B1DC 00000000 */ nop -/* 179AC0 8024B1E0 3C01802A */ lui $at, %hi(D_8029F28C) -/* 179AC4 8024B1E4 C422F28C */ lwc1 $f2, %lo(D_8029F28C)($at) +/* 179AC0 8024B1E0 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 179AC4 8024B1E4 C422F28C */ lwc1 $f2, %lo(BattleCam_TargetBoomLength)($at) /* 179AC8 8024B1E8 3C0143FA */ lui $at, 0x43fa /* 179ACC 8024B1EC 44810000 */ mtc1 $at, $f0 /* 179AD0 8024B1F0 00000000 */ nop @@ -195,18 +195,18 @@ glabel func_8024AFE4 /* 179B78 8024B298 00000000 */ nop /* 179B7C 8024B29C 46800020 */ cvt.s.w $f0, $f0 /* 179B80 8024B2A0 86020022 */ lh $v0, 0x22($s0) -/* 179B84 8024B2A4 3C01802A */ lui $at, %hi(D_8029F28C) -/* 179B88 8024B2A8 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) +/* 179B84 8024B2A4 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 179B88 8024B2A8 E420F28C */ swc1 $f0, %lo(BattleCam_TargetBoomLength)($at) /* 179B8C 8024B2AC 44820000 */ mtc1 $v0, $f0 /* 179B90 8024B2B0 00000000 */ nop /* 179B94 8024B2B4 46800020 */ cvt.s.w $f0, $f0 -/* 179B98 8024B2B8 3C01802A */ lui $at, %hi(D_8029F294) -/* 179B9C 8024B2BC E420F294 */ swc1 $f0, %lo(D_8029F294)($at) +/* 179B98 8024B2B8 3C01802A */ lui $at, %hi(BattleCam_TargetBoomPitch) +/* 179B9C 8024B2BC E420F294 */ swc1 $f0, %lo(BattleCam_TargetBoomPitch)($at) /* 179BA0 8024B2C0 44830000 */ mtc1 $v1, $f0 /* 179BA4 8024B2C4 00000000 */ nop /* 179BA8 8024B2C8 46800020 */ cvt.s.w $f0, $f0 -/* 179BAC 8024B2CC 3C01802A */ lui $at, %hi(D_8029F290) -/* 179BB0 8024B2D0 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) +/* 179BAC 8024B2CC 3C01802A */ lui $at, %hi(BattleCam_TargetBoomYaw) +/* 179BB0 8024B2D0 E420F290 */ swc1 $f0, %lo(BattleCam_TargetBoomYaw)($at) /* 179BB4 8024B2D4 04820001 */ bltzl $a0, .L8024B2DC /* 179BB8 8024B2D8 248400FF */ addiu $a0, $a0, 0xff .L8024B2DC: @@ -214,30 +214,30 @@ glabel func_8024AFE4 /* 179BC0 8024B2E0 C6020054 */ lwc1 $f2, 0x54($s0) /* 179BC4 8024B2E4 C6040058 */ lwc1 $f4, 0x58($s0) /* 179BC8 8024B2E8 C606005C */ lwc1 $f6, 0x5c($s0) -/* 179BCC 8024B2EC 3C03802A */ lui $v1, %hi(D_8029F29E) -/* 179BD0 8024B2F0 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) +/* 179BCC 8024B2EC 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeLeft) +/* 179BD0 8024B2F0 9463F29E */ lhu $v1, %lo(BattleCam_MoveTimeLeft)($v1) /* 179BD4 8024B2F4 44820000 */ mtc1 $v0, $f0 /* 179BD8 8024B2F8 00000000 */ nop /* 179BDC 8024B2FC 46800020 */ cvt.s.w $f0, $f0 -/* 179BE0 8024B300 3C01802A */ lui $at, %hi(D_8029F298) -/* 179BE4 8024B304 E420F298 */ swc1 $f0, %lo(D_8029F298)($at) -/* 179BE8 8024B308 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 179BEC 8024B30C E422F2A8 */ swc1 $f2, %lo(D_8029F2A8)($at) -/* 179BF0 8024B310 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 179BF4 8024B314 E424F2AC */ swc1 $f4, %lo(D_8029F2AC)($at) -/* 179BF8 8024B318 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 179BFC 8024B31C E426F2B0 */ swc1 $f6, %lo(D_8029F2B0)($at) -/* 179C00 8024B320 3C01802A */ lui $at, %hi(D_8029F2A0) -/* 179C04 8024B324 A423F2A0 */ sh $v1, %lo(D_8029F2A0)($at) +/* 179BE0 8024B300 3C01802A */ lui $at, %hi(BattleCam_TargetBoomZOffset) +/* 179BE4 8024B304 E420F298 */ swc1 $f0, %lo(BattleCam_TargetBoomZOffset)($at) +/* 179BE8 8024B308 3C01802A */ lui $at, %hi(BattleCam_TargetPosX) +/* 179BEC 8024B30C E422F2A8 */ swc1 $f2, %lo(BattleCam_TargetPosX)($at) +/* 179BF0 8024B310 3C01802A */ lui $at, %hi(BattleCam_TargetPosY) +/* 179BF4 8024B314 E424F2AC */ swc1 $f4, %lo(BattleCam_TargetPosY)($at) +/* 179BF8 8024B318 3C01802A */ lui $at, %hi(BattleCam_TargetPosZ) +/* 179BFC 8024B31C E426F2B0 */ swc1 $f6, %lo(BattleCam_TargetPosZ)($at) +/* 179C00 8024B320 3C01802A */ lui $at, %hi(BattleCam_MoveTimeTotal) +/* 179C04 8024B324 A423F2A0 */ sh $v1, %lo(BattleCam_MoveTimeTotal)($at) .L8024B328: -/* 179C08 8024B328 3C02802A */ lui $v0, %hi(D_8029F2A5) -/* 179C0C 8024B32C 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) +/* 179C08 8024B328 3C02802A */ lui $v0, %hi(BattleCam_UseLinearInterp) +/* 179C0C 8024B32C 8042F2A5 */ lb $v0, %lo(BattleCam_UseLinearInterp)($v0) /* 179C10 8024B330 14400027 */ bnez $v0, .L8024B3D0 /* 179C14 8024B334 00000000 */ nop -/* 179C18 8024B338 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 179C1C 8024B33C 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 179C20 8024B340 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 179C24 8024B344 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) +/* 179C18 8024B338 3C02802A */ lui $v0, %hi(BattleCam_MoveTimeLeft) +/* 179C1C 8024B33C 8442F29E */ lh $v0, %lo(BattleCam_MoveTimeLeft)($v0) +/* 179C20 8024B340 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeTotal) +/* 179C24 8024B344 8463F2A0 */ lh $v1, %lo(BattleCam_MoveTimeTotal)($v1) /* 179C28 8024B348 3C013F80 */ lui $at, 0x3f80 /* 179C2C 8024B34C 4481C000 */ mtc1 $at, $f24 /* 179C30 8024B350 4482E000 */ mtc1 $v0, $f28 @@ -273,10 +273,10 @@ glabel func_8024AFE4 /* 179CA8 8024B3C8 08092CFF */ j .L8024B3FC /* 179CAC 8024B3CC 4600C701 */ sub.s $f28, $f24, $f0 .L8024B3D0: -/* 179CB0 8024B3D0 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 179CB4 8024B3D4 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 179CB8 8024B3D8 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 179CBC 8024B3DC 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) +/* 179CB0 8024B3D0 3C02802A */ lui $v0, %hi(BattleCam_MoveTimeLeft) +/* 179CB4 8024B3D4 8442F29E */ lh $v0, %lo(BattleCam_MoveTimeLeft)($v0) +/* 179CB8 8024B3D8 3C03802A */ lui $v1, %hi(BattleCam_MoveTimeTotal) +/* 179CBC 8024B3DC 8463F2A0 */ lh $v1, %lo(BattleCam_MoveTimeTotal)($v1) /* 179CC0 8024B3E0 4482E000 */ mtc1 $v0, $f28 /* 179CC4 8024B3E4 00000000 */ nop /* 179CC8 8024B3E8 4680E720 */ cvt.s.w $f28, $f28 @@ -285,32 +285,32 @@ glabel func_8024AFE4 /* 179CD4 8024B3F4 46800020 */ cvt.s.w $f0, $f0 /* 179CD8 8024B3F8 4600E703 */ div.s $f28, $f28, $f0 .L8024B3FC: -/* 179CDC 8024B3FC 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 179CE0 8024B400 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) +/* 179CDC 8024B3FC 3C01802A */ lui $at, %hi(BattleCam_TargetPosX) +/* 179CE0 8024B400 C434F2A8 */ lwc1 $f20, %lo(BattleCam_TargetPosX)($at) /* 179CE4 8024B404 461CA502 */ mul.s $f20, $f20, $f28 /* 179CE8 8024B408 00000000 */ nop -/* 179CEC 8024B40C 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 179CF0 8024B410 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) +/* 179CEC 8024B40C 3C01802A */ lui $at, %hi(BattleCam_TargetPosY) +/* 179CF0 8024B410 C432F2AC */ lwc1 $f18, %lo(BattleCam_TargetPosY)($at) /* 179CF4 8024B414 461C9482 */ mul.s $f18, $f18, $f28 /* 179CF8 8024B418 00000000 */ nop -/* 179CFC 8024B41C 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 179D00 8024B420 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) +/* 179CFC 8024B41C 3C01802A */ lui $at, %hi(BattleCam_TargetPosZ) +/* 179D00 8024B420 C430F2B0 */ lwc1 $f16, %lo(BattleCam_TargetPosZ)($at) /* 179D04 8024B424 461C8402 */ mul.s $f16, $f16, $f28 /* 179D08 8024B428 00000000 */ nop -/* 179D0C 8024B42C 3C01802A */ lui $at, %hi(D_8029F298) -/* 179D10 8024B430 C42AF298 */ lwc1 $f10, %lo(D_8029F298)($at) +/* 179D0C 8024B42C 3C01802A */ lui $at, %hi(BattleCam_TargetBoomZOffset) +/* 179D10 8024B430 C42AF298 */ lwc1 $f10, %lo(BattleCam_TargetBoomZOffset)($at) /* 179D14 8024B434 461C5282 */ mul.s $f10, $f10, $f28 /* 179D18 8024B438 00000000 */ nop -/* 179D1C 8024B43C 3C01802A */ lui $at, %hi(D_8029F28C) -/* 179D20 8024B440 C42EF28C */ lwc1 $f14, %lo(D_8029F28C)($at) +/* 179D1C 8024B43C 3C01802A */ lui $at, %hi(BattleCam_TargetBoomLength) +/* 179D20 8024B440 C42EF28C */ lwc1 $f14, %lo(BattleCam_TargetBoomLength)($at) /* 179D24 8024B444 461C7382 */ mul.s $f14, $f14, $f28 /* 179D28 8024B448 00000000 */ nop -/* 179D2C 8024B44C 3C01802A */ lui $at, %hi(D_8029F290) -/* 179D30 8024B450 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) +/* 179D2C 8024B44C 3C01802A */ lui $at, %hi(BattleCam_TargetBoomYaw) +/* 179D30 8024B450 C428F290 */ lwc1 $f8, %lo(BattleCam_TargetBoomYaw)($at) /* 179D34 8024B454 461C4202 */ mul.s $f8, $f8, $f28 /* 179D38 8024B458 00000000 */ nop -/* 179D3C 8024B45C 3C01802A */ lui $at, %hi(D_8029F294) -/* 179D40 8024B460 C424F294 */ lwc1 $f4, %lo(D_8029F294)($at) +/* 179D3C 8024B45C 3C01802A */ lui $at, %hi(BattleCam_TargetBoomPitch) +/* 179D40 8024B460 C424F294 */ lwc1 $f4, %lo(BattleCam_TargetBoomPitch)($at) /* 179D44 8024B464 461C2102 */ mul.s $f4, $f4, $f28 /* 179D48 8024B468 00000000 */ nop /* 179D4C 8024B46C 3C013F80 */ lui $at, 0x3f80 @@ -322,20 +322,20 @@ glabel func_8024AFE4 /* 179D64 8024B484 C7BE0018 */ lwc1 $f30, 0x18($sp) /* 179D68 8024B488 4602F602 */ mul.s $f24, $f30, $f2 /* 179D6C 8024B48C 00000000 */ nop -/* 179D70 8024B490 3C02802A */ lui $v0, %hi(D_8029F286) -/* 179D74 8024B494 8442F286 */ lh $v0, %lo(D_8029F286)($v0) +/* 179D70 8024B490 3C02802A */ lui $v0, %hi(BattleCam_BoomZOffset) +/* 179D74 8024B494 8442F286 */ lh $v0, %lo(BattleCam_BoomZOffset)($v0) /* 179D78 8024B498 44820000 */ mtc1 $v0, $f0 /* 179D7C 8024B49C 00000000 */ nop /* 179D80 8024B4A0 46800020 */ cvt.s.w $f0, $f0 -/* 179D84 8024B4A4 3C02802A */ lui $v0, %hi(D_8029F280) -/* 179D88 8024B4A8 8442F280 */ lh $v0, %lo(D_8029F280)($v0) +/* 179D84 8024B4A4 3C02802A */ lui $v0, %hi(BattleCam_BoomLength) +/* 179D88 8024B4A8 8442F280 */ lh $v0, %lo(BattleCam_BoomLength)($v0) /* 179D8C 8024B4AC 46020002 */ mul.s $f0, $f0, $f2 /* 179D90 8024B4B0 00000000 */ nop /* 179D94 8024B4B4 44826000 */ mtc1 $v0, $f12 /* 179D98 8024B4B8 00000000 */ nop /* 179D9C 8024B4BC 46806320 */ cvt.s.w $f12, $f12 -/* 179DA0 8024B4C0 3C02802A */ lui $v0, %hi(D_8029F282) -/* 179DA4 8024B4C4 8442F282 */ lh $v0, %lo(D_8029F282)($v0) +/* 179DA0 8024B4C0 3C02802A */ lui $v0, %hi(BattleCam_BoomYaw) +/* 179DA4 8024B4C4 8442F282 */ lh $v0, %lo(BattleCam_BoomYaw)($v0) /* 179DA8 8024B4C8 44823000 */ mtc1 $v0, $f6 /* 179DAC 8024B4CC 00000000 */ nop /* 179DB0 8024B4D0 468031A0 */ cvt.s.w $f6, $f6 @@ -355,8 +355,8 @@ glabel func_8024AFE4 /* 179DE8 8024B508 44810000 */ mtc1 $at, $f0 /* 179DEC 8024B50C 00000000 */ nop /* 179DF0 8024B510 4600F001 */ sub.s $f0, $f30, $f0 -/* 179DF4 8024B514 3C02802A */ lui $v0, %hi(D_8029F284) -/* 179DF8 8024B518 8442F284 */ lh $v0, %lo(D_8029F284)($v0) +/* 179DF4 8024B514 3C02802A */ lui $v0, %hi(BattleCam_BoomPitch) +/* 179DF8 8024B518 8442F284 */ lh $v0, %lo(BattleCam_BoomPitch)($v0) /* 179DFC 8024B51C 46006300 */ add.s $f12, $f12, $f0 /* 179E00 8024B520 44820000 */ mtc1 $v0, $f0 /* 179E04 8024B524 00000000 */ nop @@ -368,8 +368,8 @@ glabel func_8024AFE4 /* 179E1C 8024B53C 461AA500 */ add.s $f20, $f20, $f26 /* 179E20 8024B540 46189480 */ add.s $f18, $f18, $f24 /* 179E24 8024B544 46064200 */ add.s $f8, $f8, $f6 -/* 179E28 8024B548 3C04802A */ lui $a0, %hi(D_8029F29E) -/* 179E2C 8024B54C 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) +/* 179E28 8024B548 3C04802A */ lui $a0, %hi(BattleCam_MoveTimeLeft) +/* 179E2C 8024B54C 2484F29E */ addiu $a0, $a0, %lo(BattleCam_MoveTimeLeft) /* 179E30 8024B550 46168400 */ add.s $f16, $f16, $f22 /* 179E34 8024B554 E6140054 */ swc1 $f20, 0x54($s0) /* 179E38 8024B558 E6120058 */ swc1 $f18, 0x58($s0) @@ -397,8 +397,8 @@ glabel func_8024AFE4 /* 179E90 8024B5B0 14400006 */ bnez $v0, .L8024B5CC /* 179E94 8024B5B4 2462FFFF */ addiu $v0, $v1, -1 /* 179E98 8024B5B8 24020001 */ addiu $v0, $zero, 1 -/* 179E9C 8024B5BC 3C01802A */ lui $at, %hi(D_8029F29C) -/* 179EA0 8024B5C0 A022F29C */ sb $v0, %lo(D_8029F29C)($at) +/* 179E9C 8024B5BC 3C01802A */ lui $at, %hi(BattleCam_DoneMoving) +/* 179EA0 8024B5C0 A022F29C */ sb $v0, %lo(BattleCam_DoneMoving)($at) /* 179EA4 8024B5C4 08092D75 */ j .L8024B5D4 /* 179EA8 8024B5C8 0000102D */ daddu $v0, $zero, $zero .L8024B5CC: diff --git a/ver/us/asm/nonmatchings/msg/draw_msg.s b/ver/us/asm/nonmatchings/msg/draw_msg.s deleted file mode 100644 index b3da7bbad7..0000000000 --- a/ver/us/asm/nonmatchings/msg/draw_msg.s +++ /dev/null @@ -1,182 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel draw_msg -/* BCBEC 801264EC 27BDFA58 */ addiu $sp, $sp, -0x5a8 -/* BCBF0 801264F0 8FA205BC */ lw $v0, 0x5bc($sp) -/* BCBF4 801264F4 AFB7059C */ sw $s7, 0x59c($sp) -/* BCBF8 801264F8 8FB705B8 */ lw $s7, 0x5b8($sp) -/* BCBFC 801264FC AFB00580 */ sw $s0, 0x580($sp) -/* BCC00 80126500 0080802D */ daddu $s0, $a0, $zero -/* BCC04 80126504 AFBE05A0 */ sw $fp, 0x5a0($sp) -/* BCC08 80126508 00E0F02D */ daddu $fp, $a3, $zero -/* BCC0C 8012650C AFB60598 */ sw $s6, 0x598($sp) -/* BCC10 80126510 0000B02D */ daddu $s6, $zero, $zero -/* BCC14 80126514 AFB20588 */ sw $s2, 0x588($sp) -/* BCC18 80126518 02C0902D */ daddu $s2, $s6, $zero -/* BCC1C 8012651C AFB40590 */ sw $s4, 0x590($sp) -/* BCC20 80126520 0000A02D */ daddu $s4, $zero, $zero -/* BCC24 80126524 AFB3058C */ sw $s3, 0x58c($sp) -/* BCC28 80126528 0280982D */ daddu $s3, $s4, $zero -/* BCC2C 8012652C AFBF05A4 */ sw $ra, 0x5a4($sp) -/* BCC30 80126530 AFB50594 */ sw $s5, 0x594($sp) -/* BCC34 80126534 AFB10584 */ sw $s1, 0x584($sp) -/* BCC38 80126538 AFA505AC */ sw $a1, 0x5ac($sp) -/* BCC3C 8012653C AFA605B0 */ sw $a2, 0x5b0($sp) -/* BCC40 80126540 12000087 */ beqz $s0, .L80126760 -/* BCC44 80126544 0040A82D */ daddu $s5, $v0, $zero -/* BCC48 80126548 30420001 */ andi $v0, $v0, 1 -/* BCC4C 8012654C 10400003 */ beqz $v0, .L8012655C -/* BCC50 80126550 2BC200FF */ slti $v0, $fp, 0xff -/* BCC54 80126554 24160002 */ addiu $s6, $zero, 2 -/* BCC58 80126558 24130001 */ addiu $s3, $zero, 1 -.L8012655C: -/* BCC5C 8012655C 54400001 */ bnel $v0, $zero, .L80126564 -/* BCC60 80126560 36D60001 */ ori $s6, $s6, 1 -.L80126564: -/* BCC64 80126564 27B10020 */ addiu $s1, $sp, 0x20 -/* BCC68 80126568 0220202D */ daddu $a0, $s1, $zero -/* BCC6C 8012656C 24050001 */ addiu $a1, $zero, 1 -/* BCC70 80126570 0C0495A9 */ jal initialize_printer -/* BCC74 80126574 0000302D */ daddu $a2, $zero, $zero -/* BCC78 80126578 06010003 */ bgez $s0, .L80126588 -/* BCC7C 8012657C 00000000 */ nop -/* BCC80 80126580 08049975 */ j .L801265D4 -/* BCC84 80126584 AFB00020 */ sw $s0, 0x20($sp) -.L80126588: -/* BCC88 80126588 0C00AB0A */ jal general_heap_malloc -/* BCC8C 8012658C 24040400 */ addiu $a0, $zero, 0x400 -/* BCC90 80126590 0040A02D */ daddu $s4, $v0, $zero -/* BCC94 80126594 0200202D */ daddu $a0, $s0, $zero -/* BCC98 80126598 0C049601 */ jal dma_load_msg -/* BCC9C 8012659C 0280282D */ daddu $a1, $s4, $zero -/* BCCA0 801265A0 0000282D */ daddu $a1, $zero, $zero -/* BCCA4 801265A4 27B00578 */ addiu $s0, $sp, 0x578 -/* BCCA8 801265A8 0200302D */ daddu $a2, $s0, $zero -/* BCCAC 801265AC AFB40020 */ sw $s4, 0x20($sp) -/* BCCB0 801265B0 AFA00010 */ sw $zero, 0x10($sp) -/* BCCB4 801265B4 AFA00014 */ sw $zero, 0x14($sp) -/* BCCB8 801265B8 AFA00018 */ sw $zero, 0x18($sp) -/* BCCBC 801265BC AFB3001C */ sw $s3, 0x1c($sp) -/* BCCC0 801265C0 0280202D */ daddu $a0, $s4, $zero -/* BCCC4 801265C4 0C0497DA */ jal get_msg_properties -/* BCCC8 801265C8 00A0382D */ daddu $a3, $a1, $zero -/* BCCCC 801265CC 96020002 */ lhu $v0, 2($s0) -/* BCCD0 801265D0 A7A20558 */ sh $v0, 0x558($sp) -.L801265D4: -/* BCCD4 801265D4 06E00011 */ bltz $s7, .L8012661C -/* BCCD8 801265D8 26450001 */ addiu $a1, $s2, 1 -/* BCCDC 801265DC 24A40001 */ addiu $a0, $a1, 1 -/* BCCE0 801265E0 3242FFFF */ andi $v0, $s2, 0xffff -/* BCCE4 801265E4 02221021 */ addu $v0, $s1, $v0 -/* BCCE8 801265E8 240300FF */ addiu $v1, $zero, 0xff -/* BCCEC 801265EC A0430010 */ sb $v1, 0x10($v0) -/* BCCF0 801265F0 30A2FFFF */ andi $v0, $a1, 0xffff -/* BCCF4 801265F4 02221021 */ addu $v0, $s1, $v0 -/* BCCF8 801265F8 24030004 */ addiu $v1, $zero, 4 -/* BCCFC 801265FC 3084FFFF */ andi $a0, $a0, 0xffff -/* BCD00 80126600 02242021 */ addu $a0, $s1, $a0 -/* BCD04 80126604 A0430010 */ sb $v1, 0x10($v0) -/* BCD08 80126608 A0970010 */ sb $s7, 0x10($a0) -/* BCD0C 8012660C 96220004 */ lhu $v0, 4($s1) -/* BCD10 80126610 24B20002 */ addiu $s2, $a1, 2 -/* BCD14 80126614 24420003 */ addiu $v0, $v0, 3 -/* BCD18 80126618 A6220004 */ sh $v0, 4($s1) -.L8012661C: -/* BCD1C 8012661C 32A20002 */ andi $v0, $s5, 2 -/* BCD20 80126620 10400012 */ beqz $v0, .L8012666C -/* BCD24 80126624 26450001 */ addiu $a1, $s2, 1 -/* BCD28 80126628 24A40001 */ addiu $a0, $a1, 1 -/* BCD2C 8012662C 3242FFFF */ andi $v0, $s2, 0xffff -/* BCD30 80126630 02221021 */ addu $v0, $s1, $v0 -/* BCD34 80126634 240300FF */ addiu $v1, $zero, 0xff -/* BCD38 80126638 A0430010 */ sb $v1, 0x10($v0) -/* BCD3C 8012663C 30A2FFFF */ andi $v0, $a1, 0xffff -/* BCD40 80126640 02221021 */ addu $v0, $s1, $v0 -/* BCD44 80126644 2403001C */ addiu $v1, $zero, 0x1c -/* BCD48 80126648 3084FFFF */ andi $a0, $a0, 0xffff -/* BCD4C 8012664C 02242021 */ addu $a0, $s1, $a0 -/* BCD50 80126650 A0430010 */ sb $v1, 0x10($v0) -/* BCD54 80126654 24020008 */ addiu $v0, $zero, 8 -/* BCD58 80126658 A0820010 */ sb $v0, 0x10($a0) -/* BCD5C 8012665C 96220004 */ lhu $v0, 4($s1) -/* BCD60 80126660 24B20002 */ addiu $s2, $a1, 2 -/* BCD64 80126664 24420003 */ addiu $v0, $v0, 3 -/* BCD68 80126668 A6220004 */ sh $v0, 4($s1) -.L8012666C: -/* BCD6C 8012666C 32A20004 */ andi $v0, $s5, 4 -/* BCD70 80126670 10400012 */ beqz $v0, .L801266BC -/* BCD74 80126674 26450001 */ addiu $a1, $s2, 1 -/* BCD78 80126678 24A40001 */ addiu $a0, $a1, 1 -/* BCD7C 8012667C 3242FFFF */ andi $v0, $s2, 0xffff -/* BCD80 80126680 02221021 */ addu $v0, $s1, $v0 -/* BCD84 80126684 240300FF */ addiu $v1, $zero, 0xff -/* BCD88 80126688 A0430010 */ sb $v1, 0x10($v0) -/* BCD8C 8012668C 30A2FFFF */ andi $v0, $a1, 0xffff -/* BCD90 80126690 02221021 */ addu $v0, $s1, $v0 -/* BCD94 80126694 2403001C */ addiu $v1, $zero, 0x1c -/* BCD98 80126698 3084FFFF */ andi $a0, $a0, 0xffff -/* BCD9C 8012669C 02242021 */ addu $a0, $s1, $a0 -/* BCDA0 801266A0 A0430010 */ sb $v1, 0x10($v0) -/* BCDA4 801266A4 24020009 */ addiu $v0, $zero, 9 -/* BCDA8 801266A8 A0820010 */ sb $v0, 0x10($a0) -/* BCDAC 801266AC 96220004 */ lhu $v0, 4($s1) -/* BCDB0 801266B0 24B20002 */ addiu $s2, $a1, 2 -/* BCDB4 801266B4 24420003 */ addiu $v0, $v0, 3 -/* BCDB8 801266B8 A6220004 */ sh $v0, 4($s1) -.L801266BC: -/* BCDBC 801266BC 32A20008 */ andi $v0, $s5, 8 -/* BCDC0 801266C0 10400011 */ beqz $v0, .L80126708 -/* BCDC4 801266C4 26440001 */ addiu $a0, $s2, 1 -/* BCDC8 801266C8 24850001 */ addiu $a1, $a0, 1 -/* BCDCC 801266CC 3242FFFF */ andi $v0, $s2, 0xffff -/* BCDD0 801266D0 02221021 */ addu $v0, $s1, $v0 -/* BCDD4 801266D4 240300FF */ addiu $v1, $zero, 0xff -/* BCDD8 801266D8 3084FFFF */ andi $a0, $a0, 0xffff -/* BCDDC 801266DC 02242021 */ addu $a0, $s1, $a0 -/* BCDE0 801266E0 A0430010 */ sb $v1, 0x10($v0) -/* BCDE4 801266E4 2402001C */ addiu $v0, $zero, 0x1c -/* BCDE8 801266E8 30A5FFFF */ andi $a1, $a1, 0xffff -/* BCDEC 801266EC 02252821 */ addu $a1, $s1, $a1 -/* BCDF0 801266F0 A0820010 */ sb $v0, 0x10($a0) -/* BCDF4 801266F4 2402000E */ addiu $v0, $zero, 0xe -/* BCDF8 801266F8 A0A20010 */ sb $v0, 0x10($a1) -/* BCDFC 801266FC 96220004 */ lhu $v0, 4($s1) -/* BCE00 80126700 24420003 */ addiu $v0, $v0, 3 -/* BCE04 80126704 A6220004 */ sh $v0, 4($s1) -.L80126708: -/* BCE08 80126708 0220202D */ daddu $a0, $s1, $zero -/* BCE0C 8012670C 24052710 */ addiu $a1, $zero, 0x2710 -/* BCE10 80126710 0C04915C */ jal msg_copy_to_print_buffer -/* BCE14 80126714 24060001 */ addiu $a2, $zero, 1 -/* BCE18 80126718 0220202D */ daddu $a0, $s1, $zero -/* BCE1C 8012671C 0000382D */ daddu $a3, $zero, $zero -/* BCE20 80126720 8FA805AC */ lw $t0, 0x5ac($sp) -/* BCE24 80126724 32C2FFFF */ andi $v0, $s6, 0xffff -/* BCE28 80126728 AFA20014 */ sw $v0, 0x14($sp) -/* BCE2C 8012672C 33C200FF */ andi $v0, $fp, 0xff -/* BCE30 80126730 AFA00010 */ sw $zero, 0x10($sp) -/* BCE34 80126734 AFA20018 */ sw $v0, 0x18($sp) -/* BCE38 80126738 00082C00 */ sll $a1, $t0, 0x10 -/* BCE3C 8012673C 8FA805B0 */ lw $t0, 0x5b0($sp) -/* BCE40 80126740 00052C03 */ sra $a1, $a1, 0x10 -/* BCE44 80126744 00083400 */ sll $a2, $t0, 0x10 -/* BCE48 80126748 0C049F64 */ jal appendGfx_message -/* BCE4C 8012674C 00063403 */ sra $a2, $a2, 0x10 -/* BCE50 80126750 12800003 */ beqz $s4, .L80126760 -/* BCE54 80126754 00000000 */ nop -/* BCE58 80126758 0C00AB1E */ jal general_heap_free -/* BCE5C 8012675C 0280202D */ daddu $a0, $s4, $zero -.L80126760: -/* BCE60 80126760 8FBF05A4 */ lw $ra, 0x5a4($sp) -/* BCE64 80126764 8FBE05A0 */ lw $fp, 0x5a0($sp) -/* BCE68 80126768 8FB7059C */ lw $s7, 0x59c($sp) -/* BCE6C 8012676C 8FB60598 */ lw $s6, 0x598($sp) -/* BCE70 80126770 8FB50594 */ lw $s5, 0x594($sp) -/* BCE74 80126774 8FB40590 */ lw $s4, 0x590($sp) -/* BCE78 80126778 8FB3058C */ lw $s3, 0x58c($sp) -/* BCE7C 8012677C 8FB20588 */ lw $s2, 0x588($sp) -/* BCE80 80126780 8FB10584 */ lw $s1, 0x584($sp) -/* BCE84 80126784 8FB00580 */ lw $s0, 0x580($sp) -/* BCE88 80126788 03E00008 */ jr $ra -/* BCE8C 8012678C 27BD05A8 */ addiu $sp, $sp, 0x5a8 diff --git a/ver/us/asm/nonmatchings/msg/msg_get_draw_char_width.s b/ver/us/asm/nonmatchings/msg/msg_get_draw_char_width.s deleted file mode 100644 index df795b75f5..0000000000 --- a/ver/us/asm/nonmatchings/msg/msg_get_draw_char_width.s +++ /dev/null @@ -1,115 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80150580 -.double 0.6 - -.section .text - -glabel msg_get_draw_char_width -/* BC4F4 80125DF4 288200F0 */ slti $v0, $a0, 0xf0 -/* BC4F8 80125DF8 44871000 */ mtc1 $a3, $f2 -/* BC4FC 80125DFC 8FA70010 */ lw $a3, 0x10($sp) -/* BC500 80125E00 97A30016 */ lhu $v1, 0x16($sp) -/* BC504 80125E04 14400004 */ bnez $v0, .L80125E18 -/* BC508 80125E08 2482FF0B */ addiu $v0, $a0, -0xf5 -/* BC50C 80125E0C 2C420003 */ sltiu $v0, $v0, 3 -/* BC510 80125E10 10400037 */ beqz $v0, .L80125EF0 -/* BC514 80125E14 0000102D */ daddu $v0, $zero, $zero -.L80125E18: -/* BC518 80125E18 10E00005 */ beqz $a3, .L80125E30 -/* BC51C 80125E1C 240200F5 */ addiu $v0, $zero, 0xf5 -/* BC520 80125E20 44870000 */ mtc1 $a3, $f0 -/* BC524 80125E24 00000000 */ nop -/* BC528 80125E28 080497B1 */ j .L80125EC4 -/* BC52C 80125E2C 46800020 */ cvt.s.w $f0, $f0 -.L80125E30: -/* BC530 80125E30 30620100 */ andi $v0, $v1, 0x100 -/* BC534 80125E34 10400015 */ beqz $v0, .L80125E8C -/* BC538 80125E38 00051880 */ sll $v1, $a1, 2 -/* BC53C 80125E3C 00061040 */ sll $v0, $a2, 1 -/* BC540 80125E40 3C01802F */ lui $at, %hi(gMsgCharsets) -/* BC544 80125E44 00230821 */ addu $at, $at, $v1 -/* BC548 80125E48 8C23B5A8 */ lw $v1, %lo(gMsgCharsets)($at) -/* BC54C 80125E4C 00461021 */ addu $v0, $v0, $a2 -/* BC550 80125E50 8C630008 */ lw $v1, 8($v1) -/* BC554 80125E54 00021080 */ sll $v0, $v0, 2 -/* BC558 80125E58 00431021 */ addu $v0, $v0, $v1 -/* BC55C 80125E5C 8C430004 */ lw $v1, 4($v0) -/* BC560 80125E60 1060000A */ beqz $v1, .L80125E8C -/* BC564 80125E64 240200F5 */ addiu $v0, $zero, 0xf5 -/* BC568 80125E68 10820008 */ beq $a0, $v0, .L80125E8C -/* BC56C 80125E6C 240200F6 */ addiu $v0, $zero, 0xf6 -/* BC570 80125E70 10820006 */ beq $a0, $v0, .L80125E8C -/* BC574 80125E74 240200F7 */ addiu $v0, $zero, 0xf7 -/* BC578 80125E78 10820004 */ beq $a0, $v0, .L80125E8C -/* BC57C 80125E7C 00641021 */ addu $v0, $v1, $a0 -/* BC580 80125E80 90420000 */ lbu $v0, ($v0) -/* BC584 80125E84 080497AD */ j .L80125EB4 -/* BC588 80125E88 00000000 */ nop -.L80125E8C: -/* BC58C 80125E8C 00051880 */ sll $v1, $a1, 2 -/* BC590 80125E90 00061040 */ sll $v0, $a2, 1 -/* BC594 80125E94 3C01802F */ lui $at, %hi(gMsgCharsets) -/* BC598 80125E98 00230821 */ addu $at, $at, $v1 -/* BC59C 80125E9C 8C23B5A8 */ lw $v1, %lo(gMsgCharsets)($at) -/* BC5A0 80125EA0 00461021 */ addu $v0, $v0, $a2 -/* BC5A4 80125EA4 8C630008 */ lw $v1, 8($v1) -/* BC5A8 80125EA8 00021080 */ sll $v0, $v0, 2 -/* BC5AC 80125EAC 00431021 */ addu $v0, $v0, $v1 -/* BC5B0 80125EB0 90420008 */ lbu $v0, 8($v0) -.L80125EB4: -/* BC5B4 80125EB4 44820000 */ mtc1 $v0, $f0 -/* BC5B8 80125EB8 00000000 */ nop -/* BC5BC 80125EBC 46800020 */ cvt.s.w $f0, $f0 -/* BC5C0 80125EC0 240200F5 */ addiu $v0, $zero, 0xf5 -.L80125EC4: -/* BC5C4 80125EC4 1482000C */ bne $a0, $v0, .L80125EF8 -/* BC5C8 80125EC8 240200F6 */ addiu $v0, $zero, 0xf6 -/* BC5CC 80125ECC 46020002 */ mul.s $f0, $f0, $f2 -/* BC5D0 80125ED0 00000000 */ nop -/* BC5D4 80125ED4 3C018015 */ lui $at, %hi(D_80150580) -/* BC5D8 80125ED8 D4220580 */ ldc1 $f2, %lo(D_80150580)($at) -/* BC5DC 80125EDC 46000021 */ cvt.d.s $f0, $f0 -.L80125EE0: -/* BC5E0 80125EE0 46220002 */ mul.d $f0, $f0, $f2 -/* BC5E4 80125EE4 00000000 */ nop -/* BC5E8 80125EE8 4620010D */ trunc.w.d $f4, $f0 -/* BC5EC 80125EEC 44022000 */ mfc1 $v0, $f4 -.L80125EF0: -/* BC5F0 80125EF0 03E00008 */ jr $ra -/* BC5F4 80125EF4 00000000 */ nop -.L80125EF8: -/* BC5F8 80125EF8 14820008 */ bne $a0, $v0, .L80125F1C -/* BC5FC 80125EFC 240200F7 */ addiu $v0, $zero, 0xf7 -/* BC600 80125F00 46020002 */ mul.s $f0, $f0, $f2 -/* BC604 80125F04 00000000 */ nop -/* BC608 80125F08 46000021 */ cvt.d.s $f0, $f0 -/* BC60C 80125F0C 4620010D */ trunc.w.d $f4, $f0 -/* BC610 80125F10 44022000 */ mfc1 $v0, $f4 -/* BC614 80125F14 03E00008 */ jr $ra -/* BC618 80125F18 00000000 */ nop -.L80125F1C: -/* BC61C 80125F1C 14820008 */ bne $a0, $v0, .L80125F40 -/* BC620 80125F20 288200F0 */ slti $v0, $a0, 0xf0 -/* BC624 80125F24 46020002 */ mul.s $f0, $f0, $f2 -/* BC628 80125F28 00000000 */ nop -/* BC62C 80125F2C 3C013FE0 */ lui $at, 0x3fe0 -/* BC630 80125F30 44811800 */ mtc1 $at, $f3 -/* BC634 80125F34 44801000 */ mtc1 $zero, $f2 -/* BC638 80125F38 080497B8 */ j .L80125EE0 -/* BC63C 80125F3C 46000021 */ cvt.d.s $f0, $f0 -.L80125F40: -/* BC640 80125F40 10400007 */ beqz $v0, .L80125F60 -/* BC644 80125F44 00000000 */ nop -/* BC648 80125F48 46020002 */ mul.s $f0, $f0, $f2 -/* BC64C 80125F4C 00000000 */ nop -/* BC650 80125F50 4600010D */ trunc.w.s $f4, $f0 -/* BC654 80125F54 44022000 */ mfc1 $v0, $f4 -/* BC658 80125F58 03E00008 */ jr $ra -/* BC65C 80125F5C 00000000 */ nop -.L80125F60: -/* BC660 80125F60 03E00008 */ jr $ra -/* BC664 80125F64 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/msg/msg_get_print_char_width.s b/ver/us/asm/nonmatchings/msg/msg_get_print_char_width.s deleted file mode 100644 index 49577c37c4..0000000000 --- a/ver/us/asm/nonmatchings/msg/msg_get_print_char_width.s +++ /dev/null @@ -1,114 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80150578 -.double 0.6 - -.section .text - -glabel msg_get_print_char_width -/* BC384 80125C84 288200F0 */ slti $v0, $a0, 0xf0 -/* BC388 80125C88 44871000 */ mtc1 $a3, $f2 -/* BC38C 80125C8C 8FA70010 */ lw $a3, 0x10($sp) -/* BC390 80125C90 93A30017 */ lbu $v1, 0x17($sp) -/* BC394 80125C94 14400004 */ bnez $v0, .L80125CA8 -/* BC398 80125C98 2482FF09 */ addiu $v0, $a0, -0xf7 -/* BC39C 80125C9C 2C420003 */ sltiu $v0, $v0, 3 -/* BC3A0 80125CA0 10400036 */ beqz $v0, .L80125D7C -/* BC3A4 80125CA4 0000102D */ daddu $v0, $zero, $zero -.L80125CA8: -/* BC3A8 80125CA8 10E00005 */ beqz $a3, .L80125CC0 -/* BC3AC 80125CAC 240200F7 */ addiu $v0, $zero, 0xf7 -/* BC3B0 80125CB0 44870000 */ mtc1 $a3, $f0 -/* BC3B4 80125CB4 00000000 */ nop -/* BC3B8 80125CB8 08049754 */ j .L80125D50 -/* BC3BC 80125CBC 46800020 */ cvt.s.w $f0, $f0 -.L80125CC0: -/* BC3C0 80125CC0 10600015 */ beqz $v1, .L80125D18 -/* BC3C4 80125CC4 00051880 */ sll $v1, $a1, 2 -/* BC3C8 80125CC8 00061040 */ sll $v0, $a2, 1 -/* BC3CC 80125CCC 3C01802F */ lui $at, %hi(gMsgCharsets) -/* BC3D0 80125CD0 00230821 */ addu $at, $at, $v1 -/* BC3D4 80125CD4 8C23B5A8 */ lw $v1, %lo(gMsgCharsets)($at) -/* BC3D8 80125CD8 00461021 */ addu $v0, $v0, $a2 -/* BC3DC 80125CDC 8C630008 */ lw $v1, 8($v1) -/* BC3E0 80125CE0 00021080 */ sll $v0, $v0, 2 -/* BC3E4 80125CE4 00431021 */ addu $v0, $v0, $v1 -/* BC3E8 80125CE8 8C430004 */ lw $v1, 4($v0) -/* BC3EC 80125CEC 1060000A */ beqz $v1, .L80125D18 -/* BC3F0 80125CF0 240200F7 */ addiu $v0, $zero, 0xf7 -/* BC3F4 80125CF4 10820008 */ beq $a0, $v0, .L80125D18 -/* BC3F8 80125CF8 240200F8 */ addiu $v0, $zero, 0xf8 -/* BC3FC 80125CFC 10820006 */ beq $a0, $v0, .L80125D18 -/* BC400 80125D00 240200F9 */ addiu $v0, $zero, 0xf9 -/* BC404 80125D04 10820004 */ beq $a0, $v0, .L80125D18 -/* BC408 80125D08 00641021 */ addu $v0, $v1, $a0 -/* BC40C 80125D0C 90420000 */ lbu $v0, ($v0) -/* BC410 80125D10 08049750 */ j .L80125D40 -/* BC414 80125D14 00000000 */ nop -.L80125D18: -/* BC418 80125D18 00051880 */ sll $v1, $a1, 2 -/* BC41C 80125D1C 00061040 */ sll $v0, $a2, 1 -/* BC420 80125D20 3C01802F */ lui $at, %hi(gMsgCharsets) -/* BC424 80125D24 00230821 */ addu $at, $at, $v1 -/* BC428 80125D28 8C23B5A8 */ lw $v1, %lo(gMsgCharsets)($at) -/* BC42C 80125D2C 00461021 */ addu $v0, $v0, $a2 -/* BC430 80125D30 8C630008 */ lw $v1, 8($v1) -/* BC434 80125D34 00021080 */ sll $v0, $v0, 2 -/* BC438 80125D38 00431021 */ addu $v0, $v0, $v1 -/* BC43C 80125D3C 90420008 */ lbu $v0, 8($v0) -.L80125D40: -/* BC440 80125D40 44820000 */ mtc1 $v0, $f0 -/* BC444 80125D44 00000000 */ nop -/* BC448 80125D48 46800020 */ cvt.s.w $f0, $f0 -/* BC44C 80125D4C 240200F7 */ addiu $v0, $zero, 0xf7 -.L80125D50: -/* BC450 80125D50 1482000C */ bne $a0, $v0, .L80125D84 -/* BC454 80125D54 240200F8 */ addiu $v0, $zero, 0xf8 -/* BC458 80125D58 46020002 */ mul.s $f0, $f0, $f2 -/* BC45C 80125D5C 00000000 */ nop -/* BC460 80125D60 3C018015 */ lui $at, %hi(D_80150578) -/* BC464 80125D64 D4220578 */ ldc1 $f2, %lo(D_80150578)($at) -/* BC468 80125D68 46000021 */ cvt.d.s $f0, $f0 -.L80125D6C: -/* BC46C 80125D6C 46220002 */ mul.d $f0, $f0, $f2 -/* BC470 80125D70 00000000 */ nop -/* BC474 80125D74 4620010D */ trunc.w.d $f4, $f0 -/* BC478 80125D78 44022000 */ mfc1 $v0, $f4 -.L80125D7C: -/* BC47C 80125D7C 03E00008 */ jr $ra -/* BC480 80125D80 00000000 */ nop -.L80125D84: -/* BC484 80125D84 14820008 */ bne $a0, $v0, .L80125DA8 -/* BC488 80125D88 240200F9 */ addiu $v0, $zero, 0xf9 -/* BC48C 80125D8C 46020002 */ mul.s $f0, $f0, $f2 -/* BC490 80125D90 00000000 */ nop -/* BC494 80125D94 46000021 */ cvt.d.s $f0, $f0 -/* BC498 80125D98 4620010D */ trunc.w.d $f4, $f0 -/* BC49C 80125D9C 44022000 */ mfc1 $v0, $f4 -/* BC4A0 80125DA0 03E00008 */ jr $ra -/* BC4A4 80125DA4 00000000 */ nop -.L80125DA8: -/* BC4A8 80125DA8 14820008 */ bne $a0, $v0, .L80125DCC -/* BC4AC 80125DAC 288200F0 */ slti $v0, $a0, 0xf0 -/* BC4B0 80125DB0 46020002 */ mul.s $f0, $f0, $f2 -/* BC4B4 80125DB4 00000000 */ nop -/* BC4B8 80125DB8 3C013FE0 */ lui $at, 0x3fe0 -/* BC4BC 80125DBC 44811800 */ mtc1 $at, $f3 -/* BC4C0 80125DC0 44801000 */ mtc1 $zero, $f2 -/* BC4C4 80125DC4 0804975B */ j .L80125D6C -/* BC4C8 80125DC8 46000021 */ cvt.d.s $f0, $f0 -.L80125DCC: -/* BC4CC 80125DCC 10400007 */ beqz $v0, .L80125DEC -/* BC4D0 80125DD0 00000000 */ nop -/* BC4D4 80125DD4 46020002 */ mul.s $f0, $f0, $f2 -/* BC4D8 80125DD8 00000000 */ nop -/* BC4DC 80125DDC 4600010D */ trunc.w.s $f4, $f0 -/* BC4E0 80125DE0 44022000 */ mfc1 $v0, $f4 -/* BC4E4 80125DE4 03E00008 */ jr $ra -/* BC4E8 80125DE8 00000000 */ nop -.L80125DEC: -/* BC4EC 80125DEC 03E00008 */ jr $ra -/* BC4F0 80125DF0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s b/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s deleted file mode 100644 index 9c203321b1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240000_B70860.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B70860 -/* B70860 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B70864 80240004 AFB00018 */ sw $s0, 0x18($sp) -/* B70868 80240008 0080802D */ daddu $s0, $a0, $zero -/* B7086C 8024000C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* B70870 80240010 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* B70874 80240014 AFB1001C */ sw $s1, 0x1c($sp) -/* B70878 80240018 3C118011 */ lui $s1, %hi(gPlayerData) -/* B7087C 8024001C 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* B70880 80240020 AFB20020 */ sw $s2, 0x20($sp) -/* B70884 80240024 0220902D */ daddu $s2, $s1, $zero -/* B70888 80240028 10A00004 */ beqz $a1, .L8024003C -/* B7088C 8024002C AFBF0024 */ sw $ra, 0x24($sp) -/* B70890 80240030 240200FF */ addiu $v0, $zero, 0xff -/* B70894 80240034 AE020070 */ sw $v0, 0x70($s0) -/* B70898 80240038 AE000074 */ sw $zero, 0x74($s0) -.L8024003C: -/* B7089C 8024003C 24040001 */ addiu $a0, $zero, 1 -/* B708A0 80240040 C460002C */ lwc1 $f0, 0x2c($v1) -/* B708A4 80240044 3C014100 */ lui $at, 0x4100 -/* B708A8 80240048 44811000 */ mtc1 $at, $f2 -/* B708AC 8024004C 00000000 */ nop -/* B708B0 80240050 46020000 */ add.s $f0, $f0, $f2 -/* B708B4 80240054 C4620030 */ lwc1 $f2, 0x30($v1) -/* B708B8 80240058 C4640028 */ lwc1 $f4, 0x28($v1) -/* B708BC 8024005C 4600118D */ trunc.w.s $f6, $f2 -/* B708C0 80240060 E7A60010 */ swc1 $f6, 0x10($sp) -/* B708C4 80240064 4600218D */ trunc.w.s $f6, $f4 -/* B708C8 80240068 44063000 */ mfc1 $a2, $f6 -/* B708CC 8024006C 4600018D */ trunc.w.s $f6, $f0 -/* B708D0 80240070 44073000 */ mfc1 $a3, $f6 -/* B708D4 80240074 0C04DFB0 */ jal set_screen_overlay_center_worldpos -/* B708D8 80240078 0080282D */ daddu $a1, $a0, $zero -/* B708DC 8024007C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) -/* B708E0 80240080 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) -/* B708E4 80240084 10400012 */ beqz $v0, .L802400D0 -/* B708E8 80240088 24020006 */ addiu $v0, $zero, 6 -/* B708EC 8024008C 82230012 */ lb $v1, 0x12($s1) -/* B708F0 80240090 14620022 */ bne $v1, $v0, .L8024011C -/* B708F4 80240094 00000000 */ nop -/* B708F8 80240098 8E020074 */ lw $v0, 0x74($s0) -/* B708FC 8024009C 14400004 */ bnez $v0, .L802400B0 -/* B70900 802400A0 24020001 */ addiu $v0, $zero, 1 -/* B70904 802400A4 AE020074 */ sw $v0, 0x74($s0) -/* B70908 802400A8 0C05272D */ jal sfx_play_sound -/* B7090C 802400AC 24042011 */ addiu $a0, $zero, 0x2011 -.L802400B0: -/* B70910 802400B0 8E020070 */ lw $v0, 0x70($s0) -/* B70914 802400B4 2442FFF8 */ addiu $v0, $v0, -8 -/* B70918 802400B8 AE020070 */ sw $v0, 0x70($s0) -/* B7091C 802400BC 2842005A */ slti $v0, $v0, 0x5a -/* B70920 802400C0 10400016 */ beqz $v0, .L8024011C -/* B70924 802400C4 2402005A */ addiu $v0, $zero, 0x5a -/* B70928 802400C8 08090047 */ j .L8024011C -/* B7092C 802400CC AE020070 */ sw $v0, 0x70($s0) -.L802400D0: -/* B70930 802400D0 82430012 */ lb $v1, 0x12($s2) -/* B70934 802400D4 14620010 */ bne $v1, $v0, .L80240118 -/* B70938 802400D8 240200FF */ addiu $v0, $zero, 0xff -/* B7093C 802400DC 8E020074 */ lw $v0, 0x74($s0) -/* B70940 802400E0 10400007 */ beqz $v0, .L80240100 -/* B70944 802400E4 00000000 */ nop -/* B70948 802400E8 8E020070 */ lw $v0, 0x70($s0) -/* B7094C 802400EC 284200FF */ slti $v0, $v0, 0xff -/* B70950 802400F0 10400003 */ beqz $v0, .L80240100 -/* B70954 802400F4 AE000074 */ sw $zero, 0x74($s0) -/* B70958 802400F8 0C05272D */ jal sfx_play_sound -/* B7095C 802400FC 24042012 */ addiu $a0, $zero, 0x2012 -.L80240100: -/* B70960 80240100 8E020070 */ lw $v0, 0x70($s0) -/* B70964 80240104 24420008 */ addiu $v0, $v0, 8 -/* B70968 80240108 AE020070 */ sw $v0, 0x70($s0) -/* B7096C 8024010C 284200FF */ slti $v0, $v0, 0xff -/* B70970 80240110 14400002 */ bnez $v0, .L8024011C -/* B70974 80240114 240200FF */ addiu $v0, $zero, 0xff -.L80240118: -/* B70978 80240118 AE020070 */ sw $v0, 0x70($s0) -.L8024011C: -/* B7097C 8024011C C6060070 */ lwc1 $f6, 0x70($s0) -/* B70980 80240120 468031A0 */ cvt.s.w $f6, $f6 -/* B70984 80240124 44053000 */ mfc1 $a1, $f6 -/* B70988 80240128 0C04E035 */ jal set_screen_overlay_alpha -/* B7098C 8024012C 24040001 */ addiu $a0, $zero, 1 -/* B70990 80240130 3C05437F */ lui $a1, 0x437f -/* B70994 80240134 0C04DF69 */ jal set_screen_overlay_params_back -/* B70998 80240138 2404000B */ addiu $a0, $zero, 0xb -/* B7099C 8024013C 8FBF0024 */ lw $ra, 0x24($sp) -/* B709A0 80240140 8FB20020 */ lw $s2, 0x20($sp) -/* B709A4 80240144 8FB1001C */ lw $s1, 0x1c($sp) -/* B709A8 80240148 8FB00018 */ lw $s0, 0x18($sp) -/* B709AC 8024014C 0000102D */ daddu $v0, $zero, $zero -/* B709B0 80240150 03E00008 */ jr $ra -/* B709B4 80240154 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s deleted file mode 100644 index f726ebec93..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9A10/func_80240000_8A9A10.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8A9A10 -/* 8A9A10 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8A9A14 80240004 AFB00018 */ sw $s0, 0x18($sp) -/* 8A9A18 80240008 0080802D */ daddu $s0, $a0, $zero -/* 8A9A1C 8024000C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8A9A20 80240010 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8A9A24 80240014 AFB1001C */ sw $s1, 0x1c($sp) -/* 8A9A28 80240018 3C118011 */ lui $s1, %hi(gPlayerData) -/* 8A9A2C 8024001C 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* 8A9A30 80240020 AFB20020 */ sw $s2, 0x20($sp) -/* 8A9A34 80240024 0220902D */ daddu $s2, $s1, $zero -/* 8A9A38 80240028 10A00004 */ beqz $a1, .L8024003C -/* 8A9A3C 8024002C AFBF0024 */ sw $ra, 0x24($sp) -/* 8A9A40 80240030 240200FF */ addiu $v0, $zero, 0xff -/* 8A9A44 80240034 AE020070 */ sw $v0, 0x70($s0) -/* 8A9A48 80240038 AE000074 */ sw $zero, 0x74($s0) -.L8024003C: -/* 8A9A4C 8024003C 24040001 */ addiu $a0, $zero, 1 -/* 8A9A50 80240040 C460002C */ lwc1 $f0, 0x2c($v1) -/* 8A9A54 80240044 3C014100 */ lui $at, 0x4100 -/* 8A9A58 80240048 44811000 */ mtc1 $at, $f2 -/* 8A9A5C 8024004C 00000000 */ nop -/* 8A9A60 80240050 46020000 */ add.s $f0, $f0, $f2 -/* 8A9A64 80240054 C4620030 */ lwc1 $f2, 0x30($v1) -/* 8A9A68 80240058 C4640028 */ lwc1 $f4, 0x28($v1) -/* 8A9A6C 8024005C 4600118D */ trunc.w.s $f6, $f2 -/* 8A9A70 80240060 E7A60010 */ swc1 $f6, 0x10($sp) -/* 8A9A74 80240064 4600218D */ trunc.w.s $f6, $f4 -/* 8A9A78 80240068 44063000 */ mfc1 $a2, $f6 -/* 8A9A7C 8024006C 4600018D */ trunc.w.s $f6, $f0 -/* 8A9A80 80240070 44073000 */ mfc1 $a3, $f6 -/* 8A9A84 80240074 0C04DFB0 */ jal set_screen_overlay_center_worldpos -/* 8A9A88 80240078 0080282D */ daddu $a1, $a0, $zero -/* 8A9A8C 8024007C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) -/* 8A9A90 80240080 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) -/* 8A9A94 80240084 10400012 */ beqz $v0, .L802400D0 -/* 8A9A98 80240088 24020006 */ addiu $v0, $zero, 6 -/* 8A9A9C 8024008C 82230012 */ lb $v1, 0x12($s1) -/* 8A9AA0 80240090 14620022 */ bne $v1, $v0, .L8024011C -/* 8A9AA4 80240094 00000000 */ nop -/* 8A9AA8 80240098 8E020074 */ lw $v0, 0x74($s0) -/* 8A9AAC 8024009C 14400004 */ bnez $v0, .L802400B0 -/* 8A9AB0 802400A0 24020001 */ addiu $v0, $zero, 1 -/* 8A9AB4 802400A4 AE020074 */ sw $v0, 0x74($s0) -/* 8A9AB8 802400A8 0C05272D */ jal sfx_play_sound -/* 8A9ABC 802400AC 24042011 */ addiu $a0, $zero, 0x2011 -.L802400B0: -/* 8A9AC0 802400B0 8E020070 */ lw $v0, 0x70($s0) -/* 8A9AC4 802400B4 2442FFF8 */ addiu $v0, $v0, -8 -/* 8A9AC8 802400B8 AE020070 */ sw $v0, 0x70($s0) -/* 8A9ACC 802400BC 2842005A */ slti $v0, $v0, 0x5a -/* 8A9AD0 802400C0 10400016 */ beqz $v0, .L8024011C -/* 8A9AD4 802400C4 2402005A */ addiu $v0, $zero, 0x5a -/* 8A9AD8 802400C8 08090047 */ j .L8024011C -/* 8A9ADC 802400CC AE020070 */ sw $v0, 0x70($s0) -.L802400D0: -/* 8A9AE0 802400D0 82430012 */ lb $v1, 0x12($s2) -/* 8A9AE4 802400D4 14620010 */ bne $v1, $v0, .L80240118 -/* 8A9AE8 802400D8 240200FF */ addiu $v0, $zero, 0xff -/* 8A9AEC 802400DC 8E020074 */ lw $v0, 0x74($s0) -/* 8A9AF0 802400E0 10400007 */ beqz $v0, .L80240100 -/* 8A9AF4 802400E4 00000000 */ nop -/* 8A9AF8 802400E8 8E020070 */ lw $v0, 0x70($s0) -/* 8A9AFC 802400EC 284200FF */ slti $v0, $v0, 0xff -/* 8A9B00 802400F0 10400003 */ beqz $v0, .L80240100 -/* 8A9B04 802400F4 AE000074 */ sw $zero, 0x74($s0) -/* 8A9B08 802400F8 0C05272D */ jal sfx_play_sound -/* 8A9B0C 802400FC 24042012 */ addiu $a0, $zero, 0x2012 -.L80240100: -/* 8A9B10 80240100 8E020070 */ lw $v0, 0x70($s0) -/* 8A9B14 80240104 24420008 */ addiu $v0, $v0, 8 -/* 8A9B18 80240108 AE020070 */ sw $v0, 0x70($s0) -/* 8A9B1C 8024010C 284200FF */ slti $v0, $v0, 0xff -/* 8A9B20 80240110 14400002 */ bnez $v0, .L8024011C -/* 8A9B24 80240114 240200FF */ addiu $v0, $zero, 0xff -.L80240118: -/* 8A9B28 80240118 AE020070 */ sw $v0, 0x70($s0) -.L8024011C: -/* 8A9B2C 8024011C C6060070 */ lwc1 $f6, 0x70($s0) -/* 8A9B30 80240120 468031A0 */ cvt.s.w $f6, $f6 -/* 8A9B34 80240124 44053000 */ mfc1 $a1, $f6 -/* 8A9B38 80240128 0C04E035 */ jal set_screen_overlay_alpha -/* 8A9B3C 8024012C 24040001 */ addiu $a0, $zero, 1 -/* 8A9B40 80240130 3C05437F */ lui $a1, 0x437f -/* 8A9B44 80240134 0C04DF69 */ jal set_screen_overlay_params_back -/* 8A9B48 80240138 2404000B */ addiu $a0, $zero, 0xb -/* 8A9B4C 8024013C 8FBF0024 */ lw $ra, 0x24($sp) -/* 8A9B50 80240140 8FB20020 */ lw $s2, 0x20($sp) -/* 8A9B54 80240144 8FB1001C */ lw $s1, 0x1c($sp) -/* 8A9B58 80240148 8FB00018 */ lw $s0, 0x18($sp) -/* 8A9B5C 8024014C 0000102D */ daddu $v0, $zero, $zero -/* 8A9B60 80240150 03E00008 */ jr $ra -/* 8A9B64 80240154 27BD0028 */ addiu $sp, $sp, 0x28 -/* 8A9B68 80240158 00000000 */ nop -/* 8A9B6C 8024015C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s deleted file mode 100644 index 5952e5e529..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s +++ /dev/null @@ -1,141 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80240A30_8AA440 -.double 0.06 - -.section .text - -glabel func_80240160_8A9B70 -/* 8A9B70 80240160 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8A9B74 80240164 AFB60028 */ sw $s6, 0x28($sp) -/* 8A9B78 80240168 00C0B02D */ daddu $s6, $a2, $zero -/* 8A9B7C 8024016C AFB7002C */ sw $s7, 0x2c($sp) -/* 8A9B80 80240170 00E0B82D */ daddu $s7, $a3, $zero -/* 8A9B84 80240174 AFB20018 */ sw $s2, 0x18($sp) -/* 8A9B88 80240178 0000902D */ daddu $s2, $zero, $zero -/* 8A9B8C 8024017C AFB50024 */ sw $s5, 0x24($sp) -/* 8A9B90 80240180 3C158011 */ lui $s5, %hi(gPlayerStatus) -/* 8A9B94 80240184 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus) -/* 8A9B98 80240188 AFBF0030 */ sw $ra, 0x30($sp) -/* 8A9B9C 8024018C AFB40020 */ sw $s4, 0x20($sp) -/* 8A9BA0 80240190 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A9BA4 80240194 AFB10014 */ sw $s1, 0x14($sp) -/* 8A9BA8 80240198 1AC00063 */ blez $s6, .L80240328 -/* 8A9BAC 8024019C AFB00010 */ sw $s0, 0x10($sp) -/* 8A9BB0 802401A0 3C1451EB */ lui $s4, 0x51eb -/* 8A9BB4 802401A4 3694851F */ ori $s4, $s4, 0x851f -/* 8A9BB8 802401A8 00A0882D */ daddu $s1, $a1, $zero -/* 8A9BBC 802401AC 0080982D */ daddu $s3, $a0, $zero -.L802401B0: -/* 8A9BC0 802401B0 86220000 */ lh $v0, ($s1) -/* 8A9BC4 802401B4 C6A00028 */ lwc1 $f0, 0x28($s5) -/* 8A9BC8 802401B8 44826000 */ mtc1 $v0, $f12 -/* 8A9BCC 802401BC 00000000 */ nop -/* 8A9BD0 802401C0 46806320 */ cvt.s.w $f12, $f12 -/* 8A9BD4 802401C4 46006001 */ sub.s $f0, $f12, $f0 -/* 8A9BD8 802401C8 4600018D */ trunc.w.s $f6, $f0 -/* 8A9BDC 802401CC 44023000 */ mfc1 $v0, $f6 -/* 8A9BE0 802401D0 00000000 */ nop -/* 8A9BE4 802401D4 00420018 */ mult $v0, $v0 -/* 8A9BE8 802401D8 86220004 */ lh $v0, 4($s1) -/* 8A9BEC 802401DC C6A00030 */ lwc1 $f0, 0x30($s5) -/* 8A9BF0 802401E0 44821000 */ mtc1 $v0, $f2 -/* 8A9BF4 802401E4 00000000 */ nop -/* 8A9BF8 802401E8 468010A0 */ cvt.s.w $f2, $f2 -/* 8A9BFC 802401EC 46001001 */ sub.s $f0, $f2, $f0 -/* 8A9C00 802401F0 00001812 */ mflo $v1 -/* 8A9C04 802401F4 4600018D */ trunc.w.s $f6, $f0 -/* 8A9C08 802401F8 44023000 */ mfc1 $v0, $f6 -/* 8A9C0C 802401FC 00000000 */ nop -/* 8A9C10 80240200 00420018 */ mult $v0, $v0 -/* 8A9C14 80240204 00001012 */ mflo $v0 -/* 8A9C18 80240208 00621021 */ addu $v0, $v1, $v0 -/* 8A9C1C 8024020C 00000000 */ nop -/* 8A9C20 80240210 00540018 */ mult $v0, $s4 -/* 8A9C24 80240214 000217C3 */ sra $v0, $v0, 0x1f -/* 8A9C28 80240218 00001810 */ mfhi $v1 -/* 8A9C2C 8024021C 00031943 */ sra $v1, $v1, 5 -/* 8A9C30 80240220 00628023 */ subu $s0, $v1, $v0 -/* 8A9C34 80240224 2A02000B */ slti $v0, $s0, 0xb -/* 8A9C38 80240228 50400001 */ beql $v0, $zero, .L80240230 -/* 8A9C3C 8024022C 2410000A */ addiu $s0, $zero, 0xa -.L80240230: -/* 8A9C40 80240230 3C018024 */ lui $at, %hi(D_80240A30_8AA440) -/* 8A9C44 80240234 D4200A30 */ ldc1 $f0, %lo(D_80240A30_8AA440)($at) -/* 8A9C48 80240238 46006321 */ cvt.d.s $f12, $f12 -/* 8A9C4C 8024023C 46206302 */ mul.d $f12, $f12, $f0 -/* 8A9C50 80240240 00000000 */ nop -/* 8A9C54 80240244 3C013CF5 */ lui $at, 0x3cf5 -/* 8A9C58 80240248 3421C28F */ ori $at, $at, 0xc28f -/* 8A9C5C 8024024C 44810000 */ mtc1 $at, $f0 -/* 8A9C60 80240250 00000000 */ nop -/* 8A9C64 80240254 46001002 */ mul.s $f0, $f2, $f0 -/* 8A9C68 80240258 00000000 */ nop -/* 8A9C6C 8024025C 3C013C23 */ lui $at, 0x3c23 -/* 8A9C70 80240260 3421D70A */ ori $at, $at, 0xd70a -/* 8A9C74 80240264 44812000 */ mtc1 $at, $f4 -/* 8A9C78 80240268 44971000 */ mtc1 $s7, $f2 -/* 8A9C7C 8024026C 00000000 */ nop -/* 8A9C80 80240270 468010A0 */ cvt.s.w $f2, $f2 -/* 8A9C84 80240274 46041082 */ mul.s $f2, $f2, $f4 -/* 8A9C88 80240278 00000000 */ nop -/* 8A9C8C 8024027C 46000021 */ cvt.d.s $f0, $f0 -/* 8A9C90 80240280 46206300 */ add.d $f12, $f12, $f0 -/* 8A9C94 80240284 001017C2 */ srl $v0, $s0, 0x1f -/* 8A9C98 80240288 460010A1 */ cvt.d.s $f2, $f2 -/* 8A9C9C 8024028C 46226300 */ add.d $f12, $f12, $f2 -/* 8A9CA0 80240290 02021021 */ addu $v0, $s0, $v0 -/* 8A9CA4 80240294 00028043 */ sra $s0, $v0, 1 -/* 8A9CA8 80240298 0C00A85B */ jal sin_rad -/* 8A9CAC 8024029C 46206320 */ cvt.s.d $f12, $f12 -/* 8A9CB0 802402A0 46000000 */ add.s $f0, $f0, $f0 -/* 8A9CB4 802402A4 3C014000 */ lui $at, 0x4000 -/* 8A9CB8 802402A8 44811000 */ mtc1 $at, $f2 -/* 8A9CBC 802402AC 00000000 */ nop -/* 8A9CC0 802402B0 46020000 */ add.s $f0, $f0, $f2 -/* 8A9CC4 802402B4 4600018D */ trunc.w.s $f6, $f0 -/* 8A9CC8 802402B8 44033000 */ mfc1 $v1, $f6 -/* 8A9CCC 802402BC 00000000 */ nop -/* 8A9CD0 802402C0 02038021 */ addu $s0, $s0, $v1 -/* 8A9CD4 802402C4 86230000 */ lh $v1, ($s1) -/* 8A9CD8 802402C8 240200C8 */ addiu $v0, $zero, 0xc8 -/* 8A9CDC 802402CC 00431823 */ subu $v1, $v0, $v1 -/* 8A9CE0 802402D0 04620001 */ bltzl $v1, .L802402D8 -/* 8A9CE4 802402D4 0000182D */ daddu $v1, $zero, $zero -.L802402D8: -/* 8A9CE8 802402D8 28620065 */ slti $v0, $v1, 0x65 -/* 8A9CEC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 8A9CF0 802402E0 24030064 */ addiu $v1, $zero, 0x64 -.L802402E4: -/* 8A9CF4 802402E4 02030018 */ mult $s0, $v1 -/* 8A9CF8 802402E8 00001012 */ mflo $v0 -/* 8A9CFC 802402EC 00000000 */ nop -/* 8A9D00 802402F0 00000000 */ nop -/* 8A9D04 802402F4 00540018 */ mult $v0, $s4 -/* 8A9D08 802402F8 96640002 */ lhu $a0, 2($s3) -/* 8A9D0C 802402FC 26730010 */ addiu $s3, $s3, 0x10 -/* 8A9D10 80240300 26520001 */ addiu $s2, $s2, 1 -/* 8A9D14 80240304 000217C3 */ sra $v0, $v0, 0x1f -/* 8A9D18 80240308 00001810 */ mfhi $v1 -/* 8A9D1C 8024030C 00031943 */ sra $v1, $v1, 5 -/* 8A9D20 80240310 00628023 */ subu $s0, $v1, $v0 -/* 8A9D24 80240314 00902021 */ addu $a0, $a0, $s0 -/* 8A9D28 80240318 A6240002 */ sh $a0, 2($s1) -/* 8A9D2C 8024031C 0256102A */ slt $v0, $s2, $s6 -/* 8A9D30 80240320 1440FFA3 */ bnez $v0, .L802401B0 -/* 8A9D34 80240324 26310010 */ addiu $s1, $s1, 0x10 -.L80240328: -/* 8A9D38 80240328 8FBF0030 */ lw $ra, 0x30($sp) -/* 8A9D3C 8024032C 8FB7002C */ lw $s7, 0x2c($sp) -/* 8A9D40 80240330 8FB60028 */ lw $s6, 0x28($sp) -/* 8A9D44 80240334 8FB50024 */ lw $s5, 0x24($sp) -/* 8A9D48 80240338 8FB40020 */ lw $s4, 0x20($sp) -/* 8A9D4C 8024033C 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A9D50 80240340 8FB20018 */ lw $s2, 0x18($sp) -/* 8A9D54 80240344 8FB10014 */ lw $s1, 0x14($sp) -/* 8A9D58 80240348 8FB00010 */ lw $s0, 0x10($sp) -/* 8A9D5C 8024034C 03E00008 */ jr $ra -/* 8A9D60 80240350 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s deleted file mode 100644 index 6d1ec577c8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240354_8A9D64 -/* 8A9D64 80240354 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8A9D68 80240358 24040001 */ addiu $a0, $zero, 1 -/* 8A9D6C 8024035C 27A50010 */ addiu $a1, $sp, 0x10 -/* 8A9D70 80240360 27A60014 */ addiu $a2, $sp, 0x14 -/* 8A9D74 80240364 27A70018 */ addiu $a3, $sp, 0x18 -/* 8A9D78 80240368 AFBF0028 */ sw $ra, 0x28($sp) -/* 8A9D7C 8024036C AFB10024 */ sw $s1, 0x24($sp) -/* 8A9D80 80240370 0C0470AC */ jal mdl_get_copied_vertices -/* 8A9D84 80240374 AFB00020 */ sw $s0, 0x20($sp) -/* 8A9D88 80240378 3C108024 */ lui $s0, %hi(D_802407C0_8AA1D0) -/* 8A9D8C 8024037C 261007C0 */ addiu $s0, $s0, %lo(D_802407C0_8AA1D0) -/* 8A9D90 80240380 8FA40010 */ lw $a0, 0x10($sp) -/* 8A9D94 80240384 8FA50014 */ lw $a1, 0x14($sp) -/* 8A9D98 80240388 8FA60018 */ lw $a2, 0x18($sp) -/* 8A9D9C 8024038C 0C090058 */ jal func_80240160_8A9B70 -/* 8A9DA0 80240390 96070000 */ lhu $a3, ($s0) -/* 8A9DA4 80240394 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 8A9DA8 80240398 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* 8A9DAC 8024039C 8C620000 */ lw $v0, ($v1) -/* 8A9DB0 802403A0 24040001 */ addiu $a0, $zero, 1 -/* 8A9DB4 802403A4 0040882D */ daddu $s1, $v0, $zero -/* 8A9DB8 802403A8 24420008 */ addiu $v0, $v0, 8 -/* 8A9DBC 802403AC AC620000 */ sw $v0, ($v1) -/* 8A9DC0 802403B0 3C02DE00 */ lui $v0, 0xde00 -/* 8A9DC4 802403B4 0C0470BB */ jal mdl_get_copied_gfx -/* 8A9DC8 802403B8 AE220000 */ sw $v0, ($s1) -/* 8A9DCC 802403BC 96030000 */ lhu $v1, ($s0) -/* 8A9DD0 802403C0 AE220004 */ sw $v0, 4($s1) -/* 8A9DD4 802403C4 2463000A */ addiu $v1, $v1, 0xa -/* 8A9DD8 802403C8 A6030000 */ sh $v1, ($s0) -/* 8A9DDC 802403CC 8FBF0028 */ lw $ra, 0x28($sp) -/* 8A9DE0 802403D0 8FB10024 */ lw $s1, 0x24($sp) -/* 8A9DE4 802403D4 8FB00020 */ lw $s0, 0x20($sp) -/* 8A9DE8 802403D8 03E00008 */ jr $ra -/* 8A9DEC 802403DC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s deleted file mode 100644 index 2f75844627..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80240A38_8AA448 -.double 0.06 - -.section .text - -glabel func_802403E0_8A9DF0 -/* 8A9DF0 802403E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A9DF4 802403E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8A9DF8 802403E8 0080802D */ daddu $s0, $a0, $zero -/* 8A9DFC 802403EC AFBF0014 */ sw $ra, 0x14($sp) -/* 8A9E00 802403F0 C60C0084 */ lwc1 $f12, 0x84($s0) -/* 8A9E04 802403F4 46806320 */ cvt.s.w $f12, $f12 -/* 8A9E08 802403F8 3C018024 */ lui $at, %hi(D_80240A38_8AA448) -/* 8A9E0C 802403FC D4200A38 */ ldc1 $f0, %lo(D_80240A38_8AA448)($at) -/* 8A9E10 80240400 46006321 */ cvt.d.s $f12, $f12 -/* 8A9E14 80240404 46206302 */ mul.d $f12, $f12, $f0 -/* 8A9E18 80240408 00000000 */ nop -/* 8A9E1C 8024040C 3C013CF5 */ lui $at, 0x3cf5 -/* 8A9E20 80240410 3421C28F */ ori $at, $at, 0xc28f -/* 8A9E24 80240414 44810000 */ mtc1 $at, $f0 -/* 8A9E28 80240418 C602008C */ lwc1 $f2, 0x8c($s0) -/* 8A9E2C 8024041C 468010A0 */ cvt.s.w $f2, $f2 -/* 8A9E30 80240420 46001082 */ mul.s $f2, $f2, $f0 -/* 8A9E34 80240424 00000000 */ nop -/* 8A9E38 80240428 3C028024 */ lui $v0, %hi(D_802407C0_8AA1D0) -/* 8A9E3C 8024042C 944207C0 */ lhu $v0, %lo(D_802407C0_8AA1D0)($v0) -/* 8A9E40 80240430 3C013C23 */ lui $at, 0x3c23 -/* 8A9E44 80240434 3421D70A */ ori $at, $at, 0xd70a -/* 8A9E48 80240438 44812000 */ mtc1 $at, $f4 -/* 8A9E4C 8024043C 44820000 */ mtc1 $v0, $f0 -/* 8A9E50 80240440 00000000 */ nop -/* 8A9E54 80240444 46800020 */ cvt.s.w $f0, $f0 -/* 8A9E58 80240448 46040002 */ mul.s $f0, $f0, $f4 -/* 8A9E5C 8024044C 00000000 */ nop -/* 8A9E60 80240450 460010A1 */ cvt.d.s $f2, $f2 -/* 8A9E64 80240454 46226300 */ add.d $f12, $f12, $f2 -/* 8A9E68 80240458 46000021 */ cvt.d.s $f0, $f0 -/* 8A9E6C 8024045C 46206300 */ add.d $f12, $f12, $f0 -/* 8A9E70 80240460 0C00A85B */ jal sin_rad -/* 8A9E74 80240464 46206320 */ cvt.s.d $f12, $f12 -/* 8A9E78 80240468 46000180 */ add.s $f6, $f0, $f0 -/* 8A9E7C 8024046C 3C014348 */ lui $at, 0x4348 -/* 8A9E80 80240470 44811000 */ mtc1 $at, $f2 -/* 8A9E84 80240474 C6000084 */ lwc1 $f0, 0x84($s0) -/* 8A9E88 80240478 46800020 */ cvt.s.w $f0, $f0 -/* 8A9E8C 8024047C 46001081 */ sub.s $f2, $f2, $f0 -/* 8A9E90 80240480 44800000 */ mtc1 $zero, $f0 -/* 8A9E94 80240484 00000000 */ nop -/* 8A9E98 80240488 4600103C */ c.lt.s $f2, $f0 -/* 8A9E9C 8024048C 00000000 */ nop -/* 8A9EA0 80240490 45030001 */ bc1tl .L80240498 -/* 8A9EA4 80240494 46000086 */ mov.s $f2, $f0 -.L80240498: -/* 8A9EA8 80240498 3C0142C8 */ lui $at, 0x42c8 -/* 8A9EAC 8024049C 44812000 */ mtc1 $at, $f4 -/* 8A9EB0 802404A0 00000000 */ nop -/* 8A9EB4 802404A4 4602203C */ c.lt.s $f4, $f2 -/* 8A9EB8 802404A8 00000000 */ nop -/* 8A9EBC 802404AC 45030001 */ bc1tl .L802404B4 -/* 8A9EC0 802404B0 46002086 */ mov.s $f2, $f4 -.L802404B4: -/* 8A9EC4 802404B4 46023082 */ mul.s $f2, $f6, $f2 -/* 8A9EC8 802404B8 00000000 */ nop -/* 8A9ECC 802404BC 3C014480 */ lui $at, 0x4480 -/* 8A9ED0 802404C0 44810000 */ mtc1 $at, $f0 -/* 8A9ED4 802404C4 46041183 */ div.s $f6, $f2, $f4 -/* 8A9ED8 802404C8 46003002 */ mul.s $f0, $f6, $f0 -/* 8A9EDC 802404CC 00000000 */ nop -/* 8A9EE0 802404D0 3C01CD5B */ lui $at, 0xcd5b -/* 8A9EE4 802404D4 34215858 */ ori $at, $at, 0x5858 -/* 8A9EE8 802404D8 44811000 */ mtc1 $at, $f2 -/* 8A9EEC 802404DC 00000000 */ nop -/* 8A9EF0 802404E0 46020000 */ add.s $f0, $f0, $f2 -/* 8A9EF4 802404E4 4600020D */ trunc.w.s $f8, $f0 -/* 8A9EF8 802404E8 E6080084 */ swc1 $f8, 0x84($s0) -/* 8A9EFC 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A9F00 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* 8A9F04 802404F4 24020002 */ addiu $v0, $zero, 2 -/* 8A9F08 802404F8 03E00008 */ jr $ra -/* 8A9F0C 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500_8A9F10.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500_8A9F10.s deleted file mode 100644 index 45b3780c71..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500_8A9F10.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_8A9F10 -/* 8A9F10 80240500 3C028016 */ lui $v0, %hi(gCollisionStatus+0x18) -/* 8A9F14 80240504 8442A568 */ lh $v0, %lo(gCollisionStatus+0x18)($v0) -/* 8A9F18 80240508 04400002 */ bltz $v0, .L80240514 -/* 8A9F1C 8024050C 24020001 */ addiu $v0, $zero, 1 -/* 8A9F20 80240510 AC820088 */ sw $v0, 0x88($a0) -.L80240514: -/* 8A9F24 80240514 03E00008 */ jr $ra -/* 8A9F28 80240518 24020002 */ addiu $v0, $zero, 2 -/* 8A9F2C 8024051C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s deleted file mode 100644 index 1103cda0e6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA450/func_80240000_8AA450.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8AA450 -/* 8AA450 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8AA454 80240004 AFB00018 */ sw $s0, 0x18($sp) -/* 8AA458 80240008 0080802D */ daddu $s0, $a0, $zero -/* 8AA45C 8024000C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8AA460 80240010 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8AA464 80240014 AFB1001C */ sw $s1, 0x1c($sp) -/* 8AA468 80240018 3C118011 */ lui $s1, %hi(gPlayerData) -/* 8AA46C 8024001C 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* 8AA470 80240020 AFB20020 */ sw $s2, 0x20($sp) -/* 8AA474 80240024 0220902D */ daddu $s2, $s1, $zero -/* 8AA478 80240028 10A00004 */ beqz $a1, .L8024003C -/* 8AA47C 8024002C AFBF0024 */ sw $ra, 0x24($sp) -/* 8AA480 80240030 240200FF */ addiu $v0, $zero, 0xff -/* 8AA484 80240034 AE020070 */ sw $v0, 0x70($s0) -/* 8AA488 80240038 AE000074 */ sw $zero, 0x74($s0) -.L8024003C: -/* 8AA48C 8024003C 24040001 */ addiu $a0, $zero, 1 -/* 8AA490 80240040 C460002C */ lwc1 $f0, 0x2c($v1) -/* 8AA494 80240044 3C014100 */ lui $at, 0x4100 -/* 8AA498 80240048 44811000 */ mtc1 $at, $f2 -/* 8AA49C 8024004C 00000000 */ nop -/* 8AA4A0 80240050 46020000 */ add.s $f0, $f0, $f2 -/* 8AA4A4 80240054 C4620030 */ lwc1 $f2, 0x30($v1) -/* 8AA4A8 80240058 C4640028 */ lwc1 $f4, 0x28($v1) -/* 8AA4AC 8024005C 4600118D */ trunc.w.s $f6, $f2 -/* 8AA4B0 80240060 E7A60010 */ swc1 $f6, 0x10($sp) -/* 8AA4B4 80240064 4600218D */ trunc.w.s $f6, $f4 -/* 8AA4B8 80240068 44063000 */ mfc1 $a2, $f6 -/* 8AA4BC 8024006C 4600018D */ trunc.w.s $f6, $f0 -/* 8AA4C0 80240070 44073000 */ mfc1 $a3, $f6 -/* 8AA4C4 80240074 0C04DFB0 */ jal set_screen_overlay_center_worldpos -/* 8AA4C8 80240078 0080282D */ daddu $a1, $a0, $zero -/* 8AA4CC 8024007C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) -/* 8AA4D0 80240080 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) -/* 8AA4D4 80240084 10400012 */ beqz $v0, .L802400D0 -/* 8AA4D8 80240088 24020006 */ addiu $v0, $zero, 6 -/* 8AA4DC 8024008C 82230012 */ lb $v1, 0x12($s1) -/* 8AA4E0 80240090 14620022 */ bne $v1, $v0, .L8024011C -/* 8AA4E4 80240094 00000000 */ nop -/* 8AA4E8 80240098 8E020074 */ lw $v0, 0x74($s0) -/* 8AA4EC 8024009C 14400004 */ bnez $v0, .L802400B0 -/* 8AA4F0 802400A0 24020001 */ addiu $v0, $zero, 1 -/* 8AA4F4 802400A4 AE020074 */ sw $v0, 0x74($s0) -/* 8AA4F8 802400A8 0C05272D */ jal sfx_play_sound -/* 8AA4FC 802400AC 24042011 */ addiu $a0, $zero, 0x2011 -.L802400B0: -/* 8AA500 802400B0 8E020070 */ lw $v0, 0x70($s0) -/* 8AA504 802400B4 2442FFF8 */ addiu $v0, $v0, -8 -/* 8AA508 802400B8 AE020070 */ sw $v0, 0x70($s0) -/* 8AA50C 802400BC 2842005A */ slti $v0, $v0, 0x5a -/* 8AA510 802400C0 10400016 */ beqz $v0, .L8024011C -/* 8AA514 802400C4 2402005A */ addiu $v0, $zero, 0x5a -/* 8AA518 802400C8 08090047 */ j .L8024011C -/* 8AA51C 802400CC AE020070 */ sw $v0, 0x70($s0) -.L802400D0: -/* 8AA520 802400D0 82430012 */ lb $v1, 0x12($s2) -/* 8AA524 802400D4 14620010 */ bne $v1, $v0, .L80240118 -/* 8AA528 802400D8 240200FF */ addiu $v0, $zero, 0xff -/* 8AA52C 802400DC 8E020074 */ lw $v0, 0x74($s0) -/* 8AA530 802400E0 10400007 */ beqz $v0, .L80240100 -/* 8AA534 802400E4 00000000 */ nop -/* 8AA538 802400E8 8E020070 */ lw $v0, 0x70($s0) -/* 8AA53C 802400EC 284200FF */ slti $v0, $v0, 0xff -/* 8AA540 802400F0 10400003 */ beqz $v0, .L80240100 -/* 8AA544 802400F4 AE000074 */ sw $zero, 0x74($s0) -/* 8AA548 802400F8 0C05272D */ jal sfx_play_sound -/* 8AA54C 802400FC 24042012 */ addiu $a0, $zero, 0x2012 -.L80240100: -/* 8AA550 80240100 8E020070 */ lw $v0, 0x70($s0) -/* 8AA554 80240104 24420008 */ addiu $v0, $v0, 8 -/* 8AA558 80240108 AE020070 */ sw $v0, 0x70($s0) -/* 8AA55C 8024010C 284200FF */ slti $v0, $v0, 0xff -/* 8AA560 80240110 14400002 */ bnez $v0, .L8024011C -/* 8AA564 80240114 240200FF */ addiu $v0, $zero, 0xff -.L80240118: -/* 8AA568 80240118 AE020070 */ sw $v0, 0x70($s0) -.L8024011C: -/* 8AA56C 8024011C C6060070 */ lwc1 $f6, 0x70($s0) -/* 8AA570 80240120 468031A0 */ cvt.s.w $f6, $f6 -/* 8AA574 80240124 44053000 */ mfc1 $a1, $f6 -/* 8AA578 80240128 0C04E035 */ jal set_screen_overlay_alpha -/* 8AA57C 8024012C 24040001 */ addiu $a0, $zero, 1 -/* 8AA580 80240130 3C05437F */ lui $a1, 0x437f -/* 8AA584 80240134 0C04DF69 */ jal set_screen_overlay_params_back -/* 8AA588 80240138 2404000B */ addiu $a0, $zero, 0xb -/* 8AA58C 8024013C 8FBF0024 */ lw $ra, 0x24($sp) -/* 8AA590 80240140 8FB20020 */ lw $s2, 0x20($sp) -/* 8AA594 80240144 8FB1001C */ lw $s1, 0x1c($sp) -/* 8AA598 80240148 8FB00018 */ lw $s0, 0x18($sp) -/* 8AA59C 8024014C 0000102D */ daddu $v0, $zero, $zero -/* 8AA5A0 80240150 03E00008 */ jr $ra -/* 8AA5A4 80240154 27BD0028 */ addiu $sp, $sp, 0x28 -/* 8AA5A8 80240158 00000000 */ nop -/* 8AA5AC 8024015C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s deleted file mode 100644 index 231a5cd7b4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_8AAB80 -/* 8AAB80 80240730 3C028011 */ lui $v0, %hi(gPartnerActionStatus+0x3) -/* 8AAB84 80240734 8042EBB3 */ lb $v0, %lo(gPartnerActionStatus+0x3)($v0) -/* 8AAB88 80240738 38420006 */ xori $v0, $v0, 6 -/* 8AAB8C 8024073C 2C420001 */ sltiu $v0, $v0, 1 -/* 8AAB90 80240740 03E00008 */ jr $ra -/* 8AAB94 80240744 00021040 */ sll $v0, $v0, 1 diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s deleted file mode 100644 index 657329f6cc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240748_8AAB98 -/* 8AAB98 80240748 3C028011 */ lui $v0, %hi(gPartnerActionStatus+0x3) -/* 8AAB9C 8024074C 8042EBB3 */ lb $v0, %lo(gPartnerActionStatus+0x3)($v0) -/* 8AABA0 80240750 38420006 */ xori $v0, $v0, 6 -/* 8AABA4 80240754 0002102B */ sltu $v0, $zero, $v0 -/* 8AABA8 80240758 03E00008 */ jr $ra -/* 8AABAC 8024075C 00021040 */ sll $v0, $v0, 1 diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240760_8AABB0.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240760_8AABB0.s deleted file mode 100644 index 868738c66f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240760_8AABB0.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240760_8AABB0 -/* 8AABB0 80240760 3C028016 */ lui $v0, %hi(gCollisionStatus+0x18) -/* 8AABB4 80240764 8442A568 */ lh $v0, %lo(gCollisionStatus+0x18)($v0) -/* 8AABB8 80240768 04400002 */ bltz $v0, .L80240774 -/* 8AABBC 8024076C 24020001 */ addiu $v0, $zero, 1 -/* 8AABC0 80240770 AC820088 */ sw $v0, 0x88($a0) -.L80240774: -/* 8AABC4 80240774 03E00008 */ jr $ra -/* 8AABC8 80240778 24020002 */ addiu $v0, $zero, 2 -/* 8AABCC 8024077C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s deleted file mode 100644 index bc5a8e6642..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A46F60/func_80240000_A46F60.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A46F60 -/* A46F60 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A46F64 80240004 AFB00018 */ sw $s0, 0x18($sp) -/* A46F68 80240008 0080802D */ daddu $s0, $a0, $zero -/* A46F6C 8024000C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* A46F70 80240010 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* A46F74 80240014 AFB1001C */ sw $s1, 0x1c($sp) -/* A46F78 80240018 3C118011 */ lui $s1, %hi(gPlayerData) -/* A46F7C 8024001C 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* A46F80 80240020 AFB20020 */ sw $s2, 0x20($sp) -/* A46F84 80240024 0220902D */ daddu $s2, $s1, $zero -/* A46F88 80240028 10A00004 */ beqz $a1, .L8024003C -/* A46F8C 8024002C AFBF0024 */ sw $ra, 0x24($sp) -/* A46F90 80240030 240200FF */ addiu $v0, $zero, 0xff -/* A46F94 80240034 AE020070 */ sw $v0, 0x70($s0) -/* A46F98 80240038 AE000074 */ sw $zero, 0x74($s0) -.L8024003C: -/* A46F9C 8024003C 24040001 */ addiu $a0, $zero, 1 -/* A46FA0 80240040 C460002C */ lwc1 $f0, 0x2c($v1) -/* A46FA4 80240044 3C014100 */ lui $at, 0x4100 -/* A46FA8 80240048 44811000 */ mtc1 $at, $f2 -/* A46FAC 8024004C 00000000 */ nop -/* A46FB0 80240050 46020000 */ add.s $f0, $f0, $f2 -/* A46FB4 80240054 C4620030 */ lwc1 $f2, 0x30($v1) -/* A46FB8 80240058 C4640028 */ lwc1 $f4, 0x28($v1) -/* A46FBC 8024005C 4600118D */ trunc.w.s $f6, $f2 -/* A46FC0 80240060 E7A60010 */ swc1 $f6, 0x10($sp) -/* A46FC4 80240064 4600218D */ trunc.w.s $f6, $f4 -/* A46FC8 80240068 44063000 */ mfc1 $a2, $f6 -/* A46FCC 8024006C 4600018D */ trunc.w.s $f6, $f0 -/* A46FD0 80240070 44073000 */ mfc1 $a3, $f6 -/* A46FD4 80240074 0C04DFB0 */ jal set_screen_overlay_center_worldpos -/* A46FD8 80240078 0080282D */ daddu $a1, $a0, $zero -/* A46FDC 8024007C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) -/* A46FE0 80240080 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) -/* A46FE4 80240084 10400012 */ beqz $v0, .L802400D0 -/* A46FE8 80240088 24020006 */ addiu $v0, $zero, 6 -/* A46FEC 8024008C 82230012 */ lb $v1, 0x12($s1) -/* A46FF0 80240090 14620022 */ bne $v1, $v0, .L8024011C -/* A46FF4 80240094 00000000 */ nop -/* A46FF8 80240098 8E020074 */ lw $v0, 0x74($s0) -/* A46FFC 8024009C 14400004 */ bnez $v0, .L802400B0 -/* A47000 802400A0 24020001 */ addiu $v0, $zero, 1 -/* A47004 802400A4 AE020074 */ sw $v0, 0x74($s0) -/* A47008 802400A8 0C05272D */ jal sfx_play_sound -/* A4700C 802400AC 24042011 */ addiu $a0, $zero, 0x2011 -.L802400B0: -/* A47010 802400B0 8E020070 */ lw $v0, 0x70($s0) -/* A47014 802400B4 2442FFF8 */ addiu $v0, $v0, -8 -/* A47018 802400B8 AE020070 */ sw $v0, 0x70($s0) -/* A4701C 802400BC 2842005A */ slti $v0, $v0, 0x5a -/* A47020 802400C0 10400016 */ beqz $v0, .L8024011C -/* A47024 802400C4 2402005A */ addiu $v0, $zero, 0x5a -/* A47028 802400C8 08090047 */ j .L8024011C -/* A4702C 802400CC AE020070 */ sw $v0, 0x70($s0) -.L802400D0: -/* A47030 802400D0 82430012 */ lb $v1, 0x12($s2) -/* A47034 802400D4 14620010 */ bne $v1, $v0, .L80240118 -/* A47038 802400D8 240200FF */ addiu $v0, $zero, 0xff -/* A4703C 802400DC 8E020074 */ lw $v0, 0x74($s0) -/* A47040 802400E0 10400007 */ beqz $v0, .L80240100 -/* A47044 802400E4 00000000 */ nop -/* A47048 802400E8 8E020070 */ lw $v0, 0x70($s0) -/* A4704C 802400EC 284200FF */ slti $v0, $v0, 0xff -/* A47050 802400F0 10400003 */ beqz $v0, .L80240100 -/* A47054 802400F4 AE000074 */ sw $zero, 0x74($s0) -/* A47058 802400F8 0C05272D */ jal sfx_play_sound -/* A4705C 802400FC 24042012 */ addiu $a0, $zero, 0x2012 -.L80240100: -/* A47060 80240100 8E020070 */ lw $v0, 0x70($s0) -/* A47064 80240104 24420008 */ addiu $v0, $v0, 8 -/* A47068 80240108 AE020070 */ sw $v0, 0x70($s0) -/* A4706C 8024010C 284200FF */ slti $v0, $v0, 0xff -/* A47070 80240110 14400002 */ bnez $v0, .L8024011C -/* A47074 80240114 240200FF */ addiu $v0, $zero, 0xff -.L80240118: -/* A47078 80240118 AE020070 */ sw $v0, 0x70($s0) -.L8024011C: -/* A4707C 8024011C C6060070 */ lwc1 $f6, 0x70($s0) -/* A47080 80240120 468031A0 */ cvt.s.w $f6, $f6 -/* A47084 80240124 44053000 */ mfc1 $a1, $f6 -/* A47088 80240128 0C04E035 */ jal set_screen_overlay_alpha -/* A4708C 8024012C 24040001 */ addiu $a0, $zero, 1 -/* A47090 80240130 3C05437F */ lui $a1, 0x437f -/* A47094 80240134 0C04DF69 */ jal set_screen_overlay_params_back -/* A47098 80240138 2404000B */ addiu $a0, $zero, 0xb -/* A4709C 8024013C 8FBF0024 */ lw $ra, 0x24($sp) -/* A470A0 80240140 8FB20020 */ lw $s2, 0x20($sp) -/* A470A4 80240144 8FB1001C */ lw $s1, 0x1c($sp) -/* A470A8 80240148 8FB00018 */ lw $s0, 0x18($sp) -/* A470AC 8024014C 0000102D */ daddu $v0, $zero, $zero -/* A470B0 80240150 03E00008 */ jr $ra -/* A470B4 80240154 27BD0028 */ addiu $sp, $sp, 0x28 -/* A470B8 80240158 00000000 */ nop -/* A470BC 8024015C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s deleted file mode 100644 index d81b0a193b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A485C0/func_80240000_A485C0.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A485C0 -/* A485C0 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A485C4 80240004 AFB00018 */ sw $s0, 0x18($sp) -/* A485C8 80240008 0080802D */ daddu $s0, $a0, $zero -/* A485CC 8024000C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* A485D0 80240010 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* A485D4 80240014 AFB1001C */ sw $s1, 0x1c($sp) -/* A485D8 80240018 3C118011 */ lui $s1, %hi(gPlayerData) -/* A485DC 8024001C 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* A485E0 80240020 AFB20020 */ sw $s2, 0x20($sp) -/* A485E4 80240024 0220902D */ daddu $s2, $s1, $zero -/* A485E8 80240028 10A00004 */ beqz $a1, .L8024003C -/* A485EC 8024002C AFBF0024 */ sw $ra, 0x24($sp) -/* A485F0 80240030 240200FF */ addiu $v0, $zero, 0xff -/* A485F4 80240034 AE020070 */ sw $v0, 0x70($s0) -/* A485F8 80240038 AE000074 */ sw $zero, 0x74($s0) -.L8024003C: -/* A485FC 8024003C 24040001 */ addiu $a0, $zero, 1 -/* A48600 80240040 C460002C */ lwc1 $f0, 0x2c($v1) -/* A48604 80240044 3C014100 */ lui $at, 0x4100 -/* A48608 80240048 44811000 */ mtc1 $at, $f2 -/* A4860C 8024004C 00000000 */ nop -/* A48610 80240050 46020000 */ add.s $f0, $f0, $f2 -/* A48614 80240054 C4620030 */ lwc1 $f2, 0x30($v1) -/* A48618 80240058 C4640028 */ lwc1 $f4, 0x28($v1) -/* A4861C 8024005C 4600118D */ trunc.w.s $f6, $f2 -/* A48620 80240060 E7A60010 */ swc1 $f6, 0x10($sp) -/* A48624 80240064 4600218D */ trunc.w.s $f6, $f4 -/* A48628 80240068 44063000 */ mfc1 $a2, $f6 -/* A4862C 8024006C 4600018D */ trunc.w.s $f6, $f0 -/* A48630 80240070 44073000 */ mfc1 $a3, $f6 -/* A48634 80240074 0C04DFB0 */ jal set_screen_overlay_center_worldpos -/* A48638 80240078 0080282D */ daddu $a1, $a0, $zero -/* A4863C 8024007C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) -/* A48640 80240080 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) -/* A48644 80240084 10400012 */ beqz $v0, .L802400D0 -/* A48648 80240088 24020006 */ addiu $v0, $zero, 6 -/* A4864C 8024008C 82230012 */ lb $v1, 0x12($s1) -/* A48650 80240090 14620022 */ bne $v1, $v0, .L8024011C -/* A48654 80240094 00000000 */ nop -/* A48658 80240098 8E020074 */ lw $v0, 0x74($s0) -/* A4865C 8024009C 14400004 */ bnez $v0, .L802400B0 -/* A48660 802400A0 24020001 */ addiu $v0, $zero, 1 -/* A48664 802400A4 AE020074 */ sw $v0, 0x74($s0) -/* A48668 802400A8 0C05272D */ jal sfx_play_sound -/* A4866C 802400AC 24042011 */ addiu $a0, $zero, 0x2011 -.L802400B0: -/* A48670 802400B0 8E020070 */ lw $v0, 0x70($s0) -/* A48674 802400B4 2442FFF8 */ addiu $v0, $v0, -8 -/* A48678 802400B8 AE020070 */ sw $v0, 0x70($s0) -/* A4867C 802400BC 2842005A */ slti $v0, $v0, 0x5a -/* A48680 802400C0 10400016 */ beqz $v0, .L8024011C -/* A48684 802400C4 2402005A */ addiu $v0, $zero, 0x5a -/* A48688 802400C8 08090047 */ j .L8024011C -/* A4868C 802400CC AE020070 */ sw $v0, 0x70($s0) -.L802400D0: -/* A48690 802400D0 82430012 */ lb $v1, 0x12($s2) -/* A48694 802400D4 14620010 */ bne $v1, $v0, .L80240118 -/* A48698 802400D8 240200FF */ addiu $v0, $zero, 0xff -/* A4869C 802400DC 8E020074 */ lw $v0, 0x74($s0) -/* A486A0 802400E0 10400007 */ beqz $v0, .L80240100 -/* A486A4 802400E4 00000000 */ nop -/* A486A8 802400E8 8E020070 */ lw $v0, 0x70($s0) -/* A486AC 802400EC 284200FF */ slti $v0, $v0, 0xff -/* A486B0 802400F0 10400003 */ beqz $v0, .L80240100 -/* A486B4 802400F4 AE000074 */ sw $zero, 0x74($s0) -/* A486B8 802400F8 0C05272D */ jal sfx_play_sound -/* A486BC 802400FC 24042012 */ addiu $a0, $zero, 0x2012 -.L80240100: -/* A486C0 80240100 8E020070 */ lw $v0, 0x70($s0) -/* A486C4 80240104 24420008 */ addiu $v0, $v0, 8 -/* A486C8 80240108 AE020070 */ sw $v0, 0x70($s0) -/* A486CC 8024010C 284200FF */ slti $v0, $v0, 0xff -/* A486D0 80240110 14400002 */ bnez $v0, .L8024011C -/* A486D4 80240114 240200FF */ addiu $v0, $zero, 0xff -.L80240118: -/* A486D8 80240118 AE020070 */ sw $v0, 0x70($s0) -.L8024011C: -/* A486DC 8024011C C6060070 */ lwc1 $f6, 0x70($s0) -/* A486E0 80240120 468031A0 */ cvt.s.w $f6, $f6 -/* A486E4 80240124 44053000 */ mfc1 $a1, $f6 -/* A486E8 80240128 0C04E035 */ jal set_screen_overlay_alpha -/* A486EC 8024012C 24040001 */ addiu $a0, $zero, 1 -/* A486F0 80240130 3C05437F */ lui $a1, 0x437f -/* A486F4 80240134 0C04DF69 */ jal set_screen_overlay_params_back -/* A486F8 80240138 2404000B */ addiu $a0, $zero, 0xb -/* A486FC 8024013C 8FBF0024 */ lw $ra, 0x24($sp) -/* A48700 80240140 8FB20020 */ lw $s2, 0x20($sp) -/* A48704 80240144 8FB1001C */ lw $s1, 0x1c($sp) -/* A48708 80240148 8FB00018 */ lw $s0, 0x18($sp) -/* A4870C 8024014C 0000102D */ daddu $v0, $zero, $zero -/* A48710 80240150 03E00008 */ jr $ra -/* A48714 80240154 27BD0028 */ addiu $sp, $sp, 0x28 -/* A48718 80240158 00000000 */ nop -/* A4871C 8024015C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80_833780.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80_833780.s index 2ca0defb89..59ee128d6a 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80_833780.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80_833780.s @@ -4,7 +4,7 @@ glabel func_80241F80_833780 /* 833780 80241F80 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 833784 80241F84 AFBF0010 */ sw $ra, 0x10($sp) -/* 833788 80241F88 0C03A5B2 */ jal func_800E96C8 +/* 833788 80241F88 0C03A5B2 */ jal hide_coin_counter_immediately /* 83378C 80241F8C 00000000 */ nop /* 833790 80241F90 8FBF0010 */ lw $ra, 0x10($sp) /* 833794 80241F94 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80241170_E0F910.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80241170_E0F910.s deleted file mode 100644 index 7ab2c44aa4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80241170_E0F910.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241170_E0F910 -/* E0F910 80241170 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0F914 80241174 AFB10014 */ sw $s1, 0x14($sp) -/* E0F918 80241178 0080882D */ daddu $s1, $a0, $zero -/* E0F91C 8024117C AFB00010 */ sw $s0, 0x10($sp) -/* E0F920 80241180 0000802D */ daddu $s0, $zero, $zero -/* E0F924 80241184 AFBF0018 */ sw $ra, 0x18($sp) -/* E0F928 80241188 0C039D91 */ jal find_item -/* E0F92C 8024118C 2404007C */ addiu $a0, $zero, 0x7c -/* E0F930 80241190 04400003 */ bltz $v0, .L802411A0 -/* E0F934 80241194 00000000 */ nop -/* E0F938 80241198 0809046C */ j .L802411B0 -/* E0F93C 8024119C 24100002 */ addiu $s0, $zero, 2 -.L802411A0: -/* E0F940 802411A0 0C039D91 */ jal find_item -/* E0F944 802411A4 2404007B */ addiu $a0, $zero, 0x7b -/* E0F948 802411A8 04430001 */ bgezl $v0, .L802411B0 -/* E0F94C 802411AC 24100001 */ addiu $s0, $zero, 1 -.L802411B0: -/* E0F950 802411B0 0220202D */ daddu $a0, $s1, $zero -/* E0F954 802411B4 3C05FE36 */ lui $a1, 0xfe36 -/* E0F958 802411B8 34A53C85 */ ori $a1, $a1, 0x3c85 -/* E0F95C 802411BC 0C0B2026 */ jal evt_set_variable -/* E0F960 802411C0 0200302D */ daddu $a2, $s0, $zero -/* E0F964 802411C4 8FBF0018 */ lw $ra, 0x18($sp) -/* E0F968 802411C8 8FB10014 */ lw $s1, 0x14($sp) -/* E0F96C 802411CC 8FB00010 */ lw $s0, 0x10($sp) -/* E0F970 802411D0 24020002 */ addiu $v0, $zero, 2 -/* E0F974 802411D4 03E00008 */ jr $ra -/* E0F978 802411D8 27BD0020 */ addiu $sp, $sp, 0x20 -/* E0F97C 802411DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s deleted file mode 100644 index 0e0ad19533..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s +++ /dev/null @@ -1,235 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243F90_E12730 -.double 0.65 - -dlabel D_80243F98_E12738 -.double 0.55 - -.section .text - -glabel func_802411E0_E0F980 -/* E0F980 802411E0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* E0F984 802411E4 AFB1002C */ sw $s1, 0x2c($sp) -/* E0F988 802411E8 0080882D */ daddu $s1, $a0, $zero -/* E0F98C 802411EC AFB20030 */ sw $s2, 0x30($sp) -/* E0F990 802411F0 00A0902D */ daddu $s2, $a1, $zero -/* E0F994 802411F4 AFBF0034 */ sw $ra, 0x34($sp) -/* E0F998 802411F8 1A4000CB */ blez $s2, .L80241528 -/* E0F99C 802411FC AFB00028 */ sw $s0, 0x28($sp) -/* E0F9A0 80241200 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* E0F9A4 80241204 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* E0F9A8 80241208 3C02DE00 */ lui $v0, 0xde00 -/* E0F9AC 8024120C 44920000 */ mtc1 $s2, $f0 -/* E0F9B0 80241210 00000000 */ nop -/* E0F9B4 80241214 46800021 */ cvt.d.w $f0, $f0 -/* E0F9B8 80241218 8C830000 */ lw $v1, ($a0) -/* E0F9BC 8024121C 3C018024 */ lui $at, %hi(D_80243F90_E12730) -/* E0F9C0 80241220 D4223F90 */ ldc1 $f2, %lo(D_80243F90_E12730)($at) -/* E0F9C4 80241224 0060282D */ daddu $a1, $v1, $zero -/* E0F9C8 80241228 24630008 */ addiu $v1, $v1, 8 -/* E0F9CC 8024122C AC830000 */ sw $v1, ($a0) -/* E0F9D0 80241230 ACA20000 */ sw $v0, ($a1) -/* E0F9D4 80241234 3C028024 */ lui $v0, %hi(D_80243C50_E123F0) -/* E0F9D8 80241238 24423C50 */ addiu $v0, $v0, %lo(D_80243C50_E123F0) -/* E0F9DC 8024123C ACA20004 */ sw $v0, 4($a1) -/* E0F9E0 80241240 24620008 */ addiu $v0, $v1, 8 -/* E0F9E4 80241244 AC820000 */ sw $v0, ($a0) -/* E0F9E8 80241248 3C02E700 */ lui $v0, 0xe700 -/* E0F9EC 8024124C 46220002 */ mul.d $f0, $f0, $f2 -/* E0F9F0 80241250 00000000 */ nop -/* E0F9F4 80241254 AC620000 */ sw $v0, ($v1) -/* E0F9F8 80241258 24620010 */ addiu $v0, $v1, 0x10 -/* E0F9FC 8024125C AC600004 */ sw $zero, 4($v1) -/* E0FA00 80241260 AC820000 */ sw $v0, ($a0) -/* E0FA04 80241264 3C02FA00 */ lui $v0, 0xfa00 -/* E0FA08 80241268 3C0141E0 */ lui $at, 0x41e0 -/* E0FA0C 8024126C 44811800 */ mtc1 $at, $f3 -/* E0FA10 80241270 44801000 */ mtc1 $zero, $f2 -/* E0FA14 80241274 246D000C */ addiu $t5, $v1, 0xc -/* E0FA18 80241278 4620103E */ c.le.d $f2, $f0 -/* E0FA1C 8024127C 00000000 */ nop -/* E0FA20 80241280 45010005 */ bc1t .L80241298 -/* E0FA24 80241284 AC620008 */ sw $v0, 8($v1) -/* E0FA28 80241288 4620010D */ trunc.w.d $f4, $f0 -/* E0FA2C 8024128C 440C2000 */ mfc1 $t4, $f4 -/* E0FA30 80241290 080904AD */ j .L802412B4 -/* E0FA34 80241294 3C091078 */ lui $t1, 0x1078 -.L80241298: -/* E0FA38 80241298 46220001 */ sub.d $f0, $f0, $f2 -/* E0FA3C 8024129C 3C028000 */ lui $v0, 0x8000 -/* E0FA40 802412A0 4620010D */ trunc.w.d $f4, $f0 -/* E0FA44 802412A4 440C2000 */ mfc1 $t4, $f4 -/* E0FA48 802412A8 00000000 */ nop -/* E0FA4C 802412AC 01826025 */ or $t4, $t4, $v0 -/* E0FA50 802412B0 3C091078 */ lui $t1, 0x1078 -.L802412B4: -/* E0FA54 802412B4 35291800 */ ori $t1, $t1, 0x1800 -/* E0FA58 802412B8 3C0BF644 */ lui $t3, 0xf644 -/* E0FA5C 802412BC 356B0204 */ ori $t3, $t3, 0x204 -/* E0FA60 802412C0 3C0A000C */ lui $t2, 0xc -/* E0FA64 802412C4 354A00D4 */ ori $t2, $t2, 0xd4 -/* E0FA68 802412C8 2404002D */ addiu $a0, $zero, 0x2d -/* E0FA6C 802412CC 24050032 */ addiu $a1, $zero, 0x32 -/* E0FA70 802412D0 240600E6 */ addiu $a2, $zero, 0xe6 -/* E0FA74 802412D4 3C08800A */ lui $t0, %hi(gMasterGfxPos) -/* E0FA78 802412D8 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) -/* E0FA7C 802412DC 318200FF */ andi $v0, $t4, 0xff -/* E0FA80 802412E0 00491025 */ or $v0, $v0, $t1 -/* E0FA84 802412E4 44921000 */ mtc1 $s2, $f2 -/* E0FA88 802412E8 00000000 */ nop -/* E0FA8C 802412EC 468010A1 */ cvt.d.w $f2, $f2 -/* E0FA90 802412F0 8D030000 */ lw $v1, ($t0) -/* E0FA94 802412F4 3C018024 */ lui $at, %hi(D_80243F98_E12738) -/* E0FA98 802412F8 D4203F98 */ ldc1 $f0, %lo(D_80243F98_E12738)($at) -/* E0FA9C 802412FC 24100001 */ addiu $s0, $zero, 1 -/* E0FAA0 80241300 ADA20000 */ sw $v0, ($t5) -/* E0FAA4 80241304 0060102D */ daddu $v0, $v1, $zero -/* E0FAA8 80241308 24630008 */ addiu $v1, $v1, 8 -/* E0FAAC 8024130C AD030000 */ sw $v1, ($t0) -/* E0FAB0 80241310 AC4B0000 */ sw $t3, ($v0) -/* E0FAB4 80241314 AC4A0004 */ sw $t2, 4($v0) -/* E0FAB8 80241318 24620008 */ addiu $v0, $v1, 8 -/* E0FABC 8024131C AD020000 */ sw $v0, ($t0) -/* E0FAC0 80241320 3C02E700 */ lui $v0, 0xe700 -/* E0FAC4 80241324 46201082 */ mul.d $f2, $f2, $f0 -/* E0FAC8 80241328 00000000 */ nop -/* E0FACC 8024132C AC620000 */ sw $v0, ($v1) -/* E0FAD0 80241330 24020006 */ addiu $v0, $zero, 6 -/* E0FAD4 80241334 AC600004 */ sw $zero, 4($v1) -/* E0FAD8 80241338 AFA20010 */ sw $v0, 0x10($sp) -/* E0FADC 8024133C AFA00014 */ sw $zero, 0x14($sp) -/* E0FAE0 80241340 AFB00018 */ sw $s0, 0x18($sp) -/* E0FAE4 80241344 AFB20020 */ sw $s2, 0x20($sp) -/* E0FAE8 80241348 4620110D */ trunc.w.d $f4, $f2 -/* E0FAEC 8024134C E7A4001C */ swc1 $f4, 0x1c($sp) -/* E0FAF0 80241350 0C04B6D6 */ jal msg_draw_frame -/* E0FAF4 80241354 24070052 */ addiu $a3, $zero, 0x52 -/* E0FAF8 80241358 8E220008 */ lw $v0, 8($s1) -/* E0FAFC 8024135C 1450001F */ bne $v0, $s0, .L802413DC -/* E0FB00 80241360 3C040008 */ lui $a0, 8 -/* E0FB04 80241364 3484001C */ ori $a0, $a0, 0x1c -/* E0FB08 80241368 24050042 */ addiu $a1, $zero, 0x42 -/* E0FB0C 8024136C 24060039 */ addiu $a2, $zero, 0x39 -/* E0FB10 80241370 0240382D */ daddu $a3, $s2, $zero -/* E0FB14 80241374 AFB00010 */ sw $s0, 0x10($sp) -/* E0FB18 80241378 0C04993B */ jal draw_msg -/* E0FB1C 8024137C AFA00014 */ sw $zero, 0x14($sp) -/* E0FB20 80241380 240500DB */ addiu $a1, $zero, 0xdb -/* E0FB24 80241384 2406004E */ addiu $a2, $zero, 0x4e -/* E0FB28 80241388 0200382D */ daddu $a3, $s0, $zero -/* E0FB2C 8024138C 3C108011 */ lui $s0, %hi(gPlayerData) -/* E0FB30 80241390 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* E0FB34 80241394 AFA00010 */ sw $zero, 0x10($sp) -/* E0FB38 80241398 AFB20014 */ sw $s2, 0x14($sp) -/* E0FB3C 8024139C 9604032E */ lhu $a0, 0x32e($s0) -/* E0FB40 802413A0 24110003 */ addiu $s1, $zero, 3 -/* E0FB44 802413A4 0C049DA7 */ jal draw_number -/* E0FB48 802413A8 AFB10018 */ sw $s1, 0x18($sp) -/* E0FB4C 802413AC 240500DB */ addiu $a1, $zero, 0xdb -/* E0FB50 802413B0 2406005D */ addiu $a2, $zero, 0x5d -/* E0FB54 802413B4 8E040330 */ lw $a0, 0x330($s0) -/* E0FB58 802413B8 24070001 */ addiu $a3, $zero, 1 -/* E0FB5C 802413BC AFA00010 */ sw $zero, 0x10($sp) -/* E0FB60 802413C0 AFB20014 */ sw $s2, 0x14($sp) -/* E0FB64 802413C4 0C049DA7 */ jal draw_number -/* E0FB68 802413C8 AFB10018 */ sw $s1, 0x18($sp) -/* E0FB6C 802413CC 240500DB */ addiu $a1, $zero, 0xdb -/* E0FB70 802413D0 96040334 */ lhu $a0, 0x334($s0) -/* E0FB74 802413D4 08090514 */ j .L80241450 -/* E0FB78 802413D8 2406006C */ addiu $a2, $zero, 0x6c -.L802413DC: -/* E0FB7C 802413DC 3484001D */ ori $a0, $a0, 0x1d -/* E0FB80 802413E0 24050040 */ addiu $a1, $zero, 0x40 -/* E0FB84 802413E4 24060039 */ addiu $a2, $zero, 0x39 -/* E0FB88 802413E8 0240382D */ daddu $a3, $s2, $zero -/* E0FB8C 802413EC AFB00010 */ sw $s0, 0x10($sp) -/* E0FB90 802413F0 0C04993B */ jal draw_msg -/* E0FB94 802413F4 AFA00014 */ sw $zero, 0x14($sp) -/* E0FB98 802413F8 240500DB */ addiu $a1, $zero, 0xdb -/* E0FB9C 802413FC 2406004E */ addiu $a2, $zero, 0x4e -/* E0FBA0 80241400 24070001 */ addiu $a3, $zero, 1 -/* E0FBA4 80241404 3C108011 */ lui $s0, %hi(gPlayerData) -/* E0FBA8 80241408 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* E0FBAC 8024140C AFA00010 */ sw $zero, 0x10($sp) -/* E0FBB0 80241410 AFB20014 */ sw $s2, 0x14($sp) -/* E0FBB4 80241414 96040336 */ lhu $a0, 0x336($s0) -/* E0FBB8 80241418 24110003 */ addiu $s1, $zero, 3 -/* E0FBBC 8024141C 0C049DA7 */ jal draw_number -/* E0FBC0 80241420 AFB10018 */ sw $s1, 0x18($sp) -/* E0FBC4 80241424 240500DB */ addiu $a1, $zero, 0xdb -/* E0FBC8 80241428 2406005D */ addiu $a2, $zero, 0x5d -/* E0FBCC 8024142C 8E040338 */ lw $a0, 0x338($s0) -/* E0FBD0 80241430 24070001 */ addiu $a3, $zero, 1 -/* E0FBD4 80241434 AFA00010 */ sw $zero, 0x10($sp) -/* E0FBD8 80241438 AFB20014 */ sw $s2, 0x14($sp) -/* E0FBDC 8024143C 0C049DA7 */ jal draw_number -/* E0FBE0 80241440 AFB10018 */ sw $s1, 0x18($sp) -/* E0FBE4 80241444 240500DB */ addiu $a1, $zero, 0xdb -/* E0FBE8 80241448 2406006C */ addiu $a2, $zero, 0x6c -/* E0FBEC 8024144C 9604033C */ lhu $a0, 0x33c($s0) -.L80241450: -/* E0FBF0 80241450 24070001 */ addiu $a3, $zero, 1 -/* E0FBF4 80241454 AFA00010 */ sw $zero, 0x10($sp) -/* E0FBF8 80241458 AFB20014 */ sw $s2, 0x14($sp) -/* E0FBFC 8024145C 0C049DA7 */ jal draw_number -/* E0FC00 80241460 AFB10018 */ sw $s1, 0x18($sp) -/* E0FC04 80241464 3C040008 */ lui $a0, 8 -/* E0FC08 80241468 3484001E */ ori $a0, $a0, 0x1e -/* E0FC0C 8024146C 2405003A */ addiu $a1, $zero, 0x3a -/* E0FC10 80241470 2406004E */ addiu $a2, $zero, 0x4e -/* E0FC14 80241474 0240382D */ daddu $a3, $s2, $zero -/* E0FC18 80241478 24100001 */ addiu $s0, $zero, 1 -/* E0FC1C 8024147C AFA00010 */ sw $zero, 0x10($sp) -/* E0FC20 80241480 0C04993B */ jal draw_msg -/* E0FC24 80241484 AFB00014 */ sw $s0, 0x14($sp) -/* E0FC28 80241488 3C040008 */ lui $a0, 8 -/* E0FC2C 8024148C 34840023 */ ori $a0, $a0, 0x23 -/* E0FC30 80241490 240500DF */ addiu $a1, $zero, 0xdf -/* E0FC34 80241494 2406004E */ addiu $a2, $zero, 0x4e -/* E0FC38 80241498 0240382D */ daddu $a3, $s2, $zero -/* E0FC3C 8024149C AFA00010 */ sw $zero, 0x10($sp) -/* E0FC40 802414A0 0C04993B */ jal draw_msg -/* E0FC44 802414A4 AFB00014 */ sw $s0, 0x14($sp) -/* E0FC48 802414A8 3C040008 */ lui $a0, 8 -/* E0FC4C 802414AC 3484001F */ ori $a0, $a0, 0x1f -/* E0FC50 802414B0 2405003A */ addiu $a1, $zero, 0x3a -/* E0FC54 802414B4 2406005D */ addiu $a2, $zero, 0x5d -/* E0FC58 802414B8 0240382D */ daddu $a3, $s2, $zero -/* E0FC5C 802414BC AFA00010 */ sw $zero, 0x10($sp) -/* E0FC60 802414C0 0C04993B */ jal draw_msg -/* E0FC64 802414C4 AFB00014 */ sw $s0, 0x14($sp) -/* E0FC68 802414C8 3C040008 */ lui $a0, 8 -/* E0FC6C 802414CC 34840021 */ ori $a0, $a0, 0x21 -/* E0FC70 802414D0 240500DF */ addiu $a1, $zero, 0xdf -/* E0FC74 802414D4 2406005D */ addiu $a2, $zero, 0x5d -/* E0FC78 802414D8 0240382D */ daddu $a3, $s2, $zero -/* E0FC7C 802414DC AFA00010 */ sw $zero, 0x10($sp) -/* E0FC80 802414E0 0C04993B */ jal draw_msg -/* E0FC84 802414E4 AFB00014 */ sw $s0, 0x14($sp) -/* E0FC88 802414E8 3C040008 */ lui $a0, 8 -/* E0FC8C 802414EC 34840020 */ ori $a0, $a0, 0x20 -/* E0FC90 802414F0 2405003A */ addiu $a1, $zero, 0x3a -/* E0FC94 802414F4 2406006C */ addiu $a2, $zero, 0x6c -/* E0FC98 802414F8 0240382D */ daddu $a3, $s2, $zero -/* E0FC9C 802414FC AFA00010 */ sw $zero, 0x10($sp) -/* E0FCA0 80241500 0C04993B */ jal draw_msg -/* E0FCA4 80241504 AFB00014 */ sw $s0, 0x14($sp) -/* E0FCA8 80241508 3C040008 */ lui $a0, 8 -/* E0FCAC 8024150C 34840021 */ ori $a0, $a0, 0x21 -/* E0FCB0 80241510 240500DF */ addiu $a1, $zero, 0xdf -/* E0FCB4 80241514 2406006C */ addiu $a2, $zero, 0x6c -/* E0FCB8 80241518 0240382D */ daddu $a3, $s2, $zero -/* E0FCBC 8024151C AFA00010 */ sw $zero, 0x10($sp) -/* E0FCC0 80241520 0C04993B */ jal draw_msg -/* E0FCC4 80241524 AFB00014 */ sw $s0, 0x14($sp) -.L80241528: -/* E0FCC8 80241528 8FBF0034 */ lw $ra, 0x34($sp) -/* E0FCCC 8024152C 8FB20030 */ lw $s2, 0x30($sp) -/* E0FCD0 80241530 8FB1002C */ lw $s1, 0x2c($sp) -/* E0FCD4 80241534 8FB00028 */ lw $s0, 0x28($sp) -/* E0FCD8 80241538 03E00008 */ jr $ra -/* E0FCDC 8024153C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s deleted file mode 100644 index 24b417c473..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s +++ /dev/null @@ -1,114 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243FA0_E12740 -.word .L80241588_E0FD28, .L802415A4_E0FD44, .L80241604_E0FDA4, .L8024163C_E0FDDC, .L80241658_E0FDF8, 0, 0, 0 - -.section .text - -glabel func_80241540_E0FCE0 -/* E0FCE0 80241540 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E0FCE4 80241544 0000202D */ daddu $a0, $zero, $zero -/* E0FCE8 80241548 3C05FD05 */ lui $a1, 0xfd05 -/* E0FCEC 8024154C 34A50F8A */ ori $a1, $a1, 0xf8a -/* E0FCF0 80241550 AFBF0020 */ sw $ra, 0x20($sp) -/* E0FCF4 80241554 AFB1001C */ sw $s1, 0x1c($sp) -/* E0FCF8 80241558 0C0B1EAF */ jal evt_get_variable -/* E0FCFC 8024155C AFB00018 */ sw $s0, 0x18($sp) -/* E0FD00 80241560 0040802D */ daddu $s0, $v0, $zero -/* E0FD04 80241564 8E030000 */ lw $v1, ($s0) -/* E0FD08 80241568 2C620005 */ sltiu $v0, $v1, 5 -/* E0FD0C 8024156C 1040004C */ beqz $v0, .L802416A0 -/* E0FD10 80241570 00031080 */ sll $v0, $v1, 2 -/* E0FD14 80241574 3C018024 */ lui $at, %hi(jtbl_80243FA0_E12740) -/* E0FD18 80241578 00220821 */ addu $at, $at, $v0 -/* E0FD1C 8024157C 8C223FA0 */ lw $v0, %lo(jtbl_80243FA0_E12740)($at) -/* E0FD20 80241580 00400008 */ jr $v0 -/* E0FD24 80241584 00000000 */ nop -.L80241588_E0FD28: -/* E0FD28 80241588 2404021C */ addiu $a0, $zero, 0x21c -/* E0FD2C 8024158C 0000282D */ daddu $a1, $zero, $zero -/* E0FD30 80241590 00A0302D */ daddu $a2, $a1, $zero -/* E0FD34 80241594 24020001 */ addiu $v0, $zero, 1 -/* E0FD38 80241598 AE000004 */ sw $zero, 4($s0) -/* E0FD3C 8024159C 0C015478 */ jal snd_start_sound -/* E0FD40 802415A0 AE020000 */ sw $v0, ($s0) -.L802415A4_E0FD44: -/* E0FD44 802415A4 3C054200 */ lui $a1, 0x4200 -/* E0FD48 802415A8 8E020004 */ lw $v0, 4($s0) -/* E0FD4C 802415AC 3C06437F */ lui $a2, 0x437f -/* E0FD50 802415B0 24420001 */ addiu $v0, $v0, 1 -/* E0FD54 802415B4 AE020004 */ sw $v0, 4($s0) -/* E0FD58 802415B8 24020005 */ addiu $v0, $zero, 5 -/* E0FD5C 802415BC AFA20010 */ sw $v0, 0x10($sp) -/* E0FD60 802415C0 8E070004 */ lw $a3, 4($s0) -/* E0FD64 802415C4 0C00A8ED */ jal update_lerp -/* E0FD68 802415C8 0000202D */ daddu $a0, $zero, $zero -/* E0FD6C 802415CC 8E020004 */ lw $v0, 4($s0) -/* E0FD70 802415D0 4600008D */ trunc.w.s $f2, $f0 -/* E0FD74 802415D4 44031000 */ mfc1 $v1, $f2 -/* E0FD78 802415D8 00000000 */ nop -/* E0FD7C 802415DC AE03000C */ sw $v1, 0xc($s0) -/* E0FD80 802415E0 28420005 */ slti $v0, $v0, 5 -/* E0FD84 802415E4 1440002E */ bnez $v0, .L802416A0 -/* E0FD88 802415E8 AE030010 */ sw $v1, 0x10($s0) -/* E0FD8C 802415EC 24020002 */ addiu $v0, $zero, 2 -/* E0FD90 802415F0 AE020000 */ sw $v0, ($s0) -/* E0FD94 802415F4 240200FF */ addiu $v0, $zero, 0xff -/* E0FD98 802415F8 AE02000C */ sw $v0, 0xc($s0) -/* E0FD9C 802415FC 080905A8 */ j .L802416A0 -/* E0FDA0 80241600 AE020010 */ sw $v0, 0x10($s0) -.L80241604_E0FDA4: -/* E0FDA4 80241604 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* E0FDA8 80241608 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* E0FDAC 8024160C 240200FF */ addiu $v0, $zero, 0xff -/* E0FDB0 80241610 AE02000C */ sw $v0, 0xc($s0) -/* E0FDB4 80241614 AE020010 */ sw $v0, 0x10($s0) -/* E0FDB8 80241618 8C620000 */ lw $v0, ($v1) -/* E0FDBC 8024161C 3042C000 */ andi $v0, $v0, 0xc000 -/* E0FDC0 80241620 10400002 */ beqz $v0, .L8024162C -/* E0FDC4 80241624 24020003 */ addiu $v0, $zero, 3 -/* E0FDC8 80241628 AE020000 */ sw $v0, ($s0) -.L8024162C: -/* E0FDCC 8024162C 8E030000 */ lw $v1, ($s0) -/* E0FDD0 80241630 24020003 */ addiu $v0, $zero, 3 -/* E0FDD4 80241634 1462001A */ bne $v1, $v0, .L802416A0 -/* E0FDD8 80241638 00000000 */ nop -.L8024163C_E0FDDC: -/* E0FDDC 8024163C 240400CA */ addiu $a0, $zero, 0xca -/* E0FDE0 80241640 0000282D */ daddu $a1, $zero, $zero -/* E0FDE4 80241644 00A0302D */ daddu $a2, $a1, $zero -/* E0FDE8 80241648 24020004 */ addiu $v0, $zero, 4 -/* E0FDEC 8024164C AE000004 */ sw $zero, 4($s0) -/* E0FDF0 80241650 0C015478 */ jal snd_start_sound -/* E0FDF4 80241654 AE020000 */ sw $v0, ($s0) -.L80241658_E0FDF8: -/* E0FDF8 80241658 0000202D */ daddu $a0, $zero, $zero -/* E0FDFC 8024165C C6000010 */ lwc1 $f0, 0x10($s0) -/* E0FE00 80241660 46800020 */ cvt.s.w $f0, $f0 -/* E0FE04 80241664 24110005 */ addiu $s1, $zero, 5 -/* E0FE08 80241668 8E020004 */ lw $v0, 4($s0) -/* E0FE0C 8024166C 44050000 */ mfc1 $a1, $f0 -/* E0FE10 80241670 24420001 */ addiu $v0, $v0, 1 -/* E0FE14 80241674 AE020004 */ sw $v0, 4($s0) -/* E0FE18 80241678 AFB10010 */ sw $s1, 0x10($sp) -/* E0FE1C 8024167C 8E070004 */ lw $a3, 4($s0) -/* E0FE20 80241680 0C00A8ED */ jal update_lerp -/* E0FE24 80241684 0000302D */ daddu $a2, $zero, $zero -/* E0FE28 80241688 8E020004 */ lw $v0, 4($s0) -/* E0FE2C 8024168C 4600008D */ trunc.w.s $f2, $f0 -/* E0FE30 80241690 E602000C */ swc1 $f2, 0xc($s0) -/* E0FE34 80241694 0051102A */ slt $v0, $v0, $s1 -/* E0FE38 80241698 50400001 */ beql $v0, $zero, .L802416A0 -/* E0FE3C 8024169C AE110000 */ sw $s1, ($s0) -.L802416A0: -/* E0FE40 802416A0 8E05000C */ lw $a1, 0xc($s0) -/* E0FE44 802416A4 0C090478 */ jal func_802411E0_E0F980 -/* E0FE48 802416A8 0200202D */ daddu $a0, $s0, $zero -/* E0FE4C 802416AC 8FBF0020 */ lw $ra, 0x20($sp) -/* E0FE50 802416B0 8FB1001C */ lw $s1, 0x1c($sp) -/* E0FE54 802416B4 8FB00018 */ lw $s0, 0x18($sp) -/* E0FE58 802416B8 03E00008 */ jr $ra -/* E0FE5C 802416BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416C0_E0FE60.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416C0_E0FE60.s deleted file mode 100644 index 607ad39649..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416C0_E0FE60.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C0_E0FE60 -/* E0FE60 802416C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E0FE64 802416C4 2402002D */ addiu $v0, $zero, 0x2d -/* E0FE68 802416C8 AFA20010 */ sw $v0, 0x10($sp) -/* E0FE6C 802416CC 3C028024 */ lui $v0, %hi(func_80241540_E0FCE0) -/* E0FE70 802416D0 24421540 */ addiu $v0, $v0, %lo(func_80241540_E0FCE0) -/* E0FE74 802416D4 27A40010 */ addiu $a0, $sp, 0x10 -/* E0FE78 802416D8 AFBF0020 */ sw $ra, 0x20($sp) -/* E0FE7C 802416DC AFA00018 */ sw $zero, 0x18($sp) -/* E0FE80 802416E0 AFA2001C */ sw $v0, 0x1c($sp) -/* E0FE84 802416E4 0C047644 */ jal queue_render_task -/* E0FE88 802416E8 AFA00014 */ sw $zero, 0x14($sp) -/* E0FE8C 802416EC 8FBF0020 */ lw $ra, 0x20($sp) -/* E0FE90 802416F0 03E00008 */ jr $ra -/* E0FE94 802416F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s deleted file mode 100644 index bd782c5d12..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F8_E0FE98 -/* E0FE98 802416F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0FE9C 802416FC AFB10014 */ sw $s1, 0x14($sp) -/* E0FEA0 80241700 0080882D */ daddu $s1, $a0, $zero -/* E0FEA4 80241704 AFBF001C */ sw $ra, 0x1c($sp) -/* E0FEA8 80241708 AFB20018 */ sw $s2, 0x18($sp) -/* E0FEAC 8024170C AFB00010 */ sw $s0, 0x10($sp) -/* E0FEB0 80241710 8E22000C */ lw $v0, 0xc($s1) -/* E0FEB4 80241714 00A0802D */ daddu $s0, $a1, $zero -/* E0FEB8 80241718 0C0B1EAF */ jal evt_get_variable -/* E0FEBC 8024171C 8C450000 */ lw $a1, ($v0) -/* E0FEC0 80241720 12000013 */ beqz $s0, .L80241770 -/* E0FEC4 80241724 0040902D */ daddu $s2, $v0, $zero -/* E0FEC8 80241728 0C00AB39 */ jal heap_malloc -/* E0FECC 8024172C 24040018 */ addiu $a0, $zero, 0x18 -/* E0FED0 80241730 0040802D */ daddu $s0, $v0, $zero -/* E0FED4 80241734 0000202D */ daddu $a0, $zero, $zero -/* E0FED8 80241738 3C058024 */ lui $a1, %hi(func_802416C0_E0FE60) -/* E0FEDC 8024173C 24A516C0 */ addiu $a1, $a1, %lo(func_802416C0_E0FE60) -/* E0FEE0 80241740 240200FF */ addiu $v0, $zero, 0xff -/* E0FEE4 80241744 AE300070 */ sw $s0, 0x70($s1) -/* E0FEE8 80241748 AE000000 */ sw $zero, ($s0) -/* E0FEEC 8024174C 0C048C56 */ jal create_generic_entity_world -/* E0FEF0 80241750 AE02000C */ sw $v0, 0xc($s0) -/* E0FEF4 80241754 0220202D */ daddu $a0, $s1, $zero -/* E0FEF8 80241758 3C05FD05 */ lui $a1, 0xfd05 -/* E0FEFC 8024175C 34A50F8A */ ori $a1, $a1, 0xf8a -/* E0FF00 80241760 0200302D */ daddu $a2, $s0, $zero -/* E0FF04 80241764 AE020014 */ sw $v0, 0x14($s0) -/* E0FF08 80241768 0C0B2026 */ jal evt_set_variable -/* E0FF0C 8024176C AE120008 */ sw $s2, 8($s0) -.L80241770: -/* E0FF10 80241770 8E300070 */ lw $s0, 0x70($s1) -/* E0FF14 80241774 8E030000 */ lw $v1, ($s0) -/* E0FF18 80241778 24020005 */ addiu $v0, $zero, 5 -/* E0FF1C 8024177C 14620007 */ bne $v1, $v0, .L8024179C -/* E0FF20 80241780 0000102D */ daddu $v0, $zero, $zero -/* E0FF24 80241784 8E040014 */ lw $a0, 0x14($s0) -/* E0FF28 80241788 0C048D70 */ jal free_generic_entity -/* E0FF2C 8024178C 00000000 */ nop -/* E0FF30 80241790 0C00AB4B */ jal heap_free -/* E0FF34 80241794 0200202D */ daddu $a0, $s0, $zero -/* E0FF38 80241798 24020001 */ addiu $v0, $zero, 1 -.L8024179C: -/* E0FF3C 8024179C 8FBF001C */ lw $ra, 0x1c($sp) -/* E0FF40 802417A0 8FB20018 */ lw $s2, 0x18($sp) -/* E0FF44 802417A4 8FB10014 */ lw $s1, 0x14($sp) -/* E0FF48 802417A8 8FB00010 */ lw $s0, 0x10($sp) -/* E0FF4C 802417AC 03E00008 */ jr $ra -/* E0FF50 802417B0 27BD0020 */ addiu $sp, $sp, 0x20 -/* E0FF54 802417B4 00000000 */ nop -/* E0FF58 802417B8 00000000 */ nop -/* E0FF5C 802417BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s deleted file mode 100644 index ebc95159e6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802435B0_E15D10 -.double -95.0 - -dlabel D_802435B8_E15D18 -.double 95.0 - -dlabel D_802435C0_E15D20 -.double -0.35 - -dlabel D_802435C8_E15D28 -.double 0.3 - -dlabel D_802435D0_E15D30 -.double 0.35 - -dlabel D_802435D8_E15D38 -.double 0.8 - -.section .text - -glabel func_80240000_E12760 -/* E12760 80240000 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* E12764 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* E12768 80240008 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* E1276C 8024000C 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* E12770 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* E12774 80240014 AFB00010 */ sw $s0, 0x10($sp) -/* E12778 80240018 F7B80030 */ sdc1 $f24, 0x30($sp) -/* E1277C 8024001C F7B60028 */ sdc1 $f22, 0x28($sp) -/* E12780 80240020 F7B40020 */ sdc1 $f20, 0x20($sp) -/* E12784 80240024 8E260000 */ lw $a2, ($s1) -/* E12788 80240028 C4C40028 */ lwc1 $f4, 0x28($a2) -/* E1278C 8024002C 3C018024 */ lui $at, %hi(D_802435B0_E15D10) -/* E12790 80240030 D42235B0 */ ldc1 $f2, %lo(D_802435B0_E15D10)($at) -/* E12794 80240034 46002021 */ cvt.d.s $f0, $f4 -/* E12798 80240038 4622003C */ c.lt.d $f0, $f2 -/* E1279C 8024003C 00000000 */ nop -/* E127A0 80240040 45000003 */ bc1f .L80240050 -/* E127A4 80240044 0080802D */ daddu $s0, $a0, $zero -/* E127A8 80240048 3C01C2BE */ lui $at, 0xc2be -/* E127AC 8024004C 44812000 */ mtc1 $at, $f4 -.L80240050: -/* E127B0 80240050 3C018024 */ lui $at, %hi(D_802435B8_E15D18) -/* E127B4 80240054 D42235B8 */ ldc1 $f2, %lo(D_802435B8_E15D18)($at) -/* E127B8 80240058 46002021 */ cvt.d.s $f0, $f4 -/* E127BC 8024005C 4620103C */ c.lt.d $f2, $f0 -/* E127C0 80240060 00000000 */ nop -/* E127C4 80240064 45000003 */ bc1f .L80240074 -/* E127C8 80240068 00000000 */ nop -/* E127CC 8024006C 3C0142BE */ lui $at, 0x42be -/* E127D0 80240070 44812000 */ mtc1 $at, $f4 -.L80240074: -/* E127D4 80240074 C4D80030 */ lwc1 $f24, 0x30($a2) -/* E127D8 80240078 3C01C054 */ lui $at, 0xc054 -/* E127DC 8024007C 44811800 */ mtc1 $at, $f3 -/* E127E0 80240080 44801000 */ mtc1 $zero, $f2 -/* E127E4 80240084 4600C021 */ cvt.d.s $f0, $f24 -/* E127E8 80240088 4622003C */ c.lt.d $f0, $f2 -/* E127EC 8024008C 00000000 */ nop -/* E127F0 80240090 45000003 */ bc1f .L802400A0 -/* E127F4 80240094 00000000 */ nop -/* E127F8 80240098 3C01C2A0 */ lui $at, 0xc2a0 -/* E127FC 8024009C 4481C000 */ mtc1 $at, $f24 -.L802400A0: -/* E12800 802400A0 3C014054 */ lui $at, 0x4054 -/* E12804 802400A4 44811800 */ mtc1 $at, $f3 -/* E12808 802400A8 44801000 */ mtc1 $zero, $f2 -/* E1280C 802400AC 4600C021 */ cvt.d.s $f0, $f24 -/* E12810 802400B0 4620103C */ c.lt.d $f2, $f0 -/* E12814 802400B4 00000000 */ nop -/* E12818 802400B8 45000003 */ bc1f .L802400C8 -/* E1281C 802400BC 00000000 */ nop -/* E12820 802400C0 3C0142A0 */ lui $at, 0x42a0 -/* E12824 802400C4 4481C000 */ mtc1 $at, $f24 -.L802400C8: -/* E12828 802400C8 3C018024 */ lui $at, %hi(D_802435C0_E15D20) -/* E1282C 802400CC D42035C0 */ ldc1 $f0, %lo(D_802435C0_E15D20)($at) -/* E12830 802400D0 4600C521 */ cvt.d.s $f20, $f24 -/* E12834 802400D4 4620A502 */ mul.d $f20, $f20, $f0 -/* E12838 802400D8 00000000 */ nop -/* E1283C 802400DC 3C018024 */ lui $at, %hi(D_802435C8_E15D28) -/* E12840 802400E0 D42035C8 */ ldc1 $f0, %lo(D_802435C8_E15D28)($at) -/* E12844 802400E4 4620A502 */ mul.d $f20, $f20, $f0 -/* E12848 802400E8 00000000 */ nop -/* E1284C 802400EC 3C018024 */ lui $at, %hi(D_802435D0_E15D30) -/* E12850 802400F0 D42035D0 */ ldc1 $f0, %lo(D_802435D0_E15D30)($at) -/* E12854 802400F4 460025A1 */ cvt.d.s $f22, $f4 -/* E12858 802400F8 4620B582 */ mul.d $f22, $f22, $f0 -/* E1285C 802400FC 00000000 */ nop -/* E12860 80240100 0200202D */ daddu $a0, $s0, $zero -/* E12864 80240104 3C05FE36 */ lui $a1, 0xfe36 -/* E12868 80240108 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E1286C 8024010C 44062000 */ mfc1 $a2, $f4 -/* E12870 80240110 4620A520 */ cvt.s.d $f20, $f20 -/* E12874 80240114 0C0B2190 */ jal evt_set_float_variable -/* E12878 80240118 4620B5A0 */ cvt.s.d $f22, $f22 -/* E1287C 8024011C 0200202D */ daddu $a0, $s0, $zero -/* E12880 80240120 3C05FE36 */ lui $a1, 0xfe36 -/* E12884 80240124 4406C000 */ mfc1 $a2, $f24 -/* E12888 80240128 0C0B2190 */ jal evt_set_float_variable -/* E1288C 8024012C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E12890 80240130 0200202D */ daddu $a0, $s0, $zero -/* E12894 80240134 3C05FE36 */ lui $a1, 0xfe36 -/* E12898 80240138 4406A000 */ mfc1 $a2, $f20 -/* E1289C 8024013C 0C0B2190 */ jal evt_set_float_variable -/* E128A0 80240140 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E128A4 80240144 0200202D */ daddu $a0, $s0, $zero -/* E128A8 80240148 3C05FE36 */ lui $a1, 0xfe36 -/* E128AC 8024014C 4406B000 */ mfc1 $a2, $f22 -/* E128B0 80240150 0C0B2190 */ jal evt_set_float_variable -/* E128B4 80240154 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E128B8 80240158 8E230000 */ lw $v1, ($s1) -/* E128BC 8024015C C4600028 */ lwc1 $f0, 0x28($v1) -/* E128C0 80240160 3C018024 */ lui $at, %hi(D_802435D8_E15D38) -/* E128C4 80240164 D42235D8 */ ldc1 $f2, %lo(D_802435D8_E15D38)($at) -/* E128C8 80240168 46000021 */ cvt.d.s $f0, $f0 -/* E128CC 8024016C 46220002 */ mul.d $f0, $f0, $f2 -/* E128D0 80240170 00000000 */ nop -/* E128D4 80240174 3C028015 */ lui $v0, %hi(D_80151328) -/* E128D8 80240178 8C421328 */ lw $v0, %lo(D_80151328)($v0) -/* E128DC 8024017C 3C0142A0 */ lui $at, 0x42a0 -/* E128E0 80240180 44811000 */ mtc1 $at, $f2 -/* E128E4 80240184 00000000 */ nop -/* E128E8 80240188 E442000C */ swc1 $f2, 0xc($v0) -/* E128EC 8024018C 3C014248 */ lui $at, 0x4248 -/* E128F0 80240190 44811000 */ mtc1 $at, $f2 -/* E128F4 80240194 46200020 */ cvt.s.d $f0, $f0 -/* E128F8 80240198 E4400008 */ swc1 $f0, 8($v0) -/* E128FC 8024019C C4600030 */ lwc1 $f0, 0x30($v1) -/* E12900 802401A0 46020000 */ add.s $f0, $f0, $f2 -/* E12904 802401A4 E4400010 */ swc1 $f0, 0x10($v0) -/* E12908 802401A8 8FBF0018 */ lw $ra, 0x18($sp) -/* E1290C 802401AC 8FB10014 */ lw $s1, 0x14($sp) -/* E12910 802401B0 8FB00010 */ lw $s0, 0x10($sp) -/* E12914 802401B4 D7B80030 */ ldc1 $f24, 0x30($sp) -/* E12918 802401B8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* E1291C 802401BC D7B40020 */ ldc1 $f20, 0x20($sp) -/* E12920 802401C0 24020002 */ addiu $v0, $zero, 2 -/* E12924 802401C4 03E00008 */ jr $ra -/* E12928 802401C8 27BD0038 */ addiu $sp, $sp, 0x38 -/* E1292C 802401CC 00000000 */ nop 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 deleted file mode 100644 index f0afbb168b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802401D0_E12930.s +++ /dev/null @@ -1,141 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0_E12930 -/* E12930 802401D0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* E12934 802401D4 0000202D */ daddu $a0, $zero, $zero -/* E12938 802401D8 AFBF0058 */ sw $ra, 0x58($sp) -/* E1293C 802401DC AFB10054 */ sw $s1, 0x54($sp) -/* E12940 802401E0 0C00FB3A */ jal get_enemy -/* E12944 802401E4 AFB00050 */ sw $s0, 0x50($sp) -/* E12948 802401E8 2404FFFF */ addiu $a0, $zero, -1 -/* E1294C 802401EC 8C430074 */ lw $v1, 0x74($v0) -/* E12950 802401F0 1464000B */ bne $v1, $a0, .L80240220 -/* E12954 802401F4 8C510080 */ lw $s1, 0x80($v0) -/* E12958 802401F8 8E230014 */ lw $v1, 0x14($s1) -/* E1295C 802401FC 28620141 */ slti $v0, $v1, 0x141 -/* E12960 80240200 1040006B */ beqz $v0, .L802403B0 -/* E12964 80240204 2462000A */ addiu $v0, $v1, 0xa -/* E12968 80240208 AE220014 */ sw $v0, 0x14($s1) -/* E1296C 8024020C 28420142 */ slti $v0, $v0, 0x142 -/* E12970 80240210 1440000C */ bnez $v0, .L80240244 -/* E12974 80240214 24020141 */ addiu $v0, $zero, 0x141 -/* E12978 80240218 08090091 */ j .L80240244 -/* E1297C 8024021C AE220014 */ sw $v0, 0x14($s1) -.L80240220: -/* E12980 80240220 8E230014 */ lw $v1, 0x14($s1) -/* E12984 80240224 286200DD */ slti $v0, $v1, 0xdd -/* E12988 80240228 14400006 */ bnez $v0, .L80240244 -/* E1298C 8024022C 2462FFF6 */ addiu $v0, $v1, -0xa -/* E12990 80240230 AE220014 */ sw $v0, 0x14($s1) -/* E12994 80240234 284200DC */ slti $v0, $v0, 0xdc -/* E12998 80240238 10400002 */ beqz $v0, .L80240244 -/* E1299C 8024023C 240200DC */ addiu $v0, $zero, 0xdc -/* E129A0 80240240 AE220014 */ sw $v0, 0x14($s1) -.L80240244: -/* E129A4 80240244 8E220014 */ lw $v0, 0x14($s1) -/* E129A8 80240248 28420141 */ slti $v0, $v0, 0x141 -/* E129AC 8024024C 10400058 */ beqz $v0, .L802403B0 -/* E129B0 80240250 0000202D */ daddu $a0, $zero, $zero -/* E129B4 80240254 24050009 */ addiu $a1, $zero, 9 -/* E129B8 80240258 24020048 */ addiu $v0, $zero, 0x48 -/* E129BC 8024025C AFA20014 */ sw $v0, 0x14($sp) -/* E129C0 80240260 24020014 */ addiu $v0, $zero, 0x14 -/* E129C4 80240264 AFA20018 */ sw $v0, 0x18($sp) -/* E129C8 80240268 240200FF */ addiu $v0, $zero, 0xff -/* E129CC 8024026C AFA2001C */ sw $v0, 0x1c($sp) -/* E129D0 80240270 24020140 */ addiu $v0, $zero, 0x140 -/* E129D4 80240274 AFA20044 */ sw $v0, 0x44($sp) -/* E129D8 80240278 240200F0 */ addiu $v0, $zero, 0xf0 -/* E129DC 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* E129E0 80240280 AFA00020 */ sw $zero, 0x20($sp) -/* E129E4 80240284 AFA00024 */ sw $zero, 0x24($sp) -/* E129E8 80240288 AFA00028 */ sw $zero, 0x28($sp) -/* E129EC 8024028C AFA0002C */ sw $zero, 0x2c($sp) -/* E129F0 80240290 AFA00030 */ sw $zero, 0x30($sp) -/* E129F4 80240294 AFA00034 */ sw $zero, 0x34($sp) -/* E129F8 80240298 AFA00038 */ sw $zero, 0x38($sp) -/* E129FC 8024029C AFA0003C */ sw $zero, 0x3c($sp) -/* E12A00 802402A0 AFA00040 */ sw $zero, 0x40($sp) -/* E12A04 802402A4 AFA20048 */ sw $v0, 0x48($sp) -/* E12A08 802402A8 AFA0004C */ sw $zero, 0x4c($sp) -/* E12A0C 802402AC 8E260014 */ lw $a2, 0x14($s1) -/* E12A10 802402B0 0C03D4B8 */ jal draw_box -/* E12A14 802402B4 2407001C */ addiu $a3, $zero, 0x1c -/* E12A18 802402B8 24060027 */ addiu $a2, $zero, 0x27 -/* 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 hud_element_set_render_pos -/* E12A2C 802402CC 24A5000F */ addiu $a1, $a1, 0xf -/* 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) -/* E12A40 802402E0 0064102A */ slt $v0, $v1, $a0 -/* E12A44 802402E4 10400003 */ beqz $v0, .L802402F4 -/* E12A48 802402E8 0083102A */ slt $v0, $a0, $v1 -/* E12A4C 802402EC 080900E1 */ j .L80240384 -/* E12A50 802402F0 AE23000C */ sw $v1, 0xc($s1) -.L802402F4: -/* E12A54 802402F4 10400023 */ beqz $v0, .L80240384 -/* E12A58 802402F8 00641823 */ subu $v1, $v1, $a0 -/* E12A5C 802402FC 28620065 */ slti $v0, $v1, 0x65 -/* E12A60 80240300 14400003 */ bnez $v0, .L80240310 -/* E12A64 80240304 2862004C */ slti $v0, $v1, 0x4c -/* E12A68 80240308 080900DB */ j .L8024036C -/* E12A6C 8024030C 24820028 */ addiu $v0, $a0, 0x28 -.L80240310: -/* E12A70 80240310 14400003 */ bnez $v0, .L80240320 -/* E12A74 80240314 28620033 */ slti $v0, $v1, 0x33 -/* E12A78 80240318 080900DB */ j .L8024036C -/* E12A7C 8024031C 24820023 */ addiu $v0, $a0, 0x23 -.L80240320: -/* E12A80 80240320 14400003 */ bnez $v0, .L80240330 -/* E12A84 80240324 2862001F */ slti $v0, $v1, 0x1f -/* E12A88 80240328 080900DB */ j .L8024036C -/* E12A8C 8024032C 2482001E */ addiu $v0, $a0, 0x1e -.L80240330: -/* E12A90 80240330 14400003 */ bnez $v0, .L80240340 -/* E12A94 80240334 28620015 */ slti $v0, $v1, 0x15 -/* E12A98 80240338 080900DB */ j .L8024036C -/* E12A9C 8024033C 24820014 */ addiu $v0, $a0, 0x14 -.L80240340: -/* E12AA0 80240340 14400003 */ bnez $v0, .L80240350 -/* E12AA4 80240344 2862000B */ slti $v0, $v1, 0xb -/* E12AA8 80240348 080900DB */ j .L8024036C -/* E12AAC 8024034C 2482000A */ addiu $v0, $a0, 0xa -.L80240350: -/* E12AB0 80240350 14400003 */ bnez $v0, .L80240360 -/* E12AB4 80240354 28620006 */ slti $v0, $v1, 6 -/* E12AB8 80240358 080900DB */ j .L8024036C -/* E12ABC 8024035C 24820005 */ addiu $v0, $a0, 5 -.L80240360: -/* E12AC0 80240360 14400002 */ bnez $v0, .L8024036C -/* E12AC4 80240364 24820001 */ addiu $v0, $a0, 1 -/* E12AC8 80240368 24820002 */ addiu $v0, $a0, 2 -.L8024036C: -/* E12ACC 8024036C AE22000C */ sw $v0, 0xc($s1) -/* E12AD0 80240370 24040211 */ addiu $a0, $zero, 0x211 -/* E12AD4 80240374 0000282D */ daddu $a1, $zero, $zero -/* E12AD8 80240378 24060040 */ addiu $a2, $zero, 0x40 -/* E12ADC 8024037C 0C0526AE */ jal sfx_play_sound_with_params -/* E12AE0 80240380 24070032 */ addiu $a3, $zero, 0x32 -.L80240384: -/* E12AE4 80240384 24060020 */ addiu $a2, $zero, 0x20 -/* E12AE8 80240388 24070001 */ addiu $a3, $zero, 1 -/* E12AEC 8024038C 8E250014 */ lw $a1, 0x14($s1) -/* E12AF0 80240390 240200FF */ addiu $v0, $zero, 0xff -/* E12AF4 80240394 AFA20014 */ sw $v0, 0x14($sp) -/* E12AF8 80240398 24020003 */ addiu $v0, $zero, 3 -/* E12AFC 8024039C AFA00010 */ sw $zero, 0x10($sp) -/* E12B00 802403A0 AFA20018 */ sw $v0, 0x18($sp) -/* E12B04 802403A4 8E24000C */ lw $a0, 0xc($s1) -/* E12B08 802403A8 0C049DA7 */ jal draw_number -/* E12B0C 802403AC 24A5003F */ addiu $a1, $a1, 0x3f -.L802403B0: -/* E12B10 802403B0 8FBF0058 */ lw $ra, 0x58($sp) -/* E12B14 802403B4 8FB10054 */ lw $s1, 0x54($sp) -/* E12B18 802403B8 8FB00050 */ lw $s0, 0x50($sp) -/* E12B1C 802403BC 03E00008 */ jr $ra -/* E12B20 802403C0 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403C4_E12B24.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403C4_E12B24.s deleted file mode 100644 index f1befaa048..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403C4_E12B24.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C4_E12B24 -/* E12B24 802403C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E12B28 802403C8 2402002D */ addiu $v0, $zero, 0x2d -/* E12B2C 802403CC AFA20010 */ sw $v0, 0x10($sp) -/* E12B30 802403D0 3C028024 */ lui $v0, %hi(func_802401D0_E12930) -/* E12B34 802403D4 244201D0 */ addiu $v0, $v0, %lo(func_802401D0_E12930) -/* E12B38 802403D8 27A40010 */ addiu $a0, $sp, 0x10 -/* E12B3C 802403DC AFBF0020 */ sw $ra, 0x20($sp) -/* E12B40 802403E0 AFA00018 */ sw $zero, 0x18($sp) -/* E12B44 802403E4 AFA2001C */ sw $v0, 0x1c($sp) -/* E12B48 802403E8 0C047644 */ jal queue_render_task -/* E12B4C 802403EC AFA00014 */ sw $zero, 0x14($sp) -/* E12B50 802403F0 8FBF0020 */ lw $ra, 0x20($sp) -/* E12B54 802403F4 03E00008 */ jr $ra -/* E12B58 802403F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403FC_E12B5C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403FC_E12B5C.s deleted file mode 100644 index b178232505..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403FC_E12B5C.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC_E12B5C -/* E12B5C 802403FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E12B60 80240400 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* E12B64 80240404 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* E12B68 80240408 AFBF0010 */ sw $ra, 0x10($sp) -/* E12B6C 8024040C 8C430000 */ lw $v1, ($v0) -/* E12B70 80240410 3C040004 */ lui $a0, 4 -/* E12B74 80240414 00641825 */ or $v1, $v1, $a0 -/* E12B78 80240418 0C03A625 */ jal func_800E9894 -/* E12B7C 8024041C AC430000 */ sw $v1, ($v0) -/* E12B80 80240420 0C03A5EE */ jal close_status_menu -/* E12B84 80240424 00000000 */ nop -/* E12B88 80240428 8FBF0010 */ lw $ra, 0x10($sp) -/* E12B8C 8024042C 24020002 */ addiu $v0, $zero, 2 -/* E12B90 80240430 03E00008 */ jr $ra -/* E12B94 80240434 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240438_E12B98.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240438_E12B98.s deleted file mode 100644 index 0b3f8b9d3b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240438_E12B98.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240438_E12B98 -/* E12B98 80240438 3C04FFFB */ lui $a0, 0xfffb -/* E12B9C 8024043C 3C03800A */ lui $v1, %hi(gOverrideFlags) -/* E12BA0 80240440 2463A650 */ addiu $v1, $v1, %lo(gOverrideFlags) -/* E12BA4 80240444 8C620000 */ lw $v0, ($v1) -/* E12BA8 80240448 3484FFFF */ ori $a0, $a0, 0xffff -/* E12BAC 8024044C 00441024 */ and $v0, $v0, $a0 -/* E12BB0 80240450 AC620000 */ sw $v0, ($v1) -/* E12BB4 80240454 03E00008 */ jr $ra -/* E12BB8 80240458 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024045C_E12BBC.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024045C_E12BBC.s deleted file mode 100644 index de5ce8335d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024045C_E12BBC.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024045C_E12BBC -/* E12BBC 8024045C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E12BC0 80240460 AFB10014 */ sw $s1, 0x14($sp) -/* E12BC4 80240464 0080882D */ daddu $s1, $a0, $zero -/* E12BC8 80240468 0000202D */ daddu $a0, $zero, $zero -/* E12BCC 8024046C AFBF0018 */ sw $ra, 0x18($sp) -/* E12BD0 80240470 0C00FB3A */ jal get_enemy -/* E12BD4 80240474 AFB00010 */ sw $s0, 0x10($sp) -/* E12BD8 80240478 8E23000C */ lw $v1, 0xc($s1) -/* E12BDC 8024047C 8C650000 */ lw $a1, ($v1) -/* E12BE0 80240480 8C500080 */ lw $s0, 0x80($v0) -/* E12BE4 80240484 0C0B1EAF */ jal evt_get_variable -/* E12BE8 80240488 0220202D */ daddu $a0, $s1, $zero -/* E12BEC 8024048C 0220202D */ daddu $a0, $s1, $zero -/* E12BF0 80240490 3C05FE36 */ lui $a1, 0xfe36 -/* E12BF4 80240494 00021840 */ sll $v1, $v0, 1 -/* E12BF8 80240498 00621821 */ addu $v1, $v1, $v0 -/* E12BFC 8024049C 000318C0 */ sll $v1, $v1, 3 -/* E12C00 802404A0 00621823 */ subu $v1, $v1, $v0 -/* E12C04 802404A4 00031880 */ sll $v1, $v1, 2 -/* E12C08 802404A8 02038021 */ addu $s0, $s0, $v1 -/* E12C0C 802404AC 8E060074 */ lw $a2, 0x74($s0) -/* E12C10 802404B0 0C0B2026 */ jal evt_set_variable -/* E12C14 802404B4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E12C18 802404B8 0220202D */ daddu $a0, $s1, $zero -/* E12C1C 802404BC 3C05FE36 */ lui $a1, 0xfe36 -/* E12C20 802404C0 8E060078 */ lw $a2, 0x78($s0) -/* E12C24 802404C4 0C0B2026 */ jal evt_set_variable -/* E12C28 802404C8 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E12C2C 802404CC 0220202D */ daddu $a0, $s1, $zero -/* E12C30 802404D0 3C05FE36 */ lui $a1, 0xfe36 -/* E12C34 802404D4 8E06007C */ lw $a2, 0x7c($s0) -/* E12C38 802404D8 0C0B2026 */ jal evt_set_variable -/* E12C3C 802404DC 34A53C82 */ ori $a1, $a1, 0x3c82 -/* E12C40 802404E0 0220202D */ daddu $a0, $s1, $zero -/* E12C44 802404E4 3C05FE36 */ lui $a1, 0xfe36 -/* E12C48 802404E8 8E060084 */ lw $a2, 0x84($s0) -/* E12C4C 802404EC 0C0B2026 */ jal evt_set_variable -/* E12C50 802404F0 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E12C54 802404F4 8FBF0018 */ lw $ra, 0x18($sp) -/* E12C58 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* E12C5C 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* E12C60 80240500 24020002 */ addiu $v0, $zero, 2 -/* E12C64 80240504 03E00008 */ jr $ra -/* E12C68 80240508 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024050C_E12C6C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024050C_E12C6C.s deleted file mode 100644 index a023738a94..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024050C_E12C6C.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024050C_E12C6C -/* E12C6C 8024050C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E12C70 80240510 AFB10014 */ sw $s1, 0x14($sp) -/* E12C74 80240514 0080882D */ daddu $s1, $a0, $zero -/* E12C78 80240518 0000202D */ daddu $a0, $zero, $zero -/* E12C7C 8024051C AFBF001C */ sw $ra, 0x1c($sp) -/* E12C80 80240520 AFB20018 */ sw $s2, 0x18($sp) -/* E12C84 80240524 0C00FB3A */ jal get_enemy -/* E12C88 80240528 AFB00010 */ sw $s0, 0x10($sp) -/* E12C8C 8024052C 0220202D */ daddu $a0, $s1, $zero -/* E12C90 80240530 8E30000C */ lw $s0, 0xc($s1) -/* E12C94 80240534 8C520080 */ lw $s2, 0x80($v0) -/* E12C98 80240538 8E050000 */ lw $a1, ($s0) -/* E12C9C 8024053C 0C0B1EAF */ jal evt_get_variable -/* E12CA0 80240540 26100004 */ addiu $s0, $s0, 4 -/* E12CA4 80240544 0220202D */ daddu $a0, $s1, $zero -/* E12CA8 80240548 8E050000 */ lw $a1, ($s0) -/* E12CAC 8024054C 0C0B1EAF */ jal evt_get_variable -/* E12CB0 80240550 0040802D */ daddu $s0, $v0, $zero -/* E12CB4 80240554 00101840 */ sll $v1, $s0, 1 -/* E12CB8 80240558 00701821 */ addu $v1, $v1, $s0 -/* E12CBC 8024055C 000318C0 */ sll $v1, $v1, 3 -/* E12CC0 80240560 00701823 */ subu $v1, $v1, $s0 -/* E12CC4 80240564 00031880 */ sll $v1, $v1, 2 -/* E12CC8 80240568 02439021 */ addu $s2, $s2, $v1 -/* E12CCC 8024056C AE420074 */ sw $v0, 0x74($s2) -/* E12CD0 80240570 8FBF001C */ lw $ra, 0x1c($sp) -/* E12CD4 80240574 8FB20018 */ lw $s2, 0x18($sp) -/* E12CD8 80240578 8FB10014 */ lw $s1, 0x14($sp) -/* E12CDC 8024057C 8FB00010 */ lw $s0, 0x10($sp) -/* E12CE0 80240580 24020002 */ addiu $v0, $zero, 2 -/* E12CE4 80240584 03E00008 */ jr $ra -/* E12CE8 80240588 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s deleted file mode 100644 index 556f2a196c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802435E0_E15D40 -.double 35.0 - -.section .text - -glabel func_8024058C_E12CEC -/* E12CEC 8024058C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E12CF0 80240590 AFB00010 */ sw $s0, 0x10($sp) -/* E12CF4 80240594 0080802D */ daddu $s0, $a0, $zero -/* E12CF8 80240598 AFBF0014 */ sw $ra, 0x14($sp) -/* E12CFC 8024059C 0C00FB3A */ jal get_enemy -/* E12D00 802405A0 0000202D */ daddu $a0, $zero, $zero -/* E12D04 802405A4 8E03000C */ lw $v1, 0xc($s0) -/* E12D08 802405A8 0200202D */ daddu $a0, $s0, $zero -/* E12D0C 802405AC 8C650000 */ lw $a1, ($v1) -/* E12D10 802405B0 0C0B1EAF */ jal evt_get_variable -/* E12D14 802405B4 8C500080 */ lw $s0, 0x80($v0) -/* E12D18 802405B8 00021840 */ sll $v1, $v0, 1 -/* E12D1C 802405BC 00621821 */ addu $v1, $v1, $v0 -/* E12D20 802405C0 000318C0 */ sll $v1, $v1, 3 -/* E12D24 802405C4 00621823 */ subu $v1, $v1, $v0 -/* E12D28 802405C8 00031880 */ sll $v1, $v1, 2 -/* E12D2C 802405CC 02038021 */ addu $s0, $s0, $v1 -/* E12D30 802405D0 8E030080 */ lw $v1, 0x80($s0) -/* E12D34 802405D4 24020005 */ addiu $v0, $zero, 5 -/* E12D38 802405D8 AE00008C */ sw $zero, 0x8c($s0) -/* E12D3C 802405DC AE020090 */ sw $v0, 0x90($s0) -/* E12D40 802405E0 3C028024 */ lui $v0, %hi(D_80241AC8_E14228) -/* E12D44 802405E4 00431021 */ addu $v0, $v0, $v1 -/* E12D48 802405E8 80421AC8 */ lb $v0, %lo(D_80241AC8_E14228)($v0) -/* E12D4C 802405EC 44820000 */ mtc1 $v0, $f0 -/* E12D50 802405F0 00000000 */ nop -/* E12D54 802405F4 46800020 */ cvt.s.w $f0, $f0 -/* E12D58 802405F8 E6000094 */ swc1 $f0, 0x94($s0) -/* E12D5C 802405FC 3C028024 */ lui $v0, %hi(D_80241AD4_E14234) -/* E12D60 80240600 00431021 */ addu $v0, $v0, $v1 -/* E12D64 80240604 80421AD4 */ lb $v0, %lo(D_80241AD4_E14234)($v0) -/* E12D68 80240608 3C01402E */ lui $at, 0x402e -/* E12D6C 8024060C 44811800 */ mtc1 $at, $f3 -/* E12D70 80240610 44801000 */ mtc1 $zero, $f2 -/* E12D74 80240614 44820000 */ mtc1 $v0, $f0 -/* E12D78 80240618 00000000 */ nop -/* E12D7C 8024061C 46800021 */ cvt.d.w $f0, $f0 -/* E12D80 80240620 46220000 */ add.d $f0, $f0, $f2 -/* E12D84 80240624 3C014000 */ lui $at, 0x4000 -/* E12D88 80240628 44813000 */ mtc1 $at, $f6 -/* E12D8C 8024062C C6020094 */ lwc1 $f2, 0x94($s0) -/* E12D90 80240630 46200020 */ cvt.s.d $f0, $f0 -/* E12D94 80240634 E6000098 */ swc1 $f0, 0x98($s0) -/* E12D98 80240638 3C018024 */ lui $at, %hi(D_80241AE0_E14240) -/* E12D9C 8024063C 00230821 */ addu $at, $at, $v1 -/* E12DA0 80240640 80231AE0 */ lb $v1, %lo(D_80241AE0_E14240)($at) -/* E12DA4 80240644 3C013F80 */ lui $at, 0x3f80 -/* E12DA8 80240648 44810000 */ mtc1 $at, $f0 -/* E12DAC 8024064C 46001106 */ mov.s $f4, $f2 -/* E12DB0 80240650 E60400AC */ swc1 $f4, 0xac($s0) -/* E12DB4 80240654 C6040098 */ lwc1 $f4, 0x98($s0) -/* E12DB8 80240658 E60200A0 */ swc1 $f2, 0xa0($s0) -/* E12DBC 8024065C AE0000B8 */ sw $zero, 0xb8($s0) -/* E12DC0 80240660 E60600CC */ swc1 $f6, 0xcc($s0) -/* E12DC4 80240664 2463000C */ addiu $v1, $v1, 0xc -/* E12DC8 80240668 E60000C4 */ swc1 $f0, 0xc4($s0) -/* E12DCC 8024066C E60000C8 */ swc1 $f0, 0xc8($s0) -/* E12DD0 80240670 46002006 */ mov.s $f0, $f4 -/* E12DD4 80240674 44831000 */ mtc1 $v1, $f2 -/* E12DD8 80240678 00000000 */ nop -/* E12DDC 8024067C 468010A0 */ cvt.s.w $f2, $f2 -/* E12DE0 80240680 E602009C */ swc1 $f2, 0x9c($s0) -/* E12DE4 80240684 46001186 */ mov.s $f6, $f2 -/* E12DE8 80240688 3C018024 */ lui $at, %hi(D_802435E0_E15D40) -/* E12DEC 8024068C D42235E0 */ ldc1 $f2, %lo(D_802435E0_E15D40)($at) -/* E12DF0 80240690 46000021 */ cvt.d.s $f0, $f0 -/* E12DF4 80240694 E60400A4 */ swc1 $f4, 0xa4($s0) -/* E12DF8 80240698 46003106 */ mov.s $f4, $f6 -/* E12DFC 8024069C 46220000 */ add.d $f0, $f0, $f2 -/* E12E00 802406A0 E60600A8 */ swc1 $f6, 0xa8($s0) -/* E12E04 802406A4 E60400B4 */ swc1 $f4, 0xb4($s0) -/* E12E08 802406A8 46200020 */ cvt.s.d $f0, $f0 -/* E12E0C 802406AC E60000B0 */ swc1 $f0, 0xb0($s0) -/* E12E10 802406B0 8FBF0014 */ lw $ra, 0x14($sp) -/* E12E14 802406B4 8FB00010 */ lw $s0, 0x10($sp) -/* E12E18 802406B8 24020002 */ addiu $v0, $zero, 2 -/* E12E1C 802406BC 03E00008 */ jr $ra -/* E12E20 802406C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802406C4_E12E24.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802406C4_E12E24.s deleted file mode 100644 index 36b2c02654..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802406C4_E12E24.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406C4_E12E24 -/* E12E24 802406C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E12E28 802406C8 AFB1001C */ sw $s1, 0x1c($sp) -/* E12E2C 802406CC 0080882D */ daddu $s1, $a0, $zero -/* E12E30 802406D0 0000202D */ daddu $a0, $zero, $zero -/* E12E34 802406D4 AFBF0020 */ sw $ra, 0x20($sp) -/* E12E38 802406D8 0C00FB3A */ jal get_enemy -/* E12E3C 802406DC AFB00018 */ sw $s0, 0x18($sp) -/* E12E40 802406E0 8E23000C */ lw $v1, 0xc($s1) -/* E12E44 802406E4 8C650000 */ lw $a1, ($v1) -/* E12E48 802406E8 8C500080 */ lw $s0, 0x80($v0) -/* E12E4C 802406EC 0C0B1EAF */ jal evt_get_variable -/* E12E50 802406F0 0220202D */ daddu $a0, $s1, $zero -/* E12E54 802406F4 00021840 */ sll $v1, $v0, 1 -/* E12E58 802406F8 00621821 */ addu $v1, $v1, $v0 -/* E12E5C 802406FC 000318C0 */ sll $v1, $v1, 3 -/* E12E60 80240700 00621823 */ subu $v1, $v1, $v0 -/* E12E64 80240704 00031880 */ sll $v1, $v1, 2 -/* E12E68 80240708 02038021 */ addu $s0, $s0, $v1 -/* E12E6C 8024070C 8E020090 */ lw $v0, 0x90($s0) -/* E12E70 80240710 AFA20010 */ sw $v0, 0x10($sp) -/* E12E74 80240714 8E0500A0 */ lw $a1, 0xa0($s0) -/* E12E78 80240718 8E0600AC */ lw $a2, 0xac($s0) -/* E12E7C 8024071C 8E07008C */ lw $a3, 0x8c($s0) -/* E12E80 80240720 0C00A8ED */ jal update_lerp -/* E12E84 80240724 24040004 */ addiu $a0, $zero, 4 -/* E12E88 80240728 8E020090 */ lw $v0, 0x90($s0) -/* E12E8C 8024072C E6000094 */ swc1 $f0, 0x94($s0) -/* E12E90 80240730 AFA20010 */ sw $v0, 0x10($sp) -/* E12E94 80240734 8E0500A4 */ lw $a1, 0xa4($s0) -/* E12E98 80240738 8E0600B0 */ lw $a2, 0xb0($s0) -/* E12E9C 8024073C 8E07008C */ lw $a3, 0x8c($s0) -/* E12EA0 80240740 0C00A8ED */ jal update_lerp -/* E12EA4 80240744 24040004 */ addiu $a0, $zero, 4 -/* E12EA8 80240748 8E020090 */ lw $v0, 0x90($s0) -/* E12EAC 8024074C E6000098 */ swc1 $f0, 0x98($s0) -/* E12EB0 80240750 AFA20010 */ sw $v0, 0x10($sp) -/* E12EB4 80240754 8E0500A8 */ lw $a1, 0xa8($s0) -/* E12EB8 80240758 8E0600B4 */ lw $a2, 0xb4($s0) -/* E12EBC 8024075C 8E07008C */ lw $a3, 0x8c($s0) -/* E12EC0 80240760 0C00A8ED */ jal update_lerp -/* E12EC4 80240764 24040004 */ addiu $a0, $zero, 4 -/* E12EC8 80240768 8E020090 */ lw $v0, 0x90($s0) -/* E12ECC 8024076C E600009C */ swc1 $f0, 0x9c($s0) -/* E12ED0 80240770 AFA20010 */ sw $v0, 0x10($sp) -/* E12ED4 80240774 8E0500C8 */ lw $a1, 0xc8($s0) -/* E12ED8 80240778 8E0600CC */ lw $a2, 0xcc($s0) -/* E12EDC 8024077C 8E07008C */ lw $a3, 0x8c($s0) -/* E12EE0 80240780 0C00A8ED */ jal update_lerp -/* E12EE4 80240784 0000202D */ daddu $a0, $zero, $zero -/* E12EE8 80240788 8E02008C */ lw $v0, 0x8c($s0) -/* E12EEC 8024078C 8E030090 */ lw $v1, 0x90($s0) -/* E12EF0 80240790 E60000C4 */ swc1 $f0, 0xc4($s0) -/* E12EF4 80240794 24420001 */ addiu $v0, $v0, 1 -/* E12EF8 80240798 AE02008C */ sw $v0, 0x8c($s0) -/* E12EFC 8024079C 0043102A */ slt $v0, $v0, $v1 -/* E12F00 802407A0 14400005 */ bnez $v0, .L802407B8 -/* E12F04 802407A4 0220202D */ daddu $a0, $s1, $zero -/* E12F08 802407A8 3C05FE36 */ lui $a1, 0xfe36 -/* E12F0C 802407AC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E12F10 802407B0 080901F1 */ j .L802407C4 -/* E12F14 802407B4 24060001 */ addiu $a2, $zero, 1 -.L802407B8: -/* E12F18 802407B8 3C05FE36 */ lui $a1, 0xfe36 -/* E12F1C 802407BC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E12F20 802407C0 0000302D */ daddu $a2, $zero, $zero -.L802407C4: -/* E12F24 802407C4 0C0B2026 */ jal evt_set_variable -/* E12F28 802407C8 00000000 */ nop -/* E12F2C 802407CC 8FBF0020 */ lw $ra, 0x20($sp) -/* E12F30 802407D0 8FB1001C */ lw $s1, 0x1c($sp) -/* E12F34 802407D4 8FB00018 */ lw $s0, 0x18($sp) -/* E12F38 802407D8 24020002 */ addiu $v0, $zero, 2 -/* E12F3C 802407DC 03E00008 */ jr $ra -/* E12F40 802407E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802407E4_E12F44.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802407E4_E12F44.s deleted file mode 100644 index 613f4f6acf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802407E4_E12F44.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407E4_E12F44 -/* E12F44 802407E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E12F48 802407E8 AFB00010 */ sw $s0, 0x10($sp) -/* E12F4C 802407EC 0080802D */ daddu $s0, $a0, $zero -/* E12F50 802407F0 AFBF0014 */ sw $ra, 0x14($sp) -/* E12F54 802407F4 0C00FB3A */ jal get_enemy -/* E12F58 802407F8 0000202D */ daddu $a0, $zero, $zero -/* E12F5C 802407FC 8E03000C */ lw $v1, 0xc($s0) -/* E12F60 80240800 0200202D */ daddu $a0, $s0, $zero -/* E12F64 80240804 8C650000 */ lw $a1, ($v1) -/* E12F68 80240808 0C0B1EAF */ jal evt_get_variable -/* E12F6C 8024080C 8C500080 */ lw $s0, 0x80($v0) -/* E12F70 80240810 0040202D */ daddu $a0, $v0, $zero -/* E12F74 80240814 24020002 */ addiu $v0, $zero, 2 -/* E12F78 80240818 00041840 */ sll $v1, $a0, 1 -/* E12F7C 8024081C 00641821 */ addu $v1, $v1, $a0 -/* E12F80 80240820 000318C0 */ sll $v1, $v1, 3 -/* E12F84 80240824 00641823 */ subu $v1, $v1, $a0 -/* E12F88 80240828 00431804 */ sllv $v1, $v1, $v0 -/* E12F8C 8024082C 02038021 */ addu $s0, $s0, $v1 -/* E12F90 80240830 2403000A */ addiu $v1, $zero, 0xa -/* E12F94 80240834 AE00008C */ sw $zero, 0x8c($s0) -/* E12F98 80240838 AE030090 */ sw $v1, 0x90($s0) -/* E12F9C 8024083C 8FBF0014 */ lw $ra, 0x14($sp) -/* E12FA0 80240840 8FB00010 */ lw $s0, 0x10($sp) -/* E12FA4 80240844 03E00008 */ jr $ra -/* E12FA8 80240848 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024084C_E12FAC.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024084C_E12FAC.s deleted file mode 100644 index 4e63e6b565..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024084C_E12FAC.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024084C_E12FAC -/* E12FAC 8024084C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E12FB0 80240850 AFB10014 */ sw $s1, 0x14($sp) -/* E12FB4 80240854 0080882D */ daddu $s1, $a0, $zero -/* E12FB8 80240858 0000202D */ daddu $a0, $zero, $zero -/* E12FBC 8024085C AFBF0018 */ sw $ra, 0x18($sp) -/* E12FC0 80240860 0C00FB3A */ jal get_enemy -/* E12FC4 80240864 AFB00010 */ sw $s0, 0x10($sp) -/* E12FC8 80240868 8E23000C */ lw $v1, 0xc($s1) -/* E12FCC 8024086C 8C650000 */ lw $a1, ($v1) -/* E12FD0 80240870 8C500080 */ lw $s0, 0x80($v0) -/* E12FD4 80240874 0C0B1EAF */ jal evt_get_variable -/* E12FD8 80240878 0220202D */ daddu $a0, $s1, $zero -/* E12FDC 8024087C 00021840 */ sll $v1, $v0, 1 -/* E12FE0 80240880 00621821 */ addu $v1, $v1, $v0 -/* E12FE4 80240884 000318C0 */ sll $v1, $v1, 3 -/* E12FE8 80240888 00621823 */ subu $v1, $v1, $v0 -/* E12FEC 8024088C 00031880 */ sll $v1, $v1, 2 -/* E12FF0 80240890 02038021 */ addu $s0, $s0, $v1 -/* E12FF4 80240894 8E02008C */ lw $v0, 0x8c($s0) -/* E12FF8 80240898 8E030090 */ lw $v1, 0x90($s0) -/* E12FFC 8024089C 24420001 */ addiu $v0, $v0, 1 -/* E13000 802408A0 AE02008C */ sw $v0, 0x8c($s0) -/* E13004 802408A4 0043102A */ slt $v0, $v0, $v1 -/* E13008 802408A8 14400005 */ bnez $v0, .L802408C0 -/* E1300C 802408AC 0220202D */ daddu $a0, $s1, $zero -/* E13010 802408B0 3C05FE36 */ lui $a1, 0xfe36 -/* E13014 802408B4 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E13018 802408B8 08090233 */ j .L802408CC -/* E1301C 802408BC 24060001 */ addiu $a2, $zero, 1 -.L802408C0: -/* E13020 802408C0 3C05FE36 */ lui $a1, 0xfe36 -/* E13024 802408C4 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E13028 802408C8 0000302D */ daddu $a2, $zero, $zero -.L802408CC: -/* E1302C 802408CC 0C0B2026 */ jal evt_set_variable -/* E13030 802408D0 00000000 */ nop -/* E13034 802408D4 8FBF0018 */ lw $ra, 0x18($sp) -/* E13038 802408D8 8FB10014 */ lw $s1, 0x14($sp) -/* E1303C 802408DC 8FB00010 */ lw $s0, 0x10($sp) -/* E13040 802408E0 24020002 */ addiu $v0, $zero, 2 -/* E13044 802408E4 03E00008 */ jr $ra -/* E13048 802408E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s deleted file mode 100644 index aa44c41db4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408EC_E1304C -/* E1304C 802408EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E13050 802408F0 AFB00018 */ sw $s0, 0x18($sp) -/* E13054 802408F4 0080802D */ daddu $s0, $a0, $zero -/* E13058 802408F8 AFBF001C */ sw $ra, 0x1c($sp) -/* E1305C 802408FC 0C00FB3A */ jal get_enemy -/* E13060 80240900 0000202D */ daddu $a0, $zero, $zero -/* E13064 80240904 8E03000C */ lw $v1, 0xc($s0) -/* E13068 80240908 0200202D */ daddu $a0, $s0, $zero -/* E1306C 8024090C 8C650000 */ lw $a1, ($v1) -/* E13070 80240910 0C0B1EAF */ jal evt_get_variable -/* E13074 80240914 8C500080 */ lw $s0, 0x80($v0) -/* E13078 80240918 0040282D */ daddu $a1, $v0, $zero -/* E1307C 8024091C 00051040 */ sll $v0, $a1, 1 -/* E13080 80240920 00451021 */ addu $v0, $v0, $a1 -/* E13084 80240924 000210C0 */ sll $v0, $v0, 3 -/* E13088 80240928 00451023 */ subu $v0, $v0, $a1 -/* E1308C 8024092C 00021080 */ sll $v0, $v0, 2 -/* E13090 80240930 02022021 */ addu $a0, $s0, $v0 -/* E13094 80240934 C4800094 */ lwc1 $f0, 0x94($a0) -/* E13098 80240938 C4820098 */ lwc1 $f2, 0x98($a0) -/* E1309C 8024093C C484009C */ lwc1 $f4, 0x9c($a0) -/* E130A0 80240940 C48600C4 */ lwc1 $f6, 0xc4($a0) -/* E130A4 80240944 8C83007C */ lw $v1, 0x7c($a0) -/* E130A8 80240948 24020003 */ addiu $v0, $zero, 3 -/* E130AC 8024094C AC80008C */ sw $zero, 0x8c($a0) -/* E130B0 80240950 AC8000B8 */ sw $zero, 0xb8($a0) -/* E130B4 80240954 AC8000BC */ sw $zero, 0xbc($a0) -/* E130B8 80240958 E48000A0 */ swc1 $f0, 0xa0($a0) -/* E130BC 8024095C E48200A4 */ swc1 $f2, 0xa4($a0) -/* E130C0 80240960 E48400A8 */ swc1 $f4, 0xa8($a0) -/* E130C4 80240964 10620017 */ beq $v1, $v0, .L802409C4 -/* E130C8 80240968 E48600C8 */ swc1 $f6, 0xc8($a0) -/* E130CC 8024096C 8C820084 */ lw $v0, 0x84($a0) -/* E130D0 80240970 3C0142DC */ lui $at, 0x42dc -/* E130D4 80240974 44812000 */ mtc1 $at, $f4 -/* E130D8 80240978 00021080 */ sll $v0, $v0, 2 -/* E130DC 8024097C 3C018024 */ lui $at, %hi(D_80241AEC_E1424C) -/* E130E0 80240980 00220821 */ addu $at, $at, $v0 -/* E130E4 80240984 C4201AEC */ lwc1 $f0, %lo(D_80241AEC_E1424C)($at) -/* E130E8 80240988 8C820084 */ lw $v0, 0x84($a0) -/* E130EC 8024098C 3C013F80 */ lui $at, 0x3f80 -/* E130F0 80240990 44811000 */ mtc1 $at, $f2 -/* E130F4 80240994 00021080 */ sll $v0, $v0, 2 -/* E130F8 80240998 E48000AC */ swc1 $f0, 0xac($a0) -/* E130FC 8024099C 3C018024 */ lui $at, %hi(D_80241B18_E14278) -/* E13100 802409A0 00220821 */ addu $at, $at, $v0 -/* E13104 802409A4 C4261B18 */ lwc1 $f6, %lo(D_80241B18_E14278)($at) -/* E13108 802409A8 3C0143B4 */ lui $at, 0x43b4 -/* E1310C 802409AC 44810000 */ mtc1 $at, $f0 -/* E13110 802409B0 E48400B4 */ swc1 $f4, 0xb4($a0) -/* E13114 802409B4 E48200CC */ swc1 $f2, 0xcc($a0) -/* E13118 802409B8 E48000C0 */ swc1 $f0, 0xc0($a0) -/* E1311C 802409BC 0809027E */ j .L802409F8 -/* E13120 802409C0 E48600B0 */ swc1 $f6, 0xb0($a0) -.L802409C4: -/* E13124 802409C4 3C0142C8 */ lui $at, 0x42c8 -/* E13128 802409C8 44810000 */ mtc1 $at, $f0 -/* E1312C 802409CC 3C0142F0 */ lui $at, 0x42f0 -/* E13130 802409D0 44811000 */ mtc1 $at, $f2 -/* E13134 802409D4 3C014434 */ lui $at, 0x4434 -/* E13138 802409D8 44812000 */ mtc1 $at, $f4 -/* E1313C 802409DC 3C014080 */ lui $at, 0x4080 -/* E13140 802409E0 44813000 */ mtc1 $at, $f6 -/* E13144 802409E4 AC8000AC */ sw $zero, 0xac($a0) -/* E13148 802409E8 E48000B0 */ swc1 $f0, 0xb0($a0) -/* E1314C 802409EC E48200B4 */ swc1 $f2, 0xb4($a0) -/* E13150 802409F0 E48400C0 */ swc1 $f4, 0xc0($a0) -/* E13154 802409F4 E48600CC */ swc1 $f6, 0xcc($a0) -.L802409F8: -/* E13158 802409F8 00051040 */ sll $v0, $a1, 1 -/* E1315C 802409FC 00451021 */ addu $v0, $v0, $a1 -/* E13160 80240A00 000210C0 */ sll $v0, $v0, 3 -/* E13164 80240A04 00451023 */ subu $v0, $v0, $a1 -/* E13168 80240A08 00021080 */ sll $v0, $v0, 2 -/* E1316C 80240A0C 02028021 */ addu $s0, $s0, $v0 -/* E13170 80240A10 C60000B0 */ lwc1 $f0, 0xb0($s0) -/* E13174 80240A14 E7A00010 */ swc1 $f0, 0x10($sp) -/* E13178 80240A18 C60000B4 */ lwc1 $f0, 0xb4($s0) -/* E1317C 80240A1C E7A00014 */ swc1 $f0, 0x14($sp) -/* E13180 80240A20 C60C00A0 */ lwc1 $f12, 0xa0($s0) -/* E13184 80240A24 C60E00A4 */ lwc1 $f14, 0xa4($s0) -/* E13188 80240A28 8E0600A8 */ lw $a2, 0xa8($s0) -/* E1318C 80240A2C 0C00A7CB */ jal dist3D -/* E13190 80240A30 8E0700AC */ lw $a3, 0xac($s0) -/* E13194 80240A34 8E03007C */ lw $v1, 0x7c($s0) -/* E13198 80240A38 24020003 */ addiu $v0, $zero, 3 -/* E1319C 80240A3C 1062000C */ beq $v1, $v0, .L80240A70 -/* E131A0 80240A40 46000021 */ cvt.d.s $f0, $f0 -/* E131A4 80240A44 3C013FC0 */ lui $at, 0x3fc0 -/* E131A8 80240A48 44811800 */ mtc1 $at, $f3 -/* E131AC 80240A4C 44801000 */ mtc1 $zero, $f2 -/* E131B0 80240A50 00000000 */ nop -/* E131B4 80240A54 46220002 */ mul.d $f0, $f0, $f2 -/* E131B8 80240A58 00000000 */ nop -/* E131BC 80240A5C 3C013FE0 */ lui $at, 0x3fe0 -/* E131C0 80240A60 44811800 */ mtc1 $at, $f3 -/* E131C4 80240A64 44801000 */ mtc1 $zero, $f2 -/* E131C8 80240A68 080902A4 */ j .L80240A90 -/* E131CC 80240A6C 46220000 */ add.d $f0, $f0, $f2 -.L80240A70: -/* E131D0 80240A70 3C014014 */ lui $at, 0x4014 -/* E131D4 80240A74 44811800 */ mtc1 $at, $f3 -/* E131D8 80240A78 44801000 */ mtc1 $zero, $f2 -/* E131DC 80240A7C 3C013FE0 */ lui $at, 0x3fe0 -/* E131E0 80240A80 44812800 */ mtc1 $at, $f5 -/* E131E4 80240A84 44802000 */ mtc1 $zero, $f4 -/* E131E8 80240A88 46220003 */ div.d $f0, $f0, $f2 -/* E131EC 80240A8C 46240000 */ add.d $f0, $f0, $f4 -.L80240A90: -/* E131F0 80240A90 4620020D */ trunc.w.d $f8, $f0 -/* E131F4 80240A94 E6080090 */ swc1 $f8, 0x90($s0) -/* E131F8 80240A98 8FBF001C */ lw $ra, 0x1c($sp) -/* E131FC 80240A9C 8FB00018 */ lw $s0, 0x18($sp) -/* E13200 80240AA0 24020002 */ addiu $v0, $zero, 2 -/* E13204 80240AA4 03E00008 */ jr $ra -/* E13208 80240AA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240AAC_E1320C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240AAC_E1320C.s deleted file mode 100644 index 7c2967d237..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240AAC_E1320C.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC_E1320C -/* E1320C 80240AAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E13210 80240AB0 AFB1001C */ sw $s1, 0x1c($sp) -/* E13214 80240AB4 0080882D */ daddu $s1, $a0, $zero -/* E13218 80240AB8 0000202D */ daddu $a0, $zero, $zero -/* E1321C 80240ABC AFBF0020 */ sw $ra, 0x20($sp) -/* E13220 80240AC0 0C00FB3A */ jal get_enemy -/* E13224 80240AC4 AFB00018 */ sw $s0, 0x18($sp) -/* E13228 80240AC8 8E23000C */ lw $v1, 0xc($s1) -/* E1322C 80240ACC 8C650000 */ lw $a1, ($v1) -/* E13230 80240AD0 8C500080 */ lw $s0, 0x80($v0) -/* E13234 80240AD4 0C0B1EAF */ jal evt_get_variable -/* E13238 80240AD8 0220202D */ daddu $a0, $s1, $zero -/* E1323C 80240ADC 00021840 */ sll $v1, $v0, 1 -/* E13240 80240AE0 00621821 */ addu $v1, $v1, $v0 -/* E13244 80240AE4 000318C0 */ sll $v1, $v1, 3 -/* E13248 80240AE8 00621823 */ subu $v1, $v1, $v0 -/* E1324C 80240AEC 00031880 */ sll $v1, $v1, 2 -/* E13250 80240AF0 02038021 */ addu $s0, $s0, $v1 -/* E13254 80240AF4 8E02008C */ lw $v0, 0x8c($s0) -/* E13258 80240AF8 8E030090 */ lw $v1, 0x90($s0) -/* E1325C 80240AFC 24420001 */ addiu $v0, $v0, 1 -/* E13260 80240B00 AE02008C */ sw $v0, 0x8c($s0) -/* E13264 80240B04 AFA30010 */ sw $v1, 0x10($sp) -/* E13268 80240B08 8E0500A0 */ lw $a1, 0xa0($s0) -/* E1326C 80240B0C 8E0600AC */ lw $a2, 0xac($s0) -/* E13270 80240B10 8E07008C */ lw $a3, 0x8c($s0) -/* E13274 80240B14 0C00A8ED */ jal update_lerp -/* E13278 80240B18 24040004 */ addiu $a0, $zero, 4 -/* E1327C 80240B1C 8E020090 */ lw $v0, 0x90($s0) -/* E13280 80240B20 E6000094 */ swc1 $f0, 0x94($s0) -/* E13284 80240B24 AFA20010 */ sw $v0, 0x10($sp) -/* E13288 80240B28 8E0500A4 */ lw $a1, 0xa4($s0) -/* E1328C 80240B2C 8E0600B0 */ lw $a2, 0xb0($s0) -/* E13290 80240B30 8E07008C */ lw $a3, 0x8c($s0) -/* E13294 80240B34 0C00A8ED */ jal update_lerp -/* E13298 80240B38 24040004 */ addiu $a0, $zero, 4 -/* E1329C 80240B3C 8E020090 */ lw $v0, 0x90($s0) -/* E132A0 80240B40 E6000098 */ swc1 $f0, 0x98($s0) -/* E132A4 80240B44 AFA20010 */ sw $v0, 0x10($sp) -/* E132A8 80240B48 8E0500A8 */ lw $a1, 0xa8($s0) -/* E132AC 80240B4C 8E0600B4 */ lw $a2, 0xb4($s0) -/* E132B0 80240B50 8E07008C */ lw $a3, 0x8c($s0) -/* E132B4 80240B54 0C00A8ED */ jal update_lerp -/* E132B8 80240B58 0000202D */ daddu $a0, $zero, $zero -/* E132BC 80240B5C 8E020090 */ lw $v0, 0x90($s0) -/* E132C0 80240B60 E600009C */ swc1 $f0, 0x9c($s0) -/* E132C4 80240B64 AFA20010 */ sw $v0, 0x10($sp) -/* E132C8 80240B68 8E0500BC */ lw $a1, 0xbc($s0) -/* E132CC 80240B6C 8E0600C0 */ lw $a2, 0xc0($s0) -/* E132D0 80240B70 8E07008C */ lw $a3, 0x8c($s0) -/* E132D4 80240B74 0C00A8ED */ jal update_lerp -/* E132D8 80240B78 0000202D */ daddu $a0, $zero, $zero -/* E132DC 80240B7C 8E020090 */ lw $v0, 0x90($s0) -/* E132E0 80240B80 E60000B8 */ swc1 $f0, 0xb8($s0) -/* E132E4 80240B84 AFA20010 */ sw $v0, 0x10($sp) -/* E132E8 80240B88 8E0500C8 */ lw $a1, 0xc8($s0) -/* E132EC 80240B8C 8E0600CC */ lw $a2, 0xcc($s0) -/* E132F0 80240B90 8E07008C */ lw $a3, 0x8c($s0) -/* E132F4 80240B94 0C00A8ED */ jal update_lerp -/* E132F8 80240B98 0000202D */ daddu $a0, $zero, $zero -/* E132FC 80240B9C 8E02008C */ lw $v0, 0x8c($s0) -/* E13300 80240BA0 8E030090 */ lw $v1, 0x90($s0) -/* E13304 80240BA4 0043102A */ slt $v0, $v0, $v1 -/* E13308 80240BA8 14400006 */ bnez $v0, .L80240BC4 -/* E1330C 80240BAC E60000C4 */ swc1 $f0, 0xc4($s0) -/* E13310 80240BB0 0220202D */ daddu $a0, $s1, $zero -/* E13314 80240BB4 3C05FE36 */ lui $a1, 0xfe36 -/* E13318 80240BB8 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E1331C 80240BBC 080902F5 */ j .L80240BD4 -/* E13320 80240BC0 24060001 */ addiu $a2, $zero, 1 -.L80240BC4: -/* E13324 80240BC4 0220202D */ daddu $a0, $s1, $zero -/* E13328 80240BC8 3C05FE36 */ lui $a1, 0xfe36 -/* E1332C 80240BCC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* E13330 80240BD0 0000302D */ daddu $a2, $zero, $zero -.L80240BD4: -/* E13334 80240BD4 0C0B2026 */ jal evt_set_variable -/* E13338 80240BD8 00000000 */ nop -/* E1333C 80240BDC 8FBF0020 */ lw $ra, 0x20($sp) -/* E13340 80240BE0 8FB1001C */ lw $s1, 0x1c($sp) -/* E13344 80240BE4 8FB00018 */ lw $s0, 0x18($sp) -/* E13348 80240BE8 24020002 */ addiu $v0, $zero, 2 -/* E1334C 80240BEC 03E00008 */ jr $ra -/* E13350 80240BF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240BF4_E13354.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240BF4_E13354.s deleted file mode 100644 index d9ec6c69de..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240BF4_E13354.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BF4_E13354 -/* E13354 80240BF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13358 80240BF8 AFB00010 */ sw $s0, 0x10($sp) -/* E1335C 80240BFC 0080802D */ daddu $s0, $a0, $zero -/* E13360 80240C00 AFBF0014 */ sw $ra, 0x14($sp) -/* E13364 80240C04 0C00FB3A */ jal get_enemy -/* E13368 80240C08 0000202D */ daddu $a0, $zero, $zero -/* E1336C 80240C0C 8E03000C */ lw $v1, 0xc($s0) -/* E13370 80240C10 0200202D */ daddu $a0, $s0, $zero -/* E13374 80240C14 8C650000 */ lw $a1, ($v1) -/* E13378 80240C18 0C0B1EAF */ jal evt_get_variable -/* E1337C 80240C1C 8C500080 */ lw $s0, 0x80($v0) -/* E13380 80240C20 0040202D */ daddu $a0, $v0, $zero -/* E13384 80240C24 24020002 */ addiu $v0, $zero, 2 -/* E13388 80240C28 00041840 */ sll $v1, $a0, 1 -/* E1338C 80240C2C 00641821 */ addu $v1, $v1, $a0 -/* E13390 80240C30 000318C0 */ sll $v1, $v1, 3 -/* E13394 80240C34 00641823 */ subu $v1, $v1, $a0 -/* E13398 80240C38 00431804 */ sllv $v1, $v1, $v0 -/* E1339C 80240C3C 02038021 */ addu $s0, $s0, $v1 -/* E133A0 80240C40 AE0000B8 */ sw $zero, 0xb8($s0) -/* E133A4 80240C44 8FBF0014 */ lw $ra, 0x14($sp) -/* E133A8 80240C48 8FB00010 */ lw $s0, 0x10($sp) -/* E133AC 80240C4C 03E00008 */ jr $ra -/* E133B0 80240C50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240C54_E133B4.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240C54_E133B4.s deleted file mode 100644 index 522094cf4e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240C54_E133B4.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C54_E133B4 -/* E133B4 80240C54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E133B8 80240C58 AFBF0010 */ sw $ra, 0x10($sp) -/* E133BC 80240C5C 0C00FB3A */ jal get_enemy -/* E133C0 80240C60 0000202D */ daddu $a0, $zero, $zero -/* E133C4 80240C64 3C060001 */ lui $a2, 1 -/* E133C8 80240C68 3C058011 */ lui $a1, %hi(gPlayerData) -/* E133CC 80240C6C 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* E133D0 80240C70 34C6869F */ ori $a2, $a2, 0x869f -/* E133D4 80240C74 8C440080 */ lw $a0, 0x80($v0) -/* E133D8 80240C78 8CA20330 */ lw $v0, 0x330($a1) -/* E133DC 80240C7C 8C83000C */ lw $v1, 0xc($a0) -/* E133E0 80240C80 00431021 */ addu $v0, $v0, $v1 -/* E133E4 80240C84 ACA20330 */ sw $v0, 0x330($a1) -/* E133E8 80240C88 00C2102B */ sltu $v0, $a2, $v0 -/* E133EC 80240C8C 10400002 */ beqz $v0, .L80240C98 -/* E133F0 80240C90 00A0382D */ daddu $a3, $a1, $zero -/* E133F4 80240C94 ACA60330 */ sw $a2, 0x330($a1) -.L80240C98: -/* E133F8 80240C98 94E20334 */ lhu $v0, 0x334($a3) -/* E133FC 80240C9C 8C83000C */ lw $v1, 0xc($a0) -/* E13400 80240CA0 0043102A */ slt $v0, $v0, $v1 -/* E13404 80240CA4 10400003 */ beqz $v0, .L80240CB4 -/* E13408 80240CA8 00000000 */ nop -/* E1340C 80240CAC 9482000E */ lhu $v0, 0xe($a0) -/* E13410 80240CB0 A4E20334 */ sh $v0, 0x334($a3) -.L80240CB4: -/* E13414 80240CB4 8C84000C */ lw $a0, 0xc($a0) -/* E13418 80240CB8 0C0496FA */ jal set_message_value -/* E1341C 80240CBC 0000282D */ daddu $a1, $zero, $zero -/* E13420 80240CC0 8FBF0010 */ lw $ra, 0x10($sp) -/* E13424 80240CC4 24020002 */ addiu $v0, $zero, 2 -/* E13428 80240CC8 03E00008 */ jr $ra -/* E1342C 80240CCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240CD0_E13430.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240CD0_E13430.s deleted file mode 100644 index 6e0ca64506..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240CD0_E13430.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD0_E13430 -/* E13430 80240CD0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13434 80240CD4 0000202D */ daddu $a0, $zero, $zero -/* E13438 80240CD8 AFBF0014 */ sw $ra, 0x14($sp) -/* E1343C 80240CDC 0C00FB3A */ jal get_enemy -/* E13440 80240CE0 AFB00010 */ sw $s0, 0x10($sp) -/* E13444 80240CE4 8C500080 */ lw $s0, 0x80($v0) -/* E13448 80240CE8 8E03000C */ lw $v1, 0xc($s0) -/* E1344C 80240CEC 28620065 */ slti $v0, $v1, 0x65 -/* E13450 80240CF0 14400003 */ bnez $v0, .L80240D00 -/* E13454 80240CF4 2862004C */ slti $v0, $v1, 0x4c -/* E13458 80240CF8 08090352 */ j .L80240D48 -/* E1345C 80240CFC 24040028 */ addiu $a0, $zero, 0x28 -.L80240D00: -/* E13460 80240D00 14400003 */ bnez $v0, .L80240D10 -/* E13464 80240D04 28620033 */ slti $v0, $v1, 0x33 -/* E13468 80240D08 08090352 */ j .L80240D48 -/* E1346C 80240D0C 24040023 */ addiu $a0, $zero, 0x23 -.L80240D10: -/* E13470 80240D10 14400003 */ bnez $v0, .L80240D20 -/* E13474 80240D14 2862001F */ slti $v0, $v1, 0x1f -/* E13478 80240D18 08090352 */ j .L80240D48 -/* E1347C 80240D1C 2404001E */ addiu $a0, $zero, 0x1e -.L80240D20: -/* E13480 80240D20 14400003 */ bnez $v0, .L80240D30 -/* E13484 80240D24 28620015 */ slti $v0, $v1, 0x15 -/* E13488 80240D28 08090352 */ j .L80240D48 -/* E1348C 80240D2C 2404000A */ addiu $a0, $zero, 0xa -.L80240D30: -/* E13490 80240D30 10400005 */ beqz $v0, .L80240D48 -/* E13494 80240D34 24040005 */ addiu $a0, $zero, 5 -/* E13498 80240D38 2862000B */ slti $v0, $v1, 0xb -/* E1349C 80240D3C 14400002 */ bnez $v0, .L80240D48 -/* E134A0 80240D40 24040001 */ addiu $a0, $zero, 1 -/* E134A4 80240D44 24040002 */ addiu $a0, $zero, 2 -.L80240D48: -/* E134A8 80240D48 8E02000C */ lw $v0, 0xc($s0) -/* E134AC 80240D4C 00441023 */ subu $v0, $v0, $a0 -/* E134B0 80240D50 0C03A830 */ jal add_coins -/* E134B4 80240D54 AE02000C */ sw $v0, 0xc($s0) -/* E134B8 80240D58 8E02000C */ lw $v0, 0xc($s0) -/* E134BC 80240D5C 24040211 */ addiu $a0, $zero, 0x211 -/* E134C0 80240D60 0C05272D */ jal sfx_play_sound -/* E134C4 80240D64 AE020010 */ sw $v0, 0x10($s0) -/* E134C8 80240D68 8E02000C */ lw $v0, 0xc($s0) -/* E134CC 80240D6C 8FBF0014 */ lw $ra, 0x14($sp) -/* E134D0 80240D70 8FB00010 */ lw $s0, 0x10($sp) -/* E134D4 80240D74 28420001 */ slti $v0, $v0, 1 -/* E134D8 80240D78 00021040 */ sll $v0, $v0, 1 -/* E134DC 80240D7C 03E00008 */ jr $ra -/* E134E0 80240D80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240D84_E134E4.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240D84_E134E4.s deleted file mode 100644 index 35d1627214..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240D84_E134E4.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D84_E134E4 -/* E134E4 80240D84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E134E8 80240D88 AFBF0010 */ sw $ra, 0x10($sp) -/* E134EC 80240D8C 0C00FB3A */ jal get_enemy -/* E134F0 80240D90 0000202D */ daddu $a0, $zero, $zero -/* E134F4 80240D94 8C440080 */ lw $a0, 0x80($v0) -/* E134F8 80240D98 8C83000C */ lw $v1, 0xc($a0) -/* E134FC 80240D9C 00031840 */ sll $v1, $v1, 1 -/* E13500 80240DA0 AC83000C */ sw $v1, 0xc($a0) -/* E13504 80240DA4 AC830010 */ sw $v1, 0x10($a0) -/* E13508 80240DA8 8FBF0010 */ lw $ra, 0x10($sp) -/* E1350C 80240DAC 24020002 */ addiu $v0, $zero, 2 -/* E13510 80240DB0 03E00008 */ jr $ra -/* E13514 80240DB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s deleted file mode 100644 index ff4bb3108b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DB8_E13518 -/* E13518 80240DB8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E1351C 80240DBC AFB10014 */ sw $s1, 0x14($sp) -/* E13520 80240DC0 0080882D */ daddu $s1, $a0, $zero -/* E13524 80240DC4 0000202D */ daddu $a0, $zero, $zero -/* E13528 80240DC8 AFBF0018 */ sw $ra, 0x18($sp) -/* E1352C 80240DCC 0C00FB3A */ jal get_enemy -/* E13530 80240DD0 AFB00010 */ sw $s0, 0x10($sp) -/* E13534 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* E13538 80240DD8 24070003 */ addiu $a3, $zero, 3 -/* E1353C 80240DDC 8C460080 */ lw $a2, 0x80($v0) -/* E13540 80240DE0 24040009 */ addiu $a0, $zero, 9 -/* E13544 80240DE4 00C0182D */ daddu $v1, $a2, $zero -.L80240DE8: -/* E13548 80240DE8 8C62007C */ lw $v0, 0x7c($v1) -/* E1354C 80240DEC 54470005 */ bnel $v0, $a3, .L80240E04 -/* E13550 80240DF0 24A50001 */ addiu $a1, $a1, 1 -/* E13554 80240DF4 8C620074 */ lw $v0, 0x74($v1) -/* E13558 80240DF8 50440006 */ beql $v0, $a0, .L80240E14 -/* E1355C 80240DFC 0220202D */ daddu $a0, $s1, $zero -/* E13560 80240E00 24A50001 */ addiu $a1, $a1, 1 -.L80240E04: -/* E13564 80240E04 28A2000B */ slti $v0, $a1, 0xb -/* E13568 80240E08 1440FFF7 */ bnez $v0, .L80240DE8 -/* E1356C 80240E0C 2463005C */ addiu $v1, $v1, 0x5c -/* E13570 80240E10 0220202D */ daddu $a0, $s1, $zero -.L80240E14: -/* E13574 80240E14 00058040 */ sll $s0, $a1, 1 -/* E13578 80240E18 02058021 */ addu $s0, $s0, $a1 -/* E1357C 80240E1C 001080C0 */ sll $s0, $s0, 3 -/* E13580 80240E20 02058023 */ subu $s0, $s0, $a1 -/* E13584 80240E24 00108080 */ sll $s0, $s0, 2 -/* E13588 80240E28 00D08021 */ addu $s0, $a2, $s0 -/* E1358C 80240E2C 8E020084 */ lw $v0, 0x84($s0) -/* E13590 80240E30 3C05FE36 */ lui $a1, 0xfe36 -/* E13594 80240E34 00021080 */ sll $v0, $v0, 2 -/* E13598 80240E38 3C018024 */ lui $at, %hi(D_80241AEC_E1424C) -/* E1359C 80240E3C 00220821 */ addu $at, $at, $v0 -/* E135A0 80240E40 C4201AEC */ lwc1 $f0, %lo(D_80241AEC_E1424C)($at) -/* E135A4 80240E44 8E020084 */ lw $v0, 0x84($s0) -/* E135A8 80240E48 8E060078 */ lw $a2, 0x78($s0) -/* E135AC 80240E4C 00021080 */ sll $v0, $v0, 2 -/* E135B0 80240E50 E6000094 */ swc1 $f0, 0x94($s0) -/* E135B4 80240E54 3C018024 */ lui $at, %hi(D_80241B18_E14278) -/* E135B8 80240E58 00220821 */ addu $at, $at, $v0 -/* E135BC 80240E5C C4221B18 */ lwc1 $f2, %lo(D_80241B18_E14278)($at) -/* E135C0 80240E60 3C0142DC */ lui $at, 0x42dc -/* E135C4 80240E64 44810000 */ mtc1 $at, $f0 -/* E135C8 80240E68 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E135CC 80240E6C E600009C */ swc1 $f0, 0x9c($s0) -/* E135D0 80240E70 0C0B2026 */ jal evt_set_variable -/* E135D4 80240E74 E6020098 */ swc1 $f2, 0x98($s0) -/* E135D8 80240E78 0220202D */ daddu $a0, $s1, $zero -/* E135DC 80240E7C 3C05FE36 */ lui $a1, 0xfe36 -/* E135E0 80240E80 8E060094 */ lw $a2, 0x94($s0) -/* E135E4 80240E84 0C0B2190 */ jal evt_set_float_variable -/* E135E8 80240E88 34A53C85 */ ori $a1, $a1, 0x3c85 -/* E135EC 80240E8C 0220202D */ daddu $a0, $s1, $zero -/* E135F0 80240E90 3C05FE36 */ lui $a1, 0xfe36 -/* E135F4 80240E94 8E060098 */ lw $a2, 0x98($s0) -/* E135F8 80240E98 0C0B2190 */ jal evt_set_float_variable -/* E135FC 80240E9C 34A53C86 */ ori $a1, $a1, 0x3c86 -/* E13600 80240EA0 0220202D */ daddu $a0, $s1, $zero -/* E13604 80240EA4 3C05FE36 */ lui $a1, 0xfe36 -/* E13608 80240EA8 8E06009C */ lw $a2, 0x9c($s0) -/* E1360C 80240EAC 0C0B2190 */ jal evt_set_float_variable -/* E13610 80240EB0 34A53C87 */ ori $a1, $a1, 0x3c87 -/* E13614 80240EB4 8FBF0018 */ lw $ra, 0x18($sp) -/* E13618 80240EB8 8FB10014 */ lw $s1, 0x14($sp) -/* E1361C 80240EBC 8FB00010 */ lw $s0, 0x10($sp) -/* E13620 80240EC0 24020002 */ addiu $v0, $zero, 2 -/* E13624 80240EC4 03E00008 */ jr $ra -/* E13628 80240EC8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240ECC_E1362C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240ECC_E1362C.s deleted file mode 100644 index ca45c95486..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240ECC_E1362C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ECC_E1362C -/* E1362C 80240ECC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E13630 80240ED0 AFB10014 */ sw $s1, 0x14($sp) -/* E13634 80240ED4 0080882D */ daddu $s1, $a0, $zero -/* E13638 80240ED8 0000202D */ daddu $a0, $zero, $zero -/* E1363C 80240EDC AFBF0018 */ sw $ra, 0x18($sp) -/* E13640 80240EE0 0C00FB3A */ jal get_enemy -/* E13644 80240EE4 AFB00010 */ sw $s0, 0x10($sp) -/* E13648 80240EE8 8E23000C */ lw $v1, 0xc($s1) -/* E1364C 80240EEC 8C650000 */ lw $a1, ($v1) -/* E13650 80240EF0 8C500080 */ lw $s0, 0x80($v0) -/* E13654 80240EF4 0C0B1EAF */ jal evt_get_variable -/* E13658 80240EF8 0220202D */ daddu $a0, $s1, $zero -/* E1365C 80240EFC 0220202D */ daddu $a0, $s1, $zero -/* E13660 80240F00 3C05FE36 */ lui $a1, 0xfe36 -/* E13664 80240F04 00021840 */ sll $v1, $v0, 1 -/* E13668 80240F08 00621821 */ addu $v1, $v1, $v0 -/* E1366C 80240F0C 000318C0 */ sll $v1, $v1, 3 -/* E13670 80240F10 00621823 */ subu $v1, $v1, $v0 -/* E13674 80240F14 00031880 */ sll $v1, $v1, 2 -/* E13678 80240F18 02038021 */ addu $s0, $s0, $v1 -/* E1367C 80240F1C 8E060094 */ lw $a2, 0x94($s0) -/* E13680 80240F20 0C0B2190 */ jal evt_set_float_variable -/* E13684 80240F24 34A53C85 */ ori $a1, $a1, 0x3c85 -/* E13688 80240F28 0220202D */ daddu $a0, $s1, $zero -/* E1368C 80240F2C 3C05FE36 */ lui $a1, 0xfe36 -/* E13690 80240F30 8E060098 */ lw $a2, 0x98($s0) -/* E13694 80240F34 0C0B2190 */ jal evt_set_float_variable -/* E13698 80240F38 34A53C86 */ ori $a1, $a1, 0x3c86 -/* E1369C 80240F3C 0220202D */ daddu $a0, $s1, $zero -/* E136A0 80240F40 3C05FE36 */ lui $a1, 0xfe36 -/* E136A4 80240F44 8E06009C */ lw $a2, 0x9c($s0) -/* E136A8 80240F48 0C0B2190 */ jal evt_set_float_variable -/* E136AC 80240F4C 34A53C87 */ ori $a1, $a1, 0x3c87 -/* E136B0 80240F50 0220202D */ daddu $a0, $s1, $zero -/* E136B4 80240F54 3C05FE36 */ lui $a1, 0xfe36 -/* E136B8 80240F58 8E0600B8 */ lw $a2, 0xb8($s0) -/* E136BC 80240F5C 0C0B2190 */ jal evt_set_float_variable -/* E136C0 80240F60 34A53C88 */ ori $a1, $a1, 0x3c88 -/* E136C4 80240F64 0220202D */ daddu $a0, $s1, $zero -/* E136C8 80240F68 3C05FE36 */ lui $a1, 0xfe36 -/* E136CC 80240F6C 8E0600C4 */ lw $a2, 0xc4($s0) -/* E136D0 80240F70 0C0B2190 */ jal evt_set_float_variable -/* E136D4 80240F74 34A53C89 */ ori $a1, $a1, 0x3c89 -/* E136D8 80240F78 8FBF0018 */ lw $ra, 0x18($sp) -/* E136DC 80240F7C 8FB10014 */ lw $s1, 0x14($sp) -/* E136E0 80240F80 8FB00010 */ lw $s0, 0x10($sp) -/* E136E4 80240F84 24020002 */ addiu $v0, $zero, 2 -/* E136E8 80240F88 03E00008 */ jr $ra -/* E136EC 80240F8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s deleted file mode 100644 index b6ac0c024a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F90_E136F0 -/* E136F0 80240F90 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* E136F4 80240F94 0000202D */ daddu $a0, $zero, $zero -/* E136F8 80240F98 AFBF002C */ sw $ra, 0x2c($sp) -/* E136FC 80240F9C AFB40028 */ sw $s4, 0x28($sp) -/* E13700 80240FA0 AFB30024 */ sw $s3, 0x24($sp) -/* E13704 80240FA4 AFB20020 */ sw $s2, 0x20($sp) -/* E13708 80240FA8 AFB1001C */ sw $s1, 0x1c($sp) -/* E1370C 80240FAC 0C00FB3A */ jal get_enemy -/* E13710 80240FB0 AFB00018 */ sw $s0, 0x18($sp) -/* E13714 80240FB4 0000802D */ daddu $s0, $zero, $zero -/* E13718 80240FB8 3C148024 */ lui $s4, %hi(D_80241AC8_E14228) -/* E1371C 80240FBC 26941AC8 */ addiu $s4, $s4, %lo(D_80241AC8_E14228) -/* E13720 80240FC0 3C138024 */ lui $s3, %hi(D_80241AD4_E14234) -/* E13724 80240FC4 26731AD4 */ addiu $s3, $s3, %lo(D_80241AD4_E14234) -/* E13728 80240FC8 3C128024 */ lui $s2, %hi(D_80241AE0_E14240) -/* E1372C 80240FCC 26521AE0 */ addiu $s2, $s2, %lo(D_80241AE0_E14240) -/* E13730 80240FD0 8C510080 */ lw $s1, 0x80($v0) -.L80240FD4: -/* E13734 80240FD4 8E220088 */ lw $v0, 0x88($s1) -/* E13738 80240FD8 0440001B */ bltz $v0, .L80241048 -/* E1373C 80240FDC 02141021 */ addu $v0, $s0, $s4 -/* E13740 80240FE0 02131821 */ addu $v1, $s0, $s3 -/* E13744 80240FE4 02122021 */ addu $a0, $s0, $s2 -/* E13748 80240FE8 80450000 */ lb $a1, ($v0) -/* E1374C 80240FEC 80620000 */ lb $v0, ($v1) -/* E13750 80240FF0 80830000 */ lb $v1, ($a0) -/* E13754 80240FF4 44850000 */ mtc1 $a1, $f0 -/* E13758 80240FF8 00000000 */ nop -/* E1375C 80240FFC 46800020 */ cvt.s.w $f0, $f0 -/* E13760 80241000 2442000D */ addiu $v0, $v0, 0xd -/* E13764 80241004 44050000 */ mfc1 $a1, $f0 -/* E13768 80241008 44820000 */ mtc1 $v0, $f0 -/* E1376C 8024100C 00000000 */ nop -/* E13770 80241010 46800020 */ cvt.s.w $f0, $f0 -/* E13774 80241014 24630005 */ addiu $v1, $v1, 5 -/* E13778 80241018 44060000 */ mfc1 $a2, $f0 -/* E1377C 8024101C 44830000 */ mtc1 $v1, $f0 -/* E13780 80241020 00000000 */ nop -/* E13784 80241024 46800020 */ cvt.s.w $f0, $f0 -/* E13788 80241028 44070000 */ mfc1 $a3, $f0 -/* E1378C 8024102C 24040001 */ addiu $a0, $zero, 1 -/* E13790 80241030 AFA00010 */ sw $zero, 0x10($sp) -/* E13794 80241034 0C01BECC */ jal fx_walking_dust -/* E13798 80241038 AFA00014 */ sw $zero, 0x14($sp) -/* E1379C 8024103C 8E240088 */ lw $a0, 0x88($s1) -/* E137A0 80241040 0C0441B4 */ jal delete_entity -/* E137A4 80241044 00000000 */ nop -.L80241048: -/* E137A8 80241048 26100001 */ addiu $s0, $s0, 1 -/* E137AC 8024104C 2A02000B */ slti $v0, $s0, 0xb -/* E137B0 80241050 1440FFE0 */ bnez $v0, .L80240FD4 -/* E137B4 80241054 2631005C */ addiu $s1, $s1, 0x5c -/* E137B8 80241058 24040283 */ addiu $a0, $zero, 0x283 -/* E137BC 8024105C 24050050 */ addiu $a1, $zero, 0x50 -/* E137C0 80241060 0000302D */ daddu $a2, $zero, $zero -/* E137C4 80241064 0C0526AE */ jal sfx_play_sound_with_params -/* E137C8 80241068 00C0382D */ daddu $a3, $a2, $zero -/* E137CC 8024106C 8FBF002C */ lw $ra, 0x2c($sp) -/* E137D0 80241070 8FB40028 */ lw $s4, 0x28($sp) -/* E137D4 80241074 8FB30024 */ lw $s3, 0x24($sp) -/* E137D8 80241078 8FB20020 */ lw $s2, 0x20($sp) -/* E137DC 8024107C 8FB1001C */ lw $s1, 0x1c($sp) -/* E137E0 80241080 8FB00018 */ lw $s0, 0x18($sp) -/* E137E4 80241084 24020002 */ addiu $v0, $zero, 2 -/* E137E8 80241088 03E00008 */ jr $ra -/* E137EC 8024108C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241090_E137F0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241090_E137F0.s deleted file mode 100644 index 8c5080750e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241090_E137F0.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241090_E137F0 -/* E137F0 80241090 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* E137F4 80241094 AFB00010 */ sw $s0, 0x10($sp) -/* E137F8 80241098 0080802D */ daddu $s0, $a0, $zero -/* E137FC 8024109C 0000202D */ daddu $a0, $zero, $zero -/* E13800 802410A0 AFBF0034 */ sw $ra, 0x34($sp) -/* E13804 802410A4 AFBE0030 */ sw $fp, 0x30($sp) -/* E13808 802410A8 AFB7002C */ sw $s7, 0x2c($sp) -/* E1380C 802410AC AFB60028 */ sw $s6, 0x28($sp) -/* E13810 802410B0 AFB50024 */ sw $s5, 0x24($sp) -/* E13814 802410B4 AFB40020 */ sw $s4, 0x20($sp) -/* E13818 802410B8 AFB3001C */ sw $s3, 0x1c($sp) -/* E1381C 802410BC AFB20018 */ sw $s2, 0x18($sp) -/* E13820 802410C0 0C00FB3A */ jal get_enemy -/* E13824 802410C4 AFB10014 */ sw $s1, 0x14($sp) -/* E13828 802410C8 0200202D */ daddu $a0, $s0, $zero -/* E1382C 802410CC 8C83000C */ lw $v1, 0xc($a0) -/* E13830 802410D0 0040B02D */ daddu $s6, $v0, $zero -/* E13834 802410D4 8C650000 */ lw $a1, ($v1) -/* E13838 802410D8 8ED20080 */ lw $s2, 0x80($s6) -/* E1383C 802410DC 0C0B1EAF */ jal evt_get_variable -/* E13840 802410E0 0000802D */ daddu $s0, $zero, $zero -/* E13844 802410E4 0040982D */ daddu $s3, $v0, $zero -/* E13848 802410E8 00131880 */ sll $v1, $s3, 2 -/* E1384C 802410EC 02431821 */ addu $v1, $s2, $v1 -/* E13850 802410F0 8ED40074 */ lw $s4, 0x74($s6) -/* E13854 802410F4 8C75001C */ lw $s5, 0x1c($v1) -/* E13858 802410F8 2403FFFF */ addiu $v1, $zero, -1 -/* E1385C 802410FC 00141080 */ sll $v0, $s4, 2 -/* E13860 80241100 02421021 */ addu $v0, $s2, $v0 -/* E13864 80241104 AC550048 */ sw $s5, 0x48($v0) -/* E13868 80241108 00131040 */ sll $v0, $s3, 1 -/* E1386C 8024110C 00531021 */ addu $v0, $v0, $s3 -/* E13870 80241110 000210C0 */ sll $v0, $v0, 3 -/* E13874 80241114 00531023 */ subu $v0, $v0, $s3 -/* E13878 80241118 00021080 */ sll $v0, $v0, 2 -/* E1387C 8024111C 02421021 */ addu $v0, $s2, $v0 -/* E13880 80241120 AC430088 */ sw $v1, 0x88($v0) -/* E13884 80241124 26820001 */ addiu $v0, $s4, 1 -/* E13888 80241128 18400020 */ blez $v0, .L802411AC -/* E1388C 8024112C 0200202D */ daddu $a0, $s0, $zero -/* E13890 80241130 241E0003 */ addiu $fp, $zero, 3 -/* E13894 80241134 0040B82D */ daddu $s7, $v0, $zero -/* E13898 80241138 0240882D */ daddu $s1, $s2, $zero -.L8024113C: -/* E1389C 8024113C 8E230048 */ lw $v1, 0x48($s1) -/* E138A0 80241140 24060001 */ addiu $a2, $zero, 1 -/* E138A4 80241144 1066000D */ beq $v1, $a2, .L8024117C -/* E138A8 80241148 28620002 */ slti $v0, $v1, 2 -/* E138AC 8024114C 50400005 */ beql $v0, $zero, .L80241164 -/* E138B0 80241150 24060002 */ addiu $a2, $zero, 2 -/* E138B4 80241154 50600010 */ beql $v1, $zero, .L80241198 -/* E138B8 80241158 24840001 */ addiu $a0, $a0, 1 -/* E138BC 8024115C 08090467 */ j .L8024119C -/* E138C0 80241160 26310004 */ addiu $s1, $s1, 4 -.L80241164: -/* E138C4 80241164 10660007 */ beq $v1, $a2, .L80241184 -/* E138C8 80241168 00041080 */ sll $v0, $a0, 2 -/* E138CC 8024116C 107E0007 */ beq $v1, $fp, .L8024118C -/* E138D0 80241170 00000000 */ nop -/* E138D4 80241174 08090467 */ j .L8024119C -/* E138D8 80241178 26310004 */ addiu $s1, $s1, 4 -.L8024117C: -/* E138DC 8024117C 08090466 */ j .L80241198 -/* E138E0 80241180 24840005 */ addiu $a0, $a0, 5 -.L80241184: -/* E138E4 80241184 08090466 */ j .L80241198 -/* E138E8 80241188 00822021 */ addu $a0, $a0, $v0 -.L8024118C: -/* E138EC 8024118C 0C05272D */ jal sfx_play_sound -/* E138F0 80241190 2404021D */ addiu $a0, $zero, 0x21d -/* E138F4 80241194 0000202D */ daddu $a0, $zero, $zero -.L80241198: -/* E138F8 80241198 26310004 */ addiu $s1, $s1, 4 -.L8024119C: -/* E138FC 8024119C 26100001 */ addiu $s0, $s0, 1 -/* E13900 802411A0 0217102A */ slt $v0, $s0, $s7 -/* E13904 802411A4 1440FFE5 */ bnez $v0, .L8024113C -/* E13908 802411A8 00000000 */ nop -.L802411AC: -/* E1390C 802411AC AE440010 */ sw $a0, 0x10($s2) -/* E13910 802411B0 0000802D */ daddu $s0, $zero, $zero -/* E13914 802411B4 24040001 */ addiu $a0, $zero, 1 -/* E13918 802411B8 24050002 */ addiu $a1, $zero, 2 -/* E1391C 802411BC 0240182D */ daddu $v1, $s2, $zero -.L802411C0: -/* E13920 802411C0 8C62007C */ lw $v0, 0x7c($v1) -/* E13924 802411C4 16A20008 */ bne $s5, $v0, .L802411E8 -/* E13928 802411C8 26100001 */ addiu $s0, $s0, 1 -/* E1392C 802411CC 8C620074 */ lw $v0, 0x74($v1) -/* E13930 802411D0 14440006 */ bne $v0, $a0, .L802411EC -/* E13934 802411D4 2A02000B */ slti $v0, $s0, 0xb -/* E13938 802411D8 AC650074 */ sw $a1, 0x74($v1) -/* E1393C 802411DC AC730080 */ sw $s3, 0x80($v1) -/* E13940 802411E0 0809047D */ j .L802411F4 -/* E13944 802411E4 AC740084 */ sw $s4, 0x84($v1) -.L802411E8: -/* E13948 802411E8 2A02000B */ slti $v0, $s0, 0xb -.L802411EC: -/* E1394C 802411EC 1440FFF4 */ bnez $v0, .L802411C0 -/* E13950 802411F0 2463005C */ addiu $v1, $v1, 0x5c -.L802411F4: -/* E13954 802411F4 8EC30074 */ lw $v1, 0x74($s6) -/* E13958 802411F8 24630001 */ addiu $v1, $v1, 1 -/* E1395C 802411FC AEC30074 */ sw $v1, 0x74($s6) -/* E13960 80241200 8FBF0034 */ lw $ra, 0x34($sp) -/* E13964 80241204 8FBE0030 */ lw $fp, 0x30($sp) -/* E13968 80241208 8FB7002C */ lw $s7, 0x2c($sp) -/* E1396C 8024120C 8FB60028 */ lw $s6, 0x28($sp) -/* E13970 80241210 8FB50024 */ lw $s5, 0x24($sp) -/* E13974 80241214 8FB40020 */ lw $s4, 0x20($sp) -/* E13978 80241218 8FB3001C */ lw $s3, 0x1c($sp) -/* E1397C 8024121C 8FB20018 */ lw $s2, 0x18($sp) -/* E13980 80241220 8FB10014 */ lw $s1, 0x14($sp) -/* E13984 80241224 8FB00010 */ lw $s0, 0x10($sp) -/* E13988 80241228 24020002 */ addiu $v0, $zero, 2 -/* E1398C 8024122C 03E00008 */ jr $ra -/* E13990 80241230 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s deleted file mode 100644 index 5316423198..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s +++ /dev/null @@ -1,201 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802435E8_E15D48 -.word 0x80242310, 0x80242330, 0x80242350, 0x80242370, 0x80242390, 0x802423B0, 0x802423D0, 0x802423F0, 0x80242410, 0x80242430, 0x80242450, 0x6D676D5F, 0x30300000, 0x00000000 - -.section .text - -glabel func_80241234_E13994 -/* E13994 80241234 27BDFF88 */ addiu $sp, $sp, -0x78 -/* E13998 80241238 AFB5006C */ sw $s5, 0x6c($sp) -/* E1399C 8024123C 0080A82D */ daddu $s5, $a0, $zero -/* E139A0 80241240 AFB00058 */ sw $s0, 0x58($sp) -/* E139A4 80241244 00A0802D */ daddu $s0, $a1, $zero -/* E139A8 80241248 0000202D */ daddu $a0, $zero, $zero -/* E139AC 8024124C AFBF0070 */ sw $ra, 0x70($sp) -/* E139B0 80241250 AFB40068 */ sw $s4, 0x68($sp) -/* E139B4 80241254 AFB30064 */ sw $s3, 0x64($sp) -/* E139B8 80241258 AFB20060 */ sw $s2, 0x60($sp) -/* E139BC 8024125C 0C00FB3A */ jal get_enemy -/* E139C0 80241260 AFB1005C */ sw $s1, 0x5c($sp) -/* E139C4 80241264 27A30028 */ addiu $v1, $sp, 0x28 -/* E139C8 80241268 8C540080 */ lw $s4, 0x80($v0) -/* E139CC 8024126C 3C028024 */ lui $v0, %hi(D_802435E8_E15D48) -/* E139D0 80241270 244235E8 */ addiu $v0, $v0, %lo(D_802435E8_E15D48) -/* E139D4 80241274 24440020 */ addiu $a0, $v0, 0x20 -.L80241278: -/* E139D8 80241278 8C480000 */ lw $t0, ($v0) -/* E139DC 8024127C 8C490004 */ lw $t1, 4($v0) -/* E139E0 80241280 8C4A0008 */ lw $t2, 8($v0) -/* E139E4 80241284 8C4B000C */ lw $t3, 0xc($v0) -/* E139E8 80241288 AC680000 */ sw $t0, ($v1) -/* E139EC 8024128C AC690004 */ sw $t1, 4($v1) -/* E139F0 80241290 AC6A0008 */ sw $t2, 8($v1) -/* E139F4 80241294 AC6B000C */ sw $t3, 0xc($v1) -/* E139F8 80241298 24420010 */ addiu $v0, $v0, 0x10 -/* E139FC 8024129C 1444FFF6 */ bne $v0, $a0, .L80241278 -/* E13A00 802412A0 24630010 */ addiu $v1, $v1, 0x10 -/* E13A04 802412A4 8C480000 */ lw $t0, ($v0) -/* E13A08 802412A8 8C490004 */ lw $t1, 4($v0) -/* E13A0C 802412AC 8C4A0008 */ lw $t2, 8($v0) -/* E13A10 802412B0 AC680000 */ sw $t0, ($v1) -/* E13A14 802412B4 AC690004 */ sw $t1, 4($v1) -/* E13A18 802412B8 12000044 */ beqz $s0, .L802413CC -/* E13A1C 802412BC AC6A0008 */ sw $t2, 8($v1) -/* E13A20 802412C0 0C00A67F */ jal rand_int -/* E13A24 802412C4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* E13A28 802412C8 0040182D */ daddu $v1, $v0, $zero -/* E13A2C 802412CC 04620001 */ bltzl $v1, .L802412D4 -/* E13A30 802412D0 24620003 */ addiu $v0, $v1, 3 -.L802412D4: -/* E13A34 802412D4 00022083 */ sra $a0, $v0, 2 -/* E13A38 802412D8 00041080 */ sll $v0, $a0, 2 -/* E13A3C 802412DC 00622023 */ subu $a0, $v1, $v0 -/* E13A40 802412E0 0000882D */ daddu $s1, $zero, $zero -/* E13A44 802412E4 3C058024 */ lui $a1, %hi(D_80241B9C_E142FC) -/* E13A48 802412E8 24A51B9C */ addiu $a1, $a1, %lo(D_80241B9C_E142FC) -/* E13A4C 802412EC 00041040 */ sll $v0, $a0, 1 -/* E13A50 802412F0 00441021 */ addu $v0, $v0, $a0 -/* E13A54 802412F4 00021080 */ sll $v0, $v0, 2 -/* E13A58 802412F8 00441023 */ subu $v0, $v0, $a0 -/* E13A5C 802412FC 00022080 */ sll $a0, $v0, 2 -/* E13A60 80241300 0280182D */ daddu $v1, $s4, $zero -.L80241304: -/* E13A64 80241304 00851021 */ addu $v0, $a0, $a1 -/* E13A68 80241308 24840004 */ addiu $a0, $a0, 4 -/* E13A6C 8024130C 8C420000 */ lw $v0, ($v0) -/* E13A70 80241310 26310001 */ addiu $s1, $s1, 1 -/* E13A74 80241314 AC62001C */ sw $v0, 0x1c($v1) -/* E13A78 80241318 2A22000B */ slti $v0, $s1, 0xb -/* E13A7C 8024131C 1440FFF9 */ bnez $v0, .L80241304 -/* E13A80 80241320 24630004 */ addiu $v1, $v1, 4 -/* E13A84 80241324 0000882D */ daddu $s1, $zero, $zero -/* E13A88 80241328 3C122E8B */ lui $s2, 0x2e8b -/* E13A8C 8024132C 3652A2E9 */ ori $s2, $s2, 0xa2e9 -.L80241330: -/* E13A90 80241330 0C00A67F */ jal rand_int -/* E13A94 80241334 24042710 */ addiu $a0, $zero, 0x2710 -/* E13A98 80241338 00520018 */ mult $v0, $s2 -/* E13A9C 8024133C 24042710 */ addiu $a0, $zero, 0x2710 -/* E13AA0 80241340 00021FC3 */ sra $v1, $v0, 0x1f -/* E13AA4 80241344 00004010 */ mfhi $t0 -/* E13AA8 80241348 00082843 */ sra $a1, $t0, 1 -/* E13AAC 8024134C 00A38023 */ subu $s0, $a1, $v1 -/* E13AB0 80241350 00101840 */ sll $v1, $s0, 1 -/* E13AB4 80241354 00701821 */ addu $v1, $v1, $s0 -/* E13AB8 80241358 00031880 */ sll $v1, $v1, 2 -/* E13ABC 8024135C 00701823 */ subu $v1, $v1, $s0 -/* E13AC0 80241360 0C00A67F */ jal rand_int -/* E13AC4 80241364 00438023 */ subu $s0, $v0, $v1 -/* E13AC8 80241368 00520018 */ mult $v0, $s2 -/* E13ACC 8024136C 00021FC3 */ sra $v1, $v0, 0x1f -/* E13AD0 80241370 00004010 */ mfhi $t0 -/* E13AD4 80241374 00082043 */ sra $a0, $t0, 1 -/* E13AD8 80241378 00832023 */ subu $a0, $a0, $v1 -/* E13ADC 8024137C 00041840 */ sll $v1, $a0, 1 -/* E13AE0 80241380 00641821 */ addu $v1, $v1, $a0 -/* E13AE4 80241384 00031880 */ sll $v1, $v1, 2 -/* E13AE8 80241388 00641823 */ subu $v1, $v1, $a0 -/* E13AEC 8024138C 00432023 */ subu $a0, $v0, $v1 -/* E13AF0 80241390 12040009 */ beq $s0, $a0, .L802413B8 -/* E13AF4 80241394 26310001 */ addiu $s1, $s1, 1 -/* E13AF8 80241398 00041880 */ sll $v1, $a0, 2 -/* E13AFC 8024139C 02831821 */ addu $v1, $s4, $v1 -/* E13B00 802413A0 00101080 */ sll $v0, $s0, 2 -/* E13B04 802413A4 02821021 */ addu $v0, $s4, $v0 -/* E13B08 802413A8 8C44001C */ lw $a0, 0x1c($v0) -/* E13B0C 802413AC 8C65001C */ lw $a1, 0x1c($v1) -/* E13B10 802413B0 AC64001C */ sw $a0, 0x1c($v1) -/* E13B14 802413B4 AC45001C */ sw $a1, 0x1c($v0) -.L802413B8: -/* E13B18 802413B8 2A2203E8 */ slti $v0, $s1, 0x3e8 -/* E13B1C 802413BC 1440FFDC */ bnez $v0, .L80241330 -/* E13B20 802413C0 00000000 */ nop -/* E13B24 802413C4 AEA00070 */ sw $zero, 0x70($s5) -/* E13B28 802413C8 AEA00074 */ sw $zero, 0x74($s5) -.L802413CC: -/* E13B2C 802413CC 8EA20070 */ lw $v0, 0x70($s5) -/* E13B30 802413D0 2442FFFF */ addiu $v0, $v0, -1 -/* E13B34 802413D4 1C400041 */ bgtz $v0, .L802414DC -/* E13B38 802413D8 AEA20070 */ sw $v0, 0x70($s5) -/* E13B3C 802413DC 3C138024 */ lui $s3, %hi(D_80241AC8_E14228) -/* E13B40 802413E0 26731AC8 */ addiu $s3, $s3, %lo(D_80241AC8_E14228) -/* E13B44 802413E4 3C128024 */ lui $s2, %hi(D_80241AD4_E14234) -/* E13B48 802413E8 26521AD4 */ addiu $s2, $s2, %lo(D_80241AD4_E14234) -/* E13B4C 802413EC 3C118024 */ lui $s1, %hi(D_80241AE0_E14240) -/* E13B50 802413F0 26311AE0 */ addiu $s1, $s1, %lo(D_80241AE0_E14240) -/* E13B54 802413F4 8EB00074 */ lw $s0, 0x74($s5) -/* E13B58 802413F8 3C04802F */ lui $a0, %hi(D_802EA0C4) -/* E13B5C 802413FC 2484A0C4 */ addiu $a0, $a0, %lo(D_802EA0C4) -/* E13B60 80241400 02139821 */ addu $s3, $s0, $s3 -/* E13B64 80241404 02129021 */ addu $s2, $s0, $s2 -/* E13B68 80241408 02118821 */ addu $s1, $s0, $s1 -/* E13B6C 8024140C 82650000 */ lb $a1, ($s3) -/* E13B70 80241410 82460000 */ lb $a2, ($s2) -/* E13B74 80241414 82270000 */ lb $a3, ($s1) -/* E13B78 80241418 3C028000 */ lui $v0, 0x8000 -/* E13B7C 8024141C AFA00010 */ sw $zero, 0x10($sp) -/* E13B80 80241420 AFA00014 */ sw $zero, 0x14($sp) -/* E13B84 80241424 AFA00018 */ sw $zero, 0x18($sp) -/* E13B88 80241428 AFA0001C */ sw $zero, 0x1c($sp) -/* E13B8C 8024142C 0C044631 */ jal create_entity -/* E13B90 80241430 AFA20020 */ sw $v0, 0x20($sp) -/* E13B94 80241434 0040202D */ daddu $a0, $v0, $zero -/* E13B98 80241438 00101040 */ sll $v0, $s0, 1 -/* E13B9C 8024143C 00501021 */ addu $v0, $v0, $s0 -/* E13BA0 80241440 000210C0 */ sll $v0, $v0, 3 -/* E13BA4 80241444 00501023 */ subu $v0, $v0, $s0 -/* E13BA8 80241448 00021080 */ sll $v0, $v0, 2 -/* E13BAC 8024144C 02821021 */ addu $v0, $s4, $v0 -/* E13BB0 80241450 0C04417A */ jal get_entity_by_index -/* E13BB4 80241454 AC440088 */ sw $a0, 0x88($v0) -/* E13BB8 80241458 00108080 */ sll $s0, $s0, 2 -/* E13BBC 8024145C 03B01821 */ addu $v1, $sp, $s0 -/* E13BC0 80241460 8C630028 */ lw $v1, 0x28($v1) -/* E13BC4 80241464 3C0141B8 */ lui $at, 0x41b8 -/* E13BC8 80241468 44810000 */ mtc1 $at, $f0 -/* E13BCC 8024146C AC430028 */ sw $v1, 0x28($v0) -/* E13BD0 80241470 82650000 */ lb $a1, ($s3) -/* E13BD4 80241474 82420000 */ lb $v0, ($s2) -/* E13BD8 80241478 82230000 */ lb $v1, ($s1) -/* E13BDC 8024147C 44851000 */ mtc1 $a1, $f2 -/* E13BE0 80241480 00000000 */ nop -/* E13BE4 80241484 468010A0 */ cvt.s.w $f2, $f2 -/* E13BE8 80241488 2442000D */ addiu $v0, $v0, 0xd -/* E13BEC 8024148C 44051000 */ mfc1 $a1, $f2 -/* E13BF0 80241490 44821000 */ mtc1 $v0, $f2 -/* E13BF4 80241494 00000000 */ nop -/* E13BF8 80241498 468010A0 */ cvt.s.w $f2, $f2 -/* E13BFC 8024149C 24630005 */ addiu $v1, $v1, 5 -/* E13C00 802414A0 44061000 */ mfc1 $a2, $f2 -/* E13C04 802414A4 44831000 */ mtc1 $v1, $f2 -/* E13C08 802414A8 00000000 */ nop -/* E13C0C 802414AC 468010A0 */ cvt.s.w $f2, $f2 -/* E13C10 802414B0 44071000 */ mfc1 $a3, $f2 -/* E13C14 802414B4 24040003 */ addiu $a0, $zero, 3 -/* E13C18 802414B8 0C01BFBC */ jal fx_sparkles -/* E13C1C 802414BC E7A00010 */ swc1 $f0, 0x10($sp) -/* E13C20 802414C0 0C05272D */ jal sfx_play_sound -/* E13C24 802414C4 24040213 */ addiu $a0, $zero, 0x213 -/* E13C28 802414C8 8EA20074 */ lw $v0, 0x74($s5) -/* E13C2C 802414CC 24030003 */ addiu $v1, $zero, 3 -/* E13C30 802414D0 AEA30070 */ sw $v1, 0x70($s5) -/* E13C34 802414D4 24420001 */ addiu $v0, $v0, 1 -/* E13C38 802414D8 AEA20074 */ sw $v0, 0x74($s5) -.L802414DC: -/* E13C3C 802414DC 8EA20074 */ lw $v0, 0x74($s5) -/* E13C40 802414E0 8FBF0070 */ lw $ra, 0x70($sp) -/* E13C44 802414E4 8FB5006C */ lw $s5, 0x6c($sp) -/* E13C48 802414E8 8FB40068 */ lw $s4, 0x68($sp) -/* E13C4C 802414EC 8FB30064 */ lw $s3, 0x64($sp) -/* E13C50 802414F0 8FB20060 */ lw $s2, 0x60($sp) -/* E13C54 802414F4 8FB1005C */ lw $s1, 0x5c($sp) -/* E13C58 802414F8 8FB00058 */ lw $s0, 0x58($sp) -/* E13C5C 802414FC 2842000B */ slti $v0, $v0, 0xb -/* E13C60 80241500 38420001 */ xori $v0, $v0, 1 -/* E13C64 80241504 00021040 */ sll $v0, $v0, 1 -/* E13C68 80241508 03E00008 */ jr $ra -/* E13C6C 8024150C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241510_E13C70.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241510_E13C70.s deleted file mode 100644 index c28e7b2e73..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241510_E13C70.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241510_E13C70 -/* E13C70 80241510 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13C74 80241514 AFB00010 */ sw $s0, 0x10($sp) -/* E13C78 80241518 0080802D */ daddu $s0, $a0, $zero -/* E13C7C 8024151C 3C038011 */ lui $v1, %hi(gPlayerData) -/* E13C80 80241520 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* E13C84 80241524 10A00005 */ beqz $a1, .L8024153C -/* E13C88 80241528 AFBF0014 */ sw $ra, 0x14($sp) -/* E13C8C 8024152C 9462032E */ lhu $v0, 0x32e($v1) -/* E13C90 80241530 24420001 */ addiu $v0, $v0, 1 -/* E13C94 80241534 A462032E */ sh $v0, 0x32e($v1) -/* E13C98 80241538 AE000070 */ sw $zero, 0x70($s0) -.L8024153C: -/* E13C9C 8024153C 0C03A830 */ jal add_coins -/* E13CA0 80241540 2404FFFF */ addiu $a0, $zero, -1 -/* E13CA4 80241544 0C05272D */ jal sfx_play_sound -/* E13CA8 80241548 24040211 */ addiu $a0, $zero, 0x211 -/* E13CAC 8024154C 8E030070 */ lw $v1, 0x70($s0) -/* E13CB0 80241550 24630001 */ addiu $v1, $v1, 1 -/* E13CB4 80241554 3862000A */ xori $v0, $v1, 0xa -/* E13CB8 80241558 2C420001 */ sltiu $v0, $v0, 1 -/* E13CBC 8024155C AE030070 */ sw $v1, 0x70($s0) -/* E13CC0 80241560 8FBF0014 */ lw $ra, 0x14($sp) -/* E13CC4 80241564 8FB00010 */ lw $s0, 0x10($sp) -/* E13CC8 80241568 00021040 */ sll $v0, $v0, 1 -/* E13CCC 8024156C 03E00008 */ jr $ra -/* E13CD0 80241570 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241574_E13CD4.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241574_E13CD4.s deleted file mode 100644 index 2fec3ebe74..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241574_E13CD4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241574_E13CD4 -/* E13CD4 80241574 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13CD8 80241578 AFBF0010 */ sw $ra, 0x10($sp) -/* E13CDC 8024157C 0C00FB3A */ jal get_enemy -/* E13CE0 80241580 0000202D */ daddu $a0, $zero, $zero -/* E13CE4 80241584 0000302D */ daddu $a2, $zero, $zero -/* E13CE8 80241588 2407FFFF */ addiu $a3, $zero, -1 -/* E13CEC 8024158C 3C058024 */ lui $a1, %hi(D_80241B70_E142D0) -/* E13CF0 80241590 24A51B70 */ addiu $a1, $a1, %lo(D_80241B70_E142D0) -/* E13CF4 80241594 8C420080 */ lw $v0, 0x80($v0) -/* E13CF8 80241598 3C048024 */ lui $a0, %hi(D_80241B44_E142A4) -/* E13CFC 8024159C 24841B44 */ addiu $a0, $a0, %lo(D_80241B44_E142A4) -/* E13D00 802415A0 0040182D */ daddu $v1, $v0, $zero -/* E13D04 802415A4 AC60000C */ sw $zero, 0xc($v1) -/* E13D08 802415A8 AC600010 */ sw $zero, 0x10($v1) -.L802415AC: -/* E13D0C 802415AC AC600074 */ sw $zero, 0x74($v1) -/* E13D10 802415B0 8C820000 */ lw $v0, ($a0) -/* E13D14 802415B4 24840004 */ addiu $a0, $a0, 4 -/* E13D18 802415B8 24C60001 */ addiu $a2, $a2, 1 -/* E13D1C 802415BC AC620078 */ sw $v0, 0x78($v1) -/* E13D20 802415C0 8CA20000 */ lw $v0, ($a1) -/* E13D24 802415C4 24A50004 */ addiu $a1, $a1, 4 -/* E13D28 802415C8 AC670084 */ sw $a3, 0x84($v1) -/* E13D2C 802415CC AC62007C */ sw $v0, 0x7c($v1) -/* E13D30 802415D0 28C2000B */ slti $v0, $a2, 0xb -/* E13D34 802415D4 1440FFF5 */ bnez $v0, .L802415AC -/* E13D38 802415D8 2463005C */ addiu $v1, $v1, 0x5c -/* E13D3C 802415DC 8FBF0010 */ lw $ra, 0x10($sp) -/* E13D40 802415E0 24020002 */ addiu $v0, $zero, 2 -/* E13D44 802415E4 03E00008 */ jr $ra -/* E13D48 802415E8 27BD0018 */ addiu $sp, $sp, 0x18 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 deleted file mode 100644 index 225041a5e8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415EC_E13D4C -/* E13D4C 802415EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E13D50 802415F0 0000202D */ daddu $a0, $zero, $zero -/* E13D54 802415F4 AFBF0018 */ sw $ra, 0x18($sp) -/* E13D58 802415F8 AFB10014 */ sw $s1, 0x14($sp) -/* E13D5C 802415FC 0C00FB3A */ jal get_enemy -/* E13D60 80241600 AFB00010 */ sw $s0, 0x10($sp) -/* E13D64 80241604 24040468 */ addiu $a0, $zero, 0x468 -/* E13D68 80241608 0C00AB0A */ jal general_heap_malloc -/* E13D6C 8024160C 0040882D */ daddu $s1, $v0, $zero -/* E13D70 80241610 0000202D */ daddu $a0, $zero, $zero -/* E13D74 80241614 3C058024 */ lui $a1, %hi(func_802403C4_E12B24) -/* E13D78 80241618 24A503C4 */ addiu $a1, $a1, %lo(func_802403C4_E12B24) -/* E13D7C 8024161C 0040802D */ daddu $s0, $v0, $zero -/* E13D80 80241620 0C048C56 */ jal create_generic_entity_world -/* 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 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 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 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) -/* E13DC4 80241664 2402001C */ addiu $v0, $zero, 0x1c -/* E13DC8 80241668 0C03A625 */ jal func_800E9894 -/* E13DCC 8024166C AE020018 */ sw $v0, 0x18($s0) -/* E13DD0 80241670 0C03A5EE */ jal close_status_menu -/* E13DD4 80241674 00000000 */ nop -/* E13DD8 80241678 8FBF0018 */ lw $ra, 0x18($sp) -/* E13DDC 8024167C 8FB10014 */ lw $s1, 0x14($sp) -/* E13DE0 80241680 8FB00010 */ lw $s0, 0x10($sp) -/* E13DE4 80241684 24020002 */ addiu $v0, $zero, 2 -/* E13DE8 80241688 03E00008 */ jr $ra -/* E13DEC 8024168C 27BD0020 */ addiu $sp, $sp, 0x20 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 deleted file mode 100644 index 15c9506c03..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241690_E13DF0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241690_E13DF0 -/* E13DF0 80241690 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13DF4 80241694 0000202D */ daddu $a0, $zero, $zero -/* E13DF8 80241698 AFBF0014 */ sw $ra, 0x14($sp) -/* E13DFC 8024169C 0C00FB3A */ jal get_enemy -/* E13E00 802416A0 AFB00010 */ sw $s0, 0x10($sp) -/* E13E04 802416A4 8C500080 */ lw $s0, 0x80($v0) -/* E13E08 802416A8 0C048D70 */ jal free_generic_entity -/* E13E0C 802416AC 8E040000 */ lw $a0, ($s0) -/* 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) -/* E13E20 802416C0 24020002 */ addiu $v0, $zero, 2 -/* E13E24 802416C4 03E00008 */ jr $ra -/* E13E28 802416C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s deleted file mode 100644 index 7edf953906..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416CC_E13E2C -/* E13E2C 802416CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13E30 802416D0 3C05FE36 */ lui $a1, 0xfe36 -/* E13E34 802416D4 3C068011 */ lui $a2, %hi(gPlayerData+0xC) -/* E13E38 802416D8 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) -/* E13E3C 802416DC AFBF0010 */ sw $ra, 0x10($sp) -/* E13E40 802416E0 0C0B2026 */ jal evt_set_variable -/* E13E44 802416E4 34A53C8A */ ori $a1, $a1, 0x3c8a -/* E13E48 802416E8 8FBF0010 */ lw $ra, 0x10($sp) -/* E13E4C 802416EC 24020002 */ addiu $v0, $zero, 2 -/* E13E50 802416F0 03E00008 */ jr $ra -/* E13E54 802416F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s deleted file mode 100644 index 4c89c8e07a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F8_E13E58 -/* E13E58 802416F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13E5C 802416FC 0000202D */ daddu $a0, $zero, $zero -/* E13E60 80241700 AFBF0014 */ sw $ra, 0x14($sp) -/* E13E64 80241704 0C00FB3A */ jal get_enemy -/* E13E68 80241708 AFB00010 */ sw $s0, 0x10($sp) -/* E13E6C 8024170C 8C50007C */ lw $s0, 0x7c($v0) -/* E13E70 80241710 8C420074 */ lw $v0, 0x74($v0) -/* E13E74 80241714 0000282D */ daddu $a1, $zero, $zero -/* E13E78 80241718 02028023 */ subu $s0, $s0, $v0 -/* E13E7C 8024171C 26100001 */ addiu $s0, $s0, 1 -/* E13E80 80241720 0C0496FA */ jal set_message_value -/* E13E84 80241724 0200202D */ daddu $a0, $s0, $zero -/* E13E88 80241728 3C048015 */ lui $a0, %hi(MessagePlural) -/* E13E8C 8024172C 2484C290 */ addiu $a0, $a0, %lo(MessagePlural) -/* E13E90 80241730 24020001 */ addiu $v0, $zero, 1 -/* E13E94 80241734 16020003 */ bne $s0, $v0, .L80241744 -/* E13E98 80241738 00000000 */ nop -/* E13E9C 8024173C 3C048015 */ lui $a0, %hi(MessageSingular) -/* E13EA0 80241740 2484C294 */ addiu $a0, $a0, %lo(MessageSingular) -.L80241744: -/* E13EA4 80241744 0C0496CF */ jal set_message_msg -/* E13EA8 80241748 24050001 */ addiu $a1, $zero, 1 -/* E13EAC 8024174C 8FBF0014 */ lw $ra, 0x14($sp) -/* E13EB0 80241750 8FB00010 */ lw $s0, 0x10($sp) -/* E13EB4 80241754 24020002 */ addiu $v0, $zero, 2 -/* E13EB8 80241758 03E00008 */ jr $ra -/* E13EBC 8024175C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241760_E13EC0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241760_E13EC0.s deleted file mode 100644 index 4623cc0229..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241760_E13EC0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241760_E13EC0 -/* E13EC0 80241760 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13EC4 80241764 AFBF0010 */ sw $ra, 0x10($sp) -/* E13EC8 80241768 0C03A5B2 */ jal func_800E96C8 -/* E13ECC 8024176C 00000000 */ nop -/* E13ED0 80241770 8FBF0010 */ lw $ra, 0x10($sp) -/* E13ED4 80241774 24020002 */ addiu $v0, $zero, 2 -/* E13ED8 80241778 03E00008 */ jr $ra -/* E13EDC 8024177C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241780_E13EE0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241780_E13EE0.s deleted file mode 100644 index 63d4c9f429..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241780_E13EE0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241780_E13EE0 -/* E13EE0 80241780 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E13EE4 80241784 3C048024 */ lui $a0, %hi(D_80243560_E15CC0) -/* E13EE8 80241788 24843560 */ addiu $a0, $a0, %lo(D_80243560_E15CC0) -/* E13EEC 8024178C AFBF0010 */ sw $ra, 0x10($sp) -/* E13EF0 80241790 0C0496CB */ jal set_message_images -/* E13EF4 80241794 00000000 */ nop -/* E13EF8 80241798 8FBF0010 */ lw $ra, 0x10($sp) -/* E13EFC 8024179C 24020002 */ addiu $v0, $zero, 2 -/* E13F00 802417A0 03E00008 */ jr $ra -/* E13F04 802417A4 27BD0018 */ addiu $sp, $sp, 0x18 -/* E13F08 802417A8 00000000 */ nop -/* E13F0C 802417AC 00000000 */ nop 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 deleted file mode 100644 index ac1e60d7ab..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s +++ /dev/null @@ -1,288 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802484E0_E1E260 -.double 59.0 - -.section .text - -glabel func_80240000_E15D80 -/* E15D80 80240000 27BDFF90 */ addiu $sp, $sp, -0x70 -/* E15D84 80240004 0000202D */ daddu $a0, $zero, $zero -/* E15D88 80240008 AFBF006C */ sw $ra, 0x6c($sp) -/* E15D8C 8024000C AFB60068 */ sw $s6, 0x68($sp) -/* E15D90 80240010 AFB50064 */ sw $s5, 0x64($sp) -/* E15D94 80240014 AFB40060 */ sw $s4, 0x60($sp) -/* E15D98 80240018 AFB3005C */ sw $s3, 0x5c($sp) -/* E15D9C 8024001C AFB20058 */ sw $s2, 0x58($sp) -/* E15DA0 80240020 AFB10054 */ sw $s1, 0x54($sp) -/* E15DA4 80240024 0C00FB3A */ jal get_enemy -/* E15DA8 80240028 AFB00050 */ sw $s0, 0x50($sp) -/* E15DAC 8024002C 0040882D */ daddu $s1, $v0, $zero -/* E15DB0 80240030 8E32006C */ lw $s2, 0x6c($s1) -/* E15DB4 80240034 8E420028 */ lw $v0, 0x28($s2) -/* E15DB8 80240038 30420004 */ andi $v0, $v0, 4 -/* E15DBC 8024003C 1040002A */ beqz $v0, .L802400E8 -/* 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 hud_element_set_render_pos -/* E15DD0 80240050 0200202D */ daddu $a0, $s0, $zero -/* 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 hud_element_set_render_pos -/* E15DEC 8024006C 0200202D */ daddu $a0, $s0, $zero -/* 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 -/* E15E00 80240080 24070079 */ addiu $a3, $zero, 0x79 -/* E15E04 80240084 C6400024 */ lwc1 $f0, 0x24($s2) -/* E15E08 80240088 46800020 */ cvt.s.w $f0, $f0 -/* E15E0C 8024008C 46000021 */ cvt.d.s $f0, $f0 -/* E15E10 80240090 3C014028 */ lui $at, 0x4028 -/* E15E14 80240094 44811800 */ mtc1 $at, $f3 -/* E15E18 80240098 44801000 */ mtc1 $zero, $f2 -/* E15E1C 8024009C 3C018025 */ lui $at, %hi(D_802484E0_E1E260) -/* E15E20 802400A0 D42484E0 */ ldc1 $f4, %lo(D_802484E0_E1E260)($at) -/* E15E24 802400A4 46220003 */ div.d $f0, $f0, $f2 -/* E15E28 802400A8 46240002 */ mul.d $f0, $f0, $f4 -/* E15E2C 802400AC 00000000 */ nop -/* E15E30 802400B0 240200E4 */ addiu $v0, $zero, 0xe4 -/* E15E34 802400B4 AFA20014 */ sw $v0, 0x14($sp) -/* E15E38 802400B8 24020086 */ addiu $v0, $zero, 0x86 -/* E15E3C 802400BC AFA20018 */ sw $v0, 0x18($sp) -/* E15E40 802400C0 240200FF */ addiu $v0, $zero, 0xff -/* E15E44 802400C4 AFA00010 */ sw $zero, 0x10($sp) -/* E15E48 802400C8 AFA2001C */ sw $v0, 0x1c($sp) -/* E15E4C 802400CC 4620018D */ trunc.w.d $f6, $f0 -/* E15E50 802400D0 44063000 */ mfc1 $a2, $f6 -/* E15E54 802400D4 00000000 */ nop -/* E15E58 802400D8 00C43021 */ addu $a2, $a2, $a0 -/* E15E5C 802400DC 00063400 */ sll $a2, $a2, 0x10 -/* E15E60 802400E0 0C00AAB1 */ jal startup_draw_prim_rect_COPY -/* E15E64 802400E4 00063403 */ sra $a2, $a2, 0x10 -.L802400E8: -/* E15E68 802400E8 8E220078 */ lw $v0, 0x78($s1) -/* E15E6C 802400EC 10400003 */ beqz $v0, .L802400FC -/* E15E70 802400F0 28420004 */ slti $v0, $v0, 4 -/* E15E74 802400F4 1440000B */ bnez $v0, .L80240124 -/* E15E78 802400F8 00000000 */ nop -.L802400FC: -/* E15E7C 802400FC 8E430014 */ lw $v1, 0x14($s2) -/* E15E80 80240100 2862FFB1 */ slti $v0, $v1, -0x4f -/* E15E84 80240104 14400010 */ bnez $v0, .L80240148 -/* E15E88 80240108 2462FFF6 */ addiu $v0, $v1, -0xa -/* E15E8C 8024010C AE420014 */ sw $v0, 0x14($s2) -/* E15E90 80240110 2842FFB0 */ slti $v0, $v0, -0x50 -/* E15E94 80240114 1040000C */ beqz $v0, .L80240148 -/* E15E98 80240118 2402FFB0 */ addiu $v0, $zero, -0x50 -/* E15E9C 8024011C 08090052 */ j .L80240148 -/* E15EA0 80240120 AE420014 */ sw $v0, 0x14($s2) -.L80240124: -/* E15EA4 80240124 8E430014 */ lw $v1, 0x14($s2) -/* E15EA8 80240128 28620017 */ slti $v0, $v1, 0x17 -/* E15EAC 8024012C 10400006 */ beqz $v0, .L80240148 -/* E15EB0 80240130 2462000A */ addiu $v0, $v1, 0xa -/* E15EB4 80240134 AE420014 */ sw $v0, 0x14($s2) -/* E15EB8 80240138 28420018 */ slti $v0, $v0, 0x18 -/* E15EBC 8024013C 14400002 */ bnez $v0, .L80240148 -/* E15EC0 80240140 24020017 */ addiu $v0, $zero, 0x17 -/* E15EC4 80240144 AE420014 */ sw $v0, 0x14($s2) -.L80240148: -/* E15EC8 80240148 8E220078 */ lw $v0, 0x78($s1) -/* E15ECC 8024014C 1440000B */ bnez $v0, .L8024017C -/* E15ED0 80240150 00000000 */ nop -/* E15ED4 80240154 8E430018 */ lw $v1, 0x18($s2) -/* E15ED8 80240158 28620140 */ slti $v0, $v1, 0x140 -/* E15EDC 8024015C 10400011 */ beqz $v0, .L802401A4 -/* E15EE0 80240160 2462000A */ addiu $v0, $v1, 0xa -/* E15EE4 80240164 AE420018 */ sw $v0, 0x18($s2) -/* E15EE8 80240168 28420141 */ slti $v0, $v0, 0x141 -/* E15EEC 8024016C 1440000E */ bnez $v0, .L802401A8 -/* E15EF0 80240170 0000202D */ daddu $a0, $zero, $zero -/* E15EF4 80240174 08090068 */ j .L802401A0 -/* E15EF8 80240178 24020140 */ addiu $v0, $zero, 0x140 -.L8024017C: -/* E15EFC 8024017C 8E430018 */ lw $v1, 0x18($s2) -/* E15F00 80240180 286200E2 */ slti $v0, $v1, 0xe2 -/* E15F04 80240184 14400008 */ bnez $v0, .L802401A8 -/* E15F08 80240188 0000202D */ daddu $a0, $zero, $zero -/* E15F0C 8024018C 2462FFF6 */ addiu $v0, $v1, -0xa -/* E15F10 80240190 AE420018 */ sw $v0, 0x18($s2) -/* E15F14 80240194 284200E1 */ slti $v0, $v0, 0xe1 -/* E15F18 80240198 10400003 */ beqz $v0, .L802401A8 -/* E15F1C 8024019C 240200E1 */ addiu $v0, $zero, 0xe1 -.L802401A0: -/* E15F20 802401A0 AE420018 */ sw $v0, 0x18($s2) -.L802401A4: -/* E15F24 802401A4 0000202D */ daddu $a0, $zero, $zero -.L802401A8: -/* E15F28 802401A8 24050009 */ addiu $a1, $zero, 9 -/* E15F2C 802401AC 24020050 */ addiu $v0, $zero, 0x50 -/* E15F30 802401B0 AFA20014 */ sw $v0, 0x14($sp) -/* E15F34 802401B4 24020026 */ addiu $v0, $zero, 0x26 -/* E15F38 802401B8 241100B4 */ addiu $s1, $zero, 0xb4 -/* E15F3C 802401BC 24160140 */ addiu $s6, $zero, 0x140 -/* E15F40 802401C0 241500F0 */ addiu $s5, $zero, 0xf0 -/* E15F44 802401C4 AFA00010 */ sw $zero, 0x10($sp) -/* E15F48 802401C8 AFA20018 */ sw $v0, 0x18($sp) -/* E15F4C 802401CC AFB1001C */ sw $s1, 0x1c($sp) -/* E15F50 802401D0 AFA00020 */ sw $zero, 0x20($sp) -/* E15F54 802401D4 AFA00024 */ sw $zero, 0x24($sp) -/* E15F58 802401D8 AFA00028 */ sw $zero, 0x28($sp) -/* E15F5C 802401DC AFA0002C */ sw $zero, 0x2c($sp) -/* E15F60 802401E0 AFA00030 */ sw $zero, 0x30($sp) -/* E15F64 802401E4 AFA00034 */ sw $zero, 0x34($sp) -/* E15F68 802401E8 AFA00038 */ sw $zero, 0x38($sp) -/* E15F6C 802401EC AFA0003C */ sw $zero, 0x3c($sp) -/* E15F70 802401F0 AFA00040 */ sw $zero, 0x40($sp) -/* E15F74 802401F4 AFB60044 */ sw $s6, 0x44($sp) -/* E15F78 802401F8 AFB50048 */ sw $s5, 0x48($sp) -/* E15F7C 802401FC AFA0004C */ sw $zero, 0x4c($sp) -/* E15F80 80240200 8E460014 */ lw $a2, 0x14($s2) -/* E15F84 80240204 0C03D4B8 */ jal draw_box -/* E15F88 80240208 24070017 */ addiu $a3, $zero, 0x17 -/* E15F8C 8024020C 3C040008 */ lui $a0, 8 -/* E15F90 80240210 34840047 */ ori $a0, $a0, 0x47 -/* E15F94 80240214 2406001C */ addiu $a2, $zero, 0x1c -/* E15F98 80240218 8E450014 */ lw $a1, 0x14($s2) -/* E15F9C 8024021C 240700FF */ addiu $a3, $zero, 0xff -/* E15FA0 80240220 AFA00010 */ sw $zero, 0x10($sp) -/* E15FA4 80240224 AFA00014 */ sw $zero, 0x14($sp) -/* E15FA8 80240228 0C04993B */ jal draw_msg -/* E15FAC 8024022C 24A5002A */ addiu $a1, $a1, 0x2a -/* E15FB0 80240230 2406002B */ addiu $a2, $zero, 0x2b -/* E15FB4 80240234 24070001 */ addiu $a3, $zero, 1 -/* E15FB8 80240238 241300FF */ addiu $s3, $zero, 0xff -/* E15FBC 8024023C 24140003 */ addiu $s4, $zero, 3 -/* E15FC0 80240240 8E440004 */ lw $a0, 4($s2) -/* E15FC4 80240244 8E450014 */ lw $a1, 0x14($s2) -/* E15FC8 80240248 2410000A */ addiu $s0, $zero, 0xa -/* E15FCC 8024024C AFA00010 */ sw $zero, 0x10($sp) -/* E15FD0 80240250 AFB30014 */ sw $s3, 0x14($sp) -/* E15FD4 80240254 AFB40018 */ sw $s4, 0x18($sp) -/* E15FD8 80240258 02042023 */ subu $a0, $s0, $a0 -/* E15FDC 8024025C 0C049DA7 */ jal draw_number -/* E15FE0 80240260 24A50041 */ addiu $a1, $a1, 0x41 -/* E15FE4 80240264 3C048025 */ lui $a0, %hi(D_802482A0_E1E020) -/* E15FE8 80240268 248482A0 */ addiu $a0, $a0, %lo(D_802482A0_E1E020) -/* E15FEC 8024026C 24050020 */ addiu $a1, $zero, 0x20 -/* E15FF0 80240270 00A0302D */ daddu $a2, $a1, $zero -/* E15FF4 80240274 24070002 */ addiu $a3, $zero, 2 -/* E15FF8 80240278 3C028025 */ lui $v0, %hi(D_802484A0_E1E220) -/* E15FFC 8024027C 244284A0 */ addiu $v0, $v0, %lo(D_802484A0_E1E220) -/* E16000 80240280 AFA00010 */ sw $zero, 0x10($sp) -/* E16004 80240284 AFA20014 */ sw $v0, 0x14($sp) -/* E16008 80240288 96430016 */ lhu $v1, 0x16($s2) -/* E1600C 8024028C 2402001A */ addiu $v0, $zero, 0x1a -/* E16010 80240290 AFB00020 */ sw $s0, 0x20($sp) -/* E16014 80240294 24100014 */ addiu $s0, $zero, 0x14 -/* E16018 80240298 AFA2001C */ sw $v0, 0x1c($sp) -/* E1601C 8024029C 2402012C */ addiu $v0, $zero, 0x12c -/* E16020 802402A0 AFA20028 */ sw $v0, 0x28($sp) -/* E16024 802402A4 240200C8 */ addiu $v0, $zero, 0xc8 -/* E16028 802402A8 AFB00024 */ sw $s0, 0x24($sp) -/* E1602C 802402AC AFA2002C */ sw $v0, 0x2c($sp) -/* E16030 802402B0 AFB30030 */ sw $s3, 0x30($sp) -/* E16034 802402B4 24630005 */ addiu $v1, $v1, 5 -/* E16038 802402B8 00031C00 */ sll $v1, $v1, 0x10 -/* E1603C 802402BC 00031C03 */ sra $v1, $v1, 0x10 -/* E16040 802402C0 0C04BA68 */ jal draw_ci_image_with_clipping -/* E16044 802402C4 AFA30018 */ sw $v1, 0x18($sp) -/* E16048 802402C8 8E460008 */ lw $a2, 8($s2) -/* E1604C 802402CC 28C20385 */ slti $v0, $a2, 0x385 -/* E16050 802402D0 50400001 */ beql $v0, $zero, .L802402D8 -/* E16054 802402D4 24060384 */ addiu $a2, $zero, 0x384 -.L802402D8: -/* E16058 802402D8 3C038888 */ lui $v1, 0x8888 -/* E1605C 802402DC 34638889 */ ori $v1, $v1, 0x8889 -/* E16060 802402E0 0000202D */ daddu $a0, $zero, $zero -/* E16064 802402E4 2405000B */ addiu $a1, $zero, 0xb -/* E16068 802402E8 2402003C */ addiu $v0, $zero, 0x3c -/* E1606C 802402EC AFA20014 */ sw $v0, 0x14($sp) -/* E16070 802402F0 000617C3 */ sra $v0, $a2, 0x1f -/* E16074 802402F4 3C014024 */ lui $at, 0x4024 -/* E16078 802402F8 44811800 */ mtc1 $at, $f3 -/* E1607C 802402FC 44801000 */ mtc1 $zero, $f2 -/* E16080 80240300 00C30018 */ mult $a2, $v1 -/* E16084 80240304 AFA00010 */ sw $zero, 0x10($sp) -/* E16088 80240308 AFB00018 */ sw $s0, 0x18($sp) -/* E1608C 8024030C AFB1001C */ sw $s1, 0x1c($sp) -/* E16090 80240310 AFA00020 */ sw $zero, 0x20($sp) -/* E16094 80240314 AFA00024 */ sw $zero, 0x24($sp) -/* E16098 80240318 AFA00028 */ sw $zero, 0x28($sp) -/* E1609C 8024031C AFA0002C */ sw $zero, 0x2c($sp) -/* E160A0 80240320 AFA00030 */ sw $zero, 0x30($sp) -/* E160A4 80240324 AFA00034 */ sw $zero, 0x34($sp) -/* E160A8 80240328 AFA00038 */ sw $zero, 0x38($sp) -/* E160AC 8024032C 00004010 */ mfhi $t0 -/* E160B0 80240330 01068021 */ addu $s0, $t0, $a2 -/* E160B4 80240334 00108103 */ sra $s0, $s0, 4 -/* E160B8 80240338 02028023 */ subu $s0, $s0, $v0 -/* E160BC 8024033C 00101100 */ sll $v0, $s0, 4 -/* E160C0 80240340 00501023 */ subu $v0, $v0, $s0 -/* E160C4 80240344 00021040 */ sll $v0, $v0, 1 -/* E160C8 80240348 00C21023 */ subu $v0, $a2, $v0 -/* E160CC 8024034C 44820000 */ mtc1 $v0, $f0 -/* E160D0 80240350 00000000 */ nop -/* E160D4 80240354 46800020 */ cvt.s.w $f0, $f0 -/* E160D8 80240358 46000021 */ cvt.d.s $f0, $f0 -/* E160DC 8024035C 46220002 */ mul.d $f0, $f0, $f2 -/* E160E0 80240360 00000000 */ nop -/* E160E4 80240364 AFA0003C */ sw $zero, 0x3c($sp) -/* E160E8 80240368 AFA00040 */ sw $zero, 0x40($sp) -/* E160EC 8024036C AFB60044 */ sw $s6, 0x44($sp) -/* E160F0 80240370 AFB50048 */ sw $s5, 0x48($sp) -/* E160F4 80240374 AFA0004C */ sw $zero, 0x4c($sp) -/* E160F8 80240378 3C01403E */ lui $at, 0x403e -/* E160FC 8024037C 44811800 */ mtc1 $at, $f3 -/* E16100 80240380 44801000 */ mtc1 $zero, $f2 -/* E16104 80240384 8E460018 */ lw $a2, 0x18($s2) -/* E16108 80240388 46220003 */ div.d $f0, $f0, $f2 -/* E1610C 8024038C 4620018D */ trunc.w.d $f6, $f0 -/* E16110 80240390 44113000 */ mfc1 $s1, $f6 -/* E16114 80240394 0C03D4B8 */ jal draw_box -/* E16118 80240398 2407001B */ addiu $a3, $zero, 0x1b -/* E1611C 8024039C 0200202D */ daddu $a0, $s0, $zero -/* E16120 802403A0 2406001F */ addiu $a2, $zero, 0x1f -/* E16124 802403A4 8E450018 */ lw $a1, 0x18($s2) -/* E16128 802403A8 24070001 */ addiu $a3, $zero, 1 -/* E1612C 802403AC AFA00010 */ sw $zero, 0x10($sp) -/* E16130 802403B0 AFB30014 */ sw $s3, 0x14($sp) -/* E16134 802403B4 AFB40018 */ sw $s4, 0x18($sp) -/* E16138 802403B8 0C049DA7 */ jal draw_number -/* E1613C 802403BC 24A5001D */ addiu $a1, $a1, 0x1d -/* E16140 802403C0 0220202D */ daddu $a0, $s1, $zero -/* E16144 802403C4 2406001F */ addiu $a2, $zero, 0x1f -/* E16148 802403C8 8E450018 */ lw $a1, 0x18($s2) -/* E1614C 802403CC 24070001 */ addiu $a3, $zero, 1 -/* E16150 802403D0 AFA00010 */ sw $zero, 0x10($sp) -/* E16154 802403D4 AFB30014 */ sw $s3, 0x14($sp) -/* E16158 802403D8 AFA00018 */ sw $zero, 0x18($sp) -/* E1615C 802403DC 0C049DA7 */ jal draw_number -/* E16160 802403E0 24A50028 */ addiu $a1, $a1, 0x28 -/* E16164 802403E4 3C040008 */ lui $a0, 8 -/* E16168 802403E8 34840024 */ ori $a0, $a0, 0x24 -/* E1616C 802403EC 2406001D */ addiu $a2, $zero, 0x1d -/* E16170 802403F0 8E450018 */ lw $a1, 0x18($s2) -/* E16174 802403F4 240700FF */ addiu $a3, $zero, 0xff -/* E16178 802403F8 AFA00010 */ sw $zero, 0x10($sp) -/* E1617C 802403FC AFA00014 */ sw $zero, 0x14($sp) -/* E16180 80240400 0C04993B */ jal draw_msg -/* E16184 80240404 24A5001E */ addiu $a1, $a1, 0x1e -/* E16188 80240408 8FBF006C */ lw $ra, 0x6c($sp) -/* E1618C 8024040C 8FB60068 */ lw $s6, 0x68($sp) -/* E16190 80240410 8FB50064 */ lw $s5, 0x64($sp) -/* E16194 80240414 8FB40060 */ lw $s4, 0x60($sp) -/* E16198 80240418 8FB3005C */ lw $s3, 0x5c($sp) -/* E1619C 8024041C 8FB20058 */ lw $s2, 0x58($sp) -/* E161A0 80240420 8FB10054 */ lw $s1, 0x54($sp) -/* E161A4 80240424 8FB00050 */ lw $s0, 0x50($sp) -/* E161A8 80240428 03E00008 */ jr $ra -/* E161AC 8024042C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240430_E161B0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240430_E161B0.s deleted file mode 100644 index 99fd240b25..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240430_E161B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240430_E161B0 -/* E161B0 80240430 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E161B4 80240434 2402002D */ addiu $v0, $zero, 0x2d -/* E161B8 80240438 AFA20010 */ sw $v0, 0x10($sp) -/* E161BC 8024043C 3C028024 */ lui $v0, %hi(func_80240000_E15D80) -/* E161C0 80240440 24420000 */ addiu $v0, $v0, %lo(func_80240000_E15D80) -/* E161C4 80240444 27A40010 */ addiu $a0, $sp, 0x10 -/* E161C8 80240448 AFBF0020 */ sw $ra, 0x20($sp) -/* E161CC 8024044C AFA00018 */ sw $zero, 0x18($sp) -/* E161D0 80240450 AFA2001C */ sw $v0, 0x1c($sp) -/* E161D4 80240454 0C047644 */ jal queue_render_task -/* E161D8 80240458 AFA00014 */ sw $zero, 0x14($sp) -/* E161DC 8024045C 8FBF0020 */ lw $ra, 0x20($sp) -/* E161E0 80240460 03E00008 */ jr $ra -/* E161E4 80240464 27BD0028 */ addiu $sp, $sp, 0x28 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 deleted file mode 100644 index 336339958e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240468_E161E8 -/* E161E8 80240468 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E161EC 8024046C AFB00010 */ sw $s0, 0x10($sp) -/* E161F0 80240470 00A0802D */ daddu $s0, $a1, $zero -/* E161F4 80240474 0000202D */ daddu $a0, $zero, $zero -/* E161F8 80240478 AFBF001C */ sw $ra, 0x1c($sp) -/* E161FC 8024047C AFB20018 */ sw $s2, 0x18($sp) -/* E16200 80240480 0C00FB3A */ jal get_enemy -/* E16204 80240484 AFB10014 */ sw $s1, 0x14($sp) -/* E16208 80240488 8C52006C */ lw $s2, 0x6c($v0) -/* E1620C 8024048C 12000026 */ beqz $s0, .L80240528 -/* E16210 80240490 00000000 */ nop -/* E16214 80240494 3C058024 */ lui $a1, %hi(func_80240430_E161B0) -/* E16218 80240498 24A50430 */ addiu $a1, $a1, %lo(func_80240430_E161B0) -/* E1621C 8024049C 0C048C56 */ jal create_generic_entity_world -/* E16220 802404A0 0000202D */ daddu $a0, $zero, $zero -/* 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 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 hud_element_set_render_depth -/* E16248 802404C8 AE50000C */ sw $s0, 0xc($s2) -/* E1624C 802404CC 0200202D */ daddu $a0, $s0, $zero -/* 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 hud_element_set_tint -/* E16268 802404E8 00A0382D */ daddu $a3, $a1, $zero -/* E1626C 802404EC 0200202D */ daddu $a0, $s0, $zero -/* 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 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 hud_element_set_render_depth -/* E16298 80240518 AE500010 */ sw $s0, 0x10($s2) -/* E1629C 8024051C 0200202D */ daddu $a0, $s0, $zero -/* E162A0 80240520 0C051280 */ jal hud_element_set_flags -/* E162A4 80240524 24050080 */ addiu $a1, $zero, 0x80 -.L80240528: -/* E162A8 80240528 8FBF001C */ lw $ra, 0x1c($sp) -/* E162AC 8024052C 8FB20018 */ lw $s2, 0x18($sp) -/* E162B0 80240530 8FB10014 */ lw $s1, 0x14($sp) -/* E162B4 80240534 8FB00010 */ lw $s0, 0x10($sp) -/* E162B8 80240538 0000102D */ daddu $v0, $zero, $zero -/* E162BC 8024053C 03E00008 */ jr $ra -/* E162C0 80240540 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240544_E162C4.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240544_E162C4.s deleted file mode 100644 index ad22b5b77a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240544_E162C4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_E162C4 -/* E162C4 80240544 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E162C8 80240548 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* E162CC 8024054C 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* E162D0 80240550 AFBF0010 */ sw $ra, 0x10($sp) -/* E162D4 80240554 8C430000 */ lw $v1, ($v0) -/* E162D8 80240558 3C040004 */ lui $a0, 4 -/* E162DC 8024055C 00641825 */ or $v1, $v1, $a0 -/* E162E0 80240560 0C03A625 */ jal func_800E9894 -/* E162E4 80240564 AC430000 */ sw $v1, ($v0) -/* E162E8 80240568 0C03A5EE */ jal close_status_menu -/* E162EC 8024056C 00000000 */ nop -/* E162F0 80240570 8FBF0010 */ lw $ra, 0x10($sp) -/* E162F4 80240574 24020002 */ addiu $v0, $zero, 2 -/* E162F8 80240578 03E00008 */ jr $ra -/* E162FC 8024057C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240580_E16300.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240580_E16300.s deleted file mode 100644 index fc964af420..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240580_E16300.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240580_E16300 -/* E16300 80240580 3C04FFFB */ lui $a0, 0xfffb -/* E16304 80240584 3C03800A */ lui $v1, %hi(gOverrideFlags) -/* E16308 80240588 2463A650 */ addiu $v1, $v1, %lo(gOverrideFlags) -/* E1630C 8024058C 8C620000 */ lw $v0, ($v1) -/* E16310 80240590 3484FFFF */ ori $a0, $a0, 0xffff -/* E16314 80240594 00441024 */ and $v0, $v0, $a0 -/* E16318 80240598 AC620000 */ sw $v0, ($v1) -/* E1631C 8024059C 03E00008 */ jr $ra -/* E16320 802405A0 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405A4_E16324.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405A4_E16324.s deleted file mode 100644 index 3bdfdd9b89..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405A4_E16324.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A4_E16324 -/* E16324 802405A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E16328 802405A8 AFBF0010 */ sw $ra, 0x10($sp) -/* E1632C 802405AC 0C00FB3A */ jal get_enemy -/* E16330 802405B0 0000202D */ daddu $a0, $zero, $zero -/* E16334 802405B4 8C42006C */ lw $v0, 0x6c($v0) -/* E16338 802405B8 0C0441B4 */ jal delete_entity -/* E1633C 802405BC 8C44001C */ lw $a0, 0x1c($v0) -/* E16340 802405C0 8FBF0010 */ lw $ra, 0x10($sp) -/* E16344 802405C4 24020002 */ addiu $v0, $zero, 2 -/* E16348 802405C8 03E00008 */ jr $ra -/* E1634C 802405CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s deleted file mode 100644 index 7fcf0d0c2d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D0_E16350 -/* E16350 802405D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* E16354 802405D4 0000202D */ daddu $a0, $zero, $zero -/* E16358 802405D8 AFBF002C */ sw $ra, 0x2c($sp) -/* E1635C 802405DC 0C00FB3A */ jal get_enemy -/* E16360 802405E0 AFB00028 */ sw $s0, 0x28($sp) -/* E16364 802405E4 3C04802F */ lui $a0, %hi(D_802EAFDC) -/* E16368 802405E8 2484AFDC */ addiu $a0, $a0, %lo(D_802EAFDC) -/* E1636C 802405EC 8C50006C */ lw $s0, 0x6c($v0) -/* E16370 802405F0 3C028000 */ lui $v0, 0x8000 -/* E16374 802405F4 24050163 */ addiu $a1, $zero, 0x163 -/* E16378 802405F8 24060014 */ addiu $a2, $zero, 0x14 -/* E1637C 802405FC 2407FF4C */ addiu $a3, $zero, -0xb4 -/* E16380 80240600 AFA00010 */ sw $zero, 0x10($sp) -/* E16384 80240604 AFA00014 */ sw $zero, 0x14($sp) -/* E16388 80240608 AFA00018 */ sw $zero, 0x18($sp) -/* E1638C 8024060C AFA0001C */ sw $zero, 0x1c($sp) -/* E16390 80240610 0C044631 */ jal create_entity -/* E16394 80240614 AFA20020 */ sw $v0, 0x20($sp) -/* E16398 80240618 0040202D */ daddu $a0, $v0, $zero -/* E1639C 8024061C 0C04417A */ jal get_entity_by_index -/* E163A0 80240620 AE04001C */ sw $a0, 0x1c($s0) -/* E163A4 80240624 3C038024 */ lui $v1, %hi(D_80242A3C_E187BC) -/* E163A8 80240628 24632A3C */ addiu $v1, $v1, %lo(D_80242A3C_E187BC) -/* E163AC 8024062C AC430028 */ sw $v1, 0x28($v0) -/* E163B0 80240630 8FBF002C */ lw $ra, 0x2c($sp) -/* E163B4 80240634 8FB00028 */ lw $s0, 0x28($sp) -/* E163B8 80240638 24020002 */ addiu $v0, $zero, 2 -/* E163BC 8024063C 03E00008 */ jr $ra -/* E163C0 80240640 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240644_E163C4.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240644_E163C4.s deleted file mode 100644 index 28129b60eb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240644_E163C4.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240644_E163C4 -/* E163C4 80240644 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E163C8 80240648 AFB20018 */ sw $s2, 0x18($sp) -/* E163CC 8024064C 0080902D */ daddu $s2, $a0, $zero -/* E163D0 80240650 0000202D */ daddu $a0, $zero, $zero -/* E163D4 80240654 AFBF001C */ sw $ra, 0x1c($sp) -/* E163D8 80240658 AFB10014 */ sw $s1, 0x14($sp) -/* E163DC 8024065C 0C00FB3A */ jal get_enemy -/* E163E0 80240660 AFB00010 */ sw $s0, 0x10($sp) -/* E163E4 80240664 0240202D */ daddu $a0, $s2, $zero -/* E163E8 80240668 3C05FE36 */ lui $a1, 0xfe36 -/* E163EC 8024066C 8C51006C */ lw $s1, 0x6c($v0) -/* E163F0 80240670 0C0B1EAF */ jal evt_get_variable -/* E163F4 80240674 34A53C8A */ ori $a1, $a1, 0x3c8a -/* E163F8 80240678 0240202D */ daddu $a0, $s2, $zero -/* E163FC 8024067C 3C05FE36 */ lui $a1, 0xfe36 -/* E16400 80240680 34A53C8B */ ori $a1, $a1, 0x3c8b -/* E16404 80240684 0C0B1EAF */ jal evt_get_variable -/* E16408 80240688 0040802D */ daddu $s0, $v0, $zero -/* E1640C 8024068C 0000182D */ daddu $v1, $zero, $zero -/* E16410 80240690 0220202D */ daddu $a0, $s1, $zero -.L80240694: -/* E16414 80240694 8C820038 */ lw $v0, 0x38($a0) -/* E16418 80240698 52020006 */ beql $s0, $v0, .L802406B4 -/* E1641C 8024069C 0240202D */ daddu $a0, $s2, $zero -/* E16420 802406A0 24630001 */ addiu $v1, $v1, 1 -/* E16424 802406A4 28620023 */ slti $v0, $v1, 0x23 -/* E16428 802406A8 1440FFFA */ bnez $v0, .L80240694 -/* E1642C 802406AC 2484001C */ addiu $a0, $a0, 0x1c -/* E16430 802406B0 0240202D */ daddu $a0, $s2, $zero -.L802406B4: -/* E16434 802406B4 3C05FE36 */ lui $a1, 0xfe36 -/* E16438 802406B8 000310C0 */ sll $v0, $v1, 3 -/* E1643C 802406BC 00431023 */ subu $v0, $v0, $v1 -/* E16440 802406C0 00021080 */ sll $v0, $v0, 2 -/* E16444 802406C4 02228021 */ addu $s0, $s1, $v0 -/* E16448 802406C8 8E060034 */ lw $a2, 0x34($s0) -/* E1644C 802406CC 0C0B2026 */ jal evt_set_variable -/* E16450 802406D0 34A53C8C */ ori $a1, $a1, 0x3c8c -/* E16454 802406D4 8E030034 */ lw $v1, 0x34($s0) -/* E16458 802406D8 24020001 */ addiu $v0, $zero, 1 -/* E1645C 802406DC 10620013 */ beq $v1, $v0, .L8024072C -/* E16460 802406E0 28620002 */ slti $v0, $v1, 2 -/* E16464 802406E4 10400005 */ beqz $v0, .L802406FC -/* E16468 802406E8 24020002 */ addiu $v0, $zero, 2 -/* E1646C 802406EC 10600009 */ beqz $v1, .L80240714 -/* E16470 802406F0 0240202D */ daddu $a0, $s2, $zero -/* E16474 802406F4 080901DD */ j .L80240774 -/* E16478 802406F8 00000000 */ nop -.L802406FC: -/* E1647C 802406FC 10620018 */ beq $v1, $v0, .L80240760 -/* E16480 80240700 24020003 */ addiu $v0, $zero, 3 -/* E16484 80240704 10620010 */ beq $v1, $v0, .L80240748 -/* E16488 80240708 0240202D */ daddu $a0, $s2, $zero -/* E1648C 8024070C 080901DD */ j .L80240774 -/* E16490 80240710 00000000 */ nop -.L80240714: -/* E16494 80240714 3C05FE36 */ lui $a1, 0xfe36 -/* E16498 80240718 8E060040 */ lw $a2, 0x40($s0) -/* E1649C 8024071C 0C0B2026 */ jal evt_set_variable -/* E164A0 80240720 34A53C8D */ ori $a1, $a1, 0x3c8d -/* E164A4 80240724 080901DC */ j .L80240770 -/* E164A8 80240728 2402000D */ addiu $v0, $zero, 0xd -.L8024072C: -/* E164AC 8024072C 0240202D */ daddu $a0, $s2, $zero -/* E164B0 80240730 3C05FE36 */ lui $a1, 0xfe36 -/* E164B4 80240734 8E060040 */ lw $a2, 0x40($s0) -/* E164B8 80240738 0C0B2026 */ jal evt_set_variable -/* E164BC 8024073C 34A53C8D */ ori $a1, $a1, 0x3c8d -/* E164C0 80240740 080901DC */ j .L80240770 -/* E164C4 80240744 24020021 */ addiu $v0, $zero, 0x21 -.L80240748: -/* E164C8 80240748 3C05FE36 */ lui $a1, 0xfe36 -/* E164CC 8024074C 8E060040 */ lw $a2, 0x40($s0) -/* E164D0 80240750 0C0B2026 */ jal evt_set_variable -/* E164D4 80240754 34A53C8D */ ori $a1, $a1, 0x3c8d -/* E164D8 80240758 080901DC */ j .L80240770 -/* E164DC 8024075C 24020034 */ addiu $v0, $zero, 0x34 -.L80240760: -/* E164E0 80240760 8E220004 */ lw $v0, 4($s1) -/* E164E4 80240764 24420001 */ addiu $v0, $v0, 1 -/* E164E8 80240768 AE220004 */ sw $v0, 4($s1) -/* E164EC 8024076C 24020049 */ addiu $v0, $zero, 0x49 -.L80240770: -/* E164F0 80240770 AE02002C */ sw $v0, 0x2c($s0) -.L80240774: -/* E164F4 80240774 8FBF001C */ lw $ra, 0x1c($sp) -/* E164F8 80240778 8FB20018 */ lw $s2, 0x18($sp) -/* E164FC 8024077C 8FB10014 */ lw $s1, 0x14($sp) -/* E16500 80240780 8FB00010 */ lw $s0, 0x10($sp) -/* E16504 80240784 24020002 */ addiu $v0, $zero, 2 -/* E16508 80240788 03E00008 */ jr $ra -/* E1650C 8024078C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s deleted file mode 100644 index b24e81f066..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s +++ /dev/null @@ -1,292 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240790_E16510 -/* E16510 80240790 27BDFF40 */ addiu $sp, $sp, -0xc0 -/* E16514 80240794 0000202D */ daddu $a0, $zero, $zero -/* E16518 80240798 AFBF00BC */ sw $ra, 0xbc($sp) -/* E1651C 8024079C AFB600B8 */ sw $s6, 0xb8($sp) -/* E16520 802407A0 AFB500B4 */ sw $s5, 0xb4($sp) -/* E16524 802407A4 AFB400B0 */ sw $s4, 0xb0($sp) -/* E16528 802407A8 AFB300AC */ sw $s3, 0xac($sp) -/* E1652C 802407AC AFB200A8 */ sw $s2, 0xa8($sp) -/* E16530 802407B0 AFB100A4 */ sw $s1, 0xa4($sp) -/* E16534 802407B4 0C00FB3A */ jal get_enemy -/* E16538 802407B8 AFB000A0 */ sw $s0, 0xa0($sp) -/* E1653C 802407BC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* E16540 802407C0 8C55006C */ lw $s5, 0x6c($v0) -/* E16544 802407C4 2402038E */ addiu $v0, $zero, 0x38e -/* E16548 802407C8 AEA00004 */ sw $zero, 4($s5) -/* E1654C 802407CC AEA20008 */ sw $v0, 8($s5) -/* E16550 802407D0 AEA00020 */ sw $zero, 0x20($s5) -/* E16554 802407D4 AEA00024 */ sw $zero, 0x24($s5) -/* E16558 802407D8 0C00A67F */ jal rand_int -/* E1655C 802407DC AEA00028 */ sw $zero, 0x28($s5) -/* E16560 802407E0 3C035555 */ lui $v1, 0x5555 -/* E16564 802407E4 34635556 */ ori $v1, $v1, 0x5556 -/* E16568 802407E8 00430018 */ mult $v0, $v1 -/* E1656C 802407EC 0000802D */ daddu $s0, $zero, $zero -/* E16570 802407F0 3C068024 */ lui $a2, %hi(D_8024273C_E184BC) -/* E16574 802407F4 24C6273C */ addiu $a2, $a2, %lo(D_8024273C_E184BC) -/* E16578 802407F8 27A50010 */ addiu $a1, $sp, 0x10 -/* E1657C 802407FC 00021FC3 */ sra $v1, $v0, 0x1f -/* E16580 80240800 00004010 */ mfhi $t0 -/* E16584 80240804 01032023 */ subu $a0, $t0, $v1 -/* E16588 80240808 00041840 */ sll $v1, $a0, 1 -/* E1658C 8024080C 00641821 */ addu $v1, $v1, $a0 -/* E16590 80240810 00432023 */ subu $a0, $v0, $v1 -/* E16594 80240814 000410C0 */ sll $v0, $a0, 3 -/* E16598 80240818 00441021 */ addu $v0, $v0, $a0 -/* E1659C 8024081C 00021080 */ sll $v0, $v0, 2 -/* E165A0 80240820 00441023 */ subu $v0, $v0, $a0 -/* E165A4 80240824 00021880 */ sll $v1, $v0, 2 -.L80240828: -/* E165A8 80240828 00661021 */ addu $v0, $v1, $a2 -/* E165AC 8024082C 24630004 */ addiu $v1, $v1, 4 -/* E165B0 80240830 8C420000 */ lw $v0, ($v0) -/* E165B4 80240834 26100001 */ addiu $s0, $s0, 1 -/* E165B8 80240838 ACA20000 */ sw $v0, ($a1) -/* E165BC 8024083C 2A020023 */ slti $v0, $s0, 0x23 -/* E165C0 80240840 1440FFF9 */ bnez $v0, .L80240828 -/* E165C4 80240844 24A50004 */ addiu $a1, $a1, 4 -/* E165C8 80240848 0000802D */ daddu $s0, $zero, $zero -/* E165CC 8024084C 3C13EA0E */ lui $s3, 0xea0e -/* E165D0 80240850 3673A0EB */ ori $s3, $s3, 0xa0eb -/* E165D4 80240854 27B20010 */ addiu $s2, $sp, 0x10 -.L80240858: -/* E165D8 80240858 0C00A67F */ jal rand_int -/* E165DC 8024085C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* E165E0 80240860 00530018 */ mult $v0, $s3 -/* E165E4 80240864 240403E8 */ addiu $a0, $zero, 0x3e8 -/* E165E8 80240868 00022FC3 */ sra $a1, $v0, 0x1f -/* E165EC 8024086C 00004010 */ mfhi $t0 -/* E165F0 80240870 01021821 */ addu $v1, $t0, $v0 -/* E165F4 80240874 00031943 */ sra $v1, $v1, 5 -/* E165F8 80240878 00658823 */ subu $s1, $v1, $a1 -/* E165FC 8024087C 001118C0 */ sll $v1, $s1, 3 -/* E16600 80240880 00711821 */ addu $v1, $v1, $s1 -/* E16604 80240884 00031880 */ sll $v1, $v1, 2 -/* E16608 80240888 00711823 */ subu $v1, $v1, $s1 -/* E1660C 8024088C 0C00A67F */ jal rand_int -/* E16610 80240890 00438823 */ subu $s1, $v0, $v1 -/* E16614 80240894 00530018 */ mult $v0, $s3 -/* E16618 80240898 000227C3 */ sra $a0, $v0, 0x1f -/* E1661C 8024089C 00004010 */ mfhi $t0 -/* E16620 802408A0 01021821 */ addu $v1, $t0, $v0 -/* E16624 802408A4 00031943 */ sra $v1, $v1, 5 -/* E16628 802408A8 00642023 */ subu $a0, $v1, $a0 -/* E1662C 802408AC 000418C0 */ sll $v1, $a0, 3 -/* E16630 802408B0 00641821 */ addu $v1, $v1, $a0 -/* E16634 802408B4 00031880 */ sll $v1, $v1, 2 -/* E16638 802408B8 00641823 */ subu $v1, $v1, $a0 -/* E1663C 802408BC 00432023 */ subu $a0, $v0, $v1 -/* E16640 802408C0 12240009 */ beq $s1, $a0, .L802408E8 -/* E16644 802408C4 26100001 */ addiu $s0, $s0, 1 -/* E16648 802408C8 00041880 */ sll $v1, $a0, 2 -/* E1664C 802408CC 02431821 */ addu $v1, $s2, $v1 -/* E16650 802408D0 00111080 */ sll $v0, $s1, 2 -/* E16654 802408D4 02421021 */ addu $v0, $s2, $v0 -/* E16658 802408D8 8C440000 */ lw $a0, ($v0) -/* E1665C 802408DC 8C650000 */ lw $a1, ($v1) -/* E16660 802408E0 AC640000 */ sw $a0, ($v1) -/* E16664 802408E4 AC450000 */ sw $a1, ($v0) -.L802408E8: -/* E16668 802408E8 2A022710 */ slti $v0, $s0, 0x2710 -/* E1666C 802408EC 1440FFDA */ bnez $v0, .L80240858 -/* E16670 802408F0 2407FFFF */ addiu $a3, $zero, -1 -/* E16674 802408F4 0000802D */ daddu $s0, $zero, $zero -/* E16678 802408F8 3C068024 */ lui $a2, %hi(D_8024296C_E186EC) -/* E1667C 802408FC 24C6296C */ addiu $a2, $a2, %lo(D_8024296C_E186EC) -/* E16680 80240900 3C058024 */ lui $a1, %hi(D_802428E0_E18660) -/* E16684 80240904 24A528E0 */ addiu $a1, $a1, %lo(D_802428E0_E18660) -/* E16688 80240908 27A40010 */ addiu $a0, $sp, 0x10 -/* E1668C 8024090C 02A0182D */ daddu $v1, $s5, $zero -.L80240910: -/* E16690 80240910 AC67002C */ sw $a3, 0x2c($v1) -/* E16694 80240914 AC600030 */ sw $zero, 0x30($v1) -/* E16698 80240918 8C820000 */ lw $v0, ($a0) -/* E1669C 8024091C 24840004 */ addiu $a0, $a0, 4 -/* E166A0 80240920 26100001 */ addiu $s0, $s0, 1 -/* E166A4 80240924 AC620034 */ sw $v0, 0x34($v1) -/* E166A8 80240928 8CA20000 */ lw $v0, ($a1) -/* E166AC 8024092C 24A50004 */ addiu $a1, $a1, 4 -/* E166B0 80240930 AC620038 */ sw $v0, 0x38($v1) -/* E166B4 80240934 8CC20000 */ lw $v0, ($a2) -/* E166B8 80240938 24C60004 */ addiu $a2, $a2, 4 -/* E166BC 8024093C AC670040 */ sw $a3, 0x40($v1) -/* E166C0 80240940 AC670044 */ sw $a3, 0x44($v1) -/* E166C4 80240944 AC62003C */ sw $v0, 0x3c($v1) -/* E166C8 80240948 2A020023 */ slti $v0, $s0, 0x23 -/* E166CC 8024094C 1440FFF0 */ bnez $v0, .L80240910 -/* E166D0 80240950 2463001C */ addiu $v1, $v1, 0x1c -/* E166D4 80240954 2410000A */ addiu $s0, $zero, 0xa -.L80240958: -/* E166D8 80240958 0C00FB3A */ jal get_enemy -/* E166DC 8024095C 0200202D */ daddu $a0, $s0, $zero -/* E166E0 80240960 AC40006C */ sw $zero, 0x6c($v0) -/* E166E4 80240964 26100001 */ addiu $s0, $s0, 1 -/* E166E8 80240968 2A02000F */ slti $v0, $s0, 0xf -/* E166EC 8024096C 1440FFFA */ bnez $v0, .L80240958 -/* E166F0 80240970 00000000 */ nop -/* E166F4 80240974 2410001E */ addiu $s0, $zero, 0x1e -.L80240978: -/* E166F8 80240978 0C00FB3A */ jal get_enemy -/* E166FC 8024097C 0200202D */ daddu $a0, $s0, $zero -/* E16700 80240980 AC40006C */ sw $zero, 0x6c($v0) -/* E16704 80240984 26100001 */ addiu $s0, $s0, 1 -/* E16708 80240988 2A020023 */ slti $v0, $s0, 0x23 -/* E1670C 8024098C 1440FFFA */ bnez $v0, .L80240978 -/* E16710 80240990 00000000 */ nop -/* E16714 80240994 24100064 */ addiu $s0, $zero, 0x64 -.L80240998: -/* E16718 80240998 0C00FB3A */ jal get_enemy -/* E1671C 8024099C 0200202D */ daddu $a0, $s0, $zero -/* E16720 802409A0 AC40006C */ sw $zero, 0x6c($v0) -/* E16724 802409A4 26100001 */ addiu $s0, $s0, 1 -/* E16728 802409A8 2A02006E */ slti $v0, $s0, 0x6e -/* E1672C 802409AC 1440FFFA */ bnez $v0, .L80240998 -/* E16730 802409B0 00000000 */ nop -/* E16734 802409B4 24100009 */ addiu $s0, $zero, 9 -/* E16738 802409B8 3C028025 */ lui $v0, %hi(D_80248624) -/* E1673C 802409BC 24428624 */ addiu $v0, $v0, %lo(D_80248624) -.L802409C0: -/* E16740 802409C0 AC400000 */ sw $zero, ($v0) -/* E16744 802409C4 2610FFFF */ addiu $s0, $s0, -1 -/* E16748 802409C8 0601FFFD */ bgez $s0, .L802409C0 -/* E1674C 802409CC 2442FFFC */ addiu $v0, $v0, -4 -/* E16750 802409D0 24140001 */ addiu $s4, $zero, 1 -/* E16754 802409D4 3C168025 */ lui $s6, %hi(D_80248600) -/* E16758 802409D8 26D68600 */ addiu $s6, $s6, %lo(D_80248600) -/* E1675C 802409DC 02A0982D */ daddu $s3, $s5, $zero -.L802409E0: -/* E16760 802409E0 8E630034 */ lw $v1, 0x34($s3) -/* E16764 802409E4 1074001B */ beq $v1, $s4, .L80240A54 -/* E16768 802409E8 28620002 */ slti $v0, $v1, 2 -/* E1676C 802409EC 10400005 */ beqz $v0, .L80240A04 -/* E16770 802409F0 24020002 */ addiu $v0, $zero, 2 -/* E16774 802409F4 10600009 */ beqz $v1, .L80240A1C -/* E16778 802409F8 2402000A */ addiu $v0, $zero, 0xa -/* E1677C 802409FC 080902DD */ j .L80240B74 -/* E16780 80240A00 2673001C */ addiu $s3, $s3, 0x1c -.L80240A04: -/* E16784 80240A04 1062002E */ beq $v1, $v0, .L80240AC0 -/* E16788 80240A08 24020003 */ addiu $v0, $zero, 3 -/* E1678C 80240A0C 10620057 */ beq $v1, $v0, .L80240B6C -/* E16790 80240A10 24020032 */ addiu $v0, $zero, 0x32 -/* E16794 80240A14 080902DD */ j .L80240B74 -/* E16798 80240A18 2673001C */ addiu $s3, $s3, 0x1c -.L80240A1C: -/* E1679C 80240A1C AE62002C */ sw $v0, 0x2c($s3) -/* E167A0 80240A20 0040882D */ daddu $s1, $v0, $zero -.L80240A24: -/* E167A4 80240A24 0C00FB3A */ jal get_enemy -/* E167A8 80240A28 0220202D */ daddu $a0, $s1, $zero -/* E167AC 80240A2C 0040802D */ daddu $s0, $v0, $zero -/* E167B0 80240A30 8E02006C */ lw $v0, 0x6c($s0) -/* E167B4 80240A34 1040003B */ beqz $v0, .L80240B24 -/* E167B8 80240A38 00000000 */ nop -/* E167BC 80240A3C 26310001 */ addiu $s1, $s1, 1 -/* E167C0 80240A40 2A22000F */ slti $v0, $s1, 0xf -/* E167C4 80240A44 1440FFF7 */ bnez $v0, .L80240A24 -/* E167C8 80240A48 00000000 */ nop -/* E167CC 80240A4C 080902DD */ j .L80240B74 -/* E167D0 80240A50 2673001C */ addiu $s3, $s3, 0x1c -.L80240A54: -/* E167D4 80240A54 2402001E */ addiu $v0, $zero, 0x1e -/* E167D8 80240A58 AE62002C */ sw $v0, 0x2c($s3) -/* E167DC 80240A5C 0040882D */ daddu $s1, $v0, $zero -.L80240A60: -/* E167E0 80240A60 0C00FB3A */ jal get_enemy -/* E167E4 80240A64 0220202D */ daddu $a0, $s1, $zero -/* E167E8 80240A68 0040802D */ daddu $s0, $v0, $zero -/* E167EC 80240A6C 8E02006C */ lw $v0, 0x6c($s0) -/* E167F0 80240A70 1040002C */ beqz $v0, .L80240B24 -/* E167F4 80240A74 00000000 */ nop -/* E167F8 80240A78 26310001 */ addiu $s1, $s1, 1 -/* E167FC 80240A7C 2A220023 */ slti $v0, $s1, 0x23 -/* E16800 80240A80 1440FFF7 */ bnez $v0, .L80240A60 -/* E16804 80240A84 00000000 */ nop -/* E16808 80240A88 080902DD */ j .L80240B74 -/* E1680C 80240A8C 2673001C */ addiu $s3, $s3, 0x1c -.L80240A90: -/* E16810 80240A90 86040008 */ lh $a0, 8($s0) -/* E16814 80240A94 0C00EABB */ jal get_npc_unsafe -/* E16818 80240A98 00000000 */ nop -/* E1681C 80240A9C 0040902D */ daddu $s2, $v0, $zero -/* E16820 80240AA0 0040202D */ daddu $a0, $v0, $zero -/* E16824 80240AA4 AE14006C */ sw $s4, 0x6c($s0) -/* E16828 80240AA8 0C00EAFF */ jal disable_npc_shadow -/* E1682C 80240AAC AE710040 */ sw $s1, 0x40($s3) -/* E16830 80240AB0 8E420000 */ lw $v0, ($s2) -/* E16834 80240AB4 34420002 */ ori $v0, $v0, 2 -/* E16838 80240AB8 080902BD */ j .L80240AF4 -/* E1683C 80240ABC AE420000 */ sw $v0, ($s2) -.L80240AC0: -/* E16840 80240AC0 24020046 */ addiu $v0, $zero, 0x46 -/* E16844 80240AC4 AE62002C */ sw $v0, 0x2c($s3) -/* E16848 80240AC8 24110064 */ addiu $s1, $zero, 0x64 -.L80240ACC: -/* E1684C 80240ACC 0C00FB3A */ jal get_enemy -/* E16850 80240AD0 0220202D */ daddu $a0, $s1, $zero -/* E16854 80240AD4 0040802D */ daddu $s0, $v0, $zero -/* E16858 80240AD8 8E02006C */ lw $v0, 0x6c($s0) -/* E1685C 80240ADC 1040FFEC */ beqz $v0, .L80240A90 -/* E16860 80240AE0 00000000 */ nop -/* E16864 80240AE4 26310001 */ addiu $s1, $s1, 1 -/* E16868 80240AE8 2A22006E */ slti $v0, $s1, 0x6e -/* E1686C 80240AEC 1440FFF7 */ bnez $v0, .L80240ACC -/* E16870 80240AF0 00000000 */ nop -.L80240AF4: -/* E16874 80240AF4 0000882D */ daddu $s1, $zero, $zero -/* E16878 80240AF8 02C0202D */ daddu $a0, $s6, $zero -.L80240AFC: -/* E1687C 80240AFC 0080182D */ daddu $v1, $a0, $zero -/* E16880 80240B00 8C620000 */ lw $v0, ($v1) -/* E16884 80240B04 10400013 */ beqz $v0, .L80240B54 -/* E16888 80240B08 00112880 */ sll $a1, $s1, 2 -/* E1688C 80240B0C 26310001 */ addiu $s1, $s1, 1 -/* E16890 80240B10 2A22000B */ slti $v0, $s1, 0xb -/* E16894 80240B14 1440FFF9 */ bnez $v0, .L80240AFC -/* E16898 80240B18 24640004 */ addiu $a0, $v1, 4 -/* E1689C 80240B1C 080902DD */ j .L80240B74 -/* E168A0 80240B20 2673001C */ addiu $s3, $s3, 0x1c -.L80240B24: -/* E168A4 80240B24 86040008 */ lh $a0, 8($s0) -/* E168A8 80240B28 0C00EABB */ jal get_npc_unsafe -/* E168AC 80240B2C 00000000 */ nop -/* E168B0 80240B30 0040902D */ daddu $s2, $v0, $zero -/* E168B4 80240B34 0240202D */ daddu $a0, $s2, $zero -/* E168B8 80240B38 AE14006C */ sw $s4, 0x6c($s0) -/* E168BC 80240B3C 0C00EAFF */ jal disable_npc_shadow -/* E168C0 80240B40 AE710040 */ sw $s1, 0x40($s3) -/* E168C4 80240B44 8E420000 */ lw $v0, ($s2) -/* E168C8 80240B48 34420002 */ ori $v0, $v0, 2 -/* E168CC 80240B4C 080902DC */ j .L80240B70 -/* E168D0 80240B50 AE420000 */ sw $v0, ($s2) -.L80240B54: -/* E168D4 80240B54 AC940000 */ sw $s4, ($a0) -/* E168D8 80240B58 3C028024 */ lui $v0, %hi(D_802429F8_E18778) -/* E168DC 80240B5C 00451021 */ addu $v0, $v0, $a1 -/* E168E0 80240B60 8C4229F8 */ lw $v0, %lo(D_802429F8_E18778)($v0) -/* E168E4 80240B64 080902DC */ j .L80240B70 -/* E168E8 80240B68 AE620044 */ sw $v0, 0x44($s3) -.L80240B6C: -/* E168EC 80240B6C AE62002C */ sw $v0, 0x2c($s3) -.L80240B70: -/* E168F0 80240B70 2673001C */ addiu $s3, $s3, 0x1c -.L80240B74: -/* E168F4 80240B74 26A203D4 */ addiu $v0, $s5, 0x3d4 -/* E168F8 80240B78 0262102A */ slt $v0, $s3, $v0 -/* E168FC 80240B7C 1440FF98 */ bnez $v0, .L802409E0 -/* E16900 80240B80 00000000 */ nop -/* E16904 80240B84 8FBF00BC */ lw $ra, 0xbc($sp) -/* E16908 80240B88 8FB600B8 */ lw $s6, 0xb8($sp) -/* E1690C 80240B8C 8FB500B4 */ lw $s5, 0xb4($sp) -/* E16910 80240B90 8FB400B0 */ lw $s4, 0xb0($sp) -/* E16914 80240B94 8FB300AC */ lw $s3, 0xac($sp) -/* E16918 80240B98 8FB200A8 */ lw $s2, 0xa8($sp) -/* E1691C 80240B9C 8FB100A4 */ lw $s1, 0xa4($sp) -/* E16920 80240BA0 8FB000A0 */ lw $s0, 0xa0($sp) -/* E16924 80240BA4 24020002 */ addiu $v0, $zero, 2 -/* E16928 80240BA8 03E00008 */ jr $ra -/* E1692C 80240BAC 27BD00C0 */ addiu $sp, $sp, 0xc0 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 deleted file mode 100644 index 15792d1e94..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s +++ /dev/null @@ -1,1233 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802484E8_E1E268 -.word .L80240C9C_E16A1C, .L80240CCC_E16A4C, .L80240D88_E16B08, .L80240E60_E16BE0, .L80241048_E16DC8, .L802411E8_E16F68, .L802412C4_E17044, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241354_E170D4, .L80241384_E17104, .L80241434_E171B4, .L8024152C_E172AC, .L8024164C_E173CC, .L802416C4_E17444, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241B38_E178B8, .L80241748_E174C8, .L802417AC_E1752C, .L802418C4_E17644, .L802419F0_E17770, .L80241A30_E177B0, .L80241B38_E178B8 - -.section .text - -glabel func_80240BB0_E16930 -/* E16930 80240BB0 27BDFF18 */ addiu $sp, $sp, -0xe8 -/* E16934 80240BB4 0000202D */ daddu $a0, $zero, $zero -/* E16938 80240BB8 AFBF00B4 */ sw $ra, 0xb4($sp) -/* E1693C 80240BBC AFBE00B0 */ sw $fp, 0xb0($sp) -/* E16940 80240BC0 AFB700AC */ sw $s7, 0xac($sp) -/* E16944 80240BC4 AFB600A8 */ sw $s6, 0xa8($sp) -/* E16948 80240BC8 AFB500A4 */ sw $s5, 0xa4($sp) -/* E1694C 80240BCC AFB400A0 */ sw $s4, 0xa0($sp) -/* E16950 80240BD0 AFB3009C */ sw $s3, 0x9c($sp) -/* E16954 80240BD4 AFB20098 */ sw $s2, 0x98($sp) -/* E16958 80240BD8 AFB10094 */ sw $s1, 0x94($sp) -/* E1695C 80240BDC AFB00090 */ sw $s0, 0x90($sp) -/* E16960 80240BE0 F7BE00E0 */ sdc1 $f30, 0xe0($sp) -/* E16964 80240BE4 F7BC00D8 */ sdc1 $f28, 0xd8($sp) -/* E16968 80240BE8 F7BA00D0 */ sdc1 $f26, 0xd0($sp) -/* E1696C 80240BEC F7B800C8 */ sdc1 $f24, 0xc8($sp) -/* E16970 80240BF0 F7B600C0 */ sdc1 $f22, 0xc0($sp) -/* E16974 80240BF4 F7B400B8 */ sdc1 $f20, 0xb8($sp) -/* E16978 80240BF8 AFA00084 */ sw $zero, 0x84($sp) -/* E1697C 80240BFC 0C00FB3A */ jal get_enemy -/* E16980 80240C00 AFA00088 */ sw $zero, 0x88($sp) -/* E16984 80240C04 27BE0074 */ addiu $fp, $sp, 0x74 -/* E16988 80240C08 27B60078 */ addiu $s6, $sp, 0x78 -/* E1698C 80240C0C 27B7007C */ addiu $s7, $sp, 0x7c -/* E16990 80240C10 3C01C47A */ lui $at, 0xc47a -/* E16994 80240C14 4481D000 */ mtc1 $at, $f26 -/* E16998 80240C18 3C014000 */ lui $at, 0x4000 -/* E1699C 80240C1C 4481C800 */ mtc1 $at, $f25 -/* E169A0 80240C20 4480C000 */ mtc1 $zero, $f24 -/* E169A4 80240C24 4480E000 */ mtc1 $zero, $f28 -/* E169A8 80240C28 3C014000 */ lui $at, 0x4000 -/* E169AC 80240C2C 4481F000 */ mtc1 $at, $f30 -/* E169B0 80240C30 3C014120 */ lui $at, 0x4120 -/* E169B4 80240C34 4481B000 */ mtc1 $at, $f22 -/* E169B8 80240C38 8C55006C */ lw $s5, 0x6c($v0) -/* E169BC 80240C3C 3C014024 */ lui $at, 0x4024 -/* E169C0 80240C40 4481A800 */ mtc1 $at, $f21 -/* E169C4 80240C44 4480A000 */ mtc1 $zero, $f20 -/* E169C8 80240C48 02A0A02D */ daddu $s4, $s5, $zero -.L80240C4C: -/* E169CC 80240C4C 8E840040 */ lw $a0, 0x40($s4) -/* E169D0 80240C50 2402FFFF */ addiu $v0, $zero, -1 -/* E169D4 80240C54 108203B2 */ beq $a0, $v0, .L80241B20 -/* E169D8 80240C58 24020032 */ addiu $v0, $zero, 0x32 -/* E169DC 80240C5C 0C00FB3A */ jal get_enemy -/* E169E0 80240C60 00000000 */ nop -/* E169E4 80240C64 84440008 */ lh $a0, 8($v0) -/* E169E8 80240C68 0C00EABB */ jal get_npc_unsafe -/* E169EC 80240C6C 0040802D */ daddu $s0, $v0, $zero -/* E169F0 80240C70 8E83002C */ lw $v1, 0x2c($s4) -/* E169F4 80240C74 0040982D */ daddu $s3, $v0, $zero -/* E169F8 80240C78 2463FFF6 */ addiu $v1, $v1, -0xa -/* E169FC 80240C7C 2C620042 */ sltiu $v0, $v1, 0x42 -/* E16A00 80240C80 104003AD */ beqz $v0, .L80241B38_E178B8 -/* E16A04 80240C84 00031080 */ sll $v0, $v1, 2 -/* E16A08 80240C88 3C018025 */ lui $at, %hi(jtbl_802484E8_E1E268) -/* E16A0C 80240C8C 00220821 */ addu $at, $at, $v0 -/* E16A10 80240C90 8C2284E8 */ lw $v0, %lo(jtbl_802484E8_E1E268)($at) -/* E16A14 80240C94 00400008 */ jr $v0 -/* E16A18 80240C98 00000000 */ nop -.L80240C9C_E16A1C: -/* E16A1C 80240C9C 240400D2 */ addiu $a0, $zero, 0xd2 -/* E16A20 80240CA0 2402000B */ addiu $v0, $zero, 0xb -/* E16A24 80240CA4 0C00A67F */ jal rand_int -/* E16A28 80240CA8 AE82002C */ sw $v0, 0x2c($s4) -/* E16A2C 80240CAC 0260202D */ daddu $a0, $s3, $zero -/* E16A30 80240CB0 AE820030 */ sw $v0, 0x30($s4) -/* E16A34 80240CB4 8E620000 */ lw $v0, ($s3) -/* E16A38 80240CB8 2403FFFD */ addiu $v1, $zero, -3 -/* E16A3C 80240CBC E67A003C */ swc1 $f26, 0x3c($s3) -/* E16A40 80240CC0 00431024 */ and $v0, $v0, $v1 -/* E16A44 80240CC4 0C00EAFF */ jal disable_npc_shadow -/* E16A48 80240CC8 AE620000 */ sw $v0, ($s3) -.L80240CCC_E16A4C: -/* E16A4C 80240CCC 8E820030 */ lw $v0, 0x30($s4) -/* E16A50 80240CD0 2442FFFF */ addiu $v0, $v0, -1 -/* E16A54 80240CD4 1C400398 */ bgtz $v0, .L80241B38_E178B8 -/* E16A58 80240CD8 AE820030 */ sw $v0, 0x30($s4) -/* E16A5C 80240CDC 3C02002B */ lui $v0, 0x2b -/* E16A60 80240CE0 34420002 */ ori $v0, $v0, 2 -/* E16A64 80240CE4 AE620028 */ sw $v0, 0x28($s3) -/* E16A68 80240CE8 2402000C */ addiu $v0, $zero, 0xc -/* E16A6C 80240CEC AE82002C */ sw $v0, 0x2c($s4) -/* E16A70 80240CF0 C6600040 */ lwc1 $f0, 0x40($s3) -/* E16A74 80240CF4 E7A00010 */ swc1 $f0, 0x10($sp) -/* E16A78 80240CF8 8E04008C */ lw $a0, 0x8c($s0) -/* E16A7C 80240CFC 8E660038 */ lw $a2, 0x38($s3) -/* E16A80 80240D00 8E67003C */ lw $a3, 0x3c($s3) -/* E16A84 80240D04 0C052757 */ jal sfx_play_sound_at_position -/* E16A88 80240D08 3C050010 */ lui $a1, 0x10 -/* E16A8C 80240D0C 27A50068 */ addiu $a1, $sp, 0x68 -/* E16A90 80240D10 27A6006C */ addiu $a2, $sp, 0x6c -/* E16A94 80240D14 9684003A */ lhu $a0, 0x3a($s4) -/* E16A98 80240D18 27A70070 */ addiu $a3, $sp, 0x70 -/* E16A9C 80240D1C AFBE0010 */ sw $fp, 0x10($sp) -/* E16AA0 80240D20 AFB60014 */ sw $s6, 0x14($sp) -/* E16AA4 80240D24 0C046C3B */ jal get_model_center_and_size -/* E16AA8 80240D28 AFB70018 */ sw $s7, 0x18($sp) -/* E16AAC 80240D2C 3C014128 */ lui $at, 0x4128 -/* E16AB0 80240D30 44810000 */ mtc1 $at, $f0 -/* E16AB4 80240D34 C7A40068 */ lwc1 $f4, 0x68($sp) -/* E16AB8 80240D38 C7A2006C */ lwc1 $f2, 0x6c($sp) -/* E16ABC 80240D3C E660001C */ swc1 $f0, 0x1c($s3) -/* E16AC0 80240D40 3C014029 */ lui $at, 0x4029 -/* E16AC4 80240D44 44810800 */ mtc1 $at, $f1 -/* E16AC8 80240D48 44800000 */ mtc1 $zero, $f0 -/* E16ACC 80240D4C 460010A1 */ cvt.d.s $f2, $f2 -/* E16AD0 80240D50 E6640038 */ swc1 $f4, 0x38($s3) -/* E16AD4 80240D54 3C013FC0 */ lui $at, 0x3fc0 -/* E16AD8 80240D58 44812000 */ mtc1 $at, $f4 -/* E16ADC 80240D5C 46201081 */ sub.d $f2, $f2, $f0 -/* E16AE0 80240D60 E6640014 */ swc1 $f4, 0x14($s3) -/* E16AE4 80240D64 C7A00070 */ lwc1 $f0, 0x70($sp) -/* E16AE8 80240D68 46000021 */ cvt.d.s $f0, $f0 -/* E16AEC 80240D6C 46380000 */ add.d $f0, $f0, $f24 -/* E16AF0 80240D70 462010A0 */ cvt.s.d $f2, $f2 -/* E16AF4 80240D74 E662003C */ swc1 $f2, 0x3c($s3) -/* E16AF8 80240D78 E6620064 */ swc1 $f2, 0x64($s3) -/* E16AFC 80240D7C 46200020 */ cvt.s.d $f0, $f0 -/* E16B00 80240D80 080906CD */ j .L80241B34 -/* E16B04 80240D84 E6600040 */ swc1 $f0, 0x40($s3) -.L80240D88_E16B08: -/* E16B08 80240D88 8E820030 */ lw $v0, 0x30($s4) -/* E16B0C 80240D8C 24420001 */ addiu $v0, $v0, 1 -/* E16B10 80240D90 AE820030 */ sw $v0, 0x30($s4) -/* E16B14 80240D94 C660001C */ lwc1 $f0, 0x1c($s3) -/* E16B18 80240D98 C664003C */ lwc1 $f4, 0x3c($s3) -/* E16B1C 80240D9C 46000186 */ mov.s $f6, $f0 -/* E16B20 80240DA0 46002100 */ add.s $f4, $f4, $f0 -/* E16B24 80240DA4 C6600014 */ lwc1 $f0, 0x14($s3) -/* E16B28 80240DA8 3C0141A0 */ lui $at, 0x41a0 -/* E16B2C 80240DAC 44811000 */ mtc1 $at, $f2 -/* E16B30 80240DB0 46003181 */ sub.s $f6, $f6, $f0 -/* E16B34 80240DB4 C6600064 */ lwc1 $f0, 0x64($s3) -/* E16B38 80240DB8 46020000 */ add.s $f0, $f0, $f2 -/* E16B3C 80240DBC E664003C */ swc1 $f4, 0x3c($s3) -/* E16B40 80240DC0 46002086 */ mov.s $f2, $f4 -/* E16B44 80240DC4 4602003C */ c.lt.s $f0, $f2 -/* E16B48 80240DC8 00000000 */ nop -/* E16B4C 80240DCC 45000005 */ bc1f .L80240DE4 -/* E16B50 80240DD0 E666001C */ swc1 $f6, 0x1c($s3) -/* E16B54 80240DD4 0C00EAE8 */ jal enable_npc_shadow -/* E16B58 80240DD8 0260202D */ daddu $a0, $s3, $zero -/* E16B5C 80240DDC 0809037B */ j .L80240DEC -/* E16B60 80240DE0 00000000 */ nop -.L80240DE4: -/* E16B64 80240DE4 0C00EAFF */ jal disable_npc_shadow -/* E16B68 80240DE8 0260202D */ daddu $a0, $s3, $zero -.L80240DEC: -/* E16B6C 80240DEC C660001C */ lwc1 $f0, 0x1c($s3) -/* E16B70 80240DF0 44801000 */ mtc1 $zero, $f2 -/* E16B74 80240DF4 44801800 */ mtc1 $zero, $f3 -/* E16B78 80240DF8 46000021 */ cvt.d.s $f0, $f0 -/* E16B7C 80240DFC 4622003C */ c.lt.d $f0, $f2 -/* E16B80 80240E00 00000000 */ nop -/* E16B84 80240E04 4502034D */ bc1fl .L80241B3C -/* E16B88 80240E08 2694001C */ addiu $s4, $s4, 0x1c -/* E16B8C 80240E0C C662003C */ lwc1 $f2, 0x3c($s3) -/* E16B90 80240E10 C6600064 */ lwc1 $f0, 0x64($s3) -/* E16B94 80240E14 4600103E */ c.le.s $f2, $f0 -/* E16B98 80240E18 00000000 */ nop -/* E16B9C 80240E1C 45000346 */ bc1f .L80241B38_E178B8 -/* E16BA0 80240E20 2404014A */ addiu $a0, $zero, 0x14a -/* E16BA4 80240E24 2402000B */ addiu $v0, $zero, 0xb -/* E16BA8 80240E28 0C00A67F */ jal rand_int -/* E16BAC 80240E2C AE82002C */ sw $v0, 0x2c($s4) -/* E16BB0 80240E30 24040064 */ addiu $a0, $zero, 0x64 -/* E16BB4 80240E34 2442005A */ addiu $v0, $v0, 0x5a -/* E16BB8 80240E38 AE820030 */ sw $v0, 0x30($s4) -/* E16BBC 80240E3C 0C00A67F */ jal rand_int -/* E16BC0 80240E40 E67A003C */ swc1 $f26, 0x3c($s3) -/* E16BC4 80240E44 28420032 */ slti $v0, $v0, 0x32 -/* E16BC8 80240E48 104001B0 */ beqz $v0, .L8024150C -/* E16BCC 80240E4C 00000000 */ nop -/* E16BD0 80240E50 3C014387 */ lui $at, 0x4387 -/* E16BD4 80240E54 44810000 */ mtc1 $at, $f0 -/* E16BD8 80240E58 08090547 */ j .L8024151C -/* E16BDC 80240E5C E660000C */ swc1 $f0, 0xc($s3) -.L80240E60_E16BE0: -/* 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 hud_element_set_script -/* E16BF0 80240E70 00000000 */ nop -/* E16BF4 80240E74 8EA4000C */ lw $a0, 0xc($s5) -/* 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 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 -/* E16C14 80240E94 AEA00024 */ sw $zero, 0x24($s5) -/* E16C18 80240E98 34420004 */ ori $v0, $v0, 4 -/* E16C1C 80240E9C 0C00EAE8 */ jal enable_npc_shadow -/* E16C20 80240EA0 AEA20028 */ sw $v0, 0x28($s5) -/* E16C24 80240EA4 8EA20028 */ lw $v0, 0x28($s5) -/* E16C28 80240EA8 34420003 */ ori $v0, $v0, 3 -/* E16C2C 80240EAC AEA20028 */ sw $v0, 0x28($s5) -/* E16C30 80240EB0 24020008 */ addiu $v0, $zero, 8 -/* E16C34 80240EB4 A662008E */ sh $v0, 0x8e($s3) -/* E16C38 80240EB8 0C05272D */ jal sfx_play_sound -/* E16C3C 80240EBC 8E04008C */ lw $a0, 0x8c($s0) -/* E16C40 80240EC0 3C070001 */ lui $a3, 1 -/* E16C44 80240EC4 34E70001 */ ori $a3, $a3, 1 -/* E16C48 80240EC8 3C04002B */ lui $a0, 0x2b -/* E16C4C 80240ECC 34840003 */ ori $a0, $a0, 3 -/* E16C50 80240ED0 27A50068 */ addiu $a1, $sp, 0x68 -/* E16C54 80240ED4 27A6006C */ addiu $a2, $sp, 0x6c -/* E16C58 80240ED8 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* E16C5C 80240EDC 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* E16C60 80240EE0 2402000E */ addiu $v0, $zero, 0xe -/* E16C64 80240EE4 AE82002C */ sw $v0, 0x2c($s4) -/* E16C68 80240EE8 AC6700B8 */ sw $a3, 0xb8($v1) -/* E16C6C 80240EEC AE640028 */ sw $a0, 0x28($s3) -/* E16C70 80240EF0 9684003A */ lhu $a0, 0x3a($s4) -/* E16C74 80240EF4 27A70070 */ addiu $a3, $sp, 0x70 -/* E16C78 80240EF8 AFBE0010 */ sw $fp, 0x10($sp) -/* E16C7C 80240EFC AFB60014 */ sw $s6, 0x14($sp) -/* E16C80 80240F00 0C046C3B */ jal get_model_center_and_size -/* E16C84 80240F04 AFB70018 */ sw $s7, 0x18($sp) -/* E16C88 80240F08 0000202D */ daddu $a0, $zero, $zero -/* E16C8C 80240F0C 0260282D */ daddu $a1, $s3, $zero -/* E16C90 80240F10 4406E000 */ mfc1 $a2, $f28 -/* E16C94 80240F14 C7A20068 */ lwc1 $f2, 0x68($sp) -/* E16C98 80240F18 C7A00070 */ lwc1 $f0, 0x70($sp) -/* E16C9C 80240F1C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E16CA0 80240F20 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E16CA4 80240F24 3C014128 */ lui $at, 0x4128 -/* E16CA8 80240F28 44812000 */ mtc1 $at, $f4 -/* E16CAC 80240F2C 46000021 */ cvt.d.s $f0, $f0 -/* E16CB0 80240F30 E6620038 */ swc1 $f2, 0x38($s3) -/* E16CB4 80240F34 C7A2006C */ lwc1 $f2, 0x6c($sp) -/* E16CB8 80240F38 46380000 */ add.d $f0, $f0, $f24 -/* E16CBC 80240F3C E662003C */ swc1 $f2, 0x3c($s3) -/* E16CC0 80240F40 3C01420C */ lui $at, 0x420c -/* E16CC4 80240F44 44811000 */ mtc1 $at, $f2 -/* E16CC8 80240F48 46200020 */ cvt.s.d $f0, $f0 -/* E16CCC 80240F4C E6600040 */ swc1 $f0, 0x40($s3) -/* E16CD0 80240F50 C440002C */ lwc1 $f0, 0x2c($v0) -/* E16CD4 80240F54 3C013FC0 */ lui $at, 0x3fc0 -/* E16CD8 80240F58 44813000 */ mtc1 $at, $f6 -/* E16CDC 80240F5C 46020000 */ add.s $f0, $f0, $f2 -/* E16CE0 80240F60 E664001C */ swc1 $f4, 0x1c($s3) -/* E16CE4 80240F64 E6660014 */ swc1 $f6, 0x14($s3) -/* E16CE8 80240F68 E6600064 */ swc1 $f0, 0x64($s3) -/* E16CEC 80240F6C AE800030 */ sw $zero, 0x30($s4) -/* E16CF0 80240F70 866300A8 */ lh $v1, 0xa8($s3) -/* E16CF4 80240F74 3C013F80 */ lui $at, 0x3f80 -/* E16CF8 80240F78 44810000 */ mtc1 $at, $f0 -/* E16CFC 80240F7C 2402000A */ addiu $v0, $zero, 0xa -/* E16D00 80240F80 AFA2001C */ sw $v0, 0x1c($sp) -/* E16D04 80240F84 44834000 */ mtc1 $v1, $f8 -/* E16D08 80240F88 00000000 */ nop -/* E16D0C 80240F8C 46804220 */ cvt.s.w $f8, $f8 -/* E16D10 80240F90 44074000 */ mfc1 $a3, $f8 -/* E16D14 80240F94 27A20080 */ addiu $v0, $sp, 0x80 -/* E16D18 80240F98 E7BE0014 */ swc1 $f30, 0x14($sp) -/* E16D1C 80240F9C E7BC0018 */ swc1 $f28, 0x18($sp) -/* E16D20 80240FA0 AFA20020 */ sw $v0, 0x20($sp) -/* E16D24 80240FA4 0C01BFA4 */ jal fx_emote -/* E16D28 80240FA8 E7A00010 */ swc1 $f0, 0x10($sp) -/* E16D2C 80240FAC C6600038 */ lwc1 $f0, 0x38($s3) -/* E16D30 80240FB0 46160002 */ mul.s $f0, $f0, $f22 -/* E16D34 80240FB4 00000000 */ nop -/* E16D38 80240FB8 4600020D */ trunc.w.s $f8, $f0 -/* E16D3C 80240FBC E6080070 */ swc1 $f8, 0x70($s0) -/* E16D40 80240FC0 C660003C */ lwc1 $f0, 0x3c($s3) -/* E16D44 80240FC4 46160002 */ mul.s $f0, $f0, $f22 -/* E16D48 80240FC8 00000000 */ nop -/* E16D4C 80240FCC 4600020D */ trunc.w.s $f8, $f0 -/* E16D50 80240FD0 E6080074 */ swc1 $f8, 0x74($s0) -/* E16D54 80240FD4 C6600040 */ lwc1 $f0, 0x40($s3) -/* E16D58 80240FD8 46160002 */ mul.s $f0, $f0, $f22 -/* E16D5C 80240FDC 00000000 */ nop -/* E16D60 80240FE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E16D64 80240FE4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E16D68 80240FE8 4600020D */ trunc.w.s $f8, $f0 -/* E16D6C 80240FEC E6080078 */ swc1 $f8, 0x78($s0) -/* E16D70 80240FF0 C4400028 */ lwc1 $f0, 0x28($v0) -/* E16D74 80240FF4 46160002 */ mul.s $f0, $f0, $f22 -/* E16D78 80240FF8 00000000 */ nop -/* E16D7C 80240FFC 3C0141E0 */ lui $at, 0x41e0 -/* E16D80 80241000 44811000 */ mtc1 $at, $f2 -/* E16D84 80241004 4600020D */ trunc.w.s $f8, $f0 -/* E16D88 80241008 E608007C */ swc1 $f8, 0x7c($s0) -/* E16D8C 8024100C C440002C */ lwc1 $f0, 0x2c($v0) -/* E16D90 80241010 46020000 */ add.s $f0, $f0, $f2 -/* E16D94 80241014 46160002 */ mul.s $f0, $f0, $f22 -/* E16D98 80241018 00000000 */ nop -/* E16D9C 8024101C 4600020D */ trunc.w.s $f8, $f0 -/* E16DA0 80241020 E6080080 */ swc1 $f8, 0x80($s0) -/* E16DA4 80241024 C4400030 */ lwc1 $f0, 0x30($v0) -/* E16DA8 80241028 461E0000 */ add.s $f0, $f0, $f30 -/* E16DAC 8024102C 46160002 */ mul.s $f0, $f0, $f22 -/* E16DB0 80241030 00000000 */ nop -/* E16DB4 80241034 AE000088 */ sw $zero, 0x88($s0) -/* E16DB8 80241038 4600020D */ trunc.w.s $f8, $f0 -/* E16DBC 8024103C E6080084 */ swc1 $f8, 0x84($s0) -/* E16DC0 80241040 080906CF */ j .L80241B3C -/* E16DC4 80241044 2694001C */ addiu $s4, $s4, 0x1c -.L80241048_E16DC8: -/* E16DC8 80241048 C6000070 */ lwc1 $f0, 0x70($s0) -/* E16DCC 8024104C 46800020 */ cvt.s.w $f0, $f0 -/* E16DD0 80241050 46000021 */ cvt.d.s $f0, $f0 -/* E16DD4 80241054 46340003 */ div.d $f0, $f0, $f20 -/* E16DD8 80241058 46200020 */ cvt.s.d $f0, $f0 -/* E16DDC 8024105C 44050000 */ mfc1 $a1, $f0 -/* E16DE0 80241060 C600007C */ lwc1 $f0, 0x7c($s0) -/* E16DE4 80241064 46800020 */ cvt.s.w $f0, $f0 -/* E16DE8 80241068 46000021 */ cvt.d.s $f0, $f0 -/* E16DEC 8024106C 46340003 */ div.d $f0, $f0, $f20 -/* E16DF0 80241070 46200020 */ cvt.s.d $f0, $f0 -/* E16DF4 80241074 8E020088 */ lw $v0, 0x88($s0) -/* E16DF8 80241078 44060000 */ mfc1 $a2, $f0 -/* E16DFC 8024107C 24420001 */ addiu $v0, $v0, 1 -/* E16E00 80241080 AE020088 */ sw $v0, 0x88($s0) -/* E16E04 80241084 24080008 */ addiu $t0, $zero, 8 -/* E16E08 80241088 AFA80010 */ sw $t0, 0x10($sp) -/* E16E0C 8024108C 8E070088 */ lw $a3, 0x88($s0) -/* E16E10 80241090 0C00A8ED */ jal update_lerp -/* E16E14 80241094 0000202D */ daddu $a0, $zero, $zero -/* E16E18 80241098 E6600038 */ swc1 $f0, 0x38($s3) -/* E16E1C 8024109C C6000074 */ lwc1 $f0, 0x74($s0) -/* E16E20 802410A0 46800020 */ cvt.s.w $f0, $f0 -/* E16E24 802410A4 46000021 */ cvt.d.s $f0, $f0 -/* E16E28 802410A8 46340003 */ div.d $f0, $f0, $f20 -/* E16E2C 802410AC 46200020 */ cvt.s.d $f0, $f0 -/* E16E30 802410B0 44050000 */ mfc1 $a1, $f0 -/* E16E34 802410B4 C6000080 */ lwc1 $f0, 0x80($s0) -/* E16E38 802410B8 46800020 */ cvt.s.w $f0, $f0 -/* E16E3C 802410BC 24080008 */ addiu $t0, $zero, 8 -/* E16E40 802410C0 46000021 */ cvt.d.s $f0, $f0 -/* E16E44 802410C4 46340003 */ div.d $f0, $f0, $f20 -/* E16E48 802410C8 46200020 */ cvt.s.d $f0, $f0 -/* E16E4C 802410CC AFA80010 */ sw $t0, 0x10($sp) -/* E16E50 802410D0 8E070088 */ lw $a3, 0x88($s0) -/* E16E54 802410D4 44060000 */ mfc1 $a2, $f0 -/* E16E58 802410D8 0C00A8ED */ jal update_lerp -/* E16E5C 802410DC 0000202D */ daddu $a0, $zero, $zero -/* E16E60 802410E0 E660003C */ swc1 $f0, 0x3c($s3) -/* E16E64 802410E4 C6000078 */ lwc1 $f0, 0x78($s0) -/* E16E68 802410E8 46800020 */ cvt.s.w $f0, $f0 -/* E16E6C 802410EC 46000021 */ cvt.d.s $f0, $f0 -/* E16E70 802410F0 46340003 */ div.d $f0, $f0, $f20 -/* E16E74 802410F4 46200020 */ cvt.s.d $f0, $f0 -/* E16E78 802410F8 44050000 */ mfc1 $a1, $f0 -/* E16E7C 802410FC C6000084 */ lwc1 $f0, 0x84($s0) -/* E16E80 80241100 46800020 */ cvt.s.w $f0, $f0 -/* E16E84 80241104 24080008 */ addiu $t0, $zero, 8 -/* E16E88 80241108 46000021 */ cvt.d.s $f0, $f0 -/* E16E8C 8024110C 46340003 */ div.d $f0, $f0, $f20 -/* E16E90 80241110 46200020 */ cvt.s.d $f0, $f0 -/* E16E94 80241114 AFA80010 */ sw $t0, 0x10($sp) -/* E16E98 80241118 8E070088 */ lw $a3, 0x88($s0) -/* E16E9C 8024111C 44060000 */ mfc1 $a2, $f0 -/* E16EA0 80241120 0C00A8ED */ jal update_lerp -/* E16EA4 80241124 0000202D */ daddu $a0, $zero, $zero -/* E16EA8 80241128 3C020001 */ lui $v0, 1 -/* E16EAC 8024112C 3C04800F */ lui $a0, %hi(gPlayerStatusPtr) -/* E16EB0 80241130 8C847B30 */ lw $a0, %lo(gPlayerStatusPtr)($a0) -/* E16EB4 80241134 34420001 */ ori $v0, $v0, 1 -/* E16EB8 80241138 E6600040 */ swc1 $f0, 0x40($s3) -/* E16EBC 8024113C AC8200B8 */ sw $v0, 0xb8($a0) -/* E16EC0 80241140 9662008E */ lhu $v0, 0x8e($s3) -/* E16EC4 80241144 2442FFFF */ addiu $v0, $v0, -1 -/* E16EC8 80241148 A662008E */ sh $v0, 0x8e($s3) -/* E16ECC 8024114C 00021400 */ sll $v0, $v0, 0x10 -/* E16ED0 80241150 5C40027A */ bgtzl $v0, .L80241B3C -/* E16ED4 80241154 2694001C */ addiu $s4, $s4, 0x1c -/* E16ED8 80241158 3C03002B */ lui $v1, 0x2b -/* E16EDC 8024115C 3463000F */ ori $v1, $v1, 0xf -/* E16EE0 80241160 3C020001 */ lui $v0, 1 -/* E16EE4 80241164 3442001B */ ori $v0, $v0, 0x1b -/* E16EE8 80241168 AE630028 */ sw $v1, 0x28($s3) -/* E16EEC 8024116C AC8200B8 */ sw $v0, 0xb8($a0) -/* E16EF0 80241170 AEA00024 */ sw $zero, 0x24($s5) -/* E16EF4 80241174 C4800028 */ lwc1 $f0, 0x28($a0) -/* E16EF8 80241178 E6600038 */ swc1 $f0, 0x38($s3) -/* E16EFC 8024117C C480002C */ lwc1 $f0, 0x2c($a0) -/* E16F00 80241180 3C01403C */ lui $at, 0x403c -/* E16F04 80241184 44811800 */ mtc1 $at, $f3 -/* E16F08 80241188 44801000 */ mtc1 $zero, $f2 -/* E16F0C 8024118C 46000021 */ cvt.d.s $f0, $f0 -/* E16F10 80241190 46220000 */ add.d $f0, $f0, $f2 -/* E16F14 80241194 46200020 */ cvt.s.d $f0, $f0 -/* E16F18 80241198 E660003C */ swc1 $f0, 0x3c($s3) -/* E16F1C 8024119C C4800030 */ lwc1 $f0, 0x30($a0) -/* E16F20 802411A0 46000021 */ cvt.d.s $f0, $f0 -/* E16F24 802411A4 46380000 */ add.d $f0, $f0, $f24 -/* E16F28 802411A8 46200020 */ cvt.s.d $f0, $f0 -/* E16F2C 802411AC E6600040 */ swc1 $f0, 0x40($s3) -/* 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 hud_element_set_script -/* E16F40 802411C0 00000000 */ nop -/* E16F44 802411C4 8EA4000C */ lw $a0, 0xc($s5) -/* 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 hud_element_set_alpha -/* E16F58 802411D8 240500FF */ addiu $a1, $zero, 0xff -/* E16F5C 802411DC 2402000F */ addiu $v0, $zero, 0xf -/* E16F60 802411E0 080906CE */ j .L80241B38_E178B8 -/* E16F64 802411E4 AE82002C */ sw $v0, 0x2c($s4) -.L802411E8_E16F68: -/* E16F68 802411E8 3C040001 */ lui $a0, 1 -/* E16F6C 802411EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E16F70 802411F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E16F74 802411F4 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* E16F78 802411F8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* E16F7C 802411FC 3484001B */ ori $a0, $a0, 0x1b -/* E16F80 80241200 AC4400B8 */ sw $a0, 0xb8($v0) -/* E16F84 80241204 8C620010 */ lw $v0, 0x10($v1) -/* E16F88 80241208 30428000 */ andi $v0, $v0, 0x8000 -/* E16F8C 8024120C 10400004 */ beqz $v0, .L80241220 -/* E16F90 80241210 00000000 */ nop -/* E16F94 80241214 8EA20024 */ lw $v0, 0x24($s5) -/* E16F98 80241218 24420001 */ addiu $v0, $v0, 1 -/* E16F9C 8024121C AEA20024 */ sw $v0, 0x24($s5) -.L80241220: -/* E16FA0 80241220 8EA20024 */ lw $v0, 0x24($s5) -/* E16FA4 80241224 2842000C */ slti $v0, $v0, 0xc -/* E16FA8 80241228 54400244 */ bnel $v0, $zero, .L80241B3C -/* E16FAC 8024122C 2694001C */ addiu $s4, $s4, 0x1c -/* E16FB0 80241230 3C030001 */ lui $v1, 1 -/* E16FB4 80241234 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E16FB8 80241238 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E16FBC 8024123C 34630002 */ ori $v1, $v1, 2 -/* E16FC0 80241240 AC4300B8 */ sw $v1, 0xb8($v0) -/* E16FC4 80241244 8EA20028 */ lw $v0, 0x28($s5) -/* E16FC8 80241248 2403FFFE */ addiu $v1, $zero, -2 -/* E16FCC 8024124C 00431024 */ and $v0, $v0, $v1 -/* E16FD0 80241250 34420002 */ ori $v0, $v0, 2 -/* E16FD4 80241254 AEA20028 */ sw $v0, 0x28($s5) -/* E16FD8 80241258 24020010 */ addiu $v0, $zero, 0x10 -/* E16FDC 8024125C AE82002C */ sw $v0, 0x2c($s4) -/* E16FE0 80241260 2402000A */ addiu $v0, $zero, 0xa -/* E16FE4 80241264 A662008E */ sh $v0, 0x8e($s3) -/* 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 hud_element_set_script -/* E16FF8 80241278 2694001C */ addiu $s4, $s4, 0x1c -/* E16FFC 8024127C 8EA4000C */ lw $a0, 0xc($s5) -/* 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 hud_element_set_alpha -/* E17010 80241290 240500A0 */ addiu $a1, $zero, 0xa0 -/* E17014 80241294 3C02002B */ lui $v0, 0x2b -/* E17018 80241298 C660003C */ lwc1 $f0, 0x3c($s3) -/* E1701C 8024129C 3C014008 */ lui $at, 0x4008 -/* E17020 802412A0 44811800 */ mtc1 $at, $f3 -/* E17024 802412A4 44801000 */ mtc1 $zero, $f2 -/* E17028 802412A8 46000021 */ cvt.d.s $f0, $f0 -/* E1702C 802412AC 46220000 */ add.d $f0, $f0, $f2 -/* E17030 802412B0 34420008 */ ori $v0, $v0, 8 -/* E17034 802412B4 AE620028 */ sw $v0, 0x28($s3) -/* E17038 802412B8 46200020 */ cvt.s.d $f0, $f0 -/* E1703C 802412BC 080906CF */ j .L80241B3C -/* E17040 802412C0 E660003C */ swc1 $f0, 0x3c($s3) -.L802412C4_E17044: -/* E17044 802412C4 9662008E */ lhu $v0, 0x8e($s3) -/* E17048 802412C8 24080008 */ addiu $t0, $zero, 8 -/* E1704C 802412CC 2442FFFF */ addiu $v0, $v0, -1 -/* E17050 802412D0 A662008E */ sh $v0, 0x8e($s3) -/* E17054 802412D4 00021400 */ sll $v0, $v0, 0x10 -/* E17058 802412D8 00021403 */ sra $v0, $v0, 0x10 -/* E1705C 802412DC 14480004 */ bne $v0, $t0, .L802412F0 -/* E17060 802412E0 2403FFFB */ addiu $v1, $zero, -5 -/* E17064 802412E4 8EA20028 */ lw $v0, 0x28($s5) -/* E17068 802412E8 00431024 */ and $v0, $v0, $v1 -/* E1706C 802412EC AEA20028 */ sw $v0, 0x28($s5) -.L802412F0: -/* E17070 802412F0 8662008E */ lh $v0, 0x8e($s3) -/* E17074 802412F4 5C400211 */ bgtzl $v0, .L80241B3C -/* E17078 802412F8 2694001C */ addiu $s4, $s4, 0x1c -/* E1707C 802412FC 0260202D */ daddu $a0, $s3, $zero -/* E17080 80241300 24020011 */ addiu $v0, $zero, 0x11 -/* E17084 80241304 0C00EAFF */ jal disable_npc_shadow -/* E17088 80241308 AE82002C */ sw $v0, 0x2c($s4) -/* E1708C 8024130C C660003C */ lwc1 $f0, 0x3c($s3) -/* E17090 80241310 46160000 */ add.s $f0, $f0, $f22 -/* E17094 80241314 C6620040 */ lwc1 $f2, 0x40($s3) -/* E17098 80241318 8E620000 */ lw $v0, ($s3) -/* E1709C 8024131C 44060000 */ mfc1 $a2, $f0 -/* E170A0 80241320 3C013F80 */ lui $at, 0x3f80 -/* E170A4 80241324 44810000 */ mtc1 $at, $f0 -/* E170A8 80241328 34420002 */ ori $v0, $v0, 2 -/* E170AC 8024132C AE620000 */ sw $v0, ($s3) -/* E170B0 80241330 AFA00010 */ sw $zero, 0x10($sp) -/* E170B4 80241334 46001080 */ add.s $f2, $f2, $f0 -/* E170B8 80241338 AFA00014 */ sw $zero, 0x14($sp) -/* E170BC 8024133C 8E650038 */ lw $a1, 0x38($s3) -/* E170C0 80241340 44071000 */ mfc1 $a3, $f2 -/* E170C4 80241344 0C01BECC */ jal fx_walking_dust -/* E170C8 80241348 24040001 */ addiu $a0, $zero, 1 -/* E170CC 8024134C 080906CF */ j .L80241B3C -/* E170D0 80241350 2694001C */ addiu $s4, $s4, 0x1c -.L80241354_E170D4: -/* E170D4 80241354 240400D2 */ addiu $a0, $zero, 0xd2 -/* E170D8 80241358 2402001F */ addiu $v0, $zero, 0x1f -/* E170DC 8024135C 0C00A67F */ jal rand_int -/* E170E0 80241360 AE82002C */ sw $v0, 0x2c($s4) -/* E170E4 80241364 0260202D */ daddu $a0, $s3, $zero -/* E170E8 80241368 AE820030 */ sw $v0, 0x30($s4) -/* E170EC 8024136C 0C00EAFF */ jal disable_npc_shadow -/* E170F0 80241370 E67A003C */ swc1 $f26, 0x3c($s3) -/* E170F4 80241374 8E620000 */ lw $v0, ($s3) -/* E170F8 80241378 2403FFFD */ addiu $v1, $zero, -3 -/* E170FC 8024137C 00431024 */ and $v0, $v0, $v1 -/* E17100 80241380 AE620000 */ sw $v0, ($s3) -.L80241384_E17104: -/* E17104 80241384 8E820030 */ lw $v0, 0x30($s4) -/* E17108 80241388 2442FFFF */ addiu $v0, $v0, -1 -/* E1710C 8024138C 1C4001EA */ bgtz $v0, .L80241B38_E178B8 -/* E17110 80241390 AE820030 */ sw $v0, 0x30($s4) -/* E17114 80241394 24020020 */ addiu $v0, $zero, 0x20 -/* E17118 80241398 AE82002C */ sw $v0, 0x2c($s4) -/* E1711C 8024139C C6600040 */ lwc1 $f0, 0x40($s3) -/* E17120 802413A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* E17124 802413A4 8E04008C */ lw $a0, 0x8c($s0) -/* E17128 802413A8 8E660038 */ lw $a2, 0x38($s3) -/* E1712C 802413AC 8E67003C */ lw $a3, 0x3c($s3) -/* E17130 802413B0 0C052757 */ jal sfx_play_sound_at_position -/* E17134 802413B4 3C050010 */ lui $a1, 0x10 -/* E17138 802413B8 27A50068 */ addiu $a1, $sp, 0x68 -/* E1713C 802413BC 27A6006C */ addiu $a2, $sp, 0x6c -/* E17140 802413C0 9684003A */ lhu $a0, 0x3a($s4) -/* E17144 802413C4 27A70070 */ addiu $a3, $sp, 0x70 -/* E17148 802413C8 AFBE0010 */ sw $fp, 0x10($sp) -/* E1714C 802413CC AFB60014 */ sw $s6, 0x14($sp) -/* E17150 802413D0 0C046C3B */ jal get_model_center_and_size -/* E17154 802413D4 AFB70018 */ sw $s7, 0x18($sp) -/* E17158 802413D8 3C014128 */ lui $at, 0x4128 -/* E1715C 802413DC 44810000 */ mtc1 $at, $f0 -/* E17160 802413E0 C7A40068 */ lwc1 $f4, 0x68($sp) -/* E17164 802413E4 C7A2006C */ lwc1 $f2, 0x6c($sp) -/* E17168 802413E8 E660001C */ swc1 $f0, 0x1c($s3) -/* E1716C 802413EC 3C014029 */ lui $at, 0x4029 -/* E17170 802413F0 44810800 */ mtc1 $at, $f1 -/* E17174 802413F4 44800000 */ mtc1 $zero, $f0 -/* E17178 802413F8 460010A1 */ cvt.d.s $f2, $f2 -/* E1717C 802413FC E6640038 */ swc1 $f4, 0x38($s3) -/* E17180 80241400 3C013FC0 */ lui $at, 0x3fc0 -/* E17184 80241404 44812000 */ mtc1 $at, $f4 -/* E17188 80241408 46201081 */ sub.d $f2, $f2, $f0 -/* E1718C 8024140C E6640014 */ swc1 $f4, 0x14($s3) -/* E17190 80241410 C7A00070 */ lwc1 $f0, 0x70($sp) -/* E17194 80241414 46000021 */ cvt.d.s $f0, $f0 -/* E17198 80241418 46380000 */ add.d $f0, $f0, $f24 -/* E1719C 8024141C 462010A0 */ cvt.s.d $f2, $f2 -/* E171A0 80241420 E662003C */ swc1 $f2, 0x3c($s3) -/* E171A4 80241424 E6620064 */ swc1 $f2, 0x64($s3) -/* E171A8 80241428 46200020 */ cvt.s.d $f0, $f0 -/* E171AC 8024142C 080906CD */ j .L80241B34 -/* E171B0 80241430 E6600040 */ swc1 $f0, 0x40($s3) -.L80241434_E171B4: -/* E171B4 80241434 8E820030 */ lw $v0, 0x30($s4) -/* E171B8 80241438 24420001 */ addiu $v0, $v0, 1 -/* E171BC 8024143C AE820030 */ sw $v0, 0x30($s4) -/* E171C0 80241440 C660001C */ lwc1 $f0, 0x1c($s3) -/* E171C4 80241444 C664003C */ lwc1 $f4, 0x3c($s3) -/* E171C8 80241448 46000186 */ mov.s $f6, $f0 -/* E171CC 8024144C 46002100 */ add.s $f4, $f4, $f0 -/* E171D0 80241450 C6600014 */ lwc1 $f0, 0x14($s3) -/* E171D4 80241454 3C0141A0 */ lui $at, 0x41a0 -/* E171D8 80241458 44811000 */ mtc1 $at, $f2 -/* E171DC 8024145C 46003181 */ sub.s $f6, $f6, $f0 -/* E171E0 80241460 C6600064 */ lwc1 $f0, 0x64($s3) -/* E171E4 80241464 46020000 */ add.s $f0, $f0, $f2 -/* E171E8 80241468 E664003C */ swc1 $f4, 0x3c($s3) -/* E171EC 8024146C 46002086 */ mov.s $f2, $f4 -/* E171F0 80241470 4602003C */ c.lt.s $f0, $f2 -/* E171F4 80241474 00000000 */ nop -/* E171F8 80241478 45000005 */ bc1f .L80241490 -/* E171FC 8024147C E666001C */ swc1 $f6, 0x1c($s3) -/* E17200 80241480 0C00EAE8 */ jal enable_npc_shadow -/* E17204 80241484 0260202D */ daddu $a0, $s3, $zero -/* E17208 80241488 08090526 */ j .L80241498 -/* E1720C 8024148C 00000000 */ nop -.L80241490: -/* E17210 80241490 0C00EAFF */ jal disable_npc_shadow -/* E17214 80241494 0260202D */ daddu $a0, $s3, $zero -.L80241498: -/* E17218 80241498 C660001C */ lwc1 $f0, 0x1c($s3) -/* E1721C 8024149C 44801000 */ mtc1 $zero, $f2 -/* E17220 802414A0 44801800 */ mtc1 $zero, $f3 -/* E17224 802414A4 46000021 */ cvt.d.s $f0, $f0 -/* E17228 802414A8 4622003C */ c.lt.d $f0, $f2 -/* E1722C 802414AC 00000000 */ nop -/* E17230 802414B0 450201A2 */ bc1fl .L80241B3C -/* E17234 802414B4 2694001C */ addiu $s4, $s4, 0x1c -/* E17238 802414B8 C662003C */ lwc1 $f2, 0x3c($s3) -/* E1723C 802414BC C6600064 */ lwc1 $f0, 0x64($s3) -/* E17240 802414C0 4600103E */ c.le.s $f2, $f0 -/* E17244 802414C4 00000000 */ nop -/* E17248 802414C8 4500019B */ bc1f .L80241B38_E178B8 -/* E1724C 802414CC 2404014A */ addiu $a0, $zero, 0x14a -/* E17250 802414D0 2402001F */ addiu $v0, $zero, 0x1f -/* E17254 802414D4 0C00A67F */ jal rand_int -/* E17258 802414D8 AE82002C */ sw $v0, 0x2c($s4) -/* E1725C 802414DC 24040064 */ addiu $a0, $zero, 0x64 -/* E17260 802414E0 2442005A */ addiu $v0, $v0, 0x5a -/* E17264 802414E4 AE820030 */ sw $v0, 0x30($s4) -/* E17268 802414E8 0C00A67F */ jal rand_int -/* E1726C 802414EC E67A003C */ swc1 $f26, 0x3c($s3) -/* E17270 802414F0 28420032 */ slti $v0, $v0, 0x32 -/* E17274 802414F4 10400005 */ beqz $v0, .L8024150C -/* E17278 802414F8 00000000 */ nop -/* E1727C 802414FC 3C014387 */ lui $at, 0x4387 -/* E17280 80241500 44810000 */ mtc1 $at, $f0 -/* E17284 80241504 08090547 */ j .L8024151C -/* E17288 80241508 E660000C */ swc1 $f0, 0xc($s3) -.L8024150C: -/* E1728C 8024150C 3C0142B4 */ lui $at, 0x42b4 -/* E17290 80241510 44810000 */ mtc1 $at, $f0 -/* E17294 80241514 00000000 */ nop -/* E17298 80241518 E660000C */ swc1 $f0, 0xc($s3) -.L8024151C: -/* E1729C 8024151C 0C00EAFF */ jal disable_npc_shadow -/* E172A0 80241520 0260202D */ daddu $a0, $s3, $zero -/* E172A4 80241524 080906CF */ j .L80241B3C -/* E172A8 80241528 2694001C */ addiu $s4, $s4, 0x1c -.L8024152C_E172AC: -/* E172AC 8024152C 0C00EAE8 */ jal enable_npc_shadow -/* E172B0 80241530 0260202D */ daddu $a0, $s3, $zero -/* E172B4 80241534 3C03002C */ lui $v1, 0x2c -/* E172B8 80241538 34630005 */ ori $v1, $v1, 5 -/* E172BC 8024153C 27A50068 */ addiu $a1, $sp, 0x68 -/* E172C0 80241540 27A6006C */ addiu $a2, $sp, 0x6c -/* E172C4 80241544 2402000F */ addiu $v0, $zero, 0xf -/* E172C8 80241548 A662008E */ sh $v0, 0x8e($s3) -/* E172CC 8024154C AE630028 */ sw $v1, 0x28($s3) -/* E172D0 80241550 8EA20028 */ lw $v0, 0x28($s5) -/* E172D4 80241554 27A70070 */ addiu $a3, $sp, 0x70 -/* E172D8 80241558 34420003 */ ori $v0, $v0, 3 -/* E172DC 8024155C AEA20028 */ sw $v0, 0x28($s5) -/* E172E0 80241560 9684003A */ lhu $a0, 0x3a($s4) -/* E172E4 80241564 24020022 */ addiu $v0, $zero, 0x22 -/* E172E8 80241568 AE82002C */ sw $v0, 0x2c($s4) -/* E172EC 8024156C AFBE0010 */ sw $fp, 0x10($sp) -/* E172F0 80241570 AFB60014 */ sw $s6, 0x14($sp) -/* E172F4 80241574 0C046C3B */ jal get_model_center_and_size -/* E172F8 80241578 AFB70018 */ sw $s7, 0x18($sp) -/* E172FC 8024157C 0000202D */ daddu $a0, $zero, $zero -/* E17300 80241580 0260282D */ daddu $a1, $s3, $zero -/* E17304 80241584 4406E000 */ mfc1 $a2, $f28 -/* E17308 80241588 C7A00068 */ lwc1 $f0, 0x68($sp) -/* E1730C 8024158C 866200A8 */ lh $v0, 0xa8($s3) -/* E17310 80241590 C7A4006C */ lwc1 $f4, 0x6c($sp) -/* E17314 80241594 3C014020 */ lui $at, 0x4020 -/* E17318 80241598 44811800 */ mtc1 $at, $f3 -/* E1731C 8024159C 44801000 */ mtc1 $zero, $f2 -/* E17320 802415A0 44824000 */ mtc1 $v0, $f8 -/* E17324 802415A4 00000000 */ nop -/* E17328 802415A8 46804220 */ cvt.s.w $f8, $f8 -/* E1732C 802415AC 46162101 */ sub.s $f4, $f4, $f22 -/* E17330 802415B0 E6600038 */ swc1 $f0, 0x38($s3) -/* E17334 802415B4 C7A00070 */ lwc1 $f0, 0x70($sp) -/* E17338 802415B8 44074000 */ mfc1 $a3, $f8 -/* E1733C 802415BC 46000021 */ cvt.d.s $f0, $f0 -/* E17340 802415C0 46220000 */ add.d $f0, $f0, $f2 -/* E17344 802415C4 3C013F80 */ lui $at, 0x3f80 -/* E17348 802415C8 44811000 */ mtc1 $at, $f2 -/* E1734C 802415CC 2402000A */ addiu $v0, $zero, 0xa -/* E17350 802415D0 E664003C */ swc1 $f4, 0x3c($s3) -/* E17354 802415D4 46200020 */ cvt.s.d $f0, $f0 -/* E17358 802415D8 E6600040 */ swc1 $f0, 0x40($s3) -/* E1735C 802415DC AFA2001C */ sw $v0, 0x1c($sp) -/* E17360 802415E0 27A20080 */ addiu $v0, $sp, 0x80 -/* E17364 802415E4 E7A20010 */ swc1 $f2, 0x10($sp) -/* E17368 802415E8 E7BE0014 */ swc1 $f30, 0x14($sp) -/* E1736C 802415EC E7BC0018 */ swc1 $f28, 0x18($sp) -/* E17370 802415F0 0C01BFA4 */ jal fx_emote -/* E17374 802415F4 AFA20020 */ sw $v0, 0x20($sp) -/* E17378 802415F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E1737C 802415FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E17380 80241600 C6620038 */ lwc1 $f2, 0x38($s3) -/* E17384 80241604 C4400028 */ lwc1 $f0, 0x28($v0) -/* E17388 80241608 4602003C */ c.lt.s $f0, $f2 -/* E1738C 8024160C 00000000 */ nop -/* E17390 80241610 45000007 */ bc1f .L80241630 -/* E17394 80241614 00000000 */ nop -/* E17398 80241618 3C014387 */ lui $at, 0x4387 -/* E1739C 8024161C 44810000 */ mtc1 $at, $f0 -/* E173A0 80241620 3C0142BE */ lui $at, 0x42be -/* E173A4 80241624 44811000 */ mtc1 $at, $f2 -/* E173A8 80241628 08090592 */ j .L80241648 -/* E173AC 8024162C E660000C */ swc1 $f0, 0xc($s3) -.L80241630: -/* E173B0 80241630 3C0142B4 */ lui $at, 0x42b4 -/* E173B4 80241634 44810000 */ mtc1 $at, $f0 -/* E173B8 80241638 3C014384 */ lui $at, 0x4384 -/* E173BC 8024163C 34218000 */ ori $at, $at, 0x8000 -/* E173C0 80241640 44811000 */ mtc1 $at, $f2 -/* E173C4 80241644 E660000C */ swc1 $f0, 0xc($s3) -.L80241648: -/* E173C8 80241648 E4420080 */ swc1 $f2, 0x80($v0) -.L8024164C_E173CC: -/* E173CC 8024164C 3C030001 */ lui $v1, 1 -/* E173D0 80241650 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E173D4 80241654 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E173D8 80241658 34630001 */ ori $v1, $v1, 1 -/* E173DC 8024165C AC4300B8 */ sw $v1, 0xb8($v0) -/* E173E0 80241660 9662008E */ lhu $v0, 0x8e($s3) -/* E173E4 80241664 2442FFFF */ addiu $v0, $v0, -1 -/* E173E8 80241668 A662008E */ sh $v0, 0x8e($s3) -/* E173EC 8024166C 00021400 */ sll $v0, $v0, 0x10 -/* E173F0 80241670 5C400132 */ bgtzl $v0, .L80241B3C -/* E173F4 80241674 2694001C */ addiu $s4, $s4, 0x1c -/* E173F8 80241678 C6620040 */ lwc1 $f2, 0x40($s3) -/* E173FC 8024167C 3C013F80 */ lui $at, 0x3f80 -/* E17400 80241680 44810000 */ mtc1 $at, $f0 -/* E17404 80241684 00000000 */ nop -/* E17408 80241688 46001080 */ add.s $f2, $f2, $f0 -/* E1740C 8024168C 8E650038 */ lw $a1, 0x38($s3) -/* E17410 80241690 8E66003C */ lw $a2, 0x3c($s3) -/* E17414 80241694 44071000 */ mfc1 $a3, $f2 -/* E17418 80241698 0C01C07C */ jal fx_explosion -/* E1741C 8024169C 0000202D */ daddu $a0, $zero, $zero -/* E17420 802416A0 24042076 */ addiu $a0, $zero, 0x2076 -/* E17424 802416A4 2402001E */ addiu $v0, $zero, 0x1e -/* E17428 802416A8 A662008E */ sh $v0, 0x8e($s3) -/* E1742C 802416AC 24020023 */ addiu $v0, $zero, 0x23 -/* E17430 802416B0 E67A003C */ swc1 $f26, 0x3c($s3) -/* E17434 802416B4 0C05272D */ jal sfx_play_sound -/* E17438 802416B8 AE82002C */ sw $v0, 0x2c($s4) -/* E1743C 802416BC 080906CF */ j .L80241B3C -/* E17440 802416C0 2694001C */ addiu $s4, $s4, 0x1c -.L802416C4_E17444: -/* E17444 802416C4 9662008E */ lhu $v0, 0x8e($s3) -/* E17448 802416C8 24030019 */ addiu $v1, $zero, 0x19 -/* E1744C 802416CC 2442FFFF */ addiu $v0, $v0, -1 -/* E17450 802416D0 A662008E */ sh $v0, 0x8e($s3) -/* E17454 802416D4 00021400 */ sll $v0, $v0, 0x10 -/* E17458 802416D8 00021403 */ sra $v0, $v0, 0x10 -/* E1745C 802416DC 14430005 */ bne $v0, $v1, .L802416F4 -/* E17460 802416E0 3C030001 */ lui $v1, 1 -/* E17464 802416E4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E17468 802416E8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E1746C 802416EC 3463002F */ ori $v1, $v1, 0x2f -/* E17470 802416F0 AC4300B8 */ sw $v1, 0xb8($v0) -.L802416F4: -/* E17474 802416F4 8662008E */ lh $v0, 0x8e($s3) -/* E17478 802416F8 5C400110 */ bgtzl $v0, .L80241B3C -/* E1747C 802416FC 2694001C */ addiu $s4, $s4, 0x1c -/* E17480 80241700 3C030001 */ lui $v1, 1 -/* E17484 80241704 34630002 */ ori $v1, $v1, 2 -/* E17488 80241708 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E1748C 8024170C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E17490 80241710 0260202D */ daddu $a0, $s3, $zero -/* E17494 80241714 AC4300B8 */ sw $v1, 0xb8($v0) -/* E17498 80241718 8EA20028 */ lw $v0, 0x28($s5) -/* E1749C 8024171C 2403FFFE */ addiu $v1, $zero, -2 -/* E174A0 80241720 00431024 */ and $v0, $v0, $v1 -/* E174A4 80241724 34420002 */ ori $v0, $v0, 2 -/* E174A8 80241728 AEA20028 */ sw $v0, 0x28($s5) -/* E174AC 8024172C 24020024 */ addiu $v0, $zero, 0x24 -/* E174B0 80241730 0C00EAFF */ jal disable_npc_shadow -/* E174B4 80241734 AE82002C */ sw $v0, 0x2c($s4) -/* E174B8 80241738 8E620000 */ lw $v0, ($s3) -/* E174BC 8024173C 34420002 */ ori $v0, $v0, 2 -/* E174C0 80241740 080906CE */ j .L80241B38_E178B8 -/* E174C4 80241744 AE620000 */ sw $v0, ($s3) -.L80241748_E174C8: -/* E174C8 80241748 27A50068 */ addiu $a1, $sp, 0x68 -/* E174CC 8024174C 27A6006C */ addiu $a2, $sp, 0x6c -/* E174D0 80241750 9684003A */ lhu $a0, 0x3a($s4) -/* E174D4 80241754 27A70070 */ addiu $a3, $sp, 0x70 -/* E174D8 80241758 AFBE0010 */ sw $fp, 0x10($sp) -/* E174DC 8024175C AFB60014 */ sw $s6, 0x14($sp) -/* E174E0 80241760 0C046C3B */ jal get_model_center_and_size -/* E174E4 80241764 AFB70018 */ sw $s7, 0x18($sp) -/* E174E8 80241768 240400D2 */ addiu $a0, $zero, 0xd2 -/* E174EC 8024176C 24020047 */ addiu $v0, $zero, 0x47 -/* E174F0 80241770 0C00A67F */ jal rand_int -/* E174F4 80241774 AE82002C */ sw $v0, 0x2c($s4) -/* E174F8 80241778 C7A20068 */ lwc1 $f2, 0x68($sp) -/* E174FC 8024177C C7A00070 */ lwc1 $f0, 0x70($sp) -/* E17500 80241780 0260202D */ daddu $a0, $s3, $zero -/* E17504 80241784 AE820030 */ sw $v0, 0x30($s4) -/* E17508 80241788 46000021 */ cvt.d.s $f0, $f0 -/* E1750C 8024178C E6620038 */ swc1 $f2, 0x38($s3) -/* E17510 80241790 C7A2006C */ lwc1 $f2, 0x6c($sp) -/* E17514 80241794 46380000 */ add.d $f0, $f0, $f24 -/* E17518 80241798 E662003C */ swc1 $f2, 0x3c($s3) -/* E1751C 8024179C E6620064 */ swc1 $f2, 0x64($s3) -/* E17520 802417A0 46200020 */ cvt.s.d $f0, $f0 -/* E17524 802417A4 0C00EAFF */ jal disable_npc_shadow -/* E17528 802417A8 E6600040 */ swc1 $f0, 0x40($s3) -.L802417AC_E1752C: -/* E1752C 802417AC 8E820030 */ lw $v0, 0x30($s4) -/* E17530 802417B0 2442FFFF */ addiu $v0, $v0, -1 -/* E17534 802417B4 1C4000E0 */ bgtz $v0, .L80241B38_E178B8 -/* E17538 802417B8 AE820030 */ sw $v0, 0x30($s4) -/* E1753C 802417BC 27B20068 */ addiu $s2, $sp, 0x68 -/* E17540 802417C0 0240282D */ daddu $a1, $s2, $zero -/* E17544 802417C4 27B0006C */ addiu $s0, $sp, 0x6c -/* E17548 802417C8 0200302D */ daddu $a2, $s0, $zero -/* E1754C 802417CC 27B10070 */ addiu $s1, $sp, 0x70 -/* E17550 802417D0 9684003A */ lhu $a0, 0x3a($s4) -/* E17554 802417D4 0220382D */ daddu $a3, $s1, $zero -/* E17558 802417D8 AFBE0010 */ sw $fp, 0x10($sp) -/* E1755C 802417DC AFB60014 */ sw $s6, 0x14($sp) -/* E17560 802417E0 0C046C3B */ jal get_model_center_and_size -/* E17564 802417E4 AFB70018 */ sw $s7, 0x18($sp) -/* E17568 802417E8 24020048 */ addiu $v0, $zero, 0x48 -/* E1756C 802417EC AE82002C */ sw $v0, 0x2c($s4) -/* E17570 802417F0 C6600040 */ lwc1 $f0, 0x40($s3) -/* E17574 802417F4 24040214 */ addiu $a0, $zero, 0x214 -/* E17578 802417F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* E1757C 802417FC 8E660038 */ lw $a2, 0x38($s3) -/* E17580 80241800 8E67003C */ lw $a3, 0x3c($s3) -/* E17584 80241804 0C052757 */ jal sfx_play_sound_at_position -/* E17588 80241808 3C050020 */ lui $a1, 0x20 -/* E1758C 8024180C 0240282D */ daddu $a1, $s2, $zero -/* E17590 80241810 0200302D */ daddu $a2, $s0, $zero -/* E17594 80241814 9684003A */ lhu $a0, 0x3a($s4) -/* E17598 80241818 0220382D */ daddu $a3, $s1, $zero -/* E1759C 8024181C AFBE0010 */ sw $fp, 0x10($sp) -/* E175A0 80241820 AFB60014 */ sw $s6, 0x14($sp) -/* E175A4 80241824 0C046C3B */ jal get_model_center_and_size -/* E175A8 80241828 AFB70018 */ sw $s7, 0x18($sp) -/* E175AC 8024182C C6600064 */ lwc1 $f0, 0x64($s3) -/* E175B0 80241830 3C013F8C */ lui $at, 0x3f8c -/* E175B4 80241834 3421CCCD */ ori $at, $at, 0xcccd -/* E175B8 80241838 44811000 */ mtc1 $at, $f2 -/* E175BC 8024183C E676001C */ swc1 $f22, 0x1c($s3) -/* E175C0 80241840 E660003C */ swc1 $f0, 0x3c($s3) -/* E175C4 80241844 E6620014 */ swc1 $f2, 0x14($s3) -/* E175C8 80241848 8E840044 */ lw $a0, 0x44($s4) -/* E175CC 8024184C 0C046C04 */ jal get_model_list_index_from_tree_index -/* E175D0 80241850 AE800030 */ sw $zero, 0x30($s4) -/* E175D4 80241854 0C046B4C */ jal get_model_from_list_index -/* E175D8 80241858 0040202D */ daddu $a0, $v0, $zero -/* E175DC 8024185C 0040802D */ daddu $s0, $v0, $zero -/* E175E0 80241860 96030000 */ lhu $v1, ($s0) -/* E175E4 80241864 3062FFFD */ andi $v0, $v1, 0xfffd -/* E175E8 80241868 30630400 */ andi $v1, $v1, 0x400 -/* E175EC 8024186C 1460000A */ bnez $v1, .L80241898 -/* E175F0 80241870 A6020000 */ sh $v0, ($s0) -/* E175F4 80241874 8E650038 */ lw $a1, 0x38($s3) -/* E175F8 80241878 8E66003C */ lw $a2, 0x3c($s3) -/* E175FC 8024187C 8E670040 */ lw $a3, 0x40($s3) -/* E17600 80241880 0C019E40 */ jal guTranslateF -/* E17604 80241884 26040058 */ addiu $a0, $s0, 0x58 -/* E17608 80241888 96020000 */ lhu $v0, ($s0) -/* E1760C 8024188C 34421400 */ ori $v0, $v0, 0x1400 -/* E17610 80241890 080906CE */ j .L80241B38_E178B8 -/* E17614 80241894 A6020000 */ sh $v0, ($s0) -.L80241898: -/* E17618 80241898 8E650038 */ lw $a1, 0x38($s3) -/* E1761C 8024189C 8E66003C */ lw $a2, 0x3c($s3) -/* E17620 802418A0 8E670040 */ lw $a3, 0x40($s3) -/* E17624 802418A4 0C019E40 */ jal guTranslateF -/* E17628 802418A8 27A40028 */ addiu $a0, $sp, 0x28 -/* E1762C 802418AC 27A40028 */ addiu $a0, $sp, 0x28 -/* E17630 802418B0 26050058 */ addiu $a1, $s0, 0x58 -/* E17634 802418B4 0C019D80 */ jal guMtxCatF -/* E17638 802418B8 00A0302D */ daddu $a2, $a1, $zero -/* E1763C 802418BC 080906CF */ j .L80241B3C -/* E17640 802418C0 2694001C */ addiu $s4, $s4, 0x1c -.L802418C4_E17644: -/* E17644 802418C4 8E820030 */ lw $v0, 0x30($s4) -/* E17648 802418C8 24420001 */ addiu $v0, $v0, 1 -/* E1764C 802418CC AE820030 */ sw $v0, 0x30($s4) -/* E17650 802418D0 C660001C */ lwc1 $f0, 0x1c($s3) -/* E17654 802418D4 C664003C */ lwc1 $f4, 0x3c($s3) -/* E17658 802418D8 46000086 */ mov.s $f2, $f0 -/* E1765C 802418DC 46002100 */ add.s $f4, $f4, $f0 -/* E17660 802418E0 C6600014 */ lwc1 $f0, 0x14($s3) -/* E17664 802418E4 46001081 */ sub.s $f2, $f2, $f0 -/* E17668 802418E8 E664003C */ swc1 $f4, 0x3c($s3) -/* E1766C 802418EC E662001C */ swc1 $f2, 0x1c($s3) -/* E17670 802418F0 0C046C04 */ jal get_model_list_index_from_tree_index -/* E17674 802418F4 8E840044 */ lw $a0, 0x44($s4) -/* E17678 802418F8 0C046B4C */ jal get_model_from_list_index -/* E1767C 802418FC 0040202D */ daddu $a0, $v0, $zero -/* E17680 80241900 0040802D */ daddu $s0, $v0, $zero -/* E17684 80241904 96020000 */ lhu $v0, ($s0) -/* E17688 80241908 30420400 */ andi $v0, $v0, 0x400 -/* E1768C 8024190C 1440000A */ bnez $v0, .L80241938 -/* E17690 80241910 00000000 */ nop -/* E17694 80241914 8E650038 */ lw $a1, 0x38($s3) -/* E17698 80241918 8E66003C */ lw $a2, 0x3c($s3) -/* E1769C 8024191C 8E670040 */ lw $a3, 0x40($s3) -/* E176A0 80241920 0C019E40 */ jal guTranslateF -/* E176A4 80241924 26040058 */ addiu $a0, $s0, 0x58 -/* E176A8 80241928 96020000 */ lhu $v0, ($s0) -/* E176AC 8024192C 34421400 */ ori $v0, $v0, 0x1400 -/* E176B0 80241930 08090657 */ j .L8024195C -/* E176B4 80241934 A6020000 */ sh $v0, ($s0) -.L80241938: -/* E176B8 80241938 8E650038 */ lw $a1, 0x38($s3) -/* E176BC 8024193C 8E66003C */ lw $a2, 0x3c($s3) -/* E176C0 80241940 8E670040 */ lw $a3, 0x40($s3) -/* E176C4 80241944 0C019E40 */ jal guTranslateF -/* E176C8 80241948 27A40028 */ addiu $a0, $sp, 0x28 -/* E176CC 8024194C 27A40028 */ addiu $a0, $sp, 0x28 -/* E176D0 80241950 26050058 */ addiu $a1, $s0, 0x58 -/* E176D4 80241954 0C019D80 */ jal guMtxCatF -/* E176D8 80241958 00A0302D */ daddu $a2, $a1, $zero -.L8024195C: -/* E176DC 8024195C C6600064 */ lwc1 $f0, 0x64($s3) -/* E176E0 80241960 3C0141A0 */ lui $at, 0x41a0 -/* E176E4 80241964 44811000 */ mtc1 $at, $f2 -/* E176E8 80241968 00000000 */ nop -/* E176EC 8024196C 46020000 */ add.s $f0, $f0, $f2 -/* E176F0 80241970 C662003C */ lwc1 $f2, 0x3c($s3) -/* E176F4 80241974 4602003C */ c.lt.s $f0, $f2 -/* E176F8 80241978 00000000 */ nop -/* E176FC 8024197C 45000005 */ bc1f .L80241994 -/* E17700 80241980 00000000 */ nop -/* E17704 80241984 0C00EAE8 */ jal enable_npc_shadow -/* E17708 80241988 0260202D */ daddu $a0, $s3, $zero -/* E1770C 8024198C 08090667 */ j .L8024199C -/* E17710 80241990 00000000 */ nop -.L80241994: -/* E17714 80241994 0C00EAFF */ jal disable_npc_shadow -/* E17718 80241998 0260202D */ daddu $a0, $s3, $zero -.L8024199C: -/* E1771C 8024199C C660001C */ lwc1 $f0, 0x1c($s3) -/* E17720 802419A0 44801000 */ mtc1 $zero, $f2 -/* E17724 802419A4 44801800 */ mtc1 $zero, $f3 -/* E17728 802419A8 46000021 */ cvt.d.s $f0, $f0 -/* E1772C 802419AC 4622003C */ c.lt.d $f0, $f2 -/* E17730 802419B0 00000000 */ nop -/* E17734 802419B4 45020061 */ bc1fl .L80241B3C -/* E17738 802419B8 2694001C */ addiu $s4, $s4, 0x1c -/* E1773C 802419BC C662003C */ lwc1 $f2, 0x3c($s3) -/* E17740 802419C0 C6600064 */ lwc1 $f0, 0x64($s3) -/* E17744 802419C4 4600103E */ c.le.s $f2, $f0 -/* E17748 802419C8 00000000 */ nop -/* E1774C 802419CC 4500005A */ bc1f .L80241B38_E178B8 -/* E17750 802419D0 2404014A */ addiu $a0, $zero, 0x14a -/* E17754 802419D4 24020047 */ addiu $v0, $zero, 0x47 -/* E17758 802419D8 0C00A67F */ jal rand_int -/* E1775C 802419DC AE82002C */ sw $v0, 0x2c($s4) -/* E17760 802419E0 0260202D */ daddu $a0, $s3, $zero -/* E17764 802419E4 2442005A */ addiu $v0, $v0, 0x5a -/* E17768 802419E8 080906C2 */ j .L80241B08 -/* E1776C 802419EC AE820030 */ sw $v0, 0x30($s4) -.L802419F0_E17770: -/* E17770 802419F0 0C05272D */ jal sfx_play_sound -/* E17774 802419F4 2404021C */ addiu $a0, $zero, 0x21c -/* E17778 802419F8 8E840044 */ lw $a0, 0x44($s4) -/* E1777C 802419FC 0C046C04 */ jal get_model_list_index_from_tree_index -/* E17780 80241A00 00000000 */ nop -/* E17784 80241A04 0C046B4C */ jal get_model_from_list_index -/* E17788 80241A08 0040202D */ daddu $a0, $v0, $zero -/* E1778C 80241A0C 0040802D */ daddu $s0, $v0, $zero -/* E17790 80241A10 0C00EAE8 */ jal enable_npc_shadow -/* E17794 80241A14 0260202D */ daddu $a0, $s3, $zero -/* E17798 80241A18 2402004A */ addiu $v0, $zero, 0x4a -/* E1779C 80241A1C A660008E */ sh $zero, 0x8e($s3) -/* E177A0 80241A20 AE82002C */ sw $v0, 0x2c($s4) -/* E177A4 80241A24 96020000 */ lhu $v0, ($s0) -/* E177A8 80241A28 3042FFFD */ andi $v0, $v0, 0xfffd -/* E177AC 80241A2C A6020000 */ sh $v0, ($s0) -.L80241A30_E177B0: -/* E177B0 80241A30 8E840044 */ lw $a0, 0x44($s4) -/* E177B4 80241A34 24080001 */ addiu $t0, $zero, 1 -/* E177B8 80241A38 0C046C04 */ jal get_model_list_index_from_tree_index -/* E177BC 80241A3C AFA80088 */ sw $t0, 0x88($sp) -/* E177C0 80241A40 0C046B4C */ jal get_model_from_list_index -/* E177C4 80241A44 0040202D */ daddu $a0, $v0, $zero -/* E177C8 80241A48 0040802D */ daddu $s0, $v0, $zero -/* E177CC 80241A4C 2402001E */ addiu $v0, $zero, 0x1e -/* E177D0 80241A50 C6600064 */ lwc1 $f0, 0x64($s3) -/* E177D4 80241A54 8667008E */ lh $a3, 0x8e($s3) -/* E177D8 80241A58 3C01403E */ lui $at, 0x403e -/* E177DC 80241A5C 44811800 */ mtc1 $at, $f3 -/* E177E0 80241A60 44801000 */ mtc1 $zero, $f2 -/* E177E4 80241A64 46000021 */ cvt.d.s $f0, $f0 -/* E177E8 80241A68 46220000 */ add.d $f0, $f0, $f2 -/* E177EC 80241A6C AFA20010 */ sw $v0, 0x10($sp) -/* E177F0 80241A70 8E650064 */ lw $a1, 0x64($s3) -/* E177F4 80241A74 46200020 */ cvt.s.d $f0, $f0 -/* E177F8 80241A78 44060000 */ mfc1 $a2, $f0 -/* E177FC 80241A7C 0C00A8ED */ jal update_lerp -/* E17800 80241A80 24040004 */ addiu $a0, $zero, 4 -/* E17804 80241A84 96020000 */ lhu $v0, ($s0) -/* E17808 80241A88 30420400 */ andi $v0, $v0, 0x400 -/* E1780C 80241A8C 1440000A */ bnez $v0, .L80241AB8 -/* E17810 80241A90 E7A0006C */ swc1 $f0, 0x6c($sp) -/* E17814 80241A94 8E650038 */ lw $a1, 0x38($s3) -/* E17818 80241A98 44060000 */ mfc1 $a2, $f0 -/* E1781C 80241A9C 8E670040 */ lw $a3, 0x40($s3) -/* E17820 80241AA0 0C019E40 */ jal guTranslateF -/* E17824 80241AA4 26040058 */ addiu $a0, $s0, 0x58 -/* E17828 80241AA8 96020000 */ lhu $v0, ($s0) -/* E1782C 80241AAC 34421400 */ ori $v0, $v0, 0x1400 -/* E17830 80241AB0 080906B7 */ j .L80241ADC -/* E17834 80241AB4 A6020000 */ sh $v0, ($s0) -.L80241AB8: -/* E17838 80241AB8 8E650038 */ lw $a1, 0x38($s3) -/* E1783C 80241ABC 44060000 */ mfc1 $a2, $f0 -/* E17840 80241AC0 8E670040 */ lw $a3, 0x40($s3) -/* E17844 80241AC4 0C019E40 */ jal guTranslateF -/* E17848 80241AC8 27A40028 */ addiu $a0, $sp, 0x28 -/* E1784C 80241ACC 27A40028 */ addiu $a0, $sp, 0x28 -/* E17850 80241AD0 26050058 */ addiu $a1, $s0, 0x58 -/* E17854 80241AD4 0C019D80 */ jal guMtxCatF -/* E17858 80241AD8 00A0302D */ daddu $a2, $a1, $zero -.L80241ADC: -/* E1785C 80241ADC 9662008E */ lhu $v0, 0x8e($s3) -/* E17860 80241AE0 24420001 */ addiu $v0, $v0, 1 -/* E17864 80241AE4 A662008E */ sh $v0, 0x8e($s3) -/* E17868 80241AE8 00021400 */ sll $v0, $v0, 0x10 -/* E1786C 80241AEC 00021403 */ sra $v0, $v0, 0x10 -/* E17870 80241AF0 2842001E */ slti $v0, $v0, 0x1e -/* E17874 80241AF4 54400011 */ bnel $v0, $zero, .L80241B3C -/* E17878 80241AF8 2694001C */ addiu $s4, $s4, 0x1c -/* E1787C 80241AFC 0260202D */ daddu $a0, $s3, $zero -/* E17880 80241B00 2402004B */ addiu $v0, $zero, 0x4b -/* E17884 80241B04 AE82002C */ sw $v0, 0x2c($s4) -.L80241B08: -/* E17888 80241B08 0C00EAFF */ jal disable_npc_shadow -/* E1788C 80241B0C 2694001C */ addiu $s4, $s4, 0x1c -/* E17890 80241B10 96020000 */ lhu $v0, ($s0) -/* E17894 80241B14 34420002 */ ori $v0, $v0, 2 -/* E17898 80241B18 080906CF */ j .L80241B3C -/* E1789C 80241B1C A6020000 */ sh $v0, ($s0) -.L80241B20: -/* E178A0 80241B20 8E83002C */ lw $v1, 0x2c($s4) -/* E178A4 80241B24 54620005 */ bnel $v1, $v0, .L80241B3C -/* E178A8 80241B28 2694001C */ addiu $s4, $s4, 0x1c -/* E178AC 80241B2C 24020033 */ addiu $v0, $zero, 0x33 -/* E178B0 80241B30 AE82002C */ sw $v0, 0x2c($s4) -.L80241B34: -/* E178B4 80241B34 AE800030 */ sw $zero, 0x30($s4) -.L80241B38_E178B8: -/* E178B8 80241B38 2694001C */ addiu $s4, $s4, 0x1c -.L80241B3C: -/* E178BC 80241B3C 26A203D4 */ addiu $v0, $s5, 0x3d4 -/* E178C0 80241B40 0282102A */ slt $v0, $s4, $v0 -/* E178C4 80241B44 1440FC41 */ bnez $v0, .L80240C4C -/* E178C8 80241B48 00000000 */ nop -/* E178CC 80241B4C 8EA30008 */ lw $v1, 8($s5) -/* E178D0 80241B50 18600040 */ blez $v1, .L80241C54 -/* E178D4 80241B54 00000000 */ nop -/* E178D8 80241B58 8EA20004 */ lw $v0, 4($s5) -/* E178DC 80241B5C 2842000A */ slti $v0, $v0, 0xa -/* E178E0 80241B60 10400031 */ beqz $v0, .L80241C28 -/* E178E4 80241B64 2463FFFF */ addiu $v1, $v1, -1 -/* E178E8 80241B68 240202EE */ addiu $v0, $zero, 0x2ee -/* E178EC 80241B6C 14620003 */ bne $v1, $v0, .L80241B7C -/* E178F0 80241B70 AEA30008 */ sw $v1, 8($s5) -/* E178F4 80241B74 08090708 */ j .L80241C20 -/* E178F8 80241B78 240401A5 */ addiu $a0, $zero, 0x1a5 -.L80241B7C: -/* E178FC 80241B7C 24020258 */ addiu $v0, $zero, 0x258 -/* E17900 80241B80 14620003 */ bne $v1, $v0, .L80241B90 -/* E17904 80241B84 240201C2 */ addiu $v0, $zero, 0x1c2 -/* E17908 80241B88 08090708 */ j .L80241C20 -/* E1790C 80241B8C 240401A5 */ addiu $a0, $zero, 0x1a5 -.L80241B90: -/* E17910 80241B90 14620003 */ bne $v1, $v0, .L80241BA0 -/* E17914 80241B94 2402012C */ addiu $v0, $zero, 0x12c -/* E17918 80241B98 08090708 */ j .L80241C20 -/* E1791C 80241B9C 240401A5 */ addiu $a0, $zero, 0x1a5 -.L80241BA0: -/* E17920 80241BA0 14620003 */ bne $v1, $v0, .L80241BB0 -/* E17924 80241BA4 2402010E */ addiu $v0, $zero, 0x10e -/* E17928 80241BA8 08090708 */ j .L80241C20 -/* E1792C 80241BAC 240401A6 */ addiu $a0, $zero, 0x1a6 -.L80241BB0: -/* E17930 80241BB0 14620003 */ bne $v1, $v0, .L80241BC0 -/* E17934 80241BB4 240200F0 */ addiu $v0, $zero, 0xf0 -/* E17938 80241BB8 08090708 */ j .L80241C20 -/* E1793C 80241BBC 240401A6 */ addiu $a0, $zero, 0x1a6 -.L80241BC0: -/* E17940 80241BC0 14620003 */ bne $v1, $v0, .L80241BD0 -/* E17944 80241BC4 240200D2 */ addiu $v0, $zero, 0xd2 -/* E17948 80241BC8 08090708 */ j .L80241C20 -/* E1794C 80241BCC 240401A6 */ addiu $a0, $zero, 0x1a6 -.L80241BD0: -/* E17950 80241BD0 14620003 */ bne $v1, $v0, .L80241BE0 -/* E17954 80241BD4 240200B4 */ addiu $v0, $zero, 0xb4 -/* E17958 80241BD8 08090708 */ j .L80241C20 -/* E1795C 80241BDC 240401A6 */ addiu $a0, $zero, 0x1a6 -.L80241BE0: -/* E17960 80241BE0 14620003 */ bne $v1, $v0, .L80241BF0 -/* E17964 80241BE4 24020096 */ addiu $v0, $zero, 0x96 -/* E17968 80241BE8 08090708 */ j .L80241C20 -/* E1796C 80241BEC 240401A6 */ addiu $a0, $zero, 0x1a6 -.L80241BF0: -/* E17970 80241BF0 1062000A */ beq $v1, $v0, .L80241C1C -/* E17974 80241BF4 24020078 */ addiu $v0, $zero, 0x78 -/* E17978 80241BF8 10620008 */ beq $v1, $v0, .L80241C1C -/* E1797C 80241BFC 2402005A */ addiu $v0, $zero, 0x5a -/* E17980 80241C00 8EA30008 */ lw $v1, 8($s5) -/* E17984 80241C04 10620005 */ beq $v1, $v0, .L80241C1C -/* E17988 80241C08 2402003C */ addiu $v0, $zero, 0x3c -/* E1798C 80241C0C 10620003 */ beq $v1, $v0, .L80241C1C -/* E17990 80241C10 2402001E */ addiu $v0, $zero, 0x1e -/* E17994 80241C14 14620004 */ bne $v1, $v0, .L80241C28 -/* E17998 80241C18 00000000 */ nop -.L80241C1C: -/* E1799C 80241C1C 240401A7 */ addiu $a0, $zero, 0x1a7 -.L80241C20: -/* E179A0 80241C20 0C05272D */ jal sfx_play_sound -/* E179A4 80241C24 00000000 */ nop -.L80241C28: -/* E179A8 80241C28 8EA20008 */ lw $v0, 8($s5) -/* E179AC 80241C2C 18400009 */ blez $v0, .L80241C54 -/* E179B0 80241C30 2402000A */ addiu $v0, $zero, 0xa -/* E179B4 80241C34 8EA30004 */ lw $v1, 4($s5) -/* E179B8 80241C38 14620006 */ bne $v1, $v0, .L80241C54 -/* E179BC 80241C3C 00000000 */ nop -/* E179C0 80241C40 8EA30028 */ lw $v1, 0x28($s5) -/* E179C4 80241C44 30620001 */ andi $v0, $v1, 1 -/* E179C8 80241C48 14400002 */ bnez $v0, .L80241C54 -/* E179CC 80241C4C 34620003 */ ori $v0, $v1, 3 -/* E179D0 80241C50 AEA20028 */ sw $v0, 0x28($s5) -.L80241C54: -/* E179D4 80241C54 8EA20008 */ lw $v0, 8($s5) -/* E179D8 80241C58 1440000A */ bnez $v0, .L80241C84 -/* E179DC 80241C5C 00000000 */ nop -/* E179E0 80241C60 8FA80088 */ lw $t0, 0x88($sp) -/* E179E4 80241C64 11000007 */ beqz $t0, .L80241C84 -/* E179E8 80241C68 00000000 */ nop -/* E179EC 80241C6C 8EA30028 */ lw $v1, 0x28($s5) -/* E179F0 80241C70 30620001 */ andi $v0, $v1, 1 -/* E179F4 80241C74 14400005 */ bnez $v0, .L80241C8C -/* E179F8 80241C78 30620002 */ andi $v0, $v1, 2 -/* E179FC 80241C7C 34620003 */ ori $v0, $v1, 3 -/* E17A00 80241C80 AEA20028 */ sw $v0, 0x28($s5) -.L80241C84: -/* E17A04 80241C84 8EA30028 */ lw $v1, 0x28($s5) -/* E17A08 80241C88 30620002 */ andi $v0, $v1, 2 -.L80241C8C: -/* E17A0C 80241C8C 10400010 */ beqz $v0, .L80241CD0 -/* E17A10 80241C90 2402FFFD */ addiu $v0, $zero, -3 -/* E17A14 80241C94 00621024 */ and $v0, $v1, $v0 -/* E17A18 80241C98 AEA20028 */ sw $v0, 0x28($s5) -/* E17A1C 80241C9C 30620001 */ andi $v0, $v1, 1 -/* E17A20 80241CA0 10400007 */ beqz $v0, .L80241CC0 -/* E17A24 80241CA4 00000000 */ nop -/* E17A28 80241CA8 0C03805E */ jal disable_player_input -/* E17A2C 80241CAC 00000000 */ nop -/* E17A30 80241CB0 0C03BD8A */ jal partner_disable_input -/* E17A34 80241CB4 00000000 */ nop -/* E17A38 80241CB8 08090734 */ j .L80241CD0 -/* E17A3C 80241CBC 00000000 */ nop -.L80241CC0: -/* E17A40 80241CC0 0C038069 */ jal enable_player_input -/* E17A44 80241CC4 00000000 */ nop -/* E17A48 80241CC8 0C03BD80 */ jal partner_enable_input -/* E17A4C 80241CCC 00000000 */ nop -.L80241CD0: -/* E17A50 80241CD0 8FA80088 */ lw $t0, 0x88($sp) -/* E17A54 80241CD4 1500000E */ bnez $t0, .L80241D10 -/* E17A58 80241CD8 2402000A */ addiu $v0, $zero, 0xa -/* E17A5C 80241CDC 8EA30004 */ lw $v1, 4($s5) -/* E17A60 80241CE0 5062000A */ beql $v1, $v0, .L80241D0C -/* E17A64 80241CE4 24080001 */ addiu $t0, $zero, 1 -/* E17A68 80241CE8 8EA20008 */ lw $v0, 8($s5) -/* E17A6C 80241CEC 14400008 */ bnez $v0, .L80241D10 -/* E17A70 80241CF0 00000000 */ nop -/* E17A74 80241CF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E17A78 80241CF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E17A7C 80241CFC 804300B4 */ lb $v1, 0xb4($v0) -/* E17A80 80241D00 24020012 */ addiu $v0, $zero, 0x12 -/* E17A84 80241D04 10620002 */ beq $v1, $v0, .L80241D10 -/* E17A88 80241D08 24080001 */ addiu $t0, $zero, 1 -.L80241D0C: -/* E17A8C 80241D0C AFA80084 */ sw $t0, 0x84($sp) -.L80241D10: -/* E17A90 80241D10 8FA80084 */ lw $t0, 0x84($sp) -/* E17A94 80241D14 1100001B */ beqz $t0, .L80241D84 -/* E17A98 80241D18 0000102D */ daddu $v0, $zero, $zero -/* E17A9C 80241D1C 8EA20028 */ lw $v0, 0x28($s5) -/* E17AA0 80241D20 30420001 */ andi $v0, $v0, 1 -/* E17AA4 80241D24 10400005 */ beqz $v0, .L80241D3C -/* E17AA8 80241D28 00000000 */ nop -/* E17AAC 80241D2C 0C038069 */ jal enable_player_input -/* E17AB0 80241D30 00000000 */ nop -/* E17AB4 80241D34 0C03BD80 */ jal partner_enable_input -/* E17AB8 80241D38 00000000 */ nop -.L80241D3C: -/* E17ABC 80241D3C 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* E17AC0 80241D40 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* E17AC4 80241D44 8E020000 */ lw $v0, ($s0) -/* E17AC8 80241D48 3C014334 */ lui $at, 0x4334 -/* E17ACC 80241D4C 44810000 */ mtc1 $at, $f0 -/* E17AD0 80241D50 AEA00028 */ sw $zero, 0x28($s5) -/* E17AD4 80241D54 E4400080 */ swc1 $f0, 0x80($v0) -/* E17AD8 80241D58 8EA20008 */ lw $v0, 8($s5) -/* E17ADC 80241D5C 14400002 */ bnez $v0, .L80241D68 -/* E17AE0 80241D60 240400D4 */ addiu $a0, $zero, 0xd4 -/* E17AE4 80241D64 2404021D */ addiu $a0, $zero, 0x21d -.L80241D68: -/* E17AE8 80241D68 0C05272D */ jal sfx_play_sound -/* E17AEC 80241D6C 00000000 */ nop -/* E17AF0 80241D70 3C030001 */ lui $v1, 1 -/* E17AF4 80241D74 8E020000 */ lw $v0, ($s0) -/* E17AF8 80241D78 34630002 */ ori $v1, $v1, 2 -/* E17AFC 80241D7C AC4300B8 */ sw $v1, 0xb8($v0) -/* E17B00 80241D80 24020002 */ addiu $v0, $zero, 2 -.L80241D84: -/* E17B04 80241D84 8FBF00B4 */ lw $ra, 0xb4($sp) -/* E17B08 80241D88 8FBE00B0 */ lw $fp, 0xb0($sp) -/* E17B0C 80241D8C 8FB700AC */ lw $s7, 0xac($sp) -/* E17B10 80241D90 8FB600A8 */ lw $s6, 0xa8($sp) -/* E17B14 80241D94 8FB500A4 */ lw $s5, 0xa4($sp) -/* E17B18 80241D98 8FB400A0 */ lw $s4, 0xa0($sp) -/* E17B1C 80241D9C 8FB3009C */ lw $s3, 0x9c($sp) -/* E17B20 80241DA0 8FB20098 */ lw $s2, 0x98($sp) -/* E17B24 80241DA4 8FB10094 */ lw $s1, 0x94($sp) -/* E17B28 80241DA8 8FB00090 */ lw $s0, 0x90($sp) -/* E17B2C 80241DAC D7BE00E0 */ ldc1 $f30, 0xe0($sp) -/* E17B30 80241DB0 D7BC00D8 */ ldc1 $f28, 0xd8($sp) -/* E17B34 80241DB4 D7BA00D0 */ ldc1 $f26, 0xd0($sp) -/* E17B38 80241DB8 D7B800C8 */ ldc1 $f24, 0xc8($sp) -/* E17B3C 80241DBC D7B600C0 */ ldc1 $f22, 0xc0($sp) -/* E17B40 80241DC0 D7B400B8 */ ldc1 $f20, 0xb8($sp) -/* E17B44 80241DC4 03E00008 */ jr $ra -/* E17B48 80241DC8 27BD00E8 */ addiu $sp, $sp, 0xe8 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241DCC_E17B4C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241DCC_E17B4C.s deleted file mode 100644 index f1250f2704..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241DCC_E17B4C.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DCC_E17B4C -/* E17B4C 80241DCC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E17B50 80241DD0 AFB40020 */ sw $s4, 0x20($sp) -/* E17B54 80241DD4 0080A02D */ daddu $s4, $a0, $zero -/* E17B58 80241DD8 0000202D */ daddu $a0, $zero, $zero -/* E17B5C 80241DDC AFBF0024 */ sw $ra, 0x24($sp) -/* E17B60 80241DE0 AFB3001C */ sw $s3, 0x1c($sp) -/* E17B64 80241DE4 AFB20018 */ sw $s2, 0x18($sp) -/* E17B68 80241DE8 AFB10014 */ sw $s1, 0x14($sp) -/* E17B6C 80241DEC 0C00FB3A */ jal get_enemy -/* E17B70 80241DF0 AFB00010 */ sw $s0, 0x10($sp) -/* E17B74 80241DF4 8C51006C */ lw $s1, 0x6c($v0) -/* E17B78 80241DF8 3C028888 */ lui $v0, 0x8888 -/* E17B7C 80241DFC 8E240008 */ lw $a0, 8($s1) -/* E17B80 80241E00 34428889 */ ori $v0, $v0, 0x8889 -/* E17B84 80241E04 00820018 */ mult $a0, $v0 -/* E17B88 80241E08 3C014024 */ lui $at, 0x4024 -/* E17B8C 80241E0C 44811800 */ mtc1 $at, $f3 -/* E17B90 80241E10 44801000 */ mtc1 $zero, $f2 -/* E17B94 80241E14 00041FC3 */ sra $v1, $a0, 0x1f -/* E17B98 80241E18 00003810 */ mfhi $a3 -/* E17B9C 80241E1C 00E41021 */ addu $v0, $a3, $a0 -/* E17BA0 80241E20 00021103 */ sra $v0, $v0, 4 -/* E17BA4 80241E24 00432823 */ subu $a1, $v0, $v1 -/* E17BA8 80241E28 00051100 */ sll $v0, $a1, 4 -/* E17BAC 80241E2C 00451023 */ subu $v0, $v0, $a1 -/* E17BB0 80241E30 00021040 */ sll $v0, $v0, 1 -/* E17BB4 80241E34 00822023 */ subu $a0, $a0, $v0 -/* E17BB8 80241E38 44840000 */ mtc1 $a0, $f0 -/* E17BBC 80241E3C 00000000 */ nop -/* E17BC0 80241E40 46800020 */ cvt.s.w $f0, $f0 -/* E17BC4 80241E44 46000021 */ cvt.d.s $f0, $f0 -/* E17BC8 80241E48 46220002 */ mul.d $f0, $f0, $f2 -/* E17BCC 80241E4C 00000000 */ nop -/* E17BD0 80241E50 3C108011 */ lui $s0, %hi(gPlayerData) -/* E17BD4 80241E54 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* E17BD8 80241E58 3C040001 */ lui $a0, 1 -/* E17BDC 80241E5C 00051080 */ sll $v0, $a1, 2 -/* E17BE0 80241E60 00451021 */ addu $v0, $v0, $a1 -/* E17BE4 80241E64 3C01403E */ lui $at, 0x403e -/* E17BE8 80241E68 44811800 */ mtc1 $at, $f3 -/* E17BEC 80241E6C 44801000 */ mtc1 $zero, $f2 -/* E17BF0 80241E70 00021040 */ sll $v0, $v0, 1 -/* E17BF4 80241E74 46220003 */ div.d $f0, $f0, $f2 -/* E17BF8 80241E78 4620010D */ trunc.w.d $f4, $f0 -/* E17BFC 80241E7C 44132000 */ mfc1 $s3, $f4 -/* E17C00 80241E80 00000000 */ nop -/* E17C04 80241E84 00531021 */ addu $v0, $v0, $s3 -/* E17C08 80241E88 AE220020 */ sw $v0, 0x20($s1) -/* E17C0C 80241E8C 8E030338 */ lw $v1, 0x338($s0) -/* E17C10 80241E90 3484869F */ ori $a0, $a0, 0x869f -/* E17C14 80241E94 00621821 */ addu $v1, $v1, $v0 -/* E17C18 80241E98 AE030338 */ sw $v1, 0x338($s0) -/* E17C1C 80241E9C 0083182B */ sltu $v1, $a0, $v1 -/* E17C20 80241EA0 10600002 */ beqz $v1, .L80241EAC -/* E17C24 80241EA4 0200902D */ daddu $s2, $s0, $zero -/* E17C28 80241EA8 AE040338 */ sw $a0, 0x338($s0) -.L80241EAC: -/* E17C2C 80241EAC 9642033C */ lhu $v0, 0x33c($s2) -/* E17C30 80241EB0 8E230020 */ lw $v1, 0x20($s1) -/* E17C34 80241EB4 0043102A */ slt $v0, $v0, $v1 -/* E17C38 80241EB8 10400003 */ beqz $v0, .L80241EC8 -/* E17C3C 80241EBC 00A0202D */ daddu $a0, $a1, $zero -/* E17C40 80241EC0 96220022 */ lhu $v0, 0x22($s1) -/* E17C44 80241EC4 A642033C */ sh $v0, 0x33c($s2) -.L80241EC8: -/* E17C48 80241EC8 0C0496FA */ jal set_message_value -/* E17C4C 80241ECC 0000282D */ daddu $a1, $zero, $zero -/* E17C50 80241ED0 0260202D */ daddu $a0, $s3, $zero -/* E17C54 80241ED4 0C0496FA */ jal set_message_value -/* E17C58 80241ED8 24050001 */ addiu $a1, $zero, 1 -/* E17C5C 80241EDC 8E240020 */ lw $a0, 0x20($s1) -/* E17C60 80241EE0 0C0496FA */ jal set_message_value -/* E17C64 80241EE4 24050002 */ addiu $a1, $zero, 2 -/* E17C68 80241EE8 8E260020 */ lw $a2, 0x20($s1) -/* E17C6C 80241EEC 14C00006 */ bnez $a2, .L80241F08 -/* E17C70 80241EF0 0280202D */ daddu $a0, $s4, $zero -/* E17C74 80241EF4 8E230004 */ lw $v1, 4($s1) -/* E17C78 80241EF8 2402000A */ addiu $v0, $zero, 0xa -/* E17C7C 80241EFC 50620002 */ beql $v1, $v0, .L80241F08 -/* E17C80 80241F00 2406FFFF */ addiu $a2, $zero, -1 -/* E17C84 80241F04 0280202D */ daddu $a0, $s4, $zero -.L80241F08: -/* E17C88 80241F08 3C05FE36 */ lui $a1, 0xfe36 -/* E17C8C 80241F0C 0C0B2026 */ jal evt_set_variable -/* E17C90 80241F10 34A53C80 */ ori $a1, $a1, 0x3c80 -/* E17C94 80241F14 8FBF0024 */ lw $ra, 0x24($sp) -/* E17C98 80241F18 8FB40020 */ lw $s4, 0x20($sp) -/* E17C9C 80241F1C 8FB3001C */ lw $s3, 0x1c($sp) -/* E17CA0 80241F20 8FB20018 */ lw $s2, 0x18($sp) -/* E17CA4 80241F24 8FB10014 */ lw $s1, 0x14($sp) -/* E17CA8 80241F28 8FB00010 */ lw $s0, 0x10($sp) -/* E17CAC 80241F2C 24020002 */ addiu $v0, $zero, 2 -/* E17CB0 80241F30 03E00008 */ jr $ra -/* E17CB4 80241F34 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241F38_E17CB8.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241F38_E17CB8.s deleted file mode 100644 index 4b02ad272b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241F38_E17CB8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F38_E17CB8 -/* E17CB8 80241F38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E17CBC 80241F3C 0000202D */ daddu $a0, $zero, $zero -/* E17CC0 80241F40 AFBF0014 */ sw $ra, 0x14($sp) -/* E17CC4 80241F44 0C00FB3A */ jal get_enemy -/* E17CC8 80241F48 AFB00010 */ sw $s0, 0x10($sp) -/* E17CCC 80241F4C 8C50006C */ lw $s0, 0x6c($v0) -/* E17CD0 80241F50 8E030020 */ lw $v1, 0x20($s0) -/* E17CD4 80241F54 28620065 */ slti $v0, $v1, 0x65 -/* E17CD8 80241F58 14400003 */ bnez $v0, .L80241F68 -/* E17CDC 80241F5C 2862004C */ slti $v0, $v1, 0x4c -/* E17CE0 80241F60 080907EC */ j .L80241FB0 -/* E17CE4 80241F64 24040028 */ addiu $a0, $zero, 0x28 -.L80241F68: -/* E17CE8 80241F68 14400003 */ bnez $v0, .L80241F78 -/* E17CEC 80241F6C 28620033 */ slti $v0, $v1, 0x33 -/* E17CF0 80241F70 080907EC */ j .L80241FB0 -/* E17CF4 80241F74 24040023 */ addiu $a0, $zero, 0x23 -.L80241F78: -/* E17CF8 80241F78 14400003 */ bnez $v0, .L80241F88 -/* E17CFC 80241F7C 2862001F */ slti $v0, $v1, 0x1f -/* E17D00 80241F80 080907EC */ j .L80241FB0 -/* E17D04 80241F84 2404001E */ addiu $a0, $zero, 0x1e -.L80241F88: -/* E17D08 80241F88 14400003 */ bnez $v0, .L80241F98 -/* E17D0C 80241F8C 28620015 */ slti $v0, $v1, 0x15 -/* E17D10 80241F90 080907EC */ j .L80241FB0 -/* E17D14 80241F94 2404000A */ addiu $a0, $zero, 0xa -.L80241F98: -/* E17D18 80241F98 10400005 */ beqz $v0, .L80241FB0 -/* E17D1C 80241F9C 24040005 */ addiu $a0, $zero, 5 -/* E17D20 80241FA0 2862000B */ slti $v0, $v1, 0xb -/* E17D24 80241FA4 14400002 */ bnez $v0, .L80241FB0 -/* E17D28 80241FA8 24040001 */ addiu $a0, $zero, 1 -/* E17D2C 80241FAC 24040002 */ addiu $a0, $zero, 2 -.L80241FB0: -/* E17D30 80241FB0 8E020020 */ lw $v0, 0x20($s0) -/* E17D34 80241FB4 00441023 */ subu $v0, $v0, $a0 -/* E17D38 80241FB8 0C03A830 */ jal add_coins -/* E17D3C 80241FBC AE020020 */ sw $v0, 0x20($s0) -/* E17D40 80241FC0 0C05272D */ jal sfx_play_sound -/* E17D44 80241FC4 24040211 */ addiu $a0, $zero, 0x211 -/* E17D48 80241FC8 8E020020 */ lw $v0, 0x20($s0) -/* E17D4C 80241FCC 8FBF0014 */ lw $ra, 0x14($sp) -/* E17D50 80241FD0 8FB00010 */ lw $s0, 0x10($sp) -/* E17D54 80241FD4 28420001 */ slti $v0, $v0, 1 -/* E17D58 80241FD8 00021040 */ sll $v0, $v0, 1 -/* E17D5C 80241FDC 03E00008 */ jr $ra -/* E17D60 80241FE0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s deleted file mode 100644 index 47ad53a637..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s +++ /dev/null @@ -1,179 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FE4_E17D64 -/* E17D64 80241FE4 27BDFF88 */ addiu $sp, $sp, -0x78 -/* E17D68 80241FE8 AFBF0058 */ sw $ra, 0x58($sp) -/* E17D6C 80241FEC AFB70054 */ sw $s7, 0x54($sp) -/* E17D70 80241FF0 AFB60050 */ sw $s6, 0x50($sp) -/* E17D74 80241FF4 AFB5004C */ sw $s5, 0x4c($sp) -/* E17D78 80241FF8 AFB40048 */ sw $s4, 0x48($sp) -/* E17D7C 80241FFC AFB30044 */ sw $s3, 0x44($sp) -/* E17D80 80242000 AFB20040 */ sw $s2, 0x40($sp) -/* E17D84 80242004 AFB1003C */ sw $s1, 0x3c($sp) -/* E17D88 80242008 AFB00038 */ sw $s0, 0x38($sp) -/* E17D8C 8024200C F7B80070 */ sdc1 $f24, 0x70($sp) -/* E17D90 80242010 F7B60068 */ sdc1 $f22, 0x68($sp) -/* E17D94 80242014 F7B40060 */ sdc1 $f20, 0x60($sp) -/* E17D98 80242018 0C00FB3A */ jal get_enemy -/* E17D9C 8024201C 0000202D */ daddu $a0, $zero, $zero -/* E17DA0 80242020 0040882D */ daddu $s1, $v0, $zero -/* E17DA4 80242024 24030004 */ addiu $v1, $zero, 4 -/* E17DA8 80242028 8E220078 */ lw $v0, 0x78($s1) -/* E17DAC 8024202C 8E24006C */ lw $a0, 0x6c($s1) -/* E17DB0 80242030 14430035 */ bne $v0, $v1, .L80242108 -/* E17DB4 80242034 0000902D */ daddu $s2, $zero, $zero -/* E17DB8 80242038 2417FFFF */ addiu $s7, $zero, -1 -/* E17DBC 8024203C 27B60028 */ addiu $s6, $sp, 0x28 -/* E17DC0 80242040 27B5002C */ addiu $s5, $sp, 0x2c -/* E17DC4 80242044 27B40030 */ addiu $s4, $sp, 0x30 -/* E17DC8 80242048 0080982D */ daddu $s3, $a0, $zero -.L8024204C: -/* E17DCC 8024204C 8E640040 */ lw $a0, 0x40($s3) -/* E17DD0 80242050 50970028 */ beql $a0, $s7, .L802420F4 -/* E17DD4 80242054 26520001 */ addiu $s2, $s2, 1 -/* E17DD8 80242058 0C00FB3A */ jal get_enemy -/* E17DDC 8024205C 00000000 */ nop -/* E17DE0 80242060 84440008 */ lh $a0, 8($v0) -/* E17DE4 80242064 0C00EABB */ jal get_npc_unsafe -/* E17DE8 80242068 0040882D */ daddu $s1, $v0, $zero -/* E17DEC 8024206C 0040802D */ daddu $s0, $v0, $zero -/* E17DF0 80242070 8E020000 */ lw $v0, ($s0) -/* E17DF4 80242074 30420002 */ andi $v0, $v0, 2 -/* E17DF8 80242078 5440001E */ bnel $v0, $zero, .L802420F4 -/* E17DFC 8024207C 26520001 */ addiu $s2, $s2, 1 -/* E17E00 80242080 AFB60010 */ sw $s6, 0x10($sp) -/* E17E04 80242084 AFB50014 */ sw $s5, 0x14($sp) -/* E17E08 80242088 AFB40018 */ sw $s4, 0x18($sp) -/* E17E0C 8024208C 8E050038 */ lw $a1, 0x38($s0) -/* E17E10 80242090 8E06003C */ lw $a2, 0x3c($s0) -/* E17E14 80242094 8E070040 */ lw $a3, 0x40($s0) -/* E17E18 80242098 0C00B94E */ jal get_screen_coords -/* E17E1C 8024209C 0000202D */ daddu $a0, $zero, $zero -/* E17E20 802420A0 8FA20028 */ lw $v0, 0x28($sp) -/* E17E24 802420A4 2442FFFF */ addiu $v0, $v0, -1 -/* E17E28 802420A8 2C42013F */ sltiu $v0, $v0, 0x13f -/* E17E2C 802420AC 1040000A */ beqz $v0, .L802420D8 -/* E17E30 802420B0 00000000 */ nop -/* E17E34 802420B4 AFA00010 */ sw $zero, 0x10($sp) -/* E17E38 802420B8 AFA00014 */ sw $zero, 0x14($sp) -/* E17E3C 802420BC 8E050038 */ lw $a1, 0x38($s0) -/* E17E40 802420C0 8E06003C */ lw $a2, 0x3c($s0) -/* E17E44 802420C4 8E070040 */ lw $a3, 0x40($s0) -/* E17E48 802420C8 0C01BECC */ jal fx_walking_dust -/* E17E4C 802420CC 24040001 */ addiu $a0, $zero, 1 -/* E17E50 802420D0 0C05272D */ jal sfx_play_sound -/* E17E54 802420D4 24040283 */ addiu $a0, $zero, 0x283 -.L802420D8: -/* E17E58 802420D8 8E020000 */ lw $v0, ($s0) -/* E17E5C 802420DC 0200202D */ daddu $a0, $s0, $zero -/* E17E60 802420E0 34420002 */ ori $v0, $v0, 2 -/* E17E64 802420E4 0C00EAFF */ jal disable_npc_shadow -/* E17E68 802420E8 AC820000 */ sw $v0, ($a0) -/* E17E6C 802420EC AE20006C */ sw $zero, 0x6c($s1) -/* E17E70 802420F0 26520001 */ addiu $s2, $s2, 1 -.L802420F4: -/* E17E74 802420F4 2A420023 */ slti $v0, $s2, 0x23 -/* E17E78 802420F8 1440FFD4 */ bnez $v0, .L8024204C -/* E17E7C 802420FC 2673001C */ addiu $s3, $s3, 0x1c -/* E17E80 80242100 0809088F */ j .L8024223C -/* E17E84 80242104 24020002 */ addiu $v0, $zero, 2 -.L80242108: -/* E17E88 80242108 24160012 */ addiu $s6, $zero, 0x12 -/* E17E8C 8024210C 2415001E */ addiu $s5, $zero, 0x1e -/* E17E90 80242110 27B30034 */ addiu $s3, $sp, 0x34 -/* E17E94 80242114 24140025 */ addiu $s4, $zero, 0x25 -/* E17E98 80242118 0080882D */ daddu $s1, $a0, $zero -/* E17E9C 8024211C 4480A000 */ mtc1 $zero, $f20 -/* E17EA0 80242120 3C013F80 */ lui $at, 0x3f80 -/* E17EA4 80242124 4481C000 */ mtc1 $at, $f24 -/* E17EA8 80242128 3C014000 */ lui $at, 0x4000 -/* E17EAC 8024212C 4481B000 */ mtc1 $at, $f22 -.L80242130: -/* E17EB0 80242130 8E240040 */ lw $a0, 0x40($s1) -/* E17EB4 80242134 2402FFFF */ addiu $v0, $zero, -1 -/* E17EB8 80242138 5082003C */ beql $a0, $v0, .L8024222C -/* E17EBC 8024213C 2631001C */ addiu $s1, $s1, 0x1c -/* E17EC0 80242140 0C00FB3A */ jal get_enemy -/* E17EC4 80242144 00000000 */ nop -/* E17EC8 80242148 0C00EABB */ jal get_npc_unsafe -/* E17ECC 8024214C 84440008 */ lh $a0, 8($v0) -/* E17ED0 80242150 0040802D */ daddu $s0, $v0, $zero -/* E17ED4 80242154 8E020000 */ lw $v0, ($s0) -/* E17ED8 80242158 30420002 */ andi $v0, $v0, 2 -/* E17EDC 8024215C 54400033 */ bnel $v0, $zero, .L8024222C -/* E17EE0 80242160 2631001C */ addiu $s1, $s1, 0x1c -/* E17EE4 80242164 8E230034 */ lw $v1, 0x34($s1) -/* E17EE8 80242168 10600005 */ beqz $v1, .L80242180 -/* E17EEC 8024216C 24020001 */ addiu $v0, $zero, 1 -/* E17EF0 80242170 10620017 */ beq $v1, $v0, .L802421D0 -/* E17EF4 80242174 00000000 */ nop -/* E17EF8 80242178 0809088B */ j .L8024222C -/* E17EFC 8024217C 2631001C */ addiu $s1, $s1, 0x1c -.L80242180: -/* E17F00 80242180 8E22002C */ lw $v0, 0x2c($s1) -/* E17F04 80242184 10560028 */ beq $v0, $s6, .L80242228 -/* E17F08 80242188 24040002 */ addiu $a0, $zero, 2 -/* E17F0C 8024218C AE36002C */ sw $s6, 0x2c($s1) -/* E17F10 80242190 860200A8 */ lh $v0, 0xa8($s0) -/* E17F14 80242194 4406A000 */ mfc1 $a2, $f20 -/* E17F18 80242198 44820000 */ mtc1 $v0, $f0 -/* E17F1C 8024219C 00000000 */ nop -/* E17F20 802421A0 46800020 */ cvt.s.w $f0, $f0 -/* E17F24 802421A4 44070000 */ mfc1 $a3, $f0 -/* E17F28 802421A8 0200282D */ daddu $a1, $s0, $zero -/* E17F2C 802421AC E7B80010 */ swc1 $f24, 0x10($sp) -/* E17F30 802421B0 E7B60014 */ swc1 $f22, 0x14($sp) -/* E17F34 802421B4 E7B40018 */ swc1 $f20, 0x18($sp) -/* E17F38 802421B8 AFB5001C */ sw $s5, 0x1c($sp) -/* E17F3C 802421BC 0C01BFA4 */ jal fx_emote -/* E17F40 802421C0 AFB30020 */ sw $s3, 0x20($sp) -/* E17F44 802421C4 3C02002B */ lui $v0, 0x2b -/* E17F48 802421C8 08090887 */ j .L8024221C -/* E17F4C 802421CC 3442000E */ ori $v0, $v0, 0xe -.L802421D0: -/* E17F50 802421D0 8E22002C */ lw $v0, 0x2c($s1) -/* E17F54 802421D4 10540014 */ beq $v0, $s4, .L80242228 -/* E17F58 802421D8 24040002 */ addiu $a0, $zero, 2 -/* E17F5C 802421DC AE34002C */ sw $s4, 0x2c($s1) -/* E17F60 802421E0 860200A8 */ lh $v0, 0xa8($s0) -/* E17F64 802421E4 4406A000 */ mfc1 $a2, $f20 -/* E17F68 802421E8 44820000 */ mtc1 $v0, $f0 -/* E17F6C 802421EC 00000000 */ nop -/* E17F70 802421F0 46800020 */ cvt.s.w $f0, $f0 -/* E17F74 802421F4 44070000 */ mfc1 $a3, $f0 -/* E17F78 802421F8 0200282D */ daddu $a1, $s0, $zero -/* E17F7C 802421FC E7B80010 */ swc1 $f24, 0x10($sp) -/* E17F80 80242200 E7B60014 */ swc1 $f22, 0x14($sp) -/* E17F84 80242204 E7B40018 */ swc1 $f20, 0x18($sp) -/* E17F88 80242208 AFB5001C */ sw $s5, 0x1c($sp) -/* E17F8C 8024220C 0C01BFA4 */ jal fx_emote -/* E17F90 80242210 AFB30020 */ sw $s3, 0x20($sp) -/* E17F94 80242214 3C02002C */ lui $v0, 0x2c -/* E17F98 80242218 3442001C */ ori $v0, $v0, 0x1c -.L8024221C: -/* E17F9C 8024221C 0200202D */ daddu $a0, $s0, $zero -/* E17FA0 80242220 0C00EAE8 */ jal enable_npc_shadow -/* E17FA4 80242224 AC820028 */ sw $v0, 0x28($a0) -.L80242228: -/* E17FA8 80242228 2631001C */ addiu $s1, $s1, 0x1c -.L8024222C: -/* E17FAC 8024222C 26520001 */ addiu $s2, $s2, 1 -/* E17FB0 80242230 2A420023 */ slti $v0, $s2, 0x23 -/* E17FB4 80242234 1440FFBE */ bnez $v0, .L80242130 -/* E17FB8 80242238 0000102D */ daddu $v0, $zero, $zero -.L8024223C: -/* E17FBC 8024223C 8FBF0058 */ lw $ra, 0x58($sp) -/* E17FC0 80242240 8FB70054 */ lw $s7, 0x54($sp) -/* E17FC4 80242244 8FB60050 */ lw $s6, 0x50($sp) -/* E17FC8 80242248 8FB5004C */ lw $s5, 0x4c($sp) -/* E17FCC 8024224C 8FB40048 */ lw $s4, 0x48($sp) -/* E17FD0 80242250 8FB30044 */ lw $s3, 0x44($sp) -/* E17FD4 80242254 8FB20040 */ lw $s2, 0x40($sp) -/* E17FD8 80242258 8FB1003C */ lw $s1, 0x3c($sp) -/* E17FDC 8024225C 8FB00038 */ lw $s0, 0x38($sp) -/* E17FE0 80242260 D7B80070 */ ldc1 $f24, 0x70($sp) -/* E17FE4 80242264 D7B60068 */ ldc1 $f22, 0x68($sp) -/* E17FE8 80242268 D7B40060 */ ldc1 $f20, 0x60($sp) -/* E17FEC 8024226C 03E00008 */ jr $ra -/* E17FF0 80242270 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s deleted file mode 100644 index 46919d209b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242274_E17FF4 -/* E17FF4 80242274 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E17FF8 80242278 0000202D */ daddu $a0, $zero, $zero -/* E17FFC 8024227C AFBF0014 */ sw $ra, 0x14($sp) -/* E18000 80242280 0C00FB3A */ jal get_enemy -/* E18004 80242284 AFB00010 */ sw $s0, 0x10($sp) -/* E18008 80242288 24040400 */ addiu $a0, $zero, 0x400 -/* E1800C 8024228C 0C00AB39 */ jal heap_malloc -/* E18010 80242290 0040802D */ daddu $s0, $v0, $zero -/* E18014 80242294 2403FFB0 */ addiu $v1, $zero, -0x50 -/* E18018 80242298 AE02006C */ sw $v0, 0x6c($s0) -/* E1801C 8024229C AC430014 */ sw $v1, 0x14($v0) -/* E18020 802422A0 24030140 */ addiu $v1, $zero, 0x140 -/* E18024 802422A4 AC430018 */ sw $v1, 0x18($v0) -/* E18028 802422A8 24030384 */ addiu $v1, $zero, 0x384 -/* E1802C 802422AC 0C03A625 */ jal func_800E9894 -/* E18030 802422B0 AC430008 */ sw $v1, 8($v0) -/* E18034 802422B4 0C03A5EE */ jal close_status_menu -/* E18038 802422B8 00000000 */ nop -/* E1803C 802422BC 8FBF0014 */ lw $ra, 0x14($sp) -/* E18040 802422C0 8FB00010 */ lw $s0, 0x10($sp) -/* E18044 802422C4 24020002 */ addiu $v0, $zero, 2 -/* E18048 802422C8 03E00008 */ jr $ra -/* E1804C 802422CC 27BD0018 */ addiu $sp, $sp, 0x18 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 deleted file mode 100644 index 72417cb033..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802422D0_E18050.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422D0_E18050 -/* E18050 802422D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E18054 802422D4 0000202D */ daddu $a0, $zero, $zero -/* E18058 802422D8 AFBF0014 */ sw $ra, 0x14($sp) -/* E1805C 802422DC 0C00FB3A */ jal get_enemy -/* E18060 802422E0 AFB00010 */ sw $s0, 0x10($sp) -/* E18064 802422E4 8C50006C */ lw $s0, 0x6c($v0) -/* E18068 802422E8 0C048D70 */ jal free_generic_entity -/* E1806C 802422EC 8E040000 */ lw $a0, ($s0) -/* E18070 802422F0 0C05123D */ jal hud_element_free -/* E18074 802422F4 8E04000C */ lw $a0, 0xc($s0) -/* 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) -/* E18088 80242308 24020002 */ addiu $v0, $zero, 2 -/* E1808C 8024230C 03E00008 */ jr $ra -/* E18090 80242310 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s deleted file mode 100644 index df39e05031..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242314_E18094 -/* E18094 80242314 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E18098 80242318 3C05FE36 */ lui $a1, 0xfe36 -/* E1809C 8024231C 3C068011 */ lui $a2, %hi(gPlayerData+0xC) -/* E180A0 80242320 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) -/* E180A4 80242324 AFBF0010 */ sw $ra, 0x10($sp) -/* E180A8 80242328 0C0B2026 */ jal evt_set_variable -/* E180AC 8024232C 34A53C8A */ ori $a1, $a1, 0x3c8a -/* E180B0 80242330 8FBF0010 */ lw $ra, 0x10($sp) -/* E180B4 80242334 24020002 */ addiu $v0, $zero, 2 -/* E180B8 80242338 03E00008 */ jr $ra -/* E180BC 8024233C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340_E180C0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340_E180C0.s deleted file mode 100644 index 379e3734db..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340_E180C0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242340_E180C0 -/* E180C0 80242340 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E180C4 80242344 AFB00010 */ sw $s0, 0x10($sp) -/* E180C8 80242348 0080802D */ daddu $s0, $a0, $zero -/* E180CC 8024234C 3C038011 */ lui $v1, %hi(gPlayerData) -/* E180D0 80242350 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* E180D4 80242354 10A00005 */ beqz $a1, .L8024236C -/* E180D8 80242358 AFBF0014 */ sw $ra, 0x14($sp) -/* E180DC 8024235C 94620336 */ lhu $v0, 0x336($v1) -/* E180E0 80242360 24420001 */ addiu $v0, $v0, 1 -/* E180E4 80242364 A4620336 */ sh $v0, 0x336($v1) -/* E180E8 80242368 AE000070 */ sw $zero, 0x70($s0) -.L8024236C: -/* E180EC 8024236C 0C03A830 */ jal add_coins -/* E180F0 80242370 2404FFFF */ addiu $a0, $zero, -1 -/* E180F4 80242374 0C05272D */ jal sfx_play_sound -/* E180F8 80242378 24040211 */ addiu $a0, $zero, 0x211 -/* E180FC 8024237C 8E030070 */ lw $v1, 0x70($s0) -/* E18100 80242380 24630001 */ addiu $v1, $v1, 1 -/* E18104 80242384 3862000A */ xori $v0, $v1, 0xa -/* E18108 80242388 2C420001 */ sltiu $v0, $v0, 1 -/* E1810C 8024238C AE030070 */ sw $v1, 0x70($s0) -/* E18110 80242390 8FBF0014 */ lw $ra, 0x14($sp) -/* E18114 80242394 8FB00010 */ lw $s0, 0x10($sp) -/* E18118 80242398 00021040 */ sll $v0, $v0, 1 -/* E1811C 8024239C 03E00008 */ jr $ra -/* E18120 802423A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4_E18124.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4_E18124.s deleted file mode 100644 index e7aa431f34..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4_E18124.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423A4_E18124 -/* E18124 802423A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E18128 802423A8 AFBF0010 */ sw $ra, 0x10($sp) -/* E1812C 802423AC 0C03A5B2 */ jal func_800E96C8 -/* E18130 802423B0 00000000 */ nop -/* E18134 802423B4 8FBF0010 */ lw $ra, 0x10($sp) -/* E18138 802423B8 24020002 */ addiu $v0, $zero, 2 -/* E1813C 802423BC 03E00008 */ jr $ra -/* E18140 802423C0 27BD0018 */ addiu $sp, $sp, 0x18 -/* E18144 802423C4 00000000 */ nop -/* E18148 802423C8 00000000 */ nop -/* E1814C 802423CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E18150/func_802423D0_E18150.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E18150/func_802423D0_E18150.s deleted file mode 100644 index cee35d499b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E18150/func_802423D0_E18150.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423D0_E18150 -/* E18150 802423D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E18154 802423D4 3C048025 */ lui $a0, %hi(D_802484C0_E1E240) -/* E18158 802423D8 248484C0 */ addiu $a0, $a0, %lo(D_802484C0_E1E240) -/* E1815C 802423DC AFBF0010 */ sw $ra, 0x10($sp) -/* E18160 802423E0 0C0496CB */ jal set_message_images -/* E18164 802423E4 00000000 */ nop -/* E18168 802423E8 8FBF0010 */ lw $ra, 0x10($sp) -/* E1816C 802423EC 24020002 */ addiu $v0, $zero, 2 -/* E18170 802423F0 03E00008 */ jr $ra -/* E18174 802423F4 27BD0018 */ addiu $sp, $sp, 0x18 -/* E18178 802423F8 00000000 */ nop -/* E1817C 802423FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s b/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s deleted file mode 100644 index 94bc58c947..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_80240184_DDF494.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240184_DDF494 -/* DDF494 80240184 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DDF498 80240188 AFB00018 */ sw $s0, 0x18($sp) -/* DDF49C 8024018C 0080802D */ daddu $s0, $a0, $zero -/* DDF4A0 80240190 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* DDF4A4 80240194 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* DDF4A8 80240198 AFB1001C */ sw $s1, 0x1c($sp) -/* DDF4AC 8024019C 3C118011 */ lui $s1, %hi(gPlayerData) -/* DDF4B0 802401A0 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* DDF4B4 802401A4 AFB20020 */ sw $s2, 0x20($sp) -/* DDF4B8 802401A8 0220902D */ daddu $s2, $s1, $zero -/* DDF4BC 802401AC 10A00004 */ beqz $a1, .L802401C0 -/* DDF4C0 802401B0 AFBF0024 */ sw $ra, 0x24($sp) -/* DDF4C4 802401B4 240200FF */ addiu $v0, $zero, 0xff -/* DDF4C8 802401B8 AE020070 */ sw $v0, 0x70($s0) -/* DDF4CC 802401BC AE000074 */ sw $zero, 0x74($s0) -.L802401C0: -/* DDF4D0 802401C0 24040001 */ addiu $a0, $zero, 1 -/* DDF4D4 802401C4 C460002C */ lwc1 $f0, 0x2c($v1) -/* DDF4D8 802401C8 3C014100 */ lui $at, 0x4100 -/* DDF4DC 802401CC 44811000 */ mtc1 $at, $f2 -/* DDF4E0 802401D0 00000000 */ nop -/* DDF4E4 802401D4 46020000 */ add.s $f0, $f0, $f2 -/* DDF4E8 802401D8 C4620030 */ lwc1 $f2, 0x30($v1) -/* DDF4EC 802401DC C4640028 */ lwc1 $f4, 0x28($v1) -/* DDF4F0 802401E0 4600118D */ trunc.w.s $f6, $f2 -/* DDF4F4 802401E4 E7A60010 */ swc1 $f6, 0x10($sp) -/* DDF4F8 802401E8 4600218D */ trunc.w.s $f6, $f4 -/* DDF4FC 802401EC 44063000 */ mfc1 $a2, $f6 -/* DDF500 802401F0 4600018D */ trunc.w.s $f6, $f0 -/* DDF504 802401F4 44073000 */ mfc1 $a3, $f6 -/* DDF508 802401F8 0C04DFB0 */ jal set_screen_overlay_center_worldpos -/* DDF50C 802401FC 0080282D */ daddu $a1, $a0, $zero -/* DDF510 80240200 3C028011 */ lui $v0, %hi(gPartnerActionStatus) -/* DDF514 80240204 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) -/* DDF518 80240208 10400012 */ beqz $v0, .L80240254 -/* DDF51C 8024020C 24020006 */ addiu $v0, $zero, 6 -/* DDF520 80240210 82230012 */ lb $v1, 0x12($s1) -/* DDF524 80240214 14620022 */ bne $v1, $v0, .L802402A0 -/* DDF528 80240218 00000000 */ nop -/* DDF52C 8024021C 8E020074 */ lw $v0, 0x74($s0) -/* DDF530 80240220 14400004 */ bnez $v0, .L80240234 -/* DDF534 80240224 24020001 */ addiu $v0, $zero, 1 -/* DDF538 80240228 AE020074 */ sw $v0, 0x74($s0) -/* DDF53C 8024022C 0C05272D */ jal sfx_play_sound -/* DDF540 80240230 24042011 */ addiu $a0, $zero, 0x2011 -.L80240234: -/* DDF544 80240234 8E020070 */ lw $v0, 0x70($s0) -/* DDF548 80240238 2442FFF8 */ addiu $v0, $v0, -8 -/* DDF54C 8024023C AE020070 */ sw $v0, 0x70($s0) -/* DDF550 80240240 2842005A */ slti $v0, $v0, 0x5a -/* DDF554 80240244 10400016 */ beqz $v0, .L802402A0 -/* DDF558 80240248 2402005A */ addiu $v0, $zero, 0x5a -/* DDF55C 8024024C 080900A8 */ j .L802402A0 -/* DDF560 80240250 AE020070 */ sw $v0, 0x70($s0) -.L80240254: -/* DDF564 80240254 82430012 */ lb $v1, 0x12($s2) -/* DDF568 80240258 14620010 */ bne $v1, $v0, .L8024029C -/* DDF56C 8024025C 240200FF */ addiu $v0, $zero, 0xff -/* DDF570 80240260 8E020074 */ lw $v0, 0x74($s0) -/* DDF574 80240264 10400007 */ beqz $v0, .L80240284 -/* DDF578 80240268 00000000 */ nop -/* DDF57C 8024026C 8E020070 */ lw $v0, 0x70($s0) -/* DDF580 80240270 284200FF */ slti $v0, $v0, 0xff -/* DDF584 80240274 10400003 */ beqz $v0, .L80240284 -/* DDF588 80240278 AE000074 */ sw $zero, 0x74($s0) -/* DDF58C 8024027C 0C05272D */ jal sfx_play_sound -/* DDF590 80240280 24042012 */ addiu $a0, $zero, 0x2012 -.L80240284: -/* DDF594 80240284 8E020070 */ lw $v0, 0x70($s0) -/* DDF598 80240288 24420008 */ addiu $v0, $v0, 8 -/* DDF59C 8024028C AE020070 */ sw $v0, 0x70($s0) -/* DDF5A0 80240290 284200FF */ slti $v0, $v0, 0xff -/* DDF5A4 80240294 14400002 */ bnez $v0, .L802402A0 -/* DDF5A8 80240298 240200FF */ addiu $v0, $zero, 0xff -.L8024029C: -/* DDF5AC 8024029C AE020070 */ sw $v0, 0x70($s0) -.L802402A0: -/* DDF5B0 802402A0 C6060070 */ lwc1 $f6, 0x70($s0) -/* DDF5B4 802402A4 468031A0 */ cvt.s.w $f6, $f6 -/* DDF5B8 802402A8 44053000 */ mfc1 $a1, $f6 -/* DDF5BC 802402AC 0C04E035 */ jal set_screen_overlay_alpha -/* DDF5C0 802402B0 24040001 */ addiu $a0, $zero, 1 -/* DDF5C4 802402B4 3C05437F */ lui $a1, 0x437f -/* DDF5C8 802402B8 0C04DF69 */ jal set_screen_overlay_params_back -/* DDF5CC 802402BC 2404000B */ addiu $a0, $zero, 0xb -/* DDF5D0 802402C0 8FBF0024 */ lw $ra, 0x24($sp) -/* DDF5D4 802402C4 8FB20020 */ lw $s2, 0x20($sp) -/* DDF5D8 802402C8 8FB1001C */ lw $s1, 0x1c($sp) -/* DDF5DC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* DDF5E0 802402D0 0000102D */ daddu $v0, $zero, $zero -/* DDF5E4 802402D4 03E00008 */ jr $ra -/* DDF5E8 802402D8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s deleted file mode 100644 index afdcf7c006..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE56B0/func_80240000_DE56B0.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_DE56B0 -/* DE56B0 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DE56B4 80240004 AFB00018 */ sw $s0, 0x18($sp) -/* DE56B8 80240008 0080802D */ daddu $s0, $a0, $zero -/* DE56BC 8024000C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* DE56C0 80240010 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* DE56C4 80240014 AFB1001C */ sw $s1, 0x1c($sp) -/* DE56C8 80240018 3C118011 */ lui $s1, %hi(gPlayerData) -/* DE56CC 8024001C 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* DE56D0 80240020 AFB20020 */ sw $s2, 0x20($sp) -/* DE56D4 80240024 0220902D */ daddu $s2, $s1, $zero -/* DE56D8 80240028 10A00004 */ beqz $a1, .L8024003C -/* DE56DC 8024002C AFBF0024 */ sw $ra, 0x24($sp) -/* DE56E0 80240030 240200FF */ addiu $v0, $zero, 0xff -/* DE56E4 80240034 AE020070 */ sw $v0, 0x70($s0) -/* DE56E8 80240038 AE000074 */ sw $zero, 0x74($s0) -.L8024003C: -/* DE56EC 8024003C 24040001 */ addiu $a0, $zero, 1 -/* DE56F0 80240040 C460002C */ lwc1 $f0, 0x2c($v1) -/* DE56F4 80240044 3C014100 */ lui $at, 0x4100 -/* DE56F8 80240048 44811000 */ mtc1 $at, $f2 -/* DE56FC 8024004C 00000000 */ nop -/* DE5700 80240050 46020000 */ add.s $f0, $f0, $f2 -/* DE5704 80240054 C4620030 */ lwc1 $f2, 0x30($v1) -/* DE5708 80240058 C4640028 */ lwc1 $f4, 0x28($v1) -/* DE570C 8024005C 4600118D */ trunc.w.s $f6, $f2 -/* DE5710 80240060 E7A60010 */ swc1 $f6, 0x10($sp) -/* DE5714 80240064 4600218D */ trunc.w.s $f6, $f4 -/* DE5718 80240068 44063000 */ mfc1 $a2, $f6 -/* DE571C 8024006C 4600018D */ trunc.w.s $f6, $f0 -/* DE5720 80240070 44073000 */ mfc1 $a3, $f6 -/* DE5724 80240074 0C04DFB0 */ jal set_screen_overlay_center_worldpos -/* DE5728 80240078 0080282D */ daddu $a1, $a0, $zero -/* DE572C 8024007C 3C028011 */ lui $v0, %hi(gPartnerActionStatus) -/* DE5730 80240080 8042EBB0 */ lb $v0, %lo(gPartnerActionStatus)($v0) -/* DE5734 80240084 10400012 */ beqz $v0, .L802400D0 -/* DE5738 80240088 24020006 */ addiu $v0, $zero, 6 -/* DE573C 8024008C 82230012 */ lb $v1, 0x12($s1) -/* DE5740 80240090 14620022 */ bne $v1, $v0, .L8024011C -/* DE5744 80240094 00000000 */ nop -/* DE5748 80240098 8E020074 */ lw $v0, 0x74($s0) -/* DE574C 8024009C 14400004 */ bnez $v0, .L802400B0 -/* DE5750 802400A0 24020001 */ addiu $v0, $zero, 1 -/* DE5754 802400A4 AE020074 */ sw $v0, 0x74($s0) -/* DE5758 802400A8 0C05272D */ jal sfx_play_sound -/* DE575C 802400AC 24042011 */ addiu $a0, $zero, 0x2011 -.L802400B0: -/* DE5760 802400B0 8E020070 */ lw $v0, 0x70($s0) -/* DE5764 802400B4 2442FFF8 */ addiu $v0, $v0, -8 -/* DE5768 802400B8 AE020070 */ sw $v0, 0x70($s0) -/* DE576C 802400BC 2842005A */ slti $v0, $v0, 0x5a -/* DE5770 802400C0 10400016 */ beqz $v0, .L8024011C -/* DE5774 802400C4 2402005A */ addiu $v0, $zero, 0x5a -/* DE5778 802400C8 08090047 */ j .L8024011C -/* DE577C 802400CC AE020070 */ sw $v0, 0x70($s0) -.L802400D0: -/* DE5780 802400D0 82430012 */ lb $v1, 0x12($s2) -/* DE5784 802400D4 14620010 */ bne $v1, $v0, .L80240118 -/* DE5788 802400D8 240200FF */ addiu $v0, $zero, 0xff -/* DE578C 802400DC 8E020074 */ lw $v0, 0x74($s0) -/* DE5790 802400E0 10400007 */ beqz $v0, .L80240100 -/* DE5794 802400E4 00000000 */ nop -/* DE5798 802400E8 8E020070 */ lw $v0, 0x70($s0) -/* DE579C 802400EC 284200FF */ slti $v0, $v0, 0xff -/* DE57A0 802400F0 10400003 */ beqz $v0, .L80240100 -/* DE57A4 802400F4 AE000074 */ sw $zero, 0x74($s0) -/* DE57A8 802400F8 0C05272D */ jal sfx_play_sound -/* DE57AC 802400FC 24042012 */ addiu $a0, $zero, 0x2012 -.L80240100: -/* DE57B0 80240100 8E020070 */ lw $v0, 0x70($s0) -/* DE57B4 80240104 24420008 */ addiu $v0, $v0, 8 -/* DE57B8 80240108 AE020070 */ sw $v0, 0x70($s0) -/* DE57BC 8024010C 284200FF */ slti $v0, $v0, 0xff -/* DE57C0 80240110 14400002 */ bnez $v0, .L8024011C -/* DE57C4 80240114 240200FF */ addiu $v0, $zero, 0xff -.L80240118: -/* DE57C8 80240118 AE020070 */ sw $v0, 0x70($s0) -.L8024011C: -/* DE57CC 8024011C C6060070 */ lwc1 $f6, 0x70($s0) -/* DE57D0 80240120 468031A0 */ cvt.s.w $f6, $f6 -/* DE57D4 80240124 44053000 */ mfc1 $a1, $f6 -/* DE57D8 80240128 0C04E035 */ jal set_screen_overlay_alpha -/* DE57DC 8024012C 24040001 */ addiu $a0, $zero, 1 -/* DE57E0 80240130 3C05437F */ lui $a1, 0x437f -/* DE57E4 80240134 0C04DF69 */ jal set_screen_overlay_params_back -/* DE57E8 80240138 2404000B */ addiu $a0, $zero, 0xb -/* DE57EC 8024013C 8FBF0024 */ lw $ra, 0x24($sp) -/* DE57F0 80240140 8FB20020 */ lw $s2, 0x20($sp) -/* DE57F4 80240144 8FB1001C */ lw $s1, 0x1c($sp) -/* DE57F8 80240148 8FB00018 */ lw $s0, 0x18($sp) -/* DE57FC 8024014C 0000102D */ daddu $v0, $zero, $zero -/* DE5800 80240150 03E00008 */ jr $ra -/* DE5804 80240154 27BD0028 */ addiu $sp, $sp, 0x28 -/* DE5808 80240158 00000000 */ nop -/* DE580C 8024015C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802400FC_B1B66C.s b/ver/us/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802400FC_B1B66C.s deleted file mode 100644 index 24f4c078f0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802400FC_B1B66C.s +++ /dev/null @@ -1,94 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400FC_B1B66C -/* B1B66C 802400FC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B1B670 80240100 AFB10014 */ sw $s1, 0x14($sp) -/* B1B674 80240104 0080882D */ daddu $s1, $a0, $zero -/* B1B678 80240108 AFBF0018 */ sw $ra, 0x18($sp) -/* B1B67C 8024010C AFB00010 */ sw $s0, 0x10($sp) -/* B1B680 80240110 F7BE0048 */ sdc1 $f30, 0x48($sp) -/* B1B684 80240114 F7BC0040 */ sdc1 $f28, 0x40($sp) -/* B1B688 80240118 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* B1B68C 8024011C F7B80030 */ sdc1 $f24, 0x30($sp) -/* B1B690 80240120 F7B60028 */ sdc1 $f22, 0x28($sp) -/* B1B694 80240124 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B1B698 80240128 0C00EAD2 */ jal get_npc_safe -/* B1B69C 8024012C 2404FFFC */ addiu $a0, $zero, -4 -/* B1B6A0 80240130 0040802D */ daddu $s0, $v0, $zero -/* B1B6A4 80240134 1200003F */ beqz $s0, .L80240234 -/* B1B6A8 80240138 24020002 */ addiu $v0, $zero, 2 -/* B1B6AC 8024013C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B1B6B0 80240140 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B1B6B4 80240144 3C06C37A */ lui $a2, 0xc37a -/* B1B6B8 80240148 0C00A7B5 */ jal dist2D -/* B1B6BC 8024014C 3C07C2C8 */ lui $a3, 0xc2c8 -/* B1B6C0 80240150 0220202D */ daddu $a0, $s1, $zero -/* B1B6C4 80240154 3C05FE36 */ lui $a1, 0xfe36 -/* B1B6C8 80240158 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B1B6CC 8024015C 0C0B1EAF */ jal evt_get_variable -/* B1B6D0 80240160 46000606 */ mov.s $f24, $f0 -/* B1B6D4 80240164 2442FFFF */ addiu $v0, $v0, -1 -/* B1B6D8 80240168 3C0140C9 */ lui $at, 0x40c9 -/* B1B6DC 8024016C 34210FD0 */ ori $at, $at, 0xfd0 -/* B1B6E0 80240170 4481B000 */ mtc1 $at, $f22 -/* B1B6E4 80240174 44820000 */ mtc1 $v0, $f0 -/* B1B6E8 80240178 00000000 */ nop -/* B1B6EC 8024017C 46800020 */ cvt.s.w $f0, $f0 -/* B1B6F0 80240180 46160502 */ mul.s $f20, $f0, $f22 -/* B1B6F4 80240184 00000000 */ nop -/* B1B6F8 80240188 3C0143B4 */ lui $at, 0x43b4 -/* B1B6FC 8024018C 4481D000 */ mtc1 $at, $f26 -/* B1B700 80240190 00000000 */ nop -/* B1B704 80240194 461AA503 */ div.s $f20, $f20, $f26 -/* B1B708 80240198 0C00A85B */ jal sin_rad -/* B1B70C 8024019C 4600A306 */ mov.s $f12, $f20 -/* B1B710 802401A0 46000786 */ mov.s $f30, $f0 -/* B1B714 802401A4 0C00A874 */ jal cos_rad -/* B1B718 802401A8 4600A306 */ mov.s $f12, $f20 -/* B1B71C 802401AC 4600C702 */ mul.s $f28, $f24, $f0 -/* B1B720 802401B0 00000000 */ nop -/* B1B724 802401B4 0220202D */ daddu $a0, $s1, $zero -/* B1B728 802401B8 4600F507 */ neg.s $f20, $f30 -/* B1B72C 802401BC 4614C502 */ mul.s $f20, $f24, $f20 -/* B1B730 802401C0 00000000 */ nop -/* B1B734 802401C4 3C05FE36 */ lui $a1, 0xfe36 -/* B1B738 802401C8 0C0B1EAF */ jal evt_get_variable -/* B1B73C 802401CC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B1B740 802401D0 44820000 */ mtc1 $v0, $f0 -/* B1B744 802401D4 00000000 */ nop -/* B1B748 802401D8 46800020 */ cvt.s.w $f0, $f0 -/* B1B74C 802401DC 46160582 */ mul.s $f22, $f0, $f22 -/* B1B750 802401E0 00000000 */ nop -/* B1B754 802401E4 461AB583 */ div.s $f22, $f22, $f26 -/* B1B758 802401E8 0C00A85B */ jal sin_rad -/* B1B75C 802401EC 4600B306 */ mov.s $f12, $f22 -/* B1B760 802401F0 46000786 */ mov.s $f30, $f0 -/* B1B764 802401F4 0C00A874 */ jal cos_rad -/* B1B768 802401F8 4600B306 */ mov.s $f12, $f22 -/* B1B76C 802401FC 4600C002 */ mul.s $f0, $f24, $f0 -/* B1B770 80240200 00000000 */ nop -/* B1B774 80240204 4600F087 */ neg.s $f2, $f30 -/* B1B778 80240208 4602C602 */ mul.s $f24, $f24, $f2 -/* B1B77C 8024020C 00000000 */ nop -/* B1B780 80240210 461C0001 */ sub.s $f0, $f0, $f28 -/* B1B784 80240214 4614C601 */ sub.s $f24, $f24, $f20 -/* B1B788 80240218 C6020038 */ lwc1 $f2, 0x38($s0) -/* B1B78C 8024021C 46001080 */ add.s $f2, $f2, $f0 -/* B1B790 80240220 C6000040 */ lwc1 $f0, 0x40($s0) -/* B1B794 80240224 46180000 */ add.s $f0, $f0, $f24 -/* B1B798 80240228 24020002 */ addiu $v0, $zero, 2 -/* B1B79C 8024022C E6020038 */ swc1 $f2, 0x38($s0) -/* B1B7A0 80240230 E6000040 */ swc1 $f0, 0x40($s0) -.L80240234: -/* B1B7A4 80240234 8FBF0018 */ lw $ra, 0x18($sp) -/* B1B7A8 80240238 8FB10014 */ lw $s1, 0x14($sp) -/* B1B7AC 8024023C 8FB00010 */ lw $s0, 0x10($sp) -/* B1B7B0 80240240 D7BE0048 */ ldc1 $f30, 0x48($sp) -/* B1B7B4 80240244 D7BC0040 */ ldc1 $f28, 0x40($sp) -/* B1B7B8 80240248 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* B1B7BC 8024024C D7B80030 */ ldc1 $f24, 0x30($sp) -/* B1B7C0 80240250 D7B60028 */ ldc1 $f22, 0x28($sp) -/* B1B7C4 80240254 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B1B7C8 80240258 03E00008 */ jr $ra -/* B1B7CC 8024025C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 9a7bb3883e..de57d52dfb 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -1979,7 +1979,7 @@ coin_counter_draw_content = 0x800E92D8; // type:func rom:0x82788 update_coin_counter = 0x800E93DC; // type:func rom:0x8288C show_coin_counter = 0x800E9518; // type:func rom:0x829C8 hide_coin_counter = 0x800E9698; // type:func rom:0x82B48 -func_800E96C8 = 0x800E96C8; // type:func rom:0x82B78 +hide_coin_counter_immediately = 0x800E96C8; // type:func rom:0x82B78 ShowCoinCounter = 0x800E96F8; // type:func rom:0x82BA8 draw_status_ui = 0x800E973C; // type:func rom:0x82BEC open_status_menu_long = 0x800E9760; // type:func rom:0x82C10 @@ -4822,7 +4822,7 @@ btl_cam_use_preset = 0x8024CF34; // type:func rom:0x17B814 func_8024E3D8 = 0x8024E3D8; // type:func rom:0x17CCB8 func_8024E40C = 0x8024E40C; // type:func rom:0x17CCEC btl_cam_target_actor = 0x8024E43C; // type:func rom:0x17CD1C -func_8024E45C = 0x8024E45C; // type:func rom:0x17CD3C +btl_cam_target_actor_part = 0x8024E45C; // type:func rom:0x17CD3C func_8024E484 = 0x8024E484; // type:func rom:0x17CD64 btl_cam_move = 0x8024E4D8; // type:func rom:0x17CDB8 btl_cam_set_target_pos = 0x8024E520; // type:func rom:0x17CE00 @@ -4844,7 +4844,7 @@ SetBattleCamOffsetZ = 0x8024EA58; // type:func rom:0x17D338 AddBattleCamOffsetZ = 0x8024EA98; // type:func rom:0x17D378 SetBattleCamYaw = 0x8024EAE4; // type:func rom:0x17D3C4 BattleCamTargetActor = 0x8024EB24; // type:func rom:0x17D404 -func_8024EB84 = 0x8024EB84; // type:func rom:0x17D464 +BattleCamTargetActorPart = 0x8024EB84; // type:func rom:0x17D464 MoveBattleCamOver = 0x8024EC08; // type:func rom:0x17D4E8 SetBattleCamZoom = 0x8024EC6C; // type:func rom:0x17D54C AddBattleCamZoom = 0x8024ECAC; // type:func rom:0x17D58C @@ -5473,8 +5473,8 @@ bHPDigitHudScripts = 0x802809FC; // type:data rom:0x1AF2DC D_80280A30 = 0x80280A30; // type:data rom:0x1AF310 BtlPutPartnerAway = 0x80280A34; // rom:0x1AF314 BtlBringPartnerOut = 0x80280B6C; // rom:0x1AF44C -D_80280CE0 = 0x80280CE0; // type:data rom:0x1AF5C0 -D_80280CE4 = 0x80280CE4; // type:data rom:0x1AF5C4 +BattleCam_IsFrozen = 0x80280CE0; // type:data rom:0x1AF5C0 +BattleCam_CurrentPresetID = 0x80280CE4; // type:data rom:0x1AF5C4 CamPreset_B = 0x80280CE8; // type:data rom:0x1AF5C8 CamPreset_F = 0x80280D04; // type:data rom:0x1AF5E4 CamPreset_M = 0x80280D20; // type:data rom:0x1AF600 @@ -9478,17 +9478,17 @@ tik_25_SetEntityPosition = 0x802406AC; // type:func rom:0x8A862C func_80240770_8A86F0 = 0x80240770; // type:func rom:0x8A86F0 func_80240000_8A9A10 = 0x80240000; // type:func rom:0x8A9A10 func_80240160_8A9B70 = 0x80240160; // type:func rom:0x8A9B70 -func_80240354_8A9D64 = 0x80240354; // type:func rom:0x8A9D64 -func_802403E0_8A9DF0 = 0x802403E0; // type:func rom:0x8A9DF0 +kgr_01_make_tongue_gfx = 0x80240354; // type:func rom:0x8A9D64 +kgr_01_GetEffectiveTongueOffset = 0x802403E0; // type:func rom:0x8A9DF0 func_80240500_8A9F10 = 0x80240500; // type:func rom:0x8A9F10 -D_802407C0_8AA1D0 = 0x802407C0; // type:data rom:0x8AA1D0 +kgr_01_TongueWiggleTime = 0x802407C0; // type:data rom:0x8AA1D0 D_80240A30_8AA440 = 0x80240A30; // type:data rom:0x8AA440 D_80240A38_8AA448 = 0x80240A38; // type:data rom:0x8AA448 func_80240000_8AA450 = 0x80240000; // type:func rom:0x8AA450 func_80240160_8AA5B0 = 0x80240160; // type:func rom:0x8AA5B0 func_80240730_8AAB80 = 0x80240730; // type:func rom:0x8AAB80 func_80240748_8AAB98 = 0x80240748; // type:func rom:0x8AAB98 -func_80240760_8AABB0 = 0x80240760; // type:func rom:0x8AABB0 +kgr_02_HasBombetteExploded = 0x80240760; // type:func rom:0x8AABB0 D_80240970_8AADC0 = 0x80240970; // type:data rom:0x8AADC0 func_80240000_8ABF90 = 0x80240000; // type:func rom:0x8ABF90 func_80240388_8AC318 = 0x80240388; // type:func rom:0x8AC318 @@ -11885,7 +11885,7 @@ func_80240BFC_A4033C = 0x80240BFC; // type:func rom:0xA4033C hos_20_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA45930 hos_20_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA45A54 func_80240310_A45C40 = 0x80240310; // type:func rom:0xA45C40 -func_80240000_A46F60 = 0x80240000; // type:func rom:0xA46F60 +kpa_01_DarkRoomUpdate = 0x80240000; // type:func rom:0xA46F60 kpa_01_set_script_owner_npc_anim = 0x80240160; // type:func rom:0xA470C0 kpa_01_UnkDistFunc = 0x802401DC; // type:func rom:0xA4713C kpa_01_UnkNpcAIFunc12 = 0x80240310; // type:func rom:0xA47270 @@ -11895,7 +11895,7 @@ kpa_01_func_80240814_97BE44 = 0x80240934; // type:func rom:0xA47894 kpa_01_AwaitPlayerNearNpc = 0x8024097C; // type:func rom:0xA478DC kpa_01_func_802408B4_97BEE4 = 0x802409D4; // type:func rom:0xA47934 D_80241600_A48560 = 0x80241600; // type:data rom:0xA48560 -func_80240000_A485C0 = 0x80240000; // type:func rom:0xA485C0 +kpa_03_DarkRoomUpdate = 0x80240000; // type:func rom:0xA485C0 kpa_03_set_script_owner_npc_anim = 0x80240160; // type:func rom:0xA48720 kpa_03_UnkDistFunc = 0x802401DC; // type:func rom:0xA4879C kpa_03_UnkNpcAIFunc12 = 0x80240310; // type:func rom:0xA488D0 @@ -13091,7 +13091,7 @@ func_802414BC_B6D84C = 0x802414BC; // type:func rom:0xB6D84C dup_jan_10_foliage_setup_shear_mtx = 0x80241500; // type:func rom:0xB6D890 dup_jan_10_TransformFoliage = 0x80241570; // type:func rom:0xB6D900 D_80244480_B70810 = 0x80244480; // type:data rom:0xB70810 -func_80240000_B70860 = 0x80240000; // type:func rom:0xB70860 +jan_11_DarkRoomUpdate = 0x80240000; // type:func rom:0xB70860 jan_11_SetPlayerStatusAnimFlags100000 = 0x80240158; // type:func rom:0xB709B8 jan_11_GetCurrentFloor = 0x80240178; // type:func rom:0xB709D8 jan_11_UnkFunc25 = 0x8024018C; // type:func rom:0xB709EC @@ -18334,7 +18334,7 @@ D_80241E48_DDE678 = 0x80241E48; // type:data rom:0xDDE678 D_80241E58_DDE688 = 0x80241E58; // type:data rom:0xDDE688 omo_11_bigFuncFloats = 0x80241E98; // type:data rom:0xDDE6C8 omo_12_UnkFunc41 = 0x80240000; // type:func rom:0xDDF310 -func_80240184_DDF494 = 0x80240184; // type:func rom:0xDDF494 +omo_12_DarkRoomUpdate = 0x80240184; // type:func rom:0xDDF494 omo_12_SetCamera0Flag1000 = 0x802402DC; // type:func rom:0xDDF5EC omo_12_UnsetCamera0Flag1000 = 0x802402F8; // type:func rom:0xDDF608 func_80240314_DDF624 = 0x80240314; // type:func rom:0xDDF624 @@ -18368,7 +18368,7 @@ D_80242EE0_DE5370 = 0x80242EE0; // type:data rom:0xDE5370 D_80242EE8_DE5378 = 0x80242EE8; // type:data rom:0xDE5378 D_80243080_DE5510 = 0x80243080; // type:data rom:0xDE5510 D_80243088_DE5518 = 0x80243088; // type:data rom:0xDE5518 -func_80240000_DE56B0 = 0x80240000; // type:func rom:0xDE56B0 +omo_14_DarkRoomUpdate = 0x80240000; // type:func rom:0xDE56B0 func_80240160_DE5810 = 0x80240160; // type:func rom:0xDE5810 func_802403FC_DE5AAC = 0x802403FC; // type:func rom:0xDE5AAC func_80240564_DE5C14 = 0x80240564; // type:func rom:0xDE5C14 @@ -18536,54 +18536,54 @@ mgm_00_UnkNpcDurationFlagFunc = 0x80240D4C; // type:func rom:0xE0F4EC mgm_00_UnkFunc16 = 0x80240DB4; // type:func rom:0xE0F554 mgm_00_UnkNpcAIMainFunc = 0x80240E74; // type:func rom:0xE0F614 func_80241170_E0F910 = 0x80241170; // type:func rom:0xE0F910 -func_802411E0_E0F980 = 0x802411E0; // type:func rom:0xE0F980 -func_80241540_E0FCE0 = 0x80241540; // type:func rom:0xE0FCE0 -func_802416C0_E0FE60 = 0x802416C0; // type:func rom:0xE0FE60 -func_802416F8_E0FE98 = 0x802416F8; // type:func rom:0xE0FE98 +mgm_00_draw_record_display = 0x802411E0; // type:func rom:0xE0F980 +mgm_00_animate_and_draw_record = 0x80241540; // type:func rom:0xE0FCE0 +mgm_00_work_draw_record = 0x802416C0; // type:func rom:0xE0FE60 +mgm_00_UpdateRecordDisplay = 0x802416F8; // type:func rom:0xE0FE98 D_80243C50_E123F0 = 0x80243C50; // type:data rom:0xE123F0 D_80243DF0_E12590 = 0x80243DF0; // type:data rom:0xE12590 D_80243DF8_E12598 = 0x80243DF8; // type:data rom:0xE12598 D_80243F90_E12730 = 0x80243F90; // type:data rom:0xE12730 D_80243F98_E12738 = 0x80243F98; // type:data rom:0xE12738 func_80240000_E12760 = 0x80240000; // type:func rom:0xE12760 -func_802401D0_E12930 = 0x802401D0; // type:func rom:0xE12930 -func_802403C4_E12B24 = 0x802403C4; // type:func rom:0xE12B24 -func_802403FC_E12B5C = 0x802403FC; // type:func rom:0xE12B5C -func_80240438_E12B98 = 0x80240438; // type:func rom:0xE12B98 -func_8024045C_E12BBC = 0x8024045C; // type:func rom:0xE12BBC -func_8024050C_E12C6C = 0x8024050C; // type:func rom:0xE12C6C -func_8024058C_E12CEC = 0x8024058C; // type:func rom:0xE12CEC -func_802406C4_E12E24 = 0x802406C4; // type:func rom:0xE12E24 -func_802407E4_E12F44 = 0x802407E4; // type:func rom:0xE12F44 -func_8024084C_E12FAC = 0x8024084C; // type:func rom:0xE12FAC -func_802408EC_E1304C = 0x802408EC; // type:func rom:0xE1304C -func_80240AAC_E1320C = 0x80240AAC; // type:func rom:0xE1320C -func_80240BF4_E13354 = 0x80240BF4; // type:func rom:0xE13354 -func_80240C54_E133B4 = 0x80240C54; // type:func rom:0xE133B4 -func_80240CD0_E13430 = 0x80240CD0; // type:func rom:0xE13430 -func_80240D84_E134E4 = 0x80240D84; // type:func rom:0xE134E4 -func_80240DB8_E13518 = 0x80240DB8; // type:func rom:0xE13518 -func_80240ECC_E1362C = 0x80240ECC; // type:func rom:0xE1362C -func_80240F90_E136F0 = 0x80240F90; // type:func rom:0xE136F0 -func_80241090_E137F0 = 0x80241090; // type:func rom:0xE137F0 -func_80241234_E13994 = 0x80241234; // type:func rom:0xE13994 -func_80241510_E13C70 = 0x80241510; // type:func rom:0xE13C70 -func_80241574_E13CD4 = 0x80241574; // type:func rom:0xE13CD4 -func_802415EC_E13D4C = 0x802415EC; // type:func rom:0xE13D4C -func_80241690_E13DF0 = 0x80241690; // type:func rom:0xE13DF0 -func_802416CC_E13E2C = 0x802416CC; // type:func rom:0xE13E2C -func_802416F8_E13E58 = 0x802416F8; // type:func rom:0xE13E58 -func_80241760_E13EC0 = 0x80241760; // type:func rom:0xE13EC0 -func_80241780_E13EE0 = 0x80241780; // type:func rom:0xE13EE0 -D_80241AC8_E14228 = 0x80241AC8; // type:data rom:0xE14228 -D_80241AD4_E14234 = 0x80241AD4; // type:data rom:0xE14234 -D_80241AE0_E14240 = 0x80241AE0; // type:data rom:0xE14240 -D_80241AEC_E1424C = 0x80241AEC; // type:data rom:0xE1424C -D_80241B18_E14278 = 0x80241B18; // type:data rom:0xE14278 -D_80241B44_E142A4 = 0x80241B44; // type:data rom:0xE142A4 -D_80241B70_E142D0 = 0x80241B70; // type:data rom:0xE142D0 -D_80241B9C_E142FC = 0x80241B9C; // type:data rom:0xE142FC -D_80243560_E15CC0 = 0x80243560; // type:data rom:0xE15CC0 +mgm_01_draw_score_display = 0x802401D0; // type:func rom:0xE12930 +mgm_01_work_draw_score = 0x802403C4; // type:func rom:0xE12B24 +mgm_01_DisableMenus = 0x802403FC; // type:func rom:0xE12B5C +mgm_01_EnableMenus = 0x80240438; // type:func rom:0xE12B98 +mgm_01_GetPanelInfo = 0x8024045C; // type:func rom:0xE12BBC +mgm_01_SetPanelState = 0x8024050C; // type:func rom:0xE12C6C +mgm_01_InitPanelEmergeFromBlock = 0x8024058C; // type:func rom:0xE12CEC +mgm_01_UpdatePanelEmergeFromBlock = 0x802406C4; // type:func rom:0xE12E24 +mgm_01_InitPanelHoldAboveBlock = 0x802407E4; // type:func rom:0xE12F44 +mgm_01_UpdatetPanelHoldAboveBlock = 0x8024084C; // type:func rom:0xE12FAC +mgm_01_InitPanelMoveToTally = 0x802408EC; // type:func rom:0xE1304C +mgm_01_UpdatePanelMoveToTally = 0x80240AAC; // type:func rom:0xE1320C +mgm_01_EndPanelAnimation = 0x80240BF4; // type:func rom:0xE13354 +mgm_01_UpdateRecords = 0x80240C54; // type:func rom:0xE133B4 +mgm_01_GiveCoinReward = 0x80240CD0; // type:func rom:0xE13430 +mgm_01_DoubleScore = 0x80240D84; // type:func rom:0xE134E4 +mgm_01_EndBowserPanelAnimation = 0x80240DB8; // type:func rom:0xE13518 +mgm_01_GetPanelPos = 0x80240ECC; // type:func rom:0xE1362C +mgm_01_DestroyBlockEntities = 0x80240F90; // type:func rom:0xE136F0 +mgm_01_OnBreakBlock = 0x80241090; // type:func rom:0xE137F0 +mgm_01_CreateBlockEntities = 0x80241234; // type:func rom:0xE13994 +mgm_01_TakeCoinCost = 0x80241510; // type:func rom:0xE13C70 +mgm_01_InitializePanels = 0x80241574; // type:func rom:0xE13CD4 +mgm_01_CreateMinigame = 0x802415EC; // type:func rom:0xE13D4C +mgm_01_DestroyMinigame = 0x80241690; // type:func rom:0xE13DF0 +mgm_01_GetCoinCount = 0x802416CC; // type:func rom:0xE13E2C +mgm_01_SetMsgVars_BlocksRemaining = 0x802416F8; // type:func rom:0xE13E58 +mgm_01_HideCoinCounter = 0x80241760; // type:func rom:0xE13EC0 +mgm_01_SetMsgImgs_Panels = 0x80241780; // type:func rom:0xE13EE0 +mgm_01_BlockPosX = 0x80241AC8; // type:data rom:0xE14228 +mgm_01_BlockPosY = 0x80241AD4; // type:data rom:0xE14234 +mgm_01_BlockPosZ = 0x80241AE0; // type:data rom:0xE14240 +mgm_01_TallyPosX = 0x80241AEC; // type:data rom:0xE1424C +mgm_01_TallyPosY = 0x80241B18; // type:data rom:0xE14278 +mgm_01_PanelModelIDs = 0x80241B44; // type:data rom:0xE142A4 +mgm_01_PanelTypes = 0x80241B70; // type:data rom:0xE142D0 +mgm_01_InitialConfigurations = 0x80241B9C; // type:data rom:0xE142FC +mgm_01_MsgImgs_Panels = 0x80243560; // type:data rom:0xE15CC0 D_802435B0_E15D10 = 0x802435B0; // type:data rom:0xE15D10 D_802435B8_E15D18 = 0x802435B8; // type:data rom:0xE15D18 D_802435C0_E15D20 = 0x802435C0; // type:data rom:0xE15D20 @@ -18592,33 +18592,33 @@ D_802435D0_E15D30 = 0x802435D0; // type:data rom:0xE15D30 D_802435D8_E15D38 = 0x802435D8; // type:data rom:0xE15D38 D_802435E0_E15D40 = 0x802435E0; // type:data rom:0xE15D40 D_802435E8_E15D48 = 0x802435E8; // type:data rom:0xE15D48 -func_80240000_E15D80 = 0x80240000; // type:func rom:0xE15D80 -func_80240430_E161B0 = 0x80240430; // type:func rom:0xE161B0 -func_80240468_E161E8 = 0x80240468; // type:func rom:0xE161E8 -func_80240544_E162C4 = 0x80240544; // type:func rom:0xE162C4 -func_80240580_E16300 = 0x80240580; // type:func rom:0xE16300 -func_802405A4_E16324 = 0x802405A4; // type:func rom:0xE16324 -func_802405D0_E16350 = 0x802405D0; // type:func rom:0xE16350 -func_80240644_E163C4 = 0x80240644; // type:func rom:0xE163C4 -func_80240790_E16510 = 0x80240790; // type:func rom:0xE16510 -func_80240BB0_E16930 = 0x80240BB0; // type:func rom:0xE16930 -func_80241DCC_E17B4C = 0x80241DCC; // type:func rom:0xE17B4C -func_80241F38_E17CB8 = 0x80241F38; // type:func rom:0xE17CB8 -func_80241FE4_E17D64 = 0x80241FE4; // type:func rom:0xE17D64 -func_80242274_E17FF4 = 0x80242274; // type:func rom:0xE17FF4 -func_802422D0_E18050 = 0x802422D0; // type:func rom:0xE18050 -func_80242314_E18094 = 0x80242314; // type:func rom:0xE18094 -func_80242340_E180C0 = 0x80242340; // type:func rom:0xE180C0 -func_802423A4_E18124 = 0x802423A4; // type:func rom:0xE18124 -func_802423D0_E18150 = 0x802423D0; // type:func rom:0xE18150 -D_8024273C_E184BC = 0x8024273C; // type:data rom:0xE184BC -D_802428E0_E18660 = 0x802428E0; // type:data rom:0xE18660 -D_8024296C_E186EC = 0x8024296C; // type:data rom:0xE186EC -D_802429F8_E18778 = 0x802429F8; // type:data rom:0xE18778 +mgm_02_draw_score_display = 0x80240000; // type:func rom:0xE15D80 +mgm_02_work_draw_score = 0x80240430; // type:func rom:0xE161B0 +mgm_02_CreateScoreDisplay = 0x80240468; // type:func rom:0xE161E8 +mgm_02_DisableMenus = 0x80240544; // type:func rom:0xE162C4 +mgm_02_EnableMenus = 0x80240580; // type:func rom:0xE16300 +mgm_02_DestroySignpost = 0x802405A4; // type:func rom:0xE16324 +mgm_02_CreateSignpost = 0x802405D0; // type:func rom:0xE16350 +mgm_02_OnHitBox = 0x80240644; // type:func rom:0xE163C4 +mgm_02_SetBoxContents = 0x80240790; // type:func rom:0xE16510 +mgm_02_RunMinigame = 0x80240BB0; // type:func rom:0xE16930 +mgm_02_UpdateRecords = 0x80241DCC; // type:func rom:0xE17B4C +mgm_02_GiveCoinReward = 0x80241F38; // type:func rom:0xE17CB8 +mgm_02_CleanupGame = 0x80241FE4; // type:func rom:0xE17D64 +mgm_02_CreateMinigame = 0x80242274; // type:func rom:0xE17FF4 +mgm_02_DestroyMinigame = 0x802422D0; // type:func rom:0xE18050 +mgm_02_GetCoinCount = 0x80242314; // type:func rom:0xE18094 +mgm_02_TakeCoinCost = 0x80242340; // type:func rom:0xE180C0 +mgm_02_HideCoinCounter = 0x802423A4; // type:func rom:0xE18124 +mgm_02_SetMsgImgs_Panel = 0x802423D0; // type:func rom:0xE18150 +mgm_02_InitialConfigurations = 0x8024273C; // type:data rom:0xE184BC +mgm_02_BoxModelIDs = 0x802428E0; // type:data rom:0xE18660 +mgm_02_BoxColliderIDs = 0x8024296C; // type:data rom:0xE186EC +mgm_02_PanelModelIDs = 0x802429F8; // type:data rom:0xE18778 D_80242A3C_E187BC = 0x80242A3C; // type:data rom:0xE187BC -D_802482A0_E1E020 = 0x802482A0; // type:data rom:0xE1E020 -D_802484A0_E1E220 = 0x802484A0; // type:data rom:0xE1E220 -D_802484C0_E1E240 = 0x802484C0; // type:data rom:0xE1E240 +mgm_02_PeachPanelImg = 0x802482A0; // type:data rom:0xE1E020 +mgm_02_PeachPanelPal = 0x802484A0; // type:data rom:0xE1E220 +mgm_02_MsgImg_PeachPanel = 0x802484C0; // type:data rom:0xE1E240 D_802484E0_E1E260 = 0x802484E0; // type:data rom:0xE1E260 gv_01_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xE1E460 gv_01_GetCurrentFloor = 0x80240020; // type:func rom:0xE1E480 @@ -20685,33 +20685,33 @@ D_8029F258 = 0x8029F258; // type:data D_8029F25C = 0x8029F25C; // type:data D_8029F260 = 0x8029F260; // type:data D_8029F264 = 0x8029F264; // type:data -D_8029F270 = 0x8029F270; // type:data -D_8029F274 = 0x8029F274; // type:data -D_8029F278 = 0x8029F278; // type:data -D_8029F27C = 0x8029F27C; // type:data -D_8029F27E = 0x8029F27E; // type:data -D_8029F280 = 0x8029F280; // type:data -D_8029F282 = 0x8029F282; // type:data -D_8029F284 = 0x8029F284; // type:data -D_8029F286 = 0x8029F286; // type:data +BattleCam_PosX = 0x8029F270; // type:data +BattleCam_PosY = 0x8029F274; // type:data +BattleCam_PosZ = 0x8029F278; // type:data +BattleCam_TargetActor = 0x8029F27C; // type:data +BattleCam_TargetActorPart = 0x8029F27E; // type:data +BattleCam_BoomLength = 0x8029F280; // type:data +BattleCam_BoomYaw = 0x8029F282; // type:data +BattleCam_BoomPitch = 0x8029F284; // type:data +BattleCam_BoomZOffset = 0x8029F286; // type:data D_8029F288 = 0x8029F288; // type:data -D_8029F28C = 0x8029F28C; // type:data -D_8029F290 = 0x8029F290; // type:data -D_8029F294 = 0x8029F294; // type:data -D_8029F298 = 0x8029F298; // type:data -D_8029F29C = 0x8029F29C; // type:data -D_8029F29E = 0x8029F29E; // type:data -D_8029F2A0 = 0x8029F2A0; // type:data +BattleCam_TargetBoomLength = 0x8029F28C; // type:data +BattleCam_TargetBoomYaw = 0x8029F290; // type:data +BattleCam_TargetBoomPitch = 0x8029F294; // type:data +BattleCam_TargetBoomZOffset = 0x8029F298; // type:data +BattleCam_DoneMoving = 0x8029F29C; // type:data +BattleCam_MoveTimeLeft = 0x8029F29E; // type:data +BattleCam_MoveTimeTotal = 0x8029F2A0; // type:data D_8029F2A2 = 0x8029F2A2; // type:data D_8029F2A3 = 0x8029F2A3; // type:data D_8029F2A4 = 0x8029F2A4; // type:data -D_8029F2A5 = 0x8029F2A5; // type:data +BattleCam_UseLinearInterp = 0x8029F2A5; // type:data D_8029F2A6 = 0x8029F2A6; // type:data D_8029F2A7 = 0x8029F2A7; // type:data -D_8029F2A8 = 0x8029F2A8; // type:data -D_8029F2AC = 0x8029F2AC; // type:data -D_8029F2B0 = 0x8029F2B0; // type:data -D_8029F2B4 = 0x8029F2B4; // type:data +BattleCam_TargetPosX = 0x8029F2A8; // type:data +BattleCam_TargetPosY = 0x8029F2AC; // type:data +BattleCam_TargetPosZ = 0x8029F2B0; // type:data +BattleCam_ControlScript = 0x8029F2B4; // type:data popupMessages = 0x8029F2C0; // type:data D_8029F640 = 0x8029F640; // type:data D_8029F642 = 0x8029F642; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index fb62cf9e11..6a7020afca 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -809,33 +809,33 @@ D_8029F258 = 0x8029F258; D_8029F25C = 0x8029F25C; D_8029F260 = 0x8029F260; D_8029F264 = 0x8029F264; -D_8029F270 = 0x8029F270; -D_8029F274 = 0x8029F274; -D_8029F278 = 0x8029F278; -D_8029F27C = 0x8029F27C; -D_8029F27E = 0x8029F27E; -D_8029F280 = 0x8029F280; -D_8029F282 = 0x8029F282; -D_8029F284 = 0x8029F284; -D_8029F286 = 0x8029F286; +BattleCam_PosX = 0x8029F270; +BattleCam_PosY = 0x8029F274; +BattleCam_PosZ = 0x8029F278; +BattleCam_TargetActor = 0x8029F27C; +BattleCam_TargetActorPart = 0x8029F27E; +BattleCam_BoomLength = 0x8029F280; +BattleCam_BoomYaw = 0x8029F282; +BattleCam_BoomPitch = 0x8029F284; +BattleCam_BoomZOffset = 0x8029F286; D_8029F288 = 0x8029F288; -D_8029F28C = 0x8029F28C; -D_8029F290 = 0x8029F290; -D_8029F294 = 0x8029F294; -D_8029F298 = 0x8029F298; -D_8029F29C = 0x8029F29C; -D_8029F29E = 0x8029F29E; -D_8029F2A0 = 0x8029F2A0; +BattleCam_TargetBoomLength = 0x8029F28C; +BattleCam_TargetBoomYaw = 0x8029F290; +BattleCam_TargetBoomPitch = 0x8029F294; +BattleCam_TargetBoomZOffset = 0x8029F298; +BattleCam_DoneMoving = 0x8029F29C; +BattleCam_MoveTimeLeft = 0x8029F29E; +BattleCam_MoveTimeTotal = 0x8029F2A0; D_8029F2A2 = 0x8029F2A2; D_8029F2A3 = 0x8029F2A3; D_8029F2A4 = 0x8029F2A4; -D_8029F2A5 = 0x8029F2A5; +BattleCam_UseLinearInterp = 0x8029F2A5; D_8029F2A6 = 0x8029F2A6; D_8029F2A7 = 0x8029F2A7; -D_8029F2A8 = 0x8029F2A8; -D_8029F2AC = 0x8029F2AC; -D_8029F2B0 = 0x8029F2B0; -D_8029F2B4 = 0x8029F2B4; +BattleCam_TargetPosX = 0x8029F2A8; +BattleCam_TargetPosY = 0x8029F2AC; +BattleCam_TargetPosZ = 0x8029F2B0; +BattleCam_ControlScript = 0x8029F2B4; popupMessages = 0x8029F2C0; D_8029F640 = 0x8029F640; D_8029F642 = 0x8029F642; @@ -1196,3 +1196,16 @@ some_80241FBC = 0x80241FBC; D_80246558_kkj_19 = 0x80246558; D_80077A40 = 0x80077A40; + +// mgm_01 scripts (unsplit in E141D0.data.s) +D_80242310 = 0x80242310; +D_80242330 = 0x80242330; +D_80242350 = 0x80242350; +D_80242370 = 0x80242370; +D_80242390 = 0x80242390; +D_802423B0 = 0x802423B0; +D_802423D0 = 0x802423D0; +D_802423F0 = 0x802423F0; +D_80242410 = 0x80242410; +D_80242430 = 0x80242430; +D_80242450 = 0x80242450;