Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00
1 parent be3d9c1c6d
commit fa39dc76dc
@@ -1,13 +1,13 @@
-	.macro song label, music_player, unknown
+	.macro song label:req, music_player:req, unknown:req
 	.4byte \label
 	.2byte \music_player
 	.2byte \unknown
 	.endm

-	.macro music_player info_struct, track_struct, unknown_1, unknown_2
+	.macro music_player info_struct:req, track_struct:req, num_tracks:req, unknown:req
 	.4byte \info_struct
 	.4byte \track_struct
-	.byte \unknown_1
-	.space 1
-	.2byte \unknown_2
+	.byte \num_tracks
+	.space 1  @ Padding
+	.2byte \unknown
 	.endm