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

348 Commits

Author SHA1 Message Date
mid-kid f52f20edb7 Rename CheckTrainerBattle 
Renamed to be more in line with our current coding standards. Hopefully
this is slightly more readable.
 2018-10-11 11:39:09 +02:00
Rangi 3241c9cfaa Use 0/1/2/3 for palettes, and rgbds opt feature for battle transition graphic 2018-09-09 18:15:54 -04:00
Rangi bb4a6e5f55 wCursorCurTile -> wCursorCurrentTile 2018-09-09 17:15:49 -04:00
Rangi 14a2ea835e Remove redundant comments 2018-09-09 15:15:33 -04:00
Rangi ae022e1420 Curr -> Cur 2018-09-09 15:09:51 -04:00
Rangi 1c0fff7668 hLabel - $ff00 -> LOW(hLabel) 2018-08-25 14:34:25 -04:00
Rangi eb1e3636bb Use labels instead of constants for HRAM 
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
 2018-08-25 14:28:22 -04:00
Rangi b5a9e83a94 Fix reviewed issues. 
Pokedex_PrintListing has a comment noting how it depends on wCurSpecies == wNamedObjectIndexBuffer; an assert would be more convenient, but is not possible since WRAM label addresses are not defined yet here.
 2018-07-29 16:00:11 -04:00
Rangi c9cb67141b Make reviewed fixes; standardize on " + " 2018-07-29 01:40:23 -04:00
Rangi 9dec80b07e Add meaningful aliases for wd265 
Introduce MONICON_* constants
Introduce BATTLEPLAYERACTION_* constants
 2018-07-29 00:25:52 -04:00
Rangi 4f0c9cecf9 StringCmp → CompareBytes; CompareLong → CompareBytesLong 
hStringCmpString[1/2] → h[EnemyMon/PartyMon1]Speed
 2018-07-23 00:25:53 -04:00
mid-kid ffa63c51df Clean up TX_ commands 
Some of the TX_ commands didn't use the TX_ prefix for their
constants, and the label names were inconsistent. I've chosen to adopt
the `TextCommand_` prefix as opposed to `Text_`, as it has a clear
difference in namespace compared to the possibly-used `Text_` namespace
for actual dialogue text.
 2018-07-18 10:55:30 +02:00
mid-kid 1fc7430a2b Fix misnamed character codes 
Some character codes were erroneously named after their text command
counterparts. This has caused a lot of confusion with naming their
functions and with other things.

I've also removed the `dict2` macro and expanded the `dict` macro. This
really isn't something we should be doing for macros but I can't deny it
looks a lot neater than repeated code.
 2018-07-18 10:55:30 +02:00
Rangi b565e6a9dc Miscellaneous reorganization fixes 2018-07-04 02:42:11 -04:00
Rangi e2cf3eb7bd Add more collision nybble constants 2018-06-28 22:35:29 -04:00
Rangi 4eb8165158 Use :: for all global labels, not the GLOBAL keyword 2018-06-27 16:44:52 -04:00
Rangi 1caa50a647 No space between labels and bodies 2018-06-25 12:24:18 -04:00
Rangi 5693cc49cf Single newline at the end of files 2018-06-25 12:07:35 -04:00
Rangi 9f3e9145f9 Remove more triple newlines 2018-06-25 12:01:02 -04:00
Rangi 67d1364c7a Fix triple newlines left over from removing address comments 2018-06-24 23:22:50 -04:00
Rangi 9afaed9b8f Remove more address comments 2018-06-24 21:39:23 -04:00
mid-kid 5efce10789 Remove even more address comments 
That should be all of them this time
 2018-06-25 02:10:37 +02:00
mid-kid 1d9a68dbdd Remove all address comments 2018-06-24 16:13:22 +02:00
mid-kid e8f847b537 Use structure constants for channel_struct 2018-06-04 11:35:27 +02:00
Rangi 32b92ca51c Start improving sprite movement engine (to do: identify bit flags) 
Introduce maskbits N[, S]: optionally shift the bitmask
 2018-05-23 12:48:14 -04:00
Rangi 4e776d4fa6 Use constants 2018-05-23 11:14:15 -04:00
Rangi d2880d1981 Factor out GetHPPals and SetHPPals from home.asm 
The remaining code in home.asm is almost all "generic", unrelated to Pokémon-specific game logic, so leaving it as-is might be neater than little home/*.asm files for each routine.
 2018-05-23 11:08:23 -04:00
Rangi 846e3e65de adc a, 0 → adc 0; fix comments 2018-05-20 17:55:27 -04:00
Rangi 7307fc8dce Use constants for bit/set/res more 2018-04-05 11:44:02 -04:00
Rangi 99df17d571 Move more code from home.asm into home/ 2018-04-05 00:35:14 -04:00
Rangi 145efc1353 Use constants for screen size in metatiles 2018-04-04 16:14:48 -04:00
Rangi 0447ee0cf9 Relabel some map-related WRAM 
wMisc -> {wSurroundingTiles, wBoxPartialData, wLink_c608}
wOverworldMap -> {wOverworldMapBlocks, wHallOfFamePokemonList}
 2018-03-19 11:36:14 -04:00
Rangi e2c15b0b92 * BillPhoneGeneriText -> BillPhoneGenericText 
* data/phone/text/trainers1.asm -> data/phone/text/trainers.asm
* ,ROM -> , ROM0
 2018-02-26 22:29:09 -05:00
Rangi 612fd7cb96 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	maps/KrissHouse2F.asm
 2018-02-15 21:21:58 -05:00
luckytyphlosion 8b007e8d51 Fix more w-izing edge cases. 2018-02-04 22:45:04 -05:00
Rangi 73ea7c6326 Macro factors out sine code, just like sine data, since it's used 5 times 2018-02-03 21:11:55 -05: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 6ff2cb20e6 map → map_id; map_def → map; map_data → map_attributes 2018-02-03 17:11:55 -05:00
Rangi 2a53d75807 Similar formatting for similar WRAM areas 2018-02-02 21:15:15 -05:00
luckytyphlosion 0b45e2e846 Fix wVirtualOAM labels, part 2. 2018-01-30 14:52:46 -05:00
luckytyphlosion 3c7ba37de7 Fix wVirtualOAM labels, part 1. 2018-01-30 14:47:14 -05:00
luckytyphlosion 3203ad7d50 Fix comment/style issues caused from w-izing. 2018-01-30 14:05:25 -05:00
Rangi 4d93741a54 use PAL_COLOR_SIZE 2018-01-26 21:25:49 -05:00
Rangi 7d3ad2136a Separate home/battle_vars.asm for easy data editing, same as home/hm_moves.asm 2018-01-25 18:10:41 -05:00
Rangi d719d318e8 Remove Special_ prefix from special routines (close #478) 2018-01-24 11:17:05 -05:00
Rangi 132fe46925 Rename some routines to avoid conflicts when removing "Special_" prefixes 2018-01-24 11:12:02 -05:00
luckytyphlosion a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
luckytyphlosion 79bd48f85c Replace Stack with wStack. 2018-01-23 16:49:58 -05:00
luckytyphlosion f2ae74079f Prefix wram labels with w, part 1. 
Handle edge cases first.
 2018-01-23 16:45:34 -05:00
Rangi ead103d2c6 MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440) 2018-01-23 16:08:43 -05:00