diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /home | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip | |
Add macros, constants, and labels for map scripts and text (#367)
This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
Diffstat (limited to 'home')
| -rw-r--r-- | home/overworld.asm | 2 | ||||
| -rw-r--r-- | home/text.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index a4e547bf..be1e6b24 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -5,7 +5,7 @@ HandleMidJump:: EnterMap:: ; Load a new map. - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a call LoadMapData farcall ClearVariablesOnEnterMap diff --git a/home/text.asm b/home/text.asm index b1f5e55c..836f3986 100644 --- a/home/text.asm +++ b/home/text.asm @@ -547,7 +547,7 @@ TextCommandSounds:: db TX_SOUND_GET_KEY_ITEM, SFX_GET_KEY_ITEM db TX_SOUND_DEX_PAGE_ADDED, SFX_DEX_PAGE_ADDED db TX_SOUND_CRY_NIDORINA, NIDORINA ; used in OakSpeech - db TX_SOUND_CRY_PIDGEOT, PIDGEOT ; used in SaffronCityText12 + db TX_SOUND_CRY_PIDGEOT, PIDGEOT ; used in SaffronCityPidgeotText db TX_SOUND_CRY_DEWGONG, DEWGONG ; unused TextCommand_DOTS:: |