Game-Decompilation/kh1
1
0
Fork 0
mirror of https://github.com/ethteck/kh1.git synced 2025-02-17 06:40:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

couple matches

Browse Source
This commit is contained in:
Ethan Roseman 2023-09-26 09:32:20 +09:00
parent dcf2228fb2
commit 5a8d0f9d85
No known key found for this signature in database
GPG Key ID: 27F9FCEB8E4969BD
5 changed files with 147 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff_settings.py
View File

@ -13,5 +13,5 @@ def apply(config, args):
"assets",
]
config["make_command"] = ["ninja"]
config["objdump_flags"] = ["-Mfpr-names=32"]
config["objdump_flags"] = ["-Mreg-names=n32"]
config["expected_dir"] = f"expected/"

2
include/gcc/_ansi.h
View File

@ -12,7 +12,7 @@
#ifndef _ANSIDECL_H_
#define _ANSIDECL_H_
#include <sys/config.h>
#include "sys/config.h"
/* First try to figure out whether we really are in an ANSI C environment. */
/* FIXME: This probably needs some work. Perhaps sys/config.h can be

2
include/gcc/stdio.h
View File

@ -45,7 +45,7 @@ extern "C" {
* want reent.h to include this file.
*/
#include <sys/reent.h>
#include "sys/reent.h"
typedef _fpos_t fpos_t;

2
include/gcc/sys/reent.h
View File

@ -10,7 +10,7 @@ extern "C" {
#endif
#define _SYS_REENT_H_
#include <_ansi.h>
#include "gcc/_ansi.h"
#include <time.h>
#ifndef Long

146
src/xcapy.c
View File

@ -1,8 +1,98 @@
#include "common.h"
INCLUDE_ASM(const s32, "xcapy", func_00244490);
//#include "gcc/stdio.h"
INCLUDE_ASM(const s32, "xcapy", func_002446B0);
typedef struct XCapy {
/* 0x00 */ char unk_00[0x08];
/* 0x08 */ s32 unk_08;
/* 0x0C */ s32 unk_0C; // some state
/* 0x10 */ s32 unk_10;
/* 0x14 */ s32 unk_14;
} XCapy;
typedef struct XCapy2 {
/* 0x00 */ char unk_00[0x24];
/* 0x24 */ s32 unk_24;
/* 0x28 */ s32 unk_28;
/* 0x2C */ s32 unk_2C;
/* 0x30 */ char unk_30[0x14];
/* 0x44 */ s32 unk_44;
/* 0x48 */ s32 unk_48;
/* 0x4C */ s32 unk_4C;
/* 0x50 */ s32 unk_50;
} XCapy2;
void func_00244048(s32, UNK_TYPE*, s32, s32, f32);
void func_00244130(s32, s32, char*, f32, char*, s32);
void func_00244200(void*);
extern s32 D_004610F8;
extern char D_0048B348[];
extern char D_0048B350[];
extern char D_0048B358[];
extern char D_0048B360[];
extern char D_0048B368[];
extern char D_0048B370[];
extern char D_0048B378[];
extern UNK_TYPE D_006632D0;
extern s32 D_006633C0[8];
#ifdef NON_MATCHING
void func_00244490(XCapy2* arg0) {
char sp[3];
char sp10[0x10];
s32 unk_24;
s32 x;
s32 y;
unk_24 = arg0->unk_24;
x = (arg0->unk_2C != 0) ? (unk_24 + 0x5D) : (unk_24 + 0x67);
y = arg0->unk_28;
sp[0] = 0xE5;
sp[1] = 0x4E;
sp[2] = 0x19;
y += 0x2B;
if (arg0->unk_2C != 0) {
sprintf(sp10, D_0048B348, arg0->unk_50);
func_00244130(0.8f, x, y, sp, sp10, D_004610F8);
x += 22;
func_00244130(0.8f, x, y, sp, D_0048B350, D_004610F8);
x += 11;
}
sprintf(sp10, D_0048B348, arg0->unk_4C);
func_00244130(0.8f, x, y, sp, sp10, D_004610F8);
x += 22;
func_00244130(0.8f, x, y, sp, D_0048B358, D_004610F8);
x += 11;
sprintf(sp10, D_0048B348, arg0->unk_48);
func_00244130(0.8f, x, y, sp, sp10, D_004610F8);
x += 22;
func_00244130(0.8f, x, y, sp, D_0048B358, D_004610F8);
x += 5;
func_00244130(0.8f, x, y, sp, D_0048B358, D_004610F8);
x += 9;
sprintf(sp10, D_0048B348, arg0->unk_44);
func_00244130(0.8f, x, y, sp, sp10, D_004610F8);
}
#else
void func_00244490(XCapy2*);
INCLUDE_ASM(const s32, "xcapy", func_00244490);
#endif
void func_002446B0(XCapy2* arg0) {
s32 i;
for (i = 0; i < ARRAY_COUNT(D_006633C0); i++) {
func_00244048(D_006633C0[i], &D_006632D0, arg0->unk_24, arg0->unk_28, 1.0f);
}
func_00244200(arg0);
func_00244490(arg0);
}
INCLUDE_ASM(const s32, "xcapy", func_00244730);
@ -10,4 +100,54 @@ INCLUDE_ASM(const s32, "xcapy", func_002447B0);
INCLUDE_ASM(const s32, "xcapy", func_00244828);
INCLUDE_ASM(const s32, "xcapy", func_00244858);
void func_00244858(XCapy* arg0) {
char str[0x10];
u8 rgb[3]; // probably
rgb[0] = 0xFF;
rgb[1] = 0xFF;
rgb[2] = 0xFF;
switch (arg0->unk_0C) {
case 1:
sprintf(str, D_0048B360, arg0->unk_10);
func_00244130(69, 22, rgb, 1.0f, str, D_004610F8);
if (arg0->unk_08 != 0) {
sprintf(str, D_0048B368);
func_00244130(84, 22, rgb, 1.0f, str, D_004610F8);
sprintf(str, D_0048B360, arg0->unk_14);
func_00244130(97, 22, rgb, 1.0f, str, D_004610F8);
}
break;
case 2:
sprintf(str, D_0048B348, arg0->unk_10);
func_00244130(69, 22, rgb, 1.0f, str, D_004610F8);
if (arg0->unk_08 != 0) {
sprintf(str, D_0048B368);
func_00244130(97, 22, rgb, 1.0f, str, D_004610F8);
sprintf(str, D_0048B348, arg0->unk_14);
func_00244130(110, 22, rgb, 1.0f, str, D_004610F8);
}
break;
case 3:
sprintf(str, D_0048B370, arg0->unk_10);
func_00244130(69, 22, rgb, 1.0f, str, D_004610F8);
if (arg0->unk_08 != 0) {
sprintf(str, D_0048B368);
func_00244130(110, 22, rgb, 1.0f, str, D_004610F8);
sprintf(str, D_0048B370, arg0->unk_14);
func_00244130(123, 22, rgb, 1.0f, str, D_004610F8);
}
break;
case 4:
sprintf(str, D_0048B378, arg0->unk_10);
func_00244130(69, 22, rgb, 1.0f, str, D_004610F8);
if (arg0->unk_08 != 0) {
sprintf(str, D_0048B368);
func_00244130(123, 22, rgb, 1.0f, str, D_004610F8);
sprintf(str, D_0048B378, arg0->unk_14);
func_00244130(136, 22, rgb, 1.0f, str, D_004610F8);
}
break;
}
}