diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
| commit | d4532c70cb03962d38517fef2d723f81a9b27c1b (patch) | |
| tree | 70220c06025360d7089011f5d80239b61ac183af /asm/battle_1.s | |
| parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
| parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/battle_1.s')
| -rw-r--r-- | asm/battle_1.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index 849736cb4..416fd87ec 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -1547,7 +1547,7 @@ _080358E0: .4byte _08035A40 .4byte _08035A70 _08035904: - ldr r4, =gUnknown_0831ABA8 + ldr r4, =gBattleTerrainTable ldr r5, =gBattleTerrain ldrb r1, [r5] lsls r0, r1, 2 @@ -2632,7 +2632,7 @@ _08036350: lsls r0, 24 cmp r0, 0 bne _0803639C - ldr r4, =gUnknown_0831ABA8 + ldr r4, =gBattleTerrainTable ldr r5, =gBattleTerrain ldrb r1, [r5] lsls r0, r1, 2 @@ -2778,7 +2778,7 @@ _080364A8: .4byte _08036510 .4byte _08036518 _080364CC: - ldr r2, =gUnknown_0831ABA8 + ldr r2, =gBattleTerrainTable ldr r0, =gBattleTerrain ldrb r1, [r0] lsls r0, r1, 2 @@ -2888,7 +2888,7 @@ _080365B4: .4byte _0803661C .4byte _08036624 _080365D8: - ldr r2, =gUnknown_0831ABA8 + ldr r2, =gBattleTerrainTable ldr r0, =gBattleTerrain ldrb r1, [r0] lsls r0, r1, 2 @@ -3003,7 +3003,7 @@ _080366C8: .4byte _08036738 .4byte _08036740 _080366EC: - ldr r2, =gUnknown_0831ABA8 + ldr r2, =gBattleTerrainTable ldr r0, =gBattleTerrain ldrb r1, [r0] lsls r0, r1, 2 |