Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu

This commit is contained in:
golem galvanize committed 2018-12-13 00:31:06 -05:00
commit 6748ef72fb
525 files changed
+76142 -91660

No files matched your search

-2035
View File
File diff suppressed because it is too large. Load diff
-2882
View File
File diff suppressed because it is too large. Load diff
-10509
View File
File diff suppressed because it is too large. Load diff
-2397
View File
File diff suppressed because it is too large. Load diff
-3251
View File
File diff suppressed because it is too large. Load diff
+2 -2
View File
@@ -1368,7 +1368,7 @@ _0810C0E2:
mov r0, sp
movs r2, 0
bl sub_80A6D60
ldr r0, =gUnknown_0854C270
ldr r0, =gUnknown_083970E8
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@@ -1650,7 +1650,7 @@ _0810C366:
mov r0, sp
movs r2, 0
bl sub_80A6D60
ldr r0, =gUnknown_0854C270
ldr r0, =gUnknown_083970E8
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
+1 -1
View File
@@ -668,7 +668,7 @@
.4byte \pointer2 @ text
.4byte \pointer3 @ text
.4byte \pointer4 @ event script
.elseif \type == TRAINER_BATTLE_9
.elseif \type == TRAINER_BATTLE_PYRAMID
.4byte \pointer1 @ text
.4byte \pointer2 @ text
.elseif \type == TRAINER_BATTLE_SET_TRAINER_A
-1431
View File
File diff suppressed because it is too large. Load diff