pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity
3,864 Commits 1 Branch 0 Tags 52 MiB
5959548c01
Commit Graph

37 Commits

Author SHA1 Message Date
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
08891da822 const_def N 2018-01-31 11:38:45 -05:00
luckytyphlosion
a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
luckytyphlosion
f2ae74079f Prefix wram labels with w, part 1. 
Handle edge cases first.
 2018-01-23 16:45:34 -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
ddec0ee305 More Japanese characters 2018-01-19 20:48:33 -05:00
Remy Oukaour
a3beba1e64 Use Japanese charmap definitions in strings 2018-01-18 20:49:17 -05:00
Remy Oukaour
8048082114 Remove Predef_ prefix from routines listed in PredefPointers 2018-01-16 14:39:28 -05:00
Remy Oukaour
dfcca93b45 Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 
# Conflicts:
#	engine/battle/core.asm
#	engine/save.asm
 2018-01-14 23:00:22 -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
7a09fc9f75 GFX tile sizes in decimal 2018-01-14 19:43:35 -05:00
Remy Oukaour
417937cffc Resolve #461 2018-01-10 13:47:57 -05:00
Remy Oukaour
5c5f8b325f Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
Adelaide Walter
9d0ba6bfd3 Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary). 2018-01-03 19:12:45 -05:00
xCrystal
d7970f749a Consistent predef function names 2018-01-02 18:49:25 +01:00
xCrystal
a98ed77c83 Merge 2d0ed11 and 355acfc from Roukaour/master 2018-01-01 20:25:07 +01:00
xCrystal
37369d1ae0 Rename Pals labels in WRAM bank 5 2018-01-01 20:09:53 +01:00
xCrystal
6e12a51503 Use more palette(s) constants 2018-01-01 20:09:53 +01:00
Remy Oukaour
2d0ed1159e Use constants for rBGPI+rOBPI auto-increment 
Fix some documentation
 2018-01-01 13:43:02 -05:00
xCrystal
333524f0be Lowercase v for VRAM addresses 2017-12-28 13:32:33 +01:00
Remy Oukaour
e34e68095d Resolve #428: Use HIGH(X) and LOW(X) instead of X / $100 and X % $100 or X >> 8 and X & $ff 2017-12-25 14:23:16 -05:00
Remy Oukaour
9973e43d5a Fix issue #345: 
- GetMonFrontpic → GetEnemyMonFrontpic
- GetMonBackpic → GetBattleMonBackpic
- FrontpicPredef → GetAnimatedFrontpicPredef
- GetFrontpic → GetMonFrontpic
- GetBackpic → GetMonBackpic
- CutAndPasteMap → PadMapForHDMATransfer
 2017-12-24 15:03:20 -05:00
Remy Oukaour
c66d195089 callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
Remy Oukaour
fa98c29fa4 Add more palettes to data/palettes/ 2017-12-15 22:36:33 -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
3713b71d9e More splitting of main.asm; remove unneeded rept 2 2016-05-04 11:46:23 -04:00
pikalaxalt
6be4cd4da9 Local labels starting with lowercase letters are no longer decorated with a trailing colon 2016-04-10 15:01:49 -04:00
PikalaxALT
2ed6c357af More WRAM tidying 2016-01-12 12:46:18 -05:00
PikalaxALT
f030315b1f jumptable macro repurposed 2015-12-26 21:59:03 -05:00
PikalaxALT
d08199c79d Color fns, some more address decoding in link/mobile 2015-12-22 18:03:00 -05:00
PikalaxALT
987ed1fafb More work on slots; WRAM cleanup, Move Deleter 2015-12-19 14:48:30 -05:00
PikalaxALT
ecd277204a Card Flip 2015-12-11 16:59:40 -05:00
PikalaxALT
be082943ed More work interpreting the sprite engine 2015-12-02 13:24:18 -05:00
PikalaxALT
8612a4a531 Renaming sections, further dissolving main.asm 2015-11-28 15:13:40 -05:00
PikalaxALT
7b3090e22a Annotate battle tower text bug 2015-11-20 15:15:32 -05:00
PikalaxALT
93a129eb6d main.asm is now under 30k lines 2015-11-19 18:09:11 -05:00