diff options
| author | JimB16 <f1@jimb.de> | 2015-10-19 16:25:15 +0200 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-10-19 16:25:15 +0200 |
| commit | 3b9a3cc3bee8934e45f5e4d3fd9704b3fa619560 (patch) | |
| tree | b402ddfd95a21402d2ab76368d44b9f04f937725 /sram.asm | |
| parent | 3ef626d37864f4dae26f115c26e448351f19da7c (diff) | |
| parent | f399315a489c7eff28ec1941c41d12264fb38039 (diff) | |
merge conflicts resolved
Diffstat (limited to 'sram.asm')
| -rw-r--r-- | sram.asm | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -27,9 +27,8 @@ s0_abe4End:: ds $30 s0_ac60:: ds 8 -s0_ac68:: ds 1 -s0_ac69:: ds 1 -s0_ac6a:: ds 1 +sLuckyNumberDay:: ds 1 +sLuckyIDNumber:: ds 2 ds $b200 - $ac6b |