Skip to content

Commit

Permalink
[Maintenance] Move all shot-related slices to the player/ subdirectory
Browse files Browse the repository at this point in the history
It seems that the main th0?/ directories should only contain actual
translation units (of which there are more than previously assumed)
as well as other not really further classifiable slices?

Part of P0036, funded by zorg.
  • Loading branch information
nmlgc committed Oct 14, 2019
1 parent a533b5d commit 5ebbe7b
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 16 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 5 additions & 6 deletions th04_main.asm
Expand Up @@ -12825,7 +12825,7 @@ loc_11D92:
retn
yuuka6_fg_render endp

include th04/shots_add.asm
include th04/player/shots_add.asm

; =============== S U B R O U T I N E =======================================

Expand All @@ -12843,7 +12843,6 @@ sub_11DCA proc near
retn 4
sub_11DCA endp


; =============== S U B R O U T I N E =======================================


Expand Down Expand Up @@ -39556,7 +39555,7 @@ NUMERALS db 0, 0, 38h, 0, 44h, 0, 82h, 0, 82h, 0, 82h, 0, 44h, 0
db 0FFh
db 0
include th02/sprites/sparks.asm
include th04/shot_velocity[data].asm
include th04/player/shot_velocity[data].asm
db 18h
db 68h ; h
db 98h
Expand Down Expand Up @@ -40267,7 +40266,7 @@ byte_23212 db 0
db 90h
db 0F0h
db 10h
include th04/shot_levels[data].asm
include th04/player/shot_levels[data].asm
aMiko_cfg db 'MIKO.CFG',0
db 0
word_2323A dw 0AF30h
Expand Down Expand Up @@ -40950,7 +40949,7 @@ _rank db ?
include th04/score[bss].asm
byte_256A2 db ?
db ?
include th04/shots_add[bss].asm
include th04/player/shots_add[bss].asm
byte_256A8 db ?
byte_256A9 db ?
fp_256AA dw ?
Expand Down Expand Up @@ -47072,7 +47071,7 @@ include th04/circles[bss].asm
dd ? ;
db ? ;
db ? ;
include th04/shots[bss].asm
include th04/player/shots[bss].asm
dd ? ;
dd ? ;
dd ? ;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion th05/th05.inc
@@ -1,7 +1,7 @@
GAME = 5
include th04/shared.inc

include th05/shot_types.inc
include th05/player/shot_types.inc

_player_option_patnum = 26

Expand Down
17 changes: 8 additions & 9 deletions th05_main.asm
Expand Up @@ -6537,7 +6537,7 @@ sub_E480 proc far
retf
sub_E480 endp

include th05/shots_add.asm
include th05/player/shots_add.asm

; =============== S U B R O U T I N E =======================================

Expand All @@ -6555,7 +6555,6 @@ sub_E4DE proc near
retn 4
sub_E4DE endp


; =============== S U B R O U T I N E =======================================


Expand Down Expand Up @@ -13367,7 +13366,7 @@ loc_125F6:
retn
sub_125A3 endp

include th05/hitshot_from.asm
include th05/player/hitshot_from.asm

; =============== S U B R O U T I N E =======================================

Expand Down Expand Up @@ -37294,9 +37293,9 @@ include th05/formats/bb_curvebullet[data].asm
aMaine db 'maine',0
; char aMaine_0[]
aMaine_0 db 'maine',0
include th04/shot_levels[data].asm
include th04/player/shot_levels[data].asm
include th05/formats/bb_txt_load[data].asm
include th04/shot_velocity[data].asm
include th04/player/shot_velocity[data].asm
aGENSOU_SCR db 'GENSOU.SCR',0
gCONTINUE db 0ACh, 0B8h, 0B7h, 0BDh, 0B2h, 0B7h, 0BEh, 0AEh, 0
byte_221C0 db 0
Expand Down Expand Up @@ -44385,7 +44384,7 @@ word_2C0C8 dw ?
dd ? ;
dd ? ;
dd ? ;
include th04/shots[bss].asm
include th04/player/shots[bss].asm
dd ? ;
dd ? ;
dd ? ;
Expand All @@ -44404,7 +44403,7 @@ include th04/shots[bss].asm
dd ? ;
dd ? ;
dd ? ;
include th05/hitshots[bss].asm
include th05/player/hitshots[bss].asm
include th04/homing_target[bss].asm
public _stage_vm
_stage_vm dd ?
Expand Down Expand Up @@ -44897,11 +44896,11 @@ word_2CED8 dw ?
dd ? ;
dd ? ;
word_2D05A dw ?
include th05/hitshot_from[bss].asm
include th05/player/hitshot_from[bss].asm
word_2D05E dw ?
byte_2D060 db ?
db ?
include th04/shots_add[bss].asm
include th04/player/shots_add[bss].asm
include th04/boss/funcs[bss].asm
include th05/boss/b5_intervals[bss].asm
dd ? ;
Expand Down

0 comments on commit 5ebbe7b

Please sign in to comment.