summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/graphics.s16
-rwxr-xr-xgraphics/unused/old_battle_interface_1.png (renamed from graphics/unused/obi_battle_interface_1.png)bin524 -> 524 bytes
-rwxr-xr-xgraphics/unused/old_battle_interface_2.png (renamed from graphics/unused/obi_battle_interface_2.png)bin198 -> 198 bytes
-rwxr-xr-xgraphics/unused/old_battle_interface_3.png (renamed from graphics/unused/obi_battle_interface_3.png)bin226 -> 226 bytes
-rwxr-xr-xgraphics/unused/old_battle_interface_tilemap.bin (renamed from graphics/unused/obi_tilemap.bin)bin2048 -> 2048 bytes
-rwxr-xr-xgraphics/unused/old_bulbasaur.png (renamed from graphics/unused/obi_bulbasaur.png)bin490 -> 490 bytes
-rwxr-xr-xgraphics/unused/old_bulbasaur2.png (renamed from graphics/unused/obi_bulbasaur2.png)bin520 -> 520 bytes
-rwxr-xr-xgraphics/unused/old_charizard.png (renamed from graphics/unused/obi_charizard.png)bin335 -> 335 bytes
-rwxr-xr-xgraphics/unused/old_charmap.bin (renamed from graphics/unused/old.bin)bin4096 -> 4096 bytes
-rwxr-xr-xgraphics/unused/old_charmap.pal (renamed from graphics/unused/old.pal)0
-rwxr-xr-xgraphics/unused/old_charmap.png (renamed from graphics/unused/old.png)bin1934 -> 1934 bytes
-rwxr-xr-xgraphics/unused/old_contest.bin (renamed from graphics/unused/beta_contest.bin)bin2048 -> 2048 bytes
-rwxr-xr-xgraphics/unused/old_contest.pal (renamed from graphics/unused/beta_contest.pal)0
-rwxr-xr-xgraphics/unused/old_contest_classes.png (renamed from graphics/unused/beta_contest_classes.png)bin292 -> 292 bytes
-rwxr-xr-xgraphics/unused/old_contest_floor.png (renamed from graphics/unused/beta_contest_floor.png)bin614 -> 614 bytes
-rwxr-xr-xgraphics/unused/old_contest_frame_1.png (renamed from graphics/unused/beta_contest_frame_1.png)bin359 -> 359 bytes
-rwxr-xr-xgraphics/unused/old_contest_frame_2.png (renamed from graphics/unused/beta_contest_frame_2.png)bin259 -> 259 bytes
-rwxr-xr-xgraphics/unused/old_contest_meter.png (renamed from graphics/unused/beta_contest_meter.png)bin212 -> 212 bytes
-rwxr-xr-xgraphics/unused/old_contest_numbers.png (renamed from graphics/unused/beta_contest_numbers.png)bin324 -> 324 bytes
-rwxr-xr-xgraphics/unused/old_contest_symbols.png (renamed from graphics/unused/beta_contest_symbols.png)bin237 -> 237 bytes
-rwxr-xr-xgraphics/unused/old_pal1.pal (renamed from graphics/unused/obi_pal1.pal)0
-rwxr-xr-xgraphics/unused/old_pal2.pal (renamed from graphics/unused/obi_pal2.pal)0
-rwxr-xr-xgraphics/unused/old_pal3.pal (renamed from graphics/unused/obi_pal3.pal)0
-rwxr-xr-xgraphics/unused/old_pal4.pal (renamed from graphics/unused/obi_pal4.pal)0
-rwxr-xr-xgraphics/unused/old_pal5.pal (renamed from graphics/unused/obi_pal5.pal)0
-rwxr-xr-xgraphics/unused/old_pal6.pal (renamed from graphics/unused/obi_pal6.pal)0
-rwxr-xr-xgraphics/unused/old_pal7.pal (renamed from graphics/unused/obi_pal7.pal)0
-rwxr-xr-xmisc.mk20
28 files changed, 18 insertions, 18 deletions
diff --git a/data/graphics.s b/data/graphics.s
index bebde2e02..22e91d378 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -18,9 +18,9 @@ gUnknown_08D00524:: @ 8D00524
.include "data/graphics/pokemon/circled_question_mark_graphics.s"
@ 8D019E4
- .incbin "graphics/unused/old.4bpp.lz" @ japanese table and bunch of stuff
- .incbin "graphics/unused/old.bin.lz"
- .incbin "graphics/unused/old.gbapal.lz"
+ .incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff
+ .incbin "graphics/unused/old_charmap.bin.lz"
+ .incbin "graphics/unused/old_charmap.gbapal.lz"
.align 2
gSmokescreenImpactTiles:: @ 8D02410
@@ -437,7 +437,7 @@ gBattleAnimSpriteSheet_037:: @ 8D0781C
.incbin "graphics/unused/obi_palpak1.gbapal.lz" @ palettes 1-3
.align 2
- .incbin "graphics/unused/obi_pal4.gbapal.lz" @ 4 is by itself
+ .incbin "graphics/unused/old_pal4.gbapal.lz" @ 4 is by itself
.align 2
.incbin "graphics/unused/obi_palpak3.gbapal.lz" @ palettes 5-7
@@ -446,7 +446,7 @@ gBattleAnimSpriteSheet_037:: @ 8D0781C
.incbin "graphics/unused/obi2.4bpp.lz"
.align 2
- .incbin "graphics/unused/obi_tilemap.bin.lz"
+ .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz"
.align 2
gBattleAnimSpritePalette_038:: @ 8D086E4
@@ -1177,13 +1177,13 @@ gBattleAnimSpriteSheet_077:: @ 8D150F4
.incbin "graphics/battle_anims/sprites/077.4bpp.lz"
.align 2
- .incbin "graphics/unused/beta_contest.4bpp.lz"
+ .incbin "graphics/unused/old_contest.4bpp.lz"
.align 2
- .incbin "graphics/unused/beta_contest.gbapal.lz"
+ .incbin "graphics/unused/old_contest.gbapal.lz"
.align 2
- .incbin "graphics/unused/beta_contest.bin.lz"
+ .incbin "graphics/unused/old_contest.bin.lz"
.align 2
.incbin "baserom.gba", 0xD15D64, 0x2C0 @ LZ, uncomp. size = 0x1000
diff --git a/graphics/unused/obi_battle_interface_1.png b/graphics/unused/old_battle_interface_1.png
index 0b2fe5eb7..0b2fe5eb7 100755
--- a/graphics/unused/obi_battle_interface_1.png
+++ b/graphics/unused/old_battle_interface_1.png
Binary files differ
diff --git a/graphics/unused/obi_battle_interface_2.png b/graphics/unused/old_battle_interface_2.png
index 04229ccda..04229ccda 100755
--- a/graphics/unused/obi_battle_interface_2.png
+++ b/graphics/unused/old_battle_interface_2.png
Binary files differ
diff --git a/graphics/unused/obi_battle_interface_3.png b/graphics/unused/old_battle_interface_3.png
index 428c7765d..428c7765d 100755
--- a/graphics/unused/obi_battle_interface_3.png
+++ b/graphics/unused/old_battle_interface_3.png
Binary files differ
diff --git a/graphics/unused/obi_tilemap.bin b/graphics/unused/old_battle_interface_tilemap.bin
index aae3307e7..aae3307e7 100755
--- a/graphics/unused/obi_tilemap.bin
+++ b/graphics/unused/old_battle_interface_tilemap.bin
Binary files differ
diff --git a/graphics/unused/obi_bulbasaur.png b/graphics/unused/old_bulbasaur.png
index 729ebe789..729ebe789 100755
--- a/graphics/unused/obi_bulbasaur.png
+++ b/graphics/unused/old_bulbasaur.png
Binary files differ
diff --git a/graphics/unused/obi_bulbasaur2.png b/graphics/unused/old_bulbasaur2.png
index f374e5a9f..f374e5a9f 100755
--- a/graphics/unused/obi_bulbasaur2.png
+++ b/graphics/unused/old_bulbasaur2.png
Binary files differ
diff --git a/graphics/unused/obi_charizard.png b/graphics/unused/old_charizard.png
index e1470aada..e1470aada 100755
--- a/graphics/unused/obi_charizard.png
+++ b/graphics/unused/old_charizard.png
Binary files differ
diff --git a/graphics/unused/old.bin b/graphics/unused/old_charmap.bin
index aa15ea36e..aa15ea36e 100755
--- a/graphics/unused/old.bin
+++ b/graphics/unused/old_charmap.bin
Binary files differ
diff --git a/graphics/unused/old.pal b/graphics/unused/old_charmap.pal
index cbcd5de4d..cbcd5de4d 100755
--- a/graphics/unused/old.pal
+++ b/graphics/unused/old_charmap.pal
diff --git a/graphics/unused/old.png b/graphics/unused/old_charmap.png
index b5ea6e803..b5ea6e803 100755
--- a/graphics/unused/old.png
+++ b/graphics/unused/old_charmap.png
Binary files differ
diff --git a/graphics/unused/beta_contest.bin b/graphics/unused/old_contest.bin
index da6f4652e..da6f4652e 100755
--- a/graphics/unused/beta_contest.bin
+++ b/graphics/unused/old_contest.bin
Binary files differ
diff --git a/graphics/unused/beta_contest.pal b/graphics/unused/old_contest.pal
index 69fde2000..69fde2000 100755
--- a/graphics/unused/beta_contest.pal
+++ b/graphics/unused/old_contest.pal
diff --git a/graphics/unused/beta_contest_classes.png b/graphics/unused/old_contest_classes.png
index c2e7b5e29..c2e7b5e29 100755
--- a/graphics/unused/beta_contest_classes.png
+++ b/graphics/unused/old_contest_classes.png
Binary files differ
diff --git a/graphics/unused/beta_contest_floor.png b/graphics/unused/old_contest_floor.png
index 94877b921..94877b921 100755
--- a/graphics/unused/beta_contest_floor.png
+++ b/graphics/unused/old_contest_floor.png
Binary files differ
diff --git a/graphics/unused/beta_contest_frame_1.png b/graphics/unused/old_contest_frame_1.png
index 28eaae905..28eaae905 100755
--- a/graphics/unused/beta_contest_frame_1.png
+++ b/graphics/unused/old_contest_frame_1.png
Binary files differ
diff --git a/graphics/unused/beta_contest_frame_2.png b/graphics/unused/old_contest_frame_2.png
index c8b20408c..c8b20408c 100755
--- a/graphics/unused/beta_contest_frame_2.png
+++ b/graphics/unused/old_contest_frame_2.png
Binary files differ
diff --git a/graphics/unused/beta_contest_meter.png b/graphics/unused/old_contest_meter.png
index 606208b1f..606208b1f 100755
--- a/graphics/unused/beta_contest_meter.png
+++ b/graphics/unused/old_contest_meter.png
Binary files differ
diff --git a/graphics/unused/beta_contest_numbers.png b/graphics/unused/old_contest_numbers.png
index 98c145976..98c145976 100755
--- a/graphics/unused/beta_contest_numbers.png
+++ b/graphics/unused/old_contest_numbers.png
Binary files differ
diff --git a/graphics/unused/beta_contest_symbols.png b/graphics/unused/old_contest_symbols.png
index 87cac733e..87cac733e 100755
--- a/graphics/unused/beta_contest_symbols.png
+++ b/graphics/unused/old_contest_symbols.png
Binary files differ
diff --git a/graphics/unused/obi_pal1.pal b/graphics/unused/old_pal1.pal
index 1e2ef9083..1e2ef9083 100755
--- a/graphics/unused/obi_pal1.pal
+++ b/graphics/unused/old_pal1.pal
diff --git a/graphics/unused/obi_pal2.pal b/graphics/unused/old_pal2.pal
index 3c5e6ad7f..3c5e6ad7f 100755
--- a/graphics/unused/obi_pal2.pal
+++ b/graphics/unused/old_pal2.pal
diff --git a/graphics/unused/obi_pal3.pal b/graphics/unused/old_pal3.pal
index d07e21019..d07e21019 100755
--- a/graphics/unused/obi_pal3.pal
+++ b/graphics/unused/old_pal3.pal
diff --git a/graphics/unused/obi_pal4.pal b/graphics/unused/old_pal4.pal
index 60b814f75..60b814f75 100755
--- a/graphics/unused/obi_pal4.pal
+++ b/graphics/unused/old_pal4.pal
diff --git a/graphics/unused/obi_pal5.pal b/graphics/unused/old_pal5.pal
index b6f481d46..b6f481d46 100755
--- a/graphics/unused/obi_pal5.pal
+++ b/graphics/unused/old_pal5.pal
diff --git a/graphics/unused/obi_pal6.pal b/graphics/unused/old_pal6.pal
index 6d91e9918..6d91e9918 100755
--- a/graphics/unused/obi_pal6.pal
+++ b/graphics/unused/old_pal6.pal
diff --git a/graphics/unused/obi_pal7.pal b/graphics/unused/old_pal7.pal
index d380bc65d..d380bc65d 100755
--- a/graphics/unused/obi_pal7.pal
+++ b/graphics/unused/old_pal7.pal
diff --git a/misc.mk b/misc.mk
index 441c3e4de..3005252e7 100755
--- a/misc.mk
+++ b/misc.mk
@@ -167,17 +167,17 @@ $(PICFRAMEGFXDIR)/frame5.4bpp: $(PICFRAMEGFXDIR)/frame5.png
$(MISCGFXDIR)/nextturn.4bpp: $(MISCGFXDIR)/nextturn.png
$(GFX) $< $@ -num_tiles 8
-$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/obi_pal1.gbapal $(UNUSEDGFXDIR)/obi_pal2.gbapal $(UNUSEDGFXDIR)/obi_pal3.gbapal
- @cat $(UNUSEDGFXDIR)/obi_pal1.gbapal $(UNUSEDGFXDIR)/obi_pal2.gbapal $(UNUSEDGFXDIR)/obi_pal3.gbapal >$@
+$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal $(UNUSEDGFXDIR)/old_pal2.gbapal $(UNUSEDGFXDIR)/old_pal3.gbapal
+ @cat $(UNUSEDGFXDIR)/old_pal1.gbapal $(UNUSEDGFXDIR)/old_pal2.gbapal $(UNUSEDGFXDIR)/old_pal3.gbapal >$@
-$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/obi_pal5.gbapal $(UNUSEDGFXDIR)/obi_pal6.gbapal $(UNUSEDGFXDIR)/obi_pal7.gbapal
- @cat $(UNUSEDGFXDIR)/obi_pal5.gbapal $(UNUSEDGFXDIR)/obi_pal6.gbapal $(UNUSEDGFXDIR)/obi_pal7.gbapal >$@
+$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal $(UNUSEDGFXDIR)/old_pal6.gbapal $(UNUSEDGFXDIR)/old_pal7.gbapal
+ @cat $(UNUSEDGFXDIR)/old_pal5.gbapal $(UNUSEDGFXDIR)/old_pal6.gbapal $(UNUSEDGFXDIR)/old_pal7.gbapal >$@
-$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/obi_bulbasaur.4bpp $(UNUSEDGFXDIR)/obi_charizard.4bpp
- @cat $(UNUSEDGFXDIR)/obi_bulbasaur.4bpp $(UNUSEDGFXDIR)/obi_charizard.4bpp >$@
+$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp $(UNUSEDGFXDIR)/old_charizard.4bpp
+ @cat $(UNUSEDGFXDIR)/old_bulbasaur.4bpp $(UNUSEDGFXDIR)/old_charizard.4bpp >$@
-$(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/obi_bulbasaur2.4bpp $(UNUSEDGFXDIR)/obi_battle_interface_1.4bpp $(UNUSEDGFXDIR)/obi_battle_interface_2.4bpp $(UNUSEDGFXDIR)/obi_battle_interface_3.4bpp
- @cat $(UNUSEDGFXDIR)/obi_bulbasaur2.4bpp $(UNUSEDGFXDIR)/obi_battle_interface_1.4bpp $(UNUSEDGFXDIR)/obi_battle_interface_2.4bpp $(UNUSEDGFXDIR)/obi_battle_interface_3.4bpp >$@
+$(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp
+ @cat $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp >$@
$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/numbers2.4bpp
@cat $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/numbers2.4bpp >$@
@@ -188,5 +188,5 @@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin $(UNUSED
$(UNUSEDGFXDIR)/color_frames.4bpp: $(UNUSEDGFXDIR)/color_frames.png
$(GFX) $< $@ -num_tiles 353
-$(UNUSEDGFXDIR)/beta_contest.4bpp: $(UNUSEDGFXDIR)/beta_contest_frame_1.4bpp $(UNUSEDGFXDIR)/beta_contest_floor.4bpp $(UNUSEDGFXDIR)/beta_contest_frame_2.4bpp $(UNUSEDGFXDIR)/beta_contest_symbols.4bpp $(UNUSEDGFXDIR)/beta_contest_meter.4bpp $(UNUSEDGFXDIR)/beta_contest_classes.4bpp $(UNUSEDGFXDIR)/beta_contest_numbers.4bpp
- @cat $(UNUSEDGFXDIR)/beta_contest_frame_1.4bpp $(UNUSEDGFXDIR)/beta_contest_floor.4bpp $(UNUSEDGFXDIR)/beta_contest_frame_2.4bpp $(UNUSEDGFXDIR)/beta_contest_symbols.4bpp $(UNUSEDGFXDIR)/beta_contest_meter.4bpp $(UNUSEDGFXDIR)/beta_contest_classes.4bpp $(UNUSEDGFXDIR)/beta_contest_numbers.4bpp >$@
+$(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp $(UNUSEDGFXDIR)/old_contest_floor.4bpp $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp $(UNUSEDGFXDIR)/old_contest_symbols.4bpp $(UNUSEDGFXDIR)/old_contest_meter.4bpp $(UNUSEDGFXDIR)/old_contest_classes.4bpp $(UNUSEDGFXDIR)/old_contest_numbers.4bpp
+ @cat $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp $(UNUSEDGFXDIR)/old_contest_floor.4bpp $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp $(UNUSEDGFXDIR)/old_contest_symbols.4bpp $(UNUSEDGFXDIR)/old_contest_meter.4bpp $(UNUSEDGFXDIR)/old_contest_classes.4bpp $(UNUSEDGFXDIR)/old_contest_numbers.4bpp >$@
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 11:46:25 +0000