diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 01:09:58 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 01:09:58 -0400 |
commit | 881e0059704b9134a80d30f203f54677a7c6fb89 (patch) | |
tree | 836409ababf58376c5d2dbccef8250aeaea9617f | |
parent | f275790aec4a796ed969b099364abfdf25385967 (diff) |
INCLUDE "engine/pokemon/bills_pc.asm" in main.asm, not audio.asm
-rw-r--r-- | audio.asm | 7 | ||||
-rw-r--r-- | layout.link | 2 | ||||
-rwxr-xr-x | main.asm | 5 |
3 files changed, 12 insertions, 2 deletions
@@ -359,10 +359,13 @@ INCLUDE "audio/engine_1.asm" INCLUDE "audio/alternate_tempo.asm" -SECTION "Audio Engine 2", ROMX +SECTION "Low Health Alarm (Audio Engine 2)", ROMX INCLUDE "audio/low_health_alarm.asm" -INCLUDE "engine/pokemon/bills_pc.asm" + + +SECTION "Audio Engine 2", ROMX + INCLUDE "audio/engine_2.asm" INCLUDE "audio/poke_flute.asm" diff --git a/layout.link b/layout.link index c9ad5839..6391c9d5 100644 --- a/layout.link +++ b/layout.link @@ -94,6 +94,8 @@ ROMX $8 "Sound Effect Headers 2" "Music Headers 2" "Sound Effects 2" + "Low Health Alarm (Audio Engine 2)" + "Bill's PC" "Audio Engine 2" "Music 2" @@ -160,6 +160,11 @@ INCLUDE "engine/menus/oaks_pc.asm" INCLUDE "engine/events/hidden_object_functions7.asm" +SECTION "Bill's PC", ROMX + +INCLUDE "engine/pokemon/bills_pc.asm" + + SECTION "Battle (BANK 9)", ROMX INCLUDE "engine/battle/print_type.asm" |