dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

egg moves

Browse Source
This commit is contained in:
YamaArashi
2015-10-12 20:26:16 -07:00
parent b3f965dc84
commit 79f2988694
4 changed files with 1317 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/emerald.s
+2 -2
View File
@@ -200855,7 +200855,7 @@ pokemon_get_eggmoves: ; 80703C8
lsls r0, 16 lsls r0, 16
lsrs r3, r0, 16 lsrs r3, r0, 16
movs r2, 0 movs r2, 0
ldr r5, =gUnknown_0832ADD8 ldr r5, =gEggMoves
ldrh r1, [r5] ldrh r1, [r5]
ldr r7, =0x00004e20 ldr r7, =0x00004e20
adds r0, r3, r7 adds r0, r3, r7
@@ -200870,7 +200870,7 @@ pokemon_get_eggmoves: ; 80703C8
lsls r0, 16 lsls r0, 16
lsrs r2, r0, 16 lsrs r2, r0, 16
ldr r0, =0x00000471 ldr r0, =0x00000471
ldr r5, =gUnknown_0832ADD8 ldr r5, =gEggMoves
cmp r2, r0 cmp r2, r0
bhi @0807041A bhi @0807041A
lsls r0, r2, 1 lsls r0, r2, 1
asm/macros.s
+4
View File
@@ -104,3 +104,7 @@
.macro empty_evo_entries count .macro empty_evo_entries count
.fill 8 * \count, 1, 0 .fill 8 * \count, 1, 0
.endm .endm
.macro egg_moves_begin species
.2byte 20000 + \species
.endm
data/data2.s
+4 -2
View File
@@ -1754,8 +1754,10 @@ gUnknown_0832A3C0: ; 832A3C0
gUnknown_0832A3D8: ; 832A3D8 gUnknown_0832A3D8: ; 832A3D8
.incbin "base_emerald.gba", 0x32a3d8, 0xa00 .incbin "base_emerald.gba", 0x32a3d8, 0xa00
gUnknown_0832ADD8: ; 832ADD8 ; 832ADD8
.incbin "base_emerald.gba", 0x32add8, 0x8e8 .include "data/egg_moves.s"
.align 2, 0
gUnknown_0832B6C0: ; 832B6C0 gUnknown_0832B6C0: ; 832B6C0
.incbin "base_emerald.gba", 0x32b6c0, 0x20 .incbin "base_emerald.gba", 0x32b6c0, 0x20
data/egg_moves.s
+1307
View File
File diff suppressed because it is too large Load Diff