egg moves

2015-10-12 20:26:16 -07:00
parent b3f965dc84
commit 79f2988694
4 changed files with 1317 additions and 4 deletions
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -200855,7 +200855,7 @@ pokemon_get_eggmoves: ; 80703C8
 	lsls r0, 16
 	lsrs r3, r0, 16
 	movs r2, 0
-	ldr r5, =gUnknown_0832ADD8
+	ldr r5, =gEggMoves
 	ldrh r1, [r5]
 	ldr r7, =0x00004e20
 	adds r0, r3, r7
@@ -200870,7 +200870,7 @@ pokemon_get_eggmoves: ; 80703C8
 	lsls r0, 16
 	lsrs r2, r0, 16
 	ldr r0, =0x00000471
-	ldr r5, =gUnknown_0832ADD8
+	ldr r5, =gEggMoves
 	cmp r2, r0
 	bhi @0807041A
 	lsls r0, r2, 1
--- a/asm/macros.s
+++ b/asm/macros.s
@@ -104,3 +104,7 @@
 	.macro empty_evo_entries count
 	.fill 8 * \count, 1, 0
 	.endm
+
+	.macro egg_moves_begin species
+	.2byte 20000 + \species
+	.endm