Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,955 Commits 3 Branches 0 Tags 878 MiB
Commit Graph

403 Commits

Author SHA1 Message Date
GriffinR 144c5888a1 Fix map script names 2019-10-13 15:29:53 -04: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 4e2be7ff5e Review changes for #835 2019-10-12 15:14:57 -05:00
GriffinR 1b7607bd91 Document cable_club.inc 2019-10-12 15:14:57 -05:00
GriffinR 07fa82c911 Last non-anim trade.c doc 2019-10-10 03:50:51 -04:00
GriffinR 32aa87c7e1 More trade doc, fix switch indentations 2019-10-09 14:21:29 -04:00
GriffinR 2c062dc764 More trade documentation 2019-10-09 05:56:44 -04:00
GriffinR d1bcd60b58 Document more trade.c 2019-10-08 20:25:46 -04:00
GriffinR d8f5e73bb7
Merge branch 'master' into doc-inc 2019-10-07 17:37:04 -04:00
GriffinR 0df304d629 Document roulette.inc 2019-10-07 02:00:16 -04:00
GriffinR c4deb4db96 Document field_poison 2019-10-06 20:04:30 -04:00
GriffinR f179ab95c0 Document move tutors 2019-10-06 17:30:17 -04:00
GriffinR 02070eaf73 Document kecleon 2019-10-06 16:06:34 -04:00
Marcus Huderle 799edaf3e6 Document hide/show reflection movement actions 2019-10-06 14:17:34 -05:00
GriffinR 66a68159b1 Continue trade doc 2019-10-05 10:41:37 -04:00
GriffinR dadb1cb9f1 More trade/union room doc, incidental party_menu doc 2019-10-04 23:31:25 -04:00
GriffinR 6b556900f8 Move union room data, more trade doc 2019-10-04 17:24:03 -04:00
GriffinR 4a7f061885 Document some of trade 2019-10-03 19:39:37 -04:00
GriffinR c3c8fb40cf Move trade data, some trade.c clean up documentation 2019-10-03 01:16:22 -04:00
GriffinR 73b96fe145 Rename CONTACT macros to ON_DAMAGE 2019-09-27 12:27:36 -04:00
GriffinR 3bf8129396 Clean up new Cmd macro names 2019-09-27 02:54:28 -04:00
GriffinR 1491b1855b
Merge branch 'master' into document-eventscripts 2019-09-26 15:03:22 -04:00
GriffinR 1016b23918
Merge branch 'master' into rename-tablecmds 2019-09-26 15:02:38 -04:00
GriffinR 4e98a0cc4b Remove Egg parent constants 2019-09-25 18:46:25 -05:00
GriffinR 801ca37f04 Document day_care.inc and related 2019-09-25 18:46:25 -05:00
GriffinR de6e1e9ecf Use multi constants from merge 2019-09-23 00:36:49 -04:00
GriffinR a180d2af49
Merge branch 'master' into document-eventscripts 2019-09-22 12:18:48 -04:00
GriffinR 8e4e344c7d
Merge branch 'master' into document-scriptmenu 2019-09-22 09:45:44 -04:00
GriffinR 1ffa890d27 Consolidate remaining pokemon constants 2019-09-22 08:14:22 -05:00
GriffinR 80f58f7b24 Document PLAYER_HAS constants, consolidate poke constants 2019-09-22 08:14:22 -05:00
GriffinR b6dffcf8b7 Clean up script_menu documentation 2019-09-19 19:23:24 -04:00
GriffinR 9fb24bbbce Remainder of script_menu documentation 2019-09-19 18:31:09 -04:00
GriffinR 275695c189 Document more script_menu, lilycove harbor 2019-09-19 17:27:34 -04:00
GriffinR de0084ef7a Document multichoice ids 2019-09-19 00:56:51 -04:00
GriffinR b596322ca2 Initial script_menu documentation 2019-09-18 18:57:25 -04:00
GriffinR 58b8d7c297
Merge branch 'master' into document-eventscripts 2019-09-17 18:01:20 -04:00
GriffinR 6ab192e739 Review changes for #807 2019-09-17 16:50:17 -05:00
GriffinR 6ab49da811 Clean up field_specials documentation 2019-09-17 16:50:17 -05:00
GriffinR 3dbd375779 Some frontier field_specials documentation 2019-09-17 16:50:17 -05:00
GriffinR aac9658a8e Document some field_specials data 2019-09-17 16:50:17 -05:00
GriffinR 945d3d3a27
Merge branch 'master' into document-eventscripts 2019-09-17 00:10:23 -04:00
GriffinR 06af24bce5 Use misc ScrCmd constants 2019-09-16 19:44:47 -05:00
GriffinR 85d97542cd Use MAX_MON_MOVES constants 2019-09-16 19:21:23 -05:00
GriffinR bb236b490d Update BS constants for Cmd rename 2019-09-15 17:58:12 -04:00
GriffinR 9fbcd552de document remainder of secret_base scripts, delete unneeded scripts.incs 2019-09-06 02:12:00 -04:00
GriffinR 6b04ea0727
Merge branch 'master' into document-eventscripts 2019-09-03 22:22:14 -04:00
GriffinR 869d0eebc0
Rename atk## constants and states 2019-08-23 08:46:21 -04:00
GriffinR a46f7952f9 Use DIR constants for createvobject 
Also uses event object ids in LinkContestRoom1
 2019-08-21 17:11:06 -05:00
GriffinR f08615881e Changes from review 2019-08-21 17:06:55 -05:00
GriffinR 5fb7ab05dd clean up 2019-08-21 17:06:55 -05:00
GriffinR d931ba9602 document remaining funcs 2019-08-21 17:06:55 -05:00
Tustin2121 1069adae46 Renaming unknown link room ids to be the same as name 
This descrepency was causing a lot of annoyance when using porymap, because porymap generated the ids in map_groups.h from the name, and mapjson was generating map_groups.h from the id in the json files. So just name them the same already like every other map in the repo.
 2019-08-17 13:26:57 -04:00
GriffinR ecf2097abb initial event_scripts documentation 2019-08-14 23:38:42 -04:00
GriffinR 191f74525d
name unused route state vars 2019-08-05 11:50:29 -04:00
GriffinR c2bf668fdd
rename town/city vars 2019-08-05 11:23:45 -04:00
GriffinR 0f5d96e5f5
name used and unnamed vars 2019-08-03 14:12:48 -04:00
Gudf 75f165ed74 Use a constant instead of integer literals when checking for shinyness 2019-07-11 20:16:39 +02:00
garak 2c22a82a25 clean metatile constants file 2019-06-16 10:08:07 -05:00
garak a43dcd26bd finish labeling metatiles 2019-06-16 10:08:07 -05:00
garak 713f61de7c continue labeling metatiles for scripts 2019-06-16 10:08:07 -05:00
garak fbbc2b1d8b finish src metatile labels 2019-06-16 10:08:07 -05:00
garak 9f8a30e4e7 label metatiles in fldeff_cut.c 2019-06-16 10:08:07 -05:00
garak 8b26bd1e09 label metatiles for general, fallarbor, and sootopolis gym tilesets 2019-06-16 10:08:07 -05:00
garak aad839995f label metatiles for pacifidlog and fortree bridges 2019-06-16 10:08:07 -05:00
garak 724add638c label regi cave metatiles 2019-06-16 10:08:07 -05:00
garak 7e35b8a710 label remaining metatiles in field_specials.c 2019-06-16 10:08:07 -05:00
garak a9560d9c62 give metatile labels to petalburg gym and pcs 2019-06-16 10:08:07 -05:00
garak c68ba9f4e8 label mauville gym metatiles 2019-06-16 10:08:07 -05:00
DizzyEggg 453be19670 change cooltrainer unused class name 2019-05-25 08:26:40 -05:00
DizzyEggg a074f36766 USE PROTAG 2019-05-25 08:26:40 -05:00
DizzyEggg e706280503 Rename PKMN TRAINER CALSS 4 2019-05-25 08:26:40 -05:00
Flametix dbdb827e54 Fix typos (#713) 
* fix typos
 2019-05-18 21:56:19 -05:00
garak daecd5ec40 name some trainer card related functions 2019-05-16 17:10:13 -05:00
Fontbane 2c076f1f3e Doc most OnTransitions 2019-04-22 17:23:59 -05:00
DizzyEggg b4e1375bb6 Document pokemon item effects 2019-04-16 11:23:09 -05:00
DizzyEggg 59797e4801 Use constants in battle_anim_special.c 2019-04-14 10:19:50 -05:00
Marcus Huderle 78151b6d88 Start decompiling pokemon_jump.c 2019-04-07 13:12:27 -05:00
DizzyEggg b85a74afc5 Give names to battle anim backgrounds 2019-04-06 12:44:27 -05:00
DizzyEggg 19f151417e Rename sprite sheet to sprite gfx 2019-04-06 10:14:48 -05:00
DizzyEggg b93581b519 Rename battle anim sprites 2019-04-06 10:14:48 -05:00
DizzyEggg 311c1b9cba Change anim tag names 2019-04-06 10:14:48 -05:00
Marcus Huderle 033580da96 Document secret base 2019-04-05 16:24:57 -05:00
Phlosioneer 6916f09cd5 Expand MatchCallStruct defs, use REMATCH_* enum 2019-04-02 07:28:30 -05:00
PikalaxALT 7571969a45 Finish union room battle 2019-04-01 22:08:50 -05:00
PikalaxALT 1fe5208560 through sub_801A02C 2019-04-01 12:05:58 -04:00
Phlosioneer cd069446e0 Merge branch 'master' into pokedex-area-const-array 2019-03-31 20:43:42 -04:00
Phlosioneer 3181c64c64 Change names from MAP_AREA_ to MAP_GROUP_ 2019-03-31 20:40:14 -04:00
DizzyEggg 35cffea987 Helpful macros for atk49 2019-03-30 08:29:56 -05:00
scnorton c6c0c9582f Port menews_jisan.c from FireRed 2019-03-27 07:40:08 -05:00
Marcus Huderle e6caf0ff10 Port mevent2.c from pokefirered 2019-03-24 18:29:00 -05:00
Marcus Huderle 456cc3a6f0 Split out the remaining wireless-related files 2019-03-24 13:15:37 -05:00
Fontbane e8add87bf3 Document Field Effects and some related text 
Also VAR_TRICK_HOUSE_LEVEL
 2019-03-23 09:57:37 -05:00
Marcus Huderle f4f666f5af Finish decompiling ereader.c 2019-03-22 13:36:06 -05:00
Phlosioneer 092608aef6 Add a constant for "no music" on maps. 2019-03-16 12:31:29 -05:00
Phlosioneer 7f70b629f5 Document sAreaGlowTilemapMapping 
I used a script to generate the format for the array, so I can easily
change its formatting if needed.
 2019-03-12 05:35:15 -04:00
Phlosioneer 8e1537fb57 Document map name popup flag 2019-03-10 09:23:58 -05:00
huderlem ee9694d9ba
Merge pull request #587 from Phlosioneer/document-all-event-vars 
Document all event vars
 2019-03-02 08:24:46 -06:00
huderlem 3b04cfa437
Merge pull request #551 from Phlosioneer/multiplayer-stuff 
Document overworld.c and link stuff in general
 2019-03-01 08:43:55 -06:00
Phlosioneer a7e5852f1d More minor fixes 2019-03-01 01:49:11 -05:00
Phlosioneer 99bfd8c80f VAR_0x3F20 is not a var 2019-02-28 00:10:44 -05:00
Phlosioneer 373d73eb3b Fix last special var 2019-02-28 00:06:27 -05:00
Phlosioneer bf45b83c65 Finish documenting event vars 2019-02-27 23:54:51 -05:00
Phlosioneer 782979f1fc Finish documenting trainer hill 
Trainer hill isn't anywhere close to done, but I figured out enough
to name the VAR. That's all this PR should do.
 2019-02-27 22:16:01 -05:00
Phlosioneer 66f0616a2d I guess I'm documenting Trainer Hill now 2019-02-27 21:31:05 -05:00
Phlosioneer e77e7844ea Name several vars, document some related events 2019-02-27 20:25:09 -05:00
Phlosioneer 648fc3d4f3 Name more unknown vars 2019-02-27 15:18:56 -05:00
Phlosioneer 4137dd7b0b Identify unused, never read, and never written vars 2019-02-27 14:42:32 -05:00
Marcus Huderle 4b9e93850c Document easy chat screen types 2019-02-27 12:55:29 -06:00
Phlosioneer fe55580fe1 Reverse engineer unusual weather events 2019-02-27 03:42:04 -05:00
Phlosioneer 3a44b090d1 Merge branch 'master' into multiplayer-stuff 2019-02-26 22:07:29 -05:00
huderlem 153f134318
Merge pull request #583 from huderlem/easy_chat 
Decompile more easy_chat.c
 2019-02-25 14:12:18 -06:00
Marcus Huderle 7ea05431a5 Decompile more easy_chat.c 2019-02-25 14:11:31 -06:00
huderlem b3a7a1278a
Merge pull request #577 from Phlosioneer/weather-15 
Document the weather state functions
 2019-02-25 08:03:22 -06:00
huderlem 84573f1774
Merge pull request #574 from Phlosioneer/event-vars 
Event vars
 2019-02-25 08:02:28 -06:00
Phlosioneer 5f7a971313 Source file part of map script renaming 2019-02-25 08:01:22 -06:00
Phlosioneer 87859a655b Fix flag formatting for fun 2019-02-25 02:20:38 -05:00
Phlosioneer b2866fae21 Document the weather state functions 
All weather types are now documented (including WEATHER_15)
 2019-02-22 22:20:42 -05:00
Phlosioneer cea5696f23 Finish moving pokeruby vars 2019-02-22 04:18:43 -05:00
Phlosioneer e12a7790cf Start porting pokeruby vars to pokeemerald 2019-02-22 04:01:38 -05:00
Phlosioneer eca329f9c5 Merge branch 'master' into multiplayer-stuff 2019-02-21 21:22:10 -05:00
Phlosioneer 486cf449b8 Make flag names more consistent 2019-02-18 14:17:02 -05:00
Phlosioneer fcb541189d Rename some flags, and use map ID macros 2019-02-18 02:02:20 -05:00
Phlosioneer e90e3458cb Document the regi* code more 
Fixed some confusing naming, named some unknown symbols, and fixed the
names of some flags.
 2019-02-15 18:24:55 -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
Marcus Huderle 6f1d2b870c Give proper names to dynamic map layouts 2019-02-09 09:57:30 -06:00
Marcus Huderle d4125fef9b Cleanup and add game version flag to mapjson tool 2019-02-04 17:28:45 -06:00
Marcus Huderle 29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
Marcus Huderle 5c1667b41a Define layout constants 2019-01-29 16:55:25 -06:00
Diegoisawesome 900f294011 Add var const prefix for some missed var numbers 2019-01-21 22:34:01 -06:00
DizzyEggg 4b420643dc Merge branch 'master' into trainer_hill 2019-01-13 20:51:05 +01:00
DizzyEggg c0bc01d301 Move some vars to C 2019-01-13 13:15:23 +01:00
Diegoisawesome af2c39860d Rename non-mapsec constants 2019-01-08 13:40:11 -06:00
Slawter666 aeaf390706 Update constants 2019-01-05 20:12:50 +00:00
Tetrable 97ebeef1db Relabel TEMP_FLAG_20 into FLAG_UNUSED_0x020 2019-01-03 18:13:16 +00:00
Tetrable 30e7ac0dca Fix merge conflicts 2019-01-03 02:28:18 +00:00
Tetrable 50aa222aff Corrected typos 2019-01-03 01:54:55 +00:00
Marcus Huderle e1092028ec Decompile match_call.c 2019-01-02 19:46:15 -06:00
Tetrable a3ebca4d81 Fix merge conflicts 2019-01-02 21:25:14 +00:00
Tetrable 1e3da62d24 Finish off labelling flags 2019-01-02 21:12:43 +00:00
Melody dc6c0ed17e add event object var references 2018-12-29 11:56:53 -06:00
DizzyEggg 55e44b0951 a bit more of contest painting effect 2018-12-29 11:48:28 -06:00
Marcus Huderle d0d870e193 Cleanup formatting 2018-12-29 11:36:54 -06:00
Marcus Huderle 67636b7c64 Document deoxys rock 2018-12-29 11:36:54 -06:00
Melody 6d556f8cf7 improve checkplayergender calls 
clean up constant definitions

make tweaks from review
 2018-12-28 08:22:21 -06:00
Marcus Huderle d59f5a8e56 Misc overworld documentation 2018-12-27 16:52:13 -06:00
Marcus Huderle dcbc8db6a3 Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c) 2018-12-25 11:46:35 -06:00
DizzyEggg ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
Diegoisawesome 6ef9671718
Merge pull request #440 from garakmon/fldeff 
Decompile / port fldeff_80F9BCC
 2018-12-19 22:16:59 -06:00
Melody 5e6ceeb631 update applymovement to remove magic numbers 2018-12-19 14:08:01 -05:00