1 files changed, 12 insertions, 12 deletions
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index 1cb348887..80c57851b 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -1,14 +1,14 @@
 BillsHouse_MapScriptHeader:
-	; trigger count
+.MapTriggers:
 	db 0
 
-	; callback count
+.MapCallbacks:
 	db 0
 
 GrampsScript_0x189538:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue UnknownScript_0x1896ba
 	checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
 	iftrue UnknownScript_0x1896c0
@@ -120,7 +120,7 @@ UnknownScript_0x18963b:
 	verbosegiveitem EVERSTONE, 1
 	iffalse UnknownScript_0x1896cc
 	setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	loadmovesprites
 	end
 
@@ -131,7 +131,7 @@ UnknownScript_0x189652:
 	verbosegiveitem LEAF_STONE, 1
 	iffalse UnknownScript_0x1896cc
 	setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	loadmovesprites
 	end
 
@@ -142,7 +142,7 @@ UnknownScript_0x189669:
 	verbosegiveitem WATER_STONE, 1
 	iffalse UnknownScript_0x1896cc
 	setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	loadmovesprites
 	end
 
@@ -153,7 +153,7 @@ UnknownScript_0x189680:
 	verbosegiveitem FIRE_STONE, 1
 	iffalse UnknownScript_0x1896cc
 	setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	loadmovesprites
 	end
 
@@ -354,17 +354,17 @@ BillsHouse_MapEventHeader:
 	; filler
 	db 0, 0
 
-	; warps
+.Warps:
 	db 2
 	warp_def $7, $2, 1, GROUP_ROUTE_25, MAP_ROUTE_25
 	warp_def $7, $3, 1, GROUP_ROUTE_25, MAP_ROUTE_25
 
-	; xy triggers
+.XYTriggers:
 	db 0
 
-	; signposts
+.Signposts:
 	db 0
 
-	; people-events
+.PersonEvents:
 	db 1
-	person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, -1
+	person_event SPRITE_GRAMPS, 7, 6, OW_UP | $3, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x189538, -1