diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /data/script_menu.s | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'data/script_menu.s')
| -rw-r--r-- | data/script_menu.s | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/data/script_menu.s b/data/script_menu.s deleted file mode 100644 index e28616300..000000000 --- a/data/script_menu.s +++ /dev/null @@ -1,29 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 83CD788 - .include "data/multichoice.inc" - - .align 2 -gUnknown_083CE048:: @ 83CE048 - .4byte OtherText_Cool2 - .4byte OtherText_Beauty3 - .4byte OtherText_Cute2 - .4byte OtherText_Smart2 - .4byte OtherText_Tough2 - .4byte OtherText_Normal - .4byte OtherText_Super - .4byte OtherText_Hyper - .4byte OtherText_Master - .4byte OtherText_Cool3 - .4byte OtherText_Beauty4 - .4byte OtherText_Cute3 - .4byte OtherText_Smart3 - .4byte OtherText_Tough3 - .4byte OtherText_Items - .4byte OtherText_KeyItems - .4byte OtherText_Balls - .4byte OtherText_TMsHMs - .4byte OtherText_Berries |