mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-12 06:28:09 -05:00
Code Issues Projects Releases Wiki Activity

Update particle enums, add deku/stick bag RGs (#377)

Browse Source
This commit is contained in:
aMannus 2024-12-23 20:23:19 +01:00 committed by GitHub
parent b4bb00a3b1
commit d40344982d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
soh/src/code/z_en_item00.c
View File

@ -1183,19 +1183,22 @@ void EnItem00_Draw(Actor* thisx, PlayState* play) {
} }
} }
#define MINUET_GREEN 0
#define BOLERO_RED 1 typedef enum {
#define SERENADE_AQUA 2 PARTICLE_BRIGHT_GREEN,
#define REQUIEM_AMBER 3 PARTICLE_RED,
#define NOCTURNE_VIOLET 4 PARTICLE_CYAN,
#define PRELUDE_YELLOW 5 PARTICLE_ORANGE,
#define STICK_FOREST_GREEN 6 PARTICLE_VIOLET,
#define NUT_GOLD 7 PARTICLE_YELLOW,
#define DOUBLE_WHITE 8 PARTICLE_GREEN,
#define BOMBCHU_BLUE 9 PARTICLE_GOLD,
#define FAIRY_PINK 10 PARTICLE_WHITE,
#define RED_POTION_RED 11 PARTICLE_DARK_BLUE,
#define BLUE_FIRE_BLUE 12 PARTICLE_PINK,
PARTICLE_BRIGHT_RED,
PARTICLE_BLUE,
} Item00ParticleColors;
void EnItem00_CustomItemsParticles(Actor* Parent, PlayState* play, GetItemEntry giEntry) { void EnItem00_CustomItemsParticles(Actor* Parent, PlayState* play, GetItemEntry giEntry) {
s16 colorIndex; s16 colorIndex;
@ -1203,35 +1206,35 @@ void EnItem00_CustomItemsParticles(Actor* Parent, PlayState* play, GetItemEntry
case MOD_NONE: case MOD_NONE:
switch (giEntry.drawItemId) { switch (giEntry.drawItemId) {
case ITEM_SONG_MINUET: case ITEM_SONG_MINUET:
colorIndex = MINUET_GREEN; colorIndex = PARTICLE_BRIGHT_GREEN;
break; break;
case ITEM_SONG_BOLERO: case ITEM_SONG_BOLERO:
colorIndex = BOLERO_RED; colorIndex = PARTICLE_RED;
break; break;
case ITEM_SONG_SERENADE: case ITEM_SONG_SERENADE:
colorIndex = SERENADE_AQUA; colorIndex = PARTICLE_CYAN;
break; break;
case ITEM_SONG_REQUIEM: case ITEM_SONG_REQUIEM:
colorIndex = REQUIEM_AMBER; colorIndex = PARTICLE_ORANGE;
break; break;
case ITEM_SONG_NOCTURNE: case ITEM_SONG_NOCTURNE:
colorIndex = NOCTURNE_VIOLET; colorIndex = PARTICLE_VIOLET;
break; break;
case ITEM_SONG_PRELUDE: case ITEM_SONG_PRELUDE:
colorIndex = PRELUDE_YELLOW; colorIndex = PARTICLE_YELLOW;
break; break;
case ITEM_STICK_UPGRADE_20: case ITEM_STICK_UPGRADE_20:
case ITEM_STICK_UPGRADE_30: case ITEM_STICK_UPGRADE_30:
colorIndex = STICK_FOREST_GREEN; colorIndex = PARTICLE_GREEN;
break; break;
case ITEM_NUT_UPGRADE_30: case ITEM_NUT_UPGRADE_30:
case ITEM_NUT_UPGRADE_40: case ITEM_NUT_UPGRADE_40:
colorIndex = NUT_GOLD; colorIndex = PARTICLE_GOLD;
break; break;
case ITEM_BOTTLE: case ITEM_BOTTLE:
case ITEM_MILK_BOTTLE: case ITEM_MILK_BOTTLE:
case ITEM_LETTER_RUTO: case ITEM_LETTER_RUTO:
colorIndex = DOUBLE_WHITE; colorIndex = PARTICLE_WHITE;
break; break;
default: default:
return; return;
@ -1245,32 +1248,38 @@ void EnItem00_CustomItemsParticles(Actor* Parent, PlayState* play, GetItemEntry
case RG_BOTTLE_WITH_GREEN_POTION: case RG_BOTTLE_WITH_GREEN_POTION:
case RG_BOTTLE_WITH_BUGS: case RG_BOTTLE_WITH_BUGS:
case RG_GREG_RUPEE: case RG_GREG_RUPEE:
colorIndex = MINUET_GREEN; colorIndex = PARTICLE_BRIGHT_GREEN;
break; break;
case RG_BOTTLE_WITH_FISH: case RG_BOTTLE_WITH_FISH:
colorIndex = SERENADE_AQUA; colorIndex = PARTICLE_CYAN;
break; break;
case RG_BOTTLE_WITH_POE: case RG_BOTTLE_WITH_POE:
colorIndex = NOCTURNE_VIOLET; colorIndex = PARTICLE_VIOLET;
break; break;
case RG_BOTTLE_WITH_BIG_POE: case RG_BOTTLE_WITH_BIG_POE:
colorIndex = PRELUDE_YELLOW; colorIndex = PARTICLE_YELLOW;
break;
case RG_DEKU_STICK_BAG:
colorIndex = PARTICLE_GREEN;
break;
case RG_DEKU_NUT_BAG:
colorIndex = PARTICLE_GOLD;
break; break;
case RG_DOUBLE_DEFENSE: case RG_DOUBLE_DEFENSE:
colorIndex = DOUBLE_WHITE; colorIndex = PARTICLE_WHITE;
break; break;
case RG_PROGRESSIVE_BOMBCHUS: case RG_PROGRESSIVE_BOMBCHUS:
colorIndex = BOMBCHU_BLUE; colorIndex = PARTICLE_DARK_BLUE;
break; break;
case RG_BOTTLE_WITH_FAIRY: case RG_BOTTLE_WITH_FAIRY:
colorIndex = FAIRY_PINK; colorIndex = PARTICLE_PINK;
break; break;
case RG_BOTTLE_WITH_RED_POTION: case RG_BOTTLE_WITH_RED_POTION:
colorIndex = RED_POTION_RED; colorIndex = PARTICLE_BRIGHT_RED;
break; break;
case RG_BOTTLE_WITH_BLUE_FIRE: case RG_BOTTLE_WITH_BLUE_FIRE:
case RG_BOTTLE_WITH_BLUE_POTION: case RG_BOTTLE_WITH_BLUE_POTION:
colorIndex = BLUE_FIRE_BLUE; colorIndex = PARTICLE_BLUE;
break; break;
default: default:
return; return;
@ -1282,7 +1291,7 @@ void EnItem00_CustomItemsParticles(Actor* Parent, PlayState* play, GetItemEntry
// Color of the circle for the particles // Color of the circle for the particles
static Color_RGBA8 mainColors[13][3] = { static Color_RGBA8 mainColors[13][3] = {
{ 34, 255, 76 }, // Minuet, Bean Pack, and Magic Upgrades, Bottle with Green Potion, Bottle with Bugs, and Greg { 34, 255, 76 }, // Minuet, Bean Pack, Magic Upgrades, Bottle with Green Potion, Bottle with Bugs, and Greg
{ 177, 35, 35 }, // Bolero { 177, 35, 35 }, // Bolero
{ 115, 251, 253 }, // Serenade and Bottle with Fish { 115, 251, 253 }, // Serenade and Bottle with Fish
{ 177, 122, 35 }, // Requiem { 177, 122, 35 }, // Requiem