Commit Graph

478 Commits

Author SHA1 Message Date
GriffinR
973e6f9667 Document mauville_man.inc 2019-10-21 17:21:53 -05:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
DizzyEggg
4c462a726e Merge with master and learnsets 2019-10-06 15:57:33 +02:00
GriffinR
945d3d3a27
Merge branch 'master' into document-eventscripts 2019-09-17 00:10:23 -04:00
GriffinR
85d97542cd Use MAX_MON_MOVES constants 2019-09-16 19:21:23 -05:00
GriffinR
9fbcd552de document remainder of secret_base scripts, delete unneeded scripts.incs 2019-09-06 02:12:00 -04:00
PikalaxALT
904bba9e16 NULL_BATTLE_TOWER_POKEMON define 2019-09-05 20:48:48 -05:00
DizzyEggg
e96e98a8de Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-08-25 13:10:32 +02:00
DizzyEggg
58b313956d Merge with master 2019-08-25 12:51:09 +02:00
GriffinR
5fb7ab05dd clean up 2019-08-21 17:06:55 -05:00
GriffinR
d931ba9602 document remaining funcs 2019-08-21 17:06:55 -05:00
GriffinR
7fc99f3952 favor lady funcs 2019-08-21 17:06:55 -05:00
GriffinR
009caa21c8 some contest lady funcs 2019-08-21 17:06:55 -05:00
GriffinR
fc467a9d52 standardize favour/favor 2019-08-21 17:06:55 -05:00
GriffinR
23979c4d7d initial documentation commit 2019-08-21 17:06:55 -05:00
DizzyEggg
fabbc9ae31 Merge with master 2019-08-14 11:48:08 +02:00
DizzyEggg
0252270515 Merge with master 2019-08-12 11:25:05 +02:00
PikalaxALT
329670e16e Minor fixes 2019-08-05 08:46:52 -04:00
DizzyEggg
4881e48994 Merge with master 2019-08-04 23:57:53 +02:00
DizzyEggg
c219776034 Merge with master 2019-08-04 23:09:28 +02:00
PikalaxALT
cd876292d1 Merge branch 'master' into pokenav_unk_2 2019-08-04 15:35:35 -04:00
DizzyEggg
e634e722cc Decompile pokemon jump 2019-07-29 12:35:57 +02:00
PikalaxALT
e92e9a184c Support for non-dkA toolchains 2019-06-28 22:26:11 -04:00
PikalaxALT
fb06e4a3c9 Modernize code
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
2019-06-26 12:12:10 -04:00
DizzyEggg
ad6093f5bc Merge with master, fix conflicts 2019-05-17 10:15:30 +02:00
DizzyEggg
f22f7866ac Merge with master, fix conficts 2019-05-17 09:52:20 +02:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
DizzyEggg
94045ace0b Merge branch 'master' into battle_engine_v2 2019-05-15 13:31:53 +02:00
DizzyEggg
38b320eaa5 Data for hidden abilities 2019-05-14 13:20:10 +02:00
DizzyEggg
00dcc05516 Add new dex flags 2019-05-14 11:54:58 +02:00
PikalaxALT
539d472796 Merge branch 'master' into dodrio_berry_picking 2019-05-11 21:22:09 -04:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
PikalaxALT
a58d9a16dd Merge branch 'master' into dodrio_berry_picking 2019-04-05 08:41:31 -04:00
DizzyEggg
183b714ff1 Merge with master and fix web moves 2019-04-05 12:43:44 +02:00
PikalaxALT
53efbe2832 Finish decomp of union_room_chat 2019-04-04 19:26:45 -05:00
PikalaxALT
a47abb3949 union_room_chat data, 1 2019-04-04 19:26:45 -05:00
PikalaxALT
d220f876fc Some symbol documentation 2019-04-03 17:04:42 -05:00
DizzyEggg
17e74756cb Merge with master, add defines to atk49 and statbuffchange commands 2019-03-31 15:19:25 +02:00
Marcus Huderle
af1baa89f1 Start decompiling union_room_chat.c 2019-03-26 21:58:20 -05:00
PikalaxALT
d4cca4ffa2 through sub_8024F38 2019-03-24 22:56:16 -04:00
Marcus Huderle
e6caf0ff10 Port mevent2.c from pokefirered 2019-03-24 18:29:00 -05:00
DizzyEggg
fddb5159b4 Merge with master 2019-03-05 21:46:45 +01:00
huderlem
ee9694d9ba
Merge pull request #587 from Phlosioneer/document-all-event-vars
Document all event vars
2019-03-02 08:24:46 -06:00
huderlem
3b04cfa437
Merge pull request #551 from Phlosioneer/multiplayer-stuff
Document overworld.c and link stuff in general
2019-03-01 08:43:55 -06:00
DizzyEggg
cebada80d0 Merge with master 2019-02-28 20:56:52 +01:00
Phlosioneer
782979f1fc Finish documenting trainer hill
Trainer hill isn't anywhere close to done, but I figured out enough
to name the VAR. That's all this PR should do.
2019-02-27 22:16:01 -05:00
Phlosioneer
66f0616a2d I guess I'm documenting Trainer Hill now 2019-02-27 21:31:05 -05:00
Marcus Huderle
4b9e93850c Document easy chat screen types 2019-02-27 12:55:29 -06:00
Phlosioneer
3a44b090d1 Merge branch 'master' into multiplayer-stuff 2019-02-26 22:07:29 -05:00
Marcus Huderle
b60611c38e Finish decompiling easy_chat.c code 2019-02-26 14:50:02 -06:00
DizzyEggg
842e379a7b Merge branch 'master' into battle_engine_v2 2019-02-23 22:50:46 +01:00
Phlosioneer
eca329f9c5 Merge branch 'master' into multiplayer-stuff 2019-02-21 21:22:10 -05:00
Phlosioneer
93e9b9fe5d Fix some names 2019-02-18 01:33:41 -05:00
Phlosioneer
08579edbcd Clean up mistakes and bad formatting 2019-02-18 01:03:44 -05:00
Phlosioneer
986d3d8b2f Finish and polish new_game.c
Only one function is left undocumented. I tried to go into the assembly
to at least name it, but it clears fields in the save block that aren't
even documented yet.
2019-02-15 03:40:57 -05:00
DizzyEggg
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
Marcus Huderle
4570e3b6a5 Document battle arena 2019-02-08 09:41:36 -06:00
Marcus Huderle
85040e26fd Document battle pike 2019-02-07 17:37:41 -06:00
DizzyEggg
aa33a61e58 Merge branch 'master' into battle_engine_v2 2019-02-07 21:17:30 +01:00
Marcus Huderle
4785a07acd Document battle factory functions 2019-02-07 12:58:09 -06:00
Marcus Huderle
3a88ab831d Document more battle pyramid 2019-02-07 11:51:03 -06:00
Marcus Huderle
a1ad1bad3a Document a bunch of battle pyramid 2019-02-06 21:14:28 -06:00
DizzyEggg
2c3210f4d1 merge with master 2019-01-18 22:30:34 +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
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
d59f5a8e56 Misc overworld documentation 2018-12-27 16:52:13 -06:00
DizzyEggg
ef55bdac89 Merge branch 'master' into battle_engine_v2 2018-12-22 23:57:42 +01:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
DizzyEggg
ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
Marcus Huderle
fb9a365dc6
Merge pull request #448 from Meowsy/pokedex-documentation
Pokedex Documentation
2018-12-15 18:06:42 -06:00
DizzyEggg
f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
Meowsy
bc11a4a9f4 Document various things relating to the Pokedex. 2018-12-15 15:12:28 -05:00
Marcus Huderle
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
Meowsy
68017b531a Rename UnknownPokemonStruct to BattleTowerPokemon. 2018-12-10 15:49:33 -05:00
Marcus Huderle
a7722a0b93
Decompile cable_car.c (#438) 2018-12-09 13:41:52 -06:00
DizzyEggg
4c23adb5f5 Decompile field weather 2018-12-08 19:05:03 +01:00
DizzyEggg
a5df797804 Merge branch 'master' into battle_engine_v2 2018-11-19 20:42:07 +01:00
DizzyEggg
d22c2110de Decompile mossdeep hym 2018-11-19 17:16:01 +01: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
eb66b60f38 Begin battle pyramid 2018-11-17 15:30:34 +01:00
DizzyEggg
bb9dbc0c6d Merge with master 2018-11-14 22:50:27 +01: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
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
e9965dd341 merge with master 2018-11-02 22:55:32 +01: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
826d0ea2ab Begin frontier records 2018-10-27 15:44:29 +02:00
DizzyEggg
549b669f2a battle tower, match sth and dumb loop instead of goto 2018-10-24 23:14:45 +02:00
DizzyEggg
b330bdba51 More and more battle tower 2018-10-22 19:22:57 +02: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
DizzyEggg
f4e55999a5 begin porting and decomping battle tower 2018-10-20 00:33:51 +02:00
DizzyEggg
dfee5deca8 Move Bitmap struct and clear sprite/text files 2018-10-18 21:24:37 +02:00
Slawter666
b7b1d609d0 More synchronisation 2018-10-17 13:52:26 +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
DizzyEggg
c3113db931 Move HEAP_SIZE to malloc and use void instead of empty argument list 2018-10-14 20:00:14 +02:00
DizzyEggg
7952cfeba5 document more of apprentice 2018-10-14 16:27:48 +02:00
DizzyEggg
145df49063 Document more of apprentice 2018-10-14 14:35:51 +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
DizzyEggg
74b81bf229 start apprentice 2018-10-13 00:48:26 +02:00
Diegoisawesome
72c9abbb66
Remove invalid version entries 2018-10-07 23:28:36 -05:00
DizzyEggg
b80b94ee73 merge with master 2018-10-07 19:40:34 +02:00
Deokishisu
2070c246f9
Added new findings about invalid version IDs.
After transferring Pokemon up to Gen 6 and then to Gen 7, I discovered that invalid version IDs display the "a distant land" string that is used for the Gamecube games, so that information was added in a comment.

Also clarified that it's not just Gen 4 that displays the Johto string, it's Gen 4 and up.
2018-10-06 07:40:56 -04:00
Deokishisu
76a9cf0d54
Fix captitalization of HGSS in comment and match FRLG formatting in enum 2018-10-06 01:56:03 -04:00
Deokishisu
cc0d2288d5
Match comment formatting 2018-10-06 01:46:17 -04:00
Deokishisu
024700769a
Document all possible VERSION_ numbers and add them to the enum 2018-10-06 01:45:36 -04:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
DizzyEggg
24b9cd721f More Battle Factory 2018-09-03 22:55:55 +02:00
DizzyEggg
f9af3bec9b merge with master 2018-09-02 00:07:19 +02:00
DizzyEggg
e28ce3be78 Fix the strings length issue 2018-09-01 22:03:21 +02:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
bc9fe72c6e Do some pyramid bag 2018-08-30 15:01:07 +02:00
DizzyEggg
78cad0dee5 try battle tent and fail 2018-08-26 15:27:06 +02:00
DizzyEggg
edcf04b665 Document battle dome. 2018-08-25 19:59:47 +02:00
DizzyEggg
62a645abaf Up To CopyDomeTrainerName 2018-08-25 18:46:15 +02: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
63cbc8f3cc battle dome - a couple more functions 2018-08-18 00:54:18 +02:00
DizzyEggg
e2f5e73445 More battle dome 2018-08-15 23:04:46 +02:00
DizzyEggg
a54fa23b5f Begin battle frontier 1 2018-08-15 15:49:50 +02:00
DizzyEggg
cc145a45f7 merge with master 2018-08-12 22:37:28 +02:00
Diegoisawesome
32b0e102cf
Merge pull request #287 from DizzyEggg/easy_chat
Pikalax's Easy chat
2018-08-12 12:17:23 -07:00
DizzyEggg
3a72e6a80d Easy chat review changes 2018-08-12 11:39:09 +02:00
Diegoisawesome
b54793be91 Finish decompiling field_specials 2018-08-11 14:51:54 -07:00
DizzyEggg
59d8d56868 merge easy chat with master 2018-08-11 14:14:51 +02:00
Diegoisawesome
bad170b0cb Continue decompiling field_specials 2018-08-08 23:53:21 -07:00
DizzyEggg
5a38bb61db Basic damage calc is ready. 2018-07-14 22:56:03 +02: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
f35c0abe80 merge with battle tent update 2018-07-01 12:16:52 +02:00
DizzyEggg
15fe5a031b Merge branch 'master' into decompile_battle_tent 2018-06-30 14:43:41 +02:00
Marcus Huderle
ed8b006e67 Rename map-layout-related things 2018-06-20 19:54:21 -05:00
DizzyEggg
ab36efdaf4 document bounce effect 2018-06-20 23:07:51 +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
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Diegoisawesome
0b09575fd4
Merge pull request #249 from golemgalvanize/decompile_pokedex
Decompile pokedex
2018-06-01 00:02:46 -07:00
DizzyEggg
9e7965fab0 document record mixing 2018-05-26 00:25:36 +02:00
DizzyEggg
b051cbaaab more record mixing decomp 2018-05-25 21:00:41 +02:00
DizzyEggg
03b593d3c3 try my luck with record mixing 2018-05-22 21:54:57 +02:00
DizzyEggg
1a8d5132d6 fix record mixing for real 2018-05-20 10:51:09 +02:00
DizzyEggg
e44f35c7b7 fix record mixing merge conflicts 2018-05-19 12:32:44 +02:00
Diegoisawesome
23b050a99e Update naked attribute and ASM_DIRECT to NAKED macro 2018-05-11 17:24:32 -05:00
golem galvanize
13efa1ef62 fixing conflicts 2018-05-10 03:34:36 -04:00
golem galvanize
d31600e70e finish decompiling pokedex 2018-05-10 03:30:42 -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
PikalaxALT
58200616d5
Merge branch 'master' into trader 2018-05-04 17:45:50 -04:00
PikalaxALT
c6115a2fec through sub_8120C0C 2018-05-03 17:03:52 -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
21c3e7e8e5 through SetMauvilleOldMan 2018-05-02 11:31:58 -04:00
PikalaxALT
4acbcf5759 Port trader from Ruby 2018-05-01 15:19:24 -04:00
DizzyEggg
95cf853762 battle records more decomp and subtle name changes 2018-05-01 14:01:54 +02:00
DizzyEggg
25c669e36b decompile item 2018-04-29 13:36:26 +02:00
golem galvanize
069a7e71fc Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex 2018-03-30 16:49:08 -04:00
Diegoisawesome
ebd88b3606 Merge branch 'master' of https://github.com/pret/pokeemerald into intro 2018-02-17 04:03:59 -06:00
Diegoisawesome
0a206ee52c Finish decompiling intro 2018-02-15 22:30:39 -06:00
golem galvanize
6cbea9af6d Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex 2018-02-15 18:20:53 -05:00
golem galvanize
4a71a61e58 start decompiling 2018-02-15 18:20:19 -05:00
DizzyEggg
94b47c0686 decompile overworld 2018-02-14 00:58:22 +01: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
PikalaxALT
590c4b500b Merge branch 'master' into record_mixing 2018-02-11 20:12:40 -05:00
PikalaxALT
ea347199a2 Merge branch 'master' into link 2018-02-11 19:22:06 -05:00
Diegoisawesome
772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
DizzyEggg
96ab6f8353 match secret base func and fix struct 2018-02-07 13:49:33 +01:00
PikalaxALT
d52f52fa73 Merge branch 'master' into link 2018-02-03 09:42:19 -05:00
ProjectRevoTPP
78bd2b0849 move save rodata to source and use saveblock chunk macros 2018-01-31 15:26:57 -05:00
Diegoisawesome
3793152bc3 More work on menu 2018-01-29 17:26:36 -06:00
PikalaxALT
d4e8c20f84 Merge branch 'master' into link 2018-01-21 23:20:13 -05:00
PikalaxALT
d35cf06854 nonmatching sub_801120C 2018-01-21 18:25:23 -05:00
scnorton
89bbecd34b Include <string.h> in global.h 2018-01-21 14:40:19 -05:00
scnorton
c6ff1a6ce3 Merge branch 'master' into link 2018-01-18 12:53:31 -05:00
ProjectRevoTPP
10ddfac7ab consistency 2018-01-06 22:00:08 -05:00
ProjectRevoTPP
7be61cfb1a add assert support to pokeemerald. 2018-01-06 21:12:42 -05:00
camthesaxman
601ec28721 remove explicit memcpy and add HEAP_SIZE constant 2018-01-06 00:35:48 -06:00
DizzyEggg
cb229f56e8 fix pokeblock conflicts 2017-12-18 16:58:14 +01:00
Diegoisawesome
6a674e1e83 Merge remote-tracking branch 'Egg/decompile_mail_data' 2017-12-17 22:51:40 -06:00
DizzyEggg
46fa2557d7 merge mail with master, fix conflicts 2017-12-17 20:22:56 +01:00
PikalaxALT
190a2cba61 Merge branch 'master' into link 2017-12-16 11:27:10 -05:00
DizzyEggg
f4ab21ee67 Merge branch 'master' into decompile_use_pokeblock 2017-12-16 11:42:59 +01: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
caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00
PikalaxALT
0b58905eea sub_800E3A8 2017-12-04 19:10:37 -05:00
DizzyEggg
4faa442d5a decompile and label mail 2017-12-03 19:19:11 +01:00
DizzyEggg
e8ecb01ab2 more work on battle setup 2017-11-29 19:54:15 +01:00
Diegoisawesome
8e9428c482 Add languages to enum 2017-11-29 00:53:18 -06:00
PikalaxALT
cbd2718b5e Merge branch 'master' into link 2017-11-27 20:05:51 -05:00
PikalaxALT
a875d665b8 Merge branch 'master' into easy_chat 2017-11-25 10:56:55 -05: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
Diegoisawesome
5dc8beb034
Merge pull request #112 from DizzyEggg/decompile_recorded_battle
Decompile recorded battle
2017-11-18 13:29:27 -06:00
DizzyEggg
6b075ae0ff wild encounter file is decompiled 2017-11-17 22:28:55 +01:00
DizzyEggg
a2a17bba92 more work on wild encounter 2017-11-17 17:50:07 +01:00
DizzyEggg
b37d8c0821 start decompiling wild encounter 2017-11-16 20:38:10 +01:00
DizzyEggg
a972de7bca start working on daycare 2017-11-14 20:23:25 +01:00
DizzyEggg
209b6eb467 more of recorded battle done 2017-11-13 18:07:23 +01:00
DizzyEggg
c4674735d2 start working on recorded battle 2017-11-12 22:59:36 +01:00
PikalaxALT
d76901ff64 through sub_800A0AC 2017-11-10 08:37:50 -05:00
PikalaxALT
1c3e7f169f sub_80E6E24 2017-11-03 22:26:12 -04:00
PikalaxALT
f8486b31c5 sub_80E6CA0 2017-11-03 21:56:18 -04:00
PikalaxALT
ca2bc94c2b through sub_80E6BF8 2017-11-03 20:59:29 -04:00
PikalaxALT
01d6114da2 easy_chat_input_maybe 2017-11-02 19:26:14 -04:00
PikalaxALT
ed7ded0748 Merge branch 'master' into easy_chat 2017-11-02 18:34:41 -04:00
PikalaxALT
17fd3bccf7 Merge branch 'master' into secret_base 2017-11-01 23:39:54 -04:00
PikalaxALT
975e28c01e Merge branch 'master' into easy_chat 2017-10-28 20:03:24 -04:00
PikalaxALT
84a9441267 MWF: sub_80E9914 2017-10-25 19:54:24 -04:00
PikalaxALT
eb2c2f0a3f through sub_80E8BC8 2017-10-23 19:21:08 -04:00
DizzyEggg
356eb34e32 undo revert 2017-10-23 14:40:22 +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
PikalaxALT
1ef4dbe691 Fix global declarations of libc fns 2017-10-22 20:43:03 -04:00
DizzyEggg
813b1bfd4a label and do more work at player controller 2017-10-22 01:04:02 +02:00
DizzyEggg
cda5c5f925 start working on walda phrase 2017-10-20 18:52:01 +02: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
7552caaadc placeholders for battle strings are done 2017-10-07 19:59:41 +02:00
DizzyEggg
729f4e10ed start decompiling battle2 2017-10-01 01:12:42 +02:00
PikalaxALT
0e75d957d6 Update offset comments in save block 1 2017-09-25 19:57:44 -04:00
DizzyEggg
9ee9a20152 fix merge conflicts 2017-09-21 10:50:15 +02:00
PikalaxALT
7c8cbc6b88 SetLilycoveContestLady 2017-09-20 16:49:22 -04:00
PikalaxALT
d22a9acc63 through sub_818E490 2017-09-20 16:12:18 -04:00
scnorton
8a31e58689 sub_818E298 2017-09-20 11:30:09 -04:00
scnorton
0b81c2920a sub_818E1F4 2017-09-20 10:45:00 -04:00
DizzyEggg
3919b7130b Fix merge conflicts 2017-09-20 13:12:43 +02:00
PikalaxALT
28d0fa33fe SetLilicoveQuizLady 2017-09-19 22:35:40 -04:00
PikalaxALT
73ee165ef6 sub_818DF00 2017-09-19 22:25:31 -04:00
PikalaxALT
316f9f4d83 through sub_818DD14 2017-09-19 21:28:01 -04:00
PikalaxALT
f43de6e582 Merge branch 'master' into lilycove_lady 2017-09-19 21:18:34 -04:00
scnorton
3b3423d1a7 sub_818DC60 2017-09-19 17:07:36 -04:00
scnorton
4e8a2c6934 SetLilycoveFavourLady 2017-09-19 16:55:53 -04:00
scnorton
b26eb6713b sub_818DB20 2017-09-19 16:32:33 -04:00
scnorton
e7e1938094 Start decompilation of lilycove_lady 2017-09-19 16:17:23 -04:00
DizzyEggg
c253bf5e75 add important headers, const ptrs and egg hatch start 2017-09-18 18:36:05 +02:00
PikalaxALT
559833ccf6 Merge branch 'master' into field_map_obj 2017-09-16 15:41:54 -04:00