Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-08 11:06:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,122 Commits 3 Branches 0 Tags
master
Commit Graph

2217 Commits

Author SHA1 Message Date
GriffinR
5eff78649e Merge pull request #2322 from mrgriffin/pret-applywaitmovement
Some checks failed
CI / build (push) Has been cancelled
Details
2026-09-01 02:36:56 -04:00
psf
ebd27892ff comparison operators now use enum instead of raw numbers (#2334)
Some checks failed
CI / build (push) Has been cancelled
Details
2026-06-24 13:43:43 -04:00
Martin Griffin
55a392457d Implicit waitmovement 
Applied to moverotatingtileobjects and turnrotatingtileobjects.
 2026-06-18 15:21:53 +01:00
Martin Griffin
00acaf5dfd applywaitmovement 2026-06-18 06:20:29 +01:00
Martin Griffin
167b05f2a7 Cleanup commas in .macro 2026-06-17 14:35:40 +01:00
Frank
76799d84eb Added electric puff macro 2026-05-06 19:47:22 -04:00
Frank
edc58c881f Added fist and foot templates 2026-05-06 19:43:40 -04:00
Martin Griffin
89ca861a3a Merge pull request #2200 from mrgriffin/pret-implicit-waitstate 
Implicit waitstate for special/specialvars
 2026-04-21 15:54:10 +01:00
Frank DeBlasio
064ca5c243 Added macro for Surf/Muddy Water's animation (#2232)
Some checks failed
CI / build (push) Has been cancelled
Details
2026-02-06 10:08:20 -05:00
Martin Griffin
22eed3f4bf Partially document battle_anim_effects_1.c 2026-01-19 09:16:37 +00:00
Martin Griffin
0e415dde46 Document battle_anim_dragon.c 2026-01-19 09:16:37 +00:00
Martin Griffin
5d713ad9bb Document battle_anim_dark.c 2026-01-19 09:16:37 +00:00
Martin Griffin
050a9415c7 Document battle_anim_bug.c 2026-01-19 09:16:37 +00:00
Martin Griffin
e09423fadf Document battle_anim_normal.c 2026-01-19 09:16:37 +00:00
cawtds
b11741855d Add enum for battle script opcodes (#2222) 2026-01-02 20:19:01 +00:00
GriffinR
d8a6b72e23 Display error for invalid hidden item flags 2025-12-03 21:44:25 -05:00
mitsunee
afa42f5d29 Standardize spelling of "paralyze" 2025-11-19 21:19:15 +01:00
Martin Griffin
1a9fbbcfba Fix copyvar with non-var argument
Some checks failed
CI / build (push) Has been cancelled
Details
2025-11-06 14:29:09 +01:00
Martin Griffin
400788ddf6 Implicit waitstate for special/specialvars 2025-11-05 22:38:51 +00:00
Martin Griffin
d1d5435487 Improve undefined map assembler messages (#2196)
Some checks failed
CI / build (push) Has been cancelled
Details
2025-10-29 21:34:03 -04:00
Josh
65f9c04757 Key split restructure (#2168)
Some checks failed
CI / build (push) Has been cancelled
Details 
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)
Some checks failed
CI / build (push) Has been cancelled
Details 
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
Some checks failed
CI / build (push) Has been cancelled
Details
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
Some checks are pending
CI / build (push) Waiting to run
Details 
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)
Some checks failed
CI / build (push) Has been cancelled
Details
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