diff options
Diffstat (limited to 'docs')
-rw-r--r-- | docs/battle_anim_commands.md | 3 | ||||
-rw-r--r-- | docs/design_flaws.md | 2 | ||||
-rw-r--r-- | docs/event_commands.md | 4 | ||||
-rw-r--r-- | docs/images/hp_exp_bar_border.png | bin | 125 -> 116 bytes | |||
-rw-r--r-- | docs/images/hp_exp_bar_border_fix.png | bin | 124 -> 187 bytes | |||
-rw-r--r-- | docs/images/port.png | bin | 1055 -> 1048 bytes | |||
-rw-r--r-- | docs/images/port_fix.png | bin | 1056 -> 1547 bytes | |||
-rw-r--r-- | docs/map_scripts.md | 28 | ||||
-rw-r--r-- | docs/move_effect_commands.md | 2 |
9 files changed, 26 insertions, 13 deletions
diff --git a/docs/battle_anim_commands.md b/docs/battle_anim_commands.md index e7eb4a98f..4c29aea30 100644 --- a/docs/battle_anim_commands.md +++ b/docs/battle_anim_commands.md @@ -9,7 +9,8 @@ Defined in [macros/scripts/battle_anims.asm](/macros/scripts/battle_anims.asm) a ## `$D0`: `anim_obj` *object*, *x*, *y*, *param* -*Alternate*: `anim_obj` *object*, *x_tile*, *x*, *y_tile*, *y*, *param* + +***Alternate*: `anim_obj` *object*, *x_tile*, *x*, *y_tile*, *y*, *param*** Spawns an *object* at coordinate (*x*, *y*). diff --git a/docs/design_flaws.md b/docs/design_flaws.md index 21a222743..7dbe79cfb 100644 --- a/docs/design_flaws.md +++ b/docs/design_flaws.md @@ -471,7 +471,7 @@ GetNumberedTMHM: ; d417 ## `GetForestTreeFrame` works, but it's still bad -In [tilesets/animations.asm](/tilesets/animations.asm): +In [engine/tileset_anims.asm](/engine/tileset_anims.asm): ```asm GetForestTreeFrame: ; fc54c diff --git a/docs/event_commands.md b/docs/event_commands.md index b4314bd24..dfbe943f1 100644 --- a/docs/event_commands.md +++ b/docs/event_commands.md @@ -133,7 +133,7 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s ## `$3E`: `readcoins` *memory* -## `$3F`: `RAM2MEM` *memory* +## `$3F`: `vartomem` *memory* ## `$40`: `pokenamemem` *mon_id*, *memory* @@ -151,7 +151,7 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s ## `$47`: `opentext` -## `$48`: `refreshscreen` *dummy* +## `$48`: `refreshscreen` [*dummy*=0] ## `$49`: `closetext` diff --git a/docs/images/hp_exp_bar_border.png b/docs/images/hp_exp_bar_border.png Binary files differindex 9d16a042b..f0f5d31a6 100644 --- a/docs/images/hp_exp_bar_border.png +++ b/docs/images/hp_exp_bar_border.png diff --git a/docs/images/hp_exp_bar_border_fix.png b/docs/images/hp_exp_bar_border_fix.png Binary files differindex 02d36f8a0..26135576f 100644 --- a/docs/images/hp_exp_bar_border_fix.png +++ b/docs/images/hp_exp_bar_border_fix.png diff --git a/docs/images/port.png b/docs/images/port.png Binary files differindex 8a18aad7d..3e05e0da7 100644 --- a/docs/images/port.png +++ b/docs/images/port.png diff --git a/docs/images/port_fix.png b/docs/images/port_fix.png Binary files differindex 055a377a5..3156b065d 100644 --- a/docs/images/port_fix.png +++ b/docs/images/port_fix.png 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`** +<!-- need pre tags here; can't use inline bold/italic formatting in Markdown code blocks --> +<pre> + callback MAPCALLBACK_CMDQUEUE, .Boulders + +.Boulders: + writecmdqueue .BoulderCmdQueue + return + +.BoulderCmdQueue: + cmdqueue CMDQUEUE_STONETABLE, .BoulderTable + +.BoulderTable: + stonetable <i>warp_id</i>, <i>person</i>, <i>script</i> + db -1 ; end +</pre> ## 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`** diff --git a/docs/move_effect_commands.md b/docs/move_effect_commands.md index b8b09c5c2..a7a779123 100644 --- a/docs/move_effect_commands.md +++ b/docs/move_effect_commands.md @@ -1,6 +1,6 @@ # Move Effect Commands -Defined in [macros/scripts/battle_commands.asm](/macros/scripts/battle_commands.asm) and [data/battle_command_pointers.asm:BattleCommandPointers](/data/battle_command_pointers.asm). +Defined in [macros/scripts/battle_commands.asm](/macros/scripts/battle_commands.asm) and [data/battle/effect_command_pointers.asm:BattleCommandPointers](/data/battle/effect_command_pointers.asm). ## `$01`: `checkturn` |