From cd6c98022237babf00ed8c65dfa5caa9ebc3655f Mon Sep 17 00:00:00 2001 From: Ethan Date: Sat, 20 Jan 2024 03:47:09 +0900 Subject: [PATCH 1/6] working on it --- ver/jp/splat.yaml | 47 ++++++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index 44827476f07..04fdb99276d 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -26,7 +26,6 @@ options: undefined_syms_auto_path: ver/jp/undefined_syms_auto.txt symbol_name_format: JP_$VRAM symbol_name_format_no_rom: JP_$VRAM_$SEG - ld_legacy_generation: True asset_stack: - jp segments: @@ -280,6 +279,8 @@ segments: - [auto, c, os/destroythread, gcc_272 -O3] - [auto, hasm, os/osMapTLBRdb] - [auto, c, os/vi, gcc_272 -O3] + - [auto, c, os/vimodepallan1, -O3] + - [auto, c, os/vimodempallan1, -O3] - [auto, c, os/vigetcurrcontext, gcc_272 -O3] - [auto, hasm, os/padding] - [auto, hasm, os/guNormalize] @@ -305,32 +306,26 @@ segments: subsegments: - [0x4F1E0] - [0x4F1F0, i4, reset_tiles, 128, 8] - - [auto, .data, main] - - [auto, .data, main_loop] - - [auto, .data, background_gfx] - - [auto, .data, rumble] - - [auto, .data, 43F0] - - [auto, .data, fio] - start: 0x4F9C0 type: .data name: curtains subsegments: - - [0x4F9C0, i4, theater/walls, 16, 32] - - [0x4FAC0] - - [0x4FB10, rgba32, theater/curtains, 32, 32] - - [0x50B10] - - [0x50B60, ci4, theater/floor, 32, 16] - - [0x50C60, palette, theater/floor] - - [0x50C80] - - [0x50D00, vtx, theater/left_wall_vtx] - - [0x50D60, vtx, theater/right_wall_vtx] - - [0x50DC0, vtx, theater/floor_vtx] - - [0x50F50, vtx, theater/left_inset_shadow_vtx] - - [0x50F90, vtx, theater/right_inset_shadow_vtx] - - [0x50FD0, vtx, theater/curtain_vtx] - - [0x511C0, vtx, theater/wall_shadows_vtx] - - [0x51240] - - [0x51520, ia8, ui/no_controller, 128, 32] + - [0x4F9C0, i4, theater/walls, 16, 32] + - [0x4FAC0] + - [0x4FB10, rgba32, theater/curtains, 32, 32] + - [0x50B10] + - [0x50B60, ci4, theater/floor, 32, 16] + - [0x50C60, palette, theater/floor] + - [0x50C80] + - [0x50D00, vtx, theater/left_wall_vtx] + - [0x50D60, vtx, theater/right_wall_vtx] + - [0x50DC0, vtx, theater/floor_vtx] + - [0x50F50, vtx, theater/left_inset_shadow_vtx] + - [0x50F90, vtx, theater/right_inset_shadow_vtx] + - [0x50FD0, vtx, theater/curtain_vtx] + - [0x511C0, vtx, theater/wall_shadows_vtx] + - [0x51240] + - [0x51520, ia8, ui/no_controller, 128, 32] - [auto, .data, crash_screen] - [auto, .data, os/nusys/nugfxtaskmgr] - [auto, .data, cam_math] @@ -414,9 +409,6 @@ segments: - [auto, c, 8a160_len_700] - [auto, c, 8a860_len_3f30] - [auto, c, draw_box] - - [auto, .data, npc_collision] - - [auto, .data, world/actions] - - [auto, .data, world/partners] - start: 0x91B40 type: .data name: global_hud_scripts @@ -801,7 +793,6 @@ segments: - [0x9DBF0, rgba32, ui/stat_flower, 16, 16] - [0x9DFF0] - [auto, .data, 891b0_len_fb0] - - [auto, .data, 8a160_len_700] - start: 0xA2AF0 type: .data name: 8a160_len_700 @@ -812,7 +803,6 @@ segments: - [0xA2D50, gfx, A2BC0] - [0xA2E18, gfx, A2C88] - [0xA2E40] - - [auto, .data, 8a860_len_3f30] - start: 0xA2EE0 type: .data name: draw_box @@ -973,7 +963,6 @@ segments: subsegments: - [auto, c, msg_data] - [auto, c, msg_img] - - [auto, .data, msg_data] - start: 0x10D030 type: .data name: msg_img From 2975e25f705911b6fcee7b25216cf4c12be16a94 Mon Sep 17 00:00:00 2001 From: Ethan Date: Sat, 20 Jan 2024 04:55:54 +0900 Subject: [PATCH 2/6] ique brok --- src/os/nusys/nugfxfuncset.c | 3 - src/os/nusys/nugfxthread.c | 3 + ver/ique/splat.yaml | 159 +++++------------------------------- ver/jp/splat.yaml | 89 +------------------- ver/pal/splat.yaml | 90 ++++++-------------- 5 files changed, 53 insertions(+), 291 deletions(-) diff --git a/src/os/nusys/nugfxfuncset.c b/src/os/nusys/nugfxfuncset.c index ecc4bb1727d..e833fb522d9 100644 --- a/src/os/nusys/nugfxfuncset.c +++ b/src/os/nusys/nugfxfuncset.c @@ -1,9 +1,6 @@ #include "common.h" #include "nu/nusys.h" -NUGfxFunc nuGfxFunc = NULL; -NUGfxPreNMIFunc nuGfxPreNMIFunc = NULL; - void nuGfxFuncSet(NUGfxFunc func) { OSIntMask intMask; diff --git a/src/os/nusys/nugfxthread.c b/src/os/nusys/nugfxthread.c index 6cec569bd2a..bdd21a48600 100644 --- a/src/os/nusys/nugfxthread.c +++ b/src/os/nusys/nugfxthread.c @@ -3,6 +3,9 @@ void gfxThread(void*); +NUGfxFunc nuGfxFunc = NULL; +NUGfxPreNMIFunc nuGfxPreNMIFunc = NULL; + extern char GfxStack[NU_GFX_STACK_SIZE]; extern OSThread D_800B1B90; extern OSMesg nuGfxMesgBuf[NU_GFX_MESGS]; diff --git a/ver/ique/splat.yaml b/ver/ique/splat.yaml index 94b223d2a80..ec8eee6c6bd 100644 --- a/ver/ique/splat.yaml +++ b/ver/ique/splat.yaml @@ -93,8 +93,8 @@ segments: - [auto, c, audio/33450] - [auto, c, audio/tables] - [auto, c, audio/reverb] - - [auto, c, 5B320] - [auto, c, effects] + - [auto, c, 5B320] - [auto, c, world/world] - [auto, c, collision] - [auto, c, 38F00] @@ -312,79 +312,23 @@ segments: type: .data name: curtains subsegments: - - [0x4E650, i4, theater/walls, 16, 32] - - [0x4E750] - - [0x4E7A0, rgba32, theater/curtains, 32, 32] - - [0x4F7A0] - - [0x4F7F0, ci4, theater/floor, 32, 16] - - [0x4F8F0, palette, theater/floor] - - [0x4F910] - - [0x4F990, vtx, theater/left_wall_vtx] - - [0x4F9F0, vtx, theater/right_wall_vtx] - - [0x4FA50, vtx, theater/floor_vtx] - - [0x4FBE0, vtx, theater/left_inset_shadow_vtx] - - [0x4FC20, vtx, theater/right_inset_shadow_vtx] - - [0x4FC60, vtx, theater/curtain_vtx] - - [0x4FE50, vtx, theater/wall_shadows_vtx] - - [0x4FED0] - - [0x501B0, ia8, ui/no_controller, 128, 32] - - [0x511B0] - - [auto, .data, crash_screen] - - [auto, .data, os/nusys/nugfxtaskmgr] - - [auto, .data, cam_math] - - [auto, .data, game_modes] - - [auto, .data, state_battle] - - [auto, .data, state_logos] - - [auto, .data, state_pause] - - [auto, .data, state_file_select] - - [auto, .data, state_title_screen] - - [auto, .data, state_demo] - - [auto, .data, npc] - - [auto, .data, encounter] - - [auto, .data, status_icons] - - [auto, .data, audio/25f00_len_940] - - [auto, .data, audio/sfx_player] - - [auto, .data, audio/30450] - - [auto, .data, audio/31650] - - [auto, .data, audio/33450] - - [auto, .data, audio/tables] - - [auto, .data, audio/reverb] - - [auto, .data, effects] - - [auto, .data, 5B320] - - [auto, .data, world/world] - - [auto, .data, 38F00] - - [auto, .data, os/nusys/nusched] - - [auto, .data, os/nusys/nugfxinit] - - [auto, .data, os/nusys/nucontpakmgr] - - [auto, .data, os/nusys/nucontrmbmgr] - - [auto, .data, os/nusys/nugfxfuncset] - - [auto, .data, os/nusys/nusimgr] - - [auto, .data, os/nusys/nucontmgr] - - [auto, .data, os/aisetnextbuf] - - [auto, .data, os/controller] - - [auto, .data, os/position] - - [auto, .data, os/rotateRPY] - - [auto, .data, os/sins] - - [auto, .data, os/xprintf] - - [auto, .data, os/seteventmesg] - - [auto, .data, os/siacs] - - [auto, .data, os/thread] - - [auto, .data, os/timerintr] - - [auto, .data, os/vimgr] - - [auto, .data, os/vitbl] - - [auto, .data, os/vimodentsclan1] - - [auto, .data, os/vimodempallan1] - - [auto, .data, os/guRotate] - - [auto, .data, os/exceptasm] - - [auto, .data, os/pimgr] - - [auto, .data, os/cartrominit] - - [auto, .data, os/piacs] - - [auto, .data, os/contpfs] - - [auto, .data, os/initialize] - - [auto, .data, os/xlitob] - - [auto, .data, os/vi] - - [auto, .data, os/vimodepallan1] - - [auto, .data, battle/battle] + - [0x4E650, i4, theater/walls, 16, 32] + - [0x4E750] + - [0x4E7A0, rgba32, theater/curtains, 32, 32] + - [0x4F7A0] + - [0x4F7F0, ci4, theater/floor, 32, 16] + - [0x4F8F0, palette, theater/floor] + - [0x4F910] + - [0x4F990, vtx, theater/left_wall_vtx] + - [0x4F9F0, vtx, theater/right_wall_vtx] + - [0x4FA50, vtx, theater/floor_vtx] + - [0x4FBE0, vtx, theater/left_inset_shadow_vtx] + - [0x4FC20, vtx, theater/right_inset_shadow_vtx] + - [0x4FC60, vtx, theater/curtain_vtx] + - [0x4FE50, vtx, theater/wall_shadows_vtx] + - [0x4FED0] + - [0x501B0, ia8, ui/no_controller, 128, 32] + - [0x511B0] - [0x700B0, bin, gspF3DEX2kawase_fifo_text] - [0x716E0, bin, gspF3DEX2kawase_fifo_data] - [0x71B00, bin, n_aspMain_data] @@ -406,13 +350,11 @@ segments: - [auto, c, world/actions] - [auto, c, world/partners] - [auto, hasm, bss2_2] + - [auto, c, global_hud_scripts] - [auto, c, 891b0_len_fb0] - [auto, c, 8a160_len_700] - [auto, c, 8a860_len_3f30] - [auto, c, draw_box] - - [auto, .data, npc_collision] - - [auto, .data, world/actions] - - [auto, .data, world/partners] - start: 0x90570 type: .data name: global_hud_scripts @@ -796,8 +738,6 @@ segments: - [0x9C618] - [0x9C620, rgba32, ui/stat_flower, 16, 16] - [0x9CA20] - - [auto, .data, 891b0_len_fb0] - - [auto, .data, 8a160_len_700] - start: 0xA1520 type: .data name: 8a160_len_700 @@ -808,7 +748,6 @@ segments: - [0xA1780, gfx, A2BC0] - [0xA1848, gfx, A2C88] - [0xA1870] - - [auto, .data, 8a860_len_3f30] - start: 0xA1950 type: .data name: draw_box @@ -858,15 +797,6 @@ segments: - [auto, c, sprite_shading] - [auto, c, audio/sfx] - [auto, c, audio/e0b30_len_b80] - - [auto, .data, entity] - - [auto, .data, game_states] - - [auto, .data, model] - - [auto, .data, animator] - - [auto, .data, entity_model] - - [auto, .data, msg] - - [auto, .data, msg_draw] - - [auto, .data, draw_img_util] - - [auto, .data, item_entity] - start: 0xE1D60 type: .data name: screen_overlays @@ -880,14 +810,6 @@ segments: - [0xE3C10] - [0xE3DE0, vtx, vtx/stencil2] - [0xE3F60] - - [auto, .data, screen_render_util] - - [auto, .data, imgfx] - - [auto, .data, hud_element] - - [auto, .data, background] - - [auto, .data, audio/ambience] - - [auto, .data, windows] - - [auto, .data, audio/sfx] - - [auto, .data, audio/e0b30_len_b80] - [0xE4DB0] - name: heaps type: code @@ -954,20 +876,6 @@ segments: - [0x109AE0, i4, entity/shadow/square_big, 32, 32] - [0x109CE0, i4, entity/shadow/circle_big, 32, 32] - [0x109EE0] - - [auto, .data, entity/SaveBlock] - - [auto, .data, entity/Switch] - - [auto, .data, entity/ShatteringBlock_common] - - [auto, .data, entity/ShatteringBlock] - - [auto, .data, entity/Block] - - [auto, .data, entity/ItemBlock] - - [auto, .data, entity/HeartBlock] - - [auto, .data, entity/SuperBlock] - - [auto, .data, entity/SimpleSpring] - - [auto, .data, entity/HiddenPanel] - - [auto, .data, entity/Chest] - - [auto, .data, entity/WoodenCrate] - - [auto, .data, entity/BlueWarpPipe] - - [auto, .data, entity/Signpost] - name: font_width type: code start: 0x10BB80 @@ -975,7 +883,6 @@ segments: subsegments: - [auto, c, msg_data] - [auto, c, msg_img] - - [auto, .data, msg_data] - start: 0x10BE20 type: .data name: msg_img @@ -1300,14 +1207,6 @@ segments: - [auto, c, pause_spirits] - [auto, c, pause_map] - [auto, c, pause_gfx] - - [auto, .data, pause_main] - - [auto, .data, pause_tabs] - - [auto, .data, pause_stats] - - [auto, .data, pause_badges] - - [auto, .data, pause_items] - - [auto, .data, pause_partners] - - [auto, .data, pause_spirits] - - [auto, .data, pause_map] - start: 0x18C680 type: .data name: pause_gfx @@ -1355,11 +1254,7 @@ segments: - [auto, c, filemenu_info] - [auto, c, filemenu_createfile] - [auto, c, filemenu_msg] - - [auto, .data, filemenu_common] - - [auto, .data, filemenu_main] - - [auto, .data, filemenu_yesno] - - [auto, .data, filemenu_info] - - [auto, .data, filemenu_createfile] + - [auto, c, filemenu_styles] - start: 0x1B3B40 type: .data name: filemenu_gfx @@ -1367,9 +1262,6 @@ segments: - [auto, ia4, copyarrow, 64, 16] - [auto, rgba32, corners_yellow, 16, 64] - [auto, ia8, corners_gray, 16, 32] - - [auto, .data, filemenu_gfx] - - [auto, .data, filemenu_msg] - - [auto, .data, filemenu_styles] - [0x1B59A0] - name: battle_code type: code @@ -1384,6 +1276,7 @@ segments: - [auto, c, battle/entity_model_icons] - [auto, c, battle/dmg_item] - [auto, c, battle/181810] + - [auto, c, battle/partner_dma] - [auto, c, battle/actor_rendering] - [auto, c, battle/level_up] - [auto, c, battle/player_events] @@ -1398,11 +1291,6 @@ segments: - [auto, c, battle/dmg_partner] - [auto, c, battle/standard_events] - [auto, c, battle/use_star_powers] - - [auto, .data, battle/16C8E0] - - [auto, .data, battle/camera] - - [auto, .data, battle/actors] - - [auto, .data, battle/popup_messages] - - [auto, .data, battle/entity_model_icons] - start: 0x1FB260 type: .data name: battle/entity_model_icons @@ -1410,11 +1298,6 @@ segments: - [0x1FB260, ci4, ui/battle/cursor_hand, 32, 32] - [0x1FB460, palette, ui/battle/cursor_hand] - [0x1FB480] - - [auto, .data, battle/partner_dma] - - [auto, .data, battle/181810] - - [auto, .data, battle/actor_rendering] - - [auto, .data, battle/level_up] - - [auto, .data, battle/player_events] - start: 0x200D60 type: .data name: battle_ui_gfx diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index 04fdb99276d..d153e7ec3d4 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -209,6 +209,7 @@ segments: - [auto, c, os/vigetmode, gcc_272 -O3] - [auto, c, os/vimgr, gcc_272 -O3] - [auto, c, os/vitbl, gcc_272 -O3] + - [auto, c, os/vimodentsclan1, gcc_272 -O3] - [auto, c, os/visetevent, gcc_272 -O3] - [auto, c, os/visetmode, gcc_272 -O3] - [auto, c, os/visetspecial, gcc_272 -O3] @@ -326,64 +327,7 @@ segments: - [0x511C0, vtx, theater/wall_shadows_vtx] - [0x51240] - [0x51520, ia8, ui/no_controller, 128, 32] - - [auto, .data, crash_screen] - - [auto, .data, os/nusys/nugfxtaskmgr] - - [auto, .data, cam_math] - - [auto, .data, game_modes] - - [auto, .data, state_battle] - - [auto, .data, state_logos] - - [auto, .data, state_pause] - - [auto, .data, state_file_select] - - [auto, .data, state_title_screen] - - [auto, .data, state_demo] - - [auto, .data, npc] - - [auto, .data, encounter] - - [auto, .data, status_icons] - - [auto, .data, audio/25f00_len_940] - - [auto, .data, audio/sfx_player] - - [auto, .data, audio/30450] - - [auto, .data, audio/31650] - - [auto, .data, audio/33450] - - [auto, .data, audio/tables] - - [auto, .data, audio/reverb] - - [auto, .data, effects] - - [auto, .data, 5B320] - - [auto, .data, world/world] - - [auto, .data, 38F00] - - [auto, .data, os/nusys/nusched] - - [auto, .data, os/nusys/nugfxinit] - - [auto, .data, os/nusys/nucontpakmgr] - - [auto, .data, os/nusys/nucontrmbmgr] - - [auto, .data, os/nusys/nugfxfuncset] - - [auto, .data, os/nusys/nusimgr] - - [auto, .data, os/nusys/nucontmgr] - - [auto, .data, os/pimgr] - - [auto, .data, os/cartrominit] - - [auto, .data, os/piacs ] - - [auto, .data, os/aisetnextbuf] - - [auto, .data, os/controller] - - [auto, .data, os/position] - - [auto, .data, os/rotateRPY] - - [auto, .data, os/sins] - - [auto, .data, os/xprintf] - - [auto, .data, os/seteventmesg] - - [auto, .data, os/siacs] - - [auto, .data, os/thread] - - [auto, .data, os/timerintr] - - [auto, .data, os/vimgr] - - [auto, .data, os/vitbl] - - [auto, .data, os/vimodentsclan1] - - [auto, .data, os/guRotate] - - [auto, .data, os/contpfs] - - [auto, .data, os/contramread] - - [auto, .data, os/initialize] - - [auto, .data, os/exceptasm] - - [auto, .data, os/xlitob] - - [auto, .data, os/vi] - - [auto, .data, os/vimodepallan1] - - [auto, .data, os/vimodempallan1] - - [auto, .data, battle/battle] - [0x71410, bin, gspF3DEX2kawase_fifo_text] - [0x72A40, bin, gspF3DEX2kawase_fifo_data] - [0x72E60, bin, n_aspMain_data] @@ -405,6 +349,7 @@ segments: - [auto, c, world/actions] # DUMMY ROM - [auto, c, world/partners] - [auto, hasm, bss2_2] + - [auto, c, global_hud_scripts] - [auto, c, 891b0_len_fb0] - [auto, c, 8a160_len_700] - [auto, c, 8a860_len_3f30] @@ -792,7 +737,6 @@ segments: - [0x9DBE8] - [0x9DBF0, rgba32, ui/stat_flower, 16, 16] - [0x9DFF0] - - [auto, .data, 891b0_len_fb0] - start: 0xA2AF0 type: .data name: 8a160_len_700 @@ -860,13 +804,6 @@ segments: - [auto, c, sprite_shading] - [auto, c, audio/sfx] - [auto, c, audio/e0b30_len_b80] - - [auto, .data, entity] - - [auto, .data, model] - - [auto, .data, animator] - - [auto, .data, entity_model] - - [auto, .data, msg] - - [auto, .data, msg_draw] - - [auto, .data, item_entity] - start: 0xE6620 type: .data name: screen_overlays @@ -880,14 +817,6 @@ segments: - [0xE84D0] - [0xE86A0, vtx, vtx/stencil2] - [0xE8820] - - [auto, .data, screen_render_util] - - [auto, .data, imgfx] - - [auto, .data, hud_element] - - [auto, .data, background] - - [auto, .data, audio/ambience] - - [auto, .data, windows] - - [auto, .data, audio/sfx] - - [auto, .data, audio/e0b30_len_b80] - name: evt dir: evt @@ -941,20 +870,6 @@ segments: - [0x10AB80, i4, entity/shadow/square_big, 32, 32] - [0x10AD80, i4, entity/shadow/circle_big, 32, 32] - [0x10AF80] - - [auto, .data, entity/SaveBlock] - - [auto, .data, entity/Switch] - - [auto, .data, entity/ShatteringBlock_common] - - [auto, .data, entity/ShatteringBlock] - - [auto, .data, entity/Block] - - [auto, .data, entity/ItemBlock] - - [auto, .data, entity/HeartBlock] - - [auto, .data, entity/SuperBlock] - - [auto, .data, entity/SimpleSpring] - - [auto, .data, entity/HiddenPanel] - - [auto, .data, entity/Chest] - - [auto, .data, entity/WoodenCrate] - - [auto, .data, entity/BlueWarpPipe] - - [auto, .data, entity/Signpost] - name: font_width type: code diff --git a/ver/pal/splat.yaml b/ver/pal/splat.yaml index f9f1c45a53a..7c676957674 100644 --- a/ver/pal/splat.yaml +++ b/ver/pal/splat.yaml @@ -50,13 +50,11 @@ segments: - [auto, c, world/actions] # DUMMY ROM - [auto, c, world/partners] - [auto, hasm, bss2_2] + - [auto, c, global_hud_scripts] - [auto, c, 891b0_len_fb0] - [auto, c, 8a160_len_700] - [auto, c, 8a860_len_3f30] - [auto, c, draw_box] - - [auto, .data, npc_collision] - - [auto, .data, world/actions] - - [auto, .data, world/partners] - start: 0x8DA40 type: .data name: global_hud_scripts @@ -511,8 +509,6 @@ segments: - [0x9B5A8, rgba32, ui/stat_heart, 16, 16] - [0x9B9B0, rgba32, ui/stat_flower, 16, 16] - [0x9BDB0] - - [auto, .data, 891b0_len_fb0] - - [auto, .data, 8a160_len_700] - start: 0xA1160 type: .data name: 8a160_len_700 @@ -523,7 +519,6 @@ segments: - [0xA13C0, gfx, A2BC0] - [0xA1488, gfx, A2C88] - [0xA14B0] - - [auto, .data, 8a860_len_3f30] - start: 0xA1590 type: .data name: draw_box @@ -572,15 +567,6 @@ segments: - [auto, c, sprite_shading] - [auto, c, audio/sfx] - [auto, c, audio/e0b30_len_b80] - - [auto, .data, entity] - - [auto, .data, game_states] - - [auto, .data, model] - - [auto, .data, animator] - - [auto, .data, entity_model] - - [auto, .data, msg] - - [auto, .data, msg_draw] - - [auto, .data, draw_img_util] - - [auto, .data, item_entity] - start: 0xE1610 type: .data name: screen_overlays @@ -594,14 +580,6 @@ segments: - [0xE34C0] - [0xE3690, vtx, vtx/stencil2] - [0xE3810] - - [auto, .data, screen_render_util] - - [auto, .data, imgfx] - - [auto, .data, hud_element] - - [auto, .data, background] - - [auto, .data, audio/ambience] - - [auto, .data, windows] - - [auto, .data, audio/sfx] - - [auto, .data, audio/e0b30_len_b80] - [0xE61D0] - name: evt type: code @@ -636,46 +614,32 @@ segments: start: 0x1040F0 vram: 0x802E7070 subsegments: - - [auto, c, entity/Shadow] - - [auto, c, entity/SaveBlock] - - [auto, c, entity/Switch] - - [auto, c, entity/ShatteringBlock_common] - - [auto, c, entity/ShatteringBlock] - - [auto, c, entity/Block] - - [auto, c, entity/ItemBlock] - - [auto, c, entity/HeartBlock] - - [auto, c, entity/SuperBlock] - - [auto, c, entity/SimpleSpring] - - [auto, c, entity/HiddenPanel] - - [auto, c, entity/Chest] - - [auto, c, entity/WoodenCrate] - - [auto, c, entity/BlueWarpPipe] - - [auto, c, entity/Signpost] - - start: 0x10A9F0 - type: .data - name: entity/Shadow - subsegments: - - [0x10C4F0, i4, entity/shadow/square, 16, 16] - - [0x10C570, i4, entity/shadow/circle, 16, 16] - - [0x10C5F0, vtx, entity/vtx/shadow1] - - [0x10C630, vtx, entity/vtx/shadow2] - - [0x10C670, i4, entity/shadow/square_big, 32, 32] - - [0x10C870, i4, entity/shadow/circle_big, 32, 32] - - [0x10CA70] - - [auto, .data, entity/SaveBlock] - - [auto, .data, entity/Switch] - - [auto, .data, entity/ShatteringBlock_common] - - [auto, .data, entity/ShatteringBlock] - - [auto, .data, entity/Block] - - [auto, .data, entity/ItemBlock] - - [auto, .data, entity/HeartBlock] - - [auto, .data, entity/SuperBlock] - - [auto, .data, entity/SimpleSpring] - - [auto, .data, entity/HiddenPanel] - - [auto, .data, entity/Chest] - - [auto, .data, entity/WoodenCrate] - - [auto, .data, entity/BlueWarpPipe] - - [auto, .data, entity/Signpost] + - [auto, c, entity/Shadow] + - [auto, c, entity/SaveBlock] + - [auto, c, entity/Switch] + - [auto, c, entity/ShatteringBlock_common] + - [auto, c, entity/ShatteringBlock] + - [auto, c, entity/Block] + - [auto, c, entity/ItemBlock] + - [auto, c, entity/HeartBlock] + - [auto, c, entity/SuperBlock] + - [auto, c, entity/SimpleSpring] + - [auto, c, entity/HiddenPanel] + - [auto, c, entity/Chest] + - [auto, c, entity/WoodenCrate] + - [auto, c, entity/BlueWarpPipe] + - [auto, c, entity/Signpost] + - start: 0x10A9F0 + type: .data + name: entity/Shadow + subsegments: + - [0x10C4F0, i4, entity/shadow/square, 16, 16] + - [0x10C570, i4, entity/shadow/circle, 16, 16] + - [0x10C5F0, vtx, entity/vtx/shadow1] + - [0x10C630, vtx, entity/vtx/shadow2] + - [0x10C670, i4, entity/shadow/square_big, 32, 32] + - [0x10C870, i4, entity/shadow/circle_big, 32, 32] + - [0x10CA70] - [0x10E710, bin] From 8879f672bbd0b576c617e6debae053c6bd782b48 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 20 Jan 2024 19:16:02 +0900 Subject: [PATCH 3/6] Autos gawn (#1152) * ique builds * Yeet most `auto, .data` from ique * us dun --------- Co-authored-by: angie --- tools/build/configure.py | 3 +- ver/ique/splat.yaml | 127 +------------------ ver/us/splat.yaml | 261 ++------------------------------------- 3 files changed, 15 insertions(+), 376 deletions(-) diff --git a/tools/build/configure.py b/tools/build/configure.py index e62d2522af9..22e6637d779 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -626,6 +626,7 @@ def build( build(entry.object_path, entry.src_paths, "as") elif isinstance(seg, splat.segtypes.common.asm.CommonSegAsm) or ( isinstance(seg, splat.segtypes.common.data.CommonSegData) and not seg.type[0] == "." + or isinstance(seg, splat.segtypes.common.textbin.CommonSegTextbin) ): build(entry.object_path, entry.src_paths, "as") elif seg.type in ["pm_effect_loads", "pm_effect_shims"]: @@ -785,8 +786,6 @@ def build( ) elif ( isinstance(seg, splat.segtypes.common.bin.CommonSegBin) - or isinstance(seg, splat.segtypes.common.textbin.CommonSegTextbin) - or isinstance(seg, splat.segtypes.common.rodatabin.CommonSegRodatabin) ): build(entry.object_path, entry.src_paths, "bin") elif isinstance(seg, splat.segtypes.n64.yay0.N64SegYay0): diff --git a/ver/ique/splat.yaml b/ver/ique/splat.yaml index ec8eee6c6bd..6d5dfa3baec 100644 --- a/ver/ique/splat.yaml +++ b/ver/ique/splat.yaml @@ -301,13 +301,6 @@ segments: subsegments: - [0x4DE70] - [0x4DE80, i4, reset_tiles, 128, 8] - - [auto, .data, main] - - [auto, .data, main_loop] - - [auto, .data, background_gfx] - - [auto, .data, rumble] - - [auto, .data, 43F0] - - [auto, .data, fio] - - [auto, .data, curtains] - start: 0x4E650 type: .data name: curtains @@ -1253,6 +1246,7 @@ segments: - [auto, c, filemenu_yesno] - [auto, c, filemenu_info] - [auto, c, filemenu_createfile] + - [auto, c, filemenu_gfx] - [auto, c, filemenu_msg] - [auto, c, filemenu_styles] - start: 0x1B3B40 @@ -1275,11 +1269,12 @@ segments: - [auto, c, battle/popup_messages] - [auto, c, battle/entity_model_icons] - [auto, c, battle/dmg_item] - - [auto, c, battle/181810] - [auto, c, battle/partner_dma] + - [auto, c, battle/181810] - [auto, c, battle/actor_rendering] - [auto, c, battle/level_up] - [auto, c, battle/player_events] + - [auto, c, battle_ui_gfx] - [auto, c, battle/190A10] - [auto, c, battle/190B20] - [auto, c, battle/use_items] @@ -1457,14 +1452,6 @@ segments: - [0x2095D8] - [0x2095E0, ia8, ui/battle/swap_background, 48, 16] - [0x2098E0] - - [auto, .data, battle/190B20] - - [auto, .data, battle/use_items] - - [auto, .data, battle/use_moves] - - [auto, .data, battle/action_cmd] - - [auto, .data, battle/dmg_player] - - [auto, .data, battle/1A5830] - - [auto, .data, battle/standard_events] - - [auto, .data, battle/use_star_powers] - [0x215390, pm_icons, icon] - dir: logos type: code @@ -6348,7 +6335,6 @@ segments: - [0x5E91C0, gfx, gfx10] - [0x5E9200, gfx, gfx11] - [0x5E9250] - - [auto, .data, anim/lava_piranha_anim] - start: 0x5EB8D0 type: .data name: actor/lava_piranha @@ -6358,17 +6344,6 @@ segments: - [0x5EBE70, palette, lava_piranha_vine] - [0x5EC070, gfx, lava_piranha_vine] - [0x5EC148] - - [auto, .data, actor/petit_piranha] - - [auto, .data, actor/lava_bud] - - [auto, .data, actor/petit_piranha_bomb] - - [auto, .data, stage/kzn_01] - - [auto, .data, stage/kzn_01b] - - [auto, .data, stage/kzn_02] - - [auto, .data, stage/kzn_04] - - [auto, .data, stage/kzn_04b] - - [auto, .data, stage/kzn_04c] - - [auto, .data, stage/kzn_05] - - [auto, .data, area] - [0x5F9C90] - dir: battle/area/flo type: code @@ -6498,6 +6473,7 @@ segments: - [auto, c, stage/sam_03] - [auto, c, area] - [auto, c, dlist] + - [auto, c, vtx] - start: 0x687A90 type: .data name: actor/monstar @@ -6506,16 +6482,6 @@ segments: - [0x687CC8, ci4, actor/img, 32, 32] - [0x687EC8, palette, actor/img] - [0x687EE8] - - [auto, .data, actor/paragoomba] - - [auto, .data, actor/gray_magikoopa] - - [auto, .data, stage/sam_01] - - [auto, .data, stage/sam_02] - - [auto, .data, stage/sam_02b] - - [auto, .data, stage/sam_02c] - - [auto, .data, stage/sam_02d] - - [auto, .data, stage/sam_03] - - [auto, .data, area] - - [auto, .data, dlist] - start: 0x6912B0 type: .data name: vtx @@ -7934,15 +7900,6 @@ segments: - [auto, c, mac_01_11_epilogue_npc] - [auto, c, mac_01_12_intro] - [auto, c, mac_01_13_foliage] - - [auto, .data, mac_01_0_header] - - [auto, .data, mac_01_1_music] - - [auto, .data, mac_01_2_main] - - [auto, .data, mac_01_3_entity] - - [auto, .data, mac_01_4_rooms] - - [auto, .data, mac_01_5_shop] - - [auto, .data, mac_01_6_crystal_ball_gfx] - - [auto, .data, mac_01_7_bulletin] - - [auto, .data, mac_01_8_music_mix] - start: 0x851C20 type: .data name: mac_01_9_npc @@ -7953,10 +7910,6 @@ segments: - [0x855F88, rgba16, ../../toad_house/blanket, 16, 32, namespaced] - [0x856388] - [0x8683F0] - - [auto, .data, mac_01_10_intro_npc] - - [auto, .data, mac_01_11_epilogue_npc] - - [auto, .data, mac_01_12_intro] - - [auto, .data, mac_01_13_foliage] - name: mac_02 dir: world/area_mac/mac_02 type: code @@ -8323,15 +8276,6 @@ segments: - [auto, c, kmr_02_7_kammy] - [auto, c, kmr_02_8_foliage] - [auto, c, kmr_02_9_images] - - [auto, .data, kmr_02_0_header] - - [auto, .data, kmr_02_1_music] - - [auto, .data, kmr_02_2_main] - - [auto, .data, kmr_02_3_npc] - - [auto, .data, kmr_02_4_rooms_1] - - [auto, .data, kmr_02_5_entity] - - [auto, .data, kmr_02_6_rooms_2] - - [auto, .data, kmr_02_7_kammy] - - [auto, .data, kmr_02_8_foliage] - start: 0x9105A0 type: .data name: kmr_02_9_images @@ -8364,11 +8308,6 @@ segments: - [auto, c, kmr_04_3_npc] - [auto, c, kmr_04_4_entity] - [auto, c, kmr_04_5_foliage] - - [auto, .data, kmr_04_0_header] - - [auto, .data, kmr_04_1_music] - - [auto, .data, kmr_04_2_main] - - [auto, .data, kmr_04_3_npc] - - [auto, .data, kmr_04_4_entity] - start: 0x914F20 type: .data name: kmr_04_5_foliage @@ -8483,19 +8422,6 @@ segments: - [auto, c, kmr_20_11_npc_intro] - [auto, c, kmr_20_12_npc_epilogue] - [auto, c, kmr_20_13_records] - - [auto, .data, kmr_20_0_header] - - [auto, .data, kmr_20_1_music] - - [auto, .data, kmr_20_2_main] - - [auto, .data, kmr_20_3_rooms] - - [auto, .data, kmr_20_4_documents] - - [auto, .data, kmr_20_5_entity] - - [auto, .data, kmr_20_6_trees] - - [auto, .data, kmr_20_7_bushes] - - [auto, .data, kmr_20_8_bed] - - [auto, .data, kmr_20_9_npc_scenes] - - [auto, .data, kmr_20_10_npc] - - [auto, .data, kmr_20_11_npc_intro] - - [auto, .data, kmr_20_12_npc_epilogue] - start: 0x9475A0 type: .data name: kmr_20_13_records @@ -8519,8 +8445,6 @@ segments: - [auto, c, kmr_22_0_header] - [auto, c, kmr_22_1_main] - [auto, c, kmr_22_2_npc] - - [auto, .data, kmr_22_0_header] - - [auto, .data, kmr_22_1_main] - start: 0x9494B0 type: .data name: kmr_22_2_npc @@ -8539,8 +8463,6 @@ segments: - [auto, c, kmr_23_0_header] - [auto, c, kmr_23_1_main] - [auto, c, kmr_23_2_npc] - - [auto, .data, kmr_23_0_header] - - [auto, .data, kmr_23_1_main] - start: 0x951AC0 type: .data name: kmr_23_2_npc @@ -8592,9 +8514,6 @@ segments: - [auto, c, iwa_01_3_splash] - [auto, c, iwa_01_4_npc] - [auto, c, iwa_01_5_slide] - - [auto, .data, iwa_01_0_header] - - [auto, .data, iwa_01_1_main] - - [auto, .data, iwa_01_2_entity] - start: 0x95BAA0 type: .data name: iwa_01_3_splash @@ -8603,8 +8522,6 @@ segments: - [0x95BEA0, vtx, splash] - [0x95BEE0, gfx, splash] - [0x95BFA8] - - [auto, .data, iwa_01_4_npc] - - [auto, .data, iwa_01_5_slide] - name: iwa_02 dir: world/area_iwa/iwa_02 type: code @@ -9118,11 +9035,6 @@ segments: - [auto, c, dro_02_3_main] - [auto, c, dro_02_4_rooms] - [auto, c, dro_02_5_npc] - - [auto, .data, dro_02_0_header] - - [auto, .data, dro_02_1_music] - - [auto, .data, dro_02_2_entity] - - [auto, .data, dro_02_3_main] - - [auto, .data, dro_02_4_rooms] - start: 0x9B69D0 type: .data name: dro_02_5_npc @@ -11302,12 +11214,6 @@ segments: - [auto, c, dgb_01_6_img6] - [auto, c, dgb_01_6_img7] - [auto, c, dgb_01_7] - - [auto, .data, dgb_01_0_header] - - [auto, .data, dgb_01_1_music] - - [auto, .data, dgb_01_2_main] - - [auto, .data, dgb_01_3_bridges] - - [auto, .data, dgb_01_4_entity] - - [auto, .data, dgb_01_5_npc] - start: 0xC4D220 type: .data name: dgb_01_6_img0 @@ -11989,10 +11895,6 @@ segments: - [auto, c, kzn_19_4_npc] - [auto, c, kzn_19_5_eruption] - [auto, c, kzn_19_6_entity] - - [auto, .data, kzn_19_0_header] - - [auto, .data, kzn_19_1_music] - - [auto, .data, kzn_19_2_main] - - [auto, .data, kzn_19_3_npc_settings] - start: 0xCD9620 type: .data name: kzn_19_4_npc @@ -12002,8 +11904,6 @@ segments: - [0xCD9EB8, palette, ../../lava_piranha/vine] - [0xCDA0B8, gfx_common, ../../lava_piranha/vine] - [0xCDA198] - - [auto, .data, kzn_19_5_eruption] - - [auto, .data, kzn_19_6_entity] - name: kzn_20 dir: world/area_kzn/kzn_20 type: code @@ -12338,10 +12238,6 @@ segments: - [auto, c, sam_05_5_scenes] - [auto, c, sam_05_6_monstar_gfx] - [auto, c, sam_05_7_monstar_vtx] - - [auto, .data, sam_05_0_header] - - [auto, .data, sam_05_1_music] - - [auto, .data, sam_05_2_main] - - [auto, .data, sam_05_3_entity] - start: 0xD63330 type: .data name: sam_05_4_npc @@ -12353,7 +12249,6 @@ segments: - [0xD63F80, ia4, monstar_blank3, 32, 32] - [0xD64180, palette, monstar] - [0xD641A0] - - [auto, .data, sam_05_5_scenes] - start: 0xD681B0 type: .data name: sam_05_6_monstar_gfx @@ -12692,11 +12587,6 @@ segments: - [auto, c, pra_31_9_stairs_anim] - [auto, c, pra_31_10_stairs_lights] - [auto, c, pra_31_11_stairs_vtx] - - [auto, .data, pra_31_0_header] - - [auto, .data, pra_31_1_music] - - [auto, .data, pra_31_2_npc] - - [auto, .data, pra_31_3_main] - - [auto, .data, pra_31_4_puzzle] - start: 0xDCACA0 type: .data name: pra_31_5_texture_1 @@ -12759,8 +12649,6 @@ segments: - [0xDCD1C0, gfx, unk_33] - [0xDCD1E8, gfx, unk_34] - [0xDCD220] - - [auto, .data, pra_31_9_stairs_anim] - - [auto, .data, pra_31_10_stairs_lights] - start: 0xDCEED0 type: .data name: pra_31_11_stairs_vtx @@ -13122,10 +13010,6 @@ segments: - [auto, c, mgm_01_2_npc] - [auto, c, mgm_01_3_entity] - [auto, c, mgm_01_4_images] - - [auto, .data, mgm_01_0_header] - - [auto, .data, mgm_01_1_main] - - [auto, .data, mgm_01_2_npc] - - [auto, .data, mgm_01_3_entity] - start: 0xE5DF20 type: .data name: mgm_01_4_images @@ -13149,9 +13033,6 @@ segments: - [auto, c, mgm_02_1_main] - [auto, c, mgm_02_2_npc] - [auto, c, mgm_02_3_images] - - [auto, .data, mgm_02_0_header] - - [auto, .data, mgm_02_1_main] - - [auto, .data, mgm_02_2_npc] - start: 0xE66B00 type: .data name: mgm_02_3_images diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 4f0ce7319bf..f7f17dbab1e 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -143,8 +143,8 @@ segments: - [auto, c, audio/33450] - [auto, c, audio/tables] - [auto, c, audio/reverb] - - [auto, c, 5B320] - [auto, c, effects] + - [auto, c, 5B320] - [auto, c, world/world] - [auto, c, collision] - [auto, c, 38F00] @@ -257,6 +257,8 @@ segments: - [auto, c, os/viswapcontext, gcc_272 -O3] - [auto, c, os/viblack, gcc_272 -O3] - [auto, c, os/virepeatline, gcc_272 -O3] + - [auto, c, os/vimodentsclan1] + - [auto, c, os/vimodempallan1] - [auto, hasm, os/guMtxIdent] # has padding - [auto, hasm, os/guMtxIdentF] - [auto, hasm, os/guMtxF2L] @@ -323,6 +325,7 @@ segments: - [auto, hasm, os/guNormalize] - [auto, c, os/pfschecker, gcc_272 -O3] - [auto, c, os/pfsisplug, gcc_272 -O3] + - [auto, c, os/vimodepallan1] - [auto, c, os/ldiv, gcc_272 -O3] - [auto, c, os/osSiDeviceBusy] - [auto, c, gcc/divdi3, -g2] @@ -343,12 +346,6 @@ segments: subsegments: - [0x4F200] - [0x4F210, i4, reset_tiles, 128, 8] - - [auto, .data, main] - - [auto, .data, main_loop] - - [auto, .data, background_gfx] - - [auto, .data, rumble] - - [auto, .data, 43F0] - - [auto, .data, fio] - start: 0x4F9E0 type: .data name: curtains @@ -375,64 +372,6 @@ segments: subsegments: - [0x52690, i1, crash_screen/font, 32, 64] - [0x52790] - - [auto, .data, os/nusys/nugfxtaskmgr] - - [auto, .data, os/nusys/nusimgr] - - [auto, .data, cam_math] - - [auto, .data, game_modes] - - [auto, .data, state_battle] - - [auto, .data, state_logos] - - [auto, .data, state_pause] - - [auto, .data, state_file_select] - - [auto, .data, state_title_screen] - - [auto, .data, state_demo] - - [auto, .data, npc] - - [auto, .data, encounter] - - [auto, .data, status_icons] - - [auto, .data, audio/25f00_len_940] - - [auto, .data, audio/sfx_player] - - [auto, .data, audio/30450] - - [auto, .data, audio/31650] - - [auto, .data, audio/33450] - - [auto, .data, audio/tables] - - [auto, .data, audio/reverb] - - [auto, .data, effects] - - [auto, .data, 5B320] - - [auto, .data, world/world] - - [auto, .data, 38F00] - - [auto, .data, os/nusys/nusched] - - [auto, .data, os/nusys/nugfxinit] - - [auto, .data, os/nusys/nucontpakmgr] - - [auto, .data, os/nusys/nucontrmbmgr] - - [auto, .data, os/nusys/nugfxfuncset] - - [auto, .data, os/nusys/nucontmgr] - - [auto, .data, os/pimgr] - - [auto, .data, os/epirawdma] - - [auto, .data, os/cartrominit] - - [auto, .data, os/piacs] - - [auto, .data, os/aisetnextbuf] - - [auto, .data, os/controller] - - [auto, .data, os/position] - - [auto, .data, os/rotateRPY] - - [auto, .data, os/sins] - - [auto, .data, os/xprintf] - - [auto, .data, os/seteventmesg] - - [auto, .data, os/siacs] - - [auto, .data, os/thread] - - [auto, .data, os/timerintr] - - [auto, .data, os/vimgr] - - [auto, .data, os/vitbl] - - [auto, .data, os/vimodentsclan1] - - [auto, .data, os/vimodempallan1] - - [auto, .data, os/guRotate] - - [auto, .data, os/contpfs] - - [auto, .data, os/contramread] - - [auto, .data, os/initialize] - - [auto, .data, os/exceptasm] - - [auto, .data, os/xlitob] - - [auto, .data, os/vi] - - [auto, .data, os/pfsisplug] - - [auto, .data, os/vimodepallan1] - - [auto, .data, battle/battle] - [0x71430, bin, gspF3DEX2kawase_fifo_text] - [0x72A60, bin, gspF3DEX2kawase_fifo_data] - [0x72E80, bin, n_aspMain_data] @@ -452,14 +391,12 @@ segments: - [auto, c, inventory] - [auto, c, world/actions] # DUMMY ROM - [auto, c, world/partners] + - [auto, c, global_hud_scripts] - [auto, hasm, bss2_2] - [auto, c, 891b0_len_fb0] - [auto, c, 8a160_len_700] - [auto, c, 8a860_len_3f30] - [auto, c, draw_box] - - [auto, .data, npc_collision] - - [auto, .data, world/actions] - - [auto, .data, world/partners] - start: 0x919B0 type: .data name: global_hud_scripts @@ -843,8 +780,6 @@ segments: - [0x9DA58] - [0x9DA60, rgba32, ui/stat_flower, 16, 16] - [0x9DE60] - - [auto, .data, 891b0_len_fb0] - - [auto, .data, 8a160_len_700] - start: 0xA2960 type: .data name: 8a160_len_700 @@ -855,7 +790,6 @@ segments: - [0xA2BC0, gfx, A2BC0] - [0xA2C88, gfx, A2C88] - [0xA2CB0] - - [auto, .data, 8a860_len_3f30] - start: 0xA2D90 type: .data name: draw_box @@ -904,15 +838,6 @@ segments: - [auto, c, sprite_shading] - [auto, c, audio/sfx] - [auto, c, audio/e0b30_len_b80] - - [auto, .data, entity] - - [auto, .data, game_states] - - [auto, .data, model] - - [auto, .data, animator] - - [auto, .data, entity_model] - - [auto, .data, msg] - - [auto, .data, msg_draw] - - [auto, .data, draw_img_util] - - [auto, .data, item_entity] - start: 0xE2DF0 type: .data name: screen_overlays @@ -926,14 +851,6 @@ segments: - [0xE4CA0] - [0xE4E70, vtx, vtx/stencil2] - [0xE4FF0] - - [auto, .data, screen_render_util] - - [auto, .data, imgfx] - - [auto, .data, hud_element] - - [auto, .data, background] - - [auto, .data, audio/ambience] - - [auto, .data, windows] - - [auto, .data, audio/sfx] - - [auto, .data, audio/e0b30_len_b80] - [0xE5E40] - name: heaps type: code @@ -1000,20 +917,6 @@ segments: - [0x10AB70, i4, entity/shadow/square_big, 32, 32] - [0x10AD70, i4, entity/shadow/circle_big, 32, 32] - [0x10AF70] - - [auto, .data, entity/SaveBlock] - - [auto, .data, entity/Switch] - - [auto, .data, entity/ShatteringBlock_common] - - [auto, .data, entity/ShatteringBlock] - - [auto, .data, entity/Block] - - [auto, .data, entity/ItemBlock] - - [auto, .data, entity/HeartBlock] - - [auto, .data, entity/SuperBlock] - - [auto, .data, entity/SimpleSpring] - - [auto, .data, entity/HiddenPanel] - - [auto, .data, entity/Chest] - - [auto, .data, entity/WoodenCrate] - - [auto, .data, entity/BlueWarpPipe] - - [auto, .data, entity/Signpost] - [0x10C880] - type: code name: font_width @@ -1022,7 +925,6 @@ segments: subsegments: - [auto, c, msg_data] - [auto, c, msg_img] - - [auto, .data, msg_data] - start: 0x10CEB0 type: .data name: msg_img @@ -1346,14 +1248,7 @@ segments: - [auto, c, pause_spirits] - [auto, c, pause_map] - [auto, c, pause_gfx] - - [auto, .data, pause_main] - - [auto, .data, pause_tabs] - - [auto, .data, pause_stats] - - [auto, .data, pause_badges] - - [auto, .data, pause_items] - - [auto, .data, pause_partners] - - [auto, .data, pause_spirits] - - [auto, .data, pause_map] + - [auto, c, pause_styles] - start: 0x1439F0 type: .data name: pause_gfx @@ -1388,7 +1283,6 @@ segments: - [0x1619F0, ci4, stats_bar, 160, 8] - [0x161C70, palette, stats_bar] - [0x161E70, .data, pause_gfx] - - [0x162D30, .data, pause_styles] - [0x1632A0] - type: code dir: filemenu @@ -1400,12 +1294,9 @@ segments: - [auto, c, filemenu_yesno] - [auto, c, filemenu_info] - [auto, c, filemenu_createfile] + - [auto, c, filemenu_gfx] - [auto, c, filemenu_msg] - - [auto, .data, filemenu_common] - - [auto, .data, filemenu_main] - - [auto, .data, filemenu_yesno] - - [auto, .data, filemenu_info] - - [auto, .data, filemenu_createfile] + - [auto, c, filemenu_styles] - start: 0x16AA60 type: .data name: filemenu_gfx @@ -1413,9 +1304,7 @@ segments: - [auto, ia4, copyarrow, 64, 16] - [auto, rgba32, corners_yellow, 16, 64] - [auto, ia8, corners_gray, 16, 32] - - [auto, .data, filemenu_gfx] - - [auto, .data, filemenu_msg] - - [auto, .data, filemenu_styles] + - [auto, .data, filemenu_gfx] ## ?????? this looks kinda borken - [0x16C7D0] - type: code start: 0x16C8E0 @@ -1434,6 +1323,7 @@ segments: - [auto, c, battle/actor_rendering] - [auto, c, battle/level_up] - [auto, c, battle/player_events] + - [auto, c, battle_ui_gfx] - [auto, c, battle/190A10] - [auto, c, battle/190B20] - [auto, c, battle/use_items] @@ -1445,12 +1335,6 @@ segments: - [auto, c, battle/dmg_partner] - [auto, c, battle/standard_events] - [auto, c, battle/use_star_powers] - - [auto, .data, battle/16C8E0] - - [auto, .data, battle/camera] - - [auto, .data, battle/actors] - - [auto, .data, battle/popup_messages] - - [auto, .data, battle/entity_model_icons] - - [auto, .data, battle/partner_dma] - start: 0x1B2050 type: .data name: battle/popup_messages @@ -1459,10 +1343,6 @@ segments: - [0x1B21E0, ci4, ui/battle/cursor_hand, 32, 32] - [0x1B23E0, palette, ui/battle/cursor_hand] - [0x1B2400] - - [auto, .data, battle/181810] - - [auto, .data, battle/actor_rendering] - - [auto, .data, battle/level_up] - - [auto, .data, battle/player_events] - start: 0x1B7CE0 type: .data name: battle_ui_gfx @@ -1622,14 +1502,6 @@ segments: - [0x1C0558] - [0x1C0560, ia8, ui/battle/swap_background, 48, 16] - [0x1C0860] - - [auto, .data, battle/190B20] - - [auto, .data, battle/use_items] - - [auto, .data, battle/use_moves] - - [auto, .data, battle/action_cmd] - - [auto, .data, battle/dmg_player] - - [auto, .data, battle/1A5830] - - [auto, .data, battle/standard_events] - - [auto, .data, battle/use_star_powers] - [0x1CB240] - [0x1CC310, pm_icons, icon] - dir: logos @@ -6544,7 +6416,6 @@ segments: - [0x5A0770, gfx, gfx10] - [0x5A07B0, gfx, gfx11] - [0x5A0800] - - [auto, .data, anim/lava_piranha_anim] - start: 0x5A2E80 type: .data name: actor/lava_piranha @@ -6554,17 +6425,6 @@ segments: - [0x5A3420, palette, lava_piranha_vine] - [0x5A3620, gfx, lava_piranha_vine] - [0x5A36F8] - - [auto, .data, actor/petit_piranha] - - [auto, .data, actor/lava_bud] - - [auto, .data, actor/petit_piranha_bomb] - - [auto, .data, stage/kzn_01] - - [auto, .data, stage/kzn_01b] - - [auto, .data, stage/kzn_02] - - [auto, .data, stage/kzn_04] - - [auto, .data, stage/kzn_04b] - - [auto, .data, stage/kzn_04c] - - [auto, .data, stage/kzn_05] - - [auto, .data, area] - [0x5B1240] - dir: battle/area/flo type: code @@ -6702,16 +6562,6 @@ segments: - [0x63F278, ci4, actor/img, 32, 32] - [0x63F478, palette, actor/img] - [0x63F498] - - [auto, .data, actor/paragoomba] - - [auto, .data, actor/gray_magikoopa] - - [auto, .data, stage/sam_01] - - [auto, .data, stage/sam_02] - - [auto, .data, stage/sam_02b] - - [auto, .data, stage/sam_02c] - - [auto, .data, stage/sam_02d] - - [auto, .data, stage/sam_03] - - [auto, .data, area] - - [auto, .data, dlist] - start: 0x648860 type: .data name: vtx @@ -8129,15 +7979,6 @@ segments: - [auto, c, mac_01_11_epilogue_npc] - [auto, c, mac_01_12_intro] - [auto, c, mac_01_13_foliage] - - [auto, .data, mac_01_0_header] - - [auto, .data, mac_01_1_music] - - [auto, .data, mac_01_2_main] - - [auto, .data, mac_01_3_entity] - - [auto, .data, mac_01_4_rooms] - - [auto, .data, mac_01_5_shop] - - [auto, .data, mac_01_6_crystal_ball_gfx] - - [auto, .data, mac_01_7_bulletin] - - [auto, .data, mac_01_8_music_mix] - start: 0x8091F0 type: .data name: mac_01_9_npc @@ -8148,10 +7989,6 @@ segments: - [0x80D558, rgba16, ../../toad_house/blanket, 16, 32, namespaced] - [0x80D958] - [0x81F9C0] - - [auto, .data, mac_01_10_intro_npc] - - [auto, .data, mac_01_11_epilogue_npc] - - [auto, .data, mac_01_12_intro] - - [auto, .data, mac_01_13_foliage] - name: mac_02 dir: world/area_mac/mac_02 type: code @@ -8518,15 +8355,6 @@ segments: - [auto, c, kmr_02_7_kammy] - [auto, c, kmr_02_8_foliage] - [auto, c, kmr_02_9_images] - - [auto, .data, kmr_02_0_header] - - [auto, .data, kmr_02_1_music] - - [auto, .data, kmr_02_2_main] - - [auto, .data, kmr_02_3_npc] - - [auto, .data, kmr_02_4_rooms_1] - - [auto, .data, kmr_02_5_entity] - - [auto, .data, kmr_02_6_rooms_2] - - [auto, .data, kmr_02_7_kammy] - - [auto, .data, kmr_02_8_foliage] - start: 0x8C7B70 type: .data name: kmr_02_9_images @@ -8559,11 +8387,6 @@ segments: - [auto, c, kmr_04_3_npc] - [auto, c, kmr_04_4_entity] - [auto, c, kmr_04_5_foliage] - - [auto, .data, kmr_04_0_header] - - [auto, .data, kmr_04_1_music] - - [auto, .data, kmr_04_2_main] - - [auto, .data, kmr_04_3_npc] - - [auto, .data, kmr_04_4_entity] - start: 0x8CC4F0 type: .data name: kmr_04_5_foliage @@ -8678,19 +8501,6 @@ segments: - [auto, c, kmr_20_11_npc_intro] - [auto, c, kmr_20_12_npc_epilogue] - [auto, c, kmr_20_13_records] - - [auto, .data, kmr_20_0_header] - - [auto, .data, kmr_20_1_music] - - [auto, .data, kmr_20_2_main] - - [auto, .data, kmr_20_3_rooms] - - [auto, .data, kmr_20_4_documents] - - [auto, .data, kmr_20_5_entity] - - [auto, .data, kmr_20_6_trees] - - [auto, .data, kmr_20_7_bushes] - - [auto, .data, kmr_20_8_bed] - - [auto, .data, kmr_20_9_npc_scenes] - - [auto, .data, kmr_20_10_npc] - - [auto, .data, kmr_20_11_npc_intro] - - [auto, .data, kmr_20_12_npc_epilogue] - start: 0x8FEB70 type: .data name: kmr_20_13_records @@ -8714,8 +8524,6 @@ segments: - [auto, c, kmr_22_0_header] - [auto, c, kmr_22_1_main] - [auto, c, kmr_22_2_npc] - - [auto, .data, kmr_22_0_header] - - [auto, .data, kmr_22_1_main] - start: 0x900A80 type: .data name: kmr_22_2_npc @@ -8734,8 +8542,6 @@ segments: - [auto, c, kmr_23_0_header] - [auto, c, kmr_23_1_main] - [auto, c, kmr_23_2_npc] - - [auto, .data, kmr_23_0_header] - - [auto, .data, kmr_23_1_main] - start: 0x909090 type: .data name: kmr_23_2_npc @@ -8787,9 +8593,6 @@ segments: - [auto, c, iwa_01_3_splash] - [auto, c, iwa_01_4_npc] - [auto, c, iwa_01_5_slide] - - [auto, .data, iwa_01_0_header] - - [auto, .data, iwa_01_1_main] - - [auto, .data, iwa_01_2_entity] - start: 0x913070 type: .data name: iwa_01_3_splash @@ -8798,8 +8601,6 @@ segments: - [0x913470, vtx, splash] - [0x9134B0, gfx, splash] - [0x913578] - - [auto, .data, iwa_01_4_npc] - - [auto, .data, iwa_01_5_slide] - name: iwa_02 dir: world/area_iwa/iwa_02 type: code @@ -9313,11 +9114,6 @@ segments: - [auto, c, dro_02_3_main] - [auto, c, dro_02_4_rooms] - [auto, c, dro_02_5_npc] - - [auto, .data, dro_02_0_header] - - [auto, .data, dro_02_1_music] - - [auto, .data, dro_02_2_entity] - - [auto, .data, dro_02_3_main] - - [auto, .data, dro_02_4_rooms] - start: 0x96DFA0 type: .data name: dro_02_5_npc @@ -11497,12 +11293,6 @@ segments: - [auto, c, dgb_01_6_img6] - [auto, c, dgb_01_6_img7] - [auto, c, dgb_01_7] - - [auto, .data, dgb_01_0_header] - - [auto, .data, dgb_01_1_music] - - [auto, .data, dgb_01_2_main] - - [auto, .data, dgb_01_3_bridges] - - [auto, .data, dgb_01_4_entity] - - [auto, .data, dgb_01_5_npc] - start: 0xC047F0 type: .data name: dgb_01_6_img0 @@ -12184,10 +11974,6 @@ segments: - [auto, c, kzn_19_4_npc] - [auto, c, kzn_19_5_eruption] - [auto, c, kzn_19_6_entity] - - [auto, .data, kzn_19_0_header] - - [auto, .data, kzn_19_1_music] - - [auto, .data, kzn_19_2_main] - - [auto, .data, kzn_19_3_npc_settings] - start: 0xC90BF0 type: .data name: kzn_19_4_npc @@ -12197,8 +11983,6 @@ segments: - [0xC91488, palette, ../../lava_piranha/vine] - [0xC91688, gfx_common, ../../lava_piranha/vine] - [0xC91768] - - [auto, .data, kzn_19_5_eruption] - - [auto, .data, kzn_19_6_entity] - name: kzn_20 dir: world/area_kzn/kzn_20 type: code @@ -12533,10 +12317,6 @@ segments: - [auto, c, sam_05_5_scenes] - [auto, c, sam_05_6_monstar_gfx] - [auto, c, sam_05_7_monstar_vtx] - - [auto, .data, sam_05_0_header] - - [auto, .data, sam_05_1_music] - - [auto, .data, sam_05_2_main] - - [auto, .data, sam_05_3_entity] - start: 0xD1A900 type: .data name: sam_05_4_npc @@ -12548,7 +12328,6 @@ segments: - [0xD1B550, ia4, monstar_blank3, 32, 32] - [0xD1B750, palette, monstar] - [0xD1B770] - - [auto, .data, sam_05_5_scenes] - start: 0xD1F780 type: .data name: sam_05_6_monstar_gfx @@ -12887,11 +12666,6 @@ segments: - [auto, c, pra_31_9_stairs_anim] - [auto, c, pra_31_10_stairs_lights] - [auto, c, pra_31_11_stairs_vtx] - - [auto, .data, pra_31_0_header] - - [auto, .data, pra_31_1_music] - - [auto, .data, pra_31_2_npc] - - [auto, .data, pra_31_3_main] - - [auto, .data, pra_31_4_puzzle] - start: 0xD82270 type: .data name: pra_31_5_texture_1 @@ -12954,8 +12728,6 @@ segments: - [0xD84790, gfx, unk_33] - [0xD847B8, gfx, unk_34] - [0xD847F0] - - [auto, .data, pra_31_9_stairs_anim] - - [auto, .data, pra_31_10_stairs_lights] - start: 0xD864A0 type: .data name: pra_31_11_stairs_vtx @@ -13317,10 +13089,6 @@ segments: - [auto, c, mgm_01_2_npc] - [auto, c, mgm_01_3_entity] - [auto, c, mgm_01_4_images] - - [auto, .data, mgm_01_0_header] - - [auto, .data, mgm_01_1_main] - - [auto, .data, mgm_01_2_npc] - - [auto, .data, mgm_01_3_entity] - start: 0xE15440 type: .data name: mgm_01_4_images @@ -13344,9 +13112,6 @@ segments: - [auto, c, mgm_02_1_main] - [auto, c, mgm_02_2_npc] - [auto, c, mgm_02_3_images] - - [auto, .data, mgm_02_0_header] - - [auto, .data, mgm_02_1_main] - - [auto, .data, mgm_02_2_npc] - start: 0xE1E020 type: .data name: mgm_02_3_images @@ -14782,10 +14547,6 @@ segments: - [auto, c, kzn_19_4_npc] - [auto, c, kzn_19_5_eruption] - [auto, c, kzn_19_6_entity] - - [auto, .data, kzn_19_0_header] - - [auto, .data, kzn_19_1_music] - - [auto, .data, kzn_19_2_main] - - [auto, .data, kzn_19_3_npc_settings] - start: 0xEABB20 type: .data name: kzn_19_4_npc @@ -14795,8 +14556,6 @@ segments: - [0xEAC3B8, palette, ../../lava_piranha/vine] - [0xEAC5B8, gfx_common, ../../lava_piranha/vine] - [0xEAC698] - - [auto, .data, kzn_19_5_eruption] - - [auto, .data, kzn_19_6_entity] - name: dead_kzn_20 dir: world/dead/area_kzn/kzn_20 type: code From ce5b473ef907c5aee9a62e5ec651436549f285a2 Mon Sep 17 00:00:00 2001 From: Ethan Date: Sat, 20 Jan 2024 23:34:16 +0900 Subject: [PATCH 4/6] update shplort --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 29866d7833a..e5a1ab7e3e7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,4 +13,4 @@ rabbitizer n64img python-githooks crunch64>=0.2.0 -splat64>=0.21.0 +splat64>=0.21.4 From 01147dc883e8b1b51f460b3936a973018fdc7496 Mon Sep 17 00:00:00 2001 From: Ethan Date: Sat, 20 Jan 2024 23:36:58 +0900 Subject: [PATCH 5/6] fix configure --- tools/build/configure.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/build/configure.py b/tools/build/configure.py index 22e6637d779..f3d283c7d9c 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -625,7 +625,8 @@ def build( if isinstance(seg, splat.segtypes.n64.header.N64SegHeader): build(entry.object_path, entry.src_paths, "as") elif isinstance(seg, splat.segtypes.common.asm.CommonSegAsm) or ( - isinstance(seg, splat.segtypes.common.data.CommonSegData) and not seg.type[0] == "." + isinstance(seg, splat.segtypes.common.data.CommonSegData) + and not seg.type[0] == "." or isinstance(seg, splat.segtypes.common.textbin.CommonSegTextbin) ): build(entry.object_path, entry.src_paths, "as") @@ -784,9 +785,7 @@ def build( type="data", define=True, ) - elif ( - isinstance(seg, splat.segtypes.common.bin.CommonSegBin) - ): + elif isinstance(seg, splat.segtypes.common.bin.CommonSegBin): build(entry.object_path, entry.src_paths, "bin") elif isinstance(seg, splat.segtypes.n64.yay0.N64SegYay0): compressed_path = entry.object_path.with_suffix("") # remove .o From bec7f87da86d547de1ee4230ba0887c1b6437ce4 Mon Sep 17 00:00:00 2001 From: Ethan Date: Sun, 21 Jan 2024 03:05:30 +0900 Subject: [PATCH 6/6] requests --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index e5a1ab7e3e7..d5ffdf8b58a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,3 +14,4 @@ n64img python-githooks crunch64>=0.2.0 splat64>=0.21.4 +requests