From f275790aec4a796ed969b099364abfdf25385967 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 2 Jul 2020 23:30:21 -0400 Subject: [PATCH 1/3] Add subdirectories to engine/ similar to pokecrystal --- audio.asm | 234 +----------------- audio/alternate_tempo.asm | 50 ++++ audio/low_health_alarm.asm | 75 ++++++ audio/notes.asm | 2 + audio/play_battle_music.asm | 34 +++ audio/poke_flute.asm | 18 ++ audio/pokedex_rating_sfx.asm | 36 +++ audio/wave_instruments.asm | 2 + data/hm_moves.asm | 7 + engine/battle/{bank_e_misc.asm => misc.asm} | 0 .../conversion.asm} | 0 .../drain_hp.asm} | 0 .../focus_energy.asm} | 0 .../haze_effect.asm => move_effects/haze.asm} | 0 .../heal_effect.asm => move_effects/heal.asm} | 0 .../leech_seed.asm} | 0 .../mist_effect.asm => move_effects/mist.asm} | 0 .../one_hit_ko.asm} | 0 .../paralyze.asm} | 0 .../pay_day.asm} | 0 .../recoil.asm} | 0 .../reflect_light_screen.asm} | 0 .../substitute.asm} | 0 .../transform.asm} | 0 engine/battle/trainer_ai.asm | 2 +- engine/{debug1.asm => debug/debug_party.asm} | 0 engine/{ => debug}/test_battle.asm | 0 engine/{ => events}/black_out.asm | 0 engine/{overworld => events}/card_key.asm | 0 engine/{overworld => events}/cinnabar_lab.asm | 0 engine/{menu => events}/diploma.asm | 0 engine/{ => events}/display_pokedex.asm | 0 engine/{predefs7.asm => events/elevator.asm} | 0 engine/{ => events}/evolve_trade.asm | 0 engine/{ => events}/give_pokemon.asm | 0 engine/{ => events}/heal_party.asm | 0 engine/{overworld => events}/hidden_items.asm | 0 .../hidden_object_functions14.asm | 0 .../hidden_object_functions17.asm | 0 .../hidden_object_functions18.asm | 0 .../{ => events}/hidden_object_functions3.asm | 0 .../{ => events}/hidden_object_functions7.asm | 0 engine/{ => events}/in_game_trades.asm | 0 engine/{overworld => events}/oaks_aide.asm | 0 engine/{overworld => events}/pewter_guys.asm | 0 .../item.asm => events/pick_up_item.asm} | 0 engine/{overworld => events}/poison.asm | 0 engine/{overworld => events}/pokecenter.asm | 0 engine/{ => events}/pokedex_rating.asm | 0 engine/{overworld => events}/pokemart.asm | 0 engine/{menu => events}/prize_menu.asm | 0 .../{overworld => events}/saffron_guards.asm | 0 .../set_blackout_map.asm | 0 .../{predefs17.asm => events/starter_dex.asm} | 0 engine/{menu => events}/vending_machine.asm | 0 engine/{ => gfx}/hp_bar.asm | 0 engine/{ => gfx}/load_pokedex_tiles.asm | 0 .../mon_icons.asm} | 0 engine/{ => gfx}/oam_dma.asm | 0 engine/{ => gfx}/palettes.asm | 0 .../{predefs12.asm => gfx/screen_effects.asm} | 0 .../{overworld/oam.asm => gfx/sprite_oam.asm} | 0 engine/{ => items}/get_bag_item_quantity.asm | 0 engine/items/{items.asm => item_effects.asm} | 0 engine/{ => items}/subtract_paid_money.asm | 0 engine/{ => items}/town_map.asm | 0 engine/{ => link}/cable_club.asm | 0 engine/{overworld => link}/cable_club_npc.asm | 0 engine/{ => link}/print_waiting_text.asm | 0 engine/{ => math}/bcd.asm | 0 engine/{ => math}/multiply_divide.asm | 0 engine/{ => math}/random.asm | 0 engine/{ => menus}/display_text_id_init.asm | 0 engine/{menu => menus}/draw_badges.asm | 0 engine/{menu => menus}/draw_start_menu.asm | 0 engine/{menu => menus}/league_pc.asm | 0 engine/{menu => menus}/main_menu.asm | 0 engine/{menu => menus}/naming_screen.asm | 0 engine/{menu => menus}/oaks_pc.asm | 0 engine/{menu => menus}/party_menu.asm | 0 engine/{menu => menus}/pc.asm | 0 engine/{menu => menus}/players_pc.asm | 0 engine/{menu => menus}/pokedex.asm | 0 engine/{ => menus}/save.asm | 0 engine/{menu => menus}/start_sub_menus.asm | 0 engine/{menu => menus}/swap_items.asm | 0 engine/{menu => menus}/text_box.asm | 0 engine/{ => movie}/clear_save.asm | 0 engine/{HoF_room_pc.asm => movie/credits.asm} | 0 engine/{ => movie}/evolution.asm | 0 engine/{ => movie}/gamefreak.asm | 0 engine/{ => movie}/hall_of_fame.asm | 0 engine/{ => movie}/init_player_data.asm | 0 engine/{ => movie}/intro.asm | 0 engine/{ => movie}/oak_speech.asm | 0 engine/{ => movie}/oak_speech2.asm | 0 engine/{ => movie}/titlescreen.asm | 0 engine/{ => movie}/titlescreen2.asm | 0 engine/{ => movie}/trade.asm | 0 engine/{ => movie}/trade2.asm | 0 .../{npc_movement.asm => auto_movement.asm} | 0 .../overworld/{ssanne.asm => dust_smoke.asm} | 0 engine/{ => overworld}/pathfinding.asm | 0 engine/{ => overworld}/special_warps.asm | 0 ...e_functions1.asm => sprite_collisions.asm} | 0 .../{tileset_header.asm => tilesets.asm} | 0 .../{trainers.asm => trainer_sight.asm} | 0 engine/{ => overworld}/turn_sprite.asm | 0 engine/{ => pokemon}/add_mon.asm | 0 engine/{menu => pokemon}/bills_pc.asm | 8 +- engine/{ => pokemon}/evos_moves.asm | 0 engine/{ => pokemon}/experience.asm | 0 engine/{ => pokemon}/learn_move.asm | 0 engine/{ => pokemon}/load_mon_data.asm | 0 .../remove_mon.asm} | 0 .../set_types.asm} | 0 engine/{ => pokemon}/status_ailments.asm | 0 engine/{menu => pokemon}/status_screen.asm | 0 engine/{ => slots}/game_corner_slots.asm | 0 engine/{ => slots}/game_corner_slots2.asm | 0 engine/{ => slots}/slot_machine.asm | 0 home.asm | 2 +- {engine/menu => home}/start_menu.asm | 0 main.asm | 218 ++++++++-------- 124 files changed, 342 insertions(+), 346 deletions(-) create mode 100644 audio/alternate_tempo.asm create mode 100644 audio/low_health_alarm.asm create mode 100644 audio/play_battle_music.asm create mode 100644 audio/poke_flute.asm create mode 100644 audio/pokedex_rating_sfx.asm create mode 100644 data/hm_moves.asm rename engine/battle/{bank_e_misc.asm => misc.asm} (100%) rename engine/battle/{moveEffects/conversion_effect.asm => move_effects/conversion.asm} (100%) rename engine/battle/{moveEffects/drain_hp_effect.asm => move_effects/drain_hp.asm} (100%) rename engine/battle/{moveEffects/focus_energy_effect.asm => move_effects/focus_energy.asm} (100%) rename engine/battle/{moveEffects/haze_effect.asm => move_effects/haze.asm} (100%) rename engine/battle/{moveEffects/heal_effect.asm => move_effects/heal.asm} (100%) rename engine/battle/{moveEffects/leech_seed_effect.asm => move_effects/leech_seed.asm} (100%) rename engine/battle/{moveEffects/mist_effect.asm => move_effects/mist.asm} (100%) rename engine/battle/{moveEffects/one_hit_ko_effect.asm => move_effects/one_hit_ko.asm} (100%) rename engine/battle/{moveEffects/paralyze_effect.asm => move_effects/paralyze.asm} (100%) rename engine/battle/{moveEffects/pay_day_effect.asm => move_effects/pay_day.asm} (100%) rename engine/battle/{moveEffects/recoil_effect.asm => move_effects/recoil.asm} (100%) rename engine/battle/{moveEffects/reflect_light_screen_effect.asm => move_effects/reflect_light_screen.asm} (100%) rename engine/battle/{moveEffects/substitute_effect.asm => move_effects/substitute.asm} (100%) rename engine/battle/{moveEffects/transform_effect.asm => move_effects/transform.asm} (100%) rename engine/{debug1.asm => debug/debug_party.asm} (100%) rename engine/{ => debug}/test_battle.asm (100%) rename engine/{ => events}/black_out.asm (100%) rename engine/{overworld => events}/card_key.asm (100%) rename engine/{overworld => events}/cinnabar_lab.asm (100%) rename engine/{menu => events}/diploma.asm (100%) rename engine/{ => events}/display_pokedex.asm (100%) rename engine/{predefs7.asm => events/elevator.asm} (100%) rename engine/{ => events}/evolve_trade.asm (100%) rename engine/{ => events}/give_pokemon.asm (100%) rename engine/{ => events}/heal_party.asm (100%) rename engine/{overworld => events}/hidden_items.asm (100%) rename engine/{ => events}/hidden_object_functions14.asm (100%) rename engine/{ => events}/hidden_object_functions17.asm (100%) rename engine/{ => events}/hidden_object_functions18.asm (100%) rename engine/{ => events}/hidden_object_functions3.asm (100%) rename engine/{ => events}/hidden_object_functions7.asm (100%) rename engine/{ => events}/in_game_trades.asm (100%) rename engine/{overworld => events}/oaks_aide.asm (100%) rename engine/{overworld => events}/pewter_guys.asm (100%) rename engine/{overworld/item.asm => events/pick_up_item.asm} (100%) rename engine/{overworld => events}/poison.asm (100%) rename engine/{overworld => events}/pokecenter.asm (100%) rename engine/{ => events}/pokedex_rating.asm (100%) rename engine/{overworld => events}/pokemart.asm (100%) rename engine/{menu => events}/prize_menu.asm (100%) rename engine/{overworld => events}/saffron_guards.asm (100%) rename engine/{overworld => events}/set_blackout_map.asm (100%) rename engine/{predefs17.asm => events/starter_dex.asm} (100%) rename engine/{menu => events}/vending_machine.asm (100%) rename engine/{ => gfx}/hp_bar.asm (100%) rename engine/{ => gfx}/load_pokedex_tiles.asm (100%) rename engine/{mon_party_sprites.asm => gfx/mon_icons.asm} (100%) rename engine/{ => gfx}/oam_dma.asm (100%) rename engine/{ => gfx}/palettes.asm (100%) rename engine/{predefs12.asm => gfx/screen_effects.asm} (100%) rename engine/{overworld/oam.asm => gfx/sprite_oam.asm} (100%) rename engine/{ => items}/get_bag_item_quantity.asm (100%) rename engine/items/{items.asm => item_effects.asm} (100%) rename engine/{ => items}/subtract_paid_money.asm (100%) rename engine/{ => items}/town_map.asm (100%) rename engine/{ => link}/cable_club.asm (100%) rename engine/{overworld => link}/cable_club_npc.asm (100%) rename engine/{ => link}/print_waiting_text.asm (100%) rename engine/{ => math}/bcd.asm (100%) rename engine/{ => math}/multiply_divide.asm (100%) rename engine/{ => math}/random.asm (100%) rename engine/{ => menus}/display_text_id_init.asm (100%) rename engine/{menu => menus}/draw_badges.asm (100%) rename engine/{menu => menus}/draw_start_menu.asm (100%) rename engine/{menu => menus}/league_pc.asm (100%) rename engine/{menu => menus}/main_menu.asm (100%) rename engine/{menu => menus}/naming_screen.asm (100%) rename engine/{menu => menus}/oaks_pc.asm (100%) rename engine/{menu => menus}/party_menu.asm (100%) rename engine/{menu => menus}/pc.asm (100%) rename engine/{menu => menus}/players_pc.asm (100%) rename engine/{menu => menus}/pokedex.asm (100%) rename engine/{ => menus}/save.asm (100%) rename engine/{menu => menus}/start_sub_menus.asm (100%) rename engine/{menu => menus}/swap_items.asm (100%) rename engine/{menu => menus}/text_box.asm (100%) rename engine/{ => movie}/clear_save.asm (100%) rename engine/{HoF_room_pc.asm => movie/credits.asm} (100%) rename engine/{ => movie}/evolution.asm (100%) rename engine/{ => movie}/gamefreak.asm (100%) rename engine/{ => movie}/hall_of_fame.asm (100%) rename engine/{ => movie}/init_player_data.asm (100%) rename engine/{ => movie}/intro.asm (100%) rename engine/{ => movie}/oak_speech.asm (100%) rename engine/{ => movie}/oak_speech2.asm (100%) rename engine/{ => movie}/titlescreen.asm (100%) rename engine/{ => movie}/titlescreen2.asm (100%) rename engine/{ => movie}/trade.asm (100%) rename engine/{ => movie}/trade2.asm (100%) rename engine/overworld/{npc_movement.asm => auto_movement.asm} (100%) rename engine/overworld/{ssanne.asm => dust_smoke.asm} (100%) rename engine/{ => overworld}/pathfinding.asm (100%) rename engine/{ => overworld}/special_warps.asm (100%) rename engine/overworld/{map_sprite_functions1.asm => sprite_collisions.asm} (100%) rename engine/overworld/{tileset_header.asm => tilesets.asm} (100%) rename engine/overworld/{trainers.asm => trainer_sight.asm} (100%) rename engine/{ => overworld}/turn_sprite.asm (100%) rename engine/{ => pokemon}/add_mon.asm (100%) rename engine/{menu => pokemon}/bills_pc.asm (99%) rename engine/{ => pokemon}/evos_moves.asm (100%) rename engine/{ => pokemon}/experience.asm (100%) rename engine/{ => pokemon}/learn_move.asm (100%) rename engine/{ => pokemon}/load_mon_data.asm (100%) rename engine/{remove_pokemon.asm => pokemon/remove_mon.asm} (100%) rename engine/{predefs17_2.asm => pokemon/set_types.asm} (100%) rename engine/{ => pokemon}/status_ailments.asm (100%) rename engine/{menu => pokemon}/status_screen.asm (100%) rename engine/{ => slots}/game_corner_slots.asm (100%) rename engine/{ => slots}/game_corner_slots2.asm (100%) rename engine/{ => slots}/slot_machine.asm (100%) rename {engine/menu => home}/start_menu.asm (100%) diff --git a/audio.asm b/audio.asm index 9675c98a..effcb6f7 100644 --- a/audio.asm +++ b/audio.asm @@ -352,248 +352,27 @@ INCLUDE "audio/sfx/cry21_3.asm" INCLUDE "audio/sfx/cry22_3.asm" - SECTION "Audio Engine 1", ROMX -PlayBattleMusic:: - xor a - ld [wAudioFadeOutControl], a - ld [wLowHealthAlarm], a - dec a - ld [wNewSoundID], a - call PlaySound ; stop music - call DelayFrame - ld c, BANK(Music_GymLeaderBattle) - ld a, [wGymLeaderNo] - and a - jr z, .notGymLeaderBattle - ld a, MUSIC_GYM_LEADER_BATTLE - jr .playSong -.notGymLeaderBattle - ld a, [wCurOpponent] - cp OPP_ID_OFFSET - jr c, .wildBattle - cp OPP_SONY3 - jr z, .finalBattle - cp OPP_LANCE - jr nz, .normalTrainerBattle - ld a, MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme - jr .playSong -.normalTrainerBattle - ld a, MUSIC_TRAINER_BATTLE - jr .playSong -.finalBattle - ld a, MUSIC_FINAL_BATTLE - jr .playSong -.wildBattle - ld a, MUSIC_WILD_BATTLE -.playSong - jp PlayMusic - - +INCLUDE "audio/play_battle_music.asm" INCLUDE "audio/engine_1.asm" - - -; an alternate start for MeetRival which has a different first measure -Music_RivalAlternateStart:: - ld c, BANK(Music_MeetRival) - ld a, MUSIC_MEET_RIVAL - call PlayMusic - ld hl, wChannelCommandPointers - ld de, Music_MeetRival_branch_b1a2 - call Audio1_OverwriteChannelPointer - ld de, Music_MeetRival_branch_b21d - call Audio1_OverwriteChannelPointer - ld de, Music_MeetRival_branch_b2b5 - -Audio1_OverwriteChannelPointer: - ld a, e - ld [hli], a - ld a, d - ld [hli], a - ret - -; an alternate tempo for MeetRival which is slightly slower -Music_RivalAlternateTempo:: - ld c, BANK(Music_MeetRival) - ld a, MUSIC_MEET_RIVAL - call PlayMusic - ld hl, wChannelCommandPointers - ld de, Music_MeetRival_branch_b119 - jp Audio1_OverwriteChannelPointer - -; applies both the alternate start and alternate tempo -Music_RivalAlternateStartAndTempo:: - call Music_RivalAlternateStart - ld hl, wChannelCommandPointers - ld de, Music_MeetRival_branch_b19b - jp Audio1_OverwriteChannelPointer - -; an alternate tempo for Cities1 which is used for the Hall of Fame room -Music_Cities1AlternateTempo:: - ld a, 10 - ld [wAudioFadeOutCounterReloadValue], a - ld [wAudioFadeOutCounter], a - ld a, $ff ; stop playing music after the fade-out is finished - ld [wAudioFadeOutControl], a - ld c, 100 - call DelayFrames ; wait for the fade-out to finish - ld c, BANK(Music_Cities1) - ld a, MUSIC_CITIES1 - call PlayMusic - ld hl, wChannelCommandPointers - ld de, Music_Cities1_branch_aa6f - jp Audio1_OverwriteChannelPointer +INCLUDE "audio/alternate_tempo.asm" SECTION "Audio Engine 2", ROMX -Music_DoLowHealthAlarm:: - ld a, [wLowHealthAlarm] - cp $ff - jr z, .disableAlarm - - bit 7, a ;alarm enabled? - ret z ;nope - - and $7f ;low 7 bits are the timer. - jr nz, .asm_21383 ;if timer > 0, play low tone. - - call .playToneHi - ld a, 30 ;keep this tone for 30 frames. - jr .asm_21395 ;reset the timer. - -.asm_21383 - cp 20 - jr nz, .asm_2138a ;if timer == 20, - call .playToneLo ;actually set the sound registers. - -.asm_2138a - ld a, $86 - ld [wChannelSoundIDs + Ch5], a ;disable sound channel? - ld a, [wLowHealthAlarm] - and $7f ;decrement alarm timer. - dec a - -.asm_21395 - ; reset the timer and enable flag. - set 7, a - ld [wLowHealthAlarm], a - ret - -.disableAlarm - xor a - ld [wLowHealthAlarm], a ;disable alarm - ld [wChannelSoundIDs + Ch5], a ;re-enable sound channel? - ld de, .toneDataSilence - jr .playTone - -;update the sound registers to change the frequency. -;the tone set here stays until we change it. -.playToneHi - ld de, .toneDataHi - jr .playTone - -.playToneLo - ld de, .toneDataLo - -;update sound channel 1 to play the alarm, overriding all other sounds. -.playTone - ld hl, rNR10 ;channel 1 sound register - ld c, $5 - xor a - -.copyLoop - ld [hli], a - ld a, [de] - inc de - dec c - jr nz, .copyLoop - ret - -;bytes to write to sound channel 1 registers for health alarm. -;starting at FF11 (FF10 is always zeroed), so these bytes are: -;length, envelope, freq lo, freq hi -.toneDataHi - db $A0,$E2,$50,$87 - -.toneDataLo - db $B0,$E2,$EE,$86 - -;written to stop the alarm -.toneDataSilence - db $00,$00,$00,$80 - - -INCLUDE "engine/menu/bills_pc.asm" - +INCLUDE "audio/low_health_alarm.asm" +INCLUDE "engine/pokemon/bills_pc.asm" INCLUDE "audio/engine_2.asm" - - -Music_PokeFluteInBattle:: - ; begin playing the "caught mon" sound effect - ld a, SFX_CAUGHT_MON - call PlaySoundWaitForCurrent - ; then immediately overwrite the channel pointers - ld hl, wChannelCommandPointers + Ch5 * 2 - ld de, SFX_Pokeflute_Ch5 - call Audio2_OverwriteChannelPointer - ld de, SFX_Pokeflute_Ch6 - call Audio2_OverwriteChannelPointer - ld de, SFX_Pokeflute_Ch7 - -Audio2_OverwriteChannelPointer: - ld a, e - ld [hli], a - ld a, d - ld [hli], a - ret +INCLUDE "audio/poke_flute.asm" SECTION "Audio Engine 3", ROMX -PlayPokedexRatingSfx:: - ld a, [$ffdc] - ld c, $0 - ld hl, OwnedMonValues -.getSfxPointer - cp [hl] - jr c, .gotSfxPointer - inc c - inc hl - jr .getSfxPointer -.gotSfxPointer - push bc - ld a, $ff - ld [wNewSoundID], a - call PlaySoundWaitForCurrent - pop bc - ld b, $0 - ld hl, PokedexRatingSfxPointers - add hl, bc - add hl, bc - ld a, [hli] - ld c, [hl] - call PlayMusic - jp PlayDefaultMusic - -PokedexRatingSfxPointers: - db SFX_DENIED, BANK(SFX_Denied_3) - db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) - db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) - db SFX_CAUGHT_MON, BANK(SFX_Caught_Mon) - db SFX_LEVEL_UP, BANK(SFX_Level_Up) - db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1) - db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1) - -OwnedMonValues: - db 10, 40, 60, 90, 120, 150, $ff - - +INCLUDE "audio/pokedex_rating_sfx.asm" INCLUDE "audio/engine_3.asm" - SECTION "Music 1", ROMX INCLUDE "audio/music/pkmnhealed.asm" @@ -663,4 +442,3 @@ INCLUDE "audio/music/surfing.asm" INCLUDE "audio/music/jigglypuffsong.asm" INCLUDE "audio/music/halloffame.asm" INCLUDE "audio/music/credits.asm" - diff --git a/audio/alternate_tempo.asm b/audio/alternate_tempo.asm new file mode 100644 index 00000000..6c2cdc49 --- /dev/null +++ b/audio/alternate_tempo.asm @@ -0,0 +1,50 @@ +; an alternate start for MeetRival which has a different first measure +Music_RivalAlternateStart:: + ld c, BANK(Music_MeetRival) + ld a, MUSIC_MEET_RIVAL + call PlayMusic + ld hl, wChannelCommandPointers + ld de, Music_MeetRival_branch_b1a2 + call Audio1_OverwriteChannelPointer + ld de, Music_MeetRival_branch_b21d + call Audio1_OverwriteChannelPointer + ld de, Music_MeetRival_branch_b2b5 + +Audio1_OverwriteChannelPointer: + ld a, e + ld [hli], a + ld a, d + ld [hli], a + ret + +; an alternate tempo for MeetRival which is slightly slower +Music_RivalAlternateTempo:: + ld c, BANK(Music_MeetRival) + ld a, MUSIC_MEET_RIVAL + call PlayMusic + ld hl, wChannelCommandPointers + ld de, Music_MeetRival_branch_b119 + jp Audio1_OverwriteChannelPointer + +; applies both the alternate start and alternate tempo +Music_RivalAlternateStartAndTempo:: + call Music_RivalAlternateStart + ld hl, wChannelCommandPointers + ld de, Music_MeetRival_branch_b19b + jp Audio1_OverwriteChannelPointer + +; an alternate tempo for Cities1 which is used for the Hall of Fame room +Music_Cities1AlternateTempo:: + ld a, 10 + ld [wAudioFadeOutCounterReloadValue], a + ld [wAudioFadeOutCounter], a + ld a, $ff ; stop playing music after the fade-out is finished + ld [wAudioFadeOutControl], a + ld c, 100 + call DelayFrames ; wait for the fade-out to finish + ld c, BANK(Music_Cities1) + ld a, MUSIC_CITIES1 + call PlayMusic + ld hl, wChannelCommandPointers + ld de, Music_Cities1_branch_aa6f + jp Audio1_OverwriteChannelPointer diff --git a/audio/low_health_alarm.asm b/audio/low_health_alarm.asm new file mode 100644 index 00000000..514db55f --- /dev/null +++ b/audio/low_health_alarm.asm @@ -0,0 +1,75 @@ +Music_DoLowHealthAlarm:: + ld a, [wLowHealthAlarm] + cp $ff + jr z, .disableAlarm + + bit 7, a ;alarm enabled? + ret z ;nope + + and $7f ;low 7 bits are the timer. + jr nz, .asm_21383 ;if timer > 0, play low tone. + + call .playToneHi + ld a, 30 ;keep this tone for 30 frames. + jr .asm_21395 ;reset the timer. + +.asm_21383 + cp 20 + jr nz, .asm_2138a ;if timer == 20, + call .playToneLo ;actually set the sound registers. + +.asm_2138a + ld a, $86 + ld [wChannelSoundIDs + Ch5], a ;disable sound channel? + ld a, [wLowHealthAlarm] + and $7f ;decrement alarm timer. + dec a + +.asm_21395 + ; reset the timer and enable flag. + set 7, a + ld [wLowHealthAlarm], a + ret + +.disableAlarm + xor a + ld [wLowHealthAlarm], a ;disable alarm + ld [wChannelSoundIDs + Ch5], a ;re-enable sound channel? + ld de, .toneDataSilence + jr .playTone + +;update the sound registers to change the frequency. +;the tone set here stays until we change it. +.playToneHi + ld de, .toneDataHi + jr .playTone + +.playToneLo + ld de, .toneDataLo + +;update sound channel 1 to play the alarm, overriding all other sounds. +.playTone + ld hl, rNR10 ;channel 1 sound register + ld c, $5 + xor a + +.copyLoop + ld [hli], a + ld a, [de] + inc de + dec c + jr nz, .copyLoop + ret + +;bytes to write to sound channel 1 registers for health alarm. +;starting at FF11 (FF10 is always zeroed), so these bytes are: +;length, envelope, freq lo, freq hi +.toneDataHi + db $A0,$E2,$50,$87 + +.toneDataLo + db $B0,$E2,$EE,$86 + +;written to stop the alarm +.toneDataSilence + db $00,$00,$00,$80 diff --git a/audio/notes.asm b/audio/notes.asm index 025eb6a8..75e1a0b7 100644 --- a/audio/notes.asm +++ b/audio/notes.asm @@ -1,3 +1,5 @@ +; This file is INCLUDEd three times, once in each audio engine. + dw $F82C ; C_ dw $F89D ; C# dw $F907 ; D_ diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm new file mode 100644 index 00000000..35dd19ad --- /dev/null +++ b/audio/play_battle_music.asm @@ -0,0 +1,34 @@ +PlayBattleMusic:: + xor a + ld [wAudioFadeOutControl], a + ld [wLowHealthAlarm], a + dec a + ld [wNewSoundID], a + call PlaySound ; stop music + call DelayFrame + ld c, BANK(Music_GymLeaderBattle) + ld a, [wGymLeaderNo] + and a + jr z, .notGymLeaderBattle + ld a, MUSIC_GYM_LEADER_BATTLE + jr .playSong +.notGymLeaderBattle + ld a, [wCurOpponent] + cp OPP_ID_OFFSET + jr c, .wildBattle + cp OPP_SONY3 + jr z, .finalBattle + cp OPP_LANCE + jr nz, .normalTrainerBattle + ld a, MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme + jr .playSong +.normalTrainerBattle + ld a, MUSIC_TRAINER_BATTLE + jr .playSong +.finalBattle + ld a, MUSIC_FINAL_BATTLE + jr .playSong +.wildBattle + ld a, MUSIC_WILD_BATTLE +.playSong + jp PlayMusic diff --git a/audio/poke_flute.asm b/audio/poke_flute.asm new file mode 100644 index 00000000..f55a2a1f --- /dev/null +++ b/audio/poke_flute.asm @@ -0,0 +1,18 @@ +Music_PokeFluteInBattle:: + ; begin playing the "caught mon" sound effect + ld a, SFX_CAUGHT_MON + call PlaySoundWaitForCurrent + ; then immediately overwrite the channel pointers + ld hl, wChannelCommandPointers + Ch5 * 2 + ld de, SFX_Pokeflute_Ch5 + call Audio2_OverwriteChannelPointer + ld de, SFX_Pokeflute_Ch6 + call Audio2_OverwriteChannelPointer + ld de, SFX_Pokeflute_Ch7 + +Audio2_OverwriteChannelPointer: + ld a, e + ld [hli], a + ld a, d + ld [hli], a + ret diff --git a/audio/pokedex_rating_sfx.asm b/audio/pokedex_rating_sfx.asm new file mode 100644 index 00000000..a218d5e6 --- /dev/null +++ b/audio/pokedex_rating_sfx.asm @@ -0,0 +1,36 @@ +PlayPokedexRatingSfx:: + ld a, [$ffdc] + ld c, $0 + ld hl, OwnedMonValues +.getSfxPointer + cp [hl] + jr c, .gotSfxPointer + inc c + inc hl + jr .getSfxPointer +.gotSfxPointer + push bc + ld a, $ff + ld [wNewSoundID], a + call PlaySoundWaitForCurrent + pop bc + ld b, $0 + ld hl, PokedexRatingSfxPointers + add hl, bc + add hl, bc + ld a, [hli] + ld c, [hl] + call PlayMusic + jp PlayDefaultMusic + +PokedexRatingSfxPointers: + db SFX_DENIED, BANK(SFX_Denied_3) + db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) + db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) + db SFX_CAUGHT_MON, BANK(SFX_Caught_Mon) + db SFX_LEVEL_UP, BANK(SFX_Level_Up) + db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1) + db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1) + +OwnedMonValues: + db 10, 40, 60, 90, 120, 150, $ff diff --git a/audio/wave_instruments.asm b/audio/wave_instruments.asm index fede06af..c915f18a 100644 --- a/audio/wave_instruments.asm +++ b/audio/wave_instruments.asm @@ -1,3 +1,5 @@ +; This file is INCLUDEd three times, once for each audio engine. + dw .wave0 dw .wave1 dw .wave2 diff --git a/data/hm_moves.asm b/data/hm_moves.asm new file mode 100644 index 00000000..d72eddfe --- /dev/null +++ b/data/hm_moves.asm @@ -0,0 +1,7 @@ +HMMoveArray: + db CUT + db FLY + db SURF + db STRENGTH + db FLASH + db -1 diff --git a/engine/battle/bank_e_misc.asm b/engine/battle/misc.asm similarity index 100% rename from engine/battle/bank_e_misc.asm rename to engine/battle/misc.asm diff --git a/engine/battle/moveEffects/conversion_effect.asm b/engine/battle/move_effects/conversion.asm similarity index 100% rename from engine/battle/moveEffects/conversion_effect.asm rename to engine/battle/move_effects/conversion.asm diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/move_effects/drain_hp.asm similarity index 100% rename from engine/battle/moveEffects/drain_hp_effect.asm rename to engine/battle/move_effects/drain_hp.asm diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/move_effects/focus_energy.asm similarity index 100% rename from engine/battle/moveEffects/focus_energy_effect.asm rename to engine/battle/move_effects/focus_energy.asm diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/move_effects/haze.asm similarity index 100% rename from engine/battle/moveEffects/haze_effect.asm rename to engine/battle/move_effects/haze.asm diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/move_effects/heal.asm similarity index 100% rename from engine/battle/moveEffects/heal_effect.asm rename to engine/battle/move_effects/heal.asm diff --git a/engine/battle/moveEffects/leech_seed_effect.asm b/engine/battle/move_effects/leech_seed.asm similarity index 100% rename from engine/battle/moveEffects/leech_seed_effect.asm rename to engine/battle/move_effects/leech_seed.asm diff --git a/engine/battle/moveEffects/mist_effect.asm b/engine/battle/move_effects/mist.asm similarity index 100% rename from engine/battle/moveEffects/mist_effect.asm rename to engine/battle/move_effects/mist.asm diff --git a/engine/battle/moveEffects/one_hit_ko_effect.asm b/engine/battle/move_effects/one_hit_ko.asm similarity index 100% rename from engine/battle/moveEffects/one_hit_ko_effect.asm rename to engine/battle/move_effects/one_hit_ko.asm diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/move_effects/paralyze.asm similarity index 100% rename from engine/battle/moveEffects/paralyze_effect.asm rename to engine/battle/move_effects/paralyze.asm diff --git a/engine/battle/moveEffects/pay_day_effect.asm b/engine/battle/move_effects/pay_day.asm similarity index 100% rename from engine/battle/moveEffects/pay_day_effect.asm rename to engine/battle/move_effects/pay_day.asm diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/move_effects/recoil.asm similarity index 100% rename from engine/battle/moveEffects/recoil_effect.asm rename to engine/battle/move_effects/recoil.asm diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/move_effects/reflect_light_screen.asm similarity index 100% rename from engine/battle/moveEffects/reflect_light_screen_effect.asm rename to engine/battle/move_effects/reflect_light_screen.asm diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/move_effects/substitute.asm similarity index 100% rename from engine/battle/moveEffects/substitute_effect.asm rename to engine/battle/move_effects/substitute.asm diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/move_effects/transform.asm similarity index 100% rename from engine/battle/moveEffects/transform_effect.asm rename to engine/battle/move_effects/transform.asm diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 7755b50f..2850b9c2 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -279,7 +279,7 @@ INCLUDE "data/trainer_pic_money_pointers.asm" INCLUDE "text/trainer_names.asm" -INCLUDE "engine/battle/bank_e_misc.asm" +INCLUDE "engine/battle/misc.asm" INCLUDE "engine/battle/read_trainer_party.asm" diff --git a/engine/debug1.asm b/engine/debug/debug_party.asm similarity index 100% rename from engine/debug1.asm rename to engine/debug/debug_party.asm diff --git a/engine/test_battle.asm b/engine/debug/test_battle.asm similarity index 100% rename from engine/test_battle.asm rename to engine/debug/test_battle.asm diff --git a/engine/black_out.asm b/engine/events/black_out.asm similarity index 100% rename from engine/black_out.asm rename to engine/events/black_out.asm diff --git a/engine/overworld/card_key.asm b/engine/events/card_key.asm similarity index 100% rename from engine/overworld/card_key.asm rename to engine/events/card_key.asm diff --git a/engine/overworld/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm similarity index 100% rename from engine/overworld/cinnabar_lab.asm rename to engine/events/cinnabar_lab.asm diff --git a/engine/menu/diploma.asm b/engine/events/diploma.asm similarity index 100% rename from engine/menu/diploma.asm rename to engine/events/diploma.asm diff --git a/engine/display_pokedex.asm b/engine/events/display_pokedex.asm similarity index 100% rename from engine/display_pokedex.asm rename to engine/events/display_pokedex.asm diff --git a/engine/predefs7.asm b/engine/events/elevator.asm similarity index 100% rename from engine/predefs7.asm rename to engine/events/elevator.asm diff --git a/engine/evolve_trade.asm b/engine/events/evolve_trade.asm similarity index 100% rename from engine/evolve_trade.asm rename to engine/events/evolve_trade.asm diff --git a/engine/give_pokemon.asm b/engine/events/give_pokemon.asm similarity index 100% rename from engine/give_pokemon.asm rename to engine/events/give_pokemon.asm diff --git a/engine/heal_party.asm b/engine/events/heal_party.asm similarity index 100% rename from engine/heal_party.asm rename to engine/events/heal_party.asm diff --git a/engine/overworld/hidden_items.asm b/engine/events/hidden_items.asm similarity index 100% rename from engine/overworld/hidden_items.asm rename to engine/events/hidden_items.asm diff --git a/engine/hidden_object_functions14.asm b/engine/events/hidden_object_functions14.asm similarity index 100% rename from engine/hidden_object_functions14.asm rename to engine/events/hidden_object_functions14.asm diff --git a/engine/hidden_object_functions17.asm b/engine/events/hidden_object_functions17.asm similarity index 100% rename from engine/hidden_object_functions17.asm rename to engine/events/hidden_object_functions17.asm diff --git a/engine/hidden_object_functions18.asm b/engine/events/hidden_object_functions18.asm similarity index 100% rename from engine/hidden_object_functions18.asm rename to engine/events/hidden_object_functions18.asm diff --git a/engine/hidden_object_functions3.asm b/engine/events/hidden_object_functions3.asm similarity index 100% rename from engine/hidden_object_functions3.asm rename to engine/events/hidden_object_functions3.asm diff --git a/engine/hidden_object_functions7.asm b/engine/events/hidden_object_functions7.asm similarity index 100% rename from engine/hidden_object_functions7.asm rename to engine/events/hidden_object_functions7.asm diff --git a/engine/in_game_trades.asm b/engine/events/in_game_trades.asm similarity index 100% rename from engine/in_game_trades.asm rename to engine/events/in_game_trades.asm diff --git a/engine/overworld/oaks_aide.asm b/engine/events/oaks_aide.asm similarity index 100% rename from engine/overworld/oaks_aide.asm rename to engine/events/oaks_aide.asm diff --git a/engine/overworld/pewter_guys.asm b/engine/events/pewter_guys.asm similarity index 100% rename from engine/overworld/pewter_guys.asm rename to engine/events/pewter_guys.asm diff --git a/engine/overworld/item.asm b/engine/events/pick_up_item.asm similarity index 100% rename from engine/overworld/item.asm rename to engine/events/pick_up_item.asm diff --git a/engine/overworld/poison.asm b/engine/events/poison.asm similarity index 100% rename from engine/overworld/poison.asm rename to engine/events/poison.asm diff --git a/engine/overworld/pokecenter.asm b/engine/events/pokecenter.asm similarity index 100% rename from engine/overworld/pokecenter.asm rename to engine/events/pokecenter.asm diff --git a/engine/pokedex_rating.asm b/engine/events/pokedex_rating.asm similarity index 100% rename from engine/pokedex_rating.asm rename to engine/events/pokedex_rating.asm diff --git a/engine/overworld/pokemart.asm b/engine/events/pokemart.asm similarity index 100% rename from engine/overworld/pokemart.asm rename to engine/events/pokemart.asm diff --git a/engine/menu/prize_menu.asm b/engine/events/prize_menu.asm similarity index 100% rename from engine/menu/prize_menu.asm rename to engine/events/prize_menu.asm diff --git a/engine/overworld/saffron_guards.asm b/engine/events/saffron_guards.asm similarity index 100% rename from engine/overworld/saffron_guards.asm rename to engine/events/saffron_guards.asm diff --git a/engine/overworld/set_blackout_map.asm b/engine/events/set_blackout_map.asm similarity index 100% rename from engine/overworld/set_blackout_map.asm rename to engine/events/set_blackout_map.asm diff --git a/engine/predefs17.asm b/engine/events/starter_dex.asm similarity index 100% rename from engine/predefs17.asm rename to engine/events/starter_dex.asm diff --git a/engine/menu/vending_machine.asm b/engine/events/vending_machine.asm similarity index 100% rename from engine/menu/vending_machine.asm rename to engine/events/vending_machine.asm diff --git a/engine/hp_bar.asm b/engine/gfx/hp_bar.asm similarity index 100% rename from engine/hp_bar.asm rename to engine/gfx/hp_bar.asm diff --git a/engine/load_pokedex_tiles.asm b/engine/gfx/load_pokedex_tiles.asm similarity index 100% rename from engine/load_pokedex_tiles.asm rename to engine/gfx/load_pokedex_tiles.asm diff --git a/engine/mon_party_sprites.asm b/engine/gfx/mon_icons.asm similarity index 100% rename from engine/mon_party_sprites.asm rename to engine/gfx/mon_icons.asm diff --git a/engine/oam_dma.asm b/engine/gfx/oam_dma.asm similarity index 100% rename from engine/oam_dma.asm rename to engine/gfx/oam_dma.asm diff --git a/engine/palettes.asm b/engine/gfx/palettes.asm similarity index 100% rename from engine/palettes.asm rename to engine/gfx/palettes.asm diff --git a/engine/predefs12.asm b/engine/gfx/screen_effects.asm similarity index 100% rename from engine/predefs12.asm rename to engine/gfx/screen_effects.asm diff --git a/engine/overworld/oam.asm b/engine/gfx/sprite_oam.asm similarity index 100% rename from engine/overworld/oam.asm rename to engine/gfx/sprite_oam.asm diff --git a/engine/get_bag_item_quantity.asm b/engine/items/get_bag_item_quantity.asm similarity index 100% rename from engine/get_bag_item_quantity.asm rename to engine/items/get_bag_item_quantity.asm diff --git a/engine/items/items.asm b/engine/items/item_effects.asm similarity index 100% rename from engine/items/items.asm rename to engine/items/item_effects.asm diff --git a/engine/subtract_paid_money.asm b/engine/items/subtract_paid_money.asm similarity index 100% rename from engine/subtract_paid_money.asm rename to engine/items/subtract_paid_money.asm diff --git a/engine/town_map.asm b/engine/items/town_map.asm similarity index 100% rename from engine/town_map.asm rename to engine/items/town_map.asm diff --git a/engine/cable_club.asm b/engine/link/cable_club.asm similarity index 100% rename from engine/cable_club.asm rename to engine/link/cable_club.asm diff --git a/engine/overworld/cable_club_npc.asm b/engine/link/cable_club_npc.asm similarity index 100% rename from engine/overworld/cable_club_npc.asm rename to engine/link/cable_club_npc.asm diff --git a/engine/print_waiting_text.asm b/engine/link/print_waiting_text.asm similarity index 100% rename from engine/print_waiting_text.asm rename to engine/link/print_waiting_text.asm diff --git a/engine/bcd.asm b/engine/math/bcd.asm similarity index 100% rename from engine/bcd.asm rename to engine/math/bcd.asm diff --git a/engine/multiply_divide.asm b/engine/math/multiply_divide.asm similarity index 100% rename from engine/multiply_divide.asm rename to engine/math/multiply_divide.asm diff --git a/engine/random.asm b/engine/math/random.asm similarity index 100% rename from engine/random.asm rename to engine/math/random.asm diff --git a/engine/display_text_id_init.asm b/engine/menus/display_text_id_init.asm similarity index 100% rename from engine/display_text_id_init.asm rename to engine/menus/display_text_id_init.asm diff --git a/engine/menu/draw_badges.asm b/engine/menus/draw_badges.asm similarity index 100% rename from engine/menu/draw_badges.asm rename to engine/menus/draw_badges.asm diff --git a/engine/menu/draw_start_menu.asm b/engine/menus/draw_start_menu.asm similarity index 100% rename from engine/menu/draw_start_menu.asm rename to engine/menus/draw_start_menu.asm diff --git a/engine/menu/league_pc.asm b/engine/menus/league_pc.asm similarity index 100% rename from engine/menu/league_pc.asm rename to engine/menus/league_pc.asm diff --git a/engine/menu/main_menu.asm b/engine/menus/main_menu.asm similarity index 100% rename from engine/menu/main_menu.asm rename to engine/menus/main_menu.asm diff --git a/engine/menu/naming_screen.asm b/engine/menus/naming_screen.asm similarity index 100% rename from engine/menu/naming_screen.asm rename to engine/menus/naming_screen.asm diff --git a/engine/menu/oaks_pc.asm b/engine/menus/oaks_pc.asm similarity index 100% rename from engine/menu/oaks_pc.asm rename to engine/menus/oaks_pc.asm diff --git a/engine/menu/party_menu.asm b/engine/menus/party_menu.asm similarity index 100% rename from engine/menu/party_menu.asm rename to engine/menus/party_menu.asm diff --git a/engine/menu/pc.asm b/engine/menus/pc.asm similarity index 100% rename from engine/menu/pc.asm rename to engine/menus/pc.asm diff --git a/engine/menu/players_pc.asm b/engine/menus/players_pc.asm similarity index 100% rename from engine/menu/players_pc.asm rename to engine/menus/players_pc.asm diff --git a/engine/menu/pokedex.asm b/engine/menus/pokedex.asm similarity index 100% rename from engine/menu/pokedex.asm rename to engine/menus/pokedex.asm diff --git a/engine/save.asm b/engine/menus/save.asm similarity index 100% rename from engine/save.asm rename to engine/menus/save.asm diff --git a/engine/menu/start_sub_menus.asm b/engine/menus/start_sub_menus.asm similarity index 100% rename from engine/menu/start_sub_menus.asm rename to engine/menus/start_sub_menus.asm diff --git a/engine/menu/swap_items.asm b/engine/menus/swap_items.asm similarity index 100% rename from engine/menu/swap_items.asm rename to engine/menus/swap_items.asm diff --git a/engine/menu/text_box.asm b/engine/menus/text_box.asm similarity index 100% rename from engine/menu/text_box.asm rename to engine/menus/text_box.asm diff --git a/engine/clear_save.asm b/engine/movie/clear_save.asm similarity index 100% rename from engine/clear_save.asm rename to engine/movie/clear_save.asm diff --git a/engine/HoF_room_pc.asm b/engine/movie/credits.asm similarity index 100% rename from engine/HoF_room_pc.asm rename to engine/movie/credits.asm diff --git a/engine/evolution.asm b/engine/movie/evolution.asm similarity index 100% rename from engine/evolution.asm rename to engine/movie/evolution.asm diff --git a/engine/gamefreak.asm b/engine/movie/gamefreak.asm similarity index 100% rename from engine/gamefreak.asm rename to engine/movie/gamefreak.asm diff --git a/engine/hall_of_fame.asm b/engine/movie/hall_of_fame.asm similarity index 100% rename from engine/hall_of_fame.asm rename to engine/movie/hall_of_fame.asm diff --git a/engine/init_player_data.asm b/engine/movie/init_player_data.asm similarity index 100% rename from engine/init_player_data.asm rename to engine/movie/init_player_data.asm diff --git a/engine/intro.asm b/engine/movie/intro.asm similarity index 100% rename from engine/intro.asm rename to engine/movie/intro.asm diff --git a/engine/oak_speech.asm b/engine/movie/oak_speech.asm similarity index 100% rename from engine/oak_speech.asm rename to engine/movie/oak_speech.asm diff --git a/engine/oak_speech2.asm b/engine/movie/oak_speech2.asm similarity index 100% rename from engine/oak_speech2.asm rename to engine/movie/oak_speech2.asm diff --git a/engine/titlescreen.asm b/engine/movie/titlescreen.asm similarity index 100% rename from engine/titlescreen.asm rename to engine/movie/titlescreen.asm diff --git a/engine/titlescreen2.asm b/engine/movie/titlescreen2.asm similarity index 100% rename from engine/titlescreen2.asm rename to engine/movie/titlescreen2.asm diff --git a/engine/trade.asm b/engine/movie/trade.asm similarity index 100% rename from engine/trade.asm rename to engine/movie/trade.asm diff --git a/engine/trade2.asm b/engine/movie/trade2.asm similarity index 100% rename from engine/trade2.asm rename to engine/movie/trade2.asm diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/auto_movement.asm similarity index 100% rename from engine/overworld/npc_movement.asm rename to engine/overworld/auto_movement.asm diff --git a/engine/overworld/ssanne.asm b/engine/overworld/dust_smoke.asm similarity index 100% rename from engine/overworld/ssanne.asm rename to engine/overworld/dust_smoke.asm diff --git a/engine/pathfinding.asm b/engine/overworld/pathfinding.asm similarity index 100% rename from engine/pathfinding.asm rename to engine/overworld/pathfinding.asm diff --git a/engine/special_warps.asm b/engine/overworld/special_warps.asm similarity index 100% rename from engine/special_warps.asm rename to engine/overworld/special_warps.asm diff --git a/engine/overworld/map_sprite_functions1.asm b/engine/overworld/sprite_collisions.asm similarity index 100% rename from engine/overworld/map_sprite_functions1.asm rename to engine/overworld/sprite_collisions.asm diff --git a/engine/overworld/tileset_header.asm b/engine/overworld/tilesets.asm similarity index 100% rename from engine/overworld/tileset_header.asm rename to engine/overworld/tilesets.asm diff --git a/engine/overworld/trainers.asm b/engine/overworld/trainer_sight.asm similarity index 100% rename from engine/overworld/trainers.asm rename to engine/overworld/trainer_sight.asm diff --git a/engine/turn_sprite.asm b/engine/overworld/turn_sprite.asm similarity index 100% rename from engine/turn_sprite.asm rename to engine/overworld/turn_sprite.asm diff --git a/engine/add_mon.asm b/engine/pokemon/add_mon.asm similarity index 100% rename from engine/add_mon.asm rename to engine/pokemon/add_mon.asm diff --git a/engine/menu/bills_pc.asm b/engine/pokemon/bills_pc.asm similarity index 99% rename from engine/menu/bills_pc.asm rename to engine/pokemon/bills_pc.asm index 6f643228..e5855f1d 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -376,13 +376,7 @@ KnowsHMMove:: and a ret -HMMoveArray: - db CUT - db FLY - db SURF - db STRENGTH - db FLASH - db -1 +INCLUDE "data/hm_moves.asm" DisplayDepositWithdrawMenu: coord hl, 9, 10 diff --git a/engine/evos_moves.asm b/engine/pokemon/evos_moves.asm similarity index 100% rename from engine/evos_moves.asm rename to engine/pokemon/evos_moves.asm diff --git a/engine/experience.asm b/engine/pokemon/experience.asm similarity index 100% rename from engine/experience.asm rename to engine/pokemon/experience.asm diff --git a/engine/learn_move.asm b/engine/pokemon/learn_move.asm similarity index 100% rename from engine/learn_move.asm rename to engine/pokemon/learn_move.asm diff --git a/engine/load_mon_data.asm b/engine/pokemon/load_mon_data.asm similarity index 100% rename from engine/load_mon_data.asm rename to engine/pokemon/load_mon_data.asm diff --git a/engine/remove_pokemon.asm b/engine/pokemon/remove_mon.asm similarity index 100% rename from engine/remove_pokemon.asm rename to engine/pokemon/remove_mon.asm diff --git a/engine/predefs17_2.asm b/engine/pokemon/set_types.asm similarity index 100% rename from engine/predefs17_2.asm rename to engine/pokemon/set_types.asm diff --git a/engine/status_ailments.asm b/engine/pokemon/status_ailments.asm similarity index 100% rename from engine/status_ailments.asm rename to engine/pokemon/status_ailments.asm diff --git a/engine/menu/status_screen.asm b/engine/pokemon/status_screen.asm similarity index 100% rename from engine/menu/status_screen.asm rename to engine/pokemon/status_screen.asm diff --git a/engine/game_corner_slots.asm b/engine/slots/game_corner_slots.asm similarity index 100% rename from engine/game_corner_slots.asm rename to engine/slots/game_corner_slots.asm diff --git a/engine/game_corner_slots2.asm b/engine/slots/game_corner_slots2.asm similarity index 100% rename from engine/game_corner_slots2.asm rename to engine/slots/game_corner_slots2.asm diff --git a/engine/slot_machine.asm b/engine/slots/slot_machine.asm similarity index 100% rename from engine/slot_machine.asm rename to engine/slots/slot_machine.asm diff --git a/home.asm b/home.asm index cd5352cb..dfa1bec2 100644 --- a/home.asm +++ b/home.asm @@ -1282,7 +1282,7 @@ RepelWoreOffText:: TX_FAR _RepelWoreOffText db "@" -INCLUDE "engine/menu/start_menu.asm" +INCLUDE "home/start_menu.asm" ; function to count how many bits are set in a string of bytes ; INPUT: diff --git a/engine/menu/start_menu.asm b/home/start_menu.asm similarity index 100% rename from engine/menu/start_menu.asm rename to home/start_menu.asm diff --git a/main.asm b/main.asm index 126bf943..be29dfd7 100755 --- a/main.asm +++ b/main.asm @@ -4,46 +4,46 @@ INCLUDE "constants.asm" SECTION "bank1", ROMX INCLUDE "data/facing.asm" -INCLUDE "engine/black_out.asm" +INCLUDE "engine/events/black_out.asm" MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic" MewPicBack:: INCBIN "gfx/pokemon/back/mewb.pic" INCLUDE "data/baseStats/mew.asm" INCLUDE "engine/battle/safari_zone.asm" -INCLUDE "engine/titlescreen.asm" -INCLUDE "engine/load_mon_data.asm" +INCLUDE "engine/movie/titlescreen.asm" +INCLUDE "engine/pokemon/load_mon_data.asm" INCLUDE "data/item_prices.asm" INCLUDE "text/item_names.asm" INCLUDE "text/unused_names.asm" -INCLUDE "engine/overworld/oam.asm" -INCLUDE "engine/oam_dma.asm" -INCLUDE "engine/print_waiting_text.asm" -INCLUDE "engine/overworld/map_sprite_functions1.asm" -INCLUDE "engine/test_battle.asm" -INCLUDE "engine/overworld/item.asm" +INCLUDE "engine/gfx/sprite_oam.asm" +INCLUDE "engine/gfx/oam_dma.asm" +INCLUDE "engine/link/print_waiting_text.asm" +INCLUDE "engine/overworld/sprite_collisions.asm" +INCLUDE "engine/debug/test_battle.asm" +INCLUDE "engine/events/pick_up_item.asm" INCLUDE "engine/overworld/movement.asm" -INCLUDE "engine/cable_club.asm" -INCLUDE "engine/menu/main_menu.asm" -INCLUDE "engine/oak_speech.asm" -INCLUDE "engine/special_warps.asm" -INCLUDE "engine/debug1.asm" -INCLUDE "engine/menu/naming_screen.asm" -INCLUDE "engine/oak_speech2.asm" -INCLUDE "engine/subtract_paid_money.asm" -INCLUDE "engine/menu/swap_items.asm" -INCLUDE "engine/overworld/pokemart.asm" -INCLUDE "engine/learn_move.asm" -INCLUDE "engine/overworld/pokecenter.asm" -INCLUDE "engine/overworld/set_blackout_map.asm" -INCLUDE "engine/display_text_id_init.asm" -INCLUDE "engine/menu/draw_start_menu.asm" -INCLUDE "engine/overworld/cable_club_npc.asm" -INCLUDE "engine/menu/text_box.asm" -INCLUDE "engine/battle/moveEffects/drain_hp_effect.asm" -INCLUDE "engine/menu/players_pc.asm" -INCLUDE "engine/remove_pokemon.asm" -INCLUDE "engine/display_pokedex.asm" +INCLUDE "engine/link/cable_club.asm" +INCLUDE "engine/menus/main_menu.asm" +INCLUDE "engine/movie/oak_speech.asm" +INCLUDE "engine/overworld/special_warps.asm" +INCLUDE "engine/debug/debug_party.asm" +INCLUDE "engine/menus/naming_screen.asm" +INCLUDE "engine/movie/oak_speech2.asm" +INCLUDE "engine/items/subtract_paid_money.asm" +INCLUDE "engine/menus/swap_items.asm" +INCLUDE "engine/events/pokemart.asm" +INCLUDE "engine/pokemon/learn_move.asm" +INCLUDE "engine/events/pokecenter.asm" +INCLUDE "engine/events/set_blackout_map.asm" +INCLUDE "engine/menus/display_text_id_init.asm" +INCLUDE "engine/menus/draw_start_menu.asm" +INCLUDE "engine/link/cable_club_npc.asm" +INCLUDE "engine/menus/text_box.asm" +INCLUDE "engine/battle/move_effects/drain_hp.asm" +INCLUDE "engine/menus/players_pc.asm" +INCLUDE "engine/pokemon/remove_mon.asm" +INCLUDE "engine/events/display_pokedex.asm" SECTION "bank3", ROMX @@ -53,28 +53,28 @@ INCLUDE "data/map_songs.asm" INCLUDE "data/map_header_banks.asm" INCLUDE "engine/overworld/clear_variables.asm" INCLUDE "engine/overworld/player_state.asm" -INCLUDE "engine/overworld/poison.asm" -INCLUDE "engine/overworld/tileset_header.asm" +INCLUDE "engine/events/poison.asm" +INCLUDE "engine/overworld/tilesets.asm" INCLUDE "engine/overworld/daycare_exp.asm" INCLUDE "data/hide_show_data.asm" INCLUDE "engine/overworld/field_move_messages.asm" INCLUDE "engine/items/inventory.asm" INCLUDE "engine/overworld/wild_mons.asm" -INCLUDE "engine/items/items.asm" -INCLUDE "engine/menu/draw_badges.asm" +INCLUDE "engine/items/item_effects.asm" +INCLUDE "engine/menus/draw_badges.asm" INCLUDE "engine/overworld/update_map.asm" INCLUDE "engine/overworld/cut.asm" INCLUDE "engine/overworld/missable_objects.asm" INCLUDE "engine/overworld/push_boulder.asm" -INCLUDE "engine/add_mon.asm" +INCLUDE "engine/pokemon/add_mon.asm" INCLUDE "engine/flag_action.asm" -INCLUDE "engine/heal_party.asm" -INCLUDE "engine/bcd.asm" -INCLUDE "engine/init_player_data.asm" -INCLUDE "engine/get_bag_item_quantity.asm" -INCLUDE "engine/pathfinding.asm" -INCLUDE "engine/hp_bar.asm" -INCLUDE "engine/hidden_object_functions3.asm" +INCLUDE "engine/events/heal_party.asm" +INCLUDE "engine/math/bcd.asm" +INCLUDE "engine/movie/init_player_data.asm" +INCLUDE "engine/items/get_bag_item_quantity.asm" +INCLUDE "engine/overworld/pathfinding.asm" +INCLUDE "engine/gfx/hp_bar.asm" +INCLUDE "engine/events/hidden_object_functions3.asm" SECTION "Graphics (BANK 4)", ROMX @@ -106,33 +106,33 @@ PlayerCharacterTitleGraphicsEnd: SECTION "Battle (BANK 4)", ROMX INCLUDE "engine/overworld/is_player_just_outside_map.asm" -INCLUDE "engine/menu/status_screen.asm" -INCLUDE "engine/menu/party_menu.asm" +INCLUDE "engine/pokemon/status_screen.asm" +INCLUDE "engine/menus/party_menu.asm" RedPicFront:: INCBIN "gfx/player/red.pic" ShrinkPic1:: INCBIN "gfx/player/shrink1.pic" ShrinkPic2:: INCBIN "gfx/player/shrink2.pic" -INCLUDE "engine/turn_sprite.asm" -INCLUDE "engine/menu/start_sub_menus.asm" +INCLUDE "engine/overworld/turn_sprite.asm" +INCLUDE "engine/menus/start_sub_menus.asm" INCLUDE "engine/items/tms.asm" INCLUDE "engine/battle/end_of_battle.asm" INCLUDE "engine/battle/wild_encounters.asm" -INCLUDE "engine/battle/moveEffects/recoil_effect.asm" -INCLUDE "engine/battle/moveEffects/conversion_effect.asm" -INCLUDE "engine/battle/moveEffects/haze_effect.asm" +INCLUDE "engine/battle/move_effects/recoil.asm" +INCLUDE "engine/battle/move_effects/conversion.asm" +INCLUDE "engine/battle/move_effects/haze.asm" INCLUDE "engine/battle/get_trainer_name.asm" -INCLUDE "engine/random.asm" +INCLUDE "engine/math/random.asm" SECTION "Battle (BANK 5)", ROMX -INCLUDE "engine/load_pokedex_tiles.asm" +INCLUDE "engine/gfx/load_pokedex_tiles.asm" INCLUDE "engine/overworld/map_sprites.asm" INCLUDE "engine/overworld/emotion_bubbles.asm" -INCLUDE "engine/evolve_trade.asm" -INCLUDE "engine/battle/moveEffects/substitute_effect.asm" -INCLUDE "engine/menu/pc.asm" +INCLUDE "engine/events/evolve_trade.asm" +INCLUDE "engine/battle/move_effects/substitute.asm" +INCLUDE "engine/menus/pc.asm" SECTION "bank6_1", ROMX @@ -142,7 +142,7 @@ INCLUDE "engine/play_time.asm" SECTION "bank6_2", ROMX -INCLUDE "engine/overworld/npc_movement.asm" +INCLUDE "engine/overworld/auto_movement.asm" INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" @@ -150,26 +150,26 @@ INCLUDE "engine/overworld/ledges.asm" SECTION "bank7_1", ROMX INCLUDE "text/monster_names.asm" -INCLUDE "engine/clear_save.asm" -INCLUDE "engine/predefs7.asm" +INCLUDE "engine/movie/clear_save.asm" +INCLUDE "engine/events/elevator.asm" SECTION "bank7_2", ROMX -INCLUDE "engine/menu/oaks_pc.asm" -INCLUDE "engine/hidden_object_functions7.asm" +INCLUDE "engine/menus/oaks_pc.asm" +INCLUDE "engine/events/hidden_object_functions7.asm" SECTION "Battle (BANK 9)", ROMX INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" -INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" +INCLUDE "engine/battle/move_effects/focus_energy.asm" SECTION "Battle (BANK A)", ROMX -INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" +INCLUDE "engine/battle/move_effects/leech_seed.asm" SECTION "Battle (BANK B)", ROMX @@ -184,24 +184,24 @@ BadgeNumbersTileGraphics: INCBIN "gfx/trainer_card/badge_numbers.2bpp" INCLUDE "engine/items/tmhm.asm" INCLUDE "engine/battle/scale_sprites.asm" -INCLUDE "engine/battle/moveEffects/pay_day_effect.asm" -INCLUDE "engine/game_corner_slots2.asm" +INCLUDE "engine/battle/move_effects/pay_day.asm" +INCLUDE "engine/slots/game_corner_slots2.asm" SECTION "Battle (BANK C)", ROMX -INCLUDE "engine/battle/moveEffects/mist_effect.asm" -INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" +INCLUDE "engine/battle/move_effects/mist.asm" +INCLUDE "engine/battle/move_effects/one_hit_ko.asm" SECTION "Battle (BANK D)", ROMX -INCLUDE "engine/titlescreen2.asm" +INCLUDE "engine/movie/titlescreen2.asm" INCLUDE "engine/battle/link_battle_versus_text.asm" -INCLUDE "engine/slot_machine.asm" -INCLUDE "engine/overworld/pewter_guys.asm" -INCLUDE "engine/multiply_divide.asm" -INCLUDE "engine/game_corner_slots.asm" +INCLUDE "engine/slots/slot_machine.asm" +INCLUDE "engine/events/pewter_guys.asm" +INCLUDE "engine/math/multiply_divide.asm" +INCLUDE "engine/slots/game_corner_slots.asm" SECTION "bankE", ROMX @@ -223,10 +223,10 @@ TradingAnimationGraphicsEnd: TradingAnimationGraphics2: INCBIN "gfx/trade/cable_ball.2bpp" TradingAnimationGraphics2End: -INCLUDE "engine/evos_moves.asm" -INCLUDE "engine/battle/moveEffects/heal_effect.asm" -INCLUDE "engine/battle/moveEffects/transform_effect.asm" -INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm" +INCLUDE "engine/pokemon/evos_moves.asm" +INCLUDE "engine/battle/move_effects/heal.asm" +INCLUDE "engine/battle/move_effects/transform.asm" +INCLUDE "engine/battle/move_effects/reflect_light_screen.asm" SECTION "bankF", ROMX @@ -237,15 +237,15 @@ INCLUDE "engine/battle/effects.asm" SECTION "bank10", ROMX -INCLUDE "engine/menu/pokedex.asm" -INCLUDE "engine/trade.asm" -INCLUDE "engine/intro.asm" -INCLUDE "engine/trade2.asm" +INCLUDE "engine/menus/pokedex.asm" +INCLUDE "engine/movie/trade.asm" +INCLUDE "engine/movie/intro.asm" +INCLUDE "engine/movie/trade2.asm" SECTION "bank11_1", ROMX -INCLUDE "engine/pokedex_rating.asm" +INCLUDE "engine/events/pokedex_rating.asm" SECTION "bank11_2", ROMX @@ -255,22 +255,22 @@ INCLUDE "engine/overworld/hidden_objects.asm" SECTION "bank12", ROMX -INCLUDE "engine/predefs12.asm" +INCLUDE "engine/gfx/screen_effects.asm" SECTION "bank13", ROMX -INCLUDE "engine/give_pokemon.asm" +INCLUDE "engine/events/give_pokemon.asm" INCLUDE "engine/predefs.asm" SECTION "bank14", ROMX INCLUDE "engine/battle/init_battle_variables.asm" -INCLUDE "engine/battle/moveEffects/paralyze_effect.asm" -INCLUDE "engine/overworld/card_key.asm" -INCLUDE "engine/menu/prize_menu.asm" -INCLUDE "engine/hidden_object_functions14.asm" +INCLUDE "engine/battle/move_effects/paralyze.asm" +INCLUDE "engine/events/card_key.asm" +INCLUDE "engine/events/prize_menu.asm" +INCLUDE "engine/events/hidden_object_functions14.asm" SECTION "bank15_1", ROMX @@ -280,41 +280,41 @@ INCLUDE "engine/battle/experience.asm" SECTION "bank15_2", ROMX -INCLUDE "engine/menu/diploma.asm" -INCLUDE "engine/overworld/trainers.asm" +INCLUDE "engine/events/diploma.asm" +INCLUDE "engine/overworld/trainer_sight.asm" SECTION "bank16_1", ROMX INCLUDE "engine/battle/common_text.asm" -INCLUDE "engine/experience.asm" -INCLUDE "engine/overworld/oaks_aide.asm" +INCLUDE "engine/pokemon/experience.asm" +INCLUDE "engine/events/oaks_aide.asm" SECTION "bank16_2", ROMX -INCLUDE "engine/overworld/saffron_guards.asm" +INCLUDE "engine/events/saffron_guards.asm" SECTION "bank17_1", ROMX -INCLUDE "engine/predefs17.asm" +INCLUDE "engine/events/starter_dex.asm" SECTION "bank17_2", ROMX -INCLUDE "engine/predefs17_2.asm" -INCLUDE "engine/hidden_object_functions17.asm" +INCLUDE "engine/pokemon/set_types.asm" +INCLUDE "engine/events/hidden_object_functions17.asm" SECTION "bank18_1", ROMX -INCLUDE "engine/overworld/cinnabar_lab.asm" +INCLUDE "engine/events/cinnabar_lab.asm" SECTION "bank18_2", ROMX -INCLUDE "engine/hidden_object_functions18.asm" +INCLUDE "engine/events/hidden_object_functions18.asm" SECTION "bank1A", ROMX @@ -333,42 +333,42 @@ Version_GFXEnd: SECTION "bank1C", ROMX -INCLUDE "engine/gamefreak.asm" -INCLUDE "engine/hall_of_fame.asm" +INCLUDE "engine/movie/gamefreak.asm" +INCLUDE "engine/movie/hall_of_fame.asm" INCLUDE "engine/overworld/healing_machine.asm" INCLUDE "engine/overworld/player_animations.asm" INCLUDE "engine/battle/ghost_marowak_anim.asm" INCLUDE "engine/battle/battle_transitions.asm" -INCLUDE "engine/town_map.asm" -INCLUDE "engine/mon_party_sprites.asm" -INCLUDE "engine/in_game_trades.asm" -INCLUDE "engine/palettes.asm" -INCLUDE "engine/save.asm" +INCLUDE "engine/items/town_map.asm" +INCLUDE "engine/gfx/mon_icons.asm" +INCLUDE "engine/events/in_game_trades.asm" +INCLUDE "engine/gfx/palettes.asm" +INCLUDE "engine/menus/save.asm" SECTION "bank1D_1", ROMX -INCLUDE "engine/HoF_room_pc.asm" -INCLUDE "engine/status_ailments.asm" +INCLUDE "engine/movie/credits.asm" +INCLUDE "engine/pokemon/status_ailments.asm" INCLUDE "engine/items/itemfinder.asm" SECTION "bank1D_2", ROMX -INCLUDE "engine/menu/vending_machine.asm" +INCLUDE "engine/events/vending_machine.asm" SECTION "bank1D_3", ROMX -INCLUDE "engine/menu/league_pc.asm" -INCLUDE "engine/overworld/hidden_items.asm" +INCLUDE "engine/menus/league_pc.asm" +INCLUDE "engine/events/hidden_items.asm" SECTION "bank1E", ROMX INCLUDE "engine/battle/animations.asm" INCLUDE "engine/overworld/cut2.asm" -INCLUDE "engine/overworld/ssanne.asm" +INCLUDE "engine/overworld/dust_smoke.asm" RedFishingTilesFront: INCBIN "gfx/overworld/red_fish_front.2bpp" RedFishingTilesBack: INCBIN "gfx/overworld/red_fish_back.2bpp" @@ -376,6 +376,6 @@ RedFishingTilesSide: INCBIN "gfx/overworld/red_fish_side.2bpp" RedFishingRodTiles: INCBIN "gfx/overworld/fishing_rod.2bpp" INCLUDE "data/animations.asm" -INCLUDE "engine/evolution.asm" +INCLUDE "engine/movie/evolution.asm" INCLUDE "engine/overworld/elevator.asm" INCLUDE "engine/items/tm_prices.asm" From 881e0059704b9134a80d30f203f54677a7c6fb89 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 3 Jul 2020 01:09:58 -0400 Subject: [PATCH 2/3] INCLUDE "engine/pokemon/bills_pc.asm" in main.asm, not audio.asm --- audio.asm | 7 +++++-- layout.link | 2 ++ main.asm | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/audio.asm b/audio.asm index effcb6f7..94d63f25 100644 --- a/audio.asm +++ b/audio.asm @@ -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" diff --git a/main.asm b/main.asm index be29dfd7..50930bb4 100755 --- a/main.asm +++ b/main.asm @@ -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" From 87ef75c173b5d5f227912860487600b6f53d1d1f Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 3 Jul 2020 01:11:23 -0400 Subject: [PATCH 3/3] Add engine/movie/oak_speech/ subdirectory --- engine/movie/{ => oak_speech}/clear_save.asm | 0 engine/movie/{ => oak_speech}/init_player_data.asm | 0 engine/movie/{ => oak_speech}/oak_speech.asm | 0 engine/movie/{ => oak_speech}/oak_speech2.asm | 0 main.asm | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename engine/movie/{ => oak_speech}/clear_save.asm (100%) rename engine/movie/{ => oak_speech}/init_player_data.asm (100%) rename engine/movie/{ => oak_speech}/oak_speech.asm (100%) rename engine/movie/{ => oak_speech}/oak_speech2.asm (100%) diff --git a/engine/movie/clear_save.asm b/engine/movie/oak_speech/clear_save.asm similarity index 100% rename from engine/movie/clear_save.asm rename to engine/movie/oak_speech/clear_save.asm diff --git a/engine/movie/init_player_data.asm b/engine/movie/oak_speech/init_player_data.asm similarity index 100% rename from engine/movie/init_player_data.asm rename to engine/movie/oak_speech/init_player_data.asm diff --git a/engine/movie/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm similarity index 100% rename from engine/movie/oak_speech.asm rename to engine/movie/oak_speech/oak_speech.asm diff --git a/engine/movie/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm similarity index 100% rename from engine/movie/oak_speech2.asm rename to engine/movie/oak_speech/oak_speech2.asm diff --git a/main.asm b/main.asm index 50930bb4..1c3b5800 100755 --- a/main.asm +++ b/main.asm @@ -25,11 +25,11 @@ INCLUDE "engine/events/pick_up_item.asm" INCLUDE "engine/overworld/movement.asm" INCLUDE "engine/link/cable_club.asm" INCLUDE "engine/menus/main_menu.asm" -INCLUDE "engine/movie/oak_speech.asm" +INCLUDE "engine/movie/oak_speech/oak_speech.asm" INCLUDE "engine/overworld/special_warps.asm" INCLUDE "engine/debug/debug_party.asm" INCLUDE "engine/menus/naming_screen.asm" -INCLUDE "engine/movie/oak_speech2.asm" +INCLUDE "engine/movie/oak_speech/oak_speech2.asm" INCLUDE "engine/items/subtract_paid_money.asm" INCLUDE "engine/menus/swap_items.asm" INCLUDE "engine/events/pokemart.asm" @@ -70,7 +70,7 @@ INCLUDE "engine/pokemon/add_mon.asm" INCLUDE "engine/flag_action.asm" INCLUDE "engine/events/heal_party.asm" INCLUDE "engine/math/bcd.asm" -INCLUDE "engine/movie/init_player_data.asm" +INCLUDE "engine/movie/oak_speech/init_player_data.asm" INCLUDE "engine/items/get_bag_item_quantity.asm" INCLUDE "engine/overworld/pathfinding.asm" INCLUDE "engine/gfx/hp_bar.asm" @@ -150,7 +150,7 @@ INCLUDE "engine/overworld/ledges.asm" SECTION "bank7_1", ROMX INCLUDE "text/monster_names.asm" -INCLUDE "engine/movie/clear_save.asm" +INCLUDE "engine/movie/oak_speech/clear_save.asm" INCLUDE "engine/events/elevator.asm"