diff options
| author | YamaArashi <shadow962@live.com> | 2015-10-14 13:17:58 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-10-14 13:17:58 -0700 |
| commit | dd8f08f8a8a4bf4a313d9537a19601902ff3f425 (patch) | |
| tree | 8cdba15c08f4f9635c94d20efe083da73b9fc3d9 /data/data2.s | |
| parent | 6dd8d212c6c1e808452ab3e76d7830427fed7b68 (diff) | |
some contest text
Diffstat (limited to 'data/data2.s')
| -rw-r--r-- | data/data2.s | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/data/data2.s b/data/data2.s index 80e59dc06..b6e631c28 100644 --- a/data/data2.s +++ b/data/data2.s @@ -4178,11 +4178,11 @@ gUnknown_08587C18: ; 8587C18 gUnknown_08587C30: ; 8587C30 .incbin "base_emerald.gba", 0x587c30, 0x20 -gUnknown_08587C50: ; 8587C50 - .incbin "base_emerald.gba", 0x587c50, 0xf8 +; 8587C50 + .include "data/text/contest_text_pointers.s" -gUnknown_08587D48: ; 8587D48 - .incbin "base_emerald.gba", 0x587d48, 0x48 +; 8587D5C + .incbin "base_emerald.gba", 0x587d5c, 0x34 gUnknown_08587D90: ; 8587D90 .incbin "base_emerald.gba", 0x587d90, 0x80 @@ -4484,8 +4484,15 @@ gUnknown_0858C2AC: ; 858C2AC gUnknown_0858CDCC: ; 858CDCC .incbin "base_emerald.gba", 0x58cdcc, 0xc0 -gUnknown_0858CE8C: ; 858CE8C - .incbin "base_emerald.gba", 0x58ce8c, 0x40 +; A look-up table with a 1 for each combo starter ID and a 0 for ID 0, +; which means "not a combo starter move". +gComboStarterLut: ; 858CE8C + .byte 0 + .rept 62 + .byte 1 + .endr + + .align 2, 0 gUnknown_0858CECC: ; 858CECC .incbin "base_emerald.gba", 0x58cecc, 0xc0 |