Commit Graph

315 Commits

Author SHA1 Message Date
mitsunee
c0569cd529 Standardize spelling of "synchronize" 2025-11-19 21:14:45 +01:00
mitsunee
73ec0813e1 Standardize spelling of "canceler"
just a quick grep -r and regex substitution, but didn't see anything wrong in the diffs during a quick proofread
2025-11-15 12:11:32 +01:00
Alex
208f97e1e3 Rename passive damage hitmarker (#2174) 2025-08-21 13:43:19 +01:00
GriffinR
92f7727a60 Merge pull request #2107 from AsparagusEduardo/pret/pr/simpleMultiBattleFix
Simplified Multi Battle bugfix, removing duplicate code
2025-08-14 15:09:42 -04:00
GriffinR
0c7c81e02f Merge branch 'master' into _pret/pr/pyramidLocation 2025-06-30 11:51:45 -04:00
Alex
b31a73f990 Rename ItemId_GetX to GetItemX (#2116) 2025-05-22 13:27:52 +01:00
Bassoonian
16357c7e29 Streamline pointer notation (#2139) 2025-05-16 12:04:44 +01:00
Alex
baf5be2035 Replace: moveId -> move, moveIdx -> moveIndex (#2134) 2025-05-09 16:33:23 +01:00
Alex
2044bea883 Rename battlerId to battler for consistency (#2126) 2025-05-09 12:43:23 +01:00
DavidJCobb
0f17e70371 Shorter names for engine/controller communication enum members 2025-05-02 00:01:15 -04:00
DavidJCobb
b4ee45f3e8 Renamed BATTLELINKMSGTYPE_ to BATTLELINKCOMMTYPE_
I want to avoid the word "message" since PRET has already chosen "battle message" as the term for predefined strings usable in the battle scripts and UI.

I was considering the term "battle link packet" instead, but the library for wireless communications already uses the word "packet" even though GBATEK does not. I'm going with "battle link communication type" instead. For this particular context, I don't think we need a compound noun ("X type"); the singular noun "type" is fine enough.
2025-04-26 11:37:20 -04:00
DavidJCobb
2738d11b0f Additional fixes to last few commits
ROM now compiles, but it's not comparing as equal...
2025-04-26 01:00:16 -04:00
DavidJCobb
9dc48899d3 BUFFER_A/B -> BATTLELINKMSGTYPE; link send/recv. task data names
Replaced the BUFFER_A and BUFFER_B constants with the BATTLELINKMSGTYPE enum, which also identifies the "controller becoming idle" message type.

Named the task data for the link send task and the link receive task. Added macros to functions related to those tasks, for legibility.
2025-04-26 00:13:42 -04:00
GriffinR
709cfa1c9a Merge pull request #2014 from Bassoonian/battleterrain
Rename battle terrain to environment
2025-04-13 19:32:06 -04:00
Eduardo Quezada
0eabbf7a3f Simplified Multi Battle bugfix, removing duplicate code 2025-03-02 18:10:22 -03:00
shachar700
95aa41f0d4 Fixed switchout bug in multibattle where order of mons gets messed up (#2099) 2025-01-29 07:43:13 +00:00
Eduardo Quezada
29ef1cf9ad Stick to the new name 2024-12-05 21:00:55 -03:00
Eduardo Quezada
5483e05db6 Fixed brace style inconsistencies 2024-12-05 12:46:50 -03: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
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
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
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
af210da972 Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03: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
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
GriffinR
18319e8da3 Misc missing constant use 2023-08-10 01:42:18 -04:00
Martin Griffin
912a80e27a Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
GriffinR
41847cd5aa STAT_ANIM constant usage 2023-08-04 16:27:45 -04:00
GriffinR
14f7e49099 Add some missing palette macro use 2023-05-25 15:09:16 -04:00
Eduardo Quezada
079ca8ab29 Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification 2023-02-24 07:53:02 -03:00
GriffinR
0cc10a1ada Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -05:00
Eduardo Quezada
7327be6f9e Made Types and Egg Groups into arrays 2022-11-22 17:05:25 -03:00
Eduardo Quezada
3ed485632f Renamed gBaseStats to gSpeciesInfo 2022-10-24 17:01:48 -03:00
Eduardo Quezada
65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
GriffinR
a28fbbc1b8 Merge pull request #1748 from GriffinRichards/fix-judgement
Standardize judgement vs judgment spelling
2022-09-01 11:51:04 -04:00
Eduardo Quezada
1c8d3a4922 Removed unnecessary parenthesis 2022-08-27 11:19:50 -04:00
Eduardo Quezada
1f0a952546 Usage of BATTLE_OPPOSITE 2022-08-27 01:44:39 -04:00
Eduardo Quezada
15d611ba65 Usage of BATTLE_PARTNER 2022-08-27 01:26:13 -04:00
GriffinR
8a1130d046 Missing constant in friendshiptodamagecalculation 2022-08-25 10:21:41 -04:00
GriffinR
261b0ff118 Standardize judgement vs judgment spelling 2022-08-20 22:58:46 -04:00
Martin Griffin
d57442a511 Decimal paletteNums 2022-08-19 17:05:22 +01:00
Martin Griffin
6fed961ed6 Write palette IDs in hex 2022-08-19 15:29:35 +01:00
GriffinR
63468f9fcb Add some missing battle arena constants 2022-08-11 12:02:56 -04:00