Commit Graph

1536 Commits

Author SHA1 Message Date
DizzyEggg
4881e48994 Merge with master 2019-08-04 23:57:53 +02:00
DizzyEggg
c219776034 Merge with master 2019-08-04 23:09:28 +02:00
PikalaxALT
cd876292d1 Merge branch 'master' into pokenav_unk_2 2019-08-04 15:35:35 -04:00
DizzyEggg
c8cc39cb57 More pokemav, massive clean-up, seriously who the left the file in this state??? 2019-08-04 19:09:12 +02:00
PikalaxALT
fa5bfc1627
Merge pull request #766 from DizzyEggg/pokenav_10
Decompile pokenav 10
2019-08-04 11:07:10 -04:00
DizzyEggg
252df94bc1 Decompile pokenav 10 2019-08-04 13:53:00 +02:00
DizzyEggg
1641579297 Merge branch 'master' into pok_jump 2019-08-04 00:02:13 +02:00
PikalaxALT
9f50c4fa80
Merge pull request #760 from ultima-soul/use_pokeblock_data
Decompile use_pokeblock data
2019-08-03 11:01:05 -04:00
DizzyEggg
9306c142b3 Merge dodrio with master 2019-08-02 00:45:49 +02:00
DizzyEggg
4d2d8779bf Dodrio berry picking decompiled 2019-08-02 00:41:55 +02:00
ultima-soul
9a152f8fe6 Decompile data/use_pokeblock.s 2019-07-30 17:21:17 -07:00
garak
5b57c001f5
Merge branch 'master' into navdata 2019-07-29 13:06:45 -04:00
DizzyEggg
a4a382a004 Match sub_81D2278 and poke jump clean 2019-07-29 16:22:50 +02:00
DizzyEggg
e634e722cc Decompile pokemon jump 2019-07-29 12:35:57 +02:00
DizzyEggg
56b124fdec Some more pokenav 2019-07-25 21:41:02 +02:00
DizzyEggg
fd07c608fc Decompile pokemon unk 6 2019-07-25 18:56:08 +02:00
DizzyEggg
33c036e7ff Decompile pokemonav 7 2019-07-24 17:02:52 +02:00
garak
c39d25ff4d
Merge branch 'master' into navdata 2019-07-20 12:30:41 -04:00
PikalaxALT
8d0d5cfd55 Merge branch 'master' into modern_gcc 2019-07-20 11:51:22 -04:00
garak
dfa3e079c0 finish pokenav data decomp 2019-07-19 22:57:33 -04:00
garak
f9a9297d4f decompile pokenav 7/8 data 2019-07-19 22:06:42 -04:00
garak
f6d55db535 decompile pokenav_unk_5 data 2019-07-19 21:05:55 -04:00
garak
690a0c4390 decompile pokenav_unk_4 rodata 2019-07-19 19:36:17 -04:00
garak
c400d1dc7f decompile pokenav_unk_3 data 2019-07-19 18:31:42 -04:00
garak
b68ab6106d pokenav unk 2 data decomp 2019-07-19 17:23:52 -04:00
PikalaxALT
20863ac85b Resolve compile warnings in modern 2019-07-18 20:46:00 -04:00
DizzyEggg
fc84033e3d Merge with master 2019-07-12 11:20:24 +02:00
aaaaaa123456789
f4a65dbb1c Fix LD script to not contain huge gap sections 2019-07-10 05:01:15 -03:00
PikalaxALT
7a02a9ef36 Indentation fix in ld_scripts 2019-06-27 06:55:50 -04:00
PikalaxALT
fb06e4a3c9 Modernize code
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
2019-06-26 12:12:10 -04:00
DizzyEggg
9e175c9f1b Merge branch 'master' into battle_engine_v2 2019-06-10 11:21:16 +02:00
DizzyEggg
1c60387968 Merge with master, placeholder back anims 2019-06-03 11:24:10 +02:00
DizzyEggg
f64c1dfabf Some pokenav work 2019-05-26 07:20:51 -05:00
DizzyEggg
94045ace0b Merge branch 'master' into battle_engine_v2 2019-05-15 13:31:53 +02:00
DizzyEggg
dfb9a1fa16 Add all new cries 2019-05-14 10:58:11 +02:00
DizzyEggg
5682f98605 Merge branch 'master' into pokemon_expansion 2019-05-14 09:12:45 +02:00
PikalaxALT
539d472796 Merge branch 'master' into dodrio_berry_picking 2019-05-11 21:22:09 -04:00
PikalaxALT
9b40cdaeb9 through sub_81C99FC 2019-05-02 14:27:59 -04:00
DizzyEggg
bbe3a28b78 Merge with master 2019-05-01 11:10:41 +02:00
DizzyEggg
0666da6145 Merge branch 'master' into pokemon_expansion 2019-04-22 14:12:18 +02:00
Marcus Huderle
9915a3fd7f Decompile pokenav_unk_5.c 2019-04-16 14:29:00 -05:00
Marcus Huderle
f9f5f34b0c Finish decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
Marcus Huderle
394c0f5546 Start decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
DizzyEggg
17cf13beef Merge with master 2019-04-16 11:14:50 +02:00
Marcus Huderle
f40f2c5e9c Decompile all of pokenav_unk_3.c 2019-04-14 13:44:44 -05:00
Marcus Huderle
e3bdb08efa Start decompiling pokenav_unk_3.c 2019-04-14 13:44:44 -05:00
Marcus Huderle
1268691410 Finish decompiling pokenav_unk_1.c 2019-04-13 16:18:04 -05:00
Phlosioneer
ee2edb068a Start decomp of pokenav_unk_1
Looks like it's the Ribbons menu, based on the first function.
2019-04-13 11:34:53 -05:00
DizzyEggg
c17dbbc47c Merge branch 'master' into pokemon_expansion 2019-04-08 10:56:37 +02:00
DizzyEggg
0e02c28927 Merge with master 2019-04-08 09:37:41 +02:00
huderlem
a4ea0ac816
Merge pull request #645 from Phlosioneer/pokenav-decomp-again
Pokenav decomp again
2019-04-07 18:03:32 -05:00
Phlosioneer
0dc73b0b3a Break up pokenav into subfiles
The files are separated based on the pokenav resources substruct
ID they use.
2019-04-07 14:40:35 -04:00
Marcus Huderle
78151b6d88 Start decompiling pokemon_jump.c 2019-04-07 13:12:27 -05:00
DizzyEggg
8213222337 Merge with master 2019-04-06 23:20:16 +02:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
DizzyEggg
c36476af85 Clean up data2b.c 2019-04-05 07:53:23 -05:00
DizzyEggg
dd24597d52 Finish up menu specialised 2019-04-05 07:53:23 -05:00
PikalaxALT
a58d9a16dd Merge branch 'master' into dodrio_berry_picking 2019-04-05 08:41:31 -04:00
DizzyEggg
183b714ff1 Merge with master and fix web moves 2019-04-05 12:43:44 +02:00
PikalaxALT
53efbe2832 Finish decomp of union_room_chat 2019-04-04 19:26:45 -05:00
Diegoisawesome
8361ada4ba
Merge pull request #656 from ultima-soul/menu_specialized
Decompile some of menu_specialized
2019-04-04 12:49:17 -05:00
PikalaxALT
d0384ee95e mevent_server_ish --> mevent_client 2019-04-03 17:04:42 -05:00
PikalaxALT
28646ea64e Decompile mevent server scripts 2019-04-03 17:04:42 -05:00
PikalaxALT
6c12d154e7 Reformat mevent server and client scripts 2019-04-03 17:04:42 -05:00
PikalaxALT
03badd9c40 mevent_server_ish 2019-04-03 17:04:42 -05:00
PikalaxALT
dabd1f6177 finish mevent_server.s 2019-04-03 17:04:42 -05:00
PikalaxALT
a455d98385 start porting mevent_server from firered 2019-04-03 17:04:42 -05:00
DizzyEggg
de4722708b Add Gen4 mon sprites 2019-04-03 17:39:08 +02:00
ultima-soul
02651f6177 Attempt to decompile menu_specialized. 2 NONMATCHING 2019-04-02 19:18:36 -07:00
DizzyEggg
cd3de7821e Merge branch 'master' into battle_engine_v2 2019-04-02 08:37:54 +02:00
PikalaxALT
7571969a45 Finish union room battle 2019-04-01 22:08:50 -05:00
PikalaxALT
4be97b2dc6 through sub_801A960 2019-04-01 22:08:50 -05:00
PikalaxALT
08f4d3e105 Rename these objects to union_room_battle 2019-04-01 14:41:37 -04:00
PikalaxALT
4ea8217f81 file split 2019-04-01 14:25:58 -04:00
PikalaxALT
1fe5208560 through sub_801A02C 2019-04-01 12:05:58 -04:00
DizzyEggg
944dc4f6bf Merge with master 2019-04-01 13:40:42 +02:00
Phlosioneer
37c7441a15 Merge branch 'master' into contest-data 2019-03-31 20:22:47 -04:00
PikalaxALT
93c4e35d84 infer additional file split after task00_mystery_gift 2019-03-31 15:43:51 -05:00
PikalaxALT
f34cda3b52 Start decompiling mystery gift 2019-03-31 15:43:51 -05:00
Marcus Huderle
462b196abc Give battle_anim files appropriate names 2019-03-31 12:15:39 -05:00
Marcus Huderle
500d009b5c Start decompiling berry_crush.c 2019-03-31 09:13:19 -05:00
DizzyEggg
17e74756cb Merge with master, add defines to atk49 and statbuffchange commands 2019-03-31 15:19:25 +02:00
Marcus Huderle
accc5ae8dd Merge remote-tracking branch 'upstream/master' into union_room_chat
# Conflicts:
#	ld_script.txt
2019-03-29 21:27:08 -05:00
Marcus Huderle
a978a6a624 Finish decompiling union_room_chat.c 2019-03-29 21:26:08 -05:00
PikalaxALT
7c45a7c443 port mevent_801BAAC from fire red 2019-03-28 07:32:25 -05:00
scnorton
c6c0c9582f Port menews_jisan.c from FireRed 2019-03-27 07:40:08 -05:00
Marcus Huderle
af1baa89f1 Start decompiling union_room_chat.c 2019-03-26 21:58:20 -05:00
scnorton
708f128568 Merge branch 'master' into dodrio_berry_picking 2019-03-24 20:08:49 -04:00
Marcus Huderle
e6caf0ff10 Port mevent2.c from pokefirered 2019-03-24 18:29:00 -05:00
Kermalis
285608666b Match se_w043.mid 2019-03-24 16:37:27 -05:00
Kermalis
7cb1345cba Match se_w039.mid 2019-03-24 16:37:27 -05:00
Kermalis
f11ca86b46 Match se_w036.mid 2019-03-24 16:37:27 -05:00
Kermalis
85ec6ccf46 Match se_w030.mid 2019-03-24 16:37:27 -05:00
Kermalis
b6128b7e39 Match se_w029.mid 2019-03-24 16:37:27 -05:00
Kermalis
f40d36a564 Match se_w028.mid 2019-03-24 16:37:27 -05:00
Kermalis
08a565dadd Match se_w026.mid 2019-03-24 16:37:27 -05:00
Kermalis
4f1ba2c1ad Match se_w025b.mid 2019-03-24 16:37:27 -05:00
Kermalis
b949c7033d Match se_w025.mid 2019-03-24 16:37:27 -05:00
Kermalis
f46156a98c Match se_w020.mid 2019-03-24 16:37:27 -05:00
Kermalis
810cff0f21 Match se_w019.mid 2019-03-24 16:37:27 -05:00
Kermalis
3e53b505ee Match se_w017.mid 2019-03-24 16:37:27 -05:00
Kermalis
0a581cf1c6 Match se_w016b.mid 2019-03-24 16:37:27 -05:00
Kermalis
a2cb1991c5 Match se_w016.mid 2019-03-24 16:37:27 -05:00
Kermalis
d9b29ec549 Match se_w015.mid 2019-03-24 16:37:27 -05:00
Kermalis
2315bbfb8d Match se_w014.mid 2019-03-24 16:37:27 -05:00
Kermalis
f4b40d3220 Match se_w013b.mid 2019-03-24 16:37:27 -05:00
Kermalis
d9f8e253eb Match se_w013.mid 2019-03-24 16:37:27 -05:00
Kermalis
700ce03828 Match se_w011.mid 2019-03-24 16:37:27 -05:00
Kermalis
2ac7d8282b Match se_w010.mid 2019-03-24 16:37:27 -05:00
Kermalis
47c9bd4189 Match se_w007.mid 2019-03-24 16:37:27 -05:00
Kermalis
61c480634d Match se_w006.mid 2019-03-24 16:37:27 -05:00
Kermalis
d3899c5087 Match se_w004.mid 2019-03-24 16:37:27 -05:00
Kermalis
9d803b24a6 Match se_w003.mid 2019-03-24 16:37:27 -05:00
Kermalis
3f997ef4c2 Match se_ussoki.mid 2019-03-24 16:37:27 -05:00
Kermalis
b532e51659 Match se_u.mid 2019-03-24 16:37:27 -05:00
Kermalis
6437f9fb15 Match se_tu_saa.mid 2019-03-24 16:37:27 -05:00
Kermalis
fb297ca1c0 Match se_track_stop.mid 2019-03-24 16:37:27 -05:00
Kermalis
bc1b5bacc9 Match se_track_move.mid 2019-03-24 16:37:27 -05:00
Kermalis
1d08ff3a60 Match se_track_haiki.mid 2019-03-24 16:37:27 -05:00
Kermalis
7d9cda59ba Match se_track_door.mid 2019-03-24 16:37:27 -05:00
Kermalis
16fedb74b4 Match se_toy_kabe.mid 2019-03-24 16:37:27 -05:00
Kermalis
6b31879135 Match se_toy_g.mid 2019-03-24 16:37:27 -05:00
Kermalis
de4587480a Match se_toy_f.mid 2019-03-24 16:37:27 -05:00
Kermalis
63119116e7 Match se_toy_dango.mid 2019-03-24 16:37:27 -05:00
Kermalis
e26c30d390 Match se_toy_e.mid 2019-03-24 16:37:27 -05:00
Kermalis
afda8b34c1 Match se_toy_d.mid 2019-03-24 16:37:27 -05:00
Kermalis
2a7d758a17 Match se_toy_c1.mid 2019-03-24 16:37:27 -05:00
Kermalis
83cc45dec2 Match se_toy_c.mid 2019-03-24 16:37:27 -05:00
Kermalis
fcf0d729b0 Match se_toy_b.mid 2019-03-24 16:37:27 -05:00
Kermalis
bd100bcd9c Match se_toy_a.mid 2019-03-24 16:37:27 -05:00
Kermalis
2d71193555 Match se_toreoff.mid 2019-03-24 16:37:27 -05:00
Kermalis
5a64d81581 Match se_toreeye.mid 2019-03-24 16:37:27 -05:00
Kermalis
dff22304c4 Match se_tk_warpout.mid 2019-03-24 16:37:27 -05:00
Kermalis
d2451ee62c Match se_tk_warpin.mid 2019-03-24 16:37:27 -05:00
Kermalis
b04cdd1c24 Match se_tk_kasya.mid 2019-03-24 16:37:27 -05:00
Kermalis
00a6de011f Match se_tb_start.mid 2019-03-24 16:37:27 -05:00
Kermalis
fd6e44b8a8 Match se_tb_kon.mid 2019-03-24 16:37:27 -05:00
Kermalis
c8a57d3007 Match se_tb_kara.mid 2019-03-24 16:37:27 -05:00
Kermalis
d82b198820 Match se_tamakoro_e.mid 2019-03-24 16:37:27 -05:00
Kermalis
6881c256c4 Match se_tamakoro.mid 2019-03-24 16:37:27 -05:00
Kermalis
b706b60622 Match se_tamago.mid 2019-03-24 16:37:27 -05:00
Kermalis
5ffdb259a3 Match se_tama.mid 2019-03-24 16:37:27 -05:00
scnorton
98ab62a7af Dodrio: through sub_8024A30 2019-03-24 16:42:42 -04:00
Marcus Huderle
cf917a8733 Decompile berry_powder.c 2019-03-24 14:50:16 -05:00
Marcus Huderle
456cc3a6f0 Split out the remaining wireless-related files 2019-03-24 13:15:37 -05:00
Marcus Huderle
d3ff307f9f Remove asm/use_pokeblock.s 2019-03-24 08:23:27 -05:00
DizzyEggg
53c60ab292 Merge branch 'master' into battle_engine_v2 2019-03-23 15:54:08 +01:00
Marcus Huderle
a7d5f032b1 Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c 2019-03-22 14:16:26 -05:00
Marcus Huderle
f4f666f5af Finish decompiling ereader.c 2019-03-22 13:36:06 -05:00
DizzyEggg
54ab6b43dc Merge with master 2019-03-22 10:40:31 +01:00
Marcus Huderle
768a68d3e8 Decompile ereader.c up to faraway island code 2019-03-21 18:36:12 -05:00
Marcus Huderle
7118462b9f Decompile ereader.c up to faraway island code 2019-03-21 18:28:44 -05:00
Marcus Huderle
e9a3cc6d51 Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c
2019-03-17 17:20:40 -05:00
Marcus Huderle
4ae8a52473 Finish decompiling contest_painting_effects.c 2019-03-17 16:25:18 -05:00
Phlosioneer
13c2f91b11 Moved last contest data into C 2019-03-09 23:51:39 -05:00
Phlosioneer
b7cfa9d365 Move more contest constants into C 2019-03-08 21:39:51 -05:00
Phlosioneer
b93d923826 Merge branch 'master' into move-tutor 2019-03-08 02:27:20 -05:00
Phlosioneer
eac70acab6 Change filename to something more descriptive 2019-03-08 02:17:01 -05:00
DizzyEggg
fddb5159b4 Merge with master 2019-03-05 21:46:45 +01:00
Phlosioneer
9bea9e1624 Start decompiling menu_unknown 2019-03-05 06:06:20 -05:00
Phlosioneer
0e3fc4956b Rename asm file 2019-03-05 00:06:43 -05:00
Phlosioneer
907492fd6e Split rom asm file in half
The first half is ui/menu stuff, while the second half is link-related
stuff.
2019-03-04 23:26:51 -05:00
Phlosioneer
cae63cf1c7 Rename move tutor to move relearner 2019-03-04 20:56:39 -05:00
shinny456
1e7f4a80c7 port the rest of flying (leave 2 nonmatchings to egg) 2019-03-03 09:33:19 -06:00
Phlosioneer
4907ce6f7f Fully document move_tutor (formerly learn_move) 2019-03-03 02:50:40 -05:00
DizzyEggg
cebada80d0 Merge with master 2019-02-28 20:56:52 +01:00
Marcus Huderle
231355f84d Decompile easy_chat data 2019-02-26 14:50:02 -06:00
Marcus Huderle
b60611c38e Finish decompiling easy_chat.c code 2019-02-26 14:50:02 -06:00
DizzyEggg
842e379a7b Merge branch 'master' into battle_engine_v2 2019-02-23 22:50:46 +01:00
Marcus Huderle
1c6502338e Decompile contest_link_80F57C4.c 2019-02-20 18:11:27 -06:00
Marcus Huderle
05f9368154 Decompile start of flying.c 2019-02-19 16:36:42 -06:00
Phlosioneer
f528552583 Rename pokenav file 2019-02-17 23:14:14 -05:00
Phlosioneer
bf4c1a73c0 Start moving pokenav data into C files
The types and usage of many of the globals are now known.
2019-02-17 23:14:14 -05:00
Phlosioneer
698c2879e4 Decompiled sub_81C7078 2019-02-17 23:14:14 -05:00
DizzyEggg
f415871369 Merge with master 2019-02-03 10:44:05 +01:00
DizzyEggg
a7f94bbeea Dump last battle anim file 2019-02-02 11:55:11 +01:00
DizzyEggg
b4055e4fc0 Merge m4a files into one, get rid of one asm 2019-02-01 10:37:13 +01:00
DizzyEggg
7750a8126d CgbSound is decompiled. 2019-02-01 00:25:31 +01:00
DizzyEggg
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +01:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
DizzyEggg
94d2a30d44 Merge with master 2019-01-28 20:41:46 +01:00
DizzyEggg
ad59811154 Decompile whole contest 2019-01-28 18:13:07 +01:00
DizzyEggg
897592a8d4 Merge branch 'master' into battle_engine_v2 2019-01-27 10:58:57 +01:00
DizzyEggg
01c3f3fc05 Document all of frontier pass 2019-01-26 20:56:06 +01:00
DizzyEggg
4e396207d3 document more of trainer card 2019-01-20 18:24:35 +01:00
shinny456
1b30da21d9 merge trainer hill changes 2019-01-19 10:44:58 -05:00
DizzyEggg
2c3210f4d1 merge with master 2019-01-18 22:30:34 +01:00
Diegoisawesome
6857b73ee3 Split pokenav so calcrom works properly 2019-01-14 15:25:29 -06:00
DizzyEggg
4b420643dc Merge branch 'master' into trainer_hill 2019-01-13 20:51:05 +01:00
DizzyEggg
c0bc01d301 Move some vars to C 2019-01-13 13:15:23 +01:00
DizzyEggg
11a49a7f02 Decompile trainer hill 2019-01-13 12:12:27 +01:00
Philipp AUER
f53279b1e1 add DWARF debug sections to ld_script.txt 2019-01-11 10:41:51 -06:00
shinny456
8a5fce7837 start decompiling trainer_card.s 2019-01-08 21:51:19 -05:00
DizzyEggg
4827776a3c Merge with master 2019-01-05 10:14:20 +01:00
Marcus Huderle
fd201f8395 Start decompiling contest_link_80F57C4.c 2019-01-03 20:35:20 -06:00
Marcus Huderle
2857f7fff9 Decompile contest_link_81D9DE4.c 2019-01-03 20:35:20 -06:00
Marcus Huderle
bc43dbab13 Decompile contest_link_81D9DE4.c 2019-01-03 20:35:20 -06:00
Marcus Huderle
e1092028ec Decompile match_call.c 2019-01-02 19:46:15 -06:00
Diegoisawesome
6202ae1df0 Extract rodata from roulette 2019-01-02 16:40:40 -06:00
Diegoisawesome
e7f8190ba3 Finish roulette port 2019-01-01 15:25:52 -06:00