Phlosioneer
486cf449b8
Make flag names more consistent
2019-02-18 14:17:02 -05:00
Phlosioneer
fcb541189d
Rename some flags, and use map ID macros
2019-02-18 02:02:20 -05:00
Phlosioneer
93e9b9fe5d
Fix some names
2019-02-18 01:33:41 -05:00
Phlosioneer
5695617d64
Merge branch 'master' into multiplayer-stuff
2019-02-18 01:12:47 -05:00
Phlosioneer
08579edbcd
Clean up mistakes and bad formatting
2019-02-18 01:03:44 -05:00
Phlosioneer
be08a662a8
More data moved into C code
2019-02-17 23:14:14 -05:00
Phlosioneer
a4aaf279ac
Move more data into pokenav, name some strings
2019-02-17 23:14:14 -05:00
Phlosioneer
3bb4057bad
Decompiled sub_81C7764
2019-02-17 23:14:14 -05:00
DizzyEggg
a001faeced
New AI command for using priority moves in death situatiions
2019-02-16 14:54:17 +01:00
DizzyEggg
c1f9032989
Defiant and Competitive
2019-02-16 12:54:11 +01:00
Phlosioneer
e90e3458cb
Document the regi* code more
...
Fixed some confusing naming, named some unknown symbols, and fixed the
names of some flags.
2019-02-15 18:24:55 -05:00
Phlosioneer
986d3d8b2f
Finish and polish new_game.c
...
Only one function is left undocumented. I tried to go into the assembly
to at least name it, but it clears fields in the save block that aren't
even documented yet.
2019-02-15 03:40:57 -05:00
DizzyEggg
08892d19f2
Modify the stat changer, so it supports raise/lower by 12
2019-02-14 19:48:21 +01:00
DizzyEggg
94cd547e9a
Change move effect to u16
2019-02-14 13:17:27 +01:00
DizzyEggg
dc39f76a95
Spectral Thief effect
2019-02-14 12:15:53 +01:00
Phlosioneer
9e8a841bfa
Merge branch 'master' of github.com:pret/pokeemerald into main-menu-state-machine
2019-02-13 23:04:56 -05:00
Diegoisawesome
047c282763
Merge pull request #548 from Phlosioneer/intro-movie-state-machine
...
Document the intro movie state machine
2019-02-13 21:24:20 -06:00
Diegoisawesome
aa5d5fa34a
Merge pull request #550 from Phlosioneer/name-palette-return-values
...
Name the possible return values of palette fading functions
2019-02-13 20:15:47 -06:00
Diegoisawesome
dfb896356c
Merge branch 'master' of github.com:pret/pokeemerald
2019-02-12 00:40:42 -06:00
Diegoisawesome
449fb25f23
Clear up misnamed time-based flags and functions
2019-02-12 00:40:34 -06:00
Phlosioneer
d979ac3bf3
Document main_menu state machine, name window constants
...
The new names for the constants (and newly named functions) give a much
better understanding of what the window system is trying to do.
2019-02-11 00:34:50 -05:00
Phlosioneer
e75f45dbcf
Reverse engineered many of the multiplayer events
...
Some corrections to the way events are handled and identified.
2019-02-10 20:42:50 -05:00
DizzyEggg
4c535a1b03
Merge pull request #71 from thechurchofcage/partingshot
...
Parting Shot
2019-02-10 18:18:49 +01:00
DizzyEggg
b5d0253890
Merge with master
2019-02-10 18:17:33 +01:00
Phlosioneer
f2f1b1978b
Done documenting link code in overworld.c
2019-02-10 03:54:50 -05:00
Phlosioneer
3fd878483f
Start renaming symbols
...
I finally figured out what the code is trying to do. I have a foothold;
the rest should follow.
2019-02-10 00:50:46 -05:00
Phlosioneer
d0cc8dfc17
Change negative constant into unsigned hex constant
2019-02-09 22:02:56 -05:00
Phlosioneer
37bea25b01
Name the possible return values of palette fading functions
...
Also replace implicit conversion from gPalette.active into a status with
if statements, to make the return value clear.
I've also added comments when the check is redundant.
2019-02-09 21:50:12 -05:00
Phlosioneer
45297797e6
Document the intro movie state machine
...
Need to study the water droplet animation more closely before they can
be renamed; otherwise, this names every major symbol in this file.
2019-02-09 21:07:07 -05:00
Marcus Huderle
6f1d2b870c
Give proper names to dynamic map layouts
2019-02-09 09:57:30 -06:00
DizzyEggg
3d616dfffe
Add Surge Abilities
2019-02-09 14:30:16 +01:00
Marcus Huderle
40dc6833c5
Fully document tileset animations
2019-02-08 15:07:42 -06:00
Marcus Huderle
abebd2b864
Cleanup externs in overworld.c
2019-02-08 11:48:51 -06:00
Marcus Huderle
6add3e1794
Document some battle dome stuff
2019-02-08 11:08:25 -06:00
Marcus Huderle
4570e3b6a5
Document battle arena
2019-02-08 09:41:36 -06:00
Marcus Huderle
3a40f5203b
Remove old rom_818CFC8.h header
2019-02-07 17:41:44 -06:00
Marcus Huderle
85040e26fd
Document battle pike
2019-02-07 17:37:41 -06:00
DizzyEggg
aa33a61e58
Merge branch 'master' into battle_engine_v2
2019-02-07 21:17:30 +01:00
Marcus Huderle
4785a07acd
Document battle factory functions
2019-02-07 12:58:09 -06:00
Marcus Huderle
3a88ab831d
Document more battle pyramid
2019-02-07 11:51:03 -06:00
Marcus Huderle
a1ad1bad3a
Document a bunch of battle pyramid
2019-02-06 21:14:28 -06:00
Marcus Huderle
1253cbf5f6
Document some battle anim things
2019-02-06 21:14:28 -06:00
Papa Cancer
62fd90caa0
Parting Shot
...
Effect plus animation (looks like Snarl)
2019-02-05 21:47:50 +00:00
huderlem
b0ee100975
Merge pull request #543 from pret/mapdata
...
Convert map data to JSON
2019-02-04 21:36:18 -06:00
Marcus Huderle
d4125fef9b
Cleanup and add game version flag to mapjson tool
2019-02-04 17:28:45 -06:00
DizzyEggg
f415871369
Merge with master
2019-02-03 10:44:05 +01:00
Diegoisawesome
59807c0f2c
Merge pull request #536 from DizzyEggg/menu
...
Use Menu and List Menu input defines
2019-02-02 12:45:35 -06:00
Diegoisawesome
e8952c2374
Merge pull request #539 from DizzyEggg/ram_vars
...
Move ram vars in sym files to C
2019-02-02 11:17:50 -06:00
Diegoisawesome
47c105bef6
Merge pull request #538 from DizzyEggg/data
...
Dump last battle anim file
2019-02-02 11:12:29 -06:00
DizzyEggg
363fa9bed2
Clean up ram vars
2019-02-02 12:44:00 +01:00
DizzyEggg
a7f94bbeea
Dump last battle anim file
2019-02-02 11:55:11 +01:00
DizzyEggg
a740bc7190
Name action 11
2019-02-02 11:32:00 +01:00
DizzyEggg
23b240ab65
Fix Menu and List Menu input defines
2019-02-02 11:04:38 +01:00
DizzyEggg
a42bba755b
Add Crafty Shield effect
2019-02-01 14:34:16 +01:00
DizzyEggg
a3460c9e45
Code Belch effect
2019-02-01 14:17:24 +01:00
DizzyEggg
7750a8126d
CgbSound is decompiled.
2019-02-01 00:25:31 +01:00
Marcus Huderle
29d6221935
Convert map data to JSON
2019-01-31 15:51:20 -06:00
Marcus Huderle
5c1667b41a
Define layout constants
2019-01-29 16:55:25 -06:00
DizzyEggg
d46e60765d
Rename a palace battle field
2019-01-29 22:22:02 +01:00
DizzyEggg
7bc4a3b3f7
Merge with master
2019-01-29 22:12:53 +01:00
Marcus Huderle
e81838dba3
Misc. documentation and move some data into .c files
2019-01-29 14:36:02 -06:00
DizzyEggg
94d2a30d44
Merge with master
2019-01-28 20:41:46 +01:00
DizzyEggg
73d919fa0f
Define double single left right qutoation marks char
2019-01-28 19:02:34 +01:00
DizzyEggg
ad59811154
Decompile whole contest
2019-01-28 18:13:07 +01:00
Diegoisawesome
183b6857ff
Merge pull request #458 from ultima-soul/contest
...
Decompile more of contest
2019-01-27 23:08:24 -06:00
DizzyEggg
736826e863
New feature - battle 2 vs 1 opponent
2019-01-27 20:54:34 +01:00
DizzyEggg
abd518b668
Refactor GF's idiotic coding
2019-01-27 13:52:02 +01:00
DizzyEggg
88b788bfab
Fix Charge Beam effect
2019-01-27 11:57:13 +01:00
DizzyEggg
897592a8d4
Merge branch 'master' into battle_engine_v2
2019-01-27 10:58:57 +01:00
DizzyEggg
01c3f3fc05
Document all of frontier pass
2019-01-26 20:56:06 +01:00
DizzyEggg
0688725afb
Document and decompile more of frontier pass.
2019-01-26 14:50:24 +01:00
DizzyEggg
08a3533682
Start frontier pass
2019-01-25 23:32:45 +01:00
DizzyEggg
524db6068e
Merge branch 'master' into trainer_card
2019-01-22 21:59:32 +01:00
DizzyEggg
b6e5b4ee1a
trainer card diego pls
2019-01-22 21:56:57 +01:00
Diegoisawesome
900f294011
Add var const prefix for some missed var numbers
2019-01-21 22:34:01 -06:00
DizzyEggg
4e396207d3
document more of trainer card
2019-01-20 18:24:35 +01:00
DizzyEggg
576d1b3474
Document and match somne trainer card
2019-01-19 23:04:33 +01:00
shinny456
f06c0749bc
trainer_card up to sub_80C4998
2019-01-19 12:14:59 -05:00
DizzyEggg
f34ab49f63
Merge pull request #56 from SBird1337/feature/battle-engine-animpack1
...
Add some animations (see below)
2019-01-18 23:06:19 +01:00
DizzyEggg
2c3210f4d1
merge with master
2019-01-18 22:30:34 +01:00
DizzyEggg
4b420643dc
Merge branch 'master' into trainer_hill
2019-01-13 20:51:05 +01:00
DizzyEggg
edddd847c5
Document and clean up trainer hill
2019-01-13 20:50:08 +01:00
DizzyEggg
c0bc01d301
Move some vars to C
2019-01-13 13:15:23 +01:00
DizzyEggg
11a49a7f02
Decompile trainer hill
2019-01-13 12:12:27 +01:00
Karathan
832c0d6333
add toxic spike animation
2019-01-12 17:02:24 +01:00
Diegoisawesome
af2c39860d
Rename non-mapsec constants
2019-01-08 13:40:11 -06:00
ultima-soul
284751e761
Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present.
2019-01-06 13:41:18 -08:00
ultima-soul
2ca482dc24
Committing progress so far.
2019-01-06 13:38:31 -08:00
ultima-soul
76510d58bb
Matched up to sub_80DBF68, sub_80DBF90 WIP.
2019-01-06 13:32:47 -08:00
Slawter666
aeaf390706
Update constants
2019-01-05 20:12:50 +00:00
DizzyEggg
b667c20d80
Remove unused vars in battle main.c
2019-01-05 18:52:33 +01:00
DizzyEggg
78d7c29290
Move buffers to allocated reousrces, get rid of old type effectiveness table
2019-01-05 16:00:57 +01:00
DizzyEggg
4827776a3c
Merge with master
2019-01-05 10:14:20 +01:00
Marcus Huderle
95db853a78
Decompile more of contest_link_80F57C4.c
2019-01-04 20:03:29 -06:00
Philipp AUER
55202eac24
rename coords to size in struct MonCoords
2019-01-04 19:59:55 -06:00
huderlem
cba2f81bf8
Merge pull request #507 from Tetrable/master
...
Finish off labeling flags
2019-01-03 20:37:25 -06:00
Marcus Huderle
fd201f8395
Start decompiling contest_link_80F57C4.c
2019-01-03 20:35:20 -06:00
Marcus Huderle
2857f7fff9
Decompile contest_link_81D9DE4.c
2019-01-03 20:35:20 -06:00
Marcus Huderle
bc43dbab13
Decompile contest_link_81D9DE4.c
2019-01-03 20:35:20 -06:00
Tetrable
97ebeef1db
Relabel TEMP_FLAG_20 into FLAG_UNUSED_0x020
2019-01-03 18:13:16 +00:00
Tetrable
30e7ac0dca
Fix merge conflicts
2019-01-03 02:28:18 +00:00
Tetrable
50aa222aff
Corrected typos
2019-01-03 01:54:55 +00:00
Marcus Huderle
b471bba55e
Use better names for match call texts
2019-01-02 19:46:15 -06:00
Marcus Huderle
e1092028ec
Decompile match_call.c
2019-01-02 19:46:15 -06:00
Diegoisawesome
0053e61535
Merge pull request #504 from Diegoisawesome/roulette
...
Port/decompile roulette
2019-01-02 17:00:33 -06:00
Diegoisawesome
a0188aac33
Cleanup and EWRAM
2019-01-02 16:55:50 -06:00
Diegoisawesome
6202ae1df0
Extract rodata from roulette
2019-01-02 16:40:40 -06:00
Tetrable
a3ebca4d81
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Tetrable
1e3da62d24
Finish off labelling flags
2019-01-02 21:12:43 +00:00
Diegoisawesome
d28d8c850d
Up to sub_81446DC
2018-12-31 19:39:41 -06:00
Diegoisawesome
af1e44befe
Continue porting roulette
2018-12-31 18:07:29 -06:00
Marcus Huderle
a0ff38d0be
Fix build
2018-12-31 16:53:38 -06:00
Marcus Huderle
05b1d2ea94
Document field_tasks.c
2018-12-31 16:53:38 -06:00
Marcus Huderle
b6ee970e7a
Minor berry.c cleanup
2018-12-31 16:53:38 -06:00
Marcus Huderle
fb2d1591c1
Document more battle anim effects
2018-12-31 16:53:38 -06:00
Diegoisawesome
439fa13e94
Start porting/decompiling roulette
2018-12-31 16:09:45 -06:00
Diegoisawesome
530a20354c
Merge pull request #500 from Deokishisu/patch-1
...
Consolidate unused escapeRope MapHeader field into filler_18 field
2018-12-31 11:55:33 -06:00
Diegoisawesome
d004ce065c
Merge branch 'master' of github.com:pret/pokeemerald into trade
2018-12-31 02:30:30 -06:00
Diegoisawesome
ec780bb209
Cleanup and documentation
2018-12-31 02:22:21 -06:00
Diegoisawesome
c5c6e437ec
Document, cleanup, extract data from trade
2018-12-31 01:23:27 -06:00
Deokishisu
447fec26dc
Consolidate unused escapeRope MapHeader field into filler_18 field
2018-12-30 19:59:57 -05:00
Marcus Huderle
58f130d007
Document some battle anims and helpers
2018-12-30 11:04:17 -06:00
Diegoisawesome
2fb9f490fb
Almost done with trade
2018-12-29 12:46:15 -06:00
Melody
dc6c0ed17e
add event object var references
2018-12-29 11:56:53 -06:00
DizzyEggg
75b4e9ac70
compile contest
2018-12-29 11:48:28 -06:00
DizzyEggg
55e44b0951
a bit more of contest painting effect
2018-12-29 11:48:28 -06:00
Marcus Huderle
d0d870e193
Cleanup formatting
2018-12-29 11:36:54 -06:00
Marcus Huderle
6e7bdb3ca4
Document misc field_specials things
2018-12-29 11:36:54 -06:00
Marcus Huderle
67636b7c64
Document deoxys rock
2018-12-29 11:36:54 -06:00
Marcus Huderle
95dcff581b
Document some fieldmap stuff
2018-12-29 11:36:54 -06:00
DizzyEggg
27b1d74dad
Merge branch 'master' into battle_engine_v2
2018-12-29 15:11:54 +01:00
Diegoisawesome
f30270dffe
Undo bad idea with BLDALPHA_BLEND macro
2018-12-28 12:56:06 -06:00
Melody
6d556f8cf7
improve checkplayergender calls
...
clean up constant definitions
make tweaks from review
2018-12-28 08:22:21 -06:00
Diegoisawesome
9cad5e8197
Big switch mofo
2018-12-28 02:11:41 -06:00
Marcus Huderle
d59f5a8e56
Misc overworld documentation
2018-12-27 16:52:13 -06:00
Diegoisawesome
5691a67629
Up to sub_807B62C
2018-12-27 02:05:09 -06:00
DizzyEggg
6411d1d693
Merge pull request #55 from huderlem/anims
...
Some battle anims
2018-12-26 17:48:03 +01:00
DizzyEggg
517573eb4b
Update with master
2018-12-26 17:46:51 +01:00
DizzyEggg
7f6f6c33ab
Fix BgAttributes
2018-12-26 13:05:02 +01:00
Diegoisawesome
d8948a5cda
Merge remote-tracking branch 'pret/master' into trade
2018-12-25 15:03:13 -06:00
melthelesbian
2dd706ca54
use max mon moves constant where able ( #480 )
...
* use max mon moves constant where able
* fix errors in script commands file
* fix more errors
2018-12-25 11:50:15 -06:00
Marcus Huderle
dcbc8db6a3
Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)
2018-12-25 11:46:35 -06:00
DizzyEggg
49517aca9e
make it compie hopefully
2018-12-24 22:19:40 +01:00
DizzyEggg
e230afd543
Merge branch 'master' into learn
2018-12-24 22:01:52 +01:00
DizzyEggg
442b1826a2
asm party and fldeff clean-up
2018-12-24 21:59:05 +01:00
Marcus Huderle
c2fdbb0ef7
Decompile psychic.c
2018-12-24 10:52:56 -06:00
Marcus Huderle
f1213ebb4b
Decompile dark.c
2018-12-24 09:55:00 -06:00
Diegoisawesome
3f08e0c76c
Some more trade nonsense
2018-12-24 03:03:02 -06:00
DizzyEggg
6fa5f33519
Merge branch 'master' into battle_engine_v2
2018-12-24 09:07:18 +01:00
Marcus Huderle
c17f7d73fa
Merge remote-tracking branch 'origin/battle_engine_v2' into features
...
# Conflicts:
# ld_script.txt
# src/effects_1.c
2018-12-23 17:24:14 -06:00
DizzyEggg
72aa9eb5a9
clear headers more
2018-12-24 00:20:38 +01:00
DizzyEggg
9320fe8f85
Clear includes
2018-12-24 00:02:29 +01:00
DizzyEggg
bd817d70d6
Refactor battle intro, allow to speed it up
2018-12-23 18:47:00 +01:00
DizzyEggg
efa820469a
move data to c
2018-12-23 14:52:47 +01:00
DizzyEggg
c23b1acc5e
Merge with master
2018-12-23 10:26:58 +01:00
Diegoisawesome
a5c09bfec6
S'more trade
2018-12-23 01:26:38 -06:00
DizzyEggg
ef55bdac89
Merge branch 'master' into battle_engine_v2
2018-12-22 23:57:42 +01:00
DizzyEggg
adb4927504
Merge with master
2018-12-22 23:30:41 +01:00
Diegoisawesome
ebbe826133
Merge pull request #437 from DizzyEggg/storage
...
Pokemon Storage System
2018-12-22 16:12:27 -06:00
DizzyEggg
c805bab483
Storage - review changes
2018-12-22 23:00:22 +01:00
DizzyEggg
53b9d4a224
Dont clear AI flags on move choose. Will come in handy in smart ai switch logic
2018-12-22 20:57:12 +01:00
DizzyEggg
6dffa6d17c
Match and clean up fldeff misc
2018-12-22 19:33:45 +01:00
DizzyEggg
f7a7ddde0c
Fix Quick Guard
2018-12-22 15:10:24 +01:00
DizzyEggg
0748069705
Merge pull request #53 from ultima-soul/battle_engine
...
Added new battle items.
2018-12-22 13:54:19 +01:00
DizzyEggg
e54dd6a02b
Merge with master
2018-12-22 13:53:07 +01:00
Diegoisawesome
052d458f48
sub_80796B4 is a pain
2018-12-21 12:20:28 -06:00
DizzyEggg
ecee02816d
Merge with master
2018-12-20 22:53:08 +01:00
golem galvanize
64832ff67e
start ice
2018-12-20 16:20:34 -05:00
DizzyEggg
7dcb614cca
PSS is done
2018-12-20 22:14:36 +01:00
Marcus Huderle
ecda59a406
Add Poison Jab animation
2018-12-20 11:58:21 -06:00
Marcus Huderle
0369780db9
Add Rock Polish animation
2018-12-20 10:18:17 -06:00
Diegoisawesome
6ef9671718
Merge pull request #440 from garakmon/fldeff
...
Decompile / port fldeff_80F9BCC
2018-12-19 22:16:59 -06:00
garak
5eac3ce1a2
rename fldeff_misc
2018-12-19 22:19:54 -05:00
Marcus Huderle
b7ce383a96
Document a bunch of battle anims
2018-12-19 21:19:44 -06:00
Diegoisawesome
48d7c0a7a3
Merge pull request #454 from golemgalvanize/decompile_party_menu
...
Decompile party menu
2018-12-19 19:57:31 -06:00
Diegoisawesome
5b73fe138c
Merge pull request #457 from golemgalvanize/decompile_water
...
Decompile water
2018-12-19 19:16:40 -06:00
DizzyEggg
128239d65e
Almost there
2018-12-19 22:47:27 +01:00
Melody
5e6ceeb631
update applymovement to remove magic numbers
2018-12-19 14:08:01 -05:00
golem galvanize
cd785011fe
decompiled water
2018-12-19 10:31:37 -05:00
Diegoisawesome
bd7c251859
Fix compressed palette alignment
2018-12-18 20:15:59 -06:00
Diegoisawesome
2592803460
Merge branch 'master' of github.com:pret/pokeemerald into trade
2018-12-18 19:54:27 -06:00
Diegoisawesome
cd994f4935
Begin trade.c
2018-12-18 19:29:41 -06:00
Marcus Huderle
b2ac3b6d6f
Decompile most of battle_anim_effects_3.c
2018-12-18 19:15:59 -06:00
golem galvanize
8781d969ff
finish party_menu
2018-12-18 05:38:08 -05:00
golem galvanize
c259ee46d3
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
2018-12-18 05:31:39 -05:00
Marcus Huderle
c74468fd11
Document a bunch of battle anim stuff
2018-12-17 22:16:17 -06:00
Marcus Huderle
c04ce0ee64
Decompile battle_anim_effects_2.c
2018-12-17 22:16:17 -06:00
DizzyEggg
9ffd0c7382
3.5 asm left
2018-12-17 23:00:08 +01:00
golem galvanize
076d07f6fe
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
2018-12-17 02:40:30 -05:00
golem galvanize
71a7a8a075
decompiled up to sub_81B8A7C
2018-12-17 02:39:17 -05:00
shinny456
60484153a5
decompile electric.s
2018-12-16 22:23:05 -05:00
garak
e292d0ca83
Merge branch 'master' into fldeff
2018-12-16 20:05:31 -05:00
DizzyEggg
aae36b5653
6k left
2018-12-16 21:10:01 +01:00
Marcus Huderle
d1e6e705cc
Decompile battle_anim_effects_1.c
2018-12-16 11:39:22 -06:00
Marcus Huderle
fb9a365dc6
Merge pull request #448 from Meowsy/pokedex-documentation
...
Pokedex Documentation
2018-12-15 18:06:42 -06:00
DizzyEggg
f1421d94c3
Up to sub 0x80ce580
2018-12-15 23:58:47 +01:00
Meowsy
bc11a4a9f4
Document various things relating to the Pokedex.
2018-12-15 15:12:28 -05:00
Marcus Huderle
1ca3656d74
Decompile contest_painting.c ( #447 )
2018-12-15 13:07:07 -06:00
Slawter666
2fa0555ed5
Document some of item_menu.c
2018-12-15 18:08:13 +00:00
Marcus Huderle
5e92481f51
Merge pull request #443 from Meowsy/misc-renamings
...
Misc renamings.
2018-12-13 21:35:36 -06:00