Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/xml/code/z_moji_data.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Root>
<File Name="code">
<Texture Name="gMojiFontTLUT0" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
<Texture Name="gMojiFontTLUT1" Format="rgba16" Width="4" Height="4" Offset="0x20"/>
<Texture Name="gMojiFontTLUT2" Format="rgba16" Width="4" Height="4" Offset="0x40"/>
<Texture Name="gMojiFontTLUT3" Format="rgba16" Width="4" Height="4" Offset="0x60"/>
<!-- gMojiFontTex is a ci4 texture with any of the four above (distinct) palettes. For now extract it as i4 -->
<Texture Name="gMojiFontTex" Format="i4" Width="16" Height="128" Offset="0x80"/>
</File>
</Root>
12 changes: 4 additions & 8 deletions baseroms/gc-eu-dbg-2/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@ incbins:
segment: code
vram: 0x80114950
size: 0xAF0
- name: gMojiFontTLUTs
segment: code
vram: 0x8012A760
size: 0x80
- name: gMojiFontTex
segment: code
vram: 0x8012A7E0
size: 0x400
- name: aspMainData
segment: code
vram: 0x80155C90
Expand Down Expand Up @@ -73,6 +65,10 @@ assets:
xml_path: assets/xml/code/fbdemo_wipe1.xml
start_offset: 0x10E2C0
end_offset: 0x10ED48
- name: code/z_moji_data
xml_path: assets/xml/code/z_moji_data.xml
start_offset: 0x10D900
end_offset: 0x10DD80
- name: misc/link_animetion
xml_path: assets/xml/misc/link_animetion.xml
- name: misc/z_select_static
Expand Down
12 changes: 4 additions & 8 deletions baseroms/gc-eu-dbg/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@ incbins:
segment: code
vram: 0x80114950
size: 0xAF0
- name: gMojiFontTLUTs
segment: code
vram: 0x8012A760
size: 0x80
- name: gMojiFontTex
segment: code
vram: 0x8012A7E0
size: 0x400
- name: aspMainData
segment: code
vram: 0x80155C90
Expand Down Expand Up @@ -73,6 +65,10 @@ assets:
xml_path: assets/xml/code/fbdemo_wipe1.xml
start_offset: 0x10E2C0
end_offset: 0x10ED48
- name: code/z_moji_data
xml_path: assets/xml/code/z_moji_data.xml
start_offset: 0x10D900
end_offset: 0x10DD80
- name: misc/link_animetion
xml_path: assets/xml/misc/link_animetion.xml
- name: misc/z_select_static
Expand Down
12 changes: 4 additions & 8 deletions baseroms/gc-eu-mq-dbg/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@ incbins:
segment: code
vram: 0x80114930
size: 0xAF0
- name: gMojiFontTLUTs
segment: code
vram: 0x8012A740
size: 0x80
- name: gMojiFontTex
segment: code
vram: 0x8012A7C0
size: 0x400
- name: aspMainData
segment: code
vram: 0x80155C70
Expand Down Expand Up @@ -73,6 +65,10 @@ assets:
xml_path: assets/xml/code/fbdemo_wipe1.xml
start_offset: 0x10E2A0
end_offset: 0x10ED28
- name: code/z_moji_data
xml_path: assets/xml/code/z_moji_data.xml
start_offset: 0x10D8E0
end_offset: 0x10DD60
- name: misc/link_animetion
xml_path: assets/xml/misc/link_animetion.xml
- name: misc/z_select_static
Expand Down
25 changes: 0 additions & 25 deletions data/unk_8012ABC0.data.s

This file was deleted.

21 changes: 0 additions & 21 deletions data/z_text.data.s

This file was deleted.

2 changes: 2 additions & 0 deletions include/libc/math.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ double round(double);
long lroundf(float);
long lround(double);

f32 fmodf(f32 x, f32 y);

f32 fabsf(f32 f);
#ifdef __sgi
#pragma intrinsic(fabsf)
Expand Down
4 changes: 2 additions & 2 deletions spec/spec
Original file line number Diff line number Diff line change
Expand Up @@ -587,9 +587,9 @@ beginseg
include "$(BUILD_DIR)/src/code/z_ss_sram.o"
include "$(BUILD_DIR)/src/code/z_rumble.o"
#if DEBUG_ASSETS
include "$(BUILD_DIR)/data/z_text.data.o"
include "$(BUILD_DIR)/src/code/z_moji_data.o"
#endif
include "$(BUILD_DIR)/data/unk_8012ABC0.data.o"
include "$(BUILD_DIR)/src/code/code_unk_8012ABC0.o"
include "$(BUILD_DIR)/src/code/z_view.o"
include "$(BUILD_DIR)/src/code/z_vimode.o"
include "$(BUILD_DIR)/src/code/z_viscvg.o"
Expand Down
8 changes: 8 additions & 0 deletions src/code/code_unk_8012ABC0.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include "math.h"
#include "ultra64.h"
#include "libu64/gfxprint.h"

static void* sUnkFunctionPointers[] = {
fmodf, guScale, guRotate, guTranslate, GfxPrint_SetPos, GfxPrint_SetColor,
GfxPrint_Printf, GfxPrint_SetPosPx, GfxPrint_Init, GfxPrint_Open, GfxPrint_Close, GfxPrint_Destroy,
};
21 changes: 21 additions & 0 deletions src/code/z_moji_data.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#include "ultra64.h"
#include "gfx.h"

u64 gMojiFontTLUTs[4][4] = {
{
#include "assets/code/z_moji_data/gMojiFontTLUT0.rgba16.inc.c"
},
{
#include "assets/code/z_moji_data/gMojiFontTLUT1.rgba16.inc.c"
},
{
#include "assets/code/z_moji_data/gMojiFontTLUT2.rgba16.inc.c"
},
{
#include "assets/code/z_moji_data/gMojiFontTLUT3.rgba16.inc.c"
},
};

u64 gMojiFontTex[] = {
#include "assets/code/z_moji_data/gMojiFontTex.i4.inc.c"
};