8066 Commits

Author SHA1 Message Date
Ariel A
3abf4871fd Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-08-12 23:13:02 -04:00
Ariel A
8a8c27c6c7 Merge branch 'lighting' into lighting-expanded-id 2024-08-12 23:11:27 -04:00
Ariel A.
25e8c88eb1
Merge pull request #40 from AsparagusEduardo/merrp/pr/speciesMacros
Backported OBJ_EVENT_GFX_SPECIES macros from pokeemerald-expansion
2024-08-12 23:10:53 -04:00
Ariel A
29b2a7512f Merge branch 'followers' into lighting 2024-08-12 23:06:45 -04:00
Ariel A
ca755420ed meta: ignored refactoring change 2024-08-12 23:06:30 -04:00
Ariel A
0ae5cb1e39 meta: cleaned up spacing of lighting code 2024-08-12 23:04:41 -04:00
Ariel A
0745eaf2e0 fix: Uninitialized value used in LightenSpritePaletteInFog 2024-08-12 22:42:31 -04:00
Eduardo Quezada
e6e2285c44 Added OBJ_EVENT_GFX_SPECIES_SHINY 2024-08-11 14:50:38 -04:00
Eduardo Quezada
d88834dd58 Backported OBJ_EVENT_GFX_SPECIES macro from Expansion 2024-08-07 13:42:18 -04:00
Ariel A
5293e67995 Merge branch 'followers' into followers-expanded-id 2024-08-07 00:02:16 -04:00
Ariel A.
8d79ea1b19
Merge pull request #39 from Bassoonian/followersstringfixes
Fix two small text errors in follower dialogue
2024-08-07 00:00:01 -04:00
Ariel A.
e0f66c80b8
Merge pull request #38 from PokemonSanFran/followers-owTowerFix
Fixed expanded OW IDs in battle_tower
2024-08-04 22:43:11 -04:00
Bassoonian
4dce7db714 Another text fix 2024-08-04 16:53:46 +01:00
Bassoonian
369efc1208 Fix two small text errors in follower dialogue 2024-08-04 01:15:36 +01:00
pkmnsnfrn
0fb48e8a9a Fixed expanded OW IDs 2024-08-03 17:04:33 -07:00
Ariel A
88cfd9e267 fix: Removed LoadSpriteSheetByTemplate offset's dependence on EWRAM memory layout 2024-07-11 00:01:45 -04:00
Ariel A
e899218dfb fix: MSG_COND_TIME_OF_DAY now checks whether map is outdoors and not raining 2024-06-25 01:38:52 -04:00
Ariel A
d6762d4dbc Merge branch 'lighting' into lighting-expanded-id 2024-06-01 15:22:21 -04:00
Ariel A
d410ca6999 Merge branch 'followers' into lighting 2024-06-01 15:21:57 -04:00
Ariel A
e420f99fc3 Merge branch 'followers' into followers-expanded-id 2024-06-01 15:20:56 -04:00
Ariel A
3727be9511 fix: fixed a few oversights with follower message generation 2024-06-01 14:46:45 -04:00
Ariel A
0630acce44 fix: make LoadSheetGraphicsInfo load, then free, tiles
Fixes follower pokeball gfx showing garbage for 1 frame when emerging
2024-05-27 18:15:02 -04:00
Ariel A
a49d908254 Merge branch 'followers' into followers-expanded-id 2024-05-21 22:23:00 -04:00
Ariel A
c0ca88d45a
Merge pull request #36 from Jaizu/followers-expanded-id
Fix virtual object events
2024-05-21 19:17:25 -07:00
Ariel A
f82b40178e Merge branch 'followers' into lighting 2024-05-21 22:16:01 -04:00
Ariel A
b37d9b3000 fix: disable followers in Union Room
Fixed #17
2024-05-21 22:14:29 -04:00
Ariel A
ed98b0b8ba fix: added shadows on direct corner map
Fixed #18
2024-05-21 22:12:03 -04:00
Ariel A
9b6843442a fix: add mart light sprite to Route102 2024-05-21 22:10:53 -04:00
Jaizu
689f41803d fix uppercase typo 2024-05-21 09:46:27 +02:00
Jaizu
2358ee88e3 Fix virtual object events 2024-05-19 12:41:51 +02:00
Ariel A
73978b7015 Merge branch 'lighting' into lighting-expanded-id 2024-05-17 21:45:50 -04:00
Ariel A
991b104d52 Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-05-17 21:45:44 -04:00
Ariel A
05bf03975a Merge branch 'followers' into lighting 2024-05-17 21:40:20 -04:00
Ariel A
d785fad8cf refactor: code review for expansion 2024-05-17 21:37:18 -04:00
Ariel A
d3849f2fc6 Merge branch 'followers' into followers-expanded-id 2024-05-17 20:46:24 -04:00
Ariel A
6856bcf610 refactor: code review for expansion 2024-05-17 20:45:32 -04:00
Ariel A
f3b637c115 fix: castform OW sprite & palette
fixed #34
2024-05-04 18:47:25 -04:00
Ariel A
e36a7c59cf Merge branch 'followers' into followers-expanded-id 2024-05-03 00:45:04 -04:00
Ariel A
758e4049cd fix: LARGE_OW_SUPPORT and affine OW movements
fixed #33
2024-05-03 00:43:39 -04:00
Ariel A
4948d80030 fix: follower pokemon should disappear when healed by nurse 2024-04-30 23:09:43 -04:00
Ariel A
3d797eaec2 Merge branch 'lighting' into lighting-expanded-id 2024-04-28 20:39:56 -04:00
Ariel A
3c9c48e2a1 Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-04-28 20:39:39 -04:00
Ariel A
ee0d7a467a fix: reverted Wailord OW gfx back to 32x32 2024-04-28 20:37:08 -04:00
Ariel A
7939894b18 fix: object event palettes can be loaded during fadeout 2024-04-28 18:52:33 -04:00
Ariel A
ad0ae99207 Merge branch 'followers' into lighting 2024-04-27 23:30:08 -04:00
Ariel A
42d9b284b9 Merge branch 'followers' into followers-expanded-id 2024-04-27 23:19:38 -04:00
Ariel A
dbc11ad3d2 fix: improved follower pokemon lock and applymovement code
fixed #30, fixed #32
2024-04-27 23:15:49 -04:00
Ariel A
d7a021a914 fix: Made Common_Movement_* 'safe' for followers
fixed #31
2024-04-27 22:47:41 -04:00
Ariel A
e8b5252790 Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-03-06 22:28:44 -05:00
Ariel A
86171be6d3 Merge branch 'lighting' into lighting-expanded-id 2024-03-06 22:28:35 -05:00