Revert "Move type_matchups.asm out of Effect Commands bank to fix size issue"

This reverts commit e59cc2b329.

engine/battle/effect_commands.asm

@@ -1277,11 +1277,6 @@ INCLUDE "data/battle/critical_hit_chances.asm"
 
 INCLUDE "engine/battle/move_effects/triple_kick.asm"
 
-GetNextTypeMatchupsByte:
-   ld a, BANK(TypeMatchups)
-   call GetFarByte
-   ret
-
 BattleCommand_Stab:
 ; STAB = Same Type Attack Bonus
 	ld a, BATTLE_VARS_MOVE_ANIM
@@ -1372,9 +1367,7 @@ BattleCommand_Stab:
 	ld hl, InverseTypeMatchups
 
 .TypesLoop:
-;	ld a, [hli]
-   call GetNextTypeMatchupsByte
-   inc hl
+	ld a, [hli]
 
 	cp -1
 	jr z, .end
@@ -1392,8 +1385,7 @@ BattleCommand_Stab:
 .SkipForesightCheck:
 	cp b
 	jr nz, .SkipType
-;	ld a, [hl]
-	call GetNextTypeMatchupsByte
+	ld a, [hl]
 	cp d
 	jr z, .GotMatchup
 	cp e
@@ -1504,9 +1496,7 @@ CheckTypeMatchup:
 .inverse
 	ld hl, InverseTypeMatchups
 .TypesLoop:
-;	ld a, [hli]
-	call GetNextTypeMatchupsByte
-	inc hl
+	ld a, [hli]
 	cp -1
 	jr z, .End
 	cp -2
@@ -1519,9 +1509,7 @@ CheckTypeMatchup:
 .Next:
 	cp d
 	jr nz, .Nope
-;	ld a, [hli]
-	call GetNextTypeMatchupsByte
-	inc hl
+	ld a, [hli]
 	cp b
 	jr z, .Yup
 	cp c
@@ -1539,9 +1527,7 @@ CheckTypeMatchup:
 	ldh [hDividend + 0], a
 	ldh [hMultiplicand + 0], a
 	ldh [hMultiplicand + 1], a
-;	ld a, [hli]
-	call GetNextTypeMatchupsByte
-	inc hl
+	ld a, [hli]
 	ldh [hMultiplicand + 2], a
 	ld a, [wTypeMatchup]
 	ldh [hMultiplier], a
@@ -1583,7 +1569,7 @@ BattleCommand_ResetTypeMatchup:
 
 INCLUDE "engine/battle/ai/switch.asm"
 
-;INCLUDE "data/types/type_matchups.asm"
+INCLUDE "data/types/type_matchups.asm"
 
 BattleCommand_DamageVariation:
 ; Modify the damage spread between 85% and 100%.

gfx/tilesets.asm

@@ -623,6 +623,15 @@ INCLUDE "data/tilesets/lushcave_collision.asm"
 TilesetLushCaveAttr::
 INCBIN "data/tilesets/lushcave_attributes.bin"
 
+TilesetPlayersRoomGFX::
+INCBIN "gfx/tilesets/players_room.2bpp.lz"
+
+TilesetPlayersRoomMeta::
+INCBIN "data/tilesets/players_room_metatiles.bin"
+
+TilesetPlayersRoomColl::
+INCLUDE "data/tilesets/players_room_collision.asm"
+
 ; there should be space here, lavender crypt's set is just big
 
 SECTION "Tileset Data 16", ROMX

main.asm

@@ -149,11 +149,6 @@ SECTION "Effect Commands", ROMX
 INCLUDE "engine/battle/effect_commands.asm"
 
 
-SECTION "Type Matchups", ROMX
-
-INCLUDE "data/types/type_matchups.asm"
-
-
 SECTION "Enemy Trainers", ROMX
 
 INCLUDE "engine/battle/ai/items.asm"