KMC GCC, effects, cleanup, map funcs (#476)

* warnings, cleanup, 2 npc ai funcs

* kmcgcc stuff

* effect_75

* effect_9.c done

* cleanup, work on kmc gcc

* start on fx_73

* guOrtho/guOrthoF

* more libultra/cleanup

* more libultra

* add wine for darwin

* effect_73 done

* UnkQuizFunc

* effect func naming

* name appendGfx funcs

* fix fx_66

* Add KMC wrapper to Jenkinsfile

* mac fixes

* fix macro usage

* oopz

* 3 fixes

* blah

* KMC_ASM

* config changes

Jenkinsfile

@@ -11,6 +11,7 @@ pipeline {
                 sh 'curl -L "https://github.com/pmret/gcc-papermario/releases/download/master/linux.tar.gz" | tar zx -C tools/build/cc/gcc'
                 sh 'curl -L "https://github.com/pmret/binutils-papermario/releases/download/master/linux.tar.gz" | tar zx -C tools/build/cc/gcc'
                 sh 'curl -L "https://github.com/ethteck/ido-static-recomp/releases/download/per-function/ido-5.3-recomp-ubuntu-latest.tar.gz" | tar zx -C tools/build/cc/ido5.3'
+		sh 'curl -L "https://github.com/Mr-Wiseguy/kmc-gcc-wrapper/releases/download/master/kmc-gcc-wrapper-ubuntu-latest.tar.gz" | tar zx -C tools/build/cc/kmcgcc'
                 sh './configure'
             }
         }

include/common_structs.h

@@ -1243,7 +1243,7 @@ typedef Shadow* ShadowList[MAX_SHADOWS];
 typedef struct StaticShadowData {
     /* 0x00 */ u16 flags;
     /* 0x02 */ char unk_02[0x2];
-    /* 0x04 */ s32 unk_04;
+    /* 0x04 */ s32* unk_04;
     /* 0x08 */ StaticAnimatorNode** animModelNode;
     /* 0x0C */ void (*onCreateCallback)(Shadow* shadow);
     /* 0x10 */ char unk_10[0x10];

include/effects_internal.h

@@ -3,10 +3,41 @@
 
 #include "effects.h"
 
+// Used by effects 8 and 9 (TODO: better name)
+typedef struct Effect8 {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ u16 unk_04;
+    /* 0x06 */ s16 unk_06;
+    /* 0x08 */ u8 primAlpha;
+    /* 0x09 */ s8 unk_09;
+    /* 0x0A */ char unk_0A[0x2];
+    /* 0x0C */ f32 unk_0C;
+    /* 0x10 */ f32 unk_10;
+    /* 0x14 */ f32 unk_14;
+    /* 0x18 */ f32 unk_18;
+    /* 0x1C */ f32 unk_1C;
+    /* 0x20 */ f32 unk_20;
+    /* 0x24 */ f32 unk_24;
+    /* 0x28 */ f32 unk_28;
+    /* 0x2C */ f32 unk_2C;
+    /* 0x30 */ Mtx unk_30;
+    /* 0x70 */ f32 unk_70;
+    /* 0x74 */ f32 unk_74;
+    /* 0x78 */ f32 unk_78;
+    /* 0x7C */ f32 unk_7C;
+    /* 0x80 */ f32 unk_80;
+    /* 0x84 */ f32 unk_84;
+    /* 0x88 */ f32 unk_88;
+    /* 0x8C */ f32 unk_8C;
+    /* 0x90 */ f32 unk_90;
+    /* 0x94 */ f32 unk_94;
+} Effect8; // size = 0x98
+
 u32 func_E0200000(s32);
 
 EffectInstance* shim_create_effect_instance(EffectBlueprint* effectBp);
 void shim_remove_effect(EffectInstance*);
+s32 shim_rand_int(s32);
 void* shim_general_heap_malloc(s32 size);
 RenderTask* shim_queue_render_task(RenderTask* task);
 f32 shim_sin_deg(f32 x);

include/functions.h

@@ -305,6 +305,9 @@ void set_aux_pan_v(s32 texPannerID, s32 value);
 void enable_world_fog(void);
 void set_world_fog_dist(s32 start, s32 end);
 void set_world_fog_color(s32 r, s32 g, s32 b, s32 a);
+void enable_entity_fog(void);
+void set_entity_fog_dist(s32 start, s32 end);
+void set_entity_fog_color(s32 r, s32 g, s32 b, s32 a);
 
 ModelTransformGroup* get_transform_group(s32 index);
 
@@ -471,6 +474,16 @@ void crash_screen_set_draw_info(u16* frameBufPtr, s16 width, s16 height);
 void func_80077BD0(s32, s32, s32, s32, s32, s32);
 void func_8006CAC0(float mf[4][4], float x, float y, float z);
 
+void func_800495A0(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_800496B8(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_80049C04(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_80049E3C(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_80049ECC(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_80049F7C(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_8004A124(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_8004A3E8(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory);
+void func_8004A73C(Evt* script);
+
 s32 create_generic_entity_world(void (*updateFunc)(void), void (*drawFunc)(void));
 EntityModel* get_entity_model(s32 idx);
 f32 phys_get_spin_history(s32 lag, s32* x, s32* y, s32* z);

include/include_asm_libultra.h

@@ -0,0 +1,31 @@
+#ifndef __INCLUDE_ASM_LIBULTRA_H__
+#define __INCLUDE_ASM_LIBULTRA_H__
+
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x) STRINGIFY_(x)
+
+#if !defined(SPLAT) && !defined(__CTX__) && !defined(PERMUTER)
+#ifndef INCLUDE_ASM_LIBULTRA
+#define INCLUDE_ASM_LIBULTRA(FOLDER, NAME) \
+   __asm__( \
+        ".section .text\n" \
+        "\t.align\t2\n" \
+        "\t.globl\t"#NAME"\n" \
+        "\t.ent\t"#NAME"\n" \
+        #NAME ":\n" \
+        "\t.include \"ver/"STRINGIFY(VERSION)"/asm/os/"FOLDER"/"#NAME".s\"\n" \
+        "\t.set reorder\n" \
+        "\t.set at\n" \
+        "\t.end\t"#NAME \
+    );
+#endif
+__asm__(".include \"include/macro.inc\"\n");
+#ifdef MOVE_ADDU
+__asm__(".include \"include/move_addu.inc\"\n");
+#endif
+#else
+#define INCLUDE_ASM_LIBULTRA(FOLDER, NAME)
+#endif
+
+
+#endif

include/map.h

@@ -327,6 +327,11 @@ typedef struct {
     /* 0x08 */ s32 battle;
 } NpcGroupList[]; // size = 0x0C
 
+typedef struct QuizRequirements {
+    s32 unk_00;
+    s32 unk_04;
+} QuizRequirements; // size = 0x8
+
 #define NPC_GROUP(npcs, battle) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle }
 
 Enemy* get_enemy(s32 npcId);

include/variables.h

@@ -112,15 +112,6 @@ extern f32 D_800F7B70[4];
 
 extern TempSetZoneEnabled* D_800D91D4;
 
-extern UNK_TYPE D_0A0031E0;
-extern UNK_TYPE D_0A001508;
-extern UNK_TYPE D_0A0031B0;
-extern UNK_TYPE D_0A0014D8;
-extern UNK_TYPE D_0A002F78;
-extern UNK_TYPE D_0A001218;
-extern UNK_TYPE D_0A003F70;
-extern UNK_TYPE D_0A002318;
-
 // Animation related
 extern AnimatedMeshList* gCurrentAnimMeshListPtr;
 

install.sh

@@ -23,7 +23,7 @@ if [[ "$uname" == "Darwin" ]]; then
     fi
 
     # Install packages
-    brew install md5sha1sum ninja gcc nanaian/brew/mips-linux-gnu-binutils || exit 1
+    brew install md5sha1sum ninja gcc nanaian/brew/mips-linux-gnu-binutils wine || exit 1
     python3 -m pip install -U -r requirements.txt || exit 1
 
     if [[ $1 == "--extra" ]]; then
@@ -42,6 +42,9 @@ curl -L "https://github.com/pmret/binutils-papermario/releases/download/master/l
 echo "Downloading IDO 5.3 for Linux"
 curl -L "https://github.com/ethteck/ido-static-recomp/releases/download/per-function/ido-5.3-recomp-ubuntu-latest.tar.gz" | tar zx -C tools/build/cc/ido5.3
 
+echo "Downloading KMC GCC wrapper for Linux"
+curl -L "https://github.com/Mr-Wiseguy/kmc-gcc-wrapper/releases/download/master/kmc-gcc-wrapper-ubuntu-latest.tar.gz" | tar zx -C tools/build/cc/kmcgcc
+
 # Debian and derivatives (apt)
 if cat /etc/os-release | grep -E 'ID=debian|ID_LIKE=(.*)debian' &> /dev/null; then
     echo "Installing packages for Debian or derivative (apt)"

src/104730.c

@@ -1,4 +1,5 @@
 #include "common.h"
+#include "ld_addrs.h"
 
 void entity_shattering_block_init(Entity* entity);
 
@@ -7,31 +8,18 @@ extern UNK_TYPE D_802E91F0;
 extern UNK_TYPE D_802E9270;
 extern UNK_TYPE D_802E92B0;
 
-extern UNK_TYPE D_0A003508;
-extern UNK_TYPE D_00E4B2E0;
-extern UNK_TYPE D_00E4E7F0;
-extern UNK_TYPE D_0A000EF8;
-extern UNK_TYPE D_0A000EF8;
-extern UNK_TYPE D_0A000EE8;
 extern UNK_TYPE D_0A000740;
-
+extern UNK_TYPE D_0A000EE8;
-extern UNK_TYPE D_00E62AC0;
+extern UNK_TYPE D_0A000EF8;
-extern UNK_TYPE D_00E639C0;
-extern UNK_TYPE D_00E639C0;
-extern UNK_TYPE D_00E648D0;
-extern UNK_TYPE D_00E639C0;
-extern UNK_TYPE D_00E648D0;
-extern UNK_TYPE D_00E62370;
-extern UNK_TYPE D_00E62AC0;
-
-extern UNK_TYPE D_0A0031E0;
-extern UNK_TYPE D_0A001508;
-extern UNK_TYPE D_0A0031B0;
-extern UNK_TYPE D_0A0014D8;
-extern UNK_TYPE D_0A002F78;
 extern UNK_TYPE D_0A001218;
-extern UNK_TYPE D_0A003F70;
+extern UNK_TYPE D_0A0014D8;
+extern UNK_TYPE D_0A001508;
 extern UNK_TYPE D_0A002318;
+extern UNK_TYPE D_0A002F78;
+extern UNK_TYPE D_0A0031B0;
+extern UNK_TYPE D_0A0031E0;
+extern UNK_TYPE D_0A003508;
+extern UNK_TYPE D_0A003F70;
 
 Gfx D_802E96F0[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@@ -46,21 +34,21 @@ Gfx D_802E96F0[] = {
 };
 
 Gfx D_802E9738[] = {
-    gsSPDisplayList(&D_802E96F0),
+    gsSPDisplayList(D_802E96F0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsDPLoadTextureTile_4b(&D_802E9170, G_IM_FMT_I, 16, 0, 0, 0, 15, 15, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD),
     gsSPEndDisplayList(),
 };
 
 Gfx D_802E9788[] = {
-    gsSPDisplayList(&D_802E96F0),
+    gsSPDisplayList(D_802E96F0),
     gsDPSetTextureLUT(G_TT_NONE),
     gsDPLoadTextureTile_4b(&D_802E91F0, G_IM_FMT_I, 16, 0, 0, 0, 15, 15, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD),
     gsSPEndDisplayList(),
 };
 
 Gfx D_802E97B0[] = {
-    gsSPDisplayList(&D_802E9738),
+    gsSPDisplayList(D_802E9738),
     gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH),
     gsSPVertex(&D_802E92B0, 4, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -68,7 +56,7 @@ Gfx D_802E97B0[] = {
 };
 
 Gfx D_802E97D8[] = {
-    gsSPDisplayList(&D_802E9788),
+    gsSPDisplayList(D_802E9788),
     gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH),
     gsSPVertex(&D_802E9270, 4, 0),
     gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -81,30 +69,30 @@ Gfx D_802E9828[] = {
 
 // Entity "script" data; unknown if it's used or not.
 s32 D_802E9830[8] = {
-    0x00000001, 0x0000003C, (s32) &D_802E9828, 0x00000002,
+    0x00000001, 0x0000003C, (s32)D_802E9828, 0x00000002,
     0x00000000, 0x00000000, 0x00000000, 0x00000000
 };
 
 s32 D_802E9850[9] = {
     0x00000005, 0x00000800, 0x00000004, 0x00000020,
-    0x00000001, 0x0000003C, (s32) &D_802E97D8, 0x00000002,
+    0x00000001, 0x0000003C, (s32)D_802E97D8, 0x00000002,
     0x00000000
 };
 
 s32 D_802E9874[9] = {
     0x00000005, 0x00000800, 0x00000004, 0x00000020,
-    0x00000001, 0x0000003C, (s32) &D_802E97D8, 0x00000002,
+    0x00000001, 0x0000003C, (s32)D_802E97D8, 0x00000002,
     0x00000000
 };
 s32 D_802E9898[9] = {
     0x00000005, 0x00000800, 0x00000004, 0x00000020,
-    0x00000001, 0x0000003C, &D_802E97B0, 0x00000002,
+    0x00000001, 0x0000003C, (s32)D_802E97B0, 0x00000002,
     0x00000000,
 };
 
 StaticShadowData D_802E98BC = {
     .flags = 0x20,
-    .unk_04 = &D_802E9850,
+    .unk_04 = D_802E9850,
     .animModelNode =  NULL,
     .onCreateCallback = entity_Shadow_init,
     .unk_20 = 0x01190A19,
@@ -112,7 +100,7 @@ StaticShadowData D_802E98BC = {
 
 StaticShadowData D_802E98E0 = {
     .flags = 0x20,
-    .unk_04 = &D_802E9874,
+    .unk_04 = D_802E9874,
     .animModelNode =  NULL,
     .onCreateCallback = entity_Shadow_init,
     .unk_20 = 0x01190A19,
@@ -120,7 +108,7 @@ StaticShadowData D_802E98E0 = {
 
 StaticShadowData D_802E9904 = {
     .flags = 0x20,
-    .unk_04 = &D_802E9898,
+    .unk_04 = D_802E9898,
     .animModelNode =  NULL,
     .onCreateCallback = entity_Shadow_init,
     .unk_20 = 0x01190A19,
@@ -147,12 +135,11 @@ s32 D_802E9930[51] = {
 };
 
 s32 D_802E99FC[7] = {
-
     0x00000004, 0x00000022, 0x00000001, 0x0000003C,
     &D_0A003508, 0x00000002, 0x00000000,
 };
 
-StaticEntityData D_802E9A18 = { 0x4200, 0x0020, &D_802E99FC, {0, 0, 0, 0}, entity_SaveBlock_init, &D_802E9930, entity_block_handle_collision, &D_00E4B2E0, &D_00E4E7F0, 32, {0x19, 0x19, 0x19}};
+StaticEntityData D_802E9A18 = { 0x4200, 0x0020, &D_802E99FC, {0, 0, 0, 0}, entity_SaveBlock_init, &D_802E9930, entity_block_handle_collision, E4B2E0_ROM_START, E4B2E0_ROM_END, 32, {0x19, 0x19, 0x19}};
 
 // potential file split(?)
 s32 D_802E9A3C[1] = {
@@ -208,10 +195,10 @@ s32 D_802E9B94[7] = {
     (s32) &D_0A000740, 0x00000002, 0x00000000,
 };
 
-StaticEntityData D_802E9BB0 = { 0xA000, 0x002C, &D_802E9B78, {0, 0, 0, 0}, entity_base_switch_init,              &D_802E9A40, NULL, &D_00E62AC0, &D_00E639C0,  8, {0x16, 0x17, 0x16} };
+StaticEntityData D_802E9BB0 = { 0xA000, 0x002C, &D_802E9B78, {0, 0, 0, 0}, entity_base_switch_init,    &D_802E9A40, NULL, E62AC0_ROM_START, E62AC0_ROM_END, 8, {0x16, 0x17, 0x16} };
-StaticEntityData D_802E9BD4 = { 0xAA04, 0x002C, &D_802E9B40, {0, 0, 0, 0}, entity_BlueSwitch_init,     &D_802E9AC4, NULL, &D_00E639C0, &D_00E648D0,  7, {0x16, 0x17, 0x16} };
+StaticEntityData D_802E9BD4 = { 0xAA04, 0x002C, &D_802E9B40, {0, 0, 0, 0}, entity_BlueSwitch_init,     &D_802E9AC4, NULL, E639C0_ROM_START, E639C0_ROM_END, 7, {0x16, 0x17, 0x16} };
-StaticEntityData D_802E9BF8 = { 0xAA04, 0x002C, &D_802E9B5C, {0, 0, 0, 0}, entity_HugeBlueSwitch_init, &D_802E9A88, NULL, &D_00E639C0, &D_00E648D0,  9, {0x42, 0x4B, 0x42} };
+StaticEntityData D_802E9BF8 = { 0xAA04, 0x002C, &D_802E9B5C, {0, 0, 0, 0}, entity_HugeBlueSwitch_init, &D_802E9A88, NULL, E639C0_ROM_START, E639C0_ROM_END, 9, {0x42, 0x4B, 0x42} };
-StaticEntityData D_802E9C1C = { 0xC000, 0x002C, &D_802E9B94, {0, 0, 0, 0}, entity_base_switch_init,              &D_802E9B00, NULL, &D_00E62370, &D_00E62AC0, 10, {0x32, 0x0F, 0x32} };
+StaticEntityData D_802E9C1C = { 0xC000, 0x002C, &D_802E9B94, {0, 0, 0, 0}, entity_base_switch_init,    &D_802E9B00, NULL, E62370_ROM_START, E62370_ROM_END, 10, {0x32, 0x0F, 0x32} };
 
 s32 D_802E9C40[12] = {
     0x00000007, 0x00000020, 0x00000003, 0x00000000,
@@ -224,20 +211,13 @@ s32 D_802E9C70[7] = {
     (s32) &D_802E9828, 0x00000002, 0x00000000
 };
 
-extern UNK_TYPE D_00E32420;
+StaticEntityData D_802E9C8C = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, 21, {0x10, 0x10, 0x10}};
-extern UNK_TYPE D_00E35670;
+StaticEntityData D_802E9CB0 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, 22, {0x10, 0x10, 0x10}};
-extern UNK_TYPE D_00E38890;
+StaticEntityData D_802E9CD4 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, 23, {0x10, 0x10, 0x10}};
-extern UNK_TYPE D_00E3B870;
+StaticEntityData D_802E9CF8 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, 24, {0x08, 0x08, 0x08}};
-extern UNK_TYPE D_00E3E260;
+StaticEntityData D_802E9D1C = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, 25, {0x08, 0x08, 0x08}};
-extern UNK_TYPE D_00E42240;
+StaticEntityData D_802E9D40 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, 26, {0x08, 0x08, 0x08}};
-
+StaticEntityData D_802E9D64 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E3E260_ROM_START, E3E260_ROM_END, 13, {0x08, 0x08, 0x08}};
-StaticEntityData D_802E9C8C = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E32420, &D_00E35670, 21, {0x10, 0x10, 0x10}};
-StaticEntityData D_802E9CB0 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E35670, &D_00E38890, 22, {0x10, 0x10, 0x10}};
-StaticEntityData D_802E9CD4 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E38890, &D_00E3B870, 23, {0x10, 0x10, 0x10}};
-StaticEntityData D_802E9CF8 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E32420, &D_00E35670, 24, {0x08, 0x08, 0x08}};
-StaticEntityData D_802E9D1C = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E35670, &D_00E38890, 25, {0x08, 0x08, 0x08}};
-StaticEntityData D_802E9D40 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E38890, &D_00E3B870, 26, {0x08, 0x08, 0x08}};
-StaticEntityData D_802E9D64 = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, &D_00E3E260, &D_00E42240, 13, {0x08, 0x08, 0x08}};
 
 void entity_shattering_block_init(Entity* entity) {
     u32 type;

src/23680.c

@@ -182,7 +182,25 @@ void func_80049550(Evt* script, s32 arg1) {
     }
 }
 
-INCLUDE_ASM(s32, "23680", func_800495A0);
+void func_800495A0(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+
+    npc->duration = (npcAISettings->moveTime / 2) + rand_int((npcAISettings->moveTime / 2) + 1);
+    npc->yaw = clamp_angle(npc->yaw + rand_int(60) - 30.0f);
+    npc->currentAnim.w = enemy->animList[1];
+    script->functionTemp[1] = 0;
+
+    if (enemy->territory->wander.moveSpeedOverride < 0) {
+        npc->moveSpeed = npcAISettings->moveSpeed;
+    } else {
+        npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0;
+    }
+
+    enemy->unk_B0 &= ~0x40;
+    enemy->unk_B0 &= ~0x20;
+    script->functionTemp[0] = 1;
+}
 
 INCLUDE_ASM(s32, "23680", func_800496B8);
 
@@ -191,7 +209,7 @@ INCLUDE_ASM(s32, "23680", func_800496B8);
 
 INCLUDE_ASM(s32, "23680", func_80049C04);
 
-void func_80049E3C(Evt* script) {
+void func_80049E3C(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
@@ -204,7 +222,7 @@ void func_80049E3C(Evt* script) {
     script->functionTemp[0] = 11;
 }
 
-void func_80049ECC(Evt* script) {
+void func_80049ECC(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) {
     Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID);
     s32 flag = FALSE;
 
@@ -225,11 +243,45 @@ void func_80049ECC(Evt* script) {
     }
 }
 
-INCLUDE_ASM(s32, "23680", func_80049F7C);
+void func_80049F7C(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) {
+    Enemy* enemy = script->owner1.enemy;
+    Npc* npc = get_npc_unsafe(enemy->npcID);
+    s32 cond = FALSE;
+
+    if ((gPlayerStatusPtr->actionState == ACTION_STATE_JUMP || gPlayerStatusPtr->actionState == ACTION_STATE_BOUNCE ||
+        gPlayerStatusPtr->actionState == ACTION_STATE_HOP || gPlayerStatusPtr->actionState == ACTION_STATE_FALLING) &&
+        (f64)dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) < npc->collisionRadius)
+    {
+        cond = TRUE;
+    }
+
+    if (!cond) {
+        f32 yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
+        f32 angleDiff = get_clamped_angle_diff(npc->yaw, yaw);
+        s32 temp_f4 = npcAISettings->unk_1C.s;
+
+        if (temp_f4 < fabsf(angleDiff)) {
+            yaw = npc->yaw;
+            if (angleDiff < 0.0f) {
+                yaw += -npcAISettings->unk_1C.s;
+            } else {
+                yaw += temp_f4;
+            }
+        }
+        npc->yaw = clamp_angle(yaw);
+        npc->duration = (npcAISettings->unk_20 / 2) + rand_int((npcAISettings->unk_20 / 2) + 1);
+    } else {
+        npc->duration = 0;
+    }
+
+    npc->currentAnim.w = enemy->animList[3];
+    npc->moveSpeed = npcAISettings->chaseSpeed;
+    script->functionTemp[0] = 13;
+}
 
 INCLUDE_ASM(s32, "23680", func_8004A124);
 
-void func_8004A3E8(Evt* script, s32 arg1) {
+void func_8004A3E8(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) {
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 

src/effects/effect_1.c

@@ -17,11 +17,6 @@ typedef struct Effect1 {
     /* 0x28 */ char unk_28[0x4];
 } Effect1; // size = 0x2C
 
-void fx_1_init(EffectInstance* effect);
-void fx_1_update(EffectInstance* effect);
-void fx_1_render(EffectInstance* effect);
-void fx_1_appendGfx(EffectInstance* effect);
-
 static f32 D_E0002760[10] = { 10.0f, 40.0f, 80.0f, 170.0f, 140.0f, 100.0f, 25.0f, 155.0f, 60.0f, 120.0f };
 static f32 D_E0002788[10] = { 2.2f, 2.7f, 3.0f, 2.2f, 2.7f, 3.0f, 1.9f, 1.9f, 1.5f, 1.5f };
 static f32 sPartScales[10] = { 1.4f, 1.3f, 1.2f, 1.3f, 1.4f, 1.3f, 1.6f, 1.6f, 1.6f, 1.6f };
@@ -29,6 +24,11 @@ static f32 sPartYaws[10] = { 0.0f, 234.0f, 468.0f, 702.0f, 936.0f, 1260.0f, 1404
 
 static s32 sDlists[7] = { 0x09000FA0, 0x09001060, 0x09001120, 0x090011E0, 0x090012A0, 0x09001360, 0x09001420 };
 
+void fx_1_init(EffectInstance* effect);
+void fx_1_update(EffectInstance* effect);
+void fx_1_render(EffectInstance* effect);
+void fx_1_appendGfx(EffectInstance* effect);
+
 void fx_1_main(f32 x, f32 y, f32 z) {
     EffectBlueprint bp;
     EffectInstance* effect;

src/effects/effect_10.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_10", fx_10_main);
 
-void func_E0014258(void) {
+void fx_10_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_10", func_E0014260);
+INCLUDE_ASM(s32, "effects/effect_10", fx_10_update);
 
-INCLUDE_ASM(s32, "effects/effect_10", func_E001449C);
+INCLUDE_ASM(s32, "effects/effect_10", fx_10_render);
 
-INCLUDE_ASM(s32, "effects/effect_10", func_E00144E0);
+INCLUDE_ASM(s32, "effects/effect_10", fx_10_appendGfx);

src/effects/effect_100.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_100", fx_100_main);
 
-void func_E00C8218(void) {
+void fx_100_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_100", func_E00C8220);
+INCLUDE_ASM(s32, "effects/effect_100", fx_100_update);
 
-INCLUDE_ASM(s32, "effects/effect_100", func_E00C8404);
+INCLUDE_ASM(s32, "effects/effect_100", fx_100_render);
 
 void func_E00C844C(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_100", func_E00C8454);
+INCLUDE_ASM(s32, "effects/effect_100", fx_100_appendGfx);

src/effects/effect_101.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_101", fx_101_main);
 
-void func_E00CA240(void) {
+void fx_101_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_101", func_E00CA248);
+INCLUDE_ASM(s32, "effects/effect_101", fx_101_update);
 
-INCLUDE_ASM(s32, "effects/effect_101", func_E00CA484);
+INCLUDE_ASM(s32, "effects/effect_101", fx_101_render);
 
-INCLUDE_ASM(s32, "effects/effect_101", func_E00CA4CC);
+INCLUDE_ASM(s32, "effects/effect_101", fx_101_appendGfx);

src/effects/effect_102.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_102", fx_102_main);
 
-void func_E00CC250(void) {
+void fx_102_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_102", func_E00CC258);
+INCLUDE_ASM(s32, "effects/effect_102", fx_102_update);
 
-INCLUDE_ASM(s32, "effects/effect_102", func_E00CC980);
+INCLUDE_ASM(s32, "effects/effect_102", fx_102_render);
 
 void func_E00CC9C8(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_102", func_E00CC9D0);
+INCLUDE_ASM(s32, "effects/effect_102", fx_102_appendGfx);

src/effects/effect_103.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_103", fx_103_main);
 
-void func_E00CE21C(void) {
+void fx_103_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_103", func_E00CE224);
+INCLUDE_ASM(s32, "effects/effect_103", fx_103_update);
 
-INCLUDE_ASM(s32, "effects/effect_103", func_E00CE428);
+INCLUDE_ASM(s32, "effects/effect_103", fx_103_render);
 
 void func_E00CE470(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_103", func_E00CE478);
+INCLUDE_ASM(s32, "effects/effect_103", fx_103_appendGfx);

src/effects/effect_104.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_104", fx_104_main);
 
-void func_E00D018C(void) {
+void fx_104_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_104", func_E00D0194);
+INCLUDE_ASM(s32, "effects/effect_104", fx_104_update);
 
-INCLUDE_ASM(s32, "effects/effect_104", func_E00D0448);
+INCLUDE_ASM(s32, "effects/effect_104", fx_104_render);
 
-INCLUDE_ASM(s32, "effects/effect_104", func_E00D048C);
+INCLUDE_ASM(s32, "effects/effect_104", fx_104_appendGfx);

src/effects/effect_105.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_105", fx_105_main);
 
-void func_E00D2118(void) {
+void fx_105_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_105", func_E00D2120);
+INCLUDE_ASM(s32, "effects/effect_105", fx_105_update);
 
-INCLUDE_ASM(s32, "effects/effect_105", func_E00D2234);
+INCLUDE_ASM(s32, "effects/effect_105", fx_105_render);
 
 void func_E00D227C(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_105", func_E00D2284);
+INCLUDE_ASM(s32, "effects/effect_105", fx_105_appendGfx);

src/effects/effect_107.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_107", fx_107_main);
 
-void func_E00D6718(void) {
+void fx_107_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_107", func_E00D6720);
+INCLUDE_ASM(s32, "effects/effect_107", fx_107_update);
 
-INCLUDE_ASM(s32, "effects/effect_107", func_E00D693C);
+INCLUDE_ASM(s32, "effects/effect_107", fx_107_render);
 
 void func_E00D6978(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_107", func_E00D6980);
+INCLUDE_ASM(s32, "effects/effect_107", fx_107_appendGfx);

src/effects/effect_108.c

@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_108", fx_108_main);
 
-void func_E00D8120(void) {
+void fx_108_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_108", func_E00D8128);
+INCLUDE_ASM(s32, "effects/effect_108", fx_108_update);
 
-void func_E00D825C(void) {
+void fx_108_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_108", func_E00D8264);

src/effects/effect_109.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_109", fx_109_main);
 
-void func_E00DA0FC(void) {
+void fx_109_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_109", func_E00DA104);
+INCLUDE_ASM(s32, "effects/effect_109", fx_109_update);
 
-INCLUDE_ASM(s32, "effects/effect_109", func_E00DA1E0);
+INCLUDE_ASM(s32, "effects/effect_109", fx_109_render);
 
 void func_E00DA228(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_109", func_E00DA230);
+INCLUDE_ASM(s32, "effects/effect_109", fx_109_appendGfx);

src/effects/effect_11.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_11", fx_11_main);
 
-void func_E0016220(void) {
+void fx_11_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_11", func_E0016228);
+INCLUDE_ASM(s32, "effects/effect_11", fx_11_update);
 
-INCLUDE_ASM(s32, "effects/effect_11", func_E0016410);
+INCLUDE_ASM(s32, "effects/effect_11", fx_11_render);
 
-INCLUDE_ASM(s32, "effects/effect_11", func_E0016454);
+INCLUDE_ASM(s32, "effects/effect_11", fx_11_appendGfx);

src/effects/effect_110.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_110", fx_110_main);
 
-void func_E00DC190(void) {
+void fx_110_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_110", func_E00DC198);
+INCLUDE_ASM(s32, "effects/effect_110", fx_110_update);
 
-INCLUDE_ASM(s32, "effects/effect_110", func_E00DC2C0);
+INCLUDE_ASM(s32, "effects/effect_110", fx_110_render);
 
 void func_E00DC2FC(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_110", func_E00DC304);
+INCLUDE_ASM(s32, "effects/effect_110", fx_110_appendGfx);

src/effects/effect_111.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_111", fx_111_main);
 
-void func_E00DE11C(void) {
+void fx_111_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_111", func_E00DE124);
+INCLUDE_ASM(s32, "effects/effect_111", fx_111_update);
 
-INCLUDE_ASM(s32, "effects/effect_111", func_E00DE260);
+INCLUDE_ASM(s32, "effects/effect_111", fx_111_render);
 
-INCLUDE_ASM(s32, "effects/effect_111", func_E00DE2A8);
+INCLUDE_ASM(s32, "effects/effect_111", fx_111_appendGfx);

src/effects/effect_112.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_112", fx_112_main);
 
-void func_E00E01D0(void) {
+void fx_112_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_112", func_E00E01D8);
+INCLUDE_ASM(s32, "effects/effect_112", fx_112_update);
 
-INCLUDE_ASM(s32, "effects/effect_112", func_E00E05B0);
+INCLUDE_ASM(s32, "effects/effect_112", fx_112_render);
 
 void func_E00E05F8(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_112", func_E00E0600);
+INCLUDE_ASM(s32, "effects/effect_112", fx_112_appendGfx);

src/effects/effect_113.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_113", fx_113_main);
 
-void func_E00E212C(void) {
+void fx_113_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_113", func_E00E2134);
+INCLUDE_ASM(s32, "effects/effect_113", fx_113_update);
 
-INCLUDE_ASM(s32, "effects/effect_113", func_E00E21C8);
+INCLUDE_ASM(s32, "effects/effect_113", fx_113_render);
 
 void func_E00E2210(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_113", func_E00E2218);
+INCLUDE_ASM(s32, "effects/effect_113", fx_113_appendGfx);

src/effects/effect_114.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_114", fx_114_main);
 
-void func_E00E4288(void) {
+void fx_114_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_114", func_E00E4290);
+INCLUDE_ASM(s32, "effects/effect_114", fx_114_update);
 
-INCLUDE_ASM(s32, "effects/effect_114", func_E00E490C);
+INCLUDE_ASM(s32, "effects/effect_114", fx_114_render);
 
 void func_E00E4954(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_114", func_E00E495C);
+INCLUDE_ASM(s32, "effects/effect_114", fx_114_appendGfx);

src/effects/effect_115.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_115", fx_115_main);
 
-void func_E00E617C(void) {
+void fx_115_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_115", func_E00E6184);
+INCLUDE_ASM(s32, "effects/effect_115", fx_115_update);
 
-INCLUDE_ASM(s32, "effects/effect_115", func_E00E64D4);
+INCLUDE_ASM(s32, "effects/effect_115", fx_115_render);
 
 void func_E00E651C(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_115", func_E00E6524);
+INCLUDE_ASM(s32, "effects/effect_115", fx_115_appendGfx);

src/effects/effect_116.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_116", fx_116_main);
 
-void func_E00E825C(void) {
+void fx_116_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_116", func_E00E8264);
+INCLUDE_ASM(s32, "effects/effect_116", fx_116_update);
 
-INCLUDE_ASM(s32, "effects/effect_116", func_E00E8374);
+INCLUDE_ASM(s32, "effects/effect_116", fx_116_render);
 
-INCLUDE_ASM(s32, "effects/effect_116", func_E00E83BC);
+INCLUDE_ASM(s32, "effects/effect_116", fx_116_appendGfx);

src/effects/effect_117.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_117", fx_117_main);
 
-void func_E00EA190(void) {
+void fx_117_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_117", func_E00EA198);
+INCLUDE_ASM(s32, "effects/effect_117", fx_117_update);
 
-INCLUDE_ASM(s32, "effects/effect_117", func_E00EA520);
+INCLUDE_ASM(s32, "effects/effect_117", fx_117_render);
 
 void func_E00EA664(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_117", func_E00EA66C);
+INCLUDE_ASM(s32, "effects/effect_117", fx_117_appendGfx);

src/effects/effect_119.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_119", fx_119_main);
 
-void func_E010A184(void) {
+void fx_119_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_119", func_E010A18C);
+INCLUDE_ASM(s32, "effects/effect_119", fx_119_update);
 
-INCLUDE_ASM(s32, "effects/effect_119", func_E010A4A0);
+INCLUDE_ASM(s32, "effects/effect_119", fx_119_render);
 
-INCLUDE_ASM(s32, "effects/effect_119", func_E010A4E8);
+INCLUDE_ASM(s32, "effects/effect_119", fx_119_appendGfx);

src/effects/effect_12.c

@@ -4,13 +4,13 @@ INCLUDE_ASM(s32, "effects/effect_12", func_E0018000);
 
 INCLUDE_ASM(s32, "effects/effect_12", fx_12_main);
 
-void func_E00182AC(void) {
+void fx_12_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_12", func_E00182B4);
+INCLUDE_ASM(s32, "effects/effect_12", fx_12_update);
 
-INCLUDE_ASM(s32, "effects/effect_12", func_E0018378);
+INCLUDE_ASM(s32, "effects/effect_12", fx_12_render);
 
 INCLUDE_ASM(s32, "effects/effect_12", func_E00183BC);
 
-INCLUDE_ASM(s32, "effects/effect_12", func_E00183D8);
+INCLUDE_ASM(s32, "effects/effect_12", fx_12_appendGfx);

src/effects/effect_120.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_120", fx_120_main);
 
-void func_E010C190(void) {
+void fx_120_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_120", func_E010C198);
+INCLUDE_ASM(s32, "effects/effect_120", fx_120_update);
 
-INCLUDE_ASM(s32, "effects/effect_120", func_E010C354);
+INCLUDE_ASM(s32, "effects/effect_120", fx_120_render);
 
-INCLUDE_ASM(s32, "effects/effect_120", func_E010C39C);
+INCLUDE_ASM(s32, "effects/effect_120", fx_120_appendGfx);

src/effects/effect_121.c

@@ -4,11 +4,11 @@ INCLUDE_ASM(s32, "effects/effect_121", func_E010E000);
 
 INCLUDE_ASM(s32, "effects/effect_121", fx_121_main);
 
-void func_E010E4A0(void) {
+void fx_121_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_121", func_E010E4A8);
+INCLUDE_ASM(s32, "effects/effect_121", fx_121_update);
 
-INCLUDE_ASM(s32, "effects/effect_121", func_E010E510);
+INCLUDE_ASM(s32, "effects/effect_121", fx_121_render);
 
-INCLUDE_ASM(s32, "effects/effect_121", func_E010E558);
+INCLUDE_ASM(s32, "effects/effect_121", fx_121_appendGfx);

src/effects/effect_122.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_122", fx_122_main);
 
-void func_E0110224(void) {
+void fx_122_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_122", func_E011022C);
+INCLUDE_ASM(s32, "effects/effect_122", fx_122_update);
 
-INCLUDE_ASM(s32, "effects/effect_122", func_E01103A4);
+INCLUDE_ASM(s32, "effects/effect_122", fx_122_render);
 
-INCLUDE_ASM(s32, "effects/effect_122", func_E01103EC);
+INCLUDE_ASM(s32, "effects/effect_122", fx_122_appendGfx);

src/effects/effect_123.c

@@ -2,13 +2,13 @@
 
 INCLUDE_ASM(s32, "effects/effect_123", fx_123_main);
 
-void func_E01121B8(void) {
+void fx_123_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_123", func_E01121C0);
+INCLUDE_ASM(s32, "effects/effect_123", fx_123_update);
 
-INCLUDE_ASM(s32, "effects/effect_123", func_E01122E8);
+INCLUDE_ASM(s32, "effects/effect_123", fx_123_render);
 
 INCLUDE_ASM(s32, "effects/effect_123", func_E0112330);
 
-INCLUDE_ASM(s32, "effects/effect_123", func_E01124CC);
+INCLUDE_ASM(s32, "effects/effect_123", fx_123_appendGfx);

src/effects/effect_124.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_124", fx_124_main);
 
-void func_E01140D4(void) {
+void fx_124_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_124", func_E01140DC);
+INCLUDE_ASM(s32, "effects/effect_124", fx_124_update);
 
-INCLUDE_ASM(s32, "effects/effect_124", func_E0114340);
+INCLUDE_ASM(s32, "effects/effect_124", fx_124_render);
 
-INCLUDE_ASM(s32, "effects/effect_124", func_E0114388);
+INCLUDE_ASM(s32, "effects/effect_124", fx_124_appendGfx);

src/effects/effect_125.c

@@ -2,13 +2,13 @@
 
 INCLUDE_ASM(s32, "effects/effect_125", fx_125_main);
 
-void func_E0116184(void) {
+void fx_125_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_125", func_E011618C);
+INCLUDE_ASM(s32, "effects/effect_125", fx_125_update);
 
-INCLUDE_ASM(s32, "effects/effect_125", func_E01166A0);
+INCLUDE_ASM(s32, "effects/effect_125", fx_125_render);
 
 INCLUDE_ASM(s32, "effects/effect_125", func_E01166E8);
 
-INCLUDE_ASM(s32, "effects/effect_125", func_E0116884);
+INCLUDE_ASM(s32, "effects/effect_125", fx_125_appendGfx);

src/effects/effect_126.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_126", fx_126_main);
 
-void func_E01182EC(void) {
+void fx_126_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_126", func_E01182F4);
+INCLUDE_ASM(s32, "effects/effect_126", fx_126_update);
 
-INCLUDE_ASM(s32, "effects/effect_126", func_E0118454);
+INCLUDE_ASM(s32, "effects/effect_126", fx_126_render);
 
-INCLUDE_ASM(s32, "effects/effect_126", func_E011849C);
+INCLUDE_ASM(s32, "effects/effect_126", fx_126_appendGfx);

src/effects/effect_127.c

@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_127", fx_127_main);
 
-void func_E011A0FC(void) {
+void fx_127_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_127", func_E011A104);
+INCLUDE_ASM(s32, "effects/effect_127", fx_127_update);
 
-void func_E011A398(void) {
+void fx_127_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_127", func_E011A3A0);

src/effects/effect_128.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_128", fx_128_main);
 
-void func_E011C0F4(void) {
+void fx_128_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_128", func_E011C0FC);
+INCLUDE_ASM(s32, "effects/effect_128", fx_128_update);
 
-INCLUDE_ASM(s32, "effects/effect_128", func_E011C17C);
+INCLUDE_ASM(s32, "effects/effect_128", fx_128_render);
 
-INCLUDE_ASM(s32, "effects/effect_128", func_E011C1C4);
+INCLUDE_ASM(s32, "effects/effect_128", fx_128_appendGfx);

src/effects/effect_129.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_129", fx_129_main);
 
-void func_E011E18C(void) {
+void fx_129_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_129", func_E011E194);
+INCLUDE_ASM(s32, "effects/effect_129", fx_129_update);
 
-INCLUDE_ASM(s32, "effects/effect_129", func_E011E530);
+INCLUDE_ASM(s32, "effects/effect_129", fx_129_render);
 
-INCLUDE_ASM(s32, "effects/effect_129", func_E011E578);
+INCLUDE_ASM(s32, "effects/effect_129", fx_129_appendGfx);

src/effects/effect_13.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_13", fx_13_main);
 
-void func_E001A21C(void) {
+void fx_13_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_13", func_E001A224);
+INCLUDE_ASM(s32, "effects/effect_13", fx_13_update);
 
-INCLUDE_ASM(s32, "effects/effect_13", func_E001A3FC);
+INCLUDE_ASM(s32, "effects/effect_13", fx_13_render);
 
-INCLUDE_ASM(s32, "effects/effect_13", func_E001A440);
+INCLUDE_ASM(s32, "effects/effect_13", fx_13_appendGfx);

src/effects/effect_130.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_130", fx_130_main);
 
-void func_E0120134(void) {
+void fx_130_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_130", func_E012013C);
+INCLUDE_ASM(s32, "effects/effect_130", fx_130_update);
 
-INCLUDE_ASM(s32, "effects/effect_130", func_E012039C);
+INCLUDE_ASM(s32, "effects/effect_130", fx_130_render);
 
-INCLUDE_ASM(s32, "effects/effect_130", func_E01203E4);
+INCLUDE_ASM(s32, "effects/effect_130", fx_130_appendGfx);

src/effects/effect_131.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_131", fx_131_main);
 
-void func_E0122174(void) {
+void fx_131_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_131", func_E012217C);
+INCLUDE_ASM(s32, "effects/effect_131", fx_131_update);
 
-INCLUDE_ASM(s32, "effects/effect_131", func_E01226C4);
+INCLUDE_ASM(s32, "effects/effect_131", fx_131_render);
 
-INCLUDE_ASM(s32, "effects/effect_131", func_E012270C);
+INCLUDE_ASM(s32, "effects/effect_131", fx_131_appendGfx);

src/effects/effect_132.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_132", fx_132_main);
 
-void func_E01242FC(void) {
+void fx_132_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_132", func_E0124304);
+INCLUDE_ASM(s32, "effects/effect_132", fx_132_update);
 
-INCLUDE_ASM(s32, "effects/effect_132", func_E012448C);
+INCLUDE_ASM(s32, "effects/effect_132", fx_132_render);
 
-INCLUDE_ASM(s32, "effects/effect_132", func_E01244C4);
+INCLUDE_ASM(s32, "effects/effect_132", fx_132_appendGfx);

src/effects/effect_133.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_133", fx_133_main);
 
-void func_E012612C(void) {
+void fx_133_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_133", func_E0126134);
+INCLUDE_ASM(s32, "effects/effect_133", fx_133_update);
 
-INCLUDE_ASM(s32, "effects/effect_133", func_E01264A4);
+INCLUDE_ASM(s32, "effects/effect_133", fx_133_render);
 
-INCLUDE_ASM(s32, "effects/effect_133", func_E01264EC);
+INCLUDE_ASM(s32, "effects/effect_133", fx_133_appendGfx);

src/effects/effect_134.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_134", fx_134_main);
 
-void func_E0128128(void) {
+void fx_134_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_134", func_E0128130);
+INCLUDE_ASM(s32, "effects/effect_134", fx_134_update);
 
-INCLUDE_ASM(s32, "effects/effect_134", func_E0128198);
+INCLUDE_ASM(s32, "effects/effect_134", fx_134_render);
 
-INCLUDE_ASM(s32, "effects/effect_134", func_E01281E0);
+INCLUDE_ASM(s32, "effects/effect_134", fx_134_appendGfx);

src/effects/effect_14.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_14", fx_14_main);
 
-void func_E001C120(void) {
+void fx_14_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_14", func_E001C128);
+INCLUDE_ASM(s32, "effects/effect_14", fx_14_update);
 
-INCLUDE_ASM(s32, "effects/effect_14", func_E001C200);
+INCLUDE_ASM(s32, "effects/effect_14", fx_14_render);
 
-INCLUDE_ASM(s32, "effects/effect_14", func_E001C30C);
+INCLUDE_ASM(s32, "effects/effect_14", fx_14_appendGfx);

src/effects/effect_15.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_15", fx_15_main);
 
-void func_E001E370(void) {
+void fx_15_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_15", func_E001E378);
+INCLUDE_ASM(s32, "effects/effect_15", fx_15_update);
 
-INCLUDE_ASM(s32, "effects/effect_15", func_E001E6E8);
+INCLUDE_ASM(s32, "effects/effect_15", fx_15_render);
 
-INCLUDE_ASM(s32, "effects/effect_15", func_E001E730);
+INCLUDE_ASM(s32, "effects/effect_15", fx_15_appendGfx);

src/effects/effect_16.c

@@ -4,11 +4,11 @@ INCLUDE_ASM(s32, "effects/effect_16", func_E0020000);
 
 INCLUDE_ASM(s32, "effects/effect_16", fx_16_main);
 
-void func_E0020460(void) {
+void fx_16_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_16", func_E0020468);
+INCLUDE_ASM(s32, "effects/effect_16", fx_16_update);
 
-INCLUDE_ASM(s32, "effects/effect_16", func_E002058C);
+INCLUDE_ASM(s32, "effects/effect_16", fx_16_render);
 
-INCLUDE_ASM(s32, "effects/effect_16", func_E00205D0);
+INCLUDE_ASM(s32, "effects/effect_16", fx_16_appendGfx);

src/effects/effect_17.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_17", fx_17_main);
 
-void func_E0022544(void) {
+void fx_17_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_17", func_E002254C);
+INCLUDE_ASM(s32, "effects/effect_17", fx_17_update);
 
-INCLUDE_ASM(s32, "effects/effect_17", func_E0022960);
+INCLUDE_ASM(s32, "effects/effect_17", fx_17_render);
 
-INCLUDE_ASM(s32, "effects/effect_17", func_E0022998);
+INCLUDE_ASM(s32, "effects/effect_17", fx_17_appendGfx);

src/effects/effect_18.c

@@ -2,15 +2,15 @@
 
 INCLUDE_ASM(s32, "effects/effect_18", fx_18_main);
 
-void func_E0024180(void) {
+void fx_18_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_18", func_E0024188);
+INCLUDE_ASM(s32, "effects/effect_18", fx_18_update);
 
-INCLUDE_ASM(s32, "effects/effect_18", func_E00242E0);
+INCLUDE_ASM(s32, "effects/effect_18", fx_18_render);
 
 INCLUDE_ASM(s32, "effects/effect_18", func_E0024324);
 
 INCLUDE_ASM(s32, "effects/effect_18", func_E00243BC);
 
-INCLUDE_ASM(s32, "effects/effect_18", func_E0024454);
+INCLUDE_ASM(s32, "effects/effect_18", fx_18_appendGfx);

src/effects/effect_19.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_19", fx_19_main);
 
-void func_E0026184(void) {
+void fx_19_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_19", func_E002618C);
+INCLUDE_ASM(s32, "effects/effect_19", fx_19_update);
 
-INCLUDE_ASM(s32, "effects/effect_19", func_E00264B0);
+INCLUDE_ASM(s32, "effects/effect_19", fx_19_render);
 
-INCLUDE_ASM(s32, "effects/effect_19", func_E00264F4);
+INCLUDE_ASM(s32, "effects/effect_19", fx_19_appendGfx);

src/effects/effect_20.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_20", fx_20_main);
 
-void func_E0028240(void) {
+void fx_20_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_20", func_E0028248);
+INCLUDE_ASM(s32, "effects/effect_20", fx_20_update);
 
-INCLUDE_ASM(s32, "effects/effect_20", func_E00284E8);
+INCLUDE_ASM(s32, "effects/effect_20", fx_20_render);
 
-INCLUDE_ASM(s32, "effects/effect_20", func_E002852C);
+INCLUDE_ASM(s32, "effects/effect_20", fx_20_appendGfx);

src/effects/effect_21.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_21", fx_21_main);
 
-void func_E002A284(void) {
+void fx_21_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_21", func_E002A28C);
+INCLUDE_ASM(s32, "effects/effect_21", fx_21_update);
 
-INCLUDE_ASM(s32, "effects/effect_21", func_E002A380);
+INCLUDE_ASM(s32, "effects/effect_21", fx_21_render);
 
-INCLUDE_ASM(s32, "effects/effect_21", func_E002A3C4);
+INCLUDE_ASM(s32, "effects/effect_21", fx_21_appendGfx);

src/effects/effect_22.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_22", fx_22_main);
 
-void func_E002C234(void) {
+void fx_22_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_22", func_E002C23C);
+INCLUDE_ASM(s32, "effects/effect_22", fx_22_update);
 
-INCLUDE_ASM(s32, "effects/effect_22", func_E002C3D0);
+INCLUDE_ASM(s32, "effects/effect_22", fx_22_render);
 
-INCLUDE_ASM(s32, "effects/effect_22", func_E002C414);
+INCLUDE_ASM(s32, "effects/effect_22", fx_22_appendGfx);

src/effects/effect_23.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_23", fx_23_main);
 
-void func_E002E248(void) {
+void fx_23_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_23", func_E002E250);
+INCLUDE_ASM(s32, "effects/effect_23", fx_23_update);
 
-INCLUDE_ASM(s32, "effects/effect_23", func_E002E330);
+INCLUDE_ASM(s32, "effects/effect_23", fx_23_render);
 
-INCLUDE_ASM(s32, "effects/effect_23", func_E002E368);
+INCLUDE_ASM(s32, "effects/effect_23", fx_23_appendGfx);

src/effects/effect_24.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_24", fx_24_main);
 
-void func_E0030728(void) {
+void fx_24_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_24", func_E0030730);
+INCLUDE_ASM(s32, "effects/effect_24", fx_24_update);
 
-INCLUDE_ASM(s32, "effects/effect_24", func_E0030A24);
+INCLUDE_ASM(s32, "effects/effect_24", fx_24_render);
 
-INCLUDE_ASM(s32, "effects/effect_24", func_E0030A68);
+INCLUDE_ASM(s32, "effects/effect_24", fx_24_appendGfx);

src/effects/effect_25.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_25", fx_25_main);
 
-void func_E00321D0(void) {
+void fx_25_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_25", func_E00321D8);
+INCLUDE_ASM(s32, "effects/effect_25", fx_25_update);
 
-INCLUDE_ASM(s32, "effects/effect_25", func_E0032420);
+INCLUDE_ASM(s32, "effects/effect_25", fx_25_render);
 
-INCLUDE_ASM(s32, "effects/effect_25", func_E003245C);
+INCLUDE_ASM(s32, "effects/effect_25", fx_25_appendGfx);

src/effects/effect_26.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_26", fx_26_main);
 
-void func_E0034108(void) {
+void fx_26_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_26", func_E0034110);
+INCLUDE_ASM(s32, "effects/effect_26", fx_26_update);
 
-INCLUDE_ASM(s32, "effects/effect_26", func_E00342C8);
+INCLUDE_ASM(s32, "effects/effect_26", fx_26_render);
 
-INCLUDE_ASM(s32, "effects/effect_26", func_E0034310);
+INCLUDE_ASM(s32, "effects/effect_26", fx_26_appendGfx);

src/effects/effect_27.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_27", fx_27_main);
 
-void func_E00360DC(void) {
+void fx_27_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_27", func_E00360E4);
+INCLUDE_ASM(s32, "effects/effect_27", fx_27_update);
 
-INCLUDE_ASM(s32, "effects/effect_27", func_E00361D8);
+INCLUDE_ASM(s32, "effects/effect_27", fx_27_render);
 
 void func_E003621C(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_27", func_E0036224);
+INCLUDE_ASM(s32, "effects/effect_27", fx_27_appendGfx);

src/effects/effect_28.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_28", fx_28_main);
 
-void func_E003841C(void) {
+void fx_28_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_28", func_E0038424);
+INCLUDE_ASM(s32, "effects/effect_28", fx_28_update);
 
-INCLUDE_ASM(s32, "effects/effect_28", func_E0038704);
+INCLUDE_ASM(s32, "effects/effect_28", fx_28_render);
 
-INCLUDE_ASM(s32, "effects/effect_28", func_E0038748);
+INCLUDE_ASM(s32, "effects/effect_28", fx_28_appendGfx);

src/effects/effect_29.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_29", fx_29_main);
 
-void func_E003A1D4(void) {
+void fx_29_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_29", func_E003A1DC);
+INCLUDE_ASM(s32, "effects/effect_29", fx_29_update);
 
-INCLUDE_ASM(s32, "effects/effect_29", func_E003A310);
+INCLUDE_ASM(s32, "effects/effect_29", fx_29_render);
 
-INCLUDE_ASM(s32, "effects/effect_29", func_E003A354);
+INCLUDE_ASM(s32, "effects/effect_29", fx_29_appendGfx);

src/effects/effect_30.c

@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_30", fx_30_main);
 
-void func_E003C23C(void) {
+void fx_30_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_30", func_E003C244);
+INCLUDE_ASM(s32, "effects/effect_30", fx_30_update);
 
-void func_E003C474(void) {
+void fx_30_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_30", func_E003C47C);

src/effects/effect_31.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_31", fx_31_main);
 
-void func_E003E3F8(void) {
+void fx_31_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_31", func_E003E400);
+INCLUDE_ASM(s32, "effects/effect_31", fx_31_update);
 
-INCLUDE_ASM(s32, "effects/effect_31", func_E003E5F4);
+INCLUDE_ASM(s32, "effects/effect_31", fx_31_render);
 
-INCLUDE_ASM(s32, "effects/effect_31", func_E003E638);
+INCLUDE_ASM(s32, "effects/effect_31", fx_31_appendGfx);

src/effects/effect_32.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_32", fx_32_main);
 
-void func_E0040148(void) {
+void fx_32_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_32", func_E0040150);
+INCLUDE_ASM(s32, "effects/effect_32", fx_32_update);
 
-INCLUDE_ASM(s32, "effects/effect_32", func_E0040210);
+INCLUDE_ASM(s32, "effects/effect_32", fx_32_render);
 
-INCLUDE_ASM(s32, "effects/effect_32", func_E0040348);
+INCLUDE_ASM(s32, "effects/effect_32", fx_32_appendGfx);

src/effects/effect_33.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_33", fx_33_main);
 
-void func_E004222C(void) {
+void fx_33_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_33", func_E0042234);
+INCLUDE_ASM(s32, "effects/effect_33", fx_33_update);
 
-INCLUDE_ASM(s32, "effects/effect_33", func_E0042374);
+INCLUDE_ASM(s32, "effects/effect_33", fx_33_render);
 
-INCLUDE_ASM(s32, "effects/effect_33", func_E00423B8);
+INCLUDE_ASM(s32, "effects/effect_33", fx_33_appendGfx);

src/effects/effect_34.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_34", fx_34_main);
 
-void func_E004441C(void) {
+void fx_34_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_34", func_E0044424);
+INCLUDE_ASM(s32, "effects/effect_34", fx_34_update);
 
-INCLUDE_ASM(s32, "effects/effect_34", func_E00448E4);
+INCLUDE_ASM(s32, "effects/effect_34", fx_34_render);
 
-INCLUDE_ASM(s32, "effects/effect_34", func_E004491C);
+INCLUDE_ASM(s32, "effects/effect_34", fx_34_appendGfx);

src/effects/effect_35.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_35", fx_35_main);
 
-void func_E0046158(void) {
+void fx_35_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_35", func_E0046160);
+INCLUDE_ASM(s32, "effects/effect_35", fx_35_update);
 
-INCLUDE_ASM(s32, "effects/effect_35", func_E004627C);
+INCLUDE_ASM(s32, "effects/effect_35", fx_35_render);
 
-INCLUDE_ASM(s32, "effects/effect_35", func_E00462C0);
+INCLUDE_ASM(s32, "effects/effect_35", fx_35_appendGfx);

src/effects/effect_36.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_36", fx_36_main);
 
-void func_E0048128(void) {
+void fx_36_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_36", func_E0048130);
+INCLUDE_ASM(s32, "effects/effect_36", fx_36_update);
 
-INCLUDE_ASM(s32, "effects/effect_36", func_E00481D4);
+INCLUDE_ASM(s32, "effects/effect_36", fx_36_render);
 
-INCLUDE_ASM(s32, "effects/effect_36", func_E0048218);
+INCLUDE_ASM(s32, "effects/effect_36", fx_36_appendGfx);

src/effects/effect_37.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_37", fx_37_main);
 
-void func_E004A328(void) {
+void fx_37_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_37", func_E004A330);
+INCLUDE_ASM(s32, "effects/effect_37", fx_37_update);
 
-INCLUDE_ASM(s32, "effects/effect_37", func_E004A748);
+INCLUDE_ASM(s32, "effects/effect_37", fx_37_render);
 
-INCLUDE_ASM(s32, "effects/effect_37", func_E004A78C);
+INCLUDE_ASM(s32, "effects/effect_37", fx_37_appendGfx);

src/effects/effect_38.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_38", fx_38_main);
 
-void func_E004C204(void) {
+void fx_38_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_38", func_E004C20C);
+INCLUDE_ASM(s32, "effects/effect_38", fx_38_update);
 
-INCLUDE_ASM(s32, "effects/effect_38", func_E004C364);
+INCLUDE_ASM(s32, "effects/effect_38", fx_38_render);
 
-INCLUDE_ASM(s32, "effects/effect_38", func_E004C3A8);
+INCLUDE_ASM(s32, "effects/effect_38", fx_38_appendGfx);

src/effects/effect_39.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_39", fx_39_main);
 
-void func_E004E15C(void) {
+void fx_39_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_39", func_E004E164);
+INCLUDE_ASM(s32, "effects/effect_39", fx_39_update);
 
-INCLUDE_ASM(s32, "effects/effect_39", func_E004E1D0);
+INCLUDE_ASM(s32, "effects/effect_39", fx_39_render);
 
-INCLUDE_ASM(s32, "effects/effect_39", func_E004E214);
+INCLUDE_ASM(s32, "effects/effect_39", fx_39_appendGfx);

src/effects/effect_40.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_40", fx_40_main);
 
-void func_E00501D0(void) {
+void fx_40_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_40", func_E00501D8);
+INCLUDE_ASM(s32, "effects/effect_40", fx_40_update);
 
-INCLUDE_ASM(s32, "effects/effect_40", func_E00502C4);
+INCLUDE_ASM(s32, "effects/effect_40", fx_40_render);
 
-INCLUDE_ASM(s32, "effects/effect_40", func_E0050308);
+INCLUDE_ASM(s32, "effects/effect_40", fx_40_appendGfx);

src/effects/effect_41.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_41", fx_41_main);
 
-void func_E00520E8(void) {
+void fx_41_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_41", func_E00520F0);
+INCLUDE_ASM(s32, "effects/effect_41", fx_41_update);
 
-INCLUDE_ASM(s32, "effects/effect_41", func_E005241C);
+INCLUDE_ASM(s32, "effects/effect_41", fx_41_render);
 
-INCLUDE_ASM(s32, "effects/effect_41", func_E0052460);
+INCLUDE_ASM(s32, "effects/effect_41", fx_41_appendGfx);

src/effects/effect_43.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_43", fx_43_main);
 
-void func_E0056304(void) {
+void fx_43_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_43", func_E005630C);
+INCLUDE_ASM(s32, "effects/effect_43", fx_43_update);
 
-INCLUDE_ASM(s32, "effects/effect_43", func_E0056B8C);
+INCLUDE_ASM(s32, "effects/effect_43", fx_43_render);
 
-INCLUDE_ASM(s32, "effects/effect_43", func_E0056BD0);
+INCLUDE_ASM(s32, "effects/effect_43", fx_43_appendGfx);

src/effects/effect_44.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_44", fx_44_main);
 
-void func_E00581AC(void) {
+void fx_44_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_44", func_E00581B4);
+INCLUDE_ASM(s32, "effects/effect_44", fx_44_update);
 
-INCLUDE_ASM(s32, "effects/effect_44", func_E0058490);
+INCLUDE_ASM(s32, "effects/effect_44", fx_44_render);
 
-INCLUDE_ASM(s32, "effects/effect_44", func_E00584D4);
+INCLUDE_ASM(s32, "effects/effect_44", fx_44_appendGfx);

src/effects/effect_45.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_45", fx_45_main);
 
-void func_E005A1F4(void) {
+void fx_45_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_45", func_E005A1FC);
+INCLUDE_ASM(s32, "effects/effect_45", fx_45_update);
 
-INCLUDE_ASM(s32, "effects/effect_45", func_E005A3B0);
+INCLUDE_ASM(s32, "effects/effect_45", fx_45_render);
 
-INCLUDE_ASM(s32, "effects/effect_45", func_E005A3F4);
+INCLUDE_ASM(s32, "effects/effect_45", fx_45_appendGfx);

src/effects/effect_46.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_46", fx_46_main);
 
-void func_E005C178(void) {
+void fx_46_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_46", func_E005C180);
+INCLUDE_ASM(s32, "effects/effect_46", fx_46_update);
 
-INCLUDE_ASM(s32, "effects/effect_46", func_E005C2B4);
+INCLUDE_ASM(s32, "effects/effect_46", fx_46_render);
 
-INCLUDE_ASM(s32, "effects/effect_46", func_E005C2F8);
+INCLUDE_ASM(s32, "effects/effect_46", fx_46_appendGfx);

src/effects/effect_47.c

@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_47", fx_47_main);
 
-void func_E005E1B0(void) {
+void fx_47_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_47", func_E005E1B8);
+INCLUDE_ASM(s32, "effects/effect_47", fx_47_update);
 
-void func_E005E310(void) {
+void fx_47_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_47", func_E005E318);

src/effects/effect_48.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_48", fx_48_main);
 
-void func_E00601D8(void) {
+void fx_48_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_48", func_E00601E0);
+INCLUDE_ASM(s32, "effects/effect_48", fx_48_update);
 
-INCLUDE_ASM(s32, "effects/effect_48", func_E006040C);
+INCLUDE_ASM(s32, "effects/effect_48", fx_48_render);
 
-INCLUDE_ASM(s32, "effects/effect_48", func_E0060450);
+INCLUDE_ASM(s32, "effects/effect_48", fx_48_appendGfx);

src/effects/effect_49.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_49", fx_49_main);
 
-void func_E0062218(void) {
+void fx_49_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_49", func_E0062220);
+INCLUDE_ASM(s32, "effects/effect_49", fx_49_update);
 
-INCLUDE_ASM(s32, "effects/effect_49", func_E00624A8);
+INCLUDE_ASM(s32, "effects/effect_49", fx_49_render);
 
-INCLUDE_ASM(s32, "effects/effect_49", func_E00624EC);
+INCLUDE_ASM(s32, "effects/effect_49", fx_49_appendGfx);

src/effects/effect_50.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_50", fx_50_main);
 
-void func_E006419C(void) {
+void fx_50_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_50", func_E00641A4);
+INCLUDE_ASM(s32, "effects/effect_50", fx_50_update);
 
-INCLUDE_ASM(s32, "effects/effect_50", func_E00643DC);
+INCLUDE_ASM(s32, "effects/effect_50", fx_50_render);
 
-INCLUDE_ASM(s32, "effects/effect_50", func_E0064414);
+INCLUDE_ASM(s32, "effects/effect_50", fx_50_appendGfx);

src/effects/effect_51.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_51", fx_51_main);
 
-void func_E0066490(void) {
+void fx_51_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_51", func_E0066498);
+INCLUDE_ASM(s32, "effects/effect_51", fx_51_update);
 
-INCLUDE_ASM(s32, "effects/effect_51", func_E006672C);
+INCLUDE_ASM(s32, "effects/effect_51", fx_51_render);
 
-INCLUDE_ASM(s32, "effects/effect_51", func_E0066770);
+INCLUDE_ASM(s32, "effects/effect_51", fx_51_appendGfx);

src/effects/effect_52.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_52", fx_52_main);
 
-void func_E0068140(void) {
+void fx_52_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_52", func_E0068148);
+INCLUDE_ASM(s32, "effects/effect_52", fx_52_update);
 
-INCLUDE_ASM(s32, "effects/effect_52", func_E00681D8);
+INCLUDE_ASM(s32, "effects/effect_52", fx_52_render);
 
-INCLUDE_ASM(s32, "effects/effect_52", func_E0068234);
+INCLUDE_ASM(s32, "effects/effect_52", fx_52_appendGfx);

src/effects/effect_53.c

@@ -6,15 +6,15 @@ INCLUDE_ASM(s32, "effects/effect_53", func_E006A0BC);
 
 INCLUDE_ASM(s32, "effects/effect_53", fx_53_main);
 
-void func_E006A45C(void) {
+void fx_53_init(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_53", func_E006A464);
 
-INCLUDE_ASM(s32, "effects/effect_53", func_E006A580);
+INCLUDE_ASM(s32, "effects/effect_53", fx_53_update);
 
-INCLUDE_ASM(s32, "effects/effect_53", func_E006A814);
+INCLUDE_ASM(s32, "effects/effect_53", fx_53_render);
 
 INCLUDE_ASM(s32, "effects/effect_53", func_E006A85C);
 
-INCLUDE_ASM(s32, "effects/effect_53", func_E006A94C);
+INCLUDE_ASM(s32, "effects/effect_53", fx_53_appendGfx);

src/effects/effect_54.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_54", fx_54_main);
 
-void func_E006C298(void) {
+void fx_54_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_54", func_E006C2A0);
+INCLUDE_ASM(s32, "effects/effect_54", fx_54_update);
 
-INCLUDE_ASM(s32, "effects/effect_54", func_E006C5A0);
+INCLUDE_ASM(s32, "effects/effect_54", fx_54_render);
 
-INCLUDE_ASM(s32, "effects/effect_54", func_E006C5E8);
+INCLUDE_ASM(s32, "effects/effect_54", fx_54_appendGfx);

src/effects/effect_55.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_55", fx_55_main);
 
-void func_E006E354(void) {
+void fx_55_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_55", func_E006E35C);
+INCLUDE_ASM(s32, "effects/effect_55", fx_55_update);
 
-INCLUDE_ASM(s32, "effects/effect_55", func_E006E6E4);
+INCLUDE_ASM(s32, "effects/effect_55", fx_55_render);
 
-INCLUDE_ASM(s32, "effects/effect_55", func_E006E764);
+INCLUDE_ASM(s32, "effects/effect_55", fx_55_appendGfx);

src/effects/effect_56.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_56", fx_56_main);
 
-void func_E00701EC(void) {
+void fx_56_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_56", func_E00701F4);
+INCLUDE_ASM(s32, "effects/effect_56", fx_56_update);
 
-INCLUDE_ASM(s32, "effects/effect_56", func_E00706F0);
+INCLUDE_ASM(s32, "effects/effect_56", fx_56_render);
 
 void func_E0070738(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_56", func_E0070740);
+INCLUDE_ASM(s32, "effects/effect_56", fx_56_appendGfx);

src/effects/effect_57.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_57", fx_57_main);
 
-void func_E0072148(void) {
+void fx_57_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_57", func_E0072150);
+INCLUDE_ASM(s32, "effects/effect_57", fx_57_update);
 
-INCLUDE_ASM(s32, "effects/effect_57", func_E007238C);
+INCLUDE_ASM(s32, "effects/effect_57", fx_57_render);
 
-INCLUDE_ASM(s32, "effects/effect_57", func_E00723D4);
+INCLUDE_ASM(s32, "effects/effect_57", fx_57_appendGfx);

src/effects/effect_58.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_58", fx_58_main);
 
-void func_E00741E0(void) {
+void fx_58_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_58", func_E00741E8);
+INCLUDE_ASM(s32, "effects/effect_58", fx_58_update);
 
-INCLUDE_ASM(s32, "effects/effect_58", func_E0074598);
+INCLUDE_ASM(s32, "effects/effect_58", fx_58_render);
 
-INCLUDE_ASM(s32, "effects/effect_58", func_E00745E0);
+INCLUDE_ASM(s32, "effects/effect_58", fx_58_appendGfx);

src/effects/effect_59.c

@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_59", fx_59_main);
 
-void func_E0076370(void) {
+void fx_59_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_59", func_E0076378);
+INCLUDE_ASM(s32, "effects/effect_59", fx_59_update);
 
-INCLUDE_ASM(s32, "effects/effect_59", func_E0076808);
+INCLUDE_ASM(s32, "effects/effect_59", fx_59_render);
 
 void func_E007684C(void) {
 }
@@ -15,4 +15,4 @@ void func_E007684C(void) {
 void func_E0076854(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_59", func_E007685C);
+INCLUDE_ASM(s32, "effects/effect_59", fx_59_appendGfx);

src/effects/effect_6.c

@@ -22,11 +22,6 @@ typedef struct Effect6 {
     /* 0x40 */ s32 unk_40;
 } Effect6; // size = 0x44
 
-void fx_6_init(EffectInstance* effect);
-void fx_6_update(EffectInstance* effect);
-void fx_6_render(EffectInstance* effect);
-void fx_6_appendGfx(EffectInstance* effect);
-
 static s32 sDlists[] = { 0x09002B20, 0x09002B40, 0x09002B60, 0x09002B60, 0x09002B60 };
 static s32 sDlists2[] = { 0x09002780, 0x09002868, 0x09002950, 0x09002A38, 0x09002A38 };
 
@@ -54,6 +49,11 @@ static s8 D_E000CCE0[] = { 0x00, 0x10, 0x20, 0x30, 0x01, 0x11, 0x21, 0x31, 0x02,
 
 static s8* D_E000CD24[4] = { &D_E000CC38, &D_E000CC48, &D_E000CC5C, &D_E000CCE0 };
 
+void fx_6_init(EffectInstance* effect);
+void fx_6_update(EffectInstance* effect);
+void fx_6_render(EffectInstance* effect);
+void fx_6_appendGfx(EffectInstance* effect);
+
 void func_E000C000(Effect6* part) {
     part->unk_18 += part->unk_1C;
     part->unk_14 += part->unk_18;

src/effects/effect_60.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_60", fx_60_main);
 
-void func_E0078124(void) {
+void fx_60_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_60", func_E007812C);
+INCLUDE_ASM(s32, "effects/effect_60", fx_60_update);
 
-INCLUDE_ASM(s32, "effects/effect_60", func_E0078210);
+INCLUDE_ASM(s32, "effects/effect_60", fx_60_render);
 
 void func_E0078274(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_60", func_E007827C);
+INCLUDE_ASM(s32, "effects/effect_60", fx_60_appendGfx);

src/effects/effect_61.c

@@ -2,14 +2,14 @@
 
 INCLUDE_ASM(s32, "effects/effect_61", fx_61_main);
 
-void func_E007A504(void) {
+void fx_61_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_61", func_E007A50C);
+INCLUDE_ASM(s32, "effects/effect_61", fx_61_update);
 
-INCLUDE_ASM(s32, "effects/effect_61", func_E007A840);
+INCLUDE_ASM(s32, "effects/effect_61", fx_61_render);
 
 void func_E007A884(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_61", func_E007A88C);
+INCLUDE_ASM(s32, "effects/effect_61", fx_61_appendGfx);

src/effects/effect_62.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_62", fx_62_main);
 
-void func_E007C128(void) {
+void fx_62_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_62", func_E007C130);
+INCLUDE_ASM(s32, "effects/effect_62", fx_62_update);
 
-INCLUDE_ASM(s32, "effects/effect_62", func_E007C1B0);
+INCLUDE_ASM(s32, "effects/effect_62", fx_62_render);
 
-INCLUDE_ASM(s32, "effects/effect_62", func_E007C1F4);
+INCLUDE_ASM(s32, "effects/effect_62", fx_62_appendGfx);

src/effects/effect_63.c

@@ -2,11 +2,11 @@
 
 INCLUDE_ASM(s32, "effects/effect_63", fx_63_main);
 
-void func_E007E1FC(void) {
+void fx_63_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_63", func_E007E204);
+INCLUDE_ASM(s32, "effects/effect_63", fx_63_update);
 
-INCLUDE_ASM(s32, "effects/effect_63", func_E007E508);
+INCLUDE_ASM(s32, "effects/effect_63", fx_63_render);
 
-INCLUDE_ASM(s32, "effects/effect_63", func_E007E54C);
+INCLUDE_ASM(s32, "effects/effect_63", fx_63_appendGfx);

src/effects/effect_64.c

@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_64", fx_64_main);
 
-void func_E00801C8(void) {
+void fx_64_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_64", func_E00801D0);
+INCLUDE_ASM(s32, "effects/effect_64", fx_64_update);
 
-void func_E0080424(void) {
+void fx_64_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_64", func_E008042C);

src/effects/effect_65.c

@@ -2,12 +2,12 @@
 
 INCLUDE_ASM(s32, "effects/effect_65", fx_65_main);
 
-void func_E00821B0(void) {
+void fx_65_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_65", func_E00821B8);
+INCLUDE_ASM(s32, "effects/effect_65", fx_65_update);
 
-void func_E0082520(void) {
+void fx_65_render(void) {
 }
 
 INCLUDE_ASM(s32, "effects/effect_65", func_E0082528);