ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-19 04:57:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,332 Commits 1 Branch 0 Tags 235 MiB
724add638c
Commit Graph

2846 Commits

Author SHA1 Message Date
shinny456
1b30da21d9 merge trainer hill changes 2019-01-19 10:44:58 -05:00
DizzyEggg
f84b22fca4 Dump trainer hill trainers 2019-01-19 12:57:18 +01:00
DizzyEggg
87763d133f bites to bits 2019-01-14 20:57:44 +01:00
DizzyEggg
353ad13f91 make trainer hill compile 2019-01-13 20:58:42 +01:00
DizzyEggg
4b420643dc Merge branch 'master' into trainer_hill 2019-01-13 20:51:05 +01:00
DizzyEggg
edddd847c5 Document and clean up trainer hill 2019-01-13 20:50:08 +01:00
DizzyEggg
c0bc01d301 Move some vars to C 2019-01-13 13:15:23 +01:00
DizzyEggg
11a49a7f02 Decompile trainer hill 2019-01-13 12:12:27 +01:00
shinny456
8a5fce7837 start decompiling trainer_card.s 2019-01-08 21:51:19 -05:00
Diegoisawesome
af2c39860d Rename non-mapsec constants 2019-01-08 13:40:11 -06:00
ultima-soul
b8ff71e65e Fix build conflicts. 2019-01-06 14:11:31 -08:00
ultima-soul
284751e761 Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present. 2019-01-06 13:41:18 -08:00
ultima-soul
2ca482dc24 Committing progress so far. 2019-01-06 13:38:31 -08:00
ultima-soul
f966b65849 Through sub_80DC028, sub_80DC0F4 non-matching. 2019-01-06 13:32:48 -08:00
ultima-soul
76510d58bb Matched up to sub_80DBF68, sub_80DBF90 WIP. 2019-01-06 13:32:47 -08:00
Slawter666
aeaf390706 Update constants 2019-01-05 20:12:50 +00:00
Slawter666
f8c2fcb9b2 Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base 2019-01-05 19:54:26 +00:00
DizzyEggg
50a26bffe4 tabs to spaces 2019-01-05 19:27:23 +01:00
DizzyEggg
b756996581 fakematch and nonmatch 2019-01-05 19:25:46 +01:00
Marcus Huderle
95db853a78 Decompile more of contest_link_80F57C4.c 2019-01-04 20:03:29 -06:00
Philipp AUER
55202eac24 rename coords to size in struct MonCoords 2019-01-04 19:59:55 -06:00
huderlem
cba2f81bf8
Merge pull request #507 from Tetrable/master 
Finish off labeling flags
 2019-01-03 20:37:25 -06:00
Marcus Huderle
fd201f8395 Start decompiling contest_link_80F57C4.c 2019-01-03 20:35:20 -06:00
Marcus Huderle
2857f7fff9 Decompile contest_link_81D9DE4.c 2019-01-03 20:35:20 -06:00
Marcus Huderle
bc43dbab13 Decompile contest_link_81D9DE4.c 2019-01-03 20:35:20 -06:00
Tetrable
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
f8c708a82a
Merge pull request #506 from Slawter666/menu 
Minor labelling of menu.c
 2019-01-02 17:29:27 -06:00
Diegoisawesome
0053e61535
Merge pull request #504 from Diegoisawesome/roulette 
Port/decompile roulette
 2019-01-02 17:00:33 -06:00
Diegoisawesome
a0188aac33 Cleanup and EWRAM 2019-01-02 16:55:50 -06:00
Diegoisawesome
6202ae1df0 Extract rodata from roulette 2019-01-02 16:40:40 -06:00
Tetrable
a3ebca4d81 Fix merge conflicts 2019-01-02 21:25:14 +00:00
Tetrable
1e3da62d24 Finish off labelling flags 2019-01-02 21:12:43 +00:00
Slawter666
99c37023c8 Minor labelling of menu.c 2019-01-02 01:11:02 +00:00
Slawter666
ee5a239534 Use constants in secret_base.c 2019-01-01 23:19:07 +00:00
Diegoisawesome
e7f8190ba3 Finish roulette port 2019-01-01 15:25:52 -06:00
Diegoisawesome
d28d8c850d Up to sub_81446DC 2018-12-31 19:39:41 -06:00
Diegoisawesome
af1e44befe Continue porting roulette 2018-12-31 18:07:29 -06:00
Marcus Huderle
a0ff38d0be Fix build 2018-12-31 16:53:38 -06:00
Marcus Huderle
05b1d2ea94 Document field_tasks.c 2018-12-31 16:53:38 -06:00
Marcus Huderle
b6ee970e7a Minor berry.c cleanup 2018-12-31 16:53:38 -06:00
Marcus Huderle
fb2d1591c1 Document more battle anim effects 2018-12-31 16:53:38 -06:00
Diegoisawesome
439fa13e94 Start porting/decompiling roulette 2018-12-31 16:09:45 -06:00
Diegoisawesome
17ac8e29ef
Merge pull request #497 from garakmon/rm_sec 
index gRegionMapEntries by map section constants
 2018-12-31 11:51:12 -06:00
Diegoisawesome
d004ce065c Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-31 02:30:30 -06:00
Diegoisawesome
ec780bb209 Cleanup and documentation 2018-12-31 02:22:21 -06:00
Diegoisawesome
c5c6e437ec Document, cleanup, extract data from trade 2018-12-31 01:23:27 -06:00
Marcus Huderle
58f130d007 Document some battle anims and helpers 2018-12-30 11:04:17 -06:00
garak
ed25326140 fix formatting 2018-12-29 21:52:38 -05:00
garak
1baa17c632 index gRegionMapEntries by map section constants 2018-12-29 21:49:29 -05:00
Diegoisawesome
c22a12d8d6 trade source done 2018-12-29 13:50:24 -06:00
Diegoisawesome
2fb9f490fb Almost done with trade 2018-12-29 12:46:15 -06:00
DizzyEggg
b2a042f65c
Match and clean up battle anim 3 2018-12-29 19:31:04 +01:00
DizzyEggg
0d5a0b58fa Fakematch a function 2018-12-29 11:51:00 -06:00
DizzyEggg
75b4e9ac70 compile contest 2018-12-29 11:48:28 -06:00
DizzyEggg
55e44b0951 a bit more of contest painting effect 2018-12-29 11:48:28 -06:00
DizzyEggg
34243bbe1d Start contest painting effect 2018-12-29 11:48:28 -06:00
PALPATlNE
061b879561 Documentation for pokemon_summary_screens.c 2018-12-29 11:45:06 -06:00
Marcus Huderle
229177f7c6 Use anim weather constants 2018-12-29 11:40:12 -06:00
Marcus Huderle
8eea0925c5 Finish battle_anim_effects_3.c 2018-12-29 11:40:12 -06:00
Marcus Huderle
d0d870e193 Cleanup formatting 2018-12-29 11:36:54 -06:00
Marcus Huderle
6e7bdb3ca4 Document misc field_specials things 2018-12-29 11:36:54 -06:00
Marcus Huderle
67636b7c64 Document deoxys rock 2018-12-29 11:36:54 -06:00
Marcus Huderle
46d41d2fb9 Use EVENT_OBJ_ID_PLAYER in C code 2018-12-29 11:36:54 -06:00
Marcus Huderle
95dcff581b Document some fieldmap stuff 2018-12-29 11:36:54 -06:00
Diegoisawesome
146ad2bdd4 Next big honkin' function done 2018-12-28 13:42:34 -06:00
Diegoisawesome
9cad5e8197 Big switch mofo 2018-12-28 02:11:41 -06:00
Marcus Huderle
d59f5a8e56 Misc overworld documentation 2018-12-27 16:52:13 -06:00
Marcus Huderle
2c0f5f58e9 Use constants for warp into MAP_INSIDE_OF_TRUCK 2018-12-27 11:24:34 -06:00
Diegoisawesome
5691a67629 Up to sub_807B62C 2018-12-27 02:05:09 -06:00
DizzyEggg
b9ad5de8a0 fortmatting 2018-12-26 14:50:47 +01:00
DizzyEggg
6761a049da Fix Bldalpha args 2018-12-26 14:03:48 +01:00
DizzyEggg
7e4db39da5 Fix bldcnt gpu reg args 2018-12-26 13:43:07 +01:00
DizzyEggg
7f6f6c33ab Fix BgAttributes 2018-12-26 13:05:02 +01:00
Diegoisawesome
720007e457
Merge pull request #3 from DizzyEggg/patch-1 
Match nonmatching except the loop one
 2018-12-25 15:04:12 -06:00
Diegoisawesome
d8948a5cda Merge remote-tracking branch 'pret/master' into trade 2018-12-25 15:03:13 -06:00
melthelesbian
2dd706ca54 use max mon moves constant where able (#480) 
* use max mon moves constant where able

* fix errors in script commands file

* fix more errors
 2018-12-25 11:50:15 -06:00
Marcus Huderle
dcbc8db6a3 Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c) 2018-12-25 11:46:35 -06:00
DizzyEggg
1b28844b12
Match nonmatching except the loop one 2018-12-25 15:14:15 +01:00
Diegoisawesome
dea41e1a7e trade.c up to sub_807A7E0 2018-12-24 20:18:06 -06:00
DizzyEggg
8833004d41 space 2018-12-24 23:29:47 +01:00
DizzyEggg
44e5e82f67 clean up party menu 2018-12-24 23:27:20 +01:00
DizzyEggg
43c88440e0 make it compile for reals 2018-12-24 22:28:33 +01:00
DizzyEggg
49517aca9e make it compie hopefully 2018-12-24 22:19:40 +01:00
DizzyEggg
e230afd543 Merge branch 'master' into learn 2018-12-24 22:01:52 +01:00
DizzyEggg
442b1826a2 asm party and fldeff clean-up 2018-12-24 21:59:05 +01:00
Diegoisawesome
2bca45bcf5 More link stuff, stumped on sub_807A728 2018-12-24 14:39:05 -06:00
Melody
370b1093cd fix feebas check 2018-12-24 13:48:31 -06:00
Marcus Huderle
c2fdbb0ef7 Decompile psychic.c 2018-12-24 10:52:56 -06:00
Marcus Huderle
f1213ebb4b Decompile dark.c 2018-12-24 09:55:00 -06:00
Diegoisawesome
3f08e0c76c Some more trade nonsense 2018-12-24 03:03:02 -06:00
Diegoisawesome
980b055bf0
Merge pull request #471 from DizzyEggg/clean 
Get rid of externs and add includes
 2018-12-24 01:33:57 -06:00
DizzyEggg
72aa9eb5a9 clear headers more 2018-12-24 00:20:38 +01:00
DizzyEggg
9320fe8f85 Clear includes 2018-12-24 00:02:29 +01:00
Rangi
78bab9ca0c Fix OLD_UNOWN_BASE_STATS formatting: tabs->spaces, and comma outside the macro 2018-12-23 17:24:10 -05:00
Diegoisawesome
e874267edb
Merge pull request #469 from DizzyEggg/data 
Move some data to C
 2018-12-23 10:45:19 -06:00
Diegoisawesome
f1ee374e93
Merge pull request #468 from KDSKardabox/resolve_ice_electric_split 
Move 2 incorrectly split functions of electric from ice
 2018-12-23 10:42:01 -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
KDSKardabox
436122ec93 Add new line at EOL 2018-12-23 13:07:00 +05:30
Diegoisawesome
a5c09bfec6 S'more trade 2018-12-23 01:26:38 -06:00
KDSKardabox
b394ad7781 Add space 2018-12-23 11:55:01 +05:30
DizzyEggg
adb4927504 Merge with master 2018-12-22 23:30:41 +01:00
Diegoisawesome
ebbe826133
Merge pull request #437 from DizzyEggg/storage 
Pokemon Storage System
 2018-12-22 16:12:27 -06:00
DizzyEggg
c805bab483 Storage - review changes 2018-12-22 23:00:22 +01:00
KDSKardabox
67beec5cbe Move 2 functions of electric from ice 2018-12-23 00:34:00 +05:30
DizzyEggg
6dffa6d17c Match and clean up fldeff misc 2018-12-22 19:33:45 +01:00
DizzyEggg
8fcb3f71c7 Match electric c 2018-12-22 18:52:05 +01:00
DizzyEggg
72532c9eee Match and clean up party_menu.c 2018-12-22 17:32:21 +01:00
Diegoisawesome
a39783a637 More trade.c 2018-12-22 01:26:53 -06:00
DizzyEggg
1374c11a1c Review pokemon storage system chaanges 2018-12-21 22:35:01 +01:00
Diegoisawesome
052d458f48 sub_80796B4 is a pain 2018-12-21 12:20:28 -06:00
Diegoisawesome
87fd6b8dc2
Merge pull request #463 from ShinyDragonHunter/old_unown_macro 
Use a macro for OLD_UNOWN base stats
 2018-12-21 12:15:34 -06:00
ShinyDragonHunter
c120a446ad Moved macro to the top of base_stats.h 2018-12-21 10:37:35 +00: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
golem galvanize
64832ff67e start ice 2018-12-20 16:20:34 -05:00
DizzyEggg
7dcb614cca PSS is done 2018-12-20 22:14:36 +01:00
ShinyDragonHunter
c489bb88b7 Updated macro name to be less vague 2018-12-20 13:59:00 +00:00
ShinyDragonHunter
51e5be68de Use a macro for OLD_UNOWN base stats 2018-12-20 11:28:19 +00:00
Diegoisawesome
6ef9671718
Merge pull request #440 from garakmon/fldeff 
Decompile / port fldeff_80F9BCC
 2018-12-19 22:16:59 -06:00
Diegoisawesome
c74bfbe110
Merge pull request #462 from Deokishisu/Move-data-out-of-wild_encounter.c 
Move data out of wild_encounter.c
 2018-12-19 22:11:57 -06:00
Deokishisu
a3543c9a34 Move data out of wild_encounter.c 
wild_encounter.c is cleaned up, and its data has been moved to src/data/wild_encounters.h.
 2018-12-19 22:50:54 -05:00
garak
5eac3ce1a2 rename fldeff_misc 2018-12-19 22:19:54 -05:00
Marcus Huderle
b7ce383a96 Document a bunch of battle anims 2018-12-19 21:19:44 -06:00
garak
af208a6bbb Merge branch 'fldeff' of https://github.com/garakmon/pokeemerald into fldeff 2018-12-19 21:35:32 -05:00
Diegoisawesome
48d7c0a7a3
Merge pull request #454 from golemgalvanize/decompile_party_menu 
Decompile party menu
 2018-12-19 19:57:31 -06:00
garak
f801eed3a8
clean fldeff file 2018-12-19 20:52:41 -05:00
golem galvanize
d6589d1abc another fix 2018-12-19 20:50:36 -05:00
golem galvanize
44fae5a688 add TM constant use 2018-12-19 20:44:40 -05:00
golem galvanize
64d4eed63b hidden conversation fixes applied 2018-12-19 20:27:44 -05:00
Diegoisawesome
5b73fe138c
Merge pull request #457 from golemgalvanize/decompile_water 
Decompile water
 2018-12-19 19:16:40 -06:00
golem galvanize
038836d21d pretty sure it's fixed now 2018-12-19 20:08:01 -05:00
golem galvanize
085e793460 one line cleanup in summary_screen 2018-12-19 19:55:51 -05:00
golem galvanize
fabbbdd02a fix up party_menu 2018-12-19 19:53:52 -05:00
golem galvanize
6f0dd694ea removed weird comment 2018-12-19 19:48:28 -05:00
DizzyEggg
128239d65e Almost there 2018-12-19 22:47:27 +01:00
Melody
5e6ceeb631 update applymovement to remove magic numbers 2018-12-19 14:08:01 -05:00
golem galvanize
e771854eae removed commented out attempt 2018-12-19 10:51:55 -05:00
golem galvanize
0fa120ebcd get a nonmatching slightly more functional 2018-12-19 10:48:15 -05:00
golem galvanize
cd785011fe decompiled water 2018-12-19 10:31:37 -05:00
Diegoisawesome
bd7c251859 Fix compressed palette alignment 2018-12-18 20:15:59 -06:00
Diegoisawesome
2592803460 Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-18 19:54:27 -06:00
Diegoisawesome
cd994f4935 Begin trade.c 2018-12-18 19:29:41 -06:00
golem galvanize
f7df299be8 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_water 2018-12-18 20:23:32 -05:00
golem galvanize
15a7b1bc08 begin water.s 2018-12-18 20:23:07 -05:00
Marcus Huderle
b2ac3b6d6f Decompile most of battle_anim_effects_3.c 2018-12-18 19:15:59 -06:00
Marcus Huderle
d2b5a0e83f Convert battle_anim_815A0D4 data to .c 2018-12-18 19:15:59 -06:00
Diegoisawesome
2c7948bae8
Merge pull request #452 from Meowsy/pokemon-adding-easer 
Add macros to simplify defining front animations and still pics.
 2018-12-18 14:27:01 -06:00
Meowsy
d6b31346c3 Additional SPECIES_* documentation. 2018-12-18 10:03:57 -05:00
Meowsy
9ca27f1332 Document return value. 2018-12-18 09:20:43 -05:00
golem galvanize
8781d969ff finish party_menu 2018-12-18 05:38:08 -05:00
golem galvanize
c259ee46d3 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-18 05:31:39 -05:00
Marcus Huderle
c74468fd11 Document a bunch of battle anim stuff 2018-12-17 22:16:17 -06:00
Marcus Huderle
c04ce0ee64 Decompile battle_anim_effects_2.c 2018-12-17 22:16:17 -06:00
DizzyEggg
9ffd0c7382 3.5 asm left 2018-12-17 23:00:08 +01:00
Meowsy
e92245ab06 Add macros to simplify defining front animations and still pics. 2018-12-17 12:29:35 -05:00
Meowsy
62c4379a21 Remove magic numbers. 2018-12-17 12:28:11 -05:00
golem galvanize
076d07f6fe Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-17 02:40:30 -05:00
golem galvanize
71a7a8a075 decompiled up to sub_81B8A7C 2018-12-17 02:39:17 -05:00
shinny456
60484153a5 decompile electric.s 2018-12-16 22:23:05 -05:00
garak
e292d0ca83
Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
DizzyEggg
aae36b5653 6k left 2018-12-16 21:10:01 +01:00
Marcus Huderle
d1e6e705cc Decompile battle_anim_effects_1.c 2018-12-16 11:39:22 -06:00
Marcus Huderle
9c5fa4a787 Fix typo in UpdateContestPaintingMosaicEffect() 2018-12-16 08:28:09 -06:00
Marcus Huderle
fb9a365dc6
Merge pull request #448 from Meowsy/pokedex-documentation 
Pokedex Documentation
 2018-12-15 18:06:42 -06:00
Meowsy
1d09216e4b Simplify comparisons. 2018-12-15 18:39:48 -05:00
Meowsy
6ed8e4d6ed Rename temp_notNationalDex to temp_isHoennDex. 
Don't use hexadecimal format for x and y args.
 2018-12-15 18:34:06 -05:00
Meowsy
3d8cecb662 Use correct term. 2018-12-15 18:32:50 -05:00
DizzyEggg
f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
Meowsy
83c3f13655 Prettify line. 2018-12-15 15:26:07 -05:00
Meowsy
8f168add21 Remove incorrect comment. 2018-12-15 15:25:45 -05:00
Meowsy
bc11a4a9f4 Document various things relating to the Pokedex. 2018-12-15 15:12:28 -05:00
Marcus Huderle
1ca3656d74
Decompile contest_painting.c (#447) 2018-12-15 13:07:07 -06:00
Slawter666
2fa0555ed5 Document some of item_menu.c 2018-12-15 18:08:13 +00:00
garak
7e170a06cc label some sprite templates 2018-12-14 19:39:01 -05: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
golem galvanize
6748ef72fb Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-13 00:31:06 -05:00
Marcus Huderle
170b6ef449
Decompile battle_intro.c (#444) 2018-12-12 23:18:25 -06:00
golem galvanize
2265d49ac2 decompiled up to sub_81B5A8C 2018-12-12 22:55:39 -05:00
DizzyEggg
59a69eb627 Storage up to icon palettes 2018-12-12 23:19:50 +01:00
DizzyEggg
74746603ad More pokemon storage 2018-12-11 23:09:12 +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
Meowsy
68017b531a Rename UnknownPokemonStruct to BattleTowerPokemon. 2018-12-10 15:49:33 -05:00
DizzyEggg
c2d8876174 Document PSS functions 2018-12-10 21:36:52 +01:00
Diegoisawesome
58ca87accc
Merge pull request #441 from Meowsy/document-pockets 
Document bag pocket magic numbers.
 2018-12-10 11:23:41 -06:00
Diegoisawesome
bfdfe367e8
Merge pull request #422 from garakmon/frontier_data_1 
Battle tower data
 2018-12-10 11:22:16 -06:00
Meowsy
2f008e866b Document return locations. 2018-12-10 11:39:57 -05:00
Meowsy
0aa41ad647 Fix whitespace to be consistent. 2018-12-10 11:38:27 -05:00
garak
c8cad8a389 re-add explicit array sizes 2018-12-10 10:33:51 -05:00
garak
2187dbb10a remove explicit array lengths from battle_tower.c 2018-12-10 10:17:03 -05:00
garak
10237e8d13 move externs and remove comments 2018-12-10 09:52:36 -05:00
Meowsy
e143804af0 Document pocket magic numbers. 2018-12-10 04:33:29 -05:00
golem galvanize
a6db7b2419 decompiled up to brm_cancel_1 2018-12-10 02:38:23 -05:00
garak
62384e7a61 use facility class constants 2018-12-09 22:57:46 -05: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
DizzyEggg
431e7e7e5c More storage work 2018-12-09 21:06:43 +01: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
Marcus Huderle
342d23e0ba
Merge pull request #436 from KDSKardabox/master 
Decompile ghost
 2018-12-09 07:59:32 -06:00
KDSKardabox
4233ae50c3 Finish decompile ghost 2018-12-09 18:38:15 +05:30
DizzyEggg
c46499b05c field screen review changes 2018-12-09 12:16:01 +01:00
DizzyEggg
4683cdc30c Merge branch 'master' into weather 2018-12-09 11:56:50 +01:00
KDSKardabox
8712757d24 Merge remote-tracking branch 'upstream/master' 2018-12-09 13:44:41 +05:30
KDSKardabox
f8838491f6 Initial commit for ghost 2018-12-09 13:44:07 +05:30
Diegoisawesome
0b91d2948a
Merge pull request #429 from nullableVoidPtr/master 
Various fixes and cleanups
 2018-12-08 21:44:12 -06:00
nullableVoidPtr
cceb8ac331 Remove trailing whitespace 2018-12-09 11:32:58 +08:00
DizzyEggg
4d2f1bad7f fix header 2018-12-08 22:12:44 +01:00
DizzyEggg
b94ae8bb92 Merge branch 'master' into weather 2018-12-08 22:10:20 +01:00
DizzyEggg
4ec14b3d43 Finish field screen 2018-12-08 22:05:11 +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
Marcus Huderle
88ffb09765
Merge pull request #432 from KDSKardabox/master 
De-compile fire
 2018-12-08 12:41:08 -06:00
KDSKardabox
1357449d73 Merge remote-tracking branch 'upstream/master' 2018-12-09 00:01:45 +05:30
KDSKardabox
2dfbe75b05 Shift externs to header file 2018-12-08 23:52:52 +05:30
DizzyEggg
4c23adb5f5 Decompile field weather 2018-12-08 19:05:03 +01:00
Meowsy
6babb97182 Fix typo "ggText_DexSortSmallestDescription". (#433) 
Should be "gText_DexSortSmallestDescription".
 2018-12-08 11:57:19 -06:00
Marcus Huderle
f3a25f83cf
Decompile roulette_util.c (#434) 2018-12-08 11:56:59 -06:00
KDSKardabox
5630ab2b1e Fully decompile fire 2018-12-08 17:55:17 +05:30
KDSKardabox
0f82e5caf7 Intial commit for decomp fire 2018-12-08 15:15:52 +05:30
nullableVoidPtr
f50faac244 Clean more tables 2018-12-08 14:10:30 +08:00
nullableVoidPtr
8a8baaeaaa Merge remote-tracking branch 'upstream/master' 2018-12-08 12:13:15 +08:00
nullableVoidPtr
907ed3f5f5 Format pokemon.c 2018-12-08 11:39:35 +08:00
nullableVoidPtr
4d307a6f63 Clean some more arrays 2018-12-08 11:33:41 +08:00
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
golem galvanize
53fac4417b fixing merge conflicts 2018-12-07 14:47:20 -05:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
nullableVoidPtr
4fc3fa9e44 Realign comments, clean tables in pokemon_animation.c and use SPECIES_OLD_UNOWN_ defines 2018-12-07 20:18:24 +08:00
golem galvanize
18124740a4 pushing so I can merge 2018-12-06 23:14:33 -05:00
Diegoisawesome
6df2042b3b
Merge pull request #427 from Slawter666/pokedex 
Document some more of pokedex.c
 2018-12-06 13:39:32 -06:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
nullableVoidPtr
3909b6408c Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
 2018-12-06 09:44:08 +08:00
DizzyEggg
a9e6154fa9 Finish porting battle frontier data 2018-12-05 22:21:26 +01:00
DizzyEggg
fc806b966e Merge branch 'frontier_data_1' of https://github.com/garakmon/pokeemerald into help_garak 2018-12-05 21:24:01 +01:00
Melody
2347e36d60 document pokédex options 2018-12-05 10:10:33 -05:00
Slawter666
9cfed81789 Document some more of pokedex.c 2018-12-05 00:15:22 +00:00
garak
d9287f3261 extern gTower trainer data 2018-12-04 12:15:13 -05:00
garak
80c3258504 finish battle tower data except sRubyFacilityClassToEmerald 2018-12-04 12:09:35 -05:00
garak
e69cb6b276 update frontier class names 2018-12-03 17:21:34 -05:00
garak
2c14d6ee6c fix merge conflicts 2018-12-03 16:58:28 -05:00
DizzyEggg
bac1f1b6c9
Match and clean rotating_gate.c 
One more down, many more to go.
 2018-12-03 21:44:47 +01:00
DizzyEggg
c7dd347bb1
Match battle_tower.c function 
For some reason, I gave the function of type void, type u16 instead, which messed up the registers, LMAO
 2018-12-03 21:09:26 +01:00
DizzyEggg
ba1fc05558 tabs 2018-12-03 18:10:03 +01:00
DizzyEggg
0d122bc831 Fix merge conflicts 2018-12-03 17:56:36 +01:00
Diegoisawesome
ffa8655f4c
Merge pull request #423 from Slawter666/pokedex-doc 
Document some of pokedex.c
 2018-12-03 10:53:21 -06:00
DizzyEggg
e1829c40ab Clean up safari zone 2018-12-03 17:31:34 +01:00
DizzyEggg
2821eafb99 Clean up roamer 2018-12-03 17:19:10 +01:00
DizzyEggg
dcb1d78fa9 Add battle controllers var to src from sym_ewram 2018-12-03 16:20:39 +01:00
DizzyEggg
846b5d79e4 Get rid of headers in src/data 2018-12-03 16:10:41 +01:00
Slawter666
715fbb379e Document some of pokedex.c 2018-12-03 14:58:25 +00:00
DizzyEggg
a83fc52a7e Make data easier to edit 2018-12-03 14:49:16 +01:00
Melody
44af811033 index trainer front anims ptr table 2018-12-03 08:36:10 -05:00
Melody
2779421ad4 fix brendan/may/wally consistency issues 2018-12-03 08:01:52 -05:00
DizzyEggg
d8b952f94c Clean up items data 2018-12-03 13:37: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
Melody
72bd670ba6 index trainer class lookups 2018-12-02 22:35:31 -05: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
9828e0e97b Merge with master 2018-12-02 19:38:05 +01:00
Diegoisawesome
ee05197eba
Merge pull request #418 from DizzyEggg/link_rfu 
Finish Link rfu
 2018-12-02 12:29:31 -06:00
DizzyEggg
a42bfd7a0e fix brackes n ne file 2018-12-02 19:27:56 +01:00
DizzyEggg
b87e6a4e57 Get rid of static functions in includes 2018-12-02 18:58:33 +01:00
DizzyEggg
d137ebc7a9 Some more rom 8011dc0 work 2018-12-02 13:59:55 +01:00
DizzyEggg
e17140536a finish link rfu and fix rom 8011dc0 2018-12-02 11:58:50 +01:00
Melody
b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
Melody
c7f52c4203 cleans up trainer name defines 2018-12-01 22:49:33 -05:00
DizzyEggg
b082f000af Start working on link rfu 2018-12-01 18:54:59 +01:00
Marcus Huderle
0e32a3adf3
Decompile normal.c (#414) 2018-11-30 17:29:55 -06:00
DizzyEggg
0ad4795e69 Match 2 field effect functions 2018-11-30 23:16:15 +01:00
Marcus Huderle
9dd7f8f214
Decompile pokedex_area_screen.c (#412) 2018-11-30 10:41:03 -06:00
DizzyEggg
f87e68379c match 2 field functions 2018-11-29 21:19:00 +01:00
Diegoisawesome
a7a317f6cc
Merge pull request #408 from DizzyEggg/pass_time 
Match 3 link rfu functions
 2018-11-28 16:51:53 -06:00
DizzyEggg
f54f5b3531 Match 3 link rfu functions 2018-11-28 23:08:20 +01:00
DizzyEggg
0ed2f54d61 Use MAX_SPRITES define 2018-11-28 21:08:22 +01:00
Marcus Huderle
0148e38973
Decompile pokedex_cry_screen.c (#406) 2018-11-28 10:14:32 -06:00
Marcus Huderle
9fafa63743 Finish decompiling internation_string_util.c 2018-11-27 17:21:23 -06:00
DizzyEggg
7cfe0342f0 Finish frontier data 2018-11-27 22:45:50 +01:00
garak
50f00b0827 Merge remote-tracking branch 'upstream/master' into fldeff 2018-11-27 13:31:07 -05:00
garak
2707bd9b91 clean frontier data 2018-11-27 13:27:49 -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
nullableVoidPtr
556bdd52e1 Clean up aligned variables in src/ 2018-11-27 19:37:29 +08:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Marcus Huderle
382ff45452
Merge pull request #396 from DizzyEggg/attempt 
Match some functions
 2018-11-26 16:58:19 -06:00
Marcus Huderle
c233dbb220
Merge pull request #400 from DizzyEggg/util 
Match sub_080F8970
 2018-11-26 16:57:36 -06:00
Jefferson Steelflex
af08f3bb13
Update back_pic_coordinates.h 2018-11-26 16:55:37 -05:00
Jefferson Steelflex
8e5e4c2304
Fix labels, shifted off by one. 2018-11-26 16:51:08 -05:00
DizzyEggg
132a486169 Match 0x0F8970 2018-11-26 21:54:51 +01:00
DizzyEggg
c9b3f3e3cb Fix indentation 2018-11-26 20:19:52 +01:00
Marcus Huderle
2425a14b19 Decompile fight.c 2018-11-26 10:25:51 -06:00
Marcus Huderle
35c0fb5154 Decompile ground.c 2018-11-26 09:55:31 -06:00
Marcus Huderle
839c629d5b Decompile dragon.c 2018-11-26 09:31:03 -06:00
Marcus Huderle
9b1f2ccf5e Decompile poison.c 2018-11-26 09:13:45 -06:00
Marcus Huderle
2c2431aa4c
Decopmile bug.c (#399) 2018-11-26 09:03:50 -06:00
Marcus Huderle
5947e0d229 Decompile rock 2018-11-25 17:00:18 -06:00
Marcus Huderle
19e235867a
Merge pull request #395 from Slawter666/battle-ui-doc 
Document some battle ui
 2018-11-25 15:58:37 -06:00
Marcus Huderle
fb6120da5b Fixup some names 2018-11-25 15:50:54 -06:00
Marcus Huderle
256bfc3caa Decompile script_pokemon_util_80F87D8 2018-11-25 15:32:22 -06:00
DizzyEggg
8e10d7c0e5 Match some functions 2018-11-25 20:16:41 +01:00
Slawter666
3b501cb470 Document battle ui 2018-11-22 01:10:50 +00:00
DizzyEggg
a900a51a59 match DecompressGlyphTile nicer 2018-11-21 23:30:50 +01:00
DizzyEggg
d70c3a94c5 match DecompressGlyphTile nicer 2018-11-21 23:30:04 +01:00
DizzyEggg
c7ca38ccf3 Match DecompressGlyphTile 2018-11-21 21:58:35 +01:00
garak
f02cb667bb first 4 functions in fldeff 2018-11-20 09:51:54 -05:00
DizzyEggg
58a1bba059 tabs to spaces 2018-11-19 20:25:09 +01:00
DizzyEggg
f0ec68c058 add include 2018-11-19 18:14:28 +01:00
DizzyEggg
9f8bcadad5 apprentice and factory screen common symbols 2018-11-19 18:06:15 +01:00
DizzyEggg
37d49b34e0 Move vars to battle_main.c 2018-11-19 17:36:39 +01:00
DizzyEggg
5d5b4b853c Merge branch 'master' into frontier 2018-11-19 17:32:32 +01:00
DizzyEggg
8a00334102 document mossdeep gym 2018-11-19 17:31:46 +01:00
DizzyEggg
d22c2110de Decompile mossdeep hym 2018-11-19 17:16:01 +01:00
DizzyEggg
6a5b20ee8a Fix fossil specials 2018-11-19 17:15:28 +01:00
Marcus Huderle
72f0a079a9 Decompile all of battle_anim_utility_funcs 2018-11-19 09:37:25 -06:00
DizzyEggg
95d3c180cc clean up variables in files 2018-11-19 01:03:14 +01:00
DizzyEggg
f58cc47e17 USE RGB constants in hall of fame 2018-11-18 20:32:27 +01:00
DizzyEggg
27ee7d567e fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT 2018-11-18 20:19:10 +01:00
Diegoisawesome
0bbe03f170
Merge pull request #388 from DizzyEggg/clean_savve 
Clean up save related files
 2018-11-18 13:13:56 -06:00
DizzyEggg
682e6c8512 Use RGB constants in save files 2018-11-18 20:09:11 +01:00
DizzyEggg
1b0cfb0757 Party Size and Num Stats 2018-11-18 20:00:36 +01:00
DizzyEggg
7ce3473b0e Clean up save related files 2018-11-18 19:37:18 +01:00
DizzyEggg
4803a31b84 Fix unk5 field 2018-11-18 17:54:15 +01:00
DizzyEggg
4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
DizzyEggg
40a44a8508 more battle pytamid 2018-11-17 22:55:39 +01:00
DizzyEggg
eb66b60f38 Begin battle pyramid 2018-11-17 15:30:34 +01:00
Slawter666
4311fd8b89 Sort includes into alphabetical order 2018-11-14 00:01:50 +00:00
Slawter666
6fcf878e2f Tidy up header files 2018-11-13 22:28:46 +00: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
734403fdfa Merge branch 'master' into frontier_2 2018-11-12 15:42:44 +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
Slawter666
be33878b94 Synchronise wallclock.c 2018-11-12 14:04:32 +00:00
DizzyEggg
d5abd7b696 Document Battle Pie 2018-11-12 14:36:31 +01:00
DizzyEggg
3b3cffac44 Decompile battle pike 2018-11-12 14:07:31 +01:00
DizzyEggg
4fb463377c Start battle pike 2018-11-12 00:46:02 +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
DizzyEggg
1437755cdd Start arena 2018-11-07 22:54:42 +01:00
Diegoisawesome
65f053fd89 Thanks Egg 2018-11-07 14:48:06 -06:00
DizzyEggg
01fdb01364 Diego pls 2018-11-07 21:09:54 +01:00
Diegoisawesome
9f50ba1ce3 Fix incorrect compressed types, part 2 2018-11-07 12:35:31 -06: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
Slawter666
15117a8d09 Remove redundancy in berry.c 2018-11-06 23:15:57 +00:00
Diegoisawesome
9afe7a896e Merge remote-tracking branch 'pret/master' into render_text 2018-11-06 11:40:17 -06:00
Diegoisawesome
43a8534fce Merge remote-tracking branch 'origin/master' into render_text 2018-11-06 11:33:21 -06:00
Diegoisawesome
f8d337e491 Finish cleaning up text.c 2018-11-06 11:30:21 -06:00
Diegoisawesome
6d38431c33 Begin cleaning text.c 2018-11-06 10:44:48 -06:00
DizzyEggg
258ec3162f frontier util review changes 2018-11-05 22:13:59 +01:00
Diegoisawesome
7dd4ed7060 r5/r6 swap on sub_80E2578 2018-11-05 14:45:54 -06:00
DizzyEggg
487a6c2b2c this file is 2018-11-05 21:42:12 +01:00
DizzyEggg
6d0d69f3a5 Match Render Text 2018-11-04 23:09:10 +01:00
Slawter666
bd766b9049 Minor labelling of field effects 2018-11-03 20:20:28 +00:00
DizzyEggg
3159e958b8 Match a record mixing function 2018-11-03 18:21:33 +01:00
DizzyEggg
0bb51037d7 Finish frontier util 2018-11-01 21:31:10 +01:00
DizzyEggg
37d742cbd8 Document recorded battle 2018-11-01 15:06:50 +01:00
Diegoisawesome
645830624d Continue script_menu.c 2018-10-31 23:03:41 -05:00
DizzyEggg
7de1c4bd14 Make frontier util compile 2018-10-30 22:17:03 +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
9adbb5d871
Merge pull request #375 from garakmon/animation-test-temp 
Back animation names
 2018-10-30 12:00:37 -05: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
garak
3cb7a33f42 label back animations 2018-10-30 12:37:53 -04:00
Diegoisawesome
c8ef69a00d
Merge pull request #372 from garakmon/sprite-tags 
Synchronize sprite tags
 2018-10-30 11:26:44 -05:00
Diegoisawesome
f3af20d3cf
Merge pull request #370 from DizzyEggg/battle_tower 
Decompile Battle Tower
 2018-10-30 11:18:24 -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
e850517123 more battle frontier 2 2018-10-27 21:01:35 +02:00
DizzyEggg
269d7c2510 up to factory 2018-10-27 17:39:05 +02:00
DizzyEggg
826d0ea2ab Begin frontier records 2018-10-27 15:44:29 +02:00
DizzyEggg
b252bd0292 Window priority to window bg 2018-10-27 00:53:07 +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
DizzyEggg
dc273cc19d Battle tower - ewram variables 2018-10-26 23:54:41 +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
DizzyEggg
549b669f2a battle tower, match sth and dumb loop instead of goto 2018-10-24 23:14:45 +02: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
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
Diegoisawesome
32d2640dc7 Match GameClear (thanks Egg) 2018-10-21 16:24:43 -05:00
DizzyEggg
0ab27e44b1 more tower, fail 2018-10-21 20:13:12 +02:00
Diegoisawesome
8e7202ec3d Fix LZ compressed data alignment 2018-10-21 12:05:34 -05:00
Diegoisawesome
97bbb326b8 GameClear nonsense 2018-10-20 19:53:41 -05:00
golem galvanize
ba3247d5cd decompiled more, stuck on sub_81B1760 2018-10-20 20:25:28 -04: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
Slawter666
7a072d4527 Continue synchronising 2018-10-20 21:01:45 +01: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
DizzyEggg
f4e55999a5 begin porting and decomping battle tower 2018-10-20 00:33:51 +02: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
Diegoisawesome
95d8815721
Merge pull request #368 from Diegoisawesome/master 
Finish porting/decompiling field_player_avatar
 2018-10-19 00:08:59 -05:00
Diegoisawesome
dd3689fdbf Finish porting/decompiling field_player_avatar 2018-10-19 00:05:54 -05: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
DizzyEggg
dfee5deca8 Move Bitmap struct and clear sprite/text files 2018-10-18 21:24:37 +02:00
Diegoisawesome
b23dc9a123
Merge pull request #366 from Diegoisawesome/master 
Finish shop and fldeff_escalator
 2018-10-18 12:08:38 -05:00
Diegoisawesome
6206acd2d2 Finish shop and fldeff_escalator 2018-10-18 12:05:02 -05:00
golem galvanize
dded980cde fix building 2018-10-17 23:36:18 -04:00
garak
d1b7f32b0a begin event flag names, add temporary hidden item macro 2018-10-17 22:07:23 -04:00
golem galvanize
2c6d634acd Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-10-17 20:03:31 -04:00
golem galvanize
65a0c48eec decompiled some more of the file 2018-10-17 20:03:02 -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
Slawter666
b7b1d609d0 More synchronisation 2018-10-17 13:52:26 +01:00
Diegoisawesome
f67bbbdaaa
Merge pull request #364 from Diegoisawesome/master 
Port/decompile field_control_avatar
 2018-10-16 21:54:14 -05: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
DizzyEggg
1f358fbb07
Use constants 2018-10-16 22:34:53 +02:00
Slawter666
3aff112127 Begin synchronising with pokeruby 2018-10-16 14:55:16 +01: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
Deokishisu
94bec0b8db Fix Double Underscores 
Whoops.
 2018-10-14 16:14:01 -04:00
Deokishisu
d7ba8a306c Rename OW Sprites 
Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed.

Renamed:
LittleBoy1 -> NinjaBoy
LittleGirl1 -> Twin
Woman2 -> PokefanF
OldMan1 -> ExpertM
OldWoman1 -> ExpertF
Man3 -> PokefanM
Woman6 -> LinkReceptionist
Man7 -> DevonEmployee
Boy4 -> RichBoy
Boy5 -> GameboyKid (Consistent with pokecrystal)
ContestOldMan -> ContestJudge

Renamed Because of Numbering Changes:
LittleBoy2 -> LittleBoy
LittleGirl2 -> LittleGirl
OldWoman2 -> OldWoman
OldMan2 -> OldMan
Man4 -> Man3
Man5 -> Man4
Man6 -> Man5
Woman3 -> Woman2
Woman4 -> Woman3
Woman5 -> Woman4
Woman7 -> Woman5
 2018-10-14 15:49:55 -04:00
Deokishisu
a8afec762b Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:22:56 -04:00
Diegoisawesome
02049d52ee
Merge pull request #351 from DizzyEggg/apprentice 
Decompile apprentice
 2018-10-14 13:20:38 -05:00
Deokishisu
c89b14f5ef Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:19:23 -04:00
Diegoisawesome
43316ffae8
Merge pull request #356 from DizzyEggg/clean_battlestruct 
Clean a couple of battlestructs' fields
 2018-10-14 13:18:29 -05:00
Deokishisu
e129f4864f Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:16:07 -04:00
Diegoisawesome
0979ea91fb
Merge pull request #357 from DizzyEggg/move_heap 
Move HEAP_SIZE to malloc and use void instead of empty argument list
 2018-10-14 13:15:31 -05:00
DizzyEggg
c3113db931 Move HEAP_SIZE to malloc and use void instead of empty argument list 2018-10-14 20:00:14 +02: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
Diegoisawesome
e0bc3fd59c
Merge pull request #355 from DizzyEggg/use_eos 
Use defines for text chars
 2018-10-14 12:21:37 -05:00
DizzyEggg
ecdf0fd69d Clean battle structs 2018-10-14 18:37:52 +02:00
Deokishisu
2bd86dad2f Rename Boy4 to RichBoy 2018-10-14 12:26:48 -04:00
DizzyEggg
b73611bccb clean battle structs 2018-10-14 18:10:54 +02:00
DizzyEggg
cd4f65ecef Make apprentice compile 2018-10-14 17:06:47 +02: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
af7aa624cd make aprentice compile 2018-10-14 15:23:14 +02:00
DizzyEggg
84936b4260 Merge branch 'master' into apprentice 2018-10-14 15:07:16 +02:00
DizzyEggg
541043a661 Use defines for text chars 2018-10-14 15:04:25 +02:00
DizzyEggg
7a008a944a Move 'blend_palette'.c to util.c 2018-10-14 14:43:19 +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
36b8a6a9a2 More apprentice work 2018-10-13 23:23:33 +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
DizzyEggg
74b81bf229 start apprentice 2018-10-13 00:48:26 +02:00
golem galvanize
d3d725cc83 decompiled up to sub_81B0948 2018-10-11 21:23:39 -04:00
Diegoisawesome
04836db167 Start porting cable_club.c 2018-10-11 16:02: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
Marcus Huderle
807050a048
Merge pull request #348 from DizzyEggg/anim_files 
Decompile/Port battle_anim_80A5C6C
 2018-10-07 12:23:07 -05:00
DizzyEggg
dbb09aa445 get rid of SPRITE and TASK 2018-10-07 19:19:13 +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
Diegoisawesome
7a7aeed5e8
Merge pull request #347 from Deokishisu/GamV 
Fill out VERSION_ enum with all possible values
 2018-10-06 13:45:21 -05:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims 
Document battle animation scripts
 2018-10-06 08:20:41 -05:00
Deokishisu
9f69ea1931
Update gGameVersion to use GAME_VERSION 2018-10-06 01:57:39 -04:00
Marcus Huderle
ec0d350137 Move metatile behavior constants to include/constants and sync closer to pokeruby 2018-10-04 17:57:07 -05:00
Diegoisawesome
25033ef311 Finish tileset_anims macroization 2018-09-23 14:58:36 -05:00
Diegoisawesome
584cad6c0b
Merge pull request #339 from Kermalis/master 
Rename voicegroups
 2018-09-22 15:48:29 -05:00
Kermalis
e93f1182e6 Rename voicegroups 2018-09-22 16:42:34 -04:00
Diegoisawesome
58a5e4a261 Merge branch 'master' of github.com:pret/pokeemerald 2018-09-22 15:39:34 -05:00
Diegoisawesome
9e840dc5fe Merge remote-tracking branch 'Tetra/master' 2018-09-22 15:23:47 -05:00
Diegoisawesome
d50554bb8e Use macros and defines in tileset_anims 2018-09-22 15:02:49 -05: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
Tetrable
1f767e4c49 Document and make tileset_anims.c easier to use 2018-09-22 13:27:43 +01:00
Tetrable
4d9c513e3e Document and improve tileset_anims.c further 2018-09-22 12:50:24 +01:00
DizzyEggg
66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +02:00
DizzyEggg
bf64333299 Give labels to healthbox gfx 2018-09-20 21:42:38 +02:00
DizzyEggg
e4b7ba0977 Document some not labeled battle things 2018-09-20 11:55:35 +02:00
Diegoisawesome
8a05bf82ec Merge branch 'master' of github.com:pret/pokeemerald 2018-09-18 10:03:57 -05:00
Diegoisawesome
899ae7a59a Add defines for tile, metatile, and palette count 2018-09-18 10:03:24 -05:00
Diegoisawesome
7f2d52d9e0
Merge pull request #332 from DizzyEggg/patch-5 
Use defines for BattleAI_ChooseMoveOrAction
 2018-09-17 10:11:25 -05:00
Diegoisawesome
6978a896d1
Merge pull request #331 from DizzyEggg/patch-3 
Use pokeruby's formatting for move descriptions
 2018-09-17 10:11:12 -05:00
DizzyEggg
5164215c91
Use defines for BattleAI_ChooseMoveOrAction 2018-09-16 17:06:35 +02:00
DizzyEggg
94bbfa7fa0
Use pokeruby's formatting for move descriptions 2018-09-16 15:58:13 +02:00
DizzyEggg
de65ddf4b6
Make it easier to edit ability text 2018-09-16 10:17:10 +02:00
Diegoisawesome
6a8f27c1ac
Merge pull request #326 from DizzyEggg/cablecarutil 
Decompile cable_car_util.c
 2018-09-16 01:06:33 -05: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
ff13cb6352 decompile cable car util which has nothing to do with actual cable car 2018-09-15 13:50:23 +02:00
DizzyEggg
2a7811456a Add anim tag sprite defines 2018-09-15 00:30:20 +02:00
Diegoisawesome
b8c9d9a980
Merge pull request #324 from Diegoisawesome/master 
Document main_menu
 2018-09-14 12:17:11 -05:00
Diegoisawesome
b860d583e4 Document main_menu 2018-09-14 12:15:46 -05: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
Marcus Huderle
ba125b23fd Remove transparency from event object spritesheets 2018-09-11 17:18:10 -05: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
Diegoisawesome
d9941cd1a8 Standardize sprite visibility to boolean 2018-09-10 10:25:58 -05:00
Diegoisawesome
cb053b3a15
Merge pull request #312 from DizzyEggg/decompile_frontier_2 
Decompile Battle Factory
 2018-09-10 10:20:41 -05:00
DizzyEggg
74cc2cf512 battle factory review changes 2018-09-10 10:18:30 +02:00
DizzyEggg
b87856b58e Battle Factory is decompiled and documented. 2018-09-10 01:01:39 +02:00
Tetrable
044ef98309 Document trainer animations, correct unused table labelling 2018-09-09 22:35:07 +01:00
DizzyEggg
cf8898071d Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into decompile_frontier_2 2018-09-09 20:31:56 +02:00
DizzyEggg
4d1df7ecbe comm 2018-09-09 20:31:51 +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
DizzyEggg
2f59df03ab Standartize AddTextPrinterParametrized functions, 2018-09-08 23:38:30 +02:00
DizzyEggg
1616c254d2 Swap_InitAllSprites done 2018-09-08 22:33:07 +02:00
Diegoisawesome
e1834c9d7b Change overworld_frame macro to use tiles 2018-09-08 03:07:44 -05:00
Diegoisawesome
eb8b0ff0f7 Merge branch 'master' of github.com:pret/pokeemerald 2018-09-08 02:43:19 -05:00
Diegoisawesome
12521fb1a8 Merge branch 'Slawter666-spritesheet' 2018-09-08 02:37:33 -05:00
Diegoisawesome
2b07588c02 Merge branch 'master' of github.com:Diegoisawesome/pokeemerald 2018-09-08 02:36:59 -05:00
Diegoisawesome
f73807ea60 Add palette tags for event objects 2018-09-07 23:52:11 -05:00
Diegoisawesome
d945a8bf2f Macroize main_menu and general cleanup 2018-09-07 19:24:33 -05:00
Slawter666
291ac2cee9 Add build rules for overworld sprite sheets 2018-09-08 00:28:32 +01:00
Diegoisawesome
cf8f73bde1
Merge pull request #314 from Slawter666/data 
Convert data to C
 2018-09-07 11:39:07 -05:00
Slawter666
54d5a7ad97 Format event object pic tables 2018-09-07 14:14:52 +01:00
Slawter666
9dec2bdef8 Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet 2018-09-07 11:50:23 +01:00
DizzyEggg
1283b87505 up to sub_819d064 2018-09-06 23:02:16 +02: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
0cd250a83e
Deleted accidently uploaded file 2018-09-06 00:00:29 +01:00
Slawter666
5656ceab6c Move graphics to src/data/graphics 2018-09-05 23:53:54 +01:00
Diegoisawesome
8defc345f0
Merge pull request #313 from ultima-soul/overworld_and_mapping 
Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be de…
 2018-09-05 16:50:25 -05:00
DizzyEggg
75384546b5 More factory decomp and documentation. 2018-09-05 23:30:15 +02:00
ultima-soul
857ac33adb Fixed a typo. 2018-09-05 17:25:44 +00:00
Diegoisawesome
41fe72b95d
Merge pull request #310 from DizzyEggg/patch-1 
Update item_menu.c
 2018-09-05 01:36:40 -05:00
ultima-soul
f505ba1bc7 Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be dependent on Map Section ID enum rather than order dependent. 2018-09-05 01:13:17 +00:00
Slawter666
4c54212b1f Bring labels for overworld.c over from pokeruby 2018-09-04 23:31:37 +01:00