Merge pull request #2891 from 2dos/who-you-gonna-call-guardbusters-i-aint-afraid-of-no-guard

Whoops i forgot to update the drop table

Author: theballaam96

base-hack/Build/item_dictionaries.py

@@ -263,6 +263,10 @@ def __init__(
     EnemyDropDef(0xB6, 0x2F, Song.MelonSliceDrop, 1),  # Klobber
     EnemyDropDef(0xAF, 0x2F, Song.MelonSliceDrop, 1),  # Kaboom
     EnemyDropDef(0x103, 0x79, Song.Silence, 1),  # Guard
+    EnemyDropDef(CustomActors.GuardDisableA, 0x79, Song.Silence, 1),  # Guard
+    EnemyDropDef(CustomActors.GuardDisableZ, 0x79, Song.Silence, 1),  # Guard
+    EnemyDropDef(CustomActors.GuardTag, 0x79, Song.Silence, 1),  # Guard
+    EnemyDropDef(CustomActors.GuardGetOut, 0x79, Song.Silence, 1),  # Guard
     EnemyDropDef(276, 0x34, Song.Silence, 2),  # Spiderling
     EnemyDropDef(273, 0x34, Song.Silence, 1),  # Fireball with Glasses
     EnemyDropDef(230, 0x2F, Song.MelonSliceDrop, 1),  # Ruler

base-hack/include/item_data.h

@@ -60,7 +60,7 @@ typedef enum new_custom_actors {
 	/* 0x187 */ NEWACTOR_GUARDTAG = 0x187, 
 	/* ----- */ NEWACTOR_TERMINATOR, 
 } new_custom_actors;
-#define DROP_COUNT 36
+#define DROP_COUNT 40
 extern GBDictItem new_flag_mapping[122];
 #define FILE_INFO_SIZE 0x8e4
 #define GB_DICTIONARY_COUNT 122

base-hack/src/lib_items.c

@@ -217,6 +217,10 @@ drop_item drops[] = {
 	{.source_object=182, .dropped_object=47, .drop_music=47, .drop_count=1},
 	{.source_object=175, .dropped_object=47, .drop_music=47, .drop_count=1},
 	{.source_object=259, .dropped_object=121, .drop_music=0, .drop_count=1},
+	{.source_object=388, .dropped_object=121, .drop_music=0, .drop_count=1},
+	{.source_object=389, .dropped_object=121, .drop_music=0, .drop_count=1},
+	{.source_object=391, .dropped_object=121, .drop_music=0, .drop_count=1},
+	{.source_object=390, .dropped_object=121, .drop_music=0, .drop_count=1},
 	{.source_object=276, .dropped_object=52, .drop_music=0, .drop_count=2},
 	{.source_object=273, .dropped_object=52, .drop_music=0, .drop_count=1},
 	{.source_object=230, .dropped_object=47, .drop_music=47, .drop_count=1},