sayseong
24f260f6c7
Merge remote-tracking branch 'upstream/master'
2025-05-27 13:33:46 +08: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
Alex
f9400332fc
Fixes AI repeated use of weather set up moves ( #6963 )
2025-05-22 16:50:13 -04:00
Alex
48100e9593
Fixes Unnerve activation not limited to 1 per switch-in ( #6960 )
2025-05-22 19:15:01 +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
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
Bassoonian
16357c7e29
Streamline pointer notation ( #2139 )
2025-05-16 12:04:44 +01:00
Hedara
468454d810
Merge commit '51b000860be6d26da989c8b2e51a3f66c664083e' into pret-merge
...
Conflicts:
src/battle_controllers.c
src/battle_gfx_sfx_util.c
2025-05-15 21:38:57 +02:00
Hedara
578c5f96cd
Merge commit 'baf5be20354c9dfde182c0a2dd23ab40643fe57b' into pret-merge
...
Conflicts:
include/battle_gfx_sfx_util.h
src/apprentice.c
src/battle_controller_recorded_opponent.c
src/battle_controller_recorded_player.c
src/battle_dome.c
src/battle_gfx_sfx_util.c
src/battle_script_commands.c
src/battle_tv.c
src/item_menu.c
src/move_relearner.c
src/pokemon.c
src/scrcmd.c
2025-05-15 21:31:54 +02:00
Hedara
2945c83bbc
Merge commit '2044bea883d08ec9266d21ac0cd6a56c3e0d5962' into pret-merge
...
Conflicts:
include/battle.h
include/battle_ai_script_commands.h
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/pokemon.h
include/recorded_battle.h
src/battle_ai_script_commands.c
src/battle_anim.c
src/battle_anim_mons.c
src/battle_anim_sound_tasks.c
src/battle_anim_status_effects.c
src/battle_controller_link_opponent.c
src/battle_controller_link_partner.c
src/battle_controller_opponent.c
src/battle_controller_player.c
src/battle_controller_player_partner.c
src/battle_controller_recorded_opponent.c
src/battle_controller_recorded_player.c
src/battle_controller_wally.c
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_interface.c
src/battle_main.c
src/battle_message.c
src/battle_records.c
src/battle_script_commands.c
src/battle_tv.c
src/battle_util.c
src/battle_util2.c
src/pokeball.c
src/pokemon.c
src/recorded_battle.c
src/reshow_battle_screen.c
2025-05-15 21:15:37 +02:00
Hedara
49906a81f7
Merge commit 'c39ef1a03002a7af94' into pret-merge
...
Conflicts:
src/battle_ai_switch_items.c
src/battle_controller_link_opponent.c
src/battle_controller_link_partner.c
src/battle_controller_opponent.c
src/battle_controller_player.c
src/battle_controller_player_partner.c
src/battle_controller_recorded_opponent.c
src/battle_controller_recorded_player.c
src/battle_controller_safari.c
src/battle_controller_wally.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
src/battle_util.c
src/battle_util2.c
src/pokemon.c
2025-05-15 17:31:50 +02:00
Alex
a086d5f592
Reverts wrongly done gem fix and renames struggle effect ( #6806 )
2025-05-15 10:45:48 +02:00
ghoulslash
5ad8d852fd
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into expansion/ripenfix
2025-05-13 08:01:41 -04:00
Bassoonian
60587682e3
Remove redundant script declaration in battle_scripts.h ( #6837 )
2025-05-13 10:32:03 +02:00
ghoulslash
d4c64d3b67
rename berrystatraise script to consumablestatraise
2025-05-12 21:11:25 -04:00
Alex
0ad3f929ab
Fixes Berserk Gene infinite loop ( #6813 )
2025-05-11 11:34:16 +02:00
Alex
51b000860b
Add BattlerId enum and document ( #2135 )
2025-05-11 07:36:39 +01:00
spindrift64
f4f82f2394
Toxic Spikes print whether the target is poisoned or badly poisoned ( #6814 )
2025-05-10 22:55:28 +02:00
RoamerX
f7d405b9ad
Merge pull request #50 from rh-hideout/master
...
update
2025-05-11 00:23:51 +08:00
spindrift64
3b91a964c9
Fix Iron Ball type effectiveness check ( #6794 )
2025-05-09 22:23:44 +02:00
Alex
baf5be2035
Replace: moveId -> move, moveIdx -> moveIndex ( #2134 )
2025-05-09 16:33:23 +01:00
Alex
2044bea883
Rename battlerId to battler for consistency ( #2126 )
2025-05-09 12:43:23 +01:00
hedara90
b6b6e91959
A lot of tests ( #6734 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-07 16:50:12 +02:00
Alex
4e7b1f2a97
Fixes Stomping Tantrum not boosting damage when missed due to Accuracy ( #6762 )
2025-05-06 12:07:01 +02:00
RoamerX
b151869a6a
Merge pull request #43 from rh-hideout/master
...
UPDATE MASTER
2025-05-05 16:49:33 +08:00
hedara90
fe2d7442af
Remove old slide workaround ( #6754 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-03 10:54:49 +02:00
Alex
9259b7ee69
Bugfixes batch ( #6750 )
2025-05-02 20:14:27 +02:00
DavidJCobb
0f17e70371
Shorter names for engine/controller communication enum members
2025-05-02 00:01:15 -04:00
摆烂
fc76d93d26
Merge branch 'rh-hideout:master' into master
2025-05-02 09:34:31 +08:00
PhallenTree
fadf472157
Adds RNG tags and tests for Moody and Starf Berry ( #6718 )
2025-05-01 10:16:15 +02:00
Eduardo Quezada
d2a4b5ef84
Changed Tackle for Scratch in tests ( #6730 )
2025-04-30 17:18:52 -04:00
Hedara
f0ecbce9c7
Start of 1.11.3 Cycle
2025-04-30 11:26:09 +02:00
Hedara
accb85554a
Expansion 1.11.2 Release
2025-04-30 11:23:05 +02:00
Alex
afcba8d9cd
Fixes Stomping Tantrum not doubling power if asleep or frozen ( #6719 )
2025-04-29 23:25:56 +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
Alex
1cd4d23969
Fixes Z and Max moves dmg reduction against side protection ( #6697 )
2025-04-26 21:46:41 +02:00
DavidJCobb
7ee3043c58
Update battle_controllers.h
...
typo
2025-04-26 11:47:48 -04:00
DavidJCobb
2864408060
Tweaks to documentation comments
2025-04-26 11:40:14 -04:00
DavidJCobb
b4ee45f3e8
Renamed BATTLELINKMSGTYPE_ to BATTLELINKCOMMTYPE_
...
I want to avoid the word "message" since PRET has already chosen "battle message" as the term for predefined strings usable in the battle scripts and UI.
I was considering the term "battle link packet" instead, but the library for wireless communications already uses the word "packet" even though GBATEK does not. I'm going with "battle link communication type" instead. For this particular context, I don't think we need a compound noun ("X type"); the singular noun "type" is fine enough.
2025-04-26 11:37:20 -04:00
DavidJCobb
8f5c1a452d
Update battle_controllers.h
...
Simplified macros.
2025-04-26 01:33:17 -04:00
DavidJCobb
2738d11b0f
Additional fixes to last few commits
...
ROM now compiles, but it's not comparing as equal...
2025-04-26 01:00:16 -04:00
DavidJCobb
a4370ffcde
gBattleControllerExecFlags bits now identified via helper macros
...
Created "exposition" macros to describe operations performed on gBattleControllerExecFlags. Updated the battle engine internals to use them, to more clearly document how battle link communications actually work.
2025-04-26 00:45:03 -04:00
DavidJCobb
9dc48899d3
BUFFER_A/B -> BATTLELINKMSGTYPE; link send/recv. task data names
...
Replaced the BUFFER_A and BUFFER_B constants with the BATTLELINKMSGTYPE enum, which also identifies the "controller becoming idle" message type.
Named the task data for the link send task and the link receive task. Added macros to functions related to those tasks, for legibility.
2025-04-26 00:13:42 -04:00
