Merge branch 'master' into dodrio_berry_picking

2019-05-11 21:22:09 -04:00
parent a58d9a16dd fc72b74e6c
commit 539d472796
783 changed files with 74008 additions and 50982 deletions
--- a/asm/macros/battle_anim_script.inc
+++ b/asm/macros/battle_anim_script.inc
@@ -144,7 +144,7 @@
 	.byte \pan
 	.endm

-	.macro panse_1B se:req, param1:req, param2:req, param3:req, param4
+	.macro panse_1B se:req, param1:req, param2:req, param3:req, param4:req
 	.byte 0x1b
 	.2byte \se
 	.byte \param1
@@ -215,7 +215,7 @@
 	.byte \param2
 	.endm

-	.macro panse_26 se:req, param1:req, param2:req, param3:req, param4
+	.macro panse_26 se:req, param1:req, param2:req, param3:req, param4:req
 	.byte 0x26
 	.2byte \se
 	.byte \param1
@@ -224,7 +224,7 @@
 	.byte \param4
 	.endm

-	.macro panse_27 se:req, param1:req, param2:req, param3:req, param4
+	.macro panse_27 se:req, param1:req, param2:req, param3:req, param4:req
 	.byte 0x27
 	.2byte \se
 	.byte \param1
--- a/asm/pokemon_jump.s
+++ b/asm/pokemon_jump.s
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
--- a/asm/pokenav_unk_10.s
+++ b/asm/pokenav_unk_10.s
--- a/asm/pokenav_unk_2.s
+++ b/asm/pokenav_unk_2.s
--- a/asm/pokenav_unk_6.s
+++ b/asm/pokenav_unk_6.s
--- a/asm/pokenav_unk_7.s
+++ b/asm/pokenav_unk_7.s
--- a/asm/pokenav_unk_8.s
+++ b/asm/pokenav_unk_8.s
--- a/asm/pokenav_unk_9.s
+++ b/asm/pokenav_unk_9.s