summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultima-soul <akshayjhanji@hotmail.com>2019-10-17 13:16:42 -0700
committerultima-soul <akshayjhanji@hotmail.com>2019-10-17 13:16:42 -0700
commitbcbd4bcee2d3214d5d7a39b188ebb1639b05ae69 (patch)
tree705c1c98b1c86bb4b5b7ba922a0a16790cdff345
parent790966aec02d9e8540a1adcf39b7b6c0be55c0d5 (diff)
Fix build and bump baserom.ips.
-rw-r--r--baserom.ipsbin1675622 -> 1671478 bytes
-rw-r--r--data/graphics.s4
2 files changed, 2 insertions, 2 deletions
diff --git a/baserom.ips b/baserom.ips
index 59846cc98..998959a17 100644
--- a/baserom.ips
+++ b/baserom.ips
Binary files differ
diff --git a/data/graphics.s b/data/graphics.s
index 23130b8df..6b5d0c499 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -13269,11 +13269,11 @@ gTrainerPalette_SisAndBro:: @ 8E66860
.align 2
gTrainerFrontPic_ProfessorOak:: @ 8E66888
- .incbin "graphics/trainers/front_pics/oak_front_pic.4bpp.lz"
+ .incbin "graphics/trainers/front_pics/professor_oak_front_pic.4bpp.lz"
.align 2
gTrainerPalette_ProfessorOak:: @ 8E66Bf4
- .incbin "graphics/trainers/palettes/oak.gbapal.lz"
+ .incbin "graphics/trainers/palettes/professor_oak.gbapal.lz"
.align 2
gTrainerFrontPic_RSBrendan2:: @ 8E66C1C