From 9236084ad807cc1d2062d87217beb82a874119ec Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 6 Oct 2018 16:40:08 -0400 Subject: finish decompiling text.c --- data/text.s | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'data') diff --git a/data/text.s b/data/text.s index c9948aef5..b44badaa2 100644 --- a/data/text.s +++ b/data/text.s @@ -24,65 +24,65 @@ gUnknown_81EA6A4:: @ 81EA6A4 gUnknown_81EA6B4:: @ 81EA6B4 .incbin "baserom.gba", 0x1EA6B4, 0x18 -gUnknown_81EA6CC:: @ 81EA6CC +gKeypadIcons:: @ 81EA6CC .incbin "baserom.gba", 0x1EA6CC, 0x34 -gUnknown_81EA700:: @ 81EA700 +gKeypadIconTiles:: @ 81EA700 .incbin "baserom.gba", 0x1EA700, 0x800 -gUnknown_81EAF00:: @ 81EAF00 +gFont0LatinGlyphs:: @ 81EAF00 .incbin "baserom.gba", 0x1EAF00, 0x4000 -gUnknown_81EEF00:: @ 81EEF00 +gFont0LatinGlyphWidths:: @ 81EEF00 .incbin "baserom.gba", 0x1EEF00, 0x200 -gUnknown_81EF100:: @ 81EF100 +gFont0JapaneseGlyphs:: @ 81EF100 .incbin "baserom.gba", 0x1EF100, 0x4000 -gUnknown_81F3100:: @ 81F3100 +gFont1LatinGlyphs:: @ 81F3100 .incbin "baserom.gba", 0x1F3100, 0x8000 -gUnknown_81FB100:: @ 81FB100 +gFont1LatinGlyphWidths:: @ 81FB100 .incbin "baserom.gba", 0x1FB100, 0x200 -gUnknown_81FB300:: @ 81FB300 +gFont1JapaneseGlyphs:: @ 81FB300 .incbin "baserom.gba", 0x1FB300, 0x4000 -gUnknown_81FF300:: @ 81FF300 +gFont2LatinGlyphs:: @ 81FF300 .incbin "baserom.gba", 0x1FF300, 0x8000 -gUnknown_8207300:: @ 8207300 +gFont2LatinGlyphWidths:: @ 8207300 .incbin "baserom.gba", 0x207300, 0x200 -gUnknown_8207500:: @ 8207500 +gFont2JapaneseGlyphs:: @ 8207500 .incbin "baserom.gba", 0x207500, 0x8000 -gUnknown_820F500:: @ 820F500 +gFont2JapaneseGlyphWidths:: @ 820F500 .incbin "baserom.gba", 0x20F500, 0x118 -gUnknown_820F618:: @ 820F618 +gFont4LatinGlyphs:: @ 820F618 .incbin "baserom.gba", 0x20F618, 0x8000 -gUnknown_8217618:: @ 8217618 +gFont4LatinGlyphWidths:: @ 8217618 .incbin "baserom.gba", 0x217618, 0x200 -gUnknown_8217818:: @ 8217818 +gFont4JapaneseGlyphs:: @ 8217818 .incbin "baserom.gba", 0x217818, 0x8000 -gUnknown_821F818:: @ 821F818 +gFont4JapaneseGlyphWidths:: @ 821F818 .incbin "baserom.gba", 0x21F818, 0x118 -gUnknown_821F930:: @ 821F930 +gFont5LatinGlyphs:: @ 821F930 .incbin "baserom.gba", 0x21F930, 0x8000 -gUnknown_8227930:: @ 8227930 +gFont5LatinGlyphWidths:: @ 8227930 .incbin "baserom.gba", 0x227930, 0x200 -gUnknown_8227B30:: @ 8227B30 +gFont5JapaneseGlyphs:: @ 8227B30 .incbin "baserom.gba", 0x227B30, 0x8000 -gUnknown_822FB30:: @ 822FB30 +gFont5JapaneseGlyphWidths:: @ 822FB30 .incbin "baserom.gba", 0x22FB30, 0x118 -gUnknown_822FC48:: @ 822FC48 +gFont9JapaneseGlyphs:: @ 822FC48 .incbin "baserom.gba", 0x22FC48, 0x2000 -- cgit v1.2.3 From 4cd32e863617326cab9cb7347a55be8c6c6dc3ac Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 7 Oct 2018 00:14:45 -0400 Subject: migrate text rodata to C file --- data/data.s | 5 +- data/graphics/fonts/down_arrow.png | Bin 0 -> 162 bytes data/graphics/fonts/down_arrow_2.png | Bin 0 -> 150 bytes data/graphics/fonts/down_arrow_3.png | Bin 0 -> 189 bytes data/graphics/fonts/down_arrow_RS.png | Bin 0 -> 163 bytes data/graphics/fonts/down_arrow_RS_2.png | Bin 0 -> 150 bytes data/graphics/fonts/font0_jap.png | Bin 0 -> 3073 bytes data/graphics/fonts/font0_latin.png | Bin 0 -> 3285 bytes data/graphics/fonts/font1_jap.png | Bin 0 -> 3135 bytes data/graphics/fonts/font1_latin.png | Bin 0 -> 3470 bytes data/graphics/fonts/font2_jap.png | Bin 0 -> 4532 bytes data/graphics/fonts/font2_latin.png | Bin 0 -> 3470 bytes data/graphics/fonts/font4_jap.png | Bin 0 -> 4480 bytes data/graphics/fonts/font4_latin.png | Bin 0 -> 3470 bytes data/graphics/fonts/font5_jap.png | Bin 0 -> 4507 bytes data/graphics/fonts/font5_latin.png | Bin 0 -> 3470 bytes data/graphics/fonts/font9_jap.png | Bin 0 -> 2281 bytes data/graphics/fonts/keypad_icons.png | Bin 0 -> 297 bytes data/text.s | 88 -------------------------------- 19 files changed, 4 insertions(+), 89 deletions(-) create mode 100644 data/graphics/fonts/down_arrow.png create mode 100644 data/graphics/fonts/down_arrow_2.png create mode 100644 data/graphics/fonts/down_arrow_3.png create mode 100644 data/graphics/fonts/down_arrow_RS.png create mode 100644 data/graphics/fonts/down_arrow_RS_2.png create mode 100644 data/graphics/fonts/font0_jap.png create mode 100644 data/graphics/fonts/font0_latin.png create mode 100644 data/graphics/fonts/font1_jap.png create mode 100644 data/graphics/fonts/font1_latin.png create mode 100644 data/graphics/fonts/font2_jap.png create mode 100644 data/graphics/fonts/font2_latin.png create mode 100644 data/graphics/fonts/font4_jap.png create mode 100644 data/graphics/fonts/font4_latin.png create mode 100644 data/graphics/fonts/font5_jap.png create mode 100644 data/graphics/fonts/font5_latin.png create mode 100644 data/graphics/fonts/font9_jap.png create mode 100644 data/graphics/fonts/keypad_icons.png delete mode 100644 data/text.s (limited to 'data') diff --git a/data/data.s b/data/data.s index d1598bfbc..7f2b474aa 100644 --- a/data/data.s +++ b/data/data.s @@ -1554,7 +1554,10 @@ gUnknown_83AC970:: @ 83AC970 .incbin "baserom.gba", 0x3AC970, 0x20 sFanfares:: @ 83AC990 - .incbin "baserom.gba", 0x3AC990, 0x278 + .incbin "baserom.gba", 0x3AC990, 0x40 + +gUnknown_83AC9D0:: @ 83AC9D0 + .incbin "baserom.gba", 0x3AC9D0, 0x238 gUnknown_83ACC08:: @ 83ACC08 .incbin "baserom.gba", 0x3ACC08, 0x440 diff --git a/data/graphics/fonts/down_arrow.png b/data/graphics/fonts/down_arrow.png new file mode 100644 index 000000000..e74ed47ef Binary files /dev/null and b/data/graphics/fonts/down_arrow.png differ diff --git a/data/graphics/fonts/down_arrow_2.png b/data/graphics/fonts/down_arrow_2.png new file mode 100644 index 000000000..aefcf4f08 Binary files /dev/null and b/data/graphics/fonts/down_arrow_2.png differ diff --git a/data/graphics/fonts/down_arrow_3.png b/data/graphics/fonts/down_arrow_3.png new file mode 100644 index 000000000..85a157564 Binary files /dev/null and b/data/graphics/fonts/down_arrow_3.png differ diff --git a/data/graphics/fonts/down_arrow_RS.png b/data/graphics/fonts/down_arrow_RS.png new file mode 100644 index 000000000..c0aae894f Binary files /dev/null and b/data/graphics/fonts/down_arrow_RS.png differ diff --git a/data/graphics/fonts/down_arrow_RS_2.png b/data/graphics/fonts/down_arrow_RS_2.png new file mode 100644 index 000000000..de9d9cf47 Binary files /dev/null and b/data/graphics/fonts/down_arrow_RS_2.png differ diff --git a/data/graphics/fonts/font0_jap.png b/data/graphics/fonts/font0_jap.png new file mode 100644 index 000000000..23903f343 Binary files /dev/null and b/data/graphics/fonts/font0_jap.png differ diff --git a/data/graphics/fonts/font0_latin.png b/data/graphics/fonts/font0_latin.png new file mode 100644 index 000000000..7a79f2389 Binary files /dev/null and b/data/graphics/fonts/font0_latin.png differ diff --git a/data/graphics/fonts/font1_jap.png b/data/graphics/fonts/font1_jap.png new file mode 100644 index 000000000..0041b477a Binary files /dev/null and b/data/graphics/fonts/font1_jap.png differ diff --git a/data/graphics/fonts/font1_latin.png b/data/graphics/fonts/font1_latin.png new file mode 100644 index 000000000..42e847faf Binary files /dev/null and b/data/graphics/fonts/font1_latin.png differ diff --git a/data/graphics/fonts/font2_jap.png b/data/graphics/fonts/font2_jap.png new file mode 100644 index 000000000..efdb4b77e Binary files /dev/null and b/data/graphics/fonts/font2_jap.png differ diff --git a/data/graphics/fonts/font2_latin.png b/data/graphics/fonts/font2_latin.png new file mode 100644 index 000000000..42e847faf Binary files /dev/null and b/data/graphics/fonts/font2_latin.png differ diff --git a/data/graphics/fonts/font4_jap.png b/data/graphics/fonts/font4_jap.png new file mode 100644 index 000000000..da4f2beac Binary files /dev/null and b/data/graphics/fonts/font4_jap.png differ diff --git a/data/graphics/fonts/font4_latin.png b/data/graphics/fonts/font4_latin.png new file mode 100644 index 000000000..42e847faf Binary files /dev/null and b/data/graphics/fonts/font4_latin.png differ diff --git a/data/graphics/fonts/font5_jap.png b/data/graphics/fonts/font5_jap.png new file mode 100644 index 000000000..7da59c0eb Binary files /dev/null and b/data/graphics/fonts/font5_jap.png differ diff --git a/data/graphics/fonts/font5_latin.png b/data/graphics/fonts/font5_latin.png new file mode 100644 index 000000000..42e847faf Binary files /dev/null and b/data/graphics/fonts/font5_latin.png differ diff --git a/data/graphics/fonts/font9_jap.png b/data/graphics/fonts/font9_jap.png new file mode 100644 index 000000000..14cf6c042 Binary files /dev/null and b/data/graphics/fonts/font9_jap.png differ diff --git a/data/graphics/fonts/keypad_icons.png b/data/graphics/fonts/keypad_icons.png new file mode 100644 index 000000000..f8c162bb9 Binary files /dev/null and b/data/graphics/fonts/keypad_icons.png differ diff --git a/data/text.s b/data/text.s deleted file mode 100644 index b44badaa2..000000000 --- a/data/text.s +++ /dev/null @@ -1,88 +0,0 @@ - .section .rodata - -gDownArrowTiles:: @ 81EA14C - .incbin "baserom.gba", 0x1EA14C, 0x100 - -gDarkDownArrowTiles:: @ 81EA24C - .incbin "baserom.gba", 0x1EA24C, 0x400 - -gDownArrowYCoords:: @ 81EA64C - .incbin "baserom.gba", 0x1EA64C, 0x4 - -gUnknown_81EA650:: @ 81EA650 - .incbin "baserom.gba", 0x1EA650, 0x4 - -gGlyphWidthFuncs:: @ 81EA654 - .incbin "baserom.gba", 0x1EA654, 0x38 - -gUnknown_81EA68C:: @ 81EA68C - .incbin "baserom.gba", 0x1EA68C, 0x18 - -gUnknown_81EA6A4:: @ 81EA6A4 - .incbin "baserom.gba", 0x1EA6A4, 0x10 - -gUnknown_81EA6B4:: @ 81EA6B4 - .incbin "baserom.gba", 0x1EA6B4, 0x18 - -gKeypadIcons:: @ 81EA6CC - .incbin "baserom.gba", 0x1EA6CC, 0x34 - -gKeypadIconTiles:: @ 81EA700 - .incbin "baserom.gba", 0x1EA700, 0x800 - -gFont0LatinGlyphs:: @ 81EAF00 - .incbin "baserom.gba", 0x1EAF00, 0x4000 - -gFont0LatinGlyphWidths:: @ 81EEF00 - .incbin "baserom.gba", 0x1EEF00, 0x200 - -gFont0JapaneseGlyphs:: @ 81EF100 - .incbin "baserom.gba", 0x1EF100, 0x4000 - -gFont1LatinGlyphs:: @ 81F3100 - .incbin "baserom.gba", 0x1F3100, 0x8000 - -gFont1LatinGlyphWidths:: @ 81FB100 - .incbin "baserom.gba", 0x1FB100, 0x200 - -gFont1JapaneseGlyphs:: @ 81FB300 - .incbin "baserom.gba", 0x1FB300, 0x4000 - -gFont2LatinGlyphs:: @ 81FF300 - .incbin "baserom.gba", 0x1FF300, 0x8000 - -gFont2LatinGlyphWidths:: @ 8207300 - .incbin "baserom.gba", 0x207300, 0x200 - -gFont2JapaneseGlyphs:: @ 8207500 - .incbin "baserom.gba", 0x207500, 0x8000 - -gFont2JapaneseGlyphWidths:: @ 820F500 - .incbin "baserom.gba", 0x20F500, 0x118 - -gFont4LatinGlyphs:: @ 820F618 - .incbin "baserom.gba", 0x20F618, 0x8000 - -gFont4LatinGlyphWidths:: @ 8217618 - .incbin "baserom.gba", 0x217618, 0x200 - -gFont4JapaneseGlyphs:: @ 8217818 - .incbin "baserom.gba", 0x217818, 0x8000 - -gFont4JapaneseGlyphWidths:: @ 821F818 - .incbin "baserom.gba", 0x21F818, 0x118 - -gFont5LatinGlyphs:: @ 821F930 - .incbin "baserom.gba", 0x21F930, 0x8000 - -gFont5LatinGlyphWidths:: @ 8227930 - .incbin "baserom.gba", 0x227930, 0x200 - -gFont5JapaneseGlyphs:: @ 8227B30 - .incbin "baserom.gba", 0x227B30, 0x8000 - -gFont5JapaneseGlyphWidths:: @ 822FB30 - .incbin "baserom.gba", 0x22FB30, 0x118 - -gFont9JapaneseGlyphs:: @ 822FC48 - .incbin "baserom.gba", 0x22FC48, 0x2000 -- cgit v1.2.3 From 77f8b38417393b8639912efbcc18f7ac610549c1 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 7 Oct 2018 01:01:45 -0400 Subject: address comments --- data/graphics/fonts/down_arrow_3.png | Bin 189 -> 159 bytes data/graphics/fonts/down_arrow_4.png | Bin 0 -> 160 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/graphics/fonts/down_arrow_4.png (limited to 'data') diff --git a/data/graphics/fonts/down_arrow_3.png b/data/graphics/fonts/down_arrow_3.png index 85a157564..6345eacfb 100644 Binary files a/data/graphics/fonts/down_arrow_3.png and b/data/graphics/fonts/down_arrow_3.png differ diff --git a/data/graphics/fonts/down_arrow_4.png b/data/graphics/fonts/down_arrow_4.png new file mode 100644 index 000000000..b6cba25f3 Binary files /dev/null and b/data/graphics/fonts/down_arrow_4.png differ -- cgit v1.2.3 From d348c44eb66a30d50a742d900760826a863c5759 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 8 Oct 2018 14:58:51 -0400 Subject: Finish decompile of menews_jisan.s --- data/data_84827AC.s | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'data') diff --git a/data/data_84827AC.s b/data/data_84827AC.s index 2c69a76d7..565a6adf2 100644 --- a/data/data_84827AC.s +++ b/data/data_84827AC.s @@ -5014,13 +5014,7 @@ gUnknown_8468B6C:: @ 8468B6C gUnknown_8468BCC:: @ 8468BCC .incbin "baserom.gba", 0x468BCC, 0x90 - .align 2 -gUnknown_8468C5C:: @ 8468C5C - .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/menews_jisan.c" - - .align 2 -gUnknown_8468C94:: @ 8468C94 - .asciz "0" + .section .rodata.8468C98 .align 2 gUnknown_8468C98:: @ 8468C98 -- cgit v1.2.3