dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
jiangzhengwenjz committed 2019-06-26 07:34:38 +08:00
1 parent 5c9af82955
commit d7cd28a98c
2 files changed
-886
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

asm/egg_hatch.s
-8
View File
@@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
.align 2, 0 @ Don't pad with nop.