aboutsummaryrefslogtreecommitdiffstats
path: root/data/events
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-15 13:23:22 -0400
committerGitHub <noreply@github.com>2020-07-15 13:23:22 -0400
commit87f24a885d888411d715171d75163bd59a609b41 (patch)
tree802877f7038146e7246ba4adc56d560049e5eb96 /data/events
parentMerge pull request #273 from Rangi42/master (diff)
parentAlign constant comments as a column (diff)
downloadpokeyellow-87f24a885d888411d715171d75163bd59a609b41.tar.gz
pokeyellow-87f24a885d888411d715171d75163bd59a609b41.tar.xz
pokeyellow-87f24a885d888411d715171d75163bd59a609b41.zip
Merge pull request #274 from Rangi42/master
Indent comments that describe data table macro formats
Diffstat (limited to 'data/events')
-rwxr-xr-xdata/events/hidden_coins.asm2
-rwxr-xr-xdata/events/hidden_item_coords.asm2
-rwxr-xr-xdata/events/trades.asm2
3 files changed, 3 insertions, 3 deletions
diff --git a/data/events/hidden_coins.asm b/data/events/hidden_coins.asm
index 78aaaa64..bcdbcd80 100755
--- a/data/events/hidden_coins.asm
+++ b/data/events/hidden_coins.asm
@@ -3,7 +3,7 @@ hidden_coin: MACRO
ENDM
HiddenCoinCoords:
-; map id, x, y
+ ; map id, x, y
hidden_coin GAME_CORNER, 0, 8
hidden_coin GAME_CORNER, 1, 16
hidden_coin GAME_CORNER, 3, 11
diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm
index 54571cac..115f53aa 100755
--- a/data/events/hidden_item_coords.asm
+++ b/data/events/hidden_item_coords.asm
@@ -3,7 +3,7 @@ hidden_item: MACRO
ENDM
HiddenItemCoords:
-; map id, x, y
+ ; map id, x, y
hidden_item VIRIDIAN_FOREST, 1, 18
hidden_item VIRIDIAN_FOREST, 16, 42
hidden_item MT_MOON_B2F, 18, 12
diff --git a/data/events/trades.asm b/data/events/trades.asm
index 8dd6ef8f..a92ad2fa 100755
--- a/data/events/trades.asm
+++ b/data/events/trades.asm
@@ -1,5 +1,5 @@
TradeMons:
-; give mon, get mon, dialog id, nickname
+ ; give mon, get mon, dialog id, nickname
db NIDORINO, NIDORINA, TRADE_DIALOGSET_CASUAL, "TERRY@@@@@@"
db ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@"
db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU@"