diff options
author | mid-kid <esteve.varela@gmail.com> | 2020-02-21 23:48:51 +0100 |
---|---|---|
committer | mid-kid <esteve.varela@gmail.com> | 2020-02-22 00:23:47 +0100 |
commit | 43eff93861b5b00473e567e6449c64f039f8f4ba (patch) | |
tree | 7eb66fc5272b26fbc0e99a5ea4327013516a89fc /home.asm | |
parent | 9a927c1b3efa2eca886f346a4fcca0eb57278faf (diff) |
Small home/ reorganization
Time to move everything out of home.asm:
- InexplicablyEmptyFunction was moved to home/map.asm
- The wDebugFlags functions and xor_a brothers were moved to
home/flag.asm because they're all flag-related.
- ret_2f3e was moved into home/region.asm
- The register alias sisters were moved to a new file called home/call_regs.asm
- IsInArray and SkipNames were joined by AddNTimes from home/math.asm
into home/array.asm, as they're all used to index arrays.
- CallPointerAt was moved into home/print_text.asm because given the
contents of that file it doesn't feel very out of place (that file
isn't very aptly named...)
- CountSetBits was moved into home/pokedex_flags.asm because it's unique
use is counting the amount of seen/caught mon in the podedex. GetWeekday
was pulled into this by proximity.
Other changes were also made:
- PushLYOverrides was moved from home/sprite_anims.asm to
home/battle.asm, because it's almost exclusively used for battle
animations, with the lone exception being the Magnet Train.
- home/copy.asm was renamed to home/gfx.asm, as it's all gfx-related
- home/copy2.asm was renamed to home/copy.asm, now it's the only file
called copy.
- SetHPPal and GetHPPal were moved from home/hp_pals.asm to
home/tilemap.asm, as they're attrmap related, like many functions in
that file are.
- home/rtc.asm was renamed to home/time_palettes.asm, as it had very
little to do with the RTC at all, all RTC functions being in home/time.asm
- home/handshake.asm was renamed to home/printer.asm.
- home/mon_data_2.asm was renamed to home/mon_party.asm.
Diffstat (limited to 'home.asm')
-rw-r--r-- | home.asm | 152 |
1 files changed, 7 insertions, 145 deletions
@@ -24,7 +24,7 @@ SECTION "Home", ROM0 INCLUDE "home/init.asm" INCLUDE "home/vblank.asm" INCLUDE "home/delay.asm" -INCLUDE "home/rtc.asm" +INCLUDE "home/time_palettes.asm" INCLUDE "home/fade.asm" INCLUDE "home/lcd.asm" INCLUDE "home/time.asm" @@ -32,7 +32,7 @@ INCLUDE "home/serial.asm" INCLUDE "home/joypad.asm" INCLUDE "home/decompress.asm" INCLUDE "home/palettes.asm" -INCLUDE "home/copy.asm" +INCLUDE "home/gfx.asm" INCLUDE "home/text.asm" INCLUDE "home/video.asm" INCLUDE "home/map_objects.asm" @@ -41,169 +41,31 @@ INCLUDE "home/movement.asm" INCLUDE "home/menu.asm" INCLUDE "home/menu_window.asm" INCLUDE "home/menu2.asm" -INCLUDE "home/handshake.asm" +INCLUDE "home/printer.asm" INCLUDE "home/game_time.asm" INCLUDE "home/map.asm" - -InexplicablyEmptyFunction:: -; unused -; Inexplicably empty. -; Seen in PredefPointers. -rept 16 - nop -endr - ret - INCLUDE "home/farcall.asm" INCLUDE "home/predef.asm" INCLUDE "home/window.asm" INCLUDE "home/flag.asm" - -Unreferenced_CheckBPressedDebug:: -; Used in debug ROMs to walk through walls and avoid encounters. - - ld a, [wDebugFlags] - bit DEBUG_FIELD_F, a - ret z - - ldh a, [hJoyDown] - bit B_BUTTON_F, a - ret - -xor_a:: - xor a - ret - -xor_a_dec_a:: - xor a - dec a - ret - -Unreferenced_CheckFieldDebug:: - push hl - ld hl, wDebugFlags - bit DEBUG_FIELD_F, [hl] - pop hl - ret - INCLUDE "home/sprite_updates.asm" INCLUDE "home/string.asm" INCLUDE "home/region.asm" - -ret_2f3e:: - ret - INCLUDE "home/item.asm" INCLUDE "home/random.asm" INCLUDE "home/sram.asm" - -; Register aliases - -_hl_:: - jp hl - -_de_:: - push de - ret - +INCLUDE "home/call_regs.asm" INCLUDE "home/double_speed.asm" INCLUDE "home/clear_sprites.asm" -INCLUDE "home/copy2.asm" +INCLUDE "home/copy.asm" INCLUDE "home/copy_tilemap.asm" INCLUDE "home/copy_name.asm" - -IsInArray:: -; Find value a for every de bytes in array hl. -; Return index in b and carry if found. - - ld b, 0 - ld c, a -.loop - ld a, [hl] - cp -1 - jr z, .NotInArray - cp c - jr z, .InArray - inc b - add hl, de - jr .loop - -.NotInArray: - and a - ret - -.InArray: - scf - ret - -SkipNames:: -; Skip a names. - ld bc, NAME_LENGTH - and a - ret z -.loop - add hl, bc - dec a - jr nz, .loop - ret - +INCLUDE "home/array.asm" INCLUDE "home/math.asm" INCLUDE "home/print_text.asm" - -CallPointerAt:: - ldh a, [hROMBank] - push af - ld a, [hli] - rst Bankswitch - - ld a, [hli] - ld h, [hl] - ld l, a - - call _hl_ - - pop hl - ld a, h - rst Bankswitch - ret - INCLUDE "home/queue_script.asm" INCLUDE "home/compare.asm" INCLUDE "home/tilemap.asm" -INCLUDE "home/hp_pals.asm" - -CountSetBits:: -; Count the number of set bits in b bytes starting from hl. -; Return in a, c and [wNumSetBits]. - ld c, 0 -.next - ld a, [hli] - ld e, a - ld d, 8 - -.count - srl e - ld a, 0 - adc c - ld c, a - dec d - jr nz, .count - - dec b - jr nz, .next - - ld a, c - ld [wNumSetBits], a - ret - -GetWeekday:: - ld a, [wCurDay] -.mod - sub 7 - jr nc, .mod - add 7 - ret - INCLUDE "home/pokedex_flags.asm" INCLUDE "home/names.asm" INCLUDE "home/scrolling_menu.asm" @@ -214,7 +76,7 @@ INCLUDE "home/cry.asm" INCLUDE "home/print_level.asm" INCLUDE "home/mon_data.asm" INCLUDE "home/print_bcd.asm" -INCLUDE "home/mon_data_2.asm" +INCLUDE "home/mon_party.asm" INCLUDE "home/battle.asm" INCLUDE "home/sprite_anims.asm" INCLUDE "home/audio.asm" |