0b31d12dac
Merge pull request #756 from mid-kid/master
...
Rub a dub dub, thanks for the grub
2020-08-18 16:35:15 -04:00
e0b783bb7b
Enable compatibility with upcoming RGBASM version
...
This is additionally required, because an `elif`'s condition is evaluated even
when it's about to be skipped over, and this `"\2"` will become an error
2020-08-18 13:41:59 +02:00
9d6ac04c9d
"<NULL>" -> 0, for 'and a'
2020-08-17 16:29:08 -04:00
328a6737db
Use ISCONST for future rgbds lexer compatibility
2020-08-17 13:02:49 -04:00
6f30d79620
TX_NUM -> TX_DECIMAL
2020-08-03 23:35:18 +02:00
b3bd682366
text_linkpromptbutton -> text_waitbutton
...
Removes support for text_waitbutton as a legacy alias for text_promptbutton.
2020-07-06 12:55:31 -04:00
e0d07fba3f
Sync PokeFluteTerminator with pokegold
2020-06-21 19:01:54 -04:00
91774f206e
Replace "Unreferenced" labels with "; unreferenced" comments
2020-06-21 16:27:43 -04:00
156f2cc3ef
Update some routine labels, including unreferenced ones
2020-05-18 11:59:48 -04:00
b69526a908
Miscellaneous fixes
...
Addresses the haircut brothers' probability comments in #709
2020-05-05 10:17:02 -04:00
26b8bf003e
Standardize on lowercase Tilemap and Attrmap
...
We used to have a mixture of TileMap and and Tilemap, as well as the
similar AttrMap. Standardize on one.
2020-02-13 18:31:10 +01:00
4d32035d4f
Bit 6 of PrintNum left-aligns numbers
2019-11-03 20:17:04 -05:00
4aeab6b879
Rename buttonsound to promptbutton
2019-11-03 12:48:54 -05:00
3e78e5b2b6
TextBox -> Textbox
...
Homogenizing names.
2019-04-09 16:09:18 +02:00
3202c4f3df
Resolve issue #575 : Rename text commands
2018-11-18 12:41:11 -05:00
940256569b
text_jump → text_far
...
The previous name for this was rather misleading. It isn't an actual
jump like you'd expect the `jp` instruction to behave as. Instead, it
behaves more like a `farcall`.
This also makes it consistent with its current command ID name of
`TX_FAR`.
2018-11-05 22:26:18 +01:00
eb1e3636bb
Use labels instead of constants for HRAM
...
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 14:28:22 -04:00
ffa63c51df
Clean up TX_ commands
...
Some of the TX_ commands didn't use the TX_ prefix for their
constants, and the label names were inconsistent. I've chosen to adopt
the `TextCommand_` prefix as opposed to `Text_`, as it has a clear
difference in namespace compared to the possibly-used `Text_` namespace
for actual dialogue text.
2018-07-18 10:55:30 +02: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
1caa50a647
No space between labels and bodies
2018-06-25 12:24:18 -04:00
67d1364c7a
Fix triple newlines left over from removing address comments
2018-06-24 23:22:50 -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
2a53d75807
Similar formatting for similar WRAM areas
2018-02-02 21:15:15 -05:00
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -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
e69544b61f
More Unicode
2018-01-19 02:30:19 -05:00
55d8de6c24
why "5A"?
2018-01-19 00:07:13 -05:00
105ef872dd
Better TX_SOUND_* names
2018-01-18 22:06:51 -05:00
a9f8aeb94e
Remove trailing whitespace
2018-01-18 21:48:52 -05:00
a3beba1e64
Use Japanese charmap definitions in strings
2018-01-18 20:49:17 -05:00
2acaa96cf1
More charmap and home/text.asm documentation for JP chars
2018-01-18 18:34:20 -05:00
6d20cf3e80
"CryHeader" → "Cry"; "Cry" → "MonCry"
2018-01-16 23:47:45 -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
d91e42ca5e
Group some mutually edited files in data/sprites/
2018-01-10 18:10:01 -05:00
9a3088e50c
Clean up XXX comments for unused content
2018-01-02 13:26:18 +01:00
92fba8821c
Merge pull request #450 from roukaour/master
...
Constants for TextBoxFlags
2017-12-30 21:32:45 -05:00
e1a672e427
Constants for TextBoxFlags
2017-12-29 13:18:17 -05:00
3c6c80f1b2
LY_BLANK and rLCDC constants
2017-12-29 18:53:21 +01:00
50fc9c3389
endm -> ENDM
2017-12-28 22:31:16 +01:00
7beb497d3a
Uppercase MACRO and EQU(S) according to the style guide
2017-12-28 13:23:44 +01:00
9457679af8
Prefix engine_flags wram addresses with w
2017-12-28 13:15:46 +01:00
c4a18b1329
Correct documentation
...
Split out text_constants.asm
2017-12-26 22:36:01 -05:00
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
fecc5c339a
More comments for macros
2017-12-15 00:38:52 -05:00
e48a401290
Reorganize macros
2017-12-14 00:36:24 -05:00
5b13a7a13b
Identify more sprite-related constants
...
Start more documentation
2017-12-12 13:22:19 -05:00
6a41d4f63e
Define more charmap characters and use them in place of hard-coded numbers
2017-12-09 12:57:23 -05:00
Rangi