diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-31 19:40:14 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-31 19:40:14 -0400 |
| commit | 7d4ec90538d297ebbfd65d82213d9c13c3527379 (patch) | |
| tree | 421657da2f1a2108f004c7d388c60eacc9d749ab /data | |
| parent | Use rgblink -w to have one $2000-byte WRAM0 region (diff) | |
| download | pokeyellow-7d4ec90538d297ebbfd65d82213d9c13c3527379.tar.gz pokeyellow-7d4ec90538d297ebbfd65d82213d9c13c3527379.tar.xz pokeyellow-7d4ec90538d297ebbfd65d82213d9c13c3527379.zip | |
Some miscellaneous changes, syncing more with pokered
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/hide_show_data.asm | 2 | ||||
| -rw-r--r-- | data/sgb/sgb_packets.asm | 1 | ||||
| -rw-r--r-- | data/sgb/sgb_palettes.asm | 3 | ||||
| -rw-r--r-- | data/tilesets/tileset_headers.asm | 1 | ||||
| -rw-r--r-- | data/tilesets/warp_tile_ids.asm | 2 |
5 files changed, 6 insertions, 3 deletions
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 810da263..6d5d4aa6 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -251,7 +251,7 @@ MapHSPointers: dw NoHS dw NoHS dw NoHS - dw NoHS ; beach house + dw NoHS assert_table_length NUM_MAPS dw -1 ; end diff --git a/data/sgb/sgb_packets.asm b/data/sgb/sgb_packets.asm index 161ad9fe..38257fa1 100644 --- a/data/sgb/sgb_packets.asm +++ b/data/sgb/sgb_packets.asm @@ -159,6 +159,7 @@ 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. diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index aa8c0b7e..ba753f6a 100644 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm @@ -1,6 +1,6 @@ SuperPalettes: - table_width 2 * 4, SuperPalettes ; entries correspond to PAL_* constants + table_width 2 * 4, SuperPalettes RGB 31,31,30, 23,26,19, 23,27,31, 06,06,06 ; PAL_ROUTE RGB 31,31,30, 28,27,31, 23,27,31, 06,06,06 ; PAL_PALLET RGB 31,31,30, 26,31,21, 23,27,31, 06,06,06 ; PAL_VIRIDIAN @@ -44,6 +44,7 @@ SuperPalettes: assert_table_length NUM_SGB_PALS GBCBasePalettes: +; entries correspond to PAL_* constants table_width 2 * 4, GBCBasePalettes RGB 31,31,31, 16,31,04, 11,23,31, 03,03,03 ; PAL_ROUTE RGB 31,31,31, 23,17,31, 11,23,31, 03,03,03 ; PAL_PALLET diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm index 819364b3..3355de6d 100644 --- a/data/tilesets/tileset_headers.asm +++ b/data/tilesets/tileset_headers.asm @@ -8,6 +8,7 @@ ENDM Tilesets: table_width 12, Tilesets + ; name, 3 counter tiles, grass tile, animations tileset Overworld, -1, -1, -1, $52, TILEANIM_WATER_FLOWER tileset RedsHouse1, -1, -1, -1, -1, TILEANIM_NONE tileset Mart, $18,$19,$1E, -1, TILEANIM_NONE diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index b30a731d..61b93a36 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -92,7 +92,7 @@ ENDM ; fallthrough .ShipPortWarpTileIDs: .ClubWarpTileIDs: - warp_tiles + warp_tiles ; end .BeachHouseWarpTileIDs: warp_tiles ; end |