summaryrefslogtreecommitdiff
path: root/data/maps/sprite_sets.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/sprite_sets.asm')
-rwxr-xr-xdata/maps/sprite_sets.asm163
1 files changed, 82 insertions, 81 deletions
diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm
index ee6ddef0..b2c9371c 100755
--- a/data/maps/sprite_sets.asm
+++ b/data/maps/sprite_sets.asm
@@ -37,154 +37,155 @@ MapSpriteSets:
db $02 ; ROUTE_24
db $02 ; ROUTE_25
+EAST_WEST EQU 1
+NORTH_SOUTH EQU 2
+
; Format:
-; 00: determines whether the map is split East/West or North/South
-; $01 = East/West divide
-; $02 = North/South divide
+; 00: determines whether the map is split EAST_WEST or NORTH_SOUTH
; 01: coordinate of dividing line
; 02: sprite set ID if in the West or North side
; 03: sprite set ID if in the East or South side
SplitMapSpriteSets:
- db $02, $25, $02, $01 ; $f1
- db $02, $32, $02, $03 ; $f2
- db $01, $39, $04, $08 ; $f3
- db $02, $15, $03, $08 ; $f4
- db $01, $08, $0A, $08 ; $f5
- db $01, $18, $09, $05 ; $f6
- db $01, $22, $09, $0A ; $f7
- db $01, $35, $01, $0A ; $f8
- db $02, $21, $02, $07 ; $f9
- db $02, $02, $07, $04 ; $fa
- db $01, $11, $05, $07 ; $fb
- db $01, $03, $07, $03 ; $fc
+ db NORTH_SOUTH, 37, $02, $01 ; $f1
+ db NORTH_SOUTH, 50, $02, $03 ; $f2
+ db EAST_WEST, 57, $04, $08 ; $f3
+ db NORTH_SOUTH, 21, $03, $08 ; $f4
+ db EAST_WEST, 8, $0A, $08 ; $f5
+ db EAST_WEST, 24, $09, $05 ; $f6
+ db EAST_WEST, 34, $09, $0A ; $f7
+ db EAST_WEST, 53, $01, $0A ; $f8
+ db NORTH_SOUTH, 33, $02, $07 ; $f9
+ db NORTH_SOUTH, 2, $07, $04 ; $fa
+ db EAST_WEST, 17, $05, $07 ; $fb
+ db EAST_WEST, 3, $07, $03 ; $fc
SpriteSets:
; sprite set $01
db SPRITE_BLUE
- db SPRITE_BUG_CATCHER
+ db SPRITE_YOUNGSTER
db SPRITE_GIRL
- db SPRITE_FISHER2
- db SPRITE_BLACK_HAIR_BOY_1
+ db SPRITE_FISHER
+ db SPRITE_COOLTRAINER_M
db SPRITE_GAMBLER
db SPRITE_SEEL
db SPRITE_OAK
db SPRITE_SWIMMER
- db SPRITE_BALL
- db SPRITE_LYING_OLD_MAN
+ db SPRITE_POKE_BALL
+ db SPRITE_GAMBLER_ASLEEP
; sprite set $02
- db SPRITE_BUG_CATCHER
+ db SPRITE_YOUNGSTER
db SPRITE_ROCKET
- db SPRITE_BLACK_HAIR_BOY_2
+ db SPRITE_SUPER_NERD
db SPRITE_HIKER
- db SPRITE_SLOWBRO
+ db SPRITE_MONSTER
db SPRITE_BLUE
db SPRITE_GUARD
- db SPRITE_LASS
- db SPRITE_BLACK_HAIR_BOY_1
- db SPRITE_BALL
- db SPRITE_LYING_OLD_MAN_UNUSED_2
+ db SPRITE_COOLTRAINER_F
+ db SPRITE_COOLTRAINER_M
+ db SPRITE_POKE_BALL
+ db SPRITE_UNUSED_GAMBLER_ASLEEP_2
; sprite set $03
db SPRITE_LITTLE_GIRL
db SPRITE_GIRL
- db SPRITE_BLACK_HAIR_BOY_2
+ db SPRITE_SUPER_NERD
db SPRITE_HIKER
db SPRITE_GAMBLER
- db SPRITE_SLOWBRO
- db SPRITE_LASS
- db SPRITE_BLACK_HAIR_BOY_1
+ db SPRITE_MONSTER
+ db SPRITE_COOLTRAINER_F
+ db SPRITE_COOLTRAINER_M
db SPRITE_GUARD
- db SPRITE_BALL
- db SPRITE_LYING_OLD_MAN_UNUSED_2
+ db SPRITE_POKE_BALL
+ db SPRITE_UNUSED_GAMBLER_ASLEEP_2
; sprite set $04
- db SPRITE_FOULARD_WOMAN
- db SPRITE_BLACK_HAIR_BOY_2
- db SPRITE_BUG_CATCHER
+ db SPRITE_BEAUTY
+ db SPRITE_SUPER_NERD
+ db SPRITE_YOUNGSTER
db SPRITE_GAMBLER
- db SPRITE_SLOWBRO
+ db SPRITE_MONSTER
db SPRITE_GUARD
db SPRITE_SAILOR
- db SPRITE_LASS
- db SPRITE_BLACK_HAIR_BOY_1
- db SPRITE_BALL
- db SPRITE_LYING_OLD_MAN_UNUSED_2
+ db SPRITE_COOLTRAINER_F
+ db SPRITE_COOLTRAINER_M
+ db SPRITE_POKE_BALL
+ db SPRITE_UNUSED_GAMBLER_ASLEEP_2
; sprite set $05
db SPRITE_LITTLE_GIRL
- db SPRITE_YOUNG_BOY
+ db SPRITE_LITTLE_BOY
db SPRITE_GIRL
- db SPRITE_FISHER2
- db SPRITE_FAT_BALD_GUY
- db SPRITE_OLD_PERSON
- db SPRITE_SLOWBRO
+ db SPRITE_FISHER
+ db SPRITE_MIDDLE_AGED_MAN
+ db SPRITE_GRAMPS
+ db SPRITE_MONSTER
db SPRITE_GUARD
db SPRITE_ROCKET
- db SPRITE_BALL
+ db SPRITE_POKE_BALL
db SPRITE_SNORLAX
; sprite set $06
- db SPRITE_BUG_CATCHER
- db SPRITE_GYM_HELPER
- db SPRITE_SLOWBRO
+ db SPRITE_YOUNGSTER
+ db SPRITE_GYM_GUIDE
+ db SPRITE_MONSTER
db SPRITE_BLUE
- db SPRITE_LASS
- db SPRITE_BLACK_HAIR_BOY_1
+ db SPRITE_COOLTRAINER_F
+ db SPRITE_COOLTRAINER_M
db SPRITE_SWIMMER
db SPRITE_GUARD
db SPRITE_GAMBLER
- db SPRITE_BALL
- db SPRITE_LYING_OLD_MAN_UNUSED_2
+ db SPRITE_POKE_BALL
+ db SPRITE_UNUSED_GAMBLER_ASLEEP_2
; sprite set $07
db SPRITE_ROCKET
- db SPRITE_OAK_AIDE
- db SPRITE_LAPRAS_GIVER
+ db SPRITE_SCIENTIST
+ db SPRITE_SILPH_WORKER
db SPRITE_ERIKA
db SPRITE_GENTLEMAN
db SPRITE_BIRD
db SPRITE_ROCKER
- db SPRITE_BLACK_HAIR_BOY_1
- db SPRITE_SLOWBRO
- db SPRITE_BALL
- db SPRITE_LYING_OLD_MAN_UNUSED_2
+ db SPRITE_COOLTRAINER_M
+ db SPRITE_MONSTER
+ db SPRITE_POKE_BALL
+ db SPRITE_UNUSED_GAMBLER_ASLEEP_2
; sprite set $08
db SPRITE_BIKER
- db SPRITE_BLACK_HAIR_BOY_2
- db SPRITE_FAT_BALD_GUY
- db SPRITE_LASS
- db SPRITE_BLACK_HAIR_BOY_1
- db SPRITE_FOULARD_WOMAN
- db SPRITE_FISHER2
+ db SPRITE_SUPER_NERD
+ db SPRITE_MIDDLE_AGED_MAN
+ db SPRITE_COOLTRAINER_F
+ db SPRITE_COOLTRAINER_M
+ db SPRITE_BEAUTY
+ db SPRITE_FISHER
db SPRITE_ROCKER
- db SPRITE_SLOWBRO
- db SPRITE_BALL
+ db SPRITE_MONSTER
+ db SPRITE_POKE_BALL
db SPRITE_SNORLAX
; sprite set $09
db SPRITE_BIKER
- db SPRITE_BLACK_HAIR_BOY_1
- db SPRITE_LAPRAS_GIVER
- db SPRITE_FISHER2
+ db SPRITE_COOLTRAINER_M
+ db SPRITE_SILPH_WORKER
+ db SPRITE_FISHER
db SPRITE_ROCKER
db SPRITE_HIKER
db SPRITE_GAMBLER
- db SPRITE_FAT_BALD_GUY
- db SPRITE_BLACK_HAIR_BOY_2
- db SPRITE_BALL
+ db SPRITE_MIDDLE_AGED_MAN
+ db SPRITE_SUPER_NERD
+ db SPRITE_POKE_BALL
db SPRITE_SNORLAX
; sprite set $0a
db SPRITE_BIRD
- db SPRITE_BLACK_HAIR_BOY_1
- db SPRITE_CLEFAIRY
- db SPRITE_FISHER2
+ db SPRITE_COOLTRAINER_M
+ db SPRITE_FAIRY
+ db SPRITE_FISHER
db SPRITE_GAMBLER
- db SPRITE_SLOWBRO
+ db SPRITE_MONSTER
db SPRITE_SEEL
db SPRITE_SWIMMER
- db SPRITE_BUG_CATCHER
- db SPRITE_BALL
- db SPRITE_OMANYTE
+ db SPRITE_YOUNGSTER
+ db SPRITE_POKE_BALL
+ db SPRITE_FOSSIL