print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add Silhouette

Browse Source
This commit is contained in:
Arceveti
2021-09-18 15:55:57 -07:00
parent d019fcdbbe
commit e57f1dc59a
35 changed files with 556 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -86,6 +86,7 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
- Widescreen (16:9) support toggleable by pressing `L` in the pause menu. *
- S2DEX engine by someone2639! To use it, compile with `make TEXT_ENGINE=s2dex_text_engine` or just set `TEXT_ENGINE` to `s2dex_text_engine` in the makefile.
- ia8 coins (64x64), the vanilla coin texture is upgraded to accomodate. *
- Mario's silhouette is shown when behind most surfaces (By Frame#5375, Axollyon, AloXado320, Wiseguy, Arceveti) *
- Skybox size modifier. You can have 2x, 3x and 4x size skyboxes (you can select the skybox size in `config.h`.) Please note that this might affect console performance, especially 4x mode. 2x or 3x mode is recommended if aiming for console. By CowQuack *
- You can set the black border size to different values for console and emulator. It's set to 0 by default for both. *
- This repo supports much better implementation of reverb over vanilla's fake echo reverb. Great for caves or eerie levels, as well as just a better audio experience in general. See `audio/synthesis.c` for more configuration info. (By ArcticJaguar725) *

34
actors/amp/geo.inc.c
View File

@@ -3,49 +3,49 @@ const GeoLayout dAmpGeo[] = {
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, dAmpEyeDl),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpEyeDl),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, dAmpElectricityDl),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpElectricityDl),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, dAmpElectricityDl),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpElectricityDl),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, dAmpElectricityDl),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpElectricityDl),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, dAmpElectricityDl),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpElectricityDl),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, dAmpMouthDl),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, dAmpMouthDl),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_BILLBOARD(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, dAmpBodyDl),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, dAmpBodyDl),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

14
actors/bird/geo.inc.c
View File

@@ -4,20 +4,20 @@ const GeoLayout birds_geo[] = {
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, birds_seg5_dl_05000670),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, birds_seg5_dl_05000670),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 1, -12, 37, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 1, -12, 37, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, birds_seg5_dl_05000528),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, birds_seg5_dl_05000528),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 1, -12, -37, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 1, -12, -37, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, birds_seg5_dl_05000600),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, birds_seg5_dl_05000600),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, birds_seg5_dl_05000598),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, birds_seg5_dl_05000598),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

12
actors/blue_fish/geo.inc.c
View File

@@ -4,11 +4,11 @@ const GeoLayout fish_shadow_geo[] = {
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, -16, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, -16, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, blue_fish_seg3_dl_0301BFB8),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, blue_fish_seg3_dl_0301BFB8),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 97, 0, 0, blue_fish_seg3_dl_0301C150),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 97, 0, 0, blue_fish_seg3_dl_0301C150),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
@@ -20,11 +20,11 @@ const GeoLayout fish_shadow_geo[] = {
const GeoLayout fish_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, -16, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, -16, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, blue_fish_seg3_dl_0301BFB8),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, blue_fish_seg3_dl_0301BFB8),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 97, 0, 0, blue_fish_seg3_dl_0301C150),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 97, 0, 0, blue_fish_seg3_dl_0301C150),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

8
actors/bowser_key/geo.inc.c
View File

@@ -4,7 +4,7 @@ const GeoLayout bowser_key_geo[] = {
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 65536),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, bowser_key_dl),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, bowser_key_dl),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
@@ -14,14 +14,14 @@ const GeoLayout bowser_key_geo[] = {
const GeoLayout bowser_key_cutscene_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_scale_bowser_key),
GEO_SCALE(0x00, 65536),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, bowser_key_dl),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, bowser_key_dl),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

4
actors/bubble/geo.inc.c
View File

@@ -2,7 +2,7 @@
const GeoLayout bubble_geo[] = {
GEO_SWITCH_CASE(1, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, bubble_seg4_dl_0401DD60),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, bubble_seg4_dl_0401DD60),
GEO_CLOSE_NODE(),
GEO_END(),
};
@@ -11,7 +11,7 @@ const GeoLayout bubble_geo[] = {
const GeoLayout purple_marble_geo[] = {
GEO_SWITCH_CASE(1, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, bubble_seg4_dl_0401DDE0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, bubble_seg4_dl_0401DDE0),
GEO_CLOSE_NODE(),
GEO_END(),
};

12
actors/butterfly/geo.inc.c
View File

@@ -4,19 +4,19 @@ const GeoLayout butterfly_geo[] = {
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, butterfly_seg3_dl_03005408),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, butterfly_seg3_dl_03005408),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, butterfly_seg3_dl_030054A0),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, butterfly_seg3_dl_030054A0),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

96
actors/coin/geo.inc.c
View File

@@ -4,14 +4,14 @@ const GeoLayout yellow_coin_geo[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(8, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007800),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007800),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007828),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007828),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007850),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007850),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007878),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007878),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007800),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007800),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007828),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007828),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007850),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007850),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007878),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007878),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
@@ -23,14 +23,14 @@ const GeoLayout yellow_coin_no_shadow_geo[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(8, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007800),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007800),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007828),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007828),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007850),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007850),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007878),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007878),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007800),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007800),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007828),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007828),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007850),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007850),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007878),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007878),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
@@ -42,14 +42,14 @@ const GeoLayout blue_coin_geo[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(8, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030078A0),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030078A0),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030078C8),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030078C8),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030078F0),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030078F0),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007918),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007918),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030078A0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030078A0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030078C8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030078C8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030078F0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030078F0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007918),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007918),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
@@ -61,14 +61,14 @@ const GeoLayout blue_coin_no_shadow_geo[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(8, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030078A0),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030078A0),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030078C8),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030078C8),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030078F0),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030078F0),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007918),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007918),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030078A0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030078A0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030078C8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030078C8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030078F0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030078F0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007918),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007918),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
@@ -80,14 +80,14 @@ const GeoLayout red_coin_geo[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(8, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007940),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007940),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007968),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007968),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007990),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007990),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030079B8),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030079B8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007940),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007940),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007968),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007968),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007990),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007990),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030079B8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030079B8),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
@@ -99,14 +99,14 @@ const GeoLayout red_coin_no_shadow_geo[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(8, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007940),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007940),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007968),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007968),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007990),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_03007990),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030079B8),
GEO_DISPLAY_LIST(LAYER_ALPHA, coin_seg3_dl_030079B8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007940),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007940),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007968),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007968),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007990),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_03007990),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030079B8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, coin_seg3_dl_030079B8),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),

10
actors/cyan_fish/geo.inc.c
View File

@@ -2,14 +2,14 @@
const GeoLayout cyan_fish_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, cyan_fish_seg6_dl_0600DDD8),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, cyan_fish_seg6_dl_0600DDD8),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 160, 0, 0, cyan_fish_seg6_dl_0600E038),
GEO_ANIMATED_PART(LAYER_OPAQUE, 32, 112, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 160, 0, 0, cyan_fish_seg6_dl_0600E038),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 32, 112, 0, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, cyan_fish_seg6_dl_0600DED8),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, cyan_fish_seg6_dl_0600DED8),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

22
actors/dirt/geo.inc.c
View File

@@ -4,12 +4,12 @@ const GeoLayout dirt_animation_geo[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(6, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dirt_seg3_dl_0302C378),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dirt_seg3_dl_0302C3B0),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dirt_seg3_dl_0302C3E8),
GEO_DISPLAY_LIST(LAYER_ALPHA, dirt_seg3_dl_0302C028),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dirt_seg3_dl_0302C420),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dirt_seg3_dl_0302C458),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C378),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C3B0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C3E8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, dirt_seg3_dl_0302C028),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C420),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C458),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
@@ -22,11 +22,11 @@ const GeoLayout cartoon_star_geo[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(5, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dirt_seg3_dl_0302C298),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dirt_seg3_dl_0302C2B8),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dirt_seg3_dl_0302C2D8),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dirt_seg3_dl_0302C2F8),
GEO_DISPLAY_LIST(LAYER_OPAQUE, dirt_seg3_dl_0302C318),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C298),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C2B8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C2D8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C2F8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C318),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),

16
actors/group0_geo.c
View File

@@ -15,4 +15,20 @@
#include "sparkle/geo.inc.c"
#include "water_splash/geo.inc.c"
#include "sparkle_animation/geo.inc.c"
#if SILHOUETTE
#define LAYER_OPAQUE_ORIG LAYER_OPAQUE
#define LAYER_ALPHA_ORIG LAYER_ALPHA
#undef LAYER_OPAQUE
#undef LAYER_ALPHA
#define LAYER_OPAQUE LAYER_SILHOUETTE_OPAQUE
#define LAYER_ALPHA LAYER_SILHOUETTE_ALPHA
#include "mario/geo.inc.c"
#undef LAYER_OPAQUE
#undef LAYER_ALPHA
#define LAYER_OPAQUE LAYER_OPAQUE_ORIG
#define LAYER_ALPHA LAYER_ALPHA_ORIG
#undef LAYER_OPAQUE_ORIG
#undef LAYER_ALPHA_OGIG
#else
#include "mario/geo.inc.c"
#endif

54
actors/hoot/geo.inc.c
View File

@@ -4,54 +4,54 @@ const GeoLayout hoot_geo[] = {
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 147, -5, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 147, -5, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, hoot_seg5_dl_05004D48),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, hoot_seg5_dl_05004D48),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 96, 0, 0, hoot_seg5_dl_05001DF0),
GEO_ANIMATED_PART(LAYER_OPAQUE, 34, -35, 31, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 96, 0, 0, hoot_seg5_dl_05001DF0),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 34, -35, 31, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, hoot_seg5_dl_05003728),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, hoot_seg5_dl_05003728),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_ALPHA, 91, 0, 0, hoot_seg5_dl_050034D8),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 91, 0, 0, hoot_seg5_dl_050034D8),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_ALPHA, 121, 0, 0, hoot_seg5_dl_050033B0),
GEO_ANIMATED_PART(LAYER_OPAQUE, 121, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 121, 0, 0, hoot_seg5_dl_050033B0),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 121, 0, 0, NULL),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 91, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 91, 0, 0, NULL),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, hoot_seg5_dl_05003600),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, hoot_seg5_dl_05003600),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, -31, 5, 37, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, -31, 5, 37, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, hoot_seg5_dl_05004A98),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, hoot_seg5_dl_05004A98),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 42, 0, 0, hoot_seg5_dl_05004928),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 42, 0, 0, hoot_seg5_dl_05004928),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, -31, 5, -37, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, -31, 5, -37, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, hoot_seg5_dl_05004CA8),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, hoot_seg5_dl_05004CA8),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 42, 0, 0, hoot_seg5_dl_05004B38),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 42, 0, 0, hoot_seg5_dl_05004B38),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 34, -35, -31, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 34, -35, -31, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, hoot_seg5_dl_05003288),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, hoot_seg5_dl_05003288),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_ALPHA, 91, 0, 0, hoot_seg5_dl_05003038),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 91, 0, 0, hoot_seg5_dl_05003038),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_ALPHA, 121, 0, 0, hoot_seg5_dl_05002F10),
GEO_ANIMATED_PART(LAYER_OPAQUE, 121, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 121, 0, 0, hoot_seg5_dl_05002F10),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 121, 0, 0, NULL),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 91, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 91, 0, 0, NULL),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, hoot_seg5_dl_05003160),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 0, 0, hoot_seg5_dl_05003160),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

6
actors/klepto/geo.inc.c
View File

@@ -40,9 +40,9 @@ const GeoLayout klepto_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_offset_klepto_held_object),
GEO_TRANSLATE_ROTATE_WITH_DL(LAYER_OPAQUE, 0, 100, 0, 180, 270, 0, star_seg3_dl_0302B870),
GEO_TRANSLATE_ROTATE_WITH_DL(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 100, 0, 180, 270, 0, star_seg3_dl_0302B870),
GEO_ASM(0, geo_offset_klepto_held_object),
GEO_TRANSLATE_ROTATE_WITH_DL(LAYER_ALPHA, 0, 100, 0, 180, 270, 0, star_seg3_dl_0302BA18),
GEO_TRANSLATE_ROTATE_WITH_DL(LAYER_OCCLUDE_SILHOUETTE_ALPHA, 0, 100, 0, 180, 270, 0, star_seg3_dl_0302BA18),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_NODE_START(),
@@ -50,7 +50,7 @@ const GeoLayout klepto_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_offset_klepto_held_object),
GEO_TRANSLATE_ROTATE_WITH_DL(LAYER_OPAQUE, 0, 100, 0, 180, 270, 0, transparent_star_seg3_dl_0302C620),
GEO_TRANSLATE_ROTATE_WITH_DL(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 100, 0, 180, 270, 0, transparent_star_seg3_dl_0302C620),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

6
actors/koopa_shell/geo.inc.c
View File

@@ -4,7 +4,7 @@ const GeoLayout koopa_shell_geo[] = {
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 65536),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, koopa_shell_seg8_dl_08028B78),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, koopa_shell_seg8_dl_08028B78),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
@@ -16,7 +16,7 @@ const GeoLayout koopa_shell2_geo[] = {
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, koopa_shell_seg8_dl_08027420),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, koopa_shell_seg8_dl_08027420),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
@@ -28,7 +28,7 @@ const GeoLayout koopa_shell3_geo[] = {
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, koopa_shell_seg8_dl_080273C8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, koopa_shell_seg8_dl_080273C8),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),

28
actors/lakitu_cameraman/geo.inc.c
View File

@@ -4,36 +4,36 @@ const GeoLayout lakitu_geo[] = {
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, lakitu_seg6_dl_06003E30),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, lakitu_seg6_dl_06003E30),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 132, 0, 0, lakitu_seg6_dl_06004680),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 132, 0, 0, lakitu_seg6_dl_06004680),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, lakitu_seg6_dl_06004C60),
GEO_DISPLAY_LIST(LAYER_ALPHA, lakitu_seg6_dl_06004C88),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, lakitu_seg6_dl_06004C60),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, lakitu_seg6_dl_06004C88),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 87, 18, 72, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 87, 18, 72, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, lakitu_seg6_dl_060047E8),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, lakitu_seg6_dl_060047E8),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 87, 18, -72, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 87, 18, -72, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, lakitu_seg6_dl_060049E0),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, lakitu_seg6_dl_060049E0),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 334, -214, -50, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 334, -214, -50, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, lakitu_seg6_dl_06005610),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, lakitu_seg6_dl_06005610),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 191, 0, 0, lakitu_seg6_dl_06005360),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 191, 0, 0, lakitu_seg6_dl_06005360),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, lakitu_seg6_dl_060055E8),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, lakitu_seg6_dl_060055E8),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, lakitu_seg6_dl_06005598),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, lakitu_seg6_dl_06005598),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

2
actors/leaves/geo.inc.c
View File

@@ -2,7 +2,7 @@
const GeoLayout leaves_geo[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, leaves_seg3_dl_0301CDE0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, leaves_seg3_dl_0301CDE0),
GEO_CLOSE_NODE(),
GEO_END(),
};

12
actors/mario_cap/geo.inc.c
View File

@@ -7,7 +7,7 @@ const GeoLayout marios_cap_geo[] = {
GEO_ASM(10, geo_update_layer_transparency),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_seg3_dl_03022F48),
GEO_DISPLAY_LIST(LAYER_SILHOUETTE_OPAQUE, mario_cap_seg3_dl_03022F48),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_seg3_dl_03022F48),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
@@ -24,7 +24,7 @@ const GeoLayout marios_metal_cap_geo[] = {
GEO_ASM(10, geo_update_layer_transparency),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_seg3_dl_03022FF8),
GEO_DISPLAY_LIST(LAYER_SILHOUETTE_OPAQUE, mario_cap_seg3_dl_03022FF8),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_seg3_dl_03022FF8),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
@@ -43,8 +43,8 @@ const GeoLayout marios_wing_cap_geo[] = {
GEO_OPEN_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_seg3_dl_03022F48),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_cap_seg3_dl_030230B0),
GEO_DISPLAY_LIST(LAYER_SILHOUETTE_OPAQUE, mario_cap_seg3_dl_03022F48),
GEO_DISPLAY_LIST(LAYER_SILHOUETTE_ALPHA, mario_cap_seg3_dl_030230B0),
GEO_CLOSE_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
@@ -67,8 +67,8 @@ const GeoLayout marios_winged_metal_cap_geo[] = {
GEO_OPEN_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_seg3_dl_03022FF8),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_cap_seg3_dl_03023108),
GEO_DISPLAY_LIST(LAYER_SILHOUETTE_OPAQUE, mario_cap_seg3_dl_03022FF8),
GEO_DISPLAY_LIST(LAYER_SILHOUETTE_ALPHA, mario_cap_seg3_dl_03023108),
GEO_CLOSE_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),

37
actors/mips/geo.inc.c
View File

@@ -4,44 +4,44 @@ const GeoLayout mips_geo[] = {
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, mips_seg6_dl_06010C40),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, mips_seg6_dl_06010C40),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 64, 0, 0, mips_seg6_dl_060107B8),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 64, 0, 0, mips_seg6_dl_060107B8),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 52, -24, -32, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 52, -24, -32, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, mips_seg6_dl_06011DB0),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, mips_seg6_dl_06011DB0),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 79, 0, 0, mips_seg6_dl_06011BB0),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 79, 0, 0, mips_seg6_dl_06011BB0),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 52, -24, 32, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 52, -24, 32, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, mips_seg6_dl_060110B0),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, mips_seg6_dl_060110B0),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 79, 0, 0, mips_seg6_dl_06010E60),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 79, 0, 0, mips_seg6_dl_06010E60),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, -31, 4, -39, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, -31, 4, -39, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, mips_seg6_dl_06011FC0),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, mips_seg6_dl_06011FC0),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 45, 0, 0, mips_seg6_dl_06011990),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 45, 0, 0, mips_seg6_dl_06011990),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 52, 0, 0, mips_seg6_dl_06011780),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 52, 0, 0, mips_seg6_dl_06011780),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, -31, 4, 40, NULL),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, -31, 4, 40, NULL),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, mips_seg6_dl_06011ED8),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 0, 0, 0, mips_seg6_dl_06011ED8),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 45, 0, 0, mips_seg6_dl_06011520),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 45, 0, 0, mips_seg6_dl_06011520),
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 52, 0, 0, mips_seg6_dl_06011310),
GEO_ANIMATED_PART(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, 52, 0, 0, mips_seg6_dl_06011310),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
@@ -49,8 +49,7 @@ const GeoLayout mips_geo[] = {
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(), //! more close than open nodes
GEO_END(),
GEO_END(),
};
UNUSED static const u64 mips_unused_1 = 0;

40
actors/mr_i_iris/geo.inc.c
View File

@@ -4,26 +4,26 @@ const GeoLayout mr_i_iris_geo[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(20, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041F0),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_06004208),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_06004220),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_06004208),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041F0),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041F0),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_06004208),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_06004220),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_06004208),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041F0),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041F0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_06004208),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_06004220),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_06004208),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041F0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041F0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_06004208),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_06004220),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_06004208),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041F0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mr_i_iris_seg6_dl_060041D8),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),

2
actors/mushroom_1up/geo.inc.c
View File

@@ -2,7 +2,7 @@
const GeoLayout mushroom_1up_geo[] = {
GEO_SHADOW(SHADOW_CIRCLE_4_VERTS, 0xB4, 80),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, mushroom_1up_seg3_dl_0302A660),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, mushroom_1up_seg3_dl_0302A660),
GEO_CLOSE_NODE(),
GEO_END(),
};

Some files were not shown because too many files have changed in this diff Show More