Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,182 Commits 1 Branch 0 Tags
Commit Graph

64 Commits

Author SHA1 Message Date
LOuroboros
5718d99f40
Used the COMPOUND_STRING macro to unify item descriptions and item data (#3432) 
* Used the COMPOUND_STRING macro to unify item descriptions and item data

Misc. Changes:
-Corrected the Serious Mint's description.
-Moved the X_ITEM_STAGES and CONFUSE_BERRY_HEAL_FRACTION macros to the top of the file for consistency's sake.
-Corrected the Tapunium Z's description.

* Oops. I forgot to delete the old .description of the X Attack

* Removed definition of CONFUSE_BERRY_HEAL_FRACTION from include/constants/items.h

* Moved CONFUSE_BERRY_HEAL_FRACTION back to include/constants/items.h

* Unified item description strings where possible

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-20 17:28:43 +01:00
DizzyEggg
9778587935 optimize battle util and item functions by setting u32 variables 2023-09-13 00:02:26 +02:00
LOuroboros
9d6953cc63
Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field (#3243) 
* Deleted sTMHMMoves array, TMs/HMs read moves from their secondaryId item field now
The unused "registrability" variable has been removed in order to preserve the size of the gItems array after turning the secondaryId variable into a u16.
* Made ItemIdToBattleMoveId return ITEM_NONE if an item that is not a TM/HM is passed through it
* Renamed IsMoveHm to IsMoveHM
 2023-08-21 12:49:17 +01:00
Bassoonian
2aa4d2da38 Fix Ice Heal message 2023-04-25 19:38:47 +02:00
Bassoonian
9c9a1fb831 Allow for healing with items 2023-04-22 19:18:10 +02:00
CallmeEchoo
216b7a4dfd fix dire hit and paralyze heal 2023-04-20 09:44:18 +02:00
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
7ddebb6671 Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 
# Conflicts:
#	data/battle_ai_scripts.s
#	src/menu_specialized.c
#	src/mystery_gift_menu.c
 2023-02-15 14:18:00 -03:00
GriffinR
28ada9c93b Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest-bar 2023-02-01 15:52:19 -05:00
LOuroboros
52dda5fc0f Actually removed ItemId_GetId 2022-10-30 22:52:22 -03:00
Eduardo Quezada
68b474c0f0 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007 
# Conflicts:
#	include/constants/items.h
#	src/battle_interface.c
 2022-10-07 14:52:32 -03:00
Eduardo Quezada
a20334f79a Removed unused functions in item header 2022-10-04 22:06:07 -03:00
Eduardo Quezada
c68ca72fb0 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 2022-09-13 16:26:59 -03:00
LOuroboros
2d841a25f9
Removed unused extern declaration of old gUnknown func 2022-09-13 15:45:01 -03:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
LOuroboros
ea345f90f5 Picked the correct pointers for correctness' sake 2022-08-31 23:06:20 -03:00
LOuroboros
e02b33ee11 Automatized the contents of some sideof in src/item.c 2022-08-31 23:00:24 -03:00
GriffinR
5fa8ca55b0 Clean up some additional unknowns 2022-05-17 17:12:45 -04:00
ultima-soul
2d3ba500c9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2022-03-01 15:10:19 -08:00
LOuroboros
dbca24aa82 [LEAK INFORMED] Documented the unk19 item field 2021-12-17 19:41:39 -03:00
LOuroboros
ea12dfdf2c Implemented Fling 2021-11-15 12:41:00 -03:00
ultima-soul
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07:00
ExpoSeed
361fa594b3 Various BUGFIXes and UBFIXes 2021-05-15 15:56:17 -05:00
Kurausukun
2cc38acb84 fix item.c gotos 2021-05-13 11:29:11 -05:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix 
Document TV
 2021-04-29 00:25:01 -04:00
GriffinR
aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR
8c820878bf Document Battle Pyramid Bag 2021-04-23 15:07:36 -04:00
PikalaxALT
e6b1b97aa1 Nonmatching resoltuion 
- Fix fakematch in Cmd_get_used_held_item
- Remove `static` overrides in MODERN in four objects
 2021-03-12 13:55:07 -05:00
GriffinR
752982552e Add FIRST_BALL, some FIRST_BERRY_INDEX usage 2021-01-19 13:39:18 -05:00
Kurausukun
9c9b626ccb re-match CheckBagHasSpace (from #1179) 2020-10-25 23:19:56 -04:00
aaaaaa123456789
7dc95a0103 Undo PokeCodec's PRs 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
 2020-09-13 06:30:55 -03:00
PokeCodec
0039542e19 Match CheckBagHasSpace 2020-09-05 14:41:43 -04:00
Thomas Winwood
a529bcf0b6 Tidy up naked functions 2020-09-02 14:49:04 +01:00
GriffinR
9a6c2c25d0 Add some capacity constants 2020-01-26 09:42:55 -06:00
GriffinR
6a470ddfda Some script clean up, document secret base secrets show 2020-01-12 19:39:30 -06:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
PikalaxALT
20863ac85b Resolve compile warnings in modern 2019-07-18 20:46:00 -04:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
Phlosioneer
bf45b83c65 Finish documenting event vars 2019-02-27 23:54:51 -05:00
Slawter666
2fa0555ed5 Document some of item_menu.c 2018-12-15 18:08:13 +00:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
nullableVoidPtr
3909b6408c Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
 2018-12-06 09:44:08 +08:00
DizzyEggg
d8b952f94c Clean up items data 2018-12-03 13:37:32 +01:00
DizzyEggg
4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
DizzyEggg
96f2b995dc Pyramid bag review changes 2018-08-30 21:28:03 +02:00
DizzyEggg
917b32ffbe Finish decompiling pyramid bag. 2018-08-30 20:10:57 +02:00
DizzyEggg
bc9fe72c6e Do some pyramid bag 2018-08-30 15:01:07 +02:00
DizzyEggg
edcf04b665 Document battle dome. 2018-08-25 19:59:47 +02:00
DizzyEggg
1c48e58574 small fixes 2018-07-07 14:24:19 +02:00