diff options
| author | yenatch <yenatch@gmail.com> | 2017-04-24 22:08:48 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-04-24 22:08:48 -0400 |
| commit | 678b3c9e6c7de83ad09c00b181497f942bf86e62 (patch) | |
| tree | 7d5f51fc30caf3d0e690864369d140800e2d82c1 /wram.asm | |
| parent | INSTALL.md: add a note about different cygwin install paths (diff) | |
| parent | Revert "Fix floating sections" (diff) | |
| download | pokeyellow-678b3c9e6c7de83ad09c00b181497f942bf86e62.tar.gz pokeyellow-678b3c9e6c7de83ad09c00b181497f942bf86e62.tar.xz pokeyellow-678b3c9e6c7de83ad09c00b181497f942bf86e62.zip | |
Merge commit '52adb84'
Revert "Fix floating sections"
This reverts commit cec6e6e.
Diffstat (limited to 'wram.asm')
| -rwxr-xr-x | wram.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -60,7 +60,7 @@ battle_struct: MACRO ENDM -SECTION "WRAM Bank 0", WRAM0 [$c000] +SECTION "WRAM Bank 0", WRAM0 wUnusedC000:: ; c000 ds 1 @@ -1610,7 +1610,7 @@ wEnemyMonDefense:: dw wEnemyMonSpeed:: dw wEnemyMonSpecial:: dw wEnemyMonPP:: ds 2 ; NUM_MOVES - 2 -SECTION "WRAM Bank 1", WRAMX[$d000], BANK[1] +SECTION "WRAM Bank 1", WRAMX, BANK[1] ds 2 ; NUM_MOVES - 2 wEnemyMonBaseStats:: ds 5 |