mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-09 20:41:29 -04:00
j2d / map_path work, d_drawlist / d_attention cleanup (#208)
* work on fop actor / actor mng, daalink, d_a_obj_item * d_a_title mostly decompiled * daalink / d_event / JMessage / dmsg_out_font work * msg_scrn_base / msg_scrn_boss * some work on mDo machine, d_menu_save, d_tresure, and various * remove asm * progress * finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data * rename more data * remove asm / progress * match all of d_pane_class * fixes / some dKankyo doc * bunch of j2d work. d_drawlist / d_attention cleanup * progress / asm * cleanup wip * decompile JStage * setup some more JStudio structs * set up d_demo classes * some d_demo work * cleanup dolphin os stuff * some initial dEvent documentation * some At collision documentation * match JUTConsole::doDraw * dbgs work / split up some of d_a_alink into .inc files * d_a_alink_spinner work
This commit is contained in:
TakaRikka
@@ -279,40 +279,16 @@ SECTION_DATA static char* bmg_filename[10] = {
|
||||
};
|
||||
|
||||
/* 803BF350-803BF554 01C470 0204+00 1/1 0/0 0/0 .data i_action_num$8471 */
|
||||
SECTION_DATA static u8 i_action_num[516] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xE9, 0x00, 0x00, 0x03, 0xEA, 0x00, 0x00, 0x03, 0xEB,
|
||||
0x00, 0x00, 0x03, 0xEC, 0x00, 0x00, 0x03, 0xED, 0x00, 0x00, 0x03, 0xEE, 0x00, 0x00, 0x03, 0xEF,
|
||||
0x00, 0x00, 0x05, 0x6B, 0x00, 0x00, 0x03, 0xF1, 0x00, 0x00, 0x03, 0xF2, 0x00, 0x00, 0x03, 0xF3,
|
||||
0x00, 0x00, 0x03, 0xF4, 0x00, 0x00, 0x03, 0xF5, 0x00, 0x00, 0x03, 0xF6, 0x00, 0x00, 0x03, 0xF7,
|
||||
0x00, 0x00, 0x04, 0x09, 0x00, 0x00, 0x03, 0xF8, 0x00, 0x00, 0x03, 0xF9, 0x00, 0x00, 0x03, 0xFA,
|
||||
0x00, 0x00, 0x03, 0xFB, 0x00, 0x00, 0x03, 0xFC, 0x00, 0x00, 0x04, 0x15, 0x00, 0x00, 0x03, 0xFE,
|
||||
0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x04, 0x03, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x04, 0x05,
|
||||
0x00, 0x00, 0x04, 0x06, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x07, 0x00, 0x00, 0x04, 0x01,
|
||||
0x00, 0x00, 0x03, 0xFF, 0x00, 0x00, 0x04, 0x15, 0x00, 0x00, 0x04, 0x0C, 0x00, 0x00, 0x04, 0x08,
|
||||
0x00, 0x00, 0x00, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x04, 0x0B, 0x00, 0x00, 0x04, 0x0A, 0x00, 0x00, 0x04, 0x0D, 0x00, 0x00, 0x04, 0x0E,
|
||||
0x00, 0x00, 0x04, 0x0F, 0x00, 0x00, 0x04, 0x10, 0x00, 0x00, 0x04, 0x11, 0x00, 0x00, 0x03, 0xE6,
|
||||
0x00, 0x00, 0x04, 0x12, 0x00, 0x00, 0x04, 0x13, 0x00, 0x00, 0x04, 0x14, 0x00, 0x00, 0x04, 0x16,
|
||||
0x00, 0x00, 0x04, 0x17, 0x00, 0x00, 0x04, 0x18, 0x00, 0x00, 0x04, 0x19, 0x00, 0x00, 0x04, 0x1A,
|
||||
0x00, 0x00, 0x04, 0x1B, 0x00, 0x00, 0x04, 0x1C, 0x00, 0x00, 0x04, 0x1D, 0x00, 0x00, 0x04, 0x1E,
|
||||
0x00, 0x00, 0x04, 0x1F, 0x00, 0x00, 0x04, 0x20, 0x00, 0x00, 0x04, 0x21, 0x00, 0x00, 0x04, 0x22,
|
||||
0x00, 0x00, 0x04, 0x23, 0x00, 0x00, 0x04, 0x2E, 0x00, 0x00, 0x04, 0x24, 0x00, 0x00, 0x04, 0x25,
|
||||
0x00, 0x00, 0x04, 0x26, 0x00, 0x00, 0x04, 0x27, 0x00, 0x00, 0x04, 0x28, 0x00, 0x00, 0x04, 0x2B,
|
||||
0x00, 0x00, 0x04, 0x29, 0x00, 0x00, 0x04, 0x2A, 0x00, 0x00, 0x04, 0xBB, 0x00, 0x00, 0x04, 0x2D,
|
||||
0x00, 0x00, 0x03, 0xFD, 0x00, 0x00, 0x04, 0x30, 0x00, 0x00, 0x04, 0x31, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x04, 0x32, 0x00, 0x00, 0x04, 0x33, 0x00, 0x00, 0x04, 0x34, 0x00, 0x00, 0x04, 0x35,
|
||||
0x00, 0x00, 0x04, 0x36, 0x00, 0x00, 0x04, 0x37, 0x00, 0x00, 0x04, 0x38, 0x00, 0x00, 0x04, 0x39,
|
||||
0x00, 0x00, 0x04, 0x3A, 0x00, 0x00, 0x04, 0x3B, 0x00, 0x00, 0x04, 0x3C, 0x00, 0x00, 0x04, 0x3D,
|
||||
0x00, 0x00, 0x04, 0x3E, 0x00, 0x00, 0x04, 0x3F, 0x00, 0x00, 0x04, 0x40, 0x00, 0x00, 0x04, 0x41,
|
||||
0x00, 0x00, 0x04, 0x42, 0x00, 0x00, 0x04, 0x44, 0x00, 0x00, 0x04, 0x45, 0x00, 0x00, 0x04, 0x46,
|
||||
0x00, 0x00, 0x04, 0x47, 0x00, 0x00, 0x04, 0x48, 0x00, 0x00, 0x07, 0x70, 0x00, 0x00, 0x04, 0x49,
|
||||
0x00, 0x00, 0x04, 0x4A, 0x00, 0x00, 0x04, 0x4B, 0x00, 0x00, 0x04, 0x4C, 0x00, 0x00, 0x04, 0x7E,
|
||||
0x00, 0x00, 0x04, 0x7D, 0x00, 0x00, 0x04, 0x7C, 0x00, 0x00, 0x05, 0x61, 0x00, 0x00, 0x04, 0x7B,
|
||||
0x00, 0x00, 0x04, 0x79, 0x00, 0x00, 0x04, 0x7A, 0x00, 0x00, 0x04, 0x89, 0x00, 0x00, 0x04, 0x8A,
|
||||
0x00, 0x00, 0x04, 0x8B, 0x00, 0x00, 0x04, 0x8C, 0x00, 0x00, 0x04, 0x8D, 0x00, 0x00, 0x04, 0x8E,
|
||||
0x00, 0x00, 0x04, 0x78, 0x00, 0x00, 0x03, 0xD6, 0x00, 0x00, 0x03, 0xD7, 0x00, 0x00, 0x04, 0x77,
|
||||
0x00, 0x00, 0x04, 0x88, 0x00, 0x00, 0x05, 0x27, 0x00, 0x00, 0x05, 0x22, 0x00, 0x00, 0x05, 0x77,
|
||||
0x00, 0x00, 0x03, 0xF0,
|
||||
SECTION_DATA static int i_action_num[129] = {
|
||||
0, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1387, 1009, 1010, 1011, 1012, 1013, 1014,
|
||||
1015, 1033, 1016, 1017, 1018, 1019, 1020, 1045, 1022, 1026, 1027, 1028, 1029, 1030, 1024,
|
||||
1031, 1025, 1023, 1045, 1036, 1032, 93, 0, 0, 0, 1035, 1034, 1037, 1038, 1039,
|
||||
1040, 1041, 998, 1042, 1043, 1044, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054,
|
||||
1055, 1056, 1057, 1058, 1059, 1070, 1060, 1061, 1062, 1063, 1064, 1067, 1065, 1066, 1211,
|
||||
1069, 1021, 1072, 1073, 0, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083,
|
||||
1084, 1085, 1086, 1087, 1088, 1089, 1090, 1092, 1093, 1094, 1095, 1096, 1904, 1097, 1098,
|
||||
1099, 1100, 1150, 1149, 1148, 1377, 1147, 1145, 1146, 1161, 1162, 1163, 1164, 1165, 1166,
|
||||
1144, 982, 983, 1143, 1160, 1319, 1314, 1399, 1008,
|
||||
};
|
||||
|
||||
/* 803BF554-803BF578 -00001 0024+00 1/1 0/0 0/0 .data @9008 */
|
||||
@@ -521,7 +497,7 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* p_heap) {
|
||||
mpPikariParent = new CPaneMgr(mpPikariScreen, 'pika_n', 0, NULL);
|
||||
field_0x548 = ((J2DPicture*)mpPikariScreen->search('pika00'))->getBlack();
|
||||
field_0x54c = ((J2DPicture*)mpPikariScreen->search('pika00'))->getWhite();
|
||||
OSInitFastCast();
|
||||
i_OSInitFastCast();
|
||||
void* pikari_bck = JKRGetNameResource("zelda_icon_pikari.bck", dComIfGp_getMain2DArchive());
|
||||
mPikariBck = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(pikari_bck);
|
||||
playPikariBckAnimation(1.0f);
|
||||
@@ -1159,7 +1135,7 @@ void dMeter2Draw_c::initMagic() {
|
||||
mpMagicFrameL = new CPaneMgr(mpKanteraScreen, 'm_w_l_n', 2, NULL);
|
||||
mpMagicFrameR = new CPaneMgr(mpKanteraScreen, 'm_w_r_n', 2, NULL);
|
||||
mpMagicMeter = new CPaneMgr(mpKanteraScreen, 'mm_00', 0, NULL);
|
||||
OSInitFastCast();
|
||||
i_OSInitFastCast();
|
||||
|
||||
void* res = JKRFileLoader::getGlbResource("zelda_game_image_sanso_10percent.bpk",
|
||||
dComIfGp_getMain2DArchive());
|
||||
|
||||
Reference in New Issue
Block a user