AgustinGDLV
2eabcea86e
Battle Item Refactor ( #2902 )
...
* items that can be used in battle now use battlescripts
* removed ExecuteTableBasedItemEffect_
* taught AI how to use items, removed AI_itemtype/flag
* X-Items store stages raised in holdEffectParam
* USE_ITEM in tests
2023-04-14 19:25:50 +01:00
Eduardo Quezada D'Ottone
d59d8b92af
Merge branch 'dev' into AI
2022-09-24 11:07:09 -03:00
LOuroboros
5f67335212
Fixed typo in BoxMonKnowsMove
2022-09-19 05:21:54 -03:00
crater-git
ed02c4b425
Removed tutor move distinction, combined llists
2022-08-25 19:56:47 -04:00
Eduardo Quezada D'Ottone
21867a6061
Merge branch 'master' into AI
2022-08-24 01:07:35 -04:00
DizzyEggg
05ec8fb182
AI knows Party mons
2022-08-23 11:58:17 +02:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.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_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Eduardo Quezada
e96c9c87fa
Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge
...
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 23:38:52 -04:00
Eduardo Quezada D'Ottone
49905cee04
Ability Patch
2022-05-03 14:14:04 -04:00
LOuroboros
f82c946ff3
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:26:27 -03:00
ultima-soul
18afd06f6d
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-18 00:28:18 -08:00
Eduardo Quezada D'Ottone
55b61313a4
PSS uses form change table for holding items.
...
# Conflicts:
# src/pokemon.c
2021-09-29 02:13:44 -03:00
ExpoSeed
f49da96f1d
Fix consumable item form change
2021-03-03 15:24:58 -06:00
ExpoSeed
07af84db8a
Implement FORM_ITEM_USE. Credits to Lunos for work on Gracidea
2021-03-03 13:54:25 -06:00
DizzyEggg
09dcff81f8
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2020-04-15 13:28:10 +02:00
GriffinR
7a5deff0bc
Add misc party constant usage
2020-04-09 15:18:53 -04:00
DizzyEggg
791ed999d9
Merge
2019-11-10 12:40:11 +01:00
GriffinR
27169f634b
Review changes for party menu doc
2019-10-31 21:33:01 -04:00
GriffinR
aec7eb6089
Clean up party_menu doc
2019-10-31 14:11:55 -04:00
GriffinR
e01ec84837
Document party_menu second pass
2019-10-31 03:25:56 -04:00
GriffinR
6db014cc32
Document party_menu first pass
2019-10-25 15:41:06 -04:00
DizzyEggg
1d10d44a4d
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2019-10-19 15:17:45 +02:00
GriffinR
a081124a20
Merge branch 'master' into doc-inc
2019-10-13 15:26:44 -04:00
Marcus Huderle
8df4982b3f
Merge remote-tracking branch 'upstream/master' into document-trade
2019-10-12 15:39:17 -05:00
GriffinR
1b7607bd91
Document cable_club.inc
2019-10-12 15:14:57 -05:00
GriffinR
d1bcd60b58
Document more trade.c
2019-10-08 20:25:46 -04:00
GriffinR
f179ab95c0
Document move tutors
2019-10-06 17:30:17 -04:00
DizzyEggg
cb6bafcb7f
Merge with master
2019-10-06 14:40:12 +02:00
GriffinR
dadb1cb9f1
More trade/union room doc, incidental party_menu doc
2019-10-04 23:31:25 -04:00
GriffinR
aac9658a8e
Document some field_specials data
2019-09-17 16:50:17 -05:00
DizzyEggg
51bfdffac3
Ability Capsule
2019-08-17 12:47:25 +02:00
Slawter666
2fdc489bc0
Further documentation of party_menu.c
2019-05-15 16:55:39 -05:00
Phlosioneer
63e700af6c
Use macros for summary windows
...
Other minor changes and fixes are included
2019-03-03 16:50:51 -05:00
Phlosioneer
e75f45dbcf
Reverse engineered many of the multiplayer events
...
Some corrections to the way events are handled and identified.
2019-02-10 20:42:50 -05:00
DizzyEggg
363fa9bed2
Clean up ram vars
2019-02-02 12:44:00 +01:00
DizzyEggg
442b1826a2
asm party and fldeff clean-up
2018-12-24 21:59:05 +01:00
DizzyEggg
9320fe8f85
Clear includes
2018-12-24 00:02:29 +01:00
golem galvanize
8781d969ff
finish party_menu
2018-12-18 05:38:08 -05:00
golem galvanize
71a7a8a075
decompiled up to sub_81B8A7C
2018-12-17 02:39:17 -05:00
golem galvanize
53fac4417b
fixing merge conflicts
2018-12-07 14:47:20 -05:00
golem galvanize
18124740a4
pushing so I can merge
2018-12-06 23:14:33 -05:00
golem galvanize
ba3247d5cd
decompiled more, stuck on sub_81B1760
2018-10-20 20:25:28 -04:00
Diegoisawesome
6206acd2d2
Finish shop and fldeff_escalator
2018-10-18 12:05:02 -05:00
golem galvanize
dded980cde
fix building
2018-10-17 23:36:18 -04:00
golem galvanize
2c6d634acd
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
2018-10-17 20:03:31 -04:00
golem galvanize
65a0c48eec
decompiled some more of the file
2018-10-17 20:03:02 -04:00
DizzyEggg
c3113db931
Move HEAP_SIZE to malloc and use void instead of empty argument list
2018-10-14 20:00:14 +02:00
Slawter666
991151f461
Move item_use data to C
2018-09-11 03:04:19 +01:00
Diegoisawesome
a07d69d7c2
Finish pokemon_summary_screen
2018-08-14 22:00:35 -07:00
