Hedara
|
647c786c53
|
Merge commit '07c897a' into pret-merge
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
|
2025-05-27 19:46:13 +02:00 |
|
Hedara
|
5e9b8cdbad
|
Merge commit 'cc388ef' into pret-merge
Conflicts:
src/map_name_popup.c
|
2025-05-27 19:06:35 +02:00 |
|
Hedara
|
4a442cc3e6
|
Merge commit '091b726' into pret-merge
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
|
2025-05-27 19:02:53 +02:00 |
|
Hedara
|
9bfef357a2
|
Merge commit 'e4e90ea' into pret-merge
Conflicts:
src/battle_setup.c
src/field_specials.c
src/menu_helpers.c
src/pokedex_area_screen.c
src/roamer.c
src/script.c
|
2025-05-27 18:53:30 +02:00 |
|
Hedara
|
86ca6e2719
|
Merge remote-tracking branch 'pret/master' into pret-merge
|
2025-05-24 21:27:25 +02:00 |
|
Hedara
|
2e4833240f
|
Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge
Conflicts:
include/item.h
src/battle_ai_script_commands.c
src/battle_main.c
src/battle_pyramid_bag.c
src/battle_script_commands.c
src/battle_util.c
src/item.c
src/item_menu.c
src/item_use.c
src/pokemon.c
src/pokemon_summary_screen.c
src/shop.c
|
2025-05-24 21:24:56 +02:00 |
|
Hedara
|
950dbe7897
|
Merge commit '16357c7' into pret-merge
Conflicts:
include/battle.h
include/battle_controllers.h
include/battle_script_commands.h
include/contest.h
include/list_menu.h
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_main.c
src/battle_message.c
src/battle_tower.c
src/berry_crush.c
src/contest.c
src/ereader_helpers.c
src/evolution_scene.c
src/hall_of_fame.c
src/mauville_old_man.c
src/mystery_gift_menu.c
src/pokedex.c
src/pokenav_conditions_search_results.c
src/pokenav_menu_handler_gfx.c
src/pokenav_ribbons_list.c
src/rom_header_gf.c
src/union_room.c
src/union_room_battle.c
src/union_room_player_avatar.c
|
2025-05-24 19:22:31 +02:00 |
|
GriffinR
|
fba096a500
|
Remove map_group_count.h
|
2025-05-22 13:59:23 -04:00 |
|
Alex
|
b31a73f990
|
Rename ItemId_GetX to GetItemX (#2116)
|
2025-05-22 13:27:52 +01:00 |
|
Eduardo Quezada
|
be4b8ca3d0
|
Fix KNOWN_FAILING Bestow tests (#6947)
|
2025-05-22 10:23:15 +02:00 |
|
kittenchilly
|
75f6d85582
|
Improve a few Gen 9 Pokemon sprites (#6885)
|
2025-05-17 19:48:44 +02:00 |
|
Bassoonian
|
16357c7e29
|
Streamline pointer notation (#2139)
|
2025-05-16 12:04:44 +01:00 |
|
kittenchilly
|
7359d234c8
|
PokeCommunity sprites batch (April 2025) (#6840)
|
2025-05-16 09:35:30 +02:00 |
|
Alex
|
a086d5f592
|
Reverts wrongly done gem fix and renames struggle effect (#6806)
|
2025-05-15 10:45:48 +02:00 |
|
kittenchilly
|
4474bd5b80
|
Add move description data for Z-Moves and Max/G-Max moves (#6852)
|
2025-05-15 10:44:09 +02:00 |
|
Martin Griffin
|
484c41c49d
|
Remove files that should not have been committed
|
2025-05-13 14:56:31 +01:00 |
|
Alex
|
2044bea883
|
Rename battlerId to battler for consistency (#2126)
|
2025-05-09 12:43:23 +01:00 |
|
PCG
|
904b399a81
|
Added Egg Moves for Basculin White Striped (#6769)
|
2025-05-04 11:43:57 +02:00 |
|
Cafe
|
b451bc3606
|
New Lurantis animation (#6725)
|
2025-04-30 12:45:29 +02:00 |
|
Hedara
|
4873589c65
|
Merge remote-tracking branch 'pret/master' into new-pret-merge
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
|
2025-04-29 20:27:33 +02:00 |
|
hedara90
|
7a35f35352
|
Make generated files match the current formatting (#6636)
|
2025-04-17 13:38:30 +02:00 |
|
GriffinR
|
709cfa1c9a
|
Merge pull request #2014 from Bassoonian/battleterrain
Rename battle terrain to environment
|
2025-04-13 19:32:06 -04:00 |
|
Alex
|
f3c76e866b
|
Fix potential compile error caused by sTeraIndicatorDataPtrs (#6599)
|
2025-04-13 19:06:44 +02:00 |
|
Bassoonian
|
3c8d5d1a57
|
Add hold effects for PLA Origin Trio items (#6578)
|
2025-04-11 16:38:08 +02:00 |
|
hedara90
|
cf98d764ad
|
Gimmick Indicator refactor (#6553)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-10 23:56:26 +02:00 |
|
aronson
|
68a869da99
|
Hide in-battle types from Union Room trade request (#6489)
|
2025-03-30 10:57:58 +02:00 |
|
Hedara
|
a3a48c59b8
|
Merge remote-tracking branch 'pret/master' into pret-merge-2025-03-29
|
2025-03-29 14:21:29 +01:00 |
|
Isaac Aronson
|
56947be5d6
|
Fix union room typo
|
2025-03-28 10:26:01 -05:00 |
|
Hedara
|
521432b269
|
Renamed a berry tag variable
|
2025-03-24 13:47:47 +01:00 |
|
Deokishisu
|
eaf7549854
|
Replace Incorrect Slow Stairs Movement with Correct One (#6275)
|
2025-03-16 14:51:36 -07:00 |
|
hedara90
|
40dd3a7688
|
Fix compile errors with OW_BATTLE_ONLY_FORMS set to FALSE (#6400)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-10 17:11:25 +01:00 |
|
Alex
|
3def0e751b
|
Fixes crash damage move against absorbing abilities (#6361)
|
2025-03-09 20:54:58 +01:00 |
|
kittenchilly
|
f747deb6ca
|
Fix Melmetal's weight (#6382)
|
2025-03-05 17:58:35 +01:00 |
|
Ruby
|
ec8344c2ad
|
Fixed a missing ) in trainers.party comment block. (#6367)
|
2025-03-02 15:00:57 +01:00 |
|
Hedara
|
06d31bc8ea
|
Merge branch 'master' into final-1.10-master-upcoming-merge
|
2025-02-26 22:07:10 +01:00 |
|
hedara90
|
cf43787d72
|
Added MOVE_TARGET_OPPONENT and added it to Me First, (#6336)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-25 22:28:22 +01:00 |
|
hedara90
|
4cf219e5c7
|
Resized gimmick indicators to reduce VRAM usage (#6319)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-22 12:28:53 -03:00 |
|
Eduardo Quezada
|
fe7ed22f5b
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-20 19:44:00 -03:00 |
|
Eduardo Quezada
|
ff098bc520
|
Reverted compound literal OW mon pic tables (#6216)
|
2025-02-19 19:17:59 +01:00 |
|
Alex
|
502b1c5087
|
Rename SetPhotonGeyser to a more general use and clean up (#6272)
|
2025-02-17 22:07:30 +01:00 |
|
Alex
|
264e72c1a1
|
Use more accurate count in MovesInfo (#6260)
|
2025-02-13 20:22:10 -03:00 |
|
Frank DeBlasio
|
d1b2b045d0
|
Moved sValidApprenticeMove into gMovesInfo (#6254)
|
2025-02-13 14:58:12 -03:00 |
|
Frank
|
a0a8434e26
|
Converted apprenctice IDs from hex to decimal
|
2025-02-13 12:13:22 -05:00 |
|
Eduardo Quezada
|
845679471f
|
Added missing Dream Eater and Reflect Type tests (#6245)
|
2025-02-13 17:32:08 +01:00 |
|
Eduardo Quezada
|
9c4fbbf274
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-13 13:06:32 -03:00 |
|
Eduardo Quezada
|
3507862164
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-12 09:30:59 -03:00 |
|
Eduardo Quezada
|
860c2f6cbc
|
Remove whitespace from trainers data file (#6234)
|
2025-02-12 00:27:33 +01:00 |
|
Hedara
|
e0e73983c7
|
Merge remote-tracking branch 'pret/master' into pret-merge-2025-02-11
|
2025-02-11 11:20:37 +01:00 |
|
Frank DeBlasio
|
3be1d1d91e
|
Consolidated Frontier teams into battle_frontier_trainers.h (#5892)
|
2025-02-09 22:17:10 +01:00 |
|
Eduardo Quezada
|
a2ad5d2ca3
|
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210)
|
2025-02-09 21:54:03 +01:00 |
|