Commit Graph

65 Commits

Author SHA1 Message Date
Rangi e22670438e Badge type boosts make sense in data/types/ 2018-01-28 01:17:32 -05:00
Rangi 0cf4eb6895 Move-unique effect commands consistently go in engine/battle/move_effects/ 2018-01-26 11:36:00 -05:00
Rangi a0cc4a3392 Move power data belongs in data/moves/ 2018-01-26 11:01:15 -05:00
Rangi 87514598be More battle data in data/battle/ 2018-01-25 21:34:42 -05:00
Rangi d504fb8852 Move AI data tables into data/battle/ai (mirroring engine/battle/ai) so they're more discoverable. 2018-01-25 20:34:33 -05:00
Rangi 132fe46925 Rename some routines to avoid conflicts when removing "Special_" prefixes 2018-01-24 11:12:02 -05:00
Rangi ead103d2c6 MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440) 2018-01-23 16:08:43 -05:00
Rangi cb5e3378de Move type data to data/types/ 2018-01-22 16:23:34 -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 7cef012335 wUnlockedUnowns engine flag constants
Use local labels for "End"ings
2018-01-22 13:00:35 -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 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 f556ab9a4c Comment on RIVAL1 item 2018-01-18 12:03:58 -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
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
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 f1e1b26138 More gfx/**/*.pal files 2018-01-12 14:54:00 -05:00
Remy Oukaour 94d6a32721 Use maskbits some more 2018-01-11 14:27:19 -05:00
Remy Oukaour 0a3b251dcb Arrays end with -1, not $ff 2018-01-10 22:53:42 -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 417937cffc Resolve #461 2018-01-10 13:47:57 -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 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
Remy Oukaour 5a73a62d9b Move battle engine data into data/
IsJohtoGymLeader → IsGymLeader
2018-01-09 15:12:49 -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
xCrystal e9e8bf6eb1 Predef_Flag -> Predef_FlagAction 2018-01-05 11:05:01 +01:00
Adelaide Walter fb422e8d9c Use BANK for hardcoded WRAM banks preceding FarCopyWRAM/GetFarWRAMByte calls. 2018-01-04 14:53:50 -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 0caea0f820 Use BANK for all hardcoded banks with BANK in comments. 2018-01-02 16:46:40 -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 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