diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:14:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:19:52 -0500 |
| commit | 6b2d0ae841f5a7ff851d462b12f09eac998d2d8f (patch) | |
| tree | 280e64b26f9b525606de02701f0c9a768301c4d2 /hram.asm | |
| parent | 010b450834bd595b961582aea5e5771632510ef9 (diff) | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
Fix merge conflicts
Diffstat (limited to 'hram.asm')
| -rw-r--r-- | hram.asm | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -89,7 +89,7 @@ hRandom EQU $ffe1 hRandomAdd EQU $ffe1 hRandomSub EQU $ffe2 hSecondsBackup EQU $ffe3 -hBattleTurn EQU $ffe4 +hBattleTurn EQU $ffe4 ; Which trainers turn is it? 0: Player, 1: Opponent Trainer hCGBPalUpdate EQU $ffe5 hCGB EQU $ffe6 hSGB EQU $ffe7 |