Merge pull request #456 from Rangi42/master

OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming

4 files changed, 58 insertions, 29 deletions

diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm
index 5933740f0..4ae8dbaf4 100644
--- a/macros/scripts/battle_commands.asm
+++ b/macros/scripts/battle_commands.asm
@@ -3,7 +3,7 @@ command: MACRO
 \1 EQUS "db \1_command"
 ENDM
 
-; BattleCommandPointers indexes (see data/battle_command_pointers.asm)
+; BattleCommandPointers indexes (see data/battle/effect_command_pointers.asm)
 	enum_start 1
 	command checkturn               ; 01
 	command checkobedience          ; 02
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 694a7cd12..9bca1c004 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -101,11 +101,6 @@ special: MACRO
 	dw (\1Special - SpecialsPointers) / 3
 ENDM
 
-add_special: MACRO
-\1Special::
-	dba \1
-ENDM
-
 	enum ptcallasm_command ; $10
 ptcallasm: MACRO
 	db ptcallasm_command
@@ -424,9 +419,9 @@ readcoins: MACRO
 	db \1 ; memory
 ENDM
 
-	enum RAM2MEM_command ; $3f
-RAM2MEM: MACRO
-	db RAM2MEM_command
+	enum vartomem_command ; $3f
+vartomem: MACRO
+	db vartomem_command
 	db \1 ; memory
 ENDM
 
@@ -483,7 +478,11 @@ ENDM
 	enum refreshscreen_command ; $48
 refreshscreen: MACRO
 	db refreshscreen_command
+if _NARG == 1
 	db \1 ; dummy
+else
+	db 0
+endc
 ENDM
 
 	enum closetext_command ; $49
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm
index e9703531d..31a1f16d9 100644
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -9,6 +9,12 @@ scene_script: MACRO
 	dw \1, 0
 ENDM
 
+callback: MACRO
+;\1: type: a MAPCALLBACK_* constant
+;\2: script pointer
+	dbw \1, \2
+ENDM
+
 warp_def: MACRO
 ;\1: x: left to right, starts at 0
 ;\2: y: top to bottom, starts at 0
@@ -23,9 +29,10 @@ coord_event: MACRO
 ;\2: y: top to bottom, starts at 0
 ;\3: scene id: controlled by setscene/setmapscene
 ;\4: script pointer
-	db \3, \2, \1, $0
+	db \3, \2, \1
+	db 0 ; filler
 	dw \4
-	db $0, $0
+	db 0, 0 ; filler
 ENDM
 
 bg_event: MACRO
@@ -91,6 +98,12 @@ else
 endc
 ENDM
 
+hiddenitem: MACRO
+;\1: flag: an EVENT_* constant
+;\2: item: from constants/item_constants.asm
+	dwb \1, \2
+ENDM
+
 elevfloor: MACRO
 ;\1: floor: a FLOOR_* constant
 ;\2: warp destination: starts at 1
@@ -99,10 +112,22 @@ elevfloor: MACRO
 	map \3
 ENDM
 
+conditional_event: MACRO
+;\1: flag: an EVENT_* constant
+;\2: script pointer
+	dw \1, \2
+ENDM
+
+cmdqueue: MACRO
+;\1: type: a CMDQUEUE_* constant
+;\2: data pointer
+	dbw \1, \2
+	dw 0 ; filler
+ENDM
+
 stonetable: MACRO
 ;\1: warp id
 ;\2: object_event id
 ;\3: script pointer
-	db \1, \2
-	dw \3
+	dbbw \1, \2, \3
 ENDM
diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm
index f22f83551..bff18c7ea 100644
--- a/macros/scripts/text.asm
+++ b/macros/scripts/text.asm
@@ -1,4 +1,4 @@
-text   EQUS "db \"<START>\"," ; Start writing text.
+text   EQUS "db TX_START,"    ; Start writing text.
 next   EQUS "db \"<NEXT>\","  ; Move a line down.
 line   EQUS "db \"<LINE>\","  ; Start writing at the bottom line.
 page   EQUS "db \"@\","       ; Start a new Pokédex page.
@@ -8,7 +8,12 @@ done   EQUS "db \"<DONE>\""   ; End a text box.
 prompt EQUS "db \"<PROMPT>\"" ; Prompt the player to end a text box (initiating some other event).
 
 ; TextCommands indexes (see home/text.asm)
-	enum_start $01
+	enum_start
+
+	enum TX_START ; $00
+text_start: MACRO
+	db TX_START
+ENDM
 
 	enum TX_RAM ; $01
 text_from_ram: MACRO
@@ -68,9 +73,9 @@ interpret_data: MACRO
 	db TX_EXIT
 ENDM
 
-	enum TX_SOUND_0B ; $0b
+	enum TX_SOUND_DEX_FANFARE_50_79 ; $0b
 sound_dex_fanfare_50_79: MACRO
-	db TX_SOUND_0B
+	db TX_SOUND_DEX_FANFARE_50_79
 ENDM
 
 	enum TX_DOTS ; $0c
@@ -84,34 +89,34 @@ link_wait_button: MACRO
 	db TX_LINK_WAIT_BUTTON
 ENDM
 
-	enum TX_SOUND_0E ; $0e
+	enum TX_SOUND_DEX_FANFARE_20_49 ; $0e
 sound_dex_fanfare_20_49: MACRO
-	db TX_SOUND_0E
+	db TX_SOUND_DEX_FANFARE_20_49
 ENDM
 
-	enum TX_SOUND_0F ; $0f
+	enum TX_SOUND_ITEM ; $0f
 sound_item: MACRO
-	db TX_SOUND_0F
+	db TX_SOUND_ITEM
 ENDM
 
-	enum TX_SOUND_10 ; $10
+	enum TX_SOUND_CAUGHT_MON ; $10
 sound_caught_mon: MACRO
-	db TX_SOUND_10
+	db TX_SOUND_CAUGHT_MON
 ENDM
 
-	enum TX_SOUND_11 ; $11
+	enum TX_SOUND_DEX_FANFARE_80_109 ; $11
 sound_dex_fanfare_80_109: MACRO
-	db TX_SOUND_11
+	db TX_SOUND_DEX_FANFARE_80_109
 ENDM
 
-	enum TX_SOUND_12 ; $12
+	enum TX_SOUND_FANFARE ; $12
 sound_fanfare: MACRO
-	db TX_SOUND_12
+	db TX_SOUND_FANFARE
 ENDM
 
-	enum TX_SOUND_13 ; $13
+	enum TX_SOUND_SLOT_MACHINE_START ; $13
 sound_slot_machine_start: MACRO
-	db TX_SOUND_13
+	db TX_SOUND_SLOT_MACHINE_START
 ENDM
 
 	enum TX_STRINGBUFFER ; $14