diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-09 14:32:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 14:32:44 -0500 |
| commit | 08a5efbd8144d2cb1f4b8da62ba484ffcc9a1f93 (patch) | |
| tree | ab77e37580ab0eb0ee18c28f749d8c8da15dbcf7 /asm/battle_1.s | |
| parent | 96c5966ff3676eb1b3463808b83b42e13e1591fd (diff) | |
| parent | 41db0259759c8e4c3c31c5cf09daed9f85ab5b63 (diff) | |
Merge pull request #62 from Diegoisawesome/baserom_extraction
Continued baserom extraction
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 |