a1806d6e81
Consistent routine naming convention: 'Foo' wraps '_Foo'
2018-07-23 00:13:43 -04:00
1fc7430a2b
Fix misnamed character codes
...
Some character codes were erroneously named after their text command
counterparts. This has caused a lot of confusion with naming their
functions and with other things.
I've also removed the `dict2` macro and expanded the `dict` macro. This
really isn't something we should be doing for macros but I can't deny it
looks a lot neater than repeated code.
2018-07-18 10:55:30 +02:00
67d1364c7a
Fix triple newlines left over from removing address comments
2018-06-24 23:22:50 -04:00
9afaed9b8f
Remove more address comments
2018-06-24 21:39:23 -04:00
5efce10789
Remove even more address comments
...
That should be all of them this time
2018-06-25 02:10:37 +02:00
1d9a68dbdd
Remove all address comments
2018-06-24 16:13:22 +02:00
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
0b45e2e846
Fix wVirtualOAM labels, part 2.
2018-01-30 14:52:46 -05:00
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
f2ae74079f
Prefix wram labels with w, part 1.
...
Handle edge cases first.
2018-01-23 16:45:34 -05:00
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
c5cc23a35f
wGameTimerPause bit flag constants
2018-01-23 12:40:29 -05:00
4d8528f903
More engine flag constants
2018-01-22 14:34:55 -05:00
b071dd364f
Japanese characters in Japanese text (e.g. "ォ" not "," for $f4)
2018-01-19 21:49:16 -05:00
ddec0ee305
More Japanese characters
2018-01-19 20:48:33 -05:00
a3beba1e64
Use Japanese charmap definitions in strings
2018-01-18 20:49:17 -05:00
8048082114
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 14:39:28 -05:00
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
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
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
2ab60fa8a4
menu_coords macro for (x1, y1, x2, y2) order (see issue #440 )
2018-01-13 16:38:14 -05:00
0a3b251dcb
Arrays end with -1, not $ff
2018-01-10 22:53:42 -05:00
417937cffc
Resolve #461
2018-01-10 13:47:57 -05:00
d7970f749a
Consistent predef function names
2018-01-02 18:49:25 +01:00
37369d1ae0
Rename Pals labels in WRAM bank 5
2018-01-01 20:09:53 +01:00
333524f0be
Lowercase v for VRAM addresses
2017-12-28 13:32:33 +01:00
9457679af8
Prefix engine_flags wram addresses with w
2017-12-28 13:15:46 +01:00
b3f0e11567
Various cleanup
2017-12-26 20:33:41 -05:00
040aa7cb17
LoadEDTile → CopyTilemapAtOnce ( fix #345 )
2017-12-24 18:11:17 -05:00
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
d6dccb7df5
Use NAME_LENGTH_JAPANESE more
2017-12-21 11:56:33 -05:00
1038ebca5e
Move more contiguous related code blocks from main.asm to engine/ and events/
2017-12-15 20:10:54 -05:00
ebf3bfb6b2
Move some misc/ files into meaningful directories
2017-12-15 12:53:33 -05:00
Rangi