diff options
| author | IIMarckus <iimarckus@gmail.com> | 2015-02-01 02:36:46 -0700 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2015-02-01 02:36:46 -0700 |
| commit | 1c82ddfee5abee7ebd7cd8f86da9ae69d2af0f2f (patch) | |
| tree | 2f9550ac887c0b82ff2f30375cb675506f6787b4 | |
| parent | 8551c4142b8fcadbf7903a0b71e56822bf33fa40 (diff) | |
Pull in new changes.
| -rw-r--r-- | stadiumgs/Makefile | 4 | ||||
| m--------- | stadiumgs/backgrounds | 0 | ||||
| m--------- | stadiumgs/presjpeg | 0 |
3 files changed, 2 insertions, 2 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 -Subproject 65ab87263a92cb8cc60ade9f9018df87939e930 +Subproject def8062c9bc0918ce37da79bbcad92c1082006c diff --git a/stadiumgs/presjpeg b/stadiumgs/presjpeg -Subproject c5e60162a101df44950a2a2a4184f3febd89e04 +Subproject bedcfd6ab0b22a3f4882f70ca5cdd634784ebef |