ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-19 04:57:39 +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
DizzyEggg
8a00334102 document mossdeep gym 2018-11-19 17:31:46 +01:00
DizzyEggg
d22c2110de Decompile mossdeep hym 2018-11-19 17:16:01 +01:00
DizzyEggg
6a5b20ee8a Fix fossil specials 2018-11-19 17:15:28 +01:00
Marcus Huderle
72f0a079a9 Decompile all of battle_anim_utility_funcs 2018-11-19 09:37:25 -06:00
DizzyEggg
95d3c180cc clean up variables in files 2018-11-19 01:03:14 +01:00
DizzyEggg
b0c78065e5
Merge pull request #30 from Kurausukun/battle_engine_v2 
Fix Aurora Veil's name, update Gen 1-3 moves to be consistent with Gen 7
 2018-11-18 20:51:16 +01:00
DizzyEggg
623f1963b7 Merge with master 2018-11-18 20:49:52 +01:00
DizzyEggg
f58cc47e17 USE RGB constants in hall of fame 2018-11-18 20:32:27 +01:00
DizzyEggg
27ee7d567e fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT 2018-11-18 20:19:10 +01:00
Diegoisawesome
0bbe03f170
Merge pull request #388 from DizzyEggg/clean_savve 
Clean up save related files
 2018-11-18 13:13:56 -06:00
DizzyEggg
682e6c8512 Use RGB constants in save files 2018-11-18 20:09:11 +01:00
DizzyEggg
1b0cfb0757 Party Size and Num Stats 2018-11-18 20:00:36 +01:00
DizzyEggg
7ce3473b0e Clean up save related files 2018-11-18 19:37:18 +01:00
DizzyEggg
4803a31b84 Fix unk5 field 2018-11-18 17:54:15 +01:00
DizzyEggg
4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
DizzyEggg
6cb262aa20 un-static a function 2018-11-18 11:09:40 +01:00
Kurausukun
3ef247ce56 Merge branch 'battle_engine_v2' of https://github.com/Kurausukun/pokeemerald 2018-11-17 21:33:54 -05:00
Kurausukun
febb4a612a Update Gen 1-3 moves to be consistent with Gen 7 2018-11-17 21:32:03 -05:00
Kurausukun
98ebd7ef5a
fix indentation 2018-11-17 21:29:46 -05:00
Kurausukun
a98ecc08aa fix Aurora Veil's name 2018-11-17 21:16:33 -05:00
DizzyEggg
c2a3cff814 Fix physical atk stat stage and third type 2018-11-17 23:47:35 +01:00
DizzyEggg
dff968d1f1
Merge pull request #26 from PALPATlNE/battle_engine_work 
Battle engine work
 2018-11-17 23:04:00 +01:00
DizzyEggg
40a44a8508 more battle pytamid 2018-11-17 22:55:39 +01:00
Kurausukun
c798d0f1d1 mud-slap should be special, not physical 2018-11-17 16:48:22 -05:00
PALPATlNE
4284816d81 Fixed Createsprite command arguments 2018-11-17 21:16:48 +01:00
PALPATlNE
a5ba055814 Added new move animations 2018-11-17 20:15:38 +01:00
DizzyEggg
eb66b60f38 Begin battle pyramid 2018-11-17 15:30:34 +01:00
DizzyEggg
15b8046b2b Add third type 2018-11-17 12:10:24 +01:00
DizzyEggg
65036b9a09 Merge with master 2018-11-15 21:53:32 +01:00
DizzyEggg
bb9dbc0c6d Merge with master 2018-11-14 22:50:27 +01:00
Slawter666
4311fd8b89 Sort includes into alphabetical order 2018-11-14 00:01:50 +00:00
Slawter666
6fcf878e2f Tidy up header files 2018-11-13 22:28:46 +00:00
Slawter666
1d46507110 Move field effects enum to defines 2018-11-13 14:19:04 +00:00
DizzyEggg
b5ea69cf74 Fix conflicts 2018-11-12 19:22:23 +01:00
DizzyEggg
734403fdfa Merge branch 'master' into frontier_2 2018-11-12 15:42:44 +01:00
DizzyEggg
69683f9572 Decompile Battle Palace 2018-11-12 15:41:19 +01:00
Slawter666
1b895ff52c Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-11-12 14:14:50 +00:00
Slawter666
be33878b94 Synchronise wallclock.c 2018-11-12 14:04:32 +00:00
DizzyEggg
d5abd7b696 Document Battle Pie 2018-11-12 14:36:31 +01:00
DizzyEggg
3b3cffac44 Decompile battle pike 2018-11-12 14:07:31 +01:00
DizzyEggg
4fb463377c Start battle pike 2018-11-12 00:46:02 +01:00
DizzyEggg
a4235c9ff8 Document battle arena 2018-11-11 18:33:16 +01:00
DizzyEggg
81410fee17 Factory done 2018-11-11 16:44:27 +01:00
DizzyEggg
1437755cdd Start arena 2018-11-07 22:54:42 +01:00
Diegoisawesome
65f053fd89 Thanks Egg 2018-11-07 14:48:06 -06:00
DizzyEggg
01fdb01364 Diego pls 2018-11-07 21:09:54 +01:00
Diegoisawesome
9f50ba1ce3 Fix incorrect compressed types, part 2 2018-11-07 12:35:31 -06:00
Diegoisawesome
18839a4872 Merge remote-tracking branch 'pret/master' into script_menu 2018-11-06 20:20:56 -06:00
Diegoisawesome
054a015c95 Finish decompiling/porting script_menu 2018-11-06 20:13:40 -06:00
Slawter666
15117a8d09 Remove redundancy in berry.c 2018-11-06 23:15:57 +00:00
Diegoisawesome
9afe7a896e Merge remote-tracking branch 'pret/master' into render_text 2018-11-06 11:40:17 -06:00
Diegoisawesome
43a8534fce Merge remote-tracking branch 'origin/master' into render_text 2018-11-06 11:33:21 -06:00
Diegoisawesome
f8d337e491 Finish cleaning up text.c 2018-11-06 11:30:21 -06:00
Diegoisawesome
6d38431c33 Begin cleaning text.c 2018-11-06 10:44:48 -06:00
DizzyEggg
258ec3162f frontier util review changes 2018-11-05 22:13:59 +01:00
Diegoisawesome
7dd4ed7060 r5/r6 swap on sub_80E2578 2018-11-05 14:45:54 -06:00
DizzyEggg
487a6c2b2c this file is 2018-11-05 21:42:12 +01:00
DizzyEggg
6d0d69f3a5 Match Render Text 2018-11-04 23:09:10 +01:00
DizzyEggg
c3eac92af8 fix protect 2018-11-03 23:32:18 +01:00
Slawter666
bd766b9049 Minor labelling of field effects 2018-11-03 20:20:28 +00:00
DizzyEggg
3159e958b8 Match a record mixing function 2018-11-03 18:21:33 +01:00
DizzyEggg
bc42de5f60 Aurora Veil, Revelation Dance, Diamond Storm 2018-11-03 14:35:45 +01:00
DizzyEggg
52a68f6f1c Introduce ability pop-up define 2018-11-03 10:51:51 +01:00
DizzyEggg
68d94ad316 Implement trainer sliding 2018-11-03 01:17:16 +01:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
DizzyEggg
0bb51037d7 Finish frontier util 2018-11-01 21:31:10 +01:00
DizzyEggg
37d742cbd8 Document recorded battle 2018-11-01 15:06:50 +01:00
Diegoisawesome
645830624d Continue script_menu.c 2018-10-31 23:03:41 -05:00
DizzyEggg
7de1c4bd14 Make frontier util compile 2018-10-30 22:17:03 +01:00
DizzyEggg
90ef269426 Merge branch 'master' into battle_frontier_2 2018-10-30 21:48:18 +01:00
DizzyEggg
0da7d7e6ae why is this function so hard to match 2018-10-30 21:45:26 +01:00
Diegoisawesome
9adbb5d871
Merge pull request #375 from garakmon/animation-test-temp 
Back animation names
 2018-10-30 12:00:37 -05:00
Diegoisawesome
2837859bdb
Merge pull request #373 from garakmon/battle-anim 
Split battle_anim_80FE840 and move data to C
 2018-10-30 11:53:05 -05:00
garak
3cb7a33f42 label back animations 2018-10-30 12:37:53 -04:00
Diegoisawesome
c8ef69a00d
Merge pull request #372 from garakmon/sprite-tags 
Synchronize sprite tags
 2018-10-30 11:26:44 -05:00
Diegoisawesome
f3af20d3cf
Merge pull request #370 from DizzyEggg/battle_tower 
Decompile Battle Tower
 2018-10-30 11:18:24 -05:00
DizzyEggg
3a9eeef844 Frontier, finish ranking hall 2018-10-28 21:11:53 +01:00
DizzyEggg
98d8dbfd8a Up to sub_81a443c 2018-10-28 00:50:06 +02:00
DizzyEggg
e850517123 more battle frontier 2 2018-10-27 21:01:35 +02:00
DizzyEggg
269d7c2510 up to factory 2018-10-27 17:39:05 +02:00
DizzyEggg
826d0ea2ab Begin frontier records 2018-10-27 15:44:29 +02:00
DizzyEggg
b252bd0292 Window priority to window bg 2018-10-27 00:53:07 +02:00
DizzyEggg
0e6fbbfe09 Make battle tower compile 2018-10-27 00:04:18 +02:00
DizzyEggg
52be8eeaf1 Merge branch 'master' into battle_tower 2018-10-26 23:55:36 +02:00
DizzyEggg
dc273cc19d Battle tower - ewram variables 2018-10-26 23:54:41 +02:00
garak
7747a891a2 finish 80FE840 data (actually) 2018-10-25 18:59:05 -04:00
garak
de90ce9123 finish 80FE840 data (almost) 2018-10-25 17:46:23 -04:00
DizzyEggg
1efdaebe23 finish decompiling battle tower 2018-10-25 21:27:10 +02:00
garak
17c26fae1a fire, electric, ice data 2018-10-24 20:01:40 -04:00
DizzyEggg
549b669f2a battle tower, match sth and dumb loop instead of goto 2018-10-24 23:14:45 +02:00
garak
22a0b58e57 effects_2 and water data 2018-10-24 15:52:21 -04:00
garak
2f4b00e34b finish effects_1 data 2018-10-23 12:17:31 -04:00
garak
68814c42de begin 80FE840 data 2018-10-23 08:25:51 -04:00
DizzyEggg
b330bdba51 More and more battle tower 2018-10-22 19:22:57 +02:00
garak
d267fcbfb1 name remaining tags 2018-10-22 10:36:43 -04:00
garak
2b9fd18dd4 battle_anims.s data to C 2018-10-21 22:30:20 -04:00
garak
f2363f5982 more tag names 2018-10-21 19:30:27 -04:00
Diegoisawesome
32d2640dc7 Match GameClear (thanks Egg) 2018-10-21 16:24:43 -05:00
DizzyEggg
0ab27e44b1 more tower, fail 2018-10-21 20:13:12 +02:00
Diegoisawesome
8e7202ec3d Fix LZ compressed data alignment 2018-10-21 12:05:34 -05:00
Diegoisawesome
97bbb326b8 GameClear nonsense 2018-10-20 19:53:41 -05:00
golem galvanize
ba3247d5cd decompiled more, stuck on sub_81B1760 2018-10-20 20:25:28 -04:00
Slawter666
3d8874d919 Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-10-21 00:20:09 +01:00
DizzyEggg
16026fe91d More battle tower. 2018-10-21 00:06:42 +02:00
Slawter666
7a072d4527 Continue synchronising 2018-10-20 21:01:45 +01:00
Diegoisawesome
2a3ba78831
Merge pull request #369 from garakmon/pan-constants 
Use sound pan constants in data/battle_anim_scripts.s
 2018-10-19 20:27:54 -05:00
DizzyEggg
f4e55999a5 begin porting and decomping battle tower 2018-10-20 00:33:51 +02:00
garak
38fcc46abb Merge remote-tracking branch 'upstream/master' into pan-constants 2018-10-19 16:05:14 -04:00
garak
901f3ff557 use sound panning constants in battle_anim_scripts 2018-10-19 15:57:19 -04:00
Diegoisawesome
bf8fa23462
Merge pull request #365 from garakmon/event-flags 
[WIP] Event flags
 2018-10-19 14:24:34 -05:00
garak
113a8d1efd clean flags and remove temp macro 2018-10-19 14:59:18 -04:00
Diegoisawesome
95d8815721
Merge pull request #368 from Diegoisawesome/master 
Finish porting/decompiling field_player_avatar
 2018-10-19 00:08:59 -05:00
Diegoisawesome
dd3689fdbf Finish porting/decompiling field_player_avatar 2018-10-19 00:05:54 -05:00
garak
cb5981cdf2 name more event flags 2018-10-18 21:32:21 -04:00
garak
c27043bd3c more event flags 2018-10-18 15:28:59 -04:00
DizzyEggg
dfee5deca8 Move Bitmap struct and clear sprite/text files 2018-10-18 21:24:37 +02:00
Diegoisawesome
b23dc9a123
Merge pull request #366 from Diegoisawesome/master 
Finish shop and fldeff_escalator
 2018-10-18 12:08:38 -05:00
Diegoisawesome
6206acd2d2 Finish shop and fldeff_escalator 2018-10-18 12:05:02 -05:00
golem galvanize
dded980cde fix building 2018-10-17 23:36:18 -04:00
garak
d1b7f32b0a begin event flag names, add temporary hidden item macro 2018-10-17 22:07:23 -04:00
golem galvanize
2c6d634acd Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-10-17 20:03:31 -04:00
golem galvanize
65a0c48eec decompiled some more of the file 2018-10-17 20:03:02 -04:00
garak
7d88b9647f
Merge branch 'master' into event-flags 2018-10-17 12:30:45 -04:00
garak
ff97873c30 label temp flags, test replace script 2018-10-17 12:25:12 -04:00
Slawter666
b7b1d609d0 More synchronisation 2018-10-17 13:52:26 +01:00
Diegoisawesome
f67bbbdaaa
Merge pull request #364 from Diegoisawesome/master 
Port/decompile field_control_avatar
 2018-10-16 21:54:14 -05:00
Diegoisawesome
e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
Slawter666
1435c96b41 Further synchronisation 2018-10-17 01:11:44 +01:00
DizzyEggg
1f358fbb07
Use constants 2018-10-16 22:34:53 +02:00
DizzyEggg
d3215ff96f Fix wild double battle issues 2018-10-16 22:19:53 +02:00
Slawter666
3aff112127 Begin synchronising with pokeruby 2018-10-16 14:55:16 +01:00
DizzyEggg
67384c08be Implement double wild battle functionality 2018-10-15 21:19:52 +02:00
Diegoisawesome
a9abb930aa
Merge pull request #352 from huderlem/shop 
[WIP] Shop
 2018-10-14 19:03:48 -05:00
Diegoisawesome
7f211b2588
Merge pull request #359 from Slawter666/label_field_effect_helpers 
Label field_effect_helpers.c
 2018-10-14 18:37:11 -05:00
Deokishisu
bf2063cc1a Update All EVENT_OBJ_GFX References 
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
 2018-10-14 19:09:18 -04:00
Slawter666
137f6549ff label field_effect_helpers 2018-10-14 23:43:40 +01:00
DizzyEggg
ef11706dc7 Begin wild double battles 2018-10-14 22:37:07 +02:00
Deokishisu
94bec0b8db Fix Double Underscores 
Whoops.
 2018-10-14 16:14:01 -04:00
Deokishisu
d7ba8a306c Rename OW Sprites 
Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed.

Renamed:
LittleBoy1 -> NinjaBoy
LittleGirl1 -> Twin
Woman2 -> PokefanF
OldMan1 -> ExpertM
OldWoman1 -> ExpertF
Man3 -> PokefanM
Woman6 -> LinkReceptionist
Man7 -> DevonEmployee
Boy4 -> RichBoy
Boy5 -> GameboyKid (Consistent with pokecrystal)
ContestOldMan -> ContestJudge

Renamed Because of Numbering Changes:
LittleBoy2 -> LittleBoy
LittleGirl2 -> LittleGirl
OldWoman2 -> OldWoman
OldMan2 -> OldMan
Man4 -> Man3
Man5 -> Man4
Man6 -> Man5
Woman3 -> Woman2
Woman4 -> Woman3
Woman5 -> Woman4
Woman7 -> Woman5
 2018-10-14 15:49:55 -04:00
DizzyEggg
b3ad32bbe6 Merge with master 2018-10-14 20:51:34 +02:00
Deokishisu
a8afec762b Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:22:56 -04:00
Diegoisawesome
02049d52ee
Merge pull request #351 from DizzyEggg/apprentice 
Decompile apprentice
 2018-10-14 13:20:38 -05:00
Deokishisu
c89b14f5ef Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:19:23 -04:00
Diegoisawesome
43316ffae8
Merge pull request #356 from DizzyEggg/clean_battlestruct 
Clean a couple of battlestructs' fields
 2018-10-14 13:18:29 -05:00
Deokishisu
e129f4864f Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:16:07 -04:00
Diegoisawesome
0979ea91fb
Merge pull request #357 from DizzyEggg/move_heap 
Move HEAP_SIZE to malloc and use void instead of empty argument list
 2018-10-14 13:15:31 -05:00
DizzyEggg
c3113db931 Move HEAP_SIZE to malloc and use void instead of empty argument list 2018-10-14 20:00:14 +02:00
Diegoisawesome
d40e737d52
Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers 
Decompile field effect helpers
 2018-10-14 12:48:18 -05:00
Diegoisawesome
e0bc3fd59c
Merge pull request #355 from DizzyEggg/use_eos 
Use defines for text chars
 2018-10-14 12:21:37 -05:00
DizzyEggg
ecdf0fd69d Clean battle structs 2018-10-14 18:37:52 +02:00
Deokishisu
2bd86dad2f Rename Boy4 to RichBoy 2018-10-14 12:26:48 -04:00
DizzyEggg
b73611bccb clean battle structs 2018-10-14 18:10:54 +02:00
DizzyEggg
cd4f65ecef Make apprentice compile 2018-10-14 17:06:47 +02:00
DizzyEggg
f47ed3268c Finish documenting apprentice for now 2018-10-14 17:00:41 +02:00
DizzyEggg
d60e4e23f8
Merge pull request #25 from Slawter666/apprentice-data 
Move apprentice data to C
 2018-10-14 16:28:27 +02:00
DizzyEggg
7952cfeba5 document more of apprentice 2018-10-14 16:27:48 +02:00
Slawter666
f08b56d645 Move apprentice data to C 2018-10-14 15:26:13 +01:00
DizzyEggg
af7aa624cd make aprentice compile 2018-10-14 15:23:14 +02:00
DizzyEggg
84936b4260 Merge branch 'master' into apprentice 2018-10-14 15:07:16 +02:00
DizzyEggg
541043a661 Use defines for text chars 2018-10-14 15:04:25 +02:00
DizzyEggg
7a008a944a Move 'blend_palette'.c to util.c 2018-10-14 14:43:19 +02:00
DizzyEggg
145df49063 Document more of apprentice 2018-10-14 14:35:51 +02:00
DizzyEggg
b4a42a6832 Decompile apprentice 2018-10-14 11:37:44 +02:00
DizzyEggg
36b8a6a9a2 More apprentice work 2018-10-13 23:23:33 +02:00
DizzyEggg
a496a763ca Merge record mixing, pokemon and global with apprentice 2018-10-13 20:38:46 +02:00
Diegoisawesome
32fbf67d47
Merge branch 'master' into shop 2018-10-13 12:55:06 -05:00
Diegoisawesome
a26380663c Merge branch 'master' of github.com:pret/pokeemerald 2018-10-13 12:44:23 -05:00
Diegoisawesome
35c6938814 Port/decompile cable_club.s 2018-10-13 12:41:10 -05:00
Marcus Huderle
b24559d69b Merge remote-tracking branch 'upstream/master' into shop 
# Conflicts:
#	asm/shop.s
 2018-10-13 10:22:58 -05:00
DizzyEggg
74b81bf229 start apprentice 2018-10-13 00:48:26 +02:00
golem galvanize
d3d725cc83 decompiled up to sub_81B0948 2018-10-11 21:23:39 -04:00
Diegoisawesome
04836db167 Start porting cable_club.c 2018-10-11 16:02:58 -05:00
golem galvanize
803c2388ce finish porting field_effect_helpers 2018-10-10 12:02:02 -04:00
golem galvanize
35ee9f67c0 ported some of field_effect_helpers 2018-10-09 17:32:39 -04:00
DizzyEggg
b80b94ee73 merge with master 2018-10-07 19:40:34 +02:00
Marcus Huderle
807050a048
Merge pull request #348 from DizzyEggg/anim_files 
Decompile/Port battle_anim_80A5C6C
 2018-10-07 12:23:07 -05:00
DizzyEggg
dbb09aa445 get rid of SPRITE and TASK 2018-10-07 19:19:13 +02:00
DizzyEggg
413e26e83d port 80d51ac 2018-10-07 17:45:37 +02:00
DizzyEggg
61343d5069 Decompile battle_anim_80A9C70 2018-10-07 15:39:46 +02:00
DizzyEggg
8c834b9ae8 battle anim 80a5c6c decompiled 2018-10-07 12:32:20 +02:00
DizzyEggg
54fc92bc92 Start porting ruby battle anim file 2018-10-06 23:04:53 +02:00
Diegoisawesome
7a7aeed5e8
Merge pull request #347 from Deokishisu/GamV 
Fill out VERSION_ enum with all possible values
 2018-10-06 13:45:21 -05:00
DizzyEggg
7925000a54 merge with master 2018-10-06 16:05:58 +02:00
DizzyEggg
6b5c52e926 Flower Shield and protect moves 2018-10-06 15:50:35 +02:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims 
Document battle animation scripts
 2018-10-06 08:20:41 -05:00
Deokishisu
9f69ea1931
Update gGameVersion to use GAME_VERSION 2018-10-06 01:57:39 -04:00
Marcus Huderle
ec0d350137 Move metatile behavior constants to include/constants and sync closer to pokeruby 2018-10-04 17:57:07 -05:00
DizzyEggg
de9e9072fc Rototiller and 2 turn moves 2018-09-30 14:04:46 +02:00
DizzyEggg
162c83fcff Bestow 2018-09-30 12:27:51 +02:00
DizzyEggg
65a48e16ee
Merge pull request #19 from LOuroboros/patch-11 
Update move_names.h
 2018-09-30 11:43:57 +02:00
DizzyEggg
eb4a8b8748
Merge pull request #20 from LOuroboros/patch-12 
Update battle_moves.h
 2018-09-30 11:43:49 +02:00
DizzyEggg
7623eabdee After you 2018-09-29 19:37:39 +02:00
DizzyEggg
b9cf1fdcfe Psycho Shift, Power Trick, Flame Burst 2018-09-29 18:40:14 +02:00
LOuroboros
0621d5ceb7
Update battle_moves.h 
When I made the Gen. 7 moves data, I screwed up Spirit Shackle's effect. I should have gave it EFFECT_PLACEHOLDER as it will probably need a new effect.
 2018-09-29 12:39:27 -03:00
DizzyEggg
dddefbb0e3 Full support for moves hitting all battlers 2018-09-29 16:41:25 +02:00
DizzyEggg
ada76cbe4f Synchronoise and Smack Down 2018-09-29 15:43:56 +02:00
LOuroboros
258f1ea606
Update move_names.h 
Decapped move names and fixed U-Turn's,
 2018-09-29 10:06:10 -03:00
DizzyEggg
597299136f Add Pollen Puff effect 2018-09-29 14:10:53 +02:00
DizzyEggg
2ebffb9912 allow gen7 moves and abilities for debug 2018-09-29 13:53:37 +02:00
DizzyEggg
b8440f4a03
Merge pull request #17 from LOuroboros/patch-9 
Update move_names.h
 2018-09-29 13:49:58 +02:00
DizzyEggg
38fe5011ad
Merge pull request #18 from LOuroboros/patch-10 
Update move_descriptions.h
 2018-09-29 13:49:50 +02:00
DizzyEggg
cbaae44f9f Add pop-up to battlescripts 2018-09-29 13:36:33 +02:00
DizzyEggg
731ff38067 Ability pop-up functionality is done 2018-09-29 12:47:35 +02:00
Diegoisawesome
25033ef311 Finish tileset_anims macroization 2018-09-23 14:58:36 -05:00
DizzyEggg
3f2beff554 Defog 2018-09-23 19:03:53 +02:00
DizzyEggg
6b7a171dbe Ability pop-up fail, maybe will do something about it later 2018-09-23 14:24:06 +02:00
LOuroboros
aa7fab8b66
Update move_descriptions.h 
-Added 4 move descriptions that were missing (Darkest Lariat, Ice Hammer, Anchor Shot and Power Trip).
-Added the table with the pointers for the Gen. 7 moves descriptions.
 2018-09-23 01:41:12 -03:00
LOuroboros
80523b4257
Update move_names.h 
Gen. 7 moves' names
 2018-09-23 01:01:57 -03:00
Diegoisawesome
584cad6c0b
Merge pull request #339 from Kermalis/master 
Rename voicegroups
 2018-09-22 15:48:29 -05:00
Kermalis
e93f1182e6 Rename voicegroups 2018-09-22 16:42:34 -04:00
Diegoisawesome
58a5e4a261 Merge branch 'master' of github.com:pret/pokeemerald 2018-09-22 15:39:34 -05:00
Diegoisawesome
9e840dc5fe Merge remote-tracking branch 'Tetra/master' 2018-09-22 15:23:47 -05:00
Diegoisawesome
d50554bb8e Use macros and defines in tileset_anims 2018-09-22 15:02:49 -05:00
DizzyEggg
37d8859404 random move to called move 2018-09-22 19:27:56 +02:00
DizzyEggg
60e8c80c4c Merge branch 'master' into battle_engine_v2 2018-09-22 19:14:56 +02:00
DizzyEggg
611360c29e calledattack to calledmove 2018-09-22 19:08:41 +02:00
DizzyEggg
e362c06aea gRandomMove to gCalledMove 2018-09-22 18:41:00 +02:00
DizzyEggg
19e1606595 Add Copycat 2018-09-22 18:37:03 +02:00
DizzyEggg
fafcedc722 Clean gen7 moves data merge 2018-09-22 17:35:30 +02:00
DizzyEggg
ef4b74d934
Merge pull request #16 from LOuroboros/patch-8 
Update battle_moves.h
 2018-09-22 17:32:57 +02:00
DizzyEggg
cbaf2d6b86
Merge pull request #15 from LOuroboros/patch-7 
Update move_descriptions.h
 2018-09-22 17:28:53 +02:00
DizzyEggg
db44a7e25a Techno Blast and Autotomize 2018-09-22 17:27:51 +02:00
LOuroboros
3c6b405dd8
Update battle_moves.h 
Gen. 7 moves data.
 2018-09-22 12:24:47 -03:00
DizzyEggg
9474254e4d Final Gambit, Dragon Tail 2018-09-22 16:15:00 +02:00
Tetrable
1f767e4c49 Document and make tileset_anims.c easier to use 2018-09-22 13:27:43 +01:00
DizzyEggg
fd15e23419 Placeholder entries for gen7 moves 2018-09-22 14:04:15 +02:00
DizzyEggg
bf11c35eaf Add gen7 learsnets for pokemon 2018-09-22 13:52:38 +02:00
Tetrable
4d9c513e3e Document and improve tileset_anims.c further 2018-09-22 12:50:24 +01:00
LOuroboros
fff4336a63
Update move_descriptions.h 
Fixed Magma Storm's description. Sorry, I didn't know that it was working like in Gen. 5+
 2018-09-22 08:03:39 -03:00
DizzyEggg
c5831d5f3e
Merge pull request #14 from LOuroboros/patch-6 
Update move_descriptions.h
 2018-09-22 12:24:59 +02:00
DizzyEggg
ca9876b0b4 Updated Wrap Mechanics, Infestation, stat changing move effects 2018-09-22 12:20:33 +02:00
DizzyEggg
f455f663f4 Shell Smash move effect 2018-09-22 11:13:17 +02:00
DizzyEggg
1284bb94f1 Last Resort, Fangs and Flare Blitz/Volt Tackle 2018-09-22 10:45:43 +02:00
DizzyEggg
23a06c0836 Close combat effect 2018-09-22 01:12:27 +02:00
DizzyEggg
7b60a654b2 Growth gen6 effect 2018-09-22 01:01:13 +02:00
DizzyEggg
a69af8f2f5 Merge with master 2018-09-22 00:22:13 +02:00
DizzyEggg
66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +02:00
DizzyEggg
bf64333299 Give labels to healthbox gfx 2018-09-20 21:42:38 +02:00
DizzyEggg
d05875dd04 New mega trigger sprite 2018-09-20 20:59:00 +02:00
DizzyEggg
0755240fbc link battles mega evo fix hopefully????? 2018-09-20 17:59:17 +02:00
DizzyEggg
2bae70a66b Convert mega related struct fields to a seperate struct 2018-09-20 17:33:27 +02:00
DizzyEggg
13e434f874 Fix trainer name getter function 2018-09-20 17:22:16 +02:00
DizzyEggg
c7ca7b6e8e Fix mega evolution allowing to evolve two mons in doubles 2018-09-20 12:55:12 +02:00
DizzyEggg
a181900141 Merge branch 'master' into battle_engine_v2 2018-09-20 11:58:23 +02:00
DizzyEggg
e4b7ba0977 Document some not labeled battle things 2018-09-20 11:55:35 +02:00
DizzyEggg
602c1322e4 almost full support for link battles mega evolution 2018-09-20 11:23:12 +02:00
DizzyEggg
facd838112 Add debug controller to all controllers 2018-09-18 21:51:10 +02:00
Diegoisawesome
8a05bf82ec Merge branch 'master' of github.com:pret/pokeemerald 2018-09-18 10:03:57 -05:00
Diegoisawesome
899ae7a59a Add defines for tile, metatile, and palette count 2018-09-18 10:03:24 -05:00
LOuroboros
49cf3eb396
Update move_descriptions.h 
Descriptions for Roar of Time and Magma Storm. I think that I did things correctly, but please check before merging, just in case.
 2018-09-18 00:26:22 -03:00
DizzyEggg
add1f4910c Add mega trigger png 2018-09-17 22:40:49 +02:00
DizzyEggg
abebf479a6 Tweak mega evo to hopefully be compatibile with recorded battles. 2018-09-17 20:37:33 +02:00
DizzyEggg
1018b8f2a8
Merge pull request #13 from Tetrable/battle_engine_v2 
Add periods to the end of ability descriptions.
 2018-09-17 20:03:32 +02:00
Diegoisawesome
7f2d52d9e0
Merge pull request #332 from DizzyEggg/patch-5 
Use defines for BattleAI_ChooseMoveOrAction
 2018-09-17 10:11:25 -05:00
Diegoisawesome
6978a896d1
Merge pull request #331 from DizzyEggg/patch-3 
Use pokeruby's formatting for move descriptions
 2018-09-17 10:11:12 -05:00
DizzyEggg
2042788fdc Mega Evolution done except sprites. 2018-09-16 21:08:49 +02:00
DizzyEggg
55f21c1776 Mega Evolution support is mostly done. 2018-09-16 18:55:32 +02:00
Tetrable
9397618d9d Missed a description 2018-09-16 16:40:02 +01:00
Tetrable
8d4d5b501c Add periods to the end of ability descriptions. 2018-09-16 16:36:47 +01:00
DizzyEggg
5164215c91
Use defines for BattleAI_ChooseMoveOrAction 2018-09-16 17:06:35 +02:00
DizzyEggg
33b6ec8c0a Add move descriptions for moves 2018-09-16 15:59:17 +02:00
DizzyEggg
94bbfa7fa0
Use pokeruby's formatting for move descriptions 2018-09-16 15:58:13 +02:00
DizzyEggg
cd0934a399 Add Fairy Type icon 2018-09-16 10:45:22 +02:00
DizzyEggg
c3a5001945 Add Ability Descriptions: credits to BluRose :3 2018-09-16 10:18:35 +02:00
DizzyEggg
de65ddf4b6
Make it easier to edit ability text 2018-09-16 10:17:10 +02:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
Diegoisawesome
6a8f27c1ac
Merge pull request #326 from DizzyEggg/cablecarutil 
Decompile cable_car_util.c
 2018-09-16 01:06:33 -05:00
DizzyEggg
4d2637883a Slot machine is decompiled. 2018-09-15 23:19:37 +02:00
DizzyEggg
db248dada2 slot machine is decompiled 2018-09-15 22:59:45 +02:00
DizzyEggg
0547e260a4 More of slot machine 2018-09-15 18:01:20 +02:00
DizzyEggg
ff13cb6352 decompile cable car util which has nothing to do with actual cable car 2018-09-15 13:50:23 +02:00
DizzyEggg
2a7811456a Add anim tag sprite defines 2018-09-15 00:30:20 +02:00
Diegoisawesome
b8c9d9a980
Merge pull request #324 from Diegoisawesome/master 
Document main_menu
 2018-09-14 12:17:11 -05:00
Diegoisawesome
b860d583e4 Document main_menu 2018-09-14 12:15:46 -05:00
DizzyEggg
a08d9dd451 Merge branch 'master' into anims 2018-09-12 22:59:04 +02:00
DizzyEggg
8a81bd1bce Sync battle anim labels with pokeruby 2018-09-12 22:58:03 +02:00
Diegoisawesome
095cbbc5c2
Merge pull request #321 from Slawter666/data 
Move more data to C
 2018-09-11 22:10:26 -05:00
Slawter666
f40fa37398 Move battle_bg data to C 2018-09-11 23:37:47 +01:00
Marcus Huderle
ba125b23fd Remove transparency from event object spritesheets 2018-09-11 17:18:10 -05:00
Slawter666
991151f461 Move item_use data to C 2018-09-11 03:04:19 +01:00
Slawter666
3c16d8c598 Move braille_puzzles data to C 2018-09-11 02:17:21 +01:00
Slawter666
b6ee8823f0 Move field_special_scene data to C 2018-09-11 02:04:03 +01:00
Slawter666
bcea321494 Finish converting data2b data 2018-09-11 01:35:47 +01:00
DizzyEggg
10b479a3ca Document battle animation scripts. 2018-09-10 21:19:19 +02:00
Diegoisawesome
d9941cd1a8 Standardize sprite visibility to boolean 2018-09-10 10:25:58 -05:00
Diegoisawesome
cb053b3a15
Merge pull request #312 from DizzyEggg/decompile_frontier_2 
Decompile Battle Factory
 2018-09-10 10:20:41 -05:00
DizzyEggg
d20189234e Shyly begin move animations 2018-09-10 17:11:16 +02:00
DizzyEggg
ae24f7de41
Merge pull request #11 from LOuroboros/patch-5 
Update pokemon_summary_screen.c
 2018-09-10 14:51:42 +02:00
DizzyEggg
c6c8b7b0fd Merge branch 'master' into battle_engine_v2 2018-09-10 14:49:24 +02:00
DizzyEggg
74cc2cf512 battle factory review changes 2018-09-10 10:18:30 +02:00
DizzyEggg
b87856b58e Battle Factory is decompiled and documented. 2018-09-10 01:01:39 +02:00
Tetrable
044ef98309 Document trainer animations, correct unused table labelling 2018-09-09 22:35:07 +01:00
DizzyEggg
cf8898071d Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into decompile_frontier_2 2018-09-09 20:31:56 +02:00
DizzyEggg
4d1df7ecbe comm 2018-09-09 20:31:51 +02:00
Slawter666
135e98a824 Move battle factory data to C 2018-09-09 16:06:35 +01:00
Slawter666
1ba17e1666 Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data 2018-09-09 15:51:13 +01:00
DizzyEggg
6454740587 More battle factory 2018-09-09 13:12:26 +02:00
DizzyEggg
2f59df03ab Standartize AddTextPrinterParametrized functions, 2018-09-08 23:38:30 +02:00
DizzyEggg
1616c254d2 Swap_InitAllSprites done 2018-09-08 22:33:07 +02:00
LOuroboros
c74d38c7b8
Update pokemon_summary_screen.c 
Added Fairy Type related code.
 2018-09-08 05:31:26 -03:00
Diegoisawesome
e1834c9d7b Change overworld_frame macro to use tiles 2018-09-08 03:07:44 -05:00
Diegoisawesome
eb8b0ff0f7 Merge branch 'master' of github.com:pret/pokeemerald 2018-09-08 02:43:19 -05:00
Diegoisawesome
12521fb1a8 Merge branch 'Slawter666-spritesheet' 2018-09-08 02:37:33 -05:00
Diegoisawesome
2b07588c02 Merge branch 'master' of github.com:Diegoisawesome/pokeemerald 2018-09-08 02:36:59 -05:00
Diegoisawesome
f73807ea60 Add palette tags for event objects 2018-09-07 23:52:11 -05:00
Diegoisawesome
d945a8bf2f Macroize main_menu and general cleanup 2018-09-07 19:24:33 -05:00
Slawter666
291ac2cee9 Add build rules for overworld sprite sheets 2018-09-08 00:28:32 +01:00
Diegoisawesome
cf8f73bde1
Merge pull request #314 from Slawter666/data 
Convert data to C
 2018-09-07 11:39:07 -05:00
Slawter666
54d5a7ad97 Format event object pic tables 2018-09-07 14:14:52 +01:00
Slawter666
9dec2bdef8 Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet 2018-09-07 11:50:23 +01:00
DizzyEggg
1283b87505 up to sub_819d064 2018-09-06 23:02:16 +02:00
Marcus Huderle
fa9d1759bd checkpoint 2018-09-06 11:37:45 -05:00
Slawter666
9ad7dc9fd7 Move remaining field_player_avatar data across 2018-09-06 12:02:37 +01:00
Slawter666
26c91f1502 Move field_player_avatar data to C 2018-09-06 03:11:33 +01:00
Diegoisawesome
f8f7a8e300
Merge pull request #304 from Slawter666/graphics 
Move data from graphics.s to C
 2018-09-05 20:32:23 -05:00
Slawter666
9350ac0a74 Move battle_pyramid_bag data to C 2018-09-06 01:24:11 +01:00
Slawter666
07c2882390 Move starter_choose data to C 2018-09-06 00:47:29 +01:00
Slawter666
0cd250a83e
Deleted accidently uploaded file 2018-09-06 00:00:29 +01:00
Slawter666
5656ceab6c Move graphics to src/data/graphics 2018-09-05 23:53:54 +01:00
Diegoisawesome
8defc345f0
Merge pull request #313 from ultima-soul/overworld_and_mapping 
Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be de…
 2018-09-05 16:50:25 -05:00
DizzyEggg
75384546b5 More factory decomp and documentation. 2018-09-05 23:30:15 +02:00
ultima-soul
857ac33adb Fixed a typo. 2018-09-05 17:25:44 +00:00
Diegoisawesome
41fe72b95d
Merge pull request #310 from DizzyEggg/patch-1 
Update item_menu.c
 2018-09-05 01:36:40 -05:00
ultima-soul
f505ba1bc7 Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be dependent on Map Section ID enum rather than order dependent. 2018-09-05 01:13:17 +00:00
Slawter666
4c54212b1f Bring labels for overworld.c over from pokeruby 2018-09-04 23:31:37 +01:00
DizzyEggg
24b9cd721f More Battle Factory 2018-09-03 22:55:55 +02:00
Slawter666
5c66b8a7ef Label event_object_movement.c 2018-09-02 23:20:45 +01:00
DizzyEggg
0238b1c8ec More battle factory work 2018-09-02 19:41:33 +02:00
Slawter666
f74adc80c1 Format more templates 2018-09-02 17:53:52 +01:00
DizzyEggg
10eb952db5 Start battle factory 2018-09-02 18:10:36 +02:00
Slawter666
6106154801 Format WindowTemplate in battle_pyramid_bag.c 2018-09-02 16:26:23 +01:00
Slawter666
c1b3dfa15a Format templates in wallclock.c 2018-09-02 16:10:06 +01:00
Slawter666
c9db9b7a59 Format WindowTemplate in berry_blender.c 2018-09-02 15:14:23 +01:00
Slawter666
3119aae4b2 Format WindowTemplate in berry_tag_screen.c 2018-09-02 15:02:39 +01:00
DizzyEggg
15b91a3c89 AI handling for new moves 2018-09-02 15:50:18 +02:00
Slawter666
f45c9e75db Format templates in item_menu.c 2018-09-02 14:49:29 +01:00
Slawter666
ef4695a72c Minor labelling 2018-09-02 13:47:12 +01:00
DizzyEggg
23aab35b96
Update item_menu.c 
Don't use signed values for unsigned variables
 2018-09-02 00:28:03 +02:00
Marcus Huderle
8ecf3b2159 Start decompiling shop.c 2018-09-01 17:15:35 -05:00
DizzyEggg
f9af3bec9b merge with master 2018-09-02 00:07:19 +02:00
DizzyEggg
528a1e9ed0 Match CopySpriteTiles 2018-09-01 22:53:29 +02:00
DizzyEggg
e28ce3be78 Fix the strings length issue 2018-09-01 22:03:21 +02:00
DizzyEggg
5c7ca813e7 Add AI flags to trainers data 2018-09-01 21:25:19 +02:00
DizzyEggg
44ba432dad Label various battle scripts 2018-09-01 20:00:13 +02:00
DizzyEggg
38c89b9d0f Bank to battler 2018-09-01 18:36:08 +02:00
DizzyEggg
ce949ba705 document move type variables in pss 2018-09-01 18:31:53 +02:00
DizzyEggg
7ba59334d0 Revert testing trainer 2018-09-01 17:40:49 +02:00
DizzyEggg
f3e5c488a3 DONT SPAM HELPING HAND IN DOUBLES 2018-09-01 17:36:09 +02:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
96f2b995dc Pyramid bag review changes 2018-08-30 21:28:03 +02:00
DizzyEggg
43b74032fa Make pyramid bag compile. 2018-08-30 20:25:57 +02:00
DizzyEggg
917b32ffbe Finish decompiling pyramid bag. 2018-08-30 20:10:57 +02:00
DizzyEggg
bc9fe72c6e Do some pyramid bag 2018-08-30 15:01:07 +02:00
Diegoisawesome
8e5c72766c
Merge pull request #300 from DizzyEggg/decompile_battle_frontier_1 
Decompile battle_dome
 2018-08-29 14:13:39 -05:00
DizzyEggg
3dea8fa265 battle tent review changes 2018-08-29 20:38:54 +02:00
Slawter666
e30c2251ce Convert more of data2b 2018-08-27 00:26:54 +01:00
DizzyEggg
d65ebcd3dd Label a dome functiion 2018-08-26 21:41:47 +02:00
DizzyEggg
ddd4733de3 rename battle pyramid to battle pyramid bag 2018-08-26 17:54:58 +02:00
Slawter666
ca07412686 Format SpriteTemplate 2018-08-26 15:45:08 +01:00
DizzyEggg
a8a2444f93 make battle dome compikle 2018-08-26 15:58:44 +02:00
DizzyEggg
df3af2d9e1 Clean up battle dome code a bit 2018-08-26 15:51:14 +02:00
DizzyEggg
71de20a159
Merge pull request #9 from Slawter666/frontier-data 
Convert battle dome data to C
 2018-08-26 15:28:09 +02:00
DizzyEggg
78cad0dee5 try battle tent and fail 2018-08-26 15:27:06 +02:00
Slawter666
69c20f18ac Convert battle dome data to C 2018-08-26 13:40:36 +01:00
DizzyEggg
2b7c138cbe Some labels 2018-08-25 21:04:12 +02:00
DizzyEggg
0d8c5b613e make battle dome compile 2018-08-25 20:14:10 +02:00
DizzyEggg
447e65860c Merge branch 'master' into decompile_battle_frontier_1 2018-08-25 20:02:09 +02:00
DizzyEggg
edcf04b665 Document battle dome. 2018-08-25 19:59:47 +02:00
DizzyEggg
62a645abaf Up To CopyDomeTrainerName 2018-08-25 18:46:15 +02:00
DizzyEggg
91349324c6 up to CB2_BattleDome 2018-08-25 11:55:16 +02:00
Slawter666
709b63efa9 Split files 2018-08-24 21:21:19 +01:00
Slawter666
6b145ed77c Move data from graphics.s to C 2018-08-24 04:21:07 +01:00
Diegoisawesome
96d744706d Merge branch 'master' of https://github.com/pret/pokeemerald 2018-08-23 02:42:45 -05:00
Diegoisawesome
26ef40553c Move data from include to src 2018-08-23 02:32:34 -05:00
Slawter666
ed24233274 Convert more of data2b.s to C 2018-08-22 23:03:44 +01:00
Slawter666
4db5ef3ae6 Convert more data 2018-08-22 21:41:34 +01:00
Slawter666
ef6a3c2278 Move some data from data2b.s to C 2018-08-22 14:34:36 +01:00
DizzyEggg
dea1de3fed More battle dome 2018-08-21 23:36:59 +02:00
DizzyEggg
a12b69eae1 DisplayMatchInfoOnCard decompiled 2018-08-20 22:56:05 +02:00
DizzyEggg
5da12f2b21 battle dome - more work 2018-08-19 22:26:07 +02:00
DizzyEggg
4a0f7398ec Cant believe Ive matched this 2018-08-19 20:21:37 +02:00
DizzyEggg
239c56496b This is impossible 2018-08-19 17:13:05 +02:00
DizzyEggg
fb19a8fc59 battle dome cards sensibly renamed 2018-08-19 01:06:10 +02:00
DizzyEggg
e4649245ba this file is too much 2018-08-18 19:52:25 +02:00
DizzyEggg
f7fd5ce75c Match one of the hardest battle dome functions 2018-08-18 18:23:40 +02:00
DizzyEggg
63cbc8f3cc battle dome - a couple more functions 2018-08-18 00:54:18 +02:00
DizzyEggg
5dd1afd383 contest effect review changes 2018-08-16 22:55:36 +02:00
DizzyEggg
0bfe894566 Merge with master 2018-08-16 22:53:01 +02:00
DizzyEggg
7669a94f0d this function is driving me insane 2018-08-16 22:46:02 +02:00
Diegoisawesome
2b81db7ace Fix Task_Truck1 2018-08-15 19:49:17 -07:00
Diegoisawesome
13dc7a4170 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-15 16:22:54 -07:00
Diegoisawesome
f65da613cf
Merge pull request #299 from DizzyEggg/contest_ai 
Decompile Contest ai
 2018-08-15 16:19:18 -07:00
Diegoisawesome
e7da514382 Finish documenting and cleaning up summary_screen 
Also fix remaining nonmatchings
 2018-08-15 15:58:41 -07:00
DizzyEggg
e2f5e73445 More battle dome 2018-08-15 23:04:46 +02:00
Tetrable
8896b54e8f Add national/hoenn dex defines, update dex arrays 2018-08-15 20:10:28 +01:00
Diegoisawesome
ac3f4fd994 Continue documentation and cleanup of pokemon_summary_screen 2018-08-15 11:51:47 -07:00
DizzyEggg
a54fa23b5f Begin battle frontier 1 2018-08-15 15:49:50 +02:00
DizzyEggg
dc6cf391ce Make contest ai compile. 2018-08-15 12:06:23 +02:00
DizzyEggg
92c4fc6345 Contest AI clean-up 2018-08-15 11:50:18 +02:00
DizzyEggg
c806992cfc Port contest ai from pokeruby 2018-08-15 11:43:57 +02:00
Diegoisawesome
0bc975bf57 Document and cleanup pokemon_summary_screen 2018-08-15 01:44:20 -07:00
Diegoisawesome
332a8bcb1d Extract rodata for unk_pokedex_area_screen_helper 2018-08-14 22:37:59 -07:00
Diegoisawesome
a07d69d7c2 Finish pokemon_summary_screen 2018-08-14 22:00:35 -07:00
DizzyEggg
ba225f8eaa Fix fakematching in contest effect 2018-08-15 00:25:19 +02:00
DizzyEggg
0b22ad4ab5 make contest effect build 2018-08-15 00:01:43 +02:00
DizzyEggg
0c7063c5ba Make contest effect table easier to edit in the future 2018-08-14 23:50:58 +02:00
DizzyEggg
c72b55a5c4 Match the worst function ever 2018-08-14 22:28:25 +02:00
DizzyEggg
1a0e6f7aed match contest effect 2018-08-13 21:24:11 +02:00
Diegoisawesome
6dac87abfd Cleanup and document learn_move 2018-08-12 14:28:15 -07:00
DizzyEggg
0d68af7f06 copy contest effect from ruby 2018-08-12 23:20:17 +02:00
DizzyEggg
396d598ddc
Merge pull request #8 from LOuroboros/patch-4 
Update battle_message.c
 2018-08-12 22:38:12 +02:00
DizzyEggg
cc145a45f7 merge with master 2018-08-12 22:37:28 +02:00
Diegoisawesome
b40957c09b Finish decompiling learn_move 2018-08-12 13:33:41 -07:00
Diegoisawesome
bd2b7beb07 Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 13:17:51 -07:00
Diegoisawesome
335f4c1e81
Merge pull request #296 from DizzyEggg/event_data 
Event data
 2018-08-12 13:17:36 -07:00
DizzyEggg
f1daf7442d event data review changes 2018-08-12 22:04:49 +02:00
Diegoisawesome
9a73a47ddd Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 12:55:21 -07:00
DizzyEggg
577e6e7c1f Merge branch 'patch-2' of https://github.com/DizzyEggg/pokeemerald into event_data 2018-08-12 21:55:20 +02:00
Diegoisawesome
2dd5fc23d4 Prepare learn_move for merge 2018-08-12 12:54:07 -07:00
Diegoisawesome
25832810f6
Merge pull request #288 from DizzyEggg/slot_machine 
Port a little bit of slot machine
 2018-08-12 12:27:23 -07:00
Diegoisawesome
32b0e102cf
Merge pull request #287 from DizzyEggg/easy_chat 
Pikalax's Easy chat
 2018-08-12 12:17:23 -07:00
Diegoisawesome
6bb761a711
Merge pull request #277 from atasro2/player_field_avatar 
decompile a portion of field_player_avatar.s
 2018-08-12 12:09:09 -07:00
Diegoisawesome
26e18f2292
Merge pull request #289 from DizzyEggg/contests 
Pikalax's contests
 2018-08-12 12:04:53 -07:00
MCboy
1bc93c5a66
Merge branch 'master' into player_field_avatar 2018-08-12 23:26:00 +04:30
MCboy
2ddabca996
apply some changes 2018-08-12 22:31:58 +04:30
DizzyEggg
7dac22314e Decompile a bit of pokemon storarage system 2018-08-12 16:40:31 +02:00
DizzyEggg
957dcd01b3 merge with master 2018-08-12 12:11:35 +02:00
DizzyEggg
e787d5b602 Contest review changes 2018-08-12 12:08:51 +02:00
DizzyEggg
1229bead2e slot machine review changes 2018-08-12 11:50:26 +02:00
DizzyEggg
3a72e6a80d Easy chat review changes 2018-08-12 11:39:09 +02:00
Diegoisawesome
a000eb4f36 Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move 2018-08-11 19:03:38 -07:00
Diegoisawesome
18d5186630 Merge remote-tracking branch 'garakmon/heal-loc-2' 2018-08-11 16:57:46 -07:00
Diegoisawesome
cf9518f237 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-11 16:32:03 -07:00
Diegoisawesome
94eef0bfa5
Merge pull request #294 from DizzyEggg/learnsets 
Make learnsets easier to edit
 2018-08-11 16:27:52 -07:00
Diegoisawesome
0c29447717
Merge pull request #292 from DizzyEggg/move_desc 
Move move descriptions to C
 2018-08-11 16:26:16 -07:00
DizzyEggg
7b9a7765e0 Make learnsets easier to edit 2018-08-12 00:42:25 +02:00
Diegoisawesome
57b3393192 Fix compile error 2018-08-11 15:42:08 -07:00
Diegoisawesome
cb9127ccaf Revert "Rename some specials" 
This reverts commit 658f9351fe.
 2018-08-11 15:16:41 -07:00
DizzyEggg
df5009cb3e Move move descriptions to C 2018-08-12 00:03:19 +02:00
Diegoisawesome
658f9351fe Rename some specials 2018-08-11 14:59:43 -07:00
Diegoisawesome
b54793be91 Finish decompiling field_specials 2018-08-11 14:51:54 -07:00
DizzyEggg
7f167ca9f4
Update battle_script_commands.c 2018-08-11 23:00:16 +02:00
DizzyEggg
feee4751eb
Make event data look cleaner 2018-08-11 22:54:34 +02:00
DizzyEggg
537ebd36ac Merge contests with master 2018-08-11 19:04:28 +02:00
LOuroboros
5bb3af11bd
Update battle_message.c 
Added strings for Sticky Web, Quash, Ion Deluge, Topsy-Turby, Misty Terrain, Grassy Terrain, Electric Terrain, Psychic Terrain, Electrify, Assault Vest, Gravity and Heal Block.
 2018-08-11 13:53:10 -03:00
DizzyEggg
0e0d103044 port more of slot machine 2018-08-11 18:47:56 +02:00
DizzyEggg
7961aa44ba start porting slot machine 2018-08-11 17:57:20 +02:00
garak
2fc3b7f171 change sUnknown_085A1E3C to sMapHealLocations 2018-08-11 10:28:13 -04:00
DizzyEggg
59d8d56868 merge easy chat with master 2018-08-11 14:14:51 +02:00
DizzyEggg
4cb1e880da Reflect Type and SOAK 2018-08-11 13:30:34 +02:00
DizzyEggg
674d35861c Couple bug fixes 2018-08-11 12:16:00 +02:00
DizzyEggg
f126585e71 Merge with master 2018-08-11 11:05:57 +02:00
Diegoisawesome
1e0f3ec433 Continue decompiling field_specials 2018-08-10 14:07:23 -07:00
garak
c3512e3b39 port larger heal location changes from poke ruby pr 2018-08-10 10:45:15 -04:00
Diegoisawesome
12ff59f9c1 Continue decompiling field_specials 2018-08-10 00:42:06 -07:00
Slawter666
bc42c5054c Merge remaining overworld frames 2018-08-10 00:20:19 +01:00
Slawter666
877a80d3bc Merge berry tree frames 2018-08-09 23:19:45 +01:00
Diegoisawesome
bad170b0cb Continue decompiling field_specials 2018-08-08 23:53:21 -07:00
Slawter666
dea0bba64e Merge "pokemon" frames 2018-08-09 00:55:32 +01:00
Diegoisawesome
90896e38c9 Begin porting/decompiling field_specials 2018-08-08 01:37:12 -07:00
garak
45b730e474 copy heal_location changes from pokeruby 2018-08-07 23:05:48 -04:00
Slawter666
704e3c7334 Merge https://github.com/pret/pokeemerald into spritesheet 2018-08-07 22:18:30 +01:00
Slawter666
ab2cc59629 Merge remaining "people" overworld frames 2018-08-07 22:16:03 +01:00
DizzyEggg
d230d986fa Me First. 2018-08-05 16:43:07 +02:00
DizzyEggg
de85f88bbb Support for two typed moves. 2018-08-05 13:57:37 +02:00
DizzyEggg
5fbeef860c Bulletproof and a couple of new moves 2018-08-05 13:39:22 +02:00
DizzyEggg
065032bf35 Moves changing terrains 2018-08-05 12:43:57 +02:00
Diegoisawesome
85ebd76cd0 Fix fanfare constant to use define 2018-08-04 18:41:53 -07:00
DizzyEggg
2218949d7c Topsy Turvy and Ion Deluge. 2018-08-04 23:34:29 +02:00
DizzyEggg
222ea7269d Rapid Spin blews all hazards, Quash and a couple of new move effects 2018-08-04 22:23:07 +02:00
DizzyEggg
9ff7b0e849 Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst 2018-08-04 20:36:24 +02:00
DizzyEggg
f8f46244fb Add Infatuation to debug. 2018-08-03 22:45:27 +02:00
DizzyEggg
2d73637ff4 Introduce argument and do Draining kiss 2018-08-03 19:01:03 +02:00
DizzyEggg
39f9b1ddf0 Experience on caught mon 2018-08-03 18:01:14 +02:00
DizzyEggg
eb4d9f6fed Tabs to spaces 2018-08-03 00:24:10 +02:00
DizzyEggg
320120d529 Merge with master 2018-08-03 00:20:34 +02:00
DizzyEggg
d6537c811b Battle code enums in case switches 2018-08-03 00:13:44 +02:00
DizzyEggg
92f3d89598 Gravity and Heal Block preventing after choosing a move 2018-08-02 21:27:28 +02:00
DizzyEggg
c7baa71a5e Add placeholder string for not done moves. 2018-08-02 20:32:13 +02:00
DizzyEggg
198a1a8646 Proper Sound moves and substitute 2018-08-02 20:24:18 +02:00
Diegoisawesome
759bc2671c
Merge pull request #280 from DizzyEggg/decompile_part_mon_summary 
Decompile a few pokemon summary screen functions
 2018-08-02 08:27:05 -07:00
Slawter666
5917f7d108 Merge frontier brains, team magma and team aqua frames 2018-08-02 00:34:28 +01:00
DizzyEggg
5e27cd53a9 Add Substitute handler to debug 2018-08-01 23:14:02 +02:00
DizzyEggg
4c3de6f58a Fix moves always hitting 2018-08-01 22:39:42 +02:00
DizzyEggg
a62bd511c8 Fix opponent hp bar issue 2018-08-01 22:01:37 +02:00
DizzyEggg
0f29610a61 Flying type pokemon can take ground type moves damage if grounded 2018-07-31 23:21:42 +02:00
DizzyEggg
b73075f822 Update Unusable Moves 2018-07-31 23:09:47 +02:00
DizzyEggg
991e041181 Add more AI scripts to debug menu 2018-07-31 22:21:43 +02:00
DizzyEggg
44a454ecb4 Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done 2018-07-30 20:41:16 +02:00
DizzyEggg
0663c142b7 Add split icons 2018-07-29 19:54:23 +02:00
Slawter666
52aa9cedcf Merge May frames into sprite sheets 
Plus fix Brendan's surfing and watering frame order.
 2018-07-29 17:29:36 +01:00
DizzyEggg
0a4b2ba456 Make it harder to break with battle debug 2018-07-29 17:28:56 +02:00
DizzyEggg
cc764d8b77 Debug option to show opponents hp 2018-07-29 17:19:57 +02:00
DizzyEggg
9febcd3a0a Document a bit of atk47 2018-07-29 15:51:08 +02:00
DizzyEggg
68145cd002 Document atk48 2018-07-29 15:33:16 +02:00
DizzyEggg
2f6cc2be80 Electric types immune to paralysis 2018-07-29 12:45:08 +02:00
DizzyEggg
3d93da7133 Add Imposter 2018-07-29 12:21:28 +02:00
DizzyEggg
d628d1f5fd Move Weather Ball, Hidden power, AI support for dynamic type moves and AI debug support 2018-07-29 11:32:40 +02:00
DizzyEggg
4080c6f831 Decompile a few pokemon summary screen functions 2018-07-28 23:26:19 +02:00
Slawter666
d5825230e5 Merge "brendan" frames into sprite sheets 2018-07-28 18:11:28 +01:00
DizzyEggg
ec9693c797 ate abilities 2018-07-28 18:41:57 +02:00
DizzyEggg
3a0c244f40 Add Harvest 2018-07-28 17:13:47 +02:00
DizzyEggg
b3e6dc8457 Add Gluttony 2018-07-28 16:33:01 +02:00
DizzyEggg
ef3c39fbae Fix Counter and Mirror Coat 2018-07-28 10:58:47 +02:00
DizzyEggg
43fc4b6933 Add Magic Bounce 2018-07-28 10:41:20 +02:00
DizzyEggg
a452661cb9 Prankster and Gale Wings 2018-07-28 00:25:02 +02:00
DizzyEggg
0148cc8b0c merge with master, gen6 move names 2018-07-28 00:01:34 +02:00
DizzyEggg
9088c0bdb5 Introduce battle config; Snow Warning Done. 2018-07-27 23:40:10 +02:00
DizzyEggg
0c6d30e3da
Merge pull request #6 from LOuroboros/patch-3 
Update battle_message.c
 2018-07-27 22:26:45 +02:00
DizzyEggg
2537ed6eb1 Fix Lunar Dance pp issue 2018-07-27 22:24:07 +02:00
LOuroboros
232a1849eb
Update battle_message.c 
Fixed the text string of "sText_AngryPointActivates".
 2018-07-27 16:46:49 -03:00
LOuroboros
8f4f851780
Update battle_message.c 
Fixed sText_PoisonSpikesScattered and added a string for sText_ToxicSpikesAbsorbed, sText_ToxicSpikesPoisoned and sText_StickyWebSwitchIn.
 2018-07-27 06:55:55 -03:00
DizzyEggg
f51812d0fe Add Fell Stinger 2018-07-26 23:40:55 +02:00
DizzyEggg
d991d669da Add Moxie 2018-07-26 22:52:13 +02:00
DizzyEggg
16d38f5343 Add a couple of gen5 abilities 2018-07-26 21:56:23 +02:00
DizzyEggg
1c95c36338 Healing Wish and Lunar Dance 2018-07-26 20:36:16 +02:00
MCboy
6c365fdc94
Update field_player_avatar.c 2018-07-25 17:47:04 +04:30
MCboy
3a15012085
Update field_player_avatar.c 2018-07-25 17:28:25 +04:30
MCboy
94a5f8d529
made file better ? 2018-07-25 17:18:49 +04:30
Diegoisawesome
7270e73fee Move strings to C 2018-07-25 01:15:36 -07:00
Diegoisawesome
e92e2cb0aa Merge branch 'master' of github.com:pret/pokeemerald 2018-07-24 21:18:36 -07:00
Diegoisawesome
156fb472e1 Clean up files and add entries to charmap 2018-07-24 21:18:23 -07:00
Diegoisawesome
5883f867f0
Merge pull request #278 from vblm12/trainer_data 
Move some trainer data into c structs
 2018-07-24 18:58:56 -07:00
DizzyEggg
100ce73a12 Sticky Web done 2018-07-24 22:09:55 +02:00
DizzyEggg
f8b1f0a45c Stealth Rock and Toxic Spikes 2018-07-24 21:47:00 +02:00
DizzyEggg
45bc76d94c Side Status from u16 to u32 2018-07-24 20:13:02 +02:00
MCboy
82d88479ce
decompiled a bunch of functions 
i also made TryInterruptEventObjectSpecialAnim functionally equivalent tho its still nonmatching so i need help with that
 2018-07-24 16:59:52 +04:30
LOuroboros
74cac75a38
Update battle_message.c 
Assigned the abilities' In-Battle strings from Line 593 to Line 618.
 2018-07-23 17:32:34 -03:00
DizzyEggg
567a0240f3 Fix crits and do Worry Seed 2018-07-23 22:18:56 +02:00
DizzyEggg
6570324432 New crit calculator. 2018-07-23 21:36:05 +02:00
DizzyEggg
194adf0ab2 Abilities affected by weather conditions 2018-07-22 22:41:13 +02:00
DizzyEggg
831816e9b2 Switch-in abilities with a message 2018-07-22 22:21:47 +02:00
DizzyEggg
6a7d58003b Add Bad Dreams 2018-07-22 21:05:12 +02:00
DizzyEggg
fdd8765256 Add Storm Drain redirection 2018-07-22 19:34:13 +02:00
DizzyEggg
c2f8d176dc Trick Room, Stall, Lagging Tail 2018-07-22 19:02:41 +02:00
DizzyEggg
fee81d03ab A couple of gen4 abilities 2018-07-22 18:40:18 +02:00
DizzyEggg
51dc76c7e8 Captivate and new accuracy calc 2018-07-22 15:08:32 +02:00
DizzyEggg
1e9143e0b2 merge union room with master 2018-07-22 13:14:58 +02:00
DizzyEggg
c9d486a5d3 make union room compile i guess 2018-07-22 12:49:49 +02:00
DizzyEggg
4ec43cbed1 Gen 5 move names, telekinesis, power/guard split/swap 2018-07-21 23:12:10 +02:00
DizzyEggg
fcca2afc81 More gen4 move effects battlescrips. 2018-07-21 21:58:07 +02:00
DizzyEggg
b203cf4ca4 Add a couple of gen4 moves battlescripts 2018-07-21 16:34:43 +02:00
DizzyEggg
9d4d8c5dac Add new Sturdy effect 2018-07-21 15:11:13 +02:00
DizzyEggg
12bd67f0f9 Add PP modyfing to debug 2018-07-21 13:38:51 +02:00
DizzyEggg
6cffd5b045 Add new field end turn effects 2018-07-21 13:24:20 +02:00
DizzyEggg
66a3c13f49 Add new Side turn effects 2018-07-21 12:56:07 +02:00
DizzyEggg
17ef60099e Merge branch 'battle_engine_v2' of git://github.com/Tetrable/pokeemerald into Tetrable-battle_engine_v2 2018-07-21 12:13:56 +02:00
DizzyEggg
382f640809 Start Side/Field end turn 2018-07-21 12:10:08 +02:00
vblm12
29276cc76c Move some trainer data from data2b.s to c structs. 2018-07-20 22:14:31 -05:00
MCboy
201fb6f818
ported code over from pokeruby 2018-07-21 03:06:40 +04:30
Tetrable
e411bad2f3
added more battle strings 2018-07-20 15:39:40 +01:00
MCboy
43fa9da52a
decompile more code 
1 non matching need help
 2018-07-20 03:44:20 +04:30
DizzyEggg
1468107002 Add Roost endturn effect 2018-07-19 21:18:20 +02:00
MCboy
416db8e751
oops 2018-07-19 21:23:45 +04:30
MCboy
a8f9adeaf5
decompile player_field_avatar 2018-07-19 21:22:35 +04:30
MCboy
e3a82bd2c5
decompile player_field_avatar.s 2018-07-19 21:18:09 +04:30
DizzyEggg
e8f7699c2c Add five new statuses3 to debug. 2018-07-18 22:33:40 +02:00
DizzyEggg
f3be5ad22d Do new battler end turn effects. 2018-07-18 22:07:48 +02:00
DizzyEggg
81b29ae7c1 Merge with pokeemerald 2018-07-16 22:45:06 +02:00
DizzyEggg
118fa3afce IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL 2018-07-16 22:00:27 +02:00
DizzyEggg
0852cba111 Fix dynamic move power moves, get rid of gDynamicBasePower' 
'
 2018-07-16 21:42:03 +02:00
DizzyEggg
f250436db0 Working physical special split 2018-07-16 21:04:56 +02:00
DizzyEggg
bf0178238a Battle files - review changes 2018-07-16 20:47:30 +02:00
DizzyEggg
ea5ffa3375 Merge with master 2018-07-16 20:23:05 +02:00
DizzyEggg
5318cc656a Add some new battlestrings. 2018-07-15 18:53:43 +02:00
DizzyEggg
6f484c20ce Final ai damage calc touches 2018-07-15 18:07:01 +02:00
Diegoisawesome
07ef762770
Merge pull request #275 from Diegoisawesome/master 
Document list_menu.c and main_menu.c
 2018-07-15 04:43:03 -07:00
Diegoisawesome
731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
DizzyEggg
967117093d Add type modyfing option to debug 2018-07-15 12:51:45 +02:00
DizzyEggg
9c7db9f45e New AI damage and type functions 2018-07-15 12:39:07 +02:00
DizzyEggg
5a38bb61db Basic damage calc is ready. 2018-07-14 22:56:03 +02:00
DizzyEggg
c00fa14b66 Create template of new dmg calc 2018-07-14 19:29:25 +02:00
DizzyEggg
2ebf14a83d Get rid of scripting dmg multiplier 2018-07-14 18:58:45 +02:00
DizzyEggg
baf172d605 Prepare damage calc huge changes 2018-07-14 18:44:38 +02:00
DizzyEggg
939127bfff Important battle util functions 2018-07-14 16:41:14 +02:00
DizzyEggg
b24427f3bf Introduce Field Statuses 2018-07-14 13:17:10 +02:00
DizzyEggg
3a10ae9a94 Crit changes accomodated to ai scripts 2018-07-14 12:54:12 +02:00
DizzyEggg
2293d1ddbc Get rid of duplicate bs command jumpiftype 2018-07-14 12:02:29 +02:00
DizzyEggg
fe15e56f31 Add Gen4 move names and fairy type name 2018-07-14 10:57:34 +02:00
DizzyEggg
c9d1ee3c4a Move high crit to a flag and update move table 2018-07-14 10:11:38 +02:00
DizzyEggg
626b80106e Basic Battle Debug Menu is done 2018-07-13 23:00:56 +02:00
Marcus Huderle
546819bc72 Use map type constants in map headers 2018-07-12 22:39:38 -05:00
Marcus Huderle
7d375972ba Sync bg_event macros with pokeruby 2018-07-11 11:12:26 -05:00
Marcus Huderle
d675b7578c Move movement type constants into include/constants/event_object_movement_constants.h 2018-07-10 18:04:41 -05:00
Slawter666
08774bdd88 Merge https://github.com/pret/pokeemerald into pokedex-doc 2018-07-08 01:23:28 +01:00
Slawter666
dd228fae5a Minor variable labelling 2018-07-08 01:20:01 +01:00
DizzyEggg
ee3d505b58 little touches for HandleTurnActionSelectionState 2018-07-07 21:14:41 +02:00
DizzyEggg
008d961b2a add party menu defines 2018-07-07 19:57:09 +02:00
DizzyEggg
1c48e58574 small fixes 2018-07-07 14:24:19 +02:00
DizzyEggg
9892298645 Merge branch 'master' into final_battle_files_touches 2018-07-07 14:11:04 +02:00
Diegoisawesome
f79ac26ce3 Rename SetLastTalkedObjectInFrontOfPlayer to CheckObjectGraphicsInFrontOfPlayer 2018-07-05 20:33:07 -07:00
Diegoisawesome
5189442bcc Merge branch 'decompile_cut' of git://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_cut 2018-07-05 20:32:12 -07:00
DizzyEggg
e6d67c7c22 give labels to player controller functions 2018-07-01 15:45:47 +02:00
DizzyEggg
c556358e47 label multiuse sprite template functions 2018-07-01 15:28:57 +02:00
DizzyEggg
f35c0abe80 merge with battle tent update 2018-07-01 12:16:52 +02:00
DizzyEggg
d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg
2d0be91217 Move all trainer defines to trainers.h and identify frontier brain trainer id 2018-06-30 18:55:34 +02:00
DizzyEggg
bfc64c9689 C vars sym ewram 2018-06-30 15:35:54 +02:00
DizzyEggg
97712ec931 change mapDataId to mapLayoutId 2018-06-30 14:52:13 +02:00
DizzyEggg
15fe5a031b Merge branch 'master' into decompile_battle_tent 2018-06-30 14:43:41 +02:00