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
mid-kid
066cc91b13
Fix some MenuData2 labels
...
Gave them better names, moved the flags out of the union, and documented
the w2DMenuFlags1.
2018-01-14 11:59:27 +01:00
Remy Oukaour
2b4a4ccaab
SaffronMagnetTrainStation
2018-01-12 02:33:06 -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
417937cffc
Resolve #461
2018-01-10 13:47:57 -05:00
Remy Oukaour
cc0fd6e12c
CRYSTAL11 → _CRYSTAL11
2018-01-09 17:26:40 -05:00
Remy Oukaour
d0a8e8e744
includes.asm → constants.asm
2018-01-09 00:36:15 -05:00
Adelaide Walter
9d0ba6bfd3
Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary).
2018-01-03 19:12:45 -05:00
Adelaide Walter
fb825a800e
Label MobileCrashCheckPointer and consolidate relevant functions.
2018-01-02 23:16:56 -05:00
Remy Oukaour
eb8e55a01a
Route 17-18 Gate and Route 29-46 Gate
2018-01-01 18:19:32 -05:00
xCrystal
37369d1ae0
Rename Pals labels in WRAM bank 5
2018-01-01 20:09:53 +01:00
Remy Oukaour
e1a672e427
Constants for TextBoxFlags
2017-12-29 13:18:17 -05: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
a45c6a558b
Better placement for wram address
2017-12-28 19:42:16 +01:00
xCrystal
d6507e3882
More constants and documentation in slot machines
2017-12-28 19:38:15 +01:00
Remy Oukaour
b373984ab9
Rename pokemon animation files ( fix #439 )
2017-12-28 11:05:42 -05:00
xCrystal
333524f0be
Lowercase v for VRAM addresses
2017-12-28 13:32:33 +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
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
9bc680bd6d
Battle animation data is like sprite animation data
2017-12-26 19:27:56 -05:00
Remy Oukaour
38b84c5b11
Remove unused label (last few commits resolve #434 )
2017-12-26 13:00:23 -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
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
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
3c37bfc6fa
Correct address comment
2017-12-23 12:17:11 -05:00
Remy Oukaour
2309396c88
Don't keep commented-out SECTION headers
2017-12-23 11:47:28 -05:00
Remy Oukaour
1d2df3bba1
Some more WRAM cleanup
2017-12-23 11:34:55 -05:00
Remy Oukaour
e44640b008
Move more main.asm code into individual files
2017-12-15 21:22:26 -05:00
Remy Oukaour
606817f18b
Add a map_connection_struct macro
2017-12-15 18:25:32 -05:00
Remy Oukaour
6ab1d028bb
Split items/ and trainers/ into their data/ and engine/ components
...
Move some data into a pokemon/ subdirectory
2017-12-14 23:00:54 -05:00
Remy Oukaour
79873a1bfc
Move pic animation documentation to docs/
...
Move growth rates to a data/ table
Name more SECTIONs
2017-12-11 23:44:29 -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
31cce83e9b
Move lots of data tables into individual data/ files
...
(This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
2017-12-11 14:23:18 -05:00
Remy Oukaour
c2ad79c4f2
Add constants for time-of-day boundaries
...
Split off more misc constants into proper files
2017-12-11 12:20:01 -05:00
Remy Oukaour
699495bfcb
Consistent capitalization for map names, matching their constants
2017-12-10 13:37:15 -05:00
Remy Oukaour
59ee673775
Consistent pointer labels in WRAM
2017-12-09 22:24:43 -05:00
Remy Oukaour
cd2a748128
More WRAM cleanup
2017-12-09 22:00:36 -05:00
Remy Oukaour
880fb511e1
More WRAM organization
2017-12-09 15:28:03 -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
512863989f
Document constants with comments, actual names, and more thorough usage
2017-12-09 02:15:46 -05:00
