Commit Graph

7536 Commits

Author SHA1 Message Date
GriffinR
797aa08141
Merge pull request #1764 from AsparagusEduardo/pret/battlerMacros
Further uses of GET_BATTLER_SIDE macros'
2022-09-03 01:04:55 -04:00
Eduardo Quezada
41bf6bde25 Removed pointless macro 2022-09-03 00:28:53 -04:00
Eduardo Quezada
790bdd69f8 Using GET_BATTLER_SIDE and GET_BATTLER_SIDE2 2022-09-03 00:28:32 -04:00
GriffinR
97021baec6 Drop usage of global directive 2022-09-02 21:53:44 -04:00
GriffinR
8b7230c3c4 CpuFastFill -> CpuFastFill16 in fieldmap 2022-09-02 19:41:28 -04:00
GriffinR
7f1c4720a2 Update arguments for ApplyGlobalTintToPaletteSlot 2022-09-02 19:36:46 -04:00
GriffinR
03a98c72bc Sync fieldmap 2022-09-02 19:29:35 -04:00
GriffinR
ff53a553bc
Merge pull request #1761 from AsparagusEduardo/pret/tmFlagNames
Renamed TM flags to keep consistency with the rest of the repo
2022-09-02 17:09:49 -04:00
Eduardo Quezada
c7fc2e13f7 Renamed TM flags to keep consistency with the rest of the repo 2022-09-02 16:54:58 -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
GriffinR
d211adbc77
Merge pull request #1760 from LOuroboros/bermuda
Updated a couple of sizeofs in src/battle_pyramid_bag.c
2022-09-01 11:42:09 -04:00
LOuroboros
5d346fd939 Updated a couple more sizeofs 2022-08-31 23:49:43 -03:00
GriffinR
b66de1f056
Merge pull request #1759 from LOuroboros/pyramidSchemes
Automatized the contents of some sideof in src/item.c
2022-08-31 22:14:06 -04:00
LOuroboros
ea345f90f5 Picked the correct pointers for correctness' sake 2022-08-31 23:06:20 -03:00
LOuroboros
e02b33ee11 Automatized the contents of some sideof in src/item.c 2022-08-31 23:00:24 -03:00
GriffinR
0a2ac61b0f
Merge pull request #1757 from AsparagusEduardo/pret_clean2
Cleanup based on previous PRs
2022-08-27 11:40:33 -04:00
Eduardo Quezada
1c8d3a4922 Removed unnecessary parenthesis 2022-08-27 11:19:50 -04:00
Eduardo Quezada
99fbad92e2 IS_BATTLER_OF_TYPE 2022-08-27 02:50:55 -04:00
Eduardo Quezada
866d916f2f SpriteTemplate formatting 2022-08-27 02:07:58 -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
Eduardo Quezada
6c457f42af Corrected uses of GetBattlerSide 2022-08-27 00:59:12 -04:00
Eduardo Quezada
0a34d47041 Merge remote-tracking branch 'pret/master' into pret_clean2 2022-08-27 00:56:00 -04:00
Eduardo Quezada
481210b7f3 Missing uses of MAX_SPRITES 2022-08-27 00:54:30 -04:00
GriffinR
8aead3b4c8
Merge pull request #1747 from GriffinRichards/contest-ai-bug
Incorporate commented bug fixes in contest AI scripts
2022-08-26 23:53:44 -04:00
GriffinR
578064d799 Add missing use of METATILE_ROW_WIDTH 2022-08-26 15:23:54 -04:00
GriffinR
0516f94837
Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore
Added constants for GetLeadMonFriendshipScore
2022-08-26 14:52:10 -04:00
GriffinR
c5e873aa2b
Merge pull request #1742 from GriffinRichards/sound-pan
Add missing usage of SOUND_PAN_*
2022-08-26 14:47:24 -04:00
GriffinR
005c46f0da
Merge pull request #1754 from AsparagusEduardo/pret_citySigns
Corrected Oldale Town Sign labels
2022-08-25 22:09:56 -04:00
Eduardo Quezada
6fb4da68f3 Corrected Oldale Town Sign labels 2022-08-25 22:00:24 -04:00
GriffinR
ce4a6e9067 MAP_NONE -> MAP_DYNAMIC 2022-08-25 21:34:05 -04:00
LOuroboros
23bf67c63f Removed unnecessary inclusion of header in src/field_specials.c 2022-08-25 11:43:01 -03:00
LOuroboros
11d6ae4820 Renamed the GetLeadMonFriendshipScore constants 2022-08-25 11:34:37 -03:00
GriffinR
8a1130d046 Missing constant in friendshiptodamagecalculation 2022-08-25 10:21:41 -04:00
LOuroboros
1f4ef2a0fb Added constants for GetLeadMonFriendshipScore 2022-08-25 10:40:56 -03:00
GriffinR
32ea55dcba
Merge pull request #1752 from LOuroboros/patch-4
Re-aligned READ_PTR_FROM_TASK's 2nd line EoL
2022-08-24 17:08:15 -04:00
GriffinR
8cc520ccd7
Merge pull request #1751 from LOuroboros/patch-3
Fixed KeyInterCB_DeferToEventScript comment
2022-08-24 17:07:59 -04:00
GriffinR
eecf968390
Merge pull request #1750 from LOuroboros/patch-2
Fixed switch syntax in Task_TryFieldPoisonWhiteOut
2022-08-24 17:07:17 -04:00
LOuroboros
015961c00a
Re-aligned READ_PTR_FROM_TASK's 2nd line EoL 2022-08-24 17:19:24 -03:00
LOuroboros
3a65529293
Fixed KeyInterCB_DeferToEventScript comment 2022-08-24 17:12:59 -03:00
LOuroboros
90f72a745a
Fixed switch syntax in Task_TryFieldPoisonWhiteOut 2022-08-24 17:01:36 -03:00
GriffinR
3771abbe08 Fix names and constant usage for union room classes 2022-08-23 12:44:07 -04:00
GriffinR
8a8ba92f21 Revert COMMON wildcards 2022-08-22 19:04:47 -04:00
Martin Griffin
f4a2040843 Options menu: cleanup 2022-08-22 08:38:06 +01: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
Martin Griffin
2aa821176b Options menu: sort #includes 2022-08-21 15:06:05 +01:00
Martin Griffin
ba6d4866e4 Options menu: standardize task data 2022-08-21 15:05:57 +01:00
GriffinR
30906762ed
Merge pull request #1740 from AsparagusEduardo/pret_stringTabs
Fixed inconsistent use of white space for scripts, .c files and .h files.
2022-08-20 23:03:59 -04:00
GriffinR
261b0ff118 Standardize judgement vs judgment spelling 2022-08-20 22:58:46 -04:00
GriffinR
9e175a1037
Merge pull request #1735 from GriffinRichards/arena-const
Add some missing battle arena constants
2022-08-20 22:54:32 -04:00