diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-16 19:39:35 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-16 19:39:35 +0100 |
| commit | 4dd06dbcd327e2af38912e09d31d5c3e00bc93ba (patch) | |
| tree | ec33a5256f8b6a880c68b9380f955c0f4bdac75f /data | |
| parent | a6072ae293b0c0c3577b280274a2fd755033ab9f (diff) | |
optiom menu move data to C
Diffstat (limited to 'data')
| -rw-r--r-- | data/option_menu.s | 20 | ||||
| -rw-r--r-- | data/strings.s | 14 |
2 files changed, 7 insertions, 27 deletions
diff --git a/data/option_menu.s b/data/option_menu.s deleted file mode 100644 index 05db7fddf..000000000 --- a/data/option_menu.s +++ /dev/null @@ -1,20 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0855C604:: @ 855C604 - .incbin "baserom.gba", 0x55c604, 0x60 - -gUnknown_0855C664:: @ 855C664 - .incbin "baserom.gba", 0x55c664, 0x1c - -gUnknown_0855C680:: @ 855C680 - .incbin "baserom.gba", 0x55c680, 0x18 - -gUnknown_0855C698:: @ 855C698 - .incbin "baserom.gba", 0x55c698, 0x8 - -gUnknown_0855C6A0:: @ 855C6A0 - .incbin "baserom.gba", 0x55c6a0, 0x4 diff --git a/data/strings.s b/data/strings.s index 01bca9cd8..b26beefce 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4399,25 +4399,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 |