From 651a7dc27c84913bffa66fcdb061f57b5dd55f4e Mon Sep 17 00:00:00 2001 From: Prakxo Date: Thu, 9 Nov 2023 13:25:56 +0100 Subject: [PATCH] fixes and link m_cpak --- .gitignore | 2 +- config/rel_slices.yml | 4 ++++ include/m_name_table.h | 1 + rel/m_cpak.c | 28 ++++++++++++++++++++++++++++ upload_frogress.py | 3 ++- 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 rel/m_cpak.c diff --git a/.gitignore b/.gitignore index a5c37886..b1bf6917 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,4 @@ build.ninja ac-decomp.code-workspace assets/ tools/cli.ini -tools/cli.py \ No newline at end of file +tools/cli.py diff --git a/config/rel_slices.yml b/config/rel_slices.yml index 7a522645..aa3a5ef9 100644 --- a/config/rel_slices.yml +++ b/config/rel_slices.yml @@ -283,6 +283,10 @@ m_roll_lib.c: .rodata: [0x806434D8, 0x80643538] sys_stacks.c: .bss: [0x812F5670, 0x812F9670] +m_cpak.c: + .text: [0x80403830, 0x80403874] + .data: [0x8065EC98, 0x8065ECA0] + .bss: [0x812F3040, 0x812F3098] m_vibctl.c: .text: [0x8040387C, 0x804040F0] .rodata: [0x80643550, 0x806436C8] diff --git a/include/m_name_table.h b/include/m_name_table.h index dd9a6d71..49724f7e 100644 --- a/include/m_name_table.h +++ b/include/m_name_table.h @@ -3,6 +3,7 @@ #include "types.h" #include "m_actor_type.h" +#include "m_collision_bg.h" /* TODO: these defintions are likely included from an auto-gen source */ diff --git a/rel/m_cpak.c b/rel/m_cpak.c new file mode 100644 index 00000000..1ed5c5f6 --- /dev/null +++ b/rel/m_cpak.c @@ -0,0 +1,28 @@ +#include "m_cpak.h" + +#include "s_cpak.h" + +mCPk_c l_paks_info; + +mCPk_c* g_paks_info_p = { + &l_paks_info +}; + +extern int mCPk_PakOpen(mCPk_c* pak, int pak_idx) { + sCPk_PakOpen(&pak->save_pak); +} + +extern int mCPk_InitPak(int pak_idx){ + return 0; +} + +extern int mCPk_SavePak(Private_c* private_data, Animal_c* animals, mCPk_c* cpak){ + return 0; +} + +extern mCPk_c* mCPk_get_pkinfo(){ + return g_paks_info_p; +} + + + diff --git a/upload_frogress.py b/upload_frogress.py index 673bb3d5..bc1733e6 100644 --- a/upload_frogress.py +++ b/upload_frogress.py @@ -73,4 +73,5 @@ if __name__ == "__main__": "entries": entries, }) r.raise_for_status() - print("Done!") \ No newline at end of file + print("Done!") + \ No newline at end of file