pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Effect work and rodata migration (#747)

Browse Source 
* bombette_breaking WIP

* bombette_breaking

* migration & stuff

* spr funcs

* btl_state_update_begin_turn

* beginning effect data work

* effect rodata migration

* fix

* fixin

* breaking_junk

* args

* handle gfx

* trim yaml

* yaml cleanup

* gfx stuff

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "b681843a78"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "b681843a78"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* water_splash gfx

* move decl down

* fix warnings
This commit is contained in:
Ethan Roseman 2022-08-11 00:29:06 +09:00 committed by GitHub
parent f4efd09c80
commit ded1be2b17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
226 changed files with 2744 additions and 3419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/effects.h
View File

@ -239,7 +239,7 @@ typedef struct FlowerFXData {
typedef struct CloudPuffFXData { typedef struct CloudPuffFXData {
/* 0x00 */ s32 alive; /* 0x00 */ s32 alive;
/* 0x04 */ char unk_04[0x2]; /* 0x04 */ char unk_04[0x2];
/* 0x06 */ s16 lifetime; /* 0x06 */ s16 timeLeft;
/* 0x08 */ u8 alpha; /* 0x08 */ u8 alpha;
/* 0x09 */ char unk_09[0x3]; /* 0x09 */ char unk_09[0x3];
/* 0x0C */ f32 unk_0C; /* 0x0C */ f32 unk_0C;
@ -332,9 +332,7 @@ typedef struct FloatingFlowerFXData {
} FloatingFlowerFXData; // size = 0x48 } FloatingFlowerFXData; // size = 0x48
typedef struct SnowflakeFXData { typedef struct SnowflakeFXData {
/* 0x00 */ f32 xPos; /* 0x00 */ Vec3f pos;
/* 0x04 */ f32 yPos;
/* 0x08 */ f32 zPos;
/* 0x0C */ f32 unk_0C; /* 0x0C */ f32 unk_0C;
/* 0x10 */ f32 unk_10; /* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14; /* 0x14 */ f32 unk_14;
@ -641,8 +639,8 @@ typedef struct FireBreathFXData {
/* 0x38 */ f32 scale; /* 0x38 */ f32 scale;
/* 0x3C */ f32 scaleChangeFactor; /* 0x3C */ f32 scaleChangeFactor;
/* 0x40 */ s32 alpha; /* 0x40 */ s32 alpha;
/* 0x44 */ s32 maxLifetime; /* 0x44 */ s32 lifeTime;
/* 0x48 */ s32 lifetime; /* 0x48 */ s32 timeLeft;
/* 0x4C */ s32 spawnTimer; /* 0x4C */ s32 spawnTimer;
/* 0x50 */ Vec3f unk_50; /* 0x50 */ Vec3f unk_50;
/* 0x5C */ f32 unk_5C; /* 0x5C */ f32 unk_5C;
@ -766,8 +764,20 @@ typedef struct DisableXFXData {
} DisableXFXData; // size = 0x48 } DisableXFXData; // size = 0x48
typedef struct BombetteBreakingFXData { typedef struct BombetteBreakingFXData {
/* 0x00 */ char todo[0]; /* 0x00 */ s16 type;
} BombetteBreakingFXData; // size = unknown /* 0x02 */ s16 treeIndex;
/* 0x04 */ f32 unk_04;
/* 0x08 */ Vec3f center;
/* 0x14 */ Vec3f unk_14;
/* 0x20 */ Vec3f unk_20;
/* 0x2C */ Vec3f unk_2C;
/* 0x38 */ f32 unk_38;
/* 0x3C */ f32 unk_3C;
/* 0x40 */ f32 unk_40;
/* 0x44 */ s32 timeLeft;
/* 0x48 */ s32 unk_48;
/* 0x4C */ s32 alpha;
} BombetteBreakingFXData;
typedef struct FireworkFXData { typedef struct FireworkFXData {
/* 0x00 */ char todo[0]; /* 0x00 */ char todo[0];
@ -1240,7 +1250,21 @@ typedef struct SomethingRotatingFXData {
} SomethingRotatingFXData; // size = unknown } SomethingRotatingFXData; // size = unknown
typedef struct BreakingJunkFXData { typedef struct BreakingJunkFXData {
/* 0x00 */ char todo[0]; /* 0x00 */ s32 unk_00;
/* 0x04 */ Vec3f pos;
/* 0x10 */ Vec3f vel;
/* 0x1C */ s32 timeLeft;
/* 0x20 */ s32 lifeTime;
/* 0x24 */ f32 scale;
/* 0x28 */ f32 rot;
/* 0x2C */ s16 primR;
/* 0x2E */ s16 primG;
/* 0x30 */ s16 primB;
/* 0x32 */ s16 primA;
/* 0x34 */ s16 envR;
/* 0x36 */ s16 envG;
/* 0x38 */ s16 envB;
/* 0x3A */ s16 envA;
} BreakingJunkFXData; // size = unknown } BreakingJunkFXData; // size = unknown
typedef struct PartnerBuffFXData { typedef struct PartnerBuffFXData {
@ -1470,8 +1494,8 @@ typedef struct WattEffectData {
/* 0x08 */ s32 angle; /* 0x08 */ s32 angle;
/* 0x0C */ s32 unk_0C; /* 0x0C */ s32 unk_0C;
/* 0x10 */ s32 unk_10; /* 0x10 */ s32 unk_10;
/* 0x14 */ struct EffectInstance* effect1; /* 0x14 */ EffectInstance* effect1;
/* 0x18 */ struct EffectInstance* effect2; /* 0x18 */ EffectInstance* effect2;
/* 0x1C */ s32 debuff; /* 0x1C */ s32 debuff;
} WattEffectData; } WattEffectData;

5
include/effects_internal.h
View File

@ -29,6 +29,7 @@ void shim_mem_clear(void* data, s32 numBytes);
void shim_transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outS); void shim_transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outS);
s32 shim_npc_raycast_down_sides(s32, f32*, f32*, f32*, 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_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);
// the actual signature is going to be wrong, but it doesn't matter // the actual signature is going to be wrong, but it doesn't matter
// TODO remove when every effect's main is sorted out // TODO remove when every effect's main is sorted out
@ -94,7 +95,7 @@ void blast_main(s32, f32, f32, f32, f32, s32);
EffectInstance* fire_flower_main(s32, f32, f32, f32, s32); EffectInstance* fire_flower_main(s32, f32, f32, f32, s32);
FX_MAIN(recover_main); FX_MAIN(recover_main);
EffectInstance* disable_x_main(s32, f32, f32, f32, s32); EffectInstance* disable_x_main(s32, f32, f32, f32, s32);
FX_MAIN(bombette_breaking_main); EffectInstance* bombette_breaking_main(s32, s32, s32, f32, s32, s32);
FX_MAIN(firework_main); FX_MAIN(firework_main);
FX_MAIN(confetti_main); FX_MAIN(confetti_main);
FX_MAIN(snowfall_main); FX_MAIN(snowfall_main);
@ -152,7 +153,7 @@ FX_MAIN(ice_shard_main);
FX_MAIN(spirit_card_main); FX_MAIN(spirit_card_main);
FX_MAIN(lil_oink_main); FX_MAIN(lil_oink_main);
FX_MAIN(something_rotating_main); FX_MAIN(something_rotating_main);
FX_MAIN(breaking_junk_main); EffectInstance* breaking_junk_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
FX_MAIN(partner_buff_main); FX_MAIN(partner_buff_main);
FX_MAIN(quizmo_assistant_main); FX_MAIN(quizmo_assistant_main);
FX_MAIN(ice_pillar_main); FX_MAIN(ice_pillar_main);

1
include/macros.h
View File

@ -13,6 +13,7 @@
#endif #endif
#define ALIGN16(val) (((val) + 0xF) & ~0xF) #define ALIGN16(val) (((val) + 0xF) & ~0xF)
#define ALIGN8(val) (((val) + 0x7) & ~0x7)
#define A(sym) NS(AREA, sym) #define A(sym) NS(AREA, sym)
#define N(sym) NS(NAMESPACE, sym) #define N(sym) NS(NAMESPACE, sym)

142
src/101b90_len_8f0.c
View File

@ -5,18 +5,98 @@
// TODO generate this somehow, or prevent it from shifting. must be resolved at compile time // TODO generate this somehow, or prevent it from shifting. must be resolved at compile time
#define SPRITE_ROM_START 0x1943000 + 0x10 #define SPRITE_ROM_START 0x1943000 + 0x10
extern s32 spr_allocateBtlComponentsOnWorldHeap;
extern s32 D_802DFEB0[];
extern s32 D_802DFEB8[];
extern s32 PlayerRasterSetsLoaded; extern s32 PlayerRasterSetsLoaded;
extern s32 PlayerRasterBufferSetOffsets[13]; extern s32 PlayerRasterBufferSetOffsets[13];
extern s32 D_802E0090[];
extern s32 PlayerRasterHeader; extern s32 PlayerRasterHeader;
extern s32 D_802E0C14[];
extern s32 D_802E0C20[]; extern s32 D_802E0C20[];
extern s32 PlayerRasterCacheSize; extern s32 PlayerRasterCacheSize;
extern s32 PlayerRasterMaxSize; extern s32 PlayerRasterMaxSize;
extern s32 SpriteDataHeader[]; extern s32 SpriteDataHeader[];
extern s32 D_802E0C64;
extern s32 D_802E0C68;
extern PlayerSpriteCacheEntry PlayerRasterCache[18]; extern PlayerSpriteCacheEntry PlayerRasterCache[18];
INCLUDE_ASM(s32, "101b90_len_8f0", spr_swizzle_anim_offsets); INCLUDE_ASM(s32, "101b90_len_8f0", spr_swizzle_anim_offsets);
#ifdef NON_EQUIVALENT
SpriteAnimData* spr_load_sprite(s32 idx, s32 arg1, s32 arg2) {
SpriteAnimData* animData;
s32 base;
s32 i;
s32 temp_s0;
s32 temp_s0_2;
s32 temp_v0_2;
s32 temp_v0_3;
s32* temp_a1_3;
s32** var_s2;
u16** var_v1;
s32* temp_v0;
if (arg1) {
base = D_802E0C64;
} else {
base = D_802E0C68;
}
nuPiReadRom(base + (idx * 4), &D_802DFEB0, 8U);
temp_s0 = ALIGN8(D_802DFEB0[1] - D_802DFEB0[0]);
temp_v0 = general_heap_malloc(temp_s0);
nuPiReadRom(base + D_802DFEB0[0], temp_v0, temp_s0);
if (arg2) {
temp_v0++;
animData = _heap_malloc_tail(&gSpriteHeapPtr, *temp_v0);
} else {
temp_v0++;
animData = _heap_malloc(&gSpriteHeapPtr, *temp_v0);
}
decode_yay0(temp_v0, animData);
general_heap_free(temp_v0);
temp_v0_2 = ((u32) animData / 4) * 4;
var_s2 = animData->rastersOffset + temp_v0_2;
animData->rastersOffset = var_s2;
while (*var_s2 != (s32* )-1) {
temp_a1_3 = *var_s2 + temp_v0_2;
*var_s2 = temp_a1_3;
var_s2++;
if (!arg1) {
*temp_a1_3 += temp_v0_2;
}
}
if (arg1) {
D_802E0050[idx] = D_802E004C;
temp_s0_2 = D_802E0C20[idx + 1] - D_802E0C20[idx];
nuPiReadRom(D_802E0C60[0] + D_802E0C14[0] + D_802E0C20[idx], &D_802DFEB8, 0x194);
for (i = 0; i < temp_s0_2; i++) {
D_802E0090[D_802E004C++] = D_802DFEB8[i];
}
}
temp_v0_3 = ((u32) animData / 4) * 4;
var_v1 = animData->palettesOffset + temp_v0_3;
animData->palettesOffset = var_v1;
while (*var_v1 != -1) {
*var_v1 += temp_v0_3;
var_v1++;
}
spr_swizzle_anim_offsets(0, 0, animData);
return animData;
}
#else
INCLUDE_ASM(s32, "101b90_len_8f0", spr_load_sprite); INCLUDE_ASM(s32, "101b90_len_8f0", spr_load_sprite);
#endif
void spr_init_player_raster_cache(s32 cacheSize, s32 maxRasterSize) { void spr_init_player_raster_cache(s32 cacheSize, s32 maxRasterSize) {
void* raster; void* raster;
@ -46,7 +126,35 @@ void spr_init_player_raster_cache(s32 cacheSize, s32 maxRasterSize) {
nuPiReadRom(SpriteDataHeader[0] + PlayerRasterHeader, D_802E0C20, 0x38); nuPiReadRom(SpriteDataHeader[0] + PlayerRasterHeader, D_802E0C20, 0x38);
} }
INCLUDE_ASM(s32, "101b90_len_8f0", spr_get_player_raster); IMG_PTR spr_get_player_raster(s32 rasterIndex, s32 playerSpriteID) {
PlayerSpriteCacheEntry* temp_s0;
u32 temp_a2;
s32 idx = -1;
s32 i;
for (i = 0; i < PlayerRasterCacheSize; i++) {
if (PlayerRasterCache[i].lazyDeleteTime != 0) {
if (PlayerRasterCache[i].rasterIndex == rasterIndex && PlayerRasterCache[i].spriteIndex == playerSpriteID) {
PlayerRasterCache[i].lazyDeleteTime = 2;
return PlayerRasterCache[i].raster;
}
} else if (idx == -1) {
idx = i;
}
}
if (idx == -1) {
return NULL;
}
temp_s0 = &PlayerRasterCache[idx];
temp_s0->rasterIndex = rasterIndex;
temp_s0->spriteIndex = playerSpriteID;
temp_s0->lazyDeleteTime = 2;
temp_a2 = D_802E0090[PlayerRasterBufferSetOffsets[playerSpriteID] + rasterIndex];
nuPiReadRom(*SpriteDataHeader + (temp_a2 & 0xFFFFF), temp_s0->raster, (temp_a2 >> 0x10) & 0xFFF0);
return temp_s0->raster;
}
void spr_update_player_raster_cache(void) { void spr_update_player_raster_cache(void) {
s32 i; s32 i;
@ -62,4 +170,36 @@ void spr_update_player_raster_cache(void) {
INCLUDE_ASM(s32, "101b90_len_8f0", spr_load_npc_extra_anims); INCLUDE_ASM(s32, "101b90_len_8f0", spr_load_npc_extra_anims);
#ifdef NON_MATCHING
void** spr_allocate_components(s32 arg0) {
s32 temp_s1;
void** heap;
void* var_a0_2;
void** new_var;
u32 size;
s32 i;
temp_s1 = (arg0 + 1) * 4;
size = (arg0 * 0x50) + (temp_s1);
if (spr_allocateBtlComponentsOnWorldHeap) {
heap = _heap_malloc(&heap_generalHead, size);
} else {
heap = _heap_malloc(&gSpriteHeapPtr, size);
}
new_var = heap;
var_a0_2 = heap + (temp_s1 / 4);
for (i = 0; i < arg0; i++) {
*new_var = var_a0_2;
new_var++;
var_a0_2 += 0x50;
}
*new_var = (void* )-1;
return heap;
}
#else
INCLUDE_ASM(s32, "101b90_len_8f0", spr_allocate_components); INCLUDE_ASM(s32, "101b90_len_8f0", spr_allocate_components);
#endif

154
src/168590.c
View File

@ -2,8 +2,20 @@
#include "filemenu.h" #include "filemenu.h"
#include "hud_element.h" #include "hud_element.h"
typedef struct UnkStruct8015A370 {
/* 0x00 */ u8 unk_00;
/* 0x01 */ char unk_01[0x3];
/* 0x04 */ void (*unk_04)(s32);
/* 0x08 */ char unk_08[0x14];
/* 0x1C */ u8 unk_1C;
} UnkStruct8015A370;
extern UnkStruct8015A370 D_8015A370;
extern MenuWindowBP D_8024A134[1]; extern MenuWindowBP D_8024A134[1];
extern HudScript* D_8024A180[3]; extern HudScript* D_8024A180[3];
extern s32 D_8024A18C;
extern s32 D_8024C108;
extern MenuWindowBP D_8024A190[2]; extern MenuWindowBP D_8024A190[2];
extern s32 D_8024A1B4; extern s32 D_8024A1B4;
extern s8 D_8024C090; extern s8 D_8024C090;
@ -128,7 +140,149 @@ void filemenu_draw_contents_file_create_header(MenuPanel* menu, s32 baseX, s32 b
} }
void filemenu_draw_contents_choose_name(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening); void filemenu_draw_contents_choose_name(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening);
#ifdef NON_MATCHING
void filemenu_draw_contents_choose_name(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity,
s32 darkening)
{
s32 sp18;
s32 menuPage;
s32 pageNotOne;
s32 page;
s32 temp_s2;
s32 new_var;
s32 gridData;
s32 xOffset;
s32 yOffset;
s32 color;
s32 flags;
s32 i;
s32 r;
s32 c;
s32 new_var2;
if ((D_8015A370.unk_00 & 8) && D_8015A370.unk_04 == func_80248170) {
sp18 = D_8015A370.unk_1C * 2;
menuPage = menu->page;
pageNotOne = menu->page != 1;
if (sp18 > 0x10) {
sp18 = 0x10;
}
for (r = 0; r < menu->numRows; r++) {
temp_s2 = (r * 15); // ???
for (i = 0; i < 2; i++) {
if (i == 0) {
temp_s2 += 4;
page = menuPage;
gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE,
baseX,
baseY + temp_s2,
baseX + width,
baseY + temp_s2 + sp18);
} else {
temp_s2 += 4;
page = pageNotOne;
gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE,
baseX,
baseY + temp_s2 + sp18,
baseX + width,
baseY + temp_s2 + 0x10);
}
for (c = 0; c < menu->numCols; c++) {
gridData = menu->gridData[(page * menu->numCols * menu->numRows) + (menu->numCols * r) + c];
if (gridData != 0xF7) {
if (r == menu->col && c == menu->row) {
flags = 8;
color = 0;
} else {
flags = 0;
color = 10;
}
xOffset = (c * 19) + 12;
yOffset = (r * 17) + 5;
if ((u32) (gridData - 0xA2) < 0x4EU) {
if (gridData >= 0xC6) {
hud_element_set_render_pos(D_8024C108, baseX + xOffset + 22, baseY + yOffset + 8);
hud_element_draw_without_clipping(D_8024C108);
flags = 0;
}
}
if (gridData == 0xC6) {
xOffset -= 1;
}
if (gridData == 0xC9) {
xOffset += 5;
}
if (gridData == 0xCA) {
xOffset += 8;
}
if (gridData == 0xC6 || gridData == 0xCA || gridData == 0xC9) {
yOffset -= 1;
}
filemenu_draw_message((Message* ) gridData, baseX + xOffset, baseY + yOffset, 255, color, flags);
}
}
}
}
gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, baseX, baseY, baseX + width, baseY + height);
} else {
for (r = 0; r < menu->numCols; r++) {
for (c = 0; c < menu->numRows; c++) {
gridData = menu->gridData[(menu->page * menu->numCols * menu->numRows) + (menu->numCols * c) + r];
if (gridData != 0xF7) {
if (r == menu->col && c == menu->row) {
flags = 8;
color = 0;
} else {
flags = 0;
color = 10;
}
xOffset = (r * 19) + 12;
yOffset = (c * 17) + 5;
new_var2 = gridData; // ???
if ((u32) (gridData - 0xA2) < 0x4EU) {
if (gridData >= 0xC6) {
hud_element_set_render_pos(D_8024C108, baseX + xOffset + 22, baseY + yOffset + 8);
hud_element_draw_without_clipping(D_8024C108);
flags = 0;
}
}
if (gridData == 0xC6) {
xOffset -= 1;
}
if (gridData == 0xC9) {
xOffset += 5;
}
if (gridData == 0xCA) {
xOffset += 8;
}
if (gridData == 0xC6 || gridData == 0xCA || gridData == 0xC9) {
yOffset -= 1;
}
filemenu_draw_message((Message* ) new_var2, baseX + xOffset, baseY + yOffset, 255, color, flags);
}
}
}
}
if (filemenu_8024C098 == 3) {
if (filemenu_heldButtons & (BUTTON_STICK_RIGHT | BUTTON_STICK_LEFT | BUTTON_STICK_DOWN | BUTTON_STICK_UP)) {
D_8024A18C = -4;
}
D_8024A18C += 1;
filemenu_set_cursor_goal_pos(0x31, baseX + 2 + (menu->col * 19), baseY + 13 + (menu->row * 17));
}
}
#else
INCLUDE_ASM(s32, "168590", filemenu_draw_contents_choose_name); INCLUDE_ASM(s32, "168590", filemenu_draw_contents_choose_name);
#endif
void filemenu_choose_name_init(MenuPanel* menu) { void filemenu_choose_name_init(MenuPanel* menu) {
s32 i; s32 i;

171
src/16F740.c
View File

@ -184,7 +184,176 @@ void btl_state_draw_normal_start(void) {
} }
} }
INCLUDE_ASM(s32, "16F740", btl_state_update_begin_turn); void btl_state_update_begin_turn(void) {
BattleStatus* battleStatus = &gBattleStatus;
PlayerData* playerData = &gPlayerData;
Actor* partner = battleStatus->partnerActor;
Actor* player = battleStatus->playerActor;
Actor* enemy;
Actor* enemy1;
Actor* enemy2;
Evt* script;
Evt* script2;
s32 cond;
u16 id1;
u16 id2;
s32 numEnemyActors;
s32 i;
s32 j;
s16* enemyIDs;
if (gBattleState2 == 0) {
battleStatus->flags2 &= ~BS_FLAGS2_2;
battleStatus->flags2 &= ~BS_FLAGS2_4;
battleStatus->flags2 &= ~BS_FLAGS2_8;
battleStatus->flags2 &= ~BS_FLAGS2_10;
battleStatus->merleeAttackBoost = 0;
battleStatus->merleeDefenseBoost = 0;
battleStatus->flags2 &= ~BS_FLAGS2_1000000;
player->unk_21D = 0;
player->flags |= ACTOR_FLAG_8000000 | ACTOR_FLAG_4000000;
if (partner != NULL) {
player->flags |= ACTOR_FLAG_8000000 | ACTOR_FLAG_4000000;
partner->unk_21D = 0;
}
if (battleStatus->hustleTurns != 0) {
battleStatus->flags1 |= BS_FLAGS1_4000000;
}
numEnemyActors = 0;
for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
enemy = battleStatus->enemyActors[i];
if (enemy != NULL) {
battleStatus->enemyIDs[numEnemyActors] = i | ACTOR_ENEMY0;
numEnemyActors++;
}
}
battleStatus->numEnemyActors = numEnemyActors;
enemyIDs = battleStatus->enemyIDs;
for (i = 0; i < numEnemyActors - 1; i++) {
for (j = i + 1; j < numEnemyActors; j++) {
id1 = enemyIDs[i];
id2 = enemyIDs[j];
enemy1 = battleStatus->enemyActors[id1 & 0xFF];
enemy2 = battleStatus->enemyActors[id2 & 0xFF];
if (gBattleStatus.flags1 & BS_FLAGS1_8000000) {
if (enemy1->homePos.x > enemy2->homePos.x) {
enemyIDs[i] = id2;
enemyIDs[j] = id1;
}
} else if (enemy1->turnPriority < enemy2->turnPriority) {
enemyIDs[i] = id2;
enemyIDs[j] = id1;
}
}
}
battleStatus->nextEnemyIndex = 0;
btl_merlee_on_start_turn();
battleStatus->rushFlags = 0;
gBattleStatus.flags2 &= ~BS_FLAGS2_8000000;
if (!(gBattleStatus.flags2 & BS_FLAGS2_40)) {
if (playerData->curHP < 2 && is_ability_active(ABILITY_MEGA_RUSH)) {
gBattleStatus.flags2 |= BS_FLAGS2_8000000;
battleStatus->rushFlags |= 1;
}
if (playerData->curHP < 6 && is_ability_active(ABILITY_POWER_RUSH) && !(battleStatus->rushFlags & 1)) {
gBattleStatus.flags2 |= BS_FLAGS2_8000000;
battleStatus->rushFlags |= 2;
}
}
if (!(gBattleStatus.flags1 & BS_FLAGS1_20000000)) {
battleStatus->jumpCharge = 0;
}
if (!(gBattleStatus.flags1 & BS_FLAGS1_10000000)) {
battleStatus->hammerCharge = 0;
}
if (gGameStatusPtr->debugEnemyContact == 4) {
btl_set_state(BATTLE_STATE_RUN_AWAY);
return;
}
if (gGameStatusPtr->debugEnemyContact == 3) {
for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
enemy = battleStatus->enemyActors[i];
if (enemy != NULL && enemy->onHitScriptSource != NULL) {
Evt* script = start_script(enemy->onHitScriptSource, 0xA, 0);
enemy->onHitScript = script;
script->owner1.actorID = i | ACTOR_ENEMY0;
enemy->onHitID = script->id;
enemy->lastEventType = EVENT_DEATH;
}
}
gBattleState2 = BATTLE_STATE_SWITCH_TO_PLAYER;
} else {
for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
enemy = battleStatus->enemyActors[i];
if (enemy != NULL && enemy->onTurnChanceScriptSource != NULL) {
battleStatus->battlePhase = PHASE_PLAYER_BEGIN;
script = start_script(enemy->onTurnChanceScriptSource, 0xA, 0);
enemy->onTurnChangeScript = script;
enemy->onTurnChangeID = script->id;
script->owner1.actorID = i | ACTOR_ENEMY0;
}
}
partner = battleStatus->partnerActor;
if (partner != NULL) {
if (partner->onTurnChanceScriptSource != NULL) {
battleStatus->battlePhase = PHASE_PLAYER_BEGIN;
script = start_script(partner->onTurnChanceScriptSource, 0xA, 0);
partner->onTurnChangeScript = script;
partner->onTurnChangeID = script->id;
script->owner1.actorID = ACTOR_PARTNER;
}
}
gBattleState2 = BATTLE_STATE_BEGIN_TURN;
}
}
if (gBattleState2 == BATTLE_STATE_BEGIN_TURN) {
cond = FALSE;
for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
enemy = battleStatus->enemyActors[i];
if (enemy != NULL && enemy->onTurnChanceScriptSource != NULL && does_script_exist(enemy->onTurnChangeID)) {
cond = TRUE;
}
}
if (partner != NULL && partner->onTurnChanceScriptSource != NULL && does_script_exist(partner->onTurnChangeID)) {
cond = TRUE;
}
if (!cond) {
if (!btl_check_enemies_defeated()) {
btl_set_state(BATTLE_STATE_BEGIN_PLAYER_TURN);
}
return;
}
}
if (gBattleState2 == BATTLE_STATE_SWITCH_TO_PLAYER) {
cond = FALSE;
for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
enemy = battleStatus->enemyActors[i];
if (enemy != NULL && enemy->onHitScriptSource != NULL && does_script_exist(enemy->onHitID)) {
cond = TRUE;
}
}
if (!cond) {
if (!btl_check_enemies_defeated()) {
btl_set_state(BATTLE_STATE_BEGIN_PLAYER_TURN);
}
}
}
}
void btl_state_draw_begin_turn(void) { void btl_state_draw_begin_turn(void) {
} }

45
src/17D6A0.c
View File

@ -5,11 +5,46 @@
#include "hud_element.h" #include "hud_element.h"
s16 D_80280FC0[] = { s16 D_80280FC0[] = {
10, 90, 0, 50, 3, 11, 0, 50, 1, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 10, 90, 0, 50,
1, 49, 0, 50, 1, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 1, 50, 0, 50, 1, 3, 11, 0, 50,
50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 3, 10, 0, 50, 3, 10, 0, 0, 0, 0, 1, 45, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 3, 10, 0, 20, 3, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 50,
1, 49, 0, 50,
1, 49, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 50,
1, 50, 0, 50,
1, 50, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 50,
3, 10, 0, 50,
3, 10, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 80,
3, 10, 0, 20,
3, 11, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
}; };
s32 bActorNames[ACTOR_TYPE_COUNT] = { s32 bActorNames[ACTOR_TYPE_COUNT] = {

2
src/190B20.c
View File

@ -220,7 +220,7 @@ s32 btl_are_all_enemies_defeated(void) {
s32 btl_check_enemies_defeated(void) { s32 btl_check_enemies_defeated(void) {
if (btl_are_all_enemies_defeated()) { if (btl_are_all_enemies_defeated()) {
btl_set_state(0x1A); btl_set_state(BATTLE_STATE_VICTORY);
return TRUE; return TRUE;
} }
return FALSE; return FALSE;

6
src/effects.c
View File

@ -102,7 +102,7 @@ EffectTableEntry gEffectTable[] = {
/* 0x48 */ FX_ENTRY(attack_result_text, _3903D0), /* 0x48 */ FX_ENTRY(attack_result_text, _3903D0),
/* 0x49 */ FX_ENTRY(small_gold_sparkle, effect_gfx_small_gold_sparkle), /* 0x49 */ FX_ENTRY(small_gold_sparkle, effect_gfx_small_gold_sparkle),
/* 0x4A */ FX_ENTRY(flashing_box_shockwave, _3930A0), /* 0x4A */ FX_ENTRY(flashing_box_shockwave, _3930A0),
/* 0x4B */ FX_ENTRY(balloon, _394670), /* 0x4B */ FX_ENTRY(balloon, effect_gfx_balloon),
/* 0x4C */ FX_ENTRY(floating_rock, _3960F0), /* 0x4C */ FX_ENTRY(floating_rock, _3960F0),
/* 0x4D */ FX_ENTRY(chomp_drop, _397040), /* 0x4D */ FX_ENTRY(chomp_drop, _397040),
/* 0x4E */ FX_ENTRY(quizmo_stage, _398BC0), /* 0x4E */ FX_ENTRY(quizmo_stage, _398BC0),
@ -122,7 +122,7 @@ EffectTableEntry gEffectTable[] = {
/* 0x5C */ FX_ENTRY(water_fountain, _3B8860), /* 0x5C */ FX_ENTRY(water_fountain, _3B8860),
/* 0x5D */ FX_ENTRY(underwater, _3B9A70), /* 0x5D */ FX_ENTRY(underwater, _3B9A70),
/* 0x5E */ FX_ENTRY(lightning_bolt, _3BAEA0), /* 0x5E */ FX_ENTRY(lightning_bolt, _3BAEA0),
/* 0x5F */ FX_ENTRY(water_splash, _3BCA90), /* 0x5F */ FX_ENTRY(water_splash, effect_gfx_water_splash),
/* 0x60 */ FX_ENTRY(snowman_doll, _3BD9A0), /* 0x60 */ FX_ENTRY(snowman_doll, _3BD9A0),
/* 0x61 */ FX_ENTRY(fright_jar, _3C1BA0), /* 0x61 */ FX_ENTRY(fright_jar, _3C1BA0),
/* 0x62 */ FX_ENTRY(stop_watch, _3CB890), /* 0x62 */ FX_ENTRY(stop_watch, _3CB890),
@ -153,7 +153,7 @@ EffectTableEntry gEffectTable[] = {
/* 0x7B */ FX_ENTRY(spirit_card, _3FA4B0), /* 0x7B */ FX_ENTRY(spirit_card, _3FA4B0),
/* 0x7C */ FX_ENTRY(lil_oink, _3FF250), /* 0x7C */ FX_ENTRY(lil_oink, _3FF250),
/* 0x7D */ FX_ENTRY(something_rotating, _3FA4B0), /* 0x7D */ FX_ENTRY(something_rotating, _3FA4B0),
/* 0x7E */ FX_ENTRY(breaking_junk, _403BF0), /* 0x7E */ FX_ENTRY(breaking_junk, effect_gfx_breaking_junk),
/* 0x7F */ FX_ENTRY(partner_buff, _404F40), /* 0x7F */ FX_ENTRY(partner_buff, _404F40),
/* 0x80 */ FX_ENTRY(quizmo_assistant, _407080), /* 0x80 */ FX_ENTRY(quizmo_assistant, _407080),
/* 0x81 */ FX_ENTRY(ice_pillar, _40A1C0), /* 0x81 */ FX_ENTRY(ice_pillar, _40A1C0),

12
src/effects/balloon.c
View File

@ -1,12 +1,12 @@
#include "common.h" #include "common.h"
#include "effects_internal.h" #include "effects_internal.h"
extern Gfx D_09001280[]; extern Gfx D_09001280_3958F0[];
extern Gfx D_09001358[]; extern Gfx D_09001358_3959C8[];
extern Gfx D_09001430[]; extern Gfx D_09001430_395AA0[];
extern Gfx D_09001508[]; extern Gfx D_09001508_395B78[];
Gfx* D_E00963E0[] = { D_09001280, D_09001358, D_09001430 }; Gfx* D_E00963E0[] = { D_09001280_3958F0, D_09001358_3959C8, D_09001430_395AA0 };
void balloon_init(EffectInstance* effect); void balloon_init(EffectInstance* effect);
void balloon_update(EffectInstance* effect); void balloon_update(EffectInstance* effect);
@ -102,7 +102,7 @@ void balloon_appendGfx(void* effect) {
gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
gSPDisplayList(gMasterGfxPos++, D_E00963E0[idx]); gSPDisplayList(gMasterGfxPos++, D_E00963E0[idx]);
gSPDisplayList(gMasterGfxPos++, D_09001508); gSPDisplayList(gMasterGfxPos++, D_09001508_395B78);
gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
gDPPipeSync(gMasterGfxPos++); gDPPipeSync(gMasterGfxPos++);
} }

63
src/effects/blast.c
View File

@ -1,12 +1,27 @@
#include "common.h" #include "common.h"
#include "effects_internal.h" #include "effects_internal.h"
void blast_init(EffectInstance* effect); void blast_init(EffectInstance* effect);
void blast_update(EffectInstance* effect); void blast_update(EffectInstance* effect);
void blast_render(EffectInstance* effect); void blast_render(EffectInstance* effect);
void blast_appendGfx(void* effect); void blast_appendGfx(void* effect);
extern Gfx D_09001300[];
extern Gfx D_09001378[];
extern Gfx D_090013F0[];
extern Gfx D_09001468[];
extern Gfx D_090014E0[];
extern Gfx D_09001558[];
extern Gfx D_090015D0[];
extern Gfx D_09001648[];
extern Gfx D_090016C0[];
extern Gfx D_09001738[];
extern Gfx D_090017B0[];
Gfx* D_E007C510[] = {
D_09001378, D_090013F0, D_09001468, D_090014E0, D_09001558, D_090015D0, D_09001648, D_090016C0, D_09001738
};
void blast_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) { void blast_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) {
EffectBlueprint bp; EffectBlueprint bp;
EffectBlueprint* bpPtr = &bp; EffectBlueprint* bpPtr = &bp;
@ -75,4 +90,50 @@ void blast_render(EffectInstance* effect) {
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_2;
} }
#ifdef NON_MATCHING
void blast_appendGfx(void* effect) {
Matrix4f sp18, sp58, sp98;
Gfx* dlist;
Gfx* dlist2;
BlastFXData* data = ((EffectInstance*)effect)->data;
f32 temp_f2;
s32 temp_f4;
s32 alpha;
dlist = D_090017B0;
dlist2 = D_09001300;
temp_f4 = data->unk_20;
temp_f2 = temp_f4;
alpha = (temp_f2 - temp_f4) * 256.0f;
gDPPipeSync(gMasterGfxPos++);
gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
gSPDisplayList(gMasterGfxPos++, dlist2);
gSPDisplayList(gMasterGfxPos++, D_E007C510[temp_f4]);
shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z);
shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f);
shim_guMtxCatF(sp58, sp18, sp98);
shim_guScaleF(sp18, data->unk_10, data->unk_10, 1.0f);
shim_guMtxCatF(sp18, sp98, sp98);
shim_guRotateF(sp18, data->unk_24, 0.0f, 0.0f, 1.0f);
shim_guMtxCatF(sp18, sp98, sp98);
shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]);
gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
if (data->unk_20 > 4.0f) {
gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, 127);
} else {
gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 128, 127);
}
gDPSetEnvColor(gMasterGfxPos++, 255, 255, 139, alpha);
gSPDisplayList(gMasterGfxPos++, dlist);
gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
}
#else
INCLUDE_ASM(s32, "effects/blast", blast_appendGfx); INCLUDE_ASM(s32, "effects/blast", blast_appendGfx);
#endif

212
src/effects/bombette_breaking.c
View File

@ -2,10 +2,10 @@
#include "model.h" #include "model.h"
#include "effects_internal.h" #include "effects_internal.h"
void bombette_breaking_appendGfx(void* effect);
void bombette_breaking_init(EffectInstance* effect); void bombette_breaking_init(EffectInstance* effect);
void bombette_breaking_update(EffectInstance* effect); void bombette_breaking_update(EffectInstance* effect);
void bombette_breaking_render(EffectInstance* effect); void bombette_breaking_render(EffectInstance* effect);
void bombette_breaking_appendGfx(void* effect);
extern Gfx D_090018C0[]; extern Gfx D_090018C0[];
extern Gfx D_09001D00[]; extern Gfx D_09001D00[];
@ -21,24 +21,173 @@ void (*D_E0084E34)(u16, f32*, f32*, f32*, f32*, f32*, f32*) = get_model_center_a
Model* (*D_E0084E38)(s32) = get_model_from_list_index; Model* (*D_E0084E38)(s32) = get_model_from_list_index;
s32 (*D_E0084E3C)(s32) = get_model_list_index_from_tree_index; s32 (*D_E0084E3C)(s32) = get_model_list_index_from_tree_index;
void func_E0084000(s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ) { void bombette_breaking_get_model_center_and_size(s32 modelID,
f32* centerX, f32* centerY, f32* centerZ,
f32* sizeX, f32* sizeY, f32* sizeZ)
{
D_E0084E34(modelID, centerX, centerY, centerZ, sizeX, sizeY, sizeZ); D_E0084E34(modelID, centerX, centerY, centerZ, sizeX, sizeY, sizeZ);
} }
Model* func_E008403C(s32 listIndex) { Model* bombette_breaking_get_model_from_list_index(s32 listIndex) {
return D_E0084E38(listIndex); return D_E0084E38(listIndex);
} }
s32 func_E0084060(s32 listIndex) { s32 bombette_breaking_get_model_list_index_from_tree_index(s32 listIndex) {
return D_E0084E3C(listIndex); return D_E0084E3C(listIndex);
} }
INCLUDE_ASM(s32, "effects/bombette_breaking", bombette_breaking_main); EffectInstance* bombette_breaking_main(s32 type, s32 modelID, s32 treeIndex, f32 arg3, s32 arg4, s32 time) {
EffectBlueprint bp;
EffectBlueprint* bpPtr = &bp;
EffectInstance* effect;
s32 numParts;
BombetteBreakingFXData* data;
f32 centerX, centerY, centerZ;
f32 sizeX, sizeY, sizeZ;
s32 xParts, yParts, zParts;
s32 iX, iY, iZ;
f32 f20, f30, f40;
bombette_breaking_get_model_center_and_size(modelID & 0xFFFF, &centerX, &centerY, &centerZ, &sizeX, &sizeY, &sizeZ);
xParts = (sizeX * 0.0625f) + 1.0f;
yParts = (sizeY * 0.0625f) + 1.0f;
zParts = (sizeZ * 0.0625f) + 1.0f;
f20 = (s32)sizeX % 16;
f30 = (s32)sizeY % 16;
f40 = (s32)sizeZ % 16;
bp.unk_00 = 0;
bp.init = bombette_breaking_init;
bp.update = bombette_breaking_update;
bp.renderWorld = bombette_breaking_render;
bp.unk_14 = 0;
bp.effectID = EFFECT_BOMBETTE_BREAKING;
f20 *= 0.5;
f30 *= 0.5;
f40 *= 0.5;
numParts = (xParts * yParts * zParts) + 1;
effect = shim_create_effect_instance(bpPtr);
effect->numParts = numParts;
effect->data.bombetteBreaking = data = shim_general_heap_malloc(numParts * sizeof(*data));
ASSERT(data != NULL);
data->unk_04 = -sizeY * 0.5;
data->timeLeft = time;
data->unk_48 = 0;
data->type = type;
data->unk_38 = arg3;
data->alpha = 255;
data->treeIndex = treeIndex;
data->unk_3C = 2.0f * arg3;
data->center.x = centerX;
data->center.y = centerY;
data->center.z = centerZ;
data->unk_40 = sizeY * 0.05;
if (data->unk_40 < 1.0f) {
data->unk_40 = 1.0f;
}
data++;
for (iX = 0; iX < xParts; iX++) {
centerX = f20 - (sizeX * 0.5) + (iX * 16.0f);
for (iY = 0; iY < yParts; iY++) {
centerY = f30 - (sizeY * 0.5) + (iY * 16.0f);
for (iZ = 0; iZ < zParts; iZ++) {
centerZ = f30 - (sizeZ * 0.5) + (iZ * 16.0f);
data->center.x = data->unk_14.x = centerX;
data->center.y = data->unk_14.y = centerY;
data->center.z = data->unk_14.z = centerZ;
if (sizeX < sizeZ) {
if (xParts >= 2) {
data->unk_20.x = 2.0 * (centerX / (sizeX * 0.5));
} else {
if (iZ & 1) {
data->unk_20.x = 2.0f;
} else {
data->unk_20.x = -2.0f;
}
}
data->unk_20.z = 0.0f;
} else {
data->unk_20.x = 0.0f;
if (zParts >= 2) {
data->unk_20.z = 2.0 * (centerZ / (sizeZ * 0.5));
} else {
if (iX & 1) {
data->unk_20.z = 2.0f;
} else {
data->unk_20.z = -2.0f;
}
}
}
data->unk_20.y = centerY * 0.2;
data->unk_2C.x = centerZ * 0.2 + (centerX < centerZ ? (centerZ < 0 ? -1.0 : (centerZ > 0 ? 1.0 : 0.0)) : 0.0);
data->unk_2C.y = centerY * 0.2;
data->unk_2C.z = centerX * 0.2 + (centerZ < centerX ? (centerX < 0 ? -1.0 : (centerX > 0 ? 1.0 : 0.0)) : 0.0);
data->alpha = 255;
data++;
}
}
}
return effect;
}
void bombette_breaking_init(EffectInstance* effect) { void bombette_breaking_init(EffectInstance* effect) {
} }
INCLUDE_ASM(s32, "effects/bombette_breaking", bombette_breaking_update); void bombette_breaking_update(EffectInstance* effect) {
BombetteBreakingFXData* data = effect->data.bombetteBreaking;
f32 unk_04;
s32 i;
data->unk_48++;
data->timeLeft--;
if (data->timeLeft < 0) {
shim_remove_effect(effect);
return;
}
unk_04 = data->unk_04;
if (data->timeLeft < 25.0f) {
data->alpha = data->timeLeft * 10.0f;
}
data->unk_38 += (data->unk_3C - data->unk_38) * 0.1;
data++;
for (i = 1; i < effect->numParts; i++, data++) {
data->unk_20.x *= 0.9;
data->unk_20.y *= 0.9;
data->unk_20.z *= 0.9;
data->center.x += data->unk_20.x;
data->center.y += data->unk_20.y;
data->center.z += data->unk_20.z;
if (data->center.y < unk_04 && data->unk_20.y < 0.0f) {
data->center.y = unk_04;
data->unk_20.y *= -0.7;
}
data->unk_2C.x *= 0.95;
data->unk_2C.y -= 0.4;
data->unk_2C.z *= 0.95;
data->unk_14.x += data->unk_2C.x;
data->unk_14.y += data->unk_2C.y;
data->unk_14.z += data->unk_2C.z;
if (data->unk_14.y < unk_04 && data->unk_2C.y < 0.0f) {
data->unk_14.y = unk_04;
data->unk_2C.y *= -0.4;
}
}
}
void bombette_breaking_render(EffectInstance* effect) { void bombette_breaking_render(EffectInstance* effect) {
RenderTask renderTask; RenderTask renderTask;
@ -53,4 +202,53 @@ void bombette_breaking_render(EffectInstance* effect) {
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_2;
} }
INCLUDE_ASM(s32, "effects/bombette_breaking", bombette_breaking_appendGfx); void bombette_breaking_appendGfx(void* effect) {
Matrix4f sp20;
BombetteBreakingFXData* data = ((EffectInstance*)effect)->data.bombetteBreaking;
s32 timeLeft = data->timeLeft;
u16 type = data->type;
Gfx* sp60 = D_E0084E10[type];
Gfx* sp64 = D_E0084E28[type];
f32 unk_38 = data->unk_38;
f32 unk_40 = data->unk_40;
s32 mainAlpha = data->alpha;
s32 i;
timeLeft *= 4;
gDPPipeSync(gMasterGfxPos++);
gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
shim_guTranslateF(sp20, data->center.x, data->center.y, data->center.z);
shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]);
gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
shim_mdl_draw_hidden_panel_surface(&gMasterGfxPos, data->treeIndex);
data++;
for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) {
shim_guPositionF(sp20, timeLeft + (130 * i), timeLeft - (40 * i), timeLeft + (80 * i), unk_40,
data->unk_14.x, data->unk_14.y, data->unk_14.z);
shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]);
gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
gSPDisplayList(gMasterGfxPos++, D_E0084E1C[type]);
gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
}
gSPDisplayList(gMasterGfxPos++, sp64);
data = ((EffectInstance*)effect)->data.bombetteBreaking;
data++;
for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) {
gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, (data->alpha * mainAlpha) / 255);
shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_38,
data->center.x, data->center.y, data->center.z);
shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]);
gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
gSPDisplayList(gMasterGfxPos++, sp60);
gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
}
gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
}

139
src/effects/breaking_junk.c
View File

@ -1,14 +1,122 @@
#include "common.h" #include "common.h"
#include "effects_internal.h" #include "effects_internal.h"
void breaking_junk_init(EffectInstance* effect);
void breaking_junk_update(EffectInstance* effect);
void breaking_junk_render(EffectInstance* effect);
void breaking_junk_appendGfx(void* effect); void breaking_junk_appendGfx(void* effect);
INCLUDE_ASM(s32, "effects/breaking_junk", breaking_junk_main); extern Gfx D_09000400_403FF0[];
extern Gfx D_090005A8_404198[];
extern Gfx D_090005C8_4041B8[];
extern Gfx D_090005E8_4041D8[];
extern Gfx D_09000608_4041F8[];
void breaking_junk_init(void) { Gfx* D_E01187B0[] = { D_090005A8_404198, D_090005C8_4041B8, D_090005E8_4041D8, D_09000608_4041F8 };
Gfx* D_E01187C0[] = { D_09000400_403FF0 };
EffectInstance* breaking_junk_main(s32 arg0, f32 x, f32 y, f32 z, f32 scale, s32 time) {
EffectBlueprint bp;
EffectBlueprint* bpPtr = &bp;
EffectInstance* effect;
BreakingJunkFXData* data;
s32 numParts = 6;
u32 g;
s32 i;
bp.unk_00 = 0;
bp.init = breaking_junk_init;
bp.update = breaking_junk_update;
bp.renderWorld = breaking_junk_render;
bp.unk_14 = 0;
bp.effectID = EFFECT_BREAKING_JUNK;
effect = shim_create_effect_instance(bpPtr);
effect->numParts = numParts;
data = effect->data.breakingJunk = shim_general_heap_malloc(numParts * sizeof(*data));
ASSERT(effect->data.breakingJunk != NULL);
data->unk_00 = arg0;
data->lifeTime = 0;
if (time <= 0) {
data->timeLeft = 1000;
} else {
data->timeLeft = time;
}
data->primA = 255;
for (i = 0; i < effect->numParts; i++, data++) {
data->pos.x = x;
data->pos.y = y;
data->pos.z = z;
data->vel.x = (shim_rand_int(10) - 5) * 0.5;
data->vel.y = (shim_rand_int(5) + 1) * 0.8;
data->vel.z = (shim_rand_int(10) - 5) * 0.5;
data->scale = scale;
data->primR = data->envR = shim_rand_int(255);
g = shim_rand_int(255 - data->envR);
data->primG = data->envG = g;
data->primB = data->envB = (255 - g) - data->envR;
data->primR += 168;
data->primG += 168;
data->primB += 168;
if (data->primR > 255) {
data->primR = 255;
}
if (data->primG > 255) {
data->primG = 255;
}
if (data->primB > 255) {
data->primB = 255;
}
data->envR = data->envR * 0.6;
data->envG = data->envG * 0.6;
data->envB = data->envB * 0.6;
data->rot = shim_rand_int(359);
}
return effect;
} }
INCLUDE_ASM(s32, "effects/breaking_junk", breaking_junk_update); void breaking_junk_init(EffectInstance* effect) {
}
void breaking_junk_update(EffectInstance* effect) {
BreakingJunkFXData* data = effect->data.breakingJunk;
s32 i;
if (effect->flags & 0x10) {
effect->flags &= ~0x10;
data->timeLeft = 16;
}
if (data->timeLeft < 1000) {
data->timeLeft--;
}
data->lifeTime++;
if (data->timeLeft < 0) {
shim_remove_effect(effect);
return;
}
if (data->timeLeft < 8) {
data->primA = data->timeLeft * 32;
}
for (i = 0; i < effect->numParts; i++, data++) {
data->vel.y -= 0.5;
data->pos.x += data->vel.x;
data->pos.y += data->vel.y;
data->pos.z += data->vel.z;
if (data->pos.y < 0.0f && data->vel.y < 0.0f) {
data->pos.y = 0.0f;
data->vel.y *= -0.7;
}
data->rot += (((i & 1) * 2) - 1) * 14;
}
}
void breaking_junk_render(EffectInstance* effect) { void breaking_junk_render(EffectInstance* effect) {
RenderTask renderTask; RenderTask renderTask;
@ -23,4 +131,27 @@ void breaking_junk_render(EffectInstance* effect) {
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_2;
} }
INCLUDE_ASM(s32, "effects/breaking_junk", breaking_junk_appendGfx); void breaking_junk_appendGfx(void* effect) {
Matrix4f sp20, sp60;
BreakingJunkFXData* data = ((EffectInstance*)effect)->data.breakingJunk;
s32 alpha = data->primA;
s32 i;
gDPPipeSync(gMasterGfxPos++);
gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
gSPDisplayList(gMasterGfxPos++, D_E01187C0[0]);
for (i = 0; i < ((EffectInstance*)effect)->numParts; i++, data++) {
shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale * 0.5, data->pos.x, data->pos.y, data->pos.z);
shim_guRotateF(sp60, data->rot, 0.0f, 0.0f, 1.0f);
shim_guMtxCatF(sp60, sp20, sp20);
shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]);
gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primR, data->primG, data->primB, alpha);
gDPSetEnvColor(gMasterGfxPos++, data->envR, data->envG, data->envB, data->envA);
gSPDisplayList(gMasterGfxPos++, D_E01187B0[(u32)i % ARRAY_COUNT(D_E01187B0)]);
gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
}
gDPPipeSync(gMasterGfxPos++);
}

10
src/effects/cloud_puff.c
View File

@ -45,7 +45,7 @@ void cloud_puff_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
part->unk_24 = (shim_rand_int(10) * 0.03) + 1.0; part->unk_24 = (shim_rand_int(10) * 0.03) + 1.0;
part->unk_28 = (shim_rand_int(10) * 0.03) + 1.7; part->unk_28 = (shim_rand_int(10) * 0.03) + 1.7;
part->unk_2C = func_E0200000(60); part->unk_2C = func_E0200000(60);
part->lifetime = 30; part->timeLeft = 30;
part->unk_34 = 0.5f; part->unk_34 = 0.5f;
part->unk_38 = -0.02f; part->unk_38 = -0.02f;
part->unk_3C = 0.00005f; part->unk_3C = 0.00005f;
@ -66,8 +66,8 @@ void cloud_puff_update(EffectInstance* effect) {
for (i = 0; i < effect->numParts; i++, part++) { for (i = 0; i < effect->numParts; i++, part++) {
if (part->alive) { if (part->alive) {
part->lifetime--; part->timeLeft--;
if (part->lifetime <= 0) { if (part->timeLeft <= 0) {
part->alive = FALSE; part->alive = FALSE;
} else { } else {
cond = TRUE; cond = TRUE;
@ -83,11 +83,11 @@ void cloud_puff_update(EffectInstance* effect) {
part->unk_10 += part->unk_34; part->unk_10 += part->unk_34;
part->unk_28 *= 0.98; part->unk_28 *= 0.98;
if (part->lifetime < 10) { if (part->timeLeft < 10) {
part->unk_28 *= 0.9; part->unk_28 *= 0.9;
} }
if (part->lifetime < 15) { if (part->timeLeft < 15) {
part->alpha -= 16; part->alpha -= 16;
} }
} }

34
src/effects/fire_breath.c
View File

@ -59,8 +59,8 @@ EffectInstance* fire_breath_main(
} }
data->unk_30 = data->scale; data->unk_30 = data->scale;
data->maxLifetime = lifetime; data->lifeTime = lifetime;
data->lifetime = lifetime; data->timeLeft = lifetime;
data->spawnTimer = 0; data->spawnTimer = 0;
data->alpha = 255; data->alpha = 255;
data->unk_5C = 0.0f; data->unk_5C = 0.0f;
@ -93,30 +93,30 @@ void fire_breath_init(EffectInstance* effect) {
void fire_breath_update(EffectInstance* effect) { void fire_breath_update(EffectInstance* effect) {
FireBreathFXData* data = effect->data.fireBreath; FireBreathFXData* data = effect->data.fireBreath;
s32 maxLifetime; s32 lifeTime;
s32 lifetime; s32 timeLeft;
s32 spawnTimer; s32 spawnTimer;
data->lifetime--; data->timeLeft--;
data->unk_5C = (data->spawnTimer * 4.0f) / 10.0f; data->unk_5C = (data->spawnTimer * 4.0f) / 10.0f;
data->spawnTimer++; data->spawnTimer++;
if (data->lifetime < 0) { if (data->timeLeft < 0) {
shim_remove_effect(effect); shim_remove_effect(effect);
return; return;
} }
lifetime = data->lifetime; timeLeft = data->timeLeft;
maxLifetime = data->maxLifetime; lifeTime = data->lifeTime;
spawnTimer = data->spawnTimer; spawnTimer = data->spawnTimer;
if (lifetime >= 6 && data->type == FIRE_BREATH_LARGE) { if (timeLeft >= 6 && data->type == FIRE_BREATH_LARGE) {
data->scale += (2.5 - data->scale) * 0.05; data->scale += (2.5 - data->scale) * 0.05;
} }
data->pos.x = data->initPos.x + (((data->endPos.x - data->initPos.x + data->unk_50.x) * spawnTimer) / maxLifetime); data->pos.x = data->initPos.x + (((data->endPos.x - data->initPos.x + data->unk_50.x) * spawnTimer) / lifeTime);
data->pos.y = data->initPos.y + (((data->endPos.y - data->initPos.y + data->unk_50.y) * spawnTimer) / maxLifetime); data->pos.y = data->initPos.y + (((data->endPos.y - data->initPos.y + data->unk_50.y) * spawnTimer) / lifeTime);
data->pos.z = data->initPos.z + (((data->endPos.z - data->initPos.z + data->unk_50.z) * spawnTimer) / maxLifetime); data->pos.z = data->initPos.z + (((data->endPos.z - data->initPos.z + data->unk_50.z) * spawnTimer) / lifeTime);
if (data->type == FIRE_BREATH_SMALL) { if (data->type == FIRE_BREATH_SMALL) {
data->unk_60 += (f32) spawnTimer * 0.01; data->unk_60 += (f32) spawnTimer * 0.01;
@ -129,7 +129,7 @@ void fire_breath_update(EffectInstance* effect) {
shim_load_effect(EFFECT_FIRE_BREATH); shim_load_effect(EFFECT_FIRE_BREATH);
spawned = fire_breath_main( spawned = fire_breath_main(
data->type, data->initPos.x, data->initPos.y, data->initPos.z, data->endPos.x, data->endPos.y, data->type, data->initPos.x, data->initPos.y, data->initPos.z, data->endPos.x, data->endPos.y,
data->endPos.z, data->numChildren - 1, data->spawnDelay, maxLifetime data->endPos.z, data->numChildren - 1, data->spawnDelay, lifeTime
); );
spawned->data.fireBreath->primR = data->primR; spawned->data.fireBreath->primR = data->primR;
@ -143,18 +143,18 @@ void fire_breath_update(EffectInstance* effect) {
spawned->data.fireBreath->scaleChangeFactor = data->scaleChangeFactor; spawned->data.fireBreath->scaleChangeFactor = data->scaleChangeFactor;
} }
if (lifetime < 10 && data->type == FIRE_BREATH_LARGE) { if (timeLeft < 10 && data->type == FIRE_BREATH_LARGE) {
data->alpha = lifetime * 25; data->alpha = timeLeft * 25;
} }
if (data->type == FIRE_BREATH_SMALL) { if (data->type == FIRE_BREATH_SMALL) {
data->scale += (0.3 - data->scale) * 0.008; data->scale += (0.3 - data->scale) * 0.008;
data->alpha = (lifetime * 224) / maxLifetime; data->alpha = (timeLeft * 224) / lifeTime;
} }
if (data->type == FIRE_BREATH_TINY) { if (data->type == FIRE_BREATH_TINY) {
data->scale += (data->unk_34 - data->scale) * data->scaleChangeFactor; data->scale += (data->unk_34 - data->scale) * data->scaleChangeFactor;
data->alpha = (lifetime * 224) / maxLifetime; data->alpha = (timeLeft * 224) / lifeTime;
} }
} }

31
src/effects/gfx/balloon.c Normal file
View File

@ -0,0 +1,31 @@
#include "common.h"
#include "effects/gfx/D_09000000_394670.png.inc.c"
#include "effects/gfx/D_09000200_394870.png.inc.c"
#include "effects/gfx/D_09000000_394670.pal.inc.c"
u8 D_09000420_394A90[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
};
#include "effects/gfx/D_09000600_394C70.png.inc.c"
#include "effects/gfx/D_09000800_394E70.png.inc.c"
#include "effects/gfx/D_09000600_394C70.pal.inc.c"
u8 D_09000A20_395090[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
};
#include "effects/gfx/D_09000C00_395270.png.inc.c"
#include "effects/gfx/D_09000E00_395470.png.inc.c"
#include "effects/gfx/D_09000C00_395270.pal.inc.c"
u8 D_09001020_395690[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
};
#include "effects/gfx/D_09001200_395870.vtx.inc.c"
#include "effects/gfx/D_09001280_3958F0.gfx.inc.c"
#include "effects/gfx/D_09001358_3959C8.gfx.inc.c"
#include "effects/gfx/D_09001430_395AA0.gfx.inc.c"
#include "effects/gfx/D_09001508_395B78.gfx.inc.c"

16
src/effects/gfx/breaking_junk.c Normal file
View File

@ -0,0 +1,16 @@
#include "common.h"
#include "effects/gfx/D_09000000_403BF0.png.inc.c"
#include "effects/gfx/D_09000100_403CF0.png.inc.c"
#include "effects/gfx/D_09000200_403DF0.png.inc.c"
#include "effects/gfx/D_09000300_403EF0.png.inc.c"
#include "effects/gfx/D_09000400_403FF0.gfx.inc.c"
#include "effects/gfx/D_090004A8_404098.vtx.inc.c"
#include "effects/gfx/D_090004E8_4040D8.vtx.inc.c"
#include "effects/gfx/D_09000528_404118.vtx.inc.c"
#include "effects/gfx/D_09000568_404158.vtx.inc.c"
#include "effects/gfx/D_090005A8_404198.gfx.inc.c"
#include "effects/gfx/D_090005C8_4041B8.gfx.inc.c"
#include "effects/gfx/D_090005E8_4041D8.gfx.inc.c"
#include "effects/gfx/D_09000608_4041F8.gfx.inc.c"

12
src/effects/gfx/water_splash.c Normal file
View File

@ -0,0 +1,12 @@
#include "common.h"
#include "effects/gfx/D_09000000_3BCA90.png.inc.c"
#include "effects/gfx/D_09000100_3BCB90.gfx.inc.c"
#include "effects/gfx/D_090001A8_3BCC38.vtx.inc.c"
#include "effects/gfx/D_090001E8_3BCC78.vtx.inc.c"
#include "effects/gfx/D_09000228_3BCCB8.vtx.inc.c"
#include "effects/gfx/D_09000268_3BCCF8.gfx.inc.c"
#include "effects/gfx/D_09000288_3BCD18.gfx.inc.c"
#include "effects/gfx/D_090002A8_3BCD38.gfx.inc.c"

38
src/effects/snowflake.c
View File

@ -11,7 +11,7 @@ void snowflake_update(EffectInstance* effect);
void snowflake_render(EffectInstance* effect); void snowflake_render(EffectInstance* effect);
void snowflake_appendGfx(void* effect); void snowflake_appendGfx(void* effect);
void snowflake_main(f32 arg0, f32 arg1, f32 arg2, s32 arg3, s32 arg4) { void snowflake_main(f32 x, f32 y, f32 z, s32 arg3, s32 arg4) {
EffectBlueprint bp; EffectBlueprint bp;
EffectInstance* effect; EffectInstance* effect;
SnowflakeFXData* part; SnowflakeFXData* part;
@ -31,14 +31,14 @@ void snowflake_main(f32 arg0, f32 arg1, f32 arg2, s32 arg3, s32 arg4) {
ASSERT(effect->data.snowflake != NULL); ASSERT(effect->data.snowflake != NULL);
part->xPos = arg0; part->pos.x = x;
part->yPos = arg1; part->pos.y = y;
part->zPos = arg2; part->pos.z = z;
part->unk_0C = 0; part->unk_0C = 0;
part->unk_10 = -3.0f;
part->unk_14 = 0; part->unk_14 = 0;
part->unk_18 = 0; part->unk_18 = 0;
part->unk_1C = 0; part->unk_1C = 0;
part->unk_10 = -3.0f;
part->unk_20 = 3.0f; part->unk_20 = 3.0f;
if (D_E001C5E0 != 0) { if (D_E001C5E0 != 0) {
phi_f4 = -10.0f; phi_f4 = -10.0f;
@ -66,9 +66,9 @@ void snowflake_update(EffectInstance* effect) {
return; return;
} }
data->xPos += data->unk_0C; data->pos.x += data->unk_0C;
data->yPos += data->unk_10; data->pos.y += data->unk_10;
data->zPos += data->unk_14; data->pos.z += data->unk_14;
data->unk_18 += data->unk_20; data->unk_18 += data->unk_20;
if (data->unk_18 < 10.0f) { if (data->unk_18 < 10.0f) {
data->unk_18 = 10.0f; data->unk_18 = 10.0f;
@ -83,28 +83,28 @@ void snowflake_update(EffectInstance* effect) {
void snowflake_render(EffectInstance* effect) { void snowflake_render(EffectInstance* effect) {
PlayerStatus* playerStatus = &gPlayerStatus; PlayerStatus* playerStatus = &gPlayerStatus;
SnowflakeFXData* effect14 = effect->data.snowflake; SnowflakeFXData* data = effect->data.snowflake;
RenderTask renderTask; RenderTask renderTask;
RenderTask* renderTaskPtr = &renderTask; RenderTask* renderTaskPtr = &renderTask;
RenderTask* retTask; RenderTask* retTask;
f32 effectPos = effect14->xPos; f32 effectPos = data->pos.x;
f32 playerPos = playerStatus->position.x; f32 playerPos = playerStatus->position.x;
if (effectPos - playerPos > 200) { if (effectPos - playerPos > 200) {
effect14->xPos = effectPos - 400; data->pos.x = effectPos - 400;
} else { } else {
if (playerPos - effectPos > 200) { if (playerPos - effectPos > 200) {
effect14->xPos = effectPos + 400; data->pos.x = effectPos + 400;
} }
} }
effectPos = effect14->zPos; effectPos = data->pos.z;
playerPos = playerStatus->position.z; playerPos = playerStatus->position.z;
if (effectPos - playerPos > 200) { if (effectPos - playerPos > 200) {
effect14->zPos = effectPos - 400; data->pos.z = effectPos - 400;
} else { } else {
if (playerPos - effectPos > 200) { if (playerPos - effectPos > 200) {
effect14->zPos = effectPos + 400; data->pos.z = effectPos + 400;
} }
} }
@ -120,13 +120,13 @@ void snowflake_render(EffectInstance* effect) {
void snowflake_appendGfx(void* effect) { void snowflake_appendGfx(void* effect) {
Matrix4f sp18, sp58, sp98, spD8, sp118; Matrix4f sp18, sp58, sp98, spD8, sp118;
EffectInstance* effectTemp = effect; EffectInstance* effectTemp = effect;
SnowflakeFXData* part = effectTemp->data.snowflake; SnowflakeFXData* data = effectTemp->data.snowflake;
gDPPipeSync(gMasterGfxPos++); gDPPipeSync(gMasterGfxPos++);
gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data));
gSPDisplayList(gMasterGfxPos++, D_09000900_331800); gSPDisplayList(gMasterGfxPos++, D_09000900_331800);
shim_guTranslateF(sp18, part->xPos, part->yPos, part->zPos); shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z);
shim_guRotateF(spD8, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); shim_guRotateF(spD8, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f);
shim_guMtxCatF(spD8, sp18, sp118); shim_guMtxCatF(spD8, sp18, sp118);
shim_guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]); shim_guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]);
@ -134,8 +134,8 @@ void snowflake_appendGfx(void* effect) {
gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 255); gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 255);
shim_guRotateF(sp58, part->unk_18, 1.0f, 0.0f, 0.0f); shim_guRotateF(sp58, data->unk_18, 1.0f, 0.0f, 0.0f);
shim_guRotateF(sp98, part->unk_1C, 0.0f, 1.0f, 0.0f); shim_guRotateF(sp98, data->unk_1C, 0.0f, 1.0f, 0.0f);
shim_guMtxCatF(sp58, sp98, sp118); shim_guMtxCatF(sp58, sp98, sp118);
shim_guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]); shim_guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]);

8
src/effects/water_splash.c
View File

@ -1,6 +1,14 @@
#include "common.h" #include "common.h"
#include "effects_internal.h" #include "effects_internal.h"
extern Gfx D_09000268_3BCCF8[];
extern Gfx D_09000288_3BCD18[];
extern Gfx D_090002A8_3BCD38[];
Gfx* D_E00BEAF0[] = {
D_09000268_3BCCF8, D_09000288_3BCD18, D_09000268_3BCCF8, D_090002A8_3BCD38
};
void water_splash_appendGfx(void* effect); void water_splash_appendGfx(void* effect);
INCLUDE_ASM(s32, "effects/water_splash", water_splash_main); INCLUDE_ASM(s32, "effects/water_splash", water_splash_main);

19
src/sprite.c
View File

@ -92,15 +92,6 @@ PlayerSpriteSet spr_playerSpriteSets[] = {
/* Peach */ { 6, 0x900, 0x00003C00 }, /* Peach */ { 6, 0x900, 0x00003C00 },
}; };
void spr_appendGfx_component_flat(
Quad* vertices,
IMG_PTR raster, PAL_PTR palette,
s32 width, s32 height,
f32 arg5,
Matrix4f mtx,
s32 alpha
);
void spr_init_quad_cache(void) { void spr_init_quad_cache(void) {
s32 i; s32 i;
@ -196,6 +187,16 @@ void spr_clear_quad_cache(void) {
} }
} }
void spr_appendGfx_component_flat(
Quad* vertices,
IMG_PTR raster, PAL_PTR palette,
s32 width, s32 height,
f32 arg5,
Matrix4f mtx,
s32 alpha
);
INCLUDE_ASM(s32, "sprite", spr_appendGfx_component_flat); INCLUDE_ASM(s32, "sprite", spr_appendGfx_component_flat);
void spr_appendGfx_component( void spr_appendGfx_component(

4
src/sprite.h
View File

@ -32,7 +32,7 @@ typedef struct SpriteAnimComponent {
// TODO: consider moving to 101b90_len_8f0 (sprite_cache) // TODO: consider moving to 101b90_len_8f0 (sprite_cache)
typedef struct SpriteRasterCacheEntry { typedef struct SpriteRasterCacheEntry {
/* 0x00 */ void* image; /* 0x00 */ IMG_PTR image;
/* 0x04 */ u8 width; /* 0x04 */ u8 width;
/* 0x05 */ u8 height; /* 0x05 */ u8 height;
/* 0x06 */ s8 palette; /* 0x06 */ s8 palette;
@ -71,7 +71,7 @@ typedef struct PlayerSpriteCacheEntry {
/* 0x00 */ s32 lazyDeleteTime; /* 0x00 */ s32 lazyDeleteTime;
/* 0x04 */ s32 rasterIndex; /* 0x04 */ s32 rasterIndex;
/* 0x08 */ s32 spriteIndex; /* 0x08 */ s32 spriteIndex;
/* 0x0C */ IMG_PTR* raster; /* 0x0C */ IMG_PTR raster;
} PlayerSpriteCacheEntry; // size = 0x10 } PlayerSpriteCacheEntry; // size = 0x10
/// Sprite data header. /// Sprite data header.

149
tools/migrate_effect_rodata.py Executable file
View File

@ -0,0 +1,149 @@
#!/usr/bin/python3
import os
from pathlib import Path
script_dir = os.path.dirname(os.path.realpath(__file__))
root_dir = script_dir + "/../"
asm_dir = root_dir + "ver/current/asm/"
asm_effects_dir = asm_dir + "nonmatchings/effects/"
asm_data_dir = asm_dir + "data/effects/"
data_to_thing = {
"337F10": "sparkles",
"339F10": "shape_spell",
"33BB70": "gather_energy_pink",
"33D5D0": "drop_leaves",
"33EFE0": "dust",
"3407C0": "shattering_stones",
"342120": "smoke_ring",
"342FD0": "damage_stars",
"343F30": "explosion",
"345190": "lens_flare",
"345B10": "got_item_outline",
"34E710": "spiky_white_aura",
"34F480": "smoke_impact",
"352CB0": "purple_ring",
"354F20": "stars_burst",
"355D10": "stars_shimmer",
"3564E0": "rising_bubble",
"357380": "ring_blast",
"359320": "shockwave",
"35A580": "music_note",
"35BFB0": "smoke_burst",
"35C530": "sweat",
"35E8A0": "windy_leaves",
"35F0A0": "falling_leaves",
"360A10": "stars_spread",
"361640": "steam_burst",
"362C30": "stars_orbiting",
"365970": "green_impact",
"366C80": "radial_shimmer",
"36AE80": "ending_decals",
"36DE10": "light_rays",
"36ED30": "lightning",
"374D80": "shimmer_burst",
"375500": "energy_shockwave",
"376FC0": "shimmer_wave",
"37ACF0": "bulb_glow",
"37D140": "effect_3D",
"38A2F0": "firework",
"38BAB0": "confetti",
"38D040": "snowfall",
"38E8F0": "effect_46",
"38F6F0": "gather_magic",
"393080": "flashing_box_shockwave",
"3960C0": "floating_rock",
"397010": "chomp_drop",
"3BD770": "snowman_doll",
"3C1B60": "fright_jar",
"3CB7C0": "stop_watch",
"3CD670": "effect_63",
"3D11B0": "effect_65",
"3D2460": "tubba_heart_attack",
"3D3910": "whirlwind",
"3D4930": "red_impact",
"3D4E70": "floating_cloud_puff",
"3D5E60": "energy_in_out",
"3D7740": "shiny_flare",
"3D80B0": "huff_puff_breath",
"3D8F30": "cold_breath",
"3DBEA0": "embers",
"3DCD00": "hieroglyphs",
"3DED90": "misc_particles",
"3E11B0": "static_status",
"3E1CC0": "moving_cloud",
"3E5060": "firework_rocket",
"3E5ED0": "peach_star_beam",
"3EBC30": "chapter_change",
"3F8CA0": "ice_shard",
"3FA480": "spirit_card",
"3FF180": "lil_oink",
"4032A0": "something_rotating",
"403BB0": "breaking_junk",
"404E40": "partner_buff",
"407040": "quizmo_assistant",
"40A180": "ice_pillar",
"40BB70": "sun",
"40D130": "star_spirits_energy",
"412FD0": "pink_sparkles",
"413F20": "star_outline",
}
def handle_symbol(effect, symbol):
for root, dirs, files in os.walk(asm_effects_dir + effect + "/"):
for f_name in files:
if f_name.endswith(".s"):
f_path = os.path.join(root, f_name)
with open(f_path) as f:
asm_lines = f.readlines()
has_rodata_section = False
for line in asm_lines:
if ".section .rodata" in line:
has_rodata_section = True
continue
if symbol[1] in line:
if not has_rodata_section:
asm_lines.insert(3, ".section .rodata\n")
asm_lines.insert(4, "\n")
asm_lines.insert(5, ".section .text\n")
asm_lines.insert(6, "\n")
asm_lines.insert(5, f"dlabel {symbol[1]}\n")
asm_lines.insert(6, f"{symbol[2]}\n")
asm_lines.insert(7, "\n")
with open(f_path, "w", newline="\n") as f:
f.write("".join(asm_lines))
return True
return False
def handle_file(f_path):
with open(f_path) as f:
rodata_lines = f.readlines()[4:]
effect = f_path.split("/")[-1].split(".")[0]
symbols = []
for i in range(0, len(rodata_lines), 3):
l1 = rodata_lines[i].strip()
l2 = rodata_lines[i + 1].strip()
symbols.append((i + 4, l1.split()[1], l2))
for symbol in reversed(symbols):
if symbol[2].startswith(".word") and not symbol[1].startswith("jtbl_"):
print("skipping" + str(symbol))
continue
migrated = handle_symbol(data_to_thing[effect], symbol)
# Walk through asm files and rename stuff
print("Walking through asm files")
for root, dirs, files in os.walk(asm_data_dir):
for f_name in files:
if f_name.endswith(".data.s"):
f_path = os.path.join(root, f_name)
handle_file(f_path)

4
tools/splat/.gitrepo
View File

@ -6,7 +6,7 @@
[subrepo] [subrepo]
remote = https://github.com/ethteck/splat.git remote = https://github.com/ethteck/splat.git
branch = master branch = master
commit = fd9cbc3a16ce6e7a4ba81ca36c1ee35472d9c0c2 commit = b681843a788a48824ca60d5063a8f6494e444ddc
parent = 70aeffbdc06b9b84e4e848a412afc5c6e9cde4bd parent = de8a76e84bb952636a1caee8408417bcedf4a326
method = merge method = merge
cmdver = 0.4.3 cmdver = 0.4.3

13
tools/splat/CHANGELOG.md
View File

@ -1,5 +1,8 @@
# splat Release Notes # splat Release Notes
### 0.9.2
* Added "palette" argument to ci4/ci8 segments so that segments' palettes can be manually specified
### 0.9.1 ### 0.9.1
* Fixed a bug in which local labels and jump table labels could replace raw words in data blobs during data disassembly * Fixed a bug in which local labels and jump table labels could replace raw words in data blobs during data disassembly
@ -22,11 +25,11 @@ We plan to roll this out in phases. Currently, it only handles actual code disas
### Global options changes ### Global options changes
The new `symbol_name_format` option allows specification of how symbols will be named. This can be set as a global option and also changed per-segment. `symbol_norom_name_format` is used when the symbol does not have a rom address (BSS). The new `symbol_name_format` option allows specification of how symbols will be named. This can be set as a global option and also changed per-segment. `symbol_name_format_no_rom` is used when the symbol does not have a rom address (BSS).
The following substitutions are allowed: The following substitutions are allowed:
`$ROM` - the rom address of the symbol, hex-formatted and padded to 6 characters (ABCF10, 000030, 123456) (note: only for `symbol_name_format`, usage in `symbol_norom_name_format` will cause an error) `$ROM` - the rom address of the symbol, hex-formatted and padded to 6 characters (ABCF10, 000030, 123456) (note: only for `symbol_name_format`, usage in `symbol_name_format_no_rom` will cause an error)
`$VRAM` - the vram address of the symbol, hex-formatted and padded to 8 characters (00030010, 00020015, ABCDEF10) `$VRAM` - the vram address of the symbol, hex-formatted and padded to 8 characters (00030010, 00020015, ABCDEF10)
@ -34,14 +37,14 @@ The new `symbol_name_format` option allows specification of how symbols will be
The default values for these options are as follows The default values for these options are as follows
`symbol_name_format` : `$VRAM_$ROM` `symbol_name_format` : `$VRAM`
`symbol_noram_name_format` : `$VRAM_$SEG` `symbol_name_format_no_rom` : `$VRAM_$SEG`
The appropriate prefix string will still automatically be applied depending on the type of the symbol: `D_` for data, `jtbl_` for jump tables, and `func_` for functions. This functionality may be customizable in the future. The appropriate prefix string will still automatically be applied depending on the type of the symbol: `D_` for data, `jtbl_` for jump tables, and `func_` for functions. This functionality may be customizable in the future.
---- ----
The `auto_all_section` option now should be a list of section names (`[".data", ".rodata", ".bss"]` by default) indicating the sections that should be linked from .o files built from source files (.c or asm/hasm .s files), when no subsegment explicitly indicates linking this type of section. The `auto_all_sections` option now should be a list of section names (`[".data", ".rodata", ".bss"]` by default) indicating the sections that should be linked from .o files built from source files (.c or asm/hasm .s files), when no subsegment explicitly indicates linking this type of section.
For example, if any subsegment of a code segment is of segment type `data` or `.data`, the `.data` section from all `c`/`asm`/`hasm` subsegments will not be linked unless explicitly indicated with a relevant `.data` subsegment. For example, if any subsegment of a code segment is of segment type `data` or `.data`, the `.data` section from all `c`/`asm`/`hasm` subsegments will not be linked unless explicitly indicated with a relevant `.data` subsegment.

10
tools/splat/segtypes/n64/ci8.py
View File

@ -43,7 +43,15 @@ class N64SegCi8(N64SegRgba16):
) )
self.palette: "Optional[Palette]" = None self.palette: "Optional[Palette]" = None
self.palette_name = self.name
palette_name = self.name
if isinstance(yaml, dict):
if "palette" in yaml:
palette_name = yaml["palette"]
elif len(args) > 2:
palette_name = args[2]
self.palette_name = palette_name
def split(self, rom_bytes): def split(self, rom_bytes):
path = options.get_asset_path() / self.dir / (self.name + ".png") path = options.get_asset_path() / self.dir / (self.name + ".png")

17
tools/splat/segtypes/n64/ia16.py
View File

@ -3,16 +3,17 @@ from util import iter
class N64SegIa16(N64SegIa4): class N64SegIa16(N64SegIa4):
@staticmethod def split(self, rom_bytes):
def parse_image(data, width, height, flip_h=False, flip_v=False): path = self.out_path()
img = bytearray() path.parent.mkdir(parents=True, exist_ok=True)
for x, y, i in iter.iter_image_indexes(width, height, 2, 1, flip_h, flip_v): data = rom_bytes[self.rom_start : self.rom_end]
i1 = data[i]
a1 = data[i + 1]
img += bytes((i1, a1))
return img w = self.__class__.get_writer(self.width, self.height)
with open(path, "wb") as f:
w.write_array(f, data)
self.log(f"Wrote {self.name} to {path}")
def max_length(self): def max_length(self):
return self.width * self.height * 2 return self.width * self.height * 2

2
tools/splat/split.py
View File

@ -20,7 +20,7 @@ from util.symbols import Symbol
from intervaltree import Interval, IntervalTree from intervaltree import Interval, IntervalTree
VERSION = "0.9.0" VERSION = "0.9.2"
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description="Split a rom given a rom, a config, and output directory" description="Split a rom given a rom, a config, and output directory"

10
tools/splat/util/palettes.py
View File

@ -1,21 +1,19 @@
from typing import Dict from typing import Dict, Union
from segtypes.n64.ci4 import N64SegCi4, N64SegCi8
from segtypes.n64.palette import N64SegPalette as Palette from segtypes.n64.palette import N64SegPalette as Palette
from segtypes.n64.ci8 import N64SegCi8 as Raster
from segtypes.common.group import CommonSegGroup from segtypes.common.group import CommonSegGroup
# Resolve Raster#palette and Palette#raster links # Resolve Raster#palette and Palette#raster links
def initialize(all_segments): def initialize(all_segments):
global palettes_remaining
def process(segments): def process(segments):
raster_map: Dict[str, Raster] = {} raster_map: Dict[str, Union[N64SegCi4, N64SegCi8]] = {}
palette_map: Dict[str, Palette] = {} palette_map: Dict[str, Palette] = {}
for segment in segments: for segment in segments:
if isinstance(segment, Palette): if isinstance(segment, Palette):
palette_map[segment.name] = segment palette_map[segment.name] = segment
if isinstance(segment, Raster): if isinstance(segment, N64SegCi4) or isinstance(segment, N64SegCi8):
raster_map[segment.name] = segment raster_map[segment.name] = segment
if isinstance(segment, CommonSegGroup): if isinstance(segment, CommonSegGroup):

12
ver/us/asm/data/effects/330440.data.s
View File

@ -1,12 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E001A610
.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
dlabel D_E001A620
.double 0.001
dlabel D_E001A628
.double 0.0007

24
ver/us/asm/data/effects/337F10.data.s
View File

@ -13,27 +13,3 @@ dlabel D_E0022D14
dlabel D_E0022D1C dlabel D_E0022D1C
.ascii "<Zdhjlm\0\0\0\0\0\0\0\0\0\0\0\0\0" .ascii "<Zdhjlm\0\0\0\0\0\0\0\0\0\0\0\0\0"
dlabel D_E0022D30
.word 0xE00221DC, 0xE0022318, 0xE0022318, 0xE00223EC, 0xE00223EC, 0x00000000
dlabel D_E0022D48
.double 0.05
dlabel D_E0022D50
.double 0.05
dlabel D_E0022D58
.double 0.01
dlabel D_E0022D60
.double 0.96
dlabel D_E0022D68
.double 0.1
dlabel D_E0022D70
.double -0.02
dlabel D_E0022D78
.double 0.9

15
ver/us/asm/data/effects/339F10.data.s
View File

@ -1,15 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E0024CC0
.word 0x00FFD01A, 0x09001128, 0x090011A0, 0x784DD0FE, 0x09001150, 0x090011C8, 0xF0FE4C6E, 0x09001178, 0x090011F0, 0x00000000, 0x00000000, 0x00000000
dlabel D_E0024CF0
.double 0.9
dlabel D_E0024CF8
.double 0.83
dlabel D_E0024D00
.double 1.2048192771084338, 0.0

18
ver/us/asm/data/effects/33BB70.data.s
View File

@ -10,21 +10,3 @@ dlabel D_E00269F8
dlabel D_E0026A00 dlabel D_E0026A00
.word 0xFFC59CFF, 0x9CFFFF73, 0xD6FF9CFF, 0xFFC57BFF, 0xB4FFDE73, 0xFFFF949C, 0x00000000, 0x00000000 .word 0xFFC59CFF, 0x9CFFFF73, 0xD6FF9CFF, 0xFFC57BFF, 0xB4FFDE73, 0xFFFF949C, 0x00000000, 0x00000000
dlabel D_E0026A20
.double 0.2
dlabel D_E0026A28
.double 0.7
dlabel D_E0026A30
.double 0.1
dlabel D_E0026A38
.double 0.4
dlabel D_E0026A40
.double 0.1
dlabel D_E0026A48
.double 0.3

24
ver/us/asm/data/effects/33D5D0.data.s
View File

@ -1,24 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00287E0
.double 0.3
dlabel D_E00287E8
.double 0.8
dlabel D_E00287F0
.double 0.2
dlabel D_E00287F8
.double 0.94
dlabel D_E0028800
.double 0.05
dlabel D_E0028808
.double 0.95
dlabel D_E0028810
.double 0.92, 0.0

15
ver/us/asm/data/effects/33EFE0.data.s
View File

@ -1,15 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E002A720
.double 0.1
dlabel D_E002A728
.double 0.2
dlabel D_E002A730
.double 0.9
dlabel D_E002A738
.double 0.005

15
ver/us/asm/data/effects/3407C0.data.s
View File

@ -13,18 +13,3 @@ dlabel D_E002C964
dlabel D_E002C984 dlabel D_E002C984
.word 0xC0A00000, 0xC0800000, 0xC0400000, 0xC0000000, 0x40000000, 0xC0400000, 0x40A00000, 0xC0800000, 0xC0800000, 0x40000000, 0xBF800000, 0x40800000, 0x40400000, 0x40000000, 0x40A00000, 0x40800000, 0x00000000, 0x00000000, 0x00000000 .word 0xC0A00000, 0xC0800000, 0xC0400000, 0xC0000000, 0x40000000, 0xC0400000, 0x40A00000, 0xC0800000, 0xC0800000, 0x40000000, 0xBF800000, 0x40800000, 0x40400000, 0x40000000, 0x40A00000, 0x40800000, 0x00000000, 0x00000000, 0x00000000
dlabel D_E002C9D0
.double 0.1
dlabel D_E002C9D8
.double -0.1
dlabel D_E002C9E0
.double 0.8
dlabel D_E002C9E8
.double -0.2
dlabel D_E002C9F0
.double 0.9, 0.0

15
ver/us/asm/data/effects/342FD0.data.s
View File

@ -7,18 +7,3 @@ dlabel D_E0030E90
dlabel D_E0030EB4 dlabel D_E0030EB4
.word 0x00000000, 0x00000000, 0x00000000 .word 0x00000000, 0x00000000, 0x00000000
dlabel D_E0030EC0
.word 0xE00305D0, 0xE00305DC, 0xE00305F4, 0xE0030660, 0xE0030660, 0x00000000
dlabel D_E0030ED8
.double 0.94
dlabel D_E0030EE0
.double 0.8
dlabel D_E0030EE8
.double 0.6
dlabel D_E0030EF0
.double 0.7, 0.0

18
ver/us/asm/data/effects/343F30.data.s
View File

@ -4,21 +4,3 @@
dlabel D_E00328B0 dlabel D_E00328B0
.word 0x09000978, 0x090009D8, 0x09000A38, 0x00000000 .word 0x09000978, 0x090009D8, 0x09000A38, 0x00000000
dlabel D_E00328C0
.double 0.4
dlabel D_E00328C8
.double 0.6
dlabel D_E00328D0
.double 0.9
dlabel D_E00328D8
.double 0.6
dlabel D_E00328E0
.double 0.1
dlabel D_E00328E8
.double 0.9

12
ver/us/asm/data/effects/345190.data.s
View File

@ -16,15 +16,3 @@ dlabel D_E0034791
dlabel D_E0034792 dlabel D_E0034792
.byte 0x52, 0xFF, 0xFF, 0x52, 0xB5, 0x94, 0x00, 0xB5, 0x94, 0x00, 0xFF, 0xFF, 0xD6, 0xFF, 0xFF, 0xD6, 0xB5, 0x94, 0x00, 0xB5, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x52, 0xFF, 0xFF, 0x52, 0xB5, 0x94, 0x00, 0xB5, 0x94, 0x00, 0xFF, 0xFF, 0xD6, 0xFF, 0xFF, 0xD6, 0xB5, 0x94, 0x00, 0xB5, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
dlabel D_E00347B0
.double 0.78
dlabel D_E00347B8
.double 0.93
dlabel D_E00347C0
.double 0.29
dlabel D_E00347C8
.double 0.9

3
ver/us/asm/data/effects/345B10.data.s
View File

@ -10,6 +10,3 @@ dlabel D_E0036640
dlabel D_E0036648 dlabel D_E0036648
.byte 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x00, 0x00 .byte 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x00, 0x00
dlabel D_E0036650
.double 0.6, 0.0

15
ver/us/asm/data/effects/34E710.data.s
View File

@ -4,18 +4,3 @@
dlabel D_E00389F0 dlabel D_E00389F0
.word 0xFEACACFE, 0xACD5FEB4, 0x9AD5B4FE, 0xB4B4FEB4, 0xDDFEB4FE, 0xFEB4FED5, 0xB4FEB4D5, 0xFEB4FEFE, 0xB4FED5AC, 0x00000000, 0x00000000, 0x00000000 .word 0xFEACACFE, 0xACD5FEB4, 0x9AD5B4FE, 0xB4B4FEB4, 0xDDFEB4FE, 0xFEB4FED5, 0xB4FEB4D5, 0xFEB4FEFE, 0xB4FED5AC, 0x00000000, 0x00000000, 0x00000000
dlabel D_E0038A20
.double 0.6
dlabel D_E0038A28
.double 0.8
dlabel D_E0038A30
.double 0.7
dlabel D_E0038A38
.double 0.4
dlabel D_E0038A40
.double 0.6, 0.0

6
ver/us/asm/data/effects/34F480.data.s
View File

@ -8,11 +8,5 @@ dlabel D_E003A800
dlabel D_E003A80C dlabel D_E003A80C
.word 0x09002A38, 0x09002A38, 0x09002A38, 0x00000000, 0x00000000 .word 0x09002A38, 0x09002A38, 0x09002A38, 0x00000000, 0x00000000
dlabel D_E003A820
.double 0.1
dlabel D_E003A828
.double 0.04
dlabel D_E003A830
.double 0.9, 0.0

21
ver/us/asm/data/effects/352CB0.data.s
View File

@ -1,21 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E003E870
.double 0.1
dlabel D_E003E878
.double 0.3
dlabel D_E003E880
.double 0.8
dlabel D_E003E888
.double 0.6
dlabel D_E003E890
.double 0.7
dlabel D_E003E898
.double 1.05

6
ver/us/asm/data/effects/354F20.data.s
View File

@ -4,9 +4,3 @@
dlabel D_E0042780 dlabel D_E0042780
.word 0xFEACACFE, 0xACD5FEB4, 0x9AD5B4FE, 0xB4B4FEB4, 0xDDFEB4FE, 0xFEB4FED5, 0xB4FEB4D5, 0xFEB4FEFE, 0xB4FED5AC, 0x00000000, 0x00000000, 0x00000000 .word 0xFEACACFE, 0xACD5FEB4, 0x9AD5B4FE, 0xB4B4FEB4, 0xDDFEB4FE, 0xFEB4FED5, 0xB4FEB4D5, 0xFEB4FEFE, 0xB4FED5AC, 0x00000000, 0x00000000, 0x00000000
dlabel D_E00427B0
.double 0.8
dlabel D_E00427B8
.double 0.9

36
ver/us/asm/data/effects/355D10.data.s
View File

@ -13,39 +13,3 @@ dlabel D_E0044DF4
dlabel D_E0044E04 dlabel D_E0044E04
.ascii "<Zdhjlnpqqnkg\0\0\0\0\0\0\0\0\0\0\0\0\0\0" .ascii "<Zdhjlnpqqnkg\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
dlabel D_E0044E20
.double 0.1
dlabel D_E0044E28
.double 0.005
dlabel D_E0044E30
.double 0.4
dlabel D_E0044E38
.double 0.4
dlabel D_E0044E40
.word 0xE0044284, 0xE0044284, 0xE0044344, 0xE00442A8, 0xE0044344, 0xE0044344
dlabel D_E0044E58
.double 0.01
dlabel D_E0044E60
.double 0.01
dlabel D_E0044E68
.double 0.96
dlabel D_E0044E70
.double 0.1
dlabel D_E0044E78
.word 0xE0044514, 0xE0044514, 0xE0044704, 0xE00446B0, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE004462C, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE004462C, 0x00000000
dlabel D_E0044EF8
.double -0.02
dlabel jtbl_E0044F00
.word LE0044A74_3559D4, LE0044A74_3559D4, LE0044A74_3559D4, LE0044A98_3559F8, LE0044B14_355A74, LE0044AF4_355A54, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044A74_3559D4, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044A98_3559F8, 0

15
ver/us/asm/data/effects/3564E0.data.s
View File

@ -13,18 +13,3 @@ dlabel D_E0046614
dlabel D_E0046618 dlabel D_E0046618
.word 0x09000308, 0x00000000 .word 0x09000308, 0x00000000
dlabel D_E0046620
.double 0.1
dlabel D_E0046628
.double 0.7
dlabel D_E0046630
.double 0.4
dlabel D_E0046638
.double 0.3
dlabel D_E0046640
.double 0.1, 0.0

3
ver/us/asm/data/effects/357380.data.s
View File

@ -7,6 +7,3 @@ dlabel D_E0048A00
dlabel D_E0048A08 dlabel D_E0048A08
.word 0x09001040, 0x09001040 .word 0x09001040, 0x09001040
dlabel D_E0048A10
.double 0.1, 0.0

30
ver/us/asm/data/effects/359320.data.s
View File

@ -4,33 +4,3 @@
dlabel D_E004AE60 dlabel D_E004AE60
.word 0x090009A0, 0x090009A0, 0x09000A80, 0x09000A80, 0x09000A80, 0x09000A80, 0x00000000, 0x00000000 .word 0x090009A0, 0x090009A0, 0x09000A80, 0x09000A80, 0x09000A80, 0x09000A80, 0x00000000, 0x00000000
dlabel jtbl_E004AE80
.word LE004A1AC_35866C, LE004A1AC_35866C, LE004A1D4_358694, LE004A200_3586C0, LE004A25C_35871C, LE004A22C_3586EC
dlabel D_E004AE98
.double 0.8
dlabel D_E004AEA0
.double 0.94
dlabel D_E004AEA8
.double 1.002
dlabel D_E004AEB0
.word 0xE004A4F8, 0xE004A4F8, 0xE004A51C, 0xE004A548, 0xE004A584, 0xE004A51C
dlabel D_E004AEC8
.double 0.8
dlabel D_E004AED0
.double 0.9
dlabel D_E004AED8
.double 0.99
dlabel D_E004AEE0
.double 0.95
dlabel D_E004AEE8
.double 0.3

27
ver/us/asm/data/effects/35A580.data.s
View File

@ -1,27 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E004C660
.word 0x09001038, 0x090010C0, 0x09001148, 0x090011D0, 0x09001258, 0x090012E0, 0x09001368
dlabel D_E004C67C
.byte 0xFE
dlabel D_E004C67D
.byte 0xAC
dlabel D_E004C67E
.byte 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
dlabel D_E004C6A0
.double 0.1
dlabel D_E004C6A8
.double 0.1
dlabel D_E004C6B0
.double 0.3
dlabel D_E004C6B8
.double 0.04

12
ver/us/asm/data/effects/35C530.data.s
View File

@ -1,12 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E0050560
.double 0.94
dlabel D_E0050568
.double 0.05
dlabel D_E0050570
.double -0.1, 0.0

12
ver/us/asm/data/effects/35D460.data.s
View File

@ -1,12 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00529E0
.word 0x408CCCCD, 0x404CCCCD, 0x40ACCCCD, 0x402CCCCD, 0x40C00000, 0x409CCCCD, 0x40A66666, 0x40466666, 0x4019999A, 0x40900000, 0x40266666, 0x40B66666, 0x40733333, 0x4039999A, 0x40466666, 0x40A66666, 0x40133333, 0x40ACCCCD, 0x40600000, 0x40266666, 0x4019999A, 0x40466666, 0x40A66666, 0x409CCCCD, 0x40C00000, 0x402CCCCD, 0x40ACCCCD, 0x404CCCCD, 0x408CCCCD, 0x40266666, 0x40600000, 0x40ACCCCD, 0x40133333, 0x40A66666, 0x40466666, 0x4039999A, 0x40733333, 0x40B66666, 0x40266666, 0x40900000
dlabel D_E0052A80
.double 0.1
dlabel D_E0052A88
.double 1.2

51
ver/us/asm/data/effects/35E8A0.data.s
View File

@ -1,51 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E0056EA0
.double 0.1
dlabel D_E0056EA8
.double 0.008
dlabel D_E0056EB0
.double 0.05
dlabel D_E0056EB8
.double 0.3
dlabel D_E0056EC0
.double 0.8
dlabel D_E0056EC8
.double 0.4
dlabel D_E0056ED0
.double 0.98
dlabel D_E0056ED8
.double 0.2
dlabel D_E0056EE0
.double 0.94
dlabel D_E0056EE8
.double 0.05
dlabel D_E0056EF0
.double 0.95
dlabel D_E0056EF8
.double 0.92
dlabel D_E0056F00
.double 0.8
dlabel D_E0056F08
.double 0.9603999999999999
dlabel D_E0056F10
.double 0.2
dlabel D_E0056F18
.double 0.8464

24
ver/us/asm/data/effects/35F0A0.data.s
View File

@ -1,24 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E0058780
.double 0.3
dlabel D_E0058788
.double 0.8
dlabel D_E0058790
.double 0.2
dlabel D_E0058798
.double 0.94
dlabel D_E00587A0
.double 0.05
dlabel D_E00587A8
.double 0.95
dlabel D_E00587B0
.double 0.92, 0.0

12
ver/us/asm/data/effects/360A10.data.s
View File

@ -1,12 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E005A750
.double 0.8
dlabel D_E005A758
.double 0.7
dlabel D_E005A760
.double 0.2, 0.0

9
ver/us/asm/data/effects/361640.data.s
View File

@ -7,12 +7,3 @@ dlabel D_E005C700
dlabel D_E005C704 dlabel D_E005C704
.word 0x09000E00, 0x00000000, 0x00000000 .word 0x09000E00, 0x00000000, 0x00000000
dlabel D_E005C710
.double 0.1
dlabel D_E005C718
.double 0.04
dlabel D_E005C720
.double 0.9, 0.0

3
ver/us/asm/data/effects/362C30.data.s
View File

@ -7,6 +7,3 @@ dlabel D_E005E670
dlabel D_E005E674 dlabel D_E005E674
.word 0x09000440, 0x00000000, 0x00000000 .word 0x09000440, 0x00000000, 0x00000000
dlabel D_E005E680
.double 0.1, 0.0

15
ver/us/asm/data/effects/365970.data.s
View File

@ -4,18 +4,3 @@
dlabel D_E0064A60 dlabel D_E0064A60
.word 0x090005A0, 0x090005A0, 0x00000000, 0x00000000 .word 0x090005A0, 0x090005A0, 0x00000000, 0x00000000
dlabel D_E0064A70
.double 0.8
dlabel D_E0064A78
.double 0.2
dlabel D_E0064A80
.double 0.9
dlabel D_E0064A88
.double 0.1
dlabel D_E0064A90
.double 0.3, 0.0

6
ver/us/asm/data/effects/366C80.data.s
View File

@ -7,9 +7,3 @@ dlabel D_E0066C50
dlabel D_E0066C8C dlabel D_E0066C8C
.word 0x09003508, 0x090035E8, 0x09003428, 0x090039A8, 0x09003A88, 0x09003428, 0x090039A8, 0x09003A88, 0x090038B8, 0x09003508, 0x090038B8, 0x090038B8, 0x09003428, 0x09003A88, 0x090036C8, 0xFFC59CFF, 0x9CFFFF73, 0xD6FF9CFF, 0xFFC57BFF, 0xB4FFDE73, 0xFFFF949C .word 0x09003508, 0x090035E8, 0x09003428, 0x090039A8, 0x09003A88, 0x09003428, 0x090039A8, 0x09003A88, 0x090038B8, 0x09003508, 0x090038B8, 0x090038B8, 0x09003428, 0x09003A88, 0x090036C8, 0xFFC59CFF, 0x9CFFFF73, 0xD6FF9CFF, 0xFFC57BFF, 0xB4FFDE73, 0xFFFF949C
dlabel jtbl_E0066CE0
.word LE006615C_36618C, LE006615C_36618C, LE0066198_3661C8, LE00661C0_3661F0, LE006620C_36623C, LE0066240_366270, LE006626C_36629C, LE00662A0_3662D0, LE00662DC_36630C, LE0066318_366348, LE0066348_366378, LE00663AC_3663DC, LE00663F8_366428, LE00663F8_366428, LE006642C_36645C, 0
dlabel D_E0066D20
.double 0.7, 0.0

2
ver/us/asm/data/effects/36AE80.data.s
View File

@ -11,5 +11,3 @@ dlabel D_E00685BC
dlabel D_E00685F4 dlabel D_E00685F4
.word 0x09001F78, 0x09001F78, 0x09002078 .word 0x09001F78, 0x09001F78, 0x09002078
dlabel D_E0068600
.double 0.97, 0.0

6
ver/us/asm/data/effects/36DE10.data.s
View File

@ -11,11 +11,5 @@ dlabel D_E006AE00
dlabel D_E006AE10 dlabel D_E006AE10
.word 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000001, 0x00000012, 0xFFFFFFF6, 0xFFFFFFC4, 0x0000002D, 0xFFFFFFFF, 0x00000004, 0xFFFFFFEC, 0xFFFFFFEC, 0x0000005A, 0x00000001, 0x00000001, 0xFFFFFFF6, 0xFFFFFFC4, 0x00000087, 0x00000001, 0xFFFFFFFC, 0x00000000, 0xFFFFFFEC, 0x000000B4, 0xFFFFFFF8, 0x00000001, 0xFFFFFFF6, 0xFFFFFFC4, 0x000000E1, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFEC, 0xFFFFFFEC, 0x0000010E, 0x00000001, 0xFFFFFFF7, 0xFFFFFFF6, 0xFFFFFFC4, 0x0000013B, 0x00000004, 0x00000004, 0x00000000, 0x0000000A, 0x00000016, 0x00000004, 0x00000001, 0xFFFFFFF6, 0x00000014, 0x00000043, 0x00000001, 0xFFFFFFFF, 0xFFFFFFEC, 0x0000000A, 0x00000070, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFF6, 0x00000014, 0x0000009D, 0xFFFFFFF8, 0x00000001, 0x00000000, 0x0000000A, 0x000000CA, 0x00000001, 0xFFFFFFFC, 0xFFFFFFF6, 0x00000014, 0x000000F7, 0x00000001, 0xFFFFFFEE, 0xFFFFFFEC, 0x0000000A, 0x00000124, 0xFFFFFFFF, 0x00000009, 0xFFFFFFF6, 0x00000014, 0x00000151, 0x00000001, 0x00000001 .word 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000001, 0x00000012, 0xFFFFFFF6, 0xFFFFFFC4, 0x0000002D, 0xFFFFFFFF, 0x00000004, 0xFFFFFFEC, 0xFFFFFFEC, 0x0000005A, 0x00000001, 0x00000001, 0xFFFFFFF6, 0xFFFFFFC4, 0x00000087, 0x00000001, 0xFFFFFFFC, 0x00000000, 0xFFFFFFEC, 0x000000B4, 0xFFFFFFF8, 0x00000001, 0xFFFFFFF6, 0xFFFFFFC4, 0x000000E1, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFEC, 0xFFFFFFEC, 0x0000010E, 0x00000001, 0xFFFFFFF7, 0xFFFFFFF6, 0xFFFFFFC4, 0x0000013B, 0x00000004, 0x00000004, 0x00000000, 0x0000000A, 0x00000016, 0x00000004, 0x00000001, 0xFFFFFFF6, 0x00000014, 0x00000043, 0x00000001, 0xFFFFFFFF, 0xFFFFFFEC, 0x0000000A, 0x00000070, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFF6, 0x00000014, 0x0000009D, 0xFFFFFFF8, 0x00000001, 0x00000000, 0x0000000A, 0x000000CA, 0x00000001, 0xFFFFFFFC, 0xFFFFFFF6, 0x00000014, 0x000000F7, 0x00000001, 0xFFFFFFEE, 0xFFFFFFEC, 0x0000000A, 0x00000124, 0xFFFFFFFF, 0x00000009, 0xFFFFFFF6, 0x00000014, 0x00000151, 0x00000001, 0x00000001
dlabel D_E006AF50
.double 0.1
dlabel D_E006AF58
.double 0.3
dlabel D_E006AF60
.double 0.9, 0.0

21
ver/us/asm/data/effects/374D80.data.s
View File

@ -7,24 +7,3 @@ dlabel D_E0070CD0
dlabel D_E0070CF0 dlabel D_E0070CF0
.word 0x3E4CCCCD, 0x3ECCCCCD, 0x3F4CCCCD, 0x3FA66666, 0x3FC00000, 0x3FA66666, 0x3F666666, 0x3F19999A, 0x3ECCCCCD, 0x3E99999A, 0x3E4CCCCD, 0x3ECCCCCD, 0x3F4CCCCD, 0x3FA66666, 0x3FC00000, 0x3FA66666, 0x3F666666, 0x3F19999A, 0x3ECCCCCD, 0x3E99999A, 0xC8FAFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFAC8, 0x00000000, 0x00000000, 0x00000000 .word 0x3E4CCCCD, 0x3ECCCCCD, 0x3F4CCCCD, 0x3FA66666, 0x3FC00000, 0x3FA66666, 0x3F666666, 0x3F19999A, 0x3ECCCCCD, 0x3E99999A, 0x3E4CCCCD, 0x3ECCCCCD, 0x3F4CCCCD, 0x3FA66666, 0x3FC00000, 0x3FA66666, 0x3F666666, 0x3F19999A, 0x3ECCCCCD, 0x3E99999A, 0xC8FAFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFAC8, 0x00000000, 0x00000000, 0x00000000
dlabel D_E0070D60
.double 0.02
dlabel D_E0070D68
.double 0.04
dlabel D_E0070D70
.double 0.4
dlabel D_E0070D78
.double 0.1
dlabel D_E0070D80
.double 0.3
dlabel D_E0070D88
.double 0.2
dlabel D_E0070D90
.double 0.6, 0.0

6
ver/us/asm/data/effects/375500.data.s
View File

@ -1,6 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00726B0
.double 0.1, 0.0

12
ver/us/asm/data/effects/376FC0.data.s
View File

@ -7,15 +7,3 @@ dlabel D_E0074B60
dlabel D_E0074B80 dlabel D_E0074B80
.word 0x3E4CCCCD, 0x3ECCCCCD, 0x3F4CCCCD, 0x3FA66666, 0x3FC00000, 0x3FA66666, 0x3F666666, 0x3F19999A, 0x3ECCCCCD, 0x3E99999A, 0x3E4CCCCD, 0x3ECCCCCD, 0x3F4CCCCD, 0x3FA66666, 0x3FC00000, 0x3FA66666, 0x3F666666, 0x3F19999A, 0x3ECCCCCD, 0x3E99999A, 0xC8FAFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFAC8, 0x00000000, 0x00000000, 0x00000000 .word 0x3E4CCCCD, 0x3ECCCCCD, 0x3F4CCCCD, 0x3FA66666, 0x3FC00000, 0x3FA66666, 0x3F666666, 0x3F19999A, 0x3ECCCCCD, 0x3E99999A, 0x3E4CCCCD, 0x3ECCCCCD, 0x3F4CCCCD, 0x3FA66666, 0x3FC00000, 0x3FA66666, 0x3F666666, 0x3F19999A, 0x3ECCCCCD, 0x3E99999A, 0xC8FAFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFAC8, 0x00000000, 0x00000000, 0x00000000
dlabel D_E0074BF0
.double 0.04
dlabel D_E0074BF8
.double 0.4
dlabel D_E0074C00
.double 0.2
dlabel D_E0074C08
.double 0.6

33
ver/us/asm/data/effects/377F00.data.s
View File

@ -1,33 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E0076E90
.word 0x090023E0, 0x090023E0, 0x09002440, 0x09002440
dlabel D_E0076EA0
.word 0x090023F8, 0x090023F8, 0x09002458, 0x09002458
dlabel D_E0076EB0
.word 0x090023B0, 0x090023B0, 0x09002410, 0x09002410
dlabel D_E0076EC0
.word 0x090023C8, 0x090023C8, 0x09002428, 0x09002428
dlabel D_E0076ED0
.word 0x09002000, 0x09002000, 0x090020E8, 0x090021D0
dlabel D_E0076EE0
.double 0.6
dlabel D_E0076EE8
.double 0.02
dlabel D_E0076EF0
.double 0.04
dlabel D_E0076EF8
.double 0.02
dlabel D_E0076F00
.double 0.1, 0.0

3
ver/us/asm/data/effects/37ACF0.data.s
View File

@ -13,6 +13,3 @@ dlabel D_E00789A8
dlabel D_E00789AC dlabel D_E00789AC
.word 0xFFFFFFFF, 0xFF80FF80, 0xFF80FFFF, 0xFF808080, 0xFF808080, 0xFF000000, 0x00000000, 0x00000000, 0x00000000 .word 0xFFFFFFFF, 0xFF80FF80, 0xFF80FFFF, 0xFF808080, 0xFF808080, 0xFF000000, 0x00000000, 0x00000000, 0x00000000
dlabel D_E00789D0
.double 0.6, 0.0

24
ver/us/asm/data/effects/37D140.data.s
View File

@ -1,24 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E007AC00
.double 0.05
dlabel D_E007AC08
.double 0.1
dlabel D_E007AC10
.double 0.03
dlabel D_E007AC18
.double 0.225
dlabel D_E007AC20
.double 0.2
dlabel D_E007AC28
.double 0.45
dlabel D_E007AC30
.double 0.8, 0.0

6
ver/us/asm/data/effects/37D9A0.data.s
View File

@ -1,6 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E007C510
.word 0x09001378, 0x090013F0, 0x09001468, 0x090014E0, 0x09001558, 0x090015D0, 0x09001648, 0x090016C0, 0x09001738, 0x00000000, 0x00000000, 0x00000000

18
ver/us/asm/data/effects/380350.data.s
View File

@ -1,18 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E007EC30
.word 0x323C4650, 0x5A646964, 0x00000000, 0x00000000
dlabel D_E007EC40
.double 0.05
dlabel jtbl_E007EC48
.word LE007E270_37F990, LE007E2C0_37F9E0, LE007E314_37FA34, LE007E334_37FA54, LE007E354_37FA74, LE007E3A0_37FAC0, LE007E3C8_37FAE8, 0
dlabel D_E007EC68
.double 0.01
dlabel D_E007EC70
.double 0.9, 0.0

18
ver/us/asm/data/effects/381D80.data.s
View File

@ -1,18 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E0080AC0
.word 0x09003540, 0x09003580, 0x090035C0, 0x09003600, 0x09003640, 0x09003680, 0x090036C0, 0x09003700, 0x09003740, 0x09003780, 0x090037C0, 0x09003800
dlabel D_E0080AF0
.word 0x3E800000, 0x3F000000, 0x3F400000, 0x3F800000, 0x3F666666, 0x3F8CCCCD, 0x3F800000
dlabel D_E0080B0C
.float 0.25, 0.5, 0.75, 1.0, 1.2, 0.9, 1.0, 0.0, 0.0
dlabel D_E0080B30
.double 0.05
dlabel D_E0080B38
.double 0.9

45
ver/us/asm/data/effects/3897E0.data.s
View File

@ -1,45 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E0084E10
.word 0x090018C0, 0x090018C0, 0x090018C0
dlabel D_E0084E1C
.word 0x09001D00, 0x09001CC8, 0x09001C80
dlabel D_E0084E28
.word 0x090017D0, 0x090017D0, 0x090017D0
dlabel D_E0084E34
.word get_model_center_and_size
dlabel D_E0084E38
.word get_model_from_list_index
dlabel D_E0084E3C
.word get_model_list_index_from_tree_index
dlabel D_E0084E40
.double 0.05
dlabel D_E0084E48
.double 0.2
dlabel D_E0084E50
.double 0.1
dlabel D_E0084E58
.double 0.9
dlabel D_E0084E60
.double -0.7
dlabel D_E0084E68
.double 0.95
dlabel D_E0084E70
.double 0.4
dlabel D_E0084E78
.double -0.4

30
ver/us/asm/data/effects/38BAB0.data.s
View File

@ -13,33 +13,3 @@ dlabel D_E0088D00
dlabel D_E0088D08 dlabel D_E0088D08
.word 0x002D003C, 0x00000000 .word 0x002D003C, 0x00000000
dlabel D_E0088D10
.double 0.03
dlabel D_E0088D18
.double 0.01
dlabel D_E0088D20
.double -1.7
dlabel D_E0088D28
.double 0.05
dlabel jtbl_E0088D30
.word LE00881F4_38AFE4, LE00881FC_38AFEC, LE0088204_38AFF4, LE008820C_38AFFC, LE00881F4_38AFE4, LE00881FC_38AFEC, LE0088204_38AFF4, 0
dlabel jtbl_E0088D50
.word LE0088230_38B020, LE0088240_38B030, LE0088250_38B040, LE0088250_38B040, LE0088230_38B020, LE0088240_38B030, LE0088250_38B040, 0
dlabel D_E0088D70
.word 0xE0088374, 0xE0088374, 0xE0088374, 0xE0088374, 0xE0088374, 0xE0088374, 0xE0088374, 0x00000000
dlabel D_E0088D90
.double 0.02
dlabel D_E0088D98
.double -0.02
dlabel D_E0088DA0
.double 0.98, 0.0

12
ver/us/asm/data/effects/38D040.data.s
View File

@ -4,15 +4,3 @@
dlabel D_E008AA50 dlabel D_E008AA50
.word 0x09000D50, 0x09000D50, 0x00000000, 0x00000000 .word 0x09000D50, 0x09000D50, 0x00000000, 0x00000000
dlabel D_E008AA60
.double 0.05
dlabel D_E008AA68
.double 0.01
dlabel D_E008AA70
.double -1.2
dlabel D_E008AA78
.double 0.3

24
ver/us/asm/data/effects/38E8F0.data.s
View File

@ -13,27 +13,3 @@ dlabel D_E008CB18
dlabel D_E008CB1C dlabel D_E008CB1C
.byte 0xFF, 0x40, 0xFF, 0x00 .byte 0xFF, 0x40, 0xFF, 0x00
dlabel D_E008CB20
.double 1.2
dlabel D_E008CB28
.word 0xE008C180, 0xE008C1CC, 0xE008C180, 0xE008C1CC, 0xE008C180, 0xE008C1CC, 0xE008C180, 0xE008C1CC
dlabel D_E008CB48
.word 0xE008C34C, 0xE008C34C, 0xE008C354, 0xE008C354, 0xE008C35C, 0xE008C35C
dlabel D_E008CB60
.double 0.05
dlabel D_E008CB68
.double 0.3
dlabel D_E008CB70
.double 0.8
dlabel D_E008CB78
.double 0.1
dlabel D_E008CB80
.double 0.2, 0.0

3
ver/us/asm/data/effects/38F6F0.data.s
View File

@ -4,6 +4,3 @@
dlabel D_E008E890 dlabel D_E008E890
.word 0x090001A8, 0x090001C8, 0x00000000, 0x00000000 .word 0x090001A8, 0x090001C8, 0x00000000, 0x00000000
dlabel D_E008E8A0
.double 0.2, 0.0

15
ver/us/asm/data/effects/393080.data.s
View File

@ -1,15 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00947B0
.double 1.1
dlabel D_E00947B8
.double 0.05
dlabel D_E00947C0
.double 0.9
dlabel D_E00947C8
.double 0.8

3
ver/us/asm/data/effects/3960C0.data.s
View File

@ -4,6 +4,3 @@
dlabel D_E0098510 dlabel D_E0098510
.word 0x090003A0, 0x090003E0, 0x09000410, 0x090003A0, 0x090003E0, 0x09000410, 0x00000000, 0x00000000 .word 0x090003A0, 0x090003E0, 0x09000410, 0x090003A0, 0x090003E0, 0x09000410, 0x00000000, 0x00000000
dlabel D_E0098530
.double 0.8, 0.0

12
ver/us/asm/data/effects/397010.data.s
View File

@ -1,12 +0,0 @@
.include "macro.inc"
.section .data
dlabel jtbl_E009AA60
.word LE009A1AC_39675C, LE009A24C_3967FC, LE009A270_396820, LE009A28C_39683C, LE009A32C_3968DC, LE009A348_3968F8
dlabel D_E009AA78
.double 0.02
dlabel D_E009AA80
.double 0.05, 0.0

21
ver/us/asm/data/effects/3BCA50.data.s
View File

@ -1,21 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00BEAF0
.word 0x09000268, 0x09000288, 0x09000268, 0x090002A8
dlabel D_E00BEB00
.double 0.98
dlabel D_E00BEB08
.double -0.8
dlabel D_E00BEB10
.double -0.1
dlabel D_E00BEB18
.double 1.2
dlabel D_E00BEB20
.double 0.9, 0.0

15
ver/us/asm/data/effects/3BD770.data.s
View File

@ -16,18 +16,3 @@ dlabel D_E00C0A40
dlabel D_E00C0A8C dlabel D_E00C0A8C
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x05, 0x0A, 0x10, 0x16, 0x1C, 0x21, 0x26, 0x28, 0x29, 0x29, 0x28, 0x26, 0x21, 0x1C, 0x16, 0x10, 0x0A, 0x05, 0x01, 0x01, 0x05, 0x0A, 0x10, 0x16, 0x1C, 0x21, 0x26, 0x28, 0x29, 0x29, 0x28, 0x26, 0x21, 0x1C, 0x16, 0x10, 0x0A, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x38, 0x00, 0xC8, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x4C, 0x00, 0xB4, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x60, 0x00, 0xA0, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x74, 0x00, 0x8C, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x88, 0x00, 0x78, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x9C, 0x00, 0x64, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0xB0, 0x00, 0x50, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0xC4, 0x00, 0x3C, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0xD8, 0x00, 0x28, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0xEC, 0x00, 0x14, 0x1E, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x82, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x87, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x8A, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x8C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x8C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x8A, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x87, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0x82, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x78, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x01, 0xF4, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x03, 0xEE, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x05, 0xE6, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xDC, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xD0, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x14, 0xC2, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xB2, 0x64, 0x64, 0x00, 0x00, 0x05, 0x00, 0x1E, 0xA0, 0x64, 0x64, 0x00, 0x00, 0x08, 0x00, 0x1E, 0xA0, 0x64, 0x64, 0x00, 0x00, 0x0A, 0x00, 0x1E, 0xA0, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x05, 0x0A, 0x10, 0x16, 0x1C, 0x21, 0x26, 0x28, 0x29, 0x29, 0x28, 0x26, 0x21, 0x1C, 0x16, 0x10, 0x0A, 0x05, 0x01, 0x01, 0x05, 0x0A, 0x10, 0x16, 0x1C, 0x21, 0x26, 0x28, 0x29, 0x29, 0x28, 0x26, 0x21, 0x1C, 0x16, 0x10, 0x0A, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x38, 0x00, 0xC8, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x4C, 0x00, 0xB4, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x60, 0x00, 0xA0, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x74, 0x00, 0x8C, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x88, 0x00, 0x78, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x9C, 0x00, 0x64, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0xB0, 0x00, 0x50, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0xC4, 0x00, 0x3C, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0xD8, 0x00, 0x28, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0xEC, 0x00, 0x14, 0x1E, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x82, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x87, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x8A, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x8C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x8C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x8A, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x87, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0x82, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x78, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x01, 0xF4, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x03, 0xEE, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x05, 0xE6, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xDC, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xD0, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x14, 0xC2, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xB2, 0x64, 0x64, 0x00, 0x00, 0x05, 0x00, 0x1E, 0xA0, 0x64, 0x64, 0x00, 0x00, 0x08, 0x00, 0x1E, 0xA0, 0x64, 0x64, 0x00, 0x00, 0x0A, 0x00, 0x1E, 0xA0, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
dlabel D_E00C0C00
.double 0.01
dlabel D_E00C0C08
.double 0.01
dlabel D_E00C0C10
.double 0.01
dlabel D_E00C0C18
.double 0.01
dlabel jtbl_E00C0C20
.word LE00C0500_3BD260, LE00C0508_3BD268, LE00C0518_3BD278, LE00C0548_3BD2A8, LE00C0570_3BD2D0, 0, 0, 0

4
ver/us/asm/data/effects/3C1B60.data.s
View File

@ -5,8 +5,4 @@
dlabel D_E00C2990 dlabel D_E00C2990
.word 0xFFFFDCBE, 0xA0785028, 0x00002850, 0x78A0BEDC .word 0xFFFFDCBE, 0xA0785028, 0x00002850, 0x78A0BEDC
dlabel D_E00C29A0
.double 0.1
dlabel jtbl_E00C29A8
.word LE00C27F0_3C19C0, LE00C2818_3C19E8, LE00C2830_3C1A00, LE00C2848_3C1A18, LE00C2860_3C1A30, LE00C2878_3C1A48, LE00C2890_3C1A60, LE00C28A8_3C1A78, LE00C28C0_3C1A90, LE00C28D8_3C1AA8

4
ver/us/asm/data/effects/3CB7C0.data.s
View File

@ -17,8 +17,4 @@ dlabel D_E00C49FC
dlabel D_E00C4A10 dlabel D_E00C4A10
.word 0xFFFFFFCE, 0xFFFFFFBA, 0x00000005, 0x00000050, 0xFFFFFFA6, 0x00000014, 0x00000014, 0xFFFFFFCE, 0x0000002D, 0xFFFFFFB0, 0x0000001E, 0x0000000A, 0x0000001E, 0x00000000, 0x00000023, 0x00000078, 0xFFFFFFE2, 0x00000032, 0x0000000A, 0x00000032, 0x0000001E, 0x00000064, 0x0000001E, 0x0000000F, 0x00000028, 0x00000064, 0x00000028, 0x0000008C, 0x0000005A, 0x00000019, 0x00000000, 0x00000000 .word 0xFFFFFFCE, 0xFFFFFFBA, 0x00000005, 0x00000050, 0xFFFFFFA6, 0x00000014, 0x00000014, 0xFFFFFFCE, 0x0000002D, 0xFFFFFFB0, 0x0000001E, 0x0000000A, 0x0000001E, 0x00000000, 0x00000023, 0x00000078, 0xFFFFFFE2, 0x00000032, 0x0000000A, 0x00000032, 0x0000001E, 0x00000064, 0x0000001E, 0x0000000F, 0x00000028, 0x00000064, 0x00000028, 0x0000008C, 0x0000005A, 0x00000019, 0x00000000, 0x00000000
dlabel D_E00C4A90
.double 0.05
dlabel D_E00C4A98
.double 0.01

27
ver/us/asm/data/effects/3CD670.data.s
View File

@ -7,30 +7,3 @@ dlabel D_E00C6C90
dlabel D_E00C6C9C dlabel D_E00C6C9C
.word 0x09001B70, 0x09001B70, 0x09001B70, 0x00000000, 0x00000000 .word 0x09001B70, 0x09001B70, 0x09001B70, 0x00000000, 0x00000000
dlabel D_E00C6CB0
.double 0.97
dlabel D_E00C6CB8
.double 0.02
dlabel D_E00C6CC0
.double 0.05
dlabel D_E00C6CC8
.double 0.1
dlabel D_E00C6CD0
.double 0.9
dlabel D_E00C6CD8
.double 0.2
dlabel D_E00C6CE0
.double -0.6
dlabel D_E00C6CE8
.double 0.07
dlabel D_E00C6CF0
.double 0.05, 0.0

12
ver/us/asm/data/effects/3D11B0.data.s
View File

@ -4,15 +4,3 @@
dlabel D_E00CACB0 dlabel D_E00CACB0
.word 0x09000400, 0x09000400, 0x09000400, 0x09000400 .word 0x09000400, 0x09000400, 0x09000400, 0x09000400
dlabel D_E00CACC0
.double 0.8
dlabel D_E00CACC8
.double 255.0
dlabel D_E00CACD0
.double 0.4
dlabel D_E00CACD8
.double 255.0

15
ver/us/asm/data/effects/3D2460.data.s
View File

@ -19,18 +19,3 @@ dlabel D_E00CCE04
dlabel D_E00CCE4C dlabel D_E00CCE4C
.byte 0xFB, 0xFB, 0xFB, 0xFC, 0xFC, 0xFC, 0xFD, 0xFD, 0xFE, 0xFE, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xFB, 0xFB, 0xFB, 0xFC, 0xFC, 0xFC, 0xFD, 0xFD, 0xFE, 0xFE, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
dlabel D_E00CCE70
.double 0.01
dlabel jtbl_E00CCE78
.word LE00CC3D8_3D1A68, LE00CC448_3D1AD8, LE00CC53C_3D1BCC, LE00CC5E4_3D1C74, LE00CC614_3D1CA4, LE00CC790_3D1E20, LE00CC870_3D1F00, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC4A4_3D1B34, 0
dlabel D_E00CCED0
.double 0.99
dlabel D_E00CCED8
.double -0.1
dlabel D_E00CCEE0
.double 0.9, 0.0

15
ver/us/asm/data/effects/3D3910.data.s
View File

@ -1,15 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00CEE50
.double 0.2
dlabel D_E00CEE58
.double 0.1
dlabel D_E00CEE60
.double 12.96
dlabel D_E00CEE68
.double 17.28

15
ver/us/asm/data/effects/3D4930.data.s
View File

@ -4,18 +4,3 @@
dlabel D_E00D0B10 dlabel D_E00D0B10
.word 0x090009A0, 0x090009A0, 0x00000000, 0x00000000 .word 0x090009A0, 0x090009A0, 0x00000000, 0x00000000
dlabel D_E00D0B20
.double 0.8
dlabel D_E00D0B28
.double 1.002
dlabel D_E00D0B30
.double 0.6
dlabel D_E00D0B38
.double 0.9
dlabel D_E00D0B40
.double 0.3, 0.0

6
ver/us/asm/data/effects/3D4E70.data.s
View File

@ -7,9 +7,3 @@ dlabel D_E00D2500
dlabel D_E00D2508 dlabel D_E00D2508
.byte 0x5E, 0x5C, 0x64, 0x69, 0x6B, 0x69, 0x64, 0x00 .byte 0x5E, 0x5C, 0x64, 0x69, 0x6B, 0x69, 0x64, 0x00
dlabel D_E00D2510
.double 0.6
dlabel D_E00D2518
.double 0.01

24
ver/us/asm/data/effects/3D5E60.data.s
View File

@ -10,27 +10,3 @@ dlabel D_E00D6E74
dlabel D_E00D6E84 dlabel D_E00D6E84
.byte 0x14, 0x05, 0x14, 0x14, 0x0A, 0x14, 0x14, 0x08, 0x08, 0x08, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x14, 0x05, 0x14, 0x14, 0x0A, 0x14, 0x14, 0x08, 0x08, 0x08, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
dlabel D_E00D6EA0
.double 0.2
dlabel D_E00D6EA8
.double 0.1
dlabel D_E00D6EB0
.double 0.3
dlabel jtbl_E00D6EB8
.word LE00D6204_3D5224, LE00D6204_3D5224, LE00D6204_3D5224, LE00D6264_3D5284, LE00D65A0_3D55C0, LE00D6264_3D5284, LE00D62C0_3D52E0, LE00D6320_3D5340, LE00D6380_3D53A0, LE00D63E4_3D5404, LE00D6494_3D54B4, LE00D652C_3D554C, LE00D65A0_3D55C0, 0
dlabel D_E00D6EF0
.double 0.6
dlabel D_E00D6EF8
.double 0.6
dlabel D_E00D6F00
.double 0.05
dlabel D_E00D6F08
.double 0.6

9
ver/us/asm/data/effects/3D6FA0.data.s
View File

@ -1,9 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00D87E0
.word 0x00000000, 0x00000000, 0x00000000, 0x09000000, 0x31100810, 0x08100810, 0x08000000, 0x00000000, 0xFC317FFF, 0x5FFEF438, 0xFC3135FF, 0x5FFEFE38, 0x3D4ABCFF, 0x00191CFF
dlabel D_E00D8818
.word 0xFF38FFFF, 0xFF60FFFF, 0xFF88FFFF, 0xFFABFFFF, 0xFFC9FFFF, 0xFFE2FFFF, 0xFFF0FFFF, 0xFFF8FFFF, 0xFFFCFFFF, 0xFFFEFFFF, 0xFFFFFFFF, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x0000E6FA, 0x000078F5, 0x000000F0, 0x000000D2, 0x000000AA, 0x00000078, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000

3
ver/us/asm/data/effects/3D7740.data.s
View File

@ -10,6 +10,3 @@ dlabel D_E00DA501
dlabel D_E00DA502 dlabel D_E00DA502
.byte 0x52, 0xFF, 0xFF, 0x52, 0xB5, 0x94, 0x00, 0xB5, 0x94, 0x00, 0xFF, 0xFF, 0xD6, 0xFF, 0xFF, 0xD6, 0xB5, 0x94, 0x00, 0xB5, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x52, 0xFF, 0xFF, 0x52, 0xB5, 0x94, 0x00, 0xB5, 0x94, 0x00, 0xFF, 0xFF, 0xD6, 0xFF, 0xFF, 0xD6, 0xB5, 0x94, 0x00, 0xB5, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
dlabel D_E00DA520
.double 0.3, 0.0

3
ver/us/asm/data/effects/3D8F30.data.s
View File

@ -19,6 +19,3 @@ dlabel D_E00DE910
dlabel D_E00DE96C dlabel D_E00DE96C
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
dlabel D_E00DE9D0
.double 0.02, 0.0

12
ver/us/asm/data/effects/3DBEA0.data.s
View File

@ -10,15 +10,3 @@ dlabel D_E00E0A44
dlabel D_E00E0A48 dlabel D_E00E0A48
.word 0x3C23D70A, 0x3D4CCCCD, 0x3DCCCCCD, 0x3E4CCCCD, 0x3EB33333, 0x3F000000, 0x3F266666, 0x3F4CCCCD, 0x3F733333, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F733333, 0x3F4CCCCD, 0x3F266666, 0x3F000000, 0x3EB33333, 0x3E4CCCCD, 0x3DCCCCCD, 0x3D4CCCCD, 0x3C23D70A .word 0x3C23D70A, 0x3D4CCCCD, 0x3DCCCCCD, 0x3E4CCCCD, 0x3EB33333, 0x3F000000, 0x3F266666, 0x3F4CCCCD, 0x3F733333, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F733333, 0x3F4CCCCD, 0x3F266666, 0x3F000000, 0x3EB33333, 0x3E4CCCCD, 0x3DCCCCCD, 0x3D4CCCCD, 0x3C23D70A
dlabel D_E00E0AC0
.double 0.05
dlabel D_E00E0AC8
.double 0.04
dlabel D_E00E0AD0
.double 0.1
dlabel D_E00E0AD8
.double 0.3

6
ver/us/asm/data/effects/3DCD00.data.s
View File

@ -13,9 +13,3 @@ dlabel D_E00E2A08
dlabel D_E00E2A1C dlabel D_E00E2A1C
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00
dlabel D_E00E2A30
.double 78.75
dlabel D_E00E2A38
.double 0.01

24
ver/us/asm/data/effects/3DED90.data.s
View File

@ -16,27 +16,3 @@ dlabel D_E00E4DE0
dlabel D_E00E4E00 dlabel D_E00E4E00
.byte 0xC8, 0xFA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xC8, 0x00, 0x00 .byte 0xC8, 0xFA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xC8, 0x00, 0x00
dlabel D_E00E4E20
.double 0.05
dlabel D_E00E4E28
.double 0.04
dlabel D_E00E4E30
.double 0.2
dlabel D_E00E4E38
.double 0.6
dlabel D_E00E4E40
.double 0.1
dlabel D_E00E4E48
.double 0.2
dlabel D_E00E4E50
.double 0.6
dlabel D_E00E4E58
.double 0.01

3
ver/us/asm/data/effects/3E11B0.data.s
View File

@ -22,6 +22,3 @@ dlabel D_E00E6910
dlabel D_E00E6970 dlabel D_E00E6970
.byte 0xFA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xFA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
dlabel D_E00E6990
.double 0.2, 0.0

12
ver/us/asm/data/effects/3E5060.data.s
View File

@ -25,15 +25,3 @@ dlabel D_E010AF80
dlabel D_E010AF84 dlabel D_E010AF84
.word 0x00000000, 0x00000000, 0x00000000 .word 0x00000000, 0x00000000, 0x00000000
dlabel D_E010AF90
.double 0.11
dlabel D_E010AF98
.double 0.15
dlabel D_E010AFA0
.double 0.15
dlabel D_E010AFA8
.double 0.8

6
ver/us/asm/data/effects/3E5ED0.data.s
View File

@ -13,9 +13,3 @@ dlabel D_E010CA18
dlabel D_E010CA38 dlabel D_E010CA38
.word 0x090050F0, 0x09005168, 0x090051E0, 0x09005258, 0x090052D0, 0x09005348, 0x090053C0, 0x09005438, 0x00000000, 0x00000000 .word 0x090050F0, 0x09005168, 0x090051E0, 0x09005258, 0x090052D0, 0x09005348, 0x090053C0, 0x09005438, 0x00000000, 0x00000000
dlabel D_E010CA60
.double 255.0
dlabel D_E010CA68
.double 0.4

3
ver/us/asm/data/effects/3EBC30.data.s
View File

@ -19,6 +19,3 @@ dlabel D_E010E838
dlabel D_E010E868 dlabel D_E010E868
.word 0x0900BE40, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BE88, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BED0, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BF18, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BF60, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BFA8, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BFF0, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900C038, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 .word 0x0900BE40, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BE88, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BED0, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BF18, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BF60, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BFA8, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BFF0, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900C038, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
dlabel jtbl_E010E930
.word LE010E61C_3EBAFC, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E60C_3EBAEC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, 0

6
ver/us/asm/data/effects/3F8CA0.data.s
View File

@ -7,9 +7,3 @@ dlabel D_E01108B0
dlabel D_E01108B4 dlabel D_E01108B4
.word 0x09001000, 0x00000000, 0x00000000 .word 0x09001000, 0x00000000, 0x00000000
dlabel D_E01108C0
.double 0.1
dlabel D_E01108C8
.double -0.7

3
ver/us/asm/data/effects/3FF180.data.s
View File

@ -10,6 +10,3 @@ dlabel D_E0114718
dlabel D_E0114740 dlabel D_E0114740
.word 0x01020100, 0x00000000, 0x00000000, 0x00000000 .word 0x01020100, 0x00000000, 0x00000000, 0x00000000
dlabel jtbl_E0114750
.word LE0114150_3FEC30, LE0114148_3FEC28, LE01141B4_3FEC94, LE0114158_3FEC38, LE0114210_3FECF0, LE011426C_3FED4C, 0, 0

Some files were not shown because too many files have changed in this diff Show More