diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-19 19:46:37 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-19 19:46:37 +0200 |
| commit | dee61330769b3e3a93844c9a0ef609500fe399d3 (patch) | |
| tree | 1f36102b4133fdfe5fe2fd8a062d085e9673b062 /asm/contest.s | |
| parent | dd0f19476c3a15514e3d08855cee3266fdbdf2ed (diff) | |
| parent | 8ceecd9fba385442f55bff2d19977e3c2fd6e5e8 (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/contest.s b/asm/contest.s index 480a5a664..9c0684663 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -1048,7 +1048,7 @@ _080D8004: bl sub_80DC594 bl sub_80DC5E8 bl sub_80DC7EC - ldr r1, =gBanksBySide + ldr r1, =gBanksByIdentity strb r4, [r1] movs r0, 0x1 strb r0, [r1, 0x1] |