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
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
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
DizzyEggg
7018745230
Fix Defiant stat raise by allies
2019-03-23 17:21:14 +01:00
Marcus Huderle
511ff2f20f
Match sub_8166BEC and do some cleanup
2019-03-23 10:41:09 -05: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
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
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
7f70b629f5
Document sAreaGlowTilemapMapping
...
I used a script to generate the format for the array, so I can easily
change its formatting if needed.
2019-03-12 05:35:15 -04:00
Phlosioneer
8e1537fb57
Document map name popup flag
2019-03-10 09:23:58 -05:00
Phlosioneer
0c935a8bd5
Move the contest opponent filter to C
2019-03-09 22:54:17 -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
b7cfa9d365
Move more contest constants into C
2019-03-08 21:39:51 -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
