mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-08 12:16:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add in map icon data, kan_tizu[2]

Browse Source
This commit is contained in:
Cuyler36
2024-08-08 01:03:56 -04:00
parent 31c2e946a6
commit 3d30d49722
5 changed files with 441 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/submenu/map/kan_tizu.c
+217
View File
@@ -0,0 +1,217 @@
// clang-format off
extern unsigned char kan_tizu_c1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c1r1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c1r1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c1s_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c1s_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c2_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c2_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c2r1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c2r1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c3r1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c3r1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c4r1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c4r1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c5r1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c5r1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c6_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c6_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c6r1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c6r1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c6s_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c6s_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c7_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c7_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c7r1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c7r1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_f_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_f_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_r1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_r1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_r1b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_r1b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_r2_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_r2_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_r4_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_r4_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_r5_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_r5_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_r6_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_r6_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_r7_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_r7_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c4_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c4_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c5_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c5_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c3_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c3_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_r7b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_r7b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c1r2_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c1r2_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c2r2_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c2r2_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c3r2_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c3r2_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c4r2_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c4r2_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c5r2_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c5r2_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c6r3_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c6r3_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c7r3_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c7r3_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c2s_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c2s_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c3s_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c3s_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c4s_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c4s_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c5s_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c5s_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c7s_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c7s_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_r2b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_r2b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_r4b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_r4b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_r5b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_r5b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_r6b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_r6b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_pr1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_pr1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_pr2_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_pr2_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_pr4_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_pr4_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_pr5_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_pr5_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_pr6_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_pr6_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_pr7_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_pr7_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c3r1b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c3r1b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c4r1b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c4r1b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c1r2b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c1r2b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c4r2b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c4r2b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c5r2b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c5r2b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c6r1b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c6r1b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_c7r1b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_c7r1b_TA_tex_txt.inc"
};
src/data/submenu/map/kan_tizu2.c
+61
View File
@@ -0,0 +1,61 @@
// clang-format off
extern unsigned char kan_tizu_tst1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_tst1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_tr1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_tr1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_t_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_t_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_fsh_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_fsh_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_fpo_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_fpo_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_fpk_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_fpk_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_fmh_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_fmh_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_fko_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_fko_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_mr1_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_mr1_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_m_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_m_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_mr1b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_mr1b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_tr1b_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_tr1b_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_fta_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_fta_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_mwf_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_mwf_TA_tex_txt.inc"
};
extern unsigned char kan_tizu_fmu_TA_tex_txt[] __attribute__((aligned(32))) = {
#include "assets/submenu/map/kan_tizu_fmu_TA_tex_txt.inc"
};
src/m_map_ovl.c
+19 -15
View File
@@ -115,14 +115,14 @@ static u8* l_map_texture[mFM_BLOCK_TYPE_NUM] = {
kan_tizu_c6r1b_TA_tex_txt, kan_tizu_c7r1b_TA_tex_txt, kan_tizu_c7r1b_TA_tex_txt, kan_tizu_c7r1b_TA_tex_txt,
kan_tizu_c7r1b_TA_tex_txt, kan_tizu_c7r1b_TA_tex_txt, kan_tizu_c7r1b_TA_tex_txt, kan_tizu_c7r1b_TA_tex_txt,
kan_tizu_mwf_TA_tex_txt, kan_tizu_mwf_TA_tex_txt, kan_tizu_mwf_TA_tex_txt, kan_tizu_mwf_TA_tex_txt,
kan_tizu_mwf_TA_tex_txt, kan_tizu_c1r2b_TA_tex_txt, kan_tizu_c4r2b_TA_tex_txt, kan_tizu_c5r2b_TA_tex_txt
kan_tizu_mwf_TA_tex_txt, kan_tizu_c1r2b_TA_tex_txt, kan_tizu_c4r2b_TA_tex_txt, kan_tizu_c5r2b_TA_tex_txt,
};
static u8 l_map_pal[mFM_BLOCK_TYPE_NUM] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0 };
static u8 l_map_pal[mFM_BLOCK_TYPE_NUM] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
};
static u8 pluss_bridge[mFM_BLOCK_TYPE_NUM] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x56, 0xff, 0xff, 0xff, 0xff,
@@ -130,7 +130,7 @@ static u8 pluss_bridge[mFM_BLOCK_TYPE_NUM] = {
0x6b, 0xff, 0xff, 0xff, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x52, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
};
extern Gfx kan_win_model[];
@@ -156,11 +156,15 @@ extern mMP_HousePos_c mMP_house_pos_list[];
extern Gfx kan_win_mode[];
static u16 kan_tizu1_pal[16] ATTRIBUTE_ALIGN(32) = { 0x0000, 0xc3b0, 0x9e87, 0xd294, 0xca52, 0xbdef, 0xb5ad, 0xb9ce,
0xa2e8, 0xb18c, 0xa705, 0xdaff, 0xab4a, 0xffff, 0xb635, 0xbe9f };
static u16 kan_tizu1_pal[16] ATTRIBUTE_ALIGN(32) = {
0x0000, 0xc3b0, 0x9e87, 0xd294, 0xca52, 0xbdef, 0xb5ad, 0xb9ce,
0xa2e8, 0xb18c, 0xa705, 0xdaff, 0xab4a, 0xffff, 0xb635, 0xbe9f,
};
static u16 kan_tizu2_pal[16] ATTRIBUTE_ALIGN(32) = { 0x0000, 0xc3b0, 0x9e87, 0xc94a, 0xe70d, 0xe1ce, 0xb5ad, 0xb195,
0xf390, 0xb18c, 0xa705, 0xffff, 0xd54a, 0xdaff, 0xb635, 0xbe9f };
static u16 kan_tizu2_pal[16] ATTRIBUTE_ALIGN(32) = {
0x0000, 0xc3b0, 0x9e87, 0xc94a, 0xe70d, 0xe1ce, 0xb5ad, 0xb195,
0xf390, 0xb18c, 0xa705, 0xffff, 0xd54a, 0xdaff, 0xb635, 0xbe9f,
};
static u16* l_kan_tizu_pal[2] = { kan_tizu1_pal, kan_tizu2_pal };
@@ -303,10 +307,10 @@ static mMP_LabelWord_c mMP_label_word_port = { -83.0f, -25.0f, mMP_label_str_por
static mMP_Label_c mMP_label_port = { -93.0f, -30.0f, kan_win_funeT_model, { &mMP_label_word_port, NULL } };
static mMP_Label_c* mMP_label_data[mMP_LABEL_NUM] = { &mMP_label_npc, &mMP_label_player, &mMP_label_shop,
&mMP_label_police, &mMP_label_post, &mMP_label_shrine,
&mMP_label_station, &mMP_label_junk, &mMP_label_museum,
&mMP_label_needle, &mMP_label_port };
static mMP_Label_c* mMP_label_data[mMP_LABEL_NUM] = {
&mMP_label_npc, &mMP_label_player, &mMP_label_shop, &mMP_label_police, &mMP_label_post, &mMP_label_shrine,
&mMP_label_station, &mMP_label_junk, &mMP_label_museum, &mMP_label_needle, &mMP_label_port,
};
static int mMP_check_layer(f32 y) {
int layer;