fp: Pull in submodule patches

External/tely

@@ -1 +1 @@
-Subproject commit 96fbfd683769e652a99e9fad5f30553c6b918bf5
+Subproject commit 6fefb31c2f4a44f974d6987fc5942857891ae429

feely_pona.cpp

@@ -2155,7 +2155,7 @@ void FP_Update(TELY_Platform *platform, FP_Game *game, TELY_PlatformInput *input
         }
 
         // NOTE: Mob spawner =======================================================================
-        if (entity->type == FP_EntityType_MobSpawner && 0) {
+        if (entity->type == FP_EntityType_MobSpawner) {
             // NOTE: Flush any spawn entities that are dead
             for (FP_SentinelListLink<FP_GameEntityHandle> *link = nullptr; FP_SentinelList_Iterate<FP_GameEntityHandle>(&entity->spawn_list, &link); ) {
                 FP_GameEntity *spawned_entity = FP_Game_GetEntity(game, link->data);
@@ -2728,7 +2728,7 @@ void FP_Render(FP_Game *game, TELY_Platform *platform, TELY_Renderer *renderer,
                 FP_GameAudio         audio_type;
                 bool                *sound_played;
             } merchants[] = {
-                {play->merchant_terry,         &play->merchant_terry_menu_pos,         g_anim_names.icon_stamina, g_anim_names.merchant_terry_menu,         g_anim_names.club_terry_dark,   Dqn_V2_InitNx2(0.015f, +0.04f), &invent->clubs,    &invent->clubs_base_price,    &invent->health_base_price,      FP_GameAudio_MerchantTerry, &sound_played_flags[0]},
+                {play->merchant_terry,         &play->merchant_terry_menu_pos,         g_anim_names.icon_attack,  g_anim_names.merchant_terry_menu,         g_anim_names.club_terry_dark,   Dqn_V2_InitNx2(0.015f, +0.04f), &invent->clubs,    &invent->clubs_base_price,    &invent->health_base_price,      FP_GameAudio_MerchantTerry, &sound_played_flags[0]},
                 {play->merchant_graveyard,     &play->merchant_graveyard_menu_pos,     g_anim_names.icon_stamina, g_anim_names.merchant_graveyard_menu,     g_anim_names.church_terry_dark, Dqn_V2_InitNx2(0.04f,  -0.15f), &invent->churchs,  &invent->churchs_base_price,  &invent->stamina_base_price,     FP_GameAudio_MerchantGhost, &sound_played_flags[1]},
                 {play->merchant_gym,           &play->merchant_gym_menu_pos,           g_anim_names.icon_health,  g_anim_names.merchant_gym_menu,           g_anim_names.kennel_terry,      Dqn_V2_InitNx2(0,      +0),     &invent->kennels,  &invent->kennels_base_price,  &invent->attack_base_price,      FP_GameAudio_MerchantGym,   &sound_played_flags[2]},
                 {play->merchant_phone_company, &play->merchant_phone_company_menu_pos, g_anim_names.icon_phone,   g_anim_names.merchant_phone_company_menu, g_anim_names.airport_terry,     Dqn_V2_InitNx2(0,      -0.1f),  &invent->airports, &invent->airports_base_price, &invent->mobile_plan_base_price, FP_GameAudio_MerchantPhone, &sound_played_flags[3]},

feely_pona.h

@@ -52,6 +52,7 @@ struct FP_GlobalAnimations
     Dqn_String8 heart                 = DQN_STRING8("heart");
     Dqn_String8 heart_bleed           = DQN_STRING8("heart_bleed");
 
+    Dqn_String8 icon_attack           = DQN_STRING8("icon_attack");
     Dqn_String8 icon_health           = DQN_STRING8("icon_health");
     Dqn_String8 icon_money            = DQN_STRING8("icon_money");
     Dqn_String8 icon_phone            = DQN_STRING8("icon_phone");