Commit Graph

11502 Commits

Author SHA1 Message Date
GriffinR
f695ddd1ba Ignore new Porymap config 2022-09-25 18:34:07 -04:00
Eduardo Quezada
057f76bfe6 Cleaned up missing JOY macros 2022-09-25 13:05:18 -03:00
Eduardo Quezada
f969effd36 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925 2022-09-25 12:51:39 -03:00
Eduardo Quezada D'Ottone
2a02cefc81
Merge pull request #2358 from LOuroboros/PeeCee
Fixed IsPlayerInFrontOfPC
2022-09-25 08:36:43 -03:00
Eduardo Quezada D'Ottone
3b983aae14
Apply suggestions from code review 2022-09-25 08:31:24 -03:00
LOuroboros
a9ab3286ef Fixed IsPlayerInFrontOfPC 2022-09-25 05:51:08 -03:00
GriffinR
4579efe4c7
Merge pull request #1790 from AsparagusEduardo/pret/pr/namingScreenGender
Gender icon in naming screen based on Pokémon name length
2022-09-24 23:27:40 -04:00
Eduardo Quezada
0f35f080ec Gender icon in naming screen based on Pokémon name length 2022-09-24 23:48:24 -03:00
Eduardo Quezada D'Ottone
b8aa34af81
Merge pull request #2357 from LOuroboros/patch-2
Update field_specials.c
2022-09-24 22:35:58 -03:00
LOuroboros
8e9bfda120
Update field_specials.c 2022-09-24 22:22:18 -03:00
Eduardo Quezada D'Ottone
13573b6e53
Merge pull request #2356 from LOuroboros/PeeC
Modified the debug menu's PC access
2022-09-24 22:18:21 -03:00
LOuroboros
00eb67608a Small tweak to the new check in PCTurnOffEffect 2022-09-24 22:10:46 -03:00
GriffinR
d8b3919063 Ignore Porymap's prefabs file 2022-09-24 18:27:53 -04:00
LOuroboros
5500e64a71 Reworked the debug menu's PC access 2022-09-24 17:26:41 -03:00
Eduardo Quezada D'Ottone
e950da02f3
Merge pull request #2121 from LOuroboros/teleport
Updated Teleport
2022-09-24 14:53:45 -03:00
Eduardo Quezada D'Ottone
17c8842ad4
Merge branch 'dev' into teleport 2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone
38df216ebd
Merge pull request #2355 from ghoulslash/be/aiparty
Add overwrittenAbilities field
2022-09-24 14:33:02 -03:00
Eduardo Quezada D'Ottone
0f743c4f00
Merge pull request #2117 from AgustinGDLV/symbiosis
ABILITY_SYMBIOSIS
2022-09-24 14:30:39 -03:00
Eduardo Quezada D'Ottone
0fa8e20d08
Style changes from upstream 2022-09-24 14:20:07 -03:00
ghoulslash
c22671d2a2 add overwrittenAbilities field 2022-09-24 12:12:31 -04:00
Eduardo Quezada D'Ottone
a483899043
Merge branch 'dev' into symbiosis 2022-09-24 11:58:35 -03:00
Eduardo Quezada D'Ottone
ba9f085782
Merge pull request #2230 from DizzyEggg/AI
AI remembers Party mons
2022-09-24 11:36:25 -03:00
Eduardo Quezada D'Ottone
d59d8b92af
Merge branch 'dev' into AI 2022-09-24 11:07:09 -03:00
Eduardo Quezada D'Ottone
bb564d805f
Merge pull request #2353 from LOuroboros/siTypes
Fixed Z-Moves showing the wrong type in battle
2022-09-24 10:36:38 -03:00
Eduardo Quezada D'Ottone
6bf794eb1c
Merge pull request #2350 from LOuroboros/yagami
Fixed Light That Burns The Sky's animation
2022-09-24 09:44:39 -03:00
LOuroboros
696d90880e Made Z-Moves always show the right type 2022-09-24 09:33:31 -03:00
LOuroboros
c64593cb9c Fixed LTBTS's animation 2022-09-24 09:04:15 -03:00
Eduardo Quezada D'Ottone
88f22e92ff
Merge pull request #2349 from LOuroboros/patch-2
Updated IsViableZMove
2022-09-24 08:57:57 -03:00
LOuroboros
64405250ae
Updated IsViableZMove 2022-09-24 08:50:48 -03:00
GriffinR
9b6b164aad
Merge pull request #1768 from SBird1337/feature/mgba-print
[debug] add support for mgba printf
2022-09-23 13:49:48 -04:00
sbird
343d7f7d26 [debug] do not use heap allocation for MgbaPrintf 2022-09-23 04:12:57 +02:00
sbird
12670e8e3e [debug] simplify macros, add EX versions 2022-09-23 03:48:58 +02:00
sbird
22329d3318 [debug] use boolean constants for nStopProgram 2022-09-23 03:23:44 +02:00
sbird
44a5a8d31e [debug] fix AGBAssert for AGBPrintf debug block 2022-09-23 03:22:57 +02:00
GriffinR
ad9247439c
Merge pull request #1788 from AsparagusEduardo/pret/pr/newKeys
Added missing uses of JOY_xx macros
2022-09-22 20:50:19 -04:00
Eduardo Quezada
7e112b0f0d Added missing uses of JOY_xx macros 2022-09-22 21:43:33 -03:00
GriffinR
1107ff954d Clean up shop.c 2022-09-22 15:08:17 -04:00
GriffinR
d79252aa7f
Merge pull request #1784 from AsparagusEduardo/pret/pr/FrontierPartySize
Altered MAX_FRONTIER_PARTY_SIZE to be automatically calculated by the other frontier party sizes
2022-09-22 12:19:05 -04:00
GriffinR
b8341558c3
Merge pull request #1779 from GriffinRichards/sync-fld-weather
Add misc constant usage to field_weather_effect
2022-09-22 12:13:07 -04:00
GriffinR
9bcc36fe08
Merge pull request #1767 from GriffinRichards/trainer-pals
Generate trainer pic palettes from image
2022-09-22 11:34:03 -04:00
GriffinR
e74fa7b8c0
Merge pull request #1785 from AsparagusEduardo/pret/pr/malloc
Removed unnecessary malloc.h macros
2022-09-22 11:25:06 -04:00
Eduardo Quezada D'Ottone
29c3f57772
Merge pull request #2343 from StubbornOne/GetAiLogicData
Replace battle-type flags in GetAiLogicData with BATTLE_TYPE_HAS_AI
2022-09-21 12:54:13 -03:00
StubbornOne
cad8922d7b Replace battle-type flags in GetAiLogicData with BATTLE_TYPE_HAS_AI 2022-09-21 23:42:40 +08:00
Eduardo Quezada D'Ottone
5261645c7e
Merge pull request #2340 from LOuroboros/patch-2
Update debug.c
2022-09-20 06:33:29 -03:00
LOuroboros
d04a852e91
Update debug.c 2022-09-20 02:31:20 -03:00
Eduardo Quezada D'Ottone
24aebf0624
Merge pull request #2337 from LOuroboros/patch-2
Renamed some misclassified labels in src/debug.c
2022-09-19 14:33:51 -03:00
Eduardo Quezada D'Ottone
6868d8aa2a
Merge pull request #2338 from LOuroboros/BoxMonMon
Fixed typo in BoxMonKnowsMove
2022-09-19 14:33:12 -03:00
Eduardo Quezada
192312d7ee Extrapolated Battle Arena's move Mind ratings 2022-09-19 14:29:22 -03:00
Eduardo Quezada D'Ottone
6e0481e723
Merge pull request #2336 from ghoulslash/be/aiswitch
fix natural cure, shed skin, early bird check in ShouldSwitchIfGameSt…
2022-09-19 12:10:38 -03:00
LOuroboros
5f67335212 Fixed typo in BoxMonKnowsMove 2022-09-19 05:21:54 -03:00