Skip to content

Make model ID's an enum #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
someone2639 wants to merge 15 commits into
base: develop/3.0.0
Choose a base branch
from
Draft

Make model ID's an enum #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e1862b4
enumify models; get rid of ModelID8
Feb 7, 2025
705d537
we dont need this tool
Feb 7, 2025
a1bda08
rename level specific models
Feb 8, 2025
57c07b8
move wooden door loading to common1 global
Feb 8, 2025
039c753
remove some more common1 things
Feb 8, 2025
2c8ad6b
fully enum-ify, hardcode the level geos to halve model count
Feb 8, 2025
0e7e919
wf level geo renames
Feb 8, 2025
a5a6e83
rename models in behavior code
Feb 8, 2025
0cdc7f4
mario_actions_cutscene single renaming
Feb 8, 2025
0bdbd6b
migrate warp pipe and bubbly tree to one global load
Feb 8, 2025
4060e25
shorten ID impact to 511
Feb 8, 2025
8d235cb
oops debug tool
Feb 8, 2025
bc71028
revert level specific geometry models
Feb 8, 2025
8878960
deduplicate bowser bomb
Feb 8, 2025
37fff58
and the other files
Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/behavior_data.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2005,7 +2005,7 @@ const BehaviorScript bhvBowser[] = {
SET_HOME(),
LOAD_ANIMATIONS(oAnimations, bowser_seg6_anims_06057690),
SPAWN_CHILD(/*Model*/ MODEL_NONE, /*Behavior*/ bhvBowserBodyAnchor),
SPAWN_CHILD(/*Model*/ MODEL_BOWSER_BOMB_CHILD_OBJ, /*Behavior*/ bhvBowserFlameSpawn),
SPAWN_CHILD(/*Model*/ MODEL_BOWSER_BOMB, /*Behavior*/ bhvBowserFlameSpawn),
SPAWN_OBJ(/*Model*/ MODEL_NONE, /*Behavior*/ bhvBowserTailAnchor),
// Beta leftover that spawn 50 coins when Bowser is defeated
SET_INT(oNumLootCoins, 50),
Expand Down
5 changes: 0 additions & 5 deletions include/config/config_game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@
*/
// #define GLOBAL_STAR_IDS

/**
* Number of possible unique model ID's (keep it higher than 256).
*/
#define MODEL_ID_COUNT 256

/**
* Number of supported areas per level.
*/
Expand Down
1,072 changes: 506 additions & 566 deletions include/model_ids.h
View file
Open in desktop
Copy link
Collaborator

@gheskett gheskett Feb 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please neaten up the line spacing for geo comments, like how they were previously.

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions include/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,7 @@ typedef u32 Texture32;
typedef s16 TextureCoord;

// -- Models --

typedef u8 ModelID8;
typedef u16 ModelID16;
typedef u16 ModelID;
typedef u32 ModelID32;

// -- Animations --
Expand Down
50 changes: 25 additions & 25 deletions levels/bbh/script.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,31 +54,31 @@ static const LevelScript script_bbh_macro_objects[] = {
OBJECT(/*model*/ MODEL_BREAKABLE_BOX, /*pos*/ -220, -220, 6140, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvJumpingBox),
OBJECT(/*model*/ MODEL_1UP, /*pos*/ -3040, 1120, 5460, /*angle*/ 0, 0, 0, /*behParam*/ (MUSHROOM_BP_REQUIRES_NONE << 16), /*beh*/ bhv1Up),
// Special objects
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 0, -2457, 2099, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -1996, -2457, 205, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 1587, -2457, 205, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -2136, -204, 4527, /*angle*/ 0, 315, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 0, -2457, 4659, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 2099, 1741, 486, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 589, 1922, 1894, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 742, 1922, 1894, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -1970, 1024, 1075, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -2021, 0, 1075, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 2099, 819, 1818, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 3354, 0, 1075, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 742, 0, 2099, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 589, 0, 2099, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 2099, 0, 1459, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 179, 819, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 2099, 819, 486, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 435, 0, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 1613, 0, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 1613, 819, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -1561, 0, -1586, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -767, 819, 1408, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -767, 819, 640, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -50, 0, 640, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -50, 0, 1459, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 0, -2457, 2099, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -1996, -2457, 205, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 1587, -2457, 205, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -2136, -204, 4527, /*angle*/ 0, 315, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 0, -2457, 4659, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 2099, 1741, 486, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 589, 1922, 1894, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 742, 1922, 1894, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -1970, 1024, 1075, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -2021, 0, 1075, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 2099, 819, 1818, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 3354, 0, 1075, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 742, 0, 2099, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 589, 0, 2099, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 2099, 0, 1459, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 179, 819, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 2099, 819, 486, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 435, 0, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 1613, 0, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 1613, 819, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -1561, 0, -1586, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -767, 819, 1408, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -767, 819, 640, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -50, 0, 640, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -50, 0, 1459, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor),
RETURN(),
};

Expand Down
1 change: 0 additions & 1 deletion levels/bitdw/areas/script_vanilla.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, geo_bitdw_0004C8),
LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, geo_bitdw_0004E0),
LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, geo_bitdw_0004F8),
LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, geo_bitdw_000510),
LOAD_MODEL_FROM_GEO(MODEL_BITDW_WARP_PIPE, warp_pipe_geo),
2 changes: 1 addition & 1 deletion levels/bitdw/script.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ const LevelScript level_bitdw_entry[] = {

AREA(/*index*/ 1, geo_bitdw_000618),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ -7443, -2153, 3886, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvAirborneWarp),
OBJECT(/*model*/ MODEL_BITDW_WARP_PIPE, /*pos*/ 6816, 2860, -7, /*angle*/ 0, 0, 0, /*behParam*/ 0x000B0000, /*beh*/ bhvWarpPipe),
OBJECT(/*model*/ MODEL_WARP_PIPE, /*pos*/ 6816, 2860, -7, /*angle*/ 0, 0, 0, /*behParam*/ 0x000B0000, /*beh*/ bhvWarpPipe),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 5910, 3500, -7, /*angle*/ 0, 90, 0, /*behParam*/ 0x000C0000, /*beh*/ bhvDeathWarp),
WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_BITDW, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ 0x0B, /*destLevel*/ LEVEL_BOWSER_1, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT),
Expand Down
1 change: 0 additions & 1 deletion levels/bits/areas/script_vanilla.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, bits_geo_000580),
LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, bits_geo_000598),
LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, bits_geo_0005B0),
LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, bits_geo_0005C8),
LOAD_MODEL_FROM_GEO(MODEL_BITS_WARP_PIPE, warp_pipe_geo),
1 change: 0 additions & 1 deletion levels/bob/areas/script_vanilla.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ JUMP_LINK(script_func_global_1),
JUMP_LINK(script_func_global_4),
JUMP_LINK(script_func_global_15),
JUMP_LINK(script_func_vo_bob),
LOAD_MODEL_FROM_GEO(MODEL_BOB_BUBBLY_TREE, bubbly_tree_geo),
34 changes: 17 additions & 17 deletions levels/bob/script.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,23 +108,23 @@ static const LevelScript script_bob_macro_objects[] = {
OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ -300, 4200, 1250, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvYellowCoin),
OBJECT(/*model*/ MODEL_BREAKABLE_BOX, /*pos*/ -6800, 1024, 40, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBreakableBoxSmall),
// Special objects
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -5792, 1024, -4654, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -1509, 144, 5094, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -4095, 768, 3072, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -5119, 768, 2048, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 5444, 863, 6016, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -6655, 768, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -6130, 900, -6507, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -6804, 1024, -4866, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 6033, 2194, -7660, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -4095, 768, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -4268, 0, 4768, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -3583, 768, 2560, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -6172, 1024, -430, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 4096, 3072, 1638, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 6799, 2008, -5587, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 2911, 768, 5917, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 4208, 927, 3772, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -5792, 1024, -4654, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -1509, 144, 5094, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -4095, 768, 3072, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -5119, 768, 2048, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 5444, 863, 6016, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -6655, 768, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -6130, 900, -6507, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -6804, 1024, -4866, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 6033, 2194, -7660, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -4095, 768, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -4268, 0, 4768, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -3583, 768, 2560, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -6172, 1024, -430, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 4096, 3072, 1638, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 6799, 2008, -5587, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 2911, 768, 5917, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 4208, 927, 3772, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
RETURN(),
};

Expand Down
1 change: 0 additions & 1 deletion levels/castle_courtyard/areas/script_vanilla.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
JUMP_LINK(script_func_global_1),
JUMP_LINK(script_func_global_10),
LOAD_MODEL_FROM_GEO(MODEL_COURTYARD_SPIKY_TREE, spiky_tree_geo),
LOAD_MODEL_FROM_GEO(MODEL_COURTYARD_WOODEN_DOOR, wooden_door_geo),
LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, castle_courtyard_geo_000200),
2 changes: 1 addition & 1 deletion levels/castle_courtyard/script.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static const LevelScript script_castle_courtyard_macro_objects[] = {
OBJECT(/*model*/ MODEL_COURTYARD_SPIKY_TREE, /*pos*/ -2446, -214, -1786, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_COURTYARD_SPIKY_TREE, /*pos*/ -2820, -214, -1317, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_COURTYARD_SPIKY_TREE, /*pos*/ -1868, -214, -45, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree),
OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR, /*pos*/ 0, 0, 461, /*angle*/ 0, 0, 0, /*behParam*/ (1 << 16), /*beh*/ bhvDoorWarp),
OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 0, 0, 461, /*angle*/ 0, 0, 0, /*behParam*/ (1 << 16), /*beh*/ bhvDoorWarp),
RETURN(),
};

Expand Down
4 changes: 0 additions & 4 deletions levels/castle_grounds/areas/script_vanilla.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,3 @@ JUMP_LINK(script_func_global_11),
JUMP_LINK(script_func_global_16),
JUMP_LINK(script_func_vo_castle_grounds),
LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, castle_grounds_geo_0006F4),
LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_BUBBLY_TREE, bubbly_tree_geo),
LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_WARP_PIPE, warp_pipe_geo),
LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_CASTLE_DOOR, castle_door_geo),
LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_METAL_DOOR, metal_door_geo),
Loading