diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/graphics.s | 2 | ||||
| -rw-r--r-- | data/option_menu.s | 30 | ||||
| -rw-r--r-- | data/strings.s | 14 | ||||
| -rw-r--r-- | data/text_window.s | 196 |
4 files changed, 8 insertions, 234 deletions
diff --git a/data/graphics.s b/data/graphics.s index 11244eb99..8527e570d 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -5041,7 +5041,7 @@ gUnknown_08DDD704:: @ 8DDD704 .incbin "graphics/unknown/unknown_DDD704.bin" @ textbox tilemap?? .align 2 -gUnknown_08DDD728:: @ 8DDD728 +gMessageBox_Pal:: @ 8DDD728 .incbin "graphics/text_window/message_box.gbapal" .align 2 diff --git a/data/option_menu.s b/data/option_menu.s deleted file mode 100644 index 0f8608f4b..000000000 --- a/data/option_menu.s +++ /dev/null @@ -1,30 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0855C604:: @ 855C604 - .incbin "graphics/interface/855C604.gbapal" - .incbin "graphics/interface/855C624.bin" - -gUnknown_0855C664:: @ 855C664 - .4byte gUnknown_085EE590 - .4byte gUnknown_085EE59B - .4byte gUnknown_085EE5A8 - .4byte gUnknown_085EE5B5 - .4byte gUnknown_085EE5C8 - .4byte gUnknown_085EE5BB - .4byte gUnknown_085EE5C1 - -gUnknown_0855C680:: @ 855C680 - window_template 1, 2, 1, 0x1A, 2, 1, 2 - window_template 0, 2, 5, 0x1A, 14, 1, 0x36 - null_window_template - -gUnknown_0855C698:: @ 855C698 - .4byte 0x1E5 - .4byte 0x11F4 - -gUnknown_0855C6A0:: @ 855C6A0 - .2byte 0x7E51, 0 diff --git a/data/strings.s b/data/strings.s index 360f26711..75b430dd1 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4379,25 +4379,25 @@ gText_ABtnTitleScreen:: @ 85EE572 gText_Option:: @ 85EE589 .string "OPTION$" -gUnknown_085EE590:: @ 85EE590 +gText_TextSpeed:: @ 85EE590 .string "TEXT SPEED$" -gUnknown_085EE59B:: @ 85EE59B +gText_BattleScene:: @ 85EE59B .string "BATTLE SCENE$" -gUnknown_085EE5A8:: @ 85EE5A8 +gText_BattleStyle:: @ 85EE5A8 .string "BATTLE STYLE$" -gUnknown_085EE5B5:: @ 85EE5B5 +gText_Sound:: @ 85EE5B5 .string "SOUND$" -gUnknown_085EE5BB:: @ 85EE5BB +gText_Frame:: @ 85EE5BB .string "FRAME$" -gUnknown_085EE5C1:: @ 85EE5C1 +gText_OptionMenuCancel:: @ 85EE5C1 .string "CANCEL$" -gUnknown_085EE5C8:: @ 85EE5C8 +gText_ButtonMode:: @ 85EE5C8 .string "BUTTON MODE$" gText_TextSpeedSlow:: @ 85EE5D4 diff --git a/data/text_window.s b/data/text_window.s deleted file mode 100644 index 8acbe5a25..000000000 --- a/data/text_window.s +++ /dev/null @@ -1,196 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gTextWindowFrame1_Gfx:: @ 850E87C - .incbin "graphics/text_window/1.4bpp" - - .align 2 -gTextWindowFrame2_Gfx:: @ 850E99C - .incbin "graphics/text_window/2.4bpp" - - .align 2 -gTextWindowFrame3_Gfx:: @ 850EABC - .incbin "graphics/text_window/3.4bpp" - - .align 2 -gTextWindowFrame4_Gfx:: @ 850EBDC - .incbin "graphics/text_window/4.4bpp" - - .align 2 -gTextWindowFrame5_Gfx:: @ 850ECFC - .incbin "graphics/text_window/5.4bpp" - - .align 2 -gTextWindowFrame6_Gfx:: @ 850EE1C - .incbin "graphics/text_window/6.4bpp" - - .align 2 -gTextWindowFrame7_Gfx:: @ 850EF3C - .incbin "graphics/text_window/7.4bpp" - - .align 2 -gTextWindowFrame8_Gfx:: @ 850F05C - .incbin "graphics/text_window/8.4bpp" - - .align 2 -gTextWindowFrame9_Gfx:: @ 850F17C - .incbin "graphics/text_window/9.4bpp" - - .align 2 -gTextWindowFrame10_Gfx:: @ 850F29C - .incbin "graphics/text_window/10.4bpp" - - .align 2 -gTextWindowFrame11_Gfx:: @ 850F3BC - .incbin "graphics/text_window/11.4bpp" - - .align 2 -gTextWindowFrame12_Gfx:: @ 850F4DC - .incbin "graphics/text_window/12.4bpp" - - .align 2 -gTextWindowFrame13_Gfx:: @ 850F5FC - .incbin "graphics/text_window/13.4bpp" - - .align 2 -gTextWindowFrame14_Gfx:: @ 850F71C - .incbin "graphics/text_window/14.4bpp" - - .align 2 -gTextWindowFrame15_Gfx:: @ 850F83C - .incbin "graphics/text_window/15.4bpp" - - .align 2 -gTextWindowFrame16_Gfx:: @ 850F95C - .incbin "graphics/text_window/16.4bpp" - - .align 2 -gTextWindowFrame17_Gfx:: @ 850FA7C - .incbin "graphics/text_window/17.4bpp" - - .align 2 -gTextWindowFrame18_Gfx:: @ 850FB9C - .incbin "graphics/text_window/18.4bpp" - - .align 2 -gTextWindowFrame19_Gfx:: @ 850FCBC - .incbin "graphics/text_window/19.4bpp" - - .align 2 -gTextWindowFrame20_Gfx:: @ 850FDDC - .incbin "graphics/text_window/20.4bpp" - - .align 2 -gTextWindowFrame1_Pal:: @ 850FEFC - .incbin "graphics/text_window/1.gbapal" - - .align 2 -gTextWindowFrame2_Pal:: @ 850FF1C - .incbin "graphics/text_window/2.gbapal" - - .align 2 -gTextWindowFrame3_Pal:: @ 850FF3C - .incbin "graphics/text_window/3.gbapal" - - .align 2 -gTextWindowFrame4_Pal:: @ 850FF5C - .incbin "graphics/text_window/4.gbapal" - - .align 2 -gTextWindowFrame5_Pal:: @ 850FF7C - .incbin "graphics/text_window/5.gbapal" - - .align 2 -gTextWindowFrame6_Pal:: @ 850FF9C - .incbin "graphics/text_window/6.gbapal" - - .align 2 -gTextWindowFrame7_Pal:: @ 850FFBC - .incbin "graphics/text_window/7.gbapal" - - .align 2 -gTextWindowFrame8_Pal:: @ 850FFDC - .incbin "graphics/text_window/8.gbapal" - - .align 2 -gTextWindowFrame9_Pal:: @ 850FFFC - .incbin "graphics/text_window/9.gbapal" - - .align 2 -gTextWindowFrame10_Pal:: @ 851001C - .incbin "graphics/text_window/10.gbapal" - - .align 2 -gTextWindowFrame11_Pal:: @ 851003C - .incbin "graphics/text_window/11.gbapal" - - .align 2 -gTextWindowFrame12_Pal:: @ 851005C - .incbin "graphics/text_window/12.gbapal" - - .align 2 -gTextWindowFrame13_Pal:: @ 851007C - .incbin "graphics/text_window/13.gbapal" - - .align 2 -gTextWindowFrame14_Pal:: @ 851009C - .incbin "graphics/text_window/14.gbapal" - - .align 2 -gTextWindowFrame15_Pal:: @ 85100BC - .incbin "graphics/text_window/15.gbapal" - - .align 2 -gTextWindowFrame16_Pal:: @ 85100DC - .incbin "graphics/text_window/16.gbapal" - - .align 2 -gTextWindowFrame17_Pal:: @ 85100FC - .incbin "graphics/text_window/17.gbapal" - - .align 2 -gTextWindowFrame18_Pal:: @ 851011C - .incbin "graphics/text_window/18.gbapal" - - .align 2 -gTextWindowFrame19_Pal:: @ 851013C - .incbin "graphics/text_window/19.gbapal" - - .align 2 -gTextWindowFrame20_Pal:: @ 851015C - .incbin "graphics/text_window/20.gbapal" - - .align 2 -gUnknown_0851017C:: @ 851017C - .incbin "graphics/text_window/message_box.gbapal" - - .incbin "graphics/text_window/text_pal1.gbapal" - .incbin "graphics/text_window/text_pal2.gbapal" - .incbin "graphics/text_window/text_pal3.gbapal" - .incbin "graphics/text_window/text_pal4.gbapal" - - .align 2 -gUnknown_0851021C:: @ 851021C - .4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal - .4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal - .4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal - .4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal - .4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal - .4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal - .4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal - .4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal - .4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal - .4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal - .4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal - .4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal - .4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal - .4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal - .4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal - .4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal - .4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal - .4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal - .4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal - .4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal |