Eduardo Quezada
|
11bdbfb658
|
Fix compile issues
|
2025-01-26 16:35:05 -03:00 |
|
Eduardo Quezada
|
0b8aa7b0dc
|
Temp fixes
|
2025-01-26 12:08:26 -03:00 |
|
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 |
|
Ariel A
|
b22724e0b4
|
Merge branch 'lighting-expanded-id' of github.com:aarant/pokeemerald into lighting-expanded-id
|
2025-01-25 21:48:13 -05: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
|
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 |
|
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 |
|
RavePossum
|
2aa0ee3de8
|
Add dependency on json files to learnset helper (#6083)
|
2025-01-23 00:20:07 +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 |
|
Ariel A
|
c492bb3fec
|
fix: follower field movements after scripted movement update
|
2025-01-21 23:27:28 -05:00 |
|
Pawkkie
|
3c5bd4d16c
|
Return the universe to a state of balanced quilibrium (#6074)
|
2025-01-21 18:25:15 -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
|
b1831daa98
|
Adds static assert for DamageCalculationData (#6063)
|
2025-01-21 21:15:25 +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 |
|
Alex
|
27c8ec07c2
|
Documentation for DisableStruct (#6066)
|
2025-01-20 16:41:42 -05: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 |
|
kittenchilly
|
4bcb07a6a7
|
Add Clodsire second frame and fixed Grookey backsprite + overworld (#6047)
|
2025-01-20 09:49:20 +01:00 |
|
khbsd
|
52666fb545
|
IV/EV Info on Summary Screen (#6027)
|
2025-01-20 09:41:31 +01:00 |
|
Eduardo Quezada
|
3cdcb4b282
|
Moved front animations frames to gSpeciesInfo (#5605)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-01-19 21:14:12 -08:00 |
|
Eduardo Quezada
|
a756bb501c
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-19 22:31:33 -03:00 |
|
Eduardo Quezada
|
d1fc3d7009
|
Reverted orb effect shadow change
|
2025-01-19 22:13:08 -03:00 |
|
Alex
|
3977b66c91
|
Remove redundant line in Cmd_setcharge (#6053)
|
2025-01-19 22:45:26 +01:00 |
|
Eduardo Quezada
|
f6a86a65ef
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-19 10:32:57 -03:00 |
|
PhallenTree
|
b9acfdbb81
|
Fixes large battle messages being cut off instead of being prompted to advance (#6052)
|
2025-01-19 12:04:15 +01:00 |
|
Frank DeBlasio
|
6be3d337c0
|
Re-removed trainers.h trailing whitespace (#6048)
|
2025-01-19 11:33:39 +01:00 |
|
hedara90
|
ab9c48b2b3
|
Fixes HGSS dex not compiling currently (#6051)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-19 11:32:58 +01:00 |
|