diff options
| -rw-r--r-- | data/debug/field_debug_entries.inc (renamed from data/field_debug_entries.inc) | 1 | ||||
| -rw-r--r-- | data/debug/field_debug_pokemart_items.inc (renamed from data/field_debug_pokemart_items.inc) | 0 | ||||
| -rw-r--r-- | data/debug/field_debug_usable_items_1.inc (renamed from data/field_debug_usable_items_1.inc) | 0 | ||||
| -rw-r--r-- | data/debug/field_debug_usable_items_2.inc (renamed from data/field_debug_usable_items_2.inc) | 0 | ||||
| -rw-r--r-- | data/tileset_headers.asm | 66 | ||||
| -rw-r--r-- | engine/debug/field/item_test.inc | 4 | ||||
| -rw-r--r-- | engine/debug/field/pokemart_menu.inc | 2 | ||||
| -rw-r--r-- | engine/debug/field_debug_menu.asm | 2 |
8 files changed, 37 insertions, 38 deletions
diff --git a/data/field_debug_entries.inc b/data/debug/field_debug_entries.inc index c304e80..bc32ef1 100644 --- a/data/field_debug_entries.inc +++ b/data/debug/field_debug_entries.inc @@ -127,4 +127,3 @@ FieldDebug_Pages: db FIELDDEBUG_TOWN_MAP db FIELDDEBUG_CLOSE_MENU db -1 - diff --git a/data/field_debug_pokemart_items.inc b/data/debug/field_debug_pokemart_items.inc index c9be9c0..c9be9c0 100644 --- a/data/field_debug_pokemart_items.inc +++ b/data/debug/field_debug_pokemart_items.inc diff --git a/data/field_debug_usable_items_1.inc b/data/debug/field_debug_usable_items_1.inc index 5115df4..5115df4 100644 --- a/data/field_debug_usable_items_1.inc +++ b/data/debug/field_debug_usable_items_1.inc diff --git a/data/field_debug_usable_items_2.inc b/data/debug/field_debug_usable_items_2.inc index 46e66f2..46e66f2 100644 --- a/data/field_debug_usable_items_2.inc +++ b/data/debug/field_debug_usable_items_2.inc diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index f12f762..a9e5041 100644 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -3,39 +3,39 @@ INCLUDE "constants.asm" SECTION "data/tileset_headers.asm", ROMX tileset: MACRO - db BANK(\2) ; bank - dw \1, \2, \3 ; Meta, GFX, Coll - db \4, \5, \6 ; counter tiles - db \7 ; unknown + db BANK(\1_GFX) ; shared bank + dw \1_Meta, \1_GFX, \1_Coll + db \2, \3, \4 ; counter tiles + db \5 ; unknown ENDM Tilesets: - ; meta, gfx, coll, 3 counter tiles, unknown - tileset Tileset_00_Meta, Tileset_00_GFX, Tileset_00_Coll, $77, $40, $00, $00 - tileset Tileset_01_Meta, Tileset_01_GFX, Tileset_01_Coll, $4b, $40, $00, $00 - tileset Tileset_02_Meta, Tileset_02_GFX, Tileset_02_Coll, $1f, $40, $00, $00 - tileset Tileset_03_Meta, Tileset_03_GFX, Tileset_03_Coll, $1f, $40, $00, $00 - tileset Tileset_04_Meta, Tileset_04_GFX, Tileset_04_Coll, $4b, $40, $00, $00 - tileset Tileset_05_Meta, Tileset_05_GFX, Tileset_05_Coll, $a7, $40, $00, $00 - tileset Tileset_06_Meta, Tileset_06_GFX, Tileset_06_Coll, $4b, $40, $00, $00 - tileset Tileset_07_Meta, Tileset_07_GFX, Tileset_07_Coll, $1f, $40, $00, $00 - tileset Tileset_08_Meta, Tileset_08_GFX, Tileset_08_Coll, $4b, $40, $00, $00 - tileset Tileset_09_Meta, Tileset_09_GFX, Tileset_09_Coll, $07, $41, $00, $00 - tileset Tileset_0a_Meta, Tileset_0a_GFX, Tileset_0a_Coll, $07, $41, $00, $00 - tileset Tileset_0b_Meta, Tileset_0b_GFX, Tileset_0b_Coll, $07, $41, $00, $00 - tileset Tileset_0c_Meta, Tileset_0c_GFX, Tileset_0c_Coll, $07, $41, $00, $00 - tileset Tileset_0d_Meta, Tileset_0d_GFX, Tileset_0d_Coll, $07, $41, $00, $00 - tileset Tileset_0e_Meta, Tileset_0e_GFX, Tileset_0e_Coll, $07, $41, $00, $00 - tileset Tileset_0f_Meta, Tileset_0f_GFX, Tileset_0f_Coll, $07, $41, $00, $00 - tileset Tileset_10_Meta, Tileset_10_GFX, Tileset_10_Coll, $07, $41, $00, $00 - tileset Tileset_11_Meta, Tileset_11_GFX, Tileset_11_Coll, $07, $41, $00, $00 - tileset Tileset_12_Meta, Tileset_12_GFX, Tileset_12_Coll, $07, $41, $00, $00 - tileset Tileset_13_Meta, Tileset_13_GFX, Tileset_13_Coll, $df, $40, $00, $00 - tileset Tileset_14_Meta, Tileset_14_GFX, Tileset_14_Coll, $07, $41, $00, $00 - tileset Tileset_15_Meta, Tileset_15_GFX, Tileset_15_Coll, $07, $41, $00, $00 - tileset Tileset_16_Meta, Tileset_16_GFX, Tileset_16_Coll, $07, $41, $00, $00 - tileset Tileset_17_Meta, Tileset_17_GFX, Tileset_17_Coll, $07, $41, $00, $00 - tileset Tileset_18_Meta, Tileset_18_GFX, Tileset_18_Coll, $07, $41, $00, $00 - tileset Tileset_19_Meta, Tileset_19_GFX, Tileset_19_Coll, $07, $41, $00, $00 - tileset Tileset_1a_Meta, Tileset_1a_GFX, Tileset_1a_Coll, $07, $41, $00, $00 - tileset Tileset_1b_Meta, Tileset_1b_GFX, Tileset_1b_Coll, $77, $40, $00, $00 + ; name, 3 counter tiles, unknown + tileset Tileset_00, $77, $40, $00, $00 + tileset Tileset_01, $4b, $40, $00, $00 + tileset Tileset_02, $1f, $40, $00, $00 + tileset Tileset_03, $1f, $40, $00, $00 + tileset Tileset_04, $4b, $40, $00, $00 + tileset Tileset_05, $a7, $40, $00, $00 + tileset Tileset_06, $4b, $40, $00, $00 + tileset Tileset_07, $1f, $40, $00, $00 + tileset Tileset_08, $4b, $40, $00, $00 + tileset Tileset_09, $07, $41, $00, $00 + tileset Tileset_0a, $07, $41, $00, $00 + tileset Tileset_0b, $07, $41, $00, $00 + tileset Tileset_0c, $07, $41, $00, $00 + tileset Tileset_0d, $07, $41, $00, $00 + tileset Tileset_0e, $07, $41, $00, $00 + tileset Tileset_0f, $07, $41, $00, $00 + tileset Tileset_10, $07, $41, $00, $00 + tileset Tileset_11, $07, $41, $00, $00 + tileset Tileset_12, $07, $41, $00, $00 + tileset Tileset_13, $df, $40, $00, $00 + tileset Tileset_14, $07, $41, $00, $00 + tileset Tileset_15, $07, $41, $00, $00 + tileset Tileset_16, $07, $41, $00, $00 + tileset Tileset_17, $07, $41, $00, $00 + tileset Tileset_18, $07, $41, $00, $00 + tileset Tileset_19, $07, $41, $00, $00 + tileset Tileset_1a, $07, $41, $00, $00 + tileset Tileset_1b, $77, $40, $00, $00 diff --git a/engine/debug/field/item_test.inc b/engine/debug/field/item_test.inc index 6f928ac..e2592bd 100644 --- a/engine/debug/field/item_test.inc +++ b/engine/debug/field/item_test.inc @@ -266,7 +266,7 @@ ItemTest_FindUsableItem: call FindItemInTable ret -INCLUDE "data/field_debug_usable_items_1.inc" +INCLUDE "data/debug/field_debug_usable_items_1.inc" ItemTest_FindUsableItem2: ld hl, ItemTest_UsableItems2 @@ -274,4 +274,4 @@ ItemTest_FindUsableItem2: call FindItemInTable ret -INCLUDE "data/field_debug_usable_items_2.inc" +INCLUDE "data/debug/field_debug_usable_items_2.inc" diff --git a/engine/debug/field/pokemart_menu.inc b/engine/debug/field/pokemart_menu.inc index 6985703..4ebeb5b 100644 --- a/engine/debug/field/pokemart_menu.inc +++ b/engine/debug/field/pokemart_menu.inc @@ -164,7 +164,7 @@ DebugMart_Buy: line "かいはつちゅうなんだ" prompt -INCLUDE "data/field_debug_pokemart_items.inc" +INCLUDE "data/debug/field_debug_pokemart_items.inc" DebugMart_Sell: call DebugMart_ShowPlaceholderText diff --git a/engine/debug/field_debug_menu.asm b/engine/debug/field_debug_menu.asm index 1fc161e..3c97280 100644 --- a/engine/debug/field_debug_menu.asm +++ b/engine/debug/field_debug_menu.asm @@ -24,7 +24,7 @@ FieldDebugMenuHeader: dw PlaceMenuStrings dw FieldDebug_MenuStrings -INCLUDE "data/field_debug_entries.inc" +INCLUDE "data/debug/field_debug_entries.inc" FieldDebugMenu:: call RefreshScreen |