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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Diegoisawesome
|
85ebd76cd0
|
Fix fanfare constant to use define
|
2018-08-04 18:41:53 -07:00 |
|
DizzyEggg
|
eb4d9f6fed
|
Tabs to spaces
|
2018-08-03 00:24:10 +02:00 |
|
DizzyEggg
|
d6537c811b
|
Battle code enums in case switches
|
2018-08-03 00:13:44 +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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
MCboy
|
43fa9da52a
|
decompile more code
1 non matching need help
|
2018-07-20 03:44:20 +04:30 |
|
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
|
118fa3afce
|
IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL
|
2018-07-16 22:00:27 +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 |
|
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 |
|