diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/facing.asm | 20 | ||||
| -rwxr-xr-x | data/hide_show_data.asm | 4 | ||||
| -rwxr-xr-x | data/mapObjects/route19.asm | 2 | ||||
| -rwxr-xr-x | data/sgb_packets.asm | 26 | ||||
| -rwxr-xr-x | data/sprite_sets.asm | 20 | ||||
| -rwxr-xr-x | data/tileset_headers.asm | 2 | ||||
| -rwxr-xr-x | data/title_mons.asm | 18 | ||||
| -rwxr-xr-x | data/trainer_types.asm | 2 | ||||
| -rwxr-xr-x | data/warp_tile_ids.asm | 2 |
9 files changed, 39 insertions, 57 deletions
diff --git a/data/facing.asm b/data/facing.asm index 138a0162..7a3dfacd 100644 --- a/data/facing.asm +++ b/data/facing.asm @@ -13,12 +13,12 @@ SpriteFacingAndAnimationTable: ; 4000 (1:4000) dw SpriteFacingLeftAndWalking ; facing left, walk animation frame 1 dw SpriteFacingLeftAndStanding ; facing left, walk animation frame 2 dw SpriteFacingLeftAndWalking ; facing left, walk animation frame 3 - + dw SpriteFacingRightAndStanding ; facing right, walk animation frame 0 dw SpriteFacingRightAndWalking ; facing right, walk animation frame 1 dw SpriteFacingRightAndStanding ; facing right, walk animation frame 2 dw SpriteFacingRightAndWalking ; facing right, walk animation frame 3 - + dw SpriteFacingDownAndStanding ; --- dw SpriteFacingDownAndStanding ; This table is used for sprites $a and $b. dw SpriteFacingDownAndStanding ; All orientation and animation parameters @@ -69,7 +69,7 @@ SpriteFacingUpAndStanding: ; 4075 (1:4075) db $00,$08,$05,$00 ; top right db $08,$00,$06,OAMFLAG_CANBEMASKED ; bottom left db $08,$08,$07,OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right - + SpriteFacingUpAndWalking: ; 4086 (1:4086) db $04 ; Sprite OAM Parameters @@ -85,7 +85,7 @@ SpriteFacingUpAndWalking2: ; 4097 (1:4097) db $00,$00,$85,OAMFLAG_VFLIPPED ; top right db $08,$08,$86,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left db $08,$00,$87,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right - + SpriteFacingLeftAndStanding: ; 40a8 (1:40a8) db $04 ; Sprite OAM Parameters @@ -109,7 +109,7 @@ SpriteFacingRightAndStanding: ; 40ca (1:40ca) db $00,$00,$09,OAMFLAG_VFLIPPED ; top right db $08,$08,$0a,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left db $08,$00,$0b,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right - + SpriteFacingRightAndWalking: ; 40db (1:40db) db $04 ; Sprite OAM Parameters @@ -117,14 +117,14 @@ SpriteFacingRightAndWalking: ; 40db (1:40db) db $00,$00,$89,OAMFLAG_VFLIPPED ; top right db $08,$08,$8a,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left db $08,$00,$8b,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right - + SpriteSpecialCase ; 40ec (1:40ec) db $09 ; Sprite OAM Parameters - db -$4,-$4,$00,$00 - db -$4,$04,$01,$00 - db -$4,$0c,$00,OAMFLAG_VFLIPPED - db $04,-$4,$01,$00 + db -$4,-$4,$00,$00 + db -$4,$04,$01,$00 + db -$4,$0c,$00,OAMFLAG_VFLIPPED + db $04,-$4,$01,$00 db $04,$04,$02,$00 db $04,$0c,$01,$00 db $0c,-$4,$00,OAM_VFLIP | OAMFLAG_CANBEMASKED diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 2387218b..5b522f8e 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -1,7 +1,7 @@ ; data for default hidden/shown ; objects for each map ($00-$F8) -; Table of 2-Byte pointers, one pointer per map, +; Table of 2-Byte pointers, one pointer per map, ; goes up to Map_F7, ends with $FFFF. ; points to table listing all missable object in the area MapHSPointers: ; c69b (3:469b) @@ -589,5 +589,5 @@ MapHS27Copy: ; cb56 (3:4b56) db BLUES_HOUSE, $01, Show db BLUES_HOUSE, $02, Hide db BLUES_HOUSE, $03, Show - + db $FF, $01, Show
\ No newline at end of file diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index ec2b8774..151cc4a8 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -8,7 +8,7 @@ Route19Object: ; 0x54e9a (size=87) db $b,$b,$b db $a ; objects - + object SPRITE_BLACK_HAIR_BOY_1, $09, $07, STAY, RIGHT, $1, OPP_SWIMMER, $2 object SPRITE_BLACK_HAIR_BOY_1, $0c, $09, STAY, LEFT, $2, OPP_SWIMMER, $3 object SPRITE_SWIMMER, $0d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4 diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm index a0af4a44..c00a7f58 100755 --- a/data/sgb_packets.asm +++ b/data/sgb_packets.asm @@ -118,41 +118,41 @@ UnknownPacket_72751: ; 72751 (1c:6751) PalPacket_Empty: ; 72761 (1c:6761) PAL_SET 0, 0, 0, 0 - + PalPacket_PartyMenu: ; 72771 (1c:6771) PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR - + PalPacket_Black: ; 72781 (1c:6781) PAL_SET PAL_BLACK, PAL_BLACK, PAL_BLACK, PAL_BLACK - + PalPacket_TownMap: ; 72791 (1c:6791) PAL_SET PAL_TOWNMAP, 0, 0, 0 - + PalPacket_Pokedex: ; 727a1 (1c:67a1) PAL_SET PAL_BROWNMON, 0, 0, 0 - + PalPacket_Slots: ; 727b1 (1c:67b1) PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SLOTS4 - + PalPacket_Titlescreen: ; 727c1 (1c:67c1) PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON - + PalPacket_TrainerCard: ; 727d1 (1c:67d1) PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON - + PalPacket_Generic: ; 727e1 (1c:67e1) PAL_SET PAL_MEWMON, 0, 0, 0 - + PalPacket_NidorinoIntro: ; 727f1 (1c:67f1) PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0 - + PalPacket_GameFreakIntro: ; 72801 (1c:6801) PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON - + UnknownPalPacket_72811: ; 72811 (1c:6811) db $51,$25,$0,$25,$0,$25,$0,$25,$0,$0,$0,$0,$0,$0,$0,$0 - -UnknownPalPacket_72821: ; 72821 (1c:6821) + +UnknownPalPacket_72821: ; 72821 (1c:6821) db $51,$25,$0,$27,$0,$25,$0,$25,$0,$0,$0,$0,$0,$0,$0,$0 PalTrnPacket: ; 72831 (1c:6831) diff --git a/data/sprite_sets.asm b/data/sprite_sets.asm index e529b506..50e50e07 100755 --- a/data/sprite_sets.asm +++ b/data/sprite_sets.asm @@ -494,52 +494,52 @@ SpriteSheetPointerTable: ; 142a9 (5:42a9) dw PikachuSprite db $c0 db BANK(PikachuSprite) - + ; SPRITE_OFFICER_JENNY dw OfficerJennySprite db $c0 db BANK(OfficerJennySprite) - + ; SPRITE_SANDSHREW dw SandshrewSprite db $c0 db BANK(SandshrewSprite) - + ; SPRITE_ODDISH dw OddishSprite db $c0 db BANK(OddishSprite) - + ; SPRITE_BULBASAUR dw BulbasaurSprite db $c0 db BANK(BulbasaurSprite) - + ; SPRITE_JIGGLYPUFF dw JigglypuffSprite db $c0 db BANK(JigglypuffSprite) - + ; SPRITE_CLEFAIRY_2 dw Clefairy2Sprite db $c0 db BANK(Clefairy2Sprite) - + ; SPRITE_CHANSEY dw ChanseySprite db $c0 db BANK(ChanseySprite) - + ; SPRITE_JESSIE dw JessieSprite db $c0 db BANK(JessieSprite) - + ; SPRITE_JAMES dw JamesSprite db $c0 db BANK(JamesSprite) - + ; SPRITE_BALL dw BallSprite db $40 ; byte count diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index d6c6a2c9..e81d11ff 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -1,6 +1,6 @@ Tilesets: ; c558 (3:4558) ; dr $c558,$c684 - + tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, INDOOR diff --git a/data/title_mons.asm b/data/title_mons.asm deleted file mode 100755 index e27742af..00000000 --- a/data/title_mons.asm +++ /dev/null @@ -1,18 +0,0 @@ -TitleMons: ; 4588 (1:4588) -; mons on the title screen are randomly chosen from here - db CHARMANDER - db SQUIRTLE - db BULBASAUR - db WEEDLE - db NIDORAN_M - db SCYTHER - db PIKACHU - db CLEFAIRY - db RHYDON - db ABRA - db GASTLY - db DITTO - db PIDGEOTTO - db ONIX - db PONYTA - db MAGIKARP diff --git a/data/trainer_types.asm b/data/trainer_types.asm index 24cb3a8c..bb8bd0ec 100755 --- a/data/trainer_types.asm +++ b/data/trainer_types.asm @@ -14,5 +14,5 @@ EvilTrainerList:: ; 33c8 (0:33c8) db OPP_SCIENTIST db OPP_GIOVANNI db OPP_ROCKET - + db $ff diff --git a/data/warp_tile_ids.asm b/data/warp_tile_ids.asm index 1e40c9ce..672d7382 100755 --- a/data/warp_tile_ids.asm +++ b/data/warp_tile_ids.asm @@ -24,7 +24,7 @@ WarpTileIDPointers: ; c215 (3:4215) dw FacilityWarpTileIDs dw PlateauWarpTileIDs dw BeachHouseWarpTileIDs - + OverworldWarpTileIDs: ; c247 (3:4247) db $1B,$58,$FF |