ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 13:45:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,227 Commits 1 Branch 0 Tags 235 MiB
a646c3311b
Commit Graph

2593 Commits

Author SHA1 Message Date
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
bf4c1a73c0 Start moving pokenav data into C files 
The types and usage of many of the globals are now known.
 2019-02-17 23:14:14 -05:00
Marcus Huderle
19b76bffda Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields 2019-02-16 16:56:41 -06:00
garak
0b1bb9e4e9 use strings for map json coord_event var_value 2019-02-16 16:14:43 -06:00
DizzyEggg
9bc55246bc AI handle Belch 2019-02-16 18:23:56 +01: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
DizzyEggg
c0f47d67aa
Merge pull request #72 from PALPATlNE/battle_engine_work 
Mud bomb and Shadow Sneak Animations
 2019-02-15 22:50:07 +01: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
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
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
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
PALPATlNE
136f767f1f Replaced tab spaces with 4 spaces 2019-02-10 19:30:00 +01: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
Papa Cancer
dd34272620
Parting Shot v3 2019-02-09 17:40:04 +00:00
Papa Cancer
a1be618c47
Parting Shot v2 
With DizzyEgg's amendment
 2019-02-09 16:05:59 +00:00
Marcus Huderle
6f1d2b870c Give proper names to dynamic map layouts 2019-02-09 09:57:30 -06:00
DizzyEggg
10536196f9 AI edge case with atk up 2019-02-09 16:45:02 +01:00
DizzyEggg
3d616dfffe Add Surge Abilities 2019-02-09 14:30:16 +01:00
DizzyEggg
691544fa0b AI takes split into account, debug view ai move points 2019-02-09 13:21:32 +01:00
DizzyEggg
413cf4f0ae
Merge pull request #68 from Fontbane/patch-2 
AI uses Swagger on allies with Own Tempo
 2019-02-09 12:35:52 +01:00
Marcus Huderle
40dc6833c5 Fully document tileset animations 2019-02-08 15:07:42 -06:00
Marcus Huderle
6add3e1794 Document some battle dome stuff 2019-02-08 11:08:25 -06:00
PALPATlNE
e7f8186ccc Mud bomb and Shadow Sneak Animations 2019-02-08 03:13:36 +01:00
DizzyEggg
aa33a61e58 Merge branch 'master' into battle_engine_v2 2019-02-07 21:17:30 +01: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
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
AJ Fontaine
b10c2ecf04
Use Swagger on allies with Own Tempo 2019-02-04 11:55:26 -05:00
DizzyEggg
f415871369 Merge with master 2019-02-03 10:44:05 +01:00
DizzyEggg
a7f94bbeea Dump last battle anim file 2019-02-02 11:55:11 +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
fab5b86d31 Fix Embargo string 2019-02-01 13:41:08 +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
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +01:00
Marcus Huderle
14641e916e Cleanup Rustboro City House layout label 2019-01-29 14:36:02 -06:00
Marcus Huderle
bd667102fa Fix PetaburgCity map scripts label 2019-01-29 14:36:02 -06:00
Marcus Huderle
e43f341799 Cleanup link contest map scripts 2019-01-29 14:36:02 -06:00
Marcus Huderle
d2d44a97b8 Cleanup link contest map events 2019-01-29 14:36:02 -06:00
Marcus Huderle
36a1825bbe Document trainer approach funcs, and use movement type constants in scripts 2019-01-29 14:36:02 -06: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
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
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
Diegoisawesome
6b2dda422b Merge branch 'master' of github.com:pret/pokeemerald 2019-01-27 00:11:44 -06:00
Diegoisawesome
7a60f36954 Clean up variable numbers mistakenly written as decimal 2019-01-27 00:11:32 -06:00
DizzyEggg
01c3f3fc05 Document all of frontier pass 2019-01-26 20:56:06 +01:00
DizzyEggg
ebfaf3f6be Merge branch 'master' into dump 2019-01-24 21:30:19 +01:00
DizzyEggg
524db6068e Merge branch 'master' into trainer_card 2019-01-22 21:59:32 +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
DizzyEggg
f84b22fca4 Dump trainer hill trainers 2019-01-19 12:57:18 +01: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
Diegoisawesome
6857b73ee3 Split pokenav so calcrom works properly 2019-01-14 15:25:29 -06:00
Karathan
5ad85f0d55 add bullet punch animation 2019-01-14 00:21:36 +01:00
DizzyEggg
edddd847c5 Document and clean up trainer hill 2019-01-13 20:50:08 +01:00
Karathan
200f0a09d3 add sticky web 2019-01-13 19:35:29 +01:00
Karathan
bb38edad23 add x-scissor animation 2019-01-13 19:13:37 +01:00
Karathan
cb617401a6 add air slash 2019-01-13 17:03:23 +01:00
DizzyEggg
c0bc01d301 Move some vars to C 2019-01-13 13:15:23 +01:00
SBird1337
3a5e5d04e7 add iceshard 2019-01-13 01:21:05 +01:00
Karathan
74ae0a6e83 add thunder fang and fire fang animations 2019-01-12 17:03:44 +01:00
Karathan
768af79b36 add ice fang animation 2019-01-12 17:02:24 +01:00
Karathan
e0be163978 add seed bomb animation 2019-01-12 17:02:24 +01:00
Karathan
832c0d6333 add toxic spike animation 2019-01-12 17:02:24 +01:00
Karathan
8c73045fd6 add brave bird animation 2019-01-12 17:02:24 +01:00
ultima-soul
284751e761 Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present. 2019-01-06 13:41:18 -08:00
Slawter666
f8c2fcb9b2 Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base 2019-01-05 19:54:26 +00:00
DizzyEggg
4827776a3c Merge with master 2019-01-05 10:14:20 +01: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
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
af1e44befe Continue porting roulette 2018-12-31 18:07:29 -06:00
Marcus Huderle
fb2d1591c1 Document more battle anim effects 2018-12-31 16:53:38 -06:00
Diegoisawesome
d004ce065c Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-31 02:30:30 -06:00
Diegoisawesome
c5c6e437ec Document, cleanup, extract data from trade 2018-12-31 01:23:27 -06: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
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
DizzyEggg
27b1d74dad Merge branch 'master' into battle_engine_v2 2018-12-29 15:11:54 +01:00
Melody
6d556f8cf7 improve checkplayergender calls 
clean up constant definitions

make tweaks from review
 2018-12-28 08:22:21 -06:00
Marcus Huderle
c3dde7353d
Add newline to Route111_NoMirageTower layout.inc 
To match all other layout.inc files.
 2018-12-26 17:04:24 -06:00
Marcus Huderle
a1ea3b5e39
Use map_header_flags macro (#483) 2018-12-26 12:20:15 -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
Marcus Huderle
dcbc8db6a3 Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c) 2018-12-25 11:46:35 -06:00
Melody
c7971ecb20 improve event script object calls 2018-12-25 11:20:33 -06:00
Diegoisawesome
a54aa03d20
Merge pull request #475 from DizzyEggg/learn 
asm party and fldeff clean-up
 2018-12-24 16:50:14 -06:00
Diegoisawesome
c2ca57e8ac
Merge pull request #477 from melthelesbian/object_script_commands 
use player constant in obj script commands
 2018-12-24 16:09:42 -06:00
Melody
38293d4293 use player constant in obj script commands 2018-12-24 16:31:24 -05:00
Melody
1e87810414 document setweather calls 2018-12-24 16:23:58 -05:00
DizzyEggg
442b1826a2 asm party and fldeff clean-up 2018-12-24 21:59:05 +01: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
Diegoisawesome
81b38c00e4
Merge pull request #466 from melthelesbian/compare_macros 
improve compare macros
 2018-12-23 11:17:30 -06:00
DizzyEggg
efa820469a move data to c 2018-12-23 14:52:47 +01:00
DizzyEggg
6d57a9dfc8 start data converting 2018-12-23 13:52:53 +01:00
DizzyEggg
ef55bdac89 Merge branch 'master' into battle_engine_v2 2018-12-22 23:57:42 +01:00
Diegoisawesome
ebbe826133
Merge pull request #437 from DizzyEggg/storage 
Pokemon Storage System
 2018-12-22 16:12:27 -06:00
DizzyEggg
bea1faec10 some ai scripts touch 2018-12-22 21:43:21 +01:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
Melody
55005f1588 improve call_if macros 2018-12-21 21:32:45 -05:00
Melody
ac2e4adf2d improve goto_if macros 2018-12-21 20:28:24 -05:00
golem galvanize
314b718471 finish porting ice 2018-12-21 01:37:59 -05:00
DizzyEggg
ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
DizzyEggg
7dcb614cca PSS is done 2018-12-20 22:14:36 +01:00
Marcus Huderle
efd7013f62 Add poison bubble effect to Poison Jab 2018-12-20 14:58:13 -06:00
Marcus Huderle
4aecea2ce8 Add Night Slash animation 2018-12-20 12:46:08 -06: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
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
Marcus Huderle
fe66019bc5 Fix ROOST healing effect graphical bug 2018-12-19 16:36:55 -06:00
Melody
5e6ceeb631 update applymovement to remove magic numbers 2018-12-19 14:08:01 -05:00
Marcus Huderle
d2b5a0e83f Convert battle_anim_815A0D4 data to .c 2018-12-18 19:15:59 -06:00
golem galvanize
8781d969ff finish party_menu 2018-12-18 05:38:08 -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
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
DizzyEggg
f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
Marcus Huderle
1ca3656d74
Decompile contest_painting.c (#447) 2018-12-15 13:07:07 -06:00
Marcus Huderle
5e92481f51
Merge pull request #443 from Meowsy/misc-renamings 
Misc renamings.
 2018-12-13 21:35:36 -06:00
Marcus Huderle
2c6849bee8
Decompile battle_anim_8170478.c (#445) 2018-12-13 21:33:54 -06:00
Marcus Huderle
170b6ef449
Decompile battle_intro.c (#444) 2018-12-12 23:18:25 -06:00
DizzyEggg
59a69eb627 Storage up to icon palettes 2018-12-12 23:19:50 +01:00
DizzyEggg
c5b5f4bd77 More storage 2018-12-10 23:42:44 +01:00
Meowsy
d3e32ab287 Rename Mauville Man text. 2018-12-10 15:50:10 -05:00
DizzyEggg
c2d8876174 Document PSS functions 2018-12-10 21:36:52 +01:00
Diegoisawesome
bfdfe367e8
Merge pull request #422 from garakmon/frontier_data_1 
Battle tower data
 2018-12-10 11:22:16 -06:00
garak
e1e2132a37 sync fldeff function names with pokeruby 2018-12-09 22:24:54 -05:00
garak
b4312648e2 decompile fldeff_80F9BCC with data 2018-12-09 19:22:59 -05:00
Marcus Huderle
a7722a0b93
Decompile cable_car.c (#438) 2018-12-09 13:41:52 -06:00
DizzyEggg
e0f3de0b74 Start pokemon storage system 2018-12-09 16:44:01 +01:00
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01:00
DizzyEggg
58c4cec946 decompile field screen 2018-12-08 21:42:36 +01:00
DizzyEggg
5caca7a4d6 Clean up field weather 2018-12-08 19:43:21 +01:00
DizzyEggg
4c23adb5f5 Decompile field weather 2018-12-08 19:05:03 +01:00
DizzyEggg
b60915539d Fix Phantom Force 2018-12-08 16:19:50 +01:00
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
DizzyEggg
470df386c9 Fix conflicts 2018-12-07 23:01:14 +01:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
garak
80c3258504 finish battle tower data except sRubyFacilityClassToEmerald 2018-12-04 12:09:35 -05:00
garak
2c14d6ee6c fix merge conflicts 2018-12-03 16:58:28 -05:00
DizzyEggg
b9e711bbf4 Add Powder 2018-12-03 12:50:32 +01:00
garak
462e7c8295 begin batle tower data 2018-12-02 23:22:42 -05:00
Melody
eeb6446da4 add more consistent names 2018-12-02 22:36:09 -05:00
DizzyEggg
52d1e69591 Add AI support for newly added moves 2018-12-02 23:50:51 +01:00
DizzyEggg
ad67f4f26f Merge with master and REQ arguments 2018-12-02 22:05:23 +01:00
Melody
10725def8e trainerbattle_normal → trainerbattle_single 
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
 2018-12-02 15:08:19 -05:00
Melody
bad5323642 cleans up trainer battle scripts 
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
 2018-12-02 15:08:19 -05:00
DizzyEggg
d46c3ebe5b Fix Future Sight 2018-12-02 18:47:39 +01:00
Melody
862265b73a defines register_matchcall macro 2018-12-02 06:04:59 -05:00
Melody
c557ac61ae adds constants, cleans up callstd and msgbox code 
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
 2018-12-02 03:37:46 -05:00
DizzyEggg
6ae949e360 Psychic Terrain blocks priority moves 2018-12-01 11:35:49 +01:00
DizzyEggg
1a8859b1d8 Add Dazzling 2018-11-30 22:12:18 +01:00
DizzyEggg
0329175f06 Add Protean 2018-11-30 21:21:43 +01:00
DizzyEggg
7fa55704b2 merge with master 2018-11-30 20:46:09 +01:00
Marcus Huderle
9dd7f8f214
Decompile pokedex_area_screen.c (#412) 2018-11-30 10:41:03 -06:00
Marcus Huderle
0148e38973
Decompile pokedex_cry_screen.c (#406) 2018-11-28 10:14:32 -06:00
DizzyEggg
7cfe0342f0 Finish frontier data 2018-11-27 22:45:50 +01:00
garak
f316d53c58 Merge branch 'frontier-data' of https://github.com/garakmon/pokeemerald into frontier-data 2018-11-27 13:28:44 -05:00
garak
2707bd9b91 clean frontier data 2018-11-27 13:27:49 -05:00
garak
a636005066
delete createsprite.py 2018-11-27 11:40:29 -05:00
garak
73cce79753 Merge remote-tracking branch 'upstream/master' into frontier-data 2018-11-27 11:35:19 -05:00
garak
091b5194e7 frontier pike and pyramid data 2018-11-27 11:21:48 -05:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Marcus Huderle
fb6120da5b Fixup some names 2018-11-25 15:50:54 -06:00
DizzyEggg
a0699dba52 Add Aromatic Mist 2018-11-25 12:59:22 +01:00
DizzyEggg
434e257943 Add Acupressure 2018-11-24 21:06:53 +01:00
DizzyEggg
194139a35b Add Move Effect - Feint 2018-11-24 19:37:10 +01:00
DizzyEggg
cc635c5e6d Custom wild multi battles functionality 2018-11-24 17:31:45 +01:00
DizzyEggg
1c8e574646 Custom Multi Battles - fix defeat msg 2018-11-24 17:06:48 +01:00
DizzyEggg
d52016bc31 Mon creation in custom multi battles 2018-11-24 13:29:10 +01:00
DizzyEggg
539b05ff73 Begin working on custom multi battles 2018-11-24 01:02:02 +01:00
LOuroboros
9d93817319
Update battle_anim_scripts.s 2018-11-21 18:27:35 -03:00
LOuroboros
67375ba3c8
Update battle_anim_scripts.s 
New mega evolution animation.
 2018-11-19 21:45:15 -03:00
DizzyEggg
e4fba4bc7e make it assemble 2018-11-19 20:49:38 +01:00
DizzyEggg
a5df797804 Merge branch 'master' into battle_engine_v2 2018-11-19 20:42:07 +01:00
Marcus Huderle
72f0a079a9 Decompile all of battle_anim_utility_funcs 2018-11-19 09:37:25 -06:00
DizzyEggg
623f1963b7 Merge with master 2018-11-18 20:49:52 +01:00
DizzyEggg
4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
DizzyEggg
c9f57a3b7b
Merge pull request #28 from PALPATlNE/battle_engine_work 
Fixed U-turn
 2018-11-17 23:20:43 +01:00
PALPATlNE
f7cd950b69 Fixed U-turn 2018-11-17 23:17:41 +01:00
DizzyEggg
dff968d1f1
Merge pull request #26 from PALPATlNE/battle_engine_work 
Battle engine work
 2018-11-17 23:04:00 +01:00
PALPATlNE
4284816d81 Fixed Createsprite command arguments 2018-11-17 21:16:48 +01:00
PALPATlNE
fe8c70b9f8 Fix 2018-11-17 19:59:03 +01:00
DizzyEggg
eb66b60f38 Begin battle pyramid 2018-11-17 15:30:34 +01:00
DizzyEggg
15b8046b2b Add third type 2018-11-17 12:10:24 +01:00
DizzyEggg
65036b9a09 Merge with master 2018-11-15 21:53:32 +01:00
Diegoisawesome
032dd251e6
Merge pull request #383 from garakmon/createsprite 
Update createsprite macro and rename BANK to BATTLER
 2018-11-15 14:45:13 -06:00
DizzyEggg
bb9dbc0c6d Merge with master 2018-11-14 22:50:27 +01:00
Slawter666
6fcf878e2f Tidy up header files 2018-11-13 22:28:46 +00:00
garak
c6833c903c remove extra macro and shorten names 2018-11-13 16:19:52 -05:00
garak
269aebaca7 update createsprite macro and rename BANK to BATTLER 2018-11-13 15:35:46 -05:00
Slawter666
1d46507110 Move field effects enum to defines 2018-11-13 14:19:04 +00:00
DizzyEggg
b5ea69cf74 Fix conflicts 2018-11-12 19:22:23 +01:00
DizzyEggg
69683f9572 Decompile Battle Palace 2018-11-12 15:41:19 +01:00
Slawter666
1b895ff52c Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-11-12 14:14:50 +00:00
DizzyEggg
d5abd7b696 Document Battle Pie 2018-11-12 14:36:31 +01:00
DizzyEggg
a4235c9ff8 Document battle arena 2018-11-11 18:33:16 +01:00
DizzyEggg
81410fee17 Factory done 2018-11-11 16:44:27 +01:00
Diegoisawesome
18839a4872 Merge remote-tracking branch 'pret/master' into script_menu 2018-11-06 20:20:56 -06:00
Diegoisawesome
054a015c95 Finish decompiling/porting script_menu 2018-11-06 20:13:40 -06:00
Diegoisawesome
7dd4ed7060 r5/r6 swap on sub_80E2578 2018-11-05 14:45:54 -06:00
DizzyEggg
c3eac92af8 fix protect 2018-11-03 23:32:18 +01:00
DizzyEggg
bc42de5f60 Aurora Veil, Revelation Dance, Diamond Storm 2018-11-03 14:35:45 +01:00
DizzyEggg
68d94ad316 Implement trainer sliding 2018-11-03 01:17:16 +01:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
DizzyEggg
0bb51037d7 Finish frontier util 2018-11-01 21:31:10 +01:00
DizzyEggg
90ef269426 Merge branch 'master' into battle_frontier_2 2018-10-30 21:48:18 +01:00
DizzyEggg
0da7d7e6ae why is this function so hard to match 2018-10-30 21:45:26 +01:00
Diegoisawesome
2837859bdb
Merge pull request #373 from garakmon/battle-anim 
Split battle_anim_80FE840 and move data to C
 2018-10-30 11:53:05 -05:00
Diegoisawesome
c8ef69a00d
Merge pull request #372 from garakmon/sprite-tags 
Synchronize sprite tags
 2018-10-30 11:26:44 -05:00
DizzyEggg
3a9eeef844 Frontier, finish ranking hall 2018-10-28 21:11:53 +01:00
DizzyEggg
98d8dbfd8a Up to sub_81a443c 2018-10-28 00:50:06 +02:00
DizzyEggg
0e6fbbfe09 Make battle tower compile 2018-10-27 00:04:18 +02:00
DizzyEggg
52be8eeaf1 Merge branch 'master' into battle_tower 2018-10-26 23:55:36 +02:00
garak
7747a891a2 finish 80FE840 data (actually) 2018-10-25 18:59:05 -04:00
garak
de90ce9123 finish 80FE840 data (almost) 2018-10-25 17:46:23 -04:00
DizzyEggg
1efdaebe23 finish decompiling battle tower 2018-10-25 21:27:10 +02:00
garak
17c26fae1a fire, electric, ice data 2018-10-24 20:01:40 -04:00
garak
22a0b58e57 effects_2 and water data 2018-10-24 15:52:21 -04:00
garak
2f4b00e34b finish effects_1 data 2018-10-23 12:17:31 -04:00
garak
68814c42de begin 80FE840 data 2018-10-23 08:25:51 -04:00
DizzyEggg
b330bdba51 More and more battle tower 2018-10-22 19:22:57 +02:00
garak
6cf39e8a6e clean up sprite tags 2018-10-22 10:51:40 -04:00
garak
d267fcbfb1 name remaining tags 2018-10-22 10:36:43 -04:00
garak
2b9fd18dd4 battle_anims.s data to C 2018-10-21 22:30:20 -04:00
garak
f2363f5982 more tag names 2018-10-21 19:30:27 -04:00
garak
7a9c7e5f06
Merge branch 'master' into sprite-tags 2018-10-21 15:12:18 -04:00
garak
2bb286ab4e begin ANIM_TAG port 2018-10-21 15:07:10 -04:00
DizzyEggg
0ab27e44b1 more tower, fail 2018-10-21 20:13:12 +02:00
Slawter666
3d8874d919 Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-10-21 00:20:09 +01:00
DizzyEggg
16026fe91d More battle tower. 2018-10-21 00:06:42 +02:00
Diegoisawesome
2a3ba78831
Merge pull request #369 from garakmon/pan-constants 
Use sound pan constants in data/battle_anim_scripts.s
 2018-10-19 20:27:54 -05:00
garak
ecd482fa2c fix merge conflicts in battle_anim_scripts 2018-10-19 16:19:36 -04:00
garak
38fcc46abb Merge remote-tracking branch 'upstream/master' into pan-constants 2018-10-19 16:05:14 -04:00
garak
901f3ff557 use sound panning constants in battle_anim_scripts 2018-10-19 15:57:19 -04:00
Diegoisawesome
bf8fa23462
Merge pull request #365 from garakmon/event-flags 
[WIP] Event flags
 2018-10-19 14:24:34 -05:00
garak
113a8d1efd clean flags and remove temp macro 2018-10-19 14:59:18 -04:00
garak
1441ee6bc3 finish event object flags 2018-10-19 13:04:47 -04:00
garak
cb5981cdf2 name more event flags 2018-10-18 21:32:21 -04:00
garak
c27043bd3c more event flags 2018-10-18 15:28:59 -04:00
Diegoisawesome
6206acd2d2 Finish shop and fldeff_escalator 2018-10-18 12:05:02 -05:00
garak
d1b7f32b0a begin event flag names, add temporary hidden item macro 2018-10-17 22:07:23 -04:00
garak
7d88b9647f
Merge branch 'master' into event-flags 2018-10-17 12:30:45 -04:00
garak
ff97873c30 label temp flags, test replace script 2018-10-17 12:25:12 -04:00
garak
624a7552b6 use event flags in event scripts 2018-10-17 09:05:22 -04:00
Diegoisawesome
e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
Slawter666
1435c96b41 Further synchronisation 2018-10-17 01:11:44 +01:00
Deokishisu
b52b05368c
Fix "Vigaroth" misspelling in May's House 1F 2018-10-16 12:08:17 -04:00
Deokishisu
e377c323c4
Fix "Vigaroth" misspelling in Brendan's House 1F 2018-10-16 12:07:47 -04:00
Diegoisawesome
a9abb930aa
Merge pull request #352 from huderlem/shop 
[WIP] Shop
 2018-10-14 19:03:48 -05:00
Diegoisawesome
7f211b2588
Merge pull request #359 from Slawter666/label_field_effect_helpers 
Label field_effect_helpers.c
 2018-10-14 18:37:11 -05:00
Deokishisu
bf2063cc1a Update All EVENT_OBJ_GFX References 
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
 2018-10-14 19:09:18 -04:00
Slawter666
137f6549ff label field_effect_helpers 2018-10-14 23:43:40 +01:00
DizzyEggg
b3ad32bbe6 Merge with master 2018-10-14 20:51:34 +02:00
Diegoisawesome
02049d52ee
Merge pull request #351 from DizzyEggg/apprentice 
Decompile apprentice
 2018-10-14 13:20:38 -05:00
Diegoisawesome
d40e737d52
Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers 
Decompile field effect helpers
 2018-10-14 12:48:18 -05:00
DizzyEggg
f47ed3268c Finish documenting apprentice for now 2018-10-14 17:00:41 +02:00
DizzyEggg
d60e4e23f8
Merge pull request #25 from Slawter666/apprentice-data 
Move apprentice data to C
 2018-10-14 16:28:27 +02:00
DizzyEggg
7952cfeba5 document more of apprentice 2018-10-14 16:27:48 +02:00
Slawter666
f08b56d645 Move apprentice data to C 2018-10-14 15:26:13 +01:00
DizzyEggg
84936b4260 Merge branch 'master' into apprentice 2018-10-14 15:07:16 +02:00
DizzyEggg
145df49063 Document more of apprentice 2018-10-14 14:35:51 +02:00
DizzyEggg
b4a42a6832 Decompile apprentice 2018-10-14 11:37:44 +02:00
DizzyEggg
a496a763ca Merge record mixing, pokemon and global with apprentice 2018-10-13 20:38:46 +02:00
Diegoisawesome
32fbf67d47
Merge branch 'master' into shop 2018-10-13 12:55:06 -05:00
Diegoisawesome
a26380663c Merge branch 'master' of github.com:pret/pokeemerald 2018-10-13 12:44:23 -05:00
Diegoisawesome
35c6938814 Port/decompile cable_club.s 2018-10-13 12:41:10 -05:00
Marcus Huderle
b24559d69b Merge remote-tracking branch 'upstream/master' into shop 
# Conflicts:
#	asm/shop.s
 2018-10-13 10:22:58 -05:00
golem galvanize
803c2388ce finish porting field_effect_helpers 2018-10-10 12:02:02 -04:00
golem galvanize
35ee9f67c0 ported some of field_effect_helpers 2018-10-09 17:32:39 -04:00
DizzyEggg
e44fef30ff Fix move animations 2018-10-07 19:57:17 +02:00
DizzyEggg
b80b94ee73 merge with master 2018-10-07 19:40:34 +02:00
DizzyEggg
413e26e83d port 80d51ac 2018-10-07 17:45:37 +02:00
DizzyEggg
61343d5069 Decompile battle_anim_80A9C70 2018-10-07 15:39:46 +02:00
DizzyEggg
8c834b9ae8 battle anim 80a5c6c decompiled 2018-10-07 12:32:20 +02:00
DizzyEggg
54fc92bc92 Start porting ruby battle anim file 2018-10-06 23:04:53 +02:00
DizzyEggg
7925000a54 merge with master 2018-10-06 16:05:58 +02:00
DizzyEggg
6b5c52e926 Flower Shield and protect moves 2018-10-06 15:50:35 +02:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims 
Document battle animation scripts
 2018-10-06 08:20:41 -05:00
DizzyEggg
17c5b4089a Label most of the anim tags 2018-10-06 09:37:52 +02:00
Tetrable
e80a53060b Start anim tags 2018-10-05 23:00:07 +01:00
DizzyEggg
de9e9072fc Rototiller and 2 turn moves 2018-09-30 14:04:46 +02:00
DizzyEggg
162c83fcff Bestow 2018-09-30 12:27:51 +02:00
DizzyEggg
7623eabdee After you 2018-09-29 19:37:39 +02:00
DizzyEggg
b9cf1fdcfe Psycho Shift, Power Trick, Flame Burst 2018-09-29 18:40:14 +02:00
DizzyEggg
dddefbb0e3 Full support for moves hitting all battlers 2018-09-29 16:41:25 +02:00
DizzyEggg
ada76cbe4f Synchronoise and Smack Down 2018-09-29 15:43:56 +02:00
DizzyEggg
597299136f Add Pollen Puff effect 2018-09-29 14:10:53 +02:00
DizzyEggg
cbaae44f9f Add pop-up to battlescripts 2018-09-29 13:36:33 +02:00
DizzyEggg
731ff38067 Ability pop-up functionality is done 2018-09-29 12:47:35 +02:00
DizzyEggg
3f2beff554 Defog 2018-09-23 19:03:53 +02:00
DizzyEggg
6b7a171dbe Ability pop-up fail, maybe will do something about it later 2018-09-23 14:24:06 +02:00
DizzyEggg
37d8859404 random move to called move 2018-09-22 19:27:56 +02:00
DizzyEggg
60e8c80c4c Merge branch 'master' into battle_engine_v2 2018-09-22 19:14:56 +02:00
DizzyEggg
611360c29e calledattack to calledmove 2018-09-22 19:08:41 +02:00
DizzyEggg
e362c06aea gRandomMove to gCalledMove 2018-09-22 18:41:00 +02:00
DizzyEggg
19e1606595 Add Copycat 2018-09-22 18:37:03 +02:00
DizzyEggg
db44a7e25a Techno Blast and Autotomize 2018-09-22 17:27:51 +02:00
DizzyEggg
9474254e4d Final Gambit, Dragon Tail 2018-09-22 16:15:00 +02:00
DizzyEggg
ca9876b0b4 Updated Wrap Mechanics, Infestation, stat changing move effects 2018-09-22 12:20:33 +02:00
DizzyEggg
f455f663f4 Shell Smash move effect 2018-09-22 11:13:17 +02:00
DizzyEggg
1284bb94f1 Last Resort, Fangs and Flare Blitz/Volt Tackle 2018-09-22 10:45:43 +02:00
DizzyEggg
23a06c0836 Close combat effect 2018-09-22 01:12:27 +02:00
DizzyEggg
7b60a654b2 Growth gen6 effect 2018-09-22 01:01:13 +02:00
DizzyEggg
a69af8f2f5 Merge with master 2018-09-22 00:22:13 +02:00
DizzyEggg
66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +02:00
DizzyEggg
602c1322e4 almost full support for link battles mega evolution 2018-09-20 11:23:12 +02:00
DizzyEggg
e7e110de55 Merge with master 2018-09-17 20:02:49 +02:00
DizzyEggg
2042788fdc Mega Evolution done except sprites. 2018-09-16 21:08:49 +02:00
DizzyEggg
55f21c1776 Mega Evolution support is mostly done. 2018-09-16 18:55:32 +02:00
Marcus Huderle
f2a76b54bd Re-dump tileset images as RGB-indexed, rather than greyscale 2018-09-16 11:07:48 -05:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
DizzyEggg
4d2637883a Slot machine is decompiled. 2018-09-15 23:19:37 +02:00
DizzyEggg
db248dada2 slot machine is decompiled 2018-09-15 22:59:45 +02:00
DizzyEggg
0547e260a4 More of slot machine 2018-09-15 18:01:20 +02:00
DizzyEggg
2a7811456a Add anim tag sprite defines 2018-09-15 00:30:20 +02:00
DizzyEggg
a08d9dd451 Merge branch 'master' into anims 2018-09-12 22:59:04 +02:00
DizzyEggg
8a81bd1bce Sync battle anim labels with pokeruby 2018-09-12 22:58:03 +02:00
Diegoisawesome
095cbbc5c2
Merge pull request #321 from Slawter666/data 
Move more data to C
 2018-09-11 22:10:26 -05:00
Slawter666
f40fa37398 Move battle_bg data to C 2018-09-11 23:37:47 +01:00
Slawter666
991151f461 Move item_use data to C 2018-09-11 03:04:19 +01:00
Slawter666
3c16d8c598 Move braille_puzzles data to C 2018-09-11 02:17:21 +01:00
Slawter666
b6ee8823f0 Move field_special_scene data to C 2018-09-11 02:04:03 +01:00
Slawter666
bcea321494 Finish converting data2b data 2018-09-11 01:35:47 +01:00
DizzyEggg
10b479a3ca Document battle animation scripts. 2018-09-10 21:19:19 +02:00
DizzyEggg
d20189234e Shyly begin move animations 2018-09-10 17:11:16 +02:00
DizzyEggg
c6c8b7b0fd Merge branch 'master' into battle_engine_v2 2018-09-10 14:49:24 +02:00
DizzyEggg
b87856b58e Battle Factory is decompiled and documented. 2018-09-10 01:01:39 +02:00
Slawter666
135e98a824 Move battle factory data to C 2018-09-09 16:06:35 +01:00
Slawter666
1ba17e1666 Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data 2018-09-09 15:51:13 +01:00
DizzyEggg
6454740587 More battle factory 2018-09-09 13:12:26 +02:00
Diegoisawesome
cf8f73bde1
Merge pull request #314 from Slawter666/data 
Convert data to C
 2018-09-07 11:39:07 -05:00
Marcus Huderle
fa9d1759bd checkpoint 2018-09-06 11:37:45 -05:00
Slawter666
9ad7dc9fd7 Move remaining field_player_avatar data across 2018-09-06 12:02:37 +01:00
Slawter666
26c91f1502 Move field_player_avatar data to C 2018-09-06 03:11:33 +01:00
Diegoisawesome
f8f7a8e300
Merge pull request #304 from Slawter666/graphics 
Move data from graphics.s to C
 2018-09-05 20:32:23 -05:00
Slawter666
9350ac0a74 Move battle_pyramid_bag data to C 2018-09-06 01:24:11 +01:00
Slawter666
07c2882390 Move starter_choose data to C 2018-09-06 00:47:29 +01:00
Slawter666
5656ceab6c Move graphics to src/data/graphics 2018-09-05 23:53:54 +01:00
DizzyEggg
75384546b5 More factory decomp and documentation. 2018-09-05 23:30:15 +02:00
DizzyEggg
15b91a3c89 AI handling for new moves 2018-09-02 15:50:18 +02:00
DizzyEggg
f9af3bec9b merge with master 2018-09-02 00:07:19 +02:00
DizzyEggg
44ba432dad Label various battle scripts 2018-09-01 20:00:13 +02:00
DizzyEggg
ead21250a6 Label all battle ai scripts 2018-09-01 19:05:06 +02:00
DizzyEggg
f3e5c488a3 DONT SPAM HELPING HAND IN DOUBLES 2018-09-01 17:36:09 +02:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
917b32ffbe Finish decompiling pyramid bag. 2018-08-30 20:10:57 +02:00
Diegoisawesome
8e5c72766c
Merge pull request #300 from DizzyEggg/decompile_battle_frontier_1 
Decompile battle_dome
 2018-08-29 14:13:39 -05:00
Slawter666
e30c2251ce Convert more of data2b 2018-08-27 00:26:54 +01:00
DizzyEggg
ddd4733de3 rename battle pyramid to battle pyramid bag 2018-08-26 17:54:58 +02:00
Slawter666
69c20f18ac Convert battle dome data to C 2018-08-26 13:40:36 +01:00
DizzyEggg
2b7c138cbe Some labels 2018-08-25 21:04:12 +02:00
DizzyEggg
447e65860c Merge branch 'master' into decompile_battle_frontier_1 2018-08-25 20:02:09 +02:00
DizzyEggg
edcf04b665 Document battle dome. 2018-08-25 19:59:47 +02:00
Slawter666
6b145ed77c Move data from graphics.s to C 2018-08-24 04:21:07 +01:00
Slawter666
ed24233274 Convert more of data2b.s to C 2018-08-22 23:03:44 +01:00
Slawter666
4db5ef3ae6 Convert more data 2018-08-22 21:41:34 +01:00
Slawter666
ef6a3c2278 Move some data from data2b.s to C 2018-08-22 14:34:36 +01:00
DizzyEggg
5da12f2b21 battle dome - more work 2018-08-19 22:26:07 +02:00
DizzyEggg
e4649245ba this file is too much 2018-08-18 19:52:25 +02:00
DizzyEggg
0bfe894566 Merge with master 2018-08-16 22:53:01 +02:00
Diegoisawesome
13dc7a4170 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-15 16:22:54 -07:00
Diegoisawesome
ac3f4fd994 Continue documentation and cleanup of pokemon_summary_screen 2018-08-15 11:51:47 -07:00
DizzyEggg
92c4fc6345 Contest AI clean-up 2018-08-15 11:50:18 +02:00
Diegoisawesome
332a8bcb1d Extract rodata for unk_pokedex_area_screen_helper 2018-08-14 22:37:59 -07:00
Diegoisawesome
a07d69d7c2 Finish pokemon_summary_screen 2018-08-14 22:00:35 -07:00
DizzyEggg
1a0e6f7aed match contest effect 2018-08-13 21:24:11 +02:00
DizzyEggg
0d68af7f06 copy contest effect from ruby 2018-08-12 23:20:17 +02:00
DizzyEggg
cc145a45f7 merge with master 2018-08-12 22:37:28 +02:00
Diegoisawesome
9a73a47ddd Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 12:55:21 -07:00
Diegoisawesome
2dd5fc23d4 Prepare learn_move for merge 2018-08-12 12:54:07 -07:00
Diegoisawesome
25832810f6
Merge pull request #288 from DizzyEggg/slot_machine 
Port a little bit of slot machine
 2018-08-12 12:27:23 -07:00
Diegoisawesome
6bb761a711
Merge pull request #277 from atasro2/player_field_avatar 
decompile a portion of field_player_avatar.s
 2018-08-12 12:09:09 -07:00
Diegoisawesome
26e18f2292
Merge pull request #289 from DizzyEggg/contests 
Pikalax's contests
 2018-08-12 12:04:53 -07:00
MCboy
1bc93c5a66
Merge branch 'master' into player_field_avatar 2018-08-12 23:26:00 +04:30
DizzyEggg
7dac22314e Decompile a bit of pokemon storarage system 2018-08-12 16:40:31 +02:00
DizzyEggg
957dcd01b3 merge with master 2018-08-12 12:11:35 +02:00
Diegoisawesome
18d5186630 Merge remote-tracking branch 'garakmon/heal-loc-2' 2018-08-11 16:57:46 -07:00
Diegoisawesome
cf9518f237 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-11 16:32:03 -07:00
Diegoisawesome
cb9127ccaf Revert "Rename some specials" 
This reverts commit 658f9351fe.
 2018-08-11 15:16:41 -07:00
DizzyEggg
df5009cb3e Move move descriptions to C 2018-08-12 00:03:19 +02:00
Diegoisawesome
658f9351fe Rename some specials 2018-08-11 14:59:43 -07:00
Diegoisawesome
b54793be91 Finish decompiling field_specials 2018-08-11 14:51:54 -07:00
DizzyEggg
537ebd36ac Merge contests with master 2018-08-11 19:04:28 +02:00
DizzyEggg
0e0d103044 port more of slot machine 2018-08-11 18:47:56 +02:00
DizzyEggg
4cb1e880da Reflect Type and SOAK 2018-08-11 13:30:34 +02:00
DizzyEggg
e259000dc3 Coil and Quiver Dance 2018-08-11 12:29:01 +02:00
DizzyEggg
674d35861c Couple bug fixes 2018-08-11 12:16:00 +02:00
DizzyEggg
f126585e71 Merge with master 2018-08-11 11:05:57 +02:00
Diegoisawesome
1e0f3ec433 Continue decompiling field_specials 2018-08-10 14:07:23 -07:00
garak
c3512e3b39 port larger heal location changes from poke ruby pr 2018-08-10 10:45:15 -04:00
Diegoisawesome
12ff59f9c1 Continue decompiling field_specials 2018-08-10 00:42:06 -07:00
Diegoisawesome
bad170b0cb Continue decompiling field_specials 2018-08-08 23:53:21 -07:00
Diegoisawesome
90896e38c9 Begin porting/decompiling field_specials 2018-08-08 01:37:12 -07:00
DizzyEggg
d230d986fa Me First. 2018-08-05 16:43:07 +02:00
DizzyEggg
de85f88bbb Support for two typed moves. 2018-08-05 13:57:37 +02:00
DizzyEggg
5fbeef860c Bulletproof and a couple of new moves 2018-08-05 13:39:22 +02:00
DizzyEggg
065032bf35 Moves changing terrains 2018-08-05 12:43:57 +02:00
DizzyEggg
2218949d7c Topsy Turvy and Ion Deluge. 2018-08-04 23:34:29 +02:00
DizzyEggg
222ea7269d Rapid Spin blews all hazards, Quash and a couple of new move effects 2018-08-04 22:23:07 +02:00
DizzyEggg
9ff7b0e849 Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst 2018-08-04 20:36:24 +02:00
DizzyEggg
2d73637ff4 Introduce argument and do Draining kiss 2018-08-03 19:01:03 +02:00
DizzyEggg
3d5f512aec
Use constant in a battle script. 2018-08-03 18:07:45 +02:00
DizzyEggg
39f9b1ddf0 Experience on caught mon 2018-08-03 18:01:14 +02:00
DizzyEggg
28b4d0d9dc Make it compile 2018-08-03 00:21:40 +02:00
DizzyEggg
320120d529 Merge with master 2018-08-03 00:20:34 +02:00
DizzyEggg
c7baa71a5e Add placeholder string for not done moves. 2018-08-02 20:32:13 +02:00
DizzyEggg
198a1a8646 Proper Sound moves and substitute 2018-08-02 20:24:18 +02:00
DizzyEggg
b73075f822 Update Unusable Moves 2018-07-31 23:09:47 +02:00
DizzyEggg
44a454ecb4 Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done 2018-07-30 20:41:16 +02:00
DizzyEggg
9febcd3a0a Document a bit of atk47 2018-07-29 15:51:08 +02:00
DizzyEggg
68145cd002 Document atk48 2018-07-29 15:33:16 +02:00
DizzyEggg
2f6cc2be80 Electric types immune to paralysis 2018-07-29 12:45:08 +02:00
DizzyEggg
3d93da7133 Add Imposter 2018-07-29 12:21:28 +02:00
DizzyEggg
d628d1f5fd Move Weather Ball, Hidden power, AI support for dynamic type moves and AI debug support 2018-07-29 11:32:40 +02:00
DizzyEggg
3a0c244f40 Add Harvest 2018-07-28 17:13:47 +02:00
DizzyEggg
ef3c39fbae Fix Counter and Mirror Coat 2018-07-28 10:58:47 +02:00
DizzyEggg
43fc4b6933 Add Magic Bounce 2018-07-28 10:41:20 +02:00
DizzyEggg
0148cc8b0c merge with master, gen6 move names 2018-07-28 00:01:34 +02:00
DizzyEggg
9088c0bdb5 Introduce battle config; Snow Warning Done. 2018-07-27 23:40:10 +02:00
DizzyEggg
f51812d0fe Add Fell Stinger 2018-07-26 23:40:55 +02:00
DizzyEggg
d991d669da Add Moxie 2018-07-26 22:52:13 +02:00
DizzyEggg
16d38f5343 Add a couple of gen5 abilities 2018-07-26 21:56:23 +02:00
DizzyEggg
1c95c36338 Healing Wish and Lunar Dance 2018-07-26 20:36:16 +02:00
Diegoisawesome
7270e73fee Move strings to C 2018-07-25 01:15:36 -07:00
Diegoisawesome
e92e2cb0aa Merge branch 'master' of github.com:pret/pokeemerald 2018-07-24 21:18:36 -07:00
Diegoisawesome
156fb472e1 Clean up files and add entries to charmap 2018-07-24 21:18:23 -07:00
Diegoisawesome
5883f867f0
Merge pull request #278 from vblm12/trainer_data 
Move some trainer data into c structs
 2018-07-24 18:58:56 -07:00
DizzyEggg
100ce73a12 Sticky Web done 2018-07-24 22:09:55 +02:00
DizzyEggg
f8b1f0a45c Stealth Rock and Toxic Spikes 2018-07-24 21:47:00 +02:00
MCboy
1b3d7a5bef
Update field_player_avatar.s 2018-07-24 17:04:02 +04:30
DizzyEggg
3f7e6e9fe0 Add U-turn effect 2018-07-23 22:43:05 +02:00
DizzyEggg
567a0240f3 Fix crits and do Worry Seed 2018-07-23 22:18:56 +02:00
DizzyEggg
6570324432 New crit calculator. 2018-07-23 21:36:05 +02:00
DizzyEggg
194adf0ab2 Abilities affected by weather conditions 2018-07-22 22:41:13 +02:00
DizzyEggg
831816e9b2 Switch-in abilities with a message 2018-07-22 22:21:47 +02:00
DizzyEggg
6a7d58003b Add Bad Dreams 2018-07-22 21:05:12 +02:00
DizzyEggg
fee81d03ab A couple of gen4 abilities 2018-07-22 18:40:18 +02:00
DizzyEggg
51dc76c7e8 Captivate and new accuracy calc 2018-07-22 15:08:32 +02:00
DizzyEggg
1e9143e0b2 merge union room with master 2018-07-22 13:14:58 +02:00
DizzyEggg
c9d486a5d3 make union room compile i guess 2018-07-22 12:49:49 +02:00
DizzyEggg
4ec43cbed1 Gen 5 move names, telekinesis, power/guard split/swap 2018-07-21 23:12:10 +02:00
DizzyEggg
fcca2afc81 More gen4 move effects battlescrips. 2018-07-21 21:58:07 +02:00
DizzyEggg
b203cf4ca4 Add a couple of gen4 moves battlescripts 2018-07-21 16:34:43 +02:00
DizzyEggg
9d4d8c5dac Add new Sturdy effect 2018-07-21 15:11:13 +02:00
DizzyEggg
6cffd5b045 Add new field end turn effects 2018-07-21 13:24:20 +02:00
DizzyEggg
66a3c13f49 Add new Side turn effects 2018-07-21 12:56:07 +02:00
vblm12
3d04105488 Remove unnecessary files. 2018-07-21 01:51:44 -05:00
vblm12
29276cc76c Move some trainer data from data2b.s to c structs. 2018-07-20 22:14:31 -05:00
DizzyEggg
f3be5ad22d Do new battler end turn effects. 2018-07-18 22:07:48 +02:00
DizzyEggg
81b29ae7c1 Merge with pokeemerald 2018-07-16 22:45:06 +02:00
DizzyEggg
988e00b8e4 Small change 2018-07-16 21:56:11 +02:00
DizzyEggg
0852cba111 Fix dynamic move power moves, get rid of gDynamicBasePower' 
'
 2018-07-16 21:42:03 +02:00
DizzyEggg
ea5ffa3375 Merge with master 2018-07-16 20:23:05 +02:00
Diegoisawesome
07ef762770
Merge pull request #275 from Diegoisawesome/master 
Document list_menu.c and main_menu.c
 2018-07-15 04:43:03 -07:00
Diegoisawesome
731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
DizzyEggg
5a38bb61db Basic damage calc is ready. 2018-07-14 22:56:03 +02:00
DizzyEggg
2ebf14a83d Get rid of scripting dmg multiplier 2018-07-14 18:58:45 +02:00
DizzyEggg
baf172d605 Prepare damage calc huge changes 2018-07-14 18:44:38 +02:00
DizzyEggg
939127bfff Important battle util functions 2018-07-14 16:41:14 +02:00
DizzyEggg
3a10ae9a94 Crit changes accomodated to ai scripts 2018-07-14 12:54:12 +02:00
DizzyEggg
2293d1ddbc Get rid of duplicate bs command jumpiftype 2018-07-14 12:02:29 +02:00
DizzyEggg
fe15e56f31 Add Gen4 move names and fairy type name 2018-07-14 10:57:34 +02:00
DizzyEggg
c9d1ee3c4a Move high crit to a flag and update move table 2018-07-14 10:11:38 +02:00
Marcus Huderle
94650495c6 Use map battle scene constants in map headers 2018-07-12 22:45:41 -05:00
Marcus Huderle
546819bc72 Use map type constants in map headers 2018-07-12 22:39:38 -05:00
Marcus Huderle
d53e8137cd Use weather constants in map headers 2018-07-12 22:15:35 -05:00
Marcus Huderle
d5eb94330a Use region map section constants in map headers 2018-07-12 21:47:04 -05:00
Marcus Huderle
7d375972ba Sync bg_event macros with pokeruby 2018-07-11 11:12:26 -05:00
Marcus Huderle
8ffd7a70fc Use movement type constants in object_event macros 2018-07-10 18:04:51 -05:00
DizzyEggg
9892298645 Merge branch 'master' into final_battle_files_touches 2018-07-07 14:11:04 +02:00
Diegoisawesome
5189442bcc Merge branch 'decompile_cut' of git://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_cut 2018-07-05 20:32:12 -07:00
DizzyEggg
c556358e47 label multiuse sprite template functions 2018-07-01 15:28:57 +02:00
DizzyEggg
f35c0abe80 merge with battle tent update 2018-07-01 12:16:52 +02:00
DizzyEggg
d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg
2d0be91217 Move all trainer defines to trainers.h and identify frontier brain trainer id 2018-06-30 18:55:34 +02:00
DizzyEggg
15fe5a031b Merge branch 'master' into decompile_battle_tent 2018-06-30 14:43:41 +02:00
DizzyEggg
30c85a5128 more battle documentation 2018-06-30 14:12:17 +02:00
DizzyEggg
272b98da6c document party status summary 2018-06-28 21:06:32 +02:00
Marcus Huderle
91ee3221b3 Formatting 2018-06-20 19:54:21 -05:00
Marcus Huderle
5e00c0bfcf Fix map constants 2018-06-20 19:54:21 -05:00
Marcus Huderle
ed8b006e67 Rename map-layout-related things 2018-06-20 19:54:21 -05:00
Marcus Huderle
135a11e50e Move events and scripts into map dirs 2018-06-20 19:54:21 -05:00
Marcus Huderle
89d35e82a2 Move 'map attributes' into 'layouts' 2018-06-20 19:54:21 -05:00
DizzyEggg
caa36b530a label and document battle windows 2018-06-17 16:48:58 +02:00
DizzyEggg
0fe3e612eb battle tent start and create frontier struct in saveblock 2018-06-17 12:30:09 +02:00
DizzyEggg
3bcd30969a cut field effect is decompiled and documented 2018-06-16 14:04:29 +02:00
Marcus Huderle
f807eb1f2d Split out movement radius in object_event macro 2018-06-15 07:49:21 -05:00
Marcus Huderle
2807abe3ba Remove filler bytes from object_event macro 2018-06-15 07:49:21 -05:00
Marcus Huderle
acc1a5d446 Get all map constants from include/ rather than constants/ 2018-06-15 07:49:21 -05:00
Marcus Huderle
bebcea4029
Merge pull request #263 from huderlem/event_object_movement 
Sync event object movement with pokeruby
 2018-06-14 08:08:51 -05:00
Marcus Huderle
e01dd90bb3 Update applymovement actions to reflect movement action names 2018-06-13 18:19:19 -05:00
Marcus Huderle
4d13e3394a Bring all movement function names up-to-date with pokeruby 2018-06-13 17:51:26 -05:00
Avara
223ee357f7 battle dome palette label update to graphics.s 2018-06-12 12:12:29 +01:00
Marcus Huderle
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Marcus Huderle
ed245b677a Add remaining rodata to event_object_movement.c 2018-06-11 18:17:31 -05:00
Marcus Huderle
89edf6d9e9 Move all field object data into src/data and event_object_movement.c 2018-06-11 17:33:50 -05:00
Marcus Huderle
eb8dbff4a7 Move event_object_movement_helpers into event_object_movement 2018-06-11 10:56:14 -05:00
Marcus Huderle
73327f0d44 Decompile field_ground_effect into event_object_movement.c 2018-06-11 10:23:14 -05:00
Marcus Huderle
38a126df66 Rename field_map_obj to event_object_movement 2018-06-11 08:46:33 -05:00
DizzyEggg
e95b1156d2 more progress 2018-06-03 09:37:01 +02:00
Diegoisawesome
0b09575fd4
Merge pull request #249 from golemgalvanize/decompile_pokedex 
Decompile pokedex
 2018-06-01 00:02:46 -07:00
Diegoisawesome
dd28854a22
Merge pull request #255 from DizzyEggg/decomp_record_mixing 
Fix pika's Record Mixing PR
Also closes #107.
 2018-05-30 16:51:30 -07:00
DizzyEggg
ff0c615870 decompile rom_8034C54 2018-05-27 23:26:01 +02:00
DizzyEggg
b051cbaaab more record mixing decomp 2018-05-25 21:00:41 +02:00
PikalaxALT
6ae395a636 Merge branch 'master' into contest 2018-05-24 10:26:55 -04:00
Diegoisawesome
de60bdf2fe
Merge pull request #256 from DizzyEggg/decompile_field_tasks 
Decompile field tasks
 2018-05-19 23:34:30 -05:00
DizzyEggg
0978cc60a1 change map event var names to pokeruby ones 2018-05-19 19:20:32 +02:00
DizzyEggg
1307fde8ca make field tasks compile 2018-05-19 18:13:48 +02:00
DizzyEggg
d1798d0ed9 decompile field tasks 2018-05-19 18:02:43 +02:00
DizzyEggg
1ead30ad40 decompile menu indicators 2018-05-19 10:54:02 +02:00
DizzyEggg
0cf3836a03 decompile menu helpers 2018-05-15 20:22:19 +02:00
PikalaxALT
4488bbe9e6 Merge branch 'master' into contest 2018-05-11 09:25:26 -04:00
Diegoisawesome
2b6d2dfadd Merge branch 'master' of https://github.com/pret/pokeemerald 2018-05-10 18:38:24 -05:00
Diegoisawesome
416d67c832 Finish porting/decompiling field_effect.c 2018-05-10 18:36:57 -05:00
PikalaxALT
dfc83cf28f Merge branch 'master' into contest 2018-05-10 09:47:12 -04:00
Diegoisawesome
80062972ae Begin porting field_effect 2018-05-10 03:02:33 -05:00
golem galvanize
13efa1ef62 fixing conflicts 2018-05-10 03:34:36 -04:00
PikalaxALT
4470f77b3d Merge branch 'master' into mauville_old_man 2018-05-09 15:30:21 -04:00
Diegoisawesome
b570f87152 Merge master from pret 2018-05-09 05:10:23 -05:00
Diegoisawesome
d66c1c642c Port/decompile fieldmap.c 2018-05-09 05:07:56 -05:00
PikalaxALT
5efe8f3a0d through sub_80DAB8C 2018-05-08 19:00:23 -04:00
PikalaxALT
fd1d75ce37 Merge branch 'master' into mauville_old_man 2018-05-07 18:18:00 -04:00
PikalaxALT
61cc1d5574 Rename symbols using Ruby as a reference 2018-05-07 18:11:20 -04:00
Slawter666
279a6e1ddc Convert item_icon_table.inc to C 2018-05-06 13:37:28 +01:00
Slawter666
aab1238ec0 Revert "Convert item_graphics.inc to C" 
This reverts commit 546217d281.
 2018-05-06 09:12:23 +01:00
Slawter666
546217d281 Convert item_graphics.inc to C 
I have tried to group the items that share the same icon but have different palettes where possible. This commit also splits data/graphics.s into two files.
 2018-05-05 23:27:26 +01:00
Slawter666
22ec43a6ed resolve merge conflicts 2018-05-05 18:50:26 +01:00
PikalaxALT
58200616d5
Merge branch 'master' into trader 2018-05-04 17:45:50 -04:00
PikalaxALT
8aa462cd74 through sub_8121178 2018-05-03 18:05:07 -04:00
PikalaxALT
c6115a2fec through sub_8120C0C 2018-05-03 17:03:52 -04:00
PikalaxALT
0bc7759f9b through sub_8120748 2018-05-03 13:40:08 -04:00
Marcus Huderle
cdb5e9e314
Merge pull request #242 from DizzyEggg/decompile_battle_records 
Decompile battle records
 2018-05-03 08:42:44 -07:00
PikalaxALT
cae0fb8ec2 through sub_81203FC 2018-05-02 16:57:34 -04:00
PikalaxALT
21c3e7e8e5 through SetMauvilleOldMan 2018-05-02 11:31:58 -04:00
PikalaxALT
4b1e30434d Through sub_80D787C 2018-05-01 19:47:11 -04:00
PikalaxALT
4acbcf5759 Port trader from Ruby 2018-05-01 15:19:24 -04:00
DizzyEggg
ae78786723 identify and name battle records things 2018-05-01 15:33:13 +02:00
DizzyEggg
f9a2f6c4a2 start decompiling battle records 2018-05-01 12:38:55 +02:00
DizzyEggg
fd40e93cb5 clear item, save and load save files 2018-04-29 14:21:59 +02:00
DizzyEggg
25c669e36b decompile item 2018-04-29 13:36:26 +02:00
golem galvanize
6a401b5386 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex 2018-04-25 00:28:57 -04:00
Slawter666
39fd42faea convert data/items.inc to include/data/items.h 
OK
 2018-04-25 02:33:55 +01:00
Slawter666
a49f80d552 Convert item_descriptions.inc to .h 
OK
 2018-04-25 01:41:04 +01:00
Slawter666
a04f8f6ee3 Convert item data files to .c (not compiling) 2018-04-23 21:44:46 +01:00
KDSKardabox
b818924feb Decompile rotating_rate & remove debug check 2018-04-18 14:09:50 +05:30
KDSKardabox
f5cbefc295 Decompile mon markings 2018-04-17 14:24:39 +05:30
KDSKardabox
936bb5925a Decompile dewford trend 2018-04-16 16:22:13 +05:30
KDSKardabox
a3d065d0bd Decompile rom6 2018-04-10 12:17:29 +05:30
KDSKardabox
a18dc6aa80 Decompile map_name_popup 2018-04-09 12:52:28 +05:30
golem galvanize
069a7e71fc Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex 2018-03-30 16:49:08 -04:00
golem galvanize
3006ff177b pushing so I can pull from master 2018-03-30 16:48:30 -04:00
Marcus Huderle
a5cd6e8ef4
Merge pull request #231 from KDSKardabox/master 
Player PC
 2018-03-28 21:45:24 -07:00
Marcus Huderle
d4c6ef7ae6
Merge pull request #227 from PikalaxALT/pokenav_match_call 
Pokenav match call
 2018-03-28 21:33:50 -07:00
Anders Løvig
57775a946d Rename start menu functions 2018-03-28 21:09:27 +02:00
Anders Løvig
5bc8ee6465 Added static modifers 2018-03-28 15:45:35 +02:00
KDSKardabox
f9f64fff42 Resolve conflicts 2018-03-19 16:15:13 +05:30
KDSKardabox
a24ffb1321 Finish decompiling player_pc rodata 2018-03-19 15:57:33 +05:30
Diegoisawesome
2ecbe252a2
Merge pull request #219 from Mother-Of-Dragons/master 
Fixed label names: battle_ai_scripts.s
 2018-03-14 17:47:46 -05:00
Avara
e03004b4b6 Fixed label names: battle_ai_scripts.s 2018-03-13 11:55:18 +00:00
KDSKardabox
f3b5ed0d12 Decompile more functions & rename some labels 2018-03-13 14:41:39 +05:30
KDSKardabox
e7cf8e5c17 Start decompile player_pc 2018-03-12 13:56:20 +05:30
PikalaxALT
aa2cb6a974 Rename match call assets 2018-03-06 08:52:29 -05:00
PikalaxALT
7b9930a0a2 Remaining data in match_call 2018-03-04 16:58:51 -05:00
PikalaxALT
1c67840652 Match call data, 2 2018-03-04 16:44:50 -05:00
PikalaxALT
9b25d02369 Match call data, 1 2018-03-04 16:14:56 -05:00
DizzyEggg
62e849a5df item menu is done 2018-03-04 20:03:11 +01:00
DizzyEggg
4c3f8ac6c6 start item menu icons decomp 2018-03-04 18:41:07 +01:00
PikalaxALT
df128cbfed Merge branch 'master' into pokenav_match_call 2018-03-02 21:49:09 -05:00
PikalaxALT
89847427e4 match_call_t; through sub_81D17E4 2018-03-02 08:44:33 -05:00
PikalaxALT
988be1ab86 Carve out Match Call functions 2018-02-28 22:47:50 -05:00
KDSKardabox
85492c0dac Merge branch 'master' of https://github.com/pret/pokeemerald 2018-03-01 09:13:29 +05:30
DizzyEggg
988f0b7e19 Merge branch 'master' into decompile_battle_link_817C95C 2018-03-01 01:01:18 +01:00
Diegoisawesome
bcef4e7d1c
Merge pull request #221 from DizzyEggg/data_to_c 
Move some data to C
 2018-02-28 16:55:45 -06:00
DizzyEggg
59ff4aec9b decompile and document battle tv 2018-02-27 20:40:09 +01:00
KDSKardabox
835777dec2 Decompile fleff_flash rodata 2018-02-27 10:33:23 +05:30
PikalaxALT
1616f998fc Rename some flags relevant to the conditions under which Wattson becomes available for rematch 2018-02-26 08:42:15 -05:00
DizzyEggg
1972303792 type and ability names to C 2018-02-26 14:29:17 +01:00
PikalaxALT
f46e941f30 Name functions, variables, and that one flag constant 2018-02-26 08:23:17 -05:00
DizzyEggg
8821d6396a move battle moves to C 2018-02-26 12:59:52 +01:00
PikalaxALT
6bfc8579ad Decompile trainer_rematch 2018-02-25 21:56:09 -05:00
KDSKardabox
a3c17fad22 Decompile Fossil Special & Groundshake Data 2018-02-22 12:17:46 +05:30
Avara
59c95c32db Fixed label names: battle_ai_scripts.s 2018-02-21 00:26:12 +00:00
Diegoisawesome
ebd88b3606 Merge branch 'master' of https://github.com/pret/pokeemerald into intro 2018-02-17 04:03:59 -06:00
Diegoisawesome
1605f62535 Decompile credits 2018-02-17 04:00:22 -06:00
Diegoisawesome
0a206ee52c Finish decompiling intro 2018-02-15 22:30:39 -06:00
KDSKardabox
ffeca135bc Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-16 09:29:11 +05:30
Diegoisawesome
34716558b1 Almost finish decompiling intro 2018-02-15 16:54:34 -06:00
DizzyEggg
90fa97f810 merge overworld with master 2018-02-15 12:41:32 +01:00
KDSKardabox
64683e1473 [WIP] Decompile fledd_softboiled.h 2018-02-15 15:29:26 +05:30
KDSKardabox
2fb78b5ca8 Fix reviewed points. 2018-02-15 09:47:42 +05:30
golem galvanize
e1bd37dca9 fix merge conflicts 2018-02-13 22:19:14 -05:00
golem galvanize
e5b6d15f91 move data to c 2018-02-13 22:12:02 -05:00
DizzyEggg
5dde701c81 merge overworld with master 2018-02-14 01:12:17 +01:00
DizzyEggg
94b47c0686 decompile overworld 2018-02-14 00:58:22 +01:00
KDSKardabox
aaea65c37b Merge branch 'master' of https://github.com/pret/pokeemerald 
# Conflicts:
#	include/strings.h
 2018-02-13 10:02:27 +05:30
golem galvanize
4ac064bbaf Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-12 14:00:47 -05:00
golem galvanize
f81c52b56e more fixes 2018-02-12 13:59:42 -05:00
DizzyEggg
f22be4d010 more overworld work 2018-02-12 18:26:26 +01:00
DizzyEggg
382442c4c8 start decompiling overworld.s 2018-02-12 15:01:43 +01:00
KDSKardabox
0ca0ad1c63 Decompile birch_pc.c 2018-02-12 15:42:15 +05:30
Diegoisawesome
a4787bc06a
Merge pull request #207 from DizzyEggg/decompile_pokemon_123 
Decompile and clean pokemon files
 2018-02-11 22:13:15 -06:00
PikalaxALT
ea347199a2 Merge branch 'master' into link 2018-02-11 19:22:06 -05:00
DizzyEggg
0347509704 make it compile o 2018-02-12 00:31:13 +01:00
DizzyEggg
2736c0fd4a add more const pokemon data, clear include 2018-02-11 23:46:50 +01:00
golem galvanize
601a942db4 decompile main_menu 2018-02-11 17:19:36 -05:00
DizzyEggg
fd17ca59b0 more pokemon work 2018-02-11 17:35:01 +01:00
DizzyEggg
9e7696f25a decompile pokemon1 2018-02-09 15:55:12 +01:00
DizzyEggg
bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01:00
Diegoisawesome
387dbf48d0
Merge pull request #202 from DizzyEggg/move_mon_data 
Move data from asm to pokemon_1.c
 2018-02-08 14:06:57 -06:00
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
Diegoisawesome
772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
DizzyEggg
a10fd5a7c4 create more battle constants 2018-02-08 00:35:13 +01:00
DizzyEggg
4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01:00
DizzyEggg
c5e2092e8b title screen with master 2018-02-07 20:10:56 +01:00
Diegoisawesome
802b505d7b
Merge pull request #199 from DizzyEggg/decompile_rtc_screen 
decompile rtc reset screen
 2018-02-07 13:03:59 -06:00
Diegoisawesome
ccae0ee970
Merge pull request #198 from DizzyEggg/decompile_item_icon 
decompile item icon
 2018-02-07 12:59:40 -06:00
Cameron Hall
13bc7a8dd2
Merge pull request #166 from camthesaxman/battle_refactor 
rename/refactor battle code
 2018-02-07 12:46:12 -06:00
Diegoisawesome
3fb2471016
Merge pull request #197 from DizzyEggg/decompile_berry_tag_screen 
Decompile berry tag screen
 2018-02-07 12:27:25 -06:00
Diegoisawesome
18abda9dca Finish menu.s and eliminate TextColor 2018-02-06 20:37:54 -06:00
camthesaxman
c3dc14ba66 more renaming 2018-02-06 16:09:39 -06:00
camthesaxman
6a4967689e more renaming 2018-02-06 13:48:02 -06:00
camthesaxman
3ec68d5f79 reorganize berry graphics files 2018-02-06 11:51:43 -06:00
camthesaxman
f78fa6aabf rename bank to battler 2018-02-05 19:46:59 -06:00
camthesaxman
607cba8c2e Merge branch 'master' into battle_refactor 2018-02-05 17:38:23 -06:00
DizzyEggg
541fef5368 move wild data to C 2018-02-05 22:27:29 +01:00
DizzyEggg
e6eae224fc mon ewram data to c 2018-02-05 17:56:28 +01:00
DizzyEggg
ae8e89a10d move some pokemon data to c 2018-02-05 17:39:26 +01:00
DizzyEggg
0c60ffe22a decompile title screen 2018-02-04 16:11:00 +01:00
PikalaxALT
d52f52fa73 Merge branch 'master' into link 2018-02-03 09:42:19 -05:00
DizzyEggg
27452ca822 decompile rtc reset screen 2018-02-02 19:00:01 +01:00
DizzyEggg
e13eacda39 decompile item icon 2018-02-02 16:06:20 +01:00
DizzyEggg
14d2caaf8d start decompiling berry tag screen 2018-02-02 12:32:12 +01:00
ProjectRevoTPP
78bd2b0849 move save rodata to source and use saveblock chunk macros 2018-01-31 15:26:57 -05:00
Diegoisawesome
eb5737357d
Merge pull request #194 from DizzyEggg/decompile_mystery_event_menu 
decompile mystery event menu
 2018-01-30 20:33:27 -06:00
DizzyEggg
9fbedcc41c coord weather fix conflicts 2018-01-31 00:02:16 +01:00
DizzyEggg
741b8adf9a decompile mystery event menu 2018-01-30 23:23:35 +01:00
Diegoisawesome
6873f47821
Merge pull request #190 from DizzyEggg/decompile_time_events 
decompile time events
 2018-01-30 15:20:24 -06:00
DizzyEggg
e6fb626c1f decompile_coord_event_weather 2018-01-29 16:46:56 +01:00
DizzyEggg
d728124a7b decompile time events 2018-01-29 15:55:34 +01:00
DizzyEggg
78fc471f32 mon anim with master 2018-01-29 14:40:50 +01:00
DizzyEggg
78728ae454 add rgb constants 2018-01-29 14:36:13 +01:00
DizzyEggg
ed546d680f pokemon animation is decompiled 2018-01-29 12:36:56 +01:00
DizzyEggg
16c46905ff more pokemon animation functions 2018-01-28 00:51:20 +01:00
DizzyEggg
95827ab64b more pokemon anim functions decompiled 2018-01-27 11:57:46 +01:00
Diegoisawesome
2da7bdbb11 Begin menu.s decomp 2018-01-26 23:41:52 -06:00
Diegoisawesome
0c47cd6fc3 Renamed link_strings and fixed warning in fldeff_cut.s 2018-01-24 00:18:10 -06:00
Diegoisawesome
5784098446 Organization and naming 2018-01-23 23:14:22 -06:00
Diegoisawesome
5a57485ece Decompile naming_screen.c 2018-01-23 21:30:13 -06:00
DizzyEggg
ad73f92061 start decompiling pokemon animation 2018-01-22 21:32:50 +01:00
camthesaxman
663ecd0014 Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor 2018-01-21 22:29:35 -06:00
PikalaxALT
d4e8c20f84 Merge branch 'master' into link 2018-01-21 23:20:13 -05:00
Diegoisawesome
2ba141eac4
Merge pull request #182 from DizzyEggg/decompile_hof_pc 
decompile hof pc
 2018-01-21 15:10:26 -06:00
DizzyEggg
f59eedb672 decompile hof pc 2018-01-21 20:45:43 +01:00
DizzyEggg
f53a39e7a2 mystery event labels 2018-01-21 19:30:01 +01:00
DizzyEggg
e0fbd5daad text window cleanup 2018-01-21 13:32:11 +01:00
DizzyEggg
ad2ef517bd option menu fix conflicts 2018-01-21 12:46:19 +01:00
DizzyEggg
0bc7fb92db start decompiling mystery event script 2018-01-21 12:36:11 +01:00
Diegoisawesome
c5b3c4168a Remove attempt at guarding specials.inc 2018-01-21 03:30:31 -06:00
golem galvanize
4499af0ec3 got another pointer 2018-01-20 23:36:17 -05:00
golem galvanize
452c0cfd7c BEGONE POINTER 2018-01-20 23:18:26 -05:00
golem galvanize
bce63b3694 REMOVE BASEROM 2018-01-20 22:41:02 -05:00
PikalaxALT
772f0aa3fd Merge branch 'master' into link 2018-01-20 22:08:41 -05:00
golem galvanize
f22d295cfc Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 21:37:47 -05:00
Diegoisawesome
d279f50f57 Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 19:18:33 -06:00
Diegoisawesome
28c9f40b3e Extract data from fossil_special_fldeff_groundshake 2018-01-20 19:18:03 -06:00
golem galvanize
33ebcabc3a Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 19:45:38 -05:00
golem galvanize
bdc8cf6ac4 fixing conflicts 2018-01-20 19:44:34 -05:00
Diegoisawesome
f00bbdfeca Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 18:31:07 -06:00
Diegoisawesome
8d7a830151 Extract data from field_effect_misc 2018-01-20 18:30:33 -06:00
Diegoisawesome
064c813a95 Extract data from map_obj_8097404 2018-01-20 17:45:45 -06:00
Diegoisawesome
ed8269889b Extract data from pokedex.s 2018-01-20 17:17:51 -06:00
golem galvanize
59e1aacd26 DIEGO SEND HELP 2018-01-20 17:26:30 -05:00
Diegoisawesome
aca539d5dd Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 16:22:40 -06:00
Diegoisawesome
b47b9e5758 Extract data from starter_choose 2018-01-20 16:22:16 -06:00
Diegoisawesome
692ed13fe7 Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 15:37:56 -06:00
Diegoisawesome
d10c91f1b0 Extract data from item_menu_icons.s 2018-01-20 15:37:37 -06:00
golem galvanize
646aa19e87 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 15:56:36 -05:00
Diegoisawesome
82c6df71b6 Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 14:20:34 -06:00
Diegoisawesome
971b47755d Extract data from naming screen 2018-01-20 14:16:01 -06:00
Diegoisawesome
80e376d6cb Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 02:38:11 -06:00
Diegoisawesome
2ef7467951 Extract data from pokemon_summary_screen 2018-01-20 02:37:28 -06:00
golem galvanize
4729338e5b Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 03:07:04 -05:00
Diegoisawesome
4cb2853344 Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 00:49:43 -06:00
Diegoisawesome
098671750b Extract data from text window 2018-01-20 00:49:21 -06:00
Diegoisawesome
ce3ab413ba Merge remote-tracking branch 'Diego/dump_data' 2018-01-19 23:43:05 -06:00
Diegoisawesome
7abfc6a989 Extract data from trainer card 2018-01-19 23:42:30 -06:00
Diegoisawesome
73082f2855 Merge remote-tracking branch 'Diego/dump_data' 2018-01-19 21:39:23 -06:00
Diegoisawesome
fbb51bc24b Extract baseroms from party_menu.s 2018-01-19 21:38:57 -06:00
Diegoisawesome
2d74179d86 Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-19 20:08:30 -06:00
Diegoisawesome
4be109e60e Extract forgotten baserom in trade.s 2018-01-19 20:07:59 -06:00
golem galvanize
59b5957ebe Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-19 21:05:13 -05:00
golem galvanize
e5ba5ccdbb dump battle_frontier_2.s 2018-01-19 21:04:43 -05:00
golem galvanize
c45db79b5d dump contest.s 2018-01-19 21:03:17 -05:00
Diegoisawesome
4559a95d9b Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-19 19:54:19 -06:00
Diegoisawesome
b22a800581 Extract data from trade.s 
Also rename window_template_terminator to null_window_template, in keeping with naming conventions
 2018-01-19 19:52:46 -06:00
Diegoisawesome
c74334c26a Fix address of berry struct in item.c 2018-01-19 12:49:08 -06:00
Diegoisawesome
fd544ba438 Start extracting data from trade.s 2018-01-19 12:38:09 -06:00
Diegoisawesome
4c6511c8f9 Extract data from field_screen.s 
Also move files incorrectly placed in interface dir
 2018-01-18 22:36:24 -06:00
Diegoisawesome
6445394929 Extract rotating_gate.s 2018-01-18 15:38:31 -06:00
Diegoisawesome
b7ee548897 Merge remote-tracking branch 'Bird/dump_pokenav.s' 2018-01-18 14:38:45 -06:00
Diegoisawesome
7086bf0048 Merge remote-tracking branch 'Bird/dump_slot_machine.s' 2018-01-18 14:19:13 -06:00
Diegoisawesome
48c1e4961e Merge remote-tracking branch 'Egg/decompile_unk_transition' 2018-01-18 14:02:13 -06:00
Diegoisawesome
dcdf91c111 Merge remote-tracking branch 'Bird/dump_learn_move.s' 2018-01-18 13:46:34 -06:00
Diegoisawesome
dbbd005a53 Merge remote-tracking branch 'Bird/dump_wild_encounter.s' 2018-01-18 13:39:44 -06:00
Diegoisawesome
9a65fbd81e Merge remote-tracking branch 'pret/master' 2018-01-18 12:53:45 -06:00
Diegoisawesome
b806ee8bed Finish extracting pokemon storage system data 2018-01-18 12:52:37 -06:00
scnorton
c6ff1a6ce3 Merge branch 'master' into link 2018-01-18 12:53:31 -05:00
Diegoisawesome
ec8594fd10 Extract Wanda PC box wallpapers 2018-01-18 04:06:43 -06:00
golem galvanize
3c93557bcf tab fixing 2018-01-17 23:10:26 -05:00
golem galvanize
c9a3ef7a6e dump pokenav.s 2018-01-17 23:01:33 -05:00
Diegoisawesome
184fedc870 Extract PC box background images 2018-01-17 20:57:19 -06:00
golem galvanize
5d8db75db9 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_pokenav.s 2018-01-17 19:40:35 -05:00
golem galvanize
173c5923cb clean up reel_time_gfx 2018-01-17 19:19:47 -05:00
golem galvanize
442398261e fix tabs and add forgotten image 2018-01-17 14:48:50 -05:00
golem galvanize
84c6a97429 dump slot_machine.s 2018-01-17 14:44:38 -05:00
golem galvanize
c06bb60183 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_slot_machine.s 2018-01-16 21:53:55 -05:00
golem galvanize
35f8898725 start dumping slot_machine.s 2018-01-16 21:52:43 -05:00
DizzyEggg
295aa96a05 decompile unk transition 2018-01-16 23:57:26 +01:00
camthesaxman
c3c13d0acf more renaming 2018-01-16 15:12:38 -06:00
Diegoisawesome
309640a28c Merge remote-tracking branch 'Egg/decompile_battle_transition' 2018-01-16 14:51:00 -06:00
golem galvanize
820c11358d dump learn_move.s 2018-01-16 15:31:43 -05:00
camthesaxman
157b88b6db identity -> position 2018-01-16 14:01:31 -06:00
DizzyEggg
4dd06dbcd3 optiom menu move data to C 2018-01-16 19:39:35 +01:00
golem galvanize
147b43cca6 tabs 2018-01-16 04:13:28 -05:00
golem galvanize
1555a607d0 dump wild_encounter 2018-01-16 04:06:58 -05:00
golem galvanize
449d645936 window_template usage 2018-01-16 02:20:48 -05:00
Diegoisawesome
56e55d217a Merge remote-tracking branch 'Bird/dump_shop.s' 2018-01-16 00:04:48 -06:00
golem galvanize
29d84dabe6 spacing fix 2018-01-16 01:01:14 -05:00
golem galvanize
f9d7b6a923 fixes 2018-01-16 00:56:12 -05:00
golem galvanize
63460df7fd dump shop.s 2018-01-16 00:40:42 -05:00
golem galvanize
5a5eb4ff59 dumped most of pokenav.s 2018-01-15 23:38:10 -05:00
Diegoisawesome
90c175b73f Extract baseroms from field_effect.s 2018-01-15 02:49:52 -06:00
Diegoisawesome
79451b5bb4 Extract data around Deoxys icon 2018-01-14 23:40:55 -06:00
Diegoisawesome
59680b2a73 Finish adding symbols to battle_anims 2018-01-14 21:04:06 -06:00
DizzyEggg
05aba58d5d fix battle transition conflicts 2018-01-14 22:19:26 +01:00
DizzyEggg
fdbe7fa7de up to 30 battle transitions 2018-01-14 20:45:44 +01:00
DizzyEggg
9106d8df18 up to groudon transition 2018-01-13 21:03:07 +01:00
Diegoisawesome
d2a55b1b10 Remove extraneous comments that mess with incbin count 2018-01-09 22:23:11 -06:00
Diegoisawesome
90c5b93f23 Extract voicegroups 2018-01-09 19:27:11 -06:00
Diegoisawesome
dcdb5d7693 Create sound data files 2018-01-08 01:30:28 -06:00
Diegoisawesome
75f9c16504 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-01-07 18:47:05 -06:00
Diegoisawesome
a11c65ff1a Port field_door 2018-01-07 17:50:13 -06:00
Diegoisawesome
efe19e95c8 Extract door animations 2018-01-07 01:29:26 -06:00
DizzyEggg
eb00e8ba4a more work on battle transition 2018-01-02 20:38:33 +01:00
DizzyEggg
ba176dfe07 start working on battle transition 2018-01-01 17:41:34 +01:00
Diegoisawesome
31140b10c5 Merge remote-tracking branch 'Egg/dump_battle_anim_scripts' 2017-12-31 13:35:14 -06:00
Diegoisawesome
4633de0665 Merge remote-tracking branch 'Egg/dump_trainer_ai_scripts' 2017-12-31 13:06:42 -06:00
DizzyEggg
4f82c1630e dump all battle anim sprite templates ptrs 2017-12-31 17:23:27 +01:00
DizzyEggg
4f950d698c dump battle animation scripts 2017-12-31 16:28:57 +01:00
ProjectRevoTPP
59e40c293e requests 2017-12-31 02:13:32 -05:00
DizzyEggg
ca29ad22e8 dump trainer ai scripts 2017-12-30 16:04:31 +01:00
ProjectRevoTPP
48378f791c last wave of graphics.s dumps 2017-12-30 01:09:06 -05:00
ProjectRevoTPP
06aa07306e sixteenth wave of graphics.s dumps 2017-12-29 20:25:32 -05:00
Diegoisawesome
f0df833f37 Extract easy chat and pokemon animation 2017-12-29 13:34:24 -06:00
ProjectRevoTPP
cfe17cc552 fifteenth wave of graphics.s dumps 2017-12-28 22:05:30 -05:00
ProjectRevoTPP
77b7462dbb merge 2017-12-28 17:26:58 -05:00
ProjectRevoTPP
03a2a3b81b fourteenth wave of graphics.s dumps 2017-12-28 17:15:37 -05:00
Diegoisawesome
1496ea3a24 Merge branch 'master' of github.com:pret/pokeemerald 2017-12-28 03:00:15 -06:00
Diegoisawesome
2d04eb22ab Split rom_81370FC and port function names 2017-12-28 02:09:11 -06:00
Diegoisawesome
ca49f8438d Extract battle_transition data 2017-12-27 15:25:15 -06:00
ProjectRevoTPP
8a338f44db thirteenth wave of graphics.s dumps 2017-12-26 22:37:36 -05:00
Diegoisawesome
f9a9391ff3 Split/extract/port landmark 2017-12-26 21:20:29 -06:00
Diegoisawesome
ba130d469d Split/extract pokedex cry screen data 2017-12-26 16:18:18 -06:00
Diegoisawesome
eff0caf759 Split and extract roulette data 2017-12-26 01:42:08 -06:00
ProjectRevoTPP
0af942e0b8 twelfth wave of graphics.s dumps 2017-12-26 01:39:01 -05:00
ProjectRevoTPP
770714dcee eleventh wave of graphics.s dumps 2017-12-25 22:00:56 -05:00
ProjectRevoTPP
d6bac7f9f8 tenth wave of graphics.s dumps (battle_frontier) 2017-12-25 15:51:01 -05:00
Diegoisawesome
15c92318d3 Extract data from misc files 
Also split data4d.s
 2017-12-25 00:32:01 -06:00
ProjectRevoTPP
7dd75f453d merge 2017-12-25 00:05:39 -05:00
ProjectRevoTPP
2c7112ce8f ninth wave of graphics.s dumps 2017-12-24 22:39:43 -05:00
DizzyEggg
47ab4efef0 fix tab-killed strings 2017-12-24 19:47:27 +01:00
DizzyEggg
71b522b212 trailing spaces 2017-12-24 19:26:44 +01:00
DizzyEggg
b2eadfa16c spaces to tabs 2017-12-24 19:15:51 +01:00
DizzyEggg
ee4185865d more data dumped 2017-12-24 18:40:24 +01:00
DizzyEggg
c436f01ce9 get rid of trainer card pointers 2017-12-24 12:18:21 +01:00
DizzyEggg
43f23b8a78 Merge branch 'master' into dump_pointers 2017-12-24 11:15:00 +01:00
ProjectRevoTPP
addfdfbcba eighth wave of graphics.s dumps 2017-12-24 02:54:08 -05:00
Diegoisawesome
e8153598ef Extract contest painting 2017-12-24 01:09:18 -06:00
ProjectRevoTPP
d0659a3ec6 seventh wave of graphics.s dumps 2017-12-24 01:00:53 -05:00
ProjectRevoTPP
e56f04ae2e sixth wave of graphics.s dumps 2017-12-24 00:08:28 -05:00
ProjectRevoTPP
ac74d6f100 fifth wave of graphics.s dumps 2017-12-23 22:06:01 -05:00
ProjectRevoTPP
4ad2c5c941 fourth wave of graphics.s dumps 2017-12-23 18:30:48 -05:00
DizzyEggg
8cd4908fa3 merge bike with master, fix conflicts 2017-12-24 00:08:55 +01:00
Diegoisawesome
ca25068ae8 Extract baseroms from battle_tower 2017-12-23 16:17:31 -06:00
DizzyEggg
3a3772c74f more baseroms dumped 2017-12-23 22:41:31 +01:00
ProjectRevoTPP
d137b7f0a8 third wave of graphics.s dumps (battle_anim part 2) 2017-12-23 15:50:58 -05:00
Diegoisawesome
4eccc06973 Finish extracting battle_frontier_2 data 2017-12-23 13:56:52 -06:00
DizzyEggg
4d24381e5e more pointer dumping 2017-12-23 20:47:43 +01:00
DizzyEggg
e647cb2308 dump start menu and a bit of textwindow and trainercard 2017-12-23 19:23:55 +01:00
DizzyEggg
c959c65562 dump some pokenav data pointers 2017-12-23 15:15:02 +01:00
DizzyEggg
4f6ca126b5 dump all rayquaza scene data to C 2017-12-23 13:23:23 +01:00
Diegoisawesome
8bd6f9319f Continue extraction from battle_frontier_2 2017-12-23 03:47:03 -06:00
Diegoisawesome
a64b5cd31f Extract start of battle_frontier_2 2017-12-23 01:16:45 -06:00
ProjectRevoTPP
3499ff51b5 second wave of graphics.s dumps (battle_anim part 1) 2017-12-23 01:45:04 -05:00
ProjectRevoTPP
d10c645353 first wave of graphics.s dump 2017-12-22 19:18:09 -05:00
DizzyEggg
e7111984a9 start rayquaza dumping 2017-12-23 00:22:07 +01:00
Diegoisawesome
04b64dda0b Extract baseroms from battle frontier and tent files 2017-12-22 15:04:05 -06:00
DizzyEggg
3ca5af4d5d do some pointer storage system hunting 2017-12-22 20:10:51 +01:00
DizzyEggg
9c45ca0c5f dump pokemon icon 2017-12-22 19:16:15 +01:00
DizzyEggg
08ebf59e44 get rid of pointers in pokedex 2017-12-22 18:43:41 +01:00
DizzyEggg
cddd44834e Merge branch 'master' into dump_pointers 2017-12-22 16:22:16 +01:00
Diegoisawesome
4a4a10a990 Merge remote-tracking branch 'pret/master' 2017-12-22 03:10:09 -06:00
Diegoisawesome
8278583e7b Extract baseroms from battle_anim files 2017-12-22 02:45:03 -06:00
sceptillion
3c286feec6 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs 2017-12-22 00:17:34 -08:00
sceptillion
96511dc214 use internal song names 2017-12-22 00:10:20 -08:00
sceptillion
d6987ee9b9 dump songs 2017-12-21 14:30:11 -08:00
Diegoisawesome
0403f6eea9 Merge remote-tracking branch 'Egg/decompile_use_pokeblock' 2017-12-21 16:19:50 -06:00
DizzyEggg
bcffcb0c1c pokeblock merge conflicts 2017-12-21 23:12:36 +01:00
DizzyEggg
19c25a8f2b start dumping pokedex 2017-12-21 22:56:20 +01:00
Marcus Huderle
173761a5a1 Port generic event script macros from pokeruby 2017-12-21 13:47:52 -06:00
Diegoisawesome
4307292f55 Merge remote-tracking branch 'Egg/kobold_fixes' 2017-12-21 11:42:10 -06:00
DizzyEggg
6b5157b2a3 decompile bike.s 2017-12-21 17:46:03 +01:00
DizzyEggg
b4b3fe04ee pr dump review changes 2017-12-20 17:24:37 +01:00
DizzyEggg
8380fc63dc Merge branch 'master' into kobold_fixes 2017-12-20 17:22:25 +01:00
DizzyEggg
504363f2a6 Merge branch 'master' into decompile_trainer_see 2017-12-20 17:21:46 +01:00
DizzyEggg
b615af4184 fix pokeblock merge conflicts 2017-12-20 17:16:56 +01:00
DizzyEggg
38af0f78ea hopefully fix kobold PR 2017-12-19 20:52:52 +01:00
DizzyEggg
37a6e1b6c7 Merge branch 'master' of https://github.com/itskobold/pokeemerald into kobold_fixes 2017-12-19 20:09:28 +01:00
DizzyEggg
7581218569 Merge branch 'master' into decompile_battle1 2017-12-19 17:37:53 +01:00
DizzyEggg
5744356989 decompile trainer see 2017-12-18 23:26:44 +01:00
DizzyEggg
a612ef12a0 start working on trainer see 2017-12-18 19:35:50 +01:00
DizzyEggg
cb229f56e8 fix pokeblock conflicts 2017-12-18 16:58:14 +01:00
DizzyEggg
54dccc8512 give batter script command names 2017-12-17 20:38:01 +01:00
DizzyEggg
7517f6a030 fix battle setup conflicts 2017-12-17 20:26:13 +01:00
DizzyEggg
eb8055eb07 battle 1 is decompiled 2017-12-17 20:10:57 +01:00
scnorton
3c2b1731ee Merge branch 'master' into link 2017-12-17 14:09:06 -05:00
PikalaxALT
190a2cba61 Merge branch 'master' into link 2017-12-16 11:27:10 -05:00
PikalaxALT
6d73bb4b57 Import function labels from Ruby 2017-12-16 10:23:05 -05:00
DizzyEggg
f4ab21ee67 Merge branch 'master' into decompile_use_pokeblock 2017-12-16 11:42:59 +01:00
PikalaxALT
da2e0dfe50 Merge branch 'master' into clock 2017-12-15 21:04:25 -05:00
DizzyEggg
44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
DizzyEggg
4351676749 decompile more of pokeblock.s 2017-12-16 00:08:23 +01:00
Diegoisawesome
e3c366df64 Merge remote-tracking branch 'pret/master' 2017-12-15 00:08:48 -06:00
camthesaxman
9525fdd54d convert more constants 2017-12-11 12:41:13 -06:00
camthesaxman
c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
DizzyEggg
8ac17e0948 move data from asm to pokeblock.c 2017-12-11 16:52:28 +01:00
DizzyEggg
b4d10ab7ab split pokeblock files 2017-12-10 19:02:51 +01:00
DizzyEggg
37ae6a7758 move more pokeblock data to C and label 2017-12-10 16:38:27 +01:00
DizzyEggg
fb30acbc30 pokeblock feed is decompiled 2017-12-10 15:04:03 +01:00
DizzyEggg
bb1ae5f857 Merge branch 'master' into decompile_use_pokeblock 2017-12-09 21:24:47 +01:00
DizzyEggg
6561b62986 start pokeblock feed 2017-12-09 21:23:40 +01:00
PikalaxALT
dc0d544119 sub_800E87C, remaining data in link_rfu 2017-12-05 23:54:31 -05:00
camthesaxman
00896cb3b5 rename rng.c to random.c and rom4.c to overworld.c 2017-12-05 12:27:33 -06:00
Cameron Hall
fd75493bc6
Merge pull request #129 from DizzyEggg/dumb_naming 
Name some battle labels
 2017-12-05 12:05:06 -06:00
PikalaxALT
8b5d6fe5d9 CreateWirelessStatusIndicatorSprite 2017-12-03 22:01:06 -05:00
PikalaxALT
519c8d42f8 through sub_800DD94 2017-12-03 20:04:54 -05:00
DizzyEggg
790df7159e more battlescript labels 2017-12-03 00:47:21 +01:00
DizzyEggg
e10aea9a51 give some more labels to battle struct fields 2017-12-02 23:31:58 +01:00
DizzyEggg
2fe25da65a move pokeball data to rom 2017-12-02 21:27:00 +01:00
DizzyEggg
c2fdde3a49 pokeball file is decompiled 2017-12-02 20:38:26 +01:00
DizzyEggg
c27f7a8131 start working on pokeball 2017-12-02 19:39:07 +01:00
DizzyEggg
d75e7ace1d label battle stuff 2017-12-02 14:08:55 +01:00
DizzyEggg
273474d57a give names to some battlescripts 2017-12-02 00:03:46 +01:00
DizzyEggg
039c9f4bd8 merge with master 2017-12-01 21:27:29 +01:00
DizzyEggg
646664ff29 battle setup file is decompiled 2017-12-01 21:25:13 +01:00
DizzyEggg
e8ecb01ab2 more work on battle setup 2017-11-29 19:54:15 +01:00
Diegoisawesome
70743f4b95 Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-29 00:52:32 -06:00
DizzyEggg
10470ef536 start working on battle setup 2017-11-28 23:02:09 +01:00
PikalaxALT
88636dfc2a Merge branch 'master' into clock 2017-11-27 20:09:53 -05:00
PikalaxALT
b9d08ed83b Merge branch 'master' into unk_81BAD84 2017-11-27 20:08:34 -05:00
PikalaxALT
cbd2718b5e Merge branch 'master' into link 2017-11-27 20:05:51 -05:00
Cameron Hall
6e317c6463
Merge pull request #124 from DizzyEggg/dump_battlescripts 
Dump Battle Scripts
 2017-11-27 14:00:29 -06:00
DizzyEggg
77a6c30bd4 make various macros 2017-11-26 21:04:00 +01:00
DizzyEggg
b0657350a4 berry blender fix merge conflicts 2017-11-26 19:21:51 +01:00
DizzyEggg
d48392e677 change battle variables names 2017-11-26 18:07:00 +01:00
DizzyEggg
59f64c622b name more battlescripts 2017-11-26 17:26:11 +01:00
DizzyEggg
1bb5b1fd07 more battle labels 2017-11-26 17:15:28 +01:00
DizzyEggg
9886eeb5d8 fix, rename, label battle labels and battlescripts 2017-11-26 13:26:58 +01:00
DizzyEggg
cc572f7c00 clear battle code and battlescripts 2017-11-26 11:55:17 +01:00
DizzyEggg
938d346b6d fixes and labels 2017-11-26 01:19:57 +01:00
DizzyEggg
76f4a8b195 clean up and use names for printfromtable 2017-11-26 00:33:40 +01:00
DizzyEggg
847bfa1540 add more battlescript macros 2017-11-25 21:32:17 +01:00
DizzyEggg
fe658cc2fd create setword macro 2017-11-25 21:11:20 +01:00
DizzyEggg
9151a6d094 dump battlescripts, rename battlescripts 2017-11-25 18:42:31 +01:00
PikalaxALT
2746967bef through sub_8134CE8 2017-11-24 20:46:29 -05:00
PikalaxALT
24009ea941 through Cb2_StartWallClock and associated data 2017-11-24 19:49:03 -05:00
PikalaxALT
2280614a14 Start decompiling data 2017-11-24 19:06:01 -05:00
PikalaxALT
f54f2c424f LoadWallClockGraphics 2017-11-24 18:00:26 -05:00
PikalaxALT
772da493f9 data/unk_81BAD84 2017-11-23 21:15:57 -05:00
itskobold
deec6f21db Pointer fixes etc 
Fixed up the last of my old dumps
 2017-11-23 10:48:56 +00:00
itskobold
40638a48e7 battle_frontier_1.s fix 
sorted out most of the other raw pointers
 2017-11-22 15:15:58 +00:00
itskobold
a9f7a41edd battle_frontier_1 buncha pointers fixed 2017-11-22 13:05:28 +00:00
itskobold
caf952e02e Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-20 18:27:23 +00:00
DizzyEggg
4e25ef10f2 wild encounter review changes 2017-11-20 16:40:02 +01:00
DizzyEggg
a3b5af17ea berry blender is done 2017-11-19 22:48:46 +01:00
itskobold
625be4bf04 Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-19 10:50:39 +00:00
PikalaxALT
d6d315d817 Merge branch 'master' into link 2017-11-19 00:07:56 -05:00
DizzyEggg
3de416662b wild encounter, fix merge conflicts 2017-11-18 21:45:52 +01:00
DizzyEggg
8fd3081306 start working on berry blender 2017-11-18 16:11:34 +01:00
DizzyEggg
6b075ae0ff wild encounter file is decompiled 2017-11-17 22:28:55 +01:00
Diegoisawesome
52624c4fb7 Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-17 15:07:17 -06:00
DizzyEggg
1b7246395d merge conflicts, review changes, daycare 2017-11-17 19:31:03 +01:00
DizzyEggg
a2a17bba92 more work on wild encounter 2017-11-17 17:50:07 +01:00
itskobold
370e47beee Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-17 09:25:40 +00:00
PikalaxALT
236cbf96c8 Merge origin/master into pikalaxalt/link 2017-11-16 19:00:07 -05:00
DizzyEggg
b37d8c0821 start decompiling wild encounter 2017-11-16 20:38:10 +01:00
Diegoisawesome
a98c6bf210 Fix build by renaming specials 2017-11-16 09:30:04 -06:00
Diegoisawesome
f8402b3d74 Rename contest string symbols 2017-11-15 23:57:38 -06:00
Diegoisawesome
c0d180a870
Merge pull request #100 from PikalaxALT/heal_location 
Heal location and Field Region Map
 2017-11-15 23:24:45 -06:00
Diegoisawesome
6a73c89e54
Merge pull request #113 from DizzyEggg/decompile_pss 
Start Pokemon Storage System
 2017-11-15 20:55:38 -06:00
DizzyEggg
ba00a1c688 daycare file fully done 2017-11-15 22:12:18 +01:00
DizzyEggg
616edd6c3f daycare file is decompiled 2017-11-15 20:08:31 +01:00
DizzyEggg
1e79d53d2f merge daycare with master 2017-11-15 17:18:05 +01:00
PikalaxALT
89b695278d Merge branch 'master' into heal_location 2017-11-15 09:01:56 -05:00
itskobold
46ee15b962 Getting myself organised 
durr
 2017-11-15 12:55:16 +00:00
itskobold
7c79b030e9 Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-15 12:42:18 +00:00
itskobold
2acab81713 Merge branch 'master' of https://github.com/pret/pokeemerald 
also started fixing pointers in my dumps
 2017-11-15 12:41:25 +00:00
Diegoisawesome
ce0e5cbfe4 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps 2017-11-15 00:47:34 -06:00
Diegoisawesome
118bf4f4b1
Merge pull request #108 from DizzyEggg/decompile_starter_choose 
Decompile starter choose
 2017-11-14 16:41:53 -06:00
DizzyEggg
95949c772e more of daycare done 2017-11-14 21:43:23 +01:00
DizzyEggg
a972de7bca start working on daycare 2017-11-14 20:23:25 +01:00
DizzyEggg
516a5b2219 fix merge conflicts, review changes 2017-11-13 20:00:20 +01:00
Diegoisawesome
d1fe93bf4a
Merge pull request #105 from DizzyEggg/dump_things 
Get rid of a couple of baseroms
 2017-11-13 12:46:40 -06:00
DizzyEggg
4d615350c8 added berry blender start gfx 2017-11-13 19:36:23 +01:00
DizzyEggg
bb9c928330 starter choose review changes 2017-11-13 18:30:17 +01:00
PikalaxALT
1ca032c6ff Address review items, 1 2017-11-12 21:13:18 -05:00
DizzyEggg
c967ba1d5f dump couple of baseroms review changes 2017-11-12 18:41:04 +01:00
Diegoisawesome
6e6e11205d Fix capitalized symbol names 2017-11-11 18:17:46 -06:00
Diegoisawesome
f497c1508b Split files from event_scripts.s 
Also move maps/scripts to scripts/maps
 2017-11-11 16:10:17 -06:00
itskobold
e373cf4bb9 field_effect dataroms 
quite a few pointers and stuff done
 2017-11-11 15:26:39 +00:00
itskobold
1e495b2837 contest_painting.s, cute_sketch.s 
simple stuff
 2017-11-11 15:05:05 +00:00
DizzyEggg
fa3691ca40 start pss 2017-11-11 14:45:08 +01:00
PikalaxALT
e874cbd9d9 Rename functions in link.c 2017-11-11 00:05:44 -05:00
PikalaxALT
b92d85fd30 Decompile link data 2017-11-10 20:55:03 -05:00
PikalaxALT
50c1622507 Split link.s and link_rfu.s 2017-11-10 20:47:24 -05:00
Diegoisawesome
2e40384fa2 Extract baseroms from event_scripts 2017-11-10 18:12:18 -06:00
Diegoisawesome
a6c30ba951 More file organization 2017-11-10 13:20:27 -06:00
Diegoisawesome
d5af24fb2d Extract tilesets 2017-11-10 12:46:01 -06:00
Diegoisawesome
6ecad1a59d Organize map data 2017-11-10 12:39:00 -06:00
Diegoisawesome
a81deec3b3 Extract unused maps 2017-11-10 11:42:04 -06:00
Diegoisawesome
de8a058714 Extract more baseroms from maps 2017-11-10 02:52:05 -06:00
Diegoisawesome
29079c4b99 Dump numerous baseroms, begin moving data to proper files 2017-11-10 01:49:12 -06:00
Diegoisawesome
09e431077a Merge remote-tracking branch 'pret/master' into dump_maps 2017-11-09 20:30:56 -06:00
PikalaxALT
d94f74d261 sub_8009AA0 2017-11-09 21:14:43 -05:00
Diegoisawesome
2d3044aaa6 Begin map dump cleanup 2017-11-09 19:38:57 -06:00
Diegoisawesome
455a979819 Add dummy Sootopolis map connections 2017-11-09 19:21:54 -06:00
Diegoisawesome
f61810a8f9 Dump maps 2017-11-09 19:21:31 -06:00
Diegoisawesome
e6ef86e4b0 Update variable and flag names 2017-11-08 15:20:10 -06:00
DizzyEggg
045e7d6382 split starter choose data 2017-11-08 20:53:39 +01:00
DizzyEggg
61408456e8 starter choose file is decompiled 2017-11-08 18:05:47 +01:00
itskobold
0e69dcd30c more work on battle_frontier_1.s 
added a few window_templates and pointer tables
 2017-11-08 09:51:20 +00:00
itskobold
bb28d9ef40 easy_chat.s 2017-11-08 08:32:41 +00:00
PikalaxALT
59eb766f47 sub_80094EC 2017-11-07 21:45:44 -05:00
PikalaxALT
fce326fbd4 through sub_8009414 2017-11-07 20:25:24 -05:00
itskobold
fd80cc40c0 daycare.s 
a few pointers
 2017-11-07 23:23:09 +00:00
itskobold
b2cb7ba58c contest.s, region_map.s, trainer_rematch.s 
all partially done
 2017-11-07 23:11:17 +00:00
itskobold
aedec0865d Labels 2017-11-07 22:04:52 +00:00
itskobold
45b28d08ba mystery_event_msg.s 
also fixed a couple of other files
 2017-11-07 21:24:39 +00:00
itskobold
ffeeb20299 mauville_old_man.s 
progress
 2017-11-07 20:47:43 +00:00
itskobold
da2335f10c naming_screen.s update 
made it more readable
 2017-11-07 20:09:38 +00:00
itskobold
0f541e703d shop.s, menu_indicators.s, naming_screen.s 
all only partially done
 2017-11-07 19:46:00 +00:00
itskobold
4c514a50bf field_screen.s 
partially done
 2017-11-07 18:59:33 +00:00
itskobold
f844eab31b baseroms 
fieldmap.s
fldeff_cut.s (partially)
 2017-11-07 18:31:19 +00:00
itskobold
dedae4a1d0 battle_frontier_1.s, unk_transition.s dumproms 
still a fair bit to dump for battle_frontier_1.s
 2017-11-07 14:51:51 +00:00
DizzyEggg
a729e9838e move data to hall of fame c file 2017-11-06 18:41:32 +01:00
DizzyEggg
a2263207bf hall of fame is decompiled 2017-11-06 17:27:39 +01:00
DizzyEggg
0f723f7677 halfway through hall of fame 2017-11-05 14:55:13 +01:00
DizzyEggg
bd56bb073f start working on hall of fame 2017-11-05 12:05:07 +01:00
DizzyEggg
99e697223f get rid of two baseroms 2017-11-05 00:25:09 +01:00
DizzyEggg
135c4ea1f6 dump some of the item menu 2017-11-05 00:16:09 +01:00
DizzyEggg
4d4d642285 dump berry blender and script menu 2017-11-04 22:40:36 +01:00
DizzyEggg
352102a07a Merge branch 'master' into decompile_battle_7 2017-11-04 16:12:45 +01:00
DizzyEggg
6c8155074b battle 7 is decompiled 2017-11-04 16:11:13 +01:00
PikalaxALT
ab3b8cd51a Merge branch 'master' into heal_location 2017-11-02 07:59:29 -04:00
Diegoisawesome
af197ccd3b
Merge pull request #98 from PikalaxALT/bard_music 
Decompile bard music
 2017-11-01 23:18:10 -05:00
PikalaxALT
75262c1920 Merge branch 'master' into bard_music 2017-11-02 00:09:14 -04:00
PikalaxALT
17fd3bccf7 Merge branch 'master' into secret_base 2017-11-01 23:39:54 -04:00
PikalaxALT
9cfdc8b7e8 Merge branch 'master' into heal_location 2017-11-01 23:37:41 -04:00
PikalaxALT
22f6517423 Decompile remaining region map data 2017-11-01 23:21:07 -04:00
PikalaxALT
c99a08d448 More data decomp in region_map 2017-11-01 23:00:22 -04:00
PikalaxALT
30d68db0dc sRegionMapCursorSpriteTemplate 2017-11-01 22:26:54 -04:00
PikalaxALT
2e0b1700f4 sRegionMap_MapSecAquaHideoutOld 2017-11-01 22:12:18 -04:00
PikalaxALT
4ff03f85a9 Decompile data related to Emerald-specific areas 2017-11-01 22:07:30 -04:00
PikalaxALT
50efd7b68d Decompile region map entry structs 2017-11-01 21:51:59 -04:00
PikalaxALT
7eacb24cf7 Start ripping graphics/data for region_map 2017-11-01 21:10:47 -04:00
DizzyEggg
6cb1c4fd6e fix merge conflicts, evo scene 2017-10-31 19:36:25 +01:00
DizzyEggg
665734d689 evolution files review changes 2017-10-31 19:28:43 +01:00
DizzyEggg
712ae56167 review change battle controllers 2017-10-31 18:04:08 +01:00
PikalaxALT
c0a229f108 Decompile field region map bg and window templates 2017-10-29 11:12:28 -04:00
PikalaxALT
00f4bba6d8 Decompile heal location functions 2017-10-28 20:55:01 -04:00
PikalaxALT
6fcde15bb6 Decompile heal location data 2017-10-28 20:43:33 -04:00
PikalaxALT
607b7ac834 Decompile remaining bard music data 2017-10-28 10:42:12 -04:00
PikalaxALT
4ae9b1d9d0 Decompile Bard Sound structs 2017-10-28 10:27:28 -04:00
PikalaxALT
5da296e94e GetWordPhonemes; assign names and improve guess of types 2017-10-28 09:46:35 -04:00
PikalaxALT
a5951592be Decompile data 2017-10-27 23:21:09 -04:00
DizzyEggg
f4e134569f evo graphics file is done 2017-10-27 15:49:14 +02:00
DizzyEggg
0f992c8f5c begin working on evolution graphics 2017-10-27 14:59:55 +02:00
Diegoisawesome
49c88e6343 Merge branch 'master' of github.com:pret/pokeemerald into dump_maps 2017-10-27 02:02:36 -05:00
Diegoisawesome
431e737453 Final predump fixes 2017-10-27 00:26:34 -05:00
Diegoisawesome
7827feaa2f Final fixes before dump 2017-10-26 18:03:19 -05:00
DizzyEggg
fa36e23683 start opponent controller, thx bird 2017-10-25 21:57:28 +02:00
DizzyEggg
91b010299f start recorded opponent controller 2017-10-25 16:24:17 +02:00
Diegoisawesome
71cde8829b More fixes 2017-10-24 15:06:09 -05:00
Diegoisawesome
3b4093640e Even more prep 2017-10-24 13:59:43 -05:00
Diegoisawesome
17303d963e More prep 2017-10-24 00:11:26 -05:00
Diegoisawesome
26f9776f6f Fix some stuff 2017-10-23 22:18:35 -05:00
Diegoisawesome
c23a633a44 Prepare for dumping 2017-10-23 21:18:49 -05:00
DizzyEggg
356eb34e32 undo revert 2017-10-23 14:40:22 +02:00
DizzyEggg
5b05811dd9 start link partner controller 2017-10-23 14:24:54 +02:00
DizzyEggg
5b70307962 revert merge coz its bugged 2017-10-23 13:36:55 +02:00
DizzyEggg
7d1373e3fa Merge branch 'master' into decompile_battle_controllers 2017-10-23 13:33:32 +02:00
DizzyEggg
aa7e97945b start recorded player controller 2017-10-23 11:24:58 +02:00
Diegoisawesome
cd7c3476d5 Rename script commands again 2017-10-23 00:34:55 -05:00
Diegoisawesome
88230e8d16 Merge pull request #91 from golemgalvanize/summary 
partially decompile pokemon_summary_screen
 2017-10-22 20:16:16 -05:00
PikalaxALT
0dd3db7061 Rename some functions and all RAM objects in decoration.c 2017-10-22 20:13:31 -04:00
PikalaxALT
c042e5148b Decoration + decoration_inventory (#89) 
* SetDecorationInventoriesPointers

* ClearDecorationInventories

* CheckHasDecoration

* DecorationAdd

* DecorationCheckSpace

* DecorationRemove

* sub_8161A38

* CountDecorations; Funcion renaming

* Disassemble decoration data structs, tilemaps, and descriptions

* sub_8126968

* sub_81269D4

* through sub_8126A88

* through sub_8126B2C

* sub_8126B80

* sub_8126C08

* sub_8126C48

* sub_8126CA4

* sub_8126D10

* sub_8126E44

* sub_8126E8C

* sub_8126F68

* sub_8127058

* sub_8127088

* sub_81270E8

* through sub_8127208

* through sub_8127268

* sub_8127284

* through sub_81272F8

* sub_8127330

* through sub_8127480

* sub_81274A0

* sub_8127500; makefile now tells scaninc to scan headers

* Actual real fix to mapfile being in build/emerald instead of wd

* through sub_812759C

* through sub_812764C

* through sub_8127744

* through sub_81277BC

* sub_81277E8

* sub_8127814

* through sub_81279C4

* through sub_8127ACC

* sub_8127B04

* sub_8127B54

* sub_8127B90

* sub_8127D38

* sub_8127E18

* sub_8127F68

* sub_8128060

* ConfigureCameraObjectForPlacingDecoration

* SetUpPlacingDecorationPlayerAvatar

* sub_812826C

* through sub_8128414

* through sub_81284F4

* sub_812853C

* sub_8128950

* through sub_8128AAC

* through sub_8128BBC

* c1_overworld_prev_quest

* sub_8128C64

* sub_8128CD4

* sub_8128D10

* sub_8128DB4

* through sub_8128E18

* through sub_8129068

* sub_8129088

* through sub_81291E8

* sub_812925C

* sub_81292D0

* sub_81292E8

* gpu_pal_decompress_alloc_tag_and_upload

* AddDecorationIconObjectFromIconTable

* GetDecorationIconPicOrPalette

* AddDecorationIconObjectFromFieldObject

* AddDecorationIconObject

* through sub_8129708

* sub_81297F8

* sub_81298EC

* SetUpPuttingAwayDecorationPlayerAvatar

* sub_8129ABC

* sub_8129B34

* sub_8129BCC

* through sub_8129C74

* through sub_8129D8C

* sub_8129E0C

* sub_8129E74

* sub_8129F20

* sub_8129FC8

* sub_812A040

* nonmatching sub_812A0E8

* through sub_812A22C

* sub_812A25C

* sub_812A2C4

* through sub_812A39C

* Remaining fns in decoration.s

* Decompile decoration headers

* Decompile all remaining decoration data that had already been disassembled

* Disassemble two data objects

* Suggest structure of list menu template

* decompile through decoration list menu template

* Disassemble decoration icon graphics table

* Rip icon gfx

* Decompile deco icon table

* Decompile more data related to drawing decorations

* Decompile gUnknown_085A7250 structs

* Decompile two sprite templates

* Decompile remaining data in decoration.s

* Decompile decoration ewram

* deco -> decor
 2017-10-22 17:55:07 -05:00
DizzyEggg
21f4995922 start player partner controller 2017-10-22 20:49:21 +02:00
DizzyEggg
26c79313d8 safari controller is done 2017-10-22 20:38:23 +02:00
DizzyEggg
f77dcef59d Merge branch 'master' into decompile_battle_controllers 2017-10-22 18:47:06 +02:00
DizzyEggg
3d1c16523e start working on battle controllers, especially player 2017-10-21 17:32:35 +02:00
ProjectRevoTPP
ae53458622 decompile clear_save_data_screen. 2017-10-21 00:44:17 -04:00
Diegoisawesome
afd42c8e14 Merge pull request #92 from DizzyEggg/decompile_walda_phrase 
decompile walda phrase
 2017-10-20 14:01:40 -05:00
DizzyEggg
31e0b468c7 move from raq scene to walda phrase 2017-10-20 20:46:26 +02:00
Diegoisawesome
d2cf86bff9 Merge pull request #82 from PikalaxALT/mail 
Decompile functions for reading mail
 2017-10-20 13:22:56 -05:00
DizzyEggg
cda5c5f925 start working on walda phrase 2017-10-20 18:52:01 +02:00
DizzyEggg
b65da491a9 merge with master, fix conflicts 2017-10-20 10:49:21 +02:00
Diegoisawesome
ae5aa3c4df Merge pull request #86 from PikalaxALT/special_ptr_table 
Decompile special pointers
 2017-10-20 00:24:06 -05:00
DizzyEggg
11bead31e9 battle interface is done 2017-10-19 15:28:41 +02:00
U-User-PC\User
d4532c70cb fix merge conflicts 2017-10-18 19:28:36 -04:00
DizzyEggg
25a9c851cf more of battle interface done again 2017-10-18 23:05:14 +02:00
DizzyEggg
4b45282dd3 start working on battle interface 2017-10-16 18:12:27 +02:00
DizzyEggg
dd0f19476c battle anim file is decompiled 2017-10-15 23:21:59 +02:00
DizzyEggg
ebb2999c03 more of battle anim done 2017-10-14 23:37:44 +02:00
PikalaxALT
70eaf5d1be port def_special 2017-10-14 16:28:22 -04:00
PikalaxALT
7cf9693551 Decompile special pointers 2017-10-14 14:26:25 -04:00
DizzyEggg
752ce9b90d start working on battle anim 2017-10-14 16:55:25 +02:00
PikalaxALT
a252140f3b Merge branch 'master' into mail 2017-10-14 09:52:56 -04:00
Diegoisawesome
924c0c6b5a Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd 2017-10-13 20:29:11 -05:00
Diegoisawesome
3040c1e1aa Merge pull request #75 from DizzyEggg/decompile_reshow_battle_screen 
Decompile reshow battle screen
 2017-10-13 12:42:42 -05:00
PikalaxALT
e24f3808f4 Merge branch 'master' into mail 2017-10-13 11:16:34 -04:00
PikalaxALT
52db3ad5aa Decompile TV (#80) 
* ClearTVShowData

* special_0x44

* DoTVShow (nonmatching because align)

* DoTVShowBravoTrainerPokemonProfile

* Update field names

* DoTVShowBravoTrainerBattleTower

* Renaming of struct fields

* sub_80EBFF4 and UpdateTVScreensOnMap

* SetTVMetatilesOnMap

* Power buttons for the TV screens on the map

* special_0x45

* sub_80EC18C

* special_0x4a

* ResetGabbyAndTy

* GabbyAndTyBeforeInterview

* GabbyAndTyAfterInterview

* Through IsTVShowInSearchOfTrainersAiring

* GabbyAndTyGetLastQuote

* GabbyAndTyGetLastBattleTrivia

* GabbyAndTySetScriptVarsToFieldObjectLocalIds

* InterviewAfter; use TVShow as a precursor for making the individual show structs anonymous

* Make TV structs anonymous within the union

* Move the TV union to its own subheader

* Move TV show enums to the global.tv.h subheader

* Funcion renaming

* Apply static attributes where able

* PutPokemonTodayCaughtOnAir

* sub_80EC8A4

* PutPokemonTodayFailedOnTheAir

* sub_80EC9E8, sub_80ECA10

* sub_80ECA38

* sub_80ECB00

* Put3CheersForPokeblocksOnTheAir

* PutFanClubSpecialOnTheAir

* ContestLiveUpdates_BeforeInterview

* Other before-interview Contest Live Updates functions

* ContestLiveUpdates_BeforeInterview_5

* InterviewAfter_BravoTrainerPokemonProfile

* BravoTrainerPokemonProfile_BeforeInterview1

* BravoTrainerPokemonProfile_BeforeInterview2

* Disassemble TV data

* Decompile TV data

* InterviewAfter_BravoTrainerBattleTowerProfile

* SaveRecordedItemPurchasesForTVShow

* PutNameRaterShowOnTheAir

* StartMassOutbreak

* PutLilycoveContestLadyShowOnTheAir

* InterviewAfter_FanClubLetter

* Rip TV strings

* InterviewAfter_RecentHappenings

* InterviewAfter_PkmnFanClubOpinions

* sub_80ED718

* EndMassOutbreak

* sub_80ED888

* sub_80ED8B4

* UpdateMassOutbreakTimeLeft

* sub_80ED950

* PutFishingAdviceShowOnTheAir

* through sub_80EDA80

* ewram and common syms are now fetched from the object files

* BSS symbols are taken from the tv.o file

* through sub_80EDC60

* sub_80EDCE8

* sub_80EDD78

* through sub_80EDE84

* nomatching sub_80EDE98

* sub_80EDFB4

* sub_80EE104

* sub_80EE104

* sub_80EE184

* sub_80EE2CC

* sub_80EE35C

* sub_80EE44C

* sub_80EE4DC

* sub_80EE5A4

* sub_80EE69C

* sub_80EE72C

* sub_80EE7C0

* sub_80EE818

* sub_80EE8C8

* sub_80EEA70

* sub_80EEB98

* sub_80EEBF4

* through sub_80EED60

* Functions relating to Pokemon News

* sub_80EEF6C

* GetPriceReduction

* IsPriceDiscounted

* sub_80EF120

* through sub_80EF370

* sub_80EF40C

* HasMixableShowAlreadyBeenSpawnedWithPlayerID

* TV_SortPurchasesByQuantity

* FindActiveBroadcastByShowType_SetScriptResult

* InterviewBefore

* through sub_80EF88C

* through sub_80EF93C

* through sub_80EFA24

* through TV_BernoulliTrial

* sub_80EFB58

* sub_80EFBA4

* sub_80EFBDC

* through sub_80EFD98

* ChangePokemonNickname

* ChangeBoxPokemonNickname

* sub_80EFF9C

* through player_id_to_dword

* CheckForBigMovieOrEmergencyNewsOnTV

* GetMomOrDadStringForTVMessage

* sub_80F01E8

* sub_80F0358

* sub_80F049C

* TV record mixing functions

* sub_80F06D0

* sub_80F0708 nonmatching

* through sub_80F0B24

* sub_80F0B64

* through sub_80F0C04

* sub_80F0C7C

* sub_80F0D60

* sub_80F0E58

* sub_80F0E84

* through sub_80F0F24

* sub_80F0F64

* sub_80F1208

* sub_80F1254

* sub_80F1290

* sub_80F12A4

* sub_80F14F8

* DoTVShowTodaysSmartShopper

* DoTVShowTheNameRaterShow

* DoTVShowPokemonTodaySuccessfulCapture

* DoTVShowPokemonTodayFailedCapture

* DoTVShowPokemonFanClubLetter

* DoTVShowRecentHappenings

* DoTVShowPokemonFanClubOpinions

* DoTVShowPokemonNewsMassOutbreak

* DoTVShowPokemonContestLiveUpdates

* DoTVShowPokemonBattleUpdate

* DoTVShow3CheersForPokeblocks

* DoTVShowInSearchOfTrainers

* Label GabbyAndTyData fields; remove ddump comments from data/text/tv.inc

* DoTVShowPokemonAngler

* DoTVShowTheWorldOfMasters; update RAM symbols and field names

* Decorate static functions

* DoTVShowTodaysRivalTrainer; region map enums

* TVDewfordTrendWatcherNetworkTextGroup

* DoTVShowHoennTreasureInvestigators

* DoTVShowFindThatGamer

* DoTVShowBreakingNewsTV

* DoTVShowSecretBaseVisit

* DoTVShowPokemonLotterWinnerFlashReport

* DoTVShowThePokemonBattleSeminar

* DoTVShowTrainerFanClubSpecial, DoTVShowTrainerFanClub

* DoTVShowSpotTheCuties

* DoTVShowPokemonNewsBattleFrontier

* DoTVShowWhatsNo1InHoennToday

* Helpers for DoTVShowSecretBaseSecrets

* DoTVShowSecretBaseSecrets

* DoTVShowSafariFanClub

* Finish decompilation of tv.s

* Some renaming

* Rename text group pointers

* revoke statis; pokenews enums

* Labels are number one

* Label all TV struct fields

* Make data/text/tv.inc more readable

* Split data/text/tv.inc

* Rename pokenews text pointers

* Frontier Symbol constants; indicate static rodata objects with 's' prefix

* Fix leading spaces/tabs

F*** CLion sometimes

* Fix inconsequential warning
 2017-10-13 10:09:36 -05:00
DizzyEggg
0f44747788 review changes 2017-10-13 12:25:32 +02:00
PikalaxALT
3c4478b370 Decompile data 2017-10-13 00:11:55 -04:00
Diegoisawesome
24bd8c73e1 Name some new script commands 2017-10-12 22:34:58 -05:00
Diegoisawesome
f1b6358047 Port/decomp scrcmd 2017-10-12 02:06:19 -05:00
DizzyEggg
e382a73e9d merge branch master 2017-10-10 11:48:16 +02:00
DizzyEggg
eb59f15799 mergin and chill 2017-10-09 21:40:05 +02:00
Diegoisawesome
41db025975 Merge remote-tracking branch 'pret/master' into baserom_extraction 2017-10-09 13:32:26 -05:00
Diegoisawesome
ae06c13e99 Add front pic anims with help from marijnvdwerf 2017-10-09 13:10:02 -05:00
DizzyEggg
ab03b03c4b decompile reshow battle screen 2017-10-09 18:18:40 +02:00
DizzyEggg
7fb4a54e39 Merge branch 'master' into decompile_battle_message 2017-10-09 13:58:24 +02:00
ProjectRevoTPP
a9d94cc5d6 decompile save_location.c 2017-10-08 22:21:34 -04:00
ProjectRevoTPP
f0775000a1 decompile diploma.c 2017-10-07 22:54:32 -04:00
DizzyEggg
db63fc1a09 battle message huge take off 2017-10-07 15:15:47 +02:00
ProjectRevoTPP
e38fd8347d use rodata for save_failed_screen 2017-10-06 21:59:47 -04:00
ProjectRevoTPP
f383cb8354 update labels 2017-10-06 19:48:18 -04:00
DizzyEggg
7b88c7f2f0 move const data to battle files 2017-10-06 19:09:37 +02:00
DizzyEggg
19e2255c34 Merge branch 'master' into decomp_battle2 2017-10-06 17:07:56 +02:00
DizzyEggg
3cc20c7c3f battle 2 is done 2017-10-06 17:06:45 +02:00
Diegoisawesome
d5e7ddddb7 Extract baseroms from data2c 2017-10-06 01:57:52 -05:00
DizzyEggg
342e616d4b battle2 more and more and more 2017-10-06 00:12:01 +02:00
ProjectRevoTPP
e7175999f5 decompile braille_puzzles.c 2017-10-05 13:02:39 -04:00
DizzyEggg
aaa191f0d8 Merge branch 'master' into decomp_battle2 2017-10-04 11:18:50 +02:00
Diegoisawesome
f41709d322 Rename files for consistency with pokeruby 2017-10-04 02:43:45 -05:00
Diegoisawesome
cfc70c9806 Extract baseroms from miscellaneous files 
Had to leave some unfinished due to complexity at the moment
 2017-10-04 02:38:25 -05:00
DizzyEggg
46fe1f441f giant battle handler is done wohohohhohoho 2017-10-03 21:35:27 +02:00
Diegoisawesome
d32ec8bf72 Merge pull request #59 from PikalaxALT/sym_bss 
BSS; decompile tileset_anims
 2017-10-03 01:26:01 -05:00
PikalaxALT
2701191a76 Merge branch 'master' into unk_text_util_2 2017-10-02 22:09:29 -04:00
PikalaxALT
10c5a7a2dd Merge branch 'master' into sym_bss 2017-10-02 22:04:43 -04:00
PikalaxALT
df0b715207 Decompile data/tileset.s 2017-10-02 21:08:54 -04:00
PikalaxALT
d43b6227bb Rip tileset anims 2017-10-02 20:53:58 -04:00
PikalaxALT
74951e4312 Name pointer tables 2017-10-02 08:43:52 -04:00
PikalaxALT
5a51a49642 Sanitize data/tilesets.s, 3 2017-10-01 19:39:55 -04:00
PikalaxALT
84e5819ca3 Sanitize data/tilesets.s, 2 2017-10-01 19:01:37 -04:00
Diegoisawesome
ba758afc14 Extract baseroms from and combine fldeff_emotion and trainer_see 
Also extract from bike
 2017-10-01 14:48:29 -05:00
Diegoisawesome
8982501b78 Extract baseroms from reset_rtc_screen 2017-10-01 13:03:51 -05:00
DizzyEggg
d4e1c417d3 Merge branch 'master' into decomp_battle2 2017-10-01 18:55:21 +02:00
DizzyEggg
1fcafaf35a more of battle2 done 2017-10-01 18:54:01 +02:00
Diegoisawesome
c9cad220de Extract baseroms from intro_credits_graphics.s 2017-10-01 03:08:19 -05:00
PikalaxALT
4d78e62fd9 Sanitize data/tilesets.s 2017-09-30 22:23:00 -04:00
PikalaxALT
a1ccd78218 Disassemble pointer tables in data/tileset.s 2017-09-30 22:16:51 -04:00
PikalaxALT
20ed9ad0ac Decompile asm/tileset.s into src/palette.c 2017-09-30 21:19:29 -04:00
Diegoisawesome
1a55966f1b Extract baseroms from battle_interface 2017-09-30 16:37:53 -05:00
Diegoisawesome
13017a3b19 Merge pull request #55 from DizzyEggg/decompile_metatile_behavior 
decompile metatile behavior
 2017-09-30 03:11:36 -05:00
Diegoisawesome
741c99cded Merge pull request #45 from DizzyEggg/decomp_battle4 
Decompile Battle 4
 2017-09-30 03:00:10 -05:00
Diegoisawesome
52a66f0d4c Merge pull request #50 from DizzyEggg/decomp_roamer 
decompile roamer
 2017-09-30 02:31:43 -05:00
DizzyEggg
2766bd78df split the second file 2017-09-30 09:22:59 +02:00
DizzyEggg
5d9d9c1423 split, rename for real this time 2017-09-30 09:11:48 +02:00
DizzyEggg
cd87f47c8a fix a bad file name 2017-09-30 09:01:21 +02:00
Diegoisawesome
88655144df Merge pull request #51 from DizzyEggg/decomp_money 
decompile money
 2017-09-30 01:56:21 -05:00
Diegoisawesome
7ffba45d0f Merge pull request #49 from Diegoisawesome/baserom_extraction 
Extract baseroms from intro.s and others
 2017-09-30 01:40:24 -05:00
Diegoisawesome
5d246842b1 Extract baseroms from battle_setup.s 2017-09-29 17:53:48 -05:00
Diegoisawesome
3ced50a9e8 Extract baseroms from item_use 2017-09-29 17:41:45 -05:00
Diegoisawesome
6f22bf385d Extract baseroms from battle_anim_80FE840 2017-09-29 17:34:39 -05:00
DizzyEggg
f5387cf6b1 decompile metatile behav 2017-09-29 19:03:50 +02:00
DizzyEggg
e41b9cbbb3 decompile money 2017-09-29 00:11:42 +02:00
DizzyEggg
f1fe0c217d decompile roamer 2017-09-28 20:52:36 +02:00
DizzyEggg
7273b8f262 battle 4 is all done 2017-09-28 16:51:24 +02:00
DizzyEggg
14fcc9ec20 merge with master and move to C 2017-09-28 16:32:23 +02:00
DizzyEggg
bc3b4b4d9a battle 4 commands are decompiled 2017-09-28 15:34:21 +02:00
DizzyEggg
69928d3904 battle 4 up to 0xE5 2017-09-27 23:43:45 +02:00
Diegoisawesome
22211c08f1 Extract baseroms from player_pc 2017-09-27 01:40:04 -05:00
Diegoisawesome
ee777d7b17 Extract baseroms from title_screen 2017-09-27 00:51:09 -05:00
ProjectRevoTPP
04c8eff882 merge 2017-09-27 00:48:11 -04:00
Diegoisawesome
d27bc3e071 Extract baserom includes from battle_7 and field_region_map 2017-09-26 23:21:27 -05:00
Diegoisawesome
6cc1ec7bb1 Extract intro gfx from graphics.s 2017-09-26 23:06:25 -05:00
Diegoisawesome
14fc923503 Merge remote-tracking branch 'pret/master' into baserom_extraction 2017-09-26 22:21:38 -05:00
Diegoisawesome
825b8dffe1 Extract baserom calls from data2b_2.s and rename 2017-09-26 21:48:26 -05:00
Diegoisawesome
d18eaa3502 Extract baserom calls from intro.s 2017-09-26 18:13:58 -05:00
yenatch
3c8091393c Merge pull request #47 from PikalaxALT/split_data3 
Split data3
 2017-09-26 18:16:52 -04:00
DizzyEggg
d769ec1374 battle 4 up to a8 2017-09-26 22:39:59 +02:00
PikalaxALT
def827fcd4 Capitalize all gUnknown labels 2017-09-26 08:30:12 -04:00
Diegoisawesome
60b0fd8b39 Rename battle AI prefix to something agreeable 2017-09-26 00:19:20 -05:00
Diegoisawesome
3db01d1867 Correct battle AI prefix again 2017-09-25 21:28:30 -05:00
Diegoisawesome
6f230848f6 Add window_template_terminator macro 2017-09-25 20:24:14 -05:00
Diegoisawesome
3093d770ee Correct battle AI prefix 2017-09-25 16:42:07 -05:00
Diegoisawesome
d1efbcd282 Extract scattered baseroms and cleanup 2017-09-25 16:27:02 -05:00
scnorton
1d5ec895af Rename data/data3.s to data/daycare.s 2017-09-25 16:13:32 -04:00
scnorton
9cf6a05905 Split data3_a0_B 2017-09-25 16:09:44 -04:00
scnorton
a8a4a500ab split data3_a0_A 2017-09-25 15:27:54 -04:00
scnorton
bf9e2b7210 split data3_a1 2017-09-25 15:03:52 -04:00
scnorton
55bae5e8ad data/script_menu.s 2017-09-25 14:47:44 -04:00
scnorton
5fbfc57304 Disassemble some pointers in data3_a1.s 2017-09-25 14:18:54 -04:00
scnorton
3013d3726f Split data3b.s 2017-09-25 11:23:44 -04:00
DizzyEggg
52a951276f battle 4, up to x69 2017-09-25 00:09:13 +02:00
ProjectRevoTPP
d740eabb3c merge 2017-09-23 15:02:32 -04:00
DizzyEggg
7bb0fcf182 merge with master and fix conflicts 2017-09-23 20:36:00 +02:00
DizzyEggg
601fc9e85b atk49 is matching baby WOHOHOHOHO 2017-09-23 20:13:45 +02:00
yenatch
a57915fa5b Merge pull request #36 from DizzyEggg/decomp_egg_hatch 
Decompile Egg Hatch
 2017-09-23 13:50:55 -04:00
ProjectRevoTPP
2448426183 decompile field_special_scene.c 2017-09-22 22:45:47 -04:00
PikalaxALT
561d60342f Decompile data 2017-09-22 21:18:53 -04:00
DizzyEggg
21f668d6a5 add things git ate 2017-09-23 00:13:11 +02:00
DizzyEggg
d5afb0c6e9 up to x48 and troubles 2017-09-22 21:33:49 +02:00
PikalaxALT
4e1c9920b2 Split data/data_emerald2.s 2017-09-21 13:51:32 -04:00
PikalaxALT
ab6a7d2d8c Split data/data_emerald.s 2017-09-21 13:28:02 -04:00
DizzyEggg
9ee9a20152 fix merge conflicts 2017-09-21 10:50:15 +02:00
PikalaxALT
27903a102b Merge branch 'master' into berry_fix_program 2017-09-20 23:18:20 -04:00
PikalaxALT
8d5250fdaa Merge branch 'master' into lilycove_lady 2017-09-20 23:02:17 -04:00
PikalaxALT
6f481cceb1 Decompile lilycove lady data 2017-09-20 22:52:42 -04:00
yenatch
e7f91c65d9 Merge pull request #38 from PikalaxALT/battle_dome_cards 
Battle dome cards
 2017-09-20 22:41:18 -04:00
PikalaxALT
63a25a34a7 Disassemble lilycove lady data 2017-09-20 21:42:14 -04:00
Diegoisawesome
9ed9f7de94 Finish renaming strings in strings.s 2017-09-20 16:46:59 -05:00
DizzyEggg
0c7555e237 SetMoveEffect functionally equivalent and close 2017-09-20 22:54:26 +02:00
DizzyEggg
3919b7130b Fix merge conflicts 2017-09-20 13:12:43 +02:00
DizzyEggg
28da80e19a battle 4 up to SetMoveEffect 2017-09-20 12:56:45 +02:00
Diegoisawesome
4ec2fe8f37 Replace data with move constants 2017-09-19 22:00:02 -05:00
PikalaxALT
54bd2c1781 Address review by diego 2017-09-19 21:10:30 -04:00
PikalaxALT
2c07b94e94 Merge branch 'master' into berry_fix_program 2017-09-19 20:55:05 -04:00
PikalaxALT
d4d8f876e5 Merge branch 'master' into battle_dome_cards 2017-09-19 20:54:49 -04:00
Diegoisawesome
d273493cbb Merge remote-tracking branch 'pret/master' 2017-09-19 19:42:32 -05:00
Diegoisawesome
fcc94f9722 Extract baseroms from battle_message and rename strings 2017-09-19 19:31:53 -05:00
DizzyEggg
b4875d82d5 more battle 4 2017-09-20 00:28:00 +02:00
Diegoisawesome
3d32be86fc Continue baserom extraction 2017-09-19 14:12:51 -05:00
DizzyEggg
b3c788f2ca begin work on battle4, organize battle headers 2017-09-19 21:01:12 +02:00
scnorton
bff89725ec Add battle_dome_cards header to expose symbols as needed 2017-09-19 09:46:17 -04:00
DizzyEggg
148b995189 finish egg hatch, clean up headers 2017-09-19 14:27:46 +02:00
PikalaxALT
60f8369a89 Merge branch 'master' into berry_fix_program 2017-09-18 19:24:09 -04:00
PikalaxALT
ee73040717 Merge branch 'master' into field_map_obj 2017-09-18 19:21:34 -04:00
DizzyEggg
f255cbd7dc Merge branch 'master' into decomp_egg_hatch 2017-09-18 23:50:08 +02:00
DizzyEggg
2e7127284f egg hatch almost decompiled 2017-09-18 23:48:47 +02:00
scnorton
810bfffd12 data decomp 2017-09-18 15:10:25 -04:00
PikalaxALT
8604291b0f Start decomp 2017-09-18 09:23:06 -04:00
Diegoisawesome
9f87103ea0 Extract baserom calls from files 
Extract calls from crt0.s, bard_music.s, battle_4.s
 2017-09-17 20:33:32 -05:00
scnorton
25c7b4cd92 Remaining pointers 2017-09-17 20:08:29 -04:00
scnorton
b7a373e700 No more incbins 2017-09-17 19:35:09 -04:00
scnorton
c980070657 More glorious data dumping 2017-09-17 19:33:44 -04:00
scnorton
a23f1a4b11 hooray, another data dump 2017-09-17 19:19:01 -04:00
scnorton
88bb0dfc39 More data dism 2017-09-17 18:54:19 -04:00
scnorton
d8dd96fa07 Start dumping data 2017-09-17 18:36:38 -04:00
scnorton
b92b690d2a never mind, this actually is in field_map_obj.s 2017-09-17 17:40:38 -04:00
scnorton
6106bc93b3 Remove data/field_map_obj.s from data/data3.s 2017-09-17 17:33:25 -04:00
scnorton
71b40f50c0 Merge branch 'master' into field_map_obj 2017-09-17 13:38:33 -04:00
DizzyEggg
75595f9b3d decompile battle 3 2017-09-17 17:14:32 +02:00
DizzyEggg
c7592bc87c finish porting cam's port 2017-09-17 15:19:15 +02:00
DizzyEggg
a9a66b06ef start porting cam's port of battle3 2017-09-17 14:10:32 +02:00
PikalaxALT
559833ccf6 Merge branch 'master' into field_map_obj 2017-09-16 15:41:54 -04:00
Diegoisawesome
5a74c0e913 Merge remote-tracking branch 'pret/master' 2017-09-16 14:24:47 -05:00
Cameron Hall
19d2d73c70 Merge pull request #28 from DizzyEggg/decomp_pokemon 
decompile pokemon1/2/3
 2017-09-16 14:14:50 -05:00
Diegoisawesome
3c63063831 Add missing file and rename data2.s to link.s 2017-09-16 14:08:47 -05:00
Diegoisawesome
6ba1dc8169 Merge remote-tracking branch 'pret/master' 2017-09-16 03:21:42 -05:00
Diegoisawesome
448497dfbb Finish extracting data2.s 2017-09-16 03:21:09 -05:00
PikalaxALT
64ffa8f963 Merge branch 'master' into field_map_obj 2017-09-13 19:29:19 -04:00
DizzyEggg
c80b76e85a Merge branch 'master' into decomp_berry 2017-09-13 18:24:59 +02:00
DizzyEggg
117f8a6abd Merge branch 'master' into decomp_pokemon 2017-09-13 18:24:01 +02:00
DizzyEggg
4c16bb5ee6 decompile util.s 2017-09-13 12:58:57 +02:00
DizzyEggg
5f4c5e280c berry.s decompiled 2017-09-13 11:16:26 +02:00
DizzyEggg
a83d07e1b3 Merge branch 'master' into decomp_berry 2017-09-13 10:03:07 +02:00
Diegoisawesome
3e1c6024a7 Continue extracting from data2.s 2017-09-13 01:10:12 -05:00
DizzyEggg
c9603c40d8 Merge branch 'master' into decomp_pokemon 2017-09-12 23:02:08 +02:00
DizzyEggg
625b1b6949 start berry porting 2017-09-12 18:47:27 +02:00
DizzyEggg
0fe7030230 pokemon 3 is almost decompiled 2017-09-12 15:05:40 +02:00
DizzyEggg
6539188fa6 label and decomp some pokemon animation stuff 2017-09-12 13:05:54 +02:00
Diegoisawesome
a9f09ca051 Begin renaming string.s unknowns 2017-09-12 01:23:34 -05:00
Diegoisawesome
04598f0749 Rename data2 external file symbols 2017-09-12 00:00:05 -05:00
Diegoisawesome
3a96688b12 Dump strings.txt 2017-09-11 22:01:39 -05:00
DizzyEggg
4242ede445 almost there, troubles 2017-09-12 00:01:12 +02:00
DizzyEggg
8e88f2790a pokemon2 get mon data troubles 2017-09-11 18:27:54 +02:00
DizzyEggg
5394435520 more of pokemon3 decompiled 2017-09-11 14:42:13 +02:00
DizzyEggg
154a70e228 start pokemon3 decomp 2017-09-11 11:35:41 +02:00
DizzyEggg
48239b6598 Merge branch 'master' into decomp_script 2017-09-11 09:22:10 +02:00
Diegoisawesome
ab189ecec5 Begin extracting baserom calls from data2.s 2017-09-11 00:40:47 -05:00
DizzyEggg
a2a66181fb decompile script.s 2017-09-10 23:05:23 +02:00
Diegoisawesome
a1368c545d Merge remote-tracking branch 'pret/master' 2017-09-09 20:54:41 -05:00
Diegoisawesome
f29fc55796 Cleanup bg.c 2017-09-09 20:52:33 -05:00
DizzyEggg
10a525d5a0 decomp safari zone 2017-09-09 15:45:50 +02:00
DizzyEggg
3355389eab start coins decomp 2017-09-09 14:24:18 +02:00
DizzyEggg
307278374b start money.s decomp 2017-09-09 00:45:25 +02:00
DizzyEggg
44dbf4dea0 port pokemon size record 2017-09-08 22:23:14 +02:00
DizzyEggg
4d01d400a8 port lottery corner 2017-09-08 18:48:55 +02:00
DizzyEggg
a55c5925a6 label gMapHeader 2017-09-08 18:31:57 +02:00
PikalaxALT
112177b57f Slight touching up of data3.s; denote boundaries of data/field_map_obj.s for future split 2017-09-06 22:46:44 -04:00
DizzyEggg
cdd36116f2 label pokemon3.s 2017-09-06 21:48:30 +02:00
DizzyEggg
b7d75cb615 split item effects and organize sym ewram 2017-09-06 21:11:10 +02:00
DizzyEggg
0cc4cadd2f label pokemon2 and some box stuff 2017-09-06 18:34:18 +02:00
DizzyEggg
c6eacc9be5 start porting pokemon1 2017-09-06 17:19:08 +02:00
DizzyEggg
b6661e7736 name some pokemon and battle labels 2017-09-05 20:13:34 +02:00
DizzyEggg
a7486afb4e dump some more strings 2017-09-05 17:43:47 +02:00
DizzyEggg
e18241d8ec dumped a lot of strings 2017-09-05 17:04:11 +02:00
DizzyEggg
1680fc0b81 start start menu decomp 2017-09-05 13:01:24 +02:00
DizzyEggg
54b8306115 really clean up battle ai 2017-09-05 09:41:48 +02:00
DizzyEggg
2702b0ec9b decomp calc dmg and clean up battle ai 2017-09-04 21:43:13 +02:00
DizzyEggg
7ba62bcac8 split data battle controller files 2017-09-04 15:39:20 +02:00
DizzyEggg
1a9b1a45ca split battle rodata 2017-09-04 15:05:11 +02:00
DizzyEggg
4bf54bfdd4 split roamer and decor inventories 2017-09-04 13:01:57 +02:00
DizzyEggg
75a94ce58e split and label 2017-09-04 12:22:04 +02:00
DizzyEggg
5afd2d5bfb begin new save.c, label lots of things 2017-09-03 22:50:17 +02:00
DizzyEggg
9dedb3a8bd split more battle buffer files 2017-09-03 18:58:40 +02:00
DizzyEggg
a3f602f17c begin save.s decomp, thanks revo! 2017-09-03 14:13:01 +02:00
DizzyEggg
907e281de6 decompile label more of item.s 2017-09-03 13:33:13 +02:00
DizzyEggg
e0725bca55 move variables to rtc.c 2017-09-02 23:37:06 +02:00
DizzyEggg
048700fe57 decompile rtc 2017-09-02 23:28:44 +02:00