tools: rename 'background_tile_commands' to 'tilemaps'

This will help to introduce 'attrmaps' later.
This commit is contained in:
Pierre de La Morinerie 2021-01-11 23:10:48 +00:00
parent de29c36cec
commit a19054c250
21 changed files with 165 additions and 55 deletions

View File

@ -40,18 +40,18 @@ WorldMapTilemap::
incbin "data/backgrounds/world_map.tilemap.encoded"
MenuFileSelectionTilemap::
incbin "data/backgrounds/menu_file_selection.tilemap.encoded"
BackgroundTileCommands03::
incbin "data/backgrounds/background_tile_commands03.tilemap.encoded"
Tilemap03::
incbin "data/backgrounds/tilemap03.tilemap.encoded"
MenuFileCreationTilemap::
incbin "data/backgrounds/menu_file_creation.tilemap.encoded"
BackgroundTileCommands06::
incbin "data/backgrounds/background_tile_commands06.tilemap.encoded"
Tilemap06::
incbin "data/backgrounds/tilemap06.tilemap.encoded"
MenuFileCopyTilemap::
incbin "data/backgrounds/menu_file_copy.tilemap.encoded"
InventoryTilemap::
incbin "data/backgrounds/inventory.tilemap.encoded"
BackgroundTileCommands09::
incbin "data/backgrounds/background_tile_commands09.tilemap.encoded"
Tilemap09::
incbin "data/backgrounds/tilemap09.tilemap.encoded"
InventoryDebugTilemap::
incbin "data/backgrounds/inventory_debug.tilemap.encoded"
GameOverTilemap::

View File

@ -1,14 +1,14 @@
BackgroundTileCommandsPointersTable::
TilemapsPointersTable::
._00 dw $0000
._01 dw CreditsIslandTilemap ; $5D69
._02 dw InventoryTilemap ; $6DDA
._03 dw BackgroundTileCommands03 ; $69D4
._03 dw Tilemap03 ; $69D4
._04 dw MenuFileSelectionTilemap ; $69C5
._05 dw MenuFileCreationTilemap ; $6AD6
._06 dw BackgroundTileCommands06 ; $6C13
._06 dw Tilemap06 ; $6C13
._07 dw $D651
._08 dw WorldMapTilemap ; $6986
._09 dw BackgroundTileCommands09 ; $6E5A
._09 dw Tilemap09 ; $6E5A
._0A dw GameOverTilemap ; $7020
._0B dw InventoryDebugTilemap ; $6F87
._0C dw MenuFileCopyTilemap ; $6CEC

View File

@ -1,3 +1,11 @@
FaceShrineMuralTilemap::
incbin "data/backgrounds/face_shrine_mural.tilemap.encoded"
PeachTilemap::
incbin "data/backgrounds/peach.tilemap.encoded"
MarinBeachTilemap::
incbin "data/backgrounds/marin_beach.tilemap.encoded"
SchulePaintingTilemap::
incbin "data/backgrounds/schule_painting.tilemap.encoded"
EaglesTowerCollapseTilemap::
incbin "data/backgrounds/eagles_tower_collapse.tilemap.encoded"
CreditsKidsTilemap::
@ -32,18 +40,18 @@ WorldMapTilemap::
incbin "data/backgrounds/world_map.tilemap.encoded"
MenuFileSelectionTilemap::
incbin "data/backgrounds/menu_file_selection.tilemap.encoded"
BackgroundTileCommands03::
incbin "data/backgrounds/background_tile_commands03.tilemap.encoded"
Tilemap03::
incbin "data/backgrounds/tilemap03.tilemap.encoded"
MenuFileCreationTilemap::
incbin "data/backgrounds/menu_file_creation.tilemap.encoded"
BackgroundTileCommands06::
incbin "data/backgrounds/background_tile_commands06.tilemap.encoded"
Tilemap06::
incbin "data/backgrounds/tilemap06.tilemap.encoded"
MenuFileCopyTilemap::
incbin "data/backgrounds/menu_file_copy.tilemap.encoded"
InventoryTilemap::
incbin "data/backgrounds/inventory.tilemap.encoded"
BackgroundTileCommands09::
incbin "data/backgrounds/background_tile_commands09.tilemap.encoded"
Tilemap09::
incbin "data/backgrounds/tilemap09.tilemap.encoded"
InventoryDebugTilemap::
incbin "data/backgrounds/inventory_debug.tilemap.encoded"
GameOverTilemap::
@ -60,11 +68,3 @@ IntroBeachTilemap::
incbin "data/backgrounds/intro_beach.tilemap.encoded"
TitleTilemap::
incbin "data/backgrounds/title.tilemap.encoded"
FaceShrineMuralTilemap::
incbin "data/backgrounds/face_shrine_mural.tilemap.encoded"
PeachTilemap::
incbin "data/backgrounds/peach.tilemap.encoded"
MarinBeachTilemap::
incbin "data/backgrounds/marin_beach.tilemap.encoded"
SchulePaintingTilemap::
incbin "data/backgrounds/schule_painting.tilemap.encoded"

View File

@ -1,14 +1,14 @@
BackgroundTileCommandsPointersTable::
TilemapsPointersTable::
._00 dw $0000
._01 dw CreditsIslandTilemap ; $5D69
._02 dw InventoryTilemap ; $6DFD
._03 dw BackgroundTileCommands03 ; $69D5
._03 dw Tilemap03 ; $69D5
._04 dw MenuFileSelectionTilemap ; $69C5
._05 dw MenuFileCreationTilemap ; $6AD2
._06 dw BackgroundTileCommands06 ; $6C21
._06 dw Tilemap06 ; $6C21
._07 dw $D651
._08 dw WorldMapTilemap ; $6986
._09 dw BackgroundTileCommands09 ; $6E7D
._09 dw Tilemap09 ; $6E7D
._0A dw GameOverTilemap ; $6FBF
._0B dw InventoryDebugTilemap ; $6F26
._0C dw MenuFileCopyTilemap ; $6D07

View File

@ -1,11 +1,3 @@
FaceShrineMuralTilemap::
incbin "data/backgrounds/face_shrine_mural.tilemap.encoded"
PeachTilemap::
incbin "data/backgrounds/peach.tilemap.encoded"
MarinBeachTilemap::
incbin "data/backgrounds/marin_beach.tilemap.encoded"
SchulePaintingTilemap::
incbin "data/backgrounds/schule_painting.tilemap.encoded"
EaglesTowerCollapseTilemap::
incbin "data/backgrounds/eagles_tower_collapse.tilemap.encoded"
CreditsKidsTilemap::
@ -40,18 +32,18 @@ WorldMapTilemap::
incbin "data/backgrounds/world_map.tilemap.encoded"
MenuFileSelectionTilemap::
incbin "data/backgrounds/menu_file_selection.tilemap.encoded"
BackgroundTileCommands03::
incbin "data/backgrounds/background_tile_commands03.tilemap.encoded"
Tilemap03::
incbin "data/backgrounds/tilemap03.tilemap.encoded"
MenuFileCreationTilemap::
incbin "data/backgrounds/menu_file_creation.tilemap.encoded"
BackgroundTileCommands06::
incbin "data/backgrounds/background_tile_commands06.tilemap.encoded"
Tilemap06::
incbin "data/backgrounds/tilemap06.tilemap.encoded"
MenuFileCopyTilemap::
incbin "data/backgrounds/menu_file_copy.tilemap.encoded"
InventoryTilemap::
incbin "data/backgrounds/inventory.tilemap.encoded"
BackgroundTileCommands09::
incbin "data/backgrounds/background_tile_commands09.tilemap.encoded"
Tilemap09::
incbin "data/backgrounds/tilemap09.tilemap.encoded"
InventoryDebugTilemap::
incbin "data/backgrounds/inventory_debug.tilemap.encoded"
GameOverTilemap::
@ -68,3 +60,11 @@ IntroBeachTilemap::
incbin "data/backgrounds/intro_beach.tilemap.encoded"
TitleTilemap::
incbin "data/backgrounds/title.tilemap.encoded"
FaceShrineMuralTilemap::
incbin "data/backgrounds/face_shrine_mural.tilemap.encoded"
PeachTilemap::
incbin "data/backgrounds/peach.tilemap.encoded"
MarinBeachTilemap::
incbin "data/backgrounds/marin_beach.tilemap.encoded"
SchulePaintingTilemap::
incbin "data/backgrounds/schule_painting.tilemap.encoded"

View File

@ -0,0 +1,40 @@
TilemapsPointersTable::
._00 dw $0000
._01 dw CreditsIslandTilemap ; $56CC
._02 dw InventoryTilemap ; $67BA
._03 dw Tilemap03 ; $633A
._04 dw MenuFileSelectionTilemap ; $6328
._05 dw MenuFileCreationTilemap ; $6451
._06 dw Tilemap06 ; $65FA
._07 dw $D651
._08 dw WorldMapTilemap ; $62E9
._09 dw Tilemap09 ; $683B
._0A dw GameOverTilemap ; $6A01
._0B dw InventoryDebugTilemap ; $6968
._0C dw MenuFileCopyTilemap ; $66C3
._0D dw MenuFileSaveTilemap ; $6AED
._0E dw IntroSeaDMGTilemap ; $6B77
._0F dw IntroLinkFaceTilemap ; $6E09
._10 dw IntroBeachTilemap ; $7014
._11 dw TitleTilemap ; $7193
._12 dw PeachTilemap ; $74AB
._13 dw MarinBeachTilemap ; $766C
._14 dw MamuTilemap ; $62A8
._15 dw FaceShrineMuralTilemap ; $730C
._16 dw CreditsStairsTilemap ; $578C
._17 dw CreditsLinkOnSeaLargeTilemap ; $5AF5
._18 dw CreditsSunAboveTilemap ; $5BC8
._19 dw CreditsLinkOnSeaCloseTilemap ; $5D0C
._1A dw CreditsLinkSeatedOnLogTilemap ; $5E5B
._1B dw CreditsLinkFaceCloseUpTilemap ; $5F47
._1C dw CreditsRollTilemap ; $6004
._1D dw CreditsRollTilemap ; $6004
._1E dw CreditsKidsTilemap ; $4E9A
._1F dw CreditsMarinSingingTilemap ; $5050
._20 dw CreditsMrsMeowMeowsHouseTilemap ; $51EF
._21 dw CreditsTarinTilemap ; $538E
._22 dw CreditsBeachTilemap ; $552D
._23 dw SchulePaintingTilemap ; $780A
._24 dw EaglesTowerCollapseTilemap ; $4DD4
._25 dw IntroSeaCGBTilemap ; $6CC0

View File

@ -4,7 +4,7 @@
; Contains pointers to wRequests data.
; (The requests themselves load data in bank 8.)
include "data/backgrounds/background_tile_commands_pointers.asm"
include "data/backgrounds/tilemaps_pointers.asm"
; Retrieve the address of a wRequest for loading a given background.
; Input:
@ -12,7 +12,7 @@ include "data/backgrounds/background_tile_commands_pointers.asm"
; Returns:
; de an address to a wRequest for loading BG data
GetBGCopyRequest::
ld hl, BackgroundTileCommandsPointersTable ; $4577: $21 $2B $45
ld hl, TilemapsPointersTable ; $4577: $21 $2B $45
ld b, $00 ; $457A: $06 $00
ld a, [wBGMapToLoad] ; $457C: $FA $FF $D6
sla a ; $457F: $CB $27

View File

@ -0,0 +1,70 @@
EaglesTowerCollapseTilemap::
incbin "data/backgrounds/eagles_tower_collapse.tilemap.encoded"
CreditsKidsTilemap::
incbin "data/backgrounds/credits_kids.tilemap.encoded"
CreditsMarinSingingTilemap::
incbin "data/backgrounds/credits_marin_singing.tilemap.encoded"
CreditsMrsMeowMeowsHouseTilemap::
incbin "data/backgrounds/credits_mrs_meow_meows_house.tilemap.encoded"
CreditsTarinTilemap::
incbin "data/backgrounds/credits_tarin.tilemap.encoded"
CreditsBeachTilemap::
incbin "data/backgrounds/credits_beach.tilemap.encoded"
CreditsIslandTilemap::
incbin "data/backgrounds/credits_island.tilemap.encoded"
CreditsStairsTilemap::
incbin "data/backgrounds/credits_stairs.tilemap.encoded"
CreditsLinkOnSeaLargeTilemap::
incbin "data/backgrounds/credits_link_on_sea_large.tilemap.encoded"
CreditsSunAboveTilemap::
incbin "data/backgrounds/credits_sun_above.tilemap.encoded"
CreditsLinkOnSeaCloseTilemap::
incbin "data/backgrounds/credits_link_on_sea_close.tilemap.encoded"
CreditsLinkSeatedOnLogTilemap::
incbin "data/backgrounds/credits_link_seated_on_log.tilemap.encoded"
CreditsLinkFaceCloseUpTilemap::
incbin "data/backgrounds/credits_link_face_close_up.tilemap.encoded"
CreditsRollTilemap::
incbin "data/backgrounds/credits_roll.tilemap.encoded"
MamuTilemap::
incbin "data/backgrounds/mamu.tilemap.encoded"
WorldMapTilemap::
incbin "data/backgrounds/world_map.tilemap.encoded"
MenuFileSelectionTilemap::
incbin "data/backgrounds/menu_file_selection.tilemap.encoded"
Tilemap03::
incbin "data/backgrounds/tilemap03.tilemap.encoded"
MenuFileCreationTilemap::
incbin "data/backgrounds/menu_file_creation.tilemap.encoded"
Tilemap06::
incbin "data/backgrounds/tilemap06.tilemap.encoded"
MenuFileCopyTilemap::
incbin "data/backgrounds/menu_file_copy.tilemap.encoded"
InventoryTilemap::
incbin "data/backgrounds/inventory.tilemap.encoded"
Tilemap09::
incbin "data/backgrounds/tilemap09.tilemap.encoded"
InventoryDebugTilemap::
incbin "data/backgrounds/inventory_debug.tilemap.encoded"
GameOverTilemap::
incbin "data/backgrounds/game_over.tilemap.encoded"
MenuFileSaveTilemap::
incbin "data/backgrounds/menu_file_save.tilemap.encoded"
IntroSeaDMGTilemap::
incbin "data/backgrounds/intro_sea_dmg.tilemap.encoded"
IntroSeaCGBTilemap::
incbin "data/backgrounds/intro_sea_cgb.tilemap.encoded"
IntroLinkFaceTilemap::
incbin "data/backgrounds/intro_link_face.tilemap.encoded"
IntroBeachTilemap::
incbin "data/backgrounds/intro_beach.tilemap.encoded"
TitleTilemap::
incbin "data/backgrounds/title.tilemap.encoded"
FaceShrineMuralTilemap::
incbin "data/backgrounds/face_shrine_mural.tilemap.encoded"
PeachTilemap::
incbin "data/backgrounds/peach.tilemap.encoded"
MarinBeachTilemap::
incbin "data/backgrounds/marin_beach.tilemap.encoded"
SchulePaintingTilemap::
incbin "data/backgrounds/schule_painting.tilemap.encoded"

View File

@ -1,14 +1,14 @@
BackgroundTileCommandsPointersTable::
TilemapsPointersTable::
._00 dw $0000
._01 dw CreditsIslandTilemap ; $56CC
._02 dw InventoryTilemap ; $6748
._03 dw BackgroundTileCommands03 ; $6336
._03 dw Tilemap03 ; $6336
._04 dw MenuFileSelectionTilemap ; $6328
._05 dw MenuFileCreationTilemap ; $644D
._06 dw BackgroundTileCommands06 ; $6589
._06 dw Tilemap06 ; $6589
._07 dw $D651
._08 dw WorldMapTilemap ; $62E9
._09 dw BackgroundTileCommands09 ; $67C9
._09 dw Tilemap09 ; $67C9
._0A dw GameOverTilemap ; $698F
._0B dw InventoryDebugTilemap ; $68F6
._0C dw MenuFileCopyTilemap ; $6660

View File

@ -67,7 +67,7 @@ ColorDungeonObjectsTilemap::
include "data/objects_tilemaps/color_dungeon.asm"
include "data/objects/physics.asm"
BGTilemaps::
include "data/backgrounds/backgrounds_list.asm"
include "data/backgrounds/tilemaps_list.asm"
; Maps and dialogs
section "bank9",romx[$4000],bank[$09]

View File

@ -12,7 +12,7 @@ from lib.utils import BANK, global_to_local
background_descriptors = [
BackgroundTableDescriptor(
name = 'background_tile_commands',
name = 'tilemaps',
address = BANK(0x20) + 0x052B,
length = 0x4C,
data = BackgroundDescriptor(
@ -24,7 +24,7 @@ background_descriptors = [
# so we need to split the output into multiple files and make sure not to decode any code.
# But we only need a single pointer list.
#BackgroundTableDescriptor(
# name = 'background_attributes',
# name = 'attrmaps',
# address = BANK(0x24) + 0x1C4B,
# length = 0x4C,
# data = BackgroundDescriptor(
@ -38,13 +38,13 @@ background_names = [
None, #00
'CreditsIslandTilemap', #01
'InventoryTilemap', #02
'BackgroundTileCommands03', #03
'Tilemap03', #03
'MenuFileSelectionTilemap', #04
'MenuFileCreationTilemap', #05
'BackgroundTileCommands06', #06
'Tilemap06', #06
None, #07
'WorldMapTilemap', #08
'BackgroundTileCommands09', #09 (inventory no minimap?)
'Tilemap09', #09 (inventory no minimap?)
'GameOverTilemap', #0A
'InventoryDebugTilemap', #0B
'MenuFileCopyTilemap', #0C
@ -208,7 +208,7 @@ if __name__ == "__main__":
"bin": ".encoded"
}
tilemap_extension = extensions_for_format[args.format[0]]
list_filename = os.path.join(target_dir, 'backgrounds_list.asm')
list_filename = os.path.join(target_dir, f"{background_table_parser.name}_list.asm")
with open(list_filename, 'w') as list_file:
# For each group of pointers at the same address…