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

784 Commits

Author SHA1 Message Date
Remy Oukaour d83aefb30a Use more constants in scripts 2018-01-12 02:27:42 -05:00
Remy Oukaour af4001132e Break up engine/events_3.asm 2018-01-11 23:50:44 -05:00
Remy Oukaour 163f3e0c3f Local UI tiles don't belong in charmap 
Separate 1bpp font tiles from gfx/mobile/phone_tiles.png
 2018-01-11 22:49:45 -05:00
Remy Oukaour 177341425c Use charmap frame characters 2018-01-11 21:14:35 -05:00
Remy Oukaour 17f34cb29c Disambiguate some uses of wcf64/5/6 2018-01-11 15:36:11 -05:00
Remy Oukaour fd0a78d708 Trainer card has state constants and WRAM labels 2018-01-11 14:43:18 -05:00
Remy Oukaour 94d6a32721 Use maskbits some more 2018-01-11 14:27:19 -05:00
Remy Oukaour a436bbc23b Move party menu qualities to data/ 2018-01-11 02:54:07 -05:00
Remy Oukaour 1a2bc57841 Event script–related constants go in constants/script_constants.asm 2018-01-11 02:35:46 -05:00
Remy Oukaour 2d0506ecf9 Group item and deco data more 2018-01-11 01:54:49 -05:00
Remy Oukaour b45f89f80c More constants and data tables 2018-01-11 01:45:27 -05:00
Remy Oukaour cc8dac5a22 Use constants and data for Unown chamber events 2018-01-11 00:25:14 -05:00
Remy Oukaour 0a3b251dcb Arrays end with -1, not $ff 2018-01-10 22:53:42 -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 bc79f17b9d More maskbits 2018-01-10 13:59:07 -05:00
Remy Oukaour 417937cffc Resolve #461 2018-01-10 13:47:57 -05:00
Remy Oukaour cc95d1208d Use maskbits more, and clarify its usage 2018-01-10 11:57:28 -05:00
Remy Oukaour 22b607b664 Move radio channel data into data/ 2018-01-10 11:30:12 -05:00
Remy Oukaour 16eb97ae9c Constant swap explains this Battle Tower bug 2018-01-10 02:55:44 -05:00
Remy Oukaour 7de7441e72 gfx/*.asm files have INCBINs 2018-01-10 02:38:45 -05:00
Remy Oukaour ee4ec65fc1 map_objects.pal is easier to find in gfx/overworld/ than gfx/sprites/ 2018-01-10 02:30:17 -05:00
Remy Oukaour 9af6d8d0f1 Split tilesets/ into gfx/tilesets and data/tilesets/ 2018-01-09 23:53:58 -05:00
Remy Oukaour 5c5f8b325f Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
Remy Oukaour f22485b08d Binary tilemaps 2018-01-09 22:44:06 -05:00
Remy Oukaour feb34b49ba data/phone_text → data/phone/text 2018-01-09 19:51:30 -05:00
Remy Oukaour cc0fd6e12c CRYSTAL11 → _CRYSTAL11 2018-01-09 17:26:40 -05:00
Remy Oukaour a8cf8979d9 Do a little cleanup towards issue #465 2018-01-09 17:20:47 -05:00
Remy Oukaour ce50d1b2cb Clearer Battle Tower code 2018-01-09 16:55:11 -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
Remy Oukaour 5a73a62d9b Move battle engine data into data/ 
IsJohtoGymLeader → IsGymLeader
 2018-01-09 15:12:49 -05:00
Remy Oukaour 2f741dfa03 Remove old Python class names from script command param doc comments 2018-01-09 01:02:29 -05:00
Remy Oukaour 05e5eaf12f Eliminate version.asm (resolves #464) 2018-01-09 00:51:53 -05:00
Remy Oukaour 459d5d3164 default_names.asm → player_names.asm 2018-01-09 00:45:03 -05:00
Remy Oukaour d0a8e8e744 includes.asm → constants.asm 2018-01-09 00:36:15 -05:00
Remy Oukaour 31edd7f803 Move text/ into data/ 2018-01-09 00:23:48 -05:00
Adelaide Walter 6c5cd7a963 Simplify comments per Rangi's rec. 2018-01-08 23:07:46 -05:00
Adelaide Walter 94f32db7bc Document hardcoded SRAM addresses. 2018-01-08 22:48:58 -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
xCrystal 2c789b64b1 Predef_FlagAction -> Predef_SmallFarFlagAction 2018-01-07 11:53:20 +01:00
Remy Oukaour bdd3a55333 Organize mobile/battle_tower_*.asm data and code 2018-01-06 18:53:30 -05:00
xCrystal e9e8bf6eb1 Predef_Flag -> Predef_FlagAction 2018-01-05 11:05:01 +01:00
Adelaide Walter ce985a09a7 Document switches to BANK(sScratch) via xor a 2018-01-04 16:51:50 -05:00
Adelaide Walter 36e91c971c Fix stray hardcoded WRAM bank. 2018-01-04 15:06:11 -05:00
Adelaide Walter fb422e8d9c Use BANK for hardcoded WRAM banks preceding FarCopyWRAM/GetFarWRAMByte calls. 2018-01-04 14:53:50 -05:00
Adelaide Walter 5fd3bfa832 Clarify the purpose of writing 0 to rSVBK. 2018-01-03 20:47:44 -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 91f97f08f0 Special_MapCallbackSprites_LoadUsedSpritesGFX -> Special_LoadUsedSpritesGFX 2018-01-03 14:58:08 +01:00
Remy Oukaour 10bd011d06 More relevant data file locations 2018-01-03 02:23:54 -05:00
Adelaide Walter cd8a22cd2e Replace magic reference to PackMenuGFX. 2018-01-03 01:29:52 -05:00
Remy Oukaour 8d095cd5b8 Better names 2018-01-03 01:27:12 -05:00
Adelaide Walter 76ee2f58c4 WRAM1_Begin -> wd000 2018-01-03 00:40:59 -05:00
Adelaide Walter 51106cccd0 Scrub WRAM addresses from comments & use WRAM1_Begin where appropriate. 2018-01-03 00:19:54 -05:00
Remy Oukaour 3fc06b0f9d Use constants 2018-01-02 20:35:57 -05:00
Remy Oukaour a7fb9e124c Use dsprite for Pokédex cursor OAM data 2018-01-02 18:02:22 -05:00
Remy Oukaour 4f01dff6c2 Use OAM flags in dsprite data 2018-01-02 17:26:23 -05:00
Adelaide Walter 0caea0f820 Use BANK for all hardcoded banks with BANK in comments. 2018-01-02 16:46:40 -05:00
Remy Oukaour 648e71832a Comment correction 2018-01-02 14:50:04 -05:00
Remy Oukaour 776b8c7396 Egg hatch shell framgent data is not exactly dsprite 2018-01-02 14:48:24 -05:00
Remy Oukaour 2dd9ac08a4 More sprite anim documentation 2018-01-02 14:39:24 -05:00
Remy Oukaour 7ad8ea13c9 Document more sprite anim data 2018-01-02 14:25:58 -05:00
xCrystal aa9a0a900d No more mobile EQUS ret (replace with Stubbed_ + ret) 2018-01-02 20:00:14 +01: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
Remy Oukaour be2aeedcf0 More clarification 2018-01-02 11:53:06 -05:00
Remy Oukaour d435bd8911 Reword Magikarp length comments 2018-01-02 11:50:08 -05: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 7c0e903c48 Clean up leftover code from main.asm 2018-01-02 16:25:40 +01:00
xCrystal 6f0b81504d More unreferenced labels cleanup 2018-01-02 16:04:21 +01:00
xCrystal 7a24703398 Clean up Predef function names 2018-01-02 15:05:14 +01:00
xCrystal 9a3088e50c Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
Remy Oukaour 3c953efcba Consistent *_palette_map.asm 2018-01-01 18:33:42 -05:00
Remy Oukaour 0722de77ae Remove trailing whitespace 
find . -name '*.asm' -exec sed -i 's/[ \t]\+$//' {} \;
 2018-01-01 18:32:01 -05: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
yenatch 8c3905c4cd
Merge pull request #451 from yenatch/document-battle-anim-macros 
Fix and document some battle animation macros
 2018-01-01 12:47:28 -05:00
yenatch 927e87eda5 AnimateEndOfExpBar palette constant 2018-01-01 04:40:30 -05:00
yenatch 92fba8821c
Merge pull request #450 from roukaour/master 
Constants for TextBoxFlags
 2017-12-30 21:32:45 -05:00
Remy Oukaour b40181db41 Use input constants 2017-12-30 12:35:50 -05:00
Remy Oukaour f01434f2c0 bgrows → * BG_MAP_WIDTH 
No dims macro
 2017-12-29 18:59:50 -05:00
xCrystal 2a7ba6685a Clean up changes in 3c6c80f 2017-12-29 19:22:33 +01:00
xCrystal 3c6c80f1b2 LY_BLANK and rLCDC constants 2017-12-29 18:53:21 +01:00
xCrystal 6464d077ee slot_reel offset constants 2017-12-29 16:48:47 +01:00
xCrystal ee5bf71640 Consistently name unknown fields in macros/wram as Fieldxx 2017-12-29 16:19:51 +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
Remy Oukaour 4c35f3ac85 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	macros/scripts/maps.asm
 2017-12-28 20:56:21 -05:00
xCrystal 50fc9c3389 endm -> ENDM 2017-12-28 22:31:16 +01:00
Remy Oukaour bb005694b3 Avoid unused labels 2017-12-28 14:42:56 -05:00
Remy Oukaour 84e22eb578 Consistent (x, y) coordinate formatting in map scripts 2017-12-28 14:31:25 -05:00
xCrystal 43a1e5b5ba Fix accidentally renamed constant 2017-12-28 20:27:44 +01:00
xCrystal bd783370f8 Consistent function name prefixes in slot machine code 2017-12-28 20:23:17 +01:00
xCrystal 83ef3b9a36 Suggest fixes to untranslated magikarp length filters 2017-12-28 20:03:27 +01:00
xCrystal d6507e3882 More constants and documentation in slot machines 2017-12-28 19:38:15 +01:00
Remy Oukaour fe92e4d848 Document design flaws 2017-12-28 11:28:23 -05:00
Remy Oukaour b373984ab9 Rename pokemon animation files (fix #439) 2017-12-28 11:05:42 -05:00
xCrystal 731311cb15 Update Magikarp length documentation 2017-12-28 16:42:57 +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 2c4777f336 05:OBPals+6*8 == 01:wCurMessageScrollPosition (new) 2017-12-28 00:56:45 -05:00
Remy Oukaour 2ae2ce4fde Use constant 2017-12-27 20:43:56 -05:00
Remy Oukaour e3e64fdf59 Move more decoration data to data/ 2017-12-27 11:56:03 -05:00
Remy Oukaour e614dd1278 gfx/pokemon/animation.asm → engine/pic_animation.asm 
Correct comment in constants/pokemon_constants.asm
 2017-12-27 01:58:36 -05:00
Remy Oukaour 7a4d641251 Remove redundant data/ filename prefixes 2017-12-27 01:29:15 -05:00
Remy Oukaour 86fd37af16 Move events/ to engine/events/ 2017-12-27 00:09:12 -05: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 172dba3c0b Rename some sections 
engine/battle_tower.asm fits better in events/
 2017-12-26 22:57:19 -05:00
Remy Oukaour dae16acd6f event/ → events/, and move some appropriate engine/ files there 2017-12-26 21:55:57 -05:00
Remy Oukaour b3f0e11567 Various cleanup 2017-12-26 20:33:41 -05:00
Remy Oukaour 8259136911 Name mail graphics 2017-12-26 20:02:00 -05:00
Remy Oukaour 9bc680bd6d Battle animation data is like sprite animation data 2017-12-26 19:27:56 -05:00
Remy Oukaour 35a3a19fda Use "battle_anims" and "sprite_anims" for clarity, not just "anims" 2017-12-26 18:45:04 -05:00
Remy Oukaour b5417fafec Split battle/ into data/ and engine/ components 2017-12-26 17:47:05 -05:00
Remy Oukaour 38b84c5b11 Remove unused label (last few commits resolve #434) 2017-12-26 13:00:23 -05:00
Remy Oukaour 4d18bb2eda Rename: gfx/pics → gfx/pokemon 2017-12-26 12:55:02 -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 17f45b5c95 MAX_LEVEL = 255 should still compile 2017-12-25 15:46:24 -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
Remy Oukaour da2b01a36c Clean up color/palette code 2017-12-25 12:41:31 -05:00
Remy Oukaour c6b12b07b3 Group Pokérus files in engine/pokerus/ 2017-12-24 20:11:03 -05:00
Remy Oukaour aeee49d29b Change a few Unknown labels 2017-12-24 20:07:23 -05:00
Remy Oukaour 148fd299f9 Add more constants for some maximum values 2017-12-24 19:49:57 -05:00
Remy Oukaour 7d4486e6a3 Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present) 
engine/routines/ stores isolated out-of-context routines as individual files. It might be preferable later to append them to their related engine/ files in unique little SECTIONs, relying on the linkerscript to place them appropriately; or some other organization method. In the meantime, they're now easily findable apart from main.asm's other content.
 2017-12-24 19:35:35 -05:00
Remy Oukaour 040aa7cb17 LoadEDTile → CopyTilemapAtOnce (fix #345) 2017-12-24 18:11:17 -05:00
Remy Oukaour 0a1fef45fd Rename maps: 
- Underground -> UndergroundPath
- Route5UndergroundEntrance -> Route5UndergroundPathEntrance
- Route6UndergroundEntrance -> Route6UndergroundPathEntrance

- WarehouseEntrance -> GoldenrodUnderground
- UndergroundWarehouse -> GoldenrodUndergroundWarehouse
- UndergroundPathSwitchRoomEntrances -> GoldenrodUndergroundSwitchRoomEntrances
 2017-12-24 18:06:12 -05:00
Remy Oukaour b805d343f3 Merge branch 'master' of https://github.com/pret/pokecrystal 2017-12-24 17:30:29 -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 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
mid-kid cbec3771e2 Misc fixes for the usage of constants 
Several improvements that will make it easier to edit some data
structures for everyone.
 2017-12-24 14:42:13 +01:00
yenatch c51968f0de Merge remote-tracking branch 'origin/master' into master 2017-12-23 17:14:09 -05:00
Remy Oukaour 1d2df3bba1 Some more WRAM cleanup 2017-12-23 11:34:55 -05:00
Remy Oukaour ff4d25eee3 Include bugfix in comments 2017-12-21 12:11:35 -05:00
Remy Oukaour 02609940db Document one more bug 2017-12-21 11:43:41 -05:00
Remy Oukaour 2fa1e97aeb Document two more bugs 2017-12-19 19:04:56 -05:00
Remy Oukaour 25a3960646 Move some more main.asm routines into individual files 2017-12-16 19:00:50 -05:00
Remy Oukaour 05d49f7d75 Move more code out of main.asm 2017-12-16 12:49:43 -05:00
Remy Oukaour bd6dc94da0 Move tileset-specific palette code into tilesets/ 2017-12-16 00:52:16 -05:00
Remy Oukaour fbf931f5d3 Ad some more constants for meaningful audio WRAM bits 2017-12-16 00:50:03 -05:00
Remy Oukaour cbde91d7ed Only engine/decorations.asm uses PadCoords_de 2017-12-15 23:59:24 -05:00
Remy Oukaour 5aac8afae7 PLAYER_SLIP → PLAYER_SKATE (probably used for the beta skateboard; DoPlayerMovement.BikeCheck returns true for it) 2017-12-15 23:29:42 -05:00
surskitty c883ab4d34 Reorganising phone stuff. 2017-12-15 23:06:53 -05:00