ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 20:47:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,167 Commits 1 Branch 0 Tags 235 MiB
47dce452e9
Commit Graph

2769 Commits

Author SHA1 Message Date
Slawter666
fa352cfda3 Some more labelling 2019-02-04 14:35:49 +00:00
Slawter666
3d79aeb9da More documentation 2019-02-04 12:44:09 +00:00
DizzyEggg
c436cdf384 Fix Magnet Rise 2019-02-04 13:40:13 +01:00
DizzyEggg
ed030e5b62 Fix Aurora Veil description 2019-02-04 12:46:04 +01:00
DizzyEggg
a8edf08ee4 Fix Protean ability pop-up 2019-02-04 12:43:20 +01:00
Slawter666
804e955c8d Label some more functions 2019-02-04 11:38:44 +00:00
DizzyEggg
f415871369 Merge with master 2019-02-03 10:44:05 +01:00
Slawter666
031fd66393 Label some summary screen functions 2019-02-02 22:14:04 +00:00
Diegoisawesome
ff48e5ada0
Merge pull request #541 from Diegoisawesome/master 
Misc documentation
 2019-02-02 16:00:56 -06:00
Diegoisawesome
d64a905d65 Document trainer backsprites 2019-02-02 15:56:22 -06:00
Diegoisawesome
59807c0f2c
Merge pull request #536 from DizzyEggg/menu 
Use Menu and List Menu input defines
 2019-02-02 12:45:35 -06:00
DizzyEggg
ea79f1c8f6 tabs 2019-02-02 19:41:34 +01:00
Diegoisawesome
e8952c2374
Merge pull request #539 from DizzyEggg/ram_vars 
Move ram vars in sym files to C
 2019-02-02 11:17:50 -06:00
Diegoisawesome
47c105bef6
Merge pull request #538 from DizzyEggg/data 
Dump last battle anim file
 2019-02-02 11:12:29 -06:00
DizzyEggg
363fa9bed2 Clean up ram vars 2019-02-02 12:44:00 +01:00
DizzyEggg
a7f94bbeea Dump last battle anim file 2019-02-02 11:55:11 +01:00
DizzyEggg
a740bc7190 Name action 11 2019-02-02 11:32:00 +01:00
DizzyEggg
23b240ab65 Fix Menu and List Menu input defines 2019-02-02 11:04:38 +01:00
Diegoisawesome
46a3969f69 Add constants for flags and vars 2019-02-02 00:25:43 -06:00
Diegoisawesome
9d8a43a1fb
Merge pull request #534 from DizzyEggg/patch-1 
Get rid of an unnecessary extern
 2019-02-01 14:51:04 -06:00
DizzyEggg
b3d48c0ed6
Get rid of an unnecessary extern 2019-02-01 19:45:06 +01:00
DizzyEggg
d02a788d2e Match GetItemEffectType 2019-02-01 19:25:10 +01:00
Diegoisawesome
b26c24ffee
Merge pull request #532 from DizzyEggg/bored 
Fix some fakematches
 2019-02-01 10:04:42 -06:00
DizzyEggg
a42bba755b Add Crafty Shield effect 2019-02-01 14:34:16 +01:00
DizzyEggg
a3460c9e45 Code Belch effect 2019-02-01 14:17:24 +01:00
DizzyEggg
c0db311637 some more fakematch fix 2019-02-01 12:26:40 +01:00
DizzyEggg
e3bec4b480 fix nonmatch in mauville old man 2019-02-01 11:56:02 +01:00
DizzyEggg
7c8fb66acf Fix field player avatar fakmatch 2019-02-01 11:50:45 +01:00
DizzyEggg
5dfaf22fb3 Fix pokemon icon asm 2019-02-01 11:39:24 +01:00
DizzyEggg
b4055e4fc0 Merge m4a files into one, get rid of one asm 2019-02-01 10:37:13 +01:00
DizzyEggg
7750a8126d CgbSound is decompiled. 2019-02-01 00:25:31 +01:00
Marcus Huderle
29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
Diegoisawesome
3f1a7330dd Document siirtc a bit more 2019-01-30 19:48:28 -06:00
DizzyEggg
d46e60765d Rename a palace battle field 2019-01-29 22:22:02 +01:00
DizzyEggg
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +01:00
Marcus Huderle
8f832434e5 Change drought colors table files to .bin 2019-01-29 14:36:02 -06:00
Marcus Huderle
36a1825bbe Document trainer approach funcs, and use movement type constants in scripts 2019-01-29 14:36:02 -06:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
DizzyEggg
77fcb62015
Merge pull request #64 from Kurausukun/patch-1 
Prevent Skarmory from Evolving via Level
 2019-01-28 20:43:29 +01:00
DizzyEggg
94d2a30d44 Merge with master 2019-01-28 20:41:46 +01:00
DizzyEggg
73d919fa0f Define double single left right qutoation marks char 2019-01-28 19:02:34 +01:00
DizzyEggg
922726ff3d contest 2019-01-28 18:19:58 +01:00
DizzyEggg
ad59811154 Decompile whole contest 2019-01-28 18:13:07 +01:00
DizzyEggg
26a2a4f9e7 Match all of contest functions 2019-01-28 12:29:47 +01:00
Kurausukun
c3126df436
Prevent Skarmory from Evolving via Level 2019-01-28 00:49:26 -05:00
Diegoisawesome
183b6857ff
Merge pull request #458 from ultima-soul/contest 
Decompile more of contest
 2019-01-27 23:08:24 -06:00
ultima-soul
72720204da Fix stuff 2019-01-27 20:54:21 -08:00
ultima-soul
d633ee6f58 Minor changes 2019-01-27 20:48:18 -08:00
ultima-soul
f828823bf0 Make changes 2019-01-27 20:21:30 -08:00
DizzyEggg
ceb56e2fce
Merge pull request #62 from Mother-Of-Dragons/battle_engine_v2 
Decapitalize item names and add new item descriptions
 2019-01-27 23:01:59 +01:00
DizzyEggg
736826e863 New feature - battle 2 vs 1 opponent 2019-01-27 20:54:34 +01:00
Avara
dd44ab8150 Decapitalize item names and add new item descriptions 2019-01-27 17:33:29 +00:00
DizzyEggg
abd518b668 Refactor GF's idiotic coding 2019-01-27 13:52:02 +01:00
DizzyEggg
88b788bfab Fix Charge Beam effect 2019-01-27 11:57:13 +01:00
DizzyEggg
6653ecf676 Fix Safari zone bug 2019-01-27 11:47:36 +01:00
DizzyEggg
897592a8d4 Merge branch 'master' into battle_engine_v2 2019-01-27 10:58:57 +01:00
DizzyEggg
54ddbaaf0c Frontier pass clean-up 2019-01-26 22:09:24 +01:00
DizzyEggg
251d16b733 Make Frontier pass compile 2019-01-26 21:06:20 +01:00
DizzyEggg
01c3f3fc05 Document all of frontier pass 2019-01-26 20:56:06 +01:00
DizzyEggg
03549349f8 Decompile all frontier pass 2019-01-26 19:20:14 +01:00
DizzyEggg
0688725afb Document and decompile more of frontier pass. 2019-01-26 14:50:24 +01:00
DizzyEggg
08a3533682 Start frontier pass 2019-01-25 23:32:45 +01:00
DizzyEggg
ebfaf3f6be Merge branch 'master' into dump 2019-01-24 21:30:19 +01:00
DizzyEggg
b6e5b4ee1a trainer card diego pls 2019-01-22 21:56:57 +01:00
garak
261955b6ed trainer hill easy chat constants 2019-01-21 12:01:49 -05:00
DizzyEggg
75a1c022dd Make trainer card compile 2019-01-20 18:48:29 +01:00
DizzyEggg
4e396207d3 document more of trainer card 2019-01-20 18:24:35 +01:00
DizzyEggg
576d1b3474 Document and match somne trainer card 2019-01-19 23:04:33 +01:00
shinny456
f06c0749bc trainer_card up to sub_80C4998 2019-01-19 12:14:59 -05:00
shinny456
1b30da21d9 merge trainer hill changes 2019-01-19 10:44:58 -05:00
DizzyEggg
f84b22fca4 Dump trainer hill trainers 2019-01-19 12:57:18 +01:00
DizzyEggg
fac9631235 Fix Sandstorm raining 2019-01-19 11:22:49 +01:00
DizzyEggg
f34ab49f63
Merge pull request #56 from SBird1337/feature/battle-engine-animpack1 
Add some animations (see below)
 2019-01-18 23:06:19 +01:00
DizzyEggg
2c3210f4d1 merge with master 2019-01-18 22:30:34 +01:00
Karathan
0f19f969c9 modify net animation for sticky web 2019-01-15 01:11:34 +01:00
DizzyEggg
87763d133f bites to bits 2019-01-14 20:57:44 +01:00
DizzyEggg
353ad13f91 make trainer hill compile 2019-01-13 20:58:42 +01:00
DizzyEggg
4b420643dc Merge branch 'master' into trainer_hill 2019-01-13 20:51:05 +01:00
DizzyEggg
edddd847c5 Document and clean up trainer hill 2019-01-13 20:50:08 +01:00
DizzyEggg
c0bc01d301 Move some vars to C 2019-01-13 13:15:23 +01:00
DizzyEggg
11a49a7f02 Decompile trainer hill 2019-01-13 12:12:27 +01:00
Karathan
832c0d6333 add toxic spike animation 2019-01-12 17:02:24 +01:00
shinny456
8a5fce7837 start decompiling trainer_card.s 2019-01-08 21:51:19 -05:00
Diegoisawesome
af2c39860d Rename non-mapsec constants 2019-01-08 13:40:11 -06:00
ultima-soul
b8ff71e65e Fix build conflicts. 2019-01-06 14:11:31 -08:00
ultima-soul
284751e761 Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present. 2019-01-06 13:41:18 -08:00
ultima-soul
2ca482dc24 Committing progress so far. 2019-01-06 13:38:31 -08:00
ultima-soul
f966b65849 Through sub_80DC028, sub_80DC0F4 non-matching. 2019-01-06 13:32:48 -08:00
ultima-soul
76510d58bb Matched up to sub_80DBF68, sub_80DBF90 WIP. 2019-01-06 13:32:47 -08:00
Slawter666
aeaf390706 Update constants 2019-01-05 20:12:50 +00:00
Slawter666
f8c2fcb9b2 Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base 2019-01-05 19:54:26 +00:00
DizzyEggg
50a26bffe4 tabs to spaces 2019-01-05 19:27:23 +01:00
DizzyEggg
b756996581 fakematch and nonmatch 2019-01-05 19:25:46 +01:00
DizzyEggg
aecc87447a Use more damage look-up tables 2019-01-05 19:02:01 +01:00
DizzyEggg
b667c20d80 Remove unused vars in battle main.c 2019-01-05 18:52:33 +01:00
DizzyEggg
81fe0a1339 Encore lasts always 3 turns 2019-01-05 16:02:58 +01:00
DizzyEggg
78d7c29290 Move buffers to allocated reousrces, get rid of old type effectiveness table 2019-01-05 16:00:57 +01:00
DizzyEggg
4827776a3c Merge with master 2019-01-05 10:14:20 +01:00
Marcus Huderle
95db853a78 Decompile more of contest_link_80F57C4.c 2019-01-04 20:03:29 -06:00
Philipp AUER
55202eac24 rename coords to size in struct MonCoords 2019-01-04 19:59:55 -06:00
huderlem
cba2f81bf8
Merge pull request #507 from Tetrable/master 
Finish off labeling flags
 2019-01-03 20:37:25 -06:00
Marcus Huderle
fd201f8395 Start decompiling contest_link_80F57C4.c 2019-01-03 20:35:20 -06:00
Marcus Huderle
2857f7fff9 Decompile contest_link_81D9DE4.c 2019-01-03 20:35:20 -06:00
Marcus Huderle
bc43dbab13 Decompile contest_link_81D9DE4.c 2019-01-03 20:35:20 -06: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
b471bba55e Use better names for match call texts 2019-01-02 19:46:15 -06:00
Marcus Huderle
e1092028ec Decompile match_call.c 2019-01-02 19:46:15 -06:00
Diegoisawesome
f8c708a82a
Merge pull request #506 from Slawter666/menu 
Minor labelling of menu.c
 2019-01-02 17:29:27 -06:00
Diegoisawesome
0053e61535
Merge pull request #504 from Diegoisawesome/roulette 
Port/decompile roulette
 2019-01-02 17:00:33 -06:00
Diegoisawesome
a0188aac33 Cleanup and EWRAM 2019-01-02 16:55:50 -06:00
Diegoisawesome
6202ae1df0 Extract rodata from roulette 2019-01-02 16:40:40 -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
Slawter666
99c37023c8 Minor labelling of menu.c 2019-01-02 01:11:02 +00:00
Slawter666
ee5a239534 Use constants in secret_base.c 2019-01-01 23:19:07 +00:00
Diegoisawesome
e7f8190ba3 Finish roulette port 2019-01-01 15:25:52 -06:00
Diegoisawesome
d28d8c850d Up to sub_81446DC 2018-12-31 19:39:41 -06:00
Diegoisawesome
af1e44befe Continue porting roulette 2018-12-31 18:07:29 -06:00
Marcus Huderle
a0ff38d0be Fix build 2018-12-31 16:53:38 -06:00
Marcus Huderle
05b1d2ea94 Document field_tasks.c 2018-12-31 16:53:38 -06:00
Marcus Huderle
b6ee970e7a Minor berry.c cleanup 2018-12-31 16:53:38 -06:00
Marcus Huderle
fb2d1591c1 Document more battle anim effects 2018-12-31 16:53:38 -06:00
Diegoisawesome
439fa13e94 Start porting/decompiling roulette 2018-12-31 16:09:45 -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
Diegoisawesome
d004ce065c Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-31 02:30:30 -06:00
Diegoisawesome
ec780bb209 Cleanup and documentation 2018-12-31 02:22:21 -06:00
Diegoisawesome
c5c6e437ec Document, cleanup, extract data from trade 2018-12-31 01:23:27 -06:00
Marcus Huderle
58f130d007 Document some battle anims and helpers 2018-12-30 11:04:17 -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
Diegoisawesome
c22a12d8d6 trade source done 2018-12-29 13:50:24 -06:00
Diegoisawesome
2fb9f490fb Almost done with trade 2018-12-29 12:46:15 -06:00
DizzyEggg
b2a042f65c
Match and clean up battle anim 3 2018-12-29 19:31:04 +01:00
DizzyEggg
0d5a0b58fa Fakematch a function 2018-12-29 11:51:00 -06:00
DizzyEggg
75b4e9ac70 compile contest 2018-12-29 11:48:28 -06:00
DizzyEggg
55e44b0951 a bit more of contest painting effect 2018-12-29 11:48:28 -06:00
DizzyEggg
34243bbe1d Start contest painting effect 2018-12-29 11:48:28 -06:00
PALPATlNE
061b879561 Documentation for pokemon_summary_screens.c 2018-12-29 11:45:06 -06:00
Marcus Huderle
229177f7c6 Use anim weather constants 2018-12-29 11:40:12 -06:00
Marcus Huderle
8eea0925c5 Finish battle_anim_effects_3.c 2018-12-29 11:40:12 -06:00
Marcus Huderle
d0d870e193 Cleanup formatting 2018-12-29 11:36:54 -06:00
Marcus Huderle
6e7bdb3ca4 Document misc field_specials things 2018-12-29 11:36:54 -06:00
Marcus Huderle
67636b7c64 Document deoxys rock 2018-12-29 11:36:54 -06:00
Marcus Huderle
46d41d2fb9 Use EVENT_OBJ_ID_PLAYER in C code 2018-12-29 11:36:54 -06:00
Marcus Huderle
95dcff581b Document some fieldmap stuff 2018-12-29 11:36:54 -06:00
DizzyEggg
27b1d74dad Merge branch 'master' into battle_engine_v2 2018-12-29 15:11:54 +01:00
Diegoisawesome
146ad2bdd4 Next big honkin' function done 2018-12-28 13:42:34 -06:00
Diegoisawesome
9cad5e8197 Big switch mofo 2018-12-28 02:11:41 -06:00
Marcus Huderle
d59f5a8e56 Misc overworld documentation 2018-12-27 16:52:13 -06:00