Commit Graph

1962 Commits

Author SHA1 Message Date
DizzyEggg
7a8f524bc5 Proper Roar handling in double battles 2019-03-06 12:09:34 +01: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
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
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
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
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
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
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
Diegoisawesome
1b0079445d
Merge pull request #559 from Phlosioneer/finish-newgame-docs
Finish and polish new_game.c
2019-02-18 13:28:50 -06:00
Phlosioneer
5695617d64 Merge branch 'master' into multiplayer-stuff 2019-02-18 01:12:47 -05:00
Phlosioneer
758b8c7f0e Decompiled three more functions. 2019-02-17 23:14:14 -05:00
Phlosioneer
6d929c61c5 Decompiled 4 more functions 2019-02-17 23:14:14 -05:00
Phlosioneer
cb800e4708 Decompiled 5 functions
Was unable to decompile sub_81C79BC.
2019-02-17 23:14:14 -05:00
Phlosioneer
d41c597f90 Decompiled sub_81C7990 2019-02-17 23:14:14 -05:00
Phlosioneer
a8d920cc45 Decompiled 2 functions, unable to decompile 1.
sub_81C795C could not be decompiled due to register naming issues.
However, its structure was correctly matched, so I have left the C
code and a comment explaining the issue.
2019-02-17 23:14:14 -05:00
Phlosioneer
34b16e9e78 Decompiled 5 functions for unknown structs 2019-02-17 23:14:14 -05:00
Phlosioneer
3bb4057bad Decompiled sub_81C7764 2019-02-17 23:14:14 -05:00
Phlosioneer
7c405e08d0 Decompiled three more small functions 2019-02-17 23:14:14 -05:00
Phlosioneer
5beb2baa97 Decompiled sub_81C76C4 2019-02-17 23:14:14 -05:00
Phlosioneer
b038556851 Decompiled several setters and getters 2019-02-17 23:14:14 -05:00
Phlosioneer
13a6765c88 Decompiled several trivial functions 2019-02-17 23:14:14 -05:00
Phlosioneer
112fc47017 Decompiled sub_81C756C
Also discovered a constant that may be useful for future decompiling.
Comments were added in the asm that references the constant.
2019-02-17 23:14:14 -05:00
Phlosioneer
3d73f7c48c Decompiled sub_81C742C 2019-02-17 23:14:14 -05:00