mirror/sm64
1
0
Fork 0
mirror of https://github.com/n64decomp/sm64 synced 2026-09-09 11:34:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refresh 7

Browse Source
This commit is contained in:
n64
2020-03-01 22:42:52 -05:00
parent 9a801cb96d
commit 06ec56df7f
414 changed files with 7706 additions and 10210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
levels/bbh/areas/1/geo.inc.c
+1 -1
View File
@@ -517,7 +517,7 @@ const GeoLayout geo_bbh_000F00[] = {
GEO_BRANCH(1, geo_bbh_000EB0), // 0x0E000EB0
GEO_CLOSE_NODE(),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/bitdw/areas/1/geo.inc.c
+1 -1
View File
@@ -17,7 +17,7 @@ const GeoLayout geo_bitdw_000618[] = {
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, bitdw_seg7_dl_070020C8),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/bitfs/areas/1/geo.inc.c
+1 -1
View File
@@ -21,7 +21,7 @@ const GeoLayout bitfs_geo_0007A0[] = {
GEO_ASM(0x1902, geo_movtex_draw_nocolor),
GEO_ASM(0x1903, geo_movtex_draw_nocolor),
GEO_RENDER_OBJ(),
GEO_ASM( 12, geo_enfvx_main),
GEO_ASM( 12, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/bits/areas/1/geo.inc.c
+1 -1
View File
@@ -17,7 +17,7 @@ const GeoLayout bits_geo_000718[] = {
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, bits_seg7_dl_07002918),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/bob/areas/1/geo.inc.c
+1 -1
View File
@@ -22,7 +22,7 @@ const GeoLayout bob_geo_000488[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, bob_seg7_dl_0700DD18),
GEO_DISPLAY_LIST(LAYER_OPAQUE, bob_seg7_dl_0700E338),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/bowser_1/areas/1/geo.inc.c
+1 -1
View File
@@ -17,7 +17,7 @@ const GeoLayout bowser_1_geo_0000D0[] = {
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, bowser_1_seg7_dl_07002768),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/bowser_2/areas/1/geo.inc.c
+1 -1
View File
@@ -17,7 +17,7 @@ const GeoLayout bowser_2_geo_000188[] = {
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, bowser_2_seg7_dl_07001930),
GEO_RENDER_OBJ(),
GEO_ASM(12, geo_enfvx_main),
GEO_ASM(12, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/bowser_3/areas/1/geo.inc.c
+1 -1
View File
@@ -17,7 +17,7 @@ const GeoLayout bowser_3_geo_000398[] = {
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, bowser_3_seg7_dl_070046B0),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/castle_courtyard/areas/1/geo.inc.c
+1 -1
View File
@@ -21,7 +21,7 @@ const GeoLayout castle_courtyard_geo_000218[] = {
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x2601, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/castle_grounds/areas/1/geo.inc.c
+1 -1
View File
@@ -26,7 +26,7 @@ const GeoLayout castle_grounds_geo_00073C[] = {
GEO_ASM(0x1601, geo_movtex_draw_nocolor),
GEO_ASM(0x1601, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/castle_inside/areas/1/geo.inc.c
+17 -17
View File
@@ -48,8 +48,8 @@ const GeoLayout castle_geo_000FD0[] = {
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07032FC0),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07033158),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(256, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(0, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -61,8 +61,8 @@ const GeoLayout castle_geo_001000[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07034D88),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07035178),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07035288),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(258, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(2, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -77,8 +77,8 @@ const GeoLayout castle_geo_001038[] = {
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_07037DE8),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, dl_castle_aquarium_light),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07038350),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(259, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(3, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -91,8 +91,8 @@ const GeoLayout castle_geo_001088[] = {
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_0703A808),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_070234C0),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07023520),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(257, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(1, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -172,8 +172,8 @@ const GeoLayout castle_geo_001200[] = {
GEO_ASM( 0, geo_exec_inside_castle_light),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07032FC0),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07033158),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(256, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(256, geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -191,8 +191,8 @@ const GeoLayout castle_geo_001260[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07034D88),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07035178),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07035288),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(258, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(258, geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -213,8 +213,8 @@ const GeoLayout castle_geo_0012C8[] = {
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_07037DE8),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, dl_castle_aquarium_light),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07038350),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(259, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(3, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -233,8 +233,8 @@ const GeoLayout castle_geo_001348[] = {
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_0703A808),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_070234C0),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07023520),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(257, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(1, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -292,7 +292,7 @@ const GeoLayout castle_geo_001400[] = {
GEO_BRANCH(1, castle_geo_0013B8), // 0x0E0013B8
GEO_CLOSE_NODE(),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/castle_inside/areas/2/geo.inc.c
+29 -29
View File
@@ -14,9 +14,9 @@ const GeoLayout castle_geo_001578[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07043028),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07043B48),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07043CD8),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(264, Geo18_802D5B98),
GEO_ASM(266, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(8, 1), geo_painting_draw),
GEO_ASM(PAINTING_ID(10, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -28,8 +28,8 @@ const GeoLayout castle_geo_0015B8[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_0704A0E8),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_0704A2E0),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_0704AA98),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(268, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(12, 1), geo_painting_draw),
GEO_ASM( 0, geo_render_mirror_mario),
GEO_CLOSE_NODE(),
GEO_RETURN(),
@@ -40,9 +40,9 @@ const GeoLayout castle_geo_0015F8[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_0704C7D8),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(265, Geo18_802D5B98),
GEO_ASM(269, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(9, 1), geo_painting_draw),
GEO_ASM(PAINTING_ID(13, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -55,8 +55,8 @@ const GeoLayout castle_geo_001628[] = {
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07051678),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_070519C8),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_07051B60),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(267, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(11, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -80,9 +80,9 @@ const GeoLayout castle_geo_001690[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07043028),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07043B48),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07043CD8),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(264, Geo18_802D5B98),
GEO_ASM(266, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(8, 1), geo_painting_draw),
GEO_ASM(PAINTING_ID(10, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -97,10 +97,10 @@ const GeoLayout castle_geo_0016D8[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_0704A0E8),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_0704A2E0),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_0704AA98),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(264, Geo18_802D5B98),
GEO_ASM(266, Geo18_802D5B98),
GEO_ASM(268, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(8, 1), geo_painting_draw),
GEO_ASM(PAINTING_ID(10, 1), geo_painting_draw),
GEO_ASM(PAINTING_ID(12, 1), geo_painting_draw),
GEO_ASM( 0, geo_render_mirror_mario),
GEO_CLOSE_NODE(),
GEO_RETURN(),
@@ -114,11 +114,11 @@ const GeoLayout castle_geo_001740[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07043B48),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07043CD8),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_0704C7D8),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(264, Geo18_802D5B98),
GEO_ASM(265, Geo18_802D5B98),
GEO_ASM(266, Geo18_802D5B98),
GEO_ASM(269, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(8, 1), geo_painting_draw),
GEO_ASM(PAINTING_ID(9, 1), geo_painting_draw),
GEO_ASM(PAINTING_ID(10, 1), geo_painting_draw),
GEO_ASM(PAINTING_ID(13, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -134,10 +134,10 @@ const GeoLayout castle_geo_001798[] = {
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07051678),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_070519C8),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_07051B60),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(264, Geo18_802D5B98),
GEO_ASM(266, Geo18_802D5B98),
GEO_ASM(267, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(8, 1), geo_painting_draw),
GEO_ASM(PAINTING_ID(10, 1), geo_painting_draw),
GEO_ASM(PAINTING_ID(11, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -153,8 +153,8 @@ const GeoLayout castle_geo_001800[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_070558D0),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_070572A0),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07057F00),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(267, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(11, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -191,7 +191,7 @@ const GeoLayout castle_geo_001858[] = {
GEO_BRANCH(1, castle_geo_001800), // 0x0E001800
GEO_CLOSE_NODE(),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/castle_inside/areas/3/geo.inc.c
+20 -20
View File
@@ -15,9 +15,9 @@ const GeoLayout castle_geo_001980[] = {
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_070616E8),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_07061C20),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM( 260, Geo18_802D5B98),
GEO_ASM( 261, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM( PAINTING_ID(4, 1), geo_painting_draw),
GEO_ASM( PAINTING_ID(5, 1), geo_painting_draw),
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x0600, geo_movtex_draw_water_regions),
GEO_CLOSE_NODE(),
@@ -30,8 +30,8 @@ const GeoLayout castle_geo_0019C8[] = {
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07064B78),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07064D58),
GEO_ASM(0, Geo18_802D5D0C),
GEO_ASM(262, Geo18_802D5B98),
GEO_ASM(0, geo_painting_update),
GEO_ASM(PAINTING_ID(6, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -54,8 +54,8 @@ const GeoLayout castle_geo_001A30[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07068850),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(263, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(7, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -69,9 +69,9 @@ const GeoLayout castle_geo_001A58[] = {
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_0705E450),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_070616E8),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_07061C20),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM( 260, Geo18_802D5B98),
GEO_ASM( 261, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM( PAINTING_ID(4, 1), geo_painting_draw),
GEO_ASM( PAINTING_ID(5, 1), geo_painting_draw),
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x0600, geo_movtex_draw_water_regions),
GEO_CLOSE_NODE(),
@@ -86,8 +86,8 @@ const GeoLayout castle_geo_001AB8[] = {
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_0705E2A0),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_0705E450),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07068850),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM(263, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(7, 1), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -117,9 +117,9 @@ const GeoLayout castle_geo_001B48[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07066CE0),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_07066E90),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07066FA0),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM( 260, Geo18_802D5B98),
GEO_ASM( 261, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM( PAINTING_ID(4, 1), geo_painting_draw),
GEO_ASM( PAINTING_ID(5, 1), geo_painting_draw),
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x0600, geo_movtex_draw_water_regions),
GEO_ASM(0x0612, geo_movtex_draw_water_regions),
@@ -135,10 +135,10 @@ const GeoLayout castle_geo_001BB0[] = {
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, inside_castle_seg7_dl_07061C20),
GEO_DISPLAY_LIST(LAYER_OPAQUE, inside_castle_seg7_dl_07064B78),
GEO_DISPLAY_LIST(LAYER_ALPHA, inside_castle_seg7_dl_07064D58),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM( 260, Geo18_802D5B98),
GEO_ASM( 261, Geo18_802D5B98),
GEO_ASM( 262, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM( PAINTING_ID(4, 1), geo_painting_draw),
GEO_ASM( PAINTING_ID(5, 1), geo_painting_draw),
GEO_ASM( PAINTING_ID(6, 1), geo_painting_draw),
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x0600, geo_movtex_draw_water_regions),
GEO_CLOSE_NODE(),
@@ -176,7 +176,7 @@ const GeoLayout castle_geo_001C10[] = {
GEO_BRANCH(1, castle_geo_001BB0), // 0x0E001BB0
GEO_CLOSE_NODE(),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/castle_inside/painting.inc.c
+271 -219
View File
@@ -98,8 +98,10 @@ static const Gfx inside_castle_seg7_painting_dl_07021AC0[] = {
};
// 0x07021AE0 - 0x07021FFA
static const PaintingData inside_castle_seg7_painting_points_07021AE0[] = {
85,
static const PaintingData inside_castle_seg7_painting_texture_map_bottom_07021AE0[] = {
85, // num mappings
// Format:
// mesh vtx ID, texture X, texture Y
49, 2016, 889,
53, 2016, 685,
55, 1843, 787,
@@ -186,8 +188,9 @@ static const PaintingData inside_castle_seg7_painting_points_07021AE0[] = {
150, 649, 0,
153, -32, 0,
// inside_castle_seg7_painting_triangles_07021CE0:
132,
132, // num groups
// Grouped by 5 + one remainder group,
// = 15 vertices per group + a few extra triangles
13, 8, 5,
0, 1, 2,
3, 0, 4,
@@ -324,8 +327,10 @@ static const PaintingData inside_castle_seg7_painting_points_07021AE0[] = {
// 0x07021FFC - 0x07022516
static const PaintingData inside_castle_seg7_painting_points_07021FFC[] = {
85,
static const PaintingData inside_castle_seg7_painting_texture_map_top_07021FFC[] = {
85, // num mappings
// Format:
// mesh vtx ID, texture X, texture Y
0, 2016, 72,
1, 2016, 0,
2, 1843, 0,
@@ -412,8 +417,9 @@ static const PaintingData inside_castle_seg7_painting_points_07021FFC[] = {
152, -32, 685,
153, -32, 992,
// inside_castle_seg7_painting_triangles_070221FC:
132,
132, // num groups
// Grouped by 5 + one remainder group,
// = 15 vertices per group + a few extra triangles
10, 7, 13,
0, 1, 2,
3, 0, 2,
@@ -550,9 +556,9 @@ static const PaintingData inside_castle_seg7_painting_points_07021FFC[] = {
// 0x07022518
static const PaintingData *const inside_castle_seg7_painting_data_07022518[] = {
inside_castle_seg7_painting_points_07021AE0,
inside_castle_seg7_painting_points_07021FFC,
static const PaintingData *const inside_castle_seg7_painting_texture_maps_07022518[] = {
inside_castle_seg7_painting_texture_map_bottom_07021AE0,
inside_castle_seg7_painting_texture_map_top_07021FFC,
};
UNUSED static const u64 castle_inside_unused_0 = 0x0;
@@ -619,8 +625,10 @@ static const Gfx inside_castle_seg7_painting_dl_07022640[] = {
};
// 0x07022660 - 0x07023042
static const PaintingData inside_castle_seg7_painting_points_07022660[] = {
157,
static const PaintingData inside_castle_seg7_painting_env_map_texture_map_07022660[] = {
157, // num mappings
// Format:
// mesh vtx ID, texture X, texture Y
0, 6100, -4832,
1, 6100, -5142,
2, 5582, -5142,
@@ -780,7 +788,9 @@ static const PaintingData inside_castle_seg7_painting_points_07022660[] = {
156, 0, 990,
// inside_castle_seg7_painting_triangles_07022A10:
264,
264, // num groups
// Grouped by 5 + one remainder group,
// = 15 vertices per group + a few extra triangles
8, 12, 13,
0, 1, 2,
3, 0, 2,
@@ -1049,8 +1059,8 @@ static const PaintingData inside_castle_seg7_painting_points_07022660[] = {
// 0x07023044 - 0x07023048
static const PaintingData *const inside_castle_seg7_painting_data_07023044[] = {
inside_castle_seg7_painting_points_07022660,
static const PaintingData *const inside_castle_seg7_painting_env_map_texture_maps_07023044[] = {
inside_castle_seg7_painting_env_map_texture_map_07022660,
};
UNUSED static const u64 castle_inside_unused_1 = 0x0;
@@ -1345,335 +1355,377 @@ static const u8 *const inside_castle_seg7_painting_textures_07023618[] = {
// 0x07023620 - 0x07023698
struct Painting bob_painting = {
/* id */ 0x0000,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 90.0f,
/* Position */ -5222.4f, 409.6f, -153.6f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.24f, 0.14f,
0.0f, 40.0f, 30.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_07023050,
inside_castle_seg7_painting_data_07022518,
inside_castle_seg7_painting_textures_070235C0,
64, 32,
inside_castle_seg7_painting_dl_07021AC0,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
614.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.24f, 0.14f,
/* Ripple Dispersion */ 0.0f, 40.0f, 30.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_07023050,
/* Texture Maps */ inside_castle_seg7_painting_texture_maps_07022518,
/* Textures */ inside_castle_seg7_painting_textures_070235C0,
/* Texture w, h */ 64, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07021AC0,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 614.0f,
};
// 0x07023698 - 0x07023710
struct Painting ccm_painting = {
/* id */ 0x0001,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 0.0f,
/* Position */ -2611.2f, -307.2f, -4352.0f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.24f, 0.14f,
0.0f, 40.0f, 30.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_070230B0,
inside_castle_seg7_painting_data_07022518,
inside_castle_seg7_painting_textures_070235C8,
64, 32,
inside_castle_seg7_painting_dl_07021AC0,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
614.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.24f, 0.14f,
/* Ripple Dispersion */ 0.0f, 40.0f, 30.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_070230B0,
/* Texture Maps */ inside_castle_seg7_painting_texture_maps_07022518,
/* Textures */ inside_castle_seg7_painting_textures_070235C8,
/* Texture w, h */ 64, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07021AC0,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 614.0f,
};
// 0x07023710 - 0x07023788
struct Painting wf_painting = {
/* id */ 0x0002,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 0.0f,
/* Position */ -51.2f, -204.8f, -4505.6f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.24f, 0.14f,
0.0f, 40.0f, 30.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_07023110,
inside_castle_seg7_painting_data_07022518,
inside_castle_seg7_painting_textures_070235D0,
64, 32,
inside_castle_seg7_painting_dl_07021AC0,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
614.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.24f, 0.14f,
/* Ripple Dispersion */ 0.0f, 40.0f, 30.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_07023110,
/* Texture Maps */ inside_castle_seg7_painting_texture_maps_07022518,
/* Textures */ inside_castle_seg7_painting_textures_070235D0,
/* Texture w, h */ 64, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07021AC0,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 614.0f,
};
// 0x07023788 - 0x07023800
struct Painting jrb_painting = {
/* id */ 0x0003,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 270.0f,
/* Position */ 4300.8f, 409.6f, -537.6f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.24f, 0.14f,
0.0f, 40.0f, 30.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_07023170,
inside_castle_seg7_painting_data_07022518,
inside_castle_seg7_painting_textures_070235D8,
64, 32,
inside_castle_seg7_painting_dl_07021AC0,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
614.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.24f, 0.14f,
/* Ripple Dispersion */ 0.0f, 40.0f, 30.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_07023170,
/* Texture Maps */ inside_castle_seg7_painting_texture_maps_07022518,
/* Textures */ inside_castle_seg7_painting_textures_070235D8,
/* Texture w, h */ 64, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07021AC0,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 614.0f,
};
// 0x07023800 - 0x07023878
struct Painting lll_painting = {
/* id */ 0x0004,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 0.0f,
/* Position */ -1689.6f, -1126.4f, -3942.4f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.24f, 0.14f,
0.0f, 40.0f, 30.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_070231D0,
inside_castle_seg7_painting_data_07022518,
inside_castle_seg7_painting_textures_070235E0,
64, 32,
inside_castle_seg7_painting_dl_07021AC0,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
614.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.24f, 0.14f,
/* Ripple Dispersion */ 0.0f, 40.0f, 30.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_070231D0,
/* Texture Maps */ inside_castle_seg7_painting_texture_maps_07022518,
/* Textures */ inside_castle_seg7_painting_textures_070235E0,
/* Texture w, h */ 64, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07021AC0,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 614.0f,
};
// 0x07023878 - 0x070238F0
struct Painting ssl_painting = {
/* id */ 0x0005,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 180.0f,
/* Position */ -2611.2f, -1177.6f, -1075.2f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.24f, 0.14f,
0.0f, 40.0f, 30.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_07023230,
inside_castle_seg7_painting_data_07022518,
inside_castle_seg7_painting_textures_070235E8,
64, 32,
inside_castle_seg7_painting_dl_07021AC0,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
614.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.24f, 0.14f,
/* Ripple Dispersion */ 0.0f, 40.0f, 30.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_07023230,
/* Texture Maps */ inside_castle_seg7_painting_texture_maps_07022518,
/* Textures */ inside_castle_seg7_painting_textures_070235E8,
/* Texture w, h */ 64, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07021AC0,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 614.0f,
};
// 0x070238F0 - 0x07023968
struct Painting hmc_painting = {
/* id */ 0x000E,
/* Face Count */ 0x01,
/* Ripple Shape */ RIPPLE_SHAPE_CONCENTRIC,
/* Image Count */ 0x01,
/* Texture Type */ PAINTING_ENV_MAP,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 270.0f, 0.0f,
/* Position */ 2099.2f, -1484.8f, -2278.4f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 10.0f, 30.0f,
1.0f, 1.0f, 0.98f,
0.0f, 0.05f, 0.05f,
0.0f, 15.0f, 15.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_07023580,
inside_castle_seg7_painting_data_07023044,
inside_castle_seg7_painting_textures_070235F0,
32, 32,
inside_castle_seg7_painting_dl_07022640,
RIPPLE_TRIGGER_CONTINUOUS, 0xFF, 0x00, 0x00, 0x00,
768.0f,
/* Ripple Decay */ 1.0f, 1.0f, 0.98f,
/* Ripple Rate */ 0.0f, 0.05f, 0.05f,
/* Ripple Dispersion */ 0.0f, 15.0f, 15.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_07023580,
/* Texture Maps */ inside_castle_seg7_painting_env_map_texture_maps_07023044,
/* Textures */ inside_castle_seg7_painting_textures_070235F0,
/* Texture w, h */ 32, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07022640,
/* Ripple Trigger */ RIPPLE_TRIGGER_CONTINUOUS,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 768.0f,
};
// 0x07023968 - 0x070239E0
struct Painting ddd_painting = {
/* id */ 0x0007,
/* Face Count */ 0x01,
/* Ripple Shape */ RIPPLE_SHAPE_CONCENTRIC,
/* Image Count */ 0x01,
/* Texture Type */ PAINTING_ENV_MAP,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 270.0f,
/* Position */ 3456.0f, -1075.2f, 1587.2f,
/* Ripple Magnitude */ 0.0f, 10.0f, 30.0f,
1.0f, 1.0f, 0.98f,
0.0f, 0.05f, 0.05f,
0.0f, 15.0f, 15.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_070235B8,
inside_castle_seg7_painting_data_07023044,
inside_castle_seg7_painting_textures_070235F4,
32, 32,
inside_castle_seg7_painting_dl_07022640,
RIPPLE_TRIGGER_CONTINUOUS, 0xB4, 0x00, 0x00, 0x00,
819.2f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 10.0f, 30.0f,
/* Ripple Decay */ 1.0f, 1.0f, 0.98f,
/* Ripple Rate */ 0.0f, 0.05f, 0.05f,
/* Ripple Dispersion */ 0.0f, 15.0f, 15.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_070235B8,
/* Texture Maps */ inside_castle_seg7_painting_env_map_texture_maps_07023044,
/* Textures */ inside_castle_seg7_painting_textures_070235F4,
/* Texture w, h */ 32, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07022640,
/* Ripple Trigger */ RIPPLE_TRIGGER_CONTINUOUS,
/* Alpha */ 0xB4,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 819.2f,
};
// 0x070239E0 - 0x07023A58
struct Painting wdw_painting = {
/* id */ 0x0008,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 0.0f,
/* Position */ -966.656f, 1305.6f, -143.36f,
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.24f, 0.14f,
0.0f, 40.0f, 30.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_07023290,
inside_castle_seg7_painting_data_07022518,
inside_castle_seg7_painting_textures_070235F8,
64, 32,
inside_castle_seg7_painting_dl_07021AC0,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
614.0f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.24f, 0.14f,
/* Ripple Dispersion */ 0.0f, 40.0f, 30.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_07023290,
/* Texture Maps */ inside_castle_seg7_painting_texture_maps_07022518,
/* Textures */ inside_castle_seg7_painting_textures_070235F8,
/* Texture w, h */ 64, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07021AC0,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 614.0f,
};
// 0x07023A58 - 0x07023AD0
struct Painting thi_tiny_painting = {
/* id */ 0x0009,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 180.0f,
/* Position */ -4598.7842f, 1354.752f, 3005.44f,
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.24f, 0.14f,
0.0f, 40.0f, 30.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_070232F0,
inside_castle_seg7_painting_data_07022518,
inside_castle_seg7_painting_textures_07023600,
64, 32,
inside_castle_seg7_painting_dl_07021AC0,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
393.216f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.24f, 0.14f,
/* Ripple Dispersion */ 0.0f, 40.0f, 30.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_070232F0,
/* Texture Maps */ inside_castle_seg7_painting_texture_maps_07022518,
/* Textures */ inside_castle_seg7_painting_textures_07023600,
/* Texture w, h */ 64, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07021AC0,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 393.216f,
};
// 0x07023AD0 - 0x07023B48
struct Painting ttm_painting = {
/* id */ 0x000A,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 180.0f,
/* Position */ -546.816f, 1356.8f, 3813.376f,
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.24f, 0.14f,
0.0f, 40.0f, 30.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_07023350,
inside_castle_seg7_painting_data_07022518,
inside_castle_seg7_painting_textures_07023608,
64, 32,
inside_castle_seg7_painting_dl_07021AC0,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
256.0f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.24f, 0.14f,
/* Ripple Dispersion */ 0.0f, 40.0f, 30.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_07023350,
/* Texture Maps */ inside_castle_seg7_painting_texture_maps_07022518,
/* Textures */ inside_castle_seg7_painting_textures_07023608,
/* Texture w, h */ 64, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07021AC0,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 256.0f,
};
// 0x07023B48 - 0x07023BC0
struct Painting ttc_painting = {
/* id */ 0x000B,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 180.0f,
/* Position */ 0.0f, 2713.6f, 7232.5122f,
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.24f, 0.14f,
0.0f, 40.0f, 30.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_070233B0,
inside_castle_seg7_painting_data_07022518,
inside_castle_seg7_painting_textures_07023610,
64, 32,
inside_castle_seg7_painting_dl_07021AC0,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
409.6f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.24f, 0.14f,
/* Ripple Dispersion */ 0.0f, 40.0f, 30.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_070233B0,
/* Texture Maps */ inside_castle_seg7_painting_texture_maps_07022518,
/* Textures */ inside_castle_seg7_painting_textures_07023610,
/* Texture w, h */ 64, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07021AC0,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 409.6f,
};
// 0x07023BC0 - 0x07023C38
struct Painting sl_painting = {
/* id */ 0x000C,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 0.0f,
/* Position */ 3179.52f, 1408.0f, -271.36f,
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.24f, 0.14f,
0.0f, 40.0f, 30.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_07023410,
inside_castle_seg7_painting_data_07022518,
inside_castle_seg7_painting_textures_07023618,
64, 32,
inside_castle_seg7_painting_dl_07021AC0,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
716.8f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.24f, 0.14f,
/* Ripple Dispersion */ 0.0f, 40.0f, 30.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_07023410,
/* Texture Maps */ inside_castle_seg7_painting_texture_maps_07022518,
/* Textures */ inside_castle_seg7_painting_textures_07023618,
/* Texture w, h */ 64, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07021AC0,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 716.8f,
};
// 0x07023C38 - 0x07023CB0
struct Painting thi_huge_painting = {
/* id */ 0x000D,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 0.0f,
/* Position */ -5614.5918f, 1510.4f, -3292.16f,
/* Ripple Magnitude */ 0.0f, 40.0f, 160.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.12f, 0.07f,
0.0f, 80.0f, 60.0f,
0.0f,
0.0f, 0.0f,
inside_castle_seg7_painting_dl_070232F0,
inside_castle_seg7_painting_data_07022518,
inside_castle_seg7_painting_textures_07023600,
64, 32,
inside_castle_seg7_painting_dl_07021AC0,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
1638.4f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 40.0f, 160.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.12f, 0.07f,
/* Ripple Dispersion */ 0.0f, 80.0f, 60.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ inside_castle_seg7_painting_dl_070232F0,
/* Texture Maps */ inside_castle_seg7_painting_texture_maps_07022518,
/* Textures */ inside_castle_seg7_painting_textures_07023600,
/* Texture w, h */ 64, 32,
/* Ripple DList */ inside_castle_seg7_painting_dl_07021AC0,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 1638.4f,
};
levels/ccm/areas/1/geo.inc.c
+1 -1
View File
@@ -23,7 +23,7 @@ const GeoLayout ccm_geo_00051C[] = {
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x0501, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM( 1, geo_enfvx_main),
GEO_ASM( 1, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/ccm/areas/2/geo.inc.c
+1 -1
View File
@@ -23,7 +23,7 @@ const GeoLayout ccm_geo_0005E8[] = {
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, ccm_seg7_dl_0701FE60),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, ccm_seg7_dl_070207F0),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/cotmc/areas/1/geo.inc.c
+1 -1
View File
@@ -21,7 +21,7 @@ const GeoLayout cotmc_geo_0001A0[] = {
GEO_ASM(0x2801, geo_movtex_draw_nocolor),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, cotmc_seg7_dl_0700A4B8),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/ddd/areas/1/geo.inc.c
+1 -1
View File
@@ -22,7 +22,7 @@ const GeoLayout ddd_geo_0004C0[] = {
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x2301, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM( 13, geo_enfvx_main),
GEO_ASM( 13, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/ddd/areas/2/geo.inc.c
+1 -1
View File
@@ -24,7 +24,7 @@ const GeoLayout ddd_geo_000570[] = {
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x2302, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM( 14, geo_enfvx_main),
GEO_ASM( 14, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/hmc/areas/1/geo.inc.c
+5 -5
View File
@@ -83,8 +83,8 @@ const GeoLayout hmc_geo_000748[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, hmc_seg7_dl_07020FD0),
GEO_ASM(0, Geo18_802D5D0C),
GEO_ASM(0, Geo18_802D5B98),
GEO_ASM(0, geo_painting_update),
GEO_ASM(PAINTING_ID(0, 0), geo_painting_draw),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@@ -246,8 +246,8 @@ const GeoLayout hmc_geo_000A88[] = {
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, hmc_seg7_dl_0701F818),
GEO_DISPLAY_LIST(LAYER_OPAQUE, hmc_seg7_dl_0701FD58),
GEO_DISPLAY_LIST(LAYER_OPAQUE, hmc_seg7_dl_07020FD0),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM( 0, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM( PAINTING_ID(0, 0), geo_painting_draw),
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x0701, geo_movtex_draw_water_regions),
GEO_CLOSE_NODE(),
@@ -326,7 +326,7 @@ const GeoLayout hmc_geo_000B90[] = {
GEO_BRANCH(1, hmc_geo_000B48), // 0x0E000B48
GEO_CLOSE_NODE(),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/hmc/areas/1/painting.inc.c
+27 -21
View File
@@ -61,8 +61,10 @@ static const Gfx hmc_seg7_painting_dl_070242D0[] = {
};
// 0x070242F0 - 0x07024CD2
static const PaintingData hmc_seg7_pool_points_070242F0[] = {
157,
static const PaintingData hmc_seg7_pool_texture_map_070242F0[] = {
157, // num mappings
// Format:
// mesh vtx ID, texture X, texture Y
0, 6100, -4832,
1, 6100, -5142,
2, 5582, -5142,
@@ -221,8 +223,9 @@ static const PaintingData hmc_seg7_pool_points_070242F0[] = {
155, 0, 70,
156, 0, 990,
// hmc_seg7_triangles_070246A0:
264,
264, // num groups
// Grouped by 5 + one remainder group,
// = 15 vertices per group + a few extra triangles
8, 12, 13,
0, 1, 2,
3, 0, 2,
@@ -490,8 +493,8 @@ static const PaintingData hmc_seg7_pool_points_070242F0[] = {
};
// 0x07024CD4
static const PaintingData *const hmc_seg7_painting_data_07024CD4[] = {
hmc_seg7_pool_points_070242F0,
static const PaintingData *const hmc_seg7_painting_texture_maps_07024CD4[] = {
hmc_seg7_pool_texture_map_070242F0,
};
UNUSED static const u64 hmc_unused_0 = 0;
@@ -520,23 +523,26 @@ const u8 *const hmc_seg7_painting_textures_07025518[] = {
// 0x0702551C (PaintingData)
struct Painting cotmc_painting = {
/* id */ 0x000E,
/* Face Count */ 0x01,
/* Ripple Shape */ RIPPLE_SHAPE_CONCENTRIC,
/* Image Count */ 0x01,
/* Texture Type */ PAINTING_ENV_MAP,
/* Floor Status */ 0x00, 0x00 , 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 270.0f, 0.0f,
/* Position */ 2989.055908f, -4485.120117f, 5135.359863f,
/* Ripple Magnitude */ 0.0f, 10.0f, 30.0f,
1.0f, 1.0f, 0.98f,
0.0f, 0.05f, 0.05f,
0.0f, 15.0f, 15.0f,
0.0f,
0.0f, 0.0f,
hmc_seg7_painting_dl_070254E0,
hmc_seg7_painting_data_07024CD4,
hmc_seg7_painting_textures_07025518,
32, 32,
hmc_seg7_painting_dl_070242D0,
RIPPLE_TRIGGER_CONTINUOUS, 0xFF, 0x00, 0x00, 0x00,
723.968018f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 10.0f, 30.0f,
/* Ripple Decay */ 1.0f, 1.0f, 0.98f,
/* Ripple Rate */ 0.0f, 0.05f, 0.05f,
/* Ripple Dispersion */ 0.0f, 15.0f, 15.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ hmc_seg7_painting_dl_070254E0,
/* Texture Maps */ hmc_seg7_painting_texture_maps_07024CD4,
/* Textures */ hmc_seg7_painting_textures_07025518,
/* Texture w, h */ 32, 32,
/* Ripple DList */ hmc_seg7_painting_dl_070242D0,
/* Ripple Trigger */ RIPPLE_TRIGGER_CONTINUOUS,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 723.968018f,
};
levels/jrb/areas/1/geo.inc.c
+1 -1
View File
@@ -26,7 +26,7 @@ const GeoLayout jrb_geo_000A18[] = {
GEO_ASM(0x1201, geo_movtex_draw_water_regions),
GEO_ASM(0x1205, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM( 14, geo_enfvx_main),
GEO_ASM( 14, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/jrb/areas/2/geo.inc.c
+1 -1
View File
@@ -21,7 +21,7 @@ const GeoLayout jrb_geo_000AFC[] = {
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x1202, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM( 2, geo_enfvx_main),
GEO_ASM( 2, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/jrb/wooden_ship/geo.inc.c
+2 -2
View File
@@ -11,7 +11,7 @@ const GeoLayout jrb_geo_000978[] = {
const GeoLayout jrb_geo_000990[] = {
GEO_CULLING_RADIUS(5000),
GEO_OPEN_NODE(),
GEO_ASM(0, Geo18_8029D924),
GEO_ASM(0, geo_update_layer_transparency),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, jrb_seg7_dl_070090B0),
GEO_CLOSE_NODE(),
GEO_END(),
@@ -30,7 +30,7 @@ const GeoLayout jrb_geo_0009B0[] = {
const GeoLayout jrb_geo_0009C8[] = {
GEO_CULLING_RADIUS(5000),
GEO_OPEN_NODE(),
GEO_ASM(0, Geo18_8029D924),
GEO_ASM(0, geo_update_layer_transparency),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, jrb_seg7_dl_07009B30),
GEO_CLOSE_NODE(),
GEO_END(),
levels/lll/areas/1/geo.inc.c
+1 -1
View File
@@ -21,7 +21,7 @@ const GeoLayout lll_geo_000E00[] = {
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x2201, geo_movtex_draw_nocolor),
GEO_RENDER_OBJ(),
GEO_ASM( 12, geo_enfvx_main),
GEO_ASM( 12, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/lll/areas/2/geo.inc.c
+1 -1
View File
@@ -24,7 +24,7 @@ const GeoLayout lll_geo_000EC0[] = {
GEO_ASM(0x2202, geo_movtex_draw_nocolor),
GEO_ASM(0x2202, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM( 0, geo_enfvx_main),
GEO_ASM( 0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/pss/areas/1/geo.inc.c
+1 -1
View File
@@ -23,7 +23,7 @@ const GeoLayout pss_geo_000100[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, pss_seg7_dl_0700E2B0),
GEO_DISPLAY_LIST(LAYER_OPAQUE_DECAL, pss_seg7_dl_0700E3E8),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/rr/areas/1/geo.inc.c
+1 -1
View File
@@ -18,7 +18,7 @@ const GeoLayout rr_geo_0009D0[] = {
GEO_ASM(0, geo_exec_flying_carpet_timer_update),
GEO_DISPLAY_LIST(LAYER_ALPHA, dl_cruiser_metal_holes),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/sa/areas/1/geo.inc.c
+1 -1
View File
@@ -18,7 +18,7 @@ const GeoLayout sa_geo_000170[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, sa_seg7_dl_07002DE8),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, sa_seg7_dl_07002FD0),
GEO_RENDER_OBJ(),
GEO_ASM(2, geo_enfvx_main),
GEO_ASM(2, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/scripts.c
+3 -3
View File
@@ -67,10 +67,10 @@ const LevelScript level_main_scripts_entry[] = {
LOAD_MODEL_FROM_GEO(MODEL_SMOKE, smoke_geo),
LOAD_MODEL_FROM_GEO(MODEL_SPARKLES, sparkles_geo),
LOAD_MODEL_FROM_GEO(MODEL_BUBBLE, bubble_geo),
LOAD_MODEL_FROM_GEO(MODEL_SPOT_ON_GROUND, spot_on_ground_geo),
LOAD_MODEL_FROM_GEO(MODEL_WATER_WAVES_SURF, water_waves_surface_geo),
LOAD_MODEL_FROM_GEO(MODEL_SMALL_WATER_SPLASH, small_water_splash_geo),
LOAD_MODEL_FROM_GEO(MODEL_IDLE_WATER_WAVE, idle_water_wave_geo),
LOAD_MODEL_FROM_GEO(MODEL_WATER_SPLASH, water_splash_geo),
LOAD_MODEL_FROM_GEO(MODEL_WATER_WAVES, water_waves_geo),
LOAD_MODEL_FROM_GEO(MODEL_WAVE_TRAIL, wave_trail_geo),
LOAD_MODEL_FROM_GEO(MODEL_YELLOW_COIN, yellow_coin_geo),
LOAD_MODEL_FROM_GEO(MODEL_STAR, star_geo),
LOAD_MODEL_FROM_GEO(MODEL_TRANSPARENT_STAR, transparent_star_geo),
levels/sl/areas/1/geo.inc.c
+1 -1
View File
@@ -25,7 +25,7 @@ const GeoLayout sl_geo_0003A8[] = {
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x1001, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM( 1, geo_enfvx_main),
GEO_ASM( 1, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/sl/areas/2/geo.inc.c
+1 -1
View File
@@ -20,7 +20,7 @@ const GeoLayout sl_geo_000484[] = {
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, sl_seg7_dl_0700C9E8),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, sl_seg7_dl_0700CB58),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/sl/script.c
+2 -2
View File
@@ -29,8 +29,8 @@ static const LevelScript script_func_local_2[] = {
};
static const LevelScript script_func_local_3[] = {
OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 1715, 3328, 518, /*angle*/ 0, -51, 0, /*behParam*/ 0x00000000, /*beh*/ bhvWalkingPenguin),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 700, 3428, 700, /*angle*/ 0, 30, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSnowmanWindBlowing),
OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 1715, 3328, 518, /*angle*/ 0, -51, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSLWalkingPenguin),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 700, 3428, 700, /*angle*/ 0, 30, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSLSnowmanWind),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 480, 2300, 1370, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvIgloo),
OBJECT(/*model*/ MODEL_BIG_CHILL_BULLY, /*pos*/ 315, 1331, -4852, /*angle*/ 0, 0, 0, /*behParam*/ 0x01000000, /*beh*/ bhvBigChillBully),
OBJECT(/*model*/ MODEL_MR_BLIZZARD_HIDDEN, /*pos*/ 2954, 970, 750, /*angle*/ 0, 0, 0, /*behParam*/ 0x00020000, /*beh*/ bhvMrBlizzard),
levels/ssl/areas/1/geo.inc.c
+1 -1
View File
@@ -27,7 +27,7 @@ const GeoLayout ssl_geo_000648[] = {
GEO_ASM(0x0802, geo_movtex_draw_colored),
GEO_ASM(0x0803, geo_movtex_draw_colored),
GEO_RENDER_OBJ(),
GEO_ASM( 0, geo_enfvx_main),
GEO_ASM( 0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/ssl/areas/2/geo.inc.c
+1 -1
View File
@@ -24,7 +24,7 @@ const GeoLayout ssl_geo_0007CC[] = {
GEO_ASM(0x802, geo_movtex_draw_nocolor),
GEO_ASM(0x803, geo_movtex_draw_nocolor),
GEO_RENDER_OBJ(),
GEO_ASM( 0, geo_enfvx_main),
GEO_ASM( 0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/ssl/areas/3/geo.inc.c
+1 -1
View File
@@ -18,7 +18,7 @@ const GeoLayout ssl_geo_00088C[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, ssl_seg7_dl_07021A08),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, ssl_seg7_dl_07021DE8),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/thi/areas/1/geo.inc.c
+1 -1
View File
@@ -23,7 +23,7 @@ const GeoLayout thi_geo_000608[] = {
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x1301, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM( 0, geo_enfvx_main),
GEO_ASM( 0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/thi/areas/2/geo.inc.c
+1 -1
View File
@@ -28,7 +28,7 @@ const GeoLayout thi_geo_0006D4[] = {
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x1302, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM( 0, geo_enfvx_main),
GEO_ASM( 0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/thi/areas/3/geo.inc.c
+1 -1
View File
@@ -20,7 +20,7 @@ const GeoLayout thi_geo_00079C[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, thi_seg7_dl_07009D50),
GEO_DISPLAY_LIST(LAYER_ALPHA, thi_seg7_dl_07009F58),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/totwc/areas/1/geo.inc.c
+1 -1
View File
@@ -19,7 +19,7 @@ const GeoLayout totwc_geo_000188[] = {
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, totwc_seg7_dl_07007048),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, totwc_seg7_dl_070078B8),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/ttc/areas/1/geo.inc.c
+1 -1
View File
@@ -22,7 +22,7 @@ const GeoLayout ttc_geo_0003B8[] = {
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, ttc_seg7_dl_0700B1D8),
GEO_DISPLAY_LIST(LAYER_ALPHA, ttc_seg7_dl_0700E878),
GEO_RENDER_OBJ(),
GEO_ASM( 0, geo_enfvx_main),
GEO_ASM( 0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/ttm/areas/1/geo.inc.c
+3 -3
View File
@@ -18,8 +18,8 @@ const GeoLayout ttm_geo_000A70[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, ttm_seg7_dl_0700A120),
GEO_DISPLAY_LIST(LAYER_OPAQUE, ttm_seg7_dl_0700A2E0),
GEO_RENDER_OBJ(),
GEO_ASM( 0, Geo18_802D5D0C),
GEO_ASM( 512, Geo18_802D5B98),
GEO_ASM( 0, geo_painting_update),
GEO_ASM(PAINTING_ID(0, 2), geo_painting_draw),
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x3601, geo_movtex_draw_nocolor),
GEO_ASM(0x3602, geo_movtex_draw_nocolor),
@@ -27,7 +27,7 @@ const GeoLayout ttm_geo_000A70[] = {
GEO_ASM(0x3604, geo_movtex_draw_nocolor),
GEO_ASM(0x3605, geo_movtex_draw_nocolor),
GEO_ASM(0x3601, geo_movtex_draw_water_regions),
GEO_ASM( 0, geo_enfvx_main),
GEO_ASM( 0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/ttm/areas/1/painting.inc.c
+35 -26
View File
@@ -62,8 +62,10 @@ static const Gfx ttm_seg7_painting_dl_07012430[] = {
};
// 0x07012450 - 0x0701296A
static const PaintingData ttm_seg7_painting_points_07012450[] = {
85,
static const PaintingData ttm_seg7_painting_texture_map_bottom_07012450[] = {
85, // num mappings
// Format:
// mesh vtx ID, texture X, texture Y
49, 2016, 889,
53, 2016, 685,
55, 1843, 787,
@@ -150,8 +152,9 @@ static const PaintingData ttm_seg7_painting_points_07012450[] = {
150, 649, 0,
153, -32, 0,
// ttm_seg7_painting_triangles_07012650:
132,
132, // num groups
// Grouped by 5 + one remainder group,
// = 15 vertices per group + a few extra triangles
13, 8, 5,
0, 1, 2,
3, 0, 4,
@@ -288,8 +291,10 @@ static const PaintingData ttm_seg7_painting_points_07012450[] = {
// 0x0701296C - 0x07012E84
static const PaintingData ttm_seg7_painting_points_0701296C[] = {
85,
static const PaintingData ttm_seg7_painting_top_0701296C[] = {
85, // num mappings
// Format:
// mesh vtx ID, texture X, texture Y
0, 2016, 72,
1, 2016, 0,
2, 1843, 0,
@@ -376,8 +381,9 @@ static const PaintingData ttm_seg7_painting_points_0701296C[] = {
152, -32, 685,
153, -32, 992,
// ttm_seg7_painting_triangles_07012B6C:
132,
132, // num groups
// Grouped by 5 + one remainder group,
// = 15 vertices per group + a few extra triangles
10, 7, 13,
0, 1, 2,
3, 0, 2,
@@ -514,9 +520,9 @@ static const PaintingData ttm_seg7_painting_points_0701296C[] = {
// 0x07012E88
static const PaintingData *const ttm_seg7_painting_data_07012E88[] = {
ttm_seg7_painting_points_07012450,
ttm_seg7_painting_points_0701296C,
static const PaintingData *const ttm_seg7_painting_texture_maps_07012E88[] = {
ttm_seg7_painting_texture_map_bottom_07012450,
ttm_seg7_painting_top_0701296C,
};
UNUSED static const u64 ttm_unused_0 = 0x0;
@@ -546,23 +552,26 @@ static const u8 *const ttm_seg7_painting_textures_07012EF8[] = {
// 0x07012F00 (PaintingData)
struct Painting ttm_slide_painting = {
/* id */ 0x0000,
/* Face Count */ 0x02,
/* Ripple Shape */ RIPPLE_SHAPE_WAVE,
/* Image Count */ 0x02,
/* Texture Type */ PAINTING_IMAGE,
/* Floor Status */ 0x00, 0x00, 0x00 /* which of the painting's nearby special floors Mario's on */,
/* Ripple Status */ 0x00,
/* Rotation */ 0.0f, 90.0f,
/* Position */ 3072.0f, 921.6f, -819.2f,
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
1.0f, 0.9608f, 0.9524f,
0.0f, 0.24f, 0.14f,
0.0f, 40.0f, 30.0f,
0.0f,
0.0f, 0.0f,
ttm_seg7_painting_dl_07012E98,
ttm_seg7_painting_data_07012E88,
ttm_seg7_painting_textures_07012EF8,
64, 32,
ttm_seg7_painting_dl_07012430,
RIPPLE_TRIGGER_PROXIMITY, 0xFF, 0x00, 0x00, 0x00,
460.8f,
/* curr passive entry */
/* Ripple Magnitude */ 0.0f, 20.0f, 80.0f,
/* Ripple Decay */ 1.0f, 0.9608f, 0.9524f,
/* Ripple Rate */ 0.0f, 0.24f, 0.14f,
/* Ripple Dispersion */ 0.0f, 40.0f, 30.0f,
/* Curr Ripple Timer */ 0.0f,
/* Curr Ripple x, y */ 0.0f, 0.0f,
/* Normal DList */ ttm_seg7_painting_dl_07012E98,
/* Texture Maps */ ttm_seg7_painting_texture_maps_07012E88,
/* Textures */ ttm_seg7_painting_textures_07012EF8,
/* Texture w, h */ 64, 32,
/* Ripple DList */ ttm_seg7_painting_dl_07012430,
/* Ripple Trigger */ RIPPLE_TRIGGER_PROXIMITY,
/* Alpha */ 0xFF,
/* Mario Below */ 0x00, 0x00, 0x00, /* Whether or not Mario is below the painting */
/* Size */ 460.8f,
};
levels/ttm/areas/2/geo.inc.c
+1 -1
View File
@@ -18,7 +18,7 @@ const GeoLayout ttm_geo_000B5C[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, ttm_seg7_dl_0701D798),
GEO_DISPLAY_LIST(LAYER_OPAQUE, ttm_seg7_dl_0701DBB8),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/ttm/areas/3/geo.inc.c
+1 -1
View File
@@ -19,7 +19,7 @@ const GeoLayout ttm_geo_000BEC[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, ttm_seg7_dl_07024C78),
GEO_DISPLAY_LIST(LAYER_OPAQUE, ttm_seg7_dl_07025F48),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/ttm/areas/4/geo.inc.c
+1 -1
View File
@@ -18,7 +18,7 @@ const GeoLayout ttm_geo_000C84[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, ttm_seg7_dl_0702A1B8),
GEO_DISPLAY_LIST(LAYER_OPAQUE, ttm_seg7_dl_0702A8A0),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/vcutm/areas/1/geo.inc.c
+1 -1
View File
@@ -20,7 +20,7 @@ const GeoLayout vcutm_geo_000208[] = {
GEO_DISPLAY_LIST(LAYER_OPAQUE, vcutm_seg7_dl_070093E8),
GEO_DISPLAY_LIST(LAYER_ALPHA, vcutm_seg7_dl_070080D0),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/wdw/areas/1/geo.inc.c
+1 -1
View File
@@ -23,7 +23,7 @@ const GeoLayout wdw_geo_000658[] = {
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x1101, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM( 0, geo_enfvx_main),
GEO_ASM( 0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/wdw/areas/2/geo.inc.c
+1 -1
View File
@@ -21,7 +21,7 @@ const GeoLayout wdw_geo_000724[] = {
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x1102, geo_movtex_draw_water_regions),
GEO_RENDER_OBJ(),
GEO_ASM( 0, geo_enfvx_main),
GEO_ASM( 0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/wf/areas/1/geo.inc.c
+1 -1
View File
@@ -22,7 +22,7 @@ const GeoLayout wf_geo_000BF8[] = {
GEO_RENDER_OBJ(),
GEO_ASM( 0, geo_movtex_pause_control),
GEO_ASM(0x2401, geo_movtex_draw_water_regions),
GEO_ASM( 0, geo_enfvx_main),
GEO_ASM( 0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
levels/wmotr/areas/1/geo.inc.c
+1 -1
View File
@@ -19,7 +19,7 @@ const GeoLayout wmotr_geo_0001F0[] = {
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wmotr_seg7_dl_0700EFD8),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wmotr_seg7_dl_07010608),
GEO_RENDER_OBJ(),
GEO_ASM(0, geo_enfvx_main),
GEO_ASM(0, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),