diff options
| author | 2Tie <foxman95@ymail.com> | 2018-06-18 22:53:06 -0600 |
|---|---|---|
| committer | 2Tie <foxman95@ymail.com> | 2018-06-18 22:53:06 -0600 |
| commit | 2f0b152e5a52d39bfe938f8f19cdd49d3dcd4671 (patch) | |
| tree | 65ee75fd312bfb8d325a494569c8776cdd4ed16c /wram.asm | |
| parent | b44077ed3180b57a852db48f784312f6a1b0221a (diff) | |
this is how you fix conflicts, right?
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -595,7 +595,8 @@ wDebugFlags:: db ; ce63 ; | \-- debug field indicator ; \---- loaded/continued game -SECTION "Player And Mom Names", WRAM0[$CE67] + ds 3 + wPlayerName:: ds 6 ; ce67 wMomsName:: ds 6 ; ce6d |