Hedara
|
726f18f360
|
Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
asm/macros/event.inc
data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
data/scripts/trainer_hill.inc
include/graphics.h
|
2025-06-24 10:42:24 +02:00 |
|
DizzyEggg
|
e1b83d6056
|
Match graphics declarations with externs (#2089)
|
2025-06-23 20:31:18 +01:00 |
|
Pablo Pena
|
e449a612f5
|
fix: use BackPickId to calculate player intro ball throw animation palette (#7193)
|
2025-06-23 19:45:12 +02:00 |
|
Eduardo Quezada
|
a75a49710f
|
Fixed debug flag menu sound (#7190)
|
2025-06-23 15:46:49 +02:00 |
|
psf
|
456a8f6aa0
|
Update the description of OW_OBJECT_VANILLA_SHADOWS (#7184)
|
2025-06-23 15:40:13 +02:00 |
|
i0brendan0
|
0ccf797cce
|
Fixes Roamers not saving shininess (#7185)
|
2025-06-23 15:05:01 +02:00 |
|
Alex
|
753eb9f8d8
|
Fixes Enigma, Kee and Maranga Berry activation timing (#7171)
|
2025-06-23 13:47:26 +02:00 |
|
DizzyEggg
|
7fdc5a45b6
|
force RHH Rom Header to always be present (#7187)
|
2025-06-23 10:38:03 +02:00 |
|
DizzyEggg
|
0dae2cea28
|
force sGFRomHeader to always be present (#7186)
|
2025-06-23 10:37:49 +02:00 |
|
grintoul
|
6c6daa8b9c
|
Fixes Rapid Spin description (#7178) (#7181)
|
2025-06-23 10:02:51 +02:00 |
|
GriffinR
|
4ce83c7d96
|
Merge pull request #2104 from GriffinRichards/fix-collision-comparison
Fix collision comparison in PlayerNotOnBikeMoving
|
2025-06-22 20:05:30 -04:00 |
|
GriffinR
|
f029fc5eac
|
Merge pull request #2156 from DizzyEggg/temps
Fix wrong keep temps files directory in makefile
|
2025-06-22 19:54:58 -04:00 |
|
DizzyEggg
|
53f8ae11ff
|
Move gTradePlatform_Tilemap to header (#2088)
|
2025-06-22 19:48:37 -04:00 |
|
DizzyEggg
|
01fc7e76ef
|
Fix wrong keep temps files directory in makefile
|
2025-06-22 11:26:31 +02:00 |
|
PhallenTree
|
98670ca30e
|
Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170)
|
2025-06-21 00:04:01 +02:00 |
|
GriffinR
|
e2e3438674
|
Add missing uses of LOCALID_NONE for trainerbattle
|
2025-06-20 15:33:12 -04:00 |
|
Eduardo Quezada
|
8edb736429
|
Spruce up FEATURES.md (#7159)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-06-20 05:44:55 -07:00 |
|
hedara90
|
009a47a5dc
|
Fixed Battle Pyramid mon generation (#7146)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-20 13:19:24 +02:00 |
|
hedara90
|
c7e744d713
|
Pret merge (19th of June, 2025) (#7163)
|
2025-06-20 10:07:14 +02:00 |
|
Bassoonian
|
24fdac662e
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
|
2025-06-19 14:32:23 +02:00 |
|
Alex
|
57feee3743
|
Add missing flag for Berserk Gene (#7151)
|
2025-06-19 14:26:28 +02:00 |
|
allcontributors[bot]
|
4a80caf8cd
|
add poetahto as a contributor for code (#7162)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-06-18 21:23:27 -07:00 |
|
allcontributors[bot]
|
a996525bdd
|
add lordraindance2 as a contributor for code (#7161)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
|
2025-06-18 21:06:45 -07:00 |
|
Bivurnum
|
12b2a29607
|
Bug fix: clear follower npc surf blob on white out (#7153)
|
2025-06-18 22:50:55 +02:00 |
|
Eduardo Quezada
|
8a0bc495d5
|
Fixed description of FORM_CHANGE_WITHDRAW (#7152)
|
2025-06-18 22:09:59 +02:00 |
|
ghoulslash
|
a154d7a7a4
|
Fix savage spin out spider web template (#7137)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-06-18 11:04:24 +02:00 |
|
Eduardo Quezada
|
9adb84b2d0
|
Fixed KNOWN_FAILING Tera test (#6949)
|
2025-06-18 11:00:42 +02:00 |
|
Eduardo Quezada
|
0dc01f244e
|
Fixed Aura Wheel KNOWN_FAILING test (#7135)
|
2025-06-17 20:48:03 +02:00 |
|
psf
|
75fe3e7da6
|
Fixed typo in sMoveRelearnerMenuState (#2155)
|
2025-06-17 15:38:33 +01:00 |
|
allcontributors[bot]
|
e7b9372662
|
add fakuzatsu as a contributor for code (#7136)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
|
2025-06-17 13:47:57 +01:00 |
|
hedara90
|
2e50314fb2
|
Applied Kasen's documentation improvements (#7104)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-16 13:38:49 +02:00 |
|
hedara90
|
981aa3ee7c
|
Use RGB values for DEFAULT_LIGHT_COLOR (#7133)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-16 13:38:07 +02:00 |
|
Pawkkie
|
283bf68ff9
|
Fix incorrect function parameters used in AI damage calc (#7130)
|
2025-06-16 07:59:30 +02:00 |
|
hedara90
|
b2a0107a68
|
Test runner fixes (#7100)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-15 12:02:29 +02:00 |
|
cawtds
|
3491cd95e8
|
Fix sell price display (#7123)
|
2025-06-15 11:52:51 +02:00 |
|
Bivurnum
|
459946ac9a
|
Bug fix: Follower NPC no longer retains bike sprite after white out (#7120)
|
2025-06-15 11:10:32 +02:00 |
|
GriffinR
|
bfa3e4a07b
|
Merge pull request #2145 from abaresk/remove-berryfix
Remove berry yield bug fix
|
2025-06-15 00:41:33 -04:00 |
|
hedara90
|
cb331aa133
|
Fix typo in INSTALL.md (#7116)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-14 14:29:09 +02:00 |
|
Alex
|
c6b4118c3c
|
Added AI_FLAG_PP_STALL_PREVENTION to AI_FLAG_SMART_TRAINER (#7112)
|
2025-06-14 11:06:23 +02:00 |
|
GriffinR
|
5a3fc2a61b
|
Merge pull request #2154 from DizzyEggg/patch-1
Fix AnimItemSteal_Step3 and AnimKnockOffOpponentsItem matches
|
2025-06-13 11:28:26 -04:00 |
|
DizzyEggg
|
1cc4321a42
|
Fix AnimItemSteal_Step3 and AnimKnockOffOpponentsItem matches
|
2025-06-13 16:45:24 +02:00 |
|
Alex
|
c120fa71dc
|
Fixes Ally Switch in multi battles (#7109)
|
2025-06-13 15:18:27 +02:00 |
|
PhallenTree
|
a000a743df
|
Fix typos and some cleanup (mainly in battle files) (#7107)
|
2025-06-13 14:12:13 +02:00 |
|
Eduardo Quezada
|
6cb5016113
|
Fixed potential mismatch between players and battlers in tests (#7101)
|
2025-06-12 19:46:03 +02:00 |
|
Eduardo Quezada
|
393bed069a
|
Wrote some missing tests (#7094)
|
2025-06-11 09:13:37 +02:00 |
|
psf
|
7ef781e9e0
|
Update CREDITS.md with correct line placement (#7096)
|
2025-06-10 19:38:55 +02:00 |
|
allcontributors[bot]
|
7514ed5efb
|
add Emiliasky as a contributor for test (#7082)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-06-10 05:52:48 -07:00 |
|
hedara90
|
0834d9d80b
|
Added loop iterator style (#7092)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-09 13:52:37 -07:00 |
|
GriffinR
|
ec6e85d4b4
|
Merge pull request #2151 from ghoulslash/pret/repeatparticlefix
Fix Repeat Ball Particle Animation Sprite Count
|
2025-06-09 16:43:57 -04:00 |
|
ghoulslash
|
96844bd3bb
|
fix sprite count in RepeatBallOpenParticleAnimation
|
2025-06-09 16:19:25 -04:00 |
|