From 1c82ddfee5abee7ebd7cd8f86da9ae69d2af0f2f Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Sun, 1 Feb 2015 02:36:46 -0700 Subject: Pull in new changes. --- stadiumgs/Makefile | 4 ++-- stadiumgs/backgrounds | 2 +- stadiumgs/presjpeg | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stadiumgs/Makefile b/stadiumgs/Makefile index 8f3c7f8..f762523 100644 --- a/stadiumgs/Makefile +++ b/stadiumgs/Makefile @@ -2068,7 +2068,7 @@ BACKGROUNDS = \ backgrounds/labmachine.bin \ backgrounds/whitecity2.bin \ backgrounds/freebattle.bin \ - backgrounds/0x1f449b0.bin \ + backgrounds/selectpokemon/0x1f449b0.bin \ backgrounds/0x1f48620.bin \ backgrounds/0x1f4eca0.bin \ backgrounds/castlejohto.bin \ @@ -2091,7 +2091,7 @@ BACKGROUNDS = \ backgrounds/credits/redvsblue.bin \ backgrounds/0x1fe3520.bin \ backgrounds/0x1fea540.bin \ - backgrounds/battlenow.bin \ + backgrounds/selectpokemon/battlenow.bin \ backgrounds/mysterygift.bin .SUFFIXES: .txt .json .bin diff --git a/stadiumgs/backgrounds b/stadiumgs/backgrounds index 65ab872..def8062 160000 --- a/stadiumgs/backgrounds +++ b/stadiumgs/backgrounds @@ -1 +1 @@ -Subproject commit 65ab87263a92cb8cc60ade9f9018df87939e9304 +Subproject commit def8062c9bc0918ce37da79bbcad92c1082006c9 diff --git a/stadiumgs/presjpeg b/stadiumgs/presjpeg index c5e6016..bedcfd6 160000 --- a/stadiumgs/presjpeg +++ b/stadiumgs/presjpeg @@ -1 +1 @@ -Subproject commit c5e60162a101df44950a2a2a4184f3febd89e04a +Subproject commit bedcfd6ab0b22a3f4882f70ca5cdd634784ebef4 -- cgit v1.2.3