LOuroboros
c267c615c1
Fixed CanFling
2022-10-22 10:38:39 -03:00
BuffelSaft
6035c5a280
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-10-22 14:31:13 +13:00
Eduardo Quezada
0a79390ec0
Primal Reversion in Form Change tables
2022-10-21 02:08:37 -03:00
Eduardo Quezada
861590f747
Form change when fainting. Goodbye UndoFormChange!
2022-10-20 18:53:12 -03:00
Eduardo Quezada
d8cc7f7abe
Form change when switching out
2022-10-20 17:56:56 -03:00
Eduardo Quezada
b74f0777da
Renamed form change constants
2022-10-20 17:22:58 -03:00
Eduardo Quezada
ff494edb85
Refactored ItemUseOutOfBattle_FormChange to not use secondaryId
2022-10-20 16:57:34 -03:00
Eduardo Quezada
620e69945d
Form change for starting and ending battles. Adjusted PP for Iron Head/Behemoth moves
2022-10-20 16:40:24 -03:00
GriffinR
e752c8a2f9
Merge pull request #1805 from tustin2121/tustin2121-patch-runimmedeately
...
Document seldom-used trigger functionality
2022-10-20 11:45:35 -04:00
Eduardo Quezada D'Ottone
18e7fc5efc
Introduce NUM_BATTLE_SIDES
2022-10-20 08:41:18 -03:00
GriffinR
3e8baa5b04
Merge branch 'master' into porymap-5
2022-10-18 22:54:25 -04:00
GriffinR
a418f8d976
Merge pull request #1755 from GriffinRichards/map-dynamic
...
Rename special map constants, treat warp ids as strings
2022-10-18 22:45:56 -04:00
tustin2121
4730870646
VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY
...
Getting rid of the VAR_ prefix, to avoid the porymap problem.
2022-10-18 21:12:31 -04:00
ghoulslash
e1021af6bd
fix MapHasNoEncounterData
2022-10-18 20:37:33 -04:00
GriffinR
e33581ff9c
Merge pull request #1671 from sphericalice/heal-location-none
...
Add the HEAL_LOCATION_NONE constant
2022-10-18 18:41:04 -04:00
Abaresk
7f09894045
Merge branch 'master' into thunder
2022-10-18 04:37:56 +00:00
Marcus Huderle
0d0a9bd31d
Update src/overworld.c
...
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
2022-10-17 17:41:27 -07:00
Marcus Huderle
48ab684b48
Fix weather color map documentation
2022-10-17 17:41:27 -07:00
GriffinR
716025395c
Merge pull request #1802 from abaresk/wild-encounters
...
Document new metatile wild encounter odds
2022-10-17 18:56:58 -04:00
Eduardo Quezada D'Ottone
c57ab9e529
Merge pull request #2392 from gruxor/wait-fix
...
Replaced busy-wait loops
2022-10-17 15:34:22 -03:00
gruxor
610a8efb7d
Replaced busy-wait loops
2022-10-17 11:21:06 -04:00
ghoulslash
7431044da1
dont open dexnav from start menu if map has no encounters
2022-10-17 09:19:41 -04:00
ghoulslash
4775e0372a
merge w pret
2022-10-17 09:06:27 -04:00
tustin2121
327c648e87
Document seldom-used trigger functionality
...
Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.
2022-10-16 20:46:50 -04:00
Eduardo Quezada D'Ottone
1607291982
Implemented Honey's Sweet Scent functionality
2022-10-16 20:20:13 -03:00
ghoulslash
ede6162724
Merge pull request #2388 from AsparagusEduardo/RHH/pr/running
...
Config for running indoors
2022-10-16 09:28:32 -04:00
Eduardo Quezada D'Ottone
dd2d6107bd
Fixed Z-Move not being cleared if Pokémon faints
2022-10-16 09:57:21 -03:00
Ariel A
e32232f9e8
Merge branch 'followers' into lighting
2022-10-15 15:16:45 -04:00
Ariel A
f970057930
Fixed field_poison.c error from master merge.
2022-10-15 15:06:53 -04:00
Abaresk
e67d55bfc4
Fix names
2022-10-15 13:37:24 +00:00
Abaresk
b538239f18
Add more documentation to thunder weather
2022-10-15 04:25:35 +00:00
Eduardo Quezada D'Ottone
4cbc6d4de1
Config for running indoors
2022-10-14 22:31:45 -03:00
LOuroboros
8a1a561b80
Uncommented evo moves for each species
2022-10-14 11:28:15 -03:00
ghoulslash
d64e18d0b4
Merge pull request #2385 from LOuroboros/trainerClassBasedBalls
...
Added class-based Poké Balls for trainers
2022-10-14 10:19:20 -04:00
LOuroboros
90f79999bb
Added class-based Poké Balls for trainers
...
Thanks to Ghoulslash for helping me optimizing things.
2022-10-14 11:14:30 -03:00
GriffinR
2e128e3282
Merge pull request #1799 from AsparagusEduardo/pret/pr/recordedInvalid
...
Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID
2022-10-13 14:30:18 -04:00
GriffinR
722e501b7c
Merge pull request #1800 from AsparagusEduardo/pret/pr/gSoftResetDisabled
...
Documented missing gSoftResetDisabled uses
2022-10-13 14:29:43 -04:00
Eduardo Quezada D'Ottone
71dad6aec9
Merge pull request #2384 from May8th1995/confuseAI
...
Fix AI issue giving decrementing score to confuse hit instead of confuse
2022-10-13 12:16:00 -03:00
tennis
db013aab0b
Fix AI issue giving decrementing score to confuse hit instead of confuse
2022-10-13 15:58:57 +01:00
tennis
f79205af08
Fix bug where badge boost flag is inverted
2022-10-13 15:32:08 +01:00
Abaresk
af081b08ee
Make related func names more concise
2022-10-12 04:35:23 +00:00
Abaresk
11e3f03bd8
Document new metatile wild encounter odds
2022-10-12 04:03:02 +00:00
GriffinR
60e1ad20e4
Add NUM_MON_PIC_FRAMES, and trainer pic size constants
2022-10-10 23:16:08 -04:00
Kurausukun
dc97eca92d
combine "unused" field into tile buffer
2022-10-10 21:00:31 -04:00
GriffinR
bd023b1c6c
Merge pull request #1796 from GriffinRichards/tilesets-c
...
Convert tilesets.s to C
2022-10-10 12:47:47 -04:00
GriffinR
65d3944a93
Give tileset palettes proper type, name compressed secret base tiles
2022-10-08 02:02:12 -04:00
Ariel A
3a86c8bd4c
Merge branch 'followers' into lighting
2022-10-07 21:08:06 -04:00
Ariel A
1c011a9c1c
Merge branch 'master' into followers
2022-10-07 20:52:15 -04:00
Eduardo Quezada D'Ottone
2ce340e8e1
Merge pull request #2262 from LOuroboros/becomingAHero
...
Fixed Mega Evolved Pokémon being able to get Friendship effects in battle
2022-10-07 18:27:29 -03:00
LOuroboros
589c969e89
Removed unused access to struct MegaEvolutionData in GetBattlerFriendshipScore
2022-10-07 18:20:00 -03:00
