diff options
Diffstat (limited to 'data')
22 files changed, 27 insertions, 193 deletions
diff --git a/data/data.s b/data/data.s index 9cb522076..dcb46036a 100644 --- a/data/data.s +++ b/data/data.s @@ -1558,7 +1558,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/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 diff --git a/data/graphics.s b/data/graphics.s index 8b7d09760..fd965ede6 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -9,17 +9,18 @@ gUnknown_8D004D8:: @ 8D004D8 .align 2 gMenuMapBin:: @ 8D0051C .incbin "graphics/interface/menu_map.bin.lz" - + + .align 2 gUnknown_8D00748:: @ 8D00748 .incbin "baserom.gba", 0xD00748, 0x488 - @ circled questionmark normal palette, different locations in ruby/emerald + .align 2 gUnknown_8D00BD0:: @ 8D00BD0 - .incbin "baserom.gba", 0xD00BD0, 0x18 - - @ circled questionmark shiny palette, different locations in ruby/emerald + .incbin "graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz" + + .align 2 gUnknown_8D00BE8:: @ 8D00BE8 - .incbin "baserom.gba", 0xD00BE8, 0x18 + .incbin "graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz" .align 2 gOldCharmap4bpp:: @ 8D00C00 @@ -232,7 +233,7 @@ gSprite0094bpp:: @ 8D02F8C .align 2 gSprite009Gbapal:: @ 8D03274 .incbin "graphics/battle_anims/sprites/009.gbapal.lz" - @ BEGINHERE + .align 2 gSprite0114bpp:: @ 8D03294 .incbin "graphics/battle_anims/sprites/011.4bpp.lz" @@ -375,252 +376,167 @@ gSprite026Gbapal:: @ 8D047B4 .align 2 gSprite027Gbapal:: @ 8D047DC - .incbin "baserom.gba", 0xD047DC, 0x28 @ this should be 027.gbapal.lz but my matcher didnt pick it up... + .incbin "graphics/battle_anims/sprites/027.gbapal.lz" .align 2 gSprite0274bpp:: @ 8D04804 .incbin "graphics/battle_anims/sprites/027.4bpp.lz" - - .align 2 gSprite028Gbapal:: @ 8D04B00 .incbin "graphics/battle_anims/sprites/028.gbapal.lz" - - .align 2 gSprite0284bpp:: @ 8D04B28 .incbin "graphics/battle_anims/sprites/028.4bpp.lz" - - .align 2 gSprite0294bpp:: @ 8D04E78 .incbin "graphics/battle_anims/sprites/029.4bpp.lz" - - .align 2 gSprite029Gbapal:: @ 8D05130 .incbin "graphics/battle_anims/sprites/029.gbapal.lz" - - - .align 2 gSprite0304bpp:: @ 8D05158 .incbin "graphics/battle_anims/sprites/030.4bpp.lz" - - .align 2 gSprite030Gbapal:: @ 8D05518 .incbin "graphics/battle_anims/sprites/030.gbapal.lz" - - .align 2 gSprite033Gbapal:: @ 8D0553C .incbin "graphics/battle_anims/sprites/033.gbapal.lz" - - .align 2 gSprite0334bpp:: @ 8D05564 .incbin "graphics/battle_anims/sprites/033.4bpp.lz" - - .align 2 gSprite0344bpp:: @ 8D05ED4 .incbin "graphics/battle_anims/sprites/034.4bpp.lz" - - .align 2 gSprite0354bpp:: @ 8D062A0 .incbin "graphics/battle_anims/sprites/035.4bpp.lz" - - - + .align 2 gSprite036Gbapal:: @ 8D06638 .incbin "graphics/battle_anims/sprites/036.gbapal.lz" - - .align 2 gSprite0364bpp:: @ 8D06660 .incbin "graphics/battle_anims/sprites/036.4bpp.lz" - - .align 2 gSprite0374bpp:: @ 8D06A34 .incbin "graphics/battle_anims/sprites/037.4bpp.lz" - - - .align 2 gUnknown_D06D804bpp:: @ 8D06D80 .incbin "graphics/unknown/unknown_D06D80.4bpp.lz" - - - .align 2 gUnknown_D06D80Gbapal:: @ 8D06DC4 .incbin "graphics/unknown/unknown_D06D80.gbapal.lz" - - - .align 2 gUnknown_D06D80Gbapal2:: @ 8D06DD8 .incbin "graphics/unknown/unknown_D06D80_2.gbapal.lz" - - - .align 2 gUnusedObi14bpp:: @ 8D06E0C .incbin "graphics/unused/obi1.4bpp.lz" - - .align 2 gUnusedObiPalpak1Gbapal:: @ 8D07170 .incbin "graphics/unused/obi_palpak1.gbapal.lz" - - .align 2 gUnusedOldPal4Gbapal:: @ 8D071B4 .incbin "graphics/unused/old_pal4.gbapal.lz" - - .align 2 gUnusedObiPalpak3Gbapal:: @ 8D071CC .incbin "graphics/unused/obi_palpak3.gbapal.lz" - - .align 2 gUnusedObi24bpp:: @ 8D07224 .incbin "graphics/unused/obi2.4bpp.lz" - - .align 2 gUnusedOldBattleInterfaceTilemapBin:: @ 8D077EC .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" - - - .align 2 gSprite038Gbapal:: @ 8D078FC .incbin "graphics/battle_anims/sprites/038.gbapal.lz" - - .align 2 gSprite039Gbapal:: @ 8D07924 .incbin "graphics/battle_anims/sprites/039.gbapal.lz" - - .align 2 gSprite0384bpp:: @ 8D0794C .incbin "graphics/battle_anims/sprites/038.4bpp.lz" - - .align 2 gSprite0394bpp:: @ 8D07B70 .incbin "graphics/battle_anims/sprites/039.4bpp.lz" - - .align 2 gSprite0404bpp:: @ 8D07E6C .incbin "graphics/battle_anims/sprites/040.4bpp.lz" - - - .align 2 gSprite0414bpp:: @ 8D08078 .incbin "graphics/battle_anims/sprites/041.4bpp.lz" - - .align 2 gIntefacePartyMenuHpBar4bpp:: @ 8D08218 .incbin "graphics/interface/party_menu_hpbar.4bpp.lz" - - .align 2 gSprite0424bpp:: @ 8D082AC .incbin "graphics/battle_anims/sprites/042.4bpp.lz" - - .align 2 gSprite042Gbapal:: @ 8D0857C .incbin "graphics/battle_anims/sprites/042.gbapal.lz" - - .align 2 gSprite0434bpp:: @ 8D085A4 .incbin "graphics/battle_anims/sprites/043.4bpp.lz" - - .align 2 gSprite043Gbapal:: @ 8D089A4 .incbin "graphics/battle_anims/sprites/043.gbapal.lz" - .align 2 gSprite044Gbapal:: @ 8D089CC - .incbin "baserom.gba", 0xD089CC, 0x28 @ this should be 044.gbapal.lz but my matched didnt pick it up... - + .incbin "graphics/battle_anims/sprites/044.gbapal.lz" .align 2 gSprite0444bpp:: @ 8D089F4 .incbin "graphics/battle_anims/sprites/044.4bpp.lz" - - .align 2 gSprite045Gbapal:: @ 8D08C60 .incbin "graphics/battle_anims/sprites/045.gbapal.lz" - - .align 2 gSprite0454bpp:: @ 8D08C88 .incbin "graphics/battle_anims/sprites/045.4bpp.lz" - - .align 2 gBattleInterfaceUnusedWindow4bpp:: @ 8D08EF4 .incbin "graphics/battle_interface/unused_window.4bpp.lz" - - .align 2 gBattleInterfaceUnusedWindowGbapal:: @ 8D093B0 .incbin "graphics/battle_interface/unused_window.gbapal.lz" - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gUnknown_8D093D8:: @ 8D093D8 @@ -729,8 +645,17 @@ gUnknown_8D2EC70:: @ 8D2EC70 .incbin "baserom.gba", 0xD2EC70, 0xF44 gUnknown_8D2FBB4:: @ 8D2FBB4 - .incbin "baserom.gba", 0xD2FBB4, 0x1477C8 - + .incbin "baserom.gba", 0xD2FBB4, 0x20 + + @ INSERT POKEMANS HERE +gUnknown_8D2FBD4:: @ 8D2FBD4 + .incbin "baserom.gba", 0xD2FBD4, 0x119184 + + @ INSERT TRAINERS HERE +gUnknown_8E48D58:: @ 8E48D58 + .incbin "baserom.gba", 0xE48D58, 0x2E624 + + @ THIS IS ./graphics/battle_transitions/vs_frame.4bpp.lz gUnknown_8E7737C:: @ 8E7737C .incbin "baserom.gba", 0xE7737C, 0xE8 diff --git a/data/graphics/fonts/down_arrow.png b/data/graphics/fonts/down_arrow.png Binary files differnew file mode 100644 index 000000000..e74ed47ef --- /dev/null +++ b/data/graphics/fonts/down_arrow.png diff --git a/data/graphics/fonts/down_arrow_2.png b/data/graphics/fonts/down_arrow_2.png Binary files differnew file mode 100644 index 000000000..aefcf4f08 --- /dev/null +++ b/data/graphics/fonts/down_arrow_2.png diff --git a/data/graphics/fonts/down_arrow_3.png b/data/graphics/fonts/down_arrow_3.png Binary files differnew file mode 100644 index 000000000..6345eacfb --- /dev/null +++ b/data/graphics/fonts/down_arrow_3.png diff --git a/data/graphics/fonts/down_arrow_4.png b/data/graphics/fonts/down_arrow_4.png Binary files differnew file mode 100644 index 000000000..b6cba25f3 --- /dev/null +++ b/data/graphics/fonts/down_arrow_4.png diff --git a/data/graphics/fonts/down_arrow_RS.png b/data/graphics/fonts/down_arrow_RS.png Binary files differnew file mode 100644 index 000000000..c0aae894f --- /dev/null +++ b/data/graphics/fonts/down_arrow_RS.png diff --git a/data/graphics/fonts/down_arrow_RS_2.png b/data/graphics/fonts/down_arrow_RS_2.png Binary files differnew file mode 100644 index 000000000..de9d9cf47 --- /dev/null +++ b/data/graphics/fonts/down_arrow_RS_2.png diff --git a/data/graphics/fonts/font0_jap.png b/data/graphics/fonts/font0_jap.png Binary files differnew file mode 100644 index 000000000..23903f343 --- /dev/null +++ b/data/graphics/fonts/font0_jap.png diff --git a/data/graphics/fonts/font0_latin.png b/data/graphics/fonts/font0_latin.png Binary files differnew file mode 100644 index 000000000..7a79f2389 --- /dev/null +++ b/data/graphics/fonts/font0_latin.png diff --git a/data/graphics/fonts/font1_jap.png b/data/graphics/fonts/font1_jap.png Binary files differnew file mode 100644 index 000000000..0041b477a --- /dev/null +++ b/data/graphics/fonts/font1_jap.png diff --git a/data/graphics/fonts/font1_latin.png b/data/graphics/fonts/font1_latin.png Binary files differnew file mode 100644 index 000000000..42e847faf --- /dev/null +++ b/data/graphics/fonts/font1_latin.png diff --git a/data/graphics/fonts/font2_jap.png b/data/graphics/fonts/font2_jap.png Binary files differnew file mode 100644 index 000000000..efdb4b77e --- /dev/null +++ b/data/graphics/fonts/font2_jap.png diff --git a/data/graphics/fonts/font2_latin.png b/data/graphics/fonts/font2_latin.png Binary files differnew file mode 100644 index 000000000..42e847faf --- /dev/null +++ b/data/graphics/fonts/font2_latin.png diff --git a/data/graphics/fonts/font4_jap.png b/data/graphics/fonts/font4_jap.png Binary files differnew file mode 100644 index 000000000..da4f2beac --- /dev/null +++ b/data/graphics/fonts/font4_jap.png diff --git a/data/graphics/fonts/font4_latin.png b/data/graphics/fonts/font4_latin.png Binary files differnew file mode 100644 index 000000000..42e847faf --- /dev/null +++ b/data/graphics/fonts/font4_latin.png diff --git a/data/graphics/fonts/font5_jap.png b/data/graphics/fonts/font5_jap.png Binary files differnew file mode 100644 index 000000000..7da59c0eb --- /dev/null +++ b/data/graphics/fonts/font5_jap.png diff --git a/data/graphics/fonts/font5_latin.png b/data/graphics/fonts/font5_latin.png Binary files differnew file mode 100644 index 000000000..42e847faf --- /dev/null +++ b/data/graphics/fonts/font5_latin.png diff --git a/data/graphics/fonts/font9_jap.png b/data/graphics/fonts/font9_jap.png Binary files differnew file mode 100644 index 000000000..14cf6c042 --- /dev/null +++ b/data/graphics/fonts/font9_jap.png diff --git a/data/graphics/fonts/keypad_icons.png b/data/graphics/fonts/keypad_icons.png Binary files differnew file mode 100644 index 000000000..f8c162bb9 --- /dev/null +++ b/data/graphics/fonts/keypad_icons.png diff --git a/data/text.s b/data/text.s deleted file mode 100644 index c9948aef5..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 - -gUnknown_81EA6CC:: @ 81EA6CC - .incbin "baserom.gba", 0x1EA6CC, 0x34 - -gUnknown_81EA700:: @ 81EA700 - .incbin "baserom.gba", 0x1EA700, 0x800 - -gUnknown_81EAF00:: @ 81EAF00 - .incbin "baserom.gba", 0x1EAF00, 0x4000 - -gUnknown_81EEF00:: @ 81EEF00 - .incbin "baserom.gba", 0x1EEF00, 0x200 - -gUnknown_81EF100:: @ 81EF100 - .incbin "baserom.gba", 0x1EF100, 0x4000 - -gUnknown_81F3100:: @ 81F3100 - .incbin "baserom.gba", 0x1F3100, 0x8000 - -gUnknown_81FB100:: @ 81FB100 - .incbin "baserom.gba", 0x1FB100, 0x200 - -gUnknown_81FB300:: @ 81FB300 - .incbin "baserom.gba", 0x1FB300, 0x4000 - -gUnknown_81FF300:: @ 81FF300 - .incbin "baserom.gba", 0x1FF300, 0x8000 - -gUnknown_8207300:: @ 8207300 - .incbin "baserom.gba", 0x207300, 0x200 - -gUnknown_8207500:: @ 8207500 - .incbin "baserom.gba", 0x207500, 0x8000 - -gUnknown_820F500:: @ 820F500 - .incbin "baserom.gba", 0x20F500, 0x118 - -gUnknown_820F618:: @ 820F618 - .incbin "baserom.gba", 0x20F618, 0x8000 - -gUnknown_8217618:: @ 8217618 - .incbin "baserom.gba", 0x217618, 0x200 - -gUnknown_8217818:: @ 8217818 - .incbin "baserom.gba", 0x217818, 0x8000 - -gUnknown_821F818:: @ 821F818 - .incbin "baserom.gba", 0x21F818, 0x118 - -gUnknown_821F930:: @ 821F930 - .incbin "baserom.gba", 0x21F930, 0x8000 - -gUnknown_8227930:: @ 8227930 - .incbin "baserom.gba", 0x227930, 0x200 - -gUnknown_8227B30:: @ 8227B30 - .incbin "baserom.gba", 0x227B30, 0x8000 - -gUnknown_822FB30:: @ 822FB30 - .incbin "baserom.gba", 0x22FB30, 0x118 - -gUnknown_822FC48:: @ 822FC48 - .incbin "baserom.gba", 0x22FC48, 0x2000 |
