From 0297b8f6f2b49ebc4d105e2830203b8ff1c2e20c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 13 Sep 2017 18:29:49 -0700 Subject: Re-organize unused data blobs --- data/unknown/unused_4b6a8.bin | Bin 2392 -> 0 bytes data/unknown/unused_9800.asm | 19 ------------------- data/unknown/unused_dbf60.bin | Bin 160 -> 0 bytes data/unused/unused_4b6a8.bin | Bin 0 -> 2392 bytes data/unused/unused_9800.asm | 19 +++++++++++++++++++ data/unused/unused_data_d3800.bin | Bin 0 -> 2048 bytes data/unused/unused_dbf60.bin | Bin 0 -> 160 bytes data/unused_data_d3800.bin | Bin 2048 -> 0 bytes main.asm | 8 ++++---- 9 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 data/unknown/unused_4b6a8.bin delete mode 100755 data/unknown/unused_9800.asm delete mode 100644 data/unknown/unused_dbf60.bin create mode 100644 data/unused/unused_4b6a8.bin create mode 100755 data/unused/unused_9800.asm create mode 100644 data/unused/unused_data_d3800.bin create mode 100644 data/unused/unused_dbf60.bin delete mode 100644 data/unused_data_d3800.bin diff --git a/data/unknown/unused_4b6a8.bin b/data/unknown/unused_4b6a8.bin deleted file mode 100644 index bddd5a0..0000000 Binary files a/data/unknown/unused_4b6a8.bin and /dev/null differ diff --git a/data/unknown/unused_9800.asm b/data/unknown/unused_9800.asm deleted file mode 100755 index f87722a..0000000 --- a/data/unknown/unused_9800.asm +++ /dev/null @@ -1,19 +0,0 @@ -macro_9800: MACRO -x = 0 -rept \1 -y = 0 -rept $100 / \1 - db (x + y) & $ff -y = y + \1 -endr -x = x + 1 -endr -endm - -Data_9800: - -w = $100 -rept 8 - macro_9800 w -w = w >> 1 -endr diff --git a/data/unknown/unused_dbf60.bin b/data/unknown/unused_dbf60.bin deleted file mode 100644 index af8870c..0000000 Binary files a/data/unknown/unused_dbf60.bin and /dev/null differ diff --git a/data/unused/unused_4b6a8.bin b/data/unused/unused_4b6a8.bin new file mode 100644 index 0000000..bddd5a0 Binary files /dev/null and b/data/unused/unused_4b6a8.bin differ diff --git a/data/unused/unused_9800.asm b/data/unused/unused_9800.asm new file mode 100755 index 0000000..f87722a --- /dev/null +++ b/data/unused/unused_9800.asm @@ -0,0 +1,19 @@ +macro_9800: MACRO +x = 0 +rept \1 +y = 0 +rept $100 / \1 + db (x + y) & $ff +y = y + \1 +endr +x = x + 1 +endr +endm + +Data_9800: + +w = $100 +rept 8 + macro_9800 w +w = w >> 1 +endr diff --git a/data/unused/unused_data_d3800.bin b/data/unused/unused_data_d3800.bin new file mode 100644 index 0000000..aedea89 Binary files /dev/null and b/data/unused/unused_data_d3800.bin differ diff --git a/data/unused/unused_dbf60.bin b/data/unused/unused_dbf60.bin new file mode 100644 index 0000000..af8870c Binary files /dev/null and b/data/unused/unused_dbf60.bin differ diff --git a/data/unused_data_d3800.bin b/data/unused_data_d3800.bin deleted file mode 100644 index aedea89..0000000 Binary files a/data/unused_data_d3800.bin and /dev/null differ diff --git a/main.asm b/main.asm index 88bb9d7..c77ee8b 100644 --- a/main.asm +++ b/main.asm @@ -25,7 +25,7 @@ INCLUDE "engine/pokedex/variable_width_font_character.asm" SECTION "bank2.2", ROMX -INCLUDE "data/unknown/unused_9800.asm" +INCLUDE "data/unused/unused_9800.asm" PokedexCharactersGfx: ; 0xa000 INCBIN "gfx/pokedex/characters.interleave.2bpp" @@ -189,7 +189,7 @@ SECTION "bank12", ROMX INCLUDE "audio/engine_12.asm" ; This is a blob of unused junk data -INCBIN "data/unknown/unused_4b6a8.bin" +INCBIN "data/unused/unused_4b6a8.bin" SECTION "bank13", ROMX @@ -866,7 +866,7 @@ DiglettBonusTilemap_GameBoyColor: ; 0xd3000 DiglettBonusTilemap2_GameBoyColor: ; 0xd3400 INCBIN "gfx/tilemaps/stage_diglett_bonus_gameboycolor_2.map" -INCBIN "data/unused_data_d3800.bin" +INCBIN "data/unused/unused_data_d3800.bin" SECTION "bank35", ROMX @@ -1034,7 +1034,7 @@ EvolutionTrinketsGfx: Unknown_dbf60: ; 0xdbf60 ; this seems to be unused garbage - INCBIN "data/unknown/unused_dbf60.bin" + INCBIN "data/unused/unused_dbf60.bin" SECTION "bank37", ROMX -- cgit v1.2.3