Merge branch 'master' into heal_location

This commit is contained in:
PikalaxALT
2017-11-01 23:37:41 -04:00
94 changed files with 20013 additions and 61089 deletions
+3 -7
View File
@@ -495,10 +495,10 @@ gBankInMenu: @ 20244B8
gDoingBattleAnim: @ 20244B9
.space 0x3
gUnknown_020244BC: @ 20244BC
gTransformedPersonalities: @ 20244BC
.space 0x10
gUnknown_020244CC: @ 20244CC
gPlayerDpadHoldFrames: @ 20244CC
.space 0x4
gBattleSpritesDataPtr: @ 20244D0
@@ -1275,11 +1275,7 @@ gUnknown_0203AB78: @ 203AB78
gUnknown_0203AB7C: @ 203AB7C
.space 0x4
gUnknown_0203AB80: @ 203AB80
.space 0x4
gUnknown_0203AB84: @ 203AB84
.space 0x4
.include "src/evolution_scene.o"
gUnknown_0203AB88: @ 203AB88
.space 0x4