m_play (#50)

* m_play

* Some warnings

* lots of function renames from the gcn version

* fix warnings

* format

* a

* a

* PR

* PR2

---------

Co-authored-by: Maide <you@example.com>
Co-authored-by: angie <angheloalf95@gmail.com>

3 files changed, 95 insertions, 95 deletions

diff --git a/linker_scripts/jp/symbol_addrs_boot.txt b/linker_scripts/jp/symbol_addrs_boot.txt
index bc9b690..1d97817 100644
--- a/linker_scripts/jp/symbol_addrs_boot.txt
+++ b/linker_scripts/jp/symbol_addrs_boot.txt
@@ -507,9 +507,9 @@ RO_DBL_8003E8E8_jp = 0x8003E8E8; // type:f64
 RO_8003E8F0_jp = 0x8003E8F0; // type:s64
 RO_8003E8F8_jp = 0x8003E8F8; // type:s64
 
-gBuildTeam = 0x8003E900; // type:asciz
-gBuildDate = 0x8003E924; // type:asciz
-gBuildMakeOption = 0x8003E938; // type:asciz
+__Creator__ = 0x8003E900; // type:asciz
+__DateTime__ = 0x8003E924; // type:asciz
+__MakeOption__ = 0x8003E938; // type:asciz
 
 // .bss
 
diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt
index 60c0d72..51f9e9c 100644
--- a/linker_scripts/jp/symbol_addrs_code.txt
+++ b/linker_scripts/jp/symbol_addrs_code.txt
@@ -163,12 +163,12 @@ mAc_UnagiActorShadow = 0x80059AE0; // type:func
 mAc_ActorShadowCircle = 0x80059B34; // type:func
 mAc_ActorShadowEllipse = 0x80059B90; // type:func
 func_80059BF0_jp = 0x80059BF0; // type:func
-func_80059C24_jp = 0x80059C24; // type:func
+banti_move = 0x80059C24; // type:func
 func_80059EC0_jp = 0x80059EC0; // type:func
 func_8005A070_jp = 0x8005A070; // type:func
 func_8005A154_jp = 0x8005A154; // type:func
 func_8005A238_jp = 0x8005A238; // type:func
-func_8005A2FC_jp = 0x8005A2FC; // type:func
+banti_draw = 0x8005A2FC; // type:func
 func_8005ABA0_jp = 0x8005ABA0; // type:func
 func_8005ABE0_jp = 0x8005ABE0; // type:func
 func_8005ACA8_jp = 0x8005ACA8; // type:func
@@ -272,7 +272,7 @@ func_8005DC9C_jp = 0x8005DC9C; // type:func
 func_8005DCCC_jp = 0x8005DCCC; // type:func
 mBGMPsComp_make_ps_lost_fanfare = 0x8005DD2C; // type:func
 func_8005DD5C_jp = 0x8005DD5C; // type:func
-func_8005DDE4_jp = 0x8005DDE4; // type:func
+mBGMPsComp_make_ps_wipe = 0x8005DDE4; // type:func
 func_8005DE0C_jp = 0x8005DE0C; // type:func
 func_8005DE60_jp = 0x8005DE60; // type:func
 func_8005DE88_jp = 0x8005DE88; // type:func
@@ -500,8 +500,8 @@ func_80064F08_jp = 0x80064F08; // type:func
 func_80064F28_jp = 0x80064F28; // type:func
 func_80064F48_jp = 0x80064F48; // type:func
 func_80064F84_jp = 0x80064F84; // type:func
-func_80064FD8_jp = 0x80064FD8; // type:func
-func_80065028_jp = 0x80065028; // type:func
+Camera2_process = 0x80064FD8; // type:func
+Camera2_draw = 0x80065028; // type:func
 func_80065040_jp = 0x80065040; // type:func
 func_80065064_jp = 0x80065064; // type:func
 func_80065158_jp = 0x80065158; // type:func
@@ -705,7 +705,7 @@ func_8006BF0C_jp = 0x8006BF0C; // type:func
 func_8006C4B4_jp = 0x8006C4B4; // type:func
 func_8006C5A8_jp = 0x8006C5A8; // type:func
 func_8006C634_jp = 0x8006C634; // type:func
-func_8006C740_jp = 0x8006C740; // type:func
+mCoBG_CalcTimerDecalCircle = 0x8006C740; // type:func
 func_8006C7B4_jp = 0x8006C7B4; // type:func
 func_8006C8D0_jp = 0x8006C8D0; // type:func
 func_8006C910_jp = 0x8006C910; // type:func
@@ -892,8 +892,8 @@ func_80077410_jp = 0x80077410; // type:func
 func_800774B4_jp = 0x800774B4; // type:func
 func_80077580_jp = 0x80077580; // type:func
 func_80077620_jp = 0x80077620; // type:func
-func_80077640_jp = 0x80077640; // type:func
-func_80077650_jp = 0x80077650; // type:func
+CollisionCheck_dt = 0x80077640; // type:func
+CollisionCheck_clear = 0x80077650; // type:func
 CollisionCheck_setOC = 0x800776B4; // type:func
 func_80077794_jp = 0x80077794; // type:func
 func_800777D0_jp = 0x800777D0; // type:func
@@ -903,7 +903,7 @@ func_80077EF4_jp = 0x80077EF4; // type:func
 func_80077F20_jp = 0x80077F20; // type:func
 func_80077FF0_jp = 0x80077FF0; // type:func
 func_80078014_jp = 0x80078014; // type:func
-func_80078070_jp = 0x80078070; // type:func
+CollisionCheck_OC = 0x80078070; // type:func
 func_80078214_jp = 0x80078214; // type:func
 func_80078258_jp = 0x80078258; // type:func
 func_8007841C_jp = 0x8007841C; // type:func
@@ -1037,13 +1037,13 @@ func_8007CB28_jp = 0x8007CB28; // type:func
 func_8007CB50_jp = 0x8007CB50; // type:func
 func_8007CBEC_jp = 0x8007CBEC; // type:func
 func_8007CC9C_jp = 0x8007CC9C; // type:func
-func_8007CDB8_jp = 0x8007CDB8; // type:func
+mDemo_stock_clear = 0x8007CDB8; // type:func
 func_8007CDD8_jp = 0x8007CDD8; // type:func
 func_8007CF00_jp = 0x8007CF00; // type:func
 func_8007CF34_jp = 0x8007CF34; // type:func
 func_8007CF44_jp = 0x8007CF44; // type:func
 func_8007CF84_jp = 0x8007CF84; // type:func
-func_8007CFB4_jp = 0x8007CFB4; // type:func
+mDemo_Main = 0x8007CFB4; // type:func
 func_8007CFD8_jp = 0x8007CFD8; // type:func
 func_8007D030_jp = 0x8007D030; // type:func
 func_8007D048_jp = 0x8007D048; // type:func
@@ -1135,10 +1135,10 @@ func_8007F6A0_jp = 0x8007F6A0; // type:func
 func_8007F764_jp = 0x8007F764; // type:func
 func_8007F858_jp = 0x8007F858; // type:func
 func_8007F8A4_jp = 0x8007F8A4; // type:func
-func_8007F8DC_jp = 0x8007F8DC; // type:func
+mEv_2nd_init = 0x8007F8DC; // type:func
 func_8007F950_jp = 0x8007F950; // type:func
-func_8007F988_jp = 0x8007F988; // type:func
-func_8007FB44_jp = 0x8007FB44; // type:func
+mEv_run = 0x8007F988; // type:func
+mEv_finish = 0x8007FB44; // type:func
 func_8007FCB8_jp = 0x8007FCB8; // type:func
 func_8007FD40_jp = 0x8007FD40; // type:func
 func_8007FDA8_jp = 0x8007FDA8; // type:func
@@ -1208,36 +1208,36 @@ func_80082FA0_jp = 0x80082FA0; // type:func
 func_80083038_jp = 0x80083038; // type:func
 func_800831E0_jp = 0x800831E0; // type:func
 func_800835AC_jp = 0x800835AC; // type:func
-func_8008366C_jp = 0x8008366C; // type:func
-func_800836F8_jp = 0x800836F8; // type:func
+fbdemo_cleanup = 0x8008366C; // type:func
+fbdemo_init = 0x800836F8; // type:func
 func_80083870_jp = 0x80083870; // type:func
-func_80083984_jp = 0x80083984; // type:func
+fbdemo_draw = 0x80083984; // type:func
 func_80083AB0_jp = 0x80083AB0; // type:func
-func_80083BE4_jp = 0x80083BE4; // type:func
+fbdemo_move = 0x80083BE4; // type:func
 func_80083BF0_jp = 0x80083BF0; // type:func
-func_80083C00_jp = 0x80083C00; // type:func
-func_80083CBC_jp = 0x80083CBC; // type:func
+fbdemo_triforce_startup = 0x80083C00; // type:func
+fbdemo_triforce_init = 0x80083CBC; // type:func
 func_80083CE8_jp = 0x80083CE8; // type:func
-func_80083D14_jp = 0x80083D14; // type:func
-func_80083E08_jp = 0x80083E08; // type:func
-func_8008400C_jp = 0x8008400C; // type:func
-func_80084018_jp = 0x80084018; // type:func
-func_80084068_jp = 0x80084068; // type:func
-func_80084080_jp = 0x80084080; // type:func
-func_800840AC_jp = 0x800840AC; // type:func
-func_8008418C_jp = 0x8008418C; // type:func
-func_800843C8_jp = 0x800843C8; // type:func
-func_80084480_jp = 0x80084480; // type:func
-func_800844B0_jp = 0x800844B0; // type:func
+fbdemo_triforce_move = 0x80083D14; // type:func
+fbdemo_triforce_draw = 0x80083E08; // type:func
+fbdemo_triforce_is_finish = 0x8008400C; // type:func
+fbdemo_triforce_settype = 0x80084018; // type:func
+fbdemo_triforce_setcolor_rgba8888 = 0x80084068; // type:func
+fbdemo_wipe1_init = 0x80084080; // type:func
+fbdemo_wipe1_move = 0x800840AC; // type:func
+fbdemo_wipe1_draw = 0x8008418C; // type:func
+fbdemo_wipe1_startup = 0x800843C8; // type:func
+fbdemo_wipe1_settype = 0x80084480; // type:func
+fbdemo_wipe1_setcolor_rgba8888 = 0x800844B0; // type:func
 func_800844BC_jp = 0x800844BC; // type:func
-func_800844C8_jp = 0x800844C8; // type:func
-func_800844E0_jp = 0x800844E0; // type:func
-func_8008450C_jp = 0x8008450C; // type:func
-func_800845EC_jp = 0x800845EC; // type:func
-func_8008468C_jp = 0x8008468C; // type:func
-func_800846D4_jp = 0x800846D4; // type:func
-func_800846E0_jp = 0x800846E0; // type:func
-func_800846EC_jp = 0x800846EC; // type:func
+fbdemo_wipe1_is_finish = 0x800844C8; // type:func
+fbdemo_fade_init = 0x800844E0; // type:func
+fbdemo_fade_move = 0x8008450C; // type:func
+fbdemo_fade_draw = 0x800845EC; // type:func
+fbdemo_fade_startup = 0x8008468C; // type:func
+fbdemo_fade_settype = 0x800846D4; // type:func
+fbdemo_fade_setcolor_rgba8888 = 0x800846E0; // type:func
+fbdemo_fade_is_finish = 0x800846EC; // type:func
 func_80084700_jp = 0x80084700; // type:func
 func_80084748_jp = 0x80084748; // type:func
 func_800848AC_jp = 0x800848AC; // type:func
@@ -1588,13 +1588,13 @@ func_80092468_jp = 0x80092468; // type:func
 func_800924CC_jp = 0x800924CC; // type:func
 func_80092538_jp = 0x80092538; // type:func
 func_8009264C_jp = 0x8009264C; // type:func
-func_800928C0_jp = 0x800928C0; // type:func
-func_800928E8_jp = 0x800928E8; // type:func
+Balloon_init = 0x800928C0; // type:func
+Balloon_move = 0x800928E8; // type:func
 func_80092B7C_jp = 0x80092B7C; // type:func
 func_80092B8C_jp = 0x80092B8C; // type:func
 func_80092BA0_jp = 0x80092BA0; // type:func
 func_80092BE8_jp = 0x80092BE8; // type:func
-func_80092C2C_jp = 0x80092C2C; // type:func
+mHsRm_GetHuusuiRoom = 0x80092C2C; // type:func
 func_80092D10_jp = 0x80092D10; // type:func
 func_80092E14_jp = 0x80092E14; // type:func
 func_80092E80_jp = 0x80092E80; // type:func
@@ -1735,7 +1735,7 @@ func_80098158_jp = 0x80098158; // type:func
 func_800981B8_jp = 0x800981B8; // type:func
 func_8009836C_jp = 0x8009836C; // type:func
 func_800983F0_jp = 0x800983F0; // type:func
-func_800984CC_jp = 0x800984CC; // type:func
+Global_kankyo_set = 0x800984CC; // type:func
 func_80098558_jp = 0x80098558; // type:func
 func_8009867C_jp = 0x8009867C; // type:func
 func_80098794_jp = 0x80098794; // type:func
@@ -1743,7 +1743,7 @@ func_8009895C_jp = 0x8009895C; // type:func
 func_80098980_jp = 0x80098980; // type:func
 func_80098990_jp = 0x80098990; // type:func
 func_80098A90_jp = 0x80098A90; // type:func
-func_80098B50_jp = 0x80098B50; // type:func
+mEnv_WindMove = 0x80098B50; // type:func
 func_80098CCC_jp = 0x80098CCC; // type:func
 func_80098D88_jp = 0x80098D88; // type:func
 func_80098DE0_jp = 0x80098DE0; // type:func
@@ -2179,11 +2179,11 @@ func_800A2EAC_jp = 0x800A2EAC; // type:func
 func_800A3190_jp = 0x800A3190; // type:func
 func_800A31D8_jp = 0x800A31D8; // type:func
 func_800A3220_jp = 0x800A3220; // type:func
-func_800A32D0_jp = 0x800A32D0; // type:func
+mMsg_ct = 0x800A32D0; // type:func
 func_800A3304_jp = 0x800A3304; // type:func
 func_800A332C_jp = 0x800A332C; // type:func
-func_800A339C_jp = 0x800A339C; // type:func
-func_800A33D8_jp = 0x800A33D8; // type:func
+mMsg_Main = 0x800A339C; // type:func
+mMsg_Draw = 0x800A33D8; // type:func
 func_800A3400_jp = 0x800A3400; // type:func
 func_800A3420_jp = 0x800A3420; // type:func
 func_800A345C_jp = 0x800A345C; // type:func
@@ -2529,7 +2529,7 @@ func_800B1960_jp = 0x800B1960; // type:func
 func_800B19C4_jp = 0x800B19C4; // type:func
 func_800B1A28_jp = 0x800B1A28; // type:func
 func_800B1A60_jp = 0x800B1A60; // type:func
-func_800B1AA0_jp = 0x800B1AA0; // type:func
+mPlib_Object_Exchange_keep_Player_dt = 0x800B1AA0; // type:func
 func_800B1AE0_jp = 0x800B1AE0; // type:func
 func_800B1B3C_jp = 0x800B1B3C; // type:func
 func_800B1B6C_jp = 0x800B1B6C; // type:func
@@ -2708,7 +2708,7 @@ func_800B7350_jp = 0x800B7350; // type:func
 func_800B7468_jp = 0x800B7468; // type:func
 func_800B74E8_jp = 0x800B74E8; // type:func
 func_800B7560_jp = 0x800B7560; // type:func
-func_800B7624_jp = 0x800B7624; // type:func
+mPO_business_proc = 0x800B7624; // type:func
 func_800B7680_jp = 0x800B7680; // type:func
 func_800B7700_jp = 0x800B7700; // type:func
 func_800B7780_jp = 0x800B7780; // type:func
@@ -2873,7 +2873,7 @@ func_800BCFC8_jp = 0x800BCFC8; // type:func
 func_800BD02C_jp = 0x800BD02C; // type:func
 func_800BD1E4_jp = 0x800BD1E4; // type:func
 func_800BD2B0_jp = 0x800BD2B0; // type:func
-func_800BD37C_jp = 0x800BD37C; // type:func
+gfx_set_fog_nosync = 0x800BD37C; // type:func
 func_800BD3EC_jp = 0x800BD3EC; // type:func
 func_800BD428_jp = 0x800BD428; // type:func
 func_800BD448_jp = 0x800BD448; // type:func
@@ -2902,7 +2902,7 @@ func_800BD9FC_jp = 0x800BD9FC; // type:func
 func_800BDA20_jp = 0x800BDA20; // type:func
 two_tex_scroll = 0x800BDAA8; // type:func
 DisplayList_initialize = 0x800BDBB4; // type:func
-func_800BDF90_jp = 0x800BDF90; // type:func
+fade_rgba8888_draw = 0x800BDF90; // type:func
 func_800BE030_jp = 0x800BE030; // type:func
 fade_black_draw = 0x800BE070; // type:func
 func_800BE094_jp = 0x800BE094; // type:func
@@ -3043,23 +3043,23 @@ mSM_ovlptr_dllcnv = 0x800C4728; // type:func
 func_800C47B4_jp = 0x800C47B4; // type:func
 func_800C497C_jp = 0x800C497C; // type:func
 func_800C49D4_jp = 0x800C49D4; // type:func
-func_800C4C60_jp = 0x800C4C60; // type:func
+mSM_submenu_ovlptr_cleanup = 0x800C4C60; // type:func
 load_player = 0x800C4CC4; // type:func
-func_800C4D1C_jp = 0x800C4D1C; // type:func
-func_800C4D80_jp = 0x800C4D80; // type:func
+mSM_submenu_ct = 0x800C4D1C; // type:func
+mSM_submenu_dt = 0x800C4D80; // type:func
 func_800C4D8C_jp = 0x800C4D8C; // type:func
 func_800C4DB0_jp = 0x800C4DB0; // type:func
 func_800C4DD8_jp = 0x800C4DD8; // type:func
 func_800C4DFC_jp = 0x800C4DFC; // type:func
 func_800C4E2C_jp = 0x800C4E2C; // type:func
-func_800C4E58_jp = 0x800C4E58; // type:func
+mSM_submenu_ctrl = 0x800C4E58; // type:func
 func_800C50C4_jp = 0x800C50C4; // type:func
 func_800C50EC_jp = 0x800C50EC; // type:func
 func_800C510C_jp = 0x800C510C; // type:func
 func_800C5228_jp = 0x800C5228; // type:func
 func_800C524C_jp = 0x800C524C; // type:func
-func_800C5328_jp = 0x800C5328; // type:func
-func_800C535C_jp = 0x800C535C; // type:func
+mSM_submenu_move = 0x800C5328; // type:func
+mSM_submenu_draw = 0x800C535C; // type:func
 func_800C53B8_jp = 0x800C53B8; // type:func
 func_800C543C_jp = 0x800C543C; // type:func
 func_800C54A8_jp = 0x800C54A8; // type:func
@@ -3087,7 +3087,7 @@ func_800C5D68_jp = 0x800C5D68; // type:func
 func_800C5E10_jp = 0x800C5E10; // type:func
 func_800C5EA0_jp = 0x800C5EA0; // type:func
 func_800C5F0C_jp = 0x800C5F0C; // type:func
-func_800C5F64_jp = 0x800C5F64; // type:func
+mSc_dmacopy_data_bank = 0x800C5F64; // type:func
 mSc_bank_regist_check = 0x800C60EC; // type:func
 func_800C6144_jp = 0x800C6144; // type:func
 mSc_regist_initial_exchange_bank = 0x800C61CC; // type:func
@@ -3150,11 +3150,11 @@ mSN_snowman_init = 0x800C8D04; // type:func
 func_800C8D40_jp = 0x800C8D40; // type:func
 func_800C8D98_jp = 0x800C8D98; // type:func
 func_800C8E08_jp = 0x800C8E08; // type:func
-func_800C8E50_jp = 0x800C8E50; // type:func
+mTD_player_keydata_init = 0x800C8E50; // type:func
 func_800C8ECC_jp = 0x800C8ECC; // type:func
 func_800C8F5C_jp = 0x800C8F5C; // type:func
 func_800C8F84_jp = 0x800C8F84; // type:func
-func_800C8FB8_jp = 0x800C8FB8; // type:func
+title_demo_move = 0x800C8FB8; // type:func
 func_800C9010_jp = 0x800C9010; // type:func
 func_800C9088_jp = 0x800C9088; // type:func
 mTD_get_titledemo_no = 0x800C909C; // type:func
@@ -3174,7 +3174,7 @@ func_800C9728_jp = 0x800C9728; // type:func
 func_800C98A0_jp = 0x800C98A0; // type:func
 func_800C9D38_jp = 0x800C9D38; // type:func
 func_800C9F88_jp = 0x800C9F88; // type:func
-func_800CA008_jp = 0x800CA008; // type:func
+mTRC_move = 0x800CA008; // type:func
 func_800CA070_jp = 0x800CA070; // type:func
 mTM_set_season = 0x800CA1DC; // type:func
 func_800CA230_jp = 0x800CA230; // type:func
@@ -3209,8 +3209,8 @@ showPerspectiveOverLayView = 0x800CB7B0; // type:func
 showOrthoView1 = 0x800CBA70; // type:func
 showView1 = 0x800CBC00; // type:func
 func_800CBF80_jp = 0x800CBF80; // type:func
-func_800CBFBC_jp = 0x800CBFBC; // type:func
-func_800CC3EC_jp = 0x800CC3EC; // type:func
+watch_my_step_move = 0x800CBFBC; // type:func
+watch_my_step_draw = 0x800CC3EC; // type:func
 func_800CC9C4_jp = 0x800CC9C4; // type:func
 func_800CC9EC_jp = 0x800CC9EC; // type:func
 func_800CCB44_jp = 0x800CCB44; // type:func
@@ -3374,7 +3374,7 @@ func_800D227C_jp = 0x800D227C; // type:func
 func_800D22A4_jp = 0x800D22A4; // type:func
 func_800D22CC_jp = 0x800D22CC; // type:func
 func_800D22F4_jp = 0x800D22F4; // type:func
-func_800D2314_jp = 0x800D2314; // type:func
+sAdo_BgmFadeoutCheck = 0x800D2314; // type:func
 func_800D2334_jp = 0x800D2334; // type:func
 func_800D2354_jp = 0x800D2354; // type:func
 func_800D2360_jp = 0x800D2360; // type:func
diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt
index 4596d7f..475cc3a 100644
--- a/linker_scripts/jp/symbol_addrs_overlays.txt
+++ b/linker_scripts/jp/symbol_addrs_overlays.txt
@@ -181,34 +181,34 @@ func_808029D0_jp = 0x808029D0; // type:func
 first_game_cleanup = 0x80802A20; // type:func
 first_game_init = 0x80802A2C; // type:func
 func_80802A60_jp = 0x80802A60; // type:func
-func_80802AE0_jp = 0x80802AE0; // type:func
-func_80802B40_jp = 0x80802B40; // type:func
-func_80802B64_jp = 0x80802B64; // type:func
-func_80802B8C_jp = 0x80802B8C; // type:func
-func_80802BB8_jp = 0x80802BB8; // type:func
-func_80802BF4_jp = 0x80802BF4; // type:func
-func_80802C90_jp = 0x80802C90; // type:func
-func_80802CBC_jp = 0x80802CBC; // type:func
-func_80802D9C_jp = 0x80802D9C; // type:func
-func_80802DF0_jp = 0x80802DF0; // type:func
-func_80802E10_jp = 0x80802E10; // type:func
-func_80802E34_jp = 0x80802E34; // type:func
-func_80802E74_jp = 0x80802E74; // type:func
-func_808030D0_jp = 0x808030D0; // type:func
-func_80803124_jp = 0x80803124; // type:func
-func_80803174_jp = 0x80803174; // type:func
+Game_play_Reset_destiny = 0x80802AE0; // type:func
+event_title_flag_on = 0x80802B40; // type:func
+event_title_flag_off = 0x80802B64; // type:func
+Game_play_camera_proc = 0x80802B8C; // type:func
+Game_play_fbdemo_wipe_destroy = 0x80802BB8; // type:func
+Game_play_fbdemo_wipe_create_sub = 0x80802BF4; // type:func
+Game_play_fbdemo_wipe_create = 0x80802C90; // type:func
+Game_play_fbdemo_wipe_init = 0x80802CBC; // type:func
+Game_play_fbdemo_fade_in_move_end = 0x80802D9C; // type:func
+Game_play_fbdemo_fade_out_start_emu_move_end = 0x80802DF0; // type:func
+Game_play_fbdemo_fade_out_game_end_move_end = 0x80802E10; // type:func
+Game_play_change_scene_move_end = 0x80802E34; // type:func
+Game_play_fbdemo_wipe_move = 0x80802E74; // type:func
+Game_play_fbdemo_wipe_proc = 0x808030D0; // type:func
+game_play_set_fog = 0x80803124; // type:func
+Game_play_fbdemo_proc = 0x80803174; // type:func
 play_cleanup = 0x80803210; // type:func
 play_init = 0x808032F8; // type:func
-func_80803544_jp = 0x80803544; // type:func
-func_8080367C_jp = 0x8080367C; // type:func
+Game_play_move_fbdemo_not_move = 0x80803544; // type:func
+Game_play_move = 0x8080367C; // type:func
 func_80803810_jp = 0x80803810; // type:func
-func_808039D0_jp = 0x808039D0; // type:func
-func_80803A18_jp = 0x80803A18; // type:func
-func_80803A40_jp = 0x80803A40; // type:func
-func_80803B08_jp = 0x80803B08; // type:func
-func_80803E40_jp = 0x80803E40; // type:func
-func_80803F48_jp = 0x80803F48; // type:func
-func_8080407C_jp = 0x8080407C; // type:func
+setupFog = 0x808039D0; // type:func
+setupViewer = 0x80803A18; // type:func
+setupViewMatrix = 0x80803A40; // type:func
+makeBumpTexture = 0x80803B08; // type:func
+draw_version = 0x80803E40; // type:func
+Game_play_draw = 0x80803F48; // type:func
+play_main = 0x8080407C; // type:func
 func_80804138_jp = 0x80804138; // type:func
 func_808041A4_jp = 0x808041A4; // type:func
 Gameplay_Scene_Init = 0x808041C4; // type:func
@@ -233,10 +233,10 @@ jtbl_80804410_jp = 0x80804410; // type:jtbl
 
 // .bss
 
-B_80804480_jp = 0x80804480; //
+fbdemo = 0x80804480; //
 B_8080455C_jp = 0x8080455C; //
-B_80804560_jp = 0x80804560; // type:s16
-B_80804562_jp = 0x80804562; // type:s16
+S_back_title_timer = 0x80804560; // type:s16
+S_se_endcheck_timeout = 0x80804562; // type:s16
 
 // .text