diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/option_menu.s | 30 | ||||
| -rw-r--r-- | data/strings.s | 14 |
2 files changed, 7 insertions, 37 deletions
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 |