mudskipper13
|
0d09e5cce8
|
battle_interface: overhaul ability pop up (#7227)
|
2025-07-10 19:09:52 +02:00 |
|
AlexOn1ine
|
b90fdd1b3c
|
Master to upcoming merge
|
2025-05-26 10:41:11 +02:00 |
|
Hedara
|
2b92ba315a
|
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
Conflicts:
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_interface.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/easy_chat.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/field_player_avatar.h
include/intro.h
include/item_use.h
include/metatile_behavior.h
include/move_relearner.h
include/pokedex.h
include/pokemon.h
include/pokemon_icon.h
include/roamer.h
include/script_pokemon_util.h
include/sprite.h
include/text.h
include/wild_encounter.h
src/battle_controllers.c
|
2025-05-24 20:38:21 +02:00 |
|
Bassoonian
|
59d315734d
|
Update header files to match source files (#2143)
|
2025-05-19 09:18:04 +01:00 |
|
Bassoonian
|
2394195123
|
Remove non-existent functions from header files (#6825)
|
2025-05-13 10:52:45 +02:00 |
|
hedara90
|
d1aa49cca3
|
Remove compressed palettes (#6455)
|
2025-04-26 22:58:40 +02: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
|
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 |
|
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 |
|
DizzyEggg
|
e634e722cc
|
Decompile pokemon jump
|
2019-07-29 12:35:57 +02:00 |
|
garak
|
22a0b58e57
|
effects_2 and water data
|
2018-10-24 15:52:21 -04:00 |
|
Diegoisawesome
|
8e7202ec3d
|
Fix LZ compressed data alignment
|
2018-10-21 12:05:34 -05:00 |
|
DizzyEggg
|
dfee5deca8
|
Move Bitmap struct and clear sprite/text files
|
2018-10-18 21:24:37 +02:00 |
|
DizzyEggg
|
0547e260a4
|
More of slot machine
|
2018-09-15 18:01:20 +02:00 |
|
Diegoisawesome
|
e1834c9d7b
|
Change overworld_frame macro to use tiles
|
2018-09-08 03:07:44 -05:00 |
|
Slawter666
|
54d5a7ad97
|
Format event object pic tables
|
2018-09-07 14:14:52 +01:00 |
|
Diegoisawesome
|
731d6d59bc
|
Document list_menu.c and main_menu.c
|
2018-07-15 04:30:37 -07:00 |
|
DizzyEggg
|
1ead30ad40
|
decompile menu indicators
|
2018-05-19 10:54:02 +02:00 |
|
DizzyEggg
|
ad73f92061
|
start decompiling pokemon animation
|
2018-01-22 21:32:50 +01:00 |
|
DizzyEggg
|
9c45ca0c5f
|
dump pokemon icon
|
2017-12-22 19:16:15 +01:00 |
|
DizzyEggg
|
c27f7a8131
|
start working on pokeball
|
2017-12-02 19:39:07 +01:00 |
|
DizzyEggg
|
752ce9b90d
|
start working on battle anim
|
2017-10-14 16:55:25 +02:00 |
|
DizzyEggg
|
db58d5e24a
|
battle2 3500 C lines
|
2017-10-02 23:32:39 +02:00 |
|
scnorton
|
70b1ad4857
|
Remaining functions
|
2017-09-17 15:33:26 -04:00 |
|
DizzyEggg
|
4c16bb5ee6
|
decompile util.s
|
2017-09-13 12:58:57 +02:00 |
|
DizzyEggg
|
84240b1a5a
|
sprite.c: move ewram, iwram, rom data
|
2017-09-02 13:11:19 +02:00 |
|
DizzyEggg
|
c146c247f2
|
decompile more of sprite.s
|
2017-09-02 01:42:44 +02:00 |
|
DizzyEggg
|
0989222de3
|
revert fuck-up
|
2017-09-01 22:08:40 +02:00 |
|