From 5a3822fe863a7365735c1f5d1c007d98d7736f1b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 13 Jan 2018 00:47:38 -0500 Subject: Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts --- docs/map_scripts.md | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'docs/map_scripts.md') diff --git a/docs/map_scripts.md b/docs/map_scripts.md index c6b1c58ba..e6794b543 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -16,7 +16,7 @@ ## `.MapCallbacks: db` *N* -- **`dbw` *type*, *script*** +- **`callback` *type*, *script*** Callback types: @@ -30,11 +30,21 @@ Callback types: - **`MAPCALLBACK_CMDQUEUE`** - **`dbw CMDQUEUE_STONETABLE,` *table_pointer*** - - **`stonetable` *warp_id*, *person*, *script*** - - **`db -1 ; end`** + +
+	callback MAPCALLBACK_CMDQUEUE, .Boulders
+
+.Boulders:
+	writecmdqueue .BoulderCmdQueue
+	return
+
+.BoulderCmdQueue:
+	cmdqueue CMDQUEUE_STONETABLE, .BoulderTable
+
+.BoulderTable:
+	stonetable warp_id, person, script
+	db -1 ; end
+
## Event scripts @@ -54,8 +64,10 @@ Callback types: ## `MapName_MapEventHeader:` +```asm ; filler db 0, 0 +``` ## `.Warps: db` *N* @@ -80,11 +92,11 @@ BG event types: - **`BGEVENT_IFSET/IFNOTSET`** - **`dw` *event_flag*, *script*** + **`conditional_event` *event_flag*, *script*** - **`BGEVENT_ITEM`** - **`dwb` *event_flag*, *item_id*** + **`hiddenitem` *event_flag*, *item_id*** - **`BGEVENT_COPY`** -- cgit v1.2.3 From bf074f359886707d2ffb2e0b525b03dc7af0fe29 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 22:57:19 -0500 Subject: =?UTF-8?q?map=5Fheader=20=E2=86=92=20map=5Fdef;=20map=5Fheader=5F?= =?UTF-8?q?2=20=E2=86=92=20map=5Fdata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/map_scripts.md | 119 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 70 insertions(+), 49 deletions(-) (limited to 'docs/map_scripts.md') diff --git a/docs/map_scripts.md b/docs/map_scripts.md index e6794b543..9eb924504 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -3,34 +3,39 @@ ## `const_value set 2` -- **`const` *`MAPNAME_OBJECTNAME`*** +
+	const MAPNAME_OBJECTNAME
+
-## `MapName_MapScriptHeader:` +## `MapName_MapScripts:` -## `.SceneScripts: db` *N* +### `.SceneScripts: db` *N* -- **`scene_script` *script*** +
+	scene_script script
+
-## `.MapCallbacks: db` *N* +### `.MapCallbacks: db` *N* -- **`callback` *type*, *script*** +
+	callback type, script
+
Callback types: -- **`MAPCALLBACK_NEWMAP`** +- `MAPCALLBACK_NEWMAP` -- **`MAPCALLBACK_TILES`** +- `MAPCALLBACK_TILES` -- **`MAPCALLBACK_OBJECTS`** +- `MAPCALLBACK_OBJECTS` -- **`MAPCALLBACK_SPRITES`** +- `MAPCALLBACK_SPRITES` -- **`MAPCALLBACK_CMDQUEUE`** +- `MAPCALLBACK_CMDQUEUE` - 
 	callback MAPCALLBACK_CMDQUEUE, .Boulders
 
@@ -62,7 +67,7 @@ Callback types:
 [Movement commands](movement_commands.md)
 
 
-## `MapName_MapEventHeader:`
+## `MapName_MapEvents:`
 
 ```asm
 	; filler
@@ -70,82 +75,98 @@ Callback types:
 ```
 
 
-## `.Warps: db` *N*
+### `.Warps: db` *N*
 
-- **`warp_def` *x*, *y*, *warp_id*, *map***
+
+	warp_def x, y, warp_id, map
+

 
 
-## `.CoordEvents: db` *N*
+### `.CoordEvents: db` *N*
 
-- **`coord_event` *x*, *y*, *scene_id*, *script***
+
+	coord_event x, y, scene_id, script
+

 
 
-## `.BGEvents: db` *N*
+### `.BGEvents: db` *N*
 
-- **`bg_event` *x*, *y*, *type*, *script***
+
+	bg_event x, y, type, script
+

 
 BG event types:
 
-- **`BGEVENT_READ`**
+- `BGEVENT_READ`
 
-- **`BGEVENT_UP/DOWN/LEFT/RIGHT`**
+- `BGEVENT_UP/DOWN/LEFT/RIGHT`
 
-- **`BGEVENT_IFSET/IFNOTSET`**
+- `BGEVENT_IFSET/IFNOTSET`
 
-  **`conditional_event` *event_flag*, *script***
+
+	conditional_event event_flag, script
+

 
-- **`BGEVENT_ITEM`**
+- `BGEVENT_ITEM`
 
-  **`hiddenitem` *event_flag*, *item_id***
+
+	hiddenitem event_flag, item_id
+

 
-- **`BGEVENT_COPY`**
+- `BGEVENT_COPY`
 
-## `.ObjectEvents: db` *N*
+### `.ObjectEvents: db` *N*
 
-- **`object_event` *x*, *y*, *sprite*, *movement*, *rx*, *ry*, *h1*, *h2*, *palette*, *type*, *range*, *script*, *event_flag***
+
+	object_event x, y, sprite, movement, rx, ry, h1, h2, palette, type, range, script, event_flag
+

 
 Movement types:
 
-- **`SPRITEMOVEDATA_ITEM_TREE`**
+- `SPRITEMOVEDATA_ITEM_TREE`
 
-- **`SPRITEMOVEDATA_WANDER`**
+- `SPRITEMOVEDATA_WANDER`
 
-- **`SPRITEMOVEDATA_SPINRANDOM_SLOW`**
+- `SPRITEMOVEDATA_SPINRANDOM_SLOW`
 
-- **`SPRITEMOVEDATA_WALK_UP_DOWN`**
+- `SPRITEMOVEDATA_WALK_UP_DOWN`
 
-- **`SPRITEMOVEDATA_WALK_LEFT_RIGHT`**
+- `SPRITEMOVEDATA_WALK_LEFT_RIGHT`
 
-- **`SPRITEMOVEDATA_STANDING_UP/DOWN/LEFT/RIGHT`**
+- `SPRITEMOVEDATA_STANDING_UP/DOWN/LEFT/RIGHT`
 
-- **`SPRITEMOVEDATA_SPINRANDOM_FAST`**
+- `SPRITEMOVEDATA_SPINRANDOM_FAST`
 
-- **`SPRITEMOVEDATA_SNORLAX`**
+- `SPRITEMOVEDATA_SNORLAX`
 
-- **`SPRITEMOVEDATA_POKEMON`**
+- `SPRITEMOVEDATA_POKEMON`
 
-- **`SPRITEMOVEDATA_SUDOWOODO`**
+- `SPRITEMOVEDATA_SUDOWOODO`
 
-- **`SPRITEMOVEDATA_SMASHABLE_ROCK`**
+- `SPRITEMOVEDATA_SMASHABLE_ROCK`
 
-- **`SPRITEMOVEDATA_STRENGTH_BOULDER`**
+- `SPRITEMOVEDATA_STRENGTH_BOULDER`
 
-- **`SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE`**
+- `SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE`
 
-- **`SPRITEMOVEDATA_SPINCLOCKWISE`**
+- `SPRITEMOVEDATA_SPINCLOCKWISE`
 
-- **`SPRITEMOVEDATA_BIGDOLL`**
+- `SPRITEMOVEDATA_BIGDOLL`
 
-- **`SPRITEMOVEDATA_LAPRAS`**
+- `SPRITEMOVEDATA_LAPRAS`
 
 Object types:
 
-- **`OBJECTTYPE_SCRIPT`**
+- `OBJECTTYPE_SCRIPT`
 
-- **`OBJECTTYPE_ITEMBALL`**
+- `OBJECTTYPE_ITEMBALL`
 
-  **`itemball` *item_id***
+
+	itemball item_id
+

 
-- **`OBJECTTYPE_TRAINER`**
+- `OBJECTTYPE_TRAINER`
 
-  **`trainer` *event_flag*, *group_id*, *trainer_id*, *seen_text*, *beaten_text*, *loss_text*, *script***
+
+	trainer event_flag, group_id, trainer_id, seen_text, beaten_text, loss_text, script
+

-- 
cgit v1.2.3


From d2725c31040af3d54ea9b0f28f8fe89d6454e75b Mon Sep 17 00:00:00 2001
From: Remy Oukaour 
Date: Wed, 17 Jan 2018 13:58:50 -0500
Subject: Allow italics/bold within inline code

---
 docs/map_scripts.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'docs/map_scripts.md')

diff --git a/docs/map_scripts.md b/docs/map_scripts.md
index 9eb924504..d9396ed5b 100644
--- a/docs/map_scripts.md
+++ b/docs/map_scripts.md
@@ -1,24 +1,24 @@
 # Map Scripts
 
 
-## `const_value set 2`
+## const_value set 2
 
 
 	const MAPNAME_OBJECTNAME
 

 
 
-## `MapName_MapScripts:`
+## MapName_MapScripts:
 
 
-### `.SceneScripts: db` *N*
+### .SceneScripts: db N
 
 
 	scene_script script
 

 
 
-### `.MapCallbacks: db` *N*
+### .MapCallbacks: db N
 
 
 	callback type, script
@@ -67,7 +67,7 @@ Callback types:
 [Movement commands](movement_commands.md)
 
 
-## `MapName_MapEvents:`
+## MapName_MapEvents:
 
 ```asm
 	; filler
@@ -75,21 +75,21 @@ Callback types:
 ```
 
 
-### `.Warps: db` *N*
+### .Warps: db N
 
 
 	warp_def x, y, warp_id, map
 

 
 
-### `.CoordEvents: db` *N*
+### .CoordEvents: db N
 
 
 	coord_event x, y, scene_id, script
 

 
 
-### `.BGEvents: db` *N*
+### .BGEvents: db N
 
 
 	bg_event x, y, type, script
@@ -115,7 +115,7 @@ BG event types:
 
 - `BGEVENT_COPY`
 
-### `.ObjectEvents: db` *N*
+### .ObjectEvents: db N
 
 
 	object_event x, y, sprite, movement, rx, ry, h1, h2, palette, type, range, script, event_flag
-- 
cgit v1.2.3


From b1c808f9f85c215340daccf7dc8eaa3832f15ba6 Mon Sep 17 00:00:00 2001
From: Remy Oukaour 
Date: Wed, 17 Jan 2018 14:50:34 -0500
Subject: Rename some tilesets (close #467)

---
 docs/map_scripts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/map_scripts.md')

diff --git a/docs/map_scripts.md b/docs/map_scripts.md
index d9396ed5b..2302257e7 100644
--- a/docs/map_scripts.md
+++ b/docs/map_scripts.md
@@ -118,7 +118,7 @@ BG event types:
 ### .ObjectEvents: db N
 
 
-	object_event x, y, sprite, movement, rx, ry, h1, h2, palette, type, range, script, event_flag
+	object_event x, y, sprite, movement, rx, ry, h1, h2, palette, type, range, script, event_flag
 

 
 Movement types:
-- 
cgit v1.2.3