Slawter666
|
137f6549ff
|
label field_effect_helpers
|
2018-10-14 23:43:40 +01:00 |
|
Diegoisawesome
|
02049d52ee
|
Merge pull request #351 from DizzyEggg/apprentice
Decompile apprentice
|
2018-10-14 13:20:38 -05: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 |
|
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
|
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
|
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 |
|
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
|
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 |
|
Marcus Huderle
|
b9e38a569e
|
Merge pull request #320 from DizzyEggg/anims
Document battle animation scripts
|
2018-10-06 08:20:41 -05:00 |
|
DizzyEggg
|
17c5b4089a
|
Label most of the anim tags
|
2018-10-06 09:37:52 +02:00 |
|
Tetrable
|
e80a53060b
|
Start anim tags
|
2018-10-05 23:00:07 +01: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
|
66fd9b2ddf
|
Label trainer hill battle type
|
2018-09-20 22:00:00 +02:00 |
|
Marcus Huderle
|
f2a76b54bd
|
Re-dump tileset images as RGB-indexed, rather than greyscale
|
2018-09-16 11:07:48 -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
|
2a7811456a
|
Add anim tag sprite defines
|
2018-09-15 00:30:20 +02: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 |
|
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 |
|
DizzyEggg
|
b87856b58e
|
Battle Factory is decompiled and documented.
|
2018-09-10 01:01:39 +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 |
|
Diegoisawesome
|
cf8f73bde1
|
Merge pull request #314 from Slawter666/data
Convert data to C
|
2018-09-07 11:39:07 -05: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
|
5656ceab6c
|
Move graphics to src/data/graphics
|
2018-09-05 23:53:54 +01:00 |
|
DizzyEggg
|
75384546b5
|
More factory decomp and documentation.
|
2018-09-05 23:30:15 +02:00 |
|
DizzyEggg
|
44ba432dad
|
Label various battle scripts
|
2018-09-01 20:00:13 +02:00 |
|
DizzyEggg
|
ead21250a6
|
Label all battle ai scripts
|
2018-09-01 19:05:06 +02:00 |
|
DizzyEggg
|
917b32ffbe
|
Finish decompiling pyramid bag.
|
2018-08-30 20:10:57 +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 |
|
Slawter666
|
e30c2251ce
|
Convert more of data2b
|
2018-08-27 00:26:54 +01:00 |
|
DizzyEggg
|
ddd4733de3
|
rename battle pyramid to battle pyramid bag
|
2018-08-26 17:54:58 +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
|
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 |
|
Slawter666
|
6b145ed77c
|
Move data from graphics.s to C
|
2018-08-24 04:21:07 +01: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
|
5da12f2b21
|
battle dome - more work
|
2018-08-19 22:26:07 +02:00 |
|
DizzyEggg
|
e4649245ba
|
this file is too much
|
2018-08-18 19:52:25 +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 |
|
Diegoisawesome
|
ac3f4fd994
|
Continue documentation and cleanup of pokemon_summary_screen
|
2018-08-15 11:51:47 -07:00 |
|
DizzyEggg
|
92c4fc6345
|
Contest AI clean-up
|
2018-08-15 11:50:18 +02: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
|
1a0e6f7aed
|
match contest effect
|
2018-08-13 21:24:11 +02:00 |
|
DizzyEggg
|
0d68af7f06
|
copy contest effect from ruby
|
2018-08-12 23:20:17 +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
|
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
|
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
|
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
|
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 |
|
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 |
|
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
|
3d5f512aec
|
Use constant in a battle script.
|
2018-08-03 18:07:45 +02:00 |
|