DizzyEggg
666e2ac584
Fix allowing the player to run from wild double battles
2019-03-06 12:13:37 +01: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
DizzyEggg
bf0c45d4b0
Merge pull request #86 from thechurchofcage/beta
...
All terrain effects added
2019-03-05 21:21:43 +01:00
Diegoisawesome
0081474018
Merge pull request #606 from DizzyEggg/angery
...
Fix Controllers end command function names
2019-03-05 14:17:44 -06: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
e79b6f747b
Fix Controllers end command function names
2019-03-05 20:07:59 +01:00
Diegoisawesome
842e3c8b42
Merge pull request #605 from DizzyEggg/rename
...
Rename an erroneously named battlescript
2019-03-05 10:41:30 -06:00
Diegoisawesome
fd4a0c499d
Merge pull request #604 from DizzyEggg/flying
...
Clean up flying.c
2019-03-05 10:41:15 -06:00
DizzyEggg
596d85bcbd
What is love, baby dont hurt me
2019-03-05 17:07:37 +01:00
DizzyEggg
b150091436
Rename an erroneously named battlescript
2019-03-05 17:06:29 +01:00
DizzyEggg
b9c216638c
try flying
2019-03-05 16:52:40 +01:00
Phlosioneer
9bea9e1624
Start decompiling menu_unknown
2019-03-05 06:06:20 -05:00
DizzyEggg
3507ac3974
Start fixing flying.c
2019-03-05 09:02:05 +01:00
Diegoisawesome
cb2922e7d7
Merge pull request #603 from Phlosioneer/makefile-map-fix
...
Fix make to look for .json files instead of folders
2019-03-05 01:15:40 -06:00
Phlosioneer
18902219ad
Fix make to look for .json files instead of folders
...
Currently, when Make is building the maps, it considers every
folder in the data/maps/ directory as a map that needs to be built,
even folders that are empty. This can be a problem when modding on
a separate branch, because git doesn't always clean up directories
when switching branches (usually because of hidden files in those
directories), so switching back to an unmodded branch will leave
an empty folder that confuses make.
This commit changes the makefile so that it only checks directories
that have map.json files in them.
2019-03-05 01:46:20 -05:00
Diegoisawesome
deb555310d
Merge pull request #602 from garakmon/fly
...
match sub_810EE14 in flying.c
2019-03-04 23:37:57 -06: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
Phlosioneer
ac7a048380
Removed PREV and NEXT macros, changed summary name
2019-03-04 00:25:07 -05:00
Phlosioneer
05199f8fc7
Fix merge issue
2019-03-03 22:27:57 -05:00
garak
1758eb99df
match sub_810EE14 in flying.c
2019-03-03 22:08:58 -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
f378a5a316
Fix symbol overcounting, add partial symbols
2019-03-03 15:02:26 -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
e03595a10d
Bugfixes from #591
2019-03-03 09:31:08 -06:00
huderlem
c9d2fcabef
Merge pull request #553 from Phlosioneer/main-menu-state-machine
...
Document main_menu state machine, name window constants
2019-03-03 09:28:35 -06:00
Phlosioneer
27aa27a2e9
Fix tabs
2019-03-03 02:58:50 -05: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
Phlosioneer
3716da5430
Rename macro with correct name for pixel values
2019-03-02 17:25:39 -05:00
Phlosioneer
80a4ee1145
Remove water.h and flying.h
2019-03-02 17:23:10 -05:00
DizzyEggg
5c3d755ac6
Effect Spore not affected by overcoat
2019-03-02 22:48:55 +01:00
DizzyEggg
5dd7ab98d1
Merge pull request #99 from LOuroboros/battle_engine_v2
...
Various Things
2019-03-02 22:42:50 +01:00
LOuroboros
6332023267
Oops. NOW I fixed the 2nd typo.
2019-03-02 12:59:38 -03:00
LOuroboros
5c1cf3063f
Implemented the sprites for the Gen. 6 items.
2019-03-02 12:42:53 -03:00
LOuroboros
e15c745cf5
Fixed 2 typos. Loppunite>Lopunnite and Loppunny>Lopunny.
2019-03-02 12:35:11 -03:00
LOuroboros
07f9bcad10
Swapped Keystone with Mega Bracelet.
2019-03-02 12:31:43 -03:00
DizzyEggg
043071ae12
Don't extern gMoveNames
2019-03-02 08:25:14 -06: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
bf70861798
Powder moves on grass types
2019-03-02 13:08:50 +01:00
DizzyEggg
8e9296a42b
Fix team messages
2019-03-02 12:31:07 +01:00
DizzyEggg
159d1089a7
Crunch lowers Defense
2019-03-02 12:17:41 +01:00
DizzyEggg
c9c38024e3
Fix move reminder
2019-03-02 12:13:09 +01:00
