diff --git a/include/dead.h b/include/dead.h index 86fea9b014..8672fd1bbf 100644 --- a/include/dead.h +++ b/include/dead.h @@ -1,9 +1,6 @@ #ifndef _DEAD_H_ #define _DEAD_H_ -// There can be multiple invalid references to a symbol from the dead code, -// so some symbols here have a "2" suffix. - #define gCameras dead_gCameras #define evt_get_variable dead_evt_get_variable #define evt_set_variable dead_evt_set_variable @@ -109,7 +106,11 @@ #define destroy_popup_menu dead_destroy_popup_menu #define heap_free dead_heap_free #define entity_upgrade_block_hide_content dead_entity_upgrade_block_hide_content -#define func_8003D660 dead_func_80041080 #define fx_misc_particles dead_fx_misc_particles +#define transform_point dead_transform_point +#define gMasterGfxPos dead_gMasterGfxPos +#define osVirtualToPhysical dead_osVirtualToPhysical +#define nuGfxZBuffer dead_nuGfxZBuffer +#define nuGfxCfb_ptr dead_nuGfxCfb_ptr #endif diff --git a/include/enums.h b/include/enums.h index bbfd1a9812..3b531d7ad7 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1688,7 +1688,7 @@ enum ItemIDs { ITEM_ATTACK_FX_A = 0x000000F3, ITEM_ALLOR_NOTHING = 0x000000F4, ITEM_HP_DRAIN = 0x000000F5, - ITEM_BOOTS_CHARGE0 = 0x000000F6, + ITEM_BOOTS_CHARGE0 = 0x000000F6, ITEM_SLOW_GO = 0x000000F7, ITEM_FP_PLUS_A = 0x000000F8, ITEM_MEGA_RUSH = 0x000000F9, @@ -1708,7 +1708,7 @@ enum ItemIDs { ITEM_HAMMER_THROW = 0x00000107, ITEM_MEGA_QUAKE = 0x00000108, ITEM_SMASH_CHARGE = 0x00000109, - ITEM_BOOTS_CHARGE = 0x0000010A, + ITEM_BOOTS_CHARGE = 0x0000010A, ITEM_S_SMASH_CHG = 0x0000010B, ITEM_S_JUMP_CHG = 0x0000010C, ITEM_POWER_RUSH = 0x0000010D, @@ -3281,7 +3281,8 @@ enum PopupType { POPUP_MENU_TAKE_FROM_CHEST = 0x9, POPUP_MENU_READ_DIARY_PAGE = 0xA, POPUP_MENU_READ_POSTCARD = 0xB, - POPUP_MENU_USEKEY = 0xC + POPUP_MENU_USEKEY = 0xC, + POPUP_MENU_D = 0xD, }; /// not really diff --git a/include/functions.h b/include/functions.h index 948ade7660..55c33ce7eb 100644 --- a/include/functions.h +++ b/include/functions.h @@ -493,7 +493,7 @@ ItemEntity* get_item_entity(s32 itemEntityIndex); s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupVar); void set_item_entity_flags(s32 itemEntityIndex, s32 flag); -s32 create_generic_entity_frontUI(void (*updateFunc)(void), void (*drawFunc)(void)); +s32 create_generic_entity_frontUI(s32 (*updateFunc)(void), void (*drawFunc)(void)); DynamicEntity* get_generic_entity(s32 idx); Trigger* bind_trigger_1(EvtScript* script, s32 flags, s32 triggerFlagIndex, s32 triggerVar0, s32 triggerVar1, s32 priority); diff --git a/include/variables.h b/include/variables.h index c804893f2d..ce00726280 100644 --- a/include/variables.h +++ b/include/variables.h @@ -37,8 +37,6 @@ extern ActionCommandStatus gActionCommandStatus; extern s32 D_802DAC98; -extern s32 gMoveScriptTable[][4]; - extern EntityList gWorldEntityList; extern EntityList gBattleEntityList; extern EntityList* gCurrentEntityListPtr; diff --git a/src/101b90_len_8f0.c b/src/101b90_len_8f0.c index 6a3f198b93..dab6a172e5 100644 --- a/src/101b90_len_8f0.c +++ b/src/101b90_len_8f0.c @@ -36,11 +36,11 @@ void spr_swizzle_anim_offsets(s32 arg0, s32 base, void* spriteData) { s32 animOffset; s32 compOffset; s32 temp; - + // required to match, spriteData->animList would be nicer animList = (SpriteAnimComponent***) spriteData; animList += 4; - + while (TRUE) { if (*animList == PTR_LIST_END) { break; @@ -205,6 +205,7 @@ void spr_update_player_raster_cache(void) { } } +void spr_load_npc_extra_anims(SpriteAnimData*, u32*); INCLUDE_ASM(s32, "101b90_len_8f0", spr_load_npc_extra_anims); #ifdef NON_MATCHING @@ -239,7 +240,7 @@ SpriteComponent** spr_allocate_components(s32 count) { component++; } *listPos = PTR_LIST_END; - + return listStart; } #else diff --git a/src/16c8e0.c b/src/16c8e0.c index d0a848d0ae..81ec1713f3 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -13,13 +13,17 @@ s16 D_802809F6 = -1; s16 D_802809F8 = 0; u16 D_802809FA = 0; -BSS s32 bSavedPartner; -BSS s32 bSavedOverrideFlags; -BSS s32 D_8029DA38[2]; // unused? -BSS s32 D_8029DA40; -BSS s32 D_8029DA44; -BSS s32 D_8029DA48; -BSS s32 D_8029DA4C; +BSS s32 bSavedPartner = 0; +BSS s32 bSavedOverrideFlags = 0; +BSS s32 D_8029DA38 = 0; // unused? +BSS s32 D_8029DA3C = 0; // unused? +BSS s32 D_8029DA40 = 0; +BSS s32 D_8029DA44 = 0; +BSS s32 D_8029DA48 = 0; +// The following var has a nop issue, and the only way to fix it is by initializing it. +// However, this puts it at the beginning of the BSS section, so all preceeding BSS needs to be initialized as well. +BSS s32 D_8029DA4C = 0; + BSS Camera D_8029DA50[ARRAY_COUNT(gCameras)]; BSS f32 D_8029EFB0; BSS f32 D_8029EFB4; @@ -810,8 +814,6 @@ void btl_draw_enemy_health_bars(void) { } } -// needs insane amount of data migration (1AF2D0.c) -#ifdef NON_MATCHING void btl_update_starpoints_display(void) { BattleStatus* battleStatus = &gBattleStatus; s32 cond; @@ -885,7 +887,7 @@ void btl_update_starpoints_display(void) { for (i = 0; i < tens; i++) { id = D_8029EFC0[i]; - if (hud_element_get_script(id) != HES_Item_StarPoint) { + if (hud_element_get_script(id) != &HES_Item_StarPoint) { hud_element_set_script(id, &HES_Item_StarPoint); } hud_element_clear_flags(id, 2); @@ -893,7 +895,7 @@ void btl_update_starpoints_display(void) { hud_element_draw_clipped(id); id = D_8029EFE8[i]; - if (hud_element_get_script(id) != HES_StatusSPShine) { + if (hud_element_get_script(id) != &HES_StatusSPShine) { hud_element_set_script(id, &HES_StatusSPShine); } hud_element_clear_flags(id, 2); @@ -903,8 +905,8 @@ void btl_update_starpoints_display(void) { } for (; i < ARRAY_COUNT(D_8029EFC0); i++) { - hud_element_set_flags(D_8029EFC0[i], HUD_ELEMENT_FLAGS_FILTER_TEX); - hud_element_set_flags(D_8029EFE8[i], HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(D_8029EFC0[i], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(D_8029EFE8[i], HUD_ELEMENT_FLAGS_DISABLED); } posX = D_8029DA40; @@ -918,7 +920,7 @@ void btl_update_starpoints_display(void) { for (i = 0; i < ones; i++) { id = D_8029F010[i]; - if (hud_element_get_script(id) != HES_Item_SmallStarPoint) { + if (hud_element_get_script(id) != &HES_Item_SmallStarPoint) { hud_element_set_script(id, &HES_Item_SmallStarPoint); } hud_element_clear_flags(id, 2); @@ -928,14 +930,11 @@ void btl_update_starpoints_display(void) { } for (; i < ARRAY_COUNT(D_8029F010); i++) { - hud_element_set_flags(D_8029F010[i], HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(D_8029F010[i], HUD_ELEMENT_FLAGS_DISABLED); } } } } -#else -INCLUDE_ASM(s32, "16c8e0", btl_update_starpoints_display); -#endif void btl_save_world_cameras(void) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/190B20.c b/src/190B20.c index 1c361d1aa4..b4757c4bfd 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -2,6 +2,7 @@ #include "nu/nusys.h" #include "effects.h" #include "battle/battle.h" +#include "script_api/battle.h" #include "model.h" #include "sprite.h" @@ -13,20 +14,46 @@ typedef struct PartnerDMAData { /* 0x10 */ s32 y; } PartnerDMAData; // size = 0x14 -extern EvtScript D_80293820; -extern f32 D_802938A4; -extern s16 D_802938A8; -extern EffectInstance* gDamageCountEffects[24]; -extern s32 gDamageCountTimers[24]; -extern Gfx D_80293970[]; -extern s32 D_802939C0; -extern EvtScript D_802939C4; -extern EvtScript D_80293A10; -extern EvtScript D_80293A34; -extern EvtScript D_80293A58; -extern EvtScript D_80293A7C; -extern EvtScript D_80293AA0; -extern EvtScript D_80293AC4; +EvtScript D_80293820 = { + EVT_WAIT(LocalVar(0)) + EVT_LOOP(4) + EVT_CALL(SetBattleCamParam, 4, 11) + EVT_WAIT(1) + EVT_CALL(SetBattleCamParam, 4, 5) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetBattleCamParam, 4, 8) + EVT_RETURN + EVT_END +}; + +f32 D_802938A4 = 0.0f; + +s16 D_802938A8 = 4; + +EffectInstance* gDamageCountEffects[] = { + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, +}; + +s32 gDamageCountTimers[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +Gfx D_80293970[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetTexturePersp(G_TP_NONE), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureFilter(G_TF_POINT), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +s32 D_802939C0 = 0; // from 17D6A0 extern s32 bMarioDefenseTable[]; @@ -2670,6 +2697,74 @@ void show_foreground_models(void) { #include "common/StartRumbleWithParams.inc.c" +EvtScript D_802939C4 = { + EVT_CALL(N(StartRumbleWithParams), 256, 30) + EVT_CALL(N(StartRumbleWithParams), 200, 15) + EVT_CALL(N(StartRumbleWithParams), 50, 15) + EVT_RETURN + EVT_END +}; + +EvtScript D_80293A10 = { + EVT_CALL(N(StartRumbleWithParams), 100, 20) + EVT_RETURN + EVT_END +}; + +EvtScript D_80293A34 = { + EVT_CALL(N(StartRumbleWithParams), 150, 20) + EVT_RETURN + EVT_END +}; + +EvtScript D_80293A58 = { + EVT_CALL(N(StartRumbleWithParams), 200, 30) + EVT_RETURN + EVT_END +}; + +EvtScript D_80293A7C = { + EVT_CALL(N(StartRumbleWithParams), 256, 40) + EVT_RETURN + EVT_END +}; + +EvtScript D_80293AA0 = { + EVT_CALL(N(StartRumbleWithParams), 256, 60) + EVT_RETURN + EVT_END +}; + +EvtScript D_80293AC4 = { + EVT_CALL(N(StartRumbleWithParams), 100, 20) + EVT_RETURN + EVT_END +}; + +EvtScript D_80293AE8 = { + EVT_CALL(N(StartRumbleWithParams), 150, 20) + EVT_RETURN + EVT_END +}; + +EvtScript D_80293B0C = { + EVT_CALL(N(StartRumbleWithParams), 200, 30) + EVT_RETURN + EVT_END +}; + +EvtScript D_80293B30 = { + EVT_CALL(N(StartRumbleWithParams), 256, 40) + EVT_RETURN + EVT_END +}; + +EvtScript D_80293B54 = { + EVT_CALL(N(StartRumbleWithParams), 256, 60) + EVT_RETURN + EVT_END +}; + void start_rumble_type(u32 arg0) { if (D_802939C0 != 0) { kill_script_by_ID(D_802939C0); diff --git a/src/891b0_len_fb0.c b/src/891b0_len_fb0.c index 5fa61380f8..44d00a2b1e 100644 --- a/src/891b0_len_fb0.c +++ b/src/891b0_len_fb0.c @@ -10,7 +10,8 @@ void func_800F0B3C(void); s32 D_80109480 = 0; f32 D_80109484 = 0.0f; -s16 D_80109488[] = {4, 0}; +s16 D_80109488 = 4; +s16 D_8010948A = 0; // unused? f32 D_8010948C = 0.0f; s16 D_80109490 = 4; s16 D_80109492 = 5; @@ -73,7 +74,96 @@ void func_800EFD08(void) { } } -INCLUDE_ASM(s32, "891b0_len_fb0", func_800EFE2C); +void func_800EFE2C(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 sinTheta, cosTheta; + f32 x, y, z; + s32 cond; + + cond = FALSE; + if (gGameStatusPtr->areaID == AREA_HOS) { + cond = gGameStatusPtr->mapID == 2; + } + + if (playerStatus->actionState == ACTION_STATE_LAND && + (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) && + D_8010CFF4 >= 10) + { + x = playerStatus->position.x; + y = playerStatus->position.y + 0.0f; + z = playerStatus->position.z; + if (!cond) { + fx_landing_dust(0, x, y, z, D_80109484); + } else { + fx_misc_particles(3, x, y, z, 13.0f, 10.0f, 1.0f, 5, 30); + + } + } else if ( + (playerStatus->actionState == ACTION_STATE_SPIN_POUND || playerStatus->actionState == ACTION_STATE_TORNADO_POUND) && (playerStatus->flags & PS_FLAGS_400)) + { + x = playerStatus->position.x; + y = playerStatus->position.y + 0.0f; + z = playerStatus->position.z; + if (!cond) { + fx_landing_dust(0, x, y, z, D_80109484); + } else { + fx_misc_particles(3, x, y, z, playerStatus->colliderDiameter, 10.0f, 1.0f, 5, 40); + } + } else if (playerStatus->actionState == ACTION_STATE_SPIN && playerStatus->currentSpeed != 0.0f) { + if (D_80109488++ >= 4) { + D_80109488 = 2; + if (cond) { + sin_cos_rad(DEG_TO_RAD(clamp_angle(playerStatus->targetYaw)), &sinTheta, &cosTheta); + fx_misc_particles( + 3, + playerStatus->position.x + (playerStatus->colliderDiameter * sinTheta), + playerStatus->position.y + 1.5f, + playerStatus->position.z + (playerStatus->colliderDiameter * cosTheta), + 13.0f, 10.0f, 1.0f, 5, 30 + ); + } else { + sin_cos_rad(DEG_TO_RAD(clamp_angle(-playerStatus->currentYaw)), &sinTheta, &cosTheta); + fx_walking_dust( + 0, + playerStatus->position.x + (playerStatus->colliderDiameter * sinTheta * 0.2f), + playerStatus->position.y + 1.5f, + playerStatus->position.z + (playerStatus->colliderDiameter * cosTheta * 0.2f), + sinTheta, cosTheta + ); + } + } + } else { + if (playerStatus->actionState != ACTION_STATE_RUN && + !(playerStatus->actionState == ACTION_STATE_SPIN && playerStatus->actionSubstate == 0)) + { + D_80109488 = 4; + return; + } + + if (D_80109488++ >= 4) { + D_80109488 = 0; + if (!cond) { + sin_cos_rad(DEG_TO_RAD(clamp_angle(-playerStatus->currentYaw)), &sinTheta, &cosTheta); + fx_walking_dust( + 0, + playerStatus->position.x + (playerStatus->colliderDiameter * sinTheta * 0.2f), + playerStatus->position.y + 1.5f, + playerStatus->position.z + (playerStatus->colliderDiameter * cosTheta * 0.2f), + sinTheta, cosTheta + ); + } else { + sin_cos_rad(DEG_TO_RAD(clamp_angle(playerStatus->targetYaw)), &sinTheta, &cosTheta); + fx_misc_particles( + 3, + playerStatus->position.x + (playerStatus->currentSpeed * sinTheta), + playerStatus->position.y + 1.5f, + playerStatus->position.z + (playerStatus->currentSpeed * cosTheta), + 13.0f, 10.0f, 1.0f, 5, 30 + ); + } + } + } +} void func_800F0248(void) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -119,7 +209,60 @@ void func_800F0248(void) { } } -INCLUDE_ASM(s32, "891b0_len_fb0", func_800F0490); +void func_800F0490(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 sinTheta, cosTheta; + f32 xTemp, xTemp2; + f32 yTemp, yTemp2; + f32 zTemp, zTemp2; + s32 i; + + D_801094A0 += 0.1f; + + if (((playerStatus->actionState == ACTION_STATE_LAND && (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED)) || + ((playerStatus->actionState == ACTION_STATE_SPIN_POUND || playerStatus->actionState == ACTION_STATE_TORNADO_POUND) && (playerStatus->flags & PS_FLAGS_400))) && + D_8010CFF4 >= 10) + { + fx_cloud_puff( + playerStatus->position.x, + (playerStatus->position.y + 14.0f) - 5.0f, + playerStatus->position.z, D_80109498 + ); + D_80109498 = clamp_angle(D_80109498 + 35.0f); + + for (i = 0; i < 4; i++) { + xTemp = rand_int(10) - 5; + zTemp = rand_int(10) - 5; + yTemp = -2.0f - ((SQ(xTemp) + SQ(zTemp)) / 5.0f); + D_8010949C = 0; + sin_cos_rad(DEG_TO_RAD(clamp_angle(-playerStatus->currentYaw + (i * 90))), &sinTheta, &cosTheta); + fx_cloud_trail( + 0, + playerStatus->position.x + (playerStatus->colliderDiameter * sinTheta * -0.3f) + xTemp, + playerStatus->position.y + 15.5f + yTemp, + playerStatus->position.z + (playerStatus->colliderDiameter * cosTheta * -0.3f) + zTemp + ); + } + } else { + if (!(playerStatus->actionState == ACTION_STATE_WALK || playerStatus->actionState == ACTION_STATE_RUN) && + !(playerStatus->actionState == ACTION_STATE_SPIN && playerStatus->actionSubstate == 0)) + { + D_8010949C = 0; + return; + } + xTemp2 = rand_int(10) - 5; + zTemp2 = rand_int(10) - 5; + yTemp2 = -2.0f - ((SQ(xTemp2) + SQ(zTemp2)) / 5.0f); + D_8010949C = 0; + sin_cos_rad(DEG_TO_RAD(clamp_angle(-playerStatus->currentYaw)), &sinTheta, &cosTheta); + fx_cloud_trail( + 1, + playerStatus->position.x + (playerStatus->colliderDiameter * sinTheta * -0.3f) + xTemp2, + playerStatus->position.y + 15.5f + yTemp2, + playerStatus->position.z + (playerStatus->colliderDiameter * cosTheta * -0.3f) + zTemp2 + ); + } +} void func_800F0864(void) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c index 8da6c35bd1..4604ca9d18 100644 --- a/src/8a860_len_3f30.c +++ b/src/8a860_len_3f30.c @@ -28,7 +28,7 @@ extern s32 D_8010D64C; extern s32 D_8010D650; extern s8 D_8010D654; extern s8 D_8010D655; -extern u8 D_8010D656; +extern s8 D_8010D656; extern s16 D_8010D658; extern s16 D_8010D65A; extern s32 D_8010D65C; @@ -48,11 +48,12 @@ extern s16 D_8010D686; extern s16 D_8010D688; extern s16 D_8010D68A; extern s16 D_8010D68C; -extern s8 D_8010D68E; +extern s8 D_8010D68E; // bool extern s8 D_8010D68F; extern s8 D_8010D690; extern s8 D_8010D691; extern s8 D_8010D692; +extern s8 D_8010D693; extern s32 D_8010D694; extern s8 D_8010D698; extern s8 D_8010D699; @@ -88,7 +89,68 @@ void func_800F4C6C(PopupMessage* popup, s32 x, s32 y); void func_800F4CF0(PopupMessage* popup, s32 x, s32 y); void func_800F4D28(PopupMessage* popup, s32 x, s32 y); -INCLUDE_ASM(s32, "8a860_len_3f30", hide_popup_menu); +void hide_popup_menu(void) { + if (D_8010D68E) { + switch (gPopupMenu->popupType) { + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_SWITCH_PARTNER: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_TRADE_FOR_BADGE: + case POPUP_MENU_UPGRADE_PARTNER: + case POPUP_MENU_SELL_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + case POPUP_MENU_READ_LETTER: + case POPUP_MENU_TAKE_FROM_CHEST: + case POPUP_MENU_USEKEY: + set_window_update(WINDOW_ID_14, (s32) basic_hidden_window_update); + set_window_update(WINDOW_ID_19, (s32) basic_hidden_window_update); + break; + case POPUP_MENU_READ_DIARY_PAGE: + case POPUP_MENU_READ_POSTCARD: + case POPUP_MENU_D: + set_window_update(WINDOW_ID_14, (s32) basic_hidden_window_update); + break; + } + set_window_update(WINDOW_ID_21, 2); + } else { + switch (gPopupMenu->popupType) { + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_SWITCH_PARTNER: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_TRADE_FOR_BADGE: + case POPUP_MENU_UPGRADE_PARTNER: + case POPUP_MENU_SELL_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + case POPUP_MENU_READ_LETTER: + case POPUP_MENU_TAKE_FROM_CHEST: + case POPUP_MENU_USEKEY: + set_window_update(WINDOW_ID_14, 2); + set_window_update(WINDOW_ID_19, 2); + break; + case POPUP_MENU_READ_DIARY_PAGE: + case POPUP_MENU_READ_POSTCARD: + case POPUP_MENU_D: + set_window_update(WINDOW_ID_14, 2); + break; + } + } + + if (gPopupMenu->popupType == POPUP_MENU_TRADE_FOR_BADGE) { + set_window_update(WINDOW_ID_16, (s32) basic_hidden_window_update); + set_window_update(WINDOW_ID_20, (s32) basic_hidden_window_update); + } + if (gPopupMenu->popupType == POPUP_MENU_UPGRADE_PARTNER) { + set_window_update(WINDOW_ID_18, (s32) basic_hidden_window_update); + } + if (gPopupMenu->popupType == POPUP_MENU_SELL_ITEM) { + set_window_update(WINDOW_ID_16, (s32) basic_hidden_window_update); + set_window_update(WINDOW_ID_20, (s32) basic_hidden_window_update); + } + D_8010D640 = 10; + D_8010D644 = D_8010D692; +} void destroy_popup_menu(void) { hud_element_free(D_8010D65C); @@ -131,7 +193,97 @@ void destroy_popup_menu(void) { D_8010D640 = -4; } -INCLUDE_ASM(s32, "8a860_len_3f30", func_800F16CC); +void func_800F16CC(void) { + if (D_8010D68E) { + switch (gPopupMenu->popupType) { + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_TRADE_FOR_BADGE: + case POPUP_MENU_SELL_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + case POPUP_MENU_READ_LETTER: + case POPUP_MENU_TAKE_FROM_CHEST: + case POPUP_MENU_USEKEY: + set_window_update(WINDOW_ID_14, (s32) basic_window_update); + sfx_play_sound(SOUND_1); + set_window_update(WINDOW_ID_19, (s32) basic_window_update); + break; + case POPUP_MENU_SWITCH_PARTNER: + case POPUP_MENU_UPGRADE_PARTNER: + set_window_update(WINDOW_ID_14, (s32) basic_window_update); + sfx_play_sound(SOUND_2); + set_window_update(WINDOW_ID_19, (s32) basic_window_update); + break; + case POPUP_MENU_READ_DIARY_PAGE: + case POPUP_MENU_READ_POSTCARD: + case POPUP_MENU_D: + set_window_update(WINDOW_ID_14, (s32) basic_window_update); + sfx_play_sound(SOUND_1); + break; + } + set_window_update(WINDOW_ID_21, (s32) basic_window_update); + } else { + switch (gPopupMenu->popupType) { + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_TRADE_FOR_BADGE: + case POPUP_MENU_SELL_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + case POPUP_MENU_READ_LETTER: + case POPUP_MENU_TAKE_FROM_CHEST: + case POPUP_MENU_USEKEY: + set_window_update(WINDOW_ID_14, 1); + set_window_update(WINDOW_ID_19, 1); + break; + case POPUP_MENU_SWITCH_PARTNER: + case POPUP_MENU_UPGRADE_PARTNER: + set_window_update(WINDOW_ID_14, 1); + set_window_update(WINDOW_ID_19, 1); + break; + case POPUP_MENU_READ_DIARY_PAGE: + case POPUP_MENU_READ_POSTCARD: + case POPUP_MENU_D: + set_window_update(WINDOW_ID_14, 1); + break; + } + } + + if (gPopupMenu->popupType == POPUP_MENU_TRADE_FOR_BADGE) { + set_window_update(WINDOW_ID_16, (s32) basic_window_update); + set_window_update(WINDOW_ID_20, (s32) basic_window_update); + } + if (gPopupMenu->popupType == POPUP_MENU_UPGRADE_PARTNER) { + set_window_update(WINDOW_ID_18, (s32) basic_window_update); + } + if (gPopupMenu->popupType == POPUP_MENU_SELL_ITEM) { + set_window_update(WINDOW_ID_16, (s32) basic_window_update); + } + hud_element_set_tint(D_8010D65C, 255, 255, 255); + hud_element_set_tint(D_8010D678, 255, 255, 255); + hud_element_set_tint(D_8010D66C, 255, 255, 255); + hud_element_set_tint(D_8010D670, 255, 255, 255); + hud_element_set_tint(D_8010D674, 255, 255, 255); + + if (gPopupMenu->popupType == POPUP_MENU_TRADE_FOR_BADGE) { + hud_element_set_tint(D_8010D660, 255, 255, 255); + hud_element_set_tint(D_8010D664, 255, 255, 255); + } + if (gPopupMenu->popupType == POPUP_MENU_UPGRADE_PARTNER) { + hud_element_set_tint(D_8010D660, 255, 255, 255); + hud_element_set_tint(D_8010D664, 255, 255, 255); + } + if (gPopupMenu->popupType == POPUP_MENU_SWITCH_PARTNER || gPopupMenu->popupType == POPUP_MENU_UPGRADE_PARTNER) { + hud_element_set_tint(D_8010D668, 255, 255, 255); + } + if (gPopupMenu->popupType == POPUP_MENU_SELL_ITEM) { + hud_element_set_tint(D_8010D660, 255, 255, 255); + } + hud_element_set_script(D_8010D66C, &HES_AnimatedHandPointer); + D_8010D690 = 0xA; + D_8010D640 = 0x14; +} s32 popup_menu_update(void) { s32 posX; @@ -154,7 +306,7 @@ s32 popup_menu_update(void) { D_8010D686 = 88; D_8010D688 = 32; D_8010D68A = 164; - if (D_8010D68E != 0) { + if (D_8010D68E) { D_8010D67C = D_801098A0[gPopupMenu->popupType] + 20; } if (D_8010D68F >= 7) { @@ -220,7 +372,7 @@ s32 popup_menu_update(void) { D_8010D65A = -200; D_8010D644 = D_8010D691; - if (D_8010D68E == 0) { + if (!D_8010D68E) { D_8010D644 = 1; } D_8010D690 = 0xA; @@ -228,12 +380,12 @@ s32 popup_menu_update(void) { posX = D_8010D67C; posY = D_8010D67E; switch (gPopupMenu->popupType) { - case 0: - case 2: - case 6: - case 7: - case 12: - set_window_properties(WINDOW_ID_14, posX, posY, 0x91, ((s8) D_8010D656 * 0xD) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + case POPUP_MENU_USEKEY: + set_window_properties(WINDOW_ID_14, posX, posY, 0x91, (D_8010D656 * 13) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); if (gPopupMenu->unk_31C == 0) { set_window_properties(WINDOW_ID_15, 0x19, -6, 0x5F, 0x10, 0x15, popup_menu_draw_title_contents, NULL, 0xE); } else { @@ -242,56 +394,56 @@ s32 popup_menu_update(void) { set_window_update(WINDOW_ID_15, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_17, WINDOW_UPDATE_HIDE); break; - case 1: - set_window_properties(WINDOW_ID_14, posX, posY, 0x8B, ((s8) D_8010D656 * 0xD) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); + case POPUP_MENU_SWITCH_PARTNER: + set_window_properties(WINDOW_ID_14, posX, posY, 0x8B, (D_8010D656 * 13) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); set_window_properties(WINDOW_ID_17, 0xD, -6, 0x72, 0x10, 0x15, popup_menu_draw_title_contents, NULL, 0xE); set_window_update(WINDOW_ID_15, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_17, WINDOW_UPDATE_SHOW); break; - case 3: - set_window_properties(WINDOW_ID_14, posX, posY, 0xA2, ((s8) D_8010D656 * 0xD) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); + case POPUP_MENU_TRADE_FOR_BADGE: + set_window_properties(WINDOW_ID_14, posX, posY, 0xA2, (D_8010D656 * 13) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); set_window_properties(WINDOW_ID_15, 0x11, -6, 0x60, 0x10, 0x15, popup_menu_draw_title_contents, NULL, 0xE); set_window_update(WINDOW_ID_15, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_17, WINDOW_UPDATE_HIDE); break; - case 4: - set_window_properties(WINDOW_ID_14, posX, posY, 0x92, ((s8) D_8010D656 * 0xD) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); + case POPUP_MENU_UPGRADE_PARTNER: + set_window_properties(WINDOW_ID_14, posX, posY, 0x92, (D_8010D656 * 13) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); set_window_properties(WINDOW_ID_17, 0xC, -6, 0x72, 0x10, 0x15, popup_menu_draw_title_contents, NULL, 0xE); set_window_update(WINDOW_ID_15, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_17, WINDOW_UPDATE_SHOW); break; - case 5: - set_window_properties(WINDOW_ID_14, posX, posY, 0xA7, ((s8) D_8010D656 * 0xD) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); + case POPUP_MENU_SELL_ITEM: + set_window_properties(WINDOW_ID_14, posX, posY, 0xA7, (D_8010D656 * 13) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); set_window_properties(WINDOW_ID_15, 0x16, -6, 0x5F, 0x10, 0x15, popup_menu_draw_title_contents, NULL, 0xE); set_window_update(WINDOW_ID_15, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_17, WINDOW_UPDATE_HIDE); break; - case 8: - set_window_properties(WINDOW_ID_14, posX, posY, 0xAA, ((s8) D_8010D656 * 0xD) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); + case POPUP_MENU_READ_LETTER: + set_window_properties(WINDOW_ID_14, posX, posY, 0xAA, (D_8010D656 * 13) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); set_window_properties(WINDOW_ID_15, 0x20, -6, 0x68, 0x10, 0x15, popup_menu_draw_title_contents, NULL, 0xE); set_window_update(WINDOW_ID_15, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_17, WINDOW_UPDATE_HIDE); break; - case 9: - set_window_properties(WINDOW_ID_14, posX, posY, 0x91, ((s8) D_8010D656 * 0xD) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); + case POPUP_MENU_TAKE_FROM_CHEST: + set_window_properties(WINDOW_ID_14, posX, posY, 0x91, (D_8010D656 * 13) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); set_window_properties(WINDOW_ID_15, 0xC, -6, 0x79, 0x10, 0x15, popup_menu_draw_title_contents, NULL, 0xE); set_window_update(WINDOW_ID_15, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_17, WINDOW_UPDATE_HIDE); break; - case 10: - set_window_properties(WINDOW_ID_14, posX, posY, 0x80, ((s8) D_8010D656 * 0xD) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); + case POPUP_MENU_READ_DIARY_PAGE: + set_window_properties(WINDOW_ID_14, posX, posY, 0x80, (D_8010D656 * 13) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); set_window_properties(WINDOW_ID_15, 0xC, -6, 0x68, 0x10, 0x15, popup_menu_draw_title_contents, NULL, 0xE); set_window_update(WINDOW_ID_15, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_17, WINDOW_UPDATE_HIDE); break; - case 11: - set_window_properties(WINDOW_ID_14, posX, posY, 0x95, ((s8) D_8010D656 * 0xD) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); + case POPUP_MENU_READ_POSTCARD: + set_window_properties(WINDOW_ID_14, posX, posY, 0x95, (D_8010D656 * 13) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); set_window_properties(WINDOW_ID_15, 6, -6, 0x8B, 0x10, 0x15, popup_menu_draw_title_contents, NULL, 0xE); set_window_update(WINDOW_ID_15, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_17, WINDOW_UPDATE_HIDE); break; - case 13: - set_window_properties(WINDOW_ID_14, posX, posY, 0x83, ((s8) D_8010D656 * 0xD) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); + case POPUP_MENU_D: + set_window_properties(WINDOW_ID_14, posX, posY, 0x83, (D_8010D656 * 13) + 0x1A, 0x14, popup_menu_draw_menu_contents, NULL, -1); set_window_properties(WINDOW_ID_17, 0xA, -6, 0x72, 0x10, 0x15, popup_menu_draw_title_contents, NULL, 0xE); set_window_update(WINDOW_ID_15, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_17, WINDOW_UPDATE_SHOW); @@ -299,10 +451,10 @@ s32 popup_menu_update(void) { } switch (gPopupMenu->popupType) { - case 3: + case POPUP_MENU_TRADE_FOR_BADGE: set_window_properties(WINDOW_ID_16, 0x7E, -0xE, 0x20, 0x20, 0x15, func_800F4C6C, NULL, 0xE); break; - case 5: + case POPUP_MENU_SELL_ITEM: set_window_properties(WINDOW_ID_16, 0x83, -0xE, 0x20, 0x20, 0x15, func_800F4C6C, NULL, 0xE); break; } @@ -327,92 +479,93 @@ s32 popup_menu_update(void) { } while (cond); D_8010D655 = D_8010D654 + D_8010D68F; - D_8010D658 = -D_8010D654 * 0xD; + D_8010D658 = -D_8010D654 * 13; if (gPopupMenu->popupType >= POPUP_MENU_USE_ITEM - && (gPopupMenu->popupType < POPUP_MENU_READ_DIARY_PAGE || gPopupMenu->popupType == POPUP_MENU_USEKEY)) { + && (gPopupMenu->popupType < POPUP_MENU_READ_DIARY_PAGE || gPopupMenu->popupType == POPUP_MENU_USEKEY)) + { set_window_properties(WINDOW_ID_19, D_8010D680, D_8010D682, 0x118, 0x20, 0x14, func_800F48F4, NULL, -1); } posX = D_8010D684; posY = D_8010D686; switch (gPopupMenu->popupType) { - case 0: - case 6: - case 7: - case 9: - case 12: + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + case POPUP_MENU_TAKE_FROM_CHEST: + case POPUP_MENU_USEKEY: set_window_properties(WINDOW_ID_21, posX, posY, 0x90, 0x20, 0x14, func_800F4944, NULL, -1); break; - case 1: - case 2: - case 13: + case POPUP_MENU_SWITCH_PARTNER: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_D: set_window_properties(WINDOW_ID_21, posX, posY, 0x90, 0x28, 0x14, func_800F4944, NULL, -1); break; - case 3: - case 10: - case 11: + case POPUP_MENU_TRADE_FOR_BADGE: + case POPUP_MENU_READ_DIARY_PAGE: + case POPUP_MENU_READ_POSTCARD: set_window_properties(WINDOW_ID_21, posX, posY, 0x80, 0x28, 0x14, func_800F4944, NULL, -1); break; - case 4: + case POPUP_MENU_UPGRADE_PARTNER: set_window_properties(WINDOW_ID_21, posX, posY, 0x88, 0x28, 0x14, func_800F4944, NULL, -1); break; - case 8: + case POPUP_MENU_READ_LETTER: set_window_properties(WINDOW_ID_21, posX, posY, 0x70, 0x28, 0x14, func_800F4944, NULL, -1); break; - case 5: + case POPUP_MENU_SELL_ITEM: set_window_properties(WINDOW_ID_21, posX, posY, 0x78, 0x20, 0x14, func_800F4944, NULL, -1); break; } - if (D_8010D68E == 0) { + if (!D_8010D68E) { switch (gPopupMenu->popupType) { - case 0: - case 2: - case 3: - case 5: - case 6: - case 7: - case 8: - case 9: - case 12: + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_TRADE_FOR_BADGE: + case POPUP_MENU_SELL_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + case POPUP_MENU_READ_LETTER: + case POPUP_MENU_TAKE_FROM_CHEST: + case POPUP_MENU_USEKEY: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_19, WINDOW_UPDATE_SHOW); break; - case 1: - case 4: + case POPUP_MENU_SWITCH_PARTNER: + case POPUP_MENU_UPGRADE_PARTNER: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_19, WINDOW_UPDATE_SHOW); break; - case 10: - case 11: - case 13: + case POPUP_MENU_READ_DIARY_PAGE: + case POPUP_MENU_READ_POSTCARD: + case POPUP_MENU_D: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_SHOW); break; } } else { switch (gPopupMenu->popupType) { - case 0: - case 2: - case 3: - case 5: - case 6: - case 7: - case 8: - case 9: - case 12: + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_TRADE_FOR_BADGE: + case POPUP_MENU_SELL_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + case POPUP_MENU_READ_LETTER: + case POPUP_MENU_TAKE_FROM_CHEST: + case POPUP_MENU_USEKEY: set_window_update(WINDOW_ID_14, (s32)basic_window_update); sfx_play_sound(SOUND_1); set_window_update(WINDOW_ID_19, (s32)basic_window_update); break; - case 1: - case 4: + case POPUP_MENU_SWITCH_PARTNER: + case POPUP_MENU_UPGRADE_PARTNER: set_window_update(WINDOW_ID_14, (s32)basic_window_update); sfx_play_sound(SOUND_2); set_window_update(WINDOW_ID_19, (s32)basic_window_update); break; - case 10: - case 11: - case 13: + case POPUP_MENU_READ_DIARY_PAGE: + case POPUP_MENU_READ_POSTCARD: + case POPUP_MENU_D: set_window_update(WINDOW_ID_14, (s32)basic_window_update); sfx_play_sound(SOUND_1); break; @@ -489,17 +642,17 @@ s32 popup_menu_update(void) { if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { switch (gPopupMenu->popupType) { - case 8: + case POPUP_MENU_READ_LETTER: sfx_play_sound(SOUND_MENU_NEXT); - if (D_8010D68E == 0) { + if (!D_8010D68E) { D_8010D640 = -1; } else { D_8010D640 = -2; } break; - case 13: + case POPUP_MENU_D: sfx_play_sound(SOUND_MENU_NEXT); - if (D_8010D68E == 0) { + if (!D_8010D68E) { D_8010D640 = -1; } else { D_8010D640 = -2; @@ -508,51 +661,51 @@ s32 popup_menu_update(void) { default: if (gPopupMenu->enabled[D_8010D648]) { sfx_play_sound(SOUND_MENU_NEXT); - if (D_8010D68E == 0) { + if (!D_8010D68E) { D_8010D640 = -1; } else { D_8010D640 = -2; } break; } - if (gPopupMenu->popupType == 1) { + if (gPopupMenu->popupType == POPUP_MENU_SWITCH_PARTNER) { sfx_play_sound(SOUND_MENU_ERROR); D_8010D640 = 0x1E; break; } - if ((D_8010D68E != 0) && (gPopupMenu->popupType == POPUP_MENU_USE_ITEM || gPopupMenu->popupType == POPUP_MENU_TRADE_FOR_BADGE)) { + if (D_8010D68E && (gPopupMenu->popupType == POPUP_MENU_USE_ITEM || gPopupMenu->popupType == POPUP_MENU_TRADE_FOR_BADGE)) { sfx_play_sound(SOUND_MENU_ERROR); } break; } } else { switch (gPopupMenu->popupType) { - case 0: - case 2: - case 3: - case 5: - case 6: - case 7: - case 12: - if (D_8010D68E != 0) { + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_TRADE_FOR_BADGE: + case POPUP_MENU_SELL_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + case POPUP_MENU_USEKEY: + if (D_8010D68E) { buttons = BUTTON_B | BUTTON_C_LEFT; } else { buttons = BUTTON_B; } break; - case 1: - case 4: - if (D_8010D68E != 0) { + case POPUP_MENU_SWITCH_PARTNER: + case POPUP_MENU_UPGRADE_PARTNER: + if (D_8010D68E) { buttons = BUTTON_B | BUTTON_C_RIGHT; } else { buttons = BUTTON_B; } break; - case 8: - case 9: - case 10: - case 11: - case 13: + case POPUP_MENU_READ_LETTER: + case POPUP_MENU_TAKE_FROM_CHEST: + case POPUP_MENU_READ_DIARY_PAGE: + case POPUP_MENU_READ_POSTCARD: + case POPUP_MENU_D: buttons = BUTTON_B; break; default: @@ -563,7 +716,7 @@ s32 popup_menu_update(void) { if (gGameStatusPtr->pressedButtons[0] & buttons) { sfx_play_sound(SOUND_MENU_BACK); if (D_8010D698 != 0) { - if (D_8010D68E == 0) { + if (!D_8010D68E) { D_8010D640 = -3; } else { D_8010D640 = -7; @@ -582,15 +735,15 @@ s32 popup_menu_update(void) { default: buttons = 0; break; - case 0: + case POPUP_MENU_USE_ITEM: buttons = BUTTON_C_RIGHT; break; - case 1: + case POPUP_MENU_SWITCH_PARTNER: buttons = BUTTON_C_LEFT; break; } - if (D_8010D68E != 0 && (gGameStatusPtr->pressedButtons[0] & buttons)) { + if (D_8010D68E && (gGameStatusPtr->pressedButtons[0] & buttons)) { sfx_play_sound(SOUND_MENU_BACK); D_8010D640 = -6; break; @@ -613,7 +766,7 @@ s32 popup_menu_update(void) { hud_element_set_tint(D_8010D660, 160, 160, 160); hud_element_set_tint(D_8010D664, 160, 160, 160); } - if (gPopupMenu->popupType == 1 || gPopupMenu->popupType == POPUP_MENU_UPGRADE_PARTNER) { + if (gPopupMenu->popupType == POPUP_MENU_SWITCH_PARTNER || gPopupMenu->popupType == POPUP_MENU_UPGRADE_PARTNER) { hud_element_set_tint(D_8010D668, 160, 160, 160); } if (gPopupMenu->popupType == POPUP_MENU_SELL_ITEM) { @@ -628,26 +781,26 @@ s32 popup_menu_update(void) { return D_8010D648 + 1; case -3: switch (gPopupMenu->popupType) { - case 0: - case 2: - case 3: - case 5: - case 6: - case 7: - case 8: - case 9: - case 12: + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_TRADE_FOR_BADGE: + case POPUP_MENU_SELL_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + case POPUP_MENU_READ_LETTER: + case POPUP_MENU_TAKE_FROM_CHEST: + case POPUP_MENU_USEKEY: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_19, WINDOW_UPDATE_HIDE); break; - case 1: - case 4: + case POPUP_MENU_SWITCH_PARTNER: + case POPUP_MENU_UPGRADE_PARTNER: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_19, WINDOW_UPDATE_HIDE); break; - case 10: - case 11: - case 13: + case POPUP_MENU_READ_DIARY_PAGE: + case POPUP_MENU_READ_POSTCARD: + case POPUP_MENU_D: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_HIDE); break; } @@ -691,7 +844,7 @@ s32 popup_menu_update(void) { case 31: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_19, WINDOW_UPDATE_HIDE); - if (D_8010D68E != 0) { + if (D_8010D68E) { set_window_update(WINDOW_ID_21, WINDOW_UPDATE_HIDE); } width = get_msg_width(0x1D006B, 0) + 23; @@ -711,7 +864,7 @@ s32 popup_menu_update(void) { set_window_update(WINDOW_ID_9, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_14, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_19, WINDOW_UPDATE_SHOW); - if (D_8010D68E != 0) { + if (D_8010D68E) { set_window_update(WINDOW_ID_21, WINDOW_UPDATE_SHOW); } D_8010D640 = 1; @@ -741,26 +894,26 @@ s32 popup_menu_update(void) { } switch (gPopupMenu->popupType) { - case 0: - case 2: - case 3: - case 5: - case 6: - case 7: - case 8: - case 9: - case 12: + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_TRADE_FOR_BADGE: + case POPUP_MENU_SELL_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + case POPUP_MENU_READ_LETTER: + case POPUP_MENU_TAKE_FROM_CHEST: + case POPUP_MENU_USEKEY: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_19, WINDOW_UPDATE_HIDE); break; - case 1: - case 4: + case POPUP_MENU_SWITCH_PARTNER: + case POPUP_MENU_UPGRADE_PARTNER: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_19, WINDOW_UPDATE_HIDE); break; - case 10: - case 11: - case 13: + case POPUP_MENU_READ_DIARY_PAGE: + case POPUP_MENU_READ_POSTCARD: + case POPUP_MENU_D: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_HIDE); break; } @@ -817,26 +970,26 @@ s32 popup_menu_update(void) { hud_element_set_script(D_8010D66C, &HES_HandPointer); switch (gPopupMenu->popupType) { - case 0: - case 2: - case 3: - case 5: - case 6: - case 7: - case 8: - case 9: - case 12: + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_TRADE_FOR_BADGE: + case POPUP_MENU_SELL_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + case POPUP_MENU_READ_LETTER: + case POPUP_MENU_TAKE_FROM_CHEST: + case POPUP_MENU_USEKEY: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_19, WINDOW_UPDATE_SHOW); break; - case 1: - case 4: + case POPUP_MENU_SWITCH_PARTNER: + case POPUP_MENU_UPGRADE_PARTNER: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_19, WINDOW_UPDATE_SHOW); break; - case 10: - case 11: - case 13: + case POPUP_MENU_READ_DIARY_PAGE: + case POPUP_MENU_READ_POSTCARD: + case POPUP_MENU_D: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_SHOW); break; } @@ -850,13 +1003,141 @@ s32 popup_menu_update(void) { INCLUDE_ASM(s32, "8a860_len_3f30", popup_menu_draw_menu_contents); -INCLUDE_ASM(s32, "8a860_len_3f30", popup_menu_draw_title_contents); +void popup_menu_draw_title_contents( + s32* userData, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) +{ + switch (gPopupMenu->popupType) { + case POPUP_MENU_USE_ITEM: + case POPUP_MENU_THROW_AWAY_ITEM: + case POPUP_MENU_SELL_ITEM: + case POPUP_MENU_CHECK_ITEM: + case POPUP_MENU_CLAIM_ITEM: + switch (gPopupMenu->unk_31C) { + case 0: + draw_msg(0x1D003F, baseX + 26, baseY + 2, D_8010D650, 50, 1); + break; + case 1: + draw_msg(0x1D0041, baseX + 4, baseY + 2, D_8010D650, 50, 1); + draw_number(gPopupMenu->unk_320, baseX + 94, baseY + 2, 1, 50, D_8010D650, 3); + draw_number(2, baseX + 114, baseY + 2, 1, 50, D_8010D650, 3); + break; + case 2: + draw_msg(0x1D0042, baseX + 6, baseY + 2, D_8010D650, 50, 1); + draw_number(gPopupMenu->unk_320, baseX + 94, baseY + 2, 1, 50, D_8010D650, 3); + draw_number(3, baseX + 114, baseY + 2, 1, 50, D_8010D650, 3); + break; + } + break; + case POPUP_MENU_TRADE_FOR_BADGE: + draw_msg(0x1F0032, baseX + 27, baseY + 2, D_8010D650, 50, 1); + break; + case POPUP_MENU_READ_LETTER: + draw_msg(0x1F0033, baseX + 23, baseY + 2, D_8010D650, 50, 1); + break; + case POPUP_MENU_TAKE_FROM_CHEST: + draw_msg(0x1D00D7, baseX + 4, baseY + 2, D_8010D650, 50, 1); + break; + case POPUP_MENU_READ_DIARY_PAGE: + draw_msg(0x1D00CE, baseX + 8, baseY + 2, D_8010D650, 50, 1); + break; + case POPUP_MENU_READ_POSTCARD: + draw_msg(0x1D00D0, baseX + 6, baseY + 2, D_8010D650, 50, 1); + break; + case POPUP_MENU_USEKEY: + draw_msg(0x1D003F, baseX + 27, baseY + 2, D_8010D650, 50, 1); + break; + case POPUP_MENU_SWITCH_PARTNER: + case POPUP_MENU_UPGRADE_PARTNER: + case POPUP_MENU_D: + draw_msg(0x1D003D, baseX + 8, baseY + 2, D_8010D650, 52, 1); + break; + } +} void func_800F48F4(s32* userData, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { draw_msg(gPopupMenu->descMsg[D_8010D648], baseX + 8, baseY, D_8010D650, D_8010D690, 0); } -INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4944); +void func_800F4944(s32* userData, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { + s32 msgWidth; + + baseY += 7; + + if (D_8010D68E) { + switch (gPopupMenu->popupType) { + case POPUP_MENU_USE_ITEM: + msgWidth = get_msg_width(0x1D0061, 0); + baseX += 72 - (msgWidth / 2); + draw_msg(0x1D0061, baseX, baseY, 255, 0xF, 0); + break; + case POPUP_MENU_SWITCH_PARTNER: + msgWidth = get_msg_width(0x1D0063, 0); + baseX += 72 - (msgWidth / 2); + draw_msg(0x1D0063, baseX, baseY - 4, 255, 0xF, 0); + break; + case POPUP_MENU_THROW_AWAY_ITEM: + msgWidth = get_msg_width(0x1D0064, 0); + baseX += 72 - (msgWidth / 2); + draw_msg(0x1D0064, baseX, baseY - 4, 255, 0xF, 0); + break; + case POPUP_MENU_TRADE_FOR_BADGE: + msgWidth = get_msg_width(0x1D0070, 0); + baseX += 64 - (msgWidth / 2); + draw_msg(0x1D0070, baseX, baseY - 4, 255, 0xF, 0); + break; + case POPUP_MENU_UPGRADE_PARTNER: + msgWidth = get_msg_width(0x1D006A, 0); + baseX += 68 - (msgWidth / 2); + draw_msg(0x1D006A, baseX, baseY - 4, 255, 0xF, 0); + break; + case POPUP_MENU_SELL_ITEM: + msgWidth = get_msg_width(0x1D0065, 0); + baseX += 60 - (msgWidth / 2); + draw_msg(0x1D0065, baseX, baseY, 255, 0xF, 0); + break; + case POPUP_MENU_CHECK_ITEM: + msgWidth = get_msg_width(0x1D0066, 0); + baseX += 72 - (msgWidth / 2); + draw_msg(0x1D0066, baseX, baseY, 255, 0xF, 0); + break; + case POPUP_MENU_CLAIM_ITEM: + msgWidth = get_msg_width(0x1D0067, 0); + baseX += 72 - (msgWidth / 2); + draw_msg(0x1D0067, baseX, baseY, 255, 0xF, 0); + break; + case POPUP_MENU_D: + msgWidth = get_msg_width(0x1D006F, 0); + baseX += 72 - (msgWidth / 2); + draw_msg(0x1D006F, baseX, baseY - 4, 255, 0xF, 0); + break; + case POPUP_MENU_READ_LETTER: + msgWidth = get_msg_width(0x1D006D, 0); + baseX += 56 - (msgWidth / 2); + draw_msg(0x1D006D, baseX, baseY - 4, 255, 0xF, 0); + break; + case POPUP_MENU_TAKE_FROM_CHEST: + msgWidth = get_msg_width(0x1D00D6, 0); + baseX += 72 - (msgWidth / 2); + draw_msg(0x1D00D6, baseX, baseY, 255, 0xF, 0); + break; + case POPUP_MENU_READ_DIARY_PAGE: + msgWidth = get_msg_width(0x1D006C, 0); + baseX += 64 - (msgWidth / 2); + draw_msg(0x1D006C, baseX, baseY - 4, 255, 0xF, 0); + break; + case POPUP_MENU_READ_POSTCARD: + msgWidth = get_msg_width(0x1D006D, 0); + baseX += 64 - (msgWidth / 2); + draw_msg(0x1D006D, baseX, baseY - 4, 255, 0xF, 0); + break; + case POPUP_MENU_USEKEY: + msgWidth = get_msg_width(0x1D0062, 0); + baseX += 72 - (msgWidth / 2); + draw_msg(0x1D0062, baseX, baseY, 255, 0xF, 0); + break; + } + } +} void func_800F4C1C(PopupMessage* popup, s32 x, s32 y) { s32 msg = 0x1D0069; @@ -940,17 +1221,17 @@ void create_popup_menu(PopupMenu* popup) { popup->unk_320 = 0; D_8010D699 = 0; D_8010D698 = 1; - if (popup->popupType >= 0x64) { - popup->popupType -= 0x64; + if (popup->popupType >= 100) { + popup->popupType -= 100; D_8010D699 = 1; - if (popup->popupType >= 0x64) { - popup->popupType -= 0x64; + if (popup->popupType >= 100) { + popup->popupType -= 100; D_8010D699 = 2; } D_8010D698 = 0; } - D_8010D68E = 1; + D_8010D68E = TRUE; D_8010D68F = 6; D_8010D640 = 0; @@ -980,9 +1261,94 @@ void create_popup_menu(PopupMenu* popup) { D_8010D694 = create_generic_entity_frontUI(popup_menu_update, NULL); } -INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4FC4); +void func_800F4FC4(PopupMenu* popup) { + gPopupMenu = popup; -INCLUDE_ASM(s32, "8a860_len_3f30", func_800F513C); + popup->result = 0; + popup->unk_31C = 0; + popup->unk_320 = 0; + D_8010D69A = func_800E98D4(); + D_8010D699 = 0; + D_8010D698 = 1; + if (gPopupMenu->popupType >= 100) { + gPopupMenu->popupType -= 100; + D_8010D699 = 1; + if (gPopupMenu->popupType >= 100) { + gPopupMenu->popupType -= 100; + D_8010D699 = 2; + } + D_8010D698 = 0; + } + + D_8010D68E = TRUE; + D_8010D68F = 6; + D_8010D640 = 0; + D_8010D648 = gPopupMenu->initialPos; + if (D_8010D648 >= gPopupMenu->numEntries) { + D_8010D648 = gPopupMenu->numEntries - 1; + } + D_8010D654 = 0; + D_8010D64C = D_8010D648; + D_8010D656 = gPopupMenu->numEntries; + + if (D_8010D656 > D_8010D68F) { + D_8010D656 = D_8010D68F; + } + + D_8010D655 = D_8010D68F; + if (gPopupMenu->numEntries < D_8010D68F) { + D_8010D655 = gPopupMenu->numEntries; + } + + D_8010D650 = 255; + D_8010D691 = 4; + D_8010D692 = 6; + D_8010D694 = create_generic_entity_frontUI(popup_menu_update, NULL); +} + +void func_800F513C(PopupMenu* popup) { + gPopupMenu = popup; + + popup->result = 0; + D_8010D693 = popup->unk_320; + D_8010D69A = func_800E98D4(); + D_8010D699 = 0; + D_8010D698 = 1; + if (gPopupMenu->popupType >= 100) { + gPopupMenu->popupType -= 100; + D_8010D699 = 1; + if (gPopupMenu->popupType >= 100) { + gPopupMenu->popupType -= 100; + D_8010D699 = 2; + } + D_8010D698 = 0; + } + + D_8010D68F = 6; + D_8010D68E = FALSE; + D_8010D640 = 0; + D_8010D648 = gPopupMenu->initialPos; + if (D_8010D648 >= gPopupMenu->numEntries) { + D_8010D648 = gPopupMenu->numEntries - 1; + } + D_8010D654 = 0; + D_8010D64C = D_8010D648; + D_8010D656 = gPopupMenu->numEntries; + + if (D_8010D656 > D_8010D68F) { + D_8010D656 = D_8010D68F; + } + + D_8010D655 = D_8010D68F; + if (gPopupMenu->numEntries < D_8010D68F) { + D_8010D655 = gPopupMenu->numEntries; + } + + D_8010D650 = 255; + D_8010D691 = 9; + D_8010D692 = 2; + D_8010D694 = create_generic_entity_frontUI(popup_menu_update, NULL); +} void func_800F52BC(void) { popup_menu_update(); diff --git a/src/B0E0.c b/src/B0E0.c index 59c691e4fd..b45fd5be51 100644 --- a/src/B0E0.c +++ b/src/B0E0.c @@ -25,62 +25,65 @@ void update_camera_mode_unused(Camera* camera) { f32 lookXDelta; f32 lookYDelta; f32 lookZDelta; + f32 zero; - if (camera->unk_06 != 0 || camera->unk_08 != 0) { + if (camera->unk_06 != 0 || camera->changingMap) { camera->unk_06 = 0; - camera->unk_08 = 0; - camera->unk_1C = 0; - camera->unk_1E = 100; - camera->unk_20 = 100; - camera->unk_22 = 0; - camera->unk_24 = 0; - camera->lookAt_obj.x = camera->unk_54; - camera->lookAt_obj.y = camera->unk_58; - camera->lookAt_obj.z = camera->unk_5C; + camera->changingMap = FALSE; + camera->auxPitch = 0; + camera->auxBoomLength = 100; + camera->lookAt_dist = 100; + camera->auxBoomPitch = 0; + camera->auxBoomYaw = 0; + camera->lookAt_obj.x = camera->lookAt_obj_target.x; + camera->lookAt_obj.y = camera->lookAt_obj_target.y; + camera->lookAt_obj.z = camera->lookAt_obj_target.z; } - if (!(playerStatus->flags & 6)) { - camera->unk_58 = playerStatus->position.y + 60.0f; + if (!(playerStatus->flags & (PS_FLAGS_FALLING | PS_FLAGS_JUMPING))) { + camera->lookAt_obj_target.y = playerStatus->position.y + 60.0f; } - camera->unk_54 = playerStatus->position.x; - camera->unk_5C = playerStatus->position.z + 400.0f; + camera->lookAt_obj_target.x = playerStatus->position.x; + camera->lookAt_obj_target.z = playerStatus->position.z + 400.0f; - if (camera->unk_1C == 0) { - s32 fovTemp = 10000 / camera->unk_20; + if (camera->auxPitch == 0) { + s32 fovTemp = 10000 / camera->lookAt_dist; - camera->lookAt_obj.x = camera->unk_54; - camera->lookAt_obj.y = camera->unk_58; - camera->lookAt_obj.z = camera->unk_5C; - camera->trueRotation.x = (f32) camera->unk_24; - camera->currentBoomYaw = (f32) camera->unk_22; - camera->currentBoomLength = (f32) camera->unk_1E; + camera->lookAt_obj.x = camera->lookAt_obj_target.x; + camera->lookAt_obj.y = camera->lookAt_obj_target.y; + camera->lookAt_obj.z = camera->lookAt_obj_target.z; + camera->trueRotation.x = camera->auxBoomYaw; + camera->currentBoomYaw = camera->auxBoomPitch; + camera->currentBoomLength = camera->auxBoomLength; if (fovTemp < 0) { fovTemp += 3; } camera->vfov = fovTemp >> 2; + zero = camera->currentBoomYaw; + theta = DEG_TO_RAD(camera->currentBoomYaw); sinTheta1 = sin_rad(theta); cosTheta1 = cos_rad(theta); - temp_f30 = (cosTheta1 * 0.0f) + (camera->currentBoomLength * sinTheta1); - temp_f24_2 = (sinTheta1 * -0.0f) + (camera->currentBoomLength * cosTheta1); + temp_f30 = (zero * cosTheta1) + (camera->currentBoomLength * sinTheta1); + temp_f24_2 = ( -zero * sinTheta1) + (camera->currentBoomLength * cosTheta1); theta = DEG_TO_RAD(camera->trueRotation.x); sinTheta2 = sin_rad(theta); cosTheta2 = cos_rad(theta); - camera->lookAt_eye.x = camera->lookAt_obj.x + ((cosTheta2 * 0.0f) - (temp_f24_2 * sinTheta2)); + camera->lookAt_eye.x = camera->lookAt_obj.x + ((cosTheta2 * zero) - (temp_f24_2 * sinTheta2)); camera->lookAt_eye.y = camera->lookAt_obj.y + temp_f30; - camera->lookAt_eye.z = camera->lookAt_obj.z + ((sinTheta2 * 0.0f) + (temp_f24_2 * cosTheta2)); + camera->lookAt_eye.z = camera->lookAt_obj.z + ((sinTheta2 * zero) + (temp_f24_2 * cosTheta2)); } camera->currentYaw = atan2(camera->lookAt_eye.x, camera->lookAt_eye.z, camera->lookAt_obj.x, camera->lookAt_obj.z); lookXDelta = camera->lookAt_obj.x - camera->lookAt_eye.x; lookYDelta = camera->lookAt_obj.y - camera->lookAt_eye.y; lookZDelta = camera->lookAt_obj.z - camera->lookAt_eye.z; - camera->currentBlendedYawNegated = -atan2(0.0f, 0.0f, lookXDelta, lookZDelta); - camera->currentPitch = atan2(0.0f, 0.0f, lookYDelta, -sqrtf(SQ(lookXDelta) + SQ(lookZDelta))); + camera->currentBlendedYawNegated = -atan2(zero, zero, lookXDelta, lookZDelta); + camera->currentPitch = atan2(zero, zero, lookYDelta, -sqrtf(SQ(lookXDelta) + SQ(lookZDelta))); } #else INCLUDE_ASM(void, "B0E0", update_camera_mode_unused, Camera* camera); diff --git a/src/E20110.c b/src/E20110.c index df659b56ec..2a1767939e 100644 --- a/src/E20110.c +++ b/src/E20110.c @@ -4,16 +4,17 @@ typedef struct TempE20110 { /* 0x00 */ Vec3f pos; - /* 0x0C */ f32 scale; - /* 0x10 */ f32 unk_10; - /* 0x14 */ char unk_14[0x4]; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 scale; + /* 0x14 */ s32 unk_14; /* 0x18 */ s32 unk_18; /* 0x1C */ s32 unk_1C; /* 0x20 */ s8 unk_20; /* 0x21 */ s8 unk_21; /* 0x22 */ s8 unk_22; - /* 0x23 */ s8 unk_23; - /* 0x24 */ s32 unk_24; + /* 0x23 */ u8 unk_23; + /* 0x24 */ u8 unk_24; + /* 0x25 */ char unk_25[0x3]; } TempE20110; // size = 0x28 BSS TempE20110 D_802B7DA0; @@ -28,6 +29,7 @@ TempE20110* D_802B7CB8_E20DC8 = &D_802B7DA0; #include "common/UnkAngleFunc1.inc.c" void func_802B7728_E20838(void); +void func_802B79C8_E20AD8(void); // floatz #ifdef NON_MATCHING @@ -58,8 +60,39 @@ void func_802B70B4_E201C4(void) { INCLUDE_ASM(s32, "E20110", func_802B70B4_E201C4); #endif -INCLUDE_ASM(s32, "E20110", func_802B71E8_E202F8); +void func_802B71E8_E202F8(void) { + FoldImageRecPart sp20; + Matrix4f sp38, sp78; + if (gPlayerStatus.animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE) { + guScaleF(sp38, D_802B7CB8_E20DC8->scale, D_802B7CB8_E20DC8->scale, D_802B7CB8_E20DC8->scale); + guRotateF(sp78, D_802B7CB8_E20DC8->unk_0C - gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp38, sp78, sp38); + guTranslateF(sp78, D_802B7CB8_E20DC8->pos.x, D_802B7CB8_E20DC8->pos.y, D_802B7CB8_E20DC8->pos.z); + guMtxCatF(sp38, sp78, sp78); + guMtxF2L(sp78, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, &D_802B7C40_E20D50); + + sp20.raster = D_802B7A20_E20B30; + sp20.palette = D_802B7C20_E20D30; + sp20.width = D_802B7A20_E20B30_width; + sp20.height = D_802B7A20_E20B30_height; + sp20.xOffset = -16; + sp20.yOffset = 26; + sp20.opacity = 255; + fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0x440); + fold_update(0, FOLD_TYPE_6, + D_802B7CB8_E20DC8->unk_24, D_802B7CB8_E20DC8->unk_24, D_802B7CB8_E20DC8->unk_24, 0xFF, 0x448); + fold_appendGfx_component(0, &sp20, 0, sp78); + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + } +} + +s32 func_802B7450_E20560(void); INCLUDE_ASM(s32, "E20110", func_802B7450_E20560); void func_802B75E8_E206F8(void) { @@ -96,7 +129,75 @@ void func_802B75E8_E206F8(void) { D_802B7CB8_E20DC8->pos.y += delta; } -INCLUDE_ASM(s32, "E20110", func_802B7728_E20838); +void func_802B7728_E20838(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + s32 var_s0 = 0xFF; + f32 scale; + s32 actionState; + + func_802B75E8_E206F8(); + + switch (D_802B7CB8_E20DC8->unk_23) { + case 0: + D_802B7CB8_E20DC8->unk_0C = 0.0f; + D_802B7CB8_E20DC8->scale += 0.05; + if (D_802B7CB8_E20DC8->scale >= 0.55) { + D_802B7CB8_E20DC8->scale = 0.55f; + D_802B7CB8_E20DC8->unk_23++; + D_802B7CB8_E20DC8->unk_14 = 12; + } + break; + case 1: + D_802B7CB8_E20DC8->unk_0C = 0.0f; + D_802B7CB8_E20DC8->unk_14--; + if (D_802B7CB8_E20DC8->unk_14 <= 0) { + D_802B7CB8_E20DC8->unk_23++; + } + break; + case 2: + scale = D_802B7CB8_E20DC8->unk_0C; + scale += 10.0f; + if (scale >= 360.0f) { + scale -= 360.0f; + } + D_802B7CB8_E20DC8->unk_0C = scale; + var_s0 = E20110_UnkAngleFunc1(scale); + break; + case 3: + scale = D_802B7CB8_E20DC8->unk_0C; + scale += 25.0f; + if (scale >= 360.0f) { + scale -= 360.0f; + } + D_802B7CB8_E20DC8->unk_0C = scale; + D_802B7CB8_E20DC8->unk_1C -= 25; + if (D_802B7CB8_E20DC8->unk_1C < 0) { + D_802B7CB8_E20DC8->unk_1C = 0; + } + if ((scale >= 70.0f && scale <= 110.0f) || (scale >= 250.0f && scale <= 290.0f)) { + D_8010C958 = func_802B79C8_E20AD8; + } + var_s0 = E20110_UnkAngleFunc1(scale); + break; + } + D_802B7CB8_E20DC8->unk_24 = var_s0; + + actionState = playerStatus->actionState; + if ((func_802B7450_E20560() == 0) || + (playerStatus->inputEnabledCounter != 0) || + (playerStatus->flags & PS_FLAGS_20) || + !(actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || actionState == ACTION_STATE_RUN)) + { + D_802B7CB8_E20DC8->unk_23 = 3; + } + + if ((playerStatus->interactingWithID >= 0) && + (playerStatus->interactingWithID & 0x4000) && + !(get_entity_by_index(playerStatus->interactingWithID)->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT)) + { + D_802B7CB8_E20DC8->unk_23 = 3; + } +} void func_802B79C8_E20AD8(void) { func_802B75E8_E206F8(); diff --git a/src/E225B0.c b/src/E225B0.c index a29cbf0316..734d0b3ad3 100644 --- a/src/E225B0.c +++ b/src/E225B0.c @@ -34,13 +34,12 @@ void func_802B7000_E225B0(void) { s32 temp; if (gPlayerStatus.animFlags & PA_FLAGS_100) { - guScaleF(matrix1, D_802B7C78_E23228->scale, D_802B7C78_E23228->scale, - D_802B7C78_E23228->scale); + guScaleF(matrix1, D_802B7C78_E23228->scale, D_802B7C78_E23228->scale, D_802B7C78_E23228->scale); guRotateF(matrix2, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); guMtxCatF(matrix1, matrix2, matrix1); guTranslateF(matrix2, D_802B7C78_E23228->pos.x, D_802B7C78_E23228->pos.y, D_802B7C78_E23228->pos.z); guMtxCatF(matrix1, matrix2, matrix2); - guMtxF2L(matrix2, (Mtx*) &gDisplayContext->matrixStack[gMatrixListPos]); + guMtxF2L(matrix2, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], 3); gSPDisplayList(gMasterGfxPos++, D_802B7C00_E231B0); @@ -121,7 +120,6 @@ void func_802B735C_E2290C(void) { if (!cond) { D_802B7C78_E23228->unk_24++; - return; } break; case 1: diff --git a/src/EB7540.c b/src/EB7540.c index 00a6a64cb9..96df4c04f6 100644 --- a/src/EB7540.c +++ b/src/EB7540.c @@ -1,16 +1,75 @@ #include "dead.h" #include "common.h" +#include "effects.h" -// Copy of kzn_23 (C9C610.c) +// Copy of kzn_23 (kzn_23_2_extra.c) #define NAMESPACE EB7540 -#include "world/common/SetEntityPositionF.inc.c" +API_CALLABLE(N(SetChestPosition)) { + Bytecode* args = script->ptrReadPos; + s32 entityIndex = evt_get_variable(script, *args++); + f32 x = evt_get_variable(script, *args++); + f32 y = evt_get_variable(script, *args++); + f32 z = evt_get_variable(script, *args++); + Entity* entity = get_entity_by_index(entityIndex); -#include "world/common/GetEntityPosition.inc.c" + entity->position.x = x; + entity->position.y = y; + entity->position.z = z; + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "EB7540", func_80240478_EB76A8); +API_CALLABLE(N(GetChestPosition)) { + Bytecode* args = script->ptrReadPos; + Entity* entity = get_entity_by_index(evt_get_variable(script, *args++)); -#include "world/common/UnsetCamera0MoveFlag1.inc.c" + evt_set_variable(script, *args++, entity->position.x); + evt_set_variable(script, *args++, entity->position.y); + evt_set_variable(script, *args++, entity->position.z); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "EB7540", func_80240520_EB7750); +API_CALLABLE(N(SetPyroclastPos)) { + Bytecode* args = script->ptrReadPos; + f32 x = evt_get_float_variable(script, *args++); + f32 y = evt_get_float_variable(script, *args++); + f32 z = evt_get_float_variable(script, *args++); + EffectInstance* effect = script->varTablePtr[0xE]; + + effect->data.unk_65->pos.x = x; + effect->data.unk_65->pos.y = y; + effect->data.unk_65->pos.z = z; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(AllowCameraInterpY)) { + Camera* camera = &gCameras[CAM_DEFAULT]; + + camera->moveFlags &= ~CAMERA_MOVE_IGNORE_PLAYER_Y; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(AnimateChestSize)) { + Entity* entity = get_entity_by_index(script->varTable[0xA]); + + if (isInitialCall) { + script->functionTemp[0] = 0; + script->functionTemp[1] = 60; + } + + entity->scale.x = script->functionTemp[1] / 60.0f; + entity->scale.y = script->functionTemp[1] / 60.0f; + entity->scale.z = script->functionTemp[1] / 60.0f; + + entity->rotation.y = (1.0f - cos_rad(entity->scale.y * PI)) * 990.0 / 2.0; + + script->functionTemp[1]--; + if (~script->functionTemp[1] == 0) { //TODO remove ~ optimization + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +const char* N(exit_str_0) = "jan_04"; diff --git a/src/ED46D0.c b/src/ED46D0.c index f5ed00b39a..3934a80a10 100644 --- a/src/ED46D0.c +++ b/src/ED46D0.c @@ -1,10 +1,193 @@ #include "dead.h" -#include "common.h", +#include "common.h" +#include "nu/nusys.h" +#include "model.h" // Copy of flo_10 (CB96B0.c) #define NAMESPACE ED46D0 -INCLUDE_ASM(s32, "ED46D0", func_802404B0_ED46D0); +// rodata +extern char D_80244BB8_ED8DD8[]; +extern char D_80244BEC_ED8E0C[]; -INCLUDE_ASM(s32, "ED46D0", func_80240B10_ED4D30); +void N(UnkModelFunc000)(s32, s32, s32, s32); +INCLUDE_ASM(s32, "ED46D0", ED46D0_UnkModelFunc000); + +s32 func_80066FE0(u16*); + +// Similar to the flo_10 counterpart but contains debug code +void N(UnkModelFunc001)(void) { + Camera* camera = &gCameras[gCurrentCameraID]; + Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(0x30)); + ModelBoundingBox* bb = (ModelBoundingBox*) model->modelNode->propertyList; + f32 bbHalfX = bb->halfSizeX; + f32 bbHalfZ = bb->halfSizeZ; + f32 outX, outY, outZ, outS; + Gfx* new_var; + f32 temp_f24; + f32 temp_f26; + f32 temp_f20; + f32 temp_f22; + + transform_point(camera->perspectiveMatrix, + model->center.x - bbHalfX, model->center.y, model->center.z - bbHalfZ, 1.0f, + &outX, &outY, &outZ, &outS); + + outX *= 1.0f / outS; + outY *= -(1.0f / outS); + outZ *= 1.0f / outS; + outS = 1.0f / outS; + + if (outS < 0.0f) { + outX = 0.0f; + outY = 1.0f; + } + temp_f20 = outX; + temp_f22 = outY; + + transform_point(camera->perspectiveMatrix, + model->center.x - bbHalfX, model->center.y, model->center.z + bbHalfZ, 1.0f, + &outX, &outY, &outZ, &outS); + + outX *= 1.0f / outS; + outY *= -(1.0f / outS); + outZ *= 1.0f / outS; + outS = 1.0f / outS; + + temp_f24 = temp_f20; + temp_f26 = temp_f22; + if (outS < 0.0f) { + outX = 0.0f; + outY = 1.0f; + } + + if (temp_f24 > outX) { + temp_f24 = outX; + } + + if (temp_f26 > outY) { + temp_f26 = outY; + } + + if (temp_f20 < outX) { + temp_f20 = outX; + } + + if (temp_f22 < outY) { + temp_f22 = outY; + } + + transform_point(camera->perspectiveMatrix, + model->center.x + bbHalfX, model->center.y, model->center.z + bbHalfZ, 1.0f, + &outX, &outY, &outZ, &outS); + + outX *= 1.0f / outS; + outY *= -(1.0f / outS); + outZ *= 1.0f / outS; + outS = 1.0f / outS; + + if (outS < 0.0f) { + outX = 1.0f; + outY = 1.0f; + } + + if (temp_f24 > outX) { + temp_f24 = outX; + } + + if (temp_f26 > outY) { + temp_f26 = outY; + } + + if (temp_f20 < outX) { + temp_f20 = outX; + } + + if (temp_f22 < outY) { + temp_f22 = outY; + } + + transform_point(camera->perspectiveMatrix, + model->center.x + bbHalfX, model->center.y, model->center.z - bbHalfZ, 1.0f, + &outX, &outY, &outZ, &outS); + + outX *= 1.0f / outS; + outY *= -(1.0f / outS); + outZ *= 1.0f / outS; + outS = 1.0f / outS; + + if (outS < 0.0f) { + outX = 1.0f; + outY = 1.0f; + } + + if (temp_f24 > outX) { + temp_f24 = outX; + } + + if (temp_f26 > outY) { + temp_f26 = outY; + } + + if (temp_f20 < outX) { + temp_f20 = outX; + } + + if (temp_f22 < outY) { + temp_f22 = outY; + } + + if (temp_f24 != temp_f20 || temp_f26 != temp_f22) { + temp_f24 = ((temp_f24 * camera->viewportW) + camera->viewportW) * 0.5f; + temp_f26 = ((temp_f26 * camera->viewportH) + camera->viewportH) * 0.5f; + temp_f20 = ((temp_f20 * camera->viewportW) + camera->viewportW) * 0.5f; + temp_f22 = ((temp_f22 * camera->viewportH) + camera->viewportH) * 0.5f; + + temp_f24 += camera->viewportStartX; + temp_f26 += camera->viewportStartY; + temp_f20 += camera->viewportStartX; + temp_f22 += camera->viewportStartY; + + gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gDPSetRenderMode(gMasterGfxPos++, Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | G_RM_PASS, + Z_CMP | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)); + + new_var = gMasterGfxPos++; + if ((func_80066FE0(nuGfxZBuffer) % 8) != 0) { + osSyncPrintf(D_80244BB8_ED8DD8, D_80244BEC_ED8E0C, 175, func_80066FE0(nuGfxZBuffer)); + } + gDPSetColorImage(new_var, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxZBuffer)); + + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, 0); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 248, 240, 240, 0); + gDPPipeSync(gMasterGfxPos++); + + gSPDisplayList(gMasterGfxPos++, model->modelNode->displayData->displayList); + gDPPipeSync(gMasterGfxPos++); + + new_var = gMasterGfxPos++; + if ((func_80066FE0(nuGfxCfb_ptr) % 8) != 0) { + osSyncPrintf(D_80244BB8_ED8DD8, D_80244BEC_ED8E0C, 186, func_80066FE0(nuGfxCfb_ptr)); + } + gDPSetColorImage(new_var, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); + + gDPSetDepthSource(gMasterGfxPos++, G_ZS_PRIM); + gDPSetPrimDepth(gMasterGfxPos++, 32734, 0); + gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_XLU_DECAL, G_RM_ZB_XLU_DECAL2); + gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); + gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); + gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); + gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); + gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE); + gDPPipeSync(gMasterGfxPos++); + + N(UnkModelFunc000)(temp_f24, temp_f26, temp_f20, temp_f22); + + gDPPipeSync(gMasterGfxPos++); + gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); + gDPSetDepthSource(gMasterGfxPos++, G_ZS_PIXEL); + } +} diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index cd2a63a08f..eb0c0aff52 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -4260,7 +4260,7 @@ void get_model_env_color_parameters(u8* primR, u8* primG, u8* primB, u8* envR, u *envB = gRenderModelEnvB; } -void mdl_get_vertex_count(Gfx* gfx, s32* numVertices, s32* baseVtx, s32* gfxCount, Vtx* baseAddr) { +void mdl_get_vertex_count(Gfx* gfx, s32* numVertices, Vtx** baseVtx, s32* gfxCount, Vtx* baseAddr) { s8 stuff[2]; s32 vtxCount; @@ -4276,7 +4276,7 @@ void mdl_get_vertex_count(Gfx* gfx, s32* numVertices, s32* baseVtx, s32* gfxCoun if (gfx == NULL) { *numVertices = maxVtx; - *baseVtx = minVtx; + *baseVtx = (Vtx*)minVtx; } else { Gfx* baseGfx = gfx; @@ -4307,23 +4307,58 @@ void mdl_get_vertex_count(Gfx* gfx, s32* numVertices, s32* baseVtx, s32* gfxCoun } while (cmd != G_ENDDL); *numVertices = (maxVtx - minVtx) >> 4; - *baseVtx = minVtx; + *baseVtx = (Vtx*)minVtx; *gfxCount = gfx - baseGfx; w1 = gfx->words.w1; // TODO required to match } } +// void mdl_local_gfx_update_vtx_pointers(Gfx* nodeDlist, Vtx* baseVtx, Gfx* arg2, Vtx* arg3); INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_local_gfx_update_vtx_pointers); -void mdl_local_gfx_copy_vertices(u8* from, s32 num, u8* to) { +void mdl_local_gfx_copy_vertices(Vtx* from, s32 num, Vtx* to) { u32 i; - for (i = 0; i < num * 16; i++) { - to[i] = from[i]; + for (i = 0; i < num * sizeof(*from); i++) { + ((u8*)to)[i] = ((u8*)from)[i]; } } -INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_make_local_vertex_copy); +void mdl_make_local_vertex_copy(s32 arg0, u16 treeIdx, s32 arg2) { + s32 numVertices; + Vtx* baseVtx; + s32 gfxCount; + Gfx* nodeDlist; + Model* model; + ModelLocalVertexCopy* copy; + s32 i; + + model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIdx)); + nodeDlist = model->modelNode->displayData->displayList; + mdl_get_vertex_count(nodeDlist, &numVertices, &baseVtx, &gfxCount, NULL); + + copy = (*gCurrentModelLocalVtxBuffers)[arg0] = heap_malloc(sizeof(*copy)); + + if (arg2) { + for (i = 0; i < ARRAY_COUNT(copy->gfxCopy); i++) { + copy->gfxCopy[i] = heap_malloc(gfxCount * sizeof(*copy->gfxCopy[i])); + copy->vtxCopy[i] = heap_malloc(numVertices * sizeof(*copy->vtxCopy[i])); + mdl_local_gfx_update_vtx_pointers(nodeDlist, baseVtx, copy->gfxCopy[i], copy->vtxCopy[i]); + mdl_local_gfx_copy_vertices(baseVtx, numVertices, copy->vtxCopy[i]); + } + model->flags |= MODEL_FLAGS_HAS_LOCAL_VERTEX_COPY; + } else { + for (i = 0; i < ARRAY_COUNT(copy->gfxCopy); i++) { + copy->gfxCopy[i] = NULL; + copy->vtxCopy[i] = NULL; + } + model->flags |= MODEL_FLAGS_ENABLED; + } + + copy->selector = 0; + copy->numVertices = numVertices; + copy->minVertexAddr = baseVtx; +} void mdl_get_copied_vertices(s32 copyIndex, Vtx** firstVertex, Vtx** copiedVertices, s32* numCopied) { ModelLocalVertexCopy* mlvc = (*gCurrentModelLocalVtxBuffers)[copyIndex]; diff --git a/src/battle/item/insecticide_herb.c b/src/battle/item/insecticide_herb.c index e68575ec3c..6198d7bc37 100644 --- a/src/battle/item/insecticide_herb.c +++ b/src/battle/item/insecticide_herb.c @@ -88,7 +88,7 @@ s32 N(modelCommandList)[] = { 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), &N(displayList), 0x00000002, 0x00000000, }; -EvtScript script = { +EvtScript N(main) = { EVT_SET_CONST(LVarA, 0x00000087) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) diff --git a/src/battle/item/strange_cake.c b/src/battle/item/strange_cake.c index cb8a549ed4..11523be538 100644 --- a/src/battle/item/strange_cake.c +++ b/src/battle/item/strange_cake.c @@ -262,7 +262,7 @@ s32 N(D_802A2858_732B58)[] = { 0, 1, 2, 0, 1, 0 }; -EvtScript N(script6) = { +EvtScript N(main) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar1, ITEM_KOOKY_COOKIE) EVT_SET_CONST(LVarA, ITEM_KOOKY_COOKIE) diff --git a/src/battle/move/auto_jump/auto_jump.c b/src/battle/move/auto_jump/auto_jump.c index 5d96c73a11..98545fd8ac 100644 --- a/src/battle/move/auto_jump/auto_jump.c +++ b/src/battle/move/auto_jump/auto_jump.c @@ -367,7 +367,7 @@ EvtScript D_802A2384 = { EVT_END }; -EvtScript D_802A2600 = { +EvtScript N(main) = { EVT_CALL(SetBattleFlagBits, BS_FLAGS1_1000, 1) EVT_CALL(func_802694A4, 0) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 1) diff --git a/src/battle/move/auto_multibounce/auto_multibounce.c b/src/battle/move/auto_multibounce/auto_multibounce.c index 3f6839d4c5..b008e06969 100644 --- a/src/battle/move/auto_multibounce/auto_multibounce.c +++ b/src/battle/move/auto_multibounce/auto_multibounce.c @@ -367,7 +367,7 @@ EvtScript N(D_802A2384) = { EVT_END }; -EvtScript N(D_802A2600) = { +EvtScript N(main) = { EVT_CALL(func_802694A4, 1) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_1000, 1) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/hammer.c b/src/battle/move/hammer/hammer.c index 981e35dae7..624b683642 100644 --- a/src/battle/move/hammer/hammer.c +++ b/src/battle/move/hammer/hammer.c @@ -600,7 +600,7 @@ EvtScript D_802A2DA0_00736340 = { EVT_END }; -EvtScript D_802A3044_007365E4 = { +EvtScript battle_move_hammer_802A3044 = { EVT_CALL(func_802694A4, 1) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -721,7 +721,7 @@ EvtScript D_802A3168_00736708 = { EVT_END }; -EvtScript D_802A369C_00736C3C = { +EvtScript battle_move_hammer_802A369C = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) @@ -796,7 +796,7 @@ EvtScript D_802A369C_00736C3C = { EVT_END }; -EvtScript D_802A3B28_007370C8 = { +EvtScript battle_move_hammer_802A3B28 = { EVT_CALL(func_802694A4, 1) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) diff --git a/src/battle/move/jump/jump.c b/src/battle/move/jump/jump.c index 71be2aa904..7fac8787d1 100644 --- a/src/battle/move/jump/jump.c +++ b/src/battle/move/jump/jump.c @@ -376,7 +376,7 @@ EvtScript D_802A23D4_73EC34 = { EVT_END }; -EvtScript D_802A2650_73EEB0 = { +EvtScript N(802A2650) = { EVT_CALL(func_802694A4, 1) EVT_CALL(GetBattleFlags2, LVar0) EVT_IF_FLAG(LVar0, BS_FLAGS2_200) @@ -569,7 +569,7 @@ EvtScript D_802A2DE8_73F648 = { EVT_END }; -EvtScript D_802A30F4_73F954 = { +EvtScript N(802A30F4) = { EVT_CALL(func_802694A4, 1) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -675,7 +675,7 @@ EvtScript D_802A34EC_73FD4C = { EVT_END }; -EvtScript D_802A3644_73FEA4 = { +EvtScript N(802A3644) = { EVT_CALL(func_802694A4, 1) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) diff --git a/src/battle/move/quake_hammer/quake_hammer.c b/src/battle/move/quake_hammer/quake_hammer.c index 6449d64629..367d8779c8 100644 --- a/src/battle/move/quake_hammer/quake_hammer.c +++ b/src/battle/move/quake_hammer/quake_hammer.c @@ -599,7 +599,7 @@ EvtScript D_802A2DA0_0073CC70 = { EVT_END }; -EvtScript D_802A3044_0073CF14 = { +EvtScript battle_move_quake_hammer_main = { EVT_CALL(func_802694A4, 1) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) diff --git a/src/battle/move/spin_smash/spin_smash.c b/src/battle/move/spin_smash/spin_smash.c index 57f31b03be..c70db67ffe 100644 --- a/src/battle/move/spin_smash/spin_smash.c +++ b/src/battle/move/spin_smash/spin_smash.c @@ -625,7 +625,7 @@ EvtScript D_802A2E80_739710 = { EVT_END }; -EvtScript D_802A3124_7399B4 = { +EvtScript battle_move_spin_smash_main = { EVT_CALL(func_802694A4, 1) EVT_CALL(func_80269EAC, 2) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) diff --git a/src/bss.c b/src/bss.c deleted file mode 100644 index e9fdb5c2d6..0000000000 --- a/src/bss.c +++ /dev/null @@ -1,370 +0,0 @@ -#include "types.h" - -// This file exists to enforce the order of BSS symbols, since they were reordered in the original rom. - -#ifndef M2CTX -#define BSS __attribute__ ((section (".bss"))) -#else -#define BSS static -#endif - -BSS u8 nuScPreNMIFlag; -BSS char D_8009A5B4[0x4]; -BSS s32 D_8009A5B8; -BSS char D_8009A5BC[0x4]; -BSS s32 gSoundGlobals; -BSS char D_8009A5C4[0x4]; -BSS s32 __osBaseCounter; -BSS s32 gBGMPlayerC; -BSS s32 D_8009A5D0; -BSS void (*CurrentSefCmdHandler)(void*, void*); // SoundManager*, SoundPlayer* -BSS s32 timeFreezeMode; -BSS s32 nuGfxZBuffer; -BSS u32 nuContDataLockKey; -BSS s32 __osViIntrCount; -BSS s32 BeginSoundUpdateCallback; -BSS float D_8009A5EC; -BSS u32 nuGfxCfbCounter; -BSS s32 mdl_currentModelTreeNodeInfo; -BSS u32 nuGfxDisplay; -BSS s32 gBGMPlayerB; -BSS s32 gGameState; -BSS s16 gNpcCount; -BSS s16 __osMaxControllers; -BSS s32 __osCurrentTime; -BSS s32 D_8009A60C; -BSS s32 nuGfxUcode; -BSS u32 nuContNum; -BSS u32 nuGfxTaskSpool; -BSS u8 __osContLastCmd; -BSS s32 D_8009A620; -BSS char D_8009A624[0x4]; -BSS s32 gAuAmbienceManager; -BSS s32 __osTimerCounter; -BSS s32 D_8009A630; -BSS s16 gCurrentCamID; -BSS s32 nuPiCartHandle; -BSS s32 D_8009A63C; -BSS s32 gSoundManager; -BSS char D_8009A644[0x8]; -BSS s32 nuGfxCfb_ptr; -BSS s32 gOverrideFlags; -BSS s8 D_8009A654; -BSS s32* nuGfxCfb; -BSS char D_8009A65C[0x4]; -BSS s32 D_8009A660; -BSS s32 gBGMPlayerA; -BSS s16 D_8009A668; -BSS s32 gMasterGfxPos; -BSS s32 D_8009A670; -BSS s32 gDisplayContext; -BSS s32 D_8009A678; -BSS char D_8009A67C[0x4]; -BSS s32 D_8009A680; -BSS char D_8009A684[0xC]; -BSS s16 D_8009A690; -BSS char D_8009A694[0xC]; -BSS u16 D_8009A6A0; -BSS u16 D_8009A6A2; -BSS u16 D_8009A6A4; -BSS u16 D_8009A6A6; -BSS char D_8009A6A8[0x8]; -BSS s8 D_8009A6B0[0x1380]; -BSS s32 logicalSaveInfo[4][2]; -BSS s32 physicalSaveInfo[6][2]; -BSS s32 nextAvailableSavePage; -BSS char D_8009BA84[0xC]; -BSS float gCurtainScale; -BSS float gCurtainScaleGoal; -BSS float gCurtainFade; -BSS float gCurtainFadeGoal; -BSS UNK_FUN_PTR(gCurtainDrawCallback); -BSS char D_8009BAA4[0x4]; -BSS s8 D_8009BAA8[0x40 * 2]; -BSS char D_8009BA28[0x8]; -BSS s8 gCrashScreen[0x9E0]; -BSS s32 nuGfxTask_ptr; -BSS s16 taskDoneMsg; -BSS s16 swapBufMsg; -BSS s8 GfxTaskMgrThread[0x21B0]; -BSS char D_8009E6C8[0x8]; -BSS s32 D_8009E6D0[8]; -BSS s32 nuSiMesgBuf[8]; -BSS s8 siMgrThread[0x21B0]; -BSS s8 blendedCamSettings[0x1C]; -BSS float D_800A08DC; -BSS float D_800A08E0; -BSS s32 D_800A08E4; -BSS s32 D_800A08E8; -BSS s32 D_800A08EC; -BSS s16 gameMode; -BSS char D_800A08F4[0xC]; -BSS s8 D_800A0900; -BSS s32 D_800A0904; -BSS s32 D_800A0908; -BSS char D_800A090C[0x4]; -BSS s32 gLogosImages; -BSS s32 gLogosImage3; -BSS s32 gLogosImage1; -BSS s32 gLogosImage2; -BSS s8 D_800A0920; -BSS s8 D_800A0921; -BSS s16 D_800A0922; -BSS s32 D_800A0924; -BSS char D_800A0928[0x8]; -BSS s8 D_800A0930; -BSS s8 D_800A0931; -BSS s16 D_800A0932; -BSS char D_800A0934[0xC]; -BSS s16 gMapTransitionAlpha; -BSS s16 D_800A0942; -BSS s16 D_800A0944; -BSS s16 D_800A0946; -BSS s16 D_800A0948; -BSS char D_800A094C[0x4]; -BSS s32 D_800A0950; -BSS s16 D_800A0954; -BSS s16 D_800A0956; -BSS s16 D_800A0958; -BSS s8 D_800A095A; -BSS u8 D_800A095B; -BSS s8 D_800A095C; -BSS u8 D_800A095D; -BSS s8 D_800A095E; -BSS u8 D_800A095F; -BSS s8 D_800A0960[3]; -BSS u8 D_800A0963; -BSS s32 D_800A0964; -BSS char D_800A0968[0x8]; -BSS s32 D_800A0970; -BSS s32 D_800A0974; -BSS s32 D_800A0978; -BSS s32 D_800A097C; -BSS s32 D_800A0980; -BSS char D_800A0984[0x4]; -BSS s32 D_800A0988; -BSS char D_800A098C[0x4]; -BSS s8 gWorldNpcList[0x100]; -BSS s8 gBattleNpcList[0x100]; -BSS s32 gCurrentNpcListPtr; -BSS s8 D_800A0B94; -BSS char D_800A0B98[0x8]; -BSS s32 D_800A0BA0; -BSS float D_800A0BA4; -BSS s32 WorldMerleeOrbEffect; -BSS s32 WorldMerleeWaveEffect; -BSS s32 D_800A0BB0; -BSS s32 D_800A0BB4; -BSS s16 D_800A0BB8; -BSS char D_800A0BBC[0x4]; -BSS s8 D_800A0BC0[32 * 0x1C]; -BSS s32 D_800A0F40; -BSS s32 D_800A0F44; -BSS char D_800A0F48[0x8]; -BSS u16 D_800A0F50; -BSS char D_800A0F54[0x4]; -BSS s8 nuAuMgrThread[0x25B8]; -BSS s32 AlCmdListBuffers[3]; -BSS char D_800A351C[4]; -BSS s32 D_800A3520; -BSS char D_800A3524[0x104]; -BSS s8 D_800A3628[0xC]; -BSS s32 AlFrameSize; -BSS s32 AlMinFrameSize; -BSS char D_800A363C[0x4]; -BSS s32 nuAuDmaMesgQ; -BSS char D_800A3644[0x14]; -BSS s8 nuAuDmaMesgBuf[0xC8]; -BSS s8 nuAuDmaIOMesgBuf[0x4B0]; -BSS s32 nuAuDmaState; -BSS s32 D_800A3BD4; -BSS char D_800A3BD8[0x8]; -BSS s8 nuAuDmaBufList[50 * 0x14]; -BSS s8 D_800A3FC8[8]; -BSS s32 CurrentSeqCmdHandler; -BSS char D_800A3FD4[0xC]; -BSS s32 D_800A3FE0; -BSS s32 D_800A3FE4; -BSS s32 D_800A3FE8; -BSS u8 D_800A3FEC; -BSS s16 D_800A3FEE; -BSS s32 D_800A3FF0; -BSS char D_800A3FF4[0xC]; -BSS s8 gEffectGraphicsData[15 * 0x1D]; -BSS char D_800A41B4[0xC]; -BSS s32 D_800A41C0; -BSS char D_800A41C4[0x1C]; -BSS s32 gMapConfig; -BSS char D_800A41E4[0x4]; -BSS s32 gMapSettings; -BSS char D_800A41EC[0x44]; -BSS float gCollisionRayStartX; -BSS float gCollisionRayStartY; -BSS float gCollisionRayStartZ; -BSS float gCollisionRayDirX; -BSS float gCollisionRayDirY; -BSS float gCollisionRayDirZ; -BSS float gCollisionPointX; -BSS float gCollisionPointY; -BSS float gCollisionPointZ; -BSS float gCollisionRayLength; -BSS s32 gCollisionNormalX; -BSS s32 gCollisionNormalY; -BSS s32 gCollisionNormalZ; -BSS s32 gCollisionDataBackup; -BSS s32 gCollisionDataZoneBackup; -BSS char D_800A426C[0x4]; -BSS s8 D_800A4270[0x1B0]; -BSS s8 D_800A4420[0x21B0]; -BSS s8 nuScStack[0x2000]; -BSS s8 nuScAudioStack[0x2000]; -BSS s8 nuScGraphicsStack[0x2000]; -BSS s32 D_800AC5D0; -BSS char D_800AC5D4[0x14]; -BSS s8 D_800AC5E8[0xC8]; -BSS s8 nuGfxMesgBuf[0x2020]; -BSS s32 nuContWaitMesgBuf; -BSS s32 nuContDataMutexBuf; -BSS char D_800AC6D8[0x8]; -BSS s8 piMgrThread[0x11B0]; -BSS s32 __osPiMesgQueue; -BSS char D_800AF890[0x14]; -BSS s32 piMgrMesgBuff; -BSS char D_800AF8AC[0x4]; -BSS s32 piAccessBuf; -BSS char D_800AF8B4[0xC]; -BSS char tmp_task[0x40]; -BSS s32 siAccessBuf; -BSS char D_800AF904[0xC]; -BSS s32 D_800AF910; -BSS char D_800AF914[0x4]; -BSS s32 D_800AF918; -BSS char D_800AF91C[0x11B4]; -BSS s32 D_800B0AD0; -BSS char D_800B0AD4[0x14]; -BSS s32 D_800B0AE8; -BSS char D_800B0AEC[0x14]; -BSS s16 D_800B0B00; -BSS s16 D_800B0B02; -BSS s32 D_800B0B04; -BSS char D_800B0B08[0x10]; -BSS s16 D_800B0B18; -BSS s16 D_800B0B1A; -BSS s32 D_800B0B1C; -BSS char D_800B0B20[0x10]; -BSS s32 D_800B0B30; -BSS char D_800B0B34[0x38]; -BSS s32 D_800B0B6C; -BSS char D_800B0B70[0xC0]; -BSS s32 __osFlashID; -BSS char D_800B0C34[0xC]; -BSS s32 __osFlashMsg; -BSS char D_800B0C44[0x14]; -BSS s32 __osFlashMessageQ; -BSS char D_800B0C5C[0x14]; -BSS s32 __osFlashHandler; -BSS char D_800B0C74[0x70]; -BSS s32 __osFlashMsgBuf; -BSS s32 __osFlashVersion; -BSS char D_800B0CEC[0x4]; -BSS s32 wMapTexName; -BSS char D_800B0CF4[0x14]; -BSS s32 D_800B0D08; -BSS char D_800B0D0C[0x1AC]; -BSS s32 nuContWaitMesgQ; -BSS char D_800B0EBC[0x14]; -BSS s32 __osContPifRam; -BSS char D_800B0ED4[0x34]; -BSS s32 D_800B0F08; -BSS s32 D_800B0F0C; -BSS s8 gCurrentEncounter[0xBF8]; -BSS s32 LeoDiskHandle; -BSS s8 D_800B1B0C; -BSS s8 D_800B1B0D; -BSS s8 D_800B1B0E; -BSS s8 D_800B1B0F; -BSS s32 D_800B1B10; -BSS char D_800B1B14[0x68]; -BSS s32 nuContStatus[5]; -BSS s8 D_800B1B90[0x1B0]; -BSS s8 nuContRmbCtl[0x28]; -BSS s8 nuContData[0x18]; -BSS s8 gCameras[4 * 0x958]; -BSS s32 gCollisionData; -BSS char D_800B42E4[0xC]; -BSS s32 nuGfxMesgQ; -BSS char D_800B42F4[0x14]; -BSS s32 D_800B4308; -BSS s8 D_800B430C; -BSS s8 D_800B430D; -BSS s8 D_800B430E; -BSS s8 D_800B430F; -BSS s8 D_800B4310; -BSS s8 D_800B4311; -BSS s32 D_800B4314; -BSS s32 D_800B4318; -BSS char D_800B431C[0x64]; -BSS s32 __osPiAccessQueue; -BSS char D_800B4384[0x14]; -BSS s32 gEffectInstances[96]; -BSS s32 CartRomHandle; -BSS s8 D_800B451C; -BSS s8 D_800B451D; -BSS s8 D_800B451E; -BSS s8 D_800B451F; -BSS s8 D_800B4520[0x2070]; -BSS s8 D_800B6590[0x2000]; -BSS u8 nuYieldBuf[0xC10]; -BSS s8 auSynDriver[0x30]; // type: AuSynDriver -BSS s8 D_800B91D0[0x20000]; -BSS s8 gZoneCollisionData[0x10]; -BSS s8 wMapHitName[0x18]; -BSS s8 nuSiMgrMesgQ[0x38]; -BSS s8 wMapShapeName[0x18]; -BSS s8 nuAuHeap[0x30]; -BSS s8 nuGfxTask[10 * 0x58]; -BSS s8 D_800D95E8[0x38]; -BSS s8 D_800D9620[0x48]; -BSS s8 D_800D9668[0x18]; -BSS s8 __osPfsInodeCache[0x100]; -BSS s8 rspbootUcodeBuffer[0x100]; -BSS s8 D_800D9880[0x700]; -BSS s8 __osEventStateTab[0x80]; -BSS s8 __osPfsPifRam[0x3C]; -BSS s32 D_800DA03C; -BSS s8 D_800DA040[0x400]; -BSS s32 nusched; -BSS s8 D_800DA444[0x38]; -BSS s8 D_800DA47C[0x38]; -BSS s8 D_800DA4B4[0xA8]; -BSS s8 D_800DA55C[0x54C]; -BSS s8 D_800DAAA8[0x10]; -BSS s32 AlNumFields; -BSS s8 D_800DAABC; -BSS s8 D_800DAABD; -BSS s8 D_800DAAC0[0x18]; -BSS s8 nuContPfs[0x1A0]; -BSS s8 nuSiMesgQ[0x18]; -BSS s8 D_800DAC90[0x18]; -BSS s8 __osSiAccessQueue[0x18]; -BSS s8 gCurrentSaveFile[0x1380]; -BSS s8 nuContDataMutexQ[0x20]; -BSS s32 D_800DC060; -BSS s32 D_800DC064; -BSS s32 gBattleState; -BSS char D_800DC06C[0x4]; -BSS s8 gBattleStatus[0x460]; -BSS s32 D_800DC4D0; -BSS s32 D_800DC4D4; -BSS s32 D_800DC4D8; -BSS s32 gBattleState2; -BSS s32 D_800DC4E0; -BSS s32 D_800DC4E4; -BSS s16 D_800DC4E8; -BSS u8 gCurrentBattleSection; -BSS u8 D_800DC4EB; -BSS s32 D_800DC4EC; -BSS s32 D_800DC4F0; -BSS s32 D_800DC4F4; -BSS s32 D_800DC4F8; -BSS s32 D_800DC4FC; diff --git a/src/bss2.c b/src/bss2.c deleted file mode 100644 index b3f576054e..0000000000 --- a/src/bss2.c +++ /dev/null @@ -1,147 +0,0 @@ -#include "types.h" - -// This file exists to enforce the order of BSS symbols, since they were reordered in the original rom. - -#ifndef M2CTX -#define BSS __attribute__ ((section (".bss"))) -#else -#define BSS static -#endif - -BSS s32 D_8010C920; -BSS void* D_8010C924; -BSS s32 D_8010C928; -BSS s32 D_8010C92C; -BSS s32 wPartnerNpc; -BSS s32* TweesterTouchingPlayer; -BSS s32 D_8010C938; -BSS s32 D_8010C93C; -BSS s32 D_8010C940; -BSS s32 gSpinHistoryBufferPos; -BSS char D_8010C948[0x4]; -BSS s32 D_8010C94C; -BSS s32 D_8010C950; -BSS s32 TweesterTouchingPartner; -BSS s32 D_8010C958; -BSS s32 PrevPlayerDirection; -BSS s32 JumpedOnSwitchX; -BSS s32 D_8010C964; -BSS s32 D_8010C968; -BSS s32 PeachDisguiseNpcIndex; -BSS s32 D_8010C970; -BSS s32 D_8010C974; -BSS s16 D_8010C978; -BSS s16 D_8010C97A; -BSS s32 JumpedOnSwitchZ; -BSS s32 D_8010C980; -BSS s32 D_8010C984; -BSS char D_8010C988[0x4]; -BSS s32 D_8010C98C; -BSS s32 D_8010C990; -BSS char D_8010C994[0xC]; -BSS s32 D_8010C9A0; -BSS char D_8010C9A4[0xC]; -BSS s32 D_8010C9B0; -BSS char D_8010C9B4[0xC]; - -// Moved to 7fd10_len_b40.c -// BSS s32 D_8010C9C0; -// BSS char D_8010C9C4[0x4]; -// BSS s32 D_8010C9C8; -// BSS char D_8010C9CC[0x32C]; -// BSS s16 D_8010CCF8; -// BSS s16 D_8010CCFA; -// BSS s16 D_8010CCFC; -// BSS s16 D_8010CCFE; -// BSS s32 D_8010CD00; -// BSS char D_8010CD04[0xC]; -// BSS s16 D_8010CD10; -// BSS s16 D_8010CD12; -// BSS char D_8010CD14[0xC]; -// BSS s32 D_8010CD20; -// BSS char D_8010CD24[0xC]; - -// Moved to partners.c -// BSS s32 D_8010CD30; -// BSS s32 D_8010CD34; -// BSS s32 gPlayerMoveHistory; -// BSS char D_8010CD3C[0x27C]; -// BSS s32 gPlayerMoveHistoryIndex; -// BSS s32 D_8010CFBC; -// BSS s32 wPartnerTetherDistance; -// BSS s32 D_8010CFC4; -// BSS s16 wPartnerFollowState; -// BSS s16 D_8010CFCA; -// BSS s16 D_8010CFCC; -// BSS s16 D_8010CFCE; -// BSS s32 wPartnerNpcIndex; -// BSS s32 wPartnerCurrentScript; -// BSS s32 wCurrentPartnerId; -// BSS s32 wPartnerCurrentScriptID; -// BSS s32 D_8010CFE0; -// BSS s32 D_8010CFE4; -// BSS s32 D_8010CFE8; -// BSS s32 wPartner; -// BSS s32 D_8010CFF0; -// BSS s32 D_8010CFF4; -// BSS char D_8010CFF8[0x8]; -// BSS s32 D_8010D000; -// BSS char D_8010D004[0x63C]; -// BSS s32 D_8010D640; -// BSS s32 D_8010D644; -// BSS s32 D_8010D648; -// BSS s32 D_8010D64C; -// BSS s32 D_8010D650; -// BSS s8 D_8010D654; -// BSS s8 D_8010D655; -// BSS s16 D_8010D656; -// BSS s16 D_8010D658; -// BSS s16 D_8010D65A; -// BSS s32 D_8010D65C; -// BSS s32 D_8010D660; -// BSS s32 D_8010D664; -// BSS s32 D_8010D668; -// BSS s32 D_8010D66C; -// BSS s32 D_8010D670; -// BSS s32 D_8010D674; -// BSS s32 D_8010D678; -// BSS s16 D_8010D67C; -// BSS s16 D_8010D67E; -// BSS s16 D_8010D680; -// BSS s16 D_8010D682; -// BSS s16 D_8010D684; -// BSS s16 D_8010D686; -// BSS s16 D_8010D688; -// BSS s16 D_8010D68A; -// BSS s16 D_8010D68C; -// BSS s8 D_8010D68E; -// BSS s8 D_8010D68F; -// BSS s8 D_8010D690; -// BSS s8 D_8010D691; -// BSS s8 D_8010D692; -// BSS s8 D_8010D693; -// BSS s32 D_8010D694; -// BSS s8 D_8010D698; -// BSS s8 D_8010D699; -// BSS s16 D_8010D69A; -// BSS s32 gPopupMenu; -// BSS s32 D_8010D6A0; -// BSS s32 D_8010D6A4; -// BSS char D_8010D6A8[0x8]; -// BSS char D_8010D6B0[0x1500]; -// BSS char gPartnerActionStatus[0x360]; -// BSS char gSpinHistoryPosY[0x18]; -// BSS char gSpinHistoryPosX[0x18]; -// BSS char gSpinHistoryPosZ[0x18]; -// BSS char gUIStatus[0x3A]; -// BSS s16 D_8010EF92; -// BSS char D_8010EF94[0x8]; -// BSS s8 D_8010EF9C; -// BSS s8 D_8010EF9D; -// BSS s8 D_8010EF9E; -// BSS char D_8010EF9F; -// BSS char D_8010EFA0[0x28]; -// BSS s8 gPlayerStatus[0x288]; -// BSS s8 gPlayerSpinState[0x40]; -// BSS s8 gPlayerData[0x428]; -// BSS s8 gSpinHistoryPosAngle[0x18]; diff --git a/src/bss3.c b/src/bss3.c deleted file mode 100644 index 5cc056cae2..0000000000 --- a/src/bss3.c +++ /dev/null @@ -1,249 +0,0 @@ -#include "types.h" - -// This file exists to enforce the order of BSS symbols, since they were reordered in the original rom. - -#ifndef M2CTX -#define BSS __attribute__ ((section (".bss"))) -#else -#define BSS static -#endif - -BSS s32 D_801512B0; -BSS s32 gHudElementsNumber; -BSS s32 gCurrentCustomModelGfxBuildersPtr; -BSS s32 D_801512BC; -BSS s32 entity_numEntities; -BSS s32 gEntityHeapBase; -BSS s32 gHudElementCacheTableRaster; -BSS s32 gCurrentModels; -BSS s32 gHudElementCacheTablePalette; -BSS s32 gAnimCount; -BSS s16 gMsgBGScrollAmtX; -BSS s16 D_801512DA; -BSS s32 D_801512DC; -BSS s32 gCurrentTransformGroups; -BSS s32 gMsgGlobalWaveCounter; -BSS s32 gCurrentCustomModelGfxPtr; -BSS s32 gLastCreatedEntityIndex; -BSS s32 D_801512F0; -BSS s32 gMsgVarImages; -BSS s32 ItemEntitiesCreated; -BSS s32 gCurrentModelTreeRoot; -BSS s32 gEntityHeapBottom; -BSS s32 D_80151304; -BSS u32 D_80151308; -BSS s16 gMsgBGScrollAmtY; -BSS s16 D_8015130E; -BSS s32 gEntityHideMode; -BSS s32 gHudElementCacheBuffer; -BSS s32 gEntityModelCount; -BSS s32 D_8015131C; -BSS char D_80151320[0x4]; -BSS s32 entity_numShadows; -BSS s32 D_80151328; -BSS s32 entity_area_specific_data_is_loaded; -BSS s32 entity_updateCounter; -BSS s32 gTriggerCount; -BSS s32 D_80151338; -BSS s32 gHudElementCacheSize; -BSS u32 gCurrentDoorSoundsSet; -BSS s32 D_80151344; -BSS char D_80151348[0x38]; -BSS s8 gWorldEntityList[0x78]; -BSS s8 gBattleEntityList[0x78]; -BSS s32 gCurrentEntityListPtr; -BSS char D_80151474[0x4]; -BSS s8 gWorldShadowList[0xF0]; -BSS s8 gBattleShadowList[0xF0]; -BSS s32 gCurrentShadowListPtr; -BSS s32 wEntityDataLoadedSize; -BSS s32 bEntityDataLoadedSize; -BSS char D_80151664[0x4]; -BSS s8 wEntityBlueprint[0x74]; -BSS s32 D_801516DC; -BSS char D_8015DCE0[0x8]; -BSS s8 bEntityBlueprint[0x14]; -BSS s32 D_801516FC; -BSS s8 gMainGameState[0x40]; -BSS s8 gCurrentTileDescriptor[0x30]; -BSS s8 wModelList[0x400]; -BSS s8 bModelList[0x400]; -BSS s8 wTransformGroups[0x10]; -BSS s8 bTransformGroups[0x10]; -BSS s8 wModelSpecialDls[0x80]; -BSS s8 bModelSpecialDls[0x80]; -BSS s8 wCustomModelGfxBuilders[0x80]; -BSS s8 bCustomModelGfxBuilders[0x80]; -BSS s8 wModelLocalVtxBuffers[0x40]; -BSS s8 bModelLocalVtxBuffers[0x40]; -BSS s32 gCurrentModelLocalVtxBuffers; -BSS s32 D_80152214; -BSS s32 D_80152218; -BSS char D_8015221C[0x4]; -BSS s8 D_80152220[0x800]; -BSS s8 D_80152A20[0x800]; -BSS s8 wBgRenderType; -BSS s8 bBgRenderType; -BSS s8 D_80153222; -BSS s8 D_80153223; -BSS s16 mdl_treeIterPos; -BSS s16 D_80153226; -BSS s8 wFogSettings[0x20]; -BSS s8 bFogSettings[0x1C]; -BSS s32 gCurrentFogSettings; -BSS s8 texPannerMainU[0x40]; -BSS s8 texPannerMainV[0x40]; -BSS s8 texPannerAuxU[0x40]; -BSS s8 texPannerAuxV[0x40]; -BSS void* mdl_nextTextureAddress; -BSS s16 mdl_currentTransformGroupChildIndex; -BSS s16 D_8015336E; -BSS s32 D_80153370; -BSS s16 D_80153374; -BSS s16 D_80153376; -BSS s8 D_80153378[0x8]; -BSS s8 D_80153380[0x20]; -BSS s8 mdl_renderTaskLists[0xC]; -BSS s32 mdl_renderTaskQueueIdx; -BSS s8 mdl_renderTaskCount[0x10]; -BSS s8 D_801533C0[0x300]; -BSS s8 D_801536C0[0x300]; -BSS s8 D_801539C0[0x40]; -BSS s8 D_80153A00[0x40]; -BSS s32 gCurrentAnimMeshListPtr; -BSS s32 gAnimModelFogEnabled; -BSS s32 gAnimModelFogR; -BSS s32 gAnimModelFogG; -BSS s32 gAnimModelFogB; -BSS s32 gAnimModelFogA; -BSS s32 gAnimModelFogStart; -BSS s32 gAnimModelFogEnd; -BSS s32 gAnimVtxSegment; -BSS char D_80153A64[0x4]; -BSS s8 gAnimRotMtx[0x40]; -BSS s8 gAnimScaleMtx[0x40]; -BSS s8 gAnimTranslateMtx[0x40]; -BSS s8 gAnimRotScaleMtx[0x40]; -BSS s8 gAnimTreeRoot[0x8]; -BSS s8 gWorldEntityModelList[0x400]; -BSS s8 gBattleEntityModelList[0x400]; -BSS s32 gCurrentEntityModelList; -BSS s32 D_80154374; -BSS s32 entity_fog_enabled; -BSS s8 entity_fog_red; -BSS char D_8015437D; -BSS char D_8015437E; -BSS s8 D_8015437F; -BSS s8 entity_fog_green; -BSS char D_80154381; -BSS char D_80154382; -BSS s8 D_80154383; -BSS s8 entity_fog_blue; -BSS char D_80154385; -BSS char D_80154386; -BSS s8 D_80154387; -BSS s8 entity_fog_alpha; -BSS char D_80154389; -BSS char D_8015438A; -BSS s8 D_8015438B; -BSS s32 entity_fog_dist_min; -BSS s32 entity_fog_dist_max; -BSS char D_80154394[0xC]; -BSS s8 gWorldDynamicEntityList[0x40]; -BSS s8 gBattleDynamicEntityList[0x40]; -BSS s32 gCurrentDynamicEntityListPtr; -BSS char D_80154424[0xC]; -BSS s8 gMessageBuffers[0x800]; -BSS s8 gMessagePrinters[0x1008]; -BSS s8 gMessageMsgVars[0x60]; -BSS s8 D_80155C98[0x8]; -BSS s8 gMessageWindowProjMatrix[0x80]; -BSS s32 D_80155D20; -BSS char D_8015DD24[0x50]; -BSS s32 msg_drawState; -BSS char D_8015DD78[0x8]; -BSS s32 D_80155D80; -BSS s32 ItemEntityAlternatingSpawn; -BSS s32 ItemEntityRenderGroup; -BSS s16 D_80155D8C; -BSS s16 D_80155D8E; -BSS s8 D_80155D90[0x10]; -BSS s8 WorldItemEntities[0x400]; -BSS s8 BattleItemEntities[0x400]; -BSS s32 gCurrentItemEntities; -BSS s16 isPickingUpItem; -BSS s16 D_801565A6; -BSS s32 D_801565A8; -BSS char D_801565AC[0x4]; -BSS s8 D_801565B0[0x330]; -BSS s32 D_801568E0; -BSS s32 D_801568E4; -BSS s32 D_801568E8; -BSS s32 D_801568EC; -BSS s32 D_801568F0; -BSS s32 D_801568F4; -BSS s32 D_801568F8; -BSS char D_801568FC[0x4]; -BSS s32 screen_overlay_frontType; -BSS s32 screen_overlay_frontZoom; -BSS s32 screen_overlay_backType; -BSS s32 screen_overlay_backZoom; -BSS s8 D_80156910[0x10]; -BSS s8 D_80156920[0x28]; -BSS s8 D_80156948[0x8]; -BSS s32 fold_vtxBuf; -BSS s32 D_80156954; -BSS s8 D_80156958[0x8]; -BSS s8 D_80156960[0x8]; -BSS s8 D_80156968[0x8]; -BSS s8 D_80156970[0x10]; -BSS s8 fold_groupDescriptors[0x5A0]; -BSS s8 fold_gfxDataCache[0x40]; -BSS s8 gHudElementsWorld[0x500]; -BSS s8 gHudElementsBattle[0x500]; -BSS s32 gHudElements; -BSS s32 gHudElementCacheBufferWorld; -BSS s32 gHudElementCacheSizeWorld; -BSS char D_8015796C[0x4]; -BSS s8 gHudElementCacheTableRasterWorld[0x600]; -BSS s8 gHudElementCacheTablePaletteWorld[0x600]; -BSS s32 gHudElementCacheBufferBattle; -BSS s32 gHudElementCacheSizeBattle; -BSS char D_80158578[0x8]; -BSS s8 gHudElementCacheTableRasterBattle[0x600]; -BSS s8 gHudElementCacheTablePaletteBattle[0x600]; -BSS s8 D_80159180[0x10]; -BSS s8 wTriggerList[0x100]; -BSS s8 bTriggerList[0x100]; -BSS s32 gCurrentTriggerListPtr; -BSS char D_80159394[0xC]; -BSS s8 D_801593A0[0x1FE]; -BSS s16 D_8015959E; -BSS s8 D_801595A0[0x20]; -BSS s8 D_801595C0[0xB0]; -BSS s8 D_80159670[0xB0]; -BSS s8 D_80159720[0xB0]; -BSS s8 D_801597D0[0xB0]; -BSS s8 D_80159880[0x20]; -BSS s8 D_801598A0[0x118]; -BSS s8 D_801599B8[0x118]; -BSS s32 D_80159AD0; -BSS s32 D_80159AD4; -BSS char D_80159AD8[0x8]; -BSS s16 MusicDefaultVolume; -BSS s16 MusicTargetVolume; -BSS s16 MusicMaxVolume; -BSS s16 MusicCurrentVolume; -BSS char D_80159AE8[0x8]; -BSS s8 gMusicSettings[0x60]; -BSS s8 D_80159B50[0x200]; -BSS s8 gWindows[0x800]; -BSS s8 gCollisionStatus[0x28]; -BSS s16 gCurrentHiddenPanels; -BSS s16 D_8015A57A; -BSS char D_8015A57C[0x14]; -BSS s8 mdl_textureHandles[0x2200]; -BSS s8 D_8015C790[0x30]; -BSS s8 AmbientSoundData[0x10]; -BSS s32 CreateEntityVarArgBuffer[4]; -BSS s32 D_8015C7E0; diff --git a/src/e20eb0.c b/src/e20eb0.c index 80a6998d8b..49fbf2cdb6 100644 --- a/src/e20eb0.c +++ b/src/e20eb0.c @@ -8,9 +8,9 @@ typedef struct UnkE20EB0 { /* 0x00 */ Npc* unk_00; - /* 0x04 */ Vec3f unk_04; + /* 0x04 */ Vec3f pos; /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; + /* 0x14 */ f32 scale; /* 0x18 */ s32 unk_18; /* 0x1C */ f32 unk_1C; /* 0x20 */ s32 unk_20; @@ -38,17 +38,17 @@ void func_802B70B4(void) { npc = playerStatus->encounteredNPC; D_802B79A8_E21858->unk_00 = npc; D_802B79A8_E21858->unk_1C = npc->pos.y + npc->collisionHeight + 8.0f; - D_802B79A8_E21858->unk_04.y = D_802B79A8_E21858->unk_1C; - D_802B79A8_E21858->unk_04.x = npc->pos.x; - D_802B79A8_E21858->unk_04.z = npc->pos.z; + D_802B79A8_E21858->pos.y = D_802B79A8_E21858->unk_1C; + D_802B79A8_E21858->pos.x = npc->pos.x; + D_802B79A8_E21858->pos.z = npc->pos.z; D_802B79A8_E21858->unk_18 = 0; D_802B79A8_E21858->unk_2A = 0; - D_802B79A8_E21858->unk_14 = 0.1f; + D_802B79A8_E21858->scale = 0.1f; D_8010C940 = func_802B742C; playerStatus->animFlags |= PA_FLAGS_SPEECH_PROMPT_AVAILABLE; temp = D_802B79A8_E21858; temp->unk_2A = 0; - temp->unk_14 = 0.4f; + temp->scale = 0.4f; D_802B79A8_E21858->unk_10 = -gCameras[gCurrentCameraID].currentYaw; D_802B79A8_E21858->unk_2B = 255; } @@ -58,10 +58,10 @@ void func_802B71C8(void) { Matrix4f sp38, sp78; if (gPlayerStatus.animFlags & PA_FLAGS_SPEECH_PROMPT_AVAILABLE) { - guScaleF(sp38, D_802B79A8_E21858->unk_14, D_802B79A8_E21858->unk_14, D_802B79A8_E21858->unk_14); + guScaleF(sp38, D_802B79A8_E21858->scale, D_802B79A8_E21858->scale, D_802B79A8_E21858->scale); guRotateF(sp78, D_802B79A8_E21858->unk_10 - gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); guMtxCatF(sp38, sp78, sp38); - guTranslateF(sp78, D_802B79A8_E21858->unk_04.x, D_802B79A8_E21858->unk_04.y, D_802B79A8_E21858->unk_04.z); + guTranslateF(sp78, D_802B79A8_E21858->pos.x, D_802B79A8_E21858->pos.y, D_802B79A8_E21858->pos.z); guMtxCatF(sp38, sp78, sp78); guMtxF2L(sp78, &gDisplayContext->matrixStack[gMatrixListPos]); @@ -104,9 +104,9 @@ void func_802B742C(void) { switch (D_802B79A8_E21858->unk_2A) { case 0: D_802B79A8_E21858->unk_10 = 0.0f; - D_802B79A8_E21858->unk_14 += 0.05; - if (D_802B79A8_E21858->unk_14 >= 0.55) { - D_802B79A8_E21858->unk_14 = 0.55f; + D_802B79A8_E21858->scale += 0.05; + if (D_802B79A8_E21858->scale >= 0.55) { + D_802B79A8_E21858->scale = 0.55f; D_802B79A8_E21858->unk_2A++; D_802B79A8_E21858->unk_20 = 12; } @@ -153,7 +153,7 @@ void func_802B742C(void) { npc = D_802B79A8_E21858->unk_00; D_802B79A8_E21858->unk_1C = npc->pos.y + npc->collisionHeight + 8.0f; - D_802B79A8_E21858->unk_04.y = D_802B79A8_E21858->unk_1C; - D_802B79A8_E21858->unk_04.x = npc->pos.x; - D_802B79A8_E21858->unk_04.z = npc->pos.z; + D_802B79A8_E21858->pos.y = D_802B79A8_E21858->unk_1C; + D_802B79A8_E21858->pos.x = npc->pos.x; + D_802B79A8_E21858->pos.z = npc->pos.z; } diff --git a/src/effects.c b/src/effects.c index 8e0624f412..7a148d97ca 100644 --- a/src/effects.c +++ b/src/effects.c @@ -68,7 +68,7 @@ EffectTableEntry gEffectTable[] = { /* 0x26 */ FX_ENTRY(music_note, _35A5E0), /* 0x27 */ FX_ENTRY(smoke_burst, _328EA0), /* 0x28 */ FX_ENTRY(sweat, _35C550), - /* 0x29 */ FX_ENTRY(sleep_bubble, _35D510), + /* 0x29 */ FX_ENTRY(sleep_bubble, effect_gfx_sleep_bubble), /* 0x2A */ {}, /* 0x2B */ FX_ENTRY(windy_leaves, _33D610), /* 0x2C */ FX_ENTRY(falling_leaves, _35F0E0), @@ -82,7 +82,7 @@ EffectTableEntry gEffectTable[] = { /* 0x34 */ FX_ENTRY(ending_decals, _36AEE0), /* 0x35 */ FX_ENTRY(light_rays, _36DF90), /* 0x36 */ FX_ENTRY(lightning, _36ED60), - /* 0x37 */ FX_ENTRY(fire_breath, _3733E0), + /* 0x37 */ FX_ENTRY(fire_breath, effect_gfx_fire_breath), /* 0x38 */ FX_ENTRY(shimmer_burst, _337FC0), /* 0x39 */ FX_ENTRY(energy_shockwave, _375510), /* 0x3A */ FX_ENTRY(shimmer_wave, _337FC0), diff --git a/src/effects/fire_breath.c b/src/effects/fire_breath.c index bdbe9f6f91..857d92c143 100644 --- a/src/effects/fire_breath.c +++ b/src/effects/fire_breath.c @@ -1,13 +1,13 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09000A00[]; -extern Gfx D_09000B88[]; -extern Gfx D_09000C00[]; -extern Gfx D_09000C20[]; +extern Gfx D_09000A00_373DE0[]; +extern Gfx D_09000B88_373F68[]; +extern Gfx D_09000C00_373FE0[]; +extern Gfx D_09000C20_374000[]; -Gfx* D_E006EC00[] = { D_09000B88, D_09000B88, D_09000B88 }; -Gfx* D_E006EC0C[] = { D_09000A00, D_09000A00, D_09000A00 }; +Gfx* D_E006EC00[] = { D_09000B88_373F68, D_09000B88_373F68, D_09000B88_373F68 }; +Gfx* D_E006EC0C[] = { D_09000A00_373DE0, D_09000A00_373DE0, D_09000A00_373DE0 }; void fire_breath_init(EffectInstance* effect); void fire_breath_update(EffectInstance* effect); @@ -199,8 +199,8 @@ void fire_breath_appendGfx(void* effect) { gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000C20); - gSPDisplayList(gMasterGfxPos++, D_09000C00); + gSPDisplayList(gMasterGfxPos++, D_09000C20_374000); + gSPDisplayList(gMasterGfxPos++, D_09000C00_373FE0); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/gfx/fire_breath.c b/src/effects/gfx/fire_breath.c new file mode 100644 index 0000000000..b53601b060 --- /dev/null +++ b/src/effects/gfx/fire_breath.c @@ -0,0 +1,12 @@ +#include "common.h" + +#include "effects/gfx/D_09000000_3733E0.png.inc.c" +#include "effects/gfx/D_09000800_373BE0.png.inc.c" +#include "effects/gfx/D_09000A00_373DE0.gfx.inc.c" +#include "effects/gfx/D_09000AE8_373EC8.vtx.inc.c" +#include "effects/gfx/D_09000B38_373F18.vtx.inc.c" +#include "effects/gfx/D_09000B88_373F68.gfx.inc.c" +#include "effects/gfx/D_09000BA8_373F88.gfx.inc.c" +#include "effects/gfx/D_09000BC0_373FA0.vtx.inc.c" +#include "effects/gfx/D_09000C00_373FE0.gfx.inc.c" +#include "effects/gfx/D_09000C20_374000.gfx.inc.c" diff --git a/src/effects/gfx/sleep_bubble.c b/src/effects/gfx/sleep_bubble.c new file mode 100644 index 0000000000..b9e7929db3 --- /dev/null +++ b/src/effects/gfx/sleep_bubble.c @@ -0,0 +1,11 @@ +#include "common.h" + +#include "effects/gfx/D_09000000_35D510.png.inc.c" +#include "effects/gfx/D_09000080_35D590.png.inc.c" +#include "effects/gfx/D_09000100_35D610.png.inc.c" + +#include "effects/gfx/D_09000180_35D690.vtx.inc.c" + +#include "effects/gfx/D_090002E0_35D7F0.gfx.inc.c" +#include "effects/gfx/D_09000390_35D8A0.gfx.inc.c" +#include "effects/gfx/D_09000440_35D950.gfx.inc.c" diff --git a/src/effects/sleep_bubble.c b/src/effects/sleep_bubble.c index 52bda5b773..6f8b970174 100644 --- a/src/effects/sleep_bubble.c +++ b/src/effects/sleep_bubble.c @@ -6,7 +6,17 @@ void sleep_bubble_init(EffectInstance* effect); void sleep_bubble_update(EffectInstance* effect); void sleep_bubble_render(EffectInstance* effect); -f32 D_E00529E0[] = { 4.4f, 3.2f, 5.4f, 2.7f, 6.0f, 4.9f, 5.2f, 3.1f, 2.4f, 4.5f, 2.6f, 5.7f, 3.8f, 2.9f, 3.1f, 5.2f, 2.3f, 5.4f, 3.5f, 2.6f, 2.4f, 3.1f, 5.2f, 4.9f, 6.0f, 2.7f, 5.4f, 3.2f, 4.4f, 2.6f, 3.5f, 5.4f, 2.3f, 5.2f, 3.1f, 2.9f, 3.8f, 5.7f, 2.6f, 4.5f }; +f32 D_E00529E0[] = { + 4.4f, 3.2f, 5.4f, 2.7f, 6.0f, 4.9f, 5.2f, 3.1f, 2.4f, 4.5f, + 2.6f, 5.7f, 3.8f, 2.9f, 3.1f, 5.2f, 2.3f, 5.4f, 3.5f, 2.6f, + 2.4f, 3.1f, 5.2f, 4.9f, 6.0f, 2.7f, 5.4f, 3.2f, 4.4f, 2.6f, + 3.5f, 5.4f, 2.3f, 5.2f, 3.1f, 2.9f, 3.8f, 5.7f, 2.6f, 4.5f +}; + +extern Vtx D_09000180_35D690[]; +extern Gfx D_090002E0_35D7F0[]; +extern Gfx D_09000390_35D8A0[]; +extern Gfx D_09000440_35D950[]; void sleep_bubble_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, EffectInstance** arg6) { EffectBlueprint bp; @@ -77,7 +87,7 @@ void sleep_bubble_update(EffectInstance* effect) { yPtr = &part->points->y; xAngle = yAngle = i; - do { + for (i = 0; i < ARRAY_COUNT(part->points); i++) { angle = i * 360.0f / 21.0f + 17.0f; *xPtr = temp2 * shim_sin_deg(angle); @@ -91,8 +101,7 @@ void sleep_bubble_update(EffectInstance* effect) { xPtr += 2; yPtr += 2; - i++; - } while (i < ARRAY_COUNT(part->points)); + } part->unk_C4 = 0.0f; if (timeLeft < 100) { @@ -115,4 +124,68 @@ void sleep_bubble_render(EffectInstance* effect) { retTask->renderMode |= RENDER_TASK_FLAG_2; } -INCLUDE_ASM(s32, "effects/sleep_bubble", sleep_bubble_appendGfx); +void sleep_bubble_appendGfx(void* effect) { + SleepBubbleFXData* data = ((EffectInstance*)effect)->data.sleepBubble; + Matrix4f sp18, sp58; + s32 timeLeft; + s32 i; + + gDPPipeSync(gMasterGfxPos++); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + + timeLeft = data->timeLeft; + if (timeLeft == 0) { + gSPDisplayList(gMasterGfxPos++, D_09000440_35D950); + } else if (timeLeft == 1) { + gSPDisplayList(gMasterGfxPos++, D_09000390_35D8A0); + } else { + gSPDisplayList(gMasterGfxPos++, D_090002E0_35D7F0); + } + + shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPVertex(gMasterGfxPos++, &D_09000180_35D690[1], 1, 0); + + shim_guRotateF(sp18, data->unk_10, 0.0f, 0.0f, 1.0f); + shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + shim_guRotateF(sp18, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + shim_guTranslateF(sp58, data->unk_C4, data->unk_C8, 0.0f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPVertex(gMasterGfxPos++, &D_09000180_35D690[0], 1, 1); + + for (i = 0; i < ARRAY_COUNT(data->points); i++) { + shim_guTranslateF(sp18, data->points[i].x, data->points[i].y, 0.0f); + shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPVertex(gMasterGfxPos++, &D_09000180_35D690[i + 2], 1, i + 2); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + } + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + + if (timeLeft < 100) { + gSP1Triangle(gMasterGfxPos++, 21, 2, 1, 0); + + for (i = 0; i < ARRAY_COUNT(data->points) - 1; i++) { + gSP1Triangle(gMasterGfxPos++, i + 2, i + 3, 1, 0); + } + } else { + gSP1Triangle(gMasterGfxPos++, 0, 1, 2, 0); + gSP1Triangle(gMasterGfxPos++, 0, 21, 1, 0); + + for (i = 0; i < ARRAY_COUNT(data->points) - 1; i++) { + gSP1Triangle(gMasterGfxPos++, i + 2, i + 3, 1, 0); + } + } +} diff --git a/src/entity_model.c b/src/entity_model.c index fd40d5de31..d41cc7b0ff 100644 --- a/src/entity_model.c +++ b/src/entity_model.c @@ -893,7 +893,7 @@ s32 create_generic_entity_world(void (*updateFunc)(void), void (*drawFunc)(void) return i; } -s32 create_generic_entity_frontUI(void (*updateFunc)(void), void (*drawFunc)(void)) { +s32 create_generic_entity_frontUI(s32 (*updateFunc)(void), void (*drawFunc)(void)) { s32 i; DynamicEntity* newDynEntity; diff --git a/src/is_debug.c b/src/is_debug.c index df88f0f021..eb6e78a1ab 100644 --- a/src/is_debug.c +++ b/src/is_debug.c @@ -13,7 +13,7 @@ typedef struct { #define gISVDbgPrnAdrs ((ISVDbg*) 0xb3ff0000) -u32 is_debug_print(void* arg0, const unsigned char* str, u32 count); +char* is_debug_print(char* arg0, const char* str, size_t count); void is_debug_init(void) { osEPiWriteIo(nuPiCartHandle, (u32) &gISVDbgPrnAdrs->put, 0); @@ -42,7 +42,7 @@ void rmonPrintf(const char* fmt, ...) { _Printf(is_debug_print, NULL, fmt, args); } -u32 is_debug_print(void* arg0, const unsigned char* str, u32 count) { +char* is_debug_print(char* arg0, const char* str, size_t count) { u32 data; s32 pos; s32 start; @@ -50,7 +50,7 @@ u32 is_debug_print(void* arg0, const unsigned char* str, u32 count) { osEPiReadIo(nuPiCartHandle, (u32) &gISVDbgPrnAdrs->magic, &data); if (data != ASCII_TO_U32('I', 'S', '6', '4')) { - return 1; + return (char*) 1; } osEPiReadIo(nuPiCartHandle, (u32) &gISVDbgPrnAdrs->get, &data); pos = data; @@ -60,20 +60,22 @@ u32 is_debug_print(void* arg0, const unsigned char* str, u32 count) { if (end >= 0xffe0) { end -= 0xffe0; if (pos < end || start < pos) { - return 1; + return (char*) 1; } } else { if (start < pos && pos < end) { - return 1; + return (char*) 1; } } while (count) { - if (*str) { + u8 c = *str; + + if (c != 0) { u32 addr = (u32) &gISVDbgPrnAdrs->data + (start & 0xffffffc); s32 shift = ((3 - (start & 3)) * 8); osEPiReadIo(nuPiCartHandle, addr, &data); - osEPiWriteIo(nuPiCartHandle, addr, (data & ~(0xff << shift)) | (*str << shift)); + osEPiWriteIo(nuPiCartHandle, addr, (data & ~(0xff << shift)) | ((u8)*str << shift)); start++; if (start >= 0xffe0) { @@ -84,19 +86,14 @@ u32 is_debug_print(void* arg0, const unsigned char* str, u32 count) { str++; } osEPiWriteIo(nuPiCartHandle, (u32)&gISVDbgPrnAdrs->put, start); - return 1; + return (char*) 1; } #ifdef VERSION_US -// Nop issue with the rodata string - #ifdef NON_MATCHING void func_80025F44(const char* message, char* file, s32 line) { osSyncPrintf("File:%s Line:%d %s \n", file, line, message); PANIC(); } - #else -INCLUDE_ASM(void, "is_debug", func_80025F44, char* arg0, char* file, s32 line); - #endif #elif VERSION_JP extern const char D_80097D10[]; // "File:%s Line:%d %s \n\0\0\0" void func_80025F44(char* arg0, char* file, s32 line, char* arg3) { diff --git a/src/load_script.c b/src/load_script.c index 99e38de0ca..9ad29986d3 100644 --- a/src/load_script.c +++ b/src/load_script.c @@ -1,15 +1,119 @@ #include "common.h" +#include "ld_addrs.h" -extern s32 D_80293B80[]; +s32 D_80293B80[] = { + -1, + ITEM_MUSHROOM, + ITEM_FIRE_FLOWER, + ITEM_DUSTY_HAMMER, + ITEM_P_O_W_BLOCK, + ITEM_PEBBLE, + ITEM_VOLT_SHROOM, + ITEM_THUNDER_RAGE, + ITEM_SNOWMAN_DOLL, + ITEM_DRIED_SHROOM, + ITEM_SHOOTING_STAR, + ITEM_SLEEPY_SHEEP, + ITEM_STONE_CAP, + ITEM_TASTY_TONIC, + ITEM_THUNDER_BOLT, + ITEM_SUPER_SHROOM, + ITEM_ULTRA_SHROOM, + ITEM_SUPER_SODA, + ITEM_HUSTLE_DRINK, + ITEM_STOP_WATCH, + ITEM_DIZZY_DIAL, + ITEM_PLEASE_COME_BACK, + ITEM_EGG_MISSILE, + ITEM_INSECTICIDE_HERB, + ITEM_FRIGHT_JAR, + ITEM_MYSTERY, + ITEM_REPEL_GEL, + ITEM_LIFE_SHROOM, + ITEM_COCONUT, + ITEM_ELECTRO_POP, + ITEM_STRANGE_CAKE, + ITEM_KOOKY_COOKIE, + ITEM_NONE +}; -typedef struct BattleItemTableEntry { - /* 0x0 */ u8* romStart; - /* 0x4 */ u8* romEnd; - /* 0x8 */ u8* vramStart; - /* 0xC */ u8* vramEnd; -} BattleItemTableEntry; // size = 0x10 +extern EvtScript battle_item_food_main; +extern EvtScript battle_item_mushroom_main; +extern EvtScript battle_item_fire_flower_main; +extern EvtScript battle_item_dusty_hammer_main; +extern EvtScript battle_item_pow_block_main; +extern EvtScript battle_item_pebble_main; +extern EvtScript battle_item_volt_shroom_main; +extern EvtScript battle_item_thunder_rage_main; +extern EvtScript battle_item_snowman_doll_main; +extern EvtScript battle_item_shooting_star_main; +extern EvtScript battle_item_sleepy_sheep_main; +extern EvtScript battle_item_stone_cap_main; +extern EvtScript battle_item_tasty_tonic_main; +extern EvtScript battle_item_thunder_bolt_main; +extern EvtScript battle_item_super_soda_main; +extern EvtScript battle_item_hustle_drink_main; +extern EvtScript battle_item_stop_watch_main; +extern EvtScript battle_item_dizzy_dial_main; +extern EvtScript battle_item_please_come_back_main; +extern EvtScript battle_item_egg_missile_main; +extern EvtScript battle_item_insecticide_herb_main; +extern EvtScript battle_item_fright_jar_main; +extern EvtScript battle_item_mystery_main; +extern EvtScript battle_item_repel_gel_main; +extern EvtScript battle_item_life_shroom_main; +extern EvtScript battle_item_coconut_main; +extern EvtScript battle_item_electro_pop_main; +extern EvtScript battle_item_strange_cake_main; -extern BattleItemTableEntry gBattleItemTable[]; +#define BTL_ITEM_TABLE_ENTRY(name) { name##_ROM_START, name##_ROM_END, name##_VRAM, &battle_item_##name##_main } + +typedef struct BattleTableEntry { + /* 0x00 */ u8* romStart; + /* 0x04 */ u8* romEnd; + /* 0x08 */ u8* vramStart; + /* 0x0C */ EvtScript* mainScript; +} BattleTableEntry; // size = 0x10 + +BattleTableEntry gBattleItemTable[] = { + BTL_ITEM_TABLE_ENTRY(food), + BTL_ITEM_TABLE_ENTRY(mushroom), + BTL_ITEM_TABLE_ENTRY(fire_flower), + BTL_ITEM_TABLE_ENTRY(dusty_hammer), + BTL_ITEM_TABLE_ENTRY(pow_block), + BTL_ITEM_TABLE_ENTRY(pebble), + BTL_ITEM_TABLE_ENTRY(volt_shroom), + BTL_ITEM_TABLE_ENTRY(thunder_rage), + BTL_ITEM_TABLE_ENTRY(snowman_doll), + BTL_ITEM_TABLE_ENTRY(mushroom), + BTL_ITEM_TABLE_ENTRY(shooting_star), + BTL_ITEM_TABLE_ENTRY(sleepy_sheep), + BTL_ITEM_TABLE_ENTRY(stone_cap), + BTL_ITEM_TABLE_ENTRY(tasty_tonic), + BTL_ITEM_TABLE_ENTRY(thunder_bolt), + BTL_ITEM_TABLE_ENTRY(mushroom), + BTL_ITEM_TABLE_ENTRY(mushroom), + BTL_ITEM_TABLE_ENTRY(super_soda), + BTL_ITEM_TABLE_ENTRY(hustle_drink), + BTL_ITEM_TABLE_ENTRY(stop_watch), + BTL_ITEM_TABLE_ENTRY(dizzy_dial), + BTL_ITEM_TABLE_ENTRY(please_come_back), + BTL_ITEM_TABLE_ENTRY(egg_missile), + BTL_ITEM_TABLE_ENTRY(insecticide_herb), + BTL_ITEM_TABLE_ENTRY(fright_jar), + BTL_ITEM_TABLE_ENTRY(mystery), + BTL_ITEM_TABLE_ENTRY(repel_gel), + BTL_ITEM_TABLE_ENTRY(life_shroom), + BTL_ITEM_TABLE_ENTRY(coconut), + BTL_ITEM_TABLE_ENTRY(electro_pop), + BTL_ITEM_TABLE_ENTRY(strange_cake), + BTL_ITEM_TABLE_ENTRY(strange_cake), +}; + +// Offsets into gBattleItemTable? +u16 D_80293E04[] = { + 1, 31, 1, 5, 1, 2, 9, 3, 9, 3, 9, 1, 10, 6, 10, 6, 10, 4, 11, 8, 11, 8, 11, 4, 12, 3, 12, 3, 12, 1, +}; ApiStatus LoadItemScript(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; @@ -39,7 +143,7 @@ ApiStatus LoadItemScript(Evt* script, s32 isInitialCall) { deduct_current_move_fp(); } } - + itemPtr = &D_80293B80[0]; for (i = 0; *itemPtr != ITEM_NONE; i++, itemPtr++) { if (*itemPtr == battleStatus->selectedItemID) { @@ -57,8 +161,8 @@ ApiStatus LoadItemScript(Evt* script, s32 isInitialCall) { dma_copy(gBattleItemTable[i].romStart, gBattleItemTable[i].romEnd, gBattleItemTable[i].vramStart); - script->varTable[0] = (s32) gBattleItemTable[i].vramEnd; - script->varTable[1] = 0; + script->varTablePtr[0] = gBattleItemTable[i].mainScript; + script->varTable[1] = FALSE; return ApiStatus_DONE2; } @@ -96,23 +200,15 @@ ApiStatus LoadFreeItemScript(Evt* script, s32 isInitialCall) { } dma_copy(gBattleItemTable[i].romStart, gBattleItemTable[i].romEnd, gBattleItemTable[i].vramStart); - script->varTable[0] = (s32) gBattleItemTable[i].vramEnd; - script->varTable[1] = 1; + script->varTablePtr[0] = gBattleItemTable[i].mainScript; + script->varTable[1] = TRUE; return ApiStatus_DONE2; } -ApiStatus LoadMoveScript(Evt* script, s32 isInitialCall) { - BattleStatus* battleStatus = &gBattleStatus; - s32* moveScript = gMoveScriptTable[battleStatus->selectedMoveID]; - - dma_copy(moveScript[0], moveScript[1], moveScript[2]); - script->varTable[0] = moveScript[3]; - - deduct_current_move_fp(); - - if (gBattleStatus.flags2 & 0x8000000) { - enable_player_blur(); - } - - return ApiStatus_DONE2; -} +EvtScript UseMystery = { + EVT_WAIT(2) + EVT_CALL(LoadFreeItemScript) + EVT_EXEC_WAIT(LocalVar(0)) + EVT_RETURN + EVT_END +}; diff --git a/src/move_script.c b/src/move_script.c new file mode 100644 index 0000000000..d549ea1fb4 --- /dev/null +++ b/src/move_script.c @@ -0,0 +1,124 @@ +#include "common.h" +#include "ld_addrs.h" + +typedef struct BattleTableEntry { + /* 0x00 */ u8* romStart; + /* 0x04 */ u8* romEnd; + /* 0x08 */ u8* vramStart; + /* 0x0C */ EvtScript* mainScript; +} BattleTableEntry; // size = 0x10 + +extern EvtScript battle_move_hammer_802A3044; +extern EvtScript battle_move_hammer_802A369C; +extern EvtScript battle_move_hammer_802A3B28; +extern EvtScript battle_move_spin_smash_main; +extern EvtScript battle_move_quake_hammer_main; +extern EvtScript battle_move_d_down_pound_main; +extern EvtScript battle_move_hammer_charge_0_802A38C4; +extern EvtScript battle_move_hammer_charge_0_802A3234; +extern EvtScript battle_move_hammer_throw_main; +extern EvtScript battle_move_mega_quake_main; +extern EvtScript battle_move_hammer_charge_1_802A3944; +extern EvtScript battle_move_hammer_charge_1_802A32B4; +extern EvtScript battle_move_hammer_charge_2_802A3944; +extern EvtScript battle_move_hammer_charge_2_802A32B4; +extern EvtScript battle_move_auto_smash_main; +extern EvtScript battle_move_power_quake_main; +extern EvtScript battle_move_power_smash_main; +extern EvtScript battle_move_super_smash_main; +extern EvtScript battle_move_mega_smash_main; +extern EvtScript battle_move_shrink_smash_main; +extern EvtScript battle_move_shell_crack_main; +extern EvtScript battle_move_jump_802A2650; +extern EvtScript battle_move_jump_802A30F4; +extern EvtScript battle_move_jump_802A3644; +extern EvtScript battle_move_multibounce_main; +extern EvtScript battle_move_power_bounce_main; +extern EvtScript battle_move_sleep_stomp_main; +extern EvtScript battle_move_dizzy_stomp_main; +extern EvtScript battle_move_jump_charge_0_802A2800; +extern EvtScript battle_move_jump_charge_0_802A27F0; +extern EvtScript battle_move_jump_charge_1_802A2880; +extern EvtScript battle_move_jump_charge_1_802A2870; +extern EvtScript battle_move_jump_charge_2_802A2880; +extern EvtScript battle_move_jump_charge_2_802A2870; +extern EvtScript battle_move_auto_jump_main; +extern EvtScript battle_move_auto_multibounce_main; +extern EvtScript battle_move_power_jump_main; +extern EvtScript battle_move_super_jump_main; +extern EvtScript battle_move_mega_jump_main; +extern EvtScript battle_move_d_down_jump_main; +extern EvtScript battle_move_shrink_stomp_main; +extern EvtScript battle_move_earthquake_jump_main; + +// Some moves seem to have multiple entry point methods, in which case the _SCR macro is used +#define BTL_MOVE_TABLE_ENTRY(name) { battle_move_##name##_ROM_START, battle_move_##name##_ROM_END, battle_move_##name##_VRAM, &battle_move_##name##_main } +#define BTL_MOVE_TABLE_ENTRY_SCR(name, script) { battle_move_##name##_ROM_START, battle_move_##name##_ROM_END, battle_move_##name##_VRAM, &script } + +BattleTableEntry gMoveScriptTable[] = { + { NULL, NULL, NULL, NULL }, + { NULL, NULL, NULL, NULL }, + { NULL, NULL, NULL, NULL }, + BTL_MOVE_TABLE_ENTRY_SCR(hammer, battle_move_hammer_802A3044), + BTL_MOVE_TABLE_ENTRY_SCR(hammer, battle_move_hammer_802A3044), + BTL_MOVE_TABLE_ENTRY_SCR(hammer, battle_move_hammer_802A3044), + BTL_MOVE_TABLE_ENTRY_SCR(hammer, battle_move_hammer_802A369C), + BTL_MOVE_TABLE_ENTRY_SCR(hammer, battle_move_hammer_802A3B28), + BTL_MOVE_TABLE_ENTRY(spin_smash), + BTL_MOVE_TABLE_ENTRY(quake_hammer), + BTL_MOVE_TABLE_ENTRY(d_down_pound), + BTL_MOVE_TABLE_ENTRY_SCR(hammer_charge_0, battle_move_hammer_charge_0_802A38C4), + BTL_MOVE_TABLE_ENTRY_SCR(hammer_charge_0, battle_move_hammer_charge_0_802A3234), + BTL_MOVE_TABLE_ENTRY(hammer_throw), + BTL_MOVE_TABLE_ENTRY(mega_quake), + BTL_MOVE_TABLE_ENTRY_SCR(hammer_charge_1, battle_move_hammer_charge_1_802A3944), + BTL_MOVE_TABLE_ENTRY_SCR(hammer_charge_1, battle_move_hammer_charge_1_802A32B4), + BTL_MOVE_TABLE_ENTRY_SCR(hammer_charge_2, battle_move_hammer_charge_2_802A3944), + BTL_MOVE_TABLE_ENTRY_SCR(hammer_charge_2, battle_move_hammer_charge_2_802A32B4), + BTL_MOVE_TABLE_ENTRY(auto_smash), + BTL_MOVE_TABLE_ENTRY(power_quake), + BTL_MOVE_TABLE_ENTRY(power_smash), + BTL_MOVE_TABLE_ENTRY(super_smash), + BTL_MOVE_TABLE_ENTRY(mega_smash), + BTL_MOVE_TABLE_ENTRY(shrink_smash), + BTL_MOVE_TABLE_ENTRY(shell_crack), + BTL_MOVE_TABLE_ENTRY_SCR(jump, battle_move_jump_802A2650), + BTL_MOVE_TABLE_ENTRY_SCR(jump, battle_move_jump_802A2650), + BTL_MOVE_TABLE_ENTRY_SCR(jump, battle_move_jump_802A2650), + BTL_MOVE_TABLE_ENTRY_SCR(jump, battle_move_jump_802A30F4), + BTL_MOVE_TABLE_ENTRY_SCR(jump, battle_move_jump_802A3644), + BTL_MOVE_TABLE_ENTRY(multibounce), + BTL_MOVE_TABLE_ENTRY(power_bounce), + BTL_MOVE_TABLE_ENTRY(sleep_stomp), + BTL_MOVE_TABLE_ENTRY(dizzy_stomp), + BTL_MOVE_TABLE_ENTRY_SCR(jump_charge_0, battle_move_jump_charge_0_802A2800), + BTL_MOVE_TABLE_ENTRY_SCR(jump_charge_0, battle_move_jump_charge_0_802A27F0), + BTL_MOVE_TABLE_ENTRY_SCR(jump_charge_1, battle_move_jump_charge_1_802A2880), + BTL_MOVE_TABLE_ENTRY_SCR(jump_charge_1, battle_move_jump_charge_1_802A2870), + BTL_MOVE_TABLE_ENTRY_SCR(jump_charge_2, battle_move_jump_charge_2_802A2880), + BTL_MOVE_TABLE_ENTRY_SCR(jump_charge_2, battle_move_jump_charge_2_802A2870), + BTL_MOVE_TABLE_ENTRY(auto_jump), + BTL_MOVE_TABLE_ENTRY(auto_multibounce), + BTL_MOVE_TABLE_ENTRY(power_jump), + BTL_MOVE_TABLE_ENTRY(super_jump), + BTL_MOVE_TABLE_ENTRY(mega_jump), + BTL_MOVE_TABLE_ENTRY(d_down_jump), + BTL_MOVE_TABLE_ENTRY(shrink_stomp), + BTL_MOVE_TABLE_ENTRY(earthquake_jump), +}; + +ApiStatus LoadMoveScript(Evt* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleTableEntry* moveTableEntry = &gMoveScriptTable[battleStatus->selectedMoveID]; + + dma_copy(moveTableEntry->romStart, moveTableEntry->romEnd, moveTableEntry->vramStart); + script->varTablePtr[0] = moveTableEntry->mainScript; + + deduct_current_move_fp(); + + if (gBattleStatus.flags2 & BS_FLAGS2_8000000) { + enable_player_blur(); + } + + return ApiStatus_DONE2; +} diff --git a/src/world/area_flo/flo_00/C9DF20.c b/src/world/area_flo/flo_00/C9DF20.c index aa6f50c65a..2ec4c73287 100644 --- a/src/world/area_flo/flo_00/C9DF20.c +++ b/src/world/area_flo/flo_00/C9DF20.c @@ -1,9 +1,9 @@ #include "flo_00.h" // Same as SpawnSunEffect, but doesn't touch float regs like SpawnSunEffect does -void fx_sun(); +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); ApiStatus N(func_80240000_C9DF20)(Evt* script, s32 isInitialCall) { - fx_sun(0, 0, 0, 0, 0, 0); + fx_sun_undeclared(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/src/world/area_flo/flo_10/CB96B0.c b/src/world/area_flo/flo_10/CB96B0.c index a1c3c19ca6..763b2ed2c9 100644 --- a/src/world/area_flo/flo_10/CB96B0.c +++ b/src/world/area_flo/flo_10/CB96B0.c @@ -2,151 +2,131 @@ #include "nu/nusys.h" #include "model.h" -void N(func_802404B0_CB96B0)(s32 arg0, s32 arg1, s32 arg2, s32 arg3); -INCLUDE_ASM(void, "world/area_flo/flo_10/CB96B0", flo_10_func_802404B0_CB96B0); +void N(UnkModelFunc000)(s32, s32, s32, s32); -typedef struct { - /* 0x00 */ char unk_00[0x4]; - /* 0x04 */ s32 unk_04; - /* 0x08 */ char unk_08[0x14]; - /* 0x1C */ s32 unk_1C; -} N(UnkStruct2); +INCLUDE_ASM(void, "world/area_flo/flo_10/CB96B0", flo_10_UnkModelFunc000); -typedef struct { - /* 0x00 */ char unk_00[0xC]; - /* 0x0C */ N(UnkStruct2)* unk_0C; -} N(UnkStruct); - -void N(func_80240A98_CB9C98)(void) { +void N(UnkModelFunc001)(void) { Camera* camera = &gCameras[gCurrentCameraID]; Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(0x30)); - // modelNode propertylist? Causes too many derefences and conflicts with the modelNode load below - N(UnkStruct2)* unk1 = ((N(UnkStruct)*)model->modelNode)->unk_0C; + ModelBoundingBox* bb = (ModelBoundingBox*) model->modelNode->propertyList; + f32 bbHalfX = bb->halfSizeX; + f32 bbHalfZ = bb->halfSizeZ; + f32 outX, outY, outZ, outS; f32 temp_f24; f32 temp_f26; f32 temp_f20; f32 temp_f22; - s32 test; - - f32 sp3C; - f32 sp38; - f32 sp34; - f32 sp30; - f32 sp2C; - f32 sp28; - - sp3C = unk1->unk_04; - sp38 = unk1->unk_1C; transform_point(camera->perspectiveMatrix, - model->center.x - sp3C, model->center.y, model->center.z - sp38, 1.0f, - &sp28, &sp2C, &sp30, &sp34); + model->center.x - bbHalfX, model->center.y, model->center.z - bbHalfZ, 1.0f, + &outX, &outY, &outZ, &outS); - sp28 = sp28 * (1.0f / sp34); - sp2C = sp2C * -(1.0f / sp34); - sp30 = sp30 * (1.0f / sp34); - sp34 = (1.0f / sp34); + outX *= 1.0f / outS; + outY *= -(1.0f / outS); + outZ *= 1.0f / outS; + outS = 1.0f / outS; - if (sp34 < 0.0f) { - sp28 = 0.0f; - sp2C = 1.0f; + if (outS < 0.0f) { + outX = 0.0f; + outY = 1.0f; } - temp_f20 = sp28; - temp_f22 = sp2C; + temp_f20 = outX; + temp_f22 = outY; transform_point(camera->perspectiveMatrix, - model->center.x - sp3C, model->center.y, model->center.z + sp38, 1.0f, - &sp28, &sp2C, &sp30, &sp34); + model->center.x - bbHalfX, model->center.y, model->center.z + bbHalfZ, 1.0f, + &outX, &outY, &outZ, &outS); - sp28 = sp28 * (1.0f / sp34); - sp2C = sp2C * -(1.0f / sp34); - sp30 = sp30 * (1.0f / sp34); - sp34 = 1.0f / sp34; + outX *= 1.0f / outS; + outY *= -(1.0f / outS); + outZ *= 1.0f / outS; + outS = 1.0f / outS; temp_f24 = temp_f20; temp_f26 = temp_f22; - if (sp34 < 0.0f) { - sp28 = 0.0f; - sp2C = 1.0f; + if (outS < 0.0f) { + outX = 0.0f; + outY = 1.0f; } - if (sp28 < temp_f20) { - temp_f24 = sp28; + if (temp_f24 > outX) { + temp_f24 = outX; } - if (sp2C < temp_f22) { - temp_f26 = sp2C; + if (temp_f26 > outY) { + temp_f26 = outY; } - if (temp_f20 < sp28) { - temp_f20 = sp28; + if (temp_f20 < outX) { + temp_f20 = outX; } - if (temp_f22 < sp2C) { - temp_f22 = sp2C; + if (temp_f22 < outY) { + temp_f22 = outY; } transform_point(camera->perspectiveMatrix, - model->center.x + sp3C, model->center.y, model->center.z + sp38, 1.0f, - &sp28, &sp2C, &sp30, &sp34); + model->center.x + bbHalfX, model->center.y, model->center.z + bbHalfZ, 1.0f, + &outX, &outY, &outZ, &outS); - sp28 = sp28 * (1.0f / sp34); - sp2C = sp2C * -(1.0f / sp34); - sp30 = sp30 * (1.0f / sp34); - sp34 = (1.0f / sp34); + outX *= 1.0f / outS; + outY *= -(1.0f / outS); + outZ *= 1.0f / outS; + outS = 1.0f / outS; - if (sp34 < 0.0f) { - sp28 = 1.0f; - sp2C = 1.0f; + if (outS < 0.0f) { + outX = 1.0f; + outY = 1.0f; } - if (sp28 < temp_f24) { - temp_f24 = sp28; + if (temp_f24 > outX) { + temp_f24 = outX; } - if (sp2C < temp_f26) { - temp_f26 = sp2C; + if (temp_f26 > outY) { + temp_f26 = outY; } - if (temp_f20 < sp28) { - temp_f20 = sp28; + if (temp_f20 < outX) { + temp_f20 = outX; } - if (temp_f22 < sp2C) { - temp_f22 = sp2C; + if (temp_f22 < outY) { + temp_f22 = outY; } transform_point(camera->perspectiveMatrix, - model->center.x + sp3C, model->center.y, model->center.z - sp38, 1.0f, - &sp28, &sp2C, &sp30, &sp34); + model->center.x + bbHalfX, model->center.y, model->center.z - bbHalfZ, 1.0f, + &outX, &outY, &outZ, &outS); - sp28 = sp28 * (1.0f / sp34); - sp2C = sp2C * -(1.0f / sp34); - sp30 = sp30 * (1.0f / sp34); - sp34 = (1.0f / sp34); + outX *= 1.0f / outS; + outY *= -(1.0f / outS); + outZ *= 1.0f / outS; + outS = 1.0f / outS; - if (sp34 < 0.0f) { - sp28 = 1.0f; - sp2C = 1.0f; + if (outS < 0.0f) { + outX = 1.0f; + outY = 1.0f; } - if (sp28 < temp_f24) { - temp_f24 = sp28; + if (temp_f24 > outX) { + temp_f24 = outX; } - if (sp2C < temp_f26) { - temp_f26 = sp2C; + if (temp_f26 > outY) { + temp_f26 = outY; } - if (temp_f20 < sp28) { - temp_f20 = sp28; + if (temp_f20 < outX) { + temp_f20 = outX; } - if (temp_f22 < sp2C) { - temp_f22 = sp2C; + if (temp_f22 < outY) { + temp_f22 = outY; } - if ((temp_f24 != temp_f20) || (temp_f26 != temp_f22)) { + if (temp_f24 != temp_f20 || temp_f26 != temp_f22) { temp_f24 = ((temp_f24 * camera->viewportW) + camera->viewportW) * 0.5f; temp_f26 = ((temp_f26 * camera->viewportH) + camera->viewportH) * 0.5f; temp_f20 = ((temp_f20 * camera->viewportW) + camera->viewportW) * 0.5f; @@ -181,7 +161,7 @@ void N(func_80240A98_CB9C98)(void) { gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE); gDPPipeSync(gMasterGfxPos++); - N(func_802404B0_CB96B0)(temp_f24, temp_f26, temp_f20, temp_f22); + N(UnkModelFunc000)(temp_f24, temp_f26, temp_f20, temp_f22); gDPPipeSync(gMasterGfxPos++); gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index aca0566229..074eab6dfa 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -657,9 +657,9 @@ EvtScript N(makeEntities) = { #include "world/common/atomic/Pipe.inc.c" -void fx_sun(); +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); ApiStatus N(func_802402E0_CBDFB0)(Evt* script, s32 isInitialCall) { - fx_sun(0, 0, 0, 0, 0, 0); + fx_sun_undeclared(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/src/world/area_flo/flo_12/CC0E30.c b/src/world/area_flo/flo_12/CC0E30.c index 64260d8244..68433e7e36 100644 --- a/src/world/area_flo/flo_12/CC0E30.c +++ b/src/world/area_flo/flo_12/CC0E30.c @@ -1,8 +1,8 @@ #include "flo_12.h" -void fx_sun(); +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); ApiStatus N(func_80240000_CC0E30)(Evt* script, s32 isInitialCall) { - fx_sun(0, 0, 0, 0, 0, 0); + fx_sun_undeclared(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/src/world/area_flo/flo_13/CC3810.c b/src/world/area_flo/flo_13/CC3810.c index 09a3e3fc64..fa9b63ab4f 100644 --- a/src/world/area_flo/flo_13/CC3810.c +++ b/src/world/area_flo/flo_13/CC3810.c @@ -1,8 +1,8 @@ #include "flo_13.h" -void fx_sun(); +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); ApiStatus N(func_80240000_CC3810)(Evt* script, s32 isInitialCall) { - fx_sun(0, 0, 0, 0, 0, 0); + fx_sun_undeclared(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c index db2d9e2b2f..7c231f6b69 100644 --- a/src/world/area_flo/flo_14/CCB310.c +++ b/src/world/area_flo/flo_14/CCB310.c @@ -242,9 +242,7 @@ EvtScript N(80242EAC) = { EVT_END }; -s32 N(D_802431CC_CCE4DC) = { - 0x00000000, -}; +s32 N(D_802431CC_CCE4DC) = FALSE; EvtScript N(802431D0) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -572,10 +570,10 @@ EvtScript N(80243E78) = { #include "world/common/atomic/TexturePan.inc.c" -void fx_sun(); +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); ApiStatus N(func_8024030C_CCB61C)(Evt* script, s32 isInitialCall) { - fx_sun(0, 0, 0, 0, 0, 0); + fx_sun_undeclared(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } @@ -682,9 +680,9 @@ void N(func_802407D4_CCBAE4)(void) { } } else { if (((u32)N(D_80243B18_CCEE28) - 141) < 119) { - N(D_802431CC_CCE4DC) = 1; + N(D_802431CC_CCE4DC) = TRUE; } else { - N(D_802431CC_CCE4DC) = 0; + N(D_802431CC_CCE4DC) = FALSE; } N(D_80243B18_CCEE28) += 5; } diff --git a/src/world/area_flo/flo_23/CEE260.c b/src/world/area_flo/flo_23/CEE260.c index 6088a7e6b3..3619f547ab 100644 --- a/src/world/area_flo/flo_23/CEE260.c +++ b/src/world/area_flo/flo_23/CEE260.c @@ -1,8 +1,8 @@ #include "flo_23.h" -void fx_sun(); +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); ApiStatus N(func_80240000_CEE260)(Evt* script, s32 isInitialCall) { - fx_sun(0, 0, 0, 0, 0, 0); + fx_sun_undeclared(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/src/world/area_flo/flo_25/CF2BD0.c b/src/world/area_flo/flo_25/CF2BD0.c index 033bf8225b..095404d24c 100644 --- a/src/world/area_flo/flo_25/CF2BD0.c +++ b/src/world/area_flo/flo_25/CF2BD0.c @@ -1,8 +1,8 @@ #include "flo_25.h" -void fx_sun(); +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); ApiStatus N(func_80240000_CF2BD0)(Evt* script, s32 isInitialCall) { - fx_sun(0, 0, 0, 0, 0, 0); + fx_sun_undeclared(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index 35a1d6c897..57994eafab 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -5,11 +5,11 @@ static char* N(exit_str_1) = "jan_02"; #include "world/common/atomic/TexturePan.inc.c" -//void fx_sun(); +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); // will not match with correct function definition ApiStatus func_8024030C_B2833C(Evt* script, s32 isInitialCall) { - fx_sun(0, 0, 0, 0, 0, 0); + fx_sun_undeclared(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/src/world/area_kzn/kzn_23/kzn_23_2_extra.c b/src/world/area_kzn/kzn_23/kzn_23_2_extra.c index ae525f019f..0069521a2b 100644 --- a/src/world/area_kzn/kzn_23/kzn_23_2_extra.c +++ b/src/world/area_kzn/kzn_23/kzn_23_2_extra.c @@ -48,18 +48,18 @@ API_CALLABLE(N(AllowCameraInterpY)) { API_CALLABLE(N(AnimateChestSize)) { Entity* entity = get_entity_by_index(script->varTable[0xA]); - - if (isInitialCall != 0) { + + if (isInitialCall) { script->functionTemp[0] = 0; script->functionTemp[1] = 60; } - + entity->scale.x = script->functionTemp[1] / 60.0f; entity->scale.y = script->functionTemp[1] / 60.0f; entity->scale.z = script->functionTemp[1] / 60.0f; - + entity->rotation.y = (1.0f - cos_rad(entity->scale.y * PI)) * 990.0 / 2.0; - + script->functionTemp[1]--; if (~script->functionTemp[1] == 0) { //TODO remove ~ optimization return ApiStatus_DONE2; diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index bba030c05c..520619d325 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -13,19 +13,19 @@ extern s32 D_80241220_AB1210; // Needs data migrated #ifdef NON_MATCHING -ApiStatus func_802406A4_AB0694(Evt* script, s32 isInitialCall) { +ApiStatus func_802406A4_AB0694(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - - if (isInitialCall != 0) { + + if (isInitialCall) { D_8024121C_AB120C = 0; } - + if (D_8024121C_AB120C != 0) { D_8024121C_AB120C = 0; evt_set_variable(script, *args++, D_80241220_AB1210); return ApiStatus_DONE2; } - + return ApiStatus_BLOCK; } #else diff --git a/tools/find_similar_areas.py b/tools/find_similar_areas.py new file mode 100755 index 0000000000..2f8935d309 --- /dev/null +++ b/tools/find_similar_areas.py @@ -0,0 +1,215 @@ +#!/usr/bin/python3 + +import argparse +from collections import OrderedDict +from dataclasses import dataclass +from pathlib import Path +from typing import Optional + +from Levenshtein import ratio +import os +import sys + +script_dir = Path(os.path.dirname(os.path.realpath(__file__))) +root_dir = script_dir / ".." +asm_dir = root_dir / "ver/current/asm/nonmatchings/" +map_file_path = root_dir / "ver/current/build/papermario.map" +rom_path = root_dir / "ver/current/baserom.z64" + + +@dataclass +class Symbol: + name: str + rom_start: int + ram: int + current_file: str + prev_sym: str + is_decompiled: bool + rom_end: Optional[int] = None + + def size(self): + assert(self.rom_end is not None) + return self.rom_end - self.rom_start + +@dataclass +class Bytes: + offset: int + normalized: str + bytes: list[int] + + +def read_rom() -> bytes: + with open(rom_path, "rb") as f: + return f.read() + +def get_all_unmatched_functions(): + ret = set() + for root, dirs, files in os.walk(asm_dir): + for f in files: + if f.endswith(".s"): + ret.add(f[:-2]) + return ret + + +def get_symbol_bytes(func: str) -> Optional[Bytes]: + if func not in syms or syms[func].rom_end is None: + return None + sym = syms[func] + bs = list(rom_bytes[sym.rom_start:sym.rom_end]) + + while len(bs) > 0 and bs[-1] == 0: + bs.pop() + + insns = bs[0::4] + + ret = [] + for ins in insns: + ret.append(ins >> 2) + + return Bytes(0, bytes(ret).decode('utf-8'), bs) + + +def parse_map() -> OrderedDict[str, Symbol]: + ram_offset = None + cur_file = "" + syms: OrderedDict[str, Symbol] = OrderedDict() + prev_sym = "" + prev_line = "" + with open(map_file_path) as f: + for line in f: + if "load address" in line: + if "noload" in line or "noload" in prev_line: + ram_offset = None + continue + ram = int(line[16 : 16 + 18], 0) + rom = int(line[59 : 59 + 18], 0) + ram_offset = ram - rom + continue + prev_line = line + + if ( + ram_offset is None + or "=" in line + or "*fill*" in line + or " 0x" not in line + ): + continue + ram = int(line[16 : 16 + 18], 0) + rom = ram - ram_offset + fn = line.split()[-1] + if "0x" in fn: + ram_offset = None + elif "/" in fn: + cur_file = fn + else: + syms[fn] = Symbol( + name=fn, + rom_start=rom, + ram=ram, + current_file=cur_file, + prev_sym=prev_sym, + is_decompiled=not fn in unmatched_functions, + ) + prev_sym = fn + + # Calc end offsets + for sym in syms: + prev_sym = syms[sym].prev_sym + if prev_sym: + syms[prev_sym].rom_end = syms[sym].rom_start + + return syms + + + +@dataclass +class Match: + query_offset: int + target_offset: int + length: int + + def __str__(self): + return f"{self.query_offset} {self.target_offset} {self.length}" + +def get_pair_matches(query_hashes: list[int], sym_hashes: list[int]) -> list[Match]: + ret = [] + + matching_hashes = set(query_hashes).intersection(sym_hashes) + for hash in matching_hashes: + ret.append(Match(query_hashes.index(hash), sym_hashes.index(hash), 1)) + return ret + + +def get_hashes(bytes: Bytes, window_size: int) -> list[int]: + ret = [] + for i in range(0, len(bytes.normalized) - window_size): + ret.append(bytes.normalized[i : i + window_size]) + return ret + +def get_matches(query: str, window_size: int): + query_bytes: Optional[Bytes] = get_symbol_bytes(query) + + if query_bytes is None: + sys.exit("Symbol '" + query + "' not found") + + query_hashes = get_hashes(query_bytes, window_size) + + ret: dict[str, float] = {} + for symbol in syms: + if query == symbol: + continue + + sym_bytes: Optional[Bytes] = get_symbol_bytes(symbol) + if not sym_bytes: + continue + + if len(sym_bytes.bytes) < window_size: + continue + + sym_hashes = get_hashes(sym_bytes, window_size) + + matches: list[Match] = get_pair_matches(query_hashes, sym_hashes) + for match in matches: + print(f"{query} {symbol} {match}") + + return OrderedDict(sorted(ret.items(), key=lambda kv: kv[1], reverse=True)) + + +def do_query(query, window_size): + matches = get_matches(query, window_size) + num_matches = len(matches) + + if num_matches == 0: + print(query + " - found no matches") + return + + i = 0 + more_str = ":" + if args.num_out < num_matches: + more_str = " (showing only " + str(args.num_out) + "):" + + print(query + " - found " + str(num_matches) + " matches total" + more_str) + for match in matches: + if i == args.num_out: + break + match_str = "{:.3f} - {}".format(matches[match], match) + if syms[match].is_decompiled: + match_str += " (decompiled)" + print(match_str) + i += 1 + print() + +parser = argparse.ArgumentParser(description="Tool to find duplicate portions of code from one function in code across the codebase") +parser.add_argument("query", help="function") +parser.add_argument("-t", "--threshold", help="score threshold between 0 and 1 (higher is more restrictive)", type=float, default=0.9, required=False) +parser.add_argument("-n", "--num-out", help="number of results to display", type=int, default=100, required=False) +parser.add_argument("-w", "--window-size", help="number of bytes to compare", type=int, default=20, required=False) + +args = parser.parse_args() + +if __name__ == "__main__": + rom_bytes = read_rom() + unmatched_functions = get_all_unmatched_functions() + syms = parse_map() + + do_query(args.query, args.window_size) diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 21c5f30e19..4b649526c5 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -33,7 +33,6 @@ dead_get_npc_safe = 0x8003E534; // get_npc_safe dead_heap_malloc = 0x8002BFD4; dead_general_heap_malloc = 0x8002BF18; dead_heap_free = 0x8002C01C; -dead_func_80041080 = 0x80041080; dead_evt_set_variable = 0x802D5468; dead_sin_deg = 0x8002B5DC; dead_cos_deg = 0x8002B640; diff --git a/tools/m2ctx.py b/tools/m2ctx.py index 865feca05e..3699742971 100755 --- a/tools/m2ctx.py +++ b/tools/m2ctx.py @@ -14,6 +14,7 @@ src_dir = root_dir + "src/" CPP_FLAGS = [ "-Iinclude", "-Isrc", + "-Iassets/us", "-Iver/current/build/include", "-D_LANGUAGE_C", "-DF3DEX_GBI_2", diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo index dd88efc881..06b6c07cb3 100644 --- a/tools/splat/.gitrepo +++ b/tools/splat/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/ethteck/splat.git branch = master - commit = d93b6550c4800a2eb9ef672bf8d17067091e42df - parent = aa495d906bc91dce95c15010852ac62d7ebc12dd + commit = 4e5fca24a53f6ec443ed87a6cb365f7985cd6f3a + parent = 59421ff6eeb64cd96ca3ba0699a6d683febcc047 method = merge - cmdver = 0.4.3 + cmdver = 0.4.5 diff --git a/tools/splat/CHANGELOG.md b/tools/splat/CHANGELOG.md index f59c696502..1cc645d68c 100644 --- a/tools/splat/CHANGELOG.md +++ b/tools/splat/CHANGELOG.md @@ -1,5 +1,21 @@ # splat Release Notes +### 0.12.2 +* Fixed bug where `given_dir` was possibly not a `Path` + +### 0.12.1 +* The constructor for `Segment` takes far fewer arguments now, which will affect (and hopefully simplify) any custom segments that are implemented. + +* The new option `string_encoding` can be set at the global or segment level and will influence the encoding for strings in rodata during disassembly. The default encoding used is EUC-JP, as it was previously. + +## 0.12.0: Performance Boost + +In this release, we bring many performance improvements, making splat dramatically faster. We have observed speedups of 10-20x, though your results may vary. + +* Linker script `_romPos` alignment statements now take a form that is friendlier to different assemblers. + +* Fixed the default value of `use_legacy_include_asm` to be what it was before 0.11.2 + ### 0.11.2 * The way options are parsed and accessed has been completely refactored. The following option names have changed: diff --git a/tools/splat/requirements.txt b/tools/splat/requirements.txt index 4e0665f3da..874e3ce505 100644 --- a/tools/splat/requirements.txt +++ b/tools/splat/requirements.txt @@ -3,7 +3,7 @@ pylibyaml tqdm intervaltree colorama -spimdisasm>=1.5.5 +spimdisasm>=1.5.6 rabbitizer>=1.2.0 pygfxd n64img>=0.1.2 diff --git a/tools/splat/segtypes/common/bss.py b/tools/splat/segtypes/common/bss.py index b03f7e5083..b6859bec72 100644 --- a/tools/splat/segtypes/common/bss.py +++ b/tools/splat/segtypes/common/bss.py @@ -1,9 +1,7 @@ import spimdisasm -from typing import List from segtypes.common.data import CommonSegData -from segtypes.linker_entry import LinkerEntry -from util import options, symbols +from util import symbols class CommonSegBss(CommonSegData): @@ -35,13 +33,6 @@ class CommonSegBss(CommonSegData): self.get_exclusive_ram_id(), ) - for symbol_list in self.seg_symbols.values(): - symbols.add_symbol_to_spim_section(self.spim_section, symbol_list[0]) - - for sym in symbols.all_symbols: - if sym.user_declared: - symbols.add_symbol_to_spim_section(self.spim_section, sym) - self.spim_section.analyze() self.spim_section.setCommentOffset(self.rom_start) diff --git a/tools/splat/segtypes/common/c.py b/tools/splat/segtypes/common/c.py index 89e436ded2..89ab629aa4 100644 --- a/tools/splat/segtypes/common/c.py +++ b/tools/splat/segtypes/common/c.py @@ -8,6 +8,7 @@ from pathlib import Path import spimdisasm from util import log, options +from util import symbols from util.compiler import GCC, SN64 from util.symbols import Symbol @@ -112,9 +113,8 @@ class CommonSegC(CommonSegCodeSubsegment): # TODO run cpp? self.defined_funcs = self.get_funcs_defined_in_c(path) self.global_asm_funcs = self.get_global_asm_funcs(path) - self.mark_c_funcs_as_defined( - {*self.defined_funcs, *self.global_asm_funcs} - ) + symbols.to_mark_as_defined.update(self.defined_funcs) + symbols.to_mark_as_defined.update(self.global_asm_funcs) self.scan_code(rom_bytes) @@ -156,18 +156,6 @@ class CommonSegC(CommonSegCodeSubsegment): return ret - def mark_c_funcs_as_defined(self, c_funcs): - for func_name in c_funcs: - found = False - for symbols in self.seg_symbols.values(): - for symbol in symbols: - if symbol.name == func_name: - symbol.defined = True - found = True - break - if found: - break - def create_c_asm_file( self, func: spimdisasm.mips.symbols.SymbolFunction, diff --git a/tools/splat/segtypes/common/code.py b/tools/splat/segtypes/common/code.py index f3c5c1b458..c2f9fb5b54 100644 --- a/tools/splat/segtypes/common/code.py +++ b/tools/splat/segtypes/common/code.py @@ -23,12 +23,6 @@ class CommonSegCode(CommonSegGroup): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format, - symbol_name_format_no_rom, args, yaml, ): @@ -40,12 +34,6 @@ class CommonSegCode(CommonSegGroup): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id=exclusive_ram_id, - given_dir=given_dir, - symbol_name_format=symbol_name_format, - symbol_name_format_no_rom=symbol_name_format_no_rom, args=args, yaml=yaml, ) @@ -102,15 +90,15 @@ class CommonSegCode(CommonSegGroup): type=rep_type, name=base[0], vram_start=vram_start, - extract=False, - given_subalign=self.given_subalign, - exclusive_ram_id=self.get_exclusive_ram_id(), - given_dir=self.given_dir, - symbol_name_format=self.symbol_name_format, - symbol_name_format_no_rom=self.symbol_name_format_no_rom, args=[], yaml={}, ) + rep.extract = False + rep.given_subalign = self.given_subalign + rep.exclusive_ram_id = self.get_exclusive_ram_id() + rep.given_dir = self.given_dir + rep.given_symbol_name_format = self.symbol_name_format + rep.given_symbol_name_format_no_rom = self.symbol_name_format_no_rom rep.sibling = base[1] rep.parent = self alls.append(rep) @@ -223,21 +211,23 @@ class CommonSegCode(CommonSegGroup): # Add dummy segments to be expanded later if typ.startswith("all_"): - ret.append( - Segment( - start, - "auto", - typ, - "", - "auto", - False, - self.given_subalign, - self.exclusive_ram_id, - self.given_dir, - self.symbol_name_format, - self.symbol_name_format_no_rom, - ) + dummy_seg = Segment( + rom_start=start, + rom_end="auto", + type=typ, + name="", + vram_start="auto", + args=[], + yaml={}, ) + dummy_seg.given_subalign = self.given_subalign + dummy_seg.exclusive_ram_id = self.exclusive_ram_id + dummy_seg.given_dir = self.given_dir + dummy_seg.given_symbol_name_format = self.symbol_name_format + dummy_seg.given_symbol_name_format_no_rom = ( + self.symbol_name_format_no_rom + ) + ret.append(dummy_seg) continue segment_class = Segment.get_class_for_type(typ) @@ -297,24 +287,21 @@ class CommonSegCode(CommonSegGroup): rom_start = "auto" vram_start = "auto" - ret.insert( - idx, - ( - Segment( - rom_start, - "auto", - "all_" + section, - "", - vram_start, - False, - self.given_subalign, - self.exclusive_ram_id, - self.given_dir, - self.symbol_name_format, - self.symbol_name_format_no_rom, - ) - ), + new_seg = Segment( + rom_start=rom_start, + rom_end="auto", + type="all_" + section, + name="", + vram_start=vram_start, + args=[], + yaml={}, ) + new_seg.given_subalign = self.given_subalign + new_seg.exclusive_ram_id = self.exclusive_ram_id + new_seg.given_dir = self.given_dir + new_seg.given_symbol_name_format = self.symbol_name_format + new_seg.given_symbol_name_format_no_rom = self.symbol_name_format_no_rom + ret.insert(idx, new_seg) check = True while check: diff --git a/tools/splat/segtypes/common/codesubsegment.py b/tools/splat/segtypes/common/codesubsegment.py index c89e368f49..590cb1360c 100644 --- a/tools/splat/segtypes/common/codesubsegment.py +++ b/tools/splat/segtypes/common/codesubsegment.py @@ -21,6 +21,12 @@ class CommonSegCodeSubsegment(Segment): else False ) + self.str_encoding: Optional[str] = ( + self.yaml.get("str_encoding", False) + if isinstance(self.yaml, dict) + else None + ) + self.spim_section: Optional[spimdisasm.mips.sections.SectionBase] = None @property @@ -48,13 +54,6 @@ class CommonSegCodeSubsegment(Segment): self.get_exclusive_ram_id(), ) - for symbol_list in self.seg_symbols.values(): - symbols.add_symbol_to_spim_section(self.spim_section, symbol_list[0]) - - for sym in symbols.all_symbols: - if sym.user_declared: - symbols.add_symbol_to_spim_section(self.spim_section, sym) - self.spim_section.isHandwritten = is_asm self.spim_section.analyze() diff --git a/tools/splat/segtypes/common/data.py b/tools/splat/segtypes/common/data.py index 319f7ed6e8..7a1392ddee 100644 --- a/tools/splat/segtypes/common/data.py +++ b/tools/splat/segtypes/common/data.py @@ -83,13 +83,6 @@ class CommonSegData(CommonSegCodeSubsegment, CommonSegGroup): self.get_exclusive_ram_id(), ) - for symbol_list in self.seg_symbols.values(): - symbols.add_symbol_to_spim_section(self.spim_section, symbol_list[0]) - - for sym in symbols.all_symbols: - if sym.user_declared: - symbols.add_symbol_to_spim_section(self.spim_section, sym) - self.spim_section.analyze() self.spim_section.setCommentOffset(self.rom_start) @@ -108,7 +101,7 @@ class CommonSegData(CommonSegCodeSubsegment, CommonSegGroup): f"Data segment {self.name}, symbol at vram {symbol.contextSym.vram:X} is a jumptable, indicating the start of the rodata section _may_ be near here." ) print( - f"Please note the real start of the rodata section may be way before this point." + "Please note the real start of the rodata section may be way before this point." ) if symbol.contextSym.vromAddress is not None: print(f" - [0x{symbol.contextSym.vromAddress:X}, rodata]") diff --git a/tools/splat/segtypes/common/group.py b/tools/splat/segtypes/common/group.py index da044c7a38..e5a0c374d7 100644 --- a/tools/splat/segtypes/common/group.py +++ b/tools/splat/segtypes/common/group.py @@ -12,12 +12,6 @@ class CommonSegGroup(CommonSegment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format, - symbol_name_format_no_rom, args, yaml, ): @@ -27,12 +21,6 @@ class CommonSegGroup(CommonSegment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id=exclusive_ram_id, - given_dir=given_dir, - symbol_name_format=symbol_name_format, - symbol_name_format_no_rom=symbol_name_format_no_rom, args=args, yaml=yaml, ) diff --git a/tools/splat/segtypes/common/lib.py b/tools/splat/segtypes/common/lib.py index adbfe1e556..3dd29d4ce3 100644 --- a/tools/splat/segtypes/common/lib.py +++ b/tools/splat/segtypes/common/lib.py @@ -1,3 +1,4 @@ +from pathlib import Path from segtypes.n64.segment import N64Segment from segtypes.linker_entry import LinkerEntry @@ -12,12 +13,6 @@ class CommonSegLib(N64Segment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format, - symbol_name_format_no_rom, args, yaml, ): @@ -27,12 +22,6 @@ class CommonSegLib(N64Segment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id=exclusive_ram_id, - given_dir=given_dir, - symbol_name_format=symbol_name_format, - symbol_name_format_no_rom=symbol_name_format_no_rom, args=args, yaml=yaml, ) @@ -57,6 +46,6 @@ class CommonSegLib(N64Segment): def get_linker_entries(self): path = options.opts.lib_path / self.name - object_path = f"{path}.a:{self.object}.o" + object_path = Path(f"{path}.a:{self.object}.o") return [LinkerEntry(self, [path], object_path, self.get_linker_section())] diff --git a/tools/splat/segtypes/common/rodata.py b/tools/splat/segtypes/common/rodata.py index 2161802ae8..99d3203e70 100644 --- a/tools/splat/segtypes/common/rodata.py +++ b/tools/splat/segtypes/common/rodata.py @@ -26,12 +26,14 @@ class CommonSegRodata(CommonSegData): self.get_exclusive_ram_id(), ) - for symbol_list in self.seg_symbols.values(): - symbols.add_symbol_to_spim_section(self.spim_section, symbol_list[0]) + # Set rodata string encoding + # First check the global configuration + if options.opts.string_encoding is not None: + self.spim_section.stringEncoding = options.opts.string_encoding - for sym in symbols.all_symbols: - if sym.user_declared: - symbols.add_symbol_to_spim_section(self.spim_section, sym) + # Then check the per-segment configuration in case we want to override the global one + if self.str_encoding is not None: + self.spim_section.stringEncoding = self.str_encoding self.spim_section.analyze() self.spim_section.setCommentOffset(self.rom_start) diff --git a/tools/splat/segtypes/linker_entry.py b/tools/splat/segtypes/linker_entry.py index 9f0c6225e8..0dd5937798 100644 --- a/tools/splat/segtypes/linker_entry.py +++ b/tools/splat/segtypes/linker_entry.py @@ -117,7 +117,7 @@ class LinkerWriter: self._writeln("SECTIONS") self._begin_block() - self._writeln(f"__romPos = 0;") + self._writeln("__romPos = 0;") if options.opts.gp is not None: self._writeln("_gp = " + f"0x{options.opts.gp:X};") @@ -171,7 +171,7 @@ class LinkerWriter: self._begin_segment(entry.segment) continue elif cur_section == "linker_offset": - self._write_symbol(f"{get_segment_cname(entry.segment)}_OFFSET", f".") + self._write_symbol(f"{get_segment_cname(entry.segment)}_OFFSET", ".") continue for i, section in enumerate(section_labels.values()): @@ -320,6 +320,8 @@ class LinkerWriter: def _begin_segment(self, segment: Segment): if segment.follows_vram_segment: vram_str = get_segment_cname(segment.follows_vram_segment) + "_VRAM_END " + elif segment.follows_vram_symbol: + vram_str = segment.follows_vram_symbol + " " else: vram_str = ( f"0x{segment.vram_start:X} " @@ -339,6 +341,8 @@ class LinkerWriter: def _begin_bss_segment(self, segment: Segment, is_first: bool = False): if segment.follows_vram_segment: vram_str = get_segment_cname(segment.follows_vram_segment) + "_VRAM_END " + elif segment.follows_vram_symbol: + vram_str = segment.follows_vram_symbol + " " else: vram_str = ( f"0x{segment.vram_start:X} " @@ -370,9 +374,7 @@ class LinkerWriter: # Align directive if segment.align: - self._writeln( - f"__romPos = (__romPos + {segment.align - 1}) & ~{segment.align - 1}; /* align {segment.align} */" - ) + self._writeln(f"__romPos = ALIGN(__romPos, {segment.align});") self._write_symbol(f"{name}_ROM_END", "__romPos") diff --git a/tools/splat/segtypes/n64/gfx.py b/tools/splat/segtypes/n64/gfx.py index 008861d36f..64f04ef020 100644 --- a/tools/splat/segtypes/n64/gfx.py +++ b/tools/splat/segtypes/n64/gfx.py @@ -20,12 +20,6 @@ class N64SegGfx(CommonSegCodeSubsegment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format, - symbol_name_format_no_rom, args, yaml, ): @@ -35,12 +29,6 @@ class N64SegGfx(CommonSegCodeSubsegment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id=exclusive_ram_id, - given_dir=given_dir, - symbol_name_format=symbol_name_format, - symbol_name_format_no_rom=symbol_name_format_no_rom, args=args, yaml=yaml, ) diff --git a/tools/splat/segtypes/n64/header.py b/tools/splat/segtypes/n64/header.py index 121c2d64bc..f79b6eb523 100644 --- a/tools/splat/segtypes/n64/header.py +++ b/tools/splat/segtypes/n64/header.py @@ -7,7 +7,7 @@ class N64SegHeader(CommonSegHeader): encoding = options.opts.header_encoding header_lines = [] - header_lines.append(f".section .data\n") + header_lines.append(".section .data\n") header_lines.append( self.get_line("word", rom_bytes[0x00:0x04], "PI BSB Domain 1 register") ) @@ -25,7 +25,7 @@ class N64SegHeader(CommonSegHeader): if encoding != "word": header_lines.append( - f'.ascii "' + '.ascii "' + rom_bytes[0x20:0x34].decode(encoding).strip().ljust(20) + '" /* Internal name */' ) diff --git a/tools/splat/segtypes/n64/i8.py b/tools/splat/segtypes/n64/i8.py index 0ff3097a81..72d85e5673 100644 --- a/tools/splat/segtypes/n64/i8.py +++ b/tools/splat/segtypes/n64/i8.py @@ -1,5 +1,4 @@ from segtypes.n64.img import N64SegImg -from segtypes.n64.img import N64SegImg import n64img.image diff --git a/tools/splat/segtypes/n64/img.py b/tools/splat/segtypes/n64/img.py index 66fb2261ff..ef3336c046 100644 --- a/tools/splat/segtypes/n64/img.py +++ b/tools/splat/segtypes/n64/img.py @@ -14,12 +14,6 @@ class N64SegImg(N64Segment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format, - symbol_name_format_no_rom, args, yaml, img_cls: Type[Image], @@ -30,12 +24,6 @@ class N64SegImg(N64Segment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id=exclusive_ram_id, - given_dir=given_dir, - symbol_name_format=symbol_name_format, - symbol_name_format_no_rom=symbol_name_format_no_rom, args=args, yaml=yaml, ) diff --git a/tools/splat/segtypes/n64/palette.py b/tools/splat/segtypes/n64/palette.py index 3d87661ba2..5e332379d8 100644 --- a/tools/splat/segtypes/n64/palette.py +++ b/tools/splat/segtypes/n64/palette.py @@ -1,15 +1,20 @@ +from itertools import zip_longest from pathlib import Path from typing import TYPE_CHECKING, Optional from segtypes.n64.segment import N64Segment from util import log, options from util.color import unpack_color -from util.iter import iter_in_groups if TYPE_CHECKING: from segtypes.n64.ci import N64SegCi as Raster +def iter_in_groups(iterable, n, fillvalue=None): + args = [iter(iterable)] * n + return zip_longest(*args, fillvalue=fillvalue) + + class N64SegPalette(N64Segment): require_unique_name = False diff --git a/tools/splat/segtypes/n64/vtx.py b/tools/splat/segtypes/n64/vtx.py index 0650b88024..5a0e1c0f12 100644 --- a/tools/splat/segtypes/n64/vtx.py +++ b/tools/splat/segtypes/n64/vtx.py @@ -5,7 +5,6 @@ Dumps out Vtx as a .inc.c file. Originally written by Mark Street (https://github.com/mkst) """ -import re import struct from pathlib import Path from util.log import error @@ -22,12 +21,6 @@ class N64SegVtx(CommonSegCodeSubsegment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format, - symbol_name_format_no_rom, args, yaml, ): @@ -37,12 +30,6 @@ class N64SegVtx(CommonSegCodeSubsegment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id=exclusive_ram_id, - given_dir=given_dir, - symbol_name_format=symbol_name_format, - symbol_name_format_no_rom=symbol_name_format_no_rom, args=args, yaml=yaml, ) diff --git a/tools/splat/segtypes/psx/asm.py b/tools/splat/segtypes/psx/asm.py index 1019ac8b89..b1ff86415a 100644 --- a/tools/splat/segtypes/psx/asm.py +++ b/tools/splat/segtypes/psx/asm.py @@ -1,6 +1,4 @@ from segtypes.common.asm import CommonSegAsm -from typing import Optional -from pathlib import Path from util import options diff --git a/tools/splat/segtypes/psx/header.py b/tools/splat/segtypes/psx/header.py index 631b57b86a..2c79737944 100644 --- a/tools/splat/segtypes/psx/header.py +++ b/tools/splat/segtypes/psx/header.py @@ -6,7 +6,7 @@ class PsxSegHeader(CommonSegHeader): # breakdown from https://psx-spx.consoledev.net/cdromdrive/#filenameexe-general-purpose-executable def parse_header(self, rom_bytes): header_lines = [] - header_lines.append(f".section .data\n") + header_lines.append(".section .data\n") header_lines.append( self.get_line("ascii", rom_bytes[0x00:0x08], "Magic number") ) diff --git a/tools/splat/segtypes/segment.py b/tools/splat/segtypes/segment.py index 93924a3107..8e1e7b9b27 100644 --- a/tools/splat/segtypes/segment.py +++ b/tools/splat/segtypes/segment.py @@ -49,6 +49,12 @@ def parse_segment_follows_vram(segment: Union[dict, list]) -> Optional[str]: return None +def parse_segment_follows_vram_symbol(segment: Union[dict, list]) -> Optional[str]: + if isinstance(segment, dict): + return segment.get("follows_vram_symbol", None) + return None + + class Segment: require_unique_name = True @@ -96,7 +102,9 @@ class Segment: ext_spec = importlib.util.spec_from_file_location( f"{platform}.segtypes.{seg_type}", ext_path / f"{seg_type}.py" ) + assert ext_spec is not None ext_mod = importlib.util.module_from_spec(ext_spec) + assert ext_spec.loader is not None ext_spec.loader.exec_module(ext_mod) except Exception as err: log.write(err, status="error") @@ -159,34 +167,31 @@ class Segment: type: str, name: str, vram_start: Any, - extract: bool, - given_subalign: Optional[int], - exclusive_ram_id: Optional[str], - given_dir: Path, - symbol_name_format: str, - symbol_name_format_no_rom: str, - args=[], - yaml={}, + args: list, + yaml, ): self.rom_start = rom_start self.rom_end = rom_end self.type = type self.name = name self.vram_start = vram_start - self.extract = extract self.align: Optional[int] = None - self.given_subalign = given_subalign or options.opts.subalign - self.exclusive_ram_id: Optional[str] = exclusive_ram_id - self.given_dir: Path = given_dir - self.given_seg_symbols: Dict[ - int, List[Symbol] - ] = {} # Symbols known to be in this segment + self.given_subalign: int = options.opts.subalign + self.exclusive_ram_id: Optional[str] = None + self.given_dir: Path = Path() + + # Symbols known to be in this segment + self.given_seg_symbols: Dict[int, List[Symbol]] = {} + self.given_section_order: List[str] = options.opts.section_order self.follows_vram: Optional[str] = None + self.follows_vram_symbol: Optional[str] = None - self.given_symbol_name_format = symbol_name_format - self.given_symbol_name_format_no_rom = symbol_name_format_no_rom + self.given_symbol_name_format: str = options.opts.symbol_name_format + self.given_symbol_name_format_no_rom: str = ( + options.opts.symbol_name_format_no_rom + ) self.parent: Optional[Segment] = None self.sibling: Optional[Segment] = None @@ -195,10 +200,10 @@ class Segment: self.args: List[str] = args self.yaml = yaml + self.extract: bool = True if self.rom_start == "auto": self.extract = False - - if self.type.startswith("."): + elif self.type.startswith("."): self.extract = False self.warnings: List[str] = [] @@ -221,16 +226,7 @@ class Segment: type = Segment.parse_segment_type(yaml) name = Segment.parse_segment_name(cls, rom_start, yaml) vram_start = vram if vram is not None else parse_segment_vram(yaml) - extract = bool(yaml.get("extract", True)) if isinstance(yaml, dict) else True - given_subalign = parse_segment_subalign(yaml) - exclusive_ram_id: Optional[str] = ( - yaml.get("exclusive_ram_id") if isinstance(yaml, dict) else None - ) - given_dir = Path(yaml.get("dir", "")) if isinstance(yaml, dict) else Path() - given_symbol_name_format = Segment.parse_segment_symbol_name_format(yaml) - given_symbol_name_format_no_rom = ( - Segment.parse_segment_symbol_name_format_no_rom(yaml) - ) + args: List[str] = [] if isinstance(yaml, dict) else yaml[3:] ret = cls( @@ -239,20 +235,26 @@ class Segment: type=type, name=name, vram_start=vram_start, - extract=extract, - given_subalign=given_subalign, - exclusive_ram_id=exclusive_ram_id, - given_dir=given_dir, - symbol_name_format=given_symbol_name_format, - symbol_name_format_no_rom=given_symbol_name_format_no_rom, args=args, yaml=yaml, ) ret.given_section_order = parse_segment_section_order(yaml) + ret.given_subalign = parse_segment_subalign(yaml) + if isinstance(yaml, dict): + ret.extract = bool(yaml.get("extract", ret.extract)) + ret.exclusive_ram_id = yaml.get("exclusive_ram_id") + ret.given_dir = Path(yaml.get("dir", "")) + ret.given_symbol_name_format = Segment.parse_segment_symbol_name_format(yaml) + ret.given_symbol_name_format_no_rom = ( + Segment.parse_segment_symbol_name_format_no_rom(yaml) + ) if not ret.follows_vram: ret.follows_vram = parse_segment_follows_vram(yaml) + if not ret.follows_vram_symbol: + ret.follows_vram_symbol = parse_segment_follows_vram_symbol(yaml) + if not ret.align: ret.align = parse_segment_align(yaml) return ret diff --git a/tools/splat/split.py b/tools/splat/split.py index 23af30ded5..4e65cbbfcc 100755 --- a/tools/splat/split.py +++ b/tools/splat/split.py @@ -1,26 +1,22 @@ #! /usr/bin/env python3 -import hashlib -from typing import Dict, List, Optional, Union, Set, Any import argparse -import spimdisasm +import hashlib +import pickle +from typing import Any, Dict, List, Optional, Set, Union + import rabbitizer +import spimdisasm import tqdm import yaml -import pickle -from colorama import Style, Fore -from segtypes.segment import Segment -from segtypes.linker_entry import LinkerWriter, to_cname -from util import log -from util import options -from util import symbols -from util import palettes -from util import compiler -from util.symbols import Symbol - +from colorama import Fore, Style from intervaltree import Interval, IntervalTree -VERSION = "0.11.2" +from segtypes.linker_entry import LinkerWriter, to_cname +from segtypes.segment import Segment +from util import compiler, log, options, palettes, symbols + +VERSION = "0.12.2" parser = argparse.ArgumentParser( description="Split a rom given a rom, a config, and output directory" @@ -106,8 +102,6 @@ def initialize_segments(config_segments: Union[dict, list]) -> List[Segment]: def assign_symbols_to_segments(): - seg_syms: dict[int, list[Symbol]] = {} - for symbol in symbols.all_symbols: if symbol.rom: cands = segment_roms[symbol.rom] @@ -357,6 +351,8 @@ def main(config_path, modes, verbose, use_cache=True): seg_split[typ] += 1 + symbols.mark_c_funcs_as_defined() + # Split for segment in tqdm.tqdm( all_segments, @@ -469,12 +465,12 @@ def main(config_path, modes, verbose, use_cache=True): if s.given_size is not None: f.write(f"0x{s.given_size:X},") else: - f.write(f"None,") + f.write("None,") f.write(f"{s.size},") if s.rom is not None: f.write(f"0x{s.rom:X},") else: - f.write(f"None,") + f.write("None,") f.write( f"{s.defined},{s.user_declared},{s.referenced},{s.dead},{s.extract}\n" ) diff --git a/tools/splat/stubs/png.pyi b/tools/splat/stubs/png.pyi deleted file mode 100644 index 07ad4206d2..0000000000 --- a/tools/splat/stubs/png.pyi +++ /dev/null @@ -1,100 +0,0 @@ -from collections import namedtuple -from typing import Any, Optional - -Resolution = namedtuple("Resolution", "x y unit_is_meter") - -class Error(Exception): ... -class FormatError(Error): ... -class ProtocolError(Error): ... -class ChunkError(FormatError): ... -class Default: ... - -class Writer: - width: Any = ... - height: Any = ... - transparent: Any = ... - background: Any = ... - gamma: Any = ... - greyscale: Any = ... - alpha: Any = ... - colormap: Any = ... - bitdepth: Any = ... - compression: Any = ... - chunk_limit: Any = ... - interlace: Any = ... - palette: Any = ... - x_pixels_per_unit: Any = ... - y_pixels_per_unit: Any = ... - unit_is_meter: Any = ... - color_type: Any = ... - color_planes: Any = ... - planes: Any = ... - psize: Any = ... - def __init__( - self, - width: Optional[Any] = ..., - height: Optional[Any] = ..., - size: Optional[Any] = ..., - greyscale: Any = ..., - alpha: bool = ..., - bitdepth: int = ..., - palette: Optional[Any] = ..., - transparent: Optional[Any] = ..., - background: Optional[Any] = ..., - gamma: Optional[Any] = ..., - compression: Optional[Any] = ..., - interlace: bool = ..., - planes: Optional[Any] = ..., - colormap: Optional[Any] = ..., - maxval: Optional[Any] = ..., - chunk_limit: Any = ..., - x_pixels_per_unit: Optional[Any] = ..., - y_pixels_per_unit: Optional[Any] = ..., - unit_is_meter: bool = ..., - ) -> None: ... - def write(self, outfile: Any, rows: Any): ... - def write_passes(self, outfile: Any, rows: Any): ... - def write_packed(self, outfile: Any, rows: Any): ... - def write_preamble(self, outfile: Any) -> None: ... - def write_array(self, outfile: Any, pixels: Any) -> None: ... - def array_scanlines(self, pixels: Any) -> None: ... - def array_scanlines_interlace(self, pixels: Any) -> None: ... - -def write_chunks(out: Any, chunks: Any) -> None: ... -def from_array(a: Any, mode: Optional[Any] = ..., info: Any = ...): ... - -fromarray = from_array - -class Image: - rows: Any = ... - info: Any = ... - def __init__(self, rows: Any, info: Any) -> None: ... - def save(self, file: Any) -> None: ... - def write(self, file: Any) -> None: ... - -class Reader: - signature: Any = ... - transparent: Any = ... - atchunk: Any = ... - file: Any = ... - def __init__( - self, - _guess: Optional[Any] = ..., - filename: Optional[Any] = ..., - file: Optional[Any] = ..., - bytes: Optional[Any] = ..., - ) -> None: ... - def chunk(self, lenient: bool = ...): ... - def chunks(self) -> None: ... - def undo_filter(self, filter_type: Any, scanline: Any, previous: Any): ... - def validate_signature(self) -> None: ... - def preamble(self, lenient: bool = ...) -> None: ... - def process_chunk(self, lenient: bool = ...) -> None: ... - def read(self, lenient: bool = ...): ... - def read_flat(self): ... - def palette(self, alpha: str = ...): ... - def asDirect(self): ... - def asRGB8(self): ... - def asRGBA8(self): ... - def asRGB(self): ... - def asRGBA(self): ... diff --git a/tools/splat/util/iter.py b/tools/splat/util/iter.py deleted file mode 100644 index 69e1da8cfb..0000000000 --- a/tools/splat/util/iter.py +++ /dev/null @@ -1,29 +0,0 @@ -from itertools import zip_longest -from math import ceil - - -def iter_in_groups(iterable, n, fillvalue=None): - args = [iter(iterable)] * n - return zip_longest(*args, fillvalue=fillvalue) - - -def iter_image_indexes( - width, height, bytes_per_x=1, bytes_per_y=1, flip_h=False, flip_v=False -): - w = int(width * bytes_per_x) - h = int(height * bytes_per_y) - - xrange = ( - range(w - ceil(bytes_per_x), -1, -ceil(bytes_per_x)) - if flip_h - else range(0, w, ceil(bytes_per_x)) - ) - yrange = ( - range(h - ceil(bytes_per_y), -1, -ceil(bytes_per_y)) - if flip_v - else range(0, h, ceil(bytes_per_y)) - ) - - for y in yrange: - for x in xrange: - yield x, y, (y * w) + x diff --git a/tools/splat/util/n64/Yay0decompress.py b/tools/splat/util/n64/Yay0decompress.py index 1076435f5c..547e696a84 100644 --- a/tools/splat/util/n64/Yay0decompress.py +++ b/tools/splat/util/n64/Yay0decompress.py @@ -23,7 +23,7 @@ def setup_lib(): ) return True except Exception: - print(f"Failed to load C library; falling back to python method") + print("Failed to load C library; falling back to python method") tried_loading = True return False diff --git a/tools/splat/util/options.py b/tools/splat/util/options.py index ddb95bf0b3..92187566d9 100644 --- a/tools/splat/util/options.py +++ b/tools/splat/util/options.py @@ -5,8 +5,6 @@ from typing import Dict, List, Mapping, Optional, Type, TypeVar from util import compiler from util.compiler import Compiler -opts: "SplatOpts" - @dataclass class SplatOpts: @@ -146,6 +144,8 @@ class SplatOpts: add_set_gp_64: bool # Generate .asmproc.d dependency files for each C file which still reference functions in assembly files create_asm_dependencies: bool + # Global option for rodata string encoding. This can be overriden per segment + string_encoding: Optional[str] ################################################################################ # N64-specific options @@ -168,6 +168,9 @@ class SplatOpts: return mode in self.modes or "all" in self.modes +opts: SplatOpts + + def parse_yaml( yaml: Dict, basename: str, @@ -198,6 +201,20 @@ def parse_yaml( raise ValueError(f"Missing required option {opt}") return yaml_as_type(value, t) + def parse_optional_opt( + yaml: Mapping[str, object], + opt: str, + t: Type[T], + default: Optional[T] = None, + ) -> Optional[T]: + value = yaml.get(opt) + if isinstance(value, t): + # Fast path + return value + if value is None and opt not in yaml: + return default + return yaml_as_type(value, t) + def parse_opt_within( yaml: Mapping[str, object], opt: str, @@ -340,6 +357,7 @@ def parse_yaml( ), add_set_gp_64=parse_opt(yaml, "add_set_gp_64", bool, True), create_asm_dependencies=parse_opt(yaml, "create_asm_dependencies", bool, False), + string_encoding=parse_optional_opt(yaml, "string_encoding", str, None), header_encoding=parse_opt(yaml, "header_encoding", str, "ASCII"), gfx_ucode=parse_opt_within( yaml, @@ -348,7 +366,7 @@ def parse_yaml( ["f3d", "f3db", "f3dex", "f3dexb", "f3dex2"], "f3dex2", ), - use_legacy_include_asm=parse_opt(yaml, "use_legacy_include_asm", bool, False), + use_legacy_include_asm=parse_opt(yaml, "use_legacy_include_asm", bool, True), ) diff --git a/tools/splat/util/palettes.py b/tools/splat/util/palettes.py index b62ea3f69f..d22ddb5b0b 100644 --- a/tools/splat/util/palettes.py +++ b/tools/splat/util/palettes.py @@ -1,4 +1,4 @@ -from typing import Dict, Union +from typing import Dict from segtypes.n64.ci import N64SegCi from segtypes.n64.palette import N64SegPalette as Palette from segtypes.common.group import CommonSegGroup diff --git a/tools/splat/util/range.py b/tools/splat/util/range.py index d3e3c60e02..04aea6e396 100644 --- a/tools/splat/util/range.py +++ b/tools/splat/util/range.py @@ -1,8 +1,8 @@ -import dataclasses +from dataclasses import dataclass from typing import Optional -@dataclasses.dataclass +@dataclass class Range: start: Optional[int] = None end: Optional[int] = None diff --git a/tools/splat/util/symbols.py b/tools/splat/util/symbols.py index 8e997ab240..9fd9150686 100644 --- a/tools/splat/util/symbols.py +++ b/tools/splat/util/symbols.py @@ -1,6 +1,7 @@ from typing import Dict, List, Optional, TYPE_CHECKING, Set import spimdisasm import tqdm +from dataclasses import dataclass # circular import if TYPE_CHECKING: @@ -12,6 +13,7 @@ all_symbols: List["Symbol"] = [] all_symbols_dict: Dict[int, List["Symbol"]] = {} ignored_addresses: Set[int] = set() symbol_ranges: List["Symbol"] = [] +to_mark_as_defined: Set[str] = set() # Initialize a spimdisasm context, used to store symbols and functions spim_context = spimdisasm.common.Context() @@ -194,48 +196,55 @@ def initialize_spim_context(all_segments: "List[Segment]") -> None: spim_context.bannedSymbols |= ignored_addresses + from segtypes.common.code import CommonSegCode + for segment in all_segments: - if segment.type == "code": + if not isinstance(segment, CommonSegCode): # We only care about the VRAMs of code segments - if isinstance(segment.vram_start, int) and isinstance( - segment.vram_end, int - ): - ram_id = segment.get_exclusive_ram_id() - if ram_id is None: - if global_vram_start is None: - global_vram_start = segment.vram_start - else: - if segment.vram_start < global_vram_start: - global_vram_start = segment.vram_start + continue - if global_vram_end is None: - global_vram_end = segment.vram_end - else: - if global_vram_end < segment.vram_end: - global_vram_end = segment.vram_end + if ( + not isinstance(segment.vram_start, int) + or not isinstance(segment.vram_end, int) + or not isinstance(segment.rom_start, int) + or not isinstance(segment.rom_end, int) + ): + continue - if isinstance(segment.rom_start, int): - if global_vrom_start is None: - global_vrom_start = segment.rom_start - else: - if segment.rom_start < global_vrom_start: - global_vrom_start = segment.rom_start + ram_id = segment.get_exclusive_ram_id() + if ram_id is None: + if global_vram_start is None: + global_vram_start = segment.vram_start + elif segment.vram_start < global_vram_start: + global_vram_start = segment.vram_start - if isinstance(segment.rom_end, int): - if global_vrom_end is None: - global_vrom_end = segment.rom_end - else: - if global_vrom_end < segment.rom_end: - global_vrom_end = segment.rom_end + if global_vram_end is None: + global_vram_end = segment.vram_end + elif global_vram_end < segment.vram_end: + global_vram_end = segment.vram_end - else: - spim_context.addOverlaySegment( - ram_id, - segment.rom_start, - segment.rom_end, - segment.vram_start, - segment.vram_end, - ) + if global_vrom_start is None: + global_vrom_start = segment.rom_start + elif segment.rom_start < global_vrom_start: + global_vrom_start = segment.rom_start + + if global_vrom_end is None: + global_vrom_end = segment.rom_end + elif global_vrom_end < segment.rom_end: + global_vrom_end = segment.rom_end + + else: + spim_segment = spim_context.addOverlaySegment( + ram_id, + segment.rom_start, + segment.rom_end, + segment.vram_start, + segment.vram_end, + ) + # Add the segment-specific symbols first + for symbols_list in segment.seg_symbols.values(): + for sym in symbols_list: + add_symbol_to_spim_segment(spim_segment, sym) if ( global_vram_start is not None @@ -247,9 +256,62 @@ def initialize_spim_context(all_segments: "List[Segment]") -> None: global_vrom_start, global_vrom_end, global_vram_start, global_vram_end ) + # pass the global symbols to spimdisasm + for segment in all_segments: + if not isinstance(segment, CommonSegCode): + # We only care about the VRAMs of code segments + continue + + ram_id = segment.get_exclusive_ram_id() + if ram_id is not None: + continue + + for symbols_list in segment.seg_symbols.values(): + for sym in symbols_list: + add_symbol_to_spim_segment(spim_context.globalSegment, sym) + + +def add_symbol_to_spim_segment( + segment: spimdisasm.common.SymbolsSegment, sym: "Symbol" +) -> spimdisasm.common.ContextSymbol: + if sym.type == "func": + context_sym = segment.addFunction( + sym.vram_start, isAutogenerated=not sym.user_declared, vromAddress=sym.rom + ) + elif sym.type == "jtbl": + context_sym = segment.addJumpTable( + sym.vram_start, isAutogenerated=not sym.user_declared, vromAddress=sym.rom + ) + elif sym.type == "jtbl_label": + context_sym = segment.addJumpTableLabel( + sym.vram_start, isAutogenerated=not sym.user_declared, vromAddress=sym.rom + ) + elif sym.type == "label": + context_sym = segment.addBranchLabel( + sym.vram_start, isAutogenerated=not sym.user_declared, vromAddress=sym.rom + ) + else: + context_sym = segment.addSymbol( + sym.vram_start, isAutogenerated=not sym.user_declared, vromAddress=sym.rom + ) + if sym.type is not None: + context_sym.type = sym.type + + if sym.user_declared: + context_sym.isUserDeclared = True + if sym.defined: + context_sym.isDefined = True + if sym.rom is not None: + context_sym.vromAddress = sym.rom + if sym.given_size is not None: + context_sym.size = sym.size + context_sym.setNameGetCallbackIfUnset(lambda _: sym.name) + + return context_sym + def add_symbol_to_spim_section( - section: spimdisasm.common.ElementBase, sym: "Symbol" + section: spimdisasm.mips.sections.SectionBase, sym: "Symbol" ) -> spimdisasm.common.ContextSymbol: if sym.type == "func": context_sym = section.addFunction( @@ -271,7 +333,7 @@ def add_symbol_to_spim_section( context_sym = section.addSymbol( sym.vram_start, isAutogenerated=not sym.user_declared, symbolVrom=sym.rom ) - if sym.type and sym.type != "unknown": + if sym.type is not None: context_sym.type = sym.type if sym.user_declared: @@ -355,27 +417,34 @@ def retrieve_from_ranges(vram, rom=None): return None +def mark_c_funcs_as_defined(): + for symbol in all_symbols: + if len(to_mark_as_defined) == 0: + return + sym_name = symbol.name + if sym_name in to_mark_as_defined: + symbol.defined = True + to_mark_as_defined.remove(sym_name) + + +@dataclass class Symbol: - def __init__( - self, - vram: int, - given_name: Optional[str] = None, - rom: Optional[int] = None, - type: Optional[str] = "unknown", - given_size: Optional[int] = None, - segment: Optional["Segment"] = None, - ): - self.defined: bool = False - self.referenced: bool = False - self.vram_start = vram - self.rom = rom - self.type = type - self.given_size = given_size - self.given_name = given_name - self.dead: bool = False - self.extract: bool = True - self.user_declared: bool = False - self.segment: Optional["Segment"] = segment + vram_start: int + + given_name: Optional[str] = None + rom: Optional[int] = None + type: Optional[str] = None + given_size: Optional[int] = None + segment: Optional["Segment"] = None + + defined: bool = False + referenced: bool = False + dead: bool = False + extract: bool = True + user_declared: bool = False + + _generated_default_name: Optional[str] = None + _last_type: Optional[str] = None def __str__(self): return self.name @@ -403,6 +472,10 @@ class Symbol: @property def default_name(self) -> str: + if self._generated_default_name is not None: + if self.type == self._last_type: + return self._generated_default_name + if self.segment: if isinstance(self.rom, int): suffix = self.format_name(self.segment.symbol_name_format) @@ -425,7 +498,9 @@ class Symbol: else: prefix = "D" - return f"{prefix}_{suffix}" + self._last_type = self.type + self._generated_default_name = f"{prefix}_{suffix}" + return self._generated_default_name @property def rom_end(self): diff --git a/tools/splat_ext/pm_charset_palettes.py b/tools/splat_ext/pm_charset_palettes.py index a6e06c45a3..42ed67e316 100644 --- a/tools/splat_ext/pm_charset_palettes.py +++ b/tools/splat_ext/pm_charset_palettes.py @@ -1,6 +1,6 @@ from segtypes.n64.segment import N64Segment +from segtypes.n64.palette import iter_in_groups from util.color import unpack_color -from util.iter import iter_in_groups from util import options import png diff --git a/tools/splat_ext/pm_effect_loads.py b/tools/splat_ext/pm_effect_loads.py index 46f484646a..0b583d3a78 100644 --- a/tools/splat_ext/pm_effect_loads.py +++ b/tools/splat_ext/pm_effect_loads.py @@ -53,12 +53,6 @@ glabel {name} type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format, - symbol_name_format_no_rom, args, yaml, ): @@ -68,12 +62,6 @@ glabel {name} type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format=symbol_name_format, - symbol_name_format_no_rom=symbol_name_format_no_rom, args=args, yaml=yaml, ) diff --git a/tools/splat_ext/pm_effect_shims.py b/tools/splat_ext/pm_effect_shims.py index 784f968a39..8abe616443 100644 --- a/tools/splat_ext/pm_effect_shims.py +++ b/tools/splat_ext/pm_effect_shims.py @@ -34,12 +34,6 @@ glabel {name} type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format, - symbol_name_format_no_rom, args, yaml, ): @@ -49,12 +43,6 @@ glabel {name} type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format=symbol_name_format, - symbol_name_format_no_rom=symbol_name_format_no_rom, args=args, yaml=yaml, ) diff --git a/tools/splat_ext/pm_map_data.py b/tools/splat_ext/pm_map_data.py index 6dae1f666e..d2babd8495 100644 --- a/tools/splat_ext/pm_map_data.py +++ b/tools/splat_ext/pm_map_data.py @@ -6,7 +6,7 @@ from segtypes.n64.rgba32 import N64SegRgba32 from segtypes.n64.ci4 import N64SegCi4 from util.n64 import Yay0decompress from util.color import unpack_color -from util.iter import iter_in_groups +from segtypes.n64.palette import iter_in_groups from util import options import png import yaml as yaml_loader @@ -55,12 +55,6 @@ class N64SegPm_map_data(N64Segment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format, - symbol_name_format_no_rom, args, yaml, ): @@ -70,12 +64,6 @@ class N64SegPm_map_data(N64Segment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format=symbol_name_format, - symbol_name_format_no_rom=symbol_name_format_no_rom, args=args, yaml=yaml, ) diff --git a/tools/splat_ext/pm_msg.py b/tools/splat_ext/pm_msg.py index 2996fbcc43..fa7be3ce9e 100644 --- a/tools/splat_ext/pm_msg.py +++ b/tools/splat_ext/pm_msg.py @@ -374,12 +374,6 @@ class N64SegPm_msg(N64Segment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format, - symbol_name_format_no_rom, args, yaml, ): @@ -389,12 +383,6 @@ class N64SegPm_msg(N64Segment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format=symbol_name_format, - symbol_name_format_no_rom=symbol_name_format_no_rom, args=args, yaml=yaml, ) diff --git a/tools/splat_ext/pm_npc_sprites.py b/tools/splat_ext/pm_npc_sprites.py index c08e7a9333..3e0f4c705e 100644 --- a/tools/splat_ext/pm_npc_sprites.py +++ b/tools/splat_ext/pm_npc_sprites.py @@ -2,7 +2,7 @@ from segtypes.n64.segment import N64Segment from pathlib import Path import struct from util.n64 import Yay0decompress -from util.iter import iter_in_groups +from segtypes.n64.palette import iter_in_groups from util.color import unpack_color from util import options import png @@ -269,12 +269,6 @@ class N64SegPm_npc_sprites(N64Segment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format, - symbol_name_format_no_rom, args, yaml, ): @@ -284,12 +278,6 @@ class N64SegPm_npc_sprites(N64Segment): type, name, vram_start, - extract, - given_subalign, - exclusive_ram_id, - given_dir, - symbol_name_format=symbol_name_format, - symbol_name_format_no_rom=symbol_name_format_no_rom, args=args, yaml=yaml, ) diff --git a/ver/us/asm/bss.s b/ver/us/asm/bss.s new file mode 100644 index 0000000000..7665e0d28c --- /dev/null +++ b/ver/us/asm/bss.s @@ -0,0 +1,1088 @@ +.include "macro.inc" + +# assembler directives +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +.section .bss + +dlabel nuScPreNMIFlag +.space 4 + +dlabel D_8009A5B4 +.space 4 + +dlabel D_8009A5B8 +.space 4 + +dlabel D_8009A5BC +.space 4 + +dlabel gSoundGlobals +.space 4 + +dlabel D_8009A5C4 +.space 4 + +dlabel __osBaseCounter +.space 4 + +dlabel gBGMPlayerC +.space 4 + +dlabel D_8009A5D0 +.space 4 + +dlabel CurrentSefCmdHandler +.space 4 + +dlabel timeFreezeMode +.space 4 + +dlabel nuGfxZBuffer +.space 4 + +dlabel nuContDataLockKey +.space 4 + +dlabel __osViIntrCount +.space 4 + +dlabel BeginSoundUpdateCallback +.space 4 + +dlabel D_8009A5EC +.space 4 + +dlabel nuGfxCfbCounter +.space 4 + +dlabel mdl_currentModelTreeNodeInfo +.space 4 + +dlabel nuGfxDisplay +.space 4 + +dlabel gBGMPlayerB +.space 4 + +dlabel gGameState +.space 4 + +dlabel gNpcCount +.space 2 + +dlabel __osMaxControllers +.space 2 + +dlabel __osCurrentTime +.space 4 + +dlabel D_8009A60C +.space 4 + +dlabel nuGfxUcode +.space 4 + +dlabel nuContNum +.space 4 + +dlabel nuGfxTaskSpool +.space 4 + +dlabel __osContLastCmd +.space 4 + +dlabel D_8009A620 +.space 4 + +dlabel D_8009A624 +.space 4 + +dlabel gAuAmbienceManager +.space 4 + +dlabel __osTimerCounter +.space 4 + +dlabel D_8009A630 +.space 4 + +dlabel gCurrentCamID +.space 4 + +dlabel nuPiCartHandle +.space 4 + +dlabel D_8009A63C +.space 4 + +dlabel gSoundManager +.space 4 + +dlabel D_8009A644 +.space 8 + +dlabel nuGfxCfb_ptr +.space 4 + +dlabel gOverrideFlags +.space 4 + +dlabel D_8009A654 +.space 4 + +dlabel nuGfxCfb +.space 4 + +dlabel D_8009A65C +.space 4 + +dlabel D_8009A660 +.space 4 + +dlabel gBGMPlayerA +.space 4 + +dlabel D_8009A668 +.space 4 + +dlabel gMasterGfxPos +.space 4 + +dlabel D_8009A670 +.space 4 + +dlabel gDisplayContext +.space 4 + +dlabel D_8009A678 +.space 4 + +dlabel D_8009A67C +.space 4 + +dlabel D_8009A680 +.space 4 + +dlabel D_8009A684 +.space 0x0000000c + +dlabel D_8009A690 +.space 4 + +dlabel D_8009A694 +.space 0x0000000c + +dlabel D_8009A6A0 +.space 2 + +dlabel D_8009A6A2 +.space 2 + +dlabel D_8009A6A4 +.space 2 + +dlabel D_8009A6A6 +.space 2 + +dlabel D_8009A6A8 +.space 8 + +dlabel D_8009A6B0 +.space 0x00001380 + +dlabel logicalSaveInfo +.space 0x00000020 + +dlabel physicalSaveInfo +.space 0x00000030 + +dlabel nextAvailableSavePage +.space 4 + +dlabel D_8009BA84 +.space 0x0000000c + +dlabel gCurtainScale +.space 4 + +dlabel gCurtainScaleGoal +.space 4 + +dlabel gCurtainFade +.space 4 + +dlabel gCurtainFadeGoal +.space 4 + +dlabel gCurtainDrawCallback +.space 4 + +dlabel D_8009BAA4 +.space 4 + +dlabel D_8009BAA8 +.space 0x00000080 + +dlabel D_8009BA28 +.space 8 + +dlabel gCrashScreen +.space 0x000009e0 + +dlabel nuGfxTask_ptr +.space 4 + +dlabel taskDoneMsg +.space 2 + +dlabel swapBufMsg +.space 2 + +dlabel GfxTaskMgrThread +.space 0x000021b0 + +dlabel D_8009E6C8 +.space 8 + +dlabel D_8009E6D0 +.space 0x00000020 + +dlabel nuSiMesgBuf +.space 0x00000020 + +dlabel siMgrThread +.space 0x000021b0 + +dlabel blendedCamSettings +.space 0x0000001c + +dlabel D_800A08DC +.space 4 + +dlabel D_800A08E0 +.space 4 + +dlabel D_800A08E4 +.space 4 + +dlabel D_800A08E8 +.space 4 + +dlabel D_800A08EC +.space 4 + +dlabel gameMode +.space 4 + +dlabel D_800A08F4 +.space 0x0000000c + +dlabel D_800A0900 +.space 4 + +dlabel D_800A0904 +.space 4 + +dlabel D_800A0908 +.space 4 + +dlabel D_800A090C +.space 4 + +dlabel gLogosImages +.space 4 + +dlabel gLogosImage3 +.space 4 + +dlabel gLogosImage1 +.space 4 + +dlabel gLogosImage2 +.space 4 + +dlabel D_800A0920 +.space 1 + +dlabel D_800A0921 +.space 1 + +dlabel D_800A0922 +.space 2 + +dlabel D_800A0924 +.space 4 + +dlabel D_800A0928 +.space 8 + +dlabel D_800A0930 +.space 1 + +dlabel D_800A0931 +.space 1 + +dlabel D_800A0932 +.space 2 + +dlabel D_800A0934 +.space 0x0000000c + +dlabel gMapTransitionAlpha +.space 2 + +dlabel D_800A0942 +.space 2 + +dlabel D_800A0944 +.space 2 + +dlabel D_800A0946 +.space 2 + +dlabel D_800A0948 +.space 4 + +dlabel D_800A094C +.space 4 + +dlabel D_800A0950 +.space 4 + +dlabel D_800A0954 +.space 2 + +dlabel D_800A0956 +.space 2 + +dlabel D_800A0958 +.space 2 + +dlabel D_800A095A +.space 1 + +dlabel D_800A095B +.space 1 + +dlabel D_800A095C +.space 1 + +dlabel D_800A095D +.space 1 + +dlabel D_800A095E +.space 1 + +dlabel D_800A095F +.space 1 + +dlabel D_800A0960 +.space 0x00000003 + +dlabel D_800A0963 +.space 1 + +dlabel D_800A0964 +.space 4 + +dlabel D_800A0968 +.space 8 + +dlabel D_800A0970 +.space 4 + +dlabel D_800A0974 +.space 4 + +dlabel D_800A0978 +.space 4 + +dlabel D_800A097C +.space 4 + +dlabel D_800A0980 +.space 4 + +dlabel D_800A0984 +.space 4 + +dlabel D_800A0988 +.space 4 + +dlabel D_800A098C +.space 4 + +dlabel gWorldNpcList +.space 0x00000100 + +dlabel gBattleNpcList +.space 0x00000100 + +dlabel gCurrentNpcListPtr +.space 4 + +dlabel D_800A0B94 +.space 4 + +dlabel D_800A0B98 +.space 8 + +dlabel D_800A0BA0 +.space 4 + +dlabel D_800A0BA4 +.space 4 + +dlabel WorldMerleeOrbEffect +.space 4 + +dlabel WorldMerleeWaveEffect +.space 4 + +dlabel D_800A0BB0 +.space 4 + +dlabel D_800A0BB4 +.space 4 + +dlabel D_800A0BB8 +.space 4 + +dlabel D_800A0BBC +.space 4 + +dlabel D_800A0BC0 +.space 0x00000380 + +dlabel D_800A0F40 +.space 4 + +dlabel D_800A0F44 +.space 4 + +dlabel D_800A0F48 +.space 8 + +dlabel D_800A0F50 +.space 4 + +dlabel D_800A0F54 +.space 4 + +dlabel nuAuMgrThread +.space 0x000025b8 + +dlabel AlCmdListBuffers +.space 0x0000000c + +dlabel D_800A351C +.space 4 + +dlabel D_800A3520 +.space 4 + +dlabel D_800A3524 +.space 0x00000104 + +dlabel D_800A3628 +.space 0x0000000c + +dlabel AlFrameSize +.space 4 + +dlabel AlMinFrameSize +.space 4 + +dlabel D_800A363C +.space 4 + +dlabel nuAuDmaMesgQ +.space 4 + +dlabel D_800A3644 +.space 0x00000014 + +dlabel nuAuDmaMesgBuf +.space 0x000000c8 + +dlabel nuAuDmaIOMesgBuf +.space 0x000004b0 + +dlabel nuAuDmaState +.space 4 + +dlabel D_800A3BD4 +.space 4 + +dlabel D_800A3BD8 +.space 8 + +dlabel nuAuDmaBufList +.space 0x000003e8 + +dlabel D_800A3FC8 +.space 8 + +dlabel CurrentSeqCmdHandler +.space 4 + +dlabel D_800A3FD4 +.space 0x0000000c + +dlabel D_800A3FE0 +.space 4 + +dlabel D_800A3FE4 +.space 4 + +dlabel D_800A3FE8 +.space 4 + +dlabel D_800A3FEC +.space 2 + +dlabel D_800A3FEE +.space 2 + +dlabel D_800A3FF0 +.space 4 + +dlabel D_800A3FF4 +.space 0x0000000c + +dlabel gEffectGraphicsData +.space 0x000001b4 + +dlabel D_800A41B4 +.space 0x0000000c + +dlabel D_800A41C0 +.space 4 + +dlabel D_800A41C4 +.space 0x0000001c + +dlabel gMapConfig +.space 4 + +dlabel D_800A41E4 +.space 4 + +dlabel gMapSettings +.space 4 + +dlabel D_800A41EC +.space 0x00000044 + +dlabel gCollisionRayStartX +.space 4 + +dlabel gCollisionRayStartY +.space 4 + +dlabel gCollisionRayStartZ +.space 4 + +dlabel gCollisionRayDirX +.space 4 + +dlabel gCollisionRayDirY +.space 4 + +dlabel gCollisionRayDirZ +.space 4 + +dlabel gCollisionPointX +.space 4 + +dlabel gCollisionPointY +.space 4 + +dlabel gCollisionPointZ +.space 4 + +dlabel gCollisionRayLength +.space 4 + +dlabel gCollisionNormalX +.space 4 + +dlabel gCollisionNormalY +.space 4 + +dlabel gCollisionNormalZ +.space 4 + +dlabel gCollisionDataBackup +.space 4 + +dlabel gCollisionDataZoneBackup +.space 4 + +dlabel D_800A426C +.space 4 + +dlabel D_800A4270 +.space 0x000001b0 + +dlabel D_800A4420 +.space 0x000021b0 + +dlabel nuScStack +.space 0x00002000 + +dlabel nuScAudioStack +.space 0x00002000 + +dlabel nuScGraphicsStack +.space 0x00002000 + +dlabel D_800AC5D0 +.space 4 + +dlabel D_800AC5D4 +.space 0x00000014 + +dlabel D_800AC5E8 +.space 0x000000c8 + +dlabel nuGfxMesgBuf +.space 0x00002020 + +dlabel nuContWaitMesgBuf +.space 4 + +dlabel nuContDataMutexBuf +.space 4 + +dlabel D_800AC6D8 +.space 8 + +dlabel piMgrThread +.space 0x000011b0 + +dlabel __osPiMesgQueue +.space 4 + +dlabel D_800AF890 +.space 0x00000014 + +dlabel piMgrMesgBuff +.space 4 + +dlabel D_800AF8AC +.space 4 + +dlabel piAccessBuf +.space 4 + +dlabel D_800AF8B4 +.space 0x0000000c + +dlabel tmp_task +.space 0x00000040 + +dlabel siAccessBuf +.space 4 + +dlabel D_800AF904 +.space 0x0000000c + +dlabel D_800AF910 +.space 4 + +dlabel D_800AF914 +.space 4 + +dlabel D_800AF918 +.space 4 + +dlabel D_800AF91C +.space 0x000011b4 + +dlabel D_800B0AD0 +.space 4 + +dlabel D_800B0AD4 +.space 0x00000014 + +dlabel D_800B0AE8 +.space 4 + +dlabel D_800B0AEC +.space 0x00000014 + +dlabel D_800B0B00 +.space 2 + +dlabel D_800B0B02 +.space 2 + +dlabel D_800B0B04 +.space 4 + +dlabel D_800B0B08 +.space 0x00000010 + +dlabel D_800B0B18 +.space 2 + +dlabel D_800B0B1A +.space 2 + +dlabel D_800B0B1C +.space 4 + +dlabel D_800B0B20 +.space 0x00000010 + +dlabel D_800B0B30 +.space 4 + +dlabel D_800B0B34 +.space 0x00000038 + +dlabel D_800B0B6C +.space 4 + +dlabel D_800B0B70 +.space 0x000000c0 + +dlabel __osFlashID +.space 4 + +dlabel D_800B0C34 +.space 0x0000000c + +dlabel __osFlashMsg +.space 4 + +dlabel D_800B0C44 +.space 0x00000014 + +dlabel __osFlashMessageQ +.space 4 + +dlabel D_800B0C5C +.space 0x00000014 + +dlabel __osFlashHandler +.space 4 + +dlabel D_800B0C74 +.space 0x00000070 + +dlabel __osFlashMsgBuf +.space 4 + +dlabel __osFlashVersion +.space 4 + +dlabel D_800B0CEC +.space 4 + +dlabel wMapTexName +.space 4 + +dlabel D_800B0CF4 +.space 0x00000014 + +dlabel D_800B0D08 +.space 4 + +dlabel D_800B0D0C +.space 0x000001ac + +dlabel nuContWaitMesgQ +.space 4 + +dlabel D_800B0EBC +.space 0x00000014 + +dlabel __osContPifRam +.space 4 + +dlabel D_800B0ED4 +.space 0x00000034 + +dlabel D_800B0F08 +.space 4 + +dlabel D_800B0F0C +.space 4 + +dlabel gCurrentEncounter +.space 0x00000bf8 + +dlabel LeoDiskHandle +.space 4 + +dlabel D_800B1B0C +.space 1 + +dlabel D_800B1B0D +.space 1 + +dlabel D_800B1B0E +.space 1 + +dlabel D_800B1B0F +.space 1 + +dlabel D_800B1B10 +.space 4 + +dlabel D_800B1B14 +.space 0x00000068 + +dlabel nuContStatus +.space 0x00000014 + +dlabel D_800B1B90 +.space 0x000001b0 + +dlabel nuContRmbCtl +.space 0x00000028 + +dlabel nuContData +.space 0x00000018 + +dlabel gCameras +.space 0x00002560 + +dlabel gCollisionData +.space 4 + +dlabel D_800B42E4 +.space 0x0000000c + +dlabel nuGfxMesgQ +.space 4 + +dlabel D_800B42F4 +.space 0x00000014 + +dlabel D_800B4308 +.space 4 + +dlabel D_800B430C +.space 1 + +dlabel D_800B430D +.space 1 + +dlabel D_800B430E +.space 1 + +dlabel D_800B430F +.space 1 + +dlabel D_800B4310 +.space 1 + +dlabel D_800B4311 +.space 3 + +dlabel D_800B4314 +.space 4 + +dlabel D_800B4318 +.space 4 + +dlabel D_800B431C +.space 0x00000064 + +dlabel __osPiAccessQueue +.space 4 + +dlabel D_800B4384 +.space 0x00000014 + +dlabel gEffectInstances +.space 0x00000180 + +dlabel CartRomHandle +.space 4 + +dlabel D_800B451C +.space 1 + +dlabel D_800B451D +.space 1 + +dlabel D_800B451E +.space 1 + +dlabel D_800B451F +.space 1 + +dlabel D_800B4520 +.space 0x00002070 + +dlabel D_800B6590 +.space 0x00002000 + +dlabel nuYieldBuf +.space 0x00000c10 + +dlabel auSynDriver +.space 0x00000030 + +dlabel D_800B91D0 +.space 0x00020000 + +dlabel gZoneCollisionData +.space 0x00000010 + +dlabel wMapHitName +.space 0x00000018 + +dlabel nuSiMgrMesgQ +.space 0x00000038 + +dlabel wMapShapeName +.space 0x00000018 + +dlabel nuAuHeap +.space 0x00000030 + +dlabel nuGfxTask +.space 0x00000370 + +dlabel D_800D95E8 +.space 0x00000038 + +dlabel D_800D9620 +.space 0x00000048 + +dlabel D_800D9668 +.space 0x00000018 + +dlabel __osPfsInodeCache +.space 0x00000100 + +dlabel rspbootUcodeBuffer +.space 0x00000100 + +dlabel D_800D9880 +.space 0x00000700 + +dlabel __osEventStateTab +.space 0x00000080 + +dlabel __osPfsPifRam +.space 0x0000003c + +dlabel D_800DA03C +.space 4 + +dlabel D_800DA040 +.space 0x00000400 + +dlabel nusched +.space 4 + +dlabel D_800DA444 +.space 0x00000038 + +dlabel D_800DA47C +.space 0x00000038 + +dlabel D_800DA4B4 +.space 0x000000a8 + +dlabel D_800DA55C +.space 0x0000054c + +dlabel D_800DAAA8 +.space 0x00000010 + +dlabel AlNumFields +.space 4 + +dlabel D_800DAABC +.space 1 + +dlabel D_800DAABD +.space 3 + +dlabel D_800DAAC0 +.space 0x00000018 + +dlabel nuContPfs +.space 0x000001a0 + +dlabel nuSiMesgQ +.space 0x00000018 + +dlabel D_800DAC90 +.space 0x00000018 + +dlabel __osSiAccessQueue +.space 0x00000018 + +dlabel gCurrentSaveFile +.space 0x00001380 + +dlabel nuContDataMutexQ +.space 0x00000020 + +dlabel D_800DC060 +.space 4 + +dlabel D_800DC064 +.space 4 + +dlabel gBattleState +.space 4 + +dlabel D_800DC06C +.space 4 + +dlabel gBattleStatus +.space 0x00000460 + +dlabel D_800DC4D0 +.space 4 + +dlabel D_800DC4D4 +.space 4 + +dlabel D_800DC4D8 +.space 4 + +dlabel gBattleState2 +.space 4 + +dlabel D_800DC4E0 +.space 4 + +dlabel D_800DC4E4 +.space 4 + +dlabel D_800DC4E8 +.space 2 + +dlabel gCurrentBattleSection +.space 1 + +dlabel D_800DC4EB +.space 1 + +dlabel D_800DC4EC +.space 4 + +dlabel D_800DC4F0 +.space 4 + +dlabel D_800DC4F4 +.space 4 + +dlabel D_800DC4F8 +.space 4 + +dlabel D_800DC4FC +.space 4 diff --git a/ver/us/asm/bss2.s b/ver/us/asm/bss2.s new file mode 100644 index 0000000000..bee4d87178 --- /dev/null +++ b/ver/us/asm/bss2.s @@ -0,0 +1,113 @@ +.include "macro.inc" + +# assembler directives +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +.section .bss + +dlabel D_8010C920 +.space 4 + +dlabel D_8010C924 +.space 4 + +dlabel D_8010C928 +.space 4 + +dlabel D_8010C92C +.space 4 + +dlabel wPartnerNpc +.space 4 + +dlabel TweesterTouchingPlayer +.space 4 + +dlabel D_8010C938 +.space 4 + +dlabel D_8010C93C +.space 4 + +dlabel D_8010C940 +.space 4 + +dlabel gSpinHistoryBufferPos +.space 4 + +dlabel D_8010C948 +.space 4 + +dlabel D_8010C94C +.space 4 + +dlabel D_8010C950 +.space 4 + +dlabel TweesterTouchingPartner +.space 4 + +dlabel D_8010C958 +.space 4 + +dlabel PrevPlayerDirection +.space 4 + +dlabel JumpedOnSwitchX +.space 4 + +dlabel D_8010C964 +.space 4 + +dlabel D_8010C968 +.space 4 + +dlabel PeachDisguiseNpcIndex +.space 4 + +dlabel D_8010C970 +.space 4 + +dlabel D_8010C974 +.space 4 + +dlabel D_8010C978 +.space 2 + +dlabel D_8010C97A +.space 2 + +dlabel JumpedOnSwitchZ +.space 4 + +dlabel D_8010C980 +.space 4 + +dlabel D_8010C984 +.space 4 + +dlabel D_8010C988 +.space 4 + +dlabel D_8010C98C +.space 4 + +dlabel D_8010C990 +.space 4 + +dlabel D_8010C994 +.space 0x0000000c + +dlabel D_8010C9A0 +.space 4 + +dlabel D_8010C9A4 +.space 0x0000000c + +dlabel D_8010C9B0 +.space 4 + +dlabel D_8010C9B4 +.space 0x0000000c diff --git a/ver/us/asm/bss3.s b/ver/us/asm/bss3.s new file mode 100644 index 0000000000..81719c0c83 --- /dev/null +++ b/ver/us/asm/bss3.s @@ -0,0 +1,725 @@ +.include "macro.inc" + +# assembler directives +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +.section .bss + +dlabel D_801512B0 +.space 4 + +dlabel gHudElementsNumber +.space 4 + +dlabel gCurrentCustomModelGfxBuildersPtr +.space 4 + +dlabel D_801512BC +.space 4 + +dlabel entity_numEntities +.space 4 + +dlabel gEntityHeapBase +.space 4 + +dlabel gHudElementCacheTableRaster +.space 4 + +dlabel gCurrentModels +.space 4 + +dlabel gHudElementCacheTablePalette +.space 4 + +dlabel gAnimCount +.space 4 + +dlabel gMsgBGScrollAmtX +.space 2 + +dlabel D_801512DA +.space 2 + +dlabel D_801512DC +.space 4 + +dlabel gCurrentTransformGroups +.space 4 + +dlabel gMsgGlobalWaveCounter +.space 4 + +dlabel gCurrentCustomModelGfxPtr +.space 4 + +dlabel gLastCreatedEntityIndex +.space 4 + +dlabel D_801512F0 +.space 4 + +dlabel gMsgVarImages +.space 4 + +dlabel ItemEntitiesCreated +.space 4 + +dlabel gCurrentModelTreeRoot +.space 4 + +dlabel gEntityHeapBottom +.space 4 + +dlabel D_80151304 +.space 4 + +dlabel D_80151308 +.space 4 + +dlabel gMsgBGScrollAmtY +.space 2 + +dlabel D_8015130E +.space 2 + +dlabel gEntityHideMode +.space 4 + +dlabel gHudElementCacheBuffer +.space 4 + +dlabel gEntityModelCount +.space 4 + +dlabel D_8015131C +.space 4 + +dlabel D_80151320 +.space 4 + +dlabel entity_numShadows +.space 4 + +dlabel D_80151328 +.space 4 + +dlabel entity_area_specific_data_is_loaded +.space 4 + +dlabel entity_updateCounter +.space 4 + +dlabel gTriggerCount +.space 4 + +dlabel D_80151338 +.space 4 + +dlabel gHudElementCacheSize +.space 4 + +dlabel gCurrentDoorSoundsSet +.space 4 + +dlabel D_80151344 +.space 4 + +dlabel D_80151348 +.space 0x00000038 + +dlabel gWorldEntityList +.space 0x00000078 + +dlabel gBattleEntityList +.space 0x00000078 + +dlabel gCurrentEntityListPtr +.space 4 + +dlabel D_80151474 +.space 4 + +dlabel gWorldShadowList +.space 0x000000f0 + +dlabel gBattleShadowList +.space 0x000000f0 + +dlabel gCurrentShadowListPtr +.space 4 + +dlabel wEntityDataLoadedSize +.space 4 + +dlabel bEntityDataLoadedSize +.space 4 + +dlabel D_80151664 +.space 4 + +dlabel wEntityBlueprint +.space 0x00000074 + +dlabel D_801516DC +.space 4 + +dlabel D_8015DCE0 +.space 8 + +dlabel bEntityBlueprint +.space 0x00000014 + +dlabel D_801516FC +.space 4 + +dlabel gMainGameState +.space 0x00000040 + +dlabel gCurrentTileDescriptor +.space 0x00000030 + +dlabel wModelList +.space 0x00000400 + +dlabel bModelList +.space 0x00000400 + +dlabel wTransformGroups +.space 0x00000010 + +dlabel bTransformGroups +.space 0x00000010 + +dlabel wModelSpecialDls +.space 0x00000080 + +dlabel bModelSpecialDls +.space 0x00000080 + +dlabel wCustomModelGfxBuilders +.space 0x00000080 + +dlabel bCustomModelGfxBuilders +.space 0x00000080 + +dlabel wModelLocalVtxBuffers +.space 0x00000040 + +dlabel bModelLocalVtxBuffers +.space 0x00000040 + +dlabel gCurrentModelLocalVtxBuffers +.space 4 + +dlabel D_80152214 +.space 4 + +dlabel D_80152218 +.space 4 + +dlabel D_8015221C +.space 4 + +dlabel D_80152220 +.space 0x00000800 + +dlabel D_80152A20 +.space 0x00000800 + +dlabel wBgRenderType +.space 1 + +dlabel bBgRenderType +.space 1 + +dlabel D_80153222 +.space 1 + +dlabel D_80153223 +.space 1 + +dlabel mdl_treeIterPos +.space 2 + +dlabel D_80153226 +.space 2 + +dlabel wFogSettings +.space 0x00000020 + +dlabel bFogSettings +.space 0x0000001c + +dlabel gCurrentFogSettings +.space 4 + +dlabel texPannerMainU +.space 0x00000040 + +dlabel texPannerMainV +.space 0x00000040 + +dlabel texPannerAuxU +.space 0x00000040 + +dlabel texPannerAuxV +.space 0x00000040 + +dlabel mdl_nextTextureAddress +.space 4 + +dlabel mdl_currentTransformGroupChildIndex +.space 2 + +dlabel D_8015336E +.space 2 + +dlabel D_80153370 +.space 4 + +dlabel D_80153374 +.space 2 + +dlabel D_80153376 +.space 2 + +dlabel D_80153378 +.space 8 + +dlabel D_80153380 +.space 0x00000020 + +dlabel mdl_renderTaskLists +.space 0x0000000c + +dlabel mdl_renderTaskQueueIdx +.space 4 + +dlabel mdl_renderTaskCount +.space 0x00000010 + +dlabel D_801533C0 +.space 0x00000300 + +dlabel D_801536C0 +.space 0x00000300 + +dlabel D_801539C0 +.space 0x00000040 + +dlabel D_80153A00 +.space 0x00000040 + +dlabel gCurrentAnimMeshListPtr +.space 4 + +dlabel gAnimModelFogEnabled +.space 4 + +dlabel gAnimModelFogR +.space 4 + +dlabel gAnimModelFogG +.space 4 + +dlabel gAnimModelFogB +.space 4 + +dlabel gAnimModelFogA +.space 4 + +dlabel gAnimModelFogStart +.space 4 + +dlabel gAnimModelFogEnd +.space 4 + +dlabel gAnimVtxSegment +.space 4 + +dlabel D_80153A64 +.space 4 + +dlabel gAnimRotMtx +.space 0x00000040 + +dlabel gAnimScaleMtx +.space 0x00000040 + +dlabel gAnimTranslateMtx +.space 0x00000040 + +dlabel gAnimRotScaleMtx +.space 0x00000040 + +dlabel gAnimTreeRoot +.space 8 + +dlabel gWorldEntityModelList +.space 0x00000400 + +dlabel gBattleEntityModelList +.space 0x00000400 + +dlabel gCurrentEntityModelList +.space 4 + +dlabel D_80154374 +.space 4 + +dlabel entity_fog_enabled +.space 4 + +dlabel entity_fog_red +.space 1 + +dlabel D_8015437D +.space 1 + +dlabel D_8015437E +.space 1 + +dlabel D_8015437F +.space 1 + +dlabel entity_fog_green +.space 1 + +dlabel D_80154381 +.space 1 + +dlabel D_80154382 +.space 1 + +dlabel D_80154383 +.space 1 + +dlabel entity_fog_blue +.space 1 + +dlabel D_80154385 +.space 1 + +dlabel D_80154386 +.space 1 + +dlabel D_80154387 +.space 1 + +dlabel entity_fog_alpha +.space 1 + +dlabel D_80154389 +.space 1 + +dlabel D_8015438A +.space 1 + +dlabel D_8015438B +.space 1 + +dlabel entity_fog_dist_min +.space 4 + +dlabel entity_fog_dist_max +.space 4 + +dlabel D_80154394 +.space 0x0000000c + +dlabel gWorldDynamicEntityList +.space 0x00000040 + +dlabel gBattleDynamicEntityList +.space 0x00000040 + +dlabel gCurrentDynamicEntityListPtr +.space 4 + +dlabel D_80154424 +.space 0x0000000c + +dlabel gMessageBuffers +.space 0x00000800 + +dlabel gMessagePrinters +.space 0x00001008 + +dlabel gMessageMsgVars +.space 0x00000060 + +dlabel D_80155C98 +.space 8 + +dlabel gMessageWindowProjMatrix +.space 0x00000080 + +dlabel D_80155D20 +.space 4 + +dlabel D_8015DD24 +.space 0x00000050 + +dlabel msg_drawState +.space 4 + +dlabel D_8015DD78 +.space 8 + +dlabel D_80155D80 +.space 4 + +dlabel ItemEntityAlternatingSpawn +.space 4 + +dlabel ItemEntityRenderGroup +.space 4 + +dlabel D_80155D8C +.space 2 + +dlabel D_80155D8E +.space 2 + +dlabel D_80155D90 +.space 0x00000010 + +dlabel WorldItemEntities +.space 0x00000400 + +dlabel BattleItemEntities +.space 0x00000400 + +dlabel gCurrentItemEntities +.space 4 + +dlabel isPickingUpItem +.space 2 + +dlabel D_801565A6 +.space 2 + +dlabel D_801565A8 +.space 4 + +dlabel D_801565AC +.space 4 + +dlabel D_801565B0 +.space 0x00000330 + +dlabel D_801568E0 +.space 4 + +dlabel D_801568E4 +.space 4 + +dlabel D_801568E8 +.space 4 + +dlabel D_801568EC +.space 4 + +dlabel D_801568F0 +.space 4 + +dlabel D_801568F4 +.space 4 + +dlabel D_801568F8 +.space 4 + +dlabel D_801568FC +.space 4 + +dlabel screen_overlay_frontType +.space 4 + +dlabel screen_overlay_frontZoom +.space 4 + +dlabel screen_overlay_backType +.space 4 + +dlabel screen_overlay_backZoom +.space 4 + +dlabel D_80156910 +.space 0x00000010 + +dlabel D_80156920 +.space 0x00000028 + +dlabel D_80156948 +.space 8 + +dlabel fold_vtxBuf +.space 4 + +dlabel D_80156954 +.space 4 + +dlabel D_80156958 +.space 8 + +dlabel D_80156960 +.space 8 + +dlabel D_80156968 +.space 8 + +dlabel D_80156970 +.space 0x00000010 + +dlabel fold_groupDescriptors +.space 0x000005a0 + +dlabel fold_gfxDataCache +.space 0x00000040 + +dlabel gHudElementsWorld +.space 0x00000500 + +dlabel gHudElementsBattle +.space 0x00000500 + +dlabel gHudElements +.space 4 + +dlabel gHudElementCacheBufferWorld +.space 4 + +dlabel gHudElementCacheSizeWorld +.space 4 + +dlabel D_8015796C +.space 4 + +dlabel gHudElementCacheTableRasterWorld +.space 0x00000600 + +dlabel gHudElementCacheTablePaletteWorld +.space 0x00000600 + +dlabel gHudElementCacheBufferBattle +.space 4 + +dlabel gHudElementCacheSizeBattle +.space 4 + +dlabel D_80158578 +.space 8 + +dlabel gHudElementCacheTableRasterBattle +.space 0x00000600 + +dlabel gHudElementCacheTablePaletteBattle +.space 0x00000600 + +dlabel D_80159180 +.space 0x00000010 + +dlabel wTriggerList +.space 0x00000100 + +dlabel bTriggerList +.space 0x00000100 + +dlabel gCurrentTriggerListPtr +.space 4 + +dlabel D_80159394 +.space 0x0000000c + +dlabel D_801593A0 +.space 0x000001fe + +dlabel D_8015959E +.space 2 + +dlabel D_801595A0 +.space 0x00000020 + +dlabel D_801595C0 +.space 0x000000b0 + +dlabel D_80159670 +.space 0x000000b0 + +dlabel D_80159720 +.space 0x000000b0 + +dlabel D_801597D0 +.space 0x000000b0 + +dlabel D_80159880 +.space 0x00000020 + +dlabel D_801598A0 +.space 0x00000118 + +dlabel D_801599B8 +.space 0x00000118 + +dlabel D_80159AD0 +.space 4 + +dlabel D_80159AD4 +.space 4 + +dlabel D_80159AD8 +.space 8 + +dlabel MusicDefaultVolume +.space 2 + +dlabel MusicTargetVolume +.space 2 + +dlabel MusicMaxVolume +.space 2 + +dlabel MusicCurrentVolume +.space 2 + +dlabel D_80159AE8 +.space 8 + +dlabel gMusicSettings +.space 0x00000060 + +dlabel D_80159B50 +.space 0x00000200 + +dlabel gWindows +.space 0x00000800 + +dlabel gCollisionStatus +.space 0x00000028 + +dlabel gCurrentHiddenPanels +.space 2 + +dlabel D_8015A57A +.space 2 + +dlabel D_8015A57C +.space 0x00000014 + +dlabel mdl_textureHandles +.space 0x00002200 + +dlabel D_8015C790 +.space 0x00000030 + +dlabel AmbientSoundData +.space 0x00000010 + +dlabel CreateEntityVarArgBuffer +.space 0x00000010 + +dlabel D_8015C7E0 +.space 4 diff --git a/ver/us/asm/data/1C2100.data.s b/ver/us/asm/data/1C2100.data.s deleted file mode 100644 index 7d989e961d..0000000000 --- a/ver/us/asm/data/1C2100.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80293820 -.word 0x00000008, 0x00000001, 0xFE363C80, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetBattleCamParam, 0x00000004, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetBattleCamParam, 0x00000004, 0x00000005, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetBattleCamParam, 0x00000004, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802938A4 -.float 0.0 - -dlabel D_802938A8 -.short 0x0004, 0x0000 - -dlabel gDamageCountEffects -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel gDamageCountTimers -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80293970 -.word 0xE7000000, 0x00000000, 0xD7000000, 0xFFFFFFFF, 0xE3000A01, 0x00000000, 0xE3000C00, 0x00000000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001201, 0x00000000, 0xE3001001, 0x00000000, 0xE3001402, 0x00000C00, 0xDF000000, 0x00000000 - -dlabel D_802939C0 -.word 0x00000000 - -dlabel D_802939C4 -.word 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x00000100, 0x0000001E, 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x000000C8, 0x0000000F, 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x00000032, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80293A10 -.word 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x00000064, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80293A34 -.word 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x00000096, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80293A58 -.word 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x000000C8, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80293A7C -.word 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x00000100, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80293AA0 -.word 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x00000100, 0x0000003C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80293AC4 -.word 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x00000064, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x00000096, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x000000C8, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x00000100, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, NAMESPACE_StartRumbleWithParams, 0x00000100, 0x0000003C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80293B80 -.word 0xFFFFFFFF, 0x0000008A, 0x00000080, 0x00000086, 0x00000090, 0x00000085, 0x0000008B, 0x00000082, 0x00000081, 0x0000008D, 0x00000083, 0x0000008F, 0x00000088, 0x00000089, 0x00000084, 0x0000008C, 0x0000008E, 0x0000009B, 0x00000091, 0x00000092, 0x0000009A, 0x00000099, 0x000000C8, 0x00000087, 0x00000098, 0x00000096, 0x00000097, 0x00000095, 0x000000AC, 0x000000CC, 0x000000D2, 0x000000D3, 0x00000000 - -dlabel gBattleItemTable -.word 0x007330D0, 0x007345A0, func_802A1000, 0x802A20FC, 0x00715850, 0x00716C60, func_802A1000, battle_item_mushroom_main, 0x00716C60, 0x007179D0, func_802A1000, battle_item_fire_flower_main, 0x007179D0, 0x00718850, func_802A1000, battle_item_dusty_hammer_main, 0x00718850, 0x00719970, func_802A1000, battle_item_pow_block_main, 0x00719970, 0x0071A7F0, func_802A1000, battle_item_dusty_hammer_main, 0x0071A7F0, 0x0071B1A0, func_802A1000, battle_item_volt_shroom_main, 0x0071B1A0, 0x0071BE30, func_802A1000, battle_item_thunder_rage_main, 0x0071BE30, 0x0071CCE0, func_802A1000, battle_item_snowman_doll_main, 0x00715850, 0x00716C60, func_802A1000, battle_item_mushroom_main, 0x0071D770, 0x0071E650, func_802A1000, battle_item_shooting_star_main, 0x0071E650, 0x007215A0, func_802A1000, battle_item_sleepy_sheep_main, 0x007215A0, 0x00722000, func_802A1000, battle_item_stone_cap_main, 0x00722000, 0x00722B40, func_802A1000, battle_item_stone_cap_EatItem, 0x00722B40, 0x00723780, func_802A1000, battle_item_thunder_rage_main, 0x00715850, 0x00716C60, func_802A1000, battle_item_mushroom_main, 0x00715850, 0x00716C60, func_802A1000, battle_item_mushroom_main, 0x00724CE0, 0x00725F60, func_802A1000, battle_item_super_soda_main, 0x00725F60, 0x00726DD0, func_802A1000, battle_item_stone_cap_EatItem, 0x00726DD0, 0x00727910, func_802A1000, battle_item_stop_watch_main, 0x00727910, 0x007285E0, func_802A1000, battle_item_stone_cap_main, 0x007285E0, 0x00728EC0, func_802A1000, battle_item_please_come_back_main, 0x00728EC0, 0x0072A750, func_802A1000, battle_item_egg_missile_main, 0x0072A750, 0x0072B910, func_802A1000, script, 0x0072B910, 0x0072C5B0, func_802A1000, battle_item_stop_watch_main, 0x0072C5B0, 0x0072DB70, func_802A1000, battle_item_mystery_main, 0x0072DB70, 0x0072E530, func_802A1000, battle_item_repel_gel_main, 0x0072E530, 0x0072F720, func_802A1000, battle_item_life_shroom_main, 0x0072F720, 0x007305A0, func_802A1000, battle_item_dusty_hammer_main, 0x007305A0, 0x00731300, func_802A1000, battle_item_electro_pop_main, 0x00731300, 0x007330D0, func_802A1000, battle_item_strange_cake_script6, 0x00731300, 0x007330D0, func_802A1000, battle_item_strange_cake_script6, 0x0001001F, 0x00010005, 0x00010002, 0x00090003, 0x00090003, 0x00090001, 0x000A0006, 0x000A0006, 0x000A0004, 0x000B0008, 0x000B0008, 0x000B0004, 0x000C0003, 0x000C0003, 0x000C0001 - -dlabel UseMystery -.word 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000001, LoadFreeItemScript, 0x00000046, 0x00000001, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel gMoveScriptTable -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007345A0, 0x00737890, func_802A1000, 0x802A3044, 0x007345A0, 0x00737890, func_802A1000, 0x802A3044, 0x007345A0, 0x00737890, func_802A1000, 0x802A3044, 0x007345A0, 0x00737890, func_802A1000, 0x802A369C, 0x007345A0, 0x00737890, func_802A1000, 0x802A3B28, 0x00737890, 0x0073AED0, func_802A1000, 0x802A3124, 0x0073AED0, 0x0073D860, func_802A1000, 0x802A3044, 0x0074AD90, 0x0074D570, func_802A1000, 0x802A3144, 0x0074F130, 0x00752450, func_802A1000, 0x802A38C4, 0x0074F130, 0x00752450, func_802A1000, 0x802A3234, 0x00752450, 0x00756780, func_802A1000, 0x802A3D38, 0x00756780, 0x007595B0, func_802A1000, 0x802A3114, 0x007595B0, 0x0075C980, func_802A1000, 0x802A3944, 0x007595B0, 0x0075C980, func_802A1000, 0x802A32B4, 0x0075E5D0, 0x00761920, func_802A1000, 0x802A3944, 0x0075E5D0, 0x00761920, func_802A1000, 0x802A32B4, 0x00763540, 0x00765C20, func_802A1000, 0x802A3044, 0x00767C90, 0x0076A830, func_802A1000, 0x802A3044, 0x00772BA0, 0x00775100, func_802A1000, 0x802A3044, 0x00775100, 0x00777690, func_802A1000, 0x802A3044, 0x00777690, 0x00779C90, func_802A1000, 0x802A3044, 0x0077CB80, 0x0077F240, func_802A1000, 0x802A3044, 0x0077F240, 0x00781920, func_802A1000, 0x802A3124, 0x0073D860, 0x00740CC0, func_802A1000, 0x802A2650, 0x0073D860, 0x00740CC0, func_802A1000, 0x802A2650, 0x0073D860, 0x00740CC0, func_802A1000, 0x802A2650, 0x0073D860, 0x00740CC0, func_802A1000, 0x802A30F4, 0x0073D860, 0x00740CC0, func_802A1000, 0x802A3644, 0x00740CC0, 0x00743DF0, func_802A1000, 0x802A2620, 0x00743DF0, 0x00746E10, func_802A1000, 0x802A2734, 0x00746E10, 0x00748DD0, func_802A1000, 0x802A2600, 0x00748DD0, 0x0074AD90, func_802A1000, 0x802A2600, 0x0074D570, 0x0074F130, func_802A1000, 0x802A2800, 0x0074D570, 0x0074F130, func_802A1000, 0x802A27F0, 0x0075C980, 0x0075E5D0, func_802A1000, 0x802A2880, 0x0075C980, 0x0075E5D0, func_802A1000, battle_item_strange_cake_script6, 0x00761920, 0x00763540, func_802A1000, 0x802A2880, 0x00761920, 0x00763540, func_802A1000, battle_item_strange_cake_script6, 0x00765C20, 0x00767C90, func_802A1000, 0x802A2600, 0x0076A830, 0x0076D760, func_802A1000, 0x802A2600, 0x0076D760, 0x0076F330, func_802A1000, 0x802A2600, 0x0076F330, 0x00770F30, func_802A1000, 0x802A2600, 0x00770F30, 0x00772BA0, func_802A1000, 0x802A2600, 0x00781920, 0x00783BA0, func_802A1000, 0x802A26E0, 0x00783BA0, 0x00785B20, func_802A1000, 0x802A2600, 0x00785B20, 0x00789E60, func_802A1000, 0x802A2630 diff --git a/ver/us/asm/data/battle/move/auto_smash/7635F0.data.s b/ver/us/asm/data/battle/move/auto_smash/7635F0.data.s index a29b22cc1f..15aa3774bd 100644 --- a/ver/us/asm/data/battle/move/auto_smash/7635F0.data.s +++ b/ver/us/asm/data/battle/move/auto_smash/7635F0.data.s @@ -30,7 +30,10 @@ dlabel D_802A2000_764540 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_7635F0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_7638C8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_auto_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_auto_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A23E8_764928 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_7635F0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_763A4C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_auto_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_auto_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_7636CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_763744, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_auto_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_7636CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_7638C8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_auto_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_7636CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_763A4C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_auto_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00001000, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A317C_7656BC, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A317C_7656BC, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A317C_7656BC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_7635F0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_763A4C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_auto_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_auto_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_7636CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_763744, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_auto_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_7636CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_7638C8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_auto_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_7636CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_763A4C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_auto_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_auto_smash_main +.word 0x00000043, 0x00000003, SetBattleFlagBits, 0x00001000, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A317C_7656BC, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A317C_7656BC, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A317C_7656BC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A317C_7656BC .word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1B40_764080, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2000_764540, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A23E8_764928, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C89, 0x00000010, 0x00000043, 0x00000002, GetActionSuccessCopy, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1A64_763FA4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A18AC_763DEC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A64_763FA4, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/d_down_jump/781AF0.data.s b/ver/us/asm/data/battle/move/d_down_jump/781AF0.data.s index 0f40d360f9..532b328324 100644 --- a/ver/us/asm/data/battle/move/d_down_jump/781AF0.data.s +++ b/ver/us/asm/data/battle/move/d_down_jump/781AF0.data.s @@ -30,7 +30,10 @@ dlabel D_802A20CC_7829EC .word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2264_782B84 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A128C_781BAC, 0x00000046, 0x00000001, D_802A1400_781D20, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A128C_781BAC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A14E8_781E08, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A128C_781BAC, 0x00000046, 0x00000001, D_802A15D0_781EF0, 0x00000043, 0x00000002, func_8026919C, D_802A11D0_781AF0, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000002, func_80269EAC, 0x00000004, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2784_7830A4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2B24_783444, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2EE0_783800, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A128C_781BAC, 0x00000046, 0x00000001, D_802A1400_781D20, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A128C_781BAC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A14E8_781E08, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A128C_781BAC, 0x00000046, 0x00000001, D_802A15D0_781EF0, 0x00000043, 0x00000002, func_8026919C, D_802A11D0_781AF0, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_d_down_jump_main +.word 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000002, func_80269EAC, 0x00000004, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2784_7830A4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2B24_783444, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2EE0_783800, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2784_7830A4 .word 0x00000046, 0x00000001, D_802A2264_782B84, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A20CC_7829EC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C8A, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10E4_781A04, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000015A, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000080, 0x00000000, 0x00000000, 0x00000001, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000080, 0x00000000, 0x00000000, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A90_7823B0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000002, func_802694A4, 0x00000000, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000018, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10E4_781A04, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000080, 0x00000000, 0x00000000, 0x00000001, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A16B8_781FD8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/d_down_pound/74AF40.data.s b/ver/us/asm/data/battle/move/d_down_pound/74AF40.data.s index 84bb5d8333..bb04a33006 100644 --- a/ver/us/asm/data/battle/move/d_down_pound/74AF40.data.s +++ b/ver/us/asm/data/battle/move/d_down_pound/74AF40.data.s @@ -30,7 +30,10 @@ dlabel D_802A2100_74BE90 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11B0_74AF40, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1488_74B218, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_d_down_pound_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_d_down_pound_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A24E8_74C278 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11B0_74AF40, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A160C_74B39C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_d_down_pound_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_d_down_pound_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A128C_74B01C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1304_74B094, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_d_down_pound_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A128C_74B01C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1488_74B218, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_d_down_pound_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A128C_74B01C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A160C_74B39C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_d_down_pound_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000002, func_80269EAC, 0x00000003, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A3278_74D008, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3278_74D008, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3278_74D008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11B0_74AF40, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A160C_74B39C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_d_down_pound_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_d_down_pound_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A128C_74B01C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1304_74B094, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_d_down_pound_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A128C_74B01C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1488_74B218, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_d_down_pound_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A128C_74B01C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A160C_74B39C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_d_down_pound_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_d_down_pound_main +.word 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000002, func_80269EAC, 0x00000003, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A3278_74D008, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3278_74D008, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3278_74D008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A3278_74D008 .word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1C40_74B9D0, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2100_74BE90, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A24E8_74C278, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x08000040, 0x00000019, 0x00000000, 0xFE363C89, 0x00000010, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000032, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210A, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210B, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210C, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1B64_74B8F4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C8A, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10A4_74AE34, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A19AC_74B73C, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1B64_74B8F4, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/dizzy_stomp/748EC0.data.s b/ver/us/asm/data/battle/move/dizzy_stomp/748EC0.data.s index 07db1d5f7b..f5661a3efa 100644 --- a/ver/us/asm/data/battle/move/dizzy_stomp/748EC0.data.s +++ b/ver/us/asm/data/battle/move/dizzy_stomp/748EC0.data.s @@ -30,7 +30,10 @@ dlabel D_802A1FEC_749DBC .word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2184_749F54 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_748F7C, 0x00000046, 0x00000001, D_802A1320_7490F0, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_748F7C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_7491D8, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_748F7C, 0x00000046, 0x00000001, D_802A14F0_7492C0, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_748EC0, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2694_74A464, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2980_74A750, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2CAC_74AA7C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_748F7C, 0x00000046, 0x00000001, D_802A1320_7490F0, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_748F7C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_7491D8, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_748F7C, 0x00000046, 0x00000001, D_802A14F0_7492C0, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_748EC0, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_dizzy_stomp_main +.word 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2694_74A464, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2980_74A750, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2CAC_74AA7C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2694_74A464 .word 0x00000046, 0x00000001, D_802A2184_749F54, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_749DBC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8004034B, 0x00000001, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8004034B, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19B0_749780, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000002, func_802694A4, 0x00000000, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000018, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x80040364, 0x00000001, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A15D8_7493A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/earthquake_jump/785C20.data.s b/ver/us/asm/data/battle/move/earthquake_jump/785C20.data.s index 0d37ad8126..10f1f5f036 100644 --- a/ver/us/asm/data/battle/move/earthquake_jump/785C20.data.s +++ b/ver/us/asm/data/battle/move/earthquake_jump/785C20.data.s @@ -27,7 +27,10 @@ dlabel D_802A19C0_7864E0 .word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_earthquake_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_earthquake_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_earthquake_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11BC_785CDC, 0x00000046, 0x00000001, D_802A1330_785E50, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11BC_785CDC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1418_785F38, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11BC_785CDC, 0x00000046, 0x00000001, D_802A1500_786020, 0x00000043, 0x00000002, func_8026919C, D_802A1100_785C20, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2610_787130 -.word 0x0000000B, 0x0000000A, 0x00000009, 0x00000008, 0x00000007, 0x00000006, 0x00000005, 0x00000004, 0x00000024, 0x00000002, 0xFBD3E28A, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A26D4_7871F4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3560_788080, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A4470_788F90, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000B, 0x0000000A, 0x00000009, 0x00000008, 0x00000007, 0x00000006, 0x00000005, 0x00000004 + +dlabel battle_move_earthquake_jump_main +.word 0x00000024, 0x00000002, 0xFBD3E28A, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A26D4_7871F4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3560_788080, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A4470_788F90, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A26D4_7871F4 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1330_785E50, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00030000, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C1A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AE7, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7AB4, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x18000800, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8C, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19C0_7864E0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, func_8026919C, D_802A2610_787130, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001A, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000004, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000004, 0x00000013, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C1A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AE7, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7AB4, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCommandAutoSuccess, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000003, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, func_802A10E4_785C04, 0x0000000D, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x18000800, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000040, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x000000E0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000003, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8C, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15E8_786108, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A19C0_7864E0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15E8_786108, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/hammer_charge_0/74F3D0.data.s b/ver/us/asm/data/battle/move/hammer_charge_0/74F3D0.data.s index d57adf8cb5..50c026cff7 100644 --- a/ver/us/asm/data/battle/move/hammer_charge_0/74F3D0.data.s +++ b/ver/us/asm/data/battle/move/hammer_charge_0/74F3D0.data.s @@ -27,10 +27,16 @@ dlabel D_802A1D30_74FE60 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A12A0_74F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A13F4_74F524, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A21F0_750320 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A12A0_74F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1578_74F6A8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A12A0_74F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A16FC_74F82C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A137C_74F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A13F4_74F524, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A137C_74F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1578_74F6A8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A137C_74F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A16FC_74F82C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A3348_751478, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3348_751478, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3348_751478, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A12A0_74F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1578_74F6A8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A12A0_74F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A16FC_74F82C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A137C_74F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A13F4_74F524, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A137C_74F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1578_74F6A8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A137C_74F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A16FC_74F82C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_hammer_charge_0_802A3234 +.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A3348_751478, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3348_751478, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3348_751478, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A3348_751478 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1D30_74FE60, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A21F0_750320, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1D30_74FE60, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C89, 0x00000010, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1C54_74FD84, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000030, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000020, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A1A9C_74FBCC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1C54_74FD84, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A3948_751A78, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3C90_751DC0, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A3FD8_752108, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1D30_74FE60, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A21F0_750320, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1D30_74FE60, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C89, 0x00000010, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1C54_74FD84, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000030, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000020, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A1A9C_74FBCC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1C54_74FD84, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_hammer_charge_0_802A38C4 +.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A3948_751A78, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3C90_751DC0, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A3FD8_752108, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A3948_751A78 .word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00050004, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802A11CC_74F2FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, func_802A11CC_74F2FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsHammerMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000004, func_802A10C8_74F1F8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00050005, 0x00050005, 0x00050005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000004, ShowVariableMessageBox, 0x00000004, 0x0000003C, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/hammer_charge_1/7598D0.data.s b/ver/us/asm/data/battle/move/hammer_charge_1/7598D0.data.s index 8472d54bd0..2d59c50e9d 100644 --- a/ver/us/asm/data/battle/move/hammer_charge_1/7598D0.data.s +++ b/ver/us/asm/data/battle/move/hammer_charge_1/7598D0.data.s @@ -27,10 +27,16 @@ dlabel D_802A1DB0_75A360 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1320_7598D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1474_759A24, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2270_75A820 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1320_7598D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15F8_759BA8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1320_7598D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A177C_759D2C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A13FC_7599AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1474_759A24, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A13FC_7599AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15F8_759BA8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A13FC_7599AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A177C_759D2C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A33C8_75B978, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A33C8_75B978, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A33C8_75B978, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1320_7598D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15F8_759BA8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1320_7598D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A177C_759D2C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A13FC_7599AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1474_759A24, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A13FC_7599AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15F8_759BA8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A13FC_7599AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A177C_759D2C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_hammer_charge_1_802A32B4 +.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A33C8_75B978, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A33C8_75B978, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A33C8_75B978, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A33C8_75B978 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1DB0_75A360, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2270_75A820, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1DB0_75A360, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C89, 0x00000010, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1CD4_75A284, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000030, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000020, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A1B1C_75A0CC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1CD4_75A284, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A39C8_75BF78, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3D1C_75C2CC, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A4070_75C620, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1DB0_75A360, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2270_75A820, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1DB0_75A360, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C89, 0x00000010, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1CD4_75A284, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000030, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000020, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A1B1C_75A0CC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1CD4_75A284, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_hammer_charge_1_802A3944 +.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A39C8_75BF78, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3D1C_75C2CC, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A4070_75C620, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A39C8_75BF78 .word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00050004, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_hammer_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_hammer_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsHammerMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000004, func_802A10C8_759678, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00050005, 0x00050005, 0x00050005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_802A12FC_7598AC, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/hammer_charge_2/75E8F0.data.s b/ver/us/asm/data/battle/move/hammer_charge_2/75E8F0.data.s index 36deb4b2f5..27fe8c2524 100644 --- a/ver/us/asm/data/battle/move/hammer_charge_2/75E8F0.data.s +++ b/ver/us/asm/data/battle/move/hammer_charge_2/75E8F0.data.s @@ -27,10 +27,16 @@ dlabel D_802A1DB0_75F380 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1320_75E8F0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1474_75EA44, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2270_75F840 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1320_75E8F0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15F8_75EBC8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1320_75E8F0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A177C_75ED4C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A13FC_75E9CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1474_75EA44, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A13FC_75E9CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15F8_75EBC8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A13FC_75E9CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A177C_75ED4C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A33C8_760998, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A33C8_760998, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A33C8_760998, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1320_75E8F0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15F8_75EBC8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1320_75E8F0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A177C_75ED4C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A13FC_75E9CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1474_75EA44, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A13FC_75E9CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15F8_75EBC8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A13FC_75E9CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A177C_75ED4C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_hammer_charge_2_802A32B4 +.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A33C8_760998, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A33C8_760998, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A33C8_760998, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A33C8_760998 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1DB0_75F380, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2270_75F840, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1DB0_75F380, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C89, 0x00000010, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1CD4_75F2A4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000030, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000020, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A1B1C_75F0EC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1CD4_75F2A4, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A39C8_760F98, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3CF4_7612C4, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A4020_7615F0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1DB0_75F380, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2270_75F840, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1DB0_75F380, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C89, 0x00000010, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1CD4_75F2A4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000030, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000020, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A1B1C_75F0EC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1CD4_75F2A4, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_hammer_charge_2_802A3944 +.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A39C8_760F98, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3CF4_7612C4, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A4020_7615F0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A39C8_760F98 .word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00050004, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_hammer_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_hammer_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsHammerMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000004, func_802A10C8_75E698, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00050005, 0x00050005, 0x00050005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000001, func_802A12FC_75E8CC, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/hammer_throw/752500.data.s b/ver/us/asm/data/battle/move/hammer_throw/752500.data.s index 531fe3bcaa..632553c50d 100644 --- a/ver/us/asm/data/battle/move/hammer_throw/752500.data.s +++ b/ver/us/asm/data/battle/move/hammer_throw/752500.data.s @@ -69,7 +69,10 @@ dlabel D_802A3D00_755150 .word 0x00000004, 0x0000000D, 0x00000001, 0x0000003C, D_802A3AE8_754F38, 0x00000002, 0x00000000 dlabel D_802A3D1C_75516C -.word 0x00000004, 0x0000000D, 0x00000001, 0x0000003C, D_802A3BD8_755028, 0x00000002, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A42E8_755738, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A42E8_755738, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A42E8_755738, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000004, 0x0000000D, 0x00000001, 0x0000003C, D_802A3BD8_755028, 0x00000002, 0x00000000 + +dlabel battle_move_hammer_throw_main +.word 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A42E8_755738, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A42E8_755738, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A42E8_755738, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A3E5C_7552AC .word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040016, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040016, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/jump_charge_0/74D850.data.s b/ver/us/asm/data/battle/move/jump_charge_0/74D850.data.s index 90b49734e4..eb04b876d8 100644 --- a/ver/us/asm/data/battle/move/jump_charge_0/74D850.data.s +++ b/ver/us/asm/data/battle/move/jump_charge_0/74D850.data.s @@ -18,4 +18,10 @@ dlabel D_802A15F8_74DB68 .word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A16E0_74DC50 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A139C_74D90C, 0x00000046, 0x00000001, D_802A1510_74DA80, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A139C_74D90C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A15F8_74DB68, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A139C_74D90C, 0x00000046, 0x00000001, D_802A16E0_74DC50, 0x00000043, 0x00000002, func_8026919C, D_802A12E0_74D850, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010020, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802A120C_74D77C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, func_802A120C_74D77C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_jump_charge_0_IsJumpMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, func_802A1108_74D678, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000004, ShowVariableMessageBox, 0x00000006, 0x0000003C, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A139C_74D90C, 0x00000046, 0x00000001, D_802A1510_74DA80, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A139C_74D90C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A15F8_74DB68, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A139C_74D90C, 0x00000046, 0x00000001, D_802A16E0_74DC50, 0x00000043, 0x00000002, func_8026919C, D_802A12E0_74D850, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel battle_move_jump_charge_0_802A27F0 +.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel battle_move_jump_charge_0_802A2800 +.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010020, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802A120C_74D77C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, func_802A120C_74D77C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_jump_charge_0_IsJumpMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, func_802A1108_74D678, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000004, ShowVariableMessageBox, 0x00000006, 0x0000003C, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/jump_charge_1/75CCE0.data.s b/ver/us/asm/data/battle/move/jump_charge_1/75CCE0.data.s index d48981aaba..acff3ecb10 100644 --- a/ver/us/asm/data/battle/move/jump_charge_1/75CCE0.data.s +++ b/ver/us/asm/data/battle/move/jump_charge_1/75CCE0.data.s @@ -18,4 +18,10 @@ dlabel D_802A1678_75CFF8 .word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A1760_75D0E0 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A141C_75CD9C, 0x00000046, 0x00000001, D_802A1590_75CF10, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A141C_75CD9C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1678_75CFF8, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A141C_75CD9C, 0x00000046, 0x00000001, D_802A1760_75D0E0, 0x00000043, 0x00000002, func_8026919C, D_802A1360_75CCE0, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010020, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_jump_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_jump_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_jump_charge_1_IsJumpMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, func_802A1108_75CA88, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_802A133C_75CCBC, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A141C_75CD9C, 0x00000046, 0x00000001, D_802A1590_75CF10, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A141C_75CD9C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1678_75CFF8, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A141C_75CD9C, 0x00000046, 0x00000001, D_802A1760_75D0E0, 0x00000043, 0x00000002, func_8026919C, D_802A1360_75CCE0, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel battle_move_jump_charge_1_802A2870 +.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel battle_move_jump_charge_1_802A2880 +.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010020, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_jump_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_jump_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_jump_charge_1_IsJumpMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, func_802A1108_75CA88, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_802A133C_75CCBC, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/jump_charge_2/761C80.data.s b/ver/us/asm/data/battle/move/jump_charge_2/761C80.data.s index 72ea1f1259..e175a39d91 100644 --- a/ver/us/asm/data/battle/move/jump_charge_2/761C80.data.s +++ b/ver/us/asm/data/battle/move/jump_charge_2/761C80.data.s @@ -18,4 +18,10 @@ dlabel D_802A1678_761F98 .word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A1760_762080 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A141C_761D3C, 0x00000046, 0x00000001, D_802A1590_761EB0, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A141C_761D3C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1678_761F98, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A141C_761D3C, 0x00000046, 0x00000001, D_802A1760_762080, 0x00000043, 0x00000002, func_8026919C, D_802A1360_761C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010020, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_jump_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_jump_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_jump_charge_2_IsJumpMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, func_802A1108_761A28, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000001, func_802A133C_761C5C, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A141C_761D3C, 0x00000046, 0x00000001, D_802A1590_761EB0, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A141C_761D3C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1678_761F98, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A141C_761D3C, 0x00000046, 0x00000001, D_802A1760_762080, 0x00000043, 0x00000002, func_8026919C, D_802A1360_761C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_jump_charge_2_802A2870 +.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_jump_charge_2_802A2880 +.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010020, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_jump_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_jump_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_jump_charge_2_IsJumpMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, func_802A1108_761A28, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000001, func_802A133C_761C5C, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/mega_jump/771020.data.s b/ver/us/asm/data/battle/move/mega_jump/771020.data.s index 46a8cfb6b9..1fd657ed56 100644 --- a/ver/us/asm/data/battle/move/mega_jump/771020.data.s +++ b/ver/us/asm/data/battle/move/mega_jump/771020.data.s @@ -30,7 +30,10 @@ dlabel D_802A1FEC_771F1C .word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2184_7720B4 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_7710DC, 0x00000046, 0x00000001, D_802A1320_771250, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_7710DC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_771338, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_7710DC, 0x00000046, 0x00000001, D_802A14F0_771420, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_771020, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A27FC_77272C, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2978_7728A8, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2AF4_772A24, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_7710DC, 0x00000046, 0x00000001, D_802A1320_771250, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_7710DC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_771338, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_7710DC, 0x00000046, 0x00000001, D_802A14F0_771420, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_771020, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_mega_jump_main +.word 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A27FC_77272C, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2978_7728A8, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2AF4_772A24, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A26B4_7725E4 .word 0x00000043, 0x00000002, StartRumble, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A9280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/mega_quake/756900.data.s b/ver/us/asm/data/battle/move/mega_quake/756900.data.s index 78f69cfaf9..8c187bb18c 100644 --- a/ver/us/asm/data/battle/move/mega_quake/756900.data.s +++ b/ver/us/asm/data/battle/move/mega_quake/756900.data.s @@ -27,7 +27,10 @@ dlabel D_802A2BCC_75834C .word 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A125C_7569DC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1458_756BD8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_mega_quake_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2E70_7585F0 -.word 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A125C_7569DC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15DC_756D5C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_mega_quake_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3238_7589B8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3238_7589B8, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3238_7589B8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A125C_7569DC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15DC_756D5C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_mega_quake_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_mega_quake_main +.word 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3238_7589B8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3238_7589B8, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3238_7589B8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A3238_7589B8 .word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A28A0_758020, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2BCC_75834C, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2E70_7585F0, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000021, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000042, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7BB4, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A8080, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A8080, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7EB4, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7CE7, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7B1A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7ACD, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000030, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000048, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000025, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B76, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7F4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A841A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7F4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7DDD, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C6C, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AFB, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7ABE, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000030, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000048, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000025, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000008, 0x00000001, 0x0000000F, 0x00000026, 0x00000002, 0xFE363C86, 0xF24A7A80, 0x00000005, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C86, 0xF24B0A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C84, 0xFE363C85, 0xF24F2A80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C8F, 0x00000043, 0x0000000F, PlayEffect, 0x0000005E, 0x00000000, 0xFE363C83, 0x00000001, 0xFE363C82, 0xFE363C84, 0x00000001, 0xFE363C85, 0xF24A8A80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C8A, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000032, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211B, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211C, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211D, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00200000, 0x0000001D, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x38200800, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x38200800, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802A1A68_7571E8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/mega_smash/777740.data.s b/ver/us/asm/data/battle/move/mega_smash/777740.data.s index 59ed93f76e..ca36592dd5 100644 --- a/ver/us/asm/data/battle/move/mega_smash/777740.data.s +++ b/ver/us/asm/data/battle/move/mega_smash/777740.data.s @@ -30,7 +30,10 @@ dlabel D_802A2000_778690 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_777740, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_777A18, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_mega_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_mega_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A23E8_778A78 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_777740, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_777B9C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_mega_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_mega_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77781C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_777894, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_mega_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77781C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_777A18, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_mega_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77781C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_777B9C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_mega_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A32D0_779960, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000006, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000008, 0x00000046, 0x00000001, D_802A32D0_779960, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000007, 0x00000024, 0x00000002, 0xFE363C8F, 0x0000000A, 0x00000046, 0x00000001, D_802A32D0_779960, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_777740, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_777B9C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_mega_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_mega_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77781C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_777894, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_mega_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77781C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_777A18, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_mega_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77781C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_777B9C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_mega_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_mega_smash_main +.word 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A32D0_779960, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000006, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000008, 0x00000046, 0x00000001, D_802A32D0_779960, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000007, 0x00000024, 0x00000002, 0xFE363C8F, 0x0000000A, 0x00000046, 0x00000001, D_802A32D0_779960, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A3188_779818 .word 0x00000043, 0x00000002, StartRumble, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A9280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/multibounce/740DB0.data.s b/ver/us/asm/data/battle/move/multibounce/740DB0.data.s index 33ce6f771d..f7ee9c9caa 100644 --- a/ver/us/asm/data/battle/move/multibounce/740DB0.data.s +++ b/ver/us/asm/data/battle/move/multibounce/740DB0.data.s @@ -33,7 +33,10 @@ dlabel D_802A1FEC_741CAC .word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_740E6C, 0x00000046, 0x00000001, D_802A1320_740FE0, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_740E6C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_7410C8, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_740E6C, 0x00000046, 0x00000001, D_802A14F0_7411B0, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_740DB0, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2600_7422C0 -.word 0x00000007, 0x00000006, 0x00000005, 0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A26C8_742388, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2F80_742C40, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A388C_74354C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000007, 0x00000006, 0x00000005, 0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x00000000 + +dlabel battle_move_multibounce_main +.word 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A26C8_742388, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2F80_742C40, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A388C_74354C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A26C8_742388 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000002, func_8026919C, D_802A2600_7422C0, 0x00000046, 0x00000001, D_802A11AC_740E6C, 0x00000046, 0x00000001, D_802A1320_740FE0, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_741CAC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x00000070, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x00000070, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A19B0_741670, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000028, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1320_740FE0, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_741CAC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x00000070, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x000000F0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x00000030, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x000000F0, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A19B0_741670, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000046, 0x00000001, D_802A17C4_741484, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/power_bounce/743FF0.data.s b/ver/us/asm/data/battle/move/power_bounce/743FF0.data.s index 6f3092d65c..e50abbd6ab 100644 --- a/ver/us/asm/data/battle/move/power_bounce/743FF0.data.s +++ b/ver/us/asm/data/battle/move/power_bounce/743FF0.data.s @@ -33,7 +33,10 @@ dlabel D_802A2710_745500 .word 0x00000007, 0x00000006, 0x00000005, 0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x00000000 dlabel D_802A2730_745520 -.word 0x000000C8, 0x00000024, 0x00000002, 0xFBD3E28A, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000001, func_802A1194_743F84, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000046, 0x00000001, D_802A2820_745610, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000046, 0x00000001, D_802A3024_745E14, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000046, 0x00000001, D_802A383C_74662C, 0x00000023, 0x00000000, 0x00000043, 0x00000001, func_802A11C0_743FB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x000000C8 + +dlabel battle_move_power_bounce_main +.word 0x00000024, 0x00000002, 0xFBD3E28A, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000001, func_802A1194_743F84, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000046, 0x00000001, D_802A2820_745610, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000046, 0x00000001, D_802A3024_745E14, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000046, 0x00000001, D_802A383C_74662C, 0x00000023, 0x00000000, 0x00000043, 0x00000001, func_802A11C0_743FB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2820_745610 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000002, func_8026919C, D_802A2710_745500, 0x00000046, 0x00000001, D_802A12BC_7440AC, 0x00000046, 0x00000001, D_802A1430_744220, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A20FC_744EEC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1AC0_7448B0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000043, 0x00000001, func_802A11A4_743F94, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, func_8026919C, D_802A2710_745500, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000018, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000005, 0x00000023, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCommandAutoSuccess, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000F, 0x00000002, 0xFE363C8F, 0x00000003, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802A10E4_743ED4, 0x0000000F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000040, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x000000E0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000020, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A16E8_7444D8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A1AC0_7448B0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A16E8_7444D8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000001, func_802A11A4_743F94, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/power_jump/76D850.data.s b/ver/us/asm/data/battle/move/power_jump/76D850.data.s index c8a5327f15..abce6da2b0 100644 --- a/ver/us/asm/data/battle/move/power_jump/76D850.data.s +++ b/ver/us/asm/data/battle/move/power_jump/76D850.data.s @@ -30,7 +30,10 @@ dlabel D_802A1FEC_76E74C .word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2184_76E8E4 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_76D90C, 0x00000046, 0x00000001, D_802A1320_76DA80, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_76D90C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_76DB68, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_76D90C, 0x00000046, 0x00000001, D_802A14F0_76DC50, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_76D850, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2754_76EEB4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A28D0_76F030, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2A4C_76F1AC, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_76D90C, 0x00000046, 0x00000001, D_802A1320_76DA80, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_76D90C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_76DB68, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_76D90C, 0x00000046, 0x00000001, D_802A14F0_76DC50, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_76D850, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel battle_move_power_jump_main +.word 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2754_76EEB4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A28D0_76F030, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2A4C_76F1AC, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A26B4_76EE14 .word 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8080, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000059, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/power_quake/767D40.data.s b/ver/us/asm/data/battle/move/power_quake/767D40.data.s index 2d42e11573..c4082a2915 100644 --- a/ver/us/asm/data/battle/move/power_quake/767D40.data.s +++ b/ver/us/asm/data/battle/move/power_quake/767D40.data.s @@ -27,7 +27,10 @@ dlabel D_802A2AFC_76978C .word 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_767E1C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_768018, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_power_quake_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2DA0_769A30 -.word 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_767E1C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_76819C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_power_quake_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3168_769DF8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3168_769DF8, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3168_769DF8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_767E1C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_76819C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_power_quake_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_power_quake_main +.word 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3168_769DF8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3168_769DF8, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3168_769DF8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A3168_769DF8 .word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A27D0_769460, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2AFC_76978C, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2DA0_769A30, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000021, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000042, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B76, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7F4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A841A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7F4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7DDD, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C6C, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AFB, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7ABE, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000030, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000048, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C1A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AE7, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7AB4, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000060, 0x00000008, 0x00000030, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000060, 0x00000008, 0x00000048, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000032, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211B, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211C, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211D, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00200000, 0x0000001D, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x38200800, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x38200800, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802A1998_768628, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/power_smash/772C50.data.s b/ver/us/asm/data/battle/move/power_smash/772C50.data.s index ce642aaefa..fad79ba45b 100644 --- a/ver/us/asm/data/battle/move/power_smash/772C50.data.s +++ b/ver/us/asm/data/battle/move/power_smash/772C50.data.s @@ -30,7 +30,10 @@ dlabel D_802A2000_773BA0 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_772C50, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_772F28, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_power_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_power_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A23E8_773F88 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_772C50, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_7730AC, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_power_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_power_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_772D2C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_772DA4, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_power_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_772D2C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_772F28, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_power_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_772D2C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_7730AC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_power_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3228_774DC8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3228_774DC8, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000008, 0x00000046, 0x00000001, D_802A3228_774DC8, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_772C50, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_7730AC, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_power_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_power_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_772D2C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_772DA4, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_power_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_772D2C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_772F28, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_power_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_772D2C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_7730AC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_power_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_power_smash_main +.word 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3228_774DC8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3228_774DC8, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000008, 0x00000046, 0x00000001, D_802A3228_774DC8, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A3188_774D28 .word 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8080, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/shell_crack/77F3D0.data.s b/ver/us/asm/data/battle/move/shell_crack/77F3D0.data.s index d515e871c9..d1da5b4e50 100644 --- a/ver/us/asm/data/battle/move/shell_crack/77F3D0.data.s +++ b/ver/us/asm/data/battle/move/shell_crack/77F3D0.data.s @@ -30,7 +30,10 @@ dlabel D_802A20E0_780320 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1190_77F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1468_77F6A8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_shell_crack_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_shell_crack_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A24C8_780708 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1190_77F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15EC_77F82C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_shell_crack_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_shell_crack_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A126C_77F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A12E4_77F524, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_shell_crack_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A126C_77F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1468_77F6A8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_shell_crack_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A126C_77F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15EC_77F82C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_shell_crack_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A3390_7815D0, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3390_7815D0, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3390_7815D0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A1190_77F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15EC_77F82C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_shell_crack_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_shell_crack_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A126C_77F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A12E4_77F524, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_shell_crack_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A126C_77F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1468_77F6A8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_shell_crack_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A126C_77F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15EC_77F82C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_shell_crack_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_shell_crack_main +.word 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A3390_7815D0, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3390_7815D0, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3390_7815D0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A3248_781488 .word 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A9280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/shrink_smash/77CC30.data.s b/ver/us/asm/data/battle/move/shrink_smash/77CC30.data.s index da2e45e3d2..fb35c9096a 100644 --- a/ver/us/asm/data/battle/move/shrink_smash/77CC30.data.s +++ b/ver/us/asm/data/battle/move/shrink_smash/77CC30.data.s @@ -30,7 +30,10 @@ dlabel D_802A2000_77DB80 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_77CC30, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_77CF08, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_shrink_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_shrink_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A23E8_77DF68 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_77CC30, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_77D08C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_shrink_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_shrink_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77CD0C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_77CD84, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_shrink_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77CD0C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_77CF08, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_shrink_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77CD0C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_77D08C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_shrink_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A3168_77ECE8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3168_77ECE8, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3168_77ECE8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_77CC30, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_77D08C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_shrink_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_shrink_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77CD0C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_77CD84, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_shrink_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77CD0C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_77CF08, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_shrink_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77CD0C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_77D08C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_shrink_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_shrink_smash_main +.word 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A3168_77ECE8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3168_77ECE8, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3168_77ECE8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A3168_77ECE8 .word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1B40_77D6C0, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2000_77DB80, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A23E8_77DF68, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, GetActionSuccessCopy, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1A64_77D5E4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x80080364, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x8008034B, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A18AC_77D42C, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A64_77D5E4, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/shrink_stomp/783C90.data.s b/ver/us/asm/data/battle/move/shrink_stomp/783C90.data.s index af44dea2b2..bb3be5efa0 100644 --- a/ver/us/asm/data/battle/move/shrink_stomp/783C90.data.s +++ b/ver/us/asm/data/battle/move/shrink_stomp/783C90.data.s @@ -30,7 +30,10 @@ dlabel D_802A1FEC_784B8C .word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2184_784D24 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_783D4C, 0x00000046, 0x00000001, D_802A1320_783EC0, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_783D4C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_783FA8, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_783D4C, 0x00000046, 0x00000001, D_802A14F0_784090, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_783C90, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2694_785234, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2978_785518, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2C8C_78582C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_783D4C, 0x00000046, 0x00000001, D_802A1320_783EC0, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_783D4C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_783FA8, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_783D4C, 0x00000046, 0x00000001, D_802A14F0_784090, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_783C90, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_shrink_stomp_main +.word 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2694_785234, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2978_785518, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2C8C_78582C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2694_785234 .word 0x00000046, 0x00000001, D_802A2184_784D24, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_784B8C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8008034B, 0x00000001, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8008034B, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19B0_784550, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000002, func_802694A4, 0x00000000, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000018, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000015A, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x80080364, 0x00000001, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A15D8_784178, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/sleep_stomp/746F00.data.s b/ver/us/asm/data/battle/move/sleep_stomp/746F00.data.s index 79e40103ce..62e1db3dcd 100644 --- a/ver/us/asm/data/battle/move/sleep_stomp/746F00.data.s +++ b/ver/us/asm/data/battle/move/sleep_stomp/746F00.data.s @@ -30,7 +30,10 @@ dlabel D_802A1FEC_747DFC .word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2184_747F94 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_746FBC, 0x00000046, 0x00000001, D_802A1320_747130, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_746FBC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_747218, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_746FBC, 0x00000046, 0x00000001, D_802A14F0_747300, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_746F00, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2694_7484A4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2980_748790, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2CAC_748ABC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_746FBC, 0x00000046, 0x00000001, D_802A1320_747130, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_746FBC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_747218, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_746FBC, 0x00000046, 0x00000001, D_802A14F0_747300, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_746F00, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_sleep_stomp_main +.word 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2694_7484A4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2980_748790, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2CAC_748ABC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2694_7484A4 .word 0x00000046, 0x00000001, D_802A2184_747F94, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_747DFC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8000134B, 0x00000001, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8000134B, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19B0_7477C0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000002, func_802694A4, 0x00000000, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000018, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x80001364, 0x00000001, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A15D8_7473E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/super_jump/76F420.data.s b/ver/us/asm/data/battle/move/super_jump/76F420.data.s index 4f72d39727..69b665da4d 100644 --- a/ver/us/asm/data/battle/move/super_jump/76F420.data.s +++ b/ver/us/asm/data/battle/move/super_jump/76F420.data.s @@ -30,7 +30,10 @@ dlabel D_802A1FEC_77031C .word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A2184_7704B4 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_76F4DC, 0x00000046, 0x00000001, D_802A1320_76F650, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_76F4DC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_76F738, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_76F4DC, 0x00000046, 0x00000001, D_802A14F0_76F820, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_76F420, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A278C_770ABC, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2908_770C38, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2A84_770DB4, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_76F4DC, 0x00000046, 0x00000001, D_802A1320_76F650, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_76F4DC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_76F738, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A11AC_76F4DC, 0x00000046, 0x00000001, D_802A14F0_76F820, 0x00000043, 0x00000002, func_8026919C, D_802A10F0_76F420, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, func_802A9120_421B10, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000043, 0x00000003, func_802A9120_421B10, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel battle_move_super_jump_main +.word 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A278C_770ABC, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2908_770C38, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2A84_770DB4, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A26B4_7709E4 .word 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/super_smash/7751B0.data.s b/ver/us/asm/data/battle/move/super_smash/7751B0.data.s index b58ef0c562..ccc562a5e4 100644 --- a/ver/us/asm/data/battle/move/super_smash/7751B0.data.s +++ b/ver/us/asm/data/battle/move/super_smash/7751B0.data.s @@ -30,7 +30,10 @@ dlabel D_802A2000_776100 .word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_7751B0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_775488, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_super_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_super_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A23E8_7764E8 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_7751B0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_77560C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_super_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_super_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77528C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_775304, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_super_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77528C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_775488, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_super_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77528C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_77560C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_super_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000046, 0x00000001, D_802A3260_777360, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000007, 0x00000046, 0x00000001, D_802A3260_777360, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000006, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000009, 0x00000046, 0x00000001, D_802A3260_777360, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_7751B0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_77560C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_super_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_super_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77528C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_775304, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_super_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77528C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_775488, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_super_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A118C_77528C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_77560C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_super_smash_IsRightOnEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, func_802A9258_422258, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel battle_move_super_smash_main +.word 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000046, 0x00000001, D_802A3260_777360, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000007, 0x00000046, 0x00000001, D_802A3260_777360, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000006, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000009, 0x00000046, 0x00000001, D_802A3260_777360, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802A3188_777288 .word 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EB7850.data.s b/ver/us/asm/data/dead/EB7850.data.s index 9335c66d70..eba42784eb 100644 --- a/ver/us/asm/data/dead/EB7850.data.s +++ b/ver/us/asm/data/dead/EB7850.data.s @@ -63,10 +63,10 @@ dlabel D_80241028_EB8258 .word 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, D_80241018_EB8248, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF9718891, 0x00000000, 0x00000043, 0x00000006, 0x802E382C, 0x000001AD, 0x00000000, 0xFE363C81, 0x00000AF0, 0x00000000, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802E382C, 0x000001AE, 0x00000000, 0xFE363C81, 0x00000AF0, 0x00000000, 0x00000024, 0x00000002, 0xF9718891, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802410F4_EB8324 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000003, 0xFE363C80, 0x00000044, 0x00000001, D_80241028_EB8258, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x00000032, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, D_80240F40_EB8170, 0x00000004, 0x00000004, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFEC, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000A, D_80240F70_EB81A0, 0x00000003, 0x00000004, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x0000000A, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, D_80240F94_EB81C4, 0x00000005, 0x00000004, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFCE, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x00000014, D_80240FD0_EB8200, 0x00000006, 0x00000004, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C84, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000029, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000004, func_80240478_EB76A8, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802E5160, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000003, 0xFE363C80, 0x00000044, 0x00000001, D_80241028_EB8258, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x00000032, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, D_80240F40_EB8170, 0x00000004, 0x00000004, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFEC, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000A, D_80240F70_EB81A0, 0x00000003, 0x00000004, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x0000000A, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, D_80240F94_EB81C4, 0x00000005, 0x00000004, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFCE, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x00000014, D_80240FD0_EB8200, 0x00000006, 0x00000004, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C84, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000029, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000004, EB7540_SetPyroclastPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802E5160, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241418_EB8648 -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000001, EB7540_UnsetCamera0MoveFlag1, 0x00000044, 0x00000001, D_80240E98_EB80C8, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000C12, 0x000000A0, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0x0000000A, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFFF6, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFFF6, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000B18, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049370, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802410F4_EB8324, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000007, 0x8011A58C, 0x802F92E0, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240520_EB7750, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, EB7540_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C83, 0x00000BB8, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, EB7540_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, 0x802D78AC, 0x80241C18, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000001, EB7540_AllowCameraInterpY, 0x00000044, 0x00000001, D_80240E98_EB80C8, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000C12, 0x000000A0, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0x0000000A, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFFF6, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFFF6, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000B18, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049370, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802410F4_EB8324, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000007, 0x8011A58C, 0x802F92E0, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, EB7540_AnimateChestSize, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, EB7540_GetChestPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C83, 0x00000BB8, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, EB7540_SetChestPosition, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, 0x802D78AC, 0x80241C18, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417AC_EB89DC .word 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160008, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, D_80241418_EB8648, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s b/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s deleted file mode 100644 index 07505ef588..0000000000 --- a/ver/us/asm/nonmatchings/16c8e0/btl_update_starpoints_display.s +++ /dev/null @@ -1,429 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel btl_update_starpoints_display -/* 16EC9C 802403BC 27BDFF70 */ addiu $sp, $sp, -0x90 -/* 16ECA0 802403C0 3C0B800E */ lui $t3, %hi(gBattleStatus) -/* 16ECA4 802403C4 256BC070 */ addiu $t3, $t3, %lo(gBattleStatus) -/* 16ECA8 802403C8 AFBF007C */ sw $ra, 0x7c($sp) -/* 16ECAC 802403CC AFBE0078 */ sw $fp, 0x78($sp) -/* 16ECB0 802403D0 AFB70074 */ sw $s7, 0x74($sp) -/* 16ECB4 802403D4 AFB60070 */ sw $s6, 0x70($sp) -/* 16ECB8 802403D8 AFB5006C */ sw $s5, 0x6c($sp) -/* 16ECBC 802403DC AFB40068 */ sw $s4, 0x68($sp) -/* 16ECC0 802403E0 AFB30064 */ sw $s3, 0x64($sp) -/* 16ECC4 802403E4 AFB20060 */ sw $s2, 0x60($sp) -/* 16ECC8 802403E8 AFB1005C */ sw $s1, 0x5c($sp) -/* 16ECCC 802403EC AFB00058 */ sw $s0, 0x58($sp) -/* 16ECD0 802403F0 F7B60088 */ sdc1 $f22, 0x88($sp) -/* 16ECD4 802403F4 F7B40080 */ sdc1 $f20, 0x80($sp) -/* 16ECD8 802403F8 8D620000 */ lw $v0, ($t3) -/* 16ECDC 802403FC 30420001 */ andi $v0, $v0, 1 -/* 16ECE0 80240400 1040016E */ beqz $v0, .L802409BC -/* 16ECE4 80240404 00000000 */ nop -/* 16ECE8 80240408 8D620004 */ lw $v0, 4($t3) -/* 16ECEC 8024040C 30420001 */ andi $v0, $v0, 1 -/* 16ECF0 80240410 1440001D */ bnez $v0, .L80240488 -/* 16ECF4 80240414 240500CA */ addiu $a1, $zero, 0xca -/* 16ECF8 80240418 3C036666 */ lui $v1, 0x6666 -/* 16ECFC 8024041C 34636667 */ ori $v1, $v1, 0x6667 -/* 16ED00 80240420 91650078 */ lbu $a1, 0x78($t3) -/* 16ED04 80240424 24020124 */ addiu $v0, $zero, 0x124 -/* 16ED08 80240428 3C01802A */ lui $at, %hi(D_8029DA40) -/* 16ED0C 8024042C AC22DA40 */ sw $v0, %lo(D_8029DA40)($at) -/* 16ED10 80240430 240200C4 */ addiu $v0, $zero, 0xc4 -/* 16ED14 80240434 00052E00 */ sll $a1, $a1, 0x18 -/* 16ED18 80240438 00052603 */ sra $a0, $a1, 0x18 -/* 16ED1C 8024043C 00830018 */ mult $a0, $v1 -/* 16ED20 80240440 3C01802A */ lui $at, %hi(D_8029DA44) -/* 16ED24 80240444 AC22DA44 */ sw $v0, %lo(D_8029DA44)($at) -/* 16ED28 80240448 24020006 */ addiu $v0, $zero, 6 -/* 16ED2C 8024044C 3C01802A */ lui $at, %hi(D_8029DA48) -/* 16ED30 80240450 AC22DA48 */ sw $v0, %lo(D_8029DA48)($at) -/* 16ED34 80240454 00052FC3 */ sra $a1, $a1, 0x1f -/* 16ED38 80240458 00006010 */ mfhi $t4 -/* 16ED3C 8024045C 000C1883 */ sra $v1, $t4, 2 -/* 16ED40 80240460 00651823 */ subu $v1, $v1, $a1 -/* 16ED44 80240464 00031080 */ sll $v0, $v1, 2 -/* 16ED48 80240468 00431021 */ addu $v0, $v0, $v1 -/* 16ED4C 8024046C 00021040 */ sll $v0, $v0, 1 -/* 16ED50 80240470 00822023 */ subu $a0, $a0, $v0 -/* 16ED54 80240474 00042600 */ sll $a0, $a0, 0x18 -/* 16ED58 80240478 00042603 */ sra $a0, $a0, 0x18 -/* 16ED5C 8024047C 3C01802A */ lui $at, %hi(D_8029DA4C) -/* 16ED60 80240480 0809014B */ j .L8024052C -/* 16ED64 80240484 AC24DA4C */ sw $a0, %lo(D_8029DA4C)($at) -.L80240488: -/* 16ED68 80240488 3C08802A */ lui $t0, %hi(D_8029DA40) -/* 16ED6C 8024048C 2508DA40 */ addiu $t0, $t0, %lo(D_8029DA40) -/* 16ED70 80240490 3C0A802A */ lui $t2, %hi(D_8029DA48) -/* 16ED74 80240494 254ADA48 */ addiu $t2, $t2, %lo(D_8029DA48) -/* 16ED78 80240498 8D060000 */ lw $a2, ($t0) -/* 16ED7C 8024049C 8D430000 */ lw $v1, ($t2) -/* 16ED80 802404A0 00A62823 */ subu $a1, $a1, $a2 -/* 16ED84 802404A4 14600002 */ bnez $v1, .L802404B0 -/* 16ED88 802404A8 00A3001A */ div $zero, $a1, $v1 -/* 16ED8C 802404AC 0007000D */ break 7 -.L802404B0: -/* 16ED90 802404B0 2401FFFF */ addiu $at, $zero, -1 -/* 16ED94 802404B4 14610004 */ bne $v1, $at, .L802404C8 -/* 16ED98 802404B8 3C018000 */ lui $at, 0x8000 -/* 16ED9C 802404BC 14A10002 */ bne $a1, $at, .L802404C8 -/* 16EDA0 802404C0 00000000 */ nop -/* 16EDA4 802404C4 0006000D */ break 6 -.L802404C8: -/* 16EDA8 802404C8 00002812 */ mflo $a1 -/* 16EDAC 802404CC 3C07802A */ lui $a3, %hi(D_8029DA44) -/* 16EDB0 802404D0 24E7DA44 */ addiu $a3, $a3, %lo(D_8029DA44) -/* 16EDB4 802404D4 8CE40000 */ lw $a0, ($a3) -/* 16EDB8 802404D8 24020078 */ addiu $v0, $zero, 0x78 -/* 16EDBC 802404DC 00441023 */ subu $v0, $v0, $a0 -/* 16EDC0 802404E0 14600002 */ bnez $v1, .L802404EC -/* 16EDC4 802404E4 0043001A */ div $zero, $v0, $v1 -/* 16EDC8 802404E8 0007000D */ break 7 -.L802404EC: -/* 16EDCC 802404EC 2401FFFF */ addiu $at, $zero, -1 -/* 16EDD0 802404F0 14610004 */ bne $v1, $at, .L80240504 -/* 16EDD4 802404F4 3C018000 */ lui $at, 0x8000 -/* 16EDD8 802404F8 14410002 */ bne $v0, $at, .L80240504 -/* 16EDDC 802404FC 00000000 */ nop -/* 16EDE0 80240500 0006000D */ break 6 -.L80240504: -/* 16EDE4 80240504 00001012 */ mflo $v0 -/* 16EDE8 80240508 2463FFFF */ addiu $v1, $v1, -1 -/* 16EDEC 8024050C AD430000 */ sw $v1, ($t2) -/* 16EDF0 80240510 00C53021 */ addu $a2, $a2, $a1 -/* 16EDF4 80240514 00822021 */ addu $a0, $a0, $v0 -/* 16EDF8 80240518 AD060000 */ sw $a2, ($t0) -/* 16EDFC 8024051C 1C600003 */ bgtz $v1, .L8024052C -/* 16EE00 80240520 ACE40000 */ sw $a0, ($a3) -/* 16EE04 80240524 24020001 */ addiu $v0, $zero, 1 -/* 16EE08 80240528 AD420000 */ sw $v0, ($t2) -.L8024052C: -/* 16EE0C 8024052C 3C028028 */ lui $v0, %hi(D_802809F4) -/* 16EE10 80240530 804209F4 */ lb $v0, %lo(D_802809F4)($v0) -/* 16EE14 80240534 1040000F */ beqz $v0, .L80240574 -/* 16EE18 80240538 24050001 */ addiu $a1, $zero, 1 -/* 16EE1C 8024053C 3C048028 */ lui $a0, %hi(D_802809F5) -/* 16EE20 80240540 248409F5 */ addiu $a0, $a0, %lo(D_802809F5) -/* 16EE24 80240544 80830000 */ lb $v1, ($a0) -/* 16EE28 80240548 28620009 */ slti $v0, $v1, 9 -/* 16EE2C 8024054C 14400004 */ bnez $v0, .L80240560 -/* 16EE30 80240550 2862000D */ slti $v0, $v1, 0xd -/* 16EE34 80240554 50400002 */ beql $v0, $zero, .L80240560 -/* 16EE38 80240558 A0800000 */ sb $zero, ($a0) -/* 16EE3C 8024055C 0000282D */ daddu $a1, $zero, $zero -.L80240560: -/* 16EE40 80240560 3C038028 */ lui $v1, %hi(D_802809F5) -/* 16EE44 80240564 246309F5 */ addiu $v1, $v1, %lo(D_802809F5) -/* 16EE48 80240568 90620000 */ lbu $v0, ($v1) -/* 16EE4C 8024056C 24420001 */ addiu $v0, $v0, 1 -/* 16EE50 80240570 A0620000 */ sb $v0, ($v1) -.L80240574: -/* 16EE54 80240574 10A00111 */ beqz $a1, .L802409BC -/* 16EE58 80240578 00000000 */ nop -/* 16EE5C 8024057C 3C038028 */ lui $v1, %hi(D_802809F0) -/* 16EE60 80240580 246309F0 */ addiu $v1, $v1, %lo(D_802809F0) -/* 16EE64 80240584 9162007A */ lbu $v0, 0x7a($t3) -/* 16EE68 80240588 C4600000 */ lwc1 $f0, ($v1) -/* 16EE6C 8024058C 3C013FF0 */ lui $at, 0x3ff0 -/* 16EE70 80240590 44811800 */ mtc1 $at, $f3 -/* 16EE74 80240594 44801000 */ mtc1 $zero, $f2 -/* 16EE78 80240598 3C013F80 */ lui $at, 0x3f80 -/* 16EE7C 8024059C 4481B000 */ mtc1 $at, $f22 -/* 16EE80 802405A0 46000021 */ cvt.d.s $f0, $f0 -/* 16EE84 802405A4 46220001 */ sub.d $f0, $f0, $f2 -/* 16EE88 802405A8 44801000 */ mtc1 $zero, $f2 -/* 16EE8C 802405AC 2442FFFF */ addiu $v0, $v0, -1 -/* 16EE90 802405B0 A162007A */ sb $v0, 0x7a($t3) -/* 16EE94 802405B4 46200020 */ cvt.s.d $f0, $f0 -/* 16EE98 802405B8 4602003E */ c.le.s $f0, $f2 -/* 16EE9C 802405BC 00000000 */ nop -/* 16EEA0 802405C0 45000036 */ bc1f .L8024069C -/* 16EEA4 802405C4 E4600000 */ swc1 $f0, ($v1) -/* 16EEA8 802405C8 81620079 */ lb $v0, 0x79($t3) -/* 16EEAC 802405CC 1840000D */ blez $v0, .L80240604 -/* 16EEB0 802405D0 00000000 */ nop -/* 16EEB4 802405D4 91620078 */ lbu $v0, 0x78($t3) -/* 16EEB8 802405D8 24420001 */ addiu $v0, $v0, 1 -/* 16EEBC 802405DC A1620078 */ sb $v0, 0x78($t3) -/* 16EEC0 802405E0 00021600 */ sll $v0, $v0, 0x18 -/* 16EEC4 802405E4 00021603 */ sra $v0, $v0, 0x18 -/* 16EEC8 802405E8 28420065 */ slti $v0, $v0, 0x65 -/* 16EECC 802405EC 14400002 */ bnez $v0, .L802405F8 -/* 16EED0 802405F0 24020064 */ addiu $v0, $zero, 0x64 -/* 16EED4 802405F4 A1620078 */ sb $v0, 0x78($t3) -.L802405F8: -/* 16EED8 802405F8 91620079 */ lbu $v0, 0x79($t3) -/* 16EEDC 802405FC 2442FFFF */ addiu $v0, $v0, -1 -/* 16EEE0 80240600 A1620079 */ sb $v0, 0x79($t3) -.L80240604: -/* 16EEE4 80240604 81630079 */ lb $v1, 0x79($t3) -/* 16EEE8 80240608 58600001 */ blezl $v1, .L80240610 -/* 16EEEC 8024060C 24030001 */ addiu $v1, $zero, 1 -.L80240610: -/* 16EEF0 80240610 44830000 */ mtc1 $v1, $f0 -/* 16EEF4 80240614 00000000 */ nop -/* 16EEF8 80240618 46800020 */ cvt.s.w $f0, $f0 -/* 16EEFC 8024061C 8162007A */ lb $v0, 0x7a($t3) -/* 16EF00 80240620 3C013FF0 */ lui $at, 0x3ff0 -/* 16EF04 80240624 44811800 */ mtc1 $at, $f3 -/* 16EF08 80240628 44801000 */ mtc1 $zero, $f2 -/* 16EF0C 8024062C 44822000 */ mtc1 $v0, $f4 -/* 16EF10 80240630 00000000 */ nop -/* 16EF14 80240634 46802120 */ cvt.s.w $f4, $f4 -/* 16EF18 80240638 46002103 */ div.s $f4, $f4, $f0 -/* 16EF1C 8024063C 46002021 */ cvt.d.s $f0, $f4 -/* 16EF20 80240640 3C028028 */ lui $v0, %hi(D_802809F0) -/* 16EF24 80240644 244209F0 */ addiu $v0, $v0, %lo(D_802809F0) -/* 16EF28 80240648 4622003C */ c.lt.d $f0, $f2 -/* 16EF2C 8024064C 00000000 */ nop -/* 16EF30 80240650 45000005 */ bc1f .L80240668 -/* 16EF34 80240654 E4440000 */ swc1 $f4, ($v0) -/* 16EF38 80240658 3C013F80 */ lui $at, 0x3f80 -/* 16EF3C 8024065C 44810000 */ mtc1 $at, $f0 -/* 16EF40 80240660 00000000 */ nop -/* 16EF44 80240664 E4400000 */ swc1 $f0, ($v0) -.L80240668: -/* 16EF48 80240668 C4400000 */ lwc1 $f0, ($v0) -/* 16EF4C 8024066C 3C014018 */ lui $at, 0x4018 -/* 16EF50 80240670 44811800 */ mtc1 $at, $f3 -/* 16EF54 80240674 44801000 */ mtc1 $zero, $f2 -/* 16EF58 80240678 46000021 */ cvt.d.s $f0, $f0 -/* 16EF5C 8024067C 4620103C */ c.lt.d $f2, $f0 -/* 16EF60 80240680 00000000 */ nop -/* 16EF64 80240684 45000006 */ bc1f .L802406A0 -/* 16EF68 80240688 3C036666 */ lui $v1, 0x6666 -/* 16EF6C 8024068C 3C0140C0 */ lui $at, 0x40c0 -/* 16EF70 80240690 44810000 */ mtc1 $at, $f0 -/* 16EF74 80240694 00000000 */ nop -/* 16EF78 80240698 E4400000 */ swc1 $f0, ($v0) -.L8024069C: -/* 16EF7C 8024069C 3C036666 */ lui $v1, 0x6666 -.L802406A0: -/* 16EF80 802406A0 34636667 */ ori $v1, $v1, 0x6667 -/* 16EF84 802406A4 91620078 */ lbu $v0, 0x78($t3) -/* 16EF88 802406A8 00021600 */ sll $v0, $v0, 0x18 -/* 16EF8C 802406AC 00022603 */ sra $a0, $v0, 0x18 -/* 16EF90 802406B0 00830018 */ mult $a0, $v1 -/* 16EF94 802406B4 0000882D */ daddu $s1, $zero, $zero -/* 16EF98 802406B8 3C12802A */ lui $s2, %hi(D_8029DA40) -/* 16EF9C 802406BC 8E52DA40 */ lw $s2, %lo(D_8029DA40)($s2) -/* 16EFA0 802406C0 3C15802A */ lui $s5, %hi(D_8029DA44) -/* 16EFA4 802406C4 8EB5DA44 */ lw $s5, %lo(D_8029DA44)($s5) -/* 16EFA8 802406C8 000217C3 */ sra $v0, $v0, 0x1f -/* 16EFAC 802406CC 00006010 */ mfhi $t4 -/* 16EFB0 802406D0 000C1883 */ sra $v1, $t4, 2 -/* 16EFB4 802406D4 00621823 */ subu $v1, $v1, $v0 -/* 16EFB8 802406D8 00031600 */ sll $v0, $v1, 0x18 -/* 16EFBC 802406DC 0002B603 */ sra $s6, $v0, 0x18 -/* 16EFC0 802406E0 00031080 */ sll $v0, $v1, 2 -/* 16EFC4 802406E4 00431021 */ addu $v0, $v0, $v1 -/* 16EFC8 802406E8 00021040 */ sll $v0, $v0, 1 -/* 16EFCC 802406EC 00822023 */ subu $a0, $a0, $v0 -/* 16EFD0 802406F0 00042600 */ sll $a0, $a0, 0x18 -/* 16EFD4 802406F4 00042603 */ sra $a0, $a0, 0x18 -/* 16EFD8 802406F8 1AC00039 */ blez $s6, .L802407E0 -/* 16EFDC 802406FC AFA40050 */ sw $a0, 0x50($sp) -/* 16EFE0 80240700 3C1E8008 */ lui $fp, %hi(HES_Item_StarPoint) -/* 16EFE4 80240704 27DE0FF0 */ addiu $fp, $fp, %lo(HES_Item_StarPoint) -/* 16EFE8 80240708 3C178010 */ lui $s7, %hi(HES_StatusSPShine) -/* 16EFEC 8024070C 26F74BEC */ addiu $s7, $s7, %lo(HES_StatusSPShine) -/* 16EFF0 80240710 3C14802A */ lui $s4, %hi(D_8029EFE8) -/* 16EFF4 80240714 2694EFE8 */ addiu $s4, $s4, %lo(D_8029EFE8) -/* 16EFF8 80240718 3C13802A */ lui $s3, %hi(D_8029EFC0) -/* 16EFFC 8024071C 2673EFC0 */ addiu $s3, $s3, %lo(D_8029EFC0) -.L80240720: -/* 16F000 80240720 8E700000 */ lw $s0, ($s3) -/* 16F004 80240724 0C05122C */ jal hud_element_get_script -/* 16F008 80240728 0200202D */ daddu $a0, $s0, $zero -/* 16F00C 8024072C 105E0004 */ beq $v0, $fp, .L80240740 -/* 16F010 80240730 0200202D */ daddu $a0, $s0, $zero -/* 16F014 80240734 0C0511FF */ jal hud_element_set_script -/* 16F018 80240738 03C0282D */ daddu $a1, $fp, $zero -/* 16F01C 8024073C 0200202D */ daddu $a0, $s0, $zero -.L80240740: -/* 16F020 80240740 0C05128B */ jal hud_element_clear_flags -/* 16F024 80240744 24050002 */ addiu $a1, $zero, 2 -/* 16F028 80240748 0200202D */ daddu $a0, $s0, $zero -/* 16F02C 8024074C 0240282D */ daddu $a1, $s2, $zero -/* 16F030 80240750 0C051261 */ jal hud_element_set_render_pos -/* 16F034 80240754 02A0302D */ daddu $a2, $s5, $zero -/* 16F038 80240758 0C0511EA */ jal hud_element_draw_clipped -/* 16F03C 8024075C 0200202D */ daddu $a0, $s0, $zero -/* 16F040 80240760 8E900000 */ lw $s0, ($s4) -/* 16F044 80240764 0C05122C */ jal hud_element_get_script -/* 16F048 80240768 0200202D */ daddu $a0, $s0, $zero -/* 16F04C 8024076C 10570004 */ beq $v0, $s7, .L80240780 -/* 16F050 80240770 0200202D */ daddu $a0, $s0, $zero -/* 16F054 80240774 0C0511FF */ jal hud_element_set_script -/* 16F058 80240778 02E0282D */ daddu $a1, $s7, $zero -/* 16F05C 8024077C 0200202D */ daddu $a0, $s0, $zero -.L80240780: -/* 16F060 80240780 0C05128B */ jal hud_element_clear_flags -/* 16F064 80240784 24050002 */ addiu $a1, $zero, 2 -/* 16F068 80240788 0200202D */ daddu $a0, $s0, $zero -/* 16F06C 8024078C 0240282D */ daddu $a1, $s2, $zero -/* 16F070 80240790 0C051261 */ jal hud_element_set_render_pos -/* 16F074 80240794 26A6FFFB */ addiu $a2, $s5, -5 -/* 16F078 80240798 0C0511EA */ jal hud_element_draw_clipped -/* 16F07C 8024079C 0200202D */ daddu $a0, $s0, $zero -/* 16F080 802407A0 3C0141A0 */ lui $at, 0x41a0 -/* 16F084 802407A4 44810000 */ mtc1 $at, $f0 -/* 16F088 802407A8 00000000 */ nop -/* 16F08C 802407AC 4600B002 */ mul.s $f0, $f22, $f0 -/* 16F090 802407B0 00000000 */ nop -/* 16F094 802407B4 26940004 */ addiu $s4, $s4, 4 -/* 16F098 802407B8 44921000 */ mtc1 $s2, $f2 -/* 16F09C 802407BC 00000000 */ nop -/* 16F0A0 802407C0 468010A0 */ cvt.s.w $f2, $f2 -/* 16F0A4 802407C4 46001081 */ sub.s $f2, $f2, $f0 -/* 16F0A8 802407C8 26310001 */ addiu $s1, $s1, 1 -/* 16F0AC 802407CC 0236102A */ slt $v0, $s1, $s6 -/* 16F0B0 802407D0 4600118D */ trunc.w.s $f6, $f2 -/* 16F0B4 802407D4 44123000 */ mfc1 $s2, $f6 -/* 16F0B8 802407D8 1440FFD1 */ bnez $v0, .L80240720 -/* 16F0BC 802407DC 26730004 */ addiu $s3, $s3, 4 -.L802407E0: -/* 16F0C0 802407E0 2A22000A */ slti $v0, $s1, 0xa -/* 16F0C4 802407E4 10400013 */ beqz $v0, .L80240834 -/* 16F0C8 802407E8 00111880 */ sll $v1, $s1, 2 -/* 16F0CC 802407EC 3C02802A */ lui $v0, %hi(D_8029EFE8) -/* 16F0D0 802407F0 2442EFE8 */ addiu $v0, $v0, %lo(D_8029EFE8) -/* 16F0D4 802407F4 00629021 */ addu $s2, $v1, $v0 -/* 16F0D8 802407F8 3C02802A */ lui $v0, %hi(D_8029EFC0) -/* 16F0DC 802407FC 2442EFC0 */ addiu $v0, $v0, %lo(D_8029EFC0) -/* 16F0E0 80240800 00628021 */ addu $s0, $v1, $v0 -/* 16F0E4 80240804 24050002 */ addiu $a1, $zero, 2 -.L80240808: -/* 16F0E8 80240808 8E040000 */ lw $a0, ($s0) -/* 16F0EC 8024080C 26100004 */ addiu $s0, $s0, 4 -/* 16F0F0 80240810 0C051280 */ jal hud_element_set_flags -/* 16F0F4 80240814 26310001 */ addiu $s1, $s1, 1 -/* 16F0F8 80240818 24050002 */ addiu $a1, $zero, 2 -/* 16F0FC 8024081C 8E440000 */ lw $a0, ($s2) -/* 16F100 80240820 0C051280 */ jal hud_element_set_flags -/* 16F104 80240824 26520004 */ addiu $s2, $s2, 4 -/* 16F108 80240828 2A22000A */ slti $v0, $s1, 0xa -/* 16F10C 8024082C 1440FFF6 */ bnez $v0, .L80240808 -/* 16F110 80240830 24050002 */ addiu $a1, $zero, 2 -.L80240834: -/* 16F114 80240834 3C014160 */ lui $at, 0x4160 -/* 16F118 80240838 44810000 */ mtc1 $at, $f0 -/* 16F11C 8024083C 00000000 */ nop -/* 16F120 80240840 4600B002 */ mul.s $f0, $f22, $f0 -/* 16F124 80240844 00000000 */ nop -/* 16F128 80240848 3C01802A */ lui $at, %hi(D_8029DA44) -/* 16F12C 8024084C C422DA44 */ lwc1 $f2, %lo(D_8029DA44)($at) -/* 16F130 80240850 468010A0 */ cvt.s.w $f2, $f2 -/* 16F134 80240854 3C02800E */ lui $v0, %hi(gBattleStatus+0x4) -/* 16F138 80240858 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) -/* 16F13C 8024085C 46001080 */ add.s $f2, $f2, $f0 -/* 16F140 80240860 3C12802A */ lui $s2, %hi(D_8029DA40) -/* 16F144 80240864 8E52DA40 */ lw $s2, %lo(D_8029DA40)($s2) -/* 16F148 80240868 30420001 */ andi $v0, $v0, 1 -/* 16F14C 8024086C 4600118D */ trunc.w.s $f6, $f2 -/* 16F150 80240870 44153000 */ mfc1 $s5, $f6 -/* 16F154 80240874 1040001D */ beqz $v0, .L802408EC -/* 16F158 80240878 00000000 */ nop -/* 16F15C 8024087C 8FAC0050 */ lw $t4, 0x50($sp) -/* 16F160 80240880 1180001B */ beqz $t4, .L802408F0 -/* 16F164 80240884 0000202D */ daddu $a0, $zero, $zero -/* 16F168 80240888 24050004 */ addiu $a1, $zero, 4 -/* 16F16C 8024088C 2646FF9C */ addiu $a2, $s2, -0x64 -/* 16F170 80240890 2402006E */ addiu $v0, $zero, 0x6e -/* 16F174 80240894 AFA20014 */ sw $v0, 0x14($sp) -/* 16F178 80240898 2402000C */ addiu $v0, $zero, 0xc -/* 16F17C 8024089C AFA20018 */ sw $v0, 0x18($sp) -/* 16F180 802408A0 24020078 */ addiu $v0, $zero, 0x78 -/* 16F184 802408A4 AFA2001C */ sw $v0, 0x1c($sp) -/* 16F188 802408A8 24020140 */ addiu $v0, $zero, 0x140 -/* 16F18C 802408AC AFA20044 */ sw $v0, 0x44($sp) -/* 16F190 802408B0 240200F0 */ addiu $v0, $zero, 0xf0 -/* 16F194 802408B4 26A7FFFB */ addiu $a3, $s5, -5 -/* 16F198 802408B8 AFA00010 */ sw $zero, 0x10($sp) -/* 16F19C 802408BC AFA00020 */ sw $zero, 0x20($sp) -/* 16F1A0 802408C0 AFA00024 */ sw $zero, 0x24($sp) -/* 16F1A4 802408C4 AFA00028 */ sw $zero, 0x28($sp) -/* 16F1A8 802408C8 AFA0002C */ sw $zero, 0x2c($sp) -/* 16F1AC 802408CC AFA00030 */ sw $zero, 0x30($sp) -/* 16F1B0 802408D0 AFA00034 */ sw $zero, 0x34($sp) -/* 16F1B4 802408D4 AFA00038 */ sw $zero, 0x38($sp) -/* 16F1B8 802408D8 AFA0003C */ sw $zero, 0x3c($sp) -/* 16F1BC 802408DC AFA00040 */ sw $zero, 0x40($sp) -/* 16F1C0 802408E0 AFA20048 */ sw $v0, 0x48($sp) -/* 16F1C4 802408E4 0C03D4B8 */ jal draw_box -/* 16F1C8 802408E8 AFA0004C */ sw $zero, 0x4c($sp) -.L802408EC: -/* 16F1CC 802408EC 8FAC0050 */ lw $t4, 0x50($sp) -.L802408F0: -/* 16F1D0 802408F0 19800024 */ blez $t4, .L80240984 -/* 16F1D4 802408F4 0000882D */ daddu $s1, $zero, $zero -/* 16F1D8 802408F8 3C148008 */ lui $s4, %hi(HES_Item_SmallStarPoint) -/* 16F1DC 802408FC 269410C8 */ addiu $s4, $s4, %lo(HES_Item_SmallStarPoint) -/* 16F1E0 80240900 3C014120 */ lui $at, 0x4120 -/* 16F1E4 80240904 4481A000 */ mtc1 $at, $f20 -/* 16F1E8 80240908 3C13802A */ lui $s3, %hi(D_8029F010) -/* 16F1EC 8024090C 2673F010 */ addiu $s3, $s3, %lo(D_8029F010) -.L80240910: -/* 16F1F0 80240910 8E700000 */ lw $s0, ($s3) -/* 16F1F4 80240914 0C05122C */ jal hud_element_get_script -/* 16F1F8 80240918 0200202D */ daddu $a0, $s0, $zero -/* 16F1FC 8024091C 10540004 */ beq $v0, $s4, .L80240930 -/* 16F200 80240920 0200202D */ daddu $a0, $s0, $zero -/* 16F204 80240924 0C0511FF */ jal hud_element_set_script -/* 16F208 80240928 0280282D */ daddu $a1, $s4, $zero -/* 16F20C 8024092C 0200202D */ daddu $a0, $s0, $zero -.L80240930: -/* 16F210 80240930 0C05128B */ jal hud_element_clear_flags -/* 16F214 80240934 24050002 */ addiu $a1, $zero, 2 -/* 16F218 80240938 0200202D */ daddu $a0, $s0, $zero -/* 16F21C 8024093C 0240282D */ daddu $a1, $s2, $zero -/* 16F220 80240940 0C051261 */ jal hud_element_set_render_pos -/* 16F224 80240944 02A0302D */ daddu $a2, $s5, $zero -/* 16F228 80240948 0C0511EA */ jal hud_element_draw_clipped -/* 16F22C 8024094C 0200202D */ daddu $a0, $s0, $zero -/* 16F230 80240950 4614B082 */ mul.s $f2, $f22, $f20 -/* 16F234 80240954 00000000 */ nop -/* 16F238 80240958 44920000 */ mtc1 $s2, $f0 -/* 16F23C 8024095C 00000000 */ nop -/* 16F240 80240960 46800020 */ cvt.s.w $f0, $f0 -/* 16F244 80240964 46020001 */ sub.s $f0, $f0, $f2 -/* 16F248 80240968 4600018D */ trunc.w.s $f6, $f0 -/* 16F24C 8024096C 44123000 */ mfc1 $s2, $f6 -/* 16F250 80240970 8FAC0050 */ lw $t4, 0x50($sp) -/* 16F254 80240974 26310001 */ addiu $s1, $s1, 1 -/* 16F258 80240978 022C102A */ slt $v0, $s1, $t4 -/* 16F25C 8024097C 1440FFE4 */ bnez $v0, .L80240910 -/* 16F260 80240980 26730004 */ addiu $s3, $s3, 4 -.L80240984: -/* 16F264 80240984 2A22000A */ slti $v0, $s1, 0xa -/* 16F268 80240988 1040000C */ beqz $v0, .L802409BC -/* 16F26C 8024098C 00111080 */ sll $v0, $s1, 2 -/* 16F270 80240990 3C03802A */ lui $v1, %hi(D_8029F010) -/* 16F274 80240994 2463F010 */ addiu $v1, $v1, %lo(D_8029F010) -/* 16F278 80240998 00438021 */ addu $s0, $v0, $v1 -.L8024099C: -/* 16F27C 8024099C 8E040000 */ lw $a0, ($s0) -/* 16F280 802409A0 24050002 */ addiu $a1, $zero, 2 -/* 16F284 802409A4 26100004 */ addiu $s0, $s0, 4 -/* 16F288 802409A8 0C051280 */ jal hud_element_set_flags -/* 16F28C 802409AC 26310001 */ addiu $s1, $s1, 1 -/* 16F290 802409B0 2A22000A */ slti $v0, $s1, 0xa -/* 16F294 802409B4 1440FFF9 */ bnez $v0, .L8024099C -/* 16F298 802409B8 00000000 */ nop -.L802409BC: -/* 16F29C 802409BC 8FBF007C */ lw $ra, 0x7c($sp) -/* 16F2A0 802409C0 8FBE0078 */ lw $fp, 0x78($sp) -/* 16F2A4 802409C4 8FB70074 */ lw $s7, 0x74($sp) -/* 16F2A8 802409C8 8FB60070 */ lw $s6, 0x70($sp) -/* 16F2AC 802409CC 8FB5006C */ lw $s5, 0x6c($sp) -/* 16F2B0 802409D0 8FB40068 */ lw $s4, 0x68($sp) -/* 16F2B4 802409D4 8FB30064 */ lw $s3, 0x64($sp) -/* 16F2B8 802409D8 8FB20060 */ lw $s2, 0x60($sp) -/* 16F2BC 802409DC 8FB1005C */ lw $s1, 0x5c($sp) -/* 16F2C0 802409E0 8FB00058 */ lw $s0, 0x58($sp) -/* 16F2C4 802409E4 D7B60088 */ ldc1 $f22, 0x88($sp) -/* 16F2C8 802409E8 D7B40080 */ ldc1 $f20, 0x80($sp) -/* 16F2CC 802409EC 03E00008 */ jr $ra -/* 16F2D0 802409F0 27BD0090 */ addiu $sp, $sp, 0x90 diff --git a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800EFE2C.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800EFE2C.s deleted file mode 100644 index 9aa00333ec..0000000000 --- a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800EFE2C.s +++ /dev/null @@ -1,280 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800EFE2C -/* 892DC 800EFE2C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 892E0 800EFE30 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 892E4 800EFE34 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 892E8 800EFE38 AFB00030 */ sw $s0, 0x30($sp) -/* 892EC 800EFE3C 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 892F0 800EFE40 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 892F4 800EFE44 AFBF0034 */ sw $ra, 0x34($sp) -/* 892F8 800EFE48 84620086 */ lh $v0, 0x86($v1) -/* 892FC 800EFE4C 24080005 */ addiu $t0, $zero, 5 -/* 89300 800EFE50 14480004 */ bne $v0, $t0, .L800EFE64 -/* 89304 800EFE54 0000282D */ daddu $a1, $zero, $zero -/* 89308 800EFE58 8462008C */ lh $v0, 0x8c($v1) -/* 8930C 800EFE5C 38420002 */ xori $v0, $v0, 2 -/* 89310 800EFE60 2C450001 */ sltiu $a1, $v0, 1 -.L800EFE64: -/* 89314 800EFE64 820300B4 */ lb $v1, 0xb4($s0) -/* 89318 800EFE68 2402000A */ addiu $v0, $zero, 0xa -/* 8931C 800EFE6C 14620020 */ bne $v1, $v0, .L800EFEF0 -/* 89320 800EFE70 2402000E */ addiu $v0, $zero, 0xe -/* 89324 800EFE74 8E020000 */ lw $v0, ($s0) -/* 89328 800EFE78 0441001D */ bgez $v0, .L800EFEF0 -/* 8932C 800EFE7C 2402000E */ addiu $v0, $zero, 0xe -/* 89330 800EFE80 3C028011 */ lui $v0, %hi(D_8010CFF4) -/* 89334 800EFE84 8C42CFF4 */ lw $v0, %lo(D_8010CFF4)($v0) -/* 89338 800EFE88 2842000A */ slti $v0, $v0, 0xa -/* 8933C 800EFE8C 14400018 */ bnez $v0, .L800EFEF0 -/* 89340 800EFE90 2402000E */ addiu $v0, $zero, 0xe -/* 89344 800EFE94 C6040028 */ lwc1 $f4, 0x28($s0) -/* 89348 800EFE98 C602002C */ lwc1 $f2, 0x2c($s0) -/* 8934C 800EFE9C 44800000 */ mtc1 $zero, $f0 -/* 89350 800EFEA0 C6060030 */ lwc1 $f6, 0x30($s0) -/* 89354 800EFEA4 10A00020 */ beqz $a1, .L800EFF28 -/* 89358 800EFEA8 46001080 */ add.s $f2, $f2, $f0 -/* 8935C 800EFEAC 24040003 */ addiu $a0, $zero, 3 -/* 89360 800EFEB0 44052000 */ mfc1 $a1, $f4 -/* 89364 800EFEB4 44061000 */ mfc1 $a2, $f2 -/* 89368 800EFEB8 44073000 */ mfc1 $a3, $f6 -/* 8936C 800EFEBC 3C014150 */ lui $at, 0x4150 -/* 89370 800EFEC0 44810000 */ mtc1 $at, $f0 -/* 89374 800EFEC4 3C014120 */ lui $at, 0x4120 -/* 89378 800EFEC8 44811000 */ mtc1 $at, $f2 -/* 8937C 800EFECC 3C013F80 */ lui $at, 0x3f80 -/* 89380 800EFED0 44812000 */ mtc1 $at, $f4 -/* 89384 800EFED4 2402001E */ addiu $v0, $zero, 0x1e -/* 89388 800EFED8 AFA8001C */ sw $t0, 0x1c($sp) -/* 8938C 800EFEDC AFA20020 */ sw $v0, 0x20($sp) -/* 89390 800EFEE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 89394 800EFEE4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 89398 800EFEE8 0803C08C */ j .L800F0230 -/* 8939C 800EFEEC E7A40018 */ swc1 $f4, 0x18($sp) -.L800EFEF0: -/* 893A0 800EFEF0 10620003 */ beq $v1, $v0, .L800EFF00 -/* 893A4 800EFEF4 24020010 */ addiu $v0, $zero, 0x10 -/* 893A8 800EFEF8 14620029 */ bne $v1, $v0, .L800EFFA0 -/* 893AC 800EFEFC 00000000 */ nop -.L800EFF00: -/* 893B0 800EFF00 8E020000 */ lw $v0, ($s0) -/* 893B4 800EFF04 30420400 */ andi $v0, $v0, 0x400 -/* 893B8 800EFF08 10400025 */ beqz $v0, .L800EFFA0 -/* 893BC 800EFF0C 00000000 */ nop -/* 893C0 800EFF10 C6040028 */ lwc1 $f4, 0x28($s0) -/* 893C4 800EFF14 C602002C */ lwc1 $f2, 0x2c($s0) -/* 893C8 800EFF18 44800000 */ mtc1 $zero, $f0 -/* 893CC 800EFF1C C6060030 */ lwc1 $f6, 0x30($s0) -/* 893D0 800EFF20 14A0000B */ bnez $a1, .L800EFF50 -/* 893D4 800EFF24 46001080 */ add.s $f2, $f2, $f0 -.L800EFF28: -/* 893D8 800EFF28 44052000 */ mfc1 $a1, $f4 -/* 893DC 800EFF2C 44061000 */ mfc1 $a2, $f2 -/* 893E0 800EFF30 44073000 */ mfc1 $a3, $f6 -/* 893E4 800EFF34 3C018011 */ lui $at, %hi(D_80109484) -/* 893E8 800EFF38 C4209484 */ lwc1 $f0, %lo(D_80109484)($at) -/* 893EC 800EFF3C 0000202D */ daddu $a0, $zero, $zero -/* 893F0 800EFF40 0C01BEB4 */ jal fx_landing_dust -/* 893F4 800EFF44 E7A00010 */ swc1 $f0, 0x10($sp) -/* 893F8 800EFF48 0803C08E */ j .L800F0238 -/* 893FC 800EFF4C 00000000 */ nop -.L800EFF50: -/* 89400 800EFF50 24040003 */ addiu $a0, $zero, 3 -/* 89404 800EFF54 44052000 */ mfc1 $a1, $f4 -/* 89408 800EFF58 44061000 */ mfc1 $a2, $f2 -/* 8940C 800EFF5C 44073000 */ mfc1 $a3, $f6 -/* 89410 800EFF60 24020005 */ addiu $v0, $zero, 5 -/* 89414 800EFF64 AFA2001C */ sw $v0, 0x1c($sp) -/* 89418 800EFF68 24020028 */ addiu $v0, $zero, 0x28 -/* 8941C 800EFF6C AFA20020 */ sw $v0, 0x20($sp) -/* 89420 800EFF70 860200B2 */ lh $v0, 0xb2($s0) -/* 89424 800EFF74 3C014120 */ lui $at, 0x4120 -/* 89428 800EFF78 44811000 */ mtc1 $at, $f2 -/* 8942C 800EFF7C 3C013F80 */ lui $at, 0x3f80 -/* 89430 800EFF80 44812000 */ mtc1 $at, $f4 -/* 89434 800EFF84 44820000 */ mtc1 $v0, $f0 -/* 89438 800EFF88 00000000 */ nop -/* 8943C 800EFF8C 46800020 */ cvt.s.w $f0, $f0 -/* 89440 800EFF90 E7A00010 */ swc1 $f0, 0x10($sp) -/* 89444 800EFF94 E7A20014 */ swc1 $f2, 0x14($sp) -/* 89448 800EFF98 0803C08C */ j .L800F0230 -/* 8944C 800EFF9C E7A40018 */ swc1 $f4, 0x18($sp) -.L800EFFA0: -/* 89450 800EFFA0 820300B4 */ lb $v1, 0xb4($s0) -/* 89454 800EFFA4 2402001A */ addiu $v0, $zero, 0x1a -/* 89458 800EFFA8 14620029 */ bne $v1, $v0, .L800F0050 -/* 8945C 800EFFAC 24020002 */ addiu $v0, $zero, 2 -/* 89460 800EFFB0 C6020054 */ lwc1 $f2, 0x54($s0) -/* 89464 800EFFB4 44800000 */ mtc1 $zero, $f0 -/* 89468 800EFFB8 00000000 */ nop -/* 8946C 800EFFBC 46001032 */ c.eq.s $f2, $f0 -/* 89470 800EFFC0 00000000 */ nop -/* 89474 800EFFC4 45010022 */ bc1t .L800F0050 -/* 89478 800EFFC8 00000000 */ nop -/* 8947C 800EFFCC 3C048011 */ lui $a0, %hi(D_80109488) -/* 89480 800EFFD0 24849488 */ addiu $a0, $a0, %lo(D_80109488) -/* 89484 800EFFD4 94820000 */ lhu $v0, ($a0) -/* 89488 800EFFD8 24430001 */ addiu $v1, $v0, 1 -/* 8948C 800EFFDC 00021400 */ sll $v0, $v0, 0x10 -/* 89490 800EFFE0 00021403 */ sra $v0, $v0, 0x10 -/* 89494 800EFFE4 28420004 */ slti $v0, $v0, 4 -/* 89498 800EFFE8 14400093 */ bnez $v0, .L800F0238 -/* 8949C 800EFFEC A4830000 */ sh $v1, ($a0) -/* 894A0 800EFFF0 24020002 */ addiu $v0, $zero, 2 -/* 894A4 800EFFF4 10A0002C */ beqz $a1, .L800F00A8 -/* 894A8 800EFFF8 A4820000 */ sh $v0, ($a0) -/* 894AC 800EFFFC C60C0080 */ lwc1 $f12, 0x80($s0) -/* 894B0 800F0000 0C00A6C9 */ jal clamp_angle -/* 894B4 800F0004 00000000 */ nop -/* 894B8 800F0008 3C0140C9 */ lui $at, 0x40c9 -/* 894BC 800F000C 34210FD0 */ ori $at, $at, 0xfd0 -/* 894C0 800F0010 44811000 */ mtc1 $at, $f2 -/* 894C4 800F0014 00000000 */ nop -/* 894C8 800F0018 46020002 */ mul.s $f0, $f0, $f2 -/* 894CC 800F001C 00000000 */ nop -/* 894D0 800F0020 27A50028 */ addiu $a1, $sp, 0x28 -/* 894D4 800F0024 3C0143B4 */ lui $at, 0x43b4 -/* 894D8 800F0028 44816000 */ mtc1 $at, $f12 -/* 894DC 800F002C 27A6002C */ addiu $a2, $sp, 0x2c -/* 894E0 800F0030 0C00A82D */ jal sin_cos_rad -/* 894E4 800F0034 460C0303 */ div.s $f12, $f0, $f12 -/* 894E8 800F0038 860200B2 */ lh $v0, 0xb2($s0) -/* 894EC 800F003C C7A40028 */ lwc1 $f4, 0x28($sp) -/* 894F0 800F0040 44823000 */ mtc1 $v0, $f6 -/* 894F4 800F0044 00000000 */ nop -/* 894F8 800F0048 0803C06D */ j .L800F01B4 -/* 894FC 800F004C 468031A0 */ cvt.s.w $f6, $f6 -.L800F0050: -/* 89500 800F0050 1062000A */ beq $v1, $v0, .L800F007C -/* 89504 800F0054 3C02FF00 */ lui $v0, 0xff00 -/* 89508 800F0058 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8950C 800F005C 3442FF00 */ ori $v0, $v0, 0xff00 -/* 89510 800F0060 00621824 */ and $v1, $v1, $v0 -/* 89514 800F0064 3C021A00 */ lui $v0, 0x1a00 -/* 89518 800F0068 10620004 */ beq $v1, $v0, .L800F007C -/* 8951C 800F006C 24020004 */ addiu $v0, $zero, 4 -/* 89520 800F0070 3C018011 */ lui $at, %hi(D_80109488) -/* 89524 800F0074 0803C08E */ j .L800F0238 -/* 89528 800F0078 A4229488 */ sh $v0, %lo(D_80109488)($at) -.L800F007C: -/* 8952C 800F007C 3C048011 */ lui $a0, %hi(D_80109488) -/* 89530 800F0080 24849488 */ addiu $a0, $a0, %lo(D_80109488) -/* 89534 800F0084 94820000 */ lhu $v0, ($a0) -/* 89538 800F0088 24430001 */ addiu $v1, $v0, 1 -/* 8953C 800F008C 00021400 */ sll $v0, $v0, 0x10 -/* 89540 800F0090 00021403 */ sra $v0, $v0, 0x10 -/* 89544 800F0094 28420004 */ slti $v0, $v0, 4 -/* 89548 800F0098 14400067 */ bnez $v0, .L800F0238 -/* 8954C 800F009C A4830000 */ sh $v1, ($a0) -/* 89550 800F00A0 14A00034 */ bnez $a1, .L800F0174 -/* 89554 800F00A4 A4800000 */ sh $zero, ($a0) -.L800F00A8: -/* 89558 800F00A8 C60C0084 */ lwc1 $f12, 0x84($s0) -/* 8955C 800F00AC 0C00A6C9 */ jal clamp_angle -/* 89560 800F00B0 46006307 */ neg.s $f12, $f12 -/* 89564 800F00B4 3C0140C9 */ lui $at, 0x40c9 -/* 89568 800F00B8 34210FD0 */ ori $at, $at, 0xfd0 -/* 8956C 800F00BC 44811000 */ mtc1 $at, $f2 -/* 89570 800F00C0 00000000 */ nop -/* 89574 800F00C4 46020002 */ mul.s $f0, $f0, $f2 -/* 89578 800F00C8 00000000 */ nop -/* 8957C 800F00CC 27A50028 */ addiu $a1, $sp, 0x28 -/* 89580 800F00D0 3C0143B4 */ lui $at, 0x43b4 -/* 89584 800F00D4 44816000 */ mtc1 $at, $f12 -/* 89588 800F00D8 27A6002C */ addiu $a2, $sp, 0x2c -/* 8958C 800F00DC 0C00A82D */ jal sin_cos_rad -/* 89590 800F00E0 460C0303 */ div.s $f12, $f0, $f12 -/* 89594 800F00E4 860200B2 */ lh $v0, 0xb2($s0) -/* 89598 800F00E8 C7AA0028 */ lwc1 $f10, 0x28($sp) -/* 8959C 800F00EC 44821000 */ mtc1 $v0, $f2 -/* 895A0 800F00F0 00000000 */ nop -/* 895A4 800F00F4 468010A0 */ cvt.s.w $f2, $f2 -/* 895A8 800F00F8 460A1182 */ mul.s $f6, $f2, $f10 -/* 895AC 800F00FC 00000000 */ nop -/* 895B0 800F0100 C7A8002C */ lwc1 $f8, 0x2c($sp) -/* 895B4 800F0104 46081082 */ mul.s $f2, $f2, $f8 -/* 895B8 800F0108 00000000 */ nop -/* 895BC 800F010C 3C013E4C */ lui $at, 0x3e4c -/* 895C0 800F0110 3421CCCD */ ori $at, $at, 0xcccd -/* 895C4 800F0114 44810000 */ mtc1 $at, $f0 -/* 895C8 800F0118 00000000 */ nop -/* 895CC 800F011C 46003182 */ mul.s $f6, $f6, $f0 -/* 895D0 800F0120 00000000 */ nop -/* 895D4 800F0124 46001082 */ mul.s $f2, $f2, $f0 -/* 895D8 800F0128 00000000 */ nop -/* 895DC 800F012C C604002C */ lwc1 $f4, 0x2c($s0) -/* 895E0 800F0130 3C013FC0 */ lui $at, 0x3fc0 -/* 895E4 800F0134 44810000 */ mtc1 $at, $f0 -/* 895E8 800F0138 00000000 */ nop -/* 895EC 800F013C 46002100 */ add.s $f4, $f4, $f0 -/* 895F0 800F0140 C6000028 */ lwc1 $f0, 0x28($s0) -/* 895F4 800F0144 46060000 */ add.s $f0, $f0, $f6 -/* 895F8 800F0148 44050000 */ mfc1 $a1, $f0 -/* 895FC 800F014C C6000030 */ lwc1 $f0, 0x30($s0) -/* 89600 800F0150 46020000 */ add.s $f0, $f0, $f2 -/* 89604 800F0154 44062000 */ mfc1 $a2, $f4 -/* 89608 800F0158 44070000 */ mfc1 $a3, $f0 -/* 8960C 800F015C 0000202D */ daddu $a0, $zero, $zero -/* 89610 800F0160 E7AA0010 */ swc1 $f10, 0x10($sp) -/* 89614 800F0164 0C01BECC */ jal fx_walking_dust -/* 89618 800F0168 E7A80014 */ swc1 $f8, 0x14($sp) -/* 8961C 800F016C 0803C08E */ j .L800F0238 -/* 89620 800F0170 00000000 */ nop -.L800F0174: -/* 89624 800F0174 0C00A6C9 */ jal clamp_angle -/* 89628 800F0178 C60C0080 */ lwc1 $f12, 0x80($s0) -/* 8962C 800F017C 3C0140C9 */ lui $at, 0x40c9 -/* 89630 800F0180 34210FD0 */ ori $at, $at, 0xfd0 -/* 89634 800F0184 44811000 */ mtc1 $at, $f2 -/* 89638 800F0188 00000000 */ nop -/* 8963C 800F018C 46020002 */ mul.s $f0, $f0, $f2 -/* 89640 800F0190 00000000 */ nop -/* 89644 800F0194 27A50028 */ addiu $a1, $sp, 0x28 -/* 89648 800F0198 3C0143B4 */ lui $at, 0x43b4 -/* 8964C 800F019C 44816000 */ mtc1 $at, $f12 -/* 89650 800F01A0 27A6002C */ addiu $a2, $sp, 0x2c -/* 89654 800F01A4 0C00A82D */ jal sin_cos_rad -/* 89658 800F01A8 460C0303 */ div.s $f12, $f0, $f12 -/* 8965C 800F01AC C6060054 */ lwc1 $f6, 0x54($s0) -/* 89660 800F01B0 C7A40028 */ lwc1 $f4, 0x28($sp) -.L800F01B4: -/* 89664 800F01B4 46043102 */ mul.s $f4, $f6, $f4 -/* 89668 800F01B8 00000000 */ nop -/* 8966C 800F01BC C602002C */ lwc1 $f2, 0x2c($s0) -/* 89670 800F01C0 3C013FC0 */ lui $at, 0x3fc0 -/* 89674 800F01C4 44810000 */ mtc1 $at, $f0 -/* 89678 800F01C8 00000000 */ nop -/* 8967C 800F01CC 46001080 */ add.s $f2, $f2, $f0 -/* 89680 800F01D0 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 89684 800F01D4 24020005 */ addiu $v0, $zero, 5 -/* 89688 800F01D8 AFA2001C */ sw $v0, 0x1c($sp) -/* 8968C 800F01DC 46003182 */ mul.s $f6, $f6, $f0 -/* 89690 800F01E0 00000000 */ nop -/* 89694 800F01E4 3C014150 */ lui $at, 0x4150 -/* 89698 800F01E8 44810000 */ mtc1 $at, $f0 -/* 8969C 800F01EC 44061000 */ mfc1 $a2, $f2 -/* 896A0 800F01F0 C6020028 */ lwc1 $f2, 0x28($s0) -/* 896A4 800F01F4 2402001E */ addiu $v0, $zero, 0x1e -/* 896A8 800F01F8 AFA20020 */ sw $v0, 0x20($sp) -/* 896AC 800F01FC E7A00010 */ swc1 $f0, 0x10($sp) -/* 896B0 800F0200 46041080 */ add.s $f2, $f2, $f4 -/* 896B4 800F0204 C6000030 */ lwc1 $f0, 0x30($s0) -/* 896B8 800F0208 3C013F80 */ lui $at, 0x3f80 -/* 896BC 800F020C 44812000 */ mtc1 $at, $f4 -/* 896C0 800F0210 46060000 */ add.s $f0, $f0, $f6 -/* 896C4 800F0214 44051000 */ mfc1 $a1, $f2 -/* 896C8 800F0218 3C014120 */ lui $at, 0x4120 -/* 896CC 800F021C 44811000 */ mtc1 $at, $f2 -/* 896D0 800F0220 44070000 */ mfc1 $a3, $f0 -/* 896D4 800F0224 24040003 */ addiu $a0, $zero, 3 -/* 896D8 800F0228 E7A40018 */ swc1 $f4, 0x18($sp) -/* 896DC 800F022C E7A20014 */ swc1 $f2, 0x14($sp) -.L800F0230: -/* 896E0 800F0230 0C01C8D4 */ jal fx_misc_particles -/* 896E4 800F0234 00000000 */ nop -.L800F0238: -/* 896E8 800F0238 8FBF0034 */ lw $ra, 0x34($sp) -/* 896EC 800F023C 8FB00030 */ lw $s0, 0x30($sp) -/* 896F0 800F0240 03E00008 */ jr $ra -/* 896F4 800F0244 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0490.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0490.s deleted file mode 100644 index 57d9ad0026..0000000000 --- a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0490.s +++ /dev/null @@ -1,256 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800F0490 -/* 89940 800F0490 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 89944 800F0494 3C028011 */ lui $v0, %hi(D_801094A0) -/* 89948 800F0498 244294A0 */ addiu $v0, $v0, %lo(D_801094A0) -/* 8994C 800F049C AFBF0028 */ sw $ra, 0x28($sp) -/* 89950 800F04A0 AFB30024 */ sw $s3, 0x24($sp) -/* 89954 800F04A4 AFB20020 */ sw $s2, 0x20($sp) -/* 89958 800F04A8 AFB1001C */ sw $s1, 0x1c($sp) -/* 8995C 800F04AC AFB00018 */ sw $s0, 0x18($sp) -/* 89960 800F04B0 F7BA0048 */ sdc1 $f26, 0x48($sp) -/* 89964 800F04B4 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 89968 800F04B8 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 8996C 800F04BC F7B40030 */ sdc1 $f20, 0x30($sp) -/* 89970 800F04C0 C4400000 */ lwc1 $f0, ($v0) -/* 89974 800F04C4 3C013DCC */ lui $at, 0x3dcc -/* 89978 800F04C8 3421CCCD */ ori $at, $at, 0xcccd -/* 8997C 800F04CC 44811000 */ mtc1 $at, $f2 -/* 89980 800F04D0 00000000 */ nop -/* 89984 800F04D4 46020000 */ add.s $f0, $f0, $f2 -/* 89988 800F04D8 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 8998C 800F04DC 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 89990 800F04E0 E4400000 */ swc1 $f0, ($v0) -/* 89994 800F04E4 822300B4 */ lb $v1, 0xb4($s1) -/* 89998 800F04E8 2402000A */ addiu $v0, $zero, 0xa -/* 8999C 800F04EC 14620004 */ bne $v1, $v0, .L800F0500 -/* 899A0 800F04F0 2402000E */ addiu $v0, $zero, 0xe -/* 899A4 800F04F4 8E220000 */ lw $v0, ($s1) -/* 899A8 800F04F8 04400009 */ bltz $v0, .L800F0520 -/* 899AC 800F04FC 2402000E */ addiu $v0, $zero, 0xe -.L800F0500: -/* 899B0 800F0500 10620003 */ beq $v1, $v0, .L800F0510 -/* 899B4 800F0504 24020010 */ addiu $v0, $zero, 0x10 -/* 899B8 800F0508 14620073 */ bne $v1, $v0, .L800F06D8 -/* 899BC 800F050C 00000000 */ nop -.L800F0510: -/* 899C0 800F0510 8E220000 */ lw $v0, ($s1) -/* 899C4 800F0514 30420400 */ andi $v0, $v0, 0x400 -/* 899C8 800F0518 1040006F */ beqz $v0, .L800F06D8 -/* 899CC 800F051C 00000000 */ nop -.L800F0520: -/* 899D0 800F0520 3C028011 */ lui $v0, %hi(D_8010CFF4) -/* 899D4 800F0524 8C42CFF4 */ lw $v0, %lo(D_8010CFF4)($v0) -/* 899D8 800F0528 2842000A */ slti $v0, $v0, 0xa -/* 899DC 800F052C 1440006A */ bnez $v0, .L800F06D8 -/* 899E0 800F0530 00000000 */ nop -/* 899E4 800F0534 3C108011 */ lui $s0, %hi(D_80109498) -/* 899E8 800F0538 26109498 */ addiu $s0, $s0, %lo(D_80109498) -/* 899EC 800F053C C62E002C */ lwc1 $f14, 0x2c($s1) -/* 899F0 800F0540 3C014160 */ lui $at, 0x4160 -/* 899F4 800F0544 44810000 */ mtc1 $at, $f0 -/* 899F8 800F0548 C62C0028 */ lwc1 $f12, 0x28($s1) -/* 899FC 800F054C 46007380 */ add.s $f14, $f14, $f0 -/* 89A00 800F0550 3C0140A0 */ lui $at, 0x40a0 -/* 89A04 800F0554 44810000 */ mtc1 $at, $f0 -/* 89A08 800F0558 8E260030 */ lw $a2, 0x30($s1) -/* 89A0C 800F055C 8E070000 */ lw $a3, ($s0) -/* 89A10 800F0560 0C01BF14 */ jal fx_cloud_puff -/* 89A14 800F0564 46007381 */ sub.s $f14, $f14, $f0 -/* 89A18 800F0568 C6000000 */ lwc1 $f0, ($s0) -/* 89A1C 800F056C 3C01420C */ lui $at, 0x420c -/* 89A20 800F0570 44816000 */ mtc1 $at, $f12 -/* 89A24 800F0574 0000982D */ daddu $s3, $zero, $zero -/* 89A28 800F0578 460C0300 */ add.s $f12, $f0, $f12 -/* 89A2C 800F057C 3C01BE99 */ lui $at, 0xbe99 -/* 89A30 800F0580 3421999A */ ori $at, $at, 0x999a -/* 89A34 800F0584 4481D000 */ mtc1 $at, $f26 -/* 89A38 800F0588 0C00A6C9 */ jal clamp_angle -/* 89A3C 800F058C 0260902D */ daddu $s2, $s3, $zero -/* 89A40 800F0590 E6000000 */ swc1 $f0, ($s0) -.L800F0594: -/* 89A44 800F0594 0C00A67F */ jal rand_int -/* 89A48 800F0598 2404000A */ addiu $a0, $zero, 0xa -/* 89A4C 800F059C 2442FFFB */ addiu $v0, $v0, -5 -/* 89A50 800F05A0 4482B000 */ mtc1 $v0, $f22 -/* 89A54 800F05A4 00000000 */ nop -/* 89A58 800F05A8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 89A5C 800F05AC 0C00A67F */ jal rand_int -/* 89A60 800F05B0 2404000A */ addiu $a0, $zero, 0xa -/* 89A64 800F05B4 4616B082 */ mul.s $f2, $f22, $f22 -/* 89A68 800F05B8 00000000 */ nop -/* 89A6C 800F05BC 2442FFFB */ addiu $v0, $v0, -5 -/* 89A70 800F05C0 4482C000 */ mtc1 $v0, $f24 -/* 89A74 800F05C4 00000000 */ nop -/* 89A78 800F05C8 4680C620 */ cvt.s.w $f24, $f24 -/* 89A7C 800F05CC 4618C102 */ mul.s $f4, $f24, $f24 -/* 89A80 800F05D0 00000000 */ nop -/* 89A84 800F05D4 C62C0084 */ lwc1 $f12, 0x84($s1) -/* 89A88 800F05D8 44920000 */ mtc1 $s2, $f0 -/* 89A8C 800F05DC 00000000 */ nop -/* 89A90 800F05E0 46800020 */ cvt.s.w $f0, $f0 -/* 89A94 800F05E4 46006307 */ neg.s $f12, $f12 -/* 89A98 800F05E8 46006300 */ add.s $f12, $f12, $f0 -/* 89A9C 800F05EC 3C01C000 */ lui $at, 0xc000 -/* 89AA0 800F05F0 4481A000 */ mtc1 $at, $f20 -/* 89AA4 800F05F4 3C0140A0 */ lui $at, 0x40a0 -/* 89AA8 800F05F8 44810000 */ mtc1 $at, $f0 -/* 89AAC 800F05FC 46041080 */ add.s $f2, $f2, $f4 -/* 89AB0 800F0600 3C018011 */ lui $at, %hi(D_8010949C) -/* 89AB4 800F0604 A420949C */ sh $zero, %lo(D_8010949C)($at) -/* 89AB8 800F0608 46001083 */ div.s $f2, $f2, $f0 -/* 89ABC 800F060C 0C00A6C9 */ jal clamp_angle -/* 89AC0 800F0610 4602A501 */ sub.s $f20, $f20, $f2 -/* 89AC4 800F0614 3C0140C9 */ lui $at, 0x40c9 -/* 89AC8 800F0618 34210FD0 */ ori $at, $at, 0xfd0 -/* 89ACC 800F061C 44811000 */ mtc1 $at, $f2 -/* 89AD0 800F0620 00000000 */ nop -/* 89AD4 800F0624 46020002 */ mul.s $f0, $f0, $f2 -/* 89AD8 800F0628 00000000 */ nop -/* 89ADC 800F062C 27A50010 */ addiu $a1, $sp, 0x10 -/* 89AE0 800F0630 3C0143B4 */ lui $at, 0x43b4 -/* 89AE4 800F0634 44816000 */ mtc1 $at, $f12 -/* 89AE8 800F0638 27A60014 */ addiu $a2, $sp, 0x14 -/* 89AEC 800F063C 0C00A82D */ jal sin_cos_rad -/* 89AF0 800F0640 460C0303 */ div.s $f12, $f0, $f12 -/* 89AF4 800F0644 862200B2 */ lh $v0, 0xb2($s1) -/* 89AF8 800F0648 C7A40010 */ lwc1 $f4, 0x10($sp) -/* 89AFC 800F064C 44823000 */ mtc1 $v0, $f6 -/* 89B00 800F0650 00000000 */ nop -/* 89B04 800F0654 468031A0 */ cvt.s.w $f6, $f6 -/* 89B08 800F0658 46043102 */ mul.s $f4, $f6, $f4 -/* 89B0C 800F065C 00000000 */ nop -/* 89B10 800F0660 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 89B14 800F0664 46003182 */ mul.s $f6, $f6, $f0 -/* 89B18 800F0668 00000000 */ nop -/* 89B1C 800F066C 3C014178 */ lui $at, 0x4178 -/* 89B20 800F0670 44811000 */ mtc1 $at, $f2 -/* 89B24 800F0674 C620002C */ lwc1 $f0, 0x2c($s1) -/* 89B28 800F0678 46020000 */ add.s $f0, $f0, $f2 -/* 89B2C 800F067C 46140000 */ add.s $f0, $f0, $f20 -/* 89B30 800F0680 461A2102 */ mul.s $f4, $f4, $f26 -/* 89B34 800F0684 00000000 */ nop -/* 89B38 800F0688 44060000 */ mfc1 $a2, $f0 -/* 89B3C 800F068C C6200028 */ lwc1 $f0, 0x28($s1) -/* 89B40 800F0690 46040000 */ add.s $f0, $f0, $f4 -/* 89B44 800F0694 46160000 */ add.s $f0, $f0, $f22 -/* 89B48 800F0698 461A3182 */ mul.s $f6, $f6, $f26 -/* 89B4C 800F069C 00000000 */ nop -/* 89B50 800F06A0 44050000 */ mfc1 $a1, $f0 -/* 89B54 800F06A4 C6200030 */ lwc1 $f0, 0x30($s1) -/* 89B58 800F06A8 46060000 */ add.s $f0, $f0, $f6 -/* 89B5C 800F06AC 46180000 */ add.s $f0, $f0, $f24 -/* 89B60 800F06B0 2652005A */ addiu $s2, $s2, 0x5a -/* 89B64 800F06B4 26730001 */ addiu $s3, $s3, 1 -/* 89B68 800F06B8 44070000 */ mfc1 $a3, $f0 -/* 89B6C 800F06BC 0C01BF2C */ jal fx_cloud_trail -/* 89B70 800F06C0 0000202D */ daddu $a0, $zero, $zero -/* 89B74 800F06C4 2A620004 */ slti $v0, $s3, 4 -/* 89B78 800F06C8 1040005B */ beqz $v0, .L800F0838 -/* 89B7C 800F06CC 00000000 */ nop -/* 89B80 800F06D0 0803C165 */ j .L800F0594 -/* 89B84 800F06D4 00000000 */ nop -.L800F06D8: -/* 89B88 800F06D8 922200B4 */ lbu $v0, 0xb4($s1) -/* 89B8C 800F06DC 2442FFFF */ addiu $v0, $v0, -1 -/* 89B90 800F06E0 2C420002 */ sltiu $v0, $v0, 2 -/* 89B94 800F06E4 1440000A */ bnez $v0, .L800F0710 -/* 89B98 800F06E8 3C02FF00 */ lui $v0, 0xff00 -/* 89B9C 800F06EC 8E2300B4 */ lw $v1, 0xb4($s1) -/* 89BA0 800F06F0 3442FF00 */ ori $v0, $v0, 0xff00 -/* 89BA4 800F06F4 00621824 */ and $v1, $v1, $v0 -/* 89BA8 800F06F8 3C021A00 */ lui $v0, 0x1a00 -/* 89BAC 800F06FC 10620004 */ beq $v1, $v0, .L800F0710 -/* 89BB0 800F0700 00000000 */ nop -/* 89BB4 800F0704 3C018011 */ lui $at, %hi(D_8010949C) -/* 89BB8 800F0708 0803C20E */ j .L800F0838 -/* 89BBC 800F070C A420949C */ sh $zero, %lo(D_8010949C)($at) -.L800F0710: -/* 89BC0 800F0710 0C00A67F */ jal rand_int -/* 89BC4 800F0714 2404000A */ addiu $a0, $zero, 0xa -/* 89BC8 800F0718 2442FFFB */ addiu $v0, $v0, -5 -/* 89BCC 800F071C 4482C000 */ mtc1 $v0, $f24 -/* 89BD0 800F0720 00000000 */ nop -/* 89BD4 800F0724 4680C620 */ cvt.s.w $f24, $f24 -/* 89BD8 800F0728 0C00A67F */ jal rand_int -/* 89BDC 800F072C 2404000A */ addiu $a0, $zero, 0xa -/* 89BE0 800F0730 4618C002 */ mul.s $f0, $f24, $f24 -/* 89BE4 800F0734 00000000 */ nop -/* 89BE8 800F0738 2442FFFB */ addiu $v0, $v0, -5 -/* 89BEC 800F073C 4482B000 */ mtc1 $v0, $f22 -/* 89BF0 800F0740 00000000 */ nop -/* 89BF4 800F0744 4680B5A0 */ cvt.s.w $f22, $f22 -/* 89BF8 800F0748 4616B082 */ mul.s $f2, $f22, $f22 -/* 89BFC 800F074C 00000000 */ nop -/* 89C00 800F0750 C62C0084 */ lwc1 $f12, 0x84($s1) -/* 89C04 800F0754 3C01C000 */ lui $at, 0xc000 -/* 89C08 800F0758 4481A000 */ mtc1 $at, $f20 -/* 89C0C 800F075C 46020000 */ add.s $f0, $f0, $f2 -/* 89C10 800F0760 3C018011 */ lui $at, %hi(D_8010949C) -/* 89C14 800F0764 A420949C */ sh $zero, %lo(D_8010949C)($at) -/* 89C18 800F0768 3C0140A0 */ lui $at, 0x40a0 -/* 89C1C 800F076C 44811000 */ mtc1 $at, $f2 -/* 89C20 800F0770 46006307 */ neg.s $f12, $f12 -/* 89C24 800F0774 46020003 */ div.s $f0, $f0, $f2 -/* 89C28 800F0778 0C00A6C9 */ jal clamp_angle -/* 89C2C 800F077C 4600A501 */ sub.s $f20, $f20, $f0 -/* 89C30 800F0780 3C0140C9 */ lui $at, 0x40c9 -/* 89C34 800F0784 34210FD0 */ ori $at, $at, 0xfd0 -/* 89C38 800F0788 44811000 */ mtc1 $at, $f2 -/* 89C3C 800F078C 00000000 */ nop -/* 89C40 800F0790 46020002 */ mul.s $f0, $f0, $f2 -/* 89C44 800F0794 00000000 */ nop -/* 89C48 800F0798 27A50010 */ addiu $a1, $sp, 0x10 -/* 89C4C 800F079C 3C0143B4 */ lui $at, 0x43b4 -/* 89C50 800F07A0 44816000 */ mtc1 $at, $f12 -/* 89C54 800F07A4 27A60014 */ addiu $a2, $sp, 0x14 -/* 89C58 800F07A8 0C00A82D */ jal sin_cos_rad -/* 89C5C 800F07AC 460C0303 */ div.s $f12, $f0, $f12 -/* 89C60 800F07B0 862200B2 */ lh $v0, 0xb2($s1) -/* 89C64 800F07B4 C7A60010 */ lwc1 $f6, 0x10($sp) -/* 89C68 800F07B8 44822000 */ mtc1 $v0, $f4 -/* 89C6C 800F07BC 00000000 */ nop -/* 89C70 800F07C0 46802120 */ cvt.s.w $f4, $f4 -/* 89C74 800F07C4 46062182 */ mul.s $f6, $f4, $f6 -/* 89C78 800F07C8 00000000 */ nop -/* 89C7C 800F07CC C7A00014 */ lwc1 $f0, 0x14($sp) -/* 89C80 800F07D0 46002102 */ mul.s $f4, $f4, $f0 -/* 89C84 800F07D4 00000000 */ nop -/* 89C88 800F07D8 3C01BE99 */ lui $at, 0xbe99 -/* 89C8C 800F07DC 3421999A */ ori $at, $at, 0x999a -/* 89C90 800F07E0 44810000 */ mtc1 $at, $f0 -/* 89C94 800F07E4 00000000 */ nop -/* 89C98 800F07E8 46003182 */ mul.s $f6, $f6, $f0 -/* 89C9C 800F07EC 00000000 */ nop -/* 89CA0 800F07F0 46002102 */ mul.s $f4, $f4, $f0 -/* 89CA4 800F07F4 00000000 */ nop -/* 89CA8 800F07F8 3C014178 */ lui $at, 0x4178 -/* 89CAC 800F07FC 44811000 */ mtc1 $at, $f2 -/* 89CB0 800F0800 C620002C */ lwc1 $f0, 0x2c($s1) -/* 89CB4 800F0804 46020000 */ add.s $f0, $f0, $f2 -/* 89CB8 800F0808 46140000 */ add.s $f0, $f0, $f20 -/* 89CBC 800F080C 44060000 */ mfc1 $a2, $f0 -/* 89CC0 800F0810 C6200028 */ lwc1 $f0, 0x28($s1) -/* 89CC4 800F0814 46060000 */ add.s $f0, $f0, $f6 -/* 89CC8 800F0818 46180000 */ add.s $f0, $f0, $f24 -/* 89CCC 800F081C 44050000 */ mfc1 $a1, $f0 -/* 89CD0 800F0820 C6200030 */ lwc1 $f0, 0x30($s1) -/* 89CD4 800F0824 46040000 */ add.s $f0, $f0, $f4 -/* 89CD8 800F0828 46160000 */ add.s $f0, $f0, $f22 -/* 89CDC 800F082C 44070000 */ mfc1 $a3, $f0 -/* 89CE0 800F0830 0C01BF2C */ jal fx_cloud_trail -/* 89CE4 800F0834 24040001 */ addiu $a0, $zero, 1 -.L800F0838: -/* 89CE8 800F0838 8FBF0028 */ lw $ra, 0x28($sp) -/* 89CEC 800F083C 8FB30024 */ lw $s3, 0x24($sp) -/* 89CF0 800F0840 8FB20020 */ lw $s2, 0x20($sp) -/* 89CF4 800F0844 8FB1001C */ lw $s1, 0x1c($sp) -/* 89CF8 800F0848 8FB00018 */ lw $s0, 0x18($sp) -/* 89CFC 800F084C D7BA0048 */ ldc1 $f26, 0x48($sp) -/* 89D00 800F0850 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 89D04 800F0854 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 89D08 800F0858 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 89D0C 800F085C 03E00008 */ jr $ra -/* 89D10 800F0860 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s deleted file mode 100644 index 264d32ed54..0000000000 --- a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s +++ /dev/null @@ -1,244 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8010C3A0 -.word .L800F1718_8ABC8, .L800F1734_8ABE4, .L800F1718_8ABC8, .L800F1718_8ABC8, .L800F1734_8ABE4, .L800F1718_8ABC8, .L800F1718_8ABC8, .L800F1718_8ABC8, .L800F1718_8ABC8, .L800F1718_8ABC8, .L800F1768_8AC18, .L800F1768_8AC18, .L800F1718_8ABC8, .L800F1768_8AC18 - -dlabel jtbl_8010C3D8 -.word .L800F17C0_8AC70, .L800F17D4_8AC84, .L800F17C0_8AC70, .L800F17C0_8AC70, .L800F17D4_8AC84, .L800F17C0_8AC70, .L800F17C0_8AC70, .L800F17C0_8AC70, .L800F17C0_8AC70, .L800F17C0_8AC70, .L800F17E8_8AC98, .L800F17E8_8AC98, .L800F17C0_8AC70, .L800F17E8_8AC98 - -.section .text - -glabel func_800F16CC -/* 8AB7C 800F16CC 3C028011 */ lui $v0, %hi(D_8010D68E) -/* 8AB80 800F16D0 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) -/* 8AB84 800F16D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8AB88 800F16D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8AB8C 800F16DC AFB20018 */ sw $s2, 0x18($sp) -/* 8AB90 800F16E0 AFB10014 */ sw $s1, 0x14($sp) -/* 8AB94 800F16E4 1040002B */ beqz $v0, .L800F1794 -/* 8AB98 800F16E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8AB9C 800F16EC 3C028011 */ lui $v0, %hi(gPopupMenu) -/* 8ABA0 800F16F0 8C42D69C */ lw $v0, %lo(gPopupMenu)($v0) -/* 8ABA4 800F16F4 8C430318 */ lw $v1, 0x318($v0) -/* 8ABA8 800F16F8 2C62000E */ sltiu $v0, $v1, 0xe -/* 8ABAC 800F16FC 10400020 */ beqz $v0, .L800F1780 -/* 8ABB0 800F1700 00031080 */ sll $v0, $v1, 2 -/* 8ABB4 800F1704 3C018011 */ lui $at, %hi(jtbl_8010C3A0) -/* 8ABB8 800F1708 00220821 */ addu $at, $at, $v0 -/* 8ABBC 800F170C 8C22C3A0 */ lw $v0, %lo(jtbl_8010C3A0)($at) -/* 8ABC0 800F1710 00400008 */ jr $v0 -/* 8ABC4 800F1714 00000000 */ nop -.L800F1718_8ABC8: -/* 8ABC8 800F1718 2404000E */ addiu $a0, $zero, 0xe -/* 8ABCC 800F171C 3C108014 */ lui $s0, %hi(basic_window_update) -/* 8ABD0 800F1720 26107474 */ addiu $s0, $s0, %lo(basic_window_update) -/* 8ABD4 800F1724 0C051F9F */ jal set_window_update -/* 8ABD8 800F1728 0200282D */ daddu $a1, $s0, $zero -/* 8ABDC 800F172C 0803C5D3 */ j .L800F174C -/* 8ABE0 800F1730 24040001 */ addiu $a0, $zero, 1 -.L800F1734_8ABE4: -/* 8ABE4 800F1734 2404000E */ addiu $a0, $zero, 0xe -/* 8ABE8 800F1738 3C108014 */ lui $s0, %hi(basic_window_update) -/* 8ABEC 800F173C 26107474 */ addiu $s0, $s0, %lo(basic_window_update) -/* 8ABF0 800F1740 0C051F9F */ jal set_window_update -/* 8ABF4 800F1744 0200282D */ daddu $a1, $s0, $zero -/* 8ABF8 800F1748 24040002 */ addiu $a0, $zero, 2 -.L800F174C: -/* 8ABFC 800F174C 0C05272D */ jal sfx_play_sound -/* 8AC00 800F1750 00000000 */ nop -/* 8AC04 800F1754 24040013 */ addiu $a0, $zero, 0x13 -/* 8AC08 800F1758 0C051F9F */ jal set_window_update -/* 8AC0C 800F175C 0200282D */ daddu $a1, $s0, $zero -/* 8AC10 800F1760 0803C5E1 */ j .L800F1784 -/* 8AC14 800F1764 24040015 */ addiu $a0, $zero, 0x15 -.L800F1768_8AC18: -/* 8AC18 800F1768 3C058014 */ lui $a1, %hi(basic_window_update) -/* 8AC1C 800F176C 24A57474 */ addiu $a1, $a1, %lo(basic_window_update) -/* 8AC20 800F1770 0C051F9F */ jal set_window_update -/* 8AC24 800F1774 2404000E */ addiu $a0, $zero, 0xe -/* 8AC28 800F1778 0C05272D */ jal sfx_play_sound -/* 8AC2C 800F177C 24040001 */ addiu $a0, $zero, 1 -.L800F1780: -/* 8AC30 800F1780 24040015 */ addiu $a0, $zero, 0x15 -.L800F1784: -/* 8AC34 800F1784 3C058014 */ lui $a1, %hi(basic_window_update) -/* 8AC38 800F1788 24A57474 */ addiu $a1, $a1, %lo(basic_window_update) -/* 8AC3C 800F178C 0803C5FC */ j .L800F17F0 -/* 8AC40 800F1790 00000000 */ nop -.L800F1794: -/* 8AC44 800F1794 3C028011 */ lui $v0, %hi(gPopupMenu) -/* 8AC48 800F1798 8C42D69C */ lw $v0, %lo(gPopupMenu)($v0) -/* 8AC4C 800F179C 8C430318 */ lw $v1, 0x318($v0) -/* 8AC50 800F17A0 2C62000E */ sltiu $v0, $v1, 0xe -/* 8AC54 800F17A4 10400014 */ beqz $v0, .L800F17F8 -/* 8AC58 800F17A8 00031080 */ sll $v0, $v1, 2 -/* 8AC5C 800F17AC 3C018011 */ lui $at, %hi(jtbl_8010C3D8) -/* 8AC60 800F17B0 00220821 */ addu $at, $at, $v0 -/* 8AC64 800F17B4 8C22C3D8 */ lw $v0, %lo(jtbl_8010C3D8)($at) -/* 8AC68 800F17B8 00400008 */ jr $v0 -/* 8AC6C 800F17BC 00000000 */ nop -.L800F17C0_8AC70: -/* 8AC70 800F17C0 2404000E */ addiu $a0, $zero, 0xe -/* 8AC74 800F17C4 0C051F9F */ jal set_window_update -/* 8AC78 800F17C8 24050001 */ addiu $a1, $zero, 1 -/* 8AC7C 800F17CC 0803C5FB */ j .L800F17EC -/* 8AC80 800F17D0 24040013 */ addiu $a0, $zero, 0x13 -.L800F17D4_8AC84: -/* 8AC84 800F17D4 2404000E */ addiu $a0, $zero, 0xe -/* 8AC88 800F17D8 0C051F9F */ jal set_window_update -/* 8AC8C 800F17DC 24050001 */ addiu $a1, $zero, 1 -/* 8AC90 800F17E0 0803C5FB */ j .L800F17EC -/* 8AC94 800F17E4 24040013 */ addiu $a0, $zero, 0x13 -.L800F17E8_8AC98: -/* 8AC98 800F17E8 2404000E */ addiu $a0, $zero, 0xe -.L800F17EC: -/* 8AC9C 800F17EC 24050001 */ addiu $a1, $zero, 1 -.L800F17F0: -/* 8ACA0 800F17F0 0C051F9F */ jal set_window_update -/* 8ACA4 800F17F4 00000000 */ nop -.L800F17F8: -/* 8ACA8 800F17F8 3C118011 */ lui $s1, %hi(gPopupMenu) -/* 8ACAC 800F17FC 2631D69C */ addiu $s1, $s1, %lo(gPopupMenu) -/* 8ACB0 800F1800 8E220000 */ lw $v0, ($s1) -/* 8ACB4 800F1804 8C420318 */ lw $v0, 0x318($v0) -/* 8ACB8 800F1808 24120003 */ addiu $s2, $zero, 3 -/* 8ACBC 800F180C 14520008 */ bne $v0, $s2, .L800F1830 -/* 8ACC0 800F1810 24040010 */ addiu $a0, $zero, 0x10 -/* 8ACC4 800F1814 3C108014 */ lui $s0, %hi(basic_window_update) -/* 8ACC8 800F1818 26107474 */ addiu $s0, $s0, %lo(basic_window_update) -/* 8ACCC 800F181C 0C051F9F */ jal set_window_update -/* 8ACD0 800F1820 0200282D */ daddu $a1, $s0, $zero -/* 8ACD4 800F1824 24040014 */ addiu $a0, $zero, 0x14 -/* 8ACD8 800F1828 0C051F9F */ jal set_window_update -/* 8ACDC 800F182C 0200282D */ daddu $a1, $s0, $zero -.L800F1830: -/* 8ACE0 800F1830 8E220000 */ lw $v0, ($s1) -/* 8ACE4 800F1834 8C420318 */ lw $v0, 0x318($v0) -/* 8ACE8 800F1838 24100004 */ addiu $s0, $zero, 4 -/* 8ACEC 800F183C 14500005 */ bne $v0, $s0, .L800F1854 -/* 8ACF0 800F1840 00000000 */ nop -/* 8ACF4 800F1844 3C058014 */ lui $a1, %hi(basic_window_update) -/* 8ACF8 800F1848 24A57474 */ addiu $a1, $a1, %lo(basic_window_update) -/* 8ACFC 800F184C 0C051F9F */ jal set_window_update -/* 8AD00 800F1850 24040012 */ addiu $a0, $zero, 0x12 -.L800F1854: -/* 8AD04 800F1854 8E220000 */ lw $v0, ($s1) -/* 8AD08 800F1858 8C430318 */ lw $v1, 0x318($v0) -/* 8AD0C 800F185C 24020005 */ addiu $v0, $zero, 5 -/* 8AD10 800F1860 14620006 */ bne $v1, $v0, .L800F187C -/* 8AD14 800F1864 240500FF */ addiu $a1, $zero, 0xff -/* 8AD18 800F1868 3C058014 */ lui $a1, %hi(basic_window_update) -/* 8AD1C 800F186C 24A57474 */ addiu $a1, $a1, %lo(basic_window_update) -/* 8AD20 800F1870 0C051F9F */ jal set_window_update -/* 8AD24 800F1874 24040010 */ addiu $a0, $zero, 0x10 -/* 8AD28 800F1878 240500FF */ addiu $a1, $zero, 0xff -.L800F187C: -/* 8AD2C 800F187C 00A0302D */ daddu $a2, $a1, $zero -/* 8AD30 800F1880 3C048011 */ lui $a0, %hi(D_8010D65C) -/* 8AD34 800F1884 8C84D65C */ lw $a0, %lo(D_8010D65C)($a0) -/* 8AD38 800F1888 0C0513BF */ jal hud_element_set_tint -/* 8AD3C 800F188C 00A0382D */ daddu $a3, $a1, $zero -/* 8AD40 800F1890 240500FF */ addiu $a1, $zero, 0xff -/* 8AD44 800F1894 00A0302D */ daddu $a2, $a1, $zero -/* 8AD48 800F1898 3C048011 */ lui $a0, %hi(D_8010D678) -/* 8AD4C 800F189C 8C84D678 */ lw $a0, %lo(D_8010D678)($a0) -/* 8AD50 800F18A0 0C0513BF */ jal hud_element_set_tint -/* 8AD54 800F18A4 00A0382D */ daddu $a3, $a1, $zero -/* 8AD58 800F18A8 240500FF */ addiu $a1, $zero, 0xff -/* 8AD5C 800F18AC 00A0302D */ daddu $a2, $a1, $zero -/* 8AD60 800F18B0 3C048011 */ lui $a0, %hi(D_8010D66C) -/* 8AD64 800F18B4 8C84D66C */ lw $a0, %lo(D_8010D66C)($a0) -/* 8AD68 800F18B8 0C0513BF */ jal hud_element_set_tint -/* 8AD6C 800F18BC 00A0382D */ daddu $a3, $a1, $zero -/* 8AD70 800F18C0 240500FF */ addiu $a1, $zero, 0xff -/* 8AD74 800F18C4 00A0302D */ daddu $a2, $a1, $zero -/* 8AD78 800F18C8 3C048011 */ lui $a0, %hi(D_8010D670) -/* 8AD7C 800F18CC 8C84D670 */ lw $a0, %lo(D_8010D670)($a0) -/* 8AD80 800F18D0 0C0513BF */ jal hud_element_set_tint -/* 8AD84 800F18D4 00A0382D */ daddu $a3, $a1, $zero -/* 8AD88 800F18D8 240500FF */ addiu $a1, $zero, 0xff -/* 8AD8C 800F18DC 00A0302D */ daddu $a2, $a1, $zero -/* 8AD90 800F18E0 3C048011 */ lui $a0, %hi(D_8010D674) -/* 8AD94 800F18E4 8C84D674 */ lw $a0, %lo(D_8010D674)($a0) -/* 8AD98 800F18E8 0C0513BF */ jal hud_element_set_tint -/* 8AD9C 800F18EC 00A0382D */ daddu $a3, $a1, $zero -/* 8ADA0 800F18F0 8E220000 */ lw $v0, ($s1) -/* 8ADA4 800F18F4 8C420318 */ lw $v0, 0x318($v0) -/* 8ADA8 800F18F8 1452000C */ bne $v0, $s2, .L800F192C -/* 8ADAC 800F18FC 240500FF */ addiu $a1, $zero, 0xff -/* 8ADB0 800F1900 00A0302D */ daddu $a2, $a1, $zero -/* 8ADB4 800F1904 3C048011 */ lui $a0, %hi(D_8010D660) -/* 8ADB8 800F1908 8C84D660 */ lw $a0, %lo(D_8010D660)($a0) -/* 8ADBC 800F190C 0C0513BF */ jal hud_element_set_tint -/* 8ADC0 800F1910 00A0382D */ daddu $a3, $a1, $zero -/* 8ADC4 800F1914 240500FF */ addiu $a1, $zero, 0xff -/* 8ADC8 800F1918 00A0302D */ daddu $a2, $a1, $zero -/* 8ADCC 800F191C 3C048011 */ lui $a0, %hi(D_8010D664) -/* 8ADD0 800F1920 8C84D664 */ lw $a0, %lo(D_8010D664)($a0) -/* 8ADD4 800F1924 0C0513BF */ jal hud_element_set_tint -/* 8ADD8 800F1928 00A0382D */ daddu $a3, $a1, $zero -.L800F192C: -/* 8ADDC 800F192C 8E220000 */ lw $v0, ($s1) -/* 8ADE0 800F1930 8C420318 */ lw $v0, 0x318($v0) -/* 8ADE4 800F1934 1450000C */ bne $v0, $s0, .L800F1968 -/* 8ADE8 800F1938 240500FF */ addiu $a1, $zero, 0xff -/* 8ADEC 800F193C 00A0302D */ daddu $a2, $a1, $zero -/* 8ADF0 800F1940 3C048011 */ lui $a0, %hi(D_8010D660) -/* 8ADF4 800F1944 8C84D660 */ lw $a0, %lo(D_8010D660)($a0) -/* 8ADF8 800F1948 0C0513BF */ jal hud_element_set_tint -/* 8ADFC 800F194C 00A0382D */ daddu $a3, $a1, $zero -/* 8AE00 800F1950 240500FF */ addiu $a1, $zero, 0xff -/* 8AE04 800F1954 00A0302D */ daddu $a2, $a1, $zero -/* 8AE08 800F1958 3C048011 */ lui $a0, %hi(D_8010D664) -/* 8AE0C 800F195C 8C84D664 */ lw $a0, %lo(D_8010D664)($a0) -/* 8AE10 800F1960 0C0513BF */ jal hud_element_set_tint -/* 8AE14 800F1964 00A0382D */ daddu $a3, $a1, $zero -.L800F1968: -/* 8AE18 800F1968 8E220000 */ lw $v0, ($s1) -/* 8AE1C 800F196C 8C430318 */ lw $v1, 0x318($v0) -/* 8AE20 800F1970 24020001 */ addiu $v0, $zero, 1 -/* 8AE24 800F1974 10620003 */ beq $v1, $v0, .L800F1984 -/* 8AE28 800F1978 00000000 */ nop -/* 8AE2C 800F197C 14700007 */ bne $v1, $s0, .L800F199C -/* 8AE30 800F1980 00000000 */ nop -.L800F1984: -/* 8AE34 800F1984 3C048011 */ lui $a0, %hi(D_8010D668) -/* 8AE38 800F1988 8C84D668 */ lw $a0, %lo(D_8010D668)($a0) -/* 8AE3C 800F198C 240500FF */ addiu $a1, $zero, 0xff -/* 8AE40 800F1990 00A0302D */ daddu $a2, $a1, $zero -/* 8AE44 800F1994 0C0513BF */ jal hud_element_set_tint -/* 8AE48 800F1998 00A0382D */ daddu $a3, $a1, $zero -.L800F199C: -/* 8AE4C 800F199C 3C028011 */ lui $v0, %hi(gPopupMenu) -/* 8AE50 800F19A0 8C42D69C */ lw $v0, %lo(gPopupMenu)($v0) -/* 8AE54 800F19A4 8C430318 */ lw $v1, 0x318($v0) -/* 8AE58 800F19A8 24020005 */ addiu $v0, $zero, 5 -/* 8AE5C 800F19AC 14620006 */ bne $v1, $v0, .L800F19C8 -/* 8AE60 800F19B0 240500FF */ addiu $a1, $zero, 0xff -/* 8AE64 800F19B4 3C048011 */ lui $a0, %hi(D_8010D660) -/* 8AE68 800F19B8 8C84D660 */ lw $a0, %lo(D_8010D660)($a0) -/* 8AE6C 800F19BC 00A0302D */ daddu $a2, $a1, $zero -/* 8AE70 800F19C0 0C0513BF */ jal hud_element_set_tint -/* 8AE74 800F19C4 00A0382D */ daddu $a3, $a1, $zero -.L800F19C8: -/* 8AE78 800F19C8 3C048011 */ lui $a0, %hi(D_8010D66C) -/* 8AE7C 800F19CC 8C84D66C */ lw $a0, %lo(D_8010D66C)($a0) -/* 8AE80 800F19D0 3C058010 */ lui $a1, %hi(HES_AnimatedHandPointer) -/* 8AE84 800F19D4 24A54A28 */ addiu $a1, $a1, %lo(HES_AnimatedHandPointer) -/* 8AE88 800F19D8 0C0511FF */ jal hud_element_set_script -/* 8AE8C 800F19DC 00000000 */ nop -/* 8AE90 800F19E0 8FBF001C */ lw $ra, 0x1c($sp) -/* 8AE94 800F19E4 8FB20018 */ lw $s2, 0x18($sp) -/* 8AE98 800F19E8 8FB10014 */ lw $s1, 0x14($sp) -/* 8AE9C 800F19EC 8FB00010 */ lw $s0, 0x10($sp) -/* 8AEA0 800F19F0 2402000A */ addiu $v0, $zero, 0xa -/* 8AEA4 800F19F4 3C018011 */ lui $at, %hi(D_8010D690) -/* 8AEA8 800F19F8 A022D690 */ sb $v0, %lo(D_8010D690)($at) -/* 8AEAC 800F19FC 24020014 */ addiu $v0, $zero, 0x14 -/* 8AEB0 800F1A00 3C018011 */ lui $at, %hi(D_8010D640) -/* 8AEB4 800F1A04 AC22D640 */ sw $v0, %lo(D_8010D640)($at) -/* 8AEB8 800F1A08 03E00008 */ jr $ra -/* 8AEBC 800F1A0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4944.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4944.s deleted file mode 100644 index c31bc1f630..0000000000 --- a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4944.s +++ /dev/null @@ -1,211 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8010C8E0 -.word .L800F4994_8DE44, .L800F49B0_8DE60, .L800F49E4_8DE94, .L800F4A18_8DEC8, .L800F4A4C_8DEFC, .L800F4A80_8DF30, .L800F4AA0_8DF50, .L800F4ABC_8DF6C, .L800F4B0C_8DFBC, .L800F4B40_8DFF0, .L800F4B5C_8E00C, .L800F4B90_8E040, .L800F4BC4_8E074, .L800F4AD8_8DF88, 0, 0 - -.section .text - -glabel func_800F4944 -/* 8DDF4 800F4944 3C028011 */ lui $v0, %hi(D_8010D68E) -/* 8DDF8 800F4948 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) -/* 8DDFC 800F494C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8DE00 800F4950 AFB00018 */ sw $s0, 0x18($sp) -/* 8DE04 800F4954 00A0802D */ daddu $s0, $a1, $zero -/* 8DE08 800F4958 AFB1001C */ sw $s1, 0x1c($sp) -/* 8DE0C 800F495C 24D10007 */ addiu $s1, $a2, 7 -/* 8DE10 800F4960 104000A9 */ beqz $v0, .L800F4C08 -/* 8DE14 800F4964 AFBF0020 */ sw $ra, 0x20($sp) -/* 8DE18 800F4968 3C028011 */ lui $v0, %hi(gPopupMenu) -/* 8DE1C 800F496C 8C42D69C */ lw $v0, %lo(gPopupMenu)($v0) -/* 8DE20 800F4970 8C430318 */ lw $v1, 0x318($v0) -/* 8DE24 800F4974 2C62000E */ sltiu $v0, $v1, 0xe -/* 8DE28 800F4978 104000A3 */ beqz $v0, .L800F4C08 -/* 8DE2C 800F497C 00031080 */ sll $v0, $v1, 2 -/* 8DE30 800F4980 3C018011 */ lui $at, %hi(jtbl_8010C8E0) -/* 8DE34 800F4984 00220821 */ addu $at, $at, $v0 -/* 8DE38 800F4988 8C22C8E0 */ lw $v0, %lo(jtbl_8010C8E0)($at) -/* 8DE3C 800F498C 00400008 */ jr $v0 -/* 8DE40 800F4990 00000000 */ nop -.L800F4994_8DE44: -/* 8DE44 800F4994 3C04001D */ lui $a0, 0x1d -/* 8DE48 800F4998 34840061 */ ori $a0, $a0, 0x61 -/* 8DE4C 800F499C 0C04991D */ jal get_msg_width -/* 8DE50 800F49A0 0000282D */ daddu $a1, $zero, $zero -/* 8DE54 800F49A4 3C04001D */ lui $a0, 0x1d -/* 8DE58 800F49A8 0803D2F7 */ j .L800F4BDC -/* 8DE5C 800F49AC 34840061 */ ori $a0, $a0, 0x61 -.L800F49B0_8DE60: -/* 8DE60 800F49B0 3C04001D */ lui $a0, 0x1d -/* 8DE64 800F49B4 34840063 */ ori $a0, $a0, 0x63 -/* 8DE68 800F49B8 0C04991D */ jal get_msg_width -/* 8DE6C 800F49BC 0000282D */ daddu $a1, $zero, $zero -/* 8DE70 800F49C0 3C04001D */ lui $a0, 0x1d -/* 8DE74 800F49C4 34840063 */ ori $a0, $a0, 0x63 -/* 8DE78 800F49C8 26050048 */ addiu $a1, $s0, 0x48 -/* 8DE7C 800F49CC 00021FC2 */ srl $v1, $v0, 0x1f -/* 8DE80 800F49D0 00621821 */ addu $v1, $v1, $v0 -/* 8DE84 800F49D4 00031843 */ sra $v1, $v1, 1 -/* 8DE88 800F49D8 00A32823 */ subu $a1, $a1, $v1 -/* 8DE8C 800F49DC 0803D2FD */ j .L800F4BF4 -/* 8DE90 800F49E0 2626FFFC */ addiu $a2, $s1, -4 -.L800F49E4_8DE94: -/* 8DE94 800F49E4 3C04001D */ lui $a0, 0x1d -/* 8DE98 800F49E8 34840064 */ ori $a0, $a0, 0x64 -/* 8DE9C 800F49EC 0C04991D */ jal get_msg_width -/* 8DEA0 800F49F0 0000282D */ daddu $a1, $zero, $zero -/* 8DEA4 800F49F4 3C04001D */ lui $a0, 0x1d -/* 8DEA8 800F49F8 34840064 */ ori $a0, $a0, 0x64 -/* 8DEAC 800F49FC 26050048 */ addiu $a1, $s0, 0x48 -/* 8DEB0 800F4A00 00021FC2 */ srl $v1, $v0, 0x1f -/* 8DEB4 800F4A04 00621821 */ addu $v1, $v1, $v0 -/* 8DEB8 800F4A08 00031843 */ sra $v1, $v1, 1 -/* 8DEBC 800F4A0C 00A32823 */ subu $a1, $a1, $v1 -/* 8DEC0 800F4A10 0803D2FD */ j .L800F4BF4 -/* 8DEC4 800F4A14 2626FFFC */ addiu $a2, $s1, -4 -.L800F4A18_8DEC8: -/* 8DEC8 800F4A18 3C04001D */ lui $a0, 0x1d -/* 8DECC 800F4A1C 34840070 */ ori $a0, $a0, 0x70 -/* 8DED0 800F4A20 0C04991D */ jal get_msg_width -/* 8DED4 800F4A24 0000282D */ daddu $a1, $zero, $zero -/* 8DED8 800F4A28 3C04001D */ lui $a0, 0x1d -/* 8DEDC 800F4A2C 34840070 */ ori $a0, $a0, 0x70 -/* 8DEE0 800F4A30 26050040 */ addiu $a1, $s0, 0x40 -/* 8DEE4 800F4A34 00021FC2 */ srl $v1, $v0, 0x1f -/* 8DEE8 800F4A38 00621821 */ addu $v1, $v1, $v0 -/* 8DEEC 800F4A3C 00031843 */ sra $v1, $v1, 1 -/* 8DEF0 800F4A40 00A32823 */ subu $a1, $a1, $v1 -/* 8DEF4 800F4A44 0803D2FD */ j .L800F4BF4 -/* 8DEF8 800F4A48 2626FFFC */ addiu $a2, $s1, -4 -.L800F4A4C_8DEFC: -/* 8DEFC 800F4A4C 3C04001D */ lui $a0, 0x1d -/* 8DF00 800F4A50 3484006A */ ori $a0, $a0, 0x6a -/* 8DF04 800F4A54 0C04991D */ jal get_msg_width -/* 8DF08 800F4A58 0000282D */ daddu $a1, $zero, $zero -/* 8DF0C 800F4A5C 3C04001D */ lui $a0, 0x1d -/* 8DF10 800F4A60 3484006A */ ori $a0, $a0, 0x6a -/* 8DF14 800F4A64 26050044 */ addiu $a1, $s0, 0x44 -/* 8DF18 800F4A68 00021FC2 */ srl $v1, $v0, 0x1f -/* 8DF1C 800F4A6C 00621821 */ addu $v1, $v1, $v0 -/* 8DF20 800F4A70 00031843 */ sra $v1, $v1, 1 -/* 8DF24 800F4A74 00A32823 */ subu $a1, $a1, $v1 -/* 8DF28 800F4A78 0803D2FD */ j .L800F4BF4 -/* 8DF2C 800F4A7C 2626FFFC */ addiu $a2, $s1, -4 -.L800F4A80_8DF30: -/* 8DF30 800F4A80 3C04001D */ lui $a0, 0x1d -/* 8DF34 800F4A84 34840065 */ ori $a0, $a0, 0x65 -/* 8DF38 800F4A88 0C04991D */ jal get_msg_width -/* 8DF3C 800F4A8C 0000282D */ daddu $a1, $zero, $zero -/* 8DF40 800F4A90 3C04001D */ lui $a0, 0x1d -/* 8DF44 800F4A94 34840065 */ ori $a0, $a0, 0x65 -/* 8DF48 800F4A98 0803D2F8 */ j .L800F4BE0 -/* 8DF4C 800F4A9C 2605003C */ addiu $a1, $s0, 0x3c -.L800F4AA0_8DF50: -/* 8DF50 800F4AA0 3C04001D */ lui $a0, 0x1d -/* 8DF54 800F4AA4 34840066 */ ori $a0, $a0, 0x66 -/* 8DF58 800F4AA8 0C04991D */ jal get_msg_width -/* 8DF5C 800F4AAC 0000282D */ daddu $a1, $zero, $zero -/* 8DF60 800F4AB0 3C04001D */ lui $a0, 0x1d -/* 8DF64 800F4AB4 0803D2F7 */ j .L800F4BDC -/* 8DF68 800F4AB8 34840066 */ ori $a0, $a0, 0x66 -.L800F4ABC_8DF6C: -/* 8DF6C 800F4ABC 3C04001D */ lui $a0, 0x1d -/* 8DF70 800F4AC0 34840067 */ ori $a0, $a0, 0x67 -/* 8DF74 800F4AC4 0C04991D */ jal get_msg_width -/* 8DF78 800F4AC8 0000282D */ daddu $a1, $zero, $zero -/* 8DF7C 800F4ACC 3C04001D */ lui $a0, 0x1d -/* 8DF80 800F4AD0 0803D2F7 */ j .L800F4BDC -/* 8DF84 800F4AD4 34840067 */ ori $a0, $a0, 0x67 -.L800F4AD8_8DF88: -/* 8DF88 800F4AD8 3C04001D */ lui $a0, 0x1d -/* 8DF8C 800F4ADC 3484006F */ ori $a0, $a0, 0x6f -/* 8DF90 800F4AE0 0C04991D */ jal get_msg_width -/* 8DF94 800F4AE4 0000282D */ daddu $a1, $zero, $zero -/* 8DF98 800F4AE8 3C04001D */ lui $a0, 0x1d -/* 8DF9C 800F4AEC 3484006F */ ori $a0, $a0, 0x6f -/* 8DFA0 800F4AF0 26050048 */ addiu $a1, $s0, 0x48 -/* 8DFA4 800F4AF4 00021FC2 */ srl $v1, $v0, 0x1f -/* 8DFA8 800F4AF8 00621821 */ addu $v1, $v1, $v0 -/* 8DFAC 800F4AFC 00031843 */ sra $v1, $v1, 1 -/* 8DFB0 800F4B00 00A32823 */ subu $a1, $a1, $v1 -/* 8DFB4 800F4B04 0803D2FD */ j .L800F4BF4 -/* 8DFB8 800F4B08 2626FFFC */ addiu $a2, $s1, -4 -.L800F4B0C_8DFBC: -/* 8DFBC 800F4B0C 3C04001D */ lui $a0, 0x1d -/* 8DFC0 800F4B10 3484006D */ ori $a0, $a0, 0x6d -/* 8DFC4 800F4B14 0C04991D */ jal get_msg_width -/* 8DFC8 800F4B18 0000282D */ daddu $a1, $zero, $zero -/* 8DFCC 800F4B1C 3C04001D */ lui $a0, 0x1d -/* 8DFD0 800F4B20 3484006D */ ori $a0, $a0, 0x6d -/* 8DFD4 800F4B24 26050038 */ addiu $a1, $s0, 0x38 -/* 8DFD8 800F4B28 00021FC2 */ srl $v1, $v0, 0x1f -/* 8DFDC 800F4B2C 00621821 */ addu $v1, $v1, $v0 -/* 8DFE0 800F4B30 00031843 */ sra $v1, $v1, 1 -/* 8DFE4 800F4B34 00A32823 */ subu $a1, $a1, $v1 -/* 8DFE8 800F4B38 0803D2FD */ j .L800F4BF4 -/* 8DFEC 800F4B3C 2626FFFC */ addiu $a2, $s1, -4 -.L800F4B40_8DFF0: -/* 8DFF0 800F4B40 3C04001D */ lui $a0, 0x1d -/* 8DFF4 800F4B44 348400D6 */ ori $a0, $a0, 0xd6 -/* 8DFF8 800F4B48 0C04991D */ jal get_msg_width -/* 8DFFC 800F4B4C 0000282D */ daddu $a1, $zero, $zero -/* 8E000 800F4B50 3C04001D */ lui $a0, 0x1d -/* 8E004 800F4B54 0803D2F7 */ j .L800F4BDC -/* 8E008 800F4B58 348400D6 */ ori $a0, $a0, 0xd6 -.L800F4B5C_8E00C: -/* 8E00C 800F4B5C 3C04001D */ lui $a0, 0x1d -/* 8E010 800F4B60 3484006C */ ori $a0, $a0, 0x6c -/* 8E014 800F4B64 0C04991D */ jal get_msg_width -/* 8E018 800F4B68 0000282D */ daddu $a1, $zero, $zero -/* 8E01C 800F4B6C 3C04001D */ lui $a0, 0x1d -/* 8E020 800F4B70 3484006C */ ori $a0, $a0, 0x6c -/* 8E024 800F4B74 26050040 */ addiu $a1, $s0, 0x40 -/* 8E028 800F4B78 00021FC2 */ srl $v1, $v0, 0x1f -/* 8E02C 800F4B7C 00621821 */ addu $v1, $v1, $v0 -/* 8E030 800F4B80 00031843 */ sra $v1, $v1, 1 -/* 8E034 800F4B84 00A32823 */ subu $a1, $a1, $v1 -/* 8E038 800F4B88 0803D2FD */ j .L800F4BF4 -/* 8E03C 800F4B8C 2626FFFC */ addiu $a2, $s1, -4 -.L800F4B90_8E040: -/* 8E040 800F4B90 3C04001D */ lui $a0, 0x1d -/* 8E044 800F4B94 3484006D */ ori $a0, $a0, 0x6d -/* 8E048 800F4B98 0C04991D */ jal get_msg_width -/* 8E04C 800F4B9C 0000282D */ daddu $a1, $zero, $zero -/* 8E050 800F4BA0 3C04001D */ lui $a0, 0x1d -/* 8E054 800F4BA4 3484006D */ ori $a0, $a0, 0x6d -/* 8E058 800F4BA8 26050040 */ addiu $a1, $s0, 0x40 -/* 8E05C 800F4BAC 00021FC2 */ srl $v1, $v0, 0x1f -/* 8E060 800F4BB0 00621821 */ addu $v1, $v1, $v0 -/* 8E064 800F4BB4 00031843 */ sra $v1, $v1, 1 -/* 8E068 800F4BB8 00A32823 */ subu $a1, $a1, $v1 -/* 8E06C 800F4BBC 0803D2FD */ j .L800F4BF4 -/* 8E070 800F4BC0 2626FFFC */ addiu $a2, $s1, -4 -.L800F4BC4_8E074: -/* 8E074 800F4BC4 3C04001D */ lui $a0, 0x1d -/* 8E078 800F4BC8 34840062 */ ori $a0, $a0, 0x62 -/* 8E07C 800F4BCC 0C04991D */ jal get_msg_width -/* 8E080 800F4BD0 0000282D */ daddu $a1, $zero, $zero -/* 8E084 800F4BD4 3C04001D */ lui $a0, 0x1d -/* 8E088 800F4BD8 34840062 */ ori $a0, $a0, 0x62 -.L800F4BDC: -/* 8E08C 800F4BDC 26050048 */ addiu $a1, $s0, 0x48 -.L800F4BE0: -/* 8E090 800F4BE0 00021FC2 */ srl $v1, $v0, 0x1f -/* 8E094 800F4BE4 00621821 */ addu $v1, $v1, $v0 -/* 8E098 800F4BE8 00031843 */ sra $v1, $v1, 1 -/* 8E09C 800F4BEC 00A32823 */ subu $a1, $a1, $v1 -/* 8E0A0 800F4BF0 0220302D */ daddu $a2, $s1, $zero -.L800F4BF4: -/* 8E0A4 800F4BF4 240700FF */ addiu $a3, $zero, 0xff -/* 8E0A8 800F4BF8 2402000F */ addiu $v0, $zero, 0xf -/* 8E0AC 800F4BFC AFA20010 */ sw $v0, 0x10($sp) -/* 8E0B0 800F4C00 0C04993B */ jal draw_msg -/* 8E0B4 800F4C04 AFA00014 */ sw $zero, 0x14($sp) -.L800F4C08: -/* 8E0B8 800F4C08 8FBF0020 */ lw $ra, 0x20($sp) -/* 8E0BC 800F4C0C 8FB1001C */ lw $s1, 0x1c($sp) -/* 8E0C0 800F4C10 8FB00018 */ lw $s0, 0x18($sp) -/* 8E0C4 800F4C14 03E00008 */ jr $ra -/* 8E0C8 800F4C18 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4FC4.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4FC4.s deleted file mode 100644 index 6158666b89..0000000000 --- a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4FC4.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800F4FC4 -/* 8E474 800F4FC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8E478 800F4FC8 AFB00010 */ sw $s0, 0x10($sp) -/* 8E47C 800F4FCC 3C108011 */ lui $s0, %hi(gPopupMenu) -/* 8E480 800F4FD0 2610D69C */ addiu $s0, $s0, %lo(gPopupMenu) -/* 8E484 800F4FD4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8E488 800F4FD8 AE040000 */ sw $a0, ($s0) -/* 8E48C 800F4FDC A480032C */ sh $zero, 0x32c($a0) -/* 8E490 800F4FE0 AC80031C */ sw $zero, 0x31c($a0) -/* 8E494 800F4FE4 0C03A635 */ jal func_800E98D4 -/* 8E498 800F4FE8 AC800320 */ sw $zero, 0x320($a0) -/* 8E49C 800F4FEC 3C048011 */ lui $a0, %hi(D_8010D699) -/* 8E4A0 800F4FF0 2484D699 */ addiu $a0, $a0, %lo(D_8010D699) -/* 8E4A4 800F4FF4 3C018011 */ lui $at, %hi(D_8010D69A) -/* 8E4A8 800F4FF8 A022D69A */ sb $v0, %lo(D_8010D69A)($at) -/* 8E4AC 800F4FFC A0800000 */ sb $zero, ($a0) -/* 8E4B0 800F5000 8E100000 */ lw $s0, ($s0) -/* 8E4B4 800F5004 3C068011 */ lui $a2, %hi(D_8010D698) -/* 8E4B8 800F5008 24C6D698 */ addiu $a2, $a2, %lo(D_8010D698) -/* 8E4BC 800F500C 8E030318 */ lw $v1, 0x318($s0) -/* 8E4C0 800F5010 24050001 */ addiu $a1, $zero, 1 -/* 8E4C4 800F5014 28620064 */ slti $v0, $v1, 0x64 -/* 8E4C8 800F5018 1440000C */ bnez $v0, .L800F504C -/* 8E4CC 800F501C A0C50000 */ sb $a1, ($a2) -/* 8E4D0 800F5020 2462FF9C */ addiu $v0, $v1, -0x64 -/* 8E4D4 800F5024 AE020318 */ sw $v0, 0x318($s0) -/* 8E4D8 800F5028 0040182D */ daddu $v1, $v0, $zero -/* 8E4DC 800F502C 28620064 */ slti $v0, $v1, 0x64 -/* 8E4E0 800F5030 14400005 */ bnez $v0, .L800F5048 -/* 8E4E4 800F5034 A0850000 */ sb $a1, ($a0) -/* 8E4E8 800F5038 2462FF9C */ addiu $v0, $v1, -0x64 -/* 8E4EC 800F503C AE020318 */ sw $v0, 0x318($s0) -/* 8E4F0 800F5040 24020002 */ addiu $v0, $zero, 2 -/* 8E4F4 800F5044 A0820000 */ sb $v0, ($a0) -.L800F5048: -/* 8E4F8 800F5048 A0C00000 */ sb $zero, ($a2) -.L800F504C: -/* 8E4FC 800F504C 3C058011 */ lui $a1, %hi(gPopupMenu) -/* 8E500 800F5050 8CA5D69C */ lw $a1, %lo(gPopupMenu)($a1) -/* 8E504 800F5054 24020001 */ addiu $v0, $zero, 1 -/* 8E508 800F5058 3C018011 */ lui $at, %hi(D_8010D68E) -/* 8E50C 800F505C A022D68E */ sb $v0, %lo(D_8010D68E)($at) -/* 8E510 800F5060 24020006 */ addiu $v0, $zero, 6 -/* 8E514 800F5064 3C018011 */ lui $at, %hi(D_8010D68F) -/* 8E518 800F5068 A022D68F */ sb $v0, %lo(D_8010D68F)($at) -/* 8E51C 800F506C 8CA20328 */ lw $v0, 0x328($a1) -/* 8E520 800F5070 8CA40324 */ lw $a0, 0x324($a1) -/* 8E524 800F5074 3C038011 */ lui $v1, %hi(D_8010D648) -/* 8E528 800F5078 2463D648 */ addiu $v1, $v1, %lo(D_8010D648) -/* 8E52C 800F507C 3C018011 */ lui $at, %hi(D_8010D640) -/* 8E530 800F5080 AC20D640 */ sw $zero, %lo(D_8010D640)($at) -/* 8E534 800F5084 AC620000 */ sw $v0, ($v1) -/* 8E538 800F5088 0044102A */ slt $v0, $v0, $a0 -/* 8E53C 800F508C 14400002 */ bnez $v0, .L800F5098 -/* 8E540 800F5090 2482FFFF */ addiu $v0, $a0, -1 -/* 8E544 800F5094 AC620000 */ sw $v0, ($v1) -.L800F5098: -/* 8E548 800F5098 8C620000 */ lw $v0, ($v1) -/* 8E54C 800F509C 3C048011 */ lui $a0, %hi(D_8010D656) -/* 8E550 800F50A0 2484D656 */ addiu $a0, $a0, %lo(D_8010D656) -/* 8E554 800F50A4 3C018011 */ lui $at, %hi(D_8010D654) -/* 8E558 800F50A8 A020D654 */ sb $zero, %lo(D_8010D654)($at) -/* 8E55C 800F50AC 3C018011 */ lui $at, %hi(D_8010D64C) -/* 8E560 800F50B0 AC22D64C */ sw $v0, %lo(D_8010D64C)($at) -/* 8E564 800F50B4 90A20327 */ lbu $v0, 0x327($a1) -/* 8E568 800F50B8 24030006 */ addiu $v1, $zero, 6 -/* 8E56C 800F50BC A0820000 */ sb $v0, ($a0) -/* 8E570 800F50C0 00021600 */ sll $v0, $v0, 0x18 -/* 8E574 800F50C4 00021603 */ sra $v0, $v0, 0x18 -/* 8E578 800F50C8 0062102A */ slt $v0, $v1, $v0 -/* 8E57C 800F50CC 54400001 */ bnel $v0, $zero, .L800F50D4 -/* 8E580 800F50D0 A0830000 */ sb $v1, ($a0) -.L800F50D4: -/* 8E584 800F50D4 8CA20324 */ lw $v0, 0x324($a1) -/* 8E588 800F50D8 3C048011 */ lui $a0, %hi(D_8010D655) -/* 8E58C 800F50DC 2484D655 */ addiu $a0, $a0, %lo(D_8010D655) -/* 8E590 800F50E0 28420006 */ slti $v0, $v0, 6 -/* 8E594 800F50E4 10400003 */ beqz $v0, .L800F50F4 -/* 8E598 800F50E8 A0830000 */ sb $v1, ($a0) -/* 8E59C 800F50EC 90A20327 */ lbu $v0, 0x327($a1) -/* 8E5A0 800F50F0 A0820000 */ sb $v0, ($a0) -.L800F50F4: -/* 8E5A4 800F50F4 240200FF */ addiu $v0, $zero, 0xff -/* 8E5A8 800F50F8 3C018011 */ lui $at, %hi(D_8010D650) -/* 8E5AC 800F50FC AC22D650 */ sw $v0, %lo(D_8010D650)($at) -/* 8E5B0 800F5100 24020004 */ addiu $v0, $zero, 4 -/* 8E5B4 800F5104 3C04800F */ lui $a0, %hi(popup_menu_update) -/* 8E5B8 800F5108 24841A10 */ addiu $a0, $a0, %lo(popup_menu_update) -/* 8E5BC 800F510C 3C018011 */ lui $at, %hi(D_8010D691) -/* 8E5C0 800F5110 A022D691 */ sb $v0, %lo(D_8010D691)($at) -/* 8E5C4 800F5114 3C018011 */ lui $at, %hi(D_8010D692) -/* 8E5C8 800F5118 A023D692 */ sb $v1, %lo(D_8010D692)($at) -/* 8E5CC 800F511C 0C048C8F */ jal create_generic_entity_frontUI -/* 8E5D0 800F5120 0000282D */ daddu $a1, $zero, $zero -/* 8E5D4 800F5124 8FBF0014 */ lw $ra, 0x14($sp) -/* 8E5D8 800F5128 8FB00010 */ lw $s0, 0x10($sp) -/* 8E5DC 800F512C 3C018011 */ lui $at, %hi(D_8010D694) -/* 8E5E0 800F5130 AC22D694 */ sw $v0, %lo(D_8010D694)($at) -/* 8E5E4 800F5134 03E00008 */ jr $ra -/* 8E5E8 800F5138 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F513C.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F513C.s deleted file mode 100644 index f4728c7a6d..0000000000 --- a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F513C.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800F513C -/* 8E5EC 800F513C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8E5F0 800F5140 AFB00010 */ sw $s0, 0x10($sp) -/* 8E5F4 800F5144 3C108011 */ lui $s0, %hi(gPopupMenu) -/* 8E5F8 800F5148 2610D69C */ addiu $s0, $s0, %lo(gPopupMenu) -/* 8E5FC 800F514C AFBF0014 */ sw $ra, 0x14($sp) -/* 8E600 800F5150 AE040000 */ sw $a0, ($s0) -/* 8E604 800F5154 90820323 */ lbu $v0, 0x323($a0) -/* 8E608 800F5158 A480032C */ sh $zero, 0x32c($a0) -/* 8E60C 800F515C 3C018011 */ lui $at, %hi(D_8010D693) -/* 8E610 800F5160 A022D693 */ sb $v0, %lo(D_8010D693)($at) -/* 8E614 800F5164 0C03A635 */ jal func_800E98D4 -/* 8E618 800F5168 00000000 */ nop -/* 8E61C 800F516C 3C048011 */ lui $a0, %hi(D_8010D699) -/* 8E620 800F5170 2484D699 */ addiu $a0, $a0, %lo(D_8010D699) -/* 8E624 800F5174 3C018011 */ lui $at, %hi(D_8010D69A) -/* 8E628 800F5178 A022D69A */ sb $v0, %lo(D_8010D69A)($at) -/* 8E62C 800F517C A0800000 */ sb $zero, ($a0) -/* 8E630 800F5180 8E100000 */ lw $s0, ($s0) -/* 8E634 800F5184 3C068011 */ lui $a2, %hi(D_8010D698) -/* 8E638 800F5188 24C6D698 */ addiu $a2, $a2, %lo(D_8010D698) -/* 8E63C 800F518C 8E030318 */ lw $v1, 0x318($s0) -/* 8E640 800F5190 24050001 */ addiu $a1, $zero, 1 -/* 8E644 800F5194 28620064 */ slti $v0, $v1, 0x64 -/* 8E648 800F5198 1440000C */ bnez $v0, .L800F51CC -/* 8E64C 800F519C A0C50000 */ sb $a1, ($a2) -/* 8E650 800F51A0 2462FF9C */ addiu $v0, $v1, -0x64 -/* 8E654 800F51A4 AE020318 */ sw $v0, 0x318($s0) -/* 8E658 800F51A8 0040182D */ daddu $v1, $v0, $zero -/* 8E65C 800F51AC 28620064 */ slti $v0, $v1, 0x64 -/* 8E660 800F51B0 14400005 */ bnez $v0, .L800F51C8 -/* 8E664 800F51B4 A0850000 */ sb $a1, ($a0) -/* 8E668 800F51B8 2462FF9C */ addiu $v0, $v1, -0x64 -/* 8E66C 800F51BC AE020318 */ sw $v0, 0x318($s0) -/* 8E670 800F51C0 24020002 */ addiu $v0, $zero, 2 -/* 8E674 800F51C4 A0820000 */ sb $v0, ($a0) -.L800F51C8: -/* 8E678 800F51C8 A0C00000 */ sb $zero, ($a2) -.L800F51CC: -/* 8E67C 800F51CC 3C058011 */ lui $a1, %hi(gPopupMenu) -/* 8E680 800F51D0 8CA5D69C */ lw $a1, %lo(gPopupMenu)($a1) -/* 8E684 800F51D4 24020006 */ addiu $v0, $zero, 6 -/* 8E688 800F51D8 3C018011 */ lui $at, %hi(D_8010D68F) -/* 8E68C 800F51DC A022D68F */ sb $v0, %lo(D_8010D68F)($at) -/* 8E690 800F51E0 8CA20328 */ lw $v0, 0x328($a1) -/* 8E694 800F51E4 8CA40324 */ lw $a0, 0x324($a1) -/* 8E698 800F51E8 3C038011 */ lui $v1, %hi(D_8010D648) -/* 8E69C 800F51EC 2463D648 */ addiu $v1, $v1, %lo(D_8010D648) -/* 8E6A0 800F51F0 3C018011 */ lui $at, %hi(D_8010D68E) -/* 8E6A4 800F51F4 A020D68E */ sb $zero, %lo(D_8010D68E)($at) -/* 8E6A8 800F51F8 3C018011 */ lui $at, %hi(D_8010D640) -/* 8E6AC 800F51FC AC20D640 */ sw $zero, %lo(D_8010D640)($at) -/* 8E6B0 800F5200 AC620000 */ sw $v0, ($v1) -/* 8E6B4 800F5204 0044102A */ slt $v0, $v0, $a0 -/* 8E6B8 800F5208 14400002 */ bnez $v0, .L800F5214 -/* 8E6BC 800F520C 2482FFFF */ addiu $v0, $a0, -1 -/* 8E6C0 800F5210 AC620000 */ sw $v0, ($v1) -.L800F5214: -/* 8E6C4 800F5214 8C620000 */ lw $v0, ($v1) -/* 8E6C8 800F5218 3C048011 */ lui $a0, %hi(D_8010D656) -/* 8E6CC 800F521C 2484D656 */ addiu $a0, $a0, %lo(D_8010D656) -/* 8E6D0 800F5220 3C018011 */ lui $at, %hi(D_8010D654) -/* 8E6D4 800F5224 A020D654 */ sb $zero, %lo(D_8010D654)($at) -/* 8E6D8 800F5228 3C018011 */ lui $at, %hi(D_8010D64C) -/* 8E6DC 800F522C AC22D64C */ sw $v0, %lo(D_8010D64C)($at) -/* 8E6E0 800F5230 90A20327 */ lbu $v0, 0x327($a1) -/* 8E6E4 800F5234 24030006 */ addiu $v1, $zero, 6 -/* 8E6E8 800F5238 A0820000 */ sb $v0, ($a0) -/* 8E6EC 800F523C 00021600 */ sll $v0, $v0, 0x18 -/* 8E6F0 800F5240 00021603 */ sra $v0, $v0, 0x18 -/* 8E6F4 800F5244 0062102A */ slt $v0, $v1, $v0 -/* 8E6F8 800F5248 54400001 */ bnel $v0, $zero, .L800F5250 -/* 8E6FC 800F524C A0830000 */ sb $v1, ($a0) -.L800F5250: -/* 8E700 800F5250 8CA20324 */ lw $v0, 0x324($a1) -/* 8E704 800F5254 3C048011 */ lui $a0, %hi(D_8010D655) -/* 8E708 800F5258 2484D655 */ addiu $a0, $a0, %lo(D_8010D655) -/* 8E70C 800F525C 28420006 */ slti $v0, $v0, 6 -/* 8E710 800F5260 10400003 */ beqz $v0, .L800F5270 -/* 8E714 800F5264 A0830000 */ sb $v1, ($a0) -/* 8E718 800F5268 90A20327 */ lbu $v0, 0x327($a1) -/* 8E71C 800F526C A0820000 */ sb $v0, ($a0) -.L800F5270: -/* 8E720 800F5270 240200FF */ addiu $v0, $zero, 0xff -/* 8E724 800F5274 3C018011 */ lui $at, %hi(D_8010D650) -/* 8E728 800F5278 AC22D650 */ sw $v0, %lo(D_8010D650)($at) -/* 8E72C 800F527C 24020009 */ addiu $v0, $zero, 9 -/* 8E730 800F5280 3C018011 */ lui $at, %hi(D_8010D691) -/* 8E734 800F5284 A022D691 */ sb $v0, %lo(D_8010D691)($at) -/* 8E738 800F5288 24020002 */ addiu $v0, $zero, 2 -/* 8E73C 800F528C 3C04800F */ lui $a0, %hi(popup_menu_update) -/* 8E740 800F5290 24841A10 */ addiu $a0, $a0, %lo(popup_menu_update) -/* 8E744 800F5294 3C018011 */ lui $at, %hi(D_8010D692) -/* 8E748 800F5298 A022D692 */ sb $v0, %lo(D_8010D692)($at) -/* 8E74C 800F529C 0C048C8F */ jal create_generic_entity_frontUI -/* 8E750 800F52A0 0000282D */ daddu $a1, $zero, $zero -/* 8E754 800F52A4 8FBF0014 */ lw $ra, 0x14($sp) -/* 8E758 800F52A8 8FB00010 */ lw $s0, 0x10($sp) -/* 8E75C 800F52AC 3C018011 */ lui $at, %hi(D_8010D694) -/* 8E760 800F52B0 AC22D694 */ sw $v0, %lo(D_8010D694)($at) -/* 8E764 800F52B4 03E00008 */ jr $ra -/* 8E768 800F52B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/hide_popup_menu.s b/ver/us/asm/nonmatchings/8a860_len_3f30/hide_popup_menu.s deleted file mode 100644 index e646103704..0000000000 --- a/ver/us/asm/nonmatchings/8a860_len_3f30/hide_popup_menu.s +++ /dev/null @@ -1,124 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8010C330 -.word .L800F13F8_8A8A8, .L800F13F8_8A8A8, .L800F13F8_8A8A8, .L800F13F8_8A8A8, .L800F13F8_8A8A8, .L800F13F8_8A8A8, .L800F13F8_8A8A8, .L800F13F8_8A8A8, .L800F13F8_8A8A8, .L800F13F8_8A8A8, .L800F1414_8A8C4, .L800F1414_8A8C4, .L800F13F8_8A8A8, .L800F1414_8A8C4 - -dlabel jtbl_8010C368 -.word .L800F145C_8A90C, .L800F145C_8A90C, .L800F145C_8A90C, .L800F145C_8A90C, .L800F145C_8A90C, .L800F145C_8A90C, .L800F145C_8A90C, .L800F145C_8A90C, .L800F145C_8A90C, .L800F145C_8A90C, .L800F1470_8A920, .L800F1470_8A920, .L800F145C_8A90C, .L800F1470_8A920 - -.section .text - -glabel hide_popup_menu -/* 8A860 800F13B0 3C028011 */ lui $v0, %hi(D_8010D68E) -/* 8A864 800F13B4 8042D68E */ lb $v0, %lo(D_8010D68E)($v0) -/* 8A868 800F13B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8A86C 800F13BC AFBF0018 */ sw $ra, 0x18($sp) -/* 8A870 800F13C0 AFB10014 */ sw $s1, 0x14($sp) -/* 8A874 800F13C4 1040001A */ beqz $v0, .L800F1430 -/* 8A878 800F13C8 AFB00010 */ sw $s0, 0x10($sp) -/* 8A87C 800F13CC 3C028011 */ lui $v0, %hi(gPopupMenu) -/* 8A880 800F13D0 8C42D69C */ lw $v0, %lo(gPopupMenu)($v0) -/* 8A884 800F13D4 8C430318 */ lw $v1, 0x318($v0) -/* 8A888 800F13D8 2C62000E */ sltiu $v0, $v1, 0xe -/* 8A88C 800F13DC 10400012 */ beqz $v0, .L800F1428 -/* 8A890 800F13E0 00031080 */ sll $v0, $v1, 2 -/* 8A894 800F13E4 3C018011 */ lui $at, %hi(jtbl_8010C330) -/* 8A898 800F13E8 00220821 */ addu $at, $at, $v0 -/* 8A89C 800F13EC 8C22C330 */ lw $v0, %lo(jtbl_8010C330)($at) -/* 8A8A0 800F13F0 00400008 */ jr $v0 -/* 8A8A4 800F13F4 00000000 */ nop -.L800F13F8_8A8A8: -/* 8A8A8 800F13F8 2404000E */ addiu $a0, $zero, 0xe -/* 8A8AC 800F13FC 3C108014 */ lui $s0, %hi(basic_hidden_window_update) -/* 8A8B0 800F1400 26107574 */ addiu $s0, $s0, %lo(basic_hidden_window_update) -/* 8A8B4 800F1404 0C051F9F */ jal set_window_update -/* 8A8B8 800F1408 0200282D */ daddu $a1, $s0, $zero -/* 8A8BC 800F140C 0803C506 */ j .L800F1418 -/* 8A8C0 800F1410 24040013 */ addiu $a0, $zero, 0x13 -.L800F1414_8A8C4: -/* 8A8C4 800F1414 2404000E */ addiu $a0, $zero, 0xe -.L800F1418: -/* 8A8C8 800F1418 3C058014 */ lui $a1, %hi(basic_hidden_window_update) -/* 8A8CC 800F141C 24A57574 */ addiu $a1, $a1, %lo(basic_hidden_window_update) -/* 8A8D0 800F1420 0C051F9F */ jal set_window_update -/* 8A8D4 800F1424 00000000 */ nop -.L800F1428: -/* 8A8D8 800F1428 0803C51D */ j .L800F1474 -/* 8A8DC 800F142C 24040015 */ addiu $a0, $zero, 0x15 -.L800F1430: -/* 8A8E0 800F1430 3C028011 */ lui $v0, %hi(gPopupMenu) -/* 8A8E4 800F1434 8C42D69C */ lw $v0, %lo(gPopupMenu)($v0) -/* 8A8E8 800F1438 8C430318 */ lw $v1, 0x318($v0) -/* 8A8EC 800F143C 2C62000E */ sltiu $v0, $v1, 0xe -/* 8A8F0 800F1440 1040000E */ beqz $v0, .L800F147C -/* 8A8F4 800F1444 00031080 */ sll $v0, $v1, 2 -/* 8A8F8 800F1448 3C018011 */ lui $at, %hi(jtbl_8010C368) -/* 8A8FC 800F144C 00220821 */ addu $at, $at, $v0 -/* 8A900 800F1450 8C22C368 */ lw $v0, %lo(jtbl_8010C368)($at) -/* 8A904 800F1454 00400008 */ jr $v0 -/* 8A908 800F1458 00000000 */ nop -.L800F145C_8A90C: -/* 8A90C 800F145C 2404000E */ addiu $a0, $zero, 0xe -/* 8A910 800F1460 0C051F9F */ jal set_window_update -/* 8A914 800F1464 24050002 */ addiu $a1, $zero, 2 -/* 8A918 800F1468 0803C51D */ j .L800F1474 -/* 8A91C 800F146C 24040013 */ addiu $a0, $zero, 0x13 -.L800F1470_8A920: -/* 8A920 800F1470 2404000E */ addiu $a0, $zero, 0xe -.L800F1474: -/* 8A924 800F1474 0C051F9F */ jal set_window_update -/* 8A928 800F1478 24050002 */ addiu $a1, $zero, 2 -.L800F147C: -/* 8A92C 800F147C 3C118011 */ lui $s1, %hi(gPopupMenu) -/* 8A930 800F1480 2631D69C */ addiu $s1, $s1, %lo(gPopupMenu) -/* 8A934 800F1484 8E220000 */ lw $v0, ($s1) -/* 8A938 800F1488 8C430318 */ lw $v1, 0x318($v0) -/* 8A93C 800F148C 24020003 */ addiu $v0, $zero, 3 -/* 8A940 800F1490 14620008 */ bne $v1, $v0, .L800F14B4 -/* 8A944 800F1494 24040010 */ addiu $a0, $zero, 0x10 -/* 8A948 800F1498 3C108014 */ lui $s0, %hi(basic_hidden_window_update) -/* 8A94C 800F149C 26107574 */ addiu $s0, $s0, %lo(basic_hidden_window_update) -/* 8A950 800F14A0 0C051F9F */ jal set_window_update -/* 8A954 800F14A4 0200282D */ daddu $a1, $s0, $zero -/* 8A958 800F14A8 24040014 */ addiu $a0, $zero, 0x14 -/* 8A95C 800F14AC 0C051F9F */ jal set_window_update -/* 8A960 800F14B0 0200282D */ daddu $a1, $s0, $zero -.L800F14B4: -/* 8A964 800F14B4 8E220000 */ lw $v0, ($s1) -/* 8A968 800F14B8 8C430318 */ lw $v1, 0x318($v0) -/* 8A96C 800F14BC 24020004 */ addiu $v0, $zero, 4 -/* 8A970 800F14C0 14620005 */ bne $v1, $v0, .L800F14D8 -/* 8A974 800F14C4 00000000 */ nop -/* 8A978 800F14C8 3C058014 */ lui $a1, %hi(basic_hidden_window_update) -/* 8A97C 800F14CC 24A57574 */ addiu $a1, $a1, %lo(basic_hidden_window_update) -/* 8A980 800F14D0 0C051F9F */ jal set_window_update -/* 8A984 800F14D4 24040012 */ addiu $a0, $zero, 0x12 -.L800F14D8: -/* 8A988 800F14D8 8E220000 */ lw $v0, ($s1) -/* 8A98C 800F14DC 8C430318 */ lw $v1, 0x318($v0) -/* 8A990 800F14E0 24020005 */ addiu $v0, $zero, 5 -/* 8A994 800F14E4 14620008 */ bne $v1, $v0, .L800F1508 -/* 8A998 800F14E8 24040010 */ addiu $a0, $zero, 0x10 -/* 8A99C 800F14EC 3C108014 */ lui $s0, %hi(basic_hidden_window_update) -/* 8A9A0 800F14F0 26107574 */ addiu $s0, $s0, %lo(basic_hidden_window_update) -/* 8A9A4 800F14F4 0C051F9F */ jal set_window_update -/* 8A9A8 800F14F8 0200282D */ daddu $a1, $s0, $zero -/* 8A9AC 800F14FC 24040014 */ addiu $a0, $zero, 0x14 -/* 8A9B0 800F1500 0C051F9F */ jal set_window_update -/* 8A9B4 800F1504 0200282D */ daddu $a1, $s0, $zero -.L800F1508: -/* 8A9B8 800F1508 3C038011 */ lui $v1, %hi(D_8010D692) -/* 8A9BC 800F150C 8063D692 */ lb $v1, %lo(D_8010D692)($v1) -/* 8A9C0 800F1510 8FBF0018 */ lw $ra, 0x18($sp) -/* 8A9C4 800F1514 8FB10014 */ lw $s1, 0x14($sp) -/* 8A9C8 800F1518 8FB00010 */ lw $s0, 0x10($sp) -/* 8A9CC 800F151C 2402000A */ addiu $v0, $zero, 0xa -/* 8A9D0 800F1520 3C018011 */ lui $at, %hi(D_8010D640) -/* 8A9D4 800F1524 AC22D640 */ sw $v0, %lo(D_8010D640)($at) -/* 8A9D8 800F1528 3C018011 */ lui $at, %hi(D_8010D644) -/* 8A9DC 800F152C AC23D644 */ sw $v1, %lo(D_8010D644)($at) -/* 8A9E0 800F1530 03E00008 */ jr $ra -/* 8A9E4 800F1534 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_title_contents.s b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_title_contents.s deleted file mode 100644 index 1f2bf55d68..0000000000 --- a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_title_contents.s +++ /dev/null @@ -1,198 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8010C8A8 -.word .L800F4694_8DB44, .L800F48A4_8DD54, .L800F4694_8DB44, .L800F47E4_8DC94, .L800F48A4_8DD54, .L800F4694_8DB44, .L800F4694_8DB44, .L800F4694_8DB44, .L800F4804_8DCB4, .L800F4824_8DCD4, .L800F4844_8DCF4, .L800F4864_8DD14, .L800F4884_8DD34, .L800F48A4_8DD54 - -.section .text - -glabel popup_menu_draw_title_contents -/* 8DAF8 800F4648 3C028011 */ lui $v0, %hi(gPopupMenu) -/* 8DAFC 800F464C 8C42D69C */ lw $v0, %lo(gPopupMenu)($v0) -/* 8DB00 800F4650 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8DB04 800F4654 AFBF0034 */ sw $ra, 0x34($sp) -/* 8DB08 800F4658 AFB40030 */ sw $s4, 0x30($sp) -/* 8DB0C 800F465C AFB3002C */ sw $s3, 0x2c($sp) -/* 8DB10 800F4660 AFB20028 */ sw $s2, 0x28($sp) -/* 8DB14 800F4664 AFB10024 */ sw $s1, 0x24($sp) -/* 8DB18 800F4668 AFB00020 */ sw $s0, 0x20($sp) -/* 8DB1C 800F466C 8C430318 */ lw $v1, 0x318($v0) -/* 8DB20 800F4670 2C62000E */ sltiu $v0, $v1, 0xe -/* 8DB24 800F4674 10400097 */ beqz $v0, .L800F48D4 -/* 8DB28 800F4678 00A0A02D */ daddu $s4, $a1, $zero -/* 8DB2C 800F467C 00031080 */ sll $v0, $v1, 2 -/* 8DB30 800F4680 3C018011 */ lui $at, %hi(jtbl_8010C8A8) -/* 8DB34 800F4684 00220821 */ addu $at, $at, $v0 -/* 8DB38 800F4688 8C22C8A8 */ lw $v0, %lo(jtbl_8010C8A8)($at) -/* 8DB3C 800F468C 00400008 */ jr $v0 -/* 8DB40 800F4690 00000000 */ nop -.L800F4694_8DB44: -/* 8DB44 800F4694 3C138011 */ lui $s3, %hi(gPopupMenu) -/* 8DB48 800F4698 2673D69C */ addiu $s3, $s3, %lo(gPopupMenu) -/* 8DB4C 800F469C 8E620000 */ lw $v0, ($s3) -/* 8DB50 800F46A0 8C43031C */ lw $v1, 0x31c($v0) -/* 8DB54 800F46A4 24080001 */ addiu $t0, $zero, 1 -/* 8DB58 800F46A8 10680014 */ beq $v1, $t0, .L800F46FC -/* 8DB5C 800F46AC 28620002 */ slti $v0, $v1, 2 -/* 8DB60 800F46B0 50400005 */ beql $v0, $zero, .L800F46C8 -/* 8DB64 800F46B4 24020002 */ addiu $v0, $zero, 2 -/* 8DB68 800F46B8 10600007 */ beqz $v1, .L800F46D8 -/* 8DB6C 800F46BC 3C04001D */ lui $a0, 0x1d -/* 8DB70 800F46C0 0803D235 */ j .L800F48D4 -/* 8DB74 800F46C4 00000000 */ nop -.L800F46C8: -/* 8DB78 800F46C8 10620025 */ beq $v1, $v0, .L800F4760 -/* 8DB7C 800F46CC 3C04001D */ lui $a0, 0x1d -/* 8DB80 800F46D0 0803D235 */ j .L800F48D4 -/* 8DB84 800F46D4 00000000 */ nop -.L800F46D8: -/* 8DB88 800F46D8 3484003F */ ori $a0, $a0, 0x3f -/* 8DB8C 800F46DC 2685001A */ addiu $a1, $s4, 0x1a -/* 8DB90 800F46E0 24C60002 */ addiu $a2, $a2, 2 -/* 8DB94 800F46E4 3C078011 */ lui $a3, %hi(D_8010D650) -/* 8DB98 800F46E8 8CE7D650 */ lw $a3, %lo(D_8010D650)($a3) -/* 8DB9C 800F46EC 24020032 */ addiu $v0, $zero, 0x32 -/* 8DBA0 800F46F0 AFA20010 */ sw $v0, 0x10($sp) -/* 8DBA4 800F46F4 0803D233 */ j .L800F48CC -/* 8DBA8 800F46F8 AFA80014 */ sw $t0, 0x14($sp) -.L800F46FC: -/* 8DBAC 800F46FC 3C04001D */ lui $a0, 0x1d -/* 8DBB0 800F4700 34840041 */ ori $a0, $a0, 0x41 -/* 8DBB4 800F4704 26850004 */ addiu $a1, $s4, 4 -/* 8DBB8 800F4708 24D20002 */ addiu $s2, $a2, 2 -/* 8DBBC 800F470C 0240302D */ daddu $a2, $s2, $zero -/* 8DBC0 800F4710 3C108011 */ lui $s0, %hi(D_8010D650) -/* 8DBC4 800F4714 2610D650 */ addiu $s0, $s0, %lo(D_8010D650) -/* 8DBC8 800F4718 8E070000 */ lw $a3, ($s0) -/* 8DBCC 800F471C 24110032 */ addiu $s1, $zero, 0x32 -/* 8DBD0 800F4720 AFB10010 */ sw $s1, 0x10($sp) -/* 8DBD4 800F4724 0C04993B */ jal draw_msg -/* 8DBD8 800F4728 AFA80014 */ sw $t0, 0x14($sp) -/* 8DBDC 800F472C 2685005E */ addiu $a1, $s4, 0x5e -/* 8DBE0 800F4730 0240302D */ daddu $a2, $s2, $zero -/* 8DBE4 800F4734 AFB10010 */ sw $s1, 0x10($sp) -/* 8DBE8 800F4738 8E630000 */ lw $v1, ($s3) -/* 8DBEC 800F473C 8E020000 */ lw $v0, ($s0) -/* 8DBF0 800F4740 24130003 */ addiu $s3, $zero, 3 -/* 8DBF4 800F4744 AFB30018 */ sw $s3, 0x18($sp) -/* 8DBF8 800F4748 AFA20014 */ sw $v0, 0x14($sp) -/* 8DBFC 800F474C 8C640320 */ lw $a0, 0x320($v1) -/* 8DC00 800F4750 0C049DA7 */ jal draw_number -/* 8DC04 800F4754 24070001 */ addiu $a3, $zero, 1 -/* 8DC08 800F4758 0803D1EF */ j .L800F47BC -/* 8DC0C 800F475C 24040002 */ addiu $a0, $zero, 2 -.L800F4760: -/* 8DC10 800F4760 34840042 */ ori $a0, $a0, 0x42 -/* 8DC14 800F4764 26850006 */ addiu $a1, $s4, 6 -/* 8DC18 800F4768 24D20002 */ addiu $s2, $a2, 2 -/* 8DC1C 800F476C 0240302D */ daddu $a2, $s2, $zero -/* 8DC20 800F4770 3C108011 */ lui $s0, %hi(D_8010D650) -/* 8DC24 800F4774 2610D650 */ addiu $s0, $s0, %lo(D_8010D650) -/* 8DC28 800F4778 8E070000 */ lw $a3, ($s0) -/* 8DC2C 800F477C 24110032 */ addiu $s1, $zero, 0x32 -/* 8DC30 800F4780 AFB10010 */ sw $s1, 0x10($sp) -/* 8DC34 800F4784 0C04993B */ jal draw_msg -/* 8DC38 800F4788 AFA80014 */ sw $t0, 0x14($sp) -/* 8DC3C 800F478C 2685005E */ addiu $a1, $s4, 0x5e -/* 8DC40 800F4790 0240302D */ daddu $a2, $s2, $zero -/* 8DC44 800F4794 AFB10010 */ sw $s1, 0x10($sp) -/* 8DC48 800F4798 8E630000 */ lw $v1, ($s3) -/* 8DC4C 800F479C 8E020000 */ lw $v0, ($s0) -/* 8DC50 800F47A0 24130003 */ addiu $s3, $zero, 3 -/* 8DC54 800F47A4 AFB30018 */ sw $s3, 0x18($sp) -/* 8DC58 800F47A8 AFA20014 */ sw $v0, 0x14($sp) -/* 8DC5C 800F47AC 8C640320 */ lw $a0, 0x320($v1) -/* 8DC60 800F47B0 0C049DA7 */ jal draw_number -/* 8DC64 800F47B4 24070001 */ addiu $a3, $zero, 1 -/* 8DC68 800F47B8 0260202D */ daddu $a0, $s3, $zero -.L800F47BC: -/* 8DC6C 800F47BC 26850072 */ addiu $a1, $s4, 0x72 -/* 8DC70 800F47C0 0240302D */ daddu $a2, $s2, $zero -/* 8DC74 800F47C4 8E020000 */ lw $v0, ($s0) -/* 8DC78 800F47C8 24070001 */ addiu $a3, $zero, 1 -/* 8DC7C 800F47CC AFB10010 */ sw $s1, 0x10($sp) -/* 8DC80 800F47D0 AFB30018 */ sw $s3, 0x18($sp) -/* 8DC84 800F47D4 0C049DA7 */ jal draw_number -/* 8DC88 800F47D8 AFA20014 */ sw $v0, 0x14($sp) -/* 8DC8C 800F47DC 0803D235 */ j .L800F48D4 -/* 8DC90 800F47E0 00000000 */ nop -.L800F47E4_8DC94: -/* 8DC94 800F47E4 3C04001F */ lui $a0, 0x1f -/* 8DC98 800F47E8 34840032 */ ori $a0, $a0, 0x32 -/* 8DC9C 800F47EC 2685001B */ addiu $a1, $s4, 0x1b -/* 8DCA0 800F47F0 24C60002 */ addiu $a2, $a2, 2 -/* 8DCA4 800F47F4 3C078011 */ lui $a3, %hi(D_8010D650) -/* 8DCA8 800F47F8 8CE7D650 */ lw $a3, %lo(D_8010D650)($a3) -/* 8DCAC 800F47FC 0803D230 */ j .L800F48C0 -/* 8DCB0 800F4800 24020032 */ addiu $v0, $zero, 0x32 -.L800F4804_8DCB4: -/* 8DCB4 800F4804 3C04001F */ lui $a0, 0x1f -/* 8DCB8 800F4808 34840033 */ ori $a0, $a0, 0x33 -/* 8DCBC 800F480C 26850017 */ addiu $a1, $s4, 0x17 -/* 8DCC0 800F4810 24C60002 */ addiu $a2, $a2, 2 -/* 8DCC4 800F4814 3C078011 */ lui $a3, %hi(D_8010D650) -/* 8DCC8 800F4818 8CE7D650 */ lw $a3, %lo(D_8010D650)($a3) -/* 8DCCC 800F481C 0803D230 */ j .L800F48C0 -/* 8DCD0 800F4820 24020032 */ addiu $v0, $zero, 0x32 -.L800F4824_8DCD4: -/* 8DCD4 800F4824 3C04001D */ lui $a0, 0x1d -/* 8DCD8 800F4828 348400D7 */ ori $a0, $a0, 0xd7 -/* 8DCDC 800F482C 26850004 */ addiu $a1, $s4, 4 -/* 8DCE0 800F4830 24C60002 */ addiu $a2, $a2, 2 -/* 8DCE4 800F4834 3C078011 */ lui $a3, %hi(D_8010D650) -/* 8DCE8 800F4838 8CE7D650 */ lw $a3, %lo(D_8010D650)($a3) -/* 8DCEC 800F483C 0803D230 */ j .L800F48C0 -/* 8DCF0 800F4840 24020032 */ addiu $v0, $zero, 0x32 -.L800F4844_8DCF4: -/* 8DCF4 800F4844 3C04001D */ lui $a0, 0x1d -/* 8DCF8 800F4848 348400CE */ ori $a0, $a0, 0xce -/* 8DCFC 800F484C 26850008 */ addiu $a1, $s4, 8 -/* 8DD00 800F4850 24C60002 */ addiu $a2, $a2, 2 -/* 8DD04 800F4854 3C078011 */ lui $a3, %hi(D_8010D650) -/* 8DD08 800F4858 8CE7D650 */ lw $a3, %lo(D_8010D650)($a3) -/* 8DD0C 800F485C 0803D230 */ j .L800F48C0 -/* 8DD10 800F4860 24020032 */ addiu $v0, $zero, 0x32 -.L800F4864_8DD14: -/* 8DD14 800F4864 3C04001D */ lui $a0, 0x1d -/* 8DD18 800F4868 348400D0 */ ori $a0, $a0, 0xd0 -/* 8DD1C 800F486C 26850006 */ addiu $a1, $s4, 6 -/* 8DD20 800F4870 24C60002 */ addiu $a2, $a2, 2 -/* 8DD24 800F4874 3C078011 */ lui $a3, %hi(D_8010D650) -/* 8DD28 800F4878 8CE7D650 */ lw $a3, %lo(D_8010D650)($a3) -/* 8DD2C 800F487C 0803D230 */ j .L800F48C0 -/* 8DD30 800F4880 24020032 */ addiu $v0, $zero, 0x32 -.L800F4884_8DD34: -/* 8DD34 800F4884 3C04001D */ lui $a0, 0x1d -/* 8DD38 800F4888 3484003F */ ori $a0, $a0, 0x3f -/* 8DD3C 800F488C 2685001B */ addiu $a1, $s4, 0x1b -/* 8DD40 800F4890 24C60002 */ addiu $a2, $a2, 2 -/* 8DD44 800F4894 3C078011 */ lui $a3, %hi(D_8010D650) -/* 8DD48 800F4898 8CE7D650 */ lw $a3, %lo(D_8010D650)($a3) -/* 8DD4C 800F489C 0803D230 */ j .L800F48C0 -/* 8DD50 800F48A0 24020032 */ addiu $v0, $zero, 0x32 -.L800F48A4_8DD54: -/* 8DD54 800F48A4 3C04001D */ lui $a0, 0x1d -/* 8DD58 800F48A8 3484003D */ ori $a0, $a0, 0x3d -/* 8DD5C 800F48AC 26850008 */ addiu $a1, $s4, 8 -/* 8DD60 800F48B0 24C60002 */ addiu $a2, $a2, 2 -/* 8DD64 800F48B4 3C078011 */ lui $a3, %hi(D_8010D650) -/* 8DD68 800F48B8 8CE7D650 */ lw $a3, %lo(D_8010D650)($a3) -/* 8DD6C 800F48BC 24020034 */ addiu $v0, $zero, 0x34 -.L800F48C0: -/* 8DD70 800F48C0 AFA20010 */ sw $v0, 0x10($sp) -/* 8DD74 800F48C4 24020001 */ addiu $v0, $zero, 1 -/* 8DD78 800F48C8 AFA20014 */ sw $v0, 0x14($sp) -.L800F48CC: -/* 8DD7C 800F48CC 0C04993B */ jal draw_msg -/* 8DD80 800F48D0 00000000 */ nop -.L800F48D4: -/* 8DD84 800F48D4 8FBF0034 */ lw $ra, 0x34($sp) -/* 8DD88 800F48D8 8FB40030 */ lw $s4, 0x30($sp) -/* 8DD8C 800F48DC 8FB3002C */ lw $s3, 0x2c($sp) -/* 8DD90 800F48E0 8FB20028 */ lw $s2, 0x28($sp) -/* 8DD94 800F48E4 8FB10024 */ lw $s1, 0x24($sp) -/* 8DD98 800F48E8 8FB00020 */ lw $s0, 0x20($sp) -/* 8DD9C 800F48EC 03E00008 */ jr $ra -/* 8DDA0 800F48F0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/E20110/func_802B71E8_E202F8.s b/ver/us/asm/nonmatchings/E20110/func_802B71E8_E202F8.s deleted file mode 100644 index 30e0e5fb72..0000000000 --- a/ver/us/asm/nonmatchings/E20110/func_802B71E8_E202F8.s +++ /dev/null @@ -1,159 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802B71E8_E202F8 -/* E202F8 802B71E8 3C028011 */ lui $v0, %hi(gPlayerStatus+0x4) -/* E202FC 802B71EC 8C42EFCC */ lw $v0, %lo(gPlayerStatus+0x4)($v0) -/* E20300 802B71F0 27BDFF28 */ addiu $sp, $sp, -0xd8 -/* E20304 802B71F4 AFBF00D0 */ sw $ra, 0xd0($sp) -/* E20308 802B71F8 AFB500CC */ sw $s5, 0xcc($sp) -/* E2030C 802B71FC AFB400C8 */ sw $s4, 0xc8($sp) -/* E20310 802B7200 AFB300C4 */ sw $s3, 0xc4($sp) -/* E20314 802B7204 AFB200C0 */ sw $s2, 0xc0($sp) -/* E20318 802B7208 AFB100BC */ sw $s1, 0xbc($sp) -/* E2031C 802B720C 30420010 */ andi $v0, $v0, 0x10 -/* E20320 802B7210 10400086 */ beqz $v0, .L802B742C -/* E20324 802B7214 AFB000B8 */ sw $s0, 0xb8($sp) -/* E20328 802B7218 27B00038 */ addiu $s0, $sp, 0x38 -/* E2032C 802B721C 3C14802B */ lui $s4, %hi(D_802B7CB8_E20DC8) -/* E20330 802B7220 26947CB8 */ addiu $s4, $s4, %lo(D_802B7CB8_E20DC8) -/* E20334 802B7224 8E820000 */ lw $v0, ($s4) -/* E20338 802B7228 0200202D */ daddu $a0, $s0, $zero -/* E2033C 802B722C 8C450010 */ lw $a1, 0x10($v0) -/* E20340 802B7230 3C150001 */ lui $s5, 1 -/* E20344 802B7234 00A0302D */ daddu $a2, $a1, $zero -/* E20348 802B7238 0C019DF0 */ jal guScaleF -/* E2034C 802B723C 00A0382D */ daddu $a3, $a1, $zero -/* E20350 802B7240 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* E20354 802B7244 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* E20358 802B7248 27B10078 */ addiu $s1, $sp, 0x78 -/* E2035C 802B724C 00031080 */ sll $v0, $v1, 2 -/* E20360 802B7250 00431021 */ addu $v0, $v0, $v1 -/* E20364 802B7254 00021080 */ sll $v0, $v0, 2 -/* E20368 802B7258 00431023 */ subu $v0, $v0, $v1 -/* E2036C 802B725C 000218C0 */ sll $v1, $v0, 3 -/* E20370 802B7260 00431021 */ addu $v0, $v0, $v1 -/* E20374 802B7264 000210C0 */ sll $v0, $v0, 3 -/* E20378 802B7268 8E830000 */ lw $v1, ($s4) -/* E2037C 802B726C 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* E20380 802B7270 00220821 */ addu $at, $at, $v0 -/* E20384 802B7274 C4221DEC */ lwc1 $f2, %lo(gCameras+0x6C)($at) -/* E20388 802B7278 C464000C */ lwc1 $f4, 0xc($v1) -/* E2038C 802B727C 44800000 */ mtc1 $zero, $f0 -/* E20390 802B7280 46022101 */ sub.s $f4, $f4, $f2 -/* E20394 802B7284 3C073F80 */ lui $a3, 0x3f80 -/* E20398 802B7288 44060000 */ mfc1 $a2, $f0 -/* E2039C 802B728C 44052000 */ mfc1 $a1, $f4 -/* E203A0 802B7290 0220202D */ daddu $a0, $s1, $zero -/* E203A4 802B7294 0C019EC8 */ jal guRotateF -/* E203A8 802B7298 AFA60010 */ sw $a2, 0x10($sp) -/* E203AC 802B729C 0200202D */ daddu $a0, $s0, $zero -/* E203B0 802B72A0 0220282D */ daddu $a1, $s1, $zero -/* E203B4 802B72A4 0C019D80 */ jal guMtxCatF -/* E203B8 802B72A8 0200302D */ daddu $a2, $s0, $zero -/* E203BC 802B72AC 8E820000 */ lw $v0, ($s4) -/* E203C0 802B72B0 36B51630 */ ori $s5, $s5, 0x1630 -/* E203C4 802B72B4 8C450000 */ lw $a1, ($v0) -/* E203C8 802B72B8 8C460004 */ lw $a2, 4($v0) -/* E203CC 802B72BC 8C470008 */ lw $a3, 8($v0) -/* E203D0 802B72C0 0C019E40 */ jal guTranslateF -/* E203D4 802B72C4 0220202D */ daddu $a0, $s1, $zero -/* E203D8 802B72C8 0200202D */ daddu $a0, $s0, $zero -/* E203DC 802B72CC 0220282D */ daddu $a1, $s1, $zero -/* E203E0 802B72D0 0C019D80 */ jal guMtxCatF -/* E203E4 802B72D4 0220302D */ daddu $a2, $s1, $zero -/* E203E8 802B72D8 0220202D */ daddu $a0, $s1, $zero -/* E203EC 802B72DC 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* E203F0 802B72E0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* E203F4 802B72E4 3C13800A */ lui $s3, %hi(gDisplayContext) -/* E203F8 802B72E8 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) -/* E203FC 802B72EC 96050000 */ lhu $a1, ($s0) -/* E20400 802B72F0 8E620000 */ lw $v0, ($s3) -/* E20404 802B72F4 00052980 */ sll $a1, $a1, 6 -/* E20408 802B72F8 00B52821 */ addu $a1, $a1, $s5 -/* E2040C 802B72FC 0C019D40 */ jal guMtxF2L -/* E20410 802B7300 00452821 */ addu $a1, $v0, $a1 -/* E20414 802B7304 3C03DA38 */ lui $v1, 0xda38 -/* E20418 802B7308 34630002 */ ori $v1, $v1, 2 -/* E2041C 802B730C 0000202D */ daddu $a0, $zero, $zero -/* E20420 802B7310 0080282D */ daddu $a1, $a0, $zero -/* E20424 802B7314 0080302D */ daddu $a2, $a0, $zero -/* E20428 802B7318 3C12800A */ lui $s2, %hi(gMasterGfxPos) -/* E2042C 802B731C 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) -/* E20430 802B7320 0080382D */ daddu $a3, $a0, $zero -/* E20434 802B7324 8E480000 */ lw $t0, ($s2) -/* E20438 802B7328 96020000 */ lhu $v0, ($s0) -/* E2043C 802B732C 0100482D */ daddu $t1, $t0, $zero -/* E20440 802B7330 25080008 */ addiu $t0, $t0, 8 -/* E20444 802B7334 AE480000 */ sw $t0, ($s2) -/* E20448 802B7338 AD230000 */ sw $v1, ($t1) -/* E2044C 802B733C 24430001 */ addiu $v1, $v0, 1 -/* E20450 802B7340 3042FFFF */ andi $v0, $v0, 0xffff -/* E20454 802B7344 00021180 */ sll $v0, $v0, 6 -/* E20458 802B7348 A6030000 */ sh $v1, ($s0) -/* E2045C 802B734C 8E630000 */ lw $v1, ($s3) -/* E20460 802B7350 00551021 */ addu $v0, $v0, $s5 -/* E20464 802B7354 00621821 */ addu $v1, $v1, $v0 -/* E20468 802B7358 25020008 */ addiu $v0, $t0, 8 -/* E2046C 802B735C AD230004 */ sw $v1, 4($t1) -/* E20470 802B7360 AE420000 */ sw $v0, ($s2) -/* E20474 802B7364 3C02DE00 */ lui $v0, 0xde00 -/* E20478 802B7368 AD020000 */ sw $v0, ($t0) -/* E2047C 802B736C 3C02802B */ lui $v0, %hi(D_802B7C40_E20D50) -/* E20480 802B7370 24427C40 */ addiu $v0, $v0, %lo(D_802B7C40_E20D50) -/* E20484 802B7374 AD020004 */ sw $v0, 4($t0) -/* E20488 802B7378 3C02802B */ lui $v0, %hi(D_802B7A20_E20B30) -/* E2048C 802B737C 24427A20 */ addiu $v0, $v0, %lo(D_802B7A20_E20B30) -/* E20490 802B7380 AFA20020 */ sw $v0, 0x20($sp) -/* E20494 802B7384 3C02802B */ lui $v0, %hi(D_802B7C20_E20D30) -/* E20498 802B7388 24427C20 */ addiu $v0, $v0, %lo(D_802B7C20_E20D30) -/* E2049C 802B738C AFA20024 */ sw $v0, 0x24($sp) -/* E204A0 802B7390 24020020 */ addiu $v0, $zero, 0x20 -/* E204A4 802B7394 A7A20028 */ sh $v0, 0x28($sp) -/* E204A8 802B7398 A7A2002A */ sh $v0, 0x2a($sp) -/* E204AC 802B739C 2402FFF0 */ addiu $v0, $zero, -0x10 -/* E204B0 802B73A0 A7A2002C */ sh $v0, 0x2c($sp) -/* E204B4 802B73A4 2402001A */ addiu $v0, $zero, 0x1a -/* E204B8 802B73A8 A7A2002E */ sh $v0, 0x2e($sp) -/* E204BC 802B73AC 240200FF */ addiu $v0, $zero, 0xff -/* E204C0 802B73B0 A3A20030 */ sb $v0, 0x30($sp) -/* E204C4 802B73B4 24020440 */ addiu $v0, $zero, 0x440 -/* E204C8 802B73B8 AFA00010 */ sw $zero, 0x10($sp) -/* E204CC 802B73BC AFA00014 */ sw $zero, 0x14($sp) -/* E204D0 802B73C0 0C04EAA7 */ jal fold_update -/* E204D4 802B73C4 AFA20018 */ sw $v0, 0x18($sp) -/* E204D8 802B73C8 0000202D */ daddu $a0, $zero, $zero -/* E204DC 802B73CC 8E820000 */ lw $v0, ($s4) -/* E204E0 802B73D0 24050006 */ addiu $a1, $zero, 6 -/* E204E4 802B73D4 90460024 */ lbu $a2, 0x24($v0) -/* E204E8 802B73D8 240200FF */ addiu $v0, $zero, 0xff -/* E204EC 802B73DC AFA20014 */ sw $v0, 0x14($sp) -/* E204F0 802B73E0 24020448 */ addiu $v0, $zero, 0x448 -/* E204F4 802B73E4 AFA20018 */ sw $v0, 0x18($sp) -/* E204F8 802B73E8 00C0382D */ daddu $a3, $a2, $zero -/* E204FC 802B73EC 0C04EAA7 */ jal fold_update -/* E20500 802B73F0 AFA60010 */ sw $a2, 0x10($sp) -/* E20504 802B73F4 0000202D */ daddu $a0, $zero, $zero -/* E20508 802B73F8 27A50020 */ addiu $a1, $sp, 0x20 -/* E2050C 802B73FC 0080302D */ daddu $a2, $a0, $zero -/* E20510 802B7400 0C04EBDC */ jal fold_appendGfx_component -/* E20514 802B7404 0220382D */ daddu $a3, $s1, $zero -/* E20518 802B7408 3C04D838 */ lui $a0, 0xd838 -/* E2051C 802B740C 8E420000 */ lw $v0, ($s2) -/* E20520 802B7410 34840002 */ ori $a0, $a0, 2 -/* E20524 802B7414 0040182D */ daddu $v1, $v0, $zero -/* E20528 802B7418 24420008 */ addiu $v0, $v0, 8 -/* E2052C 802B741C AE420000 */ sw $v0, ($s2) -/* E20530 802B7420 24020040 */ addiu $v0, $zero, 0x40 -/* E20534 802B7424 AC640000 */ sw $a0, ($v1) -/* E20538 802B7428 AC620004 */ sw $v0, 4($v1) -.L802B742C: -/* E2053C 802B742C 8FBF00D0 */ lw $ra, 0xd0($sp) -/* E20540 802B7430 8FB500CC */ lw $s5, 0xcc($sp) -/* E20544 802B7434 8FB400C8 */ lw $s4, 0xc8($sp) -/* E20548 802B7438 8FB300C4 */ lw $s3, 0xc4($sp) -/* E2054C 802B743C 8FB200C0 */ lw $s2, 0xc0($sp) -/* E20550 802B7440 8FB100BC */ lw $s1, 0xbc($sp) -/* E20554 802B7444 8FB000B8 */ lw $s0, 0xb8($sp) -/* E20558 802B7448 03E00008 */ jr $ra -/* E2055C 802B744C 27BD00D8 */ addiu $sp, $sp, 0xd8 diff --git a/ver/us/asm/nonmatchings/E20110/func_802B7728_E20838.s b/ver/us/asm/nonmatchings/E20110/func_802B7728_E20838.s deleted file mode 100644 index 43b0a03ccd..0000000000 --- a/ver/us/asm/nonmatchings/E20110/func_802B7728_E20838.s +++ /dev/null @@ -1,197 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802B7D88_E20E98 -.double 0.05 - -dlabel D_802B7D90_E20EA0 -.double 0.55, 0.0 - -.section .text - -glabel func_802B7728_E20838 -/* E20838 802B7728 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E2083C 802B772C AFB00010 */ sw $s0, 0x10($sp) -/* E20840 802B7730 241000FF */ addiu $s0, $zero, 0xff -/* E20844 802B7734 AFBF0018 */ sw $ra, 0x18($sp) -/* E20848 802B7738 0C0ADD7A */ jal func_802B75E8_E206F8 -/* E2084C 802B773C AFB10014 */ sw $s1, 0x14($sp) -/* E20850 802B7740 3C03802B */ lui $v1, %hi(D_802B7CB8_E20DC8) -/* E20854 802B7744 24637CB8 */ addiu $v1, $v1, %lo(D_802B7CB8_E20DC8) -/* E20858 802B7748 8C640000 */ lw $a0, ($v1) -/* E2085C 802B774C 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* E20860 802B7750 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* E20864 802B7754 90850023 */ lbu $a1, 0x23($a0) -/* E20868 802B7758 24020001 */ addiu $v0, $zero, 1 -/* E2086C 802B775C 10A20026 */ beq $a1, $v0, .L802B77F8 -/* E20870 802B7760 28A20002 */ slti $v0, $a1, 2 -/* E20874 802B7764 10400005 */ beqz $v0, .L802B777C -/* E20878 802B7768 24020002 */ addiu $v0, $zero, 2 -/* E2087C 802B776C 10A00009 */ beqz $a1, .L802B7794 -/* E20880 802B7770 00000000 */ nop -/* E20884 802B7774 080ADE4A */ j .L802B7928 -/* E20888 802B7778 00000000 */ nop -.L802B777C: -/* E2088C 802B777C 10A20027 */ beq $a1, $v0, .L802B781C -/* E20890 802B7780 24020003 */ addiu $v0, $zero, 3 -/* E20894 802B7784 10A20033 */ beq $a1, $v0, .L802B7854 -/* E20898 802B7788 00000000 */ nop -/* E2089C 802B778C 080ADE4A */ j .L802B7928 -/* E208A0 802B7790 00000000 */ nop -.L802B7794: -/* E208A4 802B7794 C4800010 */ lwc1 $f0, 0x10($a0) -/* E208A8 802B7798 3C01802B */ lui $at, %hi(D_802B7D88_E20E98) -/* E208AC 802B779C D4227D88 */ ldc1 $f2, %lo(D_802B7D88_E20E98)($at) -/* E208B0 802B77A0 3C01802B */ lui $at, %hi(D_802B7D90_E20EA0) -/* E208B4 802B77A4 D4247D90 */ ldc1 $f4, %lo(D_802B7D90_E20EA0)($at) -/* E208B8 802B77A8 46000021 */ cvt.d.s $f0, $f0 -/* E208BC 802B77AC 46220000 */ add.d $f0, $f0, $f2 -/* E208C0 802B77B0 AC80000C */ sw $zero, 0xc($a0) -/* E208C4 802B77B4 46200020 */ cvt.s.d $f0, $f0 -/* E208C8 802B77B8 460000A1 */ cvt.d.s $f2, $f0 -/* E208CC 802B77BC 4622203E */ c.le.d $f4, $f2 -/* E208D0 802B77C0 00000000 */ nop -/* E208D4 802B77C4 45000058 */ bc1f .L802B7928 -/* E208D8 802B77C8 E4800010 */ swc1 $f0, 0x10($a0) -/* E208DC 802B77CC 90820023 */ lbu $v0, 0x23($a0) -/* E208E0 802B77D0 3C013F0C */ lui $at, 0x3f0c -/* E208E4 802B77D4 3421CCCD */ ori $at, $at, 0xcccd -/* E208E8 802B77D8 44810000 */ mtc1 $at, $f0 -/* E208EC 802B77DC 24420001 */ addiu $v0, $v0, 1 -/* E208F0 802B77E0 E4800010 */ swc1 $f0, 0x10($a0) -/* E208F4 802B77E4 A0820023 */ sb $v0, 0x23($a0) -/* E208F8 802B77E8 8C630000 */ lw $v1, ($v1) -/* E208FC 802B77EC 2402000C */ addiu $v0, $zero, 0xc -/* E20900 802B77F0 080ADE4A */ j .L802B7928 -/* E20904 802B77F4 AC620014 */ sw $v0, 0x14($v1) -.L802B77F8: -/* E20908 802B77F8 8C820014 */ lw $v0, 0x14($a0) -/* E2090C 802B77FC AC80000C */ sw $zero, 0xc($a0) -/* E20910 802B7800 2442FFFF */ addiu $v0, $v0, -1 -/* E20914 802B7804 1C400048 */ bgtz $v0, .L802B7928 -/* E20918 802B7808 AC820014 */ sw $v0, 0x14($a0) -/* E2091C 802B780C 90820023 */ lbu $v0, 0x23($a0) -/* E20920 802B7810 24420001 */ addiu $v0, $v0, 1 -/* E20924 802B7814 080ADE4A */ j .L802B7928 -/* E20928 802B7818 A0820023 */ sb $v0, 0x23($a0) -.L802B781C: -/* E2092C 802B781C C48C000C */ lwc1 $f12, 0xc($a0) -/* E20930 802B7820 3C014120 */ lui $at, 0x4120 -/* E20934 802B7824 44810000 */ mtc1 $at, $f0 -/* E20938 802B7828 00000000 */ nop -/* E2093C 802B782C 46006300 */ add.s $f12, $f12, $f0 -/* E20940 802B7830 3C0143B4 */ lui $at, 0x43b4 -/* E20944 802B7834 44810000 */ mtc1 $at, $f0 -/* E20948 802B7838 00000000 */ nop -/* E2094C 802B783C 460C003E */ c.le.s $f0, $f12 -/* E20950 802B7840 00000000 */ nop -/* E20954 802B7844 45030001 */ bc1tl .L802B784C -/* E20958 802B7848 46006301 */ sub.s $f12, $f12, $f0 -.L802B784C: -/* E2095C 802B784C 080ADE47 */ j .L802B791C -/* E20960 802B7850 E48C000C */ swc1 $f12, 0xc($a0) -.L802B7854: -/* E20964 802B7854 C48C000C */ lwc1 $f12, 0xc($a0) -/* E20968 802B7858 3C0141C8 */ lui $at, 0x41c8 -/* E2096C 802B785C 44810000 */ mtc1 $at, $f0 -/* E20970 802B7860 00000000 */ nop -/* E20974 802B7864 46006300 */ add.s $f12, $f12, $f0 -/* E20978 802B7868 3C0143B4 */ lui $at, 0x43b4 -/* E2097C 802B786C 44810000 */ mtc1 $at, $f0 -/* E20980 802B7870 00000000 */ nop -/* E20984 802B7874 460C003E */ c.le.s $f0, $f12 -/* E20988 802B7878 00000000 */ nop -/* E2098C 802B787C 45030001 */ bc1tl .L802B7884 -/* E20990 802B7880 46006301 */ sub.s $f12, $f12, $f0 -.L802B7884: -/* E20994 802B7884 8C82001C */ lw $v0, 0x1c($a0) -/* E20998 802B7888 E48C000C */ swc1 $f12, 0xc($a0) -/* E2099C 802B788C 2442FFE7 */ addiu $v0, $v0, -0x19 -/* E209A0 802B7890 04410002 */ bgez $v0, .L802B789C -/* E209A4 802B7894 AC82001C */ sw $v0, 0x1c($a0) -/* E209A8 802B7898 AC80001C */ sw $zero, 0x1c($a0) -.L802B789C: -/* E209AC 802B789C 3C01428C */ lui $at, 0x428c -/* E209B0 802B78A0 44810000 */ mtc1 $at, $f0 -/* E209B4 802B78A4 00000000 */ nop -/* E209B8 802B78A8 460C003E */ c.le.s $f0, $f12 -/* E209BC 802B78AC 00000000 */ nop -/* E209C0 802B78B0 45000008 */ bc1f .L802B78D4 -/* E209C4 802B78B4 00000000 */ nop -/* E209C8 802B78B8 3C0142DC */ lui $at, 0x42dc -/* E209CC 802B78BC 44810000 */ mtc1 $at, $f0 -/* E209D0 802B78C0 00000000 */ nop -/* E209D4 802B78C4 4600603E */ c.le.s $f12, $f0 -/* E209D8 802B78C8 00000000 */ nop -/* E209DC 802B78CC 4501000F */ bc1t .L802B790C -/* E209E0 802B78D0 00000000 */ nop -.L802B78D4: -/* E209E4 802B78D4 3C01437A */ lui $at, 0x437a -/* E209E8 802B78D8 44810000 */ mtc1 $at, $f0 -/* E209EC 802B78DC 00000000 */ nop -/* E209F0 802B78E0 460C003E */ c.le.s $f0, $f12 -/* E209F4 802B78E4 00000000 */ nop -/* E209F8 802B78E8 4500000C */ bc1f .L802B791C -/* E209FC 802B78EC 00000000 */ nop -/* E20A00 802B78F0 3C014391 */ lui $at, 0x4391 -/* E20A04 802B78F4 44810000 */ mtc1 $at, $f0 -/* E20A08 802B78F8 00000000 */ nop -/* E20A0C 802B78FC 4600603E */ c.le.s $f12, $f0 -/* E20A10 802B7900 00000000 */ nop -/* E20A14 802B7904 45000005 */ bc1f .L802B791C -/* E20A18 802B7908 00000000 */ nop -.L802B790C: -/* E20A1C 802B790C 3C02802B */ lui $v0, %hi(func_802B79C8_E20AD8) -/* E20A20 802B7910 244279C8 */ addiu $v0, $v0, %lo(func_802B79C8_E20AD8) -/* E20A24 802B7914 3C018011 */ lui $at, %hi(D_8010C958) -/* E20A28 802B7918 AC22C958 */ sw $v0, %lo(D_8010C958)($at) -.L802B791C: -/* E20A2C 802B791C 0C0ADC00 */ jal E20110_UnkAngleFunc1 -/* E20A30 802B7920 00000000 */ nop -/* E20A34 802B7924 0040802D */ daddu $s0, $v0, $zero -.L802B7928: -/* E20A38 802B7928 3C02802B */ lui $v0, %hi(D_802B7CB8_E20DC8) -/* E20A3C 802B792C 8C427CB8 */ lw $v0, %lo(D_802B7CB8_E20DC8)($v0) -/* E20A40 802B7930 A0500024 */ sb $s0, 0x24($v0) -/* E20A44 802B7934 0C0ADD14 */ jal func_802B7450_E20560 -/* E20A48 802B7938 823000B4 */ lb $s0, 0xb4($s1) -/* E20A4C 802B793C 1040000A */ beqz $v0, .L802B7968 -/* E20A50 802B7940 00000000 */ nop -/* E20A54 802B7944 82220015 */ lb $v0, 0x15($s1) -/* E20A58 802B7948 14400007 */ bnez $v0, .L802B7968 -/* E20A5C 802B794C 00000000 */ nop -/* E20A60 802B7950 8E220000 */ lw $v0, ($s1) -/* E20A64 802B7954 30420020 */ andi $v0, $v0, 0x20 -/* E20A68 802B7958 14400003 */ bnez $v0, .L802B7968 -/* E20A6C 802B795C 2E020003 */ sltiu $v0, $s0, 3 -/* E20A70 802B7960 14400005 */ bnez $v0, .L802B7978 -/* E20A74 802B7964 00000000 */ nop -.L802B7968: -/* E20A78 802B7968 3C03802B */ lui $v1, %hi(D_802B7CB8_E20DC8) -/* E20A7C 802B796C 8C637CB8 */ lw $v1, %lo(D_802B7CB8_E20DC8)($v1) -/* E20A80 802B7970 24020003 */ addiu $v0, $zero, 3 -/* E20A84 802B7974 A0620023 */ sb $v0, 0x23($v1) -.L802B7978: -/* E20A88 802B7978 862400C6 */ lh $a0, 0xc6($s1) -/* E20A8C 802B797C 962200C6 */ lhu $v0, 0xc6($s1) -/* E20A90 802B7980 0480000C */ bltz $a0, .L802B79B4 -/* E20A94 802B7984 30424000 */ andi $v0, $v0, 0x4000 -/* E20A98 802B7988 1040000A */ beqz $v0, .L802B79B4 -/* E20A9C 802B798C 00000000 */ nop -/* E20AA0 802B7990 0C04417A */ jal get_entity_by_index -/* E20AA4 802B7994 00000000 */ nop -/* E20AA8 802B7998 8C420000 */ lw $v0, ($v0) -/* E20AAC 802B799C 30421000 */ andi $v0, $v0, 0x1000 -/* E20AB0 802B79A0 14400004 */ bnez $v0, .L802B79B4 -/* E20AB4 802B79A4 24020003 */ addiu $v0, $zero, 3 -/* E20AB8 802B79A8 3C03802B */ lui $v1, %hi(D_802B7CB8_E20DC8) -/* E20ABC 802B79AC 8C637CB8 */ lw $v1, %lo(D_802B7CB8_E20DC8)($v1) -/* E20AC0 802B79B0 A0620023 */ sb $v0, 0x23($v1) -.L802B79B4: -/* E20AC4 802B79B4 8FBF0018 */ lw $ra, 0x18($sp) -/* E20AC8 802B79B8 8FB10014 */ lw $s1, 0x14($sp) -/* E20ACC 802B79BC 8FB00010 */ lw $s0, 0x10($sp) -/* E20AD0 802B79C0 03E00008 */ jr $ra -/* E20AD4 802B79C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EB7540/func_80240478_EB76A8.s b/ver/us/asm/nonmatchings/EB7540/func_80240478_EB76A8.s deleted file mode 100644 index 67bf44b9a5..0000000000 --- a/ver/us/asm/nonmatchings/EB7540/func_80240478_EB76A8.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240478_EB76A8 -/* EB76A8 80240478 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* EB76AC 8024047C AFB10014 */ sw $s1, 0x14($sp) -/* EB76B0 80240480 0080882D */ daddu $s1, $a0, $zero -/* EB76B4 80240484 AFBF0018 */ sw $ra, 0x18($sp) -/* EB76B8 80240488 AFB00010 */ sw $s0, 0x10($sp) -/* EB76BC 8024048C F7B60028 */ sdc1 $f22, 0x28($sp) -/* EB76C0 80240490 F7B40020 */ sdc1 $f20, 0x20($sp) -/* EB76C4 80240494 8E30000C */ lw $s0, 0xc($s1) -/* EB76C8 80240498 8E050000 */ lw $a1, ($s0) -/* EB76CC 8024049C 0C0B55FF */ jal dead_evt_get_float_variable -/* EB76D0 802404A0 26100004 */ addiu $s0, $s0, 4 -/* EB76D4 802404A4 8E050000 */ lw $a1, ($s0) -/* EB76D8 802404A8 26100004 */ addiu $s0, $s0, 4 -/* EB76DC 802404AC 0220202D */ daddu $a0, $s1, $zero -/* EB76E0 802404B0 0C0B55FF */ jal dead_evt_get_float_variable -/* EB76E4 802404B4 46000586 */ mov.s $f22, $f0 -/* EB76E8 802404B8 0220202D */ daddu $a0, $s1, $zero -/* EB76EC 802404BC 8E050000 */ lw $a1, ($s0) -/* EB76F0 802404C0 0C0B55FF */ jal dead_evt_get_float_variable -/* EB76F4 802404C4 46000506 */ mov.s $f20, $f0 -/* EB76F8 802404C8 8E2300BC */ lw $v1, 0xbc($s1) -/* EB76FC 802404CC 8C62000C */ lw $v0, 0xc($v1) -/* EB7700 802404D0 E4560038 */ swc1 $f22, 0x38($v0) -/* EB7704 802404D4 8C62000C */ lw $v0, 0xc($v1) -/* EB7708 802404D8 E454003C */ swc1 $f20, 0x3c($v0) -/* EB770C 802404DC 8C62000C */ lw $v0, 0xc($v1) -/* EB7710 802404E0 E4400040 */ swc1 $f0, 0x40($v0) -/* EB7714 802404E4 8FBF0018 */ lw $ra, 0x18($sp) -/* EB7718 802404E8 8FB10014 */ lw $s1, 0x14($sp) -/* EB771C 802404EC 8FB00010 */ lw $s0, 0x10($sp) -/* EB7720 802404F0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* EB7724 802404F4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* EB7728 802404F8 24020002 */ addiu $v0, $zero, 2 -/* EB772C 802404FC 03E00008 */ jr $ra -/* EB7730 80240500 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/EB7540/func_80240520_EB7750.s b/ver/us/asm/nonmatchings/EB7540/func_80240520_EB7750.s deleted file mode 100644 index 6a84e52dab..0000000000 --- a/ver/us/asm/nonmatchings/EB7540/func_80240520_EB7750.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80241C10_EB8E40 -.double 990.0, 2.732579860045591e+204 - -.section .text - -glabel func_80240520_EB7750 -/* EB7750 80240520 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EB7754 80240524 AFB20018 */ sw $s2, 0x18($sp) -/* EB7758 80240528 0080902D */ daddu $s2, $a0, $zero -/* EB775C 8024052C AFBF001C */ sw $ra, 0x1c($sp) -/* EB7760 80240530 AFB10014 */ sw $s1, 0x14($sp) -/* EB7764 80240534 AFB00010 */ sw $s0, 0x10($sp) -/* EB7768 80240538 8E4400AC */ lw $a0, 0xac($s2) -/* EB776C 8024053C 0C0462EC */ jal dead_get_entity_by_index -/* EB7770 80240540 00A0802D */ daddu $s0, $a1, $zero -/* EB7774 80240544 12000004 */ beqz $s0, .L80240558 -/* EB7778 80240548 0040882D */ daddu $s1, $v0, $zero -/* EB777C 8024054C 2402003C */ addiu $v0, $zero, 0x3c -/* EB7780 80240550 AE400070 */ sw $zero, 0x70($s2) -/* EB7784 80240554 AE420074 */ sw $v0, 0x74($s2) -.L80240558: -/* EB7788 80240558 C6400074 */ lwc1 $f0, 0x74($s2) -/* EB778C 8024055C 46800020 */ cvt.s.w $f0, $f0 -/* EB7790 80240560 3C014270 */ lui $at, 0x4270 -/* EB7794 80240564 44811000 */ mtc1 $at, $f2 -/* EB7798 80240568 3C014049 */ lui $at, 0x4049 -/* EB779C 8024056C 34210FD8 */ ori $at, $at, 0xfd8 -/* EB77A0 80240570 44816000 */ mtc1 $at, $f12 -/* EB77A4 80240574 46020003 */ div.s $f0, $f0, $f2 -/* EB77A8 80240578 E6200054 */ swc1 $f0, 0x54($s1) -/* EB77AC 8024057C C6400074 */ lwc1 $f0, 0x74($s2) -/* EB77B0 80240580 46800020 */ cvt.s.w $f0, $f0 -/* EB77B4 80240584 46020003 */ div.s $f0, $f0, $f2 -/* EB77B8 80240588 460C0302 */ mul.s $f12, $f0, $f12 -/* EB77BC 8024058C 00000000 */ nop -/* EB77C0 80240590 E6200058 */ swc1 $f0, 0x58($s1) -/* EB77C4 80240594 C6400074 */ lwc1 $f0, 0x74($s2) -/* EB77C8 80240598 46800020 */ cvt.s.w $f0, $f0 -/* EB77CC 8024059C 46020003 */ div.s $f0, $f0, $f2 -/* EB77D0 802405A0 0C00AD30 */ jal dead_cos_rad -/* EB77D4 802405A4 E620005C */ swc1 $f0, 0x5c($s1) -/* EB77D8 802405A8 3C013F80 */ lui $at, 0x3f80 -/* EB77DC 802405AC 44811000 */ mtc1 $at, $f2 -/* EB77E0 802405B0 00000000 */ nop -/* EB77E4 802405B4 46001081 */ sub.s $f2, $f2, $f0 -/* EB77E8 802405B8 3C018024 */ lui $at, %hi(D_80241C10_EB8E40) -/* EB77EC 802405BC D4201C10 */ ldc1 $f0, %lo(D_80241C10_EB8E40)($at) -/* EB77F0 802405C0 460010A1 */ cvt.d.s $f2, $f2 -/* EB77F4 802405C4 46201082 */ mul.d $f2, $f2, $f0 -/* EB77F8 802405C8 00000000 */ nop -/* EB77FC 802405CC 3C013FE0 */ lui $at, 0x3fe0 -/* EB7800 802405D0 44810800 */ mtc1 $at, $f1 -/* EB7804 802405D4 44800000 */ mtc1 $zero, $f0 -/* EB7808 802405D8 00000000 */ nop -/* EB780C 802405DC 46201082 */ mul.d $f2, $f2, $f0 -/* EB7810 802405E0 00000000 */ nop -/* EB7814 802405E4 462010A0 */ cvt.s.d $f2, $f2 -/* EB7818 802405E8 E6220064 */ swc1 $f2, 0x64($s1) -/* EB781C 802405EC 8E430074 */ lw $v1, 0x74($s2) -/* EB7820 802405F0 2463FFFF */ addiu $v1, $v1, -1 -/* EB7824 802405F4 00031027 */ nor $v0, $zero, $v1 -/* EB7828 802405F8 2C420001 */ sltiu $v0, $v0, 1 -/* EB782C 802405FC AE430074 */ sw $v1, 0x74($s2) -/* EB7830 80240600 8FBF001C */ lw $ra, 0x1c($sp) -/* EB7834 80240604 8FB20018 */ lw $s2, 0x18($sp) -/* EB7838 80240608 8FB10014 */ lw $s1, 0x14($sp) -/* EB783C 8024060C 8FB00010 */ lw $s0, 0x10($sp) -/* EB7840 80240610 00021040 */ sll $v0, $v0, 1 -/* EB7844 80240614 03E00008 */ jr $ra -/* EB7848 80240618 27BD0020 */ addiu $sp, $sp, 0x20 -/* EB784C 8024061C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/ED46D0/func_802404B0_ED46D0.s b/ver/us/asm/nonmatchings/ED46D0/ED46D0_UnkModelFunc000.s similarity index 99% rename from ver/us/asm/nonmatchings/ED46D0/func_802404B0_ED46D0.s rename to ver/us/asm/nonmatchings/ED46D0/ED46D0_UnkModelFunc000.s index c7f9d86824..68610f67b7 100644 --- a/ver/us/asm/nonmatchings/ED46D0/func_802404B0_ED46D0.s +++ b/ver/us/asm/nonmatchings/ED46D0/ED46D0_UnkModelFunc000.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802404B0_ED46D0 +glabel ED46D0_UnkModelFunc000 /* ED46D0 802404B0 27BDFFB0 */ addiu $sp, $sp, -0x50 /* ED46D4 802404B4 AFB60040 */ sw $s6, 0x40($sp) /* ED46D8 802404B8 0080B02D */ daddu $s6, $a0, $zero @@ -90,8 +90,8 @@ glabel func_802404B0_ED46D0 /* ED47FC 802405DC 004A1021 */ addu $v0, $v0, $t2 /* ED4800 802405E0 AFAA0014 */ sw $t2, 0x14($sp) /* ED4804 802405E4 AFAA0010 */ sw $t2, 0x10($sp) -/* ED4808 802405E8 3C0A800A */ lui $t2, %hi(D_800A15A4) -/* ED480C 802405EC 8D4A15A4 */ lw $t2, %lo(D_800A15A4)($t2) +/* ED4808 802405E8 3C0A800A */ lui $t2, %hi(dead_nuGfxCfb_ptr) +/* ED480C 802405EC 8D4A15A4 */ lw $t2, %lo(dead_nuGfxCfb_ptr)($t2) /* ED4810 802405F0 00021040 */ sll $v0, $v0, 1 /* ED4814 802405F4 AFAA0018 */ sw $t2, 0x18($sp) /* ED4818 802405F8 8FAA0010 */ lw $t2, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/ED46D0/func_80240B10_ED4D30.s b/ver/us/asm/nonmatchings/ED46D0/func_80240B10_ED4D30.s deleted file mode 100644 index 92a95573f1..0000000000 --- a/ver/us/asm/nonmatchings/ED46D0/func_80240B10_ED4D30.s +++ /dev/null @@ -1,540 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B10_ED4D30 -/* ED4D30 80240B10 27BDFF68 */ addiu $sp, $sp, -0x98 -/* ED4D34 80240B14 24040030 */ addiu $a0, $zero, 0x30 -/* ED4D38 80240B18 3C038008 */ lui $v1, %hi(dead_gCurrentCameraID) -/* ED4D3C 80240B1C 8C63C760 */ lw $v1, %lo(dead_gCurrentCameraID)($v1) -/* ED4D40 80240B20 3C05800C */ lui $a1, %hi(dead_gCameras) -/* ED4D44 80240B24 24A58D80 */ addiu $a1, $a1, %lo(dead_gCameras) -/* ED4D48 80240B28 AFBF0064 */ sw $ra, 0x64($sp) -/* ED4D4C 80240B2C AFBE0060 */ sw $fp, 0x60($sp) -/* ED4D50 80240B30 AFB7005C */ sw $s7, 0x5c($sp) -/* ED4D54 80240B34 AFB60058 */ sw $s6, 0x58($sp) -/* ED4D58 80240B38 AFB50054 */ sw $s5, 0x54($sp) -/* ED4D5C 80240B3C AFB40050 */ sw $s4, 0x50($sp) -/* ED4D60 80240B40 AFB3004C */ sw $s3, 0x4c($sp) -/* ED4D64 80240B44 AFB20048 */ sw $s2, 0x48($sp) -/* ED4D68 80240B48 AFB10044 */ sw $s1, 0x44($sp) -/* ED4D6C 80240B4C AFB00040 */ sw $s0, 0x40($sp) -/* ED4D70 80240B50 F7BE0090 */ sdc1 $f30, 0x90($sp) -/* ED4D74 80240B54 F7BC0088 */ sdc1 $f28, 0x88($sp) -/* ED4D78 80240B58 F7BA0080 */ sdc1 $f26, 0x80($sp) -/* ED4D7C 80240B5C F7B80078 */ sdc1 $f24, 0x78($sp) -/* ED4D80 80240B60 F7B60070 */ sdc1 $f22, 0x70($sp) -/* ED4D84 80240B64 F7B40068 */ sdc1 $f20, 0x68($sp) -/* ED4D88 80240B68 00031080 */ sll $v0, $v1, 2 -/* ED4D8C 80240B6C 00431021 */ addu $v0, $v0, $v1 -/* ED4D90 80240B70 00021080 */ sll $v0, $v0, 2 -/* ED4D94 80240B74 00431023 */ subu $v0, $v0, $v1 -/* ED4D98 80240B78 000218C0 */ sll $v1, $v0, 3 -/* ED4D9C 80240B7C 00431021 */ addu $v0, $v0, $v1 -/* ED4DA0 80240B80 000210C0 */ sll $v0, $v0, 3 -/* ED4DA4 80240B84 0C04949C */ jal dead_get_model_list_index_from_tree_index -/* ED4DA8 80240B88 0045B021 */ addu $s6, $v0, $a1 -/* ED4DAC 80240B8C 0C0493D1 */ jal dead_get_model_from_list_index -/* ED4DB0 80240B90 0040202D */ daddu $a0, $v0, $zero -/* ED4DB4 80240B94 0040882D */ daddu $s1, $v0, $zero -/* ED4DB8 80240B98 27B50028 */ addiu $s5, $sp, 0x28 -/* ED4DBC 80240B9C 27B3002C */ addiu $s3, $sp, 0x2c -/* ED4DC0 80240BA0 27B40030 */ addiu $s4, $sp, 0x30 -/* ED4DC4 80240BA4 27B20034 */ addiu $s2, $sp, 0x34 -/* ED4DC8 80240BA8 8E220008 */ lw $v0, 8($s1) -/* ED4DCC 80240BAC C6200098 */ lwc1 $f0, 0x98($s1) -/* ED4DD0 80240BB0 8C42000C */ lw $v0, 0xc($v0) -/* ED4DD4 80240BB4 3C013F80 */ lui $at, 0x3f80 -/* ED4DD8 80240BB8 4481C000 */ mtc1 $at, $f24 -/* ED4DDC 80240BBC C45E0004 */ lwc1 $f30, 4($v0) -/* ED4DE0 80240BC0 4680F7A0 */ cvt.s.w $f30, $f30 -/* ED4DE4 80240BC4 461E0001 */ sub.s $f0, $f0, $f30 -/* ED4DE8 80240BC8 C448001C */ lwc1 $f8, 0x1c($v0) -/* ED4DEC 80240BCC 46804220 */ cvt.s.w $f8, $f8 -/* ED4DF0 80240BD0 E7A80038 */ swc1 $f8, 0x38($sp) -/* ED4DF4 80240BD4 44050000 */ mfc1 $a1, $f0 -/* ED4DF8 80240BD8 C62000A0 */ lwc1 $f0, 0xa0($s1) -/* ED4DFC 80240BDC 26D000D4 */ addiu $s0, $s6, 0xd4 -/* ED4E00 80240BE0 E7B80010 */ swc1 $f24, 0x10($sp) -/* ED4E04 80240BE4 AFB50014 */ sw $s5, 0x14($sp) -/* ED4E08 80240BE8 AFB30018 */ sw $s3, 0x18($sp) -/* ED4E0C 80240BEC AFB4001C */ sw $s4, 0x1c($sp) -/* ED4E10 80240BF0 46080201 */ sub.s $f8, $f0, $f8 -/* ED4E14 80240BF4 AFB20020 */ sw $s2, 0x20($sp) -/* ED4E18 80240BF8 8E26009C */ lw $a2, 0x9c($s1) -/* ED4E1C 80240BFC 44074000 */ mfc1 $a3, $f8 -/* ED4E20 80240C00 0C00AA44 */ jal func_8002A910 -/* ED4E24 80240C04 0200202D */ daddu $a0, $s0, $zero -/* ED4E28 80240C08 C7A00034 */ lwc1 $f0, 0x34($sp) -/* ED4E2C 80240C0C C7A60028 */ lwc1 $f6, 0x28($sp) -/* ED4E30 80240C10 4600C003 */ div.s $f0, $f24, $f0 -/* ED4E34 80240C14 46003182 */ mul.s $f6, $f6, $f0 -/* ED4E38 80240C18 00000000 */ nop -/* ED4E3C 80240C1C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* ED4E40 80240C20 46000087 */ neg.s $f2, $f0 -/* ED4E44 80240C24 46022102 */ mul.s $f4, $f4, $f2 -/* ED4E48 80240C28 00000000 */ nop -/* ED4E4C 80240C2C C7A20030 */ lwc1 $f2, 0x30($sp) -/* ED4E50 80240C30 46001082 */ mul.s $f2, $f2, $f0 -/* ED4E54 80240C34 00000000 */ nop -/* ED4E58 80240C38 44804000 */ mtc1 $zero, $f8 -/* ED4E5C 80240C3C 00000000 */ nop -/* ED4E60 80240C40 4608003C */ c.lt.s $f0, $f8 -/* ED4E64 80240C44 E7A00034 */ swc1 $f0, 0x34($sp) -/* ED4E68 80240C48 E7A60028 */ swc1 $f6, 0x28($sp) -/* ED4E6C 80240C4C E7A4002C */ swc1 $f4, 0x2c($sp) -/* ED4E70 80240C50 45000003 */ bc1f .L80240C60 -/* ED4E74 80240C54 E7A20030 */ swc1 $f2, 0x30($sp) -/* ED4E78 80240C58 E7A80028 */ swc1 $f8, 0x28($sp) -/* ED4E7C 80240C5C E7B8002C */ swc1 $f24, 0x2c($sp) -.L80240C60: -/* ED4E80 80240C60 C7B60028 */ lwc1 $f22, 0x28($sp) -/* ED4E84 80240C64 C7B4002C */ lwc1 $f20, 0x2c($sp) -/* ED4E88 80240C68 C6200098 */ lwc1 $f0, 0x98($s1) -/* ED4E8C 80240C6C C62200A0 */ lwc1 $f2, 0xa0($s1) -/* ED4E90 80240C70 C7A80038 */ lwc1 $f8, 0x38($sp) -/* ED4E94 80240C74 E7B80010 */ swc1 $f24, 0x10($sp) -/* ED4E98 80240C78 AFB50014 */ sw $s5, 0x14($sp) -/* ED4E9C 80240C7C AFB30018 */ sw $s3, 0x18($sp) -/* ED4EA0 80240C80 461E0001 */ sub.s $f0, $f0, $f30 -/* ED4EA4 80240C84 AFB4001C */ sw $s4, 0x1c($sp) -/* ED4EA8 80240C88 AFB20020 */ sw $s2, 0x20($sp) -/* ED4EAC 80240C8C 46081200 */ add.s $f8, $f2, $f8 -/* ED4EB0 80240C90 8E26009C */ lw $a2, 0x9c($s1) -/* ED4EB4 80240C94 44050000 */ mfc1 $a1, $f0 -/* ED4EB8 80240C98 44074000 */ mfc1 $a3, $f8 -/* ED4EBC 80240C9C 0C00AA44 */ jal func_8002A910 -/* ED4EC0 80240CA0 0200202D */ daddu $a0, $s0, $zero -/* ED4EC4 80240CA4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* ED4EC8 80240CA8 C7A60028 */ lwc1 $f6, 0x28($sp) -/* ED4ECC 80240CAC 4600C003 */ div.s $f0, $f24, $f0 -/* ED4ED0 80240CB0 46003182 */ mul.s $f6, $f6, $f0 -/* ED4ED4 80240CB4 00000000 */ nop -/* ED4ED8 80240CB8 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* ED4EDC 80240CBC 46000087 */ neg.s $f2, $f0 -/* ED4EE0 80240CC0 46022102 */ mul.s $f4, $f4, $f2 -/* ED4EE4 80240CC4 00000000 */ nop -/* ED4EE8 80240CC8 C7A20030 */ lwc1 $f2, 0x30($sp) -/* ED4EEC 80240CCC 46001082 */ mul.s $f2, $f2, $f0 -/* ED4EF0 80240CD0 00000000 */ nop -/* ED4EF4 80240CD4 4600B686 */ mov.s $f26, $f22 -/* ED4EF8 80240CD8 44804000 */ mtc1 $zero, $f8 -/* ED4EFC 80240CDC 4600A706 */ mov.s $f28, $f20 -/* ED4F00 80240CE0 4608003C */ c.lt.s $f0, $f8 -/* ED4F04 80240CE4 E7A00034 */ swc1 $f0, 0x34($sp) -/* ED4F08 80240CE8 E7A60028 */ swc1 $f6, 0x28($sp) -/* ED4F0C 80240CEC E7A4002C */ swc1 $f4, 0x2c($sp) -/* ED4F10 80240CF0 45000003 */ bc1f .L80240D00 -/* ED4F14 80240CF4 E7A20030 */ swc1 $f2, 0x30($sp) -/* ED4F18 80240CF8 E7A80028 */ swc1 $f8, 0x28($sp) -/* ED4F1C 80240CFC E7B8002C */ swc1 $f24, 0x2c($sp) -.L80240D00: -/* ED4F20 80240D00 C7A20028 */ lwc1 $f2, 0x28($sp) -/* ED4F24 80240D04 4616103C */ c.lt.s $f2, $f22 -/* ED4F28 80240D08 00000000 */ nop -/* ED4F2C 80240D0C 45030001 */ bc1tl .L80240D14 -/* ED4F30 80240D10 46001686 */ mov.s $f26, $f2 -.L80240D14: -/* ED4F34 80240D14 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* ED4F38 80240D18 4614003C */ c.lt.s $f0, $f20 -/* ED4F3C 80240D1C 00000000 */ nop -/* ED4F40 80240D20 45030001 */ bc1tl .L80240D28 -/* ED4F44 80240D24 46000706 */ mov.s $f28, $f0 -.L80240D28: -/* ED4F48 80240D28 4602B03C */ c.lt.s $f22, $f2 -/* ED4F4C 80240D2C 00000000 */ nop -/* ED4F50 80240D30 45030001 */ bc1tl .L80240D38 -/* ED4F54 80240D34 46001586 */ mov.s $f22, $f2 -.L80240D38: -/* ED4F58 80240D38 4600A03C */ c.lt.s $f20, $f0 -/* ED4F5C 80240D3C 00000000 */ nop -/* ED4F60 80240D40 45030001 */ bc1tl .L80240D48 -/* ED4F64 80240D44 46000506 */ mov.s $f20, $f0 -.L80240D48: -/* ED4F68 80240D48 C6200098 */ lwc1 $f0, 0x98($s1) -/* ED4F6C 80240D4C C62200A0 */ lwc1 $f2, 0xa0($s1) -/* ED4F70 80240D50 C7A80038 */ lwc1 $f8, 0x38($sp) -/* ED4F74 80240D54 E7B80010 */ swc1 $f24, 0x10($sp) -/* ED4F78 80240D58 AFB50014 */ sw $s5, 0x14($sp) -/* ED4F7C 80240D5C AFB30018 */ sw $s3, 0x18($sp) -/* ED4F80 80240D60 461E0000 */ add.s $f0, $f0, $f30 -/* ED4F84 80240D64 AFB4001C */ sw $s4, 0x1c($sp) -/* ED4F88 80240D68 AFB20020 */ sw $s2, 0x20($sp) -/* ED4F8C 80240D6C 46081200 */ add.s $f8, $f2, $f8 -/* ED4F90 80240D70 8E26009C */ lw $a2, 0x9c($s1) -/* ED4F94 80240D74 44050000 */ mfc1 $a1, $f0 -/* ED4F98 80240D78 44074000 */ mfc1 $a3, $f8 -/* ED4F9C 80240D7C 0C00AA44 */ jal func_8002A910 -/* ED4FA0 80240D80 0200202D */ daddu $a0, $s0, $zero -/* ED4FA4 80240D84 C7A00034 */ lwc1 $f0, 0x34($sp) -/* ED4FA8 80240D88 C7A60028 */ lwc1 $f6, 0x28($sp) -/* ED4FAC 80240D8C 4600C003 */ div.s $f0, $f24, $f0 -/* ED4FB0 80240D90 46003182 */ mul.s $f6, $f6, $f0 -/* ED4FB4 80240D94 00000000 */ nop -/* ED4FB8 80240D98 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* ED4FBC 80240D9C 46000087 */ neg.s $f2, $f0 -/* ED4FC0 80240DA0 46022102 */ mul.s $f4, $f4, $f2 -/* ED4FC4 80240DA4 00000000 */ nop -/* ED4FC8 80240DA8 C7A20030 */ lwc1 $f2, 0x30($sp) -/* ED4FCC 80240DAC 46001082 */ mul.s $f2, $f2, $f0 -/* ED4FD0 80240DB0 00000000 */ nop -/* ED4FD4 80240DB4 44804000 */ mtc1 $zero, $f8 -/* ED4FD8 80240DB8 00000000 */ nop -/* ED4FDC 80240DBC 4608003C */ c.lt.s $f0, $f8 -/* ED4FE0 80240DC0 E7A00034 */ swc1 $f0, 0x34($sp) -/* ED4FE4 80240DC4 E7A60028 */ swc1 $f6, 0x28($sp) -/* ED4FE8 80240DC8 E7A4002C */ swc1 $f4, 0x2c($sp) -/* ED4FEC 80240DCC 45000003 */ bc1f .L80240DDC -/* ED4FF0 80240DD0 E7A20030 */ swc1 $f2, 0x30($sp) -/* ED4FF4 80240DD4 E7B80028 */ swc1 $f24, 0x28($sp) -/* ED4FF8 80240DD8 E7B8002C */ swc1 $f24, 0x2c($sp) -.L80240DDC: -/* ED4FFC 80240DDC C7A20028 */ lwc1 $f2, 0x28($sp) -/* ED5000 80240DE0 461A103C */ c.lt.s $f2, $f26 -/* ED5004 80240DE4 00000000 */ nop -/* ED5008 80240DE8 45030001 */ bc1tl .L80240DF0 -/* ED500C 80240DEC 46001686 */ mov.s $f26, $f2 -.L80240DF0: -/* ED5010 80240DF0 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* ED5014 80240DF4 461C003C */ c.lt.s $f0, $f28 -/* ED5018 80240DF8 00000000 */ nop -/* ED501C 80240DFC 45030001 */ bc1tl .L80240E04 -/* ED5020 80240E00 46000706 */ mov.s $f28, $f0 -.L80240E04: -/* ED5024 80240E04 4602B03C */ c.lt.s $f22, $f2 -/* ED5028 80240E08 00000000 */ nop -/* ED502C 80240E0C 45030001 */ bc1tl .L80240E14 -/* ED5030 80240E10 46001586 */ mov.s $f22, $f2 -.L80240E14: -/* ED5034 80240E14 4600A03C */ c.lt.s $f20, $f0 -/* ED5038 80240E18 00000000 */ nop -/* ED503C 80240E1C 45030001 */ bc1tl .L80240E24 -/* ED5040 80240E20 46000506 */ mov.s $f20, $f0 -.L80240E24: -/* ED5044 80240E24 C6200098 */ lwc1 $f0, 0x98($s1) -/* ED5048 80240E28 C62200A0 */ lwc1 $f2, 0xa0($s1) -/* ED504C 80240E2C C7A80038 */ lwc1 $f8, 0x38($sp) -/* ED5050 80240E30 E7B80010 */ swc1 $f24, 0x10($sp) -/* ED5054 80240E34 AFB50014 */ sw $s5, 0x14($sp) -/* ED5058 80240E38 AFB30018 */ sw $s3, 0x18($sp) -/* ED505C 80240E3C 461E0000 */ add.s $f0, $f0, $f30 -/* ED5060 80240E40 AFB4001C */ sw $s4, 0x1c($sp) -/* ED5064 80240E44 AFB20020 */ sw $s2, 0x20($sp) -/* ED5068 80240E48 46081201 */ sub.s $f8, $f2, $f8 -/* ED506C 80240E4C 8E26009C */ lw $a2, 0x9c($s1) -/* ED5070 80240E50 44050000 */ mfc1 $a1, $f0 -/* ED5074 80240E54 44074000 */ mfc1 $a3, $f8 -/* ED5078 80240E58 0C00AA44 */ jal func_8002A910 -/* ED507C 80240E5C 26C400D4 */ addiu $a0, $s6, 0xd4 -/* ED5080 80240E60 C7A00034 */ lwc1 $f0, 0x34($sp) -/* ED5084 80240E64 C7A60028 */ lwc1 $f6, 0x28($sp) -/* ED5088 80240E68 4600C003 */ div.s $f0, $f24, $f0 -/* ED508C 80240E6C 46003182 */ mul.s $f6, $f6, $f0 -/* ED5090 80240E70 00000000 */ nop -/* ED5094 80240E74 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* ED5098 80240E78 46000087 */ neg.s $f2, $f0 -/* ED509C 80240E7C 46022102 */ mul.s $f4, $f4, $f2 -/* ED50A0 80240E80 00000000 */ nop -/* ED50A4 80240E84 C7A20030 */ lwc1 $f2, 0x30($sp) -/* ED50A8 80240E88 46001082 */ mul.s $f2, $f2, $f0 -/* ED50AC 80240E8C 00000000 */ nop -/* ED50B0 80240E90 44804000 */ mtc1 $zero, $f8 -/* ED50B4 80240E94 00000000 */ nop -/* ED50B8 80240E98 4608003C */ c.lt.s $f0, $f8 -/* ED50BC 80240E9C E7A00034 */ swc1 $f0, 0x34($sp) -/* ED50C0 80240EA0 E7A60028 */ swc1 $f6, 0x28($sp) -/* ED50C4 80240EA4 E7A4002C */ swc1 $f4, 0x2c($sp) -/* ED50C8 80240EA8 45000003 */ bc1f .L80240EB8 -/* ED50CC 80240EAC E7A20030 */ swc1 $f2, 0x30($sp) -/* ED50D0 80240EB0 E7B80028 */ swc1 $f24, 0x28($sp) -/* ED50D4 80240EB4 E7B8002C */ swc1 $f24, 0x2c($sp) -.L80240EB8: -/* ED50D8 80240EB8 C7A20028 */ lwc1 $f2, 0x28($sp) -/* ED50DC 80240EBC 461A103C */ c.lt.s $f2, $f26 -/* ED50E0 80240EC0 00000000 */ nop -/* ED50E4 80240EC4 45030001 */ bc1tl .L80240ECC -/* ED50E8 80240EC8 46001686 */ mov.s $f26, $f2 -.L80240ECC: -/* ED50EC 80240ECC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* ED50F0 80240ED0 461C003C */ c.lt.s $f0, $f28 -/* ED50F4 80240ED4 00000000 */ nop -/* ED50F8 80240ED8 45030001 */ bc1tl .L80240EE0 -/* ED50FC 80240EDC 46000706 */ mov.s $f28, $f0 -.L80240EE0: -/* ED5100 80240EE0 4602B03C */ c.lt.s $f22, $f2 -/* ED5104 80240EE4 00000000 */ nop -/* ED5108 80240EE8 45030001 */ bc1tl .L80240EF0 -/* ED510C 80240EEC 46001586 */ mov.s $f22, $f2 -.L80240EF0: -/* ED5110 80240EF0 4600A03C */ c.lt.s $f20, $f0 -/* ED5114 80240EF4 00000000 */ nop -/* ED5118 80240EF8 45030001 */ bc1tl .L80240F00 -/* ED511C 80240EFC 46000506 */ mov.s $f20, $f0 -.L80240F00: -/* ED5120 80240F00 4616D032 */ c.eq.s $f26, $f22 -/* ED5124 80240F04 00000000 */ nop -/* ED5128 80240F08 45000005 */ bc1f .L80240F20 -/* ED512C 80240F0C 00000000 */ nop -/* ED5130 80240F10 4614E032 */ c.eq.s $f28, $f20 -/* ED5134 80240F14 00000000 */ nop -/* ED5138 80240F18 450100EC */ bc1t .L802412CC -/* ED513C 80240F1C 00000000 */ nop -.L80240F20: -/* ED5140 80240F20 86C2000A */ lh $v0, 0xa($s6) -/* ED5144 80240F24 44821000 */ mtc1 $v0, $f2 -/* ED5148 80240F28 00000000 */ nop -/* ED514C 80240F2C 468010A0 */ cvt.s.w $f2, $f2 -/* ED5150 80240F30 4602D002 */ mul.s $f0, $f26, $f2 -/* ED5154 80240F34 00000000 */ nop -/* ED5158 80240F38 46020000 */ add.s $f0, $f0, $f2 -/* ED515C 80240F3C 3C013F00 */ lui $at, 0x3f00 -/* ED5160 80240F40 44813000 */ mtc1 $at, $f6 -/* ED5164 80240F44 00000000 */ nop -/* ED5168 80240F48 46060682 */ mul.s $f26, $f0, $f6 -/* ED516C 80240F4C 00000000 */ nop -/* ED5170 80240F50 86C2000C */ lh $v0, 0xc($s6) -/* ED5174 80240F54 44822000 */ mtc1 $v0, $f4 -/* ED5178 80240F58 00000000 */ nop -/* ED517C 80240F5C 46802120 */ cvt.s.w $f4, $f4 -/* ED5180 80240F60 4604E002 */ mul.s $f0, $f28, $f4 -/* ED5184 80240F64 00000000 */ nop -/* ED5188 80240F68 46040000 */ add.s $f0, $f0, $f4 -/* ED518C 80240F6C 46060702 */ mul.s $f28, $f0, $f6 -/* ED5190 80240F70 00000000 */ nop -/* ED5194 80240F74 4602B002 */ mul.s $f0, $f22, $f2 -/* ED5198 80240F78 00000000 */ nop -/* ED519C 80240F7C 3C18E300 */ lui $t8, 0xe300 -/* ED51A0 80240F80 37180A01 */ ori $t8, $t8, 0xa01 -/* ED51A4 80240F84 3C1EE200 */ lui $fp, 0xe200 -/* ED51A8 80240F88 37DE001C */ ori $fp, $fp, 0x1c -/* ED51AC 80240F8C 46020000 */ add.s $f0, $f0, $f2 -/* ED51B0 80240F90 3C060F0A */ lui $a2, 0xf0a -/* ED51B4 80240F94 34C64010 */ ori $a2, $a2, 0x4010 -/* ED51B8 80240F98 46060582 */ mul.s $f22, $f0, $f6 -/* ED51BC 80240F9C 00000000 */ nop -/* ED51C0 80240FA0 3C13800A */ lui $s3, %hi(D_800A15C4) -/* ED51C4 80240FA4 267315C4 */ addiu $s3, $s3, %lo(D_800A15C4) -/* ED51C8 80240FA8 3C12800A */ lui $s2, %hi(D_800A1530) -/* ED51CC 80240FAC 26521530 */ addiu $s2, $s2, %lo(D_800A1530) -/* ED51D0 80240FB0 AFB8003C */ sw $t8, 0x3c($sp) -/* ED51D4 80240FB4 8E700000 */ lw $s0, ($s3) -/* ED51D8 80240FB8 4604A002 */ mul.s $f0, $f20, $f4 -/* ED51DC 80240FBC 00000000 */ nop -/* ED51E0 80240FC0 8E440000 */ lw $a0, ($s2) -/* ED51E4 80240FC4 86C3000E */ lh $v1, 0xe($s6) -/* ED51E8 80240FC8 86C50010 */ lh $a1, 0x10($s6) -/* ED51EC 80240FCC 0200102D */ daddu $v0, $s0, $zero -/* ED51F0 80240FD0 46040000 */ add.s $f0, $f0, $f4 -/* ED51F4 80240FD4 26100008 */ addiu $s0, $s0, 8 -/* ED51F8 80240FD8 AE700000 */ sw $s0, ($s3) -/* ED51FC 80240FDC 46060502 */ mul.s $f20, $f0, $f6 -/* ED5200 80240FE0 00000000 */ nop -/* ED5204 80240FE4 AC580000 */ sw $t8, ($v0) -/* ED5208 80240FE8 AC400004 */ sw $zero, 4($v0) -/* ED520C 80240FEC 26020008 */ addiu $v0, $s0, 8 -/* ED5210 80240FF0 44831000 */ mtc1 $v1, $f2 -/* ED5214 80240FF4 00000000 */ nop -/* ED5218 80240FF8 468010A0 */ cvt.s.w $f2, $f2 -/* ED521C 80240FFC 4602D680 */ add.s $f26, $f26, $f2 -/* ED5220 80241000 AE620000 */ sw $v0, ($s3) -/* ED5224 80241004 26020010 */ addiu $v0, $s0, 0x10 -/* ED5228 80241008 4602B580 */ add.s $f22, $f22, $f2 -/* ED522C 8024100C AE1E0000 */ sw $fp, ($s0) -/* ED5230 80241010 44850000 */ mtc1 $a1, $f0 -/* ED5234 80241014 00000000 */ nop -/* ED5238 80241018 46800020 */ cvt.s.w $f0, $f0 -/* ED523C 8024101C 4600E700 */ add.s $f28, $f28, $f0 -/* ED5240 80241020 AE060004 */ sw $a2, 4($s0) -/* ED5244 80241024 AE620000 */ sw $v0, ($s3) -/* ED5248 80241028 0C019BF8 */ jal func_80066FE0 -/* ED524C 8024102C 4600A500 */ add.s $f20, $f20, $f0 -/* ED5250 80241030 30420007 */ andi $v0, $v0, 7 -/* ED5254 80241034 1040000B */ beqz $v0, .L80241064 -/* ED5258 80241038 3C15FF10 */ lui $s5, 0xff10 -/* ED525C 8024103C 8E440000 */ lw $a0, ($s2) -/* ED5260 80241040 0C019BF8 */ jal func_80066FE0 -/* ED5264 80241044 00000000 */ nop -/* ED5268 80241048 3C048024 */ lui $a0, %hi(D_80244BB8_ED8DD8) -/* ED526C 8024104C 24844BB8 */ addiu $a0, $a0, %lo(D_80244BB8_ED8DD8) -/* ED5270 80241050 3C058024 */ lui $a1, %hi(D_80244BEC_ED8E0C) -/* ED5274 80241054 24A54BEC */ addiu $a1, $a1, %lo(D_80244BEC_ED8E0C) -/* ED5278 80241058 240600AF */ addiu $a2, $zero, 0xaf -/* ED527C 8024105C 0C00973F */ jal osSyncPrintf -/* ED5280 80241060 0040382D */ daddu $a3, $v0, $zero -.L80241064: -/* ED5284 80241064 36B5013F */ ori $s5, $s5, 0x13f -/* ED5288 80241068 3C17FCFF */ lui $s7, 0xfcff -/* ED528C 8024106C 8E440000 */ lw $a0, ($s2) -/* ED5290 80241070 36F7FFFF */ ori $s7, $s7, 0xffff -/* ED5294 80241074 0C019BF8 */ jal func_80066FE0 -/* ED5298 80241078 AE150008 */ sw $s5, 8($s0) -/* ED529C 8024107C 3C03FFFD */ lui $v1, 0xfffd -/* ED52A0 80241080 3463FEFF */ ori $v1, $v1, 0xfeff -/* ED52A4 80241084 3C05F8F0 */ lui $a1, 0xf8f0 -/* ED52A8 80241088 3C14800A */ lui $s4, %hi(D_800A15A4) -/* ED52AC 8024108C 269415A4 */ addiu $s4, $s4, %lo(D_800A15A4) -/* ED52B0 80241090 34A5F000 */ ori $a1, $a1, 0xf000 -/* ED52B4 80241094 8E720000 */ lw $s2, ($s3) -/* ED52B8 80241098 8E840000 */ lw $a0, ($s4) -/* ED52BC 8024109C 3C16E700 */ lui $s6, 0xe700 -/* ED52C0 802410A0 AE02000C */ sw $v0, 0xc($s0) -/* ED52C4 802410A4 0240102D */ daddu $v0, $s2, $zero -/* ED52C8 802410A8 26520008 */ addiu $s2, $s2, 8 -/* ED52CC 802410AC AE720000 */ sw $s2, ($s3) -/* ED52D0 802410B0 AC570000 */ sw $s7, ($v0) -/* ED52D4 802410B4 AC430004 */ sw $v1, 4($v0) -/* ED52D8 802410B8 26420008 */ addiu $v0, $s2, 8 -/* ED52DC 802410BC AE620000 */ sw $v0, ($s3) -/* ED52E0 802410C0 3C02FA00 */ lui $v0, 0xfa00 -/* ED52E4 802410C4 AE420000 */ sw $v0, ($s2) -/* ED52E8 802410C8 26420010 */ addiu $v0, $s2, 0x10 -/* ED52EC 802410CC AE450004 */ sw $a1, 4($s2) -/* ED52F0 802410D0 AE620000 */ sw $v0, ($s3) -/* ED52F4 802410D4 3C02DE00 */ lui $v0, 0xde00 -/* ED52F8 802410D8 AE560008 */ sw $s6, 8($s2) -/* ED52FC 802410DC AE40000C */ sw $zero, 0xc($s2) -/* ED5300 802410E0 AE420010 */ sw $v0, 0x10($s2) -/* ED5304 802410E4 8E230008 */ lw $v1, 8($s1) -/* ED5308 802410E8 26420018 */ addiu $v0, $s2, 0x18 -/* ED530C 802410EC AE620000 */ sw $v0, ($s3) -/* ED5310 802410F0 8C630004 */ lw $v1, 4($v1) -/* ED5314 802410F4 26420020 */ addiu $v0, $s2, 0x20 -/* ED5318 802410F8 AE620000 */ sw $v0, ($s3) -/* ED531C 802410FC 8C630000 */ lw $v1, ($v1) -/* ED5320 80241100 26420028 */ addiu $v0, $s2, 0x28 -/* ED5324 80241104 AE620000 */ sw $v0, ($s3) -/* ED5328 80241108 AE560018 */ sw $s6, 0x18($s2) -/* ED532C 8024110C AE40001C */ sw $zero, 0x1c($s2) -/* ED5330 80241110 0C019BF8 */ jal func_80066FE0 -/* ED5334 80241114 AE430014 */ sw $v1, 0x14($s2) -/* ED5338 80241118 30420007 */ andi $v0, $v0, 7 -/* ED533C 8024111C 1040000B */ beqz $v0, .L8024114C -/* ED5340 80241120 3C11E200 */ lui $s1, 0xe200 -/* ED5344 80241124 8E840000 */ lw $a0, ($s4) -/* ED5348 80241128 0C019BF8 */ jal func_80066FE0 -/* ED534C 8024112C 00000000 */ nop -/* ED5350 80241130 3C048024 */ lui $a0, %hi(D_80244BB8_ED8DD8) -/* ED5354 80241134 24844BB8 */ addiu $a0, $a0, %lo(D_80244BB8_ED8DD8) -/* ED5358 80241138 3C058024 */ lui $a1, %hi(D_80244BEC_ED8E0C) -/* ED535C 8024113C 24A54BEC */ addiu $a1, $a1, %lo(D_80244BEC_ED8E0C) -/* ED5360 80241140 240600BA */ addiu $a2, $zero, 0xba -/* ED5364 80241144 0C00973F */ jal osSyncPrintf -/* ED5368 80241148 0040382D */ daddu $a3, $v0, $zero -.L8024114C: -/* ED536C 8024114C 8E840000 */ lw $a0, ($s4) -/* ED5370 80241150 36311D00 */ ori $s1, $s1, 0x1d00 -/* ED5374 80241154 0C019BF8 */ jal func_80066FE0 -/* ED5378 80241158 AE550020 */ sw $s5, 0x20($s2) -/* ED537C 8024115C 3C090050 */ lui $t1, 0x50 -/* ED5380 80241160 35294E50 */ ori $t1, $t1, 0x4e50 -/* ED5384 80241164 3C0AE300 */ lui $t2, 0xe300 -/* ED5388 80241168 354A1201 */ ori $t2, $t2, 0x1201 -/* ED538C 8024116C 3C0BE300 */ lui $t3, 0xe300 -/* ED5390 80241170 356B0C00 */ ori $t3, $t3, 0xc00 -/* ED5394 80241174 3C0CD700 */ lui $t4, 0xd700 -/* ED5398 80241178 358C0002 */ ori $t4, $t4, 2 -/* ED539C 8024117C 3C0DE300 */ lui $t5, 0xe300 -/* ED53A0 80241180 35AD1001 */ ori $t5, $t5, 0x1001 -/* ED53A4 80241184 3C0EE300 */ lui $t6, 0xe300 -/* ED53A8 80241188 35CE0D01 */ ori $t6, $t6, 0xd01 -/* ED53AC 8024118C 3C0FE300 */ lui $t7, 0xe300 -/* ED53B0 80241190 35EF0F00 */ ori $t7, $t7, 0xf00 -/* ED53B4 80241194 3C10FFFC */ lui $s0, 0xfffc -/* ED53B8 80241198 3610F67B */ ori $s0, $s0, 0xf67b -/* ED53BC 8024119C 4600D20D */ trunc.w.s $f8, $f26 -/* ED53C0 802411A0 44044000 */ mfc1 $a0, $f8 -/* ED53C4 802411A4 4600E20D */ trunc.w.s $f8, $f28 -/* ED53C8 802411A8 44054000 */ mfc1 $a1, $f8 -/* ED53CC 802411AC 4600B20D */ trunc.w.s $f8, $f22 -/* ED53D0 802411B0 44064000 */ mfc1 $a2, $f8 -/* ED53D4 802411B4 8E630000 */ lw $v1, ($s3) -/* ED53D8 802411B8 4600A20D */ trunc.w.s $f8, $f20 -/* ED53DC 802411BC 44074000 */ mfc1 $a3, $f8 -/* ED53E0 802411C0 AE420024 */ sw $v0, 0x24($s2) -/* ED53E4 802411C4 24020004 */ addiu $v0, $zero, 4 -/* ED53E8 802411C8 0060402D */ daddu $t0, $v1, $zero -/* ED53EC 802411CC 24630008 */ addiu $v1, $v1, 8 -/* ED53F0 802411D0 AE630000 */ sw $v1, ($s3) -/* ED53F4 802411D4 AD020004 */ sw $v0, 4($t0) -/* ED53F8 802411D8 24620008 */ addiu $v0, $v1, 8 -/* ED53FC 802411DC AD110000 */ sw $s1, ($t0) -/* ED5400 802411E0 AE620000 */ sw $v0, ($s3) -/* ED5404 802411E4 3C02EE00 */ lui $v0, 0xee00 -/* ED5408 802411E8 AC620000 */ sw $v0, ($v1) -/* ED540C 802411EC 3C027FDE */ lui $v0, 0x7fde -/* ED5410 802411F0 AC620004 */ sw $v0, 4($v1) -/* ED5414 802411F4 24620010 */ addiu $v0, $v1, 0x10 -/* ED5418 802411F8 AE620000 */ sw $v0, ($s3) -/* ED541C 802411FC 24620018 */ addiu $v0, $v1, 0x18 -/* ED5420 80241200 AC7E0008 */ sw $fp, 8($v1) -/* ED5424 80241204 AC69000C */ sw $t1, 0xc($v1) -/* ED5428 80241208 AE620000 */ sw $v0, ($s3) -/* ED542C 8024120C 24620020 */ addiu $v0, $v1, 0x20 -/* ED5430 80241210 AC6A0010 */ sw $t2, 0x10($v1) -/* ED5434 80241214 AC600014 */ sw $zero, 0x14($v1) -/* ED5438 80241218 AE620000 */ sw $v0, ($s3) -/* ED543C 8024121C 24620028 */ addiu $v0, $v1, 0x28 -/* ED5440 80241220 AC6B0018 */ sw $t3, 0x18($v1) -/* ED5444 80241224 AC60001C */ sw $zero, 0x1c($v1) -/* ED5448 80241228 AE620000 */ sw $v0, ($s3) -/* ED544C 8024122C 2402FFFF */ addiu $v0, $zero, -1 -/* ED5450 80241230 AC620024 */ sw $v0, 0x24($v1) -/* ED5454 80241234 24620030 */ addiu $v0, $v1, 0x30 -/* ED5458 80241238 AC6C0020 */ sw $t4, 0x20($v1) -/* ED545C 8024123C AE620000 */ sw $v0, ($s3) -/* ED5460 80241240 24620038 */ addiu $v0, $v1, 0x38 -/* ED5464 80241244 AC6D0028 */ sw $t5, 0x28($v1) -/* ED5468 80241248 AC60002C */ sw $zero, 0x2c($v1) -/* ED546C 8024124C AE620000 */ sw $v0, ($s3) -/* ED5470 80241250 24620040 */ addiu $v0, $v1, 0x40 -/* ED5474 80241254 AC6E0030 */ sw $t6, 0x30($v1) -/* ED5478 80241258 AC600034 */ sw $zero, 0x34($v1) -/* ED547C 8024125C AE620000 */ sw $v0, ($s3) -/* ED5480 80241260 24620048 */ addiu $v0, $v1, 0x48 -/* ED5484 80241264 AC6F0038 */ sw $t7, 0x38($v1) -/* ED5488 80241268 AC60003C */ sw $zero, 0x3c($v1) -/* ED548C 8024126C AE620000 */ sw $v0, ($s3) -/* ED5490 80241270 24620050 */ addiu $v0, $v1, 0x50 -/* ED5494 80241274 AC770040 */ sw $s7, 0x40($v1) -/* ED5498 80241278 AC700044 */ sw $s0, 0x44($v1) -/* ED549C 8024127C AE620000 */ sw $v0, ($s3) -/* ED54A0 80241280 AC760048 */ sw $s6, 0x48($v1) -/* ED54A4 80241284 0C09012C */ jal func_802404B0_ED46D0 -/* ED54A8 80241288 AC60004C */ sw $zero, 0x4c($v1) -/* ED54AC 8024128C 8E620000 */ lw $v0, ($s3) -/* ED54B0 80241290 0040182D */ daddu $v1, $v0, $zero -/* ED54B4 80241294 24420008 */ addiu $v0, $v0, 8 -/* ED54B8 80241298 AE620000 */ sw $v0, ($s3) -/* ED54BC 8024129C AC760000 */ sw $s6, ($v1) -/* ED54C0 802412A0 AC600004 */ sw $zero, 4($v1) -/* ED54C4 802412A4 24430008 */ addiu $v1, $v0, 8 -/* ED54C8 802412A8 AE630000 */ sw $v1, ($s3) -/* ED54CC 802412AC 8FB8003C */ lw $t8, 0x3c($sp) -/* ED54D0 802412B0 3C030010 */ lui $v1, 0x10 -/* ED54D4 802412B4 AC580000 */ sw $t8, ($v0) -/* ED54D8 802412B8 AC430004 */ sw $v1, 4($v0) -/* ED54DC 802412BC 24430010 */ addiu $v1, $v0, 0x10 -/* ED54E0 802412C0 AE630000 */ sw $v1, ($s3) -/* ED54E4 802412C4 AC510008 */ sw $s1, 8($v0) -/* ED54E8 802412C8 AC40000C */ sw $zero, 0xc($v0) -.L802412CC: -/* ED54EC 802412CC 8FBF0064 */ lw $ra, 0x64($sp) -/* ED54F0 802412D0 8FBE0060 */ lw $fp, 0x60($sp) -/* ED54F4 802412D4 8FB7005C */ lw $s7, 0x5c($sp) -/* ED54F8 802412D8 8FB60058 */ lw $s6, 0x58($sp) -/* ED54FC 802412DC 8FB50054 */ lw $s5, 0x54($sp) -/* ED5500 802412E0 8FB40050 */ lw $s4, 0x50($sp) -/* ED5504 802412E4 8FB3004C */ lw $s3, 0x4c($sp) -/* ED5508 802412E8 8FB20048 */ lw $s2, 0x48($sp) -/* ED550C 802412EC 8FB10044 */ lw $s1, 0x44($sp) -/* ED5510 802412F0 8FB00040 */ lw $s0, 0x40($sp) -/* ED5514 802412F4 D7BE0090 */ ldc1 $f30, 0x90($sp) -/* ED5518 802412F8 D7BC0088 */ ldc1 $f28, 0x88($sp) -/* ED551C 802412FC D7BA0080 */ ldc1 $f26, 0x80($sp) -/* ED5520 80241300 D7B80078 */ ldc1 $f24, 0x78($sp) -/* ED5524 80241304 D7B60070 */ ldc1 $f22, 0x70($sp) -/* ED5528 80241308 D7B40068 */ ldc1 $f20, 0x68($sp) -/* ED552C 8024130C 03E00008 */ jr $ra -/* ED5530 80241310 27BD0098 */ addiu $sp, $sp, 0x98 -/* ED5534 80241314 00000000 */ nop -/* ED5538 80241318 00000000 */ nop -/* ED553C 8024131C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_make_local_vertex_copy.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_make_local_vertex_copy.s deleted file mode 100644 index 4e5b021598..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_make_local_vertex_copy.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel mdl_make_local_vertex_copy -/* B2864 8011C164 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B2868 8011C168 AFB00028 */ sw $s0, 0x28($sp) -/* B286C 8011C16C 0080802D */ daddu $s0, $a0, $zero -/* B2870 8011C170 30A4FFFF */ andi $a0, $a1, 0xffff -/* B2874 8011C174 AFB1002C */ sw $s1, 0x2c($sp) -/* B2878 8011C178 00C0882D */ daddu $s1, $a2, $zero -/* B287C 8011C17C AFBF003C */ sw $ra, 0x3c($sp) -/* B2880 8011C180 AFB40038 */ sw $s4, 0x38($sp) -/* B2884 8011C184 AFB30034 */ sw $s3, 0x34($sp) -/* B2888 8011C188 0C046C04 */ jal get_model_list_index_from_tree_index -/* B288C 8011C18C AFB20030 */ sw $s2, 0x30($sp) -/* B2890 8011C190 0C046B4C */ jal get_model_from_list_index -/* B2894 8011C194 0040202D */ daddu $a0, $v0, $zero -/* B2898 8011C198 0040A02D */ daddu $s4, $v0, $zero -/* B289C 8011C19C 8E820008 */ lw $v0, 8($s4) -/* B28A0 8011C1A0 27A50018 */ addiu $a1, $sp, 0x18 -/* B28A4 8011C1A4 8C420004 */ lw $v0, 4($v0) -/* B28A8 8011C1A8 27A6001C */ addiu $a2, $sp, 0x1c -/* B28AC 8011C1AC 8C530000 */ lw $s3, ($v0) -/* B28B0 8011C1B0 27A70020 */ addiu $a3, $sp, 0x20 -/* B28B4 8011C1B4 AFA00010 */ sw $zero, 0x10($sp) -/* B28B8 8011C1B8 0C04700A */ jal mdl_get_vertex_count -/* B28BC 8011C1BC 0260202D */ daddu $a0, $s3, $zero -/* B28C0 8011C1C0 0C00AB39 */ jal heap_malloc -/* B28C4 8011C1C4 2404001C */ addiu $a0, $zero, 0x1c -/* B28C8 8011C1C8 00108080 */ sll $s0, $s0, 2 -/* B28CC 8011C1CC 3C038015 */ lui $v1, %hi(gCurrentModelLocalVtxBuffers) -/* B28D0 8011C1D0 8C632210 */ lw $v1, %lo(gCurrentModelLocalVtxBuffers)($v1) -/* B28D4 8011C1D4 0040902D */ daddu $s2, $v0, $zero -/* B28D8 8011C1D8 02038021 */ addu $s0, $s0, $v1 -/* B28DC 8011C1DC 1220001C */ beqz $s1, .L8011C250 -/* B28E0 8011C1E0 AE020000 */ sw $v0, ($s0) -/* B28E4 8011C1E4 0000882D */ daddu $s1, $zero, $zero -/* B28E8 8011C1E8 0240802D */ daddu $s0, $s2, $zero -.L8011C1EC: -/* B28EC 8011C1EC 8FA40020 */ lw $a0, 0x20($sp) -/* B28F0 8011C1F0 0C00AB39 */ jal heap_malloc -/* B28F4 8011C1F4 000420C0 */ sll $a0, $a0, 3 -/* B28F8 8011C1F8 8FA40018 */ lw $a0, 0x18($sp) -/* B28FC 8011C1FC 26310001 */ addiu $s1, $s1, 1 -/* B2900 8011C200 AE020008 */ sw $v0, 8($s0) -/* B2904 8011C204 0C00AB39 */ jal heap_malloc -/* B2908 8011C208 00042100 */ sll $a0, $a0, 4 -/* B290C 8011C20C 0260202D */ daddu $a0, $s3, $zero -/* B2910 8011C210 8FA5001C */ lw $a1, 0x1c($sp) -/* B2914 8011C214 8E060008 */ lw $a2, 8($s0) -/* B2918 8011C218 0040382D */ daddu $a3, $v0, $zero -/* B291C 8011C21C 0C047037 */ jal mdl_local_gfx_update_vtx_pointers -/* B2920 8011C220 AE070010 */ sw $a3, 0x10($s0) -/* B2924 8011C224 8FA4001C */ lw $a0, 0x1c($sp) -/* B2928 8011C228 8FA50018 */ lw $a1, 0x18($sp) -/* B292C 8011C22C 8E060010 */ lw $a2, 0x10($s0) -/* B2930 8011C230 0C04704C */ jal mdl_local_gfx_copy_vertices -/* B2934 8011C234 26100004 */ addiu $s0, $s0, 4 -/* B2938 8011C238 2A220002 */ slti $v0, $s1, 2 -/* B293C 8011C23C 1440FFEB */ bnez $v0, .L8011C1EC -/* B2940 8011C240 00000000 */ nop -/* B2944 8011C244 96820000 */ lhu $v0, ($s4) -/* B2948 8011C248 0804709E */ j .L8011C278 -/* B294C 8011C24C 34420080 */ ori $v0, $v0, 0x80 -.L8011C250: -/* B2950 8011C250 0000882D */ daddu $s1, $zero, $zero -/* B2954 8011C254 0240182D */ daddu $v1, $s2, $zero -.L8011C258: -/* B2958 8011C258 AC600008 */ sw $zero, 8($v1) -/* B295C 8011C25C AC600010 */ sw $zero, 0x10($v1) -/* B2960 8011C260 26310001 */ addiu $s1, $s1, 1 -/* B2964 8011C264 2A220002 */ slti $v0, $s1, 2 -/* B2968 8011C268 1440FFFB */ bnez $v0, .L8011C258 -/* B296C 8011C26C 24630004 */ addiu $v1, $v1, 4 -/* B2970 8011C270 96820000 */ lhu $v0, ($s4) -/* B2974 8011C274 34420002 */ ori $v0, $v0, 2 -.L8011C278: -/* B2978 8011C278 A6820000 */ sh $v0, ($s4) -/* B297C 8011C27C 8FA20018 */ lw $v0, 0x18($sp) -/* B2980 8011C280 8FA3001C */ lw $v1, 0x1c($sp) -/* B2984 8011C284 AE400018 */ sw $zero, 0x18($s2) -/* B2988 8011C288 AE420000 */ sw $v0, ($s2) -/* B298C 8011C28C AE430004 */ sw $v1, 4($s2) -/* B2990 8011C290 8FBF003C */ lw $ra, 0x3c($sp) -/* B2994 8011C294 8FB40038 */ lw $s4, 0x38($sp) -/* B2998 8011C298 8FB30034 */ lw $s3, 0x34($sp) -/* B299C 8011C29C 8FB20030 */ lw $s2, 0x30($sp) -/* B29A0 8011C2A0 8FB1002C */ lw $s1, 0x2c($sp) -/* B29A4 8011C2A4 8FB00028 */ lw $s0, 0x28($sp) -/* B29A8 8011C2A8 03E00008 */ jr $ra -/* B29AC 8011C2AC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/effects/sleep_bubble/sleep_bubble_appendGfx.s b/ver/us/asm/nonmatchings/effects/sleep_bubble/sleep_bubble_appendGfx.s deleted file mode 100644 index 063a848e65..0000000000 --- a/ver/us/asm/nonmatchings/effects/sleep_bubble/sleep_bubble_appendGfx.s +++ /dev/null @@ -1,364 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel sleep_bubble_appendGfx -/* 35CEE0 E0052460 27BDFF28 */ addiu $sp, $sp, -0xd8 -/* 35CEE4 E0052464 3C05DB06 */ lui $a1, 0xdb06 -/* 35CEE8 E0052468 3C07800A */ lui $a3, %hi(gMasterGfxPos) -/* 35CEEC E005246C 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) -/* 35CEF0 E0052470 34A50024 */ ori $a1, $a1, 0x24 -/* 35CEF4 E0052474 3C02E700 */ lui $v0, 0xe700 -/* 35CEF8 E0052478 AFBF00C4 */ sw $ra, 0xc4($sp) -/* 35CEFC E005247C AFBE00C0 */ sw $fp, 0xc0($sp) -/* 35CF00 E0052480 AFB700BC */ sw $s7, 0xbc($sp) -/* 35CF04 E0052484 AFB600B8 */ sw $s6, 0xb8($sp) -/* 35CF08 E0052488 AFB500B4 */ sw $s5, 0xb4($sp) -/* 35CF0C E005248C AFB400B0 */ sw $s4, 0xb0($sp) -/* 35CF10 E0052490 AFB300AC */ sw $s3, 0xac($sp) -/* 35CF14 E0052494 AFB200A8 */ sw $s2, 0xa8($sp) -/* 35CF18 E0052498 AFB100A4 */ sw $s1, 0xa4($sp) -/* 35CF1C E005249C AFB000A0 */ sw $s0, 0xa0($sp) -/* 35CF20 E00524A0 F7B600D0 */ sdc1 $f22, 0xd0($sp) -/* 35CF24 E00524A4 F7B400C8 */ sdc1 $f20, 0xc8($sp) -/* 35CF28 E00524A8 8CE60000 */ lw $a2, ($a3) -/* 35CF2C E00524AC 8C88000C */ lw $t0, 0xc($a0) -/* 35CF30 E00524B0 00C0182D */ daddu $v1, $a2, $zero -/* 35CF34 E00524B4 24C60008 */ addiu $a2, $a2, 8 -/* 35CF38 E00524B8 AC620000 */ sw $v0, ($v1) -/* 35CF3C E00524BC AC600004 */ sw $zero, 4($v1) -/* 35CF40 E00524C0 ACC50000 */ sw $a1, ($a2) -/* 35CF44 E00524C4 8C820010 */ lw $v0, 0x10($a0) -/* 35CF48 E00524C8 ACE60000 */ sw $a2, ($a3) -/* 35CF4C E00524CC 8C42001C */ lw $v0, 0x1c($v0) -/* 35CF50 E00524D0 3C038000 */ lui $v1, 0x8000 -/* 35CF54 E00524D4 00431021 */ addu $v0, $v0, $v1 -/* 35CF58 E00524D8 ACC20004 */ sw $v0, 4($a2) -/* 35CF5C E00524DC 8D0A001C */ lw $t2, 0x1c($t0) -/* 35CF60 E00524E0 24C20008 */ addiu $v0, $a2, 8 -/* 35CF64 E00524E4 AFAA0098 */ sw $t2, 0x98($sp) -/* 35CF68 E00524E8 15400009 */ bnez $t2, .LE0052510 -/* 35CF6C E00524EC ACE20000 */ sw $v0, ($a3) -/* 35CF70 E00524F0 24C20010 */ addiu $v0, $a2, 0x10 -/* 35CF74 E00524F4 ACE20000 */ sw $v0, ($a3) -/* 35CF78 E00524F8 3C02DE00 */ lui $v0, 0xde00 -/* 35CF7C E00524FC ACC20008 */ sw $v0, 8($a2) -/* 35CF80 E0052500 3C020900 */ lui $v0, 0x900 -/* 35CF84 E0052504 24420440 */ addiu $v0, $v0, 0x440 -/* 35CF88 E0052508 08014955 */ j .LE0052554 -/* 35CF8C E005250C ACC2000C */ sw $v0, 0xc($a2) -.LE0052510: -/* 35CF90 E0052510 8FAA0098 */ lw $t2, 0x98($sp) -/* 35CF94 E0052514 24020001 */ addiu $v0, $zero, 1 -/* 35CF98 E0052518 15420008 */ bne $t2, $v0, .LE005253C -/* 35CF9C E005251C 24C20010 */ addiu $v0, $a2, 0x10 -/* 35CFA0 E0052520 ACE20000 */ sw $v0, ($a3) -/* 35CFA4 E0052524 3C02DE00 */ lui $v0, 0xde00 -/* 35CFA8 E0052528 ACC20008 */ sw $v0, 8($a2) -/* 35CFAC E005252C 3C020900 */ lui $v0, 0x900 -/* 35CFB0 E0052530 24420390 */ addiu $v0, $v0, 0x390 -/* 35CFB4 E0052534 08014955 */ j .LE0052554 -/* 35CFB8 E0052538 ACC2000C */ sw $v0, 0xc($a2) -.LE005253C: -/* 35CFBC E005253C ACE20000 */ sw $v0, ($a3) -/* 35CFC0 E0052540 3C02DE00 */ lui $v0, 0xde00 -/* 35CFC4 E0052544 ACC20008 */ sw $v0, 8($a2) -/* 35CFC8 E0052548 3C020900 */ lui $v0, 0x900 -/* 35CFCC E005254C 244202E0 */ addiu $v0, $v0, 0x2e0 -/* 35CFD0 E0052550 ACC2000C */ sw $v0, 0xc($a2) -.LE0052554: -/* 35CFD4 E0052554 27A40018 */ addiu $a0, $sp, 0x18 -/* 35CFD8 E0052558 3C120001 */ lui $s2, 1 -/* 35CFDC E005255C 36521630 */ ori $s2, $s2, 0x1630 -/* 35CFE0 E0052560 0000982D */ daddu $s3, $zero, $zero -/* 35CFE4 E0052564 3C02800A */ lui $v0, %hi(gDisplayContext) -/* 35CFE8 E0052568 2442A674 */ addiu $v0, $v0, %lo(gDisplayContext) -/* 35CFEC E005256C 0040B82D */ daddu $s7, $v0, $zero -/* 35CFF0 E0052570 3C028007 */ lui $v0, %hi(gMatrixListPos) -/* 35CFF4 E0052574 244241F0 */ addiu $v0, $v0, %lo(gMatrixListPos) -/* 35CFF8 E0052578 0040B02D */ daddu $s6, $v0, $zero -/* 35CFFC E005257C 3C1E0001 */ lui $fp, 1 -/* 35D000 E0052580 37DE1630 */ ori $fp, $fp, 0x1630 -/* 35D004 E0052584 3C02800A */ lui $v0, %hi(gMasterGfxPos) -/* 35D008 E0052588 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) -/* 35D00C E005258C 0040A82D */ daddu $s5, $v0, $zero -/* 35D010 E0052590 8D050004 */ lw $a1, 4($t0) -/* 35D014 E0052594 8D060008 */ lw $a2, 8($t0) -/* 35D018 E0052598 8D07000C */ lw $a3, 0xc($t0) -/* 35D01C E005259C 0C080108 */ jal shim_guTranslateF -/* 35D020 E00525A0 0100A02D */ daddu $s4, $t0, $zero -/* 35D024 E00525A4 27A40018 */ addiu $a0, $sp, 0x18 -/* 35D028 E00525A8 96C50000 */ lhu $a1, ($s6) -/* 35D02C E00525AC 8EE20000 */ lw $v0, ($s7) -/* 35D030 E00525B0 00052980 */ sll $a1, $a1, 6 -/* 35D034 E00525B4 00B22821 */ addu $a1, $a1, $s2 -/* 35D038 E00525B8 0C080118 */ jal shim_guMtxF2L -/* 35D03C E00525BC 00452821 */ addu $a1, $v0, $a1 -/* 35D040 E00525C0 3C02DA38 */ lui $v0, 0xda38 -/* 35D044 E00525C4 34420002 */ ori $v0, $v0, 2 -/* 35D048 E00525C8 3C050100 */ lui $a1, 0x100 -/* 35D04C E00525CC 34A51002 */ ori $a1, $a1, 0x1002 -/* 35D050 E00525D0 3C110900 */ lui $s1, 0x900 -/* 35D054 E00525D4 26310190 */ addiu $s1, $s1, 0x190 -/* 35D058 E00525D8 4480A000 */ mtc1 $zero, $f20 -/* 35D05C E00525DC 8EA80000 */ lw $t0, ($s5) -/* 35D060 E00525E0 96C90000 */ lhu $t1, ($s6) -/* 35D064 E00525E4 3C013F80 */ lui $at, 0x3f80 -/* 35D068 E00525E8 4481B000 */ mtc1 $at, $f22 -/* 35D06C E00525EC 0100202D */ daddu $a0, $t0, $zero -/* 35D070 E00525F0 25080008 */ addiu $t0, $t0, 8 -/* 35D074 E00525F4 AC820000 */ sw $v0, ($a0) -/* 35D078 E00525F8 3122FFFF */ andi $v0, $t1, 0xffff -/* 35D07C E00525FC 00021180 */ sll $v0, $v0, 6 -/* 35D080 E0052600 00521021 */ addu $v0, $v0, $s2 -/* 35D084 E0052604 25290001 */ addiu $t1, $t1, 1 -/* 35D088 E0052608 4406A000 */ mfc1 $a2, $f20 -/* 35D08C E005260C 8EE30000 */ lw $v1, ($s7) -/* 35D090 E0052610 4407A000 */ mfc1 $a3, $f20 -/* 35D094 E0052614 00621821 */ addu $v1, $v1, $v0 -/* 35D098 E0052618 AC830004 */ sw $v1, 4($a0) -/* 35D09C E005261C AD050000 */ sw $a1, ($t0) -/* 35D0A0 E0052620 AD110004 */ sw $s1, 4($t0) -/* 35D0A4 E0052624 E7B60010 */ swc1 $f22, 0x10($sp) -/* 35D0A8 E0052628 8E850010 */ lw $a1, 0x10($s4) -/* 35D0AC E005262C 27A40018 */ addiu $a0, $sp, 0x18 -/* 35D0B0 E0052630 AEA80000 */ sw $t0, ($s5) -/* 35D0B4 E0052634 25080008 */ addiu $t0, $t0, 8 -/* 35D0B8 E0052638 A6C90000 */ sh $t1, ($s6) -/* 35D0BC E005263C 0C080104 */ jal shim_guRotateF -/* 35D0C0 E0052640 AEA80000 */ sw $t0, ($s5) -/* 35D0C4 E0052644 27A40018 */ addiu $a0, $sp, 0x18 -/* 35D0C8 E0052648 96C50000 */ lhu $a1, ($s6) -/* 35D0CC E005264C 8EE20000 */ lw $v0, ($s7) -/* 35D0D0 E0052650 00052980 */ sll $a1, $a1, 6 -/* 35D0D4 E0052654 00B22821 */ addu $a1, $a1, $s2 -/* 35D0D8 E0052658 0C080118 */ jal shim_guMtxF2L -/* 35D0DC E005265C 00452821 */ addu $a1, $v0, $a1 -/* 35D0E0 E0052660 3C03DA38 */ lui $v1, 0xda38 -/* 35D0E4 E0052664 34630001 */ ori $v1, $v1, 1 -/* 35D0E8 E0052668 27A40018 */ addiu $a0, $sp, 0x18 -/* 35D0EC E005266C 8EA20000 */ lw $v0, ($s5) -/* 35D0F0 E0052670 4406A000 */ mfc1 $a2, $f20 -/* 35D0F4 E0052674 96C80000 */ lhu $t0, ($s6) -/* 35D0F8 E0052678 0040482D */ daddu $t1, $v0, $zero -/* 35D0FC E005267C 24420008 */ addiu $v0, $v0, 8 -/* 35D100 E0052680 AEA20000 */ sw $v0, ($s5) -/* 35D104 E0052684 AD230000 */ sw $v1, ($t1) -/* 35D108 E0052688 3103FFFF */ andi $v1, $t0, 0xffff -/* 35D10C E005268C 00031980 */ sll $v1, $v1, 6 -/* 35D110 E0052690 00721821 */ addu $v1, $v1, $s2 -/* 35D114 E0052694 8EE20000 */ lw $v0, ($s7) -/* 35D118 E0052698 3C058007 */ lui $a1, %hi(gCurrentCameraID) -/* 35D11C E005269C 8CA57410 */ lw $a1, %lo(gCurrentCameraID)($a1) -/* 35D120 E00526A0 00431021 */ addu $v0, $v0, $v1 -/* 35D124 E00526A4 AD220004 */ sw $v0, 4($t1) -/* 35D128 E00526A8 00051080 */ sll $v0, $a1, 2 -/* 35D12C E00526AC 00451021 */ addu $v0, $v0, $a1 -/* 35D130 E00526B0 00021080 */ sll $v0, $v0, 2 -/* 35D134 E00526B4 00451023 */ subu $v0, $v0, $a1 -/* 35D138 E00526B8 000218C0 */ sll $v1, $v0, 3 -/* 35D13C E00526BC 00431021 */ addu $v0, $v0, $v1 -/* 35D140 E00526C0 000210C0 */ sll $v0, $v0, 3 -/* 35D144 E00526C4 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 35D148 E00526C8 00220821 */ addu $at, $at, $v0 -/* 35D14C E00526CC C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* 35D150 E00526D0 4407B000 */ mfc1 $a3, $f22 -/* 35D154 E00526D4 46000007 */ neg.s $f0, $f0 -/* 35D158 E00526D8 44050000 */ mfc1 $a1, $f0 -/* 35D15C E00526DC 25080001 */ addiu $t0, $t0, 1 -/* 35D160 E00526E0 A6C80000 */ sh $t0, ($s6) -/* 35D164 E00526E4 0C080104 */ jal shim_guRotateF -/* 35D168 E00526E8 E7B40010 */ swc1 $f20, 0x10($sp) -/* 35D16C E00526EC 27B00058 */ addiu $s0, $sp, 0x58 -/* 35D170 E00526F0 8E8500C4 */ lw $a1, 0xc4($s4) -/* 35D174 E00526F4 8E8600C8 */ lw $a2, 0xc8($s4) -/* 35D178 E00526F8 4407A000 */ mfc1 $a3, $f20 -/* 35D17C E00526FC 0C080108 */ jal shim_guTranslateF -/* 35D180 E0052700 0200202D */ daddu $a0, $s0, $zero -/* 35D184 E0052704 0200202D */ daddu $a0, $s0, $zero -/* 35D188 E0052708 27A50018 */ addiu $a1, $sp, 0x18 -/* 35D18C E005270C 0C080114 */ jal shim_guMtxCatF -/* 35D190 E0052710 00A0302D */ daddu $a2, $a1, $zero -/* 35D194 E0052714 27A40018 */ addiu $a0, $sp, 0x18 -/* 35D198 E0052718 96C50000 */ lhu $a1, ($s6) -/* 35D19C E005271C 8EE20000 */ lw $v0, ($s7) -/* 35D1A0 E0052720 00052980 */ sll $a1, $a1, 6 -/* 35D1A4 E0052724 00B22821 */ addu $a1, $a1, $s2 -/* 35D1A8 E0052728 0C080118 */ jal shim_guMtxF2L -/* 35D1AC E005272C 00452821 */ addu $a1, $v0, $a1 -/* 35D1B0 E0052730 3C060100 */ lui $a2, 0x100 -/* 35D1B4 E0052734 34C61004 */ ori $a2, $a2, 0x1004 -/* 35D1B8 E0052738 8EA40000 */ lw $a0, ($s5) -/* 35D1BC E005273C 3C03DA38 */ lui $v1, 0xda38 -/* 35D1C0 E0052740 0080282D */ daddu $a1, $a0, $zero -/* 35D1C4 E0052744 24840008 */ addiu $a0, $a0, 8 -/* 35D1C8 E0052748 AEA40000 */ sw $a0, ($s5) -/* 35D1CC E005274C 96C20000 */ lhu $v0, ($s6) -/* 35D1D0 E0052750 2631FFF0 */ addiu $s1, $s1, -0x10 -/* 35D1D4 E0052754 ACA30000 */ sw $v1, ($a1) -/* 35D1D8 E0052758 24430001 */ addiu $v1, $v0, 1 -/* 35D1DC E005275C 3042FFFF */ andi $v0, $v0, 0xffff -/* 35D1E0 E0052760 00021180 */ sll $v0, $v0, 6 -/* 35D1E4 E0052764 A6C30000 */ sh $v1, ($s6) -/* 35D1E8 E0052768 8EE30000 */ lw $v1, ($s7) -/* 35D1EC E005276C 00521021 */ addu $v0, $v0, $s2 -/* 35D1F0 E0052770 00621821 */ addu $v1, $v1, $v0 -/* 35D1F4 E0052774 24820008 */ addiu $v0, $a0, 8 -/* 35D1F8 E0052778 ACA30004 */ sw $v1, 4($a1) -/* 35D1FC E005277C AEA20000 */ sw $v0, ($s5) -/* 35D200 E0052780 AC860000 */ sw $a2, ($a0) -/* 35D204 E0052784 AC910004 */ sw $s1, 4($a0) -.LE0052788: -/* 35D208 E0052788 27A40018 */ addiu $a0, $sp, 0x18 -/* 35D20C E005278C 0000382D */ daddu $a3, $zero, $zero -/* 35D210 E0052790 8E850024 */ lw $a1, 0x24($s4) -/* 35D214 E0052794 8E860028 */ lw $a2, 0x28($s4) -/* 35D218 E0052798 0C080108 */ jal shim_guTranslateF -/* 35D21C E005279C 26940008 */ addiu $s4, $s4, 8 -/* 35D220 E00527A0 27A40018 */ addiu $a0, $sp, 0x18 -/* 35D224 E00527A4 96C50000 */ lhu $a1, ($s6) -/* 35D228 E00527A8 8EE20000 */ lw $v0, ($s7) -/* 35D22C E00527AC 00052980 */ sll $a1, $a1, 6 -/* 35D230 E00527B0 00BE2821 */ addu $a1, $a1, $fp -/* 35D234 E00527B4 0C080118 */ jal shim_guMtxF2L -/* 35D238 E00527B8 00452821 */ addu $a1, $v0, $a1 -/* 35D23C E00527BC 3C080100 */ lui $t0, 0x100 -/* 35D240 E00527C0 35081000 */ ori $t0, $t0, 0x1000 -/* 35D244 E00527C4 3C09D838 */ lui $t1, 0xd838 -/* 35D248 E00527C8 35290002 */ ori $t1, $t1, 2 -/* 35D24C E00527CC 26640003 */ addiu $a0, $s3, 3 -/* 35D250 E00527D0 00133100 */ sll $a2, $s3, 4 -/* 35D254 E00527D4 26730001 */ addiu $s3, $s3, 1 -/* 35D258 E00527D8 3C03DA38 */ lui $v1, 0xda38 -/* 35D25C E00527DC 3084007F */ andi $a0, $a0, 0x7f -/* 35D260 E00527E0 8EA50000 */ lw $a1, ($s5) -/* 35D264 E00527E4 00042040 */ sll $a0, $a0, 1 -/* 35D268 E00527E8 00A0382D */ daddu $a3, $a1, $zero -/* 35D26C E00527EC 24A50008 */ addiu $a1, $a1, 8 -/* 35D270 E00527F0 AEA50000 */ sw $a1, ($s5) -/* 35D274 E00527F4 96C20000 */ lhu $v0, ($s6) -/* 35D278 E00527F8 00882025 */ or $a0, $a0, $t0 -/* 35D27C E00527FC ACE30000 */ sw $v1, ($a3) -/* 35D280 E0052800 24430001 */ addiu $v1, $v0, 1 -/* 35D284 E0052804 3042FFFF */ andi $v0, $v0, 0xffff -/* 35D288 E0052808 00021180 */ sll $v0, $v0, 6 -/* 35D28C E005280C A6C30000 */ sh $v1, ($s6) -/* 35D290 E0052810 8EE30000 */ lw $v1, ($s7) -/* 35D294 E0052814 005E1021 */ addu $v0, $v0, $fp -/* 35D298 E0052818 00621821 */ addu $v1, $v1, $v0 -/* 35D29C E005281C 24A20008 */ addiu $v0, $a1, 8 -/* 35D2A0 E0052820 ACE30004 */ sw $v1, 4($a3) -/* 35D2A4 E0052824 AEA20000 */ sw $v0, ($s5) -/* 35D2A8 E0052828 3C020900 */ lui $v0, 0x900 -/* 35D2AC E005282C 244201A0 */ addiu $v0, $v0, 0x1a0 -/* 35D2B0 E0052830 00C23021 */ addu $a2, $a2, $v0 -/* 35D2B4 E0052834 24A20010 */ addiu $v0, $a1, 0x10 -/* 35D2B8 E0052838 24030040 */ addiu $v1, $zero, 0x40 -/* 35D2BC E005283C ACA40000 */ sw $a0, ($a1) -/* 35D2C0 E0052840 ACA60004 */ sw $a2, 4($a1) -/* 35D2C4 E0052844 AEA20000 */ sw $v0, ($s5) -/* 35D2C8 E0052848 2A620014 */ slti $v0, $s3, 0x14 -/* 35D2CC E005284C ACA90008 */ sw $t1, 8($a1) -/* 35D2D0 E0052850 1440FFCD */ bnez $v0, .LE0052788 -/* 35D2D4 E0052854 ACA3000C */ sw $v1, 0xc($a1) -/* 35D2D8 E0052858 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* 35D2DC E005285C 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) -/* 35D2E0 E0052860 8CC50000 */ lw $a1, ($a2) -/* 35D2E4 E0052864 00A0102D */ daddu $v0, $a1, $zero -/* 35D2E8 E0052868 24A50008 */ addiu $a1, $a1, 8 -/* 35D2EC E005286C ACC50000 */ sw $a1, ($a2) -/* 35D2F0 E0052870 AC490000 */ sw $t1, ($v0) -/* 35D2F4 E0052874 AC430004 */ sw $v1, 4($v0) -/* 35D2F8 E0052878 24A20008 */ addiu $v0, $a1, 8 -/* 35D2FC E005287C ACC20000 */ sw $v0, ($a2) -/* 35D300 E0052880 ACA90000 */ sw $t1, ($a1) -/* 35D304 E0052884 ACA30004 */ sw $v1, 4($a1) -/* 35D308 E0052888 8FAA0098 */ lw $t2, 0x98($sp) -/* 35D30C E005288C 29420064 */ slti $v0, $t2, 0x64 -/* 35D310 E0052890 1040001F */ beqz $v0, .LE0052910 -/* 35D314 E0052894 3C03052A */ lui $v1, 0x52a -/* 35D318 E0052898 34630402 */ ori $v1, $v1, 0x402 -/* 35D31C E005289C 0000982D */ daddu $s3, $zero, $zero -/* 35D320 E00528A0 00C0402D */ daddu $t0, $a2, $zero -/* 35D324 E00528A4 3C090500 */ lui $t1, 0x500 -/* 35D328 E00528A8 35290002 */ ori $t1, $t1, 2 -/* 35D32C E00528AC 24070006 */ addiu $a3, $zero, 6 -/* 35D330 E00528B0 24060004 */ addiu $a2, $zero, 4 -/* 35D334 E00528B4 24A20010 */ addiu $v0, $a1, 0x10 -/* 35D338 E00528B8 AD020000 */ sw $v0, ($t0) -/* 35D33C E00528BC ACA30008 */ sw $v1, 8($a1) -/* 35D340 E00528C0 ACA0000C */ sw $zero, 0xc($a1) -.LE00528C4: -/* 35D344 E00528C4 30E400FF */ andi $a0, $a3, 0xff -/* 35D348 E00528C8 24E70002 */ addiu $a3, $a3, 2 -/* 35D34C E00528CC 30C300FF */ andi $v1, $a2, 0xff -/* 35D350 E00528D0 24C60002 */ addiu $a2, $a2, 2 -/* 35D354 E00528D4 26730001 */ addiu $s3, $s3, 1 -/* 35D358 E00528D8 00031C00 */ sll $v1, $v1, 0x10 -/* 35D35C E00528DC 00042200 */ sll $a0, $a0, 8 -/* 35D360 E00528E0 00641825 */ or $v1, $v1, $a0 -/* 35D364 E00528E4 8D020000 */ lw $v0, ($t0) -/* 35D368 E00528E8 00691825 */ or $v1, $v1, $t1 -/* 35D36C E00528EC 0040282D */ daddu $a1, $v0, $zero -/* 35D370 E00528F0 24420008 */ addiu $v0, $v0, 8 -/* 35D374 E00528F4 AD020000 */ sw $v0, ($t0) -/* 35D378 E00528F8 2A620013 */ slti $v0, $s3, 0x13 -/* 35D37C E00528FC ACA30000 */ sw $v1, ($a1) -/* 35D380 E0052900 1440FFF0 */ bnez $v0, .LE00528C4 -/* 35D384 E0052904 ACA00004 */ sw $zero, 4($a1) -/* 35D388 E0052908 08014A67 */ j .LE005299C -/* 35D38C E005290C 00000000 */ nop -.LE0052910: -/* 35D390 E0052910 3C030500 */ lui $v1, 0x500 -/* 35D394 E0052914 34630204 */ ori $v1, $v1, 0x204 -/* 35D398 E0052918 3C040500 */ lui $a0, 0x500 -/* 35D39C E005291C 34842A02 */ ori $a0, $a0, 0x2a02 -/* 35D3A0 E0052920 0000982D */ daddu $s3, $zero, $zero -/* 35D3A4 E0052924 00C0402D */ daddu $t0, $a2, $zero -/* 35D3A8 E0052928 3C090500 */ lui $t1, 0x500 -/* 35D3AC E005292C 35290002 */ ori $t1, $t1, 2 -/* 35D3B0 E0052930 24070006 */ addiu $a3, $zero, 6 -/* 35D3B4 E0052934 24060004 */ addiu $a2, $zero, 4 -/* 35D3B8 E0052938 24A20010 */ addiu $v0, $a1, 0x10 -/* 35D3BC E005293C AD020000 */ sw $v0, ($t0) -/* 35D3C0 E0052940 24A20018 */ addiu $v0, $a1, 0x18 -/* 35D3C4 E0052944 ACA30008 */ sw $v1, 8($a1) -/* 35D3C8 E0052948 ACA0000C */ sw $zero, 0xc($a1) -/* 35D3CC E005294C AD020000 */ sw $v0, ($t0) -/* 35D3D0 E0052950 ACA40010 */ sw $a0, 0x10($a1) -/* 35D3D4 E0052954 ACA00014 */ sw $zero, 0x14($a1) -.LE0052958: -/* 35D3D8 E0052958 30E400FF */ andi $a0, $a3, 0xff -/* 35D3DC E005295C 24E70002 */ addiu $a3, $a3, 2 -/* 35D3E0 E0052960 30C300FF */ andi $v1, $a2, 0xff -/* 35D3E4 E0052964 24C60002 */ addiu $a2, $a2, 2 -/* 35D3E8 E0052968 26730001 */ addiu $s3, $s3, 1 -/* 35D3EC E005296C 00031C00 */ sll $v1, $v1, 0x10 -/* 35D3F0 E0052970 00042200 */ sll $a0, $a0, 8 -/* 35D3F4 E0052974 00641825 */ or $v1, $v1, $a0 -/* 35D3F8 E0052978 8D020000 */ lw $v0, ($t0) -/* 35D3FC E005297C 00691825 */ or $v1, $v1, $t1 -/* 35D400 E0052980 0040282D */ daddu $a1, $v0, $zero -/* 35D404 E0052984 24420008 */ addiu $v0, $v0, 8 -/* 35D408 E0052988 AD020000 */ sw $v0, ($t0) -/* 35D40C E005298C 2A620013 */ slti $v0, $s3, 0x13 -/* 35D410 E0052990 ACA30000 */ sw $v1, ($a1) -/* 35D414 E0052994 1440FFF0 */ bnez $v0, .LE0052958 -/* 35D418 E0052998 ACA00004 */ sw $zero, 4($a1) -.LE005299C: -/* 35D41C E005299C 8FBF00C4 */ lw $ra, 0xc4($sp) -/* 35D420 E00529A0 8FBE00C0 */ lw $fp, 0xc0($sp) -/* 35D424 E00529A4 8FB700BC */ lw $s7, 0xbc($sp) -/* 35D428 E00529A8 8FB600B8 */ lw $s6, 0xb8($sp) -/* 35D42C E00529AC 8FB500B4 */ lw $s5, 0xb4($sp) -/* 35D430 E00529B0 8FB400B0 */ lw $s4, 0xb0($sp) -/* 35D434 E00529B4 8FB300AC */ lw $s3, 0xac($sp) -/* 35D438 E00529B8 8FB200A8 */ lw $s2, 0xa8($sp) -/* 35D43C E00529BC 8FB100A4 */ lw $s1, 0xa4($sp) -/* 35D440 E00529C0 8FB000A0 */ lw $s0, 0xa0($sp) -/* 35D444 E00529C4 D7B600D0 */ ldc1 $f22, 0xd0($sp) -/* 35D448 E00529C8 D7B400C8 */ ldc1 $f20, 0xc8($sp) -/* 35D44C E00529CC 03E00008 */ jr $ra -/* 35D450 E00529D0 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 35D454 E00529D4 00000000 */ nop -/* 35D458 E00529D8 00000000 */ nop -/* 35D45C E00529DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/is_debug/func_80025F44.s b/ver/us/asm/nonmatchings/is_debug/func_80025F44.s deleted file mode 100644 index a65fe45627..0000000000 --- a/ver/us/asm/nonmatchings/is_debug/func_80025F44.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80097D30 -.ascii "File:%s Line:%d %s \n" - -.section .text - -glabel func_80025F44 -/* 1344 80025F44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1348 80025F48 AFBF0010 */ sw $ra, 0x10($sp) -/* 134C 80025F4C 0080382D */ daddu $a3, $a0, $zero -/* 1350 80025F50 3C048009 */ lui $a0, %hi(D_80097D30) -/* 1354 80025F54 24847D30 */ addiu $a0, $a0, %lo(D_80097D30) -/* 1358 80025F58 0C00973F */ jal osSyncPrintf -/* 135C 80025F5C 00000000 */ nop -.L80025F60: -/* 1360 80025F60 080097D8 */ j .L80025F60 -/* 1364 80025F64 00000000 */ nop -/* 1368 80025F68 00000000 */ nop -/* 136C 80025F6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_func_802404B0_CB96B0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_UnkModelFunc000.s similarity index 99% rename from ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_func_802404B0_CB96B0.s rename to ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_UnkModelFunc000.s index e31035e863..e172d199f8 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_func_802404B0_CB96B0.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_UnkModelFunc000.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel flo_10_func_802404B0_CB96B0 +glabel flo_10_UnkModelFunc000 /* CB96B0 802404B0 27BDFFB0 */ addiu $sp, $sp, -0x50 /* CB96B4 802404B4 AFB60040 */ sw $s6, 0x40($sp) /* CB96B8 802404B8 0080B02D */ daddu $s6, $a0, $zero diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 15cf2befb9..352ed21714 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -42,9 +42,9 @@ segments: start: 0x1000 vram: 0x80025C00 subsegments: - - [0x1000, c, bss] + - [0x1000, hasm, bss] - [0x1000, hasm, entry_point] - - [0x1060, c, is_debug] + - [0x1060, c, is_debug, -g -fforce-addr] - [0x1370, c, main_pre] - [0x1370, c, main] - [0x1B40, c, main_loop] @@ -364,7 +364,7 @@ segments: vram: 0x800DC500 follows_vram: main subsegments: - - [0x759B0, c, bss2] + - [0x759B0, hasm, bss2] - [0x759B0, c, npc_collision] - [0x77480, c, 77480] - [0x7B440, c, 7B440] @@ -803,7 +803,7 @@ segments: vram: 0x8010F6D0 follows_vram: engine1 subsegments: - - [0xA5DD0, c, bss3] + - [0xA5DD0, hasm, bss3] - [0xA5DD0, c, a5dd0_len_114e0] - [0xB4580, c, B4580] - [0xB72B0, c, entity_model] @@ -1209,6 +1209,7 @@ segments: - [0x190A10, c] - [0x190B20, c, 190B20] - [0x1967B0, c, load_script] + - [0x196A10, c, move_script] - [0x196AA0, c, 196AA0] - [0x197F40, c, actor_api] - [0x19FAF0, c, 19FAF0] @@ -1379,7 +1380,9 @@ segments: - [0x1C0558] - [0x1C0560, ia8, ui/battle/swap_background, 48, 16] - [0x1C0860] - - [0x1C2100, data, 1C2100] + - [0x1C2100, .data, 190B20] + - [0x1C2460, .data, load_script] + - [0x1C2760, .data, move_script] - [0x1C2A70, .data, 196AA0] - [0x1C2EC0, .data, 19FAF0] - [0x1C2FC0, .data, 1A5830] @@ -3057,7 +3060,25 @@ segments: subsegments: - [0x35CA80, c, sleep_bubble] - [0x35D460] - - [0x35D510, bin] # sleep_bubble gfx + - name: effect_gfx_sleep_bubble + dir: effects/gfx + type: code + start: 0x35D510 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x35D510, c, sleep_bubble] + - start: 0x35D510 + type: .data + name: sleep_bubble + subsegments: + - [0x35D510, i4, D_09000000_35D510, 16, 16] + - [0x35D590, i4, D_09000080_35D590, 16, 16] + - [0x35D610, i4, D_09000100_35D610, 16, 16] + - [0x35D690, vtx, D_09000180_35D690] + - [0x35D7F0, gfx, D_090002E0_35D7F0] + - [0x35D8A0, gfx, D_09000390_35D8A0] + - [0x35D950, gfx, D_09000440_35D950] - name: effect_windy_leaves dir: effects type: code @@ -3208,7 +3229,29 @@ segments: subsegments: - [0x372790, c, fire_breath] - [0x373390] - - [0x3733E0, bin] # fire_breath gfx + - name: effect_gfx_fire_breath + dir: effects/gfx + type: code + start: 0x3733E0 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x3733E0, c, fire_breath] + - start: 0x3733E0 + type: .data + name: fire_breath + subsegments: + - [0x3733E0, i4, D_09000000_3733E0, 128, 32] + - [0x373BE0, i4, D_09000800_373BE0, 32, 32] + - [0x373DE0, gfx, D_09000A00_373DE0] + - [0x373EC8, vtx, D_09000AE8_373EC8] + - [0x373F18, vtx, D_09000B38_373F18] + - [0x373F68, gfx, D_09000B88_373F68] + - [0x373F88, gfx, D_09000BA8_373F88] + - [0x373FA0, vtx, D_09000BC0_373FA0] + - [0x373FE0, gfx, D_09000C00_373FE0] + - [0x374000, gfx, D_09000C20_374000] + - [0x3740A8] - name: effect_shimmer_burst dir: effects type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 77b7c1c32c..8e59c6daf4 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -14272,7 +14272,7 @@ battle_item_insecticide_herb_pal = 0x802A1BE0; // type:data rom:0x72B330 battle_item_insecticide_herb_model = 0x802A1C00; // type:data rom:0x72B350 battle_item_insecticide_herb_displayList = 0x802A1C40; // type:data rom:0x72B390 battle_item_insecticide_herb_modelCommandList = 0x802A1D30; // type:data rom:0x72B480 -script = 0x802A1D4C; // type:data rom:0x72B49C +battle_item_insecticide_herb_main = 0x802A1D4C; // type:data rom:0x72B49C battle_item_fright_jar_GiveRefund = 0x802A1000; // type:func rom:0x72B910 battle_item_fright_jar_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x72BAE4 battle_item_fright_jar_FadeBackgroundToBlack = 0x802A123C; // type:func rom:0x72BB4C @@ -14420,10 +14420,10 @@ D_802A23E8_735988 = 0x802A23E8; // type:data rom:0x735988 battle_move_hammer_D_802A27D0 = 0x802A27D0; // type:data rom:0x735D70 D_802A2AFC_0073609C = 0x802A2AFC; // type:data rom:0x73609C D_802A2DA0_00736340 = 0x802A2DA0; // type:data rom:0x736340 -D_802A3044_007365E4 = 0x802A3044; // type:data rom:0x7365E4 +battle_move_hammer_802A3044 = 0x802A3044; // type:data rom:0x7365E4 D_802A3168_00736708 = 0x802A3168; // type:data rom:0x736708 -D_802A369C_00736C3C = 0x802A369C; // type:data rom:0x736C3C -D_802A3B28_007370C8 = 0x802A3B28; // type:data rom:0x7370C8 +battle_move_hammer_802A369C = 0x802A369C; // type:data rom:0x736C3C +battle_move_hammer_802A3B28 = 0x802A3B28; // type:data rom:0x7370C8 D_802A3C4C_007371EC = 0x802A3C4C; // type:data rom:0x7371EC func_802A1000_737890 = 0x802A1000; // type:func rom:0x737890 func_802A1074_737904 = 0x802A1074; // type:func rom:0x737904 @@ -14444,7 +14444,7 @@ D_802A24C8_738D58 = 0x802A24F8; // type:data rom:0x738D58 D_802A28B0_739140 = 0x802A28E0; // type:data rom:0x739140 D_802A2BDC_73946C = 0x802A2C0C; // type:data rom:0x73946C D_802A2E80_739710 = 0x802A2EB0; // type:data rom:0x739710 -D_802A3124_7399B4 = 0x802A3154; // type:data rom:0x7399B4 +battle_move_spin_smash_main = 0x802A3154; // type:data rom:0x7399B4 D_802A3258_739AE8 = 0x802A3288; // type:data rom:0x739AE8 D_802A3920_73A1B0 = 0x802A3950; // type:data rom:0x73A1B0 D_802A3FC4_73A854 = 0x802A3FF4; // type:data rom:0x73A854 @@ -14464,7 +14464,7 @@ D_802A23E8 = 0x802A23E8; // type:data rom:0x73C2B8 D_802A27D0 = 0x802A27D0; // type:data rom:0x73C6A0 D_802A2AFC_0073C9CC = 0x802A2AFC; // type:data rom:0x73C9CC D_802A2DA0_0073CC70 = 0x802A2DA0; // type:data rom:0x73CC70 -D_802A3044_0073CF14 = 0x802A3044; // type:data rom:0x73CF14 +battle_move_quake_hammer_main = 0x802A3044; // type:data rom:0x73CF14 D_802A3168_0073D038 = 0x802A3168; // type:data rom:0x73D038 battle_move_jump_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x73D860 battle_move_jump_GetJumpDamage = 0x802A10E4; // type:func rom:0x73D944 @@ -14483,11 +14483,11 @@ D_802A203C_73E89C = 0x802A203C; // type:data rom:0x73E89C D_802A21D4_73EA34 = 0x802A21D4; // type:data rom:0x73EA34 D_802A2280 = 0x802A2280; // type:data rom:0x73EAE0 D_802A23D4_73EC34 = 0x802A23D4; // type:data rom:0x73EC34 -D_802A2650_73EEB0 = 0x802A2650; // type:data rom:0x73EEB0 +battle_move_jump_802A2650 = 0x802A2650; // type:data rom:0x73EEB0 D_802A2720_73EF80 = 0x802A2720; // type:data rom:0x73EF80 D_802A2ABC_73F31C = 0x802A2ABC; // type:data rom:0x73F31C D_802A2DE8_73F648 = 0x802A2DE8; // type:data rom:0x73F648 -D_802A30F4_73F954 = 0x802A30F4; // type:data rom:0x73F954 +battle_move_jump_802A30F4 = 0x802A30F4; // type:data rom:0x73F954 D_802A3188_73F9E8 = 0x802A3188; // type:data rom:0x73F9E8 D_802A3378_73FBD8 = 0x802A3378; // type:data rom:0x73FBD8 D_802A34EC_73FD4C = 0x802A34EC; // type:data rom:0x73FD4C @@ -14601,7 +14601,7 @@ battle_move_auto_multibounce_D_802A1FEC = 0x802A1FEC; // type:data rom:0x76B81C battle_move_auto_multibounce_D_802A2184 = 0x802A2184; // type:data rom:0x76B9B4 battle_move_auto_multibounce_D_802A2230 = 0x802A2230; // type:data rom:0x76BA60 battle_move_auto_multibounce_D_802A2384 = 0x802A2384; // type:data rom:0x76BBB4 -battle_move_auto_multibounce_D_802A2600 = 0x802A2600; // type:data rom:0x76BE30 +battle_move_auto_multibounce_main = 0x802A2600; // type:data rom:0x76BE30 battle_move_auto_multibounce_D_802A26A8 = 0x802A26A8; // type:data rom:0x76BED8 battle_move_auto_multibounce_D_802A2EC0 = 0x802A2EC0; // type:data rom:0x76C6F0 battle_move_auto_multibounce_D_802A372C = 0x802A372C; // type:data rom:0x76CF5C @@ -25775,7 +25775,6 @@ D_8009BB30 = 0x8009BB30; // type:data D_8009C4E0 = 0x8009C4E0; // type:data D_8009C4FC = 0x8009C4FC; // type:data D_800A08C0 = 0x800A08C0; // type:data -D_800A1530 = 0x800A1530; // type:data dead_gCurrentCamID = 0x800A158C; // type:data D_800A15A4 = 0x800A15A4; // type:data dead_gOverrideFlags = 0x800A15A8; // type:data @@ -27930,7 +27929,6 @@ D_FD100008 = 0xFD100008; // type:data dead_atan2 = 0x8002AF70; // type:func dead:yes dead_cos_rad = 0x8002B4C0; // type:func dead:yes dead_heap_free = 0x8002C01C; // type:data dead:yes -dead_func_80041080 = 0x80041080; // type:data dead:yes dead_guMtxIdentF = 0x8006C660; // type:data dead:yes dead_guMtxCatF = 0x8006C7C0; // type:data dead:yes dead_playFX_11 = 0x80075170; // type:func dead:yes diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index babc67c1dd..32b6a7c45a 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -240,12 +240,6 @@ D_09001CC8 = 0x09001CC8; D_09001C80 = 0x09001C80; D_090017D0 = 0x090017D0; -// effect_fire_breath -D_09000A00 = 0x09000A00; -D_09000B88 = 0x09000B88; -D_09000C00 = 0x09000C00; -D_09000C20 = 0x09000C20; - // effect_blast D_09001300 = 0x09001300; D_09001378 = 0x09001378; @@ -307,7 +301,6 @@ dead_heap_malloc = 0x8002BFD4; dead_heap_free = 0x8002C01C; dead_general_heap_malloc = 0x8002BF18; dead_heap_free = 0x8002C01C; -dead_func_80041080 = 0x80041080; dead_sin_deg = 0x8002B5DC; dead_cos_deg = 0x8002B640; dead_sin_cos_deg = 0x8002B524; @@ -375,8 +368,6 @@ dead_gPlayerData = 0x80117840; dead_gCollisionStatus = 0x80169B10; dead_gOverrideFlags = 0x800A15A8; dead_fx_motion_blur_flame = 0x80076970; -D_800A1530 = 0x800A1530; -D_800A15A4 = 0x800A15A4; D_800A15C4 = 0x800A15C4; D_800A15CC = 0x800A15CC; dead_gCurrentEncounter = 0x800B7EF0; @@ -390,6 +381,11 @@ dead_gCurrentCameraID = 0x8007C760; dead_gGameStatusPtr = 0x80079430; D_80079540 = 0x80079540; dead_gPartnerPopupProperties = 0x80094900; +dead_nuGfxZBuffer = 0x800A1530; +dead_osVirtualToPhysical = 0x80066FE0; +dead_transform_point = 0x8002A910; +dead_gMasterGfxPos = 0x800A15C4; +dead_nuGfxCfb_ptr = 0x800A15A4; // TODO below