diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-01 16:54:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-01 16:54:45 -0500 |
| commit | f27f79488a460f0a89670f3611e1e9e175baf5d6 (patch) | |
| tree | 92134b1da650d7894a2fde59e0048f75d36c7dbf /docs | |
| parent | 8c3905c4cdb4f24810473da51d52cc3e16062173 (diff) | |
| parent | e5fa3f9a11fb6936709cd0c36e945bd6e018cb37 (diff) | |
Merge pull request #455 from xCrystal/master
Use more palette(s) constants, rename BG/OBP wram addresses, and rBGPI+rOBPI auto-increment constants (from Rangi)
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/battle_anim_commands.md | 12 | ||||
| -rw-r--r-- | docs/map_scripts.md | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/docs/battle_anim_commands.md b/docs/battle_anim_commands.md index cc5949e7f..e7eb4a98f 100644 --- a/docs/battle_anim_commands.md +++ b/docs/battle_anim_commands.md @@ -1,6 +1,6 @@ # Battle Animation Commands -Defined in [macros/scripts/battle_anims.asm](/macros/scripts/battle_anims.asm) and [data/moves/animations.asm:BattleAnimations](/data/moves/animations.asm). +Defined in [macros/scripts/battle_anims.asm](/macros/scripts/battle_anims.asm) and [engine/battle_anims/anim_commands.asm:BattleAnimCommands](/engine/battle_anims/anim_commands.asm). ## `$00`−`$CF`: `anim_wait` *length* @@ -80,7 +80,7 @@ Temporarily creates sprites from the top row of the player backpic, so that the ## `$DB`: `anim_checkpokeball` -Sets `var` to the result of [GetPokeBallWobble](/engine/battle_anims/getpokeballwobble.asm). +Sets `BattleAnimVar` to the result of [GetPokeBallWobble](/engine/battle_anims/getpokeballwobble.asm). ## `$DC`: `anim_transform` @@ -190,19 +190,19 @@ Does nothing. Unused. ## `$F8`: `anim_if_param_equal` *value*, *address* -Jumps to another script if `wKickCounter` is equal to *value*. +Jumps to another script if `wBattleAnimParam` (aka `wKickCounter` or `wPresentPower`) is equal to *value*. ## `$F9`: `anim_setvar` *value* -Sets `var` to *value*. +Sets `BattleAnimVar` to *value*. ## `$FA`: `anim_incvar` -Increments `var` by 1. +Increments `BattleAnimVar` by 1. ## `$FB`: `anim_if_var_equal` *value*, *address* -Jumps to another script if `var` is equal to *value*. +Jumps to another script if `BattleAnimVar` is equal to *value*. ## `$FC`: `anim_jump` *address* diff --git a/docs/map_scripts.md b/docs/map_scripts.md index 4206c7a86..c6b1c58ba 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -65,7 +65,7 @@ Callback types: ## `.CoordEvents: db` *N* -- **`coord_event` *x*, *y*, *scene id*, *script*** +- **`coord_event` *x*, *y*, *scene_id*, *script*** ## `.BGEvents: db` *N* @@ -90,7 +90,7 @@ BG event types: ## `.ObjectEvents: db` *N* -- **`object_event` *x*, *y*, *sprite*, *movement*, *ry*, *rx*, *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: |