Commit Graph

43 Commits

Author SHA1 Message Date
Remy Oukaour 05382d3e3c PARTY_LENGTH; MON_NAME; sgb_border.bin 2018-01-20 12:25:55 -05:00
Remy Oukaour 6d20cf3e80 "CryHeader" → "Cry"; "Cry" → "MonCry" 2018-01-16 23:47:45 -05:00
Remy Oukaour 8048082114 Remove Predef_ prefix from routines listed in PredefPointers 2018-01-16 14:39:28 -05:00
Remy Oukaour 14c8cf5b48 Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
# Conflicts:
#	data/player_names.asm
#	engine/battle/menu.asm
#	engine/billspc.asm
#	engine/billspctop.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/delete_save_change_clock.asm
#	engine/events/buena.asm
#	engine/events/elevator.asm
#	engine/events/kurt.asm
#	engine/events/mom.asm
#	engine/events/move_tutor.asm
#	engine/events/pokecenter_pc.asm
#	engine/events/pokepic.asm
#	engine/events/std_scripts.asm
#	engine/events/unown_walls.asm
#	engine/init_gender.asm
#	engine/intro_menu.asm
#	engine/mail.asm
#	engine/main_menu.asm
#	engine/mart.asm
#	engine/menu_2.asm
#	engine/mon_menu.asm
#	engine/pack.asm
#	engine/slot_machine.asm
#	engine/start_menu.asm
#	home/menu.asm
#	maps/CeladonDeptStore6F.asm
#	maps/CeladonGameCornerPrizeRoom.asm
#	maps/DragonShrine.asm
#	maps/EarlsPokemonAcademy.asm
#	maps/GoldenrodCity.asm
#	maps/GoldenrodDeptStore6F.asm
#	maps/GoldenrodGameCorner.asm
#	maps/GoldenrodPokeComCenter2FMobile.asm
#	mobile/mobile_12.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_22.asm
#	mobile/mobile_22_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_45.asm
#	mobile/mobile_45_sprite_engine.asm
#	mobile/mobile_46.asm
#	mobile/mobile_5c.asm
#	mobile/mobile_5f.asm
#	mobile/mobile_menu.asm
2018-01-14 23:43:51 -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
mid-kid 11d67567d2 Use constants for menu flags
Added a bunch of constants for the bitflags of each kind of menu. Some
are slightly vague or too long, but I'm not sure how to else name them.
2018-01-14 11:59:56 +01:00
Remy Oukaour 2ab60fa8a4 menu_coords macro for (x1, y1, x2, y2) order (see issue #440) 2018-01-13 16:38:14 -05:00
Remy Oukaour 94d6a32721 Use maskbits some more 2018-01-11 14:27:19 -05:00
Remy Oukaour 417937cffc Resolve #461 2018-01-10 13:47:57 -05:00
Adelaide Walter d6f20ae746 Use BANK for hardcoded SRAM banks (except for vestigial refs to JP's banks 4-7) 2018-01-08 17:13:37 -05:00
Remy Oukaour 4f01dff6c2 Use OAM flags in dsprite data 2018-01-02 17:26:23 -05:00
xCrystal b4e087167f More unreferenced labels and unused text 2018-01-02 19:38:56 +01:00
xCrystal d7970f749a Consistent predef function names 2018-01-02 18:49:25 +01:00
xCrystal 6f0b81504d More unreferenced labels cleanup 2018-01-02 16:04:21 +01:00
xCrystal 9a3088e50c Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
xCrystal def3b60493 Clean up .Jumptable: spaces 2017-12-29 13:52:42 +01:00
Remy Oukaour b9a68fec25 Consistent if/else/endc (matches rept/endr) and DEF (matches BANK/HIGH/LOW) 2017-12-28 22:13:39 -05:00
xCrystal 50fc9c3389 endm -> ENDM 2017-12-28 22:31:16 +01:00
xCrystal 333524f0be Lowercase v for VRAM addresses 2017-12-28 13:32:33 +01: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 d554b997c5 Use correct WRAM labels for intro/title scenes
Remove outdated WRAM alias comments
2017-12-10 00:18:29 -05:00
Remy Oukaour 31901f73b0 Move some gfx/misc/ files into meaningful directories 2017-12-09 22:57:41 -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 d7a01e92e9 Remaining layout constants 2016-06-06 18:23:00 -04:00
pikalaxalt 6a3b3e3773 Save functions; feeble attempt at serial and link functions 2016-05-11 21:19:52 -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 6be4cd4da9 Local labels starting with lowercase letters are no longer decorated with a trailing colon 2016-04-10 15:01:49 -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
PikalaxALT f030315b1f jumptable macro repurposed 2015-12-26 21:59:03 -05:00
PikalaxALT a5e928eb98 writebackup --> closewindow; game corner prize vendors; others 2015-12-24 22:58:42 -05:00
PikalaxALT d644406f61 More menu stuff 2015-12-17 22:31:16 -05:00
PikalaxALT 7203e9d2cc Map script and color shenanigans 2015-12-16 21:57:42 -05:00
PikalaxALT 879b430fce Bill's PC 2015-12-16 12:36:58 -05:00
PikalaxALT 77ef8404a1 Menu 2015-12-15 18:59:49 -05:00
PikalaxALT 8a439dbd05 Miscellaneous labels 2015-12-13 20:33:56 -05:00
PikalaxALT 7f68db68ad underground switches, town map 2015-12-09 11:39:35 -05:00
PikalaxALT d972564175 link and seer labels 2015-11-23 16:04:53 -05:00
PikalaxALT 58020fb5f6 trade animation 2015-11-23 00:21:21 -05:00
PikalaxALT bc1870e3f4 Save, Bill's PC 2015-11-17 23:29:14 -05:00
PikalaxALT 2ffcb4b490 More splits; map setup labels 2015-11-11 23:38:57 -05:00