Commit Graph
46 Commits
Author SHA1 Message Date
Eduardo Quezada 41752b2b2a Mon pic coordinates to macros 2023-01-03 12:14:38 -03:00
Eduardo Quezada 7dcac240d4 Review changes 2022-09-04 21:23:24 -03:00
Eduardo Quezada b6bc114ef1 Review suggestions 2022-09-04 20:56:14 -03:00
Eduardo Quezada 81ef26732d Removed UNUSED attribute 2022-09-04 18:06:58 -03:00
Eduardo Quezada 9241dc6fe7 Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4
# Conflicts:
#	include/battle.h
#	include/cable_club.h
#	src/battle_anim_fire.c
#	src/battle_anim_ghost.c
#	src/battle_anim_ground.c
#	src/battle_message.c
#	src/cable_club.c
2022-09-04 17:44:13 -03:00
Eduardo Quezada 616ab63d94 More sync with battle controllers 2022-08-20 16:13:03 -04:00
Eduardo Quezada 2f03c4a62c src/battle_controller_link_opponent.c 2022-08-18 14:17:56 -04:00
Eduardo Quezada 9020751fc4 triedShinyMonAnim 2022-08-18 14:17:35 -04:00
Eduardo Quezada 9205e7ad67 Uses of DISPLAY_WIDTH 2022-08-18 14:02:08 -04:00
Eduardo Quezada 27e81b2fc7 UnusedControllerStruct 2022-08-18 12:59:38 -04:00
Eduardo Quezada 26e8d57ba1 Special Trainer IDs 2022-08-18 12:58:27 -04:00
Eduardo Quezada e37c78c73f Usage of ST_OAM_AFFINE constants 2022-08-18 12:10:09 -04:00
Eduardo Quezada 5f81a9834f GetBattlerSpriteCoord and GetBattlerSpriteCoord2 using BATTLER_COORD_* constants 2022-08-18 12:00:13 -04:00
Eduardo Quezada 57374b796b Sync src/battle_controllers.c 2022-08-18 11:32:26 -04:00
Eduardo Quezada 5135d64501 Review changes 2022-08-15 20:42:34 -04:00
Eduardo Quezada 2cda0b61ce Reverted ++ operators not related to battle_util.c, battle_util2.c, or battle_main.c 2022-08-08 16:05:16 -04:00
Eduardo Quezada ac973aa38d Sync src/battle_util.c with pokeemerald 2022-08-07 22:37:10 -04:00
Eduardo Quezada b1bc05ec05 Review changes 2022-08-01 15:37:00 -04:00
Eduardo Quezada 95b16a2391 Review changes from https://github.com/pret/pokeemerald/pull/1721 2022-08-01 15:18:37 -04:00
Eduardo Quezada 19a521fe33 Almost complete battle_scripts_1.s sync 2022-08-01 01:05:18 -04:00
Eduardo Quezada 36a5761d36 PSS sync 2022-07-31 22:39:59 -04:00
Eduardo Quezada 9d9c2a9667 Combining pss 8 and 9 2022-07-31 22:02:44 -04:00
Eduardo Quezada 2d2d17dde3 Sync pokemon_storage_system_8.c 2022-07-31 21:41:39 -04:00
Eduardo Quezada 95dd979f09 Font constants and slight PSS sync 2022-07-31 21:00:27 -04:00
Eduardo Quezada bcfebc7de4 Review changes 2022-07-30 13:11:02 -04:00
Eduardo Quezada 60ce72fa5a Synced src/mon_markings.c and partly synced PSS 2022-07-30 12:29:20 -04:00
Eduardo Quezada 4a60396428 Colors 2022-07-29 22:49:52 -04:00
Eduardo Quezada dcb9d9de1e Synced src/pokeball.c 2022-07-29 21:39:25 -04:00
Eduardo Quezada c40791fd4e SPRITE_INVALID_TAG -> TAG_NONE 2022-07-29 18:37:43 -04:00
Eduardo Quezada dfe6c6885c Synced sound.c 2022-07-29 18:15:25 -04:00
Eduardo Quezada 78e3780fa4 And this one 2022-07-29 17:09:04 -04:00
Eduardo Quezada 65baf962c5 Forgot to include this fix 2022-07-29 17:07:26 -04:00
Eduardo Quezada e0010b9205 Reverted FONT_SMALL 2022-07-29 17:04:04 -04:00
Eduardo Quezada c97e88b437 Review changes 2022-07-29 16:57:13 -04:00
Eduardo Quezada 4c9e831a05 Standarized use of star in void and struct pointers 2022-07-29 11:20:00 -04:00
Eduardo Quezada 4998b976e1 Standarized use of star in pointer types 2022-07-29 10:35:48 -04:00
Eduardo Quezada 94fc3ca044 Fixed check 2022-07-29 10:30:12 -04:00
Eduardo Quezada 53fc50229f Review changes from pokeemerald #1719 2022-07-29 10:21:59 -04:00
Eduardo Quezada 7f53f533bb Synced src/battle_script_commands.c 2022-07-29 09:42:03 -04:00
Eduardo Quezada 0709da5867 Multiple changes 2 2022-07-28 01:20:05 -04:00
Eduardo Quezada f5e9cc595b Multiple changes
- BATTLESTRINGS_ID_ADDER ->BATTLESTRINGS_TABLE_START
- Defines for battle windows
- MAIL_NONE
- MON_DATA_FILLER -> MON_DATA_UNUSED_RIBBONS
- Usage of BattlePutTextOnWindow with masks
- PlayCry1 -> PlayCry_Normal
- BlendPalettes(0xFFFFFFFF -> BlendPalettes(PALETTES_ALL
- FillPalette(0 -> FillPalette(RGB_BLACK
2022-07-27 18:14:48 -04:00
Eduardo Quezada a81c1539e5 SpriteCallbackDummy2 -> SpriteCallbackDummy_2 2022-07-27 14:45:55 -04:00
Eduardo Quezada 36791b994b speciesToEvolve -> postEvoSpecies 2022-07-27 14:44:41 -04:00
Eduardo Quezada 611112269e StringCopy10 to StringCopy_Nickname 2022-07-27 14:35:19 -04:00
Eduardo Quezada f998a7b661 tData7 and tData8 2022-07-27 14:23:03 -04:00
Eduardo Quezada 3b98289de2 BeginNormalPaletteFade PALETTES_ALL documentation 2022-07-27 13:16:28 -04:00