From 85cded6ec5b329bb69a47544487b53bc0260f427 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 13:10:12 -0500 Subject: Update docs --- docs/music_commands.md | 2 -- 1 file changed, 2 deletions(-) (limited to 'docs') diff --git a/docs/music_commands.md b/docs/music_commands.md index 43d607ff9..21befa71f 100644 --- a/docs/music_commands.md +++ b/docs/music_commands.md @@ -7,8 +7,6 @@ See also: [Sound Engine Commands](https://github.com/pret/pokecrystal/wiki/Sound ## `musicheader` *n*, *index*, *address* -## `cry_header` *n*, *index*, *address* - ## `note` *pitch*, *length* (Used on all channels) -- cgit v1.2.3 From b5417fafec7dd37cb4be391f3bd3d4541a2a381e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 17:47:05 -0500 Subject: Split battle/ into data/ and engine/ components --- docs/bugs_and_glitches.md | 26 +++++++++++++------------- docs/move_anim_commands.md | 2 +- docs/pic_animations.md | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'docs') diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index bf170881a..9275c6572 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -56,7 +56,7 @@ ([Video](https://www.youtube.com/watch?v=rGqu3d3pdok&t=450)) -This is a bug with `SpeciesItemBoost` in [battle/effect_commands.asm](/battle/effect_commands.asm): +This is a bug with `SpeciesItemBoost` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm): ```asm ; Double the stat @@ -90,7 +90,7 @@ This is a bug with `SpeciesItemBoost` in [battle/effect_commands.asm](/battle/ef ([Video](https://www.youtube.com/watch?v=rGqu3d3pdok&t=450)) -This is a bug with `DittoMetalPowder` in [battle/effect_commands.asm](/battle/effect_commands.asm): +This is a bug with `DittoMetalPowder` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm): ```asm ld a, c @@ -146,7 +146,7 @@ This is a bug with `DittoMetalPowder` in [battle/effect_commands.asm](/battle/ef ([Video](https://www.youtube.com/watch?v=zuCLMikWo4Y)) -This is a bug with `BattleCommand_BellyDrum` in [battle/effect_commands.asm](/battle/effect_commands.asm): +This is a bug with `BattleCommand_BellyDrum` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm): ```asm BattleCommand_BellyDrum: ; 37c1a @@ -186,7 +186,7 @@ BattleCommand_BellyDrum: ; 37c1a This bug affects Acid, Iron Tail, and Rock Smash. -This is a bug with `DefenseDownHit` in [battle/moves/move_effects.asm](/battle/moves/move_effects.asm): +This is a bug with `DefenseDownHit` in [data/moves/move_effects.asm](/data/moves/move_effects.asm): ```asm DefenseDownHit: @@ -227,7 +227,7 @@ DefenseDownHit: ([Video](https://www.youtube.com/watch?v=1v9x4SgMggs)) -This is a bug with `CheckPlayerHasUsableMoves` in [battle/core.asm](/battle/core.asm): +This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engine/battle/core.asm): ```asm .done @@ -259,7 +259,7 @@ This is a bug with `CheckPlayerHasUsableMoves` in [battle/core.asm](/battle/core This bug affects Attract, Curse, Foresight, Mean Look, Mimic, Nightmare, Spider Web, Transform, and stat-lowering effects of moves like String Shot or Bubble during the semi-invulnerable turn of Fly or Dig. -This is a bug with `CheckHiddenOpponent` in [battle/effect_commands.asm](/battle/effect_commands.asm): +This is a bug with `CheckHiddenOpponent` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm): ```asm CheckHiddenOpponent: ; 37daa @@ -277,7 +277,7 @@ CheckHiddenOpponent: ; 37daa ([Video](https://www.youtube.com/watch?v=202-iAsrIa8)) -This is a bug with `BattleCommand_BeatUp` in [battle/effect_commands.asm](/battle/effect_commands.asm): +This is a bug with `BattleCommand_BeatUp` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm): ```asm .got_mon @@ -314,7 +314,7 @@ This is a bug with `BattleCommand_BeatUp` in [battle/effect_commands.asm](/battl This bug existed for all battles in Gold and Silver, and was only fixed for single-player battles in Crystal to preserve link compatibility. -This is a bug with `BattleCommand_Present` in [battle/effects/present.asm](/battle/effects/present.asm): +This is a bug with `BattleCommand_Present` in [engine/battle/effect_commands/present.asm](/engine/battle/effect_commands/present.asm): ```asm BattleCommand_Present: ; 37874 @@ -355,7 +355,7 @@ BattleCommand_Present: ; 37874 ([Video](https://www.youtube.com/watch?v=cygMO-zHTls)) -This is a bug with `AI_Smart_MeanLook` in [battle/ai/scoring.asm](/battle/ai/scoring.asm): +This is a bug with `AI_Smart_MeanLook` in [engine/battle/ai/scoring.asm](/engine/battle/ai/scoring.asm): ```asm ; 80% chance to greatly encourage this move if the enemy is badly poisoned (buggy). @@ -370,7 +370,7 @@ This is a bug with `AI_Smart_MeanLook` in [battle/ai/scoring.asm](/battle/ai/sco ## AI makes a false assumption about `CheckTypeMatchup` -In [battle/effect_commands.asm](/battle/effect_commands.asm): +In [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm): ```asm BattleCheckTypeMatchup: ; 347c8 @@ -401,7 +401,7 @@ CheckTypeMatchup: ; 347d3 ([Video](https://www.youtube.com/watch?v=rGqu3d3pdok&t=322)) -This is a bug with `AI_HealStatus` in [battle/ai/items.asm](/battle/ai/items.asm): +This is a bug with `AI_HealStatus` in [engine/battle/ai/items.asm](/engine/battle/ai/items.asm): ```asm AI_HealStatus: ; 384e0 @@ -429,7 +429,7 @@ AI_HealStatus: ; 384e0 ([Video](https://www.youtube.com/watch?v=SE-BfsFgZVM)) -This is a bug with `LongAnim_UpdateVariables` in [engine/anim_hp_bar.asm](/engine/anim_hp_bar.asm): +This is a bug with `LongAnim_UpdateVariables` in [engine/battle/anim_hp_bar.asm](/engine/battle/anim_hp_bar.asm): ```asm ; This routine is buggy. The result from ComputeHPBarPixels is stored @@ -727,7 +727,7 @@ Data_DaisyMassage: ; 746b ## Magikarp in Lake of Rage are shorter, not longer -This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [battle/core.asm](/battle/core.asm): +This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm](/engine/battle/core.asm): ```asm .CheckMagikarpArea: diff --git a/docs/move_anim_commands.md b/docs/move_anim_commands.md index 1b9bd5b8f..308c4c45e 100644 --- a/docs/move_anim_commands.md +++ b/docs/move_anim_commands.md @@ -1,6 +1,6 @@ # Move Animation Commands -Defined in [macros/scripts/move_anim.asm](/macros/scripts/move_anim.asm) and [battle/anims.asm:BattleAnimations](/battle/anims.asm). +Defined in [macros/scripts/move_anim.asm](/macros/scripts/move_anim.asm) and [data/moves/move_anims.asm:BattleAnimations](/data/moves/move_anims.asm). ## `$00`−`$EF`: `anim_wait` *length* diff --git a/docs/pic_animations.md b/docs/pic_animations.md index 57c7f151a..531282c13 100644 --- a/docs/pic_animations.md +++ b/docs/pic_animations.md @@ -1,6 +1,6 @@ # Pic Animations -Defined in [macros/scripts/gfx_anim.asm](/macros/scripts/gfx_anim.asm) and [battle/anim_commands.asm:BattleAnimCommands](/battle/anim_commands.asm). +Defined in [macros/scripts/gfx_anim.asm](/macros/scripts/gfx_anim.asm) and [engine/anims/anim_commands.asm:BattleAnimCommands](/engine/anims/anim_commands.asm). Pic animations are assembled in 3 parts: -- cgit v1.2.3 From 35a3a19fda87d95e829aa99bf1b6cf18a839c1a6 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 18:45:04 -0500 Subject: Use "battle_anims" and "sprite_anims" for clarity, not just "anims" --- docs/battle_anim_commands.md | 121 +++++++++++++++++++++++++++++++++++++++++++ docs/event_commands.md | 2 +- docs/move_anim_commands.md | 121 ------------------------------------------- docs/pic_animations.md | 9 ++-- 4 files changed, 126 insertions(+), 127 deletions(-) create mode 100644 docs/battle_anim_commands.md delete mode 100644 docs/move_anim_commands.md (limited to 'docs') diff --git a/docs/battle_anim_commands.md b/docs/battle_anim_commands.md new file mode 100644 index 000000000..4a11391db --- /dev/null +++ b/docs/battle_anim_commands.md @@ -0,0 +1,121 @@ +# Battle Animation Commands + +Defined in [macros/scripts/battle_anims.asm](/macros/scripts/battle_anims.asm) and [data/moves/move_anims.asm:BattleAnimations](/data/moves/move_anims.asm). + + +## `$00`−`$EF`: `anim_wait` *length* + +## `$D0`: `anim_obj` *object*, *x1*, *x2*, *y1*, *y2*, *param* + +The *x1*/*x2* and *y1*/*y2* pairs specify the position on screen of the animation object. +*x1*/*y1* specify a tile position, and *x2*/*y2* specify a pixel offset from that tile. + +Values for *x2*/*y2* are in the 0-7 range, since 8 pixels make a tile. + +Values for *x1* are between -16 to 31. In practice *x1* starts between 0 to 15, then between -16 to -10. Negative values are relative to the opponent, while positive values are relative to the player. Useful values are between 14 to -10 (for the opponent) and between 0 to 13 (for the player). + +Some sample values are: + +- 0: player left border +- 6: player center +- -15: enemy center +- -10: enemy right border + +Values for *y1* are also between -16 to 31; the useful range is between 2 to 14. +Values between 2 to 8 will be in the opponent's area (2 being the top border and 8 being the +bottom border), and values between 8 to 14 will be in the player's area (again, 8 being the top border and 14 being the bottom border). +The center of the body is often 2 to 4 tiles away from the border (i.e., 5-6 for the opponent or 10-11 for the player). + +## `$D1`: `anim_1gfx` *gfx* + +## `$D2`: `anim_2gfx` *gfx1*, *gfx2* + +## `$D3`: `anim_3gfx` *gfx1*, *gfx2*, *gfx3* + +## `$D4`: `anim_4gfx` *gfx1*, *gfx2*, *gfx3*, *gfx4* + +## `$D5`: `anim_5gfx` *gfx1*, *gfx2*, *gfx3*, *gfx4*, *gfx5* + +## `$D6`: `anim_incobj` *id* + +## `$D7`: `anim_setobj` *id*, *object* + +## `$D8`: `anim_incbgeffect` *effect* + +## `$D9`: `anim_enemyfeetobj` + +## `$DA`: `anim_playerheadobj` + +## `$DB`: `anim_checkpokeball` + +## `$DC`: `anim_transform` + +## `$DD`: `anim_raisesub` + +## `$DE`: `anim_dropsub` + +## `$DF`: `anim_resetobp0` + +## `$E0`: `anim_sound` *duration*, *tracks*, *id* + +## `$E1`: `anim_cry` *pitch* + +## `$E2`: `anim_minimizeopp` + +## `$E3`: `anim_oamon` + +## `$E4`: `anim_oamoff` + +## `$E5`: `anim_clearobjs` + +## `$E6`: `anim_beatup` + +## `$E7`: `anim_0xe7` + +## `$E8`: `anim_updateactorpic` + +## `$E9`: `anim_minimize` + +## `$EA`: `anim_0xea` + +## `$EB`: `anim_0xeb` + +## `$EC`: `anim_0xec` + +## `$ED`: `anim_0xed` + +## `$EE`: `anim_if_param_and` *value*, *address* + +## `$EF`: `anim_jumpuntil` *address* + +## `$F0`: `anim_bgeffect` *effect*, *unknown1*, *unknown2*, *unknown3* + +## `$F1`: `anim_bgp` *colors* + +## `$F2`: `anim_obp0` *colors* + +## `$F3`: `anim_obp1` *colors* + +## `$F4`: `anim_clearsprites` + +## `$F5`: `anim_0xf5` + +## `$F6`: `anim_0xf6` + +## `$F7`: `anim_0xf7` + +## `$F8`: `anim_if_param_equal` *value*, *address* + +## `$F9`: `anim_setvar` *value* + +## `$FA`: `anim_incvar` + +## `$FB`: `anim_if_var_equal` *value*, *address* + +## `$FC`: `anim_jump` *address* + +## `$FD`: `anim_loop` *count*, *address* + +## `$FE`: `anim_call` *address* + +## `$FF`: `anim_ret` diff --git a/docs/event_commands.md b/docs/event_commands.md index 151d74b54..b4314bd24 100644 --- a/docs/event_commands.md +++ b/docs/event_commands.md @@ -1,6 +1,6 @@ # Event Commands -Defined in [macros/scripts/event.asm](/macros/scripts/event.asm) and [engine/scripting.asm:ScriptCommandTable](/engine/scripting.asm). +Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/scripting.asm:ScriptCommandTable](/engine/scripting.asm). ## `$00`: `scall` *script* diff --git a/docs/move_anim_commands.md b/docs/move_anim_commands.md deleted file mode 100644 index 308c4c45e..000000000 --- a/docs/move_anim_commands.md +++ /dev/null @@ -1,121 +0,0 @@ -# Move Animation Commands - -Defined in [macros/scripts/move_anim.asm](/macros/scripts/move_anim.asm) and [data/moves/move_anims.asm:BattleAnimations](/data/moves/move_anims.asm). - - -## `$00`−`$EF`: `anim_wait` *length* - -## `$D0`: `anim_obj` *object*, *x1*, *x2*, *y1*, *y2*, *param* - -The *x1*/*x2* and *y1*/*y2* pairs specify the position on screen of the animation object. -*x1*/*y1* specify a tile position, and *x2*/*y2* specify a pixel offset from that tile. - -Values for *x2*/*y2* are in the 0-7 range, since 8 pixels make a tile. - -Values for *x1* are between -16 to 31. In practice *x1* starts between 0 to 15, then between -16 to -10. Negative values are relative to the opponent, while positive values are relative to the player. Useful values are between 14 to -10 (for the opponent) and between 0 to 13 (for the player). - -Some sample values are: - -- 0: player left border -- 6: player center -- -15: enemy center -- -10: enemy right border - -Values for *y1* are also between -16 to 31; the useful range is between 2 to 14. -Values between 2 to 8 will be in the opponent's area (2 being the top border and 8 being the -bottom border), and values between 8 to 14 will be in the player's area (again, 8 being the top border and 14 being the bottom border). -The center of the body is often 2 to 4 tiles away from the border (i.e., 5-6 for the opponent or 10-11 for the player). - -## `$D1`: `anim_1gfx` *gfx* - -## `$D2`: `anim_2gfx` *gfx1*, *gfx2* - -## `$D3`: `anim_3gfx` *gfx1*, *gfx2*, *gfx3* - -## `$D4`: `anim_4gfx` *gfx1*, *gfx2*, *gfx3*, *gfx4* - -## `$D5`: `anim_5gfx` *gfx1*, *gfx2*, *gfx3*, *gfx4*, *gfx5* - -## `$D6`: `anim_incobj` *id* - -## `$D7`: `anim_setobj` *id*, *object* - -## `$D8`: `anim_incbgeffect` *effect* - -## `$D9`: `anim_enemyfeetobj` - -## `$DA`: `anim_playerheadobj` - -## `$DB`: `anim_checkpokeball` - -## `$DC`: `anim_transform` - -## `$DD`: `anim_raisesub` - -## `$DE`: `anim_dropsub` - -## `$DF`: `anim_resetobp0` - -## `$E0`: `anim_sound` *duration*, *tracks*, *id* - -## `$E1`: `anim_cry` *pitch* - -## `$E2`: `anim_minimizeopp` - -## `$E3`: `anim_oamon` - -## `$E4`: `anim_oamoff` - -## `$E5`: `anim_clearobjs` - -## `$E6`: `anim_beatup` - -## `$E7`: `anim_0xe7` - -## `$E8`: `anim_updateactorpic` - -## `$E9`: `anim_minimize` - -## `$EA`: `anim_0xea` - -## `$EB`: `anim_0xeb` - -## `$EC`: `anim_0xec` - -## `$ED`: `anim_0xed` - -## `$EE`: `anim_if_param_and` *value*, *address* - -## `$EF`: `anim_jumpuntil` *address* - -## `$F0`: `anim_bgeffect` *effect*, *unknown1*, *unknown2*, *unknown3* - -## `$F1`: `anim_bgp` *colors* - -## `$F2`: `anim_obp0` *colors* - -## `$F3`: `anim_obp1` *colors* - -## `$F4`: `anim_clearsprites` - -## `$F5`: `anim_0xf5` - -## `$F6`: `anim_0xf6` - -## `$F7`: `anim_0xf7` - -## `$F8`: `anim_if_param_equal` *value*, *address* - -## `$F9`: `anim_setvar` *value* - -## `$FA`: `anim_incvar` - -## `$FB`: `anim_if_var_equal` *value*, *address* - -## `$FC`: `anim_jump` *address* - -## `$FD`: `anim_loop` *count*, *address* - -## `$FE`: `anim_call` *address* - -## `$FF`: `anim_ret` diff --git a/docs/pic_animations.md b/docs/pic_animations.md index 531282c13..ba11a1dc1 100644 --- a/docs/pic_animations.md +++ b/docs/pic_animations.md @@ -1,7 +1,6 @@ # Pic Animations -Defined in [macros/scripts/gfx_anim.asm](/macros/scripts/gfx_anim.asm) and [engine/anims/anim_commands.asm:BattleAnimCommands](/engine/anims/anim_commands.asm). - +Defined in [macros/scripts/gfx_anims.asm](/macros/scripts/gfx_anims.asm). Pic animations are assembled in 3 parts: @@ -20,12 +19,12 @@ Pic animations are assembled in 3 parts: Animation data is in these files: -- gfx/pics/anims.asm: +- [gfx/pokemon/anims.asm](/gfx/pokemon/anims.asm): Main animations (played everywhere) -- gfx/pics/extras.asm: +- [gfx/pokemon/extras.asm](/gfx/pokemon/extras.asm): Extra animations, appended to the main animation. Used in the status screen (blinking, tail wags etc.) -- gfx/pics/unown_anims.asm and gfx/pics/unown_extras.asm: +- [gfx/pokemon/unown_anims.asm](/gfx/pokemon/unown_anims.asm) and [gfx/pokemon/unown_extras.asm](/gfx/pokemon/unown_extras.asm): Unown has its own animation data despite having an entry in the main tables. -- cgit v1.2.3 From dae16acd6f4e2e2c177e3776be6ed549af070c4f Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 21:55:57 -0500 Subject: =?UTF-8?q?event/=20=E2=86=92=20events/,=20and=20move=20some=20app?= =?UTF-8?q?ropriate=20engine/=20files=20there?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/bugs_and_glitches.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 9275c6572..6e346f60d 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -678,7 +678,7 @@ This is a bug with `ItemAttributes` in [items/item_attributes.asm](/items/item_a ## Daisy's grooming doesn't always increase happiness -This is a bug with `MassageOrHaircut` in [event/special.asm](/event/special.asm): +This is a bug with `MassageOrHaircut` in [events/special.asm](/events/special.asm): ```asm ; Bug: Subtracting $ff from $ff fails to set c. @@ -753,7 +753,7 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm]( ## Magikarp lengths can be miscalculated -This is a bug with `CalcMagikarpLength.BCLessThanDE` in [event/magikarp.asm](/event/magikarp.asm): +This is a bug with `CalcMagikarpLength.BCLessThanDE` in [events/magikarp.asm](/events/magikarp.asm): ```asm .BCLessThanDE: ; fbc9a @@ -1348,7 +1348,7 @@ In [engine/events.asm](/engine/events.asm): ## `Special_CheckBugContestContestantFlag` can read beyond its data table -In [event/bug_contest_2.asm](/event/bug_contest_2.asm): +In [events/bug_contest/contest_2.asm](/events/bug_contest/contest_2.asm): ```asm Special_CheckBugContestContestantFlag: ; 139ed -- cgit v1.2.3 From c4a18b13295cd9f2777bfa27a37aafc09eb31684 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 22:36:01 -0500 Subject: Correct documentation Split out text_constants.asm --- docs/effect_commands.md | 2 +- docs/music_commands.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/effect_commands.md b/docs/effect_commands.md index 3112950a9..bd982a51d 100644 --- a/docs/effect_commands.md +++ b/docs/effect_commands.md @@ -1,6 +1,6 @@ # Effect Commands -Defined in [macros/scripts/effect_commands.asm](/macros/scripts/effect_commands.asm) and [battle/effect_command_pointers.asm:BattleCommandPointers](/battle/effect_command_pointers.asm). +Defined in [macros/scripts/effect_commands.asm](/macros/scripts/effect_commands.asm) and [data/moves/effect_command_pointers.asm:BattleCommandPointers](/data/moves/effect_command_pointers.asm). ## `$01`: `checkturn` diff --git a/docs/music_commands.md b/docs/music_commands.md index 21befa71f..7f7bd8b32 100644 --- a/docs/music_commands.md +++ b/docs/music_commands.md @@ -2,7 +2,7 @@ Defined in [macros/scripts/audio.asm](/macros/scripts/audio.asm) and [audio/engine.asm:MusicCommands](/audio/engine.asm). -See also: [Sound Engine Commands](https://github.com/pret/pokecrystal/wiki/Sound-Engine-Commands) +*See also: [Sound Engine Commands](https://github.com/pret/pokecrystal/wiki/Sound-Engine-Commands)* ## `musicheader` *n*, *index*, *address* -- cgit v1.2.3 From 5d229dcef2cabe2568491932bb082b0a42b46ed2 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 23:07:46 -0500 Subject: Copy sram.asm's global start/end constants for wram.asm and vram.asm --- docs/bugs_and_glitches.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 6e346f60d..3c940ef78 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -1398,8 +1398,8 @@ ClearWRAM:: ; 25a push af ld [rSVBK], a xor a - ld hl, wRAM1Start - ld bc, $1000 + ld hl, WRAM1_Start + ld bc, WRAM1_End - WRAM1_Start call ByteFill pop af inc a -- cgit v1.2.3 From 47e4f21e62705a8d2c832dad257c421a5cbd5c1b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 23:18:05 -0500 Subject: Keep memory map values in hardware_constants.asm --- docs/bugs_and_glitches.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 3c940ef78..b4a8f9a59 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -1398,8 +1398,8 @@ ClearWRAM:: ; 25a push af ld [rSVBK], a xor a - ld hl, WRAM1_Start - ld bc, WRAM1_End - WRAM1_Start + ld hl, WRAM1_Begin + ld bc, WRAM1_End - WRAM1_Begin call ByteFill pop af inc a -- cgit v1.2.3 From 86fd37af164110c9b85c5e132c02be0368c9c779 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 27 Dec 2017 00:09:12 -0500 Subject: Move events/ to engine/events/ --- docs/bugs_and_glitches.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index b4a8f9a59..c80eec94c 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -678,7 +678,7 @@ This is a bug with `ItemAttributes` in [items/item_attributes.asm](/items/item_a ## Daisy's grooming doesn't always increase happiness -This is a bug with `MassageOrHaircut` in [events/special.asm](/events/special.asm): +This is a bug with `MassageOrHaircut` in [engine/events/special.asm](/engine/events/special.asm): ```asm ; Bug: Subtracting $ff from $ff fails to set c. @@ -753,7 +753,7 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm]( ## Magikarp lengths can be miscalculated -This is a bug with `CalcMagikarpLength.BCLessThanDE` in [events/magikarp.asm](/events/magikarp.asm): +This is a bug with `CalcMagikarpLength.BCLessThanDE` in [engine/events/magikarp.asm](/engine/events/magikarp.asm): ```asm .BCLessThanDE: ; fbc9a @@ -1348,7 +1348,7 @@ In [engine/events.asm](/engine/events.asm): ## `Special_CheckBugContestContestantFlag` can read beyond its data table -In [events/bug_contest/contest_2.asm](/events/bug_contest/contest_2.asm): +In [engine/events/bug_contest/contest_2.asm](/engine/events/bug_contest/contest_2.asm): ```asm Special_CheckBugContestContestantFlag: ; 139ed -- cgit v1.2.3 From 7a4d64125176d9bd946682a3f9440de0f71324af Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 27 Dec 2017 01:29:15 -0500 Subject: Remove redundant data/ filename prefixes --- docs/battle_anim_commands.md | 2 +- docs/bugs_and_glitches.md | 4 +- docs/effect_commands.md | 358 ------------------------------------------- docs/move_effect_commands.md | 358 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 361 insertions(+), 361 deletions(-) delete mode 100644 docs/effect_commands.md create mode 100644 docs/move_effect_commands.md (limited to 'docs') diff --git a/docs/battle_anim_commands.md b/docs/battle_anim_commands.md index 4a11391db..5b457bf69 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/move_anims.asm:BattleAnimations](/data/moves/move_anims.asm). +Defined in [macros/scripts/battle_anims.asm](/macros/scripts/battle_anims.asm) and [data/moves/animations.asm:BattleAnimations](/data/moves/animations.asm). ## `$00`−`$EF`: `anim_wait` *length* diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index c80eec94c..69f902eb0 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -186,7 +186,7 @@ BattleCommand_BellyDrum: ; 37c1a This bug affects Acid, Iron Tail, and Rock Smash. -This is a bug with `DefenseDownHit` in [data/moves/move_effects.asm](/data/moves/move_effects.asm): +This is a bug with `DefenseDownHit` in [data/moves/effects.asm](/data/moves/effects.asm): ```asm DefenseDownHit: @@ -661,7 +661,7 @@ FastBallMultiplier: ## Dragon Scale, not Dragon Fang, boosts Dragon-type moves -This is a bug with `ItemAttributes` in [items/item_attributes.asm](/items/item_attributes.asm): +This is a bug with `ItemAttributes` in [items/attributes.asm](/items/attributes.asm): ```asm ; DRAGON FANG diff --git a/docs/effect_commands.md b/docs/effect_commands.md deleted file mode 100644 index bd982a51d..000000000 --- a/docs/effect_commands.md +++ /dev/null @@ -1,358 +0,0 @@ -# Effect Commands - -Defined in [macros/scripts/effect_commands.asm](/macros/scripts/effect_commands.asm) and [data/moves/effect_command_pointers.asm:BattleCommandPointers](/data/moves/effect_command_pointers.asm). - - -## `$01`: `checkturn` - -## `$02`: `checkobedience` - -## `$03`: `usedmovetext` - -## `$04`: `doturn` - -## `$05`: `critical` - -## `$06`: `damagestats` - -## `$07`: `stab` - -## `$08`: `damagevariation` - -## `$09`: `checkhit` - -## `$0A`: `lowersub` - -## `$0B`: `hittargetnosub` - -## `$0C`: `raisesub` - -## `$0D`: `failuretext` - -## `$0E`: `checkfaint` - -## `$0F`: `criticaltext` - -## `$10`: `supereffectivetext` - -## `$11`: `checkdestinybond` - -## `$12`: `buildopponentrage` - -## `$13`: `poisontarget` - -## `$14`: `sleeptarget` - -## `$15`: `draintarget` - -## `$16`: `eatdream` - -## `$17`: `burntarget` - -## `$18`: `freezetarget` - -## `$19`: `paralyzetarget` - -## `$1A`: `selfdestruct` - -## `$1B`: `mirrormove` - -## `$1C`: `statup` - -## `$1D`: `statdown` - -## `$1E`: `payday` - -## `$1F`: `conversion` - -## `$20`: `resetstats` - -## `$21`: `storeenergy` - -## `$22`: `unleashenergy` - -## `$23`: `forceswitch` - -## `$24`: `endloop` - -## `$25`: `flinchtarget` - -## `$26`: `ohko` - -## `$27`: `recoil` - -## `$28`: `mist` - -## `$29`: `focusenergy` - -## `$2A`: `confuse` - -## `$2B`: `confusetarget` - -## `$2C`: `heal` - -## `$2D`: `transform` - -## `$2E`: `screen` - -## `$2F`: `poison` - -## `$30`: `paralyze` - -## `$31`: `substitute` - -## `$32`: `rechargenextturn` - -## `$33`: `mimic` - -## `$34`: `metronome` - -## `$35`: `leechseed` - -## `$36`: `splash` - -## `$37`: `disable` - -## `$38`: `cleartext` - -## `$39`: `charge` - -## `$3A`: `checkcharge` - -## `$3B`: `traptarget` - -## `$3C`: `effect0x3c` - -## `$3D`: `rampage` - -## `$3E`: `checkrampage` - -## `$3F`: `constantdamage` - -## `$40`: `counter` - -## `$41`: `encore` - -## `$42`: `painsplit` - -## `$43`: `snore` - -## `$44`: `conversion2` - -## `$45`: `lockon` - -## `$46`: `sketch` - -## `$47`: `defrostopponent` - -## `$48`: `sleeptalk` - -## `$49`: `destinybond` - -## `$4A`: `spite` - -## `$4B`: `falseswipe` - -## `$4C`: `healbell` - -## `$4D`: `kingsrock` - -## `$4E`: `triplekick` - -## `$4F`: `kickcounter` - -## `$50`: `thief` - -## `$51`: `arenatrap` - -## `$52`: `nightmare` - -## `$53`: `defrost` - -## `$54`: `curse` - -## `$55`: `protect` - -## `$56`: `spikes` - -## `$57`: `foresight` - -## `$58`: `perishsong` - -## `$59`: `startsandstorm` - -## `$5A`: `endure` - -## `$5B`: `checkcurl` - -## `$5C`: `rolloutpower` - -## `$5D`: `effect0x5d` - -## `$5E`: `furycutter` - -## `$5F`: `attract` - -## `$60`: `happinesspower` - -## `$61`: `present` - -## `$62`: `damagecalc` - -## `$63`: `frustrationpower` - -## `$64`: `safeguard` - -## `$65`: `checksafeguard` - -## `$66`: `getmagnitude` - -## `$67`: `batonpass` - -## `$68`: `pursuit` - -## `$69`: `clearhazards` - -## `$6A`: `healmorn` - -## `$6B`: `healday` - -## `$6C`: `healnite` - -## `$6D`: `hiddenpower` - -## `$6E`: `startrain` - -## `$6F`: `startsun` - -## `$70`: `attackup` - -## `$71`: `defenseup` - -## `$72`: `speedup` - -## `$73`: `specialattackup` - -## `$74`: `specialdefenseup` - -## `$75`: `accuracyup` - -## `$76`: `evasionup` - -## `$77`: `attackup2` - -## `$78`: `defenseup2` - -## `$79`: `speedup2` - -## `$7A`: `specialattackup2` - -## `$7B`: `specialdefenseup2` - -## `$7C`: `accuracyup2` - -## `$7D`: `evasionup2` - -## `$7E`: `attackdown` - -## `$7F`: `defensedown` - -## `$80`: `speeddown` - -## `$81`: `specialattackdown` - -## `$82`: `specialdefensedown` - -## `$83`: `accuracydown` - -## `$84`: `evasiondown` - -## `$85`: `attackdown2` - -## `$86`: `defensedown2` - -## `$87`: `speeddown2` - -## `$88`: `specialattackdown2` - -## `$89`: `specialdefensedown2` - -## `$8A`: `accuracydown2` - -## `$8B`: `evasiondown2` - -## `$8C`: `statupmessage` - -## `$8D`: `statdownmessage` - -## `$8E`: `statupfailtext` - -## `$8F`: `statdownfailtext` - -## `$90`: `effectchance` - -## `$91`: `statdownanim` - -## `$92`: `statupanim` - -## `$93`: `switchturn` - -## `$94`: `fakeout` - -## `$95`: `bellydrum` - -## `$96`: `psychup` - -## `$97`: `rage` - -## `$98`: `doubleflyingdamage` - -## `$99`: `doubleundergrounddamage` - -## `$9A`: `mirrorcoat` - -## `$9B`: `checkfuturesight` - -## `$9C`: `futuresight` - -## `$9D`: `doubleminimizedamage` - -## `$9E`: `skipsuncharge` - -## `$9F`: `thunderaccuracy` - -## `$A0`: `teleport` - -## `$A1`: `beatup` - -## `$A2`: `ragedamage` - -## `$A3`: `resettypematchup` - -## `$A4`: `allstatsup` - -## `$A5`: `effect0xa5` - -## `$A6`: `raisesubnoanim` - -## `$A7`: `lowersubnoanim` - -## `$A8`: `effect0xa8` - -## `$A9`: `clearmissdamage` - -## `$AA`: `movedelay` - -## `$AB`: `hittarget` - -## `$AC`: `tristatuschance` - -## `$AD`: `supereffectivelooptext` - -## `$AE`: `startloop` - -## `$AF`: `curl` - -## `$FE`: `endturn` - -## `$FF`: `endmove` diff --git a/docs/move_effect_commands.md b/docs/move_effect_commands.md new file mode 100644 index 000000000..b8b09c5c2 --- /dev/null +++ b/docs/move_effect_commands.md @@ -0,0 +1,358 @@ +# 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). + + +## `$01`: `checkturn` + +## `$02`: `checkobedience` + +## `$03`: `usedmovetext` + +## `$04`: `doturn` + +## `$05`: `critical` + +## `$06`: `damagestats` + +## `$07`: `stab` + +## `$08`: `damagevariation` + +## `$09`: `checkhit` + +## `$0A`: `lowersub` + +## `$0B`: `hittargetnosub` + +## `$0C`: `raisesub` + +## `$0D`: `failuretext` + +## `$0E`: `checkfaint` + +## `$0F`: `criticaltext` + +## `$10`: `supereffectivetext` + +## `$11`: `checkdestinybond` + +## `$12`: `buildopponentrage` + +## `$13`: `poisontarget` + +## `$14`: `sleeptarget` + +## `$15`: `draintarget` + +## `$16`: `eatdream` + +## `$17`: `burntarget` + +## `$18`: `freezetarget` + +## `$19`: `paralyzetarget` + +## `$1A`: `selfdestruct` + +## `$1B`: `mirrormove` + +## `$1C`: `statup` + +## `$1D`: `statdown` + +## `$1E`: `payday` + +## `$1F`: `conversion` + +## `$20`: `resetstats` + +## `$21`: `storeenergy` + +## `$22`: `unleashenergy` + +## `$23`: `forceswitch` + +## `$24`: `endloop` + +## `$25`: `flinchtarget` + +## `$26`: `ohko` + +## `$27`: `recoil` + +## `$28`: `mist` + +## `$29`: `focusenergy` + +## `$2A`: `confuse` + +## `$2B`: `confusetarget` + +## `$2C`: `heal` + +## `$2D`: `transform` + +## `$2E`: `screen` + +## `$2F`: `poison` + +## `$30`: `paralyze` + +## `$31`: `substitute` + +## `$32`: `rechargenextturn` + +## `$33`: `mimic` + +## `$34`: `metronome` + +## `$35`: `leechseed` + +## `$36`: `splash` + +## `$37`: `disable` + +## `$38`: `cleartext` + +## `$39`: `charge` + +## `$3A`: `checkcharge` + +## `$3B`: `traptarget` + +## `$3C`: `effect0x3c` + +## `$3D`: `rampage` + +## `$3E`: `checkrampage` + +## `$3F`: `constantdamage` + +## `$40`: `counter` + +## `$41`: `encore` + +## `$42`: `painsplit` + +## `$43`: `snore` + +## `$44`: `conversion2` + +## `$45`: `lockon` + +## `$46`: `sketch` + +## `$47`: `defrostopponent` + +## `$48`: `sleeptalk` + +## `$49`: `destinybond` + +## `$4A`: `spite` + +## `$4B`: `falseswipe` + +## `$4C`: `healbell` + +## `$4D`: `kingsrock` + +## `$4E`: `triplekick` + +## `$4F`: `kickcounter` + +## `$50`: `thief` + +## `$51`: `arenatrap` + +## `$52`: `nightmare` + +## `$53`: `defrost` + +## `$54`: `curse` + +## `$55`: `protect` + +## `$56`: `spikes` + +## `$57`: `foresight` + +## `$58`: `perishsong` + +## `$59`: `startsandstorm` + +## `$5A`: `endure` + +## `$5B`: `checkcurl` + +## `$5C`: `rolloutpower` + +## `$5D`: `effect0x5d` + +## `$5E`: `furycutter` + +## `$5F`: `attract` + +## `$60`: `happinesspower` + +## `$61`: `present` + +## `$62`: `damagecalc` + +## `$63`: `frustrationpower` + +## `$64`: `safeguard` + +## `$65`: `checksafeguard` + +## `$66`: `getmagnitude` + +## `$67`: `batonpass` + +## `$68`: `pursuit` + +## `$69`: `clearhazards` + +## `$6A`: `healmorn` + +## `$6B`: `healday` + +## `$6C`: `healnite` + +## `$6D`: `hiddenpower` + +## `$6E`: `startrain` + +## `$6F`: `startsun` + +## `$70`: `attackup` + +## `$71`: `defenseup` + +## `$72`: `speedup` + +## `$73`: `specialattackup` + +## `$74`: `specialdefenseup` + +## `$75`: `accuracyup` + +## `$76`: `evasionup` + +## `$77`: `attackup2` + +## `$78`: `defenseup2` + +## `$79`: `speedup2` + +## `$7A`: `specialattackup2` + +## `$7B`: `specialdefenseup2` + +## `$7C`: `accuracyup2` + +## `$7D`: `evasionup2` + +## `$7E`: `attackdown` + +## `$7F`: `defensedown` + +## `$80`: `speeddown` + +## `$81`: `specialattackdown` + +## `$82`: `specialdefensedown` + +## `$83`: `accuracydown` + +## `$84`: `evasiondown` + +## `$85`: `attackdown2` + +## `$86`: `defensedown2` + +## `$87`: `speeddown2` + +## `$88`: `specialattackdown2` + +## `$89`: `specialdefensedown2` + +## `$8A`: `accuracydown2` + +## `$8B`: `evasiondown2` + +## `$8C`: `statupmessage` + +## `$8D`: `statdownmessage` + +## `$8E`: `statupfailtext` + +## `$8F`: `statdownfailtext` + +## `$90`: `effectchance` + +## `$91`: `statdownanim` + +## `$92`: `statupanim` + +## `$93`: `switchturn` + +## `$94`: `fakeout` + +## `$95`: `bellydrum` + +## `$96`: `psychup` + +## `$97`: `rage` + +## `$98`: `doubleflyingdamage` + +## `$99`: `doubleundergrounddamage` + +## `$9A`: `mirrorcoat` + +## `$9B`: `checkfuturesight` + +## `$9C`: `futuresight` + +## `$9D`: `doubleminimizedamage` + +## `$9E`: `skipsuncharge` + +## `$9F`: `thunderaccuracy` + +## `$A0`: `teleport` + +## `$A1`: `beatup` + +## `$A2`: `ragedamage` + +## `$A3`: `resettypematchup` + +## `$A4`: `allstatsup` + +## `$A5`: `effect0xa5` + +## `$A6`: `raisesubnoanim` + +## `$A7`: `lowersubnoanim` + +## `$A8`: `effect0xa8` + +## `$A9`: `clearmissdamage` + +## `$AA`: `movedelay` + +## `$AB`: `hittarget` + +## `$AC`: `tristatuschance` + +## `$AD`: `supereffectivelooptext` + +## `$AE`: `startloop` + +## `$AF`: `curl` + +## `$FE`: `endturn` + +## `$FF`: `endmove` -- cgit v1.2.3