diff options
| author | YamaArashi <shadow962@live.com> | 2015-10-12 20:26:16 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-10-12 20:26:16 -0700 |
| commit | 79f2988694dc91bc11eb5d656470c8346b4af7b0 (patch) | |
| tree | d68f129680f30f760cc1f93c7e6e4dfc642bcb59 /asm | |
| parent | b3f965dc845cbbb21f224c25fac2ef90538c27aa (diff) | |
egg moves
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/emerald.s | 4 | ||||
| -rw-r--r-- | asm/macros.s | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index a2947a1c0..fc74c445a 100644 --- 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 diff --git a/asm/macros.s b/asm/macros.s index 619bd7a61..5e1b125c8 100644 --- 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 |