Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,635 Commits 1 Branch 0 Tags
Commit Graph

50 Commits

Author SHA1 Message Date
Eduardo Quezada
1aa7fea14f Made OW_GFX_COMPRESS into C ifs 2024-01-19 10:58:02 -03:00
Eduardo Quezada
381a0bf8a1 Fixed compile issues 2024-01-18 09:10:20 -03:00
Eduardo Quezada
5d372b5f8a Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	README.md
#	gflib/sprite.c
#	graphics/object_events/pics/pokemon/togetic.png
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info.h
#	src/data/object_events/object_event_graphics_info_followers.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
 2024-01-18 08:12:09 -03:00
Eduardo Quezada
ddc752eb14 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	asm/macros/event.inc
#	data/field_effect_scripts.s
#	data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
#	data/script_cmd_table.inc
#	graphics/pokemon/castform/sunny/anim_front.png
#	graphics/pokemon/castform/sunny/normal.pal
#	include/battle_util.h
#	include/constants/event_object_movement.h
#	include/constants/field_effects.h
#	src/battle_controller_player.c
#	src/battle_util.c
#	src/data/object_events/movement_action_func_tables.h
#	src/data/object_events/object_event_pic_tables.h
#	src/data/trainer_graphics/back_pic_anims.h
#	src/daycare.c
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/load_save.c
#	src/scrcmd.c
#	src/trainer_see.c
 2024-01-17 18:11:35 -03:00
Ariel A
398a9ee8fa Merge branch 'followers' into followers-expanded-id 2023-12-31 01:49:56 -05:00
Ariel A
dcaaac92d9 Added support for compressed OW graphics. 
Added CpuSmartCopy macros (Credit: luckytyphlosion)
 2023-12-31 00:35:27 -05:00
Jaizu
934a1fdd8c Remove old debug function 2023-12-25 16:06:34 -05:00
Martin Griffin
74a6b8764c
overworld_ascending_frames to simplify overworld_frames (#3625) 
Introduces relativeFrames which automates the process of using
overworld_frames with ascending frames.

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-18 13:47:15 +01:00
Bassoonian
3b337672e9 Fix static variable names 2023-12-08 12:46:52 +00:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern (#3412) 
* Fix Wall Werror errors

* fix hgss pokedex modern errors

* tests build on modern

* learnset change

* Update src/battle_ai_util.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/battle_anim_new.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/pokedex_plus_hgss.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* review changes

* unused cmd args

* various args back

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-10-13 18:39:35 +02:00
Ariel A
8df538479a Merge branch 'master' into followers 2023-09-03 17:39:35 -04:00
Ariel A
d929aa60ed Added support for 48x48 and 64x64 followers. See event_objects.h 2023-09-03 16:51:43 -04:00
Martin Griffin
b08b6a37cb Optimize BuildOamBuffer 2023-08-02 12:22:30 +01:00
Eduardo Quezada
bf814e11cd Cleanup 
- Proper whitespace
- Bracket pret style
- Simplified RemoveObjectEventInternal
- SImplified GetMonInfo
- Made IsFollowerVisible easier to read
 2023-06-18 01:19:46 -04:00
Eduardo Quezada
341ce6fd95 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 
# Conflicts:
#	.github/workflows/build.yml
#	README.md
#	gflib/sprite.c
#	graphics/pokemon/banette/anim_front.png
#	graphics/pokemon/banette/normal.pal
#	graphics/pokemon/sentret/normal.pal
#	graphics/pokemon/togetic/anim_front.png
#	graphics/pokemon/togetic/normal.pal
#	include/battle_script_commands.h
#	include/data.h
#	ld_script.txt
#	src/battle_controller_player.c
#	src/bike.c
#	src/event_object_movement.c
 2023-06-16 21:25:16 -04:00
GriffinR
14f7e49099 Add some missing palette macro use 2023-05-25 15:09:16 -04:00
Ariel A
66c57e3442 Merge branch 'master' into followers 2023-01-29 18:44:06 -05:00
GriffinR
0cc10a1ada Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -05:00
Ariel A
1c011a9c1c Merge branch 'master' into followers 2022-10-07 20:52:15 -04:00
Martin Griffin
6fed961ed6 Write palette IDs in hex 2022-08-19 15:29:35 +01:00
Eduardo Quezada
59f89bde9e Misc cleanup 2022-08-18 14:23:45 -04:00
Eduardo Quezada
2e1bf0d965 OamData mosaic FALSE 2022-07-29 21:27:39 -04:00
Eduardo Quezada
01558ff8f3 Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
Ariel A
9beee311c4 Merge branch 'master' into romhack 2022-07-17 15:13:15 -04:00
GriffinR
34438e6bc4 Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
Ariel A
bdcbb5c700 Merge branch 'master' into romhack 2021-12-18 17:14:52 -05:00
GriffinR
afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none 2021-09-24 10:17:34 -04:00
GriffinR
f8f7617946 Add TAG_NONE 2021-09-14 13:14:14 -04: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
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
Ariel Antonitis
dda599e929 Updated README & Improved efficiency of tracking palette unloads. 2021-06-15 19:35:51 -04:00
Ariel Antonitis
9a6f6212b2 Fixed bug where selling items freed sprite palettes too early. 2021-06-15 18:27:58 -04:00
Ariel Antonitis
e4b9bb75e2 Merge branch 'master' into romhack 2021-06-04 23:36:21 -04:00
gAlfonso-bit
a454f9c187
UBFIX: sprite.c (#1442) 
Fix out-of-bounds array access in `SortSprites()`.

Co-authored-by: Marcus Huderle <huderlem@gmail.com>
 2021-05-23 09:10:55 -05:00
Ariel Antonitis
6df5a71b0d Merge branch 'master' into romhack 2021-03-23 18:42:00 -04:00
GriffinR
dfc6ee0e9e Add SAFE_DIV 2021-03-21 13:43:14 -05:00
Ariel Antonitis
d7697e1502 Fixed bug so that field moves do not clear follower palettes. 2021-03-03 02:10:20 -05:00
Ariel Antonitis
b6eed75fd8 Moved pokemon graphics lookup into table. 2021-03-03 01:35:43 -05:00
Ariel Antonitis
66dd1aecf9 Made (most) field effects use dynamic palettes. 2021-03-03 01:21:40 -05:00
Ariel Antonitis
4ba4fa2172 Added follower object to ScrCmd_release. 2021-03-03 01:12:57 -05:00
Ariel Antonitis
12a2ec9f26 Added dynamic reflections. 2021-03-03 01:10:48 -05:00
Ariel Antonitis
db46bf855d Fixed berry tree display. 2021-03-03 01:07:06 -05:00
GriffinR
b04f0aaa2b Use SPRITE_NONE constant 2021-02-24 11:03:32 -05:00
Sierraffinity
a982e6ab88 Make div by zero fix more concice 2021-01-04 16:39:47 -08:00
Sierraffinity
67a656a4df Fix/document possible division by zero in ConvertScaleParam 2021-01-04 16:26:28 -08:00
Sierraffinity
072a98ca9a Document undefined sprite template behavior 2020-04-25 18:25:55 -07:00
GriffinR
2756771958 More usage of ST_OAM constants and SPRITE macros 2019-12-06 19:05:44 -06:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00