ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-06 09:33:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,736 Commits 1 Branch 0 Tags 235 MiB
376b65f6bf
Commit Graph

709 Commits

Author SHA1 Message Date
GriffinR
f95192ed87 Define terminal species IDs relatively 2020-12-08 00:45:05 -05:00
Evan
539a88207e add z crystal and z ring 2020-11-29 10:00:03 -05:00
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
Eduardo Quezada D'Ottone
6f29abbe0e
Plate type data and hold effect #1207 from ExpoSeed 2020-11-09 15:24:13 -03:00
Eduardo Quezada D'Ottone
b4cf674fa1 Moved ITEM_EXPANSION define to global.h to fix reading from other branches like Battle Engine 2020-11-09 12:38:53 -03:00
Eduardo Quezada D'Ottone
2e01654eb9 Plate type data and hold effect. 2020-11-08 01:47:05 -06:00
Eduardo Quezada D'Ottone
8d86169283 Merge remote-tracking branch 'pret/master' into IE-pretSync 2020-11-07 14:54:52 -03:00
ExpoSeed
c2e8f51e35
Merge pull request #145 from AsparagusEduardo/IE-Config 
Item Expansion config file.
 2020-11-02 11:31:51 -06:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Eduardo Quezada
4aa6442cd4 Fixed price mixed up. 2020-10-25 01:28:14 -03:00
LOuroboros
61b41f3599 Removed unused labels for expanded TMs 2020-10-24 09:57:11 -03:00
Kurausukun
44c2d15ca9 re-match sub_81C79BC (from #1177) 
also re-define RBG macros
 2020-10-23 22:07:30 -04:00
Eduardo Quezada
e861abeff3 Initial review changes. 2020-10-23 22:19:37 -03:00
Kurausukun
90211248af re-match Cmd_unknown_24 (from #1140) 
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
 2020-10-23 20:47:10 -04:00
Evan
d64b926469 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2020-10-19 11:22:41 -06:00
Eduardo Quezada
12bc93dc78 Review changes 2020-10-17 17:07:54 -03:00
Eduardo Quezada
ffe23b246b Ordered config. 2020-10-17 02:54:13 -03:00
Eduardo Quezada
0717783651 Dream ball config. 2020-10-17 02:51:08 -03:00
Eduardo Quezada
e320e6f7ff Quick Ball config. 2020-10-17 02:44:09 -03:00
Eduardo Quezada
6f246bb0c7 Dusk Ball config 2020-10-17 02:41:02 -03:00
Eduardo Quezada
ce3b877666 Dive Ball config. 2020-10-17 02:33:15 -03:00
Eduardo Quezada
14c243b273 Timer ball config. 2020-10-17 02:08:58 -03:00
Eduardo Quezada
32a2f91ecb Repeat Ball modifier in config. 2020-10-17 02:04:39 -03:00
Eduardo Quezada
6af4425081 Nest Ball modifier in config. 2020-10-17 02:00:53 -03:00
Eduardo Quezada
6676451353 Net ball modifier in config 2020-10-17 01:52:14 -03:00
Eduardo Quezada
0dfbbde7ce Heavy Ball modifier in config. 2020-10-17 01:47:04 -03:00
Eduardo Quezada
e65f22a76c Lure Ball modifier in config. 2020-10-17 01:33:10 -03:00
Eduardo Quezada
7fbd64ec37 Moved Shiny Charm rerolls into config file 2020-10-17 01:26:51 -03:00
Eduardo Quezada
137d9801c0 Key Items configuration in file. 2020-10-17 01:25:54 -03:00
LOuroboros
f00d50d7b7 Renamed the HOLD_EFFECT_EV_BOOST label 2020-10-15 05:25:07 -03:00
ExpoSeed
8b83d88e75 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion 2020-10-11 00:07:10 -05:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
ExpoSeed
c3113b43bb Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion 2020-10-04 02:36:07 -05:00
GriffinR
66bd1e6d3f Use constants for item digits 2020-09-25 11:18:52 -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
DizzyEggg
271219f962 Merge with master 2020-09-08 12:00:51 +02:00
PokeCodec
3d87a88067 Make battle pyramid defines into enums 2020-09-04 19:49:53 -04:00
PokeCodec
3a2a2b6ba9 Fix issues according to feedback 2020-09-04 19:49:53 -04:00
PokeCodec
d4158e490a Match more functions 2020-09-04 19:49:53 -04:00
PikalaxALT
135ed6a162
Merge pull request #1163 from GriffinRichards/doc-animthrow 
Minor battle_anim_throw cleanup
 2020-09-04 19:44:33 -04:00
GriffinR
f5495d1220 Give proper names to underwater maps 2020-09-01 03:03:14 -04:00
GriffinR
afb3472282 Minor battle_anim_throw cleanup 2020-08-30 15:11:44 -04:00
GriffinR
a9719c92bf
Merge pull request #1160 from kiliwily/master2 
add MAX_LEVEL_UP_MOVES macro
 2020-08-28 19:18:03 -04:00
kiliwily
c68c2b66e8 add more macros 2020-08-29 01:02:20 +02:00
GriffinR
09cfed64b5
Merge pull request #1146 from GriffinRichards/rename-songs 
Give songs meaningful english names
 2020-08-28 16:14:21 -04:00
kiliwily
5e7b6a089c add MAX_LEVEL_UP_MOVES macro 2020-08-28 20:36:07 +02:00
Thomas Winwood
58786a7ac0 Add MAX_PER_STAT_EVS macro 2020-08-28 02:25:02 +01:00
DizzyEggg
35559d6b71 Merge with master 2020-08-27 10:58:31 +02:00
GriffinR
fbb70b3727 Document contest AI scripts 2020-08-21 14:57:17 -04:00
GriffinR
ee72696b53 Sync encounter musics with encounter music types 2020-08-20 21:03:24 -04:00
GriffinR
d356e35b64 Fix incorrect pike curtain SE names 2020-08-20 20:23:08 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
6c34effda9
Merge pull request #1138 from GriffinRichards/doc-contest 
Document contest
 2020-08-20 16:03:47 -04:00
PokeCodec
e27975afaa Match battle script commands by correcting a function and the pokemon struct 2020-08-18 22:05:01 -04:00
GriffinR
503dafd210 Fix wallys parents misnamed as uncle/aunt 2020-08-18 17:51:41 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
2749948eeb Clean up contest doc 2020-08-16 05:52:17 -04:00
GriffinR
e98e4652fd Document contest live updates 2020-08-16 05:18:09 -04:00
GriffinR
70851d9083 Add MAP_SCRIPT descriptions 2020-08-11 15:50:09 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette 
Document roulette
 2020-08-10 17:18:09 -04:00
GriffinR
078c341b2b
Merge pull request #1122 from GriffinRichards/clean-battlemsg 
Add stat stage constants, clean up misc battle msg data
 2020-08-10 14:29:27 -04:00
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
PikalaxALT
03eba6a62c
Merge pull request #1116 from GriffinRichards/doc-slotmachine 
Document slot machine
 2020-08-01 09:56:44 -04:00
GriffinR
22b5b6b074 Start documenting roulette 2020-07-30 19:37:16 -04:00
GriffinR
7ada56f039
Merge pull request #1085 from GriffinRichards/doc-overworld 
Document field effects / misc overworld
 2020-07-28 17:54:25 -04:00
GriffinR
1f4813bfd2 Document slot machine funcs 2020-07-28 17:38:05 -04:00
DizzyEggg
11c2207839 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-27 14:54:32 +02:00
GriffinR
36a4764a78 Document some slot machine data 2020-07-26 02:15:59 -04:00
GriffinR
2439f42de4 Add warnings to generated files 2020-07-24 03:43:37 -04:00
GriffinR
aca50c87be Continue new contest documentation 2020-07-24 00:14:53 -04:00
GriffinR
52a4428ba6 Begin new contest documentation 2020-07-23 17:55:40 -04:00
GriffinR
4a42e2a710
Merge branch 'master' into doc-overworld 2020-07-23 10:31:52 -04:00
GriffinR
813f0c724f Sync flags with pokeruby 2020-07-22 18:00:41 -04:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00
GriffinR
1a27af8855
Merge pull request #1100 from GriffinRichards/clean-battlescrdata 
Misc battle and battle palace documentation
 2020-07-18 20:22:44 -04:00
GriffinR
fb402725c6 Convert more battle constants to bit shifts 2020-07-18 18:39:38 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
GriffinR
96fd719a19
Merge pull request #1081 from GriffinRichards/add-localids 
Add local object event ids for referenced objects
 2020-07-17 18:18:47 -04:00
Evan
f923f5198e add oval charm 2020-07-16 09:48:25 -06:00
DizzyEggg
6537310387 Merge with master 2020-07-15 10:23:58 +02:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
GriffinR
3c356a1d7a
Merge pull request #1082 from GriffinRichards/add-flagvarsave 
Allow flag/var counts to be updated alongside values
 2020-07-14 19:58:38 -04:00
GriffinR
c177872c9c
Merge pull request #1080 from AsparagusEduardo/EndBalls 
Created constant for easier Ball Expansion.
 2020-07-14 19:56:20 -04:00
Eduardo Quezada
b31efcd6e3 Renamed constant, 2020-07-12 01:49:32 -04:00
DizzyEggg
e03fea84d0 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-11 12:46:41 +02:00
GriffinR
beeb673ba1 Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave 2020-07-08 16:03:32 -04:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -04:00
GriffinR
89bcf3cbd9
Merge branch 'master' into add-localids 2020-07-08 15:47:45 -04:00
GriffinR
431c60c92c Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti 2020-07-08 15:45:31 -04:00
GriffinR
c0bc7e8f7b Fix elevator metatile typo 2020-07-06 16:02:49 -04:00
GriffinR
1ce929157f Clean up field effect doc 2020-07-02 05:05:13 -04:00
DizzyEggg
1ee15997b7
Update hold_effects.h 2020-07-01 09:39:56 +02:00
GriffinR
abdf7cbf02 Label fishing effect functions 2020-06-29 16:53:38 -04:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR
2ed1f7c6f9 Byte-align daily flags 2020-06-24 18:05:22 -04:00
GriffinR
06025e887f Allow flag/var counts to be updated alongside values 2020-06-24 17:00:19 -04:00
GriffinR
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
GriffinR
fac6288156 Add local object event ids for referenced objects 2020-06-22 17:18:58 -04:00
Eduardo Quezada
7244b80fc6 Created constant for easier Ball Expansion. 2020-06-21 02:36:46 -04:00
GriffinR
24569583e4 Document contest results 2020-06-18 17:50:13 -04:00
GriffinR
c2a07276ae
Merge branch 'master' into doc-link 2020-06-13 16:15:11 -04:00
GriffinR
2859900ea9 Second pass on documenting union room 2020-06-10 17:30:59 -04:00
Sierraffinity
74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
GriffinR
e6f5c4f264 Sync link_rfu_2.c 2020-06-07 12:54:50 -04:00
GriffinR
3f97763181 Document cable_club.c 2020-06-06 16:10:03 -04:00
GriffinR
9190af73b7 Label union room battle trainer 2020-06-03 15:28:29 -04:00
GriffinR
7632404ba5 Document union_room_chat.c 2020-06-02 18:35:00 -04:00
GriffinR
f53e2491bf Document union_room_player_avatar.c 2020-06-01 10:23:12 -04:00
GriffinR
4fe507e453 Document union_room.c 2020-05-31 13:11:18 -04:00
hondew
cfc47e642f Clean up slot drawing 
Fix typos
 2020-05-24 08:24:20 -05:00
hondew
26a197847a Rename tag offset functions 
Fix typo
 2020-05-24 08:24:20 -05:00
hondew
048d1ffbdb Clarify stages 2020-05-02 13:38:25 -04:00
DizzyEggg
f86282f423 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-29 08:47:51 +02:00
GriffinR
cb5b8da77b More trainer type usage 2020-04-28 19:59:08 -05:00
GriffinR
8d9e39e6d1 Sync map types with pokefirered 2020-04-28 19:59:08 -05:00
GriffinR
e5757a3def Use trainer type constants 2020-04-28 19:59:08 -05:00
GriffinR
ecd4824f67 Index heal location data, use better names 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
GriffinR
8d3b7bd0b1 Use metatile labels for decor gfx 2020-04-13 14:43:50 -04:00
GriffinR
7a5deff0bc Add misc party constant usage 2020-04-09 15:18:53 -04:00
GriffinR
8e4b987699 Revert more porymap-breaking changes 2020-03-18 03:22:07 -04:00
PikalaxALT
39da49495d
Merge pull request #1000 from GriffinRichards/doc-dex 
Document pokedex.c
 2020-03-17 10:43:57 -04:00
PikalaxALT
7a059c75a6
Merge pull request #968 from GriffinRichards/doc-regionmap 
Document some pokenav and region map
 2020-03-17 10:38:20 -04:00
Eduardo Alvaro Quezada D'Ottone
4032160641
Restored the definitions of named TM ID to how it is in pokeemerald. (#309) 2020-03-14 12:16:59 +01:00
GriffinR
31b0cbe9b4 Document pokedex.c 2020-03-09 16:24:01 -04:00
DizzyEggg
b5c54d404d Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-03-06 11:38:32 +01:00
GriffinR
4637085390 Clarify event ticket flag names 2020-03-03 01:36:20 -05:00
DizzyEggg
f2760e3083 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-02-29 09:47:14 +01:00
GriffinR
51cd0ac081 Rename battle anim type files, remove unneeded ARG_RET_IDs 2020-02-25 12:54:08 -06:00
GriffinR
e633b57593 Document remaining status/general/special anims 2020-02-25 12:54:08 -06:00
GriffinR
501d0d3c18 Document move anims C-H 2020-02-25 12:54:08 -06:00
DizzyEggg
13c0c64d70 Merge with master 2020-02-23 12:41:36 +01:00
GriffinR
f6275cce57 Misc constant use in TV 2020-02-17 13:09:35 -06:00
Eduardo Alvaro Quezada D'Ottone
2c172a3636
Shiny charm (#276) 
* Shiny Charm Item

* Shiny Charm Rerolls
 2020-02-17 11:08:06 +01:00
GriffinR
956090b05f Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-02-12 13:05:57 -05:00
GriffinR
eaf508ba5e Resolve missing parens errors 2020-02-12 00:44:09 -05:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
GriffinR
86354f1d50 Document some pokenav and region map 2020-02-05 21:04:43 -05:00
GriffinR
27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
DizzyEggg
bf6aa6a176 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-01-31 22:02:10 +01:00
GriffinR
9c934c9664 Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers 2020-01-26 12:23:08 -05:00
GriffinR
9a6c2c25d0 Add some capacity constants 2020-01-26 09:42:55 -06:00
GriffinR
25d7577d9d Label animated doors 2020-01-26 09:40:35 -06:00
GriffinR
4c12ad00d2 Merge branch 'master' into fix-eventobj 2020-01-19 21:57:29 -05:00
GriffinR
a40f054900 Move/rename gfx start/end vars 2020-01-18 08:49:34 -06:00
DizzyEggg
044f070020 Merge with master 2020-01-18 15:04:56 +01:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
huderlem
fa5816915d
Merge pull request #949 from GriffinRichards/doc-dome 
Document Battle Dome and add facility party constants
 2020-01-12 20:10:03 -06:00
GriffinR
6a470ddfda Some script clean up, document secret base secrets show 2020-01-12 19:39:30 -06:00
GriffinR
635267ce32
Merge branch 'master' into fix-eventobj 2020-01-08 05:51:49 -05:00