Commit Graph

2197 Commits

Author SHA1 Message Date
Josh
65f9c04757 Key split restructure (#2168)
Key split tables have been given names based on usage (KeySplitTable1 -> keysplit_piano etc) and a new macro has been set up to better represent the individual bytes for key splits with it being more obvious to how said bytes are used for the respective voice in the voicegroup.

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2025-08-02 02:11:50 +01:00
Josh
0dfec24967 Allow names for voicegroups and use a macro for use with drumsets (#2149)
mid2agb has been modified to allow more than just numbers when naming voicegroups and voicegroups have been renamed to match. A "voice_group" macro has been set up with a optional parameter for the starting note will shift the offset by the specified amount * 0xC which is the length of 1 voice in a voicegroup. All drumset voicegroups have a "starting_note" of 36.
2025-07-30 19:43:08 +01:00
GriffinR
0c7c81e02f Merge branch 'master' into _pret/pr/pyramidLocation 2025-06-30 11:51:45 -04:00
GriffinR
e2e3438674 Add missing uses of LOCALID_NONE for trainerbattle 2025-06-20 15:33:12 -04:00
GriffinR
0c32d840fa Merge pull request #2141 from pret/porymap-6
Update for Porymap 6
2025-05-27 10:53:17 -04:00
Martin Griffin
54e9505d2b Warn on suspicious setvar usages 2025-05-15 09:42:59 +01:00
GriffinR
929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
GriffinR
709cfa1c9a Merge pull request #2014 from Bassoonian/battleterrain
Rename battle terrain to environment
2025-04-13 19:32:06 -04:00
Raymond Dodge
b5b0ffd511 Define field script opcode constants (#2005)
Replace the magic number opcodes in field script command macros with
these new constants
2025-01-17 17:04:00 +00:00
Eduardo Quezada
720b2daecc Improve Pyramid location documentaion 2024-12-05 18:25:27 -03:00
Eduardo Quezada
3f98c78297 Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
GriffinR
9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
NT_x86
71fcb2e7b5 Fix incorrect point macros in contest_ai_script.inc 2024-09-08 12:50:35 +03:00
Bassoonian
003bd54600 Rename battle terrain to environment 2024-07-13 12:02:18 +02:00
GriffinR
866c32a735 Add temp var aliases 2023-08-04 14:17:28 -04:00
GriffinR
ec89e519f9 Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful
Rename eventLegal to modernFatefulEncounter
2023-02-28 11:48:34 -05:00
Eduardo Quezada
bd54990333 Review changes 2023-02-15 13:56:11 -03:00
Eduardo Quezada
96865f66af Updated term to modernFatefulEncounter 2023-02-11 22:36:42 -03:00
Eduardo Quezada
6da5e0a280 Rename eventLegal to fatefulEncounter 2023-02-11 17:13:53 -03:00
GriffinR
de56e400ff Sync clone object macro 2023-02-08 13:11:10 -05:00
GriffinR
a418f8d976 Merge pull request #1755 from GriffinRichards/map-dynamic
Rename special map constants, treat warp ids as strings
2022-10-18 22:45:56 -04:00
Eduardo Quezada
65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
GriffinR
ce4a6e9067 MAP_NONE -> MAP_DYNAMIC 2022-08-25 21:34:05 -04:00
GriffinR
898ec580ae Merge pull request #1737 from GriffinRichards/lock-unlock
Clean up lock/unlock anim movement
2022-08-22 01:30:33 -04:00
tustin2121
1cb659df8c Renaming Script Contexts
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
2022-08-15 15:18:12 -04:00
GriffinR
5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
GriffinR
e6a374f2b6 Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall 2022-07-06 14:49:08 -04:00
GriffinR
fc5747f0f7 Merge pull request #1649 from GriffinRichards/clean-trainer
Trainer hill clean up
2022-04-20 00:20:44 -04:00
GriffinR
62f3f144ab Clean up some trainer hill 2022-03-31 12:54:07 -04:00
GriffinR
bb91b1b0d1 Update generic macro argument names 2022-03-10 16:36:41 -05:00
GriffinR
dc7d86f026 Add new macro comments 2022-01-23 19:30:39 -05:00
GriffinR
2495d18132 Add missing :req, remove old macros 2022-01-23 18:52:04 -05:00
GriffinR
3a6c633905 Add seteventmon 2022-01-11 02:16:25 -05:00
GriffinR
110fbc559c Make item optional for givemon and setwildbattle 2022-01-11 02:08:14 -05:00
GriffinR
ce55e58ad8 Misc cleanup 2022-01-04 10:09:42 -05:00
GriffinR
42a83ee50e Use STR_VAR names for apprentice_buff and frontier_gettrainername 2021-11-18 23:20:05 -05:00
GriffinR
c57efdba5d Allow compare + goto_if/call_if as a single statement 2021-11-18 22:06:53 -05:00
GriffinR
591ab7241f Macro comment typo fix, Object->object 2021-11-18 17:24:43 -05:00
GriffinR
c89dfd9f56 Finish updating macro comments 2021-11-18 01:47:58 -05:00
GriffinR
b5b5d95de6 Distinguish 'virtual object' names from object events 2021-11-17 23:40:53 -05:00
GriffinR
b9fa18bdd4 Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros 2021-11-17 22:03:37 -05:00
GriffinR
c4f8f4d11a Add STR_VAR_# ids to string buffer macros 2021-11-17 22:00:44 -05:00
GriffinR
c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
GriffinR
c1970a4bc8 Remove dead sub references 2021-11-17 15:47:47 -05:00
GriffinR
eb95ac0b9c Document field_tasks 2021-11-17 14:44:42 -05:00
cbt6
9d18ad0b5a Make arguments for create_movement_action required 2021-11-18 03:07:09 +08:00
cbt6
f23d9ff30e Use movement action constant values over enum 2021-11-18 02:43:39 +08:00
GriffinR
61aa9c3ba9 More updating event macro comments 2021-11-16 17:46:34 -05:00
GriffinR
5d9c31a610 Label slot machine ids, fix GetPriceReduction 2021-11-16 15:43:52 -05:00
GriffinR
63c5905914 Continue updating event macro comments 2021-11-16 13:10:23 -05:00