Commit Graph

3058 Commits

Author SHA1 Message Date
GriffinR
dbff8c4360 Merge branch 'porymap-6' into generate-map-constants 2024-12-09 20:25:41 -05:00
GriffinR
382ee9e276 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-11-23 16:10:33 -05:00
GriffinR
b89fda79ea Generate MAPSEC constants from JSON 2024-11-06 21:43:13 -05:00
Frank
544b76fbbf Added value for bard sound length 2024-10-21 09:04:42 -04: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
luckytyphlosion
a55c75d350 Get rid of common syms (#2040) 2024-10-14 23:52:11 -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
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
DizzyEggg
c4b5818d98 remove ScriptContext_Enable from secret_base.h 2024-09-14 19:13:02 +02: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
GriffinR
a3d5f54b75 Fix type for offset in MapConnection 2024-08-13 19:10:24 +02:00
psf
312749dd31 Changed type1 and type2 to be consistent (#2021)
* Changed type1 and type2 in gBattleMons to match gSpeciesInfo
* Changed monType1 and monType2 to monTypes to match gSpeciesInfo
2024-08-07 06:44:03 +01:00
pkmnsnfrn
91b48a10d4 Added constant for NUM_SNOWFLAKE_SPRITES 2024-07-26 21:57:42 -07:00
sneed
b592c6eae5 Add POKE_ICON_BASE_PAL_TAG to a header 2024-05-23 02:45:22 +03:00
GriffinR
b08d62b615 Merge pull request #1961 from GriffinRichards/doc-camera-sprite
Document camera sprite functions
2024-03-21 21:23:53 -04:00
DizzyEggg
132ca1be14 Change Safe Div to explicitly check b != 0 2024-02-02 22:57:02 +01:00
GriffinR
8e8d2f5efa Remove non-existent tilesets from label comments and alphabetize 2024-01-18 14:31:04 -05:00
Bassoonian
6365431122 Add PokéNav too 2023-12-12 23:20:22 +01:00
Bassoonian
e5ac2fe0b1 Clean up pokemon/ball/dex mentions in comments 2023-12-12 19:02:36 +01:00
GriffinR
2db9ab2a2f Document camera sprite functions 2023-11-22 13:52:56 -05: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
5712777dc2 Correct dynamic type flag name 2023-10-20 12:57:36 -04:00
GriffinR
ffdc2456cb Document datahpupdate 2023-10-20 12:50:32 -04:00
Eduardo Quezada
927e4b6071 Renamed time amounts 2023-09-20 19:04:50 -03:00
Eduardo Quezada
fb6f45b2c3 Slight RTC documentation + Evolution times constants 2023-09-17 13:45:06 -03:00
GriffinR
de3493ff0e Merge pull request #1921 from citrusbolt/blockboxrs
[LEAK-INFORMED] Add `blockBoxRS` field to `struct BoxPokemon`
2023-09-12 18:48:05 -04:00
Eduardo Quezada
b89722500f Fixed Mr. Mime capitalization 2023-09-12 13:09:56 -03:00
citrusbolt
d31b168522 Add blockBoxRS field to struct BoxPokemon 2023-09-05 06:17:10 -06:00
GriffinR
d67914e114 Merge pull request #1912 from GriffinRichards/moves-mask
Handful of fixes related to MAX_MON_MOVES
2023-08-27 19:40:59 -04:00
WhenGryphonsFly
5abeb6718d Correct KEY_INTR_ENABLE 2023-08-27 14:30:57 -05:00
GriffinR
4941e2602a Merge pull request #1909 from GriffinRichards/stat-anim
Document stat change animation
2023-08-20 14:29:11 -04:00
GriffinR
bdc0ea1037 Add MOD to match mod with powers of 2 2023-08-16 16:44:45 -04:00
GriffinR
057928438a Document ChooseMoveAndTargetInBattlePalace 2023-08-16 16:41:29 -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