aboutsummaryrefslogtreecommitdiff
path: root/entity
diff options
context:
space:
mode:
authorAstatin <[email protected]>2025-06-10 18:27:13 +0200
committerAstatin <[email protected]>2025-06-10 18:27:13 +0200
commita9142d0163f41c89196ea201ce8245899c701b82 (patch)
treefee05913dc30343798c4ccc9062ece30bdacbbec /entity
parent9690f6f39bdabcaa62211fd10027c3dba3169e94 (diff)
Add support for multi bank data
Diffstat (limited to 'entity')
-rw-r--r--entity/init.gbasm28
-rw-r--r--entity/list.gbasm21
2 files changed, 15 insertions, 34 deletions
diff --git a/entity/init.gbasm b/entity/init.gbasm
index e0272be..6e75082 100644
--- a/entity/init.gbasm
+++ b/entity/init.gbasm
@@ -36,29 +36,7 @@ Initialize_Entities:
LD A, $tmp_var_1
LD $mem_bunny_current_room_idx, A
- CALL =Reset_Entities_Collision_Map
-
-Reset_viewport_thingies:
- LD A, $mem_bunny_x
- SUB $05
- LD $mem_viewport_x, A
-
- LD A, $mem_bunny_y
- SUB $04
- LD $mem_viewport_y, A
-
- LD A, $mem_viewport_x
- SWAP A
- AND $f0
- OR $08
- LD $mem_prepared_viewport_x, A
-
- LD A, $mem_viewport_y
- SWAP A
- AND $f0
- OR $08
- LD $mem_prepared_viewport_y, A
-
+ JP =Reset_Entities_Collision_Map
RET
Initialize_Bunny_Random_room:
@@ -158,10 +136,8 @@ Initialize_Entity: ; HL => pointer to entity struct, A => entity loaded index, 1
POP BC
- INC HL
-
; Direction
- LD A, $03
+ LD A, $33
LD (HL+), A
LD A, E
diff --git a/entity/list.gbasm b/entity/list.gbasm
index 34e9a77..7623b39 100644
--- a/entity/list.gbasm
+++ b/entity/list.gbasm
@@ -1,7 +1,12 @@
+.MACRODEF SPRITE =sprite_addr
+ .ASSERT bank(=sprite_addr) $entity_sprite_data_bank
+ .DB ptr(=sprite_addr)
+.END
+
Entity_list:
.Fox:
; Sprite address
- .DB =Entity_Tile_Image_Data.Fox
+ .SPRITE =Entity_Tile_Image_Data.Fox
; Turn Jump Table index
.DB $02
@@ -25,7 +30,7 @@ Entity_list:
.Frog:
; Sprite address
- .DB =Entity_Tile_Image_Data.Frog
+ .SPRITE =Entity_Tile_Image_Data.Frog
; Turn Jump Table index
.DB $08
@@ -49,7 +54,7 @@ Entity_list:
.Cat:
; Sprite address
- .DB =Entity_Tile_Image_Data.Cat
+ .SPRITE =Entity_Tile_Image_Data.Cat
; Turn Jump Table index
.DB $03
@@ -73,7 +78,7 @@ Entity_list:
.Penguin:
; Sprite address
- .DB =Entity_Tile_Image_Data.Penguin
+ .SPRITE =Entity_Tile_Image_Data.Penguin
; Turn Jump Table index
.DB $04
@@ -97,7 +102,7 @@ Entity_list:
.Mouse:
; Sprite address
- .DB =Entity_Tile_Image_Data.Mouse
+ .SPRITE =Entity_Tile_Image_Data.Mouse
; Turn Jump Table index
.DB $07
@@ -121,7 +126,7 @@ Entity_list:
.Fimsh:
; Sprite address
- .DB =Entity_Tile_Image_Data.Fimsh
+ .SPRITE =Entity_Tile_Image_Data.Fimsh
; Turn Jump Table index
.DB $06
@@ -145,7 +150,7 @@ Entity_list:
.QuestGoalBunny:
; Sprite address
- .DB =Entity_Tile_Image_Data.Bunny
+ .SPRITE =Entity_Tile_Image_Data.Bunny
; Turn Jump Table index
.DB $05
@@ -169,7 +174,7 @@ Entity_list:
.Bug:
; Sprite address
- .DB =Entity_Tile_Image_Data.Bug
+ .SPRITE =Entity_Tile_Image_Data.Bug
; Turn Jump Table index
.DB $09