diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-18 16:48:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-18 16:48:57 -0400 |
| commit | 593002a8f92cc7d7edd0f1555c43985ca707824d (patch) | |
| tree | 8707be3595d5179d256f8087f112f6445fcf6ad3 /arm7/asm/CARD_pullOut.s | |
| parent | 5e2d0ed91734dd995d82487acc8f1e7afa92f513 (diff) | |
| parent | 83924f933797f36776a10a15ce87c85cc4dfcddf (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm7/asm/CARD_pullOut.s')
| -rw-r--r-- | arm7/asm/CARD_pullOut.s | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arm7/asm/CARD_pullOut.s b/arm7/asm/CARD_pullOut.s index ed919647..b4d52c6c 100644 --- a/arm7/asm/CARD_pullOut.s +++ b/arm7/asm/CARD_pullOut.s @@ -215,4 +215,3 @@ _038010C0: bx lr _038010CC: .word _038099A4 _038010D0: .word FUN_03801048 - .balign 2, 0 ; Don't pad with nop |