Commit Graph

1885 Commits

Author SHA1 Message Date
DizzyEggg
876be1d9cd
Merge pull request #104 from thechurchofcage/beta
Spiky Shield
2019-03-30 11:21:27 +01:00
Papa Cancer
a3b4767dd2 Spiky Shield
Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
2019-03-26 17:45:34 +00:00
Papa Cancer
61a7bd2788 Taunt fix etc.
Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's.
Heal Block now displays the correct string when preventing usage of a move.
2019-03-24 12:54:01 +00:00
DizzyEggg
7018745230 Fix Defiant stat raise by allies 2019-03-23 17:21:14 +01:00
DizzyEggg
e135ea47e5 Touch up Anger Point 2019-03-23 16:33:08 +01:00
DizzyEggg
53c60ab292 Merge branch 'master' into battle_engine_v2 2019-03-23 15:54:08 +01:00
DizzyEggg
77c4856e62 Nonmatchings go away 2019-03-23 09:51:27 -05: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
Phlosioneer
9848f84b9e Use constants for Oam .shape and .size fields
Also some general formatting fixes for constants.
2019-03-16 12:37:04 -05:00
Phlosioneer
092608aef6 Add a constant for "no music" on maps. 2019-03-16 12:31:29 -05:00
Phlosioneer
61344a4fee Document the water droplet data. 2019-03-16 12:25:02 -05:00
Phlosioneer
8e1537fb57 Document map name popup flag 2019-03-10 09:23:58 -05:00
huderlem
32f71b2976
Merge pull request #600 from Phlosioneer/summary-screen-macros
Summary screen macros
2019-03-08 13:37:12 -06:00
DizzyEggg
c329252ce3 Add Safety Googles effect 2019-03-08 10:16:54 +01:00
Phlosioneer
5886f82ef5 Merge branch 'master' into extern-cleanup 2019-03-08 02:45:26 -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
Phlosioneer
af182d6f16 Minor cleanup before pushing 2019-03-08 02:10:44 -05:00
Phlosioneer
69aec91577 Decompile move tutor stuff
2 nonmatching.
2019-03-08 01:56:38 -05:00
DizzyEggg
055f5a17b4
Merge pull request #103 from LOuroboros/battle_engine_v2
Protective Pads' description and Safety Goggles
2019-03-07 19:20:51 +01:00
DizzyEggg
b3ec24ab12
Merge pull request #102 from LOuroboros/battle_engine_v2
Gen. 5 Gems and Gen. 7 hold items stuff
2019-03-07 18:53:48 +01:00
LOuroboros
7d7e54c59a Added the item sprite of the Safety Goggles. 2019-03-07 13:54:54 -03:00
LOuroboros
25ff138ead Reordered the Item IDs a little bit to add the Safety Goggles and also added their item data. 2019-03-07 13:52:46 -03:00
DizzyEggg
f9ee31903d VCreate and fix stat stage changes functions 2019-03-07 12:20:57 +01:00
LOuroboros
75d78f4941 Added the item sprites of the Gen. 7 hold items. 2019-03-07 07:19:40 -03:00
LOuroboros
2f4aceb4a9 Defined a hold effect for the terrain effect boosting seeds and the Adrenaline Orb. 2019-03-07 07:09:19 -03:00
Phlosioneer
0da83abad2 Several nonmatching functions
Huge and difficult.
2019-03-06 22:27:30 -05:00
LOuroboros
ee8b72e68c Implemented the sprites for the Gen. 5 gems. 2019-03-06 15:33:02 -03:00
LOuroboros
7dc39298d6 Added a new hold effect for the Gen. 5 gems. 2019-03-06 15:29:00 -03:00
LOuroboros
36421d81eb Reordered the Item IDs a little bit, in order to include battle items like the Gen. 5 Gems and the Gen. 7 Seeds. 2019-03-06 15:07:25 -03: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
DizzyEggg
b150091436 Rename an erroneously named battlescript 2019-03-05 17:06:29 +01:00
Phlosioneer
9bea9e1624 Start decompiling menu_unknown 2019-03-05 06:06:20 -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
Phlosioneer
2879fe7fe0 Merge branch 'master' into summary-screen-macros 2019-03-03 16:58:54 -05:00
Phlosioneer
63e700af6c Use macros for summary windows
Other minor changes and fixes are included
2019-03-03 16:50:51 -05: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
e03595a10d Bugfixes from #591 2019-03-03 09:31:08 -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