From 922a95369173966080ce49046756d6d0e6da426c Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 5 Nov 2022 11:31:01 -0400 Subject: [PATCH] 4 effect funcs (#851) * tattle_window * cleanup * music_note_appendGfx * motion_blur_flame_update * Gfx bin, PR comments * undefined_syms cleanup * undefined_syms cleanup --- include/effects.h | 9 +- include/effects_internal.h | 3 + src/effects.c | 2 +- src/effects/gfx/tattle_window.c | 1 + src/effects/motion_blur_flame.c | 33 +- src/effects/music_note.c | 46 +- src/effects/partner_buff.c | 16 +- src/effects/tattle_window.c | 176 +++-- tools/ignored_funcs.txt | 2 - .../battle/move/hammer_throw/752500.data.s | 6 +- .../data/world/area_pra/pra_31/D81250.data.s | 2 +- .../asm/data/world/script_api/7E4EF0.data.s | 2 +- .../motion_blur_flame_update.s | 61 -- .../effects/music_note/music_note_appendGfx.s | 178 ----- .../effects/tattle_window/func_E00D8334.s | 196 ----- .../effects/tattle_window/func_E00D8630.s | 113 --- ver/us/splat.yaml | 14 +- ver/us/symbol_addrs.txt | 743 ------------------ ver/us/undefined_syms.txt | 455 +++++------ 19 files changed, 427 insertions(+), 1631 deletions(-) create mode 100644 src/effects/gfx/tattle_window.c delete mode 100644 ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_update.s delete mode 100644 ver/us/asm/nonmatchings/effects/music_note/music_note_appendGfx.s delete mode 100644 ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8334.s delete mode 100644 ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8630.s diff --git a/include/effects.h b/include/effects.h index bc2c28400a..213ed9394e 100644 --- a/include/effects.h +++ b/include/effects.h @@ -2069,12 +2069,9 @@ typedef struct TattleWindowFXData { /* 0x10 */ s32 unk_10; /* 0x14 */ s32 unk_14; /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ s32 unk_20; - /* 0x24 */ s32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ f32 unk_30; + /* 0x1C */ f32 scale; + /* 0x20 */ Vec3f rot; + /* 0x2C */ Vec2f offset; /* 0x34 */ u8 unk_34; /* 0x35 */ u8 unk_35; } TattleWindowFXData; // size = 0x38 diff --git a/include/effects_internal.h b/include/effects_internal.h index 5cb89468be..79ee1b323f 100644 --- a/include/effects_internal.h +++ b/include/effects_internal.h @@ -32,6 +32,9 @@ void shim_transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* s32 shim_npc_raycast_down_sides(s32, f32*, f32*, f32*, f32*); void shim_sfx_play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); void shim_mdl_draw_hidden_panel_surface(Gfx**, u16 treeIndex); +void shim_draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s32 width, s32 height, u8 opacity, + u8 darkening, f32 scaleX, f32 scaleY, f32 rotX, f32 rotY, f32 rotZ, void (*fpDrawContents)(void*), + void* drawContentsArg0, Matrix4f rotScaleMtx, s32 translateX, s32 translateY, f32 (*outMtx)[4]); // the actual signature is going to be wrong, but it doesn't matter // TODO remove when every effect's main is sorted out diff --git a/src/effects.c b/src/effects.c index 3946a1b2e1..7aa85a86c3 100644 --- a/src/effects.c +++ b/src/effects.c @@ -135,7 +135,7 @@ EffectTableEntry gEffectTable[] = { /* 0x69 */ FX_ENTRY(floating_cloud_puff, effect_gfx_floating_cloud_puff), /* 0x6A */ {}, /* 0x6B */ FX_ENTRY(energy_in_out, effect_gfx_energy_in_out), - /* 0x6C */ FX_ENTRY(tattle_window, _3D7040), + /* 0x6C */ FX_ENTRY(tattle_window, effect_gfx_tattle_window), /* 0x6D */ FX_ENTRY(shiny_flare, effect_gfx_shiny_flare), /* 0x6E */ FX_ENTRY(huff_puff_breath, effect_gfx_huff_puff_breath), /* 0x6F */ FX_ENTRY(cold_breath, effect_gfx_cold_breath), diff --git a/src/effects/gfx/tattle_window.c b/src/effects/gfx/tattle_window.c new file mode 100644 index 0000000000..9d2a529f98 --- /dev/null +++ b/src/effects/gfx/tattle_window.c @@ -0,0 +1 @@ +#include "effects/gfx/D_09000000_3D7040.png.inc.c" diff --git a/src/effects/motion_blur_flame.c b/src/effects/motion_blur_flame.c index 75343e0a7e..9df771fadd 100644 --- a/src/effects/motion_blur_flame.c +++ b/src/effects/motion_blur_flame.c @@ -5,7 +5,7 @@ s32 D_E00A29D0[] = { 0x09000200, 0x090002A8, 0x09000358 }; s32 D_E00A29DC[] = { 0x00000010, 0x00000010, 0x3F800000, 0x3F800000, 0x00000008, 0x00000008, 0x00000010, 0x00000010, 0x3F800000, 0x3F800000, 0x00000008, 0x00000008, 0x00000010, 0x00000010, 0x3F800000, 0x3F800000, 0x00000008, 0x00000008 }; -s32 D_E00A2A24[] = { 0x00000064, 0x0000003C, 0x0000001E, 0x0000000A, 0x00000000, 0x00000000, 0x00000000 }; +s32 D_E00A2A24[] = { 100, 60, 30, 10, 0, 0, 0 }; void motion_blur_flame_init(EffectInstance* effect); void motion_blur_flame_update(EffectInstance* effect); @@ -58,7 +58,36 @@ EffectInstance* motion_blur_flame_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f void motion_blur_flame_init(EffectInstance* effect) { } -INCLUDE_ASM(s32, "effects/motion_blur_flame", motion_blur_flame_update); +void motion_blur_flame_update(EffectInstance* effect) { + MotionBlurFlameFXData* data = effect->data.motionBlurFlame; + s32 temp; + + if (effect->flags & 0x10) { + effect->flags &= ~0x10; + data->unk_50 = 30; + } + data->unk_54++; + if (data->unk_50 < 1000) { + data->unk_50--; + } + + if (data->unk_50 < 0) { + shim_remove_effect(effect); + return; + } + temp = data->unk_50; + if (data->unk_54 <= 16) { + data->unk_4C = (data->unk_54 * 8) - 1; + } + if (temp < 16) { + data->unk_4C = temp * 8; + } + + temp = 0; + data->unk_1C[temp] = data->unk_04 + data->pos.x; + data->unk_2C[temp] = data->unk_08 + data->pos.y; + data->unk_3C[temp] = data->unk_0C + data->pos.z; +} void motion_blur_flame_render(EffectInstance* effect) { RenderTask renderTask; diff --git a/src/effects/music_note.c b/src/effects/music_note.c index 1a389bdcc8..31ce46bc38 100644 --- a/src/effects/music_note.c +++ b/src/effects/music_note.c @@ -6,6 +6,7 @@ void music_note_init(EffectInstance* effect); void music_note_update(EffectInstance* effect); void music_note_render(EffectInstance* effect); +extern Gfx D_09000FC0_35B5A0[]; extern Gfx D_09001038_35B618[]; extern Gfx D_090010C0_35B6A0[]; extern Gfx D_09001148_35B728[]; @@ -17,7 +18,20 @@ extern Gfx D_09001368_35B948[]; Gfx* D_E004C660[] = { D_09001038_35B618, D_090010C0_35B6A0, D_09001148_35B728, D_090011D0_35B7B0, D_09001258_35B838, D_090012E0_35B8C0, D_09001368_35B948 }; -s8 D_E004C67C[] = { 0xFE, 0xAC, 0xAC, 0xFE, 0xAC, 0xD5, 0xFE, 0xB4, 0x9A, 0xD5, 0xB4, 0xFE, 0xB4, 0xB4, 0xFE, 0xB4, 0xDD, 0xFE, 0xB4, 0xFE, 0xFE, 0xB4, 0xFE, 0xD5, 0xB4, 0xFE, 0xB4, 0xD5, 0xFE, 0xB4, 0xFE, 0xFE, 0xB4, 0xFE, 0xD5, 0xAC, }; +s8 D_E004C67C[] = { + 254, 172, 172, + 254, 172, 213, + 254, 180, 154, + 213, 180, 254, + 180, 180, 254, + 180, 221, 254, + 180, 254, 254, + 180, 254, 213, + 180, 254, 180, + 213, 254, 180, + 254, 254, 180, + 254, 213, 172, +}; void music_note_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { EffectBlueprint bp; @@ -114,4 +128,32 @@ void music_note_render(EffectInstance* effect) { retTask->renderMode |= RENDER_TASK_FLAG_2; } -INCLUDE_ASM(s32, "effects/music_note", music_note_appendGfx); +void music_note_appendGfx(void* data) { + EffectInstance* effect = data; + MusicNoteFXData* fxData = effect->data.musicNote; + Matrix4f sp18, sp58; + s32 colorIdx = fxData->unk_1C; + s32 dlistIdx = fxData->unk_20; + s32 rgbOffset; + + // TODO required to match - need to initialize define twice for some reason + rgbOffset = (colorIdx * 3) % ARRAY_COUNT(D_E004C67C); + rgbOffset = (colorIdx * 3) % ARRAY_COUNT(D_E004C67C); + + gDPPipeSync(gMasterGfxPos++); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMasterGfxPos++, D_09000FC0_35B5A0); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, + D_E004C67C[rgbOffset], D_E004C67C[rgbOffset + 1], D_E004C67C[rgbOffset + 2], fxData->unk_14 + ); + shim_guTranslateF(sp18, fxData->pos.x, fxData->pos.y, fxData->pos.z); + shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guScaleF(sp58, fxData->unk_10, fxData->unk_10, 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); + gSPDisplayList(gMasterGfxPos++, D_E004C660[dlistIdx]); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMasterGfxPos++); +} diff --git a/src/effects/partner_buff.c b/src/effects/partner_buff.c index 0391ce1508..cf554a5b13 100644 --- a/src/effects/partner_buff.c +++ b/src/effects/partner_buff.c @@ -36,7 +36,7 @@ EffectInstance* partner_buff_main(s32 useRandomValues, f32 arg1, f32 arg2, f32 a effect->numParts = numParts; part = effect->data.partnerBuff = shim_general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data.partnerBuff != NULL); - + part->useRandomValues = useRandomValues; part->lifeTime = 0; if (duration <= 0) { @@ -44,7 +44,7 @@ EffectInstance* partner_buff_main(s32 useRandomValues, f32 arg1, f32 arg2, f32 a } else { part->timeLeft = duration; } - + for (i = 0; i < ARRAY_COUNT(part->unk_0C); i++) { part->unk_0C[i].alpha = 0; part->unk_0C[i].turnsDisplay = 0; @@ -52,12 +52,12 @@ EffectInstance* partner_buff_main(s32 useRandomValues, f32 arg1, f32 arg2, f32 a part->unk_0C[i].state = BUFF_STATE_IDLE; part->unk_0C[i].stateTimer = 0; } - + part->unk_02 = 0; if (useRandomValues == 1) { part->unk_02 = 1; } - + return effect; } @@ -69,7 +69,7 @@ void partner_buff_update(EffectInstance* effect) { s32 useRandomValues = data->useRandomValues; s32 time; s32 i; - + if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; data->timeLeft = 16; @@ -77,7 +77,7 @@ void partner_buff_update(EffectInstance* effect) { if (data->timeLeft < 1000) { data->timeLeft--; } - + data->lifeTime++; if (data->timeLeft < 0) { shim_remove_effect(effect); @@ -85,7 +85,7 @@ void partner_buff_update(EffectInstance* effect) { } time = data->lifeTime; - + for (i = 0; i < ARRAY_COUNT(data->unk_0C); i++) { BuffData* buff = &data->unk_0C[i]; if (buff->turnsLeft < 0) { @@ -95,7 +95,7 @@ void partner_buff_update(EffectInstance* effect) { if ((useRandomValues == 1) && (time % 30 == 0)) { buff->turnsLeft = shim_rand_int(4); } - + switch (buff->state) { case BUFF_STATE_IDLE: if (buff->alpha == 255) { diff --git a/src/effects/tattle_window.c b/src/effects/tattle_window.c index 6e7900cd71..4993d52e97 100644 --- a/src/effects/tattle_window.c +++ b/src/effects/tattle_window.c @@ -8,37 +8,55 @@ void func_E00D8264(EffectInstance* effect); void func_E00D8630(EffectInstance* effect); typedef struct D_E00D8818_Entry { - s16 unk_00; + s16 yOffset; u8 unk_02; u8 unk_03; } D_E00D8818_Entry; // size = 0x4 -s32 D_E00D87E0[] = { 0x00000000, 0x00000000, 0x00000000, 0x09000000, 0x31100810, 0x08100810, 0x08000000, 0x00000000, 0xFC317FFF, 0x5FFEF438, 0xFC3135FF, 0x5FFEFE38, 0x3D4ABCFF, 0x00191CFF }; +extern u8 D_09000000_3D7040[]; + +WindowStyleCustom D_E00D87E0 = { + .background = {0}, + .corners = { + .imgData = D_09000000_3D7040, + .packedTileFormat = 0x31, + .size1 = {16, 8}, + .size2 = {16, 8}, + .size3 = {16, 8}, + .size4 = {16, 8}, + }, + .opaqueCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, 0, 0, 0, TEXEL1, 0, 0, 0, + COMBINED, 0, 0, 0, COMBINED), + .transparentCombineMode = gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL1, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0, + 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + .color1 = { 61, 74, 188, 255 }, + .color2 = { 0, 25, 28, 255}, +}; D_E00D8818_Entry D_E00D8818[] = { - { .unk_00 = 0xFF38, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0xFF60, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0xFF88, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0xFFAB, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0xFFC9, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0xFFE2, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0xFFF0, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0xFFF8, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0xFFFC, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0xFFFE, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0xFFFF, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0x0000, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0x0000, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0x0000, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0x0000, .unk_02 = 0xFF, .unk_03 = 0xFF }, - { .unk_00 = 0x0000, .unk_02 = 0xE6, .unk_03 = 0xFA }, - { .unk_00 = 0x0000, .unk_02 = 0x78, .unk_03 = 0xF5 }, - { .unk_00 = 0x0000, .unk_02 = 0x00, .unk_03 = 0xF0 }, - { .unk_00 = 0x0000, .unk_02 = 0x00, .unk_03 = 0xD2 }, - { .unk_00 = 0x0000, .unk_02 = 0x00, .unk_03 = 0xAA }, - { .unk_00 = 0x0000, .unk_02 = 0x00, .unk_03 = 0x78 }, - { .unk_00 = 0x0000, .unk_02 = 0x00, .unk_03 = 0x3C }, - { .unk_00 = 0x0000, .unk_02 = 0x00, .unk_03 = 0x00 }, + { .yOffset = -200, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = -160, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = -120, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = -85, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = -55, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = -30, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = -16, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = -8, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = -4, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = -2, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = -1, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = 0, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = 0, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = 0, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = 0, .unk_02 = 255, .unk_03 = 255 }, + { .yOffset = 0, .unk_02 = 230, .unk_03 = 250 }, + { .yOffset = 0, .unk_02 = 120, .unk_03 = 245 }, + { .yOffset = 0, .unk_02 = 0, .unk_03 = 240 }, + { .yOffset = 0, .unk_02 = 0, .unk_03 = 210 }, + { .yOffset = 0, .unk_02 = 0, .unk_03 = 170 }, + { .yOffset = 0, .unk_02 = 0, .unk_03 = 120 }, + { .yOffset = 0, .unk_02 = 0, .unk_03 = 60 }, + { .yOffset = 0, .unk_02 = 0, .unk_03 = 0 }, }; EffectInstance* tattle_window_main(s32 arg0, f32 x, f32 y, f32 z, f32 arg4, s32 arg5) { @@ -71,14 +89,14 @@ EffectInstance* tattle_window_main(s32 arg0, f32 x, f32 y, f32 z, f32 arg4, s32 part->pos.x = x; part->pos.y = y; part->pos.z = z; - part->unk_1C = 0; + part->scale = 0.0f; part->unk_18 = arg4; - part->unk_28 = 0.0f; - part->unk_2C = part->unk_30 = part->unk_28; - part->unk_20 = 0; - part->unk_24 = 0; - part->unk_34 = 0xFF; - part->unk_35 = 0xFF; + part->rot.x = 0.0f; + part->rot.y = 0.0f; + part->rot.z = 0.0f; + part->offset.x = part->offset.y = 0.0f; + part->unk_34 = 255; + part->unk_35 = 255; return effect; } @@ -108,21 +126,21 @@ void tattle_window_update(EffectInstance* effect) { return; } unk_10_2 = unk_10; - part->unk_28 = 0; - part->unk_2C = 0; - part->unk_1C = part->unk_18; + part->rot.z = 0; + part->offset.x = 0; + part->scale = part->unk_18; if (old_unk_14 < 23) { - part->unk_30 = D_E00D8818[old_unk_14].unk_00; + part->offset.y = D_E00D8818[old_unk_14].yOffset; part->unk_34 = D_E00D8818[old_unk_14].unk_02; part->unk_35 = D_E00D8818[old_unk_14].unk_03; } else { - part->unk_30 = D_E00D8818[0x16].unk_00; - part->unk_34 = D_E00D8818[0x16].unk_02; - part->unk_35 = D_E00D8818[0x16].unk_03; - part->unk_14 = 0x18; + part->offset.y = D_E00D8818[22].yOffset; + part->unk_34 = D_E00D8818[22].unk_02; + part->unk_35 = D_E00D8818[22].unk_03; + part->unk_14 = 24; } if (unk_10_2 < 23) { - part->unk_30 = D_E00D8818[unk_10_2].unk_00; + part->offset.y = D_E00D8818[unk_10_2].yOffset; part->unk_34 = D_E00D8818[unk_10_2].unk_02; part->unk_35 = D_E00D8818[unk_10_2].unk_03; } @@ -138,16 +156,16 @@ void func_E00D8264(EffectInstance* effect) { void func_E00D8280(void) { } -void func_E00D8288(s32 l, s32 r, s32 t, s32 b) { +void func_E00D8288(s32 l, s32 t, s32 r, s32 b) { if (l < 0) { l = 0; } - if (r < 0) { - r = 0; - } if (t < 0) { t = 0; } + if (r < 0) { + r = 0; + } if (b < 0) { b = 0; } @@ -155,19 +173,73 @@ void func_E00D8288(s32 l, s32 r, s32 t, s32 b) { if (l > SCREEN_WIDTH - 1) { l = SCREEN_WIDTH - 1; } - if (r > SCREEN_HEIGHT - 1) { - r = SCREEN_HEIGHT - 1; + if (t > SCREEN_HEIGHT - 1) { + t = SCREEN_HEIGHT - 1; } - if (t > SCREEN_WIDTH - 1) { - t = SCREEN_WIDTH - 1; + if (r > SCREEN_WIDTH - 1) { + r = SCREEN_WIDTH - 1; } if (b > SCREEN_HEIGHT - 1) { b = SCREEN_HEIGHT - 1; } - gDPFillRectangle(gMasterGfxPos++, l, r, t, b); + gDPFillRectangle(gMasterGfxPos++, l, t, r, b); } -INCLUDE_ASM(s32, "effects/tattle_window", func_E00D8334); +void func_E00D8334(TattleWindowFXData* data, s32 left, s32 top, s32 right, s32 bottom) { + f32 t1 = data->unk_34 / 255.0f; + f32 t2 = data->unk_35 / 255.0f; + s32 xMid, yMid; + s32 l, t, r, b; -INCLUDE_ASM(s32, "effects/tattle_window", func_E00D8630); + if (data->unk_34 > 0 || data->unk_35 > 0) { + gDPPipeSync(gMasterGfxPos++); + gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF); + gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); + gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); + gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); + gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); + gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); + gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + gDPSetCombineMode(gMasterGfxPos++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 24, 48, 96, 255); + l = left + 4; + r = (left + right) - 4; + t = top + 4; + b = (top + bottom) - 4; + xMid = (r - l) / 2; + yMid = (b - t) / 2; + func_E00D8288(l, t, l + (xMid * t1), b); + func_E00D8288(r - (xMid * t1), t, r, b); + func_E00D8288(l, t, r, t + (yMid * t2)); + func_E00D8288(l, b - (yMid * t2), r, b); + } +} + +void func_E00D8630(EffectInstance* effect) { + TattleWindowFXData* data = effect->data.tattleWindow; + s32 flags; + + gDPPipeSync(gMasterGfxPos++); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + + if (data->scale == 1.0f && data->rot.x == 0.0f && data->rot.y == 0.0f && data->rot.z == 0.0f) { + flags = 0; + } else { + flags = 1; + } + + shim_draw_box( + flags, &D_E00D87E0, + (data->pos.x + data->offset.x) - 75.0f, + (data->pos.y + data->offset.y) - 53.0f, + data->pos.z, + 150, 107, + 255, 0, + data->scale, data->scale, + data->rot.x, data->rot.y, data->rot.z, + (void (*)(void*)) func_E00D8334, data, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); + gDPPipeSync(gMasterGfxPos++); +} diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 8e897c4f3d..8d0c7ef2a4 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -81,8 +81,6 @@ dead_set_screen_overlay_params_front = 0x80144178; dead_fx_sparkles = 0x80075170; dead_npc_test_move_simple_without_slipping = 0x800E53AC; dead_get_item_entity = 0x8013CF98; -func_80066FE0 = 0x80066FE0; -func_8002A910 = 0x8002A910; dead_get_current_map_settings = 0x8005F128; dead_partner_clear_player_tracking = 0x800F7278; func_800F2E98 = 0x800F2E98; 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 632553c50d..3d0597a669 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 @@ -24,19 +24,19 @@ dlabel D_802A1A64_752EB4 .word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 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, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_752500, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_752654, 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_throw_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_hammer_throw_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, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_CreateHudElements, 0x00000046, 0x00000001, D_802A10B0_752500, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_7527D8, 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_throw_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_throw_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_802A10B0_752500, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_75295C, 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_throw_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_throw_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_7525DC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_752654, 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_throw_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_7525DC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_7527D8, 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_throw_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_7525DC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_75295C, 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_throw_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, 0x00000000 dlabel D_802A3048_754498 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000AAAAA, 0x00000000, 0x00000000, 0x00000000, 0x0AAAAAAA, 0xAAA00000, 0x00000000, 0x00000000, 0xAAA47477, 0xAAAA0AAA, D_A0000000, 0x0000000B, 0xB477333B, 0xB8AAAAAA, 0xAA000000, 0x000000BB, 0xEC738DE1, 0x1B88AAA2, 0xAAA00000, 0x00000BBE, 0x11C8C111, 0x11B88A32, 0x2AAA0000, 0x0000ABE1, 0x111C1111, 0x11B84333, 0x4AAA0000, 0x0000AAC1, 0x1111E111, 0xDB222434, 0xAAA00000, 0x000AA77C, 0x11111E1B, 0x8222224A, 0xAAA00000, 0x000AA733, 0xC11111B8, 0x22223222, 0x2AAA0000, 0x000AA43C, 0x1E11111B, 0x22222332, 0x22AAA000, 0x000AA7DF, 0x11E11111, 0xC2222233, 0x232AAA00, 0x000AA7E1, 0x111B1111, 0x1C222223, 0x3333AA00, 0x000AABF1, 0x11B3B111, 0xB2222337, 0x66764440, 0x000AABF1, 0x1D333B1B, 0x22223777, 0x76766440, 0x0000AABF, 0x1B2233B2, 0x22337667, 0x55556440, 0x0000AAAB, 0xB2222333, 0x33375675, 0x55557440, 0x00000AAA, 0x83222223, 0x33376655, 0x55554440, 0x000000AA, 0xA8332222, 0x37677555, 0x55574400, 0x00000AAA, 0x3A833323, 0x75675555, 0x55544400, 0x0000AAA3, 0x33A23333, 0x76655555, 0x55744000, 0x000AAA32, 0x34AA2233, 0x76555555, 0x57440000, 0x00AAA322, 0x4AAAA237, 0x77555555, 0x74440000, 0x0AAA3224, 0xAAAAAAA7, 0x66555557, 0x44400000, 0x0AA3224A, 0xAA00AAA7, 0x66655744, 0x44000000, 0x0AA224AA, 0xA0000AAA, 0x76744444, 0x40000000, 0x0AAA4AAA, 0x000000AA, 0xA4444440, 0x00000000, 0x00AAAAA0, 0x00000000, 0xA4444000, 0x00000000, 0x000AAA00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000AAAAA, 0x00000000, 0x00000000, 0x00000000, 0x0AAAAAAA, 0xAAA00000, 0x00000000, 0x00000000, 0xAAA47477, 0xAAAA0AAA, 0xA0000000, 0x0000000B, 0xB477333B, 0xB8AAAAAA, 0xAA000000, 0x000000BB, 0xEC738DE1, 0x1B88AAA2, 0xAAA00000, 0x00000BBE, 0x11C8C111, 0x11B88A32, 0x2AAA0000, 0x0000ABE1, 0x111C1111, 0x11B84333, 0x4AAA0000, 0x0000AAC1, 0x1111E111, 0xDB222434, 0xAAA00000, 0x000AA77C, 0x11111E1B, 0x8222224A, 0xAAA00000, 0x000AA733, 0xC11111B8, 0x22223222, 0x2AAA0000, 0x000AA43C, 0x1E11111B, 0x22222332, 0x22AAA000, 0x000AA7DF, 0x11E11111, 0xC2222233, 0x232AAA00, 0x000AA7E1, 0x111B1111, 0x1C222223, 0x3333AA00, 0x000AABF1, 0x11B3B111, 0xB2222337, 0x66764440, 0x000AABF1, 0x1D333B1B, 0x22223777, 0x76766440, 0x0000AABF, 0x1B2233B2, 0x22337667, 0x55556440, 0x0000AAAB, 0xB2222333, 0x33375675, 0x55557440, 0x00000AAA, 0x83222223, 0x33376655, 0x55554440, 0x000000AA, 0xA8332222, 0x37677555, 0x55574400, 0x00000AAA, 0x3A833323, 0x75675555, 0x55544400, 0x0000AAA3, 0x33A23333, 0x76655555, 0x55744000, 0x000AAA32, 0x34AA2233, 0x76555555, 0x57440000, 0x00AAA322, 0x4AAAA237, 0x77555555, 0x74440000, 0x0AAA3224, 0xAAAAAAA7, 0x66555557, 0x44400000, 0x0AA3224A, 0xAA00AAA7, 0x66655744, 0x44000000, 0x0AA224AA, 0xA0000AAA, 0x76744444, 0x40000000, 0x0AAA4AAA, 0x000000AA, 0xA4444440, 0x00000000, 0x00AAAAA0, 0x00000000, 0xA4444000, 0x00000000, 0x000AAA00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_802A3248_754698 .word 0x210CC631, 0xB4078AC7, 0x5A09E65B, 0xCD979C13, 0xA387B4D5, 0x30C72109, 0x39CF4A53, 0x63190001 dlabel D_802A3268_7546B8 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00AAAAAA, 0x00000000, 0x00000000, 0x00000000, 0xAAAAAAAA, 0xAA000000, 0x00000000, 0x0000000A, 0xAAA77A7A, 0xAAAA0AAA, D_A0000000, 0x000000AA, 0xA7773338, 0x8AAAAAAA, 0xAA000000, 0x00000AAA, 0x77888833, 0x388AAAA2, 0xAAA00000, 0x0000AAA7, 0x78888888, 0x33888A32, 0x2AAA0000, 0x0000AA77, 0x33833888, 0x88884333, 0x4AAA0000, 0x000AAA78, 0x33883332, 0x22222434, 0xAAA00000, 0x000AA778, 0x88888333, 0x2222224A, 0xAAA00000, 0x000AA783, 0x88822233, 0x32222222, 0x2AAA0000, 0x000AAA83, 0x38222223, 0x33222322, 0x22AAA000, 0x000AA783, 0x38222222, 0x33222233, 0x232AAA00, 0x000AA788, 0x33222222, 0x22322223, 0x3333AA00, 0x000AAA88, 0x83322222, 0x22222337, 0x66764440, 0x0000AA88, 0x82322232, 0x22223777, 0x66766440, 0x0000AAA8, 0x82232223, 0x22227667, 0x55576440, 0x00000AA8, 0x82222223, 0x32375675, 0x55556440, 0x00000AAA, 0x82222222, 0x33376655, 0x55554440, 0x000000AA, 0xA8222222, 0x37677555, 0x55554400, 0x00000AAA, 0x3A822222, 0x75675555, 0x55544400, 0x0000AAA3, 0x33A22323, 0x76655555, 0x55544000, 0x000AAA32, 0x34AA2233, 0x77755555, 0x55440000, 0x00AAA322, 0x4AAAA233, 0x77555555, 0x54440000, 0x0AAA3224, 0xAAAAAAA7, 0x66555555, 0x44400000, 0x00A3224A, 0xAA00AAAA, 0x67655544, 0x44000000, 0x000224AA, 0xA0000AAA, 0xA6644444, 0x40000000, 0x00004AAA, 0x0000000A, 0xA4444440, 0x00000000, 0x000000A0, 0x00000000, 0x04444000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00AAAAAA, 0x00000000, 0x00000000, 0x00000000, 0xAAAAAAAA, 0xAA000000, 0x00000000, 0x0000000A, 0xAAA77A7A, 0xAAAA0AAA, 0xA0000000, 0x000000AA, 0xA7773338, 0x8AAAAAAA, 0xAA000000, 0x00000AAA, 0x77888833, 0x388AAAA2, 0xAAA00000, 0x0000AAA7, 0x78888888, 0x33888A32, 0x2AAA0000, 0x0000AA77, 0x33833888, 0x88884333, 0x4AAA0000, 0x000AAA78, 0x33883332, 0x22222434, 0xAAA00000, 0x000AA778, 0x88888333, 0x2222224A, 0xAAA00000, 0x000AA783, 0x88822233, 0x32222222, 0x2AAA0000, 0x000AAA83, 0x38222223, 0x33222322, 0x22AAA000, 0x000AA783, 0x38222222, 0x33222233, 0x232AAA00, 0x000AA788, 0x33222222, 0x22322223, 0x3333AA00, 0x000AAA88, 0x83322222, 0x22222337, 0x66764440, 0x0000AA88, 0x82322232, 0x22223777, 0x66766440, 0x0000AAA8, 0x82232223, 0x22227667, 0x55576440, 0x00000AA8, 0x82222223, 0x32375675, 0x55556440, 0x00000AAA, 0x82222222, 0x33376655, 0x55554440, 0x000000AA, 0xA8222222, 0x37677555, 0x55554400, 0x00000AAA, 0x3A822222, 0x75675555, 0x55544400, 0x0000AAA3, 0x33A22323, 0x76655555, 0x55544000, 0x000AAA32, 0x34AA2233, 0x77755555, 0x55440000, 0x00AAA322, 0x4AAAA233, 0x77555555, 0x54440000, 0x0AAA3224, 0xAAAAAAA7, 0x66555555, 0x44400000, 0x00A3224A, 0xAA00AAAA, 0x67655544, 0x44000000, 0x000224AA, 0xA0000AAA, 0xA6644444, 0x40000000, 0x00004AAA, 0x0000000A, 0xA4444440, 0x00000000, 0x000000A0, 0x00000000, 0x04444000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_802A3468_7548B8 .word 0x210CC631, 0xB4078AC7, 0x5A09E65B, 0xCD979C13, 0xA387B4D5, 0x30C72109, 0x39CF4A53, 0x63190001 dlabel D_802A3488_7548D8 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000BBBB, 0x00000000, 0x00000000, 0x00000000, 0x00BBBBBB, 0xBB000000, 0x00000000, 0x00000000, 0xBBBB7889, 0xBBB00011, 0x00000000, 0x0000000B, 0xBA766788, 0x99BB0111, 0x10000000, 0x000000BB, 0x97666678, 0x899B1112, 0x11000000, 0x00000BB9, 0x76766667, 0x88991132, 0x21100000, 0x00000BA8, 0x76676666, 0x7889B333, 0x41100000, 0x0000BB88, 0x87667666, 0x67889B34, 0x11000000, 0x0000BB88, 0x88766766, 0x667889B1, D_B0000000, 0x000BB998, 0x88876676, 0x66678899, 0xBB000000, 0x000BB999, 0x88887667, 0x66667889, 0x9BB00000, 0x000BBA99, 0x98888766, 0x76666788, 0x99BB0000, 0x000BBAA9, 0x99888876, 0x67666678, 0xAAABB000, 0x000BBAAA, 0x99988887, 0x667667AA, 0x999BB000, 0x000BBAAA, 0xA9998888, 0x7667AA99, 0x9999BB00, 0x0000BBAA, 0xAA999888, 0x877A9999, 0x9999BB00, 0x0000BBAA, 0xAAA99988, 0x88A99999, 0x9999BB00, 0x00000BBA, 0xAAAA9998, 0x8A999999, 0x9999BB00, 0x000000BB, 0xAAAAA999, 0x8A999999, 0x999BB000, 0x00000111, 0xBAAAAA99, 0xA9999999, 0x999BB000, 0x00001113, 0x3BAAAAA9, 0xA9999999, 0x99BB0000, 0x00011132, 0x34B9AAAA, 0x99999999, 0x9BBB0000, 0x00111322, 0x41BB9AAA, 0x99999999, 0xBBB00000, 0x01113224, 0x111BB9AA, 0x9999999B, 0xBB000000, 0x01132241, 0x1100BB9A, 0x999999BB, D_B0000000, 0x01322411, 0x10000BBA, 0xA999BBBB, 0x00000000, 0x00224111, 0x000000BB, 0xBBBBBB00, 0x00000000, 0x00041110, 0x00000000, 0xBBBB0000, 0x00000000, 0x00001100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000BBBB, 0x00000000, 0x00000000, 0x00000000, 0x00BBBBBB, 0xBB000000, 0x00000000, 0x00000000, 0xBBBB7889, 0xBBB00011, 0x00000000, 0x0000000B, 0xBA766788, 0x99BB0111, 0x10000000, 0x000000BB, 0x97666678, 0x899B1112, 0x11000000, 0x00000BB9, 0x76766667, 0x88991132, 0x21100000, 0x00000BA8, 0x76676666, 0x7889B333, 0x41100000, 0x0000BB88, 0x87667666, 0x67889B34, 0x11000000, 0x0000BB88, 0x88766766, 0x667889B1, 0xB0000000, 0x000BB998, 0x88876676, 0x66678899, 0xBB000000, 0x000BB999, 0x88887667, 0x66667889, 0x9BB00000, 0x000BBA99, 0x98888766, 0x76666788, 0x99BB0000, 0x000BBAA9, 0x99888876, 0x67666678, 0xAAABB000, 0x000BBAAA, 0x99988887, 0x667667AA, 0x999BB000, 0x000BBAAA, 0xA9998888, 0x7667AA99, 0x9999BB00, 0x0000BBAA, 0xAA999888, 0x877A9999, 0x9999BB00, 0x0000BBAA, 0xAAA99988, 0x88A99999, 0x9999BB00, 0x00000BBA, 0xAAAA9998, 0x8A999999, 0x9999BB00, 0x000000BB, 0xAAAAA999, 0x8A999999, 0x999BB000, 0x00000111, 0xBAAAAA99, 0xA9999999, 0x999BB000, 0x00001113, 0x3BAAAAA9, 0xA9999999, 0x99BB0000, 0x00011132, 0x34B9AAAA, 0x99999999, 0x9BBB0000, 0x00111322, 0x41BB9AAA, 0x99999999, 0xBBB00000, 0x01113224, 0x111BB9AA, 0x9999999B, 0xBB000000, 0x01132241, 0x1100BB9A, 0x999999BB, 0xB0000000, 0x01322411, 0x10000BBA, 0xA999BBBB, 0x00000000, 0x00224111, 0x000000BB, 0xBBBBBB00, 0x00000000, 0x00041110, 0x00000000, 0xBBBB0000, 0x00000000, 0x00001100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_802A3688_754AD8 .word 0x210C30C7, 0xB4078AC7, 0x5A09BDEF, 0xA4E983E3, 0x5ADD4217, 0x29512109, 0x39CF4A53, 0x6319A529 diff --git a/ver/us/asm/data/world/area_pra/pra_31/D81250.data.s b/ver/us/asm/data/world/area_pra/pra_31/D81250.data.s index 65532b0c32..927e247458 100644 --- a/ver/us/asm/data/world/area_pra/pra_31/D81250.data.s +++ b/ver/us/asm/data/world/area_pra/pra_31/D81250.data.s @@ -30,7 +30,7 @@ dlabel D_80243190_D81EF0 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240894_D7F5F4, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000024, 0x00000002, 0xFE363C89, 0x00000025, 0x00000046, 0x00000001, D_80242E04_D81B64, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, InitAnimatedModels, 0x00000043, 0x00000003, LoadAnimatedModel, 0x00000000, D_80246094_D84DF4, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetAnimatedModelRenderMode, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240510_D7F270, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000034, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000034, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000034, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000034, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001F, 0x0000003C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x0000003C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x0000003C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000022, 0x0000003C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000024, 0x00000044, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x00000044, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000026, 0x00000044, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x00000044, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000044, 0x00000001, D_80242B40_D818A0, 0x00000047, 0x00000005, D_80243078_D81DD8, 0x00000040, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243104_D81E64, 0x00000040, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243190_D81EF0, 0x00000040, 0x00000025, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, D_802471E4_D85F44, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000055, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005B, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000018, 0x7FFFFE00, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, D_80246130_D84E90, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000021, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000030, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000055, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005B, 0x00000000, 0x00000044, 0x00000001, D_80242570_D812D0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243510_D82270 -.word 0x2BC17217, 0x2DD00000, 0x00000000, 0x00000000, 0x00000111, 0x11111111, 0x10C3CDD2, 0x712ABC18, 0x81C1F817, 0x8DD03300, 0x11000000, 0x00000000, 0x00000111, 0x11111111, 0x11330DD2, 0x712ABC18, 0x81C1F817, 0x2DD13000, 0x00000000, 0x00000000, 0x000B1011, 0x11111111, 0x11031332, 0x8B2A1C18, 0x80C17817, 0x2DD13004, 0x00000000, 0x00000000, 0x000B7B00, 0x11111111, 0x1100F332, 0xAB2A1C08, 0x80C17217, 0x8DD10400, 0x00000000, 0x00000000, 0x00BBBBB0, 0x01111111, 0x11007332, 0xAB2A1C08, 0x80C17817, 0x8DD03304, 0x00000111, 0x00000000, 0x0B0BB77B, 0xB1111111, 0x1100F332, 0xAB271C08, 0x80C1F817, 0x2D3B0000, 0x00000111, 0x00000000, 0x0B0B7777, 0x7F111111, 0x1110B332, 0xA18F0C08, 0x80C0F817, 0x233F0000, 0x00000011, 0x00000B00, 0x00BB7777, 0x7777B110, 0x0010F332, 0xA18F0C08, 0x80C0F817, 0x233F0000, 0x00000001, 0x0001B000, 0x11117777, 0x77777703, 0x3400F332, 0xA12F0C08, 0x80C072B8, 0x63370011, 0x00000000, 0x00000000, 0xBF777777, 0x7777B000, 0x30330DD2, 0x71271C18, 0x80C0F2B8, 0x633A0001, 0x11000000, 0x10330001, 0xB777B777, 0x777B3DDD, 0xD3330DD2, 0x712F1C18, 0x80C0F21A, 0x233A0001, 0x11000000, 0x03DD001B, 0x777B7BBB, 0xBB0DDDDD, 0xDD3DDDD8, 0x2F2ABC12, 0x80C0F8BA, 0x23370000, 0x11100000, 0x4DD3400B, 0x777B7000, 0x003DDDDD, 0xDDDDDDD7, 0xAB2A1C12, 0x80C0F2B8, 0x63370000, 0x01110000, 0x3DDDD30B, 0x777B1100, 0x043DDDDD, 0xDDDDDDDB, 0x7F271C08, 0x80C0F2B2, 0x93370000, 0x00011103, 0xDD33330B, 0x77B11110, 0x003DDDDD, 0xDDDDDDD1, 0xFF68BC1A, 0x80C0721A, 0x63370000, 0x0000003D, 0xD3333330, 0xBB711111, 0x0043DDD3, 0xDDDDDDD1, 0x00871C0B, 0x80C17218, 0x63370000, 0x000003DD, 0x3333403D, 0x4BB11111, 0x100043DD, 0xDDDDDDD1, 0x0CF103C1, 0x80C172B2, 0x63377700, 0x00003D33, 0x33334003, 0x33B11111, 0x10000033, 0x3DDDDDDF, 0x1010333F, 0x80C0F2B8, 0x63370000, 0x00043DD3, 0x33340000, 0x43B11110, 0x000000B3, 0x3DDDDDDA, 0xF171C33F, 0x80C072B8, 0x63370000, 0x00333333, 0x33300000, 0x03111110, 0x00000000, 0x33DD3D36, 0x2B27030F, 0x80C1A2B2, 0x63370700, 0x33333333, 0x33300001, 0x03111100, 0x00000000, 0x00330336, 0x8B2703C7, 0x81C1A2F2, 0x63370870, 0x33333333, 0x3333C400, 0x33010000, 0x00000000, 0x00047339, 0x2F2A1307, 0x80C172B2, 0x63370080, 0x3333333C, 0x33334040, 0x3D0100BB, D_B0000000, 0x0000A339, 0x2F2A13CF, 0x80C172F2, 0x63370000, 0x43333000, 0x00433333, 0x3D000BBB, D_B0000000, 0x0000A339, 0x2F68B3C1, 0x80C172B8, 0x63370008, 0x03333000, 0xE0003333, 0x3300B77B, 0x00000000, 0x0008A339, 0x2F68B3C1, 0x80C0F81A, 0x63370007, 0x04333030, 0x00043333, 0xD3400BBB, 0x00000111, 0x0078A336, 0x2F2A1331, 0x80C0F817, 0x233F0770, 0x00433003, 0x00E4333D, 0xD340BB00, 0x00011111, 0x5178A336, 0x2F270331, 0x80C172BA, 0x633BB444, 0x440033C0, 0x000C3DDD, 0x0000B000, 0x00100111, 0x17887336, 0x2B270330, 0x80C172B8, 0x633B0044, 0x4440033C, 0xCC33DDD0, 0x0000B000, 0x00110011, 0x11157332, 0xA08F030A, 0x81C1F81A, 0x2D3B4040, 0x0000000C, 0x333DDD30, 0x00000000, 0x01110000, 0x01117336, 0x70FF130A, 0x81C172BA, 0x23310444, 0x44440000, 0xCDDD3330, 0x000B0000, 0x01100000, 0x0400B332, 0x70FF0C0A, 0x81CBA2F2, 0x63377000, 0x00000000, 0x04333344, 0x00010000, 0x01100000, 0x00C3F332, 0xA1F1030A, 0x81C172B2, 0x63370000, 0x00000000, 0x00043304, 0x40000000, 0x00000000, 0x0C30B332, 0xAB210307, 0x81CBA2BA, 0x233F0000, 0x00000000, 0x00000C04, 0x4C000000, 0x0000004C, 0x333C0DD2, 0x718F0307, 0x80C1A2BA, 0x63370000, 0x00000000, 0x00000000, 0xCCCC4440, 0x3400400C, 0x3C041DD2, 0x70AB03CB, 0x80C1A2BA, 0x23370000, 0x00000000, 0x00000000, 0x00000000, 0x043CCC33, 0x34041332, 0xA1AF030A, 0x80C1A2B2, 0x63370000, 0x000000B0, 0x00000000, 0x00000000, 0x04433C33, 0x444C13D2, 0x71AF030A, 0x80C1A2F2, 0x633A0000, 0x00000000, 0x00000000, 0x00000000, 0x04444444, 0x4444B3D2, 0xF0AB030A, 0x81C1A2F2, 0x633A0000, 0x00000000, 0x00000000, 0x00000000, 0x00444444, 0x4444F332, 0x70AB030A, 0x81CB86F2, 0x933A0110, 0x11111100, 0x00000000, 0x00000000, 0x00000444, 0x4444B332, 0xA1AB030A, 0x80CB86F2, 0x933A1111, 0x11111110, 0x00000000, 0x000000C0, 0x00000000, 0x0444B336, 0x8BAB030A, 0x80C1A2F2, 0x933A1111, 0x11100111, 0x00000000, 0x00000400, 0x00000000, 0x0004F332, 0x8BAF1C0A, 0x80C1A2F2, 0x933A0111, 0x10000011, 0x1100000B, 0x77504000, 0x00000000, 0x0000F336, 0x8B8F1C0A, 0x81C172B8, 0x633A1111, 0x00000011, 0x11111850, 0x0007B000, 0x00000000, 0x0000F332, 0xA127030A, 0x81C1A2F2, 0x9331CC55, 0x87000111, 0x11118111, 0x00000070, 0x05700777, 0xBBB7F332, 0x812F030A, 0x81C172B2, 0x63303330, 0x78787111, 0x11108111, 0x00000000, 0x0000B077, 0x77777336, 0x812F030A, 0x81C1F2F2, 0x933C33DD, 0x07588111, 0x11115511, 0x0000000B, 0x0000700B, 0x0E077336, 0x8127030A, 0x81C172B8, 0x633C3DDD, 0x34580581, 0x11110501, 0x00000000, 0x00007000, 0x00077336, 0xA1871C0A, 0x81CBA2F2, 0x63333DDD, 0x33005850, 0x11111500, 0x00000000, 0x00000700, 0x00077332, 0x718F030A, 0x81CB8672, 0x9333DD33, 0xD3333070, 0x11110700, 0x00000000, 0x00000B00, 0x000E7336, 0x2B2F030A, 0x80C172F8, 0x633CDD3D, 0x33DDD370, 0x11110500, 0x00000000, 0x00000750, 0x00EE7336, 0x8B2F030A, 0x21C1A2B2, 0x6330DD33, 0xDDDDD301, 0x11115000, 0x000000BE, 0x00000070, 0x0000F332, 0x718F030A, 0x21CBA2F2, 0x63310DDD, 0xDDD33D40, 0x11108100, 0x040000BE, 0xE0000770, 0x00007332, 0x718F030A, 0x81C1F217, 0x23300DDD, 0xDDD3330C, 0x01118100, 0x040000EE, 0xE0000070, 0x00007336, 0xA18F030A, 0x81C17217, 0x2D3003DD, 0xDDD33403, 0x01118000, 0x044000EE, 0xE0000700, 0x000BF336, 0xAB2F030A, 0x80C0F21A, 0x2330103D, 0xDDD40403, 0x00110570, 0x00400E0E, 0x00000700, 0x777BB3D2, 0xF0AF030A, 0x80C0F81A, 0x23300033, 0xDD3C0040, 0x00110075, 0x00000EE0, 0x00000770, 0x0007BDD2, 0x70AF030A, 0x80C0F81A, 0x233C333C, 0xDD340010, 0x01000004, 0x17100B08, 0x71100F00, 0x00001DD2, 0xF0AF030A, 0x80C172BA, 0x633C3103, 0x3D301075, 0x10000443, 0xD4717777, 0x88F100B0, 0x04CC0DDA, 0xF08F030A, 0x80C1A2BA, 0x63300700, 0x33D005B7, 0x70004043, 0xD400B001, 0x78A55770, 0x000B0DD8, 0xF18F130A, 0x80C1A2BA, 0x233B0070, 0x30040100, 0x4004444D, 0x3000E011, 0x11AA7710, 0x00100DD2, 0x718F0C0A, 0x81C1A2B8, 0x23310070, 0x000533C0, 0x4040443D, 0x40000111, 0x115A7510, 0x04010DD2, 0x718F0C0A, 0x81CBA217, 0x2DD04400, 0x50053330, 0x33444433, 0x04000111, 0x1117F101, 0x00400DD8, 0xF08F0C0A, 0x81CBA217, 0x2DDC0C40, 0xCC033300, 0x03444330, 0x04000111, 0x111A7111, 0x10000DD2, 0xF1871CB2 +.word 0x2BC17217, 0x2DD00000, 0x00000000, 0x00000000, 0x00000111, 0x11111111, 0x10C3CDD2, 0x712ABC18, 0x81C1F817, 0x8DD03300, 0x11000000, 0x00000000, 0x00000111, 0x11111111, 0x11330DD2, 0x712ABC18, 0x81C1F817, 0x2DD13000, 0x00000000, 0x00000000, 0x000B1011, 0x11111111, 0x11031332, 0x8B2A1C18, 0x80C17817, 0x2DD13004, 0x00000000, 0x00000000, 0x000B7B00, 0x11111111, 0x1100F332, 0xAB2A1C08, 0x80C17217, 0x8DD10400, 0x00000000, 0x00000000, 0x00BBBBB0, 0x01111111, 0x11007332, 0xAB2A1C08, 0x80C17817, 0x8DD03304, 0x00000111, 0x00000000, 0x0B0BB77B, 0xB1111111, 0x1100F332, 0xAB271C08, 0x80C1F817, 0x2D3B0000, 0x00000111, 0x00000000, 0x0B0B7777, 0x7F111111, 0x1110B332, 0xA18F0C08, 0x80C0F817, 0x233F0000, 0x00000011, 0x00000B00, 0x00BB7777, 0x7777B110, 0x0010F332, 0xA18F0C08, 0x80C0F817, 0x233F0000, 0x00000001, 0x0001B000, 0x11117777, 0x77777703, 0x3400F332, 0xA12F0C08, 0x80C072B8, 0x63370011, 0x00000000, 0x00000000, 0xBF777777, 0x7777B000, 0x30330DD2, 0x71271C18, 0x80C0F2B8, 0x633A0001, 0x11000000, 0x10330001, 0xB777B777, 0x777B3DDD, 0xD3330DD2, 0x712F1C18, 0x80C0F21A, 0x233A0001, 0x11000000, 0x03DD001B, 0x777B7BBB, 0xBB0DDDDD, 0xDD3DDDD8, 0x2F2ABC12, 0x80C0F8BA, 0x23370000, 0x11100000, 0x4DD3400B, 0x777B7000, 0x003DDDDD, 0xDDDDDDD7, 0xAB2A1C12, 0x80C0F2B8, 0x63370000, 0x01110000, 0x3DDDD30B, 0x777B1100, 0x043DDDDD, 0xDDDDDDDB, 0x7F271C08, 0x80C0F2B2, 0x93370000, 0x00011103, 0xDD33330B, 0x77B11110, 0x003DDDDD, 0xDDDDDDD1, 0xFF68BC1A, 0x80C0721A, 0x63370000, 0x0000003D, 0xD3333330, 0xBB711111, 0x0043DDD3, 0xDDDDDDD1, 0x00871C0B, 0x80C17218, 0x63370000, 0x000003DD, 0x3333403D, 0x4BB11111, 0x100043DD, 0xDDDDDDD1, 0x0CF103C1, 0x80C172B2, 0x63377700, 0x00003D33, 0x33334003, 0x33B11111, 0x10000033, 0x3DDDDDDF, 0x1010333F, 0x80C0F2B8, 0x63370000, 0x00043DD3, 0x33340000, 0x43B11110, 0x000000B3, 0x3DDDDDDA, 0xF171C33F, 0x80C072B8, 0x63370000, 0x00333333, 0x33300000, 0x03111110, 0x00000000, 0x33DD3D36, 0x2B27030F, 0x80C1A2B2, 0x63370700, 0x33333333, 0x33300001, 0x03111100, 0x00000000, 0x00330336, 0x8B2703C7, 0x81C1A2F2, 0x63370870, 0x33333333, 0x3333C400, 0x33010000, 0x00000000, 0x00047339, 0x2F2A1307, 0x80C172B2, 0x63370080, 0x3333333C, 0x33334040, 0x3D0100BB, 0xB0000000, 0x0000A339, 0x2F2A13CF, 0x80C172F2, 0x63370000, 0x43333000, 0x00433333, 0x3D000BBB, 0xB0000000, 0x0000A339, 0x2F68B3C1, 0x80C172B8, 0x63370008, 0x03333000, 0xE0003333, 0x3300B77B, 0x00000000, 0x0008A339, 0x2F68B3C1, 0x80C0F81A, 0x63370007, 0x04333030, 0x00043333, 0xD3400BBB, 0x00000111, 0x0078A336, 0x2F2A1331, 0x80C0F817, 0x233F0770, 0x00433003, 0x00E4333D, 0xD340BB00, 0x00011111, 0x5178A336, 0x2F270331, 0x80C172BA, 0x633BB444, 0x440033C0, 0x000C3DDD, 0x0000B000, 0x00100111, 0x17887336, 0x2B270330, 0x80C172B8, 0x633B0044, 0x4440033C, 0xCC33DDD0, 0x0000B000, 0x00110011, 0x11157332, 0xA08F030A, 0x81C1F81A, 0x2D3B4040, 0x0000000C, 0x333DDD30, 0x00000000, 0x01110000, 0x01117336, 0x70FF130A, 0x81C172BA, 0x23310444, 0x44440000, 0xCDDD3330, 0x000B0000, 0x01100000, 0x0400B332, 0x70FF0C0A, 0x81CBA2F2, 0x63377000, 0x00000000, 0x04333344, 0x00010000, 0x01100000, 0x00C3F332, 0xA1F1030A, 0x81C172B2, 0x63370000, 0x00000000, 0x00043304, 0x40000000, 0x00000000, 0x0C30B332, 0xAB210307, 0x81CBA2BA, 0x233F0000, 0x00000000, 0x00000C04, 0x4C000000, 0x0000004C, 0x333C0DD2, 0x718F0307, 0x80C1A2BA, 0x63370000, 0x00000000, 0x00000000, 0xCCCC4440, 0x3400400C, 0x3C041DD2, 0x70AB03CB, 0x80C1A2BA, 0x23370000, 0x00000000, 0x00000000, 0x00000000, 0x043CCC33, 0x34041332, 0xA1AF030A, 0x80C1A2B2, 0x63370000, 0x000000B0, 0x00000000, 0x00000000, 0x04433C33, 0x444C13D2, 0x71AF030A, 0x80C1A2F2, 0x633A0000, 0x00000000, 0x00000000, 0x00000000, 0x04444444, 0x4444B3D2, 0xF0AB030A, 0x81C1A2F2, 0x633A0000, 0x00000000, 0x00000000, 0x00000000, 0x00444444, 0x4444F332, 0x70AB030A, 0x81CB86F2, 0x933A0110, 0x11111100, 0x00000000, 0x00000000, 0x00000444, 0x4444B332, 0xA1AB030A, 0x80CB86F2, 0x933A1111, 0x11111110, 0x00000000, 0x000000C0, 0x00000000, 0x0444B336, 0x8BAB030A, 0x80C1A2F2, 0x933A1111, 0x11100111, 0x00000000, 0x00000400, 0x00000000, 0x0004F332, 0x8BAF1C0A, 0x80C1A2F2, 0x933A0111, 0x10000011, 0x1100000B, 0x77504000, 0x00000000, 0x0000F336, 0x8B8F1C0A, 0x81C172B8, 0x633A1111, 0x00000011, 0x11111850, 0x0007B000, 0x00000000, 0x0000F332, 0xA127030A, 0x81C1A2F2, 0x9331CC55, 0x87000111, 0x11118111, 0x00000070, 0x05700777, 0xBBB7F332, 0x812F030A, 0x81C172B2, 0x63303330, 0x78787111, 0x11108111, 0x00000000, 0x0000B077, 0x77777336, 0x812F030A, 0x81C1F2F2, 0x933C33DD, 0x07588111, 0x11115511, 0x0000000B, 0x0000700B, 0x0E077336, 0x8127030A, 0x81C172B8, 0x633C3DDD, 0x34580581, 0x11110501, 0x00000000, 0x00007000, 0x00077336, 0xA1871C0A, 0x81CBA2F2, 0x63333DDD, 0x33005850, 0x11111500, 0x00000000, 0x00000700, 0x00077332, 0x718F030A, 0x81CB8672, 0x9333DD33, 0xD3333070, 0x11110700, 0x00000000, 0x00000B00, 0x000E7336, 0x2B2F030A, 0x80C172F8, 0x633CDD3D, 0x33DDD370, 0x11110500, 0x00000000, 0x00000750, 0x00EE7336, 0x8B2F030A, 0x21C1A2B2, 0x6330DD33, 0xDDDDD301, 0x11115000, 0x000000BE, 0x00000070, 0x0000F332, 0x718F030A, 0x21CBA2F2, 0x63310DDD, 0xDDD33D40, 0x11108100, 0x040000BE, 0xE0000770, 0x00007332, 0x718F030A, 0x81C1F217, 0x23300DDD, 0xDDD3330C, 0x01118100, 0x040000EE, 0xE0000070, 0x00007336, 0xA18F030A, 0x81C17217, 0x2D3003DD, 0xDDD33403, 0x01118000, 0x044000EE, 0xE0000700, 0x000BF336, 0xAB2F030A, 0x80C0F21A, 0x2330103D, 0xDDD40403, 0x00110570, 0x00400E0E, 0x00000700, 0x777BB3D2, 0xF0AF030A, 0x80C0F81A, 0x23300033, 0xDD3C0040, 0x00110075, 0x00000EE0, 0x00000770, 0x0007BDD2, 0x70AF030A, 0x80C0F81A, 0x233C333C, 0xDD340010, 0x01000004, 0x17100B08, 0x71100F00, 0x00001DD2, 0xF0AF030A, 0x80C172BA, 0x633C3103, 0x3D301075, 0x10000443, 0xD4717777, 0x88F100B0, 0x04CC0DDA, 0xF08F030A, 0x80C1A2BA, 0x63300700, 0x33D005B7, 0x70004043, 0xD400B001, 0x78A55770, 0x000B0DD8, 0xF18F130A, 0x80C1A2BA, 0x233B0070, 0x30040100, 0x4004444D, 0x3000E011, 0x11AA7710, 0x00100DD2, 0x718F0C0A, 0x81C1A2B8, 0x23310070, 0x000533C0, 0x4040443D, 0x40000111, 0x115A7510, 0x04010DD2, 0x718F0C0A, 0x81CBA217, 0x2DD04400, 0x50053330, 0x33444433, 0x04000111, 0x1117F101, 0x00400DD8, 0xF08F0C0A, 0x81CBA217, 0x2DDC0C40, 0xCC033300, 0x03444330, 0x04000111, 0x111A7111, 0x10000DD2, 0xF1871CB2 dlabel D_80243D10_D82A70 .word 0xD675C637, 0x8C63EF7B, 0xCEB9B5F5, 0x739DAD6B, 0x9CE76319, 0xA529BDEF, 0xDEF7F7BD, 0xCE31B5AD, 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xFD500000, D_80243510_D82270, 0xF5500000, 0x07018060, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF200, 0xE7000000, 0x00000000, 0xF5400800, 0x00018060, 0xF2000000, 0x000FC0FC, 0xE3000C00, 0x00080000, 0xE3001001, 0x00008000, 0xFD100000, D_80243D10_D82A70, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xDF000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/script_api/7E4EF0.data.s b/ver/us/asm/data/world/script_api/7E4EF0.data.s index c4bfc5b8a8..0a4e16d37c 100644 --- a/ver/us/asm/data/world/script_api/7E4EF0.data.s +++ b/ver/us/asm/data/world/script_api/7E4EF0.data.s @@ -24,7 +24,7 @@ dlabel D_80284338_7E51B8 .word 0x00000043, 0x00000002, func_80282594, 0xF24A81B0, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C8E, 0x0000000A, 0x00000043, 0x00000007, InterpCamTargetPos, 0x00000000, 0x00000001, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x00000043, 0x00000002, func_80282594, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802843D4_7E5254 -.word 0x00000043, 0x00000001, func_80282314, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000005, 0x00000043, 0x00000002, func_802822A8, D_A0000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000005, 0x00000043, 0x00000002, func_802822A8, D_A0000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x00000002, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000044, 0x00000001, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C83, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802822A8, 0xA0000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802822A8, 0xA0000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, func_80282314, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000005, 0x00000043, 0x00000002, func_802822A8, 0xA0000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000005, 0x00000043, 0x00000002, func_802822A8, 0xA0000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x00000002, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000044, 0x00000001, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C83, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_802822A8, 0xA0000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802822A8, 0xA0000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80284584_7E5404 .word 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C8C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000014, 0x00000005, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x00000014, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000014, 0x00000005, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x00000014, 0x00000002, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000044, 0x00000001, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_update.s b/ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_update.s deleted file mode 100644 index 56493577a5..0000000000 --- a/ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_update.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel motion_blur_flame_update -/* 3A2AB0 E00A2120 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3A2AB4 E00A2124 AFBF0010 */ sw $ra, 0x10($sp) -/* 3A2AB8 E00A2128 8C850000 */ lw $a1, ($a0) -/* 3A2ABC E00A212C 8C83000C */ lw $v1, 0xc($a0) -/* 3A2AC0 E00A2130 30A20010 */ andi $v0, $a1, 0x10 -/* 3A2AC4 E00A2134 10400005 */ beqz $v0, .LE00A214C -/* 3A2AC8 E00A2138 2402FFEF */ addiu $v0, $zero, -0x11 -/* 3A2ACC E00A213C 00A21024 */ and $v0, $a1, $v0 -/* 3A2AD0 E00A2140 AC820000 */ sw $v0, ($a0) -/* 3A2AD4 E00A2144 2402001E */ addiu $v0, $zero, 0x1e -/* 3A2AD8 E00A2148 AC620050 */ sw $v0, 0x50($v1) -.LE00A214C: -/* 3A2ADC E00A214C 8C620054 */ lw $v0, 0x54($v1) -/* 3A2AE0 E00A2150 8C650050 */ lw $a1, 0x50($v1) -/* 3A2AE4 E00A2154 24420001 */ addiu $v0, $v0, 1 -/* 3A2AE8 E00A2158 AC620054 */ sw $v0, 0x54($v1) -/* 3A2AEC E00A215C 28A203E8 */ slti $v0, $a1, 0x3e8 -/* 3A2AF0 E00A2160 10400002 */ beqz $v0, .LE00A216C -/* 3A2AF4 E00A2164 24A2FFFF */ addiu $v0, $a1, -1 -/* 3A2AF8 E00A2168 AC620050 */ sw $v0, 0x50($v1) -.LE00A216C: -/* 3A2AFC E00A216C 8C620050 */ lw $v0, 0x50($v1) -/* 3A2B00 E00A2170 04410005 */ bgez $v0, .LE00A2188 -/* 3A2B04 E00A2174 0040282D */ daddu $a1, $v0, $zero -/* 3A2B08 E00A2178 0C080128 */ jal shim_remove_effect -/* 3A2B0C E00A217C 00000000 */ nop -/* 3A2B10 E00A2180 08028878 */ j .LE00A21E0 -/* 3A2B14 E00A2184 00000000 */ nop -.LE00A2188: -/* 3A2B18 E00A2188 8C640054 */ lw $a0, 0x54($v1) -/* 3A2B1C E00A218C 28820011 */ slti $v0, $a0, 0x11 -/* 3A2B20 E00A2190 10400003 */ beqz $v0, .LE00A21A0 -/* 3A2B24 E00A2194 000410C0 */ sll $v0, $a0, 3 -/* 3A2B28 E00A2198 2442FFFF */ addiu $v0, $v0, -1 -/* 3A2B2C E00A219C AC62004C */ sw $v0, 0x4c($v1) -.LE00A21A0: -/* 3A2B30 E00A21A0 28A20010 */ slti $v0, $a1, 0x10 -/* 3A2B34 E00A21A4 10400002 */ beqz $v0, .LE00A21B0 -/* 3A2B38 E00A21A8 000510C0 */ sll $v0, $a1, 3 -/* 3A2B3C E00A21AC AC62004C */ sw $v0, 0x4c($v1) -.LE00A21B0: -/* 3A2B40 E00A21B0 C4660004 */ lwc1 $f6, 4($v1) -/* 3A2B44 E00A21B4 C4600010 */ lwc1 $f0, 0x10($v1) -/* 3A2B48 E00A21B8 C4640008 */ lwc1 $f4, 8($v1) -/* 3A2B4C E00A21BC 46003180 */ add.s $f6, $f6, $f0 -/* 3A2B50 E00A21C0 C4600014 */ lwc1 $f0, 0x14($v1) -/* 3A2B54 E00A21C4 C462000C */ lwc1 $f2, 0xc($v1) -/* 3A2B58 E00A21C8 46002100 */ add.s $f4, $f4, $f0 -/* 3A2B5C E00A21CC C4600018 */ lwc1 $f0, 0x18($v1) -/* 3A2B60 E00A21D0 46001080 */ add.s $f2, $f2, $f0 -/* 3A2B64 E00A21D4 E466001C */ swc1 $f6, 0x1c($v1) -/* 3A2B68 E00A21D8 E464002C */ swc1 $f4, 0x2c($v1) -/* 3A2B6C E00A21DC E462003C */ swc1 $f2, 0x3c($v1) -.LE00A21E0: -/* 3A2B70 E00A21E0 8FBF0010 */ lw $ra, 0x10($sp) -/* 3A2B74 E00A21E4 03E00008 */ jr $ra -/* 3A2B78 E00A21E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/effects/music_note/music_note_appendGfx.s b/ver/us/asm/nonmatchings/effects/music_note/music_note_appendGfx.s deleted file mode 100644 index 02f17513be..0000000000 --- a/ver/us/asm/nonmatchings/effects/music_note/music_note_appendGfx.s +++ /dev/null @@ -1,178 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel music_note_appendGfx -/* 35A2C8 E004C3A8 27BDFF40 */ addiu $sp, $sp, -0xc0 -/* 35A2CC E004C3AC 0080182D */ daddu $v1, $a0, $zero -/* 35A2D0 E004C3B0 3C0838E3 */ lui $t0, 0x38e3 -/* 35A2D4 E004C3B4 35088E39 */ ori $t0, $t0, 0x8e39 -/* 35A2D8 E004C3B8 3C05DB06 */ lui $a1, 0xdb06 -/* 35A2DC E004C3BC 34A50024 */ ori $a1, $a1, 0x24 -/* 35A2E0 E004C3C0 27A40018 */ addiu $a0, $sp, 0x18 -/* 35A2E4 E004C3C4 AFB500AC */ sw $s5, 0xac($sp) -/* 35A2E8 E004C3C8 3C150001 */ lui $s5, 1 -/* 35A2EC E004C3CC AFB200A0 */ sw $s2, 0xa0($sp) -/* 35A2F0 E004C3D0 3C12800A */ lui $s2, %hi(gMasterGfxPos) -/* 35A2F4 E004C3D4 2652A66C */ addiu $s2, $s2, %lo(gMasterGfxPos) -/* 35A2F8 E004C3D8 AFB600B0 */ sw $s6, 0xb0($sp) -/* 35A2FC E004C3DC 3C16E700 */ lui $s6, 0xe700 -/* 35A300 E004C3E0 AFBF00B4 */ sw $ra, 0xb4($sp) -/* 35A304 E004C3E4 AFB400A8 */ sw $s4, 0xa8($sp) -/* 35A308 E004C3E8 AFB300A4 */ sw $s3, 0xa4($sp) -/* 35A30C E004C3EC AFB1009C */ sw $s1, 0x9c($sp) -/* 35A310 E004C3F0 AFB00098 */ sw $s0, 0x98($sp) -/* 35A314 E004C3F4 F7B400B8 */ sdc1 $f20, 0xb8($sp) -/* 35A318 E004C3F8 8E460000 */ lw $a2, ($s2) -/* 35A31C E004C3FC 8C71000C */ lw $s1, 0xc($v1) -/* 35A320 E004C400 00C0102D */ daddu $v0, $a2, $zero -/* 35A324 E004C404 24C60008 */ addiu $a2, $a2, 8 -/* 35A328 E004C408 AE460000 */ sw $a2, ($s2) -/* 35A32C E004C40C 8E27001C */ lw $a3, 0x1c($s1) -/* 35A330 E004C410 8E330020 */ lw $s3, 0x20($s1) -/* 35A334 E004C414 3C14DE00 */ lui $s4, 0xde00 -/* 35A338 E004C418 AC560000 */ sw $s6, ($v0) -/* 35A33C E004C41C AC400004 */ sw $zero, 4($v0) -/* 35A340 E004C420 24C20008 */ addiu $v0, $a2, 8 -/* 35A344 E004C424 AE420000 */ sw $v0, ($s2) -/* 35A348 E004C428 24C20010 */ addiu $v0, $a2, 0x10 -/* 35A34C E004C42C ACC50000 */ sw $a1, ($a2) -/* 35A350 E004C430 AE420000 */ sw $v0, ($s2) -/* 35A354 E004C434 8C630010 */ lw $v1, 0x10($v1) -/* 35A358 E004C438 24C20018 */ addiu $v0, $a2, 0x18 -/* 35A35C E004C43C AE420000 */ sw $v0, ($s2) -/* 35A360 E004C440 3C020900 */ lui $v0, 0x900 -/* 35A364 E004C444 24420FC0 */ addiu $v0, $v0, 0xfc0 -/* 35A368 E004C448 00072840 */ sll $a1, $a3, 1 -/* 35A36C E004C44C 8C63001C */ lw $v1, 0x1c($v1) -/* 35A370 E004C450 00A72821 */ addu $a1, $a1, $a3 -/* 35A374 E004C454 ACC2000C */ sw $v0, 0xc($a2) -/* 35A378 E004C458 3C02FA00 */ lui $v0, 0xfa00 -/* 35A37C E004C45C ACC20010 */ sw $v0, 0x10($a2) -/* 35A380 E004C460 3C028000 */ lui $v0, 0x8000 -/* 35A384 E004C464 00A80018 */ mult $a1, $t0 -/* 35A388 E004C468 ACD40008 */ sw $s4, 8($a2) -/* 35A38C E004C46C 00621821 */ addu $v1, $v1, $v0 -/* 35A390 E004C470 000517C3 */ sra $v0, $a1, 0x1f -/* 35A394 E004C474 ACC30004 */ sw $v1, 4($a2) -/* 35A398 E004C478 00004810 */ mfhi $t1 -/* 35A39C E004C47C 000918C3 */ sra $v1, $t1, 3 -/* 35A3A0 E004C480 00621823 */ subu $v1, $v1, $v0 -/* 35A3A4 E004C484 000310C0 */ sll $v0, $v1, 3 -/* 35A3A8 E004C488 00431021 */ addu $v0, $v0, $v1 -/* 35A3AC E004C48C 00021080 */ sll $v0, $v0, 2 -/* 35A3B0 E004C490 00A22823 */ subu $a1, $a1, $v0 -/* 35A3B4 E004C494 3C02E005 */ lui $v0, %hi(D_E004C67C) -/* 35A3B8 E004C498 00451021 */ addu $v0, $v0, $a1 -/* 35A3BC E004C49C 9042C67C */ lbu $v0, %lo(D_E004C67C)($v0) -/* 35A3C0 E004C4A0 3C03E005 */ lui $v1, %hi(D_E004C67C+1) -/* 35A3C4 E004C4A4 00651821 */ addu $v1, $v1, $a1 -/* 35A3C8 E004C4A8 9063C67D */ lbu $v1, %lo(D_E004C67C+1)($v1) -/* 35A3CC E004C4AC 3C01E005 */ lui $at, %hi(D_E004C67C+2) -/* 35A3D0 E004C4B0 00250821 */ addu $at, $at, $a1 -/* 35A3D4 E004C4B4 9025C67E */ lbu $a1, %lo(D_E004C67C+2)($at) -/* 35A3D8 E004C4B8 00021600 */ sll $v0, $v0, 0x18 -/* 35A3DC E004C4BC 00031C00 */ sll $v1, $v1, 0x10 -/* 35A3E0 E004C4C0 00431025 */ or $v0, $v0, $v1 -/* 35A3E4 E004C4C4 00052A00 */ sll $a1, $a1, 8 -/* 35A3E8 E004C4C8 92230017 */ lbu $v1, 0x17($s1) -/* 35A3EC E004C4CC 00451025 */ or $v0, $v0, $a1 -/* 35A3F0 E004C4D0 00431025 */ or $v0, $v0, $v1 -/* 35A3F4 E004C4D4 ACC20014 */ sw $v0, 0x14($a2) -/* 35A3F8 E004C4D8 8E250004 */ lw $a1, 4($s1) -/* 35A3FC E004C4DC 8E260008 */ lw $a2, 8($s1) -/* 35A400 E004C4E0 8E27000C */ lw $a3, 0xc($s1) -/* 35A404 E004C4E4 4480A000 */ mtc1 $zero, $f20 -/* 35A408 E004C4E8 0C080108 */ jal shim_guTranslateF -/* 35A40C E004C4EC 36B51630 */ ori $s5, $s5, 0x1630 -/* 35A410 E004C4F0 27B00058 */ addiu $s0, $sp, 0x58 -/* 35A414 E004C4F4 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 35A418 E004C4F8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 35A41C E004C4FC 4406A000 */ mfc1 $a2, $f20 -/* 35A420 E004C500 00031080 */ sll $v0, $v1, 2 -/* 35A424 E004C504 00431021 */ addu $v0, $v0, $v1 -/* 35A428 E004C508 00021080 */ sll $v0, $v0, 2 -/* 35A42C E004C50C 00431023 */ subu $v0, $v0, $v1 -/* 35A430 E004C510 000218C0 */ sll $v1, $v0, 3 -/* 35A434 E004C514 00431021 */ addu $v0, $v0, $v1 -/* 35A438 E004C518 000210C0 */ sll $v0, $v0, 3 -/* 35A43C E004C51C 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 35A440 E004C520 00220821 */ addu $at, $at, $v0 -/* 35A444 E004C524 C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* 35A448 E004C528 3C073F80 */ lui $a3, 0x3f80 -/* 35A44C E004C52C 46000007 */ neg.s $f0, $f0 -/* 35A450 E004C530 44050000 */ mfc1 $a1, $f0 -/* 35A454 E004C534 0200202D */ daddu $a0, $s0, $zero -/* 35A458 E004C538 0C080104 */ jal shim_guRotateF -/* 35A45C E004C53C E7B40010 */ swc1 $f20, 0x10($sp) -/* 35A460 E004C540 0200202D */ daddu $a0, $s0, $zero -/* 35A464 E004C544 27A50018 */ addiu $a1, $sp, 0x18 -/* 35A468 E004C548 0C080114 */ jal shim_guMtxCatF -/* 35A46C E004C54C 00A0302D */ daddu $a2, $a1, $zero -/* 35A470 E004C550 0200202D */ daddu $a0, $s0, $zero -/* 35A474 E004C554 8E250010 */ lw $a1, 0x10($s1) -/* 35A478 E004C558 4407A000 */ mfc1 $a3, $f20 -/* 35A47C E004C55C 0C080110 */ jal shim_guScaleF -/* 35A480 E004C560 00A0302D */ daddu $a2, $a1, $zero -/* 35A484 E004C564 0200202D */ daddu $a0, $s0, $zero -/* 35A488 E004C568 27A50018 */ addiu $a1, $sp, 0x18 -/* 35A48C E004C56C 0C080114 */ jal shim_guMtxCatF -/* 35A490 E004C570 00A0302D */ daddu $a2, $a1, $zero -/* 35A494 E004C574 27A40018 */ addiu $a0, $sp, 0x18 -/* 35A498 E004C578 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* 35A49C E004C57C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* 35A4A0 E004C580 3C11800A */ lui $s1, %hi(gDisplayContext) -/* 35A4A4 E004C584 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) -/* 35A4A8 E004C588 96050000 */ lhu $a1, ($s0) -/* 35A4AC E004C58C 8E220000 */ lw $v0, ($s1) -/* 35A4B0 E004C590 00052980 */ sll $a1, $a1, 6 -/* 35A4B4 E004C594 00B52821 */ addu $a1, $a1, $s5 -/* 35A4B8 E004C598 0C080118 */ jal shim_guMtxF2L -/* 35A4BC E004C59C 00452821 */ addu $a1, $v0, $a1 -/* 35A4C0 E004C5A0 3C06D838 */ lui $a2, 0xd838 -/* 35A4C4 E004C5A4 34C60002 */ ori $a2, $a2, 2 -/* 35A4C8 E004C5A8 8E440000 */ lw $a0, ($s2) -/* 35A4CC E004C5AC 3C03DA38 */ lui $v1, 0xda38 -/* 35A4D0 E004C5B0 0080282D */ daddu $a1, $a0, $zero -/* 35A4D4 E004C5B4 24840008 */ addiu $a0, $a0, 8 -/* 35A4D8 E004C5B8 AE440000 */ sw $a0, ($s2) -/* 35A4DC E004C5BC 96020000 */ lhu $v0, ($s0) -/* 35A4E0 E004C5C0 00139880 */ sll $s3, $s3, 2 -/* 35A4E4 E004C5C4 ACA30000 */ sw $v1, ($a1) -/* 35A4E8 E004C5C8 24430001 */ addiu $v1, $v0, 1 -/* 35A4EC E004C5CC 3042FFFF */ andi $v0, $v0, 0xffff -/* 35A4F0 E004C5D0 00021180 */ sll $v0, $v0, 6 -/* 35A4F4 E004C5D4 A6030000 */ sh $v1, ($s0) -/* 35A4F8 E004C5D8 8E230000 */ lw $v1, ($s1) -/* 35A4FC E004C5DC 00551021 */ addu $v0, $v0, $s5 -/* 35A500 E004C5E0 00621821 */ addu $v1, $v1, $v0 -/* 35A504 E004C5E4 24820008 */ addiu $v0, $a0, 8 -/* 35A508 E004C5E8 ACA30004 */ sw $v1, 4($a1) -/* 35A50C E004C5EC AE420000 */ sw $v0, ($s2) -/* 35A510 E004C5F0 AC940000 */ sw $s4, ($a0) -/* 35A514 E004C5F4 3C03E005 */ lui $v1, %hi(D_E004C660) -/* 35A518 E004C5F8 00731821 */ addu $v1, $v1, $s3 -/* 35A51C E004C5FC 8C63C660 */ lw $v1, %lo(D_E004C660)($v1) -/* 35A520 E004C600 24820010 */ addiu $v0, $a0, 0x10 -/* 35A524 E004C604 AE420000 */ sw $v0, ($s2) -/* 35A528 E004C608 24020040 */ addiu $v0, $zero, 0x40 -/* 35A52C E004C60C AC82000C */ sw $v0, 0xc($a0) -/* 35A530 E004C610 24820018 */ addiu $v0, $a0, 0x18 -/* 35A534 E004C614 AC860008 */ sw $a2, 8($a0) -/* 35A538 E004C618 AE420000 */ sw $v0, ($s2) -/* 35A53C E004C61C AC960010 */ sw $s6, 0x10($a0) -/* 35A540 E004C620 AC800014 */ sw $zero, 0x14($a0) -/* 35A544 E004C624 AC830004 */ sw $v1, 4($a0) -/* 35A548 E004C628 8FBF00B4 */ lw $ra, 0xb4($sp) -/* 35A54C E004C62C 8FB600B0 */ lw $s6, 0xb0($sp) -/* 35A550 E004C630 8FB500AC */ lw $s5, 0xac($sp) -/* 35A554 E004C634 8FB400A8 */ lw $s4, 0xa8($sp) -/* 35A558 E004C638 8FB300A4 */ lw $s3, 0xa4($sp) -/* 35A55C E004C63C 8FB200A0 */ lw $s2, 0xa0($sp) -/* 35A560 E004C640 8FB1009C */ lw $s1, 0x9c($sp) -/* 35A564 E004C644 8FB00098 */ lw $s0, 0x98($sp) -/* 35A568 E004C648 D7B400B8 */ ldc1 $f20, 0xb8($sp) -/* 35A56C E004C64C 03E00008 */ jr $ra -/* 35A570 E004C650 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 35A574 E004C654 00000000 */ nop -/* 35A578 E004C658 00000000 */ nop -/* 35A57C E004C65C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8334.s b/ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8334.s deleted file mode 100644 index 9a08671171..0000000000 --- a/ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8334.s +++ /dev/null @@ -1,196 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E00D8334 -/* 3D6AF4 E00D8334 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 3D6AF8 E00D8338 00A0C02D */ daddu $t8, $a1, $zero -/* 3D6AFC E00D833C 3C03FFFF */ lui $v1, 0xffff -/* 3D6B00 E00D8340 AFBF0030 */ sw $ra, 0x30($sp) -/* 3D6B04 E00D8344 AFB7002C */ sw $s7, 0x2c($sp) -/* 3D6B08 E00D8348 AFB60028 */ sw $s6, 0x28($sp) -/* 3D6B0C E00D834C AFB50024 */ sw $s5, 0x24($sp) -/* 3D6B10 E00D8350 AFB40020 */ sw $s4, 0x20($sp) -/* 3D6B14 E00D8354 AFB3001C */ sw $s3, 0x1c($sp) -/* 3D6B18 E00D8358 AFB20018 */ sw $s2, 0x18($sp) -/* 3D6B1C E00D835C AFB10014 */ sw $s1, 0x14($sp) -/* 3D6B20 E00D8360 AFB00010 */ sw $s0, 0x10($sp) -/* 3D6B24 E00D8364 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 3D6B28 E00D8368 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 3D6B2C E00D836C AFA70054 */ sw $a3, 0x54($sp) -/* 3D6B30 E00D8370 90820034 */ lbu $v0, 0x34($a0) -/* 3D6B34 E00D8374 3C01437F */ lui $at, 0x437f -/* 3D6B38 E00D8378 44811000 */ mtc1 $at, $f2 -/* 3D6B3C E00D837C 44820000 */ mtc1 $v0, $f0 -/* 3D6B40 E00D8380 00000000 */ nop -/* 3D6B44 E00D8384 46800020 */ cvt.s.w $f0, $f0 -/* 3D6B48 E00D8388 90820035 */ lbu $v0, 0x35($a0) -/* 3D6B4C E00D838C 46020103 */ div.s $f4, $f0, $f2 -/* 3D6B50 E00D8390 44820000 */ mtc1 $v0, $f0 -/* 3D6B54 E00D8394 00000000 */ nop -/* 3D6B58 E00D8398 46800020 */ cvt.s.w $f0, $f0 -/* 3D6B5C E00D839C 8C820034 */ lw $v0, 0x34($a0) -/* 3D6B60 E00D83A0 00431024 */ and $v0, $v0, $v1 -/* 3D6B64 E00D83A4 10400095 */ beqz $v0, .LE00D85FC -/* 3D6B68 E00D83A8 46020583 */ div.s $f22, $f0, $f2 -/* 3D6B6C E00D83AC 3C09E300 */ lui $t1, 0xe300 -/* 3D6B70 E00D83B0 35290A01 */ ori $t1, $t1, 0xa01 -/* 3D6B74 E00D83B4 3C0AE300 */ lui $t2, 0xe300 -/* 3D6B78 E00D83B8 354A0C00 */ ori $t2, $t2, 0xc00 -/* 3D6B7C E00D83BC 3C0BE300 */ lui $t3, 0xe300 -/* 3D6B80 E00D83C0 356B0D01 */ ori $t3, $t3, 0xd01 -/* 3D6B84 E00D83C4 3C0CE300 */ lui $t4, 0xe300 -/* 3D6B88 E00D83C8 358C0F00 */ ori $t4, $t4, 0xf00 -/* 3D6B8C E00D83CC 3C0DE300 */ lui $t5, 0xe300 -/* 3D6B90 E00D83D0 35AD1001 */ ori $t5, $t5, 0x1001 -/* 3D6B94 E00D83D4 3C0EE300 */ lui $t6, 0xe300 -/* 3D6B98 E00D83D8 35CE1201 */ ori $t6, $t6, 0x1201 -/* 3D6B9C E00D83DC 3C0FE300 */ lui $t7, 0xe300 -/* 3D6BA0 E00D83E0 35EF1402 */ ori $t7, $t7, 0x1402 -/* 3D6BA4 E00D83E4 3C15E200 */ lui $s5, 0xe200 -/* 3D6BA8 E00D83E8 36B5001C */ ori $s5, $s5, 0x1c -/* 3D6BAC E00D83EC 3C100050 */ lui $s0, 0x50 -/* 3D6BB0 E00D83F0 36104340 */ ori $s0, $s0, 0x4340 -/* 3D6BB4 E00D83F4 3C16FCFF */ lui $s6, 0xfcff -/* 3D6BB8 E00D83F8 36D6FFFF */ ori $s6, $s6, 0xffff -/* 3D6BBC E00D83FC 3C11FFFD */ lui $s1, 0xfffd -/* 3D6BC0 E00D8400 3631F6FB */ ori $s1, $s1, 0xf6fb -/* 3D6BC4 E00D8404 3C171830 */ lui $s7, 0x1830 -/* 3D6BC8 E00D8408 36F760FF */ ori $s7, $s7, 0x60ff -/* 3D6BCC E00D840C 27140004 */ addiu $s4, $t8, 4 -/* 3D6BD0 E00D8410 0280202D */ daddu $a0, $s4, $zero -/* 3D6BD4 E00D8414 24D30004 */ addiu $s3, $a2, 4 -/* 3D6BD8 E00D8418 0260282D */ daddu $a1, $s3, $zero -/* 3D6BDC E00D841C 3C08800A */ lui $t0, %hi(gMasterGfxPos) -/* 3D6BE0 E00D8420 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) -/* 3D6BE4 E00D8424 3C02E700 */ lui $v0, 0xe700 -/* 3D6BE8 E00D8428 44940000 */ mtc1 $s4, $f0 -/* 3D6BEC E00D842C 00000000 */ nop -/* 3D6BF0 E00D8430 46800020 */ cvt.s.w $f0, $f0 -/* 3D6BF4 E00D8434 8FB20058 */ lw $s2, 0x58($sp) -/* 3D6BF8 E00D8438 8D030000 */ lw $v1, ($t0) -/* 3D6BFC E00D843C 00D29021 */ addu $s2, $a2, $s2 -/* 3D6C00 E00D8440 2652FFFC */ addiu $s2, $s2, -4 -/* 3D6C04 E00D8444 0240382D */ daddu $a3, $s2, $zero -/* 3D6C08 E00D8448 0060302D */ daddu $a2, $v1, $zero -/* 3D6C0C E00D844C 24630008 */ addiu $v1, $v1, 8 -/* 3D6C10 E00D8450 AD030000 */ sw $v1, ($t0) -/* 3D6C14 E00D8454 ACC20000 */ sw $v0, ($a2) -/* 3D6C18 E00D8458 24620008 */ addiu $v0, $v1, 8 -/* 3D6C1C E00D845C ACC00004 */ sw $zero, 4($a2) -/* 3D6C20 E00D8460 AD020000 */ sw $v0, ($t0) -/* 3D6C24 E00D8464 3C02D700 */ lui $v0, 0xd700 -/* 3D6C28 E00D8468 AC620000 */ sw $v0, ($v1) -/* 3D6C2C E00D846C 2402FFFF */ addiu $v0, $zero, -1 -/* 3D6C30 E00D8470 AC620004 */ sw $v0, 4($v1) -/* 3D6C34 E00D8474 24620010 */ addiu $v0, $v1, 0x10 -/* 3D6C38 E00D8478 AD020000 */ sw $v0, ($t0) -/* 3D6C3C E00D847C 24620018 */ addiu $v0, $v1, 0x18 -/* 3D6C40 E00D8480 AC690008 */ sw $t1, 8($v1) -/* 3D6C44 E00D8484 AC60000C */ sw $zero, 0xc($v1) -/* 3D6C48 E00D8488 AD020000 */ sw $v0, ($t0) -/* 3D6C4C E00D848C 24620020 */ addiu $v0, $v1, 0x20 -/* 3D6C50 E00D8490 AC6A0010 */ sw $t2, 0x10($v1) -/* 3D6C54 E00D8494 AC600014 */ sw $zero, 0x14($v1) -/* 3D6C58 E00D8498 AD020000 */ sw $v0, ($t0) -/* 3D6C5C E00D849C 24620028 */ addiu $v0, $v1, 0x28 -/* 3D6C60 E00D84A0 AC6B0018 */ sw $t3, 0x18($v1) -/* 3D6C64 E00D84A4 AC60001C */ sw $zero, 0x1c($v1) -/* 3D6C68 E00D84A8 AD020000 */ sw $v0, ($t0) -/* 3D6C6C E00D84AC 24620030 */ addiu $v0, $v1, 0x30 -/* 3D6C70 E00D84B0 AC6C0020 */ sw $t4, 0x20($v1) -/* 3D6C74 E00D84B4 AC600024 */ sw $zero, 0x24($v1) -/* 3D6C78 E00D84B8 AD020000 */ sw $v0, ($t0) -/* 3D6C7C E00D84BC 24620038 */ addiu $v0, $v1, 0x38 -/* 3D6C80 E00D84C0 AC6D0028 */ sw $t5, 0x28($v1) -/* 3D6C84 E00D84C4 AC60002C */ sw $zero, 0x2c($v1) -/* 3D6C88 E00D84C8 AD020000 */ sw $v0, ($t0) -/* 3D6C8C E00D84CC 24023000 */ addiu $v0, $zero, 0x3000 -/* 3D6C90 E00D84D0 AC620034 */ sw $v0, 0x34($v1) -/* 3D6C94 E00D84D4 24620040 */ addiu $v0, $v1, 0x40 -/* 3D6C98 E00D84D8 AC6E0030 */ sw $t6, 0x30($v1) -/* 3D6C9C E00D84DC AD020000 */ sw $v0, ($t0) -/* 3D6CA0 E00D84E0 24020C00 */ addiu $v0, $zero, 0xc00 -/* 3D6CA4 E00D84E4 AC62003C */ sw $v0, 0x3c($v1) -/* 3D6CA8 E00D84E8 24620048 */ addiu $v0, $v1, 0x48 -/* 3D6CAC E00D84EC AC6F0038 */ sw $t7, 0x38($v1) -/* 3D6CB0 E00D84F0 AD020000 */ sw $v0, ($t0) -/* 3D6CB4 E00D84F4 24620050 */ addiu $v0, $v1, 0x50 -/* 3D6CB8 E00D84F8 AC750040 */ sw $s5, 0x40($v1) -/* 3D6CBC E00D84FC AC700044 */ sw $s0, 0x44($v1) -/* 3D6CC0 E00D8500 AD020000 */ sw $v0, ($t0) -/* 3D6CC4 E00D8504 AC760048 */ sw $s6, 0x48($v1) -/* 3D6CC8 E00D8508 AC71004C */ sw $s1, 0x4c($v1) -/* 3D6CCC E00D850C 8FB90054 */ lw $t9, 0x54($sp) -/* 3D6CD0 E00D8510 02538023 */ subu $s0, $s2, $s3 -/* 3D6CD4 E00D8514 03198821 */ addu $s1, $t8, $t9 -/* 3D6CD8 E00D8518 2631FFFC */ addiu $s1, $s1, -4 -/* 3D6CDC E00D851C 02341023 */ subu $v0, $s1, $s4 -/* 3D6CE0 E00D8520 000237C2 */ srl $a2, $v0, 0x1f -/* 3D6CE4 E00D8524 00461021 */ addu $v0, $v0, $a2 -/* 3D6CE8 E00D8528 00021043 */ sra $v0, $v0, 1 -/* 3D6CEC E00D852C 4482A000 */ mtc1 $v0, $f20 -/* 3D6CF0 E00D8530 00000000 */ nop -/* 3D6CF4 E00D8534 4680A520 */ cvt.s.w $f20, $f20 -/* 3D6CF8 E00D8538 24620058 */ addiu $v0, $v1, 0x58 -/* 3D6CFC E00D853C 4604A502 */ mul.s $f20, $f20, $f4 -/* 3D6D00 E00D8540 00000000 */ nop -/* 3D6D04 E00D8544 AD020000 */ sw $v0, ($t0) -/* 3D6D08 E00D8548 3C02FA00 */ lui $v0, 0xfa00 -/* 3D6D0C E00D854C AC620050 */ sw $v0, 0x50($v1) -/* 3D6D10 E00D8550 001017C2 */ srl $v0, $s0, 0x1f -/* 3D6D14 E00D8554 02028021 */ addu $s0, $s0, $v0 -/* 3D6D18 E00D8558 46140000 */ add.s $f0, $f0, $f20 -/* 3D6D1C E00D855C 00108043 */ sra $s0, $s0, 1 -/* 3D6D20 E00D8560 4600018D */ trunc.w.s $f6, $f0 -/* 3D6D24 E00D8564 44063000 */ mfc1 $a2, $f6 -/* 3D6D28 E00D8568 0C0360A2 */ jal func_E00D8288 -/* 3D6D2C E00D856C AC770054 */ sw $s7, 0x54($v1) -/* 3D6D30 E00D8570 0260282D */ daddu $a1, $s3, $zero -/* 3D6D34 E00D8574 44910000 */ mtc1 $s1, $f0 -/* 3D6D38 E00D8578 00000000 */ nop -/* 3D6D3C E00D857C 46800020 */ cvt.s.w $f0, $f0 -/* 3D6D40 E00D8580 46140001 */ sub.s $f0, $f0, $f20 -/* 3D6D44 E00D8584 0220302D */ daddu $a2, $s1, $zero -/* 3D6D48 E00D8588 4600018D */ trunc.w.s $f6, $f0 -/* 3D6D4C E00D858C 44043000 */ mfc1 $a0, $f6 -/* 3D6D50 E00D8590 0C0360A2 */ jal func_E00D8288 -/* 3D6D54 E00D8594 0240382D */ daddu $a3, $s2, $zero -/* 3D6D58 E00D8598 4490A000 */ mtc1 $s0, $f20 -/* 3D6D5C E00D859C 00000000 */ nop -/* 3D6D60 E00D85A0 4680A520 */ cvt.s.w $f20, $f20 -/* 3D6D64 E00D85A4 4616A502 */ mul.s $f20, $f20, $f22 -/* 3D6D68 E00D85A8 00000000 */ nop -/* 3D6D6C E00D85AC 0280202D */ daddu $a0, $s4, $zero -/* 3D6D70 E00D85B0 44930000 */ mtc1 $s3, $f0 -/* 3D6D74 E00D85B4 00000000 */ nop -/* 3D6D78 E00D85B8 46800020 */ cvt.s.w $f0, $f0 -/* 3D6D7C E00D85BC 46140000 */ add.s $f0, $f0, $f20 -/* 3D6D80 E00D85C0 0260282D */ daddu $a1, $s3, $zero -/* 3D6D84 E00D85C4 4600018D */ trunc.w.s $f6, $f0 -/* 3D6D88 E00D85C8 44073000 */ mfc1 $a3, $f6 -/* 3D6D8C E00D85CC 0C0360A2 */ jal func_E00D8288 -/* 3D6D90 E00D85D0 0220302D */ daddu $a2, $s1, $zero -/* 3D6D94 E00D85D4 0280202D */ daddu $a0, $s4, $zero -/* 3D6D98 E00D85D8 44920000 */ mtc1 $s2, $f0 -/* 3D6D9C E00D85DC 00000000 */ nop -/* 3D6DA0 E00D85E0 46800020 */ cvt.s.w $f0, $f0 -/* 3D6DA4 E00D85E4 46140001 */ sub.s $f0, $f0, $f20 -/* 3D6DA8 E00D85E8 0220302D */ daddu $a2, $s1, $zero -/* 3D6DAC E00D85EC 4600018D */ trunc.w.s $f6, $f0 -/* 3D6DB0 E00D85F0 44053000 */ mfc1 $a1, $f6 -/* 3D6DB4 E00D85F4 0C0360A2 */ jal func_E00D8288 -/* 3D6DB8 E00D85F8 0240382D */ daddu $a3, $s2, $zero -.LE00D85FC: -/* 3D6DBC E00D85FC 8FBF0030 */ lw $ra, 0x30($sp) -/* 3D6DC0 E00D8600 8FB7002C */ lw $s7, 0x2c($sp) -/* 3D6DC4 E00D8604 8FB60028 */ lw $s6, 0x28($sp) -/* 3D6DC8 E00D8608 8FB50024 */ lw $s5, 0x24($sp) -/* 3D6DCC E00D860C 8FB40020 */ lw $s4, 0x20($sp) -/* 3D6DD0 E00D8610 8FB3001C */ lw $s3, 0x1c($sp) -/* 3D6DD4 E00D8614 8FB20018 */ lw $s2, 0x18($sp) -/* 3D6DD8 E00D8618 8FB10014 */ lw $s1, 0x14($sp) -/* 3D6DDC E00D861C 8FB00010 */ lw $s0, 0x10($sp) -/* 3D6DE0 E00D8620 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 3D6DE4 E00D8624 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 3D6DE8 E00D8628 03E00008 */ jr $ra -/* 3D6DEC E00D862C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8630.s b/ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8630.s deleted file mode 100644 index 3ed8ef32a3..0000000000 --- a/ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8630.s +++ /dev/null @@ -1,113 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E00D8630 -/* 3D6DF0 E00D8630 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 3D6DF4 E00D8634 3C07DB06 */ lui $a3, 0xdb06 -/* 3D6DF8 E00D8638 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* 3D6DFC E00D863C 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) -/* 3D6E00 E00D8640 34E70024 */ ori $a3, $a3, 0x24 -/* 3D6E04 E00D8644 3C02E700 */ lui $v0, 0xe700 -/* 3D6E08 E00D8648 AFBF0050 */ sw $ra, 0x50($sp) -/* 3D6E0C E00D864C 8CC50000 */ lw $a1, ($a2) -/* 3D6E10 E00D8650 8C88000C */ lw $t0, 0xc($a0) -/* 3D6E14 E00D8654 3C013F80 */ lui $at, 0x3f80 -/* 3D6E18 E00D8658 44810000 */ mtc1 $at, $f0 -/* 3D6E1C E00D865C 00A0182D */ daddu $v1, $a1, $zero -/* 3D6E20 E00D8660 24A50008 */ addiu $a1, $a1, 8 -/* 3D6E24 E00D8664 AC620000 */ sw $v0, ($v1) -/* 3D6E28 E00D8668 AC600004 */ sw $zero, 4($v1) -/* 3D6E2C E00D866C ACA70000 */ sw $a3, ($a1) -/* 3D6E30 E00D8670 8C820010 */ lw $v0, 0x10($a0) -/* 3D6E34 E00D8674 24040001 */ addiu $a0, $zero, 1 -/* 3D6E38 E00D8678 ACC50000 */ sw $a1, ($a2) -/* 3D6E3C E00D867C 8C42001C */ lw $v0, 0x1c($v0) -/* 3D6E40 E00D8680 3C038000 */ lui $v1, 0x8000 -/* 3D6E44 E00D8684 00431021 */ addu $v0, $v0, $v1 -/* 3D6E48 E00D8688 ACA20004 */ sw $v0, 4($a1) -/* 3D6E4C E00D868C C502001C */ lwc1 $f2, 0x1c($t0) -/* 3D6E50 E00D8690 24A50008 */ addiu $a1, $a1, 8 -/* 3D6E54 E00D8694 46001032 */ c.eq.s $f2, $f0 -/* 3D6E58 E00D8698 00000000 */ nop -/* 3D6E5C E00D869C 45000012 */ bc1f .LE00D86E8 -/* 3D6E60 E00D86A0 ACC50000 */ sw $a1, ($a2) -/* 3D6E64 E00D86A4 C5000020 */ lwc1 $f0, 0x20($t0) -/* 3D6E68 E00D86A8 44801000 */ mtc1 $zero, $f2 -/* 3D6E6C E00D86AC 00000000 */ nop -/* 3D6E70 E00D86B0 46020032 */ c.eq.s $f0, $f2 -/* 3D6E74 E00D86B4 00000000 */ nop -/* 3D6E78 E00D86B8 4500000B */ bc1f .LE00D86E8 -/* 3D6E7C E00D86BC 00000000 */ nop -/* 3D6E80 E00D86C0 C5000024 */ lwc1 $f0, 0x24($t0) -/* 3D6E84 E00D86C4 46020032 */ c.eq.s $f0, $f2 -/* 3D6E88 E00D86C8 00000000 */ nop -/* 3D6E8C E00D86CC 45000006 */ bc1f .LE00D86E8 -/* 3D6E90 E00D86D0 00000000 */ nop -/* 3D6E94 E00D86D4 C5000028 */ lwc1 $f0, 0x28($t0) -/* 3D6E98 E00D86D8 46020032 */ c.eq.s $f0, $f2 -/* 3D6E9C E00D86DC 00000000 */ nop -/* 3D6EA0 E00D86E0 45030001 */ bc1tl .LE00D86E8 -/* 3D6EA4 E00D86E4 0000202D */ daddu $a0, $zero, $zero -.LE00D86E8: -/* 3D6EA8 E00D86E8 C5040004 */ lwc1 $f4, 4($t0) -/* 3D6EAC E00D86EC C508002C */ lwc1 $f8, 0x2c($t0) -/* 3D6EB0 E00D86F0 C5020008 */ lwc1 $f2, 8($t0) -/* 3D6EB4 E00D86F4 C50A0030 */ lwc1 $f10, 0x30($t0) -/* 3D6EB8 E00D86F8 C500000C */ lwc1 $f0, 0xc($t0) -/* 3D6EBC E00D86FC 24020096 */ addiu $v0, $zero, 0x96 -/* 3D6EC0 E00D8700 AFA20014 */ sw $v0, 0x14($sp) -/* 3D6EC4 E00D8704 2402006B */ addiu $v0, $zero, 0x6b -/* 3D6EC8 E00D8708 AFA20018 */ sw $v0, 0x18($sp) -/* 3D6ECC E00D870C 240200FF */ addiu $v0, $zero, 0xff -/* 3D6ED0 E00D8710 AFA2001C */ sw $v0, 0x1c($sp) -/* 3D6ED4 E00D8714 AFA00020 */ sw $zero, 0x20($sp) -/* 3D6ED8 E00D8718 4600030D */ trunc.w.s $f12, $f0 -/* 3D6EDC E00D871C E7AC0010 */ swc1 $f12, 0x10($sp) -/* 3D6EE0 E00D8720 C500001C */ lwc1 $f0, 0x1c($t0) -/* 3D6EE4 E00D8724 E7A00024 */ swc1 $f0, 0x24($sp) -/* 3D6EE8 E00D8728 C500001C */ lwc1 $f0, 0x1c($t0) -/* 3D6EEC E00D872C 3C02E00E */ lui $v0, %hi(func_E00D8334) -/* 3D6EF0 E00D8730 24428334 */ addiu $v0, $v0, %lo(func_E00D8334) -/* 3D6EF4 E00D8734 E7A00028 */ swc1 $f0, 0x28($sp) -/* 3D6EF8 E00D8738 C5000020 */ lwc1 $f0, 0x20($t0) -/* 3D6EFC E00D873C 3C05E00E */ lui $a1, %hi(D_E00D87E0) -/* 3D6F00 E00D8740 24A587E0 */ addiu $a1, $a1, %lo(D_E00D87E0) -/* 3D6F04 E00D8744 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 3D6F08 E00D8748 C5000024 */ lwc1 $f0, 0x24($t0) -/* 3D6F0C E00D874C 46082100 */ add.s $f4, $f4, $f8 -/* 3D6F10 E00D8750 E7A00030 */ swc1 $f0, 0x30($sp) -/* 3D6F14 E00D8754 C5060028 */ lwc1 $f6, 0x28($t0) -/* 3D6F18 E00D8758 3C014296 */ lui $at, 0x4296 -/* 3D6F1C E00D875C 44810000 */ mtc1 $at, $f0 -/* 3D6F20 E00D8760 460A1080 */ add.s $f2, $f2, $f10 -/* 3D6F24 E00D8764 AFA20038 */ sw $v0, 0x38($sp) -/* 3D6F28 E00D8768 24020140 */ addiu $v0, $zero, 0x140 -/* 3D6F2C E00D876C AFA20044 */ sw $v0, 0x44($sp) -/* 3D6F30 E00D8770 46002101 */ sub.s $f4, $f4, $f0 -/* 3D6F34 E00D8774 3C014254 */ lui $at, 0x4254 -/* 3D6F38 E00D8778 44810000 */ mtc1 $at, $f0 -/* 3D6F3C E00D877C 240200F0 */ addiu $v0, $zero, 0xf0 -/* 3D6F40 E00D8780 AFA8003C */ sw $t0, 0x3c($sp) -/* 3D6F44 E00D8784 AFA00040 */ sw $zero, 0x40($sp) -/* 3D6F48 E00D8788 AFA20048 */ sw $v0, 0x48($sp) -/* 3D6F4C E00D878C AFA0004C */ sw $zero, 0x4c($sp) -/* 3D6F50 E00D8790 46001081 */ sub.s $f2, $f2, $f0 -/* 3D6F54 E00D8794 4600230D */ trunc.w.s $f12, $f4 -/* 3D6F58 E00D8798 44066000 */ mfc1 $a2, $f12 -/* 3D6F5C E00D879C 4600130D */ trunc.w.s $f12, $f2 -/* 3D6F60 E00D87A0 44076000 */ mfc1 $a3, $f12 -/* 3D6F64 E00D87A4 0C080190 */ jal shim_draw_box -/* 3D6F68 E00D87A8 E7A60034 */ swc1 $f6, 0x34($sp) -/* 3D6F6C E00D87AC 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 3D6F70 E00D87B0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* 3D6F74 E00D87B4 8C620000 */ lw $v0, ($v1) -/* 3D6F78 E00D87B8 0040202D */ daddu $a0, $v0, $zero -/* 3D6F7C E00D87BC 24420008 */ addiu $v0, $v0, 8 -/* 3D6F80 E00D87C0 AC620000 */ sw $v0, ($v1) -/* 3D6F84 E00D87C4 3C02E700 */ lui $v0, 0xe700 -/* 3D6F88 E00D87C8 AC820000 */ sw $v0, ($a0) -/* 3D6F8C E00D87CC AC800004 */ sw $zero, 4($a0) -/* 3D6F90 E00D87D0 8FBF0050 */ lw $ra, 0x50($sp) -/* 3D6F94 E00D87D4 03E00008 */ jr $ra -/* 3D6F98 E00D87D8 27BD0058 */ addiu $sp, $sp, 0x58 -/* 3D6F9C E00D87DC 00000000 */ nop diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index f6fb8f8133..327aa51c6e 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -5539,7 +5539,19 @@ segments: subsegments: - [0x3D67C0, c, tattle_window] - [0x3D6FA0] - - [0x3D7040, bin] # tattle_window gfx + - name: effect_gfx_tattle_window + dir: effects/gfx + type: code + start: 0x3D7040 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x3D7040, c, tattle_window] + - start: 0x3D7040 + type: .data + name: tattle_window + subsegments: + - [0x3D7040, ia8, D_09000000_3D7040, 16, 32] - name: effect_shiny_flare dir: effects type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index c697d8a71c..e519d69c68 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -10843,8 +10843,6 @@ b_area_trd_part_2_trd_05f_80235678 = 0x80235678; // type:data rom:0x4CE868 b_area_trd_part_2_trd_05f_beforeBattle_80235C24 = 0x80235C24; // type:data rom:0x4CEE14 b_area_trd_part_2_trd_05f_afterBattle_80235D1C = 0x80235D1C; // type:data rom:0x4CEF0C b_area_trd_part_2_trd_05f = 0x80235D2C; // type:data rom:0x4CEF1C -D_80235E6C_4CF05C = 0x80235E6C; // type:data rom:0x4CF05C -D_80235F44_4CF134 = 0x80235F44; // type:data rom:0x4CF134 D_80235FC0 = 0x80218000; // type:func rom:0x4CF1B0 b_area_trd_part_2_green_ninja_koopa_effectUnk = 0x80236040; // type:data rom:0x4CF230 func_802180C8_4CF278 = 0x802180C8; // type:func rom:0x4CF278 @@ -18495,7 +18493,6 @@ D_802427C0_A517C0 = 0x802427C0; // type:data rom:0xA517C0 D_802427C8_A517C8 = 0x802427C8; // type:data rom:0xA517C8 D_802427D0_A517D0 = 0x802427D0; // type:data rom:0xA517D0 D_802427D8_A517D8 = 0x802427D8; // type:data rom:0xA517D8 -sbk_34_802427E0 = 0x802427E0; // type:data rom:0xA517E0 kpa_10_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA51980 kpa_10_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA51AA4 kpa_11_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA528C0 @@ -22574,8 +22571,6 @@ flo_00_80248E30 = 0x80248E30; // type:data rom:0xCA6D50 flo_00_80248F48 = 0x80248F48; // type:data rom:0xCA6E68 flo_00_makeEntities = 0x80249130; // type:data rom:0xCA7050 flo_00_pad_XXXX = 0x802491B8; // type:data rom:0xCA70D8 -D_802491C0_CA70E0 = 0x802491C0; // type:data rom:0xCA70E0 -D_802491C8_CA70E8 = 0x802491C8; // type:data rom:0xCA70E8 flo_00_flo_07_name_hack = 0x80249360; // type:data rom:0xCA7280 flo_00_pad_XXX = 0x80249368; // type:data rom:0xCA7288 flo_00_sam_11_name_hack = 0x80249370; // type:data rom:0xCA7290 @@ -23054,12 +23049,6 @@ flo_13_npcGroup_802473B4 = 0x802473B4; // type:data rom:0xCCABC4 flo_13_npcGroup_802475A4 = 0x802475A4; // type:data rom:0xCCADB4 flo_13_npcGroup_80247794 = 0x80247794; // type:data rom:0xCCAFA4 flo_13_npcGroupList_80247984 = 0x80247984; // type:data rom:0xCCB194 -D_80247A30_CCB240 = 0x80247A30; // type:data rom:0xCCB240 -D_80247A38_CCB248 = 0x80247A38; // type:data rom:0xCCB248 -D_80247A40_CCB250 = 0x80247A40; // type:data rom:0xCCB250 -D_80247A88_CCB298 = 0x80247A88; // type:data rom:0xCCB298 -D_80247AE8_CCB2F8 = 0x80247AE8; // type:data rom:0xCCB2F8 -D_80247AF0_CCB300 = 0x80247AF0; // type:data rom:0xCCB300 flo_14_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xCCB310 flo_14_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xCCB434 flo_14_SpawnSunEffect = 0x8024030C; // type:func rom:0xCCB61C @@ -25878,7 +25867,6 @@ fx_sun_undeclared = 0x80072950; // type:func EnemyNpcHit = 0x80077F70; // EnemyNpcDefeat = 0x8007809C; // dead_gGameStatusPtr = 0x80079430; // type:data -D_80079540 = 0x80079540; // type:data dead_gCurrentCameraID = 0x8007C760; // type:data dead_gItemTable = 0x8008D2C0; // type:data rdpstateinit_dl = 0x80093BB8; // type:data @@ -25899,7 +25887,6 @@ dead_gCurrentCamID = 0x800A158C; // type:data D_800A15A4 = 0x800A15A4; // type:data dead_gOverrideFlags = 0x800A15A8; // type:data D_800A15C4 = 0x800A15C4; // type:data -D_800A15CC = 0x800A15CC; // type:data piEventQueue = 0x800AF890; // type:data __osFlashID = 0x800B0C30; // type:data __osFlashMsg = 0x800B0C40; // type:data @@ -25911,8 +25898,6 @@ dead_gCurrentEncounter = 0x800B7EF0; // type:data dead_gCameras = 0x800B8D80; // type:data D_800B8DEC = 0x800B8DEC; // type:data _use_partner_ability = 0x800EA6CC; // type:func -D_800FBB60 = 0x800FBB60; // type:data -D_800FBBE0 = 0x800FBBE0; // type:data dead_gPlayerStatusPtr = 0x800FFC90; // type:data dead_wPartnerHudScripts = 0x80100060; // type:data D_801000A0 = 0x801000A0; // type:data @@ -26037,8 +26022,6 @@ D_80224DB0 = 0x80224DB0; // type:data b_area_kzn2_VineData = 0x8022ADD0; // type:data b_area_kzn2_VineRenderState = 0x8022B550; // type:data D_802310D0 = 0x802310D0; // type:data -D_802312E0_battle_area_omo2 = 0x802312E0; // type:data -D_802312F8_battle_area_omo2 = 0x802312F8; // type:data D_80232C4C = 0x80232C4C; // type:data D_80235E00 = 0x80235E00; // type:data D_80236040 = 0x80236040; // type:data @@ -26177,7 +26160,6 @@ flo_10_pad_1CA8 = 0x80241CA8; // type:data dgb_07_pad_1E74 = 0x80241E88; // type:data dgb_15_pad_1E94 = 0x80241E94; // type:data D_80241ECC = 0x80241ECC; // type:data -some_80241FBC = 0x80241FBC; // type:data flo_09_pad_2004 = 0x80242004; // type:data D_80242180 = 0x80242180; // flo_24_pad_21A4 = 0x802421A4; // type:data @@ -26194,7 +26176,6 @@ D_80242410 = 0x80242410; // type:data D_80242430 = 0x80242430; // type:data D_80242450 = 0x80242450; // type:data D_802424E0 = 0x802424E0; // type:data -D_80242568_filemenu = 0x80242568; // type:data flo_23_pad_2598 = 0x80242598; // type:data flo_23_ItemChoiceList = 0x802426E0; // type:data segment:flo_23 flo_23_D_8024284C_pad = 0x8024284C; // type:data @@ -26373,7 +26354,6 @@ D_80246794 = 0x80246794; // type:data kzn_02_LetterDelivery_SavedNpcAnim = 0x80246794; // type:data kzn_17_LetterDelivery_SavedNpcAnim = 0x802467B4; // type:data flo_00_pad_684C = 0x8024684C; // type:data -D_80246894 = 0x80246894; // type:data dead_kzn_17_LetterDelivery_SavedNpcAnim = 0x80246894; // type:data D_80246990 = 0x80246990; // type:data dgb_08_pad_69DC = 0x802469DC; // type:data @@ -26412,7 +26392,6 @@ D_802483C0 = 0x802483C0; // type:data D_802483C4 = 0x802483C4; // type:data D_802483D0 = 0x802483D0; // type:data iwa_10_D_80248480 = 0x80248480; // type:data -D_8024854C = 0x8024854C; // type:data dead_kzn_19_LetterDelivery_SavedNpcAnim = 0x8024854C; // type:data kzn_19_LetterDelivery_SavedNpcAnim = 0x8024854C; // type:data D_80248600 = 0x80248600; // type:data @@ -26433,7 +26412,6 @@ trd_06_fake_sym = 0x802491C0; // type:data end_01_CreditsData = 0x80249440; // type:data D_8024A290 = 0x8024A290; // type:data D_8024A2A0 = 0x8024A2A0; // type:data -end_01_CreditsDataPtr = 0x8024A2C4; // type:data end_01_CreditsMessageBuffers = 0x8024A2D0; // type:data sam_02_Quizmo_Worker = 0x8024B990; // type:data sam_02_Quizmo_StageEffect = 0x8024B9B0; // type:data @@ -26530,75 +26508,7 @@ D_8024F248 = 0x8024F248; // type:data ItemChoiceList = 0x8024F248; // type:data dro_02_D_8024F248 = 0x8024F248; // type:data dro_02_ItemChoiceList = 0x8024F248; // type:data -D_8024F2A0 = 0x8024F2A0; // type:data -D_8024F2A1 = 0x8024F2A1; // type:data -D_8024F2A2 = 0x8024F2A2; // type:data -D_8024F2A3 = 0x8024F2A3; // type:data -D_8024F2A4 = 0x8024F2A4; // type:data -D_8024F2A5 = 0x8024F2A5; // type:data -D_8024F2A8 = 0x8024F2A8; // type:data -D_8024F2AB = 0x8024F2AB; // type:data -D_8024F2AC = 0x8024F2AC; // type:data -D_8024F2AF = 0x8024F2AF; // type:data -D_8024F2B0 = 0x8024F2B0; // type:data -D_8024F2B3 = 0x8024F2B3; // type:data -D_8024F2B4 = 0x8024F2B4; // type:data -D_8024F2B7 = 0x8024F2B7; // type:data -D_8024F2B8 = 0x8024F2B8; // type:data -D_8024F2BB = 0x8024F2BB; // type:data -D_8024F2BC = 0x8024F2BC; // type:data -D_8024F2BF = 0x8024F2BF; // type:data -D_8024F2C0 = 0x8024F2C0; // type:data -D_8024F2C4 = 0x8024F2C4; // type:data -D_8024F2C8 = 0x8024F2C8; // type:data -D_8024F2CC = 0x8024F2CC; // type:data -D_8024F2D8 = 0x8024F2D8; // type:data -D_8024F2DC = 0x8024F2DC; // type:data -D_8024F2E0 = 0x8024F2E0; // type:data -D_8024F2E4 = 0x8024F2E4; // type:data -D_8024F2E8 = 0x8024F2E8; // type:data -D_8024F2EC = 0x8024F2EC; // type:data -D_8024F2F0 = 0x8024F2F0; // type:data -D_8024F2F4 = 0x8024F2F4; // type:data -D_8024F2F8 = 0x8024F2F8; // type:data -D_8024F2FC = 0x8024F2FC; // type:data -D_8024F300 = 0x8024F300; // type:data -D_8024F304 = 0x8024F304; // type:data -D_8024F308 = 0x8024F308; // type:data -D_8024F30C = 0x8024F30C; // type:data -D_8024F318 = 0x8024F318; // type:data -D_8024F338 = 0x8024F338; // type:data -D_8024F358 = 0x8024F358; // type:data -D_8024F374 = 0x8024F374; // type:data -D_8024F378 = 0x8024F378; // type:data -D_8024F380 = 0x8024F380; // type:data -dro_02_pad_D_8024F3B4 = 0x8024F3B4; // type:data -D_8024F3F8 = 0x8024F3F8; // type:data -D_8024F420 = 0x8024F420; // type:data -D_8024F448 = 0x8024F448; // type:data -D_8024F498 = 0x8024F498; // type:data -D_8024F4C0 = 0x8024F4C0; // type:data -D_8024F4E8 = 0x8024F4E8; // type:data -D_8024F570 = 0x8024F570; // type:data -D_8024F581 = 0x8024F581; // type:data -D_8024F582 = 0x8024F582; // type:data -D_8024F583 = 0x8024F583; // type:data -D_8024F584 = 0x8024F584; // type:data -D_8024F585 = 0x8024F585; // type:data -D_8024F588 = 0x8024F588; // type:data -D_8024F58B = 0x8024F58B; // type:data -D_8024F58C = 0x8024F58C; // type:data -D_8024F58F = 0x8024F58F; // type:data -D_8024F590 = 0x8024F590; // type:data -D_8024F593 = 0x8024F593; // type:data -D_8024F594 = 0x8024F594; // type:data -D_8024F597 = 0x8024F597; // type:data -D_8024F598 = 0x8024F598; // type:data -D_8024F59B = 0x8024F59B; // type:data -D_8024F59C = 0x8024F59C; // type:data -D_8024F59F = 0x8024F59F; // type:data mac_04_Quizmo_Worker = 0x8024F5A0; // type:data -D_8024F5A4 = 0x8024F5A4; // type:data mac_04_Quizmo_AnswerResult = 0x8024F5B8; // type:data mac_04_Quizmo_StageEffect = 0x8024F5C0; // type:data mac_04_Quizmo_AudienceEffect = 0x8024F5C4; // type:data @@ -26968,46 +26878,9 @@ D_8029FBD0 = 0x8029FBD0; // type:data D_8029FBD4 = 0x8029FBD4; // type:data gActionCommandStatus = 0x8029FBE0; // type:data D_802A19B0 = 0x802A19B0; // type:data -D_802A19C0 = 0x802A19C0; // type:data D_802A1A60 = 0x802A1A60; // type:data battle_item_coconut_coconutDL = 0x802A1A60; // type:data -D_802A1A90 = 0x802A1A90; // type:data -D_802A1AC0 = 0x802A1AC0; // type:data -D_802A1B40 = 0x802A1B40; // type:data -D_802A1C40 = 0x802A1C40; // type:data -D_802A1CD0 = 0x802A1CD0; // type:data -D_802A1CD4 = 0x802A1CD4; // type:data -D_802A1D60 = 0x802A1D60; // type:data -D_802A21F0 = 0x802A21F0; // type:data itemIcon = 0x802A2410; // type:data -D_802A25C8 = 0x802A25C8; // type:data -D_802A25E4 = 0x802A25E4; // type:data -D_802A25E8 = 0x802A25E8; // type:data -D_802A25EC = 0x802A25EC; // type:data -D_802A25F0 = 0x802A25F0; // type:data -D_802A25F4 = 0x802A25F4; // type:data -D_802A25F8 = 0x802A25F8; // type:data -D_802A25FC = 0x802A25FC; // type:data -D_802A2C20 = 0x802A2C20; // type:data -D_802A2C50 = 0x802A2C50; // type:data -D_802A2CC0 = 0x802A2CC0; // type:data -D_802A2DD8 = 0x802A2DD8; // type:data -D_802A2DEC = 0x802A2DEC; // type:data -D_802A2DF0 = 0x802A2DF0; // type:data -D_802A2DF4 = 0x802A2DF4; // type:data -D_802A2DF8 = 0x802A2DF8; // type:data -D_802A2DFC = 0x802A2DFC; // type:data -D_802A2E00 = 0x802A2E00; // type:data -D_802A37F0 = 0x802A37F0; // type:data -D_802A37F8 = 0x802A37F8; // type:data -D_802A3818 = 0x802A3818; // type:data -D_802A3834 = 0x802A3834; // type:data -D_802A3838 = 0x802A3838; // type:data -D_802A3F58 = 0x802A3F58; // type:data -D_802A3F88 = 0x802A3F88; // type:data -D_802A4020 = 0x802A4020; // type:data -D_802A4350 = 0x802A4350; // type:data -D_802A43D0 = 0x802A43D0; // type:data func_802A91F8 = 0x802A91F8; // func_802A9208 = 0x802A9208; // func_802A9228 = 0x802A9228; // @@ -27231,7 +27104,6 @@ OriginalPlayerY = 0x802BFEE0; // type:data D_802BFEF0 = 0x802BFEF0; // type:data D_802BFEFC = 0x802BFEFC; // type:data D_802BFF30 = 0x802BFF30; // type:data -D_802C0000 = 0x802C0000; // type:data D_802D9D80 = 0x802D9D80; // type:data gMapFlags = 0x802DA480; // gMapVars = 0x802DA484; // @@ -27393,620 +27265,6 @@ D_E000CC5C = 0xE000CC5C; // type:data D_E000CCE0 = 0xE000CCE0; // type:data D_E000CD24 = 0xE000CD24; // type:data jtbl_E000CD70 = 0xE000CD70; // type:data -D_E0010710 = 0xE0010710; // type:data -D_E0014780 = 0xE0014780; // type:data -D_E0014788 = 0xE0014788; // type:data -D_E0014790 = 0xE0014790; // type:data -D_E0014798 = 0xE0014798; // type:data -D_E00147A0 = 0xE00147A0; // type:data -D_E00147A8 = 0xE00147A8; // type:data -D_E00147B0 = 0xE00147B0; // type:data -D_E0016720 = 0xE0016720; // type:data -D_E0016728 = 0xE0016728; // type:data -D_E0016730 = 0xE0016730; // type:data -D_E0016738 = 0xE0016738; // type:data -D_E0016740 = 0xE0016740; // type:data -D_E001A620 = 0xE001A620; // type:data -D_E001A628 = 0xE001A628; // type:data -D_E001ED50 = 0xE001ED50; // type:data -D_E001ED58 = 0xE001ED58; // type:data -D_E0022CD0 = 0xE0022CD0; // type:data -D_E0022CF0 = 0xE0022CF0; // type:data -D_E0022D14 = 0xE0022D14; // type:data -D_E0022D1C = 0xE0022D1C; // type:data -D_E0022D30 = 0xE0022D30; // type:data -D_E0022D48 = 0xE0022D48; // type:data -D_E0022D50 = 0xE0022D50; // type:data -D_E0022D58 = 0xE0022D58; // type:data -D_E0022D60 = 0xE0022D60; // type:data -D_E0022D68 = 0xE0022D68; // type:data -D_E0022D70 = 0xE0022D70; // type:data -D_E0022D78 = 0xE0022D78; // type:data -D_E0024CF0 = 0xE0024CF0; // type:data -D_E0024CF8 = 0xE0024CF8; // type:data -D_E00269F0 = 0xE00269F0; // type:data -D_E00269F8 = 0xE00269F8; // type:data -D_E0026A00 = 0xE0026A00; // type:data -D_E0026A20 = 0xE0026A20; // type:data -D_E0026A28 = 0xE0026A28; // type:data -D_E0026A30 = 0xE0026A30; // type:data -D_E0026A38 = 0xE0026A38; // type:data -D_E0026A40 = 0xE0026A40; // type:data -D_E0026A48 = 0xE0026A48; // type:data -D_E00287E0 = 0xE00287E0; // type:data -D_E00287E8 = 0xE00287E8; // type:data -D_E00287F0 = 0xE00287F0; // type:data -D_E00287F8 = 0xE00287F8; // type:data -D_E0028800 = 0xE0028800; // type:data -D_E0028808 = 0xE0028808; // type:data -D_E0028810 = 0xE0028810; // type:data -D_E002A720 = 0xE002A720; // type:data -D_E002A728 = 0xE002A728; // type:data -D_E002A730 = 0xE002A730; // type:data -D_E002A738 = 0xE002A738; // type:data -D_E002C940 = 0xE002C940; // type:data -D_E002C944 = 0xE002C944; // type:data -D_E002C964 = 0xE002C964; // type:data -D_E002C984 = 0xE002C984; // type:data -D_E002C9D0 = 0xE002C9D0; // type:data -D_E002C9D8 = 0xE002C9D8; // type:data -D_E002C9E0 = 0xE002C9E0; // type:data -D_E002C9E8 = 0xE002C9E8; // type:data -D_E002C9F0 = 0xE002C9F0; // type:data -D_E002E754 = 0xE002E754; // type:data -D_E0030E90 = 0xE0030E90; // type:data -D_E0030EB4 = 0xE0030EB4; // type:data -D_E0030EC0 = 0xE0030EC0; // type:data -D_E0030ED8 = 0xE0030ED8; // type:data -D_E0030EE0 = 0xE0030EE0; // type:data -D_E0030EE8 = 0xE0030EE8; // type:data -D_E0030EF0 = 0xE0030EF0; // type:data -D_E00328B0 = 0xE00328B0; // type:data -D_E00328C0 = 0xE00328C0; // type:data -D_E00328C8 = 0xE00328C8; // type:data -D_E00328D0 = 0xE00328D0; // type:data -D_E00328D8 = 0xE00328D8; // type:data -D_E00328E0 = 0xE00328E0; // type:data -D_E00328E8 = 0xE00328E8; // type:data -D_E0034780 = 0xE0034780; // type:data -D_E0034788 = 0xE0034788; // type:data -D_E0034790 = 0xE0034790; // type:data -D_E0034791 = 0xE0034791; // type:data -D_E0034792 = 0xE0034792; // type:data -D_E00347B0 = 0xE00347B0; // type:data -D_E00347B8 = 0xE00347B8; // type:data -D_E00347C0 = 0xE00347C0; // type:data -D_E00347C8 = 0xE00347C8; // type:data -D_E0036630 = 0xE0036630; // type:data -D_E0036640 = 0xE0036640; // type:data -D_E0036648 = 0xE0036648; // type:data -D_E0036650 = 0xE0036650; // type:data -D_E0038A20 = 0xE0038A20; // type:data -D_E0038A28 = 0xE0038A28; // type:data -D_E0038A30 = 0xE0038A30; // type:data -D_E0038A38 = 0xE0038A38; // type:data -D_E0038A40 = 0xE0038A40; // type:data -D_E003A800 = 0xE003A800; // type:data -D_E003A80C = 0xE003A80C; // type:data -D_E003A820 = 0xE003A820; // type:data -D_E003A828 = 0xE003A828; // type:data -D_E003A830 = 0xE003A830; // type:data -D_E003CD40 = 0xE003CD40; // type:data -D_E003CD48 = 0xE003CD48; // type:data -D_E003CD50 = 0xE003CD50; // type:data -D_E003E870 = 0xE003E870; // type:data -D_E003E878 = 0xE003E878; // type:data -D_E003E880 = 0xE003E880; // type:data -D_E003E888 = 0xE003E888; // type:data -D_E003E890 = 0xE003E890; // type:data -D_E003E898 = 0xE003E898; // type:data -D_E0040898 = 0xE0040898; // type:data -D_E00408A0 = 0xE00408A0; // type:data -D_E0042780 = 0xE0042780; // type:data -D_E00427B0 = 0xE00427B0; // type:data -D_E00427B8 = 0xE00427B8; // type:data -D_E0044DB0 = 0xE0044DB0; // type:data -D_E0044DD0 = 0xE0044DD0; // type:data -D_E0044DF4 = 0xE0044DF4; // type:data -D_E0044E04 = 0xE0044E04; // type:data -D_E0044E20 = 0xE0044E20; // type:data -D_E0044E28 = 0xE0044E28; // type:data -D_E0044E30 = 0xE0044E30; // type:data -D_E0044E38 = 0xE0044E38; // type:data -D_E0044E40 = 0xE0044E40; // type:data -D_E0044E58 = 0xE0044E58; // type:data -D_E0044E60 = 0xE0044E60; // type:data -D_E0044E68 = 0xE0044E68; // type:data -D_E0044E70 = 0xE0044E70; // type:data -D_E0044E78 = 0xE0044E78; // type:data -D_E0044EF8 = 0xE0044EF8; // type:data -D_E0046600 = 0xE0046600; // type:data -D_E0046604 = 0xE0046604; // type:data -D_E0046614 = 0xE0046614; // type:data -D_E0046618 = 0xE0046618; // type:data -D_E0046620 = 0xE0046620; // type:data -D_E0046628 = 0xE0046628; // type:data -D_E0046630 = 0xE0046630; // type:data -D_E0046638 = 0xE0046638; // type:data -D_E0046640 = 0xE0046640; // type:data -D_E0048A00 = 0xE0048A00; // type:data -D_E0048A08 = 0xE0048A08; // type:data -D_E0048A10 = 0xE0048A10; // type:data -D_E004AE60 = 0xE004AE60; // type:data -D_E004AE98 = 0xE004AE98; // type:data -D_E004AEA0 = 0xE004AEA0; // type:data -D_E004AEA8 = 0xE004AEA8; // type:data -D_E004AEB0 = 0xE004AEB0; // type:data -D_E004AEC8 = 0xE004AEC8; // type:data -D_E004AED0 = 0xE004AED0; // type:data -D_E004AED8 = 0xE004AED8; // type:data -D_E004AEE0 = 0xE004AEE0; // type:data -D_E004AEE8 = 0xE004AEE8; // type:data -D_E004C67D = 0xE004C67D; // type:data -D_E004C67E = 0xE004C67E; // type:data -D_E004C6A0 = 0xE004C6A0; // type:data -D_E004C6A8 = 0xE004C6A8; // type:data -D_E004C6B0 = 0xE004C6B0; // type:data -D_E004C6B8 = 0xE004C6B8; // type:data -D_E004E5E0 = 0xE004E5E0; // type:data -D_E004E5EC = 0xE004E5EC; // type:data -D_E0050560 = 0xE0050560; // type:data -D_E0050568 = 0xE0050568; // type:data -D_E0050570 = 0xE0050570; // type:data -D_E0052A80 = 0xE0052A80; // type:data -D_E0052A88 = 0xE0052A88; // type:data -D_E0056EA0 = 0xE0056EA0; // type:data -D_E0056EA8 = 0xE0056EA8; // type:data -D_E0056EB0 = 0xE0056EB0; // type:data -D_E0056EB8 = 0xE0056EB8; // type:data -D_E0056EC0 = 0xE0056EC0; // type:data -D_E0056EC8 = 0xE0056EC8; // type:data -D_E0056ED0 = 0xE0056ED0; // type:data -D_E0056ED8 = 0xE0056ED8; // type:data -D_E0056EE0 = 0xE0056EE0; // type:data -D_E0056EE8 = 0xE0056EE8; // type:data -D_E0056EF0 = 0xE0056EF0; // type:data -D_E0056EF8 = 0xE0056EF8; // type:data -D_E0056F00 = 0xE0056F00; // type:data -D_E0056F08 = 0xE0056F08; // type:data -D_E0056F10 = 0xE0056F10; // type:data -D_E0056F18 = 0xE0056F18; // type:data -D_E0058780 = 0xE0058780; // type:data -D_E0058788 = 0xE0058788; // type:data -D_E0058790 = 0xE0058790; // type:data -D_E0058798 = 0xE0058798; // type:data -D_E00587A0 = 0xE00587A0; // type:data -D_E00587A8 = 0xE00587A8; // type:data -D_E00587B0 = 0xE00587B0; // type:data -D_E005A750 = 0xE005A750; // type:data -D_E005A758 = 0xE005A758; // type:data -D_E005A760 = 0xE005A760; // type:data -D_E005C700 = 0xE005C700; // type:data -D_E005C704 = 0xE005C704; // type:data -D_E005C710 = 0xE005C710; // type:data -D_E005C718 = 0xE005C718; // type:data -D_E005C720 = 0xE005C720; // type:data -D_E005E670 = 0xE005E670; // type:data -D_E005E674 = 0xE005E674; // type:data -D_E005E680 = 0xE005E680; // type:data -D_E0060740 = 0xE0060740; // type:data -D_E0060748 = 0xE0060748; // type:data -D_E0060750 = 0xE0060750; // type:data -D_E0060758 = 0xE0060758; // type:data -D_E00628D0 = 0xE00628D0; // type:data -D_E00628D8 = 0xE00628D8; // type:data -D_E00628E0 = 0xE00628E0; // type:data -D_E00628E8 = 0xE00628E8; // type:data -D_E00628F0 = 0xE00628F0; // type:data -D_E00628F8 = 0xE00628F8; // type:data -D_E0064A60 = 0xE0064A60; // type:data -D_E0064A70 = 0xE0064A70; // type:data -D_E0064A78 = 0xE0064A78; // type:data -D_E0064A80 = 0xE0064A80; // type:data -D_E0064A88 = 0xE0064A88; // type:data -D_E0064A90 = 0xE0064A90; // type:data -D_E0066C50 = 0xE0066C50; // type:data -D_E0066C8C = 0xE0066C8C; // type:data -D_E0066D20 = 0xE0066D20; // type:data -D_E00685B0 = 0xE00685B0; // type:data -D_E00685BC = 0xE00685BC; // type:data -D_E00685F4 = 0xE00685F4; // type:data -D_E0068600 = 0xE0068600; // type:data -D_E006ADF0 = 0xE006ADF0; // type:data -D_E006AE00 = 0xE006AE00; // type:data -D_E006AE10 = 0xE006AE10; // type:data -D_E006AF50 = 0xE006AF50; // type:data -D_E006AF58 = 0xE006AF58; // type:data -D_E006AF60 = 0xE006AF60; // type:data -D_E006CB60 = 0xE006CB60; // type:data -D_E006CB78 = 0xE006CB78; // type:data -D_E006EC20 = 0xE006EC20; // type:data -D_E006EC28 = 0xE006EC28; // type:data -D_E006EC30 = 0xE006EC30; // type:data -D_E006EC38 = 0xE006EC38; // type:data -D_E006EC40 = 0xE006EC40; // type:data -D_E006EC48 = 0xE006EC48; // type:data -D_E0070CD0 = 0xE0070CD0; // type:data -D_E0070CF0 = 0xE0070CF0; // type:data -D_E0070D60 = 0xE0070D60; // type:data -D_E0070D68 = 0xE0070D68; // type:data -D_E0070D70 = 0xE0070D70; // type:data -D_E0070D78 = 0xE0070D78; // type:data -D_E0070D80 = 0xE0070D80; // type:data -D_E0070D88 = 0xE0070D88; // type:data -D_E0070D90 = 0xE0070D90; // type:data -D_E00726B0 = 0xE00726B0; // type:data -D_E0074B60 = 0xE0074B60; // type:data -D_E0074B80 = 0xE0074B80; // type:data -D_E0074BF0 = 0xE0074BF0; // type:data -D_E0074BF8 = 0xE0074BF8; // type:data -D_E0074C00 = 0xE0074C00; // type:data -D_E0074C08 = 0xE0074C08; // type:data -D_E0076EE0 = 0xE0076EE0; // type:data -D_E0076EE8 = 0xE0076EE8; // type:data -D_E0076EF0 = 0xE0076EF0; // type:data -D_E0076EF8 = 0xE0076EF8; // type:data -D_E0076F00 = 0xE0076F00; // type:data -D_E0078900 = 0xE0078900; // type:data -D_E0078918 = 0xE0078918; // type:data -D_E00789A8 = 0xE00789A8; // type:data -D_E00789AC = 0xE00789AC; // type:data -D_E00789D0 = 0xE00789D0; // type:data -D_E007AC00 = 0xE007AC00; // type:data -D_E007AC08 = 0xE007AC08; // type:data -D_E007AC10 = 0xE007AC10; // type:data -D_E007AC18 = 0xE007AC18; // type:data -D_E007AC20 = 0xE007AC20; // type:data -D_E007AC28 = 0xE007AC28; // type:data -D_E007AC30 = 0xE007AC30; // type:data -D_E007C510 = 0xE007C510; // type:data -D_E007EC2F = 0xE007EC2F; // type:data -D_E007EC40 = 0xE007EC40; // type:data -D_E0082D30 = 0xE0082D30; // type:data -D_E0082D60 = 0xE0082D60; // type:data -D_E0086AA0 = 0xE0086AA0; // type:data -D_E0086AB4 = 0xE0086AB4; // type:data -D_E0086AC0 = 0xE0086AC0; // type:data -D_E0086AC4 = 0xE0086AC4; // type:data -D_E0086AD4 = 0xE0086AD4; // type:data -D_E0086AE4 = 0xE0086AE4; // type:data -D_E0088CC0 = 0xE0088CC0; // type:data -D_E0088CDC = 0xE0088CDC; // type:data -D_E0088D00 = 0xE0088D00; // type:data -D_E0088D08 = 0xE0088D08; // type:data -D_E0088D10 = 0xE0088D10; // type:data -D_E0088D18 = 0xE0088D18; // type:data -D_E0088D20 = 0xE0088D20; // type:data -D_E0088D28 = 0xE0088D28; // type:data -D_E0088D70 = 0xE0088D70; // type:data -D_E0088D90 = 0xE0088D90; // type:data -D_E0088D98 = 0xE0088D98; // type:data -D_E0088DA0 = 0xE0088DA0; // type:data -D_E008AA50 = 0xE008AA50; // type:data -D_E008AA60 = 0xE008AA60; // type:data -D_E008AA68 = 0xE008AA68; // type:data -D_E008AA70 = 0xE008AA70; // type:data -D_E008AA78 = 0xE008AA78; // type:data -D_E008CB14 = 0xE008CB14; // type:data -D_E008CB18 = 0xE008CB18; // type:data -D_E008CB1C = 0xE008CB1C; // type:data -D_E008CB20 = 0xE008CB20; // type:data -D_E008CB28 = 0xE008CB28; // type:data -D_E008CB48 = 0xE008CB48; // type:data -D_E008CB60 = 0xE008CB60; // type:data -D_E008CB68 = 0xE008CB68; // type:data -D_E008CB70 = 0xE008CB70; // type:data -D_E008CB78 = 0xE008CB78; // type:data -D_E008CB80 = 0xE008CB80; // type:data -D_E008E890 = 0xE008E890; // type:data -D_E008E8A0 = 0xE008E8A0; // type:data -D_E0090AA0 = 0xE0090AA0; // type:data -D_E0090AA8 = 0xE0090AA8; // type:data -D_E0090AB0 = 0xE0090AB0; // type:data -D_E0090AB8 = 0xE0090AB8; // type:data -D_E0090AC0 = 0xE0090AC0; // type:data -D_E0092690 = 0xE0092690; // type:data -D_E00926A4 = 0xE00926A4; // type:data -sPartParams = 0xE00926A4; // type:data -D_E0092700 = 0xE0092700; // type:data -D_E00947B0 = 0xE00947B0; // type:data -D_E00947B8 = 0xE00947B8; // type:data -D_E00947C0 = 0xE00947C0; // type:data -D_E00947C8 = 0xE00947C8; // type:data -D_E0098510 = 0xE0098510; // type:data -D_E0098530 = 0xE0098530; // type:data -D_E009AA78 = 0xE009AA78; // type:data -D_E009AA80 = 0xE009AA80; // type:data -D_E00BEAF0 = 0xE00BEAF0; // type:data -D_E00BEB00 = 0xE00BEB00; // type:data -D_E00BEB08 = 0xE00BEB08; // type:data -D_E00BEB10 = 0xE00BEB10; // type:data -D_E00BEB18 = 0xE00BEB18; // type:data -D_E00BEB20 = 0xE00BEB20; // type:data -D_E00C0A10 = 0xE00C0A10; // type:data -D_E00C0A21 = 0xE00C0A21; // type:data -D_E00C0A24 = 0xE00C0A24; // type:data -D_E00C0A40 = 0xE00C0A40; // type:data -D_E00C0A8C = 0xE00C0A8C; // type:data -D_E00C0C00 = 0xE00C0C00; // type:data -D_E00C0C08 = 0xE00C0C08; // type:data -D_E00C0C10 = 0xE00C0C10; // type:data -D_E00C0C18 = 0xE00C0C18; // type:data -D_E00C2990 = 0xE00C2990; // type:data -D_E00C29A0 = 0xE00C29A0; // type:data -D_E00C49D0 = 0xE00C49D0; // type:data -D_E00C49D4 = 0xE00C49D4; // type:data -D_E00C49E8 = 0xE00C49E8; // type:data -D_E00C49FC = 0xE00C49FC; // type:data -D_E00C4A10 = 0xE00C4A10; // type:data -D_E00C4A90 = 0xE00C4A90; // type:data -D_E00C4A98 = 0xE00C4A98; // type:data -D_E00C6C90 = 0xE00C6C90; // type:data -D_E00C6C9C = 0xE00C6C9C; // type:data -D_E00C6CB0 = 0xE00C6CB0; // type:data -D_E00C6CB8 = 0xE00C6CB8; // type:data -D_E00C6CC0 = 0xE00C6CC0; // type:data -D_E00C6CC8 = 0xE00C6CC8; // type:data -D_E00C6CD0 = 0xE00C6CD0; // type:data -D_E00C6CD8 = 0xE00C6CD8; // type:data -D_E00C6CE0 = 0xE00C6CE0; // type:data -D_E00C6CE8 = 0xE00C6CE8; // type:data -D_E00C6CF0 = 0xE00C6CF0; // type:data -D_E00C8730 = 0xE00C8730; // type:data -D_E00C8738 = 0xE00C8738; // type:data -D_E00C8740 = 0xE00C8740; // type:data -D_E00CACB0 = 0xE00CACB0; // type:data -D_E00CACC0 = 0xE00CACC0; // type:data -D_E00CACC8 = 0xE00CACC8; // type:data -D_E00CACD0 = 0xE00CACD0; // type:data -D_E00CACD8 = 0xE00CACD8; // type:data -D_E00CCDD0 = 0xE00CCDD0; // type:data -D_E00CCDD8 = 0xE00CCDD8; // type:data -D_E00CCDE0 = 0xE00CCDE0; // type:data -D_E00CCDF0 = 0xE00CCDF0; // type:data -D_E00CCE04 = 0xE00CCE04; // type:data -D_E00CCE4C = 0xE00CCE4C; // type:data -D_E00CCE70 = 0xE00CCE70; // type:data -D_E00CCED0 = 0xE00CCED0; // type:data -D_E00CCED8 = 0xE00CCED8; // type:data -D_E00CCEE0 = 0xE00CCEE0; // type:data -D_E00CEE50 = 0xE00CEE50; // type:data -D_E00CEE58 = 0xE00CEE58; // type:data -D_E00CEE60 = 0xE00CEE60; // type:data -D_E00CEE68 = 0xE00CEE68; // type:data -D_E00D0B10 = 0xE00D0B10; // type:data -D_E00D0B20 = 0xE00D0B20; // type:data -D_E00D0B28 = 0xE00D0B28; // type:data -D_E00D0B30 = 0xE00D0B30; // type:data -D_E00D0B38 = 0xE00D0B38; // type:data -D_E00D0B40 = 0xE00D0B40; // type:data -D_E00D2500 = 0xE00D2500; // type:data -D_E00D2508 = 0xE00D2508; // type:data -D_E00D2510 = 0xE00D2510; // type:data -D_E00D2518 = 0xE00D2518; // type:data -D_E00D6E40 = 0xE00D6E40; // type:data -D_E00D6E74 = 0xE00D6E74; // type:data -D_E00D6E84 = 0xE00D6E84; // type:data -D_E00D6EA0 = 0xE00D6EA0; // type:data -D_E00D6EA8 = 0xE00D6EA8; // type:data -D_E00D6EB0 = 0xE00D6EB0; // type:data -D_E00D6EF0 = 0xE00D6EF0; // type:data -D_E00D6EF8 = 0xE00D6EF8; // type:data -D_E00D6F00 = 0xE00D6F00; // type:data -D_E00D6F08 = 0xE00D6F08; // type:data -D_E00DA500 = 0xE00DA500; // type:data -D_E00DA501 = 0xE00DA501; // type:data -D_E00DA502 = 0xE00DA502; // type:data -D_E00DA520 = 0xE00DA520; // type:data -D_E00DC640 = 0xE00DC640; // type:data -D_E00DC648 = 0xE00DC648; // type:data -D_E00DE810 = 0xE00DE810; // type:data -D_E00DE84C = 0xE00DE84C; // type:data -D_E00DE858 = 0xE00DE858; // type:data -D_E00DE8B4 = 0xE00DE8B4; // type:data -D_E00DE910 = 0xE00DE910; // type:data -D_E00DE96C = 0xE00DE96C; // type:data -D_E00DE9D0 = 0xE00DE9D0; // type:data -D_E00E0A40 = 0xE00E0A40; // type:data -D_E00E0A44 = 0xE00E0A44; // type:data -D_E00E0A48 = 0xE00E0A48; // type:data -D_E00E0AC0 = 0xE00E0AC0; // type:data -D_E00E0AC8 = 0xE00E0AC8; // type:data -D_E00E0AD0 = 0xE00E0AD0; // type:data -D_E00E0AD8 = 0xE00E0AD8; // type:data -D_E00E29F0 = 0xE00E29F0; // type:data -D_E00E29F4 = 0xE00E29F4; // type:data -D_E00E2A08 = 0xE00E2A08; // type:data -D_E00E2A1C = 0xE00E2A1C; // type:data -D_E00E2A30 = 0xE00E2A30; // type:data -D_E00E2A38 = 0xE00E2A38; // type:data -D_E00E4D90 = 0xE00E4D90; // type:data -D_E00E4DA8 = 0xE00E4DA8; // type:data -D_E00E4DC0 = 0xE00E4DC0; // type:data -D_E00E4DE0 = 0xE00E4DE0; // type:data -D_E00E4E00 = 0xE00E4E00; // type:data -D_E00E4E20 = 0xE00E4E20; // type:data -D_E00E4E28 = 0xE00E4E28; // type:data -D_E00E4E30 = 0xE00E4E30; // type:data -D_E00E4E38 = 0xE00E4E38; // type:data -D_E00E4E40 = 0xE00E4E40; // type:data -D_E00E4E48 = 0xE00E4E48; // type:data -D_E00E4E50 = 0xE00E4E50; // type:data -D_E00E4E58 = 0xE00E4E58; // type:data -D_E00E6880 = 0xE00E6880; // type:data -D_E00E6888 = 0xE00E6888; // type:data -D_E00E6890 = 0xE00E6890; // type:data -D_E00E6898 = 0xE00E6898; // type:data -D_E00E68F8 = 0xE00E68F8; // type:data -D_E00E6910 = 0xE00E6910; // type:data -D_E00E6970 = 0xE00E6970; // type:data -D_E00E6990 = 0xE00E6990; // type:data -D_E00E8630 = 0xE00E8630; // type:data -D_E00E8634 = 0xE00E8634; // type:data -D_E00EAA68 = 0xE00EAA68; // type:data -D_E00EAA70 = 0xE00EAA70; // type:data -D_E010ACCC = 0xE010ACCC; // type:data -D_E010AF68 = 0xE010AF68; // type:data -D_E010AF80 = 0xE010AF80; // type:data -D_E010AF84 = 0xE010AF84; // type:data -D_E010AF90 = 0xE010AF90; // type:data -D_E010AF98 = 0xE010AF98; // type:data -D_E010AFA0 = 0xE010AFA0; // type:data -D_E010AFA8 = 0xE010AFA8; // type:data -D_E010CA10 = 0xE010CA10; // type:data -D_E010CA14 = 0xE010CA14; // type:data -D_E010CA18 = 0xE010CA18; // type:data -D_E010CA38 = 0xE010CA38; // type:data -D_E010CA60 = 0xE010CA60; // type:data -D_E010CA68 = 0xE010CA68; // type:data -D_E010E750 = 0xE010E750; // type:data -D_E010E79C = 0xE010E79C; // type:data -D_E010E7D8 = 0xE010E7D8; // type:data -D_E010E7FC = 0xE010E7FC; // type:data -D_E010E838 = 0xE010E838; // type:data -D_E010E868 = 0xE010E868; // type:data -D_E01108B0 = 0xE01108B0; // type:data -D_E01108B4 = 0xE01108B4; // type:data -D_E01108C0 = 0xE01108C0; // type:data -D_E01108C8 = 0xE01108C8; // type:data -D_E0112630 = 0xE0112630; // type:data -D_E0112638 = 0xE0112638; // type:data -D_E0112640 = 0xE0112640; // type:data -D_E01146A0 = 0xE01146A0; // type:data -D_E0114718 = 0xE0114718; // type:data -D_E0114740 = 0xE0114740; // type:data -D_E0116C60 = 0xE0116C60; // type:data -D_E0116C64 = 0xE0116C64; // type:data -D_E0116C68 = 0xE0116C68; // type:data -D_E0116C6C = 0xE0116C6C; // type:data -D_E0116C70 = 0xE0116C70; // type:data -D_E0116C8C = 0xE0116C8C; // type:data -D_E0116CA4 = 0xE0116CA4; // type:data -D_E0116CF8 = 0xE0116CF8; // type:data -D_E0116D04 = 0xE0116D04; // type:data -D_E0116D08 = 0xE0116D08; // type:data -D_E0116D3B = 0xE0116D3B; // type:data -D_E0116D3C = 0xE0116D3C; // type:data -D_E0116D6B = 0xE0116D6B; // type:data -D_E0116D6C = 0xE0116D6C; // type:data -D_E0116D83 = 0xE0116D83; // type:data -D_E0116D90 = 0xE0116D90; // type:data -D_E0116DB0 = 0xE0116DB0; // type:data -D_E0116DB8 = 0xE0116DB8; // type:data -D_E01187B0 = 0xE01187B0; // type:data -D_E01187C0 = 0xE01187C0; // type:data -D_E01187D0 = 0xE01187D0; // type:data -D_E01187D8 = 0xE01187D8; // type:data -D_E01187E0 = 0xE01187E0; // type:data -D_E011AC20 = 0xE011AC20; // type:data -D_E011AC24 = 0xE011AC24; // type:data -D_E011AC4C = 0xE011AC4C; // type:data -D_E011AC58 = 0xE011AC58; // type:data -D_E011AC64 = 0xE011AC64; // type:data -D_E011C500 = 0xE011C500; // type:data -D_E011C514 = 0xE011C514; // type:data -D_E011C518 = 0xE011C518; // type:data -D_E011C52C = 0xE011C52C; // type:data -D_E011E7F0 = 0xE011E7F0; // type:data -D_E011E800 = 0xE011E800; // type:data -D_E011E810 = 0xE011E810; // type:data -D_E011E818 = 0xE011E818; // type:data -D_E011E820 = 0xE011E820; // type:data -D_E011E828 = 0xE011E828; // type:data -D_E0120780 = 0xE0120780; // type:data -D_E0120794 = 0xE0120794; // type:data -D_E01207A0 = 0xE01207A0; // type:data -D_E01207A8 = 0xE01207A8; // type:data -D_E0122B90 = 0xE0122B90; // type:data -D_E0122BA0 = 0xE0122BA0; // type:data -D_E0122BA4 = 0xE0122BA4; // type:data -D_E0122BA8 = 0xE0122BA8; // type:data -D_E0122C20 = 0xE0122C20; // type:data -D_E0122CA0 = 0xE0122CA0; // type:data -D_E0122CA8 = 0xE0122CA8; // type:data -D_E0122CB0 = 0xE0122CB0; // type:data -D_E0122CB8 = 0xE0122CB8; // type:data -D_E0122CC0 = 0xE0122CC0; // type:data -D_E0122CC8 = 0xE0122CC8; // type:data -D_E0122CD0 = 0xE0122CD0; // type:data -D_E0122CD8 = 0xE0122CD8; // type:data -D_E0122CE0 = 0xE0122CE0; // type:data -D_E0122CE8 = 0xE0122CE8; // type:data -D_E01248A0 = 0xE01248A0; // type:data -D_E01248C0 = 0xE01248C0; // type:data -D_E0124BC0 = 0xE0124BC0; // type:data -D_E0124BE4 = 0xE0124BE4; // type:data -D_E0124C00 = 0xE0124C00; // type:data -D_E0124C08 = 0xE0124C08; // type:data -D_E0124C10 = 0xE0124C10; // type:data -D_E0124C18 = 0xE0124C18; // type:data -D_E0124C20 = 0xE0124C20; // type:data -D_E0124C28 = 0xE0124C28; // type:data -D_E0126BC0 = 0xE0126BC0; // type:data -D_E0126BC4 = 0xE0126BC4; // type:data -D_E0126BC8 = 0xE0126BC8; // type:data -D_E0126BD0 = 0xE0126BD0; // type:data -D_E0126BD8 = 0xE0126BD8; // type:data -D_E0126BE0 = 0xE0126BE0; // type:data -D_E0126BE8 = 0xE0126BE8; // type:data -D_E0126BF0 = 0xE0126BF0; // type:data -D_E0126BF8 = 0xE0126BF8; // type:data -D_E0126C00 = 0xE0126C00; // type:data -D_E0126C08 = 0xE0126C08; // type:data -D_E0126C10 = 0xE0126C10; // type:data -D_E0126C18 = 0xE0126C18; // type:data -D_E0126C20 = 0xE0126C20; // type:data -D_E0126C28 = 0xE0126C28; // type:data -D_E0126C30 = 0xE0126C30; // type:data -D_E0126C38 = 0xE0126C38; // type:data -D_E0200000 = 0xE0200000; // type:data -D_E0200694 = 0xE0200694; // type:data -D_E0200698 = 0xE0200698; // type:data -D_E020069C = 0xE020069C; // type:data -D_E02006A0 = 0xE02006A0; // type:data -D_E02006A4 = 0xE02006A4; // type:data -D_E02006A8 = 0xE02006A8; // type:data -D_E02006AC = 0xE02006AC; // type:data -D_E02006B0 = 0xE02006B0; // type:data -D_E02006B4 = 0xE02006B4; // type:data -D_E02006B8 = 0xE02006B8; // type:data -D_E02006BC = 0xE02006BC; // type:data -D_E02006C0 = 0xE02006C0; // type:data -D_E02006C4 = 0xE02006C4; // type:data -D_E02006C8 = 0xE02006C8; // type:data -D_E02006CC = 0xE02006CC; // type:data -D_E02006D0 = 0xE02006D0; // type:data -D_E02006D4 = 0xE02006D4; // type:data -D_E02006D8 = 0xE02006D8; // type:data -D_E02006DC = 0xE02006DC; // type:data -D_E02006E0 = 0xE02006E0; // type:data -D_E02006E4 = 0xE02006E4; // type:data -D_E02006E8 = 0xE02006E8; // type:data -D_E02006EC = 0xE02006EC; // type:data -D_E02006F0 = 0xE02006F0; // type:data -D_E02006F4 = 0xE02006F4; // type:data -D_E02006F8 = 0xE02006F8; // type:data -D_E02006FC = 0xE02006FC; // type:data -D_E0200700 = 0xE0200700; // type:data -D_E0200704 = 0xE0200704; // type:data -D_E0200708 = 0xE0200708; // type:data -D_E020070C = 0xE020070C; // type:data -D_E0200710 = 0xE0200710; // type:data -D_E0200714 = 0xE0200714; // type:data -D_E0200718 = 0xE0200718; // type:data -D_E020071C = 0xE020071C; // type:data -D_E0200720 = 0xE0200720; // type:data -D_E0200724 = 0xE0200724; // type:data -D_E0200728 = 0xE0200728; // type:data -D_E020072C = 0xE020072C; // type:data -D_E0200730 = 0xE0200730; // type:data -D_E7000008 = 0xE7000008; // type:data -D_E8000008 = 0xE8000008; // type:data -D_F0000008 = 0xF0000008; // type:data -D_F5000007 = 0xF5000007; // type:data -D_F79DDD0F = 0xF79DDD0F; // type:data -D_FA000028 = 0xFA000028; // type:data -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 @@ -28014,7 +27272,6 @@ dead_guMtxIdentF = 0x8006C660; // type:data dead:yes dead_guMtxCatF = 0x8006C7C0; // type:data dead:yes dead_playFX_11 = 0x80075170; // type:func dead:yes dead_gGameStatusPtr = 0x80079430; // type:data dead:yes -D_80079540 = 0x80079540; // type:data dead:yes dead_gCurrentCameraID = 0x8007C760; // type:data dead:yes dead_gItemTable = 0x8008D2C0; // type:data dead:true dead_gItemTable = 0x8008D2C0; // type:data dead:yes diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 112caec45d..89c57a3227 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -1,34 +1,10 @@ -// Likely fake -D_A0000000 = 0xA0000000; -D_A4000000 = 0xA4000000; -D_A4000768 = 0xA4000768; -D_A4001000 = 0xA4001000; -D_A4040010 = 0xA4040010; -D_A4300000 = 0xA4300000; -D_A4300004 = 0xA4300004; -D_A4300008 = 0xA4300008; -D_A430000C = 0xA430000C; -D_A4400010 = 0xA4400010; -D_A450000C = 0xA450000C; -D_A4600004 = 0xA4600004; -D_A460000C = 0xA460000C; -D_A4600010 = 0xA4600010; -D_A4700000 = 0xA4700000; -D_A4700010 = 0xA4700010; -D_A4800018 = 0xA4800018; -D_A6000000 = 0xA6000000; -D_B0000000 = 0xB0000000; -D_B0000008 = 0xB0000008; -D_B0000010 = 0xB0000010; + +// fake? D_E7000008 = 0xE7000008; D_E8000008 = 0xE8000008; D_F0000008 = 0xF0000008; D_F5000007 = 0xF5000007; -D_FA000028 = 0xFA000028; D_FD100008 = 0xFD100008; -__osExceptionPreamble = 0x8006A9F0; -D_80095910 = 0x80095910; -D_80095938 = 0x80095938; // Obfuscation symbols obfuscated_battle_heap_create = battle_heap_create - 0xFEFFFFF; @@ -75,155 +51,12 @@ D_09004600 = 0x09004600; // effect_spirit_card D_090042E0 = 0x090042E0; +// hacks for various things fx_sun_undeclared = fx_sun; +EntityModel_Spring_ReboundAnim = 0x1E4; D_E007EC2F = 0xE007EC2F; -// Invalid pointers from dead code -dead_atan2 = 0x8002AF70; -dead_gCurrentCamID = 0x800A158C; -dead_gCameras = 0x800B8D80; -dead_wPartnerHudScripts = 0x80100060; -dead_wDisabledPartnerHudScripts = 0x801000A0; -dead_evt_get_variable = 0x802D4E8C; -dead_evt_set_variable = 0x802D5468; -dead_evt_get_float_variable = 0x802D57FC; -dead_sin_rad = 0x8002B45C; -dead_cos_rad = 0x8002B4C0; -dead_evt_set_float_variable = 0x802D5A10; -dead_fx_sparkles = 0x80075170; -dead_gPlayerStatusPtr = 0x800FFC90; -dead_set_main_pan_u = 0x80126064; -dead_set_main_pan_v = 0x8012607C; -dead_set_aux_pan_u = 0x80126094; -dead_set_aux_pan_v = 0x801260AC; -dead_get_npc_unsafe = 0x8003E4BC; -dead_fx_emote = 0x80075110; -dead_get_enemy = 0x80042AF4; -dead_dist2D = 0x8002B1C4; -dead_get_clamped_angle_diff = 0x8002AF18; -dead_clamp_angle = 0x8002AE14; -dead_add_vec2D_polar = 0x8002B28C; -dead_ai_enemy_play_sound = 0x8004D800; -dead_basic_ai_wander_init = 0x8004D9C0; -dead_basic_ai_wander = 0x8004DAD8; -dead_basic_ai_loiter_init = 0x8004DF64; -dead_basic_ai_loiter = 0x8004E024; -dead_basic_ai_found_player_jump_init = 0x8004E25C; -dead_basic_ai_found_player_jump = 0x8004E2EC; -dead_basic_ai_chase_init = 0x8004E39C; -dead_basic_ai_chase = 0x8004E544; -dead_basic_ai_lose_player = 0x8004E808; -dead_basic_ai_suspend = 0x8004EB8C; -dead_basic_ai_check_player_dist = 0x8004D1A4; -dead_npc_move_heading = 0x8003E424; -dead_sqrtf = 0x80067040; -dead_npc_test_move_simple_with_slipping = 0x800E5304; -dead_npc_raycast_down_sides = 0x800E423C; -dead_is_point_within_region = 0x8004D0C4; -func_8004D8E0 = 0x8004D8E0; -dead_rand_int = 0x8002ACEC; -dead_get_npc_safe = 0x8003E534; -dead_heap_malloc = 0x8002BFD4; -dead_heap_free = 0x8002C01C; -dead_general_heap_malloc = 0x8002BF18; -dead_heap_free = 0x8002C01C; -dead_sin_deg = 0x8002B5DC; -dead_cos_deg = 0x8002B640; -dead_sin_cos_deg = 0x8002B524; -dead_subtract_hp = 0x800F1EF8; -dead_sfx_adjust_env_sound_pos = 0x8015704C; -dead_fx_star_spirits_energy = 0x80077C30; -dead_update_lerp = 0x8002B6A4; -dead_fx_spirit_card = 0x80077930; -dead_create_shadow_type = 0x8011AAB4; -dead_dist3D = 0x8002B21C; -dead_LoadPath = 0x802E2A80; -dead_GetNextPathPos = 0x802E2B74; -dead_queue_render_task = 0x80128510; -dead_create_generic_entity_world = 0x8012DFE8; -dead_dma_copy = 0x8002AA2C; -func_80059AC8 = 0x80059AC8; -dead_get_entity_by_index = 0x80118BB0; -dead_fx_sun = 0x80077BD0; -dead_fx_sun_undeclared = dead_fx_sun; -dead_func_8003D660 = 0x80041080; -dead_set_max_SP = 0x800F1D9C; -dead_sync_status_menu = 0x800F1730; -dead_get_npc_by_index = 0x8003C43C; -dead_increment_status_menu_disabled = 0x800F1718; -dead_decrement_status_menu_disabled = 0x800F16F4; -dead_get_model_list_index_from_tree_index = 0x80125270; -dead_get_model_from_list_index = 0x80124F44; -dead_guTranslateF = 0x8006CAC0; -dead_fx_misc_particles = 0x800775D0; -dead_entity_upgrade_block_hide_content = 0x802F3B00; -dead_create_popup_menu = 0x800FCD0C; -dead_hide_popup_menu = 0x800F9260; -dead_destroy_popup_menu = 0x800F93E8; -dead_switch_to_partner = 0x800F2D5C; -dead_set_message_msg = 0x80130C74; -dead_fx_energy_orb_wave = 0x800769D0; -dead_fx_radial_shimmer = 0x80075E30; -dead_set_screen_overlay_color = 0x80144200; -dead_set_screen_overlay_params_front = 0x80144178; -dead_npc_test_move_simple_without_slipping = 0x800E53AC; -dead_get_item_entity = 0x8013CF98; -func_80066FE0 = 0x80066FE0; -func_8002A910 = 0x8002A910; -dead_get_current_map_settings = 0x8005F128; -dead_partner_clear_player_tracking = 0x800F7278; -func_800F2E98 = 0x800F2E98; -dead_set_npc_yaw = 0x8003ED50; -dead_disable_npc_shadow = 0x8003E5E8; -dead_get_screen_coords = 0x8002FCBC; -dead_sfx_get_spatialized_sound_params = 0x801574DC; -dead_sfx_play_sound_with_params = 0x80157118; -dead_load_asset_by_name = 0x8005F238; -dead_decode_yay0 = 0x80074070; -dead_general_heap_free = 0x8002BF68; -dead_set_message_images = 0x80130C64; -func_8002B45C = 0x8002B45C; -func_801266F8 = 0x801266F8; -func_80126734 = 0x80126734; -dead_set_screen_overlay_params_back = 0x80144194; -dead_gItemTable = 0x8008D2C0; -dead_gPlayerStatus = 0x80117578; -dead_gPlayerActionState = 0x8011762C; -dead_gPartnerActionStatus = 0x80117160; -dead_80117163 = 0x80117160; -dead_gPlayerData = 0x80117840; -dead_gCollisionStatus = 0x80169B10; -dead_gOverrideFlags = 0x800A15A8; -dead_fx_motion_blur_flame = 0x80076970; -D_800A15C4 = 0x800A15C4; -D_800A15CC = 0x800A15CC; -dead_gCurrentEncounter = 0x800B7EF0; -D_800B8DEC = 0x800B8DEC; -dead_guMtxIdentF = 0x8006C660; -dead_guMtxCatF = 0x8006C7C0; -D_80248380 = 0x80248380; -D_8024854C = 0x8024854C; -D_80246894 = 0x80246894; -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; -dead_guMtxF2L = 0x8006C6C0; -dead_mdl_get_copied_vertices = 0x801266F8; -dead_mdl_get_copied_gfx = 0x80126734; -dead_gMatrixListPos = 0x80079540; -dead_gDisplayContext = 0x800A15CC; - -// TODO below - -D_8024F470_hos_bss = 0x8024F470; // ??? is this real - // misc unsorted osTvType = 0x80000300; osRomBase = 0x80000308; @@ -245,36 +78,24 @@ heap_collisionHead = 0x80268000; heap_generalHead = 0x802FB800; gSpriteHeapPtr = 0x8034F800; heap_battleHead = 0x803DA800; +D_8038F800 = 0x8038F800; +D_803B5000 = 0x803B5000; D_80210000 = 0x80210000; func_80242040_8B20B0 = 0x80242040; -spiked_goomba = 0x8021B0AC; -paragoomba = 0x8021CD00; -dead_03_D_802442D0 = 0x802442D0; D_802AB513 = 0x802AB513; -D_80247AF0_CCB300 = 0x80247AF0; -D_802491C0_CA70E0 = 0x802491C0; D_80246568_C8C018 = 0x80246568; sam_02_Quizmo_AnswerResult = 0x8024B9A8; sam_02_Quizmo_StageEffect = 0x8024B9B0; -sbk_34_802427E0 = 0x802427E0; pra_13_802438E8 = 0x802438E8; -D_8038F800 = 0x8038F800; -D_803B5000 = 0x803B5000; D_802EF0D0 = 0x802EF0D0; -D_800FBB60 = 0x800FBB60; -D_800FBBE0 = 0x800FBBE0; - -D_80164000 = 0x80164000; // display contexts, part of bss3 b_area_kzn2_VineData = 0x8022ADD0; b_area_kzn2_VineRenderState = 0x8022B550; D_80232C4C = 0x80232C4C; D_80235E00 = 0x80235E00; -D_80235E6C_4CF05C = 0x80235E6C; -D_80235F44_4CF134 = 0x80235F44; D_8023BD98 = 0x8023BD98; D_8023BDB4 = 0x8023BDB4; D_8023BDB8 = 0x8023BDB8; @@ -356,7 +177,6 @@ D_802440FC = 0x802440FC; D_802440FF = 0x802440FF; D_80244100 = 0x80244100; D_80244104 = 0x80244104; -dead_03_D_802442D0 = 0x802442D0; D_802447C0 = 0x802447C0; D_80244A20 = 0x80244A20; sbk_30_D_80244C18 = 0x80244C18; @@ -387,10 +207,8 @@ D_802459C0 = 0x802459C0; D_80245AB4 = 0x80245AB4; kkj_19_D_802461F0 = 0x802461F0; hos_06_D_80246260 = 0x80246260; -dead_flo_08_ItemChoiceList = 0x802462F0; D_80246300 = 0x80246300; D_80246424 = 0x80246424; -dead_flo_08_FlowerGuard_ItemChoiceList = 0x80246460; D_8024652C = 0x8024652C; D_80246530 = 0x80246530; D_80246534 = 0x80246534; @@ -402,11 +220,7 @@ D_8024659C = 0x8024659C; D_802465A0 = 0x802465A0; D_802465CC = 0x802465CC; D_802465F0 = 0x802465F0; -dead_kzn_17_D_802466D0 = 0x802466D0; D_80246794 = 0x80246794; -dead_03_LetterDelivery_SavedNpcAnim = 0x80244494; -dead_kzn_19_LetterDelivery_SavedNpcAnim = 0x8024854C; -dead_kzn_17_LetterDelivery_SavedNpcAnim = 0x80246894; kmr_02_LetterDelivery_SavedNpcAnim = 0x8025811C; osr_01_LetterDelivery_SavedNpcAnim = 0x80242344; hos_06_LetterDelivery_SavedNpcAnim = 0x80246424; @@ -424,6 +238,19 @@ D_80243370 = 0x80243370; D_80246990 = 0x80246990; D_80246BE8 = 0x80246BE8; D_80247050 = 0x80247050; +D_80247BB8_pra_19 = 0x80247BB8; +pra_01_80243178 = 0x80243178; +D_80246538_kkj_19 = 0x80246538; +D_80246550_kkj_19 = 0x80246550; +D_80246558_kkj_19 = 0x80246558; +D_80246560_kkj_19 = 0x80246560; +D_802463B8_kkj_19 = 0x802463B8; +D_80243390_omo_12 = 0x80243390; +osr_00_802437C0 = 0x802437C0; +sam_04_80245210 = 0x80245210; +D_80243380 = 0x80243380; +obk_01_802458F0 = 0x802458F0; +omo_13_80243220 = 0x80243220; D_80247120 = 0x80247120; D_802474A0 = 0x802474A0; D_80247548 = 0x80247548; @@ -435,7 +262,6 @@ D_80247CA0 = 0x80247CA0; D_80247CB4 = 0x80247CB4; D_80247D00 = 0x80247D00; D_80247E68 = 0x80247E68; -dead_kzn_19_D_80248388 = 0x80248388; D_802483C0 = 0x802483C0; D_802483C4 = 0x802483C4; D_802483D0 = 0x802483D0; @@ -496,7 +322,6 @@ mac_02_D_8024E738 = 0x8024E738; end_00_CreditsData = 0x8024E960; sbk_30_D_80244A50 = 0x80244A50; kkj_18_D_80244CB0 = 0x80244CB0; -dead_flo_12_D_802429E0 = 0x802429E0; D_8024EA10 = 0x8024EA10; D_8024EA14 = 0x8024EA14; mac_02_LetterDelivery_SavedNpcAnim = 0x8024EA18; @@ -509,12 +334,6 @@ D_8024EFCC = 0x8024EFCC; D_8024F010 = 0x8024F010; dro_02_KeyItemChoiceList = 0x8024F080; ItemChoiceList = 0x8024F248; -D_8024F2A0 = 0x8024F2A0; -D_8024F2A1 = 0x8024F2A1; -D_8024F2A2 = 0x8024F2A2; -D_8024F2A3 = 0x8024F2A3; -D_8024F2A4 = 0x8024F2A4; -D_8024F2A5 = 0x8024F2A5; D_8024F2A8 = 0x8024F2A8; D_8024F2AB = 0x8024F2AB; D_8024F2AC = 0x8024F2AC; @@ -556,26 +375,7 @@ D_8024F498 = 0x8024F498; D_8024F4E8 = 0x8024F4E8; D_8024F570 = 0x8024F570; mac_04_Quizmo_StageEffect = 0x8024F5C0; -D_8024F581 = 0x8024F581; -D_8024F582 = 0x8024F582; -D_8024F583 = 0x8024F583; -D_8024F584 = 0x8024F584; -D_8024F585 = 0x8024F585; -D_8024F588 = 0x8024F588; -D_8024F58B = 0x8024F58B; -D_8024F58C = 0x8024F58C; -D_8024F58F = 0x8024F58F; -D_8024F590 = 0x8024F590; -D_8024F593 = 0x8024F593; -D_8024F594 = 0x8024F594; -D_8024F597 = 0x8024F597; -D_8024F598 = 0x8024F598; -D_8024F59B = 0x8024F59B; -D_8024F59C = 0x8024F59C; -D_8024F59F = 0x8024F59F; -D_8024F5A4 = 0x8024F5A4; mac_04_Quizmo_Worker = 0x8024F5A0; -D_8024F5A4 = 0x8024F5A4; mac_04_Quizmo_AnswerResult = 0x8024F5B8; // type:data mac_04_Quizmo_AudienceEffect = 0x8024F5C4; mac_04_Quizmo_VannaTEffect = 0x8024F5C8; @@ -680,19 +480,12 @@ mac_01_D_80262A70 = 0x80262A70; mac_01_LetterDelivery_SavedNpcAnim = 0x80262C34; D_80262C38 = 0x80262C38; D_80262F68 = 0x80262F68; -trd_06_802451F0 = 0x802451F0; -// more bss for 16c8e0's segment -gActionCommandStatus = 0x8029FBE0; +// Unsolved BSS Mysteries +gActionCommandStatus = 0x8029FBE0; // more bss for 16c8e0's segment +D_80164000 = 0x80164000; // display contexts, part of bss3 -D_802A19B0 = 0x802A19B0; -D_802A19C0 = 0x802A19C0; -D_802A1A90 = 0x802A1A90; -D_802A1AC0 = 0x802A1AC0; -D_802A1B40 = 0x802A1B40; -D_802A1CD0 = 0x802A1CD0; -D_802A1CD4 = 0x802A1CD4; -D_802A21F0 = 0x802A21F0; +// battle/item BSS D_802A25C8 = 0x802A25C8; D_802A25E4 = 0x802A25E4; D_802A25E8 = 0x802A25E8; @@ -711,9 +504,6 @@ D_802A2DF4 = 0x802A2DF4; D_802A2DF8 = 0x802A2DF8; D_802A2DFC = 0x802A2DFC; D_802A2E00 = 0x802A2E00; -D_802A37F0 = 0x802A37F0; -D_802A37F8 = 0x802A37F8; -D_802A3818 = 0x802A3818; D_802A3834 = 0x802A3834; D_802A3838 = 0x802A3838; D_802A3F58 = 0x802A3F58; @@ -727,35 +517,178 @@ D_802A9920 = 0x802A9920; D_802A9B00 = 0x802A9B00; D_802B6E90_E2A300 = 0x802B6E90; +D_8024F470_hos_bss = 0x8024F470; // ??? is this real + mdl_clearRenderTasks = 0x802B7E00; -D_802C0000 = 0x802C0000; -D_80247BB8_pra_19 = 0x80247BB8; -pra_01_80243178 = 0x80243178; -D_802312E0_battle_area_omo2 = 0x802312E0; -D_802312F8_battle_area_omo2 = 0x802312F8; -some_80241FBC = 0x80241FBC; -D_802463B8_kkj_19 = 0x802463B8; -D_80246538_kkj_19 = 0x80246538; -D_80246558_kkj_19 = 0x80246558; -D_80246550_kkj_19 = 0x80246550; -D_80246560_kkj_19 = 0x80246560; -end_01_CreditsProjMatrices = 0x8024B9D0; -end_01_CreditsDataPtr = 0x8024A2C4; -D_80242568_filemenu = 0x80242568; -D_80243390_omo_12 = 0x80243390; -D_8024F580_hos_05 = 0x8024F580; -osr_00_802437C0 = 0x802437C0; -mim_03_802424E0 = 0x802424E0; -sam_04_80245210 = 0x80245210; -D_80243380 = 0x80243380; -obk_01_802458F0 = 0x802458F0; -omo_13_80243220 = 0x80243220; +// boot / os stuff +D_A0000000 = 0xA0000000; +D_A4000000 = 0xA4000000; +D_A4000768 = 0xA4000768; +D_A4001000 = 0xA4001000; +D_A4040010 = 0xA4040010; +D_A4300000 = 0xA4300000; +D_A4300004 = 0xA4300004; +D_A4300008 = 0xA4300008; +D_A430000C = 0xA430000C; +D_A4400010 = 0xA4400010; +D_A450000C = 0xA450000C; +D_A4600004 = 0xA4600004; +D_A460000C = 0xA460000C; +D_A4600010 = 0xA4600010; +D_A4700000 = 0xA4700000; +D_A4700010 = 0xA4700010; +D_A4800018 = 0xA4800018; +D_A6000000 = 0xA6000000; +D_B0000000 = 0xB0000000; +D_B0000008 = 0xB0000008; +D_B0000010 = 0xB0000010; +__osExceptionPreamble = 0x8006A9F0; +D_80095910 = 0x80095910; +D_80095938 = 0x80095938; -// incorrectly-identified vtx addresses for tst_13 -D_802423D0 = 0x802423D0; -D_80242310 = 0x80242310; -flo_23_ConsumableChoiceList = 0x802426E0; -kmr_04_80243770 = 0x80243770; +// BSS / unhandled data splits in dead code +D_800A15C4 = 0x800A15C4; +D_800B8DEC = 0x800B8DEC; +D_80248380 = 0x80248380; -EntityModel_Spring_ReboundAnim = 0x1E4; +// Invalid pointers from dead code +dead_atan2 = 0x8002AF70; +dead_gCurrentCamID = 0x800A158C; +dead_gCameras = 0x800B8D80; +dead_wPartnerHudScripts = 0x80100060; +dead_wDisabledPartnerHudScripts = 0x801000A0; +dead_evt_get_variable = 0x802D4E8C; +dead_evt_set_variable = 0x802D5468; +dead_evt_get_float_variable = 0x802D57FC; +dead_sin_rad = 0x8002B45C; +dead_cos_rad = 0x8002B4C0; +dead_evt_set_float_variable = 0x802D5A10; +dead_fx_sparkles = 0x80075170; +dead_gPlayerStatusPtr = 0x800FFC90; +dead_set_main_pan_u = 0x80126064; +dead_set_main_pan_v = 0x8012607C; +dead_set_aux_pan_u = 0x80126094; +dead_set_aux_pan_v = 0x801260AC; +dead_get_npc_unsafe = 0x8003E4BC; +dead_fx_emote = 0x80075110; +dead_get_enemy = 0x80042AF4; +dead_dist2D = 0x8002B1C4; +dead_get_clamped_angle_diff = 0x8002AF18; +dead_clamp_angle = 0x8002AE14; +dead_add_vec2D_polar = 0x8002B28C; +dead_ai_enemy_play_sound = 0x8004D800; +dead_basic_ai_wander_init = 0x8004D9C0; +dead_basic_ai_wander = 0x8004DAD8; +dead_basic_ai_loiter_init = 0x8004DF64; +dead_basic_ai_loiter = 0x8004E024; +dead_basic_ai_found_player_jump_init = 0x8004E25C; +dead_basic_ai_found_player_jump = 0x8004E2EC; +dead_basic_ai_chase_init = 0x8004E39C; +dead_basic_ai_chase = 0x8004E544; +dead_basic_ai_lose_player = 0x8004E808; +dead_basic_ai_suspend = 0x8004EB8C; +dead_basic_ai_check_player_dist = 0x8004D1A4; +dead_npc_move_heading = 0x8003E424; +dead_sqrtf = 0x80067040; +dead_npc_test_move_simple_with_slipping = 0x800E5304; +dead_npc_raycast_down_sides = 0x800E423C; +dead_is_point_within_region = 0x8004D0C4; +dead_rand_int = 0x8002ACEC; +dead_get_npc_safe = 0x8003E534; +dead_heap_malloc = 0x8002BFD4; +dead_heap_free = 0x8002C01C; +dead_general_heap_malloc = 0x8002BF18; +dead_heap_free = 0x8002C01C; +dead_sin_deg = 0x8002B5DC; +dead_cos_deg = 0x8002B640; +dead_sin_cos_deg = 0x8002B524; +dead_subtract_hp = 0x800F1EF8; +dead_sfx_adjust_env_sound_pos = 0x8015704C; +dead_fx_star_spirits_energy = 0x80077C30; +dead_update_lerp = 0x8002B6A4; +dead_fx_spirit_card = 0x80077930; +dead_create_shadow_type = 0x8011AAB4; +dead_dist3D = 0x8002B21C; +dead_LoadPath = 0x802E2A80; +dead_GetNextPathPos = 0x802E2B74; +dead_queue_render_task = 0x80128510; +dead_create_generic_entity_world = 0x8012DFE8; +dead_dma_copy = 0x8002AA2C; +dead_get_entity_by_index = 0x80118BB0; +dead_fx_sun = 0x80077BD0; +dead_fx_sun_undeclared = dead_fx_sun; +dead_func_8003D660 = 0x80041080; +dead_set_max_SP = 0x800F1D9C; +dead_sync_status_menu = 0x800F1730; +dead_get_npc_by_index = 0x8003C43C; +dead_increment_status_menu_disabled = 0x800F1718; +dead_decrement_status_menu_disabled = 0x800F16F4; +dead_get_model_list_index_from_tree_index = 0x80125270; +dead_get_model_from_list_index = 0x80124F44; +dead_guTranslateF = 0x8006CAC0; +dead_fx_misc_particles = 0x800775D0; +dead_entity_upgrade_block_hide_content = 0x802F3B00; +dead_create_popup_menu = 0x800FCD0C; +dead_hide_popup_menu = 0x800F9260; +dead_destroy_popup_menu = 0x800F93E8; +dead_switch_to_partner = 0x800F2D5C; +dead_set_message_msg = 0x80130C74; +dead_fx_energy_orb_wave = 0x800769D0; +dead_fx_radial_shimmer = 0x80075E30; +dead_set_screen_overlay_color = 0x80144200; +dead_set_screen_overlay_params_front = 0x80144178; +dead_npc_test_move_simple_without_slipping = 0x800E53AC; +dead_get_item_entity = 0x8013CF98; +dead_get_current_map_settings = 0x8005F128; +dead_partner_clear_player_tracking = 0x800F7278; +dead_set_npc_yaw = 0x8003ED50; +dead_disable_npc_shadow = 0x8003E5E8; +dead_get_screen_coords = 0x8002FCBC; +dead_sfx_get_spatialized_sound_params = 0x801574DC; +dead_sfx_play_sound_with_params = 0x80157118; +dead_load_asset_by_name = 0x8005F238; +dead_decode_yay0 = 0x80074070; +dead_general_heap_free = 0x8002BF68; +dead_set_message_images = 0x80130C64; +dead_set_screen_overlay_params_back = 0x80144194; +dead_gItemTable = 0x8008D2C0; +dead_gPlayerStatus = 0x80117578; +dead_gPlayerActionState = 0x8011762C; +dead_gPartnerActionStatus = 0x80117160; +dead_80117163 = 0x80117160; +dead_gPlayerData = 0x80117840; +dead_gCollisionStatus = 0x80169B10; +dead_gOverrideFlags = 0x800A15A8; +dead_fx_motion_blur_flame = 0x80076970; +dead_gCurrentEncounter = 0x800B7EF0; +dead_guMtxIdentF = 0x8006C660; +dead_guMtxCatF = 0x8006C7C0; +dead_gCurrentCameraID = 0x8007C760; +dead_gGameStatusPtr = 0x80079430; +dead_gPartnerPopupProperties = 0x80094900; +dead_nuGfxZBuffer = 0x800A1530; +dead_osVirtualToPhysical = 0x80066FE0; +dead_transform_point = 0x8002A910; +dead_gMasterGfxPos = 0x800A15C4; +dead_nuGfxCfb_ptr = 0x800A15A4; +dead_guMtxF2L = 0x8006C6C0; +dead_mdl_get_copied_vertices = 0x801266F8; +dead_mdl_get_copied_gfx = 0x80126734; +dead_gMatrixListPos = 0x80079540; +dead_gDisplayContext = 0x800A15CC; +dead_03_D_802442D0 = 0x802442D0; +dead_03_LetterDelivery_SavedNpcAnim = 0x80244494; +dead_flo_08_ItemChoiceList = 0x802462F0; +dead_flo_08_FlowerGuard_ItemChoiceList = 0x80246460; +dead_flo_12_D_802429E0 = 0x802429E0; +dead_kzn_17_D_802466D0 = 0x802466D0; +dead_kzn_17_LetterDelivery_SavedNpcAnim = 0x80246894; +dead_kzn_19_D_80248388 = 0x80248388; +dead_kzn_19_LetterDelivery_SavedNpcAnim = 0x8024854C; +func_8002B45C = 0x8002B45C; +func_801266F8 = 0x801266F8; +func_80126734 = 0x80126734; +func_800F2E98 = 0x800F2E98; +func_8004D8E0 = 0x8004D8E0; +func_80059AC8 = 0x80059AC8;