summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-06-30 17:50:33 -0400
committerGitHub <noreply@github.com>2018-06-30 17:50:33 -0400
commit2641f93ad084b1329b3f3b9f7c8c222445fc4832 (patch)
treefb048bbc8bb7257dbd8169e2442117da5d2b30d2 /wram.asm
parent91f914718a263839daef24d44eda857bfc7cca95 (diff)
parentda5125e1411f9599b883181c5ee6e31252d37ac8 (diff)
Merge pull request #534 from Rangi42/master
[RTM] Fix triple newlines left over from removing address comments, and other improvements
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm4
1 files changed, 1 insertions, 3 deletions
diff --git a/wram.asm b/wram.asm
index 723a293ff..186c528a0 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1,4 +1,5 @@
INCLUDE "constants.asm"
+
INCLUDE "macros/wram.asm"
@@ -2111,7 +2112,6 @@ wEnemyMonCatchRate:: db ; d22b
wEnemyMonBaseExp:: db ; d22c
wEnemyMonEnd::
-
wBattleMode:: ; d22d
; 0: overworld
; 1: wild battle
@@ -2471,7 +2471,6 @@ wBadges::
wJohtoBadges:: flag_array NUM_JOHTO_BADGES ; d857
wKantoBadges:: flag_array NUM_KANTO_BADGES ; d858
-
wTMsHMs:: ds NUM_TMS + NUM_HMS ; d859
wTMsHMsEnd::
@@ -2750,7 +2749,6 @@ wKurtApricornQuantity:: db
wPlayerDataEnd::
-
wCurrMapData::
wVisitedSpawns:: flag_array NUM_SPAWNS ; dca5