Eduardo Quezada
|
00241cf569
|
Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2
# Conflicts:
# README.md
# asm/macros/event.inc
# data/scripts/pkmn_center_nurse.inc
# include/constants/event_objects.h
# include/constants/field_weather.h
# include/overworld.h
# include/palette.h
# include/sprite.h
# src/battle_controller_player.c
# src/data/object_events/object_event_graphics.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_weather.c
# src/overworld.c
# src/palette.c
# src/scrcmd.c
# src/sprite.c
|
2025-01-26 12:08:10 -03:00 |
|
DizzyEggg
|
b3543cbc59
|
Fix MindBlown crash on MyBoy/No Cash (#6112)
|
2025-01-26 12:06:13 -03:00 |
|
PhallenTree
|
4158f9251f
|
Fix Powder (status) config and some terrain timers not using gBattleTurnCounter (#6109)
|
2025-01-26 13:06:11 +01:00 |
|
PhallenTree
|
0339f684c3
|
Fix seeds softlocking the game when a battler with a Surge ability enters the field (#6110)
|
2025-01-26 12:21:19 +01:00 |
|
hedara90
|
e1e3bcfa91
|
Tera starstorm (#6073)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-26 11:08:46 +01:00 |
|
Frank DeBlasio
|
9e10f680a9
|
Move flag fixes (#6107)
|
2025-01-26 09:48:38 +01:00 |
|
Ariel A
|
c1d105c31c
|
Merge branch 'lighting' into lighting-expanded-id
|
2025-01-25 21:45:23 -05:00 |
|
Ariel A
|
bc034aaf73
|
Merge branch 'followers-expanded-id' into lighting-expanded-id
|
2025-01-25 21:42:02 -05:00 |
|
Ariel A
|
8933b84e1c
|
Merge branch 'followers' into followers-expanded-id
|
2025-01-25 21:40:51 -05:00 |
|
Ariel A
|
84fecf21c9
|
Merge branch 'followers' into lighting
|
2025-01-25 21:38:22 -05:00 |
|
Ariel A
|
d73167e262
|
fix: treat 1-tile jumps as slow copyable movement for follower pokemon
|
2025-01-25 21:37:16 -05:00 |
|
Ariel A
|
521bea6bc3
|
fix: allowed loading non-word-aligned tileset palettes
|
2025-01-25 20:59:08 -05:00 |
|
Ariel A
|
16c31d61b4
|
fix: removed fadescreenswapbuffers palette dependence, via hardware fade
|
2025-01-25 20:58:22 -05:00 |
|
Ariel A
|
090c4f3936
|
feat: hardware fades now affect BLDALPHA too
|
2025-01-25 20:57:30 -05:00 |
|
Eduardo Quezada
|
6a3d95b422
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-25 22:29:12 -03:00 |
|
Frank DeBlasio
|
4e8ddebb8d
|
Updated trainer pic tutorial (#6049)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
|
2025-01-25 19:36:19 -05:00 |
|
Frank DeBlasio
|
a2b51a2381
|
Terrain function standarization (#6097)
|
2025-01-25 23:27:39 +01:00 |
|
Pawkkie
|
17f3541a60
|
Eject item ace flag switch AI fixes (#6098)
|
2025-01-25 23:19:47 +01:00 |
|
Pawkkie
|
43e41bbed8
|
Add Code Entry functionality (#5951)
|
2025-01-25 22:03:08 +01:00 |
|
Salem
|
01e8d8233e
|
Trainer Battle Parameter Consolidation (#5982)
|
2025-01-25 22:02:39 +01:00 |
|
Alex
|
77b677dbf9
|
Introduces BattleTurnCounter to simplfy timer checks (#6080)
|
2025-01-25 14:26:38 -05:00 |
|
DizzyEggg
|
df50320ca6
|
Fix Crash if something costs 0 in shop (#6106)
|
2025-01-25 17:38:19 +01:00 |
|
Alex
|
c4b838587b
|
Fixes Charge effect not boosting and tests (#6102)
|
2025-01-25 14:38:18 +01:00 |
|
hedara90
|
88986baf5f
|
Trainer Party Pools (#5731)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-25 13:28:46 +01:00 |
|
Frank DeBlasio
|
a075166b6b
|
Added WEATHER_DOWNPOUR to Weather Ball's dynamic type (#6100)
|
2025-01-25 10:10:12 +01:00 |
|
Eduardo Quezada
|
26daf15ce0
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-24 18:29:28 -03:00 |
|
ghoulslash
|
774e61e74a
|
Add Script Cmd for Forcing Save Game (#6090)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-01-24 20:42:16 +01:00 |
|
Frank DeBlasio
|
4dc2bc69aa
|
Fixed Liquid Voice's dynamic type for normal moves (#6092)
|
2025-01-24 18:38:51 +01:00 |
|
Bassoonian
|
c372a3bf82
|
Fix Enamorus not changing forms (#6093)
|
2025-01-24 07:59:24 -03:00 |
|
Eduardo Quezada
|
cd84e07341
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-23 23:01:25 -03:00 |
|
psf
|
b109aa0c92
|
Cleaned up Trainer Slides, added automated Trainer Slide tests, add new Enemy Critical Hit Slide (#6018)
|
2025-01-23 16:28:33 +01:00 |
|
DizzyEggg
|
4e0eab9e27
|
Remove gDecompressionBuffer (#6029)
|
2025-01-23 09:47:14 +01:00 |
|
Bassoonian
|
a1c47a931f
|
Revert "Converts a bunch of defines to enums" (#6082)
|
2025-01-22 21:50:39 +01:00 |
|
hedara90
|
2a8f4b03dc
|
Revert "Revert map related enum conversion" (#6079)
|
2025-01-22 21:25:24 +01:00 |
|
hedara90
|
2b9c5fe4e7
|
Revert map related enum conversion (#6078)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-22 19:37:56 +01:00 |
|
Eduardo Quezada
|
af884b1be4
|
Cleaned up Debug Menu (#6070)
|
2025-01-22 15:27:08 +01:00 |
|
hedara90
|
e8d3b4163f
|
Trainerslide animation fix (#6040)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-22 14:50:23 +01:00 |
|
Ariel A
|
ce9f3b95f3
|
fix: non-following pokemon using slide-in battle animation
|
2025-01-21 23:27:57 -05:00 |
|
Pawkkie
|
ea4434db2a
|
Switch trapping AI will consider Trace (#6059)
|
2025-01-22 00:07:15 +01:00 |
|
Alex
|
f2840cb047
|
Fixes Eject Pack triggering twice on Intimidate (#6072)
|
2025-01-21 17:58:52 -05:00 |
|
Eduardo Quezada
|
ed505cfb5f
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-21 19:32:51 -03:00 |
|
Alex
|
b2f2a8c9fb
|
Fixes Rapid Spin / Toxic Debris interaction (#6023)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-01-21 21:43:54 +01:00 |
|
Bassoonian
|
a3ce3a569d
|
Converts a bunch of defines to enums (#6071)
|
2025-01-21 21:19:41 +01:00 |
|
Alex
|
ac9c8ac3bb
|
Replace WEATHER_HAS_EFFECT with HasWeatherEffect (#6069)
|
2025-01-21 08:43:45 +01:00 |
|
Pawkkie
|
8184737868
|
Add a uniquely striking pair of brackets (#6068)
|
2025-01-20 23:53:21 +01:00 |
|
Pawkkie
|
44ebf33f1d
|
Add Steven Multi to debug menu (#6064)
|
2025-01-20 22:29:21 +01:00 |
|
Pawkkie
|
7d39dd4aae
|
Add AI_FLAG_PREDICT_INCOMING_MON: AI will score against predicted switchin if predicting switch (#6037)
|
2025-01-20 20:54:38 +01:00 |
|
Eduardo Quezada
|
4825e523ce
|
Moved mon pic tables to gSpeciesInfo + macro cleanup (#5597)
|
2025-01-20 07:52:29 -08:00 |
|
Pawkkie
|
6ec847019e
|
Fix Entrainment AI scoring bug (#6056)
|
2025-01-20 16:45:14 +01:00 |
|
Alex
|
da9943d3b8
|
Clean up array access by using index instead of dereferencing the value (#6057)
|
2025-01-20 16:44:22 +01:00 |
|