MysterD
|
|
@ -65,6 +65,10 @@ PEACH_DIRS := bird peach yoshi
|
|||
BOWSER_DIRS := bowser_flame impact_ring yellow_sphere bowser bomb impact_smoke
|
||||
MARIO_DIRS := mario bubble walk_smoke burn_smoke stomp_smoke water_wave sparkle water_splash white_particle_small sparkle_animation
|
||||
|
||||
# Add Luigi
|
||||
COINS_DIRS += luigi_cap
|
||||
MARIO_DIRS += luigi
|
||||
|
||||
# Actor Files
|
||||
AMP_CHUCKYA_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(AMP_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
|
||||
BOBOMBS_BUBBLE_FILES := $(foreach dir,$(addprefix $(ACTOR_DIR)/,$(KING_BOBOMB_DIRS)),$(patsubst %.png,%.inc.c,$(wildcard $(dir)/*.png)))
|
||||
|
|
|
|||
BIN
actors/luigi/custom_0301DF50.rgba16.png
Normal file
|
After Width: | Height: | Size: 390 B |
BIN
actors/luigi/custom_04002090.ci8.png
Normal file
|
After Width: | Height: | Size: 694 B |
BIN
actors/luigi/custom_04002890.rgba16.png
Normal file
|
After Width: | Height: | Size: 264 B |
BIN
actors/luigi/custom_04003090.rgba16.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
actors/luigi/custom_04003890.rgba16.png
Normal file
|
After Width: | Height: | Size: 912 B |
BIN
actors/luigi/custom_04004090.rgba16.png
Normal file
|
After Width: | Height: | Size: 497 B |
BIN
actors/luigi/custom_luigi_Eyes_Pain.ia8.png
Normal file
|
After Width: | Height: | Size: 401 B |
BIN
actors/luigi_cap/custom_luigi_cap_logo.rgba16.png
Normal file
|
After Width: | Height: | Size: 316 B |
|
|
@ -20,32 +20,32 @@ static const Lights1 luigi_cap_seg3_lights_0301CF38 = gdSPDefLights1(
|
|||
|
||||
// 0x0301CF50
|
||||
ALIGNED8 static const u8 luigi_cap_seg3_texture_0301CF50[] = {
|
||||
#include "actors/luigi_cap/luigi_cap_metal.rgba16.inc.c"
|
||||
#include "actors/mario_cap/mario_cap_metal.rgba16.inc.c"
|
||||
};
|
||||
|
||||
// 0x0301DF50
|
||||
ALIGNED8 static const u8 luigi_cap_seg3_texture_0301DF50[] = {
|
||||
#include "actors/luigi_cap/luigi_cap_logo.rgba16.inc.c"
|
||||
#include "actors/luigi_cap/custom_luigi_cap_logo.rgba16.inc.c"
|
||||
};
|
||||
|
||||
// 0x0301E750
|
||||
ALIGNED8 static const u8 luigi_cap_seg3_texture_0301E750[] = {
|
||||
#include "actors/luigi_cap/luigi_cap_wing.rgba16.inc.c"
|
||||
#include "actors/mario_cap/mario_cap_wing.rgba16.inc.c"
|
||||
};
|
||||
|
||||
// 0x0301F750
|
||||
ALIGNED8 static const u8 luigi_cap_seg3_texture_0301F750[] = {
|
||||
#include "actors/luigi_cap/luigi_cap_wing_tip.rgba16.inc.c"
|
||||
#include "actors/mario_cap/mario_cap_wing_tip.rgba16.inc.c"
|
||||
};
|
||||
|
||||
// 0x03020750
|
||||
ALIGNED8 static const u8 luigi_cap_seg3_texture_03020750[] = {
|
||||
#include "actors/luigi_cap/luigi_cap_metal_wing_unused.rgba16.inc.c"
|
||||
#include "actors/mario_cap/mario_cap_metal_wing_unused.rgba16.inc.c"
|
||||
};
|
||||
|
||||
// 0x03021750
|
||||
ALIGNED8 static const u8 luigi_cap_seg3_texture_03021750[] = {
|
||||
#include "actors/luigi_cap/luigi_cap_metal_wing_tip_unused.rgba16.inc.c"
|
||||
#include "actors/mario_cap/mario_cap_metal_wing_tip_unused.rgba16.inc.c"
|
||||
};
|
||||
|
||||
// 0x03022750
|
||||
|
|
|
|||
|
|
@ -1841,6 +1841,7 @@ s32 execute_mario_action(UNUSED struct Object *o) {
|
|||
#ifndef VERSION_JP
|
||||
func_803205E8(SOUND_MARIO_SNORING3, gMarioState->marioObj->header.gfx.cameraToObject);
|
||||
#endif
|
||||
gMarioState->isSnoring = FALSE;
|
||||
}
|
||||
|
||||
// If Mario is OOB, stop executing actions.
|
||||
|
|
|
|||