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

ast_ending_award_front & ast_ending_award_back

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2024-02-22 00:21:58 -03:00
parent c8b33370a7
commit 6ab18c98b7
9 changed files with 64 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
assets/yaml/us/ast_blue_marine.yaml
View File

@ -13,13 +13,13 @@ 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 }
{ type: TEXTURE, ctype: u16, 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 }
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x3000120, symbol: D_3000120 }
D_3000130:
{ type: GFX, offset: 0x3000130, symbol: D_3000130 }
@ -37,7 +37,7 @@ 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 }
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x3000640, symbol: D_3000640 }
D_3000660:
{ type: GFX, offset: 0x3000660, symbol: D_3000660 }
@ -52,34 +52,34 @@ 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 }
{ type: TEXTURE, ctype: u16, 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 }
{ type: TEXTURE, ctype: u16, 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 }
{ type: TEXTURE, ctype: u16, 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 }
{ type: TEXTURE, ctype: u16, 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 }
{ type: TEXTURE, ctype: u16, 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 }
{ type: TEXTURE, ctype: u16, 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 }
{ type: TEXTURE, ctype: u16, 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 }
{ type: TEXTURE, ctype: u16, 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 }
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x30062E8, symbol: D_30062E8, pad: 4 }
D_3006AF0:
{ type: GFX, offset: 0x3006AF0, symbol: D_3006AF0 }

14
assets/yaml/us/ast_ending_award_back.yaml Normal file
View File

@ -0,0 +1,14 @@
:config:
segments:
seg8: 0xD68480
header:
code:
- '#include "assets/ast_ending_award_back.h"'
header:
- '#include "gfx.h"'
- '#include "sf64object.h"'
- '#include "structs.h"'
ending_award_back:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 316, height: 270, offset: 0x8000000, symbol: gEndingAwardBack }

13
assets/yaml/us/ast_ending_award_front.yaml Normal file
View File

@ -0,0 +1,13 @@
:config:
segments:
seg8: 0xD43400
header:
code:
- '#include "assets/ast_ending_award_front.h"'
header:
- '#include "gfx.h"'
- '#include "sf64object.h"'
- '#include "structs.h"'
ending_award_front:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 316, height: 240, offset: 0x8000000, symbol: gEndingAwardFront }

6
assets/yaml/us/ast_warp_zone.yaml
View File

@ -19,13 +19,13 @@ D_70008F0:
{ type: GFX, offset: 0x70008F0, symbol: D_70008F0 }
D_7000260:
{ type: TEXTURE, ctype: u8, format: RGBA16, width: 4, height: 4, offset: 0x7000260, symbol: D_7000260 }
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 4, height: 4, offset: 0x7000260, symbol: D_7000260 }
D_7000A30:
{ type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 32, offset: 0x7000A30, symbol: D_7000A30, tlut: 0x7000C30 }
D_7000C30:
{ type: TEXTURE, ctype: u8, format: TLUT, colors: 8, offset: 0x7000C30, symbol: D_7000C30 }
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x7000C30, symbol: D_7000C30 }
D_7000C40:
{ type: GFX, offset: 0x7000C40, symbol: D_7000C40 }
@ -40,4 +40,4 @@ D_7001540:
{ type: GFX, offset: 0x7001540, symbol: D_7001540 }
D_70015D0:
{ type: TEXTURE, ctype: u8, format: RGBA16, width: 32, height: 32, offset: 0x70015D0, symbol: D_70015D0 }
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x70015D0, symbol: D_70015D0 }

2
include/assets/ast_ending_award_back.h
View File

@ -5,4 +5,6 @@
#include "sf64object.h"
#include "structs.h"
extern u16 gEndingAwardBack[];
#endif

2
include/assets/ast_ending_award_front.h
View File

@ -5,4 +5,6 @@
#include "sf64object.h"
#include "structs.h"
extern u16 gEndingAwardFront[];
#endif

11
src/overlays/ovl_ending/fox_end1.c
View File

@ -1,4 +1,6 @@
#include "global.h"
#include "assets/ast_ending_award_front.h"
#include "assets/ast_ending_award_back.h"
void func_ending_8018CE20(s32);
void func_ending_801926D4(void);
@ -107,20 +109,21 @@ void func_ending_80187520(s32 arg0) {
RCP_SetupDL(&gMasterDisp, 0x4C);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
switch (arg0) {
case 0:
for (j = 0, i = 0; i < 67; j += 316 * 4, i++) {
TextureRect_16bRGBA(&gMasterDisp, D_8000000_RGBA + j, 316, 4, 0.0f, 4 * i, 1.0f, 1.0f);
TextureRect_16bRGBA(&gMasterDisp, gEndingAwardBack + j, 316, 4, 0.0f, 4 * i, 1.0f, 1.0f);
}
TextureRect_16bRGBA(&gMasterDisp, D_8000000_RGBA + j, 316, 3, 0.0f, 4 * i, 1.0f, 1.0f);
TextureRect_16bRGBA(&gMasterDisp, gEndingAwardBack + j, 316, 3, 0.0f, 4 * i, 1.0f, 1.0f);
break;
case 1:
for (j = 0, i = 0; i < 60; j += 316 * 4, i++) {
TextureRect_16bRGBA(&gMasterDisp, D_8000000_RGBA + j, 316, 4, 0.0f, 4 * i, 1.0f, 1.0f);
TextureRect_16bRGBA(&gMasterDisp, gEndingAwardFront + j, 316, 4, 0.0f, 4 * i, 1.0f, 1.0f);
}
break;
}
if (!D_8000000_RGBA) {} // fake?
}
void func_ending_801876A4(void) {

2
tools/Torch

@ -1 +1 @@
Subproject commit 3845d02cf603dbba49b44a160b4e1958c86c738e
Subproject commit 0fd8f658566f6269c1fbca297760e60e8e64cf0e

12
yamls/us/assets.yaml
View File

@ -245,13 +245,21 @@
- name: ast_ending_award_front
exclusive_ram_id: segment_08
type: bin
type: code
dir: assets
start: 0xD43400
vram: 0x08000000
subsegments:
- [0xD43400, .data, ast_ending_award_front/ast_ending_award_front]
- name: ast_ending_award_back
exclusive_ram_id: segment_08
type: bin
type: code
dir: assets
start: 0xD68480
vram: 0x08000000
subsegments:
- [0xD68480, .data, ast_ending_award_back/ast_ending_award_back]
- name: ast_reward
exclusive_ram_id: segment_08