dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
golem galvanize
2018-12-13 00:31:06 -05:00
parent 2265d49ac2 170b6ef449
commit 6748ef72fb
525 changed files with 76142 additions and 91660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_intro.s
-2035
View File
File diff suppressed because it is too large Load Diff
asm/cable_car.s
-2882
View File
File diff suppressed because it is too large Load Diff
asm/field_screen.s
-10509
View File
File diff suppressed because it is too large Load Diff
asm/fire.s
-2397
View File
File diff suppressed because it is too large Load Diff
asm/ghost.s
-3251
View File
File diff suppressed because it is too large Load Diff
asm/ice.s
+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
asm/macros/event.inc
+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
asm/roulette_util.s
-1431
View File
File diff suppressed because it is too large Load Diff