summaryrefslogtreecommitdiff
path: root/maps/GoldenrodBillsHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/GoldenrodBillsHouse.asm')
-rw-r--r--maps/GoldenrodBillsHouse.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm
index 71e44841a..2032c5b1e 100644
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/GoldenrodBillsHouse.asm
@@ -248,20 +248,20 @@ GoldenrodBillsHouse_MapEventHeader:
.Warps:
db 2
- warp_def $7, $2, 4, GOLDENROD_CITY
- warp_def $7, $3, 4, GOLDENROD_CITY
+ warp_def 2, 7, 4, GOLDENROD_CITY
+ warp_def 3, 7, 4, GOLDENROD_CITY
.CoordEvents:
db 0
.BGEvents:
db 3
- bg_event 1, 0, BGEVENT_READ, BillsHouseBookshelf2
+ bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2
bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1
- bg_event 1, 7, BGEVENT_READ, BillsHouseRadio
+ bg_event 7, 1, BGEVENT_READ, BillsHouseRadio
.ObjectEvents:
db 3
- object_event SPRITE_BILL, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL
- object_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMom, -1
- object_event SPRITE_TWIN, 4, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSister, -1
+ object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL
+ object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMom, -1
+ object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSister, -1