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 |
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 |
Adelaide Walter
|
6c5cd7a963
|
Simplify comments per Rangi's rec.
|
2018-01-08 23:07:46 -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 |
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 |
Remy Oukaour
|
c66d195089
|
callba/callab → farcall/callfar
|
2017-12-24 12:47:30 -05:00 |
pikalaxalt
|
ae36ef2c7f
|
Labeled every function in ROM0 that's referenced in the source
|
2016-05-10 12:31:49 -04:00 |
pikalaxalt
|
e95d42e0af
|
All functions in main.asm have non-generic names
|
2016-05-08 14:11:24 -04:00 |
pikalaxalt
|
a613ed915c
|
HDMA transfer functions
|
2016-05-04 22:34:09 -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
|
30b37da387
|
More stats screen shenanigans
|
2015-12-22 22:19:33 -05:00 |
PikalaxALT
|
630d789c70
|
More link trade shenanigans
|
2015-12-21 14:10:16 -05:00 |
PikalaxALT
|
047effba94
|
Menu joy flags; started with link address space
|
2015-12-20 12:54:08 -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
|
b9870541d4
|
slot machines
|
2015-12-10 22:26:31 -05:00 |
PikalaxALT
|
01792e00d2
|
Rename several script commands
|
2015-11-25 10:16:29 -05:00 |
PikalaxALT
|
d13fb46d40
|
enum macros/move_anim.asm, resolve battle/anims.asm function labels
|
2015-11-10 16:53:37 -05:00 |
PikalaxALT
|
cf5d726b7f
|
Mon submenu, engine/menu.asm
|
2015-11-04 14:02:11 -05:00 |
yenatch
|
9f53825ce2
|
move common asm from engine/ to common/
engine/ was getting really bloated and common asm wasnt what it was made for
|
2013-09-07 23:38:19 -04:00 |
yenatch
|
340e31d839
|
split menu functions into engine/menu.asm
|
2013-09-03 18:43:15 -04:00 |