ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-06 01:23:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,899 Commits 1 Branch 0 Tags 235 MiB
d66b9022a6
Commit Graph

2122 Commits

Author SHA1 Message Date
Marcus Huderle
1241700b20 Finish documenting the other weather effects 2019-04-02 18:28:56 -05:00
DizzyEggg
d8c9f1b30f Rows and columns 2019-04-02 16:28:38 -05:00
DizzyEggg
baa187665b Document a bit of script menu and battle anims 2019-04-02 16:28:38 -05:00
Phlosioneer
9f44ebc5cd Automatically calculate REMATCH_TABLE_ENTRIES 
Uses the standard C way of calculating the length of an enum.
 2019-04-02 07:28:30 -05:00
Phlosioneer
6916f09cd5 Expand MatchCallStruct defs, use REMATCH_* enum 2019-04-02 07:28:30 -05:00
DizzyEggg
5c44f44ad2 Organize new battle anim gfx 2019-04-02 12:26:24 +02:00
DizzyEggg
cd3de7821e Merge branch 'master' into battle_engine_v2 2019-04-02 08:37:54 +02:00
Phlosioneer
c3200c0beb Cleanup some of gContestResources 2019-04-02 00:35:57 -04:00
PikalaxALT
7571969a45 Finish union room battle 2019-04-01 22:08:50 -05:00
PikalaxALT
4be97b2dc6 through sub_801A960 2019-04-01 22:08:50 -05:00
Phlosioneer
845307b3a6 Rename contest AI stuff 2019-04-01 22:16:07 -04:00
Marcus Huderle
35505c7f5b Document somre more weather effects 2019-04-01 20:04:23 -05:00
Phlosioneer
c429e6d69c Move gPlayerFacingPosition out of sym_ewram.txt (#617) 
* Move gPlayerFacingPosition out of sym_ewram.txt

* Fix tabs in sym_ewram.txt

* Remove redundant faraway island extern
 2019-04-01 19:30:41 -05:00
DizzyEggg
d39b5f6d26 Fix messing with move result flags when not needed 2019-04-02 00:14:01 +02:00
Papa Cancer
c9ad96d228 Stomping Tantrum 
Uses timer in gBattleStruct to count time since last failed move. This is augmented by a MOVE_FAILED result in atk_49 and decreased with an ENDTURN case. EFFECT_STOMPING_TANTRUM doubles  base power if the timer is set.
 2019-04-01 20:06:45 +01:00
PikalaxALT
9f1d1219ce create header and fix prototypes 2019-04-01 14:20:34 -04:00
PikalaxALT
ce89cf6f75 through sub_801A3D0 2019-04-01 14:09:56 -04:00
PikalaxALT
1fe5208560 through sub_801A02C 2019-04-01 12:05:58 -04:00
huderlem
1e8e5af033
Merge pull request #607 from Phlosioneer/contest-data 
Contest data
 2019-04-01 07:37:15 -05:00
huderlem
bee1d1cbb0
Merge pull request #611 from Phlosioneer/pokedex-area-const-array 
Document sAreaGlowTilemapMapping
 2019-04-01 07:33:33 -05:00
DizzyEggg
944dc4f6bf Merge with master 2019-04-01 13:40:42 +02:00
DizzyEggg
62192b86f7 Aroma Veil 2019-04-01 11:42:37 +02:00
Marcus Huderle
099ea89b77 Document rain weather effect 2019-03-31 21:09:30 -05:00
Phlosioneer
cd069446e0 Merge branch 'master' into pokedex-area-const-array 2019-03-31 20:43:42 -04:00
Phlosioneer
3181c64c64 Change names from MAP_AREA_ to MAP_GROUP_ 2019-03-31 20:40:14 -04:00
Phlosioneer
37c7441a15 Merge branch 'master' into contest-data 2019-03-31 20:22:47 -04:00
Phlosioneer
23ac2cc94e Prep for merge 2019-03-31 20:15:44 -04:00
Phlosioneer
207a54393c Fix mistakes and use EVENT_OBJ_GFX_* macros 2019-03-31 20:07:24 -04:00
PikalaxALT
ade0183378 Document mystery_gift 2019-03-31 18:59:52 -04:00
PikalaxALT
0a8427c8ef fakematching task00_mystery_gift 2019-03-31 15:43:51 -05:00
PikalaxALT
90fb329b70 through task_add_00_mystery_gift 2019-03-31 15:43:51 -05:00
PikalaxALT
fb5c19a33b through mevent_message 2019-03-31 15:43:51 -05:00
PikalaxALT
813de11154 Through mevent_save_game 2019-03-31 15:43:51 -05:00
PikalaxALT
f88f815cff WIP sub_8018DAC 2019-03-31 15:43:51 -05:00
PikalaxALT
aafe9df454 through sub_8018798 2019-03-31 15:43:51 -05:00
PikalaxALT
f34cda3b52 Start decompiling mystery gift 2019-03-31 15:43:51 -05:00
DizzyEggg
e878de782e
Merge pull request #114 from thechurchofcage/gamma 
Misc. move updates
 2019-03-31 22:08:14 +02:00
DizzyEggg
6f9096c613 Add Sweet Veil 2019-03-31 22:02:39 +02:00
DizzyEggg
b12334c88b Remove cases from ABE, add functionality of Flower Veil 2019-03-31 21:38:58 +02:00
Marcus Huderle
d13563b174 Document some faraway_island code 2019-03-31 14:09:40 -05:00
Papa Cancer
1d5cf3acb5 Misc. move updates 
Bind: 75% Acc -> 85% Acc
Disable: 55% Acc. -> 100% Acc.
Freeze-Dry: 10% chance to freeze
Hammer Arm and Ice Hammer: lower user's speed
High Jump Kick: 130BP, 10 PP
Jump Kick: 100BP, 10 PP
Tail Glow: raises Sp. Atk by 3 stages
Waterfall: 20% chance to flinch
 2019-03-31 18:25:37 +01:00
Marcus Huderle
462b196abc Give battle_anim files appropriate names 2019-03-31 12:15:39 -05:00
Papa Cancer
ebe2dc6bbb Mat Block 
Nothing more needs to be said
 2019-03-31 17:17:13 +01:00
Marcus Huderle
500d009b5c Start decompiling berry_crush.c 2019-03-31 09:13:19 -05:00
huderlem
b9bf3bf072
Merge pull request #637 from DizzyEggg/pokeblock_attempt 
Use Pokeblock clean-up and some menu_specialised decomp
 2019-03-31 08:39:18 -05:00
DizzyEggg
d90767c490 Switch effect and argument fields in BattleMove struct 2019-03-31 15:24:46 +02:00
DizzyEggg
17e74756cb Merge with master, add defines to atk49 and statbuffchange commands 2019-03-31 15:19:25 +02:00
DizzyEggg
e3c07c83f2 More work on use pokeblock 2019-03-31 14:32:26 +02:00
DizzyEggg
aa7f69f067 Begin use pokeblock and menu specialised 2019-03-31 12:59:01 +02:00
PikalaxALT
ccac4694cd Merge branch 'master' into continue_union_room 2019-03-30 12:41:10 -04:00
DizzyEggg
35cffea987 Helpful macros for atk49 2019-03-30 08:29:56 -05:00
PikalaxALT
2f57d6bc0f sub_8018220 2019-03-30 09:18:58 -04:00
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
Marcus Huderle
a978a6a624 Finish decompiling union_room_chat.c 2019-03-29 21:26:08 -05:00
PikalaxALT
2e588fd4d7 through sub_80181DC 2019-03-29 22:22:26 -04:00
PikalaxALT
8fc51b0459 through sub_8017CB0 2019-03-29 15:50:04 -04:00
Marcus Huderle
519426f4e6 Decompile union_room_chat through sub_8020118 2019-03-28 20:20:52 -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
PikalaxALT
8e0773675c through sub_8017168 2019-03-27 13:16:10 -04:00
PikalaxALT
9a8b001ebf through sub_801704C 2019-03-27 10:44:49 -04: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
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
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
scnorton
e3a11bc3ca through sub_80259FC 2019-03-25 15:26:23 -04:00
PikalaxALT
d4cca4ffa2 through sub_8024F38 2019-03-24 22:56:16 -04:00
PikalaxALT
d49d3b6858 through sub_8024E38 2019-03-24 21:17:25 -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
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
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
8cea949e6d Move constant and EWRAM data into C. 2019-03-15 19:33:30 -04: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
LOuroboros
7dc39298d6 Added a new hold effect for the Gen. 5 gems. 2019-03-06 15:29:00 -03:00
LOuroboros
36421d81eb Reordered the Item IDs a little bit, in order to include battle items like the Gen. 5 Gems and the Gen. 7 Seeds. 2019-03-06 15:07:25 -03: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
DizzyEggg
b150091436 Rename an erroneously named battlescript 2019-03-05 17:06:29 +01:00
Phlosioneer
9bea9e1624 Start decompiling menu_unknown 2019-03-05 06:06:20 -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
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
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
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
5dd7ab98d1
Merge pull request #99 from LOuroboros/battle_engine_v2 
Various Things
 2019-03-02 22:42:50 +01: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
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
Phlosioneer
25050b9944 Fix tabs, do suggested rename 2019-03-02 04:13:27 -05:00
Phlosioneer
49bef25856 Clean up the last extern functions 2019-03-02 03:18:08 -05:00
Phlosioneer
ee69426838 Eliminate more externs 2019-03-02 02:44:02 -05:00
Phlosioneer
3ceb1667c9 Reduce externs 2019-03-01 22:32:50 -05: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
eea162d3d8 Effect Spore ability pop-up 2019-03-01 13:59:08 +01:00
DizzyEggg
201b68413d
Merge pull request #92 from LOuroboros/fileformat 
Implemented the sprites for the Gen. 4 and 5 items.
 2019-03-01 13:40:23 +01:00
DizzyEggg
bfe95bc4b9 Merge branch 'master' into battle_engine_v2 2019-03-01 13:29:50 +01:00
Phlosioneer
a7e5852f1d More minor fixes 2019-03-01 01:49:11 -05:00
Phlosioneer
459fd93b59 Fix minor errors 2019-03-01 01:18:58 -05: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
hondew
9ed0f77528 fixed issues in data and include dirs 2019-02-28 21:21:56 -06:00
hondew
6a4202cdbd tidied lucky flags 2019-02-28 21:21:56 -06:00
hondew
1dc0d346d9 fix spelling error 2019-02-28 21:21:56 -06:00
hondew
dd8ecabe26 fix mistakes and bad formatting 2019-02-28 21:21:56 -06:00
hondew
f965f1b13d label luckyFlags 2019-02-28 21:21:56 -06:00
hondew
67fe781ed2 clean up slot machine until AwardPayout 2019-02-28 21:21:56 -06:00
hondew
5c8cc5225f document slot machine 2019-02-28 21:21:56 -06:00
LOuroboros
9564de6edb Implemented the sprites for the Gen. 4 and 5 items. 2019-03-01 00:06:31 -03:00
DizzyEggg
cebada80d0 Merge with master 2019-02-28 20:56:52 +01:00
Phlosioneer
99bfd8c80f VAR_0x3F20 is not a var 2019-02-28 00:10:44 -05:00
Phlosioneer
373d73eb3b Fix last special var 2019-02-28 00:06:27 -05:00
Phlosioneer
bf45b83c65 Finish documenting event vars 2019-02-27 23:54:51 -05:00
Phlosioneer
782979f1fc Finish documenting trainer hill 
Trainer hill isn't anywhere close to done, but I figured out enough
to name the VAR. That's all this PR should do.
 2019-02-27 22:16:01 -05:00
Phlosioneer
66f0616a2d I guess I'm documenting Trainer Hill now 2019-02-27 21:31:05 -05:00
Phlosioneer
e77e7844ea Name several vars, document some related events 2019-02-27 20:25:09 -05:00
Phlosioneer
648fc3d4f3 Name more unknown vars 2019-02-27 15:18:56 -05:00
Phlosioneer
4137dd7b0b Identify unused, never read, and never written vars 2019-02-27 14:42:32 -05:00
Marcus Huderle
4b9e93850c Document easy chat screen types 2019-02-27 12:55:29 -06:00
Phlosioneer
c1348d22f3 Name most event scripts related to unusual weather 2019-02-27 04:27:54 -05:00
Phlosioneer
fe55580fe1 Reverse engineer unusual weather events 2019-02-27 03:42:04 -05:00
Phlosioneer
72bb0daccb Merge branch 'master' into main-menu-state-machine 2019-02-26 22:34:42 -05:00
Phlosioneer
6cb4c677cd Fix backwards names 2019-02-26 22:30:40 -05:00
Phlosioneer
3a44b090d1 Merge branch 'master' into multiplayer-stuff 2019-02-26 22:07:29 -05:00
Phlosioneer
accea672f1 Incorporate feedback 2019-02-26 22:04:44 -05:00
Marcus Huderle
231355f84d Decompile easy_chat data 2019-02-26 14:50:02 -06:00
Marcus Huderle
b60611c38e Finish decompiling easy_chat.c code 2019-02-26 14:50:02 -06:00
huderlem
153f134318
Merge pull request #583 from huderlem/easy_chat 
Decompile more easy_chat.c
 2019-02-25 14:12:18 -06:00
Marcus Huderle
7ea05431a5 Decompile more easy_chat.c 2019-02-25 14:11:31 -06:00
DizzyEggg
df9e6a6889 Free up two status3 flags 2019-02-25 16:17:23 +01:00
huderlem
d77ba3d413
Merge pull request #581 from arantonitis/pokemon_summary 
Documented/polished pokemon_summary_screen.c
 2019-02-25 08:09:14 -06:00
huderlem
b3a7a1278a
Merge pull request #577 from Phlosioneer/weather-15 
Document the weather state functions
 2019-02-25 08:03:22 -06:00
huderlem
84573f1774
Merge pull request #574 from Phlosioneer/event-vars 
Event vars
 2019-02-25 08:02:28 -06:00
Phlosioneer
5f7a971313 Source file part of map script renaming 2019-02-25 08:01:22 -06:00
Phlosioneer
1cd5cb09cf Merge branch 'master' into weather-15 2019-02-25 02:30:35 -05:00
Phlosioneer
e1b2460748 Adjust formatting, rename function 2019-02-25 02:28:41 -05:00
Phlosioneer
4e5fae0086 Merge branch 'master' into event-vars 2019-02-25 02:24:20 -05:00
Phlosioneer
87859a655b Fix flag formatting for fun 2019-02-25 02:20:38 -05:00
DizzyEggg
da33c38183
Merge pull request #78 from thechurchofcage/beta 
Gravity fix
 2019-02-24 19:38:42 +01:00
Papa Cancer
d704b9cd5b Gravity fix 
Brings down Pokémon in the middle of a two-turn flying move (only Bounce and Fly at the moment); says the appropriate message for all mons brought to the ground via Gravity
 2019-02-24 13:28:24 +00:00
Ariel Antonitis
74a3c06270 Documented/polished pokemon_summary_screen.c 
Mostly variables mislabeled as global and some formerly unknown stuff.
 2019-02-23 21:12:35 -05:00
Diegoisawesome
7995cf5b61
Merge pull request #578 from DizzyEggg/pokenav 
pokenav
 2019-02-23 16:04:59 -06:00
DizzyEggg
842e379a7b Merge branch 'master' into battle_engine_v2 2019-02-23 22:50:46 +01:00