Commit Graph

2083 Commits

Author SHA1 Message Date
FosterProgramming 4b6a69ae24 Rename daycare special to account for string side effects (#2287) 2026-06-04 12:08:01 +01:00
Martin Griffin c46e53bd02 Fix typos in event scripts 2026-05-28 15:14:36 +01:00
Martin Griffin 3960a18c1b Consistently use decimal for CLEAR and CLEAR_TO 2026-05-15 20:05:13 +01:00
Martin Griffin 701c665786 Consistently use '{PAUSE 15}' 2026-05-15 20:05:13 +01:00
Martin Griffin 3ca6792d20 Minor string-related cleanups 2026-05-15 20:05:13 +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 c314cc1e52 Merge pull request #2231 from GriffinRichards/match-call-rematch
Document gym leader match call texts
2026-04-21 15:57:49 +01: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
Raymond Dodge 31552457e0 Merge pull request #2241 from rayrobdod/compare_size_return_names
Name values used by CompareMonSize
2026-04-21 15:52:36 +01:00
Frank DeBlasio 064ca5c243 Added macro for Surf/Muddy Water's animation (#2232) 2026-02-06 10:08:20 -05:00
GriffinR 926488b69a Document gym leader match call texts 2026-02-01 13:36:33 -05:00
hedara90 f9c826ca57 Merge pull request #2228 from hedara90/fix-spaces
Fix spaces instead of tabs in battle_anim_scripts.s
2026-01-20 11:13:48 +00: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
mitsunee afa42f5d29 Standardize spelling of "paralyze" 2025-11-19 21:19:15 +01:00
hedara90 f8e7a2db5f Fix incorrect UBFIX checks (#2206)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-11-16 10:33:16 +00:00
Martin Griffin 1a9fbbcfba Fix copyvar with non-var argument 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) 2025-10-29 21:34:03 -04:00
Alex 208f97e1e3 Rename passive damage hitmarker (#2174) 2025-08-21 13:43:19 +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 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
GriffinR cdadd7d2ed Generate heal location constants automatically, move data back to a single file. 2025-02-03 20:25:11 -05:00
GriffinR 2f67b17571 Document bard music (#2053)
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
2025-01-17 17:54:38 +00: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
GriffinR dbff8c4360 Merge branch 'porymap-6' into generate-map-constants 2024-12-09 20:25:41 -05: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 382ee9e276 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-11-23 16:10:33 -05:00
surtr-games 13692076f9 Fixed a bug with Counter and Mirror Coat where they would be scored up depending on the wrong target mon type category. 2024-11-14 00:30:25 -05:00
GriffinR 0eb6d1d74c Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants 2024-10-15 22:04:45 -04:00
GriffinR da9c0239d9 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-10-15 22:02:40 -04:00
GriffinR a0be2cbf7b Fix Fallorbor typo 2024-10-12 23:50:12 -04:00
GriffinR f61c0099b9 OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA 2024-10-12 23:34:02 -04:00
GriffinR bf17d54b52 Finish adding local IDs to map.json files 2024-10-12 23:32:28 -04:00
GriffinR cb66ea6653 Continue adding local IDs to map.json files 2024-10-12 12:24:57 -04:00
GriffinR 9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
GriffinR 091b7269df Move heal locations data to their associated map.json (#2034) 2024-10-11 15:15:55 -04:00
GriffinR a551efea43 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-09-19 12:33:34 -04:00
GriffinR 04197b4912 Fix swapped cycling road entrances 2024-08-31 01:54:25 -04:00
Bassoonian 5fefd743a2 Fix defines in MAP_NUM and MAP_GROUP 2024-08-14 13:02:40 +02:00
Bassoonian 367f6dc8fd Address concerns 2024-07-13 18:01:54 +02:00
Bassoonian 003bd54600 Rename battle terrain to environment 2024-07-13 12:02:18 +02:00
Jaizu 189d542520 Fix Steven partner battle post-battle script (#2001) 2024-06-17 15:44:52 -04:00