Eduardo Quezada
e4a439aa46
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
...
# Conflicts:
# src/data/bard_music/moves.h
# src/data/bard_music/pokemon.h
2022-10-30 12:30:38 -03:00
GriffinR
c76beed989
Merge pull request #1807 from pret/porymap-5
...
Update for Porymap 5.0.0
2022-10-30 11:01:37 -04:00
GriffinR
01c71b4ce1
Fix more text and movements labeled as scripts
2022-10-30 03:27:28 -04:00
GriffinR
f439a2dee7
Fix EventScript_WroteSecretCodeLockOpened typo
2022-10-30 03:14:47 -04:00
GriffinR
b035fc1f42
Merge pull request #1811 from AsparagusEduardo/pret/pr/BardSounds
...
Cleaned up Bard Sounds
2022-10-27 14:01:48 -04:00
Eduardo Quezada
85c0d2dac8
Review changes
2022-10-27 11:26:09 -03:00
Eduardo Quezada D'Ottone
93dd8786ee
Merge pull request #2413 from kaisermg5/fix_tmhm_lock
...
Fix lock when teaching a TM/HM after learning a move by level up.
2022-10-26 22:27:19 -03:00
kaisermg5
2cd0a0f862
Fix lock when teaching a TM/HM after learning a move by level up.
2022-10-25 18:48:06 -03:00
Eduardo Quezada
85ce30b1d6
Created macros for Bard Sounds
2022-10-25 14:33:02 -03:00
GriffinR
cc182bf05e
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Marcus Huderle
ae6ec3b1b8
Change cleanString() to convert invalid chars to underscores
2022-10-22 15:09:37 -05:00
Eduardo Quezada D'Ottone
449f4c0caa
Merge pull request #2408 from LOuroboros/patch-1
...
Fixed CanFling
2022-10-22 10:46:11 -03:00
LOuroboros
c267c615c1
Fixed CanFling
2022-10-22 10:38:39 -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
GriffinR
fad92ec906
Merge pull request #1803 from abaresk/thunder
...
Add more documentation to thunder weather effect
2022-10-20 11:36:10 -04: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
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
Eduardo Quezada D'Ottone
ffc5ffcfe5
Merge pull request #2390 from ghoulslash/be/psychocut
...
Improve psycho cut anim
2022-10-17 00:41:01 -03:00
ghoulslash
a585d56053
fix whitespace
2022-10-16 23:39:12 -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
ghoulslash
71023512fd
update psycho cut anim
2022-10-16 19:20:24 -04:00
ghoulslash
ede6162724
Merge pull request #2388 from AsparagusEduardo/RHH/pr/running
...
Config for running indoors
2022-10-16 09:28:32 -04:00
ghoulslash
e3f37ad825
Merge pull request #2389 from AsparagusEduardo/RHH/pr/FixZMove
...
Fixed Z-Move not being cleared if Pokémon faints
2022-10-16 09:27:23 -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
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
Eduardo Quezada D'Ottone
068422bc3f
Merge pull request #2386 from LOuroboros/patch-1
...
Uncommented evo moves for each species
2022-10-14 12:00:56 -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
Eduardo Quezada D'Ottone
839d7063fe
Merge pull request #2383 from May8th1995/badgeFlagBug
...
Fix bug where badge boosts apply in all gens but gen 3.
2022-10-13 11:45:18 -03:00
tennis
f79205af08
Fix bug where badge boost flag is inverted
2022-10-13 15:32:08 +01:00
GriffinR
a10ec0487e
Color rotating gate pngs
2022-10-12 19:19:42 -04: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
bbb4ee32ca
Merge pull request #1801 from Kurausukun/storage_struct
...
Combine "Unused" Field into Tile Buffer
2022-10-10 21:10:25 -04:00
Kurausukun
dc97eca92d
combine "unused" field into tile buffer
2022-10-10 21:00:31 -04:00
