From 235b6575c208667fa39592bfe0c885c3ca006595 Mon Sep 17 00:00:00 2001 From: emilybrooks Date: Sat, 15 Jun 2024 12:56:42 -0700 Subject: extracted yubinkyoku and locerrmsg (#195) * s post office * winter post office * extracted locerrmsg * added comments --- linker_scripts/jp/symbol_addrs_assets.txt | 50 +++++++++++++ src/misc/locerrmsg/locerrmsg.c | 5 ++ src/misc/locerrmsg/locerrmsg.h | 8 ++ .../obj_s_yubinkyoku/obj_s_yubinkyoku.c | 36 +++++++++ .../obj_s_yubinkyoku/obj_s_yubinkyoku.h | 37 ++++++++++ .../obj_w_yubinkyoku/obj_w_yubinkyoku.c | 34 +++++++++ .../obj_w_yubinkyoku/obj_w_yubinkyoku.h | 37 ++++++++++ yamls/jp/assets.yaml | 85 +++++++++++++++++++++- 8 files changed, 288 insertions(+), 4 deletions(-) create mode 100644 src/misc/locerrmsg/locerrmsg.c create mode 100644 src/misc/locerrmsg/locerrmsg.h create mode 100644 src/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku.c create mode 100644 src/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku.h create mode 100644 src/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku.c create mode 100644 src/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku.h diff --git a/linker_scripts/jp/symbol_addrs_assets.txt b/linker_scripts/jp/symbol_addrs_assets.txt index e48eed9..bc07c47 100644 --- a/linker_scripts/jp/symbol_addrs_assets.txt +++ b/linker_scripts/jp/symbol_addrs_assets.txt @@ -796,6 +796,56 @@ obj_w_kouban_t1_tex_txt = 0x604EDC8; // segment:object_00D5E000 rom:0xDACDC8 obj_w_kouban_window_tex_txt = 0x604F5C8; // segment:object_00D5E000 rom:0xDAD5C8 obj_w_kouban_t2_tex_txt = 0x604F648; // segment:object_00D5E000 rom:0xDAD648 +obj_s_yubinkyoku_v = 0x604FE58; // segment:object_00D5E000 rom:0xDADE58 size:0x310 +obj_s_yubinkyoku_window_model = 0x6050168; // segment:object_00D5E000 rom:0xDAE168 +obj_s_yubinkyoku_t3_1_model = 0x60501F8; // segment:object_00D5E000 rom:0xDAE1F8 +obj_s_yubinkyoku_t2_model = 0x60502C0; // segment:object_00D5E000 rom:0xDAE2C0 +obj_s_yubinkyoku_t1_model = 0x6050390; // segment:object_00D5E000 rom:0xDAE390 +obj_s_yubinkyoku_neon_model = 0x6050468; // segment:object_00D5E000 rom:0xDAE468 +obj_s_yubinkyoku_light_model = 0x6050540; // segment:object_00D5E000 rom:0xDAE540 +obj_s_yubinkyoku_door_model = 0x6050588; // segment:object_00D5E000 rom:0xDAE588 +obj_s_yubinkyoku_t3_txt = 0x6050648; // segment:object_00D5E000 rom:0xDAE648 +obj_s_yubinkyoku_t1_txt = 0x6050E48; // segment:object_00D5E000 rom:0xDAEE48 +obj_s_yubinkyoku_window_tex_txt = 0x6051648; // segment:object_00D5E000 rom:0xDAF648 +obj_s_yubinkyoku_t2_txt = 0x60516C8; // segment:object_00D5E000 rom:0xDAF6C8 +cKF_je_r_obj_s_yubinkyoku_tbl = 0x6051EC8; // segment:object_00D5E000 rom:0xDAFEC8 +cKF_bs_r_obj_s_yubinkyoku = 0x6051F28; // segment:object_00D5E000 rom:0xDAFF28 +cKF_ckcb_r_obj_s_yubinkyoku_tbl = 0x6051F30; // segment:object_00D5E000 rom:0xDAFF30 +cKF_kn_obj_s_yubinkyoku_tbl = 0x6051F38; // segment:object_00D5E000 rom:0xDAFF38 +cKF_c_obj_s_yubinkyoku_tbl = 0x6051F3C; // segment:object_00D5E000 rom:0xDAFF3C +cKF_ds_obj_s_yubinkyoku_tbl = 0x6051F70; // segment:object_00D5E000 rom:0xDAFF70 +cKF_ba_r_obj_s_yubinkyoku = 0x6051FB4; // segment:object_00D5E000 rom:0xDAFFB4 +cKF_ckcb_r_obj_s_yubinkyoku_out_tbl = 0x6051FC8; // segment:object_00D5E000 rom:0xDAFFC8 +cKF_kn_obj_s_yubinkyoku_out_tbl = 0x6051FD0; // segment:object_00D5E000 rom:0xDAFFD0 +cKF_c_obj_s_yubinkyoku_out_tbl = 0x6051FD4; // segment:object_00D5E000 rom:0xDAFFD4 +cKF_ds_obj_s_yubinkyoku_out_tbl = 0x6052008; // segment:object_00D5E000 rom:0xDB0008 +cKF_ba_r_obj_s_yubinkyoku_out = 0x6052058; // segment:object_00D5E000 rom:0xDB0058 + +obj_w_yubinkyoku_v = 0x6052080; // segment:object_00D5E000 rom:0xDB0080 size:0x340 +obj_w_yubinkyoku_window_model = 0x60523C0; // segment:object_00D5E000 rom:0xDB03C0 +obj_w_yubinkyoku_t3_model = 0x6052450; // segment:object_00D5E000 rom:0xDB0450 +obj_w_yubinkyoku_t2_model = 0x6052518; // segment:object_00D5E000 rom:0xDB0518 +obj_w_yubinkyoku_t1_model = 0x60525E8; // segment:object_00D5E000 rom:0xDB05E8 +obj_w_yubinkyoku_neon_model = 0x60526C0; // segment:object_00D5E000 rom:0xDB06C0 +obj_w_yubinkyoku_light_model = 0x6052798; // segment:object_00D5E000 rom:0xDB0798 +obj_w_yubinkyoku_door_model = 0x60527E0; // segment:object_00D5E000 rom:0xDB07E0 +obj_w_yubinkyoku_t3_txt = 0x60528A0; // segment:object_00D5E000 rom:0xDB08A0 +obj_w_yubinkyoku_t1_txt = 0x60530A0; // segment:object_00D5E000 rom:0xDB10A0 +obj_w_yubinkyoku_window_tex_txt = 0x60538A0; // segment:object_00D5E000 rom:0xDB18A0 +obj_w_yubinkyoku_t2_txt = 0x6053920; // segment:object_00D5E000 rom:0xDB1920 +cKF_je_r_obj_w_yubinkyoku_tbl = 0x6054120; // segment:object_00D5E000 rom:0xDB2120 +cKF_bs_r_obj_w_yubinkyoku = 0x6054180; // segment:object_00D5E000 rom:0xDB2180 +cKF_ckcb_r_obj_w_yubinkyoku_tbl = 0x6054188; // segment:object_00D5E000 rom:0xDB2188 +cKF_kn_obj_w_yubinkyoku_tbl = 0x6054190; // segment:object_00D5E000 rom:0xDB2190 +cKF_c_obj_w_yubinkyoku_tbl = 0x6054194; // segment:object_00D5E000 rom:0xDB2194 +cKF_ds_obj_w_yubinkyoku_tbl = 0x60541C8; // segment:object_00D5E000 rom:0xDB21C8 +cKF_ba_r_obj_w_yubinkyoku = 0x605420C; // segment:object_00D5E000 rom:0xDB220C +cKF_ckcb_r_obj_w_yubinkyoku_out_tbl = 0x6054220; // segment:object_00D5E000 rom:0xDB2220 +cKF_kn_obj_w_yubinkyoku_out_tbl = 0x6054228; // segment:object_00D5E000 rom:0xDB2228 +cKF_c_obj_w_yubinkyoku_out_tbl = 0x605422C; // segment:object_00D5E000 rom:0xDB222C +cKF_ds_obj_w_yubinkyoku_out_tbl = 0x6054260; // segment:object_00D5E000 rom:0xDB2260 +cKF_ba_r_obj_w_yubinkyoku_out = 0x60542B0; // segment:object_00D5E000 rom:0xDB22B0 + obj_s_toudai_v = 0x0607D248; // segment:object_00D5E000 rom:0xDDB248 size:0x990 obj_s_toudai_mirror_model = 0x0607DBD8; // segment:object_00D5E000 rom:0xDDBBD8 obj_s_toudai_glass_model = 0x0607DCA0; // segment:object_00D5E000 rom:0xDDBCA0 diff --git a/src/misc/locerrmsg/locerrmsg.c b/src/misc/locerrmsg/locerrmsg.c new file mode 100644 index 0000000..0604a7b --- /dev/null +++ b/src/misc/locerrmsg/locerrmsg.c @@ -0,0 +1,5 @@ +#include "locerrmsg.h" + +u8 not_designed_for_system_error[] = { +#include "assets/jp/misc/locerrmsg/not_designed_for_system_error.i4.inc.c" +}; diff --git a/src/misc/locerrmsg/locerrmsg.h b/src/misc/locerrmsg/locerrmsg.h new file mode 100644 index 0000000..9249392 --- /dev/null +++ b/src/misc/locerrmsg/locerrmsg.h @@ -0,0 +1,8 @@ +#ifndef OBJECT_LOCERRMSG_H +#define OBJECT_LOCERRMSG_H + +#include "gbi.h" + +extern u8 not_designed_for_system_error[]; + +#endif diff --git a/src/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku.c b/src/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku.c new file mode 100644 index 0000000..a77f391 --- /dev/null +++ b/src/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku.c @@ -0,0 +1,36 @@ +#include "obj_s_yubinkyoku.h" + +s32 padDADE50[] = { 0x00000000, 0x00000000 }; +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku_v.vtx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku_window_model.gfx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku_t3_1_model.gfx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku_t2_model.gfx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku_t1_model.gfx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku_neon_model.gfx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku_light_model.gfx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku_door_model.gfx.inc.c" +u8 obj_s_yubinkyoku_t3_txt[] = { +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku_t3_txt.ci4.inc.c" +}; +u8 obj_s_yubinkyoku_t1_txt[] = { +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku_t1_txt.ci4.inc.c" +}; +u8 obj_s_yubinkyoku_window_tex_txt[] = { +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku_window_tex_txt.i4.inc.c" +}; +u8 obj_s_yubinkyoku_t2_txt[] = { +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku_t2_txt.ci4.inc.c" +}; +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/cKF_je_r_obj_s_yubinkyoku_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/cKF_bs_r_obj_s_yubinkyoku.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/cKF_ckcb_r_obj_s_yubinkyoku_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/cKF_kn_obj_s_yubinkyoku_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/cKF_c_obj_s_yubinkyoku_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/cKF_ds_obj_s_yubinkyoku_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/cKF_ba_r_obj_s_yubinkyoku.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/cKF_ckcb_r_obj_s_yubinkyoku_out_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/cKF_kn_obj_s_yubinkyoku_out_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/cKF_c_obj_s_yubinkyoku_out_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/cKF_ds_obj_s_yubinkyoku_out_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_s_yubinkyoku/cKF_ba_r_obj_s_yubinkyoku_out.inc.c" +s32 padDB006C[] = { 0x00000000, 0x00000000 }; diff --git a/src/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku.h b/src/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku.h new file mode 100644 index 0000000..408f911 --- /dev/null +++ b/src/objects/object_00D5E000/obj_s_yubinkyoku/obj_s_yubinkyoku.h @@ -0,0 +1,37 @@ +#ifndef OBJECT_OBJ_S_YUBINKYOKU_H +#define OBJECT_OBJ_S_YUBINKYOKU_H + +#include "gbi.h" +#include "c_keyframe.h" + +/** + * @file obj_w_yubinkyouku + * 郵便局 Post Office (non winter) + */ + +extern Vtx obj_s_yubinkyoku_v[]; +extern Gfx obj_s_yubinkyoku_window_model[]; +extern Gfx obj_s_yubinkyoku_t3_1_model[]; +extern Gfx obj_s_yubinkyoku_t2_model[]; +extern Gfx obj_s_yubinkyoku_t1_model[]; +extern Gfx obj_s_yubinkyoku_neon_model[]; +extern Gfx obj_s_yubinkyoku_light_model[]; +extern Gfx obj_s_yubinkyoku_door_model[]; +extern u8 obj_s_yubinkyoku_t3_txt[]; +extern u8 obj_s_yubinkyoku_t1_txt[]; +extern u8 obj_s_yubinkyoku_window_tex_txt[]; +extern u8 obj_s_yubinkyoku_t2_txt[]; +extern JointElemR cKF_je_r_obj_s_yubinkyoku_tbl[]; +extern BaseSkeletonR cKF_bs_r_obj_s_yubinkyoku; +extern u8 cKF_ckcb_r_obj_s_yubinkyoku_tbl[]; +extern s16 cKF_kn_obj_s_yubinkyoku_tbl[]; +extern s16 cKF_c_obj_s_yubinkyoku_tbl[]; +extern Keyframe cKF_ds_obj_s_yubinkyoku_tbl[]; +extern BaseAnimationR cKF_ba_r_obj_s_yubinkyoku; +extern u8 cKF_ckcb_r_obj_s_yubinkyoku_out_tbl[]; +extern s16 cKF_kn_obj_s_yubinkyoku_out_tbl[]; +extern s16 cKF_c_obj_s_yubinkyoku_out_tbl[]; +extern Keyframe cKF_ds_obj_s_yubinkyoku_out_tbl[]; +extern BaseAnimationR cKF_ba_r_obj_s_yubinkyoku_out; + +#endif diff --git a/src/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku.c b/src/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku.c new file mode 100644 index 0000000..add514f --- /dev/null +++ b/src/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku.c @@ -0,0 +1,34 @@ +#include "obj_w_yubinkyoku.h" + +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku_v.vtx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku_window_model.gfx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku_t3_model.gfx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku_t2_model.gfx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku_t1_model.gfx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku_neon_model.gfx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku_light_model.gfx.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku_door_model.gfx.inc.c" +u8 obj_w_yubinkyoku_t3_txt[] = { +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku_t3_txt.ci4.inc.c" +}; +u8 obj_w_yubinkyoku_t1_txt[] = { +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku_t1_txt.ci4.inc.c" +}; +u8 obj_w_yubinkyoku_window_tex_txt[] = { +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku_window_tex_txt.i4.inc.c" +}; +u8 obj_w_yubinkyoku_t2_txt[] = { +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku_t2_txt.ci4.inc.c" +}; +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/cKF_je_r_obj_w_yubinkyoku_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/cKF_bs_r_obj_w_yubinkyoku.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/cKF_ckcb_r_obj_w_yubinkyoku_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/cKF_kn_obj_w_yubinkyoku_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/cKF_c_obj_w_yubinkyoku_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/cKF_ds_obj_w_yubinkyoku_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/cKF_ba_r_obj_w_yubinkyoku.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/cKF_ckcb_r_obj_w_yubinkyoku_out_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/cKF_kn_obj_w_yubinkyoku_out_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/cKF_c_obj_w_yubinkyoku_out_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/cKF_ds_obj_w_yubinkyoku_out_tbl.inc.c" +#include "assets/jp/objects/object_00D5E000/obj_w_yubinkyoku/cKF_ba_r_obj_w_yubinkyoku_out.inc.c" diff --git a/src/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku.h b/src/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku.h new file mode 100644 index 0000000..1841f1a --- /dev/null +++ b/src/objects/object_00D5E000/obj_w_yubinkyoku/obj_w_yubinkyoku.h @@ -0,0 +1,37 @@ +#ifndef OBJECT_OBJ_W_YUBINKYOKU_H +#define OBJECT_OBJ_W_YUBINKYOKU_H + +#include "gbi.h" +#include "c_keyframe.h" + +/** + * @file obj_w_yubinkyouku + * 郵便局 Post Office (winter) + */ + +extern Vtx obj_w_yubinkyoku_v[]; +extern Gfx obj_w_yubinkyoku_window_model[]; +extern Gfx obj_w_yubinkyoku_t3_model[]; +extern Gfx obj_w_yubinkyoku_t2_model[]; +extern Gfx obj_w_yubinkyoku_t1_model[]; +extern Gfx obj_w_yubinkyoku_neon_model[]; +extern Gfx obj_w_yubinkyoku_light_model[]; +extern Gfx obj_w_yubinkyoku_door_model[]; +extern u8 obj_w_yubinkyoku_t3_txt[]; +extern u8 obj_w_yubinkyoku_t1_txt[]; +extern u8 obj_w_yubinkyoku_window_tex_txt[]; +extern u8 obj_w_yubinkyoku_t2_txt[]; +extern JointElemR cKF_je_r_obj_w_yubinkyoku_tbl[]; +extern BaseSkeletonR cKF_bs_r_obj_w_yubinkyoku; +extern u8 cKF_ckcb_r_obj_w_yubinkyoku_tbl[]; +extern s16 cKF_kn_obj_w_yubinkyoku_tbl[]; +extern s16 cKF_c_obj_w_yubinkyoku_tbl[]; +extern Keyframe cKF_ds_obj_w_yubinkyoku_tbl[]; +extern BaseAnimationR cKF_ba_r_obj_w_yubinkyoku; +extern u8 cKF_ckcb_r_obj_w_yubinkyoku_out_tbl[]; +extern s16 cKF_kn_obj_w_yubinkyoku_out_tbl[]; +extern s16 cKF_c_obj_w_yubinkyoku_out_tbl[]; +extern Keyframe cKF_ds_obj_w_yubinkyoku_out_tbl[]; +extern BaseAnimationR cKF_ba_r_obj_w_yubinkyoku_out; + +#endif diff --git a/yamls/jp/assets.yaml b/yamls/jp/assets.yaml index 635052e..287fcde 100644 --- a/yamls/jp/assets.yaml +++ b/yamls/jp/assets.yaml @@ -63,12 +63,21 @@ - [0xA20010] - name: locerrmsg - dir: misc - type: bin + dir: misc/locerrmsg + type: code start: 0xA21000 vram: 0x01000000 + exclusive_ram_id: segment_01 compress: True align: 0x1000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, locerrmsg] + - start: 0xA21000 + type: .data + name: locerrmsg + subsegments: + - [0xA21000, i4, not_designed_for_system_error, 208, 16] - [0xA21680] - name: gameplay_keep @@ -653,7 +662,9 @@ - [0xD5B948] - { start: 0xD5BA48, type: af_palette, name: obj_s_yamishop_pal, global_id: obj_s_yamishop_pal } - { start: 0xD5BA68, type: af_palette, name: obj_w_yamishop_pal, global_id: obj_w_yamishop_pal } - - [0xD5BA88] + - { start: 0xD5BA88, type: af_palette, name: obj_s_post_office_pal, global_id: obj_s_post_office_pal } + - { start: 0xD5BAA8, type: af_palette, name: obj_s_post_office_winter_pal, global_id: obj_s_post_office_winter_pal } + - [0xD5BAC8] - { start: 0xD5BF08, type: af_palette, name: obj_police_box_pal, global_id: obj_police_box_pal } - { start: 0xD5BF28, type: af_palette, name: obj_police_box_winter_pal, global_id: obj_police_box_winter_pal } - [0xD5BF48] @@ -1945,7 +1956,73 @@ - [0xDAD5C8, i4, obj_w_kouban/obj_w_kouban_window_tex_txt, 16, 16] - [0xDAD648, ci4, obj_w_kouban/obj_w_kouban_t2_tex_txt, 128, 32, obj_police_box_winter_pal] - [0xDADE48] - - [0xDADE50, bin, 0D5E000_unextracted] + - [auto, c, obj_s_yubinkyoku/obj_s_yubinkyoku] + - start: 0xDADE50 + type: .data + name: obj_s_yubinkyoku/obj_s_yubinkyoku + subsegments: + - [0xDADE50, pad] + - [0xDADE58, vtx, obj_s_yubinkyoku/obj_s_yubinkyoku_v] + - [0xDAE168, af_gfx, obj_s_yubinkyoku/obj_s_yubinkyoku_window_model] + - [0xDAE1F8, af_gfx, obj_s_yubinkyoku/obj_s_yubinkyoku_t3_1_model] + - [0xDAE2C0, af_gfx, obj_s_yubinkyoku/obj_s_yubinkyoku_t2_model] + - [0xDAE390, af_gfx, obj_s_yubinkyoku/obj_s_yubinkyoku_t1_model] + - [0xDAE468, af_gfx, obj_s_yubinkyoku/obj_s_yubinkyoku_neon_model] + - [0xDAE540, af_gfx, obj_s_yubinkyoku/obj_s_yubinkyoku_light_model] + - [0xDAE588, af_gfx, obj_s_yubinkyoku/obj_s_yubinkyoku_door_model] + - [0xDAE648, ci4, obj_s_yubinkyoku/obj_s_yubinkyoku_t3_txt, 128, 32, obj_s_post_office_pal] + - [0xDAEE48, ci4, obj_s_yubinkyoku/obj_s_yubinkyoku_t1_txt, 128, 32, obj_s_post_office_pal] + - [0xDAF648, i4, obj_s_yubinkyoku/obj_s_yubinkyoku_window_tex_txt, 16, 16] + - [0xDAF6C8, ci4, obj_s_yubinkyoku/obj_s_yubinkyoku_t2_txt, 128, 32, obj_s_post_office_pal] + - [0xDAFEC8, ckf_je, obj_s_yubinkyoku/cKF_je_r_obj_s_yubinkyoku_tbl] + - [0xDAFF28, ckf_bs, obj_s_yubinkyoku/cKF_bs_r_obj_s_yubinkyoku] + - [0xDAFF30, ckf_ckcb, obj_s_yubinkyoku/cKF_ckcb_r_obj_s_yubinkyoku_tbl] + - [0xDAFF38, ckf_kn, obj_s_yubinkyoku/cKF_kn_obj_s_yubinkyoku_tbl] + - [0xDAFF3C, ckf_c, obj_s_yubinkyoku/cKF_c_obj_s_yubinkyoku_tbl] + - [0xDAFF70, ckf_ds, obj_s_yubinkyoku/cKF_ds_obj_s_yubinkyoku_tbl] + - [0xDAFFB2, pad] + - [0xDAFFB4, ckf_ba, obj_s_yubinkyoku/cKF_ba_r_obj_s_yubinkyoku] + - [0xDAFFC8, ckf_ckcb, obj_s_yubinkyoku/cKF_ckcb_r_obj_s_yubinkyoku_out_tbl] + - [0xDAFFD0, ckf_kn, obj_s_yubinkyoku/cKF_kn_obj_s_yubinkyoku_out_tbl] + - [0xDAFFD4, ckf_c, obj_s_yubinkyoku/cKF_c_obj_s_yubinkyoku_out_tbl] + - [0xDB0008, ckf_ds, obj_s_yubinkyoku/cKF_ds_obj_s_yubinkyoku_out_tbl] + - [0xDB0056, pad] + - [0xDB0058, ckf_ba, obj_s_yubinkyoku/cKF_ba_r_obj_s_yubinkyoku_out] + - [0xDB006C] + - [auto, c, obj_w_yubinkyoku/obj_w_yubinkyoku] + - start: 0xDB0078 + type: .data + name: obj_w_yubinkyoku/obj_w_yubinkyoku + subsegments: + - [0xDB0078, pad] + - [0xDB0080, vtx, obj_w_yubinkyoku/obj_w_yubinkyoku_v] + - [0xDB03C0, af_gfx, obj_w_yubinkyoku/obj_w_yubinkyoku_window_model] + - [0xDB0450, af_gfx, obj_w_yubinkyoku/obj_w_yubinkyoku_t3_model] + - [0xDB0518, af_gfx, obj_w_yubinkyoku/obj_w_yubinkyoku_t2_model] + - [0xDB05E8, af_gfx, obj_w_yubinkyoku/obj_w_yubinkyoku_t1_model] + - [0xDB06C0, af_gfx, obj_w_yubinkyoku/obj_w_yubinkyoku_neon_model] + - [0xDB0798, af_gfx, obj_w_yubinkyoku/obj_w_yubinkyoku_light_model] + - [0xDB07E0, af_gfx, obj_w_yubinkyoku/obj_w_yubinkyoku_door_model] + - [0xDB08A0, ci4, obj_w_yubinkyoku/obj_w_yubinkyoku_t3_txt, 128, 32, obj_s_post_office_winter_pal] + - [0xDB10A0, ci4, obj_w_yubinkyoku/obj_w_yubinkyoku_t1_txt, 128, 32, obj_s_post_office_winter_pal] + - [0xDB18A0, i4, obj_w_yubinkyoku/obj_w_yubinkyoku_window_tex_txt, 16, 16] + - [0xDB1920, ci4, obj_w_yubinkyoku/obj_w_yubinkyoku_t2_txt, 128, 32, obj_s_post_office_winter_pal] + - [0xDB2120, ckf_je, obj_w_yubinkyoku/cKF_je_r_obj_w_yubinkyoku_tbl] + - [0xDB2180, ckf_bs, obj_w_yubinkyoku/cKF_bs_r_obj_w_yubinkyoku] + - [0xDB2188, ckf_ckcb, obj_w_yubinkyoku/cKF_ckcb_r_obj_w_yubinkyoku_tbl] + - [0xDB2190, ckf_kn, obj_w_yubinkyoku/cKF_kn_obj_w_yubinkyoku_tbl] + - [0xDB2194, ckf_c, obj_w_yubinkyoku/cKF_c_obj_w_yubinkyoku_tbl] + - [0xDB21C8, ckf_ds, obj_w_yubinkyoku/cKF_ds_obj_w_yubinkyoku_tbl] + - [0xDB220A, pad] + - [0xDB220C, ckf_ba, obj_w_yubinkyoku/cKF_ba_r_obj_w_yubinkyoku] + - [0xDB2220, ckf_ckcb, obj_w_yubinkyoku/cKF_ckcb_r_obj_w_yubinkyoku_out_tbl] + - [0xDB2228, ckf_kn, obj_w_yubinkyoku/cKF_kn_obj_w_yubinkyoku_out_tbl] + - [0xDB222C, ckf_c, obj_w_yubinkyoku/cKF_c_obj_w_yubinkyoku_out_tbl] + - [0xDB2260, ckf_ds, obj_w_yubinkyoku/cKF_ds_obj_w_yubinkyoku_out_tbl] + - [0xDB22AE, pad] + - [0xDB22B0, ckf_ba, obj_w_yubinkyoku/cKF_ba_r_obj_w_yubinkyoku_out] + - [0xDB22C4] + - [0xDB22D0, bin, 0D5E000_unextracted] - [0xDF3480] - name: object_00DF4000 -- cgit v1.2.3