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 |
|
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 |
|
allcontributors[bot]
|
ec58de2b6a
|
add ExpoSeed as a contributor for code, and maintenance (#6899)
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 15:00:00 -07:00 |
|
allcontributors[bot]
|
c83e7bda23
|
add LinathanZel as a contributor for code (#6901)
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 08:42:48 -07:00 |
|
allcontributors[bot]
|
7b679a6feb
|
add AsparagusEduardo as a contributor for code, data, and 10 more (#6905)
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 07:07:59 -07:00 |
|
Bassoonian
|
f1a655366b
|
Fix typo in the readme (#6908)
|
2025-05-18 06:47:35 -07:00 |
|
allcontributors[bot]
|
6a726d9821
|
add agsmgmaster64 as a contributor for code (#6906)
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 06:47:00 -07:00 |
|
psf
|
5164c40e49
|
Update .all-contributorsrc to skip CI (#6907)
|
2025-05-18 00:36:52 +02:00 |
|
allcontributors[bot]
|
5fdc7f9283
|
add khbsd as a contributor for doc, and code (#6903)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-05-17 15:15:28 -07:00 |
|
allcontributors[bot]
|
c0b70dd35b
|
add Cafeei as a contributor for design (#6904)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
|
2025-05-17 14:54:23 -07:00 |
|
psf
|
9145132377
|
Fixed URL for contributors badge on README.md (#6897)
|
2025-05-17 16:38:49 -04:00 |
|
allcontributors[bot]
|
6cbb7b31af
|
add Pawkkie as a contributor for doc (#6896)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
|
2025-05-17 13:25:53 -07:00 |
|
kittenchilly
|
75f6d85582
|
Improve a few Gen 9 Pokemon sprites (#6885)
|
2025-05-17 19:48:44 +02:00 |
|
psf
|
b8b73bf219
|
Add CREDITS.md & FEATURES.md, rewrite README.md & INSTALL.md (#6700)
|
2025-05-17 19:33:22 +02:00 |
|
Bassoonian
|
16357c7e29
|
Streamline pointer notation (#2139)
|
2025-05-16 12:04:44 +01:00 |
|
Eduardo Quezada
|
6711df36a3
|
Create missing ability and move effect test files (#6845)
|
2025-05-16 12:20:44 +02:00 |
|
Eduardo Quezada
|
3a3c246509
|
Consolidated stat-priority ability tests (#6863)
|
2025-05-16 12:09:39 +02:00 |
|
kittenchilly
|
7359d234c8
|
PokeCommunity sprites batch (April 2025) (#6840)
|
2025-05-16 09:35:30 +02:00 |
|