AlexOn1ine
|
b90fdd1b3c
|
Master to upcoming merge
|
2025-05-26 10:41:11 +02:00 |
|
Hedara
|
950dbe7897
|
Merge commit '16357c7' into pret-merge
Conflicts:
include/battle.h
include/battle_controllers.h
include/battle_script_commands.h
include/contest.h
include/list_menu.h
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_main.c
src/battle_message.c
src/battle_tower.c
src/berry_crush.c
src/contest.c
src/ereader_helpers.c
src/evolution_scene.c
src/hall_of_fame.c
src/mauville_old_man.c
src/mystery_gift_menu.c
src/pokedex.c
src/pokenav_conditions_search_results.c
src/pokenav_menu_handler_gfx.c
src/pokenav_ribbons_list.c
src/rom_header_gf.c
src/union_room.c
src/union_room_battle.c
src/union_room_player_avatar.c
|
2025-05-24 19:22:31 +02:00 |
|
Bassoonian
|
16357c7e29
|
Streamline pointer notation (#2139)
|
2025-05-16 12:04:44 +01:00 |
|
hedara90
|
d1aa49cca3
|
Remove compressed palettes (#6455)
|
2025-04-26 22:58:40 +02:00 |
|
Hedara
|
08a2ad2c98
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 10:01:51 +02:00 |
|
hedara90
|
b08a5fb15a
|
Tests for checking all move animations (#6297)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-13 13:46:48 +01:00 |
|
Eduardo Quezada
|
00241cf569
|
Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2
# Conflicts:
# README.md
# asm/macros/event.inc
# data/scripts/pkmn_center_nurse.inc
# include/constants/event_objects.h
# include/constants/field_weather.h
# include/overworld.h
# include/palette.h
# include/sprite.h
# src/battle_controller_player.c
# src/data/object_events/object_event_graphics.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_weather.c
# src/overworld.c
# src/palette.c
# src/scrcmd.c
# src/sprite.c
|
2025-01-26 12:08:10 -03:00 |
|
Eduardo Quezada
|
26daf15ce0
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-24 18:29:28 -03:00 |
|
DizzyEggg
|
4e0eab9e27
|
Remove gDecompressionBuffer (#6029)
|
2025-01-23 09:47:14 +01:00 |
|
Eduardo Quezada
|
a756bb501c
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-19 22:31:33 -03:00 |
|
Bassoonian
|
db5dc85b70
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan
|
2025-01-18 13:07:05 +01:00 |
|
DizzyEggg
|
0a436d580e
|
Extern gSprites and gOamMatrices with known array size (#2090)
|
2025-01-17 18:18:17 -05:00 |
|
Eduardo Quezada
|
ffc8903f93
|
More review addressing
|
2025-01-17 18:47:38 -03:00 |
|
Eduardo Quezada
|
dbc3cc28b8
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2024-12-21 09:31:23 -03:00 |
|
Eduardo Quezada
|
82252251e7
|
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
|
2024-12-20 16:04:33 -03:00 |
|
Eduardo Quezada
|
5483e05db6
|
Fixed brace style inconsistencies
|
2024-12-05 12:46:50 -03:00 |
|
Eduardo Quezada
|
d151e00c70
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2024-12-04 19:15:48 -03:00 |
|
Eduardo Quezada
|
ee9c6d4912
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2024-10-17 00:16:01 -03:00 |
|
Eduardo Quezada
|
80447bee8e
|
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
|
2024-10-15 20:56:56 -03:00 |
|
luckytyphlosion
|
a55c75d350
|
Get rid of common syms (#2040)
|
2024-10-14 23:52:11 -04:00 |
|
Kurausukun
|
52c2728ff6
|
remove gflib
|
2024-09-18 10:37:34 -04:00 |
|
PikalaxALT
|
306ce048ad
|
Move gflib srcs and headers to gflib subdir
|
2019-09-08 21:07:54 -04:00 |
|
PikalaxALT
|
b839c21307
|
Fix/suppress warnings when building with gcc-8
|
2019-06-26 16:42:57 -04:00 |
|
Phlosioneer
|
9848f84b9e
|
Use constants for Oam .shape and .size fields
Also some general formatting fixes for constants.
|
2019-03-16 12:37:04 -05:00 |
|
DizzyEggg
|
dfee5deca8
|
Move Bitmap struct and clear sprite/text files
|
2018-10-18 21:24:37 +02:00 |
|
Diegoisawesome
|
d9941cd1a8
|
Standardize sprite visibility to boolean
|
2018-09-10 10:25:58 -05:00 |
|
DizzyEggg
|
9e43b01a4c
|
match obj update pos2
|
2018-02-06 17:42:24 +01:00 |
|
DizzyEggg
|
314b96af46
|
static names given s prefix
|
2017-12-17 23:45:27 +01:00 |
|
DizzyEggg
|
ce6e97fa0b
|
sprite data fields to array
|
2017-12-02 21:44:50 +01:00 |
|
DizzyEggg
|
752ce9b90d
|
start working on battle anim
|
2017-10-14 16:55:25 +02:00 |
|
DizzyEggg
|
84240b1a5a
|
sprite.c: move ewram, iwram, rom data
|
2017-09-02 13:11:19 +02:00 |
|
DizzyEggg
|
24a1e3e544
|
decompile more of sprite.s
|
2017-09-02 12:12:09 +02:00 |
|
DizzyEggg
|
c146c247f2
|
decompile more of sprite.s
|
2017-09-02 01:42:44 +02:00 |
|
DizzyEggg
|
26bf61e06f
|
start decompiling sprite.s
|
2017-09-02 00:21:11 +02:00 |
|
DizzyEggg
|
bc5acf7394
|
more splitting, move ewram sprite vars to C
|
2017-09-02 00:09:46 +02:00 |
|
DizzyEggg
|
449d546556
|
split some battle files
|
2017-09-01 23:40:13 +02:00 |
|
DizzyEggg
|
ee7580753b
|
rename sprite labels
|
2017-09-01 19:43:26 +02:00 |
|