diff --git a/include/common.h b/include/common.h index 1286a2ee89..64fcdbbe28 100644 --- a/include/common.h +++ b/include/common.h @@ -2,6 +2,7 @@ #define _COMMON_H_ #include "ultra64.h" +#include "gbi_custom.h" #include "types.h" #include "common_structs.h" #include "functions.h" diff --git a/include/common_structs.h b/include/common_structs.h index eb39b4fd2e..b0475aba15 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -388,8 +388,7 @@ typedef struct Entity { /* 0x54 */ Vec3f scale; /* 0x60 */ Vec3f rotation; /* 0x6C */ f32 shadowPosY; - /* 0x70 */ Matrix4f* inverseTransformMatrix; /* world-to-local */ - /* 0x74 */ char unk_74[60]; + /* 0x70 */ Matrix4f inverseTransformMatrix; /* world-to-local */ /* 0xB0 */ float effectiveSize; /* 0xB4 */ char unk_B4[4]; /* 0xB8 */ Mtx transformMatrix; @@ -421,7 +420,7 @@ typedef struct StaticEntityData { typedef struct MusicSettings { /* 0x00 */ u16 flags; - /* 0x02 */ u16 unk_02; + /* 0x02 */ s16 unk_02; /* 0x04 */ s32 fadeOutTime; /* 0x08 */ s32 fadeInTime; /* 0x0C */ s16 unk_0C; @@ -558,9 +557,9 @@ typedef struct Camera { /* 0x03A */ char unk_3A[2]; /* 0x03C */ Vec3f lookAt_eye; /* 0x048 */ Vec3f lookAt_obj; - /* 0x054 */ f32 unk_54; - /* 0x058 */ f32 unk_58; - /* 0x05C */ f32 unk_5C; + /* 0x054 */ f32 unk_54; // x-related + /* 0x058 */ f32 unk_58; // y-related + /* 0x05C */ f32 unk_5C; // z-related /* 0x060 */ Vec3f targetPos; /* 0x06C */ f32 currentYaw; /* 0x070 */ f32 unk_70; @@ -1502,8 +1501,8 @@ typedef struct ShopOwner { } ShopOwner; typedef struct ShopItemLocation { - /* 0x0 */ s16 posModelID; - /* 0x2 */ s16 triggerColliderID; + /* 0x0 */ u16 posModelID; + /* 0x2 */ u16 triggerColliderID; } ShopItemLocation; // size = 0x4 typedef struct StaticInventoryItem { @@ -1560,7 +1559,7 @@ typedef struct Shop { typedef struct Encounter { /* 0x00 */ s32 count; /* 0x04 */ struct Enemy* enemy[16]; - /* 0x44 */ u16 battle; + /* 0x44 */ s16 battle; /* 0x46 */ s16 stage; /* 0x48 */ s16 encounterID; /* 0x4A */ char unk_4C[0x12]; @@ -1873,7 +1872,10 @@ typedef struct EncounterStatus { /* 0x094 */ s32 unk_94; /* 0x098 */ s32 fadeOutAccel; /* 0x09C */ s32 battleStartCountdown; - /* 0x0A0 */ char unk_A0[16]; + /* 0x0A0 */ s8 unk_A0; + /* 0x0A1 */ char unk_A1[0x1]; + /* 0x0A2 */ s16 unk_A2; + /* 0x0A4 */ char unk_A4[0xC]; /* 0x0B0 */ s32 defeatFlags[60][12]; /* 0xFB0 */ s16 recentMaps[2]; /* 0xFB4 */ char unk_FB4[4]; @@ -1938,10 +1940,15 @@ typedef struct PauseMapSpace { } PauseMapSpace; // size = 0x14 typedef struct MenuPanel { - /* 0x00 */ u8 initialized; //? - /* 0x01 */ s8 col; - /* 0x02 */ s8 row; - /* 0x03 */ u8 selected; // usually set to the current value from gridData + /* 0x00 */ union { + /* */ s32 s; + /* */ struct { + /* 0x00 */ u8 initialized; + /* 0x01 */ s8 col; + /* 0x02 */ s8 row; + /* 0x03 */ u8 selected; // usually set to the current value from gridData + /* */ } c; + /* */ } unk_00; /* 0x04 */ s8 page; // filemenu: 0 = select, 1 = delete, 3 = copy from, 4 = copy to, all else = save /* 0x05 */ s8 numCols; /* 0x06 */ s8 numRows; @@ -2269,4 +2276,32 @@ typedef struct struct8015A578 { /* 0x08 */ f32 unk_08; } struct8015A578; // size = 0x0C +typedef struct SaveMetadata { + /* 0x00 */ s32 unk_00; + /* 0x04 */ u8 unk_04; + /* 0x05 */ char unk_05[0x1]; + /* 0x06 */ s8 unk_06; + /* 0x07 */ s8 unk_07[8]; + /* 0x0F */ char unk_0F[0x1]; + /* 0x10 */ s32 unk_10; + /* 0x14 */ s32 unk_14; +} SaveMetadata; // size = 0x18 + +typedef struct SpriteShadingLightSource { + /* 0x00 */ s8 flags; + /* 0x01 */ s8 rgb[3]; + /* 0x04 */ Vec3f pos; + /* 0x10 */ f32 falloff; + /* 0x14 */ s8 unk_14; + /* 0x15 */ char unk_15[0x3]; +} SpriteShadingLightSource; // size = 0x18 + +typedef struct SpriteShadingProfile { + /* 0x00 */ s16 flags; + /* 0x02 */ char unk_02[0x2]; + /* 0x04 */ SpriteShadingLightSource sources[7]; + /* 0xAC */ s8 ambientColor[3]; + /* 0xAF */ s8 ambientPower; // ? +} SpriteShadingProfile; // size = 0xB0 + #endif diff --git a/include/enums.h b/include/enums.h index 58c714de23..0aaec6c464 100644 --- a/include/enums.h +++ b/include/enums.h @@ -480,18 +480,18 @@ enum Easings { }; enum SoundIDs { - SOUND_UNKNOWN_0 = 0x00000000, + SOUND_0 = 0x00000000, SOUND_MENU_BADGE_EQUIP = 0x00000005, SOUND_MENU_BADGE_UNEQUIP = 0x00000006, - SOUND_UNKNOWN_D = 0x0000000D, - SOUND_UNKNOWN_E = 0x0000000E, - SOUND_UNKNOWN_43 = 0x00000043, + SOUND_D = 0x0000000D, + SOUND_E = 0x0000000E, + SOUND_43 = 0x00000043, SOUND_JR_TROOPA_SPLASH = 0x00000045, SOUND_JR_TROOPA_SWIM = 0x00000046, SOUND_BOO_SPOOK = 0x00000047, - SOUND_UNKNOWN_52 = 0x00000052, - SOUND_UNKNOWN_A2 = 0x000000A2, - SOUND_UNKNOWN_B4 = 0x000000B4, + SOUND_52 = 0x00000052, + SOUND_A2 = 0x000000A2, + SOUND_B4 = 0x000000B4, SOUND_BOO_VANISH = 0x000000C1, SOUND_BOO_APPEAR = 0x000000C3, SOUND_MENU_OPEN = 0x000000C5, @@ -516,12 +516,12 @@ enum SoundIDs { SOUND_LAND = 0x0000014B, SOUND_HIT_BLOCK = 0x0000014E, SOUND_SEARCH_BUSH = 0x00000153, - SOUND_UNKNOWN_162 = 0x00000162, + SOUND_162 = 0x00000162, SOUND_SMASH_GOOMNUT_TREE = 0x00000165, - SOUND_UNKNOWN_167 = 0x00000167, - SOUND_UNKNOWN_172 = 0x00000172, - SOUND_UNKNOWN_17B = 0x0000017B, - SOUND_UNKNOWN_194 = 0x00000194, + SOUND_167 = 0x00000167, + SOUND_172 = 0x00000172, + SOUND_17B = 0x0000017B, + SOUND_194 = 0x00000194, SOUND_BASIC_DOOR_OPEN = 0x000001C1, SOUND_BASIC_DOOR_CLOSE = 0x000001C2, SOUND_METAL_DOOR_OPEN = 0x000001C3, @@ -532,49 +532,51 @@ enum SoundIDs { SOUND_CREAKY_DOOR_CLOSE = 0x000001C8, SOUND_METAL_GATE_OPEN = 0x000001C9, SOUND_METAL_GATE_CLOSE = 0x000001CA, + SOUND_1CB = 0x000001CB, + SOUND_1CC = 0x000001CC, SOUND_MENU_BADGE_ERROR = 0x0000021D, - SOUND_UNKNOWN_231 = 0x00000231, - SOUND_UNKNOWN_246 = 0x00000246, - SOUND_UNKNOWN_259 = 0x00000259, - SOUND_UNKNOWN_25A = 0x0000025A, - SOUND_UNKNOWN_25C = 0x0000025C, - SOUND_UNKNOWN_25D = 0x0000025D, - SOUND_UNKNOWN_262 = 0x00000262, - SOUND_UNKNOWN_282 = 0x00000282, + SOUND_231 = 0x00000231, + SOUND_246 = 0x00000246, + SOUND_259 = 0x00000259, + SOUND_25A = 0x0000025A, + SOUND_25C = 0x0000025C, + SOUND_25D = 0x0000025D, + SOUND_262 = 0x00000262, + SOUND_282 = 0x00000282, SOUND_BOW_SPOOK = 0x00000291, - SOUND_UNKNOWN_295 = 0x00000295, + SOUND_295 = 0x00000295, SOUND_UNUSED_2C1 = 0x000002C1, SOUND_SMOKE_BURST = 0x000002CD, SOUND_DAYZEE_SONG = 0x000002D7, SOUND_POWER_UP = 0x000002D8, - SOUND_UNKNOWN_2F1 = 0x000002F1, - SOUND_UNKNOWN_2F6 = 0x000002F6, - SOUND_UNKNOWN_2F7 = 0x000002F7, + SOUND_2F1 = 0x000002F1, + SOUND_2F6 = 0x000002F6, + SOUND_2F7 = 0x000002F7, SOUND_CLOSE_SHELL = 0x000002FF, SOUND_SHY_GUY_SCREAMS1 = 0x0000030C, SOUND_SHY_GUY_SCREAMS2 = 0x0000030D, SOUND_SHY_GUY_SCREAMS3 = 0x0000030E, SOUND_TOY_TANK_MOVE1 = 0x0000030F, SOUND_TOY_TANK_MOVE2 = 0x00000310, - SOUND_UNKNOWN_315 = 0x00000315, + SOUND_315 = 0x00000315, SOUND_MOLE_SURFACE = 0x00000321, SOUND_MOLE_DIG = 0x00000322, SOUND_MOLE_POP = 0x00000323, - SOUND_UNKNOWN_32E = 0x0000032E, - SOUND_UNKNOWN_359 = 0x00000359, - SOUND_UNKNOWN_361 = 0x00000361, - SOUND_UNKNOWN_362 = 0x00000362, - SOUND_UNKNOWN_363 = 0x00000363, - SOUND_UNKNOWN_364 = 0x00000364, - SOUND_UNKNOWN_365 = 0x00000365, - SOUND_UNKNOWN_366 = 0x00000366, - SOUND_UNKNOWN_367 = 0x00000367, - SOUND_UNKNOWN_368 = 0x00000368, - SOUND_UNKNOWN_369 = 0x00000369, - SOUND_UNKNOWN_375 = 0x00000375, - SOUND_UNKNOWN_376 = 0x00000376, - SOUND_UNKNOWN_377 = 0x00000377, - SOUND_UNKNOWN_379 = 0x00000379, + SOUND_32E = 0x0000032E, + SOUND_359 = 0x00000359, + SOUND_361 = 0x00000361, + SOUND_362 = 0x00000362, + SOUND_363 = 0x00000363, + SOUND_364 = 0x00000364, + SOUND_365 = 0x00000365, + SOUND_366 = 0x00000366, + SOUND_367 = 0x00000367, + SOUND_368 = 0x00000368, + SOUND_369 = 0x00000369, + SOUND_375 = 0x00000375, + SOUND_376 = 0x00000376, + SOUND_377 = 0x00000377, + SOUND_379 = 0x00000379, SOUND_37A = 0x0000037A, SOUND_ELECTRIC = 0x0000037B, SOUND_GENERAL_WHISTLE = 0x00000395, @@ -584,42 +586,48 @@ enum SoundIDs { SOUND_DEATH = 0x000003E5, SOUND_BIG_POWER_UP = 0x000003E6, SOUND_MOLE_THROW = 0x000003E8, - SOUND_UNKNOWN_3F3 = 0x000003F3, + SOUND_3F3 = 0x000003F3, SOUND_THROW = 0x000003FA, - SOUND_UNKNOWN_759 = 0x00000759, - SOUND_UNKNOWN_2003 = 0x00002003, - SOUND_UNKNOWN_200D = 0x0000200D, + SOUND_759 = 0x00000759, + SOUND_2003 = 0x00002003, + SOUND_200D = 0x0000200D, SOUND_BOW_VANISH = 0x0000200E, SOUND_BOW_APPEAR = 0x0000200F, - SOUND_UNKNOWN_2010 = 0x00002010, + SOUND_2010 = 0x00002010, SOUND_CANNON1 = 0x00002016, SOUND_CANNON2 = 0x00002017, SOUND_CANNON3 = 0x00002018, - SOUND_UNKNOWN_202C = 0x0000202C, - SOUND_UNKNOWN_202D = 0x0000202D, - SOUND_UNKNOWN_202E = 0x0000202E, - SOUND_UNKNOWN_202F = 0x0000202F, - SOUND_UNKNOWN_2030 = 0x00002030, + SOUND_202C = 0x0000202C, + SOUND_202D = 0x0000202D, + SOUND_202E = 0x0000202E, + SOUND_202F = 0x0000202F, + SOUND_2030 = 0x00002030, SOUND_INFLICT_SLEEP = 0x00002031, SOUND_INFLICT_STATUS = 0x00002032, //< Stop, poison, paralyze - SOUND_UNKNOWN_2038 = 0x00002038, - SOUND_UNKNOWN_2039 = 0x00002039, + SOUND_2038 = 0x00002038, + SOUND_2039 = 0x00002039, SOUND_BOMB_BLAST = 0x00002076, SOUND_JUMP_2081 = 0x00002081, SOUND_JUMP_8BIT_MARIO = 0x00002082, - SOUND_UNKNOWN_208C = 0x0000208C, - SOUND_UNKNOWN_208D = 0x0000208D, - SOUND_UNKNOWN_208E = 0x0000208E, - SOUND_UNKNOWN_208F = 0x0000208F, - SOUND_UNKNOWN_2095 = 0x00002095, + SOUND_208C = 0x0000208C, + SOUND_208D = 0x0000208D, + SOUND_208E = 0x0000208E, + SOUND_208F = 0x0000208F, + SOUND_2095 = 0x00002095, + SOUND_20A3 = 0x000020A3, + SOUND_20A4 = 0x000020A4, SOUND_SPELL_CAST1 = 0x000020D4, SOUND_SPELL_CAST2 = 0x000020D5, SOUND_SPELL_CAST3 = 0x000020D6, SOUND_SPELL_CAST4 = 0x000020D7, SOUND_SPELL_CAST5 = 0x000020D8, - SOUND_UNKNOWN_20F6 = 0x000020F6, - SOUND_UNKNOWN_2106 = 0x00002106, - SOUND_UNKNOWN_2107 = 0x00002107, + SOUND_20F6 = 0x000020F6, + SOUND_2106 = 0x00002106, + SOUND_2107 = 0x00002107, + SOUND_2111 = 0x00002111, + SOUND_2112 = 0x00002112, + SOUND_2113 = 0x00002113, + SOUND_2114 = 0x00002114, }; enum Cams { @@ -2965,14 +2973,25 @@ enum MsgWindowStates { }; enum FoldStateFlags { - FOLD_STATE_FLAGS_0 = 0x00000000, - FOLD_STATE_FLAGS_1 = 0x00000001, - FOLD_STATE_FLAGS_80 = 0x00000080, - FOLD_STATE_FLAGS_100 = 0x00000100, - FOLD_STATE_FLAGS_800 = 0x00000800, - FOLD_STATE_FLAGS_1000 = 0x00001000, - FOLD_STATE_FLAGS_4000 = 0x00004000, - FOLD_STATE_FLAGS_20000 = 0x00020000, + FOLD_STATE_FLAG_ENABLED = 0x00000001, + FOLD_STATE_FLAG_G_CULL_BACK = 0x00000002, + FOLD_STATE_FLAG_G_CULL_FRONT = 0x00000004, + FOLD_STATE_FLAG_10 = 0x00000010, + FOLD_STATE_FLAG_20 = 0x00000020, + FOLD_STATE_FLAG_40 = 0x00000040, + FOLD_STATE_FLAG_80 = 0x00000080, + FOLD_STATE_FLAG_100 = 0x00000100, + FOLD_STATE_FLAG_200 = 0x00000200, + FOLD_STATE_FLAG_400 = 0x00000400, + FOLD_STATE_FLAG_800 = 0x00000800, + FOLD_STATE_FLAG_1000 = 0x00001000, + FOLD_STATE_FLAG_2000 = 0x00002000, + FOLD_STATE_FLAG_4000 = 0x00004000, + FOLD_STATE_FLAG_8000 = 0x00008000, + FOLD_STATE_FLAG_10000 = 0x00010000, + FOLD_STATE_FLAG_20000 = 0x00020000, + FOLD_STATE_FLAG_80000 = 0x00080000, + FOLD_STATE_FLAG_100000 = 0x00100000, }; #endif diff --git a/include/functions.h b/include/functions.h index eb0175afa4..83fa64bb74 100644 --- a/include/functions.h +++ b/include/functions.h @@ -47,7 +47,6 @@ void gravity_use_fall_parms(void); f32 get_clamped_angle_diff(f32, f32); s32 intro_logos_fade_out(s16 addAlpha); -void _render_transition_stencil(s32, f32, s32); u32 get_entity_type(s32 arg0); Entity* get_entity_by_index(s32 index); s32 create_entity(StaticEntityData*, s32, s32, s32, s32, ...); @@ -77,6 +76,11 @@ void setup_pause_menu_tab(MenuWindowBP* bpArray, s32 arraySize); s32 draw_ci_image_with_clipping(s32* raster, s32 width, s32 height, s32 fmt, s32 bitDepth, s32* palette, s16 posX, s16 posY, u16 clipULx, u16 clipULy, u16 clipLRx, u16 clipRLy, u8 opacity); +// file menu stuff +void filemenu_set_cursor_goal_pos(s32 windowIndex, s32 posX, s32 posY); +s8* filemenu_get_menu_message(s32 idx); +void filemenu_draw_message(s8*, s32 posX, s32 posY, s32 alpha, s32 color, s32 flags); + // append gfx funcs void func_80257B28(s32); void func_8025595C(Actor*); @@ -95,7 +99,13 @@ s32 can_trigger_loading_zone(void); void func_802667F0(s32, Actor*, f32, f32, f32); void* general_heap_malloc(s32 size); -s32 general_heap_free(s32* data); +s32 general_heap_free(void* data); + +s32 integer_log(s32 number, u32 base); + +void set_battle_formation(s32); +void set_battle_stage(s32); +void load_battle(s32); void entity_Shadow_init(Shadow* entity); void entity_SaveBlock_idle(Entity* entity); @@ -292,10 +302,10 @@ void set_animation_rate(s32 actorID, s32 partIndex, f32 rate); void func_8011B7C0(u16, s32, s32); ModelAnimator* get_animator_by_index(s32 arg0); void set_screen_overlay_params_front(u8, f32); -void set_screen_overlay_params_back(s32, f32); +void set_screen_overlay_params_back(u8, f32); void set_screen_overlay_alpha(s32, f32); -void get_screen_overlay_params(s32, f32*, f32*); -s32 set_screen_overlay_color(s32, u8, u8, u8); +void get_screen_overlay_params(s32, u8*, f32*); +void set_screen_overlay_color(s32, u8, u8, u8); void set_screen_overlay_center(s32, s32, s32, s32); s32 rand_int(s32); void sort_items(void); @@ -407,6 +417,7 @@ void add_xz_vec3f(Vec3f* vector, f32 speed, f32 angleDeg); void play_movement_dust_effects(s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angleDeg); void func_80138D88(s32, s32, s32, s32, f32); +void func_8013A4D0(void); void btl_cam_set_target_pos(f32, f32, f32); void deduct_current_move_fp(void); @@ -526,7 +537,7 @@ void* load_asset_by_name(const char* assetName, u32* decompressedSize); void mdl_draw_hidden_panel_surface(Gfx** arg0, u16 treeIndex); s32 func_8011CFBC(void); -s32 set_screen_overlay_center_worldpos(void); +void set_screen_overlay_center_worldpos(s32 idx, s32 posIdx, s32 x, s32 y, s32 z); s32 mdl_get_next_texture_address(s32); void draw_msg(s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, u8 style); void get_background_color_blend(u8* r, u8* g, u8* b, u8* a); diff --git a/include/gbi_custom.h b/include/gbi_custom.h new file mode 100644 index 0000000000..58e353de72 --- /dev/null +++ b/include/gbi_custom.h @@ -0,0 +1,66 @@ +#ifndef _GBI_CUSTOM_H_ +#define _GBI_CUSTOM_H_ + +#include "ultra64.h" + +#define gDPScrollMultiTile2_4b(pkt, timg, fmt, width, height, \ + uls, ult, lrs, lrt, pal, \ + cms, cmt, masks, maskt, shifts, shiftt,\ + scrolls, scrollt) \ +{ \ + gDPSetTextureImage(pkt, fmt, G_IM_SIZ_8b, ((width)>>1), timg); \ + gDPSetTile(pkt, fmt, G_IM_SIZ_8b, \ + (((((lrs)-(uls)+1)>>1)+7)>>3), 0, \ + G_TX_LOADTILE, 0 , cmt, maskt, shiftt, cms, masks, \ + shifts); \ + gDPLoadSync(pkt); \ + gDPLoadTile( pkt, G_TX_LOADTILE, \ + (uls)<<(G_TEXTURE_IMAGE_FRAC-1), \ + (ult)<<(G_TEXTURE_IMAGE_FRAC), \ + (lrs)<<(G_TEXTURE_IMAGE_FRAC-1), \ + (lrt)<<(G_TEXTURE_IMAGE_FRAC)); \ + gDPPipeSync(pkt); \ + gDPSetTile(pkt, fmt, G_IM_SIZ_4b, \ + (((((lrs)-(uls)+1)>>1)+7)>>3), 0, \ + G_TX_RENDERTILE + 1, 0, cmt, maskt, shiftt, cms, masks, \ + shifts); \ + gDPSetTileSize(pkt, G_TX_RENDERTILE + 1, \ + (uls + scrolls)<>1)+7)>>3), 0, \ + G_TX_RENDERTILE + 0, 1, cmt, maskt, shiftt, cms, masks, \ + shifts); \ +} + + +#define gDPScrollTextureTile_4b(pkt, timg, fmt, width, height, \ + uls, ult, lrs, lrt, pal, \ + cms, cmt, masks, maskt, shifts, shiftt, \ + scrolls, scrollt) \ + \ + gDPSetTextureImage(pkt, fmt, G_IM_SIZ_8b, ((width)>>1), timg); \ + gDPSetTile(pkt, fmt, G_IM_SIZ_8b, \ + (((((lrs)-(uls)+1)>>1)+7)>>3), 0, \ + G_TX_LOADTILE, 0 , cmt, maskt, shiftt, cms, masks, \ + shifts); \ + gDPLoadSync(pkt); \ + gDPLoadTile( pkt, G_TX_LOADTILE, \ + (uls)<<(G_TEXTURE_IMAGE_FRAC-1), \ + (ult)<<(G_TEXTURE_IMAGE_FRAC), \ + (lrs)<<(G_TEXTURE_IMAGE_FRAC-1), \ + (lrt)<<(G_TEXTURE_IMAGE_FRAC)); \ + gDPPipeSync(pkt); \ + gDPSetTile(pkt, fmt, G_IM_SIZ_4b, \ + (((((lrs)-(uls)+1)>>1)+7)>>3), 0, \ + G_TX_RENDERTILE, 0, cmt, maskt, shiftt, cms, masks, \ + shifts); \ + gDPSetTileSize(pkt, G_TX_RENDERTILE, \ + (uls + scrolls)<col = col; - menu->row = row; - menu->selected = menu->gridData[(menu->page * menu->numCols * menu->numRows) + - (menu->numCols * (s8) row) + menu->col]; + menu->unk_00.c.col = col; + menu->unk_00.c.row = row; + menu->unk_00.c.selected = menu->gridData[(menu->page * menu->numCols * menu->numRows) + + (menu->numCols * menu->unk_00.c.row) + menu->unk_00.c.col]; } void filemenu_set_cursor_alpha(s32 arg0) { diff --git a/src/165490.c b/src/165490.c index 663656f336..04ecf21959 100644 --- a/src/165490.c +++ b/src/165490.c @@ -2,7 +2,53 @@ #include "filemenu.h" #include "hud_element.h" -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_title); +extern SaveMetadata D_800779C4[4]; +extern u8 D_80077A24[4]; +extern s8* D_80249E20[14]; +extern MenuWindowBP D_80249EA0[14]; +extern s8 D_8024C098; + +void filemenu_draw_contents_title( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + s32 msgIdx; + s32 xOffset; + s32 yOffset; + + switch (menu->page) { + case 0: + msgIdx = 1; + xOffset = 9; + yOffset = 4; + break; + case 1: + msgIdx = 2; + xOffset = 8; + yOffset = 4; + break; + case 3: + msgIdx = 4; + xOffset = 25; + yOffset = 4; + break; + case 4: + msgIdx = 5; + xOffset = 16; + yOffset = 4; + break; + case 2: + default: + msgIdx = 3; + xOffset = 10; + yOffset = 4; + break; + } + + filemenu_draw_message(filemenu_get_menu_message(msgIdx), baseX + xOffset, baseY + yOffset, 255, 0, 0); +} void filemenu_draw_contents_stereo( MenuPanel* menu, @@ -34,15 +80,92 @@ void filemenu_draw_contents_mono( } } -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_option_left); +void filemenu_draw_contents_option_left( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + if (menu->page != 2) { + if ((menu->unk_00.s & 0x00FFFF00) == 0x200) { + filemenu_set_cursor_goal_pos(53, baseX, baseY + 8); + } + filemenu_draw_message(filemenu_get_menu_message(9), baseX + 8, baseY + 2, 255, 0, 1); + } +} -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_option_center); +void filemenu_draw_contents_option_center( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + s32 msgIdx; + s32 xOffset; + s32 yOffset; + + switch (menu->page) { + case 1: + case 2: + case 3: + case 4: + msgIdx = 10; + xOffset = 18; + yOffset = 0; + if ((menu->unk_00.s & 0xFFFF00) == 0x010200) { + filemenu_set_cursor_goal_pos(54, baseX + 8, baseY + 8); + } + break; + default: + msgIdx = 11; + xOffset = 14; + yOffset = 0; + if ((menu->unk_00.s & 0xFFFF00) == 0x010200) { + filemenu_set_cursor_goal_pos(54, baseX + 4, baseY + 8); + } + break; + } + + filemenu_draw_message(filemenu_get_menu_message(msgIdx), baseX + xOffset, baseY + yOffset + 2, 255, 0, 1); +} + +void filemenu_draw_contents_option_right( + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening +) { + if (menu->page != 2) { + if ((menu->unk_00.s & 0xFFFF00) == 0x020200) { + filemenu_set_cursor_goal_pos(55, baseX + 8, baseY + 8); + } + filemenu_draw_message(filemenu_get_menu_message(10), baseX + 20, baseY + 2, 255, 0, 1); + } +} -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_option_right); INCLUDE_ASM(s32, "165490", filemenu_draw_contents_file_info); -INCLUDE_ASM(s32, "165490", filemenu_draw_contents_file_title); +void filemenu_draw_contents_file_title( + s32 fileIdx, + MenuPanel* menu, + s32 baseX, s32 baseY, + s32 width, s32 height, + s32 opacity, s32 darkening) +{ + if (D_8024C098 == 0 && menu->unk_00.c.selected == fileIdx) { + filemenu_set_cursor_goal_pos(fileIdx + 60, baseX - 3, baseY + 8); + } + + filemenu_draw_message(filemenu_get_menu_message(26), baseX + 5, baseY + 1, 255, 0, 1); + + if (D_80077A24[fileIdx] == 0) { + draw_number(fileIdx + 1, baseX + 33, baseY + 1, 1, 0, 255, 2); + } else { + draw_number(fileIdx + 1, baseX + 33, baseY + 1, 1, 0, 255, 2); + filemenu_draw_file_name(D_800779C4[fileIdx].unk_07, 8, baseX + 46, baseY + 1, 255, 0, 1, 9); + } +} void filemenu_draw_contents_file_0_info( MenuPanel* menu, @@ -116,10 +239,71 @@ void filemenu_draw_contents_file_3_title( filemenu_draw_contents_file_title(3, menu, baseX, baseY, width, height, opacity, darkening); } -INCLUDE_ASM(s32, "165490", filemenu_main_init); +void filemenu_main_init(MenuPanel* menu) { + s32 halfWidth; + s32 halfWidth2; + s16* posXPtr; + s32 x; + s32 i; + for (i = 0; i < ARRAY_COUNT(filemenu_hudElemIDs); i++) { + filemenu_hudElemIDs[i] = create_hud_element(D_80249E20[i]); + set_hud_element_flags(filemenu_hudElemIDs[i], 0x80); + } + + for (i = 0; i < ARRAY_COUNT(D_80249EA0); i++) { + D_80249EA0[i].tab = menu; + } + + setup_pause_menu_tab(D_80249EA0, ARRAY_COUNT(D_80249EA0)); + menu->unk_00.c.selected = menu->gridData[(menu->page * menu->numCols * menu->numRows) + + (menu->numCols * menu->unk_00.c.row) + + menu->unk_00.c.col]; + + if (menu->page == 2) { + gWindows[45].pos.y = 1; + gWindows[45].width = 211; + gWindows[45].height = 25; + } else { + gWindows[45].pos.y = 1; + gWindows[45].width = 162; + gWindows[45].height = 25; + } + + halfWidth = gWindows[45].width / 2; + posXPtr = &gWindows[45].pos.x; + if (gWindows[45].parent != -1) { + x = (gWindows[gWindows[45].parent].width / 2) - halfWidth; + } else { + x = 160 - halfWidth; + } + *posXPtr = x; + + halfWidth2 = gWindows[54].width / 2; + posXPtr = &gWindows[54].pos.x; + if (gWindows[54].parent != -1) { + x = (gWindows[gWindows[54].parent].width / 2) - halfWidth2; + } else { + x = 160 - halfWidth2; + } + *posXPtr = x; + + if (menu->page != 0) { + set_window_update(0x35, 2); + set_window_update(0x37, 2); + set_window_update(0x33, 2); + set_window_update(0x34, 2); + } + menu->unk_00.c.initialized = 1; +} + +static const f32 padding[] = { 0.0f }; // TODO remove when the following func is matched + +void filemenu_main_handle_input(MenuPanel* menu); INCLUDE_ASM(s32, "165490", filemenu_main_handle_input); +extern s32 D_8014F150[]; + INCLUDE_ASM(s32, "165490", filemenu_main_update); void filemenu_main_cleanup(void) { diff --git a/src/168590.c b/src/168590.c index 537d4eaad0..287e1b78a4 100644 --- a/src/168590.c +++ b/src/168590.c @@ -8,11 +8,10 @@ extern s32 filemenu_iterFileIdx; extern s32 filemenu_pressedButtons; extern s8 D_8024C090; extern s32 filemenu_loadedFileIdx; -extern s8 D_8024C098_C09918; +extern s8 D_8024C098; extern s32 D_8024C100_C09980[3]; extern s32 D_8024C110; -s32 filemenu_get_menu_message(s32 index); void filemenu_update_show_options_left(s32 windowIndex, s32* flags, s32* posX, s32* posY, s32* posZ, s32* scaleX, s32* scaleY, s32* rotX, s32* rotY, s32* rotZ, s32* darkening, s32* opacity); void filemenu_update_show_options_right(s32 windowIndex, s32* flags, s32* posX, s32* posY, s32* posZ, s32* scaleX, @@ -26,7 +25,7 @@ void filemenu_info_draw_message_contents(MenuPanel* menu, s32 baseX, s32 baseY) switch (page) { case 0: filemenu_draw_message(filemenu_get_menu_message(0x1A), baseX + 10, baseY + 4, 255, 0, 0); - draw_number(filemenu_menus[0]->selected + 1, baseX + 48, baseY + 6, 0, 0, 255, 3); + draw_number(filemenu_menus[0]->unk_00.c.selected + 1, baseX + 48, baseY + 6, 0, 0, 255, 3); filemenu_draw_message(filemenu_get_menu_message(0x1B), baseX + 49, baseY + 4, 255, 0, 0); break; case 2: @@ -43,7 +42,7 @@ void filemenu_info_draw_message_contents(MenuPanel* menu, s32 baseX, s32 baseY) break; case 3: filemenu_draw_message(filemenu_get_menu_message(0x1A), baseX + 10, baseY + 4, 255, 0, 0); - draw_number(filemenu_menus[0]->selected + 1, baseX + 48, baseY + 6, 0, 0, 255, page); + draw_number(filemenu_menus[0]->unk_00.c.selected + 1, baseX + 48, baseY + 6, 0, 0, 255, page); filemenu_draw_message(filemenu_get_menu_message(0x1F), baseX + 49, baseY + 4, 255, 0, 0); break; } @@ -66,7 +65,7 @@ void filemenu_info_handle_input(void) { MenuPanel* menu = filemenu_menus[0]; s32 page; - D_8024C098_C09918 = 0; + D_8024C098 = 0; page = menu->page; switch(page) { @@ -130,7 +129,7 @@ void filemenu_draw_contents_file_create_header(MenuPanel* menu, s32 baseX, s32 b } tempAmt = 8; - if (D_8024C098_C09918 == 3) { + if (D_8024C098 == 3) { s32 phi_v0 = 122; if (D_8024C090 != tempAmt) { diff --git a/src/16F740.c b/src/16F740.c index 94f34999bf..96b582183c 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -912,7 +912,7 @@ void btl_state_update_partner_move(void) { break; } - sfx_play_sound(SOUND_UNKNOWN_2107); + sfx_play_sound(SOUND_2107); btl_show_battle_message(phi_s0, 0x3C); for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { diff --git a/src/16c8e0.c b/src/16c8e0.c index 1d8ca6db71..3a6857c402 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -68,112 +68,6 @@ EvtSource BtlBringPartnerOut = { EVT_END }; -s8 D_80280CE0[] = { 0, 0, 0, 0 }; -s32 D_80280CE4 = -1; - -EvtSource CamPreset_B = { - EVT_CALL(func_80248DD0) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_F = { - EVT_CALL(func_80248DE4) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_M = { - EVT_CALL(func_80249804) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_G = { - EVT_CALL(func_8024A214) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_I = { - EVT_CALL(func_8024A990) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_H = { - EVT_CALL(func_8024AFE4) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_N = { - EVT_CALL(func_8024B5FC) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_C = { - EVT_CALL(func_8024B9A0) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_D = { - EVT_CALL(func_8024BDA4) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_E = { - EVT_CALL(func_8024C180) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_J = { - EVT_CALL(func_8024C570) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_K = { - EVT_CALL(func_8024C944) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_L = { - EVT_CALL(func_8024CB68) - EVT_RETURN - EVT_END -}; - -EvtSource CamPreset_A = { - EVT_CALL(func_8024E9B0, 0, 15, 0) - EVT_CALL(func_8024E748, 2, 550) - EVT_CALL(func_8024E748, 3, 100) - EVT_CALL(func_8024E748, 4, 8) - EVT_RETURN - EVT_END -}; - -EvtSource D_80280EB8 = { - EVT_CALL(SetCamPerspective, 1, 6, 25, 16, 1024) - EVT_CALL(SetCamViewport, 1, 12, 20, 296, 200) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetCamEnabled, 1, 1) - EVT_WAIT_FRAMES(1) - EVT_CALL(InitVirtualEntityList) - EVT_CALL(InitAnimatedModels) - EVT_CALL(func_802CABE8, 1, 0, 240, 100, 8) - EVT_CALL(func_802CAE50, 1, -75, 35, 0) - EVT_CALL(BattleCamTargetActor, 0) - EVT_CALL(func_8024CE9C) - EVT_RETURN - EVT_END -}; - void get_dpad_input_radial(f32* angle, f32* magnitude) { BattleStatus* battleStatus = &gBattleStatus; u16 currentButtonsDown; diff --git a/src/1776B0.c b/src/1776B0.c index f1c3f8748b..1e3ac9928b 100644 --- a/src/1776B0.c +++ b/src/1776B0.c @@ -1,7 +1,5 @@ #include "common.h" - -extern s8 D_80280CE0; -extern s32 D_80280CE4; +#include "script_api/battle.h" // battle cam extern f32 D_8029F270; // pos x @@ -20,11 +18,123 @@ extern f32 D_8029F294; extern f32 D_8029F298; extern s8 D_8029F29C; extern s16 D_8029F29E; +extern s16 D_8029F2A0; extern s8 D_8029F2A2; extern s8 D_8029F2A3; extern s8 D_8029F2A4; extern s8 D_8029F2A5; extern s8 D_8029F2A6; +extern s8 D_8029F2A7; +extern f32 D_8029F2A8; +extern f32 D_8029F2AC; +extern f32 D_8029F2B0; +extern EvtSource* D_8029F2B4; + +s8 D_80280CE0 = 0; +s32 D_80280CE4 = -1; + +EvtSource CamPreset_B = { + EVT_CALL(func_80248DD0) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_F = { + EVT_CALL(func_80248DE4) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_M = { + EVT_CALL(func_80249804) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_G = { + EVT_CALL(func_8024A214) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_I = { + EVT_CALL(func_8024A990) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_H = { + EVT_CALL(func_8024AFE4) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_N = { + EVT_CALL(func_8024B5FC) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_C = { + EVT_CALL(func_8024B9A0) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_D = { + EVT_CALL(func_8024BDA4) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_E = { + EVT_CALL(func_8024C180) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_J = { + EVT_CALL(func_8024C570) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_K = { + EVT_CALL(func_8024C944) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_L = { + EVT_CALL(func_8024CB68) + EVT_RETURN + EVT_END +}; + +EvtSource CamPreset_A = { + EVT_CALL(func_8024E9B0, 0, 15, 0) + EVT_CALL(func_8024E748, 2, 550) + EVT_CALL(func_8024E748, 3, 100) + EVT_CALL(func_8024E748, 4, 8) + EVT_RETURN + EVT_END +}; + +EvtSource D_80280EB8 = { + EVT_CALL(SetCamPerspective, 1, 6, 25, 16, 1024) + EVT_CALL(SetCamViewport, 1, 12, 20, 296, 200) + EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamEnabled, 1, 1) + EVT_WAIT_FRAMES(1) + EVT_CALL(InitVirtualEntityList) + EVT_CALL(InitAnimatedModels) + EVT_CALL(func_802CABE8, 1, 0, 240, 100, 8) + EVT_CALL(func_802CAE50, 1, -75, 35, 0) + EVT_CALL(BattleCamTargetActor, 0) + EVT_CALL(func_8024CE9C) + EVT_RETURN + EVT_END +}; ApiStatus func_80248DD0(Evt* script, s32 isInitialCall) { D_8029F29C = 1; @@ -41,15 +151,278 @@ INCLUDE_ASM(s32, "1776B0", func_8024A990); INCLUDE_ASM(s32, "1776B0", func_8024AFE4); -INCLUDE_ASM(s32, "1776B0", func_8024B5FC); +ApiStatus func_8024B5FC(Evt* script, s32 isInitialCall) { + Camera* camera = &gCameras[1]; + f32 x, y, z; + f32 invAngle; + f32 angle; -INCLUDE_ASM(s32, "1776B0", func_8024B9A0); + x = D_8029F270; + y = D_8029F274; + z = D_8029F278; -INCLUDE_ASM(s32, "1776B0", func_8024BDA4); + 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; + } -INCLUDE_ASM(s32, "1776B0", func_8024C180); + 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); + } else { + angle = D_8029F29E; + angle /= D_8029F2A0; + } -INCLUDE_ASM(s32, "1776B0", func_8024C570); + 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); + + if (D_8029F29E == 0) { + D_8029F29C = 1; + } else { + D_8029F29E--; + } + + return ApiStatus_BLOCK; +} + +ApiStatus func_8024B9A0(Evt* script, s32 isInitialCall) { + Camera* camera = &gCameras[1]; + 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; + } + 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; + } + + x = D_8029F270; + y = D_8029F274; + z = D_8029F278; + + 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); + } else { + angle = D_8029F29E; + angle /= D_8029F2A0; + } + + 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); + + if (D_8029F29E == 0) { + D_8029F29C = 1; + } else { + D_8029F29E--; + } + + return ApiStatus_BLOCK; +} + +ApiStatus func_8024BDA4(Evt* script, s32 isInitialCall) { + Camera* camera = &gCameras[1]; + 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; + } + + x = D_8029F270; + y = D_8029F274; + z = D_8029F278; + + 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); + } else { + angle = D_8029F29E; + angle /= D_8029F2A0; + } + + 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); + + if (D_8029F29E == 0) { + D_8029F29C = 1; + } else { + D_8029F29E--; + } + + return ApiStatus_BLOCK; +} + +ApiStatus func_8024C180(Evt* script, s32 isInitialCall) { + Camera* camera = &gCameras[1]; + 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; + } + 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; + } + + x = D_8029F270; + y = D_8029F274; + z = D_8029F278; + + 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); + } else { + angle = D_8029F29E; + angle /= D_8029F2A0; + } + + 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); + + if (D_8029F29E == 0) { + D_8029F29C = 1; + } else { + D_8029F29E--; + } + + return ApiStatus_BLOCK; +} + +ApiStatus func_8024C570(Evt* script, s32 isInitialCall) { + Camera* camera = &gCameras[1]; + 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; + } + 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; + } + + x = D_8029F270; + y = D_8029F274; + z = D_8029F278; + + 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); + } else { + angle = D_8029F29E; + angle /= D_8029F2A0; + } + + 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); + + if (D_8029F29E == 0) { + D_8029F29C = 1; + } else { + D_8029F29E--; + } + + return ApiStatus_BLOCK; +} ApiStatus func_8024C944(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[1]; @@ -117,7 +490,101 @@ ApiStatus func_8024C944(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -INCLUDE_ASM(s32, "1776B0", func_8024CB68); +ApiStatus func_8024CB68(Evt* script, s32 isInitialCall) { + Camera* camera = &gCameras[1]; + BattleStatus* battleStatus = &gBattleStatus; + PlayerStatus* playerStatus = &gPlayerStatus; + s32 actorType = D_8029F27C & 0x700; + s32 actorID = D_8029F27C & 0xFF; + f32 x, y, z; + s32 screenX, screenY, screenZ; + f32 temp; + + switch (actorType) { + case 0: + if (battleStatus->playerActor == NULL) { + return ApiStatus_BLOCK; + } + x = battleStatus->playerActor->currentPos.x; + y = battleStatus->playerActor->currentPos.y + (playerStatus->colliderHeight / 2); + z = battleStatus->playerActor->currentPos.z; + break; + case 0x100: + if (battleStatus->partnerActor == NULL) { + return ApiStatus_BLOCK; + } + x = battleStatus->partnerActor->currentPos.x; + y = battleStatus->partnerActor->currentPos.y; + z = battleStatus->partnerActor->currentPos.z; + break; + case 0x200: + default: + if (battleStatus->enemyActors[actorID] == NULL) { + return ApiStatus_BLOCK; + } + x = battleStatus->enemyActors[actorID]->currentPos.x; + y = battleStatus->enemyActors[actorID]->currentPos.y; + z = battleStatus->enemyActors[actorID]->currentPos.z; + break; + } + + 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; + } + + get_screen_coords(1, x, y, z, &screenX, &screenY, &screenZ); + + if (screenY < 100) { + y += 25.0f; + } + if (y < D_8029F274) { + y = D_8029F274; + } + + if (screenX < 100) { + x -= 25.0f; + } + if (x < D_8029F270) { + x = D_8029F270; + } + if (screenX > 220) { + x += 25.0f; + } + + temp = x - camera->unk_54; + if (fabsf(temp) < 0.01) { + if (temp != 0.0f) { + camera->unk_54 = x; + } + } else { + camera->unk_54 += temp / 5.0f; + } + + temp = y - camera->unk_58; + if (fabsf(temp) < 0.01) { + if (temp != 0.0f) { + camera->unk_58 = y; + } + } else { + camera->unk_58 += temp / 5.0f; + } + + temp = z - camera->unk_5C; + if (fabsf(temp) < 0.01) { + if (temp != 0.0f) { + camera->unk_5C = z; + } + } else { + camera->unk_5C += temp / 5.0f; + } + + return ApiStatus_BLOCK; +} ApiStatus func_8024CE9C(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[1]; @@ -134,7 +601,740 @@ ApiStatus func_8024CE9C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "1776B0", btl_cam_use_preset); +void btl_cam_use_preset(s32 id) { + BattleStatus* battleStatus = &gBattleStatus; + EvtSource* preset = NULL; + Evt* newScript; + + if (D_80280CE0 == 0) { + D_8029F2A6 = 1; + D_8029F2A2 = 0; + D_8029F2A3 = 0; + D_8029F2A5 = 0; + D_8029F2A7 = 0; + + switch (id) { + case 0x0: + preset = &CamPreset_A; + break; + case 0x1: + preset = &CamPreset_B; + break; + case 0x2: + if (D_80280CE4 != id) { + D_8029F280 = 500; + D_8029F29E = 30; + preset = &CamPreset_C; + break; + } + return; + case 0x3: + if (D_80280CE4 != id) { + D_8029F280 = 480; + preset = &CamPreset_D; + D_8029F29E = 20; + D_8029F286 = 0; + break; + } + return; + case 0x4: + if (D_80280CE4 != id) { + D_8029F280 = 500; + preset = &CamPreset_E; + D_8029F29E = 10; + D_8029F286 = 0; + break; + } + return; + case 0x5: + D_8029F280 = 300; + D_8029F29E = 20; + preset = &CamPreset_F; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + break; + case 0x6: + D_8029F280 = 300; + D_8029F29E = 20; + preset = &CamPreset_G; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + break; + case 0x7: + D_8029F280 = 300; + D_8029F29E = 20; + preset = &CamPreset_H; + break; + case 0x8: + D_8029F280 = 300; + D_8029F29E = 20; + preset = &CamPreset_I; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + break; + case 0x9: + if (D_8029F2B4 != &CamPreset_C) { + D_8029F280 = 500; + D_8029F29E = 120; + preset = &CamPreset_C; + break; + } + return; + case 0xA: + D_8029F280 = 200; + D_8029F284 = 8; + D_8029F29E = 20; + preset = &CamPreset_F; + D_8029F286 = 15; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + break; + case 0xB: + D_8029F280 = 300; + D_8029F284 = 8; + preset = &CamPreset_F; + D_8029F29E = 20; + D_8029F286 = 16; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + break; + case 0xC: + D_8029F280 = 400; + D_8029F284 = 8; + D_8029F29E = 20; + preset = &CamPreset_F; + D_8029F286 = 30; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + break; + case 0xD: + D_8029F280 = 200; + D_8029F284 = 8; + D_8029F29E = 20; + preset = &CamPreset_I; + D_8029F286 = 15; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + break; + case 0xE: + D_8029F280 = 300; + D_8029F284 = 8; + preset = &CamPreset_I; + D_8029F29E = 20; + D_8029F286 = 16; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + break; + case 0xF: + D_8029F280 = 400; + D_8029F284 = 8; + D_8029F29E = 20; + preset = &CamPreset_I; + D_8029F286 = 30; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + break; + case 0x10: + D_8029F280 = 267; + D_8029F284 = 8; + D_8029F29E = 20; + D_8029F282 = 0; + D_8029F286 = 23; + preset = &CamPreset_H; + break; + case 0x11: + D_8029F280 = 300; + D_8029F282 = 0; + D_8029F284 = 8; + D_8029F29E = 20; + D_8029F286 = 8; + preset = &CamPreset_H; + break; + case 0x12: + D_8029F280 = 400; + D_8029F284 = 8; + D_8029F282 = 0; + preset = &CamPreset_H; + D_8029F29E = 20; + D_8029F286 = 0; + break; + case 0x13: + D_8029F29E = 20; + preset = &CamPreset_J; + break; + case 0x14: + preset = &CamPreset_K; + D_8029F29E = 20; + D_8029F286 = 0; + break; + case 0x15: + preset = &CamPreset_L; + D_8029F29E = 20; + D_8029F286 = 0; + break; + case 0x19: + D_8029F280 = 266; + D_8029F284 = 8; + D_8029F282 = 0; + D_8029F286 = 40; + btl_cam_set_target_pos(-80.0f, 0.0f, 0.0f); + D_8029F29E = 20; + D_8029F27C = 0; + preset = &CamPreset_J; + break; + case 0x18: + D_8029F280 = 250; + D_8029F284 = 8; + D_8029F29E = 20; + D_8029F286 = 14; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + D_8029F2A6 = 0; + D_8029F27C = 0; + D_80280CE0 = 1; + preset = &CamPreset_I; + break; + case 0x17: + D_8029F280 = 255; + D_8029F284 = 8; + D_8029F29E = 20; + D_8029F282 = 0; + D_8029F286 = 29; + D_8029F2A2 = 0; + D_8029F2A3 = 0; + btl_cam_set_target_pos(-95.0f, 18.0f, 10.0f); + D_8029F27C = 0; + preset = &CamPreset_J; + break; + case 0x16: + D_8029F280 = 230; + D_8029F284 = 8; + D_8029F282 = 0; + D_8029F29E = 20; + D_8029F286 = 0; + D_8029F27C = 0; + preset = &CamPreset_J; + break; + case 0x1A: + D_8029F280 = 310; + D_8029F284 = 8; + D_8029F29E = 30; + D_8029F286 = 0x10; + D_8029F282 = 0; + D_8029F27C = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + D_8029F2A6 = 0; + preset = &CamPreset_M; + break; + case 0x1B: + D_8029F280 = 320; + D_8029F284 = 8; + D_8029F29E = 5; + D_8029F282 = 0; + D_8029F286 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 0; + preset = &CamPreset_M; + D_8029F2A6 = 0; + D_8029F27C = 0; + break; + case 0x1C: + D_8029F280 = 340; + D_8029F284 = 8; + D_8029F29E = 5; + D_8029F282 = 0; + D_8029F286 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 0; + D_8029F27C = 0; + D_8029F2A6 = 0; + preset = &CamPreset_M; + break; + case 0x1E: + case 0x1F: + D_8029F280 = 300; + D_8029F284 = 8; + D_8029F29E = 0xF; + D_8029F286 = -32; + D_8029F2A7 = 20; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + D_8029F27C = 0; + preset = &CamPreset_I; + break; + case 0x20: + D_8029F280 = 300; + D_8029F284 = 8; + D_8029F282 = 0; + D_8029F29E = 0xA; + preset = &CamPreset_N; + D_8029F286 = 0xA; + D_8029F2A2 = 0; + D_8029F2A3 = 0; + D_8029F278 = 0.0f; + D_8029F270 = -65.0f; + D_8029F274 = 30.0f; + break; + case 0x21: + D_8029F280 = 220; + D_8029F284 = 8; + D_8029F29E = 30; + preset = &CamPreset_I; + D_8029F286 = 24; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + D_8029F2A6 = 0; + D_8029F27C = 0; + break; + case 0x22: + D_8029F280 = 280; + D_8029F284 = 8; + D_8029F29E = 30; + D_8029F286 = -4; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 0; + D_8029F27C = 0; + D_8029F2A6 = 0; + preset = &CamPreset_M; + break; + case 0x23: + D_8029F280 = 380; + D_8029F284 = 8; + D_8029F29E = 60; + D_8029F282 = 0; + D_8029F286 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 0; + D_8029F2A5 = 1; + preset = &CamPreset_M; + D_8029F2A6 = 0; + D_8029F27C = 0; + break; + case 0x25: + D_8029F280 = 320; + D_8029F284 = 8; + D_8029F29E = 30; + D_8029F286 = -4; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 0; + preset = &CamPreset_M; + D_8029F2A6 = 0; + D_8029F27C = 0; + break; + case 0x24: + D_8029F280 = 300; + D_8029F284 = 8; + D_8029F29E = 60; + D_8029F282 = 0; + D_8029F286 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 0; + D_8029F2A5 = 1; + preset = &CamPreset_M; + D_8029F2A6 = 0; + D_8029F27C = 0; + break; + case 0x26: + D_8029F280 = 320; + D_8029F284 = 8; + D_8029F29E = 30; + D_8029F286 = -4; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 0; + preset = &CamPreset_M; + D_8029F2A6 = 0; + D_8029F27C = 0; + break; + case 0x27: + D_8029F280 = 320; + D_8029F284 = 8; + D_8029F29E = 30; + D_8029F282 = 0; + D_8029F286 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 0; + preset = &CamPreset_M; + D_8029F2A6 = 0; + D_8029F27C = 0; + break; + case 0x28: + D_8029F280 = 360; + D_8029F284 = 8; + D_8029F29E = 20; + preset = &CamPreset_M; + D_8029F286 = -4; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + D_8029F2A6 = 0; + D_8029F27C = 0; + break; + case 0x29: + case 0x2A: + D_8029F280 = 200; + D_8029F29E = 7; + D_8029F2A0 = 7; + D_8029F29C = 0; + D_8029F2A6 = 0; + preset = D_8029F2B4; + break; + case 0x2B: + D_8029F280 = 214; + D_8029F284 = 8; + D_8029F29E = 20; + D_8029F286 = 0x10; + D_8029F2A2 = -2; + D_8029F282 = 0; + D_8029F27C = 0; + D_8029F2A3 = 1; + D_8029F2A6 = 0; + preset = &CamPreset_M; + break; + case 0x2C: + D_8029F280 = 300; + D_8029F284 = 8; + D_8029F29E = 8; + D_8029F286 = 0x10; + D_8029F282 = 0; + D_8029F27C = 0; + D_8029F2A2 = 0; + D_8029F2A3 = 1; + D_8029F2A6 = 0; + preset = &CamPreset_M; + break; + case 45: + D_8029F280 = 430; + D_8029F284 = 8; + D_8029F29E = 0xA; + D_8029F282 = 0; + D_8029F286 = 0x10; + D_8029F27C = 0; + preset = &CamPreset_N; + D_8029F2A2 = 0; + D_8029F2A3 = 0; + D_8029F278 = 0.0f; + D_8029F270 = 60.0f; + D_8029F274 = 40.0f; + break; + case 0x2E: + D_8029F280 = 460; + D_8029F284 = 8; + D_8029F29E = 0xA; + D_8029F282 = 0; + D_8029F286 = 27; + D_8029F27C = 0; + D_8029F2A2 = 0; + preset = &CamPreset_N; + D_8029F278 = 0.0f; + D_8029F270 = 60.0f; + D_8029F274 = 40.0f; + break; + case 0x46: + D_8029F280 = 390; + D_8029F284 = 8; + D_8029F282 = 0; + D_8029F286 = 45; + btl_cam_set_target_pos(-70.0f, 0.0f, 0.0f); + D_8029F29E = 10; + D_8029F2A6 = 0; + preset = &CamPreset_J; + break; + case 0x47: + D_8029F280 = 500; + D_8029F284 = 8; + D_8029F282 = 0; + D_8029F286 = 45; + btl_cam_set_target_pos(0.0f, 0.0f, 0.0f); + D_8029F29E = 40; + D_8029F2A6 = 0; + preset = &CamPreset_J; + break; + case 0x45: + case 0x48: + D_8029F280 = 300; + D_8029F284 = 8; + D_8029F282 = 0; + D_8029F286 = 45; + btl_cam_set_target_pos(-50.0f, 0.0f, 0.0f); + D_8029F29E = 20; + D_8029F2A6 = 0; + preset = &CamPreset_J; + break; + case 0x49: + D_8029F280 = 166; + D_8029F284 = 8; + D_8029F29E = 1; + preset = &CamPreset_N; + D_8029F282 = 0; + D_8029F286 = 17; + D_8029F2A2 = 0; + D_8029F2A3 = 0; + D_8029F278 = 0.0f; + D_8029F270 = -75.0f; + D_8029F274 = 150.0f; + break; + case 0x2F: + D_8029F280 = 310; + D_8029F284 = 8; + D_8029F29E = 30; + D_8029F286 = 0x10; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + preset = &CamPreset_M; + D_8029F282 = 0; + D_8029F27C = 256; + D_8029F2A6 = 0; + break; + case 0x30: + D_8029F280 = 250; + D_8029F284 = 8; + D_8029F29E = 120; + D_8029F286 = 0x10; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + D_8029F2A5 = 1; + preset = &CamPreset_M; + D_8029F282 = 0; + D_8029F2A6 = 0; + D_8029F27C = 256; + break; + case 0x31: + D_8029F280 = 300; + D_8029F284 = 8; + D_8029F29E = 120; + D_8029F286 = 0x10; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + D_8029F2A5 = 1; + preset = &CamPreset_I; + D_8029F282 = 0; + D_8029F2A6 = 0; + D_8029F27C = 256; + break; + case 0x32: + D_8029F280 = 320; + D_8029F284 = 8; + D_8029F29E = 5; + D_8029F2A2 = 1; + D_8029F282 = 0; + D_8029F286 = 0; + D_8029F2A3 = 0; + preset = &CamPreset_M; + D_8029F27C = 256; + D_8029F2A6 = 0; + break; + case 0x1D: + case 0x33: + D_8029F29E = 50; + D_8029F280 = 500; + D_8029F286 = 0; + preset = &CamPreset_D; + break; + case 0x34: + D_8029F280 = 280; + D_8029F284 = 8; + D_8029F29E = 30; + D_8029F286 = -4; + D_8029F2A2 = 1; + D_8029F282 = 0; + D_8029F2A3 = 0; + preset = &CamPreset_M; + D_8029F2A6 = 0; + D_8029F27C = 256; + break; + case 0x35: + D_8029F280 = 380; + D_8029F284 = 8; + D_8029F29E = 60; + D_8029F2A2 = 1; + D_8029F2A5 = 1; + D_8029F282 = 0; + D_8029F286 = 0; + D_8029F2A3 = 0; + preset = &CamPreset_M; + D_8029F2A6 = 0; + D_8029F27C = 256; + break; + case 0x36: + D_8029F280 = 220; + D_8029F284 = 8; + D_8029F29E = 30; + D_8029F286 = 24; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + preset = &CamPreset_I; + D_8029F282 = 0; + D_8029F2A6 = 0; + D_8029F27C = 256; + break; + case 0x37: + D_8029F280 = 210; + D_8029F284 = 8; + D_8029F29E = 20; + preset = &CamPreset_N; + D_8029F282 = 0; + D_8029F286 = 0xA; + D_8029F2A2 = 0; + D_8029F2A3 = 0; + D_8029F278 = 0.0f; + D_8029F270 = -95.0f; + D_8029F274 = 22.0f; + break; + case 0x38: + D_8029F280 = 320; + D_8029F284 = 8; + D_8029F29E = 30; + D_8029F286 = -4; + D_8029F2A2 = 1; + D_8029F282 = 0; + D_8029F2A3 = 0; + D_8029F27C = 256; + preset = &CamPreset_M; + break; + case 0x39: + D_8029F280 = 320; + D_8029F284 = 8; + D_8029F29E = 30; + D_8029F2A2 = 1; + D_8029F282 = 0; + D_8029F286 = 0; + D_8029F2A3 = 0; + D_8029F27C = 256; + preset = &CamPreset_M; + break; + case 0x3A: + D_8029F280 = 400; + D_8029F284 = 8; + D_8029F29E = 30; + preset = &CamPreset_N; + D_8029F282 = 0; + D_8029F286 = 0xA; + D_8029F2A2 = 0; + D_8029F2A3 = 0; + D_8029F278 = 0.0f; + D_8029F270 = 25.0f; + D_8029F274 = 60.0f; + break; + case 0x3B: + D_8029F280 = 200; + D_8029F284 = 8; + D_8029F29E = 60; + D_8029F286 = 11; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + D_8029F2A5 = 1; + preset = &CamPreset_I; + D_8029F282 = 0; + D_8029F27C = 256; + D_8029F2A6 = 0; + break; + case 0x3C: + D_8029F280 = 300; + D_8029F284 = 8; + D_8029F29E = 8; + D_8029F286 = 0x10; + D_8029F282 = 0; + D_8029F27C = 256; + D_8029F2A2 = 0; + D_8029F2A3 = 0; + preset = &CamPreset_I; + break; + case 0x3D: + case 0x3E: + D_8029F280 = 300; + D_8029F284 = 8; + D_8029F29E = 15; + D_8029F286 = -32; + D_8029F2A7 = 20; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + D_8029F282 = 0; + D_8029F27C = 256; + preset = &CamPreset_I; + break; + case 0x3F: + D_8029F280 = 400; + D_8029F284 = 8; + D_8029F29E = 20; + preset = &CamPreset_F; + D_8029F286 = 27; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + break; + case 0x40: + D_8029F280 = 358; + D_8029F284 = 8; + D_8029F29E = 10; + D_8029F286 = 0x10; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 0; + preset = &CamPreset_F; + break; + case 0x41: + D_8029F29E = 50; + D_8029F280 = 500; + preset = &CamPreset_C; + break; + case 0x42: + D_8029F280 = 267; + D_8029F284 = 8; + D_8029F29E = 20; + D_8029F286 = 0x10; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 0; + preset = &CamPreset_F; + break; + case 0x43: + D_8029F280 = 214; + D_8029F284 = 8; + preset = &CamPreset_F; + D_8029F29E = 20; + D_8029F286 = 16; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + break; + case 0x44: + D_8029F280 = 300; + D_8029F284 = 8; + preset = &CamPreset_F; + D_8029F29E = 4; + D_8029F286 = 16; + D_8029F282 = 0; + D_8029F2A2 = 1; + D_8029F2A3 = 1; + break; + } + + D_80280CE4 = id; + + if (battleStatus->camMovementScript != NULL) { + kill_script_by_ID(battleStatus->camMovementScriptID); + } + + D_8029F2B4 = preset; + newScript = start_script(preset, 0xA, 0x20); + D_8029F29C = 0; + battleStatus->camMovementScript = newScript; + battleStatus->camMovementScriptID = newScript->id; + } +} void func_8024E3D8(s32 arg0) { if (D_80280CE0 == 0) { @@ -229,13 +1429,9 @@ void btl_cam_set_zoffset(s16 zOffset) { } } -#ifdef NON_MATCHING void btl_cam_unfreeze(void) { D_80280CE0 = 0; } -#else -INCLUDE_ASM(s32, "1776B0", btl_cam_unfreeze); -#endif void func_8024E60C(void) { D_8029F2A6 = 0; diff --git a/src/1A5830.c b/src/1A5830.c index 70e6c61bd0..3c24194376 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -431,7 +431,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { if (blocked) { damage--; damage -= player_team_is_ability_active(target, ABILITY_DAMAGE_DODGE); - sfx_play_sound_at_position(SOUND_UNKNOWN_231, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_231, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_802667F0(0, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); gBattleStatus.flags1 |= BS_FLAGS1_ATK_BLOCKED; break; @@ -444,7 +444,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { if (target->koStatus == STATUS_END && !(battleStatus->currentAttackElement & DAMAGE_TYPE_UNBLOCKABLE)) { if (check_block_input(BUTTON_A)) { damage = 0; - sfx_play_sound_at_position(SOUND_UNKNOWN_231, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_231, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); func_802667F0(0, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); gBattleStatus.flags1 |= BS_FLAGS1_ATK_BLOCKED; break; @@ -705,7 +705,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { func_80267018(target, 1); - if (attacker->actorTypeData1[5] != SOUND_UNKNOWN_0) { + if (attacker->actorTypeData1[5] != SOUND_0) { sfx_play_sound_at_position(attacker->actorTypeData1[5], 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c index 37d89abe77..5f12133222 100644 --- a/src/1a1f0_len_5390.c +++ b/src/1a1f0_len_5390.c @@ -1,7 +1,12 @@ #include "common.h" +#include "battle/battle.h" #include "npc.h" #include "effects.h" +#include "hud_element.h" +extern s32 D_80077C40; + +extern s8 D_8009A654; extern s16 D_8009A668; extern s32 D_800A0BA0; extern f32 D_800A0BA4; @@ -145,8 +150,8 @@ ApiStatus MerleeUpdateFX(Evt* script, s32 isInitialCall) { if (D_800A0BB8 == 2) { ((EffectInstanceData*)D_800A0BA8->data)->unk_30 = 0.00001f; ((EffectInstanceData*)D_800A0BAC->data)->unk_30 = 0.00001f; - D_800A0BA8->flags |= 0x10; - D_800A0BAC->flags |= 0x10; + D_800A0BA8->flags |= EFFECT_INSTANCE_FLAGS_10; + D_800A0BAC->flags |= EFFECT_INSTANCE_FLAGS_10; return ApiStatus_DONE1; } @@ -223,9 +228,9 @@ ApiStatus OnDefeatEnemy(Evt* script, s32 isInitialCall) { } if (script->functionTemp[1] & 1) { - npc->flags &= ~2; + npc->flags &= ~NPC_FLAG_2; } else { - npc->flags |= 2; + npc->flags |= NPC_FLAG_2; } if (script->functionTemp[1] == 15) { @@ -244,7 +249,7 @@ ApiStatus OnDefeatEnemy(Evt* script, s32 isInitialCall) { script->functionTemp[1] -= 1; if (script->functionTemp[1] == 0) { - npc->flags |= 2; + npc->flags |= NPC_FLAG_2; return ApiStatus_DONE1; } @@ -282,7 +287,209 @@ INCLUDE_ASM(s32, "1a1f0_len_5390", update_encounters_neutral); void draw_encounters_neutral(void) { } -INCLUDE_ASM(s32, "1a1f0_len_5390", update_encounters_pre_battle); +void update_encounters_pre_battle(void) { + EncounterStatus* currentEncounter = &gCurrentEncounter; + PlayerData* playerData = &gPlayerData; + Encounter* encounter; + Enemy* enemy; + s32 i; + s32 j; + + switch (D_8009A5D0) { + case 0: + currentEncounter->fadeOutAmount = 0; + currentEncounter->unk_94 = 1; + currentEncounter->fadeOutAccel = 1; + currentEncounter->unk_08 = -1; + D_8009A654 = 0; + D_80077C40 = 0; + suspend_all_group(0x10); + + for (i = 0; i < currentEncounter->numEncounters; i++) { + encounter = currentEncounter->encounterList[i]; + + if (encounter != NULL) { + for (j = 0; j < encounter->count; j++) { + enemy = encounter->enemy[j]; + if (enemy != NULL && !(enemy->flags & NPC_FLAG_NO_AI)) { + if (enemy->aiScript != NULL) { + suspend_all_script(enemy->aiScriptID); + } + if (enemy->auxScript != NULL) { + suspend_all_script(enemy->auxScriptID); + } + } + } + } + } + + enemy = currentEncounter->currentEnemy; + if ((enemy->flags & NPC_FLAG_MOTION_BLUR) && currentEncounter->unk_12 == 0) { + currentEncounter->unk_94 = 0; + currentEncounter->battleStartCountdown = 0; + partner_handle_before_battle(); + D_8009A5D0 = 3; + return; + } + + if (gGameStatusPtr->debugEnemyContact == 2) { + currentEncounter->unk_94 = 0; + currentEncounter->battleStartCountdown = 10; + partner_handle_before_battle(); + D_8009A5D0 = 2; + return; + } + + enemy = currentEncounter->currentEnemy; + if (currentEncounter->hitType != 1 && + currentEncounter->hitType != 3 && + is_ability_active(ABILITY_FIRST_ATTACK) && + (playerData->level >= enemy->npcSettings->level) && + !(enemy->flags & ENEMY_FLAGS_40) && + currentEncounter->unk_12 == 0) + { + currentEncounter->unk_94 = 0; + currentEncounter->battleStartCountdown = 0xA; + D_80077C40 = 1; + D_8009A5D0 = 2; + return; + } + + enemy = currentEncounter->currentEnemy; + if (( + (is_ability_active(ABILITY_BUMP_ATTACK)) && + (playerData->level >= enemy->npcSettings->level) && + (!(enemy->flags & ENEMY_FLAGS_40) && + (currentEncounter->unk_12 == 0)) + ) || ( + (enemy = currentEncounter->currentEnemy, + (currentEncounter->hitType == 3)) && + (is_ability_active(ABILITY_SPIN_ATTACK)) && + playerData->level >= enemy->npcSettings->level && + !(enemy->flags & ENEMY_FLAGS_40) && + currentEncounter->unk_12 == 0 + )) + { + currentEncounter->battleStartCountdown = 10; + D_80077C40 = 1; + currentEncounter->unk_94 = 0; + D_8009A5D0 = 2; + return; + } + + if (currentEncounter->songID < 0) { + switch (currentEncounter->eFirstStrike) { + case 0: + bgm_set_battle_song(SONG_NORMAL_BATTLE, FIRST_STRIKE_NONE); + break; + case 1: + bgm_set_battle_song(SONG_NORMAL_BATTLE, FIRST_STRIKE_PLAYER); + break; + case 2: + bgm_set_battle_song(SONG_NORMAL_BATTLE, FIRST_STRIKE_ENEMY); + break; + } + } else { + bgm_set_battle_song(currentEncounter->songID, FIRST_STRIKE_NONE); + } + bgm_push_battle_song(); + D_8009A654 = 1; + currentEncounter->battleStartCountdown = 10; + D_8009A5D0 = 1; + case 1: + if (currentEncounter->fadeOutAmount == 255) { + if (currentEncounter->battleStartCountdown != 0) { + currentEncounter->battleStartCountdown--; + break; + } + + encounter = currentEncounter->currentEncounter; + for (i = 0; i < encounter->count; i++) { + enemy = encounter->enemy[i]; + if (enemy != NULL && + ((!(enemy->flags & NPC_FLAG_ENABLE_HIT_SCRIPT) || enemy == currentEncounter->currentEnemy)) && + !(enemy->flags & NPC_FLAG_NO_AI) && + enemy->hitScript != NULL) + { + kill_script_by_ID(enemy->hitScriptID); + enemy->hitScript = NULL; + } + } + + partner_handle_before_battle(); + currentEncounter->unk_A0 = 0; + currentEncounter->unk_A2 = 0; + + enemy = currentEncounter->currentEnemy; + currentEncounter->unk_10 = enemy->unk_B5; + + if (is_ability_active(ABILITY_DIZZY_ATTACK) && currentEncounter->hitType == 3) { + currentEncounter->unk_A0 = 4; + currentEncounter->unk_A2 = 3; + } + + sfx_stop_sound(SOUND_2111); + sfx_stop_sound(SOUND_2112); + sfx_stop_sound(SOUND_2113); + sfx_stop_sound(SOUND_2114); + set_battle_formation(0); + set_battle_stage(encounter->stage); + load_battle(encounter->battle); + currentEncounter->unk_07 = 1; + currentEncounter->unk_08 = 0; + currentEncounter->merleeCoinBonus = 0; + currentEncounter->damageTaken = 0; + currentEncounter->coinsEarned = 0; + currentEncounter->fadeOutAccel = 0; + currentEncounter->fadeOutAmount = 255; + set_screen_overlay_params_front(0, 255.0f); + gGameState = 5; + D_8009A678 = 1; + D_8009A5D0 = 0; + } + break; + case 2: + if (currentEncounter->battleStartCountdown != 0) { + currentEncounter->battleStartCountdown--; + break; + } + + encounter = currentEncounter->currentEncounter; + for (i = 0; i < encounter->count; i++) { + enemy = encounter->enemy[i]; + if (enemy != NULL && + (!(enemy->flags & NPC_FLAG_ENABLE_HIT_SCRIPT) || enemy == currentEncounter->currentEnemy) && + !(enemy->flags & NPC_FLAG_NO_AI) && + (enemy->hitScript != 0)) + { + kill_script_by_ID(enemy->hitScriptID); + enemy->hitScript = NULL; + } + } + + currentEncounter->unk_08 = 1; + currentEncounter->unk_07 = 1; + currentEncounter->battleOutcome = 0; + currentEncounter->merleeCoinBonus = 0; + currentEncounter->damageTaken = 0; + gGameState = 5; + currentEncounter->coinsEarned = 0; + currentEncounter->fadeOutAccel = 0; + currentEncounter->fadeOutAmount = 0; + D_8009A678 = 1; + D_8009A5D0 = 0; + break; + case 3: + currentEncounter->battleOutcome = 4; + currentEncounter->unk_08 = 1; + currentEncounter->fadeOutAmount = 0; + currentEncounter->fadeOutAccel = 0; + gGameState = 5; + D_8009A678 = 1; + D_8009A5D0 = 0; + break; + } +} void draw_encounters_pre_battle(void) { EncounterStatus* encounter = &gCurrentEncounter; @@ -398,16 +605,14 @@ void show_first_strike_message(void) { INCLUDE_ASM(s32, "1a1f0_len_5390", update_encounters_post_battle); -s32 draw_encounters_post_battle(void) { +void draw_encounters_post_battle(void) { EncounterStatus* currentEncounter = &gCurrentEncounter; s32 ret = currentEncounter->fadeOutAccel; if (ret != 0) { set_screen_overlay_params_front(0, currentEncounter->fadeOutAmount); - ret = set_screen_overlay_color(0, 0, 0, 0); + set_screen_overlay_color(0, 0, 0, 0); } - - return ret; } void update_encounters_conversation(void) { @@ -493,7 +698,7 @@ s8 check_conversation_trigger(void) { s32 i, j; playerStatus->unk_C8 = NULL; - playerStatus->flags &= ~0x2000000; + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC; playerColliderHeight = playerStatus->colliderHeight; playerColliderRadius = playerStatus->colliderDiameter / 2; playerX = playerStatus->position.x; @@ -592,7 +797,7 @@ s8 check_conversation_trigger(void) { if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) && npc != NULL && !is_picking_up_item()) { playerStatus->unk_C8 = npc; - playerStatus->flags |= 0x2000000; + playerStatus->flags |= PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC; if (playerStatus->pressedButtons & BUTTON_A) { close_status_menu(); gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_CONVERSATION; diff --git a/src/30450.c b/src/30450.c index a0a568f940..4f14a851f6 100644 --- a/src/30450.c +++ b/src/30450.c @@ -366,8 +366,8 @@ void func_800559E0(void) { func_8004DA74(); } -void func_800559FC(void) { - snd_is_song_playing(); +s32 func_800559FC(void) { + return snd_is_song_playing(); } INCLUDE_ASM(s32, "30450", snd_set_song_variation_fade); diff --git a/src/C50A0.c b/src/C50A0.c index 8cd9bd5e61..32dbcb74ff 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -25,7 +25,6 @@ INCLUDE_ASM(s32, "C50A0", draw_image_with_clipping); INCLUDE_ASM(s32, "C50A0", draw_tiled_image); s32 integer_log(s32 number, u32 base) { - f64 temp_f0; f32 fNumber = number; s32 ret = 1; diff --git a/src/DF950.c b/src/DF950.c index a8d4606c87..fb48a808aa 100644 --- a/src/DF950.c +++ b/src/DF950.c @@ -19,21 +19,22 @@ extern SoundInstance* D_80159AD0; void snd_start_sound_with_shift(s32 soundID, u8 volume, u8 pan, s16 pitchShift); void snd_adjust_sound_with_shift(s32 soundID, u8 volume, u8 pan, s16 pitchShift); -s32 D_8014F2D0[] = { 0x00000287, 0x000002A8, 0x00000054, 0x00000056, 0x00000024, 0x00000027, 0x00000021, 0x00000022, - 0x00000349, 0x00000273, 0x00000275, 0x00000275, 0x00000274, 0x00000273, 0x00000274, 0x00000099, - 0x0000009E, 0x0000032E, 0x0000008E, 0x00000089, 0x00000083, 0x00000388, 0x000000A0, 0x0000004A, - 0x0000009F, 0x00000168, 0x00000185, 0x00000052, 0x0000004E, 0x0000004F, 0x00000189, 0x00000000, - 0x00000000, 0x00000198, 0x00000199, 0x00000194, 0x0000019A, 0x00000091, 0x00000164, 0x00000271, - 0x00000271, 0x00000274, 0x00000275, 0x00000271, 0x00000273, 0x00000271, 0x00000273, 0x00000271, - 0x00000274, 0x00000275, 0x00000276, 0x00000271, 0x00000273, 0x00000271, 0x00000274, 0x00000276, - 0x00000275, 0x00000271, 0x00000271, 0x00000271, 0x00000271, 0x00000276, 0x00000275, 0x00000274, - 0x0000039E, 0x00000341, 0x00000207, 0x00000271, 0x00000271, 0x00000275, 0x00000276, 0x00000271, - 0x00000271, 0x00000271, 0x00000050, 0x00000070, 0x0000036C, 0x0000036D, 0x00000295, 0x00000043, - 0x00000197, 0x00000221, 0x0000022A, 0x0000022B, 0x00002040, 0x00000046, 0x00000033, 0x00000034, - 0x00000039, 0x0000004C, 0x0000004D, 0x000001B1, 0x000001B2, 0x00000094, 0x0000005D, 0x0000005B, - 0x00000060, 0x000001B3, 0x00000000, 0x000000AD, 0x000000AE, 0x000000AF, 0x0000023D, 0x000000A2, - 0x00000248, 0x00000249, 0x00000391, 0x000003BC, 0x000003AD, 0x0000022C, 0x0000022D, - }; +// sound IDs +s32 D_8014F2D0[] = { + 0x00000287, 0x000002A8, 0x00000054, 0x00000056, 0x00000024, 0x00000027, 0x00000021, 0x00000022, 0x00000349, + 0x00000273, 0x00000275, 0x00000275, 0x00000274, 0x00000273, 0x00000274, 0x00000099, 0x0000009E, 0x0000032E, + 0x0000008E, 0x00000089, 0x00000083, 0x00000388, 0x000000A0, 0x0000004A, 0x0000009F, 0x00000168, 0x00000185, + 0x00000052, 0x0000004E, 0x0000004F, 0x00000189, 0x00000000, 0x00000000, 0x00000198, 0x00000199, 0x00000194, + 0x0000019A, 0x00000091, 0x00000164, 0x00000271, 0x00000271, 0x00000274, 0x00000275, 0x00000271, 0x00000273, + 0x00000271, 0x00000273, 0x00000271, 0x00000274, 0x00000275, 0x00000276, 0x00000271, 0x00000273, 0x00000271, + 0x00000274, 0x00000276, 0x00000275, 0x00000271, 0x00000271, 0x00000271, 0x00000271, 0x00000276, 0x00000275, + 0x00000274, 0x0000039E, 0x00000341, 0x00000207, 0x00000271, 0x00000271, 0x00000275, 0x00000276, 0x00000271, + 0x00000271, 0x00000271, 0x00000050, 0x00000070, 0x0000036C, 0x0000036D, 0x00000295, 0x00000043, 0x00000197, + 0x00000221, 0x0000022A, 0x0000022B, 0x00002040, 0x00000046, 0x00000033, 0x00000034, 0x00000039, 0x0000004C, + 0x0000004D, 0x000001B1, 0x000001B2, 0x00000094, 0x0000005D, 0x0000005B, 0x00000060, 0x000001B3, 0x00000000, + 0x000000AD, 0x000000AE, 0x000000AF, 0x0000023D, 0x000000A2, 0x00000248, 0x00000249, 0x00000391, 0x000003BC, + 0x000003AD, 0x0000022C, 0x0000022D, +}; s32 D_8014F48C[] = { 0x00000336, 0x00000316 }; s32 D_8014F494[] = { 0x00000337, 0x00000317 }; @@ -168,12 +169,10 @@ AlternatingSoundSet D_8014F5A4[] = { { .sounds = D_8014F540, .soundCount = ARRAY_COUNT(D_8014F540), - }, { .sounds = D_8014F548, .soundCount = ARRAY_COUNT(D_8014F548), - }, { .sounds = D_8014F554, @@ -217,9 +216,22 @@ AlternatingSoundSet D_8014F5A4[] = { } }; -s32 D_8014F6B4[] = { 0x000001C1, 0x000001C2, 0x000001C3, 0x000001C4, 0x000001C5, 0x000001C6, 0x000001C7, 0x000001C8, - 0x000001C9, 0x000001CA, 0x000001CB, 0x000001CC, 0x000020A3, 0x000020A4, 0x00000000, - }; +s32 D_8014F6B4[] = { + SOUND_BASIC_DOOR_OPEN, + SOUND_BASIC_DOOR_CLOSE, + SOUND_METAL_DOOR_OPEN, + SOUND_METAL_DOOR_CLOSE, + SOUND_LARGE_DOOR_OPEN, + SOUND_LARGE_DOOR_CLOSE, + SOUND_CREAKY_DOOR_OPEN, + SOUND_CREAKY_DOOR_CLOSE, + SOUND_METAL_GATE_OPEN, + SOUND_METAL_GATE_CLOSE, + SOUND_1CB, + SOUND_1CC, + SOUND_20A3, + SOUND_20A4, +}; extern s32 D_80159AD4; @@ -452,8 +464,21 @@ void sfx_play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID) { } } -INCLUDE_ASM(s32, "DF950", sfx_play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY, - f32 posZ); +void sfx_play_sound_at_position(s32 soundID, s32 flags, f32 posX, f32 posY, f32 posZ) { + if ((soundID & 0xF0000000) == 0x80000000) { + s32 id = D_8014F2D0[soundID & 0xFFFF]; + + sfx_register_looping_sound_at_position(id, flags, posX, posY, posZ); + } else { + s16 volume; + s16 pan; + + sfx_get_spatialized_sound_params(posX, posY, posZ, &volume, &pan, flags); + if (volume >= 0) { + sfx_play_sound_with_params(soundID, volume, pan, 0); + } + } +} INCLUDE_ASM(void, "DF950", sfx_get_spatialized_sound_params, f32 arg0, f32 arg1, f32 arg2, s16* arg3, s16* arg4, s32 arg5); diff --git a/src/E225B0.c b/src/E225B0.c index f2b5026a0d..07d910f27a 100644 --- a/src/E225B0.c +++ b/src/E225B0.c @@ -161,7 +161,7 @@ void func_802B735C_E2290C(void) { case 2: temp_a0->scale = 0.57f; temp_a0->unk_24 += 1; - sfx_play_sound_at_player(SOUND_UNKNOWN_17B, 0); + sfx_play_sound_at_player(SOUND_17B, 0); break; case 3: temp_a0->scale = 0.53f; diff --git a/src/EE65B0.c b/src/EE65B0.c index b838240f97..41437039d3 100644 --- a/src/EE65B0.c +++ b/src/EE65B0.c @@ -40,7 +40,7 @@ ApiStatus func_8024046C_EE6A1C(Evt* script, s32 isInitialCall) { script->functionTemp[0] = evt_get_variable(script, *args++); script->functionTemp[1] = evt_get_variable(script, *args++); script->functionTemp[2] = evt_get_variable(script, *args++); - sfx_adjust_env_sound_pos(SOUND_UNKNOWN_194, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_194, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index d748905464..712203498b 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -943,11 +943,6 @@ s32 D_8014C188[] = { 0xFFFE7960, 0x000F4240, 0x000F4240, 0x000F4240, 0x00000000, s8 D_8014C248[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -// TODO BSS to sort out -extern ModelNode** gCurrentModelTreeRoot; -extern ModelTransformGroupList wTransformGroups; -extern ModelTransformGroupList bTransformGroups; - // BSS static s32 B_801512B0[2]; static ModelCustomGfxBuilderList* gCurrentCustomModelGfxBuildersPtr; @@ -957,6 +952,7 @@ static s32 gEntityHeapBase; static s32 D_801512C8; BSS ModelList* gCurrentModels; static s32 D_801512D0[4]; +extern ModelNode** gCurrentModelTreeRoot; static ModelTransformGroupList* gCurrentTransformGroups; static s8 gMsgGlobalWaveCounter[0x4]; static ModelCustomGfxList* gCurrentCustomModelGfxPtr; @@ -964,6 +960,9 @@ static s32 gLastCreatedEntityIndex; static s8 B_801512F0[0x410]; static GameMode gMainGameState[2]; // TODO rename + + +extern s32 D_80151300; extern s32 D_80151324; extern s32 D_8015132C; extern s32 D_80151330; @@ -974,11 +973,16 @@ extern s32 bStaticEntityDataSize; extern StaticEntityData* wStaticEntityData[30]; extern StaticEntityData* bStaticEntityData[4]; +extern s32* D_801516F4; + extern TileDescriptor gCurrentTileDescriptor; extern ModelList wModelList; extern ModelList bModelList; +extern ModelTransformGroupList wTransformGroups; +extern ModelTransformGroupList bTransformGroups; + extern ModelCustomGfxList wModelSpecialDls; extern ModelCustomGfxList bModelSpecialDls; @@ -1017,6 +1021,8 @@ extern s8 D_8015A578; extern TextureHandle mdl_textureHandles[128]; extern RenderTask mdl_clearRenderTasks[3][0x100]; +extern s32 D_801A7000; // todo ??? + void update_shadows(void); s32 step_entity_commandlist(Entity* entity); void render_shadows(void); @@ -1414,11 +1420,65 @@ void render_shadows(void) { } } -INCLUDE_ASM(void, "a5dd0_len_114e0", update_entity_transform_matrix, Entity* entity); +void update_entity_transform_matrix(Entity* entity) { + Matrix4f sp18; + Matrix4f sp58; + Matrix4f sp98; + Matrix4f spD8; + Matrix4f sp118; + Matrix4f sp158; + Matrix4f sp198; -INCLUDE_ASM(void, "a5dd0_len_114e0", update_shadow_transform_matrix, Shadow* shadow); + if (entity->updateMatrixOverride != NULL) { + entity->updateMatrixOverride(entity); + return; + } -INCLUDE_ASM(void, "a5dd0_len_114e0", update_entity_inverse_rotation_matrix, Entity* entity); + guTranslateF(sp58, entity->position.x, entity->position.y, entity->position.z); + guRotateF(spD8, entity->rotation.x, 1.0f, 0.0f, 0.0f); + guRotateF(sp118, entity->rotation.y, 0.0f, 1.0f, 0.0f); + guRotateF(sp158, entity->rotation.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp158, spD8, sp18); + guMtxCatF(sp18, sp118, sp98); + guScaleF(sp198, entity->scale.x, entity->scale.y, entity->scale.z); + guMtxCatF(sp198, sp98, sp18); + guMtxCatF(sp18, sp58, sp98); + guMtxF2L(sp98, &entity->transformMatrix); +} + +void update_shadow_transform_matrix(Shadow* shadow) { + Matrix4f sp18; + Matrix4f sp58; + Matrix4f sp98; + Matrix4f spD8; + Matrix4f sp118; + Matrix4f sp158; + Matrix4f sp198; + + guTranslateF(sp58, shadow->position.x, shadow->position.y, shadow->position.z); + guRotateF(sp118, shadow->rotation.x, 1.0f, 0.0f, 0.0f); + guRotateF(spD8, shadow->rotation.y, 0.0f, 1.0f, 0.0f); + guRotateF(sp158, shadow->rotation.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp158, sp118, sp98); + guMtxCatF(spD8, sp98, sp98); + guScaleF(sp198, shadow->scale.x, shadow->scale.y, shadow->scale.z); + guMtxCatF(sp198, sp98, sp18); + guMtxCatF(sp18, sp58, sp98); + guMtxF2L(sp98, &shadow->transformMatrix); +} + +void update_entity_inverse_rotation_matrix(Entity* entity) { + Matrix4f sp18; + Matrix4f sp58; + + guRotateF(sp18, -entity->rotation.y, 0.0f, 1.0f, 0.0f); + guRotateF(sp58, -entity->rotation.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp18, sp58, sp18); + guRotateF(sp58, -entity->rotation.x, 1.0f, 0.0f, 0.0f); + guMtxCatF(sp18, sp58, entity->inverseTransformMatrix); + + entity->effectiveSize = sqrtf(((SQ(entity->aabb.x) + SQ(entity->aabb.z)) * 0.25f) + SQ(entity->aabb.y)); +} Entity* get_entity_by_index(s32 index) { return (*gCurrentEntityListPtr)[index & 0xFFF]; @@ -1569,28 +1629,28 @@ s32 entity_get_collision_flags(Entity* entity) { INCLUDE_ASM(s32, "a5dd0_len_114e0", entity_interacts_with_current_partner); -// float bs -#ifdef NON_EQUIVALENT s32 test_player_entity_aabb(Entity* entity) { - f32 temp_f4; - f32 colliderDiameter; + f32 yTemp = entity->position.y - (gPlayerStatus.position.y + gPlayerStatus.colliderHeight); + f32 xCollRadius; + f32 zCollRadius; + f32 xDist; + f32 zDist; - temp_f4 = entity->position.y - (gPlayerStatus.position.y + gPlayerStatus.colliderHeight); - if (temp_f4 > 0.0f || gPlayerStatus.colliderHeight + entity->aabb.y < fabsf(temp_f4)) { + if (yTemp > 0.0f || gPlayerStatus.colliderHeight + entity->aabb.y < fabsf(yTemp)) { return 0; } - if ((gPlayerStatus.colliderDiameter + entity->aabb.x) * 0.5 < fabsf(gPlayerStatus.position.x - entity->position.x)) { - return 0; - } - if ((gPlayerStatus.colliderDiameter + entity->aabb.z) * 0.5 < fabsf(gPlayerStatus.position.z - entity->position.z)) { + xCollRadius = (gPlayerStatus.colliderDiameter + entity->aabb.x) * 0.5; + xDist = fabsf(gPlayerStatus.position.x - entity->position.x); + zCollRadius = ((gPlayerStatus.colliderDiameter + entity->aabb.z) * 0.5); + zDist = fabsf(gPlayerStatus.position.z - entity->position.z); + + if (xCollRadius < xDist || zCollRadius < zDist) { return 0; } + return 1; } -#else -INCLUDE_ASM(s32, "a5dd0_len_114e0", test_player_entity_aabb); -#endif s32 is_player_action_state(s8 actionState) { return actionState == gPlayerActionState; @@ -1629,10 +1689,29 @@ void load_area_specific_entity_data(void) { INCLUDE_ASM(s32, "a5dd0_len_114e0", clear_entity_data); -INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80110E58); +void func_80110E58(void) { + if (!gGameStatusPtr->isBattle) { + D_80151300 = 0x80250000; + gEntityHeapBase = 0x80267FF0; + func_80110F10(); + } else { + s32 i; + + for (i = 0; i < 4; i++) { + bStaticEntityData[i] = 0; + } + D_80151300 = &D_801A7000; + gEntityHeapBase = D_80151300 + 0x3000; + } + gCurrentEntityListPtr = get_entity_list(); + gCurrentShadowListPtr = get_shadow_list(); + D_801512C0 = 0; + D_80151324 = 0; +} INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80110F10); +void entity_anim_make_vertex_pointers(StaticEntityData* entityData, void* baseAddr, Vtx* baseVtx); INCLUDE_ASM(s32, "a5dd0_len_114e0", entity_anim_make_vertex_pointers); s32 is_entity_data_loaded(Entity* entity, StaticEntityData* entityData, s32* loadedStart, s32* loadedEnd); @@ -2364,7 +2443,27 @@ ModelNodeProperty* get_model_property(ModelNode* node, ModelPropertyKeys key) { return NULL; } -INCLUDE_ASM(s32, "a5dd0_len_114e0", _load_model_textures); +void _load_model_textures(ModelNode* model, s32 romOffset, s32 size) { + if (model->type != 2) { + if (model->groupData != NULL) { + s32 numChildren = model->groupData->numChildren; + + if (numChildren != 0) { + s32 i; + + for (i = 0; i < numChildren; i++) { + _load_model_textures(model->groupData->childList[i], romOffset, size); + } + } + } + } else { + char* textureName = (char*)get_model_property(model, MODEL_PROP_KEY_TEXTURE_NAME); + if (textureName != NULL) { + load_tile_header(textureName, romOffset, size); + } + } + mdl_treeIterPos++; +} void load_model_textures(ModelNode* model, s32 romOffset, s32 size) { s32 battleOffset = ((gGameStatusPtr->isBattle != 0) << 17); @@ -2380,7 +2479,7 @@ void load_model_textures(ModelNode* model, s32 romOffset, s32 size) { mdl_treeIterPos = 0; if (model != NULL) { - _load_model_textures(); + _load_model_textures(model, romOffset, size); } } } @@ -2531,8 +2630,19 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80116698); INCLUDE_ASM(s32, "a5dd0_len_114e0", render_models); -void appendGfx_model_group(Model* model); -INCLUDE_ASM(void, "a5dd0_len_114e0", appendGfx_model_group, Model*); +void appendGfx_model_group(Model* model) { + s32 modelTreeDepth = (*mdl_currentModelTreeNodeInfo)[model->modelID].treeDepth; + s32 i; + + for (i = model->modelID - 1; i >= 0; i--) { + if (modelTreeDepth >= (*mdl_currentModelTreeNodeInfo)[i].treeDepth) { + break; + } + } + + mdl_treeIterPos = i + 1; + func_80117D00(model); +} void func_80117D00(Model* model) { Model* mdl = model; // temps needed to match @@ -3140,7 +3250,59 @@ void get_model_env_color_parameters(u8* primR, u8* primG, u8* primB, u8* envR, u *envB = gRenderModelEnvB; } -INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_get_vertex_count); +void mdl_get_vertex_count(Gfx* gfx, s32* numVertices, s32* baseVtx, s32* gfxCount, Vtx* baseAddr) { + s8 stuff[2]; + + s32 temp_t0_2; + u32 w0, w1; + u32 cmd; + u32 temp_v1; + s32 minVtx; + s32 maxVtx; + u32 phi_v1; + + minVtx = 0; + maxVtx = 0; + + if (gfx == NULL) { + *numVertices = maxVtx; + *baseVtx = minVtx; + } else { + Gfx* baseGfx = gfx; + + do { + w0 = gfx->words.w0; + w1 = gfx->words.w1; + cmd = w0 >> 0x18; + + if (cmd == G_DL_NOPUSH) { + phi_v1 = w1; + if (baseAddr != NULL) { + phi_v1 = (phi_v1 & 0xFFFF) + (s32)baseAddr; + } + + temp_t0_2 = (w0 >> 0xC) & 0xFF; + if (minVtx == 0) { + minVtx = phi_v1; + maxVtx = phi_v1 + (temp_t0_2 * 0x10); + } + temp_v1 = phi_v1 + (temp_t0_2 * 0x10); + if (maxVtx < temp_v1) { + maxVtx = temp_v1; + } + if (minVtx > temp_v1) { + minVtx = temp_v1; + } + } + gfx++; + } while (cmd != G_ENDDL); + + *numVertices = (maxVtx - minVtx) >> 4; + *baseVtx = minVtx; + *gfxCount = gfx - baseGfx; + w1 = gfx->words.w1; // TODO required to match + } +} INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_local_gfx_update_vtx_pointers); diff --git a/src/battle/item/UseItem.inc.c b/src/battle/item/UseItem.inc.c index 5dbf19a138..87a20bfd77 100644 --- a/src/battle/item/UseItem.inc.c +++ b/src/battle/item/UseItem.inc.c @@ -5,7 +5,7 @@ EvtSource N(UseItemWithEffect) = { EVT_IF_EQ(EVT_VAR(1), 0) EVT_CALL(UseBattleCamPreset, 69) EVT_WAIT_FRAMES(10) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_208D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208D) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(0), 18) @@ -26,7 +26,7 @@ EvtSource N(UseItemWithEffect) = { EVT_CALL(RemoveItemEntity, EVT_VAR(10)) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_208D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208D) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_GOT_ITEM) EVT_WAIT_FRAMES(4) EVT_ADD(EVT_VAR(1), 45) @@ -79,7 +79,7 @@ EvtSource N(PlayerGoHome) = { EvtSource N(EatItem) = { EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_2095) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) EVT_WAIT_FRAMES(10) EVT_END_LOOP EVT_END_THREAD @@ -92,7 +92,7 @@ EvtSource N(EatItem) = { EvtSource N(DrinkItem) = { EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_2095) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) EVT_WAIT_FRAMES(10) EVT_END_LOOP EVT_END_THREAD diff --git a/src/battle/item/electro_pop.c b/src/battle/item/electro_pop.c index 40277efa90..8aa76efe0a 100644 --- a/src/battle/item/electro_pop.c +++ b/src/battle/item/electro_pop.c @@ -91,7 +91,7 @@ EvtSource N(main) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 20) EVT_CALL(PlayEffect, 0x57, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_FIXED(1.0), 30, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlaySound, SOUND_UNKNOWN_379) + EVT_CALL(PlaySound, SOUND_379) EVT_CALL(GetItemPower, ITEM_VOLT_SHROOM, EVT_VAR(0), EVT_VAR(1)) EVT_CALL(N(func_802A123C_7307DC)) EVT_WAIT_FRAMES(40) diff --git a/src/battle/item/fire_flower.c b/src/battle/item/fire_flower.c index 5266704ef6..ad87db21ec 100644 --- a/src/battle/item/fire_flower.c +++ b/src/battle/item/fire_flower.c @@ -38,7 +38,7 @@ EvtSource N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000080) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundToBlack)) - EVT_CALL(PlaySound, SOUND_UNKNOWN_377) + EVT_CALL(PlaySound, SOUND_377) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_PLANT) EVT_THREAD EVT_WAIT_FRAMES(50) @@ -66,9 +66,9 @@ EvtSource N(main) = { EVT_WAIT_FRAMES(25) EVT_LOOP(12) EVT_WAIT_FRAMES(1) - EVT_CALL(PlaySound, SOUND_UNKNOWN_202C) + EVT_CALL(PlaySound, SOUND_202C) EVT_WAIT_FRAMES(2) - EVT_CALL(PlaySound, SOUND_UNKNOWN_202D) + EVT_CALL(PlaySound, SOUND_202D) EVT_WAIT_FRAMES(1) EVT_END_LOOP EVT_END_THREAD diff --git a/src/battle/item/fright_jar.c b/src/battle/item/fright_jar.c index 459d67b2eb..929ecb9ce7 100644 --- a/src/battle/item/fright_jar.c +++ b/src/battle/item/fright_jar.c @@ -32,7 +32,7 @@ EvtSource N(main) = { EVT_CALL(MoveBattleCamOver, 50) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_CROUCH) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_367) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_367) EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(0), -40) EVT_ADD(EVT_VAR(1), 5) diff --git a/src/battle/item/hustle_drink.c b/src/battle/item/hustle_drink.c index fea51d85f2..5084242bc9 100644 --- a/src/battle/item/hustle_drink.c +++ b/src/battle/item/hustle_drink.c @@ -51,7 +51,7 @@ EvtSource N(main) = { EVT_CALL(UseBattleCamPreset, 13) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_369) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_369) EVT_THREAD EVT_LOOP(2) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FIXED(1.0), EVT_FIXED(1.0), EVT_FIXED(1.0)) @@ -89,7 +89,7 @@ EvtSource N(main) = { EVT_WAIT_FRAMES(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FIXED(1.4), EVT_FIXED(0.8), EVT_FIXED(1.0)) EVT_WAIT_FRAMES(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_208E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208E) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FIXED(0.9), EVT_FIXED(1.3), EVT_FIXED(1.0)) EVT_WAIT_FRAMES(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FIXED(0.9), EVT_FIXED(1.2), EVT_FIXED(1.0)) @@ -101,7 +101,7 @@ EvtSource N(main) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) EVT_END_THREAD EVT_LOOP(10) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_369) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_369) EVT_CALL(PlayEffect, 0x6, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x6, 1, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_WAIT_FRAMES(4) diff --git a/src/battle/item/mystery.c b/src/battle/item/mystery.c index 30e2e43766..d7613b96c5 100644 --- a/src/battle/item/mystery.c +++ b/src/battle/item/mystery.c @@ -278,9 +278,9 @@ EvtSource N(main) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_THREAD EVT_WAIT_FRAMES(220) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_3F3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3F3) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_368) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_368) EVT_CALL(N(func_802A13E4_72C994)) EVT_WAIT_FRAMES(2) EVT_IF_NE(EVT_VAR(0), 133) diff --git a/src/battle/item/pow_block.c b/src/battle/item/pow_block.c index 12135b6e1e..b9b95a5c1a 100644 --- a/src/battle/item/pow_block.c +++ b/src/battle/item/pow_block.c @@ -76,7 +76,7 @@ EvtSource N(main) = { EVT_CALL(ShakeCam, 1, 0, 2, EVT_FIXED(6.0)) EVT_CALL(ShakeCam, 1, 0, 2, EVT_FIXED(5.0)) EVT_CALL(ShakeCam, 1, 0, 2, EVT_FIXED(4.0)) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_2030) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2030) EVT_CALL(ShakeCam, 1, 0, 2, EVT_FIXED(3.0)) EVT_CALL(ShakeCam, 1, 0, 2, EVT_FIXED(2.0)) EVT_CALL(ShakeCam, 1, 0, 2, EVT_FIXED(1.0)) diff --git a/src/battle/item/repel_gel.c b/src/battle/item/repel_gel.c index ce2d5c73e4..9d9918f6c0 100644 --- a/src/battle/item/repel_gel.c +++ b/src/battle/item/repel_gel.c @@ -19,14 +19,14 @@ ApiStatus N(func_802A123C_72DDAC)(Evt* script, s32 isInitialCall) { EvtSource N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000097) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_375) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_375) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_30008) EVT_WAIT_FRAMES(45) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_10002) EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 20) EVT_CALL(PlayEffect, 0x33, 3, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_FIXED(1.0), 30, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_376) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_376) EVT_CALL(GetItemPower, ITEM_REPEL_GEL, EVT_VAR(0), EVT_VAR(1)) EVT_CALL(N(func_802A123C_72DDAC)) EVT_WAIT_FRAMES(20) diff --git a/src/battle/item/shooting_star.c b/src/battle/item/shooting_star.c index 180970af7f..a187e92a0c 100644 --- a/src/battle/item/shooting_star.c +++ b/src/battle/item/shooting_star.c @@ -105,11 +105,11 @@ EvtSource N(main) = { EVT_THREAD EVT_SET(EVT_VAR(0), 0) EVT_LOOP(10) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_259) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_259) EVT_CALL(N(func_802A123C_71D9AC)) EVT_ADD(EVT_VAR(0), 1) EVT_WAIT_FRAMES(5) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_25A) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_25A) EVT_CALL(N(func_802A123C_71D9AC)) EVT_ADD(EVT_VAR(0), 1) EVT_WAIT_FRAMES(5) @@ -119,10 +119,10 @@ EvtSource N(main) = { EVT_SET(EVT_VAR(0), 0) EVT_WAIT_FRAMES(50) EVT_LOOP(10) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_25C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_25C) EVT_ADD(EVT_VAR(0), 1) EVT_WAIT_FRAMES(5) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_25D) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_25D) EVT_ADD(EVT_VAR(0), 1) EVT_WAIT_FRAMES(5) EVT_END_LOOP diff --git a/src/battle/item/sleepy_sheep.c b/src/battle/item/sleepy_sheep.c index 8522ce3836..a942b543af 100644 --- a/src/battle/item/sleepy_sheep.c +++ b/src/battle/item/sleepy_sheep.c @@ -344,7 +344,7 @@ EvtSource N(main) = { EVT_CALL(SetBattleCamZoom, 169) EVT_CALL(MoveBattleCamOver, 50) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_364) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_364) EVT_LOOP(7) EVT_CALL(StartRumble, 2) EVT_CALL(ShakeCam, 1, 0, 2, EVT_FIXED(0.5)) diff --git a/src/battle/item/snowman_doll.c b/src/battle/item/snowman_doll.c index 5572e5e288..35d716163b 100644 --- a/src/battle/item/snowman_doll.c +++ b/src/battle/item/snowman_doll.c @@ -39,7 +39,7 @@ EvtSource N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000081) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundToBlack)) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_363) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_363) EVT_THREAD EVT_LOOP(45) EVT_CALL(RandInt, 300, EVT_VAR(0)) @@ -58,19 +58,19 @@ EvtSource N(main) = { EVT_CALL(PlayEffect, 0x60, 0, 0, 0, 20, EVT_FIXED(1.0), 160, 0, 0, 0, 0, 0, 0, 0) EVT_THREAD EVT_WAIT_FRAMES(17) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_202E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_202E) EVT_CALL(StartRumble, 9) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FIXED(1.0)) EVT_WAIT_FRAMES(46) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_202E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_202E) EVT_CALL(StartRumble, 9) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FIXED(1.0)) EVT_WAIT_FRAMES(25) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_202E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_202E) EVT_CALL(StartRumble, 9) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FIXED(1.0)) EVT_WAIT_FRAMES(25) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_202E) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_202E) EVT_CALL(StartRumble, 9) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FIXED(1.0)) EVT_END_THREAD diff --git a/src/battle/item/stone_cap.c b/src/battle/item/stone_cap.c index 10df048a1d..1ac8ab598f 100644 --- a/src/battle/item/stone_cap.c +++ b/src/battle/item/stone_cap.c @@ -50,12 +50,12 @@ ApiStatus N(func_802A123C_7217DC)(Evt* script, s32 isInitialCall) { EvtSource N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000088) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(PlaySound, SOUND_UNKNOWN_361) + EVT_CALL(PlaySound, SOUND_361) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_30009) EVT_WAIT_FRAMES(30) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_CROUCH) EVT_CALL(GetItemPower, ITEM_STONE_CAP, EVT_VAR(0), EVT_VAR(1)) - EVT_CALL(PlaySound, SOUND_UNKNOWN_362) + EVT_CALL(PlaySound, SOUND_362) EVT_CALL(N(func_802A123C_7217DC)) EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_WAIT_FRAMES(20) diff --git a/src/battle/item/stop_watch.c b/src/battle/item/stop_watch.c index 71aa60c61c..7b61233ef2 100644 --- a/src/battle/item/stop_watch.c +++ b/src/battle/item/stop_watch.c @@ -32,7 +32,7 @@ EvtSource N(main) = { EVT_END_THREAD EVT_CALL(N(FadeBackgroundToBlack)) EVT_CALL(PlayEffect, 0x62, 0, 0, 0, 0, EVT_FIXED(1.0), 200, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_246) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_246) EVT_WAIT_FRAMES(200) EVT_CALL(UseBattleCamPreset, 3) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/item/super_soda.c b/src/battle/item/super_soda.c index 103fc3db0b..80ec8cb67d 100644 --- a/src/battle/item/super_soda.c +++ b/src/battle/item/super_soda.c @@ -167,7 +167,7 @@ EvtSource N(main) = { EVT_CALL(InitTargetIterator) EVT_CALL(GetOwnerTarget, EVT_VAR(0), EVT_VAR(1)) EVT_IF_EQ(EVT_VAR(0), 0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_UNKNOWN_2095) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_DRINK) EVT_WAIT_FRAMES(45) EVT_CALL(GetActorPos, ACTOR_PLAYER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) diff --git a/src/battle/item/thunder_rage.c b/src/battle/item/thunder_rage.c index 910ddb0079..540f396dff 100644 --- a/src/battle/item/thunder_rage.c +++ b/src/battle/item/thunder_rage.c @@ -60,7 +60,7 @@ EvtSource N(main) = { EVT_CALL(MoveBattleCamOver, 20) EVT_END_CHILD_THREAD EVT_CALL(N(FadeBackgroundToBlack)) - EVT_CALL(PlaySound, SOUND_UNKNOWN_365) + EVT_CALL(PlaySound, SOUND_365) EVT_WAIT_FRAMES(10) EVT_CALL(InitTargetIterator) EVT_LABEL(0) diff --git a/src/battle/item/volt_shroom.c b/src/battle/item/volt_shroom.c index cb4d7905cf..87c57c5756 100644 --- a/src/battle/item/volt_shroom.c +++ b/src/battle/item/volt_shroom.c @@ -25,7 +25,7 @@ EvtSource N(main) = { EVT_SETF(EVT_VAR(3), EVT_FIXED(1.0)) EVT_CALL(MultiplyByActorScale, EVT_VAR(3)) EVT_CALL(PlayEffect, 0x57, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3), 30, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlaySound, SOUND_UNKNOWN_379) + EVT_CALL(PlaySound, SOUND_379) EVT_CALL(GetItemPower, ITEM_VOLT_SHROOM, EVT_VAR(0), EVT_VAR(1)) EVT_CALL(N(func_802A123C_71AA2C)) EVT_WAIT_FRAMES(20) diff --git a/src/cd180_len_38f0.c b/src/cd180_len_38f0.c index e32a3fcc3d..3f1e0a6b0b 100644 --- a/src/cd180_len_38f0.c +++ b/src/cd180_len_38f0.c @@ -1,34 +1,367 @@ #include "common.h" +#include "overlay.h" -INCLUDE_ASM(void, "cd180_len_38f0", _render_transition_stencil, s32 arg0, f32 arg1, s32 arg2); +// BSS +extern s32 screen_overlay_frontType; +extern f32 screen_overlay_frontZoom; +extern s32 screen_overlay_backType; +extern f32 screen_overlay_backZoom; +extern s32 D_80156910; +extern ScreenOverlay D_8015C790[2]; -INCLUDE_ASM(void, "cd180_len_38f0", set_screen_overlay_params_front, u8 arg0, f32 arg1); +s32 D_8014C6F0 = 2; -INCLUDE_ASM(void, "cd180_len_38f0", set_screen_overlay_params_back, s32 arg0, f32 arg1); +// padding? +s32 D_8014C6F4[] = { 0x00000000, 0x00000000, 0x00000000, }; -INCLUDE_ASM(void, "cd180_len_38f0", get_screen_overlay_params, s32 arg0, f32* arg1, f32* arg2); +#include "ui/star_silhouette.png.inc.c" -INCLUDE_ASM(s32, "cd180_len_38f0", set_screen_overlay_color, s32 arg0, u8 arg1, u8 arg2, u8 arg3); +#include "ui/mario_head_silhouette.png.inc.c" -INCLUDE_ASM(void, "cd180_len_38f0", set_screen_overlay_center, s32 arg0, s32 arg1, s32 arg2, s32 arg3); +#include "ui/quarter_circle_silhouette.png.inc.c" -INCLUDE_ASM(s32, "cd180_len_38f0", set_screen_overlay_center_worldpos); +#include "ui/flame_thing_silhouette.png.inc.c" -INCLUDE_ASM(void, "cd180_len_38f0", set_screen_overlay_alpha, s32 arg0, f32 arg1); +s32 D_8014E500[] = { 0xFF8000A9, 0x00000000, 0x00000000, 0xFFFFFF00, 0xFF34FFBB, 0x00000000, 0x00000000, 0xFFFFFF00, 0x0000FF24, 0x00000000, 0x00000000, 0xFFFFFF00, 0x008000A9, 0x00000000, 0x00000000, 0xFFFFFF00, 0xFE88007B, 0x00000000, 0x00000000, 0xFFFFFF00, 0x0000018B, 0x00000000, 0x00000000, 0xFFFFFF00, 0xFF17FEC0, 0x00000000, 0x00000000, 0xFFFFFF00, 0x00CCFFBB, 0x00000000, 0x00000000, 0xFFFFFF00, 0x00E8FEC0, 0x00000000, 0x00000000, 0xFFFFFF00, 0x0178007A, 0x00000000, 0x00000000, 0xFFFFFF00, }; -INCLUDE_ASM(s32, "cd180_len_38f0", clear_screen_overlays); +s32 D_8014E5A0[] = { 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001201, 0x00003000, 0xE3001402, 0x00000C00, 0xE3000C00, 0x00000000, 0xE3001801, 0x00000000, 0xE3001A01, 0x00000000, 0xFCFFE7FF, 0xFFCD92C9, 0xE200001C, 0x00504340, 0xD9000000, 0x00000000, 0xD9FFFFFF, 0x00200004, 0xDF000000, 0x00000000, }; -INCLUDE_ASM(s32, "cd180_len_38f0", func_80138188); +s32 D_8014E618[] = { 0xDE000000, &D_8014E5A0, 0xE3001001, 0x00000000, 0xFD88000F, ui_quarter_circle_silhouette_png, 0xF5880400, 0x070D4350, 0xE6000000, 0x00000000, 0xF4000000, 0x0703E07C, 0xE7000000, 0x00000000, 0xF5800400, 0x000D4350, 0xF2000000, 0x0007C07C, 0xF2000000, 0x000FC0FC, 0xDF000000, 0x00000000, }; + +s32 D_8014E670[] = { 0xDE000000, &D_8014E5A0, 0xE3001001, 0x00000000, 0xFD88001F, ui_mario_head_silhouette_png, 0xF5880800, 0x07098260, 0xE6000000, 0x00000000, 0xF4000000, 0x0707E0FC, 0xE7000000, 0x00000000, 0xF5800800, 0x00098260, 0xF2000000, 0x000FC0FC, 0xDF000000, 0x00000000, }; + +s32 D_8014E6C0[] = { 0xDE000000, &D_8014E5A0, 0xE3001001, 0x00000000, 0xFD88000F, ui_star_silhouette_png, 0xF5880400, 0x07098350, 0xE6000000, 0x00000000, 0xF4000000, 0x0703E0FC, 0xE7000000, 0x00000000, 0xF5800400, 0x00098350, 0xF2000000, 0x0007C0FC, 0xF2000000, 0x000FC0FC, 0xDF000000, 0x00000000, }; + +s32 D_8014E718[] = { 0xDE000000, &D_8014E5A0, 0xE3001001, 0x00000000, 0xFD88003F, ui_flame_thing_silhouette_png, 0xF5881000, 0x070D8360, 0xE6000000, 0x00000000, 0xF4000000, 0x070FC0FC, 0xE7000000, 0x00000000, 0xF5881000, 0x000D8360, 0xF2000000, 0x000FC0FC, 0xF2000000, 0x001FC1FC, 0xDF000000, 0x00000000, }; + +s32 D_8014E770[] = { 0x000000F0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x014000F0, 0x00000000, 0x28000000, 0xFFFFFFFF, 0x000000DA, 0x00000000, 0x000002C0, 0xFFFFFFFF, 0x014000DA, 0x00000000, 0x280002C0, 0xFFFFFFFF, 0x000000C4, 0x00000000, 0x00000580, 0xFFFFFFFF, 0x014000C4, 0x00000000, 0x28000580, 0xFFFFFFFF, 0x000000AE, 0x00000000, 0x00000840, 0xFFFFFFFF, 0x014000AE, 0x00000000, 0x28000840, 0xFFFFFFFF, 0x00000098, 0x00000000, 0x00000B00, 0xFFFFFFFF, 0x01400098, 0x00000000, 0x28000B00, 0xFFFFFFFF, 0x00000082, 0x00000000, 0x00000DC0, 0xFFFFFFFF, 0x01400082, 0x00000000, 0x28000DC0, 0xFFFFFFFF, 0x0000006C, 0x00000000, 0x00001080, 0xFFFFFFFF, 0x0140006C, 0x00000000, 0x28001080, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00001340, 0xFFFFFFFF, 0x01400056, 0x00000000, 0x28001340, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00001600, 0xFFFFFFFF, 0x01400040, 0x00000000, 0x28001600, 0xFFFFFFFF, 0x0000002A, 0x00000000, 0x000018C0, 0xFFFFFFFF, 0x0140002A, 0x00000000, 0x280018C0, 0xFFFFFFFF, 0x00000014, 0x00000000, 0x00001B80, 0xFFFFFFFF, 0x01400014, 0x00000000, 0x28001B80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00001E00, 0xFFFFFFFF, 0x01400000, 0x00000000, 0x28001E00, 0xFFFFFFFF, }; + +s32 D_8014E8F0[] = { 0xD7000000, 0x80008000, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE2001D00, 0x00000004, 0xEE000000, 0x00000000, 0xE200001C, 0x50504360, 0xFCFFE7FF, 0xFFCE7F3F, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xD9DDF9FF, 0x00000000, 0xD9FFFFFF, 0x00000405, 0x0100A014, D_8014E500, 0x06000204, 0x00060004, 0x06000802, 0x00060A00, 0x06020C04, 0x000E0604, 0x06100E04, 0x000E1206, 0xE7000000, 0x00000000, 0xE2001D00, 0x00000000, 0xDF000000, 0x00000000, }; + +s32 D_8014E9A8[] = { 0xE7000000, 0x00000000, 0xE2001D00, 0x00000004, 0xEE000000, 0x00140000, 0xE200001C, 0x00504A50, 0xFCFFE7FF, 0xFFCE7F3F, 0xD9DDF9FF, 0x00000000, 0xD9FFFFFF, 0x00000005, 0xE3001801, 0x00000000, 0xE3000A01, 0x00000000, 0xE3001201, 0x00002000, 0xE3000C00, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3000D01, 0x00000000, 0xE3001402, 0x00000C00, 0xF65003C0, 0x00000000, 0xE3001801, 0x000000C0, 0xE7000000, 0x00000000, 0xE2001D00, 0x00000000, 0xDF000000, 0x00000000, }; + +s32 D_8014EA48[] = { 0xE2001D00, 0x00000004, 0xEE000000, 0x00140000, 0xE200001C, 0x00552210, 0xD9FDF9FF, 0x00000000, 0xD9DFFFFF, 0x00000000, 0xD7000002, 0x80008000, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0x01018030, &D_8014E770, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000000, 0x0727C02C, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000000, 0x0027C02C, 0x06000402, 0x00060204, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF400002C, 0x0727C058, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF200002C, 0x0027C058, 0x06040806, 0x000A0608, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000058, 0x0727C084, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000058, 0x0027C084, 0x06080C0A, 0x000E0A0C, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000084, 0x0727C0B0, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000084, 0x0027C0B0, 0x060C100E, 0x00120E10, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF40000B0, 0x0727C0DC, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF20000B0, 0x0027C0DC, 0x06101412, 0x00161214, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF40000DC, 0x0727C108, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF20000DC, 0x0027C108, 0x06141816, 0x001A1618, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000108, 0x0727C134, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000108, 0x0027C134, 0x06181C1A, 0x001E1A1C, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000134, 0x0727C160, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000134, 0x0027C160, 0x061C201E, 0x00221E20, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000160, 0x0727C18C, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000160, 0x0027C18C, 0x06202422, 0x00262224, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF400018C, 0x0727C1B8, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF200018C, 0x0027C1B8, 0x06242826, 0x002A2628, 0xFD10009F, &D_80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF40001B8, 0x0727C1DC, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF20001B8, 0x0027C1DC, 0x06282C2A, 0x002E2A2C, 0xE7000000, 0x00000000, 0xE2001D00, 0x00000000, }; + + +INCLUDE_ASM(void, "cd180_len_38f0", _render_transition_stencil, u8 arg0, f32 arg1, ScreenOverlay* arg2); + +void set_screen_overlay_params_front(u8 type, f32 zoom) { + screen_overlay_frontType = type; + screen_overlay_frontZoom = zoom; +} + +void set_screen_overlay_params_back(u8 type, f32 zoom) { + screen_overlay_backType = type; + screen_overlay_backZoom = zoom; +} + +void get_screen_overlay_params(s32 idx, u8* type, f32* zoom) { + switch (idx) { + case 0: + *type = screen_overlay_frontType; + *zoom = screen_overlay_frontZoom; + break; + case 1: + *type = screen_overlay_backType; + *zoom = screen_overlay_backZoom; + break; + } +} + +void set_screen_overlay_color(s32 idx, u8 r, u8 g, u8 b) { + switch (idx) { + case 0: + case 1: + D_8015C790[idx].color.r = r; + D_8015C790[idx].color.g = g; + D_8015C790[idx].color.b = b; + break; + } +} + +void set_screen_overlay_center(s32 idx, s32 arg1, s32 arg2, s32 arg3) { + switch (idx) { + case 0: + case 1: + switch (arg1) { + case 0: + D_8015C790[idx].screenPos[0][0] = arg2; + D_8015C790[idx].screenPos[0][1] = arg3; + break; + case 1: + D_8015C790[idx].screenPos[1][0] = arg2; + D_8015C790[idx].screenPos[1][1] = arg3; + break; + } + break; + } +} + +void set_screen_overlay_center_worldpos(s32 idx, s32 posIdx, s32 x, s32 y, s32 z) { + Camera* camera = &gCameras[gCurrentCameraID]; + f32 tx, ty, tz, ts; + + switch (idx) { + case 0: + case 1: + transform_point(camera->perspectiveMatrix[0], x, y, z, 1.0f, &tx, &ty, &tz, &ts); + ts = 1.0f / ts; + tx *= ts; + ty *= -ts; + tz *= ts; + tx = (((tx * camera->viewportW) + camera->viewportW) * 0.5) + camera->viewportStartX; + ty = (((ty * camera->viewportH) + camera->viewportH) * 0.5) + camera->viewportStartY; + + switch (posIdx) { + case 0: + D_8015C790[idx].screenPos[0][0] = tx; + D_8015C790[idx].screenPos[0][1] = ty; + break; + case 1: + D_8015C790[idx].screenPos[1][0] = tx; + D_8015C790[idx].screenPos[1][1] = ty; + break; + } + break; + } +} + +void set_screen_overlay_alpha(s32 idx, f32 alpha) { + switch (idx) { + case 0: + case 1: + D_8015C790[idx].alpha = alpha; + break; + } +} + +void clear_screen_overlays(void) { + ScreenOverlay* it; + s32 i; + + screen_overlay_frontType = -1; + screen_overlay_backType = -1; + screen_overlay_frontZoom = -1.0f; + screen_overlay_backZoom = -1.0f; + + for (it = &D_8015C790[0], i = 0; i < ARRAY_COUNT(D_8015C790); i++, it++) { + it->color.b = 0; + it->color.g = 0; + it->color.r = 0; + it->screenPos[1][1] = 0; + it->screenPos[1][0] = 0; + it->screenPos[0][1] = 0; + it->screenPos[0][0] = 0; + it->alpha = 255.0f; + } +} + +void func_80138188(void) { + screen_overlay_backZoom = 0; +} void func_80138198(void) { } -INCLUDE_ASM(s32, "cd180_len_38f0", render_screen_overlay_frontUI); +void render_screen_overlay_frontUI(void) { + if (screen_overlay_frontType != -1 && screen_overlay_frontZoom != -1.0f && gGameStatusPtr->isBattle != 2) { + _render_transition_stencil(screen_overlay_frontType, screen_overlay_frontZoom, &D_8015C790[0]); + } +} -INCLUDE_ASM(s32, "cd180_len_38f0", render_screen_overlay_backUI); +void render_screen_overlay_backUI(void) { + if (screen_overlay_backType != -1 && screen_overlay_backZoom != -1.0f && gGameStatusPtr->isBattle != 2) { + _render_transition_stencil(screen_overlay_backType, screen_overlay_backZoom, &D_8015C790[1]); + } +} -INCLUDE_ASM(s32, "cd180_len_38f0", set_map_transition_effect); +void set_map_transition_effect(s32 arg0) { + D_8014C6F0 = arg0; +} +// r g b register ordering issues +#ifdef NON_EQUIVALENT +s32 update_exit_map_screen_overlay(s16* progress) { + u8 overlayColor; + u8 type; + s32 phi_s2; + s16 t; + u8 r; + u8 g; + u8 b; + + type = 0; + + g = 0; + b = 0; + r = 0; + + t = 0; + phi_s2 = 20; + + switch (D_8014C6F0) { + case 1: + type = 0; + break; + case 3: + r = g = b = 208; + type = 1; + phi_s2 = 10; + if (gGameStatusPtr->demoState == 2) { + gGameStatusPtr->nextDemoScene = 18; + } + break; + case 6: + r = g = b = 208; + case 0: + type = 1; + break; + case 7: + if (gGameStatusPtr->demoState == 2) { + gGameStatusPtr->nextDemoScene = 18; + } + case 11: + case 15: + r = g = b = 208; + case 4: + case 5: + type = 1; + phi_s2 = 7; + break; + case 14: + r = g = b = 208; + case 2: + type = 1; + phi_s2 = 50; + break; + case 8: + set_screen_overlay_alpha(0, 0.0f); + type = 4; + break; + case 9: + r = g = b = 208; + case 10: + set_screen_overlay_alpha(0, 0.0f); + type = 4; + phi_s2 = 7; + break; + case 12: + set_screen_overlay_alpha(0, 160.0f); + r = g = b = 208; + type = 5; + phi_s2 = 7; + break; + case 13: + set_screen_overlay_alpha(0, 0.0f); + type = 5; + phi_s2 = 7; + break; + case 16: + set_screen_overlay_center(0, 0, 15, 28); + set_screen_overlay_center(0, 1, 305, 156); + set_screen_overlay_params_front(12, 255.0f); + *progress = 0xFF; + return 1; + } + + if (D_8014C6F0 == 5) { + overlayColor = ((255 - *progress) * 208) / 255; + set_screen_overlay_color(0, overlayColor, overlayColor, overlayColor); + set_screen_overlay_params_front(type, 255.0f); + if (*progress == 0xFF) { + return 1; + } + + *progress += phi_s2; + if (*progress > 0xFF) { + *progress = 0xFF; + } + } else { + set_screen_overlay_color(t, r, g, b); + + if (t == 0) { + set_screen_overlay_params_front(type, *progress); + } else { + set_screen_overlay_params_back(type, *progress); + } + + if (*progress == 0xFF) { + return 1; + } + + *progress += phi_s2; + if (*progress > 0xFF) { + *progress = 0xFF; + } + } + return 0; +} +#else INCLUDE_ASM(s32, "cd180_len_38f0", update_exit_map_screen_overlay); +#endif -INCLUDE_ASM(s32, "cd180_len_38f0", update_enter_map_screen_overlay); +u8 update_enter_map_screen_overlay(s16* progress) { + u8 frontType = 0; + s32 amt = 20; + u8 ret = FALSE; + + switch (D_8014C6F0) { + case 3: + set_screen_overlay_color(0, 208, 208, 208); + amt = 50; + break; + case 2: + frontType = 1; + amt = 50; + break; + case 4: + case 5: + case 7: + case 9: + case 10: + frontType = 1; + amt = 7; + break; + case 0: + case 1: + case 6: + case 13: + case 14: + frontType = 1; + break; + case 8: + case 15: + frontType = 4; + break; + case 11: + frontType = 5; + amt = 7; + break; + case 12: + frontType = 4; + amt = 7; + break; + case 16: + set_screen_overlay_center(0, 0, 15, 28); + set_screen_overlay_center(0, 1, 305, 156); + set_screen_overlay_params_front(12, *progress); + amt = 2; + break; + } + + if (D_8014C6F0 != 0x10) { + set_screen_overlay_params_front(frontType, *progress); + } + + if (*progress == 0) { + ret = TRUE; + } + + *progress -= amt; + + if (*progress < 0) { + *progress = 0; + } + + return ret; +} diff --git a/src/common/UnkSfxFunc.inc.c b/src/common/UnkSfxFunc.inc.c index bd171a5d4f..dd8fce8b23 100644 --- a/src/common/UnkSfxFunc.inc.c +++ b/src/common/UnkSfxFunc.inc.c @@ -11,13 +11,13 @@ ApiStatus N(UnkSfxFunc)(Evt* script, s32 isInitialCall) { distY = actor->state.goalPos.y - actor->currentPos.y; distZ = actor->state.goalPos.z - actor->currentPos.z; script->functionTemp[0] = ((sqrtf(SQ(distX) + SQ(distY) + SQ(distZ)) / actor->state.speed) * 0.5f) + 1.0f; - sfx_play_sound_at_position(SOUND_UNKNOWN_359, 0.0f, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(SOUND_359, 0.0f, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } if (script->functionTemp[0]-- > 0) { return ApiStatus_BLOCK; } - sfx_play_sound_at_position(SOUND_UNKNOWN_759, 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + sfx_play_sound_at_position(SOUND_759, 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); return ApiStatus_DONE2; } diff --git a/src/d0a70_len_4fe0.c b/src/d0a70_len_4fe0.c index 565cca7d41..fb185c75ce 100644 --- a/src/d0a70_len_4fe0.c +++ b/src/d0a70_len_4fe0.c @@ -1,10 +1,11 @@ #include "common.h" #include "ld_addrs.h" +#include "sprite.h" typedef struct { - /* 0x00 */ s8 arrayIdx; + /* 0x00 */ u8 arrayIdx; /* 0x01 */ u8 meshType; - /* 0x02 */ s8 renderType; + /* 0x02 */ u8 renderType; /* 0x03 */ u8 subdivX; /* 0x04 */ u8 subdivY; /* 0x05 */ s8 unk_05; @@ -20,12 +21,12 @@ typedef struct { /* 0x1C */ s32 unk_1C[2][4]; /* 0x3C */ f32 unk_3C[2][4]; /* 0x5C */ u8* buf; - /* 0x60 */ s16 bufSize; + /* 0x60 */ u16 bufSize; /* 0x62 */ char unk_62[0x2]; /* 0x64 */ s32* unk_64; - /* 0x68 */ s32* unk_68[2]; - /* 0x70 */ s32* unk_70[2]; - /* 0x78 */ char unk_78[0x4]; + /* 0x68 */ Vtx* vtxBufs[2]; + /* 0x70 */ Gfx* gfxBufs[2]; + /* 0x78 */ s32 unk_78; } FoldState; // size = 0x7C typedef struct FoldDataCache { @@ -48,7 +49,7 @@ typedef struct FoldImageRec { /* 0x1A */ char unk_1A[0x4]; /* 0x1E */ s16 unk_1E; /* 0x20 */ char unk_20[0x4]; - /* 0x24 */ u8 gfxOtherModeD; + /* 0x24 */ u8 alphaMultiplier; } FoldImageRec; // size = 0x25 typedef struct FoldGfxDescriptor { @@ -62,10 +63,16 @@ typedef struct FoldGfxDescriptor { /* 0x0F */ s8 unk_0F; } FoldGfxDescriptor; // size = 0x10 +typedef struct FoldRenderMode { + /* 0x0 */ s32 mode1; + /* 0x4 */ s32 mode2; + /* 0x8 */ u8 flags; // only checks TRUE so far. some kind of switch? +} FoldRenderMode; // size = 0xC + typedef FoldState FoldStateList[90]; // BSS -extern FoldImageRec D_80156920; // todo not sure on the type +extern FoldImageRec D_80156920; extern Vtx* D_80156948[2]; extern Vtx* fold_vtxBuf; extern FoldStateList* D_80156954; @@ -80,36 +87,75 @@ FoldImageRec* fold_currentImage = &D_80156920; u16 fold_vtxCount = 0; -// padding? -s16 D_8014EE16 = 0; +Lights2 D_8014EE18 = { + .a = { + .l = { + .col = { 144, 144, 144 }, + .colc = { 144, 144, 144 }, + } + }, + .l = { + { + .l = { + .col = { 255, 255, 255 }, + .colc = { 255, 255, 255 }, + .dir = { 0, 0, 120}, + } + }, { + .l = { + .col = { 255, 255, 255 }, + .colc = { 255, 255, 255 }, + .dir = { 0, 0, 136 }, + } + } + } +}; -s32 D_8014EE18[] = { 0x90909000, 0x90909000, 0xFFFFFF00, 0xFFFFFF00, 0x00007800, 0x00000000, 0xFFFFFF00, 0xFFFFFF00, - 0x00008800, 0x00000000, - }; +Vp D_8014EE40 = { + .vp = { + .vscale = { 640, 480, 511, 0 }, + .vtrans = { 640, 480, 511, 0 }, + } +}; -s32 D_8014EE40[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000, }; - -s32 D_8014EE50[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x02000000, }; +Vp D_8014EE50 = { + .vp = { + .vscale = { 640, 480, 511, 0 }, + .vtrans = { 640, 480, 512, 0 }, + } +}; u16 D_8014EE60 = 300; -// padding? -s16 D_8014EE62 = 0; -s16 D_8014EE64 = 0; -s16 D_8014EE66 = 0; +Gfx D_8014EE68[] = { + gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), + gsDPSetAlphaCompare(G_AC_NONE), + gsSPSetOtherMode(G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, + G_AD_DISABLE | G_CD_DISABLE | G_TC_FILT | G_TF_BILERP | G_TP_PERSP), + gsSPEndDisplayList(), +}; -s32 D_8014EE68[] = { 0xD9FDF9FF, 0x00000000, 0xD9FFFFFF, 0x00200005, 0xD7000002, 0xFFFFFFFF, 0xE2001E01, 0x00000000, - 0xE3000A11, 0x00082CF0, 0xDF000000, 0x00000000, - }; - -s32 D_8014EE98[] = { 0x00441208, 0x00111208, 0x00000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, - 0x01000000, 0x00404B40, 0x00104B40, 0x01000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, - 0x00104B40, 0x01000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, 0x01000000, - 0x00404B40, 0x00104B40, 0x01000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, - 0x01000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, 0x01000000, 0x00441208, - 0x00111208, 0x00000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, 0x01000000, - 0x00441208, 0x00111208, 0x00000000, - }; +FoldRenderMode D_8014EE98[17] = { + { 0x00441208, 0x00111208, FALSE }, + { 0x00441208, 0x00111208, FALSE }, + { 0x00404B40, 0x00104B40, TRUE }, + { 0x00404B40, 0x00104B40, TRUE }, + { 0x00441208, 0x00111208, FALSE }, + { 0x00404B40, 0x00104B40, TRUE }, + { 0x00441208, 0x00111208, FALSE }, + { 0x00404B40, 0x00104B40, TRUE }, + { 0x00404B40, 0x00104B40, TRUE }, + { 0x00441208, 0x00111208, FALSE }, + { 0x00404B40, 0x00104B40, TRUE }, + { 0x00441208, 0x00111208, FALSE }, + { 0x00404B40, 0x00104B40, TRUE }, + { 0x00441208, 0x00111208, FALSE }, + { 0x00441208, 0x00111208, FALSE }, + { 0x00404B40, 0x00104B40, TRUE }, + { 0x00441208, 0x00111208, FALSE }, +}; s32 fold_groupOffsets[] = { 0x00014358, 0x00018200, 0x0001A858, 0x0001E830, 0x00029458, 0x000314E0, 0x00033498, 0x00038988, 0x00039228, @@ -119,17 +165,22 @@ s32 fold_groupOffsets[] = { extern FoldDataCache fold_gfxDataCache[8]; -void fold_clear_state_gfx(FoldState*); -void fold_clear_state_data(FoldState*); -void fold_init_state(FoldState*); +void fold_clear_state_gfx(FoldState* state); +void fold_clear_state_data(FoldState* state); +void fold_init_state(FoldState* state); void func_8013B0EC(FoldState* state); void func_8013B1B0(FoldState* state, Matrix4f mtx); -void func_8013BC88(FoldState*); -void func_8013C048(FoldState*); -void fold_load_gfx(FoldState*); -void func_8013C3F0(FoldState*); -void func_8013EE68(FoldState*); -void func_8013F1F8(FoldState*); +void func_8013BC88(FoldState* state); +void func_8013C048(FoldState* state); +//FoldGfxDescriptor* fold_load_gfx(FoldState* state); +void func_8013C3F0(FoldState* state); +void func_8013CFA8(FoldState*, Matrix4f mtx); +void func_8013DAB4(FoldState*, Matrix4f mtx); +void func_8013E2F0(FoldState*, Matrix4f mtx); +void func_8013E904(FoldState*, Matrix4f mtx); +void func_8013EE48(FoldState* state); +void func_8013EE68(FoldState* state); +void func_8013F1F8(FoldState* state); void func_8013A370(s16 arg0) { D_8014EE60 = arg0; @@ -173,16 +224,16 @@ void func_8013A4D0(void) { fold_vtxCount = 0; fold_init_state(&(*D_80156954)[0]); - (*D_80156954)[0].flags |= FOLD_STATE_FLAGS_1; + (*D_80156954)[0].flags |= FOLD_STATE_FLAG_ENABLED; for (i = 1; i < ARRAY_COUNT(*D_80156954); i++) { - if (((*D_80156954)[i].flags & FOLD_STATE_FLAGS_1) && (*D_80156954)[i].unk_05 != 5) { + if (((*D_80156954)[i].flags & FOLD_STATE_FLAG_ENABLED) && (*D_80156954)[i].unk_05 != 5) { fold_clear_state_gfx(&(*D_80156954)[i]); } } for (i = 1; i < ARRAY_COUNT(*D_80156954); i++) { - if ((*D_80156954)[i].flags & FOLD_STATE_FLAGS_1 && (*D_80156954)[i].buf != NULL) { + if ((*D_80156954)[i].flags & FOLD_STATE_FLAG_ENABLED && (*D_80156954)[i].buf != NULL) { s32 temp = (*D_80156954)[i].unk_06; // TODO find a better way to match if (temp == 11 || (*D_80156954)[i].unk_06 == 12) { @@ -196,7 +247,7 @@ void func_8013A4D0(void) { } } -void fold_add_to_gfx_cache(s32* data, s8 usingContextualHeap) { +void fold_add_to_gfx_cache(void* data, s8 usingContextualHeap) { s32 i; for (i = 0; i < ARRAY_COUNT(fold_gfxDataCache); i++) { @@ -245,7 +296,7 @@ s32 func_8013A704(s32 arg0) { count = 0; for (i = 1; i < ARRAY_COUNT(*D_80156954); i++) { - if (!((*D_80156954)[i].flags & FOLD_STATE_FLAGS_1)) { + if (!((*D_80156954)[i].flags & FOLD_STATE_FLAG_ENABLED)) { count++; } } @@ -259,7 +310,7 @@ s32 func_8013A704(s32 arg0) { count = 0; iPrev = -1; for (i = 1; i < ARRAY_COUNT(*D_80156954); i++) { - if (!((*D_80156954)[i].flags & FOLD_STATE_FLAGS_1)) { + if (!((*D_80156954)[i].flags & FOLD_STATE_FLAG_ENABLED)) { if (!cond) { ret = i; cond = TRUE; @@ -270,7 +321,7 @@ s32 func_8013A704(s32 arg0) { (*D_80156954)[i].arrayIdx = i; fold_init_state(&(*D_80156954)[i]); count++; - (*D_80156954)[i].flags |= FOLD_STATE_FLAGS_1; + (*D_80156954)[i].flags |= FOLD_STATE_FLAG_ENABLED; iPrev = i; if (count == arg0) { (*D_80156954)[i].unk_10 = -1; @@ -284,7 +335,7 @@ s32 func_8013A704(s32 arg0) { void func_8013A854(u32 idx) { if (idx < 90) { - (*D_80156954)[idx].flags = FOLD_STATE_FLAGS_0; + (*D_80156954)[idx].flags = 0; (*D_80156954)[idx].unk_10 = -1; } } @@ -319,33 +370,33 @@ FoldState* fold_get_state(s32 idx) { } void fold_clear_state_gfx(FoldState* state) { - if (state->unk_64 != 0) { - state->unk_64 = 0; + if (state->unk_64 != NULL) { + state->unk_64 = NULL; } - if (state->unk_68[0] != 0) { - fold_add_to_gfx_cache(state->unk_68[0], 1); - state->unk_68[0] = 0; + if (state->vtxBufs[0] != NULL) { + fold_add_to_gfx_cache(state->vtxBufs[0], TRUE); + state->vtxBufs[0] = NULL; } - if (state->unk_68[1] != 0) { - fold_add_to_gfx_cache(state->unk_68[1], 1); - state->unk_68[1] = 0; + if (state->vtxBufs[1] != NULL) { + fold_add_to_gfx_cache(state->vtxBufs[1], TRUE); + state->vtxBufs[1] = NULL; } - if (state->unk_70[0] != 0) { - fold_add_to_gfx_cache(state->unk_70[0], 1); - state->unk_70[0] = 0; + if (state->gfxBufs[0] != NULL) { + fold_add_to_gfx_cache(state->gfxBufs[0], TRUE); + state->gfxBufs[0] = NULL; } - if (state->unk_70[1] != 0) { - fold_add_to_gfx_cache(state->unk_70[1], 1); - state->unk_70[1] = 0; + if (state->gfxBufs[1] != NULL) { + fold_add_to_gfx_cache(state->gfxBufs[1], TRUE); + state->gfxBufs[1] = NULL; } } void fold_clear_state_data(FoldState* state) { - state->unk_64 = 0; - state->unk_68[0] = 0; - state->unk_68[1] = 0; - state->unk_70[0] = 0; - state->unk_70[1] = 0; + state->unk_64 = NULL; + state->vtxBufs[0] = NULL; + state->vtxBufs[1] = NULL; + state->gfxBufs[0] = NULL; + state->gfxBufs[1] = NULL; state->buf = NULL; state->bufSize = 0; } @@ -357,7 +408,7 @@ void fold_init_state(FoldState* state) { state->unk_10 = -1; state->unk_05 = 0; state->unk_06 = 0; - state->flags = FOLD_STATE_FLAGS_0; + state->flags = 0; state->meshType = 0; state->renderType = 0; state->firstVtxIdx = 0; @@ -384,10 +435,198 @@ void fold_init_state(FoldState* state) { } } -INCLUDE_ASM(s32, "d0a70_len_4fe0", fold_update); +void fold_update(u32 idx, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { + FoldState* state = &(*D_80156954)[idx]; + s32 oldFlags; + s32 t1; + + if (!(state->flags & FOLD_STATE_FLAG_ENABLED) || (idx >= 90)) { + return; + } + + switch (arg1) { + case 0: + case 3: + oldFlags = state->flags; + fold_clear_state_gfx(state); + fold_init_state(state); + state->flags = oldFlags; + state->unk_05 = 0; + state->unk_06 = 0; + state->meshType = 0; + state->renderType = 0; + state->unk_1C[0][0] = -1; + state->unk_1C[1][0] = -1; + state->flags &= FOLD_STATE_FLAG_ENABLED; + + if (arg6 != 0) { + state->flags |= arg6; + } else { + state->flags = state->flags; // required to match + } + return; + case 1: + state->unk_05 = 0; + state->renderType = 0; + state->unk_1C[0][0] = -1; + return; + case 2: + state->unk_06 = 0; + state->meshType = 0; + state->unk_1C[1][0] = -1; + return; + case 17: + if (state->buf != NULL) { + heap_free(state->buf); + } + state->bufSize = arg2 * 4; + state->buf = heap_malloc(state->bufSize); + return; + case 15: + case 16: + if (arg1 == state->unk_06 && arg2 == state->unk_1C[1][0] && arg3 == state->unk_1C[1][1]) { + return; + } + break; + case 5: + if (state->unk_05 == arg1 && state->unk_1C[0][0] == arg2 && state->unk_1C[0][1] == arg3 && + state->unk_1C[0][2] == arg4) + { + return; + } + break; + default: + if (arg1 != 0xD && state->unk_06 == 0xD) { + state->meshType = 0; + state->subdivX = 1; + state->subdivY = 1; + } + break; + } + + if (arg1 != 5 && state->unk_05 == 5) { + state->unk_05 = 0; + } + + if (arg1 == 4 || arg1 == 5) { + state->unk_05 = arg1; + state->unk_1C[0][0] = arg2; + state->unk_1C[0][1] = arg3; + state->unk_1C[0][2] = arg4; + state->unk_1C[0][3] = arg5; + } else if (arg1 >= 6 && arg1 <= 16) { + state->unk_06 = arg1; + state->unk_1C[1][0] = arg2; + state->unk_1C[1][1] = arg3; + state->unk_1C[1][2] = arg4; + state->unk_1C[1][3] = arg5; + } + + state->flags &= FOLD_STATE_FLAG_ENABLED; + if (arg6 != 0) { + state->flags |= arg6; + } + state->meshType = 0; + + switch (arg1) { + case 3: + state->meshType = 0; + state->renderType = 0; + break; + case 4: + state->subdivX = 4; + state->subdivY = 4; + state->meshType = 1; + func_8013EE48(state); + break; + case 5: + state->meshType = 2; + state->renderType = 0xB; + state->unk_3C[0][0] = 0.0f; + state->unk_3C[0][1] = 0.0f; + state->flags |= FOLD_STATE_FLAG_200; + break; + case 6: + case 7: + case 8: + if (arg2 >= 0xFF && arg3 >= 0xFF && arg4 >= 0xFF && arg5 >= 0xFF) { + state->renderType = 0; + } else if (arg5 >= 0xFF) { + state->renderType = 1; + } else if (arg2 >= 0xFF && arg3 >= 0xFF && arg4 >= 0xFF) { + state->renderType = 2; + } else { + state->renderType = 3; + } + break; + case 9: + case 10: + if (arg5 == 255.0) { + state->renderType = 4; + } else { + state->renderType = 5; + } + break; + case 11: + if (arg2 < state->bufSize) { + t1 = (u32) arg3 >> 0x18; // required to match + state->buf[arg2 * 4 + 0] = (u32) arg3 >> 0x18; + state->buf[arg2 * 4 + 1] = (u32) arg3 >> 0x10; + state->buf[arg2 * 4 + 2] = (u32) arg3 >> 0x08; + do { + state->buf[arg2 * 4 + 3] = arg3; + } while (0); // required to match + + state->meshType = 0; + + if ((arg3 & 0xFF) == 0xFF) { + state->renderType = 6; + } else { + state->renderType = 8; + } + } + break; + case 12: + if (arg2 < state->bufSize) { + t1 = (u32) arg3 >> 0x18; // required to match + state->buf[arg2 * 4 + 0] = t1; + state->buf[arg2 * 4 + 1] = (u32) arg3 >> 0x10; + state->buf[arg2 * 4 + 2] = (u32) arg3 >> 0x08; + do { + state->buf[arg2 * 4 + 3] = arg3; + } while (0); // required to match + + state->meshType = 0; + + if ((arg3 & 0xFF) == 0xFF) { + state->renderType = 9; + } else { + state->renderType = 0xA; + } + } + break; + case 13: + state->renderType = 0xC; + break; + case 14: + state->renderType = 0xD; + break; + case 15: + case 16: + state->meshType = 4; + if (arg3 >= 0xFF) { + state->renderType = 0xE; + } else { + state->renderType = 0xF; + } + state->unk_3C[1][0] = 0.0f; + state->unk_3C[1][1] = 0.0f; + break; + } +} void fold_set_state_flags(s32 idx, u16 flagBits, s32 mode) { - if ((*D_80156954)[idx].flags & FOLD_STATE_FLAGS_1) { + if ((*D_80156954)[idx].flags & FOLD_STATE_FLAG_ENABLED) { if (mode) { (*D_80156954)[idx].flags |= flagBits; } else { @@ -414,7 +653,7 @@ s32 fold_appendGfx_component(s32 idx, FoldImageRec* image, u32 flagBits, Matrix4 fold_currentImage->yOffset = image->yOffset; fold_currentImage->unk_18 = 0; fold_currentImage->unk_1E = 0; - fold_currentImage->gfxOtherModeD = image->unk_10; + fold_currentImage->alphaMultiplier = image->unk_10; if ((u32)idx >= 90) { return 0; @@ -427,25 +666,25 @@ s32 fold_appendGfx_component(s32 idx, FoldImageRec* image, u32 flagBits, Matrix4 func_8013B0EC(state); func_8013B1B0(state, mtx); - if (state->flags & FOLD_STATE_FLAGS_1000) { + if (state->flags & FOLD_STATE_FLAG_1000) { state->unk_1C[0][0] = -1; state->unk_1C[1][0] = -1; state->unk_05 = 0; state->meshType = 0; state->renderType = 0; - state->flags &= ~(FOLD_STATE_FLAGS_1000 | FOLD_STATE_FLAGS_800 | FOLD_STATE_FLAGS_100 | FOLD_STATE_FLAGS_80); + state->flags &= ~(FOLD_STATE_FLAG_1000 | FOLD_STATE_FLAG_800 | FOLD_STATE_FLAG_100 | FOLD_STATE_FLAG_80); fold_clear_state_gfx(state); ret = 1; - } else if (state->flags & FOLD_STATE_FLAGS_4000) { + } else if (state->flags & FOLD_STATE_FLAG_4000) { ret = 2; - } else if (state->flags & FOLD_STATE_FLAGS_20000) { + } else if (state->flags & FOLD_STATE_FLAG_20000) { state->unk_05 = 0; state->unk_06 = 0; state->meshType = 0; state->renderType = 0; state->unk_1C[0][0] = -1; state->unk_1C[1][0] = -1; - state->flags &= FOLD_STATE_FLAGS_1; + state->flags &= FOLD_STATE_FLAG_ENABLED; ret = 1; } return ret; @@ -487,9 +726,313 @@ void func_8013B0EC(FoldState* state) { } } -INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013B1B0); +void func_8013B1B0(FoldState* state, Matrix4f mtx) { + s16 cond = FALSE; + s32 primColor = state->unk_1C[1][3]; + s32 renderType = state->renderType; + s8 angle1; + s8 angle2; + f32 alphaComp; + s32 blendColor; + FoldRenderMode* foldC; + s32 mode1; + s32 mode2; + s32 t1; + s32 t2; -INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013BC88); + gDPPipeSync(gMasterGfxPos++); + + if (!(state->flags & FOLD_STATE_FLAG_10)) { + gSPDisplayList(gMasterGfxPos++, D_8014EE68); + if (state->flags & FOLD_STATE_FLAG_10000) { + gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); + } + if (state->flags & FOLD_STATE_FLAG_G_CULL_BACK) { + gSPSetGeometryMode(gMasterGfxPos++, G_CULL_BACK); + } + if (state->flags & FOLD_STATE_FLAG_G_CULL_FRONT) { + gSPSetGeometryMode(gMasterGfxPos++, G_CULL_FRONT); + } + + foldC = &D_8014EE98[state->renderType]; + + mode1 = foldC->mode1; + mode2 = foldC->mode2; + if (foldC->flags & FOLD_STATE_FLAG_ENABLED) { + cond = TRUE; + } + + alphaComp = (f32) fold_currentImage->alphaMultiplier / 255.0; + + if (!cond && (fold_currentImage->alphaMultiplier < 0xFF)) { + state->unk_1C[1][3] = 0xFF; + switch (state->renderType) { + case 0: + case 11: + renderType = 2; + break; + case 1: + case 4: + renderType = 3; + break; + case 9: + renderType = 10; + break; + } + primColor = state->unk_1C[1][3] * alphaComp; + mode1 = 0x404B40; + mode2 = 0x104B40; + cond = TRUE; + } + + if ((state->flags & FOLD_STATE_FLAG_400) && !cond) { + mode1 &= ~0x200; + mode2 &= ~0x200; + mode1 |= 0x2040; + mode2 |= 0x2040; + } + + if (state->flags & FOLD_STATE_FLAG_40) { + gSPClearGeometryMode(gMasterGfxPos++, G_ZBUFFER); + } else { + gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER); + if (cond) { + mode1 |= 0x10; + mode2 |= 0x10; + } else { + mode1 |= 0x30; + mode2 |= 0x30; + } + } + state->unk_78 = mode2; + gDPSetRenderMode(gMasterGfxPos++, mode1, mode2); + + switch (renderType) { + case 1: + gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], state->unk_1C[1][2], 0); + break; + case 2: + if (primColor <= 0) { + return; + } + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, + TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, primColor); + break; + case 3: + if (primColor <= 0) { + return; + } + gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], + state->unk_1C[1][2], primColor); + break; + case 4: + gDPSetCombineLERP(gMasterGfxPos++, 1, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, TEXEL0, 1, PRIMITIVE, + TEXEL0, PRIMITIVE, 0, 0, 0, TEXEL0); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], state->unk_1C[1][2], 0); + break; + case 5: + if (primColor <= 0) { + return; + } + gDPSetCombineLERP(gMasterGfxPos++, 1, 0, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 1, 0, TEXEL0, + PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], + state->unk_1C[1][2], primColor); + break; + case 6: + gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); + gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + break; + case 9: + gDPSetCombineLERP(gMasterGfxPos++, 1, SHADE, TEXEL0, SHADE, 0, 0, 0, TEXEL0, 1, SHADE, TEXEL0, SHADE, + 0, 0, 0, TEXEL0); + gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + break; + case 7: + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, + SHADE, 0); + gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + break; + case 8: + gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + break; + case 10: + gDPSetCombineLERP(gMasterGfxPos++, 1, SHADE, TEXEL0, SHADE, TEXEL0, 0, SHADE, 0, 1, SHADE, TEXEL0, + SHADE, TEXEL0, 0, SHADE, 0); + gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); + gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); + break; + case 11: + if (state->flags & (FOLD_STATE_FLAG_2000 | FOLD_STATE_FLAG_8000)) { + Camera* currentCam = &gCameras[gCurrentCameraID]; + + gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); + gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); + + angle1 = cosine(currentCam->currentYaw) * 120.0f; + angle2 = cosine(currentCam->currentYaw + 90.0f) * 120.0f; + t1 = -angle1; + t2 = -angle2; + D_8014EE18.l[0].l.dir[0] = t1; + D_8014EE18.l[1].l.dir[0] = angle1; + D_8014EE18.l[0].l.dir[2] = angle2; + D_8014EE18.l[1].l.dir[2] = t2; + gSPSetLights2(gMasterGfxPos++, D_8014EE18); + break; + } + gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + break; + case 12: + if (state->unk_1C[1][0] == 0) { + primColor = state->unk_1C[1][3] * alphaComp; + gDPSetCombineLERP(gMasterGfxPos++, NOISE, PRIMITIVE, PRIMITIVE, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, + NOISE, PRIMITIVE, PRIMITIVE, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, state->unk_1C[1][1], state->unk_1C[1][1], + state->unk_1C[1][1],primColor); + } else if (state->unk_1C[1][0] == 1) { + primColor = state->unk_1C[1][3] * alphaComp; + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, + TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, primColor); + gDPSetAlphaCompare(gMasterGfxPos++, G_AC_DITHER); + } else if (state->unk_1C[1][0] == 2) { + blendColor = state->unk_1C[1][3] + state->unk_1C[1][1]; + if (blendColor > 255) { + blendColor = 255; + } + + primColor = state->unk_1C[1][3] * alphaComp; + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, + TEXEL0, 0, PRIMITIVE, 0); + gDPSetAlphaDither(gMasterGfxPos++, G_AD_NOISE); + gDPSetAlphaCompare(gMasterGfxPos++, G_AC_THRESHOLD); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, primColor); + gDPSetBlendColor(gMasterGfxPos++, 0, 0, 0, blendColor); + } + break; + case 13: + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, + TEXEL0); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, state->unk_1C[1][0], state->unk_1C[1][1], state->unk_1C[1][2], 0); + break; + case 0: + case 14: + case 16: + gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); + break; + case 15: + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, + PRIMITIVE, 0); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, state->unk_1C[1][1]); + break; + } + } + + switch (state->meshType) { + case 0: + func_8013CFA8(state, mtx); + break; + case 1: + case 3: + func_8013DAB4(state, mtx); + break; + case 2: + func_8013E2F0(state, mtx); + break; + case 4: + func_8013CFA8(state, mtx); + gDPPipeSync(gMasterGfxPos++); + func_8013E904(state, mtx); + break; + } + + gDPPipeSync(gMasterGfxPos++); + + if (state->renderType == 0xC) { + gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + gDPSetAlphaDither(gMasterGfxPos++, G_AD_DISABLE); + } +} + +void func_8013BC88(FoldState* state) { + s32 yOffset; + s32 xOffset; + s32 widthIncrement; + s32 heightIncrement; + s32 heightIncrement120; + s32 temp2; + s32 i; + + widthIncrement = 0x1000 / fold_currentImage->width; + if (widthIncrement > fold_currentImage->height) { + widthIncrement = fold_currentImage->height; + } + + xOffset = fold_currentImage->xOffset; + yOffset = fold_currentImage->yOffset; + state->firstVtxIdx = fold_vtxCount; + + fold_vtxBuf[fold_vtxCount].v.ob[0] = xOffset; + fold_vtxBuf[fold_vtxCount].v.ob[1] = yOffset; + fold_vtxBuf[fold_vtxCount].v.ob[2] = 0; + fold_vtxBuf[fold_vtxCount].v.tc[0] = 0x2000; + fold_vtxBuf[fold_vtxCount].v.tc[1] = temp2 = 0x2000; // required to match + fold_vtxBuf[fold_vtxCount].v.cn[0] = 240; + fold_vtxBuf[fold_vtxCount].v.cn[1] = 240; + fold_vtxBuf[fold_vtxCount].v.cn[2] = 240; + fold_vtxBuf[fold_vtxCount + 1].v.ob[0] = fold_currentImage->width + xOffset; + fold_vtxBuf[fold_vtxCount + 1].v.ob[1] = yOffset; + fold_vtxBuf[fold_vtxCount + 1].v.ob[2] = 0; + fold_vtxBuf[fold_vtxCount + 1].v.tc[0] = (fold_currentImage->width + 256) * 32; + fold_vtxBuf[fold_vtxCount + 1].v.tc[1] = temp2; + fold_vtxBuf[fold_vtxCount + 1].v.cn[0] = 120; + fold_vtxBuf[fold_vtxCount + 1].v.cn[1] = 120; + fold_vtxBuf[fold_vtxCount + 1].v.cn[2] = 120; + + for (i = widthIncrement; ; i += widthIncrement) { + heightIncrement = (i * 120) / fold_currentImage->height; + heightIncrement120 = heightIncrement + 120; + fold_vtxCount += 2; + fold_vtxBuf[fold_vtxCount].v.ob[0] = xOffset; + fold_vtxBuf[fold_vtxCount].v.ob[1] = yOffset - widthIncrement; + fold_vtxBuf[fold_vtxCount].v.ob[2] = 0; + fold_vtxBuf[fold_vtxCount].v.tc[0] = 0x2000; + fold_vtxBuf[fold_vtxCount].v.tc[1] = (i + 256) * 32; + fold_vtxBuf[fold_vtxCount].v.cn[0] = heightIncrement120; + fold_vtxBuf[fold_vtxCount].v.cn[1] = heightIncrement120; + fold_vtxBuf[fold_vtxCount].v.cn[2] = heightIncrement120; + fold_vtxBuf[fold_vtxCount + 1].v.ob[0] = fold_currentImage->width + xOffset; + fold_vtxBuf[fold_vtxCount + 1].v.ob[1] = yOffset - widthIncrement; + fold_vtxBuf[fold_vtxCount + 1].v.ob[2] = 0; + fold_vtxBuf[fold_vtxCount + 1].v.tc[0] = (fold_currentImage->width + 256) * 32; + fold_vtxBuf[fold_vtxCount + 1].v.tc[1] = (i + 256) * 32; + fold_vtxBuf[fold_vtxCount + 1].v.cn[0] = heightIncrement; + fold_vtxBuf[fold_vtxCount + 1].v.cn[1] = heightIncrement; + fold_vtxBuf[fold_vtxCount + 1].v.cn[2] = heightIncrement; + + if (i != fold_currentImage->height) { + yOffset -= widthIncrement; + if (fold_currentImage->height < i + widthIncrement) { + widthIncrement = fold_currentImage->height - i; + } + } else { + fold_vtxCount += 2; + break; + } + } + + state->lastVtxIdx = fold_vtxCount - 1; + state->subdivX = 1; + state->subdivY = ((state->lastVtxIdx - state->firstVtxIdx) - 1) / 2; +} void func_8013C048(FoldState* state) { f32 divSizeX; @@ -538,73 +1081,240 @@ void func_8013C048(FoldState* state) { state->lastVtxIdx = fold_vtxCount - 1; } -// Issues with the loop -#ifdef NON_EQUIVALENT -void fold_load_gfx(FoldState* state) { - Gfx* temp_s0; - Gfx* temp_s1_2; - FoldGfxDescriptor* descriptor; - s32* temp_s1; - s32 startAddr = _24B7F0_ROM_START; - Gwords* gfxPos; - u32 gfxOp; - s32 i; +FoldGfxDescriptor* fold_load_gfx(FoldState* state) { + Gfx* romStart = fold_groupOffsets[state->unk_1C[0][0]] + _24B7F0_ROM_START; + FoldGfxDescriptor* descriptor = &fold_groupDescriptors[state->arrayIdx]; - temp_s1 = fold_groupOffsets[state->unk_1C[0][0]] + startAddr; - descriptor = &fold_groupDescriptors[(u8) state->arrayIdx]; + if (state->unk_64 != romStart) { + Gfx* romEnd; + s32 i; - if (state->unk_64 != temp_s1) { - state->unk_64 = temp_s1; + state->unk_64 = romStart; dma_copy(state->unk_64, (s32)state->unk_64 + 0x10, descriptor); - if (state->unk_68[0] != NULL) { - fold_add_to_gfx_cache(state->unk_68[0], 1); - state->unk_68[0] = NULL; + if (state->vtxBufs[0] != NULL) { + fold_add_to_gfx_cache(state->vtxBufs[0], 1); + state->vtxBufs[0] = NULL; } - if (state->unk_68[1] != NULL) { - fold_add_to_gfx_cache(state->unk_68[1], 1); - state->unk_68[1] = NULL; + if (state->vtxBufs[1] != NULL) { + fold_add_to_gfx_cache(state->vtxBufs[1], 1); + state->vtxBufs[1] = NULL; } - if (state->unk_70[0] != NULL) { - fold_add_to_gfx_cache(state->unk_70[0], 1); - state->unk_70[0] = NULL; + if (state->gfxBufs[0] != NULL) { + fold_add_to_gfx_cache(state->gfxBufs[0], 1); + state->gfxBufs[0] = NULL; } - if (state->unk_70[1] != NULL) { - fold_add_to_gfx_cache(state->unk_70[1], 1); - state->unk_70[1] = NULL; + if (state->gfxBufs[1] != NULL) { + // fold_add_to_gfx_cache(state->gfxBufs[1], 1); + romEnd = state->gfxBufs[1]; // required to match + fold_add_to_gfx_cache(romEnd, 1); + state->gfxBufs[1] = NULL; } - state->unk_68[0] = heap_malloc((u16) descriptor->vtxCount * 0x10); - state->unk_68[1] = heap_malloc((u16) descriptor->vtxCount * 0x10); - state->unk_70[0] = heap_malloc((u16) descriptor->gfxCount * 8); - state->unk_70[1] = heap_malloc((u16) descriptor->gfxCount * 8); - temp_s1_2 = (s32)descriptor->gfx + startAddr; - temp_s0 = &temp_s1_2[descriptor->gfxCount]; - dma_copy(temp_s1_2, temp_s0, state->unk_70[0]); - dma_copy(temp_s1_2, temp_s0, state->unk_70[1]); + state->vtxBufs[0] = heap_malloc(descriptor->vtxCount * 0x10); + state->vtxBufs[1] = heap_malloc(descriptor->vtxCount * 0x10); + state->gfxBufs[0] = heap_malloc(descriptor->gfxCount * 8); + state->gfxBufs[1] = heap_malloc(descriptor->gfxCount * 8); + romStart = (s32)descriptor->gfx + _24B7F0_ROM_START; + romEnd = &romStart[descriptor->gfxCount]; + dma_copy(romStart, romEnd, state->gfxBufs[0]); + dma_copy(romStart, romEnd, state->gfxBufs[1]); - gfxPos = &state->unk_70[0]->words; + // Search through the state's displaylists for vertex commands + // and adjust their addresses to point into the vertex buffers + for (i = 0; i < ARRAY_COUNT(state->gfxBufs); i++) { + Gfx* gfxBuffer = state->gfxBufs[i]; + s32 j = 0; + u32 cmd; - for (i = 0; i < 2; i++) { - gfxOp = state->unk_70[i]->words.w0; - if (gfxOp >> 0x18 == 1) { - state->unk_70[i]->words.w1 = (u32)(state->unk_68[i] + ((s32)(state->unk_70[i]->words.w1 - (s32)descriptor->vtx) / 3) * 4); - } + // Loop over the displaylist commands until we hit an ENDDL + do { + u32 w0 = gfxBuffer[j++].words.w0; + cmd = w0 >> 0x18; - if (gfxOp != 0xDF) { - break; - } + // If this command is a vertex command, adjust the vertex buffer address + if (cmd == G_VTX) { + gfxBuffer[j-1].words.w1 = ((((s32) gfxBuffer[j-1].words.w1 - (s32) descriptor->vtx) / 3) * 4) + + (s32) state->vtxBufs[i]; + } + } while (cmd != G_ENDDL); } } + + return descriptor; } -#else -INCLUDE_ASM(s32, "d0a70_len_4fe0", fold_load_gfx); -#endif INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013C3F0); -INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013CFA8); +void func_8013CFA8(FoldState* state, Matrix4f mtx) { + s32 i; + + if (!(state->flags & FOLD_STATE_FLAG_20)) { + gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gMasterGfxPos++, 0, fold_currentImage->palette); + } + + i = state->firstVtxIdx; + + while (1) { + Camera* cam; + s32 uls = (fold_vtxBuf[i + 0].v.tc[0] >> 0x5) - 0x100; + s32 ult = (fold_vtxBuf[i + 0].v.tc[1] >> 0x5) - 0x100; + s32 lrs = (fold_vtxBuf[i + 3].v.tc[0] >> 0x5) - 0x100; + s32 lrt = (fold_vtxBuf[i + 3].v.tc[1] >> 0x5) - 0x100; + s32 someFlags = FOLD_STATE_FLAG_100000 | FOLD_STATE_FLAG_80000; + s32 alpha; + s32 alpha2; + + if (!(state->flags & 0x20)) { + if ((D_80151328->flags & 1) && + (state->arrayIdx != 0) && + (state->flags & someFlags) && + (state->renderType == 0 || state->renderType == 2 || state->renderType == 15 || state->renderType == 7)) + { + gDPScrollMultiTile2_4b(gMasterGfxPos++, + fold_currentImage->raster, G_IM_FMT_CI, + fold_currentImage->width, fold_currentImage->height, // img size + uls, ult, // top left + lrs - 1, lrt - 1, // bottom right + 0, // palette + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, // clamp wrap mirror + 8, 8, // mask + G_TX_NOLOD, G_TX_NOLOD, // shift, + 0x100, 0x100); // scroll + gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMASK, G_TX_NOLOD); + gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 252, 0); + + alpha = 255; + switch (state->renderType) { + case 0: + break; + case 2: + case 15: + alpha = state->unk_1C[1][3]; + break; + case 7: + alpha = -1; + break; + } + + if ((D_80151328->flags & 2) && (D_80156954[0][0].arrayIdx != 0) && (state->flags & someFlags)) { + cam = &gCameras[gCurrentCamID]; + + if (gGameStatusPtr->isBattle == 2) { + gSPViewport(gMasterGfxPos++, &D_8014EE50); + } else { + gSPViewport(gMasterGfxPos++, &cam->vpAlt); + } + + gDPSetRenderMode(gMasterGfxPos++, G_RM_PASS, state->unk_78); + + if (alpha == -1) { + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, SHADE, 0, TEXEL1, 0, 0, 0, 0, 0, 0, + 0, 0, COMBINED); + } else { + gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, alpha); + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL1, 0, 0, 0, 0, + 0, 0, 0, 0, COMBINED); + } + + gSPVertex(gMasterGfxPos++, &fold_vtxBuf[i], 4, 0); + gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + gDPPipeSync(gMasterGfxPos++); + } + render_shaded_sprite(mtx, uls, ult, lrs, lrt, alpha, state->unk_78); + } else { + gDPScrollTextureTile_4b(gMasterGfxPos++, + fold_currentImage->raster, G_IM_FMT_CI, + fold_currentImage->width, fold_currentImage->height, // img size + uls, ult, // top left + lrs - 1, lrt - 1, // bottom right + 0, // palette + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, // clamp wrap mirror + 8, 8, // mask + G_TX_NOLOD, G_TX_NOLOD, // shift, + 0x100, 0x100); // scroll + + if ((D_80151328->flags & 2) && state->arrayIdx != 0 && (state->flags & someFlags)) { + alpha2 = 255; + cam = &gCameras[gCurrentCamID]; + + if (gGameStatusPtr->isBattle == 2) { + gSPViewport(gMasterGfxPos++, &D_8014EE50); + } else { + gSPViewport(gMasterGfxPos++, &cam->vpAlt); + } + + if (alpha2 == 255) { + gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2); + } else { + gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2); + } + + switch (state->renderType) { + case 0: + alpha2 = 255; + break; + case 2: + case 15: + alpha2 = state->unk_1C[1][3]; + break; + case 7: + alpha2 = -1; + break; + } + + if (alpha2 == -1) { + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, SHADE, 0, TEXEL0, 0, 0, 0, 0, 0, SHADE, 0, TEXEL0, 0); + } else { + gDPSetEnvColor(gMasterGfxPos++, 0, 0, 0, alpha2); + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, ENVIRONMENT, 0, TEXEL0, 0, 0, 0, 0, 0, + ENVIRONMENT, 0, TEXEL0, 0); + } + + gSPVertex(gMasterGfxPos++, &fold_vtxBuf[i], 4, 0); + gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + gDPPipeSync(gMasterGfxPos++); + + if (alpha2 == 255) { + gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2); + } else { + gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2); + } + + gDPSetEnvColor(gMasterGfxPos++, 100, 100, 100, 255); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha2); + gDPSetCombineLERP(gMasterGfxPos++, SHADE, ENVIRONMENT, TEXEL0, TEXEL0, 0, 0, 0, TEXEL0, SHADE, + ENVIRONMENT, TEXEL0, TEXEL0, 0, 0, 0, TEXEL0); + gDPSetColorDither(gMasterGfxPos++, G_CD_MAGICSQ); + } + } + } + + if ((D_80151328->flags & 2) && D_80156954[0][0].arrayIdx != 0 && (state->flags & someFlags)) { + cam = &gCameras[gCurrentCamID]; + if (gGameStatusPtr->isBattle == 2) { + gSPViewport(gMasterGfxPos++, &D_8014EE40); + D_8014EE50.vp.vtrans[0] = D_8014EE40.vp.vtrans[0] + gGameStatusPtr->unk_82; + D_8014EE50.vp.vtrans[1] = D_8014EE40.vp.vtrans[1] + gGameStatusPtr->unk_83; + } else { + gSPViewport(gMasterGfxPos++, &cam->vp); + } + } + + gSPVertex(gMasterGfxPos++, &fold_vtxBuf[i], 4, 0); + gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); + + if (i + 3 >= state->lastVtxIdx) { + break; + } + + i += 2; + } +} INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013DAB4); @@ -618,26 +1328,24 @@ void func_8013EE48(FoldState* state) { state->unk_3C[0][2] = 30.0f; } -// Float stuff +// Reg swaps in the loop #ifdef NON_MATCHING void func_8013EE68(FoldState* state) { - Vtx* temp_s0; - Vtx* temp_s0_2; - Vtx* temp_s0_3; - f32 temp_f0_7; + Vtx* v1; + Vtx* v2; + Vtx* v3; f32 temp_f20; f32 temp_f20_2; f32 temp_f20_3; - f32 temp_f22; - f32 temp_f24; - f32 temp_fblah; - f32 temp_f2; - s32 temp_s5; + f32 angle2; + f32 angle3; + f32 angle1; + s32 amt; f32 phi_f8; f32 phi_f6; f32 phi_f4; - s32 phi_s3; - s32 phi_s4; + s32 angleInc; + s32 sign; s32 i; phi_f8 = (f32) gGameStatusPtr->frameCounter / 10.3; @@ -671,30 +1379,31 @@ void func_8013EE68(FoldState* state) { state->unk_3C[0][2] -= 360.0; } - phi_s4 = 0; - phi_s3 = 0; - temp_s5 = (state->lastVtxIdx - state->firstVtxIdx) - state->subdivX; - for (i = 0; i < temp_s5; i++) { - temp_f2 = phi_s3; - temp_f0_7 = phi_s4 * 180; + sign = 0; + angleInc = 0; + amt = (state->lastVtxIdx - state->firstVtxIdx) - state->subdivX; - temp_fblah = state->unk_3C[0][0] + temp_f2 + temp_f0_7; - temp_f22 = state->unk_3C[0][1] + temp_f2 + temp_f0_7; - temp_f24 = state->unk_3C[0][2] + temp_f2 + temp_f0_7; + for (i = 0; i < amt; i++) { + angle1 = state->unk_3C[0][0] + (angleInc * 45) + (sign * 180); + angle2 = state->unk_3C[0][1] + (angleInc * 45) + (sign * 180); + angle3 = state->unk_3C[0][2] + (angleInc * 45) + (sign * 180); - temp_s0 = &fold_vtxBuf[state->firstVtxIdx + i]; - temp_f20 = temp_s0->v.ob[0]; - temp_s0->v.ob[0] = (temp_f20 + (sin_rad(temp_fblah) * state->unk_1C[0][0])); - temp_s0_2 = &fold_vtxBuf[state->firstVtxIdx + i]; - temp_f20_2 = temp_s0_2->v.ob[1]; - temp_s0_2->v.ob[1] = (temp_f20_2 + (sin_rad(temp_f22) * state->unk_1C[0][1])); - temp_s0_3 = &fold_vtxBuf[state->firstVtxIdx + i]; - temp_f20_3 = temp_s0_3->v.ob[2]; - temp_s0_3->v.ob[2] = (temp_f20_3 + (sin_rad(temp_f24) * state->unk_1C[0][2])); - phi_s3 += 45; + v1 = &fold_vtxBuf[state->firstVtxIdx + i]; + temp_f20 = v1->v.ob[0]; + v1->v.ob[0] = (temp_f20 + (sin_rad(angle1) * state->unk_1C[0][0])); + + v2 = &fold_vtxBuf[state->firstVtxIdx + i]; + temp_f20_2 = v2->v.ob[1]; + v2->v.ob[1] = (temp_f20_2 + (sin_rad(angle2) * state->unk_1C[0][1])); + + v3 = &fold_vtxBuf[state->firstVtxIdx + i]; + temp_f20_3 = v3->v.ob[2]; + v3->v.ob[2] = (temp_f20_3 + (sin_rad(angle3) * state->unk_1C[0][2])); + + angleInc++; if ((i % (s32) (state->subdivX + 1)) == 0) { - phi_s3 = 0; - phi_s4 = !phi_s4; + angleInc = 0; + sign = !sign; } } } @@ -703,7 +1412,7 @@ INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013EE68); #endif void func_8013F1F8(FoldState* state) { - f32 alpha = (f32)fold_currentImage->gfxOtherModeD / 255.0; + f32 alpha = (f32)fold_currentImage->alphaMultiplier / 255.0; s32 vtxCount = state->lastVtxIdx - state->firstVtxIdx; s32 i; diff --git a/src/dc470_len_14c0.c b/src/dc470_len_14c0.c index d6899cbf60..08c18679aa 100644 --- a/src/dc470_len_14c0.c +++ b/src/dc470_len_14c0.c @@ -28,7 +28,7 @@ void load_map_bg(char* optAssetName) { void reset_background_settings(void) { D_801595A0 = 0; D_8014F12F = 0; - gGameStatusPtr->unk_15C = 0xB4; + gGameStatusPtr->unk_15C = 180; gGameStatusPtr->enableBackground &= 0xF0; } diff --git a/src/e0b30_len_b80.c b/src/e0b30_len_b80.c index 78220daf52..d4df11a41a 100644 --- a/src/e0b30_len_b80.c +++ b/src/e0b30_len_b80.c @@ -31,14 +31,11 @@ void bgm_set_target_volume(s16 volume); /// @see gSongsUsingVariationFlag /// @returns -1: no override; 0: override to variation 0; 1 override to variation 1 s32 bgm_get_map_default_variation(s32 songID) { - u32 i = 0; - Area* areas = gAreas; - GameStatus** gameStatus = &gGameStatusPtr; - s32* allowed = gSongsUsingVariationFlag; + u32 i; for (i = 0; i < ARRAY_COUNT(gSongsUsingVariationFlag); i++) { - if (allowed[i] == songID) { - Map* map = &areas[(*gameStatus)->areaID].maps[(*gameStatus)->mapID]; + if (gSongsUsingVariationFlag[i] == songID) { + Map* map = &gAreas[gGameStatusPtr->areaID].maps[gGameStatusPtr->mapID]; return map->unk_1C.bytes.songVariation & 1; } @@ -48,12 +45,10 @@ s32 bgm_get_map_default_variation(s32 songID) { } void bgm_reset_sequence_players(void) { - MusicSettings* src; // TODO: remove this temp when .data section for this file (incl. D_8014F6F0) is set up s32 i; for (i = 0; i < 2; i++) { - MusicSettings* musicSettings = gMusicSettings; - musicSettings[i] = *(src = &D_8014F6F0); + gMusicSettings[i] = D_8014F6F0; } gMusicTargetVolume = 8; @@ -67,15 +62,139 @@ void bgm_reset_volume(void) { gMusicUnkVolume2 = 8; } +// Loop struct shenanigans +#ifdef NON_EQUIVALENT + +// Experiment to fix loop +typedef struct MusicSettingsInner { + /* 0x02 */ s16 unk_02; + /* 0x04 */ s32 fadeOutTime; + /* 0x08 */ s32 fadeInTime; + /* 0x0C */ s16 unk_0C; + /* 0x0E */ s16 unk_0E; + /* 0x10 */ s32 songID; + /* 0x14 */ s32 variation; + /* 0x18 */ s32 songName; + /* 0x1C */ s32 unk_1C; + /* 0x20 */ s32 unk_20; + /* 0x24 */ s32 unk_24; + /* 0x28 */ s32 unk_28; + /* 0x2C */ s32 unk_2C; +} MusicSettingsInner; + +typedef struct MusicSettings2 { + /* 0x00 */ u16 flags; + /* 0x02 */ MusicSettingsInner unk_02; +} MusicSettings2; // size = 0x30 + +void bgm_update_music_settings(void) { + MusicSettingsInner* inner; + MusicSettings2* phi_s1; + s32* flags; + s32 phi_v0; + s32 i; + s32 a; + s32 c; + + phi_s1 = gMusicSettings; + + for (i = 0; i < 2; i++, phi_s1++) { + inner = &phi_s1->unk_02; + c = 2; + a = ~0x4; + + switch (inner->unk_02) { + case 0: + break; + case 1: + if (phi_s1->flags & 1) { + if (inner->fadeOutTime < 250) { + if (!(phi_s1->flags & 4)) { + phi_v0 = func_800559C4(inner->songName); + } else { + phi_v0 = func_80055AF0(inner->songName); + } + } else if (!(phi_s1->flags & 4)) { + phi_v0 = snd_set_song_variation_fade_time(inner->songName, inner->fadeOutTime, 0); + } else { + phi_v0 = func_80055BB8(inner->songName, 0xFA); + } + if (phi_v0 == 0) { + inner->unk_02 = c; + } + } else { + if (phi_s1->flags & 4) { + phi_s1->flags |= 0x10; + } + phi_s1->flags &= a; + inner->unk_02 = 5; + } + break; + case 2: + phi_s1->flags &= a; + if (!(phi_s1->flags & 1)) { + inner->unk_02 = 5; + break; + } + + if (func_800559FC(inner->songName) == 0) { + phi_s1->flags &= ~0x1; + inner->unk_02 = 3; + } + + break; + case 3: + inner->unk_02 = 4; + break; + case 4: + inner->unk_02 = 5; + break; + case 5: + if (!(phi_s1->flags & 8)) { + if (inner->songID < 0) { + inner->unk_02 = 0; + } else { + inner->songName = snd_load_song(inner->songID, i); + if (inner->songName > 0xFFFFU) { + if ((phi_s1->flags & 0x20) != 0) { + snd_set_song_variation_fade(inner->songName, inner->variation, inner->fadeInTime, inner->unk_0C, inner->unk_0E); + phi_s1->flags &= ~0x20; + } else { + bgm_set_target_volume(gMusicUnkVolume); + } + if (snd_start_song_variation(inner->songName, inner->variation) == 0) { + phi_s1->flags |= 1; + inner->unk_02 = 0; + } + } + } + } else { + if (phi_s1->flags & 0x10) { + inner->unk_02 = 0; + phi_s1->flags &= ~0x18; + } else if (func_80055B28(inner->unk_2C) == 0) { + inner->unk_02 = 0; + inner->songID = inner->unk_24; + inner->variation = inner->unk_28; + inner->songName = inner->unk_2C; + phi_s1->flags |= 1; + phi_s1->flags &= ~0x8; + } + } + break; + } + } + bgm_update_volume(); +} +#else INCLUDE_ASM(s32, "e0b30_len_b80", bgm_update_music_settings); +#endif s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) { if (gGameStatusPtr->demoState != 0) { return 1; } else { - // TODO: these two lines likely a MUSIC_PLAYER(idx) macro - MusicSettings* musicSettings = gMusicSettings; - MusicSettings* musicSetting = &musicSettings[playerIndex]; + MusicSettings* musicSetting = &gMusicSettings[playerIndex]; if (!gGameStatusPtr->musicEnabled) { func_800559C4(musicSetting->songName); @@ -112,9 +231,7 @@ s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s } s32 bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) { - MusicSettings* musicSettings = gMusicSettings; - - musicSettings[playerIndex].flags &= ~8; + gMusicSettings[playerIndex].flags &= ~8; return _bgm_set_song(playerIndex, songID, variation, fadeOutTime, volume); } @@ -123,8 +240,7 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1 if (gGameStatusPtr->demoState != 0) { return 1; } else { - MusicSettings* musicSettings = gMusicSettings; - MusicSettings* musicSetting = &musicSettings[playerIndex]; + MusicSettings* musicSetting = &gMusicSettings[playerIndex]; if (!gGameStatusPtr->musicEnabled) { func_800559C4(musicSetting->songName); @@ -152,8 +268,7 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1 } s32 func_8014AA54(s32 playerIndex, s32 arg1, s16 arg2) { - MusicSettings* musicSettings = gMusicSettings; - MusicSettings* musicSetting = &musicSettings[playerIndex]; + MusicSettings* musicSetting = &gMusicSettings[playerIndex]; if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) { return 0; @@ -179,8 +294,7 @@ s32 func_8014AA54(s32 playerIndex, s32 arg1, s16 arg2) { } s32 func_8014AB0C(s32 playerIndex, s16 arg1) { - MusicSettings* musicSettings = gMusicSettings; - MusicSettings* musicSetting = &musicSettings[playerIndex]; + MusicSettings* musicSetting = &gMusicSettings[playerIndex]; if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) { return 0; @@ -190,8 +304,7 @@ s32 func_8014AB0C(s32 playerIndex, s16 arg1) { } s32 func_8014AB60(s32 playerIndex, s16 arg1) { - MusicSettings* musicSettings = gMusicSettings; - MusicSettings* musicSetting = &musicSettings[playerIndex]; + MusicSettings* musicSetting = &gMusicSettings[playerIndex]; if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) { return 0; @@ -201,8 +314,7 @@ s32 func_8014AB60(s32 playerIndex, s16 arg1) { } s32 func_8014ABB4(s32 playerIndex, s16 arg1) { - MusicSettings* musicSettings = gMusicSettings; - MusicSettings* musicSetting = &musicSettings[playerIndex]; + MusicSettings* musicSetting = &gMusicSettings[playerIndex]; if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) { return 0; @@ -230,11 +342,7 @@ void bgm_set_target_volume(s16 volume) { gMusicTargetVolume = volume; } -//Data loading shenanigans -#ifdef NON_EQUIVALENT void bgm_update_volume(void) { - s16* currentVolume; - s16 compareVolume; s16 toVolume; if (D_8014F738 != 0) { @@ -242,27 +350,41 @@ void bgm_update_volume(void) { return; } - compareVolume = gMusicTargetVolume; - if (gMusicUnkVolume2 < gMusicTargetVolume) { - compareVolume = gMusicUnkVolume2; + toVolume = gMusicTargetVolume; + if (toVolume > gMusicUnkVolume2) { + toVolume = gMusicUnkVolume2; } - currentVolume = &gMusicCurrentVolume; - if (*currentVolume != compareVolume) { - toVolume = *currentVolume + 1; - if (*currentVolume >= compareVolume) { - toVolume = *currentVolume - 1; + if (gMusicCurrentVolume != toVolume) { + if (gMusicCurrentVolume >= toVolume) { + gMusicCurrentVolume--; + } else { + gMusicCurrentVolume++; } - *currentVolume = toVolume; func_800561A4(gMusicCurrentVolume); D_8014F738 = 3; } } -#else -INCLUDE_ASM(s32, "e0b30_len_b80", bgm_update_volume); -#endif +// can't figure out the loop +#ifdef NON_EQUIVALENT +s32 func_8014AD40(void) { + s32 i; + + for (i = 0; i < 2; i++) { + if (!(gMusicSettings[i].flags & MUSIC_SETTINGS_FLAGS_1)) { + continue; + } + + if (func_800559FC(gMusicSettings[i].songName) != 0) { + return 1; + } + } + return 0; +} +#else INCLUDE_ASM(s32, "e0b30_len_b80", func_8014AD40); +#endif void bgm_pop_song(void) { MusicSettings* musicSetting = &gMusicSettings[0]; diff --git a/src/evt/demo_api.c b/src/evt/demo_api.c index 277a671ef2..8ff6128974 100644 --- a/src/evt/demo_api.c +++ b/src/evt/demo_api.c @@ -10,9 +10,9 @@ INCLUDE_ASM(ApiStatus, "evt/demo_api", SetSpriteShading, Evt* script, s32 isInit ApiStatus EnableSpriteShading(Evt* script, s32 isInitialCall) { if (evt_get_variable(script, *script->ptrReadPos) != 0) { - *D_80151328 |= 1; + D_80151328->flags |= 1; } else { - *D_80151328 &= ~1; + D_80151328->flags &= ~1; } return ApiStatus_DONE2; } diff --git a/src/evt/fa4c0_len_3bf0.c b/src/evt/fa4c0_len_3bf0.c index e9a2c60c5b..6f7c85fec6 100644 --- a/src/evt/fa4c0_len_3bf0.c +++ b/src/evt/fa4c0_len_3bf0.c @@ -62,9 +62,8 @@ ApiStatus FadeInMusic(Evt* script, s32 isInitialCall) { ApiStatus func_802D5EE0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - MusicSettings* musicSettings = gMusicSettings; - (&musicSettings[evt_get_variable(script, *args++)])->flags |= 0x2; + (&gMusicSettings[evt_get_variable(script, *args++)])->flags |= 0x2; return ApiStatus_DONE2; } diff --git a/src/heap.c b/src/heap.c index e60927c39f..52501a971f 100644 --- a/src/heap.c +++ b/src/heap.c @@ -16,7 +16,7 @@ s32 general_heap_malloc_tail(s32 size) { return _heap_malloc_tail(&heap_generalHead, size); } -s32 general_heap_free(s32* data) { +s32 general_heap_free(void* data) { return _heap_free(&heap_generalHead, data); } diff --git a/src/main_loop.c b/src/main_loop.c index d0d7119557..68ff0049af 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -3,6 +3,7 @@ #include "ld_addrs.h" #include "hud_element.h" #include "sprite.h" +#include "overlay.h" s8 D_80074020 = 1; s8 D_80074021 = 5; @@ -221,7 +222,7 @@ void gfx_draw_frame(void) { switch (D_800741A2) { case 0: case 1: - _render_transition_stencil(7, D_800741A0, 0); + _render_transition_stencil(7, D_800741A0, NULL); break; } } diff --git a/src/pause/138CC0.c b/src/pause/138CC0.c index fa504a9913..9190ef43aa 100644 --- a/src/pause/138CC0.c +++ b/src/pause/138CC0.c @@ -34,25 +34,25 @@ void pause_stats_init(MenuPanel* panel) { } setup_pause_menu_tab(gStatsMenuWindowBPs, ARRAY_COUNT(gStatsMenuWindowBPs)); - panel->initialized = TRUE; + panel->unk_00.c.initialized = TRUE; } void pause_stats_handle_input(MenuPanel* panel) { - s32 initialSelection = panel->selected; + s32 initialSelection = panel->unk_00.c.selected; s16 adjustedBootsLevel; s16 adjustedHammerLevel; s32 msgOffset; if (gPauseMenuHeldButtons & BUTTON_STICK_LEFT) { while (1) { - panel->col--; - if (panel->col < 0) { - panel->col = 0; + panel->unk_00.c.col--; + if (panel->unk_00.c.col < 0) { + panel->unk_00.c.col = 0; break; - } else if (panel->selected != panel->gridData[ + } else if (panel->unk_00.c.selected != panel->gridData[ (panel->page * panel->numCols * panel->numRows) - + (panel->numCols * panel->row) - + (panel->col)]) { + + (panel->numCols * panel->unk_00.c.row) + + (panel->unk_00.c.col)]) { break; } } @@ -60,14 +60,14 @@ void pause_stats_handle_input(MenuPanel* panel) { if (gPauseMenuHeldButtons & BUTTON_STICK_RIGHT) { while (1) { - panel->col++; - if (panel->col >= panel->numCols) { - panel->col = panel->numCols - 1; + panel->unk_00.c.col++; + if (panel->unk_00.c.col >= panel->numCols) { + panel->unk_00.c.col = panel->numCols - 1; break; - } else if (panel->selected != panel->gridData[ + } else if (panel->unk_00.c.selected != panel->gridData[ (panel->page * panel->numCols * panel->numRows) - + (panel->numCols * panel->row) - + (panel->col)]) { + + (panel->numCols * panel->unk_00.c.row) + + (panel->unk_00.c.col)]) { break; } } @@ -75,14 +75,14 @@ void pause_stats_handle_input(MenuPanel* panel) { if (gPauseMenuHeldButtons & BUTTON_STICK_UP) { while (1) { - panel->row--; - if (panel->row < 0) { - panel->row = 0; + panel->unk_00.c.row--; + if (panel->unk_00.c.row < 0) { + panel->unk_00.c.row = 0; break; - } else if (panel->selected != panel->gridData[ + } else if (panel->unk_00.c.selected != panel->gridData[ (panel->page * panel->numCols * panel->numRows) - + (panel->numCols * panel->row) - + (panel->col)]) { + + (panel->numCols * panel->unk_00.c.row) + + (panel->unk_00.c.col)]) { break; } } @@ -90,24 +90,24 @@ void pause_stats_handle_input(MenuPanel* panel) { if (gPauseMenuHeldButtons & BUTTON_STICK_DOWN) { while (1) { - panel->row++; - if (panel->row >= panel->numRows) { - panel->row = panel->numRows - 1; + panel->unk_00.c.row++; + if (panel->unk_00.c.row >= panel->numRows) { + panel->unk_00.c.row = panel->numRows - 1; break; - } else if (panel->selected != panel->gridData[ + } else if (panel->unk_00.c.selected != panel->gridData[ (panel->page * panel->numCols * panel->numRows) - + (panel->numCols * panel->row) - + (panel->col)]) { + + (panel->numCols * panel->unk_00.c.row) + + (panel->unk_00.c.col)]) { break; } } } - panel->selected = panel->gridData[ + panel->unk_00.c.selected = panel->gridData[ (panel->page * panel->numCols * panel->numRows) - + (panel->numCols * panel->row) - + (panel->col)]; - if (panel->selected != initialSelection) { + + (panel->numCols * panel->unk_00.c.row) + + (panel->unk_00.c.col)]; + if (panel->unk_00.c.selected != initialSelection) { sfx_play_sound(SOUND_MENU_CHANGE_SELECTION); } @@ -131,7 +131,7 @@ void pause_stats_handle_input(MenuPanel* panel) { adjustedHammerLevel = 3; } - switch (gStatsMenuEntries[panel->selected].baseMsgID) { + switch (gStatsMenuEntries[panel->unk_00.c.selected].baseMsgID) { case 0x25: if (adjustedBootsLevel > 1) { msgOffset = adjustedBootsLevel - 1; @@ -147,7 +147,7 @@ void pause_stats_handle_input(MenuPanel* panel) { break; } - gPauseMenuCurrentDescMsg = pause_get_menu_msg(gStatsMenuEntries[panel->selected].baseMsgID + msgOffset); + gPauseMenuCurrentDescMsg = pause_get_menu_msg(gStatsMenuEntries[panel->unk_00.c.selected].baseMsgID + msgOffset); gPauseMenuCurrentDescIconScript = NULL; if (gPauseMenuPressedButtons & BUTTON_B) { @@ -459,7 +459,7 @@ void pause_badges_init(MenuPanel* panel) { pause_badges_load_badges(FALSE); if (gBadgeMenuItemIDs[0] == BADGE_NONE_STANDIN) { - panel->initialized = FALSE; + panel->unk_00.c.initialized = FALSE; return; } @@ -474,7 +474,7 @@ void pause_badges_init(MenuPanel* panel) { gBadgeMenuWindowBPs[i].tab = panel; } setup_pause_menu_tab(gBadgeMenuWindowBPs, ARRAY_COUNT(gBadgeMenuWindowBPs)); - panel->initialized = TRUE; + panel->unk_00.c.initialized = TRUE; } void pause_badges_handle_input(MenuPanel* panel) { diff --git a/src/pause/pause_map.c b/src/pause/pause_map.c index 67711fa579..83309e88de 100644 --- a/src/pause/pause_map.c +++ b/src/pause/pause_map.c @@ -112,7 +112,7 @@ void pause_map_init(MenuPanel* tab) { pause_map_cameraY = -209.0f; } - tab->initialized = 1; + tab->unk_00.c.initialized = TRUE; } void pause_map_handle_input(void) { diff --git a/src/sprite.h b/src/sprite.h index ef1f8639f4..0a1471591c 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -192,4 +192,6 @@ s32** spr_get_npc_palettes(s32 npcSpriteID); s32 spr_get_npc_color_variations(s32 npcSpriteID); +void render_shaded_sprite(Matrix4f mtx, s32 uls, s32 ult, s32 lrs, s32 lrt, s32 alpha, s32); + #endif diff --git a/src/world/action/slide.c b/src/world/action/slide.c index c7bfb237fa..e251d8d28f 100644 --- a/src/world/action/slide.c +++ b/src/world/action/slide.c @@ -52,7 +52,7 @@ void func_802B6060_E27570(void) { D_802B6798 = 0.0f; D_802B679C = 0; suggest_player_anim_clearUnkFlag(0x1000A); - sfx_play_sound_at_player(SOUND_UNKNOWN_167, 0); + sfx_play_sound_at_player(SOUND_167, 0); gCameras[0].moveFlags |= 1; } tempCurrentSpeed = playerStatus->currentSpeed; @@ -100,7 +100,7 @@ void func_802B6060_E27570(void) { } sin_cos_rad((D_802B6790 * TAU) / 360.0f, &sp4C, &sp50); playerStatus->position.y += fabsf((sp4C / sp50) * playerStatus->currentSpeed); - snd_stop_sound(SOUND_UNKNOWN_167); + snd_stop_sound(SOUND_167); break; case 1: sp28 = playerStatus->position.x; @@ -115,7 +115,7 @@ void func_802B6060_E27570(void) { } playerStatus->currentSpeed -= tempCurrentSpeed; if (playerStatus->currentSpeed <= 0.0f) { - sfx_play_sound_at_player(SOUND_UNKNOWN_172, 0); + sfx_play_sound_at_player(SOUND_172, 0); suggest_player_anim_setUnkFlag(0x10031); playerStatus->fallState = 6; playerStatus->framesOnGround = 15; @@ -148,7 +148,7 @@ void func_802B6060_E27570(void) { if (sp48 >= 0) { D_802B678C = -1; suggest_player_anim_setUnkFlag(0x80003); - sfx_play_sound_at_player(SOUND_UNKNOWN_162, 0); + sfx_play_sound_at_player(SOUND_162, 0); playerStatus->fallState++; } break; @@ -169,7 +169,7 @@ void func_802B6060_E27570(void) { } if (playerStatus->unk_BC != 0) { suggest_player_anim_setUnkFlag(0x10031); - sfx_play_sound_at_player(SOUND_UNKNOWN_172, 0); + sfx_play_sound_at_player(SOUND_172, 0); playerStatus->framesOnGround = 15; playerStatus->fallState++; } diff --git a/src/world/action/use_munchlesia.c b/src/world/action/use_munchlesia.c index 57f4d1254a..f6e2650d45 100644 --- a/src/world/action/use_munchlesia.c +++ b/src/world/action/use_munchlesia.c @@ -50,7 +50,7 @@ void func_802B6000_E291A0(void) { gCameras[0].targetPos.z = playerStatus->position.z; tempCollision = player_check_collision_below(D_802B62D0, &sp10); if (sp10 >= 0) { - sfx_play_sound_at_player(SOUND_UNKNOWN_162, 0); + sfx_play_sound_at_player(SOUND_162, 0); suggest_player_anim_setUnkFlag(0x80003); playerStatus->position.y = tempCollision; D_802B62E0 = 0xA; diff --git a/src/world/action/use_tweester.c b/src/world/action/use_tweester.c index 7c7d686ac5..7f21fdec3a 100644 --- a/src/world/action/use_tweester.c +++ b/src/world/action/use_tweester.c @@ -35,7 +35,7 @@ void func_802B6000_E2A340(void) { D_802B6350_E2A690->unk_14 = 6.0f; D_802B6350_E2A690->unk_18 = 50.0f; D_802B6350_E2A690->unk_00 = 0x78; - sfx_play_sound_at_player(SOUND_UNKNOWN_2F6, 0); + sfx_play_sound_at_player(SOUND_2F6, 0); } switch (playerStatus->fallState) { diff --git a/src/world/area_arn/arn_05/events.c b/src/world/area_arn/arn_05/events.c index 16ad145e22..ac6c586de8 100644 --- a/src/world/area_arn/arn_05/events.c +++ b/src/world/area_arn/arn_05/events.c @@ -478,7 +478,7 @@ StaticNpc N(npcGroup_8024223C)[] = { EvtSource N(80242BEC) = SCRIPT({ loop EVT_VAR(0) { - PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_20F6, 0); ShakeCam(0, 0, 10, 0.5); sleep 5; } @@ -487,7 +487,7 @@ EvtSource N(80242BEC) = SCRIPT({ EvtSource N(80242C50) = SCRIPT({ DisablePlayerInput(TRUE); NpcFacePlayer(NPC_BOO2, 1); - PlaySoundAtNpc(NPC_BOO2, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO2, SOUND_262, 0); ShowEmote(2, EMOTE_EXCLAMATION, -45, 20, 1, 0, 0, 0, 0); sleep 20; GetNpcPos(NPC_BOO2, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)); @@ -510,12 +510,12 @@ EvtSource N(80242C50) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); SpeakToPlayer(NPC_BOO2, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00A0)); - PlaySoundAt(SOUND_UNKNOWN_20F6, 0, 450, 200, 160); + PlaySoundAt(SOUND_20F6, 0, 450, 200, 160); ShakeCam(0, 0, 20, 0.80078125); - PlaySoundAtNpc(NPC_BOO0, SOUND_UNKNOWN_262, 0); - PlaySoundAtNpc(NPC_BOO1, SOUND_UNKNOWN_262, 0); - PlaySoundAtNpc(NPC_BOO2, SOUND_UNKNOWN_262, 0); - PlaySoundAtNpc(NPC_BOO4, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO0, SOUND_262, 0); + PlaySoundAtNpc(NPC_BOO1, SOUND_262, 0); + PlaySoundAtNpc(NPC_BOO2, SOUND_262, 0); + PlaySoundAtNpc(NPC_BOO4, SOUND_262, 0); ShowEmote(0, EMOTE_EXCLAMATION, -45, 20, 1, 0, 0, 0, 0); ShowEmote(1, EMOTE_EXCLAMATION, -45, 20, 1, 0, 0, 0, 0); ShowEmote(2, EMOTE_EXCLAMATION, -45, 20, 1, 0, 0, 0, 0); @@ -595,8 +595,8 @@ EvtSource N(80242C50) = SCRIPT({ NpcFaceNpc(NPC_BOO0, NPC_WORLD_TUBBA, 1); NpcFaceNpc(NPC_BOO1, NPC_WORLD_TUBBA, 1); SetNpcPos(NPC_BOO2, 272, 190, 214); - PlaySoundAtNpc(NPC_BOO0, SOUND_UNKNOWN_262, 0); - PlaySoundAtNpc(NPC_BOO1, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO0, SOUND_262, 0); + PlaySoundAtNpc(NPC_BOO1, SOUND_262, 0); ShowEmote(0, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); ShowEmote(1, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); spawn { @@ -678,7 +678,7 @@ EvtSource N(80242C50) = SCRIPT({ PanToTarget(0, 0, 1); spawn { sleep 50; - PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_315, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_315, 0); } sleep 40; SetNpcPos(NPC_BOO2, 0, -1000, 0); diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index 0d6ef3f187..53a2e58b9f 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -171,7 +171,7 @@ NpcSettings N(npcSettings_80243DA0) = { EvtSource N(80243DCC) = SCRIPT({ loop { - PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_20F6, 0); ShakeCam(0, 0, 3, 0.80078125); } }); diff --git a/src/world/area_dgb/dgb_00/BFA100.c b/src/world/area_dgb/dgb_00/BFA100.c index 43790200c6..c5e0f611a9 100644 --- a/src/world/area_dgb/dgb_00/BFA100.c +++ b/src/world/area_dgb/dgb_00/BFA100.c @@ -189,7 +189,7 @@ EvtSource N(80240F50) = SCRIPT({ sleep EVT_VAR(0); if (EVT_MAP_VAR(0) == 0) { DisablePlayerInput(TRUE); - PlaySoundAt(SOUND_UNKNOWN_B4, 0, 240, 10, -125); + PlaySoundAt(SOUND_B4, 0, 240, 10, -125); ShakeCam(0, 0, 20, 2.0); ShowMessageAtScreenPos(MESSAGE_ID(0x0E, 0x00EF), 160, 40); DisablePlayerInput(FALSE); @@ -227,10 +227,10 @@ EvtSource N(8024103C) = SCRIPT({ SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x00DB)); SpeakToPlayer(NPC_BOO4, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x00DC)); SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x00DD)); - PlaySoundAt(SOUND_UNKNOWN_B4, 0, 240, 10, -125); + PlaySoundAt(SOUND_B4, 0, 240, 10, -125); ShakeCam(0, 0, 20, 2.0); sleep 10; - PlaySoundAt(SOUND_UNKNOWN_B4, 0, 240, 10, -125); + PlaySoundAt(SOUND_B4, 0, 240, 10, -125); ShakeCam(0, 0, 20, 2.0); InterpNpcYaw(NPC_BOO0, 90, 1); ShowMessageAtScreenPos(MESSAGE_ID(0x0E, 0x00DE), 160, 40); @@ -244,12 +244,12 @@ EvtSource N(8024103C) = SCRIPT({ EvtSource N(802413F4) = SCRIPT({ SetPlayerSpeed(8.0); PlayerMoveTo(184, -44, 0); - PlaySoundAtNpc(NPC_BOO0, SOUND_UNKNOWN_262, 0); - PlaySoundAtNpc(NPC_BOO1, SOUND_UNKNOWN_262, 0); - PlaySoundAtNpc(NPC_BOO2, SOUND_UNKNOWN_262, 0); - PlaySoundAtNpc(NPC_BOO3, SOUND_UNKNOWN_262, 0); - PlaySoundAtNpc(NPC_BOO4, SOUND_UNKNOWN_262, 0); - PlaySoundAtNpc(NPC_BOO5, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO0, SOUND_262, 0); + PlaySoundAtNpc(NPC_BOO1, SOUND_262, 0); + PlaySoundAtNpc(NPC_BOO2, SOUND_262, 0); + PlaySoundAtNpc(NPC_BOO3, SOUND_262, 0); + PlaySoundAtNpc(NPC_BOO4, SOUND_262, 0); + PlaySoundAtNpc(NPC_BOO5, SOUND_262, 0); ShowEmote(0, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); ShowEmote(1, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); ShowEmote(2, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); @@ -308,10 +308,10 @@ EvtSource N(802413F4) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); PanToTarget(0, 0, 0); - PlaySoundAt(SOUND_UNKNOWN_B4, 0, 240, 10, -125); + PlaySoundAt(SOUND_B4, 0, 240, 10, -125); ShakeCam(0, 0, 20, 2.0); sleep 5; - PlaySoundAt(SOUND_UNKNOWN_B4, 0, 240, 10, -125); + PlaySoundAt(SOUND_B4, 0, 240, 10, -125); ShakeCam(0, 0, 20, 2.0); ShowMessageAtScreenPos(MESSAGE_ID(0x0E, 0x00E7), 160, 40); await N(80240B08); @@ -597,7 +597,7 @@ EvtSource N(80242B84) = SCRIPT({ DisablePlayerPhysics(TRUE); DisablePartnerAI(0); SetNpcPos(NPC_PARTNER, 320, 10, -160); - PlaySound(SOUND_UNKNOWN_32E); + PlaySound(SOUND_32E); spawn { loop 180 { GetNpcPos(NPC_SENTINEL, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)); @@ -641,7 +641,7 @@ EvtSource N(80242B84) = SCRIPT({ SetNpcPos(NPC_SENTINEL, 175, 85, -33); SetNpcAnimation(NPC_SENTINEL, NPC_ANIM_sentinel_Palette_00_Anim_9); sleep 20; - PlaySoundAtNpc(NPC_SENTINEL, SOUND_UNKNOWN_2F7, 0); + PlaySoundAtNpc(NPC_SENTINEL, SOUND_2F7, 0); SetNpcAnimation(NPC_SENTINEL, NPC_ANIM_sentinel_Palette_00_Anim_2); SetNpcPos(NPC_SENTINEL, 175, 70, -33); spawn { @@ -658,7 +658,7 @@ EvtSource N(80242B84) = SCRIPT({ } SetPlayerJumpscale(0); PlayerJump1(175, 0, -35, 10); - PlaySoundAtNpc(NPC_SENTINEL, SOUND_UNKNOWN_162, 0); + PlaySoundAtNpc(NPC_SENTINEL, SOUND_162, 0); SetPlayerAnimation(ANIM_80003); spawn { sleep 2; diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 26a16e3999..a04acf3c14 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -250,9 +250,9 @@ EvtSource N(80243EF0) = SCRIPT({ func_802D2B6C(); SetPlayerAnimation(0x8000A); spawn { - PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_20F6, 0); sleep 5; - PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_20F6, 0); sleep 5; } spawn { @@ -261,7 +261,7 @@ EvtSource N(80243EF0) = SCRIPT({ sleep 30; spawn { loop 12 { - PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_20F6, 0); sleep 5; } } @@ -362,10 +362,10 @@ EvtSource N(80243EF0) = SCRIPT({ NpcMoveTo(NPC_WORLD_TUBBA, 176, 0, 0); } spawn { - PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_20F6, 0); ShakeCam(0, 0, 5, 0.30078125); sleep 5; - PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_20F6, 0); ShakeCam(0, 0, 2, 0.150390625); sleep 8; } @@ -389,10 +389,10 @@ EvtSource N(80243EF0) = SCRIPT({ } spawn { loop { - PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_20F6, 0); ShakeCam(0, 0, 5, 0.30078125); sleep 5; - PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_20F6, 0); ShakeCam(0, 0, 2, 0.150390625); sleep 8; } @@ -1409,10 +1409,10 @@ EvtSource N(idle_8024598C) = SCRIPT({ } spawn { loop { - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 4194304); + PlaySoundAtNpc(NPC_SELF, SOUND_20F6, 4194304); ShakeCam(0, 0, 5, 2.0); sleep 5; - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 4194304); + PlaySoundAtNpc(NPC_SELF, SOUND_20F6, 4194304); ShakeCam(0, 0, 2, 1.0); sleep 8; } diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index ed979f22f5..047077c9d6 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -285,7 +285,7 @@ EvtSource N(80243D94) = SCRIPT({ PlaySound(0x212E); N(func_80242F08_C39438)(70, 70); sleep 27; - PlaySound(SOUND_UNKNOWN_208E); + PlaySound(SOUND_208E); N(func_80242F08_C39438)(50, 50); } spawn { diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 6a3455b1c9..83df25ba92 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -429,10 +429,10 @@ EvtSource N(npcAI_80244D7C) = SCRIPT({ spawn N(80244D08); spawn { loop { - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 4194304); + PlaySoundAtNpc(NPC_SELF, SOUND_20F6, 4194304); ShakeCam(0, 0, 5, 2.0); sleep 5; - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 4194304); + PlaySoundAtNpc(NPC_SELF, SOUND_20F6, 4194304); ShakeCam(0, 0, 2, 1.0); sleep 8; } diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 2956cd99ee..f8e68a78dd 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -273,7 +273,7 @@ EvtSource N(802424E8) = SCRIPT({ GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)); GetNpcPos(NPC_SELF, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)); if (EVT_VAR(3) != EVT_VAR(6)) { - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 65538); + PlaySoundAtNpc(NPC_SELF, SOUND_20F6, 65538); GetDist2D(EVT_VAR(10), EVT_VAR(0), EVT_VAR(2), EVT_VAR(3), EVT_VAR(5)); match EVT_VAR(10) { < 200 { diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 07efa0f367..624229f5ab 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -144,7 +144,7 @@ EvtSource N(idle_80241654) = SCRIPT({ FadeOutMusic(0, 500); loop 3 { SetPlayerAnimation(ANIM_8001E); - PlaySoundAt(SOUND_UNKNOWN_20F6, 0, 382, 0, 218); + PlaySoundAt(SOUND_20F6, 0, 382, 0, 218); ShakeCam(0, 0, 5, 1.0); sleep 20; SetPlayerAnimation(ANIM_10002); @@ -179,7 +179,7 @@ EvtSource N(idle_80241654) = SCRIPT({ } spawn { loop 3 { - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_20F6, 0); ShakeCam(0, 0, 5, 0.30078125); sleep 5; } @@ -213,14 +213,14 @@ EvtSource N(idle_80241654) = SCRIPT({ if (EVT_VAR(0) == 1) { break loop; } - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_20F6, 0); ShakeCam(0, 0, 5, 0.30078125); sleep 9; GetSelfVar(0, EVT_VAR(0)); if (EVT_VAR(0) == 1) { break loop; } - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_20F6, 0); ShakeCam(0, 0, 2, 0.150390625); sleep 12; } @@ -310,7 +310,7 @@ EvtSource N(idle_80241654) = SCRIPT({ sleep 15; SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_24); sleep 30; - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2038, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_2038, 0); sleep 30; spawn { SetSelfVar(1, 0); @@ -319,12 +319,12 @@ EvtSource N(idle_80241654) = SCRIPT({ if (EVT_VAR(0) == 1) { break loop; } - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2039, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_2039, 0); RandInt(10, EVT_VAR(1)); EVT_VAR(1) += 15; ShowSleepBubble(0, 0, 0, 2, 628, 121, 127, EVT_VAR(1), EVT_VAR(0)); sleep 48; - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2038, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_2038, 0); RandInt(10, EVT_VAR(1)); EVT_VAR(1) += 10; func_802D8248(EVT_VAR(0), EVT_VAR(1)); @@ -351,7 +351,7 @@ EvtSource N(idle_80242494) = SCRIPT({ sleep 15; SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_24); sleep 30; - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2038, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_2038, 0); sleep 30; spawn { SetSelfVar(1, 0); @@ -360,12 +360,12 @@ EvtSource N(idle_80242494) = SCRIPT({ if (EVT_VAR(0) == 1) { break loop; } - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2039, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_2039, 0); RandInt(10, EVT_VAR(1)); EVT_VAR(1) += 15; ShowSleepBubble(0, 0, 0, 2, 628, 121, 127, EVT_VAR(1), EVT_VAR(0)); sleep 48; - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2038, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_2038, 0); RandInt(10, EVT_VAR(1)); EVT_VAR(1) += 10; func_802D8248(EVT_VAR(0), EVT_VAR(1)); @@ -376,13 +376,13 @@ EvtSource N(idle_80242494) = SCRIPT({ EvtSource N(npcAI_802426B0) = SCRIPT({ group 11; - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2039, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_2039, 0); ShowSleepBubble(0, 0, 50, 2, 552, 111, 128, 30, EVT_VAR(0)); sleep 360; func_802D8248(EVT_VAR(0), 20); SetNpcVar(-1, 1, 2); sleep 20; - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2F1, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_2F1, 0); SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_19); sleep 30; spawn { diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 972c1cc99b..5308d4c07a 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -422,7 +422,7 @@ EvtSource N(enterWalk_80244C14) = { EVT_CALL(SetNpcPos, NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(SetPlayerPos, EVT_VAR(0), -1000, EVT_VAR(2)) EVT_WAIT_FRAMES(30) - EVT_CALL(PlaySound, SOUND_UNKNOWN_208E) + EVT_CALL(PlaySound, SOUND_208E) EVT_SET(EVT_SAVE_FLAG(1939), 1) EVT_WAIT_FRAMES(30) EVT_CALL(SetPlayerActionState, 0) diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c index 3fa93f3b49..19fb90012c 100644 --- a/src/world/area_flo/flo_03/CA72E0.c +++ b/src/world/area_flo/flo_03/CA72E0.c @@ -333,7 +333,7 @@ EvtSource N(interact_802412BC) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); SetNpcAnimation(NPC_DAYZEE, NPC_ANIM_dayzee_Palette_00_Anim_D); - PlaySoundAtNpc(NPC_DAYZEE, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_DAYZEE, SOUND_262, 0); ShowEmote(1, EMOTE_EXCLAMATION, 45, 30, 1, 0, 0, 0, 0); sleep 15; SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_7, NPC_ANIM_petunia_Palette_00_Anim_6, 0, MESSAGE_ID(0x11, 0x0056)); @@ -512,7 +512,7 @@ EvtSource N(idle_8024219C) = SCRIPT({ } else { EVT_VAR(1) = 10; } - PlaySoundAtNpc(NPC_MONTY_MOLE0, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_MONTY_MOLE0, SOUND_262, 0); ShowEmote(2, EMOTE_EXCLAMATION, 0, EVT_VAR(1), 1, 0, 0, 0, 0); sleep EVT_VAR(1); SetSelfEnemyFlagBits(((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | 0x02000000 | NPC_FLAG_PARTICLE | 0x10000000)), TRUE); @@ -588,7 +588,7 @@ EvtSource N(idle_80242618) = SCRIPT({ } else { EVT_VAR(1) = 10; } - PlaySoundAtNpc(NPC_MONTY_MOLE1, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_MONTY_MOLE1, SOUND_262, 0); ShowEmote(3, EMOTE_EXCLAMATION, 0, EVT_VAR(1), 1, 0, 0, 0, 0); sleep EVT_VAR(1); SetSelfEnemyFlagBits(((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | 0x02000000 | NPC_FLAG_PARTICLE | 0x10000000)), TRUE); @@ -664,7 +664,7 @@ EvtSource N(idle_80242A94) = SCRIPT({ } else { EVT_VAR(1) = 10; } - PlaySoundAtNpc(NPC_MONTY_MOLE2, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_MONTY_MOLE2, SOUND_262, 0); ShowEmote(4, EMOTE_EXCLAMATION, 0, EVT_VAR(1), 1, 0, 0, 0, 0); sleep EVT_VAR(1); SetSelfEnemyFlagBits(((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | 0x02000000 | NPC_FLAG_PARTICLE | 0x10000000)), TRUE); @@ -740,7 +740,7 @@ EvtSource N(idle_80242F10) = SCRIPT({ } else { EVT_VAR(1) = 10; } - PlaySoundAtNpc(NPC_MONTY_MOLE3, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_MONTY_MOLE3, SOUND_262, 0); ShowEmote(5, EMOTE_EXCLAMATION, 0, EVT_VAR(1), 1, 0, 0, 0, 0); sleep EVT_VAR(1); SetSelfEnemyFlagBits(((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | 0x02000000 | NPC_FLAG_PARTICLE | 0x10000000)), TRUE); diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index 898364bb0a..53e5fad6ed 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -75,7 +75,7 @@ EvtSource N(80242014) = SCRIPT({ PlaySound(0x212E); N(UnkFunc23)(70, 70); sleep 27; - PlaySound(SOUND_UNKNOWN_208E); + PlaySound(SOUND_208E); N(UnkFunc23)(50, 50); } spawn { @@ -445,7 +445,7 @@ EvtSource N(interact_80243214) = SCRIPT({ N(func_80241B5C_CB089C)(EVT_VAR(0)); MakeItemEntity(EVT_VAR(8), -695, 20, -29, 1, 0); EVT_VAR(7) = EVT_VAR(0); - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2095, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_2095, 0); SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_3); sleep 20; RemoveItemEntity(EVT_VAR(7)); diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c index 8080d1dca0..42435f2d68 100644 --- a/src/world/area_flo/flo_10/CB9280.c +++ b/src/world/area_flo/flo_10/CB9280.c @@ -681,7 +681,7 @@ EvtSource N(interact_802437C8) = SCRIPT({ 0x0079)); NpcFacePlayer(NPC_SELF, 1); SetNpcAnimation(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_1); - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_262, 0); ShowEmote(-1, EMOTE_EXCLAMATION, 0, 15, 1, 0, 0, 0, 0); sleep 15; SpeakToPlayer(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_1, NPC_ANIM_lily_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index 23e23e9f97..978635aa62 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -259,7 +259,7 @@ EvtSource N(80243764) = SCRIPT({ PlaySound(0x212E); N(UnkFunc23)(70, 70); sleep 27; - PlaySound(SOUND_UNKNOWN_208E); + PlaySound(SOUND_208E); N(UnkFunc23)(50, 50); } spawn { diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index f5d1bf3f38..2cfde75493 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -215,7 +215,7 @@ EvtSource N(interact_80241564) = SCRIPT({ N(func_80240C2C_CEEE8C)(EVT_VAR(0)); MakeItemEntity(EVT_VAR(8), 385, 20, -34, 1, 0); EVT_VAR(7) = EVT_VAR(0); - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2095, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_2095, 0); SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_3); sleep 20; RemoveItemEntity(EVT_VAR(7)); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index b0ef05afe9..03491eee8f 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -250,7 +250,7 @@ EvtSource N(interact_80242C58) = SCRIPT({ N(func_80241F44_CF4B14)(EVT_VAR(0)); MakeItemEntity(EVT_VAR(8), 505, 20, -24, 1, 0); EVT_VAR(7) = EVT_VAR(0); - PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2095, 0); + PlaySoundAtNpc(NPC_SELF, SOUND_2095, 0); SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_3); sleep 20; RemoveItemEntity(EVT_VAR(7)); diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c index f853b6942e..6431c030c7 100644 --- a/src/world/area_kmr/kmr_03/8C8140.c +++ b/src/world/area_kmr/kmr_03/8C8140.c @@ -99,7 +99,7 @@ EvtSource N(npcAI_80240B50) = SCRIPT({ } DisablePlayerInput(TRUE); SetNpcAux(NPC_GOOMPA, 0); - PlaySoundAtNpc(NPC_GOOMPA, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_GOOMPA, SOUND_262, 0); ShowEmote(0, EMOTE_EXCLAMATION, 45, 15, 1, 0, 0, 0, 0); sleep 15; NpcFacePlayer(NPC_SELF, 5); diff --git a/src/world/common/StarSpiritEffectFunc.inc.c b/src/world/common/StarSpiritEffectFunc.inc.c index cc8d7cab3a..edd1be96f9 100644 --- a/src/world/common/StarSpiritEffectFunc.inc.c +++ b/src/world/common/StarSpiritEffectFunc.inc.c @@ -5,7 +5,7 @@ ApiStatus N(StarSpiritEffectFunc1)(Evt* script, s32 isInitialCall) { StarSpiritEffect* ptr = (StarSpiritEffect*)script->varTable[0]; - sfx_adjust_env_sound_pos(SOUND_UNKNOWN_A2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08); + sfx_adjust_env_sound_pos(SOUND_A2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08); if (ptr->unk_44 < 2) { return ApiStatus_BLOCK; diff --git a/src/world/common/UnkFunc51.inc.c b/src/world/common/UnkFunc51.inc.c index cb643180ee..a4a449689b 100644 --- a/src/world/common/UnkFunc51.inc.c +++ b/src/world/common/UnkFunc51.inc.c @@ -7,7 +7,7 @@ ApiStatus N(UnkFunc51)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = evt_get_variable(script, *args++); script->functionTemp[1] = evt_get_variable(script, *args++); script->functionTemp[2] = evt_get_variable(script, *args++); - sfx_adjust_env_sound_pos(SOUND_UNKNOWN_52, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_52, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index ef511bdcb7..133963744c 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -376,10 +376,10 @@ void func_802BDDD8_321928(Npc* npc) { if (D_802BFF20 < 0x3C) { phi_a3 = update_lerp(0, 0.0f, 100.0f, D_802BFF20, 60); - sfx_play_sound_with_params(SOUND_UNKNOWN_295, 0, 0x40, phi_a3); + sfx_play_sound_with_params(SOUND_295, 0, 0x40, phi_a3); } else { phi_a3 = update_lerp(0, 100.0f, 0.0f, D_802BFF20 - 60, 60); - sfx_play_sound_with_params(SOUND_UNKNOWN_295, 0, 0x40, phi_a3); + sfx_play_sound_with_params(SOUND_295, 0, 0x40, phi_a3); } } diff --git a/ver/us/asm/data/16A680.data.s b/ver/us/asm/data/16A680.data.s index 29112f0b3b..aa440ddb47 100644 --- a/ver/us/asm/data/16A680.data.s +++ b/ver/us/asm/data/16A680.data.s @@ -9,10 +9,7 @@ dlabel D_80249E70 .word 0x00000102, 0x02030405, 0x06000001, 0x02020306, 0x06060000, 0x01020203, 0x06060600, 0x00010202, 0x03060606, 0x00000102, 0x02030606, 0x06000000 dlabel D_80249EA0 -.word 0x2D000000, 0x00000000, 0x00000000, filemenu_draw_contents_title, 0x00000000, 0x2C000000, filemenu_update_show_title, 0x00000000, D_8024BB08, 0x3300FFFE, 0x00060044, 0x00140000, filemenu_draw_contents_stereo, 0x00000000, 0x2C000000, filemenu_update_show_options_left, 0x00000000, D_8024BAD0, 0x340000DD, 0x00060044, 0x00140000, filemenu_draw_contents_mono, 0x00000000, 0x2C000000, filemenu_update_show_options_right, 0x00000000, D_8024BAD0, 0x35000005, 0x00AB0058, 0x00100000, filemenu_draw_contents_option_left, 0x00000000, 0x2C000000, filemenu_update_show_options_bottom, 0x00000000, D_8024BB40, 0x36000000, 0x00AB0058, 0x00100000, filemenu_draw_contents_option_center, 0x00000000, 0x2C000000, filemenu_update_show_options_bottom, 0x00000000, D_8024BB78, 0x370000C3, 0x00AB0058, 0x00100000, filemenu_draw_contents_option_right, 0x00000000, 0x2C000000, filemenu_update_show_options_bottom, 0x00000000, D_8024BBB0, 0x3A000009, 0x006E0082, 0x00360000, filemenu_draw_contents_file_2_info, 0x00000000, 0x2C000000, filemenu_update_show_options_left, 0x00000000, D_8024BC58, 0x3E000003, 0xFFF8007C, 0x000F0000, filemenu_draw_contents_file_2_title, 0x00000000, 0x3A000000, 0x00000001, 0x00000000, D_8024BD38, 0x3B000095, 0x006E0082, 0x00360000, filemenu_draw_contents_file_3_info, 0x00000000, 0x2C000000, filemenu_update_show_options_right, 0x00000000, D_8024BC90, 0x3F000003, 0xFFF8007C, 0x000F0000, filemenu_draw_contents_file_3_title, 0x00000000, 0x3B000000, 0x00000001, 0x00000000, D_8024BD70, 0x38000009, 0x00290082, 0x00360000, filemenu_draw_contents_file_0_info, 0x00000000, 0x2C000000, filemenu_update_show_options_left, 0x00000000, D_8024BBE8, 0x3C000003, 0xFFF8007C, 0x000F0000, filemenu_draw_contents_file_0_title, 0x00000000, 0x38000000, 0x00000001, 0x00000000, D_8024BCC8, 0x39000095, 0x00290082, 0x00360000, filemenu_draw_contents_file_1_info, 0x00000000, 0x2C000000, filemenu_update_show_options_right, 0x00000000, D_8024BC20 - -dlabel D_8024A074 -.word 0x3D000003, 0xFFF8007C, 0x000F0000, filemenu_draw_contents_file_1_title, 0x00000000, 0x39000000, 0x00000001, 0x00000000, D_8024BD00 +.word 0x2D000000, 0x00000000, 0x00000000, filemenu_draw_contents_title, 0x00000000, 0x2C000000, filemenu_update_show_title, 0x00000000, D_8024BB08, 0x3300FFFE, 0x00060044, 0x00140000, filemenu_draw_contents_stereo, 0x00000000, 0x2C000000, filemenu_update_show_options_left, 0x00000000, D_8024BAD0, 0x340000DD, 0x00060044, 0x00140000, filemenu_draw_contents_mono, 0x00000000, 0x2C000000, filemenu_update_show_options_right, 0x00000000, D_8024BAD0, 0x35000005, 0x00AB0058, 0x00100000, filemenu_draw_contents_option_left, 0x00000000, 0x2C000000, filemenu_update_show_options_bottom, 0x00000000, D_8024BB40, 0x36000000, 0x00AB0058, 0x00100000, filemenu_draw_contents_option_center, 0x00000000, 0x2C000000, filemenu_update_show_options_bottom, 0x00000000, D_8024BB78, 0x370000C3, 0x00AB0058, 0x00100000, filemenu_draw_contents_option_right, 0x00000000, 0x2C000000, filemenu_update_show_options_bottom, 0x00000000, D_8024BBB0, 0x3A000009, 0x006E0082, 0x00360000, filemenu_draw_contents_file_2_info, 0x00000000, 0x2C000000, filemenu_update_show_options_left, 0x00000000, D_8024BC58, 0x3E000003, 0xFFF8007C, 0x000F0000, filemenu_draw_contents_file_2_title, 0x00000000, 0x3A000000, 0x00000001, 0x00000000, D_8024BD38, 0x3B000095, 0x006E0082, 0x00360000, filemenu_draw_contents_file_3_info, 0x00000000, 0x2C000000, filemenu_update_show_options_right, 0x00000000, D_8024BC90, 0x3F000003, 0xFFF8007C, 0x000F0000, filemenu_draw_contents_file_3_title, 0x00000000, 0x3B000000, 0x00000001, 0x00000000, D_8024BD70, 0x38000009, 0x00290082, 0x00360000, filemenu_draw_contents_file_0_info, 0x00000000, 0x2C000000, filemenu_update_show_options_left, 0x00000000, D_8024BBE8, 0x3C000003, 0xFFF8007C, 0x000F0000, filemenu_draw_contents_file_0_title, 0x00000000, 0x38000000, 0x00000001, 0x00000000, D_8024BCC8, 0x39000095, 0x00290082, 0x00360000, filemenu_draw_contents_file_1_info, 0x00000000, 0x2C000000, filemenu_update_show_options_right, 0x00000000, D_8024BC20, 0x3D000003, 0xFFF8007C, 0x000F0000, filemenu_draw_contents_file_1_title, 0x00000000, 0x39000000, 0x00000001, 0x00000000, D_8024BD00 dlabel D_8024A098 .word 0x00000000, 0x00030300, D_80249E70, filemenu_main_init, filemenu_main_handle_input, filemenu_main_update, filemenu_main_cleanup, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/E2CA0.data.s b/ver/us/asm/data/E2CA0.data.s index 36f6b694f7..3d9bbb509d 100644 --- a/ver/us/asm/data/E2CA0.data.s +++ b/ver/us/asm/data/E2CA0.data.s @@ -25,57 +25,3 @@ dlabel D_8014C6E0 dlabel D_8014C6E4 .short 0x0008, 0x0004, 0x0000, 0x0000, 0x0000, 0x0000 - -dlabel D_8014C6F0 -.word 0x00000002, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8014C700 -.word 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFCA, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFC86, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFD853, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFA621, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFD8410, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFA5200, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFD73100, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFA52000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFC731000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFA520000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xC7310000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xA5200000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFC, 0x73100000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFE9, 0x52000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFC7, 0x31000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFE94, 0x10000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFA62, 0x10000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEA731, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFE, 0xDCA86310, 0x00000000, 0xFFFFFFFF, 0xEDCBAA98, 0x76542100, 0x00000000, 0xFFFDCBA9, 0x87665443, 0x32211000, 0x00000000, 0xFEB86544, 0x33222111, 0x10000000, 0x00000000, 0xFC853211, 0x11000000, 0x00000000, 0x00000000, 0xFD842100, 0x00000000, 0x00000000, 0x00000000, 0xFEA63100, 0x00000000, 0x00000000, 0x00000000, 0xFFD85200, 0x00000000, 0x00000000, 0x00000000, 0xFFFC8420, 0x00000000, 0x00000000, 0x00000000, 0xFFFFC741, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFB73, 0x10000000, 0x00000000, 0x00000000, 0xFFFFFFA6, 0x31000000, 0x00000000, 0x00000000, 0xFFFFFFEA, 0x63100000, 0x00000000, 0x00000000, 0xFFFFFFFE, 0x95210000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xD9521000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFD852000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFC84200, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFC7310, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFB631, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFE941, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFB62, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFC62, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFC73, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFC72, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFC62, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFB52, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFA51, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFF941, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFE941, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFE831, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFD731, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFC620, 0x00000000, 0x00011223, 0xFFFFFFFF, 0xFFFFB620, 0x00000000, 0x01234567, 0xFFFFFFFF, 0xFFFFA520, 0x00000001, 0x23579ACC, 0xFFFFFFFF, 0xFFFFA510, 0x00001134, 0x68ACEFFF, 0xFFFFFFFF, 0xFFFF9410, 0x00123569, 0xBDFFFFFF, 0xFFFFFFFF, 0xFFFF9521, 0x224579CE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFA644, 0x568ADFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFC988, 0x9BEFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFDDD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_8014CB00 -.word 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFDCCCCCD, 0xEFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFEB, 0x97655567, 0x9BCEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFDA86, 0x42111112, 0x3569CEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFDA7532, 0x10000000, 0x012469CF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xEB742100, 0x00000000, 0x0001247C, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFC, 0x85310000, 0x00000000, 0x00000137, 0xDFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFEB7, 0x41000000, 0x00000000, 0x00000014, 0x9FFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFD963, 0x10000000, 0x00000000, 0x00000002, 0x6CFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFC8420, 0x00000000, 0x00000000, 0x00000001, 0x49FFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFC74100, 0x00000000, 0x00000000, 0x00000000, 0x27DFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFC731000, 0x00000000, 0x00000000, 0x00000000, 0x26CFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xC7310000, 0x00000000, 0x00000000, 0x00000000, 0x26CFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFC, 0x73100000, 0x00000000, 0x00000000, 0x00000000, 0x15CFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFEC8, 0x41000000, 0x00000000, 0x00000000, 0x00000000, 0x15BFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFDCBA964, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x15CFFFFF, 0xFFFFFFFF, 0xFFFFFFFC, 0xA7654321, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x16CFFFFF, 0xFFFFFFFF, 0xFFFFFDA7, 0x42111100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x16BFFFFF, 0xFFFFFFFF, 0xFFFFC842, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x149CEEDD, 0xEEFFFFFF, 0xFFFC7310, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02578877, 0x889ACFFF, 0xFFD83100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01233322, 0x33358DFF, 0xFFA51000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00125BFF, 0xFE830000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00025BFF, 0xFC620000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00138DFF, 0xFC510000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x1247CFFF, 0xFC510000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000012, 0x469CFFFF, 0xFC510000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00012346, 0x9CEFFFFF, 0xFC510000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x013468AC, 0xEFFFFFFF, 0xFC510000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x1479BDFF, 0xFFFFFFFF, 0xFD720000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x37BEFFFF, 0xFFFFFFFF, 0xFE941000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x38DFFFFF, 0xFFFFFFFF, 0xFFD84100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x27DFFFFF, 0xFFFFFFFF, 0xFFFC7310, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x26ADDBAA, 0xABDFFFFF, 0xFFFFA520, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x14787544, 0x457AEFFF, 0xFFFEA520, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02342111, 0x1135AEFF, 0xFFFB7310, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00110000, 0x00026BFF, 0xFFC73100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000137DF, 0xFE941000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000016CF, 0xFD720000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000015BF, 0xFC610000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000015CF, 0xFC510000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000027DF, 0xFC510000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00014AFF, 0xFC510000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00138DFF, 0xFD720000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x1147CFFF, 0xFF941000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000012, 0x358CFFFF, 0xFFD84100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000136, 0x8BDFFFFF, 0xFFFC8421, 0x11110000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000026B, 0xEFFFFFFF, 0xFFFFDA75, 0x55442100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000149E, 0xFFFFFFFF, 0xFFFFFFDC, 0xBBA97310, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000015BF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFC731, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000027CF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFB62, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00025AFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFA5, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x01259EFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFE9, 0x52000000, 0x00000000, 0x00000000, 0x00000001, 0x2469DFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFD, 0x95310000, 0x00000000, 0x00000000, 0x00000013, 0x69CEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xEB742000, 0x00000000, 0x00000000, 0x00000025, 0xAEFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFC85310, 0x00000000, 0x00000000, 0x00000259, 0xEFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEA753, 0x11000000, 0x00000000, 0x0001359E, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFDA7, 0x53211000, 0x00000000, 0x11347AEF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFD, 0xB9754333, 0x33333333, 0x457ACFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEDBA988, 0x88888889, 0xABDFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFEE, 0xEEEEEEEF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_8014D300 -.word 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEDDDCCC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFEDC, 0xBBAA9999, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFDCBA9, 0x88776666, 0xFFFFFFFF, 0xFFFFFFFF, 0xFDCB9876, 0x65443333, 0xFFFFFFFF, 0xFFFFFFFE, 0xCA987643, 0x32111000, 0xFFFFFFFF, 0xFFFFFFDB, 0x98654321, 0x00000000, 0xFFFFFFFF, 0xFFFFECA8, 0x75421000, 0x00000000, 0xFFFFFFFF, 0xFFFDBA86, 0x43100000, 0x00000000, 0xFFFFFFFF, 0xFFDB9753, 0x20000000, 0x00000000, 0xFFFFFFFF, 0xFDB97531, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xDB974310, 0x00000000, 0x00000000, 0xFFFFFFFE, 0xB9743100, 0x00000000, 0x00000000, 0xFFFFFFFC, 0xA7531000, 0x00000000, 0x00000000, 0xFFFFFFDA, 0x85310000, 0x00000000, 0x00000000, 0xFFFFFEB8, 0x63100000, 0x00000000, 0x00000000, 0xFFFFFC97, 0x42000000, 0x00000000, 0x00000000, 0xFFFFDA85, 0x30000000, 0x00000000, 0x00000000, 0xFFFFC964, 0x10000000, 0x00000000, 0x00000000, 0xFFFDB852, 0x00000000, 0x00000000, 0x00000000, 0xFFFC9741, 0x00000000, 0x00000000, 0x00000000, 0xFFEB8630, 0x00000000, 0x00000000, 0x00000000, 0xFFDA7420, 0x00000000, 0x00000000, 0x00000000, 0xFFC96310, 0x00000000, 0x00000000, 0x00000000, 0xFFB86300, 0x00000000, 0x00000000, 0x00000000, 0xFEB85200, 0x00000000, 0x00000000, 0x00000000, 0xFDA74100, 0x00000000, 0x00000000, 0x00000000, 0xFDA74100, 0x00000000, 0x00000000, 0x00000000, 0xFD963100, 0x00000000, 0x00000000, 0x00000000, 0xFC963000, 0x00000000, 0x00000000, 0x00000000, 0xFC963000, 0x00000000, 0x00000000, 0x00000000, 0xFC963000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8014D500 -.word 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFEF8, 0xFEFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEFFFFFF, 0xFEFEFEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFEFEFEFD, 0xFBFBFDFD, 0xFEFDFEFD, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFEFE, 0xFEFEFCF8, 0xF5F7FAFD, 0xFEFEFEFE, 0xFEFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFCFC, 0xFCFBF8F6, 0xF0F6F9FB, 0xFCFDFEFD, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEFCFBFB, 0xFAFAF6F5, 0xF0F5F5F9, 0xFAFDFCFE, 0xFCFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFEFE, 0xFEFFFFFF, 0xFFFFFFFE, 0xFBF7F8F8, 0xF8F7F5F4, 0xEEF4F3F7, 0xF8F9F9F9, 0xFCFCFDFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFEFE, 0xFEFEFFFF, 0xFFFEFCF9, 0xF6F3F4F5, 0xF6F4F4F4, 0xF0EDF0F1, 0xF4F4F8F8, 0xF8F8FAFB, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEFEFDFE, 0xFEFFFFFF, 0xFEFDFAF7, 0xF2EFF0F2, 0xF1F2F1EF, 0xECE8ECEC, 0xF0F2F3F4, 0xF4F6F7F9, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFEFE, 0xFEFEFEFD, 0xFFFFFFFE, 0xFCF8F5F1, 0xEFEEECED, 0xEEEDEDE8, 0xE8E4E8E9, 0xEBEDEFF2, 0xF2F4F4F5, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFEFE, 0xFEFEFEFF, 0xFFFFFDF9, 0xF9F5F2EE, 0xEDEAE7E7, 0xE9E9E8E5, 0xE5E3E5E6, 0xE8EBEBED, 0xEEF1F2F2, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEFEFDFD, 0xFEFDFFFE, 0xFDFCFCF9, 0xF4F1ECEB, 0xEAE9E4E4, 0xE5E4E3E4, 0xE1E0E0E2, 0xE3E6E6E9, 0xEBEDEDF0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEFBFEFE, 0xFDFCFCFD, 0xFDFEFEFC, 0xFAF9F9F7, 0xF1EEEAE7, 0xE7E6E2E0, 0xE0E1DFDF, 0xDEDDDBDF, 0xDEE0E1E3, 0xE5E9EBEE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFAFB, 0xFCFBFBFA, 0xFDFCFBF8, 0xF7F6F6F5, 0xEEEAE5E4, 0xE3E0DEDE, 0xDBDAD8D7, 0xD6D7D6D9, 0xD9D9DBDD, 0xE0E2E6EA, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFEFEFBF8, 0xF8F9F7F9, 0xF9F9F8F7, 0xF5F4F4F2, 0xEDE8E3E0, 0xDEDCD9D5, 0xD4D1CFCF, 0xD0CECED0, 0xD1D3D6D5, 0xDADDE0E3, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFDFD, 0xFCFCFAF8, 0xF7F6F6F8, 0xF7F6F3F3, 0xF1F2F1F0, 0xEBE6DED8, 0xD7D4D4D1, 0xCBC8C4C5, 0xC5C7C9CA, 0xCBCACDD0, 0xD1D3D6D9, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFEFD, 0xFCFBFBF9, 0xFAF9F9F5, 0xF4F3F3F3, 0xF4F3F2EF, 0xEFEDEDED, 0xE8E1DAD4, 0xD2CFCAC6, 0xC1BDB9BA, 0xBEC2C3C2, 0xC3C4C4C6, 0xC7CACFD3, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEFCFBFB, 0xFAF8F9F9, 0xF9F7F8F7, 0xF4F2F1F0, 0xF1EEEDE9, 0xE9E9E9E7, 0xE3DED3CE, 0xCBC9C5BD, 0xB7B3B2B5, 0xB7BABEBD, 0xBFBEBDBD, 0xC0C1C8CE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFCF9F7, 0xF7F6F6F8, 0xF7F5F4F5, 0xF5F0EEEE, 0xECEBE5E3, 0xE1E3E5E3, 0xDCD3CBC6, 0xC2BFB9B4, 0xACABA8AD, 0xB3B7BAB6, 0xB5B4B5B6, 0xB8BDC4C8, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEF9F8F6, 0xF4F5F6F5, 0xF4F4F4F2, 0xF2F1EDEB, 0xE9E4DEDD, 0xDDDFE1DD, 0xD5CAC2BC, 0xB9B4AEA9, 0xA3A4A6AA, 0xADB1B0B0, 0xAFAFAEB1, 0xB1B6BABF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFDF9F7F6, 0xF3F2F3F3, 0xF3F1F1F0, 0xF0EFEEE9, 0xE4DED8D6, 0xD8DBDBD7, 0xCFC4B9B3, 0xAFA9A59F, 0x9C9EA0A5, 0xA9AAA9A9, 0xA8A7A8A8, 0xA8A8ACB2, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFEFE, 0xFDFBF8F5, 0xF3F3F3F2, 0xF0EFEEEE, 0xEEEEEDE7, 0xDFD7D0D0, 0xD3D5D6D3, 0xCABFB5AC, 0xA8A29C97, 0x9698999B, 0x9EA0A09E, 0x9C9E9C9A, 0x999DA1A6, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFEFC, 0xFBFAF7F5, 0xF1F0F2F0, 0xEDEAEBEB, 0xEDECE9E3, 0xD9D0CBCB, 0xCED0D4D2, 0xC9BFB3AA, 0xA19A9592, 0x91919194, 0x96979695, 0x91918E8D, 0x8F91949E, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFDFB, 0xFBF8F6F5, 0xF1F0EDED, 0xE9E7E8E8, 0xE8E9E5DE, 0xD3CBC4C3, 0xC5CACDCE, 0xC7BCB2A7, 0x9F94908C, 0x8D8A8B8A, 0x8D8D8C88, 0x85848581, 0x84898E93, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEFDFCFB, 0xFAF9F7F5, 0xF5F0EEE9, 0xE6E2E2E5, 0xE6E5E0D5, 0xCBC2BDBB, 0xBDC2C2C3, 0xC1B9B0A5, 0x9D908B88, 0x88838383, 0x8383807D, 0x7A7A7B7C, 0x797E8288, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFDFCFBFB, 0xFAF8F5F2, 0xF1F1ECE5, 0xE2E1E0E2, 0xE2E1D9CF, 0xC4BCB8B5, 0xB5B4B7B7, 0xB6B1ACA2, 0x9A908984, 0x837F7D7A, 0x7A787774, 0x736C7073, 0x75747877, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFD, 0xFDFCFBFB, 0xFAF8F3F2, 0xEDECE7E2, 0xDCDADDDF, 0xE0DACFC6, 0xBEB8B4B0, 0xAEAAABA9, 0xA9A9A6A0, 0x978C8380, 0x7C7B7774, 0x6F706C6A, 0x6A6F6263, 0x616A686C, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFD, 0xFDFCFBFB, 0xF9F8F1EC, 0xEAE7E4DF, 0xDBD8D7DA, 0xDBD4CABF, 0xB9B4AEAA, 0xA5A29F9D, 0x9E9F9E99, 0x92867E79, 0x73746D6B, 0x67636562, 0x6263665D, 0x63515963, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFEFD, 0xFCFCFCFC, 0xFAF5EFEA, 0xE7E2DEDA, 0xD4D2D3D4, 0xD4CFC4BE, 0xB6B0ACA5, 0xA09A9593, 0x94959692, 0x8C817871, 0x6C696662, 0x5E5C5B5B, 0x56585A59, 0x565A5A59, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFDFD, 0xFCFDFDF8, 0xFAF4EDE8, 0xE3DFDCD7, 0xD2CDCECE, 0xCDC6BEBA, 0xB6AFA9A2, 0x9C978E8A, 0x8B8D8B89, 0x8279716A, 0x635F5E57, 0x55515051, 0x50484F4F, 0x4B4B5556, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFDFC, 0xFCFEFEFB, 0xF6F1ECE6, 0xE1DFDCD6, 0xCFC9C7C6, 0xC5BBB2B0, 0xAFACA7A0, 0x9A928B84, 0x82848381, 0x79716B62, 0x5F585451, 0x4A484648, 0x4A49404F, 0x4D524241, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFDFC, 0xFCFFFDFA, 0xF5EFE9E7, 0xE4E0DDD5, 0xCFC7C4C1, 0xBDB6A9A1, 0x9EA09E9C, 0x948F867D, 0x7A7A7877, 0x72696861, 0x5A534C4C, 0x44413E41, 0x46484541, 0x4B494941, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFDFC, 0xFCFEFDF8, 0xF3EFEBE7, 0xE1DEDBD3, 0xCBC5C2BE, 0xB7B0A69D, 0x99959492, 0x8E88807B, 0x716F6D6B, 0x6B66635F, 0x58504743, 0x403B343D, 0x41444246, 0x413D3A36, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFCFC, 0xFBFDFAF9, 0xF5F2EFEA, 0xE2DBD6D0, 0xC9C0BCB8, 0xB4B0A8A0, 0x97918F89, 0x86817973, 0x6B666362, 0x63655E5C, 0x564D423B, 0x3E353238, 0x3D403C44, 0x463B3831, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFCFB, 0xFBFBFAF7, 0xF4F5F1EE, 0xE7DED5CB, 0xC6BDBBB5, 0xB1ADA39D, 0x968F8983, 0x7F7A746E, 0x67635A57, 0x585B5A57, 0x52483D36, 0x34322E32, 0x383A3740, 0x4137322C, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFDFBFA, 0xFAF9F9F7, 0xF7F7F6F1, 0xEBE1D8CD, 0xC2BDB7B4, 0xAFAAA49B, 0x938F8681, 0x7A766F6B, 0x645F5650, 0x4D51524F, 0x4A41362F, 0x2C2E292A, 0x32323339, 0x39322D28, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEFCFBFA, 0xF9FAFAF9, 0xF7F6F5F2, 0xEDE4D9D1, 0xC6BEB7B3, 0xADA7A29A, 0x938A857D, 0x76706B69, 0x635C554D, 0x45474A49, 0x403B3029, 0x24262524, 0x292B2F2F, 0x312B2825, 0xFFFFFFFF, 0xFFFFFFFF, 0xFDFDFAFA, 0xFAF8F8F7, 0xF6F7F6F2, 0xEDE4DACF, 0xC8C1B9B2, 0xACA59D95, 0x9088827B, 0x746A6461, 0x5E5B544C, 0x433F403F, 0x3A332B27, 0x23222320, 0x22252725, 0x2725211F, 0xFFFFFFFF, 0xFFFFFFFE, 0xFDFCF9F9, 0xF9F6F6F4, 0xF4F4F1F1, 0xEBE2D9D0, 0xCAC2BCB7, 0xADA39D94, 0x8D847F76, 0x7069605A, 0x5959534A, 0x41393636, 0x352C2823, 0x1F1E1E1D, 0x1D1E1F1E, 0x1E211B1D, 0xFFFFFFFF, 0xFFFFFEFD, 0xFDFBF9FA, 0xF8F6F4F3, 0xEFEEEBEA, 0xE6DED3C9, 0xC4BFBBB3, 0xAEA39A8F, 0x877F7670, 0x6B686156, 0x5153514C, 0x3F39312E, 0x2D292520, 0x1C1A171A, 0x181A1A19, 0x191B1617, 0xFFFFFFFF, 0xFFFEFEFD, 0xFCF8F7F6, 0xF5F3EFEC, 0xE7E3E0DB, 0xD6D1C8C0, 0xBEBBB6B1, 0xA8A1968A, 0x81766F68, 0x655F5D56, 0x4D494844, 0x3D362E28, 0x2423211D, 0x19181418, 0x14131415, 0x13161214, 0xFFFFFFFF, 0xFFFEF9FD, 0xFBF7F6F6, 0xF3F2EDE7, 0xE2D9D2CD, 0xC7C1BAB3, 0xB1B0ACA7, 0x9F998F88, 0x7B6F6763, 0x5A58534F, 0x47403D3A, 0x36312A22, 0x1B1C1D19, 0x16121110, 0x100E1110, 0x0D110E10, 0xFFFFFFFF, 0xFFFEFDFC, 0xF8F3F2F2, 0xF0EDEAE5, 0xDDD4CDC3, 0xBEB6B1AA, 0xA7A7A29B, 0x95908A83, 0x786D6057, 0x524F4A47, 0x423A3733, 0x312C2620, 0x1A16181B, 0x16120F0C, 0x0E0B0D0C, 0x080D0A0C, 0xFFFFFFFF, 0xFEFCFEFD, 0xFCF8F1E9, 0xE5E4E4E0, 0xDBD5CEC4, 0xBCB4AAA4, 0x9D9A9691, 0x8D88867C, 0x756A6258, 0x4C46423D, 0x3B35322C, 0x2926241C, 0x19161114, 0x14100D0A, 0x0B09090A, 0x080A080A, 0xFFFFFFFF, 0xFEFDFDFD, 0xFCF7F2E9, 0xE5E0DAD6, 0xD3D2CDC7, 0xBDB3A99F, 0x96918C88, 0x85827D7A, 0x72695E57, 0x4C463A37, 0x312F2C2B, 0x271F1D1A, 0x17140E0F, 0x110E0C09, 0x08080608, 0x08090808, 0xFFFFFFFF, 0xFEFEFDFD, 0xFDF9F4EC, 0xE3DFD9D5, 0xD0CAC8C4, 0xBCB5A99F, 0x958B8680, 0x7B797670, 0x6A675C56, 0x4E463E34, 0x2E2A2726, 0x231D1515, 0x16130F0C, 0x0C0E0B08, 0x06070507, 0x07060706, 0xFFFFFFFF, 0xFDFDFDFD, 0xFBF9F4EE, 0xE8E2DDDB, 0xD5D1CBC4, 0xBEB4ADA3, 0x998F867E, 0x736F6B67, 0x645C5853, 0x4B433C34, 0x2C262521, 0x201B150E, 0x10110E0A, 0x07090908, 0x06050404, 0x05040505, 0xFFFFFFFF, 0xFEFDFDFD, 0xFCF9F7F1, 0xEBE6E2DE, 0xDAD6D3CD, 0xC7BEB3A9, 0x9D94897E, 0x746D6660, 0x5D57534B, 0x47423C32, 0x2B26221F, 0x1A181510, 0x0C0C0C0A, 0x07060606, 0x05040403, 0x03030403, 0xFFFFFFFF, 0xFDFDFDFE, 0xFCF5F0F0, 0xEDE7E3DF, 0xDBD9D4CD, 0xC8C2B9B1, 0xA59B8D80, 0x756C655E, 0x5A534C46, 0x423E3A31, 0x2B24201F, 0x18151110, 0x0C090909, 0x07050506, 0x05030302, 0x03030302, 0xFFFFFFFF, 0xFDFDFDFF, 0xFEFCF9F5, 0xF0E8E4DF, 0xDCD8D5CF, 0xC7C0B7AF, 0xA4988D81, 0x746A625D, 0x58504942, 0x3D393530, 0x2A25201C, 0x1C160F0D, 0x0C090706, 0x06050404, 0x04030203, 0x02020202, 0xFFFFFFFF, 0xFDFDFEFD, 0xFCFBF9F7, 0xF0EBE7E3, 0xDEDCD4CF, 0xC6BDB4AA, 0xA1958B7E, 0x73685F59, 0x534E4840, 0x3933312D, 0x26221F1D, 0x1A15120B, 0x0A080706, 0x05050402, 0x02020201, 0x01020201, 0xFFFFFFFE, 0xFEFEFDFC, 0xFCFAF6F4, 0xF1EAE8E3, 0xE0DCD6CD, 0xC4BAAFA5, 0x9893867D, 0x6F666057, 0x524B4239, 0x35352F27, 0x231E1A18, 0x1917110C, 0x0A070506, 0x04030303, 0x02020201, 0x01010101, 0xFFFFFFFE, 0xFEFEFCF9, 0xF7F3F1EF, 0xEBE6E3E0, 0xDDD8D2C6, 0xBFB6AA9F, 0x958C8178, 0x6B625A50, 0x4D474139, 0x342E2926, 0x221D1713, 0x11110F0D, 0x0A080505, 0x04030203, 0x02010201, 0x01010101, 0xFFFFFFFF, 0xFEFCFBF8, 0xF6F5F2EC, 0xE8E1DED8, 0xD7CFC8C0, 0xB8ADA39B, 0x8E887F79, 0x6B5F524A, 0x46403D37, 0x332D2B24, 0x1E191613, 0x0E0C0B0A, 0x08080605, 0x03020202, 0x02010101, 0x01010101, 0xFFFFFFFF, 0xFFFCF9F3, 0xF3F0EEE6, 0xE1DCDBD5, 0xD3CAC3BA, 0xAEA79D93, 0x8A827A73, 0x695C534B, 0x433E3630, 0x2E2C2822, 0x1D19130F, 0x0D0C0906, 0x06050504, 0x03020202, 0x01010101, 0x01010101, 0xFFFFFFFF, 0xFFFBF7F1, 0xEFEBE5DF, 0xD9D5D1CE, 0xCDC3BDB6, 0xAAA0988F, 0x847D746D, 0x62585148, 0x413C3835, 0x312C231B, 0x1917130E, 0x0C0A0806, 0x06040303, 0x03020201, 0x01010101, 0x01010101, 0xFFFFFFFF, 0xFEF8F0EC, 0xEAE5E1D8, 0xD3CECCC8, 0xC2BCB5AD, 0xA29A928C, 0x847D766F, 0x665D5348, 0x413C3831, 0x2C29241D, 0x19150F0B, 0x0B0A0806, 0x06040303, 0x02020201, 0x01010101, 0x01010101, 0xFFFFFFFF, 0xFFFDF8F6, 0xF1EAE2D9, 0xD5CCC7C1, 0xBEB6B0A7, 0x9F968B84, 0x7F77706C, 0x625B554E, 0x48413A35, 0x2D251D18, 0x14130E0B, 0x0B0B0705, 0x05040303, 0x02020101, 0x01010101, 0x01010101, 0xFFFFFFFF, 0xFEFCFAF9, 0xF5EFE7E0, 0xD6D3CFC7, 0xC1B8B0A9, 0x9F988F86, 0x7D766D66, 0x5D554E47, 0x403B342D, 0x29211E1A, 0x1715100E, 0x0B080605, 0x05040302, 0x01020101, 0x01010101, 0x01010101, 0xFFFFFFFF, 0xFEFDFBF8, 0xF3EBE4DE, 0xD9D6D2CE, 0xC7BFB8B1, 0xA89F978F, 0x847D746C, 0x6257524E, 0x463E342D, 0x25221D19, 0x1511110D, 0x0A080807, 0x06050302, 0x01010101, 0x01010101, 0x01010101, 0xFFFFFFFF, 0xFEFCFBF9, 0xF3EBE4DE, 0xD9D6D5D1, 0xCCC5BCB5, 0xADA59F93, 0x8C857B71, 0x685D564F, 0x493E352E, 0x2A24231E, 0x1C15120E, 0x0C0A0907, 0x05040202, 0x01010101, 0x01010101, 0x01010101 - -dlabel D_8014E500 -.word 0xFF8000A9, 0x00000000, 0x00000000, 0xFFFFFF00, 0xFF34FFBB, 0x00000000, 0x00000000, 0xFFFFFF00, 0x0000FF24, 0x00000000, 0x00000000, 0xFFFFFF00, 0x008000A9, 0x00000000, 0x00000000, 0xFFFFFF00, 0xFE88007B, 0x00000000, 0x00000000, 0xFFFFFF00, 0x0000018B, 0x00000000, 0x00000000, 0xFFFFFF00, 0xFF17FEC0, 0x00000000, 0x00000000, 0xFFFFFF00, 0x00CCFFBB, 0x00000000, 0x00000000, 0xFFFFFF00, 0x00E8FEC0, 0x00000000, 0x00000000, 0xFFFFFF00, 0x0178007A, 0x00000000, 0x00000000, 0xFFFFFF00 - -dlabel D_8014E5A0 -.word 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001201, 0x00003000, 0xE3001402, 0x00000C00, 0xE3000C00, 0x00000000, 0xE3001801, 0x00000000, 0xE3001A01, 0x00000000, 0xFCFFE7FF, 0xFFCD92C9, 0xE200001C, 0x00504340, 0xD9000000, 0x00000000, 0xD9FFFFFF, 0x00200004, 0xDF000000, 0x00000000 - -dlabel D_8014E618 -.word 0xDE000000, D_8014E5A0, 0xE3001001, 0x00000000, 0xFD88000F, D_8014D300, 0xF5880400, 0x070D4350, 0xE6000000, 0x00000000, 0xF4000000, 0x0703E07C, 0xE7000000, 0x00000000, 0xF5800400, 0x000D4350, 0xF2000000, 0x0007C07C, 0xF2000000, 0x000FC0FC, 0xDF000000, 0x00000000 - -dlabel D_8014E670 -.word 0xDE000000, D_8014E5A0, 0xE3001001, 0x00000000, 0xFD88001F, D_8014CB00, 0xF5880800, 0x07098260, 0xE6000000, 0x00000000, 0xF4000000, 0x0707E0FC, 0xE7000000, 0x00000000, 0xF5800800, 0x00098260, 0xF2000000, 0x000FC0FC, 0xDF000000, 0x00000000 - -dlabel D_8014E6C0 -.word 0xDE000000, D_8014E5A0, 0xE3001001, 0x00000000, 0xFD88000F, D_8014C700, 0xF5880400, 0x07098350, 0xE6000000, 0x00000000, 0xF4000000, 0x0703E0FC, 0xE7000000, 0x00000000, 0xF5800400, 0x00098350, 0xF2000000, 0x0007C0FC, 0xF2000000, 0x000FC0FC, 0xDF000000, 0x00000000 - -dlabel D_8014E718 -.word 0xDE000000, D_8014E5A0, 0xE3001001, 0x00000000, 0xFD88003F, D_8014D500, 0xF5881000, 0x070D8360, 0xE6000000, 0x00000000, 0xF4000000, 0x070FC0FC, 0xE7000000, 0x00000000, 0xF5881000, 0x000D8360, 0xF2000000, 0x000FC0FC, 0xF2000000, 0x001FC1FC, 0xDF000000, 0x00000000 - -dlabel D_8014E770 -.word 0x000000F0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x014000F0, 0x00000000, 0x28000000, 0xFFFFFFFF, 0x000000DA, 0x00000000, 0x000002C0, 0xFFFFFFFF, 0x014000DA, 0x00000000, 0x280002C0, 0xFFFFFFFF, 0x000000C4, 0x00000000, 0x00000580, 0xFFFFFFFF, 0x014000C4, 0x00000000, 0x28000580, 0xFFFFFFFF, 0x000000AE, 0x00000000, 0x00000840, 0xFFFFFFFF, 0x014000AE, 0x00000000, 0x28000840, 0xFFFFFFFF, 0x00000098, 0x00000000, 0x00000B00, 0xFFFFFFFF, 0x01400098, 0x00000000, 0x28000B00, 0xFFFFFFFF, 0x00000082, 0x00000000, 0x00000DC0, 0xFFFFFFFF, 0x01400082, 0x00000000, 0x28000DC0, 0xFFFFFFFF, 0x0000006C, 0x00000000, 0x00001080, 0xFFFFFFFF, 0x0140006C, 0x00000000, 0x28001080, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00001340, 0xFFFFFFFF, 0x01400056, 0x00000000, 0x28001340, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00001600, 0xFFFFFFFF, 0x01400040, 0x00000000, 0x28001600, 0xFFFFFFFF, 0x0000002A, 0x00000000, 0x000018C0, 0xFFFFFFFF, 0x0140002A, 0x00000000, 0x280018C0, 0xFFFFFFFF, 0x00000014, 0x00000000, 0x00001B80, 0xFFFFFFFF, 0x01400014, 0x00000000, 0x28001B80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00001E00, 0xFFFFFFFF, 0x01400000, 0x00000000, 0x28001E00, 0xFFFFFFFF - -dlabel D_8014E8F0 -.word 0xD7000000, 0x80008000, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE2001D00, 0x00000004, 0xEE000000, 0x00000000, 0xE200001C, 0x50504360, 0xFCFFE7FF, 0xFFCE7F3F, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xD9DDF9FF, 0x00000000, 0xD9FFFFFF, 0x00000405, 0x0100A014, D_8014E500, 0x06000204, 0x00060004, 0x06000802, 0x00060A00, 0x06020C04, 0x000E0604, 0x06100E04, 0x000E1206, 0xE7000000, 0x00000000, 0xE2001D00, 0x00000000, 0xDF000000, 0x00000000 - -dlabel D_8014E9A8 -.word 0xE7000000, 0x00000000, 0xE2001D00, 0x00000004, 0xEE000000, 0x00140000, 0xE200001C, 0x00504A50, 0xFCFFE7FF, 0xFFCE7F3F, 0xD9DDF9FF, 0x00000000, 0xD9FFFFFF, 0x00000005, 0xE3001801, 0x00000000, 0xE3000A01, 0x00000000, 0xE3001201, 0x00002000, 0xE3000C00, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3000D01, 0x00000000, 0xE3001402, 0x00000C00, 0xF65003C0, 0x00000000, 0xE3001801, 0x000000C0, 0xE7000000, 0x00000000, 0xE2001D00, 0x00000000, 0xDF000000, 0x00000000 - -dlabel D_8014EA48 -.word 0xE2001D00, 0x00000004, 0xEE000000, 0x00140000, 0xE200001C, 0x00552210, 0xD9FDF9FF, 0x00000000, 0xD9DFFFFF, 0x00000000, 0xD7000002, 0x80008000, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0x01018030, D_8014E770, 0xFD10009F, 0x80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000000, 0x0727C02C, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000000, 0x0027C02C, 0x06000402, 0x00060204, 0xFD10009F, 0x80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF400002C, 0x0727C058, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF200002C, 0x0027C058, 0x06040806, 0x000A0608, 0xFD10009F, 0x80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000058, 0x0727C084, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000058, 0x0027C084, 0x06080C0A, 0x000E0A0C, 0xFD10009F, 0x80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000084, 0x0727C0B0, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000084, 0x0027C0B0, 0x060C100E, 0x00120E10, 0xFD10009F, 0x80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF40000B0, 0x0727C0DC, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF20000B0, 0x0027C0DC, 0x06101412, 0x00161214, 0xFD10009F, 0x80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF40000DC, 0x0727C108, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF20000DC, 0x0027C108, 0x06141816, 0x001A1618, 0xFD10009F, 0x80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000108, 0x0727C134, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000108, 0x0027C134, 0x06181C1A, 0x001E1A1C, 0xFD10009F, 0x80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000134, 0x0727C160, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000134, 0x0027C160, 0x061C201E, 0x00221E20, 0xFD10009F, 0x80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF4000160, 0x0727C18C, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF2000160, 0x0027C18C, 0x06202422, 0x00262224, 0xFD10009F, 0x80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF400018C, 0x0727C1B8, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF200018C, 0x0027C1B8, 0x06242826, 0x002A2628, 0xFD10009F, 0x80156910, 0xF5105000, 0x07090280, 0xE6000000, 0x00000000, 0xF40001B8, 0x0727C1DC, 0xE7000000, 0x00000000, 0xF5105000, 0x00090280, 0xF20001B8, 0x0027C1DC, 0x06282C2A, 0x002E2A2C, 0xE7000000, 0x00000000, 0xE2001D00, 0x00000000, 0xDF000000, 0x00000000 - -dlabel D_8014ED98 -.word 0x00800080, 0x01FF0000, 0x00800080, 0x01FF0000 - -dlabel D_8014EDA8 -.word 0xFFF0FFF0, 0x00000000, 0x00000000, 0x000000FF, 0x0010FFF0, 0x00000000, 0x10000000, 0x000000FF, 0x00100010, 0x00000000, 0x10001000, 0x000000FF, 0xFFF00010, 0x00000000, 0x00001000, 0x000000FF - -dlabel D_8014EDE8 -.word 0x01004008, D_8014EDA8, 0x06000204, 0x00000406, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/E5490.data.s b/ver/us/asm/data/E5490.data.s new file mode 100644 index 0000000000..4e2ecc43d2 --- /dev/null +++ b/ver/us/asm/data/E5490.data.s @@ -0,0 +1,15 @@ +.include "macro.inc" + +.section .data + +dlabel D_8014ED90 +.word 0xDF000000, 0x00000000 + +dlabel D_8014ED98 +.word 0x00800080, 0x01FF0000, 0x00800080, 0x01FF0000 + +dlabel D_8014EDA8 +.word 0xFFF0FFF0, 0x00000000, 0x00000000, 0x000000FF, 0x0010FFF0, 0x00000000, 0x10000000, 0x000000FF, 0x00100010, 0x00000000, 0x10001000, 0x000000FF, 0xFFF00010, 0x00000000, 0x00001000, 0x000000FF + +dlabel D_8014EDE8 +.word 0x01004008, D_8014EDA8, 0x06000204, 0x00000406, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/101b90_len_8f0/spr_update_player_raster_cache.s b/ver/us/asm/nonmatchings/101b90_len_8f0/spr_update_player_raster_cache.s deleted file mode 100644 index a4c5162fe9..0000000000 --- a/ver/us/asm/nonmatchings/101b90_len_8f0/spr_update_player_raster_cache.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel spr_update_player_raster_cache -/* 1020A4 802DEFB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1020A8 802DEFB8 AFBF0010 */ sw $ra, 0x10($sp) -/* 1020AC 802DEFBC 0C04E934 */ jal func_8013A4D0 -/* 1020B0 802DEFC0 00000000 */ nop -/* 1020B4 802DEFC4 3C02802E */ lui $v0, %hi(D_802E0C58) -/* 1020B8 802DEFC8 8C420C58 */ lw $v0, %lo(D_802E0C58)($v0) -/* 1020BC 802DEFCC 1840000C */ blez $v0, .L802DF000 -/* 1020C0 802DEFD0 0000202D */ daddu $a0, $zero, $zero -/* 1020C4 802DEFD4 0040282D */ daddu $a1, $v0, $zero -/* 1020C8 802DEFD8 3C03802E */ lui $v1, %hi(D_802E0C70) -/* 1020CC 802DEFDC 24630C70 */ addiu $v1, $v1, %lo(D_802E0C70) -.L802DEFE0: -/* 1020D0 802DEFE0 8C620000 */ lw $v0, ($v1) -/* 1020D4 802DEFE4 10400003 */ beqz $v0, .L802DEFF4 -/* 1020D8 802DEFE8 24840001 */ addiu $a0, $a0, 1 -/* 1020DC 802DEFEC 2442FFFF */ addiu $v0, $v0, -1 -/* 1020E0 802DEFF0 AC620000 */ sw $v0, ($v1) -.L802DEFF4: -/* 1020E4 802DEFF4 0085102A */ slt $v0, $a0, $a1 -/* 1020E8 802DEFF8 1440FFF9 */ bnez $v0, .L802DEFE0 -/* 1020EC 802DEFFC 24630010 */ addiu $v1, $v1, 0x10 -.L802DF000: -/* 1020F0 802DF000 8FBF0010 */ lw $ra, 0x10($sp) -/* 1020F4 802DF004 03E00008 */ jr $ra -/* 1020F8 802DF008 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/163400/filemenu_draw_contents_copy_arrow.s b/ver/us/asm/nonmatchings/163400/filemenu_draw_contents_copy_arrow.s index 67bfdb4636..83902582c1 100644 --- a/ver/us/asm/nonmatchings/163400/filemenu_draw_contents_copy_arrow.s +++ b/ver/us/asm/nonmatchings/163400/filemenu_draw_contents_copy_arrow.s @@ -34,8 +34,8 @@ glabel filemenu_draw_contents_copy_arrow /* 164990 80244130 8C63C094 */ lw $v1, %lo(filemenu_loadedFileIdx)($v1) /* 164994 80244134 104301D8 */ beq $v0, $v1, .L80244898 /* 164998 80244138 24040002 */ addiu $a0, $zero, 2 -/* 16499C 8024413C 3C028025 */ lui $v0, %hi(D_8024C098_C09918) -/* 1649A0 80244140 8042C098 */ lb $v0, %lo(D_8024C098_C09918)($v0) +/* 16499C 8024413C 3C028025 */ lui $v0, %hi(D_8024C098) +/* 1649A0 80244140 8042C098 */ lb $v0, %lo(D_8024C098)($v0) /* 1649A4 80244144 104401D4 */ beq $v0, $a0, .L80244898 /* 1649A8 80244148 24020001 */ addiu $v0, $zero, 1 /* 1649AC 8024414C 10620011 */ beq $v1, $v0, .L80244194 diff --git a/ver/us/asm/nonmatchings/163400/filemenu_init.s b/ver/us/asm/nonmatchings/163400/filemenu_init.s index d4fb682275..b8dfe0f6f7 100644 --- a/ver/us/asm/nonmatchings/163400/filemenu_init.s +++ b/ver/us/asm/nonmatchings/163400/filemenu_init.s @@ -51,8 +51,8 @@ glabel filemenu_init /* 1651F0 80244990 24050003 */ addiu $a1, $zero, 3 /* 1651F4 80244994 3C138025 */ lui $s3, %hi(filemenu_menus) /* 1651F8 80244998 8E739B84 */ lw $s3, %lo(filemenu_menus)($s3) -/* 1651FC 8024499C 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 165200 802449A0 A020C098 */ sb $zero, %lo(D_8024C098_C09918)($at) +/* 1651FC 8024499C 3C018025 */ lui $at, %hi(D_8024C098) +/* 165200 802449A0 A020C098 */ sb $zero, %lo(D_8024C098)($at) /* 165204 802449A4 16800003 */ bnez $s4, .L802449B4 /* 165208 802449A8 24020002 */ addiu $v0, $zero, 2 /* 16520C 802449AC 0809126E */ j .L802449B8 diff --git a/ver/us/asm/nonmatchings/163400/filemenu_update.s b/ver/us/asm/nonmatchings/163400/filemenu_update.s index 9caf080bec..d8c0d36d37 100644 --- a/ver/us/asm/nonmatchings/163400/filemenu_update.s +++ b/ver/us/asm/nonmatchings/163400/filemenu_update.s @@ -7,8 +7,8 @@ glabel filemenu_update /* 163A08 802431A8 2410002C */ addiu $s0, $zero, 0x2c /* 163A0C 802431AC 2406FFFF */ addiu $a2, $zero, -1 /* 163A10 802431B0 0200282D */ daddu $a1, $s0, $zero -/* 163A14 802431B4 3C028025 */ lui $v0, %hi(D_8024C098_C09918) -/* 163A18 802431B8 8042C098 */ lb $v0, %lo(D_8024C098_C09918)($v0) +/* 163A14 802431B4 3C028025 */ lui $v0, %hi(D_8024C098) +/* 163A18 802431B8 8042C098 */ lb $v0, %lo(D_8024C098)($v0) /* 163A1C 802431BC 3C038016 */ lui $v1, %hi(D_8015A2D0) /* 163A20 802431C0 2463A2D0 */ addiu $v1, $v1, %lo(D_8015A2D0) /* 163A24 802431C4 AFBF0018 */ sw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/163400/func_80244BC4.s b/ver/us/asm/nonmatchings/163400/func_80244BC4.s index 67c421d2da..315ea981b2 100644 --- a/ver/us/asm/nonmatchings/163400/func_80244BC4.s +++ b/ver/us/asm/nonmatchings/163400/func_80244BC4.s @@ -8,8 +8,8 @@ glabel func_80244BC4 /* 165430 80244BD0 80420004 */ lb $v0, 4($v0) /* 165434 80244BD4 14400009 */ bnez $v0, .L80244BFC /* 165438 80244BD8 24020001 */ addiu $v0, $zero, 1 -/* 16543C 80244BDC 3C038025 */ lui $v1, %hi(D_8024C098_C09918) -/* 165440 80244BE0 8063C098 */ lb $v1, %lo(D_8024C098_C09918)($v1) +/* 16543C 80244BDC 3C038025 */ lui $v1, %hi(D_8024C098) +/* 165440 80244BE0 8063C098 */ lb $v1, %lo(D_8024C098)($v1) /* 165444 80244BE4 14620005 */ bne $v1, $v0, .L80244BFC /* 165448 80244BE8 00000000 */ nop /* 16544C 80244BEC 8C820004 */ lw $v0, 4($a0) diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_title.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_title.s deleted file mode 100644 index 9a21c0baa6..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_file_title.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_file_title -/* 165CAC 8024544C 3C028025 */ lui $v0, %hi(D_8024C098_C09918) -/* 165CB0 80245450 8042C098 */ lb $v0, %lo(D_8024C098_C09918)($v0) -/* 165CB4 80245454 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 165CB8 80245458 AFB10024 */ sw $s1, 0x24($sp) -/* 165CBC 8024545C 0080882D */ daddu $s1, $a0, $zero -/* 165CC0 80245460 AFB3002C */ sw $s3, 0x2c($sp) -/* 165CC4 80245464 00C0982D */ daddu $s3, $a2, $zero -/* 165CC8 80245468 AFB00020 */ sw $s0, 0x20($sp) -/* 165CCC 8024546C 00E0802D */ daddu $s0, $a3, $zero -/* 165CD0 80245470 AFBF0034 */ sw $ra, 0x34($sp) -/* 165CD4 80245474 AFB40030 */ sw $s4, 0x30($sp) -/* 165CD8 80245478 14400007 */ bnez $v0, .L80245498 -/* 165CDC 8024547C AFB20028 */ sw $s2, 0x28($sp) -/* 165CE0 80245480 90A20003 */ lbu $v0, 3($a1) -/* 165CE4 80245484 14510004 */ bne $v0, $s1, .L80245498 -/* 165CE8 80245488 2624003C */ addiu $a0, $s1, 0x3c -/* 165CEC 8024548C 2665FFFD */ addiu $a1, $s3, -3 -/* 165CF0 80245490 0C090B80 */ jal filemenu_set_cursor_goal_pos -/* 165CF4 80245494 26060008 */ addiu $a2, $s0, 8 -.L80245498: -/* 165CF8 80245498 0C0926A9 */ jal filemenu_get_menu_message -/* 165CFC 8024549C 2404001A */ addiu $a0, $zero, 0x1a -/* 165D00 802454A0 0040202D */ daddu $a0, $v0, $zero -/* 165D04 802454A4 26650005 */ addiu $a1, $s3, 5 -/* 165D08 802454A8 26120001 */ addiu $s2, $s0, 1 -/* 165D0C 802454AC 0240302D */ daddu $a2, $s2, $zero -/* 165D10 802454B0 240700FF */ addiu $a3, $zero, 0xff -/* 165D14 802454B4 24140001 */ addiu $s4, $zero, 1 -/* 165D18 802454B8 AFA00010 */ sw $zero, 0x10($sp) -/* 165D1C 802454BC 0C09265F */ jal filemenu_draw_message -/* 165D20 802454C0 AFB40014 */ sw $s4, 0x14($sp) -/* 165D24 802454C4 3C028007 */ lui $v0, %hi(D_80077A24) -/* 165D28 802454C8 00511021 */ addu $v0, $v0, $s1 -/* 165D2C 802454CC 90427A24 */ lbu $v0, %lo(D_80077A24)($v0) -/* 165D30 802454D0 1440000D */ bnez $v0, .L80245508 -/* 165D34 802454D4 26240001 */ addiu $a0, $s1, 1 -/* 165D38 802454D8 02342021 */ addu $a0, $s1, $s4 -/* 165D3C 802454DC 26650021 */ addiu $a1, $s3, 0x21 -/* 165D40 802454E0 0240302D */ daddu $a2, $s2, $zero -/* 165D44 802454E4 0280382D */ daddu $a3, $s4, $zero -/* 165D48 802454E8 240200FF */ addiu $v0, $zero, 0xff -/* 165D4C 802454EC AFA20014 */ sw $v0, 0x14($sp) -/* 165D50 802454F0 24020002 */ addiu $v0, $zero, 2 -/* 165D54 802454F4 AFA00010 */ sw $zero, 0x10($sp) -/* 165D58 802454F8 0C049DA7 */ jal draw_number -/* 165D5C 802454FC AFA20018 */ sw $v0, 0x18($sp) -/* 165D60 80245500 0809155A */ j .L80245568 -/* 165D64 80245504 00000000 */ nop -.L80245508: -/* 165D68 80245508 26650021 */ addiu $a1, $s3, 0x21 -/* 165D6C 8024550C 0240302D */ daddu $a2, $s2, $zero -/* 165D70 80245510 24070001 */ addiu $a3, $zero, 1 -/* 165D74 80245514 241000FF */ addiu $s0, $zero, 0xff -/* 165D78 80245518 24020002 */ addiu $v0, $zero, 2 -/* 165D7C 8024551C AFA00010 */ sw $zero, 0x10($sp) -/* 165D80 80245520 AFB00014 */ sw $s0, 0x14($sp) -/* 165D84 80245524 0C049DA7 */ jal draw_number -/* 165D88 80245528 AFA20018 */ sw $v0, 0x18($sp) -/* 165D8C 8024552C 00112040 */ sll $a0, $s1, 1 -/* 165D90 80245530 00912021 */ addu $a0, $a0, $s1 -/* 165D94 80245534 000420C0 */ sll $a0, $a0, 3 -/* 165D98 80245538 3C028007 */ lui $v0, %hi(D_800779CB) -/* 165D9C 8024553C 244279CB */ addiu $v0, $v0, %lo(D_800779CB) -/* 165DA0 80245540 00822021 */ addu $a0, $a0, $v0 -/* 165DA4 80245544 24050008 */ addiu $a1, $zero, 8 -/* 165DA8 80245548 2666002E */ addiu $a2, $s3, 0x2e -/* 165DAC 8024554C 0240382D */ daddu $a3, $s2, $zero -/* 165DB0 80245550 24020009 */ addiu $v0, $zero, 9 -/* 165DB4 80245554 AFB00010 */ sw $s0, 0x10($sp) -/* 165DB8 80245558 AFA00014 */ sw $zero, 0x14($sp) -/* 165DBC 8024555C AFB40018 */ sw $s4, 0x18($sp) -/* 165DC0 80245560 0C0926AE */ jal filemenu_draw_file_name -/* 165DC4 80245564 AFA2001C */ sw $v0, 0x1c($sp) -.L80245568: -/* 165DC8 80245568 8FBF0034 */ lw $ra, 0x34($sp) -/* 165DCC 8024556C 8FB40030 */ lw $s4, 0x30($sp) -/* 165DD0 80245570 8FB3002C */ lw $s3, 0x2c($sp) -/* 165DD4 80245574 8FB20028 */ lw $s2, 0x28($sp) -/* 165DD8 80245578 8FB10024 */ lw $s1, 0x24($sp) -/* 165DDC 8024557C 8FB00020 */ lw $s0, 0x20($sp) -/* 165DE0 80245580 03E00008 */ jr $ra -/* 165DE4 80245584 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_option_center.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_option_center.s deleted file mode 100644 index 83055a0775..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_option_center.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_option_center -/* 1656B4 80244E54 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 1656B8 80244E58 0080382D */ daddu $a3, $a0, $zero -/* 1656BC 80244E5C AFB00018 */ sw $s0, 0x18($sp) -/* 1656C0 80244E60 00A0802D */ daddu $s0, $a1, $zero -/* 1656C4 80244E64 AFBF002C */ sw $ra, 0x2c($sp) -/* 1656C8 80244E68 AFB40028 */ sw $s4, 0x28($sp) -/* 1656CC 80244E6C AFB30024 */ sw $s3, 0x24($sp) -/* 1656D0 80244E70 AFB20020 */ sw $s2, 0x20($sp) -/* 1656D4 80244E74 AFB1001C */ sw $s1, 0x1c($sp) -/* 1656D8 80244E78 80E30004 */ lb $v1, 4($a3) -/* 1656DC 80244E7C 28620005 */ slti $v0, $v1, 5 -/* 1656E0 80244E80 1040000F */ beqz $v0, .L80244EC0 -/* 1656E4 80244E84 00C0882D */ daddu $s1, $a2, $zero -/* 1656E8 80244E88 1860000D */ blez $v1, .L80244EC0 -/* 1656EC 80244E8C 2412000A */ addiu $s2, $zero, 0xa -/* 1656F0 80244E90 24140012 */ addiu $s4, $zero, 0x12 -/* 1656F4 80244E94 3C0400FF */ lui $a0, 0xff -/* 1656F8 80244E98 3484FF00 */ ori $a0, $a0, 0xff00 -/* 1656FC 80244E9C 3C030001 */ lui $v1, 1 -/* 165700 80244EA0 8CE20000 */ lw $v0, ($a3) -/* 165704 80244EA4 34630200 */ ori $v1, $v1, 0x200 -/* 165708 80244EA8 00441024 */ and $v0, $v0, $a0 -/* 16570C 80244EAC 14430012 */ bne $v0, $v1, .L80244EF8 -/* 165710 80244EB0 0000982D */ daddu $s3, $zero, $zero -/* 165714 80244EB4 24040036 */ addiu $a0, $zero, 0x36 -/* 165718 80244EB8 080913BC */ j .L80244EF0 -/* 16571C 80244EBC 26050008 */ addiu $a1, $s0, 8 -.L80244EC0: -/* 165720 80244EC0 2412000B */ addiu $s2, $zero, 0xb -/* 165724 80244EC4 2414000E */ addiu $s4, $zero, 0xe -/* 165728 80244EC8 3C0400FF */ lui $a0, 0xff -/* 16572C 80244ECC 3484FF00 */ ori $a0, $a0, 0xff00 -/* 165730 80244ED0 3C030001 */ lui $v1, 1 -/* 165734 80244ED4 8CE20000 */ lw $v0, ($a3) -/* 165738 80244ED8 34630200 */ ori $v1, $v1, 0x200 -/* 16573C 80244EDC 00441024 */ and $v0, $v0, $a0 -/* 165740 80244EE0 14430005 */ bne $v0, $v1, .L80244EF8 -/* 165744 80244EE4 0000982D */ daddu $s3, $zero, $zero -/* 165748 80244EE8 24040036 */ addiu $a0, $zero, 0x36 -/* 16574C 80244EEC 26050004 */ addiu $a1, $s0, 4 -.L80244EF0: -/* 165750 80244EF0 0C090B80 */ jal filemenu_set_cursor_goal_pos -/* 165754 80244EF4 26260008 */ addiu $a2, $s1, 8 -.L80244EF8: -/* 165758 80244EF8 0C0926A9 */ jal filemenu_get_menu_message -/* 16575C 80244EFC 0240202D */ daddu $a0, $s2, $zero -/* 165760 80244F00 0040202D */ daddu $a0, $v0, $zero -/* 165764 80244F04 02142821 */ addu $a1, $s0, $s4 -/* 165768 80244F08 02333021 */ addu $a2, $s1, $s3 -/* 16576C 80244F0C 24C60002 */ addiu $a2, $a2, 2 -/* 165770 80244F10 24020001 */ addiu $v0, $zero, 1 -/* 165774 80244F14 240700FF */ addiu $a3, $zero, 0xff -/* 165778 80244F18 AFA00010 */ sw $zero, 0x10($sp) -/* 16577C 80244F1C 0C09265F */ jal filemenu_draw_message -/* 165780 80244F20 AFA20014 */ sw $v0, 0x14($sp) -/* 165784 80244F24 8FBF002C */ lw $ra, 0x2c($sp) -/* 165788 80244F28 8FB40028 */ lw $s4, 0x28($sp) -/* 16578C 80244F2C 8FB30024 */ lw $s3, 0x24($sp) -/* 165790 80244F30 8FB20020 */ lw $s2, 0x20($sp) -/* 165794 80244F34 8FB1001C */ lw $s1, 0x1c($sp) -/* 165798 80244F38 8FB00018 */ lw $s0, 0x18($sp) -/* 16579C 80244F3C 03E00008 */ jr $ra -/* 1657A0 80244F40 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_option_left.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_option_left.s deleted file mode 100644 index d7090c8869..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_option_left.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_option_left -/* 165630 80244DD0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 165634 80244DD4 AFB00018 */ sw $s0, 0x18($sp) -/* 165638 80244DD8 00A0802D */ daddu $s0, $a1, $zero -/* 16563C 80244DDC AFB1001C */ sw $s1, 0x1c($sp) -/* 165640 80244DE0 AFBF0020 */ sw $ra, 0x20($sp) -/* 165644 80244DE4 80830004 */ lb $v1, 4($a0) -/* 165648 80244DE8 24020002 */ addiu $v0, $zero, 2 -/* 16564C 80244DEC 10620014 */ beq $v1, $v0, .L80244E40 -/* 165650 80244DF0 00C0882D */ daddu $s1, $a2, $zero -/* 165654 80244DF4 3C0200FF */ lui $v0, 0xff -/* 165658 80244DF8 8C830000 */ lw $v1, ($a0) -/* 16565C 80244DFC 3442FF00 */ ori $v0, $v0, 0xff00 -/* 165660 80244E00 00621824 */ and $v1, $v1, $v0 -/* 165664 80244E04 24020200 */ addiu $v0, $zero, 0x200 -/* 165668 80244E08 14620003 */ bne $v1, $v0, .L80244E18 -/* 16566C 80244E0C 24040035 */ addiu $a0, $zero, 0x35 -/* 165670 80244E10 0C090B80 */ jal filemenu_set_cursor_goal_pos -/* 165674 80244E14 26260008 */ addiu $a2, $s1, 8 -.L80244E18: -/* 165678 80244E18 0C0926A9 */ jal filemenu_get_menu_message -/* 16567C 80244E1C 24040009 */ addiu $a0, $zero, 9 -/* 165680 80244E20 0040202D */ daddu $a0, $v0, $zero -/* 165684 80244E24 26050008 */ addiu $a1, $s0, 8 -/* 165688 80244E28 26260002 */ addiu $a2, $s1, 2 -/* 16568C 80244E2C 24020001 */ addiu $v0, $zero, 1 -/* 165690 80244E30 240700FF */ addiu $a3, $zero, 0xff -/* 165694 80244E34 AFA00010 */ sw $zero, 0x10($sp) -/* 165698 80244E38 0C09265F */ jal filemenu_draw_message -/* 16569C 80244E3C AFA20014 */ sw $v0, 0x14($sp) -.L80244E40: -/* 1656A0 80244E40 8FBF0020 */ lw $ra, 0x20($sp) -/* 1656A4 80244E44 8FB1001C */ lw $s1, 0x1c($sp) -/* 1656A8 80244E48 8FB00018 */ lw $s0, 0x18($sp) -/* 1656AC 80244E4C 03E00008 */ jr $ra -/* 1656B0 80244E50 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_option_right.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_option_right.s deleted file mode 100644 index 8c5826105c..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_option_right.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_draw_contents_option_right -/* 1657A4 80244F44 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 1657A8 80244F48 0080382D */ daddu $a3, $a0, $zero -/* 1657AC 80244F4C AFB00018 */ sw $s0, 0x18($sp) -/* 1657B0 80244F50 00A0802D */ daddu $s0, $a1, $zero -/* 1657B4 80244F54 AFB1001C */ sw $s1, 0x1c($sp) -/* 1657B8 80244F58 AFBF0020 */ sw $ra, 0x20($sp) -/* 1657BC 80244F5C 80E30004 */ lb $v1, 4($a3) -/* 1657C0 80244F60 24020002 */ addiu $v0, $zero, 2 -/* 1657C4 80244F64 10620016 */ beq $v1, $v0, .L80244FC0 -/* 1657C8 80244F68 00C0882D */ daddu $s1, $a2, $zero -/* 1657CC 80244F6C 3C0400FF */ lui $a0, 0xff -/* 1657D0 80244F70 3484FF00 */ ori $a0, $a0, 0xff00 -/* 1657D4 80244F74 3C030002 */ lui $v1, 2 -/* 1657D8 80244F78 8CE20000 */ lw $v0, ($a3) -/* 1657DC 80244F7C 34630200 */ ori $v1, $v1, 0x200 -/* 1657E0 80244F80 00441024 */ and $v0, $v0, $a0 -/* 1657E4 80244F84 14430004 */ bne $v0, $v1, .L80244F98 -/* 1657E8 80244F88 24040037 */ addiu $a0, $zero, 0x37 -/* 1657EC 80244F8C 26050008 */ addiu $a1, $s0, 8 -/* 1657F0 80244F90 0C090B80 */ jal filemenu_set_cursor_goal_pos -/* 1657F4 80244F94 26260008 */ addiu $a2, $s1, 8 -.L80244F98: -/* 1657F8 80244F98 0C0926A9 */ jal filemenu_get_menu_message -/* 1657FC 80244F9C 2404000A */ addiu $a0, $zero, 0xa -/* 165800 80244FA0 0040202D */ daddu $a0, $v0, $zero -/* 165804 80244FA4 26050014 */ addiu $a1, $s0, 0x14 -/* 165808 80244FA8 26260002 */ addiu $a2, $s1, 2 -/* 16580C 80244FAC 24020001 */ addiu $v0, $zero, 1 -/* 165810 80244FB0 240700FF */ addiu $a3, $zero, 0xff -/* 165814 80244FB4 AFA00010 */ sw $zero, 0x10($sp) -/* 165818 80244FB8 0C09265F */ jal filemenu_draw_message -/* 16581C 80244FBC AFA20014 */ sw $v0, 0x14($sp) -.L80244FC0: -/* 165820 80244FC0 8FBF0020 */ lw $ra, 0x20($sp) -/* 165824 80244FC4 8FB1001C */ lw $s1, 0x1c($sp) -/* 165828 80244FC8 8FB00018 */ lw $s0, 0x18($sp) -/* 16582C 80244FCC 03E00008 */ jr $ra -/* 165830 80244FD0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_title.s b/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_title.s deleted file mode 100644 index e596c3d137..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_draw_contents_title.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8024BF70 -.word .L80244C74_1654D4, .L80244C80_1654E0, .L80244CA4_165504, .L80244C8C_1654EC, .L80244C98_1654F8, 0 - -.section .text - -glabel filemenu_draw_contents_title -/* 165490 80244C30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 165494 80244C34 AFB20020 */ sw $s2, 0x20($sp) -/* 165498 80244C38 00A0902D */ daddu $s2, $a1, $zero -/* 16549C 80244C3C AFBF0028 */ sw $ra, 0x28($sp) -/* 1654A0 80244C40 AFB30024 */ sw $s3, 0x24($sp) -/* 1654A4 80244C44 AFB1001C */ sw $s1, 0x1c($sp) -/* 1654A8 80244C48 AFB00018 */ sw $s0, 0x18($sp) -/* 1654AC 80244C4C 80830004 */ lb $v1, 4($a0) -/* 1654B0 80244C50 2C620005 */ sltiu $v0, $v1, 5 -/* 1654B4 80244C54 10400013 */ beqz $v0, .L80244CA4_165504 -/* 1654B8 80244C58 00C0982D */ daddu $s3, $a2, $zero -/* 1654BC 80244C5C 00031080 */ sll $v0, $v1, 2 -/* 1654C0 80244C60 3C018025 */ lui $at, %hi(jtbl_8024BF70) -/* 1654C4 80244C64 00220821 */ addu $at, $at, $v0 -/* 1654C8 80244C68 8C22BF70 */ lw $v0, %lo(jtbl_8024BF70)($at) -/* 1654CC 80244C6C 00400008 */ jr $v0 -/* 1654D0 80244C70 00000000 */ nop -.L80244C74_1654D4: -/* 1654D4 80244C74 24040001 */ addiu $a0, $zero, 1 -/* 1654D8 80244C78 0809132B */ j .L80244CAC -/* 1654DC 80244C7C 24110009 */ addiu $s1, $zero, 9 -.L80244C80_1654E0: -/* 1654E0 80244C80 24040002 */ addiu $a0, $zero, 2 -/* 1654E4 80244C84 0809132B */ j .L80244CAC -/* 1654E8 80244C88 24110008 */ addiu $s1, $zero, 8 -.L80244C8C_1654EC: -/* 1654EC 80244C8C 24040004 */ addiu $a0, $zero, 4 -/* 1654F0 80244C90 0809132B */ j .L80244CAC -/* 1654F4 80244C94 24110019 */ addiu $s1, $zero, 0x19 -.L80244C98_1654F8: -/* 1654F8 80244C98 24040005 */ addiu $a0, $zero, 5 -/* 1654FC 80244C9C 0809132B */ j .L80244CAC -/* 165500 80244CA0 24110010 */ addiu $s1, $zero, 0x10 -.L80244CA4_165504: -/* 165504 80244CA4 24040003 */ addiu $a0, $zero, 3 -/* 165508 80244CA8 2411000A */ addiu $s1, $zero, 0xa -.L80244CAC: -/* 16550C 80244CAC 0C0926A9 */ jal filemenu_get_menu_message -/* 165510 80244CB0 24100004 */ addiu $s0, $zero, 4 -/* 165514 80244CB4 0040202D */ daddu $a0, $v0, $zero -/* 165518 80244CB8 02512821 */ addu $a1, $s2, $s1 -/* 16551C 80244CBC 02703021 */ addu $a2, $s3, $s0 -/* 165520 80244CC0 240700FF */ addiu $a3, $zero, 0xff -/* 165524 80244CC4 AFA00010 */ sw $zero, 0x10($sp) -/* 165528 80244CC8 0C09265F */ jal filemenu_draw_message -/* 16552C 80244CCC AFA00014 */ sw $zero, 0x14($sp) -/* 165530 80244CD0 8FBF0028 */ lw $ra, 0x28($sp) -/* 165534 80244CD4 8FB30024 */ lw $s3, 0x24($sp) -/* 165538 80244CD8 8FB20020 */ lw $s2, 0x20($sp) -/* 16553C 80244CDC 8FB1001C */ lw $s1, 0x1c($sp) -/* 165540 80244CE0 8FB00018 */ lw $s0, 0x18($sp) -/* 165544 80244CE4 03E00008 */ jr $ra -/* 165548 80244CE8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/165490/filemenu_main_handle_input.s b/ver/us/asm/nonmatchings/165490/filemenu_main_handle_input.s index 0266a52a41..37d3f47b56 100644 --- a/ver/us/asm/nonmatchings/165490/filemenu_main_handle_input.s +++ b/ver/us/asm/nonmatchings/165490/filemenu_main_handle_input.s @@ -337,8 +337,8 @@ glabel filemenu_main_handle_input /* 166740 80245EE0 3C048025 */ lui $a0, %hi(filemenu_menus + 0xC) /* 166744 80245EE4 8C849B90 */ lw $a0, %lo(filemenu_menus + 0xC)($a0) /* 166748 80245EE8 24020003 */ addiu $v0, $zero, 3 -/* 16674C 80245EEC 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 166750 80245EF0 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 16674C 80245EEC 3C018025 */ lui $at, %hi(D_8024C098) +/* 166750 80245EF0 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 166754 80245EF4 08091A38 */ j .L802468E0 /* 166758 80245EF8 A0800004 */ sb $zero, 4($a0) .L80245EFC: @@ -533,8 +533,8 @@ glabel filemenu_main_handle_input /* 166A2C 802461CC 3C048025 */ lui $a0, %hi(filemenu_menus + 0x4) /* 166A30 802461D0 8C849B88 */ lw $a0, %lo(filemenu_menus + 0x4)($a0) /* 166A34 802461D4 24020001 */ addiu $v0, $zero, 1 -/* 166A38 802461D8 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 166A3C 802461DC A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 166A38 802461D8 3C018025 */ lui $at, %hi(D_8024C098) +/* 166A3C 802461DC A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 166A40 802461E0 08091A37 */ j .L802468DC /* 166A44 802461E4 24020004 */ addiu $v0, $zero, 4 .L802461E8_166A48: @@ -637,8 +637,8 @@ glabel filemenu_main_handle_input /* 166BB4 80246354 3C048025 */ lui $a0, %hi(filemenu_menus + 0x4) /* 166BB8 80246358 8C849B88 */ lw $a0, %lo(filemenu_menus + 0x4)($a0) /* 166BBC 8024635C 00C0102D */ daddu $v0, $a2, $zero -/* 166BC0 80246360 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 166BC4 80246364 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 166BC0 80246360 3C018025 */ lui $at, %hi(D_8024C098) +/* 166BC4 80246364 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 166BC8 80246368 08091A38 */ j .L802468E0 /* 166BCC 8024636C A0800004 */ sb $zero, 4($a0) .L80246370_166BD0: @@ -725,8 +725,8 @@ glabel filemenu_main_handle_input /* 166CFC 8024649C 0C05272D */ jal sfx_play_sound /* 166D00 802464A0 240400C9 */ addiu $a0, $zero, 0xc9 /* 166D04 802464A4 24020002 */ addiu $v0, $zero, 2 -/* 166D08 802464A8 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 166D0C 802464AC A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 166D08 802464A8 3C018025 */ lui $at, %hi(D_8024C098) +/* 166D0C 802464AC A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 166D10 802464B0 24020002 */ addiu $v0, $zero, 2 /* 166D14 802464B4 3C048016 */ lui $a0, %hi(gWindows) /* 166D18 802464B8 24849D50 */ addiu $a0, $a0, %lo(gWindows) @@ -891,8 +891,8 @@ glabel filemenu_main_handle_input /* 166F70 80246710 3C048025 */ lui $a0, %hi(filemenu_menus + 0x4) /* 166F74 80246714 8C849B88 */ lw $a0, %lo(filemenu_menus + 0x4)($a0) /* 166F78 80246718 00C0102D */ daddu $v0, $a2, $zero -/* 166F7C 8024671C 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 166F80 80246720 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 166F7C 8024671C 3C018025 */ lui $at, %hi(D_8024C098) +/* 166F80 80246720 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 166F84 80246724 08091A37 */ j .L802468DC /* 166F88 80246728 24020003 */ addiu $v0, $zero, 3 .L8024672C_166F8C: @@ -923,8 +923,8 @@ glabel filemenu_main_handle_input /* 166FE8 80246788 3C058014 */ lui $a1, %hi(main_menu_window_update) /* 166FEC 8024678C 24A57650 */ addiu $a1, $a1, %lo(main_menu_window_update) /* 166FF0 80246790 24020002 */ addiu $v0, $zero, 2 -/* 166FF4 80246794 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 166FF8 80246798 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 166FF4 80246794 3C018025 */ lui $at, %hi(D_8024C098) +/* 166FF8 80246798 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 166FFC 8024679C 3C028025 */ lui $v0, %hi(filemenu_menus + 0x8) /* 167000 802467A0 8C429B8C */ lw $v0, %lo(filemenu_menus + 0x8)($v0) /* 167004 802467A4 24100001 */ addiu $s0, $zero, 1 @@ -1007,8 +1007,8 @@ glabel filemenu_main_handle_input /* 167124 802468C4 3C048025 */ lui $a0, %hi(filemenu_menus + 0x4) /* 167128 802468C8 8C849B88 */ lw $a0, %lo(filemenu_menus + 0x4)($a0) /* 16712C 802468CC 00C0102D */ daddu $v0, $a2, $zero -/* 167130 802468D0 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 167134 802468D4 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 167130 802468D0 3C018025 */ lui $at, %hi(D_8024C098) +/* 167134 802468D4 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 167138 802468D8 00C0102D */ daddu $v0, $a2, $zero .L802468DC: /* 16713C 802468DC A0820004 */ sb $v0, 4($a0) diff --git a/ver/us/asm/nonmatchings/165490/filemenu_main_init.s b/ver/us/asm/nonmatchings/165490/filemenu_main_init.s deleted file mode 100644 index e259d5f569..0000000000 --- a/ver/us/asm/nonmatchings/165490/filemenu_main_init.s +++ /dev/null @@ -1,155 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_main_init -/* 166068 80245808 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 16606C 8024580C AFB3001C */ sw $s3, 0x1c($sp) -/* 166070 80245810 0080982D */ daddu $s3, $a0, $zero -/* 166074 80245814 AFB00010 */ sw $s0, 0x10($sp) -/* 166078 80245818 0000802D */ daddu $s0, $zero, $zero -/* 16607C 8024581C AFB20018 */ sw $s2, 0x18($sp) -/* 166080 80245820 3C128025 */ lui $s2, %hi(filemenu_hudElemIDs) -/* 166084 80245824 2652C0B0 */ addiu $s2, $s2, %lo(filemenu_hudElemIDs) -/* 166088 80245828 AFB10014 */ sw $s1, 0x14($sp) -/* 16608C 8024582C 3C118025 */ lui $s1, %hi(D_80249E20) -/* 166090 80245830 26319E20 */ addiu $s1, $s1, %lo(D_80249E20) -/* 166094 80245834 AFBF0020 */ sw $ra, 0x20($sp) -.L80245838: -/* 166098 80245838 8E240000 */ lw $a0, ($s1) -/* 16609C 8024583C 26310004 */ addiu $s1, $s1, 4 -/* 1660A0 80245840 0C050529 */ jal create_hud_element -/* 1660A4 80245844 26100001 */ addiu $s0, $s0, 1 -/* 1660A8 80245848 0040202D */ daddu $a0, $v0, $zero -/* 1660AC 8024584C 24050080 */ addiu $a1, $zero, 0x80 -/* 1660B0 80245850 0C051280 */ jal set_hud_element_flags -/* 1660B4 80245854 AE440000 */ sw $a0, ($s2) -/* 1660B8 80245858 2A020014 */ slti $v0, $s0, 0x14 -/* 1660BC 8024585C 1440FFF6 */ bnez $v0, .L80245838 -/* 1660C0 80245860 26520004 */ addiu $s2, $s2, 4 -/* 1660C4 80245864 2410000D */ addiu $s0, $zero, 0xd -/* 1660C8 80245868 3C028025 */ lui $v0, %hi(D_8024A074) -/* 1660CC 8024586C 2442A074 */ addiu $v0, $v0, %lo(D_8024A074) -.L80245870: -/* 1660D0 80245870 AC530010 */ sw $s3, 0x10($v0) -/* 1660D4 80245874 2610FFFF */ addiu $s0, $s0, -1 -/* 1660D8 80245878 0601FFFD */ bgez $s0, .L80245870 -/* 1660DC 8024587C 2442FFDC */ addiu $v0, $v0, -0x24 -/* 1660E0 80245880 3C048025 */ lui $a0, %hi(D_80249EA0) -/* 1660E4 80245884 24849EA0 */ addiu $a0, $a0, %lo(D_80249EA0) -/* 1660E8 80245888 0C051FCC */ jal setup_pause_menu_tab -/* 1660EC 8024588C 2405000E */ addiu $a1, $zero, 0xe -/* 1660F0 80245890 82620004 */ lb $v0, 4($s3) -/* 1660F4 80245894 82630005 */ lb $v1, 5($s3) -/* 1660F8 80245898 00430018 */ mult $v0, $v1 -/* 1660FC 8024589C 00003012 */ mflo $a2 -/* 166100 802458A0 82620006 */ lb $v0, 6($s3) -/* 166104 802458A4 00000000 */ nop -/* 166108 802458A8 00C20018 */ mult $a2, $v0 -/* 16610C 802458AC 00002012 */ mflo $a0 -/* 166110 802458B0 82620002 */ lb $v0, 2($s3) -/* 166114 802458B4 00000000 */ nop -/* 166118 802458B8 00620018 */ mult $v1, $v0 -/* 16611C 802458BC 00001812 */ mflo $v1 -/* 166120 802458C0 00831821 */ addu $v1, $a0, $v1 -/* 166124 802458C4 82640001 */ lb $a0, 1($s3) -/* 166128 802458C8 8E620008 */ lw $v0, 8($s3) -/* 16612C 802458CC 00641821 */ addu $v1, $v1, $a0 -/* 166130 802458D0 00431021 */ addu $v0, $v0, $v1 -/* 166134 802458D4 90420000 */ lbu $v0, ($v0) -/* 166138 802458D8 82630004 */ lb $v1, 4($s3) -/* 16613C 802458DC A2620003 */ sb $v0, 3($s3) -/* 166140 802458E0 24020002 */ addiu $v0, $zero, 2 -/* 166144 802458E4 14620006 */ bne $v1, $v0, .L80245900 -/* 166148 802458E8 24020001 */ addiu $v0, $zero, 1 -/* 16614C 802458EC 3C038016 */ lui $v1, %hi(gWindows) -/* 166150 802458F0 24639D50 */ addiu $v1, $v1, %lo(gWindows) -/* 166154 802458F4 A46205AE */ sh $v0, 0x5ae($v1) -/* 166158 802458F8 08091644 */ j .L80245910 -/* 16615C 802458FC 240200D3 */ addiu $v0, $zero, 0xd3 -.L80245900: -/* 166160 80245900 3C038016 */ lui $v1, %hi(gWindows) -/* 166164 80245904 24639D50 */ addiu $v1, $v1, %lo(gWindows) -/* 166168 80245908 A46205AE */ sh $v0, 0x5ae($v1) -/* 16616C 8024590C 240200A2 */ addiu $v0, $zero, 0xa2 -.L80245910: -/* 166170 80245910 A46205B0 */ sh $v0, 0x5b0($v1) -/* 166174 80245914 24020019 */ addiu $v0, $zero, 0x19 -/* 166178 80245918 A46205B2 */ sh $v0, 0x5b2($v1) -/* 16617C 8024591C 3C048016 */ lui $a0, %hi(gWindows) -/* 166180 80245920 24849D50 */ addiu $a0, $a0, %lo(gWindows) -/* 166184 80245924 948205B0 */ lhu $v0, 0x5b0($a0) -/* 166188 80245928 00021400 */ sll $v0, $v0, 0x10 -/* 16618C 8024592C 00021C03 */ sra $v1, $v0, 0x10 -/* 166190 80245930 000217C2 */ srl $v0, $v0, 0x1f -/* 166194 80245934 00621821 */ addu $v1, $v1, $v0 -/* 166198 80245938 00032843 */ sra $a1, $v1, 1 -/* 16619C 8024593C 808305A3 */ lb $v1, 0x5a3($a0) -/* 1661A0 80245940 2402FFFF */ addiu $v0, $zero, -1 -/* 1661A4 80245944 1062000B */ beq $v1, $v0, .L80245974 -/* 1661A8 80245948 248605AC */ addiu $a2, $a0, 0x5ac -/* 1661AC 8024594C 00031140 */ sll $v0, $v1, 5 -/* 1661B0 80245950 00441021 */ addu $v0, $v0, $a0 -/* 1661B4 80245954 94420010 */ lhu $v0, 0x10($v0) -/* 1661B8 80245958 00021400 */ sll $v0, $v0, 0x10 -/* 1661BC 8024595C 00021C03 */ sra $v1, $v0, 0x10 -/* 1661C0 80245960 000217C2 */ srl $v0, $v0, 0x1f -/* 1661C4 80245964 00621821 */ addu $v1, $v1, $v0 -/* 1661C8 80245968 00031843 */ sra $v1, $v1, 1 -/* 1661CC 8024596C 08091661 */ j .L80245984 -/* 1661D0 80245970 00651023 */ subu $v0, $v1, $a1 -.L80245974: -/* 1661D4 80245974 240200A0 */ addiu $v0, $zero, 0xa0 -/* 1661D8 80245978 00451023 */ subu $v0, $v0, $a1 -/* 1661DC 8024597C 3C048016 */ lui $a0, %hi(gWindows) -/* 1661E0 80245980 24849D50 */ addiu $a0, $a0, %lo(gWindows) -.L80245984: -/* 1661E4 80245984 A4C20000 */ sh $v0, ($a2) -/* 1661E8 80245988 948206D0 */ lhu $v0, 0x6d0($a0) -/* 1661EC 8024598C 00021400 */ sll $v0, $v0, 0x10 -/* 1661F0 80245990 00021C03 */ sra $v1, $v0, 0x10 -/* 1661F4 80245994 000217C2 */ srl $v0, $v0, 0x1f -/* 1661F8 80245998 00621821 */ addu $v1, $v1, $v0 -/* 1661FC 8024599C 00032843 */ sra $a1, $v1, 1 -/* 166200 802459A0 808306C3 */ lb $v1, 0x6c3($a0) -/* 166204 802459A4 2402FFFF */ addiu $v0, $zero, -1 -/* 166208 802459A8 1062000B */ beq $v1, $v0, .L802459D8 -/* 16620C 802459AC 248606CC */ addiu $a2, $a0, 0x6cc -/* 166210 802459B0 00031140 */ sll $v0, $v1, 5 -/* 166214 802459B4 00441021 */ addu $v0, $v0, $a0 -/* 166218 802459B8 94420010 */ lhu $v0, 0x10($v0) -/* 16621C 802459BC 00021400 */ sll $v0, $v0, 0x10 -/* 166220 802459C0 00021C03 */ sra $v1, $v0, 0x10 -/* 166224 802459C4 000217C2 */ srl $v0, $v0, 0x1f -/* 166228 802459C8 00621821 */ addu $v1, $v1, $v0 -/* 16622C 802459CC 00031843 */ sra $v1, $v1, 1 -/* 166230 802459D0 08091678 */ j .L802459E0 -/* 166234 802459D4 00651023 */ subu $v0, $v1, $a1 -.L802459D8: -/* 166238 802459D8 240200A0 */ addiu $v0, $zero, 0xa0 -/* 16623C 802459DC 00451023 */ subu $v0, $v0, $a1 -.L802459E0: -/* 166240 802459E0 A4C20000 */ sh $v0, ($a2) -/* 166244 802459E4 82620004 */ lb $v0, 4($s3) -/* 166248 802459E8 1040000C */ beqz $v0, .L80245A1C -/* 16624C 802459EC 24040035 */ addiu $a0, $zero, 0x35 -/* 166250 802459F0 0C051F9F */ jal set_window_update -/* 166254 802459F4 24050002 */ addiu $a1, $zero, 2 -/* 166258 802459F8 24040037 */ addiu $a0, $zero, 0x37 -/* 16625C 802459FC 0C051F9F */ jal set_window_update -/* 166260 80245A00 24050002 */ addiu $a1, $zero, 2 -/* 166264 80245A04 24040033 */ addiu $a0, $zero, 0x33 -/* 166268 80245A08 0C051F9F */ jal set_window_update -/* 16626C 80245A0C 24050002 */ addiu $a1, $zero, 2 -/* 166270 80245A10 24040034 */ addiu $a0, $zero, 0x34 -/* 166274 80245A14 0C051F9F */ jal set_window_update -/* 166278 80245A18 24050002 */ addiu $a1, $zero, 2 -.L80245A1C: -/* 16627C 80245A1C 24020001 */ addiu $v0, $zero, 1 -/* 166280 80245A20 A2620000 */ sb $v0, ($s3) -/* 166284 80245A24 8FBF0020 */ lw $ra, 0x20($sp) -/* 166288 80245A28 8FB3001C */ lw $s3, 0x1c($sp) -/* 16628C 80245A2C 8FB20018 */ lw $s2, 0x18($sp) -/* 166290 80245A30 8FB10014 */ lw $s1, 0x14($sp) -/* 166294 80245A34 8FB00010 */ lw $s0, 0x10($sp) -/* 166298 80245A38 03E00008 */ jr $ra -/* 16629C 80245A3C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/167570/filemenu_yesno_draw_options_contents.s b/ver/us/asm/nonmatchings/167570/filemenu_yesno_draw_options_contents.s index 04fb773e34..d79dd60946 100644 --- a/ver/us/asm/nonmatchings/167570/filemenu_yesno_draw_options_contents.s +++ b/ver/us/asm/nonmatchings/167570/filemenu_yesno_draw_options_contents.s @@ -54,8 +54,8 @@ glabel filemenu_yesno_draw_options_contents /* 167610 80246DB0 AFA00010 */ sw $zero, 0x10($sp) /* 167614 80246DB4 0C09265F */ jal filemenu_draw_message /* 167618 80246DB8 AFA00014 */ sw $zero, 0x14($sp) -/* 16761C 80246DBC 3C038025 */ lui $v1, %hi(D_8024C098_C09918) -/* 167620 80246DC0 8063C098 */ lb $v1, %lo(D_8024C098_C09918)($v1) +/* 16761C 80246DBC 3C038025 */ lui $v1, %hi(D_8024C098) +/* 167620 80246DC0 8063C098 */ lb $v1, %lo(D_8024C098)($v1) /* 167624 80246DC4 24020001 */ addiu $v0, $zero, 1 /* 167628 80246DC8 1462000C */ bne $v1, $v0, .L80246DFC /* 16762C 80246DCC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s b/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s index 7a5ef9dbad..6b5dc8c44d 100644 --- a/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s +++ b/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s @@ -123,8 +123,8 @@ glabel filemenu_yesno_handle_input /* 167BD8 80247378 8C639B8C */ lw $v1, %lo(filemenu_menus + 0x8)($v1) /* 167BDC 8024737C 3C048016 */ lui $a0, %hi(gWindows) /* 167BE0 80247380 24849D50 */ addiu $a0, $a0, %lo(gWindows) -/* 167BE4 80247384 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 167BE8 80247388 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 167BE4 80247384 3C018025 */ lui $at, %hi(D_8024C098) +/* 167BE8 80247388 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 167BEC 8024738C 240200B6 */ addiu $v0, $zero, 0xb6 /* 167BF0 80247390 A0600004 */ sb $zero, 4($v1) /* 167BF4 80247394 808305E3 */ lb $v1, 0x5e3($a0) @@ -218,8 +218,8 @@ glabel filemenu_yesno_handle_input /* 167D40 802474E0 00000000 */ nop .L802474E4_167D44: /* 167D44 802474E4 24020002 */ addiu $v0, $zero, 2 -/* 167D48 802474E8 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 167D4C 802474EC A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 167D48 802474E8 3C018025 */ lui $at, %hi(D_8024C098) +/* 167D4C 802474EC A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 167D50 802474F0 24020002 */ addiu $v0, $zero, 2 /* 167D54 802474F4 3C048016 */ lui $a0, %hi(gWindows) /* 167D58 802474F8 24849D50 */ addiu $a0, $a0, %lo(gWindows) @@ -319,8 +319,8 @@ glabel filemenu_yesno_handle_input /* 167EC0 80247660 24020001 */ addiu $v0, $zero, 1 .L80247664_167EC4: /* 167EC4 80247664 24020002 */ addiu $v0, $zero, 2 -/* 167EC8 80247668 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 167ECC 8024766C A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 167EC8 80247668 3C018025 */ lui $at, %hi(D_8024C098) +/* 167ECC 8024766C A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 167ED0 80247670 24020001 */ addiu $v0, $zero, 1 /* 167ED4 80247674 3C048016 */ lui $a0, %hi(gWindows) /* 167ED8 80247678 24849D50 */ addiu $a0, $a0, %lo(gWindows) @@ -515,8 +515,8 @@ glabel filemenu_yesno_handle_input /* 1681B0 80247950 0C051F9F */ jal set_window_update /* 1681B4 80247954 24040032 */ addiu $a0, $zero, 0x32 /* 1681B8 80247958 24020002 */ addiu $v0, $zero, 2 -/* 1681BC 8024795C 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 1681C0 80247960 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 1681BC 8024795C 3C018025 */ lui $at, %hi(D_8024C098) +/* 1681C0 80247960 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 1681C4 80247964 24020003 */ addiu $v0, $zero, 3 /* 1681C8 80247968 3C048016 */ lui $a0, %hi(gWindows) /* 1681CC 8024796C 24849D50 */ addiu $a0, $a0, %lo(gWindows) @@ -614,16 +614,16 @@ glabel filemenu_yesno_handle_input /* 16831C 80247ABC 00400008 */ jr $v0 /* 168320 80247AC0 00000000 */ nop .L80247AC4_168324: -/* 168324 80247AC4 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 168328 80247AC8 A020C098 */ sb $zero, %lo(D_8024C098_C09918)($at) +/* 168324 80247AC4 3C018025 */ lui $at, %hi(D_8024C098) +/* 168328 80247AC8 A020C098 */ sb $zero, %lo(D_8024C098)($at) /* 16832C 80247ACC 3C058024 */ lui $a1, %hi(filemenu_update_hidden_name_confirm) /* 168330 80247AD0 24A53EEC */ addiu $a1, $a1, %lo(filemenu_update_hidden_name_confirm) /* 168334 80247AD4 08091EEC */ j .L80247BB0 /* 168338 80247AD8 24040032 */ addiu $a0, $zero, 0x32 .L80247ADC_16833C: /* 16833C 80247ADC 24020003 */ addiu $v0, $zero, 3 -/* 168340 80247AE0 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 168344 80247AE4 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 168340 80247AE0 3C018025 */ lui $at, %hi(D_8024C098) +/* 168344 80247AE4 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 168348 80247AE8 3C058024 */ lui $a1, %hi(filemenu_update_hidden_name_confirm) /* 16834C 80247AEC 24A53EEC */ addiu $a1, $a1, %lo(filemenu_update_hidden_name_confirm) /* 168350 80247AF0 08091EEC */ j .L80247BB0 @@ -634,8 +634,8 @@ glabel filemenu_yesno_handle_input /* 168360 80247B00 2610381C */ addiu $s0, $s0, %lo(filemenu_update_show_with_rotation) /* 168364 80247B04 3C028025 */ lui $v0, %hi(filemenu_menus) /* 168368 80247B08 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) -/* 16836C 80247B0C 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 168370 80247B10 A020C098 */ sb $zero, %lo(D_8024C098_C09918)($at) +/* 16836C 80247B0C 3C018025 */ lui $at, %hi(D_8024C098) +/* 168370 80247B10 A020C098 */ sb $zero, %lo(D_8024C098)($at) /* 168374 80247B14 90510003 */ lbu $s1, 3($v0) /* 168378 80247B18 0C051F9F */ jal set_window_update /* 16837C 80247B1C 0200282D */ daddu $a1, $s0, $zero @@ -700,16 +700,16 @@ glabel filemenu_yesno_handle_input /* 168460 80247C00 00400008 */ jr $v0 /* 168464 80247C04 00000000 */ nop .L80247C08_168468: -/* 168468 80247C08 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 16846C 80247C0C A020C098 */ sb $zero, %lo(D_8024C098_C09918)($at) +/* 168468 80247C08 3C018025 */ lui $at, %hi(D_8024C098) +/* 16846C 80247C0C A020C098 */ sb $zero, %lo(D_8024C098)($at) /* 168470 80247C10 3C058024 */ lui $a1, %hi(filemenu_update_hidden_name_confirm) /* 168474 80247C14 24A53EEC */ addiu $a1, $a1, %lo(filemenu_update_hidden_name_confirm) /* 168478 80247C18 08091F3D */ j .L80247CF4 /* 16847C 80247C1C 24040032 */ addiu $a0, $zero, 0x32 .L80247C20_168480: /* 168480 80247C20 24020003 */ addiu $v0, $zero, 3 -/* 168484 80247C24 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 168488 80247C28 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 168484 80247C24 3C018025 */ lui $at, %hi(D_8024C098) +/* 168488 80247C28 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 16848C 80247C2C 3C058024 */ lui $a1, %hi(filemenu_update_hidden_name_confirm) /* 168490 80247C30 24A53EEC */ addiu $a1, $a1, %lo(filemenu_update_hidden_name_confirm) /* 168494 80247C34 08091F3D */ j .L80247CF4 @@ -720,8 +720,8 @@ glabel filemenu_yesno_handle_input /* 1684A4 80247C44 2610381C */ addiu $s0, $s0, %lo(filemenu_update_show_with_rotation) /* 1684A8 80247C48 3C028025 */ lui $v0, %hi(filemenu_menus) /* 1684AC 80247C4C 8C429B84 */ lw $v0, %lo(filemenu_menus)($v0) -/* 1684B0 80247C50 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 1684B4 80247C54 A020C098 */ sb $zero, %lo(D_8024C098_C09918)($at) +/* 1684B0 80247C50 3C018025 */ lui $at, %hi(D_8024C098) +/* 1684B4 80247C54 A020C098 */ sb $zero, %lo(D_8024C098)($at) /* 1684B8 80247C58 90510003 */ lbu $s1, 3($v0) /* 1684BC 80247C5C 0C051F9F */ jal set_window_update /* 1684C0 80247C60 0200282D */ daddu $a1, $s0, $zero diff --git a/ver/us/asm/nonmatchings/168590/filemenu_choose_name_handle_input.s b/ver/us/asm/nonmatchings/168590/filemenu_choose_name_handle_input.s index 1f9c60a025..c9b2f7f2e4 100644 --- a/ver/us/asm/nonmatchings/168590/filemenu_choose_name_handle_input.s +++ b/ver/us/asm/nonmatchings/168590/filemenu_choose_name_handle_input.s @@ -389,8 +389,8 @@ glabel filemenu_choose_name_handle_input /* 1699C8 80249168 2404003B */ addiu $a0, $zero, 0x3b /* 1699CC 8024916C 0C051F9F */ jal set_window_update /* 1699D0 80249170 0200282D */ daddu $a1, $s0, $zero -/* 1699D4 80249174 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 1699D8 80249178 A020C098 */ sb $zero, %lo(D_8024C098_C09918)($at) +/* 1699D4 80249174 3C018025 */ lui $at, %hi(D_8024C098) +/* 1699D8 80249178 A020C098 */ sb $zero, %lo(D_8024C098)($at) /* 1699DC 8024917C 080924C4 */ j .L80249310 /* 1699E0 80249180 00000000 */ nop .L80249184: @@ -498,8 +498,8 @@ glabel filemenu_choose_name_handle_input /* 169B50 802492F0 3C048025 */ lui $a0, %hi(filemenu_menus + 0x4) /* 169B54 802492F4 8C849B88 */ lw $a0, %lo(filemenu_menus + 0x4)($a0) /* 169B58 802492F8 24020001 */ addiu $v0, $zero, 1 -/* 169B5C 802492FC 3C018025 */ lui $at, %hi(D_8024C098_C09918) -/* 169B60 80249300 A022C098 */ sb $v0, %lo(D_8024C098_C09918)($at) +/* 169B5C 802492FC 3C018025 */ lui $at, %hi(D_8024C098) +/* 169B60 80249300 A022C098 */ sb $v0, %lo(D_8024C098)($at) /* 169B64 80249304 24020002 */ addiu $v0, $zero, 2 /* 169B68 80249308 0C090B65 */ jal filemenu_set_selected /* 169B6C 8024930C A0820004 */ sb $v0, 4($a0) diff --git a/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_choose_name.s b/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_choose_name.s index 061506c355..637c954ff5 100644 --- a/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_choose_name.s +++ b/ver/us/asm/nonmatchings/168590/filemenu_draw_contents_choose_name.s @@ -466,8 +466,8 @@ glabel filemenu_draw_contents_choose_name /* 169220 802489C0 1440FF9A */ bnez $v0, .L8024882C /* 169224 802489C4 00000000 */ nop .L802489C8: -/* 169228 802489C8 3C038025 */ lui $v1, %hi(D_8024C098_C09918) -/* 16922C 802489CC 8063C098 */ lb $v1, %lo(D_8024C098_C09918)($v1) +/* 169228 802489C8 3C038025 */ lui $v1, %hi(D_8024C098) +/* 16922C 802489CC 8063C098 */ lb $v1, %lo(D_8024C098)($v1) /* 169230 802489D0 24020003 */ addiu $v0, $zero, 3 /* 169234 802489D4 1462001D */ bne $v1, $v0, .L80248A4C /* 169238 802489D8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/1776B0/btl_cam_unfreeze.s b/ver/us/asm/nonmatchings/1776B0/btl_cam_unfreeze.s deleted file mode 100644 index e66709d584..0000000000 --- a/ver/us/asm/nonmatchings/1776B0/btl_cam_unfreeze.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel btl_cam_unfreeze -/* 17CEE0 8024E600 3C018028 */ lui $at, %hi(D_80280CE0) -/* 17CEE4 8024E604 03E00008 */ jr $ra -/* 17CEE8 8024E608 A0200CE0 */ sb $zero, %lo(D_80280CE0)($at) diff --git a/ver/us/asm/nonmatchings/1776B0/btl_cam_use_preset.s b/ver/us/asm/nonmatchings/1776B0/btl_cam_use_preset.s deleted file mode 100644 index 7fe5462595..0000000000 --- a/ver/us/asm/nonmatchings/1776B0/btl_cam_use_preset.s +++ /dev/null @@ -1,1424 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8029CC48 -.word .L8024CFB0_17B890, .L8024CFBC_17B89C, .L8024CFC8_17B8A8, .L8024CFFC_17B8DC, .L8024D024_17B904, .L8024D04C_17B92C, .L8024D074_17B954, .L8024D09C_17B97C, .L8024D0C4_17B9A4, .L8024D0EC_17B9CC, .L8024D120_17BA00, .L8024D154_17BA34, .L8024D17C_17BA5C, .L8024D1B0_17BA90, .L8024D1E4_17BAC4, .L8024D20C_17BAEC, .L8024D240_17BB20, .L8024D288_17BB68, .L8024D2CC_17BBAC, .L8024D2FC_17BBDC, .L8024D314_17BBF4, .L8024D324_17BC04, .L8024D4A0_17BD80, .L8024D424_17BD04, .L8024D3B4_17BC94, .L8024D348_17BC28, .L8024D4EC_17BDCC, .L8024D548_17BE28, .L8024D5A0_17BE80, .L8024DE00_17C6E0, .L8024D5E4_17BEC4, .L8024D5E4_17BEC4, .L8024D654_17BF34, .L8024D6A0_17BF80, .L8024D6D4_17BFB4, .L8024D740_17C020, .L8024D7FC_17C0DC, .L8024D7A0_17C080, .L8024D85C_17C13C, .L8024D8B8_17C198, .L8024D910_17C1F0, .L8024D97C_17C25C, .L8024D97C_17C25C, .L8024D9BC_17C29C, .L8024DA18_17C2F8, .L8024DA80_17C360, .L8024DAE0_17C3C0, .L8024DC9C_17C57C, .L8024DCF0_17C5D0, .L8024DD4C_17C62C, .L8024DDA8_17C688, .L8024DE00_17C6E0, .L8024DE30_17C710, .L8024DE8C_17C76C, .L8024DEEC_17C7CC, .L8024DF5C_17C83C, .L8024DF94_17C874, .L8024DFE8_17C8C8, .L8024E04C_17C92C, .L8024E0CC_17C9AC, .L8024E144_17CA24, .L8024E1A4_17CA84, .L8024E1A4_17CA84, .L8024E218_17CAF8, .L8024E24C_17CB2C, .L8024E274_17CB54, .L8024E29C_17CB7C, .L8024E2F8_17CBD8, .L8024E320_17CC00, .L8024DBEC_17C4CC, .L8024DB48_17C428, .L8024DBA0_17C480, .L8024DBEC_17C4CC, .L8024DC58_17C538 - -.section .text - -glabel btl_cam_use_preset -/* 17B814 8024CF34 3C028028 */ lui $v0, %hi(D_80280CE0) -/* 17B818 8024CF38 80420CE0 */ lb $v0, %lo(D_80280CE0)($v0) -/* 17B81C 8024CF3C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 17B820 8024CF40 AFB10014 */ sw $s1, 0x14($sp) -/* 17B824 8024CF44 0080882D */ daddu $s1, $a0, $zero -/* 17B828 8024CF48 AFB00010 */ sw $s0, 0x10($sp) -/* 17B82C 8024CF4C 0000802D */ daddu $s0, $zero, $zero -/* 17B830 8024CF50 AFB20018 */ sw $s2, 0x18($sp) -/* 17B834 8024CF54 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 17B838 8024CF58 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 17B83C 8024CF5C 14400518 */ bnez $v0, .L8024E3C0 -/* 17B840 8024CF60 AFBF001C */ sw $ra, 0x1c($sp) -/* 17B844 8024CF64 24020001 */ addiu $v0, $zero, 1 -/* 17B848 8024CF68 3C01802A */ lui $at, %hi(D_8029F2A6) -/* 17B84C 8024CF6C A022F2A6 */ sb $v0, %lo(D_8029F2A6)($at) -/* 17B850 8024CF70 2E22004A */ sltiu $v0, $s1, 0x4a -/* 17B854 8024CF74 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17B858 8024CF78 A020F2A2 */ sb $zero, %lo(D_8029F2A2)($at) -/* 17B85C 8024CF7C 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17B860 8024CF80 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17B864 8024CF84 3C01802A */ lui $at, %hi(D_8029F2A5) -/* 17B868 8024CF88 A020F2A5 */ sb $zero, %lo(D_8029F2A5)($at) -/* 17B86C 8024CF8C 3C01802A */ lui $at, %hi(D_8029F2A7) -/* 17B870 8024CF90 A020F2A7 */ sb $zero, %lo(D_8029F2A7)($at) -/* 17B874 8024CF94 104004F7 */ beqz $v0, .L8024E374 -/* 17B878 8024CF98 00111080 */ sll $v0, $s1, 2 -/* 17B87C 8024CF9C 3C01802A */ lui $at, %hi(jtbl_8029CC48) -/* 17B880 8024CFA0 00220821 */ addu $at, $at, $v0 -/* 17B884 8024CFA4 8C22CC48 */ lw $v0, %lo(jtbl_8029CC48)($at) -/* 17B888 8024CFA8 00400008 */ jr $v0 -/* 17B88C 8024CFAC 00000000 */ nop -.L8024CFB0_17B890: -/* 17B890 8024CFB0 3C108028 */ lui $s0, %hi(CamPreset_A) -/* 17B894 8024CFB4 080938DD */ j .L8024E374 -/* 17B898 8024CFB8 26100E54 */ addiu $s0, $s0, %lo(CamPreset_A) -.L8024CFBC_17B89C: -/* 17B89C 8024CFBC 3C108028 */ lui $s0, %hi(CamPreset_B) -/* 17B8A0 8024CFC0 080938DD */ j .L8024E374 -/* 17B8A4 8024CFC4 26100CE8 */ addiu $s0, $s0, %lo(CamPreset_B) -.L8024CFC8_17B8A8: -/* 17B8A8 8024CFC8 3C028028 */ lui $v0, %hi(D_80280CE4) -/* 17B8AC 8024CFCC 8C420CE4 */ lw $v0, %lo(D_80280CE4)($v0) -/* 17B8B0 8024CFD0 105104FB */ beq $v0, $s1, .L8024E3C0 -/* 17B8B4 8024CFD4 240201F4 */ addiu $v0, $zero, 0x1f4 -/* 17B8B8 8024CFD8 3C108028 */ lui $s0, %hi(CamPreset_C) -/* 17B8BC 8024CFDC 26100DAC */ addiu $s0, $s0, %lo(CamPreset_C) -/* 17B8C0 8024CFE0 3C01802A */ lui $at, %hi(D_8029F280) -/* 17B8C4 8024CFE4 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17B8C8 8024CFE8 2402001E */ addiu $v0, $zero, 0x1e -/* 17B8CC 8024CFEC 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17B8D0 8024CFF0 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17B8D4 8024CFF4 080938DD */ j .L8024E374 -/* 17B8D8 8024CFF8 00000000 */ nop -.L8024CFFC_17B8DC: -/* 17B8DC 8024CFFC 3C028028 */ lui $v0, %hi(D_80280CE4) -/* 17B8E0 8024D000 8C420CE4 */ lw $v0, %lo(D_80280CE4)($v0) -/* 17B8E4 8024D004 105104EE */ beq $v0, $s1, .L8024E3C0 -/* 17B8E8 8024D008 240201E0 */ addiu $v0, $zero, 0x1e0 -/* 17B8EC 8024D00C 3C108028 */ lui $s0, %hi(CamPreset_D) -/* 17B8F0 8024D010 26100DC8 */ addiu $s0, $s0, %lo(CamPreset_D) -/* 17B8F4 8024D014 3C01802A */ lui $at, %hi(D_8029F280) -/* 17B8F8 8024D018 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17B8FC 8024D01C 080934CC */ j .L8024D330 -/* 17B900 8024D020 24020014 */ addiu $v0, $zero, 0x14 -.L8024D024_17B904: -/* 17B904 8024D024 3C028028 */ lui $v0, %hi(D_80280CE4) -/* 17B908 8024D028 8C420CE4 */ lw $v0, %lo(D_80280CE4)($v0) -/* 17B90C 8024D02C 105104E4 */ beq $v0, $s1, .L8024E3C0 -/* 17B910 8024D030 240201F4 */ addiu $v0, $zero, 0x1f4 -/* 17B914 8024D034 3C108028 */ lui $s0, %hi(CamPreset_E) -/* 17B918 8024D038 26100DE4 */ addiu $s0, $s0, %lo(CamPreset_E) -/* 17B91C 8024D03C 3C01802A */ lui $at, %hi(D_8029F280) -/* 17B920 8024D040 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17B924 8024D044 080934CC */ j .L8024D330 -/* 17B928 8024D048 2402000A */ addiu $v0, $zero, 0xa -.L8024D04C_17B92C: -/* 17B92C 8024D04C 3C108028 */ lui $s0, %hi(CamPreset_F) -/* 17B930 8024D050 26100D04 */ addiu $s0, $s0, %lo(CamPreset_F) -/* 17B934 8024D054 2402012C */ addiu $v0, $zero, 0x12c -/* 17B938 8024D058 3C01802A */ lui $at, %hi(D_8029F280) -/* 17B93C 8024D05C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17B940 8024D060 24020014 */ addiu $v0, $zero, 0x14 -/* 17B944 8024D064 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17B948 8024D068 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17B94C 8024D06C 080938D9 */ j .L8024E364 -/* 17B950 8024D070 24020001 */ addiu $v0, $zero, 1 -.L8024D074_17B954: -/* 17B954 8024D074 3C108028 */ lui $s0, %hi(CamPreset_G) -/* 17B958 8024D078 26100D3C */ addiu $s0, $s0, %lo(CamPreset_G) -/* 17B95C 8024D07C 2402012C */ addiu $v0, $zero, 0x12c -/* 17B960 8024D080 3C01802A */ lui $at, %hi(D_8029F280) -/* 17B964 8024D084 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17B968 8024D088 24020014 */ addiu $v0, $zero, 0x14 -/* 17B96C 8024D08C 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17B970 8024D090 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17B974 8024D094 080938D9 */ j .L8024E364 -/* 17B978 8024D098 24020001 */ addiu $v0, $zero, 1 -.L8024D09C_17B97C: -/* 17B97C 8024D09C 3C108028 */ lui $s0, %hi(CamPreset_H) -/* 17B980 8024D0A0 26100D74 */ addiu $s0, $s0, %lo(CamPreset_H) -/* 17B984 8024D0A4 2402012C */ addiu $v0, $zero, 0x12c -/* 17B988 8024D0A8 3C01802A */ lui $at, %hi(D_8029F280) -/* 17B98C 8024D0AC A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17B990 8024D0B0 24020014 */ addiu $v0, $zero, 0x14 -/* 17B994 8024D0B4 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17B998 8024D0B8 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17B99C 8024D0BC 080938DD */ j .L8024E374 -/* 17B9A0 8024D0C0 00000000 */ nop -.L8024D0C4_17B9A4: -/* 17B9A4 8024D0C4 3C108028 */ lui $s0, %hi(CamPreset_I) -/* 17B9A8 8024D0C8 26100D58 */ addiu $s0, $s0, %lo(CamPreset_I) -/* 17B9AC 8024D0CC 2402012C */ addiu $v0, $zero, 0x12c -/* 17B9B0 8024D0D0 3C01802A */ lui $at, %hi(D_8029F280) -/* 17B9B4 8024D0D4 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17B9B8 8024D0D8 24020014 */ addiu $v0, $zero, 0x14 -/* 17B9BC 8024D0DC 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17B9C0 8024D0E0 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17B9C4 8024D0E4 080938D9 */ j .L8024E364 -/* 17B9C8 8024D0E8 24020001 */ addiu $v0, $zero, 1 -.L8024D0EC_17B9CC: -/* 17B9CC 8024D0EC 3C02802A */ lui $v0, %hi(D_8029F2B4) -/* 17B9D0 8024D0F0 8C42F2B4 */ lw $v0, %lo(D_8029F2B4)($v0) -/* 17B9D4 8024D0F4 3C048028 */ lui $a0, %hi(CamPreset_C) -/* 17B9D8 8024D0F8 24840DAC */ addiu $a0, $a0, %lo(CamPreset_C) -/* 17B9DC 8024D0FC 104404B0 */ beq $v0, $a0, .L8024E3C0 -/* 17B9E0 8024D100 240201F4 */ addiu $v0, $zero, 0x1f4 -/* 17B9E4 8024D104 3C01802A */ lui $at, %hi(D_8029F280) -/* 17B9E8 8024D108 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17B9EC 8024D10C 24020078 */ addiu $v0, $zero, 0x78 -/* 17B9F0 8024D110 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17B9F4 8024D114 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17B9F8 8024D118 080938DD */ j .L8024E374 -/* 17B9FC 8024D11C 0080802D */ daddu $s0, $a0, $zero -.L8024D120_17BA00: -/* 17BA00 8024D120 3C108028 */ lui $s0, %hi(CamPreset_F) -/* 17BA04 8024D124 26100D04 */ addiu $s0, $s0, %lo(CamPreset_F) -/* 17BA08 8024D128 240200C8 */ addiu $v0, $zero, 0xc8 -/* 17BA0C 8024D12C 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BA10 8024D130 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BA14 8024D134 24020008 */ addiu $v0, $zero, 8 -/* 17BA18 8024D138 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BA1C 8024D13C A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BA20 8024D140 24020014 */ addiu $v0, $zero, 0x14 -/* 17BA24 8024D144 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BA28 8024D148 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BA2C 8024D14C 080938D4 */ j .L8024E350 -/* 17BA30 8024D150 2402000F */ addiu $v0, $zero, 0xf -.L8024D154_17BA34: -/* 17BA34 8024D154 3C108028 */ lui $s0, %hi(CamPreset_F) -/* 17BA38 8024D158 26100D04 */ addiu $s0, $s0, %lo(CamPreset_F) -/* 17BA3C 8024D15C 2402012C */ addiu $v0, $zero, 0x12c -/* 17BA40 8024D160 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BA44 8024D164 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BA48 8024D168 24020008 */ addiu $v0, $zero, 8 -/* 17BA4C 8024D16C 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BA50 8024D170 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BA54 8024D174 080938D1 */ j .L8024E344 -/* 17BA58 8024D178 24020014 */ addiu $v0, $zero, 0x14 -.L8024D17C_17BA5C: -/* 17BA5C 8024D17C 3C108028 */ lui $s0, %hi(CamPreset_F) -/* 17BA60 8024D180 26100D04 */ addiu $s0, $s0, %lo(CamPreset_F) -/* 17BA64 8024D184 24020190 */ addiu $v0, $zero, 0x190 -/* 17BA68 8024D188 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BA6C 8024D18C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BA70 8024D190 24020008 */ addiu $v0, $zero, 8 -/* 17BA74 8024D194 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BA78 8024D198 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BA7C 8024D19C 24020014 */ addiu $v0, $zero, 0x14 -/* 17BA80 8024D1A0 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BA84 8024D1A4 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BA88 8024D1A8 080938D4 */ j .L8024E350 -/* 17BA8C 8024D1AC 2402001E */ addiu $v0, $zero, 0x1e -.L8024D1B0_17BA90: -/* 17BA90 8024D1B0 3C108028 */ lui $s0, %hi(CamPreset_I) -/* 17BA94 8024D1B4 26100D58 */ addiu $s0, $s0, %lo(CamPreset_I) -/* 17BA98 8024D1B8 240200C8 */ addiu $v0, $zero, 0xc8 -/* 17BA9C 8024D1BC 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BAA0 8024D1C0 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BAA4 8024D1C4 24020008 */ addiu $v0, $zero, 8 -/* 17BAA8 8024D1C8 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BAAC 8024D1CC A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BAB0 8024D1D0 24020014 */ addiu $v0, $zero, 0x14 -/* 17BAB4 8024D1D4 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BAB8 8024D1D8 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BABC 8024D1DC 080938D4 */ j .L8024E350 -/* 17BAC0 8024D1E0 2402000F */ addiu $v0, $zero, 0xf -.L8024D1E4_17BAC4: -/* 17BAC4 8024D1E4 3C108028 */ lui $s0, %hi(CamPreset_I) -/* 17BAC8 8024D1E8 26100D58 */ addiu $s0, $s0, %lo(CamPreset_I) -/* 17BACC 8024D1EC 2402012C */ addiu $v0, $zero, 0x12c -/* 17BAD0 8024D1F0 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BAD4 8024D1F4 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BAD8 8024D1F8 24020008 */ addiu $v0, $zero, 8 -/* 17BADC 8024D1FC 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BAE0 8024D200 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BAE4 8024D204 080938D1 */ j .L8024E344 -/* 17BAE8 8024D208 24020014 */ addiu $v0, $zero, 0x14 -.L8024D20C_17BAEC: -/* 17BAEC 8024D20C 3C108028 */ lui $s0, %hi(CamPreset_I) -/* 17BAF0 8024D210 26100D58 */ addiu $s0, $s0, %lo(CamPreset_I) -/* 17BAF4 8024D214 24020190 */ addiu $v0, $zero, 0x190 -/* 17BAF8 8024D218 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BAFC 8024D21C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BB00 8024D220 24020008 */ addiu $v0, $zero, 8 -/* 17BB04 8024D224 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BB08 8024D228 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BB0C 8024D22C 24020014 */ addiu $v0, $zero, 0x14 -/* 17BB10 8024D230 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BB14 8024D234 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BB18 8024D238 080938D4 */ j .L8024E350 -/* 17BB1C 8024D23C 2402001E */ addiu $v0, $zero, 0x1e -.L8024D240_17BB20: -/* 17BB20 8024D240 3C108028 */ lui $s0, %hi(CamPreset_H) -/* 17BB24 8024D244 26100D74 */ addiu $s0, $s0, %lo(CamPreset_H) -/* 17BB28 8024D248 2402010B */ addiu $v0, $zero, 0x10b -/* 17BB2C 8024D24C 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BB30 8024D250 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BB34 8024D254 24020008 */ addiu $v0, $zero, 8 -/* 17BB38 8024D258 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BB3C 8024D25C A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BB40 8024D260 24020014 */ addiu $v0, $zero, 0x14 -/* 17BB44 8024D264 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BB48 8024D268 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BB4C 8024D26C 24020017 */ addiu $v0, $zero, 0x17 -/* 17BB50 8024D270 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BB54 8024D274 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17BB58 8024D278 3C01802A */ lui $at, %hi(D_8029F286) -/* 17BB5C 8024D27C A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17BB60 8024D280 080938DD */ j .L8024E374 -/* 17BB64 8024D284 00000000 */ nop -.L8024D288_17BB68: -/* 17BB68 8024D288 3C108028 */ lui $s0, %hi(CamPreset_H) -/* 17BB6C 8024D28C 26100D74 */ addiu $s0, $s0, %lo(CamPreset_H) -/* 17BB70 8024D290 2402012C */ addiu $v0, $zero, 0x12c -/* 17BB74 8024D294 24030008 */ addiu $v1, $zero, 8 -/* 17BB78 8024D298 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BB7C 8024D29C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BB80 8024D2A0 24020014 */ addiu $v0, $zero, 0x14 -/* 17BB84 8024D2A4 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BB88 8024D2A8 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17BB8C 8024D2AC 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BB90 8024D2B0 A423F284 */ sh $v1, %lo(D_8029F284)($at) -/* 17BB94 8024D2B4 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BB98 8024D2B8 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BB9C 8024D2BC 3C01802A */ lui $at, %hi(D_8029F286) -/* 17BBA0 8024D2C0 A423F286 */ sh $v1, %lo(D_8029F286)($at) -/* 17BBA4 8024D2C4 080938DD */ j .L8024E374 -/* 17BBA8 8024D2C8 00000000 */ nop -.L8024D2CC_17BBAC: -/* 17BBAC 8024D2CC 3C108028 */ lui $s0, %hi(CamPreset_H) -/* 17BBB0 8024D2D0 26100D74 */ addiu $s0, $s0, %lo(CamPreset_H) -/* 17BBB4 8024D2D4 24020190 */ addiu $v0, $zero, 0x190 -/* 17BBB8 8024D2D8 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BBBC 8024D2DC A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BBC0 8024D2E0 24020008 */ addiu $v0, $zero, 8 -/* 17BBC4 8024D2E4 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BBC8 8024D2E8 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BBCC 8024D2EC 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BBD0 8024D2F0 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17BBD4 8024D2F4 080934CC */ j .L8024D330 -/* 17BBD8 8024D2F8 24020014 */ addiu $v0, $zero, 0x14 -.L8024D2FC_17BBDC: -/* 17BBDC 8024D2FC 24020014 */ addiu $v0, $zero, 0x14 -/* 17BBE0 8024D300 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BBE4 8024D304 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BBE8 8024D308 3C108028 */ lui $s0, %hi(CamPreset_J) -/* 17BBEC 8024D30C 080938DD */ j .L8024E374 -/* 17BBF0 8024D310 26100E00 */ addiu $s0, $s0, %lo(CamPreset_J) -.L8024D314_17BBF4: -/* 17BBF4 8024D314 3C108028 */ lui $s0, %hi(CamPreset_K) -/* 17BBF8 8024D318 26100E1C */ addiu $s0, $s0, %lo(CamPreset_K) -/* 17BBFC 8024D31C 080934CC */ j .L8024D330 -/* 17BC00 8024D320 24020014 */ addiu $v0, $zero, 0x14 -.L8024D324_17BC04: -/* 17BC04 8024D324 3C108028 */ lui $s0, %hi(CamPreset_L) -/* 17BC08 8024D328 26100E38 */ addiu $s0, $s0, %lo(CamPreset_L) -/* 17BC0C 8024D32C 24020014 */ addiu $v0, $zero, 0x14 -.L8024D330: -/* 17BC10 8024D330 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BC14 8024D334 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BC18 8024D338 3C01802A */ lui $at, %hi(D_8029F286) -/* 17BC1C 8024D33C A420F286 */ sh $zero, %lo(D_8029F286)($at) -/* 17BC20 8024D340 080938DD */ j .L8024E374 -/* 17BC24 8024D344 00000000 */ nop -.L8024D348_17BC28: -/* 17BC28 8024D348 3C108028 */ lui $s0, %hi(CamPreset_J) -/* 17BC2C 8024D34C 26100E00 */ addiu $s0, $s0, %lo(CamPreset_J) -/* 17BC30 8024D350 3C01C2A0 */ lui $at, 0xc2a0 -/* 17BC34 8024D354 44816000 */ mtc1 $at, $f12 -/* 17BC38 8024D358 44800000 */ mtc1 $zero, $f0 -/* 17BC3C 8024D35C 2402010A */ addiu $v0, $zero, 0x10a -/* 17BC40 8024D360 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BC44 8024D364 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BC48 8024D368 44060000 */ mfc1 $a2, $f0 -/* 17BC4C 8024D36C 24020008 */ addiu $v0, $zero, 8 -/* 17BC50 8024D370 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BC54 8024D374 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BC58 8024D378 44867000 */ mtc1 $a2, $f14 -/* 17BC5C 8024D37C 24020028 */ addiu $v0, $zero, 0x28 -/* 17BC60 8024D380 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BC64 8024D384 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17BC68 8024D388 3C01802A */ lui $at, %hi(D_8029F286) -/* 17BC6C 8024D38C A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17BC70 8024D390 0C093948 */ jal btl_cam_set_target_pos -/* 17BC74 8024D394 00000000 */ nop -/* 17BC78 8024D398 24020014 */ addiu $v0, $zero, 0x14 -/* 17BC7C 8024D39C 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BC80 8024D3A0 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BC84 8024D3A4 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17BC88 8024D3A8 A420F27C */ sh $zero, %lo(D_8029F27C)($at) -/* 17BC8C 8024D3AC 080938DD */ j .L8024E374 -/* 17BC90 8024D3B0 00000000 */ nop -.L8024D3B4_17BC94: -/* 17BC94 8024D3B4 3C108028 */ lui $s0, %hi(CamPreset_I) -/* 17BC98 8024D3B8 26100D58 */ addiu $s0, $s0, %lo(CamPreset_I) -/* 17BC9C 8024D3BC 240200FA */ addiu $v0, $zero, 0xfa -/* 17BCA0 8024D3C0 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BCA4 8024D3C4 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BCA8 8024D3C8 24020008 */ addiu $v0, $zero, 8 -/* 17BCAC 8024D3CC 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BCB0 8024D3D0 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BCB4 8024D3D4 24020014 */ addiu $v0, $zero, 0x14 -/* 17BCB8 8024D3D8 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BCBC 8024D3DC A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BCC0 8024D3E0 2402000E */ addiu $v0, $zero, 0xe -/* 17BCC4 8024D3E4 3C01802A */ lui $at, %hi(D_8029F286) -/* 17BCC8 8024D3E8 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17BCCC 8024D3EC 24020001 */ addiu $v0, $zero, 1 -/* 17BCD0 8024D3F0 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BCD4 8024D3F4 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17BCD8 8024D3F8 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17BCDC 8024D3FC A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17BCE0 8024D400 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17BCE4 8024D404 A022F2A3 */ sb $v0, %lo(D_8029F2A3)($at) -/* 17BCE8 8024D408 3C01802A */ lui $at, %hi(D_8029F2A6) -/* 17BCEC 8024D40C A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) -/* 17BCF0 8024D410 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17BCF4 8024D414 A420F27C */ sh $zero, %lo(D_8029F27C)($at) -/* 17BCF8 8024D418 3C018028 */ lui $at, %hi(D_80280CE0) -/* 17BCFC 8024D41C 080938DD */ j .L8024E374 -/* 17BD00 8024D420 A0220CE0 */ sb $v0, %lo(D_80280CE0)($at) -.L8024D424_17BD04: -/* 17BD04 8024D424 3C108028 */ lui $s0, %hi(CamPreset_J) -/* 17BD08 8024D428 26100E00 */ addiu $s0, $s0, %lo(CamPreset_J) -/* 17BD0C 8024D42C 3C01C2BE */ lui $at, 0xc2be -/* 17BD10 8024D430 44816000 */ mtc1 $at, $f12 -/* 17BD14 8024D434 3C014190 */ lui $at, 0x4190 -/* 17BD18 8024D438 44817000 */ mtc1 $at, $f14 -/* 17BD1C 8024D43C 3C064120 */ lui $a2, 0x4120 -/* 17BD20 8024D440 240200FF */ addiu $v0, $zero, 0xff -/* 17BD24 8024D444 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BD28 8024D448 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BD2C 8024D44C 24020008 */ addiu $v0, $zero, 8 -/* 17BD30 8024D450 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BD34 8024D454 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BD38 8024D458 24020014 */ addiu $v0, $zero, 0x14 -/* 17BD3C 8024D45C 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BD40 8024D460 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BD44 8024D464 2402001D */ addiu $v0, $zero, 0x1d -/* 17BD48 8024D468 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BD4C 8024D46C A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17BD50 8024D470 3C01802A */ lui $at, %hi(D_8029F286) -/* 17BD54 8024D474 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17BD58 8024D478 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17BD5C 8024D47C A020F2A2 */ sb $zero, %lo(D_8029F2A2)($at) -/* 17BD60 8024D480 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17BD64 8024D484 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17BD68 8024D488 0C093948 */ jal btl_cam_set_target_pos -/* 17BD6C 8024D48C 00000000 */ nop -/* 17BD70 8024D490 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17BD74 8024D494 A420F27C */ sh $zero, %lo(D_8029F27C)($at) -/* 17BD78 8024D498 080938DD */ j .L8024E374 -/* 17BD7C 8024D49C 00000000 */ nop -.L8024D4A0_17BD80: -/* 17BD80 8024D4A0 3C108028 */ lui $s0, %hi(CamPreset_J) -/* 17BD84 8024D4A4 26100E00 */ addiu $s0, $s0, %lo(CamPreset_J) -/* 17BD88 8024D4A8 240200E6 */ addiu $v0, $zero, 0xe6 -/* 17BD8C 8024D4AC 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BD90 8024D4B0 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BD94 8024D4B4 24020008 */ addiu $v0, $zero, 8 -/* 17BD98 8024D4B8 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BD9C 8024D4BC A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BDA0 8024D4C0 24020014 */ addiu $v0, $zero, 0x14 -/* 17BDA4 8024D4C4 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BDA8 8024D4C8 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17BDAC 8024D4CC 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BDB0 8024D4D0 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BDB4 8024D4D4 3C01802A */ lui $at, %hi(D_8029F286) -/* 17BDB8 8024D4D8 A420F286 */ sh $zero, %lo(D_8029F286)($at) -/* 17BDBC 8024D4DC 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17BDC0 8024D4E0 A420F27C */ sh $zero, %lo(D_8029F27C)($at) -/* 17BDC4 8024D4E4 080938DD */ j .L8024E374 -/* 17BDC8 8024D4E8 00000000 */ nop -.L8024D4EC_17BDCC: -/* 17BDCC 8024D4EC 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17BDD0 8024D4F0 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17BDD4 8024D4F4 24020136 */ addiu $v0, $zero, 0x136 -/* 17BDD8 8024D4F8 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BDDC 8024D4FC A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BDE0 8024D500 24020008 */ addiu $v0, $zero, 8 -/* 17BDE4 8024D504 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BDE8 8024D508 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BDEC 8024D50C 2402001E */ addiu $v0, $zero, 0x1e -/* 17BDF0 8024D510 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BDF4 8024D514 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BDF8 8024D518 24020010 */ addiu $v0, $zero, 0x10 -/* 17BDFC 8024D51C 3C01802A */ lui $at, %hi(D_8029F286) -/* 17BE00 8024D520 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17BE04 8024D524 24020001 */ addiu $v0, $zero, 1 -/* 17BE08 8024D528 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BE0C 8024D52C A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17BE10 8024D530 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17BE14 8024D534 A420F27C */ sh $zero, %lo(D_8029F27C)($at) -/* 17BE18 8024D538 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17BE1C 8024D53C A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17BE20 8024D540 0809369A */ j .L8024DA68 -/* 17BE24 8024D544 00000000 */ nop -.L8024D548_17BE28: -/* 17BE28 8024D548 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17BE2C 8024D54C 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17BE30 8024D550 24020140 */ addiu $v0, $zero, 0x140 -/* 17BE34 8024D554 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BE38 8024D558 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BE3C 8024D55C 24020008 */ addiu $v0, $zero, 8 -/* 17BE40 8024D560 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BE44 8024D564 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BE48 8024D568 24020005 */ addiu $v0, $zero, 5 -/* 17BE4C 8024D56C 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BE50 8024D570 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BE54 8024D574 24020001 */ addiu $v0, $zero, 1 -/* 17BE58 8024D578 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BE5C 8024D57C A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17BE60 8024D580 3C01802A */ lui $at, %hi(D_8029F286) -/* 17BE64 8024D584 A420F286 */ sh $zero, %lo(D_8029F286)($at) -/* 17BE68 8024D588 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17BE6C 8024D58C A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17BE70 8024D590 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17BE74 8024D594 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17BE78 8024D598 08093659 */ j .L8024D964 -/* 17BE7C 8024D59C 00000000 */ nop -.L8024D5A0_17BE80: -/* 17BE80 8024D5A0 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17BE84 8024D5A4 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17BE88 8024D5A8 24020154 */ addiu $v0, $zero, 0x154 -/* 17BE8C 8024D5AC 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BE90 8024D5B0 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BE94 8024D5B4 24020008 */ addiu $v0, $zero, 8 -/* 17BE98 8024D5B8 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BE9C 8024D5BC A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BEA0 8024D5C0 24020005 */ addiu $v0, $zero, 5 -/* 17BEA4 8024D5C4 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BEA8 8024D5C8 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BEAC 8024D5CC 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BEB0 8024D5D0 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17BEB4 8024D5D4 3C01802A */ lui $at, %hi(D_8029F286) -/* 17BEB8 8024D5D8 A420F286 */ sh $zero, %lo(D_8029F286)($at) -/* 17BEBC 8024D5DC 080935C6 */ j .L8024D718 -/* 17BEC0 8024D5E0 24020001 */ addiu $v0, $zero, 1 -.L8024D5E4_17BEC4: -/* 17BEC4 8024D5E4 3C108028 */ lui $s0, %hi(CamPreset_I) -/* 17BEC8 8024D5E8 26100D58 */ addiu $s0, $s0, %lo(CamPreset_I) -/* 17BECC 8024D5EC 2402012C */ addiu $v0, $zero, 0x12c -/* 17BED0 8024D5F0 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BED4 8024D5F4 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BED8 8024D5F8 24020008 */ addiu $v0, $zero, 8 -/* 17BEDC 8024D5FC 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BEE0 8024D600 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BEE4 8024D604 2402000F */ addiu $v0, $zero, 0xf -/* 17BEE8 8024D608 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BEEC 8024D60C A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BEF0 8024D610 2402FFE0 */ addiu $v0, $zero, -0x20 -/* 17BEF4 8024D614 3C01802A */ lui $at, %hi(D_8029F286) -/* 17BEF8 8024D618 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17BEFC 8024D61C 24020014 */ addiu $v0, $zero, 0x14 -/* 17BF00 8024D620 3C01802A */ lui $at, %hi(D_8029F2A7) -/* 17BF04 8024D624 A022F2A7 */ sb $v0, %lo(D_8029F2A7)($at) -/* 17BF08 8024D628 24020001 */ addiu $v0, $zero, 1 -/* 17BF0C 8024D62C 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BF10 8024D630 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17BF14 8024D634 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17BF18 8024D638 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17BF1C 8024D63C 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17BF20 8024D640 A022F2A3 */ sb $v0, %lo(D_8029F2A3)($at) -/* 17BF24 8024D644 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17BF28 8024D648 A420F27C */ sh $zero, %lo(D_8029F27C)($at) -/* 17BF2C 8024D64C 080938DD */ j .L8024E374 -/* 17BF30 8024D650 00000000 */ nop -.L8024D654_17BF34: -/* 17BF34 8024D654 3C108028 */ lui $s0, %hi(CamPreset_N) -/* 17BF38 8024D658 26100D90 */ addiu $s0, $s0, %lo(CamPreset_N) -/* 17BF3C 8024D65C 3C01C282 */ lui $at, 0xc282 -/* 17BF40 8024D660 44810000 */ mtc1 $at, $f0 -/* 17BF44 8024D664 3C0141F0 */ lui $at, 0x41f0 -/* 17BF48 8024D668 44811000 */ mtc1 $at, $f2 -/* 17BF4C 8024D66C 2402012C */ addiu $v0, $zero, 0x12c -/* 17BF50 8024D670 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BF54 8024D674 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BF58 8024D678 24020008 */ addiu $v0, $zero, 8 -/* 17BF5C 8024D67C 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BF60 8024D680 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BF64 8024D684 2402000A */ addiu $v0, $zero, 0xa -/* 17BF68 8024D688 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BF6C 8024D68C A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17BF70 8024D690 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BF74 8024D694 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BF78 8024D698 08093825 */ j .L8024E094 -/* 17BF7C 8024D69C 00000000 */ nop -.L8024D6A0_17BF80: -/* 17BF80 8024D6A0 3C108028 */ lui $s0, %hi(CamPreset_I) -/* 17BF84 8024D6A4 26100D58 */ addiu $s0, $s0, %lo(CamPreset_I) -/* 17BF88 8024D6A8 240200DC */ addiu $v0, $zero, 0xdc -/* 17BF8C 8024D6AC 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BF90 8024D6B0 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BF94 8024D6B4 24020008 */ addiu $v0, $zero, 8 -/* 17BF98 8024D6B8 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BF9C 8024D6BC A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BFA0 8024D6C0 2402001E */ addiu $v0, $zero, 0x1e -/* 17BFA4 8024D6C4 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BFA8 8024D6C8 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BFAC 8024D6CC 08093650 */ j .L8024D940 -/* 17BFB0 8024D6D0 24020018 */ addiu $v0, $zero, 0x18 -.L8024D6D4_17BFB4: -/* 17BFB4 8024D6D4 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17BFB8 8024D6D8 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17BFBC 8024D6DC 24020118 */ addiu $v0, $zero, 0x118 -/* 17BFC0 8024D6E0 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BFC4 8024D6E4 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17BFC8 8024D6E8 24020008 */ addiu $v0, $zero, 8 -/* 17BFCC 8024D6EC 3C01802A */ lui $at, %hi(D_8029F284) -/* 17BFD0 8024D6F0 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17BFD4 8024D6F4 2402001E */ addiu $v0, $zero, 0x1e -/* 17BFD8 8024D6F8 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17BFDC 8024D6FC A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17BFE0 8024D700 2402FFFC */ addiu $v0, $zero, -4 -/* 17BFE4 8024D704 3C01802A */ lui $at, %hi(D_8029F286) -/* 17BFE8 8024D708 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17BFEC 8024D70C 24020001 */ addiu $v0, $zero, 1 -/* 17BFF0 8024D710 3C01802A */ lui $at, %hi(D_8029F282) -/* 17BFF4 8024D714 A420F282 */ sh $zero, %lo(D_8029F282)($at) -.L8024D718: -/* 17BFF8 8024D718 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17BFFC 8024D71C A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C000 8024D720 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C004 8024D724 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17C008 8024D728 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17C00C 8024D72C A420F27C */ sh $zero, %lo(D_8029F27C)($at) -/* 17C010 8024D730 3C01802A */ lui $at, %hi(D_8029F2A6) -/* 17C014 8024D734 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) -/* 17C018 8024D738 080938DD */ j .L8024E374 -/* 17C01C 8024D73C 00000000 */ nop -.L8024D740_17C020: -/* 17C020 8024D740 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C024 8024D744 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C028 8024D748 2402017C */ addiu $v0, $zero, 0x17c -/* 17C02C 8024D74C 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C030 8024D750 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C034 8024D754 24020008 */ addiu $v0, $zero, 8 -/* 17C038 8024D758 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C03C 8024D75C A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C040 8024D760 2402003C */ addiu $v0, $zero, 0x3c -/* 17C044 8024D764 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C048 8024D768 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C04C 8024D76C 24020001 */ addiu $v0, $zero, 1 -/* 17C050 8024D770 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C054 8024D774 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C058 8024D778 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C05C 8024D77C A420F286 */ sh $zero, %lo(D_8029F286)($at) -/* 17C060 8024D780 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C064 8024D784 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C068 8024D788 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C06C 8024D78C A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17C070 8024D790 3C01802A */ lui $at, %hi(D_8029F2A5) -/* 17C074 8024D794 A022F2A5 */ sb $v0, %lo(D_8029F2A5)($at) -/* 17C078 8024D798 08093659 */ j .L8024D964 -/* 17C07C 8024D79C 00000000 */ nop -.L8024D7A0_17C080: -/* 17C080 8024D7A0 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C084 8024D7A4 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C088 8024D7A8 24020140 */ addiu $v0, $zero, 0x140 -/* 17C08C 8024D7AC 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C090 8024D7B0 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C094 8024D7B4 24020008 */ addiu $v0, $zero, 8 -/* 17C098 8024D7B8 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C09C 8024D7BC A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C0A0 8024D7C0 2402001E */ addiu $v0, $zero, 0x1e -/* 17C0A4 8024D7C4 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C0A8 8024D7C8 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C0AC 8024D7CC 2402FFFC */ addiu $v0, $zero, -4 -/* 17C0B0 8024D7D0 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C0B4 8024D7D4 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C0B8 8024D7D8 24020001 */ addiu $v0, $zero, 1 -/* 17C0BC 8024D7DC 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C0C0 8024D7E0 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C0C4 8024D7E4 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C0C8 8024D7E8 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C0CC 8024D7EC 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C0D0 8024D7F0 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17C0D4 8024D7F4 08093659 */ j .L8024D964 -/* 17C0D8 8024D7F8 00000000 */ nop -.L8024D7FC_17C0DC: -/* 17C0DC 8024D7FC 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C0E0 8024D800 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C0E4 8024D804 2402012C */ addiu $v0, $zero, 0x12c -/* 17C0E8 8024D808 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C0EC 8024D80C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C0F0 8024D810 24020008 */ addiu $v0, $zero, 8 -/* 17C0F4 8024D814 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C0F8 8024D818 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C0FC 8024D81C 2402003C */ addiu $v0, $zero, 0x3c -/* 17C100 8024D820 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C104 8024D824 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C108 8024D828 24020001 */ addiu $v0, $zero, 1 -/* 17C10C 8024D82C 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C110 8024D830 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C114 8024D834 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C118 8024D838 A420F286 */ sh $zero, %lo(D_8029F286)($at) -/* 17C11C 8024D83C 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C120 8024D840 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C124 8024D844 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C128 8024D848 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17C12C 8024D84C 3C01802A */ lui $at, %hi(D_8029F2A5) -/* 17C130 8024D850 A022F2A5 */ sb $v0, %lo(D_8029F2A5)($at) -/* 17C134 8024D854 08093659 */ j .L8024D964 -/* 17C138 8024D858 00000000 */ nop -.L8024D85C_17C13C: -/* 17C13C 8024D85C 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C140 8024D860 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C144 8024D864 24020140 */ addiu $v0, $zero, 0x140 -/* 17C148 8024D868 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C14C 8024D86C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C150 8024D870 24020008 */ addiu $v0, $zero, 8 -/* 17C154 8024D874 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C158 8024D878 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C15C 8024D87C 2402001E */ addiu $v0, $zero, 0x1e -/* 17C160 8024D880 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C164 8024D884 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C168 8024D888 2402FFFC */ addiu $v0, $zero, -4 -/* 17C16C 8024D88C 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C170 8024D890 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C174 8024D894 24020001 */ addiu $v0, $zero, 1 -/* 17C178 8024D898 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C17C 8024D89C A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C180 8024D8A0 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C184 8024D8A4 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C188 8024D8A8 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C18C 8024D8AC A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17C190 8024D8B0 08093659 */ j .L8024D964 -/* 17C194 8024D8B4 00000000 */ nop -.L8024D8B8_17C198: -/* 17C198 8024D8B8 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C19C 8024D8BC 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C1A0 8024D8C0 24020140 */ addiu $v0, $zero, 0x140 -/* 17C1A4 8024D8C4 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C1A8 8024D8C8 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C1AC 8024D8CC 24020008 */ addiu $v0, $zero, 8 -/* 17C1B0 8024D8D0 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C1B4 8024D8D4 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C1B8 8024D8D8 2402001E */ addiu $v0, $zero, 0x1e -/* 17C1BC 8024D8DC 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C1C0 8024D8E0 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C1C4 8024D8E4 24020001 */ addiu $v0, $zero, 1 -/* 17C1C8 8024D8E8 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C1CC 8024D8EC A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C1D0 8024D8F0 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C1D4 8024D8F4 A420F286 */ sh $zero, %lo(D_8029F286)($at) -/* 17C1D8 8024D8F8 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C1DC 8024D8FC A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C1E0 8024D900 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C1E4 8024D904 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17C1E8 8024D908 08093659 */ j .L8024D964 -/* 17C1EC 8024D90C 00000000 */ nop -.L8024D910_17C1F0: -/* 17C1F0 8024D910 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C1F4 8024D914 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C1F8 8024D918 24020168 */ addiu $v0, $zero, 0x168 -/* 17C1FC 8024D91C 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C200 8024D920 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C204 8024D924 24020008 */ addiu $v0, $zero, 8 -/* 17C208 8024D928 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C20C 8024D92C A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C210 8024D930 24020014 */ addiu $v0, $zero, 0x14 -/* 17C214 8024D934 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C218 8024D938 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C21C 8024D93C 2402FFFC */ addiu $v0, $zero, -4 -.L8024D940: -/* 17C220 8024D940 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C224 8024D944 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C228 8024D948 24020001 */ addiu $v0, $zero, 1 -/* 17C22C 8024D94C 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C230 8024D950 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C234 8024D954 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C238 8024D958 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C23C 8024D95C 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C240 8024D960 A022F2A3 */ sb $v0, %lo(D_8029F2A3)($at) -.L8024D964: -/* 17C244 8024D964 3C01802A */ lui $at, %hi(D_8029F2A6) -/* 17C248 8024D968 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) -/* 17C24C 8024D96C 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17C250 8024D970 A420F27C */ sh $zero, %lo(D_8029F27C)($at) -/* 17C254 8024D974 080938DD */ j .L8024E374 -/* 17C258 8024D978 00000000 */ nop -.L8024D97C_17C25C: -/* 17C25C 8024D97C 3C10802A */ lui $s0, %hi(D_8029F2B4) -/* 17C260 8024D980 8E10F2B4 */ lw $s0, %lo(D_8029F2B4)($s0) -/* 17C264 8024D984 240200C8 */ addiu $v0, $zero, 0xc8 -/* 17C268 8024D988 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C26C 8024D98C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C270 8024D990 24020007 */ addiu $v0, $zero, 7 -/* 17C274 8024D994 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C278 8024D998 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C27C 8024D99C 3C01802A */ lui $at, %hi(D_8029F2A0) -/* 17C280 8024D9A0 A422F2A0 */ sh $v0, %lo(D_8029F2A0)($at) -/* 17C284 8024D9A4 3C01802A */ lui $at, %hi(D_8029F29C) -/* 17C288 8024D9A8 A020F29C */ sb $zero, %lo(D_8029F29C)($at) -/* 17C28C 8024D9AC 3C01802A */ lui $at, %hi(D_8029F2A6) -/* 17C290 8024D9B0 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) -/* 17C294 8024D9B4 080938DD */ j .L8024E374 -/* 17C298 8024D9B8 00000000 */ nop -.L8024D9BC_17C29C: -/* 17C29C 8024D9BC 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C2A0 8024D9C0 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C2A4 8024D9C4 240200D6 */ addiu $v0, $zero, 0xd6 -/* 17C2A8 8024D9C8 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C2AC 8024D9CC A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C2B0 8024D9D0 24020008 */ addiu $v0, $zero, 8 -/* 17C2B4 8024D9D4 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C2B8 8024D9D8 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C2BC 8024D9DC 24020014 */ addiu $v0, $zero, 0x14 -/* 17C2C0 8024D9E0 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C2C4 8024D9E4 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C2C8 8024D9E8 24020010 */ addiu $v0, $zero, 0x10 -/* 17C2CC 8024D9EC 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C2D0 8024D9F0 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C2D4 8024D9F4 2402FFFE */ addiu $v0, $zero, -2 -/* 17C2D8 8024D9F8 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C2DC 8024D9FC A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C2E0 8024DA00 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C2E4 8024DA04 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C2E8 8024DA08 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17C2EC 8024DA0C A420F27C */ sh $zero, %lo(D_8029F27C)($at) -/* 17C2F0 8024DA10 0809369A */ j .L8024DA68 -/* 17C2F4 8024DA14 24020001 */ addiu $v0, $zero, 1 -.L8024DA18_17C2F8: -/* 17C2F8 8024DA18 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C2FC 8024DA1C 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C300 8024DA20 2402012C */ addiu $v0, $zero, 0x12c -/* 17C304 8024DA24 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C308 8024DA28 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C30C 8024DA2C 24020008 */ addiu $v0, $zero, 8 -/* 17C310 8024DA30 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C314 8024DA34 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C318 8024DA38 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C31C 8024DA3C A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C320 8024DA40 24020010 */ addiu $v0, $zero, 0x10 -/* 17C324 8024DA44 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C328 8024DA48 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C32C 8024DA4C 24020001 */ addiu $v0, $zero, 1 -/* 17C330 8024DA50 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C334 8024DA54 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C338 8024DA58 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17C33C 8024DA5C A420F27C */ sh $zero, %lo(D_8029F27C)($at) -/* 17C340 8024DA60 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C344 8024DA64 A020F2A2 */ sb $zero, %lo(D_8029F2A2)($at) -.L8024DA68: -/* 17C348 8024DA68 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C34C 8024DA6C A022F2A3 */ sb $v0, %lo(D_8029F2A3)($at) -/* 17C350 8024DA70 3C01802A */ lui $at, %hi(D_8029F2A6) -/* 17C354 8024DA74 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) -/* 17C358 8024DA78 080938DD */ j .L8024E374 -/* 17C35C 8024DA7C 00000000 */ nop -.L8024DA80_17C360: -/* 17C360 8024DA80 3C108028 */ lui $s0, %hi(CamPreset_N) -/* 17C364 8024DA84 26100D90 */ addiu $s0, $s0, %lo(CamPreset_N) -/* 17C368 8024DA88 3C014270 */ lui $at, 0x4270 -/* 17C36C 8024DA8C 44810000 */ mtc1 $at, $f0 -/* 17C370 8024DA90 3C014220 */ lui $at, 0x4220 -/* 17C374 8024DA94 44811000 */ mtc1 $at, $f2 -/* 17C378 8024DA98 240201AE */ addiu $v0, $zero, 0x1ae -/* 17C37C 8024DA9C 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C380 8024DAA0 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C384 8024DAA4 24020008 */ addiu $v0, $zero, 8 -/* 17C388 8024DAA8 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C38C 8024DAAC A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C390 8024DAB0 2402000A */ addiu $v0, $zero, 0xa -/* 17C394 8024DAB4 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C398 8024DAB8 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C39C 8024DABC 24020010 */ addiu $v0, $zero, 0x10 -/* 17C3A0 8024DAC0 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C3A4 8024DAC4 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C3A8 8024DAC8 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C3AC 8024DACC A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C3B0 8024DAD0 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17C3B4 8024DAD4 A420F27C */ sh $zero, %lo(D_8029F27C)($at) -/* 17C3B8 8024DAD8 08093827 */ j .L8024E09C -/* 17C3BC 8024DADC 00000000 */ nop -.L8024DAE0_17C3C0: -/* 17C3C0 8024DAE0 3C108028 */ lui $s0, %hi(CamPreset_N) -/* 17C3C4 8024DAE4 26100D90 */ addiu $s0, $s0, %lo(CamPreset_N) -/* 17C3C8 8024DAE8 3C014270 */ lui $at, 0x4270 -/* 17C3CC 8024DAEC 44810000 */ mtc1 $at, $f0 -/* 17C3D0 8024DAF0 3C014220 */ lui $at, 0x4220 -/* 17C3D4 8024DAF4 44811000 */ mtc1 $at, $f2 -/* 17C3D8 8024DAF8 240201CC */ addiu $v0, $zero, 0x1cc -/* 17C3DC 8024DAFC 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C3E0 8024DB00 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C3E4 8024DB04 24020008 */ addiu $v0, $zero, 8 -/* 17C3E8 8024DB08 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C3EC 8024DB0C A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C3F0 8024DB10 2402000A */ addiu $v0, $zero, 0xa -/* 17C3F4 8024DB14 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C3F8 8024DB18 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C3FC 8024DB1C 2402001B */ addiu $v0, $zero, 0x1b -/* 17C400 8024DB20 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C404 8024DB24 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C408 8024DB28 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C40C 8024DB2C A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C410 8024DB30 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17C414 8024DB34 A420F27C */ sh $zero, %lo(D_8029F27C)($at) -/* 17C418 8024DB38 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C41C 8024DB3C A020F2A2 */ sb $zero, %lo(D_8029F2A2)($at) -/* 17C420 8024DB40 0809382B */ j .L8024E0AC -/* 17C424 8024DB44 00000000 */ nop -.L8024DB48_17C428: -/* 17C428 8024DB48 3C108028 */ lui $s0, %hi(CamPreset_J) -/* 17C42C 8024DB4C 26100E00 */ addiu $s0, $s0, %lo(CamPreset_J) -/* 17C430 8024DB50 3C01C28C */ lui $at, 0xc28c -/* 17C434 8024DB54 44816000 */ mtc1 $at, $f12 -/* 17C438 8024DB58 44800000 */ mtc1 $zero, $f0 -/* 17C43C 8024DB5C 24020186 */ addiu $v0, $zero, 0x186 -/* 17C440 8024DB60 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C444 8024DB64 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C448 8024DB68 44060000 */ mfc1 $a2, $f0 -/* 17C44C 8024DB6C 24020008 */ addiu $v0, $zero, 8 -/* 17C450 8024DB70 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C454 8024DB74 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C458 8024DB78 44867000 */ mtc1 $a2, $f14 -/* 17C45C 8024DB7C 2402002D */ addiu $v0, $zero, 0x2d -/* 17C460 8024DB80 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C464 8024DB84 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C468 8024DB88 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C46C 8024DB8C A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C470 8024DB90 0C093948 */ jal btl_cam_set_target_pos -/* 17C474 8024DB94 00000000 */ nop -/* 17C478 8024DB98 08093710 */ j .L8024DC40 -/* 17C47C 8024DB9C 2402000A */ addiu $v0, $zero, 0xa -.L8024DBA0_17C480: -/* 17C480 8024DBA0 3C108028 */ lui $s0, %hi(CamPreset_J) -/* 17C484 8024DBA4 26100E00 */ addiu $s0, $s0, %lo(CamPreset_J) -/* 17C488 8024DBA8 44806000 */ mtc1 $zero, $f12 -/* 17C48C 8024DBAC 240201F4 */ addiu $v0, $zero, 0x1f4 -/* 17C490 8024DBB0 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C494 8024DBB4 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C498 8024DBB8 24020008 */ addiu $v0, $zero, 8 -/* 17C49C 8024DBBC 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C4A0 8024DBC0 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C4A4 8024DBC4 2402002D */ addiu $v0, $zero, 0x2d -/* 17C4A8 8024DBC8 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C4AC 8024DBCC A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C4B0 8024DBD0 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C4B4 8024DBD4 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C4B8 8024DBD8 44066000 */ mfc1 $a2, $f12 -/* 17C4BC 8024DBDC 0C093948 */ jal btl_cam_set_target_pos -/* 17C4C0 8024DBE0 46006386 */ mov.s $f14, $f12 -/* 17C4C4 8024DBE4 08093710 */ j .L8024DC40 -/* 17C4C8 8024DBE8 24020028 */ addiu $v0, $zero, 0x28 -.L8024DBEC_17C4CC: -/* 17C4CC 8024DBEC 3C108028 */ lui $s0, %hi(CamPreset_J) -/* 17C4D0 8024DBF0 26100E00 */ addiu $s0, $s0, %lo(CamPreset_J) -/* 17C4D4 8024DBF4 3C01C248 */ lui $at, 0xc248 -/* 17C4D8 8024DBF8 44816000 */ mtc1 $at, $f12 -/* 17C4DC 8024DBFC 44800000 */ mtc1 $zero, $f0 -/* 17C4E0 8024DC00 2402012C */ addiu $v0, $zero, 0x12c -/* 17C4E4 8024DC04 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C4E8 8024DC08 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C4EC 8024DC0C 44060000 */ mfc1 $a2, $f0 -/* 17C4F0 8024DC10 24020008 */ addiu $v0, $zero, 8 -/* 17C4F4 8024DC14 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C4F8 8024DC18 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C4FC 8024DC1C 44867000 */ mtc1 $a2, $f14 -/* 17C500 8024DC20 2402002D */ addiu $v0, $zero, 0x2d -/* 17C504 8024DC24 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C508 8024DC28 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C50C 8024DC2C 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C510 8024DC30 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C514 8024DC34 0C093948 */ jal btl_cam_set_target_pos -/* 17C518 8024DC38 00000000 */ nop -/* 17C51C 8024DC3C 24020014 */ addiu $v0, $zero, 0x14 -.L8024DC40: -/* 17C520 8024DC40 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C524 8024DC44 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C528 8024DC48 3C01802A */ lui $at, %hi(D_8029F2A6) -/* 17C52C 8024DC4C A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) -/* 17C530 8024DC50 080938DD */ j .L8024E374 -/* 17C534 8024DC54 00000000 */ nop -.L8024DC58_17C538: -/* 17C538 8024DC58 3C108028 */ lui $s0, %hi(CamPreset_N) -/* 17C53C 8024DC5C 26100D90 */ addiu $s0, $s0, %lo(CamPreset_N) -/* 17C540 8024DC60 3C01C296 */ lui $at, 0xc296 -/* 17C544 8024DC64 44810000 */ mtc1 $at, $f0 -/* 17C548 8024DC68 3C014316 */ lui $at, 0x4316 -/* 17C54C 8024DC6C 44811000 */ mtc1 $at, $f2 -/* 17C550 8024DC70 240200A6 */ addiu $v0, $zero, 0xa6 -/* 17C554 8024DC74 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C558 8024DC78 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C55C 8024DC7C 24020008 */ addiu $v0, $zero, 8 -/* 17C560 8024DC80 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C564 8024DC84 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C568 8024DC88 24020001 */ addiu $v0, $zero, 1 -/* 17C56C 8024DC8C 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C570 8024DC90 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C574 8024DC94 08093823 */ j .L8024E08C -/* 17C578 8024DC98 24020011 */ addiu $v0, $zero, 0x11 -.L8024DC9C_17C57C: -/* 17C57C 8024DC9C 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C580 8024DCA0 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C584 8024DCA4 24020136 */ addiu $v0, $zero, 0x136 -/* 17C588 8024DCA8 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C58C 8024DCAC A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C590 8024DCB0 24020008 */ addiu $v0, $zero, 8 -/* 17C594 8024DCB4 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C598 8024DCB8 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C59C 8024DCBC 2402001E */ addiu $v0, $zero, 0x1e -/* 17C5A0 8024DCC0 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C5A4 8024DCC4 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C5A8 8024DCC8 24020010 */ addiu $v0, $zero, 0x10 -/* 17C5AC 8024DCCC 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C5B0 8024DCD0 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C5B4 8024DCD4 24020001 */ addiu $v0, $zero, 1 -/* 17C5B8 8024DCD8 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C5BC 8024DCDC A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C5C0 8024DCE0 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C5C4 8024DCE4 A022F2A3 */ sb $v0, %lo(D_8029F2A3)($at) -/* 17C5C8 8024DCE8 08093849 */ j .L8024E124 -/* 17C5CC 8024DCEC 24020100 */ addiu $v0, $zero, 0x100 -.L8024DCF0_17C5D0: -/* 17C5D0 8024DCF0 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C5D4 8024DCF4 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C5D8 8024DCF8 240200FA */ addiu $v0, $zero, 0xfa -/* 17C5DC 8024DCFC 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C5E0 8024DD00 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C5E4 8024DD04 24020008 */ addiu $v0, $zero, 8 -/* 17C5E8 8024DD08 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C5EC 8024DD0C A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C5F0 8024DD10 24020078 */ addiu $v0, $zero, 0x78 -/* 17C5F4 8024DD14 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C5F8 8024DD18 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C5FC 8024DD1C 24020010 */ addiu $v0, $zero, 0x10 -/* 17C600 8024DD20 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C604 8024DD24 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C608 8024DD28 24020001 */ addiu $v0, $zero, 1 -/* 17C60C 8024DD2C 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C610 8024DD30 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C614 8024DD34 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C618 8024DD38 A022F2A3 */ sb $v0, %lo(D_8029F2A3)($at) -/* 17C61C 8024DD3C 3C01802A */ lui $at, %hi(D_8029F2A5) -/* 17C620 8024DD40 A022F2A5 */ sb $v0, %lo(D_8029F2A5)($at) -/* 17C624 8024DD44 080937CF */ j .L8024DF3C -/* 17C628 8024DD48 24020100 */ addiu $v0, $zero, 0x100 -.L8024DD4C_17C62C: -/* 17C62C 8024DD4C 3C108028 */ lui $s0, %hi(CamPreset_I) -/* 17C630 8024DD50 26100D58 */ addiu $s0, $s0, %lo(CamPreset_I) -/* 17C634 8024DD54 2402012C */ addiu $v0, $zero, 0x12c -/* 17C638 8024DD58 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C63C 8024DD5C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C640 8024DD60 24020008 */ addiu $v0, $zero, 8 -/* 17C644 8024DD64 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C648 8024DD68 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C64C 8024DD6C 24020078 */ addiu $v0, $zero, 0x78 -/* 17C650 8024DD70 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C654 8024DD74 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C658 8024DD78 24020010 */ addiu $v0, $zero, 0x10 -/* 17C65C 8024DD7C 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C660 8024DD80 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C664 8024DD84 24020001 */ addiu $v0, $zero, 1 -/* 17C668 8024DD88 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C66C 8024DD8C A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C670 8024DD90 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C674 8024DD94 A022F2A3 */ sb $v0, %lo(D_8029F2A3)($at) -/* 17C678 8024DD98 3C01802A */ lui $at, %hi(D_8029F2A5) -/* 17C67C 8024DD9C A022F2A5 */ sb $v0, %lo(D_8029F2A5)($at) -/* 17C680 8024DDA0 080937CF */ j .L8024DF3C -/* 17C684 8024DDA4 24020100 */ addiu $v0, $zero, 0x100 -.L8024DDA8_17C688: -/* 17C688 8024DDA8 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C68C 8024DDAC 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C690 8024DDB0 24020140 */ addiu $v0, $zero, 0x140 -/* 17C694 8024DDB4 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C698 8024DDB8 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C69C 8024DDBC 24020008 */ addiu $v0, $zero, 8 -/* 17C6A0 8024DDC0 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C6A4 8024DDC4 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C6A8 8024DDC8 24020005 */ addiu $v0, $zero, 5 -/* 17C6AC 8024DDCC 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C6B0 8024DDD0 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C6B4 8024DDD4 24020001 */ addiu $v0, $zero, 1 -/* 17C6B8 8024DDD8 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C6BC 8024DDDC A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C6C0 8024DDE0 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C6C4 8024DDE4 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C6C8 8024DDE8 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C6CC 8024DDEC A420F286 */ sh $zero, %lo(D_8029F286)($at) -/* 17C6D0 8024DDF0 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C6D4 8024DDF4 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17C6D8 8024DDF8 0809384B */ j .L8024E12C -/* 17C6DC 8024DDFC 24020100 */ addiu $v0, $zero, 0x100 -.L8024DE00_17C6E0: -/* 17C6E0 8024DE00 3C108028 */ lui $s0, %hi(CamPreset_D) -/* 17C6E4 8024DE04 26100DC8 */ addiu $s0, $s0, %lo(CamPreset_D) -/* 17C6E8 8024DE08 24020032 */ addiu $v0, $zero, 0x32 -/* 17C6EC 8024DE0C 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C6F0 8024DE10 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C6F4 8024DE14 240201F4 */ addiu $v0, $zero, 0x1f4 -/* 17C6F8 8024DE18 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C6FC 8024DE1C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C700 8024DE20 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C704 8024DE24 A420F286 */ sh $zero, %lo(D_8029F286)($at) -/* 17C708 8024DE28 080938DD */ j .L8024E374 -/* 17C70C 8024DE2C 00000000 */ nop -.L8024DE30_17C710: -/* 17C710 8024DE30 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C714 8024DE34 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C718 8024DE38 24020118 */ addiu $v0, $zero, 0x118 -/* 17C71C 8024DE3C 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C720 8024DE40 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C724 8024DE44 24020008 */ addiu $v0, $zero, 8 -/* 17C728 8024DE48 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C72C 8024DE4C A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C730 8024DE50 2402001E */ addiu $v0, $zero, 0x1e -/* 17C734 8024DE54 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C738 8024DE58 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C73C 8024DE5C 2402FFFC */ addiu $v0, $zero, -4 -/* 17C740 8024DE60 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C744 8024DE64 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C748 8024DE68 24020001 */ addiu $v0, $zero, 1 -/* 17C74C 8024DE6C 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C750 8024DE70 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C754 8024DE74 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C758 8024DE78 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C75C 8024DE7C 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C760 8024DE80 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17C764 8024DE84 080937D1 */ j .L8024DF44 -/* 17C768 8024DE88 24020100 */ addiu $v0, $zero, 0x100 -.L8024DE8C_17C76C: -/* 17C76C 8024DE8C 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C770 8024DE90 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C774 8024DE94 2402017C */ addiu $v0, $zero, 0x17c -/* 17C778 8024DE98 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C77C 8024DE9C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C780 8024DEA0 24020008 */ addiu $v0, $zero, 8 -/* 17C784 8024DEA4 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C788 8024DEA8 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C78C 8024DEAC 2402003C */ addiu $v0, $zero, 0x3c -/* 17C790 8024DEB0 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C794 8024DEB4 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C798 8024DEB8 24020001 */ addiu $v0, $zero, 1 -/* 17C79C 8024DEBC 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C7A0 8024DEC0 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C7A4 8024DEC4 3C01802A */ lui $at, %hi(D_8029F2A5) -/* 17C7A8 8024DEC8 A022F2A5 */ sb $v0, %lo(D_8029F2A5)($at) -/* 17C7AC 8024DECC 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C7B0 8024DED0 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C7B4 8024DED4 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C7B8 8024DED8 A420F286 */ sh $zero, %lo(D_8029F286)($at) -/* 17C7BC 8024DEDC 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C7C0 8024DEE0 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17C7C4 8024DEE4 080937D1 */ j .L8024DF44 -/* 17C7C8 8024DEE8 24020100 */ addiu $v0, $zero, 0x100 -.L8024DEEC_17C7CC: -/* 17C7CC 8024DEEC 3C108028 */ lui $s0, %hi(CamPreset_I) -/* 17C7D0 8024DEF0 26100D58 */ addiu $s0, $s0, %lo(CamPreset_I) -/* 17C7D4 8024DEF4 240200DC */ addiu $v0, $zero, 0xdc -/* 17C7D8 8024DEF8 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C7DC 8024DEFC A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C7E0 8024DF00 24020008 */ addiu $v0, $zero, 8 -/* 17C7E4 8024DF04 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C7E8 8024DF08 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C7EC 8024DF0C 2402001E */ addiu $v0, $zero, 0x1e -/* 17C7F0 8024DF10 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C7F4 8024DF14 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C7F8 8024DF18 24020018 */ addiu $v0, $zero, 0x18 -/* 17C7FC 8024DF1C 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C800 8024DF20 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C804 8024DF24 24020001 */ addiu $v0, $zero, 1 -/* 17C808 8024DF28 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C80C 8024DF2C A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C810 8024DF30 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C814 8024DF34 A022F2A3 */ sb $v0, %lo(D_8029F2A3)($at) -/* 17C818 8024DF38 24020100 */ addiu $v0, $zero, 0x100 -.L8024DF3C: -/* 17C81C 8024DF3C 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C820 8024DF40 A420F282 */ sh $zero, %lo(D_8029F282)($at) -.L8024DF44: -/* 17C824 8024DF44 3C01802A */ lui $at, %hi(D_8029F2A6) -/* 17C828 8024DF48 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) -/* 17C82C 8024DF4C 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17C830 8024DF50 A422F27C */ sh $v0, %lo(D_8029F27C)($at) -/* 17C834 8024DF54 080938DD */ j .L8024E374 -/* 17C838 8024DF58 00000000 */ nop -.L8024DF5C_17C83C: -/* 17C83C 8024DF5C 3C108028 */ lui $s0, %hi(CamPreset_N) -/* 17C840 8024DF60 26100D90 */ addiu $s0, $s0, %lo(CamPreset_N) -/* 17C844 8024DF64 3C01C2BE */ lui $at, 0xc2be -/* 17C848 8024DF68 44810000 */ mtc1 $at, $f0 -/* 17C84C 8024DF6C 3C0141B0 */ lui $at, 0x41b0 -/* 17C850 8024DF70 44811000 */ mtc1 $at, $f2 -/* 17C854 8024DF74 240200D2 */ addiu $v0, $zero, 0xd2 -/* 17C858 8024DF78 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C85C 8024DF7C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C860 8024DF80 24020008 */ addiu $v0, $zero, 8 -/* 17C864 8024DF84 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C868 8024DF88 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C86C 8024DF8C 08093820 */ j .L8024E080 -/* 17C870 8024DF90 24020014 */ addiu $v0, $zero, 0x14 -.L8024DF94_17C874: -/* 17C874 8024DF94 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C878 8024DF98 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C87C 8024DF9C 24020140 */ addiu $v0, $zero, 0x140 -/* 17C880 8024DFA0 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C884 8024DFA4 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C888 8024DFA8 24020008 */ addiu $v0, $zero, 8 -/* 17C88C 8024DFAC 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C890 8024DFB0 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C894 8024DFB4 2402001E */ addiu $v0, $zero, 0x1e -/* 17C898 8024DFB8 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C89C 8024DFBC A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C8A0 8024DFC0 2402FFFC */ addiu $v0, $zero, -4 -/* 17C8A4 8024DFC4 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C8A8 8024DFC8 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C8AC 8024DFCC 24020001 */ addiu $v0, $zero, 1 -/* 17C8B0 8024DFD0 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C8B4 8024DFD4 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C8B8 8024DFD8 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C8BC 8024DFDC A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C8C0 8024DFE0 0809380D */ j .L8024E034 -/* 17C8C4 8024DFE4 24020100 */ addiu $v0, $zero, 0x100 -.L8024DFE8_17C8C8: -/* 17C8C8 8024DFE8 3C108028 */ lui $s0, %hi(CamPreset_M) -/* 17C8CC 8024DFEC 26100D20 */ addiu $s0, $s0, %lo(CamPreset_M) -/* 17C8D0 8024DFF0 24020140 */ addiu $v0, $zero, 0x140 -/* 17C8D4 8024DFF4 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C8D8 8024DFF8 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C8DC 8024DFFC 24020008 */ addiu $v0, $zero, 8 -/* 17C8E0 8024E000 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C8E4 8024E004 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C8E8 8024E008 2402001E */ addiu $v0, $zero, 0x1e -/* 17C8EC 8024E00C 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C8F0 8024E010 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C8F4 8024E014 24020001 */ addiu $v0, $zero, 1 -/* 17C8F8 8024E018 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C8FC 8024E01C A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C900 8024E020 24020100 */ addiu $v0, $zero, 0x100 -/* 17C904 8024E024 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C908 8024E028 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17C90C 8024E02C 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C910 8024E030 A420F286 */ sh $zero, %lo(D_8029F286)($at) -.L8024E034: -/* 17C914 8024E034 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C918 8024E038 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17C91C 8024E03C 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17C920 8024E040 A422F27C */ sh $v0, %lo(D_8029F27C)($at) -/* 17C924 8024E044 080938DD */ j .L8024E374 -/* 17C928 8024E048 00000000 */ nop -.L8024E04C_17C92C: -/* 17C92C 8024E04C 3C108028 */ lui $s0, %hi(CamPreset_N) -/* 17C930 8024E050 26100D90 */ addiu $s0, $s0, %lo(CamPreset_N) -/* 17C934 8024E054 3C0141C8 */ lui $at, 0x41c8 -/* 17C938 8024E058 44810000 */ mtc1 $at, $f0 -/* 17C93C 8024E05C 3C014270 */ lui $at, 0x4270 -/* 17C940 8024E060 44811000 */ mtc1 $at, $f2 -/* 17C944 8024E064 24020190 */ addiu $v0, $zero, 0x190 -/* 17C948 8024E068 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C94C 8024E06C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C950 8024E070 24020008 */ addiu $v0, $zero, 8 -/* 17C954 8024E074 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C958 8024E078 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C95C 8024E07C 2402001E */ addiu $v0, $zero, 0x1e -.L8024E080: -/* 17C960 8024E080 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C964 8024E084 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C968 8024E088 2402000A */ addiu $v0, $zero, 0xa -.L8024E08C: -/* 17C96C 8024E08C 3C01802A */ lui $at, %hi(D_8029F282) -/* 17C970 8024E090 A420F282 */ sh $zero, %lo(D_8029F282)($at) -.L8024E094: -/* 17C974 8024E094 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C978 8024E098 A422F286 */ sh $v0, %lo(D_8029F286)($at) -.L8024E09C: -/* 17C97C 8024E09C 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C980 8024E0A0 A020F2A2 */ sb $zero, %lo(D_8029F2A2)($at) -/* 17C984 8024E0A4 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C988 8024E0A8 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -.L8024E0AC: -/* 17C98C 8024E0AC 3C01802A */ lui $at, %hi(D_8029F278) -/* 17C990 8024E0B0 AC20F278 */ sw $zero, %lo(D_8029F278)($at) -/* 17C994 8024E0B4 3C01802A */ lui $at, %hi(D_8029F270) -/* 17C998 8024E0B8 E420F270 */ swc1 $f0, %lo(D_8029F270)($at) -/* 17C99C 8024E0BC 3C01802A */ lui $at, %hi(D_8029F274) -/* 17C9A0 8024E0C0 E422F274 */ swc1 $f2, %lo(D_8029F274)($at) -/* 17C9A4 8024E0C4 080938DD */ j .L8024E374 -/* 17C9A8 8024E0C8 00000000 */ nop -.L8024E0CC_17C9AC: -/* 17C9AC 8024E0CC 3C108028 */ lui $s0, %hi(CamPreset_I) -/* 17C9B0 8024E0D0 26100D58 */ addiu $s0, $s0, %lo(CamPreset_I) -/* 17C9B4 8024E0D4 240200C8 */ addiu $v0, $zero, 0xc8 -/* 17C9B8 8024E0D8 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C9BC 8024E0DC A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17C9C0 8024E0E0 24020008 */ addiu $v0, $zero, 8 -/* 17C9C4 8024E0E4 3C01802A */ lui $at, %hi(D_8029F284) -/* 17C9C8 8024E0E8 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17C9CC 8024E0EC 2402003C */ addiu $v0, $zero, 0x3c -/* 17C9D0 8024E0F0 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17C9D4 8024E0F4 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17C9D8 8024E0F8 2402000B */ addiu $v0, $zero, 0xb -/* 17C9DC 8024E0FC 3C01802A */ lui $at, %hi(D_8029F286) -/* 17C9E0 8024E100 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17C9E4 8024E104 24020001 */ addiu $v0, $zero, 1 -/* 17C9E8 8024E108 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17C9EC 8024E10C A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17C9F0 8024E110 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17C9F4 8024E114 A022F2A3 */ sb $v0, %lo(D_8029F2A3)($at) -/* 17C9F8 8024E118 3C01802A */ lui $at, %hi(D_8029F2A5) -/* 17C9FC 8024E11C A022F2A5 */ sb $v0, %lo(D_8029F2A5)($at) -/* 17CA00 8024E120 24020100 */ addiu $v0, $zero, 0x100 -.L8024E124: -/* 17CA04 8024E124 3C01802A */ lui $at, %hi(D_8029F282) -/* 17CA08 8024E128 A420F282 */ sh $zero, %lo(D_8029F282)($at) -.L8024E12C: -/* 17CA0C 8024E12C 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17CA10 8024E130 A422F27C */ sh $v0, %lo(D_8029F27C)($at) -/* 17CA14 8024E134 3C01802A */ lui $at, %hi(D_8029F2A6) -/* 17CA18 8024E138 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) -/* 17CA1C 8024E13C 080938DD */ j .L8024E374 -/* 17CA20 8024E140 00000000 */ nop -.L8024E144_17CA24: -/* 17CA24 8024E144 3C108028 */ lui $s0, %hi(CamPreset_I) -/* 17CA28 8024E148 26100D58 */ addiu $s0, $s0, %lo(CamPreset_I) -/* 17CA2C 8024E14C 2402012C */ addiu $v0, $zero, 0x12c -/* 17CA30 8024E150 3C01802A */ lui $at, %hi(D_8029F280) -/* 17CA34 8024E154 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17CA38 8024E158 24020008 */ addiu $v0, $zero, 8 -/* 17CA3C 8024E15C 3C01802A */ lui $at, %hi(D_8029F284) -/* 17CA40 8024E160 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17CA44 8024E164 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17CA48 8024E168 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17CA4C 8024E16C 24020010 */ addiu $v0, $zero, 0x10 -/* 17CA50 8024E170 3C01802A */ lui $at, %hi(D_8029F286) -/* 17CA54 8024E174 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17CA58 8024E178 24020100 */ addiu $v0, $zero, 0x100 -/* 17CA5C 8024E17C 3C01802A */ lui $at, %hi(D_8029F282) -/* 17CA60 8024E180 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17CA64 8024E184 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17CA68 8024E188 A422F27C */ sh $v0, %lo(D_8029F27C)($at) -/* 17CA6C 8024E18C 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17CA70 8024E190 A020F2A2 */ sb $zero, %lo(D_8029F2A2)($at) -/* 17CA74 8024E194 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17CA78 8024E198 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17CA7C 8024E19C 080938DD */ j .L8024E374 -/* 17CA80 8024E1A0 00000000 */ nop -.L8024E1A4_17CA84: -/* 17CA84 8024E1A4 3C108028 */ lui $s0, %hi(CamPreset_I) -/* 17CA88 8024E1A8 26100D58 */ addiu $s0, $s0, %lo(CamPreset_I) -/* 17CA8C 8024E1AC 2402012C */ addiu $v0, $zero, 0x12c -/* 17CA90 8024E1B0 3C01802A */ lui $at, %hi(D_8029F280) -/* 17CA94 8024E1B4 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17CA98 8024E1B8 24020008 */ addiu $v0, $zero, 8 -/* 17CA9C 8024E1BC 3C01802A */ lui $at, %hi(D_8029F284) -/* 17CAA0 8024E1C0 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17CAA4 8024E1C4 2402000F */ addiu $v0, $zero, 0xf -/* 17CAA8 8024E1C8 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17CAAC 8024E1CC A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17CAB0 8024E1D0 2402FFE0 */ addiu $v0, $zero, -0x20 -/* 17CAB4 8024E1D4 3C01802A */ lui $at, %hi(D_8029F286) -/* 17CAB8 8024E1D8 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17CABC 8024E1DC 24020014 */ addiu $v0, $zero, 0x14 -/* 17CAC0 8024E1E0 3C01802A */ lui $at, %hi(D_8029F2A7) -/* 17CAC4 8024E1E4 A022F2A7 */ sb $v0, %lo(D_8029F2A7)($at) -/* 17CAC8 8024E1E8 24020001 */ addiu $v0, $zero, 1 -/* 17CACC 8024E1EC 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17CAD0 8024E1F0 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17CAD4 8024E1F4 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17CAD8 8024E1F8 A022F2A3 */ sb $v0, %lo(D_8029F2A3)($at) -/* 17CADC 8024E1FC 24020100 */ addiu $v0, $zero, 0x100 -/* 17CAE0 8024E200 3C01802A */ lui $at, %hi(D_8029F282) -/* 17CAE4 8024E204 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17CAE8 8024E208 3C01802A */ lui $at, %hi(D_8029F27C) -/* 17CAEC 8024E20C A422F27C */ sh $v0, %lo(D_8029F27C)($at) -/* 17CAF0 8024E210 080938DD */ j .L8024E374 -/* 17CAF4 8024E214 00000000 */ nop -.L8024E218_17CAF8: -/* 17CAF8 8024E218 3C108028 */ lui $s0, %hi(CamPreset_F) -/* 17CAFC 8024E21C 26100D04 */ addiu $s0, $s0, %lo(CamPreset_F) -/* 17CB00 8024E220 24020190 */ addiu $v0, $zero, 0x190 -/* 17CB04 8024E224 3C01802A */ lui $at, %hi(D_8029F280) -/* 17CB08 8024E228 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17CB0C 8024E22C 24020008 */ addiu $v0, $zero, 8 -/* 17CB10 8024E230 3C01802A */ lui $at, %hi(D_8029F284) -/* 17CB14 8024E234 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17CB18 8024E238 24020014 */ addiu $v0, $zero, 0x14 -/* 17CB1C 8024E23C 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17CB20 8024E240 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17CB24 8024E244 080938D4 */ j .L8024E350 -/* 17CB28 8024E248 2402001B */ addiu $v0, $zero, 0x1b -.L8024E24C_17CB2C: -/* 17CB2C 8024E24C 3C108028 */ lui $s0, %hi(CamPreset_F) -/* 17CB30 8024E250 26100D04 */ addiu $s0, $s0, %lo(CamPreset_F) -/* 17CB34 8024E254 24020166 */ addiu $v0, $zero, 0x166 -/* 17CB38 8024E258 3C01802A */ lui $at, %hi(D_8029F280) -/* 17CB3C 8024E25C A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17CB40 8024E260 24020008 */ addiu $v0, $zero, 8 -/* 17CB44 8024E264 3C01802A */ lui $at, %hi(D_8029F284) -/* 17CB48 8024E268 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17CB4C 8024E26C 080938B0 */ j .L8024E2C0 -/* 17CB50 8024E270 2402000A */ addiu $v0, $zero, 0xa -.L8024E274_17CB54: -/* 17CB54 8024E274 3C108028 */ lui $s0, %hi(CamPreset_C) -/* 17CB58 8024E278 26100DAC */ addiu $s0, $s0, %lo(CamPreset_C) -/* 17CB5C 8024E27C 24020032 */ addiu $v0, $zero, 0x32 -/* 17CB60 8024E280 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17CB64 8024E284 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17CB68 8024E288 240201F4 */ addiu $v0, $zero, 0x1f4 -/* 17CB6C 8024E28C 3C01802A */ lui $at, %hi(D_8029F280) -/* 17CB70 8024E290 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17CB74 8024E294 080938DD */ j .L8024E374 -/* 17CB78 8024E298 00000000 */ nop -.L8024E29C_17CB7C: -/* 17CB7C 8024E29C 3C108028 */ lui $s0, %hi(CamPreset_F) -/* 17CB80 8024E2A0 26100D04 */ addiu $s0, $s0, %lo(CamPreset_F) -/* 17CB84 8024E2A4 2402010B */ addiu $v0, $zero, 0x10b -/* 17CB88 8024E2A8 3C01802A */ lui $at, %hi(D_8029F280) -/* 17CB8C 8024E2AC A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17CB90 8024E2B0 24020008 */ addiu $v0, $zero, 8 -/* 17CB94 8024E2B4 3C01802A */ lui $at, %hi(D_8029F284) -/* 17CB98 8024E2B8 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17CB9C 8024E2BC 24020014 */ addiu $v0, $zero, 0x14 -.L8024E2C0: -/* 17CBA0 8024E2C0 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17CBA4 8024E2C4 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17CBA8 8024E2C8 24020010 */ addiu $v0, $zero, 0x10 -/* 17CBAC 8024E2CC 3C01802A */ lui $at, %hi(D_8029F286) -/* 17CBB0 8024E2D0 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17CBB4 8024E2D4 24020001 */ addiu $v0, $zero, 1 -/* 17CBB8 8024E2D8 3C01802A */ lui $at, %hi(D_8029F282) -/* 17CBBC 8024E2DC A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17CBC0 8024E2E0 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17CBC4 8024E2E4 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17CBC8 8024E2E8 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17CBCC 8024E2EC A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) -/* 17CBD0 8024E2F0 080938DD */ j .L8024E374 -/* 17CBD4 8024E2F4 00000000 */ nop -.L8024E2F8_17CBD8: -/* 17CBD8 8024E2F8 3C108028 */ lui $s0, %hi(CamPreset_F) -/* 17CBDC 8024E2FC 26100D04 */ addiu $s0, $s0, %lo(CamPreset_F) -/* 17CBE0 8024E300 240200D6 */ addiu $v0, $zero, 0xd6 -/* 17CBE4 8024E304 3C01802A */ lui $at, %hi(D_8029F280) -/* 17CBE8 8024E308 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17CBEC 8024E30C 24020008 */ addiu $v0, $zero, 8 -/* 17CBF0 8024E310 3C01802A */ lui $at, %hi(D_8029F284) -/* 17CBF4 8024E314 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17CBF8 8024E318 080938D1 */ j .L8024E344 -/* 17CBFC 8024E31C 24020014 */ addiu $v0, $zero, 0x14 -.L8024E320_17CC00: -/* 17CC00 8024E320 3C108028 */ lui $s0, %hi(CamPreset_F) -/* 17CC04 8024E324 26100D04 */ addiu $s0, $s0, %lo(CamPreset_F) -/* 17CC08 8024E328 2402012C */ addiu $v0, $zero, 0x12c -/* 17CC0C 8024E32C 3C01802A */ lui $at, %hi(D_8029F280) -/* 17CC10 8024E330 A422F280 */ sh $v0, %lo(D_8029F280)($at) -/* 17CC14 8024E334 24020008 */ addiu $v0, $zero, 8 -/* 17CC18 8024E338 3C01802A */ lui $at, %hi(D_8029F284) -/* 17CC1C 8024E33C A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17CC20 8024E340 24020004 */ addiu $v0, $zero, 4 -.L8024E344: -/* 17CC24 8024E344 3C01802A */ lui $at, %hi(D_8029F29E) -/* 17CC28 8024E348 A422F29E */ sh $v0, %lo(D_8029F29E)($at) -/* 17CC2C 8024E34C 24020010 */ addiu $v0, $zero, 0x10 -.L8024E350: -/* 17CC30 8024E350 3C01802A */ lui $at, %hi(D_8029F286) -/* 17CC34 8024E354 A422F286 */ sh $v0, %lo(D_8029F286)($at) -/* 17CC38 8024E358 24020001 */ addiu $v0, $zero, 1 -/* 17CC3C 8024E35C 3C01802A */ lui $at, %hi(D_8029F282) -/* 17CC40 8024E360 A420F282 */ sh $zero, %lo(D_8029F282)($at) -.L8024E364: -/* 17CC44 8024E364 3C01802A */ lui $at, %hi(D_8029F2A2) -/* 17CC48 8024E368 A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) -/* 17CC4C 8024E36C 3C01802A */ lui $at, %hi(D_8029F2A3) -/* 17CC50 8024E370 A022F2A3 */ sb $v0, %lo(D_8029F2A3)($at) -.L8024E374: -/* 17CC54 8024E374 8E4200C4 */ lw $v0, 0xc4($s2) -/* 17CC58 8024E378 3C018028 */ lui $at, %hi(D_80280CE4) -/* 17CC5C 8024E37C AC310CE4 */ sw $s1, %lo(D_80280CE4)($at) -/* 17CC60 8024E380 10400005 */ beqz $v0, .L8024E398 -/* 17CC64 8024E384 0200202D */ daddu $a0, $s0, $zero -/* 17CC68 8024E388 8E4400C8 */ lw $a0, 0xc8($s2) -/* 17CC6C 8024E38C 0C0B102B */ jal kill_script_by_ID -/* 17CC70 8024E390 00000000 */ nop -/* 17CC74 8024E394 0200202D */ daddu $a0, $s0, $zero -.L8024E398: -/* 17CC78 8024E398 24060020 */ addiu $a2, $zero, 0x20 -/* 17CC7C 8024E39C 3C01802A */ lui $at, %hi(D_8029F2B4) -/* 17CC80 8024E3A0 AC24F2B4 */ sw $a0, %lo(D_8029F2B4)($at) -/* 17CC84 8024E3A4 0C0B0CF8 */ jal start_script -/* 17CC88 8024E3A8 2405000A */ addiu $a1, $zero, 0xa -/* 17CC8C 8024E3AC AE4200C4 */ sw $v0, 0xc4($s2) -/* 17CC90 8024E3B0 8C420144 */ lw $v0, 0x144($v0) -/* 17CC94 8024E3B4 3C01802A */ lui $at, %hi(D_8029F29C) -/* 17CC98 8024E3B8 A020F29C */ sb $zero, %lo(D_8029F29C)($at) -/* 17CC9C 8024E3BC AE4200C8 */ sw $v0, 0xc8($s2) -.L8024E3C0: -/* 17CCA0 8024E3C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 17CCA4 8024E3C4 8FB20018 */ lw $s2, 0x18($sp) -/* 17CCA8 8024E3C8 8FB10014 */ lw $s1, 0x14($sp) -/* 17CCAC 8024E3CC 8FB00010 */ lw $s0, 0x10($sp) -/* 17CCB0 8024E3D0 03E00008 */ jr $ra -/* 17CCB4 8024E3D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/1776B0/func_8024B5FC.s b/ver/us/asm/nonmatchings/1776B0/func_8024B5FC.s deleted file mode 100644 index a102ff9d8d..0000000000 --- a/ver/us/asm/nonmatchings/1776B0/func_8024B5FC.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024B5FC -/* 179EDC 8024B5FC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 179EE0 8024B600 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* 179EE4 8024B604 3C01802A */ lui $at, %hi(D_8029F270) -/* 179EE8 8024B608 C43AF270 */ lwc1 $f26, %lo(D_8029F270)($at) -/* 179EEC 8024B60C F7BC0040 */ sdc1 $f28, 0x40($sp) -/* 179EF0 8024B610 3C01802A */ lui $at, %hi(D_8029F274) -/* 179EF4 8024B614 C43CF274 */ lwc1 $f28, %lo(D_8029F274)($at) -/* 179EF8 8024B618 F7BE0048 */ sdc1 $f30, 0x48($sp) -/* 179EFC 8024B61C 3C01802A */ lui $at, %hi(D_8029F278) -/* 179F00 8024B620 C43EF278 */ lwc1 $f30, %lo(D_8029F278)($at) -/* 179F04 8024B624 AFB00018 */ sw $s0, 0x18($sp) -/* 179F08 8024B628 3C10800B */ lui $s0, %hi(gCameras+0x558) -/* 179F0C 8024B62C 261022D8 */ addiu $s0, $s0, %lo(gCameras+0x558) -/* 179F10 8024B630 AFBF001C */ sw $ra, 0x1c($sp) -/* 179F14 8024B634 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 179F18 8024B638 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 179F1C 8024B63C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 179F20 8024B640 10A00029 */ beqz $a1, .L8024B6E8 -/* 179F24 8024B644 E7BC0010 */ swc1 $f28, 0x10($sp) -/* 179F28 8024B648 8602001E */ lh $v0, 0x1e($s0) -/* 179F2C 8024B64C 86040026 */ lh $a0, 0x26($s0) -/* 179F30 8024B650 86030024 */ lh $v1, 0x24($s0) -/* 179F34 8024B654 44820000 */ mtc1 $v0, $f0 -/* 179F38 8024B658 00000000 */ nop -/* 179F3C 8024B65C 46800020 */ cvt.s.w $f0, $f0 -/* 179F40 8024B660 86020022 */ lh $v0, 0x22($s0) -/* 179F44 8024B664 3C01802A */ lui $at, %hi(D_8029F28C) -/* 179F48 8024B668 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) -/* 179F4C 8024B66C 44820000 */ mtc1 $v0, $f0 -/* 179F50 8024B670 00000000 */ nop -/* 179F54 8024B674 46800020 */ cvt.s.w $f0, $f0 -/* 179F58 8024B678 3C01802A */ lui $at, %hi(D_8029F294) -/* 179F5C 8024B67C E420F294 */ swc1 $f0, %lo(D_8029F294)($at) -/* 179F60 8024B680 44830000 */ mtc1 $v1, $f0 -/* 179F64 8024B684 00000000 */ nop -/* 179F68 8024B688 46800020 */ cvt.s.w $f0, $f0 -/* 179F6C 8024B68C 3C01802A */ lui $at, %hi(D_8029F290) -/* 179F70 8024B690 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) -/* 179F74 8024B694 04820001 */ bltzl $a0, .L8024B69C -/* 179F78 8024B698 248400FF */ addiu $a0, $a0, 0xff -.L8024B69C: -/* 179F7C 8024B69C 00041203 */ sra $v0, $a0, 8 -/* 179F80 8024B6A0 C6020054 */ lwc1 $f2, 0x54($s0) -/* 179F84 8024B6A4 C6040058 */ lwc1 $f4, 0x58($s0) -/* 179F88 8024B6A8 C606005C */ lwc1 $f6, 0x5c($s0) -/* 179F8C 8024B6AC 3C03802A */ lui $v1, %hi(D_8029F29E) -/* 179F90 8024B6B0 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) -/* 179F94 8024B6B4 44820000 */ mtc1 $v0, $f0 -/* 179F98 8024B6B8 00000000 */ nop -/* 179F9C 8024B6BC 46800020 */ cvt.s.w $f0, $f0 -/* 179FA0 8024B6C0 3C01802A */ lui $at, %hi(D_8029F298) -/* 179FA4 8024B6C4 E420F298 */ swc1 $f0, %lo(D_8029F298)($at) -/* 179FA8 8024B6C8 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 179FAC 8024B6CC E422F2A8 */ swc1 $f2, %lo(D_8029F2A8)($at) -/* 179FB0 8024B6D0 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 179FB4 8024B6D4 E424F2AC */ swc1 $f4, %lo(D_8029F2AC)($at) -/* 179FB8 8024B6D8 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 179FBC 8024B6DC E426F2B0 */ swc1 $f6, %lo(D_8029F2B0)($at) -/* 179FC0 8024B6E0 3C01802A */ lui $at, %hi(D_8029F2A0) -/* 179FC4 8024B6E4 A423F2A0 */ sh $v1, %lo(D_8029F2A0)($at) -.L8024B6E8: -/* 179FC8 8024B6E8 3C02802A */ lui $v0, %hi(D_8029F2A5) -/* 179FCC 8024B6EC 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) -/* 179FD0 8024B6F0 14400027 */ bnez $v0, .L8024B790 -/* 179FD4 8024B6F4 00000000 */ nop -/* 179FD8 8024B6F8 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 179FDC 8024B6FC 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 179FE0 8024B700 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 179FE4 8024B704 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) -/* 179FE8 8024B708 3C013F80 */ lui $at, 0x3f80 -/* 179FEC 8024B70C 4481C000 */ mtc1 $at, $f24 -/* 179FF0 8024B710 44822000 */ mtc1 $v0, $f4 -/* 179FF4 8024B714 00000000 */ nop -/* 179FF8 8024B718 46802120 */ cvt.s.w $f4, $f4 -/* 179FFC 8024B71C 44830000 */ mtc1 $v1, $f0 -/* 17A000 8024B720 00000000 */ nop -/* 17A004 8024B724 46800020 */ cvt.s.w $f0, $f0 -/* 17A008 8024B728 46002103 */ div.s $f4, $f4, $f0 -/* 17A00C 8024B72C 4604C301 */ sub.s $f12, $f24, $f4 -/* 17A010 8024B730 3C014049 */ lui $at, 0x4049 -/* 17A014 8024B734 34210FD0 */ ori $at, $at, 0xfd0 -/* 17A018 8024B738 4481B000 */ mtc1 $at, $f22 -/* 17A01C 8024B73C 00000000 */ nop -/* 17A020 8024B740 46166302 */ mul.s $f12, $f12, $f22 -/* 17A024 8024B744 00000000 */ nop -/* 17A028 8024B748 3C013F00 */ lui $at, 0x3f00 -/* 17A02C 8024B74C 4481A000 */ mtc1 $at, $f20 -/* 17A030 8024B750 00000000 */ nop -/* 17A034 8024B754 46146302 */ mul.s $f12, $f12, $f20 -/* 17A038 8024B758 0C00A85B */ jal sin_rad -/* 17A03C 8024B75C 00000000 */ nop -/* 17A040 8024B760 46160002 */ mul.s $f0, $f0, $f22 -/* 17A044 8024B764 00000000 */ nop -/* 17A048 8024B768 46140302 */ mul.s $f12, $f0, $f20 -/* 17A04C 8024B76C 0C00A85B */ jal sin_rad -/* 17A050 8024B770 00000000 */ nop -/* 17A054 8024B774 46160002 */ mul.s $f0, $f0, $f22 -/* 17A058 8024B778 00000000 */ nop -/* 17A05C 8024B77C 46140302 */ mul.s $f12, $f0, $f20 -/* 17A060 8024B780 0C00A85B */ jal sin_rad -/* 17A064 8024B784 00000000 */ nop -/* 17A068 8024B788 08092DEF */ j .L8024B7BC -/* 17A06C 8024B78C 4600C101 */ sub.s $f4, $f24, $f0 -.L8024B790: -/* 17A070 8024B790 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 17A074 8024B794 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 17A078 8024B798 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 17A07C 8024B79C 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) -/* 17A080 8024B7A0 44822000 */ mtc1 $v0, $f4 -/* 17A084 8024B7A4 00000000 */ nop -/* 17A088 8024B7A8 46802120 */ cvt.s.w $f4, $f4 -/* 17A08C 8024B7AC 44830000 */ mtc1 $v1, $f0 -/* 17A090 8024B7B0 00000000 */ nop -/* 17A094 8024B7B4 46800020 */ cvt.s.w $f0, $f0 -/* 17A098 8024B7B8 46002103 */ div.s $f4, $f4, $f0 -.L8024B7BC: -/* 17A09C 8024B7BC 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 17A0A0 8024B7C0 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) -/* 17A0A4 8024B7C4 4604A502 */ mul.s $f20, $f20, $f4 -/* 17A0A8 8024B7C8 00000000 */ nop -/* 17A0AC 8024B7CC 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 17A0B0 8024B7D0 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) -/* 17A0B4 8024B7D4 46049482 */ mul.s $f18, $f18, $f4 -/* 17A0B8 8024B7D8 00000000 */ nop -/* 17A0BC 8024B7DC 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 17A0C0 8024B7E0 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) -/* 17A0C4 8024B7E4 46048402 */ mul.s $f16, $f16, $f4 -/* 17A0C8 8024B7E8 00000000 */ nop -/* 17A0CC 8024B7EC 3C01802A */ lui $at, %hi(D_8029F298) -/* 17A0D0 8024B7F0 C426F298 */ lwc1 $f6, %lo(D_8029F298)($at) -/* 17A0D4 8024B7F4 46043182 */ mul.s $f6, $f6, $f4 -/* 17A0D8 8024B7F8 00000000 */ nop -/* 17A0DC 8024B7FC 3C01802A */ lui $at, %hi(D_8029F28C) -/* 17A0E0 8024B800 C42CF28C */ lwc1 $f12, %lo(D_8029F28C)($at) -/* 17A0E4 8024B804 46046302 */ mul.s $f12, $f12, $f4 -/* 17A0E8 8024B808 00000000 */ nop -/* 17A0EC 8024B80C 3C01802A */ lui $at, %hi(D_8029F290) -/* 17A0F0 8024B810 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) -/* 17A0F4 8024B814 46044202 */ mul.s $f8, $f8, $f4 -/* 17A0F8 8024B818 00000000 */ nop -/* 17A0FC 8024B81C 3C013F80 */ lui $at, 0x3f80 -/* 17A100 8024B820 44811000 */ mtc1 $at, $f2 -/* 17A104 8024B824 00000000 */ nop -/* 17A108 8024B828 46041081 */ sub.s $f2, $f2, $f4 -/* 17A10C 8024B82C 4602D682 */ mul.s $f26, $f26, $f2 -/* 17A110 8024B830 00000000 */ nop -/* 17A114 8024B834 C7BC0010 */ lwc1 $f28, 0x10($sp) -/* 17A118 8024B838 4602E602 */ mul.s $f24, $f28, $f2 -/* 17A11C 8024B83C 00000000 */ nop -/* 17A120 8024B840 3C02802A */ lui $v0, %hi(D_8029F286) -/* 17A124 8024B844 8442F286 */ lh $v0, %lo(D_8029F286)($v0) -/* 17A128 8024B848 44820000 */ mtc1 $v0, $f0 -/* 17A12C 8024B84C 00000000 */ nop -/* 17A130 8024B850 46800020 */ cvt.s.w $f0, $f0 -/* 17A134 8024B854 46020002 */ mul.s $f0, $f0, $f2 -/* 17A138 8024B858 00000000 */ nop -/* 17A13C 8024B85C 4602F582 */ mul.s $f22, $f30, $f2 -/* 17A140 8024B860 00000000 */ nop -/* 17A144 8024B864 3C02802A */ lui $v0, %hi(D_8029F280) -/* 17A148 8024B868 8442F280 */ lh $v0, %lo(D_8029F280)($v0) -/* 17A14C 8024B86C 44827000 */ mtc1 $v0, $f14 -/* 17A150 8024B870 00000000 */ nop -/* 17A154 8024B874 468073A0 */ cvt.s.w $f14, $f14 -/* 17A158 8024B878 46027382 */ mul.s $f14, $f14, $f2 -/* 17A15C 8024B87C 00000000 */ nop -/* 17A160 8024B880 3C02802A */ lui $v0, %hi(D_8029F282) -/* 17A164 8024B884 8442F282 */ lh $v0, %lo(D_8029F282)($v0) -/* 17A168 8024B888 44825000 */ mtc1 $v0, $f10 -/* 17A16C 8024B88C 00000000 */ nop -/* 17A170 8024B890 468052A0 */ cvt.s.w $f10, $f10 -/* 17A174 8024B894 46025282 */ mul.s $f10, $f10, $f2 -/* 17A178 8024B898 00000000 */ nop -/* 17A17C 8024B89C 46003180 */ add.s $f6, $f6, $f0 -/* 17A180 8024B8A0 3C014380 */ lui $at, 0x4380 -/* 17A184 8024B8A4 44810000 */ mtc1 $at, $f0 -/* 17A188 8024B8A8 00000000 */ nop -/* 17A18C 8024B8AC 46003182 */ mul.s $f6, $f6, $f0 -/* 17A190 8024B8B0 00000000 */ nop -/* 17A194 8024B8B4 3C01802A */ lui $at, %hi(D_8029F294) -/* 17A198 8024B8B8 C420F294 */ lwc1 $f0, %lo(D_8029F294)($at) -/* 17A19C 8024B8BC 46040002 */ mul.s $f0, $f0, $f4 -/* 17A1A0 8024B8C0 00000000 */ nop -/* 17A1A4 8024B8C4 461AA500 */ add.s $f20, $f20, $f26 -/* 17A1A8 8024B8C8 46189480 */ add.s $f18, $f18, $f24 -/* 17A1AC 8024B8CC 46168400 */ add.s $f16, $f16, $f22 -/* 17A1B0 8024B8D0 460E6300 */ add.s $f12, $f12, $f14 -/* 17A1B4 8024B8D4 3C04802A */ lui $a0, %hi(D_8029F29E) -/* 17A1B8 8024B8D8 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) -/* 17A1BC 8024B8DC 3C02802A */ lui $v0, %hi(D_8029F284) -/* 17A1C0 8024B8E0 8442F284 */ lh $v0, %lo(D_8029F284)($v0) -/* 17A1C4 8024B8E4 460A4200 */ add.s $f8, $f8, $f10 -/* 17A1C8 8024B8E8 E6140054 */ swc1 $f20, 0x54($s0) -/* 17A1CC 8024B8EC 44822000 */ mtc1 $v0, $f4 -/* 17A1D0 8024B8F0 00000000 */ nop -/* 17A1D4 8024B8F4 46802120 */ cvt.s.w $f4, $f4 -/* 17A1D8 8024B8F8 46022102 */ mul.s $f4, $f4, $f2 -/* 17A1DC 8024B8FC 00000000 */ nop -/* 17A1E0 8024B900 E6120058 */ swc1 $f18, 0x58($s0) -/* 17A1E4 8024B904 E610005C */ swc1 $f16, 0x5c($s0) -/* 17A1E8 8024B908 4600670D */ trunc.w.s $f28, $f12 -/* 17A1EC 8024B90C 4402E000 */ mfc1 $v0, $f28 -/* 17A1F0 8024B910 00000000 */ nop -/* 17A1F4 8024B914 A602001E */ sh $v0, 0x1e($s0) -/* 17A1F8 8024B918 46040000 */ add.s $f0, $f0, $f4 -/* 17A1FC 8024B91C 4600470D */ trunc.w.s $f28, $f8 -/* 17A200 8024B920 4402E000 */ mfc1 $v0, $f28 -/* 17A204 8024B924 00000000 */ nop -/* 17A208 8024B928 A6020024 */ sh $v0, 0x24($s0) -/* 17A20C 8024B92C 4600070D */ trunc.w.s $f28, $f0 -/* 17A210 8024B930 4402E000 */ mfc1 $v0, $f28 -/* 17A214 8024B934 00000000 */ nop -/* 17A218 8024B938 A6020022 */ sh $v0, 0x22($s0) -/* 17A21C 8024B93C 4600370D */ trunc.w.s $f28, $f6 -/* 17A220 8024B940 4402E000 */ mfc1 $v0, $f28 -/* 17A224 8024B944 00000000 */ nop -/* 17A228 8024B948 A6020026 */ sh $v0, 0x26($s0) -/* 17A22C 8024B94C 84820000 */ lh $v0, ($a0) -/* 17A230 8024B950 94830000 */ lhu $v1, ($a0) -/* 17A234 8024B954 14400006 */ bnez $v0, .L8024B970 -/* 17A238 8024B958 2462FFFF */ addiu $v0, $v1, -1 -/* 17A23C 8024B95C 24020001 */ addiu $v0, $zero, 1 -/* 17A240 8024B960 3C01802A */ lui $at, %hi(D_8029F29C) -/* 17A244 8024B964 A022F29C */ sb $v0, %lo(D_8029F29C)($at) -/* 17A248 8024B968 08092E5D */ j .L8024B974 -/* 17A24C 8024B96C 00000000 */ nop -.L8024B970: -/* 17A250 8024B970 A4820000 */ sh $v0, ($a0) -.L8024B974: -/* 17A254 8024B974 8FBF001C */ lw $ra, 0x1c($sp) -/* 17A258 8024B978 8FB00018 */ lw $s0, 0x18($sp) -/* 17A25C 8024B97C D7BE0048 */ ldc1 $f30, 0x48($sp) -/* 17A260 8024B980 D7BC0040 */ ldc1 $f28, 0x40($sp) -/* 17A264 8024B984 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* 17A268 8024B988 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 17A26C 8024B98C D7B60028 */ ldc1 $f22, 0x28($sp) -/* 17A270 8024B990 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 17A274 8024B994 0000102D */ daddu $v0, $zero, $zero -/* 17A278 8024B998 03E00008 */ jr $ra -/* 17A27C 8024B99C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/1776B0/func_8024B9A0.s b/ver/us/asm/nonmatchings/1776B0/func_8024B9A0.s deleted file mode 100644 index f921e112b7..0000000000 --- a/ver/us/asm/nonmatchings/1776B0/func_8024B9A0.s +++ /dev/null @@ -1,268 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024B9A0 -/* 17A280 8024B9A0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 17A284 8024B9A4 AFB00018 */ sw $s0, 0x18($sp) -/* 17A288 8024B9A8 3C10800B */ lui $s0, %hi(gCameras+0x558) -/* 17A28C 8024B9AC 261022D8 */ addiu $s0, $s0, %lo(gCameras+0x558) -/* 17A290 8024B9B0 AFBF001C */ sw $ra, 0x1c($sp) -/* 17A294 8024B9B4 F7BE0048 */ sdc1 $f30, 0x48($sp) -/* 17A298 8024B9B8 F7BC0040 */ sdc1 $f28, 0x40($sp) -/* 17A29C 8024B9BC F7BA0038 */ sdc1 $f26, 0x38($sp) -/* 17A2A0 8024B9C0 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 17A2A4 8024B9C4 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 17A2A8 8024B9C8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 17A2AC 8024B9CC 10A00046 */ beqz $a1, .L8024BAE8 -/* 17A2B0 8024B9D0 24030008 */ addiu $v1, $zero, 8 -/* 17A2B4 8024B9D4 3C014270 */ lui $at, 0x4270 -/* 17A2B8 8024B9D8 44811000 */ mtc1 $at, $f2 -/* 17A2BC 8024B9DC 3C04802A */ lui $a0, %hi(D_8029F270) -/* 17A2C0 8024B9E0 2484F270 */ addiu $a0, $a0, %lo(D_8029F270) -/* 17A2C4 8024B9E4 AC800000 */ sw $zero, ($a0) -/* 17A2C8 8024B9E8 3C02802A */ lui $v0, %hi(D_8029F2A4) -/* 17A2CC 8024B9EC 8042F2A4 */ lb $v0, %lo(D_8029F2A4)($v0) -/* 17A2D0 8024B9F0 3C01802A */ lui $at, %hi(D_8029F278) -/* 17A2D4 8024B9F4 AC20F278 */ sw $zero, %lo(D_8029F278)($at) -/* 17A2D8 8024B9F8 3C01802A */ lui $at, %hi(D_8029F282) -/* 17A2DC 8024B9FC A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17A2E0 8024BA00 3C01802A */ lui $at, %hi(D_8029F284) -/* 17A2E4 8024BA04 A423F284 */ sh $v1, %lo(D_8029F284)($at) -/* 17A2E8 8024BA08 3C01802A */ lui $at, %hi(D_8029F286) -/* 17A2EC 8024BA0C A420F286 */ sh $zero, %lo(D_8029F286)($at) -/* 17A2F0 8024BA10 3C01802A */ lui $at, %hi(D_8029F274) -/* 17A2F4 8024BA14 E422F274 */ swc1 $f2, %lo(D_8029F274)($at) -/* 17A2F8 8024BA18 1040000B */ beqz $v0, .L8024BA48 -/* 17A2FC 8024BA1C 00000000 */ nop -/* 17A300 8024BA20 C4800000 */ lwc1 $f0, ($a0) -/* 17A304 8024BA24 3C02802A */ lui $v0, %hi(D_8029F280) -/* 17A308 8024BA28 9442F280 */ lhu $v0, %lo(D_8029F280)($v0) -/* 17A30C 8024BA2C E6020058 */ swc1 $f2, 0x58($s0) -/* 17A310 8024BA30 A6000026 */ sh $zero, 0x26($s0) -/* 17A314 8024BA34 A6000024 */ sh $zero, 0x24($s0) -/* 17A318 8024BA38 A6030022 */ sh $v1, 0x22($s0) -/* 17A31C 8024BA3C E6000054 */ swc1 $f0, 0x54($s0) -/* 17A320 8024BA40 E600005C */ swc1 $f0, 0x5c($s0) -/* 17A324 8024BA44 A602001E */ sh $v0, 0x1e($s0) -.L8024BA48: -/* 17A328 8024BA48 8602001E */ lh $v0, 0x1e($s0) -/* 17A32C 8024BA4C 86040026 */ lh $a0, 0x26($s0) -/* 17A330 8024BA50 86030024 */ lh $v1, 0x24($s0) -/* 17A334 8024BA54 44820000 */ mtc1 $v0, $f0 -/* 17A338 8024BA58 00000000 */ nop -/* 17A33C 8024BA5C 46800020 */ cvt.s.w $f0, $f0 -/* 17A340 8024BA60 86020022 */ lh $v0, 0x22($s0) -/* 17A344 8024BA64 3C01802A */ lui $at, %hi(D_8029F28C) -/* 17A348 8024BA68 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) -/* 17A34C 8024BA6C 44820000 */ mtc1 $v0, $f0 -/* 17A350 8024BA70 00000000 */ nop -/* 17A354 8024BA74 46800020 */ cvt.s.w $f0, $f0 -/* 17A358 8024BA78 3C01802A */ lui $at, %hi(D_8029F294) -/* 17A35C 8024BA7C E420F294 */ swc1 $f0, %lo(D_8029F294)($at) -/* 17A360 8024BA80 44830000 */ mtc1 $v1, $f0 -/* 17A364 8024BA84 00000000 */ nop -/* 17A368 8024BA88 46800020 */ cvt.s.w $f0, $f0 -/* 17A36C 8024BA8C 3C01802A */ lui $at, %hi(D_8029F290) -/* 17A370 8024BA90 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) -/* 17A374 8024BA94 04820001 */ bltzl $a0, .L8024BA9C -/* 17A378 8024BA98 248400FF */ addiu $a0, $a0, 0xff -.L8024BA9C: -/* 17A37C 8024BA9C 00041203 */ sra $v0, $a0, 8 -/* 17A380 8024BAA0 C6020054 */ lwc1 $f2, 0x54($s0) -/* 17A384 8024BAA4 C6040058 */ lwc1 $f4, 0x58($s0) -/* 17A388 8024BAA8 C606005C */ lwc1 $f6, 0x5c($s0) -/* 17A38C 8024BAAC 3C03802A */ lui $v1, %hi(D_8029F29E) -/* 17A390 8024BAB0 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) -/* 17A394 8024BAB4 44820000 */ mtc1 $v0, $f0 -/* 17A398 8024BAB8 00000000 */ nop -/* 17A39C 8024BABC 46800020 */ cvt.s.w $f0, $f0 -/* 17A3A0 8024BAC0 3C01802A */ lui $at, %hi(D_8029F298) -/* 17A3A4 8024BAC4 E420F298 */ swc1 $f0, %lo(D_8029F298)($at) -/* 17A3A8 8024BAC8 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 17A3AC 8024BACC E422F2A8 */ swc1 $f2, %lo(D_8029F2A8)($at) -/* 17A3B0 8024BAD0 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 17A3B4 8024BAD4 E424F2AC */ swc1 $f4, %lo(D_8029F2AC)($at) -/* 17A3B8 8024BAD8 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 17A3BC 8024BADC E426F2B0 */ swc1 $f6, %lo(D_8029F2B0)($at) -/* 17A3C0 8024BAE0 3C01802A */ lui $at, %hi(D_8029F2A0) -/* 17A3C4 8024BAE4 A423F2A0 */ sh $v1, %lo(D_8029F2A0)($at) -.L8024BAE8: -/* 17A3C8 8024BAE8 3C01802A */ lui $at, %hi(D_8029F274) -/* 17A3CC 8024BAEC C43CF274 */ lwc1 $f28, %lo(D_8029F274)($at) -/* 17A3D0 8024BAF0 3C01802A */ lui $at, %hi(D_8029F270) -/* 17A3D4 8024BAF4 C43AF270 */ lwc1 $f26, %lo(D_8029F270)($at) -/* 17A3D8 8024BAF8 3C02802A */ lui $v0, %hi(D_8029F2A5) -/* 17A3DC 8024BAFC 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) -/* 17A3E0 8024BB00 3C01802A */ lui $at, %hi(D_8029F278) -/* 17A3E4 8024BB04 C43EF278 */ lwc1 $f30, %lo(D_8029F278)($at) -/* 17A3E8 8024BB08 14400022 */ bnez $v0, .L8024BB94 -/* 17A3EC 8024BB0C E7BC0010 */ swc1 $f28, 0x10($sp) -/* 17A3F0 8024BB10 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 17A3F4 8024BB14 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 17A3F8 8024BB18 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 17A3FC 8024BB1C 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) -/* 17A400 8024BB20 3C013F80 */ lui $at, 0x3f80 -/* 17A404 8024BB24 4481C000 */ mtc1 $at, $f24 -/* 17A408 8024BB28 44822000 */ mtc1 $v0, $f4 -/* 17A40C 8024BB2C 00000000 */ nop -/* 17A410 8024BB30 46802120 */ cvt.s.w $f4, $f4 -/* 17A414 8024BB34 44830000 */ mtc1 $v1, $f0 -/* 17A418 8024BB38 00000000 */ nop -/* 17A41C 8024BB3C 46800020 */ cvt.s.w $f0, $f0 -/* 17A420 8024BB40 46002103 */ div.s $f4, $f4, $f0 -/* 17A424 8024BB44 4604C301 */ sub.s $f12, $f24, $f4 -/* 17A428 8024BB48 3C014049 */ lui $at, 0x4049 -/* 17A42C 8024BB4C 34210FD0 */ ori $at, $at, 0xfd0 -/* 17A430 8024BB50 4481B000 */ mtc1 $at, $f22 -/* 17A434 8024BB54 00000000 */ nop -/* 17A438 8024BB58 46166302 */ mul.s $f12, $f12, $f22 -/* 17A43C 8024BB5C 00000000 */ nop -/* 17A440 8024BB60 3C013F00 */ lui $at, 0x3f00 -/* 17A444 8024BB64 4481A000 */ mtc1 $at, $f20 -/* 17A448 8024BB68 00000000 */ nop -/* 17A44C 8024BB6C 46146302 */ mul.s $f12, $f12, $f20 -/* 17A450 8024BB70 0C00A85B */ jal sin_rad -/* 17A454 8024BB74 00000000 */ nop -/* 17A458 8024BB78 46160002 */ mul.s $f0, $f0, $f22 -/* 17A45C 8024BB7C 00000000 */ nop -/* 17A460 8024BB80 46140302 */ mul.s $f12, $f0, $f20 -/* 17A464 8024BB84 0C00A85B */ jal sin_rad -/* 17A468 8024BB88 00000000 */ nop -/* 17A46C 8024BB8C 08092EF0 */ j .L8024BBC0 -/* 17A470 8024BB90 4600C101 */ sub.s $f4, $f24, $f0 -.L8024BB94: -/* 17A474 8024BB94 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 17A478 8024BB98 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 17A47C 8024BB9C 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 17A480 8024BBA0 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) -/* 17A484 8024BBA4 44822000 */ mtc1 $v0, $f4 -/* 17A488 8024BBA8 00000000 */ nop -/* 17A48C 8024BBAC 46802120 */ cvt.s.w $f4, $f4 -/* 17A490 8024BBB0 44830000 */ mtc1 $v1, $f0 -/* 17A494 8024BBB4 00000000 */ nop -/* 17A498 8024BBB8 46800020 */ cvt.s.w $f0, $f0 -/* 17A49C 8024BBBC 46002103 */ div.s $f4, $f4, $f0 -.L8024BBC0: -/* 17A4A0 8024BBC0 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 17A4A4 8024BBC4 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) -/* 17A4A8 8024BBC8 4604A502 */ mul.s $f20, $f20, $f4 -/* 17A4AC 8024BBCC 00000000 */ nop -/* 17A4B0 8024BBD0 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 17A4B4 8024BBD4 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) -/* 17A4B8 8024BBD8 46049482 */ mul.s $f18, $f18, $f4 -/* 17A4BC 8024BBDC 00000000 */ nop -/* 17A4C0 8024BBE0 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 17A4C4 8024BBE4 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) -/* 17A4C8 8024BBE8 46048402 */ mul.s $f16, $f16, $f4 -/* 17A4CC 8024BBEC 00000000 */ nop -/* 17A4D0 8024BBF0 3C01802A */ lui $at, %hi(D_8029F298) -/* 17A4D4 8024BBF4 C426F298 */ lwc1 $f6, %lo(D_8029F298)($at) -/* 17A4D8 8024BBF8 46043182 */ mul.s $f6, $f6, $f4 -/* 17A4DC 8024BBFC 00000000 */ nop -/* 17A4E0 8024BC00 3C01802A */ lui $at, %hi(D_8029F28C) -/* 17A4E4 8024BC04 C42CF28C */ lwc1 $f12, %lo(D_8029F28C)($at) -/* 17A4E8 8024BC08 46046302 */ mul.s $f12, $f12, $f4 -/* 17A4EC 8024BC0C 00000000 */ nop -/* 17A4F0 8024BC10 3C01802A */ lui $at, %hi(D_8029F290) -/* 17A4F4 8024BC14 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) -/* 17A4F8 8024BC18 46044202 */ mul.s $f8, $f8, $f4 -/* 17A4FC 8024BC1C 00000000 */ nop -/* 17A500 8024BC20 3C013F80 */ lui $at, 0x3f80 -/* 17A504 8024BC24 44811000 */ mtc1 $at, $f2 -/* 17A508 8024BC28 00000000 */ nop -/* 17A50C 8024BC2C 46041081 */ sub.s $f2, $f2, $f4 -/* 17A510 8024BC30 4602D682 */ mul.s $f26, $f26, $f2 -/* 17A514 8024BC34 00000000 */ nop -/* 17A518 8024BC38 C7BC0010 */ lwc1 $f28, 0x10($sp) -/* 17A51C 8024BC3C 4602E602 */ mul.s $f24, $f28, $f2 -/* 17A520 8024BC40 00000000 */ nop -/* 17A524 8024BC44 3C02802A */ lui $v0, %hi(D_8029F286) -/* 17A528 8024BC48 8442F286 */ lh $v0, %lo(D_8029F286)($v0) -/* 17A52C 8024BC4C 44820000 */ mtc1 $v0, $f0 -/* 17A530 8024BC50 00000000 */ nop -/* 17A534 8024BC54 46800020 */ cvt.s.w $f0, $f0 -/* 17A538 8024BC58 46020002 */ mul.s $f0, $f0, $f2 -/* 17A53C 8024BC5C 00000000 */ nop -/* 17A540 8024BC60 4602F582 */ mul.s $f22, $f30, $f2 -/* 17A544 8024BC64 00000000 */ nop -/* 17A548 8024BC68 3C02802A */ lui $v0, %hi(D_8029F280) -/* 17A54C 8024BC6C 8442F280 */ lh $v0, %lo(D_8029F280)($v0) -/* 17A550 8024BC70 44827000 */ mtc1 $v0, $f14 -/* 17A554 8024BC74 00000000 */ nop -/* 17A558 8024BC78 468073A0 */ cvt.s.w $f14, $f14 -/* 17A55C 8024BC7C 46027382 */ mul.s $f14, $f14, $f2 -/* 17A560 8024BC80 00000000 */ nop -/* 17A564 8024BC84 3C02802A */ lui $v0, %hi(D_8029F282) -/* 17A568 8024BC88 8442F282 */ lh $v0, %lo(D_8029F282)($v0) -/* 17A56C 8024BC8C 44825000 */ mtc1 $v0, $f10 -/* 17A570 8024BC90 00000000 */ nop -/* 17A574 8024BC94 468052A0 */ cvt.s.w $f10, $f10 -/* 17A578 8024BC98 46025282 */ mul.s $f10, $f10, $f2 -/* 17A57C 8024BC9C 00000000 */ nop -/* 17A580 8024BCA0 46003180 */ add.s $f6, $f6, $f0 -/* 17A584 8024BCA4 3C014380 */ lui $at, 0x4380 -/* 17A588 8024BCA8 44810000 */ mtc1 $at, $f0 -/* 17A58C 8024BCAC 00000000 */ nop -/* 17A590 8024BCB0 46003182 */ mul.s $f6, $f6, $f0 -/* 17A594 8024BCB4 00000000 */ nop -/* 17A598 8024BCB8 3C01802A */ lui $at, %hi(D_8029F294) -/* 17A59C 8024BCBC C420F294 */ lwc1 $f0, %lo(D_8029F294)($at) -/* 17A5A0 8024BCC0 46040002 */ mul.s $f0, $f0, $f4 -/* 17A5A4 8024BCC4 00000000 */ nop -/* 17A5A8 8024BCC8 461AA500 */ add.s $f20, $f20, $f26 -/* 17A5AC 8024BCCC 46189480 */ add.s $f18, $f18, $f24 -/* 17A5B0 8024BCD0 46168400 */ add.s $f16, $f16, $f22 -/* 17A5B4 8024BCD4 460E6300 */ add.s $f12, $f12, $f14 -/* 17A5B8 8024BCD8 3C04802A */ lui $a0, %hi(D_8029F29E) -/* 17A5BC 8024BCDC 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) -/* 17A5C0 8024BCE0 3C02802A */ lui $v0, %hi(D_8029F284) -/* 17A5C4 8024BCE4 8442F284 */ lh $v0, %lo(D_8029F284)($v0) -/* 17A5C8 8024BCE8 460A4200 */ add.s $f8, $f8, $f10 -/* 17A5CC 8024BCEC E6140054 */ swc1 $f20, 0x54($s0) -/* 17A5D0 8024BCF0 44822000 */ mtc1 $v0, $f4 -/* 17A5D4 8024BCF4 00000000 */ nop -/* 17A5D8 8024BCF8 46802120 */ cvt.s.w $f4, $f4 -/* 17A5DC 8024BCFC 46022102 */ mul.s $f4, $f4, $f2 -/* 17A5E0 8024BD00 00000000 */ nop -/* 17A5E4 8024BD04 E6120058 */ swc1 $f18, 0x58($s0) -/* 17A5E8 8024BD08 E610005C */ swc1 $f16, 0x5c($s0) -/* 17A5EC 8024BD0C 4600670D */ trunc.w.s $f28, $f12 -/* 17A5F0 8024BD10 4402E000 */ mfc1 $v0, $f28 -/* 17A5F4 8024BD14 00000000 */ nop -/* 17A5F8 8024BD18 A602001E */ sh $v0, 0x1e($s0) -/* 17A5FC 8024BD1C 46040000 */ add.s $f0, $f0, $f4 -/* 17A600 8024BD20 4600470D */ trunc.w.s $f28, $f8 -/* 17A604 8024BD24 4402E000 */ mfc1 $v0, $f28 -/* 17A608 8024BD28 00000000 */ nop -/* 17A60C 8024BD2C A6020024 */ sh $v0, 0x24($s0) -/* 17A610 8024BD30 4600070D */ trunc.w.s $f28, $f0 -/* 17A614 8024BD34 4402E000 */ mfc1 $v0, $f28 -/* 17A618 8024BD38 00000000 */ nop -/* 17A61C 8024BD3C A6020022 */ sh $v0, 0x22($s0) -/* 17A620 8024BD40 4600370D */ trunc.w.s $f28, $f6 -/* 17A624 8024BD44 4402E000 */ mfc1 $v0, $f28 -/* 17A628 8024BD48 00000000 */ nop -/* 17A62C 8024BD4C A6020026 */ sh $v0, 0x26($s0) -/* 17A630 8024BD50 84820000 */ lh $v0, ($a0) -/* 17A634 8024BD54 94830000 */ lhu $v1, ($a0) -/* 17A638 8024BD58 14400006 */ bnez $v0, .L8024BD74 -/* 17A63C 8024BD5C 2462FFFF */ addiu $v0, $v1, -1 -/* 17A640 8024BD60 24020001 */ addiu $v0, $zero, 1 -/* 17A644 8024BD64 3C01802A */ lui $at, %hi(D_8029F29C) -/* 17A648 8024BD68 A022F29C */ sb $v0, %lo(D_8029F29C)($at) -/* 17A64C 8024BD6C 08092F5E */ j .L8024BD78 -/* 17A650 8024BD70 00000000 */ nop -.L8024BD74: -/* 17A654 8024BD74 A4820000 */ sh $v0, ($a0) -.L8024BD78: -/* 17A658 8024BD78 8FBF001C */ lw $ra, 0x1c($sp) -/* 17A65C 8024BD7C 8FB00018 */ lw $s0, 0x18($sp) -/* 17A660 8024BD80 D7BE0048 */ ldc1 $f30, 0x48($sp) -/* 17A664 8024BD84 D7BC0040 */ ldc1 $f28, 0x40($sp) -/* 17A668 8024BD88 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* 17A66C 8024BD8C D7B80030 */ ldc1 $f24, 0x30($sp) -/* 17A670 8024BD90 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 17A674 8024BD94 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 17A678 8024BD98 0000102D */ daddu $v0, $zero, $zero -/* 17A67C 8024BD9C 03E00008 */ jr $ra -/* 17A680 8024BDA0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/1776B0/func_8024BDA4.s b/ver/us/asm/nonmatchings/1776B0/func_8024BDA4.s deleted file mode 100644 index 0b2aef145f..0000000000 --- a/ver/us/asm/nonmatchings/1776B0/func_8024BDA4.s +++ /dev/null @@ -1,257 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024BDA4 -/* 17A684 8024BDA4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 17A688 8024BDA8 AFB00018 */ sw $s0, 0x18($sp) -/* 17A68C 8024BDAC 3C10800B */ lui $s0, %hi(gCameras+0x558) -/* 17A690 8024BDB0 261022D8 */ addiu $s0, $s0, %lo(gCameras+0x558) -/* 17A694 8024BDB4 AFBF001C */ sw $ra, 0x1c($sp) -/* 17A698 8024BDB8 F7BE0048 */ sdc1 $f30, 0x48($sp) -/* 17A69C 8024BDBC F7BC0040 */ sdc1 $f28, 0x40($sp) -/* 17A6A0 8024BDC0 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* 17A6A4 8024BDC4 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 17A6A8 8024BDC8 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 17A6AC 8024BDCC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 17A6B0 8024BDD0 10A00037 */ beqz $a1, .L8024BEB0 -/* 17A6B4 8024BDD4 24020008 */ addiu $v0, $zero, 8 -/* 17A6B8 8024BDD8 86040026 */ lh $a0, 0x26($s0) -/* 17A6BC 8024BDDC 3C01420C */ lui $at, 0x420c -/* 17A6C0 8024BDE0 44810000 */ mtc1 $at, $f0 -/* 17A6C4 8024BDE4 3C014270 */ lui $at, 0x4270 -/* 17A6C8 8024BDE8 44811000 */ mtc1 $at, $f2 -/* 17A6CC 8024BDEC 8603001E */ lh $v1, 0x1e($s0) -/* 17A6D0 8024BDF0 3C01802A */ lui $at, %hi(D_8029F284) -/* 17A6D4 8024BDF4 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17A6D8 8024BDF8 86020022 */ lh $v0, 0x22($s0) -/* 17A6DC 8024BDFC 3C01802A */ lui $at, %hi(D_8029F270) -/* 17A6E0 8024BE00 E420F270 */ swc1 $f0, %lo(D_8029F270)($at) -/* 17A6E4 8024BE04 44830000 */ mtc1 $v1, $f0 -/* 17A6E8 8024BE08 00000000 */ nop -/* 17A6EC 8024BE0C 46800020 */ cvt.s.w $f0, $f0 -/* 17A6F0 8024BE10 86030024 */ lh $v1, 0x24($s0) -/* 17A6F4 8024BE14 3C01802A */ lui $at, %hi(D_8029F278) -/* 17A6F8 8024BE18 AC20F278 */ sw $zero, %lo(D_8029F278)($at) -/* 17A6FC 8024BE1C 3C01802A */ lui $at, %hi(D_8029F282) -/* 17A700 8024BE20 A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17A704 8024BE24 3C01802A */ lui $at, %hi(D_8029F28C) -/* 17A708 8024BE28 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) -/* 17A70C 8024BE2C 44820000 */ mtc1 $v0, $f0 -/* 17A710 8024BE30 00000000 */ nop -/* 17A714 8024BE34 46800020 */ cvt.s.w $f0, $f0 -/* 17A718 8024BE38 3C01802A */ lui $at, %hi(D_8029F274) -/* 17A71C 8024BE3C E422F274 */ swc1 $f2, %lo(D_8029F274)($at) -/* 17A720 8024BE40 3C01802A */ lui $at, %hi(D_8029F294) -/* 17A724 8024BE44 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) -/* 17A728 8024BE48 44830000 */ mtc1 $v1, $f0 -/* 17A72C 8024BE4C 00000000 */ nop -/* 17A730 8024BE50 46800020 */ cvt.s.w $f0, $f0 -/* 17A734 8024BE54 3C01802A */ lui $at, %hi(D_8029F290) -/* 17A738 8024BE58 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) -/* 17A73C 8024BE5C 04820001 */ bltzl $a0, .L8024BE64 -/* 17A740 8024BE60 248400FF */ addiu $a0, $a0, 0xff -.L8024BE64: -/* 17A744 8024BE64 00041203 */ sra $v0, $a0, 8 -/* 17A748 8024BE68 C6020054 */ lwc1 $f2, 0x54($s0) -/* 17A74C 8024BE6C C6040058 */ lwc1 $f4, 0x58($s0) -/* 17A750 8024BE70 C606005C */ lwc1 $f6, 0x5c($s0) -/* 17A754 8024BE74 3C03802A */ lui $v1, %hi(D_8029F29E) -/* 17A758 8024BE78 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) -/* 17A75C 8024BE7C 44820000 */ mtc1 $v0, $f0 -/* 17A760 8024BE80 00000000 */ nop -/* 17A764 8024BE84 46800020 */ cvt.s.w $f0, $f0 -/* 17A768 8024BE88 3C01802A */ lui $at, %hi(D_8029F298) -/* 17A76C 8024BE8C E420F298 */ swc1 $f0, %lo(D_8029F298)($at) -/* 17A770 8024BE90 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 17A774 8024BE94 E422F2A8 */ swc1 $f2, %lo(D_8029F2A8)($at) -/* 17A778 8024BE98 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 17A77C 8024BE9C E424F2AC */ swc1 $f4, %lo(D_8029F2AC)($at) -/* 17A780 8024BEA0 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 17A784 8024BEA4 E426F2B0 */ swc1 $f6, %lo(D_8029F2B0)($at) -/* 17A788 8024BEA8 3C01802A */ lui $at, %hi(D_8029F2A0) -/* 17A78C 8024BEAC A423F2A0 */ sh $v1, %lo(D_8029F2A0)($at) -.L8024BEB0: -/* 17A790 8024BEB0 3C01802A */ lui $at, %hi(D_8029F274) -/* 17A794 8024BEB4 C43CF274 */ lwc1 $f28, %lo(D_8029F274)($at) -/* 17A798 8024BEB8 3C01802A */ lui $at, %hi(D_8029F270) -/* 17A79C 8024BEBC C43AF270 */ lwc1 $f26, %lo(D_8029F270)($at) -/* 17A7A0 8024BEC0 3C02802A */ lui $v0, %hi(D_8029F2A5) -/* 17A7A4 8024BEC4 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) -/* 17A7A8 8024BEC8 3C01802A */ lui $at, %hi(D_8029F278) -/* 17A7AC 8024BECC C43EF278 */ lwc1 $f30, %lo(D_8029F278)($at) -/* 17A7B0 8024BED0 14400027 */ bnez $v0, .L8024BF70 -/* 17A7B4 8024BED4 E7BC0010 */ swc1 $f28, 0x10($sp) -/* 17A7B8 8024BED8 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 17A7BC 8024BEDC 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 17A7C0 8024BEE0 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 17A7C4 8024BEE4 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) -/* 17A7C8 8024BEE8 3C013F80 */ lui $at, 0x3f80 -/* 17A7CC 8024BEEC 4481C000 */ mtc1 $at, $f24 -/* 17A7D0 8024BEF0 44822000 */ mtc1 $v0, $f4 -/* 17A7D4 8024BEF4 00000000 */ nop -/* 17A7D8 8024BEF8 46802120 */ cvt.s.w $f4, $f4 -/* 17A7DC 8024BEFC 44830000 */ mtc1 $v1, $f0 -/* 17A7E0 8024BF00 00000000 */ nop -/* 17A7E4 8024BF04 46800020 */ cvt.s.w $f0, $f0 -/* 17A7E8 8024BF08 46002103 */ div.s $f4, $f4, $f0 -/* 17A7EC 8024BF0C 4604C301 */ sub.s $f12, $f24, $f4 -/* 17A7F0 8024BF10 3C014049 */ lui $at, 0x4049 -/* 17A7F4 8024BF14 34210FD0 */ ori $at, $at, 0xfd0 -/* 17A7F8 8024BF18 4481B000 */ mtc1 $at, $f22 -/* 17A7FC 8024BF1C 00000000 */ nop -/* 17A800 8024BF20 46166302 */ mul.s $f12, $f12, $f22 -/* 17A804 8024BF24 00000000 */ nop -/* 17A808 8024BF28 3C013F00 */ lui $at, 0x3f00 -/* 17A80C 8024BF2C 4481A000 */ mtc1 $at, $f20 -/* 17A810 8024BF30 00000000 */ nop -/* 17A814 8024BF34 46146302 */ mul.s $f12, $f12, $f20 -/* 17A818 8024BF38 0C00A85B */ jal sin_rad -/* 17A81C 8024BF3C 00000000 */ nop -/* 17A820 8024BF40 46160002 */ mul.s $f0, $f0, $f22 -/* 17A824 8024BF44 00000000 */ nop -/* 17A828 8024BF48 46140302 */ mul.s $f12, $f0, $f20 -/* 17A82C 8024BF4C 0C00A85B */ jal sin_rad -/* 17A830 8024BF50 00000000 */ nop -/* 17A834 8024BF54 46160002 */ mul.s $f0, $f0, $f22 -/* 17A838 8024BF58 00000000 */ nop -/* 17A83C 8024BF5C 46140302 */ mul.s $f12, $f0, $f20 -/* 17A840 8024BF60 0C00A85B */ jal sin_rad -/* 17A844 8024BF64 00000000 */ nop -/* 17A848 8024BF68 08092FE7 */ j .L8024BF9C -/* 17A84C 8024BF6C 4600C101 */ sub.s $f4, $f24, $f0 -.L8024BF70: -/* 17A850 8024BF70 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 17A854 8024BF74 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 17A858 8024BF78 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 17A85C 8024BF7C 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) -/* 17A860 8024BF80 44822000 */ mtc1 $v0, $f4 -/* 17A864 8024BF84 00000000 */ nop -/* 17A868 8024BF88 46802120 */ cvt.s.w $f4, $f4 -/* 17A86C 8024BF8C 44830000 */ mtc1 $v1, $f0 -/* 17A870 8024BF90 00000000 */ nop -/* 17A874 8024BF94 46800020 */ cvt.s.w $f0, $f0 -/* 17A878 8024BF98 46002103 */ div.s $f4, $f4, $f0 -.L8024BF9C: -/* 17A87C 8024BF9C 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 17A880 8024BFA0 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) -/* 17A884 8024BFA4 4604A502 */ mul.s $f20, $f20, $f4 -/* 17A888 8024BFA8 00000000 */ nop -/* 17A88C 8024BFAC 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 17A890 8024BFB0 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) -/* 17A894 8024BFB4 46049482 */ mul.s $f18, $f18, $f4 -/* 17A898 8024BFB8 00000000 */ nop -/* 17A89C 8024BFBC 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 17A8A0 8024BFC0 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) -/* 17A8A4 8024BFC4 46048402 */ mul.s $f16, $f16, $f4 -/* 17A8A8 8024BFC8 00000000 */ nop -/* 17A8AC 8024BFCC 3C01802A */ lui $at, %hi(D_8029F298) -/* 17A8B0 8024BFD0 C426F298 */ lwc1 $f6, %lo(D_8029F298)($at) -/* 17A8B4 8024BFD4 46043182 */ mul.s $f6, $f6, $f4 -/* 17A8B8 8024BFD8 00000000 */ nop -/* 17A8BC 8024BFDC 3C01802A */ lui $at, %hi(D_8029F28C) -/* 17A8C0 8024BFE0 C42CF28C */ lwc1 $f12, %lo(D_8029F28C)($at) -/* 17A8C4 8024BFE4 46046302 */ mul.s $f12, $f12, $f4 -/* 17A8C8 8024BFE8 00000000 */ nop -/* 17A8CC 8024BFEC 3C01802A */ lui $at, %hi(D_8029F290) -/* 17A8D0 8024BFF0 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) -/* 17A8D4 8024BFF4 46044202 */ mul.s $f8, $f8, $f4 -/* 17A8D8 8024BFF8 00000000 */ nop -/* 17A8DC 8024BFFC 3C013F80 */ lui $at, 0x3f80 -/* 17A8E0 8024C000 44811000 */ mtc1 $at, $f2 -/* 17A8E4 8024C004 00000000 */ nop -/* 17A8E8 8024C008 46041081 */ sub.s $f2, $f2, $f4 -/* 17A8EC 8024C00C 4602D682 */ mul.s $f26, $f26, $f2 -/* 17A8F0 8024C010 00000000 */ nop -/* 17A8F4 8024C014 C7BC0010 */ lwc1 $f28, 0x10($sp) -/* 17A8F8 8024C018 4602E602 */ mul.s $f24, $f28, $f2 -/* 17A8FC 8024C01C 00000000 */ nop -/* 17A900 8024C020 3C02802A */ lui $v0, %hi(D_8029F286) -/* 17A904 8024C024 8442F286 */ lh $v0, %lo(D_8029F286)($v0) -/* 17A908 8024C028 44820000 */ mtc1 $v0, $f0 -/* 17A90C 8024C02C 00000000 */ nop -/* 17A910 8024C030 46800020 */ cvt.s.w $f0, $f0 -/* 17A914 8024C034 46020002 */ mul.s $f0, $f0, $f2 -/* 17A918 8024C038 00000000 */ nop -/* 17A91C 8024C03C 4602F582 */ mul.s $f22, $f30, $f2 -/* 17A920 8024C040 00000000 */ nop -/* 17A924 8024C044 3C02802A */ lui $v0, %hi(D_8029F280) -/* 17A928 8024C048 8442F280 */ lh $v0, %lo(D_8029F280)($v0) -/* 17A92C 8024C04C 44827000 */ mtc1 $v0, $f14 -/* 17A930 8024C050 00000000 */ nop -/* 17A934 8024C054 468073A0 */ cvt.s.w $f14, $f14 -/* 17A938 8024C058 46027382 */ mul.s $f14, $f14, $f2 -/* 17A93C 8024C05C 00000000 */ nop -/* 17A940 8024C060 3C02802A */ lui $v0, %hi(D_8029F282) -/* 17A944 8024C064 8442F282 */ lh $v0, %lo(D_8029F282)($v0) -/* 17A948 8024C068 44825000 */ mtc1 $v0, $f10 -/* 17A94C 8024C06C 00000000 */ nop -/* 17A950 8024C070 468052A0 */ cvt.s.w $f10, $f10 -/* 17A954 8024C074 46025282 */ mul.s $f10, $f10, $f2 -/* 17A958 8024C078 00000000 */ nop -/* 17A95C 8024C07C 46003180 */ add.s $f6, $f6, $f0 -/* 17A960 8024C080 3C014380 */ lui $at, 0x4380 -/* 17A964 8024C084 44810000 */ mtc1 $at, $f0 -/* 17A968 8024C088 00000000 */ nop -/* 17A96C 8024C08C 46003182 */ mul.s $f6, $f6, $f0 -/* 17A970 8024C090 00000000 */ nop -/* 17A974 8024C094 3C01802A */ lui $at, %hi(D_8029F294) -/* 17A978 8024C098 C420F294 */ lwc1 $f0, %lo(D_8029F294)($at) -/* 17A97C 8024C09C 46040002 */ mul.s $f0, $f0, $f4 -/* 17A980 8024C0A0 00000000 */ nop -/* 17A984 8024C0A4 461AA500 */ add.s $f20, $f20, $f26 -/* 17A988 8024C0A8 46189480 */ add.s $f18, $f18, $f24 -/* 17A98C 8024C0AC 46168400 */ add.s $f16, $f16, $f22 -/* 17A990 8024C0B0 460E6300 */ add.s $f12, $f12, $f14 -/* 17A994 8024C0B4 3C04802A */ lui $a0, %hi(D_8029F29E) -/* 17A998 8024C0B8 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) -/* 17A99C 8024C0BC 3C02802A */ lui $v0, %hi(D_8029F284) -/* 17A9A0 8024C0C0 8442F284 */ lh $v0, %lo(D_8029F284)($v0) -/* 17A9A4 8024C0C4 460A4200 */ add.s $f8, $f8, $f10 -/* 17A9A8 8024C0C8 E6140054 */ swc1 $f20, 0x54($s0) -/* 17A9AC 8024C0CC 44822000 */ mtc1 $v0, $f4 -/* 17A9B0 8024C0D0 00000000 */ nop -/* 17A9B4 8024C0D4 46802120 */ cvt.s.w $f4, $f4 -/* 17A9B8 8024C0D8 46022102 */ mul.s $f4, $f4, $f2 -/* 17A9BC 8024C0DC 00000000 */ nop -/* 17A9C0 8024C0E0 E6120058 */ swc1 $f18, 0x58($s0) -/* 17A9C4 8024C0E4 E610005C */ swc1 $f16, 0x5c($s0) -/* 17A9C8 8024C0E8 4600670D */ trunc.w.s $f28, $f12 -/* 17A9CC 8024C0EC 4402E000 */ mfc1 $v0, $f28 -/* 17A9D0 8024C0F0 00000000 */ nop -/* 17A9D4 8024C0F4 A602001E */ sh $v0, 0x1e($s0) -/* 17A9D8 8024C0F8 46040000 */ add.s $f0, $f0, $f4 -/* 17A9DC 8024C0FC 4600470D */ trunc.w.s $f28, $f8 -/* 17A9E0 8024C100 4402E000 */ mfc1 $v0, $f28 -/* 17A9E4 8024C104 00000000 */ nop -/* 17A9E8 8024C108 A6020024 */ sh $v0, 0x24($s0) -/* 17A9EC 8024C10C 4600070D */ trunc.w.s $f28, $f0 -/* 17A9F0 8024C110 4402E000 */ mfc1 $v0, $f28 -/* 17A9F4 8024C114 00000000 */ nop -/* 17A9F8 8024C118 A6020022 */ sh $v0, 0x22($s0) -/* 17A9FC 8024C11C 4600370D */ trunc.w.s $f28, $f6 -/* 17AA00 8024C120 4402E000 */ mfc1 $v0, $f28 -/* 17AA04 8024C124 00000000 */ nop -/* 17AA08 8024C128 A6020026 */ sh $v0, 0x26($s0) -/* 17AA0C 8024C12C 84820000 */ lh $v0, ($a0) -/* 17AA10 8024C130 94830000 */ lhu $v1, ($a0) -/* 17AA14 8024C134 14400006 */ bnez $v0, .L8024C150 -/* 17AA18 8024C138 2462FFFF */ addiu $v0, $v1, -1 -/* 17AA1C 8024C13C 24020001 */ addiu $v0, $zero, 1 -/* 17AA20 8024C140 3C01802A */ lui $at, %hi(D_8029F29C) -/* 17AA24 8024C144 A022F29C */ sb $v0, %lo(D_8029F29C)($at) -/* 17AA28 8024C148 08093055 */ j .L8024C154 -/* 17AA2C 8024C14C 00000000 */ nop -.L8024C150: -/* 17AA30 8024C150 A4820000 */ sh $v0, ($a0) -.L8024C154: -/* 17AA34 8024C154 8FBF001C */ lw $ra, 0x1c($sp) -/* 17AA38 8024C158 8FB00018 */ lw $s0, 0x18($sp) -/* 17AA3C 8024C15C D7BE0048 */ ldc1 $f30, 0x48($sp) -/* 17AA40 8024C160 D7BC0040 */ ldc1 $f28, 0x40($sp) -/* 17AA44 8024C164 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* 17AA48 8024C168 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 17AA4C 8024C16C D7B60028 */ ldc1 $f22, 0x28($sp) -/* 17AA50 8024C170 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 17AA54 8024C174 0000102D */ daddu $v0, $zero, $zero -/* 17AA58 8024C178 03E00008 */ jr $ra -/* 17AA5C 8024C17C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/1776B0/func_8024C180.s b/ver/us/asm/nonmatchings/1776B0/func_8024C180.s deleted file mode 100644 index da2e904a2d..0000000000 --- a/ver/us/asm/nonmatchings/1776B0/func_8024C180.s +++ /dev/null @@ -1,263 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024C180 -/* 17AA60 8024C180 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 17AA64 8024C184 AFB00018 */ sw $s0, 0x18($sp) -/* 17AA68 8024C188 3C10800B */ lui $s0, %hi(gCameras+0x558) -/* 17AA6C 8024C18C 261022D8 */ addiu $s0, $s0, %lo(gCameras+0x558) -/* 17AA70 8024C190 AFBF001C */ sw $ra, 0x1c($sp) -/* 17AA74 8024C194 F7BE0048 */ sdc1 $f30, 0x48($sp) -/* 17AA78 8024C198 F7BC0040 */ sdc1 $f28, 0x40($sp) -/* 17AA7C 8024C19C F7BA0038 */ sdc1 $f26, 0x38($sp) -/* 17AA80 8024C1A0 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 17AA84 8024C1A4 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 17AA88 8024C1A8 10A0003D */ beqz $a1, .L8024C2A0 -/* 17AA8C 8024C1AC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 17AA90 8024C1B0 3C01420C */ lui $at, 0x420c -/* 17AA94 8024C1B4 44810000 */ mtc1 $at, $f0 -/* 17AA98 8024C1B8 C6060058 */ lwc1 $f6, 0x58($s0) -/* 17AA9C 8024C1BC 3C01802A */ lui $at, %hi(D_8029F270) -/* 17AAA0 8024C1C0 E420F270 */ swc1 $f0, %lo(D_8029F270)($at) -/* 17AAA4 8024C1C4 3C014270 */ lui $at, 0x4270 -/* 17AAA8 8024C1C8 44810000 */ mtc1 $at, $f0 -/* 17AAAC 8024C1CC 3C02802A */ lui $v0, %hi(D_8029F274) -/* 17AAB0 8024C1D0 2442F274 */ addiu $v0, $v0, %lo(D_8029F274) -/* 17AAB4 8024C1D4 4600303C */ c.lt.s $f6, $f0 -/* 17AAB8 8024C1D8 00000000 */ nop -/* 17AABC 8024C1DC 45000002 */ bc1f .L8024C1E8 -/* 17AAC0 8024C1E0 E4460000 */ swc1 $f6, ($v0) -/* 17AAC4 8024C1E4 E4400000 */ swc1 $f0, ($v0) -.L8024C1E8: -/* 17AAC8 8024C1E8 86040026 */ lh $a0, 0x26($s0) -/* 17AACC 8024C1EC 8603001E */ lh $v1, 0x1e($s0) -/* 17AAD0 8024C1F0 24020008 */ addiu $v0, $zero, 8 -/* 17AAD4 8024C1F4 3C01802A */ lui $at, %hi(D_8029F284) -/* 17AAD8 8024C1F8 A422F284 */ sh $v0, %lo(D_8029F284)($at) -/* 17AADC 8024C1FC 86020022 */ lh $v0, 0x22($s0) -/* 17AAE0 8024C200 44830000 */ mtc1 $v1, $f0 -/* 17AAE4 8024C204 00000000 */ nop -/* 17AAE8 8024C208 46800020 */ cvt.s.w $f0, $f0 -/* 17AAEC 8024C20C 86030024 */ lh $v1, 0x24($s0) -/* 17AAF0 8024C210 3C01802A */ lui $at, %hi(D_8029F278) -/* 17AAF4 8024C214 AC20F278 */ sw $zero, %lo(D_8029F278)($at) -/* 17AAF8 8024C218 3C01802A */ lui $at, %hi(D_8029F282) -/* 17AAFC 8024C21C A420F282 */ sh $zero, %lo(D_8029F282)($at) -/* 17AB00 8024C220 3C01802A */ lui $at, %hi(D_8029F28C) -/* 17AB04 8024C224 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) -/* 17AB08 8024C228 44820000 */ mtc1 $v0, $f0 -/* 17AB0C 8024C22C 00000000 */ nop -/* 17AB10 8024C230 46800020 */ cvt.s.w $f0, $f0 -/* 17AB14 8024C234 3C01802A */ lui $at, %hi(D_8029F294) -/* 17AB18 8024C238 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) -/* 17AB1C 8024C23C 44830000 */ mtc1 $v1, $f0 -/* 17AB20 8024C240 00000000 */ nop -/* 17AB24 8024C244 46800020 */ cvt.s.w $f0, $f0 -/* 17AB28 8024C248 3C01802A */ lui $at, %hi(D_8029F290) -/* 17AB2C 8024C24C E420F290 */ swc1 $f0, %lo(D_8029F290)($at) -/* 17AB30 8024C250 04820001 */ bltzl $a0, .L8024C258 -/* 17AB34 8024C254 248400FF */ addiu $a0, $a0, 0xff -.L8024C258: -/* 17AB38 8024C258 00041203 */ sra $v0, $a0, 8 -/* 17AB3C 8024C25C C6020054 */ lwc1 $f2, 0x54($s0) -/* 17AB40 8024C260 C604005C */ lwc1 $f4, 0x5c($s0) -/* 17AB44 8024C264 3C03802A */ lui $v1, %hi(D_8029F29E) -/* 17AB48 8024C268 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) -/* 17AB4C 8024C26C 44820000 */ mtc1 $v0, $f0 -/* 17AB50 8024C270 00000000 */ nop -/* 17AB54 8024C274 46800020 */ cvt.s.w $f0, $f0 -/* 17AB58 8024C278 3C01802A */ lui $at, %hi(D_8029F298) -/* 17AB5C 8024C27C E420F298 */ swc1 $f0, %lo(D_8029F298)($at) -/* 17AB60 8024C280 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 17AB64 8024C284 E426F2AC */ swc1 $f6, %lo(D_8029F2AC)($at) -/* 17AB68 8024C288 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 17AB6C 8024C28C E422F2A8 */ swc1 $f2, %lo(D_8029F2A8)($at) -/* 17AB70 8024C290 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 17AB74 8024C294 E424F2B0 */ swc1 $f4, %lo(D_8029F2B0)($at) -/* 17AB78 8024C298 3C01802A */ lui $at, %hi(D_8029F2A0) -/* 17AB7C 8024C29C A423F2A0 */ sh $v1, %lo(D_8029F2A0)($at) -.L8024C2A0: -/* 17AB80 8024C2A0 3C01802A */ lui $at, %hi(D_8029F274) -/* 17AB84 8024C2A4 C43CF274 */ lwc1 $f28, %lo(D_8029F274)($at) -/* 17AB88 8024C2A8 3C01802A */ lui $at, %hi(D_8029F270) -/* 17AB8C 8024C2AC C43AF270 */ lwc1 $f26, %lo(D_8029F270)($at) -/* 17AB90 8024C2B0 3C02802A */ lui $v0, %hi(D_8029F2A5) -/* 17AB94 8024C2B4 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) -/* 17AB98 8024C2B8 3C01802A */ lui $at, %hi(D_8029F278) -/* 17AB9C 8024C2BC C43EF278 */ lwc1 $f30, %lo(D_8029F278)($at) -/* 17ABA0 8024C2C0 14400027 */ bnez $v0, .L8024C360 -/* 17ABA4 8024C2C4 E7BC0010 */ swc1 $f28, 0x10($sp) -/* 17ABA8 8024C2C8 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 17ABAC 8024C2CC 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 17ABB0 8024C2D0 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 17ABB4 8024C2D4 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) -/* 17ABB8 8024C2D8 3C013F80 */ lui $at, 0x3f80 -/* 17ABBC 8024C2DC 4481C000 */ mtc1 $at, $f24 -/* 17ABC0 8024C2E0 44822000 */ mtc1 $v0, $f4 -/* 17ABC4 8024C2E4 00000000 */ nop -/* 17ABC8 8024C2E8 46802120 */ cvt.s.w $f4, $f4 -/* 17ABCC 8024C2EC 44830000 */ mtc1 $v1, $f0 -/* 17ABD0 8024C2F0 00000000 */ nop -/* 17ABD4 8024C2F4 46800020 */ cvt.s.w $f0, $f0 -/* 17ABD8 8024C2F8 46002103 */ div.s $f4, $f4, $f0 -/* 17ABDC 8024C2FC 4604C301 */ sub.s $f12, $f24, $f4 -/* 17ABE0 8024C300 3C014049 */ lui $at, 0x4049 -/* 17ABE4 8024C304 34210FD0 */ ori $at, $at, 0xfd0 -/* 17ABE8 8024C308 4481B000 */ mtc1 $at, $f22 -/* 17ABEC 8024C30C 00000000 */ nop -/* 17ABF0 8024C310 46166302 */ mul.s $f12, $f12, $f22 -/* 17ABF4 8024C314 00000000 */ nop -/* 17ABF8 8024C318 3C013F00 */ lui $at, 0x3f00 -/* 17ABFC 8024C31C 4481A000 */ mtc1 $at, $f20 -/* 17AC00 8024C320 00000000 */ nop -/* 17AC04 8024C324 46146302 */ mul.s $f12, $f12, $f20 -/* 17AC08 8024C328 0C00A85B */ jal sin_rad -/* 17AC0C 8024C32C 00000000 */ nop -/* 17AC10 8024C330 46160002 */ mul.s $f0, $f0, $f22 -/* 17AC14 8024C334 00000000 */ nop -/* 17AC18 8024C338 46140302 */ mul.s $f12, $f0, $f20 -/* 17AC1C 8024C33C 0C00A85B */ jal sin_rad -/* 17AC20 8024C340 00000000 */ nop -/* 17AC24 8024C344 46160002 */ mul.s $f0, $f0, $f22 -/* 17AC28 8024C348 00000000 */ nop -/* 17AC2C 8024C34C 46140302 */ mul.s $f12, $f0, $f20 -/* 17AC30 8024C350 0C00A85B */ jal sin_rad -/* 17AC34 8024C354 00000000 */ nop -/* 17AC38 8024C358 080930E3 */ j .L8024C38C -/* 17AC3C 8024C35C 4600C101 */ sub.s $f4, $f24, $f0 -.L8024C360: -/* 17AC40 8024C360 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 17AC44 8024C364 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 17AC48 8024C368 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 17AC4C 8024C36C 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) -/* 17AC50 8024C370 44822000 */ mtc1 $v0, $f4 -/* 17AC54 8024C374 00000000 */ nop -/* 17AC58 8024C378 46802120 */ cvt.s.w $f4, $f4 -/* 17AC5C 8024C37C 44830000 */ mtc1 $v1, $f0 -/* 17AC60 8024C380 00000000 */ nop -/* 17AC64 8024C384 46800020 */ cvt.s.w $f0, $f0 -/* 17AC68 8024C388 46002103 */ div.s $f4, $f4, $f0 -.L8024C38C: -/* 17AC6C 8024C38C 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 17AC70 8024C390 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) -/* 17AC74 8024C394 4604A502 */ mul.s $f20, $f20, $f4 -/* 17AC78 8024C398 00000000 */ nop -/* 17AC7C 8024C39C 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 17AC80 8024C3A0 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) -/* 17AC84 8024C3A4 46049482 */ mul.s $f18, $f18, $f4 -/* 17AC88 8024C3A8 00000000 */ nop -/* 17AC8C 8024C3AC 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 17AC90 8024C3B0 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) -/* 17AC94 8024C3B4 46048402 */ mul.s $f16, $f16, $f4 -/* 17AC98 8024C3B8 00000000 */ nop -/* 17AC9C 8024C3BC 3C01802A */ lui $at, %hi(D_8029F298) -/* 17ACA0 8024C3C0 C426F298 */ lwc1 $f6, %lo(D_8029F298)($at) -/* 17ACA4 8024C3C4 46043182 */ mul.s $f6, $f6, $f4 -/* 17ACA8 8024C3C8 00000000 */ nop -/* 17ACAC 8024C3CC 3C01802A */ lui $at, %hi(D_8029F28C) -/* 17ACB0 8024C3D0 C42CF28C */ lwc1 $f12, %lo(D_8029F28C)($at) -/* 17ACB4 8024C3D4 46046302 */ mul.s $f12, $f12, $f4 -/* 17ACB8 8024C3D8 00000000 */ nop -/* 17ACBC 8024C3DC 3C01802A */ lui $at, %hi(D_8029F290) -/* 17ACC0 8024C3E0 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) -/* 17ACC4 8024C3E4 46044202 */ mul.s $f8, $f8, $f4 -/* 17ACC8 8024C3E8 00000000 */ nop -/* 17ACCC 8024C3EC 3C013F80 */ lui $at, 0x3f80 -/* 17ACD0 8024C3F0 44811000 */ mtc1 $at, $f2 -/* 17ACD4 8024C3F4 00000000 */ nop -/* 17ACD8 8024C3F8 46041081 */ sub.s $f2, $f2, $f4 -/* 17ACDC 8024C3FC 4602D682 */ mul.s $f26, $f26, $f2 -/* 17ACE0 8024C400 00000000 */ nop -/* 17ACE4 8024C404 C7BC0010 */ lwc1 $f28, 0x10($sp) -/* 17ACE8 8024C408 4602E602 */ mul.s $f24, $f28, $f2 -/* 17ACEC 8024C40C 00000000 */ nop -/* 17ACF0 8024C410 3C02802A */ lui $v0, %hi(D_8029F286) -/* 17ACF4 8024C414 8442F286 */ lh $v0, %lo(D_8029F286)($v0) -/* 17ACF8 8024C418 44820000 */ mtc1 $v0, $f0 -/* 17ACFC 8024C41C 00000000 */ nop -/* 17AD00 8024C420 46800020 */ cvt.s.w $f0, $f0 -/* 17AD04 8024C424 46020002 */ mul.s $f0, $f0, $f2 -/* 17AD08 8024C428 00000000 */ nop -/* 17AD0C 8024C42C 4602F582 */ mul.s $f22, $f30, $f2 -/* 17AD10 8024C430 00000000 */ nop -/* 17AD14 8024C434 3C02802A */ lui $v0, %hi(D_8029F280) -/* 17AD18 8024C438 8442F280 */ lh $v0, %lo(D_8029F280)($v0) -/* 17AD1C 8024C43C 44827000 */ mtc1 $v0, $f14 -/* 17AD20 8024C440 00000000 */ nop -/* 17AD24 8024C444 468073A0 */ cvt.s.w $f14, $f14 -/* 17AD28 8024C448 46027382 */ mul.s $f14, $f14, $f2 -/* 17AD2C 8024C44C 00000000 */ nop -/* 17AD30 8024C450 3C02802A */ lui $v0, %hi(D_8029F282) -/* 17AD34 8024C454 8442F282 */ lh $v0, %lo(D_8029F282)($v0) -/* 17AD38 8024C458 44825000 */ mtc1 $v0, $f10 -/* 17AD3C 8024C45C 00000000 */ nop -/* 17AD40 8024C460 468052A0 */ cvt.s.w $f10, $f10 -/* 17AD44 8024C464 46025282 */ mul.s $f10, $f10, $f2 -/* 17AD48 8024C468 00000000 */ nop -/* 17AD4C 8024C46C 46003180 */ add.s $f6, $f6, $f0 -/* 17AD50 8024C470 3C014380 */ lui $at, 0x4380 -/* 17AD54 8024C474 44810000 */ mtc1 $at, $f0 -/* 17AD58 8024C478 00000000 */ nop -/* 17AD5C 8024C47C 46003182 */ mul.s $f6, $f6, $f0 -/* 17AD60 8024C480 00000000 */ nop -/* 17AD64 8024C484 3C01802A */ lui $at, %hi(D_8029F294) -/* 17AD68 8024C488 C420F294 */ lwc1 $f0, %lo(D_8029F294)($at) -/* 17AD6C 8024C48C 46040002 */ mul.s $f0, $f0, $f4 -/* 17AD70 8024C490 00000000 */ nop -/* 17AD74 8024C494 461AA500 */ add.s $f20, $f20, $f26 -/* 17AD78 8024C498 46189480 */ add.s $f18, $f18, $f24 -/* 17AD7C 8024C49C 46168400 */ add.s $f16, $f16, $f22 -/* 17AD80 8024C4A0 460E6300 */ add.s $f12, $f12, $f14 -/* 17AD84 8024C4A4 3C04802A */ lui $a0, %hi(D_8029F29E) -/* 17AD88 8024C4A8 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) -/* 17AD8C 8024C4AC 3C02802A */ lui $v0, %hi(D_8029F284) -/* 17AD90 8024C4B0 8442F284 */ lh $v0, %lo(D_8029F284)($v0) -/* 17AD94 8024C4B4 460A4200 */ add.s $f8, $f8, $f10 -/* 17AD98 8024C4B8 E6140054 */ swc1 $f20, 0x54($s0) -/* 17AD9C 8024C4BC 44822000 */ mtc1 $v0, $f4 -/* 17ADA0 8024C4C0 00000000 */ nop -/* 17ADA4 8024C4C4 46802120 */ cvt.s.w $f4, $f4 -/* 17ADA8 8024C4C8 46022102 */ mul.s $f4, $f4, $f2 -/* 17ADAC 8024C4CC 00000000 */ nop -/* 17ADB0 8024C4D0 E6120058 */ swc1 $f18, 0x58($s0) -/* 17ADB4 8024C4D4 E610005C */ swc1 $f16, 0x5c($s0) -/* 17ADB8 8024C4D8 4600670D */ trunc.w.s $f28, $f12 -/* 17ADBC 8024C4DC 4402E000 */ mfc1 $v0, $f28 -/* 17ADC0 8024C4E0 00000000 */ nop -/* 17ADC4 8024C4E4 A602001E */ sh $v0, 0x1e($s0) -/* 17ADC8 8024C4E8 46040000 */ add.s $f0, $f0, $f4 -/* 17ADCC 8024C4EC 4600470D */ trunc.w.s $f28, $f8 -/* 17ADD0 8024C4F0 4402E000 */ mfc1 $v0, $f28 -/* 17ADD4 8024C4F4 00000000 */ nop -/* 17ADD8 8024C4F8 A6020024 */ sh $v0, 0x24($s0) -/* 17ADDC 8024C4FC 4600070D */ trunc.w.s $f28, $f0 -/* 17ADE0 8024C500 4402E000 */ mfc1 $v0, $f28 -/* 17ADE4 8024C504 00000000 */ nop -/* 17ADE8 8024C508 A6020022 */ sh $v0, 0x22($s0) -/* 17ADEC 8024C50C 4600370D */ trunc.w.s $f28, $f6 -/* 17ADF0 8024C510 4402E000 */ mfc1 $v0, $f28 -/* 17ADF4 8024C514 00000000 */ nop -/* 17ADF8 8024C518 A6020026 */ sh $v0, 0x26($s0) -/* 17ADFC 8024C51C 84820000 */ lh $v0, ($a0) -/* 17AE00 8024C520 94830000 */ lhu $v1, ($a0) -/* 17AE04 8024C524 14400006 */ bnez $v0, .L8024C540 -/* 17AE08 8024C528 2462FFFF */ addiu $v0, $v1, -1 -/* 17AE0C 8024C52C 24020001 */ addiu $v0, $zero, 1 -/* 17AE10 8024C530 3C01802A */ lui $at, %hi(D_8029F29C) -/* 17AE14 8024C534 A022F29C */ sb $v0, %lo(D_8029F29C)($at) -/* 17AE18 8024C538 08093151 */ j .L8024C544 -/* 17AE1C 8024C53C 00000000 */ nop -.L8024C540: -/* 17AE20 8024C540 A4820000 */ sh $v0, ($a0) -.L8024C544: -/* 17AE24 8024C544 8FBF001C */ lw $ra, 0x1c($sp) -/* 17AE28 8024C548 8FB00018 */ lw $s0, 0x18($sp) -/* 17AE2C 8024C54C D7BE0048 */ ldc1 $f30, 0x48($sp) -/* 17AE30 8024C550 D7BC0040 */ ldc1 $f28, 0x40($sp) -/* 17AE34 8024C554 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* 17AE38 8024C558 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 17AE3C 8024C55C D7B60028 */ ldc1 $f22, 0x28($sp) -/* 17AE40 8024C560 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 17AE44 8024C564 0000102D */ daddu $v0, $zero, $zero -/* 17AE48 8024C568 03E00008 */ jr $ra -/* 17AE4C 8024C56C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/1776B0/func_8024C570.s b/ver/us/asm/nonmatchings/1776B0/func_8024C570.s deleted file mode 100644 index 582d7585de..0000000000 --- a/ver/us/asm/nonmatchings/1776B0/func_8024C570.s +++ /dev/null @@ -1,256 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024C570 -/* 17AE50 8024C570 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 17AE54 8024C574 AFB00018 */ sw $s0, 0x18($sp) -/* 17AE58 8024C578 3C10800B */ lui $s0, %hi(gCameras+0x558) -/* 17AE5C 8024C57C 261022D8 */ addiu $s0, $s0, %lo(gCameras+0x558) -/* 17AE60 8024C580 AFBF001C */ sw $ra, 0x1c($sp) -/* 17AE64 8024C584 F7BE0048 */ sdc1 $f30, 0x48($sp) -/* 17AE68 8024C588 F7BC0040 */ sdc1 $f28, 0x40($sp) -/* 17AE6C 8024C58C F7BA0038 */ sdc1 $f26, 0x38($sp) -/* 17AE70 8024C590 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 17AE74 8024C594 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 17AE78 8024C598 10A00036 */ beqz $a1, .L8024C674 -/* 17AE7C 8024C59C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 17AE80 8024C5A0 3C02802A */ lui $v0, %hi(D_8029F2A4) -/* 17AE84 8024C5A4 8042F2A4 */ lb $v0, %lo(D_8029F2A4)($v0) -/* 17AE88 8024C5A8 1040000A */ beqz $v0, .L8024C5D4 -/* 17AE8C 8024C5AC 00000000 */ nop -/* 17AE90 8024C5B0 C6000054 */ lwc1 $f0, 0x54($s0) -/* 17AE94 8024C5B4 C6020058 */ lwc1 $f2, 0x58($s0) -/* 17AE98 8024C5B8 C604005C */ lwc1 $f4, 0x5c($s0) -/* 17AE9C 8024C5BC 3C01802A */ lui $at, %hi(D_8029F270) -/* 17AEA0 8024C5C0 E420F270 */ swc1 $f0, %lo(D_8029F270)($at) -/* 17AEA4 8024C5C4 3C01802A */ lui $at, %hi(D_8029F274) -/* 17AEA8 8024C5C8 E422F274 */ swc1 $f2, %lo(D_8029F274)($at) -/* 17AEAC 8024C5CC 3C01802A */ lui $at, %hi(D_8029F278) -/* 17AEB0 8024C5D0 E424F278 */ swc1 $f4, %lo(D_8029F278)($at) -.L8024C5D4: -/* 17AEB4 8024C5D4 8602001E */ lh $v0, 0x1e($s0) -/* 17AEB8 8024C5D8 86040026 */ lh $a0, 0x26($s0) -/* 17AEBC 8024C5DC 86030024 */ lh $v1, 0x24($s0) -/* 17AEC0 8024C5E0 44820000 */ mtc1 $v0, $f0 -/* 17AEC4 8024C5E4 00000000 */ nop -/* 17AEC8 8024C5E8 46800020 */ cvt.s.w $f0, $f0 -/* 17AECC 8024C5EC 86020022 */ lh $v0, 0x22($s0) -/* 17AED0 8024C5F0 3C01802A */ lui $at, %hi(D_8029F28C) -/* 17AED4 8024C5F4 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) -/* 17AED8 8024C5F8 44820000 */ mtc1 $v0, $f0 -/* 17AEDC 8024C5FC 00000000 */ nop -/* 17AEE0 8024C600 46800020 */ cvt.s.w $f0, $f0 -/* 17AEE4 8024C604 3C01802A */ lui $at, %hi(D_8029F294) -/* 17AEE8 8024C608 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) -/* 17AEEC 8024C60C 44830000 */ mtc1 $v1, $f0 -/* 17AEF0 8024C610 00000000 */ nop -/* 17AEF4 8024C614 46800020 */ cvt.s.w $f0, $f0 -/* 17AEF8 8024C618 3C01802A */ lui $at, %hi(D_8029F290) -/* 17AEFC 8024C61C E420F290 */ swc1 $f0, %lo(D_8029F290)($at) -/* 17AF00 8024C620 04820001 */ bltzl $a0, .L8024C628 -/* 17AF04 8024C624 248400FF */ addiu $a0, $a0, 0xff -.L8024C628: -/* 17AF08 8024C628 00041203 */ sra $v0, $a0, 8 -/* 17AF0C 8024C62C C6020054 */ lwc1 $f2, 0x54($s0) -/* 17AF10 8024C630 C6040058 */ lwc1 $f4, 0x58($s0) -/* 17AF14 8024C634 C606005C */ lwc1 $f6, 0x5c($s0) -/* 17AF18 8024C638 3C03802A */ lui $v1, %hi(D_8029F29E) -/* 17AF1C 8024C63C 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) -/* 17AF20 8024C640 44820000 */ mtc1 $v0, $f0 -/* 17AF24 8024C644 00000000 */ nop -/* 17AF28 8024C648 46800020 */ cvt.s.w $f0, $f0 -/* 17AF2C 8024C64C 3C01802A */ lui $at, %hi(D_8029F298) -/* 17AF30 8024C650 E420F298 */ swc1 $f0, %lo(D_8029F298)($at) -/* 17AF34 8024C654 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 17AF38 8024C658 E422F2A8 */ swc1 $f2, %lo(D_8029F2A8)($at) -/* 17AF3C 8024C65C 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 17AF40 8024C660 E424F2AC */ swc1 $f4, %lo(D_8029F2AC)($at) -/* 17AF44 8024C664 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 17AF48 8024C668 E426F2B0 */ swc1 $f6, %lo(D_8029F2B0)($at) -/* 17AF4C 8024C66C 3C01802A */ lui $at, %hi(D_8029F2A0) -/* 17AF50 8024C670 A423F2A0 */ sh $v1, %lo(D_8029F2A0)($at) -.L8024C674: -/* 17AF54 8024C674 3C01802A */ lui $at, %hi(D_8029F274) -/* 17AF58 8024C678 C43CF274 */ lwc1 $f28, %lo(D_8029F274)($at) -/* 17AF5C 8024C67C 3C01802A */ lui $at, %hi(D_8029F270) -/* 17AF60 8024C680 C43AF270 */ lwc1 $f26, %lo(D_8029F270)($at) -/* 17AF64 8024C684 3C02802A */ lui $v0, %hi(D_8029F2A5) -/* 17AF68 8024C688 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) -/* 17AF6C 8024C68C 3C01802A */ lui $at, %hi(D_8029F278) -/* 17AF70 8024C690 C43EF278 */ lwc1 $f30, %lo(D_8029F278)($at) -/* 17AF74 8024C694 14400027 */ bnez $v0, .L8024C734 -/* 17AF78 8024C698 E7BC0010 */ swc1 $f28, 0x10($sp) -/* 17AF7C 8024C69C 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 17AF80 8024C6A0 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 17AF84 8024C6A4 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 17AF88 8024C6A8 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) -/* 17AF8C 8024C6AC 3C013F80 */ lui $at, 0x3f80 -/* 17AF90 8024C6B0 4481C000 */ mtc1 $at, $f24 -/* 17AF94 8024C6B4 44822000 */ mtc1 $v0, $f4 -/* 17AF98 8024C6B8 00000000 */ nop -/* 17AF9C 8024C6BC 46802120 */ cvt.s.w $f4, $f4 -/* 17AFA0 8024C6C0 44830000 */ mtc1 $v1, $f0 -/* 17AFA4 8024C6C4 00000000 */ nop -/* 17AFA8 8024C6C8 46800020 */ cvt.s.w $f0, $f0 -/* 17AFAC 8024C6CC 46002103 */ div.s $f4, $f4, $f0 -/* 17AFB0 8024C6D0 4604C301 */ sub.s $f12, $f24, $f4 -/* 17AFB4 8024C6D4 3C014049 */ lui $at, 0x4049 -/* 17AFB8 8024C6D8 34210FD0 */ ori $at, $at, 0xfd0 -/* 17AFBC 8024C6DC 4481B000 */ mtc1 $at, $f22 -/* 17AFC0 8024C6E0 00000000 */ nop -/* 17AFC4 8024C6E4 46166302 */ mul.s $f12, $f12, $f22 -/* 17AFC8 8024C6E8 00000000 */ nop -/* 17AFCC 8024C6EC 3C013F00 */ lui $at, 0x3f00 -/* 17AFD0 8024C6F0 4481A000 */ mtc1 $at, $f20 -/* 17AFD4 8024C6F4 00000000 */ nop -/* 17AFD8 8024C6F8 46146302 */ mul.s $f12, $f12, $f20 -/* 17AFDC 8024C6FC 0C00A85B */ jal sin_rad -/* 17AFE0 8024C700 00000000 */ nop -/* 17AFE4 8024C704 46160002 */ mul.s $f0, $f0, $f22 -/* 17AFE8 8024C708 00000000 */ nop -/* 17AFEC 8024C70C 46140302 */ mul.s $f12, $f0, $f20 -/* 17AFF0 8024C710 0C00A85B */ jal sin_rad -/* 17AFF4 8024C714 00000000 */ nop -/* 17AFF8 8024C718 46160002 */ mul.s $f0, $f0, $f22 -/* 17AFFC 8024C71C 00000000 */ nop -/* 17B000 8024C720 46140302 */ mul.s $f12, $f0, $f20 -/* 17B004 8024C724 0C00A85B */ jal sin_rad -/* 17B008 8024C728 00000000 */ nop -/* 17B00C 8024C72C 080931D8 */ j .L8024C760 -/* 17B010 8024C730 4600C101 */ sub.s $f4, $f24, $f0 -.L8024C734: -/* 17B014 8024C734 3C02802A */ lui $v0, %hi(D_8029F29E) -/* 17B018 8024C738 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) -/* 17B01C 8024C73C 3C03802A */ lui $v1, %hi(D_8029F2A0) -/* 17B020 8024C740 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) -/* 17B024 8024C744 44822000 */ mtc1 $v0, $f4 -/* 17B028 8024C748 00000000 */ nop -/* 17B02C 8024C74C 46802120 */ cvt.s.w $f4, $f4 -/* 17B030 8024C750 44830000 */ mtc1 $v1, $f0 -/* 17B034 8024C754 00000000 */ nop -/* 17B038 8024C758 46800020 */ cvt.s.w $f0, $f0 -/* 17B03C 8024C75C 46002103 */ div.s $f4, $f4, $f0 -.L8024C760: -/* 17B040 8024C760 3C01802A */ lui $at, %hi(D_8029F2A8) -/* 17B044 8024C764 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) -/* 17B048 8024C768 4604A502 */ mul.s $f20, $f20, $f4 -/* 17B04C 8024C76C 00000000 */ nop -/* 17B050 8024C770 3C01802A */ lui $at, %hi(D_8029F2AC) -/* 17B054 8024C774 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) -/* 17B058 8024C778 46049482 */ mul.s $f18, $f18, $f4 -/* 17B05C 8024C77C 00000000 */ nop -/* 17B060 8024C780 3C01802A */ lui $at, %hi(D_8029F2B0) -/* 17B064 8024C784 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) -/* 17B068 8024C788 46048402 */ mul.s $f16, $f16, $f4 -/* 17B06C 8024C78C 00000000 */ nop -/* 17B070 8024C790 3C01802A */ lui $at, %hi(D_8029F298) -/* 17B074 8024C794 C426F298 */ lwc1 $f6, %lo(D_8029F298)($at) -/* 17B078 8024C798 46043182 */ mul.s $f6, $f6, $f4 -/* 17B07C 8024C79C 00000000 */ nop -/* 17B080 8024C7A0 3C01802A */ lui $at, %hi(D_8029F28C) -/* 17B084 8024C7A4 C42CF28C */ lwc1 $f12, %lo(D_8029F28C)($at) -/* 17B088 8024C7A8 46046302 */ mul.s $f12, $f12, $f4 -/* 17B08C 8024C7AC 00000000 */ nop -/* 17B090 8024C7B0 3C01802A */ lui $at, %hi(D_8029F290) -/* 17B094 8024C7B4 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) -/* 17B098 8024C7B8 46044202 */ mul.s $f8, $f8, $f4 -/* 17B09C 8024C7BC 00000000 */ nop -/* 17B0A0 8024C7C0 3C013F80 */ lui $at, 0x3f80 -/* 17B0A4 8024C7C4 44811000 */ mtc1 $at, $f2 -/* 17B0A8 8024C7C8 00000000 */ nop -/* 17B0AC 8024C7CC 46041081 */ sub.s $f2, $f2, $f4 -/* 17B0B0 8024C7D0 4602D682 */ mul.s $f26, $f26, $f2 -/* 17B0B4 8024C7D4 00000000 */ nop -/* 17B0B8 8024C7D8 C7BC0010 */ lwc1 $f28, 0x10($sp) -/* 17B0BC 8024C7DC 4602E602 */ mul.s $f24, $f28, $f2 -/* 17B0C0 8024C7E0 00000000 */ nop -/* 17B0C4 8024C7E4 3C02802A */ lui $v0, %hi(D_8029F286) -/* 17B0C8 8024C7E8 8442F286 */ lh $v0, %lo(D_8029F286)($v0) -/* 17B0CC 8024C7EC 44820000 */ mtc1 $v0, $f0 -/* 17B0D0 8024C7F0 00000000 */ nop -/* 17B0D4 8024C7F4 46800020 */ cvt.s.w $f0, $f0 -/* 17B0D8 8024C7F8 46020002 */ mul.s $f0, $f0, $f2 -/* 17B0DC 8024C7FC 00000000 */ nop -/* 17B0E0 8024C800 4602F582 */ mul.s $f22, $f30, $f2 -/* 17B0E4 8024C804 00000000 */ nop -/* 17B0E8 8024C808 3C02802A */ lui $v0, %hi(D_8029F280) -/* 17B0EC 8024C80C 8442F280 */ lh $v0, %lo(D_8029F280)($v0) -/* 17B0F0 8024C810 44827000 */ mtc1 $v0, $f14 -/* 17B0F4 8024C814 00000000 */ nop -/* 17B0F8 8024C818 468073A0 */ cvt.s.w $f14, $f14 -/* 17B0FC 8024C81C 46027382 */ mul.s $f14, $f14, $f2 -/* 17B100 8024C820 00000000 */ nop -/* 17B104 8024C824 3C02802A */ lui $v0, %hi(D_8029F282) -/* 17B108 8024C828 8442F282 */ lh $v0, %lo(D_8029F282)($v0) -/* 17B10C 8024C82C 44825000 */ mtc1 $v0, $f10 -/* 17B110 8024C830 00000000 */ nop -/* 17B114 8024C834 468052A0 */ cvt.s.w $f10, $f10 -/* 17B118 8024C838 46025282 */ mul.s $f10, $f10, $f2 -/* 17B11C 8024C83C 00000000 */ nop -/* 17B120 8024C840 46003180 */ add.s $f6, $f6, $f0 -/* 17B124 8024C844 3C014380 */ lui $at, 0x4380 -/* 17B128 8024C848 44810000 */ mtc1 $at, $f0 -/* 17B12C 8024C84C 00000000 */ nop -/* 17B130 8024C850 46003182 */ mul.s $f6, $f6, $f0 -/* 17B134 8024C854 00000000 */ nop -/* 17B138 8024C858 3C01802A */ lui $at, %hi(D_8029F294) -/* 17B13C 8024C85C C420F294 */ lwc1 $f0, %lo(D_8029F294)($at) -/* 17B140 8024C860 46040002 */ mul.s $f0, $f0, $f4 -/* 17B144 8024C864 00000000 */ nop -/* 17B148 8024C868 461AA500 */ add.s $f20, $f20, $f26 -/* 17B14C 8024C86C 46189480 */ add.s $f18, $f18, $f24 -/* 17B150 8024C870 46168400 */ add.s $f16, $f16, $f22 -/* 17B154 8024C874 460E6300 */ add.s $f12, $f12, $f14 -/* 17B158 8024C878 3C04802A */ lui $a0, %hi(D_8029F29E) -/* 17B15C 8024C87C 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) -/* 17B160 8024C880 3C02802A */ lui $v0, %hi(D_8029F284) -/* 17B164 8024C884 8442F284 */ lh $v0, %lo(D_8029F284)($v0) -/* 17B168 8024C888 460A4200 */ add.s $f8, $f8, $f10 -/* 17B16C 8024C88C E6140054 */ swc1 $f20, 0x54($s0) -/* 17B170 8024C890 44822000 */ mtc1 $v0, $f4 -/* 17B174 8024C894 00000000 */ nop -/* 17B178 8024C898 46802120 */ cvt.s.w $f4, $f4 -/* 17B17C 8024C89C 46022102 */ mul.s $f4, $f4, $f2 -/* 17B180 8024C8A0 00000000 */ nop -/* 17B184 8024C8A4 E6120058 */ swc1 $f18, 0x58($s0) -/* 17B188 8024C8A8 E610005C */ swc1 $f16, 0x5c($s0) -/* 17B18C 8024C8AC 4600670D */ trunc.w.s $f28, $f12 -/* 17B190 8024C8B0 4402E000 */ mfc1 $v0, $f28 -/* 17B194 8024C8B4 00000000 */ nop -/* 17B198 8024C8B8 A602001E */ sh $v0, 0x1e($s0) -/* 17B19C 8024C8BC 46040000 */ add.s $f0, $f0, $f4 -/* 17B1A0 8024C8C0 4600470D */ trunc.w.s $f28, $f8 -/* 17B1A4 8024C8C4 4402E000 */ mfc1 $v0, $f28 -/* 17B1A8 8024C8C8 00000000 */ nop -/* 17B1AC 8024C8CC A6020024 */ sh $v0, 0x24($s0) -/* 17B1B0 8024C8D0 4600070D */ trunc.w.s $f28, $f0 -/* 17B1B4 8024C8D4 4402E000 */ mfc1 $v0, $f28 -/* 17B1B8 8024C8D8 00000000 */ nop -/* 17B1BC 8024C8DC A6020022 */ sh $v0, 0x22($s0) -/* 17B1C0 8024C8E0 4600370D */ trunc.w.s $f28, $f6 -/* 17B1C4 8024C8E4 4402E000 */ mfc1 $v0, $f28 -/* 17B1C8 8024C8E8 00000000 */ nop -/* 17B1CC 8024C8EC A6020026 */ sh $v0, 0x26($s0) -/* 17B1D0 8024C8F0 84820000 */ lh $v0, ($a0) -/* 17B1D4 8024C8F4 94830000 */ lhu $v1, ($a0) -/* 17B1D8 8024C8F8 14400006 */ bnez $v0, .L8024C914 -/* 17B1DC 8024C8FC 2462FFFF */ addiu $v0, $v1, -1 -/* 17B1E0 8024C900 24020001 */ addiu $v0, $zero, 1 -/* 17B1E4 8024C904 3C01802A */ lui $at, %hi(D_8029F29C) -/* 17B1E8 8024C908 A022F29C */ sb $v0, %lo(D_8029F29C)($at) -/* 17B1EC 8024C90C 08093246 */ j .L8024C918 -/* 17B1F0 8024C910 00000000 */ nop -.L8024C914: -/* 17B1F4 8024C914 A4820000 */ sh $v0, ($a0) -.L8024C918: -/* 17B1F8 8024C918 8FBF001C */ lw $ra, 0x1c($sp) -/* 17B1FC 8024C91C 8FB00018 */ lw $s0, 0x18($sp) -/* 17B200 8024C920 D7BE0048 */ ldc1 $f30, 0x48($sp) -/* 17B204 8024C924 D7BC0040 */ ldc1 $f28, 0x40($sp) -/* 17B208 8024C928 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* 17B20C 8024C92C D7B80030 */ ldc1 $f24, 0x30($sp) -/* 17B210 8024C930 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 17B214 8024C934 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 17B218 8024C938 0000102D */ daddu $v0, $zero, $zero -/* 17B21C 8024C93C 03E00008 */ jr $ra -/* 17B220 8024C940 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/1776B0/func_8024CB68.s b/ver/us/asm/nonmatchings/1776B0/func_8024CB68.s deleted file mode 100644 index 1f0940ad72..0000000000 --- a/ver/us/asm/nonmatchings/1776B0/func_8024CB68.s +++ /dev/null @@ -1,240 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8029CC30 -.double 0.01 - -dlabel D_8029CC38 -.double 0.01 - -dlabel D_8029CC40 -.double 0.01 - -.section .text - -glabel func_8024CB68 -/* 17B448 8024CB68 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 17B44C 8024CB6C AFB00030 */ sw $s0, 0x30($sp) -/* 17B450 8024CB70 3C10800B */ lui $s0, %hi(gCameras+0x558) -/* 17B454 8024CB74 261022D8 */ addiu $s0, $s0, %lo(gCameras+0x558) -/* 17B458 8024CB78 3C02802A */ lui $v0, %hi(D_8029F27C) -/* 17B45C 8024CB7C 9442F27C */ lhu $v0, %lo(D_8029F27C)($v0) -/* 17B460 8024CB80 3C04800E */ lui $a0, %hi(gBattleStatus) -/* 17B464 8024CB84 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) -/* 17B468 8024CB88 AFBF0034 */ sw $ra, 0x34($sp) -/* 17B46C 8024CB8C F7B80048 */ sdc1 $f24, 0x48($sp) -/* 17B470 8024CB90 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 17B474 8024CB94 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 17B478 8024CB98 30430700 */ andi $v1, $v0, 0x700 -/* 17B47C 8024CB9C 304600FF */ andi $a2, $v0, 0xff -/* 17B480 8024CBA0 24020100 */ addiu $v0, $zero, 0x100 -/* 17B484 8024CBA4 10620018 */ beq $v1, $v0, .L8024CC08 -/* 17B488 8024CBA8 28620101 */ slti $v0, $v1, 0x101 -/* 17B48C 8024CBAC 10400019 */ beqz $v0, .L8024CC14 -/* 17B490 8024CBB0 00061080 */ sll $v0, $a2, 2 -/* 17B494 8024CBB4 14600018 */ bnez $v1, .L8024CC18 -/* 17B498 8024CBB8 00821021 */ addu $v0, $a0, $v0 -/* 17B49C 8024CBBC 8C8400D8 */ lw $a0, 0xd8($a0) -/* 17B4A0 8024CBC0 108000AF */ beqz $a0, .L8024CE80 -/* 17B4A4 8024CBC4 0000102D */ daddu $v0, $zero, $zero -/* 17B4A8 8024CBC8 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 17B4AC 8024CBCC 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 17B4B0 8024CBD0 C4940144 */ lwc1 $f20, 0x144($a0) -/* 17B4B4 8024CBD4 944200B0 */ lhu $v0, 0xb0($v0) -/* 17B4B8 8024CBD8 C498014C */ lwc1 $f24, 0x14c($a0) -/* 17B4BC 8024CBDC C4820148 */ lwc1 $f2, 0x148($a0) -/* 17B4C0 8024CBE0 00021400 */ sll $v0, $v0, 0x10 -/* 17B4C4 8024CBE4 00021C03 */ sra $v1, $v0, 0x10 -/* 17B4C8 8024CBE8 000217C2 */ srl $v0, $v0, 0x1f -/* 17B4CC 8024CBEC 00621821 */ addu $v1, $v1, $v0 -/* 17B4D0 8024CBF0 00031843 */ sra $v1, $v1, 1 -/* 17B4D4 8024CBF4 44830000 */ mtc1 $v1, $f0 -/* 17B4D8 8024CBF8 00000000 */ nop -/* 17B4DC 8024CBFC 46800020 */ cvt.s.w $f0, $f0 -/* 17B4E0 8024CC00 0809330C */ j .L8024CC30 -/* 17B4E4 8024CC04 46001580 */ add.s $f22, $f2, $f0 -.L8024CC08: -/* 17B4E8 8024CC08 8C8200DC */ lw $v0, 0xdc($a0) -/* 17B4EC 8024CC0C 08093307 */ j .L8024CC1C -/* 17B4F0 8024CC10 00000000 */ nop -.L8024CC14: -/* 17B4F4 8024CC14 00821021 */ addu $v0, $a0, $v0 -.L8024CC18: -/* 17B4F8 8024CC18 8C4200E0 */ lw $v0, 0xe0($v0) -.L8024CC1C: -/* 17B4FC 8024CC1C 50400098 */ beql $v0, $zero, .L8024CE80 -/* 17B500 8024CC20 0000102D */ daddu $v0, $zero, $zero -/* 17B504 8024CC24 C4540144 */ lwc1 $f20, 0x144($v0) -/* 17B508 8024CC28 C4560148 */ lwc1 $f22, 0x148($v0) -/* 17B50C 8024CC2C C458014C */ lwc1 $f24, 0x14c($v0) -.L8024CC30: -/* 17B510 8024CC30 10A0001D */ beqz $a1, .L8024CCA8 -/* 17B514 8024CC34 27A20020 */ addiu $v0, $sp, 0x20 -/* 17B518 8024CC38 C6000054 */ lwc1 $f0, 0x54($s0) -/* 17B51C 8024CC3C C6020058 */ lwc1 $f2, 0x58($s0) -/* 17B520 8024CC40 C604005C */ lwc1 $f4, 0x5c($s0) -/* 17B524 8024CC44 8602001E */ lh $v0, 0x1e($s0) -/* 17B528 8024CC48 86030022 */ lh $v1, 0x22($s0) -/* 17B52C 8024CC4C 3C01802A */ lui $at, %hi(D_8029F270) -/* 17B530 8024CC50 E420F270 */ swc1 $f0, %lo(D_8029F270)($at) -/* 17B534 8024CC54 44820000 */ mtc1 $v0, $f0 -/* 17B538 8024CC58 00000000 */ nop -/* 17B53C 8024CC5C 46800020 */ cvt.s.w $f0, $f0 -/* 17B540 8024CC60 86020024 */ lh $v0, 0x24($s0) -/* 17B544 8024CC64 3C01802A */ lui $at, %hi(D_8029F274) -/* 17B548 8024CC68 E422F274 */ swc1 $f2, %lo(D_8029F274)($at) -/* 17B54C 8024CC6C 3C01802A */ lui $at, %hi(D_8029F278) -/* 17B550 8024CC70 E424F278 */ swc1 $f4, %lo(D_8029F278)($at) -/* 17B554 8024CC74 3C01802A */ lui $at, %hi(D_8029F288) -/* 17B558 8024CC78 E420F288 */ swc1 $f0, %lo(D_8029F288)($at) -/* 17B55C 8024CC7C 44820000 */ mtc1 $v0, $f0 -/* 17B560 8024CC80 00000000 */ nop -/* 17B564 8024CC84 46800020 */ cvt.s.w $f0, $f0 -/* 17B568 8024CC88 3C01802A */ lui $at, %hi(D_8029F290) -/* 17B56C 8024CC8C E420F290 */ swc1 $f0, %lo(D_8029F290)($at) -/* 17B570 8024CC90 44830000 */ mtc1 $v1, $f0 -/* 17B574 8024CC94 00000000 */ nop -/* 17B578 8024CC98 46800020 */ cvt.s.w $f0, $f0 -/* 17B57C 8024CC9C 3C01802A */ lui $at, %hi(D_8029F294) -/* 17B580 8024CCA0 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) -/* 17B584 8024CCA4 27A20020 */ addiu $v0, $sp, 0x20 -.L8024CCA8: -/* 17B588 8024CCA8 AFA20010 */ sw $v0, 0x10($sp) -/* 17B58C 8024CCAC 27A20024 */ addiu $v0, $sp, 0x24 -/* 17B590 8024CCB0 AFA20014 */ sw $v0, 0x14($sp) -/* 17B594 8024CCB4 27A20028 */ addiu $v0, $sp, 0x28 -/* 17B598 8024CCB8 4405A000 */ mfc1 $a1, $f20 -/* 17B59C 8024CCBC 4406B000 */ mfc1 $a2, $f22 -/* 17B5A0 8024CCC0 4407C000 */ mfc1 $a3, $f24 -/* 17B5A4 8024CCC4 24040001 */ addiu $a0, $zero, 1 -/* 17B5A8 8024CCC8 0C00B94E */ jal get_screen_coords -/* 17B5AC 8024CCCC AFA20018 */ sw $v0, 0x18($sp) -/* 17B5B0 8024CCD0 8FA20024 */ lw $v0, 0x24($sp) -/* 17B5B4 8024CCD4 28420064 */ slti $v0, $v0, 0x64 -/* 17B5B8 8024CCD8 10400005 */ beqz $v0, .L8024CCF0 -/* 17B5BC 8024CCDC 00000000 */ nop -/* 17B5C0 8024CCE0 3C0141C8 */ lui $at, 0x41c8 -/* 17B5C4 8024CCE4 44810000 */ mtc1 $at, $f0 -/* 17B5C8 8024CCE8 00000000 */ nop -/* 17B5CC 8024CCEC 4600B580 */ add.s $f22, $f22, $f0 -.L8024CCF0: -/* 17B5D0 8024CCF0 3C01802A */ lui $at, %hi(D_8029F274) -/* 17B5D4 8024CCF4 C420F274 */ lwc1 $f0, %lo(D_8029F274)($at) -/* 17B5D8 8024CCF8 4600B03C */ c.lt.s $f22, $f0 -/* 17B5DC 8024CCFC 00000000 */ nop -/* 17B5E0 8024CD00 45030001 */ bc1tl .L8024CD08 -/* 17B5E4 8024CD04 46000586 */ mov.s $f22, $f0 -.L8024CD08: -/* 17B5E8 8024CD08 8FA30020 */ lw $v1, 0x20($sp) -/* 17B5EC 8024CD0C 28620064 */ slti $v0, $v1, 0x64 -/* 17B5F0 8024CD10 10400005 */ beqz $v0, .L8024CD28 -/* 17B5F4 8024CD14 00000000 */ nop -/* 17B5F8 8024CD18 3C0141C8 */ lui $at, 0x41c8 -/* 17B5FC 8024CD1C 44810000 */ mtc1 $at, $f0 -/* 17B600 8024CD20 00000000 */ nop -/* 17B604 8024CD24 4600A501 */ sub.s $f20, $f20, $f0 -.L8024CD28: -/* 17B608 8024CD28 3C01802A */ lui $at, %hi(D_8029F270) -/* 17B60C 8024CD2C C420F270 */ lwc1 $f0, %lo(D_8029F270)($at) -/* 17B610 8024CD30 4600A03C */ c.lt.s $f20, $f0 -/* 17B614 8024CD34 00000000 */ nop -/* 17B618 8024CD38 45030001 */ bc1tl .L8024CD40 -/* 17B61C 8024CD3C 46000506 */ mov.s $f20, $f0 -.L8024CD40: -/* 17B620 8024CD40 286200DD */ slti $v0, $v1, 0xdd -/* 17B624 8024CD44 14400005 */ bnez $v0, .L8024CD5C -/* 17B628 8024CD48 00000000 */ nop -/* 17B62C 8024CD4C 3C0141C8 */ lui $at, 0x41c8 -/* 17B630 8024CD50 44810000 */ mtc1 $at, $f0 -/* 17B634 8024CD54 00000000 */ nop -/* 17B638 8024CD58 4600A500 */ add.s $f20, $f20, $f0 -.L8024CD5C: -/* 17B63C 8024CD5C C6060054 */ lwc1 $f6, 0x54($s0) -/* 17B640 8024CD60 4606A101 */ sub.s $f4, $f20, $f6 -/* 17B644 8024CD64 3C01802A */ lui $at, %hi(D_8029CC30) -/* 17B648 8024CD68 D422CC30 */ ldc1 $f2, %lo(D_8029CC30)($at) -/* 17B64C 8024CD6C 46002005 */ abs.s $f0, $f4 -/* 17B650 8024CD70 46000021 */ cvt.d.s $f0, $f0 -/* 17B654 8024CD74 4622003C */ c.lt.d $f0, $f2 -/* 17B658 8024CD78 00000000 */ nop -/* 17B65C 8024CD7C 45000009 */ bc1f .L8024CDA4 -/* 17B660 8024CD80 00000000 */ nop -/* 17B664 8024CD84 44800000 */ mtc1 $zero, $f0 -/* 17B668 8024CD88 00000000 */ nop -/* 17B66C 8024CD8C 46002032 */ c.eq.s $f4, $f0 -/* 17B670 8024CD90 00000000 */ nop -/* 17B674 8024CD94 45020009 */ bc1fl .L8024CDBC -/* 17B678 8024CD98 E6140054 */ swc1 $f20, 0x54($s0) -/* 17B67C 8024CD9C 0809336F */ j .L8024CDBC -/* 17B680 8024CDA0 00000000 */ nop -.L8024CDA4: -/* 17B684 8024CDA4 3C0140A0 */ lui $at, 0x40a0 -/* 17B688 8024CDA8 44810000 */ mtc1 $at, $f0 -/* 17B68C 8024CDAC 00000000 */ nop -/* 17B690 8024CDB0 46002003 */ div.s $f0, $f4, $f0 -/* 17B694 8024CDB4 46003000 */ add.s $f0, $f6, $f0 -/* 17B698 8024CDB8 E6000054 */ swc1 $f0, 0x54($s0) -.L8024CDBC: -/* 17B69C 8024CDBC C6060058 */ lwc1 $f6, 0x58($s0) -/* 17B6A0 8024CDC0 4606B101 */ sub.s $f4, $f22, $f6 -/* 17B6A4 8024CDC4 3C01802A */ lui $at, %hi(D_8029CC38) -/* 17B6A8 8024CDC8 D422CC38 */ ldc1 $f2, %lo(D_8029CC38)($at) -/* 17B6AC 8024CDCC 46002005 */ abs.s $f0, $f4 -/* 17B6B0 8024CDD0 46000021 */ cvt.d.s $f0, $f0 -/* 17B6B4 8024CDD4 4622003C */ c.lt.d $f0, $f2 -/* 17B6B8 8024CDD8 00000000 */ nop -/* 17B6BC 8024CDDC 45000009 */ bc1f .L8024CE04 -/* 17B6C0 8024CDE0 00000000 */ nop -/* 17B6C4 8024CDE4 44800000 */ mtc1 $zero, $f0 -/* 17B6C8 8024CDE8 00000000 */ nop -/* 17B6CC 8024CDEC 46002032 */ c.eq.s $f4, $f0 -/* 17B6D0 8024CDF0 00000000 */ nop -/* 17B6D4 8024CDF4 45020009 */ bc1fl .L8024CE1C -/* 17B6D8 8024CDF8 E6160058 */ swc1 $f22, 0x58($s0) -/* 17B6DC 8024CDFC 08093387 */ j .L8024CE1C -/* 17B6E0 8024CE00 00000000 */ nop -.L8024CE04: -/* 17B6E4 8024CE04 3C0140A0 */ lui $at, 0x40a0 -/* 17B6E8 8024CE08 44810000 */ mtc1 $at, $f0 -/* 17B6EC 8024CE0C 00000000 */ nop -/* 17B6F0 8024CE10 46002003 */ div.s $f0, $f4, $f0 -/* 17B6F4 8024CE14 46003000 */ add.s $f0, $f6, $f0 -/* 17B6F8 8024CE18 E6000058 */ swc1 $f0, 0x58($s0) -.L8024CE1C: -/* 17B6FC 8024CE1C C606005C */ lwc1 $f6, 0x5c($s0) -/* 17B700 8024CE20 4606C101 */ sub.s $f4, $f24, $f6 -/* 17B704 8024CE24 3C01802A */ lui $at, %hi(D_8029CC40) -/* 17B708 8024CE28 D422CC40 */ ldc1 $f2, %lo(D_8029CC40)($at) -/* 17B70C 8024CE2C 46002005 */ abs.s $f0, $f4 -/* 17B710 8024CE30 46000021 */ cvt.d.s $f0, $f0 -/* 17B714 8024CE34 4622003C */ c.lt.d $f0, $f2 -/* 17B718 8024CE38 00000000 */ nop -/* 17B71C 8024CE3C 45000009 */ bc1f .L8024CE64 -/* 17B720 8024CE40 00000000 */ nop -/* 17B724 8024CE44 44800000 */ mtc1 $zero, $f0 -/* 17B728 8024CE48 00000000 */ nop -/* 17B72C 8024CE4C 46002032 */ c.eq.s $f4, $f0 -/* 17B730 8024CE50 00000000 */ nop -/* 17B734 8024CE54 45020009 */ bc1fl .L8024CE7C -/* 17B738 8024CE58 E618005C */ swc1 $f24, 0x5c($s0) -/* 17B73C 8024CE5C 080933A0 */ j .L8024CE80 -/* 17B740 8024CE60 0000102D */ daddu $v0, $zero, $zero -.L8024CE64: -/* 17B744 8024CE64 3C0140A0 */ lui $at, 0x40a0 -/* 17B748 8024CE68 44810000 */ mtc1 $at, $f0 -/* 17B74C 8024CE6C 00000000 */ nop -/* 17B750 8024CE70 46002003 */ div.s $f0, $f4, $f0 -/* 17B754 8024CE74 46003000 */ add.s $f0, $f6, $f0 -/* 17B758 8024CE78 E600005C */ swc1 $f0, 0x5c($s0) -.L8024CE7C: -/* 17B75C 8024CE7C 0000102D */ daddu $v0, $zero, $zero -.L8024CE80: -/* 17B760 8024CE80 8FBF0034 */ lw $ra, 0x34($sp) -/* 17B764 8024CE84 8FB00030 */ lw $s0, 0x30($sp) -/* 17B768 8024CE88 D7B80048 */ ldc1 $f24, 0x48($sp) -/* 17B76C 8024CE8C D7B60040 */ ldc1 $f22, 0x40($sp) -/* 17B770 8024CE90 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 17B774 8024CE94 03E00008 */ jr $ra -/* 17B778 8024CE98 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_pre_battle.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_pre_battle.s deleted file mode 100644 index 724d7641c8..0000000000 --- a/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_pre_battle.s +++ /dev/null @@ -1,424 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_encounters_pre_battle -/* 1C764 80041364 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 1C768 80041368 AFB50024 */ sw $s5, 0x24($sp) -/* 1C76C 8004136C 3C15800B */ lui $s5, %hi(gCurrentEncounter) -/* 1C770 80041370 26B50F10 */ addiu $s5, $s5, %lo(gCurrentEncounter) -/* 1C774 80041374 AFB7002C */ sw $s7, 0x2c($sp) -/* 1C778 80041378 3C178011 */ lui $s7, %hi(gPlayerData) -/* 1C77C 8004137C 26F7F290 */ addiu $s7, $s7, %lo(gPlayerData) -/* 1C780 80041380 3C04800A */ lui $a0, %hi(D_8009A5D0) -/* 1C784 80041384 2484A5D0 */ addiu $a0, $a0, %lo(D_8009A5D0) -/* 1C788 80041388 AFBF0030 */ sw $ra, 0x30($sp) -/* 1C78C 8004138C AFB60028 */ sw $s6, 0x28($sp) -/* 1C790 80041390 AFB40020 */ sw $s4, 0x20($sp) -/* 1C794 80041394 AFB3001C */ sw $s3, 0x1c($sp) -/* 1C798 80041398 AFB20018 */ sw $s2, 0x18($sp) -/* 1C79C 8004139C AFB10014 */ sw $s1, 0x14($sp) -/* 1C7A0 800413A0 AFB00010 */ sw $s0, 0x10($sp) -/* 1C7A4 800413A4 8C830000 */ lw $v1, ($a0) -/* 1C7A8 800413A8 24050001 */ addiu $a1, $zero, 1 -/* 1C7AC 800413AC 106500CF */ beq $v1, $a1, .L800416EC -/* 1C7B0 800413B0 28620002 */ slti $v0, $v1, 2 -/* 1C7B4 800413B4 50400005 */ beql $v0, $zero, .L800413CC -/* 1C7B8 800413B8 24020002 */ addiu $v0, $zero, 2 -/* 1C7BC 800413BC 10600009 */ beqz $v1, .L800413E4 -/* 1C7C0 800413C0 2402FFFF */ addiu $v0, $zero, -1 -/* 1C7C4 800413C4 0801064E */ j .L80041938 -/* 1C7C8 800413C8 00000000 */ nop -.L800413CC: -/* 1C7CC 800413CC 1062011C */ beq $v1, $v0, .L80041840 -/* 1C7D0 800413D0 24020003 */ addiu $v0, $zero, 3 -/* 1C7D4 800413D4 1062014E */ beq $v1, $v0, .L80041910 -/* 1C7D8 800413D8 24020004 */ addiu $v0, $zero, 4 -/* 1C7DC 800413DC 0801064E */ j .L80041938 -/* 1C7E0 800413E0 00000000 */ nop -.L800413E4: -/* 1C7E4 800413E4 AEA00090 */ sw $zero, 0x90($s5) -/* 1C7E8 800413E8 AEA50094 */ sw $a1, 0x94($s5) -/* 1C7EC 800413EC AEA50098 */ sw $a1, 0x98($s5) -/* 1C7F0 800413F0 A2A20008 */ sb $v0, 8($s5) -/* 1C7F4 800413F4 3C01800A */ lui $at, %hi(D_8009A654) -/* 1C7F8 800413F8 A020A654 */ sb $zero, %lo(D_8009A654)($at) -/* 1C7FC 800413FC 3C018007 */ lui $at, %hi(D_80077C40) -/* 1C800 80041400 AC207C40 */ sw $zero, %lo(D_80077C40)($at) -/* 1C804 80041404 0C0B117A */ jal suspend_all_group -/* 1C808 80041408 24040010 */ addiu $a0, $zero, 0x10 -/* 1C80C 8004140C 82A2001C */ lb $v0, 0x1c($s5) -/* 1C810 80041410 18400024 */ blez $v0, .L800414A4 -/* 1C814 80041414 0000982D */ daddu $s3, $zero, $zero -/* 1C818 80041418 02A0B02D */ daddu $s6, $s5, $zero -.L8004141C: -/* 1C81C 8004141C 8ED40028 */ lw $s4, 0x28($s6) -/* 1C820 80041420 1280001B */ beqz $s4, .L80041490 -/* 1C824 80041424 00000000 */ nop -/* 1C828 80041428 8E820000 */ lw $v0, ($s4) -/* 1C82C 8004142C 18400018 */ blez $v0, .L80041490 -/* 1C830 80041430 0000882D */ daddu $s1, $zero, $zero -/* 1C834 80041434 0280902D */ daddu $s2, $s4, $zero -.L80041438: -/* 1C838 80041438 8E500004 */ lw $s0, 4($s2) -/* 1C83C 8004143C 1200000F */ beqz $s0, .L8004147C -/* 1C840 80041440 00000000 */ nop -/* 1C844 80041444 8E020000 */ lw $v0, ($s0) -/* 1C848 80041448 30420020 */ andi $v0, $v0, 0x20 -/* 1C84C 8004144C 1440000B */ bnez $v0, .L8004147C -/* 1C850 80041450 00000000 */ nop -/* 1C854 80041454 8E02003C */ lw $v0, 0x3c($s0) -/* 1C858 80041458 10400003 */ beqz $v0, .L80041468 -/* 1C85C 8004145C 00000000 */ nop -/* 1C860 80041460 0C0B1108 */ jal suspend_all_script -/* 1C864 80041464 8E040054 */ lw $a0, 0x54($s0) -.L80041468: -/* 1C868 80041468 8E020044 */ lw $v0, 0x44($s0) -/* 1C86C 8004146C 10400003 */ beqz $v0, .L8004147C -/* 1C870 80041470 00000000 */ nop -/* 1C874 80041474 0C0B1108 */ jal suspend_all_script -/* 1C878 80041478 8E04005C */ lw $a0, 0x5c($s0) -.L8004147C: -/* 1C87C 8004147C 8E820000 */ lw $v0, ($s4) -/* 1C880 80041480 26310001 */ addiu $s1, $s1, 1 -/* 1C884 80041484 0222102A */ slt $v0, $s1, $v0 -/* 1C888 80041488 1440FFEB */ bnez $v0, .L80041438 -/* 1C88C 8004148C 26520004 */ addiu $s2, $s2, 4 -.L80041490: -/* 1C890 80041490 82A2001C */ lb $v0, 0x1c($s5) -/* 1C894 80041494 26730001 */ addiu $s3, $s3, 1 -/* 1C898 80041498 0262102A */ slt $v0, $s3, $v0 -/* 1C89C 8004149C 1440FFDF */ bnez $v0, .L8004141C -/* 1C8A0 800414A0 26D60004 */ addiu $s6, $s6, 4 -.L800414A4: -/* 1C8A4 800414A4 8EB0008C */ lw $s0, 0x8c($s5) -/* 1C8A8 800414A8 8E020000 */ lw $v0, ($s0) -/* 1C8AC 800414AC 3C030010 */ lui $v1, 0x10 -/* 1C8B0 800414B0 00431024 */ and $v0, $v0, $v1 -/* 1C8B4 800414B4 1040000C */ beqz $v0, .L800414E8 -/* 1C8B8 800414B8 00000000 */ nop -/* 1C8BC 800414BC 82A20012 */ lb $v0, 0x12($s5) -/* 1C8C0 800414C0 14400009 */ bnez $v0, .L800414E8 -/* 1C8C4 800414C4 00000000 */ nop -/* 1C8C8 800414C8 AEA00094 */ sw $zero, 0x94($s5) -/* 1C8CC 800414CC 0C03AD96 */ jal partner_handle_before_battle -/* 1C8D0 800414D0 AEA0009C */ sw $zero, 0x9c($s5) -/* 1C8D4 800414D4 24020003 */ addiu $v0, $zero, 3 -/* 1C8D8 800414D8 3C01800A */ lui $at, %hi(D_8009A5D0) -/* 1C8DC 800414DC AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) -/* 1C8E0 800414E0 0801064E */ j .L80041938 -/* 1C8E4 800414E4 00000000 */ nop -.L800414E8: -/* 1C8E8 800414E8 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 1C8EC 800414EC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 1C8F0 800414F0 80420074 */ lb $v0, 0x74($v0) -/* 1C8F4 800414F4 24110002 */ addiu $s1, $zero, 2 -/* 1C8F8 800414F8 14510009 */ bne $v0, $s1, .L80041520 -/* 1C8FC 800414FC 24120001 */ addiu $s2, $zero, 1 -/* 1C900 80041500 2402000A */ addiu $v0, $zero, 0xa -/* 1C904 80041504 AEA00094 */ sw $zero, 0x94($s5) -/* 1C908 80041508 0C03AD96 */ jal partner_handle_before_battle -/* 1C90C 8004150C AEA2009C */ sw $v0, 0x9c($s5) -/* 1C910 80041510 3C01800A */ lui $at, %hi(D_8009A5D0) -/* 1C914 80041514 AC31A5D0 */ sw $s1, %lo(D_8009A5D0)($at) -/* 1C918 80041518 0801064E */ j .L80041938 -/* 1C91C 8004151C 00000000 */ nop -.L80041520: -/* 1C920 80041520 82A30005 */ lb $v1, 5($s5) -/* 1C924 80041524 8EB0008C */ lw $s0, 0x8c($s5) -/* 1C928 80041528 1072001D */ beq $v1, $s2, .L800415A0 -/* 1C92C 8004152C 24020003 */ addiu $v0, $zero, 3 -/* 1C930 80041530 1062001B */ beq $v1, $v0, .L800415A0 -/* 1C934 80041534 00000000 */ nop -/* 1C938 80041538 0C03A752 */ jal is_ability_active -/* 1C93C 8004153C 0040202D */ daddu $a0, $v0, $zero -/* 1C940 80041540 10400016 */ beqz $v0, .L8004159C -/* 1C944 80041544 00000000 */ nop -/* 1C948 80041548 8E020018 */ lw $v0, 0x18($s0) -/* 1C94C 8004154C 82E30009 */ lb $v1, 9($s7) -/* 1C950 80041550 84420028 */ lh $v0, 0x28($v0) -/* 1C954 80041554 0062182A */ slt $v1, $v1, $v0 -/* 1C958 80041558 14600010 */ bnez $v1, .L8004159C -/* 1C95C 8004155C 00000000 */ nop -/* 1C960 80041560 8E020000 */ lw $v0, ($s0) -/* 1C964 80041564 30420040 */ andi $v0, $v0, 0x40 -/* 1C968 80041568 1440000C */ bnez $v0, .L8004159C -/* 1C96C 8004156C 00000000 */ nop -/* 1C970 80041570 82A20012 */ lb $v0, 0x12($s5) -/* 1C974 80041574 14400009 */ bnez $v0, .L8004159C -/* 1C978 80041578 2402000A */ addiu $v0, $zero, 0xa -/* 1C97C 8004157C AEA00094 */ sw $zero, 0x94($s5) -/* 1C980 80041580 AEA2009C */ sw $v0, 0x9c($s5) -/* 1C984 80041584 3C018007 */ lui $at, %hi(D_80077C40) -/* 1C988 80041588 AC327C40 */ sw $s2, %lo(D_80077C40)($at) -/* 1C98C 8004158C 3C01800A */ lui $at, %hi(D_8009A5D0) -/* 1C990 80041590 AC31A5D0 */ sw $s1, %lo(D_8009A5D0)($at) -/* 1C994 80041594 0801064E */ j .L80041938 -/* 1C998 80041598 00000000 */ nop -.L8004159C: -/* 1C99C 8004159C 8EB0008C */ lw $s0, 0x8c($s5) -.L800415A0: -/* 1C9A0 800415A0 0C03A752 */ jal is_ability_active -/* 1C9A4 800415A4 2404002A */ addiu $a0, $zero, 0x2a -/* 1C9A8 800415A8 1040000E */ beqz $v0, .L800415E4 -/* 1C9AC 800415AC 24020003 */ addiu $v0, $zero, 3 -/* 1C9B0 800415B0 8E020018 */ lw $v0, 0x18($s0) -/* 1C9B4 800415B4 82E30009 */ lb $v1, 9($s7) -/* 1C9B8 800415B8 84420028 */ lh $v0, 0x28($v0) -/* 1C9BC 800415BC 0062182A */ slt $v1, $v1, $v0 -/* 1C9C0 800415C0 14600008 */ bnez $v1, .L800415E4 -/* 1C9C4 800415C4 24020003 */ addiu $v0, $zero, 3 -/* 1C9C8 800415C8 8E020000 */ lw $v0, ($s0) -/* 1C9CC 800415CC 30420040 */ andi $v0, $v0, 0x40 -/* 1C9D0 800415D0 14400004 */ bnez $v0, .L800415E4 -/* 1C9D4 800415D4 24020003 */ addiu $v0, $zero, 3 -/* 1C9D8 800415D8 82A20012 */ lb $v0, 0x12($s5) -/* 1C9DC 800415DC 10400015 */ beqz $v0, .L80041634 -/* 1C9E0 800415E0 24020003 */ addiu $v0, $zero, 3 -.L800415E4: -/* 1C9E4 800415E4 82A30005 */ lb $v1, 5($s5) -/* 1C9E8 800415E8 1462001D */ bne $v1, $v0, .L80041660 -/* 1C9EC 800415EC 8EB0008C */ lw $s0, 0x8c($s5) -/* 1C9F0 800415F0 0C03A752 */ jal is_ability_active -/* 1C9F4 800415F4 24040028 */ addiu $a0, $zero, 0x28 -/* 1C9F8 800415F8 10400019 */ beqz $v0, .L80041660 -/* 1C9FC 800415FC 00000000 */ nop -/* 1CA00 80041600 8E020018 */ lw $v0, 0x18($s0) -/* 1CA04 80041604 82E30009 */ lb $v1, 9($s7) -/* 1CA08 80041608 84420028 */ lh $v0, 0x28($v0) -/* 1CA0C 8004160C 0062182A */ slt $v1, $v1, $v0 -/* 1CA10 80041610 14600013 */ bnez $v1, .L80041660 -/* 1CA14 80041614 00000000 */ nop -/* 1CA18 80041618 8E020000 */ lw $v0, ($s0) -/* 1CA1C 8004161C 30420040 */ andi $v0, $v0, 0x40 -/* 1CA20 80041620 1440000F */ bnez $v0, .L80041660 -/* 1CA24 80041624 00000000 */ nop -/* 1CA28 80041628 82A20012 */ lb $v0, 0x12($s5) -/* 1CA2C 8004162C 1440000C */ bnez $v0, .L80041660 -/* 1CA30 80041630 00000000 */ nop -.L80041634: -/* 1CA34 80041634 2402000A */ addiu $v0, $zero, 0xa -/* 1CA38 80041638 AEA2009C */ sw $v0, 0x9c($s5) -/* 1CA3C 8004163C 24020001 */ addiu $v0, $zero, 1 -/* 1CA40 80041640 3C018007 */ lui $at, %hi(D_80077C40) -/* 1CA44 80041644 AC227C40 */ sw $v0, %lo(D_80077C40)($at) -/* 1CA48 80041648 24020002 */ addiu $v0, $zero, 2 -/* 1CA4C 8004164C AEA00094 */ sw $zero, 0x94($s5) -/* 1CA50 80041650 3C01800A */ lui $at, %hi(D_8009A5D0) -/* 1CA54 80041654 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) -/* 1CA58 80041658 0801064E */ j .L80041938 -/* 1CA5C 8004165C 00000000 */ nop -.L80041660: -/* 1CA60 80041660 8EA40014 */ lw $a0, 0x14($s5) -/* 1CA64 80041664 04810015 */ bgez $a0, .L800416BC -/* 1CA68 80041668 0000282D */ daddu $a1, $zero, $zero -/* 1CA6C 8004166C 82A30004 */ lb $v1, 4($s5) -/* 1CA70 80041670 24020001 */ addiu $v0, $zero, 1 -/* 1CA74 80041674 1062000B */ beq $v1, $v0, .L800416A4 -/* 1CA78 80041678 28620002 */ slti $v0, $v1, 2 -/* 1CA7C 8004167C 10400005 */ beqz $v0, .L80041694 -/* 1CA80 80041680 24020002 */ addiu $v0, $zero, 2 -/* 1CA84 80041684 1060000D */ beqz $v1, .L800416BC -/* 1CA88 80041688 24040002 */ addiu $a0, $zero, 2 -/* 1CA8C 8004168C 080105B1 */ j .L800416C4 -/* 1CA90 80041690 00000000 */ nop -.L80041694: -/* 1CA94 80041694 10620006 */ beq $v1, $v0, .L800416B0 -/* 1CA98 80041698 24040002 */ addiu $a0, $zero, 2 -/* 1CA9C 8004169C 080105B1 */ j .L800416C4 -/* 1CAA0 800416A0 00000000 */ nop -.L800416A4: -/* 1CAA4 800416A4 24040002 */ addiu $a0, $zero, 2 -/* 1CAA8 800416A8 080105AF */ j .L800416BC -/* 1CAAC 800416AC 24050001 */ addiu $a1, $zero, 1 -.L800416B0: -/* 1CAB0 800416B0 080105AF */ j .L800416BC -/* 1CAB4 800416B4 0080282D */ daddu $a1, $a0, $zero -/* 1CAB8 800416B8 0000282D */ daddu $a1, $zero, $zero -.L800416BC: -/* 1CABC 800416BC 0C052BE3 */ jal bgm_set_battle_song -/* 1CAC0 800416C0 00000000 */ nop -.L800416C4: -/* 1CAC4 800416C4 0C052BBE */ jal bgm_push_battle_song -/* 1CAC8 800416C8 00000000 */ nop -/* 1CACC 800416CC 24020001 */ addiu $v0, $zero, 1 -/* 1CAD0 800416D0 3C01800A */ lui $at, %hi(D_8009A654) -/* 1CAD4 800416D4 A022A654 */ sb $v0, %lo(D_8009A654)($at) -/* 1CAD8 800416D8 2402000A */ addiu $v0, $zero, 0xa -/* 1CADC 800416DC AEA2009C */ sw $v0, 0x9c($s5) -/* 1CAE0 800416E0 24020001 */ addiu $v0, $zero, 1 -/* 1CAE4 800416E4 3C01800A */ lui $at, %hi(D_8009A5D0) -/* 1CAE8 800416E8 AC22A5D0 */ sw $v0, %lo(D_8009A5D0)($at) -.L800416EC: -/* 1CAEC 800416EC 8EA30090 */ lw $v1, 0x90($s5) -/* 1CAF0 800416F0 240200FF */ addiu $v0, $zero, 0xff -/* 1CAF4 800416F4 14620090 */ bne $v1, $v0, .L80041938 -/* 1CAF8 800416F8 00000000 */ nop -/* 1CAFC 800416FC 8EA2009C */ lw $v0, 0x9c($s5) -/* 1CB00 80041700 14400052 */ bnez $v0, .L8004184C -/* 1CB04 80041704 2442FFFF */ addiu $v0, $v0, -1 -/* 1CB08 80041708 8EB40088 */ lw $s4, 0x88($s5) -/* 1CB0C 8004170C 8E820000 */ lw $v0, ($s4) -/* 1CB10 80041710 18400019 */ blez $v0, .L80041778 -/* 1CB14 80041714 0000982D */ daddu $s3, $zero, $zero -/* 1CB18 80041718 0280882D */ daddu $s1, $s4, $zero -.L8004171C: -/* 1CB1C 8004171C 8E300004 */ lw $s0, 4($s1) -/* 1CB20 80041720 12000010 */ beqz $s0, .L80041764 -/* 1CB24 80041724 00000000 */ nop -/* 1CB28 80041728 8E030000 */ lw $v1, ($s0) -/* 1CB2C 8004172C 30620008 */ andi $v0, $v1, 8 -/* 1CB30 80041730 10400004 */ beqz $v0, .L80041744 -/* 1CB34 80041734 30620020 */ andi $v0, $v1, 0x20 -/* 1CB38 80041738 8EA2008C */ lw $v0, 0x8c($s5) -/* 1CB3C 8004173C 16020009 */ bne $s0, $v0, .L80041764 -/* 1CB40 80041740 30620020 */ andi $v0, $v1, 0x20 -.L80041744: -/* 1CB44 80041744 14400007 */ bnez $v0, .L80041764 -/* 1CB48 80041748 00000000 */ nop -/* 1CB4C 8004174C 8E020040 */ lw $v0, 0x40($s0) -/* 1CB50 80041750 10400004 */ beqz $v0, .L80041764 -/* 1CB54 80041754 00000000 */ nop -/* 1CB58 80041758 0C0B102B */ jal kill_script_by_ID -/* 1CB5C 8004175C 8E040058 */ lw $a0, 0x58($s0) -/* 1CB60 80041760 AE000040 */ sw $zero, 0x40($s0) -.L80041764: -/* 1CB64 80041764 8E820000 */ lw $v0, ($s4) -/* 1CB68 80041768 26730001 */ addiu $s3, $s3, 1 -/* 1CB6C 8004176C 0262102A */ slt $v0, $s3, $v0 -/* 1CB70 80041770 1440FFEA */ bnez $v0, .L8004171C -/* 1CB74 80041774 26310004 */ addiu $s1, $s1, 4 -.L80041778: -/* 1CB78 80041778 0C03AD96 */ jal partner_handle_before_battle -/* 1CB7C 8004177C 00000000 */ nop -/* 1CB80 80041780 8EB0008C */ lw $s0, 0x8c($s5) -/* 1CB84 80041784 A2A000A0 */ sb $zero, 0xa0($s5) -/* 1CB88 80041788 A6A000A2 */ sh $zero, 0xa2($s5) -/* 1CB8C 8004178C 920200B5 */ lbu $v0, 0xb5($s0) -/* 1CB90 80041790 2404002D */ addiu $a0, $zero, 0x2d -/* 1CB94 80041794 0C03A752 */ jal is_ability_active -/* 1CB98 80041798 A2A20010 */ sb $v0, 0x10($s5) -/* 1CB9C 8004179C 10400008 */ beqz $v0, .L800417C0 -/* 1CBA0 800417A0 00000000 */ nop -/* 1CBA4 800417A4 82A30005 */ lb $v1, 5($s5) -/* 1CBA8 800417A8 24020003 */ addiu $v0, $zero, 3 -/* 1CBAC 800417AC 14620004 */ bne $v1, $v0, .L800417C0 -/* 1CBB0 800417B0 00000000 */ nop -/* 1CBB4 800417B4 24020004 */ addiu $v0, $zero, 4 -/* 1CBB8 800417B8 A2A200A0 */ sb $v0, 0xa0($s5) -/* 1CBBC 800417BC A6A300A2 */ sh $v1, 0xa2($s5) -.L800417C0: -/* 1CBC0 800417C0 0C05271B */ jal sfx_stop_sound -/* 1CBC4 800417C4 24042111 */ addiu $a0, $zero, 0x2111 -/* 1CBC8 800417C8 0C05271B */ jal sfx_stop_sound -/* 1CBCC 800417CC 24042112 */ addiu $a0, $zero, 0x2112 -/* 1CBD0 800417D0 0C05271B */ jal sfx_stop_sound -/* 1CBD4 800417D4 24042113 */ addiu $a0, $zero, 0x2113 -/* 1CBD8 800417D8 0C05271B */ jal sfx_stop_sound -/* 1CBDC 800417DC 24042114 */ addiu $a0, $zero, 0x2114 -/* 1CBE0 800417E0 0C01CB37 */ jal set_battle_formation -/* 1CBE4 800417E4 0000202D */ daddu $a0, $zero, $zero -/* 1CBE8 800417E8 86840046 */ lh $a0, 0x46($s4) -/* 1CBEC 800417EC 0C01CB33 */ jal set_battle_stage -/* 1CBF0 800417F0 00000000 */ nop -/* 1CBF4 800417F4 0C01CB24 */ jal load_battle -/* 1CBF8 800417F8 86840044 */ lh $a0, 0x44($s4) -/* 1CBFC 800417FC 0000202D */ daddu $a0, $zero, $zero -/* 1CC00 80041800 3C05437F */ lui $a1, 0x437f -/* 1CC04 80041804 24020001 */ addiu $v0, $zero, 1 -/* 1CC08 80041808 A2A20007 */ sb $v0, 7($s5) -/* 1CC0C 8004180C 240200FF */ addiu $v0, $zero, 0xff -/* 1CC10 80041810 A2A00008 */ sb $zero, 8($s5) -/* 1CC14 80041814 A2A0000B */ sb $zero, 0xb($s5) -/* 1CC18 80041818 A2A0000C */ sb $zero, 0xc($s5) -/* 1CC1C 8004181C A6A0000E */ sh $zero, 0xe($s5) -/* 1CC20 80041820 AEA00098 */ sw $zero, 0x98($s5) -/* 1CC24 80041824 0C04DF62 */ jal set_screen_overlay_params_front -/* 1CC28 80041828 AEA20090 */ sw $v0, 0x90($s5) -/* 1CC2C 8004182C 24020005 */ addiu $v0, $zero, 5 -/* 1CC30 80041830 3C01800A */ lui $at, %hi(gGameState) -/* 1CC34 80041834 AC22A600 */ sw $v0, %lo(gGameState)($at) -/* 1CC38 80041838 0801063E */ j .L800418F8 -/* 1CC3C 8004183C 24020001 */ addiu $v0, $zero, 1 -.L80041840: -/* 1CC40 80041840 8EA2009C */ lw $v0, 0x9c($s5) -/* 1CC44 80041844 10400003 */ beqz $v0, .L80041854 -/* 1CC48 80041848 2442FFFF */ addiu $v0, $v0, -1 -.L8004184C: -/* 1CC4C 8004184C 0801064E */ j .L80041938 -/* 1CC50 80041850 AEA2009C */ sw $v0, 0x9c($s5) -.L80041854: -/* 1CC54 80041854 8EB40088 */ lw $s4, 0x88($s5) -/* 1CC58 80041858 8E820000 */ lw $v0, ($s4) -/* 1CC5C 8004185C 18400019 */ blez $v0, .L800418C4 -/* 1CC60 80041860 0000982D */ daddu $s3, $zero, $zero -/* 1CC64 80041864 0280882D */ daddu $s1, $s4, $zero -.L80041868: -/* 1CC68 80041868 8E300004 */ lw $s0, 4($s1) -/* 1CC6C 8004186C 12000010 */ beqz $s0, .L800418B0 -/* 1CC70 80041870 00000000 */ nop -/* 1CC74 80041874 8E030000 */ lw $v1, ($s0) -/* 1CC78 80041878 30620008 */ andi $v0, $v1, 8 -/* 1CC7C 8004187C 10400004 */ beqz $v0, .L80041890 -/* 1CC80 80041880 30620020 */ andi $v0, $v1, 0x20 -/* 1CC84 80041884 8EA2008C */ lw $v0, 0x8c($s5) -/* 1CC88 80041888 16020009 */ bne $s0, $v0, .L800418B0 -/* 1CC8C 8004188C 30620020 */ andi $v0, $v1, 0x20 -.L80041890: -/* 1CC90 80041890 14400007 */ bnez $v0, .L800418B0 -/* 1CC94 80041894 00000000 */ nop -/* 1CC98 80041898 8E020040 */ lw $v0, 0x40($s0) -/* 1CC9C 8004189C 10400004 */ beqz $v0, .L800418B0 -/* 1CCA0 800418A0 00000000 */ nop -/* 1CCA4 800418A4 0C0B102B */ jal kill_script_by_ID -/* 1CCA8 800418A8 8E040058 */ lw $a0, 0x58($s0) -/* 1CCAC 800418AC AE000040 */ sw $zero, 0x40($s0) -.L800418B0: -/* 1CCB0 800418B0 8E820000 */ lw $v0, ($s4) -/* 1CCB4 800418B4 26730001 */ addiu $s3, $s3, 1 -/* 1CCB8 800418B8 0262102A */ slt $v0, $s3, $v0 -/* 1CCBC 800418BC 1440FFEA */ bnez $v0, .L80041868 -/* 1CCC0 800418C0 26310004 */ addiu $s1, $s1, 4 -.L800418C4: -/* 1CCC4 800418C4 24020001 */ addiu $v0, $zero, 1 -/* 1CCC8 800418C8 A2A20008 */ sb $v0, 8($s5) -/* 1CCCC 800418CC A2A20007 */ sb $v0, 7($s5) -/* 1CCD0 800418D0 24020005 */ addiu $v0, $zero, 5 -/* 1CCD4 800418D4 A2A00009 */ sb $zero, 9($s5) -/* 1CCD8 800418D8 A2A0000B */ sb $zero, 0xb($s5) -/* 1CCDC 800418DC A2A0000C */ sb $zero, 0xc($s5) -/* 1CCE0 800418E0 3C01800A */ lui $at, %hi(gGameState) -/* 1CCE4 800418E4 AC22A600 */ sw $v0, %lo(gGameState)($at) -/* 1CCE8 800418E8 24020001 */ addiu $v0, $zero, 1 -/* 1CCEC 800418EC A6A0000E */ sh $zero, 0xe($s5) -/* 1CCF0 800418F0 AEA00098 */ sw $zero, 0x98($s5) -/* 1CCF4 800418F4 AEA00090 */ sw $zero, 0x90($s5) -.L800418F8: -/* 1CCF8 800418F8 3C01800A */ lui $at, %hi(D_8009A678) -/* 1CCFC 800418FC AC22A678 */ sw $v0, %lo(D_8009A678)($at) -/* 1CD00 80041900 3C01800A */ lui $at, %hi(D_8009A5D0) -/* 1CD04 80041904 AC20A5D0 */ sw $zero, %lo(D_8009A5D0)($at) -/* 1CD08 80041908 0801064E */ j .L80041938 -/* 1CD0C 8004190C 00000000 */ nop -.L80041910: -/* 1CD10 80041910 A2A20009 */ sb $v0, 9($s5) -/* 1CD14 80041914 24020005 */ addiu $v0, $zero, 5 -/* 1CD18 80041918 A2A50008 */ sb $a1, 8($s5) -/* 1CD1C 8004191C AEA00090 */ sw $zero, 0x90($s5) -/* 1CD20 80041920 AEA00098 */ sw $zero, 0x98($s5) -/* 1CD24 80041924 3C01800A */ lui $at, %hi(gGameState) -/* 1CD28 80041928 AC22A600 */ sw $v0, %lo(gGameState)($at) -/* 1CD2C 8004192C 3C01800A */ lui $at, %hi(D_8009A678) -/* 1CD30 80041930 AC25A678 */ sw $a1, %lo(D_8009A678)($at) -/* 1CD34 80041934 AC800000 */ sw $zero, ($a0) -.L80041938: -/* 1CD38 80041938 8FBF0030 */ lw $ra, 0x30($sp) -/* 1CD3C 8004193C 8FB7002C */ lw $s7, 0x2c($sp) -/* 1CD40 80041940 8FB60028 */ lw $s6, 0x28($sp) -/* 1CD44 80041944 8FB50024 */ lw $s5, 0x24($sp) -/* 1CD48 80041948 8FB40020 */ lw $s4, 0x20($sp) -/* 1CD4C 8004194C 8FB3001C */ lw $s3, 0x1c($sp) -/* 1CD50 80041950 8FB20018 */ lw $s2, 0x18($sp) -/* 1CD54 80041954 8FB10014 */ lw $s1, 0x14($sp) -/* 1CD58 80041958 8FB00010 */ lw $s0, 0x10($sp) -/* 1CD5C 8004195C 03E00008 */ jr $ra -/* 1CD60 80041960 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/DF950/sfx_play_sound_at_position.s b/ver/us/asm/nonmatchings/DF950/sfx_play_sound_at_position.s deleted file mode 100644 index e28aceeb85..0000000000 --- a/ver/us/asm/nonmatchings/DF950/sfx_play_sound_at_position.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel sfx_play_sound_at_position -/* E045C 80149D5C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* E0460 80149D60 AFB20028 */ sw $s2, 0x28($sp) -/* E0464 80149D64 0080902D */ daddu $s2, $a0, $zero -/* E0468 80149D68 3C02F000 */ lui $v0, 0xf000 -/* E046C 80149D6C 02421024 */ and $v0, $s2, $v0 -/* E0470 80149D70 44866000 */ mtc1 $a2, $f12 -/* E0474 80149D74 44877000 */ mtc1 $a3, $f14 -/* E0478 80149D78 C7A00040 */ lwc1 $f0, 0x40($sp) -/* E047C 80149D7C 3C038000 */ lui $v1, 0x8000 -/* E0480 80149D80 AFBF002C */ sw $ra, 0x2c($sp) -/* E0484 80149D84 AFB10024 */ sw $s1, 0x24($sp) -/* E0488 80149D88 1443000A */ bne $v0, $v1, .L80149DB4 -/* E048C 80149D8C AFB00020 */ sw $s0, 0x20($sp) -/* E0490 80149D90 3242FFFF */ andi $v0, $s2, 0xffff -/* E0494 80149D94 00021080 */ sll $v0, $v0, 2 -/* E0498 80149D98 3C048015 */ lui $a0, %hi(D_8014F2D0) -/* E049C 80149D9C 00822021 */ addu $a0, $a0, $v0 -/* E04A0 80149DA0 8C84F2D0 */ lw $a0, %lo(D_8014F2D0)($a0) -/* E04A4 80149DA4 0C05265D */ jal sfx_register_looping_sound_at_position -/* E04A8 80149DA8 E7A00010 */ swc1 $f0, 0x10($sp) -/* E04AC 80149DAC 0805277B */ j .L80149DEC -/* E04B0 80149DB0 00000000 */ nop -.L80149DB4: -/* E04B4 80149DB4 27B10018 */ addiu $s1, $sp, 0x18 -/* E04B8 80149DB8 0220382D */ daddu $a3, $s1, $zero -/* E04BC 80149DBC 44060000 */ mfc1 $a2, $f0 -/* E04C0 80149DC0 27B0001A */ addiu $s0, $sp, 0x1a -/* E04C4 80149DC4 AFB00010 */ sw $s0, 0x10($sp) -/* E04C8 80149DC8 0C052781 */ jal sfx_get_spatialized_sound_params -/* E04CC 80149DCC AFA50014 */ sw $a1, 0x14($sp) -/* E04D0 80149DD0 87A20018 */ lh $v0, 0x18($sp) -/* E04D4 80149DD4 04400005 */ bltz $v0, .L80149DEC -/* E04D8 80149DD8 0240202D */ daddu $a0, $s2, $zero -/* E04DC 80149DDC 92250001 */ lbu $a1, 1($s1) -/* E04E0 80149DE0 92060001 */ lbu $a2, 1($s0) -/* E04E4 80149DE4 0C0526AE */ jal sfx_play_sound_with_params -/* E04E8 80149DE8 0000382D */ daddu $a3, $zero, $zero -.L80149DEC: -/* E04EC 80149DEC 8FBF002C */ lw $ra, 0x2c($sp) -/* E04F0 80149DF0 8FB20028 */ lw $s2, 0x28($sp) -/* E04F4 80149DF4 8FB10024 */ lw $s1, 0x24($sp) -/* E04F8 80149DF8 8FB00020 */ lw $s0, 0x20($sp) -/* E04FC 80149DFC 03E00008 */ jr $ra -/* E0500 80149E00 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/_load_model_textures.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/_load_model_textures.s deleted file mode 100644 index 9465c82f4d..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/_load_model_textures.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel _load_model_textures -/* AC244 80115B44 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AC248 80115B48 AFB20018 */ sw $s2, 0x18($sp) -/* AC24C 80115B4C 0080902D */ daddu $s2, $a0, $zero -/* AC250 80115B50 AFB3001C */ sw $s3, 0x1c($sp) -/* AC254 80115B54 00A0982D */ daddu $s3, $a1, $zero -/* AC258 80115B58 AFB40020 */ sw $s4, 0x20($sp) -/* AC25C 80115B5C AFBF0024 */ sw $ra, 0x24($sp) -/* AC260 80115B60 AFB10014 */ sw $s1, 0x14($sp) -/* AC264 80115B64 AFB00010 */ sw $s0, 0x10($sp) -/* AC268 80115B68 8E430000 */ lw $v1, ($s2) -/* AC26C 80115B6C 24020002 */ addiu $v0, $zero, 2 -/* AC270 80115B70 10620017 */ beq $v1, $v0, .L80115BD0 -/* AC274 80115B74 00C0A02D */ daddu $s4, $a2, $zero -/* AC278 80115B78 8E420010 */ lw $v0, 0x10($s2) -/* AC27C 80115B7C 1040001C */ beqz $v0, .L80115BF0 -/* AC280 80115B80 00000000 */ nop -/* AC284 80115B84 8C51000C */ lw $s1, 0xc($v0) -/* AC288 80115B88 12200019 */ beqz $s1, .L80115BF0 -/* AC28C 80115B8C 00000000 */ nop -/* AC290 80115B90 1A200017 */ blez $s1, .L80115BF0 -/* AC294 80115B94 0000802D */ daddu $s0, $zero, $zero -/* AC298 80115B98 0260282D */ daddu $a1, $s3, $zero -.L80115B9C: -/* AC29C 80115B9C 8E420010 */ lw $v0, 0x10($s2) -/* AC2A0 80115BA0 0280302D */ daddu $a2, $s4, $zero -/* AC2A4 80115BA4 8C430010 */ lw $v1, 0x10($v0) -/* AC2A8 80115BA8 00101080 */ sll $v0, $s0, 2 -/* AC2AC 80115BAC 00431021 */ addu $v0, $v0, $v1 -/* AC2B0 80115BB0 8C440000 */ lw $a0, ($v0) -/* AC2B4 80115BB4 0C0456D1 */ jal _load_model_textures -/* AC2B8 80115BB8 26100001 */ addiu $s0, $s0, 1 -/* AC2BC 80115BBC 0211102A */ slt $v0, $s0, $s1 -/* AC2C0 80115BC0 1440FFF6 */ bnez $v0, .L80115B9C -/* AC2C4 80115BC4 0260282D */ daddu $a1, $s3, $zero -/* AC2C8 80115BC8 080456FC */ j .L80115BF0 -/* AC2CC 80115BCC 00000000 */ nop -.L80115BD0: -/* AC2D0 80115BD0 0240202D */ daddu $a0, $s2, $zero -/* AC2D4 80115BD4 0C0456C3 */ jal get_model_property -/* AC2D8 80115BD8 2405005E */ addiu $a1, $zero, 0x5e -/* AC2DC 80115BDC 10400004 */ beqz $v0, .L80115BF0 -/* AC2E0 80115BE0 0040202D */ daddu $a0, $v0, $zero -/* AC2E4 80115BE4 0260282D */ daddu $a1, $s3, $zero -/* AC2E8 80115BE8 0C04535B */ jal load_tile_header -/* AC2EC 80115BEC 0280302D */ daddu $a2, $s4, $zero -.L80115BF0: -/* AC2F0 80115BF0 3C038015 */ lui $v1, %hi(mdl_treeIterPos) -/* AC2F4 80115BF4 24633224 */ addiu $v1, $v1, %lo(mdl_treeIterPos) -/* AC2F8 80115BF8 8C620000 */ lw $v0, ($v1) -/* AC2FC 80115BFC 24420001 */ addiu $v0, $v0, 1 -/* AC300 80115C00 AC620000 */ sw $v0, ($v1) -/* AC304 80115C04 8FBF0024 */ lw $ra, 0x24($sp) -/* AC308 80115C08 8FB40020 */ lw $s4, 0x20($sp) -/* AC30C 80115C0C 8FB3001C */ lw $s3, 0x1c($sp) -/* AC310 80115C10 8FB20018 */ lw $s2, 0x18($sp) -/* AC314 80115C14 8FB10014 */ lw $s1, 0x14($sp) -/* AC318 80115C18 8FB00010 */ lw $s0, 0x10($sp) -/* AC31C 80115C1C 03E00008 */ jr $ra -/* AC320 80115C20 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model_group.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model_group.s deleted file mode 100644 index 258428b78d..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model_group.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel appendGfx_model_group -/* AE394 80117C94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AE398 80117C98 AFBF0010 */ sw $ra, 0x10($sp) -/* AE39C 80117C9C 94820002 */ lhu $v0, 2($a0) -/* AE3A0 80117CA0 3C05800A */ lui $a1, %hi(mdl_currentModelTreeNodeInfo) -/* AE3A4 80117CA4 8CA5A5F4 */ lw $a1, %lo(mdl_currentModelTreeNodeInfo)($a1) -/* AE3A8 80117CA8 2443FFFF */ addiu $v1, $v0, -1 -/* AE3AC 80117CAC 00021080 */ sll $v0, $v0, 2 -/* AE3B0 80117CB0 00451021 */ addu $v0, $v0, $a1 -/* AE3B4 80117CB4 90460001 */ lbu $a2, 1($v0) -/* AE3B8 80117CB8 04600009 */ bltz $v1, .L80117CE0 -/* AE3BC 80117CBC 00031080 */ sll $v0, $v1, 2 -/* AE3C0 80117CC0 00452821 */ addu $a1, $v0, $a1 -.L80117CC4: -/* AE3C4 80117CC4 90A20001 */ lbu $v0, 1($a1) -/* AE3C8 80117CC8 00C2102A */ slt $v0, $a2, $v0 -/* AE3CC 80117CCC 10400005 */ beqz $v0, .L80117CE4 -/* AE3D0 80117CD0 24620001 */ addiu $v0, $v1, 1 -/* AE3D4 80117CD4 2463FFFF */ addiu $v1, $v1, -1 -/* AE3D8 80117CD8 0461FFFA */ bgez $v1, .L80117CC4 -/* AE3DC 80117CDC 24A5FFFC */ addiu $a1, $a1, -4 -.L80117CE0: -/* AE3E0 80117CE0 24620001 */ addiu $v0, $v1, 1 -.L80117CE4: -/* AE3E4 80117CE4 3C018015 */ lui $at, %hi(mdl_treeIterPos) -/* AE3E8 80117CE8 AC223224 */ sw $v0, %lo(mdl_treeIterPos)($at) -/* AE3EC 80117CEC 0C045F40 */ jal func_80117D00 -/* AE3F0 80117CF0 00000000 */ nop -/* AE3F4 80117CF4 8FBF0010 */ lw $ra, 0x10($sp) -/* AE3F8 80117CF8 03E00008 */ jr $ra -/* AE3FC 80117CFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s index 596ee9d168..af581410c9 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s @@ -57,8 +57,8 @@ glabel clear_entity_data .L80110D7C: /* A747C 80110D7C 3C018015 */ lui $at, %hi(bStaticEntityDataSize) /* A7480 80110D80 AC201660 */ sw $zero, %lo(bStaticEntityDataSize)($at) -/* A7484 80110D84 3C028015 */ lui $v0, %hi(D_801516F4) -/* A7488 80110D88 244216F4 */ addiu $v0, $v0, %lo(D_801516F4) +/* A7484 80110D84 3C028015 */ lui $v0, %hi(bStaticEntityData + 0xC) +/* A7488 80110D88 244216F4 */ addiu $v0, $v0, %lo(bStaticEntityData + 0xC) .L80110D8C: /* A748C 80110D8C AC400000 */ sw $zero, ($v0) /* A7490 80110D90 2484FFFF */ addiu $a0, $a0, -1 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110E58.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110E58.s deleted file mode 100644 index 7220aeb7d6..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110E58.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80110E58 -/* A7558 80110E58 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A755C 80110E5C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A7560 80110E60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7564 80110E64 AFBF0010 */ sw $ra, 0x10($sp) -/* A7568 80110E68 80420070 */ lb $v0, 0x70($v0) -/* A756C 80110E6C 1440000C */ bnez $v0, .L80110EA0 -/* A7570 80110E70 24030003 */ addiu $v1, $zero, 3 -/* A7574 80110E74 3C038026 */ lui $v1, 0x8026 -/* A7578 80110E78 34637FF0 */ ori $v1, $v1, 0x7ff0 -/* A757C 80110E7C 3C028025 */ lui $v0, 0x8025 -/* A7580 80110E80 3C018015 */ lui $at, %hi(D_80151300) -/* A7584 80110E84 AC221300 */ sw $v0, %lo(D_80151300)($at) -/* A7588 80110E88 3C018015 */ lui $at, %hi(gEntityHeapBase) -/* A758C 80110E8C AC2312C4 */ sw $v1, %lo(gEntityHeapBase)($at) -/* A7590 80110E90 0C0443C4 */ jal func_80110F10 -/* A7594 80110E94 00000000 */ nop -/* A7598 80110E98 080443B5 */ j .L80110ED4 -/* A759C 80110E9C 00000000 */ nop -.L80110EA0: -/* A75A0 80110EA0 3C028015 */ lui $v0, %hi(D_801516F4) -/* A75A4 80110EA4 244216F4 */ addiu $v0, $v0, %lo(D_801516F4) -.L80110EA8: -/* A75A8 80110EA8 AC400000 */ sw $zero, ($v0) -/* A75AC 80110EAC 2463FFFF */ addiu $v1, $v1, -1 -/* A75B0 80110EB0 0461FFFD */ bgez $v1, .L80110EA8 -/* A75B4 80110EB4 2442FFFC */ addiu $v0, $v0, -4 -/* A75B8 80110EB8 3C02801A */ lui $v0, %hi(D_801A7000) -/* A75BC 80110EBC 24427000 */ addiu $v0, $v0, %lo(D_801A7000) -/* A75C0 80110EC0 3C018015 */ lui $at, %hi(D_80151300) -/* A75C4 80110EC4 AC221300 */ sw $v0, %lo(D_80151300)($at) -/* A75C8 80110EC8 24423000 */ addiu $v0, $v0, 0x3000 -/* A75CC 80110ECC 3C018015 */ lui $at, %hi(gEntityHeapBase) -/* A75D0 80110ED0 AC2212C4 */ sw $v0, %lo(gEntityHeapBase)($at) -.L80110ED4: -/* A75D4 80110ED4 0C044188 */ jal get_entity_list -/* A75D8 80110ED8 00000000 */ nop -/* A75DC 80110EDC 3C018015 */ lui $at, %hi(gCurrentEntityListPtr) -/* A75E0 80110EE0 AC221470 */ sw $v0, %lo(gCurrentEntityListPtr)($at) -/* A75E4 80110EE4 0C044193 */ jal get_shadow_list -/* A75E8 80110EE8 00000000 */ nop -/* A75EC 80110EEC 8FBF0010 */ lw $ra, 0x10($sp) -/* A75F0 80110EF0 3C018015 */ lui $at, %hi(gCurrentShadowListPtr) -/* A75F4 80110EF4 AC221658 */ sw $v0, %lo(gCurrentShadowListPtr)($at) -/* A75F8 80110EF8 3C018015 */ lui $at, %hi(D_801512C0) -/* A75FC 80110EFC AC2012C0 */ sw $zero, %lo(D_801512C0)($at) -/* A7600 80110F00 3C018015 */ lui $at, %hi(D_80151324) -/* A7604 80110F04 AC201324 */ sw $zero, %lo(D_80151324)($at) -/* A7608 80110F08 03E00008 */ jr $ra -/* A760C 80110F0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_vertex_count.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_vertex_count.s deleted file mode 100644 index 5f99a66598..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_vertex_count.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel mdl_get_vertex_count -/* B2728 8011C028 27BDFFF8 */ addiu $sp, $sp, -8 -/* B272C 8011C02C 0000482D */ daddu $t1, $zero, $zero -/* B2730 8011C030 8FAC0018 */ lw $t4, 0x18($sp) -/* B2734 8011C034 14800004 */ bnez $a0, .L8011C048 -/* B2738 8011C038 0120502D */ daddu $t2, $t1, $zero -/* B273C 8011C03C ACA00000 */ sw $zero, ($a1) -/* B2740 8011C040 08047035 */ j .L8011C0D4 -/* B2744 8011C044 ACC00000 */ sw $zero, ($a2) -.L8011C048: -/* B2748 8011C048 0080682D */ daddu $t5, $a0, $zero -/* B274C 8011C04C 240F0001 */ addiu $t7, $zero, 1 -/* B2750 8011C050 240E00DF */ addiu $t6, $zero, 0xdf -.L8011C054: -/* B2754 8011C054 8C880000 */ lw $t0, ($a0) -/* B2758 8011C058 8C820004 */ lw $v0, 4($a0) -/* B275C 8011C05C 00085E02 */ srl $t3, $t0, 0x18 -/* B2760 8011C060 156F0013 */ bne $t3, $t7, .L8011C0B0 -/* B2764 8011C064 00000000 */ nop -/* B2768 8011C068 11800003 */ beqz $t4, .L8011C078 -/* B276C 8011C06C 0040182D */ daddu $v1, $v0, $zero -/* B2770 8011C070 3042FFFF */ andi $v0, $v0, 0xffff -/* B2774 8011C074 004C1821 */ addu $v1, $v0, $t4 -.L8011C078: -/* B2778 8011C078 00081302 */ srl $v0, $t0, 0xc -/* B277C 8011C07C 15200004 */ bnez $t1, .L8011C090 -/* B2780 8011C080 304800FF */ andi $t0, $v0, 0xff -/* B2784 8011C084 0060482D */ daddu $t1, $v1, $zero -/* B2788 8011C088 00081100 */ sll $v0, $t0, 4 -/* B278C 8011C08C 01225021 */ addu $t2, $t1, $v0 -.L8011C090: -/* B2790 8011C090 00081100 */ sll $v0, $t0, 4 -/* B2794 8011C094 00621821 */ addu $v1, $v1, $v0 -/* B2798 8011C098 0143102B */ sltu $v0, $t2, $v1 -/* B279C 8011C09C 54400001 */ bnel $v0, $zero, .L8011C0A4 -/* B27A0 8011C0A0 0060502D */ daddu $t2, $v1, $zero -.L8011C0A4: -/* B27A4 8011C0A4 0069102B */ sltu $v0, $v1, $t1 -/* B27A8 8011C0A8 54400001 */ bnel $v0, $zero, .L8011C0B0 -/* B27AC 8011C0AC 0060482D */ daddu $t1, $v1, $zero -.L8011C0B0: -/* B27B0 8011C0B0 156EFFE8 */ bne $t3, $t6, .L8011C054 -/* B27B4 8011C0B4 24840008 */ addiu $a0, $a0, 8 -/* B27B8 8011C0B8 01491023 */ subu $v0, $t2, $t1 -/* B27BC 8011C0BC 00021103 */ sra $v0, $v0, 4 -/* B27C0 8011C0C0 ACA20000 */ sw $v0, ($a1) -/* B27C4 8011C0C4 008D1023 */ subu $v0, $a0, $t5 -/* B27C8 8011C0C8 000210C3 */ sra $v0, $v0, 3 -/* B27CC 8011C0CC ACC90000 */ sw $t1, ($a2) -/* B27D0 8011C0D0 ACE20000 */ sw $v0, ($a3) -.L8011C0D4: -/* B27D4 8011C0D4 03E00008 */ jr $ra -/* B27D8 8011C0D8 27BD0008 */ addiu $sp, $sp, 8 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/test_player_entity_aabb.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/test_player_entity_aabb.s deleted file mode 100644 index 3e87a32ccf..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/test_player_entity_aabb.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel test_player_entity_aabb -/* A71AC 80110AAC 3C058011 */ lui $a1, %hi(gPlayerStatus) -/* A71B0 80110AB0 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) -/* A71B4 80110AB4 84A300B0 */ lh $v1, 0xb0($a1) -/* A71B8 80110AB8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* A71BC 80110ABC 44831000 */ mtc1 $v1, $f2 -/* A71C0 80110AC0 00000000 */ nop -/* A71C4 80110AC4 468010A0 */ cvt.s.w $f2, $f2 -/* A71C8 80110AC8 46020000 */ add.s $f0, $f0, $f2 -/* A71CC 80110ACC C482004C */ lwc1 $f2, 0x4c($a0) -/* A71D0 80110AD0 46001101 */ sub.s $f4, $f2, $f0 -/* A71D4 80110AD4 44800000 */ mtc1 $zero, $f0 -/* A71D8 80110AD8 00000000 */ nop -/* A71DC 80110ADC 4604003C */ c.lt.s $f0, $f4 -/* A71E0 80110AE0 00000000 */ nop -/* A71E4 80110AE4 4501000B */ bc1t .L80110B14 -/* A71E8 80110AE8 00000000 */ nop -/* A71EC 80110AEC 8482000E */ lh $v0, 0xe($a0) -/* A71F0 80110AF0 46002005 */ abs.s $f0, $f4 -/* A71F4 80110AF4 00621021 */ addu $v0, $v1, $v0 -/* A71F8 80110AF8 44821000 */ mtc1 $v0, $f2 -/* A71FC 80110AFC 00000000 */ nop -/* A7200 80110B00 468010A0 */ cvt.s.w $f2, $f2 -/* A7204 80110B04 4600103C */ c.lt.s $f2, $f0 -/* A7208 80110B08 00000000 */ nop -/* A720C 80110B0C 45000003 */ bc1f .L80110B1C -/* A7210 80110B10 00000000 */ nop -.L80110B14: -/* A7214 80110B14 03E00008 */ jr $ra -/* A7218 80110B18 0000102D */ daddu $v0, $zero, $zero -.L80110B1C: -/* A721C 80110B1C 84A300B2 */ lh $v1, 0xb2($a1) -/* A7220 80110B20 8482000C */ lh $v0, 0xc($a0) -/* A7224 80110B24 3C013FE0 */ lui $at, 0x3fe0 -/* A7228 80110B28 44810800 */ mtc1 $at, $f1 -/* A722C 80110B2C 44800000 */ mtc1 $zero, $f0 -/* A7230 80110B30 00621021 */ addu $v0, $v1, $v0 -/* A7234 80110B34 44821000 */ mtc1 $v0, $f2 -/* A7238 80110B38 00000000 */ nop -/* A723C 80110B3C 468010A1 */ cvt.d.w $f2, $f2 -/* A7240 80110B40 46201082 */ mul.d $f2, $f2, $f0 -/* A7244 80110B44 00000000 */ nop -/* A7248 80110B48 84820010 */ lh $v0, 0x10($a0) -/* A724C 80110B4C 00621821 */ addu $v1, $v1, $v0 -/* A7250 80110B50 44833000 */ mtc1 $v1, $f6 -/* A7254 80110B54 00000000 */ nop -/* A7258 80110B58 468031A1 */ cvt.d.w $f6, $f6 -/* A725C 80110B5C 46203182 */ mul.d $f6, $f6, $f0 -/* A7260 80110B60 00000000 */ nop -/* A7264 80110B64 C4A40028 */ lwc1 $f4, 0x28($a1) -/* A7268 80110B68 C4800048 */ lwc1 $f0, 0x48($a0) -/* A726C 80110B6C C4A80030 */ lwc1 $f8, 0x30($a1) -/* A7270 80110B70 46002101 */ sub.s $f4, $f4, $f0 -/* A7274 80110B74 C4800050 */ lwc1 $f0, 0x50($a0) -/* A7278 80110B78 46004201 */ sub.s $f8, $f8, $f0 -/* A727C 80110B7C 46002105 */ abs.s $f4, $f4 -/* A7280 80110B80 46004205 */ abs.s $f8, $f8 -/* A7284 80110B84 462010A0 */ cvt.s.d $f2, $f2 -/* A7288 80110B88 4604103C */ c.lt.s $f2, $f4 -/* A728C 80110B8C 00000000 */ nop -/* A7290 80110B90 4501FFE0 */ bc1t .L80110B14 -/* A7294 80110B94 462031A0 */ cvt.s.d $f6, $f6 -/* A7298 80110B98 4608303C */ c.lt.s $f6, $f8 -/* A729C 80110B9C 00000000 */ nop -/* A72A0 80110BA0 4501FFDC */ bc1t .L80110B14 -/* A72A4 80110BA4 24020001 */ addiu $v0, $zero, 1 -/* A72A8 80110BA8 03E00008 */ jr $ra -/* A72AC 80110BAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_inverse_rotation_matrix.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_inverse_rotation_matrix.s deleted file mode 100644 index 33203212ce..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_inverse_rotation_matrix.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_entity_inverse_rotation_matrix -/* A6BA4 801104A4 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* A6BA8 801104A8 F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* A6BAC 801104AC 4480A000 */ mtc1 $zero, $f20 -/* A6BB0 801104B0 AFB1009C */ sw $s1, 0x9c($sp) -/* A6BB4 801104B4 0080882D */ daddu $s1, $a0, $zero -/* A6BB8 801104B8 AFBF00A0 */ sw $ra, 0xa0($sp) -/* A6BBC 801104BC AFB00098 */ sw $s0, 0x98($sp) -/* A6BC0 801104C0 F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* A6BC4 801104C4 C6200064 */ lwc1 $f0, 0x64($s1) -/* A6BC8 801104C8 3C013F80 */ lui $at, 0x3f80 -/* A6BCC 801104CC 4481B000 */ mtc1 $at, $f22 -/* A6BD0 801104D0 46000007 */ neg.s $f0, $f0 -/* A6BD4 801104D4 4406A000 */ mfc1 $a2, $f20 -/* A6BD8 801104D8 4407B000 */ mfc1 $a3, $f22 -/* A6BDC 801104DC 44050000 */ mfc1 $a1, $f0 -/* A6BE0 801104E0 27A40018 */ addiu $a0, $sp, 0x18 -/* A6BE4 801104E4 0C019EC8 */ jal guRotateF -/* A6BE8 801104E8 E7B40010 */ swc1 $f20, 0x10($sp) -/* A6BEC 801104EC 27B00058 */ addiu $s0, $sp, 0x58 -/* A6BF0 801104F0 4406A000 */ mfc1 $a2, $f20 -/* A6BF4 801104F4 C6200068 */ lwc1 $f0, 0x68($s1) -/* A6BF8 801104F8 4407A000 */ mfc1 $a3, $f20 -/* A6BFC 801104FC 46000007 */ neg.s $f0, $f0 -/* A6C00 80110500 44050000 */ mfc1 $a1, $f0 -/* A6C04 80110504 0200202D */ daddu $a0, $s0, $zero -/* A6C08 80110508 0C019EC8 */ jal guRotateF -/* A6C0C 8011050C E7B60010 */ swc1 $f22, 0x10($sp) -/* A6C10 80110510 27A40018 */ addiu $a0, $sp, 0x18 -/* A6C14 80110514 0200282D */ daddu $a1, $s0, $zero -/* A6C18 80110518 0C019D80 */ jal guMtxCatF -/* A6C1C 8011051C 0080302D */ daddu $a2, $a0, $zero -/* A6C20 80110520 4406B000 */ mfc1 $a2, $f22 -/* A6C24 80110524 C6200060 */ lwc1 $f0, 0x60($s1) -/* A6C28 80110528 4407A000 */ mfc1 $a3, $f20 -/* A6C2C 8011052C 46000007 */ neg.s $f0, $f0 -/* A6C30 80110530 44050000 */ mfc1 $a1, $f0 -/* A6C34 80110534 0200202D */ daddu $a0, $s0, $zero -/* A6C38 80110538 0C019EC8 */ jal guRotateF -/* A6C3C 8011053C AFA70010 */ sw $a3, 0x10($sp) -/* A6C40 80110540 27A40018 */ addiu $a0, $sp, 0x18 -/* A6C44 80110544 0200282D */ daddu $a1, $s0, $zero -/* A6C48 80110548 0C019D80 */ jal guMtxCatF -/* A6C4C 8011054C 26260070 */ addiu $a2, $s1, 0x70 -/* A6C50 80110550 8622000C */ lh $v0, 0xc($s1) -/* A6C54 80110554 00420018 */ mult $v0, $v0 -/* A6C58 80110558 00001812 */ mflo $v1 -/* A6C5C 8011055C 86220010 */ lh $v0, 0x10($s1) -/* A6C60 80110560 00000000 */ nop -/* A6C64 80110564 00420018 */ mult $v0, $v0 -/* A6C68 80110568 00004812 */ mflo $t1 -/* A6C6C 8011056C 8622000E */ lh $v0, 0xe($s1) -/* A6C70 80110570 00000000 */ nop -/* A6C74 80110574 00420018 */ mult $v0, $v0 -/* A6C78 80110578 3C013E80 */ lui $at, 0x3e80 -/* A6C7C 8011057C 44811000 */ mtc1 $at, $f2 -/* A6C80 80110580 00691021 */ addu $v0, $v1, $t1 -/* A6C84 80110584 44820000 */ mtc1 $v0, $f0 -/* A6C88 80110588 00000000 */ nop -/* A6C8C 8011058C 46800020 */ cvt.s.w $f0, $f0 -/* A6C90 80110590 46020002 */ mul.s $f0, $f0, $f2 -/* A6C94 80110594 00000000 */ nop -/* A6C98 80110598 00002012 */ mflo $a0 -/* A6C9C 8011059C 44841000 */ mtc1 $a0, $f2 -/* A6CA0 801105A0 00000000 */ nop -/* A6CA4 801105A4 468010A0 */ cvt.s.w $f2, $f2 -/* A6CA8 801105A8 46020300 */ add.s $f12, $f0, $f2 -/* A6CAC 801105AC 46006004 */ sqrt.s $f0, $f12 -/* A6CB0 801105B0 46000032 */ c.eq.s $f0, $f0 -/* A6CB4 801105B4 00000000 */ nop -/* A6CB8 801105B8 45030004 */ bc1tl .L801105CC -/* A6CBC 801105BC E62000B0 */ swc1 $f0, 0xb0($s1) -/* A6CC0 801105C0 0C0187BC */ jal sqrtf -/* A6CC4 801105C4 00000000 */ nop -/* A6CC8 801105C8 E62000B0 */ swc1 $f0, 0xb0($s1) -.L801105CC: -/* A6CCC 801105CC 8FBF00A0 */ lw $ra, 0xa0($sp) -/* A6CD0 801105D0 8FB1009C */ lw $s1, 0x9c($sp) -/* A6CD4 801105D4 8FB00098 */ lw $s0, 0x98($sp) -/* A6CD8 801105D8 D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* A6CDC 801105DC D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* A6CE0 801105E0 03E00008 */ jr $ra -/* A6CE4 801105E4 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_transform_matrix.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_transform_matrix.s deleted file mode 100644 index a1c4cc0e80..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_transform_matrix.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_entity_transform_matrix -/* A692C 8011022C 27BDFE00 */ addiu $sp, $sp, -0x200 -/* A6930 80110230 AFB401E8 */ sw $s4, 0x1e8($sp) -/* A6934 80110234 0080A02D */ daddu $s4, $a0, $zero -/* A6938 80110238 AFBF01EC */ sw $ra, 0x1ec($sp) -/* A693C 8011023C AFB301E4 */ sw $s3, 0x1e4($sp) -/* A6940 80110240 AFB201E0 */ sw $s2, 0x1e0($sp) -/* A6944 80110244 AFB101DC */ sw $s1, 0x1dc($sp) -/* A6948 80110248 AFB001D8 */ sw $s0, 0x1d8($sp) -/* A694C 8011024C F7B601F8 */ sdc1 $f22, 0x1f8($sp) -/* A6950 80110250 F7B401F0 */ sdc1 $f20, 0x1f0($sp) -/* A6954 80110254 8E820020 */ lw $v0, 0x20($s4) -/* A6958 80110258 10400005 */ beqz $v0, .L80110270 -/* A695C 8011025C 27B30058 */ addiu $s3, $sp, 0x58 -/* A6960 80110260 0040F809 */ jalr $v0 -/* A6964 80110264 00000000 */ nop -/* A6968 80110268 080440D3 */ j .L8011034C -/* A696C 8011026C 00000000 */ nop -.L80110270: -/* A6970 80110270 8E850048 */ lw $a1, 0x48($s4) -/* A6974 80110274 8E86004C */ lw $a2, 0x4c($s4) -/* A6978 80110278 8E870050 */ lw $a3, 0x50($s4) -/* A697C 8011027C 4480A000 */ mtc1 $zero, $f20 -/* A6980 80110280 0C019E40 */ jal guTranslateF -/* A6984 80110284 0260202D */ daddu $a0, $s3, $zero -/* A6988 80110288 3C013F80 */ lui $at, 0x3f80 -/* A698C 8011028C 4481B000 */ mtc1 $at, $f22 -/* A6990 80110290 27B200D8 */ addiu $s2, $sp, 0xd8 -/* A6994 80110294 E7B40010 */ swc1 $f20, 0x10($sp) -/* A6998 80110298 8E850060 */ lw $a1, 0x60($s4) -/* A699C 8011029C 4407A000 */ mfc1 $a3, $f20 -/* A69A0 801102A0 4406B000 */ mfc1 $a2, $f22 -/* A69A4 801102A4 0C019EC8 */ jal guRotateF -/* A69A8 801102A8 0240202D */ daddu $a0, $s2, $zero -/* A69AC 801102AC 27B10118 */ addiu $s1, $sp, 0x118 -/* A69B0 801102B0 E7B40010 */ swc1 $f20, 0x10($sp) -/* A69B4 801102B4 8E850064 */ lw $a1, 0x64($s4) -/* A69B8 801102B8 4406A000 */ mfc1 $a2, $f20 -/* A69BC 801102BC 4407B000 */ mfc1 $a3, $f22 -/* A69C0 801102C0 0C019EC8 */ jal guRotateF -/* A69C4 801102C4 0220202D */ daddu $a0, $s1, $zero -/* A69C8 801102C8 27B00158 */ addiu $s0, $sp, 0x158 -/* A69CC 801102CC 4406A000 */ mfc1 $a2, $f20 -/* A69D0 801102D0 0200202D */ daddu $a0, $s0, $zero -/* A69D4 801102D4 E7B60010 */ swc1 $f22, 0x10($sp) -/* A69D8 801102D8 8E850068 */ lw $a1, 0x68($s4) -/* A69DC 801102DC 0C019EC8 */ jal guRotateF -/* A69E0 801102E0 00C0382D */ daddu $a3, $a2, $zero -/* A69E4 801102E4 0200202D */ daddu $a0, $s0, $zero -/* A69E8 801102E8 0240282D */ daddu $a1, $s2, $zero -/* A69EC 801102EC 0C019D80 */ jal guMtxCatF -/* A69F0 801102F0 27A60018 */ addiu $a2, $sp, 0x18 -/* A69F4 801102F4 27A40018 */ addiu $a0, $sp, 0x18 -/* A69F8 801102F8 0220282D */ daddu $a1, $s1, $zero -/* A69FC 801102FC 27B10098 */ addiu $s1, $sp, 0x98 -/* A6A00 80110300 0C019D80 */ jal guMtxCatF -/* A6A04 80110304 0220302D */ daddu $a2, $s1, $zero -/* A6A08 80110308 27B00198 */ addiu $s0, $sp, 0x198 -/* A6A0C 8011030C 8E850054 */ lw $a1, 0x54($s4) -/* A6A10 80110310 8E860058 */ lw $a2, 0x58($s4) -/* A6A14 80110314 8E87005C */ lw $a3, 0x5c($s4) -/* A6A18 80110318 0C019DF0 */ jal guScaleF -/* A6A1C 8011031C 0200202D */ daddu $a0, $s0, $zero -/* A6A20 80110320 0200202D */ daddu $a0, $s0, $zero -/* A6A24 80110324 0220282D */ daddu $a1, $s1, $zero -/* A6A28 80110328 0C019D80 */ jal guMtxCatF -/* A6A2C 8011032C 27A60018 */ addiu $a2, $sp, 0x18 -/* A6A30 80110330 27A40018 */ addiu $a0, $sp, 0x18 -/* A6A34 80110334 0260282D */ daddu $a1, $s3, $zero -/* A6A38 80110338 0C019D80 */ jal guMtxCatF -/* A6A3C 8011033C 0220302D */ daddu $a2, $s1, $zero -/* A6A40 80110340 0220202D */ daddu $a0, $s1, $zero -/* A6A44 80110344 0C019D40 */ jal guMtxF2L -/* A6A48 80110348 268500B8 */ addiu $a1, $s4, 0xb8 -.L8011034C: -/* A6A4C 8011034C 8FBF01EC */ lw $ra, 0x1ec($sp) -/* A6A50 80110350 8FB401E8 */ lw $s4, 0x1e8($sp) -/* A6A54 80110354 8FB301E4 */ lw $s3, 0x1e4($sp) -/* A6A58 80110358 8FB201E0 */ lw $s2, 0x1e0($sp) -/* A6A5C 8011035C 8FB101DC */ lw $s1, 0x1dc($sp) -/* A6A60 80110360 8FB001D8 */ lw $s0, 0x1d8($sp) -/* A6A64 80110364 D7B601F8 */ ldc1 $f22, 0x1f8($sp) -/* A6A68 80110368 D7B401F0 */ ldc1 $f20, 0x1f0($sp) -/* A6A6C 8011036C 03E00008 */ jr $ra -/* A6A70 80110370 27BD0200 */ addiu $sp, $sp, 0x200 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_shadow_transform_matrix.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_shadow_transform_matrix.s deleted file mode 100644 index 2564fcf0e5..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_shadow_transform_matrix.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_shadow_transform_matrix -/* A6A74 80110374 27BDFE00 */ addiu $sp, $sp, -0x200 -/* A6A78 80110378 AFB201E0 */ sw $s2, 0x1e0($sp) -/* A6A7C 8011037C 0080902D */ daddu $s2, $a0, $zero -/* A6A80 80110380 AFB401E8 */ sw $s4, 0x1e8($sp) -/* A6A84 80110384 27B40058 */ addiu $s4, $sp, 0x58 -/* A6A88 80110388 AFBF01EC */ sw $ra, 0x1ec($sp) -/* A6A8C 8011038C AFB301E4 */ sw $s3, 0x1e4($sp) -/* A6A90 80110390 AFB101DC */ sw $s1, 0x1dc($sp) -/* A6A94 80110394 AFB001D8 */ sw $s0, 0x1d8($sp) -/* A6A98 80110398 F7B601F8 */ sdc1 $f22, 0x1f8($sp) -/* A6A9C 8011039C F7B401F0 */ sdc1 $f20, 0x1f0($sp) -/* A6AA0 801103A0 8E450010 */ lw $a1, 0x10($s2) -/* A6AA4 801103A4 8E460014 */ lw $a2, 0x14($s2) -/* A6AA8 801103A8 8E470018 */ lw $a3, 0x18($s2) -/* A6AAC 801103AC 4480A000 */ mtc1 $zero, $f20 -/* A6AB0 801103B0 0C019E40 */ jal guTranslateF -/* A6AB4 801103B4 0280202D */ daddu $a0, $s4, $zero -/* A6AB8 801103B8 3C013F80 */ lui $at, 0x3f80 -/* A6ABC 801103BC 4481B000 */ mtc1 $at, $f22 -/* A6AC0 801103C0 27B10118 */ addiu $s1, $sp, 0x118 -/* A6AC4 801103C4 E7B40010 */ swc1 $f20, 0x10($sp) -/* A6AC8 801103C8 8E450028 */ lw $a1, 0x28($s2) -/* A6ACC 801103CC 4407A000 */ mfc1 $a3, $f20 -/* A6AD0 801103D0 4406B000 */ mfc1 $a2, $f22 -/* A6AD4 801103D4 0C019EC8 */ jal guRotateF -/* A6AD8 801103D8 0220202D */ daddu $a0, $s1, $zero -/* A6ADC 801103DC 27B300D8 */ addiu $s3, $sp, 0xd8 -/* A6AE0 801103E0 E7B40010 */ swc1 $f20, 0x10($sp) -/* A6AE4 801103E4 8E45002C */ lw $a1, 0x2c($s2) -/* A6AE8 801103E8 4406A000 */ mfc1 $a2, $f20 -/* A6AEC 801103EC 4407B000 */ mfc1 $a3, $f22 -/* A6AF0 801103F0 0C019EC8 */ jal guRotateF -/* A6AF4 801103F4 0260202D */ daddu $a0, $s3, $zero -/* A6AF8 801103F8 27B00158 */ addiu $s0, $sp, 0x158 -/* A6AFC 801103FC 4406A000 */ mfc1 $a2, $f20 -/* A6B00 80110400 0200202D */ daddu $a0, $s0, $zero -/* A6B04 80110404 E7B60010 */ swc1 $f22, 0x10($sp) -/* A6B08 80110408 8E450030 */ lw $a1, 0x30($s2) -/* A6B0C 8011040C 0C019EC8 */ jal guRotateF -/* A6B10 80110410 00C0382D */ daddu $a3, $a2, $zero -/* A6B14 80110414 0200202D */ daddu $a0, $s0, $zero -/* A6B18 80110418 0220282D */ daddu $a1, $s1, $zero -/* A6B1C 8011041C 27B10098 */ addiu $s1, $sp, 0x98 -/* A6B20 80110420 0C019D80 */ jal guMtxCatF -/* A6B24 80110424 0220302D */ daddu $a2, $s1, $zero -/* A6B28 80110428 0260202D */ daddu $a0, $s3, $zero -/* A6B2C 8011042C 0220282D */ daddu $a1, $s1, $zero -/* A6B30 80110430 0C019D80 */ jal guMtxCatF -/* A6B34 80110434 0220302D */ daddu $a2, $s1, $zero -/* A6B38 80110438 27B00198 */ addiu $s0, $sp, 0x198 -/* A6B3C 8011043C 8E45001C */ lw $a1, 0x1c($s2) -/* A6B40 80110440 8E460020 */ lw $a2, 0x20($s2) -/* A6B44 80110444 8E470024 */ lw $a3, 0x24($s2) -/* A6B48 80110448 0C019DF0 */ jal guScaleF -/* A6B4C 8011044C 0200202D */ daddu $a0, $s0, $zero -/* A6B50 80110450 0200202D */ daddu $a0, $s0, $zero -/* A6B54 80110454 0220282D */ daddu $a1, $s1, $zero -/* A6B58 80110458 0C019D80 */ jal guMtxCatF -/* A6B5C 8011045C 27A60018 */ addiu $a2, $sp, 0x18 -/* A6B60 80110460 27A40018 */ addiu $a0, $sp, 0x18 -/* A6B64 80110464 0280282D */ daddu $a1, $s4, $zero -/* A6B68 80110468 0C019D80 */ jal guMtxCatF -/* A6B6C 8011046C 0220302D */ daddu $a2, $s1, $zero -/* A6B70 80110470 0220202D */ daddu $a0, $s1, $zero -/* A6B74 80110474 0C019D40 */ jal guMtxF2L -/* A6B78 80110478 26450038 */ addiu $a1, $s2, 0x38 -/* A6B7C 8011047C 8FBF01EC */ lw $ra, 0x1ec($sp) -/* A6B80 80110480 8FB401E8 */ lw $s4, 0x1e8($sp) -/* A6B84 80110484 8FB301E4 */ lw $s3, 0x1e4($sp) -/* A6B88 80110488 8FB201E0 */ lw $s2, 0x1e0($sp) -/* A6B8C 8011048C 8FB101DC */ lw $s1, 0x1dc($sp) -/* A6B90 80110490 8FB001D8 */ lw $s0, 0x1d8($sp) -/* A6B94 80110494 D7B601F8 */ ldc1 $f22, 0x1f8($sp) -/* A6B98 80110498 D7B401F0 */ ldc1 $f20, 0x1f0($sp) -/* A6B9C 8011049C 03E00008 */ jr $ra -/* A6BA0 801104A0 27BD0200 */ addiu $sp, $sp, 0x200 diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/clear_screen_overlays.s b/ver/us/asm/nonmatchings/cd180_len_38f0/clear_screen_overlays.s deleted file mode 100644 index 85f2106ed0..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/clear_screen_overlays.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel clear_screen_overlays -/* CE808 80138108 3C048016 */ lui $a0, %hi(D_8015C790) -/* CE80C 8013810C 2484C790 */ addiu $a0, $a0, %lo(D_8015C790) -/* CE810 80138110 0000282D */ daddu $a1, $zero, $zero -/* CE814 80138114 24830014 */ addiu $v1, $a0, 0x14 -/* CE818 80138118 3C01437F */ lui $at, 0x437f -/* CE81C 8013811C 44811000 */ mtc1 $at, $f2 -/* CE820 80138120 3C01BF80 */ lui $at, 0xbf80 -/* CE824 80138124 44810000 */ mtc1 $at, $f0 -/* CE828 80138128 2402FFFF */ addiu $v0, $zero, -1 -/* CE82C 8013812C 3C018015 */ lui $at, %hi(D_80156900) -/* CE830 80138130 AC226900 */ sw $v0, %lo(D_80156900)($at) -/* CE834 80138134 3C018015 */ lui $at, %hi(D_80156908) -/* CE838 80138138 AC226908 */ sw $v0, %lo(D_80156908)($at) -/* CE83C 8013813C 3C018015 */ lui $at, %hi(D_80156904) -/* CE840 80138140 E4206904 */ swc1 $f0, %lo(D_80156904)($at) -/* CE844 80138144 3C018015 */ lui $at, %hi(D_8015690C) -/* CE848 80138148 E420690C */ swc1 $f0, %lo(D_8015690C)($at) -.L8013814C: -/* CE84C 8013814C 24A50001 */ addiu $a1, $a1, 1 -/* CE850 80138150 A060FFEE */ sb $zero, -0x12($v1) -/* CE854 80138154 A060FFED */ sb $zero, -0x13($v1) -/* CE858 80138158 A0800000 */ sb $zero, ($a0) -/* CE85C 8013815C AC60FFFC */ sw $zero, -4($v1) -/* CE860 80138160 AC60FFF8 */ sw $zero, -8($v1) -/* CE864 80138164 AC60FFF4 */ sw $zero, -0xc($v1) -/* CE868 80138168 AC60FFF0 */ sw $zero, -0x10($v1) -/* CE86C 8013816C E4620000 */ swc1 $f2, ($v1) -/* CE870 80138170 24630018 */ addiu $v1, $v1, 0x18 -/* CE874 80138174 28A20002 */ slti $v0, $a1, 2 -/* CE878 80138178 1440FFF4 */ bnez $v0, .L8013814C -/* CE87C 8013817C 24840018 */ addiu $a0, $a0, 0x18 -/* CE880 80138180 03E00008 */ jr $ra -/* CE884 80138184 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/func_80138188.s b/ver/us/asm/nonmatchings/cd180_len_38f0/func_80138188.s deleted file mode 100644 index 1a2721689f..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/func_80138188.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80138188 -/* CE888 80138188 3C018015 */ lui $at, %hi(D_8015690C) -/* CE88C 8013818C AC20690C */ sw $zero, %lo(D_8015690C)($at) -/* CE890 80138190 03E00008 */ jr $ra -/* CE894 80138194 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/get_screen_overlay_params.s b/ver/us/asm/nonmatchings/cd180_len_38f0/get_screen_overlay_params.s deleted file mode 100644 index a560e1940a..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/get_screen_overlay_params.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_screen_overlay_params -/* CE4C0 80137DC0 10800005 */ beqz $a0, .L80137DD8 -/* CE4C4 80137DC4 24020001 */ addiu $v0, $zero, 1 -/* CE4C8 80137DC8 1082000A */ beq $a0, $v0, .L80137DF4 -/* CE4CC 80137DCC 00000000 */ nop -/* CE4D0 80137DD0 03E00008 */ jr $ra -/* CE4D4 80137DD4 00000000 */ nop -.L80137DD8: -/* CE4D8 80137DD8 3C028015 */ lui $v0, %hi(D_80156903) -/* CE4DC 80137DDC 90426903 */ lbu $v0, %lo(D_80156903)($v0) -/* CE4E0 80137DE0 A0A20000 */ sb $v0, ($a1) -/* CE4E4 80137DE4 3C018015 */ lui $at, %hi(D_80156904) -/* CE4E8 80137DE8 C4206904 */ lwc1 $f0, %lo(D_80156904)($at) -/* CE4EC 80137DEC 03E00008 */ jr $ra -/* CE4F0 80137DF0 E4C00000 */ swc1 $f0, ($a2) -.L80137DF4: -/* CE4F4 80137DF4 3C028015 */ lui $v0, %hi(D_8015690B) -/* CE4F8 80137DF8 9042690B */ lbu $v0, %lo(D_8015690B)($v0) -/* CE4FC 80137DFC A0A20000 */ sb $v0, ($a1) -/* CE500 80137E00 3C018015 */ lui $at, %hi(D_8015690C) -/* CE504 80137E04 C420690C */ lwc1 $f0, %lo(D_8015690C)($at) -/* CE508 80137E08 03E00008 */ jr $ra -/* CE50C 80137E0C E4C00000 */ swc1 $f0, ($a2) diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/render_screen_overlay_backUI.s b/ver/us/asm/nonmatchings/cd180_len_38f0/render_screen_overlay_backUI.s deleted file mode 100644 index 0097f159de..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/render_screen_overlay_backUI.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel render_screen_overlay_backUI -/* CE920 80138220 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CE924 80138224 3C048015 */ lui $a0, %hi(D_80156908) -/* CE928 80138228 24846908 */ addiu $a0, $a0, %lo(D_80156908) -/* CE92C 8013822C AFBF0010 */ sw $ra, 0x10($sp) -/* CE930 80138230 8C830000 */ lw $v1, ($a0) -/* CE934 80138234 2402FFFF */ addiu $v0, $zero, -1 -/* CE938 80138238 10620016 */ beq $v1, $v0, .L80138294 -/* CE93C 8013823C 00000000 */ nop -/* CE940 80138240 3C018015 */ lui $at, %hi(D_8015690C) -/* CE944 80138244 C422690C */ lwc1 $f2, %lo(D_8015690C)($at) -/* CE948 80138248 3C01BF80 */ lui $at, 0xbf80 -/* CE94C 8013824C 44810000 */ mtc1 $at, $f0 -/* CE950 80138250 00000000 */ nop -/* CE954 80138254 46001032 */ c.eq.s $f2, $f0 -/* CE958 80138258 00000000 */ nop -/* CE95C 8013825C 4501000D */ bc1t .L80138294 -/* CE960 80138260 00000000 */ nop -/* CE964 80138264 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* CE968 80138268 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* CE96C 8013826C 80430070 */ lb $v1, 0x70($v0) -/* CE970 80138270 24020002 */ addiu $v0, $zero, 2 -/* CE974 80138274 10620007 */ beq $v1, $v0, .L80138294 -/* CE978 80138278 00000000 */ nop -/* CE97C 8013827C 90840003 */ lbu $a0, 3($a0) -/* CE980 80138280 44051000 */ mfc1 $a1, $f2 -/* CE984 80138284 3C068016 */ lui $a2, %hi(D_8015C7A8) -/* CE988 80138288 24C6C7A8 */ addiu $a2, $a2, %lo(D_8015C7A8) -/* CE98C 8013828C 0C04DAA0 */ jal _render_transition_stencil -/* CE990 80138290 00000000 */ nop -.L80138294: -/* CE994 80138294 8FBF0010 */ lw $ra, 0x10($sp) -/* CE998 80138298 03E00008 */ jr $ra -/* CE99C 8013829C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/render_screen_overlay_frontUI.s b/ver/us/asm/nonmatchings/cd180_len_38f0/render_screen_overlay_frontUI.s deleted file mode 100644 index 1019e99037..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/render_screen_overlay_frontUI.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel render_screen_overlay_frontUI -/* CE8A0 801381A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CE8A4 801381A4 3C048015 */ lui $a0, %hi(D_80156900) -/* CE8A8 801381A8 24846900 */ addiu $a0, $a0, %lo(D_80156900) -/* CE8AC 801381AC AFBF0010 */ sw $ra, 0x10($sp) -/* CE8B0 801381B0 8C830000 */ lw $v1, ($a0) -/* CE8B4 801381B4 2402FFFF */ addiu $v0, $zero, -1 -/* CE8B8 801381B8 10620016 */ beq $v1, $v0, .L80138214 -/* CE8BC 801381BC 00000000 */ nop -/* CE8C0 801381C0 3C018015 */ lui $at, %hi(D_80156904) -/* CE8C4 801381C4 C4226904 */ lwc1 $f2, %lo(D_80156904)($at) -/* CE8C8 801381C8 3C01BF80 */ lui $at, 0xbf80 -/* CE8CC 801381CC 44810000 */ mtc1 $at, $f0 -/* CE8D0 801381D0 00000000 */ nop -/* CE8D4 801381D4 46001032 */ c.eq.s $f2, $f0 -/* CE8D8 801381D8 00000000 */ nop -/* CE8DC 801381DC 4501000D */ bc1t .L80138214 -/* CE8E0 801381E0 00000000 */ nop -/* CE8E4 801381E4 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* CE8E8 801381E8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* CE8EC 801381EC 80430070 */ lb $v1, 0x70($v0) -/* CE8F0 801381F0 24020002 */ addiu $v0, $zero, 2 -/* CE8F4 801381F4 10620007 */ beq $v1, $v0, .L80138214 -/* CE8F8 801381F8 00000000 */ nop -/* CE8FC 801381FC 90840003 */ lbu $a0, 3($a0) -/* CE900 80138200 44051000 */ mfc1 $a1, $f2 -/* CE904 80138204 3C068016 */ lui $a2, %hi(D_8015C790) -/* CE908 80138208 24C6C790 */ addiu $a2, $a2, %lo(D_8015C790) -/* CE90C 8013820C 0C04DAA0 */ jal _render_transition_stencil -/* CE910 80138210 00000000 */ nop -.L80138214: -/* CE914 80138214 8FBF0010 */ lw $ra, 0x10($sp) -/* CE918 80138218 03E00008 */ jr $ra -/* CE91C 8013821C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/set_map_transition_effect.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_map_transition_effect.s deleted file mode 100644 index 4cc585ecbb..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/set_map_transition_effect.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_map_transition_effect -/* CE9A0 801382A0 3C018015 */ lui $at, %hi(D_8014C6F0) -/* CE9A4 801382A4 03E00008 */ jr $ra -/* CE9A8 801382A8 AC24C6F0 */ sw $a0, %lo(D_8014C6F0)($at) diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_alpha.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_alpha.s deleted file mode 100644 index c5d90a02b4..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_alpha.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_screen_overlay_alpha -/* CE7D4 801380D4 44850000 */ mtc1 $a1, $f0 -/* CE7D8 801380D8 28820002 */ slti $v0, $a0, 2 -/* CE7DC 801380DC 10400008 */ beqz $v0, .L80138100 -/* CE7E0 801380E0 00000000 */ nop -/* CE7E4 801380E4 04800006 */ bltz $a0, .L80138100 -/* CE7E8 801380E8 00041040 */ sll $v0, $a0, 1 -/* CE7EC 801380EC 00441021 */ addu $v0, $v0, $a0 -/* CE7F0 801380F0 000210C0 */ sll $v0, $v0, 3 -/* CE7F4 801380F4 3C018016 */ lui $at, %hi(D_8015C7A4) -/* CE7F8 801380F8 00220821 */ addu $at, $at, $v0 -/* CE7FC 801380FC E420C7A4 */ swc1 $f0, %lo(D_8015C7A4)($at) -.L80138100: -/* CE800 80138100 03E00008 */ jr $ra -/* CE804 80138104 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_center.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_center.s deleted file mode 100644 index 21242f037e..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_center.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_screen_overlay_center -/* CE54C 80137E4C 28820002 */ slti $v0, $a0, 2 -/* CE550 80137E50 10400019 */ beqz $v0, .L80137EB8 -/* CE554 80137E54 00000000 */ nop -/* CE558 80137E58 04800017 */ bltz $a0, .L80137EB8 -/* CE55C 80137E5C 00000000 */ nop -/* CE560 80137E60 10A00005 */ beqz $a1, .L80137E78 -/* CE564 80137E64 24020001 */ addiu $v0, $zero, 1 -/* CE568 80137E68 10A2000C */ beq $a1, $v0, .L80137E9C -/* CE56C 80137E6C 00041040 */ sll $v0, $a0, 1 -/* CE570 80137E70 03E00008 */ jr $ra -/* CE574 80137E74 00000000 */ nop -.L80137E78: -/* CE578 80137E78 3C038016 */ lui $v1, %hi(D_8015C790) -/* CE57C 80137E7C 2463C790 */ addiu $v1, $v1, %lo(D_8015C790) -/* CE580 80137E80 00041040 */ sll $v0, $a0, 1 -/* CE584 80137E84 00441021 */ addu $v0, $v0, $a0 -/* CE588 80137E88 000210C0 */ sll $v0, $v0, 3 -/* CE58C 80137E8C 00431021 */ addu $v0, $v0, $v1 -/* CE590 80137E90 AC460004 */ sw $a2, 4($v0) -/* CE594 80137E94 03E00008 */ jr $ra -/* CE598 80137E98 AC470008 */ sw $a3, 8($v0) -.L80137E9C: -/* CE59C 80137E9C 3C038016 */ lui $v1, %hi(D_8015C790) -/* CE5A0 80137EA0 2463C790 */ addiu $v1, $v1, %lo(D_8015C790) -/* CE5A4 80137EA4 00441021 */ addu $v0, $v0, $a0 -/* CE5A8 80137EA8 000210C0 */ sll $v0, $v0, 3 -/* CE5AC 80137EAC 00431021 */ addu $v0, $v0, $v1 -/* CE5B0 80137EB0 AC46000C */ sw $a2, 0xc($v0) -/* CE5B4 80137EB4 AC470010 */ sw $a3, 0x10($v0) -.L80137EB8: -/* CE5B8 80137EB8 03E00008 */ jr $ra -/* CE5BC 80137EBC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_center_worldpos.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_center_worldpos.s deleted file mode 100644 index 240d679b0e..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_center_worldpos.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_screen_overlay_center_worldpos -/* CE5C0 80137EC0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CE5C4 80137EC4 AFB1003C */ sw $s1, 0x3c($sp) -/* CE5C8 80137EC8 0080882D */ daddu $s1, $a0, $zero -/* CE5CC 80137ECC AFB20040 */ sw $s2, 0x40($sp) -/* CE5D0 80137ED0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* CE5D4 80137ED4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CE5D8 80137ED8 3C04800B */ lui $a0, %hi(gCameras) -/* CE5DC 80137EDC 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* CE5E0 80137EE0 AFBF0044 */ sw $ra, 0x44($sp) -/* CE5E4 80137EE4 AFB00038 */ sw $s0, 0x38($sp) -/* CE5E8 80137EE8 F7B40048 */ sdc1 $f20, 0x48($sp) -/* CE5EC 80137EEC 00031080 */ sll $v0, $v1, 2 -/* CE5F0 80137EF0 00431021 */ addu $v0, $v0, $v1 -/* CE5F4 80137EF4 00021080 */ sll $v0, $v0, 2 -/* CE5F8 80137EF8 00431023 */ subu $v0, $v0, $v1 -/* CE5FC 80137EFC 000218C0 */ sll $v1, $v0, 3 -/* CE600 80137F00 00431021 */ addu $v0, $v0, $v1 -/* CE604 80137F04 000210C0 */ sll $v0, $v0, 3 -/* CE608 80137F08 00448021 */ addu $s0, $v0, $a0 -/* CE60C 80137F0C 2A220002 */ slti $v0, $s1, 2 -/* CE610 80137F10 10400069 */ beqz $v0, .L801380B8 -/* CE614 80137F14 00A0902D */ daddu $s2, $a1, $zero -/* CE618 80137F18 06200067 */ bltz $s1, .L801380B8 -/* CE61C 80137F1C 27A20028 */ addiu $v0, $sp, 0x28 -/* CE620 80137F20 AFA20014 */ sw $v0, 0x14($sp) -/* CE624 80137F24 27A2002C */ addiu $v0, $sp, 0x2c -/* CE628 80137F28 AFA20018 */ sw $v0, 0x18($sp) -/* CE62C 80137F2C 27A20030 */ addiu $v0, $sp, 0x30 -/* CE630 80137F30 AFA2001C */ sw $v0, 0x1c($sp) -/* CE634 80137F34 27A20034 */ addiu $v0, $sp, 0x34 -/* CE638 80137F38 44866000 */ mtc1 $a2, $f12 -/* CE63C 80137F3C 00000000 */ nop -/* CE640 80137F40 46806320 */ cvt.s.w $f12, $f12 -/* CE644 80137F44 44056000 */ mfc1 $a1, $f12 -/* CE648 80137F48 44876000 */ mtc1 $a3, $f12 -/* CE64C 80137F4C 00000000 */ nop -/* CE650 80137F50 46806320 */ cvt.s.w $f12, $f12 -/* CE654 80137F54 44066000 */ mfc1 $a2, $f12 -/* CE658 80137F58 C7AC0060 */ lwc1 $f12, 0x60($sp) -/* CE65C 80137F5C 46806320 */ cvt.s.w $f12, $f12 -/* CE660 80137F60 3C013F80 */ lui $at, 0x3f80 -/* CE664 80137F64 4481A000 */ mtc1 $at, $f20 -/* CE668 80137F68 44076000 */ mfc1 $a3, $f12 -/* CE66C 80137F6C 260400D4 */ addiu $a0, $s0, 0xd4 -/* CE670 80137F70 AFA20020 */ sw $v0, 0x20($sp) -/* CE674 80137F74 0C00A588 */ jal transform_point -/* CE678 80137F78 E7B40010 */ swc1 $f20, 0x10($sp) -/* CE67C 80137F7C C7A00034 */ lwc1 $f0, 0x34($sp) -/* CE680 80137F80 C7AA0028 */ lwc1 $f10, 0x28($sp) -/* CE684 80137F84 4600A503 */ div.s $f20, $f20, $f0 -/* CE688 80137F88 46145282 */ mul.s $f10, $f10, $f20 -/* CE68C 80137F8C 00000000 */ nop -/* CE690 80137F90 8602000A */ lh $v0, 0xa($s0) -/* CE694 80137F94 44820000 */ mtc1 $v0, $f0 -/* CE698 80137F98 00000000 */ nop -/* CE69C 80137F9C 46800020 */ cvt.s.w $f0, $f0 -/* CE6A0 80137FA0 46005102 */ mul.s $f4, $f10, $f0 -/* CE6A4 80137FA4 00000000 */ nop -/* CE6A8 80137FA8 46002100 */ add.s $f4, $f4, $f0 -/* CE6AC 80137FAC 3C013FE0 */ lui $at, 0x3fe0 -/* CE6B0 80137FB0 44813800 */ mtc1 $at, $f7 -/* CE6B4 80137FB4 44803000 */ mtc1 $zero, $f6 -/* CE6B8 80137FB8 46002121 */ cvt.d.s $f4, $f4 -/* CE6BC 80137FBC 46262102 */ mul.d $f4, $f4, $f6 -/* CE6C0 80137FC0 00000000 */ nop -/* CE6C4 80137FC4 C7A8002C */ lwc1 $f8, 0x2c($sp) -/* CE6C8 80137FC8 4600A007 */ neg.s $f0, $f20 -/* CE6CC 80137FCC 46004202 */ mul.s $f8, $f8, $f0 -/* CE6D0 80137FD0 00000000 */ nop -/* CE6D4 80137FD4 8602000C */ lh $v0, 0xc($s0) -/* CE6D8 80137FD8 44820000 */ mtc1 $v0, $f0 -/* CE6DC 80137FDC 00000000 */ nop -/* CE6E0 80137FE0 46800020 */ cvt.s.w $f0, $f0 -/* CE6E4 80137FE4 46004082 */ mul.s $f2, $f8, $f0 -/* CE6E8 80137FE8 00000000 */ nop -/* CE6EC 80137FEC 46001080 */ add.s $f2, $f2, $f0 -/* CE6F0 80137FF0 460010A1 */ cvt.d.s $f2, $f2 -/* CE6F4 80137FF4 46261082 */ mul.d $f2, $f2, $f6 -/* CE6F8 80137FF8 00000000 */ nop -/* CE6FC 80137FFC E7B40034 */ swc1 $f20, 0x34($sp) -/* CE700 80138000 C7A60030 */ lwc1 $f6, 0x30($sp) -/* CE704 80138004 8602000E */ lh $v0, 0xe($s0) -/* CE708 80138008 46143182 */ mul.s $f6, $f6, $f20 -/* CE70C 8013800C 00000000 */ nop -/* CE710 80138010 E7AA0028 */ swc1 $f10, 0x28($sp) -/* CE714 80138014 E7A8002C */ swc1 $f8, 0x2c($sp) -/* CE718 80138018 44820000 */ mtc1 $v0, $f0 -/* CE71C 8013801C 00000000 */ nop -/* CE720 80138020 46800021 */ cvt.d.w $f0, $f0 -/* CE724 80138024 86020010 */ lh $v0, 0x10($s0) -/* CE728 80138028 46202100 */ add.d $f4, $f4, $f0 -/* CE72C 8013802C 44820000 */ mtc1 $v0, $f0 -/* CE730 80138030 00000000 */ nop -/* CE734 80138034 46800021 */ cvt.d.w $f0, $f0 -/* CE738 80138038 46202120 */ cvt.s.d $f4, $f4 -/* CE73C 8013803C 46201080 */ add.d $f2, $f2, $f0 -/* CE740 80138040 E7A40028 */ swc1 $f4, 0x28($sp) -/* CE744 80138044 E7A60030 */ swc1 $f6, 0x30($sp) -/* CE748 80138048 462010A0 */ cvt.s.d $f2, $f2 -/* CE74C 8013804C 12400006 */ beqz $s2, .L80138068 -/* CE750 80138050 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CE754 80138054 24020001 */ addiu $v0, $zero, 1 -/* CE758 80138058 1242000E */ beq $s2, $v0, .L80138094 -/* CE75C 8013805C 00111040 */ sll $v0, $s1, 1 -/* CE760 80138060 0804E02E */ j .L801380B8 -/* CE764 80138064 00000000 */ nop -.L80138068: -/* CE768 80138068 3C038016 */ lui $v1, %hi(D_8015C790) -/* CE76C 8013806C 2463C790 */ addiu $v1, $v1, %lo(D_8015C790) -/* CE770 80138070 00111040 */ sll $v0, $s1, 1 -/* CE774 80138074 00511021 */ addu $v0, $v0, $s1 -/* CE778 80138078 000210C0 */ sll $v0, $v0, 3 -/* CE77C 8013807C 00431021 */ addu $v0, $v0, $v1 -/* CE780 80138080 4600230D */ trunc.w.s $f12, $f4 -/* CE784 80138084 E44C0004 */ swc1 $f12, 4($v0) -/* CE788 80138088 4600130D */ trunc.w.s $f12, $f2 -/* CE78C 8013808C 0804E02E */ j .L801380B8 -/* CE790 80138090 E44C0008 */ swc1 $f12, 8($v0) -.L80138094: -/* CE794 80138094 3C038016 */ lui $v1, %hi(D_8015C790) -/* CE798 80138098 2463C790 */ addiu $v1, $v1, %lo(D_8015C790) -/* CE79C 8013809C 00511021 */ addu $v0, $v0, $s1 -/* CE7A0 801380A0 000210C0 */ sll $v0, $v0, 3 -/* CE7A4 801380A4 00431021 */ addu $v0, $v0, $v1 -/* CE7A8 801380A8 4600230D */ trunc.w.s $f12, $f4 -/* CE7AC 801380AC E44C000C */ swc1 $f12, 0xc($v0) -/* CE7B0 801380B0 4600130D */ trunc.w.s $f12, $f2 -/* CE7B4 801380B4 E44C0010 */ swc1 $f12, 0x10($v0) -.L801380B8: -/* CE7B8 801380B8 8FBF0044 */ lw $ra, 0x44($sp) -/* CE7BC 801380BC 8FB20040 */ lw $s2, 0x40($sp) -/* CE7C0 801380C0 8FB1003C */ lw $s1, 0x3c($sp) -/* CE7C4 801380C4 8FB00038 */ lw $s0, 0x38($sp) -/* CE7C8 801380C8 D7B40048 */ ldc1 $f20, 0x48($sp) -/* CE7CC 801380CC 03E00008 */ jr $ra -/* CE7D0 801380D0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_color.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_color.s deleted file mode 100644 index dd2e876011..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_color.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_screen_overlay_color -/* CE510 80137E10 28820002 */ slti $v0, $a0, 2 -/* CE514 80137E14 1040000B */ beqz $v0, .L80137E44 -/* CE518 80137E18 00000000 */ nop -/* CE51C 80137E1C 04800009 */ bltz $a0, .L80137E44 -/* CE520 80137E20 00041040 */ sll $v0, $a0, 1 -/* CE524 80137E24 3C038016 */ lui $v1, %hi(D_8015C790) -/* CE528 80137E28 2463C790 */ addiu $v1, $v1, %lo(D_8015C790) -/* CE52C 80137E2C 00441021 */ addu $v0, $v0, $a0 -/* CE530 80137E30 000210C0 */ sll $v0, $v0, 3 -/* CE534 80137E34 00431021 */ addu $v0, $v0, $v1 -/* CE538 80137E38 A0450000 */ sb $a1, ($v0) -/* CE53C 80137E3C A0460001 */ sb $a2, 1($v0) -/* CE540 80137E40 A0470002 */ sb $a3, 2($v0) -.L80137E44: -/* CE544 80137E44 03E00008 */ jr $ra -/* CE548 80137E48 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_params_back.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_params_back.s deleted file mode 100644 index 8f1b3b5220..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_params_back.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_screen_overlay_params_back -/* CE4A4 80137DA4 308400FF */ andi $a0, $a0, 0xff -/* CE4A8 80137DA8 3C018015 */ lui $at, %hi(D_80156908) -/* CE4AC 80137DAC AC246908 */ sw $a0, %lo(D_80156908)($at) -/* CE4B0 80137DB0 3C018015 */ lui $at, %hi(D_8015690C) -/* CE4B4 80137DB4 AC25690C */ sw $a1, %lo(D_8015690C)($at) -/* CE4B8 80137DB8 03E00008 */ jr $ra -/* CE4BC 80137DBC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_params_front.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_params_front.s deleted file mode 100644 index e9f17c1528..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/set_screen_overlay_params_front.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel set_screen_overlay_params_front -/* CE488 80137D88 308400FF */ andi $a0, $a0, 0xff -/* CE48C 80137D8C 3C018015 */ lui $at, %hi(D_80156900) -/* CE490 80137D90 AC246900 */ sw $a0, %lo(D_80156900)($at) -/* CE494 80137D94 3C018015 */ lui $at, %hi(D_80156904) -/* CE498 80137D98 AC256904 */ sw $a1, %lo(D_80156904)($at) -/* CE49C 80137D9C 03E00008 */ jr $ra -/* CE4A0 80137DA0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/cd180_len_38f0/update_enter_map_screen_overlay.s b/ver/us/asm/nonmatchings/cd180_len_38f0/update_enter_map_screen_overlay.s deleted file mode 100644 index 1749ad88de..0000000000 --- a/ver/us/asm/nonmatchings/cd180_len_38f0/update_enter_map_screen_overlay.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_80150F38 -.word .L80138658_CED58, .L80138658_CED58, .L80138640_CED40, .L80138624_CED24, .L8013864C_CED4C, .L8013864C_CED4C, .L80138658_CED58, .L8013864C_CED4C, .L80138660_CED60, .L8013864C_CED4C, .L8013864C_CED4C, .L80138668_CED68, .L80138674_CED74, .L80138658_CED58, .L80138658_CED58, .L80138660_CED60, .L80138680_CED80, 0 - -.section .text - -glabel update_enter_map_screen_overlay -/* CECD4 801385D4 3C038015 */ lui $v1, %hi(D_8014C6F0) -/* CECD8 801385D8 8C63C6F0 */ lw $v1, %lo(D_8014C6F0)($v1) -/* CECDC 801385DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CECE0 801385E0 AFB20018 */ sw $s2, 0x18($sp) -/* CECE4 801385E4 0080902D */ daddu $s2, $a0, $zero -/* CECE8 801385E8 AFB10014 */ sw $s1, 0x14($sp) -/* CECEC 801385EC 0000882D */ daddu $s1, $zero, $zero -/* CECF0 801385F0 AFB00010 */ sw $s0, 0x10($sp) -/* CECF4 801385F4 24100014 */ addiu $s0, $zero, 0x14 -/* CECF8 801385F8 AFB3001C */ sw $s3, 0x1c($sp) -/* CECFC 801385FC 0220982D */ daddu $s3, $s1, $zero -/* CED00 80138600 2C620011 */ sltiu $v0, $v1, 0x11 -/* CED04 80138604 10400030 */ beqz $v0, .L801386C8 -/* CED08 80138608 AFBF0020 */ sw $ra, 0x20($sp) -/* CED0C 8013860C 00031080 */ sll $v0, $v1, 2 -/* CED10 80138610 3C018015 */ lui $at, %hi(jtbl_80150F38) -/* CED14 80138614 00220821 */ addu $at, $at, $v0 -/* CED18 80138618 8C220F38 */ lw $v0, %lo(jtbl_80150F38)($at) -/* CED1C 8013861C 00400008 */ jr $v0 -/* CED20 80138620 00000000 */ nop -.L80138624_CED24: -/* CED24 80138624 0000202D */ daddu $a0, $zero, $zero -/* CED28 80138628 240500D0 */ addiu $a1, $zero, 0xd0 -/* CED2C 8013862C 00A0302D */ daddu $a2, $a1, $zero -/* CED30 80138630 0C04DF84 */ jal set_screen_overlay_color -/* CED34 80138634 00A0382D */ daddu $a3, $a1, $zero -/* CED38 80138638 0804E1B2 */ j .L801386C8 -/* CED3C 8013863C 24100032 */ addiu $s0, $zero, 0x32 -.L80138640_CED40: -/* CED40 80138640 24110001 */ addiu $s1, $zero, 1 -/* CED44 80138644 0804E1B2 */ j .L801386C8 -/* CED48 80138648 24100032 */ addiu $s0, $zero, 0x32 -.L8013864C_CED4C: -/* CED4C 8013864C 24110001 */ addiu $s1, $zero, 1 -/* CED50 80138650 0804E1B2 */ j .L801386C8 -/* CED54 80138654 24100007 */ addiu $s0, $zero, 7 -.L80138658_CED58: -/* CED58 80138658 0804E1B2 */ j .L801386C8 -/* CED5C 8013865C 24110001 */ addiu $s1, $zero, 1 -.L80138660_CED60: -/* CED60 80138660 0804E1B2 */ j .L801386C8 -/* CED64 80138664 24110004 */ addiu $s1, $zero, 4 -.L80138668_CED68: -/* CED68 80138668 24110005 */ addiu $s1, $zero, 5 -/* CED6C 8013866C 0804E1B2 */ j .L801386C8 -/* CED70 80138670 24100007 */ addiu $s0, $zero, 7 -.L80138674_CED74: -/* CED74 80138674 24110004 */ addiu $s1, $zero, 4 -/* CED78 80138678 0804E1B2 */ j .L801386C8 -/* CED7C 8013867C 24100007 */ addiu $s0, $zero, 7 -.L80138680_CED80: -/* CED80 80138680 0000202D */ daddu $a0, $zero, $zero -/* CED84 80138684 0080282D */ daddu $a1, $a0, $zero -/* CED88 80138688 2406000F */ addiu $a2, $zero, 0xf -/* CED8C 8013868C 0C04DF93 */ jal set_screen_overlay_center -/* CED90 80138690 2407001C */ addiu $a3, $zero, 0x1c -/* CED94 80138694 0000202D */ daddu $a0, $zero, $zero -/* CED98 80138698 24050001 */ addiu $a1, $zero, 1 -/* CED9C 8013869C 24060131 */ addiu $a2, $zero, 0x131 -/* CEDA0 801386A0 0C04DF93 */ jal set_screen_overlay_center -/* CEDA4 801386A4 2407009C */ addiu $a3, $zero, 0x9c -/* CEDA8 801386A8 86420000 */ lh $v0, ($s2) -/* CEDAC 801386AC 2404000C */ addiu $a0, $zero, 0xc -/* CEDB0 801386B0 44820000 */ mtc1 $v0, $f0 -/* CEDB4 801386B4 00000000 */ nop -/* CEDB8 801386B8 46800020 */ cvt.s.w $f0, $f0 -/* CEDBC 801386BC 44050000 */ mfc1 $a1, $f0 -/* CEDC0 801386C0 0C04DF62 */ jal set_screen_overlay_params_front -/* CEDC4 801386C4 24100002 */ addiu $s0, $zero, 2 -.L801386C8: -/* CEDC8 801386C8 3C038015 */ lui $v1, %hi(D_8014C6F0) -/* CEDCC 801386CC 8C63C6F0 */ lw $v1, %lo(D_8014C6F0)($v1) -/* CEDD0 801386D0 24020010 */ addiu $v0, $zero, 0x10 -/* CEDD4 801386D4 10620008 */ beq $v1, $v0, .L801386F8 -/* CEDD8 801386D8 00000000 */ nop -/* CEDDC 801386DC 86420000 */ lh $v0, ($s2) -/* CEDE0 801386E0 44820000 */ mtc1 $v0, $f0 -/* CEDE4 801386E4 00000000 */ nop -/* CEDE8 801386E8 46800020 */ cvt.s.w $f0, $f0 -/* CEDEC 801386EC 44050000 */ mfc1 $a1, $f0 -/* CEDF0 801386F0 0C04DF62 */ jal set_screen_overlay_params_front -/* CEDF4 801386F4 0220202D */ daddu $a0, $s1, $zero -.L801386F8: -/* CEDF8 801386F8 86420000 */ lh $v0, ($s2) -/* CEDFC 801386FC 96430000 */ lhu $v1, ($s2) -/* CEE00 80138700 50400001 */ beql $v0, $zero, .L80138708 -/* CEE04 80138704 24130001 */ addiu $s3, $zero, 1 -.L80138708: -/* CEE08 80138708 00701023 */ subu $v0, $v1, $s0 -/* CEE0C 8013870C A6420000 */ sh $v0, ($s2) -/* CEE10 80138710 00021400 */ sll $v0, $v0, 0x10 -/* CEE14 80138714 04420001 */ bltzl $v0, .L8013871C -/* CEE18 80138718 A6400000 */ sh $zero, ($s2) -.L8013871C: -/* CEE1C 8013871C 0260102D */ daddu $v0, $s3, $zero -/* CEE20 80138720 8FBF0020 */ lw $ra, 0x20($sp) -/* CEE24 80138724 8FB3001C */ lw $s3, 0x1c($sp) -/* CEE28 80138728 8FB20018 */ lw $s2, 0x18($sp) -/* CEE2C 8013872C 8FB10014 */ lw $s1, 0x14($sp) -/* CEE30 80138730 8FB00010 */ lw $s0, 0x10($sp) -/* CEE34 80138734 03E00008 */ jr $ra -/* CEE38 80138738 27BD0028 */ addiu $sp, $sp, 0x28 -/* CEE3C 8013873C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/d0a70_len_4fe0/fold_load_gfx.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/fold_load_gfx.s deleted file mode 100644 index 25eae5d86c..0000000000 --- a/ver/us/asm/nonmatchings/d0a70_len_4fe0/fold_load_gfx.s +++ /dev/null @@ -1,128 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fold_load_gfx -/* D2920 8013C220 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D2924 8013C224 AFB20018 */ sw $s2, 0x18($sp) -/* D2928 8013C228 0080902D */ daddu $s2, $a0, $zero -/* D292C 8013C22C AFBF0020 */ sw $ra, 0x20($sp) -/* D2930 8013C230 AFB3001C */ sw $s3, 0x1c($sp) -/* D2934 8013C234 AFB10014 */ sw $s1, 0x14($sp) -/* D2938 8013C238 AFB00010 */ sw $s0, 0x10($sp) -/* D293C 8013C23C 8E42001C */ lw $v0, 0x1c($s2) -/* D2940 8013C240 3C100025 */ lui $s0, 0x25 -/* D2944 8013C244 2610B7F0 */ addiu $s0, $s0, -0x4810 -/* D2948 8013C248 00021080 */ sll $v0, $v0, 2 -/* D294C 8013C24C 3C018015 */ lui $at, %hi(fold_groupOffsets) -/* D2950 8013C250 00220821 */ addu $at, $at, $v0 -/* D2954 8013C254 8C22EF64 */ lw $v0, %lo(fold_groupOffsets)($at) -/* D2958 8013C258 3C048015 */ lui $a0, %hi(fold_groupDescriptors) -/* D295C 8013C25C 24846980 */ addiu $a0, $a0, %lo(fold_groupDescriptors) -/* D2960 8013C260 00508821 */ addu $s1, $v0, $s0 -/* D2964 8013C264 92420000 */ lbu $v0, ($s2) -/* D2968 8013C268 8E430064 */ lw $v1, 0x64($s2) -/* D296C 8013C26C 00021100 */ sll $v0, $v0, 4 -/* D2970 8013C270 10710057 */ beq $v1, $s1, .L8013C3D0 -/* D2974 8013C274 00449821 */ addu $s3, $v0, $a0 -/* D2978 8013C278 0220202D */ daddu $a0, $s1, $zero -/* D297C 8013C27C 24850010 */ addiu $a1, $a0, 0x10 -/* D2980 8013C280 0260302D */ daddu $a2, $s3, $zero -/* D2984 8013C284 0C00A5CF */ jal dma_copy -/* D2988 8013C288 AE440064 */ sw $a0, 0x64($s2) -/* D298C 8013C28C 8E440068 */ lw $a0, 0x68($s2) -/* D2990 8013C290 10800004 */ beqz $a0, .L8013C2A4 -/* D2994 8013C294 00000000 */ nop -/* D2998 8013C298 0C04E984 */ jal fold_add_to_gfx_cache -/* D299C 8013C29C 24050001 */ addiu $a1, $zero, 1 -/* D29A0 8013C2A0 AE400068 */ sw $zero, 0x68($s2) -.L8013C2A4: -/* D29A4 8013C2A4 8E44006C */ lw $a0, 0x6c($s2) -/* D29A8 8013C2A8 10800004 */ beqz $a0, .L8013C2BC -/* D29AC 8013C2AC 00000000 */ nop -/* D29B0 8013C2B0 0C04E984 */ jal fold_add_to_gfx_cache -/* D29B4 8013C2B4 24050001 */ addiu $a1, $zero, 1 -/* D29B8 8013C2B8 AE40006C */ sw $zero, 0x6c($s2) -.L8013C2BC: -/* D29BC 8013C2BC 8E440070 */ lw $a0, 0x70($s2) -/* D29C0 8013C2C0 10800004 */ beqz $a0, .L8013C2D4 -/* D29C4 8013C2C4 00000000 */ nop -/* D29C8 8013C2C8 0C04E984 */ jal fold_add_to_gfx_cache -/* D29CC 8013C2CC 24050001 */ addiu $a1, $zero, 1 -/* D29D0 8013C2D0 AE400070 */ sw $zero, 0x70($s2) -.L8013C2D4: -/* D29D4 8013C2D4 8E440074 */ lw $a0, 0x74($s2) -/* D29D8 8013C2D8 10800004 */ beqz $a0, .L8013C2EC -/* D29DC 8013C2DC 00000000 */ nop -/* D29E0 8013C2E0 0C04E984 */ jal fold_add_to_gfx_cache -/* D29E4 8013C2E4 24050001 */ addiu $a1, $zero, 1 -/* D29E8 8013C2E8 AE400074 */ sw $zero, 0x74($s2) -.L8013C2EC: -/* D29EC 8013C2EC 96640008 */ lhu $a0, 8($s3) -/* D29F0 8013C2F0 0C00AB39 */ jal heap_malloc -/* D29F4 8013C2F4 00042100 */ sll $a0, $a0, 4 -/* D29F8 8013C2F8 AE420068 */ sw $v0, 0x68($s2) -/* D29FC 8013C2FC 96640008 */ lhu $a0, 8($s3) -/* D2A00 8013C300 0C00AB39 */ jal heap_malloc -/* D2A04 8013C304 00042100 */ sll $a0, $a0, 4 -/* D2A08 8013C308 AE42006C */ sw $v0, 0x6c($s2) -/* D2A0C 8013C30C 9664000A */ lhu $a0, 0xa($s3) -/* D2A10 8013C310 0C00AB39 */ jal heap_malloc -/* D2A14 8013C314 000420C0 */ sll $a0, $a0, 3 -/* D2A18 8013C318 AE420070 */ sw $v0, 0x70($s2) -/* D2A1C 8013C31C 9664000A */ lhu $a0, 0xa($s3) -/* D2A20 8013C320 0C00AB39 */ jal heap_malloc -/* D2A24 8013C324 000420C0 */ sll $a0, $a0, 3 -/* D2A28 8013C328 AE420074 */ sw $v0, 0x74($s2) -/* D2A2C 8013C32C 8E620004 */ lw $v0, 4($s3) -/* D2A30 8013C330 8E460070 */ lw $a2, 0x70($s2) -/* D2A34 8013C334 00508821 */ addu $s1, $v0, $s0 -/* D2A38 8013C338 9662000A */ lhu $v0, 0xa($s3) -/* D2A3C 8013C33C 0220202D */ daddu $a0, $s1, $zero -/* D2A40 8013C340 000210C0 */ sll $v0, $v0, 3 -/* D2A44 8013C344 02228021 */ addu $s0, $s1, $v0 -/* D2A48 8013C348 0C00A5CF */ jal dma_copy -/* D2A4C 8013C34C 0200282D */ daddu $a1, $s0, $zero -/* D2A50 8013C350 0220202D */ daddu $a0, $s1, $zero -/* D2A54 8013C354 8E460074 */ lw $a2, 0x74($s2) -/* D2A58 8013C358 0C00A5CF */ jal dma_copy -/* D2A5C 8013C35C 0200282D */ daddu $a1, $s0, $zero -/* D2A60 8013C360 24090001 */ addiu $t1, $zero, 1 -/* D2A64 8013C364 3C075555 */ lui $a3, 0x5555 -/* D2A68 8013C368 34E75556 */ ori $a3, $a3, 0x5556 -/* D2A6C 8013C36C 240800DF */ addiu $t0, $zero, 0xdf -/* D2A70 8013C370 0240202D */ daddu $a0, $s2, $zero -/* D2A74 8013C374 248A0008 */ addiu $t2, $a0, 8 -.L8013C378: -/* D2A78 8013C378 8C850070 */ lw $a1, 0x70($a0) -.L8013C37C: -/* D2A7C 8013C37C 8CA20000 */ lw $v0, ($a1) -/* D2A80 8013C380 00023602 */ srl $a2, $v0, 0x18 -/* D2A84 8013C384 14C9000C */ bne $a2, $t1, .L8013C3B8 -/* D2A88 8013C388 24A50008 */ addiu $a1, $a1, 8 -/* D2A8C 8013C38C 8CA2FFFC */ lw $v0, -4($a1) -/* D2A90 8013C390 8E630000 */ lw $v1, ($s3) -/* D2A94 8013C394 00431023 */ subu $v0, $v0, $v1 -/* D2A98 8013C398 00470018 */ mult $v0, $a3 -/* D2A9C 8013C39C 000217C3 */ sra $v0, $v0, 0x1f -/* D2AA0 8013C3A0 8C830068 */ lw $v1, 0x68($a0) -/* D2AA4 8013C3A4 00005810 */ mfhi $t3 -/* D2AA8 8013C3A8 01621023 */ subu $v0, $t3, $v0 -/* D2AAC 8013C3AC 00021080 */ sll $v0, $v0, 2 -/* D2AB0 8013C3B0 00431021 */ addu $v0, $v0, $v1 -/* D2AB4 8013C3B4 ACA2FFFC */ sw $v0, -4($a1) -.L8013C3B8: -/* D2AB8 8013C3B8 14C8FFF0 */ bne $a2, $t0, .L8013C37C -/* D2ABC 8013C3BC 00000000 */ nop -/* D2AC0 8013C3C0 24840004 */ addiu $a0, $a0, 4 -/* D2AC4 8013C3C4 008A102A */ slt $v0, $a0, $t2 -/* D2AC8 8013C3C8 1440FFEB */ bnez $v0, .L8013C378 -/* D2ACC 8013C3CC 00000000 */ nop -.L8013C3D0: -/* D2AD0 8013C3D0 0260102D */ daddu $v0, $s3, $zero -/* D2AD4 8013C3D4 8FBF0020 */ lw $ra, 0x20($sp) -/* D2AD8 8013C3D8 8FB3001C */ lw $s3, 0x1c($sp) -/* D2ADC 8013C3DC 8FB20018 */ lw $s2, 0x18($sp) -/* D2AE0 8013C3E0 8FB10014 */ lw $s1, 0x14($sp) -/* D2AE4 8013C3E4 8FB00010 */ lw $s0, 0x10($sp) -/* D2AE8 8013C3E8 03E00008 */ jr $ra -/* D2AEC 8013C3EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/d0a70_len_4fe0/fold_update.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/fold_update.s deleted file mode 100644 index b3d35d9317..0000000000 --- a/ver/us/asm/nonmatchings/d0a70_len_4fe0/fold_update.s +++ /dev/null @@ -1,339 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80150FB0 -.word .L8013AB0C_D120C, .L8013AB5C_D125C, .L8013AB70_D1270, .L8013AB0C_D120C, .L8013AC14_D1314, .L8013ABDC_D12DC, .L8013AC14_D1314, .L8013AC14_D1314, .L8013AC14_D1314, .L8013AC14_D1314, .L8013AC14_D1314, .L8013AC14_D1314, .L8013AC14_D1314, .L8013AC14_D1314, .L8013AC14_D1314, .L8013ABB0_D12B0, .L8013ABB0_D12B0, .L8013AB84_D1284 - -dlabel jtbl_80150FF8 -.word .L8013ACD8_D13D8, .L8013ACE4_D13E4, .L8013AD08_D1408, .L8013AD30_D1430, .L8013AD30_D1430, .L8013AD30_D1430, .L8013ADAC_D14AC, .L8013ADAC_D14AC, .L8013ADE4_D14E4, .L8013AE58_D1558, .L8013AECC_D15CC, .L8013AED8_D15D8, .L8013AEE4_D15E4, .L8013AEE4_D15E4 - -dlabel D_80151030 -.double 255.0 - -.section .text - -glabel fold_update -/* D119C 8013AA9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D11A0 8013AAA0 AFB00010 */ sw $s0, 0x10($sp) -/* D11A4 8013AAA4 00C0802D */ daddu $s0, $a2, $zero -/* D11A8 8013AAA8 00041140 */ sll $v0, $a0, 5 -/* D11AC 8013AAAC 00441023 */ subu $v0, $v0, $a0 -/* D11B0 8013AAB0 3C038015 */ lui $v1, %hi(D_80156954) -/* D11B4 8013AAB4 8C636954 */ lw $v1, %lo(D_80156954)($v1) -/* D11B8 8013AAB8 8FA80030 */ lw $t0, 0x30($sp) -/* D11BC 8013AABC 8FA60034 */ lw $a2, 0x34($sp) -/* D11C0 8013AAC0 00021080 */ sll $v0, $v0, 2 -/* D11C4 8013AAC4 AFBF001C */ sw $ra, 0x1c($sp) -/* D11C8 8013AAC8 AFB20018 */ sw $s2, 0x18($sp) -/* D11CC 8013AACC AFB10014 */ sw $s1, 0x14($sp) -/* D11D0 8013AAD0 00628821 */ addu $s1, $v1, $v0 -/* D11D4 8013AAD4 8E220014 */ lw $v0, 0x14($s1) -/* D11D8 8013AAD8 8FB20038 */ lw $s2, 0x38($sp) -/* D11DC 8013AADC 30420001 */ andi $v0, $v0, 1 -/* D11E0 8013AAE0 10400109 */ beqz $v0, .L8013AF08 -/* D11E4 8013AAE4 2C82005A */ sltiu $v0, $a0, 0x5a -/* D11E8 8013AAE8 10400107 */ beqz $v0, .L8013AF08 -/* D11EC 8013AAEC 2CA20012 */ sltiu $v0, $a1, 0x12 -/* D11F0 8013AAF0 10400048 */ beqz $v0, .L8013AC14_D1314 -/* D11F4 8013AAF4 00051080 */ sll $v0, $a1, 2 -/* D11F8 8013AAF8 3C018015 */ lui $at, %hi(jtbl_80150FB0) -/* D11FC 8013AAFC 00220821 */ addu $at, $at, $v0 -/* D1200 8013AB00 8C220FB0 */ lw $v0, %lo(jtbl_80150FB0)($at) -/* D1204 8013AB04 00400008 */ jr $v0 -/* D1208 8013AB08 00000000 */ nop -.L8013AB0C_D120C: -/* D120C 8013AB0C 8E300014 */ lw $s0, 0x14($s1) -/* D1210 8013AB10 0C04EA4F */ jal fold_clear_state_gfx -/* D1214 8013AB14 0220202D */ daddu $a0, $s1, $zero -/* D1218 8013AB18 0C04EA7A */ jal fold_init_state -/* D121C 8013AB1C 0220202D */ daddu $a0, $s1, $zero -/* D1220 8013AB20 2402FFFF */ addiu $v0, $zero, -1 -/* D1224 8013AB24 A2200005 */ sb $zero, 5($s1) -/* D1228 8013AB28 A2200006 */ sb $zero, 6($s1) -/* D122C 8013AB2C A2200001 */ sb $zero, 1($s1) -/* D1230 8013AB30 A2200002 */ sb $zero, 2($s1) -/* D1234 8013AB34 AE22001C */ sw $v0, 0x1c($s1) -/* D1238 8013AB38 AE22002C */ sw $v0, 0x2c($s1) -/* D123C 8013AB3C AE300014 */ sw $s0, 0x14($s1) -/* D1240 8013AB40 0200182D */ daddu $v1, $s0, $zero -/* D1244 8013AB44 30620001 */ andi $v0, $v1, 1 -/* D1248 8013AB48 12400002 */ beqz $s2, .L8013AB54 -/* D124C 8013AB4C AE220014 */ sw $v0, 0x14($s1) -/* D1250 8013AB50 00521025 */ or $v0, $v0, $s2 -.L8013AB54: -/* D1254 8013AB54 0804EBC2 */ j .L8013AF08 -/* D1258 8013AB58 AE220014 */ sw $v0, 0x14($s1) -.L8013AB5C_D125C: -/* D125C 8013AB5C 2402FFFF */ addiu $v0, $zero, -1 -/* D1260 8013AB60 A2200005 */ sb $zero, 5($s1) -/* D1264 8013AB64 A2200002 */ sb $zero, 2($s1) -/* D1268 8013AB68 0804EBC2 */ j .L8013AF08 -/* D126C 8013AB6C AE22001C */ sw $v0, 0x1c($s1) -.L8013AB70_D1270: -/* D1270 8013AB70 2402FFFF */ addiu $v0, $zero, -1 -/* D1274 8013AB74 A2200006 */ sb $zero, 6($s1) -/* D1278 8013AB78 A2200001 */ sb $zero, 1($s1) -/* D127C 8013AB7C 0804EBC2 */ j .L8013AF08 -/* D1280 8013AB80 AE22002C */ sw $v0, 0x2c($s1) -.L8013AB84_D1284: -/* D1284 8013AB84 8E24005C */ lw $a0, 0x5c($s1) -/* D1288 8013AB88 10800004 */ beqz $a0, .L8013AB9C -/* D128C 8013AB8C 00101080 */ sll $v0, $s0, 2 -/* D1290 8013AB90 0C00AB4B */ jal heap_free -/* D1294 8013AB94 00000000 */ nop -/* D1298 8013AB98 00101080 */ sll $v0, $s0, 2 -.L8013AB9C: -/* D129C 8013AB9C A6220060 */ sh $v0, 0x60($s1) -/* D12A0 8013ABA0 0C00AB39 */ jal heap_malloc -/* D12A4 8013ABA4 3044FFFF */ andi $a0, $v0, 0xffff -/* D12A8 8013ABA8 0804EBC2 */ j .L8013AF08 -/* D12AC 8013ABAC AE22005C */ sw $v0, 0x5c($s1) -.L8013ABB0_D12B0: -/* D12B0 8013ABB0 82220006 */ lb $v0, 6($s1) -/* D12B4 8013ABB4 14A20021 */ bne $a1, $v0, .L8013AC3C -/* D12B8 8013ABB8 24030005 */ addiu $v1, $zero, 5 -/* D12BC 8013ABBC 8E22002C */ lw $v0, 0x2c($s1) -/* D12C0 8013ABC0 1602001E */ bne $s0, $v0, .L8013AC3C -/* D12C4 8013ABC4 00000000 */ nop -/* D12C8 8013ABC8 8E220030 */ lw $v0, 0x30($s1) -/* D12CC 8013ABCC 10E200CE */ beq $a3, $v0, .L8013AF08 -/* D12D0 8013ABD0 00000000 */ nop -/* D12D4 8013ABD4 0804EB0F */ j .L8013AC3C -/* D12D8 8013ABD8 00000000 */ nop -.L8013ABDC_D12DC: -/* D12DC 8013ABDC 82220005 */ lb $v0, 5($s1) -/* D12E0 8013ABE0 14450016 */ bne $v0, $a1, .L8013AC3C -/* D12E4 8013ABE4 24030005 */ addiu $v1, $zero, 5 -/* D12E8 8013ABE8 8E22001C */ lw $v0, 0x1c($s1) -/* D12EC 8013ABEC 14500013 */ bne $v0, $s0, .L8013AC3C -/* D12F0 8013ABF0 00000000 */ nop -/* D12F4 8013ABF4 8E220020 */ lw $v0, 0x20($s1) -/* D12F8 8013ABF8 14470010 */ bne $v0, $a3, .L8013AC3C -/* D12FC 8013ABFC 00000000 */ nop -/* D1300 8013AC00 8E220024 */ lw $v0, 0x24($s1) -/* D1304 8013AC04 104800C0 */ beq $v0, $t0, .L8013AF08 -/* D1308 8013AC08 00000000 */ nop -/* D130C 8013AC0C 0804EB0F */ j .L8013AC3C -/* D1310 8013AC10 00000000 */ nop -.L8013AC14_D1314: -/* D1314 8013AC14 2403000D */ addiu $v1, $zero, 0xd -/* D1318 8013AC18 50A30008 */ beql $a1, $v1, .L8013AC3C -/* D131C 8013AC1C 24030005 */ addiu $v1, $zero, 5 -/* D1320 8013AC20 82220006 */ lb $v0, 6($s1) -/* D1324 8013AC24 14430005 */ bne $v0, $v1, .L8013AC3C -/* D1328 8013AC28 24030005 */ addiu $v1, $zero, 5 -/* D132C 8013AC2C 24020001 */ addiu $v0, $zero, 1 -/* D1330 8013AC30 A2200001 */ sb $zero, 1($s1) -/* D1334 8013AC34 A2220003 */ sb $v0, 3($s1) -/* D1338 8013AC38 A2220004 */ sb $v0, 4($s1) -.L8013AC3C: -/* D133C 8013AC3C 10A30005 */ beq $a1, $v1, .L8013AC54 -/* D1340 8013AC40 24A2FFFC */ addiu $v0, $a1, -4 -/* D1344 8013AC44 82220005 */ lb $v0, 5($s1) -/* D1348 8013AC48 50430001 */ beql $v0, $v1, .L8013AC50 -/* D134C 8013AC4C A2200005 */ sb $zero, 5($s1) -.L8013AC50: -/* D1350 8013AC50 24A2FFFC */ addiu $v0, $a1, -4 -.L8013AC54: -/* D1354 8013AC54 2C420002 */ sltiu $v0, $v0, 2 -/* D1358 8013AC58 10400007 */ beqz $v0, .L8013AC78 -/* D135C 8013AC5C 24A2FFFA */ addiu $v0, $a1, -6 -/* D1360 8013AC60 A2250005 */ sb $a1, 5($s1) -/* D1364 8013AC64 AE30001C */ sw $s0, 0x1c($s1) -/* D1368 8013AC68 AE270020 */ sw $a3, 0x20($s1) -/* D136C 8013AC6C AE280024 */ sw $t0, 0x24($s1) -/* D1370 8013AC70 0804EB26 */ j .L8013AC98 -/* D1374 8013AC74 AE260028 */ sw $a2, 0x28($s1) -.L8013AC78: -/* D1378 8013AC78 2C42000B */ sltiu $v0, $v0, 0xb -/* D137C 8013AC7C 10400006 */ beqz $v0, .L8013AC98 -/* D1380 8013AC80 00000000 */ nop -/* D1384 8013AC84 A2250006 */ sb $a1, 6($s1) -/* D1388 8013AC88 AE30002C */ sw $s0, 0x2c($s1) -/* D138C 8013AC8C AE270030 */ sw $a3, 0x30($s1) -/* D1390 8013AC90 AE280034 */ sw $t0, 0x34($s1) -/* D1394 8013AC94 AE260038 */ sw $a2, 0x38($s1) -.L8013AC98: -/* D1398 8013AC98 8E220014 */ lw $v0, 0x14($s1) -/* D139C 8013AC9C 30420001 */ andi $v0, $v0, 1 -/* D13A0 8013ACA0 12400003 */ beqz $s2, .L8013ACB0 -/* D13A4 8013ACA4 AE220014 */ sw $v0, 0x14($s1) -/* D13A8 8013ACA8 00521025 */ or $v0, $v0, $s2 -/* D13AC 8013ACAC AE220014 */ sw $v0, 0x14($s1) -.L8013ACB0: -/* D13B0 8013ACB0 24A5FFFD */ addiu $a1, $a1, -3 -/* D13B4 8013ACB4 2CA2000E */ sltiu $v0, $a1, 0xe -/* D13B8 8013ACB8 10400093 */ beqz $v0, .L8013AF08 -/* D13BC 8013ACBC A2200001 */ sb $zero, 1($s1) -/* D13C0 8013ACC0 00051080 */ sll $v0, $a1, 2 -/* D13C4 8013ACC4 3C018015 */ lui $at, %hi(jtbl_80150FF8) -/* D13C8 8013ACC8 00220821 */ addu $at, $at, $v0 -/* D13CC 8013ACCC 8C220FF8 */ lw $v0, %lo(jtbl_80150FF8)($at) -/* D13D0 8013ACD0 00400008 */ jr $v0 -/* D13D4 8013ACD4 00000000 */ nop -.L8013ACD8_D13D8: -/* D13D8 8013ACD8 A2200001 */ sb $zero, 1($s1) -/* D13DC 8013ACDC 0804EBC2 */ j .L8013AF08 -/* D13E0 8013ACE0 A2200002 */ sb $zero, 2($s1) -.L8013ACE4_D13E4: -/* D13E4 8013ACE4 0220202D */ daddu $a0, $s1, $zero -/* D13E8 8013ACE8 24020004 */ addiu $v0, $zero, 4 -/* D13EC 8013ACEC A0820003 */ sb $v0, 3($a0) -/* D13F0 8013ACF0 A0820004 */ sb $v0, 4($a0) -/* D13F4 8013ACF4 24020001 */ addiu $v0, $zero, 1 -/* D13F8 8013ACF8 0C04FB92 */ jal func_8013EE48 -/* D13FC 8013ACFC A0820001 */ sb $v0, 1($a0) -/* D1400 8013AD00 0804EBC2 */ j .L8013AF08 -/* D1404 8013AD04 00000000 */ nop -.L8013AD08_D1408: -/* D1408 8013AD08 8E230014 */ lw $v1, 0x14($s1) -/* D140C 8013AD0C 24020002 */ addiu $v0, $zero, 2 -/* D1410 8013AD10 A2220001 */ sb $v0, 1($s1) -/* D1414 8013AD14 2402000B */ addiu $v0, $zero, 0xb -/* D1418 8013AD18 A2220002 */ sb $v0, 2($s1) -/* D141C 8013AD1C AE20003C */ sw $zero, 0x3c($s1) -/* D1420 8013AD20 AE200040 */ sw $zero, 0x40($s1) -/* D1424 8013AD24 34630200 */ ori $v1, $v1, 0x200 -/* D1428 8013AD28 0804EBC2 */ j .L8013AF08 -/* D142C 8013AD2C AE230014 */ sw $v1, 0x14($s1) -.L8013AD30_D1430: -/* D1430 8013AD30 2A0200FF */ slti $v0, $s0, 0xff -/* D1434 8013AD34 1440000B */ bnez $v0, .L8013AD64 -/* D1438 8013AD38 28C200FF */ slti $v0, $a2, 0xff -/* D143C 8013AD3C 28E200FF */ slti $v0, $a3, 0xff -/* D1440 8013AD40 14400008 */ bnez $v0, .L8013AD64 -/* D1444 8013AD44 28C200FF */ slti $v0, $a2, 0xff -/* D1448 8013AD48 290200FF */ slti $v0, $t0, 0xff -/* D144C 8013AD4C 14400005 */ bnez $v0, .L8013AD64 -/* D1450 8013AD50 28C200FF */ slti $v0, $a2, 0xff -/* D1454 8013AD54 14400008 */ bnez $v0, .L8013AD78 -/* D1458 8013AD58 2A0200FF */ slti $v0, $s0, 0xff -/* D145C 8013AD5C 0804EBC2 */ j .L8013AF08 -/* D1460 8013AD60 A2200002 */ sb $zero, 2($s1) -.L8013AD64: -/* D1464 8013AD64 14400004 */ bnez $v0, .L8013AD78 -/* D1468 8013AD68 2A0200FF */ slti $v0, $s0, 0xff -/* D146C 8013AD6C 24020001 */ addiu $v0, $zero, 1 -/* D1470 8013AD70 0804EBC2 */ j .L8013AF08 -/* D1474 8013AD74 A2220002 */ sb $v0, 2($s1) -.L8013AD78: -/* D1478 8013AD78 1440000A */ bnez $v0, .L8013ADA4 -/* D147C 8013AD7C 24020003 */ addiu $v0, $zero, 3 -/* D1480 8013AD80 28E200FF */ slti $v0, $a3, 0xff -/* D1484 8013AD84 14400007 */ bnez $v0, .L8013ADA4 -/* D1488 8013AD88 24020003 */ addiu $v0, $zero, 3 -/* D148C 8013AD8C 290200FF */ slti $v0, $t0, 0xff -/* D1490 8013AD90 14400004 */ bnez $v0, .L8013ADA4 -/* D1494 8013AD94 24020003 */ addiu $v0, $zero, 3 -/* D1498 8013AD98 24020002 */ addiu $v0, $zero, 2 -/* D149C 8013AD9C 0804EBC2 */ j .L8013AF08 -/* D14A0 8013ADA0 A2220002 */ sb $v0, 2($s1) -.L8013ADA4: -/* D14A4 8013ADA4 0804EBC2 */ j .L8013AF08 -/* D14A8 8013ADA8 A2220002 */ sb $v0, 2($s1) -.L8013ADAC_D14AC: -/* D14AC 8013ADAC 3C018015 */ lui $at, %hi(D_80151030) -/* D14B0 8013ADB0 D4221030 */ ldc1 $f2, %lo(D_80151030)($at) -/* D14B4 8013ADB4 44860000 */ mtc1 $a2, $f0 -/* D14B8 8013ADB8 00000000 */ nop -/* D14BC 8013ADBC 46800021 */ cvt.d.w $f0, $f0 -/* D14C0 8013ADC0 46220032 */ c.eq.d $f0, $f2 -/* D14C4 8013ADC4 00000000 */ nop -/* D14C8 8013ADC8 45000003 */ bc1f .L8013ADD8 -/* D14CC 8013ADCC 24020004 */ addiu $v0, $zero, 4 -/* D14D0 8013ADD0 0804EBC2 */ j .L8013AF08 -/* D14D4 8013ADD4 A2220002 */ sb $v0, 2($s1) -.L8013ADD8: -/* D14D8 8013ADD8 24020005 */ addiu $v0, $zero, 5 -/* D14DC 8013ADDC 0804EBC2 */ j .L8013AF08 -/* D14E0 8013ADE0 A2220002 */ sb $v0, 2($s1) -.L8013ADE4_D14E4: -/* D14E4 8013ADE4 96220060 */ lhu $v0, 0x60($s1) -/* D14E8 8013ADE8 0202102A */ slt $v0, $s0, $v0 -/* D14EC 8013ADEC 10400046 */ beqz $v0, .L8013AF08 -/* D14F0 8013ADF0 00072602 */ srl $a0, $a3, 0x18 -/* D14F4 8013ADF4 8E22005C */ lw $v0, 0x5c($s1) -/* D14F8 8013ADF8 00101880 */ sll $v1, $s0, 2 -/* D14FC 8013ADFC 00621021 */ addu $v0, $v1, $v0 -/* D1500 8013AE00 A0440000 */ sb $a0, ($v0) -/* D1504 8013AE04 8E22005C */ lw $v0, 0x5c($s1) -/* D1508 8013AE08 00072402 */ srl $a0, $a3, 0x10 -/* D150C 8013AE0C 00621021 */ addu $v0, $v1, $v0 -/* D1510 8013AE10 A0440001 */ sb $a0, 1($v0) -/* D1514 8013AE14 8E22005C */ lw $v0, 0x5c($s1) -/* D1518 8013AE18 00072202 */ srl $a0, $a3, 8 -/* D151C 8013AE1C 00621021 */ addu $v0, $v1, $v0 -/* D1520 8013AE20 A0440002 */ sb $a0, 2($v0) -/* D1524 8013AE24 8E22005C */ lw $v0, 0x5c($s1) -/* D1528 8013AE28 00621821 */ addu $v1, $v1, $v0 -/* D152C 8013AE2C A0670003 */ sb $a3, 3($v1) -/* D1530 8013AE30 30E300FF */ andi $v1, $a3, 0xff -/* D1534 8013AE34 240200FF */ addiu $v0, $zero, 0xff -/* D1538 8013AE38 14620004 */ bne $v1, $v0, .L8013AE4C -/* D153C 8013AE3C A2200001 */ sb $zero, 1($s1) -/* D1540 8013AE40 24020006 */ addiu $v0, $zero, 6 -/* D1544 8013AE44 0804EBC2 */ j .L8013AF08 -/* D1548 8013AE48 A2220002 */ sb $v0, 2($s1) -.L8013AE4C: -/* D154C 8013AE4C 24020008 */ addiu $v0, $zero, 8 -/* D1550 8013AE50 0804EBC2 */ j .L8013AF08 -/* D1554 8013AE54 A2220002 */ sb $v0, 2($s1) -.L8013AE58_D1558: -/* D1558 8013AE58 96220060 */ lhu $v0, 0x60($s1) -/* D155C 8013AE5C 0202102A */ slt $v0, $s0, $v0 -/* D1560 8013AE60 10400029 */ beqz $v0, .L8013AF08 -/* D1564 8013AE64 00072602 */ srl $a0, $a3, 0x18 -/* D1568 8013AE68 8E22005C */ lw $v0, 0x5c($s1) -/* D156C 8013AE6C 00101880 */ sll $v1, $s0, 2 -/* D1570 8013AE70 00621021 */ addu $v0, $v1, $v0 -/* D1574 8013AE74 A0440000 */ sb $a0, ($v0) -/* D1578 8013AE78 8E22005C */ lw $v0, 0x5c($s1) -/* D157C 8013AE7C 00072402 */ srl $a0, $a3, 0x10 -/* D1580 8013AE80 00621021 */ addu $v0, $v1, $v0 -/* D1584 8013AE84 A0440001 */ sb $a0, 1($v0) -/* D1588 8013AE88 8E22005C */ lw $v0, 0x5c($s1) -/* D158C 8013AE8C 00072202 */ srl $a0, $a3, 8 -/* D1590 8013AE90 00621021 */ addu $v0, $v1, $v0 -/* D1594 8013AE94 A0440002 */ sb $a0, 2($v0) -/* D1598 8013AE98 8E22005C */ lw $v0, 0x5c($s1) -/* D159C 8013AE9C 00621821 */ addu $v1, $v1, $v0 -/* D15A0 8013AEA0 A0670003 */ sb $a3, 3($v1) -/* D15A4 8013AEA4 30E300FF */ andi $v1, $a3, 0xff -/* D15A8 8013AEA8 240200FF */ addiu $v0, $zero, 0xff -/* D15AC 8013AEAC 14620004 */ bne $v1, $v0, .L8013AEC0 -/* D15B0 8013AEB0 A2200001 */ sb $zero, 1($s1) -/* D15B4 8013AEB4 24020009 */ addiu $v0, $zero, 9 -/* D15B8 8013AEB8 0804EBC2 */ j .L8013AF08 -/* D15BC 8013AEBC A2220002 */ sb $v0, 2($s1) -.L8013AEC0: -/* D15C0 8013AEC0 2402000A */ addiu $v0, $zero, 0xa -/* D15C4 8013AEC4 0804EBC2 */ j .L8013AF08 -/* D15C8 8013AEC8 A2220002 */ sb $v0, 2($s1) -.L8013AECC_D15CC: -/* D15CC 8013AECC 2402000C */ addiu $v0, $zero, 0xc -/* D15D0 8013AED0 0804EBC2 */ j .L8013AF08 -/* D15D4 8013AED4 A2220002 */ sb $v0, 2($s1) -.L8013AED8_D15D8: -/* D15D8 8013AED8 2402000D */ addiu $v0, $zero, 0xd -/* D15DC 8013AEDC 0804EBC2 */ j .L8013AF08 -/* D15E0 8013AEE0 A2220002 */ sb $v0, 2($s1) -.L8013AEE4_D15E4: -/* D15E4 8013AEE4 24020004 */ addiu $v0, $zero, 4 -/* D15E8 8013AEE8 A2220001 */ sb $v0, 1($s1) -/* D15EC 8013AEEC 28E200FF */ slti $v0, $a3, 0xff -/* D15F0 8013AEF0 14400002 */ bnez $v0, .L8013AEFC -/* D15F4 8013AEF4 2402000F */ addiu $v0, $zero, 0xf -/* D15F8 8013AEF8 2402000E */ addiu $v0, $zero, 0xe -.L8013AEFC: -/* D15FC 8013AEFC A2220002 */ sb $v0, 2($s1) -/* D1600 8013AF00 AE20004C */ sw $zero, 0x4c($s1) -/* D1604 8013AF04 AE200050 */ sw $zero, 0x50($s1) -.L8013AF08: -/* D1608 8013AF08 8FBF001C */ lw $ra, 0x1c($sp) -/* D160C 8013AF0C 8FB20018 */ lw $s2, 0x18($sp) -/* D1610 8013AF10 8FB10014 */ lw $s1, 0x14($sp) -/* D1614 8013AF14 8FB00010 */ lw $s0, 0x10($sp) -/* D1618 8013AF18 03E00008 */ jr $ra -/* D161C 8013AF1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013B1B0.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013B1B0.s deleted file mode 100644 index 11e5bf973d..0000000000 --- a/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013B1B0.s +++ /dev/null @@ -1,757 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80151050 -.double 255.0 - -dlabel jtbl_80151058 -.word .L8013B350_D1A50, .L8013B358_D1A58, .L8013B364_D1A64, .L8013B364_D1A64, .L8013B358_D1A58, .L8013B364_D1A64, .L8013B364_D1A64, .L8013B364_D1A64, .L8013B364_D1A64, .L8013B360_D1A60, .L8013B364_D1A64, .L8013B350_D1A50 - -dlabel jtbl_80151088 -.word .L8013BAEC_D21EC, .L8013B484_D1B84, .L8013B4B4_D1BB4, .L8013B500_D1C00, .L8013B56C_D1C6C, .L8013B57C_D1C7C, .L8013B5E8_D1CE8, .L8013B664_D1D64, .L8013B678_D1D78, .L8013B650_D1D50, .L8013B68C_D1D8C, .L8013B6F8_D1DF8, .L8013B89C_D1F9C, .L8013BA84_D2184, .L8013BAEC_D21EC, .L8013BB20_D2220, .L8013BAEC_D21EC, 0 - -dlabel jtbl_801510D0 -.word .L8013BB8C_D228C, .L8013BBA0_D22A0, .L8013BBB4_D22B4, .L8013BBA0_D22A0, .L8013BBC8_D22C8, 0 - -.section .text - -glabel func_8013B1B0 -/* D18B0 8013B1B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D18B4 8013B1B4 AFB20018 */ sw $s2, 0x18($sp) -/* D18B8 8013B1B8 0080902D */ daddu $s2, $a0, $zero -/* D18BC 8013B1BC AFB3001C */ sw $s3, 0x1c($sp) -/* D18C0 8013B1C0 00A0982D */ daddu $s3, $a1, $zero -/* D18C4 8013B1C4 0000482D */ daddu $t1, $zero, $zero -/* D18C8 8013B1C8 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* D18CC 8013B1CC 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) -/* D18D0 8013B1D0 3C03E700 */ lui $v1, 0xe700 -/* D18D4 8013B1D4 AFBF0020 */ sw $ra, 0x20($sp) -/* D18D8 8013B1D8 AFB10014 */ sw $s1, 0x14($sp) -/* D18DC 8013B1DC AFB00010 */ sw $s0, 0x10($sp) -/* D18E0 8013B1E0 F7B40028 */ sdc1 $f20, 0x28($sp) -/* D18E4 8013B1E4 8E480038 */ lw $t0, 0x38($s2) -/* D18E8 8013B1E8 8CA40000 */ lw $a0, ($a1) -/* D18EC 8013B1EC 924A0002 */ lbu $t2, 2($s2) -/* D18F0 8013B1F0 0080102D */ daddu $v0, $a0, $zero -/* D18F4 8013B1F4 AC430000 */ sw $v1, ($v0) -/* D18F8 8013B1F8 AC400004 */ sw $zero, 4($v0) -/* D18FC 8013B1FC 8E420014 */ lw $v0, 0x14($s2) -/* D1900 8013B200 24840008 */ addiu $a0, $a0, 8 -/* D1904 8013B204 30420010 */ andi $v0, $v0, 0x10 -/* D1908 8013B208 14400257 */ bnez $v0, .L8013BB68 -/* D190C 8013B20C ACA40000 */ sw $a0, ($a1) -/* D1910 8013B210 24820008 */ addiu $v0, $a0, 8 -/* D1914 8013B214 ACA20000 */ sw $v0, ($a1) -/* D1918 8013B218 3C02DE00 */ lui $v0, 0xde00 -/* D191C 8013B21C AC820000 */ sw $v0, ($a0) -/* D1920 8013B220 3C028015 */ lui $v0, %hi(D_8014EE68) -/* D1924 8013B224 2442EE68 */ addiu $v0, $v0, %lo(D_8014EE68) -/* D1928 8013B228 AC820004 */ sw $v0, 4($a0) -/* D192C 8013B22C 8E420014 */ lw $v0, 0x14($s2) -/* D1930 8013B230 3C030001 */ lui $v1, 1 -/* D1934 8013B234 00431024 */ and $v0, $v0, $v1 -/* D1938 8013B238 10400006 */ beqz $v0, .L8013B254 -/* D193C 8013B23C 3C03E300 */ lui $v1, 0xe300 -/* D1940 8013B240 34631201 */ ori $v1, $v1, 0x1201 -/* D1944 8013B244 24820010 */ addiu $v0, $a0, 0x10 -/* D1948 8013B248 ACA20000 */ sw $v0, ($a1) -/* D194C 8013B24C AC830008 */ sw $v1, 8($a0) -/* D1950 8013B250 AC80000C */ sw $zero, 0xc($a0) -.L8013B254: -/* D1954 8013B254 8E420014 */ lw $v0, 0x14($s2) -/* D1958 8013B258 30420002 */ andi $v0, $v0, 2 -/* D195C 8013B25C 10400009 */ beqz $v0, .L8013B284 -/* D1960 8013B260 3C04D9FF */ lui $a0, 0xd9ff -/* D1964 8013B264 8CA20000 */ lw $v0, ($a1) -/* D1968 8013B268 3484FFFF */ ori $a0, $a0, 0xffff -/* D196C 8013B26C 0040182D */ daddu $v1, $v0, $zero -/* D1970 8013B270 24420008 */ addiu $v0, $v0, 8 -/* D1974 8013B274 ACA20000 */ sw $v0, ($a1) -/* D1978 8013B278 24020400 */ addiu $v0, $zero, 0x400 -/* D197C 8013B27C AC640000 */ sw $a0, ($v1) -/* D1980 8013B280 AC620004 */ sw $v0, 4($v1) -.L8013B284: -/* D1984 8013B284 8E420014 */ lw $v0, 0x14($s2) -/* D1988 8013B288 30420004 */ andi $v0, $v0, 4 -/* D198C 8013B28C 10400009 */ beqz $v0, .L8013B2B4 -/* D1990 8013B290 3C04D9FF */ lui $a0, 0xd9ff -/* D1994 8013B294 8CA20000 */ lw $v0, ($a1) -/* D1998 8013B298 3484FFFF */ ori $a0, $a0, 0xffff -/* D199C 8013B29C 0040182D */ daddu $v1, $v0, $zero -/* D19A0 8013B2A0 24420008 */ addiu $v0, $v0, 8 -/* D19A4 8013B2A4 ACA20000 */ sw $v0, ($a1) -/* D19A8 8013B2A8 24020200 */ addiu $v0, $zero, 0x200 -/* D19AC 8013B2AC AC640000 */ sw $a0, ($v1) -/* D19B0 8013B2B0 AC620004 */ sw $v0, 4($v1) -.L8013B2B4: -/* D19B4 8013B2B4 92430002 */ lbu $v1, 2($s2) -/* D19B8 8013B2B8 3C048015 */ lui $a0, %hi(D_8014EE98) -/* D19BC 8013B2BC 2484EE98 */ addiu $a0, $a0, %lo(D_8014EE98) -/* D19C0 8013B2C0 00031040 */ sll $v0, $v1, 1 -/* D19C4 8013B2C4 00431021 */ addu $v0, $v0, $v1 -/* D19C8 8013B2C8 00021080 */ sll $v0, $v0, 2 -/* D19CC 8013B2CC 00441021 */ addu $v0, $v0, $a0 -/* D19D0 8013B2D0 8C470000 */ lw $a3, ($v0) -/* D19D4 8013B2D4 90430008 */ lbu $v1, 8($v0) -/* D19D8 8013B2D8 8C460004 */ lw $a2, 4($v0) -/* D19DC 8013B2DC 30630001 */ andi $v1, $v1, 1 -/* D19E0 8013B2E0 54600001 */ bnel $v1, $zero, .L8013B2E8 -/* D19E4 8013B2E4 24090001 */ addiu $t1, $zero, 1 -.L8013B2E8: -/* D19E8 8013B2E8 3C028015 */ lui $v0, %hi(fold_currentImage) -/* D19EC 8013B2EC 8C42EE10 */ lw $v0, %lo(fold_currentImage)($v0) -/* D19F0 8013B2F0 3C018015 */ lui $at, %hi(D_80151050) -/* D19F4 8013B2F4 D4221050 */ ldc1 $f2, %lo(D_80151050)($at) -/* D19F8 8013B2F8 90430024 */ lbu $v1, 0x24($v0) -/* D19FC 8013B2FC 0120102D */ daddu $v0, $t1, $zero -/* D1A00 8013B300 44830000 */ mtc1 $v1, $f0 -/* D1A04 8013B304 00000000 */ nop -/* D1A08 8013B308 46800020 */ cvt.s.w $f0, $f0 -/* D1A0C 8013B30C 46000021 */ cvt.d.s $f0, $f0 -/* D1A10 8013B310 46220003 */ div.d $f0, $f0, $f2 -/* D1A14 8013B314 1440001E */ bnez $v0, .L8013B390 -/* D1A18 8013B318 462000A0 */ cvt.s.d $f2, $f0 -/* D1A1C 8013B31C 2C6200FF */ sltiu $v0, $v1, 0xff -/* D1A20 8013B320 1040001B */ beqz $v0, .L8013B390 -/* D1A24 8013B324 240200FF */ addiu $v0, $zero, 0xff -/* D1A28 8013B328 92430002 */ lbu $v1, 2($s2) -/* D1A2C 8013B32C AE420038 */ sw $v0, 0x38($s2) -/* D1A30 8013B330 2C62000C */ sltiu $v0, $v1, 0xc -/* D1A34 8013B334 1040000B */ beqz $v0, .L8013B364_D1A64 -/* D1A38 8013B338 00031080 */ sll $v0, $v1, 2 -/* D1A3C 8013B33C 3C018015 */ lui $at, %hi(jtbl_80151058) -/* D1A40 8013B340 00220821 */ addu $at, $at, $v0 -/* D1A44 8013B344 8C221058 */ lw $v0, %lo(jtbl_80151058)($at) -/* D1A48 8013B348 00400008 */ jr $v0 -/* D1A4C 8013B34C 00000000 */ nop -.L8013B350_D1A50: -/* D1A50 8013B350 0804ECD9 */ j .L8013B364_D1A64 -/* D1A54 8013B354 240A0002 */ addiu $t2, $zero, 2 -.L8013B358_D1A58: -/* D1A58 8013B358 0804ECD9 */ j .L8013B364_D1A64 -/* D1A5C 8013B35C 240A0003 */ addiu $t2, $zero, 3 -.L8013B360_D1A60: -/* D1A60 8013B360 240A000A */ addiu $t2, $zero, 0xa -.L8013B364_D1A64: -/* D1A64 8013B364 3C070040 */ lui $a3, 0x40 -/* D1A68 8013B368 C6400038 */ lwc1 $f0, 0x38($s2) -/* D1A6C 8013B36C 46800020 */ cvt.s.w $f0, $f0 -/* D1A70 8013B370 46020002 */ mul.s $f0, $f0, $f2 -/* D1A74 8013B374 00000000 */ nop -/* D1A78 8013B378 34E74B40 */ ori $a3, $a3, 0x4b40 -/* D1A7C 8013B37C 3C060010 */ lui $a2, 0x10 -/* D1A80 8013B380 34C64B40 */ ori $a2, $a2, 0x4b40 -/* D1A84 8013B384 24090001 */ addiu $t1, $zero, 1 -/* D1A88 8013B388 4600018D */ trunc.w.s $f6, $f0 -/* D1A8C 8013B38C 44083000 */ mfc1 $t0, $f6 -.L8013B390: -/* D1A90 8013B390 8E420014 */ lw $v0, 0x14($s2) -/* D1A94 8013B394 30420400 */ andi $v0, $v0, 0x400 -/* D1A98 8013B398 10400007 */ beqz $v0, .L8013B3B8 -/* D1A9C 8013B39C 0120102D */ daddu $v0, $t1, $zero -/* D1AA0 8013B3A0 14400005 */ bnez $v0, .L8013B3B8 -/* D1AA4 8013B3A4 2402FDFF */ addiu $v0, $zero, -0x201 -/* D1AA8 8013B3A8 00E23824 */ and $a3, $a3, $v0 -/* D1AAC 8013B3AC 00C23024 */ and $a2, $a2, $v0 -/* D1AB0 8013B3B0 34E72040 */ ori $a3, $a3, 0x2040 -/* D1AB4 8013B3B4 34C62040 */ ori $a2, $a2, 0x2040 -.L8013B3B8: -/* D1AB8 8013B3B8 8E420014 */ lw $v0, 0x14($s2) -/* D1ABC 8013B3BC 30420040 */ andi $v0, $v0, 0x40 -/* D1AC0 8013B3C0 1040000B */ beqz $v0, .L8013B3F0 -/* D1AC4 8013B3C4 3C05D9FF */ lui $a1, 0xd9ff -/* D1AC8 8013B3C8 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D1ACC 8013B3CC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* D1AD0 8013B3D0 8C820000 */ lw $v0, ($a0) -/* D1AD4 8013B3D4 34A5FFFE */ ori $a1, $a1, 0xfffe -/* D1AD8 8013B3D8 0040182D */ daddu $v1, $v0, $zero -/* D1ADC 8013B3DC 24420008 */ addiu $v0, $v0, 8 -/* D1AE0 8013B3E0 AC820000 */ sw $v0, ($a0) -/* D1AE4 8013B3E4 AC650000 */ sw $a1, ($v1) -/* D1AE8 8013B3E8 0804ED0D */ j .L8013B434 -/* D1AEC 8013B3EC AC600004 */ sw $zero, 4($v1) -.L8013B3F0: -/* D1AF0 8013B3F0 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D1AF4 8013B3F4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* D1AF8 8013B3F8 8C620000 */ lw $v0, ($v1) -/* D1AFC 8013B3FC 34A5FFFF */ ori $a1, $a1, 0xffff -/* D1B00 8013B400 0040202D */ daddu $a0, $v0, $zero -/* D1B04 8013B404 24420008 */ addiu $v0, $v0, 8 -/* D1B08 8013B408 AC620000 */ sw $v0, ($v1) -/* D1B0C 8013B40C 24020001 */ addiu $v0, $zero, 1 -/* D1B10 8013B410 AC820004 */ sw $v0, 4($a0) -/* D1B14 8013B414 0120102D */ daddu $v0, $t1, $zero -/* D1B18 8013B418 10400004 */ beqz $v0, .L8013B42C -/* D1B1C 8013B41C AC850000 */ sw $a1, ($a0) -/* D1B20 8013B420 34E70010 */ ori $a3, $a3, 0x10 -/* D1B24 8013B424 0804ED0D */ j .L8013B434 -/* D1B28 8013B428 34C60010 */ ori $a2, $a2, 0x10 -.L8013B42C: -/* D1B2C 8013B42C 34E70030 */ ori $a3, $a3, 0x30 -/* D1B30 8013B430 34C60030 */ ori $a2, $a2, 0x30 -.L8013B434: -/* D1B34 8013B434 3C05E200 */ lui $a1, 0xe200 -/* D1B38 8013B438 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D1B3C 8013B43C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* D1B40 8013B440 8C820000 */ lw $v0, ($a0) -/* D1B44 8013B444 34A5001C */ ori $a1, $a1, 0x1c -/* D1B48 8013B448 AE460078 */ sw $a2, 0x78($s2) -/* D1B4C 8013B44C 0040182D */ daddu $v1, $v0, $zero -/* D1B50 8013B450 24420008 */ addiu $v0, $v0, 8 -/* D1B54 8013B454 AC820000 */ sw $v0, ($a0) -/* D1B58 8013B458 00E61025 */ or $v0, $a3, $a2 -/* D1B5C 8013B45C AC620004 */ sw $v0, 4($v1) -/* D1B60 8013B460 2D420011 */ sltiu $v0, $t2, 0x11 -/* D1B64 8013B464 104001C0 */ beqz $v0, .L8013BB68 -/* D1B68 8013B468 AC650000 */ sw $a1, ($v1) -/* D1B6C 8013B46C 000A1080 */ sll $v0, $t2, 2 -/* D1B70 8013B470 3C018015 */ lui $at, %hi(jtbl_80151088) -/* D1B74 8013B474 00220821 */ addu $at, $at, $v0 -/* D1B78 8013B478 8C221088 */ lw $v0, %lo(jtbl_80151088)($at) -/* D1B7C 8013B47C 00400008 */ jr $v0 -/* D1B80 8013B480 00000000 */ nop -.L8013B484_D1B84: -/* D1B84 8013B484 3C02FC11 */ lui $v0, 0xfc11 -/* D1B88 8013B488 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D1B8C 8013B48C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* D1B90 8013B490 8C650000 */ lw $a1, ($v1) -/* D1B94 8013B494 3442FE23 */ ori $v0, $v0, 0xfe23 -/* D1B98 8013B498 00A0202D */ daddu $a0, $a1, $zero -/* D1B9C 8013B49C 24A50008 */ addiu $a1, $a1, 8 -/* D1BA0 8013B4A0 AC650000 */ sw $a1, ($v1) -/* D1BA4 8013B4A4 AC820000 */ sw $v0, ($a0) -/* D1BA8 8013B4A8 2402F3F9 */ addiu $v0, $zero, -0xc07 -/* D1BAC 8013B4AC 0804EEAD */ j .L8013BAB4 -/* D1BB0 8013B4B0 AC820004 */ sw $v0, 4($a0) -.L8013B4B4_D1BB4: -/* D1BB4 8013B4B4 190001EC */ blez $t0, .L8013BC68 -/* D1BB8 8013B4B8 3C06FCFF */ lui $a2, 0xfcff -/* D1BBC 8013B4BC 34C697FF */ ori $a2, $a2, 0x97ff -/* D1BC0 8013B4C0 3C05FF2C */ lui $a1, 0xff2c -/* D1BC4 8013B4C4 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D1BC8 8013B4C8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* D1BCC 8013B4CC 8C820000 */ lw $v0, ($a0) -/* D1BD0 8013B4D0 34A5FE7F */ ori $a1, $a1, 0xfe7f -/* D1BD4 8013B4D4 0040182D */ daddu $v1, $v0, $zero -/* D1BD8 8013B4D8 24420008 */ addiu $v0, $v0, 8 -/* D1BDC 8013B4DC AC820000 */ sw $v0, ($a0) -/* D1BE0 8013B4E0 AC660000 */ sw $a2, ($v1) -/* D1BE4 8013B4E4 AC650004 */ sw $a1, 4($v1) -/* D1BE8 8013B4E8 24430008 */ addiu $v1, $v0, 8 -/* D1BEC 8013B4EC AC830000 */ sw $v1, ($a0) -/* D1BF0 8013B4F0 3C03FA00 */ lui $v1, 0xfa00 -/* D1BF4 8013B4F4 AC430000 */ sw $v1, ($v0) -/* D1BF8 8013B4F8 0804EED9 */ j .L8013BB64 -/* D1BFC 8013B4FC 310300FF */ andi $v1, $t0, 0xff -.L8013B500_D1C00: -/* D1C00 8013B500 190001D9 */ blez $t0, .L8013BC68 -/* D1C04 8013B504 3C06FC11 */ lui $a2, 0xfc11 -/* D1C08 8013B508 34C69623 */ ori $a2, $a2, 0x9623 -/* D1C0C 8013B50C 3C04FF2F */ lui $a0, 0xff2f -/* D1C10 8013B510 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D1C14 8013B514 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* D1C18 8013B518 8C650000 */ lw $a1, ($v1) -/* D1C1C 8013B51C 3484FFFF */ ori $a0, $a0, 0xffff -/* D1C20 8013B520 00A0102D */ daddu $v0, $a1, $zero -/* D1C24 8013B524 24A50008 */ addiu $a1, $a1, 8 -/* D1C28 8013B528 AC650000 */ sw $a1, ($v1) -/* D1C2C 8013B52C AC460000 */ sw $a2, ($v0) -/* D1C30 8013B530 AC440004 */ sw $a0, 4($v0) -/* D1C34 8013B534 24A20008 */ addiu $v0, $a1, 8 -/* D1C38 8013B538 AC620000 */ sw $v0, ($v1) -/* D1C3C 8013B53C 3C02FA00 */ lui $v0, 0xfa00 -/* D1C40 8013B540 ACA20000 */ sw $v0, ($a1) -/* D1C44 8013B544 9242002F */ lbu $v0, 0x2f($s2) -/* D1C48 8013B548 92440033 */ lbu $a0, 0x33($s2) -/* D1C4C 8013B54C 92430037 */ lbu $v1, 0x37($s2) -/* D1C50 8013B550 00021600 */ sll $v0, $v0, 0x18 -/* D1C54 8013B554 00042400 */ sll $a0, $a0, 0x10 -/* D1C58 8013B558 00441025 */ or $v0, $v0, $a0 -/* D1C5C 8013B55C 00031A00 */ sll $v1, $v1, 8 -/* D1C60 8013B560 00431025 */ or $v0, $v0, $v1 -/* D1C64 8013B564 0804EEB8 */ j .L8013BAE0 -/* D1C68 8013B568 310300FF */ andi $v1, $t0, 0xff -.L8013B56C_D1C6C: -/* D1C6C 8013B56C 3C06FC60 */ lui $a2, 0xfc60 -/* D1C70 8013B570 34C6FEC1 */ ori $a2, $a2, 0xfec1 -/* D1C74 8013B574 0804EEA4 */ j .L8013BA90 -/* D1C78 8013B578 3C0433FD */ lui $a0, 0x33fd -.L8013B57C_D1C7C: -/* D1C7C 8013B57C 190001BA */ blez $t0, .L8013BC68 -/* D1C80 8013B580 3C06FC60 */ lui $a2, 0xfc60 -/* D1C84 8013B584 34C696C1 */ ori $a2, $a2, 0x96c1 -/* D1C88 8013B588 3C04FF2D */ lui $a0, 0xff2d -/* D1C8C 8013B58C 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D1C90 8013B590 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* D1C94 8013B594 8C650000 */ lw $a1, ($v1) -/* D1C98 8013B598 3484FEFF */ ori $a0, $a0, 0xfeff -/* D1C9C 8013B59C 00A0102D */ daddu $v0, $a1, $zero -/* D1CA0 8013B5A0 24A50008 */ addiu $a1, $a1, 8 -/* D1CA4 8013B5A4 AC650000 */ sw $a1, ($v1) -/* D1CA8 8013B5A8 AC460000 */ sw $a2, ($v0) -/* D1CAC 8013B5AC AC440004 */ sw $a0, 4($v0) -/* D1CB0 8013B5B0 24A20008 */ addiu $v0, $a1, 8 -/* D1CB4 8013B5B4 AC620000 */ sw $v0, ($v1) -/* D1CB8 8013B5B8 3C02FA00 */ lui $v0, 0xfa00 -/* D1CBC 8013B5BC ACA20000 */ sw $v0, ($a1) -/* D1CC0 8013B5C0 9242002F */ lbu $v0, 0x2f($s2) -/* D1CC4 8013B5C4 92440033 */ lbu $a0, 0x33($s2) -/* D1CC8 8013B5C8 92430037 */ lbu $v1, 0x37($s2) -/* D1CCC 8013B5CC 00021600 */ sll $v0, $v0, 0x18 -/* D1CD0 8013B5D0 00042400 */ sll $a0, $a0, 0x10 -/* D1CD4 8013B5D4 00441025 */ or $v0, $v0, $a0 -/* D1CD8 8013B5D8 00031A00 */ sll $v1, $v1, 8 -/* D1CDC 8013B5DC 00431025 */ or $v0, $v0, $v1 -/* D1CE0 8013B5E0 0804EEB8 */ j .L8013BAE0 -/* D1CE4 8013B5E4 310300FF */ andi $v1, $t0, 0xff -.L8013B5E8_D1CE8: -/* D1CE8 8013B5E8 3C03FC12 */ lui $v1, 0xfc12 -/* D1CEC 8013B5EC 34637E24 */ ori $v1, $v1, 0x7e24 -/* D1CF0 8013B5F0 3C07D9FF */ lui $a3, 0xd9ff -/* D1CF4 8013B5F4 34E7FFFF */ ori $a3, $a3, 0xffff -/* D1CF8 8013B5F8 3C060020 */ lui $a2, 0x20 -/* D1CFC 8013B5FC 34C60004 */ ori $a2, $a2, 4 -/* D1D00 8013B600 3C08D9FD */ lui $t0, 0xd9fd -/* D1D04 8013B604 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D1D08 8013B608 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* D1D0C 8013B60C 8C820000 */ lw $v0, ($a0) -/* D1D10 8013B610 3508FFFF */ ori $t0, $t0, 0xffff -/* D1D14 8013B614 0040282D */ daddu $a1, $v0, $zero -/* D1D18 8013B618 24420008 */ addiu $v0, $v0, 8 -/* D1D1C 8013B61C AC820000 */ sw $v0, ($a0) -/* D1D20 8013B620 ACA30000 */ sw $v1, ($a1) -/* D1D24 8013B624 2403F3F9 */ addiu $v1, $zero, -0xc07 -/* D1D28 8013B628 ACA30004 */ sw $v1, 4($a1) -/* D1D2C 8013B62C 24430008 */ addiu $v1, $v0, 8 -/* D1D30 8013B630 AC830000 */ sw $v1, ($a0) -/* D1D34 8013B634 24430010 */ addiu $v1, $v0, 0x10 -/* D1D38 8013B638 AC470000 */ sw $a3, ($v0) -/* D1D3C 8013B63C AC460004 */ sw $a2, 4($v0) -/* D1D40 8013B640 AC830000 */ sw $v1, ($a0) -/* D1D44 8013B644 AC480008 */ sw $t0, 8($v0) -/* D1D48 8013B648 0804EEDA */ j .L8013BB68 -/* D1D4C 8013B64C AC40000C */ sw $zero, 0xc($v0) -.L8013B650_D1D50: -/* D1D50 8013B650 3C07FC60 */ lui $a3, 0xfc60 -/* D1D54 8013B654 34E7FEC1 */ ori $a3, $a3, 0xfec1 -/* D1D58 8013B658 3C0544FE */ lui $a1, 0x44fe -/* D1D5C 8013B65C 0804EDA7 */ j .L8013B69C -/* D1D60 8013B660 34A57339 */ ori $a1, $a1, 0x7339 -.L8013B664_D1D64: -/* D1D64 8013B664 3C07FCFF */ lui $a3, 0xfcff -/* D1D68 8013B668 34E799FF */ ori $a3, $a3, 0x99ff -/* D1D6C 8013B66C 3C05FF30 */ lui $a1, 0xff30 -/* D1D70 8013B670 0804EDA7 */ j .L8013B69C -/* D1D74 8013B674 34A5FE7F */ ori $a1, $a1, 0xfe7f -.L8013B678_D1D78: -/* D1D78 8013B678 3C07FC12 */ lui $a3, 0xfc12 -/* D1D7C 8013B67C 34E71824 */ ori $a3, $a3, 0x1824 -/* D1D80 8013B680 3C05FF33 */ lui $a1, 0xff33 -/* D1D84 8013B684 0804EDA7 */ j .L8013B69C -/* D1D88 8013B688 34A5FFFF */ ori $a1, $a1, 0xffff -.L8013B68C_D1D8C: -/* D1D8C 8013B68C 3C07FC60 */ lui $a3, 0xfc60 -/* D1D90 8013B690 34E798C1 */ ori $a3, $a3, 0x98c1 -/* D1D94 8013B694 3C054432 */ lui $a1, 0x4432 -/* D1D98 8013B698 34A57F3F */ ori $a1, $a1, 0x7f3f -.L8013B69C: -/* D1D9C 8013B69C 3C08D9FF */ lui $t0, 0xd9ff -/* D1DA0 8013B6A0 3508FFFF */ ori $t0, $t0, 0xffff -/* D1DA4 8013B6A4 3C060020 */ lui $a2, 0x20 -/* D1DA8 8013B6A8 34C60004 */ ori $a2, $a2, 4 -/* D1DAC 8013B6AC 3C09D9FD */ lui $t1, 0xd9fd -/* D1DB0 8013B6B0 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D1DB4 8013B6B4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* D1DB8 8013B6B8 8C820000 */ lw $v0, ($a0) -/* D1DBC 8013B6BC 3529FFFF */ ori $t1, $t1, 0xffff -/* D1DC0 8013B6C0 0040182D */ daddu $v1, $v0, $zero -/* D1DC4 8013B6C4 24420008 */ addiu $v0, $v0, 8 -/* D1DC8 8013B6C8 AC820000 */ sw $v0, ($a0) -/* D1DCC 8013B6CC AC670000 */ sw $a3, ($v1) -/* D1DD0 8013B6D0 AC650004 */ sw $a1, 4($v1) -/* D1DD4 8013B6D4 24430008 */ addiu $v1, $v0, 8 -/* D1DD8 8013B6D8 AC830000 */ sw $v1, ($a0) -/* D1DDC 8013B6DC 24430010 */ addiu $v1, $v0, 0x10 -/* D1DE0 8013B6E0 AC480000 */ sw $t0, ($v0) -/* D1DE4 8013B6E4 AC460004 */ sw $a2, 4($v0) -/* D1DE8 8013B6E8 AC830000 */ sw $v1, ($a0) -/* D1DEC 8013B6EC AC490008 */ sw $t1, 8($v0) -/* D1DF0 8013B6F0 0804EEDA */ j .L8013BB68 -/* D1DF4 8013B6F4 AC40000C */ sw $zero, 0xc($v0) -.L8013B6F8_D1DF8: -/* D1DF8 8013B6F8 8E420014 */ lw $v0, 0x14($s2) -/* D1DFC 8013B6FC 3042A000 */ andi $v0, $v0, 0xa000 -/* D1E00 8013B700 104000FA */ beqz $v0, .L8013BAEC_D21EC -/* D1E04 8013B704 3C02FC12 */ lui $v0, 0xfc12 -/* D1E08 8013B708 34427E24 */ ori $v0, $v0, 0x7e24 -/* D1E0C 8013B70C 3C06D9FF */ lui $a2, 0xd9ff -/* D1E10 8013B710 34C6FFFF */ ori $a2, $a2, 0xffff -/* D1E14 8013B714 3C050022 */ lui $a1, 0x22 -/* D1E18 8013B718 3C11800A */ lui $s1, %hi(gMasterGfxPos) -/* D1E1C 8013B71C 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) -/* D1E20 8013B720 8E230000 */ lw $v1, ($s1) -/* D1E24 8013B724 34A50004 */ ori $a1, $a1, 4 -/* D1E28 8013B728 0060202D */ daddu $a0, $v1, $zero -/* D1E2C 8013B72C 24630008 */ addiu $v1, $v1, 8 -/* D1E30 8013B730 AE230000 */ sw $v1, ($s1) -/* D1E34 8013B734 AC820000 */ sw $v0, ($a0) -/* D1E38 8013B738 2402F3F9 */ addiu $v0, $zero, -0xc07 -/* D1E3C 8013B73C AC820004 */ sw $v0, 4($a0) -/* D1E40 8013B740 3C028007 */ lui $v0, %hi(gCurrentCameraID) -/* D1E44 8013B744 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) -/* D1E48 8013B748 3C04800B */ lui $a0, %hi(gCameras) -/* D1E4C 8013B74C 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* D1E50 8013B750 AC660000 */ sw $a2, ($v1) -/* D1E54 8013B754 AC650004 */ sw $a1, 4($v1) -/* D1E58 8013B758 00028080 */ sll $s0, $v0, 2 -/* D1E5C 8013B75C 02028021 */ addu $s0, $s0, $v0 -/* D1E60 8013B760 00108080 */ sll $s0, $s0, 2 -/* D1E64 8013B764 02028023 */ subu $s0, $s0, $v0 -/* D1E68 8013B768 001010C0 */ sll $v0, $s0, 3 -/* D1E6C 8013B76C 02028021 */ addu $s0, $s0, $v0 -/* D1E70 8013B770 001080C0 */ sll $s0, $s0, 3 -/* D1E74 8013B774 02048021 */ addu $s0, $s0, $a0 -/* D1E78 8013B778 C600006C */ lwc1 $f0, 0x6c($s0) -/* D1E7C 8013B77C 24630008 */ addiu $v1, $v1, 8 -/* D1E80 8013B780 AE230000 */ sw $v1, ($s1) -/* D1E84 8013B784 4600018D */ trunc.w.s $f6, $f0 -/* D1E88 8013B788 44043000 */ mfc1 $a0, $f6 -/* D1E8C 8013B78C 00000000 */ nop -/* D1E90 8013B790 00042400 */ sll $a0, $a0, 0x10 -/* D1E94 8013B794 0C00A4F5 */ jal cosine -/* D1E98 8013B798 00042403 */ sra $a0, $a0, 0x10 -/* D1E9C 8013B79C C604006C */ lwc1 $f4, 0x6c($s0) -/* D1EA0 8013B7A0 3C0142B4 */ lui $at, 0x42b4 -/* D1EA4 8013B7A4 44811000 */ mtc1 $at, $f2 -/* D1EA8 8013B7A8 00000000 */ nop -/* D1EAC 8013B7AC 46022100 */ add.s $f4, $f4, $f2 -/* D1EB0 8013B7B0 3C0142F0 */ lui $at, 0x42f0 -/* D1EB4 8013B7B4 4481A000 */ mtc1 $at, $f20 -/* D1EB8 8013B7B8 00000000 */ nop -/* D1EBC 8013B7BC 46140002 */ mul.s $f0, $f0, $f20 -/* D1EC0 8013B7C0 00000000 */ nop -/* D1EC4 8013B7C4 4600218D */ trunc.w.s $f6, $f4 -/* D1EC8 8013B7C8 44043000 */ mfc1 $a0, $f6 -/* D1ECC 8013B7CC 00000000 */ nop -/* D1ED0 8013B7D0 00042400 */ sll $a0, $a0, 0x10 -/* D1ED4 8013B7D4 4600018D */ trunc.w.s $f6, $f0 -/* D1ED8 8013B7D8 44103000 */ mfc1 $s0, $f6 -/* D1EDC 8013B7DC 0C00A4F5 */ jal cosine -/* D1EE0 8013B7E0 00042403 */ sra $a0, $a0, 0x10 -/* D1EE4 8013B7E4 3C06DC08 */ lui $a2, 0xdc08 -/* D1EE8 8013B7E8 34C6060A */ ori $a2, $a2, 0x60a -/* D1EEC 8013B7EC 3C07DC08 */ lui $a3, 0xdc08 -/* D1EF0 8013B7F0 34E7090A */ ori $a3, $a3, 0x90a -/* D1EF4 8013B7F4 3C08DC08 */ lui $t0, 0xdc08 -/* D1EF8 8013B7F8 35080C0A */ ori $t0, $t0, 0xc0a -/* D1EFC 8013B7FC 00101600 */ sll $v0, $s0, 0x18 -/* D1F00 8013B800 00021603 */ sra $v0, $v0, 0x18 -/* D1F04 8013B804 00021023 */ negu $v0, $v0 -/* D1F08 8013B808 3C048015 */ lui $a0, %hi(D_8014EE18) -/* D1F0C 8013B80C 2484EE18 */ addiu $a0, $a0, %lo(D_8014EE18) -/* D1F10 8013B810 8E230000 */ lw $v1, ($s1) -/* D1F14 8013B814 46140002 */ mul.s $f0, $f0, $f20 -/* D1F18 8013B818 00000000 */ nop -/* D1F1C 8013B81C A0820010 */ sb $v0, 0x10($a0) -/* D1F20 8013B820 A0900020 */ sb $s0, 0x20($a0) -/* D1F24 8013B824 0060282D */ daddu $a1, $v1, $zero -/* D1F28 8013B828 24630008 */ addiu $v1, $v1, 8 -/* D1F2C 8013B82C 24620008 */ addiu $v0, $v1, 8 -/* D1F30 8013B830 AE230000 */ sw $v1, ($s1) -/* D1F34 8013B834 AE220000 */ sw $v0, ($s1) -/* D1F38 8013B838 24620010 */ addiu $v0, $v1, 0x10 -/* D1F3C 8013B83C AE220000 */ sw $v0, ($s1) -/* D1F40 8013B840 24620018 */ addiu $v0, $v1, 0x18 -/* D1F44 8013B844 AE220000 */ sw $v0, ($s1) -/* D1F48 8013B848 4600018D */ trunc.w.s $f6, $f0 -/* D1F4C 8013B84C 44023000 */ mfc1 $v0, $f6 -/* D1F50 8013B850 00000000 */ nop -/* D1F54 8013B854 A0820012 */ sb $v0, 0x12($a0) -/* D1F58 8013B858 00021600 */ sll $v0, $v0, 0x18 -/* D1F5C 8013B85C 00021603 */ sra $v0, $v0, 0x18 -/* D1F60 8013B860 00021023 */ negu $v0, $v0 -/* D1F64 8013B864 A0820022 */ sb $v0, 0x22($a0) -/* D1F68 8013B868 3C02DB02 */ lui $v0, 0xdb02 -/* D1F6C 8013B86C ACA20000 */ sw $v0, ($a1) -/* D1F70 8013B870 24020030 */ addiu $v0, $zero, 0x30 -/* D1F74 8013B874 ACA20004 */ sw $v0, 4($a1) -/* D1F78 8013B878 24820008 */ addiu $v0, $a0, 8 -/* D1F7C 8013B87C AC620004 */ sw $v0, 4($v1) -/* D1F80 8013B880 24820018 */ addiu $v0, $a0, 0x18 -/* D1F84 8013B884 AC660000 */ sw $a2, ($v1) -/* D1F88 8013B888 AC670008 */ sw $a3, 8($v1) -/* D1F8C 8013B88C AC62000C */ sw $v0, 0xc($v1) -/* D1F90 8013B890 AC680010 */ sw $t0, 0x10($v1) -/* D1F94 8013B894 0804EEDA */ j .L8013BB68 -/* D1F98 8013B898 AC640014 */ sw $a0, 0x14($v1) -.L8013B89C_D1F9C: -/* D1F9C 8013B89C 8E43002C */ lw $v1, 0x2c($s2) -/* D1FA0 8013B8A0 1460001F */ bnez $v1, .L8013B920 -/* D1FA4 8013B8A4 240B0001 */ addiu $t3, $zero, 1 -/* D1FA8 8013B8A8 3C06FC71 */ lui $a2, 0xfc71 -/* D1FAC 8013B8AC 34C696E3 */ ori $a2, $a2, 0x96e3 -/* D1FB0 8013B8B0 3C04332C */ lui $a0, 0x332c -/* D1FB4 8013B8B4 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D1FB8 8013B8B8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* D1FBC 8013B8BC 8C650000 */ lw $a1, ($v1) -/* D1FC0 8013B8C0 3484FE7F */ ori $a0, $a0, 0xfe7f -/* D1FC4 8013B8C4 00A0102D */ daddu $v0, $a1, $zero -/* D1FC8 8013B8C8 24A50008 */ addiu $a1, $a1, 8 -/* D1FCC 8013B8CC AC650000 */ sw $a1, ($v1) -/* D1FD0 8013B8D0 C6400038 */ lwc1 $f0, 0x38($s2) -/* D1FD4 8013B8D4 46800020 */ cvt.s.w $f0, $f0 -/* D1FD8 8013B8D8 AC460000 */ sw $a2, ($v0) -/* D1FDC 8013B8DC AC440004 */ sw $a0, 4($v0) -/* D1FE0 8013B8E0 24A20008 */ addiu $v0, $a1, 8 -/* D1FE4 8013B8E4 AC620000 */ sw $v0, ($v1) -/* D1FE8 8013B8E8 3C02FA00 */ lui $v0, 0xfa00 -/* D1FEC 8013B8EC ACA20000 */ sw $v0, ($a1) -/* D1FF0 8013B8F0 92430033 */ lbu $v1, 0x33($s2) -/* D1FF4 8013B8F4 46020002 */ mul.s $f0, $f0, $f2 -/* D1FF8 8013B8F8 00000000 */ nop -/* D1FFC 8013B8FC 00031600 */ sll $v0, $v1, 0x18 -/* D2000 8013B900 00032400 */ sll $a0, $v1, 0x10 -/* D2004 8013B904 00441025 */ or $v0, $v0, $a0 -/* D2008 8013B908 00031A00 */ sll $v1, $v1, 8 -/* D200C 8013B90C 00431025 */ or $v0, $v0, $v1 -/* D2010 8013B910 4600018D */ trunc.w.s $f6, $f0 -/* D2014 8013B914 44083000 */ mfc1 $t0, $f6 -/* D2018 8013B918 0804EEB8 */ j .L8013BAE0 -/* D201C 8013B91C 310300FF */ andi $v1, $t0, 0xff -.L8013B920: -/* D2020 8013B920 146B0022 */ bne $v1, $t3, .L8013B9AC -/* D2024 8013B924 24020002 */ addiu $v0, $zero, 2 -/* D2028 8013B928 3C06FCFF */ lui $a2, 0xfcff -/* D202C 8013B92C 34C697FF */ ori $a2, $a2, 0x97ff -/* D2030 8013B930 3C05FF2C */ lui $a1, 0xff2c -/* D2034 8013B934 34A5FE7F */ ori $a1, $a1, 0xfe7f -/* D2038 8013B938 3C07E200 */ lui $a3, 0xe200 -/* D203C 8013B93C 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D2040 8013B940 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* D2044 8013B944 8C830000 */ lw $v1, ($a0) -/* D2048 8013B948 34E71E01 */ ori $a3, $a3, 0x1e01 -/* D204C 8013B94C 0060102D */ daddu $v0, $v1, $zero -/* D2050 8013B950 24630008 */ addiu $v1, $v1, 8 -/* D2054 8013B954 AC830000 */ sw $v1, ($a0) -/* D2058 8013B958 C6400038 */ lwc1 $f0, 0x38($s2) -/* D205C 8013B95C 46800020 */ cvt.s.w $f0, $f0 -/* D2060 8013B960 AC460000 */ sw $a2, ($v0) -/* D2064 8013B964 AC450004 */ sw $a1, 4($v0) -/* D2068 8013B968 24620008 */ addiu $v0, $v1, 8 -/* D206C 8013B96C AC820000 */ sw $v0, ($a0) -/* D2070 8013B970 3C02FA00 */ lui $v0, 0xfa00 -/* D2074 8013B974 AC620000 */ sw $v0, ($v1) -/* D2078 8013B978 24620010 */ addiu $v0, $v1, 0x10 -/* D207C 8013B97C 46020002 */ mul.s $f0, $f0, $f2 -/* D2080 8013B980 00000000 */ nop -/* D2084 8013B984 AC820000 */ sw $v0, ($a0) -/* D2088 8013B988 24020003 */ addiu $v0, $zero, 3 -/* D208C 8013B98C AC670008 */ sw $a3, 8($v1) -/* D2090 8013B990 AC62000C */ sw $v0, 0xc($v1) -/* D2094 8013B994 4600018D */ trunc.w.s $f6, $f0 -/* D2098 8013B998 44083000 */ mfc1 $t0, $f6 -/* D209C 8013B99C 00000000 */ nop -/* D20A0 8013B9A0 310200FF */ andi $v0, $t0, 0xff -/* D20A4 8013B9A4 0804EEDA */ j .L8013BB68 -/* D20A8 8013B9A8 AC620004 */ sw $v0, 4($v1) -.L8013B9AC: -/* D20AC 8013B9AC 1462006E */ bne $v1, $v0, .L8013BB68 -/* D20B0 8013B9B0 00000000 */ nop -/* D20B4 8013B9B4 8E4A0038 */ lw $t2, 0x38($s2) -/* D20B8 8013B9B8 8E420030 */ lw $v0, 0x30($s2) -/* D20BC 8013B9BC 01424821 */ addu $t1, $t2, $v0 -/* D20C0 8013B9C0 29220100 */ slti $v0, $t1, 0x100 -/* D20C4 8013B9C4 50400001 */ beql $v0, $zero, .L8013B9CC -/* D20C8 8013B9C8 240900FF */ addiu $t1, $zero, 0xff -.L8013B9CC: -/* D20CC 8013B9CC 3C06FCFF */ lui $a2, 0xfcff -/* D20D0 8013B9D0 34C697FF */ ori $a2, $a2, 0x97ff -/* D20D4 8013B9D4 3C05FF2C */ lui $a1, 0xff2c -/* D20D8 8013B9D8 34A5FE7F */ ori $a1, $a1, 0xfe7f -/* D20DC 8013B9DC 3C07E300 */ lui $a3, 0xe300 -/* D20E0 8013B9E0 34E71A01 */ ori $a3, $a3, 0x1a01 -/* D20E4 8013B9E4 3C08E200 */ lui $t0, 0xe200 -/* D20E8 8013B9E8 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D20EC 8013B9EC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* D20F0 8013B9F0 35081E01 */ ori $t0, $t0, 0x1e01 -/* D20F4 8013B9F4 448A0000 */ mtc1 $t2, $f0 -/* D20F8 8013B9F8 00000000 */ nop -/* D20FC 8013B9FC 46800020 */ cvt.s.w $f0, $f0 -/* D2100 8013BA00 8C820000 */ lw $v0, ($a0) -/* D2104 8013BA04 46020002 */ mul.s $f0, $f0, $f2 -/* D2108 8013BA08 00000000 */ nop -/* D210C 8013BA0C 0040182D */ daddu $v1, $v0, $zero -/* D2110 8013BA10 24420008 */ addiu $v0, $v0, 8 -/* D2114 8013BA14 AC820000 */ sw $v0, ($a0) -/* D2118 8013BA18 AC660000 */ sw $a2, ($v1) -/* D211C 8013BA1C AC650004 */ sw $a1, 4($v1) -/* D2120 8013BA20 24430008 */ addiu $v1, $v0, 8 -/* D2124 8013BA24 AC830000 */ sw $v1, ($a0) -/* D2128 8013BA28 24030020 */ addiu $v1, $zero, 0x20 -/* D212C 8013BA2C AC430004 */ sw $v1, 4($v0) -/* D2130 8013BA30 24430010 */ addiu $v1, $v0, 0x10 -/* D2134 8013BA34 AC470000 */ sw $a3, ($v0) -/* D2138 8013BA38 AC830000 */ sw $v1, ($a0) -/* D213C 8013BA3C 24430018 */ addiu $v1, $v0, 0x18 -/* D2140 8013BA40 AC480008 */ sw $t0, 8($v0) -/* D2144 8013BA44 AC4B000C */ sw $t3, 0xc($v0) -/* D2148 8013BA48 AC830000 */ sw $v1, ($a0) -/* D214C 8013BA4C 3C03FA00 */ lui $v1, 0xfa00 -/* D2150 8013BA50 AC430010 */ sw $v1, 0x10($v0) -/* D2154 8013BA54 24430020 */ addiu $v1, $v0, 0x20 -/* D2158 8013BA58 AC830000 */ sw $v1, ($a0) -/* D215C 8013BA5C 3C03F900 */ lui $v1, 0xf900 -/* D2160 8013BA60 AC430018 */ sw $v1, 0x18($v0) -/* D2164 8013BA64 312300FF */ andi $v1, $t1, 0xff -/* D2168 8013BA68 AC43001C */ sw $v1, 0x1c($v0) -/* D216C 8013BA6C 4600018D */ trunc.w.s $f6, $f0 -/* D2170 8013BA70 44083000 */ mfc1 $t0, $f6 -/* D2174 8013BA74 00000000 */ nop -/* D2178 8013BA78 310300FF */ andi $v1, $t0, 0xff -/* D217C 8013BA7C 0804EEDA */ j .L8013BB68 -/* D2180 8013BA80 AC430014 */ sw $v1, 0x14($v0) -.L8013BA84_D2184: -/* D2184 8013BA84 3C06FCFF */ lui $a2, 0xfcff -/* D2188 8013BA88 34C6FFFF */ ori $a2, $a2, 0xffff -/* D218C 8013BA8C 3C04FFFD */ lui $a0, 0xfffd -.L8013BA90: -/* D2190 8013BA90 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D2194 8013BA94 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* D2198 8013BA98 8C650000 */ lw $a1, ($v1) -/* D219C 8013BA9C 3484F2F9 */ ori $a0, $a0, 0xf2f9 -/* D21A0 8013BAA0 00A0102D */ daddu $v0, $a1, $zero -/* D21A4 8013BAA4 24A50008 */ addiu $a1, $a1, 8 -/* D21A8 8013BAA8 AC650000 */ sw $a1, ($v1) -/* D21AC 8013BAAC AC460000 */ sw $a2, ($v0) -/* D21B0 8013BAB0 AC440004 */ sw $a0, 4($v0) -.L8013BAB4: -/* D21B4 8013BAB4 24A20008 */ addiu $v0, $a1, 8 -/* D21B8 8013BAB8 AC620000 */ sw $v0, ($v1) -/* D21BC 8013BABC 3C02FA00 */ lui $v0, 0xfa00 -/* D21C0 8013BAC0 ACA20000 */ sw $v0, ($a1) -/* D21C4 8013BAC4 9242002F */ lbu $v0, 0x2f($s2) -/* D21C8 8013BAC8 92440033 */ lbu $a0, 0x33($s2) -/* D21CC 8013BACC 92430037 */ lbu $v1, 0x37($s2) -/* D21D0 8013BAD0 00021600 */ sll $v0, $v0, 0x18 -/* D21D4 8013BAD4 00042400 */ sll $a0, $a0, 0x10 -/* D21D8 8013BAD8 00441025 */ or $v0, $v0, $a0 -/* D21DC 8013BADC 00031A00 */ sll $v1, $v1, 8 -.L8013BAE0: -/* D21E0 8013BAE0 00431025 */ or $v0, $v0, $v1 -/* D21E4 8013BAE4 0804EEDA */ j .L8013BB68 -/* D21E8 8013BAE8 ACA20004 */ sw $v0, 4($a1) -.L8013BAEC_D21EC: -/* D21EC 8013BAEC 3C06FCFF */ lui $a2, 0xfcff -/* D21F0 8013BAF0 34C6FFFF */ ori $a2, $a2, 0xffff -/* D21F4 8013BAF4 3C05FFFC */ lui $a1, 0xfffc -/* D21F8 8013BAF8 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D21FC 8013BAFC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* D2200 8013BB00 8C820000 */ lw $v0, ($a0) -/* D2204 8013BB04 34A5F279 */ ori $a1, $a1, 0xf279 -/* D2208 8013BB08 0040182D */ daddu $v1, $v0, $zero -/* D220C 8013BB0C 24420008 */ addiu $v0, $v0, 8 -/* D2210 8013BB10 AC820000 */ sw $v0, ($a0) -/* D2214 8013BB14 AC660000 */ sw $a2, ($v1) -/* D2218 8013BB18 0804EEDA */ j .L8013BB68 -/* D221C 8013BB1C AC650004 */ sw $a1, 4($v1) -.L8013BB20_D2220: -/* D2220 8013BB20 3C06FCFF */ lui $a2, 0xfcff -/* D2224 8013BB24 34C697FF */ ori $a2, $a2, 0x97ff -/* D2228 8013BB28 3C05FF2C */ lui $a1, 0xff2c -/* D222C 8013BB2C 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D2230 8013BB30 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* D2234 8013BB34 8C820000 */ lw $v0, ($a0) -/* D2238 8013BB38 34A5FE7F */ ori $a1, $a1, 0xfe7f -/* D223C 8013BB3C 0040182D */ daddu $v1, $v0, $zero -/* D2240 8013BB40 24420008 */ addiu $v0, $v0, 8 -/* D2244 8013BB44 AC820000 */ sw $v0, ($a0) -/* D2248 8013BB48 AC660000 */ sw $a2, ($v1) -/* D224C 8013BB4C AC650004 */ sw $a1, 4($v1) -/* D2250 8013BB50 24430008 */ addiu $v1, $v0, 8 -/* D2254 8013BB54 AC830000 */ sw $v1, ($a0) -/* D2258 8013BB58 3C03FA00 */ lui $v1, 0xfa00 -/* D225C 8013BB5C AC430000 */ sw $v1, ($v0) -/* D2260 8013BB60 92430033 */ lbu $v1, 0x33($s2) -.L8013BB64: -/* D2264 8013BB64 AC430004 */ sw $v1, 4($v0) -.L8013BB68: -/* D2268 8013BB68 92430001 */ lbu $v1, 1($s2) -/* D226C 8013BB6C 2C620005 */ sltiu $v0, $v1, 5 -/* D2270 8013BB70 10400024 */ beqz $v0, .L8013BC04 -/* D2274 8013BB74 00031080 */ sll $v0, $v1, 2 -/* D2278 8013BB78 3C018015 */ lui $at, %hi(jtbl_801510D0) -/* D227C 8013BB7C 00220821 */ addu $at, $at, $v0 -/* D2280 8013BB80 8C2210D0 */ lw $v0, %lo(jtbl_801510D0)($at) -/* D2284 8013BB84 00400008 */ jr $v0 -/* D2288 8013BB88 00000000 */ nop -.L8013BB8C_D228C: -/* D228C 8013BB8C 0240202D */ daddu $a0, $s2, $zero -/* D2290 8013BB90 0C04F3EA */ jal func_8013CFA8 -/* D2294 8013BB94 0260282D */ daddu $a1, $s3, $zero -/* D2298 8013BB98 0804EF01 */ j .L8013BC04 -/* D229C 8013BB9C 00000000 */ nop -.L8013BBA0_D22A0: -/* D22A0 8013BBA0 0240202D */ daddu $a0, $s2, $zero -/* D22A4 8013BBA4 0C04F6AD */ jal func_8013DAB4 -/* D22A8 8013BBA8 0260282D */ daddu $a1, $s3, $zero -/* D22AC 8013BBAC 0804EF01 */ j .L8013BC04 -/* D22B0 8013BBB0 00000000 */ nop -.L8013BBB4_D22B4: -/* D22B4 8013BBB4 0240202D */ daddu $a0, $s2, $zero -/* D22B8 8013BBB8 0C04F8BC */ jal func_8013E2F0 -/* D22BC 8013BBBC 0260282D */ daddu $a1, $s3, $zero -/* D22C0 8013BBC0 0804EF01 */ j .L8013BC04 -/* D22C4 8013BBC4 00000000 */ nop -.L8013BBC8_D22C8: -/* D22C8 8013BBC8 0240202D */ daddu $a0, $s2, $zero -/* D22CC 8013BBCC 0C04F3EA */ jal func_8013CFA8 -/* D22D0 8013BBD0 0260282D */ daddu $a1, $s3, $zero -/* D22D4 8013BBD4 0240202D */ daddu $a0, $s2, $zero -/* D22D8 8013BBD8 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* D22DC 8013BBDC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* D22E0 8013BBE0 8C620000 */ lw $v0, ($v1) -/* D22E4 8013BBE4 0260282D */ daddu $a1, $s3, $zero -/* D22E8 8013BBE8 0040302D */ daddu $a2, $v0, $zero -/* D22EC 8013BBEC 24420008 */ addiu $v0, $v0, 8 -/* D22F0 8013BBF0 AC620000 */ sw $v0, ($v1) -/* D22F4 8013BBF4 3C02E700 */ lui $v0, 0xe700 -/* D22F8 8013BBF8 ACC20000 */ sw $v0, ($a2) -/* D22FC 8013BBFC 0C04FA41 */ jal func_8013E904 -/* D2300 8013BC00 ACC00004 */ sw $zero, 4($a2) -.L8013BC04: -/* D2304 8013BC04 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* D2308 8013BC08 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) -/* D230C 8013BC0C 8CC50000 */ lw $a1, ($a2) -/* D2310 8013BC10 3C02E700 */ lui $v0, 0xe700 -/* D2314 8013BC14 00A0182D */ daddu $v1, $a1, $zero -/* D2318 8013BC18 24A50008 */ addiu $a1, $a1, 8 -/* D231C 8013BC1C ACC50000 */ sw $a1, ($a2) -/* D2320 8013BC20 AC620000 */ sw $v0, ($v1) -/* D2324 8013BC24 AC600004 */ sw $zero, 4($v1) -/* D2328 8013BC28 92430002 */ lbu $v1, 2($s2) -/* D232C 8013BC2C 2402000C */ addiu $v0, $zero, 0xc -/* D2330 8013BC30 1462000D */ bne $v1, $v0, .L8013BC68 -/* D2334 8013BC34 3C03E200 */ lui $v1, 0xe200 -/* D2338 8013BC38 34631E01 */ ori $v1, $v1, 0x1e01 -/* D233C 8013BC3C 3C04E300 */ lui $a0, 0xe300 -/* D2340 8013BC40 34841A01 */ ori $a0, $a0, 0x1a01 -/* D2344 8013BC44 24A20008 */ addiu $v0, $a1, 8 -/* D2348 8013BC48 ACC20000 */ sw $v0, ($a2) -/* D234C 8013BC4C 24A20010 */ addiu $v0, $a1, 0x10 -/* D2350 8013BC50 ACA30000 */ sw $v1, ($a1) -/* D2354 8013BC54 ACA00004 */ sw $zero, 4($a1) -/* D2358 8013BC58 ACC20000 */ sw $v0, ($a2) -/* D235C 8013BC5C 24020030 */ addiu $v0, $zero, 0x30 -/* D2360 8013BC60 ACA40008 */ sw $a0, 8($a1) -/* D2364 8013BC64 ACA2000C */ sw $v0, 0xc($a1) -.L8013BC68: -/* D2368 8013BC68 8FBF0020 */ lw $ra, 0x20($sp) -/* D236C 8013BC6C 8FB3001C */ lw $s3, 0x1c($sp) -/* D2370 8013BC70 8FB20018 */ lw $s2, 0x18($sp) -/* D2374 8013BC74 8FB10014 */ lw $s1, 0x14($sp) -/* D2378 8013BC78 8FB00010 */ lw $s0, 0x10($sp) -/* D237C 8013BC7C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D2380 8013BC80 03E00008 */ jr $ra -/* D2384 8013BC84 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013BC88.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013BC88.s deleted file mode 100644 index 9b25afa8ad..0000000000 --- a/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013BC88.s +++ /dev/null @@ -1,253 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8013BC88 -/* D2388 8013BC88 0080C02D */ daddu $t8, $a0, $zero -/* D238C 8013BC8C 3C068015 */ lui $a2, %hi(fold_currentImage) -/* D2390 8013BC90 24C6EE10 */ addiu $a2, $a2, %lo(fold_currentImage) -/* D2394 8013BC94 8CC40000 */ lw $a0, ($a2) -/* D2398 8013BC98 94830008 */ lhu $v1, 8($a0) -/* D239C 8013BC9C 24021000 */ addiu $v0, $zero, 0x1000 -/* D23A0 8013BCA0 14600002 */ bnez $v1, .L8013BCAC -/* D23A4 8013BCA4 0043001A */ div $zero, $v0, $v1 -/* D23A8 8013BCA8 0007000D */ break 7 -.L8013BCAC: -/* D23AC 8013BCAC 2401FFFF */ addiu $at, $zero, -1 -/* D23B0 8013BCB0 14610004 */ bne $v1, $at, .L8013BCC4 -/* D23B4 8013BCB4 3C018000 */ lui $at, 0x8000 -/* D23B8 8013BCB8 14410002 */ bne $v0, $at, .L8013BCC4 -/* D23BC 8013BCBC 00000000 */ nop -/* D23C0 8013BCC0 0006000D */ break 6 -.L8013BCC4: -/* D23C4 8013BCC4 00006812 */ mflo $t5 -/* D23C8 8013BCC8 9483000A */ lhu $v1, 0xa($a0) -/* D23CC 8013BCCC 006D102A */ slt $v0, $v1, $t5 -/* D23D0 8013BCD0 54400001 */ bnel $v0, $zero, .L8013BCD8 -/* D23D4 8013BCD4 0060682D */ daddu $t5, $v1, $zero -.L8013BCD8: -/* D23D8 8013BCD8 01A0502D */ daddu $t2, $t5, $zero -/* D23DC 8013BCDC 00C0782D */ daddu $t7, $a2, $zero -/* D23E0 8013BCE0 3C028015 */ lui $v0, %hi(fold_vtxCount) -/* D23E4 8013BCE4 2442EE14 */ addiu $v0, $v0, %lo(fold_vtxCount) -/* D23E8 8013BCE8 0040482D */ daddu $t1, $v0, $zero -/* D23EC 8013BCEC 3C068015 */ lui $a2, %hi(fold_vtxBuf) -/* D23F0 8013BCF0 24C66950 */ addiu $a2, $a2, %lo(fold_vtxBuf) -/* D23F4 8013BCF4 24072000 */ addiu $a3, $zero, 0x2000 -/* D23F8 8013BCF8 00C0602D */ daddu $t4, $a2, $zero -/* D23FC 8013BCFC 8488000E */ lh $t0, 0xe($a0) -/* D2400 8013BD00 848E000C */ lh $t6, 0xc($a0) -/* D2404 8013BD04 94430000 */ lhu $v1, ($v0) -/* D2408 8013BD08 00E0C82D */ daddu $t9, $a3, $zero -/* D240C 8013BD0C A7030008 */ sh $v1, 8($t8) -/* D2410 8013BD10 95220000 */ lhu $v0, ($t1) -/* D2414 8013BD14 8CC50000 */ lw $a1, ($a2) -/* D2418 8013BD18 95230000 */ lhu $v1, ($t1) -/* D241C 8013BD1C 00021100 */ sll $v0, $v0, 4 -/* D2420 8013BD20 00451021 */ addu $v0, $v0, $a1 -/* D2424 8013BD24 00031900 */ sll $v1, $v1, 4 -/* D2428 8013BD28 A44E0000 */ sh $t6, ($v0) -/* D242C 8013BD2C 95220000 */ lhu $v0, ($t1) -/* D2430 8013BD30 00651821 */ addu $v1, $v1, $a1 -/* D2434 8013BD34 A4680002 */ sh $t0, 2($v1) -/* D2438 8013BD38 95230000 */ lhu $v1, ($t1) -/* D243C 8013BD3C 00021100 */ sll $v0, $v0, 4 -/* D2440 8013BD40 00451021 */ addu $v0, $v0, $a1 -/* D2444 8013BD44 00031900 */ sll $v1, $v1, 4 -/* D2448 8013BD48 00651821 */ addu $v1, $v1, $a1 -/* D244C 8013BD4C A4400004 */ sh $zero, 4($v0) -/* D2450 8013BD50 95240000 */ lhu $a0, ($t1) -/* D2454 8013BD54 24022000 */ addiu $v0, $zero, 0x2000 -/* D2458 8013BD58 A4620008 */ sh $v0, 8($v1) -/* D245C 8013BD5C 95220000 */ lhu $v0, ($t1) -/* D2460 8013BD60 00042100 */ sll $a0, $a0, 4 -/* D2464 8013BD64 00852021 */ addu $a0, $a0, $a1 -/* D2468 8013BD68 00021100 */ sll $v0, $v0, 4 -/* D246C 8013BD6C 00451021 */ addu $v0, $v0, $a1 -/* D2470 8013BD70 A487000A */ sh $a3, 0xa($a0) -/* D2474 8013BD74 240400F0 */ addiu $a0, $zero, 0xf0 -/* D2478 8013BD78 A044000C */ sb $a0, 0xc($v0) -/* D247C 8013BD7C 95220000 */ lhu $v0, ($t1) -/* D2480 8013BD80 8CC30000 */ lw $v1, ($a2) -/* D2484 8013BD84 00021100 */ sll $v0, $v0, 4 -/* D2488 8013BD88 00431021 */ addu $v0, $v0, $v1 -/* D248C 8013BD8C A044000D */ sb $a0, 0xd($v0) -/* D2490 8013BD90 95220000 */ lhu $v0, ($t1) -/* D2494 8013BD94 8CC30000 */ lw $v1, ($a2) -/* D2498 8013BD98 00021100 */ sll $v0, $v0, 4 -/* D249C 8013BD9C 00431021 */ addu $v0, $v0, $v1 -/* D24A0 8013BDA0 A044000E */ sb $a0, 0xe($v0) -/* D24A4 8013BDA4 95240000 */ lhu $a0, ($t1) -/* D24A8 8013BDA8 8D850000 */ lw $a1, ($t4) -/* D24AC 8013BDAC 8DE60000 */ lw $a2, ($t7) -/* D24B0 8013BDB0 95230000 */ lhu $v1, ($t1) -/* D24B4 8013BDB4 00042100 */ sll $a0, $a0, 4 -/* D24B8 8013BDB8 00852021 */ addu $a0, $a0, $a1 -/* D24BC 8013BDBC 00031900 */ sll $v1, $v1, 4 -/* D24C0 8013BDC0 94C20008 */ lhu $v0, 8($a2) -/* D24C4 8013BDC4 00651821 */ addu $v1, $v1, $a1 -/* D24C8 8013BDC8 004E1021 */ addu $v0, $v0, $t6 -/* D24CC 8013BDCC A4820010 */ sh $v0, 0x10($a0) -/* D24D0 8013BDD0 95220000 */ lhu $v0, ($t1) -/* D24D4 8013BDD4 24040078 */ addiu $a0, $zero, 0x78 -/* D24D8 8013BDD8 A4680012 */ sh $t0, 0x12($v1) -/* D24DC 8013BDDC 95230000 */ lhu $v1, ($t1) -/* D24E0 8013BDE0 00021100 */ sll $v0, $v0, 4 -/* D24E4 8013BDE4 00451021 */ addu $v0, $v0, $a1 -/* D24E8 8013BDE8 00031900 */ sll $v1, $v1, 4 -/* D24EC 8013BDEC A4400014 */ sh $zero, 0x14($v0) -/* D24F0 8013BDF0 94C20008 */ lhu $v0, 8($a2) -/* D24F4 8013BDF4 00651821 */ addu $v1, $v1, $a1 -/* D24F8 8013BDF8 24420100 */ addiu $v0, $v0, 0x100 -/* D24FC 8013BDFC 00021140 */ sll $v0, $v0, 5 -/* D2500 8013BE00 A4620018 */ sh $v0, 0x18($v1) -/* D2504 8013BE04 95220000 */ lhu $v0, ($t1) -/* D2508 8013BE08 95230000 */ lhu $v1, ($t1) -/* D250C 8013BE0C 00021100 */ sll $v0, $v0, 4 -/* D2510 8013BE10 00451021 */ addu $v0, $v0, $a1 -/* D2514 8013BE14 00031900 */ sll $v1, $v1, 4 -/* D2518 8013BE18 00651821 */ addu $v1, $v1, $a1 -/* D251C 8013BE1C A447001A */ sh $a3, 0x1a($v0) -/* D2520 8013BE20 A064001C */ sb $a0, 0x1c($v1) -/* D2524 8013BE24 95220000 */ lhu $v0, ($t1) -/* D2528 8013BE28 8D830000 */ lw $v1, ($t4) -/* D252C 8013BE2C 00021100 */ sll $v0, $v0, 4 -/* D2530 8013BE30 00431021 */ addu $v0, $v0, $v1 -/* D2534 8013BE34 A044001D */ sb $a0, 0x1d($v0) -/* D2538 8013BE38 95220000 */ lhu $v0, ($t1) -/* D253C 8013BE3C 8D830000 */ lw $v1, ($t4) -/* D2540 8013BE40 00021100 */ sll $v0, $v0, 4 -/* D2544 8013BE44 00431021 */ addu $v0, $v0, $v1 -/* D2548 8013BE48 A044001E */ sb $a0, 0x1e($v0) -.L8013BE4C: -/* D254C 8013BE4C 000A3100 */ sll $a2, $t2, 4 -/* D2550 8013BE50 8DE20000 */ lw $v0, ($t7) -/* D2554 8013BE54 00CA3023 */ subu $a2, $a2, $t2 -/* D2558 8013BE58 9442000A */ lhu $v0, 0xa($v0) -/* D255C 8013BE5C 000630C0 */ sll $a2, $a2, 3 -/* D2560 8013BE60 14400002 */ bnez $v0, .L8013BE6C -/* D2564 8013BE64 00C2001A */ div $zero, $a2, $v0 -/* D2568 8013BE68 0007000D */ break 7 -.L8013BE6C: -/* D256C 8013BE6C 2401FFFF */ addiu $at, $zero, -1 -/* D2570 8013BE70 14410004 */ bne $v0, $at, .L8013BE84 -/* D2574 8013BE74 3C018000 */ lui $at, 0x8000 -/* D2578 8013BE78 14C10002 */ bne $a2, $at, .L8013BE84 -/* D257C 8013BE7C 00000000 */ nop -/* D2580 8013BE80 0006000D */ break 6 -.L8013BE84: -/* D2584 8013BE84 00003012 */ mflo $a2 -/* D2588 8013BE88 010D5823 */ subu $t3, $t0, $t5 -/* D258C 8013BE8C 25480100 */ addiu $t0, $t2, 0x100 -/* D2590 8013BE90 95220000 */ lhu $v0, ($t1) -/* D2594 8013BE94 00084140 */ sll $t0, $t0, 5 -/* D2598 8013BE98 24420002 */ addiu $v0, $v0, 2 -/* D259C 8013BE9C A5220000 */ sh $v0, ($t1) -/* D25A0 8013BEA0 3042FFFF */ andi $v0, $v0, 0xffff -/* D25A4 8013BEA4 00021100 */ sll $v0, $v0, 4 -/* D25A8 8013BEA8 8D850000 */ lw $a1, ($t4) -/* D25AC 8013BEAC 95230000 */ lhu $v1, ($t1) -/* D25B0 8013BEB0 00451021 */ addu $v0, $v0, $a1 -/* D25B4 8013BEB4 00031900 */ sll $v1, $v1, 4 -/* D25B8 8013BEB8 A44E0000 */ sh $t6, ($v0) -/* D25BC 8013BEBC 95220000 */ lhu $v0, ($t1) -/* D25C0 8013BEC0 00651821 */ addu $v1, $v1, $a1 -/* D25C4 8013BEC4 A46B0002 */ sh $t3, 2($v1) -/* D25C8 8013BEC8 95230000 */ lhu $v1, ($t1) -/* D25CC 8013BECC 00021100 */ sll $v0, $v0, 4 -/* D25D0 8013BED0 00451021 */ addu $v0, $v0, $a1 -/* D25D4 8013BED4 00031900 */ sll $v1, $v1, 4 -/* D25D8 8013BED8 A4400004 */ sh $zero, 4($v0) -/* D25DC 8013BEDC 95220000 */ lhu $v0, ($t1) -/* D25E0 8013BEE0 00651821 */ addu $v1, $v1, $a1 -/* D25E4 8013BEE4 A4790008 */ sh $t9, 8($v1) -/* D25E8 8013BEE8 00021100 */ sll $v0, $v0, 4 -/* D25EC 8013BEEC 00451021 */ addu $v0, $v0, $a1 -/* D25F0 8013BEF0 A448000A */ sh $t0, 0xa($v0) -/* D25F4 8013BEF4 95220000 */ lhu $v0, ($t1) -/* D25F8 8013BEF8 00021100 */ sll $v0, $v0, 4 -/* D25FC 8013BEFC 00451021 */ addu $v0, $v0, $a1 -/* D2600 8013BF00 24C40078 */ addiu $a0, $a2, 0x78 -/* D2604 8013BF04 A044000C */ sb $a0, 0xc($v0) -/* D2608 8013BF08 95220000 */ lhu $v0, ($t1) -/* D260C 8013BF0C 8D830000 */ lw $v1, ($t4) -/* D2610 8013BF10 00021100 */ sll $v0, $v0, 4 -/* D2614 8013BF14 00431021 */ addu $v0, $v0, $v1 -/* D2618 8013BF18 A044000D */ sb $a0, 0xd($v0) -/* D261C 8013BF1C 95220000 */ lhu $v0, ($t1) -/* D2620 8013BF20 8D830000 */ lw $v1, ($t4) -/* D2624 8013BF24 00021100 */ sll $v0, $v0, 4 -/* D2628 8013BF28 00431021 */ addu $v0, $v0, $v1 -/* D262C 8013BF2C A044000E */ sb $a0, 0xe($v0) -/* D2630 8013BF30 95240000 */ lhu $a0, ($t1) -/* D2634 8013BF34 8D850000 */ lw $a1, ($t4) -/* D2638 8013BF38 8DE70000 */ lw $a3, ($t7) -/* D263C 8013BF3C 95230000 */ lhu $v1, ($t1) -/* D2640 8013BF40 00042100 */ sll $a0, $a0, 4 -/* D2644 8013BF44 00852021 */ addu $a0, $a0, $a1 -/* D2648 8013BF48 94E20008 */ lhu $v0, 8($a3) -/* D264C 8013BF4C 00031900 */ sll $v1, $v1, 4 -/* D2650 8013BF50 004E1021 */ addu $v0, $v0, $t6 -/* D2654 8013BF54 A4820010 */ sh $v0, 0x10($a0) -/* D2658 8013BF58 95220000 */ lhu $v0, ($t1) -/* D265C 8013BF5C 00651821 */ addu $v1, $v1, $a1 -/* D2660 8013BF60 A46B0012 */ sh $t3, 0x12($v1) -/* D2664 8013BF64 95230000 */ lhu $v1, ($t1) -/* D2668 8013BF68 00021100 */ sll $v0, $v0, 4 -/* D266C 8013BF6C 00451021 */ addu $v0, $v0, $a1 -/* D2670 8013BF70 00031900 */ sll $v1, $v1, 4 -/* D2674 8013BF74 A4400014 */ sh $zero, 0x14($v0) -/* D2678 8013BF78 94E20008 */ lhu $v0, 8($a3) -/* D267C 8013BF7C 00651821 */ addu $v1, $v1, $a1 -/* D2680 8013BF80 24420100 */ addiu $v0, $v0, 0x100 -/* D2684 8013BF84 00021140 */ sll $v0, $v0, 5 -/* D2688 8013BF88 A4620018 */ sh $v0, 0x18($v1) -/* D268C 8013BF8C 95220000 */ lhu $v0, ($t1) -/* D2690 8013BF90 95230000 */ lhu $v1, ($t1) -/* D2694 8013BF94 00021100 */ sll $v0, $v0, 4 -/* D2698 8013BF98 00451021 */ addu $v0, $v0, $a1 -/* D269C 8013BF9C 00031900 */ sll $v1, $v1, 4 -/* D26A0 8013BFA0 00651821 */ addu $v1, $v1, $a1 -/* D26A4 8013BFA4 A448001A */ sh $t0, 0x1a($v0) -/* D26A8 8013BFA8 A066001C */ sb $a2, 0x1c($v1) -/* D26AC 8013BFAC 95220000 */ lhu $v0, ($t1) -/* D26B0 8013BFB0 8D830000 */ lw $v1, ($t4) -/* D26B4 8013BFB4 00021100 */ sll $v0, $v0, 4 -/* D26B8 8013BFB8 00431021 */ addu $v0, $v0, $v1 -/* D26BC 8013BFBC A046001D */ sb $a2, 0x1d($v0) -/* D26C0 8013BFC0 95220000 */ lhu $v0, ($t1) -/* D26C4 8013BFC4 8D830000 */ lw $v1, ($t4) -/* D26C8 8013BFC8 00021100 */ sll $v0, $v0, 4 -/* D26CC 8013BFCC 00431021 */ addu $v0, $v0, $v1 -/* D26D0 8013BFD0 A046001E */ sb $a2, 0x1e($v0) -/* D26D4 8013BFD4 8DE20000 */ lw $v0, ($t7) -/* D26D8 8013BFD8 9443000A */ lhu $v1, 0xa($v0) -/* D26DC 8013BFDC 15430005 */ bne $t2, $v1, .L8013BFF4 -/* D26E0 8013BFE0 014D1021 */ addu $v0, $t2, $t5 -/* D26E4 8013BFE4 95220000 */ lhu $v0, ($t1) -/* D26E8 8013BFE8 24420002 */ addiu $v0, $v0, 2 -/* D26EC 8013BFEC 0804F003 */ j .L8013C00C -/* D26F0 8013BFF0 A5220000 */ sh $v0, ($t1) -.L8013BFF4: -/* D26F4 8013BFF4 0062102A */ slt $v0, $v1, $v0 -/* D26F8 8013BFF8 10400002 */ beqz $v0, .L8013C004 -/* D26FC 8013BFFC 0160402D */ daddu $t0, $t3, $zero -/* D2700 8013C000 006A6823 */ subu $t5, $v1, $t2 -.L8013C004: -/* D2704 8013C004 0804EF93 */ j .L8013BE4C -/* D2708 8013C008 014D5021 */ addu $t2, $t2, $t5 -.L8013C00C: -/* D270C 8013C00C 3C028015 */ lui $v0, %hi(fold_vtxCount) -/* D2710 8013C010 9442EE14 */ lhu $v0, %lo(fold_vtxCount)($v0) -/* D2714 8013C014 97040008 */ lhu $a0, 8($t8) -/* D2718 8013C018 24030001 */ addiu $v1, $zero, 1 -/* D271C 8013C01C A3030003 */ sb $v1, 3($t8) -/* D2720 8013C020 2442FFFF */ addiu $v0, $v0, -1 -/* D2724 8013C024 A702000A */ sh $v0, 0xa($t8) -/* D2728 8013C028 3042FFFF */ andi $v0, $v0, 0xffff -/* D272C 8013C02C 00441023 */ subu $v0, $v0, $a0 -/* D2730 8013C030 2442FFFF */ addiu $v0, $v0, -1 -/* D2734 8013C034 00021FC2 */ srl $v1, $v0, 0x1f -/* D2738 8013C038 00431021 */ addu $v0, $v0, $v1 -/* D273C 8013C03C 00021043 */ sra $v0, $v0, 1 -/* D2740 8013C040 03E00008 */ jr $ra -/* D2744 8013C044 A3020004 */ sb $v0, 4($t8) diff --git a/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013CFA8.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013CFA8.s deleted file mode 100644 index 79f7908657..0000000000 --- a/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013CFA8.s +++ /dev/null @@ -1,746 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8013CFA8 -/* D36A8 8013CFA8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* D36AC 8013CFAC AFB10034 */ sw $s1, 0x34($sp) -/* D36B0 8013CFB0 0080882D */ daddu $s1, $a0, $zero -/* D36B4 8013CFB4 AFBF0054 */ sw $ra, 0x54($sp) -/* D36B8 8013CFB8 AFBE0050 */ sw $fp, 0x50($sp) -/* D36BC 8013CFBC AFB7004C */ sw $s7, 0x4c($sp) -/* D36C0 8013CFC0 AFB60048 */ sw $s6, 0x48($sp) -/* D36C4 8013CFC4 AFB50044 */ sw $s5, 0x44($sp) -/* D36C8 8013CFC8 AFB40040 */ sw $s4, 0x40($sp) -/* D36CC 8013CFCC AFB3003C */ sw $s3, 0x3c($sp) -/* D36D0 8013CFD0 AFB20038 */ sw $s2, 0x38($sp) -/* D36D4 8013CFD4 AFB00030 */ sw $s0, 0x30($sp) -/* D36D8 8013CFD8 AFA5005C */ sw $a1, 0x5c($sp) -/* D36DC 8013CFDC 8E220014 */ lw $v0, 0x14($s1) -/* D36E0 8013CFE0 30420020 */ andi $v0, $v0, 0x20 -/* D36E4 8013CFE4 14400030 */ bnez $v0, .L8013D0A8 -/* D36E8 8013CFE8 3C03E300 */ lui $v1, 0xe300 -/* D36EC 8013CFEC 34631001 */ ori $v1, $v1, 0x1001 -/* D36F0 8013CFF0 3C06F500 */ lui $a2, 0xf500 -/* D36F4 8013CFF4 34C60100 */ ori $a2, $a2, 0x100 -/* D36F8 8013CFF8 3C070703 */ lui $a3, 0x703 -/* D36FC 8013CFFC 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* D3700 8013D000 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* D3704 8013D004 8C820000 */ lw $v0, ($a0) -/* D3708 8013D008 34E7C000 */ ori $a3, $a3, 0xc000 -/* D370C 8013D00C 0040282D */ daddu $a1, $v0, $zero -/* D3710 8013D010 24420008 */ addiu $v0, $v0, 8 -/* D3714 8013D014 AC820000 */ sw $v0, ($a0) -/* D3718 8013D018 ACA30000 */ sw $v1, ($a1) -/* D371C 8013D01C 34038000 */ ori $v1, $zero, 0x8000 -/* D3720 8013D020 ACA30004 */ sw $v1, 4($a1) -/* D3724 8013D024 24430008 */ addiu $v1, $v0, 8 -/* D3728 8013D028 AC830000 */ sw $v1, ($a0) -/* D372C 8013D02C 3C058015 */ lui $a1, %hi(fold_currentImage) -/* D3730 8013D030 8CA5EE10 */ lw $a1, %lo(fold_currentImage)($a1) -/* D3734 8013D034 3C03FD10 */ lui $v1, 0xfd10 -/* D3738 8013D038 AC430000 */ sw $v1, ($v0) -/* D373C 8013D03C 24430010 */ addiu $v1, $v0, 0x10 -/* D3740 8013D040 AC830000 */ sw $v1, ($a0) -/* D3744 8013D044 8CA50004 */ lw $a1, 4($a1) -/* D3748 8013D048 3C03E800 */ lui $v1, 0xe800 -/* D374C 8013D04C AC430008 */ sw $v1, 8($v0) -/* D3750 8013D050 24430018 */ addiu $v1, $v0, 0x18 -/* D3754 8013D054 AC40000C */ sw $zero, 0xc($v0) -/* D3758 8013D058 AC830000 */ sw $v1, ($a0) -/* D375C 8013D05C 3C030700 */ lui $v1, 0x700 -/* D3760 8013D060 AC430014 */ sw $v1, 0x14($v0) -/* D3764 8013D064 24430020 */ addiu $v1, $v0, 0x20 -/* D3768 8013D068 AC460010 */ sw $a2, 0x10($v0) -/* D376C 8013D06C AC830000 */ sw $v1, ($a0) -/* D3770 8013D070 3C03E600 */ lui $v1, 0xe600 -/* D3774 8013D074 AC430018 */ sw $v1, 0x18($v0) -/* D3778 8013D078 24430028 */ addiu $v1, $v0, 0x28 -/* D377C 8013D07C AC40001C */ sw $zero, 0x1c($v0) -/* D3780 8013D080 AC830000 */ sw $v1, ($a0) -/* D3784 8013D084 3C03F000 */ lui $v1, 0xf000 -/* D3788 8013D088 AC430020 */ sw $v1, 0x20($v0) -/* D378C 8013D08C 24430030 */ addiu $v1, $v0, 0x30 -/* D3790 8013D090 AC470024 */ sw $a3, 0x24($v0) -/* D3794 8013D094 AC830000 */ sw $v1, ($a0) -/* D3798 8013D098 3C03E700 */ lui $v1, 0xe700 -/* D379C 8013D09C AC430028 */ sw $v1, 0x28($v0) -/* D37A0 8013D0A0 AC40002C */ sw $zero, 0x2c($v0) -/* D37A4 8013D0A4 AC450004 */ sw $a1, 4($v0) -.L8013D0A8: -/* D37A8 8013D0A8 96350008 */ lhu $s5, 8($s1) -/* D37AC 8013D0AC 3C180018 */ lui $t8, 0x18 -/* D37B0 8013D0B0 24160002 */ addiu $s6, $zero, 2 -/* D37B4 8013D0B4 3C10800A */ lui $s0, %hi(gMasterGfxPos) -/* D37B8 8013D0B8 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) -/* D37BC 8013D0BC 3C1EE700 */ lui $fp, 0xe700 -/* D37C0 8013D0C0 3C19800B */ lui $t9, %hi(gCameras) -/* D37C4 8013D0C4 27391D80 */ addiu $t9, $t9, %lo(gCameras) -/* D37C8 8013D0C8 3C13DC08 */ lui $s3, 0xdc08 -/* D37CC 8013D0CC 36730008 */ ori $s3, $s3, 8 -/* D37D0 8013D0D0 3C178015 */ lui $s7, %hi(D_8014EE50) -/* D37D4 8013D0D4 26F7EE50 */ addiu $s7, $s7, %lo(D_8014EE50) -/* D37D8 8013D0D8 3C14E200 */ lui $s4, 0xe200 -/* D37DC 8013D0DC 3694001C */ ori $s4, $s4, 0x1c -/* D37E0 8013D0E0 00159100 */ sll $s2, $s5, 4 -.L8013D0E4: -/* D37E4 8013D0E4 3C048015 */ lui $a0, %hi(fold_vtxBuf) -/* D37E8 8013D0E8 8C846950 */ lw $a0, %lo(fold_vtxBuf)($a0) -/* D37EC 8013D0EC 02442021 */ addu $a0, $s2, $a0 -/* D37F0 8013D0F0 94820008 */ lhu $v0, 8($a0) -/* D37F4 8013D0F4 9483000A */ lhu $v1, 0xa($a0) -/* D37F8 8013D0F8 00021400 */ sll $v0, $v0, 0x10 -/* D37FC 8013D0FC 00021543 */ sra $v0, $v0, 0x15 -/* D3800 8013D100 244CFF00 */ addiu $t4, $v0, -0x100 -/* D3804 8013D104 00031C00 */ sll $v1, $v1, 0x10 -/* D3808 8013D108 00031D43 */ sra $v1, $v1, 0x15 -/* D380C 8013D10C 246FFF00 */ addiu $t7, $v1, -0x100 -/* D3810 8013D110 94820038 */ lhu $v0, 0x38($a0) -/* D3814 8013D114 9483003A */ lhu $v1, 0x3a($a0) -/* D3818 8013D118 8E240014 */ lw $a0, 0x14($s1) -/* D381C 8013D11C 00021400 */ sll $v0, $v0, 0x10 -/* D3820 8013D120 00021543 */ sra $v0, $v0, 0x15 -/* D3824 8013D124 244DFF00 */ addiu $t5, $v0, -0x100 -/* D3828 8013D128 00031C00 */ sll $v1, $v1, 0x10 -/* D382C 8013D12C 00031D43 */ sra $v1, $v1, 0x15 -/* D3830 8013D130 30820020 */ andi $v0, $a0, 0x20 -/* D3834 8013D134 14400200 */ bnez $v0, .L8013D938 -/* D3838 8013D138 246EFF00 */ addiu $t6, $v1, -0x100 -/* D383C 8013D13C 3C028015 */ lui $v0, %hi(D_80151328) -/* D3840 8013D140 8C421328 */ lw $v0, %lo(D_80151328)($v0) -/* D3844 8013D144 94420000 */ lhu $v0, ($v0) -/* D3848 8013D148 30420001 */ andi $v0, $v0, 1 -/* D384C 8013D14C 104000FE */ beqz $v0, .L8013D548 -/* D3850 8013D150 3C06070A */ lui $a2, 0x70a -/* D3854 8013D154 92220000 */ lbu $v0, ($s1) -/* D3858 8013D158 104000FB */ beqz $v0, .L8013D548 -/* D385C 8013D15C 00981024 */ and $v0, $a0, $t8 -/* D3860 8013D160 104000FA */ beqz $v0, .L8013D54C -/* D3864 8013D164 34C60280 */ ori $a2, $a2, 0x280 -/* D3868 8013D168 92230002 */ lbu $v1, 2($s1) -/* D386C 8013D16C 10600008 */ beqz $v1, .L8013D190 -/* D3870 8013D170 3C07070A */ lui $a3, 0x70a -/* D3874 8013D174 10760006 */ beq $v1, $s6, .L8013D190 -/* D3878 8013D178 2402000F */ addiu $v0, $zero, 0xf -/* D387C 8013D17C 10620004 */ beq $v1, $v0, .L8013D190 -/* D3880 8013D180 24020007 */ addiu $v0, $zero, 7 -/* D3884 8013D184 146200F0 */ bne $v1, $v0, .L8013D548 -/* D3888 8013D188 3C06070A */ lui $a2, 0x70a -/* D388C 8013D18C 3C07070A */ lui $a3, 0x70a -.L8013D190: -/* D3890 8013D190 34E70280 */ ori $a3, $a3, 0x280 -/* D3894 8013D194 3C08010A */ lui $t0, 0x10a -/* D3898 8013D198 35080280 */ ori $t0, $t0, 0x280 -/* D389C 8013D19C 3C0A001A */ lui $t2, 0x1a -/* D38A0 8013D1A0 354A0280 */ ori $t2, $t2, 0x280 -/* D38A4 8013D1A4 3C09F510 */ lui $t1, 0xf510 -/* D38A8 8013D1A8 35290900 */ ori $t1, $t1, 0x900 -/* D38AC 8013D1AC 3C0B020F */ lui $t3, 0x20f -/* D38B0 8013D1B0 356BC000 */ ori $t3, $t3, 0xc000 -/* D38B4 8013D1B4 AFAA0028 */ sw $t2, 0x28($sp) -/* D38B8 8013D1B8 8E050000 */ lw $a1, ($s0) -/* D38BC 8013D1BC 3C0AF200 */ lui $t2, 0xf200 -/* D38C0 8013D1C0 00A0302D */ daddu $a2, $a1, $zero -/* D38C4 8013D1C4 24A50008 */ addiu $a1, $a1, 8 -/* D38C8 8013D1C8 24A20008 */ addiu $v0, $a1, 8 -/* D38CC 8013D1CC AE050000 */ sw $a1, ($s0) -/* D38D0 8013D1D0 AE020000 */ sw $v0, ($s0) -/* D38D4 8013D1D4 24A20010 */ addiu $v0, $a1, 0x10 -/* D38D8 8013D1D8 AE020000 */ sw $v0, ($s0) -/* D38DC 8013D1DC 24A20018 */ addiu $v0, $a1, 0x18 -/* D38E0 8013D1E0 AE020000 */ sw $v0, ($s0) -/* D38E4 8013D1E4 24A20020 */ addiu $v0, $a1, 0x20 -/* D38E8 8013D1E8 AE020000 */ sw $v0, ($s0) -/* D38EC 8013D1EC 24A20028 */ addiu $v0, $a1, 0x28 -/* D38F0 8013D1F0 AE020000 */ sw $v0, ($s0) -/* D38F4 8013D1F4 24A20030 */ addiu $v0, $a1, 0x30 -/* D38F8 8013D1F8 AE020000 */ sw $v0, ($s0) -/* D38FC 8013D1FC 3C048015 */ lui $a0, %hi(fold_currentImage) -/* D3900 8013D200 8C84EE10 */ lw $a0, %lo(fold_currentImage)($a0) -/* D3904 8013D204 24A20038 */ addiu $v0, $a1, 0x38 -/* D3908 8013D208 AE020000 */ sw $v0, ($s0) -/* D390C 8013D20C 94820008 */ lhu $v0, 8($a0) -/* D3910 8013D210 24A30040 */ addiu $v1, $a1, 0x40 -/* D3914 8013D214 AE030000 */ sw $v1, ($s0) -/* D3918 8013D218 3C03FD48 */ lui $v1, 0xfd48 -/* D391C 8013D21C 00021042 */ srl $v0, $v0, 1 -/* D3920 8013D220 2442FFFF */ addiu $v0, $v0, -1 -/* D3924 8013D224 30420FFF */ andi $v0, $v0, 0xfff -/* D3928 8013D228 00431025 */ or $v0, $v0, $v1 -/* D392C 8013D22C ACC20000 */ sw $v0, ($a2) -/* D3930 8013D230 8C830000 */ lw $v1, ($a0) -/* D3934 8013D234 24A20048 */ addiu $v0, $a1, 0x48 -/* D3938 8013D238 AE020000 */ sw $v0, ($s0) -/* D393C 8013D23C 3C02F548 */ lui $v0, 0xf548 -/* D3940 8013D240 3C04F400 */ lui $a0, 0xf400 -/* D3944 8013D244 ACC30004 */ sw $v1, 4($a2) -/* D3948 8013D248 01AC3023 */ subu $a2, $t5, $t4 -/* D394C 8013D24C 00063043 */ sra $a2, $a2, 1 -/* D3950 8013D250 24C60007 */ addiu $a2, $a2, 7 -/* D3954 8013D254 000630C3 */ sra $a2, $a2, 3 -/* D3958 8013D258 30C601FF */ andi $a2, $a2, 0x1ff -/* D395C 8013D25C 00063240 */ sll $a2, $a2, 9 -/* D3960 8013D260 00C21025 */ or $v0, $a2, $v0 -/* D3964 8013D264 ACA20000 */ sw $v0, ($a1) -/* D3968 8013D268 3C02E600 */ lui $v0, 0xe600 -/* D396C 8013D26C 000C1840 */ sll $v1, $t4, 1 -/* D3970 8013D270 30630FFF */ andi $v1, $v1, 0xfff -/* D3974 8013D274 00031B00 */ sll $v1, $v1, 0xc -/* D3978 8013D278 ACA20008 */ sw $v0, 8($a1) -/* D397C 8013D27C 000F1080 */ sll $v0, $t7, 2 -/* D3980 8013D280 30420FFF */ andi $v0, $v0, 0xfff -/* D3984 8013D284 00441025 */ or $v0, $v0, $a0 -/* D3988 8013D288 00621825 */ or $v1, $v1, $v0 -/* D398C 8013D28C ACA30010 */ sw $v1, 0x10($a1) -/* D3990 8013D290 25A3FFFF */ addiu $v1, $t5, -1 -/* D3994 8013D294 00031840 */ sll $v1, $v1, 1 -/* D3998 8013D298 30630FFF */ andi $v1, $v1, 0xfff -/* D399C 8013D29C 00031B00 */ sll $v1, $v1, 0xc -/* D39A0 8013D2A0 25C2FFFF */ addiu $v0, $t6, -1 -/* D39A4 8013D2A4 00021080 */ sll $v0, $v0, 2 -/* D39A8 8013D2A8 30420FFF */ andi $v0, $v0, 0xfff -/* D39AC 8013D2AC 3C040700 */ lui $a0, 0x700 -/* D39B0 8013D2B0 00441025 */ or $v0, $v0, $a0 -/* D39B4 8013D2B4 00621825 */ or $v1, $v1, $v0 -/* D39B8 8013D2B8 3C02F540 */ lui $v0, 0xf540 -/* D39BC 8013D2BC 00C23025 */ or $a2, $a2, $v0 -/* D39C0 8013D2C0 ACA30014 */ sw $v1, 0x14($a1) -/* D39C4 8013D2C4 25830100 */ addiu $v1, $t4, 0x100 -/* D39C8 8013D2C8 00031880 */ sll $v1, $v1, 2 -/* D39CC 8013D2CC 30630FFF */ andi $v1, $v1, 0xfff -/* D39D0 8013D2D0 00031B00 */ sll $v1, $v1, 0xc -/* D39D4 8013D2D4 25E20100 */ addiu $v0, $t7, 0x100 -/* D39D8 8013D2D8 00021080 */ sll $v0, $v0, 2 -/* D39DC 8013D2DC 30420FFF */ andi $v0, $v0, 0xfff -/* D39E0 8013D2E0 004A1025 */ or $v0, $v0, $t2 -/* D39E4 8013D2E4 00621825 */ or $v1, $v1, $v0 -/* D39E8 8013D2E8 ACA30028 */ sw $v1, 0x28($a1) -/* D39EC 8013D2EC 25A300FF */ addiu $v1, $t5, 0xff -/* D39F0 8013D2F0 00031880 */ sll $v1, $v1, 2 -/* D39F4 8013D2F4 30630FFF */ andi $v1, $v1, 0xfff -/* D39F8 8013D2F8 00031B00 */ sll $v1, $v1, 0xc -/* D39FC 8013D2FC 25C200FF */ addiu $v0, $t6, 0xff -/* D3A00 8013D300 00021080 */ sll $v0, $v0, 2 -/* D3A04 8013D304 30420FFF */ andi $v0, $v0, 0xfff -/* D3A08 8013D308 3C040100 */ lui $a0, 0x100 -/* D3A0C 8013D30C 00441025 */ or $v0, $v0, $a0 -/* D3A10 8013D310 00621825 */ or $v1, $v1, $v0 -/* D3A14 8013D314 ACA70004 */ sw $a3, 4($a1) -/* D3A18 8013D318 ACA0000C */ sw $zero, 0xc($a1) -/* D3A1C 8013D31C ACBE0018 */ sw $fp, 0x18($a1) -/* D3A20 8013D320 ACA0001C */ sw $zero, 0x1c($a1) -/* D3A24 8013D324 ACA60020 */ sw $a2, 0x20($a1) -/* D3A28 8013D328 ACA80024 */ sw $t0, 0x24($a1) -/* D3A2C 8013D32C ACA3002C */ sw $v1, 0x2c($a1) -/* D3A30 8013D330 ACA60030 */ sw $a2, 0x30($a1) -/* D3A34 8013D334 8FAA0028 */ lw $t2, 0x28($sp) -/* D3A38 8013D338 3C020200 */ lui $v0, 0x200 -/* D3A3C 8013D33C ACAA0034 */ sw $t2, 0x34($a1) -/* D3A40 8013D340 3C0AF200 */ lui $t2, 0xf200 -/* D3A44 8013D344 ACA90038 */ sw $t1, 0x38($a1) -/* D3A48 8013D348 ACA2003C */ sw $v0, 0x3c($a1) -/* D3A4C 8013D34C ACAA0040 */ sw $t2, 0x40($a1) -/* D3A50 8013D350 ACAB0044 */ sw $t3, 0x44($a1) -/* D3A54 8013D354 92230002 */ lbu $v1, 2($s1) -/* D3A58 8013D358 10760008 */ beq $v1, $s6, .L8013D37C -/* D3A5C 8013D35C 240800FF */ addiu $t0, $zero, 0xff -/* D3A60 8013D360 28620003 */ slti $v0, $v1, 3 -/* D3A64 8013D364 14400008 */ bnez $v0, .L8013D388 -/* D3A68 8013D368 24020007 */ addiu $v0, $zero, 7 -/* D3A6C 8013D36C 10620005 */ beq $v1, $v0, .L8013D384 -/* D3A70 8013D370 2402000F */ addiu $v0, $zero, 0xf -/* D3A74 8013D374 14620004 */ bne $v1, $v0, .L8013D388 -/* D3A78 8013D378 00000000 */ nop -.L8013D37C: -/* D3A7C 8013D37C 0804F4E2 */ j .L8013D388 -/* D3A80 8013D380 8E280038 */ lw $t0, 0x38($s1) -.L8013D384: -/* D3A84 8013D384 2408FFFF */ addiu $t0, $zero, -1 -.L8013D388: -/* D3A88 8013D388 3C028015 */ lui $v0, %hi(D_80151328) -/* D3A8C 8013D38C 8C421328 */ lw $v0, %lo(D_80151328)($v0) -/* D3A90 8013D390 94420000 */ lhu $v0, ($v0) -/* D3A94 8013D394 30420002 */ andi $v0, $v0, 2 -/* D3A98 8013D398 1040005E */ beqz $v0, .L8013D514 -/* D3A9C 8013D39C 0180282D */ daddu $a1, $t4, $zero -/* D3AA0 8013D3A0 3C028015 */ lui $v0, %hi(D_80156954) -/* D3AA4 8013D3A4 8C426954 */ lw $v0, %lo(D_80156954)($v0) -/* D3AA8 8013D3A8 90420000 */ lbu $v0, ($v0) -/* D3AAC 8013D3AC 1040005A */ beqz $v0, .L8013D518 -/* D3AB0 8013D3B0 01E0302D */ daddu $a2, $t7, $zero -/* D3AB4 8013D3B4 8E220014 */ lw $v0, 0x14($s1) -/* D3AB8 8013D3B8 00581024 */ and $v0, $v0, $t8 -/* D3ABC 8013D3BC 50400057 */ beql $v0, $zero, .L8013D51C -/* D3AC0 8013D3C0 AFAE0010 */ sw $t6, 0x10($sp) -/* D3AC4 8013D3C4 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* D3AC8 8013D3C8 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* D3ACC 8013D3CC 00031080 */ sll $v0, $v1, 2 -/* D3AD0 8013D3D0 00431021 */ addu $v0, $v0, $v1 -/* D3AD4 8013D3D4 00021080 */ sll $v0, $v0, 2 -/* D3AD8 8013D3D8 00431023 */ subu $v0, $v0, $v1 -/* D3ADC 8013D3DC 000218C0 */ sll $v1, $v0, 3 -/* D3AE0 8013D3E0 00431021 */ addu $v0, $v0, $v1 -/* D3AE4 8013D3E4 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D3AE8 8013D3E8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D3AEC 8013D3EC 000210C0 */ sll $v0, $v0, 3 -/* D3AF0 8013D3F0 80630070 */ lb $v1, 0x70($v1) -/* D3AF4 8013D3F4 14760008 */ bne $v1, $s6, .L8013D418 -/* D3AF8 8013D3F8 00592021 */ addu $a0, $v0, $t9 -/* D3AFC 8013D3FC 8E020000 */ lw $v0, ($s0) -/* D3B00 8013D400 0040182D */ daddu $v1, $v0, $zero -/* D3B04 8013D404 24420008 */ addiu $v0, $v0, 8 -/* D3B08 8013D408 AE020000 */ sw $v0, ($s0) -/* D3B0C 8013D40C AC730000 */ sw $s3, ($v1) -/* D3B10 8013D410 0804F50D */ j .L8013D434 -/* D3B14 8013D414 AC770004 */ sw $s7, 4($v1) -.L8013D418: -/* D3B18 8013D418 8E020000 */ lw $v0, ($s0) -/* D3B1C 8013D41C 0040182D */ daddu $v1, $v0, $zero -/* D3B20 8013D420 24420008 */ addiu $v0, $v0, 8 -/* D3B24 8013D424 AE020000 */ sw $v0, ($s0) -/* D3B28 8013D428 248200B0 */ addiu $v0, $a0, 0xb0 -/* D3B2C 8013D42C AC730000 */ sw $s3, ($v1) -/* D3B30 8013D430 AC620004 */ sw $v0, 4($v1) -.L8013D434: -/* D3B34 8013D434 8E050000 */ lw $a1, ($s0) -/* D3B38 8013D438 00A0202D */ daddu $a0, $a1, $zero -/* D3B3C 8013D43C 24A50008 */ addiu $a1, $a1, 8 -/* D3B40 8013D440 AE050000 */ sw $a1, ($s0) -/* D3B44 8013D444 AC940000 */ sw $s4, ($a0) -/* D3B48 8013D448 8E220078 */ lw $v0, 0x78($s1) -/* D3B4C 8013D44C 3C030C08 */ lui $v1, 0xc08 -/* D3B50 8013D450 00431025 */ or $v0, $v0, $v1 -/* D3B54 8013D454 AC820004 */ sw $v0, 4($a0) -/* D3B58 8013D458 2402FFFF */ addiu $v0, $zero, -1 -/* D3B5C 8013D45C 15020009 */ bne $t0, $v0, .L8013D484 -/* D3B60 8013D460 3C03FCFF */ lui $v1, 0xfcff -/* D3B64 8013D464 3C02FCFF */ lui $v0, 0xfcff -/* D3B68 8013D468 3442C5FF */ ori $v0, $v0, 0xc5ff -/* D3B6C 8013D46C 24A30008 */ addiu $v1, $a1, 8 -/* D3B70 8013D470 AE030000 */ sw $v1, ($s0) -/* D3B74 8013D474 ACA20000 */ sw $v0, ($a1) -/* D3B78 8013D478 2402FFF8 */ addiu $v0, $zero, -8 -/* D3B7C 8013D47C 0804F52D */ j .L8013D4B4 -/* D3B80 8013D480 ACA20004 */ sw $v0, 4($a1) -.L8013D484: -/* D3B84 8013D484 3463D5FF */ ori $v1, $v1, 0xd5ff -/* D3B88 8013D488 24A20008 */ addiu $v0, $a1, 8 -/* D3B8C 8013D48C AE020000 */ sw $v0, ($s0) -/* D3B90 8013D490 3C02FB00 */ lui $v0, 0xfb00 -/* D3B94 8013D494 ACA20000 */ sw $v0, ($a1) -/* D3B98 8013D498 310200FF */ andi $v0, $t0, 0xff -/* D3B9C 8013D49C ACA20004 */ sw $v0, 4($a1) -/* D3BA0 8013D4A0 24A20010 */ addiu $v0, $a1, 0x10 -/* D3BA4 8013D4A4 AE020000 */ sw $v0, ($s0) -/* D3BA8 8013D4A8 2402FFF8 */ addiu $v0, $zero, -8 -/* D3BAC 8013D4AC ACA30008 */ sw $v1, 8($a1) -/* D3BB0 8013D4B0 ACA2000C */ sw $v0, 0xc($a1) -.L8013D4B4: -/* D3BB4 8013D4B4 3C050100 */ lui $a1, 0x100 -/* D3BB8 8013D4B8 34A54008 */ ori $a1, $a1, 0x4008 -/* D3BBC 8013D4BC 3C070600 */ lui $a3, 0x600 -/* D3BC0 8013D4C0 34E70402 */ ori $a3, $a3, 0x402 -/* D3BC4 8013D4C4 3C060002 */ lui $a2, 2 -/* D3BC8 8013D4C8 34C60406 */ ori $a2, $a2, 0x406 -/* D3BCC 8013D4CC 8E030000 */ lw $v1, ($s0) -/* D3BD0 8013D4D0 3C028015 */ lui $v0, %hi(fold_vtxBuf) -/* D3BD4 8013D4D4 8C426950 */ lw $v0, %lo(fold_vtxBuf)($v0) -/* D3BD8 8013D4D8 0060202D */ daddu $a0, $v1, $zero -/* D3BDC 8013D4DC 24630008 */ addiu $v1, $v1, 8 -/* D3BE0 8013D4E0 00521021 */ addu $v0, $v0, $s2 -/* D3BE4 8013D4E4 AE030000 */ sw $v1, ($s0) -/* D3BE8 8013D4E8 AC820004 */ sw $v0, 4($a0) -/* D3BEC 8013D4EC 24620008 */ addiu $v0, $v1, 8 -/* D3BF0 8013D4F0 AC850000 */ sw $a1, ($a0) -/* D3BF4 8013D4F4 AE020000 */ sw $v0, ($s0) -/* D3BF8 8013D4F8 24620010 */ addiu $v0, $v1, 0x10 -/* D3BFC 8013D4FC AC670000 */ sw $a3, ($v1) -/* D3C00 8013D500 AC660004 */ sw $a2, 4($v1) -/* D3C04 8013D504 AE020000 */ sw $v0, ($s0) -/* D3C08 8013D508 AC7E0008 */ sw $fp, 8($v1) -/* D3C0C 8013D50C AC60000C */ sw $zero, 0xc($v1) -/* D3C10 8013D510 0180282D */ daddu $a1, $t4, $zero -.L8013D514: -/* D3C14 8013D514 01E0302D */ daddu $a2, $t7, $zero -.L8013D518: -/* D3C18 8013D518 AFAE0010 */ sw $t6, 0x10($sp) -.L8013D51C: -/* D3C1C 8013D51C AFA80014 */ sw $t0, 0x14($sp) -/* D3C20 8013D520 8E220078 */ lw $v0, 0x78($s1) -/* D3C24 8013D524 8FA4005C */ lw $a0, 0x5c($sp) -/* D3C28 8013D528 01A0382D */ daddu $a3, $t5, $zero -/* D3C2C 8013D52C AFB80020 */ sw $t8, 0x20($sp) -/* D3C30 8013D530 AFB90024 */ sw $t9, 0x24($sp) -/* D3C34 8013D534 0C052071 */ jal render_shaded_sprite -/* D3C38 8013D538 AFA20018 */ sw $v0, 0x18($sp) -/* D3C3C 8013D53C 8FB80020 */ lw $t8, 0x20($sp) -/* D3C40 8013D540 0804F64E */ j .L8013D938 -/* D3C44 8013D544 8FB90024 */ lw $t9, 0x24($sp) -.L8013D548: -/* D3C48 8013D548 34C60280 */ ori $a2, $a2, 0x280 -.L8013D54C: -/* D3C4C 8013D54C 3C07000A */ lui $a3, 0xa -/* D3C50 8013D550 34E70280 */ ori $a3, $a3, 0x280 -/* D3C54 8013D554 8E080000 */ lw $t0, ($s0) -/* D3C58 8013D558 3C0AF200 */ lui $t2, 0xf200 -/* D3C5C 8013D55C 0100282D */ daddu $a1, $t0, $zero -/* D3C60 8013D560 25080008 */ addiu $t0, $t0, 8 -/* D3C64 8013D564 25020008 */ addiu $v0, $t0, 8 -/* D3C68 8013D568 AE080000 */ sw $t0, ($s0) -/* D3C6C 8013D56C AE020000 */ sw $v0, ($s0) -/* D3C70 8013D570 25020010 */ addiu $v0, $t0, 0x10 -/* D3C74 8013D574 AE020000 */ sw $v0, ($s0) -/* D3C78 8013D578 3C048015 */ lui $a0, %hi(fold_currentImage) -/* D3C7C 8013D57C 8C84EE10 */ lw $a0, %lo(fold_currentImage)($a0) -/* D3C80 8013D580 25020018 */ addiu $v0, $t0, 0x18 -/* D3C84 8013D584 AE020000 */ sw $v0, ($s0) -/* D3C88 8013D588 94820008 */ lhu $v0, 8($a0) -/* D3C8C 8013D58C 25030020 */ addiu $v1, $t0, 0x20 -/* D3C90 8013D590 AE030000 */ sw $v1, ($s0) -/* D3C94 8013D594 3C03FD48 */ lui $v1, 0xfd48 -/* D3C98 8013D598 00021042 */ srl $v0, $v0, 1 -/* D3C9C 8013D59C 2442FFFF */ addiu $v0, $v0, -1 -/* D3CA0 8013D5A0 30420FFF */ andi $v0, $v0, 0xfff -/* D3CA4 8013D5A4 00431025 */ or $v0, $v0, $v1 -/* D3CA8 8013D5A8 ACA20000 */ sw $v0, ($a1) -/* D3CAC 8013D5AC 8C830000 */ lw $v1, ($a0) -/* D3CB0 8013D5B0 25020028 */ addiu $v0, $t0, 0x28 -/* D3CB4 8013D5B4 AE020000 */ sw $v0, ($s0) -/* D3CB8 8013D5B8 3C02F548 */ lui $v0, 0xf548 -/* D3CBC 8013D5BC 3C04F400 */ lui $a0, 0xf400 -/* D3CC0 8013D5C0 ACA30004 */ sw $v1, 4($a1) -/* D3CC4 8013D5C4 01AC2823 */ subu $a1, $t5, $t4 -/* D3CC8 8013D5C8 00052843 */ sra $a1, $a1, 1 -/* D3CCC 8013D5CC 24A50007 */ addiu $a1, $a1, 7 -/* D3CD0 8013D5D0 000528C3 */ sra $a1, $a1, 3 -/* D3CD4 8013D5D4 30A501FF */ andi $a1, $a1, 0x1ff -/* D3CD8 8013D5D8 00052A40 */ sll $a1, $a1, 9 -/* D3CDC 8013D5DC 00A21025 */ or $v0, $a1, $v0 -/* D3CE0 8013D5E0 AD020000 */ sw $v0, ($t0) -/* D3CE4 8013D5E4 3C02E600 */ lui $v0, 0xe600 -/* D3CE8 8013D5E8 000C1840 */ sll $v1, $t4, 1 -/* D3CEC 8013D5EC 30630FFF */ andi $v1, $v1, 0xfff -/* D3CF0 8013D5F0 00031B00 */ sll $v1, $v1, 0xc -/* D3CF4 8013D5F4 AD020008 */ sw $v0, 8($t0) -/* D3CF8 8013D5F8 000F1080 */ sll $v0, $t7, 2 -/* D3CFC 8013D5FC 30420FFF */ andi $v0, $v0, 0xfff -/* D3D00 8013D600 00441025 */ or $v0, $v0, $a0 -/* D3D04 8013D604 00621825 */ or $v1, $v1, $v0 -/* D3D08 8013D608 AD030010 */ sw $v1, 0x10($t0) -/* D3D0C 8013D60C 25A3FFFF */ addiu $v1, $t5, -1 -/* D3D10 8013D610 00031840 */ sll $v1, $v1, 1 -/* D3D14 8013D614 30630FFF */ andi $v1, $v1, 0xfff -/* D3D18 8013D618 00031B00 */ sll $v1, $v1, 0xc -/* D3D1C 8013D61C 25C2FFFF */ addiu $v0, $t6, -1 -/* D3D20 8013D620 00021080 */ sll $v0, $v0, 2 -/* D3D24 8013D624 30420FFF */ andi $v0, $v0, 0xfff -/* D3D28 8013D628 3C040700 */ lui $a0, 0x700 -/* D3D2C 8013D62C 00441025 */ or $v0, $v0, $a0 -/* D3D30 8013D630 00621825 */ or $v1, $v1, $v0 -/* D3D34 8013D634 3C02F540 */ lui $v0, 0xf540 -/* D3D38 8013D638 00A22825 */ or $a1, $a1, $v0 -/* D3D3C 8013D63C AD030014 */ sw $v1, 0x14($t0) -/* D3D40 8013D640 25830100 */ addiu $v1, $t4, 0x100 -/* D3D44 8013D644 00031880 */ sll $v1, $v1, 2 -/* D3D48 8013D648 30630FFF */ andi $v1, $v1, 0xfff -/* D3D4C 8013D64C 00031B00 */ sll $v1, $v1, 0xc -/* D3D50 8013D650 25E20100 */ addiu $v0, $t7, 0x100 -/* D3D54 8013D654 00021080 */ sll $v0, $v0, 2 -/* D3D58 8013D658 30420FFF */ andi $v0, $v0, 0xfff -/* D3D5C 8013D65C 004A1025 */ or $v0, $v0, $t2 -/* D3D60 8013D660 00621825 */ or $v1, $v1, $v0 -/* D3D64 8013D664 AD030028 */ sw $v1, 0x28($t0) -/* D3D68 8013D668 25A300FF */ addiu $v1, $t5, 0xff -/* D3D6C 8013D66C 00031880 */ sll $v1, $v1, 2 -/* D3D70 8013D670 30630FFF */ andi $v1, $v1, 0xfff -/* D3D74 8013D674 00031B00 */ sll $v1, $v1, 0xc -/* D3D78 8013D678 25C200FF */ addiu $v0, $t6, 0xff -/* D3D7C 8013D67C 00021080 */ sll $v0, $v0, 2 -/* D3D80 8013D680 30420FFF */ andi $v0, $v0, 0xfff -/* D3D84 8013D684 3C048015 */ lui $a0, %hi(D_80151328) -/* D3D88 8013D688 8C841328 */ lw $a0, %lo(D_80151328)($a0) -/* D3D8C 8013D68C 00621825 */ or $v1, $v1, $v0 -/* D3D90 8013D690 AD060004 */ sw $a2, 4($t0) -/* D3D94 8013D694 AD00000C */ sw $zero, 0xc($t0) -/* D3D98 8013D698 AD1E0018 */ sw $fp, 0x18($t0) -/* D3D9C 8013D69C AD00001C */ sw $zero, 0x1c($t0) -/* D3DA0 8013D6A0 AD050020 */ sw $a1, 0x20($t0) -/* D3DA4 8013D6A4 AD070024 */ sw $a3, 0x24($t0) -/* D3DA8 8013D6A8 AD03002C */ sw $v1, 0x2c($t0) -/* D3DAC 8013D6AC 94830000 */ lhu $v1, ($a0) -/* D3DB0 8013D6B0 25020030 */ addiu $v0, $t0, 0x30 -/* D3DB4 8013D6B4 30630002 */ andi $v1, $v1, 2 -/* D3DB8 8013D6B8 106000D8 */ beqz $v1, .L8013DA1C -/* D3DBC 8013D6BC AE020000 */ sw $v0, ($s0) -/* D3DC0 8013D6C0 92220000 */ lbu $v0, ($s1) -/* D3DC4 8013D6C4 1040009C */ beqz $v0, .L8013D938 -/* D3DC8 8013D6C8 00000000 */ nop -/* D3DCC 8013D6CC 8E220014 */ lw $v0, 0x14($s1) -/* D3DD0 8013D6D0 00581024 */ and $v0, $v0, $t8 -/* D3DD4 8013D6D4 10400098 */ beqz $v0, .L8013D938 -/* D3DD8 8013D6D8 240900FF */ addiu $t1, $zero, 0xff -/* D3DDC 8013D6DC 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* D3DE0 8013D6E0 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* D3DE4 8013D6E4 00031080 */ sll $v0, $v1, 2 -/* D3DE8 8013D6E8 00431021 */ addu $v0, $v0, $v1 -/* D3DEC 8013D6EC 00021080 */ sll $v0, $v0, 2 -/* D3DF0 8013D6F0 00431023 */ subu $v0, $v0, $v1 -/* D3DF4 8013D6F4 000218C0 */ sll $v1, $v0, 3 -/* D3DF8 8013D6F8 00431021 */ addu $v0, $v0, $v1 -/* D3DFC 8013D6FC 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D3E00 8013D700 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D3E04 8013D704 000210C0 */ sll $v0, $v0, 3 -/* D3E08 8013D708 80630070 */ lb $v1, 0x70($v1) -/* D3E0C 8013D70C 14760006 */ bne $v1, $s6, .L8013D728 -/* D3E10 8013D710 00592021 */ addu $a0, $v0, $t9 -/* D3E14 8013D714 25020038 */ addiu $v0, $t0, 0x38 -/* D3E18 8013D718 AE020000 */ sw $v0, ($s0) -/* D3E1C 8013D71C AD130030 */ sw $s3, 0x30($t0) -/* D3E20 8013D720 0804F5CF */ j .L8013D73C -/* D3E24 8013D724 AD170034 */ sw $s7, 0x34($t0) -.L8013D728: -/* D3E28 8013D728 25020038 */ addiu $v0, $t0, 0x38 -/* D3E2C 8013D72C AE020000 */ sw $v0, ($s0) -/* D3E30 8013D730 248200B0 */ addiu $v0, $a0, 0xb0 -/* D3E34 8013D734 AD130030 */ sw $s3, 0x30($t0) -/* D3E38 8013D738 AD020034 */ sw $v0, 0x34($t0) -.L8013D73C: -/* D3E3C 8013D73C 240200FF */ addiu $v0, $zero, 0xff -/* D3E40 8013D740 55220005 */ bnel $t1, $v0, .L8013D758 -/* D3E44 8013D744 3C020050 */ lui $v0, 0x50 -/* D3E48 8013D748 3C020055 */ lui $v0, 0x55 -/* D3E4C 8013D74C 8E030000 */ lw $v1, ($s0) -/* D3E50 8013D750 0804F5D8 */ j .L8013D760 -/* D3E54 8013D754 34423078 */ ori $v0, $v0, 0x3078 -.L8013D758: -/* D3E58 8013D758 8E030000 */ lw $v1, ($s0) -/* D3E5C 8013D75C 34424A50 */ ori $v0, $v0, 0x4a50 -.L8013D760: -/* D3E60 8013D760 0060202D */ daddu $a0, $v1, $zero -/* D3E64 8013D764 24630008 */ addiu $v1, $v1, 8 -/* D3E68 8013D768 AE030000 */ sw $v1, ($s0) -/* D3E6C 8013D76C AC940000 */ sw $s4, ($a0) -/* D3E70 8013D770 AC820004 */ sw $v0, 4($a0) -/* D3E74 8013D774 92230002 */ lbu $v1, 2($s1) -/* D3E78 8013D778 1076000F */ beq $v1, $s6, .L8013D7B8 -/* D3E7C 8013D77C 28620003 */ slti $v0, $v1, 3 -/* D3E80 8013D780 10400005 */ beqz $v0, .L8013D798 -/* D3E84 8013D784 24020007 */ addiu $v0, $zero, 7 -/* D3E88 8013D788 10600009 */ beqz $v1, .L8013D7B0 -/* D3E8C 8013D78C 2402FFFF */ addiu $v0, $zero, -1 -/* D3E90 8013D790 0804F5F3 */ j .L8013D7CC -/* D3E94 8013D794 00000000 */ nop -.L8013D798: -/* D3E98 8013D798 1062000A */ beq $v1, $v0, .L8013D7C4 -/* D3E9C 8013D79C 2402000F */ addiu $v0, $zero, 0xf -/* D3EA0 8013D7A0 10620005 */ beq $v1, $v0, .L8013D7B8 -/* D3EA4 8013D7A4 2402FFFF */ addiu $v0, $zero, -1 -/* D3EA8 8013D7A8 0804F5F3 */ j .L8013D7CC -/* D3EAC 8013D7AC 00000000 */ nop -.L8013D7B0: -/* D3EB0 8013D7B0 0804F5F2 */ j .L8013D7C8 -/* D3EB4 8013D7B4 240900FF */ addiu $t1, $zero, 0xff -.L8013D7B8: -/* D3EB8 8013D7B8 8E290038 */ lw $t1, 0x38($s1) -/* D3EBC 8013D7BC 0804F5F3 */ j .L8013D7CC -/* D3EC0 8013D7C0 2402FFFF */ addiu $v0, $zero, -1 -.L8013D7C4: -/* D3EC4 8013D7C4 2409FFFF */ addiu $t1, $zero, -1 -.L8013D7C8: -/* D3EC8 8013D7C8 2402FFFF */ addiu $v0, $zero, -1 -.L8013D7CC: -/* D3ECC 8013D7CC 1522000C */ bne $t1, $v0, .L8013D800 -/* D3ED0 8013D7D0 3C06FCFF */ lui $a2, 0xfcff -/* D3ED4 8013D7D4 3C05FCFF */ lui $a1, 0xfcff -/* D3ED8 8013D7D8 34A5C3FF */ ori $a1, $a1, 0xc3ff -/* D3EDC 8013D7DC 3C04FF87 */ lui $a0, 0xff87 -/* D3EE0 8013D7E0 8E020000 */ lw $v0, ($s0) -/* D3EE4 8013D7E4 3484FFFF */ ori $a0, $a0, 0xffff -/* D3EE8 8013D7E8 0040182D */ daddu $v1, $v0, $zero -/* D3EEC 8013D7EC 24420008 */ addiu $v0, $v0, 8 -/* D3EF0 8013D7F0 AE020000 */ sw $v0, ($s0) -/* D3EF4 8013D7F4 AC650000 */ sw $a1, ($v1) -/* D3EF8 8013D7F8 0804F60F */ j .L8013D83C -/* D3EFC 8013D7FC AC640004 */ sw $a0, 4($v1) -.L8013D800: -/* D3F00 8013D800 34C6D3FF */ ori $a2, $a2, 0xd3ff -/* D3F04 8013D804 3C05FFA7 */ lui $a1, 0xffa7 -/* D3F08 8013D808 34A5FFFF */ ori $a1, $a1, 0xffff -/* D3F0C 8013D80C 8E030000 */ lw $v1, ($s0) -/* D3F10 8013D810 3C02FB00 */ lui $v0, 0xfb00 -/* D3F14 8013D814 0060202D */ daddu $a0, $v1, $zero -/* D3F18 8013D818 24630008 */ addiu $v1, $v1, 8 -/* D3F1C 8013D81C AE030000 */ sw $v1, ($s0) -/* D3F20 8013D820 AC820000 */ sw $v0, ($a0) -/* D3F24 8013D824 312200FF */ andi $v0, $t1, 0xff -/* D3F28 8013D828 AC820004 */ sw $v0, 4($a0) -/* D3F2C 8013D82C 24620008 */ addiu $v0, $v1, 8 -/* D3F30 8013D830 AE020000 */ sw $v0, ($s0) -/* D3F34 8013D834 AC660000 */ sw $a2, ($v1) -/* D3F38 8013D838 AC650004 */ sw $a1, 4($v1) -.L8013D83C: -/* D3F3C 8013D83C 3C040100 */ lui $a0, 0x100 -/* D3F40 8013D840 34844008 */ ori $a0, $a0, 0x4008 -/* D3F44 8013D844 3C060600 */ lui $a2, 0x600 -/* D3F48 8013D848 34C60402 */ ori $a2, $a2, 0x402 -/* D3F4C 8013D84C 3C050002 */ lui $a1, 2 -/* D3F50 8013D850 34A50406 */ ori $a1, $a1, 0x406 -/* D3F54 8013D854 8E070000 */ lw $a3, ($s0) -/* D3F58 8013D858 3C028015 */ lui $v0, %hi(fold_vtxBuf) -/* D3F5C 8013D85C 8C426950 */ lw $v0, %lo(fold_vtxBuf)($v0) -/* D3F60 8013D860 00E0182D */ daddu $v1, $a3, $zero -/* D3F64 8013D864 24E70008 */ addiu $a3, $a3, 8 -/* D3F68 8013D868 00521021 */ addu $v0, $v0, $s2 -/* D3F6C 8013D86C AE070000 */ sw $a3, ($s0) -/* D3F70 8013D870 AC620004 */ sw $v0, 4($v1) -/* D3F74 8013D874 24E20008 */ addiu $v0, $a3, 8 -/* D3F78 8013D878 AC640000 */ sw $a0, ($v1) -/* D3F7C 8013D87C AE020000 */ sw $v0, ($s0) -/* D3F80 8013D880 24E20010 */ addiu $v0, $a3, 0x10 -/* D3F84 8013D884 ACE60000 */ sw $a2, ($a3) -/* D3F88 8013D888 ACE50004 */ sw $a1, 4($a3) -/* D3F8C 8013D88C AE020000 */ sw $v0, ($s0) -/* D3F90 8013D890 240200FF */ addiu $v0, $zero, 0xff -/* D3F94 8013D894 ACFE0008 */ sw $fp, 8($a3) -/* D3F98 8013D898 15220004 */ bne $t1, $v0, .L8013D8AC -/* D3F9C 8013D89C ACE0000C */ sw $zero, 0xc($a3) -/* D3FA0 8013D8A0 3C030055 */ lui $v1, 0x55 -/* D3FA4 8013D8A4 0804F62D */ j .L8013D8B4 -/* D3FA8 8013D8A8 34633078 */ ori $v1, $v1, 0x3078 -.L8013D8AC: -/* D3FAC 8013D8AC 3C030050 */ lui $v1, 0x50 -/* D3FB0 8013D8B0 34634A50 */ ori $v1, $v1, 0x4a50 -.L8013D8B4: -/* D3FB4 8013D8B4 24E20018 */ addiu $v0, $a3, 0x18 -/* D3FB8 8013D8B8 AE020000 */ sw $v0, ($s0) -/* D3FBC 8013D8BC ACF40010 */ sw $s4, 0x10($a3) -/* D3FC0 8013D8C0 ACE30014 */ sw $v1, 0x14($a3) -/* D3FC4 8013D8C4 3C056464 */ lui $a1, 0x6464 -/* D3FC8 8013D8C8 34A564FF */ ori $a1, $a1, 0x64ff -/* D3FCC 8013D8CC 3C07FC40 */ lui $a3, 0xfc40 -/* D3FD0 8013D8D0 34E7FE81 */ ori $a3, $a3, 0xfe81 -/* D3FD4 8013D8D4 3C0655FC */ lui $a2, 0x55fc -/* D3FD8 8013D8D8 34C6F279 */ ori $a2, $a2, 0xf279 -/* D3FDC 8013D8DC 3C08E300 */ lui $t0, 0xe300 -/* D3FE0 8013D8E0 35081801 */ ori $t0, $t0, 0x1801 -/* D3FE4 8013D8E4 8E030000 */ lw $v1, ($s0) -/* D3FE8 8013D8E8 3C02FB00 */ lui $v0, 0xfb00 -/* D3FEC 8013D8EC 0060202D */ daddu $a0, $v1, $zero -/* D3FF0 8013D8F0 24630008 */ addiu $v1, $v1, 8 -/* D3FF4 8013D8F4 AE030000 */ sw $v1, ($s0) -/* D3FF8 8013D8F8 AC820000 */ sw $v0, ($a0) -/* D3FFC 8013D8FC 24620008 */ addiu $v0, $v1, 8 -/* D4000 8013D900 AC850004 */ sw $a1, 4($a0) -/* D4004 8013D904 AE020000 */ sw $v0, ($s0) -/* D4008 8013D908 3C02FA00 */ lui $v0, 0xfa00 -/* D400C 8013D90C AC620000 */ sw $v0, ($v1) -/* D4010 8013D910 312200FF */ andi $v0, $t1, 0xff -/* D4014 8013D914 AC620004 */ sw $v0, 4($v1) -/* D4018 8013D918 24620010 */ addiu $v0, $v1, 0x10 -/* D401C 8013D91C AE020000 */ sw $v0, ($s0) -/* D4020 8013D920 24620018 */ addiu $v0, $v1, 0x18 -/* D4024 8013D924 AC670008 */ sw $a3, 8($v1) -/* D4028 8013D928 AC66000C */ sw $a2, 0xc($v1) -/* D402C 8013D92C AE020000 */ sw $v0, ($s0) -/* D4030 8013D930 AC680010 */ sw $t0, 0x10($v1) -/* D4034 8013D934 AC600014 */ sw $zero, 0x14($v1) -.L8013D938: -/* D4038 8013D938 3C028015 */ lui $v0, %hi(D_80151328) -/* D403C 8013D93C 8C421328 */ lw $v0, %lo(D_80151328)($v0) -/* D4040 8013D940 94420000 */ lhu $v0, ($v0) -/* D4044 8013D944 30420002 */ andi $v0, $v0, 2 -/* D4048 8013D948 10400035 */ beqz $v0, .L8013DA20 -/* D404C 8013D94C 3C050100 */ lui $a1, 0x100 -/* D4050 8013D950 3C028015 */ lui $v0, %hi(D_80156954) -/* D4054 8013D954 8C426954 */ lw $v0, %lo(D_80156954)($v0) -/* D4058 8013D958 90420000 */ lbu $v0, ($v0) -/* D405C 8013D95C 10400031 */ beqz $v0, .L8013DA24 -/* D4060 8013D960 34A54008 */ ori $a1, $a1, 0x4008 -/* D4064 8013D964 8E220014 */ lw $v0, 0x14($s1) -/* D4068 8013D968 00581024 */ and $v0, $v0, $t8 -/* D406C 8013D96C 1040002C */ beqz $v0, .L8013DA20 -/* D4070 8013D970 3C050100 */ lui $a1, 0x100 -/* D4074 8013D974 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* D4078 8013D978 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* D407C 8013D97C 3C058007 */ lui $a1, %hi(gGameStatusPtr) -/* D4080 8013D980 8CA5419C */ lw $a1, %lo(gGameStatusPtr)($a1) -/* D4084 8013D984 00031080 */ sll $v0, $v1, 2 -/* D4088 8013D988 00431021 */ addu $v0, $v0, $v1 -/* D408C 8013D98C 00021080 */ sll $v0, $v0, 2 -/* D4090 8013D990 00431023 */ subu $v0, $v0, $v1 -/* D4094 8013D994 000218C0 */ sll $v1, $v0, 3 -/* D4098 8013D998 00431021 */ addu $v0, $v0, $v1 -/* D409C 8013D99C 000210C0 */ sll $v0, $v0, 3 -/* D40A0 8013D9A0 80A30070 */ lb $v1, 0x70($a1) -/* D40A4 8013D9A4 14760016 */ bne $v1, $s6, .L8013DA00 -/* D40A8 8013D9A8 00592021 */ addu $a0, $v0, $t9 -/* D40AC 8013D9AC 8E020000 */ lw $v0, ($s0) -/* D40B0 8013D9B0 3C048015 */ lui $a0, %hi(D_8014EE40) -/* D40B4 8013D9B4 2484EE40 */ addiu $a0, $a0, %lo(D_8014EE40) -/* D40B8 8013D9B8 0040182D */ daddu $v1, $v0, $zero -/* D40BC 8013D9BC 24420008 */ addiu $v0, $v0, 8 -/* D40C0 8013D9C0 AE020000 */ sw $v0, ($s0) -/* D40C4 8013D9C4 AC730000 */ sw $s3, ($v1) -/* D40C8 8013D9C8 AC640004 */ sw $a0, 4($v1) -/* D40CC 8013D9CC 90A20082 */ lbu $v0, 0x82($a1) -/* D40D0 8013D9D0 94830008 */ lhu $v1, 8($a0) -/* D40D4 8013D9D4 00021600 */ sll $v0, $v0, 0x18 -/* D40D8 8013D9D8 00021603 */ sra $v0, $v0, 0x18 -/* D40DC 8013D9DC 00621821 */ addu $v1, $v1, $v0 -/* D40E0 8013D9E0 A6E30008 */ sh $v1, 8($s7) -/* D40E4 8013D9E4 90A20083 */ lbu $v0, 0x83($a1) -/* D40E8 8013D9E8 9483000A */ lhu $v1, 0xa($a0) -/* D40EC 8013D9EC 00021600 */ sll $v0, $v0, 0x18 -/* D40F0 8013D9F0 00021603 */ sra $v0, $v0, 0x18 -/* D40F4 8013D9F4 00621821 */ addu $v1, $v1, $v0 -/* D40F8 8013D9F8 0804F687 */ j .L8013DA1C -/* D40FC 8013D9FC A6E3000A */ sh $v1, 0xa($s7) -.L8013DA00: -/* D4100 8013DA00 8E020000 */ lw $v0, ($s0) -/* D4104 8013DA04 0040182D */ daddu $v1, $v0, $zero -/* D4108 8013DA08 24420008 */ addiu $v0, $v0, 8 -/* D410C 8013DA0C AE020000 */ sw $v0, ($s0) -/* D4110 8013DA10 248200A0 */ addiu $v0, $a0, 0xa0 -/* D4114 8013DA14 AC730000 */ sw $s3, ($v1) -/* D4118 8013DA18 AC620004 */ sw $v0, 4($v1) -.L8013DA1C: -/* D411C 8013DA1C 3C050100 */ lui $a1, 0x100 -.L8013DA20: -/* D4120 8013DA20 34A54008 */ ori $a1, $a1, 0x4008 -.L8013DA24: -/* D4124 8013DA24 3C070600 */ lui $a3, 0x600 -/* D4128 8013DA28 34E70402 */ ori $a3, $a3, 0x402 -/* D412C 8013DA2C 3C060002 */ lui $a2, 2 -/* D4130 8013DA30 34C60406 */ ori $a2, $a2, 0x406 -/* D4134 8013DA34 8E030000 */ lw $v1, ($s0) -/* D4138 8013DA38 3C028015 */ lui $v0, %hi(fold_vtxBuf) -/* D413C 8013DA3C 8C426950 */ lw $v0, %lo(fold_vtxBuf)($v0) -/* D4140 8013DA40 0060202D */ daddu $a0, $v1, $zero -/* D4144 8013DA44 24630008 */ addiu $v1, $v1, 8 -/* D4148 8013DA48 00521021 */ addu $v0, $v0, $s2 -/* D414C 8013DA4C AE030000 */ sw $v1, ($s0) -/* D4150 8013DA50 AC820004 */ sw $v0, 4($a0) -/* D4154 8013DA54 24620008 */ addiu $v0, $v1, 8 -/* D4158 8013DA58 AC850000 */ sw $a1, ($a0) -/* D415C 8013DA5C AE020000 */ sw $v0, ($s0) -/* D4160 8013DA60 AC670000 */ sw $a3, ($v1) -/* D4164 8013DA64 AC660004 */ sw $a2, 4($v1) -/* D4168 8013DA68 9623000A */ lhu $v1, 0xa($s1) -/* D416C 8013DA6C 26A20003 */ addiu $v0, $s5, 3 -/* D4170 8013DA70 0043102A */ slt $v0, $v0, $v1 -/* D4174 8013DA74 10400003 */ beqz $v0, .L8013DA84 -/* D4178 8013DA78 26520020 */ addiu $s2, $s2, 0x20 -/* D417C 8013DA7C 0804F439 */ j .L8013D0E4 -/* D4180 8013DA80 26B50002 */ addiu $s5, $s5, 2 -.L8013DA84: -/* D4184 8013DA84 8FBF0054 */ lw $ra, 0x54($sp) -/* D4188 8013DA88 8FBE0050 */ lw $fp, 0x50($sp) -/* D418C 8013DA8C 8FB7004C */ lw $s7, 0x4c($sp) -/* D4190 8013DA90 8FB60048 */ lw $s6, 0x48($sp) -/* D4194 8013DA94 8FB50044 */ lw $s5, 0x44($sp) -/* D4198 8013DA98 8FB40040 */ lw $s4, 0x40($sp) -/* D419C 8013DA9C 8FB3003C */ lw $s3, 0x3c($sp) -/* D41A0 8013DAA0 8FB20038 */ lw $s2, 0x38($sp) -/* D41A4 8013DAA4 8FB10034 */ lw $s1, 0x34($sp) -/* D41A8 8013DAA8 8FB00030 */ lw $s0, 0x30($sp) -/* D41AC 8013DAAC 03E00008 */ jr $ra -/* D41B0 8013DAB0 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/e0b30_len_b80/bgm_update_volume.s b/ver/us/asm/nonmatchings/e0b30_len_b80/bgm_update_volume.s deleted file mode 100644 index 3080df8de7..0000000000 --- a/ver/us/asm/nonmatchings/e0b30_len_b80/bgm_update_volume.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel bgm_update_volume -/* E1394 8014AC94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E1398 8014AC98 3C048015 */ lui $a0, %hi(D_8014F738) -/* E139C 8014AC9C 2484F738 */ addiu $a0, $a0, %lo(D_8014F738) -/* E13A0 8014ACA0 AFBF0010 */ sw $ra, 0x10($sp) -/* E13A4 8014ACA4 84820000 */ lh $v0, ($a0) -/* E13A8 8014ACA8 94830000 */ lhu $v1, ($a0) -/* E13AC 8014ACAC 10400003 */ beqz $v0, .L8014ACBC -/* E13B0 8014ACB0 2462FFFF */ addiu $v0, $v1, -1 -/* E13B4 8014ACB4 08052B4D */ j .L8014AD34 -/* E13B8 8014ACB8 A4820000 */ sh $v0, ($a0) -.L8014ACBC: -/* E13BC 8014ACBC 3C038016 */ lui $v1, %hi(gMusicTargetVolume) -/* E13C0 8014ACC0 84639AE2 */ lh $v1, %lo(gMusicTargetVolume)($v1) -/* E13C4 8014ACC4 3C028016 */ lui $v0, %hi(gMusicUnkVolume2) -/* E13C8 8014ACC8 84429AE4 */ lh $v0, %lo(gMusicUnkVolume2)($v0) -/* E13CC 8014ACCC 3C048016 */ lui $a0, %hi(gMusicTargetVolume) -/* E13D0 8014ACD0 94849AE2 */ lhu $a0, %lo(gMusicTargetVolume)($a0) -/* E13D4 8014ACD4 0043102A */ slt $v0, $v0, $v1 -/* E13D8 8014ACD8 3C038016 */ lui $v1, %hi(gMusicUnkVolume2) -/* E13DC 8014ACDC 94639AE4 */ lhu $v1, %lo(gMusicUnkVolume2)($v1) -/* E13E0 8014ACE0 54400001 */ bnel $v0, $zero, .L8014ACE8 -/* E13E4 8014ACE4 0060202D */ daddu $a0, $v1, $zero -.L8014ACE8: -/* E13E8 8014ACE8 3C058016 */ lui $a1, %hi(gMusicCurrentVolume) -/* E13EC 8014ACEC 24A59AE6 */ addiu $a1, $a1, %lo(gMusicCurrentVolume) -/* E13F0 8014ACF0 00041400 */ sll $v0, $a0, 0x10 -/* E13F4 8014ACF4 00022403 */ sra $a0, $v0, 0x10 -/* E13F8 8014ACF8 84A20000 */ lh $v0, ($a1) -/* E13FC 8014ACFC 94A30000 */ lhu $v1, ($a1) -/* E1400 8014AD00 1044000C */ beq $v0, $a0, .L8014AD34 -/* E1404 8014AD04 0044102A */ slt $v0, $v0, $a0 -/* E1408 8014AD08 14400002 */ bnez $v0, .L8014AD14 -/* E140C 8014AD0C 24620001 */ addiu $v0, $v1, 1 -/* E1410 8014AD10 2462FFFF */ addiu $v0, $v1, -1 -.L8014AD14: -/* E1414 8014AD14 A4A20000 */ sh $v0, ($a1) -/* E1418 8014AD18 3C048016 */ lui $a0, %hi(gMusicCurrentVolume) -/* E141C 8014AD1C 84849AE6 */ lh $a0, %lo(gMusicCurrentVolume)($a0) -/* E1420 8014AD20 0C015869 */ jal func_800561A4 -/* E1424 8014AD24 00000000 */ nop -/* E1428 8014AD28 24020003 */ addiu $v0, $zero, 3 -/* E142C 8014AD2C 3C018015 */ lui $at, %hi(D_8014F738) -/* E1430 8014AD30 A422F738 */ sh $v0, %lo(D_8014F738)($at) -.L8014AD34: -/* E1434 8014AD34 8FBF0010 */ lw $ra, 0x10($sp) -/* E1438 8014AD38 03E00008 */ jr $ra -/* E143C 8014AD3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index fac8e09a58..9e01968613 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -718,6 +718,18 @@ segments: - [0xE2960, .data, entity] - [0xE2980, .data, msg] - [0xE2CA0, data] + #- [0xE2DF0, .data, cd180_len_38f0] + - start: 0xE2DF0 + type: .data + name: cd180_len_38f0 + subsegments: + - [0xE2DF0, .data, cd180_len_38f0] + - [0xE2E00, i4, ui/star_silhouette, 32, 64] + - [0xE3200, i4, ui/mario_head_silhouette, 64, 64] + - [0xE3A00, i4, ui/quarter_circle_silhouette, 32, 32] + - [0xE3C00, i8, ui/flame_thing_silhouette, 64, 64] + - [0xE4C00] + - [0xE5490, data] - [0xE5510, .data, d0a70_len_4fe0] - [0xE56C0, .data, hud_element] - [0xE5820, .data, dc470_len_14c0] @@ -1014,6 +1026,7 @@ segments: - [0x1AF120, c] - [0x1AF230, c] - [0x1AF2D0, .data, 16c8e0] + - [0x1AF5C0, .data, 1776B0] - [0x1AF8A0, .data, 190B20] - [0x1B21E0, data, 1AF2D0] # begins with image? - [0x1CB240, .rodata, 16c8e0] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 185ba7838b..bbe0ec6b51 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -18974,7 +18974,6 @@ bStaticEntityDataSize = 0x80151660; // type:data wStaticEntityData = 0x80151668; // type:data D_801516DC = 0x801516DC; // type:data bStaticEntityData = 0x801516E8; // type:data -D_801516F4 = 0x801516F4; // type:data D_801516FC = 0x801516FC; // type:data gMainGameState = 0x80151700; // gCurrentTileDescriptor = 0x80151740; // type:data @@ -19081,12 +19080,11 @@ D_801568EC = 0x801568EC; // type:data D_801568F0 = 0x801568F0; // type:data D_801568F4 = 0x801568F4; // type:data D_801568F8 = 0x801568F8; // type:data -D_80156900 = 0x80156900; // type:data +screen_overlay_frontType = 0x80156900; // type:data D_80156903 = 0x80156903; // type:data -D_80156904 = 0x80156904; // type:data -D_80156908 = 0x80156908; // type:data +screen_overlay_frontZoom = 0x80156904; // type:data +screen_overlay_backType = 0x80156908; // type:data D_8015690B = 0x8015690B; // type:data -D_8015690C = 0x8015690C; // type:data D_80156948 = 0x80156948; // type:data fold_vtxBuf = 0x80156950; // type:data D_80156954 = 0x80156954; // @@ -19146,7 +19144,6 @@ D_8015A578 = 0x8015A578; // type:data D_8015A57A = 0x8015A57A; // type:data mdl_textureHandles = 0x8015A590; // type:data D_8015C790 = 0x8015C790; // type:data -D_8015C7A4 = 0x8015C7A4; // type:data D_8015C7A8 = 0x8015C7A8; // type:data D_8015C7C0 = 0x8015C7C0; // type:data D_8015C7D0 = 0x8015C7D0; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 5c9b92004c..65c6252b5b 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -142,7 +142,6 @@ bStaticEntityDataSize = 0x80151660; wStaticEntityData = 0x80151668; D_801516DC = 0x801516DC; bStaticEntityData = 0x801516E8; -D_801516F4 = 0x801516F4; D_801516FC = 0x801516FC; gMainGameState = 0x80151700; gCurrentTileDescriptor = 0x80151740; @@ -249,12 +248,13 @@ D_801568EC = 0x801568EC; D_801568F0 = 0x801568F0; D_801568F4 = 0x801568F4; D_801568F8 = 0x801568F8; -D_80156900 = 0x80156900; +screen_overlay_frontType = 0x80156900; D_80156903 = 0x80156903; -D_80156904 = 0x80156904; -D_80156908 = 0x80156908; +screen_overlay_frontZoom = 0x80156904; +screen_overlay_backType = 0x80156908; +screen_overlay_backZoom = 0x8015690C; +D_80156910 = 0x80156910; D_8015690B = 0x8015690B; -D_8015690C = 0x8015690C; D_80156920 = 0x80156920; D_80156948 = 0x80156948; fold_vtxBuf = 0x80156950; @@ -315,7 +315,6 @@ D_8015A578 = 0x8015A578; D_8015A57A = 0x8015A57A; mdl_textureHandles = 0x8015A590; D_8015C790 = 0x8015C790; -D_8015C7A4 = 0x8015C7A4; D_8015C7A8 = 0x8015C7A8; D_8015C7C0 = 0x8015C7C0; D_8015C7D0 = 0x8015C7D0; @@ -534,6 +533,7 @@ D_8024BEA0 = 0x8024BEA0; D_8024C068 = 0x8024C068; D_8024C088 = 0x8024C088; D_8024C090 = 0x8024C090; +D_8024C098 = 0x8024C098; D_8024C108 = 0x8024C108; D_8024C110 = 0x8024C110; D_8024C117 = 0x8024C117;