ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-07 18:13:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,816 Commits 1 Branch 0 Tags 235 MiB
c4db74460a
Commit Graph

233 Commits

Author SHA1 Message Date
sphericalice
3db871c49a Refactor CanThrowLastUsedBall and related functions 2021-12-05 23:10:05 +00:00
LOuroboros
2e67153982 Renamed the Enigma Berries' constants 2021-12-01 22:16:38 -03:00
TheXaman
df8dfd9a65 added #ifdef TX_DEBUGGING for wild encounter, bag use and catching flags 2021-11-28 20:53:23 +01:00
TheXaman
5780560007 fixed some bugs, thanks to cbt 2021-11-28 20:28:54 +01:00
ultima-soul
a8f9a54787 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-21 10:41:32 -08:00
ultima-soul
57bf1c7824 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-21 10:41:12 -08:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
TheXaman
2f8896f2f0 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system 2021-11-18 15:13:04 +01:00
GriffinR
3e49ac804b
Merge branch 'master' into doc-finalmisc 2021-11-03 13:56:22 -04:00
GriffinR
afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
GriffinR
d6571f2355
Merge pull request #1525 from GriffinRichards/doc-recmix 
Document remainder of Record Mixing
 2021-10-26 14:18:38 -04:00
GriffinR
7f3c529935 Document record mixing mail swap 2021-10-24 15:49:19 -04:00
GriffinR
b31bddddca Clean up metatile_behavior 2021-10-18 12:54:29 -04:00
ghoulslash
c077091dbf small fixes, check GetCatchingBattler's semi-invulnerability 2021-10-15 14:57:26 -04:00
ghoulslash
883a249836 config for catching semi-invulnerable mons 2021-10-15 09:20:32 -04:00
GriffinR
862febe03a Add MAP_OFFSET 2021-10-09 13:19:27 -04:00
Eduardo Quezada D'Ottone
f9d1375451
Merge pull request #1375 from ExpoSeed/PE/form-change-table 
Form change table
 2021-09-22 00:04:26 -03:00
ghoulslash
39a254f80d fix sprite pos changes 2021-09-01 07:45:41 -04:00
ghoulslash
dfe59992d3 merge with be 2021-09-01 07:37:45 -04:00
ghoulslash
88476e0ac2 remove 2nd case in CanThrowBall 2021-08-31 12:59:20 -04:00
ultima-soul
5cb73a012c Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp 2021-08-30 11:57:27 -07:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
ultima-soul
988320b89a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:25:13 -07:00
ultima-soul
840e2bc3f9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-08-16 16:33:34 -07:00
ultima-soul
b620349da0 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-16 15:43:27 -07:00
ultima-soul
64a48800c9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-08-11 17:10:57 -07:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
ultima-soul
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07:00
ghoulslash
c06029bc72 add last used ball 2021-06-25 13:37:59 -06:00
ExpoSeed
b6b0062bd6 Change map header flags to use a bitfield 2021-06-13 17:02:06 -05:00
ultima-soul
0a87adad1a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 18:05:52 -07:00
ultima-soul
00c3f060b1 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 23:53:23 -07:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
GriffinR
8c820878bf Document Battle Pyramid Bag 2021-04-23 15:07:36 -04: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
ultima-soul
46e853c13b Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:23:23 -08:00
ultima-soul
5fdb578747 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-02-01 15:58:18 -08:00
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
GriffinR
cf9f8d01c5 Add misc item data constants 2021-01-19 05:49:20 -05:00
GriffinR
88e951bfe3 Label some ReturnToField funcs 2021-01-01 17:11:06 -05:00
ultima-soul
99fdc13e61 Merge branch 'master' into battle_engine_sync 2020-11-07 15:59:20 -08:00
Eduardo Quezada D'Ottone
8d86169283 Merge remote-tracking branch 'pret/master' into IE-pretSync 2020-11-07 14:54:52 -03:00
aaaaaa123456789
bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
Eduardo Quezada
9eeb574ad1 Fixed Escape Rope using bug. Thanks ExpoSeed! 2020-10-25 01:08:27 -03:00
TheXaman
6456009a44 Implementation if Pyredrid and AsparagusEduardo debug menu plus huge rewrite and tons of additions 
V2: Fly, Warp, Flags, Vars, give items, give pkm 2 versions

Improved cheats, reworked the vars system

vars function now starts at VARS_START and end VARS_END

Figured out how to display FieldMessages, reimplemented CheckSafeBlock, cleanup

DebugAction_DestroyExtraWindow instead of multiple, renamed text variables

cleanup + pokemon simple

give pokemon complex nearly done

Complex pkm works, items now with icons

if statement cleanup

alter build tools to include maps per map group

Warp functionallity

added hex value to flags and vars

cleanup

Credits
 2020-10-20 20:37:02 +02: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
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
DizzyEggg
271219f962 Merge with master 2020-09-08 12:00:51 +02:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
DizzyEggg
35559d6b71 Merge with master 2020-08-27 10:58:31 +02:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
e06de33cbd
Merge branch 'master' into doc-overworld 2020-07-28 17:46:17 -04:00
PokeCodec
c5aa91741b Change signedness and add casts to avoid implicit conversion warnings 2020-07-24 22:18:57 -04:00
DizzyEggg
6537310387 Merge with master 2020-07-15 10:23:58 +02:00
DizzyEggg
62dc94e9c8 Merge with master 2020-07-15 10:13:19 +02:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02:00
DizzyEggg
e03fea84d0 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-11 12:46:41 +02:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR
06025e887f Allow flag/var counts to be updated alongside values 2020-06-24 17:00:19 -04:00
Sierraffinity
74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
DizzyEggg
4fc88d18aa Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-29 09:17:25 +02:00
DizzyEggg
f86282f423 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-29 08:47:51 +02:00
GriffinR
b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
DizzyEggg
09dcff81f8 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-15 13:28:10 +02:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
GriffinR
487080b425 Minor player avatar doc 2020-04-01 02:54:26 -04:00
DizzyEggg
13c0c64d70 Merge with master 2020-02-23 12:41:36 +01:00
DizzyEggg
108f6b711f Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-02-23 10:58:26 +01:00
DizzyEggg
5054727167 Allow second mon to throw a ball if first dead 2020-02-16 13:24:50 +01:00
DizzyEggg
044f070020 Merge with master 2020-01-18 15:04:56 +01:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
DizzyEggg
9a2888fdbf Merge into master 2019-12-23 16:46:03 +01:00
DizzyEggg
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +01:00
GriffinR
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
Diegoisawesome
026e1108b2
Merge pull request #935 from GriffinRichards/doc-warp 
Document some warp/field screen effect
 2019-12-20 23:44:56 -08:00
GriffinR
949509aade
Merge branch 'master' into fix-eventobj 2019-12-18 13:16:38 -05:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
GriffinR
96ec5e1b84 Use fadescreen constants 2019-12-15 11:42:50 -05:00
DizzyEggg
871e093b65 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-12-09 08:20:29 +01:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
GriffinR
1b30f0c973 Rename event_obj_lock to event_object_lock 2019-12-06 02:55:30 -05:00
GriffinR
c51e0f3bae
Merge branch 'master' into fix-eventobj 2019-12-06 02:34:54 -05:00
GriffinR
41c1c9ca8a Set up Battle Pike macros 2019-12-05 21:11:17 -06:00
GriffinR
4c52cf9ed1 Fix event constant file names 2019-11-21 14:03:35 -05:00
GriffinR
82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR
ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
DizzyEggg
791ed999d9 Merge 2019-11-10 12:40:11 +01:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
huderlem
6eaac9ea9d
Merge pull request #863 from GriffinRichards/doc-partymenu 
Document party menu
 2019-10-31 21:36:56 -05:00
tustin2121
218fcd99b3 Itemfinder code should use flag constant 2019-10-31 21:34:03 -05:00
GriffinR
b1ea2592c3
Merge branch 'master' into doc-partymenu 2019-10-31 14:22:51 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
GriffinR
0db188b487 Clean up berry_tree.inc and misc adjacent documentation 2019-10-20 09:46:46 -05:00