Rangi
335c2699f0
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# constants/map_constants.asm
# constants/wram_constants.asm
# data/radio/oaks_pkmn_talk_routes.asm
# data/radio/pnp_hidden_places.asm
# engine/battle/core.asm
# engine/breeding.asm
# engine/phone/phone_scripts.asm
# engine/radio.asm
# maps/BattleTower1F.asm
# maps/OlivineLighthouse2F.asm
# maps/OlivineLighthouse6F.asm
# maps/PokemonFanClub.asm
# maps/RadioTower1F.asm
# maps/RadioTower2F.asm
# maps/Route30BerryHouse.asm
# maps/Route34IlexForestGate.asm
# maps/Route36NationalParkGate.asm
# maps/RuinsOfAlphKabutoChamber.asm
# maps/RuinsOfAlphResearchCenter.asm
# maps/VermilionPort.asm
# maps/VictoryRoad.asm
2018-02-25 20:39:54 -05:00
mid-kid
e8bc86d1fe
Pkmn -> Mon
...
Since we're aiming for consistency across the codebase, I believe it
includes a uniform way to refer to the creatures this game consists of
in the labels of the code.
The only exceptions to this rule are labels referring to things named
through the use of the <PK><MN> or <PKMN> characters, in which case PKMN
is used.
Most of this was already consistent enough™, I just picked the
convention with the most occurences and fixed the outliers.
2018-02-22 17:39:06 +01: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
luckytyphlosion
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
Rangi
682548493b
Struct macros should have their main label outside the macro
2018-01-23 11:40:32 -05:00
Remy Oukaour
05382d3e3c
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 12:25:55 -05:00
Remy Oukaour
8127d1fbcf
Rename BATTLETOWER_NROF constants
2018-01-20 12:05:16 -05:00
Remy Oukaour
bf074f3598
map_header → map_def; map_header_2 → map_data
2018-01-16 23:25:00 -05:00
Remy Oukaour
546f1f7115
Correct spacing
2018-01-10 22:34:22 -05:00
Remy Oukaour
47e4f21e62
Keep memory map values in hardware_constants.asm
2017-12-26 23:18:05 -05:00
Remy Oukaour
5d229dcef2
Copy sram.asm's global start/end constants for wram.asm and vram.asm
2017-12-26 23:07:46 -05:00
Remy Oukaour
e44640b008
Move more main.asm code into individual files
2017-12-15 21:22:26 -05:00
Remy Oukaour
e48a401290
Reorganize macros
2017-12-14 00:36:24 -05:00
mid-kid
df118afbca
Move all of constants/sram_constants.asm into sram
...
This way we can easily use `BANK()` where appropriate, and it is more
tidy.
2017-11-20 23:07:24 +01:00
PikalaxALT
0e470bc785
Fix section linking
...
Create linker script and float all sections
2017-09-23 23:04:10 -04:00
Ben10do
288902139f
Revert "Fix floating sections"
...
This reverts commit e28b88f56d
2017-03-24 11:51:03 +00:00
AntonioND
e28b88f56d
Fix floating sections
...
This is needed so that rgblink doesn't move them around after modifying
it's placement algorithm.
Signed-off-by: AntonioND <antonio_nd@outlook.com>
2017-03-15 00:52:26 +00:00
pikalaxalt
3713b71d9e
More splitting of main.asm; remove unneeded rept 2
2016-05-04 11:46:23 -04:00
pikalaxalt
93e12d2003
Split up banks 1-3 of main.asm
2016-03-27 12:47:28 -04:00
PikalaxALT
599e6e8d16
Battle animation annotations
2016-03-01 22:31:21 -05:00
PikalaxALT
b272c0c375
Fix marts using hard-coded bank number
2016-01-27 12:25:12 -05:00
PikalaxALT
7cc2571529
Finish function labels in battle core
2016-01-13 00:39:41 -05:00
PikalaxALT
e83a5bae87
Address some comments from padz
2015-12-05 08:08:01 -05:00
PikalaxALT
92a8c491c3
Break up engine/sprites.asm; address yenatch's comments
2015-12-01 21:54:11 -05:00
PikalaxALT
c7985e1f3c
Battle Tower scripts and text labels
2015-11-26 21:05:32 -05:00
PikalaxALT
f599e477fc
Partial interpretation of battle tower trainer data
2015-11-24 15:18:44 -05:00
PikalaxALT
58020fb5f6
trade animation
2015-11-23 00:21:21 -05:00
PikalaxALT
812976cee6
bgcoord
2015-11-20 11:47:52 -05:00
PikalaxALT
1ff37608b6
Update mail struct labels
2015-11-18 13:29:30 -05:00
PikalaxALT
6d47be8d8c
Fruit tree constants, more mail engine
2015-11-18 10:42:42 -05:00
PikalaxALT
bc1870e3f4
Save, Bill's PC
2015-11-17 23:29:14 -05:00
PikalaxALT
27ef600ace
Here's the mail it never fails
2015-11-17 17:56:49 -05:00
PikalaxALT
fb88b2ccf8
Movement constants, script stack
2015-11-16 11:53:26 -05:00
PikalaxALT
b1e63485d8
Resolve s1 addresses in battle/core.asm
2015-11-10 18:17:04 -05:00
PikalaxALT
eb39f6a339
Move MON_* parentheses to the EQUS declaration
2015-11-07 13:05:58 -05:00
PikalaxALT
adf2fe712d
Various labels
2015-11-05 14:06:03 -05:00
PikalaxALT
739bb3c136
Replace party struct relative values with EQUS constants
2015-11-04 11:31:00 -05:00
PikalaxALT
c5527a02ae
dbw BANK, addr replaced with dba
2015-11-03 19:43:47 -05:00
PikalaxALT
010b450834
Prepare to merge
2015-11-01 18:13:31 -05:00
PikalaxALT
119d6b4119
About time I got to these functions
2015-10-24 10:39:52 -04:00
PikalaxALT
f53d65c536
Battle intro animation function
2015-10-17 17:18:52 -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
d338a092c5
Revert sPlayerID
2015-10-13 17:40:18 -04:00
PikalaxALT
12f9dca7a5
Final descriptive label in tilesets/animations.asm
2015-10-13 14:29:34 -04:00
PikalaxALT
d42330ed8b
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 18:00:12 -04:00
PikalaxALT
2770cfc354
soft reset
2015-10-04 14:14:51 -04:00
