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

Implement & link bg_xmas_item

Browse Source
This commit is contained in:
Cuyler36
2024-03-18 15:25:27 -04:00
parent 86bd999056
commit 7aa204fe33
12 changed files with 3600 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/bg_item.h
+1 -141
View File
@@ -30,134 +30,6 @@ enum {
bIT_TYPE_CAT_NUM
};
enum {
bIT_DRAW_TYPE_STUMP1,
bIT_DRAW_TYPE_STUMP2,
bIT_DRAW_TYPE_STUMP3,
bIT_DRAW_TYPE_STUMP4,
bIT_DRAW_TYPE_FENCE,
bIT_DRAW_TYPE_NOTICE,
bIT_DRAW_TYPE_GRASS,
bIT_DRAW_TYPE_MAPBOARD,
bIT_DRAW_TYPE_MELODY,
bIT_DRAW_TYPE_FENCES,
bIT_DRAW_TYPE_HONYCOMB,
bIT_DRAW_TYPE_HOLE00_G,
bIT_DRAW_TYPE_HOLE00_S,
bIT_DRAW_TYPE_CRACK00_G,
bIT_DRAW_TYPE_CRACK00_S,
bIT_DRAW_TYPE_HOLE00_SHIN_G,
bIT_DRAW_TYPE_STONE_A,
bIT_DRAW_TYPE_STONE_B,
bIT_DRAW_TYPE_STONE_C,
bIT_DRAW_TYPE_STONE_D,
bIT_DRAW_TYPE_STONE_E,
bIT_DRAW_TYPE_TANE,
bIT_DRAW_TYPE_TREE0,
bIT_DRAW_TYPE_TREE1,
bIT_DRAW_TYPE_TREE2,
bIT_DRAW_TYPE_TREE3,
bIT_DRAW_TYPE_TREE4,
bIT_DRAW_TYPE_TREE4_AP,
bIT_DRAW_TYPE_TREE4_OR,
bIT_DRAW_TYPE_TREE4_PH,
bIT_DRAW_TYPE_TREE4_PR,
bIT_DRAW_TYPE_TREE4_NT,
bIT_DRAW_TYPE_TREE4_BG,
bIT_DRAW_TYPE_FLOWER_LEAF,
bIT_DRAW_TYPE_FLOWER00,
bIT_DRAW_TYPE_FLOWER01,
bIT_DRAW_TYPE_FLOWER02,
bIT_DRAW_TYPE_TREE0_DEAD,
bIT_DRAW_TYPE_PALM000,
bIT_DRAW_TYPE_PALM001,
bIT_DRAW_TYPE_PALM002,
bIT_DRAW_TYPE_PALM003,
bIT_DRAW_TYPE_PALM004,
bIT_DRAW_TYPE_PALM004_CC,
bIT_DRAW_TYPE_PALM_STUMP001,
bIT_DRAW_TYPE_PALM_STUMP002,
bIT_DRAW_TYPE_PALM_STUMP003,
bIT_DRAW_TYPE_PALM_STUMP004,
bIT_DRAW_TYPE_PALM000_DEAD,
bIT_DRAW_TYPE_CEDAR000,
bIT_DRAW_TYPE_CEDAR001,
bIT_DRAW_TYPE_CEDAR002,
bIT_DRAW_TYPE_CEDAR003,
bIT_DRAW_TYPE_CEDAR004,
bIT_DRAW_TYPE_CEDAR_STUMP001,
bIT_DRAW_TYPE_CEDAR_STUMP002,
bIT_DRAW_TYPE_CEDAR_STUMP003,
bIT_DRAW_TYPE_CEDAR_STUMP004,
bIT_DRAW_TYPE_CEDAR000_DEAD,
bIT_DRAW_TYPE_GOLD_TREE000,
bIT_DRAW_TYPE_GOLD_TREE001,
bIT_DRAW_TYPE_GOLD_TREE002,
bIT_DRAW_TYPE_GOLD_TREE003,
bIT_DRAW_TYPE_GOLD_TREE004,
bIT_DRAW_TYPE_GOLD_TREE_STUMP001,
bIT_DRAW_TYPE_GOLD_TREE_STUMP002,
bIT_DRAW_TYPE_GOLD_TREE_STUMP003,
bIT_DRAW_TYPE_GOLD_TREE_STUMP004,
bIT_DRAW_TYPE_GOLD_TREE000_DEAD,
bIT_DRAW_TYPE_APPLE,
bIT_DRAW_TYPE_ORANGE,
bIT_DRAW_TYPE_PEACH,
bIT_DRAW_TYPE_PEAR,
bIT_DRAW_TYPE_NUTS,
bIT_DRAW_TYPE_MATUTAKE,
bIT_DRAW_TYPE_KABU,
bIT_DRAW_TYPE_FISH,
bIT_DRAW_TYPE_BAG,
bIT_DRAW_TYPE_LEAF,
bIT_DRAW_TYPE_ROLL,
bIT_DRAW_TYPE_BOX,
bIT_DRAW_TYPE_PACK,
bIT_DRAW_TYPE_PRESENT,
bIT_DRAW_TYPE_SEED,
bIT_DRAW_TYPE_HANIWA,
bIT_DRAW_TYPE_OTHER,
bIT_DRAW_TYPE_86,
bIT_DRAW_TYPE_TOOL,
bIT_DRAW_TYPE_FOSSIL,
bIT_DRAW_TYPE_TRASH,
bIT_DRAW_TYPE_90,
bIT_DRAW_TYPE_OTOSI,
bIT_DRAW_TYPE_SHELL_A,
bIT_DRAW_TYPE_SHELL_B,
bIT_DRAW_TYPE_SHELL_C,
bIT_DRAW_TYPE_CANDY,
bIT_DRAW_TYPE_COCONUT,
bIT_DRAW_TYPE_97,
bIT_DRAW_TYPE_CLOTH,
bIT_DRAW_TYPE_CARPET,
bIT_DRAW_TYPE_WALL,
bIT_DRAW_TYPE_AXE,
bIT_DRAW_TYPE_NET,
bIT_DRAW_TYPE_ROD,
bIT_DRAW_TYPE_SCOOP,
bIT_DRAW_TYPE_GOLD_AXE,
bIT_DRAW_TYPE_GOLD_NET,
bIT_DRAW_TYPE_GOLD_ROD,
bIT_DRAW_TYPE_GOLD_SCOOP,
bIT_DRAW_TYPE_UMBRELLA,
bIT_DRAW_TYPE_PINWHEEL,
bIT_DRAW_TYPE_FAN,
bIT_DRAW_TYPE_PAPER,
bIT_DRAW_TYPE_SEEDBAG,
bIT_DRAW_TYPE_LUCKBAG,
bIT_DRAW_TYPE_GYMCARD,
bIT_DRAW_TYPE_MUSIC,
bIT_DRAW_TYPE_LOTTERY,
bIT_DRAW_TYPE_BONE,
bIT_DRAW_TYPE_DIARY,
bIT_DRAW_TYPE_FORK,
bIT_DRAW_TYPE_FISH2,
bIT_DRAW_TYPE_NONE,
bIT_DRAW_TYPE_MAX
};
enum {
bIT_PAL_FLOWER_A,
bIT_PAL_FLOWER_B,
@@ -193,7 +65,7 @@ typedef struct type_data_s {
typedef struct draw_pos_s {
MtxF mtxf;
int _04;
void* _04;
s16 next_add_cnt; // this isn't right
u8 cull_flag;
s8 sub_idx;
@@ -372,18 +244,6 @@ struct bg_common_s {
int _139F4[mFM_VISIBLE_BLOCK_NUM];
};
typedef struct blk_idx_info_s {
u16 idx[bIT_DRAW_TYPE_MAX];
} bg_item_idx_info_c;
typedef struct bg_item_actor_s BG_ITEM_ACTOR;
struct bg_item_actor_s {
ACTOR actor_class;
bg_item_common_c common;
bg_item_idx_info_c item_idx_info[mFM_VISIBLE_BLOCK_NUM];
};
extern ACTOR_PROFILE BgItem_Profile;
#ifdef __cplusplus
include/m_actor.h
+1 -1
View File
@@ -76,7 +76,7 @@ typedef enum bank_id {
ACTOR_OBJ_BANK_35,
ACTOR_OBJ_BANK_BG_CHERRY_ITEM,
ACTOR_OBJ_BANK_BG_WINTER_ITEM,
ACTOR_OBJ_BANK_38,
ACTOR_OBJ_BANK_BG_XMAS_ITEM,
ACTOR_OBJ_BANK_39,
ACTOR_OBJ_BANK_40,
ACTOR_OBJ_BANK_TRAINWINDOW,