summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-10-26 15:28:06 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-10-26 15:28:06 -0400
commit743c01fd7e016e02fc544e1da801af8d20f4ac8d (patch)
tree29ac6c00128212854f8d96ac732885af97875305
parentb7e4372f54b524b06d25816003b8e82fe6c1fd7f (diff)
trivial baserom resolve
-rw-r--r--baserom.ipsbin596901 -> 596864 bytes
-rw-r--r--data/graphics.s2
2 files changed, 1 insertions, 1 deletions
diff --git a/baserom.ips b/baserom.ips
index 4a5d85146..418050676 100644
--- a/baserom.ips
+++ b/baserom.ips
Binary files differ
diff --git a/data/graphics.s b/data/graphics.s
index 4eb70588a..2adc0f0b3 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1063,7 +1063,7 @@ gFile_graphics_unused_basic_frame_tilemap:: @ 8D11A78
.align 2
gBattleInterface_BallStatusBarPal:: @ 8D11B84
- .incbin "baserom.gba", 0xD11B84, 0x20
+ .incbin "graphics/battle_interface/ball_status_bar.gbapal"
gBattleInterface_BallDisplayPal:: @ 8D11BA4
.incbin "graphics/battle_interface/ball_display.gbapal"