summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-10-15 17:58:28 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-10-15 17:58:28 -0500
commit2262c45958dd122df44d7116b1b9472d783fed3e (patch)
tree933f1dc713e26e151acb2b3b15de7bbf314a7894
parentecaeb97e1d6583136d8194a69ea1f09bc02e2604 (diff)
Dump field select screen graphics
-rwxr-xr-xasm/main.s40
-rwxr-xr-xdata/graphics/field_select.inc26
-rwxr-xr-xdata/rom.s7
-rw-r--r--graphics/field_select/bg_pals.pal259
-rw-r--r--graphics/field_select/frame_shadow_tilemap.binbin0 -> 2048 bytes
-rw-r--r--graphics/field_select/mini_fields.pngbin0 -> 6535 bytes
-rw-r--r--graphics/field_select/sprite_pals.pal259
-rw-r--r--graphics/field_select/sprites.pngbin0 -> 2025 bytes
-rwxr-xr-xgraphics/field_select/unknown_080A4000.binbin0 -> 32 bytes
-rw-r--r--graphics/field_select/unknown_080A8020.binbin0 -> 32 bytes
-rw-r--r--graphics/field_select/window_tilemap.binbin0 -> 2048 bytes
-rw-r--r--graphics/field_select/window_tiles.pngbin0 -> 845 bytes
-rwxr-xr-xgraphics_rules.mk3
13 files changed, 573 insertions, 21 deletions
diff --git a/asm/main.s b/asm/main.s
index 87d4b6c..ae1395f 100755
--- a/asm/main.s
+++ b/asm/main.s
@@ -4568,7 +4568,7 @@ sub_25C4: @ 0x080025C4
ldr r1, _080026C0 @ =0x80000100
str r1, [r0, #8]
ldr r1, [r0, #8]
- ldr r1, _080026C4 @ =0x080A2C00
+ ldr r1, _080026C4 @ =gFieldSelectWindow_Gfx
str r1, [r0]
ldr r1, _080026C8 @ =0x06004000
str r1, [r0, #4]
@@ -4602,14 +4602,14 @@ sub_25C4: @ 0x080025C4
str r1, [r0, #4]
str r2, [r0, #8]
ldr r1, [r0, #8]
- ldr r1, _080026F4 @ =0x080A8A40
+ ldr r1, _080026F4 @ =gFieldSelectSpritePals
str r1, [r0]
ldr r1, _080026F8 @ =0x05000200
str r1, [r0, #4]
ldr r1, _080026FC @ =0x80000030
str r1, [r0, #8]
ldr r1, [r0, #8]
- ldr r1, _08002700 @ =0x080A8C40
+ ldr r1, _08002700 @ =gFieldSelectSpriteGfx
str r1, [r0]
ldr r1, _08002704 @ =0x06010000
str r1, [r0, #4]
@@ -4636,7 +4636,7 @@ _080026B4: .4byte 0x0200B0C0
_080026B8: .4byte 0x040000D4
_080026BC: .4byte 0x0807C2E0
_080026C0: .4byte 0x80000100
-_080026C4: .4byte 0x080A2C00
+_080026C4: .4byte gFieldSelectWindow_Gfx
_080026C8: .4byte 0x06004000
_080026CC: .4byte 0x80002000
_080026D0: .4byte 0x0807C4E0
@@ -4648,10 +4648,10 @@ _080026E4: .4byte 0x0807B2E0
_080026E8: .4byte 0x06000800
_080026EC: .4byte 0x0807BAE0
_080026F0: .4byte 0x06001000
-_080026F4: .4byte 0x080A8A40
+_080026F4: .4byte gFieldSelectSpritePals
_080026F8: .4byte 0x05000200
_080026FC: .4byte 0x80000030
-_08002700: .4byte 0x080A8C40
+_08002700: .4byte gFieldSelectSpriteGfx
_08002704: .4byte 0x06010000
_08002708: .4byte 0x80002010
_0800270C: .4byte sub_29C8 + 1
@@ -16912,7 +16912,7 @@ sub_8AF4: @ 0x08008AF4
ldrh r0, [r2]
strh r0, [r4, #0x16]
ldr r0, _08008BE4 @ =0x040000D4
- ldr r1, _08008BE8 @ =0x080A8840
+ ldr r1, _08008BE8 @ =gFieldSelectBGPals
str r1, [r0]
movs r1, #0xa0
lsls r1, r1, #0x13
@@ -16920,14 +16920,14 @@ sub_8AF4: @ 0x08008AF4
ldr r3, _08008BEC @ =0x80000100
str r3, [r0, #8]
ldr r1, [r0, #8]
- ldr r1, _08008BF0 @ =0x080A2C00
+ ldr r1, _08008BF0 @ =gFieldSelectWindow_Gfx
str r1, [r0]
ldr r1, _08008BF4 @ =0x06004000
str r1, [r0, #4]
ldr r1, _08008BF8 @ =0x80000A00
str r1, [r0, #8]
ldr r1, [r0, #8]
- ldr r1, _08008BFC @ =0x080A4820
+ ldr r1, _08008BFC @ =gFieldSelectMiniFields_Gfx
str r1, [r0]
ldr r1, _08008C00 @ =0x06008000
str r1, [r0, #4]
@@ -16942,25 +16942,25 @@ sub_8AF4: @ 0x08008AF4
ldr r2, _08008C0C @ =0x80000400
str r2, [r0, #8]
ldr r1, [r0, #8]
- ldr r1, _08008C10 @ =0x080A4020
+ ldr r1, _08008C10 @ =gFieldSelectFrameShadowTilemap
str r1, [r0]
ldr r1, _08008C14 @ =0x06000800
str r1, [r0, #4]
str r2, [r0, #8]
ldr r1, [r0, #8]
- ldr r1, _08008C18 @ =0x080A8040
+ ldr r1, _08008C18 @ =gFieldSelectWindowTilemap
str r1, [r0]
ldr r1, _08008C1C @ =0x06001000
str r1, [r0, #4]
str r2, [r0, #8]
ldr r1, [r0, #8]
- ldr r1, _08008C20 @ =0x080A8A40
+ ldr r1, _08008C20 @ =gFieldSelectSpritePals
str r1, [r0]
ldr r1, _08008C24 @ =0x05000200
str r1, [r0, #4]
str r3, [r0, #8]
ldr r1, [r0, #8]
- ldr r1, _08008C28 @ =0x080A8C40
+ ldr r1, _08008C28 @ =gFieldSelectSpriteGfx
str r1, [r0]
ldr r1, _08008C2C @ =0x06010000
str r1, [r0, #4]
@@ -16985,23 +16985,23 @@ _08008BD8: .4byte 0x0400000A
_08008BDC: .4byte 0x0400000C
_08008BE0: .4byte 0x0200B0C0
_08008BE4: .4byte 0x040000D4
-_08008BE8: .4byte 0x080A8840
+_08008BE8: .4byte gFieldSelectBGPals
_08008BEC: .4byte 0x80000100
-_08008BF0: .4byte 0x080A2C00
+_08008BF0: .4byte gFieldSelectWindow_Gfx
_08008BF4: .4byte 0x06004000
_08008BF8: .4byte 0x80000A00
-_08008BFC: .4byte 0x080A4820
+_08008BFC: .4byte gFieldSelectMiniFields_Gfx
_08008C00: .4byte 0x06008000
_08008C04: .4byte 0x80001C00
_08008C08: .4byte 0x080A2400
_08008C0C: .4byte 0x80000400
-_08008C10: .4byte 0x080A4020
+_08008C10: .4byte gFieldSelectFrameShadowTilemap
_08008C14: .4byte 0x06000800
-_08008C18: .4byte 0x080A8040
+_08008C18: .4byte gFieldSelectWindowTilemap
_08008C1C: .4byte 0x06001000
-_08008C20: .4byte 0x080A8A40
+_08008C20: .4byte gFieldSelectSpritePals
_08008C24: .4byte 0x05000200
-_08008C28: .4byte 0x080A8C40
+_08008C28: .4byte gFieldSelectSpriteGfx
_08008C2C: .4byte 0x06010000
_08008C30: .4byte 0x80002010
_08008C34: .4byte sub_8F94 + 1
diff --git a/data/graphics/field_select.inc b/data/graphics/field_select.inc
new file mode 100755
index 0000000..8997b5e
--- /dev/null
+++ b/data/graphics/field_select.inc
@@ -0,0 +1,26 @@
+gFieldSelectWindow_Gfx:: @ 0x080A2C00
+ .incbin "graphics/field_select/window_tiles.4bpp"
+
+gUnknown_080A4000:: @ 0x080A4000
+ .incbin "graphics/field_select/unknown_080A4000.bin"
+
+gFieldSelectFrameShadowTilemap:: @ 0x080A4020
+ .incbin "graphics/field_select/frame_shadow_tilemap.bin"
+
+gFieldSelectMiniFields_Gfx:: @ 0x080A4820
+ .incbin "graphics/field_select/mini_fields.4bpp"
+
+gUnknown_080A8020:: @ 0x080A8020
+ .incbin "graphics/field_select/unknown_080A8020.bin"
+
+gFieldSelectWindowTilemap:: @ 0x080A8040
+ .incbin "graphics/field_select/window_tilemap.bin"
+
+gFieldSelectBGPals:: @ 0x080A8840
+ .incbin "graphics/field_select/bg_pals.gbapal"
+
+gFieldSelectSpritePals:: @ 0x080A8A40
+ .incbin "graphics/field_select/sprite_pals.gbapal"
+
+gFieldSelectSpriteGfx:: @ 0x080A8C40
+ .incbin "graphics/field_select/sprites.4bpp"
diff --git a/data/rom.s b/data/rom.s
index 6d0b4c4..c837df7 100755
--- a/data/rom.s
+++ b/data/rom.s
@@ -1,4 +1,5 @@
.section .rodata
+@ field select palettes 0xA8840
.incbin "baserom.gba", 0x55A68, 0x7A0C0 - 0x55A68
@@ -10,7 +11,11 @@ gIntroCopyright_Gfx:: @ 0x0807A0C0
gIntroCopyright_Pal:: @ 0x0807A8E0
.incbin "graphics/intro/copyright.gbapal"
-.incbin "baserom.gba", 0x7AAE0, 0x1444F4 - 0x7AAE0
+.incbin "baserom.gba", 0x7AAE0, 0xA2C00 - 0x7AAE0
+
+.include "data/graphics/field_select.inc"
+
+.incbin "baserom.gba", 0xACC60, 0x1444F4 - 0xACC60
.include "data/graphics/mon_hatch_sprites_pals.inc"
diff --git a/graphics/field_select/bg_pals.pal b/graphics/field_select/bg_pals.pal
new file mode 100644
index 0000000..aebf38f
--- /dev/null
+++ b/graphics/field_select/bg_pals.pal
@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+176 176 176
+24 72 120
+200 16 48
+160 88 56
+72 136 96
+248 56 96
+240 88 136
+152 136 120
+72 184 112
+168 168 168
+240 168 0
+128 224 160
+208 184 160
+216 208 192
+248 224 168
+248 248 240
+176 176 176
+32 48 112
+208 8 8
+8 120 8
+144 88 32
+80 120 176
+248 56 96
+120 144 24
+32 184 48
+208 144 8
+168 160 88
+96 200 56
+248 160 0
+216 192 56
+144 208 160
+232 224 208
+176 176 176
+64 72 120
+232 8 32
+176 40 56
+248 56 96
+208 88 40
+128 128 80
+248 72 112
+200 152 24
+240 112 160
+144 168 112
+248 152 184
+208 192 88
+168 224 176
+240 192 184
+248 216 192
+176 176 176
+16 48 128
+104 56 104
+32 104 160
+136 104 120
+56 136 184
+120 160 144
+64 176 248
+232 136 96
+168 192 136
+112 216 208
+208 192 96
+232 208 136
+192 224 200
+248 224 168
+232 232 224
+176 176 176
+32 64 152
+184 24 64
+40 136 152
+112 120 208
+56 184 104
+176 144 48
+56 176 248
+72 208 120
+152 176 160
+224 176 16
+128 224 152
+136 216 248
+200 216 176
+248 216 176
+224 232 248
+176 176 176
+168 0 120
+64 56 56
+96 88 88
+48 96 216
+0 152 112
+80 112 200
+40 112 248
+136 120 112
+104 136 240
+152 144 152
+224 136 80
+160 160 192
+192 184 184
+224 208 184
+240 232 216
+176 176 176
+232 0 48
+72 104 64
+0 176 80
+56 112 200
+144 120 48
+0 224 32
+176 160 0
+136 152 192
+240 152 56
+80 240 72
+200 184 144
+248 168 80
+232 216 0
+248 216 168
+248 248 248
+176 176 176
+32 40 184
+48 96 216
+152 112 96
+40 112 248
+104 120 224
+48 152 248
+192 128 80
+88 176 248
+168 160 160
+216 176 144
+144 208 248
+248 208 152
+192 224 248
+248 224 160
+248 248 248
+176 176 176
+56 48 72
+168 0 88
+248 0 0
+16 80 240
+72 112 152
+248 40 8
+40 112 248
+208 96 32
+136 120 144
+104 152 248
+160 152 168
+240 160 72
+136 216 248
+200 200 208
+240 240 248
+176 176 176
+184 0 120
+24 80 240
+192 64 48
+136 104 152
+248 48 88
+48 120 248
+200 120 48
+184 152 144
+248 144 48
+112 184 248
+248 168 80
+208 192 184
+144 216 248
+248 216 152
+224 232 248
+176 176 176
+248 248 248
+32 128 64
+64 224 112
+48 184 72
+168 248 192
+128 80 16
+216 144 48
+248 200 136
+224 224 224
+248 248 248
+88 88 88
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/field_select/frame_shadow_tilemap.bin b/graphics/field_select/frame_shadow_tilemap.bin
new file mode 100644
index 0000000..548ee77
--- /dev/null
+++ b/graphics/field_select/frame_shadow_tilemap.bin
Binary files differ
diff --git a/graphics/field_select/mini_fields.png b/graphics/field_select/mini_fields.png
new file mode 100644
index 0000000..a4381ec
--- /dev/null
+++ b/graphics/field_select/mini_fields.png
Binary files differ
diff --git a/graphics/field_select/sprite_pals.pal b/graphics/field_select/sprite_pals.pal
new file mode 100644
index 0000000..86544e0
--- /dev/null
+++ b/graphics/field_select/sprite_pals.pal
@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+160 160 160
+248 248 248
+128 80 16
+216 144 48
+200 200 200
+176 176 176
+160 160 160
+144 144 144
+128 128 128
+104 104 104
+88 88 88
+72 72 72
+48 48 48
+32 32 32
+16 16 16
+0 0 0
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 0
+0 0 0
+160 160 160
+216 144 48
+128 80 16
+216 144 48
+200 200 200
+176 176 176
+160 160 160
+144 144 144
+128 128 128
+104 104 104
+88 88 88
+72 72 72
+48 48 48
+32 32 32
+16 16 16
+0 0 0
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+160 160 160
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
+248 248 248
diff --git a/graphics/field_select/sprites.png b/graphics/field_select/sprites.png
new file mode 100644
index 0000000..868c35c
--- /dev/null
+++ b/graphics/field_select/sprites.png
Binary files differ
diff --git a/graphics/field_select/unknown_080A4000.bin b/graphics/field_select/unknown_080A4000.bin
new file mode 100755
index 0000000..4e4e493
--- /dev/null
+++ b/graphics/field_select/unknown_080A4000.bin
Binary files differ
diff --git a/graphics/field_select/unknown_080A8020.bin b/graphics/field_select/unknown_080A8020.bin
new file mode 100644
index 0000000..4e4e493
--- /dev/null
+++ b/graphics/field_select/unknown_080A8020.bin
Binary files differ
diff --git a/graphics/field_select/window_tilemap.bin b/graphics/field_select/window_tilemap.bin
new file mode 100644
index 0000000..61bce81
--- /dev/null
+++ b/graphics/field_select/window_tilemap.bin
Binary files differ
diff --git a/graphics/field_select/window_tiles.png b/graphics/field_select/window_tiles.png
new file mode 100644
index 0000000..b7945b1
--- /dev/null
+++ b/graphics/field_select/window_tiles.png
Binary files differ
diff --git a/graphics_rules.mk b/graphics_rules.mk
index 0fe7dbc..0a389b8 100755
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -1,6 +1,9 @@
MON_PORTRAITS_DIR := graphics/mon_portraits
MON_HATCH_SPRITES_DIR := graphics/mon_hatch_sprites
+graphics/field_select/sprites.4bpp: graphics/field_select/sprites.png
+ $(GFX) $< $@ -num_tiles 513
+
$(MON_PORTRAITS_DIR)/%.4bpp: $(MON_PORTRAITS_DIR)/%.png
$(GFX) $< $@ -mwidth 2 -mheight 2