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
3,907 Commits 1 Branch 0 Tags 235 MiB
78d7c29290
Commit Graph

2572 Commits

Author SHA1 Message Date
Diegoisawesome
2c7948bae8
Merge pull request #452 from Meowsy/pokemon-adding-easer 
Add macros to simplify defining front animations and still pics.
 2018-12-18 14:27:01 -06:00
Meowsy
d6b31346c3 Additional SPECIES_* documentation. 2018-12-18 10:03:57 -05:00
Meowsy
9ca27f1332 Document return value. 2018-12-18 09:20:43 -05:00
golem galvanize
8781d969ff finish party_menu 2018-12-18 05:38:08 -05:00
golem galvanize
c259ee46d3 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-18 05:31:39 -05:00
Marcus Huderle
c74468fd11 Document a bunch of battle anim stuff 2018-12-17 22:16:17 -06:00
Marcus Huderle
c04ce0ee64 Decompile battle_anim_effects_2.c 2018-12-17 22:16:17 -06:00
DizzyEggg
9ffd0c7382 3.5 asm left 2018-12-17 23:00:08 +01:00
Meowsy
e92245ab06 Add macros to simplify defining front animations and still pics. 2018-12-17 12:29:35 -05:00
Meowsy
62c4379a21 Remove magic numbers. 2018-12-17 12:28:11 -05:00
golem galvanize
076d07f6fe Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-17 02:40:30 -05:00
golem galvanize
71a7a8a075 decompiled up to sub_81B8A7C 2018-12-17 02:39:17 -05:00
shinny456
60484153a5 decompile electric.s 2018-12-16 22:23:05 -05:00
garak
e292d0ca83
Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
DizzyEggg
aae36b5653 6k left 2018-12-16 21:10:01 +01:00
Marcus Huderle
d1e6e705cc Decompile battle_anim_effects_1.c 2018-12-16 11:39:22 -06:00
Marcus Huderle
9c5fa4a787 Fix typo in UpdateContestPaintingMosaicEffect() 2018-12-16 08:28:09 -06:00
Marcus Huderle
fb9a365dc6
Merge pull request #448 from Meowsy/pokedex-documentation 
Pokedex Documentation
 2018-12-15 18:06:42 -06:00
Meowsy
1d09216e4b Simplify comparisons. 2018-12-15 18:39:48 -05:00
Meowsy
6ed8e4d6ed Rename temp_notNationalDex to temp_isHoennDex. 
Don't use hexadecimal format for x and y args.
 2018-12-15 18:34:06 -05:00
Meowsy
3d8cecb662 Use correct term. 2018-12-15 18:32:50 -05:00
DizzyEggg
f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
Meowsy
83c3f13655 Prettify line. 2018-12-15 15:26:07 -05:00
Meowsy
8f168add21 Remove incorrect comment. 2018-12-15 15:25:45 -05:00
Meowsy
bc11a4a9f4 Document various things relating to the Pokedex. 2018-12-15 15:12:28 -05:00
Marcus Huderle
1ca3656d74
Decompile contest_painting.c (#447) 2018-12-15 13:07:07 -06:00
Slawter666
2fa0555ed5 Document some of item_menu.c 2018-12-15 18:08:13 +00:00
garak
7e170a06cc label some sprite templates 2018-12-14 19:39:01 -05:00
Marcus Huderle
5e92481f51
Merge pull request #443 from Meowsy/misc-renamings 
Misc renamings.
 2018-12-13 21:35:36 -06:00
Marcus Huderle
2c6849bee8
Decompile battle_anim_8170478.c (#445) 2018-12-13 21:33:54 -06:00
ultima-soul
a00eb2f5d8 Added new battle items. 2018-12-13 09:31:47 -08:00
golem galvanize
6748ef72fb Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-13 00:31:06 -05:00
Marcus Huderle
170b6ef449
Decompile battle_intro.c (#444) 2018-12-12 23:18:25 -06:00
golem galvanize
2265d49ac2 decompiled up to sub_81B5A8C 2018-12-12 22:55:39 -05:00
DizzyEggg
59a69eb627 Storage up to icon palettes 2018-12-12 23:19:50 +01:00
DizzyEggg
74746603ad More pokemon storage 2018-12-11 23:09:12 +01:00
DizzyEggg
c5b5f4bd77 More storage 2018-12-10 23:42:44 +01:00
Meowsy
d3e32ab287 Rename Mauville Man text. 2018-12-10 15:50:10 -05:00
Meowsy
68017b531a Rename UnknownPokemonStruct to BattleTowerPokemon. 2018-12-10 15:49:33 -05:00
DizzyEggg
c2d8876174 Document PSS functions 2018-12-10 21:36:52 +01:00
Diegoisawesome
58ca87accc
Merge pull request #441 from Meowsy/document-pockets 
Document bag pocket magic numbers.
 2018-12-10 11:23:41 -06:00
Diegoisawesome
bfdfe367e8
Merge pull request #422 from garakmon/frontier_data_1 
Battle tower data
 2018-12-10 11:22:16 -06:00
Meowsy
2f008e866b Document return locations. 2018-12-10 11:39:57 -05:00
Meowsy
0aa41ad647 Fix whitespace to be consistent. 2018-12-10 11:38:27 -05:00
garak
c8cad8a389 re-add explicit array sizes 2018-12-10 10:33:51 -05:00
garak
2187dbb10a remove explicit array lengths from battle_tower.c 2018-12-10 10:17:03 -05:00
garak
10237e8d13 move externs and remove comments 2018-12-10 09:52:36 -05:00
Meowsy
e143804af0 Document pocket magic numbers. 2018-12-10 04:33:29 -05:00
golem galvanize
a6db7b2419 decompiled up to brm_cancel_1 2018-12-10 02:38:23 -05:00
garak
62384e7a61 use facility class constants 2018-12-09 22:57:46 -05:00
garak
e1e2132a37 sync fldeff function names with pokeruby 2018-12-09 22:24:54 -05:00
garak
b4312648e2 decompile fldeff_80F9BCC with data 2018-12-09 19:22:59 -05:00
DizzyEggg
431e7e7e5c More storage work 2018-12-09 21:06:43 +01:00
Marcus Huderle
a7722a0b93
Decompile cable_car.c (#438) 2018-12-09 13:41:52 -06:00
DizzyEggg
e0f3de0b74 Start pokemon storage system 2018-12-09 16:44:01 +01:00
Marcus Huderle
342d23e0ba
Merge pull request #436 from KDSKardabox/master 
Decompile ghost
 2018-12-09 07:59:32 -06:00
KDSKardabox
4233ae50c3 Finish decompile ghost 2018-12-09 18:38:15 +05:30
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01:00
DizzyEggg
c46499b05c field screen review changes 2018-12-09 12:16:01 +01:00
DizzyEggg
4683cdc30c Merge branch 'master' into weather 2018-12-09 11:56:50 +01:00
KDSKardabox
8712757d24 Merge remote-tracking branch 'upstream/master' 2018-12-09 13:44:41 +05:30
KDSKardabox
f8838491f6 Initial commit for ghost 2018-12-09 13:44:07 +05:30
Diegoisawesome
0b91d2948a
Merge pull request #429 from nullableVoidPtr/master 
Various fixes and cleanups
 2018-12-08 21:44:12 -06:00
nullableVoidPtr
cceb8ac331 Remove trailing whitespace 2018-12-09 11:32:58 +08:00
DizzyEggg
4d2f1bad7f fix header 2018-12-08 22:12:44 +01:00
DizzyEggg
b94ae8bb92 Merge branch 'master' into weather 2018-12-08 22:10:20 +01:00
DizzyEggg
4ec14b3d43 Finish field screen 2018-12-08 22:05:11 +01:00
DizzyEggg
58c4cec946 decompile field screen 2018-12-08 21:42:36 +01:00
DizzyEggg
5caca7a4d6 Clean up field weather 2018-12-08 19:43:21 +01:00
Marcus Huderle
88ffb09765
Merge pull request #432 from KDSKardabox/master 
De-compile fire
 2018-12-08 12:41:08 -06:00
KDSKardabox
1357449d73 Merge remote-tracking branch 'upstream/master' 2018-12-09 00:01:45 +05:30
KDSKardabox
2dfbe75b05 Shift externs to header file 2018-12-08 23:52:52 +05:30
DizzyEggg
4c23adb5f5 Decompile field weather 2018-12-08 19:05:03 +01:00
Meowsy
6babb97182 Fix typo "ggText_DexSortSmallestDescription". (#433) 
Should be "gText_DexSortSmallestDescription".
 2018-12-08 11:57:19 -06:00
Marcus Huderle
f3a25f83cf
Decompile roulette_util.c (#434) 2018-12-08 11:56:59 -06:00
DizzyEggg
b60915539d Fix Phantom Force 2018-12-08 16:19:50 +01:00
KDSKardabox
5630ab2b1e Fully decompile fire 2018-12-08 17:55:17 +05:30
KDSKardabox
0f82e5caf7 Intial commit for decomp fire 2018-12-08 15:15:52 +05:30
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
nullableVoidPtr
907ed3f5f5 Format pokemon.c 2018-12-08 11:39:35 +08:00
nullableVoidPtr
4d307a6f63 Clean some more arrays 2018-12-08 11:33:41 +08:00
DizzyEggg
d52fe8ac58 Flash Cannon effect 2018-12-08 00:14:35 +01:00
DizzyEggg
43d620f13a Surf hits 3 opponent 2018-12-08 00:13:06 +01:00
DizzyEggg
35d0ea5ff5 Fix moves hitting all 3 pokemon 2018-12-08 00:09:39 +01:00
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
DizzyEggg
470df386c9 Fix conflicts 2018-12-07 23:01:14 +01:00
golem galvanize
53fac4417b fixing merge conflicts 2018-12-07 14:47:20 -05: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
golem galvanize
18124740a4 pushing so I can merge 2018-12-06 23:14:33 -05:00
Diegoisawesome
6df2042b3b
Merge pull request #427 from Slawter666/pokedex 
Document some more of pokedex.c
 2018-12-06 13:39:32 -06: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
nullableVoidPtr
3909b6408c Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
 2018-12-06 09:44:08 +08:00
DizzyEggg
a9e6154fa9 Finish porting battle frontier data 2018-12-05 22:21:26 +01:00
DizzyEggg
fc806b966e Merge branch 'frontier_data_1' of https://github.com/garakmon/pokeemerald into help_garak 2018-12-05 21:24:01 +01:00
Melody
2347e36d60 document pokédex options 2018-12-05 10:10:33 -05:00
Slawter666
9cfed81789 Document some more of pokedex.c 2018-12-05 00:15:22 +00:00
garak
d9287f3261 extern gTower trainer data 2018-12-04 12:15:13 -05: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
bac1f1b6c9
Match and clean rotating_gate.c 
One more down, many more to go.
 2018-12-03 21:44:47 +01:00
DizzyEggg
c7dd347bb1
Match battle_tower.c function 
For some reason, I gave the function of type void, type u16 instead, which messed up the registers, LMAO
 2018-12-03 21:09:26 +01: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
Diegoisawesome
ffa8655f4c
Merge pull request #423 from Slawter666/pokedex-doc 
Document some of pokedex.c
 2018-12-03 10:53:21 -06:00
DizzyEggg
e1829c40ab Clean up safari zone 2018-12-03 17:31:34 +01:00
DizzyEggg
2821eafb99 Clean up roamer 2018-12-03 17:19:10 +01:00
DizzyEggg
dcb1d78fa9 Add battle controllers var to src from sym_ewram 2018-12-03 16:20:39 +01:00
DizzyEggg
846b5d79e4 Get rid of headers in src/data 2018-12-03 16:10:41 +01:00
Slawter666
715fbb379e Document some of pokedex.c 2018-12-03 14:58:25 +00: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
DizzyEggg
b9e711bbf4 Add Powder 2018-12-03 12:50: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
52d1e69591 Add AI support for newly added moves 2018-12-02 23:50:51 +01:00
DizzyEggg
ad67f4f26f Merge with master and REQ arguments 2018-12-02 22:05:23 +01:00
Melody
10725def8e trainerbattle_normal → trainerbattle_single 
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
 2018-12-02 15:08:19 -05:00
Melody
bad5323642 cleans up trainer battle scripts 
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
 2018-12-02 15:08:19 -05:00
DizzyEggg
9828e0e97b Merge with master 2018-12-02 19:38:05 +01:00
Diegoisawesome
ee05197eba
Merge pull request #418 from DizzyEggg/link_rfu 
Finish Link rfu
 2018-12-02 12:29:31 -06:00
DizzyEggg
a42bfd7a0e fix brackes n ne file 2018-12-02 19:27:56 +01:00
DizzyEggg
b87e6a4e57 Get rid of static functions in includes 2018-12-02 18:58:33 +01:00
DizzyEggg
d46c3ebe5b Fix Future Sight 2018-12-02 18:47:39 +01:00
DizzyEggg
945575f5d6 Fix atk canceller 2018-12-02 17:58:21 +01:00
DizzyEggg
8f8e6fb88b Merge branch 'master' into battle_engine_v2 2018-12-02 16:59:38 +01:00
DizzyEggg
d137ebc7a9 Some more rom 8011dc0 work 2018-12-02 13:59:55 +01:00
DizzyEggg
e17140536a finish link rfu and fix rom 8011dc0 2018-12-02 11:58:50 +01:00
Melody
b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
Melody
c7f52c4203 cleans up trainer name defines 2018-12-01 22:49:33 -05:00
DizzyEggg
b082f000af Start working on link rfu 2018-12-01 18:54:59 +01:00
DizzyEggg
6ae949e360 Psychic Terrain blocks priority moves 2018-12-01 11:35:49 +01:00
DizzyEggg
3be070f0c3 Fix string overflowing issue 2018-12-01 11:12:31 +01:00
DizzyEggg
3934eac8d4 Merge branch 'master' into battle_engine_v2 2018-12-01 10:28:11 +01:00
Marcus Huderle
0e32a3adf3
Decompile normal.c (#414) 2018-11-30 17:29:55 -06:00
DizzyEggg
0ad4795e69 Match 2 field effect functions 2018-11-30 23:16:15 +01:00
DizzyEggg
1a8859b1d8 Add Dazzling 2018-11-30 22:12:18 +01:00
DizzyEggg
dc7be39894 Add Triage 2018-11-30 21:42:30 +01:00
DizzyEggg
0329175f06 Add Protean 2018-11-30 21:21:43 +01:00
DizzyEggg
5aff99b015 Fix Stored Power's Power 2018-11-30 20:52:39 +01:00
DizzyEggg
7a69f9cb0d Add Dream Eater blocked by heal block 2018-11-30 20:48:43 +01:00
DizzyEggg
9d9fcc540e
Merge pull request #43 from Kurausukun/battle_engine_v2 
Update Dive's Base Power
 2018-11-30 20:46:34 +01:00
DizzyEggg
7fa55704b2 merge with master 2018-11-30 20:46:09 +01:00
Marcus Huderle
9dd7f8f214
Decompile pokedex_area_screen.c (#412) 2018-11-30 10:41:03 -06:00
Kurausukun
c8bc40e3e8
Update battle_moves.h 2018-11-30 00:56:53 -05:00
DizzyEggg
f87e68379c match 2 field functions 2018-11-29 21:19:00 +01:00
Diegoisawesome
a7a317f6cc
Merge pull request #408 from DizzyEggg/pass_time 
Match 3 link rfu functions
 2018-11-28 16:51:53 -06:00
DizzyEggg
f54f5b3531 Match 3 link rfu functions 2018-11-28 23:08:20 +01:00
DizzyEggg
0ed2f54d61 Use MAX_SPRITES define 2018-11-28 21:08:22 +01:00
Marcus Huderle
0148e38973
Decompile pokedex_cry_screen.c (#406) 2018-11-28 10:14:32 -06:00
Marcus Huderle
9fafa63743 Finish decompiling internation_string_util.c 2018-11-27 17:21:23 -06:00
DizzyEggg
7cfe0342f0 Finish frontier data 2018-11-27 22:45:50 +01:00
garak
50f00b0827 Merge remote-tracking branch 'upstream/master' into fldeff 2018-11-27 13:31:07 -05:00
garak
2707bd9b91 clean frontier data 2018-11-27 13:27:49 -05:00
garak
73cce79753 Merge remote-tracking branch 'upstream/master' into frontier-data 2018-11-27 11:35:19 -05:00
garak
091b5194e7 frontier pike and pyramid data 2018-11-27 11:21:48 -05:00
nullableVoidPtr
556bdd52e1 Clean up aligned variables in src/ 2018-11-27 19:37:29 +08:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Marcus Huderle
382ff45452
Merge pull request #396 from DizzyEggg/attempt 
Match some functions
 2018-11-26 16:58:19 -06:00
Marcus Huderle
c233dbb220
Merge pull request #400 from DizzyEggg/util 
Match sub_080F8970
 2018-11-26 16:57:36 -06:00
Jefferson Steelflex
af08f3bb13
Update back_pic_coordinates.h 2018-11-26 16:55:37 -05:00
Jefferson Steelflex
8e5e4c2304
Fix labels, shifted off by one. 2018-11-26 16:51:08 -05:00
DizzyEggg
132a486169 Match 0x0F8970 2018-11-26 21:54:51 +01:00
DizzyEggg
c9b3f3e3cb Fix indentation 2018-11-26 20:19:52 +01:00
Marcus Huderle
2425a14b19 Decompile fight.c 2018-11-26 10:25:51 -06:00
Marcus Huderle
35c0fb5154 Decompile ground.c 2018-11-26 09:55:31 -06:00
Marcus Huderle
839c629d5b Decompile dragon.c 2018-11-26 09:31:03 -06:00
Marcus Huderle
9b1f2ccf5e Decompile poison.c 2018-11-26 09:13:45 -06:00
Marcus Huderle
2c2431aa4c
Decopmile bug.c (#399) 2018-11-26 09:03:50 -06:00
Marcus Huderle
5947e0d229 Decompile rock 2018-11-25 17:00:18 -06:00
Marcus Huderle
19e235867a
Merge pull request #395 from Slawter666/battle-ui-doc 
Document some battle ui
 2018-11-25 15:58:37 -06:00
Marcus Huderle
fb6120da5b Fixup some names 2018-11-25 15:50:54 -06:00
Marcus Huderle
256bfc3caa Decompile script_pokemon_util_80F87D8 2018-11-25 15:32:22 -06:00
DizzyEggg
8e10d7c0e5 Match some functions 2018-11-25 20:16:41 +01:00
DizzyEggg
a0699dba52 Add Aromatic Mist 2018-11-25 12:59:22 +01:00
Kurausukun
690f2671cb oops, forgot Igglybuff 2018-11-25 05:54:32 -05:00
Kurausukun
13ea841e32 change pokemon types to use fairy type 2018-11-24 21:16:32 -05:00
DizzyEggg
434e257943 Add Acupressure 2018-11-24 21:06:53 +01:00
DizzyEggg
194139a35b Add Move Effect - Feint 2018-11-24 19:37:10 +01:00
DizzyEggg
cc635c5e6d Custom wild multi battles functionality 2018-11-24 17:31:45 +01:00
DizzyEggg
1c8e574646 Custom Multi Battles - fix defeat msg 2018-11-24 17:06:48 +01:00
DizzyEggg
d52016bc31 Mon creation in custom multi battles 2018-11-24 13:29:10 +01:00
DizzyEggg
539b05ff73 Begin working on custom multi battles 2018-11-24 01:02:02 +01:00
DizzyEggg
10671a4f32 Fix split icons - hm cant forget 2018-11-23 23:16:48 +01:00
DizzyEggg
5fea7e3216 Fix overworld weather 2018-11-23 23:07:02 +01:00
DizzyEggg
c6a207c37b Fix Teleport in double wild battles 2018-11-23 22:26:36 +01:00
DizzyEggg
2216d49890 Merge branch 'master' into battle_engine_v2 2018-11-23 21:40:06 +01:00
Slawter666
3b501cb470 Document battle ui 2018-11-22 01:10:50 +00:00
DizzyEggg
a900a51a59 match DecompressGlyphTile nicer 2018-11-21 23:30:50 +01:00
DizzyEggg
d70c3a94c5 match DecompressGlyphTile nicer 2018-11-21 23:30:04 +01:00
DizzyEggg
c7ca38ccf3 Match DecompressGlyphTile 2018-11-21 21:58:35 +01:00
garak
f02cb667bb first 4 functions in fldeff 2018-11-20 09:51:54 -05:00
DizzyEggg
a5df797804 Merge branch 'master' into battle_engine_v2 2018-11-19 20:42:07 +01:00
DizzyEggg
58a1bba059 tabs to spaces 2018-11-19 20:25:09 +01:00
DizzyEggg
f0ec68c058 add include 2018-11-19 18:14:28 +01:00