Remove assets.h from global.h, some other header adjustments (#174)

* splits

* torch

* torch again

* headers

* merges

* format
This commit is contained in:
petrie911
2024-03-21 17:19:38 -03:00
committed by GitHub
parent df268e3bad
commit 4a572e7e30
65 changed files with 594 additions and 685 deletions
+1 -1
View File
@@ -31,7 +31,7 @@ D_800D0000 = 0x800D0000;//ignore:true
D_7FFFFFFE = 0x7FFFFFFE;//ignore:true
D_1000000 = 0x01000000;//ignore:true
D_TI_A000000 = 0x0A000000;//ignore:true
D_4000000 = 0x04000000;//ignore:true
D_ENMY_PLANET_4000000 = 0x04000000;//ignore:true
// constant for K1 access
D_TI_A0000000 = 0xA0000000;//ignore:true
+102 -102
View File
@@ -537,10 +537,10 @@ D_6017550 = 0x06017550;
D_TI1_700AB70 = 0x0700AB70;
D_TI1_700BE00 = 0x0700BE00;
D_70111D0 = 0x070111D0;
D_70143C0 = 0x070143C0;
D_7018708 = 0x07018708;
D_70187B4 = 0x070187B4;
D_END_70111D0 = 0x070111D0;
D_END_70143C0 = 0x070143C0;
D_END_7018708 = 0x07018708;
D_END_70187B4 = 0x070187B4;
D_VE1_9018BD0 = 0x09018BD0;
D_VE1_901A4B8 = 0x0901A4B8;
@@ -728,7 +728,7 @@ D_C038954 = 0x0C038954;
// fox_end2
D_arwing_3016CC0 = 0x03016CC0;
D_50054B0 = 0x050054B0;
D_7016540 = 0x07016540;
D_END_7016540 = 0x07016540;
// fox_edisplay
D_6027960 = 0x06027960;
@@ -1030,7 +1030,7 @@ D_6014D94 = 0x006014D94;
// fox_enmy2
D_6011F90 = 0x06011F90;
D_4000710 = 0x04000710;
D_ENMY_PLANET_4000710 = 0x04000710;
D_601F2A0 = 0x0601F2A0;
D_A6_6016190 = 0x06016190;
D_SX_6023500 = 0x06023500;
@@ -1064,9 +1064,9 @@ D_600AC70 = 0x0600AC70;
D_6002500 = 0x06002500;
D_60043F0 = 0x060043F0;
D_6004310 = 0x06004310;
D_4006E90 = 0x04006E90;
D_4009800 = 0x04009800;
D_40073C0 = 0x040073C0;
D_ENMY_PLANET_4006E90 = 0x04006E90;
D_ENMY_PLANET_4009800 = 0x04009800;
D_ENMY_PLANET_40073C0 = 0x040073C0;
D_A6_60282A0 = 0x060282A0;
D_SX_603298C = 0x0603298C;
@@ -1108,21 +1108,21 @@ D_60368E0 = 0x060368E0;
// fox_option
D_8003B50 = 0x08003B50;
D_8003EB0 = 0x08003EB0;
D_8004270 = 0x08004270;
D_80043B0 = 0x080043B0;
D_80046B0 = 0x080046B0;
D_8004930 = 0x08004930;
D_8005010 = 0x08005010;
D_80054F0 = 0x080054F0;
D_8005910 = 0x08005910;
D_80143B0 = 0x080143B0;
D_80039D0 = 0x080039D0;
D_80147B0 = 0x080147B0;
D_8003A50 = 0x08003A50;
D_8013990 = 0x08013990;
D_80141B0 = 0x080141B0;
D_OPT_8003B50 = 0x08003B50;
D_OPT_8003EB0 = 0x08003EB0;
D_OPT_8004270 = 0x08004270;
D_OPT_80043B0 = 0x080043B0;
D_OPT_80046B0 = 0x080046B0;
D_OPT_8004930 = 0x08004930;
D_OPT_8005010 = 0x08005010;
D_OPT_80054F0 = 0x080054F0;
D_OPT_8005910 = 0x08005910;
D_OPT_80143B0 = 0x080143B0;
D_OPT_80039D0 = 0x080039D0;
D_OPT_80147B0 = 0x080147B0;
D_OPT_8003A50 = 0x08003A50;
D_OPT_8013990 = 0x08013990;
D_OPT_80141B0 = 0x080141B0;
D_VS_70030B0 = 0x070030B0;
D_VS_7003290 = 0x07003290;
D_VS_7003470 = 0x07003470;
@@ -1453,17 +1453,17 @@ D_vs_player_302E95C = 0x302E95C;
D_vs_player_302EA4C = 0x302EA4C;
D_vs_player_302EB3C = 0x302EB3C;
D_vs_player_302EC20 = 0x302EC20;
D_4000080 = 0x4000080;
D_400014C = 0x400014C;
D_40001A4 = 0x40001A4;
D_4000270 = 0x4000270;
D_40018A0 = 0x40018A0;
D_40057AC = 0x40057AC;
D_40058B8 = 0x40058B8;
D_40068F0 = 0x40068F0;
D_4007AF0 = 0x4007AF0;
D_4008CE0 = 0x4008CE0;
D_4008F70 = 0x4008F70;
D_ENMY_PLANET_4000080 = 0x4000080;
D_ENMY_PLANET_400014C = 0x400014C;
D_ENMY_PLANET_40001A4 = 0x40001A4;
D_ENMY_PLANET_4000270 = 0x4000270;
D_ENMY_PLANET_40018A0 = 0x40018A0;
D_ENMY_PLANET_40057AC = 0x40057AC;
D_ENMY_PLANET_40058B8 = 0x40058B8;
D_ENMY_PLANET_40068F0 = 0x40068F0;
D_ENMY_PLANET_4007AF0 = 0x4007AF0;
D_ENMY_PLANET_4008CE0 = 0x4008CE0;
D_ENMY_PLANET_4008F70 = 0x4008F70;
D_5000200 = 0x5000200;
D_5000300 = 0x5000300;
D_5000500 = 0x5000500;
@@ -2105,7 +2105,7 @@ D_VS_7001270 = 0x7001270;
D_WZ_7001540 = 0x7001540;
D_VS_7001DF0 = 0x7001DF0;
D_VS_7002110 = 0x7002110;
D_7002120 = 0x7002120;
D_END_7002120 = 0x7002120;
D_TI1_7002270 = 0x7002270;
D_TI1_7002490 = 0x7002490;
D_VS_7003650 = 0x7003650;
@@ -2118,7 +2118,7 @@ D_VS_7004010 = 0x7004010;
D_VS_7004050 = 0x7004050;
D_VS_7004150 = 0x7004150;
D_VS_70041F0 = 0x70041F0;
D_7004240 = 0x7004240;
D_END_7004240 = 0x7004240;
D_VS_70042F0 = 0x70042F0;
D_VS_7004360 = 0x7004360;
D_VS_7004460 = 0x7004460;
@@ -2143,8 +2143,8 @@ D_TI1_700A990 = 0x700A990;
D_TI1_700B9C0 = 0x700B9C0;
D_TI1_700BB10 = 0x700BB10;
D_TI1_700C4B0 = 0x700C4B0;
D_700C620 = 0x700C620;
D_700C8B0 = 0x700C8B0;
D_END_700C620 = 0x700C620;
D_END_700C8B0 = 0x700C8B0;
D_TI1_700C8D8 = 0x700C8D8;
D_TI1_700C964 = 0x700C964;
D_TI1_700C980 = 0x700C980;
@@ -2155,76 +2155,76 @@ D_TI1_700D700 = 0x700D700;
D_TI2_700E244 = 0x700E244;
D_TI1_700E3F0 = 0x700E3F0;
D_VS_700E9A0 = 0x700E9A0;
D_700E9E0 = 0x700E9E0;
D_700EA38 = 0x700EA38;
D_700F240 = 0x700F240;
D_700F320 = 0x700F320;
D_7010970 = 0x7010970;
D_7010E10 = 0x7010E10;
D_7010EE0 = 0x7010EE0;
D_7010F00 = 0x7010F00;
D_7010FD0 = 0x7010FD0;
D_7010FF0 = 0x7010FF0;
D_70110C0 = 0x70110C0;
D_70110E0 = 0x70110E0;
D_70111B0 = 0x70111B0;
D_END_700E9E0 = 0x700E9E0;
D_END_700EA38 = 0x700EA38;
D_END_700F240 = 0x700F240;
D_END_700F320 = 0x700F320;
D_END_7010970 = 0x7010970;
D_END_7010E10 = 0x7010E10;
D_END_7010EE0 = 0x7010EE0;
D_END_7010F00 = 0x7010F00;
D_END_7010FD0 = 0x7010FD0;
D_END_7010FF0 = 0x7010FF0;
D_END_70110C0 = 0x70110C0;
D_END_70110E0 = 0x70110E0;
D_END_70111B0 = 0x70111B0;
D_VS_70118E0 = 0x70118E0;
D_70122E0 = 0x70122E0;
D_END_70122E0 = 0x70122E0;
D_VS_70123F8 = 0x70123F8;
D_8000000 = 0x8000000;
D_8000400 = 0x8000400;
D_8000680 = 0x8000680;
D_80006A0 = 0x80006A0;
D_OPT_8000000 = 0x8000000;
D_OPT_8000400 = 0x8000400;
D_OPT_8000680 = 0x8000680;
D_OPT_80006A0 = 0x80006A0;
D_TI_8000708 = 0x8000708;
D_TI_8000D80 = 0x8000D80;
D_TI_8000D90 = 0x8000D90;
D_TI_8000FC0 = 0x8000FC0;
D_80016A0 = 0x80016A0;
D_80017A0 = 0x80017A0;
D_80017C0 = 0x80017C0;
D_80037C0 = 0x80037C0;
D_80038C0 = 0x80038C0;
D_80038E0 = 0x80038E0;
D_8003930 = 0x8003930;
D_8003950 = 0x8003950;
D_80039A8 = 0x80039A8;
D_8003A70 = 0x8003A70;
D_8003AB8 = 0x8003AB8;
D_8003AE0 = 0x8003AE0;
D_8003B28 = 0x8003B28;
D_8003B50 = 0x8003B50;
D_80046B0 = 0x80046B0;
D_8004C50 = 0x8004C50;
D_8005CD0 = 0x8005CD0;
D_8006280 = 0x8006280;
D_80064F0 = 0x80064F0;
D_80069C0 = 0x80069C0;
D_8006D10 = 0x8006D10;
D_8006E50 = 0x8006E50;
D_8007210 = 0x8007210;
D_80076E0 = 0x80076E0;
D_80079F0 = 0x80079F0;
D_80080F0 = 0x80080F0;
D_80084B0 = 0x80084B0;
D_8008A30 = 0x8008A30;
D_8008DA0 = 0x8008DA0;
D_OPT_80016A0 = 0x80016A0;
D_OPT_80017A0 = 0x80017A0;
D_OPT_80017C0 = 0x80017C0;
D_OPT_80037C0 = 0x80037C0;
D_OPT_80038C0 = 0x80038C0;
D_OPT_80038E0 = 0x80038E0;
D_OPT_8003930 = 0x8003930;
D_OPT_8003950 = 0x8003950;
D_OPT_80039A8 = 0x80039A8;
D_OPT_8003A70 = 0x8003A70;
D_OPT_8003AB8 = 0x8003AB8;
D_OPT_8003AE0 = 0x8003AE0;
D_OPT_8003B28 = 0x8003B28;
D_OPT_8003B50 = 0x8003B50;
D_OPT_80046B0 = 0x80046B0;
D_OPT_8004C50 = 0x8004C50;
D_OPT_8005CD0 = 0x8005CD0;
D_OPT_8006280 = 0x8006280;
D_OPT_80064F0 = 0x80064F0;
D_OPT_80069C0 = 0x80069C0;
D_OPT_8006D10 = 0x8006D10;
D_OPT_8006E50 = 0x8006E50;
D_OPT_8007210 = 0x8007210;
D_OPT_80076E0 = 0x80076E0;
D_OPT_80079F0 = 0x80079F0;
D_OPT_80080F0 = 0x80080F0;
D_OPT_80084B0 = 0x80084B0;
D_OPT_8008A30 = 0x8008A30;
D_OPT_8008DA0 = 0x8008DA0;
D_TI_8008FE8 = 0x8008FE8;
D_80098E0 = 0x80098E0;
D_8009980 = 0x8009980;
D_8009B00 = 0x8009B00;
D_8009CE0 = 0x8009CE0;
D_800B5E0 = 0x800B5E0;
D_800B680 = 0x800B680;
D_800C640 = 0x800C640;
D_800CD90 = 0x800CD90;
D_800D070 = 0x800D070;
D_800D170 = 0x800D170;
D_800D1F0 = 0x800D1F0;
D_800E130 = 0x800E130;
D_800E170 = 0x800E170;
D_8015550 = 0x8015550;
D_8015DF0 = 0x8015DF0;
D_8025080 = 0x8025080;
D_OPT_80098E0 = 0x80098E0;
D_OPT_8009980 = 0x8009980;
D_OPT_8009B00 = 0x8009B00;
D_OPT_8009CE0 = 0x8009CE0;
D_OPT_800B5E0 = 0x800B5E0;
D_OPT_800B680 = 0x800B680;
D_OPT_800C640 = 0x800C640;
D_OPT_800CD90 = 0x800CD90;
D_OPT_800D070 = 0x800D070;
D_OPT_800D170 = 0x800D170;
D_OPT_800D1F0 = 0x800D1F0;
D_OPT_800E130 = 0x800E130;
D_OPT_800E170 = 0x800E170;
D_OPT_8015550 = 0x8015550;
D_OPT_8015DF0 = 0x8015DF0;
D_OPT_8025080 = 0x8025080;
D_VE1_9002CF0 = 0x9002CF0;
D_VE1_9003330 = 0x9003330;
D_VE1_9003890 = 0x9003890;