diff options
| author | Egor Ananyin <ananinegor@gmail.com> | 2020-06-20 09:18:43 +0300 |
|---|---|---|
| committer | Egor Ananyin <ananinegor@gmail.com> | 2020-06-20 09:18:43 +0300 |
| commit | abd2d1e16494867989e710e5235c6425fa4e8c34 (patch) | |
| tree | 7eff3e1db566801104a8fc2672bbe57e06f7009e /arm7/asm/CARD_pullOut.s | |
| parent | 70556fc300ba85dad248d20b3c79c415e2ef88e5 (diff) | |
| parent | 12c17948602bf14535c91c530f214b99863e038e (diff) | |
conflicts
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 |