Commit Graph

494 Commits

Author SHA1 Message Date
PikalaxALT
8aeb5ea301 uns_builder_assign_animtable1 2017-09-18 21:31:28 -04:00
PikalaxALT
16b0b386be sub_818D180 2017-09-18 21:28:28 -04:00
PikalaxALT
7de2140b86 sub_818D0C4 2017-09-18 21:26:11 -04:00
PikalaxALT
e033c72121 load_pokemon_image_TODO 2017-09-18 20:00:46 -04:00
PikalaxALT
9e96bd540a Battle Dome Cards BEGIN 2017-09-18 19:39:20 -04:00
PikalaxALT
8098a209da Remove warnings 2017-09-18 19:30:55 -04: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
yenatch
9a0438af6a battle_3: tabs 2017-09-18 17:45:11 -04:00
scnorton
d48c4ab7a9 Slight cleanup and relabeling of functions 2017-09-18 15:28:55 -04:00
scnorton
810bfffd12 data decomp 2017-09-18 15:10:25 -04:00
scnorton
0e2d84f24d Remaining functions 2017-09-18 14:07:34 -04:00
scnorton
39e6bdf094 sub_81BF7E8 2017-09-18 14:04:00 -04:00
scnorton
097a38f054 nonmatching sub_81BF7A4 2017-09-18 13:54:39 -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
DizzyEggg
ecd659f46e add side labels 2017-09-18 12:51:16 +02:00
PikalaxALT
abe72dca47 Merge branch 'master' into sub_81700F8 2017-09-17 23:42:43 -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
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
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
fb01dd2e5a More an_walk_any_2_macro memes (again again) 2017-09-17 15:06:45 -04:00
scnorton
a9d3949c91 More an_walk_any_2_macro memes (again) 2017-09-17 15:05:23 -04:00
scnorton
8d34e9c397 More an_walk_any_2_macro memes 2017-09-17 15:03:47 -04:00
scnorton
7bf307e7ae The memes keep coming 2017-09-17 14:59:52 -04:00
scnorton
0689afbd86 Yet more maybe_shadow_1 memes 2017-09-17 14:54:27 -04:00
scnorton
b54689b9a3 Another four functions 2017-09-17 14:12:32 -04:00
scnorton
c9699169ad another block of directional anim functions 2017-09-17 14:06:43 -04:00
scnorton
e544d5f8b8 sub_80958C0 and callers 2017-09-17 14:02:43 -04:00
scnorton
283d9060a7 Some functions relating to affine animations 2017-09-17 13:59:30 -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
scnorton
7af9833883 Additional script object callbacks 2017-09-17 13:06:03 -04:00
scnorton
513e3cd9bc Five small functions 2017-09-17 13:00:43 -04:00
scnorton
92a3f1cb2e More maybe_shadow_1_macro memes 2017-09-17 12:57:42 -04:00
scnorton
b06631f654 Functions for facing towards/away from another object? 2017-09-17 12:25:27 -04:00
scnorton
20152fb0af Yet Another Macro Cluster TM 2017-09-17 12:19:35 -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
384ca4658b yet more an_walk_any_2_macro functions 2017-09-17 10:29:57 -04:00
PikalaxALT
f8b08d3ee7 more an_walk_any_2_macro functions 2017-09-17 10:25:48 -04:00
PikalaxALT
43b3195bc8 More special anims with timers 2017-09-17 10:23:18 -04:00
PikalaxALT
cd958b1e43 special_anim_with_timer 2017-09-17 10:07:43 -04:00
PikalaxALT
3a7f771eab maybe_shadow_1 might be a meme 2017-09-17 10:01:27 -04:00
PikalaxALT
3fdb217ba3 sub_80941E0 2017-09-17 09:55:17 -04:00
PikalaxALT
99e0fe1f24 callers of callers of sub_80940C4 2017-09-17 09:52:17 -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
ed6e95fbd7 Avoid using duplicate macros 2017-09-17 08:30:36 -04:00
PikalaxALT
501baffc48 Yet another chunk of highly similar functions 2017-09-17 08:26:27 -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
7c8991842f do_run_anim 2017-09-16 23:52:50 -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
8e03a0199c an_look_any simple 2017-09-16 23:20:44 -04:00
PikalaxALT
4ef7127561 FieldObjectSetRegularAnim 2017-09-16 23:12:35 -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
0e3dbf3235 GetOppositeDirection 2017-09-16 23:03:04 -04:00
PikalaxALT
9514206969 Another block of functions for getting anim ids given direction 2017-09-16 22:58:17 -04:00
PikalaxALT
08cb777fd7 FieldObjectFaceOppositeDirection 2017-09-16 22:54:15 -04:00
PikalaxALT
d1666473d3 Another block of functions for getting anim IDs from directions 2017-09-16 22:48:19 -04:00
PikalaxALT
eb7e52d2a8 Deswiss the cheese 2017-09-16 22:44:47 -04:00
PikalaxALT
64d3a67b0c FieldObjectMoveDestCoords 2017-09-16 22:27:04 -04:00
PikalaxALT
eb41c57ecd GetFieldObjectMovingCameraOffset 2017-09-16 22:23:48 -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
bd48354207 sub_8092F88 2017-09-16 21:52:55 -04:00
PikalaxALT
76b68e039d MoveCoordsPixel 2017-09-16 21:45:18 -04:00
PikalaxALT
f03c0dc3b4 MoveCoords 2017-09-16 21:39:29 -04:00
PikalaxALT
996d9f4b42 sub_8092E9C 2017-09-16 21:31:37 -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
3e472ccc8b IsCoordOutsideFieldObjectMovementRect 2017-09-16 21:04:52 -04:00
PikalaxALT
7d58ce75ad sub_8092C8C 2017-09-16 18:52:20 -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
edd5c81a8e sub_8092AF8 2017-09-16 18:24:58 -04:00
PikalaxALT
589c34e30a obj_npc_animation_step, npc_apply_anim_looping 2017-09-16 18:18:34 -04:00
PikalaxALT
119c0e96b5 sub_8092A4C 2017-09-16 18:04:26 -04:00
PikalaxALT
fa436fca4d a block of direction-based anim num fns 2017-09-16 17:41:46 -04:00
PikalaxALT
34950dbd13 remaining field object step callbacks 2017-09-16 17:34:41 -04:00
PikalaxALT
15aba9a076 Hidden1 2017-09-16 17:24:26 -04:00
PikalaxALT
6247fe742c Tree and Mountain Disguise FOCB 2017-09-16 16:53:55 -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
c6bb13939e state_to_direction memes 2017-09-16 16:10:55 -04: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
PikalaxALT
c7f28f034c Change type of state_to_direction argument 1 to match pokeruby 2017-09-16 15:16:39 -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
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
a082f92581 sub_8091110 2017-09-16 08:13:37 -04:00
Diegoisawesome
6ba1dc8169 Merge remote-tracking branch 'pret/master' 2017-09-16 03:21:42 -05:00
PikalaxALT
54c8580d34 rom_81700F8 2017-09-15 22:12:45 -04:00
PikalaxALT
3e9e4b13ec MoveFieldObjectInNextDirectionInSequence 2017-09-15 21:39:24 -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
bf101743c2 RandomlyLookEastOrWest 2017-09-15 14:42:54 -04:00
scnorton
7440bba1b1 RandomlyLookNorthOrSouth 2017-09-15 14:36:54 -04:00
scnorton
9f6a4be9f0 BerryTree 2017-09-15 14:26:01 -04:00
PikalaxALT
9a13b1f34e FaceFixedDirection 2017-09-14 21:30:14 -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
c1c12981fe LookRandomDirections helpers 2017-09-13 21:11:59 -04:00
PikalaxALT
2895765964 LookRandomDirections 2017-09-13 20:36:58 -04:00
PikalaxALT
ddf712beac sub_808F8BC 2017-09-13 20:34:25 -04:00
PikalaxALT
c1f5183f40 Three-direction get-running-past-facing callbacks 2017-09-13 20:26:08 -04:00
PikalaxALT
6b906d95b9 Three more running-past-facing-direction callbacks 2017-09-13 20:22:38 -04:00
PikalaxALT
a04666e2d3 Running-past facing direction callbacks (North/East restricted) 2017-09-13 19:54:43 -04:00
PikalaxALT
f9de01dc86 sub_808F638 and sub_808F648 2017-09-13 19:45:59 -04:00
PikalaxALT
64ffa8f963 Merge branch 'master' into field_map_obj 2017-09-13 19:29:19 -04:00
PikalaxALT
c2e31f0618 sub_808F608 2017-09-13 19:21:05 -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
a83d07e1b3 Merge branch 'master' into decomp_berry 2017-09-13 10:03:07 +02:00
scnorton
c8696f1552 npc_paltag_by_palslot 2017-09-12 17:35:08 -04: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
625b1b6949 start berry porting 2017-09-12 18:47:27 +02: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
4d84618732 make vars static in script s 2017-09-12 10:41:30 +02:00
DizzyEggg
e5ff9e3db1 will fix later i guess 2017-09-12 10:39:17 +02:00
Diegoisawesome
a9f09ca051 Begin renaming string.s unknowns 2017-09-12 01:23:34 -05: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
2b9b75a824 sub_808F1B4 2017-09-11 10:40:34 -04:00
scnorton
7c40186e35 FindFieldObjectTemplateInArrayByLocalId 2017-09-11 10:31:09 -04:00
scnorton
5ad282c82c GetFieldObjectTemplateByLocalIdAndMap 2017-09-11 10:29:00 -04:00
scnorton
bd9b81546f through FieldObjectGetBerryTreeId 2017-09-11 10:19:03 -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
scnorton
bcf844f965 sub_808F080 2017-09-10 17:47:37 -04:00
scnorton
8456991837 Functions for retrieving flag and script pointer given map object id 2017-09-10 17:11:03 -04:00
DizzyEggg
a2a66181fb decompile script.s 2017-09-10 23:05:23 +02:00
scnorton
b263dcc7cf FieldObjectSetDirection 2017-09-10 17:04:37 -04:00
scnorton
69a1ff984d obj_unfreeze 2017-09-10 16:57:08 -04:00
scnorton
251360624a CopySprite 2017-09-10 16:53:08 -04:00
scnorton
a89da3ae31 Functions operating on the camera object 2017-09-10 16:36:19 -04:00
scnorton
4dfae8b9e4 FindCameraObject 2017-09-10 16:32:26 -04: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
5a5ea8c740 UpdateFieldObjectsForCameraUpdate 2017-09-10 15:56:03 -04:00
scnorton
d8e2238086 FieldObjectDoesZCoordMatch 2017-09-10 15:54:41 -04:00
scnorton
79b19a36b8 UpdateFieldObjectCoordsForCameraUpdate 2017-09-10 15:35:21 -04:00
scnorton
5bb5886774 npc_coords_shift_still 2017-09-10 15:14:46 -04:00
scnorton
1ed1fbab1c sub_808EBA8 2017-09-10 15:12:48 -04:00
Diegoisawesome
1b220ed2ed Resolve some nonmatchings in bg.c 2017-09-10 01:02:23 -05:00
Diegoisawesome
bdb6c775d9 Remove bg.h 2017-09-09 21:48:33 -05: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
Diegoisawesome
001d1027e3 Finish bg.s, 6 nonmatching 2017-09-09 19:46:19 -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
PikalaxALT
ba6987b733 sub_808EB08 2017-09-08 21:35:46 -04:00
PikalaxALT
019935fb73 npc_coords_set 2017-09-08 21:28:22 -04:00
PikalaxALT
70e982d1fa npc_coords_shift 2017-09-08 21:27:02 -04:00
PikalaxALT
43c3b9fdff unref_sub_808EAC4 2017-09-08 21:25:20 -04:00
DizzyEggg
307278374b start money.s decomp 2017-09-09 00:45:25 +02:00
scnorton
b639ca3b15 sub_808EAB0 2017-09-08 18:12:27 -04:00
scnorton
a17a1bb27a npc_load_two_palettes__and_record 2017-09-08 18:04:23 -04:00
scnorton
dddb44e301 npc_load_two_palettes__no_record 2017-09-08 17:58:41 -04:00
scnorton
5a020a47f3 FindFieldObjectPaletteIndexByTag 2017-09-08 17:34:12 -04:00
scnorton
07b1668623 pal_patch_for_npc_range 2017-09-08 17:21:58 -04:00
scnorton
e6e0dc80f6 pal_patch_for_npc 2017-09-08 17:17:03 -04:00