diff options
66 files changed, 219 insertions, 219 deletions
diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 4177e14d..8343074a 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -31,7 +31,7 @@ Music2_UpdateMusic:: ; 0x9103 ld a, c inc c ; inc channel number cp CH7 - jr nz, .loop + jr nz, .loop ret ; this routine checks flags for music effects currently applied @@ -389,7 +389,7 @@ Music2_vibrato: ; 0x9335 ld b, $0 ld hl, wc04e add hl, bc - ld [hl], a ; store delay + ld [hl], a ; store delay ld hl, wc06e add hl, bc ld [hl], a ; store delay diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 037c8741..b4cb653b 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -396,10 +396,10 @@ Music8_vibrato: ; 21ab6 (8:5ab6) ld b, $0 ld hl, wc04e add hl, bc - ld [hl], a ; store delay + ld [hl], a ; store delay ld hl, wc06e add hl, bc - ld [hl], a ; store delay + ld [hl], a ; store delay call Music8_GetNextMusicByte ld d, a and $f0 diff --git a/audio/headers/musicheaders02.asm b/audio/headers/musicheaders02.asm index 3adb23c5..dd5b4b5b 100644 --- a/audio/headers/musicheaders02.asm +++ b/audio/headers/musicheaders02.asm @@ -182,5 +182,5 @@ Music_IndigoPlateau:: ; 82f1 (2:42f1) dw Music_IndigoPlateau_Ch3 db CH3 dw Music_IndigoPlateau_Ch4 - + ; 0x82fd
\ No newline at end of file diff --git a/audio/headers/musicheaders08.asm b/audio/headers/musicheaders08.asm index fbc3f9ae..b4ef7375 100644 --- a/audio/headers/musicheaders08.asm +++ b/audio/headers/musicheaders08.asm @@ -53,5 +53,5 @@ Music_DefeatedGymLeader:: ; 202f4 (8:42f4) dw Music_DefeatedGymLeader_Ch2 db CH2 dw Music_DefeatedGymLeader_Ch3 - + ; 202fd
\ No newline at end of file diff --git a/constants/move_animation_constants.asm b/constants/move_animation_constants.asm index 71051541..018c094b 100644 --- a/constants/move_animation_constants.asm +++ b/constants/move_animation_constants.asm @@ -1,4 +1,4 @@ -; subanimations +; subanimations ; special effects, prefaced with "SE" for "Special Effect" diff --git a/data/wildPokemon/mansion1.asm b/data/wildPokemon/mansion1.asm index 0a333398..82547896 100755 --- a/data/wildPokemon/mansion1.asm +++ b/data/wildPokemon/mansion1.asm @@ -1,4 +1,4 @@ -MansionMons1: +MansionMons1: db $0A IF _RED db 32,KOFFING @@ -12,7 +12,7 @@ MansionMons1: db 37,WEEZING db 39,MUK ENDC - + IF _GREEN || _BLUE db 32,GRIMER db 30,GRIMER @@ -25,7 +25,7 @@ MansionMons1: db 37,MUK db 39,WEEZING ENDC - + IF _YELLOW db 34,RATTATA db 34,RATICATE @@ -38,6 +38,6 @@ MansionMons1: db 34,GROWLITHE db 38,GROWLITHE ENDC - + db $00 diff --git a/data/wildPokemon/mansion2.asm b/data/wildPokemon/mansion2.asm index 07ddc947..8ebbb414 100755 --- a/data/wildPokemon/mansion2.asm +++ b/data/wildPokemon/mansion2.asm @@ -1,4 +1,4 @@ -MansionMons2: +MansionMons2: db $0A IF _RED db 32,GROWLITHE @@ -12,7 +12,7 @@ MansionMons2: db 39,WEEZING db 37,MUK ENDC - + IF _GREEN || !_JAPAN && _BLUE db 32,VULPIX db 34,GRIMER @@ -25,7 +25,7 @@ MansionMons2: db 39,MUK db 37,WEEZING ENDC - + IF _JAPAN && _BLUE db 32,GROWLITHE db 34,GRIMER @@ -38,7 +38,7 @@ MansionMons2: db 39,MUK db 37,WEEZING ENDC - + IF _YELLOW db 37,RATTATA db 37,RATICATE @@ -51,6 +51,6 @@ MansionMons2: db 35,MUK db 38,MUK ENDC - + db $00 diff --git a/data/wildPokemon/mansion3.asm b/data/wildPokemon/mansion3.asm index c0df4020..a1b126ac 100755 --- a/data/wildPokemon/mansion3.asm +++ b/data/wildPokemon/mansion3.asm @@ -1,4 +1,4 @@ -MansionMons3: +MansionMons3: db $0A IF _RED db 31,KOFFING @@ -12,7 +12,7 @@ MansionMons3: db 36,PONYTA db 42,MUK ENDC - + IF _GREEN || !_JAPAN && _BLUE db 31,GRIMER db 33,VULPIX @@ -25,7 +25,7 @@ MansionMons3: db 36,PONYTA db 42,WEEZING ENDC - + IF _JAPAN && _BLUE db 31,GRIMER db 33,GROWLITHE @@ -38,7 +38,7 @@ MansionMons3: db 36,PONYTA db 42,WEEZING ENDC - + IF _YELLOW db 40,RATTATA db 40,RATICATE @@ -51,6 +51,6 @@ MansionMons3: db 38,MUK db 41,MUK ENDC - + db $00 diff --git a/data/wildPokemon/mansionb1.asm b/data/wildPokemon/mansionb1.asm index 9b90d211..23831eeb 100755 --- a/data/wildPokemon/mansionb1.asm +++ b/data/wildPokemon/mansionb1.asm @@ -1,4 +1,4 @@ -MansionMonsB1: +MansionMonsB1: db $0A IF _RED db 33,KOFFING @@ -12,7 +12,7 @@ MansionMonsB1: db 42,WEEZING db 42,MUK ENDC - + IF _GREEN || !_JAPAN && _BLUE db 33,GRIMER db 31,GRIMER @@ -25,7 +25,7 @@ MansionMonsB1: db 38,MAGMAR db 42,WEEZING ENDC - + IF _JAPAN && _BLUE db 33,GRIMER db 31,GRIMER @@ -38,7 +38,7 @@ MansionMonsB1: db 38,MUK db 42,WEEZING ENDC - + IF _YELLOW db 35,GRIMER db 38,GRIMER @@ -51,6 +51,6 @@ MansionMonsB1: db 18,DITTO db 12,DITTO ENDC - + db $00 diff --git a/data/wildPokemon/mtmoon1.asm b/data/wildPokemon/mtmoon1.asm index 3f69ae3f..5ba1d030 100755 --- a/data/wildPokemon/mtmoon1.asm +++ b/data/wildPokemon/mtmoon1.asm @@ -1,4 +1,4 @@ -MoonMons1: +MoonMons1: db $0A IF !_YELLOW db 8,ZUBAT diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wildPokemon/mtmoonb1.asm index 30d9a4ce..0f3639c1 100755 --- a/data/wildPokemon/mtmoonb1.asm +++ b/data/wildPokemon/mtmoonb1.asm @@ -1,4 +1,4 @@ -MoonMonsB1: +MoonMonsB1: db $0A IF !_YELLOW db 8,ZUBAT diff --git a/data/wildPokemon/mtmoonb2.asm b/data/wildPokemon/mtmoonb2.asm index 36266724..34966cd8 100755 --- a/data/wildPokemon/mtmoonb2.asm +++ b/data/wildPokemon/mtmoonb2.asm @@ -1,4 +1,4 @@ -MoonMonsB2: +MoonMonsB2: db $0A IF !_YELLOW db 9,ZUBAT diff --git a/data/wildPokemon/pokemontower1.asm b/data/wildPokemon/pokemontower1.asm index bdf0abc1..4911c790 100755 --- a/data/wildPokemon/pokemontower1.asm +++ b/data/wildPokemon/pokemontower1.asm @@ -1,4 +1,4 @@ -TowerMons1: +TowerMons1: db $00 db $00 diff --git a/data/wildPokemon/pokemontower2.asm b/data/wildPokemon/pokemontower2.asm index 1d0eddaf..a849668d 100755 --- a/data/wildPokemon/pokemontower2.asm +++ b/data/wildPokemon/pokemontower2.asm @@ -1,4 +1,4 @@ -TowerMons2: +TowerMons2: db $00 db $00 diff --git a/data/wildPokemon/pokemontower3.asm b/data/wildPokemon/pokemontower3.asm index 7d1abf59..e2b39398 100755 --- a/data/wildPokemon/pokemontower3.asm +++ b/data/wildPokemon/pokemontower3.asm @@ -1,6 +1,6 @@ -TowerMons3: +TowerMons3: db $0A - + IF !_YELLOW db 20,GASTLY db 21,GASTLY @@ -13,7 +13,7 @@ TowerMons3: db 22,CUBONE db 25,HAUNTER ENDC - + IF _YELLOW db 20,GASTLY db 21,GASTLY @@ -26,6 +26,6 @@ TowerMons3: db 20,HAUNTER db 25,HAUNTER ENDC - + db $00 diff --git a/data/wildPokemon/pokemontower4.asm b/data/wildPokemon/pokemontower4.asm index 462e5034..3f38af20 100755 --- a/data/wildPokemon/pokemontower4.asm +++ b/data/wildPokemon/pokemontower4.asm @@ -1,6 +1,6 @@ -TowerMons4: +TowerMons4: db $0A - + IF !_YELLOW db 20,GASTLY db 21,GASTLY @@ -13,7 +13,7 @@ TowerMons4: db 22,CUBONE db 24,GASTLY ENDC - + IF _YELLOW db 20,GASTLY db 21,GASTLY @@ -26,6 +26,6 @@ TowerMons4: db 20,HAUNTER db 25,HAUNTER ENDC - + db $00 diff --git a/data/wildPokemon/pokemontower5.asm b/data/wildPokemon/pokemontower5.asm index 6976937a..97098448 100755 --- a/data/wildPokemon/pokemontower5.asm +++ b/data/wildPokemon/pokemontower5.asm @@ -1,6 +1,6 @@ -TowerMons5: +TowerMons5: db $0A - + IF !_YELLOW db 20,GASTLY db 21,GASTLY @@ -13,7 +13,7 @@ TowerMons5: db 22,CUBONE db 24,GASTLY ENDC - + IF _YELLOW db 22,GASTLY db 23,GASTLY @@ -26,6 +26,6 @@ TowerMons5: db 22,HAUNTER db 27,HAUNTER ENDC - + db $00 diff --git a/data/wildPokemon/pokemontower6.asm b/data/wildPokemon/pokemontower6.asm index 4f2d9594..abd2969a 100755 --- a/data/wildPokemon/pokemontower6.asm +++ b/data/wildPokemon/pokemontower6.asm @@ -1,6 +1,6 @@ -TowerMons6: +TowerMons6: db $0F - + IF !_YELLOW db 21,GASTLY db 22,GASTLY @@ -13,7 +13,7 @@ TowerMons6: db 24,CUBONE db 28,HAUNTER ENDC - + IF _YELLOW db 22,GASTLY db 23,GASTLY @@ -26,6 +26,6 @@ TowerMons6: db 22,HAUNTER db 27,HAUNTER ENDC - + db $00 diff --git a/data/wildPokemon/pokemontower7.asm b/data/wildPokemon/pokemontower7.asm index 6c9afbd4..2daf3a2d 100755 --- a/data/wildPokemon/pokemontower7.asm +++ b/data/wildPokemon/pokemontower7.asm @@ -1,6 +1,6 @@ -TowerMons7: +TowerMons7: db $0F - + IF !_YELLOW db 21,GASTLY db 22,GASTLY @@ -14,7 +14,7 @@ TowerMons7: db 30,HAUNTER ENDC - + IF _YELLOW db 24,GASTLY db 25,GASTLY @@ -27,6 +27,6 @@ TowerMons7: db 24,HAUNTER db 29,HAUNTER ENDC - + db $00 diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm index 741232c3..a67ab2e9 100755 --- a/data/wildPokemon/powerplant.asm +++ b/data/wildPokemon/powerplant.asm @@ -1,7 +1,7 @@ -PowerPlantMons: +PowerPlantMons: db $0A IF !_YELLOW - + db 21,VOLTORB db 21,MAGNEMITE db 20,PIKACHU @@ -19,7 +19,7 @@ PowerPlantMons: db 36,RAICHU ENDC ENDC - + IF _YELLOW db 30,MAGNEMITE db 35,MAGNEMITE @@ -32,6 +32,6 @@ PowerPlantMons: db 33,MUK db 37,MUK ENDC - + db $00 diff --git a/data/wildPokemon/rocktunnel1.asm b/data/wildPokemon/rocktunnel1.asm index 20416c5f..e8904043 100755 --- a/data/wildPokemon/rocktunnel1.asm +++ b/data/wildPokemon/rocktunnel1.asm @@ -1,6 +1,6 @@ -TunnelMonsB1: +TunnelMonsB1: db $0F - + IF !_YELLOW db 16,ZUBAT db 17,ZUBAT @@ -18,7 +18,7 @@ TunnelMonsB1: db 13,ONIX db 15,ONIX ENDC - + IF _YELLOW db 15,ZUBAT db 16,GEODUDE @@ -31,6 +31,6 @@ TunnelMonsB1: db 19,MACHOP db 21,MACHOP ENDC - + db $00 diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wildPokemon/rocktunnel2.asm index b1ca24fd..f158453e 100755 --- a/data/wildPokemon/rocktunnel2.asm +++ b/data/wildPokemon/rocktunnel2.asm @@ -1,4 +1,4 @@ -TunnelMonsB2: +TunnelMonsB2: db $0F IF !_YELLOW db 16,ZUBAT @@ -17,7 +17,7 @@ TunnelMonsB2: db 13,ONIX db 18,GEODUDE ENDC - + IF _YELLOW db 20,ZUBAT db 17,GEODUDE @@ -30,6 +30,6 @@ TunnelMonsB2: db 18,ONIX db 22,ONIX ENDC - + db $00 diff --git a/data/wildPokemon/route1.asm b/data/wildPokemon/route1.asm index 94469880..bbad3c9e 100755 --- a/data/wildPokemon/route1.asm +++ b/data/wildPokemon/route1.asm @@ -1,4 +1,4 @@ -Route1Mons: +Route1Mons: db $19 IF !_YELLOW db 3,PIDGEY diff --git a/data/wildPokemon/route10.asm b/data/wildPokemon/route10.asm index 69651380..185e41fe 100755 --- a/data/wildPokemon/route10.asm +++ b/data/wildPokemon/route10.asm @@ -1,6 +1,6 @@ -Route10Mons: +Route10Mons: db $0F - + IF _RED db 16,VOLTORB db 16,SPEAROW @@ -13,7 +13,7 @@ Route10Mons: db 13,EKANS db 17,EKANS ENDC - + IF !_RED db 16,VOLTORB db 16,SPEAROW @@ -26,7 +26,7 @@ Route10Mons: db 13,SANDSHREW db 17,SANDSHREW ENDC - + IF _YELLOW db 16,MAGNEMITE db 18,RATTATA @@ -39,6 +39,6 @@ Route10Mons: db 16,MACHOP db 18,MACHOP ENDC - + db $00 diff --git a/data/wildPokemon/route11.asm b/data/wildPokemon/route11.asm index afe72dd2..6f724e80 100755 --- a/data/wildPokemon/route11.asm +++ b/data/wildPokemon/route11.asm @@ -1,6 +1,6 @@ -Route11Mons: +Route11Mons: db $0F - + IF _RED db 14,EKANS db 15,SPEAROW @@ -13,7 +13,7 @@ Route11Mons: db 11,DROWZEE db 15,DROWZEE ENDC - + IF _GREEN || _BLUE db 14,SANDSHREW db 15,SPEAROW @@ -26,7 +26,7 @@ Route11Mons: db 11,DROWZEE db 15,DROWZEE ENDC - + IF _YELLOW db 16,PIDGEY db 15,RATTATA @@ -39,6 +39,6 @@ Route11Mons: db 19,DROWZEE db 17,RATICATE ENDC - + db $00 diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm index e16b407b..b15a2223 100755 --- a/data/wildPokemon/route12.asm +++ b/data/wildPokemon/route12.asm @@ -1,6 +1,6 @@ -Route12Mons: +Route12Mons: db $0F - + IF _RED || (_JAPAN && _BLUE) db 24,ODDISH db 25,PIDGEY @@ -14,7 +14,7 @@ Route12Mons: db 30,GLOOM db $00 ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 24,BELLSPROUT db 25,PIDGEY @@ -28,7 +28,7 @@ Route12Mons: db 30,WEEPINBELL db $00 ENDC - + IF _YELLOW db 25,ODDISH db 25,BELLSPROUT diff --git a/data/wildPokemon/route13.asm b/data/wildPokemon/route13.asm index 96e53229..5293bf21 100755 --- a/data/wildPokemon/route13.asm +++ b/data/wildPokemon/route13.asm @@ -1,4 +1,4 @@ -Route13Mons: +Route13Mons: IF _RED || (_JAPAN && _BLUE) db $14 db 24,ODDISH @@ -13,7 +13,7 @@ Route13Mons: db 30,GLOOM db $00 ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db $14 db 24,BELLSPROUT @@ -28,7 +28,7 @@ Route13Mons: db 30,WEEPINBELL db $00 ENDC - + IF _YELLOW db $0F db 25,ODDISH diff --git a/data/wildPokemon/route14.asm b/data/wildPokemon/route14.asm index c3e0743b..76d9118f 100755 --- a/data/wildPokemon/route14.asm +++ b/data/wildPokemon/route14.asm @@ -1,4 +1,4 @@ -Route14Mons: +Route14Mons: db $0F IF _RED || (_JAPAN && _BLUE) db 24,ODDISH @@ -12,7 +12,7 @@ Route14Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 24,BELLSPROUT db 26,PIDGEY @@ -25,7 +25,7 @@ Route14Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - + IF _YELLOW db 26,ODDISH db 26,BELLSPROUT @@ -38,6 +38,6 @@ Route14Mons: db 27,VENONAT db 30,VENOMOTH ENDC - + db $00 diff --git a/data/wildPokemon/route15.asm b/data/wildPokemon/route15.asm index a8215cd3..4a0d3fc3 100755 --- a/data/wildPokemon/route15.asm +++ b/data/wildPokemon/route15.asm @@ -1,4 +1,4 @@ -Route15Mons: +Route15Mons: db $0F IF _RED || (_JAPAN && _BLUE) db 24,ODDISH @@ -12,7 +12,7 @@ Route15Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 24,BELLSPROUT db 26,DITTO @@ -25,7 +25,7 @@ Route15Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - + IF _YELLOW db 26,ODDISH db 26,BELLSPROUT @@ -38,6 +38,6 @@ Route15Mons: db 27,VENONAT db 30,VENOMOTH ENDC - + db $00 diff --git a/data/wildPokemon/route16.asm b/data/wildPokemon/route16.asm index 23aadb6c..34408164 100755 --- a/data/wildPokemon/route16.asm +++ b/data/wildPokemon/route16.asm @@ -1,4 +1,4 @@ -Route16Mons: +Route16Mons: db $19 IF !_YELLOW db 20,SPEAROW @@ -12,7 +12,7 @@ Route16Mons: db 23,RATICATE db 25,RATICATE ENDC - + IF _YELLOW db 22,SPEAROW db 22,DODUO @@ -25,6 +25,6 @@ Route16Mons: db 25,RATICATE db 26,RATICATE ENDC - + db $00 diff --git a/data/wildPokemon/route17.asm b/data/wildPokemon/route17.asm index 9cdb18b3..75882ec5 100755 --- a/data/wildPokemon/route17.asm +++ b/data/wildPokemon/route17.asm @@ -1,4 +1,4 @@ -Route17Mons: +Route17Mons: db $19 IF !_YELLOW db 20,SPEAROW @@ -12,7 +12,7 @@ Route17Mons: db 25,FEAROW db 27,FEAROW ENDC - + IF _YELLOW db 26,DODUO db 27,FEAROW @@ -25,6 +25,6 @@ Route17Mons: db 32,PONYTA db 29,DODRIO ENDC - + db $00 diff --git a/data/wildPokemon/route18.asm b/data/wildPokemon/route18.asm index 9d2b08cf..8820f045 100755 --- a/data/wildPokemon/route18.asm +++ b/data/wildPokemon/route18.asm @@ -1,4 +1,4 @@ -Route18Mons: +Route18Mons: db $19 IF !_YELLOW db 20,SPEAROW @@ -12,7 +12,7 @@ Route18Mons: db 27,FEAROW db 29,FEAROW ENDC - + IF _YELLOW db 22,SPEAROW db 22,DODUO @@ -25,6 +25,6 @@ Route18Mons: db 25,RATICATE db 26,RATICATE ENDC - + db $00 diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm index e63f5028..57d7f87f 100755 --- a/data/wildPokemon/route2.asm +++ b/data/wildPokemon/route2.asm @@ -1,6 +1,6 @@ -Route2Mons: +Route2Mons: db $19 - + IF !_YELLOW db 3,RATTATA db 3,PIDGEY diff --git a/data/wildPokemon/route21.asm b/data/wildPokemon/route21.asm index 26a590da..a29753eb 100755 --- a/data/wildPokemon/route21.asm +++ b/data/wildPokemon/route21.asm @@ -1,4 +1,4 @@ -Route21Mons: +Route21Mons: db $19 IF !_YELLOW db 21,RATTATA @@ -12,7 +12,7 @@ Route21Mons: db 30,TANGELA db 32,TANGELA ENDC - + IF _YELLOW db 15,PIDGEY db 13,RATTATA @@ -25,7 +25,7 @@ Route21Mons: db 19,PIDGEOTTO db 15,PIDGEOTTO ENDC - + db $05 db 5,TENTACOOL db 10,TENTACOOL diff --git a/data/wildPokemon/route22.asm b/data/wildPokemon/route22.asm index e78c02c9..36ff9a57 100755 --- a/data/wildPokemon/route22.asm +++ b/data/wildPokemon/route22.asm @@ -1,4 +1,4 @@ -Route22Mons: +Route22Mons: db $19 IF _RED || (_JAPAN && _BLUE) db 3,RATTATA diff --git a/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm index 3cd2ca9d..cfdd8eff 100755 --- a/data/wildPokemon/route23.asm +++ b/data/wildPokemon/route23.asm @@ -1,4 +1,4 @@ -Route23Mons: +Route23Mons: db $0A IF !_YELLOW IF _RED @@ -22,7 +22,7 @@ Route23Mons: db 41,FEAROW db 43,FEAROW ENDC - + IF _YELLOW db 41,NIDORINO db 41,NIDORINA @@ -35,6 +35,6 @@ Route23Mons: db 41,PRIMEAPE db 46,PRIMEAPE ENDC - + db $00 diff --git a/data/wildPokemon/route24.asm b/data/wildPokemon/route24.asm index 28af9916..e4ff986a 100755 --- a/data/wildPokemon/route24.asm +++ b/data/wildPokemon/route24.asm @@ -1,6 +1,6 @@ -Route24Mons: +Route24Mons: db $19 - + IF _RED db 7,WEEDLE db 8,KAKUNA @@ -13,7 +13,7 @@ Route24Mons: db 8,ABRA db 12,ABRA ENDC - + IF _GREEN || !_JAPAN && _BLUE db 7,CATERPIE db 8,METAPOD @@ -26,7 +26,7 @@ Route24Mons: db 8,ABRA db 12,ABRA ENDC - + IF _JAPAN && _BLUE db 7,CATERPIE db 8,METAPOD @@ -39,7 +39,7 @@ Route24Mons: db 8,ABRA db 12,ABRA ENDC - + IF _YELLOW db 12,ODDISH db 12,BELLSPROUT @@ -52,6 +52,6 @@ Route24Mons: db 17,PIDGEY db 17,PIDGEOTTO ENDC - + db $00 diff --git a/data/wildPokemon/route25.asm b/data/wildPokemon/route25.asm index 1aac115f..3d225473 100755 --- a/data/wildPokemon/route25.asm +++ b/data/wildPokemon/route25.asm @@ -1,6 +1,6 @@ -Route25Mons: +Route25Mons: db $0F - + IF _RED db 8,WEEDLE db 9,KAKUNA @@ -13,7 +13,7 @@ Route25Mons: db 7,METAPOD db 8,CATERPIE ENDC - + IF _GREEN || !_JAPAN && _BLUE db 8,CATERPIE db 9,METAPOD @@ -26,7 +26,7 @@ Route25Mons: db 7,KAKUNA db 8,WEEDLE ENDC - + IF _JAPAN && _BLUE db 8,CATERPIE db 9,METAPOD @@ -39,7 +39,7 @@ Route25Mons: db 7,KAKUNA db 8,WEEDLE ENDC - + IF _YELLOW db 12,ODDISH db 12,BELLSPROUT @@ -52,6 +52,6 @@ Route25Mons: db 17,PIDGEY db 17,PIDGEOTTO ENDC - + db $00 diff --git a/data/wildPokemon/route3.asm b/data/wildPokemon/route3.asm index 1b555138..21230f42 100755 --- a/data/wildPokemon/route3.asm +++ b/data/wildPokemon/route3.asm @@ -1,4 +1,4 @@ -Route3Mons: +Route3Mons: db $14 IF !_YELLOW db 6,PIDGEY diff --git a/data/wildPokemon/route4.asm b/data/wildPokemon/route4.asm index 22610dc6..f7eb80ee 100755 --- a/data/wildPokemon/route4.asm +++ b/data/wildPokemon/route4.asm @@ -1,6 +1,6 @@ -Route4Mons: +Route4Mons: db $14 - + IF _RED db 10,RATTATA db 10,SPEAROW @@ -13,7 +13,7 @@ Route4Mons: db 8,EKANS db 12,EKANS ENDC - + IF !_RED db 10,RATTATA db 10,SPEAROW @@ -26,7 +26,7 @@ Route4Mons: db 8,SANDSHREW db 12,SANDSHREW ENDC - + IF _YELLOW db 8,SPEAROW db 9,SPEAROW diff --git a/data/wildPokemon/route5.asm b/data/wildPokemon/route5.asm index c08b51a4..4b018cd6 100755 --- a/data/wildPokemon/route5.asm +++ b/data/wildPokemon/route5.asm @@ -1,6 +1,6 @@ -Route5Mons: +Route5Mons: db $0F - + IF _RED db 13,ODDISH db 13,PIDGEY @@ -13,7 +13,7 @@ Route5Mons: db 14,MANKEY db 16,MANKEY ENDC - + IF _GREEN || !_JAPAN && _BLUE db 13,BELLSPROUT db 13,PIDGEY @@ -26,7 +26,7 @@ Route5Mons: db 14,MEOWTH db 16,MEOWTH ENDC - + IF _JAPAN && _BLUE db 13,ODDISH db 13,PIDGEY @@ -39,7 +39,7 @@ Route5Mons: db 14,MEOWTH db 16,MEOWTH ENDC - + IF _YELLOW db 15,PIDGEY db 14,RATTATA @@ -52,6 +52,6 @@ Route5Mons: db 5,JIGGLYPUFF db 7,JIGGLYPUFF ENDC - + db $00 diff --git a/data/wildPokemon/route6.asm b/data/wildPokemon/route6.asm index a2e0f4d0..253a5943 100755 --- a/data/wildPokemon/route6.asm +++ b/data/wildPokemon/route6.asm @@ -1,6 +1,6 @@ -Route6Mons: +Route6Mons: db $0F - + IF _RED db 13,ODDISH db 13,PIDGEY @@ -14,7 +14,7 @@ Route6Mons: db 16,MANKEY db $00 ENDC - + IF _GREEN || !_JAPAN && _BLUE db 13,BELLSPROUT db 13,PIDGEY @@ -28,7 +28,7 @@ Route6Mons: db 16,MEOWTH db $00 ENDC - + IF _JAPAN && _BLUE db 13,ODDISH db 13,PIDGEY @@ -42,7 +42,7 @@ Route6Mons: db 16,MEOWTH db $00 ENDC - + IF _YELLOW db 15,PIDGEY db 14,RATTATA diff --git a/data/wildPokemon/route7.asm b/data/wildPokemon/route7.asm index ecda56aa..42073d11 100755 --- a/data/wildPokemon/route7.asm +++ b/data/wildPokemon/route7.asm @@ -1,6 +1,6 @@ -Route7Mons: +Route7Mons: db $0F - + IF _RED db 19,PIDGEY db 19,ODDISH @@ -13,7 +13,7 @@ Route7Mons: db 19,MANKEY db 20,MANKEY ENDC - + IF _GREEN || !_JAPAN && _BLUE db 19,PIDGEY db 19,BELLSPROUT @@ -26,7 +26,7 @@ Route7Mons: db 19,MEOWTH db 20,MEOWTH ENDC - + IF _JAPAN && _BLUE db 19,PIDGEY db 19,ODDISH @@ -39,7 +39,7 @@ Route7Mons: db 19,MEOWTH db 20,MEOWTH ENDC - + IF _YELLOW db 20,PIDGEY db 22,PIDGEY @@ -52,6 +52,6 @@ Route7Mons: db 24,JIGGLYPUFF db 24,JIGGLYPUFF ENDC - + db $00 diff --git a/data/wildPokemon/route8.asm b/data/wildPokemon/route8.asm index 97260649..59c3082d 100755 --- a/data/wildPokemon/route8.asm +++ b/data/wildPokemon/route8.asm @@ -1,6 +1,6 @@ -Route8Mons: +Route8Mons: db $0F - + IF _RED db 18,PIDGEY db 18,MANKEY @@ -13,7 +13,7 @@ Route8Mons: db 15,GROWLITHE db 18,GROWLITHE ENDC - + IF _GREEN || !_JAPAN && _BLUE db 18,PIDGEY db 18,MEOWTH @@ -26,7 +26,7 @@ Route8Mons: db 15,VULPIX db 18,VULPIX ENDC - + IF _JAPAN && _BLUE db 18,PIDGEY db 18,MEOWTH @@ -39,7 +39,7 @@ Route8Mons: db 15,GROWLITHE db 18,GROWLITHE ENDC - + IF _YELLOW db 20,PIDGEY db 22,PIDGEY @@ -52,6 +52,6 @@ Route8Mons: db 20,KADABRA db 27,KADABRA ENDC - + db $00 diff --git a/data/wildPokemon/route9.asm b/data/wildPokemon/route9.asm index c7c65186..03523e4f 100755 --- a/data/wildPokemon/route9.asm +++ b/data/wildPokemon/route9.asm @@ -1,6 +1,6 @@ -Route9Mons: +Route9Mons: db $0F - + IF _RED db 16,RATTATA db 16,SPEAROW @@ -13,7 +13,7 @@ Route9Mons: db 13,EKANS db 17,EKANS ENDC - + IF !_RED && !_YELLOW db 16,RATTATA db 16,SPEAROW @@ -26,7 +26,7 @@ Route9Mons: db 13,SANDSHREW db 17,SANDSHREW ENDC - + IF _YELLOW db 16,NIDORAN_M db 16,NIDORAN_F @@ -39,6 +39,6 @@ Route9Mons: db 20,RATICATE db 19,FEAROW ENDC - + db $00 diff --git a/data/wildPokemon/safarizone1.asm b/data/wildPokemon/safarizone1.asm index 1e2f463c..29e3f29b 100755 --- a/data/wildPokemon/safarizone1.asm +++ b/data/wildPokemon/safarizone1.asm @@ -1,4 +1,4 @@ -ZoneMons1: +ZoneMons1: db $1E IF _RED || (_JAPAN && _BLUE) db 24,NIDORAN_M @@ -17,7 +17,7 @@ ZoneMons1: ENDC db 28,SCYTHER ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 24,NIDORAN_F db 26,DODUO @@ -30,7 +30,7 @@ ZoneMons1: db 25,KANGASKHAN db 28,PINSIR ENDC - + IF _YELLOW db 21,NIDORAN_M db 29,NIDORAN_F @@ -43,6 +43,6 @@ ZoneMons1: db 21,CHANSEY db 15,SCYTHER ENDC - + db $00 diff --git a/data/wildPokemon/safarizone2.asm b/data/wildPokemon/safarizone2.asm index ac35d4e4..2adb18ed 100755 --- a/data/wildPokemon/safarizone2.asm +++ b/data/wildPokemon/safarizone2.asm @@ -1,4 +1,4 @@ -ZoneMons2: +ZoneMons2: db $1E IF !_YELLOW IF _RED || (_JAPAN && _BLUE) @@ -32,7 +32,7 @@ ZoneMons2: db 28,PINSIR ENDC ENDC - + IF _YELLOW db 36,NIDORAN_M db 14,NIDORAN_F @@ -45,6 +45,6 @@ ZoneMons2: db 25,SCYTHER db 15,PINSIR ENDC - + db $00 diff --git a/data/wildPokemon/safarizone3.asm b/data/wildPokemon/safarizone3.asm index 497efd24..436ab937 100755 --- a/data/wildPokemon/safarizone3.asm +++ b/data/wildPokemon/safarizone3.asm @@ -1,4 +1,4 @@ -ZoneMons3: +ZoneMons3: db $1E IF _RED db 25,NIDORAN_M @@ -12,7 +12,7 @@ ZoneMons3: db 26,TAUROS db 28,KANGASKHAN ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 25,NIDORAN_F db 26,DODUO @@ -25,7 +25,7 @@ ZoneMons3: db 26,TAUROS db 28,KANGASKHAN ENDC - + IF _JAPAN && _BLUE db 25,NIDORAN_M db 26,DODUO @@ -38,7 +38,7 @@ ZoneMons3: db 26,PINSIR db 28,LICKITUNG ENDC - + IF _YELLOW db 29,NIDORAN_M db 21,NIDORAN_F @@ -51,6 +51,6 @@ ZoneMons3: db 25,PINSIR db 27,TANGELA ENDC - + db $00 diff --git a/data/wildPokemon/safarizonecenter.asm b/data/wildPokemon/safarizonecenter.asm index d8c74a76..35eb7fd4 100755 --- a/data/wildPokemon/safarizonecenter.asm +++ b/data/wildPokemon/safarizonecenter.asm @@ -1,4 +1,4 @@ -ZoneMonsCenter: +ZoneMonsCenter: db $1E IF _RED db 22,NIDORAN_M @@ -12,7 +12,7 @@ ZoneMonsCenter: db 23,SCYTHER db 23,CHANSEY ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 22,NIDORAN_F db 25,RHYHORN @@ -25,7 +25,7 @@ ZoneMonsCenter: db 23,PINSIR db 23,CHANSEY ENDC - + IF _JAPAN && _BLUE db 22,NIDORAN_M db 25,RHYHORN @@ -38,7 +38,7 @@ ZoneMonsCenter: db 23,SCYTHER db 23,CHANSEY ENDC - + IF _YELLOW db 14,NIDORAN_M db 36,NIDORAN_F @@ -51,6 +51,6 @@ ZoneMonsCenter: db 22,TANGELA db 7,CHANSEY ENDC - + db $00 diff --git a/data/wildPokemon/seafoamisland1.asm b/data/wildPokemon/seafoamisland1.asm index 472af2e1..506dd98e 100755 --- a/data/wildPokemon/seafoamisland1.asm +++ b/data/wildPokemon/seafoamisland1.asm @@ -1,4 +1,4 @@ -IslandMons1: +IslandMons1: db $0F IF _RED db 30,SEEL @@ -12,7 +12,7 @@ IslandMons1: db 28,SHELLDER db 38,GOLDUCK ENDC - + IF _GREEN || !_JAPAN && _BLUE db 30,SEEL db 30,PSYDUCK @@ -25,7 +25,7 @@ IslandMons1: db 28,STARYU db 38,SLOWBRO ENDC - + IF _JAPAN && _BLUE db 30,SEEL db 30,HORSEA @@ -38,7 +38,7 @@ IslandMons1: db 28,STARYU db 38,SLOWBRO ENDC - + IF _YELLOW db 18,ZUBAT db 25,KRABBY @@ -51,6 +51,6 @@ IslandMons1: db 27,GOLBAT db 36,GOLBAT ENDC - + db $00 diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/wildPokemon/seafoamislandb1.asm index 9b49bc46..044753b4 100755 --- a/data/wildPokemon/seafoamislandb1.asm +++ b/data/wildPokemon/seafoamislandb1.asm @@ -1,4 +1,4 @@ -IslandMonsB1: +IslandMonsB1: db $0A IF _RED db 30,STARYU @@ -12,7 +12,7 @@ IslandMonsB1: db 38,DEWGONG db 37,SEADRA ENDC - + IF _GREEN || !_JAPAN && _BLUE db 30,SHELLDER db 30,KRABBY @@ -25,7 +25,7 @@ IslandMonsB1: db 38,DEWGONG db 37,KINGLER ENDC - + IF _JAPAN && _BLUE db 30,SHELLDER db 30,KRABBY @@ -38,7 +38,7 @@ IslandMonsB1: db 38,DEWGONG db 37,KINGLER ENDC - + IF _YELLOW db 27,ZUBAT db 26,KRABBY @@ -51,6 +51,6 @@ IslandMonsB1: db 22,SEEL db 26,SEEL ENDC - + db $00 diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/wildPokemon/seafoamislandb2.asm index 4cad1012..2b7a3ef8 100755 --- a/data/wildPokemon/seafoamislandb2.asm +++ b/data/wildPokemon/seafoamislandb2.asm @@ -1,4 +1,4 @@ -IslandMonsB2: +IslandMonsB2: db $0A IF _RED db 30,SEEL @@ -12,7 +12,7 @@ IslandMonsB2: db 30,GOLBAT db 37,SLOWBRO ENDC - + IF _GREEN || !_JAPAN && _BLUE db 30,SEEL db 30,PSYDUCK @@ -25,7 +25,7 @@ IslandMonsB2: db 30,GOLBAT db 37,GOLDUCK ENDC - + IF _JAPAN && _BLUE db 30,SEEL db 30,HORSEA @@ -38,7 +38,7 @@ IslandMonsB2: db 30,GOLBAT db 37,JYNX ENDC - + IF _YELLOW db 27,ZUBAT db 27,KRABBY @@ -51,6 +51,6 @@ IslandMonsB2: db 31,SLOWPOKE db 31,SLOWBRO ENDC - + db $00 diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/wildPokemon/seafoamislandb3.asm index 55d806a9..ac9769b4 100755 --- a/data/wildPokemon/seafoamislandb3.asm +++ b/data/wildPokemon/seafoamislandb3.asm @@ -1,4 +1,4 @@ -IslandMonsB3: +IslandMonsB3: db $0A IF _RED db 31,SLOWPOKE @@ -12,7 +12,7 @@ IslandMonsB3: db 39,SEADRA db 37,DEWGONG ENDC - + IF _GREEN || !_JAPAN && _BLUE db 31,PSYDUCK db 31,SEEL @@ -25,7 +25,7 @@ IslandMonsB3: db 39,KINGLER db 37,DEWGONG ENDC - + IF _JAPAN && _BLUE db 31,HORSEA db 31,SEEL @@ -38,7 +38,7 @@ IslandMonsB3: db 39,KINGLER db 37,DEWGONG ENDC - + IF _YELLOW db 27,GOLBAT db 36,ZUBAT @@ -63,6 +63,6 @@ IslandMonsB3: db 30,STARYU db 30,STARYU ENDC - + db $00 diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/wildPokemon/seafoamislandb4.asm index 9596ab5b..af5c7e02 100755 --- a/data/wildPokemon/seafoamislandb4.asm +++ b/data/wildPokemon/seafoamislandb4.asm @@ -1,4 +1,4 @@ -IslandMonsB4: +IslandMonsB4: db $0A IF _RED db 31,HORSEA @@ -12,7 +12,7 @@ IslandMonsB4: db 39,SLOWBRO db 32,GOLBAT ENDC - + IF _GREEN || !_JAPAN && _BLUE db 31,KRABBY db 31,STARYU @@ -25,7 +25,7 @@ IslandMonsB4: db 39,GOLDUCK db 32,GOLBAT ENDC - + IF _JAPAN && _BLUE db 31,KRABBY db 31,STARYU @@ -38,7 +38,7 @@ IslandMonsB4: db 39,JYNX db 32,GOLBAT ENDC - + IF _YELLOW db 36,GOLBAT db 36,ZUBAT @@ -63,6 +63,6 @@ IslandMonsB4: db 30,STARYU db 30,STARYU ENDC - + db $00 diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm index 2c23dcc8..4feb568c 100755 --- a/data/wildPokemon/unknowndungeon1.asm +++ b/data/wildPokemon/unknowndungeon1.asm @@ -1,4 +1,4 @@ -DungeonMons1: +DungeonMons1: db $0A IF !_YELLOW db 46,GOLBAT @@ -22,7 +22,7 @@ DungeonMons1: db 53,RAICHU db 53,DITTO ENDC - + IF _YELLOW db 50,GOLBAT db 55,GOLBAT @@ -35,6 +35,6 @@ DungeonMons1: db 55,DITTO db 60,DITTO ENDC - + db $00 diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm index c3971b86..a09c985c 100755 --- a/data/wildPokemon/unknowndungeon2.asm +++ b/data/wildPokemon/unknowndungeon2.asm @@ -1,4 +1,4 @@ -DungeonMons2: +DungeonMons2: db $0F IF !_YELLOW db 51,DODRIO @@ -17,7 +17,7 @@ DungeonMons2: db 55,DITTO db 60,DITTO ENDC - + IF _YELLOW db 52,GOLBAT db 57,GOLBAT @@ -30,6 +30,6 @@ DungeonMons2: db 60,RHYDON db 58,RHYDON ENDC - + db $00 diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm index 8a66d2a9..7ab1c964 100755 --- a/data/wildPokemon/unknowndungeonb1.asm +++ b/data/wildPokemon/unknowndungeonb1.asm @@ -1,4 +1,4 @@ -DungeonMonsB1: +DungeonMonsB1: db $19 IF !_YELLOW db 55,RHYDON @@ -17,7 +17,7 @@ DungeonMonsB1: db 63,DITTO db 67,DITTO ENDC - + IF _YELLOW db 54,GOLBAT db 59,GOLBAT @@ -30,6 +30,6 @@ DungeonMonsB1: db 55,LICKITUNG db 50,LICKITUNG ENDC - + db $00 diff --git a/data/wildPokemon/victoryroad1.asm b/data/wildPokemon/victoryroad1.asm index c39d1ff5..1ec65cf5 100755 --- a/data/wildPokemon/victoryroad1.asm +++ b/data/wildPokemon/victoryroad1.asm @@ -1,4 +1,4 @@ -PlateauMons1: +PlateauMons1: db $0F IF !_YELLOW db 24,MACHOP @@ -25,6 +25,6 @@ PlateauMons1: db 41,GRAVELER db 47,GRAVELER ENDC - + db $00 diff --git a/data/wildPokemon/victoryroad2.asm b/data/wildPokemon/victoryroad2.asm index 1832b83b..87159e96 100755 --- a/data/wildPokemon/victoryroad2.asm +++ b/data/wildPokemon/victoryroad2.asm @@ -1,4 +1,4 @@ -PlateauMons2: +PlateauMons2: db $0A IF !_YELLOW db 22,MACHOP @@ -12,7 +12,7 @@ PlateauMons2: db 40,MAROWAK db 43,GRAVELER ENDC - + IF _YELLOW db 31,GEODUDE db 36,GEODUDE @@ -25,6 +25,6 @@ PlateauMons2: db 39,MACHOKE db 42,MACHOKE ENDC - + db $00 diff --git a/data/wildPokemon/victoryroad3.asm b/data/wildPokemon/victoryroad3.asm index e2ebf0db..ae52eeb6 100755 --- a/data/wildPokemon/victoryroad3.asm +++ b/data/wildPokemon/victoryroad3.asm @@ -1,4 +1,4 @@ -PlateauMons3: +PlateauMons3: db $0F IF !_YELLOW db 24,MACHOP @@ -12,7 +12,7 @@ PlateauMons3: db 42,MACHOKE db 45,MACHOKE ENDC - + IF _YELLOW db 36,GEODUDE db 44,GOLBAT @@ -25,6 +25,6 @@ PlateauMons3: db 47,GRAVELER db 47,GRAVELER ENDC - + db $00 diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm index e80ba681..2ca828eb 100755 --- a/data/wildPokemon/viridianforest.asm +++ b/data/wildPokemon/viridianforest.asm @@ -1,4 +1,4 @@ -ForestMons: ; +ForestMons: IF !_YELLOW db $08 IF _RED @@ -21,11 +21,11 @@ ForestMons: ; db 4,KAKUNA db 3,WEEDLE ENDC - + db 3,PIKACHU db 5,PIKACHU ENDC - + IF _YELLOW db $19 db 3,CATERPIE diff --git a/data/wildPokemon/waterpokemon.asm b/data/wildPokemon/waterpokemon.asm index b45a94d6..ef2d39ea 100755 --- a/data/wildPokemon/waterpokemon.asm +++ b/data/wildPokemon/waterpokemon.asm @@ -1,4 +1,4 @@ -WaterMons: ; +WaterMons: db $00 db $05 @@ -89,7 +89,7 @@ tileset: MACRO INDOOR EQU 0 CAVE EQU 1 OUTDOOR EQU 2 - + ; macro for two nibbles dn: MACRO db (\1 << 4 | \2) @@ -142,7 +142,7 @@ PREDEF: MACRO ld a, (\1 - PredefPointers) / 3 call Predef ENDM - + PREDEF_JUMP: MACRO ld a, (\1 - PredefPointers) / 3 jp Predef diff --git a/scripts/route22.asm b/scripts/route22.asm index fa225415..f9f38e79 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -72,7 +72,7 @@ Route22Script0: ; 50f00 (14:4f00) jp nz, Route22Script_5104e ret -.Route22RivalBattleCoords +.Route22RivalBattleCoords db $04, $1D db $05, $1D db $FF diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index 1c3bd3c7..d7abeff5 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -59,7 +59,7 @@ Route5GateScript1: ; 1df94 (7:5f94) ld [wJoyIgnore], a ld [W_ROUTE5GATECURSCRIPT], a ret - + Route5GateTextPointers: ; 1dfa4 (7:5fa4) dw Route5GateText1 dw Route5GateText2 @@ -102,7 +102,7 @@ wSpriteStateData2:: ; c200 ; holds info for 16 sprites with $10 bytes each ; player sprite is always sprite 0 ; C2x0: walk animation counter (counting from $10 backwards when moving) -; C2x1: +; C2x1: ; C2x2: Y displacement (initialized at 8, supposed to keep moving sprites from moving too far, but bugged) ; C2x3: X displacement (initialized at 8, supposed to keep moving sprites from moving too far, but bugged) ; C2x4: Y position (in 2x2 tile grid steps, topmost 2x2 tile has value 4) |