diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-06-30 14:43:41 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-06-30 14:43:41 +0200 |
| commit | 15fe5a031b94b2f9b5686da6ba39a67e92cad31a (patch) | |
| tree | 18658511c9b9cdc73bbcbea5a0be8bdd7407abb5 /asm | |
| parent | 5434db2fc6f4e7ebd8cb6bc76115d5c3b6b5807e (diff) | |
| parent | 91ee3221b3a4885d155ad2cca16b7678062ad18a (diff) | |
Merge branch 'master' into decompile_battle_tent
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_frontier_2.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index b2b454278..a58a3d2d2 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -30026,7 +30026,7 @@ _081AA0A6: ldr r2, =0x00000169 adds r0, r2 lsls r0, 2 - ldr r1, =gMapAttributes + ldr r1, =gMapLayouts adds r0, r1 ldr r6, [r0] ldr r2, [r6, 0xC] |