diff options
162 files changed, 2305 insertions, 816 deletions
diff --git a/audio/sfx/sfx_1f_5d.asm b/audio/sfx/sfx_1f_5d.asm index 297f826d..f0606032 100644 --- a/audio/sfx/sfx_1f_5d.asm +++ b/audio/sfx/sfx_1f_5d.asm @@ -1,6 +1,6 @@ SFX_1f_5d_Ch1: ; 7c45e (1f:445e) duty 2 -IF _RED +IF DEF(_RED) unknownsfx0x20 4, 244, 0, 7 unknownsfx0x20 3, 228, 128, 6 unknownsfx0x20 3, 228, 192, 6 @@ -18,7 +18,7 @@ ENDC SFX_1f_5d_Ch2: ; 7c475 (1f:4475) duty 2 -IF _RED +IF DEF(_RED) unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 3, 212, 1, 7 unknownsfx0x20 3, 196, 129, 6 diff --git a/constants.asm b/constants.asm index d92dfb95..0b24ea05 100644 --- a/constants.asm +++ b/constants.asm @@ -1,5 +1,3 @@ -INCLUDE "version.asm" - INCLUDE "macros.asm" INCLUDE "hram.asm" diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 4e4e314f..11deedd0 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -246,4 +246,6 @@ TRADE_CENTER EQU $F0 LORELEIS_ROOM EQU $F5 BRUNOS_ROOM EQU $F6 AGATHAS_ROOM EQU $F7 -BEACH_HOUSE EQU $F8 ; Yellow only
\ No newline at end of file +IF DEF(_OPTION_BEACH_HOUSE) +BEACH_HOUSE EQU $F8 +ENDC diff --git a/constants/map_dimensions.asm b/constants/map_dimensions.asm index 7339e153..236ccac4 100755 --- a/constants/map_dimensions.asm +++ b/constants/map_dimensions.asm @@ -890,4 +890,9 @@ BRUNOS_ROOM_WIDTH EQU $05 ; Agatha_h map_id=247 AGATHAS_ROOM_HEIGHT EQU $06 -AGATHAS_ROOM_WIDTH EQU $05
\ No newline at end of file +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/tilesets.asm b/constants/tilesets.asm index e364db76..bf15f24e 100644 --- a/constants/tilesets.asm +++ b/constants/tilesets.asm @@ -22,4 +22,6 @@ 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 dfea0c68..2ee79e6f 100755 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -14,13 +14,12 @@ dw AlakazamPicFront dw AlakazamPicBack ; attacks known at lvl 0 db TELEPORT -IF !_YELLOW - db CONFUSION - db DISABLE -ENDC -IF _YELLOW +IF DEF(_YELLOW) db KINESIS db 0 +ELSE + db CONFUSION + db DISABLE ENDC db 0 db 3 ; growth rate diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm index 1c9231f0..593d5f78 100755 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -25,10 +25,9 @@ db %00111000 db %11110000 db %01000011 db %00101000 -IF !_YELLOW - db %00000010 -ENDC -IF _YELLOW +IF DEF(_YELLOW) db %01000010 +ELSE + db %00000010 ENDC db 0 ; padding diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm index 351de4cf..130a3d00 100755 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -14,11 +14,10 @@ dw ChanseyPicFront dw ChanseyPicBack ; attacks known at lvl 0 db POUND -IF !_YELLOW - db DOUBLESLAP -ENDC -IF _YELLOW +IF DEF(_YELLOW) db TAIL_WHIP +ELSE + db DOUBLESLAP ENDC db 0 db 0 diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm index b6f65175..5cbecb91 100755 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -25,10 +25,9 @@ db %01001111 db %11001110 db %11100011 db %00001000 -IF !_YELLOW - db %00100110 -ENDC -IF _YELLOW +IF DEF(_YELLOW) db %00101110 +ELSE + db %00100110 ENDC db 0 ; padding diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm index 7e8a3bbb..4944572b 100755 --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -25,10 +25,9 @@ db %00001000 db %11001110 db %00000010 db %10001000 -IF !_YELLOW - db %00000010 -ENDC -IF _YELLOW +IF DEF(_YELLOW) db %00000110 +ELSE + db %00000010 ENDC db 0 ; padding diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm index dfdd0eb9..0c4bad3b 100755 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -25,10 +25,9 @@ db %00001000 db %11001110 db %00000010 db %10001000 -IF !_YELLOW - db %00000010 -ENDC -IF _YELLOW +IF DEF(_YELLOW) db %00000110 +ELSE + db %00000010 ENDC db 0 ; padding diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm index 3632eef1..978aa4bb 100755 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -14,11 +14,10 @@ dw EeveePicFront dw EeveePicBack ; attacks known at lvl 0 db TACKLE -IF !_YELLOW - db SAND_ATTACK -ENDC -IF _YELLOW +IF DEF(_YELLOW) db TAIL_WHIP +ELSE + db SAND_ATTACK ENDC db 0 db 0 diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm index 219c7e7c..ce4a8f0a 100755 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -14,11 +14,10 @@ dw FlareonPicFront dw FlareonPicBack ; attacks known at lvl 0 db TACKLE -IF !_YELLOW - db SAND_ATTACK -ENDC -IF _YELLOW +IF DEF(_YELLOW) db TAIL_WHIP +ELSE + db SAND_ATTACK ENDC db QUICK_ATTACK db EMBER diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm index 0d23564f..c9e6dc31 100755 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -13,17 +13,16 @@ INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions dw GyaradosPicFront dw GyaradosPicBack ; attacks known at lvl 0 -IF !_YELLOW -db BITE -db DRAGON_RAGE -db LEER -db HYDRO_PUMP -ENDC -IF _YELLOW +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 diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm index d9ef0440..5dc3532a 100755 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -14,11 +14,10 @@ dw JolteonPicFront dw JolteonPicBack ; attacks known at lvl 0 db TACKLE -IF !_YELLOW - db SAND_ATTACK -ENDC -IF _YELLOW +IF DEF(_YELLOW) db TAIL_WHIP +ELSE + db SAND_ATTACK ENDC db QUICK_ATTACK db THUNDERSHOCK diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm index 1f1fe61a..85ee8a35 100755 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -14,13 +14,12 @@ dw KadabraPicFront dw KadabraPicBack ; attacks known at lvl 0 db TELEPORT -IF !_YELLOW - db CONFUSION - db DISABLE -ENDC -IF _YELLOW +IF DEF(_YELLOW) DB KINESIS db 0 +ELSE + db CONFUSION + db DISABLE ENDC db 0 db 3 ; growth rate diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 3b101fde..64bfb0d6 100755 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -14,15 +14,14 @@ dw MarowakPicFront dw MarowakPicBack ; attacks known at lvl 0 db BONE_CLUB -IF !_YELLOW - db GROWL - db LEER - db FOCUS_ENERGY -ENDC -IF _YELLOW +IF DEF(_YELLOW) db TAIL_WHIP db 0 db 0 +ELSE + db GROWL + db LEER + db FOCUS_ENERGY ENDC db 0 ; growth rate ; learnset diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm index f88511df..eeab800b 100755 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -14,12 +14,12 @@ dw PrimeapePicFront dw PrimeapePicBack ; attacks known at lvl 0 db SCRATCH -IF !_YELLOW +IF !DEF(_YELLOW) db LEER ENDC db KARATE_CHOP db FURY_SWIPES -IF _YELLOW +IF DEF(_YELLOW) db LOW_KICK ENDC db 0 ; growth rate diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm index 33ccc517..ed4b7a1e 100755 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -14,11 +14,10 @@ dw VaporeonPicFront dw VaporeonPicBack ; attacks known at lvl 0 db TACKLE -IF !_YELLOW - db SAND_ATTACK -ENDC -IF _YELLOW +IF DEF(_YELLOW) db TAIL_WHIP +ELSE + db SAND_ATTACK ENDC db QUICK_ATTACK db WATER_GUN diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm index 0a4d4461..f38be71c 100755 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -15,13 +15,12 @@ dw VenomothPicBack ; attacks known at lvl 0 db TACKLE db DISABLE -IF !_YELLOW - db POISONPOWDER - db LEECH_LIFE -ENDC -IF _YELLOW +IF DEF(_YELLOW) db SUPERSONIC db CONFUSION +ELSE + db POISONPOWDER + db LEECH_LIFE ENDC db 0 ; growth rate ; learnset diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm index 4543a730..62e8aaef 100755 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -22,17 +22,16 @@ db 0 ; growth rate db %00100000 db %00000011 db %00111000 -IF !_YELLOW - db %11010000 - db %00000011 - db %00101000 - db %00000010 -ENDC -IF _YELLOW +IF DEF(_YELLOW) db %11110000 db %01000011 db %00101000 db %00100010 +ELSE + db %11010000 + db %00000011 + db %00101000 + db %00000010 ENDC db 0 ; padding diff --git a/data/collision.asm b/data/collision.asm index 78579242..46d5ddc6 100644 --- a/data/collision.asm +++ b/data/collision.asm @@ -22,3 +22,6 @@ 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/mapHeaders/beach_house.asm b/data/mapHeaders/beach_house.asm new file mode 100644 index 00000000..11579ef1 --- /dev/null +++ b/data/mapHeaders/beach_house.asm @@ -0,0 +1,7 @@ +BeachHouse_h: + + db BEACH_HOUSE_TILESET + db BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x) + dw BeachHouseBlockdata,BeachHouseTextPointers,BeachHouseScript ; blocks, texts, scripts + db 0 ; connections + dw BeachHouseObjects ; objects diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm new file mode 100644 index 00000000..ad648931 --- /dev/null +++ b/data/mapObjects/beach_house.asm @@ -0,0 +1,20 @@ +BeachHouseObjects: ; 0xf23a4 + db $a ; border block + + db 2 ; warps + db 7,2,0,$ff + db 7,3,0,$ff + + db 4 ; signs + db 0,3,3 + db 0,7,4 + db 0,$b,5 + db 1,$d,6 + + db 2 ; people + db SPRITE_FISHER, 3+4, 2+4, $ff, $d0, 1 ; surfin' dude + db $3d, 3+4, 5+4, $fe, $01, 2 ; pikachu + + ; warp-to + EVENT_DISP BEACH_HOUSE_WIDTH,7,2 + EVENT_DISP BEACH_HOUSE_WIDTH,7,3 diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 806e92ca..c6f80b6c 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -1,30 +1,42 @@ Route19Object: ; 0x54e9a (size=87) db $43 ; border block - IF _YELLOW + IF DEF(_OPTION_BEACH_HOUSE) db $1 ; warps - db $9, $5, $0, $f8 ; SURF_HOUSE - ENDC - IF !_YELLOW + db $9, $5, $0, BEACH_HOUSE + ELSE db $0 ; warps ENDC db $1 ; signs +IF DEF(_OPTION_BEACH_HOUSE) + db $b,$b,$b +ELSE db $9, $b, $b ; Route19Text11 +ENDC db $a ; people - 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 +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 _YELLOW - EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; SURF_HOUSE + IF DEF(_OPTION_BEACH_HOUSE) + EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE ENDC diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index abc413c7..f6bd8d99 100755 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -248,3 +248,6 @@ MapHeaderBanks: ; c23d (3:423d) db BANK(Lorelei_h) db BANK(Bruno_h) db BANK(Agatha_h) +IF DEF(_OPTION_BEACH_HOUSE) + db BANK(BeachHouse_h) +ENDC diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 4f3248fc..771989a5 100755 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -248,3 +248,6 @@ MapHeaderPointers:: ; 01ae (0:01ae) dw Lorelei_h dw Bruno_h dw Agatha_h ;247 +IF DEF(_OPTION_BEACH_HOUSE) + dw BeachHouse_h +ENDC diff --git a/data/map_songs.asm b/data/map_songs.asm index c551a76d..1d7ab269 100755 --- a/data/map_songs.asm +++ b/data/map_songs.asm @@ -247,3 +247,6 @@ MapSongBanks: ; c04d (3:404d) 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/data/prize_mon_levels.asm b/data/prize_mon_levels.asm index 6b10eb2f..1437649c 100755 --- a/data/prize_mon_levels.asm +++ b/data/prize_mon_levels.asm @@ -1,5 +1,5 @@ PrizeMonLevelDictionary: ; 5298a (14:698a) -IF _RED +IF DEF(_RED) db ABRA,9 db CLEFAIRY,8 db NIDORINA,17 @@ -8,7 +8,7 @@ IF _RED db SCYTHER,25 db PORYGON,26 ENDC -IF _BLUE +IF DEF(_BLUE) db ABRA,6 db CLEFAIRY,12 db NIDORINO,17 diff --git a/data/prizes.asm b/data/prizes.asm index 1fab54fc..92736715 100755 --- a/data/prizes.asm +++ b/data/prizes.asm @@ -14,19 +14,19 @@ NoThanksText: ; 5284f (14:684f) PrizeMenuMon1Entries: ; 52859 (14:6859) db ABRA db CLEFAIRY -IF _RED +IF DEF(_RED) db NIDORINA ENDC -IF _BLUE +IF DEF(_BLUE) db NIDORINO ENDC db "@" PrizeMenuMon1Cost: ; 5285d (14:685d) -IF _RED +IF DEF(_RED) db $01,$80 db $05,$00 ENDC -IF _BLUE +IF DEF(_BLUE) db $01,$20 db $07,$50 ENDC @@ -34,23 +34,23 @@ ENDC db "@" PrizeMenuMon2Entries: ; 52864 (14:6864) -IF _RED +IF DEF(_RED) db DRATINI db SCYTHER ENDC -IF _BLUE +IF DEF(_BLUE) db PINSIR db DRATINI ENDC db PORYGON db "@" PrizeMenuMon2Cost: ; 52868 (14:6868) -IF _RED +IF DEF(_RED) db $28,$00 db $55,$00 db $99,$99 ENDC -IF _BLUE +IF DEF(_BLUE) db $25,$00 db $46,$00 db $65,$00 diff --git a/data/sgb_border.asm b/data/sgb_border.asm index 5a0bbb2d..e1da84ac 100755 --- a/data/sgb_border.asm +++ b/data/sgb_border.asm @@ -1,20 +1,20 @@ BorderPalettes: ; 72788 (1c:6788) -IF _RED +IF DEF(_RED) INCBIN "gfx/red/sgbborder.map" ENDC -IF _BLUE +IF DEF(_BLUE) INCBIN "gfx/blue/sgbborder.map" ENDC ds $100 -IF _RED +IF DEF(_RED) RGB 30,29,29 ; PAL_SGB1 RGB 25,22,25 RGB 25,17,21 RGB 24,14,12 ENDC -IF _BLUE +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 @@ -23,13 +23,13 @@ ENDC ds $18 -IF _RED +IF DEF(_RED) RGB 30,29,29 ; PAL_SGB2 RGB 22,31,16 RGB 27,20,6 RGB 15,15,15 ENDC -IF _BLUE +IF DEF(_BLUE) RGB 30,29,29 ; PAL_SGB2 RGB 27,11,6 RGB 5,9,20 @@ -38,13 +38,13 @@ ENDC ds $18 -IF _RED +IF DEF(_RED) RGB 30,29,29 ; PAL_SGB3 RGB 31,31,17 RGB 18,21,29 RGB 15,15,15 ENDC -IF _BLUE +IF DEF(_BLUE) RGB 30,29,29 ; PAL_SGB3 RGB 12,15,11 RGB 5,9,20 @@ -54,9 +54,9 @@ ENDC ds $18 SGBBorderGraphics: ; 72fe8 (1c:6fe8) -IF _RED +IF DEF(_RED) INCBIN "gfx/red/sgbborder.2bpp" ENDC -IF _BLUE +IF DEF(_BLUE) INCBIN "gfx/blue/sgbborder.2bpp" ENDC diff --git a/data/super_palettes.asm b/data/super_palettes.asm index 6ab708be..c1afb003 100755 --- a/data/super_palettes.asm +++ b/data/super_palettes.asm @@ -52,13 +52,13 @@ SuperPalettes: ; 72660 (1c:6660) RGB 20,26,31 RGB 17,23,10 RGB 3,2,2 -IF _RED +IF DEF(_RED) RGB 31,29,31 ; PAL_LOGO1 RGB 30,30,17 RGB 17,23,10 RGB 21,0,4 ENDC -IF _BLUE +IF DEF(_BLUE) RGB 31,29,31 ; PAL_LOGO1 RGB 30,30,17 RGB 21,0,4 @@ -118,28 +118,28 @@ ENDC RGB 3,2,2 RGB 31,29,31 ; PAL_SLOTS2 RGB 31,31,17 -IF _RED +IF DEF(_RED) RGB 25,17,21 ENDC -IF _BLUE +IF DEF(_BLUE) RGB 16,19,29 ENDC RGB 3,2,2 RGB 31,29,31 ; PAL_SLOTS3 RGB 22,31,16 -IF _RED +IF DEF(_RED) RGB 25,17,21 ENDC -IF _BLUE +IF DEF(_BLUE) RGB 16,19,29 ENDC RGB 3,2,2 RGB 31,29,31 ; PAL_SLOTS4 -IF _RED +IF DEF(_RED) RGB 16,19,29 RGB 25,17,21 ENDC -IF _BLUE +IF DEF(_BLUE) RGB 25,17,21 RGB 16,19,29 ENDC diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index 84cfaffd..3e2e68bb 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -23,3 +23,6 @@ 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 2781b78d..abcf1bb4 100755 --- a/data/title_mons.asm +++ b/data/title_mons.asm @@ -1,6 +1,6 @@ TitleMons: ; 4588 (1:4588) ; mons on the title screen are randomly chosen from here -IF _RED +IF DEF(_RED) db CHARMANDER db SQUIRTLE db BULBASAUR @@ -18,7 +18,7 @@ IF _RED db PONYTA db MAGIKARP ENDC -IF _GREEN +IF DEF(_GREEN) db BULBASAUR db CHARMANDER db SQUIRTLE @@ -36,7 +36,7 @@ IF _GREEN db PONYTA db MAGIKARP ENDC -IF _BLUE +IF DEF(_BLUE) db SQUIRTLE db CHARMANDER db BULBASAUR diff --git a/data/trades.asm b/data/trades.asm index 2593f01c..b761fecf 100755 --- a/data/trades.asm +++ b/data/trades.asm @@ -1,5 +1,17 @@ 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@@@@" + db KANGASKHAN,MUK, 0,"STICKY@@@@@" + db MEW, MEW, 2,"BART@@@@@@@" + db TANGELA, PARASECT, 0,"SPIKE@@@@@@" + db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@" + 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@" @@ -10,3 +22,4 @@ TradeMons: ; 71b7b (1c:5b7b) 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 61a3d650..432f0fed 100755 --- a/data/trainer_moves.asm +++ b/data/trainer_moves.asm @@ -1,3 +1,4 @@ +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 @@ -31,12 +32,14 @@ TeamMoves: ; 39d32 (e:5d32) db LANCE,BARRIER db $FF -if _YELLOW -; different format from above. +ELSE +; yellow has its own format. ; entry ≔ trainerclass, trainerid, moveset+, 0 ; moveset ≔ partymon, partymon'smove, moveid +LoneMoves: +TeamMoves: db BUG_CATCHER,$f db 2,2,TACKLE db 2,3,STRING_SHOT diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index 5b60bb29..b121efc0 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -33,11 +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 _YELLOW +if DEF(_YELLOW) db 24,SANDSHREW,0 endc BugCatcherData: ; 39dce (e:5dce) -if _YELLOW +if DEF(_YELLOW) db 7,CATERPIE,CATERPIE,0 db 6,METAPOD,CATERPIE,METAPOD,0 db 10,CATERPIE,0 @@ -57,7 +57,7 @@ endc db 18,METAPOD,CATERPIE,VENONAT,0 db 19,BEEDRILL,BEEDRILL,0 db 20,CATERPIE,WEEDLE,VENONAT,0 -if _YELLOW +if DEF(_YELLOW) db 8,CATERPIE,METAPOD,0 endc LassData: ; 39e0c (e:5e0c) @@ -72,14 +72,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 _YELLOW +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 _YELLOW +if DEF(_YELLOW) db 19,PIDGEY,RATTATA,NIDORAN_F,MEOWTH,NIDORAN_M,0 else db 19,PIDGEY,RATTATA,NIDORAN_M,MEOWTH,PIKACHU,0 @@ -87,7 +87,7 @@ endc db 22,CLEFAIRY,CLEFAIRY,0 db 23,BELLSPROUT,WEEPINBELL,0 db 23,ODDISH,GLOOM,0 -if _YELLOW +if DEF(_YELLOW) db 6,NIDORAN_F,NIDORAN_M,0 endc SailorData: ; 39e58 (e:5e58) @@ -98,13 +98,13 @@ SailorData: ; 39e58 (e:5e58) db 18,TENTACOOL,STARYU,0 db 17,HORSEA,HORSEA,HORSEA,0 db 20,MACHOP,0 -if _YELLOW +if DEF(_YELLOW) db 24,MAGNEMITE,0 else db 21,PIKACHU,PIKACHU,0 endc JrTrainerMData: ; 39e78 (e:5e78) -if _YELLOW +if DEF(_YELLOW) db 9,DIGLETT,SANDSHREW,0 else db 11,DIGLETT,SANDSHREW,0 @@ -117,12 +117,12 @@ endc db 21,GROWLITHE,CHARMANDER,0 db 19,RATTATA,DIGLETT,EKANS,SANDSHREW,0 db 29,NIDORAN_M,NIDORINO,0 -if _YELLOW +if DEF(_YELLOW) db 16,WEEPINBELL,0 endc JrTrainerFData: ; 39e9d (e:5e9d) db 19,GOLDEEN,0 -if _YELLOW +if DEF(_YELLOW) db 16,ODDISH,BELLSPROUT,0 else db 16,RATTATA,PIKACHU,0 @@ -131,7 +131,7 @@ endc db 22,BULBASAUR,0 db 18,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 db 23,MEOWTH,0 -if _YELLOW +if DEF(_YELLOW) db 20,JIGGLYPUFF,CLEFAIRY,0 else db 20,PIKACHU,CLEFAIRY,0 @@ -140,7 +140,7 @@ endc db 21,JIGGLYPUFF,PIDGEY,MEOWTH,0 db 22,ODDISH,BULBASAUR,0 db 24,BULBASAUR,IVYSAUR,0 -if _YELLOW +if DEF(_YELLOW) db 24,PIDGEY,MEOWTH,RATTATA,PIDGEY,MEOWTH,0 else db 24,PIDGEY,MEOWTH,RATTATA,PIKACHU,MEOWTH,0 @@ -153,7 +153,7 @@ endc db 20,MEOWTH,ODDISH,PIDGEY,0 db 19,PIDGEY,RATTATA,RATTATA,BELLSPROUT,0 db 28,GLOOM,ODDISH,ODDISH,0 -if _YELLOW +if DEF(_YELLOW) db 29,PIDGEY,PIDGEOTTO,0 else db 29,PIKACHU,RAICHU,0 @@ -161,7 +161,7 @@ endc db 33,CLEFAIRY,0 db 29,BELLSPROUT,ODDISH,TANGELA,0 db 30,TENTACOOL,HORSEA,SEEL,0 -if _YELLOW +if DEF(_YELLOW) db 20,CUBONE,0 endc PokemaniacData: ; 39f09 (e:5f09) @@ -282,7 +282,7 @@ BeautyData: ; 3a0d1 (e:60d1) db 21,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 db 24,BELLSPROUT,BELLSPROUT,0 db 26,EXEGGCUTE,0 -if _YELLOW +if DEF(_YELLOW) db 27,RATTATA,VULPIX,RATTATA,0 else db 27,RATTATA,PIKACHU,RATTATA,0 @@ -304,7 +304,7 @@ PsychicData: ; 3a115 (e:6115) db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0 db 38,SLOWBRO,0 RockerData: ; 3a127 (e:6127) -if _YELLOW +if DEF(_YELLOW) db 20,VOLTORB,VOLTORB,VOLTORB,0 else db 20,VOLTORB,MAGNEMITE,VOLTORB,0 @@ -355,7 +355,7 @@ BlackbeltData: ; 3a1be (e:61be) db 38,MACHOKE,MACHOP,MACHOKE,0 db 43,MACHOKE,MACHOP,MACHOKE,0 Green1Data: ; 3a1e4 (e:61e4) -if _YELLOW +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 @@ -391,7 +391,7 @@ ScientistData: ; 3a241 (e:6241) db 33,MAGNEMITE,MAGNETON,VOLTORB,0 db 34,MAGNEMITE,ELECTRODE,0 GiovanniData: ; 3a27e (e:627e) -if _YELLOW +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 @@ -442,7 +442,7 @@ RocketData: ; 3a29c (e:629c) db 33,MACHOKE,0 db 25,RATTATA,RATTATA,ZUBAT,RATTATA,EKANS,0 db 32,CUBONE,DROWZEE,MAROWAK,0 -if _YELLOW +if DEF(_YELLOW) JessieJamesData: db 14,EKANS,MEOWTH,KOFFING,0 db 25,KOFFING,MEOWTH,EKANS,0 @@ -476,7 +476,7 @@ 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 _YELLOW +if DEF(_YELLOW) db $FF,10,GEODUDE,12,ONIX,0 else db $FF,12,GEODUDE,14,ONIX,0 @@ -484,31 +484,31 @@ endc MistyData: ; 3a3bb (e:63bb) db $FF,18,STARYU,21,STARMIE,0 LtSurgeData: ; 3a3c1 (e:63c1) -if _YELLOW +if DEF(_YELLOW) db $FF,28,RAICHU,0 else db $FF,21,VOLTORB,18,PIKACHU,24,RAICHU,0 endc ErikaData: ; 3a3c9 (e:63c9) -if _YELLOW +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 _YELLOW +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 _YELLOW +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 _YELLOW +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 @@ -516,7 +516,7 @@ endc GentlemanData: ; 3a3ef (e:63ef) db 18,GROWLITHE,GROWLITHE,0 db 19,NIDORAN_M,NIDORAN_F,0 -if _YELLOW +if DEF(_YELLOW) db 22,VOLTORB,MAGNEMITE,0 else db 23,PIKACHU,0 @@ -524,7 +524,7 @@ endc db 48,PRIMEAPE,0 db 17,GROWLITHE,PONYTA,0 Green2Data: ; 3a401 (e:6401) -if _YELLOW +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 @@ -550,7 +550,7 @@ else db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0 endc Green3Data: ; 3a491 (e:6491) -if _YELLOW +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 diff --git a/data/wildPokemon/mansion1.asm b/data/wildPokemon/mansion1.asm index 82547896..e96b9d42 100755 --- a/data/wildPokemon/mansion1.asm +++ b/data/wildPokemon/mansion1.asm @@ -1,6 +1,6 @@ MansionMons1: db $0A - IF _RED + IF DEF(_RED) db 32,KOFFING db 30,KOFFING db 34,PONYTA @@ -13,7 +13,7 @@ MansionMons1: db 39,MUK ENDC - IF _GREEN || _BLUE + IF DEF(_GREEN) || DEF(_BLUE) db 32,GRIMER db 30,GRIMER db 34,PONYTA @@ -26,7 +26,7 @@ MansionMons1: db 39,WEEZING ENDC - IF _YELLOW + IF DEF(_YELLOW) db 34,RATTATA db 34,RATICATE db 23,GRIMER diff --git a/data/wildPokemon/mansion2.asm b/data/wildPokemon/mansion2.asm index 8ebbb414..77cce408 100755 --- a/data/wildPokemon/mansion2.asm +++ b/data/wildPokemon/mansion2.asm @@ -1,6 +1,6 @@ MansionMons2: db $0A - IF _RED + IF DEF(_RED) db 32,GROWLITHE db 34,KOFFING db 34,KOFFING @@ -13,7 +13,7 @@ MansionMons2: db 37,MUK ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 32,VULPIX db 34,GRIMER db 34,GRIMER @@ -26,7 +26,7 @@ MansionMons2: db 37,WEEZING ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 32,GROWLITHE db 34,GRIMER db 34,GRIMER @@ -39,7 +39,7 @@ MansionMons2: db 37,WEEZING ENDC - IF _YELLOW + IF DEF(_YELLOW) db 37,RATTATA db 37,RATICATE db 26,GRIMER diff --git a/data/wildPokemon/mansion3.asm b/data/wildPokemon/mansion3.asm index a1b126ac..eceb0296 100755 --- a/data/wildPokemon/mansion3.asm +++ b/data/wildPokemon/mansion3.asm @@ -1,6 +1,6 @@ MansionMons3: db $0A - IF _RED + IF DEF(_RED) db 31,KOFFING db 33,GROWLITHE db 35,KOFFING @@ -13,7 +13,7 @@ MansionMons3: db 42,MUK ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 31,GRIMER db 33,VULPIX db 35,GRIMER @@ -26,7 +26,7 @@ MansionMons3: db 42,WEEZING ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 31,GRIMER db 33,GROWLITHE db 35,GRIMER @@ -39,7 +39,7 @@ MansionMons3: db 42,WEEZING ENDC - IF _YELLOW + IF DEF(_YELLOW) db 40,RATTATA db 40,RATICATE db 32,GRIMER diff --git a/data/wildPokemon/mansionb1.asm b/data/wildPokemon/mansionb1.asm index 23831eeb..9dcd9893 100755 --- a/data/wildPokemon/mansionb1.asm +++ b/data/wildPokemon/mansionb1.asm @@ -1,6 +1,6 @@ MansionMonsB1: db $0A - IF _RED + IF DEF(_RED) db 33,KOFFING db 31,KOFFING db 35,GROWLITHE @@ -13,7 +13,7 @@ MansionMonsB1: db 42,MUK ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 33,GRIMER db 31,GRIMER db 35,VULPIX @@ -26,7 +26,7 @@ MansionMonsB1: db 42,WEEZING ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 33,GRIMER db 31,GRIMER db 35,GROWLITHE @@ -39,7 +39,7 @@ MansionMonsB1: db 42,WEEZING ENDC - IF _YELLOW + IF DEF(_YELLOW) db 35,GRIMER db 38,GRIMER db 37,RATICATE @@ -53,4 +53,3 @@ MansionMonsB1: ENDC db $00 - diff --git a/data/wildPokemon/mtmoon1.asm b/data/wildPokemon/mtmoon1.asm index 5ba1d030..a8018b82 100755 --- a/data/wildPokemon/mtmoon1.asm +++ b/data/wildPokemon/mtmoon1.asm @@ -1,28 +1,27 @@ MoonMons1: db $0A - IF !_YELLOW + IF DEF(_YELLOW) db 8,ZUBAT - db 7,ZUBAT db 9,ZUBAT - db 8,GEODUDE + db 10,GEODUDE db 6,ZUBAT + db 7,ZUBAT db 10,ZUBAT db 10,GEODUDE - db 8,PARAS db 11,ZUBAT - db 8,CLEFAIRY - ENDC - IF _YELLOW + db 12,SANDSHREW + db 11,CLEFAIRY + ELSE db 8,ZUBAT + db 7,ZUBAT db 9,ZUBAT - db 10,GEODUDE + db 8,GEODUDE db 6,ZUBAT - db 7,ZUBAT db 10,ZUBAT db 10,GEODUDE + db 8,PARAS db 11,ZUBAT - db 12,SANDSHREW - db 11,CLEFAIRY + db 8,CLEFAIRY ENDC db $00 diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wildPokemon/mtmoonb1.asm index 0f3639c1..c78b8471 100755 --- a/data/wildPokemon/mtmoonb1.asm +++ b/data/wildPokemon/mtmoonb1.asm @@ -1,18 +1,6 @@ MoonMonsB1: db $0A - IF !_YELLOW - 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 - IF _YELLOW + IF DEF(_YELLOW) db 8,ZUBAT db 9,ZUBAT db 10,GEODUDE @@ -23,6 +11,17 @@ MoonMonsB1: 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 $00 diff --git a/data/wildPokemon/mtmoonb2.asm b/data/wildPokemon/mtmoonb2.asm index 34966cd8..0118a898 100755 --- a/data/wildPokemon/mtmoonb2.asm +++ b/data/wildPokemon/mtmoonb2.asm @@ -1,18 +1,6 @@ MoonMonsB2: db $0A - IF !_YELLOW - 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 - IF _YELLOW + IF DEF(_YELLOW) db 10,ZUBAT db 11,GEODUDE db 13,PARAS @@ -23,6 +11,17 @@ MoonMonsB2: 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 $00 diff --git a/data/wildPokemon/pokemontower3.asm b/data/wildPokemon/pokemontower3.asm index e2b39398..4e3a7c62 100755 --- a/data/wildPokemon/pokemontower3.asm +++ b/data/wildPokemon/pokemontower3.asm @@ -1,29 +1,27 @@ TowerMons3: db $0A - IF !_YELLOW + 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 24,GASTLY - db 20,CUBONE - db 22,CUBONE + db 25,GASTLY + db 20,HAUNTER db 25,HAUNTER - ENDC - - IF _YELLOW + ELSE 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 24,GASTLY + db 20,CUBONE + db 22,CUBONE db 25,HAUNTER ENDC diff --git a/data/wildPokemon/pokemontower4.asm b/data/wildPokemon/pokemontower4.asm index 3f38af20..e0de809f 100755 --- a/data/wildPokemon/pokemontower4.asm +++ b/data/wildPokemon/pokemontower4.asm @@ -1,30 +1,28 @@ TowerMons4: db $0A - IF !_YELLOW + 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 - db 20,CUBONE - db 22,CUBONE - db 24,GASTLY - ENDC - - IF _YELLOW + ELSE 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 20,CUBONE + db 22,CUBONE + db 24,GASTLY ENDC db $00 diff --git a/data/wildPokemon/pokemontower5.asm b/data/wildPokemon/pokemontower5.asm index 97098448..9f97b98e 100755 --- a/data/wildPokemon/pokemontower5.asm +++ b/data/wildPokemon/pokemontower5.asm @@ -1,20 +1,7 @@ TowerMons5: db $0A - IF !_YELLOW - 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 - - IF _YELLOW + IF DEF(_YELLOW) db 22,GASTLY db 23,GASTLY db 24,GASTLY @@ -25,6 +12,17 @@ TowerMons5: 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 $00 diff --git a/data/wildPokemon/pokemontower6.asm b/data/wildPokemon/pokemontower6.asm index abd2969a..b97e2ddd 100755 --- a/data/wildPokemon/pokemontower6.asm +++ b/data/wildPokemon/pokemontower6.asm @@ -1,20 +1,7 @@ TowerMons6: db $0F - IF !_YELLOW - 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 - - IF _YELLOW + IF DEF(_YELLOW) db 22,GASTLY db 23,GASTLY db 24,GASTLY @@ -25,6 +12,17 @@ TowerMons6: 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 $00 diff --git a/data/wildPokemon/pokemontower7.asm b/data/wildPokemon/pokemontower7.asm index 2daf3a2d..b0d94534 100755 --- a/data/wildPokemon/pokemontower7.asm +++ b/data/wildPokemon/pokemontower7.asm @@ -1,21 +1,7 @@ TowerMons7: db $0F - IF !_YELLOW - 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 - - IF _YELLOW + IF DEF(_YELLOW) db 24,GASTLY db 25,GASTLY db 26,GASTLY @@ -26,6 +12,17 @@ TowerMons7: 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 $00 diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm index a67ab2e9..f956fcf2 100755 --- a/data/wildPokemon/powerplant.asm +++ b/data/wildPokemon/powerplant.asm @@ -1,7 +1,18 @@ PowerPlantMons: db $0A - IF !_YELLOW - + + 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 @@ -10,28 +21,14 @@ PowerPlantMons: db 23,VOLTORB db 32,MAGNETON db 35,MAGNETON - IF _RED + IF DEF(_RED) db 33,ELECTABUZZ db 36,ELECTABUZZ ENDC - IF _GREEN || _BLUE + IF DEF(_GREEN) || DEF(_BLUE) db 33,RAICHU db 36,RAICHU ENDC ENDC - IF _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 - ENDC - db $00 - diff --git a/data/wildPokemon/rocktunnel1.asm b/data/wildPokemon/rocktunnel1.asm index e8904043..992a4e73 100755 --- a/data/wildPokemon/rocktunnel1.asm +++ b/data/wildPokemon/rocktunnel1.asm @@ -1,16 +1,27 @@ TunnelMonsB1: db $0F - IF !_YELLOW + 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 _RED || _GREEN || (_BLUE && !_JAPAN) + IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN)) db 18,ZUBAT ENDC - IF (_BLUE && _JAPAN) + IF (DEF(_BLUE) && DEF(_JAPAN)) db 18,DITTO ENDC db 15,ZUBAT @@ -19,18 +30,5 @@ TunnelMonsB1: db 15,ONIX ENDC - IF _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 - ENDC - db $00 diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wildPokemon/rocktunnel2.asm index f158453e..0a47d984 100755 --- a/data/wildPokemon/rocktunnel2.asm +++ b/data/wildPokemon/rocktunnel2.asm @@ -1,15 +1,27 @@ TunnelMonsB2: db $0F - IF !_YELLOW + + 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 _RED || _GREEN || (_BLUE && !_JAPAN) + IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN)) db 18,ZUBAT ENDC - IF (_BLUE && _JAPAN) + IF DEF(_BLUE) && DEF(_JAPAN) db 18,DITTO ENDC db 17,MACHOP @@ -18,18 +30,5 @@ TunnelMonsB2: db 18,GEODUDE ENDC - IF _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 - ENDC - db $00 diff --git a/data/wildPokemon/route1.asm b/data/wildPokemon/route1.asm index bbad3c9e..8e5b6897 100755 --- a/data/wildPokemon/route1.asm +++ b/data/wildPokemon/route1.asm @@ -1,18 +1,6 @@ Route1Mons: db $19 - IF !_YELLOW - 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 - IF _YELLOW + IF DEF(_YELLOW) db 3,PIDGEY db 4,PIDGEY db 2,RATTATA @@ -23,6 +11,17 @@ Route1Mons: 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 $00 diff --git a/data/wildPokemon/route10.asm b/data/wildPokemon/route10.asm index 185e41fe..7cfaf25c 100755 --- a/data/wildPokemon/route10.asm +++ b/data/wildPokemon/route10.asm @@ -1,7 +1,7 @@ Route10Mons: db $0F - IF _RED + IF DEF(_RED) db 16,VOLTORB db 16,SPEAROW db 14,VOLTORB @@ -14,7 +14,7 @@ Route10Mons: db 17,EKANS ENDC - IF !_RED + IF DEF(_BLUE) || DEF(_GREEN) db 16,VOLTORB db 16,SPEAROW db 14,VOLTORB @@ -27,7 +27,7 @@ Route10Mons: db 17,SANDSHREW ENDC - IF _YELLOW + IF DEF(_YELLOW) db 16,MAGNEMITE db 18,RATTATA db 18,MAGNEMITE diff --git a/data/wildPokemon/route11.asm b/data/wildPokemon/route11.asm index 6f724e80..66c52c20 100755 --- a/data/wildPokemon/route11.asm +++ b/data/wildPokemon/route11.asm @@ -1,7 +1,7 @@ Route11Mons: db $0F - IF _RED + IF DEF(_RED) db 14,EKANS db 15,SPEAROW db 12,EKANS @@ -14,7 +14,7 @@ Route11Mons: db 15,DROWZEE ENDC - IF _GREEN || _BLUE + IF DEF(_GREEN) || DEF(_BLUE) db 14,SANDSHREW db 15,SPEAROW db 12,SANDSHREW @@ -27,7 +27,7 @@ Route11Mons: db 15,DROWZEE ENDC - IF _YELLOW + IF DEF(_YELLOW) db 16,PIDGEY db 15,RATTATA db 18,PIDGEY diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm index b15a2223..7f5e47fe 100755 --- a/data/wildPokemon/route12.asm +++ b/data/wildPokemon/route12.asm @@ -1,7 +1,7 @@ Route12Mons: db $0F - IF _RED || (_JAPAN && _BLUE) + IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) db 24,ODDISH db 25,PIDGEY db 23,PIDGEY @@ -15,7 +15,7 @@ Route12Mons: db $00 ENDC - IF _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 24,BELLSPROUT db 25,PIDGEY db 23,PIDGEY @@ -29,7 +29,7 @@ Route12Mons: db $00 ENDC - IF _YELLOW + IF DEF(_YELLOW) db 25,ODDISH db 25,BELLSPROUT db 28,PIDGEY diff --git a/data/wildPokemon/route13.asm b/data/wildPokemon/route13.asm index 5293bf21..1b694f36 100755 --- a/data/wildPokemon/route13.asm +++ b/data/wildPokemon/route13.asm @@ -1,5 +1,5 @@ Route13Mons: - IF _RED || (_JAPAN && _BLUE) + IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) db $14 db 24,ODDISH db 25,PIDGEY @@ -14,7 +14,7 @@ Route13Mons: db $00 ENDC - IF _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db $14 db 24,BELLSPROUT db 25,PIDGEY @@ -29,7 +29,7 @@ Route13Mons: db $00 ENDC - IF _YELLOW + IF DEF(_YELLOW) db $0F db 25,ODDISH db 25,BELLSPROUT diff --git a/data/wildPokemon/route14.asm b/data/wildPokemon/route14.asm index 76d9118f..999981af 100755 --- a/data/wildPokemon/route14.asm +++ b/data/wildPokemon/route14.asm @@ -1,6 +1,6 @@ Route14Mons: db $0F - IF _RED || (_JAPAN && _BLUE) + IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) db 24,ODDISH db 26,PIDGEY db 23,DITTO @@ -13,7 +13,7 @@ Route14Mons: db 30,PIDGEOTTO ENDC - IF _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 24,BELLSPROUT db 26,PIDGEY db 23,DITTO @@ -26,7 +26,7 @@ Route14Mons: db 30,PIDGEOTTO ENDC - IF _YELLOW + IF DEF(_YELLOW) db 26,ODDISH db 26,BELLSPROUT db 24,VENONAT diff --git a/data/wildPokemon/route15.asm b/data/wildPokemon/route15.asm index 4a0d3fc3..d924052a 100755 --- a/data/wildPokemon/route15.asm +++ b/data/wildPokemon/route15.asm @@ -1,6 +1,6 @@ Route15Mons: db $0F - IF _RED || (_JAPAN && _BLUE) + IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) db 24,ODDISH db 26,DITTO db 23,PIDGEY @@ -13,7 +13,7 @@ Route15Mons: db 30,PIDGEOTTO ENDC - IF _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 24,BELLSPROUT db 26,DITTO db 23,PIDGEY @@ -26,7 +26,7 @@ Route15Mons: db 30,PIDGEOTTO ENDC - IF _YELLOW + IF DEF(_YELLOW) db 26,ODDISH db 26,BELLSPROUT db 24,VENONAT diff --git a/data/wildPokemon/route16.asm b/data/wildPokemon/route16.asm index 34408164..468e3777 100755 --- a/data/wildPokemon/route16.asm +++ b/data/wildPokemon/route16.asm @@ -1,19 +1,6 @@ Route16Mons: db $19 - IF !_YELLOW - 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 - - IF _YELLOW + IF DEF(_YELLOW) db 22,SPEAROW db 22,DODUO db 23,RATTATA @@ -24,6 +11,17 @@ Route16Mons: 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 $00 diff --git a/data/wildPokemon/route17.asm b/data/wildPokemon/route17.asm index 75882ec5..36283a99 100755 --- a/data/wildPokemon/route17.asm +++ b/data/wildPokemon/route17.asm @@ -1,19 +1,7 @@ Route17Mons: db $19 - IF !_YELLOW - 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 - IF _YELLOW + IF DEF(_YELLOW) db 26,DODUO db 27,FEAROW db 27,DODUO @@ -24,6 +12,17 @@ Route17Mons: 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 $00 diff --git a/data/wildPokemon/route18.asm b/data/wildPokemon/route18.asm index 8820f045..e16fc8ac 100755 --- a/data/wildPokemon/route18.asm +++ b/data/wildPokemon/route18.asm @@ -1,19 +1,7 @@ Route18Mons: db $19 - IF !_YELLOW - 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 - IF _YELLOW + IF DEF(_YELLOW) db 22,SPEAROW db 22,DODUO db 23,RATTATA @@ -24,6 +12,17 @@ Route18Mons: 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 $00 diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm index 57d7f87f..8f9eb4e5 100755 --- a/data/wildPokemon/route2.asm +++ b/data/wildPokemon/route2.asm @@ -1,40 +1,39 @@ Route2Mons: db $19 - IF !_YELLOW + 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 _RED + if DEF(_RED) db 3,WEEDLE ENDC - if _BLUE + if DEF(_BLUE) db 3,CATERPIE ENDC db 2,RATTATA db 5,RATTATA - if _RED + if DEF(_RED) db 4,WEEDLE db 5,WEEDLE ENDC - if _BLUE + if DEF(_BLUE) db 4,CATERPIE db 5,CATERPIE ENDC ENDC - IF _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 - ENDC db $00 diff --git a/data/wildPokemon/route21.asm b/data/wildPokemon/route21.asm index a29753eb..7017081d 100755 --- a/data/wildPokemon/route21.asm +++ b/data/wildPokemon/route21.asm @@ -1,19 +1,7 @@ Route21Mons: db $19 - IF !_YELLOW - 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 - IF _YELLOW + IF DEF(_YELLOW) db 15,PIDGEY db 13,RATTATA db 13,PIDGEY @@ -24,6 +12,17 @@ Route21Mons: 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 $05 diff --git a/data/wildPokemon/route22.asm b/data/wildPokemon/route22.asm index 36ff9a57..78c5631a 100755 --- a/data/wildPokemon/route22.asm +++ b/data/wildPokemon/route22.asm @@ -1,6 +1,6 @@ Route22Mons: db $19 - IF _RED || (_JAPAN && _BLUE) + IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) db 3,RATTATA db 3,NIDORAN_M db 4,RATTATA @@ -12,7 +12,7 @@ Route22Mons: db 3,NIDORAN_F db 4,NIDORAN_F ENDC - IF _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 3,RATTATA db 3,NIDORAN_F db 4,RATTATA @@ -24,7 +24,7 @@ Route22Mons: db 3,NIDORAN_M db 4,NIDORAN_M ENDC - IF _YELLOW + IF DEF(_YELLOW) db 2,NIDORAN_M db 2,NIDORAN_F db 3,MANKEY diff --git a/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm index cfdd8eff..1320868c 100755 --- a/data/wildPokemon/route23.asm +++ b/data/wildPokemon/route23.asm @@ -1,10 +1,22 @@ Route23Mons: db $0A - IF !_YELLOW - IF _RED + + 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 !_RED + IF !DEF(_RED) db 26,SANDSHREW ENDC db 33,DITTO @@ -12,10 +24,10 @@ Route23Mons: db 38,FEAROW db 38,DITTO db 38,FEAROW - IF _RED + IF DEF(_RED) db 41,ARBOK ENDC - IF !_RED + IF !DEF(_RED) db 41,SANDSLASH ENDC db 43,DITTO @@ -23,18 +35,5 @@ Route23Mons: db 43,FEAROW ENDC - IF _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 - ENDC - db $00 diff --git a/data/wildPokemon/route24.asm b/data/wildPokemon/route24.asm index e4ff986a..d586927f 100755 --- a/data/wildPokemon/route24.asm +++ b/data/wildPokemon/route24.asm @@ -1,7 +1,7 @@ Route24Mons: db $19 - IF _RED + IF DEF(_RED) db 7,WEEDLE db 8,KAKUNA db 12,PIDGEY @@ -14,7 +14,7 @@ Route24Mons: db 12,ABRA ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 7,CATERPIE db 8,METAPOD db 12,PIDGEY @@ -27,7 +27,7 @@ Route24Mons: db 12,ABRA ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 7,CATERPIE db 8,METAPOD db 12,PIDGEY @@ -40,7 +40,7 @@ Route24Mons: db 12,ABRA ENDC - IF _YELLOW + IF DEF(_YELLOW) db 12,ODDISH db 12,BELLSPROUT db 13,PIDGEY diff --git a/data/wildPokemon/route25.asm b/data/wildPokemon/route25.asm index 3d225473..4609c7cd 100755 --- a/data/wildPokemon/route25.asm +++ b/data/wildPokemon/route25.asm @@ -1,7 +1,7 @@ Route25Mons: db $0F - IF _RED + IF DEF(_RED) db 8,WEEDLE db 9,KAKUNA db 13,PIDGEY @@ -14,7 +14,7 @@ Route25Mons: db 8,CATERPIE ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 8,CATERPIE db 9,METAPOD db 13,PIDGEY @@ -27,7 +27,7 @@ Route25Mons: db 8,WEEDLE ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 8,CATERPIE db 9,METAPOD db 13,PIDGEY @@ -40,7 +40,7 @@ Route25Mons: db 8,WEEDLE ENDC - IF _YELLOW + IF DEF(_YELLOW) db 12,ODDISH db 12,BELLSPROUT db 13,PIDGEY diff --git a/data/wildPokemon/route3.asm b/data/wildPokemon/route3.asm index 21230f42..fe7c5da9 100755 --- a/data/wildPokemon/route3.asm +++ b/data/wildPokemon/route3.asm @@ -1,18 +1,6 @@ Route3Mons: db $14 - IF !_YELLOW - 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 - IF _YELLOW + IF DEF(_YELLOW) db 8,SPEAROW db 9,SPEAROW db 9,MANKEY @@ -23,6 +11,17 @@ Route3Mons: 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 $00 diff --git a/data/wildPokemon/route4.asm b/data/wildPokemon/route4.asm index f7eb80ee..40c3b7b5 100755 --- a/data/wildPokemon/route4.asm +++ b/data/wildPokemon/route4.asm @@ -1,7 +1,7 @@ Route4Mons: db $14 - IF _RED + IF DEF(_RED) db 10,RATTATA db 10,SPEAROW db 8,RATTATA @@ -14,7 +14,7 @@ Route4Mons: db 12,EKANS ENDC - IF !_RED + IF DEF(_BLUE) || DEF(_GREEN) db 10,RATTATA db 10,SPEAROW db 8,RATTATA @@ -27,7 +27,7 @@ Route4Mons: db 12,SANDSHREW ENDC - IF _YELLOW + IF DEF(_YELLOW) db 8,SPEAROW db 9,SPEAROW db 9,MANKEY diff --git a/data/wildPokemon/route5.asm b/data/wildPokemon/route5.asm index 4b018cd6..aa67ca87 100755 --- a/data/wildPokemon/route5.asm +++ b/data/wildPokemon/route5.asm @@ -1,7 +1,7 @@ Route5Mons: db $0F - IF _RED + IF DEF(_RED) db 13,ODDISH db 13,PIDGEY db 15,PIDGEY @@ -14,7 +14,7 @@ Route5Mons: db 16,MANKEY ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 13,BELLSPROUT db 13,PIDGEY db 15,PIDGEY @@ -27,7 +27,7 @@ Route5Mons: db 16,MEOWTH ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 13,ODDISH db 13,PIDGEY db 15,PIDGEY @@ -40,7 +40,7 @@ Route5Mons: db 16,MEOWTH ENDC - IF _YELLOW + IF DEF(_YELLOW) db 15,PIDGEY db 14,RATTATA db 7,ABRA diff --git a/data/wildPokemon/route6.asm b/data/wildPokemon/route6.asm index 253a5943..86e0c05f 100755 --- a/data/wildPokemon/route6.asm +++ b/data/wildPokemon/route6.asm @@ -1,7 +1,7 @@ Route6Mons: db $0F - IF _RED + IF DEF(_RED) db 13,ODDISH db 13,PIDGEY db 15,PIDGEY @@ -15,7 +15,7 @@ Route6Mons: db $00 ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 13,BELLSPROUT db 13,PIDGEY db 15,PIDGEY @@ -29,7 +29,7 @@ Route6Mons: db $00 ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 13,ODDISH db 13,PIDGEY db 15,PIDGEY @@ -43,7 +43,7 @@ Route6Mons: db $00 ENDC - IF _YELLOW + IF DEF(_YELLOW) db 15,PIDGEY db 14,RATTATA db 7,ABRA diff --git a/data/wildPokemon/route7.asm b/data/wildPokemon/route7.asm index 42073d11..505b632b 100755 --- a/data/wildPokemon/route7.asm +++ b/data/wildPokemon/route7.asm @@ -1,7 +1,7 @@ Route7Mons: db $0F - IF _RED + IF DEF(_RED) db 19,PIDGEY db 19,ODDISH db 17,MANKEY @@ -14,7 +14,7 @@ Route7Mons: db 20,MANKEY ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 19,PIDGEY db 19,BELLSPROUT db 17,MEOWTH @@ -27,7 +27,7 @@ Route7Mons: db 20,MEOWTH ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 19,PIDGEY db 19,ODDISH db 17,MEOWTH @@ -40,7 +40,7 @@ Route7Mons: db 20,MEOWTH ENDC - IF _YELLOW + IF DEF(_YELLOW) db 20,PIDGEY db 22,PIDGEY db 20,RATTATA diff --git a/data/wildPokemon/route8.asm b/data/wildPokemon/route8.asm index 59c3082d..67905134 100755 --- a/data/wildPokemon/route8.asm +++ b/data/wildPokemon/route8.asm @@ -1,7 +1,7 @@ Route8Mons: db $0F - IF _RED + IF DEF(_RED) db 18,PIDGEY db 18,MANKEY db 17,EKANS @@ -14,7 +14,7 @@ Route8Mons: db 18,GROWLITHE ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 18,PIDGEY db 18,MEOWTH db 17,SANDSHREW @@ -27,7 +27,7 @@ Route8Mons: db 18,VULPIX ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 18,PIDGEY db 18,MEOWTH db 17,SANDSHREW @@ -40,7 +40,7 @@ Route8Mons: db 18,GROWLITHE ENDC - IF _YELLOW + IF DEF(_YELLOW) db 20,PIDGEY db 22,PIDGEY db 20,RATTATA diff --git a/data/wildPokemon/route9.asm b/data/wildPokemon/route9.asm index 03523e4f..d563aa2b 100755 --- a/data/wildPokemon/route9.asm +++ b/data/wildPokemon/route9.asm @@ -1,7 +1,7 @@ Route9Mons: db $0F - IF _RED + IF DEF(_RED) db 16,RATTATA db 16,SPEAROW db 14,RATTATA @@ -14,7 +14,7 @@ Route9Mons: db 17,EKANS ENDC - IF !_RED && !_YELLOW + IF DEF(_GREEN) || DEF(_BLUE) db 16,RATTATA db 16,SPEAROW db 14,RATTATA @@ -27,7 +27,7 @@ Route9Mons: db 17,SANDSHREW ENDC - IF _YELLOW + IF DEF(_YELLOW) db 16,NIDORAN_M db 16,NIDORAN_F db 18,RATTATA diff --git a/data/wildPokemon/safarizone1.asm b/data/wildPokemon/safarizone1.asm index 29e3f29b..3781af0e 100755 --- a/data/wildPokemon/safarizone1.asm +++ b/data/wildPokemon/safarizone1.asm @@ -1,6 +1,6 @@ ZoneMons1: db $1E - IF _RED || (_JAPAN && _BLUE) + IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) db 24,NIDORAN_M db 26,DODUO db 22,PARAS @@ -9,16 +9,16 @@ ZoneMons1: db 23,EXEGGCUTE db 24,NIDORAN_F db 25,PARASECT - IF _RED + IF DEF(_RED) db 25,KANGASKHAN ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 25,LICKITUNG ENDC db 28,SCYTHER ENDC - IF _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 24,NIDORAN_F db 26,DODUO db 22,PARAS @@ -31,7 +31,7 @@ ZoneMons1: db 28,PINSIR ENDC - IF _YELLOW + IF DEF(_YELLOW) db 21,NIDORAN_M db 29,NIDORAN_F db 22,EXEGGCUTE diff --git a/data/wildPokemon/safarizone2.asm b/data/wildPokemon/safarizone2.asm index 2adb18ed..5de4ad00 100755 --- a/data/wildPokemon/safarizone2.asm +++ b/data/wildPokemon/safarizone2.asm @@ -1,50 +1,48 @@ ZoneMons2: db $1E - IF !_YELLOW - IF _RED || (_JAPAN && _BLUE) + 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 _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 22,NIDORAN_F ENDC db 26,RHYHORN db 23,PARAS db 25,EXEGGCUTE - IF _RED || (_JAPAN && _BLUE) + IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) db 30,NIDORINO ENDC - IF _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 30,NIDORINA ENDC db 27,EXEGGCUTE - IF _RED || (_JAPAN && _BLUE) + IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) db 30,NIDORINA ENDC - IF _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 30,NIDORINO ENDC db 32,VENOMOTH db 26,CHANSEY - IF _RED || _GREEN || (!_JAPAN && _BLUE) + IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 28,TAUROS ENDC - IF (_JAPAN && _BLUE) + IF (DEF(_JAPAN) && DEF(_BLUE)) db 28,PINSIR ENDC ENDC - IF _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 - ENDC - db $00 diff --git a/data/wildPokemon/safarizone3.asm b/data/wildPokemon/safarizone3.asm index 436ab937..c13cd378 100755 --- a/data/wildPokemon/safarizone3.asm +++ b/data/wildPokemon/safarizone3.asm @@ -1,6 +1,6 @@ ZoneMons3: db $1E - IF _RED + IF DEF(_RED) db 25,NIDORAN_M db 26,DODUO db 23,VENONAT @@ -13,7 +13,7 @@ ZoneMons3: db 28,KANGASKHAN ENDC - IF _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 25,NIDORAN_F db 26,DODUO db 23,VENONAT @@ -26,7 +26,7 @@ ZoneMons3: db 28,KANGASKHAN ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 25,NIDORAN_M db 26,DODUO db 23,VENONAT @@ -39,7 +39,7 @@ ZoneMons3: db 28,LICKITUNG ENDC - IF _YELLOW + IF DEF(_YELLOW) db 29,NIDORAN_M db 21,NIDORAN_F db 22,EXEGGCUTE diff --git a/data/wildPokemon/safarizonecenter.asm b/data/wildPokemon/safarizonecenter.asm index 35eb7fd4..7b50e5b9 100755 --- a/data/wildPokemon/safarizonecenter.asm +++ b/data/wildPokemon/safarizonecenter.asm @@ -1,6 +1,6 @@ ZoneMonsCenter: db $1E - IF _RED + IF DEF(_RED) db 22,NIDORAN_M db 25,RHYHORN db 22,VENONAT @@ -13,7 +13,7 @@ ZoneMonsCenter: db 23,CHANSEY ENDC - IF _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 22,NIDORAN_F db 25,RHYHORN db 22,VENONAT @@ -26,7 +26,7 @@ ZoneMonsCenter: db 23,CHANSEY ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 22,NIDORAN_M db 25,RHYHORN db 22,VENONAT @@ -39,7 +39,7 @@ ZoneMonsCenter: db 23,CHANSEY ENDC - IF _YELLOW + IF DEF(_YELLOW) db 14,NIDORAN_M db 36,NIDORAN_F db 24,EXEGGCUTE diff --git a/data/wildPokemon/seafoamisland1.asm b/data/wildPokemon/seafoamisland1.asm index 506dd98e..45d0a707 100755 --- a/data/wildPokemon/seafoamisland1.asm +++ b/data/wildPokemon/seafoamisland1.asm @@ -1,6 +1,6 @@ IslandMons1: db $0F - IF _RED + IF DEF(_RED) db 30,SEEL db 30,SLOWPOKE db 30,SHELLDER @@ -13,7 +13,7 @@ IslandMons1: db 38,GOLDUCK ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 30,SEEL db 30,PSYDUCK db 30,STARYU @@ -26,7 +26,7 @@ IslandMons1: db 38,SLOWBRO ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 30,SEEL db 30,HORSEA db 30,STARYU @@ -39,7 +39,7 @@ IslandMons1: db 38,SLOWBRO ENDC - IF _YELLOW + IF DEF(_YELLOW) db 18,ZUBAT db 25,KRABBY db 27,KRABBY diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/wildPokemon/seafoamislandb1.asm index 044753b4..3f6ef7b6 100755 --- a/data/wildPokemon/seafoamislandb1.asm +++ b/data/wildPokemon/seafoamislandb1.asm @@ -1,6 +1,6 @@ IslandMonsB1: db $0A - IF _RED + IF DEF(_RED) db 30,STARYU db 30,HORSEA db 32,SHELLDER @@ -13,7 +13,7 @@ IslandMonsB1: db 37,SEADRA ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 30,SHELLDER db 30,KRABBY db 32,STARYU @@ -26,7 +26,7 @@ IslandMonsB1: db 37,KINGLER ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 30,SHELLDER db 30,KRABBY db 32,STARYU @@ -39,7 +39,7 @@ IslandMonsB1: db 37,KINGLER ENDC - IF _YELLOW + IF DEF(_YELLOW) db 27,ZUBAT db 26,KRABBY db 36,ZUBAT diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/wildPokemon/seafoamislandb2.asm index 2b7a3ef8..5df1cca9 100755 --- a/data/wildPokemon/seafoamislandb2.asm +++ b/data/wildPokemon/seafoamislandb2.asm @@ -1,6 +1,6 @@ IslandMonsB2: db $0A - IF _RED + IF DEF(_RED) db 30,SEEL db 30,SLOWPOKE db 32,SEEL @@ -13,7 +13,7 @@ IslandMonsB2: db 37,SLOWBRO ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 30,SEEL db 30,PSYDUCK db 32,SEEL @@ -26,7 +26,7 @@ IslandMonsB2: db 37,GOLDUCK ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 30,SEEL db 30,HORSEA db 32,SEEL @@ -39,7 +39,7 @@ IslandMonsB2: db 37,JYNX ENDC - IF _YELLOW + IF DEF(_YELLOW) db 27,ZUBAT db 27,KRABBY db 36,ZUBAT diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/wildPokemon/seafoamislandb3.asm index ac9769b4..e8560c9a 100755 --- a/data/wildPokemon/seafoamislandb3.asm +++ b/data/wildPokemon/seafoamislandb3.asm @@ -1,6 +1,6 @@ IslandMonsB3: db $0A - IF _RED + IF DEF(_RED) db 31,SLOWPOKE db 31,SEEL db 33,SLOWPOKE @@ -13,7 +13,7 @@ IslandMonsB3: db 37,DEWGONG ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 31,PSYDUCK db 31,SEEL db 33,PSYDUCK @@ -26,7 +26,7 @@ IslandMonsB3: db 37,DEWGONG ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 31,HORSEA db 31,SEEL db 33,HORSEA @@ -39,7 +39,7 @@ IslandMonsB3: db 37,DEWGONG ENDC - IF _YELLOW + IF DEF(_YELLOW) db 27,GOLBAT db 36,ZUBAT db 29,KRABBY diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/wildPokemon/seafoamislandb4.asm index af5c7e02..7f8977d6 100755 --- a/data/wildPokemon/seafoamislandb4.asm +++ b/data/wildPokemon/seafoamislandb4.asm @@ -1,6 +1,6 @@ IslandMonsB4: db $0A - IF _RED + IF DEF(_RED) db 31,HORSEA db 31,SHELLDER db 33,HORSEA @@ -13,7 +13,7 @@ IslandMonsB4: db 32,GOLBAT ENDC - IF _GREEN || !_JAPAN && _BLUE + IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) db 31,KRABBY db 31,STARYU db 33,KRABBY @@ -26,7 +26,7 @@ IslandMonsB4: db 32,GOLBAT ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 31,KRABBY db 31,STARYU db 33,KRABBY @@ -39,7 +39,7 @@ IslandMonsB4: db 32,GOLBAT ENDC - IF _YELLOW + IF DEF(_YELLOW) db 36,GOLBAT db 36,ZUBAT db 30,KRABBY diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm index 4feb568c..504d32f1 100755 --- a/data/wildPokemon/unknowndungeon1.asm +++ b/data/wildPokemon/unknowndungeon1.asm @@ -1,20 +1,31 @@ DungeonMons1: db $0A - IF !_YELLOW + 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 _RED || _GREEN || (!_JAPAN && _BLUE) + IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 49,DODRIO ENDC - IF _JAPAN && _BLUE + IF DEF(_JAPAN) && DEF(_BLUE) db 49,RAPIDASH ENDC db 49,VENOMOTH - IF _RED + IF DEF(_RED) db 52,ARBOK ENDC - IF !_RED + IF !DEF(_RED) db 52,SANDSLASH ENDC db 49,KADABRA @@ -23,18 +34,5 @@ DungeonMons1: db 53,DITTO ENDC - IF _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 - ENDC - db $00 diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm index a09c985c..9422f3a0 100755 --- a/data/wildPokemon/unknowndungeon2.asm +++ b/data/wildPokemon/unknowndungeon2.asm @@ -1,14 +1,25 @@ DungeonMons2: db $0F - IF !_YELLOW + 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 _RED || _GREEN || (_BLUE && !_JAPAN) + IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN)) db 52,MAROWAK ENDC - IF (_BLUE && _JAPAN) + IF (DEF(_BLUE) && DEF(_JAPAN)) db 52,MAROWAK ENDC db 52,ELECTRODE @@ -18,18 +29,5 @@ DungeonMons2: db 60,DITTO ENDC - IF _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 - ENDC - db $00 diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm index 7ab1c964..6a88edb2 100755 --- a/data/wildPokemon/unknowndungeonb1.asm +++ b/data/wildPokemon/unknowndungeonb1.asm @@ -1,16 +1,27 @@ DungeonMonsB1: db $19 - IF !_YELLOW + 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 _RED + IF DEF(_RED) db 57,ARBOK ENDC - IF !_RED + IF DEF(_BLUE) || DEF(_GREEN) db 57,SANDSLASH ENDC db 65,DITTO @@ -18,18 +29,5 @@ DungeonMonsB1: db 67,DITTO ENDC - IF _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 - ENDC - db $00 diff --git a/data/wildPokemon/victoryroad1.asm b/data/wildPokemon/victoryroad1.asm index 1ec65cf5..98914a91 100755 --- a/data/wildPokemon/victoryroad1.asm +++ b/data/wildPokemon/victoryroad1.asm @@ -1,19 +1,7 @@ PlateauMons1: db $0F - IF !_YELLOW - 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 - IF _YELLOW + IF DEF(_YELLOW) db 26,GEODUDE db 31,GEODUDE db 36,GEODUDE @@ -24,6 +12,17 @@ PlateauMons1: 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 $00 diff --git a/data/wildPokemon/victoryroad2.asm b/data/wildPokemon/victoryroad2.asm index 87159e96..ffe117bc 100755 --- a/data/wildPokemon/victoryroad2.asm +++ b/data/wildPokemon/victoryroad2.asm @@ -1,19 +1,7 @@ PlateauMons2: db $0A - IF !_YELLOW - 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 - IF _YELLOW + IF DEF(_YELLOW) db 31,GEODUDE db 36,GEODUDE db 41,GEODUDE @@ -24,6 +12,17 @@ PlateauMons2: 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 $00 diff --git a/data/wildPokemon/victoryroad3.asm b/data/wildPokemon/victoryroad3.asm index ae52eeb6..7c1b2c1c 100755 --- a/data/wildPokemon/victoryroad3.asm +++ b/data/wildPokemon/victoryroad3.asm @@ -1,19 +1,7 @@ PlateauMons3: db $0F - IF !_YELLOW - 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 - IF _YELLOW + IF DEF(_YELLOW) db 36,GEODUDE db 44,GOLBAT db 41,GEODUDE @@ -24,6 +12,17 @@ PlateauMons3: 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 $00 diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm index 2ca828eb..bac991c5 100755 --- a/data/wildPokemon/viridianforest.asm +++ b/data/wildPokemon/viridianforest.asm @@ -1,7 +1,19 @@ ForestMons: - IF !_YELLOW + 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 _RED + IF DEF(_RED) db 4,WEEDLE db 5,KAKUNA db 3,WEEDLE @@ -11,7 +23,7 @@ ForestMons: db 4,METAPOD db 3,CATERPIE ENDC - IF _BLUE || _GREEN + IF DEF(_BLUE) || DEF(_GREEN) db 4,CATERPIE db 5,METAPOD db 3,CATERPIE @@ -26,19 +38,6 @@ ForestMons: db 5,PIKACHU ENDC - IF _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 - ENDC db $00 diff --git a/data/wild_mons.asm b/data/wild_mons.asm index 2bc062f3..f29fd340 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -247,7 +247,7 @@ WildDataPointers: ; ceeb (3:4eeb) dw NoMons dw NoMons dw NoMons - IF _YELLOW + IF DEF(_OPTION_BEACH_HOUSE) dw NoMons ENDC dw $FFFF diff --git a/engine/battle/4_2.asm b/engine/battle/4_2.asm index aaada492..ef4798bd 100755 --- a/engine/battle/4_2.asm +++ b/engine/battle/4_2.asm @@ -110,31 +110,36 @@ Func_13870: ; 13870 (4:7870) jr z, .asm_13905 ld [wd0db], a .asm_1389e +; determine if wild pokémon can appear where we’re standing. +; are we standing in grass/water? hlCoord 9, 9 ld c, [hl] ld a, [W_GRASSTILE] cp c - ld a, [W_GRASSRATE] ; W_GRASSRATE - jr z, .asm_138c4 - ld a, $14 + ld a, [W_GRASSRATE] + jr z, .CanEncounter + ld a, $14 ; in all tilesets with a water tile, this is its id cp c - ld a, [W_WATERRATE] ; wEnemyMon1Species - jr z, .asm_138c4 - ld a, [W_CURMAP] ; W_CURMAP - cp REDS_HOUSE_1F - jr c, .asm_13912 - ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET + ld a, [W_WATERRATE] + jr z, .CanEncounter +; even if not in grass/water, standing anywhere we can encounter pokémon +; so long as the map is “indoor” and has wild pokémon defined. +; …as long as it’s not Viridian Forest or Safari Zone. + ld a, [W_CURMAP] + cp REDS_HOUSE_1F ; is this an indoor map? + jr c, .CantEncounter + ld a, [W_CURMAPTILESET] cp FOREST ; Viridian Forest/Safari Zone - jr z, .asm_13912 - ld a, [W_GRASSRATE] ; W_GRASSRATE -.asm_138c4 + jr z, .CantEncounter + ld a, [W_GRASSRATE] +.CanEncounter ld b, a ld a, [hRandomAdd] cp b - jr nc, .asm_13912 + jr nc, .CantEncounter ld a, [hRandomSub] ld b, a - ld hl, WildMonEncounterSlotChances ; $7918 + ld hl, WildMonEncounterSlotChances .asm_138d0 ld a, [hli] cp b @@ -143,27 +148,27 @@ Func_13870: ; 13870 (4:7870) jr .asm_138d0 .asm_138d7 ld c, [hl] - ld hl, W_GRASSMONS ; wd888 + ld hl, W_GRASSMONS aCoord 8, 9 cp $14 jr nz, .asm_138e5 - ld hl, W_WATERMONS ; wd8a5 (aliases: wEnemyMon1HP) + ld hl, W_WATERMONS .asm_138e5 ld b, $0 add hl, bc ld a, [hli] - ld [W_CURENEMYLVL], a ; W_CURENEMYLVL + ld [W_CURENEMYLVL], a ld a, [hl] ld [wcf91], a ld [wEnemyMonSpecies2], a ld a, [wd0db] and a jr z, .asm_13916 - ld a, [wPartyMon1Level] ; wPartyMon1Level + ld a, [wPartyMon1Level] ld b, a - ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL + ld a, [W_CURENEMYLVL] cp b - jr c, .asm_13912 + jr c, .CantEncounter jr .asm_13916 .asm_13905 ld [wd0db], a @@ -171,7 +176,7 @@ Func_13870: ; 13870 (4:7870) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call EnableAutoTextBoxDrawing call DisplayTextID -.asm_13912 +.CantEncounter ld a, $1 and a ret diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 349d1d5d..0e5c025f 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -367,10 +367,10 @@ AnimationTileset2: ; 786ee (1e:46ee) INCBIN "gfx/attack_anim_2.2bpp" SlotMachineTiles2: ; 78bde (1e:4bde) -IF _RED +IF DEF(_RED) INCBIN "gfx/red/slotmachine2.2bpp" ENDC -IF _BLUE +IF DEF(_BLUE) INCBIN "gfx/blue/slotmachine2.2bpp" ENDC diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 263fafa1..43373fdd 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2954,7 +2954,11 @@ Func_3d4b6: ; 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 68bf8b50..ace43beb 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -429,13 +429,13 @@ FightIntroBackMon: ; 41a99 (10:5a99) FightIntroFrontMon: ; 42099 (10:6099) -IF _RED +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 _BLUE +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" diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index f1a0e798..891ef6e8 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -345,6 +345,9 @@ 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 227728a0..e636e59d 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -366,6 +366,9 @@ 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 9d994047..34d98fd7 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -181,7 +181,7 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c) .namestring ; 6aa3 (1:6aa3) db "NAME@" -IF _RED +IF DEF(_RED) DefaultNamesPlayer: ; 6aa8 (1:6aa8) db "NEW NAME" next "RED" @@ -197,7 +197,7 @@ DefaultNamesRival: ; 6abe (1:6abe) db "@" ENDC -IF _BLUE +IF DEF(_BLUE) DefaultNamesPlayer: ; 6aa8 (1:6aa8) db "NEW NAME" next "BLUE" @@ -213,6 +213,22 @@ DefaultNamesRival: ; 6abe (1:6abe) db "@" ENDC +IF DEF(_YELLOW) +DefaultNamesPlayer: + db "NEW NAME" + next "YELLOW" + next "ASH" + next "JACK" + db "@" + +DefaultNamesRival: + db "NEW NAME" + next "BLUE" + next "GARY" + next "JOHN" + db "@" +ENDC + Func_6ad6: ; 6ad6 (1:6ad6) ld b, a ld c, $0 @@ -234,18 +250,24 @@ Func_6ad6: ; 6ad6 (1:6ad6) ld de, wcd6d ld bc, $14 jp CopyData -IF _RED +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 _BLUE +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/predefs.asm b/engine/predefs.asm index b73c485a..b21ff884 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -80,7 +80,7 @@ PredefPointers:: ; 4fe79 (13:7e79) add_predef LoadTilesetHeader add_predef LearnMoveFromLevelUp add_predef LearnMove - add_predef IsItemInBag_ ; 1C, used in Pokémon Tower + add_predef IsItemInBag_ dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the bank number is actually 0 dbw $03,GiveItem add_predef ChangeBGPalColor0_4Frames diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index b24b2d25..5b72c8b1 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -862,9 +862,9 @@ SLOTSMOUSE EQU $1614 INCLUDE "data/slot_machine_wheels.asm" SlotMachineTiles1: ; 37a51 (d:7a51) -IF _RED +IF DEF(_RED) INCBIN "gfx/red/slotmachine1.2bpp" ENDC -IF _BLUE +IF DEF(_BLUE) INCBIN "gfx/blue/slotmachine1.2bpp" ENDC diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 0bf4f4a5..e13b7da6 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -56,11 +56,11 @@ LoadTitlescreenGraphics: ; 42dd (1:42dd) ld a, BANK(PokemonLogoGraphics) call FarCopyData2 ; second chunk ld hl, Version_GFX ; $402f -IF _RED +IF DEF(_RED) ld de,vChars2 + $600 ld bc,$50 ENDC -IF _BLUE +IF DEF(_BLUE) ld de,vChars2 + $600 + $10 ld bc,$50 - $10 ENDC @@ -114,10 +114,10 @@ ENDC call SaveScreenTilesToBuffer2 call LoadScreenTilesFromBuffer2 call EnableLCD -IF _RED +IF DEF(_RED) ld a,CHARMANDER ; which Pokemon to show first on the title screen ENDC -IF _BLUE +IF DEF(_BLUE) ld a,SQUIRTLE ; which Pokemon to show first on the title screen ENDC @@ -382,9 +382,9 @@ PrintGameVersionOnTitleScreen: ; 4598 (1:4598) ; these point to special tiles specifically loaded for that purpose and are not usual text VersionOnTitleScreenText: ; 45a1 (1:45a1) -IF _RED +IF DEF(_RED) db $60,$61,$7F,$65,$66,$67,$68,$69,"@" ; "Red Version" ENDC -IF _BLUE +IF DEF(_BLUE) db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version" ENDC diff --git a/gfx/blocksets/beachhouse.bst b/gfx/blocksets/beachhouse.bst Binary files differnew file mode 100644 index 00000000..bafbe0b2 --- /dev/null +++ b/gfx/blocksets/beachhouse.bst diff --git a/gfx/tilesets/beachhouse.png b/gfx/tilesets/beachhouse.png Binary files differnew file mode 100644 index 00000000..f5dccf7a --- /dev/null +++ b/gfx/tilesets/beachhouse.png diff --git a/gfx/tilesets/beachhouse.tilecoll b/gfx/tilesets/beachhouse.tilecoll new file mode 100644 index 00000000..54ddac19 --- /dev/null +++ b/gfx/tilesets/beachhouse.tilecoll @@ -0,0 +1 @@ +
\ No newline at end of file @@ -5059,6 +5059,12 @@ 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" @@ -5962,7 +5968,11 @@ 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" @@ -6414,10 +6424,10 @@ SECTION "bank1A",ROMX,BANK[$1A] INCLUDE "engine/battle/1a.asm" Version_GFX: -IF _RED +IF DEF(_RED) INCBIN "gfx/red/redgreenversion.1bpp" ; 10 tiles ENDC -IF _BLUE +IF DEF(_BLUE) INCBIN "gfx/blue/blueversion.1bpp" ; 8 tiles ENDC @@ -6628,3 +6638,13 @@ INCLUDE "engine/evolution.asm" INCLUDE "engine/overworld/elevator.asm" INCLUDE "engine/items/tm_prices.asm" + +IF DEF(_OPTION_BEACH_HOUSE) +SECTION "bank3C",ROMX[$4314],BANK[$3C] + +BeachHouse_GFX: + INCBIN "gfx/tilesets/beachhouse.2bpp" + +BeachHouse_Block: + INCBIN "gfx/blocksets/beachhouse.bst" +ENDC diff --git a/maps/beach_house.blk b/maps/beach_house.blk new file mode 100644 index 00000000..5bcdb58a --- /dev/null +++ b/maps/beach_house.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/route19-yellow.blk b/maps/route19-yellow.blk new file mode 100644 index 00000000..3fc58494 --- /dev/null +++ b/maps/route19-yellow.blk @@ -0,0 +1 @@ +(,)(,)(,)$W%$W%CCC11111CCC111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk
\ No newline at end of file diff --git a/preprocessor.py b/preprocessor.py index ee227612..6cd6ab05 100644 --- a/preprocessor.py +++ b/preprocessor.py @@ -176,6 +176,9 @@ chars = { "№": 0x74, +"′": 0x71, +"″": 0x73, + " ": 0x7F, "A": 0x80, "B": 0x81, diff --git a/scripts/beach_house.asm b/scripts/beach_house.asm new file mode 100644 index 00000000..67c29f1b --- /dev/null +++ b/scripts/beach_house.asm @@ -0,0 +1,195 @@ +BeachHouseScript: + call $3c29 + ret + +BeachHouseTextPointers: + dw SurfinDudeText + dw BeachHousePikachuText + dw BeachHouseSign1Text + dw BeachHouseSign2Text + dw BeachHouseSign3Text + dw BeachHouseSign4Text + +SurfinDudeText: + db 8 + ld a,[$d471] + bit 6,a + jr nz,.next + ld hl,.SurfinDudeText4 + call PrintText + jr .done +.next + ld hl,$d492 + bit 0,[hl] + set 0,[hl] + jr nz,.next2 + ld hl,.SurfinDudeText1 + jr .next3 +.next2 + ld hl,.SurfinDudeText3 +.next3 + call PrintText + call YesNoChoice + ld a,[wCurrentMenuItem] + and a + jr nz,.xf226b + ld a,1 + ld [$cc3c],a + ld b,$3e + ld hl,$4000 + call $3e84 + ld hl,$d492 + set 1,[hl] + jr .done +.xf226b + ld hl,.SurfinDudeText2 + call PrintText +.done + jp TextScriptEnd + +.SurfinDudeText1 + TX_FAR _SurfinDudeText1 + db "@" +.SurfinDudeText2 + TX_FAR _SurfinDudeText2 + db "@" +.SurfinDudeText3 + TX_FAR _SurfinDudeText3 + db "@" +.SurfinDudeText4 + TX_FAR _SurfinDudeText4 + db "@" + +BeachHousePikachuText: + db 8 + ld hl,.BeachHousePikachuText + call PrintText + ld a,PIKACHU + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd + +.BeachHousePikachuText + TX_FAR _BeachHousePikachuText + db "@" + +BeachHouseSign1Text: + db 8 + ld hl,.BeachHouseSign1Text2 + ld a,[$d471] + bit 6,a + jr z,.next + ld hl,.BeachHouseSign1Text1 +.next + call PrintText + jp TextScriptEnd + +.BeachHouseSign1Text1 + TX_FAR _BeachHouseSign1Text1 + db "@" +.BeachHouseSign1Text2 + TX_FAR _BeachHouseSign1Text2 + db "@" + +BeachHouseSign2Text: + db 8 + ld hl,.BeachHouseSign2Text2 + ld a,[$d471] + bit 6,a + jr z,.next + ld hl,.BeachHouseSign2Text1 +.next + call PrintText + jp TextScriptEnd + +.BeachHouseSign2Text1 + TX_FAR _BeachHouseSign2Text1 + db "@" +.BeachHouseSign2Text2 + TX_FAR _BeachHouseSign2Text2 + db "@" + +BeachHouseSign3Text: + db 8 + ld hl,.BeachHouseSign3Text2 + ld a,[$d471] + bit 6,a + jr z,.next + ld hl,.BeachHouseSign3Text1 +.next + call PrintText + jp TextScriptEnd + +.BeachHouseSign3Text1 + TX_FAR _BeachHouseSign3Text1 + db "@" +.BeachHouseSign3Text2 + TX_FAR _BeachHouseSign3Text2 + db "@" + +BeachHouseSign4Text: + db 8 + ld a,1 + ld [$cc3c],a + ld a,[$d471] + bit 6,a + jr z,.xf2369 + + ld hl,$d492 + bit 1,[hl] + jr z,.next2 + ld a,0 + ld [$cc3c],a +.next2 + ld hl,.BeachHousePrinterText2 + call PrintText + ld a,[$d492] + bit 1,a + jr z,.xf236f + + ld a,1 + ld [$cc3c],a + ld hl,.BeachHousePrinterText3 + call PrintText + call YesNoChoice + ld a,[wCurrentMenuItem] + and a + jp z,$63d0 ; 0xf23d0 + call $36ec + ld hl,$d72f + set 6,[hl] + xor a + ld [$cfca],a + ld hl,$510a + ld b,$3a + call $3e84 + call $3852 + ld hl,$d72f + res 6,[hl] + call $3dd8 + call $2f83 + call $3dc2 + call $36f8 + call $3ddb + call $3de0 + ld a,1 + ld [$cfca],a + jr .xf236f +.xf2369 + ld hl,.BeachHousePrinterText1 + call PrintText +.xf236f + jp TextScriptEnd + +.BeachHousePrinterText1 + TX_FAR _BeachHousePrinterText1 + db $d,"@" +.BeachHousePrinterText2 + TX_FAR _BeachHousePrinterText2 + db $d,"@" +.BeachHousePrinterText3 + TX_FAR _BeachHousePrinterText3 + db "@" +.xf2383 + TX_FAR _BeachHousePrinterText4 + db "@" diff --git a/scripts/lab4.asm b/scripts/lab4.asm index a1df3387..c2d8d304 100755 --- a/scripts/lab4.asm +++ b/scripts/lab4.asm @@ -6,14 +6,16 @@ Lab4TextPointers: ; 75d34 (1d:5d34) dw Lab4Text2 Lab4Script_75d38: ; 75d38 (1d:5d38) +; construct a list of all fossils in the player's bag + xor a ld [wcd37], a ld de, wcc5b ld hl, FossilsList -.asm_75d42 +.loop ld a, [hli] and a - jr z, .asm_75d64 + jr z, .done push hl push de ld [wd11e], a @@ -23,7 +25,9 @@ Lab4Script_75d38: ; 75d38 (1d:5d38) pop hl ld a, b and a - jr z, .asm_75d42 + jr z, .loop + + ; A fossil's in the bag ld a, [wd11e] ld [de], a inc de @@ -31,8 +35,8 @@ Lab4Script_75d38: ; 75d38 (1d:5d38) ld hl, wcd37 inc [hl] pop hl - jr .asm_75d42 -.asm_75d64 + jr .loop +.done ld a, $ff ld [de], a ret @@ -75,7 +79,7 @@ Lab4Text1: ; 75d6c (1d:5d6c) set 2, [hl] ld a, [W_FOSSILMON] ld b, a - ld c, $1e + ld c, 30 call GivePokemon jr nc, .asm_75d93 ; 0x75db9 $d8 ld hl, wd7a3 diff --git a/scripts/safarizoneentrance-yellow.asm b/scripts/safarizoneentrance-yellow.asm new file mode 100644 index 00000000..1f1b6c23 --- /dev/null +++ b/scripts/safarizoneentrance-yellow.asm @@ -0,0 +1,256 @@ +.xf1f77 + ld hl,.ForJust500Text + call PrintText + ld a,$13 + ld [wd125],a + call DisplayTextBoxID + call YesNoChoice + ld a,[wCurrentMenuItem] + and a + jp nz,.PleaseComeAgain + ld hl,$d346 ; yellow d346 + ld a,[hli] + or [hl] + inc hl + or [hl] + jr nz,.xf1f9f +.xf1f98 + call .xf20ce + jr c,.CantPayWalkDown + jr .xf1ff2 + +.xf1f9f + xor a + ld [$ff9f],a + ld a,$05 + ld [$ffa0],a + ld a,$00 + ld [$ffa1],a + call HasEnoughMoney + jr nc,.success + ld hl,.NotEnoughMoneyText + call PrintText + call .xf2077 + jr c,.CantPayWalkDown + jr .xf1ff2 + +.success + xor a + ld [wSubtrahend],a + ld a,$05 + ld [wSubtrahend+1],a + ld a,$00 + ld [wSubtrahend+2],a + ld hl,wTrainerFacingDirection + ld de,wPlayerMoney + 2 + ld c,3 + predef SubBCDPredef + ld a,$b2 + call $3736 + call $373e + ld a,$13 + ld [wd125],a + call DisplayTextBoxID + ld hl,.MakePaymentText + call PrintText + ld a,30 + ld hl,(502 / $100) << 8 | (502 % $100) +.xf1ff2 + ld [W_NUMSAFARIBALLS],a + ld a,h + ld [wSafariSteps],a + ld a,l + ld [wSafariSteps + 1],a + ld a,$40 + ld c,3 + call SafariZoneEntranceAutoWalk + ld hl,wd790 + set 7,[hl] + res 6,[hl] + ld a,3 + ld [W_SAFARIZONEENTRANCECURSCRIPT],a + jr .done + +.PleaseComeAgain + ld hl,.PleaseComeAgainText + call PrintText +.CantPayWalkDown + ld a,$80 + ld c,1 + call SafariZoneEntranceAutoWalk + ld a,4 + ld [W_SAFARIZONEENTRANCECURSCRIPT],a +.done + ret + +.ForJust500Text + TX_FAR SafariZoneEntranceText_9e6e4 + db "@" + +.MakePaymentText + TX_FAR SafariZoneEntranceText_9e747 + db $b + TX_FAR _SafariZoneEntranceText_75360 + db "@" + +.PleaseComeAgainText + TX_FAR _SafariZoneEntranceText_75365 + db "@" + +.NotEnoughMoneyText + TX_FAR _SafariZoneEntranceText_7536a + db "@" + +.SafariZoneEntranceText2 + ld hl,.FirstTimeQuestionText + call PrintText + call YesNoChoice + ld a,[wCurrentMenuItem] + and a + ld hl,.RegularText + jr nz,.Explanation + ld hl,.ExplanationText +.Explanation + call PrintText + ret + +.FirstTimeQuestionText + TX_FAR _SafariZoneEntranceText_753e6 + db "@" + +.ExplanationText + TX_FAR _SafariZoneEntranceText_753eb + db "@" + +.RegularText + TX_FAR _SafariZoneEntranceText_753f0 + db "@" + +SafariZoneEntranceAutoWalk: + push af + ld b,0 + ld a,c + ld [wSimulatedJoypadStatesIndex],a + ld hl,wSimulatedJoypadStatesEnd + pop af + call FillMemory + jp StartSimulatingJoypadStates + +.xf2077 + ld hl,wPlayerMoney + ld de,$ff9f + ld bc,3 + call $b1 ; yellow $00b1 + xor a + ld [$ffa2],a + ld [$ffa3],a + ld a,$17 ; ¥17 per safari ball + ld [$ffa4],a + predef DivideBCDPredef3 + ld a,[$ffa4] + call .xf211e + pop af + ld hl,$d346 + xor a + ld bc,3 + call FillMemory + ld hl,.OhAllRightText + call Func_3c59 + ld a,$13 + ld a,[$d124] + call DisplayTextBoxID + ld hl,.CantGive30BallsText + call PrintText + pop af + inc a + jr z,.xf20bd + cp 29 + jr c,.xf20bf +.xf20bd + ld a,29 +.xf20bf + ld hl,$1f6 + and a + ret + +.OhAllRightText + TX_FAR _SafariZoneLowCostText1 + db "@" + +.CantGive30BallsText + TX_FAR _SafariZoneLowCostText2 + db "@" + +.xf20ce + ld hl,$d70c + ld a,[hl] + push af + inc [hl] + ld e,a + ld d,0 + ld hl,.lowcosttextpointers + add hl,de + add hl,de + ld a,[hli] + ld h,[hl] + ld l,a + call PrintText + pop af + cp 3 + jr z,.next + scf + ret + +.next + ld hl,.xf20f6 + call $3c46 + ld a,1 + ld hl,$01f6 + and a + ret + +.xf20f6 + TX_FAR _SafariZoneLowCostText3 + db $b + TX_FAR _SafariZoneLowCostText4 + db "@" + +.lowcosttextpointers + dw .xf210a + dw .xf210f + dw .xf2114 + dw .xf2119 + dw .xf2119 + +.xf210a + TX_FAR _SafariZoneLowCostText5 + db "@" + +.xf210f + TX_FAR _SafariZoneLowCostText6 + db "@" + +.xf2114 + TX_FAR _SafariZoneLowCostText7 + db "@" + +.xf2119 + TX_FAR _SafariZoneLowCostText8 + db "@" + +.xf211e + push hl + ld c,a + and $f + ld l,a + ld h,0 + ld a,c + and $f0 + swap a + ld bc,$a + call $3a74 + ld a,l + pop hl + ret + +.xf2133 diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index 8ae81f81..e5653ff1 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -5,16 +5,16 @@ SafariZoneEntranceScript: ; 751cd (1d:51cd) jp CallFunctionInTable SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) - dw SafariZoneEntranceScript0 - dw SafariZoneEntranceScript1 - dw SafariZoneEntranceScript2 - dw SafariZoneEntranceScript3 - dw SafariZoneEntranceScript4 - dw SafariZoneEntranceScript5 - dw SafariZoneEntranceScript6 + dw .SafariZoneEntranceScript0 + dw .SafariZoneEntranceScript1 + dw .SafariZoneEntranceScript2 + dw .SafariZoneEntranceScript3 + dw .SafariZoneEntranceScript4 + dw .SafariZoneEntranceScript5 + dw .SafariZoneEntranceScript6 -SafariZoneEntranceScript0: ; 751e7 (1d:51e7) - ld hl, CoordsData_75221 +.SafariZoneEntranceScript0 + ld hl, .CoordsData_75221 call ArePlayerCoordsInArray ret nc ld a, $3 @@ -35,22 +35,22 @@ SafariZoneEntranceScript0: ; 751e7 (1d:51e7) .asm_7520f ld a, $10 ld c, $1 - call SafariZoneEntranceScript_752a3 + call SafariZoneEntranceAutoWalk ld a, $f0 ld [wJoyIgnore], a ld a, $1 ld [W_SAFARIZONEENTRANCECURSCRIPT], a ret -CoordsData_75221: ; 75221 (1d:5221) +.CoordsData_75221: ; 75221 (1d:5221) db $02,$03 db $02,$04 db $FF -SafariZoneEntranceScript1: ; 75226 (1d:5226) +.SafariZoneEntranceScript1 call SafariZoneEntranceScript_752b4 ret nz -SafariZoneEntranceScript2: ; 7522a (1d:522a) +.SafariZoneEntranceScript2 xor a ld [hJoyHeld], a ld [wJoyIgnore], a @@ -62,7 +62,7 @@ SafariZoneEntranceScript2: ; 7522a (1d:522a) ld [wJoyIgnore], a ret -SafariZoneEntranceScript3: ; 75240 (1d:5240) +.SafariZoneEntranceScript3 call SafariZoneEntranceScript_752b4 ret nz xor a @@ -71,7 +71,7 @@ SafariZoneEntranceScript3: ; 75240 (1d:5240) ld [W_SAFARIZONEENTRANCECURSCRIPT], a ret -SafariZoneEntranceScript5: ; 7524e (1d:524e) +.SafariZoneEntranceScript5 ld a, $4 ld [wd528], a ld hl, wd790 @@ -89,7 +89,7 @@ SafariZoneEntranceScript5: ; 7524e (1d:524e) ld [W_NUMSAFARIBALLS], a ld a, $80 ld c, $3 - call SafariZoneEntranceScript_752a3 + call SafariZoneEntranceAutoWalk ld a, $4 ld [W_SAFARIZONEENTRANCECURSCRIPT], a jr .asm_75286 ; 0x7527d $7 @@ -100,7 +100,7 @@ SafariZoneEntranceScript5: ; 7524e (1d:524e) .asm_75286 ret -SafariZoneEntranceScript4: ; 75287 (1d:5287) +.SafariZoneEntranceScript4 call SafariZoneEntranceScript_752b4 ret nz xor a @@ -109,7 +109,7 @@ SafariZoneEntranceScript4: ; 75287 (1d:5287) ld [W_SAFARIZONEENTRANCECURSCRIPT], a ret -SafariZoneEntranceScript6: ; 75295 (1d:5295) +.SafariZoneEntranceScript6 call SafariZoneEntranceScript_752b4 ret nz call Delay3 @@ -117,128 +117,127 @@ SafariZoneEntranceScript6: ; 75295 (1d:5295) ld [W_SAFARIZONEENTRANCECURSCRIPT], a ret -SafariZoneEntranceScript_752a3: ; 752a3 (1d:52a3) +SafariZoneEntranceAutoWalk: push af - ld b, $0 - ld a, c - ld [wSimulatedJoypadStatesIndex], a - ld hl, wSimulatedJoypadStatesEnd + ld b,0 + ld a,c + ld [wSimulatedJoypadStatesIndex],a + ld hl,wSimulatedJoypadStatesEnd pop af call FillMemory jp StartSimulatingJoypadStates -SafariZoneEntranceScript_752b4: ; 752b4 (1d:52b4) +SafariZoneEntranceScript_752b4: ld a, [wSimulatedJoypadStatesIndex] and a ret SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) - dw SafariZoneEntranceText1 - dw SafariZoneEntranceText2 - dw SafariZoneEntranceText3 - dw SafariZoneEntranceText4 - dw SafariZoneEntranceText5 - dw SafariZoneEntranceText6 + dw .SafariZoneEntranceText1 + dw .SafariZoneEntranceText2 + dw .SafariZoneEntranceText1 + dw .SafariZoneEntranceText4 + dw .SafariZoneEntranceText5 + dw .SafariZoneEntranceText6 -SafariZoneEntranceText3: ; 752c5 (1d:52c5) -SafariZoneEntranceText1: ; 752c5 (1d:52c5) +.SafariZoneEntranceText1 TX_FAR _SafariZoneEntranceText1 db "@" -SafariZoneEntranceText4: ; 752ca (1d:52ca) +.SafariZoneEntranceText4 TX_FAR SafariZoneEntranceText_9e6e4 ; 0x9e6e4 db $8 ld a, $13 - ld [wd125], a + ld [wd125],a call DisplayTextBoxID call YesNoChoice - ld a, [wCurrentMenuItem] + ld a,[wCurrentMenuItem] and a - jp nz, .asm_75346 + jp nz,.PleaseComeAgain xor a - ld [$ff9f], a - ld a, $5 - ld [$ffa0], a - ld a, $0 - ld [$ffa1], a + ld [$ff9f],a + ld a,$05 + ld [$ffa0],a + ld a,$00 + ld [$ffa1],a call HasEnoughMoney - jr nc, .asm_752f9 ; 0x752ef $8 - ld hl, SafariZoneEntranceText_7536a + jr nc,.success + ld hl,.NotEnoughMoneyText call PrintText - jr .asm_7534c ; 0x752f7 $53 -.asm_752f9 + jr .CantPayWalkDown + +.success xor a - ld [wWhichTrade], a - ld a, $5 - ld [wTrainerEngageDistance], a - ld a, $0 - ld [wTrainerFacingDirection], a - ld hl, wTrainerFacingDirection - ld de, wPlayerMoney + 2 - ld c, $3 + ld [wSubtrahend],a + ld a,$05 + ld [wSubtrahend+1],a + ld a,$00 + ld [wSubtrahend+2],a + ld hl,wTrainerFacingDirection + ld de,wPlayerMoney + 2 + ld c,3 predef SubBCDPredef - ld a, $13 - ld [wd125], a + ld a,$13 + ld [wd125],a call DisplayTextBoxID - ld hl, SafariZoneEntranceText_7535b + ld hl,.MakePaymentText call PrintText - ld a, $1e - ld [W_NUMSAFARIBALLS], a - ld a, 502 / $100 - ld [wSafariSteps], a + ld a,30 + ld [W_NUMSAFARIBALLS],a + ld a,502 / $100 + ld [wSafariSteps],a ld a, 502 % $100 - ld [wSafariSteps + 1], a - ld a, $40 - ld c, $3 - call SafariZoneEntranceScript_752a3 - ld hl, wd790 - set 7, [hl] - res 6, [hl] - ld a, $3 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a - jr .asm_75358 ; 0x75344 $12 -.asm_75346 - ld hl, SafariZoneEntranceText_75365 + ld [wSafariSteps + 1],a + ld a,$40 + ld c,3 + call SafariZoneEntranceAutoWalk + ld hl,wd790 + set 7,[hl] + res 6,[hl] + ld a,3 + ld [W_SAFARIZONEENTRANCECURSCRIPT],a + jr .done + +.PleaseComeAgain + ld hl,.PleaseComeAgainText call PrintText -.asm_7534c - ld a, $80 - ld c, $1 - call SafariZoneEntranceScript_752a3 - ld a, $4 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a -.asm_75358 +.CantPayWalkDown + ld a,$80 + ld c,1 + call SafariZoneEntranceAutoWalk + ld a,4 + ld [W_SAFARIZONEENTRANCECURSCRIPT],a +.done jp TextScriptEnd -SafariZoneEntranceText_7535b: ; 7535b (1d:535b) - TX_FAR SafariZoneEntranceText_9e747 ; 0x9e747 - db $0B - -SafariZoneEntranceText_75360: ; 75360 (1d:5360) +.MakePaymentText + TX_FAR SafariZoneEntranceText_9e747 + db $b TX_FAR _SafariZoneEntranceText_75360 db "@" -SafariZoneEntranceText_75365: ; 75365 (1d:5365) +.PleaseComeAgainText TX_FAR _SafariZoneEntranceText_75365 db "@" -SafariZoneEntranceText_7536a: ; 7536a (1d:536a) +.NotEnoughMoneyText TX_FAR _SafariZoneEntranceText_7536a db "@" -SafariZoneEntranceText5: ; 7536f (1d:536f) +.SafariZoneEntranceText5 TX_FAR SafariZoneEntranceText_9e814 ; 0x9e814 db $8 call YesNoChoice - ld a, [wCurrentMenuItem] + ld a,[wCurrentMenuItem] and a jr nz, .asm_7539c ; 0x7537b $1f - ld hl, SafariZoneEntranceText_753bb + ld hl, .SafariZoneEntranceText_753bb call PrintText xor a ld [wSpriteStateData1 + 9], a ld a, $80 ld c, $3 - call SafariZoneEntranceScript_752a3 + call SafariZoneEntranceAutoWalk ld hl, wd790 res 6, [hl] res 7, [hl] @@ -246,13 +245,13 @@ SafariZoneEntranceText5: ; 7536f (1d:536f) ld [wcf0d], a jr .asm_753b3 ; 0x7539a $17 .asm_7539c - ld hl, SafariZoneEntranceText_753c0 + ld hl, .SafariZoneEntranceText_753c0 call PrintText ld a, $4 ld [wSpriteStateData1 + 9], a ld a, $40 ld c, $1 - call SafariZoneEntranceScript_752a3 + call SafariZoneEntranceAutoWalk ld a, $5 ld [wcf0d], a .asm_753b3 @@ -260,40 +259,40 @@ SafariZoneEntranceText5: ; 7536f (1d:536f) ld [W_SAFARIZONEENTRANCECURSCRIPT], a jp TextScriptEnd -SafariZoneEntranceText_753bb: ; 753bb (1d:53bb) +.SafariZoneEntranceText_753bb TX_FAR _SafariZoneEntranceText_753bb db "@" -SafariZoneEntranceText_753c0: ; 753c0 (1d:53c0) +.SafariZoneEntranceText_753c0 TX_FAR _SafariZoneEntranceText_753c0 db "@" -SafariZoneEntranceText6: ; 753c5 (1d:53c5) +.SafariZoneEntranceText6 TX_FAR _SafariZoneEntranceText_753c5 db "@" -SafariZoneEntranceText2: ; 753ca (1d:53ca) +.SafariZoneEntranceText2 db $08 ; asm - ld hl, SafariZoneEntranceText_753e6 + ld hl,.FirstTimeQuestionText call PrintText call YesNoChoice - ld a, [wCurrentMenuItem] + ld a,[wCurrentMenuItem] and a - ld hl, SafariZoneEntranceText_753f0 - jr nz, .asm_278a6 ; 0x753db - ld hl, SafariZoneEntranceText_753eb -.asm_278a6 ; 0x753e0 + ld hl,.RegularText + jr nz,.Explanation + ld hl,.ExplanationText +.Explanation call PrintText jp TextScriptEnd -SafariZoneEntranceText_753e6: ; 753e6 (1d:53e6) +.FirstTimeQuestionText TX_FAR _SafariZoneEntranceText_753e6 db "@" -SafariZoneEntranceText_753eb: ; 753eb (1d:53eb) +.ExplanationText TX_FAR _SafariZoneEntranceText_753eb db "@" -SafariZoneEntranceText_753f0: ; 753f0 (1d:53f0) +.RegularText TX_FAR _SafariZoneEntranceText_753f0 db "@" @@ -166,6 +166,13 @@ _OaksAideNoRoomText:: ; 802ec (20:42ec) text "." done +IF DEF(_YELLOW) +_NurseChanseyText:: + text "CHANSEY: Chaaan" + line "sey! + done +ENDC + INCLUDE "text/maps/viridian_forest.asm" INCLUDE "text/maps/mt_moon_1f.asm" INCLUDE "text/maps/mt_moon_b1f.asm" @@ -573,6 +580,12 @@ _CinnabarGymQuizIntroText:: ; 887b7 (22:47b7) line "Here we go!" prompt +IF DEF(_YELLOW) + text "#MON Quiz!" + line "Test your skill!" + done +ENDC + _CinnabarQuizQuestionsText1:: ; 8886d (22:486d) text "CATERPIE evolves" line "into BUTTERFREE?" @@ -834,6 +847,16 @@ _KabutopsFossilText:: ; 88fd5 (22:4fd5) cont "rare #MON." done +IF DEF(_YELLOW) +_FanClubPicture1Text:: + text "My cute RAPIDASH." + done + +_FanClubPicture2Text:: + text "My beloved FEAROW." + done +ENDC + _LinkCableHelpText1:: ; 89001 (22:5001) text "TRAINER TIPS" @@ -1172,6 +1195,12 @@ _GotAwayText:: ; 8981f (22:581f) text "Got away safely!" prompt +IF DEF(_YELLOW) +_RunAwayText:: + text "Hurry, get away!" + prompt +ENDC + _ItemsCantBeUsedHereText:: ; 89831 (22:5831) text "Items can't be" line "used here." @@ -1565,6 +1594,13 @@ _WhichFloorText:: ; 89dad (22:5dad) line "you want? " done +IF DEF(_YELLOW) +_SleepingPikachuText1:: + text "There isn't any" + line "response..." + prompt +ENDC + _PartyMenuNormalText:: ; 89dc8 (22:5dc8) text "Choose a #MON." done @@ -1580,7 +1616,11 @@ _PartyMenuBattleText:: ; 89df1 (22:5df1) done _PartyMenuUseTMText:: ; 89e08 (22:5e08) +IF DEF(_YELLOW) + text "Teach to which" +ELSE text "Use TM on which" +ENDC line "#MON?" done @@ -1752,6 +1792,13 @@ _AccessedHoFPCText:: ; 8a0f4 (22:60f4) line "OF FAME List." prompt +IF DEF(_YELLOW) +_SleepingPikachuText2:: + text "There isn't any" + line "response..." + prompt +ENDC + _SwitchOnText:: ; 0x8a131 text "Switch on!" prompt @@ -1805,6 +1852,14 @@ _CantTakeMonText:: ; 0x8a1f6 line "first." prompt +IF DEF(_YELLOW) +_PikachuUnhappyText:: + TX_RAM $cd6d + text "looks" + line "unhappy about it!" + prompt +ENDC + _ReleaseWhichMonText:: ; 0x8a228 text "Release which" line "#MON?" @@ -1926,6 +1981,111 @@ _WillBeTradedText:: ; 8a677 (22:6677) cont "be traded." done +IF DEF(_YELLOW) +_Colosseum3MonsText:: + text "You need 3 #MON" + line "to fight!" + prompt + +_ColosseumMewText:: + text "Sorry, MEW can't" + line "attend!" + prompt + +_ColosseumDifferentMonsText:: + text "Your #MON must" + line "all be different!" + prompt + +_ColosseumMaxL55Text:: + text "No #MON can" + line "exceed L55!" + prompt + +_ColosseumMinL50Text:: + text "All #MON must" + line "be at least L50!" + prompt + +_ColosseumTotalL155Text:: + text "Your total levels" + line "exceed 155!" + prompt + +_ColosseumMaxL30Text:: + text "No #MON can" + line "exceed L30!" + prompt + +_ColosseumMinL25Text:: + text "All #MON must" + line "be at least L25!" + prompt + +_ColosseumTotalL80Text:: + text "Your total levels" + line "exceed 80!" + prompt + +_ColosseumMaxL20Text:: + text "No #MON can" + line "exceed L20!" + prompt + +_ColosseumMinL15Text:: + text "All #MON must" + line "be at least L15!" + prompt + +_ColosseumTotalL50Text:: + text "Your total levels" + line "exceed 50!" + prompt + +_ColosseumHeightText:: + TX_RAM $CD6D + text " is over" + line "6′8″ tall!" + prompt + +_ColosseumWeightText:: + TX_RAM $CD6D + text " weighs" + line "over 44 pounds!" + prompt + +_ColosseumEvolvedText:: + TX_RAM $CD6D + text " is an" + line "evolved #MON!" + prompt + +_ColosseumIneligibleText:: + text "Your opponent is" + line "ineligible." + prompt + +_ColosseumWhereToText:: + text "Where would you" + line "like to go?" + prompt + +_ColosseumPleaseWaitText:: + text "OK, please wait" + line "just a moment." + prompt + +_ColosseumCanceledText:: + text "The link was" + line "canceled." + prompt + +_ColosseumVersionText:: + text "The game versions" + line "don't match." + prompt +ENDC + _Char00Text:: ; 8a696 (22:6696) TX_NUM $FF8C,1,2 text " ERROR." @@ -1934,6 +2094,13 @@ _Char00Text:: ; 8a696 (22:6696) _Char55Text:: ; 8a6a3 (22:66a3) text $4B,"@@" +IF DEF(_YELLOW) +_NoPokemonText:: + text "There are no" + line "#MON here!" + prompt +ENDC + INCLUDE "text/maps/digletts_cave_route_2_entrance.asm" INCLUDE "text/maps/viridian_forest_exit.asm" INCLUDE "text/maps/route_2_house.asm" @@ -1968,6 +2135,9 @@ INCLUDE "text/maps/route_16_gate_upstairs.asm" INCLUDE "text/maps/route_16_house.asm" INCLUDE "text/maps/route_18_gate.asm" INCLUDE "text/maps/route_18_gate_upstairs.asm" +IF DEF(_OPTION_BEACH_HOUSE) +INCLUDE "text/maps/beach_house.asm" +ENDC INCLUDE "text/maps/pokemon_league_gate.asm" INCLUDE "text/maps/victory_road_2f.asm" INCLUDE "text/maps/bills_house.asm" diff --git a/text/credits_text.asm b/text/credits_text.asm index c2c9e429..2c638b9e 100755 --- a/text/credits_text.asm +++ b/text/credits_text.asm @@ -65,10 +65,10 @@ 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 _RED +IF DEF(_RED) db -8, "RED VERSION STAFF@" ENDC -IF _BLUE +IF DEF(_BLUE) db -8, "BLUE VERSION STAFF@" ENDC CredTajiri: ; 74356 (1d:4356) diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm index cd0b1bb5..9e20b7aa 100644 --- a/text/maps/agatha.asm +++ b/text/maps/agatha.asm @@ -23,7 +23,11 @@ _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/beach_house.asm b/text/maps/beach_house.asm new file mode 100644 index 00000000..318b6013 --- /dev/null +++ b/text/maps/beach_house.asm @@ -0,0 +1,103 @@ +_SurfinDudeText1:: + text "Whoa!" + + para "Your PIKACHU knows" + line "how to SURF! So," + cont "I'm not alone..." + + para "Great! You earned" + line "the right to SURF" + cont "with the DUDE!" + + para "Give it a go?" + done + +_SurfinDudeText2:: + text "Come SURF anytime," + line "my friend!" + done + +_SurfinDudeText3:: + text "Wanna go SURF?" + done + +_SurfinDudeText4:: + text "Dogs and burgers" + line "on special today!" + done + +_BeachHousePikachuText:: + text "PIKACHU: Pikaa." + done + +_BeachHouseSign1Text1:: + text "SURFIN' DUDE's" + line "scribbles..." + + para "When I shoot the" + line "tube, the tunes" + cont "hit the groove!" + done + +_BeachHouseSign1Text2:: + text "30 years of waves!" + line "SURFIN' DUDE" + done + +_BeachHouseSign2Text1:: + text "SURFING TIP 1!" + + para "After flips, line" + line "the board up with" + cont "a wave for a cool" + cont "effect!" + done + +_BeachHouseSign2Text2:: + text "SUMMER BEACH HOUSE" + line "#MON welcome!" + done + +_BeachHouseSign3Text1:: + text "SURFING TIP 2!" + + para "Pulling flips in" + line "a jump is totally" + cont "rad!" + done + +_BeachHouseSign3Text2:: + text "The sea unites" + line "all in surfdom!" + done + +_BeachHousePrinterText1:: + text "It's some sort of" + line "a machine...@@" + +_BeachHousePrinterText2:: + text "SUMMER BEACH HOUSE" + line "PRINTER, it says.@@" + +_BeachHousePrinterText3:: + text "The Hi.Score is" + line "shown." + + para "PRINT it out?" + done + +_BeachHousePrinterText4:: + text "SUMMER BEACH HOUSE" + line "PRINTER, it says." + + para "The Hi.Score is" + line "shown." + + para "PRINT it out?" + done + +_BeachHousePrinterText5:: + text "PRINT completed.@@" + +_BeachHousePrinterText6:: + text "PRINT error!@@" diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm index 5963d7ea..3ec1e3f3 100644 --- a/text/maps/bills_house.asm +++ b/text/maps/bills_house.asm @@ -1,3 +1,10 @@ +IF DEF(_YELLOW) +_BillsHouseDontLeaveText:: + text "Whoa, don't go" + line "anywhere, wait!" + done +ENDC + _BillsHouseText_1e865:: ; 8d267 (23:5267) text "Hiya! I'm a" line "#MON..." diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm index 147b23fb..a5b155f2 100644 --- a/text/maps/blues_house.asm +++ b/text/maps/blues_house.asm @@ -29,11 +29,19 @@ _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/daycare_2.asm b/text/maps/daycare_2.asm index ac9720ba..c6478a76 100644 --- a/text/maps/daycare_2.asm +++ b/text/maps/daycare_2.asm @@ -3,7 +3,11 @@ _DayCareMText_56437:: ; 8c000 (23:4000) line "@@" _DayCareMText_5643b:: ; 8c013 (23:4013) +IF DEF(_YELLOW) + text "Come again." +ELSE text "come again." +ENDC done _DayCareMText_56440:: ; 8c020 (23:4020) diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm index ab5b9b15..cb0cc622 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/hall_of_fame.asm @@ -1,6 +1,10 @@ _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 1da4e8f1..35ef3546 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -1,6 +1,10 @@ _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 ad9c8598..0577adf3 100644 --- a/text/maps/mt_moon_1f.asm +++ b/text/maps/mt_moon_1f.asm @@ -115,6 +115,9 @@ _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 f8357f00..64823871 100644 --- a/text/maps/mt_moon_b2f.asm +++ b/text/maps/mt_moon_b2f.asm @@ -1,3 +1,26 @@ +IF DEF(_YELLOW) +_MtMoonJessieJamesText1:: + text "Stop right there!@@" + +_MtMoonJessieJamesText2:: + text "That fossil is" + line "TEAM ROCKET's!" + + para "Surrender now, or" + line "prepare to fight!" + done + +_MtMoonJessieJamesText3:: + text "A" + line "brat beat us?" + prompt + +_MtMoonJessieJamesText4:: + text "TEAM ROCKET, blast" + line "off at the speed" + cont "of light!@@" +ENDC + _MtMoon3Text_49f24:: ; 8095e (20:495e) text "You want the" line "DOME FOSSIL?" @@ -120,4 +143,3 @@ _MtMoon3AfterBattleText5:: ; 80c46 (20:4c46) line "here long before" cont "people came." done - diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm index f5f847d3..7371a312 100644 --- a/text/maps/museum_1f.asm +++ b/text/maps/museum_1f.asm @@ -72,7 +72,11 @@ _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/museum_2f.asm b/text/maps/museum_2f.asm index 7594c797..46238725 100644 --- a/text/maps/museum_2f.asm +++ b/text/maps/museum_2f.asm @@ -33,6 +33,21 @@ _Museum2FText5:: ; 96911 (25:6911) line "soon, I promise!" done +IF DEF(_YELLOW) +_Museum2FPikachuText1:: + text "Your PIKACHU looks" + line "untamed." + cont "May I have it for" + cont "my daughter?" + done + +_Museum2FPikachuText2:: + text "I'd like to get" + line "that PIKACHU off" + cont "you, but it's too" + cont "attached to you." +ENDC + _Museum2FText6:: ; 96933 (25:6933) text "SPACE SHUTTLE" line "COLUMBIA" @@ -43,4 +58,3 @@ _Museum2FText7:: ; 9694b (25:694b) line "fell on MT.MOON." cont "(MOON STONE?)" done - diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm index 8b45742c..58f55b85 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -1,29 +1,60 @@ _OaksLabGaryText1:: ; 94d5b (25:4d5b) - text $53, ": Yo" - line $52, "! Gramps" + text $53,": Yo" + line $52,"! Gramps" cont "isn't around!" + +IF DEF(_YELLOW) + para "I ran here 'cos" + line "he said he had a" + cont "#MON for me." +ENDC done _OaksLabText40:: ; 94d79 (25:4d79) - text $53, ": Heh, I" +IF DEF(_YELLOW) + text $53,": Humph!" + line "I'll get a better" + cont "#MON than you!" + done +ELSE + text $53,": Heh, I" line "don't need to be" cont "greedy like you!" para "Go ahead and" line "choose, ", $52, "!" done +ENDC _OaksLabText41:: ; 94dbd (25:4dbd) - text $53, ": My" +IF DEF(_YELLOW) + text $53,": Heh, my" +ELSE + text $53,": My" +ENDC line "#MON looks a" cont "lot stronger." done _OaksLabText39:: ; 94ddf (25:4ddf) +IF DEF(_YELLOW) + text "That's a #" + line "BALL. There's a" + cont "#MON inside!" + done +ELSE text "Those are #" line "BALLs. They" cont "contain #MON!" done +ENDC + +IF DEF(_YELLOW) +_OaksLabPikachuText:: + text "OAK: Go ahead," + line "it's yours!" + done +ENDC _OaksLabCharmanderText:: ; 94e06 (25:4e06) text "So! You want the" @@ -70,14 +101,26 @@ _OaksLabText_1d2f5:: ; 94ef8 (25:4ef8) line "#MON appears," cont "your #MON can" cont "fight against it!" + +IF DEF(_YELLOW) + para "Afterward, go on" + line "to the next town." +ENDC done _OaksLabText_1d2fa:: ; 94f36 (25:4f36) +IF DEF(_YELLOW) + text "OAK: You should" + line "talk to it and" + cont "see how it feels." + done +ELSE text "OAK: ", $52, "," line "raise your young" cont "#MON by making" cont "it fight!" done +ENDC _OaksLabDeliverParcelText1:: ; 94f69 (25:4f69) text "OAK: Oh, ", $52, "!" @@ -103,7 +146,15 @@ _OaksLabDeliverParcelText2:: ; 9500f (25:500f) para "Ah! This is the" line "custom # BALL" cont "I ordered!" +IF DEF(_YELLOW) + cont "Thanks, ",$52,"!" + + para "By the way, I must" + line "ask you to do" + cont "something for me." +ELSE cont "Thank you!" +ENDC done _OaksLabAroundWorldText:: ; 95045 (25:5045) @@ -132,7 +183,12 @@ _OaksLabGivePokeballsText2:: ; 950f2 (25:50f2) line "#MON appears," cont "it's fair game." +IF DEF(_YELLOW) + para "Just like I showed" + line "you, throw a #" +ELSE para "Just throw a #" +ENDC line "BALL at it and try" line "to catch it!" @@ -188,6 +244,29 @@ _OaksLabRivalWaitingText:: ; 952bb (25:52bb) done _OaksLabChooseMonText:: ; 952df (25:52df) +IF DEF(_YELLOW) + text "OAK: Hmm? ",$53,"?" + line "Why are you here" + cont "already?" + + para "I said for you to" + line "come by later..." + + para "Ah, whatever!" + line "Just wait there." + + para "Look, ",$52,"! Do" + line "you see that ball" + cont "on the table?" + + para "It's called a #" + line "BALL. It holds a" + cont "#MON inside." + + para "You may have it!" + line "Go on, take it!" + done +ELSE text "OAK: ", $53, "?" line "Let me think..." @@ -214,6 +293,7 @@ _OaksLabChooseMonText:: ; 952df (25:52df) cont "but you can have" cont "one! Choose!" done +ENDC _OaksLabRivalInterjectionText:: ; 953dc (25:53dc) text $53, ": Hey!" @@ -222,10 +302,70 @@ _OaksLabRivalInterjectionText:: ; 953dc (25:53dc) done _OaksLabBePatientText:: ; 953fc (25:53fc) +IF DEF(_YELLOW) + text "OAK: Be patient," + line $53,", I'll give" + cont "you one later." + done +ELSE text "OAK: Be patient!" line $53, ", you can" cont "have one too!" done +ENDC + +IF DEF(_YELLOW) +_OaksLabRivalTakesText1:: + text $53,": No way!" + line $52,", I want" + cont "this #MON!" + prompt + +_OaksLabRivalTakesText2:: + text $53," snatched" + line "the #MON!@@" + +_OaksLabRivalTakesText3:: + text "OAK: ",$53,"! What" + line "are you doing?" + prompt + +_OaksLabRivalTakesText4:: + text $53,": Gramps, I" + line "want this one!" + prompt + +_OaksLabRivalTakesText5:: + text "OAK: But, I... Oh," + line "all right then." + cont "That #MON is" + cont "yours." + + para "I was going to" + line "give you one" + cont "anyway..." + + para $52,", come over" + line "here." + done + +_OaksLabOakGivesText:: + text "OAK: ",$52,", this" + line "is the #MON I" + cont "caught earlier." + + para "You can have it." + line "I caught it in" + cont "the wild and it's" + cont "not tame yet." + prompt + +_OaksLabReceivedText:: + text $52," received" + line "a " + TX_RAM $CD6D + text "!@@" +ENDC _OaksLabLeavingText:: ; 95427 (25:5427) text "OAK: Hey! Don't go" @@ -275,20 +415,64 @@ _OaksLabRivalToughenUpText:: ; 95502 (25:5502) line "Smell you later!" done +IF DEF(_YELLOW) +_OaksLabPikachuDislikesPokeballsText1:: + text "OAK: What?" + done + +_OaksLabPikachuDislikesPokeballsText2:: + text "OAK: Would you" + line "look at that!" + + para "It's odd, but it" + line "appears that your" + cont "PIKACHU dislikes" + cont "# BALLs." + + para "You should just" + line "keep it with you." + + para "That should make" + line "it happy!" + + para "You can talk to it" + line "and see how it" + cont "feels about you." + done +ENDC + _OaksLabText21:: ; 95551 (25:5551) text $53, ": Gramps!" done _OaksLabText22:: ; 9555d (25:555d) +IF DEF(_YELLOW) + text $53,": Gramps," + line "my #MON has" + cont "grown stronger!" + cont "Check it out!" + done +ELSE text $53, ": What did" line "you call me for?" done +ENDC _OaksLabText23:: ; 9557b (25:557b) +IF DEF(_YELLOW) + text "OAK: Ah, ",$53,"," + line "good timing!" + + para "I needed to ask" + line "both of you to do" + cont "something for me." + done +ELSE text "OAK: Oh right! I" line "have a request" cont "of you two." done +ENDC _OaksLabText24:: ; 955a8 (25:55a8) text "On the desk there" @@ -416,8 +600,13 @@ _OaksLabText_4421a:: ; 9596d (25:596d) done _OaksLabText_4421f:: ; 959b8 (25:59b8) +IF DEF(_YELLOW) + text "Oh! This is get-" + line "ting even better!" +ELSE text "Ho! This is geting" line "even better!" +ENDC done _OaksLabText_44224:: ; 959d9 (25:59d9) @@ -472,7 +661,11 @@ _OaksLabText_44247:: ; 95b39 (25:5b39) _OaksLabText_4424c:: ; 95b6f (25:5b6f) text "Your #DEX is" +IF DEF(_YELLOW) + line "fully complete!" +ELSE line "entirely complete!" +ENDC cont "Congratulations!" done diff --git a/text/maps/pewter_gym_2.asm b/text/maps/pewter_gym_2.asm index a503f755..433fd649 100644 --- a/text/maps/pewter_gym_2.asm +++ b/text/maps/pewter_gym_2.asm @@ -3,6 +3,23 @@ _PewterGymText_5c4a3:: ; 98000 (26:4000) line "kinds of trainers" cont "in the world!" +IF DEF(_YELLOW) + para "Some raise #MON" + line "for fights. Some" + cont "see them as pets." + + para "I'm in training to" + line "become a #MON" + cont "breeder." + + para "If you take your" + line "#MON training" + cont "seriously, go" + cont "visit the GYM in" + cont "CERULEAN and test" + cont "your abilities!" + done +ELSE para "You appear to be" line "very gifted as a" cont "#MON trainer!" @@ -11,6 +28,7 @@ _PewterGymText_5c4a3:: ; 98000 (26:4000) line "CERULEAN and test" cont "your abilities!" done +ENDC _TM34PreReceiveText:: ; 98092 (26:4092) text "Wait! Take this" @@ -72,7 +90,11 @@ _PewterGymText_5c4c1:: ; 98232 (26:4232) para "The technique" line "FLASH can now be" +IF DEF(_YELLOW) + cont "used anytime!" +ELSE cont "used any time!" +ENDC prompt _PewterGymBattleText1:: ; 982ae (26:42ae) @@ -141,3 +163,18 @@ _PewterGymText_5c529:: ; 9849f (26:449f) cont "champ material!" done +IF DEF(_YELLOW) +_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 +ENDC diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm index a33974db..71760b7b 100644 --- a/text/maps/pewter_mart.asm +++ b/text/maps/pewter_mart.asm @@ -1,5 +1,9 @@ _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 4493c079..114fed16 100644 --- a/text/maps/pewter_pokecenter.asm +++ b/text/maps/pewter_pokecenter.asm @@ -8,8 +8,22 @@ _PewterPokecenterText1:: ; 98704 (26:4704) para "Scram!" done +IF DEF(_YELLOW) +_PewterPokecenterText2:: + text "#MON CENTERS" + line "are wonderful!" + + para "They heal #MON" + line "completely." + + para "Even conditions" + line "like sleep, burn," + cont "poison and others" + cont "are cured." + done +ENDC + _PewterPokecenterText5:: ; 98744 (26:4744) text "JIGGLYPUFF: Puu" line "pupuu!" done - diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm index 729c5b46..16cf5129 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -1,7 +1,11 @@ _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" @@ -10,10 +14,22 @@ _MomWakeUpText:: done _MomHealText1:: +IF DEF(_YELLOW) + text "MOM: ",$52,", if" + line "your drive your" + cont "#MON too hard," + cont "they'll dislike" + cont "you." + + 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 ecf01ec8..e069e4a9 100644 --- a/text/maps/rocket_hideout_b4f.asm +++ b/text/maps/rocket_hideout_b4f.asm @@ -1,3 +1,28 @@ +IF DEF(_YELLOW) +_RocketHideoutJessieJamesText1:: + text "Not another step," + line "brat!@@" + +_RocketHideoutJessieJamesText2:: + text "How dare you" + line "humiliate us at" + cont "MT.MOON!" + + para "It's payback time," + line "you brat!" + done + +_RocketHideoutJessieJamesText3:: + text "Such" + line "a dreadful twerp!" + prompt + +_RocketHideoutJessieJamesText4:: + text "Looks like TEAM" + line "ROCKET's blasting" + cont "off again!@@" +ENDC + _RocketHideout4Text_4557a:: ; 8223e (20:623e) text "So! I must say, I" line "am impressed you" diff --git a/text/maps/route_10.asm b/text/maps/route_10.asm index f6e4e394..795f7e69 100644 --- a/text/maps/route_10.asm +++ b/text/maps/route_10.asm @@ -33,7 +33,11 @@ _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 ef71d279..12925104 100644 --- a/text/maps/route_12.asm +++ b/text/maps/route_12.asm @@ -109,7 +109,11 @@ _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 3d22e389..3e8fb60c 100644 --- a/text/maps/route_12_gate_upstairs.asm +++ b/text/maps/route_12_gate_upstairs.asm @@ -5,7 +5,11 @@ _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 d58630a8..b542274e 100644 --- a/text/maps/route_14.asm +++ b/text/maps/route_14.asm @@ -10,7 +10,11 @@ _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 d98aaa12..ec77ec6f 100644 --- a/text/maps/route_16.asm +++ b/text/maps/route_16.asm @@ -19,7 +19,11 @@ _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 d07c3a86..b053b473 100644 --- a/text/maps/route_17.asm +++ b/text/maps/route_17.asm @@ -133,7 +133,11 @@ _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 5ce0b879..9935ce80 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -59,9 +59,15 @@ _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 fb65cad8..d73611f2 100644 --- a/text/maps/route_25.asm +++ b/text/maps/route_25.asm @@ -1,3 +1,33 @@ +IF DEF(_YELLOW) +_Route25DamianText1:: + text "I'm not good at" + line "raising #MON." + + para "I should release" + line "my CHARMANDER" + cont "because I haven't" + cont "raised it well..." + + para "If you promise me" + line "you'll care for" + cont "it, it's yours." + done + +_Route25DamianText2:: + text "Take good care of" + line "my CHARMANDER!@@" + +_Route25DamianText3:: + text "Oh... I'd better" + line "release it then." + done + +_Route25DamianText4:: + text "How's CHARMANDER" + line "doing?" + done +ENDC + _Route25BattleText1:: ; 9421e (25:421e) text "Local trainers" line "come here to" @@ -56,8 +86,13 @@ _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 248a11dd..95612425 100644 --- a/text/maps/route_3.asm +++ b/text/maps/route_3.asm @@ -66,8 +66,13 @@ _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 7d0a6097..3a54f461 100644 --- a/text/maps/route_6.asm +++ b/text/maps/route_6.asm @@ -1,3 +1,38 @@ +IF DEF(_YELLOW) +_Route6BattleText1:: + text "I'm doing this" + line "out of love." + cont "Leave me alone!" + done + +_Route6EndBattleText1:: + text "No," + line "this can't be..." + prompt + +_Route6AfterBattleText1:: + text "My love will leave" + line "me in disgust." + done + +_Route6BattleText2:: + text "I'm training for" + line "my love. Don't" + cont "bother me!" + done + +_Route6EndBattleText2:: + text "My" + line "textbook never..." + prompt + +_Route6AfterBattleText2:: + text "Now I understand," + line "#MON isn't" + cont "about calculated" + cont "numbers." + done +ELSE _Route6BattleText1:: ; 8dc38 (23:5c38) text "Who's there?" line "Quit listening in" @@ -24,6 +59,7 @@ _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 1f3f74fd..62e2aff3 100644 --- a/text/maps/route_8.asm +++ b/text/maps/route_8.asm @@ -104,7 +104,11 @@ _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/route_9.asm b/text/maps/route_9.asm index 978a5a3f..353eb779 100644 --- a/text/maps/route_9.asm +++ b/text/maps/route_9.asm @@ -15,6 +15,23 @@ _Route9AfterBattleText1:: ; 8e2c8 (23:62c8) cont "dark tunnel ahead." done +IF DEF(_YELLOW) +_Route9BattleTextAJ:: + text "I aim to be the" + line "ultimate trainer!" + done + +_Route9EndBattleTextAJ:: + text "My" + line "SANDSHREW lost?" + prompt + +_Route9AfterBattleTextAJ:: + text "I'll restart my" + line "100-win streak" + cont "with SANDSHREW." +ENDC + _Route9BattleText2:: ; 8e2ff (23:62ff) text "Who's that walking" line "with those good" diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm index 119d2301..79f70ea4 100644 --- a/text/maps/safari_zone_entrance.asm +++ b/text/maps/safari_zone_entrance.asm @@ -92,3 +92,49 @@ _SafariZoneEntranceText_753f0:: ; 9e993 (27:6993) line "regular here!" done +IF DEF(_OPTION_LOWCOST_SAFARI) +_SafariZoneLowCostText1:: + db 0 + para "Oh, all right, pay" + line "me what you have." + prompt + +_SafariZoneLowCostText2:: + text "But, I can't give" + line "you all 30 BALLs." + done + +_SafariZoneLowCostText3:: + db 0 + para "You're persistent," + line "aren't you?" + + para "OK, you can go in" + line "for free, but" + cont "just this once!@@" + +_SafariZoneLowCostText4:: + db 0 + done + +_SafariZoneLowCostText5:: + text "I'm sorry, but you" + line "have to pay to" + cont "enter." + done + +_SafariZoneLowCostText6:: + text "You can't enter" + line "without paying!" + done + +_SafariZoneLowCostText7:: + text "I said, no money," + line "no entry!" + done + +_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 0212a7dd..b7db1751 100644 --- a/text/maps/saffron_gates.asm +++ b/text/maps/saffron_gates.asm @@ -3,7 +3,11 @@ _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 @@ -18,7 +22,11 @@ _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/school.asm b/text/maps/school.asm index ce0c0175..9bdd9004 100644 --- a/text/maps/school.asm +++ b/text/maps/school.asm @@ -4,6 +4,14 @@ _SchoolText1:: ; 95d15 (25:5d15) cont "my notes." done +IF DEF(_YELLOW) +_SchoolText3:: + text "Sis says #MON" + line "will become tame" + cont "if you treat them" + cont "nicely." +ENDC + _SchoolText2:: ; 95d40 (25:5d40) text "Okay!" @@ -11,4 +19,3 @@ _SchoolText2:: ; 95d40 (25:5d40) line "the blackboard" cont "carefully!" done - diff --git a/text/maps/silph_co_10f.asm b/text/maps/silph_co_10f.asm index a5a3877e..75aa6003 100644 --- a/text/maps/silph_co_10f.asm +++ b/text/maps/silph_co_10f.asm @@ -41,3 +41,28 @@ _SilphCo10AfterBattleText2:: ; 84e66 (21:4e66) cont "Then go on home!" done +IF DEF(_YELLOW) +_SilphCoJessieJamesText1:: + text "Hold it right" + line "there, brat!@@" + +_SilphCoJessieJamesText2:: + text "Our BOSS is in a" + line "meeting!" + + para "You better not" + line "disturb him!" + done + +_SilphCoJessieJamesText3:: + text "Like" + line "always..." + prompt + +_SilphCoJessieJamesText4:: + text "TEAM ROCKET, blast" + line "off at the speed" + cont "of light!" + + para "Again...@@" +ENDC diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index caacd757..3dbeee95 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -58,7 +58,11 @@ _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" @@ -70,7 +74,11 @@ _SilphCo11Text3:: ; 85075 (21:5075) 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 8096d806..4437880c 100644 --- a/text/maps/silph_co_2f.asm +++ b/text/maps/silph_co_2f.asm @@ -72,7 +72,11 @@ _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_1.asm b/text/maps/silph_co_5f_1.asm index 8a406e67..7435c910 100644 --- a/text/maps/silph_co_5f_1.asm +++ b/text/maps/silph_co_5f_1.asm @@ -47,6 +47,10 @@ _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 diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm index b3c92aaf..5b56ad43 100644 --- a/text/maps/silph_co_7f.asm +++ b/text/maps/silph_co_7f.asm @@ -79,7 +79,11 @@ _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 @@ -167,7 +171,11 @@ _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 5909c8b9..59828a51 100644 --- a/text/maps/ss_anne_6.asm +++ b/text/maps/ss_anne_6.asm @@ -47,7 +47,11 @@ _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 daef3e4a..2a770464 100644 --- a/text/maps/ss_anne_7.asm +++ b/text/maps/ss_anne_7.asm @@ -27,7 +27,11 @@ _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) @@ -40,7 +44,11 @@ _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 e133fc2c..c96a7581 100644 --- a/text/maps/ss_anne_9.asm +++ b/text/maps/ss_anne_9.asm @@ -1,5 +1,9 @@ _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/viridian_forest.asm b/text/maps/viridian_forest.asm index 9b0f6d99..aa6ab4ab 100644 --- a/text/maps/viridian_forest.asm +++ b/text/maps/viridian_forest.asm @@ -9,7 +9,11 @@ _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) @@ -62,6 +66,42 @@ _ViridianFrstAfterBattleText3:: ; 80475 (20:4475) cont "dropped!" done +if DEF(_YELLOW) +_ViridianForestBattleTextPikaGirl:: + text "Hi, do you have a" + line "PIKACHU?" + done + +_ViridianForestEndBattleTextPikaGirl:: + text "Oh no," + line "really?" + prompt + +_ViridianForestAfterBattleTextPikaGirl:: + text "I looked forever," + line "but I never found" + cont "a PIKACHU here!" + done + +_ViridianForestBattleTextSamurai:: + text "I'm gonna be the" + line "best. You just" + cont "can't beat me!" + done + +_ViridianForestEndBattleTextSamurai:: + text "After" + line "all I did..." + prompt + +_ViridianForestAfterBattleTextSamurai:: + text "A METAPOD is cool" + line "because its" + cont "attack is its" + cont "defense!" + done +ENDC + _ViridianForestText8:: ; 804c7 (20:44c7) text "I ran out of #" line "BALLs to catch" diff --git a/text/maps/viridian_forest_entrance.asm b/text/maps/viridian_forest_entrance.asm index dcba02b4..770f2b5b 100644 --- a/text/maps/viridian_forest_entrance.asm +++ b/text/maps/viridian_forest_entrance.asm @@ -6,9 +6,19 @@ _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." + + para "Look for other" + 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 e1828c32..10a2a597 100644 --- a/text/maps/viridian_gym.asm +++ b/text/maps/viridian_gym.asm @@ -38,7 +38,11 @@ _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) @@ -205,7 +209,11 @@ _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 6cddaeaf..ed3343f1 100644 --- a/text/maps/viridian_mart.asm +++ b/text/maps/viridian_mart.asm @@ -38,12 +38,23 @@ 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/version.asm b/version.asm deleted file mode 100644 index 7d9fa036..00000000 --- a/version.asm +++ /dev/null @@ -1,11 +0,0 @@ -check_ver: MACRO -if !def(\1) -\1 EQU 0 -endc -ENDM - - check_ver _RED - check_ver _BLUE - check_ver _JAPAN - check_ver _GREEN - check_ver _YELLOW @@ -510,6 +510,9 @@ wPlayerSpinWhileMovingUpOrDownAnimDeltaY:: ; cd3d wHiddenObjectFunctionArgument:: ; cd3d +wSubtrahend:: ; cd3d +; subtract (BCD) wSubtrahend, wSubtrahend+1, wSubtrahend+2 + wWhichTrade:: ; cd3d ; which entry from TradeMons to select @@ -1 +1,3 @@ _YELLOW EQU 1 +_OPTION_BEACH_HOUSE EQU 1 +_OPTION_LOWCOST_SAFARI EQU 1 |
