Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-26 22:40:33 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Rename LoadClut2 to LoadClut

Browse Source
This commit is contained in:
Luciano Ciccariello 2024-11-20 22:32:52 +00:00
parent eee73de42a
commit 2c04d19d17
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/symbols.hd.txt
View File

@ -82,7 +82,7 @@ stup1 = 0x80010E20;
stup0 = 0x80010E9C;
main = 0x80010EB8;
LoadTPage = 0x8001112C;
LoadClut2 = 0x80011218;
LoadClut = 0x80011218;
SetDefDrawEnv = 0x80011280;
SetDefDispEnv = 0x80011310;
SetDumpFnt = 0x8001134C;

2
config/symbols.us.txt
View File

@ -82,7 +82,7 @@ stup1 = 0x80010E20;
stup0 = 0x80010E9C;
main = 0x80010EB8;
LoadTPage = 0x8001112C;
LoadClut2 = 0x80011218;
LoadClut = 0x80011218;
SetDefDrawEnv = 0x80011280;
SetDefDispEnv = 0x80011310;
SetDumpFnt = 0x8001134C;

2
include/psxsdk/libgpu.h
View File

@ -535,7 +535,7 @@ extern u_short LoadTPage(
int w, int h // Texture pattern size
);
extern u_short LoadClut2(u_long* clut, int x, int y);
extern u_short LoadClut(u_long* clut, int x, int y);
/**
* Calculates and returns the texture CLUT ID.

10
src/dra/4A538.c
View File

@ -283,7 +283,7 @@ void func_800EA7CC(void) {
clutX = 0x200;
for (i = 0xF0; i < 0x100; i++, temp_s0 = (s16*)temp_s0 + 0x100, offset++) {
if (palettes[offset] != 0) {
LoadClut2(temp_s0, clutX, i);
LoadClut(temp_s0, clutX, i);
}
}
@ -291,7 +291,7 @@ void func_800EA7CC(void) {
clutX = 0;
for (i = 0xF0; i < 0x100; i++, temp_s0 = (s16*)temp_s0 + 0x100, offset++) {
if (palettes[offset] != 0) {
LoadClut2(temp_s0, clutX, i);
LoadClut(temp_s0, clutX, i);
}
}
@ -299,7 +299,7 @@ void func_800EA7CC(void) {
clutX = 0x100;
for (i = 0xF0; i < 0x100; i++, temp_s0 = (s16*)temp_s0 + 0x100, offset++) {
if (palettes[offset]) {
LoadClut2(temp_s0, clutX, i);
LoadClut(temp_s0, clutX, i);
}
}
}
@ -607,8 +607,8 @@ void LoadEquipIcon(s32 equipIcon, s32 palette, s32 index) {
D_800705CC[index * 0x10 + i] = g_PalEquipIcon[palette * 0x10 + i];
}
LoadClut2(D_800705CC, 0, 0xFD);
LoadClut2(D_800705CC + 0x100, 0, 0xFE);
LoadClut(D_800705CC, 0, 0xFD);
LoadClut(D_800705CC + 0x100, 0, 0xFE);
}
if (D_800973EC == 0) {
D_80137478[index] = equipIcon;

4
src/dra/loading.c
View File

@ -717,7 +717,7 @@ void HandleEnding(void) {
StoreImage(&g_Vram.D_800ACDB8, &D_80070BCC);
LoadImage(&g_Vram.D_800ACDA8, (u_long*)0x80194000);
StoreImage(&g_Vram.D_800ACDA8, &D_80070BCC - 0x1000);
LoadClut2(g_Clut, 0x200, 0xF0);
LoadClut(g_Clut, 0x200, 0xF0);
} else {
if (LoadFileSim(14, SimFileType_System) < 0) {
break;
@ -734,7 +734,7 @@ void HandleEnding(void) {
if (LoadFileSim(4, SimFileType_System) < 0) {
break;
}
LoadClut2(g_Clut, 0x200, 0xF0);
LoadClut(g_Clut, 0x200, 0xF0);
}
g_GameStep++;
break;

2
src/main/psxsdk/libgpu/ext.c
View File

@ -23,7 +23,7 @@ u_short LoadTPage(u_long* pix, int tp, int abr, int x, int y, int w, int h) {
return GetTPage(tp, abr, x, y);
}
u_short LoadClut2(u_long* clut, int x, int y) {
u_short LoadClut(u_long* clut, int x, int y) {
RECT rect;
rect.x = x;

2
src/main/psxsdk/libgpu/font.c
View File

@ -34,7 +34,7 @@ extern u16 clut;
extern u16 tpage;
void FntLoad(s32 tx, s32 ty) {
clut = LoadClut2(D_8002B818, tx, ty + 0x80);
clut = LoadClut(D_8002B818, tx, ty + 0x80);
tpage = LoadTPage(D_8002B818 + 0x80, 0, 0, tx, ty, 0x80, 0x20);
D_8002B810 = 0;
memset(Font, 0, sizeof(Font));