DizzyEggg
876be1d9cd
Merge pull request #104 from thechurchofcage/beta
...
Spiky Shield
2019-03-30 11:21:27 +01: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
PikalaxALT
ae0e70d7bb
sub_80179D4 and rodata
2019-03-29 11:57:03 -04:00
PikalaxALT
7c45a7c443
port mevent_801BAAC from fire red
2019-03-28 07:32:25 -05:00
DizzyEggg
5dd653a89e
Use constants in atk89_statbuffchange
2019-03-27 07:47:01 -05:00
Marcus Huderle
af1baa89f1
Start decompiling union_room_chat.c
2019-03-26 21:58:20 -05: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
scnorton
2eba82b0fb
sub_8026634
2019-03-26 11:59:39 -04:00
Fontbane
fc69631a10
Field effects for Gen IV Abilities
...
Also added Honey (acts like White Flute for now) and made it so the Griseous Orb can't be removed from Giratina in battle.
2019-03-25 17:49:29 -04: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
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
b8a634770f
Touch up Weak Armor
2019-03-23 16:56:56 +01:00
DizzyEggg
b9052fb37d
Touch Up Justified and Rattled
2019-03-23 16:37:56 +01:00
DizzyEggg
e135ea47e5
Touch up Anger Point
2019-03-23 16:33:08 +01:00
Marcus Huderle
a5ee2c14fd
Merge remote-tracking branch 'upstream/master' into use_pokeblock
...
# Conflicts:
# include/menu_specialized.h
2019-03-23 10:14:31 -05:00
Fontbane
e8add87bf3
Document Field Effects and some related text
...
Also VAR_TRICK_HOUSE_LEVEL
2019-03-23 09:57:37 -05:00
Fontbane
7d54c2b960
EventScript and Text Documentation
...
In event_script.s. Also renamed a couple events for consistency/detail.
2019-03-23 09:57:37 -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
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
092608aef6
Add a constant for "no music" on maps.
2019-03-16 12:31:29 -05:00
Phlosioneer
8cea949e6d
Move constant and EWRAM data into C.
2019-03-15 19:33:30 -04:00
Phlosioneer
8e1537fb57
Document map name popup flag
2019-03-10 09:23:58 -05:00
Phlosioneer
13c2f91b11
Moved last contest data into C
2019-03-09 23:51:39 -05:00
Phlosioneer
0c935a8bd5
Move the contest opponent filter to C
2019-03-09 22:54:17 -05:00
Phlosioneer
a32e8e7405
Move gContestOpponents into C
...
2,400 LOC by hand.
2019-03-09 20:56:36 -05:00
Phlosioneer
0e8f94a83e
Last bit of cleanup on contest_opponents
2019-03-09 02:49:57 -05:00
Phlosioneer
153499ed6f
Clean up contest_opponents.inc
2019-03-09 01:38:38 -05:00
Phlosioneer
5b4b0a245b
Move contest winner list to C
2019-03-09 00:01:49 -05:00
Phlosioneer
88c3781880
Move text pointer tables into C
2019-03-08 22:33:40 -05:00
Phlosioneer
b7cfa9d365
Move more contest constants into C
2019-03-08 21:39:51 -05:00
DizzyEggg
c329252ce3
Add Safety Googles effect
2019-03-08 10:16:54 +01: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
DizzyEggg
f9ee31903d
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
Phlosioneer
aa7657a82a
Move constants into C
...
Also figured out what one of the graphics files is for.
2019-03-06 22:58:05 -05:00
Phlosioneer
0da83abad2
Several nonmatching functions
...
Huge and difficult.
2019-03-06 22:27:30 -05:00
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
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
