Merge branch 'master' into decomp_battle2

This commit is contained in:
DizzyEggg
2017-10-06 17:07:56 +02:00
7 changed files with 592 additions and 636 deletions

View File

@@ -316,7 +316,7 @@ gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
field_eff_end
gFieldEffectScript_Unknown60:: @ 82DBCD2
field_eff_callnative sub_81799B8
field_eff_callnative FldEff_UsePuzzleEffect
field_eff_end
gFieldEffectScript_Unknown61:: @ 82DBCD8