summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/event_commands.md30
-rw-r--r--docs/map_scripts.md38
-rw-r--r--docs/movement_commands.md6
3 files changed, 37 insertions, 37 deletions
diff --git a/docs/event_commands.md b/docs/event_commands.md
index b9bc4a925..151d74b54 100644
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -37,13 +37,13 @@ Defined in [macros/scripts/event.asm](/macros/scripts/event.asm) and [engine/scr
## `$10`: `ptcallasm` *asm*
-## `$11`: `checkmaptriggers` *map*
+## `$11`: `checkmapscene` *map*
-## `$12`: `domaptrigger` *map*, *trigger_id*
+## `$12`: `setmapscene` *map*, *scene_id*
-## `$13`: `checktriggers`
+## `$13`: `checkscene`
-## `$14`: `dotrigger` *trigger_id*
+## `$14`: `setscene` *scene_id*
## `$15`: `writebyte` *value*
@@ -215,37 +215,37 @@ Defined in [macros/scripts/event.asm](/macros/scripts/event.asm) and [engine/scr
## `$67`: `check_just_battled`
-## `$68`: `setlasttalked` *person*
+## `$68`: `setlasttalked` *object_id*
-## `$69`: `applymovement` *person*, *data_pointer*
+## `$69`: `applymovement` *object_id*, *data_pointer*
## `$6A`: `applymovement2` *data_pointer*
## `$6B`: `faceplayer`
-## `$6C`: `faceperson` *person1*, *person2*
+## `$6C`: `faceobject` *object1*, *object2*
## `$6D`: `variablesprite` *variable_sprite_id*, *sprite_id*
-## `$6E`: `disappear` *person*
+## `$6E`: `disappear` *object_id*
-## `$6F`: `appear` *person*
+## `$6F`: `appear` *object_id*
-## `$70`: `follow` *person2*, *person1*
+## `$70`: `follow` *object2*, *object1*
## `$71`: `stopfollow`
-## `$72`: `moveperson` *person*, *x*, *y*
+## `$72`: `moveobject` *object_id*, *x*, *y*
-## `$73`: `writepersonxy` *person*
+## `$73`: `writeobjectxy` *object_id*
## `$74`: `loademote` *emote_id*
-## `$75`: `showemote` *emote_id*, *person*, *length*
+## `$75`: `showemote` *emote_id*, *object_id*, *length*
-## `$76`: `spriteface` *person*, *facing*
+## `$76`: `spriteface` *object_id*, *facing*
-## `$77`: `follownotexact` *person2*, *person1*
+## `$77`: `follownotexact` *object2*, *object1*
## `$78`: `earthquake` *param*
diff --git a/docs/map_scripts.md b/docs/map_scripts.md
index f26de1949..f601616ef 100644
--- a/docs/map_scripts.md
+++ b/docs/map_scripts.md
@@ -3,15 +3,15 @@
## `const_value set 2`
-- **`const` *`MAPNAME_PERSONNAME`***
+- **`const` *`MAPNAME_OBJECTNAME`***
## `MapName_MapScriptHeader:`
-## `.MapTriggers: db` *N*
+## `.SceneScripts: db` *N*
-- **`maptrigger` *script***
+- **`scene_script` *script***
## `.MapCallbacks: db` *N*
@@ -63,34 +63,34 @@ Callback types:
- **`warp_def` *y*, *x*, *warp_id*, *map***
-## `.XYTriggers: db` *N*
+## `.CoordEvents: db` *N*
-- **`xy_trigger` *id*, *y*, *x*, `$0`, *script*, `$0`, `$0`**
+- **`coord_event` *id*, *y*, *x*, `$0`, *script*, `$0`, `$0`**
-## `.Signposts: db` *N*
+## `.BGEvents: db` *N*
-- **`signpost` *y*, *x*, *type*, *script***
+- **`bg_event` *y*, *x*, *type*, *script***
-Signpost types:
+BG event types:
-- **`SIGNPOST_READ`**
+- **`BGEVENT_READ`**
-- **`SIGNPOST_UP/DOWN/LEFT/RIGHT`**
+- **`BGEVENT_UP/DOWN/LEFT/RIGHT`**
-- **`SIGNPOST_IFSET/IFNOTSET`**
+- **`BGEVENT_IFSET/IFNOTSET`**
**`dw` *event_flag*, *script***
-- **`SIGNPOST_ITEM`**
+- **`BGEVENT_ITEM`**
**`dwb` *event_flag*, *item_id***
-- **`SIGNPOST_COPY`**
+- **`BGEVENT_COPY`**
-## `.PersonEvents: db` *N*
+## `.ObjectEvents: db` *N*
-- **`person_event` *sprite*, *y*, *x*, *movement*, *ry*, *rx*, *hour*, *daytime*, *palette*, *type*, *range*, *script*, *event_flag***
+- **`object_event` *sprite*, *y*, *x*, *movement*, *ry*, *rx*, *hour*, *daytime*, *palette*, *type*, *range*, *script*, *event_flag***
Movement types:
@@ -126,14 +126,14 @@ Movement types:
- **`SPRITEMOVEDATA_LAPRAS`**
-Person types:
+Object types:
-- **`PERSONTYPE_SCRIPT`**
+- **`OBJECTTYPE_SCRIPT`**
-- **`PERSONTYPE_ITEMBALL`**
+- **`OBJECTTYPE_ITEMBALL`**
**`itemball` *item_id***
-- **`PERSONTYPE_TRAINER`**
+- **`OBJECTTYPE_TRAINER`**
**`trainer` *event_flag*, *group_id*, *trainer_id*, *seen_text*, *beaten_text*, *loss_text*, *script***
diff --git a/docs/movement_commands.md b/docs/movement_commands.md
index db86fd2f9..56b55f53e 100644
--- a/docs/movement_commands.md
+++ b/docs/movement_commands.md
@@ -39,9 +39,9 @@ Defined in [macros/scripts/movement.asm](/macros/scripts/movement.asm) and [engi
## `$3B`: `fix_facing`
-## `$3C`: `show_person`
+## `$3C`: `show_object`
-## `$3D`: `hide_person`
+## `$3D`: `hide_object`
## `$3E`−`$46`: `step_sleep` *length*
@@ -49,7 +49,7 @@ Defined in [macros/scripts/movement.asm](/macros/scripts/movement.asm) and [engi
## `$48`: `step_48` *param*
-## `$49`: `remove_person`
+## `$49`: `remove_object`
## `$4A`: `step_loop`