Commit graph

216 commits

Author SHA1 Message Date
Rangi
f37cf959c9 Clean up some data, using macros for multiline list entries 2020-07-14 13:32:09 -04:00
Rangi
4a7d1513f3 Use 'tile' and 'tiles' macros 2020-07-07 16:21:26 -04:00
Rangi
13129459f1 Sync coordinate macros with pokecrystal 2020-07-07 11:30:10 -04:00
Rangi
45ed05decf Use HIGH() and LOW() 2020-07-07 11:10:29 -04:00
Rangi
06db7ec55b callba/callab -> farcall/callfar; jpba/jpab -> farjp/jpfar 2020-07-06 21:18:22 -04:00
Rangi
77ed5f3820 Use ASCII quotes in comments 2020-07-06 21:15:12 -04:00
Rangi
dd08b8dd6b Use labels for HRAM and VRAM 2020-07-06 21:13:17 -04:00
Rangi
772fcc7588 Specify the ldh instruction, don't turn ld into ldh 2020-07-06 19:03:05 -04:00
Rangi
9c2be80bf3 text_linkpromptbutton -> text_waitbutton
Fixes #260
2020-07-06 12:40:36 -04:00
Rangi
405889193e TM/HM constants named after moves 2020-07-05 22:52:27 -04:00
Rangi
5fe8aab344 db $f6 == script_cable_club_receptionist 2020-07-05 19:55:03 -04:00
Rangi
2b2ed54bbf Identify wSpriteStateData1 and wSpriteStateData2 offsets, like pokeyellow 2020-07-05 17:51:29 -04:00
Rangi
139a28ff99 Port pokecrystal's formatting of text commands and special characters 2020-07-04 21:14:46 -04:00
Rangi
e4e0af4d67 Remove remaining raw $xxxx values, and replace "+ -1" with "- 1" (supported by rgbds 0.4.0) 2020-07-04 01:00:45 -04:00
Rangi
6ef36800b0 Replace raw hex values with HRAM constants
To do: turn constants into labels and use ldh
2020-07-03 22:22:09 -04:00
Rangi
35deb77113 H_CONSTANTNAMES -> hConstantNames 2020-07-03 19:59:41 -04:00
Rangi
64da1f5d6b Move graphics-only object file sources into gfx/
Previously this wasn't working, but now the Makefile uses pokegold's technique for running scan_includes.

It also enables and fixes some rgbds warnings ("Non-local labels without a colon are deprecated").
2020-07-03 17:32:21 -04:00
Rangi
9878f01e29 Organize macros/ like pokecrystal
While doing so I replaced the StopAllMusic macro with a SFX_STOP_ALL_MUSIC constant and applied it throughout the code.
2020-07-03 16:37:47 -04:00
Rangi
d5089d3c62 Organize gfx/ 2020-06-27 21:43:32 -04:00
Rangi
4b853ad676
Separate maps.asm, pics.asm, sprites.asm, and tilesets.asm from main.asm (#251)
Each new file builds its own .o, along with separate main.o and home.o, which necessitates many more "exported::" labels.
2020-06-27 15:32:24 -04:00
Matt
aa030e9673 change input hex to constants 2020-05-05 21:42:40 -04:00
Matt
1978a37e19 document vermilion gym 2020-05-05 21:28:19 -04:00
Matt
8210dca8e5 label npc conditional text 2020-05-03 14:41:11 -04:00
Matt
6ec4b00b52 clean up vermilion labels 2020-05-03 14:25:01 -04:00
Matt
b6aa26ffa4 label hardcoded HRAM address, start documenting Vermilion 2020-05-03 02:00:01 -04:00
Daniel Harding
5048f24816
Merge pull request #223 from pret/audio-macros
Audio macros
2020-02-05 17:59:01 -06:00
deak311andris
71090c1349 Deobfuscate Pewter city 2019-10-07 15:53:27 +02:00
deak311andris
1aa28afad4 Deobfuscate Viridian City 2019-10-07 15:45:45 +02:00
deak311andris
2e45c2946a Deobfuscate gyms consistently 2019-10-07 07:23:57 +02:00
deak311andris
8d2afb7c13 OaksLab deobfuscation 2019-10-03 15:19:30 +02:00
dannye
20c4116788 Update audio macro names
change audio channel numbers from 0-7 back to 1-8
change all note macros back to single note macro
todo: fix comments with old macro names, update noise macros/instrument names
2019-07-27 23:21:39 -05:00
Rangi
092be231cc Merge branch 'master' of https://github.com/pret/pokered 2019-07-07 00:44:30 -04:00
Rangi
f99a715fae Replace some hard-coded values with constants 2019-07-07 00:44:21 -04:00
SatoMew
df2a68d6de Replace the few instances of Unknown Dungeon with Cerulean Cave 2019-04-08 18:47:31 +01:00
Rangi
c779602459 Rename map files, labels, and constants to be consistent and work with Polished Map 2019-01-01 23:33:10 -05:00
luckytyphlosion
c085aa4a2a Fix spritestatedata macros to be prefixed with w. 2018-11-18 17:54:46 -05:00
xCrystal
237aeb8fbd Add space between arguments in assembly instructions and remove redundant a in instructions like add a, x 2017-12-30 01:54:27 +01:00
Matthew Glazar
d51dcc263e Remove duplicate OaksLabText labels
For unknown reasons, the text pointer list for Oak's Lab is
duplicated. This is currently implemented by treating the
two text pointer lists as one large list. This leads to
duplicate labels and some confusing logic.

Refactor the code to treat the two text pointer lists
separately. This lets us remove several labels. It also
makes the code which sets the text pointer list
self-documenting.
2017-04-02 13:32:21 -07:00
YamaArashi
77c3e22a4e use more HRAM constants 2016-10-29 10:32:03 -07:00
dannye
5207a14af3 Redo audio header macro 2016-07-27 22:08:13 -05:00
dannye
70dde9d96b Clean up redundant labels
fix trainer header numbering
2016-07-20 00:40:04 -05:00
dannye
80bae03975 Clean up text commands 2016-07-18 01:17:03 -05:00
dannye
a51037eeee Remove the last address comments
except for wram.asm and sram.asm
also delete unused yellow file
2016-06-12 02:19:44 -05:00
dannye
48e0125bd6 Remove some leftover address comments 2016-06-12 01:42:19 -05:00
YamaArashi
7f34e28f24 remove address comments 2016-06-11 17:24:04 -07:00
pikalaxalt
d8dae96f35 Implement handy text macros from yellow 2016-06-09 21:20:02 -04:00
pikalaxalt
a2f7701f34 Merge branch 'master' of https://github.com/pret/pokered 2016-06-09 20:45:02 -04:00
IIMarckus
3425fd6ef8 Sync somewhat with pokeyellow. 2016-06-08 05:45:50 -06:00
IIMarckus
674b4dcc4a Remove the Beach House option. 2016-06-07 23:55:55 -06:00
pikalaxalt
0d687ba25a TX_SFX_KEY_ITEM and mapconst macro 2016-05-30 09:08:40 -04:00
pikalaxalt
31b118ab42 Merge branch 'master' of https://github.com/pret/pokered 2016-05-13 17:59:46 -04:00
IIMarckus
adc6a3aac7 Clean up script labels in marts and Pokémon Centers. 2016-04-08 19:04:36 -06:00
IIMarckus
72790bcbac Clean up labels and trainer headers for overworld Pokémon. 2016-04-06 20:58:45 -06:00
PikalaxALT
1980a5befc Macrofy sprite status data in WRA0 2016-01-29 11:20:47 -05:00
PikalaxALT
28dc5686b0 Fix game time labels 2016-01-03 14:18:33 -05:00
Marcus Huderle
1a5a108bdf Label elite four scripts more completely. 2015-12-18 20:03:09 -08:00
dannye
351146024b Fewer underscores in constants 2015-12-14 22:09:30 -06:00
dannye
38065a744d No more W_ 2015-08-30 21:38:41 -05:00
YamaArashi
30063216cd use the new battle type constants 2015-08-29 23:35:58 -07:00
YamaArashi
b6a7e5e9cf documented flags and misc. fixes 2015-08-29 17:15:05 -07:00
YamaArashi
696cffd3ae item name length constant 2015-08-14 04:11:53 -07:00
YamaArashi
b6ac1018c2 add border constant and clear up misnomer 2015-08-14 02:46:12 -07:00
YamaArashi
132d036752 named more variables 2015-08-12 22:14:31 -07:00
dannye
fb0a630c06 More joypad constants 2015-08-11 00:34:32 -05:00
dannye
4aedff0217 Replace hardcoded name lengths with NAME_LENGTH 2015-08-10 23:51:20 -05:00
dannye
dfc152d667 No more $C8
Use OPP_ constants separate from trainer constants since
valid opponents can be all Pokemon and trainers
2015-08-10 11:09:16 -05:00
dannye
dfa266f05c Use constants for elevator floors 2015-08-10 10:03:55 -05:00
dannye
66bc517605 Merge branch 'master' of https://github.com/YamaArashi/pokered 2015-08-10 00:00:12 -05:00
dannye
8a6d46f3d9 Replace some hardcoded data sizes 2015-08-09 23:56:20 -05:00
YamaArashi
2b01815999 commented audio code 2015-08-08 22:32:44 -07:00
YamaArashi
525f1b96f3 named CountSetBits output variable 2015-08-07 04:24:06 -07:00
dannye
f8a9c37a00 Use more lb
and other clean up
2015-08-05 16:25:58 -05:00
YamaArashi
93255d6d17 yet more naming 2015-07-25 19:26:54 -07:00
YamaArashi
7f6d0d49b6 more naming variables 2015-07-24 20:27:59 -07:00
YamaArashi
82512e4491 named animation functions/variables 2015-07-24 14:39:45 -07:00
YamaArashi
e6d02b4b7b make route22 rival events more consistent 2015-07-23 21:20:20 -07:00
YamaArashi
6af65df2fc named function 2015-07-23 21:00:30 -07:00
YamaArashi
04a6c306dc clean up wram aliases 2015-07-23 06:07:44 -07:00
Daniel Harding
c34156c5fb Merge pull request #107 from YamaArashi/master
enumerate events
2015-07-22 10:24:00 -05:00
dannye
a6f04b4349 Unify audio bank references
2→1
8→2
1f→3
2015-07-22 10:22:46 -05:00
YamaArashi
dcc7f3bc9f named more constants 2015-07-21 14:21:14 -07:00
YamaArashi
73171bfff5 named most of the used events 2015-07-21 10:36:03 -07:00
YamaArashi
fd2b4b6c74 gym leader events 2015-07-20 19:41:23 -07:00
YamaArashi
fcab935a0f enumerate events 2015-07-20 18:32:26 -07:00
YamaArashi
db7d941d22 constants for flag actions 2015-07-19 20:45:34 -07:00
YamaArashi
1d86932cc9 naming 2015-07-19 17:52:26 -07:00
YamaArashi
e607199397 replace uses of minus one 2015-07-19 14:01:08 -07:00
YamaArashi
02bd91b707 jpab/jpba macros 2015-07-19 11:56:13 -07:00
dannye
64b4cf624f Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
	engine/evos_moves.asm
	engine/overworld/healing_machine.asm
2015-07-19 03:52:20 -05:00
dannye
ea9cc86949 Name sound effects 2015-07-19 03:46:12 -05:00
YamaArashi
d0526c0362 small changes 2015-07-18 22:34:11 -07:00
YamaArashi
c169073eed misc 2015-07-18 21:58:55 -07:00
dannye
148d3f3cf2 Consolidate coord macros 2015-07-18 15:52:03 -05:00
YamaArashi
fc9af362ae fix variable naming 2015-07-18 08:17:46 -07:00
YamaArashi
6931ce9625 money / coins hram constants 2015-07-17 01:22:00 -07:00
dannye
fb559f1f4e More direction constants
facing directions, npc movement, joypad
2015-07-17 02:52:25 -05:00
dannye
40ea6a5f75 Merge branch 'master' of https://github.com/iimarckus/pokered 2015-07-16 23:27:57 -05:00
dannye
4670a1ddae Swap trade center and battle center
also rename battle center to colosseum
closes https://github.com/iimarckus/pokered/issues/102
2015-07-16 23:21:57 -05:00
YamaArashi
bd7d981593 menu stuff 2015-07-15 20:04:58 -07:00
YamaArashi
ac78dda7d8 more movement stuff 2015-07-15 13:58:21 -07:00