PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-02-02 16:23:57 +03:00
Code Issues Actions 2 Packages Projects Releases 1 Wiki Activity

ast_blue_marine extraction (#140)

Browse Source 
* progress so far

* progress

* progress

* progress

* matching

* revert F3DEX_MK64

* update torch

* update gitIgnore

* correction

* add src/assets to clean recipe
This commit is contained in:
Alejandro Asenjo Nitti 2024-02-21 12:52:42 -03:00 committed by GitHub
parent 05747b1b52
commit 807ade8ff7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 103 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -12,6 +12,7 @@ ctx.c.m2c
*.n64
*.z64
*.bin
*.otr
src/assets/*
!src/assets/ast_radio.c
include/assets/*
@ -19,6 +20,7 @@ include/assets/*
/build
tools/mio0
tools/ido-recomp
debug/
.venv/
m2cfiles/
TempComp.bin.mio0

1
Makefile
View File

@ -441,6 +441,7 @@ clean:
@git clean -fdx asm/
@git clean -fdx bin/
@git clean -fdx build/
@git clean -fdx src/assets/
@git clean -fdx linker_scripts/*.ld
format:

91
assets/yaml/us/ast_blue_marine.yaml Normal file
View File

@ -0,0 +1,91 @@
:config:
segments:
seg3: 0x8E1F80
header:
code:
- '#include "assets/ast_blue_marine.h"'
header:
- '#include "gfx.h"'
- '#include "sf64object.h"'
- '#include "structs.h"'
D_3000000:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x3000000, symbol: D_3000000, tlut: 0x3000080 }
D_3000080:
{ type: TEXTURE, ctype: u8, format: TLUT, colors: 8, offset: 0x3000080, symbol: D_3000080 }
D_3000090:
{ type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 9, offset: 0x3000090, symbol: D_3000090, tlut: 0x3000120 }
D_3000120:
{ type: TEXTURE, ctype: u8, format: TLUT, colors: 8, offset: 0x3000120, symbol: D_3000120 }
D_3000130:
{ type: GFX, offset: 0x3000130, symbol: D_3000130 }
ast_blue_marine_seg3_vtx_00000418:
{ type: VTX, count: 5, offset: 0x3000418, symbol: D_3000418, pad: 2 }
D_3000470:
{ type: GFX, offset: 0x3000470, symbol: D_3000470 }
D_30005E8:
{ type: BLOB, size: 24, offset: 0x30005E8, symbol: D_30005E8 }
D_3000600:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 8, offset: 0x3000600, symbol: D_3000600, tlut: 0x3000640 }
D_3000640:
{ type: TEXTURE, ctype: u8, format: TLUT, colors: 16, offset: 0x3000640, symbol: D_3000640 }
D_3000660:
{ type: GFX, offset: 0x3000660, symbol: D_3000660 }
D_30006E8:
{ type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x30006E8, symbol: D_30006E8, pad: 2 }
D_3000AF0:
{ type: GFX, offset: 0x3000AF0, symbol: D_3000AF0 }
D_3000C70:
{ type: GFX, offset: 0x3000C70, symbol: D_3000C70 }
D_3001900:
{ type: TEXTURE, ctype: u8, format: RGBA16, width: 8, height: 8, offset: 0x3001900, symbol: D_3001900 }
D_3001980:
{ type: TEXTURE, ctype: u8, format: RGBA16, width: 32, height: 32, offset: 0x3001980, symbol: D_3001980 }
D_3002180:
{ type: TEXTURE, ctype: u8, format: RGBA16, width: 32, height: 32, offset: 0x3002180, symbol: D_3002180 }
D_3002980:
{ type: TEXTURE, ctype: u8, format: RGBA16, width: 32, height: 32, offset: 0x3002980, symbol: D_3002980 }
D_3003180:
{ type: TEXTURE, ctype: u8, format: RGBA16, width: 32, height: 32, offset: 0x3003180, symbol: D_3003180 }
D_3003980:
{ type: TEXTURE, ctype: u8, format: RGBA16, width: 32, height: 32, offset: 0x3003980, symbol: D_3003980 }
D_3004180:
{ type: TEXTURE, ctype: u8, format: RGBA16, width: 32, height: 32, offset: 0x3004180, symbol: D_3004180 }
D_3004980:
{ type: TEXTURE, ctype: u8, format: RGBA16, width: 64, height: 32, offset: 0x3004980, symbol: D_3004980 }
D_3005980:
{ type: GFX, offset: 0x3005980, symbol: D_3005980 }
D_30062E8:
{ type: TEXTURE, ctype: u8, format: RGBA16, width: 32, height: 32, offset: 0x30062E8, symbol: D_30062E8, pad: 4 }
D_3006AF0:
{ type: GFX, offset: 0x3006AF0, symbol: D_3006AF0 }
D_3006C70:
{ type: GFX, offset: 0x3006C70, symbol: D_3006C70 }
D_3006DE0:
{ type: GFX, offset: 0x3006DE0, symbol: D_3006DE0 }

8
include/assets/ast_blue_marine.h
View File

@ -1,8 +0,0 @@
#ifndef AST_BLUE_MARINE_H
#define AST_BLUE_MARINE_H
#include "gfx.h"
#include "sf64object.h"
#include "structs.h"
#endif

4
linker_scripts/us/undefined_syms.ld
View File

@ -711,7 +711,7 @@ D_101B5F0 = 0x0101B5F0;
D_101B480 = 0x0101B480;
D_101B310 = 0x0101B310;
D_101B1A0 = 0x0101B1A0;
D_3000000 = 0x03000000;
D_03000000 = 0x03000000;
D_3000080 = 0x03000080;
D_5000D50 = 0x05000D50;
D_5006CB0 = 0x05006CB0;
@ -1276,6 +1276,8 @@ D_A001EC0 = 0x0A001EC0;
D_A001BE0 = 0x0A001BE0;
D_7004270 = 0x07004270;
D_3002E80 = 0x3002E80;
D_3005AB0 = 0x3005AB0;
D_1000000 = 0x1000000;
D_1000280 = 0x1000280;
D_1000640 = 0x1000640;

2
tools/Torch

@ -1 +1 @@
Subproject commit 56ade56c1236adcefddf1e97fffee0b1555c0877
Subproject commit 3845d02cf603dbba49b44a160b4e1958c86c738e

6
yamls/us/assets.yaml
View File

@ -37,8 +37,12 @@
- name: ast_blue_marine
exclusive_ram_id: segment_03
type: bin
type: code
dir: assets
start: 0x8E1F80
vram: 0x03000000
subsegments:
- [0x8E1F80, .data, ast_blue_marine/ast_blue_marine]
- name: ast_vs_player
exclusive_ram_id: segment_03