diff --git a/config/mapping.csv b/config/mapping.csv
index 1046a666..8418620c 100644
--- a/config/mapping.csv
+++ b/config/mapping.csv
@@ -293,13 +293,13 @@ 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,,void,MusicRoom*
 th06::MusicRoom::RegisterChain,0x42523a,0xde,default,,ZunResult
 th06::MusicRoom::MusicRoom,0x425318,0xc5,__thiscall,,u32*,MusicRoom*
-th06::MusicRoom::OnUpdate,0x4253dd,0x7d,__stdcall,,ChainCallbackResult,MusicRoom*
-th06::MusicRoom::OnDraw,0x42545a,0x1f2,default,,ChainCallbackResult,MusicRoom*
-th06::MusicRoom::AddedCallback,0x42564c,0x74b,__stdcall,,ZunResult,MusicRoom*
-th06::MusicRoom::DeletedCallback,0x425d97,0x6c,__stdcall,,ZunResult,MusicRoom*
+th06::MusicRoom::OnUpdate,0x4253dd,0x7d,__cdecl,,ChainCallbackResult,MusicRoom*
+th06::MusicRoom::OnDraw,0x42545a,0x1f2,__cdecl,,ChainCallbackResult,MusicRoom*
+th06::MusicRoom::AddedCallback,0x42564c,0x74b,__cdecl,,ZunResult,MusicRoom*
+th06::MusicRoom::DeletedCallback,0x425d97,0x6c,__cdecl,,ZunResult,MusicRoom*
 th06::Player::Player,0x425e10,0x1e8,__thiscall,,Player*,Player*
 th06::PlayerInner::PlayerInner,0x426000,0xc2,__thiscall,,PlayerBombInfo*,PlayerInner*
 th06::Player::FireBulletReimuA,0x4260d0,0x22,default,,FireBulletResult,Player*,PlayerBullet*,u32,u32
@@ -352,15 +352,15 @@ th06::ResultScreen::ReleaseScoreDat,0x42b7dc,0x2d,default,,void,ScoreDat*
 th06::WriteScore,0x42b809,0x424,__stdcall,,void,ResultScreen*
 th06::ResultScreen::LinkScoreEx,0x42bc2d,0x2e,__thiscall,,void,ResultScreen*,Hscr*,i32,i32
 th06::ResultScreen::FreeScore,0x42bc5b,0x2a,__thiscall,,void,ResultScreen*,i32,i32
-th06::ResultScreen::HandleResultKeyboard,0x42bc85,0x64f,__thiscall,,u32,ResultScreen*
+th06::ResultScreen::HandleResultKeyboard,0x42bc85,0x64f,__thiscall,,void,ResultScreen*
 th06::ResultScreen::HandleReplaySaveKeyboard,0x42c2d4,0xdd0,__thiscall,,void,ResultScreen*
-th06::ResultScreen::MoveCursor,0x42d0a4,0xeb,__stdcall,,void,ResultScreen*,i32
-th06::ResultScreen::MoveCursor_2,0x42d18f,0x103,__thiscall,,u32,ResultScreen*,ResultScreen*,u32
-th06::ResultScreen::CheckConfirmButton,0x42d292,0xc8,__thiscall,,u32,ResultScreen*
+th06::ResultScreen::MoveCursor,0x42d0a4,0xeb,default,,void,ResultScreen*,i32
+th06::ResultScreen::MoveCursorHorizontally,0x42d18f,0x103,default,,i32,ResultScreen*,i32
+th06::ResultScreen::CheckConfirmButton,0x42d292,0xc8,__thiscall,,ZunResult,ResultScreen*
 th06::ResultScreen::DrawFinalStats,0x42d35a,0x419,__thiscall,,u32,ResultScreen*
 th06::ResultScreen::RegisterChain,0x42d773,0x12e,default,,ZunResult,i32
 th06::ResultScreen::ResultScreen,0x42d8a1,0xed,__thiscall,,void*,ResultScreen*
-th06::ResultScreen::OnUpdate,0x42d98e,0xab8,__stdcall,,ChainCallbackResult,ResultScreen*
+th06::ResultScreen::OnUpdate,0x42d98e,0xab8,default,,ChainCallbackResult,ResultScreen*
 th06::ResultScreen::OnDraw,0x42e446,0xc1a,default,,ChainCallbackResult,ResultScreen*
 th06::ResultScreen::AddedCallback,0x42f060,0x55c,default,,ZunResult,ResultScreen*
 th06::ResultScreen::DeletedCallback,0x42f5bc,0x108,default,,ZunResult,ResultScreen*