diff options
Diffstat (limited to 'data')
428 files changed, 2589 insertions, 2434 deletions
diff --git a/data/animations.asm b/data/animations.asm index a9d22e54..cf6dc150 100755 --- a/data/animations.asm +++ b/data/animations.asm @@ -296,7 +296,7 @@ WingAttackAnim: ; 7a277 (1e:6277) WhirlwindAnim: ; 7a27b (1e:627b) db $46,$11,$10 - db SE_SLIDE_ENEMY_MON_OUT, $FF + db SE_SLIDE_ENEMY_MON_OFF, $FF db $FF FlyAnim: ; 7a281 (1e:6281) @@ -550,19 +550,19 @@ DrillPeckAnim: ; 7a3c8 (1e:63c8) db $FF SubmissionAnim: ; 7a3cc (1e:63cc) - db SE_SLIDE_MON_OUT, $41 + db SE_SLIDE_MON_OFF, $41 db $06,$FF,$01 db SE_SHOW_MON_PIC, $FF db $FF LowKickAnim: ; 7a3d4 (1e:63d4) - db SE_SLIDE_MON_OUT, $42 + db SE_SLIDE_MON_OFF, $42 db $46,$FF,$04 db SE_SHOW_MON_PIC, $FF db $FF CounterAnim: ; 7a3dc (1e:63dc) - db SE_SLIDE_MON_OUT, $43 + db SE_SLIDE_MON_OFF, $43 db $46,$FF,$04 db SE_SHOW_MON_PIC, $FF db $FF @@ -571,7 +571,7 @@ SeismicTossAnim: ; 7a3e4 (1e:63e4) db SE_BLINK_ENEMY_MON, $FF db $41,$8B,$4E db SE_HIDE_ENEMY_MON_PIC, $FF - db SE_SLIDE_MON_OUT, $FF + db SE_SLIDE_MON_OFF, $FF db $42,$44,$4F db SE_DELAY_ANIMATION_10, $FF db SE_DELAY_ANIMATION_10, $FF @@ -736,7 +736,7 @@ AgilityAnim: ; 7a4c3 (1e:64c3) db $FF QuickAttackAnim: ; 7a4c8 (1e:64c8) - db SE_SLIDE_MON_OUT, $61 + db SE_SLIDE_MON_OFF, $61 db $46,$FF,$04 db SE_SHOW_MON_PIC, $FF db $FF @@ -960,7 +960,7 @@ KinesisAnim: ; 7a5fa (1e:65fa) db $FF SoftboiledAnim: ; 7a5fe (1e:65fe) - db SE_SLIDE_MON_HALF_LEFT, $48 + db SE_SLIDE_MON_HALF_OFF, $48 db $08,$86,$4C db SE_LIGHT_SCREEN_PALETTE, $FF db SE_SPIRAL_BALLS_INWARD, $FF @@ -1119,7 +1119,7 @@ SlashAnim: ; 7a6cd (1e:66cd) db $FF SubstituteAnim: ; 7a6d1 (1e:66d1) - db SE_SLIDE_MON_OUT, $A3 + db SE_SLIDE_MON_OFF, $A3 db $08,$FF,$47 db SE_SUBSTITUTE_MON, $FF db $FF diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm index 80ee9e06..bb5b15e5 100755 --- a/data/baseStats/abra.asm +++ b/data/baseStats/abra.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11110000 -db %10000111 -db %00111000 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm index 75067ad3..949d39dc 100755 --- a/data/baseStats/aerodactyl.asm +++ b/data/baseStats/aerodactyl.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00101010 -db %01000011 -db %01001000 -db %11000000 -db %01100011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,23 + tmlearn 31,32 + tmlearn 33,34,38,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm index d9a1abf3..69e39afc 100755 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11111000 -db %10000111 -db %00111000 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 28,29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm index bddcab5b..34a73933 100755 --- a/data/baseStats/arbok.asm +++ b/data/baseStats/arbok.asm @@ -19,11 +19,11 @@ db POISON_STING db 0 db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %00011000 -db %11001110 -db %10000010 -db %10001000 -db %00100010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20,21 + tmlearn 26,27,28,31,32 + tmlearn 34,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm index 065edb6d..4d4e8f77 100755 --- a/data/baseStats/arcanine.asm +++ b/data/baseStats/arcanine.asm @@ -19,11 +19,11 @@ db LEER db TAKE_DOWN db 5 ; growth rate ; learnset -db %10100000 -db %01000011 -db %01001000 -db %11101000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20,23 + tmlearn 28,30,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm index 811bb884..31c328ed 100755 --- a/data/baseStats/articuno.asm +++ b/data/baseStats/articuno.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00101010 -db %01111111 -db %00001000 -db %11000000 -db %01000011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/beedrill.asm b/data/baseStats/beedrill.asm index 9381a63a..b3c85f3d 100755 --- a/data/baseStats/beedrill.asm +++ b/data/baseStats/beedrill.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100100 -db %01000011 -db %00011000 -db %11000000 -db %11000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10,15 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 33,34,39,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm index e8b7d97a..d6297826 100755 --- a/data/baseStats/bellsprout.asm +++ b/data/baseStats/bellsprout.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %00100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm index 1ab81327..e5ccd2db 100755 --- a/data/baseStats/blastoise.asm +++ b/data/baseStats/blastoise.asm @@ -19,11 +19,11 @@ db BUBBLE db WATER_GUN db 3 ; growth rate ; learnset -db %10110001 -db %01111111 -db %00001111 -db %11001110 -db %10000011 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm index 5bf8a184..261b28ee 100755 --- a/data/baseStats/bulbasaur.asm +++ b/data/baseStats/bulbasaur.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm index ef1fbc11..f17e21fb 100755 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -19,11 +19,12 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00111000 -db %11110000 -db %01000011 -db %00101000 -db %01000010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 29,30,31,32 + tmlearn 33,34,39 + tmlearn 44,46 + tmlearn 50,55 +ENDC db 0 ; padding diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm index 0dab990b..975f31a1 100755 --- a/data/baseStats/caterpie.asm +++ b/data/baseStats/caterpie.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm index 248e3d6b..1dd96a9a 100755 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -19,11 +19,11 @@ db 0 db 0 db 4 ; growth rate ; learnset -db %10110001 -db %01111111 -db %10101111 -db %11110001 -db %10110111 -db %00111001 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,37,38,40 + tmlearn 41,44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm index 412c11e7..b4b908c8 100755 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -19,11 +19,11 @@ db EMBER db LEER db 3 ; growth rate ; learnset -db %10110101 -db %01000011 -db %01001111 -db %11001110 -db %11100011 -db %00001000 -db %00101110 + tmlearn 1,3,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20,23 + tmlearn 26,27,28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50,51,52,54 db 0 ; padding diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm index c9deed08..936befa4 100755 --- a/data/baseStats/charmander.asm +++ b/data/baseStats/charmander.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110101 -db %00000011 -db %01001111 -db %11001000 -db %11100011 -db %00001000 -db %00100110 + tmlearn 1,3,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20,23 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm index 6b2b9ba9..8e2675f0 100755 --- a/data/baseStats/charmeleon.asm +++ b/data/baseStats/charmeleon.asm @@ -19,11 +19,11 @@ db EMBER db 0 db 3 ; growth rate ; learnset -db %10110101 -db %00000011 -db %01001111 -db %11001000 -db %11100011 -db %00001000 -db %00100110 + tmlearn 1,3,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20,23 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm index 8fee3ec6..e26f1445 100755 --- a/data/baseStats/clefable.asm +++ b/data/baseStats/clefable.asm @@ -19,11 +19,11 @@ db MINIMIZE db METRONOME db 4 ; growth rate ; learnset -db %10110001 -db %01111111 -db %10101111 -db %11110001 -db %10100111 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm index bea2ffec..cc47df10 100755 --- a/data/baseStats/clefairy.asm +++ b/data/baseStats/clefairy.asm @@ -19,11 +19,11 @@ db 0 db 0 db 4 ; growth rate ; learnset -db %10110001 -db %00111111 -db %10101111 -db %11110001 -db %10100111 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm index d57b651a..aa09d48a 100755 --- a/data/baseStats/cloyster.asm +++ b/data/baseStats/cloyster.asm @@ -19,11 +19,11 @@ db CLAMP db AURORA_BEAM db 5 ; growth rate ; learnset -db %00100000 -db %01111111 -db %00001000 -db %11100000 -db %01001011 -db %01001000 -db %00010011 + tmlearn 6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 30,31,32 + tmlearn 33,34,36,39 + tmlearn 44,47 + tmlearn 49,50,53 db 0 ; padding diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm index 42bb717c..74584844 100755 --- a/data/baseStats/cubone.asm +++ b/data/baseStats/cubone.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %00111111 -db %00001111 -db %11001110 -db %10100010 -db %00001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,38,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm index 5246189e..e7efc42b 100755 --- a/data/baseStats/dewgong.asm +++ b/data/baseStats/dewgong.asm @@ -19,11 +19,11 @@ db AURORA_BEAM db 0 db 0 ; growth rate ; learnset -db %11100000 -db %11111111 -db %00001000 -db %11000000 -db %10000010 -db %00001000 -db %00110010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm index 7412f253..a66f9e34 100755 --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00001000 -db %11001110 -db %00000010 -db %10001000 -db %00000110 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 26,27,28,31,32 + tmlearn 34 + tmlearn 44,48 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm index 0a35bf55..88def477 100755 --- a/data/baseStats/ditto.asm +++ b/data/baseStats/ditto.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm index b872ba47..025204fb 100755 --- a/data/baseStats/dodrio.asm +++ b/data/baseStats/dodrio.asm @@ -19,11 +19,11 @@ db FURY_ATTACK db 0 db 0 ; growth rate ; learnset -db %10101000 -db %01000011 -db %00001000 -db %11000000 -db %10000011 -db %00001100 -db %00001011 + tmlearn 4,6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 43,44 + tmlearn 49,50,52 db 0 ; padding diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm index 8070ba33..091152dd 100755 --- a/data/baseStats/doduo.asm +++ b/data/baseStats/doduo.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10101000 -db %00000011 -db %00001000 -db %11000000 -db %10000011 -db %00001100 -db %00001011 + tmlearn 4,6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 43,44 + tmlearn 49,50,52 db 0 ; padding diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm index 89ff2eef..b8f0a606 100755 --- a/data/baseStats/dragonair.asm +++ b/data/baseStats/dragonair.asm @@ -19,11 +19,11 @@ db THUNDER_WAVE db 0 db 5 ; growth rate ; learnset -db %11100000 -db %00111111 -db %11001000 -db %11000001 -db %11100011 -db %00011000 -db %00010010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20,23,24 + tmlearn 25,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm index 3699955b..1000e384 100755 --- a/data/baseStats/dragonite.asm +++ b/data/baseStats/dragonite.asm @@ -19,11 +19,11 @@ db THUNDER_WAVE db AGILITY db 5 ; growth rate ; learnset -db %11100010 -db %01111111 -db %11001000 -db %11000001 -db %11100011 -db %00011000 -db %00110010 + tmlearn 2,6,7,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,23,24 + tmlearn 25,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm index 4837e4a5..37ed8f09 100755 --- a/data/baseStats/dratini.asm +++ b/data/baseStats/dratini.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %10100000 -db %00111111 -db %11001000 -db %11000001 -db %11100011 -db %00011000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20,23,24 + tmlearn 25,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm index dfa591bd..6397eeaf 100755 --- a/data/baseStats/drowzee.asm +++ b/data/baseStats/drowzee.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11110000 -db %10000111 -db %00111010 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 42,44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm index c55e8bea..5892b020 100755 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -19,11 +19,11 @@ db DIG db 0 db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %00001000 -db %11001110 -db %00000010 -db %10001000 -db %00000110 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 26,27,28,31,32 + tmlearn 34 + tmlearn 44,48 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm index efeb785a..87c21acd 100755 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00001000 -db %11000000 -db %11000011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm index 79dbcbf5..26e75eeb 100755 --- a/data/baseStats/ekans.asm +++ b/data/baseStats/ekans.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00011000 -db %11001110 -db %10000010 -db %10001000 -db %00100010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20,21 + tmlearn 26,27,28,31,32 + tmlearn 34,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm index ac692436..5dc76c37 100755 --- a/data/baseStats/electabuzz.asm +++ b/data/baseStats/electabuzz.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01000011 -db %10001111 -db %11110001 -db %11000111 -db %00111000 -db %01100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,39,40 + tmlearn 44,45,46 + tmlearn 50,54,55 db 0 ; padding diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm index 7ce93e8d..dc9da8d3 100755 --- a/data/baseStats/electrode.asm +++ b/data/baseStats/electrode.asm @@ -19,11 +19,11 @@ db SONICBOOM db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01000001 -db %10001000 -db %11100001 -db %11001011 -db %01011000 -db %01000010 + tmlearn 6 + tmlearn 9,15 + tmlearn 20,24 + tmlearn 25,30,31,32 + tmlearn 33,34,36,39,40 + tmlearn 44,45,47 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm index ded05789..4c77db2a 100755 --- a/data/baseStats/exeggcute.asm +++ b/data/baseStats/exeggcute.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100000 -db %00000011 -db %00001000 -db %11110000 -db %00011011 -db %01101000 -db %00000010 + tmlearn 6 + tmlearn 9,10 + tmlearn 20 + tmlearn 29,30,31,32 + tmlearn 33,34,36,37 + tmlearn 44,46,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm index e28fb8c8..f67857e2 100755 --- a/data/baseStats/exeggutor.asm +++ b/data/baseStats/exeggutor.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100000 -db %01000011 -db %00111000 -db %11110000 -db %00011011 -db %01101000 -db %00100010 + tmlearn 6 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 29,30,31,32 + tmlearn 33,34,36,37 + tmlearn 44,46,47 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm index 51648c46..015e9ff8 100755 --- a/data/baseStats/farfetchd.asm +++ b/data/baseStats/farfetchd.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10101110 -db %00000011 -db %00001000 -db %11000000 -db %11000011 -db %00001000 -db %00001110 + tmlearn 2,3,4,6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39,40 + tmlearn 44 + tmlearn 50,51,52 db 0 ; padding diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm index 0a5d0c48..8d3059db 100755 --- a/data/baseStats/fearow.asm +++ b/data/baseStats/fearow.asm @@ -19,11 +19,11 @@ db LEER db 0 db 0 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00001000 -db %11000000 -db %01000010 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm index 3910bdb1..a785cf27 100755 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -19,11 +19,11 @@ db QUICK_ATTACK db EMBER db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %00001000 -db %11000000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm index ca6c2285..c6e69bd2 100755 --- a/data/baseStats/gastly.asm +++ b/data/baseStats/gastly.asm @@ -19,11 +19,11 @@ db NIGHT_SHADE db 0 db 3 ; growth rate ; learnset -db %00100000 -db %00000000 -db %10011000 -db %11010001 -db %00001010 -db %01101010 -db %00000010 + tmlearn 6 + tmlearn 0 + tmlearn 20,21,24 + tmlearn 25,29,31,32 + tmlearn 34,36 + tmlearn 42,44,46,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm index a5881476..910903d0 100755 --- a/data/baseStats/gengar.asm +++ b/data/baseStats/gengar.asm @@ -19,11 +19,11 @@ db NIGHT_SHADE db 0 db 3 ; growth rate ; learnset -db %10110001 -db %01000011 -db %10011111 -db %11010001 -db %10001110 -db %01101010 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20,21,24 + tmlearn 25,29,31,32 + tmlearn 34,35,36,40 + tmlearn 42,44,46,47 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm index 52d3553d..e185e3c0 100755 --- a/data/baseStats/geodude.asm +++ b/data/baseStats/geodude.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100001 -db %00000011 -db %00001111 -db %11001110 -db %00101110 -db %11001000 -db %00100010 + tmlearn 1,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,36,38 + tmlearn 44,47,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/gloom.asm b/data/baseStats/gloom.asm index e2c854d4..efee0dae 100755 --- a/data/baseStats/gloom.asm +++ b/data/baseStats/gloom.asm @@ -19,11 +19,11 @@ db STUN_SPORE db 0 db 3 ; growth rate ; learnset -db %00100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm index d89dcb1e..e6a22f70 100755 --- a/data/baseStats/golbat.asm +++ b/data/baseStats/golbat.asm @@ -19,11 +19,11 @@ db BITE db 0 db 0 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00011000 -db %11000000 -db %01000010 -db %00001000 -db %00000010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 34,39 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm index 17afd3c2..36cf0d96 100755 --- a/data/baseStats/goldeen.asm +++ b/data/baseStats/goldeen.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %01100000 -db %00111111 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00010010 + tmlearn 6,7 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/golduck.asm b/data/baseStats/golduck.asm index f3797f73..e063ae47 100755 --- a/data/baseStats/golduck.asm +++ b/data/baseStats/golduck.asm @@ -19,11 +19,11 @@ db DISABLE db 0 db 0 ; growth rate ; learnset -db %10110001 -db %11111111 -db %00001111 -db %11001000 -db %11000010 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20 + tmlearn 28,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm index deebb1d1..1308bc78 100755 --- a/data/baseStats/golem.asm +++ b/data/baseStats/golem.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11001110 -db %00101110 -db %11001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,36,38 + tmlearn 44,47,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm index 586afc2c..8cc740dd 100755 --- a/data/baseStats/graveler.asm +++ b/data/baseStats/graveler.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100001 -db %00000011 -db %00001111 -db %11001110 -db %00101110 -db %11001000 -db %00100010 + tmlearn 1,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,36,38 + tmlearn 44,47,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm index dd17fb05..55aedc95 100755 --- a/data/baseStats/grimer.asm +++ b/data/baseStats/grimer.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000000 -db %10011000 -db %11000001 -db %00101010 -db %01001000 -db %00000010 + tmlearn 6,8 + tmlearn 0 + tmlearn 20,21,24 + tmlearn 25,31,32 + tmlearn 34,36,38 + tmlearn 44,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm index ec48b605..cc4d1ff7 100755 --- a/data/baseStats/growlithe.asm +++ b/data/baseStats/growlithe.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %10100000 -db %00000011 -db %01001000 -db %11001000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20,23 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm index 38856446..fde735ee 100755 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %10100000 -db %01111111 -db %11001000 -db %11000001 -db %10100011 -db %00001000 -db %00110010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,23,24 + tmlearn 25,31,32 + tmlearn 33,34,38,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm index 6ac7db99..a530108a 100755 --- a/data/baseStats/haunter.asm +++ b/data/baseStats/haunter.asm @@ -19,11 +19,11 @@ db NIGHT_SHADE db 0 db 3 ; growth rate ; learnset -db %00100000 -db %00000000 -db %10011000 -db %11010001 -db %00001010 -db %01101010 -db %00000010 + tmlearn 6 + tmlearn 0 + tmlearn 20,21,24 + tmlearn 25,29,31,32 + tmlearn 34,36 + tmlearn 42,44,46,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm index 9cb0d566..4a717248 100755 --- a/data/baseStats/hitmonchan.asm +++ b/data/baseStats/hitmonchan.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11000000 -db %11000110 -db %00001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 31,32 + tmlearn 34,35,39,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm index 126f528b..e25bb725 100755 --- a/data/baseStats/hitmonlee.asm +++ b/data/baseStats/hitmonlee.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11000000 -db %11000110 -db %00001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 31,32 + tmlearn 34,35,39,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm index f59bee0c..b754f425 100755 --- a/data/baseStats/horsea.asm +++ b/data/baseStats/horsea.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00111111 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00010010 + tmlearn 6 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm index 022e3134..3ba1ad30 100755 --- a/data/baseStats/hypno.asm +++ b/data/baseStats/hypno.asm @@ -19,11 +19,11 @@ db DISABLE db CONFUSION db 0 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11110000 -db %10000111 -db %00111010 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 42,44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/ivysaur.asm b/data/baseStats/ivysaur.asm index 78aec210..9672935e 100755 --- a/data/baseStats/ivysaur.asm +++ b/data/baseStats/ivysaur.asm @@ -19,11 +19,11 @@ db LEECH_SEED db 0 db 3 ; growth rate ; learnset -db %10100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm index 0252880f..5111e9c8 100755 --- a/data/baseStats/jigglypuff.asm +++ b/data/baseStats/jigglypuff.asm @@ -19,11 +19,11 @@ db 0 db 0 db 4 ; growth rate ; learnset -db %10110001 -db %00111111 -db %10101111 -db %11110001 -db %10100011 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm index 3a64bf09..e753bf97 100755 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -19,11 +19,11 @@ db QUICK_ATTACK db THUNDERSHOCK db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %10001000 -db %11000001 -db %11000011 -db %00011000 -db %01000010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm index 6299f545..82778775 100755 --- a/data/baseStats/jynx.asm +++ b/data/baseStats/jynx.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01111111 -db %00001111 -db %11110000 -db %10000111 -db %00101000 -db %00000010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,46 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm index 8a9899c7..1fde7156 100755 --- a/data/baseStats/kabuto.asm +++ b/data/baseStats/kabuto.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00111111 -db %00001000 -db %11000000 -db %00000011 -db %00001000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm index 7c80a8c0..170fee9b 100755 --- a/data/baseStats/kabutops.asm +++ b/data/baseStats/kabutops.asm @@ -19,11 +19,11 @@ db ABSORB db 0 db 0 ; growth rate ; learnset -db %10110110 -db %01111111 -db %00001101 -db %11000000 -db %10000011 -db %00001000 -db %00010010 + tmlearn 2,3,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,19,20 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm index 8d3c855c..12387f7f 100755 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11111000 -db %10000111 -db %00111000 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 28,29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/kakuna.asm b/data/baseStats/kakuna.asm index 62e9c225..4ee90925 100755 --- a/data/baseStats/kakuna.asm +++ b/data/baseStats/kakuna.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm index 3d30b78a..a17cb653 100755 --- a/data/baseStats/kangaskhan.asm +++ b/data/baseStats/kangaskhan.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01111111 -db %10001111 -db %11000111 -db %10100010 -db %10001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,31,32 + tmlearn 34,38,40 + tmlearn 44,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm index 8a5b0f98..7604bf80 100755 --- a/data/baseStats/kingler.asm +++ b/data/baseStats/kingler.asm @@ -19,11 +19,11 @@ db VICEGRIP db 0 db 0 ; growth rate ; learnset -db %10100100 -db %01111111 -db %00001000 -db %11000000 -db %00000010 -db %00001000 -db %00110110 + tmlearn 3,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34 + tmlearn 44 + tmlearn 50,51,53,54 db 0 ; padding diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm index d50e5bcf..24f47d17 100755 --- a/data/baseStats/koffing.asm +++ b/data/baseStats/koffing.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00000000 -db %10001000 -db %11000001 -db %00101010 -db %01001000 -db %00000010 + tmlearn 6 + tmlearn 0 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 34,36,38 + tmlearn 44,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm index 37bbaa0b..3d901041 100755 --- a/data/baseStats/krabby.asm +++ b/data/baseStats/krabby.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %00111111 -db %00001000 -db %11000000 -db %00000010 -db %00001000 -db %00110110 + tmlearn 3,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 34 + tmlearn 44 + tmlearn 50,51,53,54 db 0 ; padding diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm index cd4ea5b1..71555c5e 100755 --- a/data/baseStats/lapras.asm +++ b/data/baseStats/lapras.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %11100000 -db %01111111 -db %11101000 -db %11010001 -db %10000011 -db %00101000 -db %00110010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,22,23,24 + tmlearn 25,29,31,32 + tmlearn 33,34,40 + tmlearn 44,46 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm index 8ada934e..eec9d2f3 100755 --- a/data/baseStats/lickitung.asm +++ b/data/baseStats/lickitung.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110101 -db %01111111 -db %10001111 -db %11000111 -db %10100010 -db %00001000 -db %00110110 + tmlearn 1,3,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,31,32 + tmlearn 34,38,40 + tmlearn 44 + tmlearn 50,51,53,54 db 0 ; padding diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm index 1c10c96e..c9ca26dd 100755 --- a/data/baseStats/machamp.asm +++ b/data/baseStats/machamp.asm @@ -19,11 +19,11 @@ db LEER db 0 db 3 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11001110 -db %10100110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,38,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm index 7b491641..6e2a977e 100755 --- a/data/baseStats/machoke.asm +++ b/data/baseStats/machoke.asm @@ -19,11 +19,11 @@ db LEER db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11001110 -db %10100110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,38,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm index c951163f..6e9f5ca0 100755 --- a/data/baseStats/machop.asm +++ b/data/baseStats/machop.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11001110 -db %10100110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,38,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm index 606bf755..95f72547 100755 --- a/data/baseStats/magikarp.asm +++ b/data/baseStats/magikarp.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm index a360fe9d..781c9edc 100755 --- a/data/baseStats/magmar.asm +++ b/data/baseStats/magmar.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11110000 -db %10100110 -db %00101000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 34,35,38,40 + tmlearn 44,46 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm index 166e2fb0..79f84923 100755 --- a/data/baseStats/magnemite.asm +++ b/data/baseStats/magnemite.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00000011 -db %10001000 -db %11100001 -db %01000011 -db %00011000 -db %01000010 + tmlearn 6 + tmlearn 9,10 + tmlearn 20,24 + tmlearn 25,30,31,32 + tmlearn 33,34,39 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm index 92ae9760..c8606619 100755 --- a/data/baseStats/magneton.asm +++ b/data/baseStats/magneton.asm @@ -19,11 +19,11 @@ db THUNDERSHOCK db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01000011 -db %10001000 -db %11100001 -db %01000011 -db %00011000 -db %01000010 + tmlearn 6 + tmlearn 9,10,15 + tmlearn 20,24 + tmlearn 25,30,31,32 + tmlearn 33,34,39 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm index 13e77c5c..759fe599 100755 --- a/data/baseStats/mankey.asm +++ b/data/baseStats/mankey.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %10000011 -db %10001111 -db %11001001 -db %11000110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,16 + tmlearn 17,18,19,20,24 + tmlearn 25,28,31,32 + tmlearn 34,35,39,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 35e3f542..5ee80e94 100755 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01111111 -db %00001111 -db %11001110 -db %10100010 -db %00001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,38,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm index dc404d20..14f82ca4 100755 --- a/data/baseStats/meowth.asm +++ b/data/baseStats/meowth.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %10001111 -db %10001000 -db %11000001 -db %11000010 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,11,12,16 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/metapod.asm b/data/baseStats/metapod.asm index 71a2be28..981bbbfb 100755 --- a/data/baseStats/metapod.asm +++ b/data/baseStats/metapod.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm index 16634430..1af20fa4 100755 --- a/data/baseStats/mew.asm +++ b/data/baseStats/mew.asm @@ -18,12 +18,12 @@ db 0 db 0 db 0 db 3 ; growth rate -; include learnset directly -db %11111111 -db %11111111 -db %11111111 -db %11111111 -db %11111111 -db %11111111 -db %11111111 +; learnset + tmlearn 1,2,3,4,5,6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,21,22,23,24 + tmlearn 25,26,27,28,29,30,31,32 + tmlearn 33,34,35,36,37,38,39,40 + tmlearn 41,42,43,44,45,46,47,48 + tmlearn 49,50,51,52,53,54,55,56 db %11111111 ; usually spacing diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm index 29b0b61b..95127645 100755 --- a/data/baseStats/mewtwo.asm +++ b/data/baseStats/mewtwo.asm @@ -19,11 +19,11 @@ db SWIFT db PSYCHIC_M db 5 ; growth rate ; learnset -db %10110001 -db %11111111 -db %10101111 -db %11110001 -db %10101111 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,36,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm index eeeb5367..646d9a49 100755 --- a/data/baseStats/moltres.asm +++ b/data/baseStats/moltres.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00001000 -db %11000000 -db %01100011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,38,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm index 93a6fcf7..3182eca0 100755 --- a/data/baseStats/mrmime.asm +++ b/data/baseStats/mrmime.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01000011 -db %10101111 -db %11110001 -db %10000111 -db %00111000 -db %01000010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,45,46 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm index 465c6012..7ef711c3 100755 --- a/data/baseStats/muk.asm +++ b/data/baseStats/muk.asm @@ -19,11 +19,11 @@ db POISON_GAS db 0 db 0 ; growth rate ; learnset -db %10100000 -db %01000000 -db %10011000 -db %11000001 -db %00101010 -db %01001000 -db %00000010 + tmlearn 6,8 + tmlearn 15 + tmlearn 20,21,24 + tmlearn 25,31,32 + tmlearn 34,36,38 + tmlearn 44,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm index c283821b..8802f52a 100755 --- a/data/baseStats/nidoking.asm +++ b/data/baseStats/nidoking.asm @@ -19,11 +19,11 @@ db POISON_STING db THRASH db 3 ; growth rate ; learnset -db %11110001 -db %11111111 -db %10001111 -db %11000111 -db %10100011 -db %10001000 -db %00110010 + tmlearn 1,5,6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,31,32 + tmlearn 33,34,38,40 + tmlearn 44,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm index 5f3f91a3..5e6ab97b 100755 --- a/data/baseStats/nidoqueen.asm +++ b/data/baseStats/nidoqueen.asm @@ -19,11 +19,11 @@ db TAIL_WHIP db BODY_SLAM db 3 ; growth rate ; learnset -db %11110001 -db %11111111 -db %10001111 -db %11000111 -db %10100011 -db %10001000 -db %00110010 + tmlearn 1,5,6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,31,32 + tmlearn 33,34,38,40 + tmlearn 44,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/nidoranf.asm b/data/baseStats/nidoranf.asm index 24caa7ab..c3f9a6e3 100755 --- a/data/baseStats/nidoranf.asm +++ b/data/baseStats/nidoranf.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100000 -db %00100011 -db %10001000 -db %11000001 -db %10000011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,14 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/nidoranm.asm b/data/baseStats/nidoranm.asm index 1b33b61c..14e9bc9f 100755 --- a/data/baseStats/nidoranm.asm +++ b/data/baseStats/nidoranm.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %11100000 -db %00100011 -db %10001000 -db %11000001 -db %10000011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10,14 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/nidorina.asm b/data/baseStats/nidorina.asm index b2ab3ce8..902286c5 100755 --- a/data/baseStats/nidorina.asm +++ b/data/baseStats/nidorina.asm @@ -19,11 +19,11 @@ db SCRATCH db 0 db 3 ; growth rate ; learnset -db %11100000 -db %00111111 -db %10001000 -db %11000001 -db %10000011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/nidorino.asm b/data/baseStats/nidorino.asm index 06957afd..db5844a9 100755 --- a/data/baseStats/nidorino.asm +++ b/data/baseStats/nidorino.asm @@ -19,11 +19,11 @@ db HORN_ATTACK db 0 db 3 ; growth rate ; learnset -db %11100000 -db %00111111 -db %10001000 -db %11000001 -db %10000011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetails.asm index 8141b627..f5339b35 100755 --- a/data/baseStats/ninetails.asm +++ b/data/baseStats/ninetails.asm @@ -19,11 +19,11 @@ db QUICK_ATTACK db ROAR db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %00001000 -db %11001000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/oddish.asm b/data/baseStats/oddish.asm index 31e376a6..895ccbe1 100755 --- a/data/baseStats/oddish.asm +++ b/data/baseStats/oddish.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %00100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm index d4b5f534..9246a325 100755 --- a/data/baseStats/omanyte.asm +++ b/data/baseStats/omanyte.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00111111 -db %00001000 -db %11000000 -db %00000011 -db %00001000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm index f39c8f2d..17b45efe 100755 --- a/data/baseStats/omastar.asm +++ b/data/baseStats/omastar.asm @@ -19,11 +19,11 @@ db HORN_ATTACK db 0 db 0 ; growth rate ; learnset -db %11100000 -db %01111111 -db %00001101 -db %11000000 -db %10000011 -db %00001000 -db %00010010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,19,20 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm index ce4375f7..4f2f8e6b 100755 --- a/data/baseStats/onix.asm +++ b/data/baseStats/onix.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00001000 -db %11001110 -db %10001010 -db %11001000 -db %00100010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 26,27,28,31,32 + tmlearn 34,36,40 + tmlearn 44,47,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/paras.asm b/data/baseStats/paras.asm index c1f9dbdd..daf1aaa9 100755 --- a/data/baseStats/paras.asm +++ b/data/baseStats/paras.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %00000011 -db %00111000 -db %11001000 -db %10000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/parasect.asm b/data/baseStats/parasect.asm index e53fec0e..cacf8e4b 100755 --- a/data/baseStats/parasect.asm +++ b/data/baseStats/parasect.asm @@ -19,11 +19,11 @@ db LEECH_LIFE db 0 db 0 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11001000 -db %10000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm index c72ac802..69429830 100755 --- a/data/baseStats/persian.asm +++ b/data/baseStats/persian.asm @@ -19,11 +19,11 @@ db BITE db SCREECH db 0 ; growth rate ; learnset -db %10100000 -db %11001111 -db %10001000 -db %11000001 -db %11000010 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,11,12,15,16 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm index 47fafc3e..19c9f2b4 100755 --- a/data/baseStats/pidgeot.asm +++ b/data/baseStats/pidgeot.asm @@ -19,11 +19,11 @@ db QUICK_ATTACK db 0 db 3 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00001000 -db %11000000 -db %01000011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm index c996b671..96a58cc3 100755 --- a/data/baseStats/pidgeotto.asm +++ b/data/baseStats/pidgeotto.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %00101010 -db %00000011 -db %00001000 -db %11000000 -db %01000011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm index 21259582..6d5e238d 100755 --- a/data/baseStats/pidgey.asm +++ b/data/baseStats/pidgey.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %00101010 -db %00000011 -db %00001000 -db %11000000 -db %01000011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/pikachu.asm b/data/baseStats/pikachu.asm index f3b224c8..1cd96200 100755 --- a/data/baseStats/pikachu.asm +++ b/data/baseStats/pikachu.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %10000011 -db %10001101 -db %11000001 -db %11000011 -db %00011000 -db %01000010 + tmlearn 1,5,6,8 + tmlearn 9,10,16 + tmlearn 17,19,20,24 + tmlearn 25,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm index d9c73ea0..8f36d87d 100755 --- a/data/baseStats/pinsir.asm +++ b/data/baseStats/pinsir.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00001101 -db %11000000 -db %00000010 -db %00001000 -db %00100110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 17,19,20 + tmlearn 31,32 + tmlearn 34 + tmlearn 44 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm index 6be8587d..7df20056 100755 --- a/data/baseStats/poliwag.asm +++ b/data/baseStats/poliwag.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100000 -db %00111111 -db %00001000 -db %11010000 -db %10000010 -db %00101000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 29,31,32 + tmlearn 34,40 + tmlearn 44,46 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm index b59d6415..a93d2674 100755 --- a/data/baseStats/poliwhirl.asm +++ b/data/baseStats/poliwhirl.asm @@ -19,11 +19,11 @@ db WATER_GUN db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00111111 -db %00001111 -db %11010110 -db %10000110 -db %00101000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20 + tmlearn 26,27,29,31,32 + tmlearn 34,35,40 + tmlearn 44,46 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm index d326a909..4d35c2cc 100755 --- a/data/baseStats/poliwrath.asm +++ b/data/baseStats/poliwrath.asm @@ -19,11 +19,11 @@ db DOUBLESLAP db BODY_SLAM db 3 ; growth rate ; learnset -db %10110001 -db %01111111 -db %00001111 -db %11010110 -db %10000110 -db %00101000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20 + tmlearn 26,27,29,31,32 + tmlearn 34,35,40 + tmlearn 44,46 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm index 3f22d6dd..9856ecbd 100755 --- a/data/baseStats/ponyta.asm +++ b/data/baseStats/ponyta.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %11100000 -db %00000011 -db %00001000 -db %11000000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm index 0c8a6b33..7ccee3c8 100755 --- a/data/baseStats/porygon.asm +++ b/data/baseStats/porygon.asm @@ -19,11 +19,11 @@ db CONVERSION db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01110011 -db %10001000 -db %11110001 -db %11000011 -db %00111000 -db %01000011 + tmlearn 6 + tmlearn 9,10,13,14,15 + tmlearn 20,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm index 6d07c401..a3dfe576 100755 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -19,11 +19,11 @@ db FURY_SWIPES db LOW_KICK db 0 ; growth rate ; learnset -db %10110001 -db %11000011 -db %10001111 -db %11001001 -db %11000110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15,16 + tmlearn 17,18,19,20,24 + tmlearn 25,28,31,32 + tmlearn 34,35,39,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm index bc435c57..469097fe 100755 --- a/data/baseStats/psyduck.asm +++ b/data/baseStats/psyduck.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %10111111 -db %00001111 -db %11001000 -db %11000010 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,16 + tmlearn 17,18,19,20 + tmlearn 28,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/raichu.asm b/data/baseStats/raichu.asm index 6324d57d..c6757b0b 100755 --- a/data/baseStats/raichu.asm +++ b/data/baseStats/raichu.asm @@ -19,11 +19,11 @@ db THUNDER_WAVE db 0 db 0 ; growth rate ; learnset -db %10110001 -db %11000011 -db %10001101 -db %11000001 -db %11000011 -db %00011000 -db %01000010 + tmlearn 1,5,6,8 + tmlearn 9,10,15,16 + tmlearn 17,19,20,24 + tmlearn 25,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm index f5088b6e..097b95bd 100755 --- a/data/baseStats/rapidash.asm +++ b/data/baseStats/rapidash.asm @@ -19,11 +19,11 @@ db STOMP db GROWL db 0 ; growth rate ; learnset -db %11100000 -db %01000011 -db %00001000 -db %11000000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm index 1bc92090..5fac0f1b 100755 --- a/data/baseStats/raticate.asm +++ b/data/baseStats/raticate.asm @@ -19,11 +19,11 @@ db QUICK_ATTACK db 0 db 0 ; growth rate ; learnset -db %10100000 -db %01111111 -db %10001000 -db %11001001 -db %11000010 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,24 + tmlearn 25,28,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm index 192f8f26..dada06bc 100755 --- a/data/baseStats/rattata.asm +++ b/data/baseStats/rattata.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00101111 -db %10001000 -db %11001001 -db %11000010 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,11,12,14 + tmlearn 20,24 + tmlearn 25,28,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm index 9f005b84..eb2396e1 100755 --- a/data/baseStats/rhydon.asm +++ b/data/baseStats/rhydon.asm @@ -1,3 +1,4 @@ +MonBaseStats: RhydonBaseStats: ; 39002 (e:5002) db DEX_RHYDON ; pokedex id db 105 ; base hp @@ -19,11 +20,12 @@ db TAIL_WHIP db FURY_ATTACK db 5 ; growth rate ; learnset -db %11110001 -db %11111111 -db %10001111 -db %11001111 -db %10100010 -db %10001000 -db %00110010 + tmlearn 1,5,6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,28,31,32 + tmlearn 34,38,40 + tmlearn 44,48 + tmlearn 50,53,54 db 0 ; padding +MonBaseStatsEnd: diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm index 5521f37a..4e292406 100755 --- a/data/baseStats/rhyhorn.asm +++ b/data/baseStats/rhyhorn.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %11100000 -db %00000011 -db %10001000 -db %11001111 -db %10100010 -db %10001000 -db %00100010 + tmlearn 6,7,8 + tmlearn 9,10 + tmlearn 20,24 + tmlearn 25,26,27,28,31,32 + tmlearn 34,38,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm index 28016ab9..ff12e24f 100755 --- a/data/baseStats/sandshrew.asm +++ b/data/baseStats/sandshrew.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %00000011 -db %00001101 -db %11001110 -db %11000010 -db %10001000 -db %00100110 + tmlearn 3,6,8 + tmlearn 9,10 + tmlearn 17,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,39,40 + tmlearn 44,48 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm index f613a517..2975b20f 100755 --- a/data/baseStats/sandslash.asm +++ b/data/baseStats/sandslash.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00001101 -db %11001110 -db %11000010 -db %10001000 -db %00100110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 17,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,39,40 + tmlearn 44,48 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm index 6e20cddc..f91327f4 100755 --- a/data/baseStats/scyther.asm +++ b/data/baseStats/scyther.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100100 -db %01000011 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm index 67cc26e1..4d28e2a3 100755 --- a/data/baseStats/seadra.asm +++ b/data/baseStats/seadra.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01111111 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00010010 + tmlearn 6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm index c122d946..d1087618 100755 --- a/data/baseStats/seaking.asm +++ b/data/baseStats/seaking.asm @@ -19,11 +19,11 @@ db SUPERSONIC db 0 db 0 ; growth rate ; learnset -db %01100000 -db %01111111 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00010010 + tmlearn 6,7 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm index 63a57b98..b6546b6f 100755 --- a/data/baseStats/seel.asm +++ b/data/baseStats/seel.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %11100000 -db %10111111 -db %00001000 -db %11000000 -db %10000010 -db %00001000 -db %00110010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14,16 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm index 06525091..fcb87404 100755 --- a/data/baseStats/shellder.asm +++ b/data/baseStats/shellder.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100000 -db %00111111 -db %00001000 -db %11100000 -db %01001011 -db %01001000 -db %00010011 + tmlearn 6 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 30,31,32 + tmlearn 33,34,36,39 + tmlearn 44,47 + tmlearn 49,50,53 db 0 ; padding diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm index dd271485..2d1f8444 100755 --- a/data/baseStats/slowbro.asm +++ b/data/baseStats/slowbro.asm @@ -19,11 +19,11 @@ db HEADBUTT db 0 db 0 ; growth rate ; learnset -db %10110001 -db %11111111 -db %00001111 -db %11111110 -db %11100011 -db %00111000 -db %01110011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20 + tmlearn 26,27,28,29,30,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45,46 + tmlearn 49,50,53,54,55 db 0 ; padding diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm index 41e0a586..e5edcdb9 100755 --- a/data/baseStats/slowpoke.asm +++ b/data/baseStats/slowpoke.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %10111111 -db %00001000 -db %11111110 -db %11100011 -db %00111000 -db %01110011 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14,16 + tmlearn 20 + tmlearn 26,27,28,29,30,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45,46 + tmlearn 49,50,53,54,55 db 0 ; padding diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm index 0ada7fa3..0a91f37e 100755 --- a/data/baseStats/snorlax.asm +++ b/data/baseStats/snorlax.asm @@ -19,11 +19,11 @@ db REST db 0 db 5 ; growth rate ; learnset -db %10110001 -db %11111111 -db %10101111 -db %11010111 -db %10101111 -db %10101000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,22,24 + tmlearn 25,26,27,29,31,32 + tmlearn 33,34,35,36,38,40 + tmlearn 44,46,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm index 818ec039..4e90e749 100755 --- a/data/baseStats/spearow.asm +++ b/data/baseStats/spearow.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00101010 -db %00000011 -db %00001000 -db %11000000 -db %01000010 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm index d79a79e3..1257a3f0 100755 --- a/data/baseStats/squirtle.asm +++ b/data/baseStats/squirtle.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00111111 -db %00001111 -db %11001000 -db %10000011 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20 + tmlearn 28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm index 671666cc..94c8f2d9 100755 --- a/data/baseStats/starmie.asm +++ b/data/baseStats/starmie.asm @@ -19,11 +19,11 @@ db HARDEN db 0 db 5 ; growth rate ; learnset -db %00100000 -db %01111111 -db %10001000 -db %11110001 -db %11000011 -db %00111000 -db %01010011 + tmlearn 6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45,46 + tmlearn 49,50,53,55 db 0 ; padding diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm index 031fe9f5..3afbb7a5 100755 --- a/data/baseStats/staryu.asm +++ b/data/baseStats/staryu.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100000 -db %00111111 -db %10001000 -db %11110001 -db %11000011 -db %00111000 -db %01010011 + tmlearn 6 + tmlearn 9,10,11,12,13,14 + tmlearn 20,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45,46 + tmlearn 49,50,53,55 db 0 ; padding diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm index 3e899c05..a9cab332 100755 --- a/data/baseStats/tangela.asm +++ b/data/baseStats/tangela.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %10000010 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 34,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm index 16020b09..39844f76 100755 --- a/data/baseStats/tauros.asm +++ b/data/baseStats/tauros.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %11100000 -db %01110011 -db %10001000 -db %11000111 -db %10100010 -db %00001000 -db %00100010 + tmlearn 6,7,8 + tmlearn 9,10,13,14,15 + tmlearn 20,24 + tmlearn 25,26,27,31,32 + tmlearn 34,38,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm index f7569d65..12ff9e0d 100755 --- a/data/baseStats/tentacool.asm +++ b/data/baseStats/tentacool.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100100 -db %00111111 -db %00011000 -db %11000000 -db %10000011 -db %00001000 -db %00010110 + tmlearn 3,6 + tmlearn 9,10,11,12,13,14 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,51,53 db 0 ; padding diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm index d7115059..01a2f685 100755 --- a/data/baseStats/tentacruel.asm +++ b/data/baseStats/tentacruel.asm @@ -19,11 +19,11 @@ db WRAP db 0 db 5 ; growth rate ; learnset -db %00100100 -db %01111111 -db %00011000 -db %11000000 -db %10000011 -db %00001000 -db %00010110 + tmlearn 3,6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,51,53 db 0 ; padding diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm index 7be669a2..1fd8bf52 100755 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -19,11 +19,11 @@ db QUICK_ATTACK db WATER_GUN db 0 ; growth rate ; learnset -db %10100000 -db %01111111 -db %00001000 -db %11000000 -db %11000011 -db %00001000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm index bd1252ea..3ef7018b 100755 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -19,11 +19,11 @@ db SUPERSONIC db CONFUSION db 0 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00111000 -db %11110000 -db %01000011 -db %00101000 -db %00000010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 29,30,31,32 + tmlearn 33,34,39 + tmlearn 44,46 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm index 461ad522..2f71a9df 100755 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00000011 -db %00111000 -db %11110000 -db %01000011 -db %00101000 -db %00100010 + tmlearn 6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 29,30,31,32 + tmlearn 33,34,39 + tmlearn 44,46 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm index 426d18ac..5052e9d0 100755 --- a/data/baseStats/venusaur.asm +++ b/data/baseStats/venusaur.asm @@ -19,11 +19,11 @@ db LEECH_SEED db VINE_WHIP db 3 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm index 4f544b8d..0df7e22c 100755 --- a/data/baseStats/victreebel.asm +++ b/data/baseStats/victreebel.asm @@ -19,11 +19,11 @@ db ACID db RAZOR_LEAF db 3 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm index df44be35..20d1b4e4 100755 --- a/data/baseStats/vileplume.asm +++ b/data/baseStats/vileplume.asm @@ -19,11 +19,11 @@ db ACID db PETAL_DANCE db 3 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm index f85fc165..4267990f 100755 --- a/data/baseStats/voltorb.asm +++ b/data/baseStats/voltorb.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00000001 -db %10001000 -db %11100001 -db %01001011 -db %01011000 -db %01000010 + tmlearn 6 + tmlearn 9 + tmlearn 20,24 + tmlearn 25,30,31,32 + tmlearn 33,34,36,39 + tmlearn 44,45,47 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm index 5b9bc47c..80a25853 100755 --- a/data/baseStats/vulpix.asm +++ b/data/baseStats/vulpix.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00001000 -db %11001000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm index 4d77ea7b..b8d1f84f 100755 --- a/data/baseStats/wartortle.asm +++ b/data/baseStats/wartortle.asm @@ -19,11 +19,11 @@ db BUBBLE db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00111111 -db %00001111 -db %11001000 -db %10000011 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20 + tmlearn 28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm index 8e501f0b..ecd788db 100755 --- a/data/baseStats/weedle.asm +++ b/data/baseStats/weedle.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm index 1a974e20..22c6a40b 100755 --- a/data/baseStats/weepinbell.asm +++ b/data/baseStats/weepinbell.asm @@ -19,11 +19,11 @@ db WRAP db 0 db 3 ; growth rate ; learnset -db %00100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm index bd526ecb..265ed3c8 100755 --- a/data/baseStats/weezing.asm +++ b/data/baseStats/weezing.asm @@ -19,11 +19,11 @@ db SLUDGE db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01000000 -db %10001000 -db %11000001 -db %00101010 -db %01001000 -db %00000010 + tmlearn 6 + tmlearn 15 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 34,36,38 + tmlearn 44,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm index 1a403c3e..13bf9b3a 100755 --- a/data/baseStats/wigglytuff.asm +++ b/data/baseStats/wigglytuff.asm @@ -19,11 +19,11 @@ db DEFENSE_CURL db DOUBLESLAP db 4 ; growth rate ; learnset -db %10110001 -db %01111111 -db %10101111 -db %11110001 -db %10100011 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm index 257bb859..5ae1f25f 100755 --- a/data/baseStats/zapdos.asm +++ b/data/baseStats/zapdos.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00101010 -db %01000011 -db %10001000 -db %11000001 -db %01000011 -db %00011100 -db %01001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,39 + tmlearn 43,44,45 + tmlearn 50,52,55 db 0 ; padding diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm index b2197c13..bafac885 100755 --- a/data/baseStats/zubat.asm +++ b/data/baseStats/zubat.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00101010 -db %00000011 -db %00011000 -db %11000000 -db %01000010 -db %00001000 -db %00000010 + tmlearn 2,4,6 + tmlearn 9,10 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 34,39 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/evos_moves.asm b/data/evos_moves.asm index cdbec0d8..6bdf2524 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -202,6 +202,7 @@ Mon112_EvosMoves: ; 3b1d8 (e:71d8) db 55,LEER db 64,TAKE_DOWN db 0 + Mon115_EvosMoves: ; 3b1e6 (e:71e6) ;KANGASKHAN ;Evolutions @@ -213,6 +214,7 @@ Mon115_EvosMoves: ; 3b1e6 (e:71e6) db 41,LEER db 46,DIZZY_PUNCH db 0 + Mon032_EvosMoves: ; 3b1f2 (e:71f2) ;NIDORAN_M ;Evolutions @@ -226,6 +228,7 @@ Mon032_EvosMoves: ; 3b1f2 (e:71f2) db 36,HORN_DRILL db 43,DOUBLE_KICK db 0 + Mon035_EvosMoves: ; 3b203 (e:7203) ;CLEFAIRY ;Evolutions @@ -239,6 +242,7 @@ Mon035_EvosMoves: ; 3b203 (e:7203) db 39,DEFENSE_CURL db 48,LIGHT_SCREEN db 0 + Mon021_EvosMoves: ; 3b215 (e:7215) ;SPEAROW ;Evolutions @@ -251,6 +255,7 @@ Mon021_EvosMoves: ; 3b215 (e:7215) db 29,DRILL_PECK db 36,AGILITY db 0 + Mon100_EvosMoves: ; 3b224 (e:7224) ;VOLTORB ;Evolutions @@ -263,6 +268,7 @@ Mon100_EvosMoves: ; 3b224 (e:7224) db 36,SWIFT db 43,EXPLOSION db 0 + Mon034_EvosMoves: ; 3b233 (e:7233) ;NIDOKING ;Evolutions @@ -272,6 +278,7 @@ Mon034_EvosMoves: ; 3b233 (e:7233) db 14,POISON_STING db 23,THRASH db 0 + Mon080_EvosMoves: ; 3b23b (e:723b) ;SLOWBRO ;Evolutions @@ -285,6 +292,7 @@ Mon080_EvosMoves: ; 3b23b (e:723b) db 44,AMNESIA db 55,PSYCHIC_M db 0 + Mon002_EvosMoves: ; 3b24b (e:724b) ;IVYSAUR ;Evolutions @@ -299,6 +307,7 @@ Mon002_EvosMoves: ; 3b24b (e:724b) db 46,SLEEP_POWDER db 54,SOLARBEAM db 0 + Mon103_EvosMoves: ; 3b25e (e:725e) ;EXEGGUTOR ;Evolutions @@ -306,6 +315,7 @@ Mon103_EvosMoves: ; 3b25e (e:725e) ;Learnset db 28,STOMP db 0 + Mon108_EvosMoves: ; 3b262 (e:7262) ;LICKITUNG ;Evolutions @@ -317,10 +327,11 @@ Mon108_EvosMoves: ; 3b262 (e:7262) db 31,SLAM db 39,SCREECH db 0 + Mon102_EvosMoves: ; 3b26e (e:726e) ;EXEGGCUTE ;Evolutions - db EV_ITEM,LEAF_STONE ,1,EXEGGUTOR + db EV_ITEM,LEAF_STONE,1,EXEGGUTOR db 0 ;Learnset db 25,REFLECT @@ -330,6 +341,7 @@ Mon102_EvosMoves: ; 3b26e (e:726e) db 42,SOLARBEAM db 48,SLEEP_POWDER db 0 + Mon088_EvosMoves: ; 3b280 (e:7280) ;GRIMER ;Evolutions @@ -343,6 +355,7 @@ Mon088_EvosMoves: ; 3b280 (e:7280) db 48,SCREECH db 55,ACID_ARMOR db 0 + Mon094_EvosMoves: ; 3b291 (e:7291) ;GENGAR ;Evolutions @@ -351,6 +364,7 @@ Mon094_EvosMoves: ; 3b291 (e:7291) db 29,HYPNOSIS db 38,DREAM_EATER db 0 + Mon029_EvosMoves: ; 3b297 (e:7297) ;NIDORAN_F ;Evolutions @@ -364,6 +378,7 @@ Mon029_EvosMoves: ; 3b297 (e:7297) db 36,FURY_SWIPES db 43,DOUBLE_KICK db 0 + Mon031_EvosMoves: ; 3b2a8 (e:72a8) ;NIDOQUEEN ;Evolutions @@ -373,6 +388,7 @@ Mon031_EvosMoves: ; 3b2a8 (e:72a8) db 14,POISON_STING db 23,BODY_SLAM db 0 + Mon104_EvosMoves: ; 3b2b0 (e:72b0) ;CUBONE ;Evolutions @@ -385,6 +401,7 @@ Mon104_EvosMoves: ; 3b2b0 (e:72b0) db 43,BONEMERANG db 46,RAGE db 0 + Mon111_EvosMoves: ; 3b2bf (e:72bf) ;RHYHORN ;Evolutions @@ -398,6 +415,7 @@ Mon111_EvosMoves: ; 3b2bf (e:72bf) db 50,LEER db 55,TAKE_DOWN db 0 + Mon131_EvosMoves: ; 3b2d0 (e:72d0) ;LAPRAS ;Evolutions @@ -410,12 +428,14 @@ Mon131_EvosMoves: ; 3b2d0 (e:72d0) db 38,ICE_BEAM db 46,HYDRO_PUMP db 0 + Mon059_EvosMoves: ; 3b2de (e:72de) ;ARCANINE ;Evolutions db 0 ;Learnset db 0 + Mon151_EvosMoves: ; 3b2e0 (e:72e0) ;MEW ;Evolutions @@ -426,6 +446,7 @@ Mon151_EvosMoves: ; 3b2e0 (e:72e0) db 30,METRONOME db 40,PSYCHIC_M db 0 + Mon130_EvosMoves: ; 3b2ea (e:72ea) ;GYARADOS ;Evolutions @@ -437,10 +458,11 @@ Mon130_EvosMoves: ; 3b2ea (e:72ea) db 41,HYDRO_PUMP db 52,HYPER_BEAM db 0 + Mon090_EvosMoves: ; 3b2f6 (e:72f6) ;SHELLDER ;Evolutions - db EV_ITEM,WATER_STONE ,1,CLOYSTER + db EV_ITEM,WATER_STONE,1,CLOYSTER db 0 ;Learnset db 18,SUPERSONIC @@ -449,6 +471,7 @@ Mon090_EvosMoves: ; 3b2f6 (e:72f6) db 39,LEER db 50,ICE_BEAM db 0 + Mon072_EvosMoves: ; 3b306 (e:7306) ;TENTACOOL ;Evolutions @@ -464,6 +487,7 @@ Mon072_EvosMoves: ; 3b306 (e:7306) db 40,SCREECH db 48,HYDRO_PUMP db 0 + Mon092_EvosMoves: ; 3b31b (e:731b) ;GASTLY ;Evolutions @@ -473,6 +497,7 @@ Mon092_EvosMoves: ; 3b31b (e:731b) db 27,HYPNOSIS db 35,DREAM_EATER db 0 + Mon123_EvosMoves: ; 3b324 (e:7324) ;SCYTHER ;Evolutions @@ -485,10 +510,11 @@ Mon123_EvosMoves: ; 3b324 (e:7324) db 35,SWORDS_DANCE db 42,AGILITY db 0 + Mon120_EvosMoves: ; 3b332 (e:7332) ;STARYU ;Evolutions - db EV_ITEM,WATER_STONE ,1,STARMIE + db EV_ITEM,WATER_STONE,1,STARMIE db 0 ;Learnset db 17,WATER_GUN @@ -499,6 +525,7 @@ Mon120_EvosMoves: ; 3b332 (e:7332) db 42,LIGHT_SCREEN db 47,HYDRO_PUMP db 0 + Mon009_EvosMoves: ; 3b346 (e:7346) ;BLASTOISE ;Evolutions @@ -511,6 +538,7 @@ Mon009_EvosMoves: ; 3b346 (e:7346) db 42,SKULL_BASH db 52,HYDRO_PUMP db 0 + Mon127_EvosMoves: ; 3b354 (e:7354) ;PINSIR ;Evolutions @@ -523,6 +551,7 @@ Mon127_EvosMoves: ; 3b354 (e:7354) db 49,SLASH db 54,SWORDS_DANCE db 0 + Mon114_EvosMoves: ; 3b362 (e:7362) ;TANGELA ;Evolutions @@ -549,6 +578,7 @@ Mon153_EvosMoves: ; 3b372 (e:7372) db 0 ;Learnset db 0 + Mon058_EvosMoves: ; 3b374 (e:7374) ;GROWLITHE ;Evolutions @@ -561,6 +591,7 @@ Mon058_EvosMoves: ; 3b374 (e:7374) db 39,AGILITY db 50,FLAMETHROWER db 0 + Mon095_EvosMoves: ; 3b384 (e:7384) ;ONIX ;Evolutions @@ -572,6 +603,7 @@ Mon095_EvosMoves: ; 3b384 (e:7384) db 33,SLAM db 43,HARDEN db 0 + Mon022_EvosMoves: ; 3b390 (e:7390) ;FEAROW ;Evolutions @@ -583,6 +615,7 @@ Mon022_EvosMoves: ; 3b390 (e:7390) db 34,DRILL_PECK db 43,AGILITY db 0 + Mon016_EvosMoves: ; 3b39c (e:739c) ;PIDGEY ;Evolutions @@ -596,6 +629,7 @@ Mon016_EvosMoves: ; 3b39c (e:739c) db 36,AGILITY db 44,MIRROR_MOVE db 0 + Mon079_EvosMoves: ; 3b3ad (e:73ad) ;SLOWPOKE ;Evolutions @@ -609,6 +643,7 @@ Mon079_EvosMoves: ; 3b3ad (e:73ad) db 40,AMNESIA db 48,PSYCHIC_M db 0 + Mon064_EvosMoves: ; 3b3be (e:73be) ;KADABRA ;Evolutions @@ -622,6 +657,7 @@ Mon064_EvosMoves: ; 3b3be (e:73be) db 38,PSYCHIC_M db 42,REFLECT db 0 + Mon075_EvosMoves: ; 3b3cf (e:73cf) ;GRAVELER ;Evolutions @@ -635,6 +671,7 @@ Mon075_EvosMoves: ; 3b3cf (e:73cf) db 36,EARTHQUAKE db 43,EXPLOSION db 0 + Mon113_EvosMoves: ; 3b3e0 (e:73e0) ;CHANSEY ;Evolutions @@ -647,6 +684,7 @@ Mon113_EvosMoves: ; 3b3e0 (e:73e0) db 48,LIGHT_SCREEN db 54,DOUBLE_EDGE db 0 + Mon067_EvosMoves: ; 3b3ee (e:73ee) ;MACHOKE ;Evolutions @@ -659,6 +697,7 @@ Mon067_EvosMoves: ; 3b3ee (e:73ee) db 44,SEISMIC_TOSS db 52,SUBMISSION db 0 + Mon122_EvosMoves: ; 3b3fd (e:73fd) ;MR_MIME ;Evolutions @@ -670,6 +709,7 @@ Mon122_EvosMoves: ; 3b3fd (e:73fd) db 39,MEDITATE db 47,SUBSTITUTE db 0 + Mon106_EvosMoves: ; 3b409 (e:7409) ;HITMONLEE ;Evolutions @@ -681,6 +721,7 @@ Mon106_EvosMoves: ; 3b409 (e:7409) db 48,HI_JUMP_KICK db 53,MEGA_KICK db 0 + Mon107_EvosMoves: ; 3b415 (e:7415) ;HITMONCHAN ;Evolutions @@ -692,6 +733,7 @@ Mon107_EvosMoves: ; 3b415 (e:7415) db 48,MEGA_PUNCH db 53,COUNTER db 0 + Mon024_EvosMoves: ; 3b421 (e:7421) ;ARBOK ;Evolutions @@ -703,6 +745,7 @@ Mon024_EvosMoves: ; 3b421 (e:7421) db 36,SCREECH db 47,ACID db 0 + Mon047_EvosMoves: ; 3b42d (e:742d) ;PARASECT ;Evolutions @@ -714,6 +757,7 @@ Mon047_EvosMoves: ; 3b42d (e:742d) db 39,SLASH db 48,GROWTH db 0 + Mon054_EvosMoves: ; 3b439 (e:7439) ;PSYDUCK ;Evolutions @@ -726,6 +770,7 @@ Mon054_EvosMoves: ; 3b439 (e:7439) db 43,FURY_SWIPES db 52,HYDRO_PUMP db 0 + Mon096_EvosMoves: ; 3b448 (e:7448) ;DROWZEE ;Evolutions @@ -739,6 +784,7 @@ Mon096_EvosMoves: ; 3b448 (e:7448) db 32,PSYCHIC_M db 37,MEDITATE db 0 + Mon076_EvosMoves: ; 3b459 (e:7459) ;GOLEM ;Evolutions @@ -758,6 +804,7 @@ Mon154_EvosMoves: ; 3b467 (e:7467) db 0 ;Learnset db 0 + Mon126_EvosMoves: ; 3b469 (e:7469) ;MAGMAR ;Evolutions @@ -777,6 +824,7 @@ Mon155_EvosMoves: ; 3b477 (e:7477) db 0 ;Learnset db 0 + Mon125_EvosMoves: ; 3b479 (e:7479) ;ELECTABUZZ ;Evolutions @@ -788,6 +836,7 @@ Mon125_EvosMoves: ; 3b479 (e:7479) db 49,LIGHT_SCREEN db 54,THUNDER db 0 + Mon082_EvosMoves: ; 3b485 (e:7485) ;MAGNETON ;Evolutions @@ -800,6 +849,7 @@ Mon082_EvosMoves: ; 3b485 (e:7485) db 46,SWIFT db 54,SCREECH db 0 + Mon109_EvosMoves: ; 3b493 (e:7493) ;KOFFING ;Evolutions @@ -819,6 +869,7 @@ Mon156_EvosMoves: ; 3b4a2 (e:74a2) db 0 ;Learnset db 0 + Mon056_EvosMoves: ; 3b4a4 (e:74a4) ;MANKEY ;Evolutions @@ -831,6 +882,7 @@ Mon056_EvosMoves: ; 3b4a4 (e:74a4) db 33,SEISMIC_TOSS db 39,THRASH db 0 + Mon086_EvosMoves: ; 3b4b3 (e:74b3) ;SEEL ;Evolutions @@ -843,6 +895,7 @@ Mon086_EvosMoves: ; 3b4b3 (e:74b3) db 45,TAKE_DOWN db 50,ICE_BEAM db 0 + Mon050_EvosMoves: ; 3b4c2 (e:74c2) ;DIGLETT ;Evolutions @@ -855,6 +908,7 @@ Mon050_EvosMoves: ; 3b4c2 (e:74c2) db 31,SLASH db 40,EARTHQUAKE db 0 + Mon128_EvosMoves: ; 3b4d1 (e:74d1) ;TAUROS ;Evolutions @@ -887,6 +941,7 @@ Mon159_EvosMoves: ; 3b4e1 (e:74e1) db 0 ;Learnset db 0 + Mon083_EvosMoves: ; 3b4e3 (e:74e3) ;FARFETCH_D ;Evolutions @@ -898,6 +953,7 @@ Mon083_EvosMoves: ; 3b4e3 (e:74e3) db 31,AGILITY db 39,SLASH db 0 + Mon048_EvosMoves: ; 3b4ef (e:74ef) ;VENONAT ;Evolutions @@ -911,6 +967,7 @@ Mon048_EvosMoves: ; 3b4ef (e:74ef) db 38,SLEEP_POWDER db 43,PSYCHIC_M db 0 + Mon149_EvosMoves: ; 3b500 (e:7500) ;DRAGONITE ;Evolutions @@ -943,6 +1000,7 @@ Mon162_EvosMoves: ; 3b510 (e:7510) db 0 ;Learnset db 0 + Mon084_EvosMoves: ; 3b512 (e:7512) ;DODUO ;Evolutions @@ -956,6 +1014,7 @@ Mon084_EvosMoves: ; 3b512 (e:7512) db 40,TRI_ATTACK db 44,AGILITY db 0 + Mon060_EvosMoves: ; 3b523 (e:7523) ;POLIWAG ;Evolutions @@ -969,6 +1028,7 @@ Mon060_EvosMoves: ; 3b523 (e:7523) db 38,AMNESIA db 45,HYDRO_PUMP db 0 + Mon124_EvosMoves: ; 3b534 (e:7534) ;JYNX ;Evolutions @@ -981,6 +1041,7 @@ Mon124_EvosMoves: ; 3b534 (e:7534) db 47,THRASH db 58,BLIZZARD db 0 + Mon146_EvosMoves: ; 3b542 (e:7542) ;MOLTRES ;Evolutions @@ -990,6 +1051,7 @@ Mon146_EvosMoves: ; 3b542 (e:7542) db 55,AGILITY db 60,SKY_ATTACK db 0 + Mon144_EvosMoves: ; 3b54a (e:754a) ;ARTICUNO ;Evolutions @@ -999,6 +1061,7 @@ Mon144_EvosMoves: ; 3b54a (e:754a) db 55,AGILITY db 60,MIST db 0 + Mon145_EvosMoves: ; 3b552 (e:7552) ;ZAPDOS ;Evolutions @@ -1008,12 +1071,14 @@ Mon145_EvosMoves: ; 3b552 (e:7552) db 55,AGILITY db 60,LIGHT_SCREEN db 0 + Mon132_EvosMoves: ; 3b55a (e:755a) ;DITTO ;Evolutions db 0 ;Learnset db 0 + Mon052_EvosMoves: ; 3b55c (e:755c) ;MEOWTH ;Evolutions @@ -1026,6 +1091,7 @@ Mon052_EvosMoves: ; 3b55c (e:755c) db 33,FURY_SWIPES db 44,SLASH db 0 + Mon098_EvosMoves: ; 3b56b (e:756b) ;KRABBY ;Evolutions @@ -1059,6 +1125,7 @@ Mon165_EvosMoves: ; 3b57e (e:757e) db 0 ;Learnset db 0 + Mon037_EvosMoves: ; 3b580 (e:7580) ;VULPIX ;Evolutions @@ -1071,16 +1138,18 @@ Mon037_EvosMoves: ; 3b580 (e:7580) db 35,FLAMETHROWER db 42,FIRE_SPIN db 0 + Mon038_EvosMoves: ; 3b590 (e:7590) ;NINETALES ;Evolutions db 0 ;Learnset db 0 + Mon025_EvosMoves: ; 3b592 (e:7592) ;PIKACHU ;Evolutions - db EV_ITEM,THUNDER_STONE ,1,RAICHU + db EV_ITEM,THUNDER_STONE,1,RAICHU db 0 ;Learnset db 9,THUNDER_WAVE @@ -1089,6 +1158,7 @@ Mon025_EvosMoves: ; 3b592 (e:7592) db 33,AGILITY db 43,THUNDER db 0 + Mon026_EvosMoves: ; 3b5a2 (e:75a2) ;RAICHU ;Evolutions @@ -1109,6 +1179,7 @@ Mon167_EvosMoves: ; 3b5a6 (e:75a6) db 0 ;Learnset db 0 + Mon147_EvosMoves: ; 3b5a8 (e:75a8) ;DRATINI ;Evolutions @@ -1121,6 +1192,7 @@ Mon147_EvosMoves: ; 3b5a8 (e:75a8) db 40,DRAGON_RAGE db 50,HYPER_BEAM db 0 + Mon148_EvosMoves: ; 3b5b7 (e:75b7) ;DRAGONAIR ;Evolutions @@ -1133,6 +1205,7 @@ Mon148_EvosMoves: ; 3b5b7 (e:75b7) db 45,DRAGON_RAGE db 55,HYPER_BEAM db 0 + Mon140_EvosMoves: ; 3b5c6 (e:75c6) ;KABUTO ;Evolutions @@ -1144,6 +1217,7 @@ Mon140_EvosMoves: ; 3b5c6 (e:75c6) db 44,LEER db 49,HYDRO_PUMP db 0 + Mon141_EvosMoves: ; 3b5d3 (e:75d3) ;KABUTOPS ;Evolutions @@ -1154,6 +1228,7 @@ Mon141_EvosMoves: ; 3b5d3 (e:75d3) db 46,LEER db 53,HYDRO_PUMP db 0 + Mon116_EvosMoves: ; 3b5dd (e:75dd) ;HORSEA ;Evolutions @@ -1166,6 +1241,7 @@ Mon116_EvosMoves: ; 3b5dd (e:75dd) db 37,AGILITY db 45,HYDRO_PUMP db 0 + Mon117_EvosMoves: ; 3b5ec (e:75ec) ;SEADRA ;Evolutions @@ -1191,6 +1267,7 @@ Mon169_EvosMoves: ; 3b5fa (e:75fa) db 0 ;Learnset db 0 + Mon027_EvosMoves: ; 3b5fc (e:75fc) ;SANDSHREW ;Evolutions @@ -1203,6 +1280,7 @@ Mon027_EvosMoves: ; 3b5fc (e:75fc) db 31,SWIFT db 38,FURY_SWIPES db 0 + Mon028_EvosMoves: ; 3b60b (e:760b) ;SANDSLASH ;Evolutions @@ -1214,6 +1292,7 @@ Mon028_EvosMoves: ; 3b60b (e:760b) db 36,SWIFT db 47,FURY_SWIPES db 0 + Mon138_EvosMoves: ; 3b617 (e:7617) ;OMANYTE ;Evolutions @@ -1225,6 +1304,7 @@ Mon138_EvosMoves: ; 3b617 (e:7617) db 46,SPIKE_CANNON db 53,HYDRO_PUMP db 0 + Mon139_EvosMoves: ; 3b624 (e:7624) ;OMASTAR ;Evolutions @@ -1235,6 +1315,7 @@ Mon139_EvosMoves: ; 3b624 (e:7624) db 44,SPIKE_CANNON db 49,HYDRO_PUMP db 0 + Mon039_EvosMoves: ; 3b62e (e:762e) ;JIGGLYPUFF ;Evolutions @@ -1249,25 +1330,29 @@ Mon039_EvosMoves: ; 3b62e (e:762e) db 34,BODY_SLAM db 39,DOUBLE_EDGE db 0 + Mon040_EvosMoves: ; 3b642 (e:7642) ;WIGGLYTUFF ;Evolutions db 0 ;Learnset db 0 + Mon133_EvosMoves: ; 3b644 (e:7644) ;EEVEE ;Evolutions db EV_ITEM,FIRE_STONE,1,FLAREON - db EV_ITEM,THUNDER_STONE ,1,JOLTEON - db EV_ITEM,WATER_STONE ,1,VAPOREON + db EV_ITEM,THUNDER_STONE,1,JOLTEON + db EV_ITEM,WATER_STONE,1,VAPOREON db 0 +Mon133_EvosEnd: ;Learnset db 27,QUICK_ATTACK db 31,TAIL_WHIP db 37,BITE db 45,TAKE_DOWN db 0 + Mon136_EvosMoves: ; 3b65a (e:765a) ;FLAREON ;Evolutions @@ -1282,6 +1367,7 @@ Mon136_EvosMoves: ; 3b65a (e:765a) db 48,RAGE db 54,FLAMETHROWER db 0 + Mon135_EvosMoves: ; 3b66c (e:766c) ;JOLTEON ;Evolutions @@ -1296,6 +1382,7 @@ Mon135_EvosMoves: ; 3b66c (e:766c) db 48,PIN_MISSILE db 54,THUNDER db 0 + Mon134_EvosMoves: ; 3b67e (e:767e) ;VAPOREON ;Evolutions @@ -1310,6 +1397,7 @@ Mon134_EvosMoves: ; 3b67e (e:767e) db 48,MIST db 54,HYDRO_PUMP db 0 + Mon066_EvosMoves: ; 3b690 (e:7690) ;MACHOP ;Evolutions @@ -1322,6 +1410,7 @@ Mon066_EvosMoves: ; 3b690 (e:7690) db 39,SEISMIC_TOSS db 46,SUBMISSION db 0 + Mon041_EvosMoves: ; 3b69f (e:769f) ;ZUBAT ;Evolutions @@ -1334,6 +1423,7 @@ Mon041_EvosMoves: ; 3b69f (e:769f) db 28,WING_ATTACK db 36,HAZE db 0 + Mon023_EvosMoves: ; 3b6ae (e:76ae) ;EKANS ;Evolutions @@ -1346,6 +1436,7 @@ Mon023_EvosMoves: ; 3b6ae (e:76ae) db 31,SCREECH db 38,ACID db 0 + Mon046_EvosMoves: ; 3b6bd (e:76bd) ;PARAS ;Evolutions @@ -1358,10 +1449,11 @@ Mon046_EvosMoves: ; 3b6bd (e:76bd) db 34,SLASH db 41,GROWTH db 0 + Mon061_EvosMoves: ; 3b6cc (e:76cc) ;POLIWHIRL ;Evolutions - db EV_ITEM,WATER_STONE ,1,POLIWRATH + db EV_ITEM,WATER_STONE,1,POLIWRATH db 0 ;Learnset db 16,HYPNOSIS @@ -1371,6 +1463,7 @@ Mon061_EvosMoves: ; 3b6cc (e:76cc) db 41,AMNESIA db 49,HYDRO_PUMP db 0 + Mon062_EvosMoves: ; 3b6de (e:76de) ;POLIWRATH ;Evolutions @@ -1379,6 +1472,7 @@ Mon062_EvosMoves: ; 3b6de (e:76de) db 16,HYPNOSIS db 19,WATER_GUN db 0 + Mon013_EvosMoves: ; 3b6e4 (e:76e4) ;WEEDLE ;Evolutions @@ -1386,6 +1480,7 @@ Mon013_EvosMoves: ; 3b6e4 (e:76e4) db 0 ;Learnset db 0 + Mon014_EvosMoves: ; 3b6e9 (e:76e9) ;KAKUNA ;Evolutions @@ -1393,6 +1488,7 @@ Mon014_EvosMoves: ; 3b6e9 (e:76e9) db 0 ;Learnset db 0 + Mon015_EvosMoves: ; 3b6ee (e:76ee) ;BEEDRILL ;Evolutions @@ -1412,6 +1508,7 @@ Mon170_EvosMoves: ; 3b6fc (e:76fc) db 0 ;Learnset db 0 + Mon085_EvosMoves: ; 3b6fe (e:76fe) ;DODRIO ;Evolutions @@ -1424,6 +1521,7 @@ Mon085_EvosMoves: ; 3b6fe (e:76fe) db 45,TRI_ATTACK db 51,AGILITY db 0 + Mon057_EvosMoves: ; 3b70c (e:770c) ;PRIMEAPE ;Evolutions @@ -1435,6 +1533,7 @@ Mon057_EvosMoves: ; 3b70c (e:770c) db 37,SEISMIC_TOSS db 46,THRASH db 0 + Mon051_EvosMoves: ; 3b718 (e:7718) ;DUGTRIO ;Evolutions @@ -1446,6 +1545,7 @@ Mon051_EvosMoves: ; 3b718 (e:7718) db 35,SLASH db 47,EARTHQUAKE db 0 + Mon049_EvosMoves: ; 3b724 (e:7724) ;VENOMOTH ;Evolutions @@ -1458,6 +1558,7 @@ Mon049_EvosMoves: ; 3b724 (e:7724) db 43,SLEEP_POWDER db 50,PSYCHIC_M db 0 + Mon087_EvosMoves: ; 3b732 (e:7732) ;DEWGONG ;Evolutions @@ -1483,6 +1584,7 @@ Mon172_EvosMoves: ; 3b740 (e:7740) db 0 ;Learnset db 0 + Mon010_EvosMoves: ; 3b742 (e:7742) ;CATERPIE ;Evolutions @@ -1490,6 +1592,7 @@ Mon010_EvosMoves: ; 3b742 (e:7742) db 0 ;Learnset db 0 + Mon011_EvosMoves: ; 3b747 (e:7747) ;METAPOD ;Evolutions @@ -1497,6 +1600,7 @@ Mon011_EvosMoves: ; 3b747 (e:7747) db 0 ;Learnset db 0 + Mon012_EvosMoves: ; 3b74c (e:774c) ;BUTTERFREE ;Evolutions @@ -1510,6 +1614,7 @@ Mon012_EvosMoves: ; 3b74c (e:774c) db 26,WHIRLWIND db 32,PSYBEAM db 0 + Mon068_EvosMoves: ; 3b75c (e:775c) ;MACHAMP ;Evolutions @@ -1528,6 +1633,7 @@ Mon173_EvosMoves: ; 3b768 (e:7768) db 0 ;Learnset db 0 + Mon055_EvosMoves: ; 3b76a (e:776a) ;GOLDUCK ;Evolutions @@ -1539,6 +1645,7 @@ Mon055_EvosMoves: ; 3b76a (e:776a) db 48,FURY_SWIPES db 59,HYDRO_PUMP db 0 + Mon097_EvosMoves: ; 3b776 (e:7776) ;HYPNO ;Evolutions @@ -1551,6 +1658,7 @@ Mon097_EvosMoves: ; 3b776 (e:7776) db 37,PSYCHIC_M db 43,MEDITATE db 0 + Mon042_EvosMoves: ; 3b784 (e:7784) ;GOLBAT ;Evolutions @@ -1562,6 +1670,7 @@ Mon042_EvosMoves: ; 3b784 (e:7784) db 32,WING_ATTACK db 43,HAZE db 0 + Mon150_EvosMoves: ; 3b790 (e:7790) ;MEWTWO ;Evolutions @@ -1573,6 +1682,7 @@ Mon150_EvosMoves: ; 3b790 (e:7790) db 75,MIST db 81,AMNESIA db 0 + Mon143_EvosMoves: ; 3b79c (e:779c) ;SNORLAX ;Evolutions @@ -1583,6 +1693,7 @@ Mon143_EvosMoves: ; 3b79c (e:779c) db 48,DOUBLE_EDGE db 56,HYPER_BEAM db 0 + Mon129_EvosMoves: ; 3b7a6 (e:77a6) ;MAGIKARP ;Evolutions @@ -1605,6 +1716,7 @@ Mon175_EvosMoves: ; 3b7af (e:77af) db 0 ;Learnset db 0 + Mon089_EvosMoves: ; 3b7b1 (e:77b1) ;MUK ;Evolutions @@ -1624,6 +1736,7 @@ Mon176_EvosMoves: ; 3b7bf (e:77bf) db 0 ;Learnset db 0 + Mon099_EvosMoves: ; 3b7c1 (e:77c1) ;KINGLER ;Evolutions @@ -1635,6 +1748,7 @@ Mon099_EvosMoves: ; 3b7c1 (e:77c1) db 42,CRABHAMMER db 49,HARDEN db 0 + Mon091_EvosMoves: ; 3b7cd (e:77cd) ;CLOYSTER ;Evolutions @@ -1649,6 +1763,7 @@ Mon177_EvosMoves: ; 3b7d1 (e:77d1) db 0 ;Learnset db 0 + Mon101_EvosMoves: ; 3b7d3 (e:77d3) ;ELECTRODE ;Evolutions @@ -1660,12 +1775,14 @@ Mon101_EvosMoves: ; 3b7d3 (e:77d3) db 40,SWIFT db 50,EXPLOSION db 0 + Mon036_EvosMoves: ; 3b7df (e:77df) ;CLEFABLE ;Evolutions db 0 ;Learnset db 0 + Mon110_EvosMoves: ; 3b7e1 (e:77e1) ;WEEZING ;Evolutions @@ -1677,6 +1794,7 @@ Mon110_EvosMoves: ; 3b7e1 (e:77e1) db 49,HAZE db 53,EXPLOSION db 0 + Mon053_EvosMoves: ; 3b7ed (e:77ed) ;PERSIAN ;Evolutions @@ -1688,6 +1806,7 @@ Mon053_EvosMoves: ; 3b7ed (e:77ed) db 37,FURY_SWIPES db 51,SLASH db 0 + Mon105_EvosMoves: ; 3b7f9 (e:77f9) ;MAROWAK ;Evolutions @@ -1706,6 +1825,7 @@ Mon178_EvosMoves: ; 3b805 (e:7805) db 0 ;Learnset db 0 + Mon093_EvosMoves: ; 3b807 (e:7807) ;HAUNTER ;Evolutions @@ -1715,6 +1835,7 @@ Mon093_EvosMoves: ; 3b807 (e:7807) db 29,HYPNOSIS db 38,DREAM_EATER db 0 + Mon063_EvosMoves: ; 3b810 (e:7810) ;ABRA ;Evolutions @@ -1722,6 +1843,7 @@ Mon063_EvosMoves: ; 3b810 (e:7810) db 0 ;Learnset db 0 + Mon065_EvosMoves: ; 3b815 (e:7815) ;ALAKAZAM ;Evolutions @@ -1734,6 +1856,7 @@ Mon065_EvosMoves: ; 3b815 (e:7815) db 38,PSYCHIC_M db 42,REFLECT db 0 + Mon017_EvosMoves: ; 3b823 (e:7823) ;PIDGEOTTO ;Evolutions @@ -1747,6 +1870,7 @@ Mon017_EvosMoves: ; 3b823 (e:7823) db 40,AGILITY db 49,MIRROR_MOVE db 0 + Mon018_EvosMoves: ; 3b834 (e:7834) ;PIDGEOT ;Evolutions @@ -1759,12 +1883,14 @@ Mon018_EvosMoves: ; 3b834 (e:7834) db 44,AGILITY db 54,MIRROR_MOVE db 0 + Mon121_EvosMoves: ; 3b842 (e:7842) ;STARMIE ;Evolutions db 0 ;Learnset db 0 + Mon001_EvosMoves: ; 3b844 (e:7844) ;BULBASAUR ;Evolutions @@ -1779,6 +1905,7 @@ Mon001_EvosMoves: ; 3b844 (e:7844) db 41,SLEEP_POWDER db 48,SOLARBEAM db 0 + Mon003_EvosMoves: ; 3b857 (e:7857) ;VENUSAUR ;Evolutions @@ -1792,6 +1919,7 @@ Mon003_EvosMoves: ; 3b857 (e:7857) db 55,SLEEP_POWDER db 65,SOLARBEAM db 0 + Mon073_EvosMoves: ; 3b867 (e:7867) ;TENTACRUEL ;Evolutions @@ -1813,6 +1941,7 @@ Mon179_EvosMoves: ; 3b879 (e:7879) db 0 ;Learnset db 0 + Mon118_EvosMoves: ; 3b87b (e:787b) ;GOLDEEN ;Evolutions @@ -1826,6 +1955,7 @@ Mon118_EvosMoves: ; 3b87b (e:787b) db 45,HORN_DRILL db 54,AGILITY db 0 + Mon119_EvosMoves: ; 3b88c (e:788c) ;SEAKING ;Evolutions @@ -1866,6 +1996,7 @@ Mon183_EvosMoves: ; 3b8a0 (e:78a0) db 0 ;Learnset db 0 + Mon077_EvosMoves: ; 3b8a2 (e:78a2) ;PONYTA ;Evolutions @@ -1879,6 +2010,7 @@ Mon077_EvosMoves: ; 3b8a2 (e:78a2) db 43,TAKE_DOWN db 48,AGILITY db 0 + Mon078_EvosMoves: ; 3b8b3 (e:78b3) ;RAPIDASH ;Evolutions @@ -1891,6 +2023,7 @@ Mon078_EvosMoves: ; 3b8b3 (e:78b3) db 47,TAKE_DOWN db 55,AGILITY db 0 + Mon019_EvosMoves: ; 3b8c1 (e:78c1) ;RATTATA ;Evolutions @@ -1902,6 +2035,7 @@ Mon019_EvosMoves: ; 3b8c1 (e:78c1) db 23,FOCUS_ENERGY db 34,SUPER_FANG db 0 + Mon020_EvosMoves: ; 3b8ce (e:78ce) ;RATICATE ;Evolutions @@ -1912,6 +2046,7 @@ Mon020_EvosMoves: ; 3b8ce (e:78ce) db 27,FOCUS_ENERGY db 41,SUPER_FANG db 0 + Mon033_EvosMoves: ; 3b8d8 (e:78d8) ;NIDORINO ;Evolutions @@ -1925,6 +2060,7 @@ Mon033_EvosMoves: ; 3b8d8 (e:78d8) db 41,HORN_DRILL db 50,DOUBLE_KICK db 0 + Mon030_EvosMoves: ; 3b8ea (e:78ea) ;NIDORINA ;Evolutions @@ -1938,6 +2074,7 @@ Mon030_EvosMoves: ; 3b8ea (e:78ea) db 41,FURY_SWIPES db 50,DOUBLE_KICK db 0 + Mon074_EvosMoves: ; 3b8fc (e:78fc) ;GEODUDE ;Evolutions @@ -1951,6 +2088,7 @@ Mon074_EvosMoves: ; 3b8fc (e:78fc) db 31,EARTHQUAKE db 36,EXPLOSION db 0 + Mon137_EvosMoves: ; 3b90d (e:790d) ;PORYGON ;Evolutions @@ -1961,6 +2099,7 @@ Mon137_EvosMoves: ; 3b90d (e:790d) db 35,AGILITY db 42,TRI_ATTACK db 0 + Mon142_EvosMoves: ; 3b917 (e:7917) ;AERODACTYL ;Evolutions @@ -1978,6 +2117,7 @@ Mon184_EvosMoves: ; 3b921 (e:7921) db 0 ;Learnset db 0 + Mon081_EvosMoves: ; 3b923 (e:7923) ;MAGNEMITE ;Evolutions @@ -2005,6 +2145,7 @@ Mon186_EvosMoves: ; 3b936 (e:7936) db 0 ;Learnset db 0 + Mon004_EvosMoves: ; 3b938 (e:7938) ;CHARMANDER ;Evolutions @@ -2018,6 +2159,7 @@ Mon004_EvosMoves: ; 3b938 (e:7938) db 38,FLAMETHROWER db 46,FIRE_SPIN db 0 + Mon007_EvosMoves: ; 3b949 (e:7949) ;SQUIRTLE ;Evolutions @@ -2031,6 +2173,7 @@ Mon007_EvosMoves: ; 3b949 (e:7949) db 35,SKULL_BASH db 42,HYDRO_PUMP db 0 + Mon005_EvosMoves: ; 3b95a (e:795a) ;CHARMELEON ;Evolutions @@ -2044,6 +2187,7 @@ Mon005_EvosMoves: ; 3b95a (e:795a) db 42,FLAMETHROWER db 56,FIRE_SPIN db 0 + Mon008_EvosMoves: ; 3b96b (e:796b) ;WARTORTLE ;Evolutions @@ -2057,6 +2201,7 @@ Mon008_EvosMoves: ; 3b96b (e:796b) db 39,SKULL_BASH db 47,HYDRO_PUMP db 0 + Mon006_EvosMoves: ; 3b97c (e:797c) ;CHARIZARD ;Evolutions @@ -2097,6 +2242,7 @@ Mon190_EvosMoves: ; 3b990 (e:7990) db 0 ;Learnset db 0 + Mon043_EvosMoves: ; 3b992 (e:7992) ;ODDISH ;Evolutions @@ -2110,10 +2256,11 @@ Mon043_EvosMoves: ; 3b992 (e:7992) db 33,PETAL_DANCE db 46,SOLARBEAM db 0 + Mon044_EvosMoves: ; 3b9a3 (e:79a3) ;GLOOM ;Evolutions - db EV_ITEM,LEAF_STONE ,1,VILEPLUME + db EV_ITEM,LEAF_STONE,1,VILEPLUME db 0 ;Learnset db 15,POISONPOWDER @@ -2123,6 +2270,7 @@ Mon044_EvosMoves: ; 3b9a3 (e:79a3) db 38,PETAL_DANCE db 52,SOLARBEAM db 0 + Mon045_EvosMoves: ; 3b9b5 (e:79b5) ;VILEPLUME ;Evolutions @@ -2132,6 +2280,7 @@ Mon045_EvosMoves: ; 3b9b5 (e:79b5) db 17,STUN_SPORE db 19,SLEEP_POWDER db 0 + Mon069_EvosMoves: ; 3b9bd (e:79bd) ;BELLSPROUT ;Evolutions @@ -2146,10 +2295,11 @@ Mon069_EvosMoves: ; 3b9bd (e:79bd) db 33,RAZOR_LEAF db 42,SLAM db 0 + Mon070_EvosMoves: ; 3b9d0 (e:79d0) ;WEEPINBELL ;Evolutions - db EV_ITEM,LEAF_STONE ,1,VICTREEBEL + db EV_ITEM,LEAF_STONE,1,VICTREEBEL db 0 ;Learnset db 13,WRAP @@ -2160,6 +2310,7 @@ Mon070_EvosMoves: ; 3b9d0 (e:79d0) db 38,RAZOR_LEAF db 49,SLAM db 0 + Mon071_EvosMoves: ; 3b9e4 (e:79e4) ;VICTREEBEL ;Evolutions diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 74d053bb..8170cf5a 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -28,8 +28,8 @@ HiddenObjectMaps: ; 46a40 (11:6a40) db SAFFRON_GYM db MT_MOON_POKECENTER db ROCK_TUNNEL_POKECENTER - db BATTLE_CENTER db TRADE_CENTER + db COLOSSEUM db VIRIDIAN_FOREST db MT_MOON_3 db INDIGO_PLATEAU @@ -117,8 +117,8 @@ HiddenObjectPointers: ; 46a96 (11:6a96) dw SaffronGymHiddenObjects dw MtMoonPokecenterHiddenObjects dw RockTunnelPokecenterHiddenObjects - dw BattleCenterHiddenObjects dw TradeCenterHiddenObjects + dw ColosseumHiddenObjects dw ViridianForestHiddenObjects dw MtMoon3HiddenObjects dw IndigoPlateauHiddenObjects @@ -175,7 +175,7 @@ HiddenObjectPointers: ; 46a96 (11:6a96) dw Route4HiddenObjects ; format: y-coord, x-coord, text id/item id, object routine -BattleCenterHiddenObjects: ; 46b40 (11:6b40) +TradeCenterHiddenObjects: ; 46b40 (11:6b40) db $04,$05,$d0 db BANK(CableClubRightGameboy) dw CableClubRightGameboy @@ -183,7 +183,7 @@ BattleCenterHiddenObjects: ; 46b40 (11:6b40) db BANK(CableClubLeftGameboy) dw CableClubLeftGameboy db $FF -TradeCenterHiddenObjects: ; 46b4d (11:6b4d) +ColosseumHiddenObjects: ; 46b4d (11:6b4d) db $04,$05,$d0 db BANK(CableClubRightGameboy) dw CableClubRightGameboy @@ -233,10 +233,10 @@ ViridianPokecenterHiddenObjects: ; 46b93 (11:6b93) ViridianMartHiddenObjects: ; 46ba0 (11:6ba0) db $FF ViridianSchoolHiddenObjects: ; 46ba1 (11:6ba1) - db $04,$03,$20 ; ViridianSchoolNotebook + db $04,$03,(ViridianSchoolNotebook_id - TextPredefs) / 2 + 1 db Bank(PrintNotebookText) dw PrintNotebookText - db $00,$03,$21 ; ViridianSchoolBlackboard + db $00,$03,(ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1 db BANK(PrintBlackboardLinkCableText) dw PrintBlackboardLinkCableText db $FF @@ -743,13 +743,13 @@ LavenderHouse1HiddenObjects: ; 46fc2 (11:6fc2) dw PrintMagazinesText db $FF CeladonMansion5HiddenObjects: ; 46fd5 (11:6fd5) - db $00,$03,$34 ; LinkCableHelp + db $00,$03,(LinkCableHelp_id - TextPredefs) / 2 + 1 db BANK(PrintBlackboardLinkCableText) dw PrintBlackboardLinkCableText - db $00,$04,$34 ; LinkCableHelp + db $00,$04,(LinkCableHelp_id - TextPredefs) / 2 + 1 db BANK(PrintBlackboardLinkCableText) dw PrintBlackboardLinkCableText - db $04,$03,$35 ; TMNotebook + db $04,$03,(TMNotebook_id - TextPredefs) / 2 + 1 db Bank(PrintNotebookText) dw PrintNotebookText db $FF diff --git a/data/item_prices.asm b/data/item_prices.asm index f6882fd0..aa5cb21e 100755 --- a/data/item_prices.asm +++ b/data/item_prices.asm @@ -82,17 +82,17 @@ ItemPrices: ; 4608 (1:4608) money 0 ; MAX_ETHER money 0 ; ELIXER money 0 ; MAX_ELIXER - money 0 ; B2F - money 0 ; B1F - money 0 ; 1F - money 0 ; 2F - money 0 ; 3F - money 0 ; 4F - money 0 ; 5F - money 0 ; 6F - money 0 ; 7F - money 0 ; 8F - money 0 ; 9F - money 0 ; 10F - money 0 ; 11F - money 0 ; B4F + money 0 ; FLOOR_B2F + money 0 ; FLOOR_B1F + money 0 ; FLOOR_1F + money 0 ; FLOOR_2F + money 0 ; FLOOR_3F + money 0 ; FLOOR_4F + money 0 ; FLOOR_5F + money 0 ; FLOOR_6F + money 0 ; FLOOR_7F + money 0 ; FLOOR_8F + money 0 ; FLOOR_9F + money 0 ; FLOOR_10F + money 0 ; FLOOR_11F + money 0 ; FLOOR_B4F diff --git a/data/mapHeaders/battlecenterm.asm b/data/mapHeaders/battlecenterm.asm deleted file mode 100755 index 984f7e38..00000000 --- a/data/mapHeaders/battlecenterm.asm +++ /dev/null @@ -1,6 +0,0 @@ -BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239) - db CLUB ; tileset - db BATTLE_CENTER_HEIGHT, BATTLE_CENTER_WIDTH ; dimensions (y, x) - dw BattleCenterMBlocks, BattleCenterMTextPointers, BattleCenterMScript ; blocks, texts, scripts - db $00 ; connections - dw BattleCenterMObject ; objects diff --git a/data/mapHeaders/celadoncity.asm b/data/mapHeaders/celadoncity.asm index 12a1731a..7e3a6c06 100755 --- a/data/mapHeaders/celadoncity.asm +++ b/data/mapHeaders/celadoncity.asm @@ -3,6 +3,6 @@ CeladonCity_h: ; 18000 (6:4000) db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x) dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_16, ROUTE_16_WIDTH, 4, 0, ROUTE_16_HEIGHT, Route16Blocks, CELADON_CITY_WIDTH - EAST_MAP_CONNECTION ROUTE_7, ROUTE_7_WIDTH, 4, 0, ROUTE_7_HEIGHT, Route7Blocks, CELADON_CITY_WIDTH + WEST_MAP_CONNECTION CELADON_CITY, ROUTE_16, 4, 0, Route16Blocks + EAST_MAP_CONNECTION CELADON_CITY, ROUTE_7, 4, 0, Route7Blocks, 1 dw CeladonCityObject ; objects diff --git a/data/mapHeaders/ceruleancity.asm b/data/mapHeaders/ceruleancity.asm index 61b04719..56cab9f7 100755 --- a/data/mapHeaders/ceruleancity.asm +++ b/data/mapHeaders/ceruleancity.asm @@ -3,8 +3,8 @@ CeruleanCity_h: ; 0x1874e to 0x18786 (56 bytes) (bank=6) (id=3) db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x) dw CeruleanCityBlocks, CeruleanCityTextPointers, CeruleanCityScript ; blocks, texts, scripts db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_24, ROUTE_24_WIDTH, ROUTE_24_HEIGHT, 5, 0, ROUTE_24_WIDTH, Route24Blocks - SOUTH_MAP_CONNECTION ROUTE_5, ROUTE_5_WIDTH, 5, 0, ROUTE_5_WIDTH, Route5Blocks, CERULEAN_CITY_WIDTH, CERULEAN_CITY_HEIGHT - WEST_MAP_CONNECTION ROUTE_4, ROUTE_4_WIDTH, 4, 0, ROUTE_4_HEIGHT, Route4Blocks, CERULEAN_CITY_WIDTH - EAST_MAP_CONNECTION ROUTE_9, ROUTE_9_WIDTH, 4, 0, ROUTE_9_HEIGHT, Route9Blocks, CERULEAN_CITY_WIDTH + NORTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_24, 5, 0, Route24Blocks + SOUTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_5, 5, 0, Route5Blocks, 1 + WEST_MAP_CONNECTION CERULEAN_CITY, ROUTE_4, 4, 0, Route4Blocks + EAST_MAP_CONNECTION CERULEAN_CITY, ROUTE_9, 4, 0, Route9Blocks dw CeruleanCityObject ; objects diff --git a/data/mapHeaders/cinnabarisland.asm b/data/mapHeaders/cinnabarisland.asm index f0da170f..60ba7560 100755 --- a/data/mapHeaders/cinnabarisland.asm +++ b/data/mapHeaders/cinnabarisland.asm @@ -3,6 +3,6 @@ CinnabarIsland_h: ; 0x1c000 to 0x1c022 (34 bytes) (bank=7) (id=8) db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x) dw CinnabarIslandBlocks, CinnabarIslandTextPointers, CinnabarIslandScript ; blocks, texts, scripts db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_21, ROUTE_21_WIDTH, ROUTE_21_HEIGHT, 0, 0, ROUTE_21_WIDTH, Route21Blocks - EAST_MAP_CONNECTION ROUTE_20, ROUTE_20_WIDTH, 0, 0, ROUTE_20_HEIGHT, Route20Blocks, CINNABAR_ISLAND_WIDTH + NORTH_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_21, 0, 0, Route21Blocks + EAST_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_20, 0, 0, Route20Blocks dw CinnabarIslandObject ; objects diff --git a/data/mapHeaders/colosseum.asm b/data/mapHeaders/colosseum.asm new file mode 100644 index 00000000..94728b8d --- /dev/null +++ b/data/mapHeaders/colosseum.asm @@ -0,0 +1,6 @@ +Colosseum_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240) + db CLUB ; tileset + db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x) + dw ColosseumBlocks, ColosseumTextPointers, ColosseumScript ; blocks, texts, scripts + db $00 ; connections + dw ColosseumObject ; objects diff --git a/data/mapHeaders/fuchsiacity.asm b/data/mapHeaders/fuchsiacity.asm index 7a3e4f66..998f7bb4 100755 --- a/data/mapHeaders/fuchsiacity.asm +++ b/data/mapHeaders/fuchsiacity.asm @@ -3,7 +3,7 @@ FuchsiaCity_h: ; 0x18ba7 to 0x18bd4 (45 bytes) (bank=6) (id=7) db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x) dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts db SOUTH | WEST | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_19, ROUTE_19_WIDTH, 5, 0, ROUTE_19_WIDTH, Route19Blocks, FUCHSIA_CITY_WIDTH, FUCHSIA_CITY_HEIGHT - WEST_MAP_CONNECTION ROUTE_18, ROUTE_18_WIDTH, 4, 0, ROUTE_18_HEIGHT, Route18Blocks, FUCHSIA_CITY_WIDTH - EAST_MAP_CONNECTION ROUTE_15, ROUTE_15_WIDTH, 4, 0, ROUTE_15_HEIGHT, Route15Blocks, FUCHSIA_CITY_WIDTH + SOUTH_MAP_CONNECTION FUCHSIA_CITY, ROUTE_19, 5, 0, Route19Blocks + WEST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_18, 4, 0, Route18Blocks + EAST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_15, 4, 0, Route15Blocks dw FuchsiaCityObject ; objects diff --git a/data/mapHeaders/indigoplateau.asm b/data/mapHeaders/indigoplateau.asm index 9705e3ee..87c37501 100755 --- a/data/mapHeaders/indigoplateau.asm +++ b/data/mapHeaders/indigoplateau.asm @@ -3,5 +3,5 @@ IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9) db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x) dw IndigoPlateauBlocks, IndigoPlateauTextPointers, IndigoPlateauScript ; blocks, texts, scripts db SOUTH ; connections - SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_23_WIDTH, 0, 0, ROUTE_23_WIDTH, Route23Blocks, INDIGO_PLATEAU_WIDTH, INDIGO_PLATEAU_HEIGHT + SOUTH_MAP_CONNECTION INDIGO_PLATEAU, ROUTE_23, 0, 0, Route23Blocks dw IndigoPlateauObject ; objects diff --git a/data/mapHeaders/lavendertown.asm b/data/mapHeaders/lavendertown.asm index 2880dc60..72952d41 100755 --- a/data/mapHeaders/lavendertown.asm +++ b/data/mapHeaders/lavendertown.asm @@ -3,7 +3,7 @@ LavenderTown_h: ; 0x44000 to 0x4402d (45 bytes) (bank=11) (id=4) db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x) dw LavenderTownBlocks, LavenderTownTextPointers, LavenderTownScript ; blocks, texts, scripts db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_10, ROUTE_10_WIDTH, ROUTE_10_HEIGHT, 0, 0, ROUTE_10_WIDTH, Route10Blocks - SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_12_WIDTH, 0, 0, ROUTE_12_WIDTH, Route12Blocks, LAVENDER_TOWN_WIDTH, LAVENDER_TOWN_HEIGHT - WEST_MAP_CONNECTION ROUTE_8, ROUTE_8_WIDTH, 0, 0, ROUTE_8_HEIGHT, Route8Blocks, LAVENDER_TOWN_WIDTH + NORTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_10, 0, 0, Route10Blocks + SOUTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_12, 0, 0, Route12Blocks, 1 + WEST_MAP_CONNECTION LAVENDER_TOWN, ROUTE_8, 0, 0, Route8Blocks dw LavenderTownObject ; objects diff --git a/data/mapHeaders/pallettown.asm b/data/mapHeaders/pallettown.asm index 248c49b4..5ad13aea 100755 --- a/data/mapHeaders/pallettown.asm +++ b/data/mapHeaders/pallettown.asm @@ -3,6 +3,6 @@ PalletTown_h: ; 182a1 (6:42a1) db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_1, ROUTE_1_WIDTH, ROUTE_1_HEIGHT, 0, 0, ROUTE_1_WIDTH, Route1Blocks - SOUTH_MAP_CONNECTION ROUTE_21, ROUTE_21_WIDTH, 0, 0, ROUTE_21_WIDTH, Route21Blocks, PALLET_TOWN_WIDTH, PALLET_TOWN_HEIGHT + NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1Blocks + SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21Blocks, 1 dw PalletTownObject diff --git a/data/mapHeaders/pewtercity.asm b/data/mapHeaders/pewtercity.asm index b5e68adc..69c5d978 100755 --- a/data/mapHeaders/pewtercity.asm +++ b/data/mapHeaders/pewtercity.asm @@ -3,8 +3,8 @@ PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2) db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x) dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_2, ROUTE_2_WIDTH, 5, 0, ROUTE_2_WIDTH, Route2Blocks, PEWTER_CITY_WIDTH, PEWTER_CITY_HEIGHT - EAST_MAP_CONNECTION ROUTE_3, ROUTE_3_WIDTH, 4, 0, ROUTE_3_HEIGHT, Route3Blocks, PEWTER_CITY_WIDTH + SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2Blocks + EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3Blocks dw PewterCityObject ; objects db $0 diff --git a/data/mapHeaders/route1.asm b/data/mapHeaders/route1.asm index cd849504..6a8db0c4 100755 --- a/data/mapHeaders/route1.asm +++ b/data/mapHeaders/route1.asm @@ -3,6 +3,6 @@ Route1_h: ; 0x1c0c3 to 0x1c0e5 (34 bytes) (bank=7) (id=12) db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x) dw Route1Blocks, Route1TextPointers, Route1Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, VIRIDIAN_CITY_HEIGHT, -3, 2, VIRIDIAN_CITY_WIDTH - 4, ViridianCityBlocks - SOUTH_MAP_CONNECTION PALLET_TOWN, PALLET_TOWN_WIDTH, 0, 0, PALLET_TOWN_WIDTH, PalletTownBlocks, ROUTE_1_WIDTH, ROUTE_1_HEIGHT + NORTH_MAP_CONNECTION ROUTE_1, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks + SOUTH_MAP_CONNECTION ROUTE_1, PALLET_TOWN, 0, 0, PalletTownBlocks, 1 dw Route1Object ; objects diff --git a/data/mapHeaders/route10.asm b/data/mapHeaders/route10.asm index 9d41ff76..fab0e4a5 100755 --- a/data/mapHeaders/route10.asm +++ b/data/mapHeaders/route10.asm @@ -3,6 +3,6 @@ Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21) db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x) dw Route10Blocks, Route10TextPointers, Route10Script ; blocks, texts, scripts db SOUTH | WEST ; connections - SOUTH_MAP_CONNECTION LAVENDER_TOWN, LAVENDER_TOWN_WIDTH, 0, 0, LAVENDER_TOWN_WIDTH, LavenderTownBlocks, ROUTE_10_WIDTH, ROUTE_10_HEIGHT - WEST_MAP_CONNECTION ROUTE_9, ROUTE_9_WIDTH, 0, 0, ROUTE_9_HEIGHT, Route9Blocks, ROUTE_10_WIDTH + SOUTH_MAP_CONNECTION ROUTE_10, LAVENDER_TOWN, 0, 0, LavenderTownBlocks + WEST_MAP_CONNECTION ROUTE_10, ROUTE_9, 0, 0, Route9Blocks dw Route10Object ; objects diff --git a/data/mapHeaders/route11.asm b/data/mapHeaders/route11.asm index 7ab3a478..66c54bbe 100755 --- a/data/mapHeaders/route11.asm +++ b/data/mapHeaders/route11.asm @@ -3,6 +3,6 @@ Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22) db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x) dw Route11Blocks, Route11TextPointers, Route11Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION VERMILION_CITY, VERMILION_CITY_WIDTH, -3, 1, VERMILION_CITY_HEIGHT - 3, VermilionCityBlocks, ROUTE_11_WIDTH - EAST_MAP_CONNECTION ROUTE_12, ROUTE_12_WIDTH, -3, 24, ROUTE_12_HEIGHT - 39, Route12Blocks, ROUTE_11_WIDTH + WEST_MAP_CONNECTION ROUTE_11, VERMILION_CITY, -3, 1, VermilionCityBlocks + EAST_MAP_CONNECTION ROUTE_11, ROUTE_12, -3, 24, Route12Blocks, 1 dw Route11Object ; objects diff --git a/data/mapHeaders/route12.asm b/data/mapHeaders/route12.asm index 44e9e731..6132a244 100755 --- a/data/mapHeaders/route12.asm +++ b/data/mapHeaders/route12.asm @@ -3,7 +3,7 @@ Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23) db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x) dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION LAVENDER_TOWN, LAVENDER_TOWN_WIDTH, LAVENDER_TOWN_HEIGHT, 0, 0, LAVENDER_TOWN_WIDTH, LavenderTownBlocks - SOUTH_MAP_CONNECTION ROUTE_13, ROUTE_13_WIDTH, -3, 17, ROUTE_13_WIDTH - 17, Route13Blocks, ROUTE_12_WIDTH, ROUTE_12_HEIGHT - WEST_MAP_CONNECTION ROUTE_11, ROUTE_11_WIDTH, 27, 0, ROUTE_11_HEIGHT, Route11Blocks, ROUTE_12_WIDTH + NORTH_MAP_CONNECTION ROUTE_12, LAVENDER_TOWN, 0, 0, LavenderTownBlocks + SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_13, -3, 17, Route13Blocks + WEST_MAP_CONNECTION ROUTE_12, ROUTE_11, 27, 0, Route11Blocks dw Route12Object ; objects diff --git a/data/mapHeaders/route13.asm b/data/mapHeaders/route13.asm index 7720e9b7..9a821208 100755 --- a/data/mapHeaders/route13.asm +++ b/data/mapHeaders/route13.asm @@ -3,6 +3,6 @@ Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24) db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x) dw Route13Blocks, Route13TextPointers, Route13Script ; blocks, texts, scripts db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_12, ROUTE_12_WIDTH, ROUTE_12_HEIGHT, 20, 0, ROUTE_12_WIDTH, Route12Blocks - WEST_MAP_CONNECTION ROUTE_14, ROUTE_14_WIDTH, 0, 0, ROUTE_14_HEIGHT - 15, Route14Blocks, ROUTE_13_WIDTH + NORTH_MAP_CONNECTION ROUTE_13, ROUTE_12, 20, 0, Route12Blocks + WEST_MAP_CONNECTION ROUTE_13, ROUTE_14, 0, 0, Route14Blocks dw Route13Object ; objects diff --git a/data/mapHeaders/route14.asm b/data/mapHeaders/route14.asm index 1ae75932..e4163126 100755 --- a/data/mapHeaders/route14.asm +++ b/data/mapHeaders/route14.asm @@ -3,6 +3,6 @@ Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25) db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x) dw Route14Blocks, Route14TextPointers, Route14Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_15, ROUTE_15_WIDTH, 18, 0, ROUTE_15_HEIGHT, Route15Blocks, ROUTE_14_WIDTH - EAST_MAP_CONNECTION ROUTE_13, ROUTE_13_WIDTH, 0, 0, ROUTE_13_HEIGHT, Route13Blocks, ROUTE_14_WIDTH + WEST_MAP_CONNECTION ROUTE_14, ROUTE_15, 18, 0, Route15Blocks + EAST_MAP_CONNECTION ROUTE_14, ROUTE_13, 0, 0, Route13Blocks dw Route14Object ; objects diff --git a/data/mapHeaders/route15.asm b/data/mapHeaders/route15.asm index 579dada0..6d2e8859 100755 --- a/data/mapHeaders/route15.asm +++ b/data/mapHeaders/route15.asm @@ -3,6 +3,6 @@ Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26) db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x) dw Route15Blocks, Route15TextPointers, Route15Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, -3, 1, FUCHSIA_CITY_HEIGHT - 3, FuchsiaCityBlocks, ROUTE_15_WIDTH - EAST_MAP_CONNECTION ROUTE_14, ROUTE_14_WIDTH, -3, 15, ROUTE_14_HEIGHT - 15, Route14Blocks, ROUTE_15_WIDTH + WEST_MAP_CONNECTION ROUTE_15, FUCHSIA_CITY, -3, 1, FuchsiaCityBlocks + EAST_MAP_CONNECTION ROUTE_15, ROUTE_14, -3, 15, Route14Blocks dw Route15Object ; objects diff --git a/data/mapHeaders/route16.asm b/data/mapHeaders/route16.asm index 4f1d8325..42678ed3 100755 --- a/data/mapHeaders/route16.asm +++ b/data/mapHeaders/route16.asm @@ -3,6 +3,6 @@ Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27) db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x) dw Route16Blocks, Route16TextPointers, Route16Script ; blocks, texts, scripts db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_17_WIDTH, 0, 0, ROUTE_17_WIDTH, Route17Blocks, ROUTE_16_WIDTH, ROUTE_16_HEIGHT - EAST_MAP_CONNECTION CELADON_CITY, CELADON_CITY_WIDTH, -3, 1, CELADON_CITY_HEIGHT - 3, CeladonCityBlocks, ROUTE_16_WIDTH + SOUTH_MAP_CONNECTION ROUTE_16, ROUTE_17, 0, 0, Route17Blocks + EAST_MAP_CONNECTION ROUTE_16, CELADON_CITY, -3, 1, CeladonCityBlocks, 1 dw Route16Object ; objects diff --git a/data/mapHeaders/route17.asm b/data/mapHeaders/route17.asm index 4f7f2d33..577fe009 100755 --- a/data/mapHeaders/route17.asm +++ b/data/mapHeaders/route17.asm @@ -3,6 +3,6 @@ Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28) db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x) dw Route17Blocks, Route17TextPointers, Route17Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_16, ROUTE_16_WIDTH, ROUTE_16_HEIGHT, 0, 0, ROUTE_16_WIDTH - 7, Route16Blocks - SOUTH_MAP_CONNECTION ROUTE_18, ROUTE_18_WIDTH, 0, 0, ROUTE_18_WIDTH - 12, Route18Blocks, ROUTE_17_WIDTH, ROUTE_17_HEIGHT + NORTH_MAP_CONNECTION ROUTE_17, ROUTE_16, 0, 0, Route16Blocks + SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_18, 0, 0, Route18Blocks, 1 dw Route17Object ; objects diff --git a/data/mapHeaders/route18.asm b/data/mapHeaders/route18.asm index d37ebcf9..8fb1b3bc 100755 --- a/data/mapHeaders/route18.asm +++ b/data/mapHeaders/route18.asm @@ -3,6 +3,6 @@ Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29) db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x) dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_17, ROUTE_17_WIDTH, ROUTE_17_HEIGHT, 0, 0, ROUTE_17_WIDTH, Route17Blocks - EAST_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, -3, 1, FUCHSIA_CITY_HEIGHT - 3, FuchsiaCityBlocks, ROUTE_18_WIDTH + NORTH_MAP_CONNECTION ROUTE_18, ROUTE_17, 0, 0, Route17Blocks + EAST_MAP_CONNECTION ROUTE_18, FUCHSIA_CITY, -3, 1, FuchsiaCityBlocks, 1 dw Route18Object ; objects diff --git a/data/mapHeaders/route19.asm b/data/mapHeaders/route19.asm index f1185425..2ca85cc1 100755 --- a/data/mapHeaders/route19.asm +++ b/data/mapHeaders/route19.asm @@ -3,6 +3,6 @@ Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30) db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x) dw Route19Blocks, Route19TextPointers, Route19Script ; blocks, texts, scripts db NORTH | WEST ; connections - NORTH_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, FUCHSIA_CITY_HEIGHT, -3, 2, FUCHSIA_CITY_WIDTH - 4, FuchsiaCityBlocks - WEST_MAP_CONNECTION ROUTE_20, ROUTE_20_WIDTH, 18, 0, ROUTE_20_HEIGHT, Route20Blocks, ROUTE_19_WIDTH + NORTH_MAP_CONNECTION ROUTE_19, FUCHSIA_CITY, -3, 2, FuchsiaCityBlocks + WEST_MAP_CONNECTION ROUTE_19, ROUTE_20, 18, 0, Route20Blocks dw Route19Object ; objects diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm index 28db1a1b..564f4a58 100755 --- a/data/mapHeaders/route2.asm +++ b/data/mapHeaders/route2.asm @@ -3,6 +3,6 @@ Route2_h: ; 54000 (15:4000) db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles) dw Route2Blocks, Route2TextPointers, Route2Script db NORTH | SOUTH ;Connection Byte - NORTH_MAP_CONNECTION PEWTER_CITY, PEWTER_CITY_WIDTH, PEWTER_CITY_HEIGHT, -3, 2, PEWTER_CITY_WIDTH - 4, PewterCityBlocks - SOUTH_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, -3, 2, VIRIDIAN_CITY_WIDTH - 4, ViridianCityBlocks, ROUTE_2_WIDTH, ROUTE_2_HEIGHT + NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCityBlocks + SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks, 1 dw Route2Object ;Object Data Pointer diff --git a/data/mapHeaders/route20.asm b/data/mapHeaders/route20.asm index 4f96906f..d4f645d8 100755 --- a/data/mapHeaders/route20.asm +++ b/data/mapHeaders/route20.asm @@ -3,6 +3,6 @@ Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31) db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x) dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION CINNABAR_ISLAND, CINNABAR_ISLAND_WIDTH, 0, 0, CINNABAR_ISLAND_HEIGHT, CinnabarIslandBlocks, ROUTE_20_WIDTH - EAST_MAP_CONNECTION ROUTE_19, ROUTE_19_WIDTH, -3, 15, ROUTE_19_HEIGHT - 15, Route19Blocks, ROUTE_20_WIDTH + WEST_MAP_CONNECTION ROUTE_20, CINNABAR_ISLAND, 0, 0, CinnabarIslandBlocks + EAST_MAP_CONNECTION ROUTE_20, ROUTE_19, -3, 15, Route19Blocks dw Route20Object ; objects diff --git a/data/mapHeaders/route21.asm b/data/mapHeaders/route21.asm index f3160814..7f3e0a2f 100755 --- a/data/mapHeaders/route21.asm +++ b/data/mapHeaders/route21.asm @@ -3,6 +3,6 @@ Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32) db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x) dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION PALLET_TOWN, PALLET_TOWN_WIDTH, PALLET_TOWN_HEIGHT, 0, 0, PALLET_TOWN_WIDTH, PalletTownBlocks - SOUTH_MAP_CONNECTION CINNABAR_ISLAND, CINNABAR_ISLAND_WIDTH, 0, 0, CINNABAR_ISLAND_WIDTH, CinnabarIslandBlocks, ROUTE_21_WIDTH, ROUTE_21_HEIGHT + NORTH_MAP_CONNECTION ROUTE_21, PALLET_TOWN, 0, 0, PalletTownBlocks + SOUTH_MAP_CONNECTION ROUTE_21, CINNABAR_ISLAND, 0, 0, CinnabarIslandBlocks, 1 dw Route21Object ; objects diff --git a/data/mapHeaders/route22.asm b/data/mapHeaders/route22.asm index 566a5cbe..598e9224 100755 --- a/data/mapHeaders/route22.asm +++ b/data/mapHeaders/route22.asm @@ -3,6 +3,6 @@ Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33) db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x) dw Route22Blocks, Route22TextPointers, Route22Script ; blocks, texts, scripts db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_23, ROUTE_23_WIDTH, ROUTE_23_HEIGHT, 0, 0, ROUTE_23_WIDTH, Route23Blocks - EAST_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, -3, 1, VIRIDIAN_CITY_HEIGHT - 3, ViridianCityBlocks, ROUTE_22_WIDTH + NORTH_MAP_CONNECTION ROUTE_22, ROUTE_23, 0, 0, Route23Blocks + EAST_MAP_CONNECTION ROUTE_22, VIRIDIAN_CITY, -3, 1, ViridianCityBlocks, 1 dw Route22Object ; objects diff --git a/data/mapHeaders/route23.asm b/data/mapHeaders/route23.asm index 2e469096..32dc36fd 100755 --- a/data/mapHeaders/route23.asm +++ b/data/mapHeaders/route23.asm @@ -3,6 +3,6 @@ Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34) db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x) dw Route23Blocks, Route23TextPointers, Route23Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION INDIGO_PLATEAU, INDIGO_PLATEAU_WIDTH, INDIGO_PLATEAU_HEIGHT, 0, 0, INDIGO_PLATEAU_WIDTH, IndigoPlateauBlocks - SOUTH_MAP_CONNECTION ROUTE_22, ROUTE_22_WIDTH, 0, 0, ROUTE_22_WIDTH - 7, Route22Blocks, ROUTE_23_WIDTH, ROUTE_23_HEIGHT + NORTH_MAP_CONNECTION ROUTE_23, INDIGO_PLATEAU, 0, 0, IndigoPlateauBlocks + SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_22, 0, 0, Route22Blocks, 1 dw Route23Object ; objects diff --git a/data/mapHeaders/route24.asm b/data/mapHeaders/route24.asm index 3194be91..a445c144 100755 --- a/data/mapHeaders/route24.asm +++ b/data/mapHeaders/route24.asm @@ -3,6 +3,6 @@ Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35) db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x) dw Route24Blocks, Route24TextPointers, Route24Script ; blocks, texts, scripts db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, -3, 2, CERULEAN_CITY_WIDTH - 4, CeruleanCityBlocks, ROUTE_24_WIDTH, ROUTE_24_HEIGHT - EAST_MAP_CONNECTION ROUTE_25, ROUTE_25_WIDTH, 0, 0, ROUTE_25_HEIGHT, Route25Blocks, ROUTE_24_WIDTH + SOUTH_MAP_CONNECTION ROUTE_24, CERULEAN_CITY, -3, 2, CeruleanCityBlocks, 1 + EAST_MAP_CONNECTION ROUTE_24, ROUTE_25, 0, 0, Route25Blocks dw Route24Object ; objects diff --git a/data/mapHeaders/route25.asm b/data/mapHeaders/route25.asm index 2e86f6d5..a6e62a00 100755 --- a/data/mapHeaders/route25.asm +++ b/data/mapHeaders/route25.asm @@ -3,5 +3,5 @@ Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36) db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x) dw Route25Blocks, Route25TextPointers, Route25Script ; blocks, texts, scripts db WEST ; connections - WEST_MAP_CONNECTION ROUTE_24, ROUTE_24_WIDTH, 0, 0, ROUTE_24_HEIGHT - 6, Route24Blocks, ROUTE_25_WIDTH + WEST_MAP_CONNECTION ROUTE_25, ROUTE_24, 0, 0, Route24Blocks dw Route25Object ; objects diff --git a/data/mapHeaders/route3.asm b/data/mapHeaders/route3.asm index 942e9e54..0003b90a 100755 --- a/data/mapHeaders/route3.asm +++ b/data/mapHeaders/route3.asm @@ -3,6 +3,6 @@ Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14) db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x) dw Route3Blocks, Route3TextPointers, Route3Script ; blocks, texts, scripts db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_4, ROUTE_4_WIDTH, ROUTE_4_HEIGHT, 25, 0, ROUTE_4_WIDTH - 32, Route4Blocks - WEST_MAP_CONNECTION PEWTER_CITY, PEWTER_CITY_WIDTH, -3, 1, PEWTER_CITY_HEIGHT - 3, PewterCityBlocks, ROUTE_3_WIDTH + NORTH_MAP_CONNECTION ROUTE_3, ROUTE_4, 25, 0, Route4Blocks + WEST_MAP_CONNECTION ROUTE_3, PEWTER_CITY, -3, 1, PewterCityBlocks dw Route3Object ; objects diff --git a/data/mapHeaders/route4.asm b/data/mapHeaders/route4.asm index c2fe6379..6e8724c9 100755 --- a/data/mapHeaders/route4.asm +++ b/data/mapHeaders/route4.asm @@ -3,6 +3,6 @@ Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15) db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) dw Route4Blocks, Route4TextPointers, Route4Script; blocks, texts, scripts db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_3, ROUTE_3_WIDTH, -3, 22, ROUTE_3_WIDTH - 22, Route3Blocks, ROUTE_4_WIDTH, ROUTE_4_HEIGHT - EAST_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, -3, 1, CERULEAN_CITY_HEIGHT - 3, CeruleanCityBlocks, ROUTE_4_WIDTH + SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3Blocks + EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCityBlocks, 1 dw Route4Object ; objects diff --git a/data/mapHeaders/route5.asm b/data/mapHeaders/route5.asm index 148eeb8d..d35a8dab 100755 --- a/data/mapHeaders/route5.asm +++ b/data/mapHeaders/route5.asm @@ -3,6 +3,6 @@ Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16) db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x) dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, CERULEAN_CITY_HEIGHT, -3, 2, CERULEAN_CITY_WIDTH - 4, CeruleanCityBlocks - SOUTH_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, -3, 2, SAFFRON_CITY_WIDTH - 4, SaffronCityBlocks, ROUTE_5_WIDTH, ROUTE_5_HEIGHT + NORTH_MAP_CONNECTION ROUTE_5, CERULEAN_CITY, -3, 2, CeruleanCityBlocks + SOUTH_MAP_CONNECTION ROUTE_5, SAFFRON_CITY, -3, 2, SaffronCityBlocks, 1 dw Route5Object ; objects diff --git a/data/mapHeaders/route6.asm b/data/mapHeaders/route6.asm index b6f5fe70..21dd0872 100755 --- a/data/mapHeaders/route6.asm +++ b/data/mapHeaders/route6.asm @@ -3,6 +3,6 @@ Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17) db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x) dw Route6Blocks, Route6TextPointers, Route6Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, SAFFRON_CITY_HEIGHT, -3, 2, SAFFRON_CITY_WIDTH - 4, SaffronCityBlocks - SOUTH_MAP_CONNECTION VERMILION_CITY, VERMILION_CITY_WIDTH, -3, 2, VERMILION_CITY_WIDTH - 4, VermilionCityBlocks, ROUTE_6_WIDTH, ROUTE_6_HEIGHT + NORTH_MAP_CONNECTION ROUTE_6, SAFFRON_CITY, -3, 2, SaffronCityBlocks + SOUTH_MAP_CONNECTION ROUTE_6, VERMILION_CITY, -3, 2, VermilionCityBlocks, 1 dw Route6Object ; objects diff --git a/data/mapHeaders/route7.asm b/data/mapHeaders/route7.asm index b90004e6..38fd1e15 100755 --- a/data/mapHeaders/route7.asm +++ b/data/mapHeaders/route7.asm @@ -3,6 +3,6 @@ Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18) db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x) dw Route7Blocks, Route7TextPointers, Route7Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION CELADON_CITY, CELADON_CITY_WIDTH, -3, 1, CELADON_CITY_HEIGHT - 3, CeladonCityBlocks, ROUTE_7_WIDTH - EAST_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, -3, 1, SAFFRON_CITY_HEIGHT - 3, SaffronCityBlocks, ROUTE_7_WIDTH + WEST_MAP_CONNECTION ROUTE_7, CELADON_CITY, -3, 1, CeladonCityBlocks + EAST_MAP_CONNECTION ROUTE_7, SAFFRON_CITY, -3, 1, SaffronCityBlocks, 1 dw Route7Object ; objects diff --git a/data/mapHeaders/route8.asm b/data/mapHeaders/route8.asm index dd9a717b..14c867ea 100755 --- a/data/mapHeaders/route8.asm +++ b/data/mapHeaders/route8.asm @@ -3,6 +3,6 @@ Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19) db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x) dw Route8Blocks, Route8TextPointers, Route8Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, -3, 1, SAFFRON_CITY_HEIGHT - 3, SaffronCityBlocks, ROUTE_8_WIDTH - EAST_MAP_CONNECTION LAVENDER_TOWN, LAVENDER_TOWN_WIDTH, 0, 0, LAVENDER_TOWN_HEIGHT, LavenderTownBlocks, ROUTE_8_WIDTH + WEST_MAP_CONNECTION ROUTE_8, SAFFRON_CITY, -3, 1, SaffronCityBlocks + EAST_MAP_CONNECTION ROUTE_8, LAVENDER_TOWN, 0, 0, LavenderTownBlocks dw Route8Object ; objects diff --git a/data/mapHeaders/route9.asm b/data/mapHeaders/route9.asm index f6cbd9af..30982dd4 100755 --- a/data/mapHeaders/route9.asm +++ b/data/mapHeaders/route9.asm @@ -3,6 +3,6 @@ Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20) db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x) dw Route9Blocks, Route9TextPointers, Route9Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, -3, 1, CERULEAN_CITY_HEIGHT - 3, CeruleanCityBlocks, ROUTE_9_WIDTH - EAST_MAP_CONNECTION ROUTE_10, ROUTE_10_WIDTH, 0, 0, ROUTE_10_HEIGHT - 24, Route10Blocks, ROUTE_9_WIDTH + WEST_MAP_CONNECTION ROUTE_9, CERULEAN_CITY, -3, 1, CeruleanCityBlocks + EAST_MAP_CONNECTION ROUTE_9, ROUTE_10, 0, 0, Route10Blocks, 1 dw Route9Object ; objects diff --git a/data/mapHeaders/saffroncity.asm b/data/mapHeaders/saffroncity.asm index 4c1d2d61..3a39b396 100755 --- a/data/mapHeaders/saffroncity.asm +++ b/data/mapHeaders/saffroncity.asm @@ -3,8 +3,8 @@ SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10) db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x) dw SaffronCityBlocks, SaffronCityTextPointers, SaffronCityScript ; blocks, texts, scripts db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_5, ROUTE_5_WIDTH, ROUTE_5_HEIGHT, 5, 0, ROUTE_5_WIDTH, Route5Blocks - SOUTH_MAP_CONNECTION ROUTE_6, ROUTE_6_WIDTH, 5, 0, ROUTE_6_WIDTH, Route6Blocks, SAFFRON_CITY_WIDTH, SAFFRON_CITY_HEIGHT - WEST_MAP_CONNECTION ROUTE_7, ROUTE_7_WIDTH, 4, 0, ROUTE_7_HEIGHT, Route7Blocks, SAFFRON_CITY_WIDTH - EAST_MAP_CONNECTION ROUTE_8, ROUTE_8_WIDTH, 4, 0, ROUTE_8_HEIGHT, Route8Blocks, SAFFRON_CITY_WIDTH + NORTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_5, 5, 0, Route5Blocks + SOUTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_6, 5, 0, Route6Blocks, 1 + WEST_MAP_CONNECTION SAFFRON_CITY, ROUTE_7, 4, 0, Route7Blocks + EAST_MAP_CONNECTION SAFFRON_CITY, ROUTE_8, 4, 0, Route8Blocks dw SaffronCityObject ; objects diff --git a/data/mapHeaders/tradecenter.asm b/data/mapHeaders/tradecenter.asm new file mode 100644 index 00000000..b9759bbb --- /dev/null +++ b/data/mapHeaders/tradecenter.asm @@ -0,0 +1,6 @@ +TradeCenter_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239) + db CLUB ; tileset + db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x) + dw TradeCenterBlocks, TradeCenterTextPointers, TradeCenterScript ; blocks, texts, scripts + db $00 ; connections + dw TradeCenterObject ; objects diff --git a/data/mapHeaders/tradecenterm.asm b/data/mapHeaders/tradecenterm.asm deleted file mode 100755 index 59eb5095..00000000 --- a/data/mapHeaders/tradecenterm.asm +++ /dev/null @@ -1,6 +0,0 @@ -TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240) - db CLUB ; tileset - db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x) - dw TradeCenterMBlocks, TradeCenterMTextPointers, TradeCenterMScript ; blocks, texts, scripts - db $00 ; connections - dw TradeCenterMObject ; objects diff --git a/data/mapHeaders/vermilioncity.asm b/data/mapHeaders/vermilioncity.asm index b7a41967..a4118084 100755 --- a/data/mapHeaders/vermilioncity.asm +++ b/data/mapHeaders/vermilioncity.asm @@ -3,6 +3,6 @@ VermilionCity_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5) db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x) dw VermilionCityBlocks, VermilionCityTextPointers, VermilionCityScript ; blocks, texts, scripts db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_6, ROUTE_6_WIDTH, ROUTE_6_HEIGHT, 5, 0, ROUTE_6_WIDTH, Route6Blocks - EAST_MAP_CONNECTION ROUTE_11, ROUTE_11_WIDTH, 4, 0, ROUTE_11_HEIGHT, Route11Blocks, VERMILION_CITY_WIDTH + NORTH_MAP_CONNECTION VERMILION_CITY, ROUTE_6, 5, 0, Route6Blocks + EAST_MAP_CONNECTION VERMILION_CITY, ROUTE_11, 4, 0, Route11Blocks dw VermilionCityObject ; objects diff --git a/data/mapHeaders/viridiancity.asm b/data/mapHeaders/viridiancity.asm index 96aac7ca..f7faa568 100755 --- a/data/mapHeaders/viridiancity.asm +++ b/data/mapHeaders/viridiancity.asm @@ -3,7 +3,7 @@ ViridianCity_h: ; 0x18357 to 0x18384 (45 bytes) (bank=6) (id=1) db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x) dw ViridianCityBlocks, ViridianCityTextPointers, ViridianCityScript ; blocks, texts, scripts db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_2, ROUTE_2_WIDTH, ROUTE_2_HEIGHT, 5, 0, ROUTE_2_WIDTH, Route2Blocks - SOUTH_MAP_CONNECTION ROUTE_1, ROUTE_1_WIDTH, 5, 0, ROUTE_1_WIDTH, Route1Blocks, VIRIDIAN_CITY_WIDTH, VIRIDIAN_CITY_HEIGHT - WEST_MAP_CONNECTION ROUTE_22, ROUTE_22_WIDTH, 4, 0, ROUTE_22_HEIGHT, Route22Blocks, VIRIDIAN_CITY_WIDTH + NORTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_2, 5, 0, Route2Blocks + SOUTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_1, 5, 0, Route1Blocks, 1 + WEST_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_22, 4, 0, Route22Blocks dw ViridianCityObject ; objects diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index 4b434885..e33172ae 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/agatha.asm @@ -9,8 +9,8 @@ AgathaObject: ; 0x76534 (size=44) db $0 ; signs - db $1 ; people - db SPRITE_AGATHA, $2 + 4, $5 + 4, $ff, $d0, TRAINER | $1, AGATHA + $C8, $1 + db $1 ; objects + object SPRITE_AGATHA, $5, $2, STAY, DOWN, $1, OPP_AGATHA, $1 ; warp-to EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $4 ; BRUNOS_ROOM diff --git a/data/mapObjects/battlecenterm.asm b/data/mapObjects/battlecenterm.asm deleted file mode 100755 index 45d88590..00000000 --- a/data/mapObjects/battlecenterm.asm +++ /dev/null @@ -1,9 +0,0 @@ -BattleCenterMObject: ; 0x4fd53 (size=10) - db $e ; border block - - db $0 ; warps - - db $0 ; signs - - db $1 ; people - db SPRITE_RED, $2 + 4, $2 + 4, $ff, $0, $1 ; person diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm index ad648931..847883d1 100644 --- a/data/mapObjects/beach_house.asm +++ b/data/mapObjects/beach_house.asm @@ -11,9 +11,9 @@ BeachHouseObjects: ; 0xf23a4 db 0,$b,5 db 1,$d,6 - db 2 ; people - db SPRITE_FISHER, 3+4, 2+4, $ff, $d0, 1 ; surfin' dude - db $3d, 3+4, 5+4, $fe, $01, 2 ; pikachu + db 2 ; objects + object SPRITE_FISHER, 2, 3, STAY, DOWN, 1 ; surfin' dude + object $3d, 5, 3, WALK, $01, 2 ; pikachu ; warp-to EVENT_DISP BEACH_HOUSE_WIDTH,7,2 diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm index 5803e3fb..ab763bc3 100755 --- a/data/mapObjects/bikeshop.asm +++ b/data/mapObjects/bikeshop.asm @@ -7,10 +7,10 @@ BikeShopObject: ; 0x1d866 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_BIKE_SHOP_GUY, $2 + 4, $6 + 4, $ff, $ff, $1 ; person - db SPRITE_MOM_GEISHA, $6 + 4, $5 + 4, $fe, $1, $2 ; person - db SPRITE_BUG_CATCHER, $3 + 4, $1 + 4, $ff, $d1, $3 ; person + db $3 ; objects + object SPRITE_BIKE_SHOP_GUY, $6, $2, STAY, NONE, $1 ; person + object SPRITE_MOM_GEISHA, $5, $6, WALK, $1, $2 ; person + object SPRITE_BUG_CATCHER, $1, $3, STAY, UP, $3 ; person ; warp-to EVENT_DISP BIKE_SHOP_WIDTH, $7, $2 diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm index 2c032bf2..9da1efd1 100755 --- a/data/mapObjects/billshouse.asm +++ b/data/mapObjects/billshouse.asm @@ -7,10 +7,10 @@ BillsHouseObject: ; 0x1e8df (size=38) db $0 ; signs - db $3 ; people - db SPRITE_SLOWBRO, $5 + 4, $6 + 4, $ff, $ff, $1 ; person - db SPRITE_BLACK_HAIR_BOY_2, $4 + 4, $4 + 4, $ff, $ff, $2 ; person - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $6 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_SLOWBRO, $6, $5, STAY, NONE, $1 ; person + object SPRITE_BLACK_HAIR_BOY_2, $4, $4, STAY, NONE, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $6, $5, STAY, NONE, $3 ; person ; warp-to EVENT_DISP BILLS_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 582733c0..43ba02e4 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -7,10 +7,10 @@ BluesHouseObject: ; 19bce (6:5bce) db $0 ; signs - db $3 ; people - db SPRITE_DAISY, $3 + 4, $2 + 4, $FF, $D3, $1 ; Daisy, sitting by map - db SPRITE_DAISY, $4 + 4, $6 + 4, $FE, $1, ITEM | $2, $0 ; Daisy, walking around - db SPRITE_BOOK_MAP_DEX, $3 + 4, $3 + 4, $FF, $FF, ITEM | $3, $0 ; map on table + db $3 ; objects + object SPRITE_DAISY, $2, $3, STAY, RIGHT, $1 ; Daisy, sitting by map + object SPRITE_DAISY, $6, $4, WALK, $1, $2, $0 ; Daisy, walking around + object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $3, $0 ; map on table ; warp-to EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index 8cbd9411..8d55461f 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -9,8 +9,8 @@ BrunoObject: ; 0x763d7 (size=44) db $0 ; signs - db $1 ; people - db SPRITE_BRUNO, $2 + 4, $5 + 4, $ff, $d0, TRAINER | $1, BRUNO + $C8, $1 + db $1 ; objects + object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, OPP_BRUNO, $1 ; warp-to EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm index b19e2f87..0e420221 100755 --- a/data/mapObjects/celadoncity.asm +++ b/data/mapObjects/celadoncity.asm @@ -27,16 +27,16 @@ CeladonCityObject: ; 0x18022 (size=189) db $15, $21, $11 ; CeladonCityText17 db $15, $1b, $12 ; CeladonCityText18 - db $9 ; people - db SPRITE_LITTLE_GIRL, $11 + 4, $8 + 4, $fe, $0, $1 ; person - db SPRITE_OLD_PERSON, $1c + 4, $b + 4, $ff, $d1, $2 ; person - db SPRITE_GIRL, $13 + 4, $e + 4, $fe, $1, $3 ; person - db SPRITE_OLD_PERSON, $16 + 4, $19 + 4, $ff, $d0, $4 ; person - db SPRITE_OLD_PERSON, $10 + 4, $16 + 4, $ff, $d0, $5 ; person - db SPRITE_FISHER2, $c + 4, $20 + 4, $ff, $d2, $6 ; person - db SPRITE_SLOWBRO, $c + 4, $1e + 4, $ff, $d3, $7 ; person - db SPRITE_ROCKET, $1d + 4, $20 + 4, $fe, $2, $8 ; person - db SPRITE_ROCKET, $e + 4, $2a + 4, $fe, $2, $9 ; person + db $9 ; objects + object SPRITE_LITTLE_GIRL, $8, $11, WALK, $0, $1 ; person + object SPRITE_OLD_PERSON, $b, $1c, STAY, UP, $2 ; person + object SPRITE_GIRL, $e, $13, WALK, $1, $3 ; person + object SPRITE_OLD_PERSON, $19, $16, STAY, DOWN, $4 ; person + object SPRITE_OLD_PERSON, $16, $10, STAY, DOWN, $5 ; person + object SPRITE_FISHER2, $20, $c, STAY, LEFT, $6 ; person + object SPRITE_SLOWBRO, $1e, $c, STAY, RIGHT, $7 ; person + object SPRITE_ROCKET, $20, $1d, WALK, $2, $8 ; person + object SPRITE_ROCKET, $2a, $e, WALK, $2, $9 ; person ; warp-to EVENT_DISP CELADON_CITY_WIDTH, $d, $8 ; CELADON_MART_1 diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm index ffb47d50..74141df9 100755 --- a/data/mapObjects/celadondiner.asm +++ b/data/mapObjects/celadondiner.asm @@ -7,12 +7,12 @@ CeladonDinerObject: ; 0x491bc (size=50) db $0 ; signs - db $5 ; people - db SPRITE_COOK, $5 + 4, $8 + 4, $fe, $2, $1 ; person - db SPRITE_MOM_GEISHA, $2 + 4, $7 + 4, $ff, $ff, $2 ; person - db SPRITE_FAT_BALD_GUY, $4 + 4, $1 + 4, $ff, $d0, $3 ; person - db SPRITE_FISHER2, $3 + 4, $5 + 4, $ff, $d3, $4 ; person - db SPRITE_GYM_HELPER, $1 + 4, $0 + 4, $ff, $d0, $5 ; person + db $5 ; objects + object SPRITE_COOK, $8, $5, WALK, $2, $1 ; person + object SPRITE_MOM_GEISHA, $7, $2, STAY, NONE, $2 ; person + object SPRITE_FAT_BALD_GUY, $1, $4, STAY, DOWN, $3 ; person + object SPRITE_FISHER2, $5, $3, STAY, RIGHT, $4 ; person + object SPRITE_GYM_HELPER, $0, $1, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP CELADON_DINER_WIDTH, $7, $3 diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index 50f85ed0..1169e1da 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -9,18 +9,18 @@ CeladonGameCornerObject: ; 0x48fa0 (size=99) db $1 ; signs db $4, $9, $c ; CeladonGameCornerText12 - db $b ; people - db SPRITE_FOULARD_WOMAN, $6 + 4, $2 + 4, $ff, $d0, $1 ; person - db SPRITE_MART_GUY, $6 + 4, $5 + 4, $ff, $d0, $2 ; person - db SPRITE_FAT_BALD_GUY, $a + 4, $2 + 4, $ff, $d2, $3 ; person - db SPRITE_FOULARD_WOMAN, $d + 4, $2 + 4, $ff, $d2, $4 ; person - db SPRITE_FISHER, $b + 4, $5 + 4, $ff, $d3, $5 ; person - db SPRITE_MOM_GEISHA, $b + 4, $8 + 4, $ff, $d2, $6 ; person - db SPRITE_GYM_HELPER, $e + 4, $8 + 4, $ff, $d2, $7 ; person - db SPRITE_GAMBLER, $f + 4, $b + 4, $ff, $d3, $8 ; person - db SPRITE_MART_GUY, $b + 4, $e + 4, $ff, $d2, $9 ; person - db SPRITE_GENTLEMAN, $d + 4, $11 + 4, $ff, $d3, $a ; person - db SPRITE_ROCKET, $5 + 4, $9 + 4, $ff, $d1, TRAINER | $b, ROCKET + $C8, $7 + db $b ; objects + object SPRITE_FOULARD_WOMAN, $2, $6, STAY, DOWN, $1 ; person + object SPRITE_MART_GUY, $5, $6, STAY, DOWN, $2 ; person + object SPRITE_FAT_BALD_GUY, $2, $a, STAY, LEFT, $3 ; person + object SPRITE_FOULARD_WOMAN, $2, $d, STAY, LEFT, $4 ; person + object SPRITE_FISHER, $5, $b, STAY, RIGHT, $5 ; person + object SPRITE_MOM_GEISHA, $8, $b, STAY, LEFT, $6 ; person + object SPRITE_GYM_HELPER, $8, $e, STAY, LEFT, $7 ; person + object SPRITE_GAMBLER, $b, $f, STAY, RIGHT, $8 ; person + object SPRITE_MART_GUY, $e, $b, STAY, LEFT, $9 ; person + object SPRITE_GENTLEMAN, $11, $d, STAY, RIGHT, $a ; person + object SPRITE_ROCKET, $9, $5, STAY, UP, $b, OPP_ROCKET, $7 ; warp-to EVENT_DISP GAME_CORNER_WIDTH, $11, $f diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index 7b90d159..f9c20c90 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -7,15 +7,15 @@ CeladonGymObject: ; 0x48b30 (size=84) db $0 ; signs - db $8 ; people - db SPRITE_ERIKA, $3 + 4, $4 + 4, $ff, $d0, TRAINER | $1, ERIKA + $C8, $1 - db SPRITE_LASS, $b + 4, $2 + 4, $ff, $d3, TRAINER | $2, LASS + $C8, $11 - db SPRITE_FOULARD_WOMAN, $a + 4, $7 + 4, $ff, $d2, TRAINER | $3, BEAUTY + $C8, $1 - db SPRITE_LASS, $5 + 4, $9 + 4, $ff, $d0, TRAINER | $4, JR__TRAINER_F + $C8, $b - db SPRITE_FOULARD_WOMAN, $5 + 4, $1 + 4, $ff, $d0, TRAINER | $5, BEAUTY + $C8, $2 - db SPRITE_LASS, $3 + 4, $6 + 4, $ff, $d0, TRAINER | $6, LASS + $C8, $12 - db SPRITE_FOULARD_WOMAN, $3 + 4, $3 + 4, $ff, $d0, TRAINER | $7, BEAUTY + $C8, $3 - db SPRITE_LASS, $3 + 4, $5 + 4, $ff, $d0, TRAINER | $8, COOLTRAINER_F + $C8, $1 + db $8 ; objects + object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, OPP_ERIKA, $1 + object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, OPP_LASS, $11 + object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, OPP_BEAUTY, $1 + object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR__TRAINER_F, $b + object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, OPP_BEAUTY, $2 + object SPRITE_LASS, $6, $3, STAY, DOWN, $6, OPP_LASS, $12 + object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, OPP_BEAUTY, $3 + object SPRITE_LASS, $5, $3, STAY, DOWN, $8, OPP_COOLTRAINER_F, $1 ; warp-to EVENT_DISP CELADON_GYM_WIDTH, $11, $4 diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm index b1052def..33c442c2 100755 --- a/data/mapObjects/celadonhotel.asm +++ b/data/mapObjects/celadonhotel.asm @@ -7,10 +7,10 @@ CeladonHotelObject: ; 0x49281 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_OLD_MEDIUM_WOMAN, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_FOULARD_WOMAN, $4 + 4, $2 + 4, $ff, $ff, $2 ; person - db SPRITE_BLACK_HAIR_BOY_2, $4 + 4, $8 + 4, $fe, $2, $3 ; person + db $3 ; objects + object SPRITE_OLD_MEDIUM_WOMAN, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_FOULARD_WOMAN, $2, $4, STAY, NONE, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $8, $4, WALK, $2, $3 ; person ; warp-to EVENT_DISP CELADON_HOTEL_WIDTH, $7, $3 diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm index 19be473b..0fcb08f5 100755 --- a/data/mapObjects/celadonhouse.asm +++ b/data/mapObjects/celadonhouse.asm @@ -7,10 +7,10 @@ CeladonHouseObject: ; 0x49227 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_OLD_PERSON, $2 + 4, $4 + 4, $ff, $d0, $1 ; person - db SPRITE_ROCKET, $4 + 4, $1 + 4, $fe, $0, $2 ; person - db SPRITE_SAILOR, $6 + 4, $5 + 4, $ff, $d2, $3 ; person + db $3 ; objects + object SPRITE_OLD_PERSON, $4, $2, STAY, DOWN, $1 ; person + object SPRITE_ROCKET, $1, $4, WALK, $0, $2 ; person + object SPRITE_SAILOR, $5, $6, STAY, LEFT, $3 ; person ; warp-to EVENT_DISP CELADON_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm index decb14e7..a308e8bc 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/celadonmansion1.asm @@ -11,11 +11,11 @@ CeladonMansion1Object: ; 0x486cf (size=71) db $1 ; signs db $9, $4, $5 ; CeladonMansion1Text5 - db $4 ; people - db SPRITE_SLOWBRO, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_OLD_MEDIUM_WOMAN, $5 + 4, $1 + 4, $ff, $d0, $2 ; person - db SPRITE_CLEFAIRY, $8 + 4, $1 + 4, $fe, $2, $3 ; person - db SPRITE_SLOWBRO, $4 + 4, $4 + 4, $fe, $1, $4 ; person + db $4 ; objects + object SPRITE_SLOWBRO, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_OLD_MEDIUM_WOMAN, $1, $5, STAY, DOWN, $2 ; person + object SPRITE_CLEFAIRY, $1, $8, WALK, $2, $3 ; person + object SPRITE_SLOWBRO, $4, $4, WALK, $1, $4 ; person ; warp-to EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $4 diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm index 3ed15a66..9271c22d 100755 --- a/data/mapObjects/celadonmansion2.asm +++ b/data/mapObjects/celadonmansion2.asm @@ -10,7 +10,7 @@ CeladonMansion2Object: ; 0x48745 (size=39) db $1 ; signs db $9, $4, $1 ; CeladonMansion2Text1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $6 ; CELADON_MANSION_3 diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm index e64bac61..36bf36d5 100755 --- a/data/mapObjects/celadonmansion3.asm +++ b/data/mapObjects/celadonmansion3.asm @@ -13,11 +13,11 @@ CeladonMansion3Object: ; 0x487ff (size=72) db $6, $1, $7 ; CeladonMansion3Text7 db $9, $4, $8 ; CeladonMansion3Text8 - db $4 ; people - db SPRITE_BIKE_SHOP_GUY, $4 + 4, $0 + 4, $ff, $d1, $1 ; person - db SPRITE_MART_GUY, $4 + 4, $3 + 4, $ff, $d1, $2 ; person - db SPRITE_BLACK_HAIR_BOY_2, $7 + 4, $0 + 4, $ff, $d1, $3 ; person - db SPRITE_LAPRAS_GIVER, $3 + 4, $2 + 4, $ff, $ff, $4 ; person + db $4 ; objects + object SPRITE_BIKE_SHOP_GUY, $0, $4, STAY, UP, $1 ; person + object SPRITE_MART_GUY, $3, $4, STAY, UP, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $0, $7, STAY, UP, $3 ; person + object SPRITE_LAPRAS_GIVER, $2, $3, STAY, NONE, $4 ; person ; warp-to EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $6 ; CELADON_MANSION_2 diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm index 4181bd17..0241725d 100755 --- a/data/mapObjects/celadonmansion4.asm +++ b/data/mapObjects/celadonmansion4.asm @@ -9,7 +9,7 @@ CeladonMansion4Object: ; 0x48875 (size=31) db $1 ; signs db $7, $3, $1 ; CeladonMansion4Text1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $6 ; CELADON_MANSION_3 diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm index efc74275..2f20323d 100755 --- a/data/mapObjects/celadonmansion5.asm +++ b/data/mapObjects/celadonmansion5.asm @@ -7,9 +7,9 @@ CeladonMansion5Object: ; 0x1dd5c (size=32) db $0 ; signs - db $2 ; people - db SPRITE_HIKER, $2 + 4, $2 + 4, $ff, $d0, $1 ; person - db SPRITE_BALL, $3 + 4, $4 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_HIKER, $2, $2, STAY, DOWN, $1 ; person + object SPRITE_BALL, $4, $3, STAY, NONE, $2 ; person ; warp-to EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $2 ; CELADON_MANSION_4 diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm index 10593f46..dbbc0a36 100755 --- a/data/mapObjects/celadonmart1.asm +++ b/data/mapObjects/celadonmart1.asm @@ -13,8 +13,8 @@ CeladonMart1Object: ; 0x60f9e (size=64) db $4, $b, $2 ; CeladonMart1Text2 db $1, $e, $3 ; CeladonMart1Text3 - db $1 ; people - db SPRITE_CABLE_CLUB_WOMAN, $3 + 4, $8 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_CABLE_CLUB_WOMAN, $8, $3, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP CELADON_MART_1_WIDTH, $7, $2 diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index 6b40ed11..061ac6e0 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/celadonmart2.asm @@ -9,11 +9,11 @@ CeladonMart2Object: ; 0x56111 (size=55) db $1 ; signs db $1, $e, $5 ; CeladonMart2Text5 - db $4 ; people - db SPRITE_MART_GUY, $3 + 4, $5 + 4, $ff, $d0, $1 ; person - db SPRITE_MART_GUY, $3 + 4, $6 + 4, $ff, $d0, $2 ; person - db SPRITE_FAT_BALD_GUY, $5 + 4, $13 + 4, $ff, $ff, $3 ; person - db SPRITE_GIRL, $4 + 4, $e + 4, $fe, $1, $4 ; person + db $4 ; objects + object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $1 ; person + object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $2 ; person + object SPRITE_FAT_BALD_GUY, $13, $5, STAY, NONE, $3 ; person + object SPRITE_GIRL, $e, $4, WALK, $1, $4 ; person ; warp-to EVENT_DISP CELADON_MART_2_WIDTH, $1, $c ; CELADON_MART_1 diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index 8ffbf823..5e11a62c 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/celadonmart3.asm @@ -20,12 +20,12 @@ CeladonMart3Object: ; 0x482c4 (size=94) db $1, $6, $10 ; CeladonMart3Text16 db $1, $a, $11 ; CeladonMart3Text17 - db $5 ; people - db SPRITE_MART_GUY, $5 + 4, $10 + 4, $ff, $ff, $1 ; person - db SPRITE_GAMEBOY_KID_COPY, $6 + 4, $b + 4, $ff, $d3, $2 ; person - db SPRITE_GAMEBOY_KID_COPY, $2 + 4, $7 + 4, $ff, $d0, $3 ; person - db SPRITE_GAMEBOY_KID_COPY, $2 + 4, $8 + 4, $ff, $d0, $4 ; person - db SPRITE_YOUNG_BOY, $5 + 4, $2 + 4, $ff, $d1, $5 ; person + db $5 ; objects + object SPRITE_MART_GUY, $10, $5, STAY, NONE, $1 ; person + object SPRITE_GAMEBOY_KID_COPY, $b, $6, STAY, RIGHT, $2 ; person + object SPRITE_GAMEBOY_KID_COPY, $7, $2, STAY, DOWN, $3 ; person + object SPRITE_GAMEBOY_KID_COPY, $8, $2, STAY, DOWN, $4 ; person + object SPRITE_YOUNG_BOY, $2, $5, STAY, UP, $5 ; person ; warp-to EVENT_DISP CELADON_MART_3_WIDTH, $1, $c ; CELADON_MART_4 diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index 5bdbbf4a..7dce43dc 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/celadonmart4.asm @@ -9,10 +9,10 @@ CeladonMart4Object: ; 0x48370 (size=49) db $1 ; signs db $1, $e, $4 ; CeladonMart4Text4 - db $3 ; people - db SPRITE_MART_GUY, $7 + 4, $5 + 4, $ff, $ff, $1 ; person - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $f + 4, $fe, $2, $2 ; person - db SPRITE_BUG_CATCHER, $2 + 4, $5 + 4, $fe, $2, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $5, $7, STAY, NONE, $1 ; person + object SPRITE_BLACK_HAIR_BOY_2, $f, $5, WALK, $2, $2 ; person + object SPRITE_BUG_CATCHER, $5, $2, WALK, $2, $3 ; person ; warp-to EVENT_DISP CELADON_MART_4_WIDTH, $1, $c ; CELADON_MART_3 diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm index 9914d51b..23b7cf4f 100755 --- a/data/mapObjects/celadonmart5.asm +++ b/data/mapObjects/celadonmart5.asm @@ -9,11 +9,11 @@ CeladonMart5Object: ; 0x49085 (size=55) db $1 ; signs db $1, $e, $5 ; CeladonMart5Text5 - db $4 ; people - db SPRITE_GENTLEMAN, $5 + 4, $e + 4, $fe, $1, $1 ; person - db SPRITE_SAILOR, $6 + 4, $2 + 4, $ff, $ff, $2 ; person - db SPRITE_MART_GUY, $3 + 4, $5 + 4, $ff, $d0, $3 ; person - db SPRITE_MART_GUY, $3 + 4, $6 + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_GENTLEMAN, $e, $5, WALK, $1, $1 ; person + object SPRITE_SAILOR, $2, $6, STAY, NONE, $2 ; person + object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $3 ; person + object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP CELADON_MART_5_WIDTH, $1, $c ; CELADON_MART_ROOF diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm index ca9a8f08..6b778043 100755 --- a/data/mapObjects/celadonmartelevator.asm +++ b/data/mapObjects/celadonmartelevator.asm @@ -8,7 +8,7 @@ CeladonMartElevatorObject: ; 0x4866d (size=23) db $1 ; signs db $0, $3, $1 ; CeladonMartElevatorText1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $1 ; CELADON_MART_1 diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index 119eb4f8..82830cf2 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/celadonmartroof.asm @@ -10,9 +10,9 @@ CeladonMartRoofObject: ; 0x485a8 (size=36) db $2, $c, $5 ; CeladonMartRoofText5 db $2, $d, $6 ; CeladonMartRoofText6 - db $2 ; people - db SPRITE_BLACK_HAIR_BOY_2, $4 + 4, $a + 4, $ff, $d2, $1 ; person - db SPRITE_LITTLE_GIRL, $5 + 4, $5 + 4, $fe, $0, $2 ; person + db $2 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $a, $4, STAY, LEFT, $1 ; person + object SPRITE_LITTLE_GIRL, $5, $5, WALK, $0, $2 ; person ; warp-to EVENT_DISP CELADON_MART_ROOF_WIDTH, $2, $f ; CELADON_MART_5 diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index dcfeceb7..ccc30ce7 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/celadonpokecenter.asm @@ -7,11 +7,11 @@ CeladonPokecenterObject: ; 0x488d2 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_GENTLEMAN, $3 + 4, $7 + 4, $fe, $2, $2 ; person - db SPRITE_FOULARD_WOMAN, $5 + 4, $a + 4, $fe, $0, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person + object SPRITE_FOULARD_WOMAN, $a, $5, WALK, $0, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm index f280b050..73ca7598 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/celadonprizeroom.asm @@ -10,9 +10,9 @@ CeladonPrizeRoomObject: ; 0x49108 (size=41) db $2, $4, $4 ; CeladonPrizeRoomText4 db $2, $6, $5 ; CeladonPrizeRoomText5 - db $2 ; people - db SPRITE_BALDING_GUY, $4 + 4, $1 + 4, $ff, $ff, $1 ; person - db SPRITE_GAMBLER, $3 + 4, $7 + 4, $fe, $2, $2 ; person + db $2 ; objects + object SPRITE_BALDING_GUY, $1, $4, STAY, NONE, $1 ; person + object SPRITE_GAMBLER, $7, $3, WALK, $2, $2 ; person ; warp-to EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $4 diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index 3f57457b..8c429695 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -21,18 +21,18 @@ CeruleanCityObject: ; 0x18786 (size=170) db $19, $b, $10 ; CeruleanCityText16 db $15, $1b, $11 ; CeruleanCityText17 - db $b ; people - db SPRITE_BLUE, $2 + 4, $14 + 4, $ff, $d0, $1 ; person - db SPRITE_ROCKET, $8 + 4, $1e + 4, $ff, $ff, TRAINER | $2, ROCKET + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_1, $14 + 4, $1f + 4, $ff, $d0, $3 ; person - db SPRITE_BLACK_HAIR_BOY_2, $12 + 4, $f + 4, $fe, $1, $4 ; person - db SPRITE_BLACK_HAIR_BOY_2, $15 + 4, $9 + 4, $fe, $2, $5 ; person - db SPRITE_GUARD, $c + 4, $1c + 4, $ff, $d0, $6 ; person - db SPRITE_LASS, $1a + 4, $1d + 4, $ff, $d2, $7 ; person - db SPRITE_SLOWBRO, $1a + 4, $1c + 4, $ff, $d0, $8 ; person - db SPRITE_LASS, $1b + 4, $9 + 4, $fe, $2, $9 ; person - db SPRITE_BLACK_HAIR_BOY_2, $c + 4, $4 + 4, $ff, $d0, $a ; person - db SPRITE_GUARD, $c + 4, $1b + 4, $ff, $d0, $b ; person + db $b ; objects + object SPRITE_BLUE, $14, $2, STAY, DOWN, $1 ; person + object SPRITE_ROCKET, $1e, $8, STAY, NONE, $2, OPP_ROCKET, $5 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, STAY, DOWN, $3 ; person + object SPRITE_BLACK_HAIR_BOY_2, $f, $12, WALK, $1, $4 ; person + object SPRITE_BLACK_HAIR_BOY_2, $9, $15, WALK, $2, $5 ; person + object SPRITE_GUARD, $1c, $c, STAY, DOWN, $6 ; person + object SPRITE_LASS, $1d, $1a, STAY, LEFT, $7 ; person + object SPRITE_SLOWBRO, $1c, $1a, STAY, DOWN, $8 ; person + object SPRITE_LASS, $9, $1b, WALK, $2, $9 ; person + object SPRITE_BLACK_HAIR_BOY_2, $4, $c, STAY, DOWN, $a ; person + object SPRITE_GUARD, $1b, $c, STAY, DOWN, $b ; person ; warp-to EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index 87128c5b..d87c9c20 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -7,11 +7,11 @@ CeruleanGymObject: ; 0x5c834 (size=50) db $0 ; signs - db $4 ; people - db SPRITE_BRUNETTE_GIRL, $2 + 4, $4 + 4, $ff, $d0, TRAINER | $1, MISTY + $C8, $1 - db SPRITE_LASS, $3 + 4, $2 + 4, $ff, $d3, TRAINER | $2, JR__TRAINER_F + $C8, $1 - db SPRITE_SWIMMER, $7 + 4, $8 + 4, $ff, $d2, TRAINER | $3, SWIMMER + $C8, $1 - db SPRITE_GYM_HELPER, $a + 4, $7 + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, OPP_MISTY, $1 + object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, OPP_JR__TRAINER_F, $1 + object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, OPP_SWIMMER, $1 + object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP CERULEAN_GYM_WIDTH, $d, $4 diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index a5d10033..db0be014 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -7,9 +7,9 @@ CeruleanHouse1Object: ; 0x1d710 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_OLD_MEDIUM_WOMAN, $4 + 4, $5 + 4, $ff, $d2, $1 ; person - db SPRITE_GAMBLER, $2 + 4, $1 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_OLD_MEDIUM_WOMAN, $5, $4, STAY, LEFT, $1 ; person + object SPRITE_GAMBLER, $1, $2, STAY, NONE, $2 ; person ; warp-to EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm index c8c4ee51..24fe3a5e 100755 --- a/data/mapObjects/ceruleanhouse2.asm +++ b/data/mapObjects/ceruleanhouse2.asm @@ -8,8 +8,8 @@ CeruleanHouse2Object: ; 0x74ebe (size=34) db $0 ; signs - db $1 ; people - db SPRITE_FAT_BALD_GUY, $3 + 4, $5 + 4, $ff, $d3, $1 ; person + db $1 ; objects + object SPRITE_FAT_BALD_GUY, $5, $3, STAY, RIGHT, $1 ; person ; warp-to EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $0, $2 diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm index ce5e0e69..0c896120 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/ceruleanhousetrashed.asm @@ -9,9 +9,9 @@ CeruleanHouseTrashedObject: ; 0x1d6bf (size=43) db $1 ; signs db $0, $3, $3 ; CeruleanHouseTrashedText3 - db $2 ; people - db SPRITE_FISHER, $1 + 4, $2 + 4, $ff, $d0, $1 ; person - db SPRITE_GIRL, $6 + 4, $5 + 4, $fe, $2, $2 ; person + db $2 ; objects + object SPRITE_FISHER, $2, $1, STAY, DOWN, $1 ; person + object SPRITE_GIRL, $5, $6, WALK, $2, $2 ; person ; warp-to EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm index bc8c4818..fc400e73 100755 --- a/data/mapObjects/ceruleanmart.asm +++ b/data/mapObjects/ceruleanmart.asm @@ -7,10 +7,10 @@ CeruleanMartObject: ; 0x5c8a8 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_BLACK_HAIR_BOY_1, $4 + 4, $3 + 4, $fe, $1, $2 ; person - db SPRITE_LASS, $2 + 4, $6 + 4, $fe, $2, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_BLACK_HAIR_BOY_1, $3, $4, WALK, $1, $2 ; person + object SPRITE_LASS, $6, $2, WALK, $2, $3 ; person ; warp-to EVENT_DISP CERULEAN_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index c7e8cb8b..930995dd 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -7,11 +7,11 @@ CeruleanPokecenterObject: ; 0x5c65f (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $a + 4, $fe, $0, $2 ; person - db SPRITE_GENTLEMAN, $3 + 4, $4 + 4, $ff, $d0, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_BLACK_HAIR_BOY_2, $a, $5, WALK, $0, $2 ; person + object SPRITE_GENTLEMAN, $4, $3, STAY, DOWN, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index ba18fdc6..d9b69192 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -7,16 +7,16 @@ CinnabarGymObject: ; 0x75acc (size=90) db $0 ; signs - db $9 ; people - db SPRITE_FAT_BALD_GUY, $3 + 4, $3 + 4, $ff, $d0, TRAINER | $1, BLAINE + $C8, $1 - db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $11 + 4, $ff, $d0, TRAINER | $2, SUPER_NERD + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_2, $8 + 4, $11 + 4, $ff, $d0, TRAINER | $3, BURGLAR + $C8, $4 - db SPRITE_BLACK_HAIR_BOY_2, $4 + 4, $b + 4, $ff, $d0, TRAINER | $4, SUPER_NERD + $C8, $a - db SPRITE_BLACK_HAIR_BOY_2, $8 + 4, $b + 4, $ff, $d0, TRAINER | $5, BURGLAR + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_2, $e + 4, $b + 4, $ff, $d0, TRAINER | $6, SUPER_NERD + $C8, $b - db SPRITE_BLACK_HAIR_BOY_2, $e + 4, $3 + 4, $ff, $d0, TRAINER | $7, BURGLAR + $C8, $6 - db SPRITE_BLACK_HAIR_BOY_2, $8 + 4, $3 + 4, $ff, $d0, TRAINER | $8, SUPER_NERD + $C8, $c - db SPRITE_GYM_HELPER, $d + 4, $10 + 4, $ff, $d0, $9 ; person + db $9 ; objects + object SPRITE_FAT_BALD_GUY, $3, $3, STAY, DOWN, $1, OPP_BLAINE, $1 + object SPRITE_BLACK_HAIR_BOY_2, $11, $2, STAY, DOWN, $2, OPP_SUPER_NERD, $9 + object SPRITE_BLACK_HAIR_BOY_2, $11, $8, STAY, DOWN, $3, OPP_BURGLAR, $4 + object SPRITE_BLACK_HAIR_BOY_2, $b, $4, STAY, DOWN, $4, OPP_SUPER_NERD, $a + object SPRITE_BLACK_HAIR_BOY_2, $b, $8, STAY, DOWN, $5, OPP_BURGLAR, $5 + object SPRITE_BLACK_HAIR_BOY_2, $b, $e, STAY, DOWN, $6, OPP_SUPER_NERD, $b + object SPRITE_BLACK_HAIR_BOY_2, $3, $e, STAY, DOWN, $7, OPP_BURGLAR, $6 + object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, DOWN, $8, OPP_SUPER_NERD, $c + object SPRITE_GYM_HELPER, $10, $d, STAY, DOWN, $9 ; person ; warp-to EVENT_DISP CINNABAR_GYM_WIDTH, $11, $10 diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index f2a53d7c..7c8e80fb 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/cinnabarisland.asm @@ -15,9 +15,9 @@ CinnabarIslandObject: ; 0x1c022 (size=71) db $b, $9, $6 ; CinnabarIslandText6 db $3, $d, $7 ; CinnabarIslandText7 - db $2 ; people - db SPRITE_GIRL, $5 + 4, $c + 4, $fe, $2, $1 ; person - db SPRITE_GAMBLER, $6 + 4, $e + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_GIRL, $c, $5, WALK, $2, $1 ; person + object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person ; warp-to EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $6 ; MANSION_1 diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm index b976d0be..057ce048 100755 --- a/data/mapObjects/cinnabarmart.asm +++ b/data/mapObjects/cinnabarmart.asm @@ -7,10 +7,10 @@ CinnabarMartObject: ; 0x75e91 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_ERIKA, $2 + 4, $6 + 4, $ff, $ff, $2 ; person - db SPRITE_OAK_AIDE, $4 + 4, $3 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_ERIKA, $6, $2, STAY, NONE, $2 ; person + object SPRITE_OAK_AIDE, $3, $4, STAY, NONE, $3 ; person ; warp-to EVENT_DISP CINNABAR_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm index 35a344e2..f144db96 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/cinnabarpokecenter.asm @@ -7,11 +7,11 @@ CinnabarPokecenterObject: ; 0x75e46 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_LASS, $4 + 4, $9 + 4, $fe, $0, $2 ; person - db SPRITE_GENTLEMAN, $6 + 4, $2 + 4, $ff, $ff, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_LASS, $9, $4, WALK, $0, $2 ; person + object SPRITE_GENTLEMAN, $2, $6, STAY, NONE, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm new file mode 100644 index 00000000..5be02b44 --- /dev/null +++ b/data/mapObjects/colosseum.asm @@ -0,0 +1,9 @@ +ColosseumObject: ; 0x4fd87 (size=10) + db $e ; border block + + db $0 ; warps + + db $0 ; signs + + db $1 ; objects + object SPRITE_RED, $2, $2, STAY, $0, $1 ; person diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index ccd839f8..96787714 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/copycatshouse1f.asm @@ -8,10 +8,10 @@ CopycatsHouse1FObject: ; 0x75ee3 (size=46) db $0 ; signs - db $3 ; people - db SPRITE_MOM_GEISHA, $2 + 4, $2 + 4, $ff, $d0, $1 ; person - db SPRITE_FAT_BALD_GUY, $4 + 4, $5 + 4, $ff, $d2, $2 ; person - db SPRITE_CLEFAIRY, $4 + 4, $1 + 4, $fe, $1, $3 ; person + db $3 ; objects + object SPRITE_MOM_GEISHA, $2, $2, STAY, DOWN, $1 ; person + object SPRITE_FAT_BALD_GUY, $5, $4, STAY, LEFT, $2 ; person + object SPRITE_CLEFAIRY, $1, $4, WALK, $1, $3 ; person ; warp-to EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $2 diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index 3d0432c6..204c429f 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/copycatshouse2f.asm @@ -8,12 +8,12 @@ CopycatsHouse2FObject: ; 0x5cd21 (size=48) db $5, $3, $6 ; CopycatsHouse2FText6 db $1, $0, $7 ; CopycatsHouse2FText7 - db $5 ; people - db SPRITE_BRUNETTE_GIRL, $3 + 4, $4 + 4, $fe, $0, $1 ; person - db SPRITE_BIRD, $6 + 4, $4 + 4, $fe, $2, $2 ; person - db SPRITE_SLOWBRO, $1 + 4, $5 + 4, $ff, $d0, $3 ; person - db SPRITE_BIRD, $0 + 4, $2 + 4, $ff, $d0, $4 ; person - db SPRITE_CLEFAIRY, $6 + 4, $1 + 4, $ff, $d3, $5 ; person + db $5 ; objects + object SPRITE_BRUNETTE_GIRL, $4, $3, WALK, $0, $1 ; person + object SPRITE_BIRD, $4, $6, WALK, $2, $2 ; person + object SPRITE_SLOWBRO, $5, $1, STAY, DOWN, $3 ; person + object SPRITE_BIRD, $2, $0, STAY, DOWN, $4 ; person + object SPRITE_CLEFAIRY, $1, $6, STAY, RIGHT, $5 ; person ; warp-to EVENT_DISP COPYCATS_HOUSE_2F_WIDTH, $1, $7 ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm index 8311853a..7fbbf13b 100755 --- a/data/mapObjects/daycarem.asm +++ b/data/mapObjects/daycarem.asm @@ -7,8 +7,8 @@ DayCareMObject: ; 0x56459 (size=26) db $0 ; signs - db $1 ; people - db SPRITE_GENTLEMAN, $3 + 4, $2 + 4, $ff, $d3, $1 ; person + db $1 ; objects + object SPRITE_GENTLEMAN, $2, $3, STAY, RIGHT, $1 ; person ; warp-to EVENT_DISP DAYCAREM_WIDTH, $7, $2 diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm index 858005ce..74bbf775 100755 --- a/data/mapObjects/diglettscave.asm +++ b/data/mapObjects/diglettscave.asm @@ -7,7 +7,7 @@ DiglettsCaveObject: ; 0x61f72 (size=20) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP DIGLETTS_CAVE_WIDTH, $5, $5 ; DIGLETTS_CAVE_EXIT diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm index e232b1cc..d77e649d 100755 --- a/data/mapObjects/diglettscaveroute11.asm +++ b/data/mapObjects/diglettscaveroute11.asm @@ -8,8 +8,8 @@ DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34) db $0 ; signs - db $1 ; people - db SPRITE_GAMBLER, $3 + 4, $2 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_GAMBLER, $2, $3, STAY, NONE, $1 ; person ; warp-to EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $2 diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm index 2e86600f..a905305b 100755 --- a/data/mapObjects/diglettscaveroute2.asm +++ b/data/mapObjects/diglettscaveroute2.asm @@ -8,8 +8,8 @@ DiglettsCaveRoute2Object: ; 0x1debf (size=34) db $0 ; signs - db $1 ; people - db SPRITE_FISHER, $3 + 4, $3 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $3, $3, STAY, NONE, $1 ; person ; warp-to EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $2 diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index 15b9a89f..6f65b287 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -9,13 +9,13 @@ FanClubObject: ; 0x59c97 (size=62) db $0, $1, $7 ; FanClubText7 db $0, $6, $8 ; FanClubText8 - db $6 ; people - db SPRITE_FISHER2, $3 + 4, $6 + 4, $ff, $d2, $1 ; person - db SPRITE_GIRL, $3 + 4, $1 + 4, $ff, $d3, $2 ; person - db SPRITE_CLEFAIRY, $4 + 4, $6 + 4, $ff, $d2, $3 ; person - db SPRITE_SEEL, $4 + 4, $1 + 4, $ff, $d3, $4 ; person - db SPRITE_GENTLEMAN, $1 + 4, $3 + 4, $ff, $d0, $5 ; person - db SPRITE_CABLE_CLUB_WOMAN, $1 + 4, $5 + 4, $ff, $d0, $6 ; person + 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 EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $2 diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index f84f3ee7..aa9c0bd7 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/fightingdojo.asm @@ -7,14 +7,14 @@ FightingDojoObject: ; 0x5cf9b (size=72) db $0 ; signs - db $7 ; people - db SPRITE_HIKER, $3 + 4, $5 + 4, $ff, $d0, TRAINER | $1, BLACKBELT + $C8, $1 - db SPRITE_HIKER, $4 + 4, $3 + 4, $ff, $d3, TRAINER | $2, BLACKBELT + $C8, $2 - db SPRITE_HIKER, $6 + 4, $3 + 4, $ff, $d3, TRAINER | $3, BLACKBELT + $C8, $3 - db SPRITE_HIKER, $5 + 4, $5 + 4, $ff, $d2, TRAINER | $4, BLACKBELT + $C8, $4 - db SPRITE_HIKER, $7 + 4, $5 + 4, $ff, $d2, TRAINER | $5, BLACKBELT + $C8, $5 - db SPRITE_BALL, $1 + 4, $4 + 4, $ff, $ff, $6 ; person - db SPRITE_BALL, $1 + 4, $5 + 4, $ff, $ff, $7 ; person + db $7 ; objects + object SPRITE_HIKER, $5, $3, STAY, DOWN, $1, OPP_BLACKBELT, $1 + object SPRITE_HIKER, $3, $4, STAY, RIGHT, $2, OPP_BLACKBELT, $2 + object SPRITE_HIKER, $3, $6, STAY, RIGHT, $3, OPP_BLACKBELT, $3 + object SPRITE_HIKER, $5, $5, STAY, LEFT, $4, OPP_BLACKBELT, $4 + object SPRITE_HIKER, $5, $7, STAY, LEFT, $5, OPP_BLACKBELT, $5 + object SPRITE_BALL, $4, $1, STAY, NONE, $6 ; person + object SPRITE_BALL, $5, $1, STAY, NONE, $7 ; person ; warp-to EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $4 diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index f6ce2ec3..85f801d9 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -28,17 +28,17 @@ FuchsiaCityObject: ; 0x18bd4 (size=178) db $f, $d, $17 ; FuchsiaCityText23 db $7, $7, $18 ; FuchsiaCityText24 - db $a ; people - db SPRITE_BUG_CATCHER, $c + 4, $a + 4, $fe, $2, $1 ; person - db SPRITE_GAMBLER, $11 + 4, $1c + 4, $fe, $2, $2 ; person - db SPRITE_FISHER2, $e + 4, $1e + 4, $ff, $d0, $3 ; person - db SPRITE_BUG_CATCHER, $8 + 4, $18 + 4, $ff, $d1, $4 ; person - db SPRITE_CLEFAIRY, $5 + 4, $1f + 4, $fe, $0, $5 ; person - db SPRITE_BALL, $6 + 4, $19 + 4, $ff, $ff, $6 ; person - db SPRITE_SLOWBRO, $6 + 4, $c + 4, $fe, $2, $7 ; person - db SPRITE_SLOWBRO, $c + 4, $1e + 4, $fe, $2, $8 ; person - db SPRITE_SEEL, $11 + 4, $8 + 4, $fe, $0, $9 ; person - db SPRITE_OMANYTE, $5 + 4, $6 + 4, $ff, $ff, $a ; person + db $a ; objects + object SPRITE_BUG_CATCHER, $a, $c, WALK, $2, $1 ; person + object SPRITE_GAMBLER, $1c, $11, WALK, $2, $2 ; person + object SPRITE_FISHER2, $1e, $e, STAY, DOWN, $3 ; person + object SPRITE_BUG_CATCHER, $18, $8, STAY, UP, $4 ; person + object SPRITE_CLEFAIRY, $1f, $5, WALK, $0, $5 ; person + object SPRITE_BALL, $19, $6, STAY, NONE, $6 ; person + object SPRITE_SLOWBRO, $c, $6, WALK, $2, $7 ; person + object SPRITE_SLOWBRO, $1e, $c, WALK, $2, $8 ; person + object SPRITE_SEEL, $8, $11, WALK, $0, $9 ; person + object SPRITE_OMANYTE, $6, $5, STAY, NONE, $a ; person ; warp-to EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $5 ; FUCHSIA_MART diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index e48c597c..ded17031 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -7,15 +7,15 @@ FuchsiaGymObject: ; 0x75658 (size=82) db $0 ; signs - db $8 ; people - db SPRITE_BLACKBELT, $a + 4, $4 + 4, $ff, $d0, TRAINER | $1, KOGA + $C8, $1 - db SPRITE_ROCKER, $d + 4, $8 + 4, $ff, $d0, TRAINER | $2, JUGGLER + $C8, $7 - db SPRITE_ROCKER, $8 + 4, $7 + 4, $ff, $d3, TRAINER | $3, JUGGLER + $C8, $3 - db SPRITE_ROCKER, $c + 4, $1 + 4, $ff, $d0, TRAINER | $4, JUGGLER + $C8, $8 - db SPRITE_ROCKER, $5 + 4, $3 + 4, $ff, $d1, TRAINER | $5, TAMER + $C8, $1 - db SPRITE_ROCKER, $2 + 4, $8 + 4, $ff, $d0, TRAINER | $6, TAMER + $C8, $2 - db SPRITE_ROCKER, $7 + 4, $2 + 4, $ff, $d2, TRAINER | $7, JUGGLER + $C8, $4 - db SPRITE_GYM_HELPER, $f + 4, $7 + 4, $ff, $d0, $8 ; person + db $8 ; objects + object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, OPP_KOGA, $1 + object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, OPP_JUGGLER, $7 + object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, OPP_JUGGLER, $3 + object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, OPP_JUGGLER, $8 + object SPRITE_ROCKER, $3, $5, STAY, UP, $5, OPP_TAMER, $1 + object SPRITE_ROCKER, $8, $2, STAY, DOWN, $6, OPP_TAMER, $2 + object SPRITE_ROCKER, $2, $7, STAY, LEFT, $7, OPP_JUGGLER, $4 + object SPRITE_GYM_HELPER, $7, $f, STAY, DOWN, $8 ; person ; warp-to EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $4 diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm index 4e3ec676..0789ea2c 100755 --- a/data/mapObjects/fuchsiahouse1.asm +++ b/data/mapObjects/fuchsiahouse1.asm @@ -7,10 +7,10 @@ FuchsiaHouse1Object: ; 0x75031 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MOM_GEISHA, $3 + 4, $2 + 4, $ff, $d3, $1 ; person - db SPRITE_GAMBLER, $2 + 4, $7 + 4, $ff, $d1, $2 ; person - db SPRITE_BUG_CATCHER, $5 + 4, $5 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_MOM_GEISHA, $2, $3, STAY, RIGHT, $1 ; person + object SPRITE_GAMBLER, $7, $2, STAY, UP, $2 ; person + object SPRITE_BUG_CATCHER, $5, $5, STAY, NONE, $3 ; person ; warp-to EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index f2958f02..f3aa5e7c 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/fuchsiahouse2.asm @@ -9,10 +9,10 @@ FuchsiaHouse2Object: ; 0x75180 (size=45) db $3, $4, $4 ; FuchsiaHouse2Text4 db $3, $5, $5 ; FuchsiaHouse2Text5 - db $3 ; people - db SPRITE_WARDEN, $3 + 4, $2 + 4, $ff, $ff, $1 ; person - db SPRITE_BALL, $3 + 4, $8 + 4, $ff, $ff, ITEM | $2, RARE_CANDY - db SPRITE_BOULDER, $4 + 4, $8 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $3 ; person + db $3 ; objects + object SPRITE_WARDEN, $2, $3, STAY, NONE, $1 ; person + object SPRITE_BALL, $8, $3, STAY, NONE, $2, RARE_CANDY + object SPRITE_BOULDER, $8, $4, STAY, BOULDER_MOVEMENT_BYTE_2, $3 ; person ; warp-to EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $4 diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm index 141f895f..3fd056e9 100755 --- a/data/mapObjects/fuchsiahouse3.asm +++ b/data/mapObjects/fuchsiahouse3.asm @@ -8,8 +8,8 @@ FuchsiaHouse3Object: ; 0x56221 (size=34) db $0 ; signs - db $1 ; people - db SPRITE_FISHER, $3 + 4, $5 + 4, $ff, $d3, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $5, $3, STAY, RIGHT, $1 ; person ; warp-to EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $0, $2 diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm index cb859734..eb85d110 100755 --- a/data/mapObjects/fuchsiamart.asm +++ b/data/mapObjects/fuchsiamart.asm @@ -7,10 +7,10 @@ FuchsiaMartObject: ; 0x1dd9b (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_FAT_BALD_GUY, $2 + 4, $4 + 4, $ff, $ff, $2 ; person - db SPRITE_LASS, $5 + 4, $6 + 4, $fe, $1, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_FAT_BALD_GUY, $4, $2, STAY, NONE, $2 ; person + object SPRITE_LASS, $6, $5, WALK, $1, $3 ; person ; warp-to EVENT_DISP FUCHSIA_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm index fb243f4b..36afcfd8 100755 --- a/data/mapObjects/fuchsiameetingroom.asm +++ b/data/mapObjects/fuchsiameetingroom.asm @@ -7,10 +7,10 @@ FuchsiaMeetingRoomObject: ; 0x756fc (size=38) db $0 ; signs - db $3 ; people - db SPRITE_WHITE_PLAYER, $1 + 4, $4 + 4, $ff, $d0, $1 ; person - db SPRITE_WHITE_PLAYER, $2 + 4, $0 + 4, $ff, $d1, $2 ; person - db SPRITE_WHITE_PLAYER, $1 + 4, $a + 4, $ff, $d0, $3 ; person + db $3 ; objects + object SPRITE_WHITE_PLAYER, $4, $1, STAY, DOWN, $1 ; person + object SPRITE_WHITE_PLAYER, $0, $2, STAY, UP, $2 ; person + object SPRITE_WHITE_PLAYER, $a, $1, STAY, DOWN, $3 ; person ; warp-to EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $4 diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm index 1efcd255..19b2c950 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/fuchsiapokecenter.asm @@ -7,11 +7,11 @@ FuchsiaPokecenterObject: ; 0x7507d (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_ROCKER, $3 + 4, $2 + 4, $ff, $ff, $2 ; person - db SPRITE_LASS, $5 + 4, $6 + 4, $fe, $2, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_ROCKER, $2, $3, STAY, NONE, $2 ; person + object SPRITE_LASS, $6, $5, WALK, $2, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index e94ad9b3..c14efcf0 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/gary.asm @@ -9,9 +9,9 @@ GaryObject: ; 0x7612f (size=48) db $0 ; signs - db $2 ; people - db SPRITE_BLUE, $2 + 4, $4 + 4, $ff, $d0, $1 ; person - db SPRITE_OAK, $7 + 4, $3 + 4, $ff, $d1, $2 ; person + db $2 ; objects + object SPRITE_BLUE, $4, $2, STAY, DOWN, $1 ; person + object SPRITE_OAK, $3, $7, STAY, UP, $2 ; person ; warp-to EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $3 ; LANCES_ROOM diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm index 6d528135..b21b1f4e 100755 --- a/data/mapObjects/halloffameroom.asm +++ b/data/mapObjects/halloffameroom.asm @@ -7,8 +7,8 @@ HallofFameRoomObject: ; 0x5a571 (size=26) db $0 ; signs - db $1 ; people - db SPRITE_OAK, $2 + 4, $5 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_OAK, $5, $2, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP HALL_OF_FAME_WIDTH, $7, $4 ; CHAMPIONS_ROOM diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/indigoplateau.asm index 6970963f..a30cfbfe 100755 --- a/data/mapObjects/indigoplateau.asm +++ b/data/mapObjects/indigoplateau.asm @@ -7,7 +7,7 @@ IndigoPlateauObject: ; 0x50936 (size=20) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP INDIGO_PLATEAU_WIDTH, $5, $9 ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index 6b9c1e99..dfcd97b7 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -8,12 +8,12 @@ IndigoPlateauLobbyObject: ; 0x19c95 (size=58) db $0 ; signs - db $5 ; people - db SPRITE_NURSE, $5 + 4, $7 + 4, $ff, $d0, $1 ; person - db SPRITE_GYM_HELPER, $9 + 4, $4 + 4, $ff, $d3, $2 ; person - db SPRITE_LASS, $1 + 4, $5 + 4, $ff, $d0, $3 ; person - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $4 ; person - db SPRITE_CABLE_CLUB_WOMAN, $6 + 4, $d + 4, $ff, $d0, $5 ; person + db $5 ; objects + object SPRITE_NURSE, $7, $5, STAY, DOWN, $1 ; person + object SPRITE_GYM_HELPER, $4, $9, STAY, RIGHT, $2 ; person + object SPRITE_LASS, $5, $1, STAY, DOWN, $3 ; person + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $4 ; person + object SPRITE_CABLE_CLUB_WOMAN, $d, $6, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $7 diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm index 52db2e24..a2e05e14 100755 --- a/data/mapObjects/lab1.asm +++ b/data/mapObjects/lab1.asm @@ -14,8 +14,8 @@ Lab1Object: ; 0x75bb3 (size=62) db $4, $d, $4 ; Lab1Text4 db $4, $11, $5 ; Lab1Text5 - db $1 ; people - db SPRITE_FISHER, $3 + 4, $1 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $1, $3, STAY, NONE, $1 ; person ; warp-to EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $2 diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index 52556c69..89ed5f2c 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -7,10 +7,10 @@ Lab2Object: ; 0x75c45 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_OLD_PERSON, $4 + 4, $1 + 4, $ff, $ff, $2 ; person - db SPRITE_FOULARD_WOMAN, $5 + 4, $5 + 4, $ff, $d1, $3 ; person + db $3 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $3, $2, STAY, DOWN, $1 ; person + object SPRITE_OLD_PERSON, $1, $4, STAY, NONE, $2 ; person + object SPRITE_FOULARD_WOMAN, $5, $5, STAY, UP, $3 ; person ; warp-to EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $2 ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm index 8b4396cc..8aca194b 100755 --- a/data/mapObjects/lab3.asm +++ b/data/mapObjects/lab3.asm @@ -10,9 +10,9 @@ Lab3Object: ; 0x75cec (size=41) db $4, $1, $4 ; Lab3Text4 db $1, $2, $5 ; Lab3Text5 - db $2 ; people - db SPRITE_OAK_AIDE, $2 + 4, $7 + 4, $ff, $d0, $1 ; person - db SPRITE_OAK_AIDE, $3 + 4, $2 + 4, $fe, $2, $2 ; person + db $2 ; objects + object SPRITE_OAK_AIDE, $7, $2, STAY, DOWN, $1 ; person + object SPRITE_OAK_AIDE, $2, $3, WALK, $2, $2 ; person ; warp-to EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $2 ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm index 66b73ebd..47f301c9 100755 --- a/data/mapObjects/lab4.asm +++ b/data/mapObjects/lab4.asm @@ -7,9 +7,9 @@ Lab4Object: ; 0x75df0 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_OAK_AIDE, $2 + 4, $5 + 4, $fe, $2, $1 ; person - db SPRITE_OAK_AIDE, $6 + 4, $7 + 4, $ff, $d1, $2 ; person + db $2 ; objects + object SPRITE_OAK_AIDE, $5, $2, WALK, $2, $1 ; person + object SPRITE_OAK_AIDE, $7, $6, STAY, UP, $2 ; person ; warp-to EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $2 ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index e4ae6dfb..cdfbc7a6 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -8,8 +8,8 @@ LanceObject: ; 0x5a3c5 (size=36) db $0 ; signs - db $1 ; people - db SPRITE_LANCE, $1 + 4, $6 + 4, $ff, $d0, TRAINER | $1, LANCE + $C8, $1 + db $1 ; objects + object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, OPP_LANCE, $1 ; warp-to EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm index 4472c7ed..45707121 100755 --- a/data/mapObjects/lavenderhouse1.asm +++ b/data/mapObjects/lavenderhouse1.asm @@ -7,13 +7,13 @@ LavenderHouse1Object: ; 0x1d96a (size=56) db $0 ; signs - db $6 ; people - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $3 + 4, $ff, $ff, $1 ; person - db SPRITE_LITTLE_GIRL, $3 + 4, $6 + 4, $ff, $d0, $2 ; person - db SPRITE_SLOWBRO, $4 + 4, $6 + 4, $ff, $d1, $3 ; person - db SPRITE_SLOWBRO, $3 + 4, $1 + 4, $ff, $ff, $4 ; person - db SPRITE_MR_FUJI, $1 + 4, $3 + 4, $ff, $ff, $5 ; person - db SPRITE_BOOK_MAP_DEX, $3 + 4, $3 + 4, $ff, $ff, $6 ; person + db $6 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, NONE, $1 ; person + object SPRITE_LITTLE_GIRL, $6, $3, STAY, DOWN, $2 ; person + object SPRITE_SLOWBRO, $6, $4, STAY, UP, $3 ; person + object SPRITE_SLOWBRO, $1, $3, STAY, NONE, $4 ; person + object SPRITE_MR_FUJI, $3, $1, STAY, NONE, $5 ; person + object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $6 ; person ; warp-to EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm index cbb7dda7..a8641204 100755 --- a/data/mapObjects/lavenderhouse2.asm +++ b/data/mapObjects/lavenderhouse2.asm @@ -7,9 +7,9 @@ LavenderHouse2Object: ; 0x1d9e6 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_SLOWBRO, $5 + 4, $3 + 4, $ff, $d1, $1 ; person - db SPRITE_BRUNETTE_GIRL, $4 + 4, $2 + 4, $ff, $d3, $2 ; person + db $2 ; objects + object SPRITE_SLOWBRO, $3, $5, STAY, UP, $1 ; person + object SPRITE_BRUNETTE_GIRL, $2, $4, STAY, RIGHT, $2 ; person ; warp-to EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $2 diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm index 79d80c35..d23f21ae 100755 --- a/data/mapObjects/lavendermart.asm +++ b/data/mapObjects/lavendermart.asm @@ -7,10 +7,10 @@ LavenderMartObject: ; 0x5c95d (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_BALDING_GUY, $4 + 4, $3 + 4, $ff, $ff, $2 ; person - db SPRITE_BLACK_HAIR_BOY_1, $2 + 4, $7 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_BALDING_GUY, $3, $4, STAY, NONE, $2 ; person + object SPRITE_BLACK_HAIR_BOY_1, $7, $2, STAY, NONE, $3 ; person ; warp-to EVENT_DISP LAVENDER_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm index a35bf4dc..b421c3a4 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/lavenderpokecenter.asm @@ -7,11 +7,11 @@ LavenderPokecenterObject: ; 0x5c8f4 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_GENTLEMAN, $3 + 4, $5 + 4, $ff, $ff, $2 ; person - db SPRITE_LITTLE_GIRL, $6 + 4, $2 + 4, $fe, $1, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_GENTLEMAN, $5, $3, STAY, NONE, $2 ; person + object SPRITE_LITTLE_GIRL, $2, $6, WALK, $1, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm index 7dc75512..fb78f139 100755 --- a/data/mapObjects/lavendertown.asm +++ b/data/mapObjects/lavendertown.asm @@ -17,10 +17,10 @@ LavenderTownObject: ; 0x4402d (size=88) db $9, $5, $8 ; LavenderTownText8 db $7, $11, $9 ; LavenderTownText9 - db $3 ; people - db SPRITE_LITTLE_GIRL, $9 + 4, $f + 4, $fe, $0, $1 ; person - db SPRITE_BLACK_HAIR_BOY_1, $a + 4, $9 + 4, $ff, $ff, $2 ; person - db SPRITE_BLACK_HAIR_BOY_2, $7 + 4, $8 + 4, $fe, $2, $3 ; person + db $3 ; objects + object SPRITE_LITTLE_GIRL, $f, $9, WALK, $0, $1 ; person + object SPRITE_BLACK_HAIR_BOY_1, $9, $a, STAY, NONE, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $8, $7, WALK, $2, $3 ; person ; warp-to EVENT_DISP LAVENDER_TOWN_WIDTH, $5, $3 ; LAVENDER_POKECENTER diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 074063bf..4ce080f7 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -9,8 +9,8 @@ LoreleiObject: ; 0x76280 (size=44) db $0 ; signs - db $1 ; people - db SPRITE_LORELEI, $2 + 4, $5 + 4, $ff, $d0, TRAINER | $1, LORELEI + $C8, $1 + db $1 ; objects + object SPRITE_LORELEI, $5, $2, STAY, DOWN, $1, OPP_LORELEI, $1 ; warp-to EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $4 ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index 89d636b8..0bb168bb 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -13,10 +13,10 @@ Mansion1Object: ; 0x443a4 (size=90) db $0 ; signs - db $3 ; people - db SPRITE_OAK_AIDE, $11 + 4, $11 + 4, $ff, $d2, TRAINER | $1, SCIENTIST + $C8, $4 - db SPRITE_BALL, $3 + 4, $e + 4, $ff, $ff, ITEM | $2, ESCAPE_ROPE - db SPRITE_BALL, $15 + 4, $12 + 4, $ff, $ff, ITEM | $3, CARBOS + db $3 ; objects + object SPRITE_OAK_AIDE, $11, $11, STAY, LEFT, $1, OPP_SCIENTIST, $4 + object SPRITE_BALL, $e, $3, STAY, NONE, $2, ESCAPE_ROPE + object SPRITE_BALL, $12, $15, STAY, NONE, $3, CARBOS ; warp-to EVENT_DISP MANSION_1_WIDTH, $1b, $4 diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index 6b2be31e..2cb45879 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -9,11 +9,11 @@ Mansion2Object: ; 0x520d1 (size=63) db $0 ; signs - db $4 ; people - db SPRITE_BLACK_HAIR_BOY_2, $11 + 4, $3 + 4, $fe, $2, TRAINER | $1, BURGLAR + $C8, $7 - db SPRITE_BALL, $7 + 4, $1c + 4, $ff, $ff, ITEM | $2, CALCIUM - db SPRITE_BOOK_MAP_DEX, $2 + 4, $12 + 4, $ff, $ff, $3 ; person - db SPRITE_BOOK_MAP_DEX, $16 + 4, $3 + 4, $ff, $ff, $4 ; person + db $4 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $3, $11, WALK, $2, $1, OPP_BURGLAR, $7 + object SPRITE_BALL, $1c, $7, STAY, NONE, $2, CALCIUM + object SPRITE_BOOK_MAP_DEX, $12, $2, STAY, NONE, $3 ; person + object SPRITE_BOOK_MAP_DEX, $3, $16, STAY, NONE, $4 ; person ; warp-to EVENT_DISP MANSION_2_WIDTH, $a, $5 ; MANSION_1 diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index ff42bee3..288b4753 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/mansion3.asm @@ -8,12 +8,12 @@ Mansion3Object: ; 0x522e6 (size=64) db $0 ; signs - db $5 ; people - db SPRITE_BLACK_HAIR_BOY_2, $b + 4, $5 + 4, $fe, $2, TRAINER | $1, BURGLAR + $C8, $8 - db SPRITE_OAK_AIDE, $b + 4, $14 + 4, $ff, $d2, TRAINER | $2, SCIENTIST + $C8, $c - db SPRITE_BALL, $10 + 4, $1 + 4, $ff, $ff, ITEM | $3, MAX_POTION - db SPRITE_BALL, $5 + 4, $19 + 4, $ff, $ff, ITEM | $4, IRON - db SPRITE_BOOK_MAP_DEX, $c + 4, $6 + 4, $ff, $ff, $5 ; person + db $5 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $5, $b, WALK, $2, $1, OPP_BURGLAR, $8 + object SPRITE_OAK_AIDE, $14, $b, STAY, LEFT, $2, OPP_SCIENTIST, $c + object SPRITE_BALL, $1, $10, STAY, NONE, $3, MAX_POTION + object SPRITE_BALL, $19, $5, STAY, NONE, $4, IRON + object SPRITE_BOOK_MAP_DEX, $6, $c, STAY, NONE, $5 ; person ; warp-to EVENT_DISP MANSION_3_WIDTH, $a, $7 ; MANSION_2 diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index 5432f676..eddbda8e 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -6,15 +6,15 @@ Mansion4Object: ; 0x52498 (size=69) db $0 ; signs - db $8 ; people - db SPRITE_BLACK_HAIR_BOY_2, $17 + 4, $10 + 4, $ff, $ff, TRAINER | $1, BURGLAR + $C8, $9 - db SPRITE_OAK_AIDE, $b + 4, $1b + 4, $ff, $d0, TRAINER | $2, SCIENTIST + $C8, $d - db SPRITE_BALL, $2 + 4, $a + 4, $ff, $ff, ITEM | $3, RARE_CANDY - db SPRITE_BALL, $16 + 4, $1 + 4, $ff, $ff, ITEM | $4, FULL_RESTORE - db SPRITE_BALL, $19 + 4, $13 + 4, $ff, $ff, ITEM | $5, TM_14 - db SPRITE_BALL, $4 + 4, $5 + 4, $ff, $ff, ITEM | $6, TM_22 - db SPRITE_BOOK_MAP_DEX, $14 + 4, $10 + 4, $ff, $ff, $7 ; person - db SPRITE_BALL, $d + 4, $5 + 4, $ff, $ff, ITEM | $8, SECRET_KEY + db $8 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $10, $17, STAY, NONE, $1, OPP_BURGLAR, $9 + object SPRITE_OAK_AIDE, $1b, $b, STAY, DOWN, $2, OPP_SCIENTIST, $d + object SPRITE_BALL, $a, $2, STAY, NONE, $3, RARE_CANDY + object SPRITE_BALL, $1, $16, STAY, NONE, $4, FULL_RESTORE + object SPRITE_BALL, $13, $19, STAY, NONE, $5, TM_14 + object SPRITE_BALL, $5, $4, STAY, NONE, $6, TM_22 + object SPRITE_BOOK_MAP_DEX, $10, $14, STAY, NONE, $7 ; person + object SPRITE_BALL, $5, $d, STAY, NONE, $8, SECRET_KEY ; warp-to EVENT_DISP MANSION_4_WIDTH, $16, $17 ; MANSION_1 diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index 6f0c05e9..a59f2a20 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -11,20 +11,20 @@ MtMoon1Object: ; 0x49b06 (size=145) db $1 ; signs db $17, $f, $e ; MtMoon1Text14 - db $d ; people - db SPRITE_HIKER, $6 + 4, $5 + 4, $ff, $d0, TRAINER | $1, HIKER + $C8, $1 - db SPRITE_BUG_CATCHER, $10 + 4, $c + 4, $ff, $d3, TRAINER | $2, YOUNGSTER + $C8, $3 - db SPRITE_LASS, $4 + 4, $1e + 4, $ff, $d0, TRAINER | $3, LASS + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_2, $1f + 4, $18 + 4, $ff, $d1, TRAINER | $4, SUPER_NERD + $C8, $1 - db SPRITE_LASS, $17 + 4, $10 + 4, $ff, $d0, TRAINER | $5, LASS + $C8, $6 - db SPRITE_BUG_CATCHER, $16 + 4, $7 + 4, $ff, $d0, TRAINER | $6, BUG_CATCHER + $C8, $7 - db SPRITE_BUG_CATCHER, $1b + 4, $1e + 4, $ff, $d3, TRAINER | $7, BUG_CATCHER + $C8, $8 - db SPRITE_BALL, $14 + 4, $2 + 4, $ff, $ff, ITEM | $8, POTION - db SPRITE_BALL, $2 + 4, $2 + 4, $ff, $ff, ITEM | $9, MOON_STONE - db SPRITE_BALL, $1f + 4, $23 + 4, $ff, $ff, ITEM | $a, RARE_CANDY - db SPRITE_BALL, $17 + 4, $24 + 4, $ff, $ff, ITEM | $b, ESCAPE_ROPE - db SPRITE_BALL, $21 + 4, $14 + 4, $ff, $ff, ITEM | $c, POTION - db SPRITE_BALL, $20 + 4, $5 + 4, $ff, $ff, ITEM | $d, TM_12 + db $d ; objects + object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, OPP_HIKER, $1 + object SPRITE_BUG_CATCHER, $c, $10, STAY, RIGHT, $2, OPP_YOUNGSTER, $3 + object SPRITE_LASS, $1e, $4, STAY, DOWN, $3, OPP_LASS, $5 + object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, STAY, UP, $4, OPP_SUPER_NERD, $1 + object SPRITE_LASS, $10, $17, STAY, DOWN, $5, OPP_LASS, $6 + object SPRITE_BUG_CATCHER, $7, $16, STAY, DOWN, $6, OPP_BUG_CATCHER, $7 + object SPRITE_BUG_CATCHER, $1e, $1b, STAY, RIGHT, $7, OPP_BUG_CATCHER, $8 + object SPRITE_BALL, $2, $14, STAY, NONE, $8, POTION + object SPRITE_BALL, $2, $2, STAY, NONE, $9, MOON_STONE + object SPRITE_BALL, $23, $1f, STAY, NONE, $a, RARE_CANDY + object SPRITE_BALL, $24, $17, STAY, NONE, $b, ESCAPE_ROPE + object SPRITE_BALL, $14, $21, STAY, NONE, $c, POTION + object SPRITE_BALL, $5, $20, STAY, NONE, $d, TM_12 ; warp-to EVENT_DISP MT_MOON_1_WIDTH, $23, $e diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm index 33313f17..2cf6be6b 100755 --- a/data/mapObjects/mtmoon2.asm +++ b/data/mapObjects/mtmoon2.asm @@ -13,7 +13,7 @@ MtMoon2Object: ; 0x51a4d (size=68) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP MT_MOON_2_WIDTH, $5, $5 ; MT_MOON_1 diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index e17a6a8b..4f8f911c 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -9,16 +9,16 @@ MtMoon3Object: ; 0x49fdb (size=102) db $0 ; signs - db $9 ; people - db SPRITE_BLACK_HAIR_BOY_2, $8 + 4, $c + 4, $ff, $d3, TRAINER | $1, SUPER_NERD + $C8, $2 - db SPRITE_ROCKET, $10 + 4, $b + 4, $ff, $d0, TRAINER | $2, ROCKET + $C8, $1 - db SPRITE_ROCKET, $16 + 4, $f + 4, $ff, $d0, TRAINER | $3, ROCKET + $C8, $2 - db SPRITE_ROCKET, $b + 4, $1d + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $3 - db SPRITE_ROCKET, $11 + 4, $1d + 4, $ff, $d2, TRAINER | $5, ROCKET + $C8, $4 - db SPRITE_OMANYTE, $6 + 4, $c + 4, $ff, $ff, $6 ; person - db SPRITE_OMANYTE, $6 + 4, $d + 4, $ff, $ff, $7 ; person - db SPRITE_BALL, $15 + 4, $19 + 4, $ff, $ff, ITEM | $8, HP_UP - db SPRITE_BALL, $5 + 4, $1d + 4, $ff, $ff, ITEM | $9, TM_01 + db $9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, OPP_SUPER_NERD, $2 + object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, OPP_ROCKET, $1 + object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, OPP_ROCKET, $2 + object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, OPP_ROCKET, $3 + object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $4 + object SPRITE_OMANYTE, $c, $6, STAY, NONE, $6 ; person + object SPRITE_OMANYTE, $d, $6, STAY, NONE, $7 ; person + object SPRITE_BALL, $19, $15, STAY, NONE, $8, HP_UP + object SPRITE_BALL, $1d, $5, STAY, NONE, $9, TM_01 ; warp-to EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2 diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index f5f52f65..d6cd35ba 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -7,13 +7,13 @@ MtMoonPokecenterObject: ; 0x49376 (size=56) db $0 ; signs - db $6 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_BUG_CATCHER, $3 + 4, $4 + 4, $ff, $d1, $2 ; person - db SPRITE_GENTLEMAN, $3 + 4, $7 + 4, $ff, $d1, $3 ; person - db SPRITE_FAT_BALD_GUY, $6 + 4, $a + 4, $fe, $2, $4 ; person - db SPRITE_CLIPBOARD, $2 + 4, $7 + 4, $ff, $ff, $5 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $6 ; person + db $6 ; objects + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_BUG_CATCHER, $4, $3, STAY, UP, $2 ; person + object SPRITE_GENTLEMAN, $7, $3, STAY, UP, $3 ; person + object SPRITE_FAT_BALD_GUY, $a, $6, WALK, $2, $4 ; person + object SPRITE_CLIPBOARD, $7, $2, STAY, NONE, $5 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $6 ; person ; warp-to EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm index c6fb4b5a..208a19c8 100755 --- a/data/mapObjects/museum1f.asm +++ b/data/mapObjects/museum1f.asm @@ -10,12 +10,12 @@ Museum1FObject: ; 0x5c2c1 (size=74) db $0 ; signs - db $5 ; people - db SPRITE_OAK_AIDE, $4 + 4, $c + 4, $ff, $d2, $1 ; person - db SPRITE_GAMBLER, $4 + 4, $1 + 4, $ff, $ff, $2 ; person - db SPRITE_OAK_AIDE, $2 + 4, $f + 4, $ff, $d0, $3 ; person - db SPRITE_OAK_AIDE, $4 + 4, $11 + 4, $ff, $ff, $4 ; person - db SPRITE_OLD_AMBER, $2 + 4, $10 + 4, $ff, $ff, $5 ; person + db $5 ; objects + object SPRITE_OAK_AIDE, $c, $4, STAY, LEFT, $1 ; person + object SPRITE_GAMBLER, $1, $4, STAY, NONE, $2 ; person + object SPRITE_OAK_AIDE, $f, $2, STAY, DOWN, $3 ; person + object SPRITE_OAK_AIDE, $11, $4, STAY, NONE, $4 ; person + object SPRITE_OLD_AMBER, $10, $2, STAY, NONE, $5 ; person ; warp-to EVENT_DISP MUSEUM_1F_WIDTH, $7, $a diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm index 88ee827c..77ea061b 100755 --- a/data/mapObjects/museum2f.asm +++ b/data/mapObjects/museum2f.asm @@ -8,12 +8,12 @@ Museum2FObject: ; 0x5c34b (size=48) db $2, $b, $6 ; Museum2FText6 db $5, $2, $7 ; Museum2FText7 - db $5 ; people - db SPRITE_BUG_CATCHER, $7 + 4, $1 + 4, $fe, $2, $1 ; person - db SPRITE_OLD_PERSON, $5 + 4, $0 + 4, $ff, $d0, $2 ; person - db SPRITE_OAK_AIDE, $5 + 4, $7 + 4, $ff, $d0, $3 ; person - db SPRITE_BRUNETTE_GIRL, $5 + 4, $b + 4, $ff, $ff, $4 ; person - db SPRITE_HIKER, $5 + 4, $c + 4, $ff, $d0, $5 ; person + db $5 ; objects + object SPRITE_BUG_CATCHER, $1, $7, WALK, $2, $1 ; person + object SPRITE_OLD_PERSON, $0, $5, STAY, DOWN, $2 ; person + object SPRITE_OAK_AIDE, $7, $5, STAY, DOWN, $3 ; person + object SPRITE_BRUNETTE_GIRL, $b, $5, STAY, NONE, $4 ; person + object SPRITE_HIKER, $c, $5, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP MUSEUM_2F_WIDTH, $7, $7 ; MUSEUM_1F diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm index b0999d61..28dcf48f 100755 --- a/data/mapObjects/namerater.asm +++ b/data/mapObjects/namerater.asm @@ -7,8 +7,8 @@ NameRaterObject: ; 0x1dad6 (size=26) db $0 ; signs - db $1 ; people - db SPRITE_MR_MASTERBALL, $3 + 4, $5 + 4, $ff, $d2, $1 ; person + db $1 ; objects + object SPRITE_MR_MASTERBALL, $5, $3, STAY, LEFT, $1 ; person ; warp-to EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 0b2717a7..53d6b85b 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -7,18 +7,18 @@ OaksLabObject: ; 0x1d40a (size=88) db $0 ; signs - db $b ; people - db SPRITE_BLUE, $3 + 4, $4 + 4, $ff, $ff, TRAINER | $1, SONY1 + $C8, $1 - db SPRITE_BALL, $3 + 4, $6 + 4, $ff, $ff, $2 ; person - db SPRITE_BALL, $3 + 4, $7 + 4, $ff, $ff, $3 ; person - db SPRITE_BALL, $3 + 4, $8 + 4, $ff, $ff, $4 ; person - db SPRITE_OAK, $2 + 4, $5 + 4, $ff, $d0, $5 ; person - db SPRITE_BOOK_MAP_DEX, $1 + 4, $2 + 4, $ff, $ff, $6 ; person - db SPRITE_BOOK_MAP_DEX, $1 + 4, $3 + 4, $ff, $ff, $7 ; person - db SPRITE_OAK, $a + 4, $5 + 4, $ff, $d1, $8 ; person - db SPRITE_GIRL, $9 + 4, $1 + 4, $fe, $1, $9 ; person - db SPRITE_OAK_AIDE, $a + 4, $2 + 4, $ff, $ff, $a ; person - db SPRITE_OAK_AIDE, $a + 4, $8 + 4, $ff, $ff, $b ; person + db $b ; objects + object SPRITE_BLUE, $4, $3, STAY, NONE, $1, OPP_SONY1, $1 + object SPRITE_BALL, $6, $3, STAY, NONE, $2 ; person + object SPRITE_BALL, $7, $3, STAY, NONE, $3 ; person + object SPRITE_BALL, $8, $3, STAY, NONE, $4 ; person + object SPRITE_OAK, $5, $2, STAY, DOWN, $5 ; person + object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $6 ; person + object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $7 ; person + object SPRITE_OAK, $5, $a, STAY, UP, $8 ; person + object SPRITE_GIRL, $1, $9, WALK, $1, $9 ; person + object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $a ; person + object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $b ; person ; warp-to EVENT_DISP OAKS_LAB_WIDTH, $b, $4 diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm index cef66431..4832246f 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/pallettown.asm @@ -12,10 +12,10 @@ PalletTownObject: ; 0x182c3 (size=58) db $5, $3, $6 ; PalletTownText6 db $5, $b, $7 ; PalletTownText7 - db $3 ; people - db SPRITE_OAK, $5 + 4, $8 + 4, $ff, $ff, $1 ; person - db SPRITE_GIRL, $8 + 4, $3 + 4, $fe, $0, $2 ; person - db SPRITE_FISHER2, $e + 4, $b + 4, $fe, $0, $3 ; person + db $3 ; objects + object SPRITE_OAK, $8, $5, STAY, NONE, $1 ; person + object SPRITE_GIRL, $3, $8, WALK, $0, $2 ; person + object SPRITE_FISHER2, $b, $e, WALK, $0, $3 ; person ; warp-to EVENT_DISP PALLET_TOWN_WIDTH, $5, $5 ; REDS_HOUSE_1F diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm index e971ad50..27a559fc 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/pewtercity.asm @@ -19,12 +19,12 @@ PewterCityObject: ; 0x18577 (size=111) db $11, $b, $b ; PewterCityText11 db $17, $19, $c ; PewterCityText12 - db $5 ; people - db SPRITE_LASS, $f + 4, $8 + 4, $ff, $ff, $1 ; person - db SPRITE_BLACK_HAIR_BOY_1, $19 + 4, $11 + 4, $ff, $ff, $2 ; person - db SPRITE_BLACK_HAIR_BOY_2, $11 + 4, $1b + 4, $ff, $ff, $3 ; person - db SPRITE_BLACK_HAIR_BOY_2, $19 + 4, $1a + 4, $fe, $2, $4 ; person - db SPRITE_BUG_CATCHER, $10 + 4, $23 + 4, $ff, $d0, $5 ; person + db $5 ; objects + object SPRITE_LASS, $8, $f, STAY, NONE, $1 ; person + object SPRITE_BLACK_HAIR_BOY_1, $11, $19, STAY, NONE, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $1b, $11, STAY, NONE, $3 ; person + object SPRITE_BLACK_HAIR_BOY_2, $1a, $19, WALK, $2, $4 ; person + object SPRITE_BUG_CATCHER, $23, $10, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP PEWTER_CITY_WIDTH, $7, $e ; MUSEUM_1F diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index f5fa120e..69196193 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -7,10 +7,10 @@ PewterGymObject: ; 0x5c52e (size=42) db $0 ; signs - db $3 ; people - db SPRITE_BLACK_HAIR_BOY_2, $1 + 4, $4 + 4, $ff, $d0, TRAINER | $1, BROCK + $C8, $1 - db SPRITE_BLACK_HAIR_BOY_1, $6 + 4, $3 + 4, $ff, $d3, TRAINER | $2, JR__TRAINER_M + $C8, $1 - db SPRITE_GYM_HELPER, $a + 4, $7 + 4, $ff, $d0, $3 ; person + db $3 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, OPP_BROCK, $1 + object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR__TRAINER_M, $1 + object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person ; warp-to EVENT_DISP PEWTER_GYM_WIDTH, $d, $4 diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm index 9af4d71b..8dcac05c 100755 --- a/data/mapObjects/pewterhouse1.asm +++ b/data/mapObjects/pewterhouse1.asm @@ -7,10 +7,10 @@ PewterHouse1Object: ; 0x1d616 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_SLOWBRO, $5 + 4, $4 + 4, $ff, $d2, $1 ; person - db SPRITE_YOUNG_BOY, $5 + 4, $3 + 4, $ff, $d3, $2 ; person - db SPRITE_FAT_BALD_GUY, $2 + 4, $1 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_SLOWBRO, $4, $5, STAY, LEFT, $1 ; person + object SPRITE_YOUNG_BOY, $3, $5, STAY, RIGHT, $2 ; person + object SPRITE_FAT_BALD_GUY, $1, $2, STAY, NONE, $3 ; person ; warp-to EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm index aa48c5bc..b4b8f2e7 100755 --- a/data/mapObjects/pewterhouse2.asm +++ b/data/mapObjects/pewterhouse2.asm @@ -7,9 +7,9 @@ PewterHouse2Object: ; 0x1d659 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_GAMBLER, $3 + 4, $2 + 4, $ff, $d3, $1 ; person - db SPRITE_BUG_CATCHER, $5 + 4, $4 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_GAMBLER, $2, $3, STAY, RIGHT, $1 ; person + object SPRITE_BUG_CATCHER, $4, $5, STAY, NONE, $2 ; person ; warp-to EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $2 diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm index 343f70c1..2ef08e29 100755 --- a/data/mapObjects/pewtermart.asm +++ b/data/mapObjects/pewtermart.asm @@ -7,10 +7,10 @@ PewterMartObject: ; 0x74cda (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_BUG_CATCHER, $3 + 4, $3 + 4, $fe, $1, $2 ; person - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $5 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_BUG_CATCHER, $3, $3, WALK, $1, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $5, $5, STAY, NONE, $3 ; person ; warp-to EVENT_DISP PEWTER_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index a9a03272..86757244 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -7,11 +7,11 @@ PewterPokecenterObject: ; 0x5c60d (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_GENTLEMAN, $7 + 4, $b + 4, $ff, $d2, $2 ; person - db SPRITE_CLEFAIRY, $3 + 4, $1 + 4, $ff, $d0, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_GENTLEMAN, $b, $7, STAY, LEFT, $2 ; person + object SPRITE_CLEFAIRY, $1, $3, STAY, DOWN, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index 30fb9cbc..eb71be9e 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/pokemontower1.asm @@ -8,12 +8,12 @@ PokemonTower1Object: ; 0x60452 (size=58) db $0 ; signs - db $5 ; people - db SPRITE_CABLE_CLUB_WOMAN, $d + 4, $f + 4, $ff, $d1, $1 ; person - db SPRITE_MOM_GEISHA, $8 + 4, $6 + 4, $ff, $ff, $2 ; person - db SPRITE_BALDING_GUY, $c + 4, $8 + 4, $ff, $ff, $3 ; person - db SPRITE_GIRL, $7 + 4, $d + 4, $ff, $ff, $4 ; person - db SPRITE_MEDIUM, $7 + 4, $11 + 4, $ff, $d2, $5 ; person + db $5 ; objects + object SPRITE_CABLE_CLUB_WOMAN, $f, $d, STAY, UP, $1 ; person + object SPRITE_MOM_GEISHA, $6, $8, STAY, NONE, $2 ; person + object SPRITE_BALDING_GUY, $8, $c, STAY, NONE, $3 ; person + object SPRITE_GIRL, $d, $7, STAY, NONE, $4 ; person + object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $5 ; person ; warp-to EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $a diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm index a255065f..57ba7363 100755 --- a/data/mapObjects/pokemontower2.asm +++ b/data/mapObjects/pokemontower2.asm @@ -7,9 +7,9 @@ PokemonTower2Object: ; 0x60646 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_BLUE, $5 + 4, $e + 4, $ff, $ff, $1 ; person - db SPRITE_MEDIUM, $7 + 4, $3 + 4, $ff, $d3, $2 ; person + db $2 ; objects + object SPRITE_BLUE, $e, $5, STAY, NONE, $1 ; person + object SPRITE_MEDIUM, $3, $7, STAY, RIGHT, $2 ; person ; warp-to EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $3 ; POKEMONTOWER_3 diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index 3a16070a..4591cbe3 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -7,11 +7,11 @@ PokemonTower3Object: ; 0x6075d (size=51) db $0 ; signs - db $4 ; people - db SPRITE_MEDIUM, $3 + 4, $c + 4, $ff, $d2, TRAINER | $1, CHANNELER + $C8, $5 - db SPRITE_MEDIUM, $8 + 4, $9 + 4, $ff, $d0, TRAINER | $2, CHANNELER + $C8, $6 - db SPRITE_MEDIUM, $d + 4, $a + 4, $ff, $d0, TRAINER | $3, CHANNELER + $C8, $8 - db SPRITE_BALL, $1 + 4, $c + 4, $ff, $ff, ITEM | $4, ESCAPE_ROPE + db $4 ; objects + object SPRITE_MEDIUM, $c, $3, STAY, LEFT, $1, OPP_CHANNELER, $5 + object SPRITE_MEDIUM, $9, $8, STAY, DOWN, $2, OPP_CHANNELER, $6 + object SPRITE_MEDIUM, $a, $d, STAY, DOWN, $3, OPP_CHANNELER, $8 + object SPRITE_BALL, $c, $1, STAY, NONE, $4, ESCAPE_ROPE ; warp-to EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $3 ; POKEMONTOWER_2 diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index 8647f937..722f6e08 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/pokemontower4.asm @@ -7,13 +7,13 @@ PokemonTower4Object: ; 0x6088b (size=65) db $0 ; signs - db $6 ; people - db SPRITE_MEDIUM, $a + 4, $5 + 4, $ff, $d3, TRAINER | $1, CHANNELER + $C8, $9 - db SPRITE_MEDIUM, $7 + 4, $f + 4, $ff, $d0, TRAINER | $2, CHANNELER + $C8, $a - db SPRITE_MEDIUM, $c + 4, $e + 4, $ff, $d2, TRAINER | $3, CHANNELER + $C8, $c - db SPRITE_BALL, $a + 4, $c + 4, $ff, $ff, ITEM | $4, ELIXER - db SPRITE_BALL, $a + 4, $9 + 4, $ff, $ff, ITEM | $5, AWAKENING - db SPRITE_BALL, $10 + 4, $c + 4, $ff, $ff, ITEM | $6, HP_UP + db $6 ; objects + object SPRITE_MEDIUM, $5, $a, STAY, RIGHT, $1, OPP_CHANNELER, $9 + object SPRITE_MEDIUM, $f, $7, STAY, DOWN, $2, OPP_CHANNELER, $a + object SPRITE_MEDIUM, $e, $c, STAY, LEFT, $3, OPP_CHANNELER, $c + object SPRITE_BALL, $c, $a, STAY, NONE, $4, ELIXER + object SPRITE_BALL, $9, $a, STAY, NONE, $5, AWAKENING + object SPRITE_BALL, $c, $10, STAY, NONE, $6, HP_UP ; warp-to EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $3 ; POKEMONTOWER_5 diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index e31a0c61..1d23abbf 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/pokemontower5.asm @@ -7,13 +7,13 @@ PokemonTower5Object: ; 0x60a48 (size=65) db $0 ; signs - db $6 ; people - db SPRITE_MEDIUM, $8 + 4, $c + 4, $ff, $ff, $1 ; person - db SPRITE_MEDIUM, $7 + 4, $11 + 4, $ff, $d2, TRAINER | $2, CHANNELER + $C8, $e - db SPRITE_MEDIUM, $3 + 4, $e + 4, $ff, $d2, TRAINER | $3, CHANNELER + $C8, $10 - db SPRITE_MEDIUM, $a + 4, $6 + 4, $ff, $d3, TRAINER | $4, CHANNELER + $C8, $11 - db SPRITE_MEDIUM, $10 + 4, $9 + 4, $ff, $d3, TRAINER | $5, CHANNELER + $C8, $12 - db SPRITE_BALL, $e + 4, $6 + 4, $ff, $ff, ITEM | $6, NUGGET + db $6 ; objects + object SPRITE_MEDIUM, $c, $8, STAY, NONE, $1 ; person + object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $2, OPP_CHANNELER, $e + object SPRITE_MEDIUM, $e, $3, STAY, LEFT, $3, OPP_CHANNELER, $10 + object SPRITE_MEDIUM, $6, $a, STAY, RIGHT, $4, OPP_CHANNELER, $11 + object SPRITE_MEDIUM, $9, $10, STAY, RIGHT, $5, OPP_CHANNELER, $12 + object SPRITE_BALL, $6, $e, STAY, NONE, $6, NUGGET ; warp-to EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $3 ; POKEMONTOWER_4 diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index d923c3d2..cd7453d8 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -7,12 +7,12 @@ PokemonTower6Object: ; 0x60c5b (size=58) db $0 ; signs - db $5 ; people - db SPRITE_MEDIUM, $a + 4, $c + 4, $ff, $d3, TRAINER | $1, CHANNELER + $C8, $13 - db SPRITE_MEDIUM, $5 + 4, $9 + 4, $ff, $d0, TRAINER | $2, CHANNELER + $C8, $14 - db SPRITE_MEDIUM, $5 + 4, $10 + 4, $ff, $d2, TRAINER | $3, CHANNELER + $C8, $15 - db SPRITE_BALL, $8 + 4, $6 + 4, $ff, $ff, ITEM | $4, RARE_CANDY - db SPRITE_BALL, $e + 4, $e + 4, $ff, $ff, ITEM | $5, X_ACCURACY + db $5 ; objects + object SPRITE_MEDIUM, $c, $a, STAY, RIGHT, $1, OPP_CHANNELER, $13 + object SPRITE_MEDIUM, $9, $5, STAY, DOWN, $2, OPP_CHANNELER, $14 + object SPRITE_MEDIUM, $10, $5, STAY, LEFT, $3, OPP_CHANNELER, $15 + object SPRITE_BALL, $6, $8, STAY, NONE, $4, RARE_CANDY + object SPRITE_BALL, $e, $e, STAY, NONE, $5, X_ACCURACY ; warp-to EVENT_DISP POKEMONTOWER_6_WIDTH, $9, $12 ; POKEMONTOWER_5 diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index a3e72093..a77d1d1e 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -6,10 +6,10 @@ PokemonTower7Object: ; 0x60ef6 (size=42) db $0 ; signs - db 3 ; people - db SPRITE_JESSIE, 8 + 4, $a + 4, $ff, $d0, 1 - db SPRITE_JAMES, 8 + 4, $b + 4, $ff, $d0, 2 - db SPRITE_MR_FUJI, 3 + 4, $a + 4, $ff, $d0, 3 + 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 ; warp-to EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6 diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm index 98e80ff9..a4c5d8ea 100755 --- a/data/mapObjects/powerplant.asm +++ b/data/mapObjects/powerplant.asm @@ -8,21 +8,21 @@ PowerPlantObject: ; 0x1e3bf (size=135) db $0 ; signs - db $e ; people - db SPRITE_BALL, $14 + 4, $9 + 4, $ff, $ff, TRAINER | $1, VOLTORB, 40 - db SPRITE_BALL, $12 + 4, $20 + 4, $ff, $ff, TRAINER | $2, VOLTORB, 40 - db SPRITE_BALL, $19 + 4, $15 + 4, $ff, $ff, TRAINER | $3, VOLTORB, 40 - db SPRITE_BALL, $12 + 4, $19 + 4, $ff, $ff, TRAINER | $4, ELECTRODE, 43 - db SPRITE_BALL, $22 + 4, $17 + 4, $ff, $ff, TRAINER | $5, VOLTORB, 40 - db SPRITE_BALL, $1c + 4, $1a + 4, $ff, $ff, TRAINER | $6, VOLTORB, 40 - db SPRITE_BALL, $e + 4, $15 + 4, $ff, $ff, TRAINER | $7, ELECTRODE, 43 - db SPRITE_BALL, $20 + 4, $25 + 4, $ff, $ff, TRAINER | $8, VOLTORB, 40 - db SPRITE_BIRD, $9 + 4, $4 + 4, $ff, $d1, TRAINER | $9, ZAPDOS, 50 - db SPRITE_BALL, $19 + 4, $7 + 4, $ff, $ff, ITEM | $a, CARBOS - db SPRITE_BALL, $3 + 4, $1c + 4, $ff, $ff, ITEM | $b, HP_UP - db SPRITE_BALL, $3 + 4, $22 + 4, $ff, $ff, ITEM | $c, RARE_CANDY - db SPRITE_BALL, $20 + 4, $1a + 4, $ff, $ff, ITEM | $d, TM_25 - db SPRITE_BALL, $20 + 4, $14 + 4, $ff, $ff, ITEM | $e, TM_33 + db $e ; objects + object SPRITE_BALL, $9, $14, STAY, NONE, $1, VOLTORB, 40 + object SPRITE_BALL, $20, $12, STAY, NONE, $2, VOLTORB, 40 + object SPRITE_BALL, $15, $19, STAY, NONE, $3, VOLTORB, 40 + object SPRITE_BALL, $19, $12, STAY, NONE, $4, ELECTRODE, 43 + object SPRITE_BALL, $17, $22, STAY, NONE, $5, VOLTORB, 40 + object SPRITE_BALL, $1a, $1c, STAY, NONE, $6, VOLTORB, 40 + object SPRITE_BALL, $15, $e, STAY, NONE, $7, ELECTRODE, 43 + object SPRITE_BALL, $25, $20, STAY, NONE, $8, VOLTORB, 40 + object SPRITE_BIRD, $4, $9, STAY, UP, $9, ZAPDOS, 50 + object SPRITE_BALL, $7, $19, STAY, NONE, $a, CARBOS + object SPRITE_BALL, $1c, $3, STAY, NONE, $b, HP_UP + object SPRITE_BALL, $22, $3, STAY, NONE, $c, RARE_CANDY + object SPRITE_BALL, $1a, $20, STAY, NONE, $d, TM_25 + object SPRITE_BALL, $14, $20, STAY, NONE, $e, TM_33 ; warp-to EVENT_DISP POWER_PLANT_WIDTH, $23, $4 diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index 5584320e..4f977b2c 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/redshouse1f.asm @@ -9,8 +9,8 @@ RedsHouse1FObject: ; 481e4 (12:41e4) db $1 ; signs db $1, $3, $2 ; TV - db $1 ; people - db $33, $4 + 4, $5 + 4, $FF, $D2, $1 ; Mom + db $1 ; objects + object SPRITE_MOM, $5, $4, STAY, LEFT, $1 ; Mom ; warp-to EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $2 diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm index f8680121..d668d441 100755 --- a/data/mapObjects/redshouse2f.asm +++ b/data/mapObjects/redshouse2f.asm @@ -1,4 +1,4 @@ -RedsHouse2FObject: ; 0x5c0d0 ? +RedsHouse2FObject: ; 0x5c0d0 db $0A ; border block db $1 ; warps @@ -6,7 +6,7 @@ RedsHouse2FObject: ; 0x5c0d0 ? db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP REDS_HOUSE_2F_WIDTH, $1, $7 diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index ab9b1041..55c0c101 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -10,14 +10,14 @@ RocketHideout1Object: ; 0x44ce7 (size=98) db $0 ; signs - db $7 ; people - db SPRITE_ROCKET, $8 + 4, $1a + 4, $ff, $d2, TRAINER | $1, ROCKET + $C8, $8 - db SPRITE_ROCKET, $6 + 4, $c + 4, $ff, $d3, TRAINER | $2, ROCKET + $C8, $9 - db SPRITE_ROCKET, $11 + 4, $12 + 4, $ff, $d0, TRAINER | $3, ROCKET + $C8, $a - db SPRITE_ROCKET, $19 + 4, $f + 4, $ff, $d3, TRAINER | $4, ROCKET + $C8, $b - db SPRITE_ROCKET, $12 + 4, $1c + 4, $ff, $d2, TRAINER | $5, ROCKET + $C8, $c - db SPRITE_BALL, $e + 4, $b + 4, $ff, $ff, ITEM | $6, ESCAPE_ROPE - db SPRITE_BALL, $11 + 4, $9 + 4, $ff, $ff, ITEM | $7, HYPER_POTION + db $7 ; objects + object SPRITE_ROCKET, $1a, $8, STAY, LEFT, $1, OPP_ROCKET, $8 + object SPRITE_ROCKET, $c, $6, STAY, RIGHT, $2, OPP_ROCKET, $9 + object SPRITE_ROCKET, $12, $11, STAY, DOWN, $3, OPP_ROCKET, $a + object SPRITE_ROCKET, $f, $19, STAY, RIGHT, $4, OPP_ROCKET, $b + object SPRITE_ROCKET, $1c, $12, STAY, LEFT, $5, OPP_ROCKET, $c + object SPRITE_BALL, $b, $e, STAY, NONE, $6, ESCAPE_ROPE + object SPRITE_BALL, $9, $11, STAY, NONE, $7, HYPER_POTION ; warp-to EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $17 ; ROCKET_HIDEOUT_2 diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index 5842e5bc..b14dc0e6 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -10,12 +10,12 @@ RocketHideout2Object: ; 0x450f7 (size=80) db $0 ; signs - db $5 ; people - db SPRITE_ROCKET, $c + 4, $14 + 4, $ff, $d0, TRAINER | $1, ROCKET + $C8, $d - db SPRITE_BALL, $b + 4, $1 + 4, $ff, $ff, ITEM | $2, MOON_STONE - db SPRITE_BALL, $8 + 4, $10 + 4, $ff, $ff, ITEM | $3, NUGGET - db SPRITE_BALL, $c + 4, $6 + 4, $ff, $ff, ITEM | $4, TM_07 - db SPRITE_BALL, $15 + 4, $3 + 4, $ff, $ff, ITEM | $5, SUPER_POTION + db $5 ; objects + object SPRITE_ROCKET, $14, $c, STAY, DOWN, $1, OPP_ROCKET, $d + object SPRITE_BALL, $1, $b, STAY, NONE, $2, MOON_STONE + object SPRITE_BALL, $10, $8, STAY, NONE, $3, NUGGET + object SPRITE_BALL, $6, $c, STAY, NONE, $4, TM_07 + object SPRITE_BALL, $3, $15, STAY, NONE, $5, SUPER_POTION ; warp-to EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $1b ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index 0464c969..d7933ddf 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -7,11 +7,11 @@ RocketHideout3Object: ; 0x4534d (size=50) db $0 ; signs - db $4 ; people - db SPRITE_ROCKET, $16 + 4, $a + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $e - db SPRITE_ROCKET, $c + 4, $1a + 4, $ff, $d1, TRAINER | $2, ROCKET + $C8, $f - db SPRITE_BALL, $11 + 4, $1a + 4, $ff, $ff, ITEM | $3, TM_10 - db SPRITE_BALL, $e + 4, $14 + 4, $ff, $ff, ITEM | $4, RARE_CANDY + db $4 ; objects + object SPRITE_ROCKET, $a, $16, STAY, RIGHT, $1, OPP_ROCKET, $e + object SPRITE_ROCKET, $1a, $c, STAY, UP, $2, OPP_ROCKET, $f + object SPRITE_BALL, $1a, $11, STAY, NONE, $3, TM_10 + object SPRITE_BALL, $14, $e, STAY, NONE, $4, RARE_CANDY ; warp-to EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $6, $19 ; ROCKET_HIDEOUT_2 diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index c73273bb..5441f9cd 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -8,16 +8,16 @@ RocketHideout4Object: ; 0x455f1 (size=95) db $0 ; signs - db $9 ; people - db SPRITE_GIOVANNI, $3 + 4, $19 + 4, $ff, $d0, TRAINER | $1, GIOVANNI + $C8, $1 - db SPRITE_ROCKET, $c + 4, $17 + 4, $ff, $d0, TRAINER | $2, ROCKET + $C8, $10 - db SPRITE_ROCKET, $c + 4, $1a + 4, $ff, $d0, TRAINER | $3, ROCKET + $C8, $11 - db SPRITE_ROCKET, $2 + 4, $b + 4, $ff, $d0, TRAINER | $4, ROCKET + $C8, $12 - db SPRITE_BALL, $c + 4, $a + 4, $ff, $ff, ITEM | $5, HP_UP - db SPRITE_BALL, $4 + 4, $9 + 4, $ff, $ff, ITEM | $6, TM_02 - db SPRITE_BALL, $14 + 4, $c + 4, $ff, $ff, ITEM | $7, IRON - db SPRITE_BALL, $2 + 4, $19 + 4, $ff, $ff, ITEM | $8, SILPH_SCOPE - db SPRITE_BALL, $2 + 4, $a + 4, $ff, $ff, ITEM | $9, LIFT_KEY + db $9 ; objects + object SPRITE_GIOVANNI, $19, $3, STAY, DOWN, $1, OPP_GIOVANNI, $1 + object SPRITE_ROCKET, $17, $c, STAY, DOWN, $2, OPP_ROCKET, $10 + object SPRITE_ROCKET, $1a, $c, STAY, DOWN, $3, OPP_ROCKET, $11 + object SPRITE_ROCKET, $b, $2, STAY, DOWN, $4, OPP_ROCKET, $12 + object SPRITE_BALL, $a, $c, STAY, NONE, $5, HP_UP + object SPRITE_BALL, $9, $4, STAY, NONE, $6, TM_02 + object SPRITE_BALL, $c, $14, STAY, NONE, $7, IRON + object SPRITE_BALL, $19, $2, STAY, NONE, $8, SILPH_SCOPE + object SPRITE_BALL, $a, $2, STAY, NONE, $9, LIFT_KEY ; warp-to EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $a, $13 ; ROCKET_HIDEOUT_3 diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm index e4653a4c..477e62c9 100755 --- a/data/mapObjects/rockethideoutelevator.asm +++ b/data/mapObjects/rockethideoutelevator.asm @@ -8,7 +8,7 @@ RocketHideoutElevatorObject: ; 0x45791 (size=23) db $1 ; signs db $1, $1, $1 ; RocketHideoutElevatorText1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP ROCKET_HIDEOUT_ELEVATOR_WIDTH, $1, $2 ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index b8c8ff62..b4001df9 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -14,14 +14,14 @@ RockTunnel1Object: ; 0x445f6 (size=127) db $1 ; signs db $1d, $b, $8 ; RockTunnel1Text8 - db $7 ; people - db SPRITE_HIKER, $5 + 4, $7 + 4, $ff, $d0, TRAINER | $1, HIKER + $C8, $c - db SPRITE_HIKER, $10 + 4, $5 + 4, $ff, $d0, TRAINER | $2, HIKER + $C8, $d - db SPRITE_HIKER, $f + 4, $11 + 4, $ff, $d2, TRAINER | $3, HIKER + $C8, $e - db SPRITE_BLACK_HAIR_BOY_2, $8 + 4, $17 + 4, $ff, $d2, TRAINER | $4, POKEMANIAC + $C8, $7 - db SPRITE_LASS, $15 + 4, $25 + 4, $ff, $d2, TRAINER | $5, JR__TRAINER_F + $C8, $11 - db SPRITE_LASS, $18 + 4, $16 + 4, $ff, $d0, TRAINER | $6, JR__TRAINER_F + $C8, $12 - db SPRITE_LASS, $18 + 4, $20 + 4, $ff, $d3, TRAINER | $7, JR__TRAINER_F + $C8, $13 + db $7 ; objects + object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, OPP_HIKER, $c + object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, OPP_HIKER, $d + object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, OPP_HIKER, $e + object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, OPP_POKEMANIAC, $7 + object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR__TRAINER_F, $11 + object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR__TRAINER_F, $12 + object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR__TRAINER_F, $13 ; warp-to EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index f75add5d..dfc36cac 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -9,15 +9,15 @@ RockTunnel2Object: ; 0x4613d (size=100) db $0 ; signs - db $8 ; people - db SPRITE_LASS, $d + 4, $b + 4, $ff, $d0, TRAINER | $1, JR__TRAINER_F + $C8, $9 - db SPRITE_HIKER, $a + 4, $6 + 4, $ff, $d0, TRAINER | $2, HIKER + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $3 + 4, $ff, $d0, TRAINER | $3, POKEMANIAC + $C8, $3 - db SPRITE_BLACK_HAIR_BOY_2, $15 + 4, $14 + 4, $ff, $d3, TRAINER | $4, POKEMANIAC + $C8, $4 - db SPRITE_HIKER, $a + 4, $1e + 4, $ff, $d0, TRAINER | $5, HIKER + $C8, $a - db SPRITE_LASS, $1c + 4, $e + 4, $ff, $d3, TRAINER | $6, JR__TRAINER_F + $C8, $a - db SPRITE_HIKER, $5 + 4, $21 + 4, $ff, $d3, TRAINER | $7, HIKER + $C8, $b - db SPRITE_BLACK_HAIR_BOY_2, $1e + 4, $1a + 4, $ff, $d0, TRAINER | $8, POKEMANIAC + $C8, $5 + db $8 ; objects + object SPRITE_LASS, $b, $d, STAY, DOWN, $1, OPP_JR__TRAINER_F, $9 + object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, OPP_HIKER, $9 + object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, OPP_POKEMANIAC, $3 + object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, OPP_POKEMANIAC, $4 + object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, OPP_HIKER, $a + object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, OPP_JR__TRAINER_F, $a + object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, OPP_HIKER, $b + object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, OPP_POKEMANIAC, $5 ; warp-to EVENT_DISP ROCK_TUNNEL_2_WIDTH, $19, $21 ; ROCK_TUNNEL_1 diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index 2dd7b71d..d2645165 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -7,11 +7,11 @@ RockTunnelPokecenterObject: ; 0x493d4 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_GENTLEMAN, $3 + 4, $7 + 4, $fe, $2, $2 ; person - db SPRITE_FISHER2, $5 + 4, $2 + 4, $ff, $ff, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person + object SPRITE_FISHER2, $2, $5, STAY, NONE, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm index c16738f3..d2abf51f 100755 --- a/data/mapObjects/route1.asm +++ b/data/mapObjects/route1.asm @@ -6,9 +6,9 @@ Route1Object: ; 0x1c0e5 (size=19) db $1 ; signs db $1b, $9, $3 ; Route1Text3 - db $2 ; people - db SPRITE_BUG_CATCHER, $18 + 4, $5 + 4, $fe, $1, $1 ; person - db SPRITE_BUG_CATCHER, $d + 4, $f + 4, $fe, $2, $2 ; person + db $2 ; objects + object SPRITE_BUG_CATCHER, $5, $18, WALK, $1, $1 ; person + object SPRITE_BUG_CATCHER, $f, $d, WALK, $2, $2 ; person ; warp-to (unused) EVENT_DISP $4, $7, $2 diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index aa3f8a8e..e324a348 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -13,13 +13,13 @@ Route10Object: ; 0x582f6 (size=96) db $37, $9, $9 ; Route10Text9 db $29, $5, $a ; Route10Text10 - db $6 ; people - db SPRITE_BLACK_HAIR_BOY_2, $2c + 4, $a + 4, $ff, $d2, TRAINER | $1, POKEMANIAC + $C8, $1 - db SPRITE_HIKER, $39 + 4, $3 + 4, $ff, $d1, TRAINER | $2, HIKER + $C8, $7 - db SPRITE_BLACK_HAIR_BOY_2, $40 + 4, $e + 4, $ff, $d2, TRAINER | $3, POKEMANIAC + $C8, $2 - db SPRITE_LASS, $19 + 4, $7 + 4, $ff, $d2, TRAINER | $4, JR__TRAINER_F + $C8, $7 - db SPRITE_HIKER, $3d + 4, $3 + 4, $ff, $d0, TRAINER | $5, HIKER + $C8, $8 - db SPRITE_LASS, $36 + 4, $7 + 4, $ff, $d0, TRAINER | $6, JR__TRAINER_F + $C8, $8 + db $6 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1 + object SPRITE_HIKER, $3, $39, STAY, UP, $2, OPP_HIKER, $7 + object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, OPP_POKEMANIAC, $2 + object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR__TRAINER_F, $7 + object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, OPP_HIKER, $8 + object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR__TRAINER_F, $8 ; warp-to EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index 167af2f8..4e196b20 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -11,17 +11,17 @@ Route11Object: ; 0x584e0 (size=127) db $1 ; signs db $5, $1, $b ; Route11Text11 - db $a ; people - db SPRITE_GAMBLER, $e + 4, $a + 4, $ff, $d0, TRAINER | $1, GAMBLER + $C8, $1 - db SPRITE_GAMBLER, $9 + 4, $1a + 4, $ff, $d0, TRAINER | $2, GAMBLER + $C8, $2 - db SPRITE_BUG_CATCHER, $5 + 4, $d + 4, $ff, $d2, TRAINER | $3, YOUNGSTER + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_2, $b + 4, $24 + 4, $ff, $d0, TRAINER | $4, ENGINEER + $C8, $2 - db SPRITE_BUG_CATCHER, $4 + 4, $16 + 4, $ff, $d1, TRAINER | $5, YOUNGSTER + $C8, $a - db SPRITE_GAMBLER, $7 + 4, $2d + 4, $ff, $d0, TRAINER | $6, GAMBLER + $C8, $3 - db SPRITE_GAMBLER, $3 + 4, $21 + 4, $ff, $d1, TRAINER | $7, GAMBLER + $C8, $4 - db SPRITE_BUG_CATCHER, $5 + 4, $2b + 4, $ff, $d3, TRAINER | $8, YOUNGSTER + $C8, $b - db SPRITE_BLACK_HAIR_BOY_2, $10 + 4, $2d + 4, $ff, $d2, TRAINER | $9, ENGINEER + $C8, $3 - db SPRITE_BUG_CATCHER, $c + 4, $16 + 4, $ff, $d1, TRAINER | $a, YOUNGSTER + $C8, $c + db $a ; objects + object SPRITE_GAMBLER, $a, $e, STAY, DOWN, $1, OPP_GAMBLER, $1 + object SPRITE_GAMBLER, $1a, $9, STAY, DOWN, $2, OPP_GAMBLER, $2 + object SPRITE_BUG_CATCHER, $d, $5, STAY, LEFT, $3, OPP_YOUNGSTER, $9 + object SPRITE_BLACK_HAIR_BOY_2, $24, $b, STAY, DOWN, $4, OPP_ENGINEER, $2 + object SPRITE_BUG_CATCHER, $16, $4, STAY, UP, $5, OPP_YOUNGSTER, $a + object SPRITE_GAMBLER, $2d, $7, STAY, DOWN, $6, OPP_GAMBLER, $3 + object SPRITE_GAMBLER, $21, $3, STAY, UP, $7, OPP_GAMBLER, $4 + object SPRITE_BUG_CATCHER, $2b, $5, STAY, RIGHT, $8, OPP_YOUNGSTER, $b + object SPRITE_BLACK_HAIR_BOY_2, $2d, $10, STAY, LEFT, $9, OPP_ENGINEER, $3 + object SPRITE_BUG_CATCHER, $16, $c, STAY, UP, $a, OPP_YOUNGSTER, $c ; warp-to EVENT_DISP ROUTE_11_WIDTH, $8, $31 ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm index 5ebfb13d..351b922c 100755 --- a/data/mapObjects/route11gate.asm +++ b/data/mapObjects/route11gate.asm @@ -10,8 +10,8 @@ Route11GateObject: ; 0x49416 (size=50) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $1 + 4, $4 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person ; warp-to EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $0 diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm index 8ee0f8fa..421de945 100755 --- a/data/mapObjects/route11gateupstairs.asm +++ b/data/mapObjects/route11gateupstairs.asm @@ -8,9 +8,9 @@ Route11GateUpstairsObject: ; 0x494da (size=30) db $2, $1, $3 ; Route11GateUpstairsText3 db $2, $6, $4 ; Route11GateUpstairsText4 - db $2 ; people - db SPRITE_BUG_CATCHER, $2 + 4, $4 + 4, $fe, $2, $1 ; person - db SPRITE_OAK_AIDE, $6 + 4, $2 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person + object SPRITE_OAK_AIDE, $2, $6, STAY, NONE, $2 ; person ; warp-to EVENT_DISP ROUTE_11_GATE_2F_WIDTH, $7, $7 ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index d0aaa847..0d0ef1c0 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -11,17 +11,17 @@ Route12Object: ; 0x5869a (size=118) db $d, $d, $b ; Route12Text11 db $3f, $b, $c ; Route12Text12 - db $a ; people - db SPRITE_SNORLAX, $3e + 4, $a + 4, $ff, $d0, $1 ; person - db SPRITE_FISHER2, $1f + 4, $e + 4, $ff, $d2, TRAINER | $2, FISHER + $C8, $3 - db SPRITE_FISHER2, $27 + 4, $5 + 4, $ff, $d1, TRAINER | $3, FISHER + $C8, $4 - db SPRITE_BLACK_HAIR_BOY_1, $5c + 4, $b + 4, $ff, $d2, TRAINER | $4, JR__TRAINER_M + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_2, $4c + 4, $e + 4, $ff, $d1, TRAINER | $5, ROCKER + $C8, $2 - db SPRITE_FISHER2, $28 + 4, $c + 4, $ff, $d2, TRAINER | $6, FISHER + $C8, $5 - db SPRITE_FISHER2, $34 + 4, $9 + 4, $ff, $d3, TRAINER | $7, FISHER + $C8, $6 - db SPRITE_FISHER2, $57 + 4, $6 + 4, $ff, $d0, TRAINER | $8, FISHER + $C8, $b - db SPRITE_BALL, $23 + 4, $e + 4, $ff, $ff, ITEM | $9, TM_16 - db SPRITE_BALL, $59 + 4, $5 + 4, $ff, $ff, ITEM | $a, IRON + db $a ; objects + object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person + object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, OPP_FISHER, $3 + object SPRITE_FISHER2, $5, $27, STAY, UP, $3, OPP_FISHER, $4 + object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR__TRAINER_M, $9 + object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, OPP_ROCKER, $2 + object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, OPP_FISHER, $5 + object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, OPP_FISHER, $6 + object SPRITE_FISHER2, $6, $57, STAY, DOWN, $8, OPP_FISHER, $b + object SPRITE_BALL, $e, $23, STAY, NONE, $9, TM_16 + object SPRITE_BALL, $5, $59, STAY, NONE, $a, IRON ; warp-to EVENT_DISP ROUTE_12_WIDTH, $f, $a ; ROUTE_12_GATE_1F diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm index fc70b763..1e2fe3f9 100755 --- a/data/mapObjects/route12gate.asm +++ b/data/mapObjects/route12gate.asm @@ -10,8 +10,8 @@ Route12GateObject: ; 0x4950e (size=50) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $3 + 4, $1 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $1, $3, STAY, NONE, $1 ; person ; warp-to EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $4 diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm index 012dedda..9a8e4d4a 100755 --- a/data/mapObjects/route12gateupstairs.asm +++ b/data/mapObjects/route12gateupstairs.asm @@ -8,8 +8,8 @@ Route12GateUpstairsObject: ; 0x495de (size=24) db $2, $1, $2 ; Route12GateUpstairsText2 db $2, $6, $3 ; Route12GateUpstairsText3 - db $1 ; people - db SPRITE_BRUNETTE_GIRL, $4 + 4, $3 + 4, $fe, $1, $1 ; person + db $1 ; objects + object SPRITE_BRUNETTE_GIRL, $3, $4, WALK, $1, $1 ; person ; warp-to EVENT_DISP ROUTE_12_GATE_2F_WIDTH, $7, $7 ; ROUTE_12_GATE_1F diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm index 74ae5bc7..fad89578 100755 --- a/data/mapObjects/route12house.asm +++ b/data/mapObjects/route12house.asm @@ -7,8 +7,8 @@ Route12HouseObject: ; 0x564de (size=26) db $0 ; signs - db $1 ; people - db SPRITE_FISHER, $4 + 4, $2 + 4, $ff, $d3, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $2, $4, STAY, RIGHT, $1 ; person ; warp-to EVENT_DISP ROUTE_12_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index 5cf6d0c2..1512ce3a 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -8,14 +8,14 @@ Route13Object: ; 0x5482e (size=93) db $5, $21, $c ; Route13Text12 db $b, $1f, $d ; Route13Text13 - db $a ; people - db SPRITE_BLACK_HAIR_BOY_1, $a + 4, $31 + 4, $ff, $d3, TRAINER | $1, BIRD_KEEPER + $C8, $1 - db SPRITE_LASS, $a + 4, $30 + 4, $ff, $d0, TRAINER | $2, JR__TRAINER_F + $C8, $c - db SPRITE_LASS, $9 + 4, $1b + 4, $ff, $d0, TRAINER | $3, JR__TRAINER_F + $C8, $d - db SPRITE_LASS, $a + 4, $17 + 4, $ff, $d2, TRAINER | $4, JR__TRAINER_F + $C8, $e - db SPRITE_LASS, $5 + 4, $32 + 4, $ff, $d0, TRAINER | $5, JR__TRAINER_F + $C8, $f - db SPRITE_BLACK_HAIR_BOY_1, $4 + 4, $c + 4, $ff, $d3, TRAINER | $6, BIRD_KEEPER + $C8, $2 - db SPRITE_FOULARD_WOMAN, $6 + 4, $21 + 4, $ff, $d0, TRAINER | $7, BEAUTY + $C8, $4 - db SPRITE_FOULARD_WOMAN, $6 + 4, $20 + 4, $ff, $d0, TRAINER | $8, BEAUTY + $C8, $5 - db SPRITE_BIKER, $7 + 4, $a + 4, $ff, $d1, TRAINER | $9, BIKER + $C8, $1 - db SPRITE_BLACK_HAIR_BOY_1, $d + 4, $7 + 4, $ff, $d1, TRAINER | $a, BIRD_KEEPER + $C8, $3 + db $a ; objects + object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $1 + object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR__TRAINER_F, $c + object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR__TRAINER_F, $d + object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR__TRAINER_F, $e + object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR__TRAINER_F, $f + object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, OPP_BIRD_KEEPER, $2 + object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, OPP_BEAUTY, $4 + object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, OPP_BEAUTY, $5 + object SPRITE_BIKER, $a, $7, STAY, UP, $9, OPP_BIKER, $1 + object SPRITE_BLACK_HAIR_BOY_1, $7, $d, STAY, UP, $a, OPP_BIRD_KEEPER, $3 diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index a16f83e2..ce6d52b0 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/route14.asm @@ -6,14 +6,14 @@ Route14Object: ; 0x549bb (size=87) db $1 ; signs db $d, $11, $b ; Route14Text11 - db $a ; people - db SPRITE_BLACK_HAIR_BOY_1, $4 + 4, $4 + 4, $ff, $d0, TRAINER | $1, BIRD_KEEPER + $C8, $e - db SPRITE_BLACK_HAIR_BOY_1, $6 + 4, $f + 4, $ff, $d0, TRAINER | $2, BIRD_KEEPER + $C8, $f - db SPRITE_BLACK_HAIR_BOY_1, $b + 4, $c + 4, $ff, $d0, TRAINER | $3, BIRD_KEEPER + $C8, $10 - db SPRITE_BLACK_HAIR_BOY_1, $f + 4, $e + 4, $ff, $d1, TRAINER | $4, BIRD_KEEPER + $C8, $11 - db SPRITE_BLACK_HAIR_BOY_1, $1f + 4, $f + 4, $ff, $d2, TRAINER | $5, BIRD_KEEPER + $C8, $4 - db SPRITE_BLACK_HAIR_BOY_1, $31 + 4, $6 + 4, $ff, $d1, TRAINER | $6, BIRD_KEEPER + $C8, $5 - db SPRITE_BIKER, $27 + 4, $5 + 4, $ff, $d0, TRAINER | $7, BIKER + $C8, $d - db SPRITE_BIKER, $1e + 4, $4 + 4, $ff, $d3, TRAINER | $8, BIKER + $C8, $e - db SPRITE_BIKER, $1e + 4, $f + 4, $ff, $d2, TRAINER | $9, BIKER + $C8, $f - db SPRITE_BIKER, $1f + 4, $4 + 4, $ff, $d3, TRAINER | $a, BIKER + $C8, $2 + db $a ; objects + object SPRITE_BLACK_HAIR_BOY_1, $4, $4, STAY, DOWN, $1, OPP_BIRD_KEEPER, $e + object SPRITE_BLACK_HAIR_BOY_1, $f, $6, STAY, DOWN, $2, OPP_BIRD_KEEPER, $f + object SPRITE_BLACK_HAIR_BOY_1, $c, $b, STAY, DOWN, $3, OPP_BIRD_KEEPER, $10 + object SPRITE_BLACK_HAIR_BOY_1, $e, $f, STAY, UP, $4, OPP_BIRD_KEEPER, $11 + object SPRITE_BLACK_HAIR_BOY_1, $f, $1f, STAY, LEFT, $5, OPP_BIRD_KEEPER, $4 + object SPRITE_BLACK_HAIR_BOY_1, $6, $31, STAY, UP, $6, OPP_BIRD_KEEPER, $5 + object SPRITE_BIKER, $5, $27, STAY, DOWN, $7, OPP_BIKER, $d + object SPRITE_BIKER, $4, $1e, STAY, RIGHT, $8, OPP_BIKER, $e + object SPRITE_BIKER, $f, $1e, STAY, LEFT, $9, OPP_BIKER, $f + object SPRITE_BIKER, $4, $1f, STAY, RIGHT, $a, OPP_BIKER, $2 diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index a7165c6c..95016038 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -10,18 +10,18 @@ Route15Object: ; 0x5894e (size=126) db $1 ; signs db $9, $27, $c ; Route15Text12 - db $b ; people - db SPRITE_LASS, $b + 4, $29 + 4, $ff, $d0, TRAINER | $1, JR__TRAINER_F + $C8, $14 - db SPRITE_LASS, $a + 4, $35 + 4, $ff, $d2, TRAINER | $2, JR__TRAINER_F + $C8, $15 - db SPRITE_BLACK_HAIR_BOY_1, $d + 4, $1f + 4, $ff, $d1, TRAINER | $3, BIRD_KEEPER + $C8, $6 - db SPRITE_BLACK_HAIR_BOY_1, $d + 4, $23 + 4, $ff, $d1, TRAINER | $4, BIRD_KEEPER + $C8, $7 - db SPRITE_FOULARD_WOMAN, $b + 4, $35 + 4, $ff, $d0, TRAINER | $5, BEAUTY + $C8, $9 - db SPRITE_FOULARD_WOMAN, $a + 4, $29 + 4, $ff, $d3, TRAINER | $6, BEAUTY + $C8, $a - db SPRITE_BIKER, $a + 4, $30 + 4, $ff, $d0, TRAINER | $7, BIKER + $C8, $3 - db SPRITE_BIKER, $a + 4, $2e + 4, $ff, $d0, TRAINER | $8, BIKER + $C8, $4 - db SPRITE_LASS, $5 + 4, $25 + 4, $ff, $d3, TRAINER | $9, JR__TRAINER_F + $C8, $16 - db SPRITE_LASS, $d + 4, $12 + 4, $ff, $d1, TRAINER | $a, JR__TRAINER_F + $C8, $17 - db SPRITE_BALL, $5 + 4, $12 + 4, $ff, $ff, ITEM | $b, TM_20 + db $b ; objects + object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR__TRAINER_F, $14 + object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR__TRAINER_F, $15 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, OPP_BIRD_KEEPER, $6 + object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, OPP_BIRD_KEEPER, $7 + object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, OPP_BEAUTY, $9 + object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, OPP_BEAUTY, $a + object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, OPP_BIKER, $3 + object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, OPP_BIKER, $4 + object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR__TRAINER_F, $16 + object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR__TRAINER_F, $17 + object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20 ; warp-to EVENT_DISP ROUTE_15_WIDTH, $8, $7 ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index e0278fbe..f571ee03 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/route15gate.asm @@ -10,8 +10,8 @@ Route15GateObject: ; 0x4960c (size=50) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $1 + 4, $4 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person ; warp-to EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $0 diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm index dd7a0b2c..4362ade0 100755 --- a/data/mapObjects/route15gateupstairs.asm +++ b/data/mapObjects/route15gateupstairs.asm @@ -7,8 +7,8 @@ Route15GateUpstairsObject: ; 4969d (12:569d) db $1 ; signs db $2, $6, $2 ; Route15GateUpstairsText2 - db $1 ; people - db SPRITE_OAK_AIDE, $2 + 4, $4 + 4, $ff, $d0, $1 + db $1 ; objects + object SPRITE_OAK_AIDE, $4, $2, STAY, DOWN, $1 ; warp-to EVENT_DISP ROUTE_15_GATE_2F_WIDTH, $7, $7 ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index 3023124e..600dbbf1 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -16,14 +16,14 @@ Route16Object: ; 0x58afc (size=136) db $b, $1b, $8 ; Route16Text8 db $11, $5, $9 ; Route16Text9 - db $7 ; people - db SPRITE_BIKER, $c + 4, $11 + 4, $ff, $d2, TRAINER | $1, BIKER + $C8, $5 - db SPRITE_BIKER, $d + 4, $e + 4, $ff, $d3, TRAINER | $2, CUE_BALL + $C8, $1 - db SPRITE_BIKER, $c + 4, $b + 4, $ff, $d1, TRAINER | $3, CUE_BALL + $C8, $2 - db SPRITE_BIKER, $b + 4, $9 + 4, $ff, $d2, TRAINER | $4, BIKER + $C8, $6 - db SPRITE_BIKER, $a + 4, $6 + 4, $ff, $d3, TRAINER | $5, CUE_BALL + $C8, $3 - db SPRITE_BIKER, $c + 4, $3 + 4, $ff, $d3, TRAINER | $6, BIKER + $C8, $7 - db SPRITE_SNORLAX, $a + 4, $1a + 4, $ff, $d0, $7 ; person + db $7 ; objects + object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, OPP_BIKER, $5 + object SPRITE_BIKER, $e, $d, STAY, RIGHT, $2, OPP_CUE_BALL, $1 + object SPRITE_BIKER, $b, $c, STAY, UP, $3, OPP_CUE_BALL, $2 + object SPRITE_BIKER, $9, $b, STAY, LEFT, $4, OPP_BIKER, $6 + object SPRITE_BIKER, $6, $a, STAY, RIGHT, $5, OPP_CUE_BALL, $3 + object SPRITE_BIKER, $3, $c, STAY, RIGHT, $6, OPP_BIKER, $7 + object SPRITE_SNORLAX, $1a, $a, STAY, DOWN, $7 ; person ; warp-to EVENT_DISP ROUTE_16_WIDTH, $a, $11 ; ROUTE_16_GATE_1F diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm index 3b493cca..e1da990d 100755 --- a/data/mapObjects/route16gate.asm +++ b/data/mapObjects/route16gate.asm @@ -14,9 +14,9 @@ Route16GateObject: ; 0x4978b (size=88) db $0 ; signs - db $2 ; people - db SPRITE_GUARD, $5 + 4, $4 + 4, $ff, $d0, $1 ; person - db SPRITE_GAMBLER, $3 + 4, $4 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_GUARD, $4, $5, STAY, DOWN, $1 ; person + object SPRITE_GAMBLER, $4, $3, STAY, NONE, $2 ; person ; warp-to EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $8, $0 diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm index ee9df620..d8c2db12 100755 --- a/data/mapObjects/route16gateupstairs.asm +++ b/data/mapObjects/route16gateupstairs.asm @@ -8,9 +8,9 @@ Route16GateUpstairsObject: ; 0x4984c (size=30) db $2, $1, $3 ; Route16GateUpstairsText3 db $2, $6, $4 ; Route16GateUpstairsText4 - db $2 ; people - db SPRITE_YOUNG_BOY, $2 + 4, $4 + 4, $ff, $ff, $1 ; person - db SPRITE_LITTLE_GIRL, $5 + 4, $2 + 4, $fe, $2, $2 ; person + db $2 ; objects + object SPRITE_YOUNG_BOY, $4, $2, STAY, NONE, $1 ; person + object SPRITE_LITTLE_GIRL, $2, $5, WALK, $2, $2 ; person ; warp-to EVENT_DISP ROUTE_16_GATE_2F_WIDTH, $7, $7 ; ROUTE_16_GATE_1F diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm index 816c0e69..12a846c6 100755 --- a/data/mapObjects/route16house.asm +++ b/data/mapObjects/route16house.asm @@ -7,9 +7,9 @@ Route16HouseObject: ; 0x1e657 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_BRUNETTE_GIRL, $3 + 4, $2 + 4, $ff, $d3, $1 ; person - db SPRITE_BIRD, $4 + 4, $6 + 4, $fe, $0, $2 ; person + db $2 ; objects + object SPRITE_BRUNETTE_GIRL, $2, $3, STAY, RIGHT, $1 ; person + object SPRITE_BIRD, $6, $4, WALK, $0, $2 ; person ; warp-to EVENT_DISP ROUTE_16_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index 06123998..c496373e 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/route17.asm @@ -11,14 +11,14 @@ Route17Object: ; 0x54b42 (size=102) db $6f, $9, $f ; Route17Text15 db $8d, $9, $10 ; Route17Text16 - db $a ; people - db SPRITE_BIKER, $13 + 4, $c + 4, $ff, $d2, TRAINER | $1, CUE_BALL + $C8, $4 - db SPRITE_BIKER, $10 + 4, $b + 4, $ff, $d3, TRAINER | $2, CUE_BALL + $C8, $5 - db SPRITE_BIKER, $12 + 4, $4 + 4, $ff, $d1, TRAINER | $3, BIKER + $C8, $8 - db SPRITE_BIKER, $20 + 4, $7 + 4, $ff, $d2, TRAINER | $4, BIKER + $C8, $9 - db SPRITE_BIKER, $22 + 4, $e + 4, $ff, $d3, TRAINER | $5, BIKER + $C8, $a - db SPRITE_BIKER, $3a + 4, $11 + 4, $ff, $d2, TRAINER | $6, CUE_BALL + $C8, $6 - db SPRITE_BIKER, $44 + 4, $2 + 4, $ff, $d3, TRAINER | $7, CUE_BALL + $C8, $7 - db SPRITE_BIKER, $62 + 4, $e + 4, $ff, $d3, TRAINER | $8, CUE_BALL + $C8, $8 - db SPRITE_BIKER, $62 + 4, $5 + 4, $ff, $d2, TRAINER | $9, BIKER + $C8, $b - db SPRITE_BIKER, $76 + 4, $a + 4, $ff, $d0, TRAINER | $a, BIKER + $C8, $c + db $a ; objects + object SPRITE_BIKER, $c, $13, STAY, LEFT, $1, OPP_CUE_BALL, $4 + object SPRITE_BIKER, $b, $10, STAY, RIGHT, $2, OPP_CUE_BALL, $5 + object SPRITE_BIKER, $4, $12, STAY, UP, $3, OPP_BIKER, $8 + object SPRITE_BIKER, $7, $20, STAY, LEFT, $4, OPP_BIKER, $9 + object SPRITE_BIKER, $e, $22, STAY, RIGHT, $5, OPP_BIKER, $a + object SPRITE_BIKER, $11, $3a, STAY, LEFT, $6, OPP_CUE_BALL, $6 + object SPRITE_BIKER, $2, $44, STAY, RIGHT, $7, OPP_CUE_BALL, $7 + object SPRITE_BIKER, $e, $62, STAY, RIGHT, $8, OPP_CUE_BALL, $8 + object SPRITE_BIKER, $5, $62, STAY, LEFT, $9, OPP_BIKER, $b + object SPRITE_BIKER, $a, $76, STAY, DOWN, $a, OPP_BIKER, $c diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index f4dd26f3..88547941 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -11,10 +11,10 @@ Route18Object: ; 0x58c5a (size=66) db $7, $2b, $4 ; Route18Text4 db $5, $21, $5 ; Route18Text5 - db $3 ; people - db SPRITE_BLACK_HAIR_BOY_1, $b + 4, $24 + 4, $ff, $d3, TRAINER | $1, BIRD_KEEPER + $C8, $8 - db SPRITE_BLACK_HAIR_BOY_1, $f + 4, $28 + 4, $ff, $d2, TRAINER | $2, BIRD_KEEPER + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_1, $d + 4, $2a + 4, $ff, $d2, TRAINER | $3, BIRD_KEEPER + $C8, $a + db $3 ; objects + object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $8 + object SPRITE_BLACK_HAIR_BOY_1, $28, $f, STAY, LEFT, $2, OPP_BIRD_KEEPER, $9 + object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, OPP_BIRD_KEEPER, $a ; warp-to EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm index 62816061..d42026da 100755 --- a/data/mapObjects/route18gate.asm +++ b/data/mapObjects/route18gate.asm @@ -10,8 +10,8 @@ Route18GateObject: ; 0x49937 (size=50) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $1 + 4, $4 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $4, $1, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $4, $0 diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index d2b55e7f..c611e0c3 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/route18gateupstairs.asm @@ -8,8 +8,8 @@ Route18GateUpstairsObject: ; 0x499a4 (size=24) db $2, $1, $2 ; Route18GateUpstairsText2 db $2, $6, $3 ; Route18GateUpstairsText3 - db $1 ; people - db SPRITE_BUG_CATCHER, $2 + 4, $4 + 4, $fe, $2, $1 ; person + db $1 ; objects + object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person ; warp-to EVENT_DISP ROUTE_18_GATE_2F_WIDTH, $7, $7 ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 41f0f260..7377e1e6 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -7,17 +7,15 @@ Route19Object: ; 0x54e9a (size=87) db $1 ; signs db $b,$b,$b - db $a ; people - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $9 + 4, $ff, $d3, TRAINER | 1, SWIMMER + $C8, 2 - db SPRITE_BLACK_HAIR_BOY_1, $9 + 4, $c + 4, $ff, $d2, TRAINER | 2, SWIMMER + $C8, 3 - db SPRITE_SWIMMER, $19 + 4, $d + 4, $ff, $d2, TRAINER | $3, SWIMMER + $C8, $4 - db SPRITE_SWIMMER, $1b + 4, $4 + 4, $ff, $d3, TRAINER | $4, SWIMMER + $C8, $5 - db SPRITE_SWIMMER, $1f + 4, $10 + 4, $ff, $d1, TRAINER | $5, SWIMMER + $C8, $6 - db SPRITE_SWIMMER, $d + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7 - db SPRITE_SWIMMER, $2b + 4, $8 + 4, $ff, $d2, TRAINER | $7, BEAUTY + $C8, $c - db SPRITE_SWIMMER, $2b + 4, $b + 4, $ff, $d3, TRAINER | $8, BEAUTY + $C8, $d - db SPRITE_SWIMMER, $2a + 4, $9 + 4, $ff, $d1, TRAINER | $9, SWIMMER + $C8, $8 - db SPRITE_SWIMMER, $2c + 4, $a + 4, $ff, $d0, TRAINER | $a, BEAUTY + $C8, $e + db $a ; objects + + object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, OPP_SWIMMER, 2 + object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, OPP_SWIMMER, 3 + object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, OPP_SWIMMER, $7 + object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c + object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d + object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8 + object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e ; warp-to EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index 5587309c..0e6784b2 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -13,9 +13,9 @@ Route2Object: ; 0x54022 (size=72) db $41, $5, $3 ; Route2Text3 db $b, $b, $4 ; Route2Text4 - db $2 ; people - db SPRITE_BALL, $36 + 4, $d + 4, $ff, $ff, ITEM | $1, MOON_STONE - db SPRITE_BALL, $2d + 4, $d + 4, $ff, $ff, ITEM | $2, HP_UP + db $2 ; objects + object SPRITE_BALL, $d, $36, STAY, NONE, $1, MOON_STONE + object SPRITE_BALL, $d, $2d, STAY, NONE, $2, HP_UP ; warp-to EVENT_DISP ROUTE_2_WIDTH, $9, $c ; DIGLETTS_CAVE_EXIT diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index 78256699..8e6b5a78 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -9,17 +9,17 @@ Route20Object: ; 0x50113 (size=106) db $7, $33, $b ; Route20Text11 db $b, $39, $c ; Route20Text12 - db $a ; people - db SPRITE_SWIMMER, $8 + 4, $57 + 4, $ff, $d1, TRAINER | $1, SWIMMER + $C8, $9 - db SPRITE_SWIMMER, $b + 4, $44 + 4, $ff, $d1, TRAINER | $2, BEAUTY + $C8, $f - db SPRITE_SWIMMER, $a + 4, $2d + 4, $ff, $d0, TRAINER | $3, BEAUTY + $C8, $6 - db SPRITE_SWIMMER, $e + 4, $37 + 4, $ff, $d3, TRAINER | $4, JR__TRAINER_F + $C8, $18 - db SPRITE_SWIMMER, $d + 4, $26 + 4, $ff, $d0, TRAINER | $5, SWIMMER + $C8, $a - db SPRITE_SWIMMER, $d + 4, $57 + 4, $ff, $d1, TRAINER | $6, SWIMMER + $C8, $b - db SPRITE_BLACK_HAIR_BOY_1, $9 + 4, $22 + 4, $ff, $d1, TRAINER | $7, BIRD_KEEPER + $C8, $b - db SPRITE_SWIMMER, $7 + 4, $19 + 4, $ff, $d1, TRAINER | $8, BEAUTY + $C8, $7 - db SPRITE_SWIMMER, $c + 4, $18 + 4, $ff, $d0, TRAINER | $9, JR__TRAINER_F + $C8, $10 - db SPRITE_SWIMMER, $8 + 4, $f + 4, $ff, $d1, TRAINER | $a, BEAUTY + $C8, $8 + db $a ; objects + object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, OPP_SWIMMER, $9 + object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, OPP_BEAUTY, $f + object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, OPP_BEAUTY, $6 + object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, OPP_JR__TRAINER_F, $18 + object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, OPP_SWIMMER, $a + object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, OPP_SWIMMER, $b + object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, OPP_BIRD_KEEPER, $b + object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, OPP_BEAUTY, $7 + object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, OPP_JR__TRAINER_F, $10 + object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, OPP_BEAUTY, $8 ; warp-to EVENT_DISP ROUTE_20_WIDTH, $5, $30 ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm index 6e9a044e..e98c8425 100755 --- a/data/mapObjects/route21.asm +++ b/data/mapObjects/route21.asm @@ -5,13 +5,13 @@ Route21Object: ; 0x55021 (size=76) db $0 ; signs - db $9 ; people - db SPRITE_FISHER2, $18 + 4, $4 + 4, $ff, $d2, TRAINER | $1, FISHER + $C8, $7 - db SPRITE_FISHER2, $19 + 4, $6 + 4, $ff, $d0, TRAINER | $2, FISHER + $C8, $9 - db SPRITE_SWIMMER, $1f + 4, $a + 4, $ff, $d1, TRAINER | $3, SWIMMER + $C8, $c - db SPRITE_SWIMMER, $1e + 4, $c + 4, $ff, $d3, TRAINER | $4, CUE_BALL + $C8, $9 - db SPRITE_SWIMMER, $3f + 4, $10 + 4, $ff, $d0, TRAINER | $5, SWIMMER + $C8, $d - db SPRITE_SWIMMER, $47 + 4, $5 + 4, $ff, $d3, TRAINER | $6, SWIMMER + $C8, $e - db SPRITE_SWIMMER, $47 + 4, $f + 4, $ff, $d2, TRAINER | $7, SWIMMER + $C8, $f - db SPRITE_FISHER2, $38 + 4, $e + 4, $ff, $d2, TRAINER | $8, FISHER + $C8, $8 - db SPRITE_FISHER2, $39 + 4, $11 + 4, $ff, $d3, TRAINER | $9, FISHER + $C8, $a + db $9 ; objects + object SPRITE_FISHER2, $4, $18, STAY, LEFT, $1, OPP_FISHER, $7 + object SPRITE_FISHER2, $6, $19, STAY, DOWN, $2, OPP_FISHER, $9 + object SPRITE_SWIMMER, $a, $1f, STAY, UP, $3, OPP_SWIMMER, $c + object SPRITE_SWIMMER, $c, $1e, STAY, RIGHT, $4, OPP_CUE_BALL, $9 + object SPRITE_SWIMMER, $10, $3f, STAY, DOWN, $5, OPP_SWIMMER, $d + object SPRITE_SWIMMER, $5, $47, STAY, RIGHT, $6, OPP_SWIMMER, $e + object SPRITE_SWIMMER, $f, $47, STAY, LEFT, $7, OPP_SWIMMER, $f + object SPRITE_FISHER2, $e, $38, STAY, LEFT, $8, OPP_FISHER, $8 + object SPRITE_FISHER2, $11, $39, STAY, RIGHT, $9, OPP_FISHER, $a diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index ac67ed9f..999b9d8a 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -7,9 +7,9 @@ Route22Object: ; 0x50022 (size=27) db $1 ; signs db $b, $7, $3 ; Route22FrontGateText - db $2 ; people - db SPRITE_BLUE, $5 + 4, $19 + 4, $ff, $ff, $1 ; person - db SPRITE_BLUE, $5 + 4, $19 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_BLUE, $19, $5, STAY, NONE, $1 ; person + object SPRITE_BLUE, $19, $5, STAY, NONE, $2 ; person ; warp-to EVENT_DISP ROUTE_22_WIDTH, $5, $8 ; ROUTE_22_GATE diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index cafc47ce..604a8730 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -9,8 +9,8 @@ Route22GateObject: ; 0x1e720 (size=42) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $2 + 4, $6 + 4, $ff, $d2, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person ; warp-to EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $4 diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm index 15591ae1..af8c8dab 100755 --- a/data/mapObjects/route23.asm +++ b/data/mapObjects/route23.asm @@ -10,14 +10,14 @@ Route23Object: ; 0x50361 (size=81) db $1 ; signs db $21, $3, $8 ; Route23Text8 - db $7 ; people - db SPRITE_GUARD, $23 + 4, $4 + 4, $ff, $d0, $1 ; person - db SPRITE_GUARD, $38 + 4, $a + 4, $ff, $d0, $2 ; person - db SPRITE_SWIMMER, $55 + 4, $8 + 4, $ff, $d0, $3 ; person - db SPRITE_SWIMMER, $60 + 4, $b + 4, $ff, $d0, $4 ; person - db SPRITE_GUARD, $69 + 4, $c + 4, $ff, $d0, $5 ; person - db SPRITE_GUARD, $77 + 4, $8 + 4, $ff, $d0, $6 ; person - db SPRITE_GUARD, $88 + 4, $8 + 4, $ff, $d0, $7 ; person + db $7 ; objects + object SPRITE_GUARD, $4, $23, STAY, DOWN, $1 ; person + object SPRITE_GUARD, $a, $38, STAY, DOWN, $2 ; person + object SPRITE_SWIMMER, $8, $55, STAY, DOWN, $3 ; person + object SPRITE_SWIMMER, $b, $60, STAY, DOWN, $4 ; person + object SPRITE_GUARD, $c, $69, STAY, DOWN, $5 ; person + object SPRITE_GUARD, $8, $77, STAY, DOWN, $6 ; person + object SPRITE_GUARD, $8, $88, STAY, DOWN, $7 ; person ; warp-to EVENT_DISP ROUTE_23_WIDTH, $8b, $7 ; ROUTE_22_GATE diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index e17709ff..b61ff713 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -5,12 +5,12 @@ Route24Object: ; 0x506a4 (size=67) db $0 ; signs - db $8 ; people - db SPRITE_BLACK_HAIR_BOY_1, $f + 4, $b + 4, $ff, $d2, TRAINER | $1, ROCKET + $C8, $6 - db SPRITE_BLACK_HAIR_BOY_1, $14 + 4, $5 + 4, $ff, $d1, TRAINER | $2, JR__TRAINER_M + $C8, $2 - db SPRITE_BLACK_HAIR_BOY_1, $13 + 4, $b + 4, $ff, $d2, TRAINER | $3, JR__TRAINER_M + $C8, $3 - db SPRITE_LASS, $16 + 4, $a + 4, $ff, $d3, TRAINER | $4, LASS + $C8, $7 - db SPRITE_BUG_CATCHER, $19 + 4, $b + 4, $ff, $d2, TRAINER | $5, YOUNGSTER + $C8, $4 - db SPRITE_LASS, $1c + 4, $a + 4, $ff, $d3, TRAINER | $6, LASS + $C8, $8 - db SPRITE_BUG_CATCHER, $1f + 4, $b + 4, $ff, $d2, TRAINER | $7, BUG_CATCHER + $C8, $9 - db SPRITE_BALL, $5 + 4, $a + 4, $ff, $ff, ITEM | $8, TM_45 + db $8 ; objects + object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6 + object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR__TRAINER_M, $2 + object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR__TRAINER_M, $3 + object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, OPP_LASS, $7 + object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, OPP_YOUNGSTER, $4 + object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8 + object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, OPP_BUG_CATCHER, $9 + object SPRITE_BALL, $a, $5, STAY, NONE, $8, TM_45 diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index 6b3ef029..62fa8e77 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -7,17 +7,17 @@ Route25Object: ; 0x507b2 (size=94) db $1 ; signs db $3, $2b, $b ; Route25Text11 - db $a ; people - db SPRITE_BUG_CATCHER, $2 + 4, $e + 4, $ff, $d0, TRAINER | $1, YOUNGSTER + $C8, $5 - db SPRITE_BUG_CATCHER, $5 + 4, $12 + 4, $ff, $d1, TRAINER | $2, YOUNGSTER + $C8, $6 - db SPRITE_BLACK_HAIR_BOY_1, $4 + 4, $18 + 4, $ff, $d0, TRAINER | $3, JR__TRAINER_M + $C8, $2 - db SPRITE_LASS, $8 + 4, $12 + 4, $ff, $d3, TRAINER | $4, LASS + $C8, $9 - db SPRITE_BUG_CATCHER, $3 + 4, $20 + 4, $ff, $d2, TRAINER | $5, YOUNGSTER + $C8, $7 - db SPRITE_LASS, $4 + 4, $25 + 4, $ff, $d0, TRAINER | $6, LASS + $C8, $a - db SPRITE_HIKER, $4 + 4, $8 + 4, $ff, $d3, TRAINER | $7, HIKER + $C8, $2 - db SPRITE_HIKER, $9 + 4, $17 + 4, $ff, $d1, TRAINER | $8, HIKER + $C8, $3 - db SPRITE_HIKER, $7 + 4, $d + 4, $ff, $d3, TRAINER | $9, HIKER + $C8, $4 - db SPRITE_BALL, $2 + 4, $16 + 4, $ff, $ff, ITEM | $a, TM_19 + db $a ; objects + object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5 + object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, OPP_YOUNGSTER, $6 + object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR__TRAINER_M, $2 + object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, OPP_LASS, $9 + object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, OPP_YOUNGSTER, $7 + object SPRITE_LASS, $25, $4, STAY, DOWN, $6, OPP_LASS, $a + object SPRITE_HIKER, $8, $4, STAY, RIGHT, $7, OPP_HIKER, $2 + object SPRITE_HIKER, $17, $9, STAY, UP, $8, OPP_HIKER, $3 + object SPRITE_HIKER, $d, $7, STAY, RIGHT, $9, OPP_HIKER, $4 + object SPRITE_BALL, $16, $2, STAY, NONE, $a, TM_19 ; warp-to EVENT_DISP ROUTE_25_WIDTH, $3, $2d ; BILLS_HOUSE diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm index a1bcc687..9a0b79e0 100755 --- a/data/mapObjects/route2gate.asm +++ b/data/mapObjects/route2gate.asm @@ -9,9 +9,9 @@ Route2GateObject: ; 0x5d620 (size=48) db $0 ; signs - db $2 ; people - db SPRITE_OAK_AIDE, $4 + 4, $1 + 4, $ff, $d2, $1 ; person - db SPRITE_BUG_CATCHER, $4 + 4, $5 + 4, $fe, $2, $2 ; person + db $2 ; objects + object SPRITE_OAK_AIDE, $1, $4, STAY, LEFT, $1 ; person + object SPRITE_BUG_CATCHER, $5, $4, WALK, $2, $2 ; person ; warp-to EVENT_DISP ROUTE_2_GATE_WIDTH, $0, $4 diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index 26adfcf4..b8d6d20f 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/route2house.asm @@ -7,9 +7,9 @@ Route2HouseObject: ; 0x1df07 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_OAK_AIDE, $4 + 4, $2 + 4, $ff, $d3, $1 ; person - db SPRITE_GAMEBOY_KID_COPY, $1 + 4, $4 + 4, $ff, $d0, $2 ; person + db $2 ; objects + object SPRITE_OAK_AIDE, $2, $4, STAY, RIGHT, $1 ; person + object SPRITE_GAMEBOY_KID_COPY, $4, $1, STAY, DOWN, $2 ; person ; warp-to EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index 99de3d73..a2df6925 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/route3.asm @@ -6,13 +6,13 @@ Route3Object: ; 0x54208 (size=77) db $1 ; signs db $9, $3b, $a ; Route3Text10 - db $9 ; people - db SPRITE_BLACK_HAIR_BOY_2, $b + 4, $39 + 4, $ff, $ff, $1 ; person - db SPRITE_BUG_CATCHER, $6 + 4, $a + 4, $ff, $d3, TRAINER | $2, BUG_CATCHER + $C8, $4 - db SPRITE_BUG_CATCHER, $4 + 4, $e + 4, $ff, $d0, TRAINER | $3, YOUNGSTER + $C8, $1 - db SPRITE_LASS, $9 + 4, $10 + 4, $ff, $d2, TRAINER | $4, LASS + $C8, $1 - db SPRITE_BUG_CATCHER, $5 + 4, $13 + 4, $ff, $d0, TRAINER | $5, BUG_CATCHER + $C8, $5 - db SPRITE_LASS, $4 + 4, $17 + 4, $ff, $d2, TRAINER | $6, LASS + $C8, $2 - db SPRITE_BUG_CATCHER, $9 + 4, $16 + 4, $ff, $d2, TRAINER | $7, YOUNGSTER + $C8, $2 - db SPRITE_BUG_CATCHER, $6 + 4, $18 + 4, $ff, $d3, TRAINER | $8, BUG_CATCHER + $C8, $6 - db SPRITE_LASS, $a + 4, $21 + 4, $ff, $d1, TRAINER | $9, LASS + $C8, $3 + db $9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $39, $b, STAY, NONE, $1 ; person + object SPRITE_BUG_CATCHER, $a, $6, STAY, RIGHT, $2, OPP_BUG_CATCHER, $4 + object SPRITE_BUG_CATCHER, $e, $4, STAY, DOWN, $3, OPP_YOUNGSTER, $1 + object SPRITE_LASS, $10, $9, STAY, LEFT, $4, OPP_LASS, $1 + object SPRITE_BUG_CATCHER, $13, $5, STAY, DOWN, $5, OPP_BUG_CATCHER, $5 + object SPRITE_LASS, $17, $4, STAY, LEFT, $6, OPP_LASS, $2 + object SPRITE_BUG_CATCHER, $16, $9, STAY, LEFT, $7, OPP_YOUNGSTER, $2 + object SPRITE_BUG_CATCHER, $18, $6, STAY, RIGHT, $8, OPP_BUG_CATCHER, $6 + object SPRITE_LASS, $21, $a, STAY, UP, $9, OPP_LASS, $3 diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index 57b81ee2..14e59684 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/route4.asm @@ -11,10 +11,10 @@ Route4Object: ; 0x543b2 (size=58) db $7, $11, $5 ; Route4Text5 db $7, $1b, $6 ; Route4Text6 - db $3 ; people - db SPRITE_LASS, $8 + 4, $9 + 4, $fe, $0, $1 ; person - db SPRITE_LASS, $3 + 4, $3f + 4, $ff, $d3, TRAINER | $2, LASS + $C8, $4 - db SPRITE_BALL, $3 + 4, $39 + 4, $ff, $ff, ITEM | $3, TM_04 + db $3 ; objects + object SPRITE_LASS, $9, $8, WALK, $0, $1 ; person + object SPRITE_LASS, $3f, $3, STAY, RIGHT, $2, OPP_LASS, $4 + object SPRITE_BALL, $39, $3, STAY, NONE, $3, TM_04 ; warp-to EVENT_DISP ROUTE_4_WIDTH, $5, $b ; MT_MOON_POKECENTER diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm index c7481faa..d11f8417 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/route5.asm @@ -11,7 +11,7 @@ Route5Object: ; 0x545a3 (size=47) db $1 ; signs db $1d, $11, $1 ; Route5Text1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP ROUTE_5_WIDTH, $1d, $a ; ROUTE_5_GATE diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm index f71e3e64..db2f4564 100755 --- a/data/mapObjects/route5gate.asm +++ b/data/mapObjects/route5gate.asm @@ -9,8 +9,8 @@ Route5GateObject: ; 0x1dffb (size=42) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $3 + 4, $1 + 4, $ff, $d3, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $1, $3, STAY, RIGHT, $1 ; person ; warp-to EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $3 diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index b804f0d5..d901e865 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -10,13 +10,13 @@ Route6Object: ; 0x58022 (size=87) db $1 ; signs db $f, $13, $7 ; Route6Text7 - db $6 ; people - db SPRITE_BLACK_HAIR_BOY_1, $15 + 4, $a + 4, $ff, $d3, TRAINER | $1, JR__TRAINER_M + $C8, $4 - db SPRITE_LASS, $15 + 4, $b + 4, $ff, $d2, TRAINER | $2, JR__TRAINER_F + $C8, $2 - db SPRITE_BUG_CATCHER, $f + 4, $0 + 4, $ff, $d3, TRAINER | $3, BUG_CATCHER + $C8, $a - db SPRITE_BLACK_HAIR_BOY_1, $1f + 4, $b + 4, $ff, $d2, TRAINER | $4, JR__TRAINER_M + $C8, $5 - db SPRITE_LASS, $1e + 4, $b + 4, $ff, $d2, TRAINER | $5, JR__TRAINER_F + $C8, $3 - db SPRITE_BUG_CATCHER, $1a + 4, $13 + 4, $ff, $d2, TRAINER | $6, BUG_CATCHER + $C8, $b + db $6 ; objects + object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR__TRAINER_M, $4 + object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR__TRAINER_F, $2 + object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a + object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR__TRAINER_M, $5 + object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR__TRAINER_F, $3 + object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, OPP_BUG_CATCHER, $b ; warp-to EVENT_DISP ROUTE_6_WIDTH, $1, $9 ; ROUTE_6_GATE diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm index 068b1cc3..59d08e57 100755 --- a/data/mapObjects/route6gate.asm +++ b/data/mapObjects/route6gate.asm @@ -9,8 +9,8 @@ Route6GateObject: ; 0x1e0be (size=42) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $2 + 4, $6 + 4, $ff, $d2, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person ; warp-to EVENT_DISP ROUTE_6_GATE_WIDTH, $5, $3 diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm index 43425a11..485a8694 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/route7.asm @@ -11,7 +11,7 @@ Route7Object: ; 0x48022 (size=47) db $1 ; signs db $d, $3, $1 ; Route7Text1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP ROUTE_7_WIDTH, $9, $12 ; ROUTE_7_GATE diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 752b53f9..8c618fc1 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -9,8 +9,8 @@ Route7GateObject: ; 0x1e185 (size=42) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $1 + 4, $3 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $3, $1, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $0 diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 2662adcd..5863129b 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -11,16 +11,16 @@ Route8Object: ; 0x5814f (size=119) db $1 ; signs db $3, $11, $a ; Route8Text10 - db $9 ; people - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $8 + 4, $ff, $d3, TRAINER | $1, SUPER_NERD + $C8, $3 - db SPRITE_GAMBLER, $9 + 4, $d + 4, $ff, $d1, TRAINER | $2, GAMBLER + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_2, $6 + 4, $2a + 4, $ff, $d1, TRAINER | $3, SUPER_NERD + $C8, $4 - db SPRITE_LASS, $3 + 4, $1a + 4, $ff, $d2, TRAINER | $4, LASS + $C8, $d - db SPRITE_BLACK_HAIR_BOY_2, $4 + 4, $1a + 4, $ff, $d3, TRAINER | $5, SUPER_NERD + $C8, $5 - db SPRITE_LASS, $5 + 4, $1a + 4, $ff, $d2, TRAINER | $6, LASS + $C8, $e - db SPRITE_LASS, $6 + 4, $1a + 4, $ff, $d3, TRAINER | $7, LASS + $C8, $f - db SPRITE_GAMBLER, $d + 4, $2e + 4, $ff, $d0, TRAINER | $8, GAMBLER + $C8, $7 - db SPRITE_LASS, $c + 4, $33 + 4, $ff, $d2, TRAINER | $9, LASS + $C8, $10 + db $9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $8, $5, STAY, RIGHT, $1, OPP_SUPER_NERD, $3 + object SPRITE_GAMBLER, $d, $9, STAY, UP, $2, OPP_GAMBLER, $5 + object SPRITE_BLACK_HAIR_BOY_2, $2a, $6, STAY, UP, $3, OPP_SUPER_NERD, $4 + object SPRITE_LASS, $1a, $3, STAY, LEFT, $4, OPP_LASS, $d + object SPRITE_BLACK_HAIR_BOY_2, $1a, $4, STAY, RIGHT, $5, OPP_SUPER_NERD, $5 + object SPRITE_LASS, $1a, $5, STAY, LEFT, $6, OPP_LASS, $e + object SPRITE_LASS, $1a, $6, STAY, RIGHT, $7, OPP_LASS, $f + object SPRITE_GAMBLER, $2e, $d, STAY, DOWN, $8, OPP_GAMBLER, $7 + object SPRITE_LASS, $33, $c, STAY, LEFT, $9, OPP_LASS, $10 ; warp-to EVENT_DISP ROUTE_8_WIDTH, $9, $1 ; ROUTE_8_GATE diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index c38eed26..8c3fb54f 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -9,8 +9,8 @@ Route8GateObject: ; 0x1e247 (size=42) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $1 + 4, $2 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $2, $1, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP ROUTE_8_GATE_WIDTH, $3, $0 diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 32b89db4..a70b208f 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -6,14 +6,14 @@ Route9Object: ; 0x546a8 (size=86) db $1 ; signs db $7, $19, $b ; Route9Text11 - db $a ; people - db SPRITE_LASS, $a + 4, $d + 4, $ff, $d2, TRAINER | $1, JR__TRAINER_F + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $18 + 4, $ff, $d2, TRAINER | $2, JR__TRAINER_M + $C8, $7 - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $1f + 4, $ff, $d3, TRAINER | $3, JR__TRAINER_M + $C8, $8 - db SPRITE_LASS, $8 + 4, $30 + 4, $ff, $d3, TRAINER | $4, JR__TRAINER_F + $C8, $6 - db SPRITE_HIKER, $f + 4, $10 + 4, $ff, $d2, TRAINER | $5, HIKER + $C8, $b - db SPRITE_HIKER, $3 + 4, $2b + 4, $ff, $d2, TRAINER | $6, HIKER + $C8, $6 - db SPRITE_BUG_CATCHER, $2 + 4, $16 + 4, $ff, $d0, TRAINER | $7, BUG_CATCHER + $C8, $d - db SPRITE_HIKER, $f + 4, $2d + 4, $ff, $d3, TRAINER | $8, HIKER + $C8, $5 - db SPRITE_BUG_CATCHER, $8 + 4, $28 + 4, $ff, $d3, TRAINER | $9, BUG_CATCHER + $C8, $e - db SPRITE_BALL, $f + 4, $a + 4, $ff, $ff, ITEM | $a, TM_30 + db $a ; objects + object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR__TRAINER_F, $5 + object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR__TRAINER_M, $7 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR__TRAINER_M, $8 + object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR__TRAINER_F, $6 + object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b + object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, OPP_HIKER, $6 + object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, OPP_BUG_CATCHER, $d + object SPRITE_HIKER, $2d, $f, STAY, RIGHT, $8, OPP_HIKER, $5 + object SPRITE_BUG_CATCHER, $28, $8, STAY, RIGHT, $9, OPP_BUG_CATCHER, $e + object SPRITE_BALL, $a, $f, STAY, NONE, $a, TM_30 diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm index 8cb07350..41886e9f 100755 --- a/data/mapObjects/safarizonecenter.asm +++ b/data/mapObjects/safarizonecenter.asm @@ -16,8 +16,8 @@ SafariZoneCenterObject: ; 0x45bc5 (size=89) db $14, $12, $2 ; SafariZoneCenterText2 db $16, $e, $3 ; SafariZoneCenterText3 - db $1 ; people - db SPRITE_BALL, $a + 4, $e + 4, $ff, $ff, ITEM | $1, NUGGET + db $1 ; objects + object SPRITE_BALL, $e, $a, STAY, NONE, $1, NUGGET ; warp-to EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $e ; SAFARI_ZONE_ENTRANCE diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm index 26aa1cc1..4cb1e0ae 100755 --- a/data/mapObjects/safarizoneeast.asm +++ b/data/mapObjects/safarizoneeast.asm @@ -13,11 +13,11 @@ SafariZoneEastObject: ; 0x4588b (size=81) db $4, $6, $6 ; SafariZoneEastText6 db $17, $5, $7 ; SafariZoneEastText7 - db $4 ; people - db SPRITE_BALL, $a + 4, $15 + 4, $ff, $ff, ITEM | $1, FULL_RESTORE - db SPRITE_BALL, $7 + 4, $3 + 4, $ff, $ff, ITEM | $2, MAX_POTION - db SPRITE_BALL, $d + 4, $14 + 4, $ff, $ff, ITEM | $3, CARBOS - db SPRITE_BALL, $c + 4, $f + 4, $ff, $ff, ITEM | $4, TM_37 + db $4 ; objects + object SPRITE_BALL, $15, $a, STAY, NONE, $1, FULL_RESTORE + object SPRITE_BALL, $3, $7, STAY, NONE, $2, MAX_POTION + object SPRITE_BALL, $14, $d, STAY, NONE, $3, CARBOS + object SPRITE_BALL, $f, $c, STAY, NONE, $4, TM_37 ; warp-to EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $4, $0 ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm index c252109c..543cf7dc 100755 --- a/data/mapObjects/safarizoneentrance.asm +++ b/data/mapObjects/safarizoneentrance.asm @@ -9,9 +9,9 @@ SafariZoneEntranceObject: ; 0x753f5 (size=48) db $0 ; signs - db $2 ; people - db SPRITE_WHITE_PLAYER, $2 + 4, $6 + 4, $ff, $d2, $1 ; person - db SPRITE_WHITE_PLAYER, $4 + 4, $1 + 4, $ff, $d3, $2 ; person + db $2 ; objects + object SPRITE_WHITE_PLAYER, $6, $2, STAY, LEFT, $1 ; person + object SPRITE_WHITE_PLAYER, $1, $4, STAY, RIGHT, $2 ; person ; warp-to EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $3 diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm index 8c7a94f5..e3c4cddb 100755 --- a/data/mapObjects/safarizonenorth.asm +++ b/data/mapObjects/safarizonenorth.asm @@ -19,9 +19,9 @@ SafariZoneNorthObject: ; 0x459d5 (size=105) db $21, $13, $6 ; SafariZoneNorthText6 db $1c, $1a, $7 ; SafariZoneNorthText7 - db $2 ; people - db SPRITE_BALL, $1 + 4, $19 + 4, $ff, $ff, ITEM | $1, PROTEIN - db SPRITE_BALL, $7 + 4, $13 + 4, $ff, $ff, ITEM | $2, TM_40 + db $2 ; objects + object SPRITE_BALL, $19, $1, STAY, NONE, $1, PROTEIN + object SPRITE_BALL, $13, $7, STAY, NONE, $2, TM_40 ; warp-to EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $2 ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm index 492f8f38..d27a967f 100755 --- a/data/mapObjects/safarizoneresthouse1.asm +++ b/data/mapObjects/safarizoneresthouse1.asm @@ -7,9 +7,9 @@ SafariZoneRestHouse1Object: ; 0x45cfe (size=32) db $0 ; signs - db $2 ; people - db SPRITE_GIRL, $2 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_OAK_AIDE, $4 + 4, $1 + 4, $fe, $1, $2 ; person + db $2 ; objects + object SPRITE_GIRL, $3, $2, STAY, DOWN, $1 ; person + object SPRITE_OAK_AIDE, $1, $4, WALK, $1, $2 ; person ; warp-to EVENT_DISP SAFARI_ZONE_REST_HOUSE_1_WIDTH, $7, $2 ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm index f6918eed..eb6c7a25 100755 --- a/data/mapObjects/safarizoneresthouse2.asm +++ b/data/mapObjects/safarizoneresthouse2.asm @@ -7,10 +7,10 @@ SafariZoneRestHouse2Object: ; 0x45d43 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_OAK_AIDE, $4 + 4, $4 + 4, $fe, $0, $1 ; person - db SPRITE_BLACK_HAIR_BOY_1, $2 + 4, $0 + 4, $ff, $d3, $2 ; person - db SPRITE_ERIKA, $2 + 4, $6 + 4, $ff, $d0, $3 ; person + db $3 ; objects + object SPRITE_OAK_AIDE, $4, $4, WALK, $0, $1 ; person + object SPRITE_BLACK_HAIR_BOY_1, $0, $2, STAY, RIGHT, $2 ; person + object SPRITE_ERIKA, $6, $2, STAY, DOWN, $3 ; person ; warp-to EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $2 ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm index 70365365..4d698782 100755 --- a/data/mapObjects/safarizoneresthouse3.asm +++ b/data/mapObjects/safarizoneresthouse3.asm @@ -7,10 +7,10 @@ SafariZoneRestHouse3Object: ; 0x45d8e (size=38) db $0 ; signs - db $3 ; people - db SPRITE_OAK_AIDE, $3 + 4, $1 + 4, $fe, $1, $1 ; person - db SPRITE_ROCKER, $2 + 4, $4 + 4, $ff, $ff, $2 ; person - db SPRITE_LAPRAS_GIVER, $2 + 4, $5 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_OAK_AIDE, $1, $3, WALK, $1, $1 ; person + object SPRITE_ROCKER, $4, $2, STAY, NONE, $2 ; person + object SPRITE_LAPRAS_GIVER, $5, $2, STAY, NONE, $3 ; person ; warp-to EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $2 ; SAFARI_ZONE_EAST diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm index 53beef42..1d928420 100755 --- a/data/mapObjects/safarizoneresthouse4.asm +++ b/data/mapObjects/safarizoneresthouse4.asm @@ -7,10 +7,10 @@ SafariZoneRestHouse4Object: ; 0x45dd9 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_OAK_AIDE, $3 + 4, $6 + 4, $fe, $2, $1 ; person - db SPRITE_WHITE_PLAYER, $4 + 4, $3 + 4, $ff, $ff, $2 ; person - db SPRITE_GENTLEMAN, $5 + 4, $1 + 4, $fe, $1, $3 ; person + db $3 ; objects + object SPRITE_OAK_AIDE, $6, $3, WALK, $2, $1 ; person + object SPRITE_WHITE_PLAYER, $3, $4, STAY, NONE, $2 ; person + object SPRITE_GENTLEMAN, $1, $5, WALK, $1, $3 ; person ; warp-to EVENT_DISP SAFARI_ZONE_REST_HOUSE_4_WIDTH, $7, $2 ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm index 79032c70..471ec40b 100755 --- a/data/mapObjects/safarizonesecrethouse.asm +++ b/data/mapObjects/safarizonesecrethouse.asm @@ -7,8 +7,8 @@ SafariZoneSecretHouseObject: ; 0x4a365 (size=26) db $0 ; signs - db $1 ; people - db SPRITE_FISHER, $3 + 4, $3 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $3, $3, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $2 ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm index 4bfc7a4d..724476ae 100755 --- a/data/mapObjects/safarizonewest.asm +++ b/data/mapObjects/safarizonewest.asm @@ -17,11 +17,11 @@ SafariZoneWestObject: ; 0x4a1dc (size=108) db $4, $1a, $7 ; SafariZoneWestText7 db $16, $18, $8 ; SafariZoneWestText8 - db $4 ; people - db SPRITE_BALL, $14 + 4, $8 + 4, $ff, $ff, ITEM | $1, MAX_POTION - db SPRITE_BALL, $7 + 4, $9 + 4, $ff, $ff, ITEM | $2, TM_32 - db SPRITE_BALL, $12 + 4, $12 + 4, $ff, $ff, ITEM | $3, MAX_REVIVE - db SPRITE_BALL, $7 + 4, $13 + 4, $ff, $ff, ITEM | $4, GOLD_TEETH + db $4 ; objects + object SPRITE_BALL, $8, $14, STAY, NONE, $1, MAX_POTION + object SPRITE_BALL, $9, $7, STAY, NONE, $2, TM_32 + object SPRITE_BALL, $12, $12, STAY, NONE, $3, MAX_REVIVE + object SPRITE_BALL, $13, $7, STAY, NONE, $4, GOLD_TEETH ; warp-to EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $14 ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 5ec54aff..69e76ee7 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -23,22 +23,22 @@ SaffronCityObject: ; 0x509dc (size=188) db $1d, $1b, $18 ; SaffronCityText24 db $13, $1, $19 ; SaffronCityText25 - db $f ; people - db SPRITE_ROCKET, $6 + 4, $7 + 4, $ff, $ff, $1 ; person - db SPRITE_ROCKET, $8 + 4, $14 + 4, $fe, $2, $2 ; person - db SPRITE_ROCKET, $4 + 4, $22 + 4, $ff, $ff, $3 ; person - db SPRITE_ROCKET, $c + 4, $d + 4, $ff, $ff, $4 ; person - db SPRITE_ROCKET, $19 + 4, $b + 4, $fe, $2, $5 ; person - db SPRITE_ROCKET, $d + 4, $20 + 4, $fe, $2, $6 ; person - db SPRITE_ROCKET, $1e + 4, $12 + 4, $fe, $2, $7 ; person - db SPRITE_OAK_AIDE, $e + 4, $8 + 4, $fe, $0, $8 ; person - db SPRITE_LAPRAS_GIVER, $17 + 4, $17 + 4, $ff, $ff, $9 ; person - db SPRITE_ERIKA, $1e + 4, $11 + 4, $fe, $2, $a ; person - db SPRITE_GENTLEMAN, $c + 4, $1e + 4, $ff, $d0, $b ; person - db SPRITE_BIRD, $c + 4, $1f + 4, $ff, $d0, $c ; person - db SPRITE_ROCKER, $8 + 4, $12 + 4, $ff, $d1, $d ; person - db SPRITE_ROCKET, $16 + 4, $12 + 4, $ff, $d0, $e ; person - db SPRITE_ROCKET, $16 + 4, $13 + 4, $ff, $d0, $f ; person + db $f ; objects + object SPRITE_ROCKET, $7, $6, STAY, NONE, $1 ; person + object SPRITE_ROCKET, $14, $8, WALK, $2, $2 ; person + object SPRITE_ROCKET, $22, $4, STAY, NONE, $3 ; person + object SPRITE_ROCKET, $d, $c, STAY, NONE, $4 ; person + object SPRITE_ROCKET, $b, $19, WALK, $2, $5 ; person + object SPRITE_ROCKET, $20, $d, WALK, $2, $6 ; person + object SPRITE_ROCKET, $12, $1e, WALK, $2, $7 ; person + object SPRITE_OAK_AIDE, $8, $e, WALK, $0, $8 ; person + object SPRITE_LAPRAS_GIVER, $17, $17, STAY, NONE, $9 ; person + object SPRITE_ERIKA, $11, $1e, WALK, $2, $a ; person + object SPRITE_GENTLEMAN, $1e, $c, STAY, DOWN, $b ; person + object SPRITE_BIRD, $1f, $c, STAY, DOWN, $c ; person + object SPRITE_ROCKER, $12, $8, STAY, UP, $d ; person + object SPRITE_ROCKET, $12, $16, STAY, DOWN, $e ; person + object SPRITE_ROCKET, $13, $16, STAY, DOWN, $f ; person ; warp-to EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index eb85a89f..63676905 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -37,16 +37,16 @@ SaffronGymObject: ; 0x5d259 (size=330) db $0 ; signs - db $9 ; people - db SPRITE_GIRL, $8 + 4, $9 + 4, $ff, $d0, TRAINER | $1, SABRINA + $C8, $1 - db SPRITE_MEDIUM, $1 + 4, $a + 4, $ff, $d0, TRAINER | $2, CHANNELER + $C8, $16 - db SPRITE_BUG_CATCHER, $1 + 4, $11 + 4, $ff, $d0, TRAINER | $3, PSYCHIC_TR + $C8, $1 - db SPRITE_MEDIUM, $7 + 4, $3 + 4, $ff, $d0, TRAINER | $4, CHANNELER + $C8, $17 - db SPRITE_BUG_CATCHER, $7 + 4, $11 + 4, $ff, $d0, TRAINER | $5, PSYCHIC_TR + $C8, $2 - db SPRITE_MEDIUM, $d + 4, $3 + 4, $ff, $d0, TRAINER | $6, CHANNELER + $C8, $18 - db SPRITE_BUG_CATCHER, $d + 4, $11 + 4, $ff, $d0, TRAINER | $7, PSYCHIC_TR + $C8, $3 - db SPRITE_BUG_CATCHER, $1 + 4, $3 + 4, $ff, $d0, TRAINER | $8, PSYCHIC_TR + $C8, $4 - db SPRITE_GYM_HELPER, $f + 4, $a + 4, $ff, $d0, $9 ; person + db $9 ; objects + object SPRITE_GIRL, $9, $8, STAY, DOWN, $1, OPP_SABRINA, $1 + object SPRITE_MEDIUM, $a, $1, STAY, DOWN, $2, OPP_CHANNELER, $16 + object SPRITE_BUG_CATCHER, $11, $1, STAY, DOWN, $3, OPP_PSYCHIC_TR, $1 + object SPRITE_MEDIUM, $3, $7, STAY, DOWN, $4, OPP_CHANNELER, $17 + object SPRITE_BUG_CATCHER, $11, $7, STAY, DOWN, $5, OPP_PSYCHIC_TR, $2 + object SPRITE_MEDIUM, $3, $d, STAY, DOWN, $6, OPP_CHANNELER, $18 + object SPRITE_BUG_CATCHER, $11, $d, STAY, DOWN, $7, OPP_PSYCHIC_TR, $3 + object SPRITE_BUG_CATCHER, $3, $1, STAY, DOWN, $8, OPP_PSYCHIC_TR, $4 + object SPRITE_GYM_HELPER, $a, $f, STAY, DOWN, $9 ; person ; warp-to EVENT_DISP SAFFRON_GYM_WIDTH, $11, $8 diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm index 991caa7d..0480cbd9 100755 --- a/data/mapObjects/saffronhouse1.asm +++ b/data/mapObjects/saffronhouse1.asm @@ -7,11 +7,11 @@ SaffronHouse1Object: ; 0x1de04 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_BRUNETTE_GIRL, $3 + 4, $2 + 4, $ff, $d3, $1 ; person - db SPRITE_BIRD, $4 + 4, $0 + 4, $fe, $1, $2 ; person - db SPRITE_BUG_CATCHER, $1 + 4, $4 + 4, $ff, $d0, $3 ; person - db SPRITE_PAPER_SHEET, $3 + 4, $3 + 4, $ff, $ff, $4 ; person + db $4 ; objects + object SPRITE_BRUNETTE_GIRL, $2, $3, STAY, RIGHT, $1 ; person + object SPRITE_BIRD, $0, $4, WALK, $1, $2 ; person + object SPRITE_BUG_CATCHER, $4, $1, STAY, DOWN, $3 ; person + object SPRITE_PAPER_SHEET, $3, $3, STAY, NONE, $4 ; person ; warp-to EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm index e9b68e7c..ffcbd64d 100755 --- a/data/mapObjects/saffronhouse2.asm +++ b/data/mapObjects/saffronhouse2.asm @@ -7,8 +7,8 @@ SaffronHouse2Object: ; 0x1de8a (size=26) db $0 ; signs - db $1 ; people - db SPRITE_FISHER, $3 + 4, $5 + 4, $ff, $d2, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $5, $3, STAY, LEFT, $1 ; person ; warp-to EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $2 diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm index 30951c12..be3803af 100755 --- a/data/mapObjects/saffronmart.asm +++ b/data/mapObjects/saffronmart.asm @@ -7,10 +7,10 @@ SaffronMartObject: ; 0x5d41c (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $4 + 4, $ff, $ff, $2 ; person - db SPRITE_LASS, $5 + 4, $6 + 4, $fe, $0, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_BLACK_HAIR_BOY_2, $4, $2, STAY, NONE, $2 ; person + object SPRITE_LASS, $6, $5, WALK, $0, $3 ; person ; warp-to EVENT_DISP SAFFRON_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index 251aeea5..8487bb01 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -7,11 +7,11 @@ SaffronPokecenterObject: ; 0x5d54f (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_FOULARD_WOMAN, $5 + 4, $5 + 4, $ff, $ff, $2 ; person - db SPRITE_GENTLEMAN, $3 + 4, $8 + 4, $ff, $d0, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_FOULARD_WOMAN, $5, $5, STAY, NONE, $2 ; person + object SPRITE_GENTLEMAN, $8, $3, STAY, DOWN, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm index c26844a4..b60be6c0 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -7,9 +7,9 @@ SchoolObject: ; 0x1d55d (size=32) db $0 ; signs - db $2 ; people - db SPRITE_BRUNETTE_GIRL, $5 + 4, $3 + 4, $ff, $d1, $1 ; person - db SPRITE_LASS, $1 + 4, $4 + 4, $ff, $d0, $2 ; person + db $2 ; objects + object SPRITE_BRUNETTE_GIRL, $3, $5, STAY, UP, $1 ; person + object SPRITE_LASS, $4, $1, STAY, DOWN, $2 ; person ; warp-to EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $2 diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index 62fc8320..287f67ce 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -12,9 +12,9 @@ SeafoamIslands1Object: ; 0x4484f (size=72) db $0 ; signs - db $2 ; people - db SPRITE_BOULDER, $a + 4, $12 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person - db SPRITE_BOULDER, $7 + 4, $1a + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person + db $2 ; objects + object SPRITE_BOULDER, $12, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person + object SPRITE_BOULDER, $1a, $7, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $4 diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm index 821a38cd..29cdfa59 100755 --- a/data/mapObjects/seafoamislands2.asm +++ b/data/mapObjects/seafoamislands2.asm @@ -12,9 +12,9 @@ SeafoamIslands2Object: ; 0x46376 (size=72) db $0 ; signs - db $2 ; people - db SPRITE_BOULDER, $6 + 4, $11 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person - db SPRITE_BOULDER, $6 + 4, $16 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person + db $2 ; objects + object SPRITE_BOULDER, $11, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person + object SPRITE_BOULDER, $16, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $2, $4 ; SEAFOAM_ISLANDS_3 diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm index 0370805d..28a5e67b 100755 --- a/data/mapObjects/seafoamislands3.asm +++ b/data/mapObjects/seafoamislands3.asm @@ -12,9 +12,9 @@ SeafoamIslands3Object: ; 0x464b2 (size=72) db $0 ; signs - db $2 ; people - db SPRITE_BOULDER, $6 + 4, $12 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person - db SPRITE_BOULDER, $6 + 4, $17 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person + db $2 ; objects + object SPRITE_BOULDER, $12, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person + object SPRITE_BOULDER, $17, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $5 ; SEAFOAM_ISLANDS_2 diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm index 3f1baa1d..e90b3865 100755 --- a/data/mapObjects/seafoamislands4.asm +++ b/data/mapObjects/seafoamislands4.asm @@ -12,13 +12,13 @@ SeafoamIslands4Object: ; 0x466a6 (size=96) db $0 ; signs - db $6 ; people - db SPRITE_BOULDER, $e + 4, $5 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person - db SPRITE_BOULDER, $f + 4, $3 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person - db SPRITE_BOULDER, $e + 4, $8 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $3 ; person - db SPRITE_BOULDER, $e + 4, $9 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $4 ; person - db SPRITE_BOULDER, $6 + 4, $12 + 4, $ff, $ff, $5 ; person - db SPRITE_BOULDER, $6 + 4, $13 + 4, $ff, $ff, $6 ; person + db $6 ; objects + object SPRITE_BOULDER, $5, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person + object SPRITE_BOULDER, $3, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person + object SPRITE_BOULDER, $8, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $3 ; person + object SPRITE_BOULDER, $9, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $4 ; person + object SPRITE_BOULDER, $12, $6, STAY, NONE, $5 ; person + object SPRITE_BOULDER, $13, $6, STAY, NONE, $6 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $c, $5 ; SEAFOAM_ISLANDS_3 diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm index 6c207975..e5fbaecd 100755 --- a/data/mapObjects/seafoamislands5.asm +++ b/data/mapObjects/seafoamislands5.asm @@ -11,10 +11,10 @@ SeafoamIslands5Object: ; 0x468bc (size=62) db $f, $9, $4 ; SeafoamIslands5Text4 db $1, $17, $5 ; SeafoamIslands5Text5 - db $3 ; people - db SPRITE_BOULDER, $f + 4, $4 + 4, $ff, $ff, $1 ; person - db SPRITE_BOULDER, $f + 4, $5 + 4, $ff, $ff, $2 ; person - db SPRITE_BIRD, $1 + 4, $6 + 4, $ff, $d0, TRAINER | $3, ARTICUNO, 50 + db $3 ; objects + object SPRITE_BOULDER, $4, $f, STAY, NONE, $1 ; person + object SPRITE_BOULDER, $5, $f, STAY, NONE, $2 ; person + object SPRITE_BIRD, $6, $1, STAY, DOWN, $3, ARTICUNO, 50 ; warp-to EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $14 ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index 0d599ca6..a953f376 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/silphco1.asm @@ -10,8 +10,8 @@ SilphCo1Object: ; 0x5d470 (size=50) db $0 ; signs - db $1 ; people - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $4 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_CABLE_CLUB_WOMAN, $4, $2, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP SILPH_CO_1F_WIDTH, $11, $a diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index 5d253d98..cc608e64 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/silphco10.asm @@ -11,13 +11,13 @@ SilphCo10Object: ; 0x5a1fb (size=95) db $0 ; signs - db $6 ; people - db SPRITE_ROCKET, $9 + 4, $1 + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $27 - db SPRITE_OAK_AIDE, $2 + 4, $a + 4, $ff, $d2, TRAINER | $2, SCIENTIST + $C8, $b - db SPRITE_ERIKA, $f + 4, $9 + 4, $fe, $0, $3 ; person - db SPRITE_BALL, $c + 4, $2 + 4, $ff, $ff, ITEM | $4, TM_26 - db SPRITE_BALL, $e + 4, $4 + 4, $ff, $ff, ITEM | $5, RARE_CANDY - db SPRITE_BALL, $b + 4, $5 + 4, $ff, $ff, ITEM | $6, CARBOS + db $6 ; objects + object SPRITE_ROCKET, $1, $9, STAY, RIGHT, $1, OPP_ROCKET, $27 + object SPRITE_OAK_AIDE, $a, $2, STAY, LEFT, $2, OPP_SCIENTIST, $b + object SPRITE_ERIKA, $9, $f, WALK, $0, $3 ; person + object SPRITE_BALL, $2, $c, STAY, NONE, $4, TM_26 + object SPRITE_BALL, $4, $e, STAY, NONE, $5, RARE_CANDY + object SPRITE_BALL, $5, $b, STAY, NONE, $6, CARBOS ; warp-to EVENT_DISP SILPH_CO_10F_WIDTH, $0, $8 ; SILPH_CO_9F diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index 93b9e339..8cba618e 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -9,12 +9,12 @@ SilphCo11Object: ; 0x62380 (size=72) db $0 ; signs - db $5 ; people - db SPRITE_MR_MASTERBALL, $5 + 4, $7 + 4, $ff, $d0, $1 ; person - db SPRITE_FOULARD_WOMAN, $5 + 4, $a + 4, $ff, $d0, $2 ; person - db SPRITE_GIOVANNI, $9 + 4, $6 + 4, $ff, $d0, TRAINER | $3, GIOVANNI + $C8, $2 - db SPRITE_ROCKET, $10 + 4, $3 + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $29 - db SPRITE_ROCKET, $9 + 4, $f + 4, $ff, $d1, TRAINER | $5, ROCKET + $C8, $28 + db $5 ; objects + object SPRITE_MR_MASTERBALL, $7, $5, STAY, DOWN, $1 ; person + object SPRITE_FOULARD_WOMAN, $a, $5, STAY, DOWN, $2 ; person + object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, OPP_GIOVANNI, $2 + object SPRITE_ROCKET, $3, $10, STAY, UP, $4, OPP_ROCKET, $29 + object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28 ; warp-to EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index 5da4ccc5..44271d70 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -12,12 +12,12 @@ SilphCo2Object: ; 0x59e66 (size=98) db $0 ; signs - db $5 ; people - db SPRITE_ERIKA, $1 + 4, $a + 4, $ff, $d1, $1 ; person - db SPRITE_OAK_AIDE, $c + 4, $5 + 4, $ff, $d0, TRAINER | $2, SCIENTIST + $C8, $2 - db SPRITE_OAK_AIDE, $d + 4, $18 + 4, $ff, $d2, TRAINER | $3, SCIENTIST + $C8, $3 - db SPRITE_ROCKET, $b + 4, $10 + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $17 - db SPRITE_ROCKET, $7 + 4, $18 + 4, $ff, $d1, TRAINER | $5, ROCKET + $C8, $18 + db $5 ; objects + object SPRITE_ERIKA, $a, $1, STAY, UP, $1 ; person + object SPRITE_OAK_AIDE, $5, $c, STAY, DOWN, $2, OPP_SCIENTIST, $2 + object SPRITE_OAK_AIDE, $18, $d, STAY, LEFT, $3, OPP_SCIENTIST, $3 + object SPRITE_ROCKET, $10, $b, STAY, UP, $4, OPP_ROCKET, $17 + object SPRITE_ROCKET, $18, $7, STAY, UP, $5, OPP_ROCKET, $18 ; warp-to EVENT_DISP SILPH_CO_2F_WIDTH, $0, $18 ; SILPH_CO_1F diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index e50bf7cb..48bb8c1a 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/silphco3.asm @@ -15,11 +15,11 @@ SilphCo3Object: ; 0x5a035 (size=113) db $0 ; signs - db $4 ; people - db SPRITE_LAPRAS_GIVER, $8 + 4, $18 + 4, $ff, $ff, $1 ; person - db SPRITE_ROCKET, $7 + 4, $14 + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $19 - db SPRITE_OAK_AIDE, $9 + 4, $7 + 4, $ff, $d0, TRAINER | $3, SCIENTIST + $C8, $4 - db SPRITE_BALL, $5 + 4, $8 + 4, $ff, $ff, ITEM | $4, HYPER_POTION + db $4 ; objects + object SPRITE_LAPRAS_GIVER, $18, $8, STAY, NONE, $1 ; person + object SPRITE_ROCKET, $14, $7, STAY, LEFT, $2, OPP_ROCKET, $19 + object SPRITE_OAK_AIDE, $7, $9, STAY, DOWN, $3, OPP_SCIENTIST, $4 + object SPRITE_BALL, $8, $5, STAY, NONE, $4, HYPER_POTION ; warp-to EVENT_DISP SILPH_CO_3F_WIDTH, $0, $1a ; SILPH_CO_2F diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index bbd26292..762ca7f8 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/silphco4.asm @@ -12,14 +12,14 @@ SilphCo4Object: ; 0x19e35 (size=111) db $0 ; signs - db $7 ; people - db SPRITE_LAPRAS_GIVER, $2 + 4, $6 + 4, $ff, $ff, $1 ; person - db SPRITE_ROCKET, $e + 4, $9 + 4, $ff, $d3, TRAINER | $2, ROCKET + $C8, $1a - db SPRITE_OAK_AIDE, $6 + 4, $e + 4, $ff, $d2, TRAINER | $3, SCIENTIST + $C8, $5 - db SPRITE_ROCKET, $a + 4, $1a + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $1b - db SPRITE_BALL, $9 + 4, $3 + 4, $ff, $ff, ITEM | $5, FULL_HEAL - db SPRITE_BALL, $7 + 4, $4 + 4, $ff, $ff, ITEM | $6, MAX_REVIVE - db SPRITE_BALL, $8 + 4, $5 + 4, $ff, $ff, ITEM | $7, ESCAPE_ROPE + db $7 ; objects + object SPRITE_LAPRAS_GIVER, $6, $2, STAY, NONE, $1 ; person + object SPRITE_ROCKET, $9, $e, STAY, RIGHT, $2, OPP_ROCKET, $1a + object SPRITE_OAK_AIDE, $e, $6, STAY, LEFT, $3, OPP_SCIENTIST, $5 + object SPRITE_ROCKET, $1a, $a, STAY, UP, $4, OPP_ROCKET, $1b + object SPRITE_BALL, $3, $9, STAY, NONE, $5, FULL_HEAL + object SPRITE_BALL, $4, $7, STAY, NONE, $6, MAX_REVIVE + object SPRITE_BALL, $5, $8, STAY, NONE, $7, ESCAPE_ROPE ; warp-to EVENT_DISP SILPH_CO_4F_WIDTH, $0, $18 ; SILPH_CO_3F diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index 2a1cf258..0c956cd3 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -12,18 +12,18 @@ SilphCo5Object: ; 0x1a08d (size=137) db $0 ; signs - db $b ; people - db SPRITE_LAPRAS_GIVER, $9 + 4, $d + 4, $ff, $ff, $1 ; person - db SPRITE_ROCKET, $10 + 4, $8 + 4, $ff, $d3, TRAINER | $2, ROCKET + $C8, $1c - db SPRITE_OAK_AIDE, $3 + 4, $8 + 4, $ff, $d3, TRAINER | $3, SCIENTIST + $C8, $6 - db SPRITE_ROCKER, $a + 4, $12 + 4, $ff, $d1, TRAINER | $4, JUGGLER + $C8, $1 - db SPRITE_ROCKET, $4 + 4, $1c + 4, $ff, $d1, TRAINER | $5, ROCKET + $C8, $1d - db SPRITE_BALL, $d + 4, $2 + 4, $ff, $ff, ITEM | $6, TM_09 - db SPRITE_BALL, $6 + 4, $4 + 4, $ff, $ff, ITEM | $7, PROTEIN - db SPRITE_BALL, $10 + 4, $15 + 4, $ff, $ff, ITEM | $8, CARD_KEY - db SPRITE_CLIPBOARD, $c + 4, $16 + 4, $ff, $ff, $9 ; person - db SPRITE_CLIPBOARD, $a + 4, $19 + 4, $ff, $ff, $a ; person - db SPRITE_CLIPBOARD, $6 + 4, $18 + 4, $ff, $ff, $b ; person + db $b ; objects + object SPRITE_LAPRAS_GIVER, $d, $9, STAY, NONE, $1 ; person + object SPRITE_ROCKET, $8, $10, STAY, RIGHT, $2, OPP_ROCKET, $1c + object SPRITE_OAK_AIDE, $8, $3, STAY, RIGHT, $3, OPP_SCIENTIST, $6 + object SPRITE_ROCKER, $12, $a, STAY, UP, $4, OPP_JUGGLER, $1 + object SPRITE_ROCKET, $1c, $4, STAY, UP, $5, OPP_ROCKET, $1d + object SPRITE_BALL, $2, $d, STAY, NONE, $6, TM_09 + object SPRITE_BALL, $4, $6, STAY, NONE, $7, PROTEIN + object SPRITE_BALL, $15, $10, STAY, NONE, $8, CARD_KEY + object SPRITE_CLIPBOARD, $16, $c, STAY, NONE, $9 ; person + object SPRITE_CLIPBOARD, $19, $a, STAY, NONE, $a ; person + object SPRITE_CLIPBOARD, $18, $6, STAY, NONE, $b ; person ; warp-to EVENT_DISP SILPH_CO_5F_WIDTH, $0, $18 ; SILPH_CO_6F diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index b3e15af1..66372f57 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -10,17 +10,17 @@ SilphCo6Object: ; 0x1a2fb (size=112) db $0 ; signs - db $a ; people - db SPRITE_LAPRAS_GIVER, $6 + 4, $a + 4, $ff, $ff, $1 ; person - db SPRITE_LAPRAS_GIVER, $6 + 4, $14 + 4, $ff, $ff, $2 ; person - db SPRITE_ERIKA, $6 + 4, $15 + 4, $ff, $d0, $3 ; person - db SPRITE_ERIKA, $a + 4, $b + 4, $ff, $d3, $4 ; person - db SPRITE_LAPRAS_GIVER, $d + 4, $12 + 4, $ff, $d1, $5 ; person - db SPRITE_ROCKET, $3 + 4, $11 + 4, $ff, $d3, TRAINER | $6, ROCKET + $C8, $1e - db SPRITE_OAK_AIDE, $8 + 4, $7 + 4, $ff, $d0, TRAINER | $7, SCIENTIST + $C8, $7 - db SPRITE_ROCKET, $f + 4, $e + 4, $ff, $d2, TRAINER | $8, ROCKET + $C8, $1f - db SPRITE_BALL, $c + 4, $3 + 4, $ff, $ff, ITEM | $9, HP_UP - db SPRITE_BALL, $f + 4, $2 + 4, $ff, $ff, ITEM | $a, X_ACCURACY + db $a ; objects + object SPRITE_LAPRAS_GIVER, $a, $6, STAY, NONE, $1 ; person + object SPRITE_LAPRAS_GIVER, $14, $6, STAY, NONE, $2 ; person + object SPRITE_ERIKA, $15, $6, STAY, DOWN, $3 ; person + object SPRITE_ERIKA, $b, $a, STAY, RIGHT, $4 ; person + object SPRITE_LAPRAS_GIVER, $12, $d, STAY, UP, $5 ; person + object SPRITE_ROCKET, $11, $3, STAY, RIGHT, $6, OPP_ROCKET, $1e + object SPRITE_OAK_AIDE, $7, $8, STAY, DOWN, $7, OPP_SCIENTIST, $7 + object SPRITE_ROCKET, $e, $f, STAY, LEFT, $8, OPP_ROCKET, $1f + object SPRITE_BALL, $3, $c, STAY, NONE, $9, HP_UP + object SPRITE_BALL, $2, $f, STAY, NONE, $a, X_ACCURACY ; warp-to EVENT_DISP SILPH_CO_6F_WIDTH, $0, $10 ; SILPH_CO_7F diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index fe435bb0..ef665ac0 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -11,18 +11,18 @@ SilphCo7Object: ; 0x51ed7 (size=128) db $0 ; signs - db $b ; people - db SPRITE_LAPRAS_GIVER, $5 + 4, $1 + 4, $ff, $ff, $1 ; person - db SPRITE_LAPRAS_GIVER, $d + 4, $d + 4, $ff, $d1, $2 ; person - db SPRITE_LAPRAS_GIVER, $a + 4, $7 + 4, $ff, $ff, $3 ; person - db SPRITE_ERIKA, $8 + 4, $a + 4, $ff, $ff, $4 ; person - db SPRITE_ROCKET, $1 + 4, $d + 4, $ff, $d0, TRAINER | $5, ROCKET + $C8, $20 - db SPRITE_OAK_AIDE, $d + 4, $2 + 4, $ff, $d0, TRAINER | $6, SCIENTIST + $C8, $8 - db SPRITE_ROCKET, $2 + 4, $14 + 4, $ff, $d2, TRAINER | $7, ROCKET + $C8, $21 - db SPRITE_ROCKET, $e + 4, $13 + 4, $ff, $d3, TRAINER | $8, ROCKET + $C8, $22 - db SPRITE_BLUE, $7 + 4, $3 + 4, $ff, $d1, $9 ; person - db SPRITE_BALL, $9 + 4, $1 + 4, $ff, $ff, ITEM | $a, CALCIUM - db SPRITE_BALL, $b + 4, $18 + 4, $ff, $ff, ITEM | $b, TM_03 + db $b ; objects + object SPRITE_LAPRAS_GIVER, $1, $5, STAY, NONE, $1 ; person + object SPRITE_LAPRAS_GIVER, $d, $d, STAY, UP, $2 ; person + object SPRITE_LAPRAS_GIVER, $7, $a, STAY, NONE, $3 ; person + object SPRITE_ERIKA, $a, $8, STAY, NONE, $4 ; person + object SPRITE_ROCKET, $d, $1, STAY, DOWN, $5, OPP_ROCKET, $20 + object SPRITE_OAK_AIDE, $2, $d, STAY, DOWN, $6, OPP_SCIENTIST, $8 + object SPRITE_ROCKET, $14, $2, STAY, LEFT, $7, OPP_ROCKET, $21 + object SPRITE_ROCKET, $13, $e, STAY, RIGHT, $8, OPP_ROCKET, $22 + object SPRITE_BLUE, $3, $7, STAY, UP, $9 ; person + object SPRITE_BALL, $1, $9, STAY, NONE, $a, CALCIUM + object SPRITE_BALL, $18, $b, STAY, NONE, $b, TM_03 ; warp-to EVENT_DISP SILPH_CO_7F_WIDTH, $0, $10 ; SILPH_CO_8F diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index be802791..a4b97a91 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -12,11 +12,11 @@ SilphCo8Object: ; 0x56613 (size=90) db $0 ; signs - db $4 ; people - db SPRITE_LAPRAS_GIVER, $2 + 4, $4 + 4, $ff, $ff, $1 ; person - db SPRITE_ROCKET, $2 + 4, $13 + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $23 - db SPRITE_OAK_AIDE, $2 + 4, $a + 4, $ff, $d0, TRAINER | $3, SCIENTIST + $C8, $9 - db SPRITE_ROCKET, $f + 4, $c + 4, $ff, $d3, TRAINER | $4, ROCKET + $C8, $24 + db $4 ; objects + object SPRITE_LAPRAS_GIVER, $4, $2, STAY, NONE, $1 ; person + object SPRITE_ROCKET, $13, $2, STAY, LEFT, $2, OPP_ROCKET, $23 + object SPRITE_OAK_AIDE, $a, $2, STAY, DOWN, $3, OPP_SCIENTIST, $9 + object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, OPP_ROCKET, $24 ; warp-to EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 2ebaa8df..204f0d1d 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -10,11 +10,11 @@ SilphCo9Object: ; 0x5d93f (size=74) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $e + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_ROCKET, $4 + 4, $2 + 4, $ff, $d1, TRAINER | $2, ROCKET + $C8, $25 - db SPRITE_OAK_AIDE, $d + 4, $15 + 4, $ff, $d0, TRAINER | $3, SCIENTIST + $C8, $a - db SPRITE_ROCKET, $10 + 4, $d + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $26 + db $4 ; objects + object SPRITE_NURSE, $3, $e, STAY, DOWN, $1 ; person + object SPRITE_ROCKET, $2, $4, STAY, UP, $2, OPP_ROCKET, $25 + object SPRITE_OAK_AIDE, $15, $d, STAY, DOWN, $3, OPP_SCIENTIST, $a + object SPRITE_ROCKET, $d, $10, STAY, UP, $4, OPP_ROCKET, $26 ; warp-to EVENT_DISP SILPH_CO_9F_WIDTH, $0, $e ; SILPH_CO_10F diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/silphcoelevator.asm index ced554eb..0e0f03c6 100755 --- a/data/mapObjects/silphcoelevator.asm +++ b/data/mapObjects/silphcoelevator.asm @@ -8,7 +8,7 @@ SilphCoElevatorObject: ; 0x45844 (size=23) db $1 ; signs db $0, $3, $1 ; SilphCoElevatorText1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP SILPH_CO_ELEVATOR_WIDTH, $3, $1 diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm index a1688f5c..c631074c 100755 --- a/data/mapObjects/ssanne1.asm +++ b/data/mapObjects/ssanne1.asm @@ -16,9 +16,9 @@ SSAnne1Object: ; 0x61277 (size=104) db $0 ; signs - db $2 ; people - db SPRITE_WAITER, $6 + 4, $c + 4, $fe, $2, $1 ; person - db SPRITE_SAILOR, $5 + 4, $1b + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_WAITER, $c, $6, WALK, $2, $1 ; person + object SPRITE_SAILOR, $1b, $5, STAY, NONE, $2 ; person ; warp-to EVENT_DISP SS_ANNE_1_WIDTH, $0, $1a ; VERMILION_DOCK diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index b98f734f..c57925f1 100755 --- a/data/mapObjects/ssanne10.asm +++ b/data/mapObjects/ssanne10.asm @@ -15,18 +15,18 @@ SSAnne10Object: ; 0x61e75 (size=165) db $0 ; signs - db $b ; people - db SPRITE_SAILOR, $d + 4, $0 + 4, $ff, $d0, TRAINER | $1, SAILOR + $C8, $3 - db SPRITE_SAILOR, $b + 4, $2 + 4, $ff, $d0, TRAINER | $2, SAILOR + $C8, $4 - db SPRITE_SAILOR, $3 + 4, $c + 4, $ff, $d2, TRAINER | $3, SAILOR + $C8, $5 - db SPRITE_SAILOR, $2 + 4, $16 + 4, $ff, $d0, TRAINER | $4, SAILOR + $C8, $6 - db SPRITE_SAILOR, $2 + 4, $0 + 4, $ff, $d3, TRAINER | $5, SAILOR + $C8, $7 - db SPRITE_FISHER2, $4 + 4, $0 + 4, $ff, $d3, TRAINER | $6, FISHER + $C8, $2 - db SPRITE_BLACK_HAIR_BOY_2, $d + 4, $a + 4, $ff, $d3, $7 ; person - db SPRITE_SLOWBRO, $c + 4, $b + 4, $ff, $ff, $8 ; person - db SPRITE_BALL, $2 + 4, $14 + 4, $ff, $ff, ITEM | $9, ETHER - db SPRITE_BALL, $2 + 4, $a + 4, $ff, $ff, ITEM | $a, TM_44 - db SPRITE_BALL, $b + 4, $c + 4, $ff, $ff, ITEM | $b, MAX_POTION + db $b ; objects + object SPRITE_SAILOR, $0, $d, STAY, DOWN, $1, OPP_SAILOR, $3 + object SPRITE_SAILOR, $2, $b, STAY, DOWN, $2, OPP_SAILOR, $4 + object SPRITE_SAILOR, $c, $3, STAY, LEFT, $3, OPP_SAILOR, $5 + object SPRITE_SAILOR, $16, $2, STAY, DOWN, $4, OPP_SAILOR, $6 + object SPRITE_SAILOR, $0, $2, STAY, RIGHT, $5, OPP_SAILOR, $7 + object SPRITE_FISHER2, $0, $4, STAY, RIGHT, $6, OPP_FISHER, $2 + object SPRITE_BLACK_HAIR_BOY_2, $a, $d, STAY, RIGHT, $7 ; person + object SPRITE_SLOWBRO, $b, $c, STAY, NONE, $8 ; person + object SPRITE_BALL, $14, $2, STAY, NONE, $9, ETHER + object SPRITE_BALL, $a, $2, STAY, NONE, $a, TM_44 + object SPRITE_BALL, $c, $b, STAY, NONE, $b, MAX_POTION ; warp-to EVENT_DISP SS_ANNE_10_WIDTH, $5, $2 ; SS_ANNE_4 diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index 3f756c31..9f3691cf 100755 --- a/data/mapObjects/ssanne2.asm +++ b/data/mapObjects/ssanne2.asm @@ -14,9 +14,9 @@ SSAnne2Object: ; 0x61514 (size=90) db $0 ; signs - db $2 ; people - db SPRITE_WAITER, $7 + 4, $3 + 4, $fe, $1, $1 ; person - db SPRITE_BLUE, $4 + 4, $24 + 4, $ff, $d0, TRAINER | $2, SONY1 + $C8, $1 + db $2 ; objects + object SPRITE_WAITER, $3, $7, WALK, $1, $1 ; person + object SPRITE_BLUE, $24, $4, STAY, DOWN, $2, OPP_SONY1, $1 ; warp-to EVENT_DISP SS_ANNE_2_WIDTH, $b, $9 ; SS_ANNE_9 diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm index 2068304d..1037d118 100755 --- a/data/mapObjects/ssanne3.asm +++ b/data/mapObjects/ssanne3.asm @@ -7,8 +7,8 @@ SSAnne3Object: ; 0x4493c (size=26) db $0 ; signs - db $1 ; people - db SPRITE_SAILOR, $3 + 4, $9 + 4, $fe, $2, $1 ; person + db $1 ; objects + object SPRITE_SAILOR, $9, $3, WALK, $2, $1 ; person ; warp-to EVENT_DISP SS_ANNE_3_WIDTH, $3, $0 ; SS_ANNE_5 diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm index a2abc2cf..9d752480 100755 --- a/data/mapObjects/ssanne4.asm +++ b/data/mapObjects/ssanne4.asm @@ -11,7 +11,7 @@ SSAnne4Object: ; 0x61632 (size=52) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP SS_ANNE_4_WIDTH, $3, $17 ; SS_ANNE_10 diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index 88b2b5b7..e18f1074 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/ssanne5.asm @@ -7,12 +7,12 @@ SSAnne5Object: ; 0x6172b (size=54) db $0 ; signs - db $5 ; people - db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $5 + 4, $ff, $d1, $1 ; person - db SPRITE_SAILOR, $9 + 4, $4 + 4, $ff, $ff, $2 ; person - db SPRITE_BLACK_HAIR_BOY_1, $b + 4, $7 + 4, $ff, $ff, $3 ; person - db SPRITE_SAILOR, $4 + 4, $4 + 4, $ff, $d0, TRAINER | $4, SAILOR + $C8, $1 - db SPRITE_SAILOR, $8 + 4, $a + 4, $ff, $d1, TRAINER | $5, SAILOR + $C8, $2 + db $5 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $5, $2, STAY, UP, $1 ; person + object SPRITE_SAILOR, $4, $9, STAY, NONE, $2 ; person + object SPRITE_BLACK_HAIR_BOY_1, $7, $b, STAY, NONE, $3 ; person + object SPRITE_SAILOR, $4, $4, STAY, DOWN, $4, OPP_SAILOR, $1 + object SPRITE_SAILOR, $a, $8, STAY, UP, $5, OPP_SAILOR, $2 ; warp-to EVENT_DISP SS_ANNE_5_WIDTH, $6, $d ; SS_ANNE_3 diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 7724ab5c..159a3ed2 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/ssanne6.asm @@ -6,14 +6,14 @@ SSAnne6Object: ; 0x6181b (size=54) db $0 ; signs - db $7 ; people - db SPRITE_COOK, $8 + 4, $1 + 4, $fe, $1, $1 ; person - db SPRITE_COOK, $8 + 4, $5 + 4, $fe, $1, $2 ; person - db SPRITE_COOK, $7 + 4, $9 + 4, $fe, $1, $3 ; person - db SPRITE_COOK, $6 + 4, $d + 4, $ff, $ff, $4 ; person - db SPRITE_COOK, $8 + 4, $d + 4, $ff, $ff, $5 ; person - db SPRITE_COOK, $a + 4, $d + 4, $ff, $ff, $6 ; person - db SPRITE_COOK, $d + 4, $b + 4, $ff, $d1, $7 ; person + db $7 ; objects + object SPRITE_COOK, $1, $8, WALK, $1, $1 ; person + object SPRITE_COOK, $5, $8, WALK, $1, $2 ; person + object SPRITE_COOK, $9, $7, WALK, $1, $3 ; person + object SPRITE_COOK, $d, $6, STAY, NONE, $4 ; person + object SPRITE_COOK, $d, $8, STAY, NONE, $5 ; person + object SPRITE_COOK, $d, $a, STAY, NONE, $6 ; person + object SPRITE_COOK, $b, $d, STAY, UP, $7 ; person ; warp-to EVENT_DISP SS_ANNE_6_WIDTH, $0, $6 ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm index c40bcfec..6179a28e 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/ssanne7.asm @@ -8,8 +8,8 @@ SSAnne7Object: ; 0x61946 (size=24) db $1, $4, $2 ; SSAnne7Text2 db $2, $1, $3 ; SSAnne7Text3 - db $1 ; people - db SPRITE_SS_CAPTAIN, $2 + 4, $4 + 4, $ff, $d1, $1 ; person + db $1 ; objects + object SPRITE_SS_CAPTAIN, $4, $2, STAY, UP, $1 ; person ; warp-to EVENT_DISP SS_ANNE_7_WIDTH, $7, $0 ; SS_ANNE_2 diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index e2df8fa9..992230d8 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -11,18 +11,18 @@ SSAnne8Object: ; 0x61a60 (size=127) db $0 ; signs - db $b ; people - db SPRITE_GENTLEMAN, $3 + 4, $2 + 4, $ff, $d2, TRAINER | $1, GENTLEMAN + $C8, $1 - db SPRITE_GENTLEMAN, $4 + 4, $b + 4, $ff, $d1, TRAINER | $2, GENTLEMAN + $C8, $2 - db SPRITE_BUG_CATCHER, $e + 4, $b + 4, $ff, $d1, TRAINER | $3, YOUNGSTER + $C8, $8 - db SPRITE_LASS, $b + 4, $d + 4, $ff, $d2, TRAINER | $4, LASS + $C8, $b - db SPRITE_GIRL, $3 + 4, $16 + 4, $fe, $1, $5 ; person - db SPRITE_FAT_BALD_GUY, $e + 4, $0 + 4, $ff, $ff, $6 ; person - db SPRITE_LITTLE_GIRL, $b + 4, $2 + 4, $ff, $d0, $7 ; person - db SPRITE_CLEFAIRY, $b + 4, $3 + 4, $ff, $d0, $8 ; person - db SPRITE_GIRL, $d + 4, $a + 4, $ff, $d3, $9 ; person - db SPRITE_BALL, $f + 4, $c + 4, $ff, $ff, ITEM | $a, TM_08 - db SPRITE_GENTLEMAN, $d + 4, $15 + 4, $fe, $2, $b ; person + db $b ; objects + object SPRITE_GENTLEMAN, $2, $3, STAY, LEFT, $1, OPP_GENTLEMAN, $1 + object SPRITE_GENTLEMAN, $b, $4, STAY, UP, $2, OPP_GENTLEMAN, $2 + object SPRITE_BUG_CATCHER, $b, $e, STAY, UP, $3, OPP_YOUNGSTER, $8 + object SPRITE_LASS, $d, $b, STAY, LEFT, $4, OPP_LASS, $b + object SPRITE_GIRL, $16, $3, WALK, $1, $5 ; person + object SPRITE_FAT_BALD_GUY, $0, $e, STAY, NONE, $6 ; person + object SPRITE_LITTLE_GIRL, $2, $b, STAY, DOWN, $7 ; person + object SPRITE_CLEFAIRY, $3, $b, STAY, DOWN, $8 ; person + object SPRITE_GIRL, $a, $d, STAY, RIGHT, $9 ; person + object SPRITE_BALL, $c, $f, STAY, NONE, $a, TM_08 + object SPRITE_GENTLEMAN, $15, $d, WALK, $2, $b ; person ; warp-to EVENT_DISP SS_ANNE_8_WIDTH, $0, $0 ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index a621ad9f..7fddc058 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -17,20 +17,20 @@ SSAnne9Object: ; 0x61c8d (size=188) db $0 ; signs - db $d ; people - db SPRITE_GENTLEMAN, $2 + 4, $a + 4, $ff, $d3, TRAINER | $1, GENTLEMAN + $C8, $3 - db SPRITE_FISHER2, $4 + 4, $d + 4, $ff, $d2, TRAINER | $2, FISHER + $C8, $1 - db SPRITE_GENTLEMAN, $e + 4, $0 + 4, $ff, $d3, TRAINER | $3, GENTLEMAN + $C8, $5 - db SPRITE_LASS, $b + 4, $2 + 4, $ff, $d0, TRAINER | $4, LASS + $C8, $c - db SPRITE_GENTLEMAN, $2 + 4, $1 + 4, $ff, $d0, $5 ; person - db SPRITE_BALL, $1 + 4, $c + 4, $ff, $ff, ITEM | $6, MAX_ETHER - db SPRITE_GENTLEMAN, $2 + 4, $15 + 4, $ff, $d0, $7 ; person - db SPRITE_OLD_PERSON, $1 + 4, $16 + 4, $ff, $d0, $8 ; person - db SPRITE_BALL, $c + 4, $0 + 4, $ff, $ff, ITEM | $9, RARE_CANDY - db SPRITE_GENTLEMAN, $c + 4, $c + 4, $ff, $d0, $a ; person - db SPRITE_YOUNG_BOY, $e + 4, $b + 4, $ff, $ff, $b ; person - db SPRITE_BRUNETTE_GIRL, $c + 4, $16 + 4, $ff, $d2, $c ; person - db SPRITE_FOULARD_WOMAN, $c + 4, $14 + 4, $ff, $d3, $d ; person + db $d ; objects + object SPRITE_GENTLEMAN, $a, $2, STAY, RIGHT, $1, OPP_GENTLEMAN, $3 + object SPRITE_FISHER2, $d, $4, STAY, LEFT, $2, OPP_FISHER, $1 + object SPRITE_GENTLEMAN, $0, $e, STAY, RIGHT, $3, OPP_GENTLEMAN, $5 + object SPRITE_LASS, $2, $b, STAY, DOWN, $4, OPP_LASS, $c + object SPRITE_GENTLEMAN, $1, $2, STAY, DOWN, $5 ; person + object SPRITE_BALL, $c, $1, STAY, NONE, $6, MAX_ETHER + object SPRITE_GENTLEMAN, $15, $2, STAY, DOWN, $7 ; person + object SPRITE_OLD_PERSON, $16, $1, STAY, DOWN, $8 ; person + object SPRITE_BALL, $0, $c, STAY, NONE, $9, RARE_CANDY + object SPRITE_GENTLEMAN, $c, $c, STAY, DOWN, $a ; person + object SPRITE_YOUNG_BOY, $b, $e, STAY, NONE, $b ; person + object SPRITE_BRUNETTE_GIRL, $16, $c, STAY, LEFT, $c ; person + object SPRITE_FOULARD_WOMAN, $14, $c, STAY, RIGHT, $d ; person ; warp-to EVENT_DISP SS_ANNE_9_WIDTH, $5, $2 ; SS_ANNE_2 diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm new file mode 100644 index 00000000..57a3eee5 --- /dev/null +++ b/data/mapObjects/tradecenter.asm @@ -0,0 +1,9 @@ +TradeCenterObject: ; 0x4fd53 (size=10) + db $e ; border block + + db $0 ; warps + + db $0 ; signs + + db $1 ; objects + object SPRITE_RED, $2, $2, STAY, $0, $1 ; person diff --git a/data/mapObjects/tradecenterm.asm b/data/mapObjects/tradecenterm.asm deleted file mode 100755 index 104b9c0b..00000000 --- a/data/mapObjects/tradecenterm.asm +++ /dev/null @@ -1,9 +0,0 @@ -TradeCenterMObject: ; 0x4fd87 (size=10) - db $e ; border block - - db $0 ; warps - - db $0 ; signs - - db $1 ; people - db SPRITE_RED, $2 + 4, $2 + 4, $ff, $0, $1 ; person diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm index f782636c..a2f18179 100755 --- a/data/mapObjects/undergroundpathentranceroute5.asm +++ b/data/mapObjects/undergroundpathentranceroute5.asm @@ -8,8 +8,8 @@ UndergroundPathEntranceRoute5Object: ; 0x5d6c1 (size=34) db $0 ; signs - db $1 ; people - db SPRITE_LITTLE_GIRL, $3 + 4, $2 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_LITTLE_GIRL, $2, $3, STAY, NONE, $1 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm index 624381a9..834263b5 100755 --- a/data/mapObjects/undergroundpathentranceroute6.asm +++ b/data/mapObjects/undergroundpathentranceroute6.asm @@ -8,8 +8,8 @@ UndergroundPathEntranceRoute6Object: ; 0x5d6fe (size=34) db $0 ; signs - db $1 ; people - db SPRITE_GIRL, $3 + 4, $2 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_GIRL, $2, $3, STAY, NONE, $1 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm index d0e51c8a..909ff4a0 100755 --- a/data/mapObjects/undergroundpathentranceroute7.asm +++ b/data/mapObjects/undergroundpathentranceroute7.asm @@ -8,8 +8,8 @@ UndergroundPathEntranceRoute7Object: ; 0x5d73b (size=34) db $0 ; signs - db $1 ; people - db SPRITE_FAT_BALD_GUY, $4 + 4, $2 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_FAT_BALD_GUY, $2, $4, STAY, NONE, $1 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm index 53972ce9..707a0e0e 100755 --- a/data/mapObjects/undergroundpathentranceroute7copy.asm +++ b/data/mapObjects/undergroundpathentranceroute7copy.asm @@ -8,9 +8,9 @@ UndergroundPathEntranceRoute7CopyObject: ; 5d787 (17:5787) db $0 ; signs - db $2 ; people - db SPRITE_GIRL, $2 + 4, $3 + 4, $ff, $ff, $1 ; person - db SPRITE_FAT_BALD_GUY, $4 + 4, $2 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_GIRL, $3, $2, STAY, NONE, $1 ; person + object SPRITE_FAT_BALD_GUY, $2, $4, STAY, NONE, $2 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm index a59e017b..9a1d9d37 100755 --- a/data/mapObjects/undergroundpathentranceroute8.asm +++ b/data/mapObjects/undergroundpathentranceroute8.asm @@ -8,8 +8,8 @@ UndergroundPathEntranceRoute8Object: ; 0x1e298 (size=34) db $0 ; signs - db $1 ; people - db SPRITE_GIRL, $4 + 4, $3 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_GIRL, $3, $4, STAY, NONE, $1 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm index 7dac9b95..d9ae7499 100755 --- a/data/mapObjects/undergroundpathns.asm +++ b/data/mapObjects/undergroundpathns.asm @@ -7,7 +7,7 @@ UndergroundPathNSObject: ; 0x61f2a (size=20) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP UNDERGROUND_PATH_NS_WIDTH, $4, $5 ; PATH_ENTRANCE_ROUTE_5 diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm index ad3c51f7..303f60b9 100755 --- a/data/mapObjects/undergroundpathwe.asm +++ b/data/mapObjects/undergroundpathwe.asm @@ -7,7 +7,7 @@ UndergroundPathWEObject: ; 0x61f4e (size=20) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP UNDERGROUND_PATH_WE_WIDTH, $5, $2 ; PATH_ENTRANCE_ROUTE_7 diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index e5dbe1c3..c55711b4 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -14,10 +14,10 @@ UnknownDungeon1Object: ; 0x74d15 (size=97) db $0 ; signs - db $3 ; people - db SPRITE_BALL, $d + 4, $7 + 4, $ff, $ff, ITEM | $1, FULL_RESTORE - db SPRITE_BALL, $3 + 4, $13 + 4, $ff, $ff, ITEM | $2, MAX_ELIXER - db SPRITE_BALL, $0 + 4, $5 + 4, $ff, $ff, ITEM | $3, NUGGET + db $3 ; objects + object SPRITE_BALL, $7, $d, STAY, NONE, $1, FULL_RESTORE + object SPRITE_BALL, $13, $3, STAY, NONE, $2, MAX_ELIXER + object SPRITE_BALL, $5, $0, STAY, NONE, $3, NUGGET ; warp-to EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18 diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index 997198b5..e5ebca56 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -11,10 +11,10 @@ UnknownDungeon2Object: ; 0x45e14 (size=73) db $0 ; signs - db $3 ; people - db SPRITE_BALL, $9 + 4, $1d + 4, $ff, $ff, ITEM | $1, PP_UP - db SPRITE_BALL, $f + 4, $4 + 4, $ff, $ff, ITEM | $2, ULTRA_BALL - db SPRITE_BALL, $6 + 4, $d + 4, $ff, $ff, ITEM | $3, FULL_RESTORE + db $3 ; objects + object SPRITE_BALL, $1d, $9, STAY, NONE, $1, PP_UP + object SPRITE_BALL, $4, $f, STAY, NONE, $2, ULTRA_BALL + object SPRITE_BALL, $d, $6, STAY, NONE, $3, FULL_RESTORE ; warp-to EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index a3fba264..8b733e6b 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -6,10 +6,10 @@ UnknownDungeon3Object: ; 0x45f36 (size=34) db $0 ; signs - db $3 ; people - db SPRITE_SLOWBRO, $d + 4, $1b + 4, $ff, $d0, TRAINER | $1, MEWTWO, 70 - db SPRITE_BALL, $9 + 4, $10 + 4, $ff, $ff, ITEM | $2, ULTRA_BALL - db SPRITE_BALL, $1 + 4, $12 + 4, $ff, $ff, ITEM | $3, MAX_REVIVE + db $3 ; objects + object SPRITE_SLOWBRO, $1b, $d, STAY, DOWN, $1, MEWTWO, 70 + object SPRITE_BALL, $10, $9, STAY, NONE, $2, ULTRA_BALL + object SPRITE_BALL, $12, $1, STAY, NONE, $3, MAX_REVIVE ; warp-to EVENT_DISP UNKNOWN_DUNGEON_3_WIDTH, $6, $3 ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index a7a6a6b4..c5602be1 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -21,13 +21,13 @@ VermilionCityObject: ; 0x189ba (size=133) db $13, $7, $c ; VermilionCityText12 db $f, $1d, $d ; VermilionCityText13 - db $6 ; people - db SPRITE_FOULARD_WOMAN, $7 + 4, $13 + 4, $fe, $2, $1 ; person - db SPRITE_GAMBLER, $6 + 4, $e + 4, $ff, $ff, $2 ; person - db SPRITE_SAILOR, $1e + 4, $13 + 4, $ff, $d1, $3 ; person - db SPRITE_GAMBLER, $7 + 4, $1e + 4, $ff, $ff, $4 ; person - db SPRITE_SLOWBRO, $9 + 4, $1d + 4, $fe, $1, $5 ; person - db SPRITE_SAILOR, $1b + 4, $19 + 4, $fe, $2, $6 ; person + db $6 ; objects + object SPRITE_FOULARD_WOMAN, $13, $7, WALK, $2, $1 ; person + object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person + object SPRITE_SAILOR, $13, $1e, STAY, UP, $3 ; person + object SPRITE_GAMBLER, $1e, $7, STAY, NONE, $4 ; person + object SPRITE_SLOWBRO, $1d, $9, WALK, $1, $5 ; person + object SPRITE_SAILOR, $19, $1b, WALK, $2, $6 ; person ; warp-to EVENT_DISP VERMILION_CITY_WIDTH, $3, $b ; VERMILION_POKECENTER diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm index 4c49e966..b8aa659d 100755 --- a/data/mapObjects/vermiliondock.asm +++ b/data/mapObjects/vermiliondock.asm @@ -7,7 +7,7 @@ VermilionDockObject: ; 0x1dcc6 (size=20) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP VERMILION_DOCK_WIDTH, $0, $e diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index 30787405..830af62c 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -7,12 +7,12 @@ VermilionGymObject: ; 0x5cbfe (size=58) db $0 ; signs - db $5 ; people - db SPRITE_ROCKER, $1 + 4, $5 + 4, $ff, $d0, TRAINER | $1, LT__SURGE + $C8, $1 - db SPRITE_GENTLEMAN, $6 + 4, $9 + 4, $ff, $d2, TRAINER | $2, GENTLEMAN + $C8, $3 - db SPRITE_BLACK_HAIR_BOY_2, $8 + 4, $3 + 4, $ff, $d2, TRAINER | $3, ROCKER + $C8, $1 - db SPRITE_SAILOR, $a + 4, $0 + 4, $ff, $d3, TRAINER | $4, SAILOR + $C8, $8 - db SPRITE_GYM_HELPER, $e + 4, $4 + 4, $ff, $d0, $5 ; person + db $5 ; objects + object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, OPP_LT__SURGE, $1 + object SPRITE_GENTLEMAN, $9, $6, STAY, LEFT, $2, OPP_GENTLEMAN, $3 + object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, LEFT, $3, OPP_ROCKER, $1 + object SPRITE_SAILOR, $0, $a, STAY, RIGHT, $4, OPP_SAILOR, $8 + object SPRITE_GYM_HELPER, $4, $e, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP VERMILION_GYM_WIDTH, $11, $4 diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm index e6104944..952661cc 100755 --- a/data/mapObjects/vermilionhouse1.asm +++ b/data/mapObjects/vermilionhouse1.asm @@ -7,10 +7,10 @@ VermilionHouse1Object: ; 0x1db20 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_BUG_CATCHER, $3 + 4, $5 + 4, $ff, $d2, $1 ; person - db SPRITE_BIRD, $5 + 4, $3 + 4, $fe, $2, $2 ; person - db SPRITE_PAPER_SHEET, $3 + 4, $4 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_BUG_CATCHER, $5, $3, STAY, LEFT, $1 ; person + object SPRITE_BIRD, $3, $5, WALK, $2, $2 ; person + object SPRITE_PAPER_SHEET, $4, $3, STAY, NONE, $3 ; person ; warp-to EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm index aab505cb..03c3c1a2 100755 --- a/data/mapObjects/vermilionhouse2.asm +++ b/data/mapObjects/vermilionhouse2.asm @@ -7,8 +7,8 @@ VermilionHouse2Object: ; 0x560cf (size=26) db $0 ; signs - db $1 ; people - db SPRITE_FISHER, $4 + 4, $2 + 4, $ff, $d3, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $2, $4, STAY, RIGHT, $1 ; person ; warp-to EVENT_DISP VERMILION_HOUSE_2_WIDTH, $7, $2 diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm index b23a741b..ab955a20 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/vermilionhouse3.asm @@ -7,8 +7,8 @@ VermilionHouse3Object: ; 0x19c25 (size=26) db $0 ; signs - db $1 ; people - db SPRITE_LITTLE_GIRL, $5 + 4, $3 + 4, $ff, $d1, $1 ; person + db $1 ; objects + object SPRITE_LITTLE_GIRL, $3, $5, STAY, UP, $1 ; person ; warp-to EVENT_DISP VERMILION_HOUSE_3_WIDTH, $7, $2 diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm index f57adde8..56c52944 100755 --- a/data/mapObjects/vermilionmart.asm +++ b/data/mapObjects/vermilionmart.asm @@ -7,10 +7,10 @@ VermilionMartObject: ; 0x5c9f4 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_BLACK_HAIR_BOY_1, $6 + 4, $5 + 4, $ff, $ff, $2 ; person - db SPRITE_LASS, $3 + 4, $3 + 4, $fe, $2, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_BLACK_HAIR_BOY_1, $5, $6, STAY, NONE, $2 ; person + object SPRITE_LASS, $3, $3, WALK, $2, $3 ; person ; warp-to EVENT_DISP VERMILION_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm index 97b86520..e5d1d147 100755 --- a/data/mapObjects/vermilionpokecenter.asm +++ b/data/mapObjects/vermilionpokecenter.asm @@ -7,11 +7,11 @@ VermilionPokecenterObject: ; 0x5c9a9 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_FISHER, $5 + 4, $a + 4, $ff, $ff, $2 ; person - db SPRITE_SAILOR, $4 + 4, $5 + 4, $ff, $ff, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_FISHER, $a, $5, STAY, NONE, $2 ; person + object SPRITE_SAILOR, $5, $4, STAY, NONE, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP VERMILION_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index 96cb23bb..9e66e95b 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/victoryroad1.asm @@ -8,14 +8,14 @@ VictoryRoad1Object: ; 0x5dab8 (size=76) db $0 ; signs - db $7 ; people - db SPRITE_LASS, $5 + 4, $7 + 4, $ff, $d3, TRAINER | $1, COOLTRAINER_F + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_1, $2 + 4, $3 + 4, $ff, $d0, TRAINER | $2, COOLTRAINER_M + $C8, $5 - db SPRITE_BALL, $0 + 4, $b + 4, $ff, $ff, ITEM | $3, TM_43 - db SPRITE_BALL, $2 + 4, $9 + 4, $ff, $ff, ITEM | $4, RARE_CANDY - db SPRITE_BOULDER, $f + 4, $5 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $5 ; person - db SPRITE_BOULDER, $2 + 4, $e + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $6 ; person - db SPRITE_BOULDER, $a + 4, $2 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $7 ; person + db $7 ; objects + object SPRITE_LASS, $7, $5, STAY, RIGHT, $1, OPP_COOLTRAINER_F, $5 + object SPRITE_BLACK_HAIR_BOY_1, $3, $2, STAY, DOWN, $2, OPP_COOLTRAINER_M, $5 + object SPRITE_BALL, $b, $0, STAY, NONE, $3, TM_43 + object SPRITE_BALL, $9, $2, STAY, NONE, $4, RARE_CANDY + object SPRITE_BOULDER, $5, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $5 ; person + object SPRITE_BOULDER, $e, $2, STAY, BOULDER_MOVEMENT_BYTE_2, $6 ; person + object SPRITE_BOULDER, $2, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person ; warp-to EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $8 diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 39ec23c5..29c0f303 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -12,20 +12,20 @@ VictoryRoad2Object: ; 0x51915 (size=154) db $0 ; signs - db $d ; people - db SPRITE_HIKER, $9 + 4, $c + 4, $ff, $d2, TRAINER | $1, BLACKBELT + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_2, $d + 4, $15 + 4, $ff, $d2, TRAINER | $2, JUGGLER + $C8, $2 - db SPRITE_BLACK_HAIR_BOY_1, $8 + 4, $13 + 4, $ff, $d0, TRAINER | $3, TAMER + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $4 + 4, $ff, $d0, TRAINER | $4, POKEMANIAC + $C8, $6 - db SPRITE_BLACK_HAIR_BOY_2, $3 + 4, $1a + 4, $ff, $d2, TRAINER | $5, JUGGLER + $C8, $5 - db SPRITE_BIRD, $5 + 4, $b + 4, $ff, $d1, TRAINER | $6, MOLTRES, 50 - db SPRITE_BALL, $5 + 4, $1b + 4, $ff, $ff, ITEM | $7, TM_17 - db SPRITE_BALL, $9 + 4, $12 + 4, $ff, $ff, ITEM | $8, FULL_HEAL - db SPRITE_BALL, $b + 4, $9 + 4, $ff, $ff, ITEM | $9, TM_05 - db SPRITE_BALL, $0 + 4, $b + 4, $ff, $ff, ITEM | $a, GUARD_SPEC_ - db SPRITE_BOULDER, $e + 4, $4 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $b ; person - db SPRITE_BOULDER, $5 + 4, $5 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $c ; person - db SPRITE_BOULDER, $10 + 4, $17 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $d ; person + db $d ; objects + object SPRITE_HIKER, $c, $9, STAY, LEFT, $1, OPP_BLACKBELT, $9 + object SPRITE_BLACK_HAIR_BOY_2, $15, $d, STAY, LEFT, $2, OPP_JUGGLER, $2 + object SPRITE_BLACK_HAIR_BOY_1, $13, $8, STAY, DOWN, $3, OPP_TAMER, $5 + object SPRITE_BLACK_HAIR_BOY_2, $4, $2, STAY, DOWN, $4, OPP_POKEMANIAC, $6 + object SPRITE_BLACK_HAIR_BOY_2, $1a, $3, STAY, LEFT, $5, OPP_JUGGLER, $5 + object SPRITE_BIRD, $b, $5, STAY, UP, $6, MOLTRES, 50 + object SPRITE_BALL, $1b, $5, STAY, NONE, $7, TM_17 + object SPRITE_BALL, $12, $9, STAY, NONE, $8, FULL_HEAL + object SPRITE_BALL, $9, $b, STAY, NONE, $9, TM_05 + object SPRITE_BALL, $b, $0, STAY, NONE, $a, GUARD_SPEC_ + object SPRITE_BOULDER, $4, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $b ; person + object SPRITE_BOULDER, $5, $5, STAY, BOULDER_MOVEMENT_BYTE_2, $c ; person + object SPRITE_BOULDER, $17, $10, STAY, BOULDER_MOVEMENT_BYTE_2, $d ; person ; warp-to EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $0 ; VICTORY_ROAD_1 diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index 998a189d..19a06c65 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/victoryroad3.asm @@ -9,17 +9,17 @@ VictoryRoad3Object: ; 0x44acd (size=106) db $0 ; signs - db $a ; people - db SPRITE_BLACK_HAIR_BOY_1, $5 + 4, $1c + 4, $ff, $d2, TRAINER | $1, COOLTRAINER_M + $C8, $2 - db SPRITE_LASS, $d + 4, $7 + 4, $ff, $d3, TRAINER | $2, COOLTRAINER_F + $C8, $2 - db SPRITE_BLACK_HAIR_BOY_1, $e + 4, $6 + 4, $ff, $d2, TRAINER | $3, COOLTRAINER_M + $C8, $3 - db SPRITE_LASS, $3 + 4, $d + 4, $ff, $d3, TRAINER | $4, COOLTRAINER_F + $C8, $3 - db SPRITE_BALL, $5 + 4, $1a + 4, $ff, $ff, ITEM | $5, MAX_REVIVE - db SPRITE_BALL, $7 + 4, $7 + 4, $ff, $ff, ITEM | $6, TM_47 - db SPRITE_BOULDER, $3 + 4, $16 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $7 ; person - db SPRITE_BOULDER, $c + 4, $d + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $8 ; person - db SPRITE_BOULDER, $a + 4, $18 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $9 ; person - db SPRITE_BOULDER, $f + 4, $16 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $a ; person + db $a ; objects + object SPRITE_BLACK_HAIR_BOY_1, $1c, $5, STAY, LEFT, $1, OPP_COOLTRAINER_M, $2 + object SPRITE_LASS, $7, $d, STAY, RIGHT, $2, OPP_COOLTRAINER_F, $2 + object SPRITE_BLACK_HAIR_BOY_1, $6, $e, STAY, LEFT, $3, OPP_COOLTRAINER_M, $3 + object SPRITE_LASS, $d, $3, STAY, RIGHT, $4, OPP_COOLTRAINER_F, $3 + object SPRITE_BALL, $1a, $5, STAY, NONE, $5, MAX_REVIVE + object SPRITE_BALL, $7, $7, STAY, NONE, $6, TM_47 + object SPRITE_BOULDER, $16, $3, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person + object SPRITE_BOULDER, $d, $c, STAY, BOULDER_MOVEMENT_BYTE_2, $8 ; person + object SPRITE_BOULDER, $18, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $9 ; person + object SPRITE_BOULDER, $16, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $a ; person ; warp-to EVENT_DISP VICTORY_ROAD_3_WIDTH, $7, $17 ; VICTORY_ROAD_2 diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm index 37cb42e2..a2d2815f 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/viridiancity.asm @@ -16,14 +16,14 @@ ViridianCityObject: ; 0x18384 (size=104) db $19, $18, $c ; PokeCenterSignText db $7, $1b, $d ; ViridianCityText13 - db $7 ; people - db SPRITE_BUG_CATCHER, $14 + 4, $d + 4, $fe, $0, $1 ; person - db SPRITE_GAMBLER, $8 + 4, $1e + 4, $ff, $ff, $2 ; person - db SPRITE_BUG_CATCHER, $19 + 4, $1e + 4, $fe, $0, $3 ; person - db SPRITE_GIRL, $9 + 4, $11 + 4, $ff, $d3, $4 ; person - db SPRITE_LYING_OLD_MAN, $9 + 4, $12 + 4, $ff, $ff, $5 ; person - db SPRITE_FISHER2, $17 + 4, $6 + 4, $ff, $d0, $6 ; person - db SPRITE_GAMBLER, $5 + 4, $11 + 4, $fe, $2, $7 ; person + db $7 ; objects + object SPRITE_BUG_CATCHER, $d, $14, WALK, $0, $1 ; person + object SPRITE_GAMBLER, $1e, $8, STAY, NONE, $2 ; person + object SPRITE_BUG_CATCHER, $1e, $19, WALK, $0, $3 ; person + object SPRITE_GIRL, $11, $9, STAY, RIGHT, $4 ; person + object SPRITE_LYING_OLD_MAN, $12, $9, STAY, NONE, $5 ; person + object SPRITE_FISHER2, $6, $17, STAY, DOWN, $6 ; person + object SPRITE_GAMBLER, $11, $5, WALK, $2, $7 ; person ; warp-to EVENT_DISP VIRIDIAN_CITY_WIDTH, $19, $17 ; VIRIDIAN_POKECENTER diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 74f64dd5..a1d52cfe 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -17,15 +17,15 @@ ViridianForestObject: ; 0x611da (size=127) db $2d, $12, $d ; ViridianForestText13 db $1, $2, $e ; ViridianForestText14 - db $8 ; people - db SPRITE_BUG_CATCHER, $2b + 4, $10 + 4, $ff, $ff, $1 ; person - db SPRITE_BUG_CATCHER, $21 + 4, $1e + 4, $ff, $d2, TRAINER | $2, BUG_CATCHER + $C8, $1 - db SPRITE_BUG_CATCHER, $13 + 4, $1e + 4, $ff, $d2, TRAINER | $3, BUG_CATCHER + $C8, $2 - db SPRITE_BUG_CATCHER, $12 + 4, $2 + 4, $ff, $d2, TRAINER | $4, BUG_CATCHER + $C8, $3 - db SPRITE_BALL, $b + 4, $19 + 4, $ff, $ff, ITEM | $5, ANTIDOTE - db SPRITE_BALL, $1d + 4, $c + 4, $ff, $ff, ITEM | $6, POTION - db SPRITE_BALL, $1f + 4, $1 + 4, $ff, $ff, ITEM | $7, POKE_BALL - db SPRITE_BUG_CATCHER, $28 + 4, $1b + 4, $ff, $ff, $8 ; person + db $8 ; objects + object SPRITE_BUG_CATCHER, $10, $2b, STAY, NONE, $1 ; person + object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, OPP_BUG_CATCHER, $1 + object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, OPP_BUG_CATCHER, $2 + object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, OPP_BUG_CATCHER, $3 + object SPRITE_BALL, $19, $b, STAY, NONE, $5, ANTIDOTE + object SPRITE_BALL, $c, $1d, STAY, NONE, $6, POTION + object SPRITE_BALL, $1, $1f, STAY, NONE, $7, POKE_BALL + object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $8 ; person ; warp-to EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $1 ; VIRIDIAN_FOREST_EXIT diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index ce0aaae5..fc676a6d 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -9,9 +9,9 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48) db $0 ; signs - db $2 ; people - db SPRITE_GIRL, $4 + 4, $8 + 4, $ff, $d2, $1 ; person - db SPRITE_LITTLE_GIRL, $4 + 4, $2 + 4, $fe, $1, $2 ; person + db $2 ; objects + object SPRITE_GIRL, $8, $4, STAY, LEFT, $1 ; person + object SPRITE_LITTLE_GIRL, $2, $4, WALK, $1, $2 ; person ; warp-to EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $4 ; VIRIDIAN_FOREST diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm index a96d5270..be8b65ea 100755 --- a/data/mapObjects/viridianforestexit.asm +++ b/data/mapObjects/viridianforestexit.asm @@ -9,9 +9,9 @@ ViridianForestExitObject: ; 0x5d598 (size=48) db $0 ; signs - db $2 ; people - db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $3 + 4, $ff, $ff, $1 ; person - db SPRITE_OLD_PERSON, $5 + 4, $2 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $3, $2, STAY, NONE, $1 ; person + object SPRITE_OLD_PERSON, $2, $5, STAY, NONE, $2 ; person ; warp-to EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $4 diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index 5cc1c086..468b9022 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -7,18 +7,18 @@ ViridianGymObject: ; 0x74bde (size=105) db $0 ; signs - db $b ; people - db SPRITE_GIOVANNI, $1 + 4, $2 + 4, $ff, $d0, TRAINER | $1, GIOVANNI + $C8, $3 - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $c + 4, $ff, $d0, TRAINER | $2, COOLTRAINER_M + $C8, $9 - db SPRITE_HIKER, $b + 4, $b + 4, $ff, $d1, TRAINER | $3, BLACKBELT + $C8, $6 - db SPRITE_ROCKER, $7 + 4, $a + 4, $ff, $d0, TRAINER | $4, TAMER + $C8, $3 - db SPRITE_HIKER, $7 + 4, $3 + 4, $ff, $d2, TRAINER | $5, BLACKBELT + $C8, $7 - db SPRITE_BLACK_HAIR_BOY_1, $5 + 4, $d + 4, $ff, $d3, TRAINER | $6, COOLTRAINER_M + $C8, $a - db SPRITE_HIKER, $1 + 4, $a + 4, $ff, $d0, TRAINER | $7, BLACKBELT + $C8, $8 - db SPRITE_ROCKER, $10 + 4, $2 + 4, $ff, $d3, TRAINER | $8, TAMER + $C8, $4 - db SPRITE_BLACK_HAIR_BOY_1, $5 + 4, $6 + 4, $ff, $d0, TRAINER | $9, COOLTRAINER_M + $C8, $1 - db SPRITE_GYM_HELPER, $f + 4, $10 + 4, $ff, $d0, $a ; person - db SPRITE_BALL, $9 + 4, $10 + 4, $ff, $ff, ITEM | $b, REVIVE + db $b ; objects + object SPRITE_GIOVANNI, $2, $1, STAY, DOWN, $1, OPP_GIOVANNI, $3 + object SPRITE_BLACK_HAIR_BOY_1, $c, $7, STAY, DOWN, $2, OPP_COOLTRAINER_M, $9 + object SPRITE_HIKER, $b, $b, STAY, UP, $3, OPP_BLACKBELT, $6 + object SPRITE_ROCKER, $a, $7, STAY, DOWN, $4, OPP_TAMER, $3 + object SPRITE_HIKER, $3, $7, STAY, LEFT, $5, OPP_BLACKBELT, $7 + object SPRITE_BLACK_HAIR_BOY_1, $d, $5, STAY, RIGHT, $6, OPP_COOLTRAINER_M, $a + object SPRITE_HIKER, $a, $1, STAY, DOWN, $7, OPP_BLACKBELT, $8 + object SPRITE_ROCKER, $2, $10, STAY, RIGHT, $8, OPP_TAMER, $4 + object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9, OPP_COOLTRAINER_M, $1 + object SPRITE_GYM_HELPER, $10, $f, STAY, DOWN, $a ; person + object SPRITE_BALL, $10, $9, STAY, NONE, $b, REVIVE ; warp-to EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $10 diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm index dd2d6069..ba45adac 100755 --- a/data/mapObjects/viridianhouse.asm +++ b/data/mapObjects/viridianhouse.asm @@ -7,11 +7,11 @@ ViridianHouseObject: ; 0x1d5bb (size=44) db $0 ; signs - db $4 ; people - db SPRITE_BALDING_GUY, $3 + 4, $5 + 4, $ff, $ff, $1 ; person - db SPRITE_LITTLE_GIRL, $4 + 4, $1 + 4, $fe, $1, $2 ; person - db SPRITE_BIRD, $5 + 4, $5 + 4, $fe, $2, $3 ; person - db SPRITE_CLIPBOARD, $0 + 4, $4 + 4, $ff, $ff, $4 ; person + db $4 ; objects + object SPRITE_BALDING_GUY, $5, $3, STAY, NONE, $1 ; person + object SPRITE_LITTLE_GIRL, $1, $4, WALK, $1, $2 ; person + object SPRITE_BIRD, $5, $5, WALK, $2, $3 ; person + object SPRITE_CLIPBOARD, $4, $0, STAY, NONE, $4 ; person ; warp-to EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm index b1b367c7..ed2642f9 100755 --- a/data/mapObjects/viridianmart.asm +++ b/data/mapObjects/viridianmart.asm @@ -7,10 +7,10 @@ ViridianMartObject: ; 0x1d50a (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_BUG_CATCHER, $5 + 4, $5 + 4, $fe, $1, $2 ; person - db SPRITE_BLACK_HAIR_BOY_1, $3 + 4, $3 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_BUG_CATCHER, $5, $5, WALK, $1, $2 ; person + object SPRITE_BLACK_HAIR_BOY_1, $3, $3, STAY, NONE, $3 ; person ; warp-to EVENT_DISP VIRIDIAN_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 6631a814..652efb97 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -7,11 +7,11 @@ ViridianPokecenterObject: ; 0x44277 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_GENTLEMAN, $5 + 4, $a + 4, $fe, $1, $2 ; person - db SPRITE_BLACK_HAIR_BOY_1, $3 + 4, $4 + 4, $ff, $ff, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_GENTLEMAN, $a, $5, WALK, $1, $2 ; person + object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, NONE, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $3 diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm index 92297b6d..7e434dce 100755 --- a/data/mon_party_sprites.asm +++ b/data/mon_party_sprites.asm @@ -13,8 +13,8 @@ MonPartyData: ; 7190d (1c:590d) dn SPRITE_SNAKE, SPRITE_SNAKE ;Ekans/Arbok dn SPRITE_FAIRY, SPRITE_FAIRY ;Pikachu/Raichu dn SPRITE_MON, SPRITE_MON ;Sandshrew/Sandslash - dn SPRITE_MON, SPRITE_MON ;Nidoran?/Nidorina - dn SPRITE_MON, SPRITE_MON ;Nidoqueen/Nidoran? + dn SPRITE_MON, SPRITE_MON ;NidoranF/Nidorina + dn SPRITE_MON, SPRITE_MON ;Nidoqueen/NidoranM dn SPRITE_MON, SPRITE_MON ;Nidorino/Nidoking dn SPRITE_FAIRY, SPRITE_FAIRY ;Clefairy/Clefable dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Vulpix/Ninetales diff --git a/data/moves.asm b/data/moves.asm index 22165b7d..44859681 100755 --- a/data/moves.asm +++ b/data/moves.asm @@ -11,6 +11,7 @@ move: macro endm move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 +MoveEnd: move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, NORMAL, 100, 25 move DOUBLESLAP, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 10 move COMET_PUNCH, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 85, 15 diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm index 37a39f1d..a0af4a44 100755 --- a/data/sgb_packets.asm +++ b/data/sgb_packets.asm @@ -50,6 +50,7 @@ DATA_SND: MACRO db \2 ; bank db \3 ; length (1-11) ENDM + BlkPacket_WholeScreen: ; 72611 (1c:6611) db $21 db $1,$3,$0,$0,$0,$13,$11,$0 @@ -170,7 +171,6 @@ MaskEnFreezePacket: ; 72881 (1c:6881) MaskEnCancelPacket: ; 72891 (1c:6891) MASK_EN 0 - ; These are DATA_SND packets containing SNES code. ; This set of packets is found in several Japanese SGB-compatible titles. ; It appears to be part of NCL's SGB devkit. diff --git a/data/special_warps.asm b/data/special_warps.asm index 480bac89..b8baccfb 100755 --- a/data/special_warps.asm +++ b/data/special_warps.asm @@ -39,26 +39,26 @@ FirstMapSpec: ; 6420 (1:6420) FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3 db REDS_HOUSE_2 -BattleCenterSpec1: ; 6428 (1:6428) - db BATTLE_CENTER - FLYWARP_DATA BATTLE_CENTER_WIDTH,4,3 - db CLUB - -BattleCenterSpec2: ; 6430 (1:6430) - db BATTLE_CENTER - FLYWARP_DATA BATTLE_CENTER_WIDTH,4,6 - db CLUB - -TradeCenterSpec1: ; 6438 (1:6438) +TradeCenterSpec1: ; 6428 (1:6428) db TRADE_CENTER FLYWARP_DATA TRADE_CENTER_WIDTH,4,3 db CLUB -TradeCenterSpec2: ; 6440 (1:6440) +TradeCenterSpec2: ; 6430 (1:6430) db TRADE_CENTER FLYWARP_DATA TRADE_CENTER_WIDTH,4,6 db CLUB +ColosseumSpec1: ; 6438 (1:6438) + db COLOSSEUM + FLYWARP_DATA COLOSSEUM_WIDTH,4,3 + db CLUB + +ColosseumSpec2: ; 6440 (1:6440) + db COLOSSEUM + FLYWARP_DATA COLOSSEUM_WIDTH,4,6 + db CLUB + FlyWarpDataPtr: ; 6448 (1:6448) db PALLET_TOWN, 0 dw PalletTownFlyWarp diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm index 0362564f..bb0f31ff 100755 --- a/data/town_map_entries.asm +++ b/data/town_map_entries.asm @@ -38,64 +38,64 @@ ExternalMapEntries: ; 7139c (1c:539c) EMAP $B,$0,Route25Name InternalMapEntries: ; 7140b (1c:540b) - IMAP $29,$2,$B,PalletTownName - IMAP $2E,$2,$8,ViridianCityName - IMAP $33,$2,$6,Route2Name - IMAP $34,$2,$4,ViridianForestName - IMAP $3B,$2,$3,PewterCityName - IMAP $3E,$6,$2,MountMoonName - IMAP $44,$A,$2,CeruleanCityName - IMAP $45,$5,$2,Route4Name - IMAP $46,$A,$2,CeruleanCityName - IMAP $49,$A,$4,Route5Name - IMAP $4C,$A,$6,Route6Name - IMAP $4F,$9,$5,Route7Name - IMAP $51,$B,$5,Route8Name - IMAP $53,$E,$3,RockTunnelName - IMAP $54,$F,$4,PowerPlantName - IMAP $57,$D,$9,Route11Name - IMAP $58,$E,$7,Route12Name - IMAP $59,$C,$0,SeaCottageName - IMAP $5F,$A,$9,VermilionCityName - IMAP $69,$9,$A,SSAnneName - IMAP $6D,$0,$4,VictoryRoadName - IMAP $77,$0,$2,PokemonLeagueName - IMAP $78,$A,$5,UndergroundPathName - IMAP $79,$0,$2,PokemonLeagueName - IMAP $7A,$A,$5,UndergroundPathName - IMAP $8D,$7,$5,CeladonCityName - IMAP $8E,$E,$5,LavenderTownName - IMAP $95,$F,$5,PokemonTowerName - IMAP $98,$E,$5,LavenderTownName - IMAP $9C,$8,$D,FuchsiaCityName - IMAP $9D,$8,$C,SafariZoneName - IMAP $9F,$8,$D,FuchsiaCityName - IMAP $A3,$5,$F,SeafoamIslandsName - IMAP $A4,$A,$9,VermilionCityName - IMAP $A5,$8,$D,FuchsiaCityName - IMAP $A6,$2,$F,PokemonMansionName - IMAP $AE,$2,$F,CinnabarIslandName - IMAP $AF,$0,$2,IndigoPlateauName - IMAP $B8,$A,$5,SaffronCityName - IMAP $BA,$9,$D,Route15Name - IMAP $BD,$4,$5,Route16Name - IMAP $BE,$E,$A,Route12Name - IMAP $C0,$7,$D,Route18Name - IMAP $C1,$5,$F,SeafoamIslandsName - IMAP $C2,$0,$7,Route22Name - IMAP $C3,$0,$4,VictoryRoadName - IMAP $C4,$E,$7,Route12Name - IMAP $C5,$A,$9,VermilionCityName - IMAP $C6,$3,$4,DiglettsCaveName - IMAP $C7,$0,$4,VictoryRoadName - IMAP $CF,$7,$5,RocketHQName - IMAP $D6,$A,$5,SilphCoName - IMAP $D9,$2,$F,PokemonMansionName - IMAP $E2,$8,$C,SafariZoneName - IMAP $E5,$9,$1,CeruleanCaveName - IMAP $E6,$E,$5,LavenderTownName - IMAP $E7,$A,$2,CeruleanCityName - IMAP $E9,$E,$3,RockTunnelName - IMAP $ED,$A,$5,SilphCoName - IMAP $F8,$0,$2,PokemonLeagueName + IMAP OAKS_LAB, $2,$B,PalletTownName + IMAP VIRIDIAN_GYM, $2,$8,ViridianCityName + IMAP VIRIDIAN_FOREST_ENTRANCE, $2,$6,Route2Name + IMAP VIRIDIAN_FOREST, $2,$4,ViridianForestName + IMAP PEWTER_POKECENTER, $2,$3,PewterCityName + IMAP MT_MOON_3, $6,$2,MountMoonName + IMAP CERULEAN_MART, $A,$2,CeruleanCityName + IMAP MT_MOON_POKECENTER, $5,$2,Route4Name + IMAP TRASHED_HOUSE_COPY, $A,$2,CeruleanCityName + IMAP DAYCAREM, $A,$4,Route5Name + IMAP PATH_ENTRANCE_ROUTE_6_COPY,$A,$6,Route6Name + IMAP PATH_ENTRANCE_ROUTE_7_COPY,$9,$5,Route7Name + IMAP PATH_ENTRANCE_ROUTE_8, $B,$5,Route8Name + IMAP ROCK_TUNNEL_1, $E,$3,RockTunnelName + IMAP POWER_PLANT, $F,$4,PowerPlantName + IMAP ROUTE_11_GATE_2F, $D,$9,Route11Name + IMAP ROUTE_12_GATE_1F, $E,$7,Route12Name + IMAP BILLS_HOUSE, $C,$0,SeaCottageName + IMAP VERMILION_DOCK, $A,$9,VermilionCityName + IMAP SS_ANNE_10, $9,$A,SSAnneName + IMAP VICTORY_ROAD_1, $0,$4,VictoryRoadName + IMAP HALL_OF_FAME, $0,$2,PokemonLeagueName + IMAP UNDERGROUND_PATH_NS, $A,$5,UndergroundPathName + IMAP CHAMPIONS_ROOM, $0,$2,PokemonLeagueName + IMAP UNDERGROUND_PATH_WE, $A,$5,UndergroundPathName + IMAP CELADON_HOTEL, $7,$5,CeladonCityName + IMAP LAVENDER_POKECENTER, $E,$5,LavenderTownName + IMAP POKEMONTOWER_7, $F,$5,PokemonTowerName + IMAP LAVENDER_HOUSE_2, $E,$5,LavenderTownName + IMAP FUCHSIA_HOUSE_2, $8,$D,FuchsiaCityName + IMAP SAFARI_ZONE_ENTRANCE, $8,$C,SafariZoneName + IMAP FUCHSIA_MEETING_ROOM, $8,$D,FuchsiaCityName + IMAP SEAFOAM_ISLANDS_5, $5,$F,SeafoamIslandsName + IMAP VERMILION_HOUSE_2, $A,$9,VermilionCityName + IMAP FUCHSIA_HOUSE_3, $8,$D,FuchsiaCityName + IMAP MANSION_1, $2,$F,PokemonMansionName + IMAP CINNABAR_MART_COPY, $2,$F,CinnabarIslandName + IMAP INDIGO_PLATEAU_LOBBY, $0,$2,IndigoPlateauName + IMAP SAFFRON_HOUSE_2, $A,$5,SaffronCityName + IMAP ROUTE_15_GATE_2F, $9,$D,Route15Name + IMAP ROUTE_16_HOUSE, $4,$5,Route16Name + IMAP ROUTE_12_HOUSE, $E,$A,Route12Name + IMAP ROUTE_18_GATE_2F, $7,$D,Route18Name + IMAP SEAFOAM_ISLANDS_1, $5,$F,SeafoamIslandsName + IMAP ROUTE_22_GATE, $0,$7,Route22Name + IMAP VICTORY_ROAD_2, $0,$4,VictoryRoadName + IMAP ROUTE_12_GATE_2F, $E,$7,Route12Name + IMAP VERMILION_HOUSE_3, $A,$9,VermilionCityName + IMAP DIGLETTS_CAVE, $3,$4,DiglettsCaveName + IMAP VICTORY_ROAD_3, $0,$4,VictoryRoadName + IMAP UNUSED_MAP_CE, $7,$5,RocketHQName + IMAP SILPH_CO_8F, $A,$5,SilphCoName + IMAP MANSION_4, $2,$F,PokemonMansionName + IMAP SAFARI_ZONE_REST_HOUSE_4, $8,$C,SafariZoneName + IMAP UNKNOWN_DUNGEON_1, $9,$1,CeruleanCaveName + IMAP NAME_RATERS_HOUSE, $E,$5,LavenderTownName + IMAP CERULEAN_HOUSE_3, $A,$2,CeruleanCityName + IMAP ROCK_TUNNEL_2, $E,$3,RockTunnelName + IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName + IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName db $FF diff --git a/data/town_map_order.asm b/data/town_map_order.asm index 2713787c..b43ed010 100755 --- a/data/town_map_order.asm +++ b/data/town_map_order.asm @@ -46,3 +46,4 @@ TownMapOrder: ; 70f95 (1c:4f95) db VICTORY_ROAD_3 db INDIGO_PLATEAU db POWER_PLANT +TownMapOrderEnd: diff --git a/data/trainer_types.asm b/data/trainer_types.asm index eff6c212..52c7bd0b 100755 --- a/data/trainer_types.asm +++ b/data/trainer_types.asm @@ -1,17 +1,18 @@ FemaleTrainerList:: ; 33c3 (0:33c3) - db $c8+LASS - db $c8+JR__TRAINER_F - db $c8+BEAUTY - db $c8+COOLTRAINER_F + db OPP_LASS + db OPP_JR__TRAINER_F + db OPP_BEAUTY + db OPP_COOLTRAINER_F db $FF EvilTrainerList:: ; 33c8 (0:33c8) - db $c8+JUGGLER_X - db $c8+GAMBLER - db $c8+ROCKER - db $c8+JUGGLER - db $c8+CHIEF - db $c8+SCIENTIST - db $c8+GIOVANNI - db $c8+ROCKET - db $FF + db OPP_JUGGLER_X + db OPP_GAMBLER + db OPP_ROCKER + db OPP_JUGGLER + db OPP_CHIEF + db OPP_SCIENTIST + db OPP_GIOVANNI + db OPP_ROCKET + + db $ff |