Hedara
|
c27930eabf
|
Merge commit '678fdf9' into pret-merge
Conflicts:
data/maps/BirthIsland_Exterior/scripts.inc
data/maps/DesertUnderpass/scripts.inc
data/maps/Route117/scripts.inc
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
data/maps/SootopolisCity/scripts.inc
include/constants/event_objects.h
src/battle_setup.c
src/event_object_movement.c
src/field_control_avatar.c
src/item_use.c
src/scrcmd.c
tools/mapjson/mapjson.cpp
|
2025-05-27 19:22:40 +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
|
090550626e
|
Merge commit '113226b03ad745183299dae1833f2a773b927cef' into pret-merge
Conflicts:
include/constants/metatile_behaviors.h
|
2025-05-27 18:34:53 +02:00 |
|
malad1211
|
d27a3575f2
|
Cleanup identical if blocks (#6988)
|
2025-05-27 10:12:12 +02:00 |
|
Alex
|
b49a3bbde5
|
Missed ItemId_GetDescription change (#6992)
|
2025-05-27 10:09:12 +02:00 |
|
ghoulslash
|
84118dec97
|
Fix heal bell test, add sparkly swirl test (#6262)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-26 19:45:51 +02:00 |
|
Alex
|
803bd2dfbf
|
Prankster block check was missng the IsStatusMove check (#6987)
|
2025-05-26 13:06:19 +02:00 |
|
Martin Griffin
|
372553b319
|
Explicit -std=gnu17 in CPPFLAGS to mirror CFLAGS (#6839)
|
2025-05-26 09:33:17 +02:00 |
|
Bassoonian
|
812bde8a48
|
Pret merge (24th of May, 2025) (#6978)
|
2025-05-25 23:08:37 +02:00 |
|
Vex
|
7b686b6749
|
Fix Wish healing even if the target is Heal Blocked (#6979)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-25 23:01:11 +02:00 |
|
Pawkkie
|
f8b3a02f6c
|
Backport #6712 Fix party data assignment (#6980)
|
2025-05-25 10:06:49 +02:00 |
|
Alex
|
d0313ff323
|
Rename AI test (#6977)
|
2025-05-24 17:12:48 -04:00 |
|
Hedara
|
dc6e40a839
|
Fix tests using old item functions
|
2025-05-24 21:57:51 +02:00 |
|
Hedara
|
86ca6e2719
|
Merge remote-tracking branch 'pret/master' into pret-merge
|
2025-05-24 21:27:25 +02:00 |
|
Hedara
|
bd735033af
|
Merge commit 'e245f1ec2291a9eac1b8688c99c0126e100178e8' into pret-merge
|
2025-05-24 21:25:57 +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
|
3ecd8afab0
|
Merge commit 'bd0a02c45630d6b3666b079593e787de263d0a17' into pret-merge
Conflicts:
Makefile
|
2025-05-24 20:42:01 +02:00 |
|
Hedara
|
2b92ba315a
|
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
Conflicts:
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_interface.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/easy_chat.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/field_player_avatar.h
include/intro.h
include/item_use.h
include/metatile_behavior.h
include/move_relearner.h
include/pokedex.h
include/pokemon.h
include/pokemon_icon.h
include/roamer.h
include/script_pokemon_util.h
include/sprite.h
include/text.h
include/wild_encounter.h
src/battle_controllers.c
|
2025-05-24 20:38:21 +02:00 |
|
Hedara
|
a90dd491d2
|
Merge commit 'e1e7d1cf3530799774fa13d4e409bed7067ffa25' into pret-merge
|
2025-05-24 19:35:01 +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 |
|
PhallenTree
|
0b67aa7546
|
Fixes checking wrong move's Dynamic Move Type in Summary Screen (#6975)
|
2025-05-24 15:13:08 +02:00 |
|
Hedara
|
a714779928
|
Merge commit '74bf498' into pret-merge
|
2025-05-23 17:35:13 +02:00 |
|
Alex
|
87cbb457f1
|
Fixes AI not seeing primal weather and partner absorbing abilities (#6936)
|
2025-05-22 17:25:29 -04:00 |
|
Alex
|
f9400332fc
|
Fixes AI repeated use of weather set up moves (#6963)
|
2025-05-22 16:50:13 -04:00 |
|
Eduardo Quezada
|
2e3ae0d167
|
Added check for gBattleStringsTable (#6948)
|
2025-05-22 21:05:22 +02:00 |
|
GriffinR
|
fba096a500
|
Remove map_group_count.h
|
2025-05-22 13:59:23 -04:00 |
|
GriffinR
|
d6962aacd7
|
Merge pull request #2146 from AlexOn1ine/removeFiles
Remove files that were wrongly commited
|
2025-05-22 13:58:18 -04:00 |
|
Alex
|
48100e9593
|
Fixes Unnerve activation not limited to 1 per switch-in (#6960)
|
2025-05-22 19:15:01 +02:00 |
|
AlexOn1ine
|
e245f1ec22
|
Remove files that were wrongly commited
|
2025-05-22 14:33:31 +02:00 |
|
Alex
|
b31a73f990
|
Rename ItemId_GetX to GetItemX (#2116)
|
2025-05-22 13:27:52 +01:00 |
|
Alex
|
8ec998abff
|
Fixes ate type being ignored after checking summary screen (#6888)
|
2025-05-22 14:07:36 +02:00 |
|
Alex
|
8ad1f329c9
|
Fixes Dazzling abilities activating on all multi hit move hits (#6943)
|
2025-05-22 10:37:00 +02:00 |
|
Eduardo Quezada
|
be4b8ca3d0
|
Fix KNOWN_FAILING Bestow tests (#6947)
|
2025-05-22 10:23:15 +02:00 |
|
hedara90
|
e9ba4b5db0
|
Added type: documentation to required labels for the label check (#6957)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-22 00:45:25 -07:00 |
|
Alex
|
ce079cfcc8
|
Fixes Life Orb damage still happening after attacker was unable to attack (#6940)
|
2025-05-21 16:16:33 +02:00 |
|
jfb1337
|
ce9bbcc3b7
|
Fix trainers.party parser failing on apostrophes (#6938)
|
2025-05-21 10:41:18 +02:00 |
|
ghoulslash
|
c485ae4e90
|
add fail ptr arg to JumpIfMoveFailed, fix tryworryseed (#6925)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-05-20 17:07:29 +02:00 |
|
allcontributors[bot]
|
8f88cfad5b
|
add surskitty as a contributor for code (#6924)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-05-20 06:25:26 -07:00 |
|
Pawkkie
|
3f89abea74
|
Fix test not referencing AI_TRAINER_NAME (#6926)
|
2025-05-19 22:17:46 -07:00 |
|
allcontributors[bot]
|
100121ad06
|
add grintoul1 as a contributor for code (#6920)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-05-19 22:14:59 -07:00 |
|
allcontributors[bot]
|
00bc660727
|
add RubyRaven6 as a contributor for code, and doc (#6918)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-05-19 19:35:38 -07:00 |
|
allcontributors[bot]
|
fe7425235a
|
add wiz1989 as a contributor for code (#6902)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-05-19 15:47:16 -07:00 |
|
Kurausukun
|
bd0a02c456
|
Correct C23 Checks (#2144)
|
2025-05-19 15:43:06 +01:00 |
|
Bassoonian
|
59d315734d
|
Update header files to match source files (#2143)
|
2025-05-19 09:18:04 +01:00 |
|
Kurausukun
|
e1e7d1cf35
|
Fixes for C23 Support (#2138)
* fixes for c23 support
* include global.h in m4a.c & remove <string.h> include
|
2025-05-19 09:11:59 +01:00 |
|
allcontributors[bot]
|
f8d31a7410
|
add PCG06 as a contributor for code (#6900)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-05-19 07:41:39 +02:00 |
|
allcontributors[bot]
|
6df68c4dd3
|
add mudskipper13 as a contributor for code, and doc (#6915)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-05-18 21:08:43 -07:00 |
|
allcontributors[bot]
|
6bdec079c0
|
add kittenchilly as a contributor for code (#6898)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-05-18 17:49:50 -07:00 |
|