diff --git a/config/mapping.csv b/config/mapping.csv
index 9e2dfd97..d026b0a9 100644
--- a/config/mapping.csv
+++ b/config/mapping.csv
@@ -34,15 +34,15 @@ th06::Stage::LoadStageData,0x404690,0x1c1,__thiscall,,ZunResult,Stage*,char*,cha
 th06::Stage::UpdateObjects,0x404860,0x101,__thiscall,,ZunResult,Stage*
 th06::Stage::RenderObjects,0x404970,0x83d,__thiscall,,ZunResult,Stage*,i32
 th06::AnmManager::ExecuteAnmIdx,0x4051b0,0xa9,__thiscall,,void,AnmManager*,AnmVm*,i32
-th06::Player::BombReimuACalc,0x405260,0x9a4,default,,void,Player*
-th06::Player::BombReimuADraw,0x405c10,0x410,default,,void,Player*
-th06::Player::DarkenViewport,0x406020,0x137,default,,void,Player*
-th06::Player::BombReimuBCalc,0x406160,0x47d,default,,void,Player*
-th06::Player::BombReimuBDraw,0x4065e0,0x110,default,,void,Player*
-th06::Player::BombMarisaACalc,0x4066f0,0x411,default,,void,Player*
-th06::Player::BombMarisaADraw,0x406b10,0x354,default,,void,Player*
-th06::Player::BombMarisaBCalc,0x406e70,0x33e,default,,void,Player*
-th06::Player::BombMarisaBDraw,0x4071b0,0x185,default,,void,Player*
+th06::BombData::BombReimuACalc,0x405260,0x9a4,default,,void,Player*
+th06::BombData::BombReimuADraw,0x405c10,0x410,default,,void,Player*
+th06::BombData::DarkenViewport,0x406020,0x137,default,,void,Player*
+th06::BombData::BombReimuBCalc,0x406160,0x47d,default,,void,Player*
+th06::BombData::BombReimuBDraw,0x4065e0,0x110,default,,void,Player*
+th06::BombData::BombMarisaACalc,0x4066f0,0x411,default,,void,Player*
+th06::BombData::BombMarisaADraw,0x406b10,0x354,default,,void,Player*
+th06::BombData::BombMarisaBCalc,0x406e70,0x33e,default,,void,Player*
+th06::BombData::BombMarisaBDraw,0x4071b0,0x185,default,,void,Player*
 th06::EclManager::Load,0x407340,0xb2,__thiscall,,ZunResult,EclManager*,char*
 th06::EclManager::Unload,0x407400,0x32,__thiscall,,void,EclManager*
 th06::EclManager::CallEclSub,0x407440,0x54,__thiscall,,ZunResult,EclManager*,EnemyEclContext*,i16
@@ -220,7 +220,7 @@ th06::TextHelper::GetFormatInfo,0x41ec22,0x50,__thiscall,,FormatInfo*,TextHelper
 th06::TextHelper::InvertAlpha,0x41ec72,0x29f,__thiscall,,bool,TextHelper*,i32,i32,i32,i32
 th06::TextHelper::CopyTextToSurface,0x41ef11,0xf7,__thiscall,,bool,TextHelper*,IDirect3DSurface8*
 th06::TextHelper::CreateTextBuffer,0x41f008,0x23,default,,void
-th06::TextHelper::ReleaseTextBuffer,0x41f02b,0x25,default,,void
+th06::TextHelper::ReleaseTextBuffer,0x41f02b,0x25,__cdecl,,void
 th06::TextHelper::RenderTextToTexture,0x41f050,0x1e0,default,,void,i32,i32,i32,i32,i32,i32,ZunColor,ZunColor,char*,IDirect3DTexture8*
 th06::ItemManager::ItemManager,0x41f230,0x5a,__thiscall,,ItemManager*,ItemManager*
 th06::ItemManager::SpawnItem,0x41f290,0x205,__thiscall,,void,ItemManager*,D3DXVECTOR3*,ItemType,i32
@@ -293,7 +293,7 @@ th06::Supervisor::StopAudio,0x424d38,0x4a,__thiscall,,ZunResult,Supervisor*
 th06::Supervisor::FadeOutMusic,0x424d82,0xbf,__thiscall,,ZunResult,Supervisor*,f32
 th06::SoundPlayer::FadeOut,0x424e41,0x4e,__thiscall,,void,SoundPlayer*,f32
 th06::MusicRoom::FUN_00424e8f,0x424e8f,0x1e,__thiscall,,ZunResult,MusicRoom*
-th06::MusicRoom::DrawMusicList,0x424ead,0x38d,__thiscall,,void,MusicRoom*
+th06::MusicRoom::DrawMusicList,0x424ead,0x38d,__thiscall,,u32,MusicRoom*
 th06::MusicRoom::RegisterChain,0x42523a,0xde,default,,ZunResult
 th06::MusicRoom::MusicRoom,0x425318,0xc5,__thiscall,,MusicRoom*,MusicRoom*
 th06::MusicRoom::OnUpdate,0x4253dd,0x7d,__cdecl,,ChainCallbackResult,MusicRoom*
@@ -370,7 +370,7 @@ th06::ScreenEffect::SetViewport,0x42f790,0x66,default,,void,unsigned long
 th06::ScreenEffect::CalcFadeIn,0x42f800,0xae,default,,ChainCallbackResult,ScreenEffect*
 th06::ScreenEffect::DrawSquare,0x42f8b0,0x3c8,default,,void,ZunRect*,unsigned long
 th06::ScreenEffect::CalcFadeOut,0x42fc80,0xa8,default,,ChainCallbackResult,ScreenEffect*
-th06::ScreenEffect::RegisterChain,0x42fd30,0x1ac,default,,ScreenEffect*,u32,u32,u32,u32,u32
+th06::ScreenEffect::RegisterChain,0x42fd30,0x1ac,default,,ScreenEffect*,i32,u32,u32,u32,u32
 th06::ScreenEffect::DrawFadeIn,0x42fee0,0x88,default,,ChainCallbackResult,ScreenEffect*
 th06::ScreenEffect::DrawFadeOut,0x42ff70,0x47,default,,ChainCallbackResult,ScreenEffect*
 th06::ScreenEffect::ShakeScreen,0x42ffc0,0x22c,default,,ChainCallbackResult,ScreenEffect*
@@ -1069,12 +1069,12 @@ _fprintf,0x45d30d,0x54,__cdecl,varargs,i32,_iobuf*,char*
 FUN_0045d361,0x45d361,0xa,unknown,,u8
 __aulldiv,0x45d370,0x68,unknown,,u8,u32,u32,u32,u32
 __allmul,0x45d3e0,0x34,unknown,,u8,u32,u32,u32,u32
-setDate,0x45d414,0x70,__stdcall,,void,char*
+strdate,0x45d414,0x70,__stdcall,,char*,char*
 _strcpy,0x45d490,0x8a,__cdecl,,char*,char*,char*
 _strcat,0x45d4a0,0x65,__cdecl,,char*,char*,char*
-th06::FileSystem::CreateDirectoryInCWD,0x45d588,0x2c,unknown,,ZunResult,char*
+_mkdir,0x45d588,0x2c,unknown,,ZunResult,char*
 _strncmp,0x45d5c0,0x39,__cdecl,,i32,char*,char*,u32
-th06::FileSystem::ChangeCWD,0x45d5f9,0x9c,__stdcall,,void,char*
+_chdir,0x45d5f9,0x9c,__stdcall,,void,char*
 _rand,0x45d695,0x22,__cdecl,,i32
 FUN_0045d6b7,0x45d6b7,0x9,unknown,,u8
 __chkstk,0x45d6c0,0x3d,unknown,,u8,u8