falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update migrate_data_to_c including some migration (#550) 

* optimize migrate_data_to_c.py and do some data migration as a test

* .

* spacing

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
This commit is contained in:
Alexander Faßbender 2021-12-15 16:02:33 +01:00 committed by GitHub
parent 7230c62545
commit bbed111c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 259 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/effects/effect_79.c
View File

@ -1,6 +1,14 @@
#include "common.h"
#include "effects_internal.h"
s32 D_E009EDF0[] = { 0x09001490 };
s32 D_E009EDF4[] = { 0x090014B0 };
s32 D_E009EDF8[] = { 0x090014D0 };
s32 D_E009EDFC[] = { 0x090014F0 };
void fx_79_appendGfx(EffectInstance* effect);
INCLUDE_ASM(s32, "effects/effect_79", fx_79_main);

6
src/effects/effect_81.c
View File

@ -1,6 +1,12 @@
#include "common.h"
#include "effects_internal.h"
s32 D_E00A29D0[] = { 0x09000200, 0x090002A8, 0x09000358 };
s32 D_E00A29DC[] = { 0x00000010, 0x00000010, 0x3F800000, 0x3F800000, 0x00000008, 0x00000008, 0x00000010, 0x00000010, 0x3F800000, 0x3F800000, 0x00000008, 0x00000008, 0x00000010, 0x00000010, 0x3F800000, 0x3F800000, 0x00000008, 0x00000008 };
s32 D_E00A2A24[] = { 0x00000064, 0x0000003C, 0x0000001E, 0x0000000A, 0x00000000, 0x00000000, 0x00000000 };
void fx_81_appendGfx(EffectInstance* effect);
INCLUDE_ASM(s32, "effects/effect_81", fx_81_main);

8
src/effects/effect_84.c
View File

@ -1,6 +1,14 @@
#include "common.h"
#include "effects_internal.h"
s32 D_E00A8620[] = { 0x090030D8, 0x090030A0, 0x09003068, 0x09003030, 0x09002FF8, 0x09002FC0, 0x09002F88, 0x09002F50, 0x09002F18, 0x09002EE0 };
s32 D_E00A8648[] = { 0x00000100, 0x02000200, 0x03000300, 0x03000200, 0x02000100, 0x01000000, 0x0000FF00, 0xFE00FE00, 0xFD00FD00, 0xFD00FE00, 0xFE00FF00, 0xFF000000 };
s32 D_E00A8678[] = { 0x00000001, 0x00020002, 0x00030003, 0x00030002, 0x00020001, 0x00010000 };
s32 D_E00A8690[] = { D_E00A8648, 0x18000000, D_E00A8678, 0x0C000000 };
void fx_84_appendGfx(EffectInstance* effect);
INCLUDE_ASM(s32, "effects/effect_84", fx_84_main);

4
src/effects/effect_85.c
View File

@ -1,6 +1,10 @@
#include "common.h"
#include "effects_internal.h"
s32 D_E00AA6C0[] = { 0x090038F8, 0x09003968, 0x090039D8, 0x09003A48, 0x09003AB8, 0x09003B28, 0x09003B98, 0x09003C08, 0x09003C78, 0x09003CE8, 0x09003D58 };
s8 D_E00AA6EC[] = { 0xFF, 0xFE, 0xFD, 0xFC, 0xFB, 0xFA, 0xF9, 0xF8, 0xF7, 0xF6, 0xF5, 0xF4, 0xF3, 0xF2, 0xF1, 0xF0, 0xEF, 0xEE, 0xED, 0xEF, 0xF1, 0xF3, 0xF5, 0xF7, 0xF9, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
void fx_85_appendGfx(EffectInstance* effect);
INCLUDE_ASM(s32, "effects/effect_85", fx_85_main);

12
src/effects/effect_86.c
View File

@ -1,6 +1,18 @@
#include "common.h"
#include "effects_internal.h"
s32 D_E00AC7B0[] = { 0x09002700, 0x09002700, 0x09002798 };
s32 D_E00AC7BC[] = { 0x09002860, 0x09002880, 0x09002860 };
s32 D_E00AC7C8[] = { 0x09002950, 0x09002990, 0x090029D0, 0x09002A10, 0x09002A50, 0x09002A90, 0x09002AD0, 0x09002B10, 0x09002B50, 0x09002B90, 0x09002BD0, 0x09002C10 };
s32 D_E00AC7F8[] = { 0xFF96FF82, 0xFF64FF46, 0xFF3CFF50, 0xFF6EFF73, 0xFF6BFF5C, 0xFF5AFF5E, 0xFF67FF68, 0xFF67FF64, 0xFF62FF63, 0xFF65FF64, 0xF064DC64, 0xC864B464, 0xA0648264, 0x64644664, 0x32642864, 0x1E641464, 0x0A640000 };
s32 D_E00AC83C[] = { 0xFF96FF82, 0xFF64FF46, 0xFF3CFF50, 0xFF6EFF73, 0xFF6BFF5C, 0xFF5AFF5E, 0xFF67FF68, 0xFF67FF64, 0xFF62FF63, 0xFF65FF64, 0xF064DC64, 0xC864B464, 0xA0648264, 0x64644664, 0x32642864, 0x1E641464, 0x0A640000 };
s32 D_E00AC880[] = { 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000003, 0x00000001, 0xFFFFFFFF, 0x00000001, 0xFFFFFFFE, 0x00000001, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x00000002, 0x00000002, 0x00000002, 0x00000003, 0x00000000, 0x00000000 };
INCLUDE_ASM(s32, "effects/effect_86", fx_86_main);
void fx_86_init(void) {

2
src/effects/effect_89.c
View File

@ -1,6 +1,8 @@
#include "common.h"
#include "effects_internal.h"
s32 D_E00B2BA0[] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFC88020, 0x00000000 };
void fx_89_appendGfx(EffectInstance* effect);
INCLUDE_ASM(s32, "effects/effect_89", fx_89_main);

2
src/effects/effect_90.c
View File

@ -1,6 +1,8 @@
#include "common.h"
#include "effects_internal.h"
s32 D_E00B4CF0[] = { 0x1904E700, 0x04010048, 0xB0B0B000, 0x1600EA00, 0x03C30000, 0xB0B0B000, 0xEA00EA00, 0x003D0000, 0xB0B0B000, 0xE704E700, 0x00010048, 0xB0B0B000, 0x192EE700, 0x040103B7, 0xB0B0B000, 0xE72EE700, 0x000103B7, 0xB0B0B000, 0x1632EA00, 0x037A03E5, 0xAED0D800, 0xEA32EA00, 0x008503E5, 0xAED0D800, 0xEA321600, 0x008503E5, 0xAED0D800, 0x16321600, 0x037A03E5, 0xAED0D800, 0xEA00EA00, 0x00850019, 0x94A5B000, 0x1600EA00, 0x037A0019, 0x94A5B000, 0x16001600, 0x037A0019, 0x94A5B000, 0xEA001600, 0x00850019, 0x94A5B000, 0xEA321600, 0x03C303FD, 0x786E8800, 0xEA32EA00, 0x003D03FD, 0x786E8800, 0xE72EE700, 0x000003B7, 0x786E8800, 0xE72E1900, 0x040003B7, 0x786E8800, 0xE704E700, 0x00000048, 0x786E8800, 0xE7041900, 0x04000048, 0x786E8800, 0xEA00EA00, 0x003D0000, 0x786E8800, 0xEA001600, 0x03C30000, 0x786E8800, 0xEA32EA00, 0x003D03FD, 0xB0B0B000, 0x1632EA00, 0x03C303FD, 0xB0B0B000, 0x16001600, 0x03C30000, 0x786E8800, 0x1600EA00, 0x003D0000, 0x786E8800, 0x1904E700, 0x00000048, 0x786E8800, 0x19041900, 0x04000048, 0x786E8800, 0x192EE700, 0x000003B7, 0x786E8800, 0x192E1900, 0x040003B7, 0x786E8800, 0x1632EA00, 0x003D03FD, 0x786E8800, 0xEA001600, 0x003D0000, 0xF0F0F000, 0x19041900, 0x04010048, 0xF0F0F000, 0x192E1900, 0x040103B7, 0xF0F0F000, 0x16321600, 0x03C303FD, 0x786E8800, 0x16001600, 0x03C30000, 0xF0F0F000, 0xE7041900, 0x00010048, 0xF0F0F000, 0xE72E1900, 0x000103B7, 0xF0F0F000, 0x16321600, 0x03C303FD, 0xF0F0F000, 0xEA321600, 0x003D03FD, 0xF0F0F000 };
void fx_90_appendGfx(EffectInstance* effect);
INCLUDE_ASM(s32, "effects/effect_90", fx_90_main);

8
src/effects/effect_92.c
View File

@ -1,6 +1,14 @@
#include "common.h"
#include "effects_internal.h"
s32 D_E00B88F0[] = { 0x27BD0108, 0x00000000, 0x00000000, 0x00000000 };
s32 D_E00B8900[] = { 0x0000001E, 0x008C0000, 0xFF000006, 0x001E0078, 0x0000FA00, 0x010C001E, 0x006EFFFB, 0xF0000111, 0x00320064, 0xFFECF000, 0x0216003C, 0x005AFFE2, 0xF000021A, 0x0046005A, 0xFFD8F000, 0x031C0050, 0x0055FFCE, 0xF0000420, 0x005A005A, 0xFFC4F000, 0x05230064, 0x0064FFBA, 0xF0000726, 0x006E006E, 0xFFB0F000, 0x08280078, 0x0078FFA6, 0xF0000B2A, 0x00820082, 0xFF9CF000, 0x0E2B0096, 0x0096FF92, 0xF000122C, 0x00BE00BE, 0xFF88F000, 0x152D00E6, 0x00E6FF7E, 0xF000182E, 0x010E010E, 0xFF74F000, 0x1B2F0136, 0x0136FF6A, 0xF0001E30, 0x015E015E, 0xFF60C800, 0x2131017C, 0x017CFF56, 0x8C002432, 0x01900190, 0xFF4C2800, 0x0000001E, 0x008C0000, 0xFF000006, 0x001E0078, 0x0000F000, 0xFF0C001E, 0x006E0005, 0xE600FF11, 0x00320064, 0x0014DC00, 0xFE16003C, 0x005A001E, 0xD200FE1A, 0x0046005A, 0x0028C800, 0xFD1C0050, 0x00550032, 0xBE00FC20, 0x005A0050, 0x003CB400, 0xFB230064, 0x004D0046, 0xAA00F926, 0x006E0041, 0x0050A000, 0xF8280078, 0x0036005A, 0x9600F52A, 0x0082003C, 0x00648C00, 0xF22B008C, 0x0046006E, 0x8200EE2C, 0x00960050, 0x00787800, 0xEB2D00A0, 0x005A0082, 0x6E00E82E, 0x00AA0064, 0x008C5A00, 0xE52F00B4, 0x006E0096, 0x5000E230, 0x00BE0078, 0x00A04600, 0xDF3100C8, 0x008200AA, 0x1E00DC32, 0x00D2008C, 0x00B40A00, 0x0000001E, 0x008C0000, 0xFF000006, 0x001E0078, 0x0000F000, 0x000C001E, 0x006E0005, 0xE6000011, 0x00320064, 0x0014DC00, 0x0016003C, 0x005A001E, 0xD200001A, 0x0046005A, 0x0028C800, 0x001C0050, 0x00550032, 0xBE000020, 0x005A0050, 0x003CB400, 0x00230064, 0x004D0046, 0xAA000026, 0x006E0041, 0x0050A000, 0x00280078, 0x0036005A, 0x9600002A, 0x0082003C, 0x00648C00, 0x002B008C, 0x0046006E, 0x8200002C, 0x00960050, 0x00787800, 0x002D00A0, 0x005A0082, 0x6E00002E, 0x00AA0064, 0x008C5A00, 0x002F00B4, 0x006E0096, 0x50000030, 0x00BE0078, 0x00A04600, 0x003100C8, 0x008200AA, 0x1E000032, 0x00D2008C, 0x00B40A00 };
s32 D_E00B8B58[] = { 0x0000001E, 0x008C0000, 0xFF000006, 0x001E0078, 0x0000F000, 0x010C001E, 0x006EFFFB, 0xE6000111, 0x00320064, 0xFFECDC00, 0x0216003C, 0x005AFFE2, 0xD200021A, 0x0046005A, 0xFFD8C800, 0x031C0050, 0x0055FFCE, 0xBE000420, 0x005A0050, 0xFFC4B400, 0x05230064, 0x004DFFBA, 0x78000726, 0x006E0041, 0xFFB05000, 0x08280078, 0x0036FFA6, 0x28000000, 0x001E008C, 0x0000FF00, 0x0006001E, 0x00780000, 0xF000FF0C, 0x001E006E, 0x0005E600, 0xFF110032, 0x00640014, 0xDC00FE16, 0x003C005A, 0x001ED200, 0xFE1A0046, 0x005A0028, 0xC800FD1C, 0x00500055, 0x0032BE00, 0xFC20005A, 0x0050003C, 0xB400FB23, 0x0064004D, 0x00467800, 0xF926006E, 0x00410050, 0x5000F828, 0x00780036, 0x005A2800, 0x0000001E, 0x008C0000, 0xFF000006, 0x001E0078, 0x0000F000, 0x000C001E, 0x006E0005, 0xE6000011, 0x00320064, 0x0014DC00, 0x0016003C, 0x005A001E, 0xD200001A, 0x0046005A, 0x0028C800, 0x001C0050, 0x00550032, 0xBE000020, 0x005A0050, 0x003CB400, 0x00240064, 0x004D0046, 0x78000027, 0x006E0041, 0x00505000, 0x002A0078, 0x0036005A, 0x28000000 };
s32 D_E00B8CA4[] = { 0x00000000, 0x00000028, 0x00000037, 0x000000BE, 0x00000014, 0x00000082, 0x0000010E, 0x0000012C, 0x00000000, 0x00000000, 0x00000000 };
void fx_92_appendGfx(EffectInstance* effect);
INCLUDE_ASM(s32, "effects/effect_92", fx_92_main);

6
src/effects/effect_94.c
View File

@ -6,6 +6,12 @@ typedef struct Effect94 {
/* 0x0C */ f32 unk_0C;
} Effect94; // size = 0x??
s32 D_E00BCC30[] = { 0x05050505, 0x05050505, 0x05050505, 0x0A090301, 0x00000000, 0x00000000, 0x05050505, 0x05050505, 0x05050505, 0x08070605, 0x04030201, 0x00000000, 0x23051905, 0x00192305, 0x0F000000, 0x0A0D0F0C, 0x0B0D0A0C, 0x05010000, 0x2D0F230F, 0x00232D37, 0x19050200, 0x0D0A0C0A, 0x0D0A0D0A, 0x0C090501, 0x0F0F0F0F, 0x0F0F000F, 0x0F050200, 0x0E0A0F0A, 0x0D1E201E, 0x1832283C, 0x01050F0F, 0x232D2823, 0x19050200, 0x04060A05, 0x080E060A, 0x0E233232, 0x010F190F, 0x19232D28, 0x230F0500, 0x0202170C, 0x080F0F05, 0x0612263C, 0x1E190F05, 0x0F0F191E, 0x23190500, 0x0303030B, 0x030C0405, 0x020C2A32, 0x2121140C, 0x19110F14, 0x16140500, 0x03030302, 0x0A02020C, 0x02020214, 0x1E1E1919, 0x23140F0A, 0x0F0F0500, 0x02020202, 0x02020602, 0x02020605, 0x1B1B1616, 0x20110C07, 0x0C0C0200, 0x02020202, 0x02020202, 0x02020200 };
s32 D_E00BCD38[] = { 0x19191905, 0x19051919, 0x05191919, 0x04030201, 0x00000000, 0x00000000, 0x0F0F0F19, 0x0F0F0519, 0x190F1919, 0x04040404, 0x04030201, 0x00000000, 0x19191905, 0x0F190505, 0x0F050500, 0x04040404, 0x04040604, 0x04040000, 0x19191905, 0x19051919, 0x050F0500, 0x04040404, 0x04040604, 0x04040605, 0x0F0F0F2D, 0x232D2323, 0x19230F00, 0x04040404, 0x04040604, 0x04040605, 0x2D372319, 0x370F2D19, 0x2D230F00, 0x04040404, 0x04040604, 0x04040605, 0x55190F4B, 0x1941232D, 0x4B550F00, 0x04040404, 0x04040604, 0x04040605, 0x550F2337, 0x412D194B, 0x232D2328, 0x04040404, 0x04040604, 0x04040605, 0x550F2337, 0x412D194B, 0x232D2328, 0x04040404, 0x04040604, 0x04040605, 0x550F2337, 0x412D194B, 0x232D2328, 0x04040404, 0x04040604, 0x04040605, 0x1E1E1919, 0x23140F0A, 0x0F0F0500, 0x04040404, 0x04040404, 0x04040200 };
s32 D_E00BCE40[] = { D_E00BCC30, D_E00BCD38, 0x00000000, 0x00000000 };
void fx_94_appendGfx(EffectInstance* effect);
INCLUDE_ASM(s32, "effects/effect_94", fx_94_main);

9
tools/migrate_data_to_c.py
View File

@ -20,13 +20,16 @@ def data_to_c(file_path):
s = file.read()
output = ""
pattern = re.compile(r"(dlabel (D_.*)\n.(\w+) (.*))")
pattern = re.compile(r"(dlabel (jtbl_.*|.+_.*)\n.(\w+) (.*))")
for (all, symbol, type, data) in re.findall(pattern, s):
if type == "word":
output += "s32 " + symbol + "[] = {" + data + "};\n\n"
if symbol.startswith("jtbl_"):
output += "dlabel " + symbol + "\n" + ".word " + data.replace("L", ".L") + "\n\n"
else:
output += "s32 " + symbol + "[] = { " + data + " };\n\n"
elif type == "byte":
output += "s8 " + symbol + "[] = {" + data + "};\n\n"
output += "s8 " + symbol + "[] = { " + data + " };\n\n"
else:
output += all + "\n\n"

6
ver/us/asm/data/battle/action_cmd/425B10.data.s
View File

@ -1,6 +0,0 @@
.include "macro.inc"
.section .data
#glabel jtbl_802A9580_425B10
#.word L802A923C_4257CC, L802A9298_425828, L802A9490_425A20, L802A9490_425A20, L802A9490_425A20, L802A9490_425A20, L802A9490_425A20, L802A9490_425A20, L802A9490_425A20, L802A9490_425A20, L802A92F0_425880, L802A9338_4258C8, L802A9464_4259F4, 0, 0, 0

39
ver/us/asm/data/effects/3A0D10.data.s
View File

@ -1,39 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E009EDF0
.word 0x09001490
dlabel D_E009EDF4
.word 0x090014B0
dlabel D_E009EDF8
.word 0x090014D0
dlabel D_E009EDFC
.word 0x090014F0
dlabel D_E009EE00
.double 0.1
dlabel D_E009EE08
.double 0.4
dlabel D_E009EE10
.double 0.1
dlabel D_E009EE18
.double 0.4
dlabel D_E009EE20
.double 0.95
dlabel D_E009EE28
.double 2.3
dlabel D_E009EE30
.double 0.05
dlabel D_E009EE38
.double 0.1

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

@ -1,12 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00A29D0
.word 0x09000200, 0x090002A8, 0x09000358
dlabel D_E00A29DC
.word 0x00000010, 0x00000010, 0x3F800000, 0x3F800000, 0x00000008, 0x00000008, 0x00000010, 0x00000010, 0x3F800000, 0x3F800000, 0x00000008, 0x00000008, 0x00000010, 0x00000010, 0x3F800000, 0x3F800000, 0x00000008, 0x00000008
dlabel D_E00A2A24
.word 0x00000064, 0x0000003C, 0x0000001E, 0x0000000A, 0x00000000, 0x00000000, 0x00000000

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

@ -1,24 +0,0 @@
.include "macro.inc"
.section .data
dlabel jtbl_E00A4AD0
.word LE00A40F4_3A38D4, LE00A40FC_3A38DC, LE00A4108_3A38E8, LE00A4114_3A38F4, LE00A4120_3A3900, LE00A412C_3A390C, LE00A4138_3A3918, 0
dlabel D_E00A4AF0
.double 0.1
dlabel jtbl_E00A4AF8
.word LE00A427C_3A3A5C, LE00A42CC_3A3AAC, LE00A4304_3A3AE4, LE00A4354_3A3B34, LE00A4384_3A3B64, LE00A440C_3A3BEC, LE00A4438_3A3C18, LE00A4480_3A3C60, LE00A44C0_3A3CA0, LE00A4508_3A3CE8
dlabel D_E00A4B20
.double 1.1
dlabel D_E00A4B28
.double 1.1
dlabel D_E00A4B30
.double 1.1
dlabel D_E00A4B38
.double 1.1

18
ver/us/asm/data/effects/3A7710.data.s
View File

@ -1,18 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00A8620
.word 0x090030D8, 0x090030A0, 0x09003068, 0x09003030, 0x09002FF8, 0x09002FC0, 0x09002F88, 0x09002F50, 0x09002F18, 0x09002EE0
dlabel D_E00A8648
.word 0x00000100, 0x02000200, 0x03000300, 0x03000200, 0x02000100, 0x01000000, 0x0000FF00, 0xFE00FE00, 0xFD00FD00, 0xFD00FE00, 0xFE00FF00, 0xFF000000
dlabel D_E00A8678
.word 0x00000001, 0x00020002, 0x00030003, 0x00030002, 0x00020001, 0x00010000
dlabel D_E00A8690
.word D_E00A8648, 0x18000000, D_E00A8678, 0x0C000000
dlabel D_E00A86A0
.double 0.01, 0.0

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

@ -1,9 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00AA6C0
.word 0x090038F8, 0x09003968, 0x090039D8, 0x09003A48, 0x09003AB8, 0x09003B28, 0x09003B98, 0x09003C08, 0x09003C78, 0x09003CE8, 0x09003D58
dlabel D_E00AA6EC
.byte 0xFF, 0xFE, 0xFD, 0xFC, 0xFB, 0xFA, 0xF9, 0xF8, 0xF7, 0xF6, 0xF5, 0xF4, 0xF3, 0xF2, 0xF1, 0xF0, 0xEF, 0xEE, 0xED, 0xEF, 0xF1, 0xF3, 0xF5, 0xF7, 0xF9, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

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

@ -1,27 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00AC7B0
.word 0x09002700, 0x09002700, 0x09002798
dlabel D_E00AC7BC
.word 0x09002860, 0x09002880, 0x09002860
dlabel D_E00AC7C8
.word 0x09002950, 0x09002990, 0x090029D0, 0x09002A10, 0x09002A50, 0x09002A90, 0x09002AD0, 0x09002B10, 0x09002B50, 0x09002B90, 0x09002BD0, 0x09002C10
dlabel D_E00AC7F8
.word 0xFF96FF82, 0xFF64FF46, 0xFF3CFF50, 0xFF6EFF73, 0xFF6BFF5C, 0xFF5AFF5E, 0xFF67FF68, 0xFF67FF64, 0xFF62FF63, 0xFF65FF64, 0xF064DC64, 0xC864B464, 0xA0648264, 0x64644664, 0x32642864, 0x1E641464, 0x0A640000
dlabel D_E00AC83C
.word 0xFF96FF82, 0xFF64FF46, 0xFF3CFF50, 0xFF6EFF73, 0xFF6BFF5C, 0xFF5AFF5E, 0xFF67FF68, 0xFF67FF64, 0xFF62FF63, 0xFF65FF64, 0xF064DC64, 0xC864B464, 0xA0648264, 0x64644664, 0x32642864, 0x1E641464, 0x0A640000
dlabel D_E00AC880
.word 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000003, 0x00000001, 0xFFFFFFFF, 0x00000001, 0xFFFFFFFE, 0x00000001, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x00000002, 0x00000002, 0x00000002, 0x00000003, 0x00000000, 0x00000000
dlabel D_E00AC8D0
.double 0.01
dlabel D_E00AC8D8
.double 0.01

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

@ -1,9 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00B07E0
.double 0.3
dlabel D_E00B07E8
.double 0.1

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

@ -1,6 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00B2BA0
.word 0xFFFFFFFF, 0xFFFFFFFF, 0xFFC88020, 0x00000000

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

@ -1,24 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00B4CF0
.word 0x1904E700, 0x04010048, 0xB0B0B000, 0x1600EA00, 0x03C30000, 0xB0B0B000, 0xEA00EA00, 0x003D0000, 0xB0B0B000, 0xE704E700, 0x00010048, 0xB0B0B000, 0x192EE700, 0x040103B7, 0xB0B0B000, 0xE72EE700, 0x000103B7, 0xB0B0B000, 0x1632EA00, 0x037A03E5, 0xAED0D800, 0xEA32EA00, 0x008503E5, 0xAED0D800, 0xEA321600, 0x008503E5, 0xAED0D800, 0x16321600, 0x037A03E5, 0xAED0D800, 0xEA00EA00, 0x00850019, 0x94A5B000, 0x1600EA00, 0x037A0019, 0x94A5B000, 0x16001600, 0x037A0019, 0x94A5B000, 0xEA001600, 0x00850019, 0x94A5B000, 0xEA321600, 0x03C303FD, 0x786E8800, 0xEA32EA00, 0x003D03FD, 0x786E8800, 0xE72EE700, 0x000003B7, 0x786E8800, 0xE72E1900, 0x040003B7, 0x786E8800, 0xE704E700, 0x00000048, 0x786E8800, 0xE7041900, 0x04000048, 0x786E8800, 0xEA00EA00, 0x003D0000, 0x786E8800, 0xEA001600, 0x03C30000, 0x786E8800, 0xEA32EA00, 0x003D03FD, 0xB0B0B000, 0x1632EA00, 0x03C303FD, 0xB0B0B000, 0x16001600, 0x03C30000, 0x786E8800, 0x1600EA00, 0x003D0000, 0x786E8800, 0x1904E700, 0x00000048, 0x786E8800, 0x19041900, 0x04000048, 0x786E8800, 0x192EE700, 0x000003B7, 0x786E8800, 0x192E1900, 0x040003B7, 0x786E8800, 0x1632EA00, 0x003D03FD, 0x786E8800, 0xEA001600, 0x003D0000, 0xF0F0F000, 0x19041900, 0x04010048, 0xF0F0F000, 0x192E1900, 0x040103B7, 0xF0F0F000, 0x16321600, 0x03C303FD, 0x786E8800, 0x16001600, 0x03C30000, 0xF0F0F000, 0xE7041900, 0x00010048, 0xF0F0F000, 0xE72E1900, 0x000103B7, 0xF0F0F000, 0x16321600, 0x03C303FD, 0xF0F0F000, 0xEA321600, 0x003D03FD, 0xF0F0F000
dlabel D_E00B4ED0
.double 0.01
dlabel D_E00B4ED8
.double 0.2
dlabel D_E00B4EE0
.double 0.2
dlabel D_E00B4EE8
.double 0.97
dlabel D_E00B4EF0
.double 0.1
dlabel D_E00B4EF8
.double 0.3

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

@ -1,15 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00B6750
.double 0.01
dlabel D_E00B6758
.double -0.1
dlabel D_E00B6760
.double 0.1
dlabel D_E00B6768
.double 0.1

18
ver/us/asm/data/effects/3B8470.data.s
View File

@ -1,18 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00B88F0
.word 0x27BD0108, 0x00000000, 0x00000000, 0x00000000
dlabel D_E00B8900
.word 0x0000001E, 0x008C0000, 0xFF000006, 0x001E0078, 0x0000FA00, 0x010C001E, 0x006EFFFB, 0xF0000111, 0x00320064, 0xFFECF000, 0x0216003C, 0x005AFFE2, 0xF000021A, 0x0046005A, 0xFFD8F000, 0x031C0050, 0x0055FFCE, 0xF0000420, 0x005A005A, 0xFFC4F000, 0x05230064, 0x0064FFBA, 0xF0000726, 0x006E006E, 0xFFB0F000, 0x08280078, 0x0078FFA6, 0xF0000B2A, 0x00820082, 0xFF9CF000, 0x0E2B0096, 0x0096FF92, 0xF000122C, 0x00BE00BE, 0xFF88F000, 0x152D00E6, 0x00E6FF7E, 0xF000182E, 0x010E010E, 0xFF74F000, 0x1B2F0136, 0x0136FF6A, 0xF0001E30, 0x015E015E, 0xFF60C800, 0x2131017C, 0x017CFF56, 0x8C002432, 0x01900190, 0xFF4C2800, 0x0000001E, 0x008C0000, 0xFF000006, 0x001E0078, 0x0000F000, 0xFF0C001E, 0x006E0005, 0xE600FF11, 0x00320064, 0x0014DC00, 0xFE16003C, 0x005A001E, 0xD200FE1A, 0x0046005A, 0x0028C800, 0xFD1C0050, 0x00550032, 0xBE00FC20, 0x005A0050, 0x003CB400, 0xFB230064, 0x004D0046, 0xAA00F926, 0x006E0041, 0x0050A000, 0xF8280078, 0x0036005A, 0x9600F52A, 0x0082003C, 0x00648C00, 0xF22B008C, 0x0046006E, 0x8200EE2C, 0x00960050, 0x00787800, 0xEB2D00A0, 0x005A0082, 0x6E00E82E, 0x00AA0064, 0x008C5A00, 0xE52F00B4, 0x006E0096, 0x5000E230, 0x00BE0078, 0x00A04600, 0xDF3100C8, 0x008200AA, 0x1E00DC32, 0x00D2008C, 0x00B40A00, 0x0000001E, 0x008C0000, 0xFF000006, 0x001E0078, 0x0000F000, 0x000C001E, 0x006E0005, 0xE6000011, 0x00320064, 0x0014DC00, 0x0016003C, 0x005A001E, 0xD200001A, 0x0046005A, 0x0028C800, 0x001C0050, 0x00550032, 0xBE000020, 0x005A0050, 0x003CB400, 0x00230064, 0x004D0046, 0xAA000026, 0x006E0041, 0x0050A000, 0x00280078, 0x0036005A, 0x9600002A, 0x0082003C, 0x00648C00, 0x002B008C, 0x0046006E, 0x8200002C, 0x00960050, 0x00787800, 0x002D00A0, 0x005A0082, 0x6E00002E, 0x00AA0064, 0x008C5A00, 0x002F00B4, 0x006E0096, 0x50000030, 0x00BE0078, 0x00A04600, 0x003100C8, 0x008200AA, 0x1E000032, 0x00D2008C, 0x00B40A00
dlabel D_E00B8B58
.word 0x0000001E, 0x008C0000, 0xFF000006, 0x001E0078, 0x0000F000, 0x010C001E, 0x006EFFFB, 0xE6000111, 0x00320064, 0xFFECDC00, 0x0216003C, 0x005AFFE2, 0xD200021A, 0x0046005A, 0xFFD8C800, 0x031C0050, 0x0055FFCE, 0xBE000420, 0x005A0050, 0xFFC4B400, 0x05230064, 0x004DFFBA, 0x78000726, 0x006E0041, 0xFFB05000, 0x08280078, 0x0036FFA6, 0x28000000, 0x001E008C, 0x0000FF00, 0x0006001E, 0x00780000, 0xF000FF0C, 0x001E006E, 0x0005E600, 0xFF110032, 0x00640014, 0xDC00FE16, 0x003C005A, 0x001ED200, 0xFE1A0046, 0x005A0028, 0xC800FD1C, 0x00500055, 0x0032BE00, 0xFC20005A, 0x0050003C, 0xB400FB23, 0x0064004D, 0x00467800, 0xF926006E, 0x00410050, 0x5000F828, 0x00780036, 0x005A2800, 0x0000001E, 0x008C0000, 0xFF000006, 0x001E0078, 0x0000F000, 0x000C001E, 0x006E0005, 0xE6000011, 0x00320064, 0x0014DC00, 0x0016003C, 0x005A001E, 0xD200001A, 0x0046005A, 0x0028C800, 0x001C0050, 0x00550032, 0xBE000020, 0x005A0050, 0x003CB400, 0x00240064, 0x004D0046, 0x78000027, 0x006E0041, 0x00505000, 0x002A0078, 0x0036005A, 0x28000000
dlabel D_E00B8CA4
.word 0x00000000, 0x00000028, 0x00000037, 0x000000BE, 0x00000014, 0x00000082, 0x0000010E, 0x0000012C, 0x00000000, 0x00000000, 0x00000000
dlabel D_E00B8CD0
.double 0.01, 0.0

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

@ -1,12 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00BAE80
.double 0.7
dlabel D_E00BAE88
.double 0.98
dlabel D_E00BAE90
.double 0.02, 0.0

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

@ -1,24 +0,0 @@
.include "macro.inc"
.section .data
dlabel D_E00BCC30
.word 0x05050505, 0x05050505, 0x05050505, 0x0A090301, 0x00000000, 0x00000000, 0x05050505, 0x05050505, 0x05050505, 0x08070605, 0x04030201, 0x00000000, 0x23051905, 0x00192305, 0x0F000000, 0x0A0D0F0C, 0x0B0D0A0C, 0x05010000, 0x2D0F230F, 0x00232D37, 0x19050200, 0x0D0A0C0A, 0x0D0A0D0A, 0x0C090501, 0x0F0F0F0F, 0x0F0F000F, 0x0F050200, 0x0E0A0F0A, 0x0D1E201E, 0x1832283C, 0x01050F0F, 0x232D2823, 0x19050200, 0x04060A05, 0x080E060A, 0x0E233232, 0x010F190F, 0x19232D28, 0x230F0500, 0x0202170C, 0x080F0F05, 0x0612263C, 0x1E190F05, 0x0F0F191E, 0x23190500, 0x0303030B, 0x030C0405, 0x020C2A32, 0x2121140C, 0x19110F14, 0x16140500, 0x03030302, 0x0A02020C, 0x02020214, 0x1E1E1919, 0x23140F0A, 0x0F0F0500, 0x02020202, 0x02020602, 0x02020605, 0x1B1B1616, 0x20110C07, 0x0C0C0200, 0x02020202, 0x02020202, 0x02020200
dlabel D_E00BCD38
.word 0x19191905, 0x19051919, 0x05191919, 0x04030201, 0x00000000, 0x00000000, 0x0F0F0F19, 0x0F0F0519, 0x190F1919, 0x04040404, 0x04030201, 0x00000000, 0x19191905, 0x0F190505, 0x0F050500, 0x04040404, 0x04040604, 0x04040000, 0x19191905, 0x19051919, 0x050F0500, 0x04040404, 0x04040604, 0x04040605, 0x0F0F0F2D, 0x232D2323, 0x19230F00, 0x04040404, 0x04040604, 0x04040605, 0x2D372319, 0x370F2D19, 0x2D230F00, 0x04040404, 0x04040604, 0x04040605, 0x55190F4B, 0x1941232D, 0x4B550F00, 0x04040404, 0x04040604, 0x04040605, 0x550F2337, 0x412D194B, 0x232D2328, 0x04040404, 0x04040604, 0x04040605, 0x550F2337, 0x412D194B, 0x232D2328, 0x04040404, 0x04040604, 0x04040605, 0x550F2337, 0x412D194B, 0x232D2328, 0x04040404, 0x04040604, 0x04040605, 0x1E1E1919, 0x23140F0A, 0x0F0F0500, 0x04040404, 0x04040404, 0x04040200
dlabel D_E00BCE40
.word D_E00BCC30, D_E00BCD38, 0x00000000, 0x00000000
dlabel D_E00BCE50
.double 0.005
dlabel D_E00BCE58
.double 0.04
dlabel D_E00BCE60
.double 0.04
dlabel D_E00BCE68
.double 0.1

15
ver/us/asm/nonmatchings/effects/effect_79/fx_79_appendGfx.s
View File

@ -1,6 +1,21 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E009EE20
.double 0.95
dlabel D_E009EE28
.double 2.3
dlabel D_E009EE30
.double 0.05
dlabel D_E009EE38
.double 0.1
.section .text
glabel fx_79_appendGfx
/* 3A0344 E009E424 27BDFED0 */ addiu $sp, $sp, -0x130
/* 3A0348 E009E428 AFBF0104 */ sw $ra, 0x104($sp)

9
ver/us/asm/nonmatchings/effects/effect_79/fx_79_main.s
View File

@ -1,6 +1,15 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E009EE00
.double 0.1
dlabel D_E009EE08
.double 0.4
.section .text
glabel fx_79_main
/* 39FF20 E009E000 27BDFFA8 */ addiu $sp, $sp, -0x58
/* 39FF24 E009E004 F7B40040 */ sdc1 $f20, 0x40($sp)

9
ver/us/asm/nonmatchings/effects/effect_79/fx_79_update.s
View File

@ -1,6 +1,15 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E009EE10
.double 0.1
dlabel D_E009EE18
.double 0.4
.section .text
glabel fx_79_update
/* 3A0104 E009E1E4 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 3A0108 E009E1E8 AFB20018 */ sw $s2, 0x18($sp)

23
ver/us/asm/nonmatchings/effects/effect_82/fx_82_main.s
View File

@ -1,6 +1,15 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel jtbl_E00A4AD0
.word .LE00A40F4_3A38D4, .LE00A40FC_3A38DC, .LE00A4108_3A38E8, .LE00A4114_3A38F4, .LE00A4120_3A3900, .LE00A412C_3A390C, .LE00A4138_3A3918
dlabel D_E00A4AF0
.double 0.1
.section .text
glabel fx_82_main
/* 3A37E0 E00A4000 27BDFFA8 */ addiu $sp, $sp, -0x58
/* 3A37E4 E00A4004 F7B60040 */ sdc1 $f22, 0x40($sp)
@ -67,30 +76,30 @@ glabel fx_82_main
/* 3A38C8 E00A40E8 8C224AD0 */ lw $v0, %lo(jtbl_E00A4AD0)($at)
/* 3A38CC E00A40EC 00400008 */ jr $v0
/* 3A38D0 E00A40F0 00000000 */ nop
dlabel LE00A40F4_3A38D4
.LE00A40F4_3A38D4:
/* 3A38D4 E00A40F4 0802905E */ j .LE00A4178
/* 3A38D8 E00A40F8 AC60001C */ sw $zero, 0x1c($v1)
dlabel LE00A40FC_3A38DC
.LE00A40FC_3A38DC:
/* 3A38DC E00A40FC 24020002 */ addiu $v0, $zero, 2
/* 3A38E0 E00A4100 0802905E */ j .LE00A4178
/* 3A38E4 E00A4104 AC62001C */ sw $v0, 0x1c($v1)
dlabel LE00A4108_3A38E8
.LE00A4108_3A38E8:
/* 3A38E8 E00A4108 24020004 */ addiu $v0, $zero, 4
/* 3A38EC E00A410C 0802905E */ j .LE00A4178
/* 3A38F0 E00A4110 AC62001C */ sw $v0, 0x1c($v1)
dlabel LE00A4114_3A38F4
.LE00A4114_3A38F4:
/* 3A38F4 E00A4114 24020006 */ addiu $v0, $zero, 6
/* 3A38F8 E00A4118 0802905E */ j .LE00A4178
/* 3A38FC E00A411C AC62001C */ sw $v0, 0x1c($v1)
dlabel LE00A4120_3A3900
.LE00A4120_3A3900:
/* 3A3900 E00A4120 24020007 */ addiu $v0, $zero, 7
/* 3A3904 E00A4124 0802905E */ j .LE00A4178
/* 3A3908 E00A4128 AC62001C */ sw $v0, 0x1c($v1)
dlabel LE00A412C_3A390C
.LE00A412C_3A390C:
/* 3A390C E00A412C 24020008 */ addiu $v0, $zero, 8
/* 3A3910 E00A4130 0802905E */ j .LE00A4178
/* 3A3914 E00A4134 AC62001C */ sw $v0, 0x1c($v1)
dlabel LE00A4138_3A3918
.LE00A4138_3A3918:
/* 3A3918 E00A4138 24020009 */ addiu $v0, $zero, 9
/* 3A391C E00A413C 0802905E */ j .LE00A4178
/* 3A3920 E00A4140 AC62001C */ sw $v0, 0x1c($v1)

38
ver/us/asm/nonmatchings/effects/effect_82/fx_82_update.s
View File

@ -1,6 +1,24 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel jtbl_E00A4AF8
.word .LE00A427C_3A3A5C, .LE00A42CC_3A3AAC, .LE00A4304_3A3AE4, .LE00A4354_3A3B34, .LE00A4384_3A3B64, .LE00A440C_3A3BEC, .LE00A4438_3A3C18, .LE00A4480_3A3C60, .LE00A44C0_3A3CA0, .LE00A4508_3A3CE8
dlabel D_E00A4B20
.double 1.1
dlabel D_E00A4B28
.double 1.1
dlabel D_E00A4B30
.double 1.1
dlabel D_E00A4B38
.double 1.1
.section .text
glabel fx_82_update
/* 3A398C E00A41AC 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 3A3990 E00A41B0 AFBF0018 */ sw $ra, 0x18($sp)
@ -60,7 +78,7 @@ glabel fx_82_update
/* 3A3A50 E00A4270 8C224AF8 */ lw $v0, %lo(jtbl_E00A4AF8)($at)
/* 3A3A54 E00A4274 00400008 */ jr $v0
/* 3A3A58 E00A4278 00000000 */ nop
dlabel LE00A427C_3A3A5C
.LE00A427C_3A3A5C:
/* 3A3A5C E00A427C 00031040 */ sll $v0, $v1, 1
/* 3A3A60 E00A4280 44826000 */ mtc1 $v0, $f12
/* 3A3A64 E00A4284 00000000 */ nop
@ -81,7 +99,7 @@ dlabel LE00A427C_3A3A5C
/* 3A3AA0 E00A42C0 44811000 */ mtc1 $at, $f2
/* 3A3AA4 E00A42C4 080290F4 */ j .LE00A43D0
/* 3A3AA8 E00A42C8 46020000 */ add.s $f0, $f0, $f2
dlabel LE00A42CC_3A3AAC
.LE00A42CC_3A3AAC:
/* 3A3AAC E00A42CC 240500FF */ addiu $a1, $zero, 0xff
/* 3A3AB0 E00A42D0 02250018 */ mult $s1, $a1
/* 3A3AB4 E00A42D4 3C048080 */ lui $a0, 0x8080
@ -96,7 +114,7 @@ dlabel LE00A42CC_3A3AAC
/* 3A3AD8 E00A42F8 00003010 */ mfhi $a2
/* 3A3ADC E00A42FC 0802916E */ j .LE00A45B8
/* 3A3AE0 E00A4300 00C31021 */ addu $v0, $a2, $v1
dlabel LE00A4304_3A3AE4
.LE00A4304_3A3AE4:
/* 3A3AE4 E00A4304 00031040 */ sll $v0, $v1, 1
/* 3A3AE8 E00A4308 44826000 */ mtc1 $v0, $f12
/* 3A3AEC E00A430C 00000000 */ nop
@ -117,7 +135,7 @@ dlabel LE00A4304_3A3AE4
/* 3A3B28 E00A4348 44811000 */ mtc1 $at, $f2
/* 3A3B2C E00A434C 080290F4 */ j .LE00A43D0
/* 3A3B30 E00A4350 46020000 */ add.s $f0, $f0, $f2
dlabel LE00A4354_3A3B34
.LE00A4354_3A3B34:
/* 3A3B34 E00A4354 240300FF */ addiu $v1, $zero, 0xff
/* 3A3B38 E00A4358 02230018 */ mult $s1, $v1
/* 3A3B3C E00A435C 3C048080 */ lui $a0, 0x8080
@ -130,7 +148,7 @@ dlabel LE00A4354_3A3B34
/* 3A3B58 E00A4378 AE020024 */ sw $v0, 0x24($s0)
/* 3A3B5C E00A437C 0802916B */ j .LE00A45AC
/* 3A3B60 E00A4380 240200AA */ addiu $v0, $zero, 0xaa
dlabel LE00A4384_3A3B64
.LE00A4384_3A3B64:
/* 3A3B64 E00A4384 00031040 */ sll $v0, $v1, 1
/* 3A3B68 E00A4388 44826000 */ mtc1 $v0, $f12
/* 3A3B6C E00A438C 00000000 */ nop
@ -166,7 +184,7 @@ dlabel LE00A4384_3A3B64
/* 3A3BE0 E00A4400 00621823 */ subu $v1, $v1, $v0
/* 3A3BE4 E00A4404 08029172 */ j .LE00A45C8
/* 3A3BE8 E00A4408 AE03002C */ sw $v1, 0x2c($s0)
dlabel LE00A440C_3A3BEC
.LE00A440C_3A3BEC:
/* 3A3BEC E00A440C 240300FF */ addiu $v1, $zero, 0xff
/* 3A3BF0 E00A4410 02230018 */ mult $s1, $v1
/* 3A3BF4 E00A4414 3C048080 */ lui $a0, 0x8080
@ -178,7 +196,7 @@ dlabel LE00A440C_3A3BEC
/* 3A3C0C E00A442C AE020024 */ sw $v0, 0x24($s0)
/* 3A3C10 E00A4430 0802916B */ j .LE00A45AC
/* 3A3C14 E00A4434 240200C8 */ addiu $v0, $zero, 0xc8
dlabel LE00A4438_3A3C18
.LE00A4438_3A3C18:
/* 3A3C18 E00A4438 C6000030 */ lwc1 $f0, 0x30($s0)
/* 3A3C1C E00A443C 3C01E00A */ lui $at, %hi(D_E00A4B20)
/* 3A3C20 E00A4440 D4224B20 */ ldc1 $f2, %lo(D_E00A4B20)($at)
@ -197,7 +215,7 @@ dlabel LE00A4438_3A3C18
/* 3A3C54 E00A4474 AE020024 */ sw $v0, 0x24($s0)
/* 3A3C58 E00A4478 08029153 */ j .LE00A454C
/* 3A3C5C E00A447C 24020078 */ addiu $v0, $zero, 0x78
dlabel LE00A4480_3A3C60
.LE00A4480_3A3C60:
/* 3A3C60 E00A4480 C6000030 */ lwc1 $f0, 0x30($s0)
/* 3A3C64 E00A4484 3C01E00A */ lui $at, %hi(D_E00A4B28)
/* 3A3C68 E00A4488 D4224B28 */ ldc1 $f2, %lo(D_E00A4B28)($at)
@ -214,7 +232,7 @@ dlabel LE00A4480_3A3C60
/* 3A3C94 E00A44B4 00640018 */ mult $v1, $a0
/* 3A3C98 E00A44B8 08029151 */ j .LE00A4544
/* 3A3C9C E00A44BC 240200BD */ addiu $v0, $zero, 0xbd
dlabel LE00A44C0_3A3CA0
.LE00A44C0_3A3CA0:
/* 3A3CA0 E00A44C0 C6000030 */ lwc1 $f0, 0x30($s0)
/* 3A3CA4 E00A44C4 3C01E00A */ lui $at, %hi(D_E00A4B30)
/* 3A3CA8 E00A44C8 D4224B30 */ ldc1 $f2, %lo(D_E00A4B30)($at)
@ -233,7 +251,7 @@ dlabel LE00A44C0_3A3CA0
/* 3A3CDC E00A44FC AE020024 */ sw $v0, 0x24($s0)
/* 3A3CE0 E00A4500 08029153 */ j .LE00A454C
/* 3A3CE4 E00A4504 2402006E */ addiu $v0, $zero, 0x6e
dlabel LE00A4508_3A3CE8
.LE00A4508_3A3CE8:
/* 3A3CE8 E00A4508 C6000030 */ lwc1 $f0, 0x30($s0)
/* 3A3CEC E00A450C 3C01E00A */ lui $at, %hi(D_E00A4B38)
/* 3A3CF0 E00A4510 D4224B38 */ ldc1 $f2, %lo(D_E00A4B38)($at)

6
ver/us/asm/nonmatchings/effects/effect_84/fx_84_update.s
View File

@ -1,6 +1,12 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00A86A0
.double 0.01
.section .text
glabel fx_84_update
/* 3A71F4 E00A8104 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 3A71F8 E00A8108 AFBF0020 */ sw $ra, 0x20($sp)

9
ver/us/asm/nonmatchings/effects/effect_86/fx_86_update.s
View File

@ -1,6 +1,15 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00AC8D0
.double 0.01
dlabel D_E00AC8D8
.double 0.01
.section .text
glabel fx_86_update
/* 3AEF44 E00AC124 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 3AEF48 E00AC128 AFBF0010 */ sw $ra, 0x10($sp)

6
ver/us/asm/nonmatchings/effects/effect_88/fx_88_appendGfx.s
View File

@ -1,6 +1,12 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00B07E8
.double 0.1
.section .text
glabel fx_88_appendGfx
/* 3B40E4 E00B0234 27BDFF10 */ addiu $sp, $sp, -0xf0
/* 3B40E8 E00B0238 0080402D */ daddu $t0, $a0, $zero

6
ver/us/asm/nonmatchings/effects/effect_88/fx_88_update.s
View File

@ -1,6 +1,12 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00B07E0
.double 0.3
.section .text
glabel fx_88_update
/* 3B3FD4 E00B0124 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 3B3FD8 E00B0128 AFBF0010 */ sw $ra, 0x10($sp)

6
ver/us/asm/nonmatchings/effects/effect_90/fx_90_appendGfx.s
View File

@ -1,6 +1,12 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00B4EF8
.double 0.3
.section .text
glabel fx_90_appendGfx
/* 3B626C E00B457C 27BDFEF8 */ addiu $sp, $sp, -0x108
/* 3B6270 E00B4580 0080282D */ daddu $a1, $a0, $zero

18
ver/us/asm/nonmatchings/effects/effect_90/fx_90_update.s
View File

@ -1,6 +1,24 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00B4ED0
.double 0.01
dlabel D_E00B4ED8
.double 0.2
dlabel D_E00B4EE0
.double 0.2
dlabel D_E00B4EE8
.double 0.97
dlabel D_E00B4EF0
.double 0.1
.section .text
glabel fx_90_update
/* 3B5E2C E00B413C 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 3B5E30 E00B4140 AFB20020 */ sw $s2, 0x20($sp)

6
ver/us/asm/nonmatchings/effects/effect_91/fx_91_appendGfx.s
View File

@ -1,6 +1,12 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00B6768
.double 0.1
.section .text
glabel fx_91_appendGfx
/* 3B7440 E00B62E0 27BDFF40 */ addiu $sp, $sp, -0xc0
/* 3B7444 E00B62E4 0080302D */ daddu $a2, $a0, $zero

6
ver/us/asm/nonmatchings/effects/effect_91/fx_91_main.s
View File

@ -1,6 +1,12 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00B6750
.double 0.01
.section .text
glabel fx_91_main
/* 3B7160 E00B6000 27BDFFA0 */ addiu $sp, $sp, -0x60
/* 3B7164 E00B6004 F7B80048 */ sdc1 $f24, 0x48($sp)

9
ver/us/asm/nonmatchings/effects/effect_91/fx_91_update.s
View File

@ -1,6 +1,15 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00B6758
.double -0.1
dlabel D_E00B6760
.double 0.1
.section .text
glabel fx_91_update
/* 3B72E0 E00B6180 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 3B72E4 E00B6184 AFBF0010 */ sw $ra, 0x10($sp)

6
ver/us/asm/nonmatchings/effects/effect_92/fx_92_appendGfx.s
View File

@ -1,6 +1,12 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00B8CD0
.double 0.01
.section .text
glabel fx_92_appendGfx
/* 3B7D88 E00B8208 27BDFEF8 */ addiu $sp, $sp, -0x108
/* 3B7D8C E00B820C 0080302D */ daddu $a2, $a0, $zero

11
ver/us/asm/nonmatchings/effects/effect_93/fx_93_update.s
View File

@ -1,6 +1,17 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00BAE80
.double 0.7
dlabel D_E00BAE88
.double 0.98
dlabel D_E00BAE90
.double 0.02
.section .text
glabel fx_93_update
/* 3B8D44 E00BA174 27BDFFC8 */ addiu $sp, $sp, -0x38
/* 3B8D48 E00BA178 AFBF0024 */ sw $ra, 0x24($sp)

12
ver/us/asm/nonmatchings/effects/effect_94/fx_94_appendGfx.s
View File

@ -1,6 +1,18 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00BCE58
.double 0.04
dlabel D_E00BCE60
.double 0.04
dlabel D_E00BCE68
.double 0.1
.section .text
glabel fx_94_appendGfx
/* 3BA3A4 E00BC374 27BDFF08 */ addiu $sp, $sp, -0xf8
/* 3BA3A8 E00BC378 0080482D */ daddu $t1, $a0, $zero

6
ver/us/asm/nonmatchings/effects/effect_94/fx_94_main.s
View File

@ -1,6 +1,12 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_E00BCE50
.double 0.005
.section .text
glabel fx_94_main
/* 3BA030 E00BC000 27BDFF90 */ addiu $sp, $sp, -0x70
/* 3BA034 E00BC004 F7B40040 */ sdc1 $f20, 0x40($sp)

26
ver/us/splat.yaml
View File

@ -2870,7 +2870,7 @@ segments:
vram: 0xE009E000
subsegments:
- [0x39FF20, c, effect_79]
- [0x3A0D10, data]
- [0x3A0D10]
- [0x3A0D60, bin] # effect 79 gfx
- name: effect_80
dir: effects
@ -2887,7 +2887,7 @@ segments:
vram: 0xE00A2000
subsegments:
- [0x3A2990, c, effect_81]
- [0x3A3360, data]
- [0x3A3360]
- [0x3A33D0, bin] # effect 81 gfx
- name: effect_82
dir: effects
@ -2896,7 +2896,7 @@ segments:
vram: 0xE00A4000
subsegments:
- [0x3A37E0, c, effect_82]
- [0x3A42B0, data]
- [0x3A42B0]
- [0x3A4320, bin] # effect 82 gfx
- name: effect_83
dir: effects
@ -2913,7 +2913,7 @@ segments:
vram: 0xE00A8000
subsegments:
- [0x3A70F0, c, effect_84]
- [0x3A7710, data]
- [0x3A7710]
- [0x3A77A0, bin] # effect 84 gfx
- name: effect_85
dir: effects
@ -2922,7 +2922,7 @@ segments:
vram: 0xE00AA000
subsegments:
- [0x3AA920, c, effect_85]
- [0x3AAFE0, data]
- [0x3AAFE0]
- [0x3AB030, bin] # effect 85 gfx
- name: effect_86
dir: effects
@ -2931,7 +2931,7 @@ segments:
vram: 0xE00AC000
subsegments:
- [0x3AEE20, c, effect_86]
- [0x3AF5D0, data]
- [0x3AF5D0]
- [0x3AF700, bin] # effect 86 gfx
- name: effect_87
dir: effects
@ -2948,7 +2948,7 @@ segments:
vram: 0xE00B0000
subsegments:
- [0x3B3EB0, c, effect_88]
- [0x3B4690, data]
- [0x3B4690]
- [0x3B46A0, bin] # effect 88 gfx
- name: effect_89
dir: effects
@ -2957,7 +2957,7 @@ segments:
vram: 0xE00B2000
subsegments:
- [0x3B4790, c, effect_89]
- [0x3B5330, data]
- [0x3B5330]
- [0x3B5340, bin] # effect 89 gfx
- name: effect_90
dir: effects
@ -2966,7 +2966,7 @@ segments:
vram: 0xE00B4000
subsegments:
- [0x3B5CF0, c, effect_90]
- [0x3B69E0, data]
- [0x3B69E0]
- [0x3B6BF0, bin] # effect 90 gfx
- name: effect_91
dir: effects
@ -2975,7 +2975,7 @@ segments:
vram: 0xE00B6000
subsegments:
- [0x3B7160, c, effect_91]
- [0x3B78B0, data]
- [0x3B78B0]
- [0x3B78D0, bin] # effect 91 gfx
- name: effect_92
dir: effects
@ -2984,7 +2984,7 @@ segments:
vram: 0xE00B8000
subsegments:
- [0x3B7B80, c, effect_92]
- [0x3B8470, data]
- [0x3B8470]
- [0x3B8860, bin] # effect 92 gfx
- name: effect_93
dir: effects
@ -2993,7 +2993,7 @@ segments:
vram: 0xE00BA000
subsegments:
- [0x3B8BD0, c, effect_93]
- [0x3B9A50, data]
- [0x3B9A50]
- [0x3B9A70, bin] # effect 93 gfx
- name: effect_94
dir: effects
@ -3002,7 +3002,7 @@ segments:
vram: 0xE00BC000
subsegments:
- [0x3BA030, c, effect_94]
- [0x3BAC60, data]
- [0x3BAC60]
- [0x3BAEA0, bin] # effect 94 gfx
- name: effect_95
dir: effects