diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-02 21:26:20 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-02 21:26:20 -0400 |
| commit | 04883f4bf9fa6c0bf935f1aac95d5d48abe3bb30 (patch) | |
| tree | 3ff95e7bbb62d0decfb9e2cba9e3d54f61013706 /engine | |
| parent | 956d010d59ad225bea768aec172ccb56977b1775 (diff) | |
| parent | 5fb7140613d6ea00ec1964fde18418c6257c2e27 (diff) | |
Merge branch 'master' into build_more_roms
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/landmarks.asm | 11 | ||||
| -rw-r--r-- | engine/link/place_waiting_text.asm | 2 | ||||
| -rw-r--r-- | engine/menu/main_menu.asm | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/engine/landmarks.asm b/engine/landmarks.asm new file mode 100644 index 0000000..9e3c95d --- /dev/null +++ b/engine/landmarks.asm @@ -0,0 +1,11 @@ +INCLUDE "constants.asm" + +SECTION "GetLandmarkName", ROMX[$4AA5], BANK[$3F] + +GetLandmarkName:: + dec a + ld hl, LandmarkNames + call GetNthString + ld d, h + ld e, l + ret diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm index c617dec..bfe9d7e 100644 --- a/engine/link/place_waiting_text.asm +++ b/engine/link/place_waiting_text.asm @@ -15,7 +15,7 @@ PlaceWaitingText:: ; 1:4000 .link_textbox ; TODO ; predef Predef_LinkTextbox - ld a, $1C + ld a, $1c call Predef .textbox_done hlcoord 4, 11 diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 5701eba..536123f 100644 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -4,7 +4,7 @@ SECTION "Main Menu Definition", ROMX[$5418], BANK[$01] MainMenuHeader: db $40 - db 0, 0, 7, 13 + db $00, $00, $07, $0d dw .data db 1 ; default option |