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
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
408485263d
Minor ability fixes
...
Status moves that target both opponents will trigger a mon with Clear Body, White Smoke, Hyper Cutter etc. to prevent the loss of stats, but if its partner is targeted first, that partner gets the popup: https://drive.google.com/open?id=1dtTfgxvppD4s2ZL5scPDz9YDf4n7AhMW
This fixes that.
2019-03-26 01:34:39 +00:00
Fontbane
2cfa5ea326
Fixed Honey
...
And updated gitignore
2019-03-25 19:00:46 -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
AJ Fontaine
cf0e38b11f
Can't Knock Griseous Orb Off Giratina
...
I'll do Plates Drives and Memories later
2019-03-24 22:33:54 -04:00
Marcus Huderle
d7a9fcb975
Cleanup mevent2
2019-03-24 18:29:00 -05:00
Marcus Huderle
e6caf0ff10
Port mevent2.c from pokefirered
2019-03-24 18:29:00 -05:00
ultima-soul
552c032f5c
Match sub_8166A34
2019-03-24 15:34:49 -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
Marcus Huderle
4fd2b0b484
Decompile remaining functions in use_pokeblock.s
2019-03-23 17:23:14 -05:00
Wyrserth
6566a49beb
Use constants for naming screen's pages.
2019-03-23 21:52:58 +01:00
Marcus Huderle
24e7269117
Match sub_81674BC
2019-03-23 11:22:41 -05:00
DizzyEggg
7018745230
Fix Defiant stat raise by allies
2019-03-23 17:21:14 +01:00
Marcus Huderle
fffdbe4e79
Match sub_8167420
2019-03-23 11:16:53 -05:00
DizzyEggg
d1fb5fa148
Remove unnecessary condition from Cursed Body
2019-03-23 16:59:58 +01:00
DizzyEggg
b8a634770f
Touch up Weak Armor
2019-03-23 16:56:56 +01:00
Marcus Huderle
511ff2f20f
Match sub_8166BEC and do some cleanup
2019-03-23 10:41:09 -05: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
Marcus Huderle
91fa5faf4a
Match sub_8166564
2019-03-23 10:10:51 -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
DizzyEggg
cbdecf2f8d
Make it compile
2019-03-23 09:51:27 -05:00
DizzyEggg
77c4856e62
Nonmatchings go away
2019-03-23 09:51:27 -05: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
Marcus Huderle
4ae8a52473
Finish decompiling contest_painting_effects.c
2019-03-17 16:25:18 -05:00
Phlosioneer
f4737874ef
Made a new substruct for the substruct
...
We must go deeper.
2019-03-16 22:10:07 -04:00
Phlosioneer
691392fd5d
Clean up intro_credits_graphics constants
2019-03-16 12:37:04 -05:00
Phlosioneer
a029254faa
Apply new macros to intro graphics struct
2019-03-16 12:37:04 -05:00
Phlosioneer
eeb329909c
Fix anonymous struct
2019-03-16 12:37:04 -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
291df27dcb
Use new MUS_NONE constant in sound.c
2019-03-16 12:31:29 -05:00
Phlosioneer
703554c4df
Ranges are magic
2019-03-16 12:25:02 -05:00
Phlosioneer
61344a4fee
Document the water droplet data.
2019-03-16 12:25:02 -05:00
garak
d0115db565
move pokemon graphics to mon-specific directories
2019-03-16 12:21:47 -05:00
garak
14211fb495
fix incbin paths
2019-03-16 12:21:47 -05:00
Phlosioneer
bdc6ed1a98
Decompiled two difficult functions
...
Had do use a lot of `asm` directives for sub_81C8A28 to match.
2019-03-16 00:34:11 -04:00
Phlosioneer
8cea949e6d
Move constant and EWRAM data into C.
2019-03-15 19:33:30 -04:00
