Commit graph

119 commits

Author SHA1 Message Date
sphericalice
7b5267c799 Rename TILESET_WIDTH to METATILE_ROW_WIDTH 2021-10-25 20:51:04 +01:00
sphericalice
5bce17cbce
Fix typo in the TILESET_WIDTH comment 2021-10-25 18:11:06 +01:00
sphericalice
120e75d275 Document the CloseBattlePikeCurtain special 2021-10-25 18:03:14 +01:00
Ariel Antonitis
8a3b04e837 Merge branch 'master' into romhack 2021-09-02 01:03:13 -04:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
ghoulslash
5b47bfacf2 Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs 2021-08-18 20:22:26 -06:00
ExpoSeed
b6b0062bd6 Change map header flags to use a bitfield 2021-06-13 17:02:06 -05:00
Ariel Antonitis
37f0684d98 Unown followers now appear as the right letter. 2021-06-04 23:35:10 -04:00
ghoulslash
cedd2967d8 merge w pret 2021-05-20 11:28:26 -06:00
Ariel Antonitis
221569a710 Merge branch 'master' into romhack 2021-04-18 22:17:53 -04:00
GriffinR
86a9d94ce1 Document fieldmap 2021-04-06 16:05:43 -04:00
Evan
d3d29d7cb5 cherry pick 0cccbfd0ba608287d5f2b642ea613d9674cd919d 2021-04-01 20:12:43 -06:00
Evan
e4674ccd03 fully working walk/run/mach bike/acro bike regular movement 2021-04-01 20:10:30 -06:00
Evan
31e9f97d52 cherry pick 4eb7fcc261934c0f9f10985761cd3e7b7abf0dab 2021-04-01 20:10:21 -06:00
Ariel Antonitis
7bcd2c8fb5 Fixed bird fly sprite shadow position.
Object event shadows are now displayed by default.
2021-03-10 17:49:18 -05:00
Ariel Antonitis
8dd1811ce5 Updated follower messages.
Added remote build scripts/workflows.
Fixed followers getting stuck when entering doors.
2021-03-03 02:07:08 -05:00
Ariel Antonitis
edbc773120 Refactored and added support for shiny followers. 2021-03-03 01:47:26 -05:00
Ariel Antonitis
38f538b755 Moved follower species into a proper union. 2021-03-03 01:47:14 -05:00
Ariel Antonitis
69ae5b18c0 Made pokemon event objects dynamic. 2021-03-03 01:12:05 -05:00
Evan
c568c3d5f7 Merge branch 'master' of https://github.com/pret/pokeemerald into stair_warps 2021-01-13 13:58:09 -07:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
GriffinR
bf65c1fb25 Name object event pals/tags 2020-11-23 14:24:48 -05:00
Evan
b17e6c9cf0 Merge branch 'master' of https://github.com/pret/pokeemerald into stair_warps 2020-09-23 13:41:29 -06:00
Kaz
1404cf3330 field_player_avatar.c: Fix TryInterruptObjectEventSpecialAnim fakematch. 2020-09-17 18:24:11 -04:00
Evan
8857579519 add stair warps 2020-07-20 12:20:25 -06:00
GriffinR
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
GriffinR
5bb688df3e Label in_connection's field in ObjectEventTemplate 2020-05-14 17:11:18 -04:00
GriffinR
b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
GriffinR
487080b425 Minor player avatar doc 2020-04-01 02:54:26 -04:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR
8da7a94423
Merge branch 'master' into fix-eventobj 2019-12-10 17:41:08 -05:00
jiangzhengwenjz
f34b8f564a InitEventObjectStateFromTemplate 2019-12-11 05:35:40 +08:00
GriffinR
82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR
ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
Marcus Huderle
4494b5d4cb Document collision types 2019-10-06 15:48:26 -05:00
Marcus Huderle
799edaf3e6 Document hide/show reflection movement actions 2019-10-06 14:17:34 -05:00
GriffinR
a46f7952f9 Use DIR constants for createvobject
Also uses event object ids in LinkContestRoom1
2019-08-21 17:11:06 -05:00
garak
f1f420954b add METATILE_ID macro 2019-06-16 10:08:07 -05:00
PikalaxALT
1fe5208560 through sub_801A02C 2019-04-01 12:05:58 -04:00
Phlosioneer
da0687987d Pick better names for constants 2019-02-28 22:21:16 -06:00
Phlosioneer
189d387f01 Add macros for metatile manipulation 2019-02-28 22:21:16 -06:00
Deokishisu
447fec26dc
Consolidate unused escapeRope MapHeader field into filler_18 field 2018-12-30 19:59:57 -05:00
nullableVoidPtr
f24584cd31 Tabs -> spaces & align in include/ 2018-12-07 21:01:59 +08:00
nullableVoidPtr
556bdd52e1 Clean up aligned variables in src/ 2018-11-27 19:37:29 +08:00
Slawter666
3d8874d919 Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-10-21 00:20:09 +01:00
Diegoisawesome
dd3689fdbf Finish porting/decompiling field_player_avatar 2018-10-19 00:05:54 -05:00
Slawter666
b7b1d609d0 More synchronisation 2018-10-17 13:52:26 +01: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
Marcus Huderle
546819bc72 Use map type constants in map headers 2018-07-12 22:39:38 -05:00
Marcus Huderle
ed8b006e67 Rename map-layout-related things 2018-06-20 19:54:21 -05:00
Marcus Huderle
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Marcus Huderle
89edf6d9e9 Move all field object data into src/data and event_object_movement.c 2018-06-11 17:33:50 -05:00
Marcus Huderle
eb8dbff4a7 Move event_object_movement_helpers into event_object_movement 2018-06-11 10:56:14 -05:00
Marcus Huderle
4018acfae1 Update event object struct members 2018-06-11 09:19:17 -05:00
DizzyEggg
824699f505 overworld review changes2 2018-02-15 23:09:52 +01:00
DizzyEggg
94b47c0686 decompile overworld 2018-02-14 00:58:22 +01:00
DizzyEggg
8cd4908fa3 merge bike with master, fix conflicts 2017-12-24 00:08:55 +01:00
DizzyEggg
6b5157b2a3 decompile bike.s 2017-12-21 17:46:03 +01:00
DizzyEggg
504363f2a6 Merge branch 'master' into decompile_trainer_see 2017-12-20 17:21:46 +01:00
DizzyEggg
5744356989 decompile trainer see 2017-12-18 23:26:44 +01:00
DizzyEggg
eb8055eb07 battle 1 is decompiled 2017-12-17 20:10:57 +01: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
PikalaxALT
ca88036ebe npc_set_running_behaviour_etc 2017-09-16 18:29:14 -04:00
scnorton
9306122359 through sub_808F23C 2017-09-11 10:46:26 -04:00
scnorton
79b19a36b8 UpdateFieldObjectCoordsForCameraUpdate 2017-09-10 15:35:21 -04:00
scnorton
9498dfa71c InitFieldObjectStateFromTemplate (nonmatching, same as ruby) 2017-09-06 14:25:17 -04:00
scnorton
1087d1c822 GetFieldObjectIdByLocalIdAndMapInternal; rename gUnknown_02037350 to gMapObjects 2017-09-06 10:48:51 -04:00
DizzyEggg
a4cc67008e begin event data 2017-09-02 21:43:53 +02:00