summaryrefslogtreecommitdiff
path: root/maps/BillsHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/BillsHouse.asm')
-rw-r--r--maps/BillsHouse.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index 1cb348887..6445a439a 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -8,7 +8,7 @@ BillsHouse_MapScriptHeader:
GrampsScript_0x189538:
faceplayer
loadfont
- checkevent EVENT_000
+ checkevent EVENT_CHRIS1_IN_CABLE_CLUB
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_CHRIS1_IN_CABLE_CLUB
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_CHRIS1_IN_CABLE_CLUB
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_CHRIS1_IN_CABLE_CLUB
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_CHRIS1_IN_CABLE_CLUB
loadmovesprites
end
@@ -367,4 +367,4 @@ BillsHouse_MapEventHeader:
; people-events
db 1
- person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, -1
+ person_event SPRITE_GRAMPS, 7, 6, UP << 2 | $3, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x189538, -1