pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Assetify crash font (#1140)

Browse Source 
* assetify crash font

* bump pigment64 version

* bump pigment ver

* maybe fix

* 2

* move to new img asset inclusion

---------

Co-authored-by: Ethan <ethteck@gmail.com>
This commit is contained in:
Alex Bates 2024-01-08 16:42:34 +00:00 committed by GitHub
parent 6da232df36
commit 6b5883f1f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/crash_screen.c
View File

@ -3,6 +3,7 @@
#include "PR/os_internal_thread.h" #include "PR/os_internal_thread.h"
#include "libc/xstdio.h" #include "libc/xstdio.h"
#include "gcc/string.h" #include "gcc/string.h"
#include "include_asset.h"
typedef struct { typedef struct {
/* 0x000 */ OSThread thread; /* 0x000 */ OSThread thread;
@ -25,7 +26,9 @@ u8 gCrashScreencharToGlyph[128] = {
23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
}; };
// TODO extract? #if VERSION_US
INCLUDE_IMG("crash_screen/font.png", gCrashScreenFont);
#else
u32 gCrashScreenFont[] = { u32 gCrashScreenFont[] = {
0x70871C30, 0x8988A250, 0x88808290, 0x88831C90, 0x888402F8, 0x88882210, 0x71CF9C10, 0xF9CF9C70, 0x8228A288, 0x70871C30, 0x8988A250, 0x88808290, 0x88831C90, 0x888402F8, 0x88882210, 0x71CF9C10, 0xF9CF9C70, 0x8228A288,
0xF200A288, 0x0BC11C78, 0x0A222208, 0x8A222288, 0x71C21C70, 0x23C738F8, 0x5228A480, 0x8A282280, 0x8BC822F0, 0xF200A288, 0x0BC11C78, 0x0A222208, 0x8A222288, 0x71C21C70, 0x23C738F8, 0x5228A480, 0x8A282280, 0x8BC822F0,
@ -36,6 +39,7 @@ u32 gCrashScreenFont[] = {
0x80020800, 0xF8011000, 0x70800000, 0x88822200, 0x08820400, 0x108F8800, 0x20821000, 0x00022200, 0x20800020, 0x80020800, 0xF8011000, 0x70800000, 0x88822200, 0x08820400, 0x108F8800, 0x20821000, 0x00022200, 0x20800020,
0x00000000, 0x00000000,
}; };
#endif
const char* gFaultCauses[18] = { const char* gFaultCauses[18] = {
"Interrupt", "Interrupt",
@ -104,7 +108,7 @@ void crash_screen_draw_rect(s32 x, s32 y, s32 width, s32 height) {
void crash_screen_draw_glyph(s32 x, s32 y, s32 glyph) { void crash_screen_draw_glyph(s32 x, s32 y, s32 glyph) {
s32 shift = ((glyph % 5) * 6); s32 shift = ((glyph % 5) * 6);
u16 width = gCrashScreen.width; u16 width = gCrashScreen.width;
const u32* data = &gCrashScreenFont[glyph / 5 * 7]; const u32* data = &((u32*)gCrashScreenFont)[glyph / 5 * 7];
s32 i; s32 i;
s32 j; s32 j;

2
tools/build/configure.py
View File

@ -24,7 +24,7 @@ YAY0_COMPRESS_TOOL = f"{BUILD_TOOLS}/yay0/Yay0compress"
CRC_TOOL = f"{BUILD_TOOLS}/rom/n64crc" CRC_TOOL = f"{BUILD_TOOLS}/rom/n64crc"
PIGMENT = "pigment64" PIGMENT = "pigment64"
PIGMENT_REQ_VERSION = "0.3.0" PIGMENT_REQ_VERSION = "0.4.2"
def exec_shell(command: List[str]) -> str: def exec_shell(command: List[str]) -> str:

7
ver/us/splat.yaml
View File

@ -369,7 +369,12 @@ segments:
- [0x511E0, vtx, theater/wall_shadows_vtx] - [0x511E0, vtx, theater/wall_shadows_vtx]
- [0x51260] - [0x51260]
- [0x51540, ia8, ui/no_controller, 128, 32] - [0x51540, ia8, ui/no_controller, 128, 32]
- [auto, .data, crash_screen] - start: auto
type: .data
name: crash_screen
subsegments:
- [0x52690, i1, crash_screen/font, 32, 64]
- [0x52790]
- [auto, .data, os/nusys/nugfxtaskmgr] - [auto, .data, os/nusys/nugfxtaskmgr]
- [auto, .data, os/nusys/nusimgr] - [auto, .data, os/nusys/nusimgr]
- [auto, .data, cam_math] - [auto, .data, cam_math]