thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up white space

Browse source
This commit is contained in:
U-Fish-PC\Daniel 2014-06-09 16:58:02 -04:00
parent fadac928bc
commit b83acb03e5
66 changed files with 219 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

4
audio/engine_1.asm
View file

@ -31,7 +31,7 @@ Music2_UpdateMusic:: ; 0x9103
ld a, c ld a, c
inc c ; inc channel number inc c ; inc channel number
cp CH7 cp CH7
jr nz, .loop jr nz, .loop
ret ret
; this routine checks flags for music effects currently applied ; this routine checks flags for music effects currently applied
@ -389,7 +389,7 @@ Music2_vibrato: ; 0x9335
ld b, $0 ld b, $0
ld hl, wc04e ld hl, wc04e
add hl, bc add hl, bc
ld [hl], a ; store delay ld [hl], a ; store delay
ld hl, wc06e ld hl, wc06e
add hl, bc add hl, bc
ld [hl], a ; store delay ld [hl], a ; store delay

4
audio/engine_2.asm
View file

@ -396,10 +396,10 @@ Music8_vibrato: ; 21ab6 (8:5ab6)
ld b, $0 ld b, $0
ld hl, wc04e ld hl, wc04e
add hl, bc add hl, bc
ld [hl], a ; store delay ld [hl], a ; store delay
ld hl, wc06e ld hl, wc06e
add hl, bc add hl, bc
ld [hl], a ; store delay ld [hl], a ; store delay
call Music8_GetNextMusicByte call Music8_GetNextMusicByte
ld d, a ld d, a
and $f0 and $f0

2
audio/headers/musicheaders02.asm
View file

@ -182,5 +182,5 @@ Music_IndigoPlateau:: ; 82f1 (2:42f1)
dw Music_IndigoPlateau_Ch3 dw Music_IndigoPlateau_Ch3
db CH3 db CH3
dw Music_IndigoPlateau_Ch4 dw Music_IndigoPlateau_Ch4
; 0x82fd ; 0x82fd

2
audio/headers/musicheaders08.asm
View file

@ -53,5 +53,5 @@ Music_DefeatedGymLeader:: ; 202f4 (8:42f4)
dw Music_DefeatedGymLeader_Ch2 dw Music_DefeatedGymLeader_Ch2
db CH2 db CH2
dw Music_DefeatedGymLeader_Ch3 dw Music_DefeatedGymLeader_Ch3
; 202fd ; 202fd

2
constants/move_animation_constants.asm
View file

@ -1,4 +1,4 @@
; subanimations ; subanimations
; special effects, prefaced with "SE" for "Special Effect" ; special effects, prefaced with "SE" for "Special Effect"

8
data/wildPokemon/mansion1.asm
View file

@ -1,4 +1,4 @@
MansionMons1: MansionMons1:
db $0A db $0A
IF _RED IF _RED
db 32,KOFFING db 32,KOFFING
@ -12,7 +12,7 @@ MansionMons1:
db 37,WEEZING db 37,WEEZING
db 39,MUK db 39,MUK
ENDC ENDC
IF _GREEN || _BLUE IF _GREEN || _BLUE
db 32,GRIMER db 32,GRIMER
db 30,GRIMER db 30,GRIMER
@ -25,7 +25,7 @@ MansionMons1:
db 37,MUK db 37,MUK
db 39,WEEZING db 39,WEEZING
ENDC ENDC
IF _YELLOW IF _YELLOW
db 34,RATTATA db 34,RATTATA
db 34,RATICATE db 34,RATICATE
@ -38,6 +38,6 @@ MansionMons1:
db 34,GROWLITHE db 34,GROWLITHE
db 38,GROWLITHE db 38,GROWLITHE
ENDC ENDC
db $00 db $00

10
data/wildPokemon/mansion2.asm
View file

@ -1,4 +1,4 @@
MansionMons2: MansionMons2:
db $0A db $0A
IF _RED IF _RED
db 32,GROWLITHE db 32,GROWLITHE
@ -12,7 +12,7 @@ MansionMons2:
db 39,WEEZING db 39,WEEZING
db 37,MUK db 37,MUK
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 32,VULPIX db 32,VULPIX
db 34,GRIMER db 34,GRIMER
@ -25,7 +25,7 @@ MansionMons2:
db 39,MUK db 39,MUK
db 37,WEEZING db 37,WEEZING
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 32,GROWLITHE db 32,GROWLITHE
db 34,GRIMER db 34,GRIMER
@ -38,7 +38,7 @@ MansionMons2:
db 39,MUK db 39,MUK
db 37,WEEZING db 37,WEEZING
ENDC ENDC
IF _YELLOW IF _YELLOW
db 37,RATTATA db 37,RATTATA
db 37,RATICATE db 37,RATICATE
@ -51,6 +51,6 @@ MansionMons2:
db 35,MUK db 35,MUK
db 38,MUK db 38,MUK
ENDC ENDC
db $00 db $00

10
data/wildPokemon/mansion3.asm
View file

@ -1,4 +1,4 @@
MansionMons3: MansionMons3:
db $0A db $0A
IF _RED IF _RED
db 31,KOFFING db 31,KOFFING
@ -12,7 +12,7 @@ MansionMons3:
db 36,PONYTA db 36,PONYTA
db 42,MUK db 42,MUK
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 31,GRIMER db 31,GRIMER
db 33,VULPIX db 33,VULPIX
@ -25,7 +25,7 @@ MansionMons3:
db 36,PONYTA db 36,PONYTA
db 42,WEEZING db 42,WEEZING
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 31,GRIMER db 31,GRIMER
db 33,GROWLITHE db 33,GROWLITHE
@ -38,7 +38,7 @@ MansionMons3:
db 36,PONYTA db 36,PONYTA
db 42,WEEZING db 42,WEEZING
ENDC ENDC
IF _YELLOW IF _YELLOW
db 40,RATTATA db 40,RATTATA
db 40,RATICATE db 40,RATICATE
@ -51,6 +51,6 @@ MansionMons3:
db 38,MUK db 38,MUK
db 41,MUK db 41,MUK
ENDC ENDC
db $00 db $00

10
data/wildPokemon/mansionb1.asm
View file

@ -1,4 +1,4 @@
MansionMonsB1: MansionMonsB1:
db $0A db $0A
IF _RED IF _RED
db 33,KOFFING db 33,KOFFING
@ -12,7 +12,7 @@ MansionMonsB1:
db 42,WEEZING db 42,WEEZING
db 42,MUK db 42,MUK
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 33,GRIMER db 33,GRIMER
db 31,GRIMER db 31,GRIMER
@ -25,7 +25,7 @@ MansionMonsB1:
db 38,MAGMAR db 38,MAGMAR
db 42,WEEZING db 42,WEEZING
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 33,GRIMER db 33,GRIMER
db 31,GRIMER db 31,GRIMER
@ -38,7 +38,7 @@ MansionMonsB1:
db 38,MUK db 38,MUK
db 42,WEEZING db 42,WEEZING
ENDC ENDC
IF _YELLOW IF _YELLOW
db 35,GRIMER db 35,GRIMER
db 38,GRIMER db 38,GRIMER
@ -51,6 +51,6 @@ MansionMonsB1:
db 18,DITTO db 18,DITTO
db 12,DITTO db 12,DITTO
ENDC ENDC
db $00 db $00

2
data/wildPokemon/mtmoon1.asm
View file

@ -1,4 +1,4 @@
MoonMons1: MoonMons1:
db $0A db $0A
IF !_YELLOW IF !_YELLOW
db 8,ZUBAT db 8,ZUBAT

2
data/wildPokemon/mtmoonb1.asm
View file

@ -1,4 +1,4 @@
MoonMonsB1: MoonMonsB1:
db $0A db $0A
IF !_YELLOW IF !_YELLOW
db 8,ZUBAT db 8,ZUBAT

2
data/wildPokemon/mtmoonb2.asm
View file

@ -1,4 +1,4 @@
MoonMonsB2: MoonMonsB2:
db $0A db $0A
IF !_YELLOW IF !_YELLOW
db 9,ZUBAT db 9,ZUBAT

2
data/wildPokemon/pokemontower1.asm
View file

@ -1,4 +1,4 @@
TowerMons1: TowerMons1:
db $00 db $00
db $00 db $00

2
data/wildPokemon/pokemontower2.asm
View file

@ -1,4 +1,4 @@
TowerMons2: TowerMons2:
db $00 db $00
db $00 db $00

8
data/wildPokemon/pokemontower3.asm
View file

@ -1,6 +1,6 @@
TowerMons3: TowerMons3:
db $0A db $0A
IF !_YELLOW IF !_YELLOW
db 20,GASTLY db 20,GASTLY
db 21,GASTLY db 21,GASTLY
@ -13,7 +13,7 @@ TowerMons3:
db 22,CUBONE db 22,CUBONE
db 25,HAUNTER db 25,HAUNTER
ENDC ENDC
IF _YELLOW IF _YELLOW
db 20,GASTLY db 20,GASTLY
db 21,GASTLY db 21,GASTLY
@ -26,6 +26,6 @@ TowerMons3:
db 20,HAUNTER db 20,HAUNTER
db 25,HAUNTER db 25,HAUNTER
ENDC ENDC
db $00 db $00

8
data/wildPokemon/pokemontower4.asm
View file

@ -1,6 +1,6 @@
TowerMons4: TowerMons4:
db $0A db $0A
IF !_YELLOW IF !_YELLOW
db 20,GASTLY db 20,GASTLY
db 21,GASTLY db 21,GASTLY
@ -13,7 +13,7 @@ TowerMons4:
db 22,CUBONE db 22,CUBONE
db 24,GASTLY db 24,GASTLY
ENDC ENDC
IF _YELLOW IF _YELLOW
db 20,GASTLY db 20,GASTLY
db 21,GASTLY db 21,GASTLY
@ -26,6 +26,6 @@ TowerMons4:
db 20,HAUNTER db 20,HAUNTER
db 25,HAUNTER db 25,HAUNTER
ENDC ENDC
db $00 db $00

8
data/wildPokemon/pokemontower5.asm
View file

@ -1,6 +1,6 @@
TowerMons5: TowerMons5:
db $0A db $0A
IF !_YELLOW IF !_YELLOW
db 20,GASTLY db 20,GASTLY
db 21,GASTLY db 21,GASTLY
@ -13,7 +13,7 @@ TowerMons5:
db 22,CUBONE db 22,CUBONE
db 24,GASTLY db 24,GASTLY
ENDC ENDC
IF _YELLOW IF _YELLOW
db 22,GASTLY db 22,GASTLY
db 23,GASTLY db 23,GASTLY
@ -26,6 +26,6 @@ TowerMons5:
db 22,HAUNTER db 22,HAUNTER
db 27,HAUNTER db 27,HAUNTER
ENDC ENDC
db $00 db $00

8
data/wildPokemon/pokemontower6.asm
View file

@ -1,6 +1,6 @@
TowerMons6: TowerMons6:
db $0F db $0F
IF !_YELLOW IF !_YELLOW
db 21,GASTLY db 21,GASTLY
db 22,GASTLY db 22,GASTLY
@ -13,7 +13,7 @@ TowerMons6:
db 24,CUBONE db 24,CUBONE
db 28,HAUNTER db 28,HAUNTER
ENDC ENDC
IF _YELLOW IF _YELLOW
db 22,GASTLY db 22,GASTLY
db 23,GASTLY db 23,GASTLY
@ -26,6 +26,6 @@ TowerMons6:
db 22,HAUNTER db 22,HAUNTER
db 27,HAUNTER db 27,HAUNTER
ENDC ENDC
db $00 db $00

8
data/wildPokemon/pokemontower7.asm
View file

@ -1,6 +1,6 @@
TowerMons7: TowerMons7:
db $0F db $0F
IF !_YELLOW IF !_YELLOW
db 21,GASTLY db 21,GASTLY
db 22,GASTLY db 22,GASTLY
@ -14,7 +14,7 @@ TowerMons7:
db 30,HAUNTER db 30,HAUNTER
ENDC ENDC
IF _YELLOW IF _YELLOW
db 24,GASTLY db 24,GASTLY
db 25,GASTLY db 25,GASTLY
@ -27,6 +27,6 @@ TowerMons7:
db 24,HAUNTER db 24,HAUNTER
db 29,HAUNTER db 29,HAUNTER
ENDC ENDC
db $00 db $00

8
data/wildPokemon/powerplant.asm
View file

@ -1,7 +1,7 @@
PowerPlantMons: PowerPlantMons:
db $0A db $0A
IF !_YELLOW IF !_YELLOW
db 21,VOLTORB db 21,VOLTORB
db 21,MAGNEMITE db 21,MAGNEMITE
db 20,PIKACHU db 20,PIKACHU
@ -19,7 +19,7 @@ PowerPlantMons:
db 36,RAICHU db 36,RAICHU
ENDC ENDC
ENDC ENDC
IF _YELLOW IF _YELLOW
db 30,MAGNEMITE db 30,MAGNEMITE
db 35,MAGNEMITE db 35,MAGNEMITE
@ -32,6 +32,6 @@ PowerPlantMons:
db 33,MUK db 33,MUK
db 37,MUK db 37,MUK
ENDC ENDC
db $00 db $00

8
data/wildPokemon/rocktunnel1.asm
View file

@ -1,6 +1,6 @@
TunnelMonsB1: TunnelMonsB1:
db $0F db $0F
IF !_YELLOW IF !_YELLOW
db 16,ZUBAT db 16,ZUBAT
db 17,ZUBAT db 17,ZUBAT
@ -18,7 +18,7 @@ TunnelMonsB1:
db 13,ONIX db 13,ONIX
db 15,ONIX db 15,ONIX
ENDC ENDC
IF _YELLOW IF _YELLOW
db 15,ZUBAT db 15,ZUBAT
db 16,GEODUDE db 16,GEODUDE
@ -31,6 +31,6 @@ TunnelMonsB1:
db 19,MACHOP db 19,MACHOP
db 21,MACHOP db 21,MACHOP
ENDC ENDC
db $00 db $00

6
data/wildPokemon/rocktunnel2.asm
View file

@ -1,4 +1,4 @@
TunnelMonsB2: TunnelMonsB2:
db $0F db $0F
IF !_YELLOW IF !_YELLOW
db 16,ZUBAT db 16,ZUBAT
@ -17,7 +17,7 @@ TunnelMonsB2:
db 13,ONIX db 13,ONIX
db 18,GEODUDE db 18,GEODUDE
ENDC ENDC
IF _YELLOW IF _YELLOW
db 20,ZUBAT db 20,ZUBAT
db 17,GEODUDE db 17,GEODUDE
@ -30,6 +30,6 @@ TunnelMonsB2:
db 18,ONIX db 18,ONIX
db 22,ONIX db 22,ONIX
ENDC ENDC
db $00 db $00

2
data/wildPokemon/route1.asm
View file

@ -1,4 +1,4 @@
Route1Mons: Route1Mons:
db $19 db $19
IF !_YELLOW IF !_YELLOW
db 3,PIDGEY db 3,PIDGEY

10
data/wildPokemon/route10.asm
View file

@ -1,6 +1,6 @@
Route10Mons: Route10Mons:
db $0F db $0F
IF _RED IF _RED
db 16,VOLTORB db 16,VOLTORB
db 16,SPEAROW db 16,SPEAROW
@ -13,7 +13,7 @@ Route10Mons:
db 13,EKANS db 13,EKANS
db 17,EKANS db 17,EKANS
ENDC ENDC
IF !_RED IF !_RED
db 16,VOLTORB db 16,VOLTORB
db 16,SPEAROW db 16,SPEAROW
@ -26,7 +26,7 @@ Route10Mons:
db 13,SANDSHREW db 13,SANDSHREW
db 17,SANDSHREW db 17,SANDSHREW
ENDC ENDC
IF _YELLOW IF _YELLOW
db 16,MAGNEMITE db 16,MAGNEMITE
db 18,RATTATA db 18,RATTATA
@ -39,6 +39,6 @@ Route10Mons:
db 16,MACHOP db 16,MACHOP
db 18,MACHOP db 18,MACHOP
ENDC ENDC
db $00 db $00

10
data/wildPokemon/route11.asm
View file

@ -1,6 +1,6 @@
Route11Mons: Route11Mons:
db $0F db $0F
IF _RED IF _RED
db 14,EKANS db 14,EKANS
db 15,SPEAROW db 15,SPEAROW
@ -13,7 +13,7 @@ Route11Mons:
db 11,DROWZEE db 11,DROWZEE
db 15,DROWZEE db 15,DROWZEE
ENDC ENDC
IF _GREEN || _BLUE IF _GREEN || _BLUE
db 14,SANDSHREW db 14,SANDSHREW
db 15,SPEAROW db 15,SPEAROW
@ -26,7 +26,7 @@ Route11Mons:
db 11,DROWZEE db 11,DROWZEE
db 15,DROWZEE db 15,DROWZEE
ENDC ENDC
IF _YELLOW IF _YELLOW
db 16,PIDGEY db 16,PIDGEY
db 15,RATTATA db 15,RATTATA
@ -39,6 +39,6 @@ Route11Mons:
db 19,DROWZEE db 19,DROWZEE
db 17,RATICATE db 17,RATICATE
ENDC ENDC
db $00 db $00

8
data/wildPokemon/route12.asm
View file

@ -1,6 +1,6 @@
Route12Mons: Route12Mons:
db $0F db $0F
IF _RED || (_JAPAN && _BLUE) IF _RED || (_JAPAN && _BLUE)
db 24,ODDISH db 24,ODDISH
db 25,PIDGEY db 25,PIDGEY
@ -14,7 +14,7 @@ Route12Mons:
db 30,GLOOM db 30,GLOOM
db $00 db $00
ENDC ENDC
IF _GREEN || (!_JAPAN && _BLUE) IF _GREEN || (!_JAPAN && _BLUE)
db 24,BELLSPROUT db 24,BELLSPROUT
db 25,PIDGEY db 25,PIDGEY
@ -28,7 +28,7 @@ Route12Mons:
db 30,WEEPINBELL db 30,WEEPINBELL
db $00 db $00
ENDC ENDC
IF _YELLOW IF _YELLOW
db 25,ODDISH db 25,ODDISH
db 25,BELLSPROUT db 25,BELLSPROUT

6
data/wildPokemon/route13.asm
View file

@ -1,4 +1,4 @@
Route13Mons: Route13Mons:
IF _RED || (_JAPAN && _BLUE) IF _RED || (_JAPAN && _BLUE)
db $14 db $14
db 24,ODDISH db 24,ODDISH
@ -13,7 +13,7 @@ Route13Mons:
db 30,GLOOM db 30,GLOOM
db $00 db $00
ENDC ENDC
IF _GREEN || (!_JAPAN && _BLUE) IF _GREEN || (!_JAPAN && _BLUE)
db $14 db $14
db 24,BELLSPROUT db 24,BELLSPROUT
@ -28,7 +28,7 @@ Route13Mons:
db 30,WEEPINBELL db 30,WEEPINBELL
db $00 db $00
ENDC ENDC
IF _YELLOW IF _YELLOW
db $0F db $0F
db 25,ODDISH db 25,ODDISH

8
data/wildPokemon/route14.asm
View file

@ -1,4 +1,4 @@
Route14Mons: Route14Mons:
db $0F db $0F
IF _RED || (_JAPAN && _BLUE) IF _RED || (_JAPAN && _BLUE)
db 24,ODDISH db 24,ODDISH
@ -12,7 +12,7 @@ Route14Mons:
db 28,PIDGEOTTO db 28,PIDGEOTTO
db 30,PIDGEOTTO db 30,PIDGEOTTO
ENDC ENDC
IF _GREEN || (!_JAPAN && _BLUE) IF _GREEN || (!_JAPAN && _BLUE)
db 24,BELLSPROUT db 24,BELLSPROUT
db 26,PIDGEY db 26,PIDGEY
@ -25,7 +25,7 @@ Route14Mons:
db 28,PIDGEOTTO db 28,PIDGEOTTO
db 30,PIDGEOTTO db 30,PIDGEOTTO
ENDC ENDC
IF _YELLOW IF _YELLOW
db 26,ODDISH db 26,ODDISH
db 26,BELLSPROUT db 26,BELLSPROUT
@ -38,6 +38,6 @@ Route14Mons:
db 27,VENONAT db 27,VENONAT
db 30,VENOMOTH db 30,VENOMOTH
ENDC ENDC
db $00 db $00

8
data/wildPokemon/route15.asm
View file

@ -1,4 +1,4 @@
Route15Mons: Route15Mons:
db $0F db $0F
IF _RED || (_JAPAN && _BLUE) IF _RED || (_JAPAN && _BLUE)
db 24,ODDISH db 24,ODDISH
@ -12,7 +12,7 @@ Route15Mons:
db 28,PIDGEOTTO db 28,PIDGEOTTO
db 30,PIDGEOTTO db 30,PIDGEOTTO
ENDC ENDC
IF _GREEN || (!_JAPAN && _BLUE) IF _GREEN || (!_JAPAN && _BLUE)
db 24,BELLSPROUT db 24,BELLSPROUT
db 26,DITTO db 26,DITTO
@ -25,7 +25,7 @@ Route15Mons:
db 28,PIDGEOTTO db 28,PIDGEOTTO
db 30,PIDGEOTTO db 30,PIDGEOTTO
ENDC ENDC
IF _YELLOW IF _YELLOW
db 26,ODDISH db 26,ODDISH
db 26,BELLSPROUT db 26,BELLSPROUT
@ -38,6 +38,6 @@ Route15Mons:
db 27,VENONAT db 27,VENONAT
db 30,VENOMOTH db 30,VENOMOTH
ENDC ENDC
db $00 db $00

6
data/wildPokemon/route16.asm
View file

@ -1,4 +1,4 @@
Route16Mons: Route16Mons:
db $19 db $19
IF !_YELLOW IF !_YELLOW
db 20,SPEAROW db 20,SPEAROW
@ -12,7 +12,7 @@ Route16Mons:
db 23,RATICATE db 23,RATICATE
db 25,RATICATE db 25,RATICATE
ENDC ENDC
IF _YELLOW IF _YELLOW
db 22,SPEAROW db 22,SPEAROW
db 22,DODUO db 22,DODUO
@ -25,6 +25,6 @@ Route16Mons:
db 25,RATICATE db 25,RATICATE
db 26,RATICATE db 26,RATICATE
ENDC ENDC
db $00 db $00

6
data/wildPokemon/route17.asm
View file

@ -1,4 +1,4 @@
Route17Mons: Route17Mons:
db $19 db $19
IF !_YELLOW IF !_YELLOW
db 20,SPEAROW db 20,SPEAROW
@ -12,7 +12,7 @@ Route17Mons:
db 25,FEAROW db 25,FEAROW
db 27,FEAROW db 27,FEAROW
ENDC ENDC
IF _YELLOW IF _YELLOW
db 26,DODUO db 26,DODUO
db 27,FEAROW db 27,FEAROW
@ -25,6 +25,6 @@ Route17Mons:
db 32,PONYTA db 32,PONYTA
db 29,DODRIO db 29,DODRIO
ENDC ENDC
db $00 db $00

6
data/wildPokemon/route18.asm
View file

@ -1,4 +1,4 @@
Route18Mons: Route18Mons:
db $19 db $19
IF !_YELLOW IF !_YELLOW
db 20,SPEAROW db 20,SPEAROW
@ -12,7 +12,7 @@ Route18Mons:
db 27,FEAROW db 27,FEAROW
db 29,FEAROW db 29,FEAROW
ENDC ENDC
IF _YELLOW IF _YELLOW
db 22,SPEAROW db 22,SPEAROW
db 22,DODUO db 22,DODUO
@ -25,6 +25,6 @@ Route18Mons:
db 25,RATICATE db 25,RATICATE
db 26,RATICATE db 26,RATICATE
ENDC ENDC
db $00 db $00

4
data/wildPokemon/route2.asm
View file

@ -1,6 +1,6 @@
Route2Mons: Route2Mons:
db $19 db $19
IF !_YELLOW IF !_YELLOW
db 3,RATTATA db 3,RATTATA
db 3,PIDGEY db 3,PIDGEY

6
data/wildPokemon/route21.asm
View file

@ -1,4 +1,4 @@
Route21Mons: Route21Mons:
db $19 db $19
IF !_YELLOW IF !_YELLOW
db 21,RATTATA db 21,RATTATA
@ -12,7 +12,7 @@ Route21Mons:
db 30,TANGELA db 30,TANGELA
db 32,TANGELA db 32,TANGELA
ENDC ENDC
IF _YELLOW IF _YELLOW
db 15,PIDGEY db 15,PIDGEY
db 13,RATTATA db 13,RATTATA
@ -25,7 +25,7 @@ Route21Mons:
db 19,PIDGEOTTO db 19,PIDGEOTTO
db 15,PIDGEOTTO db 15,PIDGEOTTO
ENDC ENDC
db $05 db $05
db 5,TENTACOOL db 5,TENTACOOL
db 10,TENTACOOL db 10,TENTACOOL

2
data/wildPokemon/route22.asm
View file

@ -1,4 +1,4 @@
Route22Mons: Route22Mons:
db $19 db $19
IF _RED || (_JAPAN && _BLUE) IF _RED || (_JAPAN && _BLUE)
db 3,RATTATA db 3,RATTATA

6
data/wildPokemon/route23.asm
View file

@ -1,4 +1,4 @@
Route23Mons: Route23Mons:
db $0A db $0A
IF !_YELLOW IF !_YELLOW
IF _RED IF _RED
@ -22,7 +22,7 @@ Route23Mons:
db 41,FEAROW db 41,FEAROW
db 43,FEAROW db 43,FEAROW
ENDC ENDC
IF _YELLOW IF _YELLOW
db 41,NIDORINO db 41,NIDORINO
db 41,NIDORINA db 41,NIDORINA
@ -35,6 +35,6 @@ Route23Mons:
db 41,PRIMEAPE db 41,PRIMEAPE
db 46,PRIMEAPE db 46,PRIMEAPE
ENDC ENDC
db $00 db $00

12
data/wildPokemon/route24.asm
View file

@ -1,6 +1,6 @@
Route24Mons: Route24Mons:
db $19 db $19
IF _RED IF _RED
db 7,WEEDLE db 7,WEEDLE
db 8,KAKUNA db 8,KAKUNA
@ -13,7 +13,7 @@ Route24Mons:
db 8,ABRA db 8,ABRA
db 12,ABRA db 12,ABRA
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 7,CATERPIE db 7,CATERPIE
db 8,METAPOD db 8,METAPOD
@ -26,7 +26,7 @@ Route24Mons:
db 8,ABRA db 8,ABRA
db 12,ABRA db 12,ABRA
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 7,CATERPIE db 7,CATERPIE
db 8,METAPOD db 8,METAPOD
@ -39,7 +39,7 @@ Route24Mons:
db 8,ABRA db 8,ABRA
db 12,ABRA db 12,ABRA
ENDC ENDC
IF _YELLOW IF _YELLOW
db 12,ODDISH db 12,ODDISH
db 12,BELLSPROUT db 12,BELLSPROUT
@ -52,6 +52,6 @@ Route24Mons:
db 17,PIDGEY db 17,PIDGEY
db 17,PIDGEOTTO db 17,PIDGEOTTO
ENDC ENDC
db $00 db $00

12
data/wildPokemon/route25.asm
View file

@ -1,6 +1,6 @@
Route25Mons: Route25Mons:
db $0F db $0F
IF _RED IF _RED
db 8,WEEDLE db 8,WEEDLE
db 9,KAKUNA db 9,KAKUNA
@ -13,7 +13,7 @@ Route25Mons:
db 7,METAPOD db 7,METAPOD
db 8,CATERPIE db 8,CATERPIE
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 8,CATERPIE db 8,CATERPIE
db 9,METAPOD db 9,METAPOD
@ -26,7 +26,7 @@ Route25Mons:
db 7,KAKUNA db 7,KAKUNA
db 8,WEEDLE db 8,WEEDLE
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 8,CATERPIE db 8,CATERPIE
db 9,METAPOD db 9,METAPOD
@ -39,7 +39,7 @@ Route25Mons:
db 7,KAKUNA db 7,KAKUNA
db 8,WEEDLE db 8,WEEDLE
ENDC ENDC
IF _YELLOW IF _YELLOW
db 12,ODDISH db 12,ODDISH
db 12,BELLSPROUT db 12,BELLSPROUT
@ -52,6 +52,6 @@ Route25Mons:
db 17,PIDGEY db 17,PIDGEY
db 17,PIDGEOTTO db 17,PIDGEOTTO
ENDC ENDC
db $00 db $00

2
data/wildPokemon/route3.asm
View file

@ -1,4 +1,4 @@
Route3Mons: Route3Mons:
db $14 db $14
IF !_YELLOW IF !_YELLOW
db 6,PIDGEY db 6,PIDGEY

8
data/wildPokemon/route4.asm
View file

@ -1,6 +1,6 @@
Route4Mons: Route4Mons:
db $14 db $14
IF _RED IF _RED
db 10,RATTATA db 10,RATTATA
db 10,SPEAROW db 10,SPEAROW
@ -13,7 +13,7 @@ Route4Mons:
db 8,EKANS db 8,EKANS
db 12,EKANS db 12,EKANS
ENDC ENDC
IF !_RED IF !_RED
db 10,RATTATA db 10,RATTATA
db 10,SPEAROW db 10,SPEAROW
@ -26,7 +26,7 @@ Route4Mons:
db 8,SANDSHREW db 8,SANDSHREW
db 12,SANDSHREW db 12,SANDSHREW
ENDC ENDC
IF _YELLOW IF _YELLOW
db 8,SPEAROW db 8,SPEAROW
db 9,SPEAROW db 9,SPEAROW

12
data/wildPokemon/route5.asm
View file

@ -1,6 +1,6 @@
Route5Mons: Route5Mons:
db $0F db $0F
IF _RED IF _RED
db 13,ODDISH db 13,ODDISH
db 13,PIDGEY db 13,PIDGEY
@ -13,7 +13,7 @@ Route5Mons:
db 14,MANKEY db 14,MANKEY
db 16,MANKEY db 16,MANKEY
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 13,BELLSPROUT db 13,BELLSPROUT
db 13,PIDGEY db 13,PIDGEY
@ -26,7 +26,7 @@ Route5Mons:
db 14,MEOWTH db 14,MEOWTH
db 16,MEOWTH db 16,MEOWTH
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 13,ODDISH db 13,ODDISH
db 13,PIDGEY db 13,PIDGEY
@ -39,7 +39,7 @@ Route5Mons:
db 14,MEOWTH db 14,MEOWTH
db 16,MEOWTH db 16,MEOWTH
ENDC ENDC
IF _YELLOW IF _YELLOW
db 15,PIDGEY db 15,PIDGEY
db 14,RATTATA db 14,RATTATA
@ -52,6 +52,6 @@ Route5Mons:
db 5,JIGGLYPUFF db 5,JIGGLYPUFF
db 7,JIGGLYPUFF db 7,JIGGLYPUFF
ENDC ENDC
db $00 db $00

10
data/wildPokemon/route6.asm
View file

@ -1,6 +1,6 @@
Route6Mons: Route6Mons:
db $0F db $0F
IF _RED IF _RED
db 13,ODDISH db 13,ODDISH
db 13,PIDGEY db 13,PIDGEY
@ -14,7 +14,7 @@ Route6Mons:
db 16,MANKEY db 16,MANKEY
db $00 db $00
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 13,BELLSPROUT db 13,BELLSPROUT
db 13,PIDGEY db 13,PIDGEY
@ -28,7 +28,7 @@ Route6Mons:
db 16,MEOWTH db 16,MEOWTH
db $00 db $00
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 13,ODDISH db 13,ODDISH
db 13,PIDGEY db 13,PIDGEY
@ -42,7 +42,7 @@ Route6Mons:
db 16,MEOWTH db 16,MEOWTH
db $00 db $00
ENDC ENDC
IF _YELLOW IF _YELLOW
db 15,PIDGEY db 15,PIDGEY
db 14,RATTATA db 14,RATTATA

12
data/wildPokemon/route7.asm
View file

@ -1,6 +1,6 @@
Route7Mons: Route7Mons:
db $0F db $0F
IF _RED IF _RED
db 19,PIDGEY db 19,PIDGEY
db 19,ODDISH db 19,ODDISH
@ -13,7 +13,7 @@ Route7Mons:
db 19,MANKEY db 19,MANKEY
db 20,MANKEY db 20,MANKEY
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 19,PIDGEY db 19,PIDGEY
db 19,BELLSPROUT db 19,BELLSPROUT
@ -26,7 +26,7 @@ Route7Mons:
db 19,MEOWTH db 19,MEOWTH
db 20,MEOWTH db 20,MEOWTH
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 19,PIDGEY db 19,PIDGEY
db 19,ODDISH db 19,ODDISH
@ -39,7 +39,7 @@ Route7Mons:
db 19,MEOWTH db 19,MEOWTH
db 20,MEOWTH db 20,MEOWTH
ENDC ENDC
IF _YELLOW IF _YELLOW
db 20,PIDGEY db 20,PIDGEY
db 22,PIDGEY db 22,PIDGEY
@ -52,6 +52,6 @@ Route7Mons:
db 24,JIGGLYPUFF db 24,JIGGLYPUFF
db 24,JIGGLYPUFF db 24,JIGGLYPUFF
ENDC ENDC
db $00 db $00

12
data/wildPokemon/route8.asm
View file

@ -1,6 +1,6 @@
Route8Mons: Route8Mons:
db $0F db $0F
IF _RED IF _RED
db 18,PIDGEY db 18,PIDGEY
db 18,MANKEY db 18,MANKEY
@ -13,7 +13,7 @@ Route8Mons:
db 15,GROWLITHE db 15,GROWLITHE
db 18,GROWLITHE db 18,GROWLITHE
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 18,PIDGEY db 18,PIDGEY
db 18,MEOWTH db 18,MEOWTH
@ -26,7 +26,7 @@ Route8Mons:
db 15,VULPIX db 15,VULPIX
db 18,VULPIX db 18,VULPIX
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 18,PIDGEY db 18,PIDGEY
db 18,MEOWTH db 18,MEOWTH
@ -39,7 +39,7 @@ Route8Mons:
db 15,GROWLITHE db 15,GROWLITHE
db 18,GROWLITHE db 18,GROWLITHE
ENDC ENDC
IF _YELLOW IF _YELLOW
db 20,PIDGEY db 20,PIDGEY
db 22,PIDGEY db 22,PIDGEY
@ -52,6 +52,6 @@ Route8Mons:
db 20,KADABRA db 20,KADABRA
db 27,KADABRA db 27,KADABRA
ENDC ENDC
db $00 db $00

10
data/wildPokemon/route9.asm
View file

@ -1,6 +1,6 @@
Route9Mons: Route9Mons:
db $0F db $0F
IF _RED IF _RED
db 16,RATTATA db 16,RATTATA
db 16,SPEAROW db 16,SPEAROW
@ -13,7 +13,7 @@ Route9Mons:
db 13,EKANS db 13,EKANS
db 17,EKANS db 17,EKANS
ENDC ENDC
IF !_RED && !_YELLOW IF !_RED && !_YELLOW
db 16,RATTATA db 16,RATTATA
db 16,SPEAROW db 16,SPEAROW
@ -26,7 +26,7 @@ Route9Mons:
db 13,SANDSHREW db 13,SANDSHREW
db 17,SANDSHREW db 17,SANDSHREW
ENDC ENDC
IF _YELLOW IF _YELLOW
db 16,NIDORAN_M db 16,NIDORAN_M
db 16,NIDORAN_F db 16,NIDORAN_F
@ -39,6 +39,6 @@ Route9Mons:
db 20,RATICATE db 20,RATICATE
db 19,FEAROW db 19,FEAROW
ENDC ENDC
db $00 db $00

8
data/wildPokemon/safarizone1.asm
View file

@ -1,4 +1,4 @@
ZoneMons1: ZoneMons1:
db $1E db $1E
IF _RED || (_JAPAN && _BLUE) IF _RED || (_JAPAN && _BLUE)
db 24,NIDORAN_M db 24,NIDORAN_M
@ -17,7 +17,7 @@ ZoneMons1:
ENDC ENDC
db 28,SCYTHER db 28,SCYTHER
ENDC ENDC
IF _GREEN || (!_JAPAN && _BLUE) IF _GREEN || (!_JAPAN && _BLUE)
db 24,NIDORAN_F db 24,NIDORAN_F
db 26,DODUO db 26,DODUO
@ -30,7 +30,7 @@ ZoneMons1:
db 25,KANGASKHAN db 25,KANGASKHAN
db 28,PINSIR db 28,PINSIR
ENDC ENDC
IF _YELLOW IF _YELLOW
db 21,NIDORAN_M db 21,NIDORAN_M
db 29,NIDORAN_F db 29,NIDORAN_F
@ -43,6 +43,6 @@ ZoneMons1:
db 21,CHANSEY db 21,CHANSEY
db 15,SCYTHER db 15,SCYTHER
ENDC ENDC
db $00 db $00

6
data/wildPokemon/safarizone2.asm
View file

@ -1,4 +1,4 @@
ZoneMons2: ZoneMons2:
db $1E db $1E
IF !_YELLOW IF !_YELLOW
IF _RED || (_JAPAN && _BLUE) IF _RED || (_JAPAN && _BLUE)
@ -32,7 +32,7 @@ ZoneMons2:
db 28,PINSIR db 28,PINSIR
ENDC ENDC
ENDC ENDC
IF _YELLOW IF _YELLOW
db 36,NIDORAN_M db 36,NIDORAN_M
db 14,NIDORAN_F db 14,NIDORAN_F
@ -45,6 +45,6 @@ ZoneMons2:
db 25,SCYTHER db 25,SCYTHER
db 15,PINSIR db 15,PINSIR
ENDC ENDC
db $00 db $00

10
data/wildPokemon/safarizone3.asm
View file

@ -1,4 +1,4 @@
ZoneMons3: ZoneMons3:
db $1E db $1E
IF _RED IF _RED
db 25,NIDORAN_M db 25,NIDORAN_M
@ -12,7 +12,7 @@ ZoneMons3:
db 26,TAUROS db 26,TAUROS
db 28,KANGASKHAN db 28,KANGASKHAN
ENDC ENDC
IF _GREEN || (!_JAPAN && _BLUE) IF _GREEN || (!_JAPAN && _BLUE)
db 25,NIDORAN_F db 25,NIDORAN_F
db 26,DODUO db 26,DODUO
@ -25,7 +25,7 @@ ZoneMons3:
db 26,TAUROS db 26,TAUROS
db 28,KANGASKHAN db 28,KANGASKHAN
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 25,NIDORAN_M db 25,NIDORAN_M
db 26,DODUO db 26,DODUO
@ -38,7 +38,7 @@ ZoneMons3:
db 26,PINSIR db 26,PINSIR
db 28,LICKITUNG db 28,LICKITUNG
ENDC ENDC
IF _YELLOW IF _YELLOW
db 29,NIDORAN_M db 29,NIDORAN_M
db 21,NIDORAN_F db 21,NIDORAN_F
@ -51,6 +51,6 @@ ZoneMons3:
db 25,PINSIR db 25,PINSIR
db 27,TANGELA db 27,TANGELA
ENDC ENDC
db $00 db $00

10
data/wildPokemon/safarizonecenter.asm
View file

@ -1,4 +1,4 @@
ZoneMonsCenter: ZoneMonsCenter:
db $1E db $1E
IF _RED IF _RED
db 22,NIDORAN_M db 22,NIDORAN_M
@ -12,7 +12,7 @@ ZoneMonsCenter:
db 23,SCYTHER db 23,SCYTHER
db 23,CHANSEY db 23,CHANSEY
ENDC ENDC
IF _GREEN || (!_JAPAN && _BLUE) IF _GREEN || (!_JAPAN && _BLUE)
db 22,NIDORAN_F db 22,NIDORAN_F
db 25,RHYHORN db 25,RHYHORN
@ -25,7 +25,7 @@ ZoneMonsCenter:
db 23,PINSIR db 23,PINSIR
db 23,CHANSEY db 23,CHANSEY
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 22,NIDORAN_M db 22,NIDORAN_M
db 25,RHYHORN db 25,RHYHORN
@ -38,7 +38,7 @@ ZoneMonsCenter:
db 23,SCYTHER db 23,SCYTHER
db 23,CHANSEY db 23,CHANSEY
ENDC ENDC
IF _YELLOW IF _YELLOW
db 14,NIDORAN_M db 14,NIDORAN_M
db 36,NIDORAN_F db 36,NIDORAN_F
@ -51,6 +51,6 @@ ZoneMonsCenter:
db 22,TANGELA db 22,TANGELA
db 7,CHANSEY db 7,CHANSEY
ENDC ENDC
db $00 db $00

10
data/wildPokemon/seafoamisland1.asm
View file

@ -1,4 +1,4 @@
IslandMons1: IslandMons1:
db $0F db $0F
IF _RED IF _RED
db 30,SEEL db 30,SEEL
@ -12,7 +12,7 @@ IslandMons1:
db 28,SHELLDER db 28,SHELLDER
db 38,GOLDUCK db 38,GOLDUCK
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 30,SEEL db 30,SEEL
db 30,PSYDUCK db 30,PSYDUCK
@ -25,7 +25,7 @@ IslandMons1:
db 28,STARYU db 28,STARYU
db 38,SLOWBRO db 38,SLOWBRO
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 30,SEEL db 30,SEEL
db 30,HORSEA db 30,HORSEA
@ -38,7 +38,7 @@ IslandMons1:
db 28,STARYU db 28,STARYU
db 38,SLOWBRO db 38,SLOWBRO
ENDC ENDC
IF _YELLOW IF _YELLOW
db 18,ZUBAT db 18,ZUBAT
db 25,KRABBY db 25,KRABBY
@ -51,6 +51,6 @@ IslandMons1:
db 27,GOLBAT db 27,GOLBAT
db 36,GOLBAT db 36,GOLBAT
ENDC ENDC
db $00 db $00

10
data/wildPokemon/seafoamislandb1.asm
View file

@ -1,4 +1,4 @@
IslandMonsB1: IslandMonsB1:
db $0A db $0A
IF _RED IF _RED
db 30,STARYU db 30,STARYU
@ -12,7 +12,7 @@ IslandMonsB1:
db 38,DEWGONG db 38,DEWGONG
db 37,SEADRA db 37,SEADRA
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 30,SHELLDER db 30,SHELLDER
db 30,KRABBY db 30,KRABBY
@ -25,7 +25,7 @@ IslandMonsB1:
db 38,DEWGONG db 38,DEWGONG
db 37,KINGLER db 37,KINGLER
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 30,SHELLDER db 30,SHELLDER
db 30,KRABBY db 30,KRABBY
@ -38,7 +38,7 @@ IslandMonsB1:
db 38,DEWGONG db 38,DEWGONG
db 37,KINGLER db 37,KINGLER
ENDC ENDC
IF _YELLOW IF _YELLOW
db 27,ZUBAT db 27,ZUBAT
db 26,KRABBY db 26,KRABBY
@ -51,6 +51,6 @@ IslandMonsB1:
db 22,SEEL db 22,SEEL
db 26,SEEL db 26,SEEL
ENDC ENDC
db $00 db $00

10
data/wildPokemon/seafoamislandb2.asm
View file

@ -1,4 +1,4 @@
IslandMonsB2: IslandMonsB2:
db $0A db $0A
IF _RED IF _RED
db 30,SEEL db 30,SEEL
@ -12,7 +12,7 @@ IslandMonsB2:
db 30,GOLBAT db 30,GOLBAT
db 37,SLOWBRO db 37,SLOWBRO
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 30,SEEL db 30,SEEL
db 30,PSYDUCK db 30,PSYDUCK
@ -25,7 +25,7 @@ IslandMonsB2:
db 30,GOLBAT db 30,GOLBAT
db 37,GOLDUCK db 37,GOLDUCK
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 30,SEEL db 30,SEEL
db 30,HORSEA db 30,HORSEA
@ -38,7 +38,7 @@ IslandMonsB2:
db 30,GOLBAT db 30,GOLBAT
db 37,JYNX db 37,JYNX
ENDC ENDC
IF _YELLOW IF _YELLOW
db 27,ZUBAT db 27,ZUBAT
db 27,KRABBY db 27,KRABBY
@ -51,6 +51,6 @@ IslandMonsB2:
db 31,SLOWPOKE db 31,SLOWPOKE
db 31,SLOWBRO db 31,SLOWBRO
ENDC ENDC
db $00 db $00

10
data/wildPokemon/seafoamislandb3.asm
View file

@ -1,4 +1,4 @@
IslandMonsB3: IslandMonsB3:
db $0A db $0A
IF _RED IF _RED
db 31,SLOWPOKE db 31,SLOWPOKE
@ -12,7 +12,7 @@ IslandMonsB3:
db 39,SEADRA db 39,SEADRA
db 37,DEWGONG db 37,DEWGONG
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 31,PSYDUCK db 31,PSYDUCK
db 31,SEEL db 31,SEEL
@ -25,7 +25,7 @@ IslandMonsB3:
db 39,KINGLER db 39,KINGLER
db 37,DEWGONG db 37,DEWGONG
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 31,HORSEA db 31,HORSEA
db 31,SEEL db 31,SEEL
@ -38,7 +38,7 @@ IslandMonsB3:
db 39,KINGLER db 39,KINGLER
db 37,DEWGONG db 37,DEWGONG
ENDC ENDC
IF _YELLOW IF _YELLOW
db 27,GOLBAT db 27,GOLBAT
db 36,ZUBAT db 36,ZUBAT
@ -63,6 +63,6 @@ IslandMonsB3:
db 30,STARYU db 30,STARYU
db 30,STARYU db 30,STARYU
ENDC ENDC
db $00 db $00

10
data/wildPokemon/seafoamislandb4.asm
View file

@ -1,4 +1,4 @@
IslandMonsB4: IslandMonsB4:
db $0A db $0A
IF _RED IF _RED
db 31,HORSEA db 31,HORSEA
@ -12,7 +12,7 @@ IslandMonsB4:
db 39,SLOWBRO db 39,SLOWBRO
db 32,GOLBAT db 32,GOLBAT
ENDC ENDC
IF _GREEN || !_JAPAN && _BLUE IF _GREEN || !_JAPAN && _BLUE
db 31,KRABBY db 31,KRABBY
db 31,STARYU db 31,STARYU
@ -25,7 +25,7 @@ IslandMonsB4:
db 39,GOLDUCK db 39,GOLDUCK
db 32,GOLBAT db 32,GOLBAT
ENDC ENDC
IF _JAPAN && _BLUE IF _JAPAN && _BLUE
db 31,KRABBY db 31,KRABBY
db 31,STARYU db 31,STARYU
@ -38,7 +38,7 @@ IslandMonsB4:
db 39,JYNX db 39,JYNX
db 32,GOLBAT db 32,GOLBAT
ENDC ENDC
IF _YELLOW IF _YELLOW
db 36,GOLBAT db 36,GOLBAT
db 36,ZUBAT db 36,ZUBAT
@ -63,6 +63,6 @@ IslandMonsB4:
db 30,STARYU db 30,STARYU
db 30,STARYU db 30,STARYU
ENDC ENDC
db $00 db $00

6
data/wildPokemon/unknowndungeon1.asm
View file

@ -1,4 +1,4 @@
DungeonMons1: DungeonMons1:
db $0A db $0A
IF !_YELLOW IF !_YELLOW
db 46,GOLBAT db 46,GOLBAT
@ -22,7 +22,7 @@ DungeonMons1:
db 53,RAICHU db 53,RAICHU
db 53,DITTO db 53,DITTO
ENDC ENDC
IF _YELLOW IF _YELLOW
db 50,GOLBAT db 50,GOLBAT
db 55,GOLBAT db 55,GOLBAT
@ -35,6 +35,6 @@ DungeonMons1:
db 55,DITTO db 55,DITTO
db 60,DITTO db 60,DITTO
ENDC ENDC
db $00 db $00

6
data/wildPokemon/unknowndungeon2.asm
View file

@ -1,4 +1,4 @@
DungeonMons2: DungeonMons2:
db $0F db $0F
IF !_YELLOW IF !_YELLOW
db 51,DODRIO db 51,DODRIO
@ -17,7 +17,7 @@ DungeonMons2:
db 55,DITTO db 55,DITTO
db 60,DITTO db 60,DITTO
ENDC ENDC
IF _YELLOW IF _YELLOW
db 52,GOLBAT db 52,GOLBAT
db 57,GOLBAT db 57,GOLBAT
@ -30,6 +30,6 @@ DungeonMons2:
db 60,RHYDON db 60,RHYDON
db 58,RHYDON db 58,RHYDON
ENDC ENDC
db $00 db $00

6
data/wildPokemon/unknowndungeonb1.asm
View file

@ -1,4 +1,4 @@
DungeonMonsB1: DungeonMonsB1:
db $19 db $19
IF !_YELLOW IF !_YELLOW
db 55,RHYDON db 55,RHYDON
@ -17,7 +17,7 @@ DungeonMonsB1:
db 63,DITTO db 63,DITTO
db 67,DITTO db 67,DITTO
ENDC ENDC
IF _YELLOW IF _YELLOW
db 54,GOLBAT db 54,GOLBAT
db 59,GOLBAT db 59,GOLBAT
@ -30,6 +30,6 @@ DungeonMonsB1:
db 55,LICKITUNG db 55,LICKITUNG
db 50,LICKITUNG db 50,LICKITUNG
ENDC ENDC
db $00 db $00

4
data/wildPokemon/victoryroad1.asm
View file

@ -1,4 +1,4 @@
PlateauMons1: PlateauMons1:
db $0F db $0F
IF !_YELLOW IF !_YELLOW
db 24,MACHOP db 24,MACHOP
@ -25,6 +25,6 @@ PlateauMons1:
db 41,GRAVELER db 41,GRAVELER
db 47,GRAVELER db 47,GRAVELER
ENDC ENDC
db $00 db $00

6
data/wildPokemon/victoryroad2.asm
View file

@ -1,4 +1,4 @@
PlateauMons2: PlateauMons2:
db $0A db $0A
IF !_YELLOW IF !_YELLOW
db 22,MACHOP db 22,MACHOP
@ -12,7 +12,7 @@ PlateauMons2:
db 40,MAROWAK db 40,MAROWAK
db 43,GRAVELER db 43,GRAVELER
ENDC ENDC
IF _YELLOW IF _YELLOW
db 31,GEODUDE db 31,GEODUDE
db 36,GEODUDE db 36,GEODUDE
@ -25,6 +25,6 @@ PlateauMons2:
db 39,MACHOKE db 39,MACHOKE
db 42,MACHOKE db 42,MACHOKE
ENDC ENDC
db $00 db $00

6
data/wildPokemon/victoryroad3.asm
View file

@ -1,4 +1,4 @@
PlateauMons3: PlateauMons3:
db $0F db $0F
IF !_YELLOW IF !_YELLOW
db 24,MACHOP db 24,MACHOP
@ -12,7 +12,7 @@ PlateauMons3:
db 42,MACHOKE db 42,MACHOKE
db 45,MACHOKE db 45,MACHOKE
ENDC ENDC
IF _YELLOW IF _YELLOW
db 36,GEODUDE db 36,GEODUDE
db 44,GOLBAT db 44,GOLBAT
@ -25,6 +25,6 @@ PlateauMons3:
db 47,GRAVELER db 47,GRAVELER
db 47,GRAVELER db 47,GRAVELER
ENDC ENDC
db $00 db $00

6
data/wildPokemon/viridianforest.asm
View file

@ -1,4 +1,4 @@
ForestMons: ; ForestMons:
IF !_YELLOW IF !_YELLOW
db $08 db $08
IF _RED IF _RED
@ -21,11 +21,11 @@ ForestMons: ;
db 4,KAKUNA db 4,KAKUNA
db 3,WEEDLE db 3,WEEDLE
ENDC ENDC
db 3,PIKACHU db 3,PIKACHU
db 5,PIKACHU db 5,PIKACHU
ENDC ENDC
IF _YELLOW IF _YELLOW
db $19 db $19
db 3,CATERPIE db 3,CATERPIE

2
data/wildPokemon/waterpokemon.asm
View file

@ -1,4 +1,4 @@
WaterMons: ; WaterMons:
db $00 db $00
db $05 db $05

4
macros.asm
View file

@ -89,7 +89,7 @@ tileset: MACRO
INDOOR EQU 0 INDOOR EQU 0
CAVE EQU 1 CAVE EQU 1
OUTDOOR EQU 2 OUTDOOR EQU 2
; macro for two nibbles ; macro for two nibbles
dn: MACRO dn: MACRO
db (\1 << 4 | \2) db (\1 << 4 | \2)
@ -142,7 +142,7 @@ PREDEF: MACRO
ld a, (\1 - PredefPointers) / 3 ld a, (\1 - PredefPointers) / 3
call Predef call Predef
ENDM ENDM
PREDEF_JUMP: MACRO PREDEF_JUMP: MACRO
ld a, (\1 - PredefPointers) / 3 ld a, (\1 - PredefPointers) / 3
jp Predef jp Predef

2
scripts/route22.asm
View file

@ -72,7 +72,7 @@ Route22Script0: ; 50f00 (14:4f00)
jp nz, Route22Script_5104e jp nz, Route22Script_5104e
ret ret
.Route22RivalBattleCoords .Route22RivalBattleCoords
db $04, $1D db $04, $1D
db $05, $1D db $05, $1D
db $FF db $FF

2
scripts/route5gate.asm
View file

@ -59,7 +59,7 @@ Route5GateScript1: ; 1df94 (7:5f94)
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld [W_ROUTE5GATECURSCRIPT], a ld [W_ROUTE5GATECURSCRIPT], a
ret ret
Route5GateTextPointers: ; 1dfa4 (7:5fa4) Route5GateTextPointers: ; 1dfa4 (7:5fa4)
dw Route5GateText1 dw Route5GateText1
dw Route5GateText2 dw Route5GateText2

2
wram.asm
View file

@ -102,7 +102,7 @@ wSpriteStateData2:: ; c200
; holds info for 16 sprites with $10 bytes each ; holds info for 16 sprites with $10 bytes each
; player sprite is always sprite 0 ; player sprite is always sprite 0
; C2x0: walk animation counter (counting from $10 backwards when moving) ; 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) ; 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) ; 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) ; C2x4: Y position (in 2x2 tile grid steps, topmost 2x2 tile has value 4)