diff options
| author | Logan <log.butt@gmail.com> | 2016-05-30 00:54:10 +1200 |
|---|---|---|
| committer | Logan <log.butt@gmail.com> | 2016-05-30 00:54:10 +1200 |
| commit | 492c0961713e18f0828bc2f88bfc8cfff2b0b8ab (patch) | |
| tree | 6146e2a2f17c7325b5abef7af0bf082effe7453c /data | |
| parent | f71b489ad8c194a392ca79b07261816b61cb55e2 (diff) | |
Merge branch 'master' of https://github.com/einstein95/pokered
Diffstat (limited to 'data')
| -rwxr-xr-x | data/hidden_item_coords.asm | 2 | ||||
| -rwxr-xr-x | data/mapObjects/pokemontower7.asm | 9 | ||||
| -rwxr-xr-x | data/trainer_parties.asm | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm index 54c785f5..b2f9b3cc 100755 --- a/data/hidden_item_coords.asm +++ b/data/hidden_item_coords.asm @@ -34,7 +34,7 @@ HiddenItemCoords: ; 766b8 (1d:66b8) db ROUTE_23,$5a,$08 db VICTORY_ROAD_2,$02,$05 db VICTORY_ROAD_2,$07,$1a - db $6f,$0b,$0e + db UNUSED_MAP_6F,$0b,$0e db VIRIDIAN_CITY,$04,$0e db ROUTE_11,$05,$30 db ROUTE_12,$3f,$02 diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index fd1fc884..b7826b73 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -6,18 +6,11 @@ PokemonTower7Object: ; 0x60ef6 (size=42) db $0 ; signs -IF DEF(_YELLOW) - db 3 ; objects - object SPRITE_JESSIE, $a 8, 8, STAY, DOWN, 1 - object SPRITE_JAMES, $b, 8, STAY, DOWN, 2 - object SPRITE_MR_FUJI, $a, 3, STAY, DOWN, 3 -ELSE - db $4 ; objects + db 4 ; objects object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, OPP_ROCKET, $13 object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, OPP_ROCKET, $14 object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, OPP_ROCKET, $15 object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person -ENDC ; warp-to EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6 diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index 321e565c..9bc80da1 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -57,6 +57,7 @@ TrainerDataPointers: ; 39d3b (e:5d3b) ; null-terminated YoungsterData: +; Route 3 db 11,RATTATA,EKANS,0 db 14,SPEAROW,0 db 10,RATTATA,RATTATA,ZUBAT,0 @@ -71,9 +72,11 @@ YoungsterData: db 18,NIDORAN_M,NIDORINO,0 db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0 BugCatcherData: +; Viridian Forest db 6,WEEDLE,CATERPIE,0 db 7,WEEDLE,KAKUNA,WEEDLE,0 db 9,WEEDLE,0 +; Route 3 db 10,CATERPIE,WEEDLE,CATERPIE,0 db 9,WEEDLE,KAKUNA,CATERPIE,METAPOD,0 db 11,CATERPIE,METAPOD,0 @@ -86,6 +89,7 @@ BugCatcherData: db 19,BEEDRILL,BEEDRILL,0 db 20,CATERPIE,WEEDLE,VENONAT,0 LassData: +; Route 3 db 9,PIDGEY,PIDGEY,0 db 10,RATTATA,NIDORAN_M,0 db 14,JIGGLYPUFF,0 |