Remy Oukaour
9576740b70
clean up GetName/NamesPointers
2018-01-19 00:29:05 -05:00
Remy Oukaour
7b3de85a06
Avoid "+- 1" at every maskbits
2018-01-16 17:27:50 -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
17f34cb29c
Disambiguate some uses of wcf64/5/6
2018-01-11 15:36:11 -05:00
Remy Oukaour
94d6a32721
Use maskbits some more
2018-01-11 14:27:19 -05:00
Adelaide Walter
cd8a22cd2e
Replace magic reference to PackMenuGFX.
2018-01-03 01:29:52 -05:00
xCrystal
6f0b81504d
More unreferenced labels cleanup
2018-01-02 16:04:21 +01:00
xCrystal
def3b60493
Clean up .Jumptable: spaces
2017-12-29 13:52:42 +01:00
xCrystal
333524f0be
Lowercase v for VRAM addresses
2017-12-28 13:32:33 +01:00
xCrystal
9457679af8
Prefix engine_flags wram addresses with w
2017-12-28 13:15:46 +01:00
Remy Oukaour
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
Remy Oukaour
25a3960646
Move some more main.asm routines into individual files
2017-12-16 19:00:50 -05:00
Remy Oukaour
31901f73b0
Move some gfx/misc/ files into meaningful directories
2017-12-09 22:57:41 -05:00
mid-kid
a1fc73603e
Label all of PARTYMENUACTION_*
...
It's pretty clear what it's used for.
PartyMenuActionText is used for two things:
1) Storing what kind of action we're going to do (<$10)
2) Storing the text for some kind of healing stuff I'm not entirely sure (>=$f0)
In the former case, if GetPartyMenuTilemapPointers is ran, it will be
used to pick a sequence of actions that should be done, specified in the
table, and it'll print the corresponding string using the
PartyMenuStrings table. The items in the sequence of actions that should
be done are in WritePartyMenuTilemap.
Strangely enough, one possible value is left completely unused:
PARTYMENUACTION_GIVE_MON_FEMALE. It works in the exact same way as it's
male counterpart, and as such I don't believe it was used in the
japanese version either, since it doesn't matter which gender your 'mon
is when you put 'em in the daycare.
2017-11-30 20:35:58 +01: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
3713b71d9e
More splitting of main.asm; remove unneeded rept 2
2016-05-04 11:46:23 -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
f030315b1f
jumptable macro repurposed
2015-12-26 21:59:03 -05:00
PikalaxALT
a5e928eb98
writebackup --> closewindow; game corner prize vendors; others
2015-12-24 22:58:42 -05:00
PikalaxALT
2a2222476a
Split up anim objects into several files
2015-12-24 14:07:33 -05:00
PikalaxALT
d08199c79d
Color fns, some more address decoding in link/mobile
2015-12-22 18:03:00 -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
77ef8404a1
Menu
2015-12-15 18:59:49 -05:00
PikalaxALT
259c155187
Pack; buy, sell, toss
2015-12-13 17:11:58 -05:00
PikalaxALT
acd92eee94
Pack
2015-12-13 14:15:16 -05:00
PikalaxALT
d972564175
link and seer labels
2015-11-23 16:04:53 -05:00
PikalaxALT
8a6a1a7d77
CmdQueues
2015-11-18 23:16:25 -05:00
PikalaxALT
2ffcb4b490
More splits; map setup labels
2015-11-11 23:38:57 -05:00
PikalaxALT
b522b0f165
engine/mart.asm
2015-11-11 14:12:46 -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
PikalaxALT
c5527a02ae
dbw BANK, addr replaced with dba
2015-11-03 19:43:47 -05:00
PikalaxALT
b1dc88b728
Experience and level calculations
2015-11-03 12:36:33 -05:00
PikalaxALT
2faa4a0f70
Fix errors in global substitution
2015-11-03 07:11:32 -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
3b4805ee98
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 09:38:48 -05: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
6c25592b8c
So very jumb
2015-10-19 16:49:29 -04:00
PikalaxALT
0a244e043c
Move battle start animation functions to its own file
2015-10-19 10:23:58 -04:00
PikalaxALT
da7849d800
Restructured functions in main.asm to resemble the home functions they clone
2015-10-17 13:00:34 -04:00
PikalaxALT
4fa6c6daa4
Split up bank 2; other relabelings
2015-10-16 13:35:43 -04:00
