AlexOn1ine
|
0fc3ef056a
|
27/02/26 Master to upcoming merge
|
2026-02-27 23:53:24 +01:00 |
|
Bassoonian
|
d7106b7ef1
|
Regularise switch indentation (#9368)
|
2026-02-27 15:54:21 +01:00 |
|
Bassoonian
|
de6947a6e5
|
Fix spacing for conditions (#9369)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-02-27 15:10:52 +01:00 |
|
FosterProgramming
|
5b8a6c614e
|
Fix mapjson error with layouts missing layout_version key (#9374)
|
2026-02-27 12:31:22 +00:00 |
|
Bassoonian
|
080274645c
|
Cleans up unused String IDs and EWRAM variables (#9363)
|
2026-02-27 13:21:31 +01:00 |
|
Bassoonian
|
3c805a030b
|
Fix tabs in C/H files (#9364)
|
2026-02-27 13:12:41 +01:00 |
|
FosterProgramming
|
edc164e247
|
Add red and leaf icons to frlg map (#9357)
|
2026-02-27 11:24:16 +00:00 |
|
Alex
|
893563a2d5
|
Pret merge, 26th of February (#9362)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Frank <fdeblasio1004@gmail.com>
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
Co-authored-by: Frank DeBlasio <35279583+fdeblasio@users.noreply.github.com>
Co-authored-by: Kildemal <206095739+izrofid@users.noreply.github.com>
Co-authored-by: Marky <143505183+HashtagMarky@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
|
2026-02-26 20:25:28 +01:00 |
|
psf
|
59776b997b
|
Adds a warning when trainer is invalid (#9195)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2026-02-26 19:55:07 +01:00 |
|
Alex
|
3bb1b3502a
|
Fix illegal switch due to hazards (#9361)
|
2026-02-26 08:00:41 -08:00 |
|
Hedara
|
4dba49657a
|
Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
data/battle_anim_scripts.s
src/battle_anim_water.c
src/event_object_movement.c
src/field_player_avatar.c
|
2026-02-26 15:33:26 +01:00 |
|
FosterProgramming
|
cbe2cfbd8e
|
Merge metatile labels files (#9351)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-02-26 11:44:42 +01:00 |
|
GGbond
|
217b6d6da2
|
Fix Paradox stat selection under Wonder Room (#9356)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2026-02-26 11:41:52 +01:00 |
|
luuma
|
cabbc632fd
|
Fixes plasma fists and several let's go and max move effects which should occur even when fainting a foe (#9262)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2026-02-25 21:46:22 +01:00 |
|
FosterProgramming
|
e5b2492b8d
|
createmon uses enum Pokeball instead of Item (#9281)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2026-02-25 21:10:57 +01:00 |
|
FosterProgramming
|
cc69e60559
|
Fix trainer sprite no reshowing properly in safari battle (#9353)
|
2026-02-25 20:26:11 +01:00 |
|
FosterProgramming
|
a3f53bc66c
|
Set var facing on all interactions (#9330)
|
2026-02-25 20:06:30 +01:00 |
|
Linathan
|
a635ac599d
|
Zen Mode Fix: Removes start battle form change and adds switch-out form change (#9304)
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
|
2026-02-25 19:35:16 +01:00 |
|
FosterProgramming
|
6ac7540d3b
|
Fix special vars in frlg ingame trade (#9328)
|
2026-02-25 18:51:15 +01:00 |
|
Bassoonian
|
9d2023e34b
|
Clean up `reshow_battle_screen.c` (#9352)
|
2026-02-25 18:18:38 +01:00 |
|
FosterProgramming
|
18acbf853d
|
Redraw money box after multi choice in bike shop script (#9331)
|
2026-02-25 17:27:38 +01:00 |
|
FosterProgramming
|
47ee107f34
|
Fix floor menu in frlg elevator showing wrong values (#9350)
|
2026-02-25 17:24:37 +01:00 |
|
FosterProgramming
|
dc3dd0273c
|
Add original frlg safari zone menu and fix initial step counter (#9340)
|
2026-02-25 15:22:08 +01:00 |
|
FosterProgramming
|
91a1278934
|
Fix region text when looking at map in frlg (#9347)
|
2026-02-25 15:19:09 +01:00 |
|
hedara90
|
34d40b9ce5
|
Temporary fix to sprite data corruption during multi-faint (#9332)
|
2026-02-25 14:11:50 +00:00 |
|
grintoul
|
d7dcf2d509
|
Fixes post-KO animation assertf trigger caused by OOB battler number (#9343)
|
2026-02-25 15:10:03 +01:00 |
|
FosterProgramming
|
d56112cd78
|
Fix frlg coinbox window (#9336)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-02-25 08:17:46 +00:00 |
|
hedara90
|
abc3ca74f5
|
Fix messed up palettes during battle intro (#9333)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2026-02-25 07:42:47 +00:00 |
|
FosterProgramming
|
06aeabce5b
|
Fix ss anne disappearing early (#9334)
|
2026-02-25 07:25:33 +00:00 |
|
FosterProgramming
|
503adc43ee
|
Fix double actions on standard bike (#9344)
|
2026-02-25 07:20:57 +00:00 |
|
FosterProgramming
|
93ad60cbdb
|
Update Makefile to remove every rom on clean (#9346)
|
2026-02-25 07:09:22 +00:00 |
|
FosterProgramming
|
03d7cee1d9
|
Fix safari healthbox (#9341)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-02-24 23:31:50 +01:00 |
|
FosterProgramming
|
0c89094756
|
Ease vanilla maps deletions (#9199)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2026-02-24 10:26:33 -08:00 |
|
GGbond
|
9e3d7db43f
|
Fix Sucker Punch to succeed against Me First targets (#9284)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2026-02-24 19:24:01 +01:00 |
|
Linathan
|
609faea428
|
Fix Power Construct Z symbol color + Add Form Change Sounds (#9326)
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
|
2026-02-24 19:16:47 +01:00 |
|
FosterProgramming
|
a997fece17
|
Fix firered TV loading emerald TV script (#9329)
|
2026-02-24 19:06:04 +01:00 |
|
FosterProgramming
|
163bf63a39
|
Update new mon teachable learnset tutorial (#9302)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2026-02-23 13:59:58 -08:00 |
|
Alex
|
1b4c199cd8
|
Adjust the restriction for Pecharunt (#9181)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-02-23 20:50:49 +01:00 |
|
Alex
|
7ba87890b5
|
Fixes present master merge regression (#9301)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2026-02-23 20:46:28 +01:00 |
|
PhallenTree
|
81a5622b51
|
Move undoing Dynamax to before faint cry (#9317)
|
2026-02-23 20:40:37 +01:00 |
|
amiosi
|
e369ea4464
|
correct move flags/data (#8858)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2026-02-23 17:23:32 +01:00 |
|
PhallenTree
|
8e3183a7a9
|
Simplify defrosting/thawing and expand target thawing config (#9271)
|
2026-02-23 17:11:05 +01:00 |
|
GGbond
|
a3d041b8af
|
Add tests for Future Sight interaction with Ally Switch (#9300)
|
2026-02-23 14:54:46 +01:00 |
|
GGbond
|
8334c68422
|
Fix Eviolite to use original species after Transform (#9285)
|
2026-02-23 14:51:32 +01:00 |
|
GGbond
|
d2ae1175c4
|
Add tests for Hadron Engine and Psyblade (#9314)
|
2026-02-23 14:50:03 +01:00 |
|
FosterProgramming
|
12d16aad16
|
createmon:fix move order when all moves are default (#9261)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-02-22 23:18:15 -08:00 |
|
KnightGallade
|
484eef4143
|
Allow Power Construct Animation (#9298)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2026-02-22 15:14:03 +01:00 |
|
hedara90
|
021a560de0
|
21/02/26 Master to upcoming merge (#9292)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-02-22 15:10:16 +01:00 |
|
Philipp AUER
|
433c4aff68
|
Fix setting the wall clock crashing with OW_USE_FAKE_RTC set to FALSE and LTO=1 (#9299)
|
2026-02-22 14:05:31 +01:00 |
|
Hedara
|
9316635687
|
Fix setting the wall clock crashing with OW_USE_FAKE_RTC set to FALSE and LTO=1
|
2026-02-22 13:36:32 +01:00 |
|