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

326 Commits

Author SHA1 Message Date
Remy Oukaour bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -05:00
Remy Oukaour 7b3de85a06 Avoid "+- 1" at every maskbits 2018-01-16 17:27:50 -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 d91e42ca5e Group some mutually edited files in data/sprites/ 2018-01-10 18:10:01 -05:00
Remy Oukaour c8575823a0 Battle data goes in data/battle/ 
TreeMons, like fish groups, have constants
 2018-01-10 17:30:27 -05:00
Remy Oukaour 28d5169a11 maskbits <count> +- 1 2018-01-10 14:03:11 -05:00
Remy Oukaour 417937cffc Resolve #461 2018-01-10 13:47:57 -05:00
Remy Oukaour a8cf8979d9 Do a little cleanup towards issue #465 2018-01-09 17:20:47 -05:00
Remy Oukaour 11556196ba Consistent sine wave code formatting 2018-01-09 16:39:36 -05:00
Remy Oukaour a849c3557b More comments 
Fix some constants
 2018-01-09 15:39:48 -05:00
xCrystal 2c789b64b1 Predef_FlagAction -> Predef_SmallFarFlagAction 2018-01-07 11:53:20 +01:00
xCrystal e9e8bf6eb1 Predef_Flag -> Predef_FlagAction 2018-01-05 11:05:01 +01:00
Adelaide Walter 9d0ba6bfd3 Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary). 2018-01-03 19:12:45 -05:00
Remy Oukaour 6d2dc86a38 Serve2bppRequest@VBlank → Serve2bppRequest_VBlank 2018-01-03 15:28:13 -05:00
Adelaide Walter a298cb9990 Replace hardcoded bank with BANK function. 2018-01-03 02:19:38 -05:00
Adelaide Walter cd8a22cd2e Replace magic reference to PackMenuGFX. 2018-01-03 01:29:52 -05:00
Adelaide Walter 51106cccd0 Scrub WRAM addresses from comments & use WRAM1_Begin where appropriate. 2018-01-03 00:19:54 -05:00
xCrystal d7970f749a Consistent predef function names 2018-01-02 18:49:25 +01:00
xCrystal b4a49351c1 Finish consistent Special function names 2018-01-02 17:47:58 +01:00
xCrystal f1ea15bbfe Consolidate Special function names 2018-01-02 17:13:57 +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 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
Remy Oukaour 2d0ed1159e Use constants for rBGPI+rOBPI auto-increment 
Fix some documentation
 2018-01-01 13:43:02 -05:00
yenatch 92fba8821c
Merge pull request #450 from roukaour/master 
Constants for TextBoxFlags
 2017-12-30 21:32:45 -05:00
Remy Oukaour 586a49c8ad lda_coord and ldcoord_a exist for this 2017-12-29 17:07:21 -05:00
xCrystal 2a7ba6685a Clean up changes in 3c6c80f 2017-12-29 19:22:33 +01: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 333524f0be Lowercase v for VRAM addresses 2017-12-28 13:32:33 +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 47e4f21e62 Keep memory map values in hardware_constants.asm 2017-12-26 23:18:05 -05:00
Remy Oukaour 5d229dcef2 Copy sram.asm's global start/end constants for wram.asm and vram.asm 2017-12-26 23:07:46 -05:00
Remy Oukaour c4a18b1329 Correct documentation 
Split out text_constants.asm
 2017-12-26 22:36:01 -05:00
Remy Oukaour b3f0e11567 Various cleanup 2017-12-26 20:33:41 -05:00
Remy Oukaour 24f0e7d045 Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers 2017-12-26 12:50:32 -05: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
yenatch ec8c9688ce move rst.asm and interrupts.asm into home/ 2017-12-24 21:47:11 -05:00
Remy Oukaour c05b7f41dd Renaming: (fix #412) 
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
 2017-12-24 14:33:17 -05:00
Remy Oukaour 20d6c1d876 Rename "map permissions" to "map environment" (fix #396) 2017-12-24 13:08:38 -05:00
Remy Oukaour c66d195089 callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
Remy Oukaour daa071451d More comments for constant<->table correspondences 2017-12-22 23:08:55 -05:00
Remy Oukaour 14a244ad3a IsHM is not used within home/names.asm; group it with the other HM routines+data 2017-12-22 22:56:21 -05:00
Remy Oukaour b423e3b90b Split more code from home.asm into home/ files 2017-12-22 22:50:28 -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 138abd097d Document one more bug. 2017-12-12 23:05:30 -05:00
Remy Oukaour b006415371 Define constants for collision types 2017-12-12 16:15:58 -05:00
Remy Oukaour 5b13a7a13b Identify more sprite-related constants 
Start more documentation
 2017-12-12 13:22:19 -05:00
Remy Oukaour 4afc2f01ef Add member constants for the base data struct, same as most other structs 2017-12-11 17:35:35 -05:00
Remy Oukaour 5be98bae3c Move more data tables into data/ files. 2017-12-11 15:20:32 -05:00
Remy Oukaour 41acb0667a Document macros/map.asm 
Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F; use MORN/DAY/NITE for shifted values (cleaner for person_events)
Prefix FLOOR to the `elevfloor` constants
 2017-12-11 01:02:28 -05:00
Remy Oukaour 08b14e593e Rename tilesets, consistent with constant names 2017-12-10 23:56:10 -05:00
Remy Oukaour b4261d27d8 Use new palette constants 2017-12-10 20:50:08 -05:00
Remy Oukaour ab7025a144 Consistent code formatting: no redundant `a`s and spaces after commas 2017-12-10 00:06:20 -05:00
Remy Oukaour cd2a748128 More WRAM cleanup 2017-12-09 22:00:36 -05:00
Remy Oukaour e3c686f6df Further WRAM organization 2017-12-09 15:14:51 -05:00
Remy Oukaour 5a5df2ab87 More WRAM organization 2017-12-09 14:47:32 -05:00
Remy Oukaour 16c6696dd5 Start organizing WRAM 
- Use db and dw when they're more meaningful than ds 1/2
- Use unions to group related labels
 2017-12-09 13:58:49 -05:00
Remy Oukaour 0b7d8d44ad More constants 2017-12-09 13:28:23 -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
Remy Oukaour 512863989f Document constants with comments, actual names, and more thorough usage 2017-12-09 02:15:46 -05:00
pfero 7c9a156133 Fix WATERTILE/WALLTILE constants 
WATRTILE was wrongly defined as 15, and WALLTILE as 1. Those had to be
flipped around.
This has allowed for us to replace inmediate values with these constants
in several places to improve readability.

WATRTILE was renamed to WATERTILE in the name of readability.
 2017-10-28 18:08:24 -04:00
yenatch d0d61cb3ab Merge pull request #354 from FredrIQ/comments 
Fix a reversed label mistake and reference a major bug
 2017-06-24 17:43:48 -04: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
Fredrik Ljungdahl f8455e9b4f Reverse the LastEnemyCounterMove and LastPlayerCounterMove labels 
They were swapped
 2017-01-08 01:26:48 +01:00
PikalaxALT 3bb73b2430 Merge branch 'master' of github.com:pret/pokecrystal 2016-07-29 10:40:57 -04:00
pikalaxalt 4e2487c056 hLCDCPointer and InitList 2016-06-13 22:53:33 -04:00
pikalaxalt ca01a92880 Fix indentation in many places 2016-06-07 08:13:08 -04:00
pikalaxalt d7a01e92e9 Remaining layout constants 2016-06-06 18:23:00 -04:00
Brandon Mulcahy eb7195a780 Fix PlaySFX priority comment 2016-05-28 15:43:41 -04:00
pikalaxalt 789ebc7304 Port homecall macro 2016-05-27 10:41:59 -04:00
pikalaxalt f1f3e2564c Comment on bug in ClearWRAM 2016-05-19 08:11:44 -04:00
pikalaxalt 87b733994b SPRITE_ANIM_FRAME_IDX constants 2016-05-15 22:00:17 -04:00
pikalaxalt 1fa6aecbfc Unify directional movement macros 2016-05-14 13:46:14 -04:00
pikalaxalt 6a3b3e3773 Save functions; feeble attempt at serial and link functions 2016-05-11 21:19:52 -04:00
pikalaxalt af0119ca7e Name all printer functions 2016-05-11 17:16:03 -04:00
pikalaxalt 46ecd5b869 Name all functions in event/ 2016-05-10 12:59:34 -04: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 8c26547645 Mobile and more battle anims 2016-05-05 15:07:37 -04:00
pikalaxalt a613ed915c HDMA transfer functions 2016-05-04 22:34:09 -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 93e12d2003 Split up banks 1-3 of main.asm 2016-03-27 12:47:28 -04:00
pikalaxalt 08e6009e61 Merge branch 'master' of https://github.com/pret/pokecrystal 2016-03-08 19:54:13 -05: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 599e6e8d16 Battle animation annotations 2016-03-01 22:31:21 -05:00
PikalaxALT 8bf255b9f8 Prepare to merge 2016-01-18 00:39:01 -05:00