diff options
Diffstat (limited to 'data')
72 files changed, 569 insertions, 383 deletions
diff --git a/data/collision.asm b/data/collision.asm new file mode 100644 index 00000000..78579242 --- /dev/null +++ b/data/collision.asm @@ -0,0 +1,24 @@ +Underground_Coll:: INCBIN "gfx/tilesets/underground.tilecoll" +Overworld_Coll:: INCBIN "gfx/tilesets/overworld.tilecoll" +RedsHouse1_Coll:: +RedsHouse2_Coll:: INCBIN "gfx/tilesets/reds_house.tilecoll" +Mart_Coll:: +Pokecenter_Coll:: INCBIN "gfx/tilesets/pokecenter.tilecoll" +Dojo_Coll:: +Gym_Coll:: INCBIN "gfx/tilesets/gym.tilecoll" +Forest_Coll:: INCBIN "gfx/tilesets/forest.tilecoll" +House_Coll:: INCBIN "gfx/tilesets/house.tilecoll" +ForestGate_Coll:: +Museum_Coll:: +Gate_Coll:: INCBIN "gfx/tilesets/gate.tilecoll" +Ship_Coll:: INCBIN "gfx/tilesets/ship.tilecoll" +ShipPort_Coll:: INCBIN "gfx/tilesets/ship_port.tilecoll" +Cemetery_Coll:: INCBIN "gfx/tilesets/cemetery.tilecoll" +Interior_Coll:: INCBIN "gfx/tilesets/interior.tilecoll" +Cavern_Coll:: INCBIN "gfx/tilesets/cavern.tilecoll" +Lobby_Coll:: INCBIN "gfx/tilesets/lobby.tilecoll" +Mansion_Coll:: INCBIN "gfx/tilesets/mansion.tilecoll" +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" diff --git a/data/facing.asm b/data/facing.asm new file mode 100644 index 00000000..6906002e --- /dev/null +++ b/data/facing.asm @@ -0,0 +1,57 @@ +SpriteFacingAndAnimationTable: ; 4000 (1:4000) + dw SpriteFacingDownAndStanding, SpriteOAMParameters ; facing down, walk animation frame 0 + dw SpriteFacingDownAndWalking, SpriteOAMParameters ; facing down, walk animation frame 1 + dw SpriteFacingDownAndStanding, SpriteOAMParameters ; facing down, walk animation frame 2 + dw SpriteFacingDownAndWalking, SpriteOAMParametersFlipped ; facing down, walk animation frame 3 + dw SpriteFacingUpAndStanding, SpriteOAMParameters ; facing up, walk animation frame 0 + dw SpriteFacingUpAndWalking, SpriteOAMParameters ; facing up, walk animation frame 1 + dw SpriteFacingUpAndStanding, SpriteOAMParameters ; facing up, walk animation frame 2 + dw SpriteFacingUpAndWalking, SpriteOAMParametersFlipped ; facing up, walk animation frame 3 + dw SpriteFacingLeftAndStanding, SpriteOAMParameters ; facing left, walk animation frame 0 + dw SpriteFacingLeftAndWalking, SpriteOAMParameters ; facing left, walk animation frame 1 + dw SpriteFacingLeftAndStanding, SpriteOAMParameters ; facing left, walk animation frame 2 + dw SpriteFacingLeftAndWalking, SpriteOAMParameters ; facing left, walk animation frame 3 + dw SpriteFacingLeftAndStanding, SpriteOAMParametersFlipped ; facing right, walk animation frame 0 + dw SpriteFacingLeftAndWalking, SpriteOAMParametersFlipped ; facing right, walk animation frame 1 + dw SpriteFacingLeftAndStanding, SpriteOAMParametersFlipped ; facing right, walk animation frame 2 + dw SpriteFacingLeftAndWalking, SpriteOAMParametersFlipped ; facing right, walk animation frame 3 + dw SpriteFacingDownAndStanding, SpriteOAMParameters ; --- + dw SpriteFacingDownAndStanding, SpriteOAMParameters ; This table is used for sprites $a and $b. + dw SpriteFacingDownAndStanding, SpriteOAMParameters ; All orientation and animation parameters + dw SpriteFacingDownAndStanding, SpriteOAMParameters ; lead to the same result. Used for immobile + dw SpriteFacingDownAndStanding, SpriteOAMParameters ; sprites like items on the ground + dw SpriteFacingDownAndStanding, SpriteOAMParameters ; --- + dw SpriteFacingDownAndStanding, SpriteOAMParameters + dw SpriteFacingDownAndStanding, SpriteOAMParameters + dw SpriteFacingDownAndStanding, SpriteOAMParameters + dw SpriteFacingDownAndStanding, SpriteOAMParameters + dw SpriteFacingDownAndStanding, SpriteOAMParameters + dw SpriteFacingDownAndStanding, SpriteOAMParameters + dw SpriteFacingDownAndStanding, SpriteOAMParameters + dw SpriteFacingDownAndStanding, SpriteOAMParameters + dw SpriteFacingDownAndStanding, SpriteOAMParameters + dw SpriteFacingDownAndStanding, SpriteOAMParameters + +SpriteFacingDownAndStanding: ; 4080 (1:4080) + db $00,$01,$02,$03 +SpriteFacingDownAndWalking: ; 4084 (1:4084) + db $80,$81,$82,$83 +SpriteFacingUpAndStanding: ; 4088 (1:4088) + db $04,$05,$06,$07 +SpriteFacingUpAndWalking: ; 408c (1:408c) + db $84,$85,$86,$87 +SpriteFacingLeftAndStanding: ; 4090 (1:4090) + db $08,$09,$0a,$0b +SpriteFacingLeftAndWalking: ; 4094 (1:4094) + db $88,$89,$8a,$8b + +SpriteOAMParameters: ; 4098 (1:4098) + db $00,$00, $00 ; top left + db $00,$08, $00 ; top right + db $08,$00, OAMFLAG_CANBEMASKED ; bottom left + db $08,$08, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right +SpriteOAMParametersFlipped: ; 40a4 (1:40a4) + db $00,$08, OAMFLAG_VFLIPPED + db $00,$00, OAMFLAG_VFLIPPED + db $08,$08, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED + db $08,$00, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 11a5cf5a..c8d89102 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -263,7 +263,7 @@ MapHSPointers: ; c8f5 (3:48f5) ; a) Map_ID = $FF ; b) Map_ID ≠ currentMapID ; -; This Data is loaded into RAM at $D5CE-$D5F?. (W_MISSABLEOBJECTLIST) +; This Data is loaded into RAM at wd5ce-$D5F?. (W_MISSABLEOBJECTLIST) ; These constants come from the bytes for Predef functions: Hide equ $11 diff --git a/data/sgb_border.asm b/data/sgb_border.asm index 716a991e..5a0bbb2d 100755 --- a/data/sgb_border.asm +++ b/data/sgb_border.asm @@ -55,8 +55,8 @@ ENDC SGBBorderGraphics: ; 72fe8 (1c:6fe8) IF _RED - INCBIN "gfx/red/sgbborder.w128.2bpp" + INCBIN "gfx/red/sgbborder.2bpp" ENDC IF _BLUE - INCBIN "gfx/blue/sgbborder.w128.2bpp" + INCBIN "gfx/blue/sgbborder.2bpp" ENDC diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm index 92bea812..3e5e3f0b 100755 --- a/data/sgb_packets.asm +++ b/data/sgb_packets.asm @@ -1,142 +1,298 @@ +ATTR_BLK: MACRO +; This is a command macro. +; Use ATTR_BLK_DATA for data sets. + db ($4 << 3) + ((\1 * 6) / 16 + 1) + db \1 +ENDM +ATTR_BLK_DATA: MACRO + db \1 ; which regions are affected + db \2 + (\3 << 2) + (\4 << 4) ; palette for each region + db \5, \6, \7, \8 ; x1, y1, x2, y2 +ENDM + +PAL_SET: MACRO + db ($a << 3) + 1 + dw \1, \2, \3, \4 + ds 7 +ENDM + +PAL_TRN: MACRO + db ($b<< 3) + 1 + ds 15 +ENDM + +MLT_REQ: MACRO + db ($11 << 3) + 1 + db \1 - 1 + ds 14 +ENDM + +CHR_TRN: MACRO + db ($13 << 3) + 1 + db \1 + (\2 << 1) + ds 14 +ENDM + +PCT_TRN: MACRO + db ($14 << 3) + 1 + ds 15 +ENDM + +MASK_EN: MACRO + db ($17 << 3) + 1 + db \1 + ds 14 +ENDM + +DATA_SND: MACRO + db ($f << 3) + 1 + dw \1 ; address + db \2 ; bank + db \3 ; length (1-11) +ENDM + BlkPacket_WholeScreen: ; 7219e (1c:619e) - db $21,$01,$03,$00,$00,$00,$13,$11,$00,$00,$00,$00,$00,$00,$00,$00 + ATTR_BLK 1 + ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,17 + ds 8 + db $03,$00,$00,$13,$11,$00,$00 BlkPacket_Battle: ; 721b5 (1c:61b5) - db $22,$05,$07,$0a,$00,$0c,$13,$11,$03,$05,$01,$00,$0a,$03,$03,$00 - db $0a,$07,$13,$0a,$03,$0a,$00,$04,$08,$0b,$03,$0f,$0b,$00,$13,$06 - db $03,$00,$00,$13,$0b,$00,$03,$00,$0c,$13,$11,$02,$03,$01,$00,$0a - db $03,$01,$03,$0a,$08,$13,$0a,$00,$03,$00,$04,$08,$0b,$02,$03,$0b - db $00,$13,$07,$03,$00 + ATTR_BLK 5 + ATTR_BLK_DATA %111, 2,2,0, 00,12, 19,17 + ATTR_BLK_DATA %011, 1,1,0, 01,00, 10,03 + ATTR_BLK_DATA %011, 0,0,0, 10,07, 19,10 + ATTR_BLK_DATA %011, 2,2,0, 00,04, 08,11 + ATTR_BLK_DATA %011, 3,3,0, 11,00, 19,06 + + db $03,$00,$00,$13,$0b,$00 + db $03,$00,$0c,$13,$11,$02 + db $03,$01,$00,$0a,$03,$01 + db $03,$0a,$08,$13,$0a,$00 + db $03,$00,$04,$08,$0b,$02 + db $03,$0b,$00,$13,$07,$03 + db $00 BlkPacket_StatusScreen: ; 721fa (1c:61fa) - db $21,$01,$07,$05,$01,$00,$07,$06,$00,$00,$00,$00,$00,$00,$00,$00 - db $02,$00,$00,$11,$00,$03,$01,$00,$07,$06,$01,$03,$01,$07,$13,$11 - db $00,$03,$08,$00,$13,$06,$00,$00 + ATTR_BLK 1 + ATTR_BLK_DATA %111, 1,1,0, 01,00, 07,06 + ds 8 + + db $02,$00,$00,$11,$00,$03 + db $01,$00,$07,$06,$01,$03 + db $01,$07,$13,$11,$00,$03 + db $08,$00,$13,$06,$00,$00 BlkPacket_Pokedex: ; 72222 (1c:6222) - db $21,$01,$07,$05,$01,$01,$08,$08,$00,$00,$00,$00,$00,$00,$00,$00 - db $02,$00,$00,$11,$00,$01,$00,$01,$13,$00,$03,$01,$01,$08,$08,$01 - db $03,$01,$09,$08,$11,$00,$03,$09,$01,$13,$11,$00,$00 + ATTR_BLK 1 + ATTR_BLK_DATA %111, 1,1,0, 01,01, 08,08 + ds 8 + + db $02,$00,$00,$11,$00,$01 + db $00,$01,$13,$00,$03,$01 + db $01,$08,$08,$01,$03,$01 + db $09,$08,$11,$00,$03,$09 + db $01,$13,$11,$00,$00 BlkPacket_Slots: ; 7224f (1c:624f) - db $22,$05,$03,$05,$00,$00,$13,$0b,$03,$0a,$00,$04,$13,$09,$02,$0f - db $00,$06,$13,$07,$03,$00,$04,$04,$0f,$09,$03,$00,$00,$0c,$13,$11 - db $03,$00,$00,$13,$0b,$01,$03,$00,$04,$13,$09,$02,$03,$00,$06,$13 - db $07,$03,$03,$04,$04,$0f,$09,$00,$03,$00,$0c,$13,$11,$00,$00 + ATTR_BLK 5 + ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,11 + ATTR_BLK_DATA %011, 2,2,0, 00,04, 19,09 + ATTR_BLK_DATA %010, 3,3,0, 00,06, 19,07 + ATTR_BLK_DATA %011, 0,0,0, 04,04, 15,09 + ATTR_BLK_DATA %011, 0,0,0, 00,12, 19,17 + + db $03,$00,$00,$13,$0b,$01 + db $03,$00,$04,$13,$09,$02 + db $03,$00,$06,$13,$07,$03 + db $03,$04,$04,$0f,$09,$00 + db $03,$00,$0c,$13,$11,$00 + db $00 BlkPacket_Titlescreen: ; 7228e (1c:628e) - db $22,$03,$03,$00,$00,$00,$13,$07,$02,$05,$00,$08,$13,$09,$03,$0a - db $00,$0a,$13,$11,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $03,$00,$00,$13,$07,$00,$03,$00,$08,$13,$09,$01,$03,$00,$0a,$13 - db $11,$02,$00 + ATTR_BLK 3 + ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 + ATTR_BLK_DATA %010, 1,1,0, 00,08, 19,09 + ATTR_BLK_DATA %011, 2,2,0, 00,10, 19,17 + ds 12 + + db $03,$00,$00,$13,$07,$00 + db $03,$00,$08,$13,$09,$01 + db $03,$00,$0a,$13,$11,$02 + db $00 BlkPacket_NidorinoIntro: ; 722c1 (1c:62c1) - db $22,$03,$03,$05,$00,$00,$13,$03,$03,$00,$00,$04,$13,$0d,$03,$05 - db $00,$0e,$13,$11,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $03,$00,$00,$13,$03,$01,$03,$00,$04,$13,$0d,$00,$03,$00,$0e,$13 - db $11,$01,$00 + ATTR_BLK 3 + ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 + ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13 + ATTR_BLK_DATA %011, 1,1,0, 00,14, 19,17 + ds 12 + + db $03,$00,$00,$13,$03,$01 + db $03,$00,$04,$13,$0d,$00 + db $03,$00,$0e,$13,$11,$01 + db $00 BlkPacket_PartyMenu: ; 722f4 (1c:62f4) - db $23,$07,$06,$10,$01,$00,$02,$0c,$02,$00,$05,$01,$0b,$01,$02,$00 - db $05,$03,$0b,$03,$02,$00,$05,$05,$0b,$05,$02,$00,$05,$07,$0b,$07 - db $02,$00,$05,$09,$0b,$09,$02,$00,$05,$0b,$0b,$0b,$00,$00,$00,$00 - db $02,$00,$00,$11,$01,$03,$01,$00,$02,$0c,$00,$03,$01,$0d,$02,$11 - db $01,$03,$03,$00,$13,$11,$01,$03,$0c,$00,$12,$01,$00,$03,$0c,$02 - db $12,$03,$00,$03,$0c,$04,$12,$05,$00,$03,$0c,$06,$12,$07,$00,$03 - db $0c,$08,$12,$09,$00,$03,$0c,$0a,$12,$0b,$00,$00 + ATTR_BLK 7 + ATTR_BLK_DATA %110, 0,0,1, 01,00, 02,12 + ATTR_BLK_DATA %010, 0,0,0, 05,01, 11,01 + ATTR_BLK_DATA %010, 0,0,0, 05,03, 11,03 + ATTR_BLK_DATA %010, 0,0,0, 05,05, 11,05 + ATTR_BLK_DATA %010, 0,0,0, 05,07, 11,07 + ATTR_BLK_DATA %010, 0,0,0, 05,09, 11,09 + ATTR_BLK_DATA %010, 0,0,0, 05,11, 11,11 + ds 4 + + db $02,$00,$00,$11,$01,$03 + db $01,$00,$02,$0c,$00,$03 + db $01,$0d,$02,$11,$01,$03 + db $03,$00,$13,$11,$01,$03 + db $0c,$00,$12,$01,$00,$03 + db $0c,$02,$12,$03,$00,$03 + db $0c,$04,$12,$05,$00,$03 + db $0c,$06,$12,$07,$00,$03 + db $0c,$08,$12,$09,$00,$03 + db $0c,$0a,$12,$0b,$00,$00 BlkPacket_TrainerCard: ; 72360 (1c:6360) - db $24,$0a,$02,$00,$03,$0c,$04,$0d,$02,$05,$07,$0c,$08,$0d,$02,$0f - db $0b,$0c,$0c,$0d,$02,$0a,$10,$0b,$11,$0c,$02,$05,$0e,$0d,$0f,$0e - db $02,$0f,$10,$0d,$11,$0e,$02,$0a,$03,$0f,$04,$10,$02,$0f,$07,$0f - db $08,$10,$02,$0a,$0b,$0f,$0c,$10,$02,$05,$0f,$0f,$10,$10,$00,$00 - db $03,$03,$0c,$04,$0d,$00,$03,$07,$0c,$08,$0d,$01,$03,$0b,$0c,$0c - db $0d,$03,$03,$10,$0b,$11,$0c,$02,$03,$0e,$0d,$0f,$0e,$01,$03,$10 - db $0d,$11,$0e,$03,$03,$03,$0f,$04,$10,$02,$03,$07,$0f,$08,$10,$03 - db $03,$0b,$0f,$0c,$10,$02,$03,$0f,$0f,$10,$10,$01,$00 + ATTR_BLK 10 + ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13 + ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13 + ATTR_BLK_DATA %010, 3,3,0, 11,12, 12,13 + ATTR_BLK_DATA %010, 2,2,0, 16,11, 17,12 + ATTR_BLK_DATA %010, 1,1,0, 14,13, 15,14 + ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,14 + ATTR_BLK_DATA %010, 2,2,0, 03,15, 04,16 + ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16 + ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16 + ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16 + ds 2 + + db $03,$03,$0c,$04,$0d,$00 + db $03,$07,$0c,$08,$0d,$01 + db $03,$0b,$0c,$0c,$0d,$03 + db $03,$10,$0b,$11,$0c,$02 + db $03,$0e,$0d,$0f,$0e,$01 + db $03,$10,$0d,$11,$0e,$03 + db $03,$03,$0f,$04,$10,$02 + db $03,$07,$0f,$08,$10,$03 + db $03,$0b,$0f,$0c,$10,$02 + db $03,$0f,$0f,$10,$10,$01 + db $00 BlkPacket_GameFreakIntro: ; 723dd (1c:63dd) - db $22,$03,$07,$05,$05,$0b,$07,$0d,$02,$0a,$08,$0b,$09,$0d,$03,$0f - db $0c,$0b,$0e,$0d,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $03,$00,$00,$13,$0a,$00,$03,$00,$0b,$04,$0d,$00,$03,$05,$0b,$07 - db $0d,$01,$03,$08,$0b,$13,$0d,$00,$03,$00,$0e,$13,$11,$00,$03,$08 - db $0b,$09,$0d,$02,$03,$0c,$0b,$0e,$0d,$03,$00 - -PalPacket_Empty: ; 72428 (1c:6428) - db $51,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_PartyMenu: ; 72438 (1c:6438) - db $51,PAL_MEWMON,$00,PAL_GREENBAR,$00,PAL_YELLOWBAR,$00,PAL_REDBAR,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_Black: ; 72448 (1c:6448) - db $51,PAL_BLACK,$00,PAL_BLACK,$00,PAL_BLACK,$00,PAL_BLACK,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_TownMap: ; 72458 (1c:6458) - db $51,PAL_TOWNMAP,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_Pokedex: ; 72468 (1c:6468) - db $51,PAL_BROWNMON,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_Slots: ; 72478 (1c:6478) - db $51,PAL_SLOTS1,$00,PAL_SLOTS2,$00,PAL_SLOTS3,$00,PAL_SLOTS4,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_Titlescreen: ; 72488 (1c:6488) - db $51,PAL_LOGO2,$00,PAL_LOGO1,$00,PAL_MEWMON,$00,PAL_PURPLEMON,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_TrainerCard: ; 72498 (1c:6498) - db $51,PAL_MEWMON,$00,PAL_BADGE,$00,PAL_REDMON,$00,PAL_YELLOWMON,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_Generic: ; 724a8 (1c:64a8) - db $51,PAL_MEWMON,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_NidorinoIntro: ; 724b8 (1c:64b8) - db $51,PAL_PURPLEMON,$00,PAL_BLACK,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_GameFreakIntro: ; 724c8 (1c:64c8) - db $51,PAL_GAMEFREAK,$00,PAL_REDMON,$00,PAL_VIRIDIAN,$00,PAL_BLUEMON,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_724d8: ; 724d8 (1c:64d8) - db $59,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_724e8: ; 724e8 (1c:64e8) - db $89,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_724f8: ; 724f8 (1c:64f8) - db $89,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_72508: ; 72508 (1c:6508) - db $99,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_72518: ; 72518 (1c:6518) - db $A1,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_72528: ; 72528 (1c:6528) - db $B9,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_72538: ; 72538 (1c:6538) - db $B9,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_72548: ; 72548 (1c:6548) - db $79,$5D,$08,$00,$0B,$8C,$D0,$F4,$60,$00,$00,$00,$00,$00,$00,$00 - -PalPacket_72558: ; 72558 (1c:6558) - db $79,$52,$08,$00,$0B,$A9,$E7,$9F,$01,$C0,$7E,$E8,$E8,$E8,$E8,$E0 - -PalPacket_72568: ; 72568 (1c:6568) - db $79,$47,$08,$00,$0B,$C4,$D0,$16,$A5,$CB,$C9,$05,$D0,$10,$A2,$28 - -PalPacket_72578: ; 72578 (1c:6578) - db $79,$3C,$08,$00,$0B,$F0,$12,$A5,$C9,$C9,$C8,$D0,$1C,$A5,$CA,$C9 - -PalPacket_72588: ; 72588 (1c:6588) - db $79,$31,$08,$00,$0B,$0C,$A5,$CA,$C9,$7E,$D0,$06,$A5,$CB,$C9,$7E - -PalPacket_72598: ; 72598 (1c:6598) - db $79,$26,$08,$00,$0B,$39,$CD,$48,$0C,$D0,$34,$A5,$C9,$C9,$80,$D0 - -PalPacket_725a8: ; 725a8 (1c:65a8) - db $79,$1B,$08,$00,$0B,$EA,$EA,$EA,$EA,$EA,$A9,$01,$CD,$4F,$0C,$D0 - -PalPacket_725b8: ; 725b8 (1c:65b8) - db $79,$10,$08,$00,$0B,$4C,$20,$08,$EA,$EA,$EA,$EA,$EA,$60,$EA,$EA + ATTR_BLK 3 + ATTR_BLK_DATA %111, 1,1,0, 05,11, 07,13 + ATTR_BLK_DATA %010, 2,2,0, 08,11, 09,13 + ATTR_BLK_DATA %011, 3,3,0, 12,11, 14,13 + ds 12 + + db $03,$00,$00,$13,$0a,$00 + db $03,$00,$0b,$04,$0d,$00 + db $03,$05,$0b,$07,$0d,$01 + db $03,$08,$0b,$13,$0d,$00 + db $03,$00,$0e,$13,$11,$00 + db $03,$08,$0b,$09,$0d,$02 + db $03,$0c,$0b,$0e,$0d,$03 + db $00 + + +PalPacket_Empty: PAL_SET 0, 0, 0, 0 +PalPacket_PartyMenu: PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR +PalPacket_Black: PAL_SET PAL_BLACK, PAL_BLACK, PAL_BLACK, PAL_BLACK +PalPacket_TownMap: PAL_SET PAL_TOWNMAP, 0, 0, 0 +PalPacket_Pokedex: PAL_SET PAL_BROWNMON, 0, 0, 0 +PalPacket_Slots: PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SLOTS4 +PalPacket_Titlescreen: PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON +PalPacket_TrainerCard: PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON +PalPacket_Generic: PAL_SET PAL_MEWMON, 0, 0, 0 +PalPacket_NidorinoIntro: PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0 +PalPacket_GameFreakIntro: PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON + +PalTrnPacket: PAL_TRN +MltReq1Packet: MLT_REQ 1 +MltReq2Packet: MLT_REQ 2 +ChrTrnPacket: CHR_TRN 0, 0 +PctTrnPacket: PCT_TRN + +MaskEnFreezePacket: MASK_EN 1 +MaskEnCancelPacket: MASK_EN 0 + + +; These are DATA_SND packets containing SNES code. +; This set of packets is found in several Japanese SGB-compatible titles. +; It appears to be part of NCL's SGB devkit. + +DataSnd_72548: DATA_SND $85d, $0, 11 + db $8C ; cpx #$8c (2) + db $D0, $F4 ; bne -$0c + db $60 ; rts + ds 7 + +DataSnd_72558: DATA_SND $852, $0, 11 + db $A9, $E7 ; lda #$e7 + db $9F, $01, $C0, $7E ; sta $7ec001, x + db $E8 ; inx + db $E8 ; inx + db $E8 ; inx + db $E8 ; inx + db $E0 ; cpx #$8c (1) + +DataSnd_72568: DATA_SND $847, $0, 11 + db $C4 ; cmp #$c4 (2) + db $D0, $16 ; bne +$16 + db $A5 ; lda dp + db $CB ; wai + db $C9, $05 ; cmp #$05 + db $D0, $10 ; bne +$10 + db $A2, $28 ; ldx #$28 + +DataSnd_72578: DATA_SND $83c, $0, 11 + db $F0, $12 ; beq +$12 + db $A5 ; lda dp + db $C9, $C9 ; cmp #$c9 + db $C8 ; iny + db $D0, $1C ; bne +$1c + db $A5 ; lda dp + db $CA ; dex + db $C9 ; cmp #$c4 (1) + +DataSnd_72588: DATA_SND $831, $0, 11 + dbw $0C, $CAA5 ; tsb $caa5 + db $C9, $7E ; cmp #$7e + db $D0, $06 ; bne +$06 + db $A5 ; lda dp + db $CB ; wai + db $C9, $7E ; cmp #$7e + +DataSnd_72598: DATA_SND $826, $0, 11 + db $39 ; bne +$39 (2) + dbw $CD, $C48 ; cmp $c48 + db $D0, $34 ; bne +$34 + db $A5 ; lda dp + db $C9, $C9 ; cmp #$c9 + db $80, $D0 ; bra -$30 + +DataSnd_725a8: DATA_SND $81b, $0, 11 + db $EA ; nop + db $EA ; nop + db $EA ; nop + db $EA ; nop + db $EA ; nop + ; $820: + db $A9,$01 ; lda #01 + dbw $CD,$C4F ; cmp $c4f + db $D0 ; bne +$39 (1) + +DataSnd_725b8: DATA_SND $810, $0, 11 + dbw $4C, $820 ; jmp $820 + db $EA ; nop + db $EA ; nop + db $EA ; nop + db $EA ; nop + db $EA ; nop + db $60 ; rts + db $EA ; nop + db $EA ; nop diff --git a/data/wildPokemon/fishinggroup1.asm b/data/wildPokemon/fishinggroup1.asm deleted file mode 100755 index 32dacef7..00000000 --- a/data/wildPokemon/fishinggroup1.asm +++ /dev/null @@ -1,4 +0,0 @@ -FishingGroup1: ; e97d (3:697d) - db 2 - db 15,TENTACOOL - db 15,POLIWAG diff --git a/data/wildPokemon/fishinggroup10.asm b/data/wildPokemon/fishinggroup10.asm deleted file mode 100755 index 5b815af4..00000000 --- a/data/wildPokemon/fishinggroup10.asm +++ /dev/null @@ -1,6 +0,0 @@ -FishingGroup10: ; e9bc (3:69bc) - db 4 - db 23,SEAKING - db 15,KRABBY - db 15,GOLDEEN - db 15,MAGIKARP diff --git a/data/wildPokemon/fishinggroup2.asm b/data/wildPokemon/fishinggroup2.asm deleted file mode 100755 index 758db30a..00000000 --- a/data/wildPokemon/fishinggroup2.asm +++ /dev/null @@ -1,4 +0,0 @@ -FishingGroup2: ; e982 (3:6982) - db 2 - db 15,GOLDEEN - db 15,POLIWAG diff --git a/data/wildPokemon/fishinggroup3.asm b/data/wildPokemon/fishinggroup3.asm deleted file mode 100755 index 2c1911fa..00000000 --- a/data/wildPokemon/fishinggroup3.asm +++ /dev/null @@ -1,5 +0,0 @@ -FishingGroup3: ; e987 (3:6987) - db 3 - db 15,PSYDUCK - db 15,GOLDEEN - db 15,KRABBY diff --git a/data/wildPokemon/fishinggroup4.asm b/data/wildPokemon/fishinggroup4.asm deleted file mode 100755 index ae9a73ed..00000000 --- a/data/wildPokemon/fishinggroup4.asm +++ /dev/null @@ -1,4 +0,0 @@ -FishingGroup4: ; e98e (3:698e) - db 2 - db 15,KRABBY - db 15,SHELLDER diff --git a/data/wildPokemon/fishinggroup5.asm b/data/wildPokemon/fishinggroup5.asm deleted file mode 100755 index ad856b27..00000000 --- a/data/wildPokemon/fishinggroup5.asm +++ /dev/null @@ -1,4 +0,0 @@ -FishingGroup5: ; e993 (3:6993) - db 2 - db 23,POLIWHIRL - db 15,SLOWPOKE diff --git a/data/wildPokemon/fishinggroup6.asm b/data/wildPokemon/fishinggroup6.asm deleted file mode 100755 index 581060d4..00000000 --- a/data/wildPokemon/fishinggroup6.asm +++ /dev/null @@ -1,6 +0,0 @@ -FishingGroup6: ; e998 (3:6998) - db 4 - db 15,DRATINI - db 15,KRABBY - db 15,PSYDUCK - db 15,SLOWPOKE diff --git a/data/wildPokemon/fishinggroup7.asm b/data/wildPokemon/fishinggroup7.asm deleted file mode 100755 index 69c3fc25..00000000 --- a/data/wildPokemon/fishinggroup7.asm +++ /dev/null @@ -1,6 +0,0 @@ -FishingGroup7: ; e9a1 (3:69a1) - db 4 - db 5,TENTACOOL - db 15,KRABBY - db 15,GOLDEEN - db 15,MAGIKARP diff --git a/data/wildPokemon/fishinggroup8.asm b/data/wildPokemon/fishinggroup8.asm deleted file mode 100755 index 04cc1632..00000000 --- a/data/wildPokemon/fishinggroup8.asm +++ /dev/null @@ -1,6 +0,0 @@ -FishingGroup8: ; e9aa (3:69aa) - db 4 - db 15,STARYU - db 15,HORSEA - db 15,SHELLDER - db 15,GOLDEEN diff --git a/data/wildPokemon/fishinggroup9.asm b/data/wildPokemon/fishinggroup9.asm deleted file mode 100755 index 8c02cd00..00000000 --- a/data/wildPokemon/fishinggroup9.asm +++ /dev/null @@ -1,6 +0,0 @@ -FishingGroup9: ; e9b3 (3:69b3) - db 4 - db 23,SLOWBRO - db 23,SEAKING - db 23,KINGLER - db 23,SEADRA diff --git a/data/wildPokemon/mansion1.asm b/data/wildPokemon/mansion1.asm index 0a333398..82547896 100755 --- a/data/wildPokemon/mansion1.asm +++ b/data/wildPokemon/mansion1.asm @@ -1,4 +1,4 @@ -MansionMons1: +MansionMons1: db $0A IF _RED db 32,KOFFING @@ -12,7 +12,7 @@ MansionMons1: db 37,WEEZING db 39,MUK ENDC - + IF _GREEN || _BLUE db 32,GRIMER db 30,GRIMER @@ -25,7 +25,7 @@ MansionMons1: db 37,MUK db 39,WEEZING ENDC - + IF _YELLOW db 34,RATTATA db 34,RATICATE @@ -38,6 +38,6 @@ MansionMons1: db 34,GROWLITHE db 38,GROWLITHE ENDC - + db $00 diff --git a/data/wildPokemon/mansion2.asm b/data/wildPokemon/mansion2.asm index 07ddc947..8ebbb414 100755 --- a/data/wildPokemon/mansion2.asm +++ b/data/wildPokemon/mansion2.asm @@ -1,4 +1,4 @@ -MansionMons2: +MansionMons2: db $0A IF _RED db 32,GROWLITHE @@ -12,7 +12,7 @@ MansionMons2: db 39,WEEZING db 37,MUK ENDC - + IF _GREEN || !_JAPAN && _BLUE db 32,VULPIX db 34,GRIMER @@ -25,7 +25,7 @@ MansionMons2: db 39,MUK db 37,WEEZING ENDC - + IF _JAPAN && _BLUE db 32,GROWLITHE db 34,GRIMER @@ -38,7 +38,7 @@ MansionMons2: db 39,MUK db 37,WEEZING ENDC - + IF _YELLOW db 37,RATTATA db 37,RATICATE @@ -51,6 +51,6 @@ MansionMons2: db 35,MUK db 38,MUK ENDC - + db $00 diff --git a/data/wildPokemon/mansion3.asm b/data/wildPokemon/mansion3.asm index c0df4020..a1b126ac 100755 --- a/data/wildPokemon/mansion3.asm +++ b/data/wildPokemon/mansion3.asm @@ -1,4 +1,4 @@ -MansionMons3: +MansionMons3: db $0A IF _RED db 31,KOFFING @@ -12,7 +12,7 @@ MansionMons3: db 36,PONYTA db 42,MUK ENDC - + IF _GREEN || !_JAPAN && _BLUE db 31,GRIMER db 33,VULPIX @@ -25,7 +25,7 @@ MansionMons3: db 36,PONYTA db 42,WEEZING ENDC - + IF _JAPAN && _BLUE db 31,GRIMER db 33,GROWLITHE @@ -38,7 +38,7 @@ MansionMons3: db 36,PONYTA db 42,WEEZING ENDC - + IF _YELLOW db 40,RATTATA db 40,RATICATE @@ -51,6 +51,6 @@ MansionMons3: db 38,MUK db 41,MUK ENDC - + db $00 diff --git a/data/wildPokemon/mansionb1.asm b/data/wildPokemon/mansionb1.asm index 9b90d211..23831eeb 100755 --- a/data/wildPokemon/mansionb1.asm +++ b/data/wildPokemon/mansionb1.asm @@ -1,4 +1,4 @@ -MansionMonsB1: +MansionMonsB1: db $0A IF _RED db 33,KOFFING @@ -12,7 +12,7 @@ MansionMonsB1: db 42,WEEZING db 42,MUK ENDC - + IF _GREEN || !_JAPAN && _BLUE db 33,GRIMER db 31,GRIMER @@ -25,7 +25,7 @@ MansionMonsB1: db 38,MAGMAR db 42,WEEZING ENDC - + IF _JAPAN && _BLUE db 33,GRIMER db 31,GRIMER @@ -38,7 +38,7 @@ MansionMonsB1: db 38,MUK db 42,WEEZING ENDC - + IF _YELLOW db 35,GRIMER db 38,GRIMER @@ -51,6 +51,6 @@ MansionMonsB1: db 18,DITTO db 12,DITTO ENDC - + db $00 diff --git a/data/wildPokemon/mtmoon1.asm b/data/wildPokemon/mtmoon1.asm index 3f69ae3f..5ba1d030 100755 --- a/data/wildPokemon/mtmoon1.asm +++ b/data/wildPokemon/mtmoon1.asm @@ -1,4 +1,4 @@ -MoonMons1: +MoonMons1: db $0A IF !_YELLOW db 8,ZUBAT diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wildPokemon/mtmoonb1.asm index 30d9a4ce..0f3639c1 100755 --- a/data/wildPokemon/mtmoonb1.asm +++ b/data/wildPokemon/mtmoonb1.asm @@ -1,4 +1,4 @@ -MoonMonsB1: +MoonMonsB1: db $0A IF !_YELLOW db 8,ZUBAT diff --git a/data/wildPokemon/mtmoonb2.asm b/data/wildPokemon/mtmoonb2.asm index 36266724..34966cd8 100755 --- a/data/wildPokemon/mtmoonb2.asm +++ b/data/wildPokemon/mtmoonb2.asm @@ -1,4 +1,4 @@ -MoonMonsB2: +MoonMonsB2: db $0A IF !_YELLOW db 9,ZUBAT diff --git a/data/wildPokemon/pokemontower1.asm b/data/wildPokemon/pokemontower1.asm index bdf0abc1..4911c790 100755 --- a/data/wildPokemon/pokemontower1.asm +++ b/data/wildPokemon/pokemontower1.asm @@ -1,4 +1,4 @@ -TowerMons1: +TowerMons1: db $00 db $00 diff --git a/data/wildPokemon/pokemontower2.asm b/data/wildPokemon/pokemontower2.asm index 1d0eddaf..a849668d 100755 --- a/data/wildPokemon/pokemontower2.asm +++ b/data/wildPokemon/pokemontower2.asm @@ -1,4 +1,4 @@ -TowerMons2: +TowerMons2: db $00 db $00 diff --git a/data/wildPokemon/pokemontower3.asm b/data/wildPokemon/pokemontower3.asm index 7d1abf59..e2b39398 100755 --- a/data/wildPokemon/pokemontower3.asm +++ b/data/wildPokemon/pokemontower3.asm @@ -1,6 +1,6 @@ -TowerMons3: +TowerMons3: db $0A - + IF !_YELLOW db 20,GASTLY db 21,GASTLY @@ -13,7 +13,7 @@ TowerMons3: db 22,CUBONE db 25,HAUNTER ENDC - + IF _YELLOW db 20,GASTLY db 21,GASTLY @@ -26,6 +26,6 @@ TowerMons3: db 20,HAUNTER db 25,HAUNTER ENDC - + db $00 diff --git a/data/wildPokemon/pokemontower4.asm b/data/wildPokemon/pokemontower4.asm index 462e5034..3f38af20 100755 --- a/data/wildPokemon/pokemontower4.asm +++ b/data/wildPokemon/pokemontower4.asm @@ -1,6 +1,6 @@ -TowerMons4: +TowerMons4: db $0A - + IF !_YELLOW db 20,GASTLY db 21,GASTLY @@ -13,7 +13,7 @@ TowerMons4: db 22,CUBONE db 24,GASTLY ENDC - + IF _YELLOW db 20,GASTLY db 21,GASTLY @@ -26,6 +26,6 @@ TowerMons4: db 20,HAUNTER db 25,HAUNTER ENDC - + db $00 diff --git a/data/wildPokemon/pokemontower5.asm b/data/wildPokemon/pokemontower5.asm index 6976937a..97098448 100755 --- a/data/wildPokemon/pokemontower5.asm +++ b/data/wildPokemon/pokemontower5.asm @@ -1,6 +1,6 @@ -TowerMons5: +TowerMons5: db $0A - + IF !_YELLOW db 20,GASTLY db 21,GASTLY @@ -13,7 +13,7 @@ TowerMons5: db 22,CUBONE db 24,GASTLY ENDC - + IF _YELLOW db 22,GASTLY db 23,GASTLY @@ -26,6 +26,6 @@ TowerMons5: db 22,HAUNTER db 27,HAUNTER ENDC - + db $00 diff --git a/data/wildPokemon/pokemontower6.asm b/data/wildPokemon/pokemontower6.asm index 4f2d9594..abd2969a 100755 --- a/data/wildPokemon/pokemontower6.asm +++ b/data/wildPokemon/pokemontower6.asm @@ -1,6 +1,6 @@ -TowerMons6: +TowerMons6: db $0F - + IF !_YELLOW db 21,GASTLY db 22,GASTLY @@ -13,7 +13,7 @@ TowerMons6: db 24,CUBONE db 28,HAUNTER ENDC - + IF _YELLOW db 22,GASTLY db 23,GASTLY @@ -26,6 +26,6 @@ TowerMons6: db 22,HAUNTER db 27,HAUNTER ENDC - + db $00 diff --git a/data/wildPokemon/pokemontower7.asm b/data/wildPokemon/pokemontower7.asm index 6c9afbd4..2daf3a2d 100755 --- a/data/wildPokemon/pokemontower7.asm +++ b/data/wildPokemon/pokemontower7.asm @@ -1,6 +1,6 @@ -TowerMons7: +TowerMons7: db $0F - + IF !_YELLOW db 21,GASTLY db 22,GASTLY @@ -14,7 +14,7 @@ TowerMons7: db 30,HAUNTER ENDC - + IF _YELLOW db 24,GASTLY db 25,GASTLY @@ -27,6 +27,6 @@ TowerMons7: db 24,HAUNTER db 29,HAUNTER ENDC - + db $00 diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm index 741232c3..a67ab2e9 100755 --- a/data/wildPokemon/powerplant.asm +++ b/data/wildPokemon/powerplant.asm @@ -1,7 +1,7 @@ -PowerPlantMons: +PowerPlantMons: db $0A IF !_YELLOW - + db 21,VOLTORB db 21,MAGNEMITE db 20,PIKACHU @@ -19,7 +19,7 @@ PowerPlantMons: db 36,RAICHU ENDC ENDC - + IF _YELLOW db 30,MAGNEMITE db 35,MAGNEMITE @@ -32,6 +32,6 @@ PowerPlantMons: db 33,MUK db 37,MUK ENDC - + db $00 diff --git a/data/wildPokemon/rocktunnel1.asm b/data/wildPokemon/rocktunnel1.asm index 20416c5f..e8904043 100755 --- a/data/wildPokemon/rocktunnel1.asm +++ b/data/wildPokemon/rocktunnel1.asm @@ -1,6 +1,6 @@ -TunnelMonsB1: +TunnelMonsB1: db $0F - + IF !_YELLOW db 16,ZUBAT db 17,ZUBAT @@ -18,7 +18,7 @@ TunnelMonsB1: db 13,ONIX db 15,ONIX ENDC - + IF _YELLOW db 15,ZUBAT db 16,GEODUDE @@ -31,6 +31,6 @@ TunnelMonsB1: db 19,MACHOP db 21,MACHOP ENDC - + db $00 diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wildPokemon/rocktunnel2.asm index b1ca24fd..f158453e 100755 --- a/data/wildPokemon/rocktunnel2.asm +++ b/data/wildPokemon/rocktunnel2.asm @@ -1,4 +1,4 @@ -TunnelMonsB2: +TunnelMonsB2: db $0F IF !_YELLOW db 16,ZUBAT @@ -17,7 +17,7 @@ TunnelMonsB2: db 13,ONIX db 18,GEODUDE ENDC - + IF _YELLOW db 20,ZUBAT db 17,GEODUDE @@ -30,6 +30,6 @@ TunnelMonsB2: db 18,ONIX db 22,ONIX ENDC - + db $00 diff --git a/data/wildPokemon/route1.asm b/data/wildPokemon/route1.asm index 94469880..bbad3c9e 100755 --- a/data/wildPokemon/route1.asm +++ b/data/wildPokemon/route1.asm @@ -1,4 +1,4 @@ -Route1Mons: +Route1Mons: db $19 IF !_YELLOW db 3,PIDGEY diff --git a/data/wildPokemon/route10.asm b/data/wildPokemon/route10.asm index 69651380..185e41fe 100755 --- a/data/wildPokemon/route10.asm +++ b/data/wildPokemon/route10.asm @@ -1,6 +1,6 @@ -Route10Mons: +Route10Mons: db $0F - + IF _RED db 16,VOLTORB db 16,SPEAROW @@ -13,7 +13,7 @@ Route10Mons: db 13,EKANS db 17,EKANS ENDC - + IF !_RED db 16,VOLTORB db 16,SPEAROW @@ -26,7 +26,7 @@ Route10Mons: db 13,SANDSHREW db 17,SANDSHREW ENDC - + IF _YELLOW db 16,MAGNEMITE db 18,RATTATA @@ -39,6 +39,6 @@ Route10Mons: db 16,MACHOP db 18,MACHOP ENDC - + db $00 diff --git a/data/wildPokemon/route11.asm b/data/wildPokemon/route11.asm index afe72dd2..6f724e80 100755 --- a/data/wildPokemon/route11.asm +++ b/data/wildPokemon/route11.asm @@ -1,6 +1,6 @@ -Route11Mons: +Route11Mons: db $0F - + IF _RED db 14,EKANS db 15,SPEAROW @@ -13,7 +13,7 @@ Route11Mons: db 11,DROWZEE db 15,DROWZEE ENDC - + IF _GREEN || _BLUE db 14,SANDSHREW db 15,SPEAROW @@ -26,7 +26,7 @@ Route11Mons: db 11,DROWZEE db 15,DROWZEE ENDC - + IF _YELLOW db 16,PIDGEY db 15,RATTATA @@ -39,6 +39,6 @@ Route11Mons: db 19,DROWZEE db 17,RATICATE ENDC - + db $00 diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm index e16b407b..b15a2223 100755 --- a/data/wildPokemon/route12.asm +++ b/data/wildPokemon/route12.asm @@ -1,6 +1,6 @@ -Route12Mons: +Route12Mons: db $0F - + IF _RED || (_JAPAN && _BLUE) db 24,ODDISH db 25,PIDGEY @@ -14,7 +14,7 @@ Route12Mons: db 30,GLOOM db $00 ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 24,BELLSPROUT db 25,PIDGEY @@ -28,7 +28,7 @@ Route12Mons: db 30,WEEPINBELL db $00 ENDC - + IF _YELLOW db 25,ODDISH db 25,BELLSPROUT diff --git a/data/wildPokemon/route13.asm b/data/wildPokemon/route13.asm index 96e53229..5293bf21 100755 --- a/data/wildPokemon/route13.asm +++ b/data/wildPokemon/route13.asm @@ -1,4 +1,4 @@ -Route13Mons: +Route13Mons: IF _RED || (_JAPAN && _BLUE) db $14 db 24,ODDISH @@ -13,7 +13,7 @@ Route13Mons: db 30,GLOOM db $00 ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db $14 db 24,BELLSPROUT @@ -28,7 +28,7 @@ Route13Mons: db 30,WEEPINBELL db $00 ENDC - + IF _YELLOW db $0F db 25,ODDISH diff --git a/data/wildPokemon/route14.asm b/data/wildPokemon/route14.asm index c3e0743b..76d9118f 100755 --- a/data/wildPokemon/route14.asm +++ b/data/wildPokemon/route14.asm @@ -1,4 +1,4 @@ -Route14Mons: +Route14Mons: db $0F IF _RED || (_JAPAN && _BLUE) db 24,ODDISH @@ -12,7 +12,7 @@ Route14Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 24,BELLSPROUT db 26,PIDGEY @@ -25,7 +25,7 @@ Route14Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - + IF _YELLOW db 26,ODDISH db 26,BELLSPROUT @@ -38,6 +38,6 @@ Route14Mons: db 27,VENONAT db 30,VENOMOTH ENDC - + db $00 diff --git a/data/wildPokemon/route15.asm b/data/wildPokemon/route15.asm index a8215cd3..4a0d3fc3 100755 --- a/data/wildPokemon/route15.asm +++ b/data/wildPokemon/route15.asm @@ -1,4 +1,4 @@ -Route15Mons: +Route15Mons: db $0F IF _RED || (_JAPAN && _BLUE) db 24,ODDISH @@ -12,7 +12,7 @@ Route15Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 24,BELLSPROUT db 26,DITTO @@ -25,7 +25,7 @@ Route15Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - + IF _YELLOW db 26,ODDISH db 26,BELLSPROUT @@ -38,6 +38,6 @@ Route15Mons: db 27,VENONAT db 30,VENOMOTH ENDC - + db $00 diff --git a/data/wildPokemon/route16.asm b/data/wildPokemon/route16.asm index 23aadb6c..34408164 100755 --- a/data/wildPokemon/route16.asm +++ b/data/wildPokemon/route16.asm @@ -1,4 +1,4 @@ -Route16Mons: +Route16Mons: db $19 IF !_YELLOW db 20,SPEAROW @@ -12,7 +12,7 @@ Route16Mons: db 23,RATICATE db 25,RATICATE ENDC - + IF _YELLOW db 22,SPEAROW db 22,DODUO @@ -25,6 +25,6 @@ Route16Mons: db 25,RATICATE db 26,RATICATE ENDC - + db $00 diff --git a/data/wildPokemon/route17.asm b/data/wildPokemon/route17.asm index 9cdb18b3..75882ec5 100755 --- a/data/wildPokemon/route17.asm +++ b/data/wildPokemon/route17.asm @@ -1,4 +1,4 @@ -Route17Mons: +Route17Mons: db $19 IF !_YELLOW db 20,SPEAROW @@ -12,7 +12,7 @@ Route17Mons: db 25,FEAROW db 27,FEAROW ENDC - + IF _YELLOW db 26,DODUO db 27,FEAROW @@ -25,6 +25,6 @@ Route17Mons: db 32,PONYTA db 29,DODRIO ENDC - + db $00 diff --git a/data/wildPokemon/route18.asm b/data/wildPokemon/route18.asm index 9d2b08cf..8820f045 100755 --- a/data/wildPokemon/route18.asm +++ b/data/wildPokemon/route18.asm @@ -1,4 +1,4 @@ -Route18Mons: +Route18Mons: db $19 IF !_YELLOW db 20,SPEAROW @@ -12,7 +12,7 @@ Route18Mons: db 27,FEAROW db 29,FEAROW ENDC - + IF _YELLOW db 22,SPEAROW db 22,DODUO @@ -25,6 +25,6 @@ Route18Mons: db 25,RATICATE db 26,RATICATE ENDC - + db $00 diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm index e63f5028..57d7f87f 100755 --- a/data/wildPokemon/route2.asm +++ b/data/wildPokemon/route2.asm @@ -1,6 +1,6 @@ -Route2Mons: +Route2Mons: db $19 - + IF !_YELLOW db 3,RATTATA db 3,PIDGEY diff --git a/data/wildPokemon/route21.asm b/data/wildPokemon/route21.asm index 26a590da..a29753eb 100755 --- a/data/wildPokemon/route21.asm +++ b/data/wildPokemon/route21.asm @@ -1,4 +1,4 @@ -Route21Mons: +Route21Mons: db $19 IF !_YELLOW db 21,RATTATA @@ -12,7 +12,7 @@ Route21Mons: db 30,TANGELA db 32,TANGELA ENDC - + IF _YELLOW db 15,PIDGEY db 13,RATTATA @@ -25,7 +25,7 @@ Route21Mons: db 19,PIDGEOTTO db 15,PIDGEOTTO ENDC - + db $05 db 5,TENTACOOL db 10,TENTACOOL diff --git a/data/wildPokemon/route22.asm b/data/wildPokemon/route22.asm index e78c02c9..36ff9a57 100755 --- a/data/wildPokemon/route22.asm +++ b/data/wildPokemon/route22.asm @@ -1,4 +1,4 @@ -Route22Mons: +Route22Mons: db $19 IF _RED || (_JAPAN && _BLUE) db 3,RATTATA diff --git a/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm index 3cd2ca9d..cfdd8eff 100755 --- a/data/wildPokemon/route23.asm +++ b/data/wildPokemon/route23.asm @@ -1,4 +1,4 @@ -Route23Mons: +Route23Mons: db $0A IF !_YELLOW IF _RED @@ -22,7 +22,7 @@ Route23Mons: db 41,FEAROW db 43,FEAROW ENDC - + IF _YELLOW db 41,NIDORINO db 41,NIDORINA @@ -35,6 +35,6 @@ Route23Mons: db 41,PRIMEAPE db 46,PRIMEAPE ENDC - + db $00 diff --git a/data/wildPokemon/route24.asm b/data/wildPokemon/route24.asm index 28af9916..e4ff986a 100755 --- a/data/wildPokemon/route24.asm +++ b/data/wildPokemon/route24.asm @@ -1,6 +1,6 @@ -Route24Mons: +Route24Mons: db $19 - + IF _RED db 7,WEEDLE db 8,KAKUNA @@ -13,7 +13,7 @@ Route24Mons: db 8,ABRA db 12,ABRA ENDC - + IF _GREEN || !_JAPAN && _BLUE db 7,CATERPIE db 8,METAPOD @@ -26,7 +26,7 @@ Route24Mons: db 8,ABRA db 12,ABRA ENDC - + IF _JAPAN && _BLUE db 7,CATERPIE db 8,METAPOD @@ -39,7 +39,7 @@ Route24Mons: db 8,ABRA db 12,ABRA ENDC - + IF _YELLOW db 12,ODDISH db 12,BELLSPROUT @@ -52,6 +52,6 @@ Route24Mons: db 17,PIDGEY db 17,PIDGEOTTO ENDC - + db $00 diff --git a/data/wildPokemon/route25.asm b/data/wildPokemon/route25.asm index 1aac115f..3d225473 100755 --- a/data/wildPokemon/route25.asm +++ b/data/wildPokemon/route25.asm @@ -1,6 +1,6 @@ -Route25Mons: +Route25Mons: db $0F - + IF _RED db 8,WEEDLE db 9,KAKUNA @@ -13,7 +13,7 @@ Route25Mons: db 7,METAPOD db 8,CATERPIE ENDC - + IF _GREEN || !_JAPAN && _BLUE db 8,CATERPIE db 9,METAPOD @@ -26,7 +26,7 @@ Route25Mons: db 7,KAKUNA db 8,WEEDLE ENDC - + IF _JAPAN && _BLUE db 8,CATERPIE db 9,METAPOD @@ -39,7 +39,7 @@ Route25Mons: db 7,KAKUNA db 8,WEEDLE ENDC - + IF _YELLOW db 12,ODDISH db 12,BELLSPROUT @@ -52,6 +52,6 @@ Route25Mons: db 17,PIDGEY db 17,PIDGEOTTO ENDC - + db $00 diff --git a/data/wildPokemon/route3.asm b/data/wildPokemon/route3.asm index 1b555138..21230f42 100755 --- a/data/wildPokemon/route3.asm +++ b/data/wildPokemon/route3.asm @@ -1,4 +1,4 @@ -Route3Mons: +Route3Mons: db $14 IF !_YELLOW db 6,PIDGEY diff --git a/data/wildPokemon/route4.asm b/data/wildPokemon/route4.asm index 22610dc6..f7eb80ee 100755 --- a/data/wildPokemon/route4.asm +++ b/data/wildPokemon/route4.asm @@ -1,6 +1,6 @@ -Route4Mons: +Route4Mons: db $14 - + IF _RED db 10,RATTATA db 10,SPEAROW @@ -13,7 +13,7 @@ Route4Mons: db 8,EKANS db 12,EKANS ENDC - + IF !_RED db 10,RATTATA db 10,SPEAROW @@ -26,7 +26,7 @@ Route4Mons: db 8,SANDSHREW db 12,SANDSHREW ENDC - + IF _YELLOW db 8,SPEAROW db 9,SPEAROW diff --git a/data/wildPokemon/route5.asm b/data/wildPokemon/route5.asm index c08b51a4..4b018cd6 100755 --- a/data/wildPokemon/route5.asm +++ b/data/wildPokemon/route5.asm @@ -1,6 +1,6 @@ -Route5Mons: +Route5Mons: db $0F - + IF _RED db 13,ODDISH db 13,PIDGEY @@ -13,7 +13,7 @@ Route5Mons: db 14,MANKEY db 16,MANKEY ENDC - + IF _GREEN || !_JAPAN && _BLUE db 13,BELLSPROUT db 13,PIDGEY @@ -26,7 +26,7 @@ Route5Mons: db 14,MEOWTH db 16,MEOWTH ENDC - + IF _JAPAN && _BLUE db 13,ODDISH db 13,PIDGEY @@ -39,7 +39,7 @@ Route5Mons: db 14,MEOWTH db 16,MEOWTH ENDC - + IF _YELLOW db 15,PIDGEY db 14,RATTATA @@ -52,6 +52,6 @@ Route5Mons: db 5,JIGGLYPUFF db 7,JIGGLYPUFF ENDC - + db $00 diff --git a/data/wildPokemon/route6.asm b/data/wildPokemon/route6.asm index a2e0f4d0..253a5943 100755 --- a/data/wildPokemon/route6.asm +++ b/data/wildPokemon/route6.asm @@ -1,6 +1,6 @@ -Route6Mons: +Route6Mons: db $0F - + IF _RED db 13,ODDISH db 13,PIDGEY @@ -14,7 +14,7 @@ Route6Mons: db 16,MANKEY db $00 ENDC - + IF _GREEN || !_JAPAN && _BLUE db 13,BELLSPROUT db 13,PIDGEY @@ -28,7 +28,7 @@ Route6Mons: db 16,MEOWTH db $00 ENDC - + IF _JAPAN && _BLUE db 13,ODDISH db 13,PIDGEY @@ -42,7 +42,7 @@ Route6Mons: db 16,MEOWTH db $00 ENDC - + IF _YELLOW db 15,PIDGEY db 14,RATTATA diff --git a/data/wildPokemon/route7.asm b/data/wildPokemon/route7.asm index ecda56aa..42073d11 100755 --- a/data/wildPokemon/route7.asm +++ b/data/wildPokemon/route7.asm @@ -1,6 +1,6 @@ -Route7Mons: +Route7Mons: db $0F - + IF _RED db 19,PIDGEY db 19,ODDISH @@ -13,7 +13,7 @@ Route7Mons: db 19,MANKEY db 20,MANKEY ENDC - + IF _GREEN || !_JAPAN && _BLUE db 19,PIDGEY db 19,BELLSPROUT @@ -26,7 +26,7 @@ Route7Mons: db 19,MEOWTH db 20,MEOWTH ENDC - + IF _JAPAN && _BLUE db 19,PIDGEY db 19,ODDISH @@ -39,7 +39,7 @@ Route7Mons: db 19,MEOWTH db 20,MEOWTH ENDC - + IF _YELLOW db 20,PIDGEY db 22,PIDGEY @@ -52,6 +52,6 @@ Route7Mons: db 24,JIGGLYPUFF db 24,JIGGLYPUFF ENDC - + db $00 diff --git a/data/wildPokemon/route8.asm b/data/wildPokemon/route8.asm index 97260649..59c3082d 100755 --- a/data/wildPokemon/route8.asm +++ b/data/wildPokemon/route8.asm @@ -1,6 +1,6 @@ -Route8Mons: +Route8Mons: db $0F - + IF _RED db 18,PIDGEY db 18,MANKEY @@ -13,7 +13,7 @@ Route8Mons: db 15,GROWLITHE db 18,GROWLITHE ENDC - + IF _GREEN || !_JAPAN && _BLUE db 18,PIDGEY db 18,MEOWTH @@ -26,7 +26,7 @@ Route8Mons: db 15,VULPIX db 18,VULPIX ENDC - + IF _JAPAN && _BLUE db 18,PIDGEY db 18,MEOWTH @@ -39,7 +39,7 @@ Route8Mons: db 15,GROWLITHE db 18,GROWLITHE ENDC - + IF _YELLOW db 20,PIDGEY db 22,PIDGEY @@ -52,6 +52,6 @@ Route8Mons: db 20,KADABRA db 27,KADABRA ENDC - + db $00 diff --git a/data/wildPokemon/route9.asm b/data/wildPokemon/route9.asm index c7c65186..03523e4f 100755 --- a/data/wildPokemon/route9.asm +++ b/data/wildPokemon/route9.asm @@ -1,6 +1,6 @@ -Route9Mons: +Route9Mons: db $0F - + IF _RED db 16,RATTATA db 16,SPEAROW @@ -13,7 +13,7 @@ Route9Mons: db 13,EKANS db 17,EKANS ENDC - + IF !_RED && !_YELLOW db 16,RATTATA db 16,SPEAROW @@ -26,7 +26,7 @@ Route9Mons: db 13,SANDSHREW db 17,SANDSHREW ENDC - + IF _YELLOW db 16,NIDORAN_M db 16,NIDORAN_F @@ -39,6 +39,6 @@ Route9Mons: db 20,RATICATE db 19,FEAROW ENDC - + db $00 diff --git a/data/wildPokemon/safarizone1.asm b/data/wildPokemon/safarizone1.asm index 1e2f463c..29e3f29b 100755 --- a/data/wildPokemon/safarizone1.asm +++ b/data/wildPokemon/safarizone1.asm @@ -1,4 +1,4 @@ -ZoneMons1: +ZoneMons1: db $1E IF _RED || (_JAPAN && _BLUE) db 24,NIDORAN_M @@ -17,7 +17,7 @@ ZoneMons1: ENDC db 28,SCYTHER ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 24,NIDORAN_F db 26,DODUO @@ -30,7 +30,7 @@ ZoneMons1: db 25,KANGASKHAN db 28,PINSIR ENDC - + IF _YELLOW db 21,NIDORAN_M db 29,NIDORAN_F @@ -43,6 +43,6 @@ ZoneMons1: db 21,CHANSEY db 15,SCYTHER ENDC - + db $00 diff --git a/data/wildPokemon/safarizone2.asm b/data/wildPokemon/safarizone2.asm index ac35d4e4..2adb18ed 100755 --- a/data/wildPokemon/safarizone2.asm +++ b/data/wildPokemon/safarizone2.asm @@ -1,4 +1,4 @@ -ZoneMons2: +ZoneMons2: db $1E IF !_YELLOW IF _RED || (_JAPAN && _BLUE) @@ -32,7 +32,7 @@ ZoneMons2: db 28,PINSIR ENDC ENDC - + IF _YELLOW db 36,NIDORAN_M db 14,NIDORAN_F @@ -45,6 +45,6 @@ ZoneMons2: db 25,SCYTHER db 15,PINSIR ENDC - + db $00 diff --git a/data/wildPokemon/safarizone3.asm b/data/wildPokemon/safarizone3.asm index 497efd24..436ab937 100755 --- a/data/wildPokemon/safarizone3.asm +++ b/data/wildPokemon/safarizone3.asm @@ -1,4 +1,4 @@ -ZoneMons3: +ZoneMons3: db $1E IF _RED db 25,NIDORAN_M @@ -12,7 +12,7 @@ ZoneMons3: db 26,TAUROS db 28,KANGASKHAN ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 25,NIDORAN_F db 26,DODUO @@ -25,7 +25,7 @@ ZoneMons3: db 26,TAUROS db 28,KANGASKHAN ENDC - + IF _JAPAN && _BLUE db 25,NIDORAN_M db 26,DODUO @@ -38,7 +38,7 @@ ZoneMons3: db 26,PINSIR db 28,LICKITUNG ENDC - + IF _YELLOW db 29,NIDORAN_M db 21,NIDORAN_F @@ -51,6 +51,6 @@ ZoneMons3: db 25,PINSIR db 27,TANGELA ENDC - + db $00 diff --git a/data/wildPokemon/safarizonecenter.asm b/data/wildPokemon/safarizonecenter.asm index d8c74a76..35eb7fd4 100755 --- a/data/wildPokemon/safarizonecenter.asm +++ b/data/wildPokemon/safarizonecenter.asm @@ -1,4 +1,4 @@ -ZoneMonsCenter: +ZoneMonsCenter: db $1E IF _RED db 22,NIDORAN_M @@ -12,7 +12,7 @@ ZoneMonsCenter: db 23,SCYTHER db 23,CHANSEY ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 22,NIDORAN_F db 25,RHYHORN @@ -25,7 +25,7 @@ ZoneMonsCenter: db 23,PINSIR db 23,CHANSEY ENDC - + IF _JAPAN && _BLUE db 22,NIDORAN_M db 25,RHYHORN @@ -38,7 +38,7 @@ ZoneMonsCenter: db 23,SCYTHER db 23,CHANSEY ENDC - + IF _YELLOW db 14,NIDORAN_M db 36,NIDORAN_F @@ -51,6 +51,6 @@ ZoneMonsCenter: db 22,TANGELA db 7,CHANSEY ENDC - + db $00 diff --git a/data/wildPokemon/seafoamisland1.asm b/data/wildPokemon/seafoamisland1.asm index 472af2e1..506dd98e 100755 --- a/data/wildPokemon/seafoamisland1.asm +++ b/data/wildPokemon/seafoamisland1.asm @@ -1,4 +1,4 @@ -IslandMons1: +IslandMons1: db $0F IF _RED db 30,SEEL @@ -12,7 +12,7 @@ IslandMons1: db 28,SHELLDER db 38,GOLDUCK ENDC - + IF _GREEN || !_JAPAN && _BLUE db 30,SEEL db 30,PSYDUCK @@ -25,7 +25,7 @@ IslandMons1: db 28,STARYU db 38,SLOWBRO ENDC - + IF _JAPAN && _BLUE db 30,SEEL db 30,HORSEA @@ -38,7 +38,7 @@ IslandMons1: db 28,STARYU db 38,SLOWBRO ENDC - + IF _YELLOW db 18,ZUBAT db 25,KRABBY @@ -51,6 +51,6 @@ IslandMons1: db 27,GOLBAT db 36,GOLBAT ENDC - + db $00 diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/wildPokemon/seafoamislandb1.asm index 9b49bc46..044753b4 100755 --- a/data/wildPokemon/seafoamislandb1.asm +++ b/data/wildPokemon/seafoamislandb1.asm @@ -1,4 +1,4 @@ -IslandMonsB1: +IslandMonsB1: db $0A IF _RED db 30,STARYU @@ -12,7 +12,7 @@ IslandMonsB1: db 38,DEWGONG db 37,SEADRA ENDC - + IF _GREEN || !_JAPAN && _BLUE db 30,SHELLDER db 30,KRABBY @@ -25,7 +25,7 @@ IslandMonsB1: db 38,DEWGONG db 37,KINGLER ENDC - + IF _JAPAN && _BLUE db 30,SHELLDER db 30,KRABBY @@ -38,7 +38,7 @@ IslandMonsB1: db 38,DEWGONG db 37,KINGLER ENDC - + IF _YELLOW db 27,ZUBAT db 26,KRABBY @@ -51,6 +51,6 @@ IslandMonsB1: db 22,SEEL db 26,SEEL ENDC - + db $00 diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/wildPokemon/seafoamislandb2.asm index 4cad1012..2b7a3ef8 100755 --- a/data/wildPokemon/seafoamislandb2.asm +++ b/data/wildPokemon/seafoamislandb2.asm @@ -1,4 +1,4 @@ -IslandMonsB2: +IslandMonsB2: db $0A IF _RED db 30,SEEL @@ -12,7 +12,7 @@ IslandMonsB2: db 30,GOLBAT db 37,SLOWBRO ENDC - + IF _GREEN || !_JAPAN && _BLUE db 30,SEEL db 30,PSYDUCK @@ -25,7 +25,7 @@ IslandMonsB2: db 30,GOLBAT db 37,GOLDUCK ENDC - + IF _JAPAN && _BLUE db 30,SEEL db 30,HORSEA @@ -38,7 +38,7 @@ IslandMonsB2: db 30,GOLBAT db 37,JYNX ENDC - + IF _YELLOW db 27,ZUBAT db 27,KRABBY @@ -51,6 +51,6 @@ IslandMonsB2: db 31,SLOWPOKE db 31,SLOWBRO ENDC - + db $00 diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/wildPokemon/seafoamislandb3.asm index 55d806a9..ac9769b4 100755 --- a/data/wildPokemon/seafoamislandb3.asm +++ b/data/wildPokemon/seafoamislandb3.asm @@ -1,4 +1,4 @@ -IslandMonsB3: +IslandMonsB3: db $0A IF _RED db 31,SLOWPOKE @@ -12,7 +12,7 @@ IslandMonsB3: db 39,SEADRA db 37,DEWGONG ENDC - + IF _GREEN || !_JAPAN && _BLUE db 31,PSYDUCK db 31,SEEL @@ -25,7 +25,7 @@ IslandMonsB3: db 39,KINGLER db 37,DEWGONG ENDC - + IF _JAPAN && _BLUE db 31,HORSEA db 31,SEEL @@ -38,7 +38,7 @@ IslandMonsB3: db 39,KINGLER db 37,DEWGONG ENDC - + IF _YELLOW db 27,GOLBAT db 36,ZUBAT @@ -63,6 +63,6 @@ IslandMonsB3: db 30,STARYU db 30,STARYU ENDC - + db $00 diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/wildPokemon/seafoamislandb4.asm index 9596ab5b..af5c7e02 100755 --- a/data/wildPokemon/seafoamislandb4.asm +++ b/data/wildPokemon/seafoamislandb4.asm @@ -1,4 +1,4 @@ -IslandMonsB4: +IslandMonsB4: db $0A IF _RED db 31,HORSEA @@ -12,7 +12,7 @@ IslandMonsB4: db 39,SLOWBRO db 32,GOLBAT ENDC - + IF _GREEN || !_JAPAN && _BLUE db 31,KRABBY db 31,STARYU @@ -25,7 +25,7 @@ IslandMonsB4: db 39,GOLDUCK db 32,GOLBAT ENDC - + IF _JAPAN && _BLUE db 31,KRABBY db 31,STARYU @@ -38,7 +38,7 @@ IslandMonsB4: db 39,JYNX db 32,GOLBAT ENDC - + IF _YELLOW db 36,GOLBAT db 36,ZUBAT @@ -63,6 +63,6 @@ IslandMonsB4: db 30,STARYU db 30,STARYU ENDC - + db $00 diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm index 2c23dcc8..4feb568c 100755 --- a/data/wildPokemon/unknowndungeon1.asm +++ b/data/wildPokemon/unknowndungeon1.asm @@ -1,4 +1,4 @@ -DungeonMons1: +DungeonMons1: db $0A IF !_YELLOW db 46,GOLBAT @@ -22,7 +22,7 @@ DungeonMons1: db 53,RAICHU db 53,DITTO ENDC - + IF _YELLOW db 50,GOLBAT db 55,GOLBAT @@ -35,6 +35,6 @@ DungeonMons1: db 55,DITTO db 60,DITTO ENDC - + db $00 diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm index c3971b86..a09c985c 100755 --- a/data/wildPokemon/unknowndungeon2.asm +++ b/data/wildPokemon/unknowndungeon2.asm @@ -1,4 +1,4 @@ -DungeonMons2: +DungeonMons2: db $0F IF !_YELLOW db 51,DODRIO @@ -17,7 +17,7 @@ DungeonMons2: db 55,DITTO db 60,DITTO ENDC - + IF _YELLOW db 52,GOLBAT db 57,GOLBAT @@ -30,6 +30,6 @@ DungeonMons2: db 60,RHYDON db 58,RHYDON ENDC - + db $00 diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm index 8a66d2a9..7ab1c964 100755 --- a/data/wildPokemon/unknowndungeonb1.asm +++ b/data/wildPokemon/unknowndungeonb1.asm @@ -1,4 +1,4 @@ -DungeonMonsB1: +DungeonMonsB1: db $19 IF !_YELLOW db 55,RHYDON @@ -17,7 +17,7 @@ DungeonMonsB1: db 63,DITTO db 67,DITTO ENDC - + IF _YELLOW db 54,GOLBAT db 59,GOLBAT @@ -30,6 +30,6 @@ DungeonMonsB1: db 55,LICKITUNG db 50,LICKITUNG ENDC - + db $00 diff --git a/data/wildPokemon/victoryroad1.asm b/data/wildPokemon/victoryroad1.asm index c39d1ff5..1ec65cf5 100755 --- a/data/wildPokemon/victoryroad1.asm +++ b/data/wildPokemon/victoryroad1.asm @@ -1,4 +1,4 @@ -PlateauMons1: +PlateauMons1: db $0F IF !_YELLOW db 24,MACHOP @@ -25,6 +25,6 @@ PlateauMons1: db 41,GRAVELER db 47,GRAVELER ENDC - + db $00 diff --git a/data/wildPokemon/victoryroad2.asm b/data/wildPokemon/victoryroad2.asm index 1832b83b..87159e96 100755 --- a/data/wildPokemon/victoryroad2.asm +++ b/data/wildPokemon/victoryroad2.asm @@ -1,4 +1,4 @@ -PlateauMons2: +PlateauMons2: db $0A IF !_YELLOW db 22,MACHOP @@ -12,7 +12,7 @@ PlateauMons2: db 40,MAROWAK db 43,GRAVELER ENDC - + IF _YELLOW db 31,GEODUDE db 36,GEODUDE @@ -25,6 +25,6 @@ PlateauMons2: db 39,MACHOKE db 42,MACHOKE ENDC - + db $00 diff --git a/data/wildPokemon/victoryroad3.asm b/data/wildPokemon/victoryroad3.asm index e2ebf0db..ae52eeb6 100755 --- a/data/wildPokemon/victoryroad3.asm +++ b/data/wildPokemon/victoryroad3.asm @@ -1,4 +1,4 @@ -PlateauMons3: +PlateauMons3: db $0F IF !_YELLOW db 24,MACHOP @@ -12,7 +12,7 @@ PlateauMons3: db 42,MACHOKE db 45,MACHOKE ENDC - + IF _YELLOW db 36,GEODUDE db 44,GOLBAT @@ -25,6 +25,6 @@ PlateauMons3: db 47,GRAVELER db 47,GRAVELER ENDC - + db $00 diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm index e80ba681..2ca828eb 100755 --- a/data/wildPokemon/viridianforest.asm +++ b/data/wildPokemon/viridianforest.asm @@ -1,4 +1,4 @@ -ForestMons: ; +ForestMons: IF !_YELLOW db $08 IF _RED @@ -21,11 +21,11 @@ ForestMons: ; db 4,KAKUNA db 3,WEEDLE ENDC - + db 3,PIKACHU db 5,PIKACHU ENDC - + IF _YELLOW db $19 db 3,CATERPIE diff --git a/data/wildPokemon/waterpokemon.asm b/data/wildPokemon/waterpokemon.asm index b45a94d6..ef2d39ea 100755 --- a/data/wildPokemon/waterpokemon.asm +++ b/data/wildPokemon/waterpokemon.asm @@ -1,4 +1,4 @@ -WaterMons: ; +WaterMons: db $00 db $05 |