DizzyEggg
17e74756cb
Merge with master, add defines to atk49 and statbuffchange commands
2019-03-31 15:19:25 +02:00
DizzyEggg
35cffea987
Helpful macros for atk49
2019-03-30 08:29:56 -05: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
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
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
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
Marcus Huderle
e6caf0ff10
Port mevent2.c from pokefirered
2019-03-24 18:29:00 -05: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
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
72bb0daccb
Merge branch 'master' into main-menu-state-machine
2019-02-26 22:34:42 -05:00