summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/rom4.s2
-rw-r--r--asm/rom5.s28
-rw-r--r--data/data2.s18
-rw-r--r--data/graphics.s73
-rw-r--r--graphics/intro/copyright.binbin0 -> 1280 bytes
-rw-r--r--graphics/intro/copyright.pal19
-rw-r--r--graphics/intro/copyright.pngbin0 -> 567 bytes
-rw-r--r--graphics/misc/decoration_10000.pngbin0 -> 192 bytes
-rw-r--r--graphics/misc/end_copyright.pngbin0 -> 983 bytes
-rw-r--r--graphics/misc/hof.pal (renamed from graphics/pokemon_storage/hof_header.pal)0
-rw-r--r--graphics/misc/hof.png (renamed from graphics/pokemon_storage/hof_header.png)bin422 -> 422 bytes
-rw-r--r--graphics/pokenav/arrow2.pngbin0 -> 151 bytes
-rw-r--r--graphics/pokenav/condition_search2.pal19
-rw-r--r--graphics/pokenav/condition_search2.pngbin0 -> 309 bytes
-rw-r--r--graphics/pokenav/ribbon_pokeview.pngbin0 -> 212 bytes
-rw-r--r--graphics/pokenav/ribbon_view.pal.binbin0 -> 32 bytes
-rw-r--r--graphics/pokenav/ribbon_view.pal.bin.bakbin0 -> 32 bytes
-rw-r--r--graphics/pokenav/ribbon_view.pngbin0 -> 213 bytes
-rw-r--r--graphics/text_window/main.pngbin0 -> 189 bytes
-rw-r--r--graphics/title_screen/press_start.pngbin0 -> 455 bytes
-rwxr-xr-xmisc.mk12
21 files changed, 115 insertions, 56 deletions
diff --git a/asm/rom4.s b/asm/rom4.s
index 1cf090b5a..f125cead0 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -41238,7 +41238,7 @@ sub_8065348: @ 8065348
pop {r0}
bx r0
.align 2, 0
-_08065364: .4byte gUnknown_08EA0108
+_08065364: .4byte gTextWindowMainFrame_Gfx
_08065368: .4byte 0x030005ae
thumb_func_end sub_8065348
diff --git a/asm/rom5.s b/asm/rom5.s
index ec0f6571f..da7a1ede5 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -124780,7 +124780,7 @@ _080B7BAA:
pop {r0}
bx r0
.align 2, 0
-_080B7BD8: .4byte gUnknown_08EA2A44
+_080B7BD8: .4byte gDecoration10000_Gfx
_080B7BDC: .4byte 0x06008000
_080B7BE0: .4byte 0xfffff000
_080B7BE4: .4byte 0x0600f800
@@ -240825,7 +240825,7 @@ _080F0380:
bl LZ77UnCompVram
b _080F0618
.align 2, 0
-_080F038C: .4byte gUnknown_08E9FA08
+_080F038C: .4byte gPokenavConditionSearch2_Gfx
_080F0390: .4byte 0x06008000
_080F0394:
ldr r6, _080F03FC
@@ -240878,7 +240878,7 @@ _080F03FC: .4byte gUnknown_083E02B4
_080F0400: .4byte gUnknown_083E0334
_080F0404: .4byte gUnknown_083DFEC4
_080F0408: .4byte 0x000087ca
-_080F040C: .4byte gUnknown_083E0294
+_080F040C: .4byte gPokenavConditionSearch2_Pal
_080F0410: .4byte 0x0202eac8
_080F0414: .4byte gUnknownPalette_81E6692
_080F0418:
@@ -242536,7 +242536,7 @@ _080F116C:
bl LZ77UnCompVram
b _080F1218
.align 2, 0
-_080F1178: .4byte gUnknown_08E9FB1C
+_080F1178: .4byte gPokenavRibbonView_Gfx
_080F117C: .4byte 0x06008000
_080F1180:
ldr r0, _080F118C
@@ -242571,7 +242571,7 @@ _080F1194:
bl LoadPalette
b _080F1218
.align 2, 0
-_080F11CC: .4byte gUnknown_08E9FAFC
+_080F11CC: .4byte gPokenavRibbonView_Pal
_080F11D0: .4byte gUnknown_083E03A8
_080F11D4: .4byte gUnknown_083E3C60
_080F11D8: .4byte gUnknownPalette_81E6692
@@ -242873,7 +242873,7 @@ _080F1424: .4byte 0x0600b800
_080F1428: .4byte 0x040000d4
_080F142C: .4byte 0x84000140
_080F1430: .4byte 0x0202eac8
-_080F1434: .4byte gUnknown_08E9FB18
+_080F1434: .4byte gPokenavRibbonView_Pal + 0x1C
thumb_func_end sub_80F13FC
thumb_func_start sub_80F1438
@@ -243159,7 +243159,7 @@ _080F1670:
ldr r0, [r0, 0x8]
b _080F16F0
.align 2, 0
-_080F1684: .4byte gUnknown_08EA0028
+_080F1684: .4byte gPokenavRibbonPokeView_Gfx
_080F1688: .4byte 0x0600e000
_080F168C: .4byte 0x040000d4
_080F1690: .4byte 0x80000070
@@ -395734,9 +395734,9 @@ sub_813B808: @ 813B808
pop {r0}
bx r0
.align 2, 0
-_0813B848: .4byte gUnknown_08E9C798
-_0813B84C: .4byte gUnknown_08E9CA24
-_0813B850: .4byte gUnknown_08E9CA44
+_0813B848: .4byte gIntroCopyright_Gfx
+_0813B84C: .4byte gIntroCopyright_Pal
+_0813B850: .4byte gIntroCopyright_Tilemap
thumb_func_end sub_813B808
thumb_func_start SerialCb_CopyrightScreen
@@ -411575,7 +411575,7 @@ _0814350A:
pop {r0}
bx r0
.align 2, 0
-_0814354C: .4byte gPSSHallOfFameHeader_Gfx
+_0814354C: .4byte gHallOfFame_Gfx
_08143550: .4byte 0x040000d4
_08143554: .4byte 0x81000800
_08143558: .4byte 0x06003800
@@ -411583,7 +411583,7 @@ _0814355C: .4byte 0x02000000
_08143560: .4byte 0x06003b80
_08143564: .4byte 0x06003000
_08143568: .4byte 0x000003ff
-_0814356C: .4byte gPSSHallOfFameHeader_Pal
+_0814356C: .4byte gHallOfFame_Pal
thumb_func_end sub_81433E0
thumb_func_start sub_8143570
@@ -415141,8 +415141,8 @@ _081451D0:
pop {r0}
bx r0
.align 2, 0
-_081451EC: .4byte gUnknown_08EA260C
-_081451F0: .4byte gUnknown_08E9CA24
+_081451EC: .4byte gCreditsCopyrightEnd_Gfx
+_081451F0: .4byte gIntroCopyright_Pal
_081451F4: .4byte 0x000003ff
_081451F8: .4byte 0x060001c8
_081451FC: .4byte 0x06000248
diff --git a/data/data2.s b/data/data2.s
index 08ff6c152..79b7a3827 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -11207,7 +11207,7 @@ gSpriteTemplate_8393F74:: @ 8393F74
.align 2
gUnknown_08393F8C:: @ 8393F8C
- obj_tiles Tiles_E9D644, 0x520, 1001
+ obj_tiles gTitleScreenPressStart_Gfx, 0x520, 1001
null_obj_tiles
.align 2
@@ -21631,8 +21631,10 @@ gUnknown_083E0254:: @ 83E0254
gUnknown_083E0274:: @ 83E0274
.incbin "baserom.gba", 0x003e0274, 0x20
-gUnknown_083E0294:: @ 83E0294
- .incbin "baserom.gba", 0x003e0294, 0x20
+ .align 2
+gPokenavConditionSearch2_Pal:: @ 83E0294
+ @.incbin "graphics/pokenav/condition_search2.gbapal"
+ .incbin "baserom.gba", 0x3e0294, 0x20
gUnknown_083E02B4:: @ 83E02B4
.incbin "baserom.gba", 0x003e02b4, 0x60
@@ -21640,9 +21642,11 @@ gUnknown_083E02B4:: @ 83E02B4
gUnknown_083E0314:: @ 83E0314
.incbin "baserom.gba", 0x003e0314, 0x20
+ .align 2
gUnknown_083E0334:: @ 83E0334
.incbin "graphics/pokenav/trainereyes_misc_pal.bin" @ the original bytes have an "FF FF" instance which is incompatible with gbagfx to produce the bytes needed to match the original ROM, so I am forced to include it as a .bin until the lowest bit is properly handled or a better workaround is produced
+ .align 2
gUnknown_083E0354:: @ 83E0354
.incbin "graphics/pokenav/trainereyes_misc.4bpp.lz"
@@ -21842,7 +21846,7 @@ gPokenavSparkle_Gfx::
.incbin "graphics/pokenav/sparkle.4bpp"
.align 2
-gContestArrows_Gfx::
+gPokenavUpDownArrows_Gfx::
.incbin "graphics/pokenav/arrows.4bpp"
gUnknown_083E3BC0::
@@ -22147,13 +22151,13 @@ gUnknown_083E4588:: @ 83E4588
.align 2
gUnknown_083E4590:: @ 83E4590
- obj_tiles Tiles_E9F9A8, 0x40, 9
- obj_tiles gContestArrows_Gfx, 0x80, 10
+ obj_tiles gPokenavArrow_Gfx, 0x40, 9
+ obj_tiles gPokenavUpDownArrows_Gfx, 0x80, 10
null_obj_tiles
.align 2
gUnknown_083E45A8:: @ 83E45A8
- obj_pal gPokenavContestArrowsPalette, 9
+ obj_pal gPokenavArrowsPalette, 9
.align 2
gOamData_83E45B0:: @ 83E45B0
diff --git a/data/graphics.s b/data/graphics.s
index e02888ce4..aaeb5c54a 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -3845,12 +3845,12 @@ gPSSMenuMisc_Tilemap:: @ 8E8E6E8
.incbin "graphics/pokemon_storage/misc1.bin.lz"
.align 2
-gPSSHallOfFameHeader_Gfx:: @ 8E8E8B0
- .incbin "graphics/pokemon_storage/hof_header.4bpp.lz"
+gHallOfFame_Gfx:: @ 8E8E8B0
+ .incbin "graphics/misc/hof.4bpp.lz"
.align 2
-gPSSHallOfFameHeader_Pal:: @ 8E8EA78
- .incbin "graphics/pokemon_storage/hof_header.gbapal"
+gHallOfFame_Pal:: @ 8E8EA78
+ .incbin "graphics/misc/hof.gbapal"
.align 2
gMenuWordGroup_Gfx:: @ 8E8EA98
@@ -4412,28 +4412,30 @@ gUnknown_08E9C6DC:: @ 8E9C6DC
.incbin "baserom.gba", 0xE9C6DC, 0xBC @ LZ, uncomp. size = 0x500
.align 2
-gUnknown_08E9C798:: @ 8E9C798
- .incbin "baserom.gba", 0xE9C798, 0x289 @ LZ, uncomp. size = 0x560
+gIntroCopyright_Gfx:: @ 8E9C798
+ .incbin "graphics/intro/copyright.4bpp.lz"
.align 2
-gUnknown_08E9CA24:: @ 8E9CA24
- .incbin "baserom.gba", 0x00e9ca24, 0x20
+gIntroCopyright_Pal:: @ 8E9CA24
+ .incbin "graphics/intro/copyright.gbapal"
-gUnknown_08E9CA44:: @ 8E9CA44
- .incbin "baserom.gba", 0xe9ca44, 0x500
+ .align 2
+gIntroCopyright_Tilemap:: @ 8E9CA44
+ .incbin "graphics/intro/copyright.bin"
.align 2
gInterviewOutlineCursorTiles:: @ 8E9CF44
.incbin "graphics/misc/interview_outline_cursor.4bpp"
.align 2
-Tiles_E9D644:: @ 8E9D644
- .incbin "baserom.gba", 0xE9D644, 0x265 @ LZ, uncomp. size = 0x520
+gTitleScreenPressStart_Gfx:: @ 8E9D644
+ .incbin "graphics/title_screen/press_start.4bpp.lz"
.align 2
-gTitleScreenLogoShinePalette::
+gTitleScreenLogoShinePalette:: @ E9D8E4
.incbin "graphics/title_screen/logo_shine.gbapal"
+ .align 2
gUnknown_08E9D8CC:: @ 8E9D8CC
.ifdef SAPPHIRE
.incbin "graphics/title_screen/pokemon_sapphire.8bpp.lz"
@@ -4441,6 +4443,7 @@ gUnknown_08E9D8CC:: @ 8E9D8CC
.incbin "graphics/title_screen/pokemon_ruby.8bpp.lz"
.endif
+ .align 2
gVersionTiles::
.ifdef SAPPHIRE
.incbin "graphics/title_screen/sapphireversion.8bpp.lz"
@@ -4448,6 +4451,7 @@ gVersionTiles::
.incbin "graphics/title_screen/rubyversion.8bpp.lz"
.endif
+ .align 2
gUnknown_08E9F624:: @ 8E9F624
.ifdef SAPPHIRE
.incbin "graphics/title_screen/logo_sapphire.gbapal" @ for some reason, the sapphire palette is different even though the visible colors for the logo and version are not, weird
@@ -4460,32 +4464,30 @@ gUnknown_08E9F7E4:: @ 8E9F7E4
.incbin "baserom.gba", 0xE9F7E4, 0x182 @ LZ, uncomp. size = 0x400
.align 2
-gPokenavContestArrowsPalette::
+gPokenavArrowsPalette::
.incbin "graphics/pokenav/arrows.gbapal"
gUnknown_08E9F988:: @ 8E9F988
.incbin "baserom.gba", 0xe9f988, 0x20
-Tiles_E9F9A8:: @ 8E9F9A8
- .incbin "baserom.gba", 0xe9f9a8, 0x40
+ .align 2
+gPokenavArrow_Gfx:: @ 8E9F9A8
+ .incbin "graphics/pokenav/arrow2.4bpp"
gUnknown_08E9F9E8:: @ 8E9F9E8
.incbin "baserom.gba", 0x00e9f9e8, 0x20
.align 2
-gUnknown_08E9FA08:: @ 8E9FA08
- .incbin "baserom.gba", 0xE9FA08, 0xF2 @ LZ, uncomp. size = 0x300
+gPokenavConditionSearch2_Gfx:: @ 8E9FA08
+ .incbin "graphics/pokenav/condition_search2.4bpp.lz"
.align 2
-gUnknown_08E9FAFC:: @ 8E9FAFC
- .incbin "baserom.gba", 0x00e9fafc, 0x1c
-
-gUnknown_08E9FB18:: @ 8E9FB18
- .incbin "baserom.gba", 0x00e9fb18, 0x4
+gPokenavRibbonView_Pal:: @ 8E9FAFC
+ .incbin "graphics/pokenav/ribbon_view.pal.bin"
.align 2
-gUnknown_08E9FB1C:: @ 8E9FB1C
- .incbin "baserom.gba", 0xE9FB1C, 0x83 @ LZ, uncomp. size = 0x160
+gPokenavRibbonView_Gfx:: @ 8E9FB1C
+ .incbin "graphics/pokenav/ribbon_view.4bpp.lz"
.align 2
gUnknown_08E9FBA0:: @ 8E9FBA0
@@ -4514,11 +4516,12 @@ gUnknown_08E9FF58:: @ 8E9FF58
.incbin "baserom.gba", 0xE9FF58, 0xCF @ LZ, uncomp. size = 0x640
.align 2
-gUnknown_08EA0028:: @ 8EA0028
- .incbin "baserom.gba", 0x00ea0028, 0xe0
+gPokenavRibbonPokeView_Gfx:: @ 8EA0028
+ .incbin "graphics/pokenav/ribbon_pokeview.4bpp"
-gUnknown_08EA0108:: @ 8EA0108
- .incbin "baserom.gba", 0x00ea0108, 0x1c0
+ .align 2
+gTextWindowMainFrame_Gfx:: @ 8EA0108
+ .incbin "graphics/text_window/main.4bpp"
.align 2
gUnknown_08EA02C8:: @ 8EA02C8
@@ -4549,21 +4552,25 @@ gUnknown_08EA1DEC:: @ 8EA1DEC
.incbin "baserom.gba", 0x00ea25ec, 0x20
.align 2
-gUnknown_08EA260C:: @ 8EA260C
- .incbin "baserom.gba", 0xEA260C, 0x436 @ LZ, uncomp. size = 0xB40
+gCreditsCopyrightEnd_Gfx:: @ 8EA260C
+ .incbin "graphics/misc/end_copyright.4bpp.lz"
.align 2
-gUnknown_08EA2A44:: @ 8EA2A44
- .incbin "baserom.gba", 0x00ea2a44, 0x200
+gDecoration10000_Gfx:: @ 8EA2A44
+ .incbin "graphics/misc/decoration_10000.4bpp"
+ .align 2
gFont3LatinGlyphs:: @ 8EA2C44
.incbin "graphics/fonts/font3_lat.4bpp"
+ .align 2
gFont4LatinGlyphs:: @ 8EA6BC4
.incbin "graphics/fonts/font4_lat.4bpp"
+ .align 2
gFont3JapaneseGlyphs:: @ 8EA8744
.incbin "graphics/fonts/font3_jpn.4bpp"
+ .align 2
gFont4JapaneseGlyphs:: @ 8EAC6C4
.incbin "graphics/fonts/font4_jpn.4bpp"
diff --git a/graphics/intro/copyright.bin b/graphics/intro/copyright.bin
new file mode 100644
index 000000000..367991ff7
--- /dev/null
+++ b/graphics/intro/copyright.bin
Binary files differ
diff --git a/graphics/intro/copyright.pal b/graphics/intro/copyright.pal
new file mode 100644
index 000000000..4219d4394
--- /dev/null
+++ b/graphics/intro/copyright.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 32 32
+24 57 57
+49 82 82
+82 106 106
+106 131 131
+139 156 156
+164 180 180
+197 205 205
+222 230 230
+255 255 255
diff --git a/graphics/intro/copyright.png b/graphics/intro/copyright.png
new file mode 100644
index 000000000..23d6dc2b4
--- /dev/null
+++ b/graphics/intro/copyright.png
Binary files differ
diff --git a/graphics/misc/decoration_10000.png b/graphics/misc/decoration_10000.png
new file mode 100644
index 000000000..89808dde4
--- /dev/null
+++ b/graphics/misc/decoration_10000.png
Binary files differ
diff --git a/graphics/misc/end_copyright.png b/graphics/misc/end_copyright.png
new file mode 100644
index 000000000..57fc6114a
--- /dev/null
+++ b/graphics/misc/end_copyright.png
Binary files differ
diff --git a/graphics/pokemon_storage/hof_header.pal b/graphics/misc/hof.pal
index b4fffc172..b4fffc172 100644
--- a/graphics/pokemon_storage/hof_header.pal
+++ b/graphics/misc/hof.pal
diff --git a/graphics/pokemon_storage/hof_header.png b/graphics/misc/hof.png
index b60489544..b60489544 100644
--- a/graphics/pokemon_storage/hof_header.png
+++ b/graphics/misc/hof.png
Binary files differ
diff --git a/graphics/pokenav/arrow2.png b/graphics/pokenav/arrow2.png
new file mode 100644
index 000000000..f971ebb5c
--- /dev/null
+++ b/graphics/pokenav/arrow2.png
Binary files differ
diff --git a/graphics/pokenav/condition_search2.pal b/graphics/pokenav/condition_search2.pal
new file mode 100644
index 000000000..a5a556515
--- /dev/null
+++ b/graphics/pokenav/condition_search2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+65 65 65
+49 65 74
+106 115 123
+255 255 255
+90 123 164
+98 172 230
+197 222 255
+148 156 205
+156 164 205
+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/pokenav/condition_search2.png b/graphics/pokenav/condition_search2.png
new file mode 100644
index 000000000..d4c25f5c8
--- /dev/null
+++ b/graphics/pokenav/condition_search2.png
Binary files differ
diff --git a/graphics/pokenav/ribbon_pokeview.png b/graphics/pokenav/ribbon_pokeview.png
new file mode 100644
index 000000000..28e85a1a6
--- /dev/null
+++ b/graphics/pokenav/ribbon_pokeview.png
Binary files differ
diff --git a/graphics/pokenav/ribbon_view.pal.bin b/graphics/pokenav/ribbon_view.pal.bin
new file mode 100644
index 000000000..bd41bf59c
--- /dev/null
+++ b/graphics/pokenav/ribbon_view.pal.bin
Binary files differ
diff --git a/graphics/pokenav/ribbon_view.pal.bin.bak b/graphics/pokenav/ribbon_view.pal.bin.bak
new file mode 100644
index 000000000..387706554
--- /dev/null
+++ b/graphics/pokenav/ribbon_view.pal.bin.bak
Binary files differ
diff --git a/graphics/pokenav/ribbon_view.png b/graphics/pokenav/ribbon_view.png
new file mode 100644
index 000000000..267a6add6
--- /dev/null
+++ b/graphics/pokenav/ribbon_view.png
Binary files differ
diff --git a/graphics/text_window/main.png b/graphics/text_window/main.png
new file mode 100644
index 000000000..b41a0f799
--- /dev/null
+++ b/graphics/text_window/main.png
Binary files differ
diff --git a/graphics/title_screen/press_start.png b/graphics/title_screen/press_start.png
new file mode 100644
index 000000000..b38a4b58d
--- /dev/null
+++ b/graphics/title_screen/press_start.png
Binary files differ
diff --git a/misc.mk b/misc.mk
index 06da01341..1d6cb09b0 100755
--- a/misc.mk
+++ b/misc.mk
@@ -14,6 +14,7 @@ CONTESTGFXDIR := graphics/contest
MASKSGFXDIR := graphics/battle_anims/masks
BATTRANSGFXDIR := graphics/battle_transitions
TYPESGFXDIR := graphics/types
+TITLEGFXDIR := graphics/title_screen
types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
contest_types := cool beauty cute smart tough
@@ -234,8 +235,17 @@ $(PSSGFXDIR)/header.4bpp: $(PSSGFXDIR)/header.png
$(PSSGFXDIR)/misc1.4bpp: $(PSSGFXDIR)/misc1.png
$(GFX) $< $@ -num_tiles 91
-$(PSSGFXDIR)/hof_header.4bpp: $(PSSGFXDIR)/hof_header.png
+$(MISCGFXDIR)/hof.4bpp: $(MISCGFXDIR)/hof.png
$(GFX) $< $@ -num_tiles 37
$(MENUGFXDIR)/wordgroup_frame.4bpp: $(MENUGFXDIR)/wordgroup_frame.png
$(GFX) $< $@ -num_tiles 65
+
+$(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png
+ $(GFX) $< $@ -num_tiles 43
+
+$(TITLEGFXDIR)/press_start.4bpp: $(TITLEGFXDIR)/press_start.png
+ $(GFX) $< $@ -num_tiles 41
+
+$(MISCGFXDIR)/end_copyright.4bpp: $(MISCGFXDIR)/end_copyright.png
+ $(GFX) $< $@ -num_tiles 90
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-13 18:12:17 +0000