ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,893 Commits 1 Branch 0 Tags 235 MiB
6efa51f8ad
Commit Graph

2060 Commits

Author SHA1 Message Date
garak
92d28c5daf add MIN_LEVEL define to pokemon constants 2019-10-14 18:12:03 -05:00
Sewef
5a366e8d72 More battle_anim_effects_1 labels 2019-10-14 22:51:45 +02:00
Sewef
63b5be9259 Ended battle_anims_effects_1 SpriteTemplates 2019-10-14 21:05:40 +02:00
GriffinR
30ef494163
Merge branch 'master' into doc-inc2 2019-10-13 15:44:07 -04:00
GriffinR
bb23128b77 Merge conflict resolves into review changes 2019-10-13 15:33:19 -04:00
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
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
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
Marcus Huderle
4494b5d4cb Document collision types 2019-10-06 15:48:26 -05: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
748a1dbdd4 Document cave hole 2019-10-06 14:16:37 -04: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
PikalaxALT
cb528cb543
Merge pull request #821 from GriffinRichards/document-textinput 
Document text input strings
 2019-10-02 09:49:26 -04:00
GriffinR
53bc1bd0d1 Document text input strings 2019-09-30 00:09:29 -04:00
GriffinR
73b96fe145 Rename CONTACT macros to ON_DAMAGE 2019-09-27 12:27:36 -04:00
PikalaxALT
301822603e
Merge pull request #802 from PikalaxALT/gflib 
Gflib and libagbsyscall
 2019-09-27 11:34:55 -04:00
PikalaxALT
7b8b5b5c8c Merge branch 'master' into gflib 2019-09-27 09:11:22 -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
37373c1b21 Review changes for #817 2019-09-25 18:46:25 -05: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
340c4e1411 Clean up script_movement documentation 2019-09-16 19:30:36 -05:00
GriffinR
f9a8f44a29 Document script_movement 2019-09-16 19:30:36 -05:00
GriffinR
6c9997a906 Document decor icons 2019-09-16 19:23:21 -05:00
GriffinR
b46c4b6703 more constant usage 2019-09-16 19:21:23 -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
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
GriffinR
9fbcd552de document remainder of secret_base scripts, delete unneeded scripts.incs 2019-09-06 02:12:00 -04:00
PikalaxALT
95b805a425 Nuke definition of struct TrHillTag_Half 2019-09-05 20:48:48 -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
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
8d910465f8 Minor refactor of ereader_helpers.c 2019-09-05 20:48:48 -05:00
Eduardo Quezada D'Ottone
de02805388 Changed names. 2019-09-05 20:42:15 -05:00
Eduardo Quezada D'Ottone
e2689d2a27 Documented Mechadoll answers. 2019-09-05 20:42:15 -05:00
GriffinR
8c6b5648d4 document secret_base_1.inc 2019-09-05 16:16:21 -04:00
GriffinR
6b04ea0727
Merge branch 'master' into document-eventscripts 2019-09-03 22:22:14 -04:00
ultima-soul
d3ea25ee7f Synchronize with pokefirered pokedex.c. 2019-08-24 11:17:11 -07:00
GriffinR
869d0eebc0
Rename atk## constants and states 2019-08-23 08:46:21 -04:00
Diegoisawesome
8e7abad720
Merge pull request #786 from DizzyEggg/u8 
GetAbilityBySpecies's arg from bool8 to u8
 2019-08-22 17:45:56 -05:00
DizzyEggg
d09c290eba bool8 to u8 2019-08-22 16:46:33 +02:00
GriffinR
4228750e38 more documentation in match_call_data 
Documents everything related to UnkStruct_08625388, names HasCheckPage functions, fixes mislabeled Brendan/May headers, and adds header count to pokenav_unk_3
 2019-08-21 17:18:38 -05:00
PikalaxALT
5b8d0f1c33 Remove MNUM from oam flip constant names 2019-08-21 17:15:23 -05:00
PikalaxALT
f7cf4fa154 Use HFLIP, VFLIP 2019-08-21 17:15:23 -05: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
GriffinR
7fc99f3952 favor lady 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
GriffinR
009caa21c8 some contest lady funcs 2019-08-21 17:06:55 -05:00
GriffinR
5d96a0cc97 minor fixes 2019-08-21 17:06:55 -05:00
GriffinR
fc467a9d52 standardize favour/favor 2019-08-21 17:06:55 -05:00
GriffinR
23979c4d7d initial documentation commit 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
Tustin2121
d12a8c10ee Documenting credits a bit 2019-08-17 13:26:44 -04:00
GriffinR
ecf2097abb initial event_scripts documentation 2019-08-14 23:38:42 -04:00
PikalaxALT
5040a5f96b Move pokenav syms around 2019-08-05 20:23:56 -04:00
PikalaxALT
195137b001
Merge pull request #768 from PikalaxALT/pokenav_unk_8 
Finish pokenav_unk_8
 2019-08-05 15:21:20 -04:00
PikalaxALT
a7eb4f9dd2 Make pokenav_unk_8 syms static, fix gcc-9 warnings 2019-08-05 14:00:38 -04:00
PikalaxALT
e2e667d4b5 Finish pokenav_unk_8 2019-08-05 13:47:04 -04:00
PikalaxALT
9beeba8424
Merge pull request #764 from GriffinRichards/document-varnames 
Document vars that are used and unnamed
 2019-08-05 11:59:53 -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
PikalaxALT
18f29c566a through sub_81CF278 2019-08-05 10:54:56 -04:00
PikalaxALT
329670e16e Minor fixes 2019-08-05 08:46:52 -04:00
PikalaxALT
51d5ee771d Merge branch 'master' into pokenav_unk_2 2019-08-05 08:33:45 -04:00
PikalaxALT
1fc64b8582
Merge pull request #767 from DizzyEggg/pokenav_8 
More pokenav
 2019-08-05 08:21:36 -04:00
PikalaxALT
ff2166b8fe pokenav_unk_2: unclutter global namespace 2019-08-04 21:10:08 -04:00
PikalaxALT
299c3cf1dc Finish pokenav_unk_2 2019-08-04 20:39:36 -04:00
PikalaxALT
cd876292d1 Merge branch 'master' into pokenav_unk_2 2019-08-04 15:35:35 -04:00
DizzyEggg
c8cc39cb57 More pokemav, massive clean-up, seriously who the left the file in this state??? 2019-08-04 19:09:12 +02:00
PikalaxALT
fa5bfc1627
Merge pull request #766 from DizzyEggg/pokenav_10 
Decompile pokenav 10
 2019-08-04 11:07:10 -04:00
DizzyEggg
252df94bc1 Decompile pokenav 10 2019-08-04 13:53:00 +02:00
DizzyEggg
1641579297 Merge branch 'master' into pok_jump 2019-08-04 00:02:13 +02:00
GriffinR
0f5d96e5f5
name used and unnamed vars 2019-08-03 14:12:48 -04:00
PikalaxALT
ce941e6f56
Merge pull request #762 from GriffinRichards/GriffinRichards-documentation 
Documenting MAPSEC use in pokenav match call data
 2019-08-03 11:10:42 -04:00
PikalaxALT
9f50c4fa80
Merge pull request #760 from ultima-soul/use_pokeblock_data 
Decompile use_pokeblock data
 2019-08-03 11:01:05 -04:00
GriffinR
9c90ff65af
Update pokenav.h 2019-08-02 12:48:15 -04:00
DizzyEggg
9306c142b3 Merge dodrio with master 2019-08-02 00:45:49 +02:00
DizzyEggg
4d2d8779bf Dodrio berry picking decompiled 2019-08-02 00:41:55 +02:00
DizzyEggg
02cadbee60 MORE DODRIO BERRY PICKINGgit status! 2019-08-01 19:01:50 +02:00
ultima-soul
9a152f8fe6 Decompile data/use_pokeblock.s 2019-07-30 17:21:17 -07:00
PikalaxALT
a08cbaee0a pokenav_unk_2 staging 2019-07-30 19:46:56 -04:00
DizzyEggg
ff2dcf5413 Two fakematches out 2019-07-29 21:09:05 +02:00
garak
5b57c001f5
Merge branch 'master' into navdata 2019-07-29 13:06:45 -04:00
DizzyEggg
a4a382a004 Match sub_81D2278 and poke jump clean 2019-07-29 16:22:50 +02:00
DizzyEggg
e634e722cc Decompile pokemon jump 2019-07-29 12:35:57 +02:00
DizzyEggg
56b124fdec Some more pokenav 2019-07-25 21:41:02 +02:00
DizzyEggg
fd07c608fc Decompile pokemon unk 6 2019-07-25 18:56:08 +02:00
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