mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-30 07:34:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into m_all_grow_ovl

Browse Source
This commit is contained in:
Cuyler36
2023-08-22 06:32:51 -04:00
committed by GitHub
parent 45c89c63e4 5756e35dfd
commit a8d646786d
13 changed files with 356 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_name_table.h
+10
View File
@@ -182,6 +182,7 @@ extern mActor_name_t bg_item_fg_sub_tree_grow(mActor_name_t tree, int past_days,
#define MUSIC_BOARD0 0x000E
#define MUSIC_BOARD1 0x000F
#define BURIED_PITFALL0 0x002A
#define SHINE_SPOT 0x005C
@@ -1189,6 +1190,15 @@ extern mActor_name_t bg_item_fg_sub_tree_grow(mActor_name_t tree, int past_days,
#define ACTOR_PROP_HANIWA1 (ACTOR_PROP_HANIWA0 + 1)
#define ACTOR_PROP_HANIWA2 (ACTOR_PROP_HANIWA1 + 1)
#define ACTOR_PROP_HANIWA3 (ACTOR_PROP_HANIWA2 + 1)
#define SNOWMAN0 (ACTOR_PROP_HANIWA3 + 1)
#define SNOWMAN1 (SNOWMAN0 + 1)
#define SNOWMAN2 (SNOWMAN1 + 1)
#define SNOWMAN3 (SNOWMAN2 + 1)
#define SNOWMAN4 (SNOWMAN3 + 1)
#define SNOWMAN5 (SNOWMAN4 + 1)
#define SNOWMAN6 (SNOWMAN5 + 1)
#define SNOWMAN7 (SNOWMAN6 + 1)
#define SNOWMAN8 (SNOWMAN7 + 1)
#define TRAIN_DOOR 0xA011
#define SP_NPC_START 0xD000