Merge branch 'master' into decompile_battle_tent

This commit is contained in:
DizzyEggg committed 2018-06-30 14:43:41 +02:00
commit 15fe5a031b
2916 files changed
+9504 -10000

No files matched your search

+1 -1
View File
@@ -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]