Rangi
5a5f5ececd
Miscellaneous fixes from #694
2020-03-21 13:07:18 -04:00
dannye
e7be25948d
Merge branch 'master' into audio-macros
2020-01-06 22:07:33 -06:00
dannye
99d16d616d
Update docs/music_commands.md
...
and remove the pokered compatibility macros
2020-01-05 15:41:55 -06:00
Rangi
4aeab6b879
Rename buttonsound to promptbutton
2019-11-03 12:48:54 -05:00
dannye
331ed51264
stereo_panning: force any non-zero arg to 1
2019-09-08 12:09:43 -05:00
dannye
9d4dd09b86
Add legacy audio macros
2019-09-04 00:17:10 -05:00
dannye
5fd3e591df
Use TRUE/FALSE constants for stereo_panning
...
and use dn instead of db for volume envelope and pitch sweep
2019-09-03 22:55:51 -05:00
dannye
e058393487
Rename dnote to drum_note and dspeed to drum_speed
2019-09-03 22:36:32 -05:00
dannye
fc051f2130
Update audio macros and arguments
...
and update related labels/constants/comments
this fixes a lot of mistakes and maximizes compatibility with red
2019-09-02 03:41:25 -05:00
mid-kid
649c8d38da
Get rid of _CRYSTAL
...
Having this here is completely redundant and useless, and doesn't even
work since it should use `if DEF(_CRYSTAL)` instead.
2019-05-25 17:59:50 +02:00
Rangi
745339014c
"object_const_def" instead of "const_def 2"
2019-04-21 17:42:25 -04:00
Rangi
45e3f6aca9
Identify some more WRAM labels
2019-04-19 11:35:27 -04:00
mid-kid
3e78e5b2b6
TextBox -> Textbox
...
Homogenizing names.
2019-04-09 16:09:18 +02:00
Rangi
f5c9958aea
Rename some call/jump script commands to avoid confusion with jr/jp asm instructions
...
Fixes #580
2019-03-10 16:39:31 -04:00
Rangi
e002b536af
Rename more script commands for consistency and predictability
...
Fixes #540
2019-03-10 16:00:19 -04:00
Rangi
79dc22c769
Define constants for map event sizes
2019-03-03 14:19:16 -05:00
Rangi
e51c64e167
Don't use legacy macros
2019-02-17 13:31:28 -05:00
Rangi
2449a17add
dba exists, use it
2019-02-16 16:09:31 -05:00
Rangi
8e359978d6
passtoengine -> autoinput
2019-02-16 16:06:11 -05:00
mid-kid
80ece33e3e
Document wBattleAnimFlags
...
`anim_clearsprites` was misnamed, so I renamed it to `anim_keepsprites`,
and documented it in docs/battle_anim_commands.md
2019-02-16 12:55:40 +01:00
mid-kid
469c51d086
dorepeat -> dowait for oam animations
...
Having the pic animation macros be the same as the oam animation macros
isn't really turning out so well... I wonder if we should split them up
eventually.
2019-02-15 02:54:35 +01:00
Rangi
4b4c53c7ae
Format music macros like movement macros
2018-12-09 17:56:13 -05:00
Rangi
e025ab9db0
Merge pull request #578 from mid-kid/master
...
Fixes in the animation subsystem.
2018-12-09 17:44:09 -05:00
mid-kid
c4979d9770
Rename "feet and head follow" commands
...
The lot of these were rather misnamed, since they're used to replace
part of the player or enemy with objects for several background effects.
https://github.com/pret/pokecrystal/pull/578#issuecomment-440996244
2018-11-25 23:57:38 +01:00
mid-kid
725cee7371
Define first_music_cmd
...
This replaces the uses of $d0 in the audio engine with proper constants.
2018-11-21 12:12:22 +01:00
mid-kid
4e3ed078f9
Cosmetic fixes
2018-11-20 21:53:45 +01:00
Rangi
3202c4f3df
Resolve issue #575 : Rename text commands
2018-11-18 12:41:11 -05:00
Rangi
ffd2b70902
Merge pull request #573 from mid-kid/master
...
text_jump → text_far
2018-11-11 17:07:17 -05:00
mid-kid
056cd5e871
Clarify LEGACY support
2018-11-11 00:44:07 +01:00
mid-kid
940256569b
text_jump → text_far
...
The previous name for this was rather misleading. It isn't an actual
jump like you'd expect the `jp` instruction to behave as. Instead, it
behaves more like a `farcall`.
This also makes it consistent with its current command ID name of
`TX_FAR`.
2018-11-05 22:26:18 +01:00
mid-kid
e68713d20e
Stop using __enum__ + 3
...
Abuse __enumdir__ instead, for better readability.
2018-10-11 11:39:09 +02:00
mid-kid
50da83cb23
CheckDestinyBond -> CheckFaint
...
Its main function is fainting the opponent and ending the move effect.
Updated the comment accordingly.
2018-08-17 20:16:37 +02:00
mid-kid
595127ba65
anim_ret_command is an index in a table after all
...
For some reason I thought BattleAnim_Ret was never used, due to how the
battle anim loop would be exited early from. It seems I was wrong.
Removing commands before anim_ret without it being part of the `enum`
seems to break things.
2018-07-28 12:14:04 +02:00
mid-kid
ffa63c51df
Clean up TX_ commands
...
Some of the TX_ commands didn't use the TX_ prefix for their
constants, and the label names were inconsistent. I've chosen to adopt
the `TextCommand_` prefix as opposed to `Text_`, as it has a clear
difference in namespace compared to the possibly-used `Text_` namespace
for actual dialogue text.
2018-07-18 10:55:30 +02:00
mid-kid
04d0490c4c
Fix anim_ret_command
2018-07-18 10:55:30 +02:00
Rangi
67d1364c7a
Fix triple newlines left over from removing address comments
2018-06-24 23:22:50 -04:00
mid-kid
c82deab86f
fix-various-little-things
...
A compilation of suggestions from the discord that don't deserve
separate commits and are not questionable at all™.
2018-05-05 09:19:04 +02:00
mid-kid
d4025863cf
Rename some battle commands
...
`hittarget` was misleading, as it doesn't actually "hit" the target, it
only plays the animation. As such, I've renamed it to `moveanim`.
`checkfaint` has nothing to do with checking if the user or target has
fainted, instead, it applies wCurDamage onto the target's HP, hitting
the substitute if applicable. I've renamed the command to `applydamage`
and all of its subfunctions accordingly.
2018-04-04 23:27:40 +02:00
mid-kid
800f948914
Label BattleCommand_BeatUpFailText
2018-04-04 22:40:35 +02:00
mid-kid
682ca7e93c
Label bidefailtext
...
This "unknown" battle command is actually used to give the proper fail
message to bide.
2018-04-04 22:40:21 +02:00
Rangi
10173f2a62
Default macro parameters use recursion; avoids repeating internal structure
2018-02-25 20:12:58 -05:00
Rangi
f964d04a87
* loadmenuheader -> loadmenu ( ead103d)
...
* objectface -> turnobject (c834bda
2018-02-25 20:05:37 -05:00
Rangi
6ff2cb20e6
map → map_id; map_def → map; map_data → map_attributes
2018-02-03 17:11:55 -05:00
Rangi
e32e5212af
use "x + -1" not "x +- 1"
...
(TODO: use "x - 1" once rgbds allows it)
2018-02-02 22:55:38 -05:00
Rangi
c834bdadf2
spriteface → objectface, consistent with the other script commands
2018-02-02 21:50:43 -05:00
Rangi
aa8db1632c
Remove checkmorn/checkday/checknite macros
2018-02-02 21:20:13 -05:00
Rangi
68d855c213
Script commands don't have underscores
2018-02-02 21:09:17 -05:00
Rangi
3088a77a21
warp_event x, y, map, warp_id
2018-02-01 21:54:00 -05:00
Rangi
323ef81286
More comments and macros
2018-02-01 15:19:27 -05:00
Rangi
b04f41da98
enum_start like const_def
2018-01-31 12:21:36 -05:00
Rangi
477adc72af
grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/g
2018-01-28 13:20:04 -05:00
Rangi
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
Rangi
8f2878c37e
trainers put the class and id first: trainer YOUNGSTER, JOEY1, ...
2018-01-23 13:08:48 -05:00
Rangi
dea26c6639
hiddenitem, like itemball and object_event, puts the item first and the event last
2018-01-23 12:59:21 -05:00
Remy Oukaour
105ef872dd
Better TX_SOUND_* names
2018-01-18 22:06:51 -05:00
Remy Oukaour
2acaa96cf1
More charmap and home/text.asm documentation for JP chars
2018-01-18 18:34:20 -05:00
Remy Oukaour
6c7e88513a
Long lists of db/dw series with struct-defining macros belong in data/
2018-01-15 14:11:11 -05:00
Remy Oukaour
5a3822fe86
Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts
2018-01-13 00:47:38 -05:00
Remy Oukaour
d83aefb30a
Use more constants in scripts
2018-01-12 02:27:42 -05:00
Remy Oukaour
e0088adb3f
Other files belong in data/battle/
2018-01-10 17:49:19 -05:00
yenatch
4ce75e8dfc
Document some more battle animation commands
2018-01-01 04:40:15 -05:00
yenatch
cc5aeb8b87
Fix anim_obj x/y values
...
- negative values have no meaning
- left in optional tile x/y for backwards compatibility
2017-12-29 13:43:17 -05:00
Remy Oukaour
b9a68fec25
Consistent if/else/endc (matches rept/endr) and DEF (matches BANK/HIGH/LOW)
2017-12-28 22:13:39 -05:00
Remy Oukaour
4c35f3ac85
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# macros/scripts/maps.asm
2017-12-28 20:56:21 -05:00
xCrystal
50fc9c3389
endm -> ENDM
2017-12-28 22:31:16 +01:00
Remy Oukaour
84e22eb578
Consistent (x, y) coordinate formatting in map scripts
2017-12-28 14:31:25 -05:00
xCrystal
7beb497d3a
Uppercase MACRO and EQU(S) according to the style guide
2017-12-28 13:23:44 +01:00
Remy Oukaour
7a4d641251
Remove redundant data/ filename prefixes
2017-12-27 01:29:15 -05:00
Remy Oukaour
35a3a19fda
Use "battle_anims" and "sprite_anims" for clarity, not just "anims"
2017-12-26 18:45:04 -05:00
Remy Oukaour
b5417fafec
Split battle/ into data/ and engine/ components
2017-12-26 17:47:05 -05:00
Remy Oukaour
24f0e7d045
Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers
2017-12-26 12:50:32 -05:00
Remy Oukaour
3e7f3bbeb6
s/number/scene/, and correct some documentation
2017-12-24 17:35:33 -05:00
Remy Oukaour
c05b7f41dd
Renaming: ( fix #412 )
...
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 14:33:17 -05:00
Remy Oukaour
10a1e6c860
Support old one-argument sound_duty macro, similar to callab/callba legacy support
2017-12-24 12:52:05 -05:00
Remy Oukaour
2f9f2317a3
Document the meaning of hour and daytime values for person_events
2017-12-23 01:19:34 -05:00
Remy Oukaour
d334a331fa
Correct endturn value
2017-12-15 00:54:45 -05:00
Remy Oukaour
d6dc9351e9
Start documenting effect commands
2017-12-15 00:48:59 -05:00
Remy Oukaour
fecc5c339a
More comments for macros
2017-12-15 00:38:52 -05:00
Remy Oukaour
2ff7f50584
Clarify which gfx anim commands are for oam
2017-12-14 00:38:08 -05:00
Remy Oukaour
e48a401290
Reorganize macros
2017-12-14 00:36:24 -05:00
