Commit Graph

244 Commits

Author SHA1 Message Date
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
DizzyEggg
b4875d82d5 more battle 4 2017-09-20 00:28:00 +02: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
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
39e6bdf094 sub_81BF7E8 2017-09-18 14:04:00 -04:00
DizzyEggg
c253bf5e75 add important headers, const ptrs and egg hatch start 2017-09-18 18:36:05 +02:00
scnorton
c5dddf41f5 sub_81BF5A4 2017-09-18 11:26:45 -04:00
PikalaxALT
8604291b0f Start decomp 2017-09-18 09:23:06 -04:00
PikalaxALT
16f2e40576 Fix naming conflicts 2017-09-17 23:42:44 -04:00
PikalaxALT
380858293e Merge branch 'master' into sub_81700F8 2017-09-17 22:58:57 -04:00
scnorton
130ba76533 remove data3.h 2017-09-17 17:50:07 -04:00
scnorton
70b1ad4857 Remaining functions 2017-09-17 15:33:26 -04:00
scnorton
b54689b9a3 Another four functions 2017-09-17 14:12:32 -04:00
scnorton
71b40f50c0 Merge branch 'master' into field_map_obj 2017-09-17 13:38:33 -04:00
scnorton
4b04e92e8b Ten more functions (remaining function count is 99) 2017-09-17 13:26:17 -04:00
PikalaxALT
3356a4fb92 Failed attempt to fix InitFieldObjectStateFromTemplate, but at least we fixed the weirdness with the double MapObject structs 2017-09-17 11:39:49 -04:00
DizzyEggg
75595f9b3d decompile battle 3 2017-09-17 17:14:32 +02:00
PikalaxALT
9b4c61658a npc_set_direction_and_anim__an_proceed 2017-09-17 10:58:24 -04:00
PikalaxALT
9dc7839dd8 callers of sub_80940C4 2017-09-17 09:49:50 -04:00
DizzyEggg
c7592bc87c finish porting cam's port 2017-09-17 15:19:15 +02:00
PikalaxALT
8ee004b9b1 sub_80940C4 which may or may not be a meme 2017-09-17 08:45:24 -04:00
PikalaxALT
bf9a00250b maybe_shadow_1 which may or may not be a shadow 2017-09-17 08:38:00 -04:00
PikalaxALT
6439551e1a Another chunk of functions, including some expanded from macros 2017-09-17 08:20:42 -04:00
DizzyEggg
a9a66b06ef start porting cam's port of battle3 2017-09-17 14:10:32 +02:00
PikalaxALT
0582b5cb90 npc_obj_ministep_stop_on_arrival 2017-09-17 08:05:33 -04:00
PikalaxALT
529ccf9a96 do_go_anim 2017-09-16 23:49:31 -04:00
PikalaxALT
432924e56d npc_apply_direction 2017-09-16 23:31:43 -04:00
PikalaxALT
4e22f1e55f MapObjectExec***Anim 2017-09-16 23:11:09 -04:00
PikalaxALT
5f189fa53b state_to_direction memes 2017-09-16 23:05:53 -04:00
PikalaxALT
eb7e52d2a8 Deswiss the cheese 2017-09-16 22:44:47 -04:00
PikalaxALT
812ad017e8 sub_80930E0 2017-09-16 22:19:23 -04:00
PikalaxALT
44e590add0 sub_8093038 2017-09-16 22:15:54 -04:00
PikalaxALT
3f2c6556cb sub_8092FF0 2017-09-16 21:59:14 -04:00
PikalaxALT
f03c0dc3b4 MoveCoords 2017-09-16 21:39:29 -04:00
PikalaxALT
951acc8c31 CheckForCollisionBetweenFieldObjects 2017-09-16 21:29:04 -04:00
PikalaxALT
c982993860 IsMetatileDirectionallyImpassable 2017-09-16 21:08:44 -04:00
PikalaxALT
fedbcd7bb7 npc_block_way 2017-09-16 18:42:35 -04:00
PikalaxALT
5812bc4ebe npc_block_way__next_tile 2017-09-16 18:33:38 -04:00
PikalaxALT
ca88036ebe npc_set_running_behaviour_etc 2017-09-16 18:29:14 -04:00
PikalaxALT
34950dbd13 remaining field object step callbacks 2017-09-16 17:34:41 -04:00
Diegoisawesome
5e12833b13 Finish merge 2017-09-16 15:50:08 -05:00
PikalaxALT
12885ca371 CopyPlayer2 2017-09-16 16:40:00 -04:00
PikalaxALT
559833ccf6 Merge branch 'master' into field_map_obj 2017-09-16 15:41:54 -04:00
Cameron Hall
19d2d73c70 Merge pull request #28 from DizzyEggg/decomp_pokemon
decompile pokemon1/2/3
2017-09-16 14:14:50 -05:00
PikalaxALT
052c9f0234 Fix header guards 2017-09-16 15:13:26 -04:00
PikalaxALT
18e06b480b Fix header guards 2017-09-16 15:13:06 -04:00
PikalaxALT
66fbc9753f sub_8091F94 2017-09-16 13:54:33 -04:00
PikalaxALT
ee3dc1edda Some more functions, including some swiss-cheesing that got out of hand 2017-09-16 09:43:49 -04:00
PikalaxALT
86df6d1073 Field object path movement 2017-09-16 08:44:43 -04:00
PikalaxALT
54c8580d34 rom_81700F8 2017-09-15 22:12:45 -04:00
PikalaxALT
79e8235701 AlternatelyGoInOppositeDirections 2017-09-15 21:26:56 -04:00
scnorton
1c6177f678 Rotatoes 2017-09-15 16:34:03 -04:00
scnorton
2e1ecdb877 Tridirectional spinners 2017-09-15 16:08:01 -04:00
scnorton
f6840ba7e7 RandomlyLookSouthOrEast 2017-09-15 16:00:39 -04:00
scnorton
b269048369 RandomlyLookSouthOrWest 2017-09-15 15:57:38 -04:00
scnorton
8c6367f997 RandomlyLookNorthOrEast 2017-09-15 15:53:07 -04:00
scnorton
0571056955 RandomlyLookNorthOrWest 2017-09-15 15:26:51 -04:00
scnorton
9f6a4be9f0 BerryTree 2017-09-15 14:26:01 -04:00
PikalaxALT
68c62595f5 RandomlyGoEastOrWest 2017-09-14 21:25:30 -04:00
PikalaxALT
4a1383d77b RandomlyGoNorthOrSouth 2017-09-14 21:22:14 -04:00
PikalaxALT
0ae3347e47 Rename some functions 2017-09-14 08:38:21 -04:00
PikalaxALT
64ffa8f963 Merge branch 'master' into field_map_obj 2017-09-13 19:29:19 -04:00
PikalaxALT
d72231379b FieldObjectIsTrainerAndCloseToPlayer 2017-09-13 19:13:44 -04:00
DizzyEggg
b1e90c1d50 review berry cleanings 2017-09-13 19:30:05 +02: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
PikalaxALT
e26501f130 Support functions for GoRandomDirections 2017-09-13 10:59:25 -04:00
scnorton
28b272bf52 NoMovement1, GoRandomDirections 2017-09-13 09:41:11 -04:00
DizzyEggg
4c16bb5ee6 decompile util.s 2017-09-13 12:58:57 +02:00
DizzyEggg
a08cd8e5a7 define number of map objects 2017-09-13 12:17:48 +02:00
DizzyEggg
5f4c5e280c berry.s decompiled 2017-09-13 11:16:26 +02:00
DizzyEggg
c9603c40d8 Merge branch 'master' into decomp_pokemon 2017-09-12 23:02:08 +02:00
PikalaxALT
9286c93c8a npc_paltag_set_load 2017-09-12 16:49:04 -04:00
PikalaxALT
c6ef344262 sub_808F254 2017-09-12 16:17:52 -04:00
DizzyEggg
8731a8caa5 one more function in pokemon1 2017-09-12 15:36:04 +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
DizzyEggg
4242ede445 almost there, troubles 2017-09-12 00:01:12 +02:00
DizzyEggg
738e776630 more pokemon2 decomp 2017-09-11 22:28:36 +02:00
DizzyEggg
e69606b5cb praise cam the CHAMP man 2017-09-11 19:42:37 +02:00
DizzyEggg
8e88f2790a pokemon2 get mon data troubles 2017-09-11 18:27:54 +02:00
scnorton
9306122359 through sub_808F23C 2017-09-11 10:46:26 -04:00
scnorton
5ad282c82c GetFieldObjectTemplateByLocalIdAndMap 2017-09-11 10:29:00 -04: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
DizzyEggg
a2a66181fb decompile script.s 2017-09-10 23:05:23 +02:00
scnorton
c7b1a8c3da ObjectCB_CameraObject 2017-09-10 16:13:19 -04:00
scnorton
9e0a171098 AddCameraObject 2017-09-10 16:02:20 -04:00
scnorton
79b19a36b8 UpdateFieldObjectCoordsForCameraUpdate 2017-09-10 15:35:21 -04:00