aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SSAnneB1FRooms.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-09-26 23:20:57 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-09-26 23:20:57 -0400
commitd48a318dbf4b9e07da57980adb5894f5eadb11f7 (patch)
tree9fd47f6aeb205591c421b178a4f870d2502ceef9 /data/maps/objects/SSAnneB1FRooms.asm
parentFix typos (#334) (diff)
downloadpokeyellow-d48a318dbf4b9e07da57980adb5894f5eadb11f7.tar.gz
pokeyellow-d48a318dbf4b9e07da57980adb5894f5eadb11f7.tar.xz
pokeyellow-d48a318dbf4b9e07da57980adb5894f5eadb11f7.zip
Align `object_event` coordinates
Fixes #336
Diffstat (limited to 'data/maps/objects/SSAnneB1FRooms.asm')
-rw-r--r--data/maps/objects/SSAnneB1FRooms.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm
index 23f7a2f2..a7bf0825 100644
--- a/data/maps/objects/SSAnneB1FRooms.asm
+++ b/data/maps/objects/SSAnneB1FRooms.asm
@@ -16,16 +16,16 @@ SSAnneB1FRooms_Object:
def_bg_events
def_object_events
- object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3
- object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, 2, OPP_SAILOR, 4
- object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, 3, OPP_SAILOR, 5
- object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 6
- object_event 0, 2, SPRITE_SAILOR, STAY, RIGHT, 5, OPP_SAILOR, 7
- object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2
+ object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3
+ object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, 2, OPP_SAILOR, 4
+ object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, 3, OPP_SAILOR, 5
+ object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 6
+ object_event 0, 2, SPRITE_SAILOR, STAY, RIGHT, 5, OPP_SAILOR, 7
+ object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2
object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 7 ; person
object_event 11, 12, SPRITE_MONSTER, STAY, NONE, 8 ; person
- object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER
- object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST
+ object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER
+ object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST
object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION
def_warps_to SS_ANNE_B1F_ROOMS