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
Rangi
505a6595bc
EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481 )
2018-01-24 10:46:49 -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
09ff04dbfc
wMenuData3 → w2DMenuData
2018-01-23 16:38:52 -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
7c0553b2d2
x is the standard temp variable
2018-01-23 10:56:36 -05:00
Rangi
94ae404732
Separate data/mon_menu.asm
2018-01-23 10:46:26 -05:00
Rangi
0261bd2ff5
Daisy offers "grooming", not "massage"
2018-01-23 00:11:23 -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
f81add782a
$20 is BG_MAP_WIDTH
2018-01-22 19:29:22 -05:00
Rangi
fa3192e3da
No significance to what data is at the dummied-out broken pointers
2018-01-22 19:25:14 -05:00
Rangi
363d8b9242
KrissHouse → PlayersHouse
2018-01-22 19:10:09 -05:00
Rangi
f44b7ad5c3
Add data/text/
2018-01-22 17:33:52 -05:00
Rangi
cb5e3378de
Move type data to data/types/
2018-01-22 16:23:34 -05:00
Rangi
efe6981a0d
Add daily+weekly bit flags (close issue #429 )
2018-01-22 15:59:24 -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
Rangi
125d51b3b2
More engine bit flag constants
2018-01-22 13:57:44 -05:00
Rangi
f75bfbeac3
Actually use PLAYER_OBJECT
2018-01-22 13:25:49 -05:00
Rangi
e135091f09
Day-Care bit flags
2018-01-22 13:18:23 -05:00
Rangi
7cef012335
wUnlockedUnowns engine flag constants
...
Use local labels for "End"ings
2018-01-22 13:00:35 -05:00
Rangi
6ecf18aa52
Engine flag bit constants for wPokegearFlags
2018-01-22 12:03:18 -05:00
Remy Oukaour
5ddea59ec5
wGBCOnlyDecompressBuffer
2018-01-21 20:10:38 -05:00
Remy Oukaour
7f54df58bf
Group engine/pokedex files
2018-01-21 18:00:23 -05:00
Remy Oukaour
5e4fa42fa7
Unrelated routine gets its own file
2018-01-21 17:45:56 -05:00
Remy Oukaour
5db31feba9
POKEDEX_SCX
2018-01-21 16:53:19 -05:00
Remy Oukaour
81ba6c848a
cgb layouts
2018-01-21 14:05:32 -05:00
Remy Oukaour
a8eb44b6e3
Separate new_game graphics
2018-01-21 13:58:16 -05:00
Remy Oukaour
732bb36c86
Scale addresses with PARTY_LENGTH
2018-01-20 14:10:31 -05:00
Remy Oukaour
05382d3e3c
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 12:25:55 -05:00
Remy Oukaour
8127d1fbcf
Rename BATTLETOWER_NROF constants
2018-01-20 12:05:16 -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
ddec0ee305
More Japanese characters
2018-01-19 20:48:33 -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
9576740b70
clean up GetName/NamesPointers
2018-01-19 00:29:05 -05:00
Remy Oukaour
25048bd12d
wiggle → wobble
2018-01-19 00:16:08 -05:00
Remy Oukaour
2c7ca13194
Disambiguate "%" and "<NO>"
2018-01-18 22:30:30 -05:00
Remy Oukaour
a9f8aeb94e
Remove trailing whitespace
2018-01-18 21:48:52 -05:00
Remy Oukaour
17336221e6
newline before para
2018-01-18 21:15:59 -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
72c4f9e04a
More constants, related to map objects
2018-01-18 15:58:55 -05:00
Remy Oukaour
3bf8325edd
More accurate constant/label names
2018-01-18 15:06:43 -05:00
Remy Oukaour
69ace7f48d
Identify leftover SGB palettes from R/B
2018-01-18 12:31:19 -05:00
Remy Oukaour
f556ab9a4c
Comment on RIVAL1 item
2018-01-18 12:03:58 -05:00
Remy Oukaour
22fd1221f5
More .pal files
2018-01-18 11:37:05 -05:00
Remy Oukaour
226d1812b3
Only graphics data goes in gfx/
...
Introduce PALRGB_WHITE constant for $7fff
2018-01-18 11:16:24 -05:00
Remy Oukaour
95c0c31c8f
Eliminate wd000
2018-01-18 01:25:19 -05:00
Remy Oukaour
23f2c056e8
Heal machine jumptable index constants
2018-01-18 00:57:06 -05:00
Remy Oukaour
0306e94cc3
More SGB documentation
2018-01-18 00:16:03 -05:00
Remy Oukaour
c5d9ecae9c
More SGB documentation
2018-01-17 22:48:57 -05:00
Remy Oukaour
4161ec98b4
Partially document SGB data from pokered
2018-01-17 22:37:04 -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
01ba6bed88
Move code out of data/
2018-01-16 18:07:06 -05:00
Remy Oukaour
5407d8de92
Cleaner Pokédex code
2018-01-16 17:59:05 -05:00
Remy Oukaour
50ce0a219e
Fewer hard-coded values
2018-01-16 17:36:12 -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
2b82338920
Phone data 0/7 are time masks
2018-01-15 22:00:56 -05:00
Remy Oukaour
6c7e88513a
Long lists of db/dw series with struct-defining macros belong in data/
2018-01-15 14:11:11 -05:00
Remy Oukaour
9180362211
Move code out of gfx/ ( close #474 )
2018-01-15 11:06:32 -05:00
Remy Oukaour
9bb584798e
_Special_BugContestJudging → _BugContestJudging; HOF_Predef_AnimateFrontpic → Predef_HOF_AnimateFrontpic ( close #473 )
2018-01-15 10:55:44 -05:00
Remy Oukaour
911c1320a2
Document PredefPals still used by CGB layouts
2018-01-15 01:10:56 -05:00
Remy Oukaour
fe3ef73a8c
Group unused data
2018-01-15 00:44:40 -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
Remy Oukaour
8e1e583640
Close #470 (JOHTO_POKEMON)
2018-01-14 20:58:49 -05:00
Remy Oukaour
7a09fc9f75
GFX tile sizes in decimal
2018-01-14 19:43:35 -05:00
Remy Oukaour
eb3102200f
More Battle Tower map script constants, fewer raw hex values
2018-01-14 19:26:55 -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
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
2ab60fa8a4
menu_coords macro for (x1, y1, x2, y2) order (see issue #440 )
2018-01-13 16:38:14 -05:00
Remy Oukaour
0197e6f23c
Don't split stats gfx in three
2018-01-13 15:22:16 -05:00
Remy Oukaour
d054116458
Merge branch 'patch' of https://github.com/mid-kid/pokecrystal
...
# Conflicts:
# constants/sprite_anim_constants.asm
# data/sprite_anims/framesets.asm
# data/sprite_anims/oam.asm
2018-01-12 17:23:50 -05:00
Remy Oukaour
f1e1b26138
More gfx/**/*.pal files
2018-01-12 14:54:00 -05:00
Remy Oukaour
31caeeba3c
Separate more palettes into gfx/**/*.pal files
2018-01-12 14:41:42 -05:00
Remy Oukaour
960783cdf4
Label more ANIM_OBJ_* constants
2018-01-12 13:47:04 -05:00
mid-kid
5b7773b7d3
Label frameset 09
...
It seems to be used as the "big" text entry cursor (i.e. for the bottom
3 buttons in the text entry screen).
It is never referenced explicitly, instead used when adding 1 to
SPRITEANIMSTRUCT_0E, in NamingScreen_AnimateCursor.
2018-01-12 12:17:55 +01:00
Remy Oukaour
0e1148fb2c
Move code out of data/
2018-01-12 03:15:58 -05:00
Remy Oukaour
bdc95598d7
Easier to find palette data
2018-01-12 03:07:48 -05:00
Remy Oukaour
c6a4d35d57
npc_sprites.pal matches PAL_NPC constants
2018-01-12 02:56:14 -05:00
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
