summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPheenoh <pheenoh@gmail.com>2021-02-20 23:11:44 -0500
committerPheenoh <pheenoh@gmail.com>2021-02-20 23:11:44 -0500
commit5fbe9419f9af28560497f42eb951cd029ceb44d7 (patch)
tree71671448e2411935f1de58253fca3bf856c14dab /src
parentd102f73e7a1bb18745cdedc034baee3c88aeb065 (diff)
delete variables.h
Diffstat (limited to 'src')
-rw-r--r--src/d/d_a/d_a_alink.cpp663
-rw-r--r--src/d/d_attention.cpp58
-rw-r--r--src/d/d_camera.cpp220
-rw-r--r--src/d/d_com/d_com_inf_game.cpp42
-rw-r--r--src/d/d_file/d_file_sel_info.cpp11
-rw-r--r--src/d/d_item/d_item.cpp14
-rw-r--r--src/d/d_kankyo.cpp209
-rw-r--r--src/d/d_kankyo/d_kankyo_data.cpp13
-rw-r--r--src/d/d_kankyo/d_kankyo_rain.cpp340
-rw-r--r--src/d/d_kankyo/d_kankyo_wether.cpp71
-rw-r--r--src/d/d_kantera_icon_meter.cpp11
-rw-r--r--src/d/d_lib.cpp9
-rw-r--r--src/d/d_meter/d_meter_HIO.cpp174
-rw-r--r--src/d/d_meter/d_meter_button.cpp39
-rw-r--r--src/d/d_meter/d_meter_haihai.cpp26
-rw-r--r--src/d/d_meter/d_meter_hakusha.cpp17
-rw-r--r--src/d/d_meter/d_meter_map.cpp17
-rw-r--r--src/d/d_meter/d_meter_string.cpp21
-rw-r--r--src/d/d_meter2.cpp26
-rw-r--r--src/d/d_meter2/d_meter2_draw.cpp95
-rw-r--r--src/d/d_meter2/d_meter2_info.cpp24
-rw-r--r--src/d/d_save/d_save.cpp18
-rw-r--r--src/d/d_stage.cpp41
-rw-r--r--src/f/f_ap_game.cpp1
-rw-r--r--src/f/f_op/f_op_actor_mng.cpp8
-rw-r--r--src/f/f_op/f_op_msg_mng.cpp3
-rw-r--r--src/f/f_op/f_op_scene_iter.cpp2
-rw-r--r--src/f/f_op/f_op_scene_mng.cpp2
-rw-r--r--src/f/f_pc/f_pc_manager.cpp4
-rw-r--r--src/m_Do/m_Do_MemCard.cpp1
-rw-r--r--src/m_Do/m_Do_MemCardRWmng.cpp1
-rw-r--r--src/m_Do/m_Do_Reset.cpp7
-rw-r--r--src/m_Do/m_Do_audio.cpp18
-rw-r--r--src/m_Do/m_Do_controller_pad.cpp9
-rw-r--r--src/m_Do/m_Do_ext.cpp15
-rw-r--r--src/m_Do/m_Do_graphic.cpp11
-rw-r--r--src/m_Do/m_Do_machine.cpp6
-rw-r--r--src/m_Do/m_Do_machine_exception.cpp1
-rw-r--r--src/m_Do/m_Do_main.cpp55
-rw-r--r--src/m_Do/m_Do_mtx.cpp4
-rw-r--r--src/m_Do/m_Do_printf.cpp5
41 files changed, 2278 insertions, 34 deletions
diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp
index e29d9fe3f0..9625ea80a4 100644
--- a/src/d/d_a/d_a_alink.cpp
+++ b/src/d/d_a/d_a_alink.cpp
@@ -1332,6 +1332,669 @@ void Z2SeqMgr_NS_taktModeMute(void);
void Z2SeqMgr_NS_taktModeMuteOff(void);
}
+class j3dsys {
+public:
+ Mtx mtx;
+};
+
+extern j3dsys lbl_80434AC8;
+// additional symbols needed for d_alink.cpp
+// autogenerated by split.py v0.3 at 2020-12-28 03:48:23.905248
+extern u8 lbl_803B2E20;
+extern u8 lbl_80452DA8;
+extern u8 lbl_80430D3C;
+extern u8 lbl_803C35A4;
+extern u8 lbl_80452CD4;
+extern u8 lbl_80453288;
+extern u8 lbl_8038F748;
+extern u8 lbl_80452D00;
+extern u8 lbl_80453330;
+extern u8 lbl_804255D4;
+extern u8 lbl_8045324C;
+extern u8 lbl_80452E08;
+extern float lbl_80452EAC;
+extern u8 lbl_804532B8;
+extern u8 lbl_8038DB40;
+extern u8 lbl_80452E10;
+extern u8 lbl_8045101E;
+extern u8 lbl_80452FB4;
+extern u8 lbl_80453254;
+extern u8 lbl_80453294;
+extern u8 lbl_80452FC8;
+extern u8 lbl_804248D0;
+extern u8 lbl_804255EC;
+extern u8 lbl_8045323C;
+extern u8 lbl_80452EE8;
+extern u8 lbl_8038F124;
+extern u8 lbl_80453368;
+extern u8 lbl_803AC31C;
+extern u8 lbl_8038EF70;
+extern u8 lbl_80452FB0;
+extern u8 lbl_80452D7C;
+extern u8 lbl_80452F6C;
+extern u8 lbl_80453010;
+extern u8 lbl_80453190;
+extern u8 lbl_80452CA8;
+extern u8 lbl_80392094;
+extern u8 lbl_8038E6C8;
+extern u8 lbl_8038F1A0;
+extern u8 lbl_80453068;
+extern u8 lbl_8038D768;
+extern u8 lbl_8045336C;
+extern u8 lbl_80452DF4;
+extern u8 lbl_80452F58;
+extern u8 lbl_8038E2B0;
+extern u8 lbl_80452E68;
+extern u8 lbl_80452D78;
+extern u8 lbl_80450FD1;
+extern u8 lbl_80452EC0;
+extern u8 lbl_80452D64;
+extern u8 lbl_80452E0C;
+extern u8 lbl_8038F29C;
+extern u8 lbl_8038F048;
+extern u8 lbl_80452D10;
+extern u8 lbl_80453060;
+extern u8 lbl_80452F1C;
+extern u8 lbl_804531A0;
+extern u8 lbl_80453134;
+extern u8 lbl_8038F46C;
+extern u8 lbl_80391D94;
+extern u8 lbl_80453138;
+extern u8 lbl_80453218;
+extern u8 lbl_8038EE28;
+extern u8 lbl_80453310;
+extern u8 lbl_80453338;
+extern u8 lbl_803A86D0;
+extern u8 lbl_80452F2C;
+extern u8 lbl_80452E8C;
+extern u8 lbl_8038F858;
+extern u8 lbl_80452FE8;
+extern u8 lbl_80452F80;
+extern u8 lbl_80452DA0;
+extern u8 lbl_8038F0A8;
+extern u8 lbl_80452E38;
+extern u8 lbl_8038D864;
+extern u8 lbl_80452E9C;
+extern u8 lbl_80452ED8;
+extern u8 lbl_803AF99C;
+extern u8 lbl_80452ED0;
+extern u8 lbl_80452E28;
+extern u8 lbl_80453378;
+extern u8 lbl_803A7904;
+extern u8 lbl_80453334;
+extern u8 lbl_80452E70;
+extern u8 lbl_80453018;
+extern u8 lbl_80391978;
+extern u8 lbl_80453370;
+extern u8 lbl_80391734;
+extern u8 lbl_8038F7A4;
+extern u8 lbl_80453084;
+extern u8 lbl_80453284;
+extern u8 lbl_80452EC8;
+extern u8 lbl_803A83A0;
+extern u8 lbl_80452DDC;
+extern u8 lbl_803B35C8;
+extern u8 lbl_803B2F28;
+extern u8 lbl_80453194;
+extern u8 lbl_80453154;
+extern u8 lbl_8045101C;
+extern u8 lbl_80453320;
+extern u8 lbl_804532E4;
+extern u8 lbl_8038E1E0;
+extern u8 lbl_80453268;
+extern u8 lbl_80452FD0;
+extern u8 lbl_80453074;
+extern u8 lbl_8038F578;
+extern u8 lbl_80450B38;
+extern u8 lbl_80452E20;
+extern u8 lbl_803B2EC8;
+extern u8 lbl_8038DE8C;
+extern u8 lbl_8038DF9C;
+extern u8 lbl_804531A4;
+extern u8 lbl_803914A8;
+extern u8 lbl_8045315C;
+extern u8 lbl_8038E840;
+extern u8 lbl_804532DC;
+extern u8 lbl_803A0004;
+extern u8 lbl_80450FC4;
+extern u8 lbl_80452D20;
+extern u8 lbl_80453188;
+extern u8 lbl_8045313C;
+extern u8 lbl_8045328C;
+extern u8 lbl_80450FB9;
+extern u8 lbl_80453030;
+extern u8 lbl_8045318C;
+extern u8 lbl_8038FA90;
+extern u8 lbl_8038FB50;
+extern u8 lbl_8045339C;
+extern u8 lbl_80391BAC;
+extern u8 lbl_80453168;
+extern u8 lbl_80452F74;
+extern u8 lbl_80452D30;
+extern u8 lbl_80391D84;
+extern u8 lbl_8038FB44;
+extern u8 lbl_803790C0;
+extern u8 lbl_804256CC;
+extern u8 lbl_80452E80;
+extern u8 lbl_803B29AC;
+extern u8 lbl_80425514;
+extern u8 lbl_80452FCC;
+extern u8 lbl_80391E18;
+extern u8 lbl_80453080;
+extern u8 lbl_804532E0;
+extern u8 lbl_80453024;
+extern u8 lbl_80453258;
+extern u8 lbl_80453358;
+extern u8 lbl_803919D8;
+extern u8 lbl_8038F95C;
+extern u8 lbl_80452DCC;
+extern u8 lbl_80453300;
+extern u8 lbl_80452F54;
+extern u8 lbl_8038D82C;
+extern u8 lbl_80450FBC;
+extern u8 lbl_804532BC;
+extern u8 lbl_80453398;
+extern u8 lbl_80452F44;
+extern u8 lbl_8038F558;
+extern u8 lbl_80452D1C;
+extern u8 lbl_80453394;
+extern u8 lbl_8038D664;
+extern u8 lbl_8038D7BC;
+extern u8 lbl_80391C30;
+extern u8 lbl_80453214;
+extern u8 lbl_80452FF0;
+extern u8 lbl_803B3580;
+extern u8 lbl_80453054;
+extern u8 lbl_804532EC;
+extern u8 lbl_80452E84;
+extern u8 lbl_8045307C;
+extern u8 lbl_8038F138;
+extern u8 lbl_80452D6C;
+extern u8 lbl_80453040;
+extern u8 lbl_80452E50;
+extern u8 lbl_80391B5C;
+extern u8 lbl_80452D44;
+extern u8 lbl_803919E4;
+extern u8 lbl_80452DC4;
+extern u8 lbl_804532A0;
+extern u8 lbl_80425508;
+extern u8 lbl_80452EB0;
+extern u8 lbl_80453260;
+extern u8 lbl_80450690;
+extern u8 lbl_8038EBFC;
+extern u8 lbl_803B2DA0;
+extern u8 lbl_80453000;
+extern u8 lbl_80452CC8;
+extern u8 lbl_803C3540;
+extern u8 lbl_80453180;
+extern u8 lbl_80452D60;
+extern u8 lbl_80452CA0;
+extern u8 lbl_80392034;
+extern u8 lbl_8038EB50;
+extern u8 lbl_80452E00;
+extern u8 lbl_804255BC;
+extern u8 lbl_8038F5B4;
+extern u8 lbl_80391D38;
+extern u8 lbl_803919FC;
+extern u8 lbl_80452D9C;
+extern u8 lbl_803919F0;
+extern u8 lbl_803B2798;
+extern u8 lbl_80452FBC;
+extern u8 lbl_804256AC;
+extern u8 lbl_8038E11C;
+extern u8 lbl_80391E78;
+extern u8 lbl_80452D08;
+extern u8 lbl_8045325C;
+extern u8 lbl_80453328;
+extern u8 lbl_803A7218;
+extern u8 lbl_8045304C;
+extern u8 lbl_804531B8;
+extern u8 lbl_80452CBC;
+extern u8 lbl_80452D74;
+extern u8 lbl_8038E1B8;
+extern u8 lbl_804531D4;
+extern u8 lbl_8038FCA8;
+extern u8 lbl_80452D4C;
+extern u8 lbl_80452CDC;
+extern u8 lbl_8038E658;
+extern u8 lbl_80453004;
+extern u8 lbl_80391960;
+extern u8 lbl_804515D0;
+extern u8 lbl_80453014;
+extern u8 lbl_80452FC0;
+extern u8 lbl_80452DD4;
+extern u8 lbl_803B2D88;
+extern u8 lbl_803F1C48;
+extern u8 lbl_80453044;
+extern u8 lbl_80453088;
+extern u8 lbl_8038E7CC;
+extern u8 lbl_80452DC0;
+extern u8 lbl_8038FB5C;
+extern u8 lbl_8038E49C;
+extern u8 lbl_80453230;
+extern u8 lbl_80406194;
+extern u8 lbl_803A33B8;
+extern u8 lbl_80453144;
+extern u8 lbl_8038FAC0;
+extern u8 lbl_8038DF70;
+extern u8 lbl_8045312C;
+extern u8 lbl_80452E30;
+extern u8 lbl_80452D8C;
+extern u8 lbl_80452EFC;
+extern u8 lbl_8038EAFC;
+extern u8 lbl_80452D48;
+extern u8 lbl_8045319C;
+extern u8 lbl_80453070;
+extern u8 lbl_80452FF4;
+extern u8 lbl_80391ECC;
+extern u8 lbl_8038F6F4;
+extern u8 lbl_8038E610;
+extern u8 lbl_80453240;
+extern u8 lbl_8038F3B4;
+extern u8 lbl_80450CD0;
+extern u8 lbl_80453078;
+extern u8 lbl_8045338C;
+extern u8 lbl_80452D04;
+extern u8 lbl_804532C0;
+extern u8 lbl_80453008;
+extern u8 lbl_80452F39;
+extern u8 lbl_80453198;
+extern u8 lbl_803918B8;
+extern u8 lbl_80452F8C;
+extern u8 lbl_80453178;
+extern u8 lbl_804532F8;
+extern u8 lbl_80452E88;
+extern u8 lbl_80452F70;
+extern u8 lbl_8038F618;
+extern u8 lbl_80453344;
+extern u8 lbl_8038DF28;
+extern u8 lbl_8038E90C;
+extern u8 lbl_80452EA8;
+extern u8 lbl_803B2EF8;
+extern u8 lbl_803B321C;
+extern u8 lbl_80452FE4;
+extern u8 lbl_80452E94;
+extern u8 lbl_80452F60;
+extern u8 lbl_8038D658;
+extern u8 lbl_80452EEC;
+extern u8 lbl_80453050;
+extern u8 lbl_80453224;
+extern u8 lbl_8045334C;
+extern u8 lbl_8038EA30;
+extern u8 lbl_80453038;
+extern u8 lbl_8038F23C;
+extern u8 lbl_8038E164;
+extern u8 lbl_80452F28;
+extern u8 lbl_8038FA6C;
+extern u8 lbl_80453090;
+extern u8 lbl_804531BC;
+extern u8 lbl_80450FBA;
+extern u8 lbl_80452E40;
+extern u8 lbl_80452E7C;
+extern u8 lbl_803918C4;
+extern u8 lbl_80452DD8;
+extern u8 lbl_80452E24;
+extern u8 lbl_804256B8;
+extern u8 lbl_8039199C;
+extern u8 lbl_8045326C;
+extern u8 lbl_80452EB4;
+extern u8 lbl_804531C0;
+extern u8 lbl_80452E34;
+extern u8 lbl_80453238;
+extern u8 lbl_804532F0;
+extern u8 lbl_80453354;
+extern u8 lbl_80453244;
+extern u8 lbl_80450CD8;
+extern u8 lbl_80452DBC;
+extern u8 lbl_80452D98;
+extern u8 lbl_80450FC0;
+extern u8 lbl_8045306C;
+extern u8 lbl_8038F3F0;
+extern u8 lbl_80450FCC;
+extern u8 lbl_80452DC8;
+extern u8 lbl_80452EA0;
+extern u8 lbl_80453388;
+extern u8 lbl_80452D28;
+extern u8 lbl_80452FA4;
+extern u8 lbl_803F1D80;
+extern u8 lbl_803B2F70;
+extern u8 lbl_8038EC48;
+extern u8 lbl_8038E01C;
+extern u8 lbl_8038F8B4;
+extern u8 lbl_803A3354;
+extern u8 lbl_80452DE4;
+extern u8 lbl_8038D6BC;
+extern u8 lbl_8045321C;
+extern u8 lbl_8038EB8C;
+extern u8 lbl_80452DAC;
+extern u8 lbl_80452D84;
+extern u8 lbl_80452E3C;
+extern u8 lbl_80452F24;
+extern u8 lbl_80452D70;
+extern u8 lbl_803F1CC4;
+extern u8 lbl_80452ECC;
+extern u8 lbl_80452D2C;
+extern u8 lbl_804532D8;
+extern u8 lbl_80452EBC;
+extern u8 lbl_80450FBB;
+extern u8 lbl_804532CC;
+extern u8 lbl_8045308C;
+extern u8 lbl_803BA14C;
+extern u8 lbl_80391A5C;
+extern u8 lbl_80453298;
+extern u8 lbl_804530BC;
+extern u8 lbl_80450694;
+extern u8 lbl_80391F2C;
+extern u8 lbl_803A8554;
+extern u8 lbl_803B3564;
+extern u8 lbl_80452E58;
+extern u8 lbl_80453184;
+extern u8 lbl_804532A4;
+extern u8 lbl_80452DFC;
+extern u8 lbl_804533A0;
+extern u8 lbl_8038DAEC;
+extern u8 lbl_803B2B68;
+extern u8 lbl_804531D0;
+extern u8 lbl_804256F8;
+extern u8 lbl_8045305C;
+extern u8 lbl_8042561C;
+extern u8 lbl_803A33E4;
+extern u8 lbl_8042552C;
+extern u8 lbl_80391E48;
+extern u8 lbl_80391D44;
+extern u8 lbl_804255A4;
+extern u8 lbl_804532AC;
+extern u8 lbl_80452F04;
+extern u8 lbl_80391A2C;
+extern u8 lbl_8038EFA8;
+extern u8 lbl_80452D90;
+extern u8 lbl_804532F4;
+extern u8 lbl_803AF990;
+extern u8 lbl_803AC170;
+extern u8 lbl_803B32B8;
+extern u8 lbl_8042555C;
+extern u8 lbl_8038F7DC;
+extern u8 lbl_804532C8;
+extern u8 lbl_8039196C;
+extern u8 lbl_80453274;
+extern u8 lbl_80452E98;
+extern u8 lbl_803A8578;
+extern u8 lbl_80450FC5;
+extern u8 lbl_8038DDB8;
+extern u8 lbl_80453220;
+extern u8 lbl_80452FB8;
+extern u8 lbl_8038EA70;
+extern u8 lbl_8038E77C;
+extern u8 lbl_80453318;
+extern u8 lbl_80452FEC;
+extern u8 lbl_80452EB8;
+extern u8 lbl_80453118;
+extern u8 lbl_8038ED2C;
+extern u8 lbl_8045301C;
+extern u8 lbl_80453280;
+extern u8 lbl_80391E3C;
+extern u8 lbl_8039201C;
+extern u8 lbl_80452F78;
+extern u8 lbl_803AC2E4;
+extern u8 lbl_80452E1C;
+extern u8 lbl_80452FA0;
+extern u8 lbl_80453140;
+extern u8 lbl_80452D24;
+extern u8 lbl_80452CAC;
+extern u8 lbl_80452FE0;
+extern u8 lbl_80450FC7;
+extern u8 lbl_803CEE60;
+extern u8 lbl_80453248;
+extern u8 lbl_803B35A0;
+extern u8 lbl_8045317C;
+extern u8 lbl_803B35EC;
+extern u8 lbl_80452E14;
+extern u8 lbl_80452EC4;
+extern u8 lbl_803A37C0;
+extern u8 lbl_80453390;
+extern u8 lbl_8038E36C;
+extern u8 lbl_80452D54;
+extern u8 lbl_80453374;
+extern u8 lbl_80452DA4;
+extern u8 lbl_80453120;
+extern u8 lbl_80453348;
+extern u8 lbl_80452E2C;
+extern u8 lbl_80391A50;
+extern u8 lbl_80452EF4;
+extern u8 lbl_80452E48;
+extern u8 lbl_80452DE8;
+extern u8 lbl_804531B4;
+extern u8 lbl_8038F3C4;
+extern u8 lbl_80450698;
+extern u8 lbl_80453174;
+extern u8 lbl_8038DD44;
+extern u8 lbl_803C3608;
+extern u8 lbl_80452F38;
+extern u8 lbl_803A3360;
+extern u8 lbl_8038DB84;
+extern u8 lbl_8038E210;
+extern u8 lbl_80450FC6;
+extern u8 lbl_80452F34;
+extern u8 lbl_8045302C;
+extern u8 lbl_80453350;
+extern u8 lbl_80453048;
+extern u8 lbl_80453264;
+extern u8 lbl_804532C4;
+extern u8 lbl_80391E24;
+extern u8 lbl_80453250;
+extern u8 lbl_80453308;
+extern u8 lbl_803A720C;
+extern u8 lbl_80452D94;
+extern u8 lbl_80452E6C;
+extern u8 lbl_8038E454;
+extern u8 lbl_80453124;
+extern u8 lbl_8038FA54;
+extern u8 lbl_803ABFC0;
+extern u8 lbl_804532A8;
+extern u8 lbl_8038F658;
+extern u8 lbl_8038F374;
+extern u8 lbl_8045335C;
+extern u8 lbl_80452F40;
+extern u8 lbl_8042558C;
+extern u8 lbl_80452F4C;
+extern u8 lbl_80453034;
+extern u8 lbl_80391E8C;
+extern u8 lbl_8038E714;
+extern u8 lbl_803918DC;
+extern u8 lbl_80391A14;
+extern u8 lbl_804531B0;
+extern u8 lbl_8038EF28;
+extern u8 lbl_80452F3C;
+extern u8 lbl_80391D54;
+extern u8 lbl_80453384;
+extern u8 lbl_80452F18;
+extern u8 lbl_8038D714;
+extern u8 lbl_803A8748;
+extern u8 lbl_80453380;
+extern u8 lbl_80452F90;
+extern u8 lbl_8045311C;
+extern u8 lbl_80452EA4;
+extern u8 lbl_80452F00;
+extern u8 lbl_8038D8CC;
+extern u8 lbl_803B35B4;
+extern u8 lbl_804531A8;
+extern u8 lbl_80452FFC;
+extern u8 lbl_80452E04;
+extern u8 lbl_80452E74;
+extern u8 lbl_80452F64;
+extern u8 lbl_8038E870;
+extern u8 lbl_8038F010;
+extern u8 lbl_804532B4;
+extern u8 lbl_80452F88;
+extern u8 lbl_803B0A28;
+extern u8 lbl_803C36D0;
+extern u8 lbl_80452D80;
+extern u8 lbl_8038E24C;
+extern u8 lbl_80453270;
+extern u8 lbl_8038E428;
+extern u8 lbl_80450FBD;
+extern u8 lbl_80452CA4;
+extern u8 lbl_80452F5C;
+extern u8 lbl_80453360;
+extern u8 lbl_8038F9F8;
+extern u8 lbl_80452EF0;
+extern u8 lbl_80453234;
+extern u8 lbl_80391BB8;
+extern u8 lbl_80452D0C;
+extern u8 lbl_80452F50;
+extern u8 lbl_80452F7C;
+extern u8 lbl_80452F9C;
+extern u8 lbl_8045337C;
+extern u8 lbl_804532D0;
+extern u8 lbl_803A338C;
+extern u8 lbl_80391E30;
+extern u8 lbl_80452F68;
+extern u8 lbl_80452FC4;
+extern u8 lbl_80453160;
+extern u8 lbl_8038E1F4;
+extern u8 lbl_8038FBBC;
+extern u8 lbl_80391EC0;
+extern u8 lbl_80450FD0;
+extern u8 lbl_80452FD8;
+extern u8 lbl_80452D38;
+extern u8 lbl_804532D4;
+extern u8 lbl_80391954;
+extern u8 lbl_80452CD8;
+extern u8 lbl_804531CC;
+extern u8 lbl_80450E20;
+extern u8 lbl_8038E54C;
+extern u8 lbl_80453164;
+extern u8 lbl_80425634;
+extern u8 lbl_803AC050;
+extern u8 lbl_8045316C;
+extern u8 lbl_80452EF8;
+extern u8 lbl_804532E8;
+extern u8 lbl_803A382C;
+extern u8 lbl_803A357C;
+extern u8 lbl_80452D40;
+extern u8 lbl_80452E64;
+extern u8 lbl_80450DF8;
+extern u8 lbl_80452DB4;
+extern u8 lbl_80391A08;
+extern u8 lbl_803CD97C;
+extern u8 lbl_80452EE4;
+extern u8 lbl_80452F10;
+extern u8 lbl_8038DC9C;
+extern u8 lbl_80452F94;
+extern u8 lbl_80450608;
+extern u8 lbl_80452D58;
+extern u8 lbl_8038DE18;
+extern u8 lbl_803B3590;
+extern u8 lbl_80452F98;
+extern u8 lbl_803A3468;
+extern u8 lbl_8038E7F4;
+extern u8 lbl_80452EE0;
+extern u8 lbl_804531C8;
+extern u8 lbl_80452FD4;
+extern u8 lbl_803B2CEC;
+extern u8 lbl_80452DD0;
+extern u8 lbl_80452F14;
+extern u8 lbl_80452F30;
+extern u8 lbl_80452F84;
+extern u8 lbl_80453290;
+extern u8 lbl_80450620;
+extern u8 lbl_80452CD0;
+extern u8 lbl_80391B7C;
+extern u8 lbl_80452F20;
+extern u8 lbl_803B2D94;
+extern u8 lbl_8038E068;
+extern u8 lbl_8038E4C0;
+extern u8 lbl_80452E18;
+extern u8 lbl_80453148;
+extern u8 lbl_80453064;
+extern u8 lbl_804506A4;
+extern u8 lbl_80453170;
+extern u8 lbl_80425544;
+extern u8 lbl_80453364;
+extern u8 lbl_80452DF0;
+extern u8 lbl_80452CCC;
+extern u8 lbl_803B2E80;
+extern u8 lbl_80450AE8;
+extern u8 lbl_803B22E0;
+extern u8 lbl_80453128;
+extern u8 lbl_80391984;
+extern u8 lbl_80450FB8;
+extern u8 lbl_80452CC4;
+extern u8 lbl_8045329C;
+extern u8 lbl_8045303C;
+extern u8 lbl_80452D34;
+extern u8 lbl_80391A20;
+extern u8 lbl_804531C4;
+extern u8 lbl_80452E78;
+extern u8 lbl_80453130;
+extern u8 lbl_80391990;
+extern u8 lbl_803C3728;
+extern u8 lbl_8038FA78;
+extern u8 lbl_8038E9C0;
+extern u8 lbl_80452FF8;
+extern u8 lbl_80391010;
+extern u8 lbl_803AC310;
+extern u8 lbl_804531AC;
+extern u8 lbl_80452F48;
+extern u8 lbl_80452E90;
+extern u8 lbl_803918D0;
+extern u8 lbl_80453028;
+extern u8 lbl_803A9C60;
+extern u8 lbl_80452628;
+extern u8 lbl_8045262C;
+extern u8 lbl_80452630;
+extern u8 lbl_80452634;
+extern u8 lbl_80452638;
+extern u8 lbl_8045263C;
+extern u8 lbl_80452640;
+extern u8 lbl_80452644;
+extern u8 lbl_80452648;
+extern u8 lbl_8045264C;
+extern u8 lbl_80452650;
+extern u8 lbl_80452654;
+extern u8 lbl_80452658;
+extern u8 lbl_8037A770;
+extern u8 lbl_80450F58;
+extern u8 lbl_803A9C54;
+extern u8 lbl_8045265C;
+extern u8 lbl_80452660;
+extern u8 lbl_80452664;
+extern u8 lbl_803A71E8;
+extern u8 lbl_803A9C48;
+extern u8 lbl_80424B0C;
+extern u8 lbl_803A9BF8;
+extern u8 lbl_80450660;
+extern u8 lbl_803A9C3C;
+extern u8 lbl_803A9C18;
+extern u8 lbl_80452670;
+extern u8 lbl_80452668;
+extern u8 lbl_80452678;
+extern u8 lbl_80452680;
+extern u8 lbl_80452688;
+extern u8 lbl_80450664;
+extern u8 lbl_803A9C04;
+extern u8 lbl_8045066C;
+extern u8 lbl_80452690;
+extern u8 lbl_803A9C70;
+extern u8 lbl_80452694;
+extern u8 lbl_80450670;
+extern u8 lbl_80452698;
+extern u8 lbl_8045269C;
+extern u8 lbl_804526A8;
+extern u8 lbl_804526A0;
+extern u8 lbl_804526B0;
+extern u8 lbl_804526B4;
+extern u8 lbl_80424B00;
+extern u8 lbl_803A78F8;
+extern u8 lbl_803DD470;
+extern u8 lbl_80450AE0;
+extern u8 lbl_80451180;
+extern u8 lbl_803A7288;
+extern u8 lbl_80450D64;
+extern u8 lbl_80451360;
+extern u8 lbl_80430188;
+extern u8 lbl_803A6F88;
+
u32 daAlink_c::getE3Zhint(void) {
return 0;
}
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index 5c2a7aef00..2b07386591 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -64,6 +64,64 @@ void mDoExt_restoreCurrentHeap(void);
void Z2SeqMgr_NS_bgmNowBattle(void);
}
+class j3dsys {
+public:
+ Mtx mtx;
+};
+
+extern j3dsys lbl_80434AC8;
+
+extern u8 lbl_803A9C60;
+extern u8 lbl_80452628;
+extern u8 lbl_8045262C;
+extern u8 lbl_80452630;
+extern u8 lbl_80452634;
+extern u8 lbl_80452638;
+extern u8 lbl_8045263C;
+extern u8 lbl_80452640;
+extern u8 lbl_80452644;
+extern u8 lbl_80452648;
+extern u8 lbl_8045264C;
+extern u8 lbl_80452650;
+extern u8 lbl_80452654;
+extern u8 lbl_80452658;
+extern u8 lbl_8037A770;
+extern u8 lbl_80450F58;
+extern u8 lbl_803A9C54;
+extern u8 lbl_8045265C;
+extern u8 lbl_80452660;
+extern u8 lbl_80452664;
+extern u8 lbl_803A71E8;
+extern u8 lbl_803A9C48;
+extern u8 lbl_80424B0C;
+extern u8 lbl_80450660;
+extern u8 lbl_803A9BF8;
+extern u8 lbl_803A9C18;
+extern u8 lbl_803A9C3C;
+extern u8 lbl_80452670;
+extern u8 lbl_80452668;
+extern u8 lbl_80452678;
+extern u8 lbl_80452680;
+extern u8 lbl_80450AE0;
+extern u8 lbl_80452688;
+extern u8 lbl_80450664;
+extern u8 lbl_803A9C04;
+extern u8 lbl_8045066C;
+extern u8 lbl_80452690;
+extern u8 lbl_803A9C70;
+extern u8 lbl_80452694;
+extern u8 lbl_80450AE8;
+extern u8 lbl_80450670;
+extern u8 lbl_80452698;
+extern u8 lbl_8045269C;
+extern u8 lbl_80450D64;
+extern u8 lbl_804526A8;
+extern u8 lbl_804526A0;
+extern u8 lbl_803DD470;
+extern u8 lbl_804526B0;
+extern u8 lbl_804526B4;
+extern u8 lbl_80424B00;
+
extern "C" {
// padLockButton__25@unnamed@d_attention_cpp@Fl
// @unnamed@d_attention_cpp@::padLockButton(long)
diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index 7bc20580d9..f068400358 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -348,6 +348,226 @@ void Xyz__7cSPolarCFv(void);
void Z2Audience_NS_setAudioCamera(void);
}
+class j3dsys {
+public:
+ Mtx mtx;
+};
+
+extern j3dsys lbl_80434AC8;
+
+// additional symbols needed for d_camera.cpp
+// autogenerated by split.py v0.3 at 2021-01-02 08:13:10.405862
+extern u8 lbl_80453730;
+extern u8 lbl_804538A0;
+extern u8 lbl_8042C9AC;
+extern u8 lbl_803BA4A4;
+extern u8 lbl_80393DC0;
+extern u8 lbl_80453784;
+extern u8 lbl_804537CC;
+extern u8 lbl_80453740;
+extern u8 lbl_804537BC;
+extern u8 lbl_804536F4;
+extern u8 lbl_80453850;
+extern u8 lbl_803A8DF8;
+extern u8 lbl_804536C0;
+extern u8 lbl_803BA378;
+extern u8 lbl_804537E8;
+extern u8 lbl_80453750;
+extern u8 lbl_804537B8;
+extern u8 lbl_80453728;
+extern u8 lbl_804537D4;
+extern u8 lbl_80453810;
+extern u32 lbl_80451018; // daPy_py_c::m_midnaActor
+extern u8 lbl_80453828;
+extern u8 lbl_80453858;
+extern u8 lbl_80451044;
+extern u8 lbl_803BA6D8;
+extern u8 lbl_80453924;
+extern u8 lbl_80453734;
+extern u8 lbl_804537F4;
+extern u8 lbl_804538B0;
+extern u8 lbl_804538E4;
+extern u8 lbl_80453778;
+extern u8 lbl_80453824;
+extern u8 lbl_8045104A;
+extern u8 lbl_804536D8;
+extern u8 lbl_80453758;
+extern u8 lbl_80453884;
+extern u8 lbl_80453894;
+extern u8 lbl_80453834;
+extern u8 lbl_804536A0;
+extern u8 lbl_80453800;
+extern u8 lbl_8042C9A0;
+extern u8 lbl_803BA39C;
+extern u8 lbl_80453900;
+extern u8 lbl_80451042;
+extern u8 lbl_80453864;
+extern u8 lbl_8045383C;
+extern u8 lbl_80453744;
+extern u8 lbl_804538D4;
+extern u8 lbl_804537D0;
+extern u8 lbl_8045384C;
+extern u8 lbl_804537C8;
+extern u8 lbl_80450CBC;
+extern u8 lbl_804536B8;
+extern u8 lbl_804537F0;
+extern u8 lbl_80451028;
+extern u8 lbl_804536AC;
+extern u8 lbl_8045377C;
+extern u8 lbl_8045370C;
+extern u8 lbl_8045378C;
+extern u8 lbl_80451190;
+extern u8 lbl_804537E4;
+extern u8 lbl_80453830;
+extern u8 lbl_80453904;
+extern u8 lbl_804536D0;
+extern u8 lbl_804537A4;
+extern u8 lbl_80453794;
+extern u8 lbl_80453798;
+extern u8 lbl_8042C9B8;
+extern u8 lbl_80453848;
+extern u8 lbl_804538A8;
+extern u8 lbl_80453710;
+extern u8 lbl_804537EC;
+extern u8 lbl_8045380C;
+extern u8 lbl_804536E0;
+extern u8 lbl_80453804;
+extern u8 lbl_80453704;
+extern u8 lbl_803BA34C;
+extern u8 lbl_80453698;
+extern u8 lbl_8042C8F8;
+extern u8 lbl_8045390C;
+extern u8 lbl_8045102C;
+extern u8 lbl_80453690;
+extern u8 lbl_80453818;
+extern u8 lbl_804537C4;
+extern u8 lbl_80453914;
+extern u8 lbl_803AB6B8;
+extern u8 lbl_80451038;
+extern u8 lbl_8045385C;
+extern u8 lbl_804537B4;
+extern u8 lbl_804536A8;
+extern u8 lbl_80451046;
+extern u8 lbl_80453920;
+extern u8 lbl_804538C4;
+extern u8 lbl_80453788;
+extern u8 lbl_80453870;
+extern u8 lbl_80451188;
+extern u8 lbl_804536C8;
+extern u8 lbl_8045388C;
+extern u8 lbl_80453854;
+extern u8 lbl_80453768;
+extern u8 lbl_8045104C;
+extern u8 lbl_80453878;
+extern u8 lbl_804538F4;
+extern u8 lbl_804536F8;
+extern u8 lbl_80453738;
+extern u8 lbl_80453874;
+extern u8 lbl_804538C8;
+extern u8 lbl_80453718;
+extern u8 lbl_804536F0;
+extern u8 lbl_8045391C;
+extern u8 lbl_80453754;
+extern u8 lbl_803BA798;
+extern u8 lbl_8045374C;
+extern u8 lbl_8045375C;
+extern u8 lbl_804538FC;
+extern u8 lbl_803A78F8;
+extern u8 lbl_80453770;
+extern u8 lbl_804537C0;
+extern u8 lbl_80453898;
+extern u8 lbl_804538E0;
+extern u8 lbl_804538AC;
+extern u8 lbl_80453910;
+extern u8 lbl_804537F8;
+extern u8 lbl_80453808;
+extern u8 lbl_80453880;
+extern u8 lbl_804537DC;
+extern u8 lbl_80453760;
+extern u8 lbl_8045386C;
+extern u8 lbl_804538F0;
+extern u8 lbl_80450BE5;
+extern u8 lbl_804538EC;
+extern u8 lbl_80453840;
+extern u8 lbl_804536FC;
+extern u8 lbl_80451020;
+extern u8 lbl_804537B0;
+extern u8 lbl_80453700;
+extern u8 lbl_803BA25C;
+extern u8 lbl_803BA7EC;
+extern u8 lbl_804536A4;
+extern u8 lbl_80453714;
+extern u8 lbl_80451034;
+extern u8 lbl_80451039;
+extern u8 lbl_804538CC;
+extern u8 lbl_804538A4;
+extern u8 lbl_804537D8;
+extern u8 lbl_8045389C;
+extern u8 lbl_80451040;
+extern u8 lbl_80453844;
+extern u8 lbl_804538E8;
+extern u8 lbl_804537A8;
+extern u8 lbl_80453774;
+extern u8 lbl_80453790;
+extern u8 lbl_80453888;
+extern u8 lbl_80453908;
+extern u8 lbl_804536B4;
+extern u8 lbl_803BA160;
+extern u8 lbl_804536B0;
+extern u8 lbl_804538D8;
+extern u8 lbl_804538C0;
+extern u8 lbl_80453868;
+extern u8 lbl_80451198;
+extern u8 lbl_8045376C;
+extern u8 lbl_804538D0;
+extern u8 lbl_80453918;
+extern u8 lbl_8045387C;
+extern u8 lbl_804536E8;
+extern u8 lbl_80453860;
+extern u8 lbl_804538BC;
+extern u8 lbl_80453748;
+extern u8 lbl_8045379C;
+extern u8 lbl_80453780;
+extern u8 lbl_804536EC;
+extern u8 lbl_80453720;
+extern u8 lbl_804538B8;
+extern u8 lbl_80393F58;
+extern u8 lbl_80453724;
+extern u8 lbl_804538DC;
+extern u8 lbl_80451030;
+extern u8 lbl_80453820;
+extern u8 lbl_8045382C;
+extern u8 lbl_804538F8;
+extern u8 lbl_80451024;
+extern u8 lbl_8045372C;
+extern u8 lbl_8045103E;
+extern u8 lbl_804538B4;
+extern u8 lbl_804536BC;
+extern u8 lbl_80453708;
+extern u8 lbl_804537E0;
+extern u8 lbl_8045373C;
+extern u8 lbl_804537FC;
+extern u8 lbl_8045371C;
+extern u8 lbl_804537A0;
+extern u8 lbl_804537AC;
+extern u8 lbl_80453814;
+extern u8 lbl_80453890;
+extern u8 lbl_80393F68;
+extern u8 lbl_8045381C;
+extern u8 lbl_80453838;
+extern u8 lbl_80451048;
+extern u8 lbl_804536E4;
+extern u8 lbl_80450618;
+extern u8 lbl_803A6F88;
+extern u8 lbl_80450D64;
+extern u8 lbl_80450AE0;
+extern u8 lbl_803A37C0;
+extern u8 lbl_803A7904;
+extern u8 lbl_803790C0;
+extern u8 lbl_803DD470;
+extern u8 lbl_80450E20;
+extern u8 lbl_80450B44;
+
extern "C" {
// limitf__22@unnamed@d_camera_cpp@Ffff
// @unnamed@d_camera_cpp@::limitf(float, float, float)
diff --git a/src/d/d_com/d_com_inf_game.cpp b/src/d/d_com/d_com_inf_game.cpp
index aea6393215..02e76da05d 100644
--- a/src/d/d_com/d_com_inf_game.cpp
+++ b/src/d/d_com/d_com_inf_game.cpp
@@ -282,6 +282,48 @@ void setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc(void);
void ct__13dComIfG_inf_cFv(void);
}
+extern u8 lbl_80430188;
+extern u8 lbl_80378F38;
+extern u8 lbl_803A7288;
+extern u8 lbl_80450D64;
+extern u8 lbl_80450BC8;
+extern u8 lbl_80450604;
+extern u8 lbl_803A71B8;
+extern u8 lbl_803A71C4;
+extern u8 lbl_80451D00;
+extern u8 lbl_803A37C0;
+extern u8 lbl_80451D04;
+extern u8 lbl_803F6094;
+extern u8 lbl_80451D10;
+extern u8 lbl_80451D08;
+extern u8 lbl_803A71D0;
+extern u8 lbl_80451D18;
+extern u8 lbl_80451D1C;
+extern u8 lbl_80423FD0;
+extern u8 lbl_80451D20;
+extern u8 lbl_804061A0;
+extern u8 lbl_804061B4;
+extern u8 lbl_803AB608;
+extern u8 lbl_803AB61C;
+extern u8 lbl_803AB630;
+extern u8 lbl_803AC3E4;
+extern u8 lbl_803A7230;
+extern u8 lbl_803A7224;
+extern u8 lbl_803C3608;
+extern u8 lbl_803C36D0;
+extern u8 lbl_803A7218;
+extern u8 lbl_803C35A4;
+extern u8 lbl_803A720C;
+extern u8 lbl_803A7200;
+extern u8 lbl_803C3748;
+extern u8 lbl_803A71F4;
+extern u8 lbl_803A6D94;
+extern u8 lbl_803A6C20;
+extern u8 lbl_803A71E8;
+extern u8 lbl_803A9C48;
+extern u8 lbl_803A9C60;
+extern u8 lbl_803A3354;
+
// memset first arg is wrong
#ifdef NONMATCHING
void dComIfG_play_c::ct(void) {
diff --git a/src/d/d_file/d_file_sel_info.cpp b/src/d/d_file/d_file_sel_info.cpp
index e6bdc9197f..5e35c49a17 100644
--- a/src/d/d_file/d_file_sel_info.cpp
+++ b/src/d/d_file/d_file_sel_info.cpp
@@ -25,6 +25,17 @@ void setPlayTime__12dFile_info_cFP10dSv_save_c(void);
void setSaveDate__12dFile_info_cFP10dSv_save_c(void);
}
+extern u8 lbl_803BB598;
+extern u8 lbl_803A6F88;
+extern u8 lbl_803BB588;
+extern u8 lbl_803948B8;
+extern u8 lbl_803BB548;
+extern u8 lbl_803BB4A8;
+extern u8 lbl_80430188;
+extern u8 lbl_804539F8;
+extern u8 lbl_804539FC;
+extern u8 lbl_803BB498;
+
asm dFile_info_c::dFile_info_c(JKRArchive*, u8) {
nofralloc
#include "d/d_file/d_file_sel_info/asm/func_80192434.s"
diff --git a/src/d/d_item/d_item.cpp b/src/d/d_item/d_item.cpp
index 6bcbd0e498..3b7e65f24f 100644
--- a/src/d/d_item/d_item.cpp
+++ b/src/d/d_item/d_item.cpp
@@ -27,6 +27,20 @@ void setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb(u8, bool);
void setEmptyBottleItemIn__17dSv_player_item_cFUc(u8);
}
+extern f32 lbl_80452BD8;
+extern f32 lbl_80452BDC;
+extern f64 lbl_80452BE0;
+extern u8 lbl_80450D64;
+extern u8 lbl_8037B0D0[0x8];
+
+struct unkEvent { // figure out what this is later
+ u16 unk0[0x11A];
+ u8 unk565;
+ u16 unk566;
+ u8 unk567[0x439];
+};
+extern unkEvent lbl_803A7288;
+
inline void dComIfGp_setItemLifeCount(float amount, u8 unk) {
g_dComIfG_gameInfo.getPlay().setItemLifeCount(amount, unk);
}
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index 5c7e41a5c8..5e1550b697 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -144,6 +144,215 @@ void Z2EnvSeMgr(void);
void Z2SceneMgr_NS_load2ndDynamicWave(void);
}
+class j3dsys {
+public:
+ Mtx mtx;
+};
+
+extern j3dsys lbl_80434AC8;
+
+// additional symbols needed for d_kankyo.cpp
+// autogenerated by split.py v0.3 at 2021-01-01 22:51:09.144358
+extern u8 lbl_80450718;
+extern u8 lbl_80453BC8;
+extern u8 lbl_80453CA8;
+extern u8 lbl_803DD428;
+extern u8 lbl_80453CB4;
+extern u8 lbl_803BC050;
+extern u8 lbl_80453E40;
+extern u8 lbl_80453CA0;
+extern u8 lbl_80453E04;
+extern u8 lbl_80453D40;
+extern u8 lbl_803BBEFC;
+extern u8 lbl_80453BF0;
+extern u8 lbl_80453BDC;
+extern u8 lbl_80453D68;
+extern u8 lbl_80453C60;
+extern u8 lbl_80453D04;
+extern u8 lbl_80453C2C;
+extern u8 lbl_80453D24;
+extern u8 lbl_80453D88;
+extern u8 lbl_80453D9C;
+extern u8 lbl_80453D80;
+extern u8 lbl_80453DE8;
+extern u8 lbl_80450708;
+extern u8 lbl_80453D60;
+extern u8 lbl_80453DAC;
+extern u8 lbl_80453DB8;
+extern u8 lbl_80453C98;
+extern u8 lbl_8045106B;
+extern u8 lbl_80453CC4;
+extern u8 lbl_80453C74;
+extern u8 lbl_80453D7C;
+extern u8 lbl_80453BC0;
+extern u8 lbl_80453C54;
+extern u8 lbl_80453CD8;
+extern u8 lbl_80453CC8;
+extern u8 lbl_80453BE8;
+extern u8 lbl_803BC13C;
+extern u8 lbl_80453BE0;
+extern u8 lbl_80453CFC;
+extern u8 lbl_80453D64;
+extern u8 lbl_80453DEC;
+extern u8 lbl_80453BD8;
+extern u8 lbl_80453D2C;
+extern u8 lbl_80453DA4;
+extern u8 lbl_80453C5C;
+extern u8 lbl_80453C30;
+extern u8 lbl_80453CE0;
+extern u8 lbl_80453CF0;
+extern u8 lbl_80453E00;
+extern u8 lbl_803BBDC4;
+extern u8 lbl_80450704;
+extern u8 lbl_80453C04;
+extern u8 lbl_80453C44;
+extern u8 lbl_80453BEC;
+extern u8 lbl_80453CB0;
+extern u8 lbl_80453E0C;
+extern u8 lbl_80453BFC;
+extern u8 lbl_80453D38;
+extern u8 lbl_80453E1C;
+extern u8 lbl_80453C6C;
+extern u8 lbl_80453C38;
+extern u8 lbl_80453C70;
+extern u8 lbl_80453BE4;
+extern u8 lbl_80453C00;
+extern u8 lbl_80453E14;
+extern u8 lbl_80453D18;
+extern u8 lbl_80453CE4;
+extern u8 lbl_80453DF0;
+extern u8 lbl_80453C94;
+extern u8 lbl_80453E20;
+extern u8 lbl_80453C10;
+extern u8 lbl_80453D5C;
+extern u8 lbl_80453BD4;
+extern u8 lbl_80453DDC;
+extern u8 lbl_80453E30;
+extern u8 lbl_80453CAC;
+extern u8 lbl_80453D90;
+extern u8 lbl_80453DD4;
+extern u8 lbl_80453E38;
+extern u8 lbl_80453BF8;
+extern u8 lbl_8045070C;
+extern u8 lbl_80453D28;
+extern u8 lbl_803BBEAC;
+extern u8 lbl_80453D94;
+extern u8 lbl_80453D58;
+extern u8 lbl_803BBFD0;
+extern u8 lbl_80453D30;
+extern u8 lbl_8042CA48;
+extern u8 lbl_80453D84;
+extern u8 lbl_80450D67;
+extern u8 lbl_80453C48;
+extern u8 lbl_80453CA4;
+extern u8 lbl_80453E24;
+extern u8 lbl_80453CCC;
+extern u8 lbl_803BBFF0;
+extern u8 lbl_80453C28;
+extern u8 lbl_80453E44;
+extern u8 lbl_80453D34;
+extern u8 lbl_803BBEBC;
+extern u8 lbl_80453DC0;
+extern u8 lbl_80451068;
+extern u8 lbl_80453DCC;
+extern u8 lbl_80453D44;
+extern u8 lbl_80453E28;
+extern u8 lbl_803BBFB8;
+extern u8 lbl_80453BD0;
+extern u8 lbl_80453C58;
+extern u8 lbl_80453C8C;
+extern u8 lbl_80453CEC;
+extern u8 lbl_80453D70;
+extern u8 lbl_80453CD4;
+extern u8 lbl_80453D48;
+extern u8 lbl_803BC028;
+extern u8 lbl_80453D3C;
+extern u8 lbl_80453E08;
+extern u8 lbl_80453D6C;
+extern u8 lbl_80453CDC;
+extern u8 lbl_8042E07C;
+extern u8 lbl_80453BCC;
+extern u8 lbl_80453C18;
+extern u8 lbl_80453C40;
+extern u8 lbl_80453D98;
+extern u8 lbl_803BC010;
+extern u8 lbl_80453C78;
+extern u8 lbl_80453DD8;
+extern u8 lbl_80453CBC;
+extern u8 lbl_80453E50;
+extern u8 lbl_80453C4C;
+extern u8 lbl_80453DD0;
+extern u8 lbl_80453C08;
+extern u8 lbl_80453C90;
+extern u8 lbl_80453D54;
+extern u8 lbl_80453DE4;
+extern u8 lbl_80453BC4;
+extern u8 lbl_80453D20;
+extern u8 lbl_803F6094;
+extern u8 lbl_80453E2C;
+extern u8 lbl_80453CB8;
+extern u8 lbl_80453D10;
+extern u8 lbl_80453C20;
+extern u8 lbl_80453D0C;
+extern u8 lbl_8045106A;
+extern u8 lbl_80453DC8;
+extern u8 lbl_803A1EC8;
+extern u8 lbl_80453CE8;
+extern u8 lbl_80453C80;
+extern u8 lbl_80453C50;
+extern u8 lbl_80453E48;
+extern u8 lbl_803BBF3C;
+extern u8 lbl_803BBF58;
+extern u8 lbl_80394C60;
+extern u8 lbl_803BBDB8;
+extern u8 lbl_80453E4C;
+extern u8 lbl_80453E3C;
+extern u8 lbl_80453DF8;
+extern u8 lbl_80453BF4;
+extern u8 lbl_80453D74;
+extern u8 lbl_80453C9C;
+extern u8 lbl_80453D50;
+extern u8 lbl_80453CF8;
+extern u8 lbl_80453DB0;
+extern u8 lbl_80453DE0;
+extern u8 lbl_80453DA0;
+extern u8 lbl_80453E34;
+extern u8 lbl_80453C68;
+extern u8 lbl_80453DF4;
+extern u8 lbl_80453DBC;
+extern u8 lbl_80450710;
+extern u8 lbl_80453DB4;
+extern u8 lbl_80453DA8;
+extern u8 lbl_80453D08;
+extern u8 lbl_80453CD0;
+extern u8 lbl_80453D78;
+extern u8 lbl_80453DC4;
+extern u8 lbl_80453D14;
+extern u8 lbl_803BC0DC;
+extern u8 lbl_80394C6C;
+extern u8 lbl_80453C0C;
+extern u8 lbl_80453CF4;
+extern u8 lbl_80453D1C;
+extern u8 lbl_80450700;
+extern u8 lbl_80453E10;
+extern u8 lbl_803A1E5C;
+extern u8 lbl_80453C88;
+extern u8 lbl_80453C3C;
+extern u8 lbl_80453C64;
+extern u8 lbl_80453D4C;
+extern u8 lbl_80453E18;
+extern u8 lbl_80453CC0;
+extern u8 lbl_80453D00;
+extern u8 lbl_80453D8C;
+extern u8 lbl_80453DFC;
+extern u8 lbl_80450D64;
+extern u8 lbl_80450AE0;
+extern u8 lbl_803A3354;
+extern u8 lbl_80430CD8;
+extern u8 lbl_803DD470;
+extern u8 lbl_80430188;
+extern u8 lbl_803790C0;
+
extern "C" {
// dKy_WolfPowerup_AmbCol__FP11_GXColorS10
// dKy_WolfPowerup_AmbCol(_GXColorS10*)
diff --git a/src/d/d_kankyo/d_kankyo_data.cpp b/src/d/d_kankyo/d_kankyo_data.cpp
index d602742c0e..86464c47fa 100644
--- a/src/d/d_kankyo/d_kankyo_data.cpp
+++ b/src/d/d_kankyo/d_kankyo_data.cpp
@@ -3,6 +3,19 @@
#include "d/d_kankyo/d_kankyo.h"
#include "global.h"
+extern u8 lbl_803A953C;
+extern u8 lbl_803A987C;
+extern u8 lbl_803A9894;
+extern u8 lbl_803A9918;
+extern u8 lbl_803A9434;
+extern u8 lbl_803A94B8;
+extern u8 lbl_803A9A94;
+extern u8 lbl_803A9410;
+extern u8 lbl_803A9198;
+extern u8 lbl_803A92A8;
+extern u8 lbl_803A93C8;
+extern u8 lbl_803A8E98;
+
extern "C" {
// dKyd_dmpalet_getp__Fv
// dKyd_dmpalet_getp(void)
diff --git a/src/d/d_kankyo/d_kankyo_rain.cpp b/src/d/d_kankyo/d_kankyo_rain.cpp
index fcba86f8ff..81f4a8520d 100644
--- a/src/d/d_kankyo/d_kankyo_rain.cpp
+++ b/src/d/d_kankyo/d_kankyo_rain.cpp
@@ -92,6 +92,346 @@ void STAR_EFF(void);
void Z2EnvSeMgr_NS_startNearThunderSe(void);
}
+class j3dsys {
+public:
+ Mtx mtx;
+};
+
+extern j3dsys lbl_80434AC8;
+
+// additional symbols needed for d_kankyo_rain.cpp
+// autogenerated by split.py v0.3 at 2021-01-01 22:35:44.884768
+extern u8 lbl_80452508;
+extern u8 lbl_80450F10;
+extern u8 lbl_80450F4C;
+extern u8 lbl_804522F8;
+extern u8 lbl_80452534;
+extern u8 lbl_80450EF2;
+extern u8 lbl_8037A4E8;
+extern u8 lbl_804521E4;
+extern u8 lbl_80452420;
+extern u8 lbl_80452444;
+extern u8 lbl_80450EEC;
+extern u8 lbl_804522EC;
+extern u8 lbl_804521F0;
+extern u8 lbl_80452450;
+extern u8 lbl_8045253C;
+extern u8 lbl_80452278;
+extern u8 lbl_803A9BA0;
+extern u8 lbl_804523FC;
+extern u8 lbl_80452234;
+extern u8 lbl_80452244;
+extern u8 lbl_80452388;
+extern u8 lbl_80450EEE;
+extern u8 lbl_80424950;
+extern u8 lbl_80450F30;
+extern u8 lbl_8045257C;
+extern u8 lbl_80452324;
+extern u8 lbl_804521F8;
+extern u8 lbl_804524CC;
+extern u8 lbl_804522B8;
+extern u8 lbl_80452400;
+extern u8 lbl_80452358;
+extern u8 lbl_804525D8;
+extern u8 lbl_80450EF4;
+extern u8 lbl_80452460;
+extern u8 lbl_803A9BB8;
+extern u8 lbl_80452608;
+extern u8 lbl_804521C4;
+extern u8 lbl_8045252C;
+extern u8 lbl_80450EE8;
+extern u8 lbl_804525B4;
+extern u8 lbl_80452530;
+extern u8 lbl_804525F0;
+extern u8 lbl_80452414;
+extern u8 lbl_804523EC;
+extern u8 lbl_804523A8;
+extern u8 lbl_80452544;
+extern u8 lbl_80452478;
+extern u8 lbl_80452510;
+extern u8 lbl_80450F28;
+extern u8 lbl_8045228C;
+extern u8 lbl_804522D0;
+extern u8 lbl_804524F8;
+extern u8 lbl_80452590;
+extern u8 lbl_804525F8;
+extern u8 lbl_804525F4;
+extern u8 lbl_804525B8;
+extern u8 lbl_8045231C;
+extern u8 lbl_8037A4C0;
+extern u8 lbl_804524DC;
+extern u8 lbl_80450F44;
+extern u8 lbl_804522C8;
+extern u8 lbl_80450EF8;
+extern u8 lbl_80452344;
+extern u8 lbl_80450F18;
+extern u8 lbl_80452578;
+extern u8 lbl_804523D0;
+extern u8 lbl_80452318;
+extern u8 lbl_80452568;
+extern u8 lbl_8045259C;
+extern u8 lbl_80452520;
+extern u8 lbl_804521D4;
+extern u8 lbl_80452350;
+extern u8 lbl_804523BC;
+extern u8 lbl_80450F1C;
+extern u8 lbl_804521C0;
+extern u8 lbl_80452390;
+extern u8 lbl_804523F0;
+extern u8 lbl_8045244C;
+extern u8 lbl_8045249C;
+extern u8 lbl_804523AC;
+extern u8 lbl_8037A578;
+extern u8 lbl_80452490;
+extern u8 lbl_804522DC;
+extern u8 lbl_804522D8;
+extern u8 lbl_8045233C;
+extern u8 lbl_80452284;
+extern u8 lbl_80452448;
+extern u8 lbl_80452564;
+extern u8 lbl_804521B0;
+extern u8 lbl_804521FC;
+extern u8 lbl_804525C4;
+extern u8 lbl_804523F8;
+extern u8 lbl_804524F4;
+extern u8 lbl_80452218;
+extern u8 lbl_80452408;
+extern u8 lbl_80452610;
+extern u8 lbl_804522B4;
+extern u8 lbl_8045222C;
+extern u8 lbl_804522AC;
+extern u8 lbl_804525CC;
+extern u8 lbl_80452604;
+extern u8 lbl_80452404;
+extern u8 lbl_8045230C;
+extern u8 lbl_804522C0;
+extern u8 lbl_80452504;
+extern u8 lbl_804525AC;
+extern u8 lbl_80452288;
+extern u8 lbl_8045227C;
+extern u8 lbl_804521B8;
+extern u8 lbl_80452494;
+extern u8 lbl_804525A0;
+extern u8 lbl_804525DC;
+extern u8 lbl_80450F40;
+extern u8 lbl_804521C8;
+extern u8 lbl_80452410;
+extern u8 lbl_804524F0;
+extern u8 lbl_80452248;
+extern u8 lbl_80450BCC;
+extern u8 lbl_804522C4;
+extern u8 lbl_804523B4;
+extern u8 lbl_80450F20;
+extern u8 lbl_80452210;
+extern u8 lbl_8045256C;
+extern u8 lbl_80452370;
+extern u8 lbl_804525A8;
+extern u8 lbl_804524B0;
+extern u8 lbl_8045240C;
+extern u8 lbl_80452214;
+extern u8 lbl_80452394;
+extern u8 lbl_80452310;
+extern u8 lbl_8037A528;
+extern u8 lbl_80452474;
+extern u8 lbl_804524C4;
+extern u8 lbl_80452468;
+extern u8 lbl_80452280;
+extern u8 lbl_804523E8;
+extern u8 lbl_8045245C;
+extern u8 lbl_80450F0D;
+extern u8 lbl_8045225C;
+extern u8 lbl_8045221C;
+extern u8 lbl_804521E8;
+extern u8 lbl_804522E4;
+extern u8 lbl_804522B0;
+extern u8 lbl_804525E8;
+extern u8 lbl_80452314;
+extern u8 lbl_8045242C;
+extern u8 lbl_804524C0;
+extern u8 lbl_80452470;
+extern u8 lbl_80450EF0;
+extern u8 lbl_804525FC;
+extern u8 lbl_80452254;
+extern u8 lbl_804525B0;
+extern u8 lbl_804522A8;
+extern u8 lbl_80452378;
+extern u8 lbl_804522F0;
+extern u8 lbl_80452454;
+extern u8 lbl_80452548;
+extern u8 lbl_804525C8;
+extern u8 lbl_80452588;
+extern u8 lbl_804522BC;
+extern u8 lbl_80450E38;
+extern u8 lbl_80452594;
+extern u8 lbl_804523DC;
+extern u8 lbl_80452614;
+extern u8 lbl_804524E4;
+extern u8 lbl_80452298;
+extern u8 lbl_8045224C;
+extern u8 lbl_80452290;
+extern u8 lbl_804522CC;
+extern u8 lbl_804524D4;
+extern u8 lbl_804523E0;
+extern u8 lbl_80452570;
+extern u8 lbl_804524C8;
+extern u8 lbl_80452458;
+extern u8 lbl_804522A0;
+extern u8 lbl_80452438;
+extern u8 lbl_80452328;
+extern u8 lbl_80452364;
+extern u8 lbl_804524A4;
+extern u8 lbl_804523B8;
+extern u8 lbl_80452398;
+extern u8 lbl_8045246C;
+extern u8 lbl_80452430;
+extern u8 lbl_80452514;
+extern u8 lbl_804521E0;
+extern u8 lbl_8045226C;
+extern u8 lbl_80452204;
+extern u8 lbl_80452584;
+extern u8 lbl_80450F2C;
+extern u8 lbl_80452600;
+extern u8 lbl_80452488;
+extern u8 lbl_80452554;
+extern u8 lbl_804524EC;
+extern u8 lbl_80452224;
+extern u8 lbl_80452480;
+extern u8 lbl_8045251C;
+extern u8 lbl_80452200;
+extern u8 lbl_804521DC;
+extern u8 lbl_80452228;
+extern u8 lbl_804521D0;
+extern u8 lbl_80452300;
+extern u8 lbl_8045236C;
+extern u8 lbl_80452384;
+extern u8 lbl_803A9BD8;
+extern u8 lbl_804523C8;
+extern u8 lbl_80452250;
+extern u8 lbl_804521D8;
+extern u8 lbl_804524AC;
+extern u8 lbl_80452540;
+extern u8 lbl_80452518;
+extern u8 lbl_80450EFD;
+extern u8 lbl_8045260C;
+extern u8 lbl_80450F0C;
+extern u8 lbl_80452528;
+extern u8 lbl_80450F24;
+extern u8 lbl_80452424;
+extern u8 lbl_8045258C;
+extern u8 lbl_804522FC;
+extern u8 lbl_80452338;
+extern u8 lbl_804523D8;
+extern u8 lbl_80452304;
+extern u8 lbl_804523A4;
+extern u8 lbl_80452208;
+extern u8 lbl_80450F38;
+extern u8 lbl_80452270;
+extern u8 lbl_804522F4;
+extern u8 lbl_804523F4;
+extern u8 lbl_804524BC;
+extern u8 lbl_80450F14;
+extern u8 lbl_80450F1D;
+extern u8 lbl_80452580;
+extern u8 lbl_804525EC;
+extern u8 lbl_80452550;
+extern u8 lbl_80450F08;
+extern u8 lbl_80452538;
+extern u8 lbl_80452428;
+extern u8 lbl_80452240;
+extern u8 lbl_80452354;
+extern u8 lbl_804524A8;
+extern u8 lbl_8045232C;
+extern u8 lbl_80452308;
+extern u8 lbl_8045229C;
+extern u8 lbl_8037A508;
+extern u8 lbl_80452368;
+extern u8 lbl_804523C4;
+extern u8 lbl_804523C0;
+extern u8 lbl_804523E4;
+extern u8 lbl_8037A568;
+extern u8 lbl_8045248C;
+extern u8 lbl_804522D4;
+extern u8 lbl_80452574;
+extern u8 lbl_80450F00;
+extern u8 lbl_804523A0;
+extern u8 lbl_80452260;
+extern u8 lbl_80452334;
+extern u8 lbl_80452380;
+extern u8 lbl_80450F04;
+extern u8 lbl_804521BC;
+extern u8 lbl_803AB6E8;
+extern u8 lbl_8045241C;
+extern u8 lbl_804522E8;
+extern u8 lbl_80452294;
+extern u8 lbl_80452560;
+extern u8 lbl_8045234C;
+extern u8 lbl_8045254C;
+extern u8 lbl_80452340;
+extern u8 lbl_8037A548;
+extern u8 lbl_80452500;
+extern u8 lbl_80452498;
+extern u8 lbl_8045255C;
+extern u8 lbl_804524E8;
+extern u8 lbl_80452418;
+extern u8 lbl_8045237C;
+extern u8 lbl_8045261C;
+extern u8 lbl_80450F3C;
+extern u8 lbl_8045239C;
+extern u8 lbl_804524A0;
+extern u8 lbl_804524FC;
+extern u8 lbl_8045220C;
+extern u8 lbl_80452268;
+extern u8 lbl_804525E4;
+extern u8 lbl_804525E0;
+extern u8 lbl_80452618;
+extern u8 lbl_80452524;
+extern u8 lbl_804525C0;
+extern u8 lbl_80450EFC;
+extern u8 lbl_8045250C;
+extern u8 lbl_804525A4;
+extern u8 lbl_80452484;
+extern u8 lbl_804524B8;
+extern u8 lbl_80452220;
+extern u8 lbl_804522A4;
+extern u8 lbl_80452330;
+extern u8 lbl_804524E0;
+extern u8 lbl_80452464;
+extern u8 lbl_80452238;
+extern u8 lbl_80430CD8;
+extern u8 lbl_804524B4;
+extern u8 lbl_803A9BAC;
+extern u8 lbl_804525D4;
+extern u8 lbl_804524D0;
+extern u8 lbl_80452348;
+extern u8 lbl_80450F34;
+extern u8 lbl_80450F48;
+extern u8 lbl_80452598;
+extern u8 lbl_804525D0;
+extern u8 lbl_80452320;
+extern u8 lbl_8045223C;
+extern u8 lbl_804524D8;
+extern u8 lbl_80452558;
+extern u8 lbl_80452360;
+extern u8 lbl_80452258;
+extern u8 lbl_804523B0;
+extern u8 lbl_80452230;
+extern u8 lbl_8045238C;
+extern u8 lbl_8045235C;
+extern u8 lbl_804522E0;
+extern u8 lbl_80452440;
+extern u8 lbl_80452264;
+extern u8 lbl_8045247C;
+extern u8 lbl_804525BC;
+extern u8 lbl_80452374;
+extern u8 lbl_80450AE0;
+extern u8 lbl_803A382C;
+extern u8 lbl_80450D64;
+extern u8 lbl_803CD97C;
+extern u8 lbl_803A9B4C;
+extern u8 lbl_803A9B38;
+extern u8 lbl_804515D0;
+extern u8 lbl_803DD470;
+
extern "C" {
// vectle_calc__FP10DOUBLE_POSP4cXyz
// vectle_calc(DOUBLE_POS*, cXyz*)
diff --git a/src/d/d_kankyo/d_kankyo_wether.cpp b/src/d/d_kankyo/d_kankyo_wether.cpp
index af45dc62e2..c08ff4129e 100644
--- a/src/d/d_kankyo/d_kankyo_wether.cpp
+++ b/src/d/d_kankyo/d_kankyo_wether.cpp
@@ -80,6 +80,77 @@ void Z2EnvSeMgr_NS_startRainSe(void);
void Z2EnvSeMgr_NS_startStrongWindSe(void);
}
+class j3dsys {
+public:
+ Mtx mtx;
+};
+
+extern j3dsys lbl_80434AC8;
+extern u8 lbl_8037A368;
+extern u8 lbl_80450D64;
+extern u8 lbl_804520E0;
+extern u8 lbl_804520E4;
+extern u8 lbl_803A9AC0;
+extern u8 lbl_803CD97C;
+extern u8 lbl_803A9AD4;
+extern u8 lbl_803A9AE8;
+extern u8 lbl_803A9B24;
+extern u8 lbl_803A9B10;
+extern u8 lbl_803A9B38;
+extern u8 lbl_803A9B4C;
+extern u8 lbl_803A9B60;
+extern u8 lbl_803A9B74;
+extern u8 lbl_803A9B88;
+extern u8 lbl_803A9AFC;
+extern u8 lbl_804520E8;
+extern u8 lbl_804520EC;
+extern u8 lbl_804520F0;
+extern u8 lbl_804520F8;
+extern u8 lbl_804520F4;
+extern u8 lbl_80452100;
+extern u8 lbl_80452104;
+extern u8 lbl_80452108;
+extern u8 lbl_8045210C;
+extern u8 lbl_80452110;
+extern u8 lbl_80452114;
+extern u8 lbl_80452118;
+extern u8 lbl_8045211C;
+extern u8 lbl_80452120;
+extern u8 lbl_80452124;
+extern u8 lbl_80452128;
+extern u8 lbl_8045212C;
+extern u8 lbl_80450EE0;
+extern u8 lbl_80452130;
+extern u8 lbl_80424944;
+extern u8 lbl_80452134;
+extern u8 lbl_80452138;
+extern u8 lbl_8045213C;
+extern u8 lbl_80452140;
+extern u8 lbl_80424938;
+extern u8 lbl_80452144;
+extern u8 lbl_80452148;
+extern u8 lbl_8045214C;
+extern u8 lbl_80452150;
+extern u8 lbl_80452154;
+extern u8 lbl_80452158;
+extern u8 lbl_8045215C;
+extern u8 lbl_80452160;
+extern u8 lbl_80452164;
+extern u8 lbl_80452168;
+extern u8 lbl_8045216C;
+extern u8 lbl_80452170;
+extern u8 lbl_80452178;
+extern u8 lbl_80452180;
+extern u8 lbl_80452188;
+extern u8 lbl_80450AE0;
+extern u8 lbl_80452190;
+extern u8 lbl_80452194;
+extern u8 lbl_80452198;
+extern u8 lbl_8045219C;
+extern u8 lbl_804521A0;
+extern u8 lbl_804521A4;
+extern u8 lbl_804521A8;
+
extern "C" {
// dKyw_setDrawPacketList__FP9J3DPacketi
// dKyw_setDrawPacketList(J3DPacket*, int)
diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp
index 78830c8bbf..a801ca28ed 100644
--- a/src/d/d_kantera_icon_meter.cpp
+++ b/src/d/d_kantera_icon_meter.cpp
@@ -15,6 +15,17 @@ void J2DScreen_NS_draw(void);
void J2DScreen_NS_setPriority(void);
}
+// additional symbols needed for d_kantera_icon_meter.cpp
+// autogenerated by split.py v0.3 at 2021-01-02 06:29:53.280100
+extern u8 lbl_803BC218;
+extern u8 lbl_80453EF8;
+extern u8 lbl_80453F08;
+extern u8 lbl_80394F50;
+extern u8 lbl_80453F00;
+extern u8 lbl_803BC228;
+extern u8 lbl_803A6F88;
+extern u8 lbl_8042EBC8;
+
extern "C" {
// __ct__15dKantera_icon_cFv
// dKantera_icon_c::dKantera_icon_c(void)
diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp
index 5d5c857753..f68735d4ce 100644
--- a/src/d/d_lib.cpp
+++ b/src/d/d_lib.cpp
@@ -16,6 +16,15 @@ void Xinit__9STControlFv(void);
void Yinit__9STControlFv(void);
}
+extern u8 lbl_80451180;
+extern u8 lbl_803DD470;
+extern u8 lbl_80450DE8;
+extern u8 lbl_80450DD8;
+extern u8 lbl_80450DDC;
+extern u8 lbl_80450DE0;
+extern u8 lbl_80450DE4;
+extern u8 lbl_80450DE0;
+
STControl::STControl(s16 param_1, s16 param_2, s16 param_3, s16 param_4, f32 param_5, f32 param_6,
s16 param_7, s16 param_8) {
__vt = (STControl_vtable*)0x803a7260;
diff --git a/src/d/d_meter/d_meter_HIO.cpp b/src/d/d_meter/d_meter_HIO.cpp
index 7d6582b3bd..4cc7592db4 100644
--- a/src/d/d_meter/d_meter_HIO.cpp
+++ b/src/d/d_meter/d_meter_HIO.cpp
@@ -15,6 +15,180 @@ void func_80361D60(void);
void JUtility_NS_TColor(void);
}
+// additional symbols needed for d_meter_HIO.cpp
+// autogenerated by split.py v0.3 at 2021-01-02 05:41:49.509892
+extern u8 lbl_80454730;
+extern u8 lbl_80454724;
+extern u8 lbl_8045471C;
+extern u8 lbl_80454734;
+extern u8 lbl_803BF190;
+extern u8 lbl_803BF178;
+extern u8 lbl_80454720;
+extern u8 lbl_80454638;
+extern u8 lbl_804546EC;
+extern u8 lbl_80454718;
+extern u8 lbl_8045460C;
+extern u8 lbl_8042EBB0;
+extern u8 lbl_804545F4;
+extern u8 lbl_80454694;
+extern u8 lbl_80454554;
+extern u8 lbl_804545B0;
+extern u8 lbl_804546FC;
+extern u8 lbl_8045455C;
+extern u8 lbl_80454508;
+extern u8 lbl_8045451C;
+extern u8 lbl_8045463C;
+extern u8 lbl_804545F0;
+extern u8 lbl_804546C0;
+extern u8 lbl_80454574;
+extern u8 lbl_804545FC;
+extern u8 lbl_803BF10C;
+extern u8 lbl_804545A0;
+extern u8 lbl_804546A0;
+extern u8 lbl_804546A4;
+extern u8 lbl_8045472C;
+extern u8 lbl_804545E4;
+extern u8 lbl_804544E4;
+extern u8 lbl_80454690;
+extern u8 lbl_804545C8;
+extern u8 lbl_80454578;
+extern u8 lbl_8045461C;
+extern u8 lbl_80454598;
+extern u8 lbl_80454644;
+extern u8 lbl_80454550;
+extern u8 lbl_804545CC;
+extern u8 lbl_80454548;
+extern u8 lbl_803BF100;
+extern u8 lbl_804546AC;
+extern u8 lbl_804546C4;
+extern u8 lbl_80454600;
+extern u8 lbl_804546CC;
+extern u8 lbl_80454528;
+extern u8 lbl_80454704;
+extern u8 lbl_80454634;
+extern u8 lbl_804545BC;
+extern u8 lbl_80454560;
+extern u8 lbl_80454538;
+extern u8 lbl_8045457C;
+extern u8 lbl_8045466C;
+extern u8 lbl_80454654;
+extern u8 lbl_80454500;
+extern u8 lbl_804546E4;
+extern u8 lbl_804545AC;
+extern u8 lbl_8045450C;
+extern u8 lbl_80454588;
+extern u8 lbl_804546B0;
+extern u8 lbl_80454630;
+extern u8 lbl_804545E8;
+extern u8 lbl_80454684;
+extern u8 lbl_80454590;
+extern u8 lbl_80454648;
+extern u8 lbl_80454514;
+extern u8 lbl_803BF184;
+extern u8 lbl_8045454C;
+extern u8 lbl_804545F8;
+extern u8 lbl_80454608;
+extern u8 lbl_80454540;
+extern u8 lbl_804544F4;
+extern u8 lbl_804545D4;
+extern u8 lbl_804546B4;
+extern u8 lbl_8045473C;
+extern u8 lbl_804545B4;
+extern u8 lbl_80454534;
+extern u8 lbl_803BF118;
+extern u8 lbl_80454728;
+extern u8 lbl_80454650;
+extern u8 lbl_804545DC;
+extern u8 lbl_80454584;
+extern u8 lbl_80454580;
+extern u8 lbl_80454570;
+extern u8 lbl_8045465C;
+extern u8 lbl_80454618;
+extern u8 lbl_8045462C;
+extern u8 lbl_80397E50;
+extern u8 lbl_8045453C;
+extern u8 lbl_804545C0;
+extern u8 lbl_804545A4;
+extern u8 lbl_803BF0E8;
+extern u8 lbl_80454708;
+extern u8 lbl_80454518;
+extern u8 lbl_804545B8;
+extern u8 lbl_803BF16C;
+extern u8 lbl_803BF160;
+extern u8 lbl_804546C8;
+extern u8 lbl_803BF19C;
+extern u8 lbl_80454640;
+extern u8 lbl_8045452C;
+extern u8 lbl_804545D0;
+extern u8 lbl_80454740;
+extern u8 lbl_80454738;
+extern u8 lbl_80454628;
+extern u8 lbl_80454620;
+extern u8 lbl_803BF154;
+extern u8 lbl_804546F0;
+extern u8 lbl_80454524;
+extern u8 lbl_804546D4;
+extern u8 lbl_80454520;
+extern u8 lbl_80454710;
+extern u8 lbl_803BF148;
+extern u8 lbl_80454660;
+extern u8 lbl_80454670;
+extern u8 lbl_80454680;
+extern u8 lbl_80454714;
+extern u8 lbl_80454658;
+extern u8 lbl_8045458C;
+extern u8 lbl_80454700;
+extern u8 lbl_80454688;
+extern u8 lbl_803BF0F4;
+extern u8 lbl_804546A8;
+extern u8 lbl_804546F4;
+extern u8 lbl_804544F0;
+extern u8 lbl_80454544;
+extern u8 lbl_804546D0;
+extern u8 lbl_804545D8;
+extern u8 lbl_8045456C;
+extern u8 lbl_803BF130;
+extern u8 lbl_80454604;
+extern u8 lbl_80454558;
+extern u8 lbl_804546B8;
+extern u8 lbl_80454614;
+extern u8 lbl_804544E0;
+extern u8 lbl_80454698;
+extern u8 lbl_804546DC;
+extern u8 lbl_804546BC;
+extern u8 lbl_8045459C;
+extern u8 lbl_80454510;
+extern u8 lbl_804544E8;
+extern u8 lbl_804544F8;
+extern u8 lbl_80454594;
+extern u8 lbl_804545A8;
+extern u8 lbl_80454624;
+extern u8 lbl_804546E8;
+extern u8 lbl_80454504;
+extern u8 lbl_80454610;
+extern u8 lbl_803BF124;
+extern u8 lbl_80454664;
+extern u8 lbl_804544EC;
+extern u8 lbl_803BF13C;
+extern u8 lbl_804546D8;
+extern u8 lbl_80454678;
+extern u8 lbl_8045464C;
+extern u8 lbl_80454674;
+extern u8 lbl_804546E0;
+extern u8 lbl_80454530;
+extern u8 lbl_804545E0;
+extern u8 lbl_8045467C;
+extern u8 lbl_80454564;
+extern u8 lbl_8045470C;
+extern u8 lbl_804545EC;
+extern u8 lbl_80454568;
+extern u8 lbl_8045469C;
+extern u8 lbl_804544FC;
+extern u8 lbl_804545C4;
+extern u8 lbl_8045468C;
+extern u8 lbl_804546F8;
+extern u8 lbl_80454668;
+
extern "C" {
// __ct__16dMeter_menuHIO_cFv
// dMeter_menuHIO_c::dMeter_menuHIO_c(void)
diff --git a/src/d/d_meter/d_meter_button.cpp b/src/d/d_meter/d_meter_button.cpp
index 6bb897ebd0..7702cd3acd 100644
--- a/src/d/d_meter/d_meter_button.cpp
+++ b/src/d/d_meter/d_meter_button.cpp
@@ -143,6 +143,45 @@ void mDoExt_getCurrentHeap(void);
void mDoExt_getMesgFont(void);
}
+// additional symbols needed for d_meter_button.cpp
+// autogenerated by split.py v0.3 at 2021-01-02 05:32:46.640422
+extern u8 lbl_80454788;
+extern u8 lbl_8045478C;
+extern u8 lbl_804547A0;
+extern u8 lbl_803BF258;
+extern u8 lbl_80454774;
+extern u8 lbl_8045477C;
+extern u8 lbl_80454784;
+extern u8 lbl_8045475C;
+extern u8 lbl_803980E8;
+extern u8 lbl_8045474C;
+extern u8 lbl_80454790;
+extern u8 lbl_80454748;
+extern u8 lbl_80454798;
+extern u8 lbl_8045479C;
+extern u8 lbl_80454760;
+extern u8 lbl_80454778;
+extern u8 lbl_80454754;
+extern u8 lbl_804547A4;
+extern u8 lbl_80454750;
+extern u8 lbl_80454770;
+extern u8 lbl_803BF1A8;
+extern u8 lbl_80454758;
+extern u8 lbl_80398048;
+extern u8 lbl_80454780;
+extern u8 lbl_803BF200;
+extern u8 lbl_80398098;
+extern u8 lbl_80454794;
+extern u8 lbl_80454768;
+extern u8 lbl_804547A8;
+extern u8 lbl_804547AC;
+extern u8 lbl_803A6F88;
+extern u8 lbl_803790C0;
+extern u8 lbl_80430188;
+extern u8 lbl_8042EBC8;
+extern u8 lbl_80430188;
+extern u8 lbl_8043028C;
+
extern "C" {
// __ct__14dMeterButton_cFv
// dMeterButton_c::dMeterButton_c(void)
diff --git a/src/d/d_meter/d_meter_haihai.cpp b/src/d/d_meter/d_meter_haihai.cpp
index 7d714f2b17..14cde1bb34 100644
--- a/src/d/d_meter/d_meter_haihai.cpp
+++ b/src/d/d_meter/d_meter_haihai.cpp
@@ -27,6 +27,32 @@ void J2DScreen_NS_setPriority(void);
void rotate__7J2DPaneFff13J2DRotateAxisf(void);
}
+// additional symbols needed for d_meter_haihai.cpp
+// autogenerated by split.py v0.3 at 2021-01-02 05:38:04.795367
+extern u8 lbl_804547D4;
+extern u8 lbl_804547E8;
+extern u8 lbl_803BF268;
+extern u8 lbl_804547B8;
+extern u8 lbl_804547C8;
+extern u8 lbl_804547D8;
+extern u8 lbl_804547EC;
+extern u8 lbl_804547CC;
+extern u8 lbl_804547C4;
+extern u8 lbl_804547BC;
+extern u8 lbl_804547E0;
+extern u8 lbl_804547C0;
+extern u8 lbl_80398158;
+extern u8 lbl_804547F0;
+extern u8 lbl_804547E4;
+extern u8 lbl_804547D0;
+extern u8 lbl_804547B4;
+extern u8 lbl_804547F8;
+extern u8 lbl_803BB6D4;
+extern u8 lbl_804547B0;
+extern u8 lbl_804547DC;
+extern u8 lbl_803A6F88;
+extern u8 lbl_8042EBC8;
+
extern "C" {
// __ct__14dMeterHaihai_cFUc
// dMeterHaihai_c::dMeterHaihai_c(unsigned char)
diff --git a/src/d/d_meter/d_meter_hakusha.cpp b/src/d/d_meter/d_meter_hakusha.cpp
index e9efc19221..8dd496ae38 100644
--- a/src/d/d_meter/d_meter_hakusha.cpp
+++ b/src/d/d_meter/d_meter_hakusha.cpp
@@ -31,6 +31,23 @@ void J2DScreen_NS_draw(void);
void J2DScreen_NS_setPriority(void);
}
+// additional symbols needed for d_meter_hakusha.cpp
+// autogenerated by split.py v0.3 at 2021-01-02 05:39:40.792760
+extern u8 lbl_8045480C;
+extern u8 lbl_80454810;
+extern u8 lbl_80454800;
+extern u8 lbl_803981B0;
+extern u8 lbl_803BF2B8;
+extern u8 lbl_803BF288;
+extern u8 lbl_80454814;
+extern u8 lbl_80454804;
+extern u8 lbl_80454808;
+extern u8 lbl_80454818;
+extern u8 lbl_803A6F88;
+extern u8 lbl_803BB6D4;
+extern u8 lbl_80430188;
+extern u8 lbl_8042EBC8;
+
extern "C" {
// __ct__15dMeterHakusha_cFPv
// dMeterHakusha_c::dMeterHakusha_c(void*)
diff --git a/src/d/d_meter/d_meter_map.cpp b/src/d/d_meter/d_meter_map.cpp
index 882f6586ef..e7e7f1c78e 100644
--- a/src/d/d_meter/d_meter_map.cpp
+++ b/src/d/d_meter/d_meter_map.cpp
@@ -41,6 +41,23 @@ void J2DPicture_X3_(void);
void onEventBit__11dSv_event_cFUs(void);
}
+// additional symbols needed for d_meter_map.cpp
+// autogenerated by split.py v0.3 at 2021-01-02 05:45:46.210955
+extern u8 lbl_803BF2F8;
+extern u8 lbl_80454838;
+extern u8 lbl_803BF2D8;
+extern u8 lbl_80454830;
+extern u8 lbl_80454820;
+extern u8 lbl_80454844;
+extern u8 lbl_80398208;
+extern u8 lbl_80454828;
+extern u8 lbl_80454840;
+extern u8 lbl_80454834;
+extern u8 lbl_80450D64;
+extern u8 lbl_803A6F88;
+extern u8 lbl_80430188;
+extern u8 lbl_803A7288;
+
extern "C" {
// isEnableDispMap__11dMeterMap_cFv
// dMeterMap_c::isEnableDispMap(void)
diff --git a/src/d/d_meter/d_meter_string.cpp b/src/d/d_meter/d_meter_string.cpp
index 68d31ca84c..c102d3abdd 100644
--- a/src/d/d_meter/d_meter_string.cpp
+++ b/src/d/d_meter/d_meter_string.cpp
@@ -33,6 +33,27 @@ void J2DTextBox_NS_setString_X1_(void);
void mDoExt_getMesgFont(void);
}
+// additional symbols needed for d_meter_string.cpp
+// autogenerated by split.py v0.3 at 2021-01-02 05:50:34.104338
+extern u8 lbl_803BF308;
+extern u8 lbl_80398210;
+extern u8 lbl_80454850;
+extern u8 lbl_80454878;
+extern u8 lbl_8045487C;
+extern u8 lbl_80454848;
+extern u8 lbl_8045484C;
+extern u8 lbl_80454854;
+extern u8 lbl_80454860;
+extern u8 lbl_80454858;
+extern u8 lbl_80454864;
+extern u8 lbl_80454870;
+extern u8 lbl_8045485C;
+extern u8 lbl_80454868;
+extern u8 lbl_803A6F88;
+extern u8 lbl_803BB6D4;
+extern u8 lbl_8042EBC8;
+extern u8 lbl_80430188;
+
extern "C" {
// __ct__14dMeterString_cFi
// dMeterString_c::dMeterString_c(int)
diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp
index 1f4aa0db5f..110ff316b5 100644
--- a/src/d/d_meter2.cpp
+++ b/src/d/d_meter2.cpp
@@ -181,6 +181,32 @@ void setBombNum__24dSv_player_item_record_cFUcUc(void);
void setItem__17dSv_player_item_cFiUc(void);
}
+// additional symbols needed for d_meter2.cpp
+// autogenerated by split.py v0.3 at 2021-01-02 05:21:57.405999
+extern u8 lbl_80454A00;
+extern u8 lbl_803BFA28;
+extern u8 lbl_8042E86C;
+extern u8 lbl_8042FC60;
+extern u8 lbl_804549C8;
+extern u8 lbl_804549EC;
+extern u8 lbl_80450E38;
+extern u8 lbl_804549E8;
+extern u8 lbl_804549F8;
+extern u8 lbl_80399338;
+extern u8 lbl_80430110;
+extern u8 lbl_804549E0;
+extern u8 lbl_80454A08;
+extern u8 lbl_804549D0;
+extern u8 lbl_804549FC;
+extern u8 lbl_804549F4;
+extern u8 lbl_80454A04;
+extern u8 lbl_804549F0;
+extern u8 lbl_8042FAFC;
+extern u8 lbl_804549CC;
+extern u8 lbl_804549D8;
+extern u8 lbl_80430188;
+extern u8 lbl_8042EBC8;
+
extern "C" {
// _create__9dMeter2_cFv
// dMeter2_c::_create(void)
diff --git a/src/d/d_meter2/d_meter2_draw.cpp b/src/d/d_meter2/d_meter2_draw.cpp
index 20f428a2f9..d60b66bea3 100644
--- a/src/d/d_meter2/d_meter2_draw.cpp
+++ b/src/d/d_meter2/d_meter2_draw.cpp
@@ -120,6 +120,101 @@ void rotate__7J2DPaneFff13J2DRotateAxisf(void);
void setBasePosition__7J2DPaneF15J2DBasePosition(void);
}
+// additional symbols needed for d_meter2_draw.cpp
+// autogenerated by split.py v0.3 at 2021-01-02 00:12:18.254960
+extern u8 lbl_80454890;
+extern u8 lbl_80454984;
+extern u8 lbl_803BF59C;
+extern u8 lbl_80454894;
+extern u8 lbl_80454928;
+extern u8 lbl_80454990;
+extern u8 lbl_80454980;
+extern u8 lbl_8045492C;
+extern u8 lbl_80454968;
+extern u8 lbl_8045488C;
+extern u8 lbl_80398258;
+extern u8 lbl_80398828;
+extern u8 lbl_80398850;
+extern u8 lbl_804548DC;
+extern u8 lbl_8045491C;
+extern u8 lbl_80454938;
+extern u8 lbl_804548D0;
+extern u8 lbl_80454904;
+extern u8 lbl_80454900;
+extern u8 lbl_804548E4;
+extern u8 lbl_804548B8;
+extern u8 lbl_80454898;
+extern u8 lbl_8043028C;
+extern u8 lbl_803BF5C0;
+extern u8 lbl_80454970;
+extern u8 lbl_804548A0;
+extern u8 lbl_803988D0;
+extern u8 lbl_804548FC;
+extern u8 lbl_8045498C;
+extern u8 lbl_804548D8;
+extern u8 lbl_80454950;
+extern u8 lbl_80454948;
+extern u8 lbl_80454888;
+extern u8 lbl_80454994;
+extern u8 lbl_80398878;
+extern u8 lbl_804548B0;
+extern u8 lbl_804548D4;
+extern u8 lbl_804548C0;
+extern u8 lbl_803988A8;
+extern u8 lbl_803AC5A0;
+extern u8 lbl_80454908;
+extern u8 lbl_803BF578;
+extern u8 lbl_80454964;
+extern u8 lbl_804548CC;
+extern u8 lbl_80454978;
+extern u8 lbl_80454920;
+extern u8 lbl_80454940;
+extern u8 lbl_80454954;
+extern u8 lbl_80454884;
+extern u8 lbl_804548F0;
+extern u8 lbl_80454930;
+extern u8 lbl_8045490C;
+extern u8 lbl_80456B9C;
+extern u8 lbl_80454918;
+extern u8 lbl_803BF350;
+extern u8 lbl_80454910;
+extern u8 lbl_804548F4;
+extern u8 lbl_80454974;
+extern u8 lbl_80456B90;
+extern u8 lbl_80454880;
+extern u8 lbl_80456B94;
+extern u8 lbl_80454958;
+extern u8 lbl_8045496C;
+extern u8 lbl_80398898;
+extern u8 lbl_8045497C;
+extern u8 lbl_80454924;
+extern u8 lbl_80454988;
+extern u8 lbl_8045494C;
+extern u8 lbl_8042EBC8;
+extern u8 lbl_804548E8;
+extern u8 lbl_80456B98;
+extern u8 lbl_80430158;
+extern u8 lbl_80454934;
+extern u8 lbl_8045493C;
+extern u8 lbl_804548AC;
+extern u8 lbl_803BF554;
+extern u8 lbl_803BF328;
+extern u8 lbl_8045495C;
+extern u8 lbl_804548A8;
+extern u8 lbl_804548EC;
+extern u8 lbl_80454914;
+extern u8 lbl_804548F8;
+extern u8 lbl_804548C8;
+extern u8 lbl_80454944;
+extern u8 lbl_804548BC;
+extern u8 lbl_804548E0;
+extern u8 lbl_803BF750;
+extern u8 lbl_804548B4;
+extern u8 lbl_80454960;
+extern u8 lbl_803A6F88;
+extern u8 lbl_80430188;
+extern u8 lbl_803A0004;
+
extern "C" {
// __ct__13dMeter2Draw_cFP10JKRExpHeap
// dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap*)
diff --git a/src/d/d_meter2/d_meter2_info.cpp b/src/d/d_meter2/d_meter2_info.cpp
index e989239a0c..a686c0acd6 100644
--- a/src/d/d_meter2/d_meter2_info.cpp
+++ b/src/d/d_meter2/d_meter2_info.cpp
@@ -54,6 +54,30 @@ void setBombNum__24dSv_player_item_record_cFUcUc(void);
void setItem__17dSv_player_item_cFiUc(void);
}
+// additional symbols needed for d_meter2_info.cpp
+// autogenerated by split.py v0.3 at 2021-01-02 00:19:27.063204
+extern u8 lbl_80399168;
+extern u8 lbl_80430178;
+extern u8 lbl_803BF760;
+extern u8 lbl_804549C0;
+extern u8 lbl_804549B0;
+extern u8 lbl_8045499C;
+extern u8 lbl_803BF81C;
+extern u8 lbl_803BFA1C;
+extern u8 lbl_804549A4;
+extern u8 lbl_80398A78;
+extern u8 lbl_804510BC;
+extern u8 lbl_803BF7F4;
+extern u8 lbl_80454998;
+extern u8 lbl_804549B8;
+extern u8 lbl_804549A8;
+extern u8 lbl_804549A0;
+extern u8 lbl_804510B8;
+extern u8 lbl_804549AC;
+extern u8 lbl_80430188;
+extern u8 lbl_803AC5A0;
+extern u8 lbl_803A7288;
+
extern "C" {
// __ct__13dMeter2Info_cFv
// dMeter2Info_c::dMeter2Info_c(void)
diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp
index 95a49856e9..9efd6be090 100644
--- a/src/d/d_save/d_save.cpp
+++ b/src/d/d_save/d_save.cpp
@@ -42,6 +42,20 @@ void setNowVibration__14dComIfG_play_cFUc(u8);
void setSound__19dSv_player_config_cFUc(void);
}
+extern f32 lbl_80451D58;
+extern char lbl_80379234[0x64];
+extern f32 lbl_80451D5C;
+extern u8 i_item_lst[24];
+extern u8 lbl_80430188[16];
+struct unkEvent { // figure out what this is later
+ u16 unk0[0x11A];
+ u8 unk565;
+ u16 unk566;
+ u8 unk567[0x439];
+};
+extern unkEvent lbl_803A7288;
+extern u32 _sRumbleSupported;
+
inline int dComIfGs_isItemFirstBit(u8 i_no) {
return g_dComIfG_gameInfo.getSaveFile().getPlayerGetItem().isFirstBit(i_no);
}
@@ -370,8 +384,8 @@ u8 dSv_player_item_c::getItem(int item_idx, bool isComboItem) const {
return 0xFF;
}
}
- // ‡¬ƒAƒCƒeƒ€•s’聁„%d, %d\n
- // Uncertain combination item„%d, %d\n
+ // ‡¬ƒAƒCƒeƒ€•s’蝝„%d, %d\n
+ // Uncertain combination item„%d, %d\n
OSReport_Error(lbl_80379234 + 9, item_id_2, item_id_1);
}
}
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index 7803e6557b..65b51f5f14 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -10,7 +10,7 @@
#include "m_Do/m_Do_Reset/m_Do_Reset.h"
extern "C" {
- void fopScnM_SearchByID__FUi(void);
+void fopScnM_SearchByID__FUi(void);
void fopCamM_Create__FisPv(void);
char* strcpy(char*, const char*);
int strcmp(const char*, const char*);
@@ -75,6 +75,45 @@ void stage_tgsc_data_class(void);
void* memalignB__3cMlFiUl(int pAlign, u32 pSize);
}
+extern char lbl_80378A50[0x3F8]; // d_stage string literals
+extern u8 lbl_803F5784;
+extern u8 lbl_803F0000;
+extern u8 lbl_80450D64;
+extern u8 lbl_80450D65;
+extern u8 lbl_80450D66;
+extern u8 lbl_80450D68;
+extern u8 lbl_804505F0;
+extern u8 lbl_803F6094;
+extern u8 lbl_80450D6C;
+extern u8 lbl_80450D70;
+extern u8 lbl_80450D6C;
+extern u8 lbl_803A6920;
+extern u8 lbl_803A696C;
+extern u8 lbl_80450D67;
+extern u8 lbl_80451C90;
+extern u8 lbl_80450D60;
+extern u8 lbl_804307EC;
+extern u8 lbl_803A65CC;
+extern u8 lbl_803A65FC;
+extern u8 lbl_803A6620;
+extern u8 lbl_803A6638;
+extern u8 lbl_803A6644;
+extern u8 lbl_803A6650;
+extern u8 lbl_803A668C;
+extern u8 lbl_803A66BC;
+extern u8 lbl_803A67F4;
+extern u8 lbl_803A689C;
+extern u8 lbl_803A68FC;
+extern u8 lbl_80406194;
+extern u8 lbl_80451C94;
+extern u8 lbl_80451C98;
+extern u8 lbl_803F4E68;
+extern u8 lbl_80450D74;
+extern u8 lbl_803A6D94;
+extern u8 lbl_803A6AAC;
+extern u8 lbl_803A1EC8;
+extern u8 J3DLightObj;
+
#ifdef NONMATCHING
void dStage_nextStage_c::set(const char* param_1, s8 param_2, s16 param_3, s8 param_4, s8 param_5,
u8 param_6) {
diff --git a/src/f/f_ap_game.cpp b/src/f/f_ap_game.cpp
index 206932c19d..6dec3a874a 100644
--- a/src/f/f_ap_game.cpp
+++ b/src/f/f_ap_game.cpp
@@ -29,6 +29,7 @@ extern u8 lbl_803A35A0;
extern u8 lbl_803F1BB0;
extern u8 lbl_80451BC0;
extern u8 lbl_80451BC4;
+extern u8 lbl_80450580;
// __ct__11fapGm_HIO_cFv
// fapGm_HIO_c::fapGm_HIO_c(void)
diff --git a/src/f/f_op/f_op_actor_mng.cpp b/src/f/f_op/f_op_actor_mng.cpp
index 2054613ad3..983f7a6a97 100644
--- a/src/f/f_op/f_op_actor_mng.cpp
+++ b/src/f/f_op/f_op_actor_mng.cpp
@@ -239,6 +239,11 @@ void dBgS_ObjLinChk_NS_dtor(void);
void dBgS_GndChk_NS_dtor(void);
}
+class j3dsys {
+public:
+ Mtx mtx;
+};
+
// additional symbols needed for f_op_actor_mng.cpp
// autogenerated by split.py v0.4 at 2021-01-25 19:11:04.087561
extern u8 lbl_803A35F0;
@@ -288,6 +293,9 @@ extern u8 lbl_80451C54;
extern u8 lbl_80451C58;
extern u8 lbl_80451C5C;
extern u8 lbl_80451C60;
+extern j3dsys lbl_80434AC8;
+extern u8 lbl_80450AE0;
+extern u8 lbl_803DD470;
inline u32 fopAcM_GetID(const void* pProc) {
return fpcM_GetID(pProc);
diff --git a/src/f/f_op/f_op_msg_mng.cpp b/src/f/f_op/f_op_msg_mng.cpp
index 7aa8f11455..1302b54eda 100644
--- a/src/f/f_op/f_op_msg_mng.cpp
+++ b/src/f/f_op/f_op_msg_mng.cpp
@@ -7,7 +7,7 @@
// additional symbols needed for f_op_msg_mng.cpp
// autogenerated by split.py v0.4 at 2021-02-15 20:21:51.945228
extern "C" {
- void fopScnM_SearchByID__FUi(void);
+void fopScnM_SearchByID__FUi(void);
void _restgpr_26(void);
void _restgpr_27(void);
void _restgpr_28(void);
@@ -71,6 +71,7 @@ extern u8 lbl_80451C7C;
extern u8 lbl_80451C80;
extern u8 lbl_80451C84;
extern u8 lbl_80451C88;
+extern u8 lbl_80430188;
extern "C" {
// fopMsgM_setStageLayer__FPv
diff --git a/src/f/f_op/f_op_scene_iter.cpp b/src/f/f_op/f_op_scene_iter.cpp
index 3cffb50a6b..5c41c7c27b 100644
--- a/src/f/f_op/f_op_scene_iter.cpp
+++ b/src/f/f_op/f_op_scene_iter.cpp
@@ -1,7 +1,7 @@
/* f_op_scene_iter.cpp autogenerated by split.py v0.4 at 2021-02-15 20:27:34.795954 */
-#include "SComponent/c_tag_iter.h"
#include "f/f_op/f_op_scene_iter.h"
+#include "SComponent/c_tag_iter.h"
#include "global.h"
// additional symbols needed for f_op_scene_iter.cpp
diff --git a/src/f/f_op/f_op_scene_mng.cpp b/src/f/f_op/f_op_scene_mng.cpp
index 0a91d44850..cecabc5746 100644
--- a/src/f/f_op/f_op_scene_mng.cpp
+++ b/src/f/f_op/f_op_scene_mng.cpp
@@ -27,7 +27,7 @@ extern u8 lbl_804505B8;
// fopScnM_SearchByID__FUi
// fopScnM_SearchByID(unsigned int)
// void* fopScnM_SearchByID(unsigned int id) {
-// unsigned int tmp = id + 8;
+// unsigned int tmp = id + 8;
// return fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, (void*)tmp);
// }
diff --git a/src/f/f_pc/f_pc_manager.cpp b/src/f/f_pc/f_pc_manager.cpp
index ee95369db7..5bb64c9b42 100644
--- a/src/f/f_pc/f_pc_manager.cpp
+++ b/src/f/f_pc/f_pc_manager.cpp
@@ -38,7 +38,9 @@ extern u8 lbl_80450D38;
extern s8 lbl_80450D39;
extern u8 lbl_80450EC4;
extern layer_class lbl_803F4DB0; // f_pc_manager::rootlayer$3716
-extern node_list_class lbl_803F4DDC; // f_pc_manager::queue$3717
+extern node_list_class lbl_803F4DDC; // f_pc_manager::queue$3717'extern u8 lbl_80450B60;
+extern JUTGamePad* m_gamePad[4];
+extern Z2SoundMgr* lbl_80450B60; // Z2SoundMgr sInstance
void fpcM_Draw(void* pProc) {
fpcDw_Execute((base_process_class*)pProc);
diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index 59609b45bb..6eb68f0c15 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -64,6 +64,7 @@ extern u8 lbl_803A3530;
extern u8 lbl_803DFC20;
extern u8 lbl_803E0C20;
extern u8 lbl_803E0F40;
+extern u8 lbl_803EAF40;
extern "C" {
// __ct__15mDoMemCd_Ctrl_cFv
diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp
index 9660b6038d..228b07b7be 100644
--- a/src/m_Do/m_Do_MemCardRWmng.cpp
+++ b/src/m_Do/m_Do_MemCardRWmng.cpp
@@ -32,6 +32,7 @@ void mDoMemCdRWm_TestCheckSumGameData(void);
// autogenerated by split.py v0.4 at 2021-01-31 21:17:23.731257
extern u8 lbl_80374408;
extern u8 lbl_803ECF40;
+extern u8 lbl_803EAF40;
extern "C" {
// mDoMemCdRWm_Store__FP12CARDFileInfoPvUl
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index dcb8d36e39..c3a39b2e61 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -23,6 +23,13 @@ void VISetBlack(s32);
void VIWaitForRetrace(void);
}
+extern u8 lbl_80450BB8;
+extern char lbl_80374198[16];
+extern u8 lbl_803EAF40[];
+extern u8 lbl_80451501;
+extern void* lbl_804514F0;
+extern void (*lbl_804514EC)(int, void*); // JUTGamePad::C3ButtonReset::sCallback
+
void my_OSCancelAlarmAll(void) {
return;
}
diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp
index 693a77243e..21e3dbc03b 100644
--- a/src/m_Do/m_Do_audio.cpp
+++ b/src/m_Do/m_Do_audio.cpp
@@ -9,6 +9,9 @@
#include "m_Do/m_Do_Reset/m_Do_Reset.h"
#include "m_Do/m_Do_main/m_Do_main.h"
+#define _SDA_BASE_(dummy) 0
+#define _SDA2_BASE_(dummy) 0
+
extern "C" {
void __dl__FPv(void);
void __dt__10JSUPtrListFv(void);
@@ -18,6 +21,21 @@ void free__7JKRHeapFPvP7JKRHeap(void);
void func_80361C24(void);
}
+extern JKRHeap* sRootHeap__7JKRHeap; // JKRHeap::sRootHeap
+extern JKRHeap* sCurrentHeap__7JKRHeap; // JKRHeap::sCurrentHeap
+extern u8 lbl_80450BB8;
+extern u8 lbl_80450C80;
+extern u8 lbl_803CBF38;
+extern u8 lbl_80450B40;
+extern u8 lbl_803CBF24;
+extern u8 lbl_803C9D80;
+extern u8 lbl_803CAC48;
+extern u8 lbl_803A2F4C;
+extern u8 lbl_80450B50;
+extern u8 lbl_803C9D70;
+extern u8 lbl_80450B60;
+extern u8 lbl_80450B80;
+
void mDoAud_zelAudio_c::reset(void) {
lbl_80450BBA = false;
}
diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp
index 66d16be5c9..bc7f646626 100644
--- a/src/m_Do/m_Do_controller_pad.cpp
+++ b/src/m_Do/m_Do_controller_pad.cpp
@@ -17,6 +17,15 @@ void mDoRst_resetCallBack__FiPv(void);
void read__10JUTGamePadFv(void);
}
+extern JUTGamePad* m_gamePad[4];
+extern u8 lbl_80450580;
+extern u8 lbl_804514EC;
+extern u8 lbl_804514F0;
+extern u8 lbl_80451A20;
+extern u8 lbl_80451A30;
+extern u8 lbl_80451A24;
+extern u8 lbl_80451A28;
+
// TODO: m_cpadInfo uses a bad type in a number of the NONMATCHING functions,
// and references need to be updated to reflect its correct type.
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index 06943a2629..17e5fe0c81 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -17,12 +17,9 @@ void GXGetTexObjWidth(void);
void cXyz_NS_dtor(void);
void GXLoadNrmMtxImm(void);
void GXLoadPosMtxImm(void);
-
void GXSetArray(void);
void GXSetNumIndStages(void);
-
void GXSetTexCoordScaleManually(void);
-
void J3DAnmColor_NS_searchUpdateMaterialID(void);
void J3DAnmTevRegKey_NS_searchUpdateMaterialID(void);
void J3DAnmTexPattern_NS_searchUpdateMaterialID(void);
@@ -298,13 +295,10 @@ void mDoExt_createZeldaHeap(void);
void mDoExt_destroyExpHeap(void);
void mDoExt_getArchiveHeapPtr(void);
void mDoExt_getAssertHeap(void);
-
void mDoExt_getDbPrintHeap(void);
-
void mDoExt_getMesgFont(void);
void mDoExt_getRubyFont(void);
void mDoExt_getSubFont(void);
-
void mDoExt_initFont0(void);
void mDoExt_initFont1(void);
void mDoExt_initFont2(void);
@@ -332,6 +326,11 @@ void setErrorFlag__7JKRHeapFb(void);
void strcmp(void);
}
+class j3dsys {
+public:
+ Mtx mtx;
+};
+
// additional symbols needed for m_Do_ext.cpp
// autogenerated by split.py v0.4 at 2021-01-31 20:51:05.468192
extern u8 lbl_803740C0;
@@ -409,6 +408,10 @@ extern u8 lbl_804563DC;
extern u8 lbl_804563E4;
extern u8 lbl_804563F0;
extern u8 lbl_804563F8;
+extern u8 lbl_80450AE0;
+extern j3dsys lbl_80434AC8;
+extern u8 lbl_80451180;
+extern JKRHeap* sCurrentHeap__7JKRHeap; // JKRHeap::sCurrentHeap
extern "C" {
// mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index 9bd855af7c..6774ea6366 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -15,6 +15,17 @@
#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
#include "m_Do/m_Do_main/m_Do_main.h"
+class j3dsys {
+public:
+ Mtx mtx;
+};
+extern j3dsys lbl_80434AC8;
+extern u8 sCurrentHeap__7JKRHeap;
+extern u8 lbl_80451550;
+extern u8 lbl_80450580;
+extern u8 lbl_80450AE0;
+extern u8 lbl_803DD470;
+
#ifdef NONMATCHING // mr and addi swapped
ResTIMG* createTimg(u16 width, u16 height, u32 format) {
u32 data_offset = 32;
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index 2fc30d1698..79c3ca666c 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -123,6 +123,12 @@ extern u8 lbl_80451570;
extern u8 lbl_80451B00;
extern u8 lbl_80451B04;
extern JKRExpHeap* sSystemHeap__7JKRHeap;
+extern JKRHeap* sRootHeap__7JKRHeap;
+extern u8 lbl_80450580;
+extern u8 lbl_80451501;
+extern u8 lbl_804508B0;
+extern u8 sSZSBufferSize__7JKRAram;
+extern u8 lbl_803EAF40;
extern "C" {
// myGetHeapTypeByString__FP7JKRHeap
diff --git a/src/m_Do/m_Do_machine_exception.cpp b/src/m_Do/m_Do_machine_exception.cpp
index 5e9601e262..d4a8a863f8 100644
--- a/src/m_Do/m_Do_machine_exception.cpp
+++ b/src/m_Do/m_Do_machine_exception.cpp
@@ -39,6 +39,7 @@ extern u8 lbl_80450C2C;
extern u8 lbl_80450C34;
extern u8 lbl_80450C90;
extern JUTConsole* lbl_804511B8;
+extern u8 lbl_803A2EE0;
extern "C" {
// print_f__FPCce
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 2b4bddadea..4e07f7fbf9 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -19,25 +19,6 @@
#include "m_Do/m_Do_reset/m_Do_reset.h"
#include "msl_c/string.h"
-extern float lbl_80451A00;
-extern float lbl_80451A04;
-extern float lbl_80451A08;
-extern u8 lbl_80451A0C;
-extern u8 lbl_80451A10;
-extern u8 lbl_80451A18;
-extern u8 lbl_803D0000;
-extern float lbl_80450B2C;
-extern float lbl_80450B1C;
-extern JKRExpHeap* sSystemHeap__7JKRHeap;
-extern JKRExpHeap* lbl_80450C2C;
-extern JKRExpHeap* lbl_80450C28;
-extern JKRExpHeap* lbl_80450C34;
-extern s8 lbl_80450B20;
-extern s8 lbl_80450B28;
-extern float lbl_80450B24;
-extern s8 lbl_80450B30;
-
-extern char lbl_803739A0[0x310];
extern "C" {
void cDyl_InitAsync(void);
void CheckHeap1__9HeapCheckFv(void);
@@ -48,8 +29,6 @@ void debug__Fv(void);
void dRes_control_c_NS_dump(void);
void dump__11JKRAramHeapFv(void);
void DynamicModuleControlBase_NS_dump(void);
-void fapGm_Create(void);
-void fapGm_Execute(void);
void fopAcM_initManager(void);
void getFreeSize__11JKRAramHeapFv(void);
void getFreeSize__7JKRHeapCFv(void);
@@ -74,8 +53,42 @@ void clear__10JUTConsoleFv(void);
void setMessageCount__12JUTAssertionFi(void);
}
+extern float lbl_80451A00;
+extern float lbl_80451A04;
+extern float lbl_80451A08;
+extern u8 lbl_80451A0C;
+extern u8 lbl_80451A10;
+extern u8 lbl_80451A18;
+extern u8 lbl_803D0000;
+extern float lbl_80450B2C;
+extern float lbl_80450B1C;
+extern JKRExpHeap* sSystemHeap__7JKRHeap;
+extern JKRExpHeap* lbl_80450C2C;
+extern JKRExpHeap* lbl_80450C28;
+extern JKRExpHeap* lbl_80450C34;
+extern s8 lbl_80450B20;
+extern s8 lbl_80450B28;
+extern float lbl_80450B24;
+extern s8 lbl_80450B30;
+extern char lbl_803739A0[0x310];
extern char* lbl_803A2F14[5];
extern char* lbl_803A2F28[5];
+extern u8 lbl_803A2EF4;
+extern char lbl_803A2EE0[16];
+extern u8 lbl_80450B19;
+extern s8 lbl_80450580;
+extern u8 LOAD_COPYDATE__FPv;
+extern JUTGamePad* m_gamePad[4];
+extern JKRHeap* sRootHeap__7JKRHeap; // JKRHeap::sRootHeap
+extern JKRHeap* sCurrentHeap__7JKRHeap; // JKRHeap::sCurrentHeap
+extern u8 lbl_803EAF40[];
+extern u8 lbl_80450B34;
+extern u8 lbl_80450B00;
+extern u8 lbl_80450C80;
+extern u32 lbl_803D3420[8192];
+extern u32 lbl_80450B0C;
+extern u32 lbl_80450B08;
+extern OSThread lbl_803DB420;
void version_check(void) {
if ((!strcmp("20Apr2004", "20Apr2004")) && (!strcmp("Patch2", "Patch2"))) {
diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp
index 46cdf9204f..42261dc6dd 100644
--- a/src/m_Do/m_Do_mtx.cpp
+++ b/src/m_Do/m_Do_mtx.cpp
@@ -2,6 +2,7 @@
#include "JSystem/JMath/JMath.h"
#include "global.h"
+#include "mtx_vec.h"
// additional symbols needed for m_Do_mtx.cpp
// autogenerated by split.py v0.4 at 2021-01-31 21:20:08.836541
@@ -57,6 +58,9 @@ extern u8 lbl_804505AC;
extern u8 lbl_80451B08;
extern u8 lbl_80451B0C;
extern u8 lbl_80451B10;
+extern u8 lbl_80451180;
+extern u8 lbl_80450AEC;
+extern u8 lbl_803DD470;
extern "C" {
// mDoMtx_XYZrotS__FPA4_fsss
diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp
index bf8aaac84e..5d16c6950d 100644
--- a/src/m_Do/m_Do_printf.cpp
+++ b/src/m_Do/m_Do_printf.cpp
@@ -3,6 +3,11 @@
#include "m_Do/m_Do_ext/m_Do_ext.h"
#include "os/OS.h"
+#define _SDA_BASE_(dummy) 0
+#define _SDA2_BASE_(dummy) 0
+
+extern u8 lbl_80450BA8;
+
asm void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32) {
nofralloc
#include "m_Do/m_Do_printf/asm/func_80006798.s"