Eduardo Quezada
|
11bdbfb658
|
Fix compile issues
|
2025-01-26 16:35:05 -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 |
|
PhallenTree
|
4158f9251f
|
Fix Powder (status) config and some terrain timers not using gBattleTurnCounter (#6109)
|
2025-01-26 13:06:11 +01:00 |
|
hedara90
|
e1e3bcfa91
|
Tera starstorm (#6073)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-26 11:08:46 +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
|
090c4f3936
|
feat: hardware fades now affect BLDALPHA too
|
2025-01-25 20:57:30 -05: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 |
|
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 |
|
hedara90
|
88986baf5f
|
Trainer Party Pools (#5731)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-25 13:28:46 +01:00 |
|
Eduardo Quezada
|
26daf15ce0
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-24 18:29:28 -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 |
|
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 |
|
Alex
|
27c8ec07c2
|
Documentation for DisableStruct (#6066)
|
2025-01-20 16:41:42 -05: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 |
|
khbsd
|
52666fb545
|
IV/EV Info on Summary Screen (#6027)
|
2025-01-20 09:41:31 +01: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
|
f6a86a65ef
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-19 10:32:57 -03:00 |
|
Eduardo Quezada
|
cd1482bbaa
|
Expanded Pokémon Follower transformation functionality (#5048)
|
2025-01-18 23:19:06 +01:00 |
|
AERDU
|
e4e4460636
|
fixed bug giving immunity to full-paralysis when B_MAGIC_GUARD is >= GEN_4 (#6032)
|
2025-01-18 19:54:20 +01:00 |
|
Alex
|
9ed3b176f0
|
Pret merge (17 of January) (#6045)
|
2025-01-18 19:53:29 +01:00 |
|
Bassoonian
|
243900cdbb
|
Rename DexNav flags and vars (#6044)
|
2025-01-18 14:44:40 +01:00 |
|
Bassoonian
|
db5dc85b70
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan
|
2025-01-18 13:07:05 +01:00 |
|
Bassoonian
|
cc9a4d34c6
|
Fix tests not building
|
2025-01-18 13:07:01 +01:00 |
|
Bassoonian
|
199760a6d3
|
Add known failing learnset cap test (#6046)
|
2025-01-17 21:04:46 -05:00 |
|
DizzyEggg
|
e83f7c79eb
|
Fix conflicting types for rotating gate functions (#2087)
|
2025-01-17 18:19:21 -05:00 |
|
DizzyEggg
|
0a436d580e
|
Extern gSprites and gOamMatrices with known array size (#2090)
|
2025-01-17 18:18:17 -05:00 |
|
Eduardo Quezada
|
937b3106b4
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-17 19:33:48 -03:00 |
|
Eduardo Quezada
|
6162628104
|
A bit more of addressing
|
2025-01-17 19:25:29 -03:00 |
|
hedara90
|
3bcfa355eb
|
Config for move slot rearrangement in battle (#6017)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-17 23:03:01 +01:00 |
|
Eduardo Quezada
|
ffc8903f93
|
More review addressing
|
2025-01-17 18:47:38 -03:00 |
|
Eduardo Quezada
|
c363c28b22
|
Addressing a bunch of small things
|
2025-01-17 18:21:48 -03:00 |
|
Bassoonian
|
bcf9a1eff8
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan
|
2025-01-17 21:57:25 +01:00 |
|
GriffinR
|
2f67b17571
|
Document bard music (#2053)
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
|
2025-01-17 17:54:38 +00:00 |
|