Skip to content

Commit

Permalink
INCLUDE "engine/pokemon/bills_pc.asm" in main.asm, not audio.asm
Browse files Browse the repository at this point in the history
  • Loading branch information
Rangi42 committed Jul 3, 2020
1 parent f275790 commit 881e005
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
7 changes: 5 additions & 2 deletions audio.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 2 additions & 0 deletions layout.link
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
5 changes: 5 additions & 0 deletions main.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 881e005

Please sign in to comment.