From 3eec91504c0f59117fd5705e2d135d483279641a Mon Sep 17 00:00:00 2001 From: Lucas Shaw <49287729+shawlucas@users.noreply.github.com> Date: Wed, 24 Feb 2021 11:41:43 -0700 Subject: [PATCH] Some static texture files "decompiled" (#658) * . * remove tools/ZAP2 from origin master * Some texture files * fix tabs in new texture files * map_i_static * some updates * update names * update more names * nintendo_rogo_static * title_static ok * Added segment= to the texture files * do_action_static update * Made suggested changes * Made suggested changes * Fixed spec --- assets/xml/textures/do_action_static.xml | 91 +++++ assets/xml/textures/icon_item_24_static.xml | 2 +- .../xml/textures/icon_item_dungeon_static.xml | 2 +- .../xml/textures/icon_item_field_static.xml | 2 +- .../textures/icon_item_gameover_static.xml | 2 +- assets/xml/textures/icon_item_nes_static.xml | 64 +-- assets/xml/textures/item_name_static.xml | 373 ++++++++++++++++++ assets/xml/textures/map_grand_static.xml | 28 ++ assets/xml/textures/map_i_static.xml | 243 ++++++++++++ assets/xml/textures/map_name_static.xml | 106 +++++ assets/xml/textures/message_static.xml | 11 + .../xml/textures/message_texture_static.xml | 6 + assets/xml/textures/nes_font_static.xml | 143 +++++++ assets/xml/textures/nintendo_rogo_static.xml | 5 + assets/xml/textures/parameter_static.xml | 4 +- assets/xml/textures/title_static.xml | 149 +++++++ spec | 30 +- 17 files changed, 1213 insertions(+), 48 deletions(-) create mode 100644 assets/xml/textures/do_action_static.xml create mode 100644 assets/xml/textures/item_name_static.xml create mode 100644 assets/xml/textures/map_grand_static.xml create mode 100644 assets/xml/textures/map_i_static.xml create mode 100644 assets/xml/textures/map_name_static.xml create mode 100644 assets/xml/textures/message_static.xml create mode 100644 assets/xml/textures/message_texture_static.xml create mode 100644 assets/xml/textures/nes_font_static.xml create mode 100644 assets/xml/textures/nintendo_rogo_static.xml create mode 100644 assets/xml/textures/title_static.xml diff --git a/assets/xml/textures/do_action_static.xml b/assets/xml/textures/do_action_static.xml new file mode 100644 index 0000000000..330dc4cc5d --- /dev/null +++ b/assets/xml/textures/do_action_static.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/icon_item_24_static.xml b/assets/xml/textures/icon_item_24_static.xml index 3de679dc12..d45cf7e7ed 100644 --- a/assets/xml/textures/icon_item_24_static.xml +++ b/assets/xml/textures/icon_item_24_static.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/textures/icon_item_dungeon_static.xml b/assets/xml/textures/icon_item_dungeon_static.xml index 5ad84ec6c2..510b7d0b2e 100644 --- a/assets/xml/textures/icon_item_dungeon_static.xml +++ b/assets/xml/textures/icon_item_dungeon_static.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/textures/icon_item_field_static.xml b/assets/xml/textures/icon_item_field_static.xml index 28ed66f710..8ec2f3b1a4 100644 --- a/assets/xml/textures/icon_item_field_static.xml +++ b/assets/xml/textures/icon_item_field_static.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/textures/icon_item_gameover_static.xml b/assets/xml/textures/icon_item_gameover_static.xml index 0b9f3536a6..a39e863b36 100644 --- a/assets/xml/textures/icon_item_gameover_static.xml +++ b/assets/xml/textures/icon_item_gameover_static.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/textures/icon_item_nes_static.xml b/assets/xml/textures/icon_item_nes_static.xml index 8e0ec4cc0e..8e10f457cd 100644 --- a/assets/xml/textures/icon_item_nes_static.xml +++ b/assets/xml/textures/icon_item_nes_static.xml @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/textures/item_name_static.xml b/assets/xml/textures/item_name_static.xml new file mode 100644 index 0000000000..80824edc9b --- /dev/null +++ b/assets/xml/textures/item_name_static.xml @@ -0,0 +1,373 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/map_grand_static.xml b/assets/xml/textures/map_grand_static.xml new file mode 100644 index 0000000000..f4cc76baab --- /dev/null +++ b/assets/xml/textures/map_grand_static.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/map_i_static.xml b/assets/xml/textures/map_i_static.xml new file mode 100644 index 0000000000..42612e9e3d --- /dev/null +++ b/assets/xml/textures/map_i_static.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/map_name_static.xml b/assets/xml/textures/map_name_static.xml new file mode 100644 index 0000000000..173eb555de --- /dev/null +++ b/assets/xml/textures/map_name_static.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/message_static.xml b/assets/xml/textures/message_static.xml new file mode 100644 index 0000000000..b0c9e43822 --- /dev/null +++ b/assets/xml/textures/message_static.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/textures/message_texture_static.xml b/assets/xml/textures/message_texture_static.xml new file mode 100644 index 0000000000..622916bee9 --- /dev/null +++ b/assets/xml/textures/message_texture_static.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/xml/textures/nes_font_static.xml b/assets/xml/textures/nes_font_static.xml new file mode 100644 index 0000000000..6a51b474af --- /dev/null +++ b/assets/xml/textures/nes_font_static.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/textures/nintendo_rogo_static.xml b/assets/xml/textures/nintendo_rogo_static.xml new file mode 100644 index 0000000000..fe9fac8dd9 --- /dev/null +++ b/assets/xml/textures/nintendo_rogo_static.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/xml/textures/parameter_static.xml b/assets/xml/textures/parameter_static.xml index f35b52269f..13b2487150 100644 --- a/assets/xml/textures/parameter_static.xml +++ b/assets/xml/textures/parameter_static.xml @@ -21,7 +21,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/assets/xml/textures/title_static.xml b/assets/xml/textures/title_static.xml new file mode 100644 index 0000000000..4b1e78353b --- /dev/null +++ b/assets/xml/textures/title_static.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spec b/spec index 84169c0f29..e6c093161c 100644 --- a/spec +++ b/spec @@ -188,37 +188,43 @@ endseg beginseg name "item_name_static" romalign 0x1000 - include "build/baserom/item_name_static.o" + include "build/assets/textures/item_name_static/item_name_static.o" + number 10 endseg beginseg name "map_name_static" romalign 0x1000 - include "build/baserom/map_name_static.o" + include "build/assets/textures/map_name_static/map_name_static.o" + number 11 endseg beginseg name "do_action_static" romalign 0x1000 - include "build/baserom/do_action_static.o" + include "build/assets/textures/do_action_static/do_action_static.o" + number 7 endseg beginseg name "message_static" romalign 0x1000 - include "build/baserom/message_static.o" + include "build/assets/textures/message_static/message_static.o" + number 7 endseg beginseg name "message_texture_static" romalign 0x1000 - include "build/baserom/message_texture_static.o" + include "build/assets/textures/message_texture_static/message_texture_static.o" + number 9 endseg beginseg name "nes_font_static" romalign 0x1000 - include "build/baserom/nes_font_static.o" + include "build/assets/textures/nes_font_static/nes_font_static.o" + number 10 endseg beginseg @@ -248,7 +254,8 @@ endseg beginseg name "map_grand_static" romalign 0x1000 - include "build/baserom/map_grand_static.o" + include "build/assets/textures/map_grand_static/map_grand_static.o" + number 11 endseg beginseg @@ -260,7 +267,8 @@ endseg beginseg name "map_i_static" romalign 0x1000 - include "build/baserom/map_i_static.o" + include "build/assets/textures/map_i_static/map_i_static.o" + number 11 endseg beginseg @@ -6225,13 +6233,15 @@ endseg beginseg name "nintendo_rogo_static" romalign 0x1000 - include "build/baserom/nintendo_rogo_static.o" + include "build/assets/textures/nintendo_rogo_static/nintendo_rogo_static.o" + number 1 endseg beginseg name "title_static" romalign 0x1000 - include "build/baserom/title_static.o" + include "build/assets/textures/title_static/title_static.o" + number 1 endseg beginseg