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 |
|