Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed rendering of metal Toad's held objects

This commit is contained in:
MysterD 2022-02-16 23:15:59 -08:00
parent 267b1c2542
commit efcf78dee1
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,9 @@ const GeoLayout toad_player_geo_face_and_wings[] = {
const GeoLayout toad_player_geo_right_hand[] = {
GEO_TRANSLATE(LAYER_OPAQUE, 100, 0, 0),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_metal_stop),
GEO_HELD_OBJECT(0x00, 0, 0, 0, geo_switch_mario_hand_grab_pos),
GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_metal_start),
GEO_CLOSE_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_hand),
@ -303,7 +305,9 @@ const GeoLayout toad_player_geo_vanish_face_and_wings[] = {
const GeoLayout toad_player_geo_vanish_right_hand[] = {
GEO_TRANSLATE(LAYER_TRANSPARENT, 100, 0, 0),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_stop),
GEO_HELD_OBJECT(0x00, 0, 0, 0, geo_switch_mario_hand_grab_pos),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_start),
GEO_CLOSE_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_hand),
@ -507,7 +511,9 @@ const GeoLayout toad_player_geo_metal_face_and_wings[] = {
const GeoLayout toad_player_geo_metal_right_hand[] = {
GEO_TRANSLATE(LAYER_OPAQUE, 100, 0, 0),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_metal_stop),
GEO_HELD_OBJECT(0x00, 0, 0, 0, geo_switch_mario_hand_grab_pos),
GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_metal_start),
GEO_CLOSE_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_hand),
@ -633,6 +639,7 @@ const GeoLayout toad_player_geo_metal_body[] = {
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_metal_stop),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
@ -711,7 +718,9 @@ const GeoLayout toad_player_geo_metal_vanish_face_and_wings[] = {
const GeoLayout toad_player_geo_metal_vanish_right_hand[] = {
GEO_TRANSLATE(LAYER_TRANSPARENT, 100, 0, 0),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_stop),
GEO_HELD_OBJECT(0x00, 0, 0, 0, geo_switch_mario_hand_grab_pos),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_start),
GEO_CLOSE_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_hand),
@ -837,6 +846,7 @@ const GeoLayout toad_player_geo_metal_vanish_body[] = {
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_stop),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};

1
actors/toad_player/geo_header.h
View File

@ -1,4 +1,5 @@
extern const Gfx toad_player_metal_start[];
extern const Gfx toad_player_metal_stop[];
extern const Gfx toad_player_dl_face[];
extern const Gfx toad_player_dl_eyes_closed[];