Commit Graph

2377 Commits

Author SHA1 Message Date
GriffinR
3bf8129396 Clean up new Cmd macro names 2019-09-27 02:54:28 -04:00
GriffinR
b6dffcf8b7 Clean up script_menu documentation 2019-09-19 19:23:24 -04:00
GriffinR
06af24bce5 Use misc ScrCmd constants 2019-09-16 19:44:47 -05:00
DizzyEggg
a41ecf7101 more ai stuff, baton pass perish song strats 2019-08-30 17:57:19 +02:00
DizzyEggg
e96e98a8de Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-08-25 13:10:32 +02:00
PikalaxALT
a4d5624ad6 Move asm srcs to src 2019-08-21 17:08:40 -05:00
DizzyEggg
e4787bacbc merge 2019-08-19 14:50:47 +02:00
Tustin2121
18dee14170 Review fixes 2019-08-17 23:26:46 -04:00
Tustin2121
f4d4424618 Folded nops into hidemoneybox and updatemoneybox
The nops are essential to the hidemoneybox and updatemoneybox commands when using vanilla versions of those commands. Even though they're not actually used parameters in the command implementation, they are still consumed, which means if someone were to get rid of the nops (as I did in TriHard) it causes the commands to consume bytecode that are not theirs, resulting in undefined behavior usually leading to softlocks. Folding the extra bytes into the macros means there's no chance of the extra bytes getting losts in scripts.
2019-08-17 13:25:36 -04:00
Tustin2121
6508469259 Rename movobjectoffscreen to copyobjectxytoperm
Renaming the command to something that makes more sense as to what the command actually does. The command copies the current xy of the instantiated object back to its template, so that the object remains in the same place if the player walks away and despawns the object, and then comes back. "moveobjectoffscreen" implies that it might be taking the object and moving it physically to an off-screen location somehow.
2019-08-17 13:18:56 -04:00
DizzyEggg
fabbc9ae31 Merge with master 2019-08-14 11:48:08 +02:00
DizzyEggg
c9de753ecc Illusion 2019-08-08 13:06:55 +02:00
PikalaxALT
b05df0377e Finish pokenav_unk_9 2019-08-05 17:17:05 -04:00
PikalaxALT
e2e667d4b5 Finish pokenav_unk_8 2019-08-05 13:47:04 -04:00
PikalaxALT
330fc46df8 through sub_81CF3F8 2019-08-05 12:21:45 -04:00
PikalaxALT
18f29c566a through sub_81CF278 2019-08-05 10:54:56 -04:00
PikalaxALT
51d5ee771d Merge branch 'master' into pokenav_unk_2 2019-08-05 08:33:45 -04:00
PikalaxALT
1fc64b8582
Merge pull request #767 from DizzyEggg/pokenav_8
More pokenav
2019-08-05 08:21:36 -04:00
DizzyEggg
2863045241 Fix switch-in abilities text/pop-up 2019-08-05 11:24:49 +02:00
PikalaxALT
299c3cf1dc Finish pokenav_unk_2 2019-08-04 20:39:36 -04:00
PikalaxALT
2dee42dbaf through sub_81CA474 2019-08-04 18:15:02 -04: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
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
DizzyEggg
02cadbee60 MORE DODRIO BERRY PICKINGgit status! 2019-08-01 19:01:50 +02:00
PikalaxALT
a08cbaee0a pokenav_unk_2 staging 2019-07-30 19:46:56 -04:00
DizzyEggg
ba1a70419a Start dodrio magic 2019-07-31 00:27:30 +02:00
garak
5b57c001f5
Merge branch 'master' into navdata 2019-07-29 13:06:45 -04: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
b68ab6106d pokenav unk 2 data decomp 2019-07-19 17:23:52 -04:00
DizzyEggg
fc84033e3d Merge with master 2019-07-12 11:20:24 +02:00
DizzyEggg
c3733f4b95 Decompile 4 berry crush functions 2019-07-09 16:39:29 -05:00
DizzyEggg
11fb13d635 Some pokemon jump work 2019-07-09 16:39:29 -05:00
DizzyEggg
3e476adf4a Stockpile gen4 effect and fixed spit up 2019-07-09 19:06:12 +02:00
DizzyEggg
10c27ac6a6 Fix a typo that crashes the gamae 2019-06-25 12:26:27 +02:00
DizzyEggg
9e175c9f1b Merge branch 'master' into battle_engine_v2 2019-06-10 11:21:16 +02:00
DizzyEggg
f64c1dfabf Some pokenav work 2019-05-26 07:20:51 -05:00
DizzyEggg
32aeba21e0 Some AI tweaking 2019-05-23 11:41:35 +02:00
DizzyEggg
e1ea4b62e9 Natural Gift 2019-05-20 12:03:00 +02:00
DizzyEggg
269f573297 Fix powder and resist berry string 2019-05-20 10:10:00 +02:00
DizzyEggg
94045ace0b Merge branch 'master' into battle_engine_v2 2019-05-15 13:31:53 +02:00
PikalaxALT
539d472796 Merge branch 'master' into dodrio_berry_picking 2019-05-11 21:22:09 -04:00
PikalaxALT
f13e1c78b2 through sub_81CA0EC 2019-05-02 17:53:00 -04:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00
PikalaxALT
a14162eb9f through sub_81C9F28 2019-05-02 16:43:32 -04:00
PikalaxALT
518865d8d9 sub_81C9A10 2019-05-02 16:19:25 -04:00
PikalaxALT
9b40cdaeb9 through sub_81C99FC 2019-05-02 14:27:59 -04:00
DizzyEggg
a7f2fa67ef
Merge pull request #142 from thechurchofcage/beta
Magnetic Flux + Gear Up
2019-05-01 11:11:46 +02:00
DizzyEggg
bbe3a28b78 Merge with master 2019-05-01 11:10:41 +02:00
Papa Cancer
3cde800bd0 Magnetic Flux + Gear Up
Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities.
Magnetic Flux uses Charge animation.
2019-04-20 20:17:56 +01:00
Papa Cancer
b50007e861 Instruct
Re-PR'd due to excess "merges"
2019-04-20 20:11:49 +01: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
c7954e1212 Decompile pokenav_unk_4.c through sub_81CB678() 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
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
065c60544d Cleanup some pokenav code 2019-04-13 16:18:04 -05:00
Marcus Huderle
1268691410 Finish decompiling pokenav_unk_1.c 2019-04-13 16:18:04 -05:00
Marcus Huderle
cb9d471a2a Decompile pokemon_jump through sub_802CE48() 2019-04-13 11:37:50 -05:00
Phlosioneer
8338e29279 Pokenav unk 1 almost done 2019-04-13 11:34:53 -05:00
Phlosioneer
2b740b46e8 About halfway done with pokenav_unk_1.s 2019-04-13 11:34:53 -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
2646f3b26a Merge with master 2019-04-13 13:42:44 +02:00
Marcus Huderle
a65cffef42 Decompile more pokemon_jump.c 2019-04-10 20:34:17 -05:00
Marcus Huderle
8a617c3d94 Decompile more pokemon_jump.c 2019-04-09 19:48:21 -05:00
DizzyEggg
382a29ad40 Update battle_anim_script.inc 2019-04-09 07:19:03 -05:00
DizzyEggg
91aafa2ebc Heal Block anim with volume change task 2019-04-09 12:49:50 +02:00
huderlem
ce93d3ab9a
Merge pull request #661 from Phlosioneer/contest-ai-cleanup
contest & contest_ai cleanup
2019-04-08 17:30:28 -05:00
DizzyEggg
0e02c28927 Merge with master 2019-04-08 09:37:41 +02:00
Marcus Huderle
a518810c17 Decompile more pokemon_jump.c 2019-04-07 19:23:14 -05:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
huderlem
a4ea0ac816
Merge pull request #645 from Phlosioneer/pokenav-decomp-again
Pokenav decomp again
2019-04-07 18:03:32 -05:00
Phlosioneer
d352999cd8 Change "navgear" to "pokenav" 2019-04-07 18:10:53 -04: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
Phlosioneer
d84d94e29a Merge branch 'master' into pokenav-decomp-again 2019-04-07 01:56:36 -04:00
Phlosioneer
ad2a97935e Document left header system 2019-04-07 01:32:42 -04:00
Phlosioneer
ddfe0f91cf Document decompiled parts of the pokenav main menu 2019-04-06 23:34:30 -04:00
Phlosioneer
3b45f37517 Significant documentatioon progress 2019-04-06 16:25:08 -04:00
Phlosioneer
bc50686158 Decomp everything onvolving UnknownSubStruct_81C81D4
Now I can start cleaning up the fields and substructs
2019-04-06 03:42:14 -04: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
Fontbane
90e32f4ec5 Document landmark setting and item balls 2019-04-04 19:34:35 -05:00
PikalaxALT
b3a4509b9a Move m4a BSS syms to m4a_1.s 2019-04-04 19:26:45 -05:00
Phlosioneer
1360b3a477 RGB Constants 2019-04-04 17:05:46 -04: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
Phlosioneer
83b6210dcb Forgot to add asm files 2019-04-03 20:56:47 -04:00
PikalaxALT
4fadbaf161 Minor fixes
gotoram --> returnram
cmdCF/execram --> gotoram
fix indentation in sym_ewram.txt
fix mevent_client.h guard name
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
ultima-soul
02651f6177 Attempt to decompile menu_specialized. 2 NONMATCHING 2019-04-02 19:18:36 -07:00
DizzyEggg
1aa95a1821 Document a bit of anims 2019-04-02 07:31:06 -05: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
ce89cf6f75 through sub_801A3D0 2019-04-01 14:09:56 -04:00
PikalaxALT
1fe5208560 through sub_801A02C 2019-04-01 12:05:58 -04:00
DizzyEggg
14a34b002a Electroweb animation 2019-04-01 14:43:18 +02:00
DizzyEggg
944dc4f6bf Merge with master 2019-04-01 13:40:42 +02:00
PikalaxALT
ade0183378 Document mystery_gift 2019-03-31 18:59:52 -04:00
PikalaxALT
93c4e35d84 infer additional file split after task00_mystery_gift 2019-03-31 15:43:51 -05:00
PikalaxALT
0a8427c8ef fakematching task00_mystery_gift 2019-03-31 15:43:51 -05:00
PikalaxALT
90fb329b70 through task_add_00_mystery_gift 2019-03-31 15:43:51 -05:00
PikalaxALT
fb5c19a33b through mevent_message 2019-03-31 15:43:51 -05:00
PikalaxALT
813de11154 Through mevent_save_game 2019-03-31 15:43:51 -05:00
PikalaxALT
f88f815cff WIP sub_8018DAC 2019-03-31 15:43:51 -05:00
PikalaxALT
608a217240 sub_8018B08 2019-03-31 15:43:51 -05:00
PikalaxALT
82a3f29b88 through sub_8018A50 2019-03-31 15:43:51 -05:00
PikalaxALT
aafe9df454 through sub_8018798 2019-03-31 15:43:51 -05:00
PikalaxALT
f34cda3b52 Start decompiling mystery gift 2019-03-31 15:43:51 -05:00
PikalaxALT
5a0142da08 infer additional file split after task00_mystery_gift 2019-03-31 15:53:38 -04:00
PikalaxALT
4f12f0ae28 fakematching task00_mystery_gift 2019-03-31 15:50:25 -04:00
DizzyEggg
b12334c88b Remove cases from ABE, add functionality of Flower Veil 2019-03-31 21:38:58 +02:00
PikalaxALT
5b361db6b3 through task_add_00_mystery_gift 2019-03-31 12:55:27 -04:00
PikalaxALT
8799a1c791 through mevent_message 2019-03-31 12:36:48 -04:00
PikalaxALT
148c417c50 Through mevent_save_game 2019-03-31 12:27:36 -04:00
PikalaxALT
c9f16cb1a8 WIP sub_8018DAC 2019-03-31 11:16:19 -04:00
PikalaxALT
db4e9505ad Merge branch 'master' into mystery_gift 2019-03-31 10:39:11 -04:00
PikalaxALT
0ba4d0cadc sub_8018B08 2019-03-31 10:33:27 -04:00
Marcus Huderle
500d009b5c Start decompiling berry_crush.c 2019-03-31 09:13:19 -05:00
huderlem
b9bf3bf072
Merge pull request #637 from DizzyEggg/pokeblock_attempt
Use Pokeblock clean-up and some menu_specialised decomp
2019-03-31 08:39:18 -05:00
DizzyEggg
17e74756cb Merge with master, add defines to atk49 and statbuffchange commands 2019-03-31 15:19:25 +02:00
DizzyEggg
e3c07c83f2 More work on use pokeblock 2019-03-31 14:32:26 +02:00
DizzyEggg
aa7f69f067 Begin use pokeblock and menu specialised 2019-03-31 12:59:01 +02:00
PikalaxALT
1ce07deeac through sub_8018A50 2019-03-30 20:04:30 -04:00
PikalaxALT
5bf7886a70 through sub_8018798 2019-03-30 14:36:52 -04:00
PikalaxALT
ed53220be2 Start decompiling mystery gift 2019-03-30 13:15:48 -04:00
PikalaxALT
ccac4694cd Merge branch 'master' into continue_union_room 2019-03-30 12:41:10 -04:00
DizzyEggg
35cffea987 Helpful macros for atk49 2019-03-30 08:29:56 -05:00
PikalaxALT
3b9275b133 sub_8018404 2019-03-30 09:23:47 -04:00
PikalaxALT
2f57d6bc0f sub_8018220 2019-03-30 09:18:58 -04: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
2e588fd4d7 through sub_80181DC 2019-03-29 22:22:26 -04:00
PikalaxALT
6b6c98e7d0 through sub_80180E8 2019-03-29 19:41:32 -04:00
PikalaxALT
8d75dc1982 sub_8017EA0 2019-03-29 17:19:29 -04:00
PikalaxALT
bf4a73a67c through sub_8017E00 2019-03-29 16:24:48 -04:00
PikalaxALT
8fc51b0459 through sub_8017CB0 2019-03-29 15:50:04 -04:00
PikalaxALT
ae0e70d7bb sub_80179D4 and rodata 2019-03-29 11:57:03 -04:00
Marcus Huderle
519426f4e6 Decompile union_room_chat through sub_8020118 2019-03-28 20:20:52 -05:00
Marcus Huderle
8b8cc7a475 Decompile union_room_chat.s through sub_801FF08 2019-03-28 18:40:49 -05:00
PikalaxALT
030fb4d898 through sub_80179AC 2019-03-28 11:24:50 -04:00
PikalaxALT
86f7691146 Through sub_80176E4 2019-03-28 10:24:31 -04:00
PikalaxALT
963dcfb84d sub_80173E0 2019-03-28 09:59:08 -04:00
PikalaxALT
9538855d9a Through sub_80173D4 2019-03-28 08:42:35 -04:00
PikalaxALT
7c45a7c443 port mevent_801BAAC from fire red 2019-03-28 07:32:25 -05:00
Marcus Huderle
aebc676913 Decompile union_room_chat.c up to sub_801F5B8 2019-03-27 19:09:12 -05:00
PikalaxALT
51d2131dc2 through (nearly-matching) sub_80172A0 2019-03-27 16:57:34 -04:00
PikalaxALT
8e0773675c through sub_8017168 2019-03-27 13:16:10 -04:00
PikalaxALT
9a8b001ebf through sub_801704C 2019-03-27 10:44:49 -04:00
PikalaxALT
44f7d49c2e Finish sub_8016CA0 2019-03-27 09:54:19 -04: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
a677d1f4cb Failed attempt at sub_8026988 2019-03-26 14:46:58 -04:00
scnorton
2eba82b0fb sub_8026634 2019-03-26 11:59:39 -04:00
PikalaxALT
df538ff7ab WIP sub_8026324 2019-03-26 09:47:13 -04:00
scnorton
03e58d7dc9 through sub_80262C0 2019-03-25 18:08:25 -04:00
scnorton
5de624783c through sub_8026044 2019-03-25 17:27:27 -04:00
scnorton
e3a11bc3ca through sub_80259FC 2019-03-25 15:26:23 -04:00
scnorton
c3e26a58df through sub_8025758 2019-03-25 12:08:56 -04:00
scnorton
4780f208d3 through sub_8025324 2019-03-25 11:22:48 -04:00
PikalaxALT
c005c2f737 sub_8024FFC 2019-03-25 08:31:29 -04:00
PikalaxALT
d4cca4ffa2 through sub_8024F38 2019-03-24 22:56:16 -04:00
PikalaxALT
d49d3b6858 through sub_8024E38 2019-03-24 21:17:25 -04: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
scnorton
2136187c11 sub_8024BC8 2019-03-24 17:32:59 -04: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
Marcus Huderle
4fd2b0b484 Decompile remaining functions in use_pokeblock.s 2019-03-23 17:23:14 -05:00
DizzyEggg
53c60ab292 Merge branch 'master' into battle_engine_v2 2019-03-23 15:54:08 +01:00
Marcus Huderle
65391a1eb2 Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
#	src/use_pokeblock.c
2019-03-23 09:39:46 -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
f4737874ef Made a new substruct for the substruct
We must go deeper.
2019-03-16 22:10:07 -04:00
Phlosioneer
bdc6ed1a98 Decompiled two difficult functions
Had do use a lot of `asm` directives for sub_81C8A28 to match.
2019-03-16 00:34:11 -04:00
Phlosioneer
a71c563b10 A few more functions decompiled 2019-03-15 02:33:55 -04:00
Phlosioneer
31ded7cc6f Merge branch 'master' into pokenav-decomp-again 2019-03-15 01:19:00 -04: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
Phlosioneer
69aec91577 Decompile move tutor stuff
2 nonmatching.
2019-03-08 01:56:38 -05:00
Phlosioneer
0da83abad2 Several nonmatching functions
Huge and difficult.
2019-03-06 22:27:30 -05:00
DizzyEggg
7a8f524bc5 Proper Roar handling in double battles 2019-03-06 12:09:34 +01:00
Phlosioneer
4345ba8e6c More decompiled and cleanup 2019-03-05 22:32:28 -05:00
Phlosioneer
c3594f982d Decompiling pokeblock ui stuff 2019-03-05 20:32:14 -05:00
DizzyEggg
fddb5159b4 Merge with master 2019-03-05 21:46:45 +01:00
Papa Cancer
2050ac3963 Grassy Terrain v2
All corrected, simplest version
Also includes proper ending strings for all terrains
2019-03-05 19:13:25 +00: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
4ea5e85bed Fix typos
This is an updated version of #554, since it hasn't been updated in two
weeks.
2019-03-03 09:31:47 -06:00
Phlosioneer
4907ce6f7f Fully document move_tutor (formerly learn_move) 2019-03-03 02:50:40 -05:00
Papa Cancer
cfd50eb65a Grassy Terrain + minor fixes
Includes strings for all
Fixes:
・Psychic Terrain blocks priority if the TARGET is grounded, not the user
・Psychic Terrain no longer targets an opponent
・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable
・Small fix: Meteor Mash corrected to being a physical attack
2019-03-02 22:52:43 +00:00
Phlosioneer
9372731c3e Merge branch 'master' into main-menu-state-machine 2019-03-02 17:35:44 -05:00
huderlem
ee9694d9ba
Merge pull request #587 from Phlosioneer/document-all-event-vars
Document all event vars
2019-03-02 08:24:46 -06:00
DizzyEggg
c9c38024e3 Fix move reminder 2019-03-02 12:13:09 +01:00
huderlem
3b04cfa437
Merge pull request #551 from Phlosioneer/multiplayer-stuff
Document overworld.c and link stuff in general
2019-03-01 08:43:55 -06:00
DizzyEggg
bfe95bc4b9 Merge branch 'master' into battle_engine_v2 2019-03-01 13:29:50 +01:00
Phlosioneer
da0687987d Pick better names for constants 2019-02-28 22:21:16 -06:00
Phlosioneer
189d387f01 Add macros for metatile manipulation 2019-02-28 22:21:16 -06:00
DizzyEggg
cebada80d0 Merge with master 2019-02-28 20:56:52 +01:00
Phlosioneer
e77e7844ea Name several vars, document some related events 2019-02-27 20:25:09 -05:00
Phlosioneer
2e789dbbdc Decompile another 7 functions 2019-02-27 02:11:45 -05:00
Phlosioneer
72bb0daccb Merge branch 'master' into main-menu-state-machine 2019-02-26 22:34:42 -05:00
Phlosioneer
6cb4c677cd Fix backwards names 2019-02-26 22:30:40 -05:00
Phlosioneer
3a44b090d1 Merge branch 'master' into multiplayer-stuff 2019-02-26 22:07:29 -05:00
Marcus Huderle
b60611c38e Finish decompiling easy_chat.c code 2019-02-26 14:50:02 -06:00
Marcus Huderle
7ea05431a5 Decompile more easy_chat.c 2019-02-25 14:11:31 -06:00
Phlosioneer
c03b13b855 Decompiled more, got one NONMATCHING 2019-02-25 01:02:16 -05:00
DizzyEggg
da33c38183
Merge pull request #78 from thechurchofcage/beta
Gravity fix
2019-02-24 19:38:42 +01:00
Marcus Huderle
bb508ade64 Decompile more of easy_chat.c 2019-02-24 10:09:57 -06:00
Papa Cancer
d704b9cd5b Gravity fix
Brings down Pokémon in the middle of a two-turn flying move (only Bounce and Fly at the moment); says the appropriate message for all mons brought to the ground via Gravity
2019-02-24 13:28:24 +00:00
Phlosioneer
a25f4c75bc Decompiled a weird function 2019-02-24 04:33:58 -05:00
Phlosioneer
62589d7003 Decompiled more, ported asmdiff to powershell 2019-02-24 03:33:33 -05:00
Phlosioneer
a7d2d986b2 Decompiled two small functions, updated structs 2019-02-23 23:38:32 -05:00
Phlosioneer
fb8dddf0f1 Decompiled sub_81C81D4 2019-02-23 23:17:26 -05:00
Diegoisawesome
7995cf5b61
Merge pull request #578 from DizzyEggg/pokenav
pokenav
2019-02-23 16:04:59 -06:00
DizzyEggg
842e379a7b Merge branch 'master' into battle_engine_v2 2019-02-23 22:50:46 +01:00
Marcus Huderle
f34903bc45 Decompile more easy_chat.c 2019-02-23 13:05:34 -06:00
ultima-soul
eb48cc2f7e Decompile through sub_8167930. 2019-02-23 09:08:07 -08:00
DizzyEggg
788caa4fe2 pokenav 2019-02-23 13:34:01 +01:00
Marcus Huderle
d3f66a98ff Decompile more easy_chat 2019-02-22 11:46:05 -06:00
Phlosioneer
44e92ce259 Give window drawing functions better names 2019-02-22 01:40:11 -05:00
Phlosioneer
399d646e3f Merge branch 'master' into main-menu-state-machine 2019-02-21 22:24:25 -05:00
Phlosioneer
eca329f9c5 Merge branch 'master' into multiplayer-stuff 2019-02-21 21:22:10 -05:00
Marcus Huderle
b105d20d1e Decompile chunk of easy_chat.c 2019-02-21 17:46:14 -06:00
Marcus Huderle
1c6502338e Decompile contest_link_80F57C4.c 2019-02-20 18:11:27 -06:00
Marcus Huderle
4223bb65f0 Decompile several contest_link_80F57C4.c functions 2019-02-19 16:36:42 -06:00
Marcus Huderle
05f9368154 Decompile start of flying.c 2019-02-19 16:36:42 -06:00