diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /data/unknown_debug_menu.s | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/unknown_debug_menu.s')
| -rw-r--r-- | data/unknown_debug_menu.s | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/data/unknown_debug_menu.s b/data/unknown_debug_menu.s deleted file mode 100644 index eaa635fa4..000000000 --- a/data/unknown_debug_menu.s +++ /dev/null @@ -1,32 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -UnknownString_1stRound: - .string "1st round$" -UnknownString_2ndRound: - .string "2nd round$" -UnknownString_3rdRound: - .string "3rd round$" -UnknownString_4thRound: - .string "4th round$" -UnknownString_5thRound: - .string "5th round$" -UnknownString_6thRound: - .string "6th round$" -UnknownString_7thRound: - .string "7th round$" -UnknownString_8thRound: - .string "8th round$" - - .align 2 -gUnknown_0842C29C:: @ 842C29C - .4byte UnknownString_1stRound, sub_814A4B8 - .4byte UnknownString_2ndRound, sub_814A4B8 - .4byte UnknownString_3rdRound, sub_814A4B8 - .4byte UnknownString_4thRound, sub_814A4B8 - .4byte UnknownString_5thRound, sub_814A4B8 - .4byte UnknownString_6thRound, sub_814A4B8 - .4byte UnknownString_7thRound, sub_814A4B8 - .4byte UnknownString_8thRound, sub_814A4B8 |