gfx: better name inventory items spritesheets

This commit is contained in:
Pierre de La Morinerie 2020-11-09 16:59:44 +01:00
parent 46c20e4353
commit 2ba776d350
16 changed files with 15 additions and 13 deletions

View File

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 307 B

View File

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 307 B

View File

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 297 B

View File

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 297 B

View File

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 307 B

View File

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 307 B

View File

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 295 B

View File

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 295 B

View File

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 295 B

View File

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 295 B

View File

@ -4884,17 +4884,19 @@ LoadDungeonTiles::
ld a, [wCurrentBank] ; $2CDA: $FA $AF $DB
ld [MBC3SelectBank], a ; $2CDD: $EA $00 $21
ld hl, InventoryDungeonItemsTiles ; $2CE0: $21 $00 $7D
ld hl, InventoryIndoorItemsTiles ; $2CE0: $21 $00 $7D
; If indoor, but not in a dungeon…
ldh a, [hMapId] ; $2CE3: $F0 $F7
cp MAP_COLOR_DUNGEON ; $2CE5: $FE $FF
jr z, .caveBOrColorDungeon ; $2CE7: $28 $0C
jr z, .inventoryItemsEnd ; $2CE7: $28 $0C
cp MAP_CAVE_B ; $2CE9: $FE $0A
jr c, .caveBOrColorDungeon ; $2CEB: $38 $08
ld a, BANK(DungeonKeysTiles) ; $2CED: $3E $0C
jr c, .inventoryItemsEnd ; $2CEB: $38 $08
; …use the overworld inventory items (instead of the dungeon ones)
ld a, BANK(InventoryOverworldItemsTiles) ; $2CED: $3E $0C
call SwitchAdjustedBank ; $2CEF: $CD $13 $08
ld hl, DungeonKeysTiles ; $2CF2: $21 $00 $4C
.caveBOrColorDungeon
ld hl, InventoryOverworldItemsTiles ; $2CF2: $21 $00 $4C
.inventoryItemsEnd
ld de, vTiles1 + $400 ; $2CF5: $11 $00 $8C
ld bc, TILE_SIZE * $30 ; $2CF8: $01 $00 $03
@ -4949,7 +4951,7 @@ LoadTileset5::
; Load dungeon keys
;
ld hl, DungeonKeysTiles ; $2D3E: $21 $00 $4C
ld hl, InventoryOverworldItemsTiles ; $2D3E: $21 $00 $4C
ld de, vTiles1 + $400 ; $2D41: $11 $00 $8C
ld bc, TILE_SIZE * $40 ; $2D44: $01 $00 $04
call CopyData ; $2D47: $CD $14 $29

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -101,8 +101,8 @@ Items1Tiles::
incbin "gfx/items/items_1.dmg.2bpp"
InventoryEquipmentItemsTiles::
incbin "gfx/items/items_2.dmg.2bpp"
DungeonKeysTiles::
incbin "gfx/items/dungeon_keys.dmg.2bpp"
InventoryOverworldItemsTiles::
incbin "gfx/items/inventory_overworld_items.dmg.2bpp"
SirenInstrumentsTiles::
incbin "gfx/items/instruments.dmg.2bpp"
Overworld1Tiles::
@ -234,8 +234,8 @@ HouseAItemsTiles::
incbin "gfx/items/house_a.dmg.2bpp"
HouseBItemsTiles::
incbin "gfx/items/house_b.dmg.2bpp"
InventoryDungeonItemsTiles::
incbin "gfx/items/dungeon_items.dmg.2bpp"
InventoryIndoorItemsTiles::
incbin "gfx/items/inventory_indoor_items.dmg.2bpp"
DungeonMinimapTiles::
incbin "gfx/items/minimap_dmg.2bpp"
@ -393,7 +393,7 @@ incbin "gfx/characters/oam_link_1.cgb.2bpp"
incbin "gfx/characters/oam_vfx.cgb.2bpp"
incbin "gfx/items/items_1.cgb.2bpp"
incbin "gfx/items/items_2.cgb.2bpp"
incbin "gfx/items/dungeon_keys.cgb.2bpp"
incbin "gfx/items/inventory_overworld_items.cgb.2bpp"
incbin "gfx/items/instruments.cgb.2bpp"
incbin "gfx/world/overworld_1.cgb.2bpp"
incbin "gfx/characters/oam_link_2.cgb.2bpp"
@ -440,7 +440,7 @@ incbin "gfx/items/dungeon_c.cgb.2bpp"
incbin "gfx/items/dungeon_d.cgb.2bpp"
incbin "gfx/items/house_a.cgb.2bpp"
incbin "gfx/items/house_b.cgb.2bpp"
incbin "gfx/items/dungeon_items.cgb.2bpp"
incbin "gfx/items/inventory_indoor_items.cgb.2bpp"
incbin "gfx/items/minimap_cgb.2bpp"
section "bank33",romx[$4000],bank[$33]