diff options
| author | YamaArashi <shadow962@live.com> | 2016-05-30 20:58:08 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-05-30 20:58:08 -0700 |
| commit | ffd70ca9ebc62ba39347dad743eda44b29dc4a65 (patch) | |
| tree | 388d0e6ee919bda1dd07de67a75daa26ed95424d | |
| parent | ac652715b04df69f49199b5978fbe70c4402fcf9 (diff) | |
combo starter lookup table
| -rw-r--r-- | asm/rom5.s | 4 | ||||
| -rw-r--r-- | data/data2.s | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index c23bff3aa..c67cc94f3 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -124972,7 +124972,7 @@ _080B7D6E: b _080B7D82 .align 2, 0 _080B7D78: .4byte gContestMoves -_080B7D7C: .4byte gUnknown_083D016C +_080B7D7C: .4byte gComboStarterLookupTable _080B7D80: movs r0, 0 _080B7D82: @@ -125862,7 +125862,7 @@ _080B83BC: .align 2, 0 _080B83F0: .4byte 0x02019260 _080B83F4: .4byte gContestMoves -_080B83F8: .4byte gUnknown_083D016C +_080B83F8: .4byte gComboStarterLookupTable _080B83FC: movs r0, 0 _080B83FE: diff --git a/data/data2.s b/data/data2.s index 95dc46851..b62b047b2 100644 --- a/data/data2.s +++ b/data/data2.s @@ -4370,10 +4370,16 @@ gUnknown_083CF58C: @ 83CF58C @ 83D00AC .include "data/contest_effects.s" - .global gUnknown_083D016C -gUnknown_083D016C: @ 83D016C - .incbin "baserom.gba", 0x003d016c, 0x40 +@ A lookup table with TRUE for each combo starter ID and FALSE for ID 0, +@ which means "not a combo starter move". + .global gComboStarterLookupTable +gComboStarterLookupTable: @ 83D016C + .byte FALSE + .rept 62 + .byte TRUE + .endr + .align 2 .global gUnknown_083D01AC gUnknown_083D01AC: @ 83D01AC .incbin "baserom.gba", 0x003d01ac, 0xc0 |