luckytyphlosion
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -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
a849c3557b
More comments
...
Fix some constants
2018-01-09 15:39:48 -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
6f0b81504d
More unreferenced labels cleanup
2018-01-02 16:04:21 +01:00
xCrystal
333524f0be
Lowercase v for VRAM addresses
2017-12-28 13:32:33 +01:00
Remy Oukaour
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
Ben10do
e6ea1889fb
Replace ‘jp [hl]’ with ‘jp hl’
...
The former is arguably misleading (as you don’t access the memory location in hl to retrieve the jump location), and is consequently deprecated in newer versions of rgbds.
This fix silences these deprecation warnings.
2017-06-09 22:01:10 +01:00
pikalaxalt
ae36ef2c7f
Labeled every function in ROM0 that's referenced in the source
2016-05-10 12:31:49 -04:00
pikalaxalt
6be4cd4da9
Local labels starting with lowercase letters are no longer decorated with a trailing colon
2016-04-10 15:01:49 -04:00
pikalaxalt
bf73772a56
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 14:42:14 -04:00
PikalaxALT
599e6e8d16
Battle animation annotations
2016-03-01 22:31:21 -05:00
PikalaxALT
80aba7fc13
maptrigger macro
2016-01-05 08:46:37 -05:00
PikalaxALT
a5e928eb98
writebackup --> closewindow; game corner prize vendors; others
2015-12-24 22:58:42 -05:00
PikalaxALT
30b37da387
More stats screen shenanigans
2015-12-22 22:19:33 -05:00
PikalaxALT
047effba94
Menu joy flags; started with link address space
2015-12-20 12:54:08 -05:00
PikalaxALT
987ed1fafb
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 14:48:30 -05:00
PikalaxALT
3d36f1a837
Events and some WRAM cleanup
2015-12-18 20:07:09 -05:00
PikalaxALT
d644406f61
More menu stuff
2015-12-17 22:31:16 -05:00
PikalaxALT
879b430fce
Bill's PC
2015-12-16 12:36:58 -05:00
PikalaxALT
77ef8404a1
Menu
2015-12-15 18:59:49 -05:00
PikalaxALT
acd92eee94
Pack
2015-12-13 14:15:16 -05:00
PikalaxALT
01792e00d2
Rename several script commands
2015-11-25 10:16:29 -05:00
PikalaxALT
91f7491017
items/item_effects.asm; engine/evolution.asm
2015-11-18 18:35:44 -05:00
PikalaxALT
042fc4bfe5
Split up some more banks in main.asm
2015-11-16 21:46:36 -05:00
PikalaxALT
91068077f0
Further split bank 4
2015-11-11 16:15:06 -05:00
PikalaxALT
d13fb46d40
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 16:53:37 -05:00
PikalaxALT
6a570ebb8e
more battle core labels
2015-11-07 21:04:54 -05:00
PikalaxALT
cf5d726b7f
Mon submenu, engine/menu.asm
2015-11-04 14:02:11 -05:00
PikalaxALT
72af3337fd
No more NONE
2015-11-02 14:37:02 -05:00
PikalaxALT
6b2d0ae841
Fix merge conflicts
2015-11-01 18:19:52 -05:00
PikalaxALT
31c407bb3d
Buena local labels
2015-11-01 12:44:30 -05:00
PikalaxALT
ed29db5841
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-29 23:32:11 -04:00
JimB16
9a9cb38e39
merge with newest update
2015-10-26 03:26:53 +01:00
PikalaxALT
4d17f6e1f6
Address comments on PR 322
2015-10-24 19:49:19 -04:00
PikalaxALT
119d6b4119
About time I got to these functions
2015-10-24 10:39:52 -04:00
PikalaxALT
52605b764a
Add commented numbers to map/group constants
2015-10-17 21:26:38 -04:00
PikalaxALT
f53d65c536
Battle intro animation function
2015-10-17 17:18:52 -04:00
PikalaxALT
4fa6c6daa4
Split up bank 2; other relabelings
2015-10-16 13:35:43 -04:00
JimB16
0001c688d3
found functions that determine next OTPkmn
2015-09-12 04:21:00 +02:00
JimB16
a7cb2a5e9b
changed more labels
2015-09-10 01:27:07 +02:00
PikalaxALT
c8960dd2c8
Various annotations
...
Annotated the SGB functions in predef/sgb.asm, and some of the map scripts. Renamed several functions in home. Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
2015-07-22 15:57:02 -04:00
PikalaxALT
471492b775
Reverted ld_hl_pointer macro
2015-07-20 22:18:18 -04:00
PikalaxALT
bef792f2d2
More label updates, moved predefs to new file
...
Also named most of the engine and event flag constants.
2015-07-20 03:51:52 -04:00
PikalaxALT
94129b6b45
Finished the decoration attributes table
...
Interpretation of the Decoration Attributes table is complete.
Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.
2015-07-19 04:58:31 -04:00
PikalaxALT
60cd04b023
Trainer data structure and field move functions
...
Trainer data in map scripts is now a macro-defined structure.
Field move functions in main.asm are now nearly completely annotated, with local references.
Trailing white space deleted.
2015-07-18 23:45:39 -04:00
