Commit Graph

845 Commits

Author SHA1 Message Date
Frank DeBlasio
064ca5c243
Added macro for Surf/Muddy Water's animation (#2232)
Some checks failed
CI / build (push) Has been cancelled
2026-02-06 10:08:20 -05: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
Mitsunee
02c44242f8
Added bugfix for missing no weather case in Cmd_weather_get (#2203)
Some checks failed
CI / build (push) Has been cancelled
2025-12-09 22:22:08 -05:00
GriffinR
83b05d5efa
Merge pull request #2201 from mrgriffin/pret-flag-registered-wally
Fix FLAG_REGISTERED_WALLY
2025-12-09 21:43:30 -05:00
mitsunee
c0569cd529
Standardize spelling of "synchronize" 2025-11-19 21:14:45 +01:00
Martin Griffin
c466dce996 Fix FLAG_REGISTERED_WALLY 2025-11-06 13:40:22 +00:00
Martin Griffin
d1d5435487
Improve undefined map assembler messages (#2196)
Some checks failed
CI / build (push) Has been cancelled
2025-10-29 21:34:03 -04:00
Alex
208f97e1e3
Rename passive damage hitmarker (#2174)
Some checks failed
CI / build (push) Has been cancelled
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
929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
Alex
51b000860b
Add BattlerId enum and document (#2135)
Some checks failed
CI / build (push) Has been cancelled
2025-05-11 07:36:39 +01:00
GriffinR
709cfa1c9a
Merge pull request #2014 from Bassoonian/battleterrain
Some checks are pending
CI / build (push) Waiting to run
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
shachar700
a0e8753083
Update vars.h (cleanup)
Removed an extra are
2025-01-06 22:17:24 +02:00
Eduardo Quezada
50d325f081
Slight contest documentation (#2078)
Some checks failed
CI / build (push) Has been cancelled
2024-12-27 11:09:33 -05: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
GriffinR
b89fda79ea Generate MAPSEC constants from JSON 2024-11-06 21:43:13 -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
Some checks failed
CI / build (push) Has been cancelled
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
a2a3255bdd Fix typo, remove old size check 2024-10-12 03:30:35 -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
e4e90eacd6
Merge pull request #2023 from Bassoonian/updatemapmacros
Fix defines in MAP_NUM and MAP_GROUP
2024-09-19 12:17:16 -04:00
Kurausukun
52c2728ff6 remove gflib 2024-09-18 10:37:34 -04:00
Icedude907
625a006cab
[Build System Rewrite] mapjson now takes output directory parameters. (#1949) 2024-08-29 14:01:01 -04:00
GriffinR
7532f8ddb8 Revert MB name changes 2024-08-28 11:19:27 -04:00
psf
113226b03a
Change metatile behaviors to enum (#2027) 2024-08-28 00:45:09 -04:00
Martin Griffin
56d3faa32f
Merge pull request #2025 from Bassoonian/cleandefinespaces
Clean up defines lacking spaces
2024-08-21 19:04:12 +01:00
GriffinR
3f49c5cbaf Fix trainer match call flags 2024-08-15 23:00:20 +02:00
Bassoonian
c1ee43254e Clean up defines lacking spaces 2024-08-15 19:34:56 +02:00
Bassoonian
5fefd743a2 Fix defines in MAP_NUM and MAP_GROUP 2024-08-14 13:02:40 +02:00
pkmnsnfrn
91b48a10d4 Added constant for NUM_SNOWFLAKE_SPRITES 2024-07-26 21:57:42 -07: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
sneed
b592c6eae5 Add POKE_ICON_BASE_PAL_TAG to a header 2024-05-23 02:45:22 +03:00
GriffinR
8e8d2f5efa Remove non-existent tilesets from label comments and alphabetize 2024-01-18 14:31:04 -05:00
Bassoonian
e5ac2fe0b1 Clean up pokemon/ball/dex mentions in comments 2023-12-12 19:02:36 +01:00
SnorlaxMonster
190e77e9c8 Rename HITMARKER_IGNORE_SAFEGUARD
Rename HITMARKER_IGNORE_SAFEGUARD to HITMARKER_STATUS_ABILITY_EFFECT.
This flag is used exclusively by status-inflicting Abilities,
and has 3 main functions:
- Whether the effect bypasses Shield Dust
- Whether the effect bypasses Safeguard
- Which text string to display when the status condition is inflicted
   (i.e. whether it was inflicted by a move or Ability)

I believe this new name better represents what the flag actually does.
This name was structured to parallel HITMARKER_SYNCHRONISE_EFFECT.
2023-11-18 13:57:50 +11:00
GriffinR
12a64fecb4
Merge pull request #1936 from GriffinRichards/doc-datahpupdate
Document datahpupdate
2023-11-07 12:25:26 -05:00
Bassoonian
f472d768dd Rename Undiscovered to No Eggs Discovered 2023-10-28 16:32:55 +02:00
GriffinR
ffdc2456cb Document datahpupdate 2023-10-20 12:50:32 -04:00
GriffinR
aca7998b93 Add missing use of ALL_MOVES_MASK 2023-08-16 14:33:15 -04:00
GriffinR
10a10e914b
Merge pull request #1910 from GriffinRichards/misc-constants
Use miscellaneous missing constants
2023-08-15 17:53:41 -04:00
GriffinR
4c2b12541b
Merge pull request #1908 from GriffinRichards/name-buffer
Automatically update nickname buffer sizes
2023-08-12 23:36:19 -04:00