mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Link data_bgd TU

Browse Source
This commit is contained in:
Cuyler36
2024-08-11 08:35:15 -04:00
parent 365e2ec57e
commit ff3bab7e79
5 changed files with 471 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/rel_disasm_overrides.yml
+1
View File
@@ -18,3 +18,4 @@ symbol_aligns:
0x80F1CCA0: 32 # dataobject/obj/.data/rom_museum5_wall_pal
0x80F85720: 32 # dataobject/obj/.data/grd_player_select_evw_anime_1 (TU is aligned to 32)
0x80FACE20: 32 # dataobject/obj/.data/rom_shop4_1_floor_tex_pal
0x8074B840: 32 # dataobject/obj/.data/mFM_obj_a_01_flower_pal
config/rel_slices.yml
+3
View File
@@ -1274,6 +1274,9 @@ data/npc/model/tex/bea_9.c:
data/npc/model/tex/bea_10.c:
.data: [0x806FA140, 0x806FB360]
data/field/bg/acre/bg_data.c:
.data: [0x806FE048, 0x8074B840]
# dataobject.obj files
data/field/bg/flower/obj_flower.c:
.data: [0x8074FE80, 0x807508C0]
include/m_bg_type.h
+310
View File
@@ -0,0 +1,310 @@
#ifndef M_BG_TYPE_H
#define M_BG_TYPE_H
#include "types.h"
#ifdef __cplusplus
extern "C" {
#endif
enum __bg_type__ {
BG_TYPE_GRD_S_HOLE_TEST,
BG_TYPE_GRD_S_C1_1,
BG_TYPE_GRD_S_C1_2,
BG_TYPE_GRD_S_C1_3,
BG_TYPE_GRD_S_C1_4,
BG_TYPE_GRD_S_C1_5,
BG_TYPE_GRD_S_C1_R1_1,
BG_TYPE_GRD_S_C1_R1_2,
BG_TYPE_GRD_S_C1_R1_3,
BG_TYPE_GRD_S_C1_R2_1,
BG_TYPE_GRD_S_C1_R2_2,
BG_TYPE_GRD_S_C1_R2_3,
BG_TYPE_GRD_S_C1_R3_1,
BG_TYPE_GRD_S_C1_R3_2,
BG_TYPE_GRD_S_C1_R3_3,
BG_TYPE_GRD_S_C1_S_1,
BG_TYPE_GRD_S_C1_S_2,
BG_TYPE_GRD_S_C1_S_3,
BG_TYPE_GRD_S_C1_S_4,
BG_TYPE_GRD_S_C2_1,
BG_TYPE_GRD_S_C2_2,
BG_TYPE_GRD_S_C2_3,
BG_TYPE_GRD_S_C2_R1_1,
BG_TYPE_GRD_S_C2_R1_2,
BG_TYPE_GRD_S_C2_R2_1,
BG_TYPE_GRD_S_C2_R2_2,
BG_TYPE_GRD_S_C2_S_1,
BG_TYPE_GRD_S_C2_S_2,
BG_TYPE_GRD_S_C2_S_3,
BG_TYPE_GRD_S_C3_1,
BG_TYPE_GRD_S_C3_2,
BG_TYPE_GRD_S_C3_3,
BG_TYPE_GRD_S_C3_R1_1,
BG_TYPE_GRD_S_C3_R1_2,
BG_TYPE_GRD_S_C3_R2_1,
BG_TYPE_GRD_S_C3_R2_2,
BG_TYPE_GRD_S_C3_S_1,
BG_TYPE_GRD_S_C4_1,
BG_TYPE_GRD_S_C4_2,
BG_TYPE_GRD_S_C4_3,
BG_TYPE_GRD_S_C4_R1_1,
BG_TYPE_GRD_S_C4_R1_2,
BG_TYPE_GRD_S_C4_R2_1,
BG_TYPE_GRD_S_C4_R2_2,
BG_TYPE_GRD_S_C4_R3_1,
BG_TYPE_GRD_S_C4_R3_2,
BG_TYPE_GRD_S_C4_S_1,
BG_TYPE_GRD_S_C4_S_2,
BG_TYPE_GRD_S_C5_1,
BG_TYPE_GRD_S_C5_2,
BG_TYPE_GRD_S_C5_3,
BG_TYPE_GRD_S_C5_R1_1,
BG_TYPE_GRD_S_C5_R1_2,
BG_TYPE_GRD_S_C5_R2_1,
BG_TYPE_GRD_S_C5_R2_2,
BG_TYPE_GRD_S_C5_R3_1,
BG_TYPE_GRD_S_C5_R3_2,
BG_TYPE_GRD_S_C5_S_1,
BG_TYPE_GRD_S_C5_S_2,
BG_TYPE_GRD_S_C6_1,
BG_TYPE_GRD_S_C6_2,
BG_TYPE_GRD_S_C6_3,
BG_TYPE_GRD_S_C6_R1_1,
BG_TYPE_GRD_S_C6_R1_2,
BG_TYPE_GRD_S_C6_R3_1,
BG_TYPE_GRD_S_C6_S_1,
BG_TYPE_GRD_S_C7_1,
BG_TYPE_GRD_S_C7_2,
BG_TYPE_GRD_S_C7_3,
BG_TYPE_GRD_S_C7_R1_1,
BG_TYPE_GRD_S_C7_R1_2,
BG_TYPE_GRD_S_C7_R3_1,
BG_TYPE_GRD_S_C7_R3_2,
BG_TYPE_GRD_S_C7_S_1,
BG_TYPE_GRD_S_C7_S_2,
BG_TYPE_GRD_S_C7_S_3,
BG_TYPE_GRD_S_E1_1,
BG_TYPE_GRD_S_E1_R1_1,
BG_TYPE_GRD_S_E2_1,
BG_TYPE_GRD_S_E2_C1_1,
BG_TYPE_GRD_S_E2_M_1,
BG_TYPE_GRD_S_E2_O_1,
BG_TYPE_GRD_S_E2_T_1,
BG_TYPE_GRD_S_E3_1,
BG_TYPE_GRD_S_E3_C1_1,
BG_TYPE_GRD_S_E3_M_1,
BG_TYPE_GRD_S_E3_O_1,
BG_TYPE_GRD_S_E3_T_1,
BG_TYPE_GRD_S_E4_1,
BG_TYPE_GRD_S_E5_1,
BG_TYPE_GRD_S_F_1,
BG_TYPE_GRD_S_F_2,
BG_TYPE_GRD_S_F_3,
BG_TYPE_GRD_S_F_4,
BG_TYPE_GRD_S_F_5,
BG_TYPE_GRD_S_F_6,
BG_TYPE_GRD_S_F_7,
BG_TYPE_GRD_S_F_8,
BG_TYPE_GRD_S_F_9,
BG_TYPE_GRD_S_F_10,
BG_TYPE_GRD_S_F_KO_1,
BG_TYPE_GRD_S_F_KO_2,
BG_TYPE_GRD_S_F_KO_3,
BG_TYPE_GRD_S_F_MH_1,
BG_TYPE_GRD_S_F_MH_2,
BG_TYPE_GRD_S_F_MH_3,
BG_TYPE_GRD_S_F_MU_1,
BG_TYPE_GRD_S_F_MU_2,
BG_TYPE_GRD_S_F_MU_3,
BG_TYPE_GRD_S_F_PK_1,
BG_TYPE_GRD_S_F_PK_2,
BG_TYPE_GRD_S_F_PK_3,
BG_TYPE_GRD_S_IR_1,
BG_TYPE_GRD_S_IR_2,
BG_TYPE_GRD_S_IR_3,
BG_TYPE_GRD_S_IR_4,
BG_TYPE_GRD_S_IL_1,
BG_TYPE_GRD_S_IL_2,
BG_TYPE_GRD_S_IL_3,
BG_TYPE_GRD_S_IL_4,
BG_TYPE_GRD_S_M_1,
BG_TYPE_GRD_S_M_2,
BG_TYPE_GRD_S_M_3,
BG_TYPE_GRD_S_M_4,
BG_TYPE_GRD_S_M_5,
BG_TYPE_GRD_S_M_6,
BG_TYPE_GRD_S_M_7,
BG_TYPE_GRD_S_M_8,
BG_TYPE_GRD_S_M_9,
BG_TYPE_GRD_S_M_10,
BG_TYPE_GRD_S_M_R1_1,
BG_TYPE_GRD_S_M_R1_2,
BG_TYPE_GRD_S_M_R1_3,
BG_TYPE_GRD_S_M_R1_4,
BG_TYPE_GRD_S_M_R1_5,
BG_TYPE_GRD_S_M_R1_B_1,
BG_TYPE_GRD_S_M_R1_B_2,
BG_TYPE_GRD_S_M_R1_B_3,
BG_TYPE_GRD_S_M_TA_1,
BG_TYPE_GRD_S_M_TA_2,
BG_TYPE_GRD_S_M_TA_3,
BG_TYPE_GRD_S_M_WF_1,
BG_TYPE_GRD_S_M_WF_2,
BG_TYPE_GRD_S_M_WF_3,
BG_TYPE_GRD_S_O_1,
BG_TYPE_GRD_S_O_2,
BG_TYPE_GRD_S_O_3,
BG_TYPE_GRD_S_O_4,
BG_TYPE_GRD_S_O_5,
BG_TYPE_GRD_S_O_6,
BG_TYPE_GRD_S_O_7,
BG_TYPE_GRD_S_O_8,
BG_TYPE_GRD_S_O_9,
BG_TYPE_GRD_S_O_10,
BG_TYPE_GRD_S_O_I_1,
BG_TYPE_GRD_S_O_I_2,
BG_TYPE_GRD_S_O_R1_1,
BG_TYPE_GRD_S_O_R1_2,
BG_TYPE_GRD_S_O_R1_3,
BG_TYPE_GRD_S_O_R1_4,
BG_TYPE_GRD_S_O_R1_5,
BG_TYPE_GRD_S_O_R1_B_1,
BG_TYPE_GRD_S_O_R1_B_2,
BG_TYPE_GRD_S_O_R1_B_3,
BG_TYPE_GRD_S_O_TA_1,
BG_TYPE_GRD_S_O_TA_2,
BG_TYPE_GRD_S_O_TA_3,
BG_TYPE_GRD_S_O_WF_1,
BG_TYPE_GRD_S_O_WF_2,
BG_TYPE_GRD_S_O_WF_3,
BG_TYPE_GRD_S_R1_1,
BG_TYPE_GRD_S_R1_2,
BG_TYPE_GRD_S_R1_3,
BG_TYPE_GRD_S_R1_4,
BG_TYPE_GRD_S_R1_B_1,
BG_TYPE_GRD_S_R1_B_2,
BG_TYPE_GRD_S_R1_B_3,
BG_TYPE_GRD_S_R1_P_1,
BG_TYPE_GRD_S_R2_1,
BG_TYPE_GRD_S_R2_2,
BG_TYPE_GRD_S_R2_3,
BG_TYPE_GRD_S_R2_4,
BG_TYPE_GRD_S_R2_B_1,
BG_TYPE_GRD_S_R2_B_2,
BG_TYPE_GRD_S_R2_B_3,
BG_TYPE_GRD_S_R2_P_1,
BG_TYPE_GRD_S_R3_1,
BG_TYPE_GRD_S_R3_2,
BG_TYPE_GRD_S_R3_3,
BG_TYPE_GRD_S_R3_4,
BG_TYPE_GRD_S_R3_B_1,
BG_TYPE_GRD_S_R3_B_2,
BG_TYPE_GRD_S_R3_B_3,
BG_TYPE_GRD_S_R3_P_1,
BG_TYPE_GRD_S_R4_1,
BG_TYPE_GRD_S_R4_2,
BG_TYPE_GRD_S_R4_3,
BG_TYPE_GRD_S_R4_B_1,
BG_TYPE_GRD_S_R4_B_2,
BG_TYPE_GRD_S_R4_P_1,
BG_TYPE_GRD_S_R5_1,
BG_TYPE_GRD_S_R5_2,
BG_TYPE_GRD_S_R5_3,
BG_TYPE_GRD_S_R5_B_1,
BG_TYPE_GRD_S_R5_B_2,
BG_TYPE_GRD_S_R5_P_1,
BG_TYPE_GRD_S_R6_1,
BG_TYPE_GRD_S_R6_2,
BG_TYPE_GRD_S_R6_3,
BG_TYPE_GRD_S_R6_B_1,
BG_TYPE_GRD_S_R6_B_2,
BG_TYPE_GRD_S_R6_P_1,
BG_TYPE_GRD_S_R7_1,
BG_TYPE_GRD_S_R7_2,
BG_TYPE_GRD_S_R7_3,
BG_TYPE_GRD_S_R7_B_1,
BG_TYPE_GRD_S_R7_B_2,
BG_TYPE_GRD_S_R7_P_1,
BG_TYPE_GRD_S_T_R1_1,
BG_TYPE_GRD_S_T_1,
BG_TYPE_GRD_S_T_2,
BG_TYPE_GRD_S_T_3,
BG_TYPE_GRD_S_T_4,
BG_TYPE_GRD_S_T_5,
BG_TYPE_GRD_S_T_6,
BG_TYPE_GRD_S_T_7,
BG_TYPE_GRD_S_T_8,
BG_TYPE_GRD_S_T_9,
BG_TYPE_GRD_S_T_10,
BG_TYPE_GRD_S_T_PO_1,
BG_TYPE_GRD_S_T_PO_2,
BG_TYPE_GRD_S_T_PO_3,
BG_TYPE_GRD_S_T_R1_2,
BG_TYPE_GRD_S_T_R1_3,
BG_TYPE_GRD_S_T_R1_4,
BG_TYPE_GRD_S_T_R1_5,
BG_TYPE_GRD_S_T_SH_1,
BG_TYPE_GRD_S_T_SH_2,
BG_TYPE_GRD_S_T_SH_3,
BG_TYPE_GRD_S_T_ST1_1,
BG_TYPE_GRD_S_T_ST1_2,
BG_TYPE_GRD_S_T_ST1_3,
BG_TYPE_242,
BG_TYPE_ROM_TENT,
BG_TYPE_ROOM01,
BG_TYPE_MYR_ETC,
BG_TYPE_246,
BG_TYPE_247,
BG_TYPE_248,
BG_TYPE_249,
BG_TYPE_250,
BG_TYPE_251,
BG_TYPE_252,
BG_TYPE_ROM_SHOP4_FUKU,
BG_TYPE_254,
BG_TYPE_ROM_URANAI,
BG_TYPE_ROM_SHOP4_1,
BG_TYPE_257,
BG_TYPE_258,
BG_TYPE_259,
BG_TYPE_260,
BG_TYPE_ROM_TRAIN_IN,
BG_TYPE_GRD_S_F_9_1,
BG_TYPE_GRD_S_R1_3_1,
BG_TYPE_GRD_S_C1_3_1,
BG_TYPE_GRD_S_F_9_2,
BG_TYPE_GRD_PLAYER_SELECT,
BG_TYPE_GRD_POST_OFFICE,
BG_TYPE_POLICE_INDOOR,
BG_TYPE_TMP,
BG_TYPE_TMP2,
BG_TYPE_TMPR,
BG_TYPE_TMPR2,
BG_TYPE_TMP3,
BG_TYPE_TMPR3,
BG_TYPE_TMP4,
BG_TYPE_TMPR4,
BG_TYPE_GRD_YAMISHOP,
BG_TYPE_ROM_MUSEUM1,
BG_TYPE_ROM_MUSEUM2,
BG_TYPE_ROM_MUSEUM3,
BG_TYPE_ROM_MUSEUM5,
BG_TYPE_282,
BG_TYPE_283,
BG_TYPE_284,
BG_TYPE_285,
BG_TYPE_286,
BG_TYPE_287,
BG_TYPE_288,
BG_TYPE_289,
BG_TYPE_ROM_TAILOR,
BG_TYPE_ROM_TOUDAI,
BG_TYPE_292,
};
#ifdef __cplusplus
}
#endif
#endif
include/m_field_info.h
+1
View File
@@ -6,6 +6,7 @@
#include "m_lib.h"
#include "m_collision_bg.h"
#include "m_field_make.h"
#include "m_bg_type.h"
#ifdef __cplusplus
extern "C" {
src/data/field/bg/acre/bg_data.c
+156 -449
View File
File diff suppressed because it is too large Load Diff