diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-06 13:51:06 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:32:39 -0400 |
| commit | 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 (patch) | |
| tree | 08106f9eec9cff1137269c20ccf848cfeffa71c6 | |
| parent | 10af88ddd712415f2a0a2b6124187d51075c95d5 (diff) | |
Build only Yellow
Conflicts:
gfx/intro_nido_1.6x6.png
gfx/intro_nido_2.6x6.png
gfx/intro_nido_3.6x6.png
gfx/redgreenversion.png
text.asm
text/maps/cerulean_trade_house.asm
text/maps/copycats_house_1f.asm
text/maps/daycare_2.asm
text/maps/museum_2f.asm
text/maps/oaks_lab.asm
text/maps/pewter_gym.asm
text/maps/route_9_1.asm
text/maps/school.asm
text/maps/vermilion_gym_1.asm
yellow/main.asm
173 files changed, 643 insertions, 3077 deletions
diff --git a/audio/music/yellow/meetjessiejames.asm b/audio/music/meetjessiejames.asm index 5ef52491..5ef52491 100644 --- a/audio/music/yellow/meetjessiejames.asm +++ b/audio/music/meetjessiejames.asm diff --git a/audio/music/yellow/surfingpikachu.asm b/audio/music/surfingpikachu.asm index 1832bb03..1832bb03 100644 --- a/audio/music/yellow/surfingpikachu.asm +++ b/audio/music/surfingpikachu.asm diff --git a/audio/music/yellow/yellowintro.asm b/audio/music/yellowintro.asm index 4d9cf938..4d9cf938 100644 --- a/audio/music/yellow/yellowintro.asm +++ b/audio/music/yellowintro.asm diff --git a/audio/music/yellow/yellowunusedsong.asm b/audio/music/yellowunusedsong.asm index e8c2a7ba..e8c2a7ba 100644 --- a/audio/music/yellow/yellowunusedsong.asm +++ b/audio/music/yellowunusedsong.asm diff --git a/audio/sfx/sfx_1f_5d.asm b/audio/sfx/sfx_1f_5d.asm index f0606032..b26e5e09 100755 --- a/audio/sfx/sfx_1f_5d.asm +++ b/audio/sfx/sfx_1f_5d.asm @@ -1,37 +1,20 @@ SFX_1f_5d_Ch1: ; 7c45e (1f:445e) duty 2 -IF DEF(_RED) unknownsfx0x20 4, 244, 0, 7 unknownsfx0x20 3, 228, 128, 6 unknownsfx0x20 3, 228, 192, 6 unknownsfx0x20 3, 228, 0, 7 unknownsfx0x20 2, 228, 160, 7 -ELSE - unknownsfx0x20 3, 228, 0, 6 - unknownsfx0x20 3, 228, 128, 6 - unknownsfx0x20 3, 228, 192, 6 - unknownsfx0x20 3, 228, 0, 7 - unknownsfx0x20 15, 242, 224, 7 -ENDC endchannel SFX_1f_5d_Ch2: ; 7c475 (1f:4475) duty 2 -IF DEF(_RED) unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 3, 212, 1, 7 unknownsfx0x20 3, 196, 129, 6 unknownsfx0x20 3, 196, 193, 6 unknownsfx0x20 3, 196, 1, 7 unknownsfx0x20 2, 196, 161, 7 -ELSE - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 3, 196, 1, 6 - unknownsfx0x20 3, 196, 129, 6 - unknownsfx0x20 3, 196, 193, 6 - unknownsfx0x20 3, 196, 1, 7 - unknownsfx0x20 15, 210, 225, 7 -ENDC endchannel ; 0x7c490 diff --git a/blue.asm b/blue.asm deleted file mode 100644 index c8c50a5d..00000000 --- a/blue.asm +++ /dev/null @@ -1,2 +0,0 @@ -_BLUE EQU 1 -INCLUDE "charmap.asm" diff --git a/blue/audio.asm b/blue/audio.asm deleted file mode 100644 index 53e37a2d..00000000 --- a/blue/audio.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "blue.asm" -INCLUDE "audio.asm" diff --git a/blue/main.asm b/blue/main.asm deleted file mode 100644 index 3fcef980..00000000 --- a/blue/main.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "blue.asm" -INCLUDE "main.asm" diff --git a/blue/text.asm b/blue/text.asm deleted file mode 100644 index ec6d7203..00000000 --- a/blue/text.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "blue.asm" -INCLUDE "text.asm" diff --git a/blue/wram.asm b/blue/wram.asm deleted file mode 100644 index 70292177..00000000 --- a/blue/wram.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "blue.asm" -INCLUDE "wram.asm" diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 11deedd0..4e764433 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -246,6 +246,4 @@ TRADE_CENTER EQU $F0 LORELEIS_ROOM EQU $F5 BRUNOS_ROOM EQU $F6 AGATHAS_ROOM EQU $F7 -IF DEF(_OPTION_BEACH_HOUSE) BEACH_HOUSE EQU $F8 -ENDC diff --git a/constants/map_dimensions.asm b/constants/map_dimensions.asm index 236ccac4..cd7980ef 100755 --- a/constants/map_dimensions.asm +++ b/constants/map_dimensions.asm @@ -892,7 +892,5 @@ BRUNOS_ROOM_WIDTH EQU $05 AGATHAS_ROOM_HEIGHT EQU $06 AGATHAS_ROOM_WIDTH EQU $05 -IF DEF(_OPTION_BEACH_HOUSE) BEACH_HOUSE_HEIGHT EQU 4 BEACH_HOUSE_WIDTH EQU 7 -ENDC diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index dc249d59..b5290d29 100755 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -84,6 +84,9 @@ SPRITE_LYING_OLD_MAN_UNUSED_1 EQU $46 SPRITE_LYING_OLD_MAN_UNUSED_2 EQU $47 SPRITE_LYING_OLD_MAN EQU $48 +SPRITE_JESSIE EQU $45 +SPRITE_JAMES EQU $46 + ; different kinds of people events ITEM EQU $80 TRAINER EQU $40 diff --git a/constants/tilesets.asm b/constants/tilesets.asm index bf15f24e..5d6698f5 100644 --- a/constants/tilesets.asm +++ b/constants/tilesets.asm @@ -22,6 +22,4 @@ LAB EQU 20 CLUB EQU 21 FACILITY EQU 22 PLATEAU EQU 23 -IF DEF(_OPTION_BEACH_HOUSE) BEACH_HOUSE_TILESET EQU 24 -ENDC diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm index 2ee79e6f..d9a1abf3 100755 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -14,13 +14,8 @@ dw AlakazamPicFront dw AlakazamPicBack ; attacks known at lvl 0 db TELEPORT -IF DEF(_YELLOW) - db KINESIS - db 0 -ELSE - db CONFUSION - db DISABLE -ENDC +db KINESIS +db 0 db 0 db 3 ; growth rate ; learnset diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm index 593d5f78..ef1fbc11 100755 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -25,9 +25,5 @@ db %00111000 db %11110000 db %01000011 db %00101000 -IF DEF(_YELLOW) - db %01000010 -ELSE - db %00000010 -ENDC +db %01000010 db 0 ; padding diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm index 130a3d00..248e3d6b 100755 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -14,11 +14,7 @@ dw ChanseyPicFront dw ChanseyPicBack ; attacks known at lvl 0 db POUND -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db DOUBLESLAP -ENDC +db TAIL_WHIP db 0 db 0 db 4 ; growth rate diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm index 5cbecb91..412c11e7 100755 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -25,9 +25,5 @@ db %01001111 db %11001110 db %11100011 db %00001000 -IF DEF(_YELLOW) - db %00101110 -ELSE - db %00100110 -ENDC +db %00101110 db 0 ; padding diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm index 4944572b..7412f253 100755 --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -25,9 +25,5 @@ db %00001000 db %11001110 db %00000010 db %10001000 -IF DEF(_YELLOW) - db %00000110 -ELSE - db %00000010 -ENDC +db %00000110 db 0 ; padding diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm index 0c4bad3b..c55e8bea 100755 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -25,9 +25,5 @@ db %00001000 db %11001110 db %00000010 db %10001000 -IF DEF(_YELLOW) - db %00000110 -ELSE - db %00000010 -ENDC +db %00000110 db 0 ; padding diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm index 978aa4bb..efeb785a 100755 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -14,11 +14,7 @@ dw EeveePicFront dw EeveePicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db TAIL_WHIP db 0 db 0 db 0 ; growth rate diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm index ce4a8f0a..3910bdb1 100755 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -14,11 +14,7 @@ dw FlareonPicFront dw FlareonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db TAIL_WHIP db QUICK_ATTACK db EMBER db 0 ; growth rate diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm index c9e6dc31..38856446 100755 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -13,17 +13,10 @@ INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions dw GyaradosPicFront dw GyaradosPicBack ; attacks known at lvl 0 -IF DEF(_YELLOW) db TACKLE db 0 db 0 db 0 -ELSE -db BITE -db DRAGON_RAGE -db LEER -db HYDRO_PUMP -ENDC db 5 ; growth rate ; learnset db %10100000 diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm index 5dc3532a..3a64bf09 100755 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -14,11 +14,7 @@ dw JolteonPicFront dw JolteonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db TAIL_WHIP db QUICK_ATTACK db THUNDERSHOCK db 0 ; growth rate diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm index 85ee8a35..8d3c855c 100755 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -14,13 +14,8 @@ dw KadabraPicFront dw KadabraPicBack ; attacks known at lvl 0 db TELEPORT -IF DEF(_YELLOW) - DB KINESIS - db 0 -ELSE - db CONFUSION - db DISABLE -ENDC +db KINESIS +db 0 db 0 db 3 ; growth rate ; learnset diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 64bfb0d6..35e3f542 100755 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -14,15 +14,9 @@ dw MarowakPicFront dw MarowakPicBack ; attacks known at lvl 0 db BONE_CLUB -IF DEF(_YELLOW) - db TAIL_WHIP - db 0 - db 0 -ELSE - db GROWL - db LEER - db FOCUS_ENERGY -ENDC +db TAIL_WHIP +db 0 +db 0 db 0 ; growth rate ; learnset db %10110001 diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm index eeab800b..6d07c401 100755 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -14,14 +14,9 @@ dw PrimeapePicFront dw PrimeapePicBack ; attacks known at lvl 0 db SCRATCH -IF !DEF(_YELLOW) - db LEER -ENDC db KARATE_CHOP db FURY_SWIPES -IF DEF(_YELLOW) - db LOW_KICK -ENDC +db LOW_KICK db 0 ; growth rate ; learnset db %10110001 diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm index ed4b7a1e..7be669a2 100755 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -14,11 +14,7 @@ dw VaporeonPicFront dw VaporeonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db TAIL_WHIP db QUICK_ATTACK db WATER_GUN db 0 ; growth rate diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm index f38be71c..bd1252ea 100755 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -15,13 +15,8 @@ dw VenomothPicBack ; attacks known at lvl 0 db TACKLE db DISABLE -IF DEF(_YELLOW) - db SUPERSONIC - db CONFUSION -ELSE - db POISONPOWDER - db LEECH_LIFE -ENDC +db SUPERSONIC +db CONFUSION db 0 ; growth rate ; learnset db %00101010 diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm index 62e8aaef..461ad522 100755 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -22,16 +22,8 @@ db 0 ; growth rate db %00100000 db %00000011 db %00111000 -IF DEF(_YELLOW) - db %11110000 - db %01000011 - db %00101000 - db %00100010 -ELSE - db %11010000 - db %00000011 - db %00101000 - db %00000010 -ENDC - +db %11110000 +db %01000011 +db %00101000 +db %00100010 db 0 ; padding diff --git a/data/collision.asm b/data/collision.asm index 46d5ddc6..8d35793d 100644 --- a/data/collision.asm +++ b/data/collision.asm @@ -22,6 +22,4 @@ Lab_Coll:: INCBIN "gfx/tilesets/lab.tilecoll" Club_Coll:: INCBIN "gfx/tilesets/club.tilecoll" Facility_Coll:: INCBIN "gfx/tilesets/facility.tilecoll" Plateau_Coll:: INCBIN "gfx/tilesets/plateau.tilecoll" -IF DEF(_OPTION_BEACH_HOUSE) BeachHouse_Coll:: INCBIN "gfx/tilesets/beachhouse.tilecoll" -ENDC diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index ca5aa669..a3e72093 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -6,18 +6,10 @@ PokemonTower7Object: ; 0x60ef6 (size=42) db $0 ; signs -IF DEF(_YELLOW) 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 -ELSE - db $4 ; people - db SPRITE_ROCKET, $b + 4, $9 + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $13 - db SPRITE_ROCKET, $9 + 4, $c + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $14 - db SPRITE_ROCKET, $7 + 4, $9 + 4, $ff, $d3, TRAINER | $3, ROCKET + $C8, $15 - db SPRITE_MR_FUJI, $3 + 4, $a + 4, $ff, $d0, $4 ; person -ENDC ; warp-to EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6 diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index c6f80b6c..41f0f260 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -1,42 +1,23 @@ Route19Object: ; 0x54e9a (size=87) db $43 ; border block - IF DEF(_OPTION_BEACH_HOUSE) - db $1 ; warps - db $9, $5, $0, BEACH_HOUSE - ELSE - db $0 ; warps - ENDC + db $1 ; warps + db $9, $5, $0, BEACH_HOUSE db $1 ; signs -IF DEF(_OPTION_BEACH_HOUSE) db $b,$b,$b -ELSE - db $9, $b, $b ; Route19Text11 -ENDC db $a ; people -IF DEF(_OPTION_BEACH_HOUSE) 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 -ELSE - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $8 + 4, $ff, $d2, TRAINER | 1, SWIMMER + $C8, 2 - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $d + 4, $ff, $d2, TRAINER | 2, SWIMMER + $C8, 3 -ENDC 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 -IF DEF(_OPTION_BEACH_HOUSE) db SPRITE_SWIMMER, $d + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7 -ELSE - db SPRITE_SWIMMER, $b + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7 -ENDC 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 ; warp-to - IF DEF(_OPTION_BEACH_HOUSE) - EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE - ENDC + EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE diff --git a/data/prize_mon_levels.asm b/data/prize_mon_levels.asm index 1437649c..15b9e827 100755 --- a/data/prize_mon_levels.asm +++ b/data/prize_mon_levels.asm @@ -1,5 +1,4 @@ PrizeMonLevelDictionary: ; 5298a (14:698a) -IF DEF(_RED) db ABRA,9 db CLEFAIRY,8 db NIDORINA,17 @@ -7,13 +6,3 @@ IF DEF(_RED) db DRATINI,18 db SCYTHER,25 db PORYGON,26 -ENDC -IF DEF(_BLUE) - db ABRA,6 - db CLEFAIRY,12 - db NIDORINO,17 - - db PINSIR,20 - db DRATINI,24 - db PORYGON,18 -ENDC diff --git a/data/prizes.asm b/data/prizes.asm index 3d4102b6..8d0f2826 100755 --- a/data/prizes.asm +++ b/data/prizes.asm @@ -14,49 +14,25 @@ NoThanksText: ; 5284f (14:684f) PrizeMenuMon1Entries: ; 52859 (14:6859) db ABRA db CLEFAIRY -IF DEF(_RED) db NIDORINA -ENDC -IF DEF(_BLUE) - db NIDORINO -ENDC db "@" PrizeMenuMon1Cost: ; 5285d (14:685d) -IF DEF(_RED) coins 180 coins 500 -ENDC -IF DEF(_BLUE) - coins 120 - coins 750 -ENDC coins 1200 db "@" PrizeMenuMon2Entries: ; 52864 (14:6864) -IF DEF(_RED) db DRATINI db SCYTHER -ENDC -IF DEF(_BLUE) - db PINSIR - db DRATINI -ENDC db PORYGON db "@" PrizeMenuMon2Cost: ; 52868 (14:6868) -IF DEF(_RED) coins 2800 coins 5500 coins 9999 -ENDC -IF DEF(_BLUE) - coins 2500 - coins 4600 - coins 6500 -ENDC db "@" PrizeMenuTMsEntries: ; 5286f (14:686f) diff --git a/data/sgb_border.asm b/data/sgb_border.asm index e1da84ac..5beaa65f 100755 --- a/data/sgb_border.asm +++ b/data/sgb_border.asm @@ -1,62 +1,28 @@ BorderPalettes: ; 72788 (1c:6788) -IF DEF(_RED) - INCBIN "gfx/red/sgbborder.map" -ENDC -IF DEF(_BLUE) - INCBIN "gfx/blue/sgbborder.map" -ENDC + INCBIN "gfx/tilemaps/sgbborder.map" ds $100 -IF DEF(_RED) RGB 30,29,29 ; PAL_SGB1 RGB 25,22,25 RGB 25,17,21 RGB 24,14,12 -ENDC -IF DEF(_BLUE) - RGB 0,0,0 ; PAL_SGB1 (the first color is not defined, but if used, turns up as 30,29,29... o_O) - RGB 10,17,26 - RGB 5,9,20 - RGB 16,20,27 -ENDC ds $18 -IF DEF(_RED) RGB 30,29,29 ; PAL_SGB2 RGB 22,31,16 RGB 27,20,6 RGB 15,15,15 -ENDC -IF DEF(_BLUE) - RGB 30,29,29 ; PAL_SGB2 - RGB 27,11,6 - RGB 5,9,20 - RGB 28,25,15 -ENDC ds $18 -IF DEF(_RED) RGB 30,29,29 ; PAL_SGB3 RGB 31,31,17 RGB 18,21,29 RGB 15,15,15 -ENDC -IF DEF(_BLUE) - RGB 30,29,29 ; PAL_SGB3 - RGB 12,15,11 - RGB 5,9,20 - RGB 14,22,17 -ENDC ds $18 SGBBorderGraphics: ; 72fe8 (1c:6fe8) -IF DEF(_RED) - INCBIN "gfx/red/sgbborder.2bpp" -ENDC -IF DEF(_BLUE) - INCBIN "gfx/blue/sgbborder.2bpp" -ENDC + INCBIN "gfx/sgbborder.2bpp" diff --git a/data/super_palettes.asm b/data/super_palettes.asm index c1afb003..3580a061 100755 --- a/data/super_palettes.asm +++ b/data/super_palettes.asm @@ -52,18 +52,10 @@ SuperPalettes: ; 72660 (1c:6660) RGB 20,26,31 RGB 17,23,10 RGB 3,2,2 -IF DEF(_RED) RGB 31,29,31 ; PAL_LOGO1 RGB 30,30,17 RGB 17,23,10 RGB 21,0,4 -ENDC -IF DEF(_BLUE) - RGB 31,29,31 ; PAL_LOGO1 - RGB 30,30,17 - RGB 21,0,4 - RGB 14,19,29 -ENDC RGB 31,29,31 ; PAL_LOGO2 RGB 30,30,17 RGB 18,18,24 @@ -118,31 +110,15 @@ ENDC RGB 3,2,2 RGB 31,29,31 ; PAL_SLOTS2 RGB 31,31,17 -IF DEF(_RED) RGB 25,17,21 -ENDC -IF DEF(_BLUE) - RGB 16,19,29 -ENDC RGB 3,2,2 RGB 31,29,31 ; PAL_SLOTS3 RGB 22,31,16 -IF DEF(_RED) RGB 25,17,21 -ENDC -IF DEF(_BLUE) - RGB 16,19,29 -ENDC RGB 3,2,2 RGB 31,29,31 ; PAL_SLOTS4 -IF DEF(_RED) RGB 16,19,29 RGB 25,17,21 -ENDC -IF DEF(_BLUE) - RGB 25,17,21 - RGB 16,19,29 -ENDC RGB 3,2,2 RGB 31,29,31 ; PAL_BLACK RGB 7,7,7 diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index 3e2e68bb..27ccc8f0 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -23,6 +23,4 @@ Tilesets: ; c7be (3:47be) tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE -IF DEF(_OPTION_BEACH_HOUSE) tileset BeachHouse_Block, BeachHouse_GFX, BeachHouse_Coll, $FF,$FF,$FF, $FF, INDOOR -ENDC diff --git a/data/title_mons.asm b/data/title_mons.asm index abcf1bb4..e27742af 100755 --- a/data/title_mons.asm +++ b/data/title_mons.asm @@ -1,6 +1,5 @@ TitleMons: ; 4588 (1:4588) ; mons on the title screen are randomly chosen from here -IF DEF(_RED) db CHARMANDER db SQUIRTLE db BULBASAUR @@ -17,40 +16,3 @@ IF DEF(_RED) db ONIX db PONYTA db MAGIKARP -ENDC -IF DEF(_GREEN) - db BULBASAUR - db CHARMANDER - db SQUIRTLE - db CATERPIE - db NIDORAN_F - db PINSIR - db PIKACHU - db CLEFAIRY - db RHYDON - db ABRA - db GASTLY - db DITTO - db PIDGEOTTO - db ONIX - db PONYTA - db MAGIKARP -ENDC -IF DEF(_BLUE) - db SQUIRTLE - db CHARMANDER - db BULBASAUR - db MANKEY - db HITMONLEE - db VULPIX - db CHANSEY - db AERODACTYL - db JOLTEON - db SNORLAX - db GLOOM - db POLIWAG - db DODUO - db PORYGON - db GENGAR - db RAICHU -ENDC diff --git a/data/trades.asm b/data/trades.asm index b761fecf..80d01161 100755 --- a/data/trades.asm +++ b/data/trades.asm @@ -1,6 +1,5 @@ TradeMons: ; 71b7b (1c:5b7b) ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total -IF DEF(_YELLOW) db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@" db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@" db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@" @@ -11,15 +10,3 @@ IF DEF(_YELLOW) db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@" db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@" db CUBONE, MACHOKE, 2,"RICKY@@@@@@" -ELSE - db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" - db ABRA, MR_MIME, 0,"MARCEL@@@@@" - db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@" - db PONYTA, SEEL, 0,"SAILOR@@@@@" - db SPEAROW, FARFETCH_D,2,"DUX@@@@@@@@" - db SLOWBRO, LICKITUNG, 0,"MARC@@@@@@@" - db POLIWHIRL, JYNX, 1,"LOLA@@@@@@@" - db RAICHU, ELECTRODE, 1,"DORIS@@@@@@" - db VENONAT, TANGELA, 2,"CRINKLES@@@" - db NIDORAN_M, NIDORAN_F, 2,"SPOT@@@@@@@" -ENDC diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm index 432f0fed..ef1d20f5 100755 --- a/data/trainer_moves.asm +++ b/data/trainer_moves.asm @@ -1,38 +1,3 @@ -IF !DEF(YELLOW) -LoneMoves: ; 39d22 (e:5d22) -; these are used for gym leaders. -; this is not automatic! you have to write the number you want to W_LONEATTACKNO -; first. e.g., erika's script writes 4 to W_LONEATTACKNO to get mega drain, -; the fourth entry in the list. - -; first byte: pokemon in the trainer's party that gets the move -; second byte: move -; unterminated - db 1,BIDE - db 1,BUBBLEBEAM - db 2,THUNDERBOLT - db 2,MEGA_DRAIN - db 3,TOXIC - db 3,PSYWAVE - db 3,FIRE_BLAST - db 4,FISSURE - -TeamMoves: ; 39d32 (e:5d32) -; these are used for elite four. -; this is automatic, based on trainer class. -; don't be confused by LoneMoves above, the two data structures are - ; _completely_ unrelated. - -; first byte: trainer (all trainers in this class have this move) -; second byte: move -; ff-terminated - db LORELEI,BLIZZARD - db BRUNO,FISSURE - db AGATHA,TOXIC - db LANCE,BARRIER - db $FF - -ELSE ; yellow has its own format. ; entry ≔ trainerclass, trainerid, moveset+, 0 @@ -194,4 +159,3 @@ TeamMoves: db 0 db $ff -endc diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index b121efc0..338db855 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -33,19 +33,11 @@ YoungsterData: ; 39d99 (e:5d99) db 17,RATTATA,RATTATA,RATICATE,0 db 18,NIDORAN_M,NIDORINO,0 db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0 -if DEF(_YELLOW) db 24,SANDSHREW,0 -endc BugCatcherData: ; 39dce (e:5dce) -if DEF(_YELLOW) db 7,CATERPIE,CATERPIE,0 db 6,METAPOD,CATERPIE,METAPOD,0 db 10,CATERPIE,0 -else - db 6,WEEDLE,CATERPIE,0 - db 7,WEEDLE,KAKUNA,WEEDLE,0 - db 9,WEEDLE,0 -endc db 10,CATERPIE,WEEDLE,CATERPIE,0 db 9,WEEDLE,KAKUNA,CATERPIE,METAPOD,0 db 11,CATERPIE,METAPOD,0 @@ -57,9 +49,7 @@ endc db 18,METAPOD,CATERPIE,VENONAT,0 db 19,BEEDRILL,BEEDRILL,0 db 20,CATERPIE,WEEDLE,VENONAT,0 -if DEF(_YELLOW) db 8,CATERPIE,METAPOD,0 -endc LassData: ; 39e0c (e:5e0c) db 9,PIDGEY,PIDGEY,0 db 10,RATTATA,NIDORAN_M,0 @@ -72,24 +62,14 @@ LassData: ; 39e0c (e:5e0c) db 15,NIDORAN_M,NIDORAN_F,0 db 13,ODDISH,PIDGEY,ODDISH,0 db 18,PIDGEY,NIDORAN_F,0 -if DEF(_YELLOW) db 20,JIGGLYPUFF,0 -else - db 18,RATTATA,PIKACHU,0 -endc db 23,NIDORAN_F,NIDORINA,0 db 24,MEOWTH,MEOWTH,MEOWTH,0 -if DEF(_YELLOW) db 19,PIDGEY,RATTATA,NIDORAN_F,MEOWTH,NIDORAN_M,0 -else - db 19,PIDGEY,RATTATA,NIDORAN_M,MEOWTH,PIKACHU,0 -endc db 22,CLEFAIRY,CLEFAIRY,0 db 23,BELLSPROUT,WEEPINBELL,0 db 23,ODDISH,GLOOM,0 -if DEF(_YELLOW) db 6,NIDORAN_F,NIDORAN_M,0 -endc SailorData: ; 39e58 (e:5e58) db 18,MACHOP,SHELLDER,0 db 17,MACHOP,TENTACOOL,0 @@ -98,17 +78,9 @@ SailorData: ; 39e58 (e:5e58) db 18,TENTACOOL,STARYU,0 db 17,HORSEA,HORSEA,HORSEA,0 db 20,MACHOP,0 -if DEF(_YELLOW) db 24,MAGNEMITE,0 -else - db 21,PIKACHU,PIKACHU,0 -endc JrTrainerMData: ; 39e78 (e:5e78) -if DEF(_YELLOW) db 9,DIGLETT,SANDSHREW,0 -else - db 11,DIGLETT,SANDSHREW,0 -endc db 14,RATTATA,EKANS,0 db 18,MANKEY,0 db 20,SQUIRTLE,0 @@ -117,34 +89,20 @@ endc db 21,GROWLITHE,CHARMANDER,0 db 19,RATTATA,DIGLETT,EKANS,SANDSHREW,0 db 29,NIDORAN_M,NIDORINO,0 -if DEF(_YELLOW) db 16,WEEPINBELL,0 -endc JrTrainerFData: ; 39e9d (e:5e9d) db 19,GOLDEEN,0 -if DEF(_YELLOW) db 16,ODDISH,BELLSPROUT,0 -else - db 16,RATTATA,PIKACHU,0 -endc db 16,PIDGEY,PIDGEY,PIDGEY,0 db 22,BULBASAUR,0 db 18,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 db 23,MEOWTH,0 -if DEF(_YELLOW) db 20,JIGGLYPUFF,CLEFAIRY,0 -else - db 20,PIKACHU,CLEFAIRY,0 -endc db 21,PIDGEY,PIDGEOTTO,0 db 21,JIGGLYPUFF,PIDGEY,MEOWTH,0 db 22,ODDISH,BULBASAUR,0 db 24,BULBASAUR,IVYSAUR,0 -if DEF(_YELLOW) db 24,PIDGEY,MEOWTH,RATTATA,PIDGEY,MEOWTH,0 -else - db 24,PIDGEY,MEOWTH,RATTATA,PIKACHU,MEOWTH,0 -endc db 30,POLIWAG,POLIWAG,0 db 27,PIDGEY,MEOWTH,PIDGEY,PIDGEOTTO,0 db 28,GOLDEEN,POLIWAG,HORSEA,0 @@ -153,17 +111,11 @@ endc db 20,MEOWTH,ODDISH,PIDGEY,0 db 19,PIDGEY,RATTATA,RATTATA,BELLSPROUT,0 db 28,GLOOM,ODDISH,ODDISH,0 -if DEF(_YELLOW) db 29,PIDGEY,PIDGEOTTO,0 -else - db 29,PIKACHU,RAICHU,0 -endc db 33,CLEFAIRY,0 db 29,BELLSPROUT,ODDISH,TANGELA,0 db 30,TENTACOOL,HORSEA,SEEL,0 -if DEF(_YELLOW) db 20,CUBONE,0 -endc PokemaniacData: ; 39f09 (e:5f09) db 30,RHYHORN,LICKITUNG,0 db 20,CUBONE,SLOWPOKE,0 @@ -282,11 +234,7 @@ BeautyData: ; 3a0d1 (e:60d1) db 21,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 db 24,BELLSPROUT,BELLSPROUT,0 db 26,EXEGGCUTE,0 -if DEF(_YELLOW) db 27,RATTATA,VULPIX,RATTATA,0 -else - db 27,RATTATA,PIKACHU,RATTATA,0 -endc db 29,CLEFAIRY,MEOWTH,0 db 35,SEAKING,0 db 30,SHELLDER,SHELLDER,CLOYSTER,0 @@ -304,11 +252,7 @@ PsychicData: ; 3a115 (e:6115) db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0 db 38,SLOWBRO,0 RockerData: ; 3a127 (e:6127) -if DEF(_YELLOW) db 20,VOLTORB,VOLTORB,VOLTORB,0 -else - db 20,VOLTORB,MAGNEMITE,VOLTORB,0 -endc db 29,VOLTORB,ELECTRODE,0 JugglerData: ; 3a130 (e:6130) db 29,KADABRA,MR_MIME,0 @@ -355,21 +299,9 @@ BlackbeltData: ; 3a1be (e:61be) db 38,MACHOKE,MACHOP,MACHOKE,0 db 43,MACHOKE,MACHOP,MACHOKE,0 Green1Data: ; 3a1e4 (e:61e4) -if DEF(_YELLOW) db 5,EEVEE,0 db $FF,9,SPEAROW,8,EEVEE,0 db $FF,18,SPEAROW,15,SANDSHREW,15,RATTATA,17,EEVEE,0 -else - db 5,SQUIRTLE,0 - db 5,BULBASAUR,0 - db 5,CHARMANDER,0 - db $FF,9,PIDGEY,8,SQUIRTLE,0 - db $FF,9,PIDGEY,8,BULBASAUR,0 - db $FF,9,PIDGEY,8,CHARMANDER,0 - db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,SQUIRTLE,0 - db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,BULBASAUR,0 - db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,CHARMANDER,0 -endc ProfOakData: ; 3a21d (e:621d) db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,BLASTOISE,70,GYARADOS,0 db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,VENUSAUR,70,GYARADOS,0 @@ -391,15 +323,9 @@ ScientistData: ; 3a241 (e:6241) db 33,MAGNEMITE,MAGNETON,VOLTORB,0 db 34,MAGNEMITE,ELECTRODE,0 GiovanniData: ; 3a27e (e:627e) -if DEF(_YELLOW) db $FF,25,ONIX,24,RHYHORN,29,PERSIAN,0 db $FF,37,NIDORINO,35,PERSIAN,37,RHYHORN,41,NIDOQUEEN,0 db $FF,50,DUGTRIO,53,PERSIAN,53,NIDOQUEEN,55,NIDOKING,55,RHYDON,0 -else - db $FF,25,ONIX,24,RHYHORN,29,KANGASKHAN,0 - db $FF,37,NIDORINO,35,KANGASKHAN,37,RHYHORN,41,NIDOQUEEN,0 - db $FF,45,RHYHORN,42,DUGTRIO,44,NIDOQUEEN,45,NIDOKING,50,RHYDON,0 -endc RocketData: ; 3a29c (e:629c) db 13,RATTATA,ZUBAT,0 db 11,SANDSHREW,RATTATA,ZUBAT,0 @@ -442,7 +368,6 @@ RocketData: ; 3a29c (e:629c) db 33,MACHOKE,0 db 25,RATTATA,RATTATA,ZUBAT,RATTATA,EKANS,0 db 32,CUBONE,DROWZEE,MAROWAK,0 -if DEF(_YELLOW) JessieJamesData: db 14,EKANS,MEOWTH,KOFFING,0 db 25,KOFFING,MEOWTH,EKANS,0 @@ -452,7 +377,6 @@ JessieJamesData: db 27,KOFFING,0 db 29,WEEZING,0 db 33,WEEZING,0 -endc CooltrainerMData: ; 3a35a (e:635a) db 39,NIDORINO,NIDOKING,0 db 43,EXEGGUTOR,CLOYSTER,ARCANINE,0 @@ -476,55 +400,26 @@ CooltrainerFData: ; 3a385 (e:6385) BrunoData: ; 3a3a9 (e:63a9) db $FF,53,ONIX,55,HITMONCHAN,55,HITMONLEE,56,ONIX,58,MACHAMP,0 BrockData: ; 3a3b5 (e:63b5) -if DEF(_YELLOW) db $FF,10,GEODUDE,12,ONIX,0 -else - db $FF,12,GEODUDE,14,ONIX,0 -endc MistyData: ; 3a3bb (e:63bb) db $FF,18,STARYU,21,STARMIE,0 LtSurgeData: ; 3a3c1 (e:63c1) -if DEF(_YELLOW) db $FF,28,RAICHU,0 -else - db $FF,21,VOLTORB,18,PIKACHU,24,RAICHU,0 -endc ErikaData: ; 3a3c9 (e:63c9) -if DEF(_YELLOW) db $FF,30,TANGELA,32,WEEPINBELL,32,GLOOM,0 -else - db $FF,29,VICTREEBEL,24,TANGELA,29,VILEPLUME,0 -endc KogaData: ; 3a3d1 (e:63d1) -if DEF(_YELLOW) db $FF,44,VENONAT,46,VENONAT,48,VENONAT,50,VENOMOTH,0 -else - db $FF,37,KOFFING,39,MUK,37,KOFFING,43,WEEZING,0 -endc BlaineData: ; 3a3db (e:63db) -if DEF(_YELLOW) db $FF,48,NINETALES,50,RAPIDASH,54,ARCANINE,0 -else - db $FF,42,GROWLITHE,40,PONYTA,42,RAPIDASH,47,ARCANINE,0 -endc SabrinaData: ; 3a3e5 (e:63e5) -if DEF(_YELLOW) db $FF,50,ABRA,50,KADABRA,50,ALAKAZAM,0 -else - db $FF,38,KADABRA,37,MR_MIME,38,VENOMOTH,43,ALAKAZAM,0 -endc GentlemanData: ; 3a3ef (e:63ef) db 18,GROWLITHE,GROWLITHE,0 db 19,NIDORAN_M,NIDORAN_F,0 -if DEF(_YELLOW) db 22,VOLTORB,MAGNEMITE,0 -else - db 23,PIKACHU,0 -endc db 48,PRIMEAPE,0 db 17,GROWLITHE,PONYTA,0 Green2Data: ; 3a401 (e:6401) -if DEF(_YELLOW) db $FF,19,SPEAROW,16,RATTATA,18,SANDSHREW,20,EEVEE,0 db $FF,25,FEAROW,23,SHELLDER,22,VULPIX,20,SANDSHREW,25,EEVEE,0 db $FF,25,FEAROW,23,MAGNEMITE,22,SHELLDER,20,SANDSHREW,25,EEVEE,0 @@ -535,30 +430,10 @@ if DEF(_YELLOW) db $FF,47,SANDSLASH,45,EXEGGCUTE,45,NINETALES,47,CLOYSTER,50,KADABRA,53,JOLTEON,0 db $FF,47,SANDSLASH,45,EXEGGCUTE,45,CLOYSTER,47,MAGNETON,50,KADABRA,53,FLAREON,0 db $FF,47,SANDSLASH,45,EXEGGCUTE,45,MAGNETON,47,NINETALES,50,KADABRA,53,VAPOREON,0 -else - db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,WARTORTLE,0 - db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,IVYSAUR,0 - db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,CHARMELEON,0 - db $FF,25,PIDGEOTTO,23,GROWLITHE,22,EXEGGCUTE,20,KADABRA,25,WARTORTLE,0 - db $FF,25,PIDGEOTTO,23,GYARADOS,22,GROWLITHE,20,KADABRA,25,IVYSAUR,0 - db $FF,25,PIDGEOTTO,23,EXEGGCUTE,22,GYARADOS,20,KADABRA,25,CHARMELEON,0 - db $FF,37,PIDGEOT,38,GROWLITHE,35,EXEGGCUTE,35,ALAKAZAM,40,BLASTOISE,0 - db $FF,37,PIDGEOT,38,GYARADOS,35,GROWLITHE,35,ALAKAZAM,40,VENUSAUR,0 - db $FF,37,PIDGEOT,38,EXEGGCUTE,35,GYARADOS,35,ALAKAZAM,40,CHARIZARD,0 - db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,BLASTOISE,0 - db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,VENUSAUR,0 - db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0 -endc Green3Data: ; 3a491 (e:6491) -if DEF(_YELLOW) db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,CLOYSTER,63,NINETALES,65,JOLTEON,0 db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,MAGNETON,63,CLOYSTER,65,FLAREON,0 db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,NINETALES,63,MAGNETON,65,VAPOREON,0 -else - db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,ARCANINE,63,EXEGGUTOR,65,BLASTOISE,0 - db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,GYARADOS,63,ARCANINE,65,VENUSAUR,0 - db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,EXEGGUTOR,63,GYARADOS,65,CHARIZARD,0 -endc LoreleiData: ; 3a4bb (e:64bb) db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0 ChannelerData: ; 3a4c7 (e:64c7) diff --git a/data/wildPokemon/mansion1.asm b/data/wildPokemon/mansion1.asm index e96b9d42..2e5a8f51 100755 --- a/data/wildPokemon/mansion1.asm +++ b/data/wildPokemon/mansion1.asm @@ -1,43 +1,14 @@ MansionMons1: db $0A - IF DEF(_RED) - db 32,KOFFING - db 30,KOFFING - db 34,PONYTA - db 30,PONYTA - db 34,GROWLITHE - db 32,PONYTA - db 30,GRIMER - db 28,PONYTA - db 37,WEEZING - db 39,MUK - ENDC - - IF DEF(_GREEN) || DEF(_BLUE) - db 32,GRIMER - db 30,GRIMER - db 34,PONYTA - db 30,PONYTA - db 34,VULPIX - db 32,PONYTA - db 30,KOFFING - db 28,PONYTA - db 37,MUK - db 39,WEEZING - ENDC - - IF DEF(_YELLOW) - db 34,RATTATA - db 34,RATICATE - db 23,GRIMER - db 26,GROWLITHE - db 37,RATTATA - db 37,RATICATE - db 30,GROWLITHE - db 26,GRIMER - db 34,GROWLITHE - db 38,GROWLITHE - ENDC - + db 34,RATTATA + db 34,RATICATE + db 23,GRIMER + db 26,GROWLITHE + db 37,RATTATA + db 37,RATICATE + db 30,GROWLITHE + db 26,GRIMER + db 34,GROWLITHE + db 38,GROWLITHE db $00 diff --git a/data/wildPokemon/mansion2.asm b/data/wildPokemon/mansion2.asm index 77cce408..e830560a 100755 --- a/data/wildPokemon/mansion2.asm +++ b/data/wildPokemon/mansion2.asm @@ -1,56 +1,14 @@ MansionMons2: db $0A - IF DEF(_RED) - db 32,GROWLITHE - db 34,KOFFING - db 34,KOFFING - db 30,PONYTA - db 30,KOFFING - db 32,PONYTA - db 30,GRIMER - db 28,PONYTA - db 39,WEEZING - db 37,MUK - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 32,VULPIX - db 34,GRIMER - db 34,GRIMER - db 30,PONYTA - db 30,GRIMER - db 32,PONYTA - db 30,KOFFING - db 28,PONYTA - db 39,MUK - db 37,WEEZING - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 32,GROWLITHE - db 34,GRIMER - db 34,GRIMER - db 30,PONYTA - db 30,GRIMER - db 32,PONYTA - db 30,KOFFING - db 28,PONYTA - db 39,MUK - db 37,WEEZING - ENDC - - IF DEF(_YELLOW) - db 37,RATTATA - db 37,RATICATE - db 26,GRIMER - db 29,GRIMER - db 40,RATTATA - db 40,RATICATE - db 32,GRIMER - db 35,GRIMER - db 35,MUK - db 38,MUK - ENDC - + db 37,RATTATA + db 37,RATICATE + db 26,GRIMER + db 29,GRIMER + db 40,RATTATA + db 40,RATICATE + db 32,GRIMER + db 35,GRIMER + db 35,MUK + db 38,MUK db $00 diff --git a/data/wildPokemon/mansion3.asm b/data/wildPokemon/mansion3.asm index eceb0296..cc180e3b 100755 --- a/data/wildPokemon/mansion3.asm +++ b/data/wildPokemon/mansion3.asm @@ -1,56 +1,14 @@ MansionMons3: db $0A - IF DEF(_RED) - db 31,KOFFING - db 33,GROWLITHE - db 35,KOFFING - db 32,PONYTA - db 34,PONYTA - db 40,WEEZING - db 34,GRIMER - db 38,WEEZING - db 36,PONYTA - db 42,MUK - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 31,GRIMER - db 33,VULPIX - db 35,GRIMER - db 32,PONYTA - db 34,MAGMAR - db 40,MUK - db 34,KOFFING - db 38,MUK - db 36,PONYTA - db 42,WEEZING - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 31,GRIMER - db 33,GROWLITHE - db 35,GRIMER - db 32,PONYTA - db 34,PONYTA - db 40,MUK - db 34,KOFFING - db 38,MUK - db 36,PONYTA - db 42,WEEZING - ENDC - - IF DEF(_YELLOW) - db 40,RATTATA - db 40,RATICATE - db 32,GRIMER - db 35,GRIMER - db 43,RATTATA - db 43,RATICATE - db 38,GRIMER - db 38,GRIMER - db 38,MUK - db 41,MUK - ENDC - + db 40,RATTATA + db 40,RATICATE + db 32,GRIMER + db 35,GRIMER + db 43,RATTATA + db 43,RATICATE + db 38,GRIMER + db 38,GRIMER + db 38,MUK + db 41,MUK db $00 diff --git a/data/wildPokemon/mansionb1.asm b/data/wildPokemon/mansionb1.asm index 9dcd9893..dcace0d8 100755 --- a/data/wildPokemon/mansionb1.asm +++ b/data/wildPokemon/mansionb1.asm @@ -1,55 +1,13 @@ MansionMonsB1: db $0A - IF DEF(_RED) - db 33,KOFFING - db 31,KOFFING - db 35,GROWLITHE - db 32,PONYTA - db 31,KOFFING - db 40,WEEZING - db 34,PONYTA - db 35,GRIMER - db 42,WEEZING - db 42,MUK - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 33,GRIMER - db 31,GRIMER - db 35,VULPIX - db 32,PONYTA - db 31,GRIMER - db 40,MUK - db 34,PONYTA - db 35,KOFFING - db 38,MAGMAR - db 42,WEEZING - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 33,GRIMER - db 31,GRIMER - db 35,GROWLITHE - db 32,PONYTA - db 31,GRIMER - db 40,MUK - db 34,PONYTA - db 35,KOFFING - db 38,MUK - db 42,WEEZING - ENDC - - IF DEF(_YELLOW) - db 35,GRIMER - db 38,GRIMER - db 37,RATICATE - db 40,RATICATE - db 41,MUK - db 43,RATICATE - db 24,DITTO - db 46,RATICATE - db 18,DITTO - db 12,DITTO - ENDC - + db 35,GRIMER + db 38,GRIMER + db 37,RATICATE + db 40,RATICATE + db 41,MUK + db 43,RATICATE + db 24,DITTO + db 46,RATICATE + db 18,DITTO + db 12,DITTO db $00 diff --git a/data/wildPokemon/mtmoon1.asm b/data/wildPokemon/mtmoon1.asm index a8018b82..75f19efd 100755 --- a/data/wildPokemon/mtmoon1.asm +++ b/data/wildPokemon/mtmoon1.asm @@ -1,27 +1,14 @@ MoonMons1: db $0A - IF DEF(_YELLOW) - db 8,ZUBAT - db 9,ZUBAT - db 10,GEODUDE - db 6,ZUBAT - db 7,ZUBAT - db 10,ZUBAT - db 10,GEODUDE - db 11,ZUBAT - db 12,SANDSHREW - db 11,CLEFAIRY - ELSE - db 8,ZUBAT - db 7,ZUBAT - db 9,ZUBAT - db 8,GEODUDE - db 6,ZUBAT - db 10,ZUBAT - db 10,GEODUDE - db 8,PARAS - db 11,ZUBAT - db 8,CLEFAIRY - ENDC + db 8,ZUBAT + db 9,ZUBAT + db 10,GEODUDE + db 6,ZUBAT + db 7,ZUBAT + db 10,ZUBAT + db 10,GEODUDE + db 11,ZUBAT + db 12,SANDSHREW + db 11,CLEFAIRY db $00 diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wildPokemon/mtmoonb1.asm index c78b8471..fd75f72b 100755 --- a/data/wildPokemon/mtmoonb1.asm +++ b/data/wildPokemon/mtmoonb1.asm @@ -1,27 +1,14 @@ MoonMonsB1: db $0A - IF DEF(_YELLOW) - db 8,ZUBAT - db 9,ZUBAT - db 10,GEODUDE - db 6,ZUBAT - db 7,ZUBAT - db 10,ZUBAT - db 10,GEODUDE - db 11,ZUBAT - db 12,SANDSHREW - db 11,CLEFAIRY - ELSE - db 8,ZUBAT - db 7,ZUBAT - db 7,GEODUDE - db 8,GEODUDE - db 9,ZUBAT - db 10,PARAS - db 10,ZUBAT - db 11,ZUBAT - db 9,CLEFAIRY - db 9,GEODUDE - ENDC + db 8,ZUBAT + db 9,ZUBAT + db 10,GEODUDE + db 6,ZUBAT + db 7,ZUBAT + db 10,ZUBAT + db 10,GEODUDE + db 11,ZUBAT + db 12,SANDSHREW + db 11,CLEFAIRY db $00 diff --git a/data/wildPokemon/mtmoonb2.asm b/data/wildPokemon/mtmoonb2.asm index 0118a898..27c76500 100755 --- a/data/wildPokemon/mtmoonb2.asm +++ b/data/wildPokemon/mtmoonb2.asm @@ -1,27 +1,14 @@ MoonMonsB2: db $0A - IF DEF(_YELLOW) - db 10,ZUBAT - db 11,GEODUDE - db 13,PARAS - db 11,ZUBAT - db 11,ZUBAT - db 12,ZUBAT - db 13,ZUBAT - db 9,CLEFAIRY - db 11,CLEFAIRY - db 13,CLEFAIRY - ELSE - db 9,ZUBAT - db 9,GEODUDE - db 10,ZUBAT - db 10,GEODUDE - db 11,ZUBAT - db 10,PARAS - db 12,PARAS - db 10,CLEFAIRY - db 12,ZUBAT - db 12,CLEFAIRY - ENDC + db 10,ZUBAT + db 11,GEODUDE + db 13,PARAS + db 11,ZUBAT + db 11,ZUBAT + db 12,ZUBAT + db 13,ZUBAT + db 9,CLEFAIRY + db 11,CLEFAIRY + db 13,CLEFAIRY db $00 diff --git a/data/wildPokemon/pokemontower3.asm b/data/wildPokemon/pokemontower3.asm index 4e3a7c62..c071c972 100755 --- a/data/wildPokemon/pokemontower3.asm +++ b/data/wildPokemon/pokemontower3.asm @@ -1,29 +1,14 @@ TowerMons3: db $0A - - IF DEF(_YELLOW) - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,GASTLY - db 20,HAUNTER - db 25,HAUNTER - ELSE - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 19,GASTLY - db 18,GASTLY - db 24,GASTLY - db 20,CUBONE - db 22,CUBONE - db 25,HAUNTER - ENDC - + db 20,GASTLY + db 21,GASTLY + db 22,GASTLY + db 23,GASTLY + db 24,GASTLY + db 19,GASTLY + db 18,GASTLY + db 25,GASTLY + db 20,HAUNTER + db 25,HAUNTER db $00 diff --git a/data/wildPokemon/pokemontower4.asm b/data/wildPokemon/pokemontower4.asm index e0de809f..35be620e 100755 --- a/data/wildPokemon/pokemontower4.asm +++ b/data/wildPokemon/pokemontower4.asm @@ -1,29 +1,14 @@ TowerMons4: db $0A - - IF DEF(_YELLOW) - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,GASTLY - db 20,HAUNTER - db 25,HAUNTER - ELSE - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,HAUNTER - db 20,CUBONE - db 22,CUBONE - db 24,GASTLY - ENDC - + db 20,GASTLY + db 21,GASTLY + db 22,GASTLY + db 23,GASTLY + db 24,GASTLY + db 19,GASTLY + db 18,GASTLY + db 25,GASTLY + db 20,HAUNTER + db 25,HAUNTER db $00 diff --git a/data/wildPokemon/pokemontower5.asm b/data/wildPokemon/pokemontower5.asm index 9f97b98e..b6c34941 100755 --- a/data/wildPokemon/pokemontower5.asm +++ b/data/wildPokemon/pokemontower5.asm @@ -1,29 +1,14 @@ TowerMons5: db $0A - - IF DEF(_YELLOW) - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 25,GASTLY - db 26,GASTLY - db 21,GASTLY - db 20,CUBONE - db 27,GASTLY - db 22,HAUNTER - db 27,HAUNTER - ELSE - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,HAUNTER - db 20,CUBONE - db 22,CUBONE - db 24,GASTLY - ENDC - + db 22,GASTLY + db 23,GASTLY + db 24,GASTLY + db 25,GASTLY + db 26,GASTLY + db 21,GASTLY + db 20,CUBONE + db 27,GASTLY + db 22,HAUNTER + db 27,HAUNTER db $00 diff --git a/data/wildPokemon/pokemontower6.asm b/data/wildPokemon/pokemontower6.asm index b97e2ddd..6e914c5c 100755 --- a/data/wildPokemon/pokemontower6.asm +++ b/data/wildPokemon/pokemontower6.asm @@ -1,29 +1,14 @@ TowerMons6: db $0F - - IF DEF(_YELLOW) - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 25,GASTLY - db 26,GASTLY - db 21,GASTLY - db 22,CUBONE - db 27,GASTLY - db 22,HAUNTER - db 27,HAUNTER - ELSE - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 20,GASTLY - db 19,GASTLY - db 26,HAUNTER - db 22,CUBONE - db 24,CUBONE - db 28,HAUNTER - ENDC - + db 22,GASTLY + db 23,GASTLY + db 24,GASTLY + db 25,GASTLY + db 26,GASTLY + db 21,GASTLY + db 22,CUBONE + db 27,GASTLY + db 22,HAUNTER + db 27,HAUNTER db $00 diff --git a/data/wildPokemon/pokemontower7.asm b/data/wildPokemon/pokemontower7.asm index b0d94534..9b99d518 100755 --- a/data/wildPokemon/pokemontower7.asm +++ b/data/wildPokemon/pokemontower7.asm @@ -1,29 +1,14 @@ TowerMons7: db $0F - - IF DEF(_YELLOW) - db 24,GASTLY - db 25,GASTLY - db 26,GASTLY - db 27,GASTLY - db 28,GASTLY - db 23,GASTLY - db 24,CUBONE - db 29,GASTLY - db 24,HAUNTER - db 29,HAUNTER - ELSE - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 20,GASTLY - db 28,HAUNTER - db 22,CUBONE - db 24,CUBONE - db 28,HAUNTER - db 30,HAUNTER - ENDC - + db 24,GASTLY + db 25,GASTLY + db 26,GASTLY + db 27,GASTLY + db 28,GASTLY + db 23,GASTLY + db 24,CUBONE + db 29,GASTLY + db 24,HAUNTER + db 29,HAUNTER db $00 diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm index f956fcf2..8a1667a5 100755 --- a/data/wildPokemon/powerplant.asm +++ b/data/wildPokemon/powerplant.asm @@ -1,34 +1,13 @@ PowerPlantMons: db $0A - - IF DEF(_YELLOW) - db 30,MAGNEMITE - db 35,MAGNEMITE - db 33,MAGNETON - db 33,VOLTORB - db 37,VOLTORB - db 33,GRIMER - db 37,GRIMER - db 38,MAGNETON - db 33,MUK - db 37,MUK - ELSE - db 21,VOLTORB - db 21,MAGNEMITE - db 20,PIKACHU - db 24,PIKACHU - db 23,MAGNEMITE - db 23,VOLTORB - db 32,MAGNETON - db 35,MAGNETON - IF DEF(_RED) - db 33,ELECTABUZZ - db 36,ELECTABUZZ - ENDC - IF DEF(_GREEN) || DEF(_BLUE) - db 33,RAICHU - db 36,RAICHU - ENDC - ENDC - + db 30,MAGNEMITE + db 35,MAGNEMITE + db 33,MAGNETON + db 33,VOLTORB + db 37,VOLTORB + db 33,GRIMER + db 37,GRIMER + db 38,MAGNETON + db 33,MUK + db 37,MUK db $00 diff --git a/data/wildPokemon/rocktunnel1.asm b/data/wildPokemon/rocktunnel1.asm index 992a4e73..9999490e 100755 --- a/data/wildPokemon/rocktunnel1.asm +++ b/data/wildPokemon/rocktunnel1.asm @@ -1,34 +1,14 @@ TunnelMonsB1: db $0F - - IF DEF(_YELLOW) - db 15,ZUBAT - db 16,GEODUDE - db 17,ZUBAT - db 19,ZUBAT - db 18,GEODUDE - db 20,GEODUDE - db 21,ZUBAT - db 17,MACHOP - db 19,MACHOP - db 21,MACHOP - ELSE - db 16,ZUBAT - db 17,ZUBAT - db 17,GEODUDE - db 15,MACHOP - db 16,GEODUDE - IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN)) - db 18,ZUBAT - ENDC - IF (DEF(_BLUE) && DEF(_JAPAN)) - db 18,DITTO - ENDC - db 15,ZUBAT - db 17,MACHOP - db 13,ONIX - db 15,ONIX - ENDC - + db 15,ZUBAT + db 16,GEODUDE + db 17,ZUBAT + db 19,ZUBAT + db 18,GEODUDE + db 20,GEODUDE + db 21,ZUBAT + db 17,MACHOP + db 19,MACHOP + db 21,MACHOP db $00 diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wildPokemon/rocktunnel2.asm index 0a47d984..41111909 100755 --- a/data/wildPokemon/rocktunnel2.asm +++ b/data/wildPokemon/rocktunnel2.asm @@ -1,34 +1,14 @@ TunnelMonsB2: db $0F - - IF DEF(_YELLOW) - db 20,ZUBAT - db 17,GEODUDE - db 18,MACHOP - db 21,ZUBAT - db 22,ZUBAT - db 21,GEODUDE - db 20,MACHOP - db 14,ONIX - db 18,ONIX - db 22,ONIX - ELSE - db 16,ZUBAT - db 17,ZUBAT - db 17,GEODUDE - db 15,MACHOP - db 16,GEODUDE - IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN)) - db 18,ZUBAT - ENDC - IF DEF(_BLUE) && DEF(_JAPAN) - db 18,DITTO - ENDC - db 17,MACHOP - db 17,ONIX - db 13,ONIX - db 18,GEODUDE - ENDC - + db 20,ZUBAT + db 17,GEODUDE + db 18,MACHOP + db 21,ZUBAT + db 22,ZUBAT + db 21,GEODUDE + db 20,MACHOP + db 14,ONIX + db 18,ONIX + db 22,ONIX db $00 diff --git a/data/wildPokemon/route1.asm b/data/wildPokemon/route1.asm index 8e5b6897..4b85ba40 100755 --- a/data/wildPokemon/route1.asm +++ b/data/wildPokemon/route1.asm @@ -1,27 +1,14 @@ Route1Mons: db $19 - IF DEF(_YELLOW) - db 3,PIDGEY - db 4,PIDGEY - db 2,RATTATA - db 3,RATTATA - db 2,PIDGEY - db 3,PIDGEY - db 5,PIDGEY - db 4,RATTATA - db 6,PIDGEY - db 7,PIDGEY - ELSE - db 3,PIDGEY - db 3,RATTATA - db 3,RATTATA - db 2,RATTATA - db 2,PIDGEY - db 3,PIDGEY - db 3,PIDGEY - db 4,RATTATA - db 4,PIDGEY - db 5,PIDGEY - ENDC + db 3,PIDGEY + db 4,PIDGEY + db 2,RATTATA + db 3,RATTATA + db 2,PIDGEY + db 3,PIDGEY + db 5,PIDGEY + db 4,RATTATA + db 6,PIDGEY + db 7,PIDGEY db $00 diff --git a/data/wildPokemon/route10.asm b/data/wildPokemon/route10.asm index 7cfaf25c..af835c99 100755 --- a/data/wildPokemon/route10.asm +++ b/data/wildPokemon/route10.asm @@ -1,44 +1,14 @@ Route10Mons: db $0F - - IF DEF(_RED) - db 16,VOLTORB - db 16,SPEAROW - db 14,VOLTORB - db 11,EKANS - db 13,SPEAROW - db 15,EKANS - db 17,VOLTORB - db 17,SPEAROW - db 13,EKANS - db 17,EKANS - ENDC - - IF DEF(_BLUE) || DEF(_GREEN) - db 16,VOLTORB - db 16,SPEAROW - db 14,VOLTORB - db 11,SANDSHREW - db 13,SPEAROW - db 15,SANDSHREW - db 17,VOLTORB - db 17,SPEAROW - db 13,SANDSHREW - db 17,SANDSHREW - ENDC - - IF DEF(_YELLOW) - db 16,MAGNEMITE - db 18,RATTATA - db 18,MAGNEMITE - db 20,MAGNEMITE - db 17,NIDORAN_M - db 17,NIDORAN_F - db 22,MAGNEMITE - db 20,RATICATE - db 16,MACHOP - db 18,MACHOP - ENDC - + db 16,MAGNEMITE + db 18,RATTATA + db 18,MAGNEMITE + db 20,MAGNEMITE + db 17,NIDORAN_M + db 17,NIDORAN_F + db 22,MAGNEMITE + db 20,RATICATE + db 16,MACHOP + db 18,MACHOP db $00 diff --git a/data/wildPokemon/route11.asm b/data/wildPokemon/route11.asm index 66c52c20..0b1425c0 100755 --- a/data/wildPokemon/route11.asm +++ b/data/wildPokemon/route11.asm @@ -1,44 +1,14 @@ Route11Mons: db $0F - - IF DEF(_RED) - db 14,EKANS - db 15,SPEAROW - db 12,EKANS - db 9,DROWZEE - db 13,SPEAROW - db 13,DROWZEE - db 15,EKANS - db 17,SPEAROW - db 11,DROWZEE - db 15,DROWZEE - ENDC - - IF DEF(_GREEN) || DEF(_BLUE) - db 14,SANDSHREW - db 15,SPEAROW - db 12,SANDSHREW - db 9,DROWZEE - db 13,SPEAROW - db 13,DROWZEE - db 15,SANDSHREW - db 17,SPEAROW - db 11,DROWZEE - db 15,DROWZEE - ENDC - - IF DEF(_YELLOW) - db 16,PIDGEY - db 15,RATTATA - db 18,PIDGEY - db 15,DROWZEE - db 17,RATTATA - db 17,DROWZEE - db 18,PIDGEOTTO - db 20,PIDGEOTTO - db 19,DROWZEE - db 17,RATICATE - ENDC - + db 16,PIDGEY + db 15,RATTATA + db 18,PIDGEY + db 15,DROWZEE + db 17,RATTATA + db 17,DROWZEE + db 18,PIDGEOTTO + db 20,PIDGEOTTO + db 19,DROWZEE + db 17,RATICATE db $00 diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm index 7f5e47fe..da73db97 100755 --- a/data/wildPokemon/route12.asm +++ b/data/wildPokemon/route12.asm @@ -1,56 +1,25 @@ Route12Mons: db $0F + db 25,ODDISH + db 25,BELLSPROUT + db 28,PIDGEY + db 28,PIDGEOTTO + db 27,ODDISH + db 27,BELLSPROUT + db 29,GLOOM + db 29,WEEPINBELL + db 26,FARFETCH_D + db 31,FARFETCH_D - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 24,ODDISH - db 25,PIDGEY - db 23,PIDGEY - db 24,VENONAT - db 22,ODDISH - db 26,VENONAT - db 26,ODDISH - db 27,PIDGEY - db 28,GLOOM - db 30,GLOOM - db $00 - ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 24,BELLSPROUT - db 25,PIDGEY - db 23,PIDGEY - db 24,VENONAT - db 22,BELLSPROUT - db 26,VENONAT - db 26,BELLSPROUT - db 27,PIDGEY - db 28,WEEPINBELL - db 30,WEEPINBELL - db $00 - ENDC - - IF DEF(_YELLOW) - db 25,ODDISH - db 25,BELLSPROUT - db 28,PIDGEY - db 28,PIDGEOTTO - db 27,ODDISH - db 27,BELLSPROUT - db 29,GLOOM - db 29,WEEPINBELL - db 26,FARFETCH_D - db 31,FARFETCH_D - - db $03 - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWBRO - db 20,SLOWBRO - ENDC + db $03 + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWBRO + db 20,SLOWBRO diff --git a/data/wildPokemon/route13.asm b/data/wildPokemon/route13.asm index 1b694f36..9dadf7e1 100755 --- a/data/wildPokemon/route13.asm +++ b/data/wildPokemon/route13.asm @@ -1,57 +1,25 @@ Route13Mons: - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db $14 - db 24,ODDISH - db 25,PIDGEY - db 27,PIDGEY - db 24,VENONAT - db 22,ODDISH - db 26,VENONAT - db 26,ODDISH - db 25,DITTO - db 28,GLOOM - db 30,GLOOM - db $00 - ENDC + db $0F + db 25,ODDISH + db 25,BELLSPROUT + db 28,PIDGEOTTO + db 28,PIDGEY + db 27,ODDISH + db 27,BELLSPROUT + db 29,GLOOM + db 29,WEEPINBELL + db 26,FARFETCH_D + db 31,FARFETCH_D - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db $14 - db 24,BELLSPROUT - db 25,PIDGEY - db 27,PIDGEY - db 24,VENONAT - db 22,BELLSPROUT - db 26,VENONAT - db 26,BELLSPROUT - db 25,DITTO - db 28,WEEPINBELL - db 30,WEEPINBELL - db $00 - ENDC - - IF DEF(_YELLOW) - db $0F - db 25,ODDISH - db 25,BELLSPROUT - db 28,PIDGEOTTO - db 28,PIDGEY - db 27,ODDISH - db 27,BELLSPROUT - db 29,GLOOM - db 29,WEEPINBELL - db 26,FARFETCH_D - db 31,FARFETCH_D - - db $03 - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWBRO - db 20,SLOWBRO - ENDC + db $03 + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWBRO + db 20,SLOWBRO diff --git a/data/wildPokemon/route14.asm b/data/wildPokemon/route14.asm index 999981af..9eb0e4c5 100755 --- a/data/wildPokemon/route14.asm +++ b/data/wildPokemon/route14.asm @@ -1,43 +1,14 @@ Route14Mons: db $0F - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 24,ODDISH - db 26,PIDGEY - db 23,DITTO - db 24,VENONAT - db 22,ODDISH - db 26,VENONAT - db 26,ODDISH - db 30,GLOOM - db 28,PIDGEOTTO - db 30,PIDGEOTTO - ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 24,BELLSPROUT - db 26,PIDGEY - db 23,DITTO - db 24,VENONAT - db 22,BELLSPROUT - db 26,VENONAT - db 26,BELLSPROUT - db 30,WEEPINBELL - db 28,PIDGEOTTO - db 30,PIDGEOTTO - ENDC - - IF DEF(_YELLOW) - db 26,ODDISH - db 26,BELLSPROUT - db 24,VENONAT - db 30,PIDGEOTTO - db 28,ODDISH - db 28,BELLSPROUT - db 30,GLOOM - db 30,WEEPINBELL - db 27,VENONAT - db 30,VENOMOTH - ENDC - + db 26,ODDISH + db 26,BELLSPROUT + db 24,VENONAT + db 30,PIDGEOTTO + db 28,ODDISH + db 28,BELLSPROUT + db 30,GLOOM + db 30,WEEPINBELL + db 27,VENONAT + db 30,VENOMOTH db $00 diff --git a/data/wildPokemon/route15.asm b/data/wildPokemon/route15.asm index d924052a..30d96ed2 100755 --- a/data/wildPokemon/route15.asm +++ b/data/wildPokemon/route15.asm @@ -1,43 +1,14 @@ Route15Mons: db $0F - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 24,ODDISH - db 26,DITTO - db 23,PIDGEY - db 26,VENONAT - db 22,ODDISH - db 28,VENONAT - db 26,ODDISH - db 30,GLOOM - db 28,PIDGEOTTO - db 30,PIDGEOTTO - ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 24,BELLSPROUT - db 26,DITTO - db 23,PIDGEY - db 26,VENONAT - db 22,BELLSPROUT - db 28,VENONAT - db 26,BELLSPROUT - db 30,WEEPINBELL - db 28,PIDGEOTTO - db 30,PIDGEOTTO - ENDC - - IF DEF(_YELLOW) - db 26,ODDISH - db 26,BELLSPROUT - db 24,VENONAT - db 32,PIDGEOTTO - db 28,ODDISH - db 28,BELLSPROUT - db 30,GLOOM - db 30,WEEPINBELL - db 27,VENONAT - db 30,VENOMOTH - ENDC - + db 26,ODDISH + db 26,BELLSPROUT + db 24,VENONAT + db 32,PIDGEOTTO + db 28,ODDISH + db 28,BELLSPROUT + db 30,GLOOM + db 30,WEEPINBELL + db 27,VENONAT + db 30,VENOMOTH db $00 diff --git a/data/wildPokemon/route16.asm b/data/wildPokemon/route16.asm index 468e3777..eeefa9ba 100755 --- a/data/wildPokemon/route16.asm +++ b/data/wildPokemon/route16.asm @@ -1,28 +1,14 @@ Route16Mons: db $19 - IF DEF(_YELLOW) - db 22,SPEAROW - db 22,DODUO - db 23,RATTATA - db 24,DODUO - db 24,RATTATA - db 26,DODUO - db 23,SPEAROW - db 24,FEAROW - db 25,RATICATE - db 26,RATICATE - ELSE - db 20,SPEAROW - db 22,SPEAROW - db 18,RATTATA - db 20,DODUO - db 20,RATTATA - db 18,DODUO - db 22,DODUO - db 22,RATTATA - db 23,RATICATE - db 25,RATICATE - ENDC - + db 22,SPEAROW + db 22,DODUO + db 23,RATTATA + db 24,DODUO + db 24,RATTATA + db 26,DODUO + db 23,SPEAROW + db 24,FEAROW + db 25,RATICATE + db 26,RATICATE db $00 diff --git a/data/wildPokemon/route17.asm b/data/wildPokemon/route17.asm index 36283a99..ce72f376 100755 --- a/data/wildPokemon/route17.asm +++ b/data/wildPokemon/route17.asm @@ -1,29 +1,14 @@ Route17Mons: db $19 - - IF DEF(_YELLOW) - db 26,DODUO - db 27,FEAROW - db 27,DODUO - db 28,DODUO - db 28,PONYTA - db 30,PONYTA - db 29,FEAROW - db 28,DODUO - db 32,PONYTA - db 29,DODRIO - ELSE - db 20,SPEAROW - db 22,SPEAROW - db 25,RATICATE - db 24,DODUO - db 27,RATICATE - db 26,DODUO - db 28,DODUO - db 29,RATICATE - db 25,FEAROW - db 27,FEAROW - ENDC - + db 26,DODUO + db 27,FEAROW + db 27,DODUO + db 28,DODUO + db 28,PONYTA + db 30,PONYTA + db 29,FEAROW + db 28,DODUO + db 32,PONYTA + db 29,DODRIO db $00 diff --git a/data/wildPokemon/route18.asm b/data/wildPokemon/route18.asm index e16fc8ac..62ce6c3e 100755 --- a/data/wildPokemon/route18.asm +++ b/data/wildPokemon/route18.asm @@ -1,29 +1,14 @@ Route18Mons: db $19 - - IF DEF(_YELLOW) - db 22,SPEAROW - db 22,DODUO - db 23,RATTATA - db 24,DODUO - db 24,RATTATA - db 26,DODUO - db 23,SPEAROW - db 24,FEAROW - db 25,RATICATE - db 26,RATICATE - ELSE - db 20,SPEAROW - db 22,SPEAROW - db 25,RATICATE - db 24,DODUO - db 25,FEAROW - db 26,DODUO - db 28,DODUO - db 29,RATICATE - db 27,FEAROW - db 29,FEAROW - ENDC - + db 22,SPEAROW + db 22,DODUO + db 23,RATTATA + db 24,DODUO + db 24,RATTATA + db 26,DODUO + db 23,SPEAROW + db 24,FEAROW + db 25,RATICATE + db 26,RATICATE db $00 diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm index 8f9eb4e5..93f3726f 100755 --- a/data/wildPokemon/route2.asm +++ b/data/wildPokemon/route2.asm @@ -1,39 +1,14 @@ Route2Mons: db $19 - - IF DEF(_YELLOW) - db 3,RATTATA - db 3,PIDGEY - db 4,RATTATA - db 4,NIDORAN_M - db 4,NIDORAN_F - db 5,PIDGEY - db 6,NIDORAN_M - db 6,NIDORAN_F - db 7,PIDGEY - db 7,PIDGEY - ELSE - db 3,RATTATA - db 3,PIDGEY - db 4,PIDGEY - db 4,RATTATA - db 5,PIDGEY - if DEF(_RED) - db 3,WEEDLE - ENDC - if DEF(_BLUE) - db 3,CATERPIE - ENDC - db 2,RATTATA - db 5,RATTATA - if DEF(_RED) - db 4,WEEDLE - db 5,WEEDLE - ENDC - if DEF(_BLUE) - db 4,CATERPIE - db 5,CATERPIE - ENDC - ENDC + db 3,RATTATA + db 3,PIDGEY + db 4,RATTATA + db 4,NIDORAN_M + db 4,NIDORAN_F + db 5,PIDGEY + db 6,NIDORAN_M + db 6,NIDORAN_F + db 7,PIDGEY + db 7,PIDGEY db $00 diff --git a/data/wildPokemon/route21.asm b/data/wildPokemon/route21.asm index 7017081d..11ac7e6b 100755 --- a/data/wildPokemon/route21.asm +++ b/data/wildPokemon/route21.asm @@ -1,29 +1,15 @@ Route21Mons: db $19 - - IF DEF(_YELLOW) - db 15,PIDGEY - db 13,RATTATA - db 13,PIDGEY - db 11,PIDGEY - db 17,PIDGEY - db 15,RATTATA - db 15,RATICATE - db 17,PIDGEOTTO - db 19,PIDGEOTTO - db 15,PIDGEOTTO - ELSE - db 21,RATTATA - db 23,PIDGEY - db 30,RATICATE - db 23,RATTATA - db 21,PIDGEY - db 30,PIDGEOTTO - db 32,PIDGEOTTO - db 28,TANGELA - db 30,TANGELA - db 32,TANGELA - ENDC + db 15,PIDGEY + db 13,RATTATA + db 13,PIDGEY + db 11,PIDGEY + db 17,PIDGEY + db 15,RATTATA + db 15,RATICATE + db 17,PIDGEOTTO + db 19,PIDGEOTTO + db 15,PIDGEOTTO db $05 db 5,TENTACOOL diff --git a/data/wildPokemon/route22.asm b/data/wildPokemon/route22.asm index 78c5631a..39f1f29c 100755 --- a/data/wildPokemon/route22.asm +++ b/data/wildPokemon/route22.asm @@ -1,40 +1,14 @@ Route22Mons: db $19 - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 3,RATTATA - db 3,NIDORAN_M - db 4,RATTATA - db 4,NIDORAN_M - db 2,RATTATA - db 2,NIDORAN_M - db 3,SPEAROW - db 5,SPEAROW - db 3,NIDORAN_F - db 4,NIDORAN_F - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 3,RATTATA - db 3,NIDORAN_F - db 4,RATTATA - db 4,NIDORAN_F - db 2,RATTATA - db 2,NIDORAN_F - db 3,SPEAROW - db 5,SPEAROW - db 3,NIDORAN_M - db 4,NIDORAN_M - ENDC - IF DEF(_YELLOW) - db 2,NIDORAN_M - db 2,NIDORAN_F - db 3,MANKEY - db 3,RATTATA - db 4,NIDORAN_M - db 4,NIDORAN_F - db 5,MANKEY - db 2,SPEAROW - db 4,SPEAROW - db 6,SPEAROW - ENDC + db 2,NIDORAN_M + db 2,NIDORAN_F + db 3,MANKEY + db 3,RATTATA + db 4,NIDORAN_M + db 4,NIDORAN_F + db 5,MANKEY + db 2,SPEAROW + db 4,SPEAROW + db 6,SPEAROW db $00 diff --git a/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm index 1320868c..43de8c2b 100755 --- a/data/wildPokemon/route23.asm +++ b/data/wildPokemon/route23.asm @@ -1,39 +1,14 @@ Route23Mons: db $0A - - IF DEF(_YELLOW) - db 41,NIDORINO - db 41,NIDORINA - db 36,MANKEY - db 44,NIDORINO - db 44,NIDORINA - db 40,FEAROW - db 41,MANKEY - db 45,FEAROW - db 41,PRIMEAPE - db 46,PRIMEAPE - ELSE - IF DEF(_RED) - db 26,EKANS - ENDC - IF !DEF(_RED) - db 26,SANDSHREW - ENDC - db 33,DITTO - db 26,SPEAROW - db 38,FEAROW - db 38,DITTO - db 38,FEAROW - IF DEF(_RED) - db 41,ARBOK - ENDC - IF !DEF(_RED) - db 41,SANDSLASH - ENDC - db 43,DITTO - db 41,FEAROW - db 43,FEAROW - ENDC - + db 41,NIDORINO + db 41,NIDORINA + db 36,MANKEY + db 44,NIDORINO + db 44,NIDORINA + db 40,FEAROW + db 41,MANKEY + db 45,FEAROW + db 41,PRIMEAPE + db 46,PRIMEAPE db $00 diff --git a/data/wildPokemon/route24.asm b/data/wildPokemon/route24.asm index d586927f..df4a3bce 100755 --- a/data/wildPokemon/route24.asm +++ b/data/wildPokemon/route24.asm @@ -1,57 +1,14 @@ Route24Mons: db $19 - - IF DEF(_RED) - db 7,WEEDLE - db 8,KAKUNA - db 12,PIDGEY - db 12,ODDISH - db 13,ODDISH - db 10,ABRA - db 14,ODDISH - db 13,PIDGEY - db 8,ABRA - db 12,ABRA - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 7,CATERPIE - db 8,METAPOD - db 12,PIDGEY - db 12,BELLSPROUT - db 13,BELLSPROUT - db 10,ABRA - db 14,BELLSPROUT - db 13,PIDGEY - db 8,ABRA - db 12,ABRA - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 7,CATERPIE - db 8,METAPOD - db 12,PIDGEY - db 12,ODDISH - db 13,ODDISH - db 10,ABRA - db 14,ODDISH - db 13,PIDGEY - db 8,ABRA - db 12,ABRA - ENDC - - IF DEF(_YELLOW) - db 12,ODDISH - db 12,BELLSPROUT - db 13,PIDGEY - db 14,ODDISH - db 14,BELLSPROUT - db 15,PIDGEY - db 13,VENONAT - db 16,VENONAT - db 17,PIDGEY - db 17,PIDGEOTTO - ENDC - + db 12,ODDISH + db 12,BELLSPROUT + db 13,PIDGEY + db 14,ODDISH + db 14,BELLSPROUT + db 15,PIDGEY + db 13,VENONAT + db 16,VENONAT + db 17,PIDGEY + db 17,PIDGEOTTO db $00 diff --git a/data/wildPokemon/route25.asm b/data/wildPokemon/route25.asm index 4609c7cd..1546dd74 100755 --- a/data/wildPokemon/route25.asm +++ b/data/wildPokemon/route25.asm @@ -1,47 +1,6 @@ Route25Mons: db $0F - - IF DEF(_RED) - db 8,WEEDLE - db 9,KAKUNA - db 13,PIDGEY - db 12,ODDISH - db 13,ODDISH - db 12,ABRA - db 14,ODDISH - db 10,ABRA - db 7,METAPOD - db 8,CATERPIE - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 8,CATERPIE - db 9,METAPOD - db 13,PIDGEY - db 12,BELLSPROUT - db 13,BELLSPROUT - db 12,ABRA - db 14,BELLSPROUT - db 10,ABRA - db 7,KAKUNA - db 8,WEEDLE - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 8,CATERPIE - db 9,METAPOD - db 13,PIDGEY - db 12,ODDISH - db 13,ODDISH - db 12,ABRA - db 14,ODDISH - db 10,ABRA - db 7,KAKUNA - db 8,WEEDLE - ENDC - - IF DEF(_YELLOW) - db 12,ODDISH + db 12,ODDISH db 12,BELLSPROUT db 13,PIDGEY db 14,ODDISH @@ -51,7 +10,5 @@ Route25Mons: db 16,VENONAT db 17,PIDGEY db 17,PIDGEOTTO - ENDC - db $00 diff --git a/data/wildPokemon/route3.asm b/data/wildPokemon/route3.asm index fe7c5da9..f867fbbf 100755 --- a/data/wildPokemon/route3.asm +++ b/data/wildPokemon/route3.asm @@ -1,27 +1,14 @@ Route3Mons: db $14 - IF DEF(_YELLOW) - db 8,SPEAROW - db 9,SPEAROW - db 9,MANKEY - db 10,SPEAROW - db 8,SANDSHREW - db 10,RATTATA - db 10,SANDSHREW - db 12,RATTATA - db 11,SPEAROW - db 12,SPEAROW - ELSE - db 6,PIDGEY - db 5,SPEAROW - db 7,PIDGEY - db 6,SPEAROW - db 7,SPEAROW - db 8,PIDGEY - db 8,SPEAROW - db 3,JIGGLYPUFF - db 5,JIGGLYPUFF - db 7,JIGGLYPUFF - ENDC + db 8,SPEAROW + db 9,SPEAROW + db 9,MANKEY + db 10,SPEAROW + db 8,SANDSHREW + db 10,RATTATA + db 10,SANDSHREW + db 12,RATTATA + db 11,SPEAROW + db 12,SPEAROW db $00 diff --git a/data/wildPokemon/route4.asm b/data/wildPokemon/route4.asm index 40c3b7b5..b62126d8 100755 --- a/data/wildPokemon/route4.asm +++ b/data/wildPokemon/route4.asm @@ -1,44 +1,14 @@ Route4Mons: db $14 - - IF DEF(_RED) - db 10,RATTATA - db 10,SPEAROW - db 8,RATTATA - db 6,EKANS - db 8,SPEAROW - db 10,EKANS - db 12,RATTATA - db 12,SPEAROW - db 8,EKANS - db 12,EKANS - ENDC - - IF DEF(_BLUE) || DEF(_GREEN) - db 10,RATTATA - db 10,SPEAROW - db 8,RATTATA - db 6,SANDSHREW - db 8,SPEAROW - db 10,SANDSHREW - db 12,RATTATA - db 12,SPEAROW - db 8,SANDSHREW - db 12,SANDSHREW - ENDC - - IF DEF(_YELLOW) - db 8,SPEAROW - db 9,SPEAROW - db 9,MANKEY - db 10,SPEAROW - db 8,SANDSHREW - db 10,RATTATA - db 10,SANDSHREW - db 12,RATTATA - db 11,SPEAROW - db 12,SPEAROW - ENDC - + db 8,SPEAROW + db 9,SPEAROW + db 9,MANKEY + db 10,SPEAROW + db 8,SANDSHREW + db 10,RATTATA + db 10,SANDSHREW + db 12,RATTATA + db 11,SPEAROW + db 12,SPEAROW db $00 diff --git a/data/wildPokemon/route5.asm b/data/wildPokemon/route5.asm index aa67ca87..1e9703a7 100755 --- a/data/wildPokemon/route5.asm +++ b/data/wildPokemon/route5.asm @@ -1,57 +1,14 @@ Route5Mons: db $0F - - IF DEF(_RED) - db 13,ODDISH - db 13,PIDGEY - db 15,PIDGEY - db 10,MANKEY - db 12,MANKEY - db 15,ODDISH - db 16,ODDISH - db 16,PIDGEY - db 14,MANKEY - db 16,MANKEY - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 13,BELLSPROUT - db 13,PIDGEY - db 15,PIDGEY - db 10,MEOWTH - db 12,MEOWTH - db 15,BELLSPROUT - db 16,BELLSPROUT - db 16,PIDGEY - db 14,MEOWTH - db 16,MEOWTH - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 13,ODDISH - db 13,PIDGEY - db 15,PIDGEY - db 10,MEOWTH - db 12,MEOWTH - db 15,ODDISH - db 16,ODDISH - db 16,PIDGEY - db 14,MEOWTH - db 16,MEOWTH - ENDC - - IF DEF(_YELLOW) - db 15,PIDGEY - db 14,RATTATA - db 7,ABRA - db 16,PIDGEY - db 16,RATTATA - db 17,PIDGEY - db 17,PIDGEOTTO - db 3,JIGGLYPUFF - db 5,JIGGLYPUFF - db 7,JIGGLYPUFF - ENDC - + db 15,PIDGEY + db 14,RATTATA + db 7,ABRA + db 16,PIDGEY + db 16,RATTATA + db 17,PIDGEY + db 17,PIDGEOTTO + db 3,JIGGLYPUFF + db 5,JIGGLYPUFF + db 7,JIGGLYPUFF db $00 diff --git a/data/wildPokemon/route6.asm b/data/wildPokemon/route6.asm index 86e0c05f..b84e5029 100755 --- a/data/wildPokemon/route6.asm +++ b/data/wildPokemon/route6.asm @@ -1,70 +1,25 @@ Route6Mons: db $0F + db 15,PIDGEY + db 14,RATTATA + db 7,ABRA + db 16,PIDGEY + db 16,RATTATA + db 17,PIDGEY + db 17,PIDGEOTTO + db 3,JIGGLYPUFF + db 5,JIGGLYPUFF + db 7,JIGGLYPUFF - IF DEF(_RED) - db 13,ODDISH - db 13,PIDGEY - db 15,PIDGEY - db 10,MANKEY - db 12,MANKEY - db 15,ODDISH - db 16,ODDISH - db 16,PIDGEY - db 14,MANKEY - db 16,MANKEY - db $00 - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 13,BELLSPROUT - db 13,PIDGEY - db 15,PIDGEY - db 10,MEOWTH - db 12,MEOWTH - db 15,BELLSPROUT - db 16,BELLSPROUT - db 16,PIDGEY - db 14,MEOWTH - db 16,MEOWTH - db $00 - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 13,ODDISH - db 13,PIDGEY - db 15,PIDGEY - db 10,MEOWTH - db 12,MEOWTH - db 15,ODDISH - db 16,ODDISH - db 16,PIDGEY - db 14,MEOWTH - db 16,MEOWTH - db $00 - ENDC - - IF DEF(_YELLOW) - db 15,PIDGEY - db 14,RATTATA - db 7,ABRA - db 16,PIDGEY - db 16,RATTATA - db 17,PIDGEY - db 17,PIDGEOTTO - db 3,JIGGLYPUFF - db 5,JIGGLYPUFF - db 7,JIGGLYPUFF - - db $03 - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,PSYDUCK - db 15,GOLDUCK - db 20,GOLDUCK - ENDC + db $03 + db 15,PSYDUCK + db 15,PSYDUCK + db 15,PSYDUCK + db 15,PSYDUCK + db 15,PSYDUCK + db 15,PSYDUCK + db 15,PSYDUCK + db 15,PSYDUCK + db 15,GOLDUCK + db 20,GOLDUCK diff --git a/data/wildPokemon/route7.asm b/data/wildPokemon/route7.asm index 505b632b..dad77e69 100755 --- a/data/wildPokemon/route7.asm +++ b/data/wildPokemon/route7.asm @@ -1,57 +1,14 @@ Route7Mons: db $0F - - IF DEF(_RED) - db 19,PIDGEY - db 19,ODDISH - db 17,MANKEY - db 22,ODDISH - db 22,PIDGEY - db 18,MANKEY - db 18,GROWLITHE - db 20,GROWLITHE - db 19,MANKEY - db 20,MANKEY - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 19,PIDGEY - db 19,BELLSPROUT - db 17,MEOWTH - db 22,BELLSPROUT - db 22,PIDGEY - db 18,MEOWTH - db 18,VULPIX - db 20,VULPIX - db 19,MEOWTH - db 20,MEOWTH - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 19,PIDGEY - db 19,ODDISH - db 17,MEOWTH - db 22,ODDISH - db 22,PIDGEY - db 18,MEOWTH - db 18,GROWLITHE - db 20,GROWLITHE - db 19,MEOWTH - db 20,MEOWTH - ENDC - - IF DEF(_YELLOW) - db 20,PIDGEY - db 22,PIDGEY - db 20,RATTATA - db 15,ABRA - db 19,ABRA - db 24,PIDGEOTTO - db 26,ABRA - db 19,JIGGLYPUFF - db 24,JIGGLYPUFF - db 24,JIGGLYPUFF - ENDC - + db 20,PIDGEY + db 22,PIDGEY + db 20,RATTATA + db 15,ABRA + db 19,ABRA + db 24,PIDGEOTTO + db 26,ABRA + db 19,JIGGLYPUFF + db 24,JIGGLYPUFF + db 24,JIGGLYPUFF db $00 diff --git a/data/wildPokemon/route8.asm b/data/wildPokemon/route8.asm index 67905134..8b47b163 100755 --- a/data/wildPokemon/route8.asm +++ b/data/wildPokemon/route8.asm @@ -1,57 +1,14 @@ Route8Mons: db $0F - - IF DEF(_RED) - db 18,PIDGEY - db 18,MANKEY - db 17,EKANS - db 16,GROWLITHE - db 20,PIDGEY - db 20,MANKEY - db 19,EKANS - db 17,GROWLITHE - db 15,GROWLITHE - db 18,GROWLITHE - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 18,PIDGEY - db 18,MEOWTH - db 17,SANDSHREW - db 16,VULPIX - db 20,PIDGEY - db 20,MEOWTH - db 19,SANDSHREW - db 17,VULPIX - db 15,VULPIX - db 18,VULPIX - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 18,PIDGEY - db 18,MEOWTH - db 17,SANDSHREW - db 16,GROWLITHE - db 20,PIDGEY - db 20,MEOWTH - db 19,SANDSHREW - db 17,GROWLITHE - db 15,GROWLITHE - db 18,GROWLITHE - ENDC - - IF DEF(_YELLOW) - db 20,PIDGEY - db 22,PIDGEY - db 20,RATTATA - db 15,ABRA - db 19,ABRA - db 24,PIDGEOTTO - db 19,JIGGLYPUFF - db 24,JIGGLYPUFF - db 20,KADABRA - db 27,KADABRA - ENDC - + db 20,PIDGEY + db 22,PIDGEY + db 20,RATTATA + db 15,ABRA + db 19,ABRA + db 24,PIDGEOTTO + db 19,JIGGLYPUFF + db 24,JIGGLYPUFF + db 20,KADABRA + db 27,KADABRA db $00 diff --git a/data/wildPokemon/route9.asm b/data/wildPokemon/route9.asm index d563aa2b..95f5b451 100755 --- a/data/wildPokemon/route9.asm +++ b/data/wildPokemon/route9.asm @@ -1,44 +1,14 @@ Route9Mons: db $0F - - IF DEF(_RED) - db 16,RATTATA - db 16,SPEAROW - db 14,RATTATA - db 11,EKANS - db 13,SPEAROW - db 15,EKANS - db 17,RATTATA - db 17,SPEAROW - db 13,EKANS - db 17,EKANS - ENDC - - IF DEF(_GREEN) || DEF(_BLUE) - db 16,RATTATA - db 16,SPEAROW - db 14,RATTATA - db 11,SANDSHREW - db 13,SPEAROW - db 15,SANDSHREW - db 17,RATTATA - db 17,SPEAROW - db 13,SANDSHREW - db 17,SANDSHREW - ENDC - - IF DEF(_YELLOW) - db 16,NIDORAN_M - db 16,NIDORAN_F - db 18,RATTATA - db 18,NIDORAN_M - db 18,NIDORAN_F - db 17,SPEAROW - db 18,NIDORINO - db 18,NIDORINA - db 20,RATICATE - db 19,FEAROW - ENDC - + db 16,NIDORAN_M + db 16,NIDORAN_F + db 18,RATTATA + db 18,NIDORAN_M + db 18,NIDORAN_F + db 17,SPEAROW + db 18,NIDORINO + db 18,NIDORINA + db 20,RATICATE + db 19,FEAROW db $00 diff --git a/data/wildPokemon/safarizone1.asm b/data/wildPokemon/safarizone1.asm index 3781af0e..c8632351 100755 --- a/data/wildPokemon/safarizone1.asm +++ b/data/wildPokemon/safarizone1.asm @@ -1,48 +1,14 @@ ZoneMons1: db $1E - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 24,NIDORAN_M - db 26,DODUO - db 22,PARAS - db 25,EXEGGCUTE - db 33,NIDORINO - db 23,EXEGGCUTE - db 24,NIDORAN_F - db 25,PARASECT - IF DEF(_RED) - db 25,KANGASKHAN - ENDC - IF DEF(_JAPAN) && DEF(_BLUE) - db 25,LICKITUNG - ENDC - db 28,SCYTHER - ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 24,NIDORAN_F - db 26,DODUO - db 22,PARAS - db 25,EXEGGCUTE - db 33,NIDORINA - db 23,EXEGGCUTE - db 24,NIDORAN_M - db 25,PARASECT - db 25,KANGASKHAN - db 28,PINSIR - ENDC - - IF DEF(_YELLOW) - db 21,NIDORAN_M - db 29,NIDORAN_F - db 22,EXEGGCUTE - db 21,TAUROS - db 32,NIDORINA - db 19,CUBONE - db 26,EXEGGCUTE - db 24,MAROWAK - db 21,CHANSEY - db 15,SCYTHER - ENDC - + db 21,NIDORAN_M + db 29,NIDORAN_F + db 22,EXEGGCUTE + db 21,TAUROS + db 32,NIDORINA + db 19,CUBONE + db 26,EXEGGCUTE + db 24,MAROWAK + db 21,CHANSEY + db 15,SCYTHER db $00 diff --git a/data/wildPokemon/safarizone2.asm b/data/wildPokemon/safarizone2.asm index 5de4ad00..1e4a6744 100755 --- a/data/wildPokemon/safarizone2.asm +++ b/data/wildPokemon/safarizone2.asm @@ -1,48 +1,14 @@ ZoneMons2: db $1E - IF DEF(_YELLOW) - db 36,NIDORAN_M - db 14,NIDORAN_F - db 20,EXEGGCUTE - db 25,RHYHORN - db 23,NIDORINA - db 28,KANGASKHAN - db 16,CUBONE - db 33,KANGASKHAN - db 25,SCYTHER - db 15,PINSIR - ELSE - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 22,NIDORAN_M - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 22,NIDORAN_F - ENDC - db 26,RHYHORN - db 23,PARAS - db 25,EXEGGCUTE - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINO - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINA - ENDC - db 27,EXEGGCUTE - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINA - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINO - ENDC - db 32,VENOMOTH - db 26,CHANSEY - IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 28,TAUROS - ENDC - IF (DEF(_JAPAN) && DEF(_BLUE)) - db 28,PINSIR - ENDC - ENDC - + db 36,NIDORAN_M + db 14,NIDORAN_F + db 20,EXEGGCUTE + db 25,RHYHORN + db 23,NIDORINA + db 28,KANGASKHAN + db 16,CUBONE + db 33,KANGASKHAN + db 25,SCYTHER + db 15,PINSIR db $00 diff --git a/data/wildPokemon/safarizone3.asm b/data/wildPokemon/safarizone3.asm index c13cd378..3424f1d7 100755 --- a/data/wildPokemon/safarizone3.asm +++ b/data/wildPokemon/safarizone3.asm @@ -1,56 +1,14 @@ ZoneMons3: db $1E - IF DEF(_RED) - db 25,NIDORAN_M - db 26,DODUO - db 23,VENONAT - db 24,EXEGGCUTE - db 33,NIDORINO - db 26,EXEGGCUTE - db 25,NIDORAN_F - db 31,VENOMOTH - db 26,TAUROS - db 28,KANGASKHAN - ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 25,NIDORAN_F - db 26,DODUO - db 23,VENONAT - db 24,EXEGGCUTE - db 33,NIDORINA - db 26,EXEGGCUTE - db 25,NIDORAN_M - db 31,VENOMOTH - db 26,TAUROS - db 28,KANGASKHAN - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 25,NIDORAN_M - db 26,DODUO - db 23,VENONAT - db 24,EXEGGCUTE - db 33,NIDORINO - db 26,EXEGGCUTE - db 25,NIDORAN_F - db 31,VENOMOTH - db 26,PINSIR - db 28,LICKITUNG - ENDC - - IF DEF(_YELLOW) - db 29,NIDORAN_M - db 21,NIDORAN_F - db 22,EXEGGCUTE - db 21,TAUROS - db 32,NIDORINO - db 19,CUBONE - db 26,EXEGGCUTE - db 24,MAROWAK - db 25,PINSIR - db 27,TANGELA - ENDC - + db 29,NIDORAN_M + db 21,NIDORAN_F + db 22,EXEGGCUTE + db 21,TAUROS + db 32,NIDORINO + db 19,CUBONE + db 26,EXEGGCUTE + db 24,MAROWAK + db 25,PINSIR + db 27,TANGELA db $00 diff --git a/data/wildPokemon/safarizonecenter.asm b/data/wildPokemon/safarizonecenter.asm index 7b50e5b9..e563fff2 100755 --- a/data/wildPokemon/safarizonecenter.asm +++ b/data/wildPokemon/safarizonecenter.asm @@ -1,56 +1,14 @@ ZoneMonsCenter: db $1E - IF DEF(_RED) - db 22,NIDORAN_M - db 25,RHYHORN - db 22,VENONAT - db 24,EXEGGCUTE - db 31,NIDORINO - db 25,EXEGGCUTE - db 31,NIDORINA - db 30,PARASECT - db 23,SCYTHER - db 23,CHANSEY - ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 22,NIDORAN_F - db 25,RHYHORN - db 22,VENONAT - db 24,EXEGGCUTE - db 31,NIDORINA - db 25,EXEGGCUTE - db 31,NIDORINO - db 30,PARASECT - db 23,PINSIR - db 23,CHANSEY - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 22,NIDORAN_M - db 25,RHYHORN - db 22,VENONAT - db 24,EXEGGCUTE - db 31,NIDORINO - db 25,EXEGGCUTE - db 31,NIDORINA - db 30,PARASECT - db 23,SCYTHER - db 23,CHANSEY - ENDC - - IF DEF(_YELLOW) - db 14,NIDORAN_M - db 36,NIDORAN_F - db 24,EXEGGCUTE - db 20,RHYHORN - db 23,NIDORINO - db 27,PARASECT - db 27,PARAS - db 32,PARASECT - db 22,TANGELA - db 7,CHANSEY - ENDC - + db 14,NIDORAN_M + db 36,NIDORAN_F + db 24,EXEGGCUTE + db 20,RHYHORN + db 23,NIDORINO + db 27,PARASECT + db 27,PARAS + db 32,PARASECT + db 22,TANGELA + db 7,CHANSEY db $00 diff --git a/data/wildPokemon/seafoamisland1.asm b/data/wildPokemon/seafoamisland1.asm index 45d0a707..f4799c12 100755 --- a/data/wildPokemon/seafoamisland1.asm +++ b/data/wildPokemon/seafoamisland1.asm @@ -1,56 +1,14 @@ IslandMons1: db $0F - IF DEF(_RED) - db 30,SEEL - db 30,SLOWPOKE - db 30,SHELLDER - db 30,HORSEA - db 28,HORSEA - db 21,ZUBAT - db 29,GOLBAT - db 28,PSYDUCK - db 28,SHELLDER - db 38,GOLDUCK - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 30,SEEL - db 30,PSYDUCK - db 30,STARYU - db 30,KRABBY - db 28,KRABBY - db 21,ZUBAT - db 29,GOLBAT - db 28,SLOWPOKE - db 28,STARYU - db 38,SLOWBRO - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 30,SEEL - db 30,HORSEA - db 30,STARYU - db 30,KRABBY - db 28,KRABBY - db 21,ZUBAT - db 29,GOLBAT - db 28,SLOWPOKE - db 28,STARYU - db 38,SLOWBRO - ENDC - - IF DEF(_YELLOW) - db 18,ZUBAT - db 25,KRABBY - db 27,KRABBY - db 27,ZUBAT - db 36,ZUBAT - db 28,SLOWPOKE - db 30,SLOWPOKE - db 9,ZUBAT - db 27,GOLBAT - db 36,GOLBAT - ENDC - + db 18,ZUBAT + db 25,KRABBY + db 27,KRABBY + db 27,ZUBAT + db 36,ZUBAT + db 28,SLOWPOKE + db 30,SLOWPOKE + db 9,ZUBAT + db 27,GOLBAT + db 36,GOLBAT db $00 diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/wildPokemon/seafoamislandb1.asm index 3f6ef7b6..2f0f255e 100755 --- a/data/wildPokemon/seafoamislandb1.asm +++ b/data/wildPokemon/seafoamislandb1.asm @@ -1,56 +1,14 @@ IslandMonsB1: db $0A - IF DEF(_RED) - db 30,STARYU - db 30,HORSEA - db 32,SHELLDER - db 32,HORSEA - db 28,SLOWPOKE - db 30,SEEL - db 30,SLOWPOKE - db 28,SEEL - db 38,DEWGONG - db 37,SEADRA - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 30,SHELLDER - db 30,KRABBY - db 32,STARYU - db 32,KRABBY - db 28,PSYDUCK - db 30,SEEL - db 30,PSYDUCK - db 28,SEEL - db 38,DEWGONG - db 37,KINGLER - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 30,SHELLDER - db 30,KRABBY - db 32,STARYU - db 32,KRABBY - db 28,HORSEA - db 30,SEEL - db 30,HORSEA - db 28,SEEL - db 38,DEWGONG - db 37,KINGLER - ENDC - - IF DEF(_YELLOW) - db 27,ZUBAT - db 26,KRABBY - db 36,ZUBAT - db 28,KRABBY - db 27,GOLBAT - db 29,SLOWPOKE - db 18,ZUBAT - db 28,KINGLER - db 22,SEEL - db 26,SEEL - ENDC - + db 27,ZUBAT + db 26,KRABBY + db 36,ZUBAT + db 28,KRABBY + db 27,GOLBAT + db 29,SLOWPOKE + db 18,ZUBAT + db 28,KINGLER + db 22,SEEL + db 26,SEEL db $00 diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/wildPokemon/seafoamislandb2.asm index 5df1cca9..f3a23b07 100755 --- a/data/wildPokemon/seafoamislandb2.asm +++ b/data/wildPokemon/seafoamislandb2.asm @@ -1,56 +1,14 @@ IslandMonsB2: db $0A - IF DEF(_RED) - db 30,SEEL - db 30,SLOWPOKE - db 32,SEEL - db 32,SLOWPOKE - db 28,HORSEA - db 30,STARYU - db 30,HORSEA - db 28,SHELLDER - db 30,GOLBAT - db 37,SLOWBRO - ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 30,SEEL - db 30,PSYDUCK - db 32,SEEL - db 32,PSYDUCK - db 28,KRABBY - db 30,SHELLDER - db 30,KRABBY - db 28,STARYU - db 30,GOLBAT - db 37,GOLDUCK - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 30,SEEL - db 30,HORSEA - db 32,SEEL - db 32,HORSEA - db 28,KRABBY - db 30,SHELLDER - db 30,KRABBY - db 28,STARYU - db 30,GOLBAT - db 37,JYNX - ENDC - - IF DEF(_YELLOW) - db 27,ZUBAT - db 27,KRABBY - db 36,ZUBAT - db 27,GOLBAT - db 28,KINGLER - db 24,SEEL - db 29,KRABBY - db 36,GOLBAT - db 31,SLOWPOKE - db 31,SLOWBRO - ENDC - + db 27,ZUBAT + db 27,KRABBY + db 36,ZUBAT + db 27,GOLBAT + db 28,KINGLER + db 24,SEEL + db 29,KRABBY + db 36,GOLBAT + db 31,SLOWPOKE + db 31,SLOWBRO db $00 diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/wildPokemon/seafoamislandb3.asm index e8560c9a..ddf6acd3 100755 --- a/data/wildPokemon/seafoamislandb3.asm +++ b/data/wildPokemon/seafoamislandb3.asm @@ -1,68 +1,25 @@ IslandMonsB3: db $0A - IF DEF(_RED) - db 31,SLOWPOKE - db 31,SEEL - db 33,SLOWPOKE - db 33,SEEL - db 29,HORSEA - db 31,SHELLDER - db 31,HORSEA - db 29,SHELLDER - db 39,SEADRA - db 37,DEWGONG - ENDC + db 27,GOLBAT + db 36,ZUBAT + db 29,KRABBY + db 27,ZUBAT + db 30,KINGLER + db 26,SEEL + db 31,KRABBY + db 30,SEEL + db 28,DEWGONG + db 32,DEWGONG - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 31,PSYDUCK - db 31,SEEL - db 33,PSYDUCK - db 33,SEEL - db 29,KRABBY - db 31,STARYU - db 31,KRABBY - db 29,STARYU - db 39,KINGLER - db 37,DEWGONG - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 31,HORSEA - db 31,SEEL - db 33,HORSEA - db 33,SEEL - db 29,KRABBY - db 31,STARYU - db 31,KRABBY - db 29,STARYU - db 39,KINGLER - db 37,DEWGONG - ENDC - - IF DEF(_YELLOW) - db 27,GOLBAT - db 36,ZUBAT - db 29,KRABBY - db 27,ZUBAT - db 30,KINGLER - db 26,SEEL - db 31,KRABBY - db 30,SEEL - db 28,DEWGONG - db 32,DEWGONG - - db $05 - db 25,TENTACOOL - db 30,TENTACOOL - db 20,TENTACOOL - db 30,STARYU - db 35,TENTACOOL - db 30,STARYU - db 40,TENTACOOL - db 30,STARYU - db 30,STARYU - db 30,STARYU - ENDC - - db $00 + db $05 + db 25,TENTACOOL + db 30,TENTACOOL + db 20,TENTACOOL + db 30,STARYU + db 35,TENTACOOL + db 30,STARYU + db 40,TENTACOOL + db 30,STARYU + db 30,STARYU + db 30,STARYU diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/wildPokemon/seafoamislandb4.asm index 7f8977d6..dd842dda 100755 --- a/data/wildPokemon/seafoamislandb4.asm +++ b/data/wildPokemon/seafoamislandb4.asm @@ -1,68 +1,25 @@ IslandMonsB4: db $0A - IF DEF(_RED) - db 31,HORSEA - db 31,SHELLDER - db 33,HORSEA - db 33,SHELLDER - db 29,SLOWPOKE - db 31,SEEL - db 31,SLOWPOKE - db 29,SEEL - db 39,SLOWBRO - db 32,GOLBAT - ENDC + db 36,GOLBAT + db 36,ZUBAT + db 30,KRABBY + db 32,KINGLER + db 28,SEEL + db 32,SEEL + db 27,GOLBAT + db 45,ZUBAT + db 30,DEWGONG + db 34,DEWGONG - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) - db 31,KRABBY - db 31,STARYU - db 33,KRABBY - db 33,STARYU - db 29,PSYDUCK - db 31,SEEL - db 31,PSYDUCK - db 29,SEEL - db 39,GOLDUCK - db 32,GOLBAT - ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 31,KRABBY - db 31,STARYU - db 33,KRABBY - db 33,STARYU - db 29,HORSEA - db 31,SEEL - db 31,HORSEA - db 29,SEEL - db 39,JYNX - db 32,GOLBAT - ENDC - - IF DEF(_YELLOW) - db 36,GOLBAT - db 36,ZUBAT - db 30,KRABBY - db 32,KINGLER - db 28,SEEL - db 32,SEEL - db 27,GOLBAT - db 45,ZUBAT - db 30,DEWGONG - db 34,DEWGONG - - db $05 - db 25,TENTACOOL - db 30,TENTACOOL - db 20,TENTACOOL - db 30,STARYU - db 35,TENTACOOL - db 30,STARYU - db 40,TENTACOOL - db 30,STARYU - db 30,STARYU - db 30,STARYU - ENDC - - db $00 + db $05 + db 25,TENTACOOL + db 30,TENTACOOL + db 20,TENTACOOL + db 30,STARYU + db 35,TENTACOOL + db 30,STARYU + db 40,TENTACOOL + db 30,STARYU + db 30,STARYU + db 30,STARYU diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm index 504d32f1..ff7be04e 100755 --- a/data/wildPokemon/unknowndungeon1.asm +++ b/data/wildPokemon/unknowndungeon1.asm @@ -1,38 +1,14 @@ DungeonMons1: db $0A - IF DEF(_YELLOW) - db 50,GOLBAT - db 55,GOLBAT - db 45,GRAVELER - db 55,GLOOM - db 55,WEEPINBELL - db 52,SANDSLASH - db 54,VENOMOTH - db 54,PARASECT - db 55,DITTO - db 60,DITTO - ELSE - db 46,GOLBAT - db 46,HYPNO - db 46,MAGNETON - IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 49,DODRIO - ENDC - IF DEF(_JAPAN) && DEF(_BLUE) - db 49,RAPIDASH - ENDC - db 49,VENOMOTH - IF DEF(_RED) - db 52,ARBOK - ENDC - IF !DEF(_RED) - db 52,SANDSLASH - ENDC - db 49,KADABRA - db 52,PARASECT - db 53,RAICHU - db 53,DITTO - ENDC - + db 50,GOLBAT + db 55,GOLBAT + db 45,GRAVELER + db 55,GLOOM + db 55,WEEPINBELL + db 52,SANDSLASH + db 54,VENOMOTH + db 54,PARASECT + db 55,DITTO + db 60,DITTO db $00 diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm index 9422f3a0..1fd20019 100755 --- a/data/wildPokemon/unknowndungeon2.asm +++ b/data/wildPokemon/unknowndungeon2.asm @@ -1,33 +1,14 @@ DungeonMons2: db $0F - IF DEF(_YELLOW) - db 52,GOLBAT - db 57,GOLBAT - db 50,GRAVELER - db 56,SANDSLASH - db 50,RHYHORN - db 60,DITTO - db 58,GLOOM - db 58,WEEPINBELL - db 60,RHYDON - db 58,RHYDON - ELSE - db 51,DODRIO - db 51,VENOMOTH - db 51,KADABRA - db 52,RHYDON - IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN)) - db 52,MAROWAK - ENDC - IF (DEF(_BLUE) && DEF(_JAPAN)) - db 52,MAROWAK - ENDC - db 52,ELECTRODE - db 56,CHANSEY - db 54,WIGGLYTUFF - db 55,DITTO - db 60,DITTO - ENDC - + db 52,GOLBAT + db 57,GOLBAT + db 50,GRAVELER + db 56,SANDSLASH + db 50,RHYHORN + db 60,DITTO + db 58,GLOOM + db 58,WEEPINBELL + db 60,RHYDON + db 58,RHYDON db $00 diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm index 6a88edb2..5848678f 100755 --- a/data/wildPokemon/unknowndungeonb1.asm +++ b/data/wildPokemon/unknowndungeonb1.asm @@ -1,33 +1,14 @@ DungeonMonsB1: db $19 - IF DEF(_YELLOW) - db 54,GOLBAT - db 59,GOLBAT - db 55,GRAVELER - db 52,RHYHORN - db 62,RHYDON - db 60,DITTO - db 56,CHANSEY - db 65,DITTO - db 55,LICKITUNG - db 50,LICKITUNG - ELSE - db 55,RHYDON - db 55,MAROWAK - db 55,ELECTRODE - db 64,CHANSEY - db 64,PARASECT - db 64,RAICHU - IF DEF(_RED) - db 57,ARBOK - ENDC - IF DEF(_BLUE) || DEF(_GREEN) - db 57,SANDSLASH - ENDC - db 65,DITTO - db 63,DITTO - db 67,DITTO - ENDC - + db 54,GOLBAT + db 59,GOLBAT + db 55,GRAVELER + db 52,RHYHORN + db 62,RHYDON + db 60,DITTO + db 56,CHANSEY + db 65,DITTO + db 55,LICKITUNG + db 50,LICKITUNG db $00 diff --git a/data/wildPokemon/victoryroad1.asm b/data/wildPokemon/victoryroad1.asm index 98914a91..f3e029fa 100755 --- a/data/wildPokemon/victoryroad1.asm +++ b/data/wildPokemon/victoryroad1.asm @@ -1,29 +1,14 @@ PlateauMons1: db $0F - - IF DEF(_YELLOW) - db 26,GEODUDE - db 31,GEODUDE - db 36,GEODUDE - db 39,ZUBAT - db 44,ZUBAT - db 41,GEODUDE - db 43,ONIX - db 45,ONIX - db 41,GRAVELER - db 47,GRAVELER - ELSE - db 24,MACHOP - db 26,GEODUDE - db 22,ZUBAT - db 36,ONIX - db 39,ONIX - db 42,ONIX - db 41,GRAVELER - db 41,GOLBAT - db 42,MACHOKE - db 43,MAROWAK - ENDC - + db 26,GEODUDE + db 31,GEODUDE + db 36,GEODUDE + db 39,ZUBAT + db 44,ZUBAT + db 41,GEODUDE + db 43,ONIX + db 45,ONIX + db 41,GRAVELER + db 47,GRAVELER db $00 diff --git a/data/wildPokemon/victoryroad2.asm b/data/wildPokemon/victoryroad2.asm index ffe117bc..fcd910d2 100755 --- a/data/wildPokemon/victoryroad2.asm +++ b/data/wildPokemon/victoryroad2.asm @@ -1,29 +1,14 @@ PlateauMons2: db $0A - - IF DEF(_YELLOW) - db 31,GEODUDE - db 36,GEODUDE - db 41,GEODUDE - db 44,ZUBAT - db 39,GOLBAT - db 44,GRAVELER - db 45,ONIX - db 47,ONIX - db 39,MACHOKE - db 42,MACHOKE - ELSE - db 22,MACHOP - db 24,GEODUDE - db 26,ZUBAT - db 36,ONIX - db 39,ONIX - db 42,ONIX - db 41,MACHOKE - db 40,GOLBAT - db 40,MAROWAK - db 43,GRAVELER - ENDC - + db 31,GEODUDE + db 36,GEODUDE + db 41,GEODUDE + db 44,ZUBAT + db 39,GOLBAT + db 44,GRAVELER + db 45,ONIX + db 47,ONIX + db 39,MACHOKE + db 42,MACHOKE db $00 diff --git a/data/wildPokemon/victoryroad3.asm b/data/wildPokemon/victoryroad3.asm index 7c1b2c1c..ed4d773b 100755 --- a/data/wildPokemon/victoryroad3.asm +++ b/data/wildPokemon/victoryroad3.asm @@ -1,29 +1,14 @@ PlateauMons3: db $0F - - IF DEF(_YELLOW) - db 36,GEODUDE - db 44,GOLBAT - db 41,GEODUDE - db 49,ONIX - db 46,GEODUDE - db 41,GRAVELER - db 42,MACHOKE - db 45,MACHOKE - db 47,GRAVELER - db 47,GRAVELER - ELSE - db 24,MACHOP - db 26,GEODUDE - db 22,ZUBAT - db 42,ONIX - db 40,VENOMOTH - db 45,ONIX - db 43,GRAVELER - db 41,GOLBAT - db 42,MACHOKE - db 45,MACHOKE - ENDC - + db 36,GEODUDE + db 44,GOLBAT + db 41,GEODUDE + db 49,ONIX + db 46,GEODUDE + db 41,GRAVELER + db 42,MACHOKE + db 45,MACHOKE + db 47,GRAVELER + db 47,GRAVELER db $00 diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm index f6e00ac3..eb4889a7 100755 --- a/data/wildPokemon/viridianforest.asm +++ b/data/wildPokemon/viridianforest.asm @@ -1,43 +1,14 @@ ForestMons: - IF DEF(_YELLOW) - db $19 - db 3,CATERPIE - db 4,METAPOD - db 4,CATERPIE - db 5,CATERPIE - db 4,PIDGEY - db 6,PIDGEY - db 6,CATERPIE - db 6,METAPOD - db 8,PIDGEY - db 9,PIDGEOTTO - ELSE - db $08 - IF DEF(_RED) - db 4,WEEDLE - db 5,KAKUNA - db 3,WEEDLE - db 5,WEEDLE - db 4,KAKUNA - db 6,KAKUNA - db 4,METAPOD - db 3,CATERPIE - ENDC - IF DEF(_BLUE) || DEF(_GREEN) - db 4,CATERPIE - db 5,METAPOD - db 3,CATERPIE - db 5,CATERPIE - db 4,METAPOD - db 6,METAPOD - db 4,KAKUNA - db 3,WEEDLE - ENDC - - db 3,PIKACHU - db 5,PIKACHU - ENDC - - + db $19 + db 3,CATERPIE + db 4,METAPOD + db 4,CATERPIE + db 5,CATERPIE + db 4,PIDGEY + db 6,PIDGEY + db 6,CATERPIE + db 6,METAPOD + db 8,PIDGEY + db 9,PIDGEOTTO db $00 diff --git a/data/wild_mons.asm b/data/wild_mons.asm index f29fd340..e1c81b8b 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -247,9 +247,7 @@ WildDataPointers: ; ceeb (3:4eeb) dw NoMons dw NoMons dw NoMons - IF DEF(_OPTION_BEACH_HOUSE) - dw NoMons - ENDC + dw NoMons dw $FFFF ; wild pokemon data is divided into two parts. diff --git a/engine/bank3f/data/map_songs.asm b/engine/bank3f/data/map_songs.asm index 4a84aebb..b7f50c93 100644 --- a/engine/bank3f/data/map_songs.asm +++ b/engine/bank3f/data/map_songs.asm @@ -247,6 +247,4 @@ MapSongBanks: ; fc000 (3f:4000) db MUSIC_GYM, BANK(Music_Gym) ; Lorelei db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha -IF DEF(_OPTION_BEACH_HOUSE) db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse -ENDC diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index dc08e0e1..8791d538 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -367,15 +367,7 @@ AnimationTileset2: ; 786ee (1e:46ee) INCBIN "gfx/attack_anim_2.2bpp" SlotMachineTiles2: ; 78bde (1e:4bde) -IF DEF(_RED) - INCBIN "gfx/red/slotmachine2.2bpp" -ENDC -IF DEF(_BLUE) - INCBIN "gfx/blue/slotmachine2.2bpp" -ENDC -IF DEF(_YELLOW) - INCBIN "gfx/yellow/slotmachine2.2bpp" -ENDC + INCBIN "gfx/slotmachine2.2bpp" MoveAnimation: ; 78d5e (1e:4d5e) push hl diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 8775604e..1b8203b1 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2972,11 +2972,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6) jp Delay3 DisabledText: ; 3d555 (f:5555) -IF DEF(_YELLOW) db "Disabled!@" -ELSE - db "disabled!@" -ENDC TypeText: ; 3d55f (f:555f) db "TYPE@" diff --git a/engine/intro.asm b/engine/intro.asm index 7c0464d3..5b03f23a 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -428,16 +428,7 @@ FightIntroBackMon: ; 41a99 (10:5a99) INCBIN "gfx/intro_fight.2bpp" FightIntroFrontMon: ; 42099 (10:6099) - -IF DEF(_RED) - INCBIN "gfx/red/intro_nido_1.6x6.2bpp" - INCBIN "gfx/red/intro_nido_2.6x6.2bpp" - INCBIN "gfx/red/intro_nido_3.6x6.2bpp" - ds $10 ; blank tile -ENDC -IF DEF(_BLUE) - INCBIN "gfx/blue/intro_purin_1.6x6.2bpp" - INCBIN "gfx/blue/intro_purin_2.6x6.2bpp" - INCBIN "gfx/blue/intro_purin_3.6x6.2bpp" + INCBIN "gfx/intro_nido_1.6x6.2bpp" + INCBIN "gfx/intro_nido_2.6x6.2bpp" + INCBIN "gfx/intro_nido_3.6x6.2bpp" ds $10 ; blank tile -ENDC diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 61e6204e..70b5bc33 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -345,9 +345,7 @@ BillsPCMenuText: ; 216e1 (8:56e1) next "DEPOSIT ", $4a next "RELEASE ", $4a next "CHANGE BOX" -IF DEF(_YELLOW) next "PRINT BOX" -ENDC next "SEE YA!" db "@" diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 4351ae4c..bd4c40bd 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -366,9 +366,7 @@ PokedexMenuItemsText: ; 402af (10:42af) db "DATA" next "CRY" next "AREA" -IF DEF(_YELLOW) next "PRNT" -ENDC next "QUIT@" ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 34d98fd7..16a97377 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -181,39 +181,6 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c) .namestring ; 6aa3 (1:6aa3) db "NAME@" -IF DEF(_RED) -DefaultNamesPlayer: ; 6aa8 (1:6aa8) - db "NEW NAME" - next "RED" - next "ASH" - next "JACK" - db "@" - -DefaultNamesRival: ; 6abe (1:6abe) - db "NEW NAME" - next "BLUE" - next "GARY" - next "JOHN" - db "@" -ENDC - -IF DEF(_BLUE) -DefaultNamesPlayer: ; 6aa8 (1:6aa8) - db "NEW NAME" - next "BLUE" - next "GARY" - next "JOHN" - db "@" - -DefaultNamesRival: ; 6abe (1:6abe) - db "NEW NAME" - next "RED" - next "ASH" - next "JACK" - db "@" -ENDC - -IF DEF(_YELLOW) DefaultNamesPlayer: db "NEW NAME" next "YELLOW" @@ -227,7 +194,6 @@ DefaultNamesRival: next "GARY" next "JOHN" db "@" -ENDC Func_6ad6: ; 6ad6 (1:6ad6) ld b, a @@ -250,24 +216,10 @@ Func_6ad6: ; 6ad6 (1:6ad6) ld de, wcd6d ld bc, $14 jp CopyData -IF DEF(_RED) -DefaultNamesPlayerList: ; 6af2 (1:6af2) - db "NEW NAME@RED@ASH@JACK@" -DefaultNamesRivalList: ; 6b08 (1:6b08) - db "NEW NAME@BLUE@GARY@JOHN@" -ENDC -IF DEF(_BLUE) -DefaultNamesPlayerList: ; 6af2 (1:6af2) - db "NEW NAME@BLUE@GARY@JOHN@" -DefaultNamesRivalList: ; 6b08 (1:6b08) - db "NEW NAME@RED@ASH@JACK@" -ENDC -IF DEF(_YELLOW) DefaultNamesPlayerList: db "NEW NAME@YELLOW@ASH@JACK@" DefaultNamesRivalList: db "NEW NAME@BLUE@GARY@JOHN@" -ENDC TextTerminator_6b20: ; 6b20 (1:6b20) db "@" diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index e3e452f3..fc1a3e11 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -862,12 +862,4 @@ SLOTSMOUSE EQU $1614 INCLUDE "data/slot_machine_wheels.asm" SlotMachineTiles1: ; 37a51 (d:7a51) -IF DEF(_RED) - INCBIN "gfx/red/slotmachine1.2bpp" -ENDC -IF DEF(_BLUE) - INCBIN "gfx/blue/slotmachine1.2bpp" -ENDC -IF DEF(_YELLOW) - INCBIN "gfx/yellow/slotmachine1.2bpp" -ENDC + INCBIN "gfx/slotmachine1.2bpp" diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index ed23fbc4..8f2fcfe7 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -56,14 +56,8 @@ LoadTitlescreenGraphics: ; 42dd (1:42dd) ld a, BANK(PokemonLogoGraphics) call FarCopyData2 ; second chunk ld hl, Version_GFX ; $402f -IF DEF(_RED) ld de,vChars2 + $600 ld bc,$50 -ENDC -IF DEF(_BLUE) - ld de,vChars2 + $600 + $10 - ld bc,$50 - $10 -ENDC ld a, BANK(Version_GFX) call FarCopyDataDouble @@ -114,12 +108,7 @@ ENDC call SaveScreenTilesToBuffer2 call LoadScreenTilesFromBuffer2 call EnableLCD -IF DEF(_RED) ld a,CHARMANDER ; which Pokemon to show first on the title screen -ENDC -IF DEF(_BLUE) - ld a,SQUIRTLE ; which Pokemon to show first on the title screen -ENDC ld [wWhichTrade], a ; wWhichTrade call Func_4524 @@ -382,9 +371,4 @@ PrintGameVersionOnTitleScreen: ; 4598 (1:4598) ; these point to special tiles specifically loaded for that purpose and are not usual text VersionOnTitleScreenText: ; 45a1 (1:45a1) -IF DEF(_RED) db $60,$61,$7F,$65,$66,$67,$68,$69,"@" ; "Red Version" -ENDC -IF DEF(_BLUE) - db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version" -ENDC diff --git a/gfx/intro_nido_1.6x6.png b/gfx/intro_nido_1.6x6.png Binary files differnew file mode 100644 index 00000000..4c7804a1 --- /dev/null +++ b/gfx/intro_nido_1.6x6.png diff --git a/gfx/intro_nido_2.6x6.png b/gfx/intro_nido_2.6x6.png Binary files differnew file mode 100644 index 00000000..a29a4814 --- /dev/null +++ b/gfx/intro_nido_2.6x6.png diff --git a/gfx/intro_nido_3.6x6.png b/gfx/intro_nido_3.6x6.png Binary files differnew file mode 100644 index 00000000..e920d55d --- /dev/null +++ b/gfx/intro_nido_3.6x6.png diff --git a/gfx/redgreenversion.png b/gfx/redgreenversion.png Binary files differnew file mode 100644 index 00000000..e41b4295 --- /dev/null +++ b/gfx/redgreenversion.png @@ -4874,12 +4874,10 @@ INCLUDE "data/mapHeaders/billshouse.asm" INCLUDE "scripts/billshouse.asm" INCLUDE "data/mapObjects/billshouse.asm" BillsHouseBlocks: INCBIN "maps/billshouse.blk" -IF DEF(_OPTION_BEACH_HOUSE) INCLUDE "data/mapHeaders/beach_house.asm" INCLUDE "scripts/beach_house.asm" BeachHouseBlockdata: INCBIN "maps/beach_house.blk" INCLUDE "data/mapObjects/beach_house.asm" -ENDC INCLUDE "engine/menu/oaks_pc.asm" @@ -5794,11 +5792,7 @@ Route17Blocks: INCBIN "maps/route17.blk" INCLUDE "data/mapHeaders/route19.asm" INCLUDE "data/mapObjects/route19.asm" -IF DEF(_OPTION_BEACH_HOUSE) Route19Blocks: INCBIN "maps/route19-yellow.blk" -ELSE -Route19Blocks: INCBIN "maps/route19.blk" -ENDC INCLUDE "data/mapHeaders/route21.asm" INCLUDE "data/mapObjects/route21.asm" @@ -6148,7 +6142,6 @@ INCLUDE "scripts/pokemontower7.asm" INCLUDE "data/mapObjects/pokemontower7.asm" PokemonTower7Blocks: INCBIN "maps/pokemontower7.blk" -<<<<<<< HEAD INCLUDE "data/mapHeaders/celadonmart1.asm" INCLUDE "scripts/celadonmart1.asm" INCLUDE "data/mapObjects/celadonmart1.asm" diff --git a/red.asm b/red.asm deleted file mode 100644 index 901a611a..00000000 --- a/red.asm +++ /dev/null @@ -1,2 +0,0 @@ -_RED EQU 1 -INCLUDE "charmap.asm" diff --git a/red/audio.asm b/red/audio.asm deleted file mode 100644 index 6c90a7c1..00000000 --- a/red/audio.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "red.asm" -INCLUDE "audio.asm" diff --git a/red/main.asm b/red/main.asm deleted file mode 100644 index ff8de04f..00000000 --- a/red/main.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "red.asm" -INCLUDE "main.asm" diff --git a/red/text.asm b/red/text.asm deleted file mode 100644 index d5d571d7..00000000 --- a/red/text.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "red.asm" -INCLUDE "text.asm" diff --git a/red/wram.asm b/red/wram.asm deleted file mode 100644 index 68c3c803..00000000 --- a/red/wram.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "red.asm" -INCLUDE "wram.asm" @@ -1,2 +1 @@ -3d45c1ee9abd5738df46d2bdda8b57dc pokered.gbc -50927e843568814f7ed45ec4f944bd8b pokeblue.gbc +d9290db87b1f0a23b89f99ee4469e34b pokeyellow.gbc diff --git a/text/credits_text.asm b/text/credits_text.asm index 2c638b9e..02614c6a 100755 --- a/text/credits_text.asm +++ b/text/credits_text.asm @@ -65,12 +65,7 @@ CreditsTextPointers: ; 742c3 (1d:42c3) dw CredPAAD CredVersion: ; 74343 (1d:4343) ; this 1 byte difference makes all bank addresses offset by 1 in the blue version -IF DEF(_RED) db -8, "RED VERSION STAFF@" -ENDC -IF DEF(_BLUE) - db -8, "BLUE VERSION STAFF@" -ENDC CredTajiri: ; 74356 (1d:4356) db -6, "SATOSHI TAJIRI@" CredTaOota: ; 74366 (1d:4366) diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm index 9e20b7aa..36b74504 100644 --- a/text/maps/agatha.asm +++ b/text/maps/agatha.asm @@ -23,11 +23,7 @@ _AgathaBeforeBattleText:: ; 8686b (21:686b) done _AgathaEndBattleText:: ; 86970 (21:6970) -IF DEF(_YELLOW) text "Woo-hoo!" -ELSE - text "Oh ho!" -ENDC line "You're something" cont "special, child!" prompt diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm index 3ec1e3f3..257a7128 100644 --- a/text/maps/bills_house.asm +++ b/text/maps/bills_house.asm @@ -1,9 +1,7 @@ -IF DEF(_YELLOW) _BillsHouseDontLeaveText:: text "Whoa, don't go" line "anywhere, wait!" done -ENDC _BillsHouseText_1e865:: ; 8d267 (23:5267) text "Hiya! I'm a" diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm index a5b155f2..9891ce26 100644 --- a/text/maps/blues_house.asm +++ b/text/maps/blues_house.asm @@ -29,19 +29,11 @@ _DaisyUseMapText:: done _BluesHouseText2:: -IF DEF(_YELLOW) text "Spending time" line "with your #MON" cont "makes them more" cont "friendly to you." done -ELSE - text "#MON are living" - line "things! If they" - cont "get tired, give" - cont "them a rest!" - done -ENDC _BluesHouseText3:: text "It's a big map!" diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm index 0a4c5333..b84cd345 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/celadon_city.asm @@ -1,18 +1,10 @@ _CeladonCityText1:: ; a59fb (29:59fb) text "I got my KOFFING" -IF DEF(_YELLOW) line "from my friend!" para "We get along now," line "because I was" cont "very nice to it!" -ELSE - line "in CINNABAR!" - - para "It's nice, but it" - line "breathes poison" - cont "when it's angry!" -ENDC done _CeladonCityText2:: ; a5a4b (29:5a4b) @@ -103,11 +95,7 @@ _CeladonCityText13:: ; a5d41 (29:5d41) line "#MON GYM" cont "LEADER: ERIKA" -IF DEF(_YELLOW) para "The Nature-Loving" -ELSE - para "The Nature Loving" -ENDC line "Princess!" done @@ -144,11 +132,7 @@ _CeladonCityText17:: ; a5e3e (29:5e3e) _CeladonCityText18:: ; a5e6a (29:5e6a) text "ROCKET GAME CORNER" line "The playground" -IF DEF(_YELLOW) cont "for grownups!" -ELSE - cont "for grown-ups!" -ENDC done _CeladonCityText10:: ; a5c82 (29:5c82) diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/celadon_dept_store_4f.asm index de33021b..514d4921 100644 --- a/text/maps/celadon_dept_store_4f.asm +++ b/text/maps/celadon_dept_store_4f.asm @@ -1,16 +1,11 @@ _CeladonMart4Text2:: ; 9cad4 (27:4ad4) text "I'm getting a" -IF DEF(_YELLOW) line "gift for COPYCAT" cont "in CERULEAN CITY." para "It's got to be a" line "# DOLL. They" cont "are trendy!" -ELSE - line "# DOLL for my" - cont "girl friend!" -ENDC done _CeladonMart4Text3:: ; 9cafd (27:4afd) diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm index f2eef613..665bf491 100644 --- a/text/maps/celadon_dept_store_roof.asm +++ b/text/maps/celadon_dept_store_roof.asm @@ -50,14 +50,7 @@ _CeladonMartRoofText_4850f:: ; 9cca5 (27:4ca5) para "@" TX_RAM wcf4b text " contains" -IF DEF(_YELLOW) line "ROCK SLIDE!@@" -ELSE - line "ROCK SLIDE!" - - para "It can spook the" - line "target sometimes!@@" -ENDC _CeladonMartRoofText_48515:: ; 9cce6 (27:4ce6) text "Yay!" diff --git a/text/maps/cerulean_badge_house_1.asm b/text/maps/cerulean_badge_house_1.asm index ad57f00e..c3f93152 100644 --- a/text/maps/cerulean_badge_house_1.asm +++ b/text/maps/cerulean_badge_house_1.asm @@ -19,11 +19,7 @@ _CeruleanHouse2Text_74e7c:: ; 9913a (26:513a) done _CeruleanHouse2Text_74e81:: ; 99170 (26:5170) -IF DEF(_YELLOW) text "Come visit me any-" -ELSE - text "Come visit me any" -ENDC line "time you wish." done @@ -33,11 +29,7 @@ _CeruleanHouse2Text_74e96:: ; 99192 (26:5192) cont "a little bit." para "It also lets you" -IF DEF(_YELLOW) line "use FLASH any-" -ELSE - line "use FLASH any" -ENDC cont "time you desire." prompt diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm index f014ee5d..52b308a4 100644 --- a/text/maps/cerulean_city.asm +++ b/text/maps/cerulean_city.asm @@ -120,7 +120,6 @@ _CeruleanCityText5:: ; a50ba (29:50ba) done _CeruleanCityText6:: ; a50f6 (29:50f6) -IF DEF(_YELLOW) text "These poor people" line "here were robbed." @@ -128,65 +127,31 @@ IF DEF(_YELLOW) line "that TEAM ROCKET" cont "is behind this" cont "terrible deed." -ELSE - text "The people here" - line "were robbed." - - para "It's obvious that" - line "TEAM ROCKET is" - cont "behind this most" - cont "heinous crime!" -ENDC para "Even our POLICE" -IF DEF(_YELLOW) line "FORCE has trouble" -ELSE - line "force has trouble" -ENDC cont "with the ROCKETs!" done _CeruleanCityText_19730:: ; a5188 (29:5188) -IF DEF(_YELLOW) text "OK! ELECTRODE!" -ELSE - text "OK! SLOWBRO!" -ENDC line "Use SONICBOOM!" -IF DEF(_YELLOW) cont "Please ELECTRODE," -ELSE - cont "Come on, SLOWBRO" -ENDC cont "pay attention!" done _CeruleanCityText_19735:: ; a51c5 (29:51c5) -IF DEF(_YELLOW) text "ELECTRODE, TACKLE!" -ELSE - text "SLOWBRO punch!" -ENDC line "No! You blew it" cont "again!" done _CeruleanCityText_1973a:: ; a51ec (29:51ec) -IF DEF(_YELLOW) text "ELECTRODE, SWIFT!" -ELSE - text "SLOWBRO, WITHDRAW!" -ENDC line "No! That's wrong!" -IF DEF(_YELLOW) para "Training #MON" line "is difficult!" -ELSE - para "It's so hard to" - line "control #MON!" -ENDC para "Your #MON's" line "obedience depends" @@ -195,38 +160,22 @@ ENDC done _CeruleanCityText_1976f:: ; a526b (29:526b) -IF DEF(_YELLOW) text "ELECTRODE took a" -ELSE - text "SLOWBRO took a" -ENDC line "snooze..." done _CeruleanCityText_19774:: ; a5285 (29:5285) -IF DEF(_YELLOW) text "ELECTRODE is" -ELSE - text "SLOWBRO is" -ENDC line "loafing around..." done _CeruleanCityText_19779:: ; a52a3 (29:52a3) -IF DEF(_YELLOW) text "ELECTRODE turned" -ELSE - text "SLOWBRO turned" -ENDC line "away..." done _CeruleanCityText_1977e:: ; a52bb (29:52bb) -IF DEF(_YELLOW) text "ELECTRODE" -ELSE - text "SLOWBRO" -ENDC line "ignored orders..." done diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm index 359d8d1c..280d6bc6 100644 --- a/text/maps/cerulean_gym.asm +++ b/text/maps/cerulean_gym.asm @@ -2,34 +2,21 @@ _CeruleanGymText_5c7be:: ; 989c1 (26:49c1) text "Hi, you're a new" line "face!" -IF DEF(_YELLOW) para "What's your policy" line "on #MON? What" cont "is your approach?" -ELSE - para "Trainers who want" - line "to turn pro have" - cont "to have a policy" - cont "about #MON!" - - para "What is your" - line "approach when you" - cont "catch #MON?" -ENDC para "My policy is an" line "all-out offensive" cont "with water-type" cont "#MON!" -IF DEF(_YELLOW) para "MISTY, the world-" line "famous beauty, is" cont "your host!" para "Are you ready," line "sweetie?" -ENDC done _CeruleanGymText_5c7c3:: ; 98a7b (26:4a7b) @@ -50,11 +37,7 @@ _CeruleanGymText_5c7c8:: ; 98ab0 (26:4ab0) para "There's more, you" line "can now use CUT" -IF DEF(_YELLOW) cont "anytime!" -ELSE - cont "any time!" -ENDC para "You can CUT down" line "small bushes to" @@ -74,13 +57,8 @@ _CeruleanGymText_5c7d3:: ; 98b90 (26:4b90) done _CeruleanGymText_5c7d8:: ; 98bb0 (26:4bb0) -IF DEF(_YELLOW) text "I can't" line "believe I lost!" -ELSE - text "Wow!" - line "You're too much!" -ENDC para "All right!" @@ -150,11 +128,7 @@ _CeruleanGymText_5c82f:: ; 98db0 (26:4db0) text "You beat MISTY!" line "What'd I tell ya?" -IF DEF(_YELLOW) para "You and me, kid," -ELSE - para "You and me kid," -ENDC line "we make a pretty" cont "darn good team!" done diff --git a/text/maps/cinnabar_island.asm b/text/maps/cinnabar_island.asm index 897368d2..608a7ace 100644 --- a/text/maps/cinnabar_island.asm +++ b/text/maps/cinnabar_island.asm @@ -13,11 +13,7 @@ _CinnabarIslandText1:: ; a61e6 (29:61e6) _CinnabarIslandText2:: ; a622a (29:622a) text "Scientists conduct" line "experiments in" -IF DEF(_YELLOW) cont "the burned-out" -ELSE - cont "the burned out" -ENDC cont "building." done diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm index cb47a8f0..7199255e 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/fan_club.asm @@ -1,24 +1,15 @@ PikachuFanText:: text "Won't you admire" -IF DEF(_YELLOW) line "my CLEFAIRY's" -ELSE - line "my PIKACHU's" -ENDC cont "adorable tail?" done PikachuFanBetterText:: -IF DEF(_YELLOW) text "Humph! My CLEFAIRY" -ELSE - text "Humph! My PIKACHU" -ENDC line "is twice as cute" cont "as that one!" done -IF DEF(_YELLOW) PikachuFanPrintText:: text "Our CHAIRMAN's new" line "hobby is taking" @@ -28,7 +19,6 @@ PikachuFanPrintText:: line "PRINT of my cute" cont "CLEFAIRY." done -ENDC SeelFanText:: text "I just love my" @@ -45,22 +35,15 @@ SeelFanBetterText:: line "more attractive!" done -IF DEF(_YELLOW) SeelFanPrintText:: text "I'm going to hook" line "up the cable to" cont "get a photo PRINT" cont "of my SEEL!" done -ENDC FanClubPikachuText:: -IF DEF(_YELLOW) text "CLEFAIRY: Pippii!" -ELSE - text "PIKACHU: Chu!" - line "Pikachu!" -ENDC done FanClubSeelText:: @@ -71,14 +54,9 @@ FanClubMeetChairText:: text "I chair the" line "#MON Fan Club!" -IF DEF(_YELLOW) para "I have more than" line "100 #MON. I" cont "love them all!" -ELSE - para "I have collected" - line "over 100 #MON!" -ENDC para "I'm very fussy" line "when it comes to" @@ -86,13 +64,8 @@ ENDC para "So..." -IF DEF(_YELLOW) para "Did you come to" line "hear me brag" -ELSE - para "Did you come" - line "visit to hear" -ENDC cont "about my #MON?" done @@ -169,7 +142,6 @@ FanClubBagFullText:: line "this!" done -IF DEF(_YELLOW) FanClubChairPrintText1:: text "Hi there, ",$52,"!" line "Have you seen my" @@ -198,14 +170,9 @@ FanClubChairPrintText4:: text "Maybe we won't" line "PRINT this now." done -ENDC _FanClubText6:: ; 9a948 (26:6948) -IF DEF(_YELLOW) text "Our CHAIRMAN is" -ELSE - text "Our Chairman is" -ENDC line "very vocal about" cont "#MON." done diff --git a/text/maps/fighting_dojo.asm b/text/maps/fighting_dojo.asm index 9cf7ba4e..334346b1 100644 --- a/text/maps/fighting_dojo.asm +++ b/text/maps/fighting_dojo.asm @@ -114,21 +114,13 @@ _FightingDojoAfterBattleText4:: ; a1b1a (28:5b1a) _WantHitmonleeText:: ; a1b4a (28:5b4a) text "You want the" -IF DEF(_YELLOW) line "hard-kicking" -ELSE - line "hard kicking" -ENDC cont "HITMONLEE?" done _WantHitmonchanText:: ; a1b70 (28:5b70) text "You want the" -IF DEF(_YELLOW) line "piston-punching" -ELSE - line "piston punching" -ENDC cont "HITMONCHAN?" done diff --git a/text/maps/fuchsia_city.asm b/text/maps/fuchsia_city.asm index bcb80d0e..2a0dddea 100644 --- a/text/maps/fuchsia_city.asm +++ b/text/maps/fuchsia_city.asm @@ -58,11 +58,7 @@ _FuchsiaCityText18:: ; a6011 (29:6011) cont "LEADER: KOGA" para "The Poisonous" -IF DEF(_YELLOW) line "Ninja Master!" -ELSE - line "Ninja Master" -ENDC done _FuchsiaCityChanseyText:: ; a6050 (29:6050) diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm index cb0cc622..4cd26004 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/hall_of_fame.asm @@ -1,10 +1,6 @@ _HallofFameRoomText1:: ; 85fb5 (21:5fb5) text "OAK: Er-hem!" -IF DEF(_YELLOW) line "Congratulations," -ELSE - line "Congratulations" -ENDC cont $52, "!" para "This floor is the" diff --git a/text/maps/lance.asm b/text/maps/lance.asm index 35ef3546..dd290681 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -1,10 +1,6 @@ _LanceBeforeBattleText:: ; 85d3c (21:5d3c) text "Ah! I heard about" -IF DEF(_YELLOW) line "you, ", $52, "!" -ELSE - line "you ", $52, "!" -ENDC para "I lead the ELITE" line "FOUR! You can" diff --git a/text/maps/mt_moon_1f.asm b/text/maps/mt_moon_1f.asm index 0577adf3..625f1c6d 100644 --- a/text/maps/mt_moon_1f.asm +++ b/text/maps/mt_moon_1f.asm @@ -115,9 +115,5 @@ _MtMoon1AfterBattleText8:: ; 80901 (20:4901) _MtMoon1Text14:: ; 8093a (20:493a) text "Beware! ZUBAT is" -IF DEF(_YELLOW) line "a bloodsucker!" -ELSE - line "a blood sucker!" -ENDC done diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/mt_moon_b2f.asm index d661e590..a564148e 100644 --- a/text/maps/mt_moon_b2f.asm +++ b/text/maps/mt_moon_b2f.asm @@ -1,4 +1,3 @@ -IF DEF(_YELLOW) _MtMoonJessieJamesText1:: text "Stop right there!@@" @@ -19,7 +18,6 @@ _MtMoonJessieJamesText4:: text "TEAM ROCKET, blast" line "off at the speed" cont "of light!@@" -ENDC _MtMoon3Text_49f24:: ; 8095e (20:495e) text "You want the" diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm index 7371a312..ca042705 100644 --- a/text/maps/museum_1f.asm +++ b/text/maps/museum_1f.asm @@ -72,11 +72,7 @@ _Museum1FText_5c28e:: ; 966b4 (25:66b4) para "But, my colleagues" line "just ignore me!" -IF DEF(_YELLOW) para "So, I have a favor" -ELSE - para "So I have a favor" -ENDC line "to ask!" para "Take this to a" diff --git a/text/maps/name_rater.asm b/text/maps/name_rater.asm index 2baec727..8adc7e61 100644 --- a/text/maps/name_rater.asm +++ b/text/maps/name_rater.asm @@ -43,11 +43,7 @@ _NameRaterText_1dac7:: ; 9a404 (26:6404) done _NameRaterText_1dacc:: ; 9a44c (26:644c) -IF DEF(_YELLOW) text "Fine! Come any-" -ELSE - text "Fine! Come any" -ENDC line "time you like!" done diff --git a/text/maps/pewter_gym.asm b/text/maps/pewter_gym.asm index 48d97e9d..a8781b4d 100644 --- a/text/maps/pewter_gym.asm +++ b/text/maps/pewter_gym.asm @@ -2,9 +2,11 @@ _PewterGymText_5c49e:: text "I'm BROCK!" line "I'm PEWTER's GYM" cont "LEADER!" + para "I believe in rock" line "hard defense and" cont "determination!" + para "That's why my" line "#MON are all" cont "the rock-type!" @@ -72,9 +74,11 @@ _TM34NoRoomText:: text "You don't have" line "room for this!" done + _PewterGymText_5c4bc:: text "I took" line "you for granted." + para "As proof of your" line "victory, here's" cont "the BOULDERBADGE!" @@ -105,8 +109,10 @@ _PewterGymBattleText1:: line "years from facing" cont "BROCK!" done + _PewterGymEndBattleText1:: text "Darn!" + para "Light years isn't" line "time! It measures" cont "distance!" @@ -117,6 +123,7 @@ _PewterGymAfterBattleText1:: line "but not as hot" cont "as BROCK!" done + _PewterGymText_5c515:: text "Hiya! I can tell" line "you have what it" @@ -126,9 +133,11 @@ _PewterGymText_5c515:: para "I'm no trainer," line "but I can tell" cont "you how to win!" + para "Let me take you" line "to the top!" done + _PewterGymText_5c51a:: text "All right! Let's" line "get happening!" @@ -161,11 +170,13 @@ _PewterGymText_5c529:: _PewterGymGuyText:: text "All right! Let's" line "get happening!" + para "It will be tough" line "for your PIKACHU" cont "at this GYM!" + para "Electric attacks" line "are harmless to" cont "BROCK's ground-" cont "type #MON." - done
\ No newline at end of file + done diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm index 71760b7b..e817fd9f 100644 --- a/text/maps/pewter_mart.asm +++ b/text/maps/pewter_mart.asm @@ -1,9 +1,5 @@ _PewterMartText_74cc6:: ; 985ac (26:45ac) -IF DEF(_YELLOW) text "A shady old man" -ELSE - text "A shady, old man" -ENDC line "got me to buy" cont "this really weird" cont "fish #MON!" diff --git a/text/maps/pewter_pokecenter.asm b/text/maps/pewter_pokecenter.asm index 114fed16..5e03f55a 100644 --- a/text/maps/pewter_pokecenter.asm +++ b/text/maps/pewter_pokecenter.asm @@ -8,7 +8,6 @@ _PewterPokecenterText1:: ; 98704 (26:4704) para "Scram!" done -IF DEF(_YELLOW) _PewterPokecenterText2:: text "#MON CENTERS" line "are wonderful!" @@ -21,7 +20,6 @@ _PewterPokecenterText2:: cont "poison and others" cont "are cured." done -ENDC _PewterPokecenterText5:: ; 98744 (26:4744) text "JIGGLYPUFF: Puu" diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/pokemon_tower_7f.asm index aab07f9c..8ac300ab 100644 --- a/text/maps/pokemon_tower_7f.asm +++ b/text/maps/pokemon_tower_7f.asm @@ -1,4 +1,3 @@ -IF DEF(_YELLOW) _PokemonTowerJessieJamesText1:: text "Stop right there!@@" @@ -22,7 +21,6 @@ _PokemonTowerJessieJamesText4:: text "Looks like TEAM" line "ROCKET's blasting" cont "off again!@@" -ENDC _TowerRescueFujiText:: ; 99c1a (26:5c1a) text "MR.FUJI: Heh? You" diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm index f6b6007e..9d03f166 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -1,11 +1,7 @@ _MomWakeUpText:: text "MOM: Right." line "All boys leave" -IF DEF(_YELLOW) cont "home someday." -ELSE - cont "home some day." -ENDC cont "It said so on TV." para "PROF.OAK, next" @@ -14,7 +10,6 @@ ENDC done _MomHealText1:: -IF DEF(_YELLOW) text "MOM: ",$52,", if" line "you drive your" cont "#MON too hard," @@ -24,12 +19,6 @@ IF DEF(_YELLOW) para "You should take a" line "rest." prompt -ELSE - text "MOM: ",$52,"!" - line "You should take a" - cont "quick rest." - prompt -ENDC _MomHealText2:: text "MOM: Oh good!" diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/rocket_hideout_b4f.asm index 0e8fca91..61c522fa 100644 --- a/text/maps/rocket_hideout_b4f.asm +++ b/text/maps/rocket_hideout_b4f.asm @@ -1,4 +1,3 @@ -IF DEF(_YELLOW) _RocketHideoutJessieJamesText1:: text "Not another step," line "brat!@@" @@ -21,7 +20,6 @@ _RocketHideoutJessieJamesText4:: text "Looks like TEAM" line "ROCKET's blasting" cont "off again!@@" -ENDC _RocketHideout4Text_4557a:: ; 8223e (20:623e) text "So! I must say, I" diff --git a/text/maps/route_10.asm b/text/maps/route_10.asm index 795f7e69..9b1c1ba4 100644 --- a/text/maps/route_10.asm +++ b/text/maps/route_10.asm @@ -33,11 +33,7 @@ _Route10AfterBattleText2:: ; 8e6f5 (23:66f5) done _Route10BattleText3:: ; 8e71c (23:671c) -IF DEF(_YELLOW) text "Hi, kid, want to" -ELSE - text "Hi kid, want to" -ENDC line "see my #MON?" done diff --git a/text/maps/route_12.asm b/text/maps/route_12.asm index 12925104..edbfa748 100644 --- a/text/maps/route_12.asm +++ b/text/maps/route_12.asm @@ -109,11 +109,7 @@ _Route12EndBattleText6:: ; 90318 (24:4318) _Route12AfterBattleText6:: ; 90329 (24:4329) text "It's all right." line "Losing doesn't" -IF DEF(_YELLOW) cont "bug me anymore." -ELSE - cont "bug me any more." -ENDC done _Route12BattleText7:: ; 90358 (24:4358) diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm index 3e8fb60c..8f18e9d4 100644 --- a/text/maps/route_12_gate_upstairs.asm +++ b/text/maps/route_12_gate_upstairs.asm @@ -5,11 +5,7 @@ _TM39PreReceiveText:: ; 8c86b (23:486b) para "You can have this" line "TM. I don't need" -IF DEF(_YELLOW) cont "it anymore..." -ELSE - cont "it any more..." -ENDC prompt _ReceivedTM39Text:: ; 8c8c6 (23:48c6) diff --git a/text/maps/route_14.asm b/text/maps/route_14.asm index b542274e..b479e3eb 100644 --- a/text/maps/route_14.asm +++ b/text/maps/route_14.asm @@ -10,11 +10,7 @@ _Route14EndBattleText1:: ; 9083f (24:483f) prompt _Route14AfterBattleText1:: ; 90851 (24:4851) -IF DEF(_YELLOW) text "You have some HMs," -ELSE - text "You have some HMs" -ENDC line "right? #MON" cont "can't ever forget" cont "those moves." diff --git a/text/maps/route_16.asm b/text/maps/route_16.asm index ec77ec6f..38d5e565 100644 --- a/text/maps/route_16.asm +++ b/text/maps/route_16.asm @@ -19,11 +19,7 @@ _Route16BattleText2:: ; 910d7 (24:50d7) done _Route16EndBattleText2:: ; 910f1 (24:50f1) -IF DEF(_YELLOW) text "Knock-" -ELSE - text "Knock" -ENDC line "out!" prompt diff --git a/text/maps/route_17.asm b/text/maps/route_17.asm index b053b473..c5897c41 100644 --- a/text/maps/route_17.asm +++ b/text/maps/route_17.asm @@ -133,11 +133,7 @@ _Route17AfterBattleText9:: ; 915dd (24:55dd) done _Route17BattleText10:: ; 91600 (24:5600) -IF DEF(_YELLOW) text "Get lost, kid!" -ELSE - text "Get lost kid!" -ENDC line "I'm bushed!" done diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index 052fd331..791eb2d4 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -77,15 +77,9 @@ _Route22RivalBeforeBattleText2:: ; 92450 (24:6450) line "the BADGEs too?" cont "That's cool!" -IF DEF(_YELLOW) para "Then I'll whip" line "you, ", $52, ", as" cont "a warmup for" -ELSE - para "Then I'll whip you" - line $52, " as a" - cont "warm up for" -ENDC cont "#MON LEAGUE!" para "Come on!" diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm index d73611f2..4ee90dc0 100644 --- a/text/maps/route_25.asm +++ b/text/maps/route_25.asm @@ -1,4 +1,3 @@ -IF DEF(_YELLOW) _Route25DamianText1:: text "I'm not good at" line "raising #MON." @@ -26,7 +25,6 @@ _Route25DamianText4:: text "How's CHARMANDER" line "doing?" done -ENDC _Route25BattleText1:: ; 9421e (25:421e) text "Local trainers" @@ -86,13 +84,8 @@ _Route25BattleText4:: ; 94369 (25:4369) done _Route25EndBattleText4:: ; 94385 (25:4385) -IF DEF(_YELLOW) text "I'm in" line "a slump!" -ELSE - text "I was in" - line "bad condition!" -ENDC prompt _Route25AfterBattleText4:: ; 9439e (25:439e) diff --git a/text/maps/route_3.asm b/text/maps/route_3.asm index 95612425..2ee5a696 100644 --- a/text/maps/route_3.asm +++ b/text/maps/route_3.asm @@ -66,13 +66,8 @@ _Route3BattleText4:: ; 8d924 (23:5924) _Route3EndBattleText4:: ; 8d944 (23:5944) text "If I" -IF DEF(_YELLOW) line "had new #MON," cont "I would've won!" -ELSE - line "had new #MON I" - cont "would've won!" -ENDC prompt _Route3AfterBattleText4:: ; 8d966 (23:5966) diff --git a/text/maps/route_6.asm b/text/maps/route_6.asm index 3a54f461..2e6a7c6a 100644 --- a/text/maps/route_6.asm +++ b/text/maps/route_6.asm @@ -1,4 +1,3 @@ -IF DEF(_YELLOW) _Route6BattleText1:: text "I'm doing this" line "out of love." @@ -32,34 +31,6 @@ _Route6AfterBattleText2:: cont "about calculated" cont "numbers." done -ELSE -_Route6BattleText1:: ; 8dc38 (23:5c38) - text "Who's there?" - line "Quit listening in" - cont "on us!" - done - -_Route6EndBattleText1:: ; 8dc5e (23:5c5e) - text "I" - line "just can't win!" - prompt - -_Route6AfterBattleText1:: ; 8dc70 (23:5c70) - text "Whisper..." - line "whisper..." - done - -_Route6BattleText2:: ; 8dc87 (23:5c87) - text "Excuse me! This" - line "is a private" - cont "conversation!" - done - -_Route6EndBattleText2:: ; 8dcb3 (23:5cb3) - text "Ugh!" - line "I hate losing!" - prompt -ENDC _Route6BattleText3:: ; 8dcc8 (23:5cc8) text "There aren't many" diff --git a/text/maps/route_8.asm b/text/maps/route_8.asm index 62e2aff3..0dbf1ec3 100644 --- a/text/maps/route_8.asm +++ b/text/maps/route_8.asm @@ -104,11 +104,7 @@ _Route8EndBattleText7:: ; 8e116 (23:6116) prompt _Route8AfterBattleText7:: ; 8e12a (23:612a) -if DEF(_YELLOW) text "SAFFRON's gate-" -ELSE - text "SAFFRON's gate" -ENDC line "keeper won't let" cont "us through." cont "He's so mean!" diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm index f0498280..17417e38 100644 --- a/text/maps/safari_zone_entrance.asm +++ b/text/maps/safari_zone_entrance.asm @@ -94,7 +94,6 @@ _SafariZoneEntranceText_753f0:: ; 9e993 (27:6993) line "regular here!" done -IF DEF(_OPTION_LOWCOST_SAFARI) _SafariZoneLowCostText1:: db 0 para "Oh, all right, pay" @@ -139,4 +138,3 @@ _SafariZoneLowCostText8:: text "Read my lips, NO!" line "Get it?" done -ENDC diff --git a/text/maps/saffron_gates.asm b/text/maps/saffron_gates.asm index b7db1751..dfc3faaf 100644 --- a/text/maps/saffron_gates.asm +++ b/text/maps/saffron_gates.asm @@ -3,11 +3,7 @@ _SaffronGateText_1dfe7:: ; 8aa5c (22:6a5c) line "Gee, I'm thirsty," cont "though!" -IF DEF(_YELLOW) para "Oh, wait there," -ELSE - para "Oh wait there," -ENDC line "the road's closed." done @@ -22,11 +18,7 @@ _SaffronGateText_8aaa9:: ; 8aaa9 (22:6aa9) _SaffronGateText_1dff1:: ; 8aaef (22:6aef) db $0 para "..." -IF DEF(_YELLOW) line "Glug, glug..." -ELSE - line "Glug glug..." -ENDC cont "..." cont "Gulp..." cont "If you want to go" diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm index 3236c7b2..1d4901f9 100644 --- a/text/maps/saffron_gym.asm +++ b/text/maps/saffron_gym.asm @@ -131,12 +131,7 @@ _SaffronGymEndBattleText2:: ; a2002 (28:6002) _SaffronGymAfterBattleText2:: ; a2019 (28:6019) text "Psychic #MON" -IF DEF(_YELLOW) line "fear only bugs!" -ELSE - line "fear only ghosts" - cont "and bugs!" -ENDC done _SaffronGymBattleText3:: ; a2042 (28:6042) diff --git a/text/maps/silph_co_10f.asm b/text/maps/silph_co_10f.asm index ef7eb2f6..937318a6 100644 --- a/text/maps/silph_co_10f.asm +++ b/text/maps/silph_co_10f.asm @@ -41,7 +41,6 @@ _SilphCo10AfterBattleText2:: ; 84e66 (21:4e66) cont "Then go on home!" done -IF DEF(_YELLOW) _SilphCoJessieJamesText1:: text "Hold it right" line "there, brat!@@" @@ -65,4 +64,3 @@ _SilphCoJessieJamesText4:: cont "of light!" para "Again...@@" -ENDC diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 1df04c5c..fcef667b 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -58,11 +58,7 @@ _SilphCo11Text2:: ; 8502f (21:502f) done _SilphCo11Text3:: ; 85075 (21:5075) -IF DEF(_YELLOW) text "Ah, ", $52, "!" -ELSE - text "Ah ", $52, "!" -ENDC line "So we meet again!" para "The PRESIDENT and" @@ -74,11 +70,7 @@ ENDC line "out of grown-up" cont "matters..." -IF DEF(_YELLOW) para "or, experience a" -ELSE - para "Or, experience a" -ENDC line "world of pain!" done diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm index 4437880c..dccf6e04 100644 --- a/text/maps/silph_co_2f.asm +++ b/text/maps/silph_co_2f.asm @@ -72,11 +72,7 @@ _SilphCo2EndBattleText3:: ; 8260f (20:660f) prompt _SilphCo2AfterBattleText3:: ; 82617 (20:6617) -IF DEF(_YELLOW) text "Diamond-shaped" -ELSE - text "Diamond shaped" -ENDC line "tiles are" cont "teleport blocks!" diff --git a/text/maps/silph_co_5f.asm b/text/maps/silph_co_5f.asm index cea48d51..d86c370a 100644 --- a/text/maps/silph_co_5f.asm +++ b/text/maps/silph_co_5f.asm @@ -47,11 +47,7 @@ _SilphCo5AfterBattleText3:: ; 82a43 (20:6a43) _SilphCo5BattleText4:: ; 82a81 (20:6a81) text "Whaaat? There" line "shouldn't be any" -IF DEF(_YELLOW) cont "children here!" -ELSE - cont "children here?" -ENDC done _SilphCo5EndBattleText4:: ; 84000 (21:4000) diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm index 5b56ad43..0b71b8c7 100644 --- a/text/maps/silph_co_7f.asm +++ b/text/maps/silph_co_7f.asm @@ -79,11 +79,7 @@ _SilphCo7Text_51e4b:: done _SilphCo7BattleText1:: ; 846ff (21:46ff) -IF DEF(_YELLOW) text "Aha! I smell a" -ELSE - text "Oh ho! I smell a" -ENDC line "little rat!" done @@ -171,11 +167,7 @@ _SilphCo7Text_51ec3:: ; 848a2 (21:48a2) done _SilphCo7Text_51ec8:: ; 8494a (21:494a) -IF DEF(_YELLOW) text "Oh-oh!" -ELSE - text "Oh ho!" -ENDC line "So, you are ready" cont "for BOSS ROCKET!" prompt diff --git a/text/maps/ss_anne_6.asm b/text/maps/ss_anne_6.asm index 59828a51..33123206 100644 --- a/text/maps/ss_anne_6.asm +++ b/text/maps/ss_anne_6.asm @@ -47,11 +47,7 @@ _SSAnne6Text_61807:: ; 81203 (20:5203) prompt _SSAnne6Text_6180c:: ; 81233 (20:5233) -IF DEF(_YELLOW) text "Salade de Salmon!" -ELSE - text "Salmon du Salad!" -ENDC para "Les guests may" line "gripe it's fish" diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm index 2a770464..f4d6f695 100644 --- a/text/maps/ss_anne_7.asm +++ b/text/maps/ss_anne_7.asm @@ -27,11 +27,7 @@ _ReceivingHM01Text:: ; 81347 (20:5347) para "Teach it to your" line "#MON and you" cont "can see it CUT" -IF DEF(_YELLOW) cont "anytime!" -ELSE - cont "any time!" -ENDC prompt _ReceivedHM01Text:: ; 8140d (20:540d) @@ -44,11 +40,7 @@ _SSAnne7Text_61932:: ; 8141c (20:541c) text "CAPTAIN: Whew!" para "Now that I'm not" -IF DEF(_YELLOW) line "sick anymore, I" -ELSE - line "sick any more, I" -ENDC cont "guess it's time." done diff --git a/text/maps/ss_anne_9.asm b/text/maps/ss_anne_9.asm index adbfe345..17efbcd0 100644 --- a/text/maps/ss_anne_9.asm +++ b/text/maps/ss_anne_9.asm @@ -1,9 +1,5 @@ _SSAnne9Text_61bf2:: ; 81799 (20:5799) -IF DEF(_YELLOW) text "In all my travels," -ELSE - text "In all my travels" -ENDC line "I've never seen" cont "any #MON sleep" cont "like this one!" diff --git a/text/maps/vermilion_gym.asm b/text/maps/vermilion_gym.asm index 952e06eb..009b5f5d 100644 --- a/text/maps/vermilion_gym.asm +++ b/text/maps/vermilion_gym.asm @@ -38,11 +38,7 @@ _VermilionGymText_5cb77:: ; 9c069 (27:4069) cont "#MON's SPEED!" para "It also lets your" -IF DEF(_YELLOW) line "#MON FLY any-" -ELSE - line "#MON FLY any" -ENDC cont "time, kid!" para "You're special," diff --git a/text/maps/viridian_forest.asm b/text/maps/viridian_forest.asm index aa6ab4ab..47c12e9b 100644 --- a/text/maps/viridian_forest.asm +++ b/text/maps/viridian_forest.asm @@ -9,11 +9,7 @@ _ViridianForestText1:: ; 8031d (20:431d) _ViridianForestBattleText1:: ; 80359 (20:4359) text "Hey! You have" line "#MON! Come on!" -IF DEF(_YELLOW) cont "Let's battle 'em!" -ELSE - cont "Let's battle'em!" -ENDC done _ViridianForestEndBattleText1:: ; 80387 (20:4387) @@ -66,7 +62,6 @@ _ViridianFrstAfterBattleText3:: ; 80475 (20:4475) cont "dropped!" done -if DEF(_YELLOW) _ViridianForestBattleTextPikaGirl:: text "Hi, do you have a" line "PIKACHU?" @@ -100,7 +95,6 @@ _ViridianForestAfterBattleTextSamurai:: cont "attack is its" cont "defense!" done -ENDC _ViridianForestText8:: ; 804c7 (20:44c7) text "I ran out of #" diff --git a/text/maps/viridian_forest_entrance.asm b/text/maps/viridian_forest_entrance.asm index 770f2b5b..f8a0df6d 100644 --- a/text/maps/viridian_forest_entrance.asm +++ b/text/maps/viridian_forest_entrance.asm @@ -6,7 +6,6 @@ _ViridianForestEntranceText1:: ; 8a868 (22:6868) done _ViridianForestEntranceText2:: ; 8a8ab (22:68ab) -IF DEF(_YELLOW) text "You have to roam" line "far to get new" cont "kinds of #MON." @@ -15,10 +14,3 @@ IF DEF(_YELLOW) line "types outside of" cont "VIRIDIAN FOREST." done -ELSE - text "RATTATA may be" - line "small, but its" - cont "bite is wicked!" - cont "Did you get one?" - done -ENDC diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm index 10a2a597..b947e8f2 100644 --- a/text/maps/viridian_gym.asm +++ b/text/maps/viridian_gym.asm @@ -38,11 +38,7 @@ _ViridianGymText_74ad9:: ; 95f2b (25:5f2b) cont "of #MON!" para "Let us meet again" -IF DEF(_YELLOW) line "someday!" -ELSE - line "some day!" -ENDC cont "Farewell!@@" _ViridianGymText12:: ; 95fcc (25:5fcc) @@ -209,11 +205,7 @@ _ViridianGymEndBattleText8:: ; 96403 (25:6403) prompt _ViridianGymAfterBattleText8:: ; 96412 (25:6412) -IF DEF(_YELLOW) text "You can go on to" -ELSE - text "You can go onto" -ENDC line "#MON LEAGUE" cont "only by defeating" cont "our GYM LEADER!" diff --git a/text/maps/viridian_mart.asm b/text/maps/viridian_mart.asm index ed3343f1..99dd2640 100644 --- a/text/maps/viridian_mart.asm +++ b/text/maps/viridian_mart.asm @@ -38,23 +38,13 @@ ViridianMartParcelQuestText:: ; 95c79 (25:5c79) line "OAK's PARCEL!@@" _ViridianMartText2:: ; 95cd5 (25:5cd5) -IF DEF(_YELLOW) text "This shop sells a" line "lot of PARLYZ" cont "HEALs." -ELSE - text "This shop sells" - line "many ANTIDOTEs." -ENDC done _ViridianMartText3:: ; 95cf6 (25:5cf6) -IF DEF(_YELLOW) text "The shop finally" line "has some POTIONs" cont "in stock." -ELSE - text "No! POTIONs are" - line "all sold out." -ENDC done diff --git a/yellow.asm b/yellow.asm deleted file mode 100644 index 3edffe01..00000000 --- a/yellow.asm +++ /dev/null @@ -1,4 +0,0 @@ -_YELLOW EQU 1 -_OPTION_BEACH_HOUSE EQU 1 -_OPTION_LOWCOST_SAFARI EQU 1 -INCLUDE "charmap.asm" diff --git a/yellow/main.asm b/yellow/main.asm index 6b544b06..bdca0983 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -1,3 +1,4 @@ +<<<<<<< HEAD INCLUDE "yellow.asm" INCLUDE "constants.asm" @@ -1069,3 +1070,7 @@ INCLUDE "engine/bank3f/main.asm" ; INCBIN "gfx/blocksets/beachhouse.bst" ;ENDC +======= +INCLUDE "charmap.asm" +INCLUDE "main.asm" +>>>>>>> e4bb6ce... Build only Yellow diff --git a/yellow/wram.asm b/yellow/wram.asm index c0b7f781..98057cd2 100755 --- a/yellow/wram.asm +++ b/yellow/wram.asm @@ -1,2 +1 @@ -INCLUDE "yellow.asm" INCLUDE "wram.asm" |
