From f41709d3225b5acbeb163ba2e4acc7deec48c0f0 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 4 Oct 2017 02:43:45 -0500 Subject: [PATCH] Rename files for consistency with pokeruby --- data/data2b.s | 18 +++++++++--------- data/graphics.s | 4 ++-- ...n_back_pic_table.inc => back_pic_table.inc} | 0 ...footprint_table.inc => footprint_table.inc} | 0 ...front_pic_table.inc => front_pic_table.inc} | 0 .../pokemon/{mon_graphics.inc => graphics.inc} | 0 ...te_indices.inc => icon_palette_indices.inc} | 0 ...alette_table.inc => icon_palette_table.inc} | 0 .../{mon_icon_table.inc => icon_table.inc} | 0 ...mon_palette_table.inc => palette_table.inc} | 0 ...lette_table.inc => shiny_palette_table.inc} | 0 ...pic_table.inc => still_front_pic_table.inc} | 0 ...te_table.inc => back_pic_palette_table.inc} | 0 ...r_back_pic_table.inc => back_pic_table.inc} | 0 ...e_table.inc => front_pic_palette_table.inc} | 0 ...front_pic_table.inc => front_pic_table.inc} | 0 .../{trainer_graphics.inc => graphics.inc} | 0 data/pokedex.s | 2 +- data/pokemon_icon.s | 6 +++--- 19 files changed, 15 insertions(+), 15 deletions(-) rename data/graphics/pokemon/{mon_back_pic_table.inc => back_pic_table.inc} (100%) rename data/graphics/pokemon/{mon_footprint_table.inc => footprint_table.inc} (100%) rename data/graphics/pokemon/{mon_front_pic_table.inc => front_pic_table.inc} (100%) rename data/graphics/pokemon/{mon_graphics.inc => graphics.inc} (100%) rename data/graphics/pokemon/{mon_icon_palette_indices.inc => icon_palette_indices.inc} (100%) rename data/graphics/pokemon/{mon_icon_palette_table.inc => icon_palette_table.inc} (100%) rename data/graphics/pokemon/{mon_icon_table.inc => icon_table.inc} (100%) rename data/graphics/pokemon/{mon_palette_table.inc => palette_table.inc} (100%) rename data/graphics/pokemon/{mon_shiny_palette_table.inc => shiny_palette_table.inc} (100%) rename data/graphics/pokemon/{mon_still_front_pic_table.inc => still_front_pic_table.inc} (100%) rename data/graphics/trainers/{trainer_back_pic_palette_table.inc => back_pic_palette_table.inc} (100%) rename data/graphics/trainers/{trainer_back_pic_table.inc => back_pic_table.inc} (100%) rename data/graphics/trainers/{trainer_front_pic_palette_table.inc => front_pic_palette_table.inc} (100%) rename data/graphics/trainers/{trainer_front_pic_table.inc => front_pic_table.inc} (100%) rename data/graphics/trainers/{trainer_graphics.inc => graphics.inc} (100%) diff --git a/data/data2b.s b/data/data2b.s index 77bb776cc8..02ef511bf4 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -3451,7 +3451,7 @@ gUnknown_08300D38:: @ 8300D38 .byte 0x35, 0x0d, 0x00, 0x00 @ 8301418 - .include "data/graphics/pokemon/mon_still_front_pic_table.inc" + .include "data/graphics/pokemon/still_front_pic_table.inc" .align 2 gUnknown_083021D8:: @ 83021D8 @@ -3897,13 +3897,13 @@ gUnknown_083021D8:: @ 83021D8 .byte 0x47, 0x06, 0x00, 0x00 @ 83028B8 - .include "data/graphics/pokemon/mon_back_pic_table.inc" + .include "data/graphics/pokemon/back_pic_table.inc" @ 8303678 - .include "data/graphics/pokemon/mon_palette_table.inc" + .include "data/graphics/pokemon/palette_table.inc" @ 8304438 - .include "data/graphics/pokemon/mon_shiny_palette_table.inc" + .include "data/graphics/pokemon/shiny_palette_table.inc" gUnknown_083051F8:: @ 83051F8 .4byte gUnknown_082FF538 @@ -4376,10 +4376,10 @@ gUnknown_0830536C:: @ 830536C .include "data/graphics/trainers/front_pic_coords.inc" @ 8305654 - .include "data/graphics/trainers/trainer_front_pic_table.inc" + .include "data/graphics/trainers/front_pic_table.inc" @ 830593C - .include "data/graphics/trainers/trainer_front_pic_palette_table.inc" + .include "data/graphics/trainers/front_pic_palette_table.inc" gUnknown_08305C24:: @ 8305C24 .2byte 0x0000, 0x0018, 0x0001, 0x0009, 0x0002, 0x0018, 0x0000, 0x0009 @@ -4470,10 +4470,10 @@ gUnknown_08305D0C:: @ 8305D0C .include "data/graphics/trainers/back_pic_coords.inc" @ 8305D4C - .include "data/graphics/trainers/trainer_back_pic_table.inc" + .include "data/graphics/trainers/back_pic_table.inc" @ 8305D8C - .include "data/graphics/trainers/trainer_back_pic_palette_table.inc" + .include "data/graphics/trainers/back_pic_palette_table.inc" @ 8305DCC .include "data/enemy_mon_elevation.inc" @@ -4484,7 +4484,7 @@ gUnknown_08309AAC:: @ 8309AAC .incbin "baserom.gba", 0x309aac, 0x6e0 @ 830A18C - .include "data/graphics/pokemon/mon_front_pic_table.inc" + .include "data/graphics/pokemon/front_pic_table.inc" @ 830AF4C .4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888 diff --git a/data/graphics.s b/data/graphics.s index c192db3ab2..2c29d6ca50 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -207,10 +207,10 @@ gUnknown_08C2EA9C:: @ 8C2EA9C .incbin "baserom.gba", 0xc2ea9c, 0xf6c @ 8C2FA08 - .include "data/graphics/pokemon/mon_graphics.inc" + .include "data/graphics/pokemon/graphics.inc" @ 8D51DC8 - .include "data/graphics/trainers/trainer_graphics.inc" + .include "data/graphics/trainers/graphics.inc" .align 2 gMonIcon_QuestionMark:: @ 8D774D0 diff --git a/data/graphics/pokemon/mon_back_pic_table.inc b/data/graphics/pokemon/back_pic_table.inc similarity index 100% rename from data/graphics/pokemon/mon_back_pic_table.inc rename to data/graphics/pokemon/back_pic_table.inc diff --git a/data/graphics/pokemon/mon_footprint_table.inc b/data/graphics/pokemon/footprint_table.inc similarity index 100% rename from data/graphics/pokemon/mon_footprint_table.inc rename to data/graphics/pokemon/footprint_table.inc diff --git a/data/graphics/pokemon/mon_front_pic_table.inc b/data/graphics/pokemon/front_pic_table.inc similarity index 100% rename from data/graphics/pokemon/mon_front_pic_table.inc rename to data/graphics/pokemon/front_pic_table.inc diff --git a/data/graphics/pokemon/mon_graphics.inc b/data/graphics/pokemon/graphics.inc similarity index 100% rename from data/graphics/pokemon/mon_graphics.inc rename to data/graphics/pokemon/graphics.inc diff --git a/data/graphics/pokemon/mon_icon_palette_indices.inc b/data/graphics/pokemon/icon_palette_indices.inc similarity index 100% rename from data/graphics/pokemon/mon_icon_palette_indices.inc rename to data/graphics/pokemon/icon_palette_indices.inc diff --git a/data/graphics/pokemon/mon_icon_palette_table.inc b/data/graphics/pokemon/icon_palette_table.inc similarity index 100% rename from data/graphics/pokemon/mon_icon_palette_table.inc rename to data/graphics/pokemon/icon_palette_table.inc diff --git a/data/graphics/pokemon/mon_icon_table.inc b/data/graphics/pokemon/icon_table.inc similarity index 100% rename from data/graphics/pokemon/mon_icon_table.inc rename to data/graphics/pokemon/icon_table.inc diff --git a/data/graphics/pokemon/mon_palette_table.inc b/data/graphics/pokemon/palette_table.inc similarity index 100% rename from data/graphics/pokemon/mon_palette_table.inc rename to data/graphics/pokemon/palette_table.inc diff --git a/data/graphics/pokemon/mon_shiny_palette_table.inc b/data/graphics/pokemon/shiny_palette_table.inc similarity index 100% rename from data/graphics/pokemon/mon_shiny_palette_table.inc rename to data/graphics/pokemon/shiny_palette_table.inc diff --git a/data/graphics/pokemon/mon_still_front_pic_table.inc b/data/graphics/pokemon/still_front_pic_table.inc similarity index 100% rename from data/graphics/pokemon/mon_still_front_pic_table.inc rename to data/graphics/pokemon/still_front_pic_table.inc diff --git a/data/graphics/trainers/trainer_back_pic_palette_table.inc b/data/graphics/trainers/back_pic_palette_table.inc similarity index 100% rename from data/graphics/trainers/trainer_back_pic_palette_table.inc rename to data/graphics/trainers/back_pic_palette_table.inc diff --git a/data/graphics/trainers/trainer_back_pic_table.inc b/data/graphics/trainers/back_pic_table.inc similarity index 100% rename from data/graphics/trainers/trainer_back_pic_table.inc rename to data/graphics/trainers/back_pic_table.inc diff --git a/data/graphics/trainers/trainer_front_pic_palette_table.inc b/data/graphics/trainers/front_pic_palette_table.inc similarity index 100% rename from data/graphics/trainers/trainer_front_pic_palette_table.inc rename to data/graphics/trainers/front_pic_palette_table.inc diff --git a/data/graphics/trainers/trainer_front_pic_table.inc b/data/graphics/trainers/front_pic_table.inc similarity index 100% rename from data/graphics/trainers/trainer_front_pic_table.inc rename to data/graphics/trainers/front_pic_table.inc diff --git a/data/graphics/trainers/trainer_graphics.inc b/data/graphics/trainers/graphics.inc similarity index 100% rename from data/graphics/trainers/trainer_graphics.inc rename to data/graphics/trainers/graphics.inc diff --git a/data/pokedex.s b/data/pokedex.s index e81a3d78aa..3ba94dbc59 100644 --- a/data/pokedex.s +++ b/data/pokedex.s @@ -95,7 +95,7 @@ gUnknown_0856E688:: @ 856E688 .incbin "baserom.gba", 0x56e688, 0xc @ 856E694 - .include "data/graphics/pokemon/mon_footprint_table.inc" + .include "data/graphics/pokemon/footprint_table.inc" gUnknown_0856ED08:: @ 856ED08 .incbin "baserom.gba", 0x56ed08, 0x28 diff --git a/data/pokemon_icon.s b/data/pokemon_icon.s index ab3824f354..831664bb70 100644 --- a/data/pokemon_icon.s +++ b/data/pokemon_icon.s @@ -5,13 +5,13 @@ .align 2, 0 @ 857BCA8 - .include "data/graphics/pokemon/mon_icon_table.inc" + .include "data/graphics/pokemon/icon_table.inc" @ 857C388 - .include "data/graphics/pokemon/mon_icon_palette_indices.inc" + .include "data/graphics/pokemon/icon_palette_indices.inc" @ 857C540 - .include "data/graphics/pokemon/mon_icon_palette_table.inc" + .include "data/graphics/pokemon/icon_palette_table.inc" gUnknown_0857C570:: @ 857C570 .incbin "baserom.gba", 0x57c570, 0x44