aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/PokemonFanClub.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-04 16:19:15 -0400
committerGitHub <noreply@github.com>2020-07-04 16:19:15 -0400
commit2718c36065e7eb201a149938bcdd51987c4e56b6 (patch)
tree4a1c0294193a497e15ec8e6be59390eb1f84b5d3 /data/mapObjects/PokemonFanClub.asm
parentMerge pull request #256 from Rangi42/master (diff)
parentUPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET... (diff)
downloadpokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.gz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.xz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.zip
Merge pull request #257 from Rangi42/master
More reorganization
Diffstat (limited to 'data/mapObjects/PokemonFanClub.asm')
-rwxr-xr-xdata/mapObjects/PokemonFanClub.asm22
1 files changed, 0 insertions, 22 deletions
diff --git a/data/mapObjects/PokemonFanClub.asm b/data/mapObjects/PokemonFanClub.asm
deleted file mode 100755
index e1f175f0..00000000
--- a/data/mapObjects/PokemonFanClub.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-PokemonFanClub_Object:
- db $d ; border block
-
- db 2 ; warps
- warp 2, 7, 1, -1
- warp 3, 7, 1, -1
-
- db 2 ; signs
- sign 1, 0, 7 ; FanClubText7
- sign 6, 0, 8 ; FanClubText8
-
- db 6 ; objects
- object SPRITE_FISHER2, 6, 3, STAY, LEFT, 1 ; person
- object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person
- object SPRITE_CLEFAIRY, 6, 4, STAY, LEFT, 3 ; person
- object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person
- object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 5, 1, STAY, DOWN, 6 ; person
-
- ; warp-to
- warp_to 2, 7, POKEMON_FAN_CLUB_WIDTH
- warp_to 3, 7, POKEMON_FAN_CLUB_WIDTH