Merge pull request #307 from elijah-thomas774/remly

dAcEremly_c equivalent. Future Cleanup needed

config/SOUE01/rels/d_a_e_remlyNP/symbols.txt

@@ -8,20 +8,20 @@ __dt__24sFState_c<11dAcEremly_c>Fv = .text:0x00000270; // type:function size:0x5
 __dt__27sFStateFct_c<11dAcEremly_c>Fv = .text:0x000002D0; // type:function size:0x6C
 __dt__80sStateMgr_c<11dAcEremly_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000340; // type:function size:0xA0
 __dt__50sFStateMgr_c<11dAcEremly_c,20sStateMethodUsr_FI_c>Fv = .text:0x000003E0; // type:function size:0xA4
-fn_177_490 = .text:0x00000490; // type:function size:0x58
-fn_177_4F0 = .text:0x000004F0; // type:function size:0x58
-fn_177_550 = .text:0x00000550; // type:function size:0x5C
-fn_177_5B0 = .text:0x000005B0; // type:function size:0xD8
-fn_177_690 = .text:0x00000690; // type:function size:0x104
-fn_177_7A0 = .text:0x000007A0; // type:function size:0x498
+__dt__15dShadowCircle_cFv = .text:0x00000490; // type:function size:0x58
+__dt__Q211dAcEremly_c10callback_cFv = .text:0x000004F0; // type:function size:0x58
+__dt__14dWaterEffect_cFv = .text:0x00000550; // type:function size:0x5C
+timingB__Q211dAcEremly_c10callback_cFUlPQ34nw4r3g3d13WorldMtxManipQ34nw4r3g3d6ResMdl = .text:0x000005B0; // type:function size:0xD8
+createHeap__11dAcEremly_cFv = .text:0x00000690; // type:function size:0x104
+actorCreate__11dAcEremly_cFv = .text:0x000007A0; // type:function size:0x498
 changeState__80sStateMgr_c<11dAcEremly_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000C40; // type:function size:0x10
-fn_177_C50 = .text:0x00000C50; // type:function size:0x10C
-fn_177_D60 = .text:0x00000D60; // type:function size:0x8
-fn_177_D70 = .text:0x00000D70; // type:function size:0x108C
+actorPostCreate__11dAcEremly_cFv = .text:0x00000C50; // type:function size:0x10C
+doDelete__11dAcEremly_cFv = .text:0x00000D60; // type:function size:0x8
+actorExecute__11dAcEremly_cFv = .text:0x00000D70; // type:function size:0x108C
 executeState__80sStateMgr_c<11dAcEremly_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00001E00; // type:function size:0x10
 getStateID__80sStateMgr_c<11dAcEremly_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001E10; // type:function size:0x10
-fn_177_1E20 = .text:0x00001E20; // type:function size:0x1C
-fn_177_1E40 = .text:0x00001E40; // type:function size:0x24C
+calcTimer<Us>__4sLibFPUs_Us = .text:0x00001E20; // type:function size:0x1C
+draw__11dAcEremly_cFv = .text:0x00001E40; // type:function size:0x24C
 initializeState_Wait__11dAcEremly_cFv = .text:0x00002090; // type:function size:0x104
 executeState_Wait__11dAcEremly_cFv = .text:0x000021A0; // type:function size:0x478
 finalizeState_Wait__11dAcEremly_cFv = .text:0x00002620; // type:function size:0x4
@@ -94,33 +94,33 @@ finalizeState_NightJumpAttack__11dAcEremly_cFv = .text:0x00006860; // type:funct
 initializeState_BirthWait__11dAcEremly_cFv = .text:0x00006870; // type:function size:0x7C
 executeState_BirthWait__11dAcEremly_cFv = .text:0x000068F0; // type:function size:0x13C
 finalizeState_BirthWait__11dAcEremly_cFv = .text:0x00006A30; // type:function size:0x4
-fn_177_6A40 = .text:0x00006A40; // type:function size:0xCC
-fn_177_6B10 = .text:0x00006B10; // type:function size:0x38C
-fn_177_6EA0 = .text:0x00006EA0; // type:function size:0x120
-fn_177_6FC0 = .text:0x00006FC0; // type:function size:0x78
-fn_177_7040 = .text:0x00007040; // type:function size:0x2EC
-fn_177_7330 = .text:0x00007330; // type:function size:0x90
-fn_177_73C0 = .text:0x000073C0; // type:function size:0x144
-fn_177_7510 = .text:0x00007510; // type:function size:0xC8
-fn_177_75E0 = .text:0x000075E0; // type:function size:0x6C
-fn_177_7650 = .text:0x00007650; // type:function size:0x164
-fn_177_77C0 = .text:0x000077C0; // type:function size:0x108
-fn_177_78D0 = .text:0x000078D0; // type:function size:0xF4
-fn_177_79D0 = .text:0x000079D0; // type:function size:0x134
-fn_177_7B10 = .text:0x00007B10; // type:function size:0x1B4
-AcERemly__handleRemlitEventsMaybe2 = .text:0x00007CD0; // type:function size:0x844
-fn_177_8520 = .text:0x00008520; // type:function size:0xD8
-fn_177_8600 = .text:0x00008600; // type:function size:0xC0
-fn_177_86C0 = .text:0x000086C0; // type:function size:0x2B4
-fn_177_8980 = .text:0x00008980; // type:function size:0x13C
-fn_177_8AC0 = .text:0x00008AC0; // type:function size:0x160
-fn_177_8C20 = .text:0x00008C20; // type:function size:0x36C
-fn_177_8F90 = .text:0x00008F90; // type:function size:0x3E0
-fn_177_9370 = .text:0x00009370; // type:function size:0xE8
-fn_177_9460 = .text:0x00009460; // type:function size:0x8
-fn_177_9470 = .text:0x00009470; // type:function size:0x4
-fn_177_9480 = .text:0x00009480; // type:function size:0x4
-fn_177_9490 = .text:0x00009490; // type:function size:0x8
+playWink__11dAcEremly_cFv = .text:0x00006A40; // type:function size:0xCC
+fn_177_6B10__11dAcEremly_cFbRC4mAng = .text:0x00006B10; // type:function size:0x38C
+fn_177_6EA0__11dAcEremly_cFb = .text:0x00006EA0; // type:function size:0x120
+adjustHeadRotation__11dAcEremly_cFb = .text:0x00006FC0; // type:function size:0x78
+fn_177_7040__11dAcEremly_cFUlf = .text:0x00007040; // type:function size:0x2EC
+isScary__11dAcEremly_cFv = .text:0x00007330; // type:function size:0x90
+shouldBeScared__11dAcEremly_cFv = .text:0x000073C0; // type:function size:0x144
+fn_177_7510__11dAcEremly_cFf = .text:0x00007510; // type:function size:0xC8
+fn_177_75E0__11dAcEremly_cFv = .text:0x000075E0; // type:function size:0x6C
+fn_177_7650__11dAcEremly_cCFb = .text:0x00007650; // type:function size:0x164
+fn_177_77C0__11dAcEremly_cFv = .text:0x000077C0; // type:function size:0x108
+fn_177_78D0__11dAcEremly_cFv = .text:0x000078D0; // type:function size:0xF4
+fn_177_79D0__11dAcEremly_cFb = .text:0x000079D0; // type:function size:0x134
+fn_177_7B10__11dAcEremly_cFv = .text:0x00007B10; // type:function size:0x1B4
+nightSleepDemoImpl__11dAcEremly_cFv = .text:0x00007CD0; // type:function size:0x844
+fn_177_8520__11dAcEremly_cFb = .text:0x00008520; // type:function size:0xD8
+fn_177_8600__11dAcEremly_cFv = .text:0x00008600; // type:function size:0xC0
+fn_177_86C0__11dAcEremly_cFv = .text:0x000086C0; // type:function size:0x2B4
+fn_177_8980__11dAcEremly_cFf = .text:0x00008980; // type:function size:0x13C
+fn_177_8AC0__11dAcEremly_cFv = .text:0x00008AC0; // type:function size:0x160
+fn_177_8C20__11dAcEremly_cF4mAng = .text:0x00008C20; // type:function size:0x36C
+fn_177_8F90__11dAcEremly_cFv = .text:0x00008F90; // type:function size:0x3E0
+fn_177_9370__11dAcEremly_cFf = .text:0x00009370; // type:function size:0xE8
+vt_0x88__11dAcEnBase_cFi = .text:0x00009460; // type:function size:0x8
+vt_0x84__11dAcEnBase_cFv = .text:0x00009470; // type:function size:0x4
+vt_0x80__11dAcEnBase_cFv = .text:0x00009480; // type:function size:0x4
+getObjectListEntry__11dAcEnBase_cFv = .text:0x00009490; // type:function size:0x8
 __dt__11dAcEremly_cFv = .text:0x000094A0; // type:function size:0x168
 build__27sFStateFct_c<11dAcEremly_c>FRC12sStateIDIf_c = .text:0x00009610; // type:function size:0x60
 dispose__27sFStateFct_c<11dAcEremly_c>FRP10sStateIf_c = .text:0x00009670; // type:function size:0xC
@@ -196,27 +196,63 @@ lbl_177_data_29C = .data:0x0000029C; // type:object size:0x5 data:string
 lbl_177_data_2A4 = .data:0x000002A4; // type:object size:0x64
 jumptable_177_data_308 = .data:0x00000308; // type:object size:0x30 scope:local
 lbl_177_data_338 = .data:0x00000338; // type:object size:0xB data:string
-lbl_177_data_344 = .data:0x00000344; // type:object size:0x8C
-lbl_177_data_3D0 = .data:0x000003D0; // type:object size:0x30
-lbl_177_data_400 = .data:0x00000400; // type:object size:0x30
-lbl_177_data_430 = .data:0x00000430; // type:object size:0x18
-lbl_177_data_448 = .data:0x00000448; // type:object size:0x18
-lbl_177_data_460 = .data:0x00000460; // type:object size:0x18
-lbl_177_data_478 = .data:0x00000478; // type:object size:0xC
-lbl_177_data_484 = .data:0x00000484; // type:object size:0x64C
+__vt__11dAcEremly_c = .data:0x00000344; // type:object size:0x8C
+__vt__50sFStateMgr_c<11dAcEremly_c,20sStateMethodUsr_FI_c> = .data:0x000003D0; // type:object size:0x30
+__vt__80sStateMgr_c<11dAcEremly_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x00000400; // type:object size:0x30
+__vt__27sFStateFct_c<11dAcEremly_c> = .data:0x00000430; // type:object size:0x18
+__vt__24sFState_c<11dAcEremly_c> = .data:0x00000448; // type:object size:0x18
+__vt__Q211dAcEremly_c10callback_c = .data:0x00000460; // type:object size:0x18
+__vt__14dWaterEffect_c = .data:0x00000478; // type:object size:0xC
+__vt__15dShadowCircle_c = .data:0x00000484; // type:object size:0x64C
 lbl_177_data_AD0 = .data:0x00000AD0; // type:object size:0x34
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_177_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte
-lbl_177_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte
-lbl_177_bss_58 = .bss:0x00000058; // type:object size:0x80 data:4byte
-lbl_177_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte
-lbl_177_bss_118 = .bss:0x00000118; // type:object size:0x100 data:4byte
-lbl_177_bss_218 = .bss:0x00000218; // type:object size:0x80 data:4byte
-lbl_177_bss_298 = .bss:0x00000298; // type:object size:0x40 data:4byte
-lbl_177_bss_2D8 = .bss:0x000002D8; // type:object size:0x140 data:4byte
-lbl_177_bss_418 = .bss:0x00000418; // type:object size:0x80 data:4byte
-lbl_177_bss_498 = .bss:0x00000498; // type:object size:0x80 data:4byte
-lbl_177_bss_518 = .bss:0x00000518; // type:object size:0x40 data:4byte
-lbl_177_bss_558 = .bss:0x00000558; // type:object size:0xB0 data:4byte
+lbl_177_bss_8 = .bss:0x00000008; // type:object size:0xC scope:local data:4byte
+StateID_Wait__11dAcEremly_c = .bss:0x00000018; // type:object size:0x30 data:4byte
+lbl_177_bss_48 = .bss:0x00000048; // type:object size:0xC scope:local data:4byte
+StateID_Walk__11dAcEremly_c = .bss:0x00000058; // type:object size:0x30 data:4byte
+lbl_177_bss_88 = .bss:0x00000088; // type:object size:0xC scope:local data:4byte
+StateID_Run__11dAcEremly_c = .bss:0x00000098; // type:object size:0x30 data:4byte
+lbl_177_bss_C8 = .bss:0x000000C8; // type:object size:0xC scope:local data:4byte
+StateID_Escape__11dAcEremly_c = .bss:0x000000D8; // type:object size:0x30 data:4byte
+lbl_177_bss_108 = .bss:0x00000108; // type:object size:0xC scope:local data:4byte
+StateID_EscapeDash__11dAcEremly_c = .bss:0x00000118; // type:object size:0x30 data:4byte
+lbl_177_bss_148 = .bss:0x00000148; // type:object size:0xC scope:local data:4byte
+StateID_Wind__11dAcEremly_c = .bss:0x00000158; // type:object size:0x30 data:4byte
+lbl_177_bss_188 = .bss:0x00000188; // type:object size:0xC scope:local data:4byte
+StateID_Hold__11dAcEremly_c = .bss:0x00000198; // type:object size:0x30 data:4byte
+lbl_177_bss_1C8 = .bss:0x000001C8; // type:object size:0xC scope:local data:4byte
+StateID_Jump__11dAcEremly_c = .bss:0x000001D8; // type:object size:0x30 data:4byte
+lbl_177_bss_208 = .bss:0x00000208; // type:object size:0xC scope:local data:4byte
+StateID_Fly__11dAcEremly_c = .bss:0x00000218; // type:object size:0x30 data:4byte
+lbl_177_bss_248 = .bss:0x00000248; // type:object size:0xC scope:local data:4byte
+StateID_Damage__11dAcEremly_c = .bss:0x00000258; // type:object size:0x30 data:4byte
+lbl_177_bss_288 = .bss:0x00000288; // type:object size:0xC scope:local data:4byte
+StateID_Sleep__11dAcEremly_c = .bss:0x00000298; // type:object size:0x30 data:4byte
+lbl_177_bss_2C8 = .bss:0x000002C8; // type:object size:0xC scope:local data:4byte
+StateID_Scared__11dAcEremly_c = .bss:0x000002D8; // type:object size:0x30 data:4byte
+lbl_177_bss_308 = .bss:0x00000308; // type:object size:0xC scope:local data:4byte
+StateID_Stun__11dAcEremly_c = .bss:0x00000318; // type:object size:0x30 data:4byte
+lbl_177_bss_348 = .bss:0x00000348; // type:object size:0xC scope:local data:4byte
+StateID_Water__11dAcEremly_c = .bss:0x00000358; // type:object size:0x30 data:4byte
+lbl_177_bss_388 = .bss:0x00000388; // type:object size:0xC scope:local data:4byte
+StateID_Hear__11dAcEremly_c = .bss:0x00000398; // type:object size:0x30 data:4byte
+lbl_177_bss_3C8 = .bss:0x000003C8; // type:object size:0xC scope:local data:4byte
+StateID_NightSleepDemo__11dAcEremly_c = .bss:0x000003D8; // type:object size:0x30 data:4byte
+lbl_177_bss_408 = .bss:0x00000408; // type:object size:0xC scope:local data:4byte
+StateID_NightFoo__11dAcEremly_c = .bss:0x00000418; // type:object size:0x30 data:4byte
+lbl_177_bss_448 = .bss:0x00000448; // type:object size:0xC scope:local data:4byte
+StateID_NightReflectionFoo__11dAcEremly_c = .bss:0x00000458; // type:object size:0x30 data:4byte
+lbl_177_bss_488 = .bss:0x00000488; // type:object size:0xC scope:local data:4byte
+StateID_NightWait__11dAcEremly_c = .bss:0x00000498; // type:object size:0x30 data:4byte
+lbl_177_bss_4C8 = .bss:0x000004C8; // type:object size:0xC scope:local data:4byte
+StateID_NightWalk__11dAcEremly_c = .bss:0x000004D8; // type:object size:0x30 data:4byte
+lbl_177_bss_508 = .bss:0x00000508; // type:object size:0xC scope:local data:4byte
+StateID_NightRun__11dAcEremly_c = .bss:0x00000518; // type:object size:0x30 data:4byte
+lbl_177_bss_548 = .bss:0x00000548; // type:object size:0xC scope:local data:4byte
+StateID_NightRet__11dAcEremly_c = .bss:0x00000558; // type:object size:0x30 data:4byte
+lbl_177_bss_588 = .bss:0x00000588; // type:object size:0xC scope:local data:4byte
+StateID_NightJumpAttack__11dAcEremly_c = .bss:0x00000598; // type:object size:0x30 data:4byte
+lbl_177_bss_5C8 = .bss:0x000005C8; // type:object size:0xC scope:local data:4byte
+StateID_BirthWait__11dAcEremly_c = .bss:0x000005D8; // type:object size:0x30 data:4byte
 lbl_177_bss_608 = .bss:0x00000608; // type:object size:0x4 data:4byte
 lbl_177_bss_60C = .bss:0x0000060C; // type:object size:0x14 data:byte

config/SOUE01/symbols.txt

@@ -976,7 +976,7 @@ setupEffect__10dEmitter_cFbUsRC7mVec3_cPC7mAng3_cPC7mVec3_cPC8_GXColorPC8_GXColo
 setupEffect__10dEmitter_cFbUsRC6mMtx_cPC8_GXColorPC8_GXColor = .text:0x8002A230; // type:function size:0x150
 polyAttrsToGroundEffectIdx__14dJEffManager_cFll = .text:0x8002A380; // type:function size:0xCC
 spawnGroundEffect__14dJEffManager_cFRC7mVec3_cUcUcRC7mVec3_clff = .text:0x8002A450; // type:function size:0x1C0
-fn_8002A610 = .text:0x8002A610; // type:function size:0x678
+spawnHitMarkEffect__14dJEffManager_cFiR8cCcD_ObjPC7mVec3_cb = .text:0x8002A610; // type:function size:0x678
 fn_8002AC90 = .text:0x8002AC90; // type:function size:0x460
 vt_0x1C0__17daPlayerActBase_cCFv = .text:0x8002B0F0; // type:function size:0x8
 init__14dWaterEffect_cFP12dAcObjBase_cfff = .text:0x8002B100; // type:function size:0x14
@@ -1153,7 +1153,7 @@ preDraw__11dAcEnBase_cFv = .text:0x8002F540; // type:function size:0x74
 fn_8002F5C0 = .text:0x8002F5C0; // type:function size:0x110
 checkBeetleActorReferences__17daPlayerActBase_cFl = .text:0x8002F6D0; // type:function size:0x8
 getBeetleActorReferencesSize__17daPlayerActBase_cFv = .text:0x8002F6E0; // type:function size:0x8
-fn_8002F6F0 = .text:0x8002F6F0; // type:function size:0xC
+getBombWithinRadius__17daPlayerActBase_cFP9dAcBase_cRC7mVec3_cf = .text:0x8002F6F0; // type:function size:0xC
 fn_8002F700 = .text:0x8002F700; // type:function size:0x8
 fn_8002F710 = .text:0x8002F710; // type:function size:0x110
 checkRefArrayAtIndex__17daPlayerActBase_cFv = .text:0x8002F820; // type:function size:0x8
@@ -1172,12 +1172,12 @@ fn_8002FBF0 = .text:0x8002FBF0; // type:function size:0x20
 fn_8002FC10 = .text:0x8002FC10; // type:function size:0xF4
 someEnemyDamageCollisionStuffMaybe__11dAcEnBase_cFR19dColliderLinkedListPUs = .text:0x8002FD10; // type:function size:0x7C
 fn_8002FD90 = .text:0x8002FD90; // type:function size:0x4C
-fn_8002FDE0 = .text:0x8002FDE0; // type:function size:0x170
+fn_8002FDE0__11dAcEnBase_cFR8cCcD_ObjPUs = .text:0x8002FDE0; // type:function size:0x170
 fn_8002FF50 = .text:0x8002FF50; // type:function size:0xD4
-fn_80030030 = .text:0x80030030; // type:function size:0x174
-fn_800301B0 = .text:0x800301B0; // type:function size:0x1D4
+fn_80030030__11dAcEnBase_cFRC7mVec3_cRsRsf = .text:0x80030030; // type:function size:0x174
+fn_800301b0__11dAcEnBase_cFRC7mVec3_c4mAngbf = .text:0x800301B0; // type:function size:0x1D4
 fn_80030390 = .text:0x80030390; // type:function size:0x64
-fn_80030400 = .text:0x80030400; // type:function size:0x168
+fn_80030400__11dAcEnBase_cFRQ23m3d5mdl_cUcbUc = .text:0x80030400; // type:function size:0x168
 fn_80030570 = .text:0x80030570; // type:function size:0x144
 fn_800306C0 = .text:0x800306C0; // type:function size:0x10
 fn_800306D0 = .text:0x800306D0; // type:function size:0x24
@@ -1186,7 +1186,7 @@ fn_80030730 = .text:0x80030730; // type:function size:0xB0
 fn_800307E0 = .text:0x800307E0; // type:function size:0x34
 fn_80030820 = .text:0x80030820; // type:function size:0x14
 fn_80030840 = .text:0x80030840; // type:function size:0x13C
-fn_80030980 = .text:0x80030980; // type:function size:0x188
+fn_80030980__11dAcEnBase_cFRQ23m3d5mdl_clb = .text:0x80030980; // type:function size:0x188
 fn_80030B10 = .text:0x80030B10; // type:function size:0x10C
 fn_80030c20__11dAcEnBase_cFUlffff = .text:0x80030C20; // type:function size:0x28
 fn_80030C50 = .text:0x80030C50; // type:function size:0x8
@@ -2722,7 +2722,7 @@ getBodyMtx__19daPlayerModelBase_cFP6mMtx_ci = .text:0x800614F0; // type:function
 getCurrentCarriedActor__19daPlayerModelBase_cFv = .text:0x80061510; // type:function size:0x8 scope:weak
 vt_0x0F4__19daPlayerModelBase_cCFv = .text:0x80061520; // type:function size:0x8 scope:weak
 vt_0x0F0__19daPlayerModelBase_cCFv = .text:0x80061530; // type:function size:0x8 scope:weak
-vt_0x0EC__19daPlayerModelBase_cCFv = .text:0x80061540; // type:function size:0x8 scope:weak
+getHeadTranslation__19daPlayerModelBase_cCFv = .text:0x80061540; // type:function size:0x8 scope:weak
 vt_0x0E8__19daPlayerModelBase_cCFv = .text:0x80061550; // type:function size:0x8 scope:weak
 getCenterTranslation__19daPlayerModelBase_cCFv = .text:0x80061560; // type:function size:0x8 scope:weak
 canBlockAttack__19daPlayerModelBase_cFv = .text:0x80061570; // type:function size:0x8 scope:weak
@@ -3545,7 +3545,7 @@ ActorEventRelated__isInEvent = .text:0x8009D950; // type:function size:0x54
 isThisActorInEvent__17ActorEventRelatedFv = .text:0x8009D9B0; // type:function size:0x5C
 fn_8009DA10 = .text:0x8009DA10; // type:function size:0x30
 fn_8009DA40 = .text:0x8009DA40; // type:function size:0x40
-getSkipOnlyEvent = .text:0x8009DA80; // type:function size:0xC
+getSkipOnlyEvent__12EventManagerFv = .text:0x8009DA80; // type:function size:0xC
 EventManager__ctorCont = .text:0x8009DA90; // type:function size:0x11C
 fn_8009DBB0 = .text:0x8009DBB0; // type:function size:0x128
 startEventManager = .text:0x8009DCE0; // type:function size:0x280
@@ -3566,7 +3566,7 @@ fn_8009EEA0 = .text:0x8009EEA0; // type:function size:0x53C
 alsoSetAsCurrentEvent__12EventManagerFP9dAcBase_cP5EventPv = .text:0x8009F3E0; // type:function size:0x470
 fn_8009F850 = .text:0x8009F850; // type:function size:0x134
 fn_8009F990__12EventManagerFv = .text:0x8009F990; // type:function size:0x80
-fn_8009FA10 = .text:0x8009FA10; // type:function size:0x8
+fn_8009FA10__12EventManagerFP9dAcBase_cP5EventPv = .text:0x8009FA10; // type:function size:0x8
 attachSkipEvent = .text:0x8009FA20; // type:function size:0x1A0
 setEvent__12EventManagerFP9dAcBase_cP5EventP9dAcBase_c = .text:0x8009FBC0; // type:function size:0x120
 changeOwnEvent__12EventManagerFP9dAcBase_cP9dAcBase_cP5Eventi = .text:0x8009FCE0; // type:function size:0x11C
@@ -3594,7 +3594,7 @@ getCurrentEventActorBasedOnGroup = .text:0x800A0890; // type:function size:0x58
 fn_800A08F0__12EventManagerFQ27fBase_c12GROUP_TYPE_e = .text:0x800A08F0; // type:function size:0x58
 checkButton2HeldForCutscenes = .text:0x800A0950; // type:function size:0x60
 canSkipCurrentEvent__12EventManagerFv = .text:0x800A09B0; // type:function size:0x1D0
-fn_800A0B80 = .text:0x800A0B80; // type:function size:0x10
+fn_800A0B80__12EventManagerFv = .text:0x800A0B80; // type:function size:0x10
 eventRelatedStateFlags_shift0x11_1__12EventManagerFv = .text:0x800A0B90; // type:function size:0x10
 fn_800A0BA0 = .text:0x800A0BA0; // type:function size:0x94
 __ct__5EventFPCcUlUlPvPv = .text:0x800A0C40; // type:function size:0xEC
@@ -10411,7 +10411,7 @@ GoddessChestsOpenedCounter__init_vtable = .text:0x801947A0; // type:function siz
 GoddessChestsOpenedCounter__dtor = .text:0x801947C0; // type:function size:0x58
 GoddessChestsOpenedCounter__getMaxGoddessChests = .text:0x80194820; // type:function size:0x8
 GoddessChestsOpenedCounter__init = .text:0x80194830; // type:function size:0x3C
-angleToRotate = .text:0x80194870; // type:function size:0x194
+getForce__11dTgStream_cFRC7mVec3_cR7mVec3_cRC9fLiMgBa_c = .text:0x80194870; // type:function size:0x194
 fn_80194A10 = .text:0x80194A10; // type:function size:0xC
 getStatueType__10dAcOSave_cCFv = .text:0x80194A20; // type:function size:0xC
 getStatueNameId__10dAcOSave_cCFv = .text:0x80194A30; // type:function size:0x24

include/d/a/e/d_a_e_remly.h

@@ -1,14 +1,80 @@
 #ifndef D_A_E_REMLY_H
 #define D_A_E_REMLY_H
 
+#include "common.h"
+#include "d/a/d_a_base.h"
 #include "d/a/e/d_a_en_base.h"
+#include "d/col/bg/d_bg_s_acch.h"
+#include "d/col/cc/d_cc_d.h"
+#include "d/d_shadow.h"
+#include "m/m3d/m_anmtexpat.h"
+#include "m/m3d/m_mdl.h"
+#include "m/m_angle.h"
+#include "m/m_vec.h"
 #include "s/s_State.hpp"
+#include "toBeSorted/d_d3d.h"
+#include "toBeSorted/d_emitter.h"
 
+class dAcBomb_c;
+class dAcNpcSkn2_c;
 class dAcEremly_c : public dAcEnBase_c {
+public:
+    class callback_c : public m3d::callback_c {
+    public:
+        virtual ~callback_c() {}
+        virtual void timingB(u32, nw4r::g3d::WorldMtxManip *, nw4r::g3d::ResMdl) override;
+
+        /* 0x04 */ mAng3_c mHeadRotation;
+        /* 0x0C */ UNKWORD field_0x0C; // Guess
+    };
+
+    enum State_e {
+        STATE_0 = 0,
+        STATE_1 = 1,
+        STATE_2 = 2,
+        STATE_3 = 3,
+        STATE_4 = 4,
+        STATE_5 = 5,
+        STATE_6 = 6,
+        STATE_7 = 7,
+        STATE_8 = 8,
+        STATE_9 = 9,
+        STATE_10 = 10,
+        STATE_11 = 11,
+        STATE_12 = 12,
+        STATE_13 = 13,
+        STATE_14 = 14,
+        STATE_15 = 15,
+        STATE_16 = 16,
+        STATE_17 = 17,
+        STATE_18 = 18,
+        STATE_19 = 19,
+        STATE_20 = 20,
+        STATE_21 = 21,
+        STATE_22 = 22,
+        STATE_23 = 23,
+        STATE_24 = 24,
+        STATE_25 = 25,
+        STATE_26 = 26,
+        STATE_27 = 27,
+        STATE_28 = 28,
+        STATE_29 = 29,
+        STATE_30 = 30,
+        STATE_31 = 31,
+        STATE_32 = 32,
+    };
+
 public:
     dAcEremly_c() : mStateMgr(*this) {}
     virtual ~dAcEremly_c() {}
 
+    virtual int doDelete() override;
+    virtual int draw() override;
+    virtual bool createHeap() override;
+    virtual int actorCreate() override;
+    virtual int actorPostCreate() override;
+    virtual int actorExecute() override;
+
     STATE_FUNC_DECLARE(dAcEremly_c, Wait);
     STATE_FUNC_DECLARE(dAcEremly_c, Walk);
     STATE_FUNC_DECLARE(dAcEremly_c, Run);
@@ -34,8 +100,133 @@ public:
     STATE_FUNC_DECLARE(dAcEremly_c, NightJumpAttack);
     STATE_FUNC_DECLARE(dAcEremly_c, BirthWait);
 
+    bool isState(State_e state) {
+        return field_0xB60 == (u32)state;
+    }
+
+    STATE_MGR_DEFINE_UTIL_EXECUTESTATE(dAcEremly_c);
+    STATE_MGR_DEFINE_UTIL_ISSTATE(dAcEremly_c);
+    STATE_MGR_DEFINE_UTIL_CHANGESTATE(dAcEremly_c);
+
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcEremly_c);
+    void playWink();
+    bool fn_177_6B10(bool lookAtTarget, const mAng &);
+    void fn_177_6EA0(bool);
+    void adjustHeadRotation(bool);
+
+    bool fn_177_7040(u32, f32);
+
+    bool isScary();
+
+    bool shouldBeScared();
+
+    bool fn_177_7510(f32);
+
+    bool fn_177_75E0();
+
+    /** false -> comapres to camera
+     *   true -> compares to player */
+    bool fn_177_7650(bool comparePlayer) const;
+
+    void fn_177_77C0();
+
+    // Set Scary Face
+    void fn_177_78D0();
+
+    void fn_177_79D0(bool);
+
+    bool fn_177_7B10();
+    void nightSleepDemoImpl();
+
+    void fn_177_8520(bool);
+    void fn_177_8600();
+    bool fn_177_86C0();
+    bool fn_177_8980(f32);
+    bool fn_177_8AC0();
+    bool fn_177_8C20(mAng);
+    bool fn_177_8F90();
+    bool fn_177_9370(f32);
+
+private:
+    /* 0x378 */ STATE_MGR_DECLARE(dAcEremly_c);
+
+    /* 0x3B4 */ dShadowCircle_c mShadow;
+    /* 0x3BC */ d3d::AnmMdlWrapper mMdl;
+    /* 0x438 */ m3d::anmTexPat_c mTexPat;
+
+    /* 0x458 */ dBgS_AcchCir mAcchCir;
+    /* 0x3B4 */ dBgS_ObjAcch mAcch;
+    /* 0x864 */ dCcD_Sph mSph;
+
+    /* 0x9B4 */ callback_c mMdlCallback;
+
+    /* 0x9C4 */ dEmitter_c mEmitters[2];
+
+    /* 0xA2C */ dAcRef_c<dAcNpcSkn2_c> mRef1; // Temporary until type known
+    /* 0xA38 */ dAcRef_c<dAcBomb_c> mNearbyBombRef;
+
+    /* 0xA44 */ mVec3_c mTargetPosition;
+    /* 0xA50 */ mVec3_c field_0xA50;
+
+    /* 0xA5C */ dWaterEffect_c mWaterEffect;
+
+    /* 0xAA4 */ mVec3_c field_0xAA4;
+    /* 0xAB0 */ mVec3_c field_0xAB0;
+    /* 0xABC */ mVec3_c field_0xABC;
+    /* 0xAC8 */ mVec3_c field_0xAC8;
+    /* 0xAD4 */ mVec3_c field_0xAD4;
+    /* 0xAE0 */ mVec3_c field_0xAE0;
+    /* 0xAEC */ mVec3_c field_0xAEC;
+    /* 0xAF8 */ mVec3_c field_0xAF8;
+
+    /* 0xB04 */ f32 field_0xB04;
+    /* 0xB08 */ f32 field_0xB08;
+    /* 0xB0C */ f32 field_0xB0C;
+    /* 0xB10 */ f32 field_0xB10;
+    /* 0xB14 */ s32 field_0xB14;
+    /* 0xB18 */ u32 field_0xB18;
+    /* 0xB1C */ u8 _B1C[0xB1E - 0xB1C];
+    /* 0xB1E */ mAng3_c field_0xB1E;
+    /* 0xB24 */ s16 field_0xB24;
+    /* 0xB26 */ s16 field_0xB26;
+    /* 0xB26 */ u32 field_0xB28;
+    /* 0xB2C */ s32 field_0xB2C;
+    /* 0xB30 */ mAng field_0xB30;
+    /* 0xB32 */ mAng field_0xB32;
+    /* 0xB34 */ mAng field_0xB34;
+    /* 0xB38 */ f32 field_0xB38;
+    /* 0xB3C */ f32 field_0xB3C;
+    /* 0xB40 */ f32 field_0xB40;
+    /* 0xB44 */ u16 field_0xB44;
+    /* 0xB46 */ u16 field_0xB46;
+    /* 0xB48 */ u16 field_0xB48;
+    /* 0xB4A */ u16 mWinkTimer;
+    /* 0xB4C */ u16 field_0xB4C;
+    /* 0xB4E */ u16 field_0xB4E;
+    /* 0xB50 */ u16 field_0xB50;
+    /* 0xB52 */ u16 field_0xB52;
+    /* 0xB54 */ u16 field_0xB54;
+    /* 0xB56 */ u16 field_0xB56;
+    /* 0xB58 */ u16 field_0xB58;
+    /* 0xB5A */ u16 field_0xB5A;
+    /* 0xB5C */ u16 field_0xB5C;
+    /* 0xB5E */ u16 field_0xB5E;
+    /* 0xB60 */ u8 field_0xB60; // Some State representation
+    /* 0xB61 */ u8 field_0xB61;
+    /* 0xB62 */ u8 mSleepDemoPlayedSceneflag;
+    /* 0xB63 */ u8 field_0xB63;
+    /* 0xB64 */ u8 field_0xB64;
+    /* 0xB65 */ u8 field_0xB65;
+    /* 0xB66 */ u8 field_0xB66;
+    /* 0xB67 */ u8 field_0xB67;
+    /* 0xB68 */ u8 field_0xB68;
+    /* 0xB69 */ u8 field_0xB69;
+    /* 0xB6A */ u8 field_0xB6A;
+    /* 0xB6B */ u8 field_0xB6B;
+    /* 0xB6C */ u8 field_0xB6C;
+    /* 0xB6D */ u8 field_0xB6D;
+    /* 0xB6E */ u8 field_0xB6E;
+    /* 0xB6F */ u8 field_0xB6F;
 };
 
 #endif

include/d/a/e/d_a_en_base.h

@@ -5,6 +5,7 @@
 #include "d/a/obj/d_a_obj_base.h"
 #include "d/a/obj/d_a_obj_bomb.h"
 #include "d/d_cc.h"
+#include "m/m3d/m_mdl.h"
 #include "m/m_angle.h"
 #include "m/m_vec.h"
 
@@ -22,6 +23,7 @@ public:
         INTERACT_0x4 = (1 << 2),
         INTERACT_0x40 = (1 << 6),
         INTERACT_0x1000 = (1 << 12),
+        INTERACT_0x2000 = (1 << 13),
     };
 
 public:
@@ -68,13 +70,16 @@ public:
 
     // Deals with dealing damage to Enemy
     // Returns a value 0-13 (similar to mStts rank?)
-    int fn_8002fde0(cCcD_Obj &mCc, u16 *pTgOut);
-
+    int fn_8002FDE0(cCcD_Obj &mCc, u16 *pTgOut);
+    void fn_80030030(const mVec3_c &pos, s16 &, s16 &, f32);
     // Returns 0-3 based on collision
-    // 2
     int fn_800301b0(const mVec3_c &pos, mAng ang, bool, f32);
+    void fn_80030400(m3d::mdl_c &, u8, bool, u8);
     void fn_800306d0();
     void fn_80030700();
+
+    static void fn_80030980(m3d::mdl_c &, s32, bool markDirty);
+
     void fn_80030c20(u32 flags, f32, f32, f32, f32);
 
     s32 someEnemyDamageCollisionStuffMaybe(dColliderLinkedList &list, u16 *pOutFlags);

include/d/a/obj/d_a_obj_base.h

@@ -95,6 +95,15 @@ public:
     mVec3_c &getOldPosition() {
         return mOldPosition;
     }
+    void setOldPosition(const mVec3_c &v) {
+        mOldPosition = v;
+    }
+    mVec3_c &getStartingPosition() {
+        return mStartingPos;
+    }
+    void setStartingPosition(const mVec3_c &v) {
+        mStartingPos = v;
+    }
     mVec3_c &getVelocity() {
         return mVelocity;
     }
@@ -102,6 +111,10 @@ public:
         return mAngle;
     }
 
+    void setStartingRotation(const mAng3_c &v) {
+        mStartingRot = v;
+    }
+
     f32 getVelocityMag() const {
         return fabsf(nw4r::math::VEC3LenSq(mVelocity));
     }

include/d/d_player_act.h

@@ -1,6 +1,8 @@
 #ifndef D_A_PLAYER_ACT_H
 #define D_A_PLAYER_ACT_H
 
+#include "d/a/d_a_base.h"
+#include "d/a/obj/d_a_obj_bomb.h"
 #include "d/d_player_base.h"
 #include "m/m_vec.h"
 
@@ -93,7 +95,7 @@ public:
         // unused; overridden by daPlayerModelBase_c
         return mVec3_c::Zero;
     }
-    /* vt 0x0EC */ virtual const mVec3_c &vt_0x0EC() const {
+    /* vt 0x0EC */ virtual const mVec3_c &getHeadTranslation() const {
         // unused; overridden by daPlayerModelBase_c
         return mVec3_c::Zero;
     }
@@ -413,7 +415,7 @@ public:
     /* vt 0x2A8 */ virtual void lookTowardItem() {}
     /* vt 0x2AC */ virtual void vt_0x2AC() {}
     /* vt 0x2B0 */ virtual void vt_0x2B0() {}
-    /* vt 0x2B4 */ virtual void triggerMoveEventMaybe(u32, u32, u32, const mVec3_c *, const mAng&, u32, u32) {}
+    /* vt 0x2B4 */ virtual void triggerMoveEventMaybe(u32, u32, u32, const mVec3_c *, const mAng &, u32, u32) {}
     /* vt 0x2B8 */ virtual void setActorRef9() {}
     /* vt 0x2BC */ virtual void unlinkActorRef9() {}
     /* vt 0x2C0 */ virtual bool vt_0x2C0() {
@@ -654,6 +656,9 @@ public:
         return sCurrentSword;
     }
 
+    // Checks through beetle actor references and
+    static dAcBomb_c *getBombWithinRadius(dAcBase_c *, const mVec3_c &, f32);
+
     static bool isInEvent();
     bool isAttackingLeft() const;
     bool isAttackingRight() const;

include/d/d_player_mdl.h

@@ -824,7 +824,7 @@ public:
     /* vt 0x0E8 */ virtual const mVec3_c &vt_0x0E8() const override {
         return field_0x12F4;
     }
-    /* vt 0x0EC */ virtual const mVec3_c &vt_0x0EC() const override {
+    /* vt 0x0EC */ virtual const mVec3_c &getHeadTranslation() const override {
         return mHeadTranslation;
     }
     /* vt 0x0F0 */ virtual const mVec3_c &vt_0x0F0() const override {

include/d/t/d_t_stream.h

@@ -5,6 +5,7 @@
 #include "f/f_list_mg.h"
 #include "f/f_list_nd.h"
 #include "m/m_mtx.h"
+#include "m/m_vec.h"
 
 class dTgStream_c : public dTg_c {
 public:
@@ -21,6 +22,8 @@ public:
 
     void addToList(fLiMgBa_c &list);
 
+    static bool getForce(const mVec3_c &position, mVec3_c &force, const fLiMgBa_c &list = sStreamList);
+
 private:
     /* 0x0FC */ u8 mSceneflag; ///< Sceneflag to indicate when to flow
     /* 0x0FD */ u8 mAreaIdx;

include/m/m3d/m_anmmdl.h

@@ -60,6 +60,13 @@ public:
     void setAnmFile(void *data) {
         mAnmFile = nw4r::g3d::ResFile(data);
     }
+    nw4r::g3d::ResFile getAnmFile() {
+        return mAnmFile;
+    }
+
+    nw4r::g3d::ResFile getMdlFile() {
+        return mMdlFile;
+    }
 
 protected:
     nw4r::g3d::ResFile mMdlFile;

include/m/m_angle.h

@@ -53,6 +53,11 @@ public:
         return *this;
     }
 
+    template <typename T>
+    bool operator==(const T other) {
+        return mVal == other;
+    }
+
 public:
     static s32 abs(const mAng b) {
         return labs(b);
@@ -63,6 +68,12 @@ public:
     s32 absDiff(const mAng &other) const {
         return sLib::absDiff(mVal, other.mVal);
     }
+    // NOTE: Try not to use this one...
+    //       May need a better home in future.
+    template <typename T>
+    static s32 absDiff2(T a, T b) {
+        return abs(a - b);
+    }
     f32 sin() const {
         return nw4r::math::SinIdx(*this);
     }

include/toBeSorted/d_emitter.h

@@ -207,7 +207,7 @@ private:
     }
 
 public:
-    dWaterEffect_c() : mIsInWater(1), mIsSmall(false) {}
+    dWaterEffect_c() : mIsInWater(true), mIsSmall(false) {}
     virtual ~dWaterEffect_c() {}
 
     void init(dAcObjBase_c *, f32 height, f32 scale, f32 depth);

include/toBeSorted/event_manager.h

@@ -20,6 +20,9 @@ public:
     static bool canSkipCurrentEvent();
     static dAcBase_c *getMainActorInEvent();
 
+    static Event *getSkipOnlyEvent();
+    static bool fn_800A0B80();
+    static void fn_8009FA10(dAcBase_c *actor, Event *event, void *unknown);
     static void execute();
 
     static EventManager *sInstance;

src/REL/d/a/e/d_a_e_sm.cpp

@@ -512,7 +512,7 @@ int dAcEsm_c::actorExecute() {
     mHitPos.set(0.f, 0.f, 0.f);
 
     if (0 == sLib::calcTimer(&mDamageTimer)) {
-        field_0xB94 = fn_8002fde0(mSph, nullptr);
+        field_0xB94 = fn_8002FDE0(mSph, nullptr);
         if (field_0xB94 != 0) {
             if (mSph.ChkTgHit()) {
                 if (field_0xB94 == 7) {