atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6136 commits 2 branches 40 tags 600 MiB
Commit graph

312 commits

Author SHA1 Message Date
AJ Fontaine
b80fa767ab
Give rivals and Maxie battles better names 
Name describes where the battle is and for rivals, which starter the player chose.
 2019-12-23 10:42:06 -05: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
ff2d8a9c4e Add frontier trainer constants 2019-12-20 21:14:05 -05:00
jiangzhengwenjz
681d929892 DrawTradeMenuPartyInfo 2019-12-21 06:09:59 +08:00
GriffinR
23f952b34e Merge master into doc-tower 2019-12-17 21:17:46 -05:00
GriffinR
ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
GriffinR
db8a5c6c2b
Merge branch 'master' into fix-eventobj 2019-12-15 11:47:27 -05:00
GriffinR
6556b556dd
Merge branch 'master' into fix-eventobj 2019-12-11 01:09:06 -05:00
GriffinR
47b0d8a597
Merge branch 'master' into doc-matchcall 2019-12-10 20:43:27 -05:00
GriffinR
b7ab9cbf4c Update JP translation and fix typo 2019-12-10 19:29:23 -06:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
GriffinR
b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05:00
GriffinR
2756771958 More usage of ST_OAM constants and SPRITE macros 2019-12-06 19:05:44 -06:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
GriffinR
c51e0f3bae
Merge branch 'master' into fix-eventobj 2019-12-06 02:34:54 -05:00
GriffinR
548af3c0f1 Document a bit of Match Call 2019-12-05 15:33:36 -05:00
AJ Fontaine
2d1a780dd8
Fix Hondrew Berry typo 2019-11-28 11:44:13 -05:00
GriffinR
f559fa3fe2 Merge master into ObjEvent rename 2019-11-25 20:00:04 -05:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
GriffinR
570881b119 Rename event_object directories 2019-11-21 00:44:55 -05:00
GriffinR
98b81722e7 Rename field_objet_palettes 2019-11-20 23:54:22 -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
GriffinR
81507fc8b7 Move Apprentice data 2019-11-20 19:04:25 -05:00
GriffinR
a486c8affd Begin documenting Apprentice, merge with master 2019-11-18 12:47:10 -05:00
GriffinR
3bbdee61b8 Clean up Trainer Hill doc 2019-11-16 13:02:35 -06:00
GriffinR
5e01871f8b Document Trainer Hill 2019-11-16 13:02:35 -06:00
GriffinR
2c3726a328 Document contest strings 2019-11-16 12:50:01 -06:00
GriffinR
248b85c3cb Document Frontier Exchange Corner scripts 2019-11-16 12:00:35 -06:00
GriffinR
fc3783b739 WIP Document apprentice 2019-11-16 12:28:49 -05:00
GriffinR
ef8370566f Document Contest scripts 2019-11-13 18:20:55 -06:00
GriffinR
5c627518b3 Rename Grunts to use location-specific names 2019-11-04 16:45:00 -06:00
GriffinR
b1ea2592c3
Merge branch 'master' into doc-partymenu 2019-10-31 14:22:51 -04:00
GriffinR
b33db9b96c Move party menu data 2019-10-31 14:16:43 -04:00
GriffinR
973e6f9667 Document mauville_man.inc 2019-10-21 17:21:53 -05:00
garak
9b9b14ad0a remove empty groups from wild encounter fields json objects 2019-10-14 18:12:03 -05:00
garak
c73e20b6af add subgroups for fishing rods to encounter json 2019-10-14 18:12:03 -05:00
Marcus Huderle
8df4982b3f Merge remote-tracking branch 'upstream/master' into document-trade 2019-10-12 15:39:17 -05:00
GriffinR
3514f9dd6b Clean up trade.c doc 2019-10-10 18:46:42 -04: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
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
2b0c944286 Document more of trade 2019-10-04 07:42:45 -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
de6e1e9ecf Use multi constants from merge 2019-09-23 00:36:49 -04: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
6ab192e739 Review changes for #807 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
6c9997a906 Document decor icons 2019-09-16 19:23:21 -05:00
PikalaxALT
e87f4f4cc7 Unify TrHillTag struct definitions (variable floors) 2019-09-05 20:48:48 -05:00
PikalaxALT
904bba9e16 NULL_BATTLE_TOWER_POKEMON define 2019-09-05 20:48:48 -05:00
PikalaxALT
e2fbce996e Use designated initializers (C99 feat) 2019-09-05 20:48:48 -05:00
PikalaxALT
f3bed6045e Disassemble data/ereader_screen.s 2019-09-05 20:48:48 -05:00
PikalaxALT
a9918c3b89 Partial refactor of TryWriteTrainerHill_r 2019-09-05 20:48:48 -05:00
PikalaxALT
5c7eac7134
Merge pull request #744 from PikalaxALT/remove_tutor_casts 
Remove unnecessary tutor learnset casts
 2019-09-04 16:51:06 -04:00
PikalaxALT
36723a235a
Merge pull request #735 from garakmon/encounter_json 
Add Different Field Info to Wild Encounters JSON
 2019-09-04 16:50:39 -04:00
tustin2121
cdae0c1444 Change event object graphics pointer table to use explicit indexes 
- This makes it easier for future hack makers to rearrange, add, or delete graphic object ids without having to count indexes or keep them in order.
- Porymap will have to be updated, but I have some code for this already in a fork.
 2019-08-29 16:44:10 -05:00
GriffinR
d931ba9602 document remaining funcs 2019-08-21 17:06:55 -05:00
GriffinR
771a7b25fa move data, more contest lady funcs 2019-08-21 17:06:55 -05:00
garak
2580693ea5 INDEX to SLOT in encounter inja template 2019-07-29 13:12:20 -04:00
garak
b6483d7026 name match call messages by trainers 2019-07-29 12:58:15 -04:00
garak
dfa3e079c0 finish pokenav data decomp 2019-07-19 22:57:33 -04:00
garak
f6d55db535 decompile pokenav_unk_5 data 2019-07-19 21:05:55 -04:00
garak
c400d1dc7f decompile pokenav_unk_3 data 2019-07-19 18:31:42 -04:00
PikalaxALT
71dff6dbf1 Remove unnecessary tutor learnset casts 2019-07-10 16:38:05 -04:00
garak
4594c955b4 create defines to support encounter index ratios 2019-07-01 23:47:45 -04:00
garak
adb0a44457 add field info to wild pokemon json 2019-06-30 12:05:45 -04: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
Papa Cancer
e53ba4773d Documenting bags, berries and graphics 
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
 2019-05-22 21:10:16 -05:00
DizzyEggg
ab421f1089 Use array count for trainer parties 2019-05-17 07:33:22 -05:00
DizzyEggg
188f2aa29e ability random define for battle pyramind 2019-05-16 17:09:43 -05:00
DizzyEggg
4ae1e014bc Change abilities in base stats to array 2019-05-16 17:09:43 -05:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
Marcus Huderle
0babaa8c07 Convert wild encounter data to JSON 2019-05-08 17:06:39 -05:00
DizzyEggg
912b87564f Compact item data, make descriptions easier to read 2019-04-16 11:25:26 -05:00
DizzyEggg
b4e1375bb6 Document pokemon item effects 2019-04-16 11:23:09 -05:00
DizzyEggg
dc764698c9 Use implicilt berry indexes in arrays 2019-04-14 10:15:18 -05:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
DizzyEggg
b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
DizzyEggg
c36476af85 Clean up data2b.c 2019-04-05 07:53:23 -05:00
Fontbane
9e74409bb2 Fix labels, label more scripts 2019-04-04 19:34:35 -05:00
Phlosioneer
845307b3a6 Rename contest AI stuff 2019-04-01 22:16:07 -04:00
Phlosioneer
37c7441a15 Merge branch 'master' into contest-data 2019-03-31 20:22:47 -04:00
Phlosioneer
207a54393c Fix mistakes and use EVENT_OBJ_GFX_* macros 2019-03-31 20:07:24 -04:00
Phlosioneer
9848f84b9e Use constants for Oam .shape and .size fields 
Also some general formatting fixes for constants.
 2019-03-16 12:37:04 -05:00
garak
d0115db565 move pokemon graphics to mon-specific directories 2019-03-16 12:21:47 -05:00
garak
14211fb495 fix incbin paths 2019-03-16 12:21:47 -05:00
Phlosioneer
0c935a8bd5 Move the contest opponent filter to C 2019-03-09 22:54:17 -05:00
Phlosioneer
a32e8e7405 Move gContestOpponents into C 
2,400 LOC by hand.
 2019-03-09 20:56:36 -05:00
Phlosioneer
153499ed6f Clean up contest_opponents.inc 2019-03-09 01:38:38 -05:00
Phlosioneer
5b4b0a245b Move contest winner list to C 2019-03-09 00:01:49 -05:00
Phlosioneer
88c3781880 Move text pointer tables into C 2019-03-08 22:33:40 -05:00
Marcus Huderle
231355f84d Decompile easy_chat data 2019-02-26 14:50:02 -06:00
Diegoisawesome
d64a905d65 Document trainer backsprites 2019-02-02 15:56:22 -06:00
garak
261955b6ed trainer hill easy chat constants 2019-01-21 12:01:49 -05:00
DizzyEggg
f84b22fca4 Dump trainer hill trainers 2019-01-19 12:57:18 +01:00
Philipp AUER
55202eac24 rename coords to size in struct MonCoords 2019-01-04 19:59:55 -06:00
Diegoisawesome
17ac8e29ef
Merge pull request #497 from garakmon/rm_sec 
index gRegionMapEntries by map section constants
 2018-12-31 11:51:12 -06:00
garak
ed25326140 fix formatting 2018-12-29 21:52:38 -05:00
garak
1baa17c632 index gRegionMapEntries by map section constants 2018-12-29 21:49:29 -05:00
DizzyEggg
8833004d41 space 2018-12-24 23:29:47 +01:00
DizzyEggg
44e5e82f67 clean up party menu 2018-12-24 23:27:20 +01:00
DizzyEggg
442b1826a2 asm party and fldeff clean-up 2018-12-24 21:59:05 +01:00
Rangi
78bab9ca0c Fix OLD_UNOWN_BASE_STATS formatting: tabs->spaces, and comma outside the macro 2018-12-23 17:24:10 -05:00
ShinyDragonHunter
c120a446ad Moved macro to the top of base_stats.h 2018-12-21 10:37:35 +00:00
ShinyDragonHunter
c489bb88b7 Updated macro name to be less vague 2018-12-20 13:59:00 +00:00
ShinyDragonHunter
51e5be68de Use a macro for OLD_UNOWN base stats 2018-12-20 11:28:19 +00:00
Diegoisawesome
6ef9671718
Merge pull request #440 from garakmon/fldeff 
Decompile / port fldeff_80F9BCC
 2018-12-19 22:16:59 -06:00
Deokishisu
a3543c9a34 Move data out of wild_encounter.c 
wild_encounter.c is cleaned up, and its data has been moved to src/data/wild_encounters.h.
 2018-12-19 22:50:54 -05:00
Meowsy
e92245ab06 Add macros to simplify defining front animations and still pics. 2018-12-17 12:29:35 -05:00
garak
e292d0ca83
Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
Diegoisawesome
bfdfe367e8
Merge pull request #422 from garakmon/frontier_data_1 
Battle tower data
 2018-12-10 11:22:16 -06:00
garak
e1e2132a37 sync fldeff function names with pokeruby 2018-12-09 22:24:54 -05:00
nullableVoidPtr
f50faac244 Clean more tables 2018-12-08 14:10:30 +08:00
nullableVoidPtr
8a8baaeaaa Merge remote-tracking branch 'upstream/master' 2018-12-08 12:13:15 +08:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
nullableVoidPtr
4fc3fa9e44 Realign comments, clean tables in pokemon_animation.c and use SPECIES_OLD_UNOWN_ defines 2018-12-07 20:18:24 +08: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
DizzyEggg
a9e6154fa9 Finish porting battle frontier data 2018-12-05 22:21:26 +01:00
garak
80c3258504 finish battle tower data except sRubyFacilityClassToEmerald 2018-12-04 12:09:35 -05:00
garak
e69cb6b276 update frontier class names 2018-12-03 17:21:34 -05:00
garak
2c14d6ee6c fix merge conflicts 2018-12-03 16:58:28 -05:00
DizzyEggg
ba1fc05558 tabs 2018-12-03 18:10:03 +01:00
DizzyEggg
0d122bc831 Fix merge conflicts 2018-12-03 17:56:36 +01:00
DizzyEggg
846b5d79e4 Get rid of headers in src/data 2018-12-03 16:10:41 +01:00
DizzyEggg
a83fc52a7e Make data easier to edit 2018-12-03 14:49:16 +01:00
Melody
44af811033 index trainer front anims ptr table 2018-12-03 08:36:10 -05:00
Melody
2779421ad4 fix brendan/may/wally consistency issues 2018-12-03 08:01:52 -05:00
DizzyEggg
d8b952f94c Clean up items data 2018-12-03 13:37:32 +01:00
garak
462e7c8295 begin batle tower data 2018-12-02 23:22:42 -05:00
Melody
eeb6446da4 add more consistent names 2018-12-02 22:36:09 -05:00
Melody
72bd670ba6 index trainer class lookups 2018-12-02 22:35:31 -05:00
DizzyEggg
a42bfd7a0e fix brackes n ne file 2018-12-02 19:27:56 +01:00