Commit graph

1964 commits

Author SHA1 Message Date
DizzyEggg
33c036e7ff Decompile pokemonav 7 2019-07-24 17:02:52 +02:00
Sewef
23b3d4bd5e Fix PREPARE_MOVE_BUFFER macro (#749) 2019-07-22 16:58:35 -04:00
garak
c39d25ff4d
Merge branch 'master' into navdata 2019-07-20 12:30:41 -04:00
PikalaxALT
8d0d5cfd55 Merge branch 'master' into modern_gcc 2019-07-20 11:51:22 -04:00
garak
690a0c4390 decompile pokenav_unk_4 rodata 2019-07-19 19:36:17 -04:00
garak
b68ab6106d pokenav unk 2 data decomp 2019-07-19 17:23:52 -04:00
PikalaxALT
20863ac85b Resolve compile warnings in modern 2019-07-18 20:46:00 -04:00
Gudf
75f165ed74 Use a constant instead of integer literals when checking for shinyness 2019-07-11 20:16:39 +02:00
DizzyEggg
11fb13d635 Some pokemon jump work 2019-07-09 16:39:29 -05:00
PikalaxALT
f300f9e699 Revert FLOAT_U* and DOUBLE_U* macros 2019-06-30 19:31:29 -04:00
PikalaxALT
e92e9a184c Support for non-dkA toolchains 2019-06-28 22:26:11 -04:00
PikalaxALT
b839c21307 Fix/suppress warnings when building with gcc-8 2019-06-26 16:42:57 -04:00
PikalaxALT
fb06e4a3c9 Modernize code
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
2019-06-26 12:12:10 -04: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
garak
f1f420954b add METATILE_ID macro 2019-06-16 10:08:07 -05:00
DizzyEggg
54150e3794 Revert "Cherrim sun form gfx"
This reverts commit cd09047c4f.
2019-06-15 14:16:11 +02:00
DizzyEggg
cd09047c4f Cherrim sun form gfx 2019-06-10 11:16:52 +02:00
DizzyEggg
1c60387968 Merge with master, placeholder back anims 2019-06-03 11:24:10 +02:00
DizzyEggg
f64c1dfabf Some pokenav work 2019-05-26 07:20:51 -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
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
Flametix
dbdb827e54 Fix typos (#713)
* fix typos
2019-05-18 21:56:19 -05:00
DizzyEggg
ad6093f5bc Merge with master, fix conflicts 2019-05-17 10:15:30 +02:00
garak
60baf19d45 rename gFacilityClassPicsByIndex to gLinkPlayerFacilityClasses 2019-05-16 17:10:13 -05:00
garak
daecd5ec40 name some trainer card related functions 2019-05-16 17:10:13 -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
Slawter666
2fdc489bc0 Further documentation of party_menu.c 2019-05-15 16:55:39 -05:00
DizzyEggg
20841a9f87 Use PLAYER_NAME_LENGTH constant 2019-05-15 16:53:59 -05:00
DizzyEggg
38b320eaa5 Data for hidden abilities 2019-05-14 13:20:10 +02:00
DizzyEggg
00dcc05516 Add new dex flags 2019-05-14 11:54:58 +02:00
DizzyEggg
5682f98605 Merge branch 'master' into pokemon_expansion 2019-05-14 09:12:45 +02:00
PikalaxALT
539d472796 Merge branch 'master' into dodrio_berry_picking 2019-05-11 21:22:09 -04:00
DizzyEggg
02594be062 Merge branch 'master' into pokemon_expansion 2019-05-04 09:20:45 +02:00
hjk321
438c5432aa Document MON_DATA_10 2019-05-03 18:21:11 -05:00
PikalaxALT
f13e1c78b2 through sub_81CA0EC 2019-05-02 17:53:00 -04:00
PikalaxALT
a14162eb9f through sub_81C9F28 2019-05-02 16:43:32 -04:00
PikalaxALT
518865d8d9 sub_81C9A10 2019-05-02 16:19:25 -04:00
PikalaxALT
9b40cdaeb9 through sub_81C99FC 2019-05-02 14:27:59 -04:00
DizzyEggg
fdb328fbd3 Gfx for megas 2019-04-29 14:27:36 +02:00
DizzyEggg
2d670fa803 Rotom forms and meowstic female 2019-04-23 13:00:40 +02:00
Fontbane
6cf06d5f95 Doc some event scripts
Doc decoration shops

Revert "Doc decoration shops"

This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435.

Document through comments

Un-revert decor documentation
2019-04-22 17:23:59 -05:00
Fontbane
2c076f1f3e Doc most OnTransitions 2019-04-22 17:23:59 -05:00
DizzyEggg
0666da6145 Merge branch 'master' into pokemon_expansion 2019-04-22 14:12:18 +02:00
DizzyEggg
f1e420ff69 Move tutor and tms compatibility for all mons 2019-04-22 14:10:40 +02:00
Marcus Huderle
9915a3fd7f Decompile pokenav_unk_5.c 2019-04-16 14:29:00 -05:00
DizzyEggg
b4e1375bb6 Document pokemon item effects 2019-04-16 11:23:09 -05:00
Marcus Huderle
f9f5f34b0c Finish decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
Marcus Huderle
c7954e1212 Decompile pokenav_unk_4.c through sub_81CB678() 2019-04-16 11:21:13 -05:00
Marcus Huderle
394c0f5546 Start decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
DizzyEggg
17cf13beef Merge with master 2019-04-16 11:14:50 +02:00
Marcus Huderle
f40f2c5e9c Decompile all of pokenav_unk_3.c 2019-04-14 13:44:44 -05:00
Marcus Huderle
e3bdb08efa Start decompiling pokenav_unk_3.c 2019-04-14 13:44:44 -05:00
DizzyEggg
59797e4801 Use constants in battle_anim_special.c 2019-04-14 10:19:50 -05:00
DizzyEggg
dc764698c9 Use implicilt berry indexes in arrays 2019-04-14 10:15:18 -05:00
Marcus Huderle
065c60544d Cleanup some pokenav code 2019-04-13 16:18:04 -05:00
Marcus Huderle
1268691410 Finish decompiling pokenav_unk_1.c 2019-04-13 16:18:04 -05:00
Marcus Huderle
cb9d471a2a Decompile pokemon_jump through sub_802CE48() 2019-04-13 11:37:50 -05:00
Phlosioneer
2b740b46e8 About halfway done with pokenav_unk_1.s 2019-04-13 11:34:53 -05:00
Phlosioneer
ee2edb068a Start decomp of pokenav_unk_1
Looks like it's the Ribbons menu, based on the first function.
2019-04-13 11:34:53 -05:00
DizzyEggg
8cd03654b0 Icons for gen6 mons 2019-04-13 11:30:00 +02:00
DizzyEggg
ece5b2c256
Merge pull request #129 from thechurchofcage/zeta
Gen 7 animations
2019-04-13 09:36:34 +02:00
Papa Cancer
7d20d8082f Gen 7 animations
Includes 2-frame images for Tapus and Marshadow
Custom animations made for Yveltal, Shiinotic, and Toxapex/Poipole
2019-04-12 20:07:54 +01:00
DizzyEggg
b0317adb8c Merge branch 'master' into pokemon_expansion 2019-04-11 13:10:35 +02:00
huderlem
ce93d3ab9a
Merge pull request #661 from Phlosioneer/contest-ai-cleanup
contest & contest_ai cleanup
2019-04-08 17:30:28 -05:00
ultima-soul
2c432c314a Match sub_8159308 2019-04-08 17:29:44 -05:00
DizzyEggg
c17dbbc47c Merge branch 'master' into pokemon_expansion 2019-04-08 10:56:37 +02:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
huderlem
a4ea0ac816
Merge pull request #645 from Phlosioneer/pokenav-decomp-again
Pokenav decomp again
2019-04-07 18:03:32 -05:00
Phlosioneer
d352999cd8 Change "navgear" to "pokenav" 2019-04-07 18:10:53 -04:00
Phlosioneer
0dc73b0b3a Break up pokenav into subfiles
The files are separated based on the pokenav resources substruct
ID they use.
2019-04-07 14:40:35 -04:00
Marcus Huderle
78151b6d88 Start decompiling pokemon_jump.c 2019-04-07 13:12:27 -05:00
DizzyEggg
51bb713aef Add Burmy Wormadam form gfx and data 2019-04-07 14:39:11 +02:00
DizzyEggg
c090f6cda9 Add Unown forms 2019-04-07 12:40:18 +02:00
Phlosioneer
d84d94e29a Merge branch 'master' into pokenav-decomp-again 2019-04-07 01:56:36 -04:00
Phlosioneer
ddfe0f91cf Document decompiled parts of the pokenav main menu 2019-04-06 23:34:30 -04:00
DizzyEggg
8213222337 Merge with master 2019-04-06 23:20:16 +02:00
Marcus Huderle
fe12f2f4b3 Document and cleanup some decoration code 2019-04-06 12:49:09 -05:00
Fontbane
4a09a5da33 Doc field move scripts completely, use fldeff constants for dofieldeffect
Fix labels

Fix labels again

Delete extra boulder scripts

Now it should build fine
2019-04-06 12:48:50 -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
Phlosioneer
bc50686158 Decomp everything onvolving UnknownSubStruct_81C81D4
Now I can start cleaning up the fields and substructs
2019-04-06 03:42:14 -04:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
DizzyEggg
70569e7ebc Use shiny species tag 2019-04-05 07:53:23 -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
DizzyEggg
dd24597d52 Finish up menu specialised 2019-04-05 07:53:23 -05:00
PikalaxALT
a58d9a16dd Merge branch 'master' into dodrio_berry_picking 2019-04-05 08:41:31 -04:00
Fontbane
9e74409bb2 Fix labels, label more scripts 2019-04-04 19:34:35 -05:00
PikalaxALT
8db03ba6fa Documentation of ereader helpers, 2 2019-04-04 19:26:45 -05:00
PikalaxALT
c46f271f67 Documentation of ereader_helpers, 1 2019-04-04 19:26:45 -05:00
PikalaxALT
53efbe2832 Finish decomp of union_room_chat 2019-04-04 19:26:45 -05:00
PikalaxALT
a47abb3949 union_room_chat data, 1 2019-04-04 19:26:45 -05:00
Phlosioneer
1360b3a477 RGB Constants 2019-04-04 17:05:46 -04:00
Diegoisawesome
f125de3e66
Merge pull request #659 from ultima-soul/pokemon
Remove pokemon_3.h
2019-04-04 12:49:46 -05:00
Diegoisawesome
8361ada4ba
Merge pull request #656 from ultima-soul/menu_specialized
Decompile some of menu_specialized
2019-04-04 12:49:17 -05:00
Diegoisawesome
e476a6d02d
Merge pull request #624 from Wyrserth/master
Use constants for naming screen's pages
2019-04-04 12:44:18 -05:00
DizzyEggg
9c6d3d33c7 Remove still pics 2019-04-04 16:12:55 +02:00
DizzyEggg
e00d40848b Gen1-4 correct coordinates 2019-04-04 15:29:27 +02:00
DizzyEggg
240e9bda17 All data for gen 6.7 mons, placeholder sprites 2019-04-04 13:36:47 +02:00
DizzyEggg
b407967cea Gen5 sprites and icon placeholder data 2019-04-04 12:57:01 +02:00
ultima-soul
91a94a0ca1 Try to get closer to matching. 2019-04-03 21:13:26 -07:00
Phlosioneer
3b3b2dd031 General cleanup of the second half of contest.c 2019-04-03 20:43:23 -04:00
ultima-soul
48d27c035a Remove pokemon_3.h 2019-04-03 15:15:08 -07:00
PikalaxALT
4fadbaf161 Minor fixes
gotoram --> returnram
cmdCF/execram --> gotoram
fix indentation in sym_ewram.txt
fix mevent_client.h guard name
2019-04-03 17:04:42 -05:00
PikalaxALT
d0384ee95e mevent_server_ish --> mevent_client 2019-04-03 17:04:42 -05:00
PikalaxALT
d220f876fc Some symbol documentation 2019-04-03 17:04:42 -05:00
PikalaxALT
28646ea64e Decompile mevent server scripts 2019-04-03 17:04:42 -05:00
PikalaxALT
6c12d154e7 Reformat mevent server and client scripts 2019-04-03 17:04:42 -05:00
PikalaxALT
03badd9c40 mevent_server_ish 2019-04-03 17:04:42 -05:00
PikalaxALT
dabd1f6177 finish mevent_server.s 2019-04-03 17:04:42 -05:00
PikalaxALT
a455d98385 start porting mevent_server from firered 2019-04-03 17:04:42 -05:00
Phlosioneer
3a2ea40188 Rename and document more contest setup functions
Also properly label the link contest flags variable, and label the
contest window ID's.
2019-04-03 17:24:32 -04:00
DizzyEggg
b21d960c5c Add Egg Moves data 2019-04-03 23:09:07 +02:00
DizzyEggg
7dcd7362d3 Add Evolution data 2019-04-03 23:00:49 +02:00
DizzyEggg
5219b7b30a Code for new evo methods 2019-04-03 22:19:18 +02:00
DizzyEggg
de4722708b Add Gen4 mon sprites 2019-04-03 17:39:08 +02:00
DizzyEggg
adfd151f47 Add Gen4 icons 2019-04-03 13:08:41 +02:00
DizzyEggg
1e6b26c549 Merge with master 2019-04-03 11:19:06 +02:00
Phlosioneer
f82bdb332a Document applause meter code 2019-04-03 03:00:06 -04:00
ultima-soul
02651f6177 Attempt to decompile menu_specialized. 2 NONMATCHING 2019-04-02 19:18:36 -07:00
Phlosioneer
8f13e991d2 Found a debug system for pokemon contests 2019-04-02 21:51:21 -04:00
Phlosioneer
99e8e8e53f More cleanup, document contestant sorting 2019-04-02 20:00:05 -04:00
Marcus Huderle
181baf9fe5 Merge remote-tracking branch 'upstream/master' into misc_docs
# Conflicts:
#	src/field_weather_effect.c
2019-04-02 18:29:51 -05:00
Marcus Huderle
1241700b20 Finish documenting the other weather effects 2019-04-02 18:28:56 -05:00
DizzyEggg
d8c9f1b30f Rows and columns 2019-04-02 16:28:38 -05:00
DizzyEggg
baa187665b Document a bit of script menu and battle anims 2019-04-02 16:28:38 -05:00
DizzyEggg
27bafdc04d Begin pokemon expansion 2019-04-02 21:22:16 +02:00
Phlosioneer
9f44ebc5cd Automatically calculate REMATCH_TABLE_ENTRIES
Uses the standard C way of calculating the length of an enum.
2019-04-02 07:28:30 -05:00
Phlosioneer
6916f09cd5 Expand MatchCallStruct defs, use REMATCH_* enum 2019-04-02 07:28:30 -05:00
Phlosioneer
c3200c0beb Cleanup some of gContestResources 2019-04-02 00:35:57 -04:00
PikalaxALT
7571969a45 Finish union room battle 2019-04-01 22:08:50 -05:00
PikalaxALT
4be97b2dc6 through sub_801A960 2019-04-01 22:08:50 -05:00
Phlosioneer
845307b3a6 Rename contest AI stuff 2019-04-01 22:16:07 -04:00
Marcus Huderle
35505c7f5b Document somre more weather effects 2019-04-01 20:04:23 -05:00
Phlosioneer
c429e6d69c Move gPlayerFacingPosition out of sym_ewram.txt (#617)
* Move gPlayerFacingPosition out of sym_ewram.txt

* Fix tabs in sym_ewram.txt

* Remove redundant faraway island extern
2019-04-01 19:30:41 -05:00