Merge commit '8d75f96' into master

Mostly sprite stuff.
This commit is contained in:
Bryan Bishop 2013-08-12 15:16:23 -05:00
commit 1cb19a03a3
355 changed files with 4708 additions and 2316 deletions

View File

@ -1583,3 +1583,187 @@ EAST EQU 1
WEST EQU 2
SOUTH EQU 4
NORTH EQU 8
; sprites
SPRITE_CHRIS EQU $01
SPRITE_CHRIS_BIKE EQU $02
SPRITE_GAMEBOY_KID EQU $03
SPRITE_SILVER EQU $04
SPRITE_OAK EQU $05
SPRITE_RED EQU $06
SPRITE_BLUE EQU $07
SPRITE_BILL EQU $08
SPRITE_ELDER EQU $09
SPRITE_JANINE EQU $0a
SPRITE_KURT EQU $0b
SPRITE_MOM EQU $0c
SPRITE_BLAINE EQU $0d
SPRITE_REDS_MOM EQU $0e
SPRITE_DAISY EQU $0f
SPRITE_ELM EQU $10
SPRITE_WILL EQU $11
SPRITE_FALKNER EQU $12
SPRITE_WHITNEY EQU $13
SPRITE_BUGSY EQU $14
SPRITE_MORTY EQU $15
SPRITE_CHUCK EQU $16
SPRITE_JASMINE EQU $17
SPRITE_PRYCE EQU $18
SPRITE_CLAIR EQU $19
SPRITE_BROCK EQU $1a
SPRITE_KAREN EQU $1b
SPRITE_BRUNO EQU $1c
SPRITE_MISTY EQU $1d
SPRITE_LANCE EQU $1e
SPRITE_SURGE EQU $1f
SPRITE_ERIKA EQU $20
SPRITE_KOGA EQU $21
SPRITE_SABRINA EQU $22
SPRITE_COOLTRAINER_M EQU $23
SPRITE_COOLTRAINER_F EQU $24
SPRITE_BUG_CATCHER EQU $25
SPRITE_TWIN EQU $26
SPRITE_YOUNGSTER EQU $27
SPRITE_LASS EQU $28
SPRITE_TEACHER EQU $29
SPRITE_BUENA EQU $2a
SPRITE_SUPER_NERD EQU $2b
SPRITE_ROCKER EQU $2c
SPRITE_POKEFAN_M EQU $2d
SPRITE_POKEFAN_F EQU $2e
SPRITE_GRAMPS EQU $2f
SPRITE_GRANNY EQU $30
SPRITE_SWIMMER_GUY EQU $31
SPRITE_SWIMMER_GIRL EQU $32
SPRITE_BIG_SNORLAX EQU $33
SPRITE_SURFING_PIKACHU EQU $34
SPRITE_ROCKET EQU $35
SPRITE_ROCKET_GIRL EQU $36
SPRITE_NURSE EQU $37
SPRITE_LINK_RECEPTIONIST EQU $38
SPRITE_CLERK EQU $39
SPRITE_FISHER EQU $3a
SPRITE_FISHING_GURU EQU $3b
SPRITE_SCIENTIST EQU $3c
SPRITE_KIMONO_GIRL EQU $3d
SPRITE_SAGE EQU $3e
SPRITE_UNUSED_GUY EQU $3f
SPRITE_GENTLEMAN EQU $40
SPRITE_BLACK_BELT EQU $41
SPRITE_RECEPTIONIST EQU $42
SPRITE_OFFICER EQU $43
SPRITE_CAL EQU $44
SPRITE_SLOWPOKE EQU $45
SPRITE_CAPTAIN EQU $46
SPRITE_BIG_LAPRAS EQU $47
SPRITE_GYM_GUY EQU $48
SPRITE_SAILOR EQU $49
SPRITE_BIKER EQU $4a
SPRITE_PHARMACIST EQU $4b
SPRITE_MONSTER EQU $4c
SPRITE_FAIRY EQU $4d
SPRITE_BIRD EQU $4e
SPRITE_DRAGON EQU $4f
SPRITE_BIG_ONIX EQU $50
SPRITE_N64 EQU $51
SPRITE_SUDOWOODO EQU $52
SPRITE_SURF EQU $53
SPRITE_POKE_BALL EQU $54
SPRITE_POKEDEX EQU $55
SPRITE_PAPER EQU $56
SPRITE_VIRTUAL_BOY EQU $57
SPRITE_OLD_LINK_RECEPTIONIST EQU $58
SPRITE_ROCK EQU $59
SPRITE_BOULDER EQU $5a
SPRITE_SNES EQU $5b
SPRITE_FAMICOM EQU $5c
SPRITE_FRUIT_TREE EQU $5d
SPRITE_GOLD_TROPHY EQU $5e
SPRITE_SILVER_TROPHY EQU $5f
SPRITE_KRIS EQU $60
SPRITE_KRIS_BIKE EQU $61
SPRITE_KURT_OUTSIDE EQU $62
SPRITE_SUICUNE EQU $63
SPRITE_ENTEI EQU $64
SPRITE_RAIKOU EQU $65
SPRITE_STANDING_YOUNGSTER EQU $66
SPRITE_POKEMON EQU $80
SPRITE_UNOWN EQU $80
SPRITE_GEODUDE EQU $81
SPRITE_GROWLITHE EQU $82
SPRITE_WEEDLE EQU $83
SPRITE_SHELLDER EQU $84
SPRITE_ODDISH EQU $85
SPRITE_GENGAR EQU $86
SPRITE_ZUBAT EQU $87
SPRITE_MAGIKARP EQU $88
SPRITE_SQUIRTLE EQU $89
SPRITE_TOGEPI EQU $8a
SPRITE_BUTTERFREE EQU $8b
SPRITE_DIGLETT EQU $8c
SPRITE_POLIWAG EQU $8d
SPRITE_PIKACHU EQU $8e
SPRITE_CLEFAIRY EQU $8f
SPRITE_CHARMANDER EQU $90
SPRITE_JYNX EQU $91
SPRITE_STARMIE EQU $92
SPRITE_BULBASAUR EQU $93
SPRITE_JIGGLYPUFF EQU $94
SPRITE_GRIMER EQU $95
SPRITE_EKANS EQU $96
SPRITE_PARAS EQU $97
SPRITE_TENTACOOL EQU $98
SPRITE_TAUROS EQU $99
SPRITE_MACHOP EQU $9a
SPRITE_VOLTORB EQU $9b
SPRITE_LAPRAS EQU $9c
SPRITE_RHYDON EQU $9d
SPRITE_MOLTRES EQU $9e
SPRITE_SNORLAX EQU $9f
SPRITE_GYARADOS EQU $a0
SPRITE_LUGIA EQU $a1
SPRITE_HO_OH EQU $a2
SPRITE_DAYCARE_MON_1 EQU $e0
SPRITE_DAYCARE_MON_2 EQU $e1
SPRITE_VARS EQU $f0
SPRITE_CONSOLE EQU $f0
SPRITE_DOLL_1 EQU $f1
SPRITE_DOLL_2 EQU $f2
SPRITE_BIG_DOLL EQU $f3
SPRITE_WEIRD_TREE EQU $f4
SPRITE_OLIVINE_RIVAL EQU $f5
SPRITE_AZALEA_ROCKET EQU $f6
SPRITE_FUSCHIA_GYM_1 EQU $f7
SPRITE_FUSCHIA_GYM_2 EQU $f8
SPRITE_FUSCHIA_GYM_3 EQU $f9
SPRITE_FUSCHIA_GYM_4 EQU $fa
SPRITE_COPYCAT EQU $fb
SPRITE_JANINE_IMPERSONATOR EQU $fc
; sprite types
WALKING_SPRITE EQU 1
STANDING_SPRITE EQU 2
STILL_SPRITE EQU 3
; sprite palettes
PAL_OW_RED EQU 0
PAL_OW_BLUE EQU 1
PAL_OW_GREEN EQU 2
PAL_OW_BROWN EQU 3
PAL_OW_PINK EQU 4
PAL_OW_SILVER EQU 5
PAL_OW_TREE EQU 6
PAL_OW_ROCK EQU 7
; permissions
TOWN EQU 1
ROUTE EQU 2
INDOOR EQU 3
CAVE EQU 4
GATE EQU 6
DUNGEON EQU 7

File diff suppressed because it is too large Load Diff

View File

@ -1,252 +1,382 @@
ChrisSpriteGFX: ; c0000
INCBIN "gfx/overworld/000.2bpp"
INCBIN "gfx/overworld/001.2bpp"
INCBIN "gfx/overworld/002.2bpp"
INCBIN "gfx/overworld/003.2bpp"
INCBIN "gfx/overworld/004.2bpp"
INCBIN "gfx/overworld/005.2bpp"
; c0180
ChrisBikeSpriteGFX: ; c0180
INCBIN "gfx/overworld/006.2bpp"
INCBIN "gfx/overworld/007.2bpp"
INCBIN "gfx/overworld/008.2bpp"
INCBIN "gfx/overworld/009.2bpp"
INCBIN "gfx/overworld/010.2bpp"
INCBIN "gfx/overworld/011.2bpp"
; c0300
GameboyKidSpriteGFX: ; c0300
INCBIN "gfx/overworld/012.2bpp"
INCBIN "gfx/overworld/013.2bpp"
INCBIN "gfx/overworld/014.2bpp"
; c03c0
SilverSpriteGFX: ; c03c0
INCBIN "gfx/overworld/015.2bpp"
INCBIN "gfx/overworld/016.2bpp"
INCBIN "gfx/overworld/017.2bpp"
INCBIN "gfx/overworld/018.2bpp"
INCBIN "gfx/overworld/019.2bpp"
INCBIN "gfx/overworld/020.2bpp"
; c0540
OakSpriteGFX: ; c0540
INCBIN "gfx/overworld/021.2bpp"
INCBIN "gfx/overworld/022.2bpp"
INCBIN "gfx/overworld/023.2bpp"
INCBIN "gfx/overworld/024.2bpp"
INCBIN "gfx/overworld/025.2bpp"
INCBIN "gfx/overworld/026.2bpp"
; c06c0
RedSpriteGFX: ; c06c0
INCBIN "gfx/overworld/027.2bpp"
INCBIN "gfx/overworld/028.2bpp"
INCBIN "gfx/overworld/029.2bpp"
INCBIN "gfx/overworld/030.2bpp"
INCBIN "gfx/overworld/031.2bpp"
INCBIN "gfx/overworld/032.2bpp"
; c0840
BlueSpriteGFX: ; c0840
INCBIN "gfx/overworld/033.2bpp"
INCBIN "gfx/overworld/034.2bpp"
INCBIN "gfx/overworld/035.2bpp"
INCBIN "gfx/overworld/036.2bpp"
INCBIN "gfx/overworld/037.2bpp"
INCBIN "gfx/overworld/038.2bpp"
; c09c0
BillSpriteGFX: ; c09c0
INCBIN "gfx/overworld/039.2bpp"
INCBIN "gfx/overworld/040.2bpp"
INCBIN "gfx/overworld/041.2bpp"
INCBIN "gfx/overworld/042.2bpp"
INCBIN "gfx/overworld/043.2bpp"
INCBIN "gfx/overworld/044.2bpp"
; c0b40
ElderSpriteGFX: ; c0b40
INCBIN "gfx/overworld/045.2bpp"
INCBIN "gfx/overworld/046.2bpp"
INCBIN "gfx/overworld/047.2bpp"
INCBIN "gfx/overworld/048.2bpp"
INCBIN "gfx/overworld/049.2bpp"
INCBIN "gfx/overworld/050.2bpp"
; c0cc0
JanineSpriteGFX: ; c0cc0
INCBIN "gfx/overworld/051.2bpp"
INCBIN "gfx/overworld/052.2bpp"
INCBIN "gfx/overworld/053.2bpp"
INCBIN "gfx/overworld/054.2bpp"
INCBIN "gfx/overworld/055.2bpp"
INCBIN "gfx/overworld/056.2bpp"
; c0e40
KurtSpriteGFX: ; c0e40
INCBIN "gfx/overworld/057.2bpp"
INCBIN "gfx/overworld/058.2bpp"
INCBIN "gfx/overworld/059.2bpp"
INCBIN "gfx/overworld/060.2bpp"
INCBIN "gfx/overworld/061.2bpp"
INCBIN "gfx/overworld/062.2bpp"
; c0fc0
MomSpriteGFX: ; c0fc0
INCBIN "gfx/overworld/063.2bpp"
INCBIN "gfx/overworld/064.2bpp"
INCBIN "gfx/overworld/065.2bpp"
INCBIN "gfx/overworld/066.2bpp"
INCBIN "gfx/overworld/067.2bpp"
INCBIN "gfx/overworld/068.2bpp"
; c1140
BlaineSpriteGFX: ; c1140
INCBIN "gfx/overworld/069.2bpp"
INCBIN "gfx/overworld/070.2bpp"
INCBIN "gfx/overworld/071.2bpp"
INCBIN "gfx/overworld/072.2bpp"
INCBIN "gfx/overworld/073.2bpp"
INCBIN "gfx/overworld/074.2bpp"
; c12c0
RedsMomSpriteGFX: ; c12c0
INCBIN "gfx/overworld/075.2bpp"
INCBIN "gfx/overworld/076.2bpp"
INCBIN "gfx/overworld/077.2bpp"
INCBIN "gfx/overworld/078.2bpp"
INCBIN "gfx/overworld/079.2bpp"
INCBIN "gfx/overworld/080.2bpp"
; c1440
DaisySpriteGFX: ; c1440
INCBIN "gfx/overworld/081.2bpp"
INCBIN "gfx/overworld/082.2bpp"
INCBIN "gfx/overworld/083.2bpp"
INCBIN "gfx/overworld/084.2bpp"
INCBIN "gfx/overworld/085.2bpp"
INCBIN "gfx/overworld/086.2bpp"
; c15c0
ElmSpriteGFX: ; c15c0
INCBIN "gfx/overworld/087.2bpp"
INCBIN "gfx/overworld/088.2bpp"
INCBIN "gfx/overworld/089.2bpp"
INCBIN "gfx/overworld/090.2bpp"
INCBIN "gfx/overworld/091.2bpp"
INCBIN "gfx/overworld/092.2bpp"
; c1740
WillSpriteGFX: ; c1740
INCBIN "gfx/overworld/093.2bpp"
INCBIN "gfx/overworld/094.2bpp"
INCBIN "gfx/overworld/095.2bpp"
; c1800
FalknerSpriteGFX: ; c1800
INCBIN "gfx/overworld/096.2bpp"
INCBIN "gfx/overworld/097.2bpp"
INCBIN "gfx/overworld/098.2bpp"
INCBIN "gfx/overworld/099.2bpp"
INCBIN "gfx/overworld/100.2bpp"
INCBIN "gfx/overworld/101.2bpp"
; c1980
WhitneySpriteGFX: ; c1980
INCBIN "gfx/overworld/102.2bpp"
INCBIN "gfx/overworld/103.2bpp"
INCBIN "gfx/overworld/104.2bpp"
INCBIN "gfx/overworld/105.2bpp"
INCBIN "gfx/overworld/106.2bpp"
INCBIN "gfx/overworld/107.2bpp"
; c1b00
BugsySpriteGFX: ; c1b00
INCBIN "gfx/overworld/108.2bpp"
INCBIN "gfx/overworld/109.2bpp"
INCBIN "gfx/overworld/110.2bpp"
INCBIN "gfx/overworld/111.2bpp"
INCBIN "gfx/overworld/112.2bpp"
INCBIN "gfx/overworld/113.2bpp"
; c1c80
MortySpriteGFX: ; c1c80
INCBIN "gfx/overworld/114.2bpp"
INCBIN "gfx/overworld/115.2bpp"
INCBIN "gfx/overworld/116.2bpp"
INCBIN "gfx/overworld/117.2bpp"
INCBIN "gfx/overworld/118.2bpp"
INCBIN "gfx/overworld/119.2bpp"
; c1e00
ChuckSpriteGFX: ; c1e00
INCBIN "gfx/overworld/120.2bpp"
INCBIN "gfx/overworld/121.2bpp"
INCBIN "gfx/overworld/122.2bpp"
INCBIN "gfx/overworld/123.2bpp"
INCBIN "gfx/overworld/124.2bpp"
INCBIN "gfx/overworld/125.2bpp"
; c1f80
JasmineSpriteGFX: ; c1f80
INCBIN "gfx/overworld/126.2bpp"
INCBIN "gfx/overworld/127.2bpp"
INCBIN "gfx/overworld/128.2bpp"
INCBIN "gfx/overworld/129.2bpp"
INCBIN "gfx/overworld/130.2bpp"
INCBIN "gfx/overworld/131.2bpp"
; c2100
PryceSpriteGFX: ; c2100
INCBIN "gfx/overworld/132.2bpp"
INCBIN "gfx/overworld/133.2bpp"
INCBIN "gfx/overworld/134.2bpp"
INCBIN "gfx/overworld/135.2bpp"
INCBIN "gfx/overworld/136.2bpp"
INCBIN "gfx/overworld/137.2bpp"
; c2280
ClairSpriteGFX: ; c2280
INCBIN "gfx/overworld/138.2bpp"
INCBIN "gfx/overworld/139.2bpp"
INCBIN "gfx/overworld/140.2bpp"
INCBIN "gfx/overworld/141.2bpp"
INCBIN "gfx/overworld/142.2bpp"
INCBIN "gfx/overworld/143.2bpp"
; c2400
BrockSpriteGFX: ; c2400
INCBIN "gfx/overworld/144.2bpp"
INCBIN "gfx/overworld/145.2bpp"
INCBIN "gfx/overworld/146.2bpp"
INCBIN "gfx/overworld/147.2bpp"
INCBIN "gfx/overworld/148.2bpp"
INCBIN "gfx/overworld/149.2bpp"
; c2580
KarenSpriteGFX: ; c2580
INCBIN "gfx/overworld/150.2bpp"
INCBIN "gfx/overworld/151.2bpp"
INCBIN "gfx/overworld/152.2bpp"
; c2640
BrunoSpriteGFX: ; c2640
INCBIN "gfx/overworld/153.2bpp"
INCBIN "gfx/overworld/154.2bpp"
INCBIN "gfx/overworld/155.2bpp"
INCBIN "gfx/overworld/156.2bpp"
INCBIN "gfx/overworld/157.2bpp"
INCBIN "gfx/overworld/158.2bpp"
; c27c0
MistySpriteGFX: ; c27c0
INCBIN "gfx/overworld/159.2bpp"
INCBIN "gfx/overworld/160.2bpp"
INCBIN "gfx/overworld/161.2bpp"
INCBIN "gfx/overworld/162.2bpp"
INCBIN "gfx/overworld/163.2bpp"
INCBIN "gfx/overworld/164.2bpp"
; c2940
LanceSpriteGFX: ; c2940
INCBIN "gfx/overworld/165.2bpp"
INCBIN "gfx/overworld/166.2bpp"
INCBIN "gfx/overworld/167.2bpp"
INCBIN "gfx/overworld/168.2bpp"
INCBIN "gfx/overworld/169.2bpp"
INCBIN "gfx/overworld/170.2bpp"
; c2ac0
SurgeSpriteGFX: ; c2ac0
INCBIN "gfx/overworld/171.2bpp"
INCBIN "gfx/overworld/172.2bpp"
INCBIN "gfx/overworld/173.2bpp"
INCBIN "gfx/overworld/174.2bpp"
INCBIN "gfx/overworld/175.2bpp"
INCBIN "gfx/overworld/176.2bpp"
; c2c40
ErikaSpriteGFX: ; c2c40
INCBIN "gfx/overworld/177.2bpp"
INCBIN "gfx/overworld/178.2bpp"
INCBIN "gfx/overworld/179.2bpp"
INCBIN "gfx/overworld/180.2bpp"
INCBIN "gfx/overworld/181.2bpp"
INCBIN "gfx/overworld/182.2bpp"
; c2dc0
KogaSpriteGFX: ; c2dc0
INCBIN "gfx/overworld/183.2bpp"
INCBIN "gfx/overworld/184.2bpp"
INCBIN "gfx/overworld/185.2bpp"
INCBIN "gfx/overworld/186.2bpp"
INCBIN "gfx/overworld/187.2bpp"
INCBIN "gfx/overworld/188.2bpp"
; c2f40
SabrinaSpriteGFX: ; c2f40
INCBIN "gfx/overworld/189.2bpp"
INCBIN "gfx/overworld/190.2bpp"
INCBIN "gfx/overworld/191.2bpp"
INCBIN "gfx/overworld/192.2bpp"
INCBIN "gfx/overworld/193.2bpp"
INCBIN "gfx/overworld/194.2bpp"
; c30c0
CooltrainerMSpriteGFX: ; c30c0
INCBIN "gfx/overworld/195.2bpp"
INCBIN "gfx/overworld/196.2bpp"
INCBIN "gfx/overworld/197.2bpp"
INCBIN "gfx/overworld/198.2bpp"
INCBIN "gfx/overworld/199.2bpp"
INCBIN "gfx/overworld/200.2bpp"
; c3240
CooltrainerFSpriteGFX: ; c3240
INCBIN "gfx/overworld/201.2bpp"
INCBIN "gfx/overworld/202.2bpp"
INCBIN "gfx/overworld/203.2bpp"
INCBIN "gfx/overworld/204.2bpp"
INCBIN "gfx/overworld/205.2bpp"
INCBIN "gfx/overworld/206.2bpp"
; c33c0
BugCatcherSpriteGFX: ; c33c0
INCBIN "gfx/overworld/207.2bpp"
INCBIN "gfx/overworld/208.2bpp"
INCBIN "gfx/overworld/209.2bpp"
INCBIN "gfx/overworld/210.2bpp"
INCBIN "gfx/overworld/211.2bpp"
INCBIN "gfx/overworld/212.2bpp"
; c3540
TwinSpriteGFX: ; c3540
INCBIN "gfx/overworld/213.2bpp"
INCBIN "gfx/overworld/214.2bpp"
INCBIN "gfx/overworld/215.2bpp"
INCBIN "gfx/overworld/216.2bpp"
INCBIN "gfx/overworld/217.2bpp"
INCBIN "gfx/overworld/218.2bpp"
; c36c0
YoungsterSpriteGFX: ; c36c0
INCBIN "gfx/overworld/219.2bpp"
INCBIN "gfx/overworld/220.2bpp"
INCBIN "gfx/overworld/221.2bpp"
INCBIN "gfx/overworld/222.2bpp"
INCBIN "gfx/overworld/223.2bpp"
INCBIN "gfx/overworld/224.2bpp"
; c3840
LassSpriteGFX: ; c3840
INCBIN "gfx/overworld/225.2bpp"
INCBIN "gfx/overworld/226.2bpp"
INCBIN "gfx/overworld/227.2bpp"
INCBIN "gfx/overworld/228.2bpp"
INCBIN "gfx/overworld/229.2bpp"
INCBIN "gfx/overworld/230.2bpp"
; c39c0
TeacherSpriteGFX: ; c39c0
INCBIN "gfx/overworld/231.2bpp"
INCBIN "gfx/overworld/232.2bpp"
INCBIN "gfx/overworld/233.2bpp"
INCBIN "gfx/overworld/234.2bpp"
INCBIN "gfx/overworld/235.2bpp"
INCBIN "gfx/overworld/236.2bpp"
; c3b40
BuenaSpriteGFX: ; c3b40
INCBIN "gfx/overworld/237.2bpp"
INCBIN "gfx/overworld/238.2bpp"
INCBIN "gfx/overworld/239.2bpp"
INCBIN "gfx/overworld/240.2bpp"
INCBIN "gfx/overworld/241.2bpp"
INCBIN "gfx/overworld/242.2bpp"
; c3cc0
SuperNerdSpriteGFX: ; c3cc0
INCBIN "gfx/overworld/243.2bpp"
INCBIN "gfx/overworld/244.2bpp"
INCBIN "gfx/overworld/245.2bpp"
INCBIN "gfx/overworld/246.2bpp"
INCBIN "gfx/overworld/247.2bpp"
INCBIN "gfx/overworld/248.2bpp"
; c3e40
RockerSpriteGFX: ; c3e40
INCBIN "gfx/overworld/249.2bpp"
INCBIN "gfx/overworld/250.2bpp"
INCBIN "gfx/overworld/251.2bpp"
@ -254,3 +384,5 @@ INCBIN "gfx/overworld/252.2bpp"
INCBIN "gfx/overworld/253.2bpp"
INCBIN "gfx/overworld/254.2bpp"
INCBIN "gfx/overworld/255.2bpp"
; c4000

View File

@ -1,256 +1,430 @@
PokefanMSpriteGFX: ; c4000
INCBIN "gfx/overworld/256.2bpp"
INCBIN "gfx/overworld/257.2bpp"
INCBIN "gfx/overworld/258.2bpp"
INCBIN "gfx/overworld/259.2bpp"
INCBIN "gfx/overworld/260.2bpp"
INCBIN "gfx/overworld/261.2bpp"
; c4180
PokefanFSpriteGFX: ; c4180
INCBIN "gfx/overworld/262.2bpp"
INCBIN "gfx/overworld/263.2bpp"
INCBIN "gfx/overworld/264.2bpp"
INCBIN "gfx/overworld/265.2bpp"
INCBIN "gfx/overworld/266.2bpp"
INCBIN "gfx/overworld/267.2bpp"
; c4300
GrampsSpriteGFX: ; c4300
INCBIN "gfx/overworld/268.2bpp"
INCBIN "gfx/overworld/269.2bpp"
INCBIN "gfx/overworld/270.2bpp"
INCBIN "gfx/overworld/271.2bpp"
INCBIN "gfx/overworld/272.2bpp"
INCBIN "gfx/overworld/273.2bpp"
; c4480
GrannySpriteGFX: ; c4480
INCBIN "gfx/overworld/274.2bpp"
INCBIN "gfx/overworld/275.2bpp"
INCBIN "gfx/overworld/276.2bpp"
INCBIN "gfx/overworld/277.2bpp"
INCBIN "gfx/overworld/278.2bpp"
INCBIN "gfx/overworld/279.2bpp"
; c4600
SwimmerGuySpriteGFX: ; c4600
INCBIN "gfx/overworld/280.2bpp"
INCBIN "gfx/overworld/281.2bpp"
INCBIN "gfx/overworld/282.2bpp"
INCBIN "gfx/overworld/283.2bpp"
INCBIN "gfx/overworld/284.2bpp"
INCBIN "gfx/overworld/285.2bpp"
; c4780
SwimmerGirlSpriteGFX: ; c4780
INCBIN "gfx/overworld/286.2bpp"
INCBIN "gfx/overworld/287.2bpp"
INCBIN "gfx/overworld/288.2bpp"
INCBIN "gfx/overworld/289.2bpp"
INCBIN "gfx/overworld/290.2bpp"
INCBIN "gfx/overworld/291.2bpp"
; c4900
BigSnorlaxSpriteGFX: ; c4900
INCBIN "gfx/overworld/292.2bpp"
INCBIN "gfx/overworld/293.2bpp"
; c4980
SurfingPikachuSpriteGFX: ; c4980
INCBIN "gfx/overworld/294.2bpp"
INCBIN "gfx/overworld/295.2bpp"
INCBIN "gfx/overworld/296.2bpp"
INCBIN "gfx/overworld/297.2bpp"
INCBIN "gfx/overworld/298.2bpp"
INCBIN "gfx/overworld/299.2bpp"
; c4b00
RocketSpriteGFX: ; c4b00
INCBIN "gfx/overworld/300.2bpp"
INCBIN "gfx/overworld/301.2bpp"
INCBIN "gfx/overworld/302.2bpp"
INCBIN "gfx/overworld/303.2bpp"
INCBIN "gfx/overworld/304.2bpp"
INCBIN "gfx/overworld/305.2bpp"
; c4c80
RocketGirlSpriteGFX: ; c4c80
INCBIN "gfx/overworld/306.2bpp"
INCBIN "gfx/overworld/307.2bpp"
INCBIN "gfx/overworld/308.2bpp"
INCBIN "gfx/overworld/309.2bpp"
INCBIN "gfx/overworld/310.2bpp"
INCBIN "gfx/overworld/311.2bpp"
; c4e00
NurseSpriteGFX: ; c4e00
INCBIN "gfx/overworld/312.2bpp"
INCBIN "gfx/overworld/313.2bpp"
INCBIN "gfx/overworld/314.2bpp"
; c4ec0
LinkReceptionistSpriteGFX: ; c4ec0
INCBIN "gfx/overworld/315.2bpp"
INCBIN "gfx/overworld/316.2bpp"
INCBIN "gfx/overworld/317.2bpp"
INCBIN "gfx/overworld/318.2bpp"
INCBIN "gfx/overworld/319.2bpp"
INCBIN "gfx/overworld/320.2bpp"
; c5040
ClerkSpriteGFX: ; c5040
INCBIN "gfx/overworld/321.2bpp"
INCBIN "gfx/overworld/322.2bpp"
INCBIN "gfx/overworld/323.2bpp"
INCBIN "gfx/overworld/324.2bpp"
INCBIN "gfx/overworld/325.2bpp"
INCBIN "gfx/overworld/326.2bpp"
; c51c0
FisherSpriteGFX: ; c51c0
INCBIN "gfx/overworld/327.2bpp"
INCBIN "gfx/overworld/328.2bpp"
INCBIN "gfx/overworld/329.2bpp"
INCBIN "gfx/overworld/330.2bpp"
INCBIN "gfx/overworld/331.2bpp"
INCBIN "gfx/overworld/332.2bpp"
; c5340
FishingGuruSpriteGFX: ; c5340
INCBIN "gfx/overworld/333.2bpp"
INCBIN "gfx/overworld/334.2bpp"
INCBIN "gfx/overworld/335.2bpp"
INCBIN "gfx/overworld/336.2bpp"
INCBIN "gfx/overworld/337.2bpp"
INCBIN "gfx/overworld/338.2bpp"
; c54c0
ScientistSpriteGFX: ; c54c0
INCBIN "gfx/overworld/339.2bpp"
INCBIN "gfx/overworld/340.2bpp"
INCBIN "gfx/overworld/341.2bpp"
INCBIN "gfx/overworld/342.2bpp"
INCBIN "gfx/overworld/343.2bpp"
INCBIN "gfx/overworld/344.2bpp"
; c5640
KimonoGirlSpriteGFX: ; c5640
INCBIN "gfx/overworld/345.2bpp"
INCBIN "gfx/overworld/346.2bpp"
INCBIN "gfx/overworld/347.2bpp"
INCBIN "gfx/overworld/348.2bpp"
INCBIN "gfx/overworld/349.2bpp"
INCBIN "gfx/overworld/350.2bpp"
; c57c0
SageSpriteGFX: ; c57c0
INCBIN "gfx/overworld/351.2bpp"
INCBIN "gfx/overworld/352.2bpp"
INCBIN "gfx/overworld/353.2bpp"
INCBIN "gfx/overworld/354.2bpp"
INCBIN "gfx/overworld/355.2bpp"
INCBIN "gfx/overworld/356.2bpp"
; c5940
UnusedGuySpriteGFX: ; c5940
INCBIN "gfx/overworld/357.2bpp"
INCBIN "gfx/overworld/358.2bpp"
INCBIN "gfx/overworld/359.2bpp"
INCBIN "gfx/overworld/360.2bpp"
INCBIN "gfx/overworld/361.2bpp"
INCBIN "gfx/overworld/362.2bpp"
; c5ac0
GentlemanSpriteGFX: ; c5ac0
INCBIN "gfx/overworld/363.2bpp"
INCBIN "gfx/overworld/364.2bpp"
INCBIN "gfx/overworld/365.2bpp"
INCBIN "gfx/overworld/366.2bpp"
INCBIN "gfx/overworld/367.2bpp"
INCBIN "gfx/overworld/368.2bpp"
; c5c40
BlackBeltSpriteGFX: ; c5c40
INCBIN "gfx/overworld/369.2bpp"
INCBIN "gfx/overworld/370.2bpp"
INCBIN "gfx/overworld/371.2bpp"
INCBIN "gfx/overworld/372.2bpp"
INCBIN "gfx/overworld/373.2bpp"
INCBIN "gfx/overworld/374.2bpp"
; c5dc0
ReceptionistSpriteGFX: ; c5dc0
INCBIN "gfx/overworld/375.2bpp"
INCBIN "gfx/overworld/376.2bpp"
INCBIN "gfx/overworld/377.2bpp"
INCBIN "gfx/overworld/378.2bpp"
INCBIN "gfx/overworld/379.2bpp"
INCBIN "gfx/overworld/380.2bpp"
; c5f40
OfficerSpriteGFX: ; c5f40
INCBIN "gfx/overworld/381.2bpp"
INCBIN "gfx/overworld/382.2bpp"
INCBIN "gfx/overworld/383.2bpp"
INCBIN "gfx/overworld/384.2bpp"
INCBIN "gfx/overworld/385.2bpp"
INCBIN "gfx/overworld/386.2bpp"
; c60c0
CalSpriteGFX: ; c60c0
INCBIN "gfx/overworld/387.2bpp"
INCBIN "gfx/overworld/388.2bpp"
INCBIN "gfx/overworld/389.2bpp"
INCBIN "gfx/overworld/390.2bpp"
INCBIN "gfx/overworld/391.2bpp"
INCBIN "gfx/overworld/392.2bpp"
; c6240
SlowpokeSpriteGFX: ; c6240
INCBIN "gfx/overworld/393.2bpp"
; c6280
CaptainSpriteGFX: ; c6280
INCBIN "gfx/overworld/394.2bpp"
INCBIN "gfx/overworld/395.2bpp"
INCBIN "gfx/overworld/396.2bpp"
INCBIN "gfx/overworld/397.2bpp"
INCBIN "gfx/overworld/398.2bpp"
INCBIN "gfx/overworld/399.2bpp"
; c6400
BigLaprasSpriteGFX: ; c6400
INCBIN "gfx/overworld/400.2bpp"
INCBIN "gfx/overworld/401.2bpp"
; c6480
GymGuySpriteGFX: ; c6480
INCBIN "gfx/overworld/402.2bpp"
INCBIN "gfx/overworld/403.2bpp"
INCBIN "gfx/overworld/404.2bpp"
INCBIN "gfx/overworld/405.2bpp"
INCBIN "gfx/overworld/406.2bpp"
INCBIN "gfx/overworld/407.2bpp"
; c6600
SailorSpriteGFX: ; c6600
INCBIN "gfx/overworld/408.2bpp"
INCBIN "gfx/overworld/409.2bpp"
INCBIN "gfx/overworld/410.2bpp"
INCBIN "gfx/overworld/411.2bpp"
INCBIN "gfx/overworld/412.2bpp"
INCBIN "gfx/overworld/413.2bpp"
; c6780
BikerSpriteGFX: ; c6780
INCBIN "gfx/overworld/414.2bpp"
INCBIN "gfx/overworld/415.2bpp"
INCBIN "gfx/overworld/416.2bpp"
INCBIN "gfx/overworld/417.2bpp"
INCBIN "gfx/overworld/418.2bpp"
INCBIN "gfx/overworld/419.2bpp"
; c6900
PharmacistSpriteGFX: ; c6900
INCBIN "gfx/overworld/420.2bpp"
INCBIN "gfx/overworld/421.2bpp"
INCBIN "gfx/overworld/422.2bpp"
INCBIN "gfx/overworld/423.2bpp"
INCBIN "gfx/overworld/424.2bpp"
INCBIN "gfx/overworld/425.2bpp"
; c6a80
MonsterSpriteGFX: ; c6a80
INCBIN "gfx/overworld/426.2bpp"
INCBIN "gfx/overworld/427.2bpp"
INCBIN "gfx/overworld/428.2bpp"
INCBIN "gfx/overworld/429.2bpp"
INCBIN "gfx/overworld/430.2bpp"
INCBIN "gfx/overworld/431.2bpp"
; c6c00
FairySpriteGFX: ; c6c00
INCBIN "gfx/overworld/432.2bpp"
INCBIN "gfx/overworld/433.2bpp"
INCBIN "gfx/overworld/434.2bpp"
INCBIN "gfx/overworld/435.2bpp"
INCBIN "gfx/overworld/436.2bpp"
INCBIN "gfx/overworld/437.2bpp"
; c6d80
BirdSpriteGFX: ; c6d80
INCBIN "gfx/overworld/438.2bpp"
INCBIN "gfx/overworld/439.2bpp"
INCBIN "gfx/overworld/440.2bpp"
INCBIN "gfx/overworld/441.2bpp"
INCBIN "gfx/overworld/442.2bpp"
INCBIN "gfx/overworld/443.2bpp"
; c6f00
DragonSpriteGFX: ; c6f00
INCBIN "gfx/overworld/444.2bpp"
INCBIN "gfx/overworld/445.2bpp"
INCBIN "gfx/overworld/446.2bpp"
INCBIN "gfx/overworld/447.2bpp"
INCBIN "gfx/overworld/448.2bpp"
INCBIN "gfx/overworld/449.2bpp"
; c7080
BigOnixSpriteGFX: ; c7080
INCBIN "gfx/overworld/450.2bpp"
INCBIN "gfx/overworld/451.2bpp"
INCBIN "gfx/overworld/452.2bpp"
; c7140
N64SpriteGFX: ; c7140
INCBIN "gfx/overworld/453.2bpp"
; c7180
SudowoodoSpriteGFX: ; c7180
INCBIN "gfx/overworld/454.2bpp"
INCBIN "gfx/overworld/455.2bpp"
; c7200
SurfSpriteGFX: ; c7200
INCBIN "gfx/overworld/456.2bpp"
INCBIN "gfx/overworld/457.2bpp"
INCBIN "gfx/overworld/458.2bpp"
INCBIN "gfx/overworld/459.2bpp"
INCBIN "gfx/overworld/460.2bpp"
INCBIN "gfx/overworld/461.2bpp"
; c7380
PokeBallSpriteGFX: ; c7380
INCBIN "gfx/overworld/462.2bpp"
INCBIN "gfx/overworld/463.2bpp"
INCBIN "gfx/overworld/464.2bpp"
INCBIN "gfx/overworld/465.2bpp"
INCBIN "gfx/overworld/466.2bpp"
INCBIN "gfx/overworld/467.2bpp"
; c7500
PokedexSpriteGFX: ; c7500
INCBIN "gfx/overworld/468.2bpp"
INCBIN "gfx/overworld/469.2bpp"
INCBIN "gfx/overworld/470.2bpp"
INCBIN "gfx/overworld/471.2bpp"
INCBIN "gfx/overworld/472.2bpp"
INCBIN "gfx/overworld/473.2bpp"
; c7680
PaperSpriteGFX: ; c7680
INCBIN "gfx/overworld/474.2bpp"
INCBIN "gfx/overworld/475.2bpp"
INCBIN "gfx/overworld/476.2bpp"
INCBIN "gfx/overworld/477.2bpp"
INCBIN "gfx/overworld/478.2bpp"
INCBIN "gfx/overworld/479.2bpp"
; c7800
VirtualBoySpriteGFX: ; c7800
INCBIN "gfx/overworld/480.2bpp"
; c7840
OldLinkReceptionistSpriteGFX: ; c7840
INCBIN "gfx/overworld/481.2bpp"
; c7880
RockSpriteGFX: ; c7880
INCBIN "gfx/overworld/482.2bpp"
; c78c0
BoulderSpriteGFX: ; c78c0
INCBIN "gfx/overworld/483.2bpp"
; c7900
SnesSpriteGFX: ; c7900
INCBIN "gfx/overworld/484.2bpp"
; c7940
FamicomSpriteGFX: ; c7940
INCBIN "gfx/overworld/485.2bpp"
; c7980
FruitTreeSpriteGFX: ; c7980
INCBIN "gfx/overworld/486.2bpp"
; c79c0
GoldTrophySpriteGFX: ; c79c0
INCBIN "gfx/overworld/487.2bpp"
; c7a00
SilverTrophySpriteGFX: ; c7a00
INCBIN "gfx/overworld/488.2bpp"
; c7a40
KrisSpriteGFX: ; c7a40
INCBIN "gfx/overworld/489.2bpp"
INCBIN "gfx/overworld/490.2bpp"
INCBIN "gfx/overworld/491.2bpp"
INCBIN "gfx/overworld/492.2bpp"
INCBIN "gfx/overworld/493.2bpp"
INCBIN "gfx/overworld/494.2bpp"
; c7bc0
KrisBikeSpriteGFX: ; c7bc0
INCBIN "gfx/overworld/495.2bpp"
INCBIN "gfx/overworld/496.2bpp"
INCBIN "gfx/overworld/497.2bpp"
INCBIN "gfx/overworld/498.2bpp"
INCBIN "gfx/overworld/499.2bpp"
INCBIN "gfx/overworld/500.2bpp"
; c7d40
KurtOutsideSpriteGFX: ; c7d40
INCBIN "gfx/overworld/501.2bpp"
INCBIN "gfx/overworld/502.2bpp"
INCBIN "gfx/overworld/503.2bpp"
; c7e00
SuicuneSpriteGFX: ; c7e00
INCBIN "gfx/overworld/504.2bpp"
; c7e40
EnteiSpriteGFX: ; c7e40
INCBIN "gfx/overworld/505.2bpp"
; c7e80
RaikouSpriteGFX: ; c7e80
INCBIN "gfx/overworld/506.2bpp"
; c7ec0
StandingYoungsterSpriteGFX: ; c7ec0
INCBIN "gfx/overworld/507.2bpp"
INCBIN "gfx/overworld/508.2bpp"
INCBIN "gfx/overworld/509.2bpp"
INCBIN "gfx/overworld/510.2bpp"
INCBIN "gfx/overworld/511.2bpp"
; c8000

1284
main.asm

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@ AzaleaGym_MapScriptHeader: ; 0x18ec1c
db 0
; 0x18ec1e
UnknownScript_0x18ec1e: ; 0x18ec1e
BugsyScript_0x18ec1e: ; 0x18ec1e
faceplayer
loadfont
checkbit1 $04be
@ -443,13 +443,13 @@ AzaleaGym_MapEventHeader: ; 0x18f3cc
; people-events
db 7
person_event $14, 11, 9, $3, $0, 255, 255, $a0, 0, UnknownScript_0x18ec1e, $ffff
person_event $25, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, $ffff
person_event $25, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, $ffff
person_event $25, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, $ffff
person_event $26, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, $ffff
person_event $26, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, $ffff
person_event $48, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, $ffff
person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, $ffff
person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, $ffff
person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, $ffff
person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, $ffff
person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, $ffff
person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, $ffff
person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, $ffff
; 0x18f441

View File

@ -6,18 +6,18 @@ AzaleaMart_MapScriptHeader: ; 0x18e03e
db 0
; 0x18e040
UnknownScript_0x18e040: ; 0x18e040
ClerkScript_0x18e040: ; 0x18e040
loadfont
pokemart $0, $0003
loadmovesprites
end
; 0x18e047
UnknownScript_0x18e047: ; 0x18e047
CooltrainerMScript_0x18e047: ; 0x18e047
jumptextfaceplayer UnknownText_0x18e04d
; 0x18e04a
UnknownScript_0x18e04a: ; 0x18e04a
BugCatcherScript_0x18e04a: ; 0x18e04a
jumptextfaceplayer UnknownText_0x18e0b6
; 0x18e04d
@ -58,8 +58,8 @@ AzaleaMart_MapEventHeader: ; 0x18e118
; people-events
db 3
person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x18e040, $ffff
person_event $23, 9, 6, $7, $0, 255, 255, $0, 0, UnknownScript_0x18e047, $ffff
person_event $25, 6, 11, $5, $2, 255, 255, $80, 0, UnknownScript_0x18e04a, $ffff
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, $ffff
person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, $ffff
person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, $ffff
; 0x18e14f

View File

@ -13,19 +13,19 @@ UnknownScript_0x18db27: ; 0x18db27
end
; 0x18db28
UnknownScript_0x18db28: ; 0x18db28
NurseScript_0x18db28: ; 0x18db28
jumpstd $0000
; 0x18db2b
UnknownScript_0x18db2b: ; 0x18db2b
GentlemanScript_0x18db2b: ; 0x18db2b
jumptextfaceplayer UnknownText_0x18db34
; 0x18db2e
UnknownScript_0x18db2e: ; 0x18db2e
FishingGuruScript_0x18db2e: ; 0x18db2e
jumptextfaceplayer UnknownText_0x18dbee
; 0x18db31
UnknownScript_0x18db31: ; 0x18db31
PokefanFScript_0x18db31: ; 0x18db31
jumptextfaceplayer UnknownText_0x18dc19
; 0x18db34
@ -87,9 +87,9 @@ AzaleaPokeCenter1F_MapEventHeader: ; 0x18dccf
; people-events
db 4
person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x18db28, $ffff
person_event $40, 10, 13, $4, $10, 255, 255, $0, 0, UnknownScript_0x18db2b, $ffff
person_event $3b, 5, 10, $6, $0, 255, 255, $0, 0, UnknownScript_0x18db2e, $ffff
person_event $2e, 8, 5, $2, $21, 255, 255, $0, 0, UnknownScript_0x18db31, $ffff
person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18db28, $ffff
person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, $ffff
person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, $ffff
person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, $ffff
; 0x18dd18

View File

@ -108,15 +108,15 @@ UnknownScript_0x198091: ; 0x198091
end
; 0x1980ab
UnknownScript_0x1980ab: ; 0x1980ab
AzaleaRocketScript_0x1980ab: ; 0x1980ab
jumptextfaceplayer UnknownText_0x19837b
; 0x1980ae
UnknownScript_0x1980ae: ; 0x1980ae
AzaleaRocketScript_0x1980ae: ; 0x1980ae
jumptextfaceplayer UnknownText_0x1983c7
; 0x1980b1
UnknownScript_0x1980b1: ; 0x1980b1
GrampsScript_0x1980b1: ; 0x1980b1
faceplayer
loadfont
checkbit1 $002b
@ -134,15 +134,15 @@ UnknownScript_0x1980bf: ; 0x1980bf
end
; 0x1980c5
UnknownScript_0x1980c5: ; 0x1980c5
TeacherScript_0x1980c5: ; 0x1980c5
jumptextfaceplayer UnknownText_0x1984ce
; 0x1980c8
UnknownScript_0x1980c8: ; 0x1980c8
YoungsterScript_0x1980c8: ; 0x1980c8
jumptextfaceplayer UnknownText_0x19851a
; 0x1980cb
UnknownScript_0x1980cb: ; 0x1980cb
SlowpokeScript_0x1980cb: ; 0x1980cb
loadfont
2writetext UnknownText_0x1985b0
pause 60
@ -183,7 +183,7 @@ UnknownScript_0x1980e5: ; 0x1980e5
end
; 0x19810c
UnknownScript_0x19810c: ; 0x19810c
KurtOutsideScript_0x19810c: ; 0x19810c
faceplayer
loadfont
2writetext UnknownText_0x198628
@ -225,7 +225,7 @@ MapAzaleaTownSignpost6Script: ; 0x19812c
jumpstd $0011
; 0x19812f
UnknownScript_0x19812f: ; 0x19812f
FruitTreeScript_0x19812f: ; 0x19812f
fruittree $14
; 0x198131
@ -485,17 +485,17 @@ AzaleaTown_MapEventHeader: ; 0x1987c1
; people-events
db 12
person_event $f6, 13, 35, $6, $0, 255, 255, $0, 0, UnknownScript_0x1980ab, $06fa
person_event $2f, 13, 25, $2, $21, 255, 255, $0, 0, UnknownScript_0x1980b1, $ffff
person_event $29, 17, 19, $4, $20, 255, 255, $90, 0, UnknownScript_0x1980c5, $ffff
person_event $27, 13, 11, $5, $1, 255, 255, $a0, 0, UnknownScript_0x1980c8, $ffff
person_event $45, 21, 12, $1, $0, 255, 255, $0, 0, UnknownScript_0x1980cb, $06f9
person_event $45, 13, 22, $1, $0, 255, 255, $0, 0, UnknownScript_0x1980cb, $06f9
person_event $45, 13, 33, $1, $0, 255, 255, $0, 0, UnknownScript_0x1980cb, $06f9
person_event $45, 19, 19, $1, $0, 255, 255, $0, 0, UnknownScript_0x1980cb, $06f9
person_event $5d, 6, 12, $1, $0, 255, 255, $0, 0, UnknownScript_0x19812f, $ffff
person_event $f6, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, $06bf
person_event $f6, 20, 14, $6, $0, 255, 255, $0, 0, UnknownScript_0x1980ae, $06fc
person_event $62, 9, 10, $8, $0, 255, 255, $0, 0, UnknownScript_0x19810c, $07a4
person_event SPRITE_AZALEA_ROCKET, 13, 35, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ab, $06fa
person_event SPRITE_GRAMPS, 13, 25, $2, $21, 255, 255, $0, 0, GrampsScript_0x1980b1, $ffff
person_event SPRITE_TEACHER, 17, 19, $4, $20, 255, 255, $90, 0, TeacherScript_0x1980c5, $ffff
person_event SPRITE_YOUNGSTER, 13, 11, $5, $1, 255, 255, $a0, 0, YoungsterScript_0x1980c8, $ffff
person_event SPRITE_SLOWPOKE, 21, 12, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9
person_event SPRITE_SLOWPOKE, 13, 22, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9
person_event SPRITE_SLOWPOKE, 13, 33, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9
person_event SPRITE_SLOWPOKE, 19, 19, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9
person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19812f, $ffff
person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, $06bf
person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, $06fc
person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, $07a4
; 0x1988d0

View File

@ -55,7 +55,7 @@ UnknownScript_0x9e3e0: ; 0x9e3e0
end
; 0x9e3e2
UnknownScript_0x9e3e2: ; 0x9e3e2
ReceptionistScript_0x9e3e2: ; 0x9e3e2
writebyte $2
special $0086
if_equal $3, BattleTowerBattleRoomScript_0x9f4e4
@ -267,7 +267,7 @@ UnknownScript_0x9e555: ; 0x9e555
2jump UnknownScript_0x9e4b0
; 0x9e55d
UnknownScript_0x9e55d: ; 0x9e55d
YoungsterScript_0x9e55d: ; 0x9e55d
faceplayer
loadfont
2writetext UnknownText_0x9f264
@ -277,15 +277,15 @@ UnknownScript_0x9e55d: ; 0x9e55d
end
; 0x9e568
UnknownScript_0x9e568: ; 0x9e568
CooltrainerFScript_0x9e568: ; 0x9e568
jumptextfaceplayer UnknownText_0x9f2a4
; 0x9e56b
UnknownScript_0x9e56b: ; 0x9e56b
BugCatcherScript_0x9e56b: ; 0x9e56b
jumptextfaceplayer UnknownText_0x9f35b
; 0x9e56e
UnknownScript_0x9e56e: ; 0x9e56e
GrannyScript_0x9e56e: ; 0x9e56e
jumptextfaceplayer UnknownText_0x9f2e3
; 0x9e571
@ -773,10 +773,10 @@ BattleTower1F_MapEventHeader: ; 0x9f3b4
; people-events
db 5
person_event $42, 10, 11, $6, $0, 255, 255, $0, 0, UnknownScript_0x9e3e2, $ffff
person_event $27, 13, 18, $9, $0, 255, 255, $b0, 0, UnknownScript_0x9e55d, $ffff
person_event $24, 13, 8, $5, $1, 255, 255, $80, 0, UnknownScript_0x9e568, $ffff
person_event $25, 7, 5, $2, $11, 255, 255, $90, 0, UnknownScript_0x9e56b, $ffff
person_event $30, 7, 18, $4, $10, 255, 255, $0, 0, UnknownScript_0x9e56e, $ffff
person_event SPRITE_RECEPTIONIST, 10, 11, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x9e3e2, $ffff
person_event SPRITE_YOUNGSTER, 13, 18, $9, $0, 255, 255, $b0, 0, YoungsterScript_0x9e55d, $ffff
person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, $ffff
person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, $ffff
person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, $ffff
; 0x9f40f

View File

@ -161,7 +161,7 @@ BattleTowerBattleRoom_MapEventHeader: ; 0x9f52e
; people-events
db 2
person_event $27, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $0791
person_event $42, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, $ffff
person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $0791
person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, $ffff
; 0x9f558

View File

@ -66,6 +66,6 @@ BattleTowerElevator_MapEventHeader: ; 0x9f594
; people-events
db 1
person_event $42, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, $ffff
person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, $ffff
; 0x9f5b1

View File

@ -107,6 +107,6 @@ BattleTowerHallway_MapEventHeader: ; 0x9f62f
; people-events
db 1
person_event $42, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, $ffff
person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, $ffff
; 0x9f660

View File

@ -21,15 +21,15 @@ UnknownScript_0x9f85b: ; 0x9f85b
return
; 0x9f85f
UnknownScript_0x9f85f: ; 0x9f85f
StandingYoungsterScript_0x9f85f: ; 0x9f85f
jumptextfaceplayer UnknownText_0x9f930
; 0x9f862
UnknownScript_0x9f862: ; 0x9f862
BuenaScript_0x9f862: ; 0x9f862
jumptextfaceplayer UnknownText_0x9f9db
; 0x9f865
UnknownScript_0x9f865: ; 0x9f865
SailorScript_0x9f865: ; 0x9f865
jumptextfaceplayer UnknownText_0x9fa8c
; 0x9f868
@ -138,10 +138,10 @@ BattleTowerOutside_MapEventHeader: ; 0x9fb5f
; people-events
db 4
person_event $66, 16, 10, $7, $0, 255, 255, $80, 0, UnknownScript_0x9f85f, $ffff
person_event $2a, 15, 17, $2, $11, 255, 255, $a0, 0, UnknownScript_0x9f862, $ffff
person_event $49, 22, 16, $5, $1, 255, 255, $0, 0, UnknownScript_0x9f865, $07cf
person_event $28, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, $ffff
person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, $0, 255, 255, $80, 0, StandingYoungsterScript_0x9f85f, $ffff
person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, $ffff
person_event SPRITE_SAILOR, 22, 16, $5, $1, 255, 255, $0, 0, SailorScript_0x9f865, $07cf
person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, $ffff
; 0x9fbb2

View File

@ -6,7 +6,7 @@ BillsHouse_MapScriptHeader: ; 0x189536
db 0
; 0x189538
UnknownScript_0x189538: ; 0x189538
GrampsScript_0x189538: ; 0x189538
faceplayer
loadfont
checkbit1 $0000
@ -368,6 +368,6 @@ BillsHouse_MapEventHeader: ; 0x189b42
; people-events
db 1
person_event $2f, 7, 6, $7, $20, 255, 255, $90, 0, UnknownScript_0x189538, $ffff
person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, $ffff
; 0x189b5f

View File

@ -29,7 +29,7 @@ UnknownScript_0x1a46e5: ; 0x1a46e5
return
; 0x1a46e8
UnknownScript_0x1a46e8: ; 0x1a46e8
SuperNerdScript_0x1a46e8: ; 0x1a46e8
faceplayer
loadfont
checkbit1 $04c4
@ -56,15 +56,15 @@ UnknownScript_0x1a4702: ; 0x1a4702
end
; 0x1a4708
UnknownScript_0x1a4708: ; 0x1a4708
GrampsScript_0x1a4708: ; 0x1a4708
jumptextfaceplayer UnknownText_0x1a48c3
; 0x1a470b
UnknownScript_0x1a470b: ; 0x1a470b
GrampsScript_0x1a470b: ; 0x1a470b
jumptextfaceplayer UnknownText_0x1a48fb
; 0x1a470e
UnknownScript_0x1a470e: ; 0x1a470e
BlackBeltScript_0x1a470e: ; 0x1a470e
faceplayer
loadfont
checkbit1 $0021
@ -82,19 +82,19 @@ UnknownScript_0x1a471c: ; 0x1a471c
end
; 0x1a4722
UnknownScript_0x1a4722: ; 0x1a4722
CooltrainerFScript_0x1a4722: ; 0x1a4722
jumptextfaceplayer UnknownText_0x1a49bd
; 0x1a4725
UnknownScript_0x1a4725: ; 0x1a4725
YoungsterScript_0x1a4725: ; 0x1a4725
jumptextfaceplayer UnknownText_0x1a49f1
; 0x1a4728
UnknownScript_0x1a4728: ; 0x1a4728
CooltrainerFScript_0x1a4728: ; 0x1a4728
jumptextfaceplayer UnknownText_0x1a4b1e
; 0x1a472b
UnknownScript_0x1a472b: ; 0x1a472b
YoungsterScript_0x1a472b: ; 0x1a472b
faceplayer
loadfont
checkbit1 $006d
@ -336,14 +336,14 @@ BlackthornCity_MapEventHeader: ; 0x1a4c57
; people-events
db 9
person_event $2b, 16, 22, $6, $0, 255, 255, $80, 0, UnknownScript_0x1a46e8, $06e3
person_event $2b, 16, 23, $6, $0, 255, 255, $80, 0, UnknownScript_0x1a46e8, $06e4
person_event $2f, 6, 24, $6, $0, 255, 255, $0, 0, UnknownScript_0x1a4708, $074c
person_event $2f, 6, 25, $8, $0, 255, 255, $0, 0, UnknownScript_0x1a470b, $074d
person_event $41, 35, 28, $5, $1, 255, 255, $90, 0, UnknownScript_0x1a470e, $ffff
person_event $24, 29, 13, $5, $2, 255, 255, $80, 0, UnknownScript_0x1a4722, $ffff
person_event $27, 19, 17, $5, $1, 255, 255, $0, 0, UnknownScript_0x1a4725, $ffff
person_event $27, 24, 26, $6, $0, 255, 255, $0, 0, UnknownScript_0x1a472b, $075d
person_event $24, 23, 39, $7, $0, 255, 255, $a0, 0, UnknownScript_0x1a4728, $ffff
person_event SPRITE_SUPER_NERD, 16, 22, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, $06e3
person_event SPRITE_SUPER_NERD, 16, 23, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, $06e4
person_event SPRITE_GRAMPS, 6, 24, $6, $0, 255, 255, $0, 0, GrampsScript_0x1a4708, $074c
person_event SPRITE_GRAMPS, 6, 25, $8, $0, 255, 255, $0, 0, GrampsScript_0x1a470b, $074d
person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, $ffff
person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, $ffff
person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, $ffff
person_event SPRITE_YOUNGSTER, 24, 26, $6, $0, 255, 255, $0, 0, YoungsterScript_0x1a472b, $075d
person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, $ffff
; 0x1a4d1d

View File

@ -6,7 +6,7 @@ BlackthornDodrioTradeHouse_MapScriptHeader: ; 0x195a28
db 0
; 0x195a2a
UnknownScript_0x195a2a: ; 0x195a2a
LassScript_0x195a2a: ; 0x195a2a
faceplayer
loadfont
trade $3
@ -38,6 +38,6 @@ BlackthornDodrioTradeHouse_MapEventHeader: ; 0x195a34
; people-events
db 1
person_event $28, 7, 6, $3, $0, 255, 255, $a0, 0, UnknownScript_0x195a2a, $ffff
person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, LassScript_0x195a2a, $ffff
; 0x195a5b

View File

@ -6,11 +6,11 @@ BlackthornDragonSpeechHouse_MapScriptHeader: ; 0x195947
db 0
; 0x195949
UnknownScript_0x195949: ; 0x195949
GrannyScript_0x195949: ; 0x195949
jumptextfaceplayer UnknownText_0x19595c
; 0x19594c
UnknownScript_0x19594c: ; 0x19594c
EkansScript_0x19594c: ; 0x19594c
loadfont
2writetext UnknownText_0x1959ee
cry DRATINI
@ -56,7 +56,7 @@ BlackthornDragonSpeechHouse_MapEventHeader: ; 0x1959fe
; people-events
db 2
person_event $30, 7, 6, $3, $0, 255, 255, $0, 0, UnknownScript_0x195949, $ffff
person_event $96, 9, 9, $16, $0, 255, 255, $90, 0, UnknownScript_0x19594c, $ffff
person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, $ffff
person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, $ffff
; 0x195a28

View File

@ -26,7 +26,7 @@ UnknownScript_0x194e23: ; 0x194e23
return
; 0x194e24
UnknownScript_0x194e24: ; 0x194e24
ClairScript_0x194e24: ; 0x194e24
faceplayer
loadfont
checkbit2 $0022
@ -428,10 +428,10 @@ BlackthornGym1F_MapEventHeader: ; 0x1956ae
; people-events
db 5
person_event $19, 7, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x194e24, $ffff
person_event $23, 10, 10, $6, $0, 255, 255, $82, 3, TrainerCooltrainermMike, $ffff
person_event $23, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, $ffff
person_event $24, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, $ffff
person_event $48, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, $ffff
person_event SPRITE_CLAIR, 7, 9, $6, $0, 255, 255, $90, 0, ClairScript_0x194e24, $ffff
person_event SPRITE_COOLTRAINER_M, 10, 10, $6, $0, 255, 255, $82, 3, TrainerCooltrainermMike, $ffff
person_event SPRITE_COOLTRAINER_M, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, $ffff
person_event SPRITE_COOLTRAINER_F, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, $ffff
person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, $ffff
; 0x195722

View File

@ -65,7 +65,7 @@ UnknownScript_0x195758: ; 0x195758
; 0x19575e
UnknownScript_0x19575e: ; 0x19575e
BoulderScript_0x19575e: ; 0x19575e
jumpstd $000e
; 0x195761
@ -189,13 +189,13 @@ BlackthornGym2F_MapEventHeader: ; 0x1958c0
; people-events
db 8
person_event $23, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, $ffff
person_event $24, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, $ffff
person_event $5a, 6, 12, $19, $0, 255, 255, $0, 0, UnknownScript_0x19575e, $0706
person_event $5a, 7, 6, $19, $0, 255, 255, $0, 0, UnknownScript_0x19575e, $0707
person_event $5a, 20, 10, $19, $0, 255, 255, $0, 0, UnknownScript_0x19575e, $0708
person_event $5a, 7, 7, $19, $0, 255, 255, $0, 0, UnknownScript_0x19575e, $ffff
person_event $5a, 5, 10, $19, $0, 255, 255, $0, 0, UnknownScript_0x19575e, $ffff
person_event $5a, 18, 12, $19, $0, 255, 255, $0, 0, UnknownScript_0x19575e, $ffff
person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, $ffff
person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, $ffff
person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0706
person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0707
person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0708
person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff
person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff
person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff
; 0x195947

Some files were not shown because too many files have changed in this diff Show More