pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity
5,156 Commits 1 Branch 0 Tags 52 MiB
236519fc55
Commit Graph

509 Commits

Author SHA1 Message Date
Rangi
58b377f25b Fix #709 miscellaneous issues 2020-04-16 09:30:50 -04:00
Rangi
a40ddc4668 Ensure that the cartridge header is patched over all $00s, and comment on the entry point format 2020-04-06 14:44:07 -04:00
Rangi
10909e6b43 hStackBank -> hTempBank 2020-04-06 13:02:23 -04:00
Rangi
1ec60810b8 hBuffer -> hStackBank and hFarByte 2020-04-06 12:52:46 -04:00
Rangi
79184bc718 Miscellaneous fixes: 
- `hSecondsBackup` -> `hUnusedBackup`
- `ld bc, hBGMapAddress + 1` -> `bccoord -1, -2, 0`
- Identify some `.asm_XXX` labels
 2020-04-04 15:43:10 -04:00
Rangi
0ee9d7a48b Upgrade to rgbds 0.4.0 
- fail for rgbds < 0.4.0
- `rst <Label>`
- `ds <count>, <byte>`
- `shift <N>`
- ASCII "\r"
- Sorted .sym file
 2020-04-04 15:15:02 -04:00
Rangi
6a6ba10315 rgbds supports 'X - 1' instead of 'X + -1' 2020-03-21 14:01:05 -04:00
Rangi
ad50e94b50 Add a LANDMARK_ prefix to landmark constants 
Resolves #697
 2020-03-15 19:50:39 -04:00
Rangi
447da80615 Identify remaining gfx/unknown files 2020-02-28 09:23:41 -05:00
Rangi
75a537ed1e Fix some comments and whitespace 2020-02-26 08:41:12 -05:00
Rangi
c3f389d615 Replace some "idiotic", "wtf", "stupid interns" comments with more common "useless", "pointless", "could have done X instead" 2020-02-23 18:51:32 -05:00
Rangi
2238f52197 Fix build with rgbds 0.3.9 release 2020-02-23 14:28:35 -05:00
mid-kid
813d0aa73a Fix the sections in home/header.asm 
They're fixed anyway, and this allows us to make some expressions
constant.
 2020-02-23 20:11:54 +01:00
mid-kid
c0b6e5bc21 JoypadInt -> Joypad 
This matches all other interrupts. The old Joypad was renamed to
UpdateJoypad.
 2020-02-23 14:33:53 +01:00
mid-kid
44128c5d98 Create home/header.asm 
Contains what was previously in:
- home/rst.asm
- home/interrupts.asm
- home.asm

All of this should be in a static location in the ROM so it kinda makes
sense together.
 2020-02-23 14:28:21 +01:00
mid-kid
7bd8d56ff9 Implement suggestions in PR #687 
Merge mon_stats.asm, cry.asm, print_level.asm, and mon_data.asm into pokemon.asm
Merge mon_party.asm into battle.asm
Merge menu.asm, menu_window.asm, and menu2.asm into menu.asm
 2020-02-22 12:52:13 +01:00
mid-kid
43eff93861 Small home/ reorganization 
Time to move everything out of home.asm:
- InexplicablyEmptyFunction was moved to home/map.asm
- The wDebugFlags functions and xor_a brothers were moved to
  home/flag.asm because they're all flag-related.
- ret_2f3e was moved into home/region.asm
- The register alias sisters were moved to a new file called home/call_regs.asm
- IsInArray and SkipNames were joined by AddNTimes from home/math.asm
  into home/array.asm, as they're all used to index arrays.
- CallPointerAt was moved into home/print_text.asm because given the
  contents of that file it doesn't feel very out of place (that file
  isn't very aptly named...)
- CountSetBits was moved into home/pokedex_flags.asm because it's unique
  use is counting the amount of seen/caught mon in the podedex. GetWeekday
  was pulled into this by proximity.

Other changes were also made:
- PushLYOverrides was moved from home/sprite_anims.asm to
  home/battle.asm, because it's almost exclusively used for battle
  animations, with the lone exception being the Magnet Train.
- home/copy.asm was renamed to home/gfx.asm, as it's all gfx-related
- home/copy2.asm was renamed to home/copy.asm, now it's the only file
  called copy.
- SetHPPal and GetHPPal were moved from home/hp_pals.asm to
  home/tilemap.asm, as they're attrmap related, like many functions in
  that file are.
- home/rtc.asm was renamed to home/time_palettes.asm, as it had very
  little to do with the RTC at all, all RTC functions being in home/time.asm
- home/handshake.asm was renamed to home/printer.asm.
- home/mon_data_2.asm was renamed to home/mon_party.asm.
 2020-02-22 00:23:47 +01:00
mid-kid
9a927c1b3e
Merge pull request #685 from mid-kid/master 
Moshi moshi? minoru enhansumentsu desu
 2020-02-21 21:11:36 +01:00
mid-kid
345b585a78 Document GetTMHMName locals 
This was documented in pokegold apparently
 2020-02-21 21:10:43 +01:00
mid-kid
c22e268083 RTC -> UpdateTimeAndPals 
Rename clear misnomer.
Most of the related functions in that file aren't really aptly named but
I don't know good names right now.
 2020-02-21 18:21:29 +01:00
mid-kid
75a6bb5df6 PanicResetClock -> ClearClock 
Funky name that only exists based on what it's used for, not so much
what it is.
 2020-02-16 12:20:20 +01:00
Rangi
88bbdb6a2f Define TileCollisionTable as a standard 'db' series 2020-02-13 19:07:19 -05:00
mid-kid
26b8bf003e Standardize on lowercase Tilemap and Attrmap 
We used to have a mixture of TileMap and and Tilemap, as well as the
similar AttrMap. Standardize on one.
 2020-02-13 18:31:10 +01:00
mid-kid
34ceaac71d Call_LoadTempTileMapToTileMap → SafeLoadTempTileMapToTileMap 
Stupid name is stupid smh tbh fam.
 2020-02-13 18:31:10 +01:00
mid-kid
a241f049df Remove FarCall prefix from SwapTextboxPalettes and ScrollBGMapPalettes 
No prefix for the farcall, prefix with an underscore for the farcalled.
This matches what is done for pretty much every other home function.
 2020-02-13 18:31:10 +01:00
mid-kid
0d81f1c470 InitSpriteAnimStruct <-> _InitSpriteAnimStruct 
These were the wrong way around, as the function in home should not be
prefixed
 2020-02-13 18:31:10 +01:00
Rangi
fb9cbe7d1e
Merge pull request #650 from pret/audio-macros 
Update audio macros and arguments
 2020-02-05 18:51:20 -05:00
Rangi
d482dc28f4 Identify four padding bytes in base data as beta front/back pic pointers 2020-02-04 11:07:16 -05:00
Rangi
b1c8548628 Clean up comments in home/time.asm 2020-01-31 20:59:48 -05:00
dannye
e7be25948d Merge branch 'master' into audio-macros 2020-01-06 22:07:33 -06:00
Rangi
94ebdab6d3
Merge pull request #660 from mid-kid/master 
Make the map setup commands match the actual function names better
 2020-01-04 20:08:43 -05:00
Rangi
fa7261a8ee Update some labels 2019-12-03 09:17:21 -05:00
Rangi
0e311ad709 Fix miscellaneous points made in #658 2019-11-23 20:56:22 -05:00
Rangi
ef48ae98b5 Separate tilesets.o goes with pics.o and sprites.o 2019-11-23 20:43:33 -05:00
mid-kid
739a60b33c Make the map setup commands match the actual function names better 
These functions used as map setup commands are used in other places,
too, so I can't prefix them under the same. The names should match
except I won't repeat "map" in a map setup command name.
 2019-11-18 18:21:57 +01:00
mid-kid
77803f571f Fix some constants around wLinkMode 2019-11-18 18:21:57 +01:00
mid-kid
176257ea6f Document WaitPressAorB_BlinkCursor a bit 
This is one weird function I'll never understand the purpose of.
It could use a better name, but I have no clue what.
 2019-11-18 18:21:57 +01:00
Rangi
4d32035d4f Bit 6 of PrintNum left-aligns numbers 2019-11-03 20:17:04 -05:00
Rangi
69ea875eeb Split menu code out of home/movement.asm 2019-11-03 14:46:36 -05:00
Rangi
4aeab6b879 Rename buttonsound to promptbutton 2019-11-03 12:48:54 -05:00
Rangi
5134266b9a Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH 2019-11-03 12:26:38 -05:00
mid-kid
7111ae8e58 Fix some mobile script and map sign things 2019-10-21 00:42:36 +02:00
mid-kid
e3e0bcd653 #641 fixes and additions. (#646) 
Name a lot of text labels according to our conventions
 2019-10-20 18:24:17 -04:00
dannye
fc051f2130 Update audio macros and arguments 
and update related labels/constants/comments
this fixes a lot of mistakes and maximizes compatibility with red
 2019-09-02 03:41:25 -05:00
mid-kid
c7fdf5f9ec Fix overworld scrolling function names 2019-06-09 00:17:35 +02:00
mid-kid
b6277408a0 Misc fixes 2019-06-04 13:31:22 +02:00
mid-kid
13cfe356d6 Fix usage of rIE and rSC constants 2019-05-25 17:59:50 +02:00
Rangi
45e3f6aca9 Identify some more WRAM labels 2019-04-19 11:35:27 -04:00
mid-kid
3e78e5b2b6 TextBox -> Textbox 
Homogenizing names.
 2019-04-09 16:09:18 +02:00
Rangi
2184b60a0c Identify and eliminate wEngineBuffer1-5 2019-04-08 19:42:55 -04:00
Rangi
79dc22c769 Define constants for map event sizes 2019-03-03 14:19:16 -05:00
Rangi
dc396822d7 Identify more collision-related constants and data 2019-03-03 13:30:27 -05:00
Rangi
df337fc417 Update to rgbds 0.3.8 2019-02-16 12:17:55 -05:00
Rangi
60cdc65293 wc7e8 -> wUnusedC7E8 (similar to wUnusedD102) 2019-01-30 19:46:45 -05:00
Rangi
84b6a084cb Keep "paragraphs" of related code together 2019-01-24 21:10:45 -05:00
Rangi
1853e3d127 Say "BANK(Foo) ; aka BANK(Bar)" to clarify that Foo and Bar share a bank 2019-01-12 15:17:20 -05:00
mid-kid
930d285fab Fix comments around BANK() statements 
Found a couple BANK()s that reference multiple labels.
 2018-12-26 21:58:13 +01:00
Rangi
e025ab9db0
Merge pull request #578 from mid-kid/master 
Fixes in the animation subsystem.
 2018-12-09 17:44:09 -05:00
mid-kid
4e3ed078f9 Cosmetic fixes 2018-11-20 21:53:45 +01:00
Rangi
3202c4f3df Resolve issue #575: Rename text commands 2018-11-18 12:41:11 -05:00
mid-kid
940256569b text_jump → text_far 
The previous name for this was rather misleading. It isn't an actual
jump like you'd expect the `jp` instruction to behave as. Instead, it
behaves more like a `farcall`.
This also makes it consistent with its current command ID name of
`TX_FAR`.
 2018-11-05 22:26:18 +01:00
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
Rangi
c5cc23a35f wGameTimerPause bit flag constants 2018-01-23 12:40:29 -05:00
Rangi
fdda670f40 Cry headers and map headers were eliminated 2018-01-23 11:17:21 -05:00
Rangi
14ef9d3066 PALETTE_SIZE 2018-01-22 19:57:35 -05:00
Rangi
a73c532738 tile+color macros in gfx.asm 2018-01-22 19:40:17 -05:00
Rangi
3a7f518de4 wStatusFlags/2 bit constants 2018-01-22 15:40:43 -05:00
Rangi
4d8528f903 More engine flag constants 2018-01-22 14:34:55 -05:00
Remy Oukaour
05382d3e3c PARTY_LENGTH; MON_NAME; sgb_border.bin 2018-01-20 12:25: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
b199f6cfbf Use hSerialConnectionStatus constants elsewhere 2018-01-19 19:31:45 -05:00
Remy Oukaour
0c6338836d Resolve #471 (although link code still needs more cleanup, like its WRAM labels) 2018-01-19 14:49:43 -05:00
Remy Oukaour
e69544b61f More Unicode 2018-01-19 02:30:19 -05:00
Remy Oukaour
c861ff5af3 This table entry has the address of MoveDescriptions in GSC ($4000 in G/S, $4b52 in Crystal) 2018-01-19 00:42:31 -05:00
Remy Oukaour
9576740b70 clean up GetName/NamesPointers 2018-01-19 00:29:05 -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
99f26a6097 Compute wc7e8 size 2018-01-18 01:28:51 -05:00
Remy Oukaour
95c0c31c8f Eliminate wd000 2018-01-18 01:25:19 -05:00
Remy Oukaour
b1c808f9f8 Rename some tilesets (close #467) 2018-01-17 14:50:34 -05:00
Remy Oukaour
6d20cf3e80 "CryHeader" → "Cry"; "Cry" → "MonCry" 2018-01-16 23:47:45 -05:00
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