Ice trap text

Author: biosp4rk

TODO.md

@@ -1,7 +1,7 @@
 ## Randomizer
 - ~~Title screen version info~~
 - Draw hash on file select
-- Add pointers to data needed by patcher
+- ~~Add pointers to data needed by patcher~~
   - ~~Palettes~~
   - ~~Room data~~
   - ~~Door data (DLR)~~
@@ -36,6 +36,7 @@
   - Replace Chozo statue graphics
 - ~~Fix ending percent calculation~~
 - Include bug fixes for bugs that don't help speedrunners
+- Increase enemy drop rates for power bombs
 
 ## Room Changes
 - Remove duplicate rooms near Ruins Test?

include/constants/text.h

@@ -60,6 +60,7 @@ MAKE_ENUM(u8, MessageId) {
     MESSAGE_UNKNOWN_ITEM,
     MESSAGE_ZIPLINES,
     MESSAGE_INFANT_METROID,
+    MESSAGE_ICE_TRAP,
 #endif // RANDOMIZER
 
     MESSAGE_COUNT,

src/data/text_data.c

@@ -380,6 +380,7 @@ const u16 sEnglishText_Message_EasySleepPrompt[] = INCTEXT("{GAP(101)}Yes\n{GAP(
 const u16 sEnglishText_Message_UnknownItem[] = INCTEXT("{GAP(74)}{COLOR(5)}Unknown Item\n{GAP(110)}");
 const u16 sEnglishText_Message_Ziplines[] = INCTEXT("{GAP(74)}{COLOR(5)}Ziplines Activated\n{GAP(110)}");
 const u16 sEnglishText_Message_InfantMetroid[] = INCTEXT("{GAP(74)}{COLOR(5)}Infant Metroid\n{GAP(110)}");
+const u16 sEnglishText_Message_IceTrap[] = INCTEXT("{GAP(74)}You are a FOOL!\n{GAP(110)}");
 #endif // RANDOMIZER
 #endif // REGION_EU
 
@@ -427,6 +428,7 @@ static const u16* sEnglishTextPointers_Message[MESSAGE_COUNT] = {
     [MESSAGE_UNKNOWN_ITEM] = sEnglishText_Message_UnknownItem,
     [MESSAGE_ZIPLINES] = sEnglishText_Message_Ziplines,
     [MESSAGE_INFANT_METROID] = sEnglishText_Message_InfantMetroid,
+    [MESSAGE_ICE_TRAP] = sEnglishText_Message_IceTrap,
 #endif // RANDOMIZER
 };
 

src/randomizer.c

@@ -1,16 +1,21 @@
 #include "randomizer.h"
 
+#include "audio_wrappers.h"
 #include "event.h"
 #include "in_game_cutscene.h"
+#include "particle.h"
 #include "projectile_util.h"
+#include "samus.h"
 #include "sprite.h"
 
 #include "data/randomizer_data.h"
 #include "data/text_data.h"
 
+#include "constants/audio.h"
 #include "constants/event.h"
 #include "constants/in_game_cutscene.h"
 #include "constants/menus/pause_screen.h"
+#include "constants/particle.h"
 #include "constants/randomizer.h"
 #include "constants/samus.h"
 #include "constants/sprite.h"
@@ -86,7 +91,8 @@ const struct MinorLocation* RandoGetMinorLocation(Area area, u8 room, u8 blockX,
 }
 
 /**
- * @brief TODO
+ * @brief Handles collecting an item, including updating equipment, spawning
+ * a message banner, and updating events
  */
 static void RandoCollectItem(RandoItemType item, u8 hintedBy)
 {
@@ -236,6 +242,17 @@ static void RandoCollectItem(RandoItemType item, u8 hintedBy)
             message = MESSAGE_ZIPLINES;
             EventFunction(EVENT_ACTION_SETTING, EVENT_ZIPLINES_ACTIVATED);
             break;
+        
+        case RIT_ICE_TRAP:
+            message = MESSAGE_ICE_TRAP;
+            // Play freeze sound
+            SoundPlayNotAlreadyPlaying(SOUND_FREEZING_SPRITE);
+            // Add charged ice beam effect
+            ParticleSet(gSamusData.yPosition + (gSamusPhysics.hitboxTop / 2),
+                gSamusData.xPosition, PE_FREEZING_SPRITE_WITH_CHARGED_ICE);
+            // TODO: Freeze Samus
+            SamusSetPose(SPOSE_KNOCKBACK_REQUEST);
+            break;
     }
 
     // Spawn the message banner

src/sprites_ai/message_banner.c

@@ -202,6 +202,7 @@ static void MessageBannerPopUp(void)
                 case MESSAGE_FULLY_POWERED_SUIT:
                 case MESSAGE_ZIPLINES:
                 case MESSAGE_INFANT_METROID:
+                case MESSAGE_ICE_TRAP:
                     isItem = TRUE;
                     break;
             }
@@ -218,6 +219,7 @@ static void MessageBannerPopUp(void)
                         case MESSAGE_MISSILE_TANK_ACQUIRED:
                         case MESSAGE_SUPER_MISSILE_TANK_ACQUIRED:
                         case MESSAGE_POWER_BOMB_TANK_ACQUIRED:
+                        case MESSAGE_ICE_TRAP:
                             gCurrentRandoItem.jingle = RIJ_MINOR;
                             break;