DizzyEggg
|
f47ed3268c
|
Finish documenting apprentice for now
|
2018-10-14 17:00:41 +02:00 |
|
DizzyEggg
|
84936b4260
|
Merge branch 'master' into apprentice
|
2018-10-14 15:07:16 +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 |
|
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 |
|
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 |
|
DizzyEggg
|
7925000a54
|
merge with master
|
2018-10-06 16:05:58 +02:00 |
|
Marcus Huderle
|
b9e38a569e
|
Merge pull request #320 from DizzyEggg/anims
Document battle animation scripts
|
2018-10-06 08:20:41 -05: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
|
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 |
|
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 |
|
DizzyEggg
|
597299136f
|
Add Pollen Puff effect
|
2018-09-29 14:10:53 +02:00 |
|
DizzyEggg
|
cbaae44f9f
|
Add pop-up to battlescripts
|
2018-09-29 13:36:33 +02:00 |
|
DizzyEggg
|
312d3a42d2
|
Fix jumpifsideaffecting glitch
|
2018-09-24 20:29:06 +02: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 |
|
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
|
db44a7e25a
|
Techno Blast and Autotomize
|
2018-09-22 17:27:51 +02:00 |
|
DizzyEggg
|
9474254e4d
|
Final Gambit, Dragon Tail
|
2018-09-22 16:15:00 +02:00 |
|
DizzyEggg
|
1284bb94f1
|
Last Resort, Fangs and Flare Blitz/Volt Tackle
|
2018-09-22 10:45:43 +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
|
55f21c1776
|
Mega Evolution support is mostly done.
|
2018-09-16 18:55:32 +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
|
b860d583e4
|
Document main_menu
|
2018-09-14 12:15:46 -05:00 |
|
DizzyEggg
|
8a81bd1bce
|
Sync battle anim labels with pokeruby
|
2018-09-12 22:58:03 +02:00 |
|
DizzyEggg
|
10b479a3ca
|
Document battle animation scripts.
|
2018-09-10 21:19:19 +02:00 |
|
DizzyEggg
|
c6c8b7b0fd
|
Merge branch 'master' into battle_engine_v2
|
2018-09-10 14:49:24 +02:00 |
|
DizzyEggg
|
b87856b58e
|
Battle Factory is decompiled and documented.
|
2018-09-10 01:01:39 +02: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
|
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 |
|
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 |
|
DizzyEggg
|
75384546b5
|
More factory decomp and documentation.
|
2018-09-05 23:30:15 +02: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 |
|
DizzyEggg
|
10eb952db5
|
Start battle factory
|
2018-09-02 18:10:36 +02:00 |
|
DizzyEggg
|
15b91a3c89
|
AI handling for new moves
|
2018-09-02 15:50:18 +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
|
38c89b9d0f
|
Bank to battler
|
2018-09-01 18:36:08 +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 |
|
Diegoisawesome
|
1895383352
|
Merge pull request #308 from DizzyEggg/pyramid_bag
Decompile pyramid bag
|
2018-08-30 14:40:22 -05: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
|
7737025f4e
|
Use gbafix to generate header and checksum
|
2018-08-29 16:34:59 -05:00 |
|
DizzyEggg
|
3dea8fa265
|
battle tent review changes
|
2018-08-29 20:38:54 +02:00 |
|
DizzyEggg
|
ddd4733de3
|
rename battle pyramid to battle pyramid bag
|
2018-08-26 17:54:58 +02:00 |
|
DizzyEggg
|
78cad0dee5
|
try battle tent and fail
|
2018-08-26 15:27:06 +02:00 |
|
DizzyEggg
|
2b7c138cbe
|
Some labels
|
2018-08-25 21:04:12 +02:00 |
|
DizzyEggg
|
447e65860c
|
Merge branch 'master' into decompile_battle_frontier_1
|
2018-08-25 20:02:09 +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 |
|
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
|
63cbc8f3cc
|
battle dome - a couple more functions
|
2018-08-18 00:54:18 +02:00 |
|
DizzyEggg
|
0bfe894566
|
Merge with master
|
2018-08-16 22:53:01 +02:00 |
|
Diegoisawesome
|
13dc7a4170
|
Merge branch 'master' of github.com:pret/pokeemerald
|
2018-08-15 16:22:54 -07:00 |
|
DizzyEggg
|
e2f5e73445
|
More battle dome
|
2018-08-15 23:04:46 +02:00 |
|
DizzyEggg
|
a54fa23b5f
|
Begin battle frontier 1
|
2018-08-15 15:49:50 +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
|
a07d69d7c2
|
Finish pokemon_summary_screen
|
2018-08-14 22:00:35 -07: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
|
cc145a45f7
|
merge with master
|
2018-08-12 22:37:28 +02:00 |
|
Diegoisawesome
|
9a73a47ddd
|
Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move
|
2018-08-12 12:55:21 -07: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 |
|
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 |
|
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
|
cb9127ccaf
|
Revert "Rename some specials"
This reverts commit 658f9351fe.
|
2018-08-11 15:16:41 -07: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
|
537ebd36ac
|
Merge contests with master
|
2018-08-11 19:04:28 +02: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 |
|
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 |
|
Diegoisawesome
|
1e0f3ec433
|
Continue decompiling field_specials
|
2018-08-10 14:07:23 -07:00 |
|
Diegoisawesome
|
12ff59f9c1
|
Continue decompiling field_specials
|
2018-08-10 00:42:06 -07:00 |
|
Diegoisawesome
|
bad170b0cb
|
Continue decompiling field_specials
|
2018-08-08 23:53:21 -07:00 |
|
Diegoisawesome
|
90896e38c9
|
Begin porting/decompiling field_specials
|
2018-08-08 01:37:12 -07:00 |
|
DizzyEggg
|
d230d986fa
|
Me First.
|
2018-08-05 16:43:07 +02:00 |
|
DizzyEggg
|
065032bf35
|
Moves changing terrains
|
2018-08-05 12:43:57 +02: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
|
2d73637ff4
|
Introduce argument and do Draining kiss
|
2018-08-03 19:01:03 +02:00 |
|
DizzyEggg
|
320120d529
|
Merge with master
|
2018-08-03 00:20:34 +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 |
|
DizzyEggg
|
44a454ecb4
|
Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done
|
2018-07-30 20:41:16 +02:00 |
|
DizzyEggg
|
9febcd3a0a
|
Document a bit of atk47
|
2018-07-29 15:51: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 |
|
DizzyEggg
|
ef3c39fbae
|
Fix Counter and Mirror Coat
|
2018-07-28 10:58:47 +02:00 |
|
DizzyEggg
|
0148cc8b0c
|
merge with master, gen6 move names
|
2018-07-28 00:01:34 +02: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
|
1c95c36338
|
Healing Wish and Lunar Dance
|
2018-07-26 20:36:16 +02:00 |
|
Diegoisawesome
|
e92e2cb0aa
|
Merge branch 'master' of github.com:pret/pokeemerald
|
2018-07-24 21:18:36 -07:00 |
|