Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,990 Commits 2 Branches 0 Tags 183 MiB
Commit Graph

65 Commits

Author SHA1 Message Date
mid-kid 1d9a68dbdd Remove all address comments 2018-06-24 16:13:22 +02:00
Rangi 32ed487a47 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
 2018-02-03 19:42:56 -05:00
Rangi 2a53d75807 Similar formatting for similar WRAM areas 2018-02-02 21:15:15 -05:00
luckytyphlosion a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
Rangi 4d8528f903 More engine flag constants 2018-01-22 14:34:55 -05:00
Remy Oukaour b071dd364f Japanese characters in Japanese text (e.g. "ォ" not "," for $f4) 2018-01-19 21:49:16 -05:00
Remy Oukaour e69544b61f More Unicode 2018-01-19 02:30:19 -05:00
Remy Oukaour 55d8de6c24 why "5A"? 2018-01-19 00:07:13 -05:00
Remy Oukaour 105ef872dd Better TX_SOUND_* names 2018-01-18 22:06:51 -05:00
Remy Oukaour a9f8aeb94e Remove trailing whitespace 2018-01-18 21:48:52 -05:00
Remy Oukaour a3beba1e64 Use Japanese charmap definitions in strings 2018-01-18 20:49:17 -05:00
Remy Oukaour 2acaa96cf1 More charmap and home/text.asm documentation for JP chars 2018-01-18 18:34:20 -05:00
Remy Oukaour 6d20cf3e80 "CryHeader" → "Cry"; "Cry" → "MonCry" 2018-01-16 23:47:45 -05:00
Remy Oukaour 5c28d05bb4 Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 
# Conflicts:
#	data/items/descriptions.asm
#	data/sprite_anims/framesets.asm
#	engine/crystal_colors.asm
#	engine/events/kurt.asm
#	engine/events/special.asm
#	engine/events/std_scripts.asm
#	engine/events_3.asm
#	engine/item_effects.asm
#	engine/namingscreen.asm
#	engine/scripting.asm
#	engine/stats_screen.asm
#	engine/trade_animation.asm
#	home/audio.asm
#	main.asm
#	maps/BattleTower1F.asm
#	maps/BattleTowerBattleRoom.asm
#	maps/BurnedTowerB1F.asm
#	maps/ElmsLab.asm
#	maps/GoldenrodDeptStore5F.asm
#	maps/GoldenrodUnderground.asm
#	maps/HallOfFame.asm
#	maps/MahoganyTown.asm
#	maps/ManiasHouse.asm
#	maps/MobileBattleRoom.asm
#	maps/MobileTradeRoomMobile.asm
#	maps/RadioTower2F.asm
#	maps/Route35NationalParkGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/Route39Farmhouse.asm
#	tilesets/palette_maps.asm
 2018-01-14 22:56:36 -05:00
Remy Oukaour d91e42ca5e Group some mutually edited files in data/sprites/ 2018-01-10 18:10:01 -05:00
xCrystal 9a3088e50c Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
yenatch 92fba8821c
Merge pull request #450 from roukaour/master 
Constants for TextBoxFlags
 2017-12-30 21:32:45 -05:00
Remy Oukaour e1a672e427 Constants for TextBoxFlags 2017-12-29 13:18:17 -05:00
xCrystal 3c6c80f1b2 LY_BLANK and rLCDC constants 2017-12-29 18:53:21 +01:00
xCrystal 50fc9c3389 endm -> ENDM 2017-12-28 22:31:16 +01:00
xCrystal 7beb497d3a Uppercase MACRO and EQU(S) according to the style guide 2017-12-28 13:23:44 +01:00
xCrystal 9457679af8 Prefix engine_flags wram addresses with w 2017-12-28 13:15:46 +01:00
Remy Oukaour c4a18b1329 Correct documentation 
Split out text_constants.asm
 2017-12-26 22:36:01 -05:00
Remy Oukaour c66d195089 callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
Remy Oukaour fecc5c339a More comments for macros 2017-12-15 00:38:52 -05:00
Remy Oukaour e48a401290 Reorganize macros 2017-12-14 00:36:24 -05:00
Remy Oukaour 5b13a7a13b Identify more sprite-related constants 
Start more documentation
 2017-12-12 13:22:19 -05:00
Remy Oukaour 6a41d4f63e Define more charmap characters and use them in place of hard-coded numbers 2017-12-09 12:57:23 -05:00
Ben10do e6ea1889fb
Replace ‘jp [hl]’ with ‘jp hl’ 
The former is arguably misleading (as you don’t access the memory location in hl to retrieve the jump location), and is consequently deprecated in newer versions of rgbds.

This fix silences these deprecation warnings.
 2017-06-09 22:01:10 +01:00
pikalaxalt ae36ef2c7f Labeled every function in ROM0 that's referenced in the source 2016-05-10 12:31:49 -04:00
pikalaxalt e95d42e0af All functions in main.asm have non-generic names 2016-05-08 14:11:24 -04:00
pikalaxalt 3713b71d9e More splitting of main.asm; remove unneeded rept 2 2016-05-04 11:46:23 -04:00
pikalaxalt bf73772a56 Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style 2016-04-10 14:42:14 -04:00
yenatch 2270052319 Make diacritic labels less confusing in PlaceString. 2016-03-04 13:21:14 -05:00
yenatch 016c2baae2 Use the dakuten characters. 2016-03-03 00:07:17 -05:00
PikalaxALT 8bf255b9f8 Prepare to merge 2016-01-18 00:39:01 -05:00
PikalaxALT 0eb0c40ba7 buttonsound 2015-11-29 22:29:45 -05:00
PikalaxALT 8612a4a531 Renaming sections, further dissolving main.asm 2015-11-28 15:13:40 -05:00
PikalaxALT 01792e00d2 Rename several script commands 2015-11-25 10:16:29 -05:00
PikalaxALT d972564175 link and seer labels 2015-11-23 16:04:53 -05:00
PikalaxALT 91f7491017 items/item_effects.asm; engine/evolution.asm 2015-11-18 18:35:44 -05:00
PikalaxALT fda1f7c01a SPRITEMOVEDATA 2015-10-31 21:05:02 -04:00
PikalaxALT 8153737bae Enumerate text constants 2015-10-30 10:34:35 -04:00
PikalaxALT 0a244e043c Move battle start animation functions to its own file 2015-10-19 10:23:58 -04:00
PikalaxALT 4fa6c6daa4 Split up bank 2; other relabelings 2015-10-16 13:35:43 -04:00
PikalaxALT 88bc86b0bb Replace Functionfb8 with FillBoxWithByte 2015-10-13 12:46:40 -04:00
PikalaxALT 327faac497 Magikarp functions moved to event/magikarp.asm 2015-10-11 12:26:39 -04:00
PikalaxALT b68913a782 More radio labels 2015-10-09 23:09:03 -04:00
PikalaxALT 2770cfc354 soft reset 2015-10-04 14:14:51 -04:00
PikalaxALT c8960dd2c8 Various annotations 
Annotated the SGB functions in predef/sgb.asm, and some of the map scripts.  Renamed several functions in home.  Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
 2015-07-22 15:57:02 -04:00