Merge branch 'master' into pokenav-decomp-again

1 files changed, 166 insertions, 166 deletions

diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc
index 2b0083175..045fbb5a7 100644
--- a/data/scripts/item_ball_scripts.inc
+++ b/data/scripts/item_ball_scripts.inc
@@ -1,659 +1,659 @@
-Route102_EventScript_290CD8:: @ 8290CD8
+Route102_EventScript_ItemPotion:: @ 8290CD8
 	giveitem_std ITEM_POTION, 1, 1
 	end
 
-Route103_EventScript_290CE5:: @ 8290CE5
+Route103_EventScript_ItemGuardSpec:: @ 8290CE5
 	giveitem_std ITEM_GUARD_SPEC, 1, 1
 	end
 
-Route103_EventScript_290CF2:: @ 8290CF2
+Route103_EventScript_ItemPPUp:: @ 8290CF2
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-Route104_EventScript_290CFF:: @ 8290CFF
+Route104_EventScript_ItemPPUp:: @ 8290CFF
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-Route104_EventScript_290D0C:: @ 8290D0C
+Route104_EventScript_ItemPokeBall:: @ 8290D0C
 	giveitem_std ITEM_POKE_BALL, 1, 1
 	end
 
-Route104_EventScript_290D19:: @ 8290D19
+Route104_EventScript_ItemXAccuracy:: @ 8290D19
 	giveitem_std ITEM_X_ACCURACY, 1, 1
 	end
 
-Route104_EventScript_290D26:: @ 8290D26
+Route104_EventScript_ItemPotion:: @ 8290D26
 	giveitem_std ITEM_POTION, 1, 1
 	end
 
-Route105_EventScript_290D33:: @ 8290D33
+Route105_EventScript_ItemIron:: @ 8290D33
 	giveitem_std ITEM_IRON, 1, 1
 	end
 
-Route106_EventScript_290D40:: @ 8290D40
+Route106_EventScript_ItemProtein:: @ 8290D40
 	giveitem_std ITEM_PROTEIN, 1, 1
 	end
 
-Route108_EventScript_290D4D:: @ 8290D4D
+Route108_EventScript_ItemStarPiece:: @ 8290D4D
 	giveitem_std ITEM_STAR_PIECE, 1, 1
 	end
 
-Route109_EventScript_290D5A:: @ 8290D5A
+Route109_EventScript_ItemPPUp:: @ 8290D5A
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-Route109_EventScript_290D67:: @ 8290D67
+Route109_EventScript_ItemPotion:: @ 8290D67
 	giveitem_std ITEM_POTION, 1, 1
 	end
 
-Route110_EventScript_290D74:: @ 8290D74
+Route110_EventScript_ItemRareCandy:: @ 8290D74
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-Route110_EventScript_290D81:: @ 8290D81
+Route110_EventScript_ItemDireHit:: @ 8290D81
 	giveitem_std ITEM_DIRE_HIT, 1, 1
 	end
 
-Route110_EventScript_290D8E:: @ 8290D8E
+Route110_EventScript_ItemElixir:: @ 8290D8E
 	giveitem_std ITEM_ELIXIR, 1, 1
 	end
 
-Route111_EventScript_290D9B:: @ 8290D9B
+Route111_EventScript_ItemTM37:: @ 8290D9B
 	giveitem_std ITEM_TM37, 1, 1
 	end
 
-Route111_EventScript_290DA8:: @ 8290DA8
+Route111_EventScript_ItemStardust:: @ 8290DA8
 	giveitem_std ITEM_STARDUST, 1, 1
 	end
 
-Route111_EventScript_290DB5:: @ 8290DB5
+Route111_EventScript_ItemHPUp:: @ 8290DB5
 	giveitem_std ITEM_HP_UP, 1, 1
 	end
 
-Route111_EventScript_290DC2:: @ 8290DC2
+Route111_EventScript_ItemElixir:: @ 8290DC2
 	giveitem_std ITEM_ELIXIR, 1, 1
 	end
 
-Route112_EventScript_290DCF:: @ 8290DCF
+Route112_EventScript_ItemNugget:: @ 8290DCF
 	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
-Route113_EventScript_290DDC:: @ 8290DDC
+Route113_EventScript_ItemMaxEther:: @ 8290DDC
 	giveitem_std ITEM_MAX_ETHER, 1, 1
 	end
 
-Route113_EventScript_290DE9:: @ 8290DE9
+Route113_EventScript_ItemSuperRepel:: @ 8290DE9
 	giveitem_std ITEM_SUPER_REPEL, 1, 1
 	end
 
-Route113_EventScript_290DF6:: @ 8290DF6
+Route113_EventScript_ItemHyperPotion:: @ 8290DF6
 	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
-Route114_EventScript_290E03:: @ 8290E03
+Route114_EventScript_ItemRareCandy:: @ 8290E03
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-Route114_EventScript_290E10:: @ 8290E10
+Route114_EventScript_ItemProtein:: @ 8290E10
 	giveitem_std ITEM_PROTEIN, 1, 1
 	end
 
-Route114_EventScript_290E1D:: @ 8290E1D
+Route114_EventScript_ItemEnergyPowder:: @ 8290E1D
 	giveitem_std ITEM_ENERGY_POWDER, 1, 1
 	end
 
-Route115_EventScript_290E2A:: @ 8290E2A
+Route115_EventScript_ItemSuperPotion:: @ 8290E2A
 	giveitem_std ITEM_SUPER_POTION, 1, 1
 	end
 
-Route115_EventScript_290E37:: @ 8290E37
+Route115_EventScript_ItemTM01:: @ 8290E37
 	giveitem_std ITEM_TM01, 1, 1
 	end
 
-Route115_EventScript_290E44:: @ 8290E44
+Route115_EventScript_ItemIron:: @ 8290E44
 	giveitem_std ITEM_IRON, 1, 1
 	end
 
-Route115_EventScript_290E51:: @ 8290E51
+Route115_EventScript_ItemGreatBall:: @ 8290E51
 	giveitem_std ITEM_GREAT_BALL, 1, 1
 	end
 
-Route115_EventScript_290E5E:: @ 8290E5E
+Route115_EventScript_ItemHealPowder:: @ 8290E5E
 	giveitem_std ITEM_HEAL_POWDER, 1, 1
 	end
 
-Route115_EventScript_290E6B:: @ 8290E6B
+Route115_EventScript_ItemPPUp:: @ 8290E6B
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-Route116_EventScript_290E78:: @ 8290E78
+Route116_EventScript_ItemXSpecial:: @ 8290E78
 	giveitem_std ITEM_X_SPECIAL, 1, 1
 	end
 
-Route116_EventScript_290E85:: @ 8290E85
+Route116_EventScript_ItemEther:: @ 8290E85
 	giveitem_std ITEM_ETHER, 1, 1
 	end
 
-Route116_EventScript_290E92:: @ 8290E92
+Route116_EventScript_ItemRepel:: @ 8290E92
 	giveitem_std ITEM_REPEL, 1, 1
 	end
 
-Route116_EventScript_290E9F:: @ 8290E9F
+Route116_EventScript_ItemHPUp:: @ 8290E9F
 	giveitem_std ITEM_HP_UP, 1, 1
 	end
 
-Route116_EventScript_290EAC:: @ 8290EAC
+Route116_EventScript_ItemPotion:: @ 8290EAC
 	giveitem_std ITEM_POTION, 1, 1
 	end
 
-Route117_EventScript_290EB9:: @ 8290EB9
+Route117_EventScript_ItemGreatBall:: @ 8290EB9
 	giveitem_std ITEM_GREAT_BALL, 1, 1
 	end
 
-Route117_EventScript_290EC6:: @ 8290EC6
+Route117_EventScript_ItemRevive:: @ 8290EC6
 	giveitem_std ITEM_REVIVE, 1, 1
 	end
 
-Route118_EventScript_290ED3:: @ 8290ED3
+Route118_EventScript_ItemHyperPotion:: @ 8290ED3
 	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
-Route119_EventScript_290EE0:: @ 8290EE0
+Route119_EventScript_ItemSuperRepel:: @ 8290EE0
 	giveitem_std ITEM_SUPER_REPEL, 1, 1
 	end
 
-Route119_EventScript_290EED:: @ 8290EED
+Route119_EventScript_ItemZinc:: @ 8290EED
 	giveitem_std ITEM_ZINC, 1, 1
 	end
 
-Route119_EventScript_290EFA:: @ 8290EFA
+Route119_EventScript_ItemElixir:: @ 8290EFA
 	giveitem_std ITEM_ELIXIR, 1, 1
 	end
 
-Route119_EventScript_290F07:: @ 8290F07
+Route119_EventScript_ItemLeafStone:: @ 8290F07
 	giveitem_std ITEM_LEAF_STONE, 1, 1
 	end
 
-Route119_EventScript_290F14:: @ 8290F14
+Route119_EventScript_ItemRareCandy:: @ 8290F14
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-Route119_EventScript_290F21:: @ 8290F21
+Route119_EventScript_ItemHyperPotion:: @ 8290F21
 	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
-Route119_EventScript_290F2E:: @ 8290F2E
+Route119_EventScript_ItemHyperPotion2:: @ 8290F2E
 	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
-Route119_EventScript_290F3B:: @ 8290F3B
+Route119_EventScript_ItemElixir2:: @ 8290F3B
 	giveitem_std ITEM_ELIXIR, 1, 1
 	end
 
-Route120_EventScript_290F48:: @ 8290F48
+Route120_EventScript_ItemNugget:: @ 8290F48
 	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
-Route120_EventScript_290F55:: @ 8290F55
+Route120_EventScript_ItemFullHeal:: @ 8290F55
 	giveitem_std ITEM_FULL_HEAL, 1, 1
 	end
 
-Route120_EventScript_290F62:: @ 8290F62
+Route120_EventScript_ItemHyperPotion:: @ 8290F62
 	giveitem_std ITEM_HYPER_POTION, 1, 1
 	end
 
-Route120_EventScript_290F6F:: @ 8290F6F
+Route120_EventScript_ItemNestBall:: @ 8290F6F
 	giveitem_std ITEM_NEST_BALL, 1, 1
 	end
 
-Route120_EventScript_290F7C:: @ 8290F7C
+Route120_EventScript_ItemRevive:: @ 8290F7C
 	giveitem_std ITEM_REVIVE, 1, 1
 	end
 
-Route121_EventScript_290F89:: @ 8290F89
+Route121_EventScript_ItemCarbos:: @ 8290F89
 	giveitem_std ITEM_CARBOS, 1, 1
 	end
 
-Route121_EventScript_290F96:: @ 8290F96
+Route121_EventScript_ItemRevive:: @ 8290F96
 	giveitem_std ITEM_REVIVE, 1, 1
 	end
 
-Route121_EventScript_290FA3:: @ 8290FA3
+Route121_EventScript_ItemZinc:: @ 8290FA3
 	giveitem_std ITEM_ZINC, 1, 1
 	end
 
-Route123_EventScript_290FB0:: @ 8290FB0
+Route123_EventScript_ItemCalcium:: @ 8290FB0
 	giveitem_std ITEM_CALCIUM, 1, 1
 	end
 
-Route123_EventScript_290FBD:: @ 8290FBD
+Route123_EventScript_ItemUltraBall:: @ 8290FBD
 	giveitem_std ITEM_ULTRA_BALL, 1, 1
 	end
 
-Route123_EventScript_290FCA:: @ 8290FCA
+Route123_EventScript_ItemElixir:: @ 8290FCA
 	giveitem_std ITEM_ELIXIR, 1, 1
 	end
 
-Route123_EventScript_290FD7:: @ 8290FD7
+Route123_EventScript_ItemPPUp:: @ 8290FD7
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-Route123_EventScript_290FE4:: @ 8290FE4
+Route123_EventScript_ItemRevivalHerb:: @ 8290FE4
 	giveitem_std ITEM_REVIVAL_HERB, 1, 1
 	end
 
-Route124_EventScript_290FF1:: @ 8290FF1
+Route124_EventScript_ItemRedShard:: @ 8290FF1
 	giveitem_std ITEM_RED_SHARD, 1, 1
 	end
 
-Route124_EventScript_290FFE:: @ 8290FFE
+Route124_EventScript_ItemBlueShard:: @ 8290FFE
 	giveitem_std ITEM_BLUE_SHARD, 1, 1
 	end
 
-Route124_EventScript_29100B:: @ 829100B
+Route124_EventScript_ItemYellowShard:: @ 829100B
 	giveitem_std ITEM_YELLOW_SHARD, 1, 1
 	end
 
-Route125_EventScript_291018:: @ 8291018
+Route125_EventScript_ItemBigPearl:: @ 8291018
 	giveitem_std ITEM_BIG_PEARL, 1, 1
 	end
 
-Route126_EventScript_291025:: @ 8291025
+Route126_EventScript_ItemGreenShard:: @ 8291025
 	giveitem_std ITEM_GREEN_SHARD, 1, 1
 	end
 
-Route127_EventScript_291032:: @ 8291032
+Route127_EventScript_ItemZinc:: @ 8291032
 	giveitem_std ITEM_ZINC, 1, 1
 	end
 
-Route127_EventScript_29103F:: @ 829103F
+Route127_EventScript_ItemCarbos:: @ 829103F
 	giveitem_std ITEM_CARBOS, 1, 1
 	end
 
-Route127_EventScript_29104C:: @ 829104C
+Route127_EventScript_ItemRareCandy:: @ 829104C
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-Route132_EventScript_291059:: @ 8291059
+Route132_EventScript_ItemRareCandy:: @ 8291059
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-Route132_EventScript_291066:: @ 8291066
+Route132_EventScript_ItemProtein:: @ 8291066
 	giveitem_std ITEM_PROTEIN, 1, 1
 	end
 
-Route133_EventScript_291073:: @ 8291073
+Route133_EventScript_ItemBigPearl:: @ 8291073
 	giveitem_std ITEM_BIG_PEARL, 1, 1
 	end
 
-Route133_EventScript_291080:: @ 8291080
+Route133_EventScript_ItemStarPiece:: @ 8291080
 	giveitem_std ITEM_STAR_PIECE, 1, 1
 	end
 
-Route133_EventScript_29108D:: @ 829108D
+Route133_EventScript_ItemMaxRevive:: @ 829108D
 	giveitem_std ITEM_MAX_REVIVE, 1, 1
 	end
 
-Route134_EventScript_29109A:: @ 829109A
+Route134_EventScript_ItemCarbos:: @ 829109A
 	giveitem_std ITEM_CARBOS, 1, 1
 	end
 
-Route134_EventScript_2910A7:: @ 82910A7
+Route134_EventScript_ItemStarPiece:: @ 82910A7
 	giveitem_std ITEM_STAR_PIECE, 1, 1
 	end
 
-PetalburgCity_EventScript_2910B4:: @ 82910B4
+PetalburgCity_EventScript_ItemMaxRevive:: @ 82910B4
 	giveitem_std ITEM_MAX_REVIVE, 1, 1
 	end
 
-PetalburgCity_EventScript_2910C1:: @ 82910C1
+PetalburgCity_EventScript_ItemEther:: @ 82910C1
 	giveitem_std ITEM_ETHER, 1, 1
 	end
 
-MauvilleCity_EventScript_2910CE:: @ 82910CE
+MauvilleCity_EventScript_ItemXSpeed:: @ 82910CE
 	giveitem_std ITEM_X_SPEED, 1, 1
 	end
 
-RustboroCity_EventScript_2910DB:: @ 82910DB
+RustboroCity_EventScript_ItemXDefend:: @ 82910DB
 	giveitem_std ITEM_X_DEFEND, 1, 1
 	end
 
-LilycoveCity_EventScript_2910E8:: @ 82910E8
+LilycoveCity_EventScript_ItemMaxRepel:: @ 82910E8
 	giveitem_std ITEM_MAX_REPEL, 1, 1
 	end
 
-MossdeepCity_EventScript_2910F5:: @ 82910F5
+MossdeepCity_EventScript_ItemNetBall:: @ 82910F5
 	giveitem_std ITEM_NET_BALL, 1, 1
 	end
 
-PetalburgWoods_EventScript_291102:: @ 8291102
+PetalburgWoods_EventScript_ItemXAttack:: @ 8291102
 	giveitem_std ITEM_X_ATTACK, 1, 1
 	end
 
-PetalburgWoods_EventScript_29110F:: @ 829110F
+PetalburgWoods_EventScript_ItemGreatBall:: @ 829110F
 	giveitem_std ITEM_GREAT_BALL, 1, 1
 	end
 
-PetalburgWoods_EventScript_29111C:: @ 829111C
+PetalburgWoods_EventScript_ItemEther:: @ 829111C
 	giveitem_std ITEM_ETHER, 1, 1
 	end
 
-PetalburgWoods_EventScript_291129:: @ 8291129
+PetalburgWoods_EventScript_ItemParalyzeHeal:: @ 8291129
 	giveitem_std ITEM_PARALYZE_HEAL, 1, 1
 	end
 
-RusturfTunnel_EventScript_291136:: @ 8291136
+RusturfTunnel_EventScript_ItemPokeBall:: @ 8291136
 	giveitem_std ITEM_POKE_BALL, 1, 1
 	end
 
-RusturfTunnel_EventScript_291143:: @ 8291143
+RusturfTunnel_EventScript_ItemMaxEther:: @ 8291143
 	giveitem_std ITEM_MAX_ETHER, 1, 1
 	end
 
-GraniteCave_1F_EventScript_291150:: @ 8291150
+GraniteCave_1F_EventScript_ItemEscapeRope:: @ 8291150
 	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
 	end
 
-GraniteCave_B1F_EventScript_29115D:: @ 829115D
+GraniteCave_B1F_EventScript_ItemPokeBall:: @ 829115D
 	giveitem_std ITEM_POKE_BALL, 1, 1
 	end
 
-GraniteCave_B2F_EventScript_29116A:: @ 829116A
+GraniteCave_B2F_EventScript_ItemRepel:: @ 829116A
 	giveitem_std ITEM_REPEL, 1, 1
 	end
 
-GraniteCave_B2F_EventScript_291177:: @ 8291177
+GraniteCave_B2F_EventScript_ItemRareCandy:: @ 8291177
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-JaggedPass_EventScript_291184:: @ 8291184
+JaggedPass_EventScript_ItemBurnHeal:: @ 8291184
 	giveitem_std ITEM_BURN_HEAL, 1, 1
 	end
 
-FieryPath_EventScript_291191:: @ 8291191
+FieryPath_EventScript_ItemFireStone:: @ 8291191
 	giveitem_std ITEM_FIRE_STONE, 1, 1
 	end
 
-FieryPath_EventScript_29119E:: @ 829119E
+FieryPath_EventScript_ItemTM06:: @ 829119E
 	giveitem_std ITEM_TM06, 1, 1
 	end
 
-MeteorFalls_1F_1R_EventScript_2911AB:: @ 82911AB
+MeteorFalls_1F_1R_EventScript_ItemTM23:: @ 82911AB
 	giveitem_std ITEM_TM23, 1, 1
 	end
 
-MeteorFalls_1F_1R_EventScript_2911B8:: @ 82911B8
+MeteorFalls_1F_1R_EventScript_ItemFullHeal:: @ 82911B8
 	giveitem_std ITEM_FULL_HEAL, 1, 1
 	end
 
-MeteorFalls_1F_1R_EventScript_2911C5:: @ 82911C5
+MeteorFalls_1F_1R_EventScript_ItemMoonStone:: @ 82911C5
 	giveitem_std ITEM_MOON_STONE, 1, 1
 	end
 
-MeteorFalls_1F_1R_EventScript_2911D2:: @ 82911D2
+MeteorFalls_1F_1R_EventScript_ItemPPUP:: @ 82911D2
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-MeteorFalls_B1F_2R_EventScript_2911DF:: @ 82911DF
+MeteorFalls_B1F_2R_EventScript_ItemTM02:: @ 82911DF
 	giveitem_std ITEM_TM02, 1, 1
 	end
 
-NewMauville_Inside_EventScript_2911EC:: @ 82911EC
+NewMauville_Inside_EventScript_ItemUltraRope:: @ 82911EC
 	giveitem_std ITEM_ULTRA_BALL, 1, 1
 	end
 
-NewMauville_Inside_EventScript_2911F9:: @ 82911F9
+NewMauville_Inside_EventScript_ItemEscapeRope:: @ 82911F9
 	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
 	end
 
-NewMauville_Inside_EventScript_291206:: @ 8291206
+NewMauville_Inside_EventScript_ItemThunderStone:: @ 8291206
 	giveitem_std ITEM_THUNDER_STONE, 1, 1
 	end
 
-NewMauville_Inside_EventScript_291213:: @ 8291213
+NewMauville_Inside_EventScript_ItemFullHeal:: @ 8291213
 	giveitem_std ITEM_FULL_HEAL, 1, 1
 	end
 
-NewMauville_Inside_EventScript_291220:: @ 8291220
+NewMauville_Inside_EventScript_ItemParalyzeHeal:: @ 8291220
 	giveitem_std ITEM_PARALYZE_HEAL, 1, 1
 	end
 
-AbandonedShip_Rooms_1F_EventScript_29122D:: @ 829122D
+AbandonedShip_Rooms_1F_EventScript_ItemHarborMail:: @ 829122D
 	giveitem_std ITEM_HARBOR_MAIL, 1, 1
 	end
 
-AbandonedShip_Rooms_B1F_EventScript_29123A:: @ 829123A
+AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope:: @ 829123A
 	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
 	end
 
-AbandonedShip_Rooms2_B1F_EventScript_291247:: @ 8291247
+AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall:: @ 8291247
 	giveitem_std ITEM_DIVE_BALL, 1, 1
 	end
 
-AbandonedShip_Room_B1F_EventScript_291254:: @ 8291254
+AbandonedShip_Room_B1F_EventScript_ItemTM13:: @ 8291254
 	giveitem_std ITEM_TM13, 1, 1
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_291261:: @ 8291261
+AbandonedShip_Rooms2_1F_EventScript_ItemRevive:: @ 8291261
 	giveitem_std ITEM_REVIVE, 1, 1
 	end
 
-AbandonedShip_CaptainsOffice_EventScript_29126E:: @ 829126E
+AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey:: @ 829126E
 	giveitem_std ITEM_STORAGE_KEY, 1, 1
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_29127B:: @ 829127B
+AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall:: @ 829127B
 	giveitem_std ITEM_LUXURY_BALL, 1, 1
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_291288:: @ 8291288
+AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner:: @ 8291288
 	giveitem_std ITEM_SCANNER, 1, 1
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_291295:: @ 8291295
+AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone:: @ 8291295
 	giveitem_std ITEM_WATER_STONE, 1, 1
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_2912A2:: @ 82912A2
+AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18:: @ 82912A2
 	giveitem_std ITEM_TM18, 1, 1
 	end
 
-ScorchedSlab_EventScript_2912AF:: @ 82912AF
+ScorchedSlab_EventScript_ItemTM11:: @ 82912AF
 	giveitem_std ITEM_TM11, 1, 1
 	end
 
-SafariZone_Northwest_EventScript_2912BC:: @ 82912BC
+SafariZone_Northwest_EventScript_ItemTM22:: @ 82912BC
 	giveitem_std ITEM_TM22, 1, 1
 	end
 
-SafariZone_North_EventScript_2912C9:: @ 82912C9
+SafariZone_North_EventScript_ItemCalcium:: @ 82912C9
 	giveitem_std ITEM_CALCIUM, 1, 1
 	end
 
-SafariZone_Southwest_EventScript_2912D6:: @ 82912D6
+SafariZone_Southwest_EventScript_ItemMaxRevive:: @ 82912D6
 	giveitem_std ITEM_MAX_REVIVE, 1, 1
 	end
 
-SafariZone_Northeast_EventScript_2912E3:: @ 82912E3
+SafariZone_Northeast_EventScript_ItemNugget:: @ 82912E3
 	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
-SafariZone_Southeast_EventScript_2912F0:: @ 82912F0
+SafariZone_Southeast_EventScript_ItemBigPearl:: @ 82912F0
 	giveitem_std ITEM_BIG_PEARL, 1, 1
 	end
 
-MtPyre_2F_EventScript_2912FD:: @ 82912FD
+MtPyre_2F_EventScript_ItemUltraBall:: @ 82912FD
 	giveitem_std ITEM_ULTRA_BALL, 1, 1
 	end
 
-MtPyre_3F_EventScript_29130A:: @ 829130A
+MtPyre_3F_EventScript_ItemSuperRepel:: @ 829130A
 	giveitem_std ITEM_SUPER_REPEL, 1, 1
 	end
 
-MtPyre_4F_EventScript_291317:: @ 8291317
+MtPyre_4F_EventScript_ItemSeaIncense:: @ 8291317
 	giveitem_std ITEM_SEA_INCENSE, 1, 1
 	end
 
-MtPyre_5F_EventScript_291324:: @ 8291324
+MtPyre_5F_EventScript_ItemLaxIncense:: @ 8291324
 	giveitem_std ITEM_LAX_INCENSE, 1, 1
 	end
 
-MtPyre_6F_EventScript_291331:: @ 8291331
+MtPyre_6F_EventScript_ItemTM30:: @ 8291331
 	giveitem_std ITEM_TM30, 1, 1
 	end
 
-MtPyre_Exterior_EventScript_29133E:: @ 829133E
+MtPyre_Exterior_EventScript_ItemMaxPotion:: @ 829133E
 	giveitem_std ITEM_MAX_POTION, 1, 1
 	end
 
-MtPyre_Exterior_EventScript_29134B:: @ 829134B
+MtPyre_Exterior_EventScript_ItemTM48:: @ 829134B
 	giveitem_std ITEM_TM48, 1, 1
 	end
 
-AquaHideout_B1F_EventScript_291358:: @ 8291358
+AquaHideout_B1F_EventScript_ItemMasterBall:: @ 8291358
 	giveitem_std ITEM_MASTER_BALL, 1, 1
 	end
 
-AquaHideout_B1F_EventScript_291365:: @ 8291365
+AquaHideout_B1F_EventScript_ItemNugget:: @ 8291365
 	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
-AquaHideout_B1F_EventScript_291372:: @ 8291372
+AquaHideout_B1F_EventScript_ItemMaxElixir:: @ 8291372
 	giveitem_std ITEM_MAX_ELIXIR, 1, 1
 	end
 
-AquaHideout_B2F_EventScript_29137F:: @ 829137F
+AquaHideout_B2F_EventScript_ItemNestBall:: @ 829137F
 	giveitem_std ITEM_NEST_BALL, 1, 1
 	end
 
-AquaHideout_B2F_EventScript_29138C:: @ 829138C
-	giveitem_std ITEM_MASTER_BALL, 1, 1
+AquaHideout_B2F_EventScript_ItemMasterBall:: @ 829138C
+	giveitem_std ITEM_MASTER_BALL, 1, 1      // Unused
 	end
 
-Route119_EventScript_291399:: @ 8291399
+Route119_EventScript_ItemNugget:: @ 8291399
 	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
-Route119_EventScript_2913A6:: @ 82913A6
+Route119_EventScript_ItemMaxElixir:: @ 82913A6
 	giveitem_std ITEM_MAX_ELIXIR, 1, 1
 	end
 
-Route119_EventScript_2913B3:: @ 82913B3
+Route119_EventScript_ItemNestBall:: @ 82913B3
 	giveitem_std ITEM_NEST_BALL, 1, 1
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_2913C0:: @ 82913C0
+ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl:: @ 82913C0
 	giveitem_std ITEM_BIG_PEARL, 1, 1
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_2913CD:: @ 82913CD
+ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy:: @ 82913CD
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-ShoalCave_LowTideStairsRoom_EventScript_2913DA:: @ 82913DA
+ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal:: @ 82913DA
 	giveitem_std ITEM_ICE_HEAL, 1, 1
 	end
 
-ShoalCave_LowTideIceRoom_EventScript_2913E7:: @ 82913E7
+ShoalCave_LowTideIceRoom_EventScript_ItemTM07:: @ 82913E7
 	giveitem_std ITEM_TM07, 1, 1
 	end
 
-ShoalCave_LowTideIceRoom_EventScript_2913F4:: @ 82913F4
+ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce:: @ 82913F4
 	giveitem_std ITEM_NEVER_MELT_ICE, 1, 1
 	end
 
-SeafloorCavern_Room9_EventScript_291401:: @ 8291401
+SeafloorCavern_Room9_EventScript_ItemTM26:: @ 8291401
 	giveitem_std ITEM_TM26, 1, 1
 	end
 
-Route110_TrickHousePuzzle1_EventScript_29140E:: @ 829140E
+Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail:: @ 829140E
 	giveitem_std ITEM_ORANGE_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle2_EventScript_29141B:: @ 829141B
+Route110_TrickHousePuzzle2_EventScript_ItemHarborMail:: @ 829141B
 	giveitem_std ITEM_HARBOR_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle2_EventScript_291428:: @ 8291428
+Route110_TrickHousePuzzle2_EventScript_ItemWaveMail:: @ 8291428
 	giveitem_std ITEM_WAVE_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle3_EventScript_291435:: @ 8291435
+Route110_TrickHousePuzzle3_EventScript_ItemShadowMail:: @ 8291435
 	giveitem_std ITEM_SHADOW_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle3_EventScript_291442:: @ 8291442
+Route110_TrickHousePuzzle3_EventScript_ItemWoodMail:: @ 8291442
 	giveitem_std ITEM_WOOD_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle4_EventScript_29144F:: @ 829144F
+Route110_TrickHousePuzzle4_EventScript_ItemMechMail:: @ 829144F
 	giveitem_std ITEM_MECH_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle6_EventScript_29145C:: @ 829145C
+Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail:: @ 829145C
 	giveitem_std ITEM_GLITTER_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle7_EventScript_291469:: @ 8291469
+Route110_TrickHousePuzzle7_EventScript_ItemTropicMail:: @ 8291469
 	giveitem_std ITEM_TROPIC_MAIL, 1, 1
 	end
 
-Route110_TrickHousePuzzle8_EventScript_291476:: @ 8291476
+Route110_TrickHousePuzzle8_EventScript_ItemBeadMail:: @ 8291476
 	giveitem_std ITEM_BEAD_MAIL, 1, 1
 	end
 
-VictoryRoad_1F_EventScript_291483:: @ 8291483
+VictoryRoad_1F_EventScript_ItemMaxElixir:: @ 8291483
 	giveitem_std ITEM_MAX_ELIXIR, 1, 1
 	end
 
-VictoryRoad_1F_EventScript_291490:: @ 8291490
+VictoryRoad_1F_EventScript_ItemPPUp:: @ 8291490
 	giveitem_std ITEM_PP_UP, 1, 1
 	end
 
-VictoryRoad_B1F_EventScript_29149D:: @ 829149D
+VictoryRoad_B1F_EventScript_ItemTM29:: @ 829149D
 	giveitem_std ITEM_TM29, 1, 1
 	end
 
-VictoryRoad_B1F_EventScript_2914AA:: @ 82914AA
+VictoryRoad_B1F_EventScript_ItemFullRestore:: @ 82914AA
 	giveitem_std ITEM_FULL_RESTORE, 1, 1
 	end
 
-VictoryRoad_B2F_EventScript_2914B7:: @ 82914B7
+VictoryRoad_B2F_EventScript_ItemFullHeal:: @ 82914B7
 	giveitem_std ITEM_FULL_HEAL, 1, 1
 	end
 
-ArtisanCave_B1F_EventScript_2914C4:: @ 82914C4
+ArtisanCave_B1F_EventScript_ItemHPUp:: @ 82914C4
 	giveitem_std ITEM_HP_UP, 1, 1
 	end
 
-ArtisanCave_1F_EventScript_2914D1:: @ 82914D1
+ArtisanCave_1F_EventScript_ItemCarbos:: @ 82914D1
 	giveitem_std ITEM_CARBOS, 1, 1
 	end
 
-MagmaHideout_1F_EventScript_2914DE:: @ 82914DE
+MagmaHideout_1F_EventScript_ItemRareCandy:: @ 82914DE
 	giveitem_std ITEM_RARE_CANDY, 1, 1
 	end
 
-MagmaHideout_2F_2R_EventScript_2914EB:: @ 82914EB
+MagmaHideout_2F_2R_EventScript_MaxElixir:: @ 82914EB
 	giveitem_std ITEM_MAX_ELIXIR, 1, 1
 	end
 
-MagmaHideout_2F_2R_EventScript_2914F8:: @ 82914F8
+MagmaHideout_2F_2R_EventScript_ItemFullRestore:: @ 82914F8
 	giveitem_std ITEM_FULL_RESTORE, 1, 1
 	end
 
-MagmaHideout_3F_1R_EventScript_291505:: @ 8291505
+MagmaHideout_3F_1R_EventScript_ItemNugget:: @ 8291505
 	giveitem_std ITEM_NUGGET, 1, 1
 	end
 
-MagmaHideout_3F_2R_EventScript_291512:: @ 8291512
+MagmaHideout_3F_2R_EventScript_ItemPPMax:: @ 8291512
 	giveitem_std ITEM_PP_MAX, 1, 1
 	end
 
-MagmaHideout_4F_EventScript_29151F:: @ 829151F
+MagmaHideout_4F_EventScript_MaxRevive:: @ 829151F
 	giveitem_std ITEM_MAX_REVIVE, 1, 1
 	end
 
-MagmaHideout_3F_3R_EventScript_29152C:: @ 829152C
+MagmaHideout_3F_3R_EventScript_ItemEscapeRope:: @ 829152C
 	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
 	end