Leahnaya/pokegold-spaceworld
1
0
Fork 0
mirror of https://github.com/pret/pokegold-spaceworld.git synced 2026-04-26 00:05:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Readjust sprite constants

Browse Source 
It would make more sense to make duplicate sprite IDs reference the latest definition of it instead of the earliest. Let's say I included the sprite, but commented it out. Now the label it pointed to falls into the next sprite over, thus making it the same as the next sprite over. This change also makes much more sense with certain maps now. Rockets are defined properly in Team Rocket areas, Red's Mom is now defined in her house, and the League buildings are filled with CoolTrainers.
This commit is contained in:
MDTravis 2026-03-11 01:41:07 -04:00
parent 4c7e042e6b
commit c81327d538
42 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
constants/sprite_constants.asm
View File

@ -13,29 +13,29 @@
const SPRITE_GANTETSU ; 0b KURT
const SPRITE_MOM ; 0c
const SPRITE_SILVERS_MOM ; 0d
const SPRITE_REDS_MOM ; 0e
const SPRITE_0F ; 0f duplicate SPRITE_REDS_MOM
const SPRITE_0E ; 0e falls into SPRITE_REDS_MOM
const SPRITE_REDS_MOM ; 0f
const SPRITE_NANAMI ; 10 DAISY
const SPRITE_EVIL_OKIDO ; 11 EVIL_PROF_OAK
const SPRITE_KIKUKO ; 12 AGATHA
const SPRITE_HAYATO ; 13 FALKNER
const SPRITE_TSUKUSHI ; 14 BUGSY
const SPRITE_15 ; 15 duplicate SPRITE_TSUKUSHI
const SPRITE_14 ; 14 falls into SPRITE_TSUKUSHI
const SPRITE_TSUKUSHI ; 15 BUGSY
const SPRITE_ENOKI ; 16 MORTY
const SPRITE_MIKAN ; 17 JASMINE
const SPRITE_18 ; 18 duplicate SPRITE_MIKAN
const SPRITE_COOLTRAINER_M ; 19
const SPRITE_1A ; 1a duplicate SPRITE_COOLTRAINER_M
const SPRITE_1B ; 1b duplicate SPRITE_COOLTRAINER_M
const SPRITE_1C ; 1c duplicate SPRITE_COOLTRAINER_M
const SPRITE_1D ; 1d duplicate SPRITE_COOLTRAINER_M
const SPRITE_1E ; 1e duplicate SPRITE_COOLTRAINER_M
const SPRITE_1F ; 1f duplicate SPRITE_COOLTRAINER_M
const SPRITE_20 ; 20 duplicate SPRITE_COOLTRAINER_M
const SPRITE_21 ; 21 duplicate SPRITE_COOLTRAINER_M
const SPRITE_22 ; 22 duplicate SPRITE_COOLTRAINER_M
const SPRITE_23 ; 23 duplicate SPRITE_COOLTRAINER_M
const SPRITE_24 ; 24 duplicate SPRITE_COOLTRAINER_M
const SPRITE_17 ; 17 falls into SPRITE_MIKAN
const SPRITE_MIKAN ; 18 JASMINE
const SPRITE_19 ; 19 falls into SPRITE_COOLTRAINER_M
const SPRITE_1A ; 1a falls into SPRITE_COOLTRAINER_M
const SPRITE_1B ; 1b falls into SPRITE_COOLTRAINER_M
const SPRITE_1C ; 1c falls into SPRITE_COOLTRAINER_M
const SPRITE_1D ; 1d falls into SPRITE_COOLTRAINER_M
const SPRITE_1E ; 1e falls into SPRITE_COOLTRAINER_M
const SPRITE_1F ; 1f falls into SPRITE_COOLTRAINER_M
const SPRITE_20 ; 20 falls into SPRITE_COOLTRAINER_M
const SPRITE_21 ; 21 falls into SPRITE_COOLTRAINER_M
const SPRITE_22 ; 22 falls into SPRITE_COOLTRAINER_M
const SPRITE_23 ; 23 falls into SPRITE_COOLTRAINER_M
const SPRITE_COOLTRAINER_M ; 24
const SPRITE_COOLTRAINER_F ; 25
const SPRITE_BUG_CATCHER_BOY ; 26
const SPRITE_TWIN ; 27
@ -51,9 +51,9 @@
const SPRITE_GRANNY ; 31
const SPRITE_SWIMMER_M ; 32
const SPRITE_SWIMMER_F ; 33
const SPRITE_ROCKET_M ; 34
const SPRITE_35 ; 35 duplicate SPRITE_ROCKET_M
const SPRITE_36 ; 36 duplicate SPRITE_ROCKET_M
const SPRITE_34 ; 34 falls into SPRITE_ROCKET_M
const SPRITE_35 ; 35 falls into SPRITE_ROCKET_M
const SPRITE_ROCKET_M ; 36
const SPRITE_ROCKET_F ; 37
const SPRITE_NURSE ; 38
const SPRITE_LINK_RECEPTIONIST ; 39
@ -68,9 +68,9 @@
const SPRITE_BLACKBELT ; 42
const SPRITE_RECEPTIONIST ; 43
const SPRITE_OFFICER ; 44
const SPRITE_CAPTAIN ; 45
const SPRITE_46 ; 46 duplicate SPRITE_CAPTAIN
const SPRITE_47 ; 47 duplicate SPRITE_CAPTAIN
const SPRITE_45 ; 45 falls into SPRITE_CAPTAIN
const SPRITE_46 ; 46 falls into SPRITE_CAPTAIN
const SPRITE_CAPTAIN ; 47
const SPRITE_MOHAWK ; 48
const SPRITE_GYM_GUY ; 49
const SPRITE_SAILOR ; 4a
@ -87,8 +87,8 @@
const SPRITE_POKE_BALL ; 55
const SPRITE_POKEDEX ; 56
const SPRITE_PAPER ; 57
const SPRITE_OLD_LINK_RECEPTIONIST ; 58
const SPRITE_59 ; 59 duplicate SPRITE_OLD_LINK_RECEPTIONIST
const SPRITE_58 ; 58 falls into SPRITE_OLD_LINK_RECEPTIONIST
const SPRITE_OLD_LINK_RECEPTIONIST ; 59
const SPRITE_EGG ; 5a
const SPRITE_BOULDER ; 5b

2
data/maps/objects/BaadonLeague1F.asm
View File

@ -18,7 +18,7 @@ BaadonLeague1F_MapEvents::
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
BaadonLeague1F_Blocks::

4
data/maps/objects/BaadonLeague2F.asm
View File

@ -14,9 +14,9 @@ BaadonLeague2F_MapEvents::
def_object_events
object_event 4, 1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 1, 2, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 1, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 1, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 9, SPRITE_24, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 9, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
BaadonLeague2F_Blocks::

2
data/maps/objects/BullLeague1F.asm
View File

@ -18,7 +18,7 @@ BullLeague1F_MapEvents::
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
BullLeague1F_Blocks::

2
data/maps/objects/BullPokecenter1F.asm
View File

@ -17,7 +17,7 @@ BullPokecenter1F_MapEvents::
def_object_events
object_event 5, 1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 14, 6, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 1, SPRITE_GRANNY, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
BullPokecenter1F_Blocks::

2
data/maps/objects/Fonto.asm
View File

@ -25,7 +25,7 @@ Fonto_MapEvents::
bg_event 10, 12, 5
def_object_events
object_event 2, 4, SPRITE_36, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 4, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_RHYDON, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 14, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 16, 8, SPRITE_TWIN, SPRITEMOVEFN_RANDOM_WALK_XY, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/FontoPokecenter1F.asm
View File

@ -17,7 +17,7 @@ FontoPokecenter1F_MapEvents::
def_object_events
object_event 5, 1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 14, 6, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
FontoPokecenter1F_Blocks::

4
data/maps/objects/FontoRocketHouse.asm
View File

@ -14,9 +14,9 @@ FontoRocketHouse_MapEvents::
def_bg_events
def_object_events
object_event 5, 4, SPRITE_36, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 4, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 2, SPRITE_ROCKET_F, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 14, 2, SPRITE_36, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 14, 2, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 12, 2, SPRITE_PIDGEY, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
FontoRocketHouse_Blocks::

2
data/maps/objects/HaitekuLeague1F.asm
View File

@ -18,7 +18,7 @@ HaitekuLeague1F_MapEvents::
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
HaitekuLeague1F_Blocks::

4
data/maps/objects/HaitekuLeague2F.asm
View File

@ -14,9 +14,9 @@ HaitekuLeague2F_MapEvents::
def_object_events
object_event 4, 1, SPRITE_LASS, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 6, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 8, 12, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 10, SPRITE_24, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 7, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
HaitekuLeague2F_Blocks::

2
data/maps/objects/KantoGreensHouse1F.asm
View File

@ -15,7 +15,7 @@ KantoGreensHouse1F_MapEvents::
def_bg_events
def_object_events
object_event 5, 3, SPRITE_0F, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 3, SPRITE_REDS_MOM, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
KantoGreensHouse1F_Blocks::
INCBIN "maps/KantoGreensHouse1F.blk"

2
data/maps/objects/KantoLeague1F.asm
View File

@ -18,7 +18,7 @@ KantoLeague1F_MapEvents::
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
KantoLeague1F_Blocks::

2
data/maps/objects/KantoLeague21F.asm
View File

@ -18,7 +18,7 @@ KantoLeague21F_MapEvents::
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
KantoLeague21F_Blocks::

4
data/maps/objects/KantoLeague22F.asm
View File

@ -14,9 +14,9 @@ KantoLeague22F_MapEvents::
def_object_events
object_event 4, 7, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 1, SPRITE_24, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 0, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 6, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 1, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
KantoLeague22F_Blocks::

4
data/maps/objects/KantoLeague2F.asm
View File

@ -14,9 +14,9 @@ KantoLeague2F_MapEvents::
def_object_events
object_event 4, 7, SPRITE_RED, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 1, SPRITE_24, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 0, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 6, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 1, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
KantoLeague2F_Blocks::

2
data/maps/objects/KantoPokecenter1F.asm
View File

@ -17,7 +17,7 @@ KantoPokecenter1F_MapEvents::
def_object_events
object_event 5, 1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 14, 6, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 1, SPRITE_GRANNY, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
KantoPokecenter1F_Blocks::

2
data/maps/objects/KantoPokecenter21F.asm
View File

@ -17,7 +17,7 @@ KantoPokecenter21F_MapEvents::
def_object_events
object_event 5, 1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 14, 6, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
KantoPokecenter21F_Blocks::

2
data/maps/objects/KantoSchool.asm
View File

@ -17,7 +17,7 @@ KantoSchool_MapEvents::
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
KantoSchool_Blocks::

2
data/maps/objects/NewtypeLeague1F.asm
View File

@ -18,7 +18,7 @@ NewtypeLeague1F_MapEvents::
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
NewtypeLeague1F_Blocks::

4
data/maps/objects/NewtypeLeague2F.asm
View File

@ -14,9 +14,9 @@ NewtypeLeague2F_MapEvents::
def_object_events
object_event 5, 5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 0, 0, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 0, 0, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 0, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 0, 11, SPRITE_24, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 0, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
NewtypeLeague2F_Blocks::

2
data/maps/objects/NewtypeSailorHouse.asm
View File

@ -14,7 +14,7 @@ NewtypeSailorHouse_MapEvents::
def_bg_events
def_object_events
object_event 6, 3, SPRITE_47, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 3, SPRITE_CAPTAIN, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
NewtypeSailorHouse_Blocks::
INCBIN "maps/NewtypeSailorHouse.blk"

2
data/maps/objects/NorthPokecenter1F.asm
View File

@ -17,7 +17,7 @@ NorthPokecenter1F_MapEvents::
def_object_events
object_event 5, 1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 14, 6, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_Y, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_RANDOM_WALK_Y, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
NorthPokecenter1F_Blocks::

2
data/maps/objects/OldCityMart.asm
View File

@ -17,7 +17,7 @@ OldCityMart_MapEvents::
def_object_events
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 5, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 1, SPRITE_24, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
OldCityMart_Blocks::
INCBIN "maps/OldCityMart.blk"

2
data/maps/objects/OldCitySchool.asm
View File

@ -20,7 +20,7 @@ OldCitySchool_MapEvents::
def_object_events
object_event 2, 5, SPRITE_GIRL, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 7, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 9, SPRITE_24, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 9, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_ROCKER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 6, SPRITE_TEACHER, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 11, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/SilentHillPokecenter.asm
View File

@ -17,7 +17,7 @@ SilentHillPokecenter_MapEvents::
def_object_events
object_event 5, 1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 14, 6, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 4, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 1, SPRITE_RHYDON, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

2
data/maps/objects/SouthPokecenter1F.asm
View File

@ -17,7 +17,7 @@ SouthPokecenter1F_MapEvents::
def_object_events
object_event 5, 1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 14, 6, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 1, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
SouthPokecenter1F_Blocks::

2
data/maps/objects/StandLeague1F.asm
View File

@ -18,7 +18,7 @@ StandLeague1F_MapEvents::
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 7, SPRITE_LASS, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
StandLeague1F_Blocks::

4
data/maps/objects/StandLeague2F.asm
View File

@ -14,9 +14,9 @@ StandLeague2F_MapEvents::
def_object_events
object_event 4, 7, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 1, SPRITE_24, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 0, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 6, SPRITE_24, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 1, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
StandLeague2F_Blocks::

2
data/maps/objects/StandRocketHouse1F.asm
View File

@ -15,7 +15,7 @@ StandRocketHouse1F_MapEvents::
def_bg_events
def_object_events
object_event 11, 4, SPRITE_36, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 11, 4, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
StandRocketHouse1F_Blocks::
INCBIN "maps/StandRocketHouse1F.blk"

2
data/maps/objects/SugarPokecenter1F.asm
View File

@ -17,7 +17,7 @@ SugarPokecenter1F_MapEvents::
def_object_events
object_event 5, 1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 14, 6, SPRITE_YOUNGSTER, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_24, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 1, SPRITE_GRANNY, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
SugarPokecenter1F_Blocks::

2
data/maps/objects/West.asm
View File

@ -39,7 +39,7 @@ West_MapEvents::
object_event 30, 14, SPRITE_LASS, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 29, 14, SPRITE_CLEFAIRY, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 22, 19, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 18, 13, SPRITE_36, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 18, 13, SPRITE_ROCKET_M, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
West_Blocks::
INCBIN "maps/West.blk"

2
data/maps/objects/WestGym.asm
View File

@ -16,7 +16,7 @@ WestGym_MapEvents::
bg_event 6, 15, 1
def_object_events
object_event 4, 4, SPRITE_TSUKUSHI, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 4, SPRITE_14, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 7, SPRITE_LASS, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0
object_event 3, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0
object_event 5, 9, SPRITE_LASS, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0

2
data/maps/objects/WestMart2F.asm
View File

@ -34,7 +34,7 @@ WestMart2F_MapEvents::
object_event 14, 5, SPRITE_CLERK, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 6, SPRITE_LASS, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 1, 5, SPRITE_BURGLAR, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 2, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 2, SPRITE_34, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
WestMart2F_Blocks::
INCBIN "maps/WestMart2F.blk"

2
data/maps/objects/WestMart4F.asm
View File

@ -30,7 +30,7 @@ WestMart4F_MapEvents::
def_object_events
object_event 13, 5, SPRITE_CLERK, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 8, 6, SPRITE_24, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 8, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 7, 2, SPRITE_ROCKER, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
WestMart4F_Blocks::

2
data/maps/objects/WestPokecenter1F.asm
View File

@ -19,7 +19,7 @@ WestPokecenter1F_MapEvents::
object_event 5, 1, SPRITE_NURSE, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 14, 6, SPRITE_GENTLEMAN, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 5, SPRITE_LASS, SPRITEMOVEFN_RANDOM_WALK_Y, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 1, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 1, SPRITE_34, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
WestPokecenter1F_Blocks::
INCBIN "maps/WestPokecenter1F.blk"

6
data/maps/objects/WestRadioTower2F.asm
View File

@ -19,9 +19,9 @@ WestRadioTower2F_MapEvents::
object_event 7, 5, SPRITE_ROCKER, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 2, SPRITE_GIRL, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 1, SPRITE_36, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 6, SPRITE_36, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 7, SPRITE_36, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 1, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 6, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 7, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
WestRadioTower2F_Blocks::
INCBIN "maps/WestRadioTower2F.blk"

8
data/maps/objects/WestRadioTower3F.asm
View File

@ -19,10 +19,10 @@ WestRadioTower3F_MapEvents::
object_event 1, 6, SPRITE_ROCKER, SPRITEMOVEFN_RANDOM_WALK_XY, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 1, SPRITE_TEACHER, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 5, SPRITE_GIRL, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 2, SPRITE_36, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 3, SPRITE_36, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 1, 7, SPRITE_36, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 7, 6, SPRITE_36, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 2, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 3, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 1, 7, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 7, 6, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
WestRadioTower3F_Blocks::
INCBIN "maps/WestRadioTower3F.blk"

8
data/maps/objects/WestRadioTower4F.asm
View File

@ -20,10 +20,10 @@ WestRadioTower4F_MapEvents::
object_event 7, 5, SPRITE_BURGLAR, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 7, 6, SPRITE_ROCKER, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 0, 5, SPRITE_GIRL, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 5, SPRITE_36, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 4, SPRITE_36, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 1, SPRITE_36, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 1, 2, SPRITE_36, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 5, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 4, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 1, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 1, 2, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
WestRadioTower4F_Blocks::
INCBIN "maps/WestRadioTower4F.blk"

4
data/maps/objects/WestRadioTower5F.asm
View File

@ -21,8 +21,8 @@ WestRadioTower5F_MapEvents::
object_event 2, 6, SPRITE_CLEFAIRY, SPRITEMOVEFN_RANDOM_WALK_X, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 1, 5, SPRITE_CLEFAIRY, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 7, SPRITE_SAKAKI, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 2, SPRITE_36, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 4, SPRITE_36, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 2, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 4, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 6, 7, SPRITE_TEACHER, SPRITEMOVEFN_RANDOM_WALK_X, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
WestRadioTower5F_Blocks::

4
data/maps/objects/WestRocketRaidedHouse.asm
View File

@ -21,8 +21,8 @@ WestRocketRaidedHouse_MapEvents::
bg_event 8, 0, 6
def_object_events
object_event 8, 1, SPRITE_36, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 7, 5, SPRITE_36, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 8, 1, SPRITE_ROCKET_M, SPRITEMOVEFN_TURN_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 7, 5, SPRITE_ROCKET_M, SPRITEMOVEFN_RANDOM_SPIN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 4, SPRITE_POKEFAN_M, SPRITEMOVEFN_TURN_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 1, 3, SPRITE_POKEFAN_F, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 7, 2, SPRITE_POKE_BALL, SPRITEMOVEFN_TURN_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0

14
data/maps/sprite_sets.asm
View File

@ -70,7 +70,7 @@ SpriteSets:
db SPRITE_ROCKER
db SPRITE_SAILOR
db SPRITE_GENTLEMAN
db SPRITE_36
db SPRITE_ROCKET_M
db SPRITE_FISHER
db SPRITE_CLEFAIRY
db SPRITE_POKE_BALL
@ -101,10 +101,10 @@ SpriteSets:
db SPRITE_POKEDEX
; sprite set $06
db SPRITE_36
db SPRITE_ROCKET_M
db SPRITE_LASS
db SPRITE_YOUNGSTER
db SPRITE_24
db SPRITE_COOLTRAINER_M
db SPRITE_POKEFAN_M
db SPRITE_ROCKET_F
db SPRITE_FISHER
@ -138,7 +138,7 @@ SpriteSets:
; sprite set $09
db SPRITE_SAKAKI
db SPRITE_CAPTAIN
db SPRITE_45
db SPRITE_TWIN
db SPRITE_TEACHER
db SPRITE_ROCKER
@ -152,7 +152,7 @@ SpriteSets:
db SPRITE_LASS
db SPRITE_YOUNGSTER
db SPRITE_COOLTRAINER_F
db SPRITE_24
db SPRITE_COOLTRAINER_M
db SPRITE_POKEFAN_M
db SPRITE_GENTLEMAN
db SPRITE_FISHER
@ -187,9 +187,9 @@ SpriteSets:
; sprite set $0d
db SPRITE_YOUNGSTER
db SPRITE_GIRL
db SPRITE_24
db SPRITE_COOLTRAINER_M
db SPRITE_SCIENTIST
db SPRITE_CAPTAIN
db SPRITE_45
db SPRITE_46
db SPRITE_FISHER
db SPRITE_RHYDON

2
home/map_objects.asm
View File

@ -363,7 +363,7 @@ IsAnimatedSprite::
db SPRITE_POKE_BALL
db SPRITE_POKEDEX
db SPRITE_PAPER
db SPRITE_OLD_LINK_RECEPTIONIST
db SPRITE_58
db SPRITE_EGG
db SPRITE_BOULDER
db -1