Game-Decompilation/LADX-Disassembly
1
0
Fork 0
mirror of https://github.com/zladx/LADX-Disassembly.git synced 2025-02-18 14:40:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change "gel" to "zol", and "mini-gel" to "gel"

Browse Source 
These are the canonical names of these enemies
This commit is contained in:
Tobias V. Langhoff 2022-11-07 23:14:09 +01:00
parent d77515f9fb
commit acb9297ee1
20 changed files with 280 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/code/entities/04_slime_eye.asm
View File

@ -105,7 +105,7 @@ SlimeEyeState0Handler::
cp $02 ; $4A05: $FE $02
jr nc, .ret_4A2C ; $4A07: $30 $23
ld a, ENTITY_GEL ; $4A09: $3E $1B
ld a, ENTITY_ZOL ; $4A09: $3E $1B
call SpawnNewEntity_trampoline ; $4A0B: $CD $86 $3B
call GetRandomByte ; $4A0E: $CD $0D $28
and $3F ; $4A11: $E6 $3F

36
src/code/entities/06_gel.asm → src/code/entities/06_zol.asm
View File

@ -1,14 +1,14 @@
Data_006_7BFA::
db $56, $02, $56, $22
MiniGelEntityHandler::
GelEntityHandler::
call func_006_7BE2 ; $7BFE: $CD $E2 $7B
ld de, Data_006_7BFA ; $7C01: $11 $FA $7B
call RenderActiveEntitySprite ; $7C04: $CD $77 $3C
jr jr_006_7C2E ; $7C07: $18 $25
; define sprite variants by selecting tile n° and setting OAM attributes (palette + flags) in a list
GelLowHealthSpriteVariants::
ZolLowHealthSpriteVariants::
.variant0
db $52, OAM_GBC_PAL_2 | OAM_DMG_PAL_0
db $52, OAM_GBC_PAL_2 | OAM_DMG_PAL_0 | OAM_X_FLIP
@ -17,7 +17,7 @@ GelLowHealthSpriteVariants::
db $54, OAM_GBC_PAL_2 | OAM_DMG_PAL_0 | OAM_X_FLIP
; define sprite variants by selecting tile n° and setting OAM attributes (palette + flags) in a list
GelSpriteVariants::
ZolSpriteVariants::
.variant0
db $52, OAM_GBC_PAL_0 | OAM_DMG_PAL_0
db $52, OAM_GBC_PAL_0 | OAM_DMG_PAL_0 | OAM_X_FLIP
@ -25,9 +25,9 @@ GelSpriteVariants::
db $54, OAM_GBC_PAL_0 | OAM_DMG_PAL_0
db $54, OAM_GBC_PAL_0 | OAM_DMG_PAL_0 | OAM_X_FLIP
GelEntityHandler::
ZolEntityHandler::
call func_006_7BE2 ; $7C19: $CD $E2 $7B
ld de, GelLowHealthSpriteVariants ; $7C1C: $11 $09 $7C
ld de, ZolLowHealthSpriteVariants ; $7C1C: $11 $09 $7C
ld hl, wEntitiesHealthTable ; $7C1F: $21 $60 $C3
add hl, bc ; $7C22: $09
ld a, [hl] ; $7C23: $7E
@ -35,7 +35,7 @@ GelEntityHandler::
jr nz, .render ; $7C26: $20 $03
; load different sprite variants, when health bit 2 is set
ld de, GelSpriteVariants ; $7C28: $11 $11 $7C
ld de, ZolSpriteVariants ; $7C28: $11 $11 $7C
.render:
call RenderActiveEntitySpritesPair ; $7C2B: $CD $C0 $3B
@ -64,7 +64,7 @@ jr_006_7C2E:
.jr_7C50
ldh a, [hActiveEntityType] ; $7C50: $F0 $EB
cp ENTITY_GEL ; $7C52: $FE $1B
cp ENTITY_ZOL ; $7C52: $FE $1B
jr nz, jr_006_7CB7 ; $7C54: $20 $61
ld hl, wEntitiesFlashCountdownTable ; $7C56: $21 $20 $C4
@ -100,7 +100,7 @@ jr_006_7C2E:
ld hl, wEntitiesSpeedZTable ; $7C83: $21 $20 $C3
add hl, bc ; $7C86: $09
ld [hl], $20 ; $7C87: $36 $20
ld a, ENTITY_MINI_GEL ; $7C89: $3E $1C
ld a, ENTITY_GEL ; $7C89: $3E $1C
call SpawnNewEntity_trampoline ; $7C8B: $CD $86 $3B
jr c, jr_006_7CB7 ; $7C8E: $38 $27
@ -163,13 +163,13 @@ jr_006_7CB7:
.jr_7CE5
ldh a, [hActiveEntityState] ; $7CE5: $F0 $F0
JP_TABLE ; $7CE7
._00 dw GelState0Handler
._01 dw GelState1Handler
._02 dw GelState2Handler
._03 dw GelState3Handler
._04 dw GelState4Handler
._00 dw ZolState0Handler
._01 dw ZolState1Handler
._02 dw ZolState2Handler
._03 dw ZolState3Handler
._04 dw ZolState4Handler
GelState1Handler::
ZolState1Handler::
call GetEntityTransitionCountdown ; $7CF2: $CD $05 $0C
jr nz, func_006_7D0F ; $7CF5: $20 $18
@ -201,7 +201,7 @@ func_006_7D0F::
ld [hl], b ; $7D23: $70
ret ; $7D24: $C9
GelState0Handler::
ZolState0Handler::
call func_006_7D0F ; $7D25: $CD $0F $7D
call GetEntityTransitionCountdown ; $7D28: $CD $05 $0C
ret nz ; $7D2B: $C0
@ -211,7 +211,7 @@ GelState0Handler::
ld a, $04 ; $7D31: $3E $04
jp ApplyVectorTowardsLink_trampoline ; $7D33: $C3 $AA $3B
GelState2Handler::
ZolState2Handler::
call GetEntityTransitionCountdown ; $7D36: $CD $05 $0C
jr nz, .jr_7D4A ; $7D39: $20 $0F
@ -242,7 +242,7 @@ jr_006_7D5B:
ld [hl], b ; $7D5F: $70
jp func_006_7D0F ; $7D60: $C3 $0F $7D
GelState3Handler::
ZolState3Handler::
call func_006_7D0F ; $7D63: $CD $0F $7D
ldh a, [hMultiPurposeG] ; $7D66: $F0 $E8
and a ; $7D68: $A7
@ -254,7 +254,7 @@ GelState3Handler::
.ret_7D6F
ret ; $7D6F: $C9
GelState4Handler::
ZolState4Handler::
call GetEntityTransitionCountdown ; $7D70: $CD $05 $0C
jr nz, .jr_7D91 ; $7D73: $20 $1C

8
src/code/entities/07_chest_with_item.asm
View File

@ -91,10 +91,10 @@ ChestWithItemEntityHandler::
; wC16A = 0
ld [wC16A], a ; $7BE5: $EA $6A $C1
ldh a, [hActiveEntitySpriteVariant] ; $7BE8: $F0 $F1
cp CHEST_GEL ; $7BEA: $FE $22
jr nz, notGelChest ; $7BEC: $20 $3B
cp CHEST_ZOL ; $7BEA: $FE $22
jr nz, notZolChest ; $7BEC: $20 $3B
ld a, ENTITY_GEL ; $7BEE: $3E $1B
ld a, ENTITY_ZOL ; $7BEE: $3E $1B
call SpawnNewEntity_trampoline ; $7BF0: $CD $86 $3B
jp c, ClearEntityStatus_07 ; $7BF3: $DA $A4 $7E
@ -125,7 +125,7 @@ ChestWithItemEntityHandler::
ldh [hJingle], a ; $7C24: $E0 $F2
jp ClearEntityStatus_07 ; $7C26: $C3 $A4 $7E
notGelChest:
notZolChest:
cp CHEST_MESSAGE ; $7C29: $FE $21
jr z, jr_007_7C5E ; $7C2B: $28 $31

10
src/code/entities/07_hiding_gel.asm → src/code/entities/07_hiding_zol.asm
View File

@ -1,6 +1,6 @@
; define sprite variants by selecting tile n° and setting OAM attributes (palette + flags) in a list
HidingGel2SpriteVariants::
HidingZol2SpriteVariants::
.variant0
db $FF, $FF
db $FF, $FF
@ -15,22 +15,22 @@ HidingGel2SpriteVariants::
db $52, $20
; define sprite variants by selecting tile n° and setting OAM attributes (palette + flags) in a list
HidingGel1SpriteVariants::
HidingZol1SpriteVariants::
.variant0
db $56, $00
db $56, $00
HidingGelEntityHandler::
HidingZolEntityHandler::
ldh a, [hActiveEntitySpriteVariant] ; $72AF: $F0 $F1
cp $01 ; $72B1: $FE $01
jr nz, .jr_72BD ; $72B3: $20 $08
ld de, HidingGel1SpriteVariants ; $72B5: $11 $AB $72
ld de, HidingZol1SpriteVariants ; $72B5: $11 $AB $72
call RenderActiveEntitySprite ; $72B8: $CD $77 $3C
jr jr_007_72C3 ; $72BB: $18 $06
.jr_72BD
ld de, HidingGel2SpriteVariants ; $72BD: $11 $9B $72
ld de, HidingZol2SpriteVariants ; $72BD: $11 $9B $72
call RenderActiveEntitySpritesPair ; $72C0: $CD $C0 $3B
jr_007_72C3:

8
src/code/entities/_handlers.asm
View File

@ -40,8 +40,8 @@ EntityHandlersTable::
._18 far_pointer PolsVoiceEntityHandler ; $18
._19 far_pointer KeeseEntityHandler
._1A far_pointer StalfosAggressiveEntityHandler
._1B far_pointer GelEntityHandler
._1C far_pointer MiniGelEntityHandler ; $1C
._1B far_pointer ZolEntityHandler
._1C far_pointer GelEntityHandler ; $1C
._1D far_pointer_null
._1E far_pointer StalfosEvasiveEntityHandler
._1F far_pointer GibdoEntityHandler
@ -168,7 +168,7 @@ EntityHandlersTable::
._98 far_pointer HorsePieceEntityHandler ; $98
._99 far_pointer WaterTektiteEntityHandler
._9A far_pointer FlyingTilesEntityHandler
._9B far_pointer HidingGelEntityHandler
._9B far_pointer HidingZolEntityHandler
._9C far_pointer StarEntityHandler ; $9C
._9D far_pointer LiftableStatueEntityHandler
._9E far_pointer FireballShooterEntityHandler
@ -319,7 +319,7 @@ EntityInitHandlersTable::
._18 dw EntityInitWithRandomDirection
._19 dw EntityInitWithRandomDirection
._1A dw EntityInitWithRandomDirection
._1B dw EntityInitGel
._1B dw EntityInitZol
._1C dw EntityInitWithRandomDirection
._1D dw EntityInitWizrobe
._1E dw IncrementEntityState

10
src/code/entities/bank3.asm
View File

@ -313,7 +313,7 @@ EntityInitSideViewPlatformVertical::
inc [hl] ; $4951: $34
ret ; $4952: $C9
EntityInitGel::
EntityInitZol::
ld hl, wEntitiesHealthTable ; $4953: $21 $60 $C3
add hl, bc ; $4956: $09
ld [hl], $02 ; $4957: $36 $02
@ -6017,18 +6017,18 @@ ApplyLinkCollisionWithEnemy::
.goombaEnd
;
; Special case when Link collisions with a Mini-Gel
; Special case when Link collides with a Gel
ldh a, [hActiveEntityType] ; $6D3D: $F0 $EB
cp ENTITY_MINI_GEL ; $6D3F: $FE $1C
jr nz, .miniGelEnd ; $6D41: $20 $0B
cp ENTITY_GEL ; $6D3F: $FE $1C
jr nz, .gelEnd ; $6D41: $20 $0B
call GetEntityTransitionCountdown ; $6D43: $CD $05 $0C
ld [hl], $80 ; $6D46: $36 $80
call IncrementEntityState ; $6D48: $CD $12 $3B
ld [hl], $04 ; $6D4B: $36 $04
ret ; $6D4D: $C9
.miniGelEnd
.gelEnd
cp ENTITY_CUE_BALL ; $6D4E: $FE $8E
jr z, .jr_6D5D ; $6D50: $28 $0B

2
src/code/entities/bank6.asm
View File

@ -559,7 +559,7 @@ include "code/entities/06_anti_fairy.asm"
include "code/entities/06_tektite.asm"
include "code/entities/06_boo_buddy.asm"
include "code/entities/06_floating_item.asm"
include "code/entities/06_gel.asm"
include "code/entities/06_zol.asm"
include "code/entities/06_like_like.asm"
include "code/entities/06_gibdo.asm"

2
src/code/entities/bank7.asm
View File

@ -36,7 +36,7 @@ include "code/entities/07_master_stalfos.asm"
include "code/entities/07_fireball_shooter.asm"
include "code/entities/07_kanalet_bombable_wall.asm"
include "code/entities/07_star.asm"
include "code/entities/07_hiding_gel.asm"
include "code/entities/07_hiding_zol.asm"
include "code/entities/07_flying_tiles_spawner.asm"
include "code/entities/07_water_tektite.asm"
include "code/entities/07_horse_piece.asm"

6
src/constants/entities.asm
View File

@ -64,8 +64,8 @@ ENTITY_SPARK_CLOCKWISE equ $17
ENTITY_POLS_VOICE equ $18
ENTITY_KEESE equ $19
ENTITY_STALFOS_AGGRESSIVE equ $1A
ENTITY_GEL equ $1B
ENTITY_MINI_GEL equ $1C
ENTITY_ZOL equ $1B
ENTITY_GEL equ $1C
;ENTITY_DISABLED equ $1D
ENTITY_STALFOS_EVASIVE equ $1E
ENTITY_GIBDO equ $1F
@ -192,7 +192,7 @@ ENTITY_DIVABLE_WATER equ $97
ENTITY_HORSE_PIECE equ $98
ENTITY_WATER_TEKTITE equ $99
ENTITY_FLYING_TILES equ $9A
ENTITY_HIDING_GEL equ $9B
ENTITY_HIDING_ZOL equ $9B
ENTITY_STAR equ $9C
ENTITY_LIFTABLE_STATUE equ $9D
ENTITY_FIREBALL_SHOOTER equ $9E

2
src/constants/gameplay.asm
View File

@ -328,7 +328,7 @@ CHEST_RUPEES_500 equ $1F ; POI: Unused
CHEST_SEASHELL equ $20
; Miscellaneous
CHEST_MESSAGE equ $21 ; used in Catfish's Maw
CHEST_GEL equ $22 ; green slime enemy
CHEST_ZOL equ $22 ; green slime enemy
; Values for wTradeSequenceItem
TRADING_ITEM_NONE equ $00

2
src/constants/gfx.asm
View File

@ -145,7 +145,7 @@ OBJECT_ROUNDED_BLOCK equ $6E
OBJECT_OWN_STATUE equ $6F
OBJECT_WEATHER_VANE_TOP equ $91
OBJECT_BOMBABLE_CAVE_DOOR equ $BA
OBJECT_FLAGELLO_KEYHOLE equ $C0
OBJECT_TAIL_KEYHOLE equ $C0
OBJECT_CLOSED_GATE equ $C2
OBJECT_GROUND_STAIRS equ $C6
OBJECT_BUSH_GROUND_STAIRS equ $D3

2
src/constants/memory/hram.asm
View File

@ -214,7 +214,7 @@ hNextMusicTrackToFadeInto::
ds 1 ; FFB1
; When 1, Link is moving much slower, like when being
; incapacited by a mini-gel.
; incapacited by a gel.
hLinkSlowWalkingSpeed::
ds 1 ; FFB2

4
src/data/chests/indoors_a.asm
View File

@ -89,7 +89,7 @@
db CHEST_STONE_BEAK
db 0
db CHEST_RUPEES_200
db CHEST_GEL
db CHEST_ZOL
; 50 --------------------
db CHEST_MAP
db CHEST_SMALL_KEY
@ -121,7 +121,7 @@
db CHEST_MAP
db 0
db 0
db CHEST_GEL
db CHEST_ZOL
db CHEST_RUPEES_50
db 0
; 70 --------------------

4
src/data/chests/indoors_b.asm
View File

@ -100,7 +100,7 @@
db 0
db 0
db 0
db CHEST_GEL
db CHEST_ZOL
db 0
db 0
db CHEST_COMPASS
@ -152,7 +152,7 @@
db 0
db 0
db 0
db CHEST_GEL
db CHEST_ZOL
db 0
db 0
db 0

20
src/data/entities/color_dungeon.asm
View File

@ -20,21 +20,21 @@ ColorDungeon04Entities::
entities_end
ColorDungeon05Entities::
entity $2, $3, ENTITY_HIDING_GEL
entity $5, $3, ENTITY_HIDING_GEL
entity $2, $6, ENTITY_HIDING_GEL
entity $5, $6, ENTITY_HIDING_GEL
entity $2, $3, ENTITY_HIDING_ZOL
entity $5, $3, ENTITY_HIDING_ZOL
entity $2, $6, ENTITY_HIDING_ZOL
entity $5, $6, ENTITY_HIDING_ZOL
entity $1, $8, ENTITY_DROPPABLE_FAIRY
entity $6, $1, ENTITY_DROPPABLE_HEART
entities_end
ColorDungeon06Entities::
entity $4, $2, ENTITY_HIDING_GEL
entity $3, $3, ENTITY_HIDING_GEL
entity $3, $2, ENTITY_GEL
entity $1, $4, ENTITY_GEL
entity $3, $8, ENTITY_HIDING_GEL
entity $4, $7, ENTITY_HIDING_GEL
entity $4, $2, ENTITY_HIDING_ZOL
entity $3, $3, ENTITY_HIDING_ZOL
entity $3, $2, ENTITY_ZOL
entity $1, $4, ENTITY_ZOL
entity $3, $8, ENTITY_HIDING_ZOL
entity $4, $7, ENTITY_HIDING_ZOL
entities_end
ColorDungeon07Entities::

194
src/data/entities/indoors_a.asm
View File

@ -24,8 +24,8 @@ IndoorsA04Entities::
IndoorsA05Entities::
entity $1, $3, ENTITY_SPARK_CLOCKWISE
entity $6, $6, ENTITY_SPARK_COUNTER_CLOCKWISE
entity $1, $5, ENTITY_MINI_GEL
entity $3, $3, ENTITY_MINI_GEL
entity $1, $5, ENTITY_GEL
entity $3, $3, ENTITY_GEL
entities_end
IndoorsA06Entities::
@ -98,8 +98,8 @@ IndoorsA12Entities::
IndoorsA13Entities::
entity $1, $4, ENTITY_HARDHAT_BEETLE
entity $5, $2, ENTITY_MINI_GEL
entity $5, $7, ENTITY_MINI_GEL
entity $5, $2, ENTITY_GEL
entity $5, $7, ENTITY_GEL
entities_end
IndoorsA14Entities::
@ -110,10 +110,10 @@ IndoorsA14Entities::
entities_end
IndoorsA15Entities::
entity $4, $2, ENTITY_HIDING_GEL
entity $3, $2, ENTITY_HIDING_GEL
entity $3, $4, ENTITY_HIDING_GEL
entity $4, $4, ENTITY_HIDING_GEL
entity $4, $2, ENTITY_HIDING_ZOL
entity $3, $2, ENTITY_HIDING_ZOL
entity $3, $4, ENTITY_HIDING_ZOL
entity $4, $4, ENTITY_HIDING_ZOL
entity $1, $1, ENTITY_FIREBALL_SHOOTER
entity $1, $5, ENTITY_FIREBALL_SHOOTER
entities_end
@ -183,7 +183,7 @@ IndoorsA22Entities::
IndoorsA23Entities::
entity $1, $7, ENTITY_HARDHAT_BEETLE
entity $2, $3, ENTITY_MINI_GEL
entity $2, $3, ENTITY_GEL
entity $6, $4, ENTITY_KEESE
entities_end
@ -199,7 +199,7 @@ IndoorsA24Entities::
IndoorsA25Entities::
entity $4, $4, ENTITY_POLS_VOICE
entity $6, $7, ENTITY_POLS_VOICE
entity $4, $6, ENTITY_GEL
entity $4, $6, ENTITY_ZOL
entity $5, $5, ENTITY_DROPPABLE_RUPEE
entity $6, $3, ENTITY_DROPPABLE_FAIRY
entities_end
@ -372,24 +372,24 @@ IndoorsA41Entities::
entities_end
IndoorsA42Entities::
entity $2, $3, ENTITY_HIDING_GEL
entity $2, $3, ENTITY_HIDING_ZOL
entity $3, $2, ENTITY_MOBLIN
entity $3, $5, ENTITY_HIDING_GEL
entity $4, $6, ENTITY_HIDING_GEL
entity $3, $5, ENTITY_HIDING_ZOL
entity $4, $6, ENTITY_HIDING_ZOL
entities_end
IndoorsA43Entities::
entity $1, $2, ENTITY_TIMER_BOMBITE
entity $2, $6, ENTITY_TIMER_BOMBITE
entity $4, $7, ENTITY_TIMER_BOMBITE
entity $3, $3, ENTITY_HIDING_GEL
entity $3, $7, ENTITY_HIDING_GEL
entity $3, $3, ENTITY_HIDING_ZOL
entity $3, $7, ENTITY_HIDING_ZOL
entities_end
IndoorsA44Entities::
entity $2, $3, ENTITY_STALFOS_AGGRESSIVE
entity $3, $5, ENTITY_GEL
entity $4, $2, ENTITY_GEL
entity $3, $5, ENTITY_ZOL
entity $4, $2, ENTITY_ZOL
entities_end
IndoorsA45Entities::
@ -405,23 +405,23 @@ IndoorsA46Entities::
IndoorsA47Entities::
entity $1, $3, ENTITY_STALFOS_AGGRESSIVE
entity $4, $6, ENTITY_STALFOS_AGGRESSIVE
entity $3, $2, ENTITY_HIDING_GEL
entity $3, $2, ENTITY_HIDING_ZOL
entity $0, $3, ENTITY_OWL_STATUE
entities_end
IndoorsA48Entities::
entity $2, $2, ENTITY_PAIRODD
entity $5, $6, ENTITY_PAIRODD
entity $3, $3, ENTITY_HIDING_GEL
entity $3, $6, ENTITY_HIDING_GEL
entity $3, $3, ENTITY_HIDING_ZOL
entity $3, $6, ENTITY_HIDING_ZOL
entities_end
IndoorsA49Entities::
entity $3, $4, ENTITY_MINI_GEL
entity $4, $3, ENTITY_MINI_GEL
entity $4, $5, ENTITY_MINI_GEL
entity $5, $4, ENTITY_MINI_GEL
entity $4, $4, ENTITY_GEL
entity $3, $4, ENTITY_GEL
entity $4, $3, ENTITY_GEL
entity $4, $5, ENTITY_GEL
entity $5, $4, ENTITY_GEL
entity $4, $4, ENTITY_ZOL
entities_end
IndoorsA4AEntities::
@ -439,31 +439,31 @@ IndoorsA4BEntities::
entities_end
IndoorsA4CEntities::
entity $2, $5, ENTITY_HIDING_GEL
entity $2, $7, ENTITY_HIDING_GEL
entity $4, $5, ENTITY_HIDING_GEL
entity $4, $7, ENTITY_HIDING_GEL
entity $2, $5, ENTITY_HIDING_ZOL
entity $2, $7, ENTITY_HIDING_ZOL
entity $4, $5, ENTITY_HIDING_ZOL
entity $4, $7, ENTITY_HIDING_ZOL
entities_end
IndoorsA4DEntities::
entity $1, $2, ENTITY_HIDING_GEL
entity $2, $1, ENTITY_HIDING_GEL
entity $2, $6, ENTITY_HIDING_GEL
entity $2, $8, ENTITY_HIDING_GEL
entity $6, $8, ENTITY_HIDING_GEL
entity $1, $2, ENTITY_HIDING_ZOL
entity $2, $1, ENTITY_HIDING_ZOL
entity $2, $6, ENTITY_HIDING_ZOL
entity $2, $8, ENTITY_HIDING_ZOL
entity $6, $8, ENTITY_HIDING_ZOL
entities_end
IndoorsA4EEntities::
entity $3, $1, ENTITY_MINI_GEL
entity $3, $1, ENTITY_GEL
entity $3, $5, ENTITY_STALFOS_EVASIVE
entity $4, $5, ENTITY_STALFOS_EVASIVE
entities_end
IndoorsA4FEntities::
entity $3, $6, ENTITY_HIDING_GEL
entity $4, $6, ENTITY_HIDING_GEL
entity $3, $7, ENTITY_HIDING_GEL
entity $4, $7, ENTITY_HIDING_GEL
entity $3, $6, ENTITY_HIDING_ZOL
entity $4, $6, ENTITY_HIDING_ZOL
entity $3, $7, ENTITY_HIDING_ZOL
entity $4, $7, ENTITY_HIDING_ZOL
entities_end
IndoorsA50Entities::
@ -473,7 +473,7 @@ IndoorsA50Entities::
entities_end
IndoorsA51Entities::
entity $3, $1, ENTITY_MINI_GEL
entity $3, $1, ENTITY_GEL
entity $4, $1, ENTITY_BOUNCING_BOMBITE
entity $4, $8, ENTITY_BOUNCING_BOMBITE
entity $3, $5, ENTITY_MOBLIN_SWORD
@ -497,18 +497,18 @@ IndoorsA54Entities::
IndoorsA55Entities::
entity $2, $7, ENTITY_PAIRODD
entity $3, $6, ENTITY_HIDING_GEL
entity $4, $1, ENTITY_HIDING_GEL
entity $3, $6, ENTITY_HIDING_ZOL
entity $4, $1, ENTITY_HIDING_ZOL
entity $5, $7, ENTITY_PAIRODD
entity $4, $2, ENTITY_FLOATING_ITEM_2
entities_end
IndoorsA56Entities::
entity $2, $5, ENTITY_HIDING_GEL
entity $4, $5, ENTITY_HIDING_GEL
entity $2, $7, ENTITY_HIDING_GEL
entity $4, $7, ENTITY_HIDING_GEL
entity $3, $2, ENTITY_MINI_GEL
entity $2, $5, ENTITY_HIDING_ZOL
entity $4, $5, ENTITY_HIDING_ZOL
entity $2, $7, ENTITY_HIDING_ZOL
entity $4, $7, ENTITY_HIDING_ZOL
entity $3, $2, ENTITY_GEL
entities_end
IndoorsA57Entities::
@ -518,9 +518,9 @@ IndoorsA57Entities::
entities_end
IndoorsA58Entities::
entity $3, $4, ENTITY_HIDING_GEL
entity $4, $1, ENTITY_HIDING_GEL
entity $5, $6, ENTITY_HIDING_GEL
entity $3, $4, ENTITY_HIDING_ZOL
entity $4, $1, ENTITY_HIDING_ZOL
entity $5, $6, ENTITY_HIDING_ZOL
entity $3, $6, ENTITY_PAIRODD
entity $5, $2, ENTITY_MOBLIN
entity $5, $4, ENTITY_DROPPABLE_BOMBS
@ -566,8 +566,8 @@ IndoorsA5FEntities::
IndoorsA60Entities::
entity $0, $3, ENTITY_FIREBALL_SHOOTER
entity $0, $5, ENTITY_FIREBALL_SHOOTER
entity $5, $3, ENTITY_GEL
entity $5, $5, ENTITY_GEL
entity $5, $3, ENTITY_ZOL
entity $5, $5, ENTITY_ZOL
entities_end
IndoorsA61Entities::
@ -587,7 +587,7 @@ IndoorsA63Entities::
entity $3, $4, ENTITY_TILE_GLINT_SHOWN
entity $3, $3, ENTITY_IRON_MASK
entity $3, $6, ENTITY_IRON_MASK
entity $4, $5, ENTITY_GEL
entity $4, $5, ENTITY_ZOL
entity $4, $4, ENTITY_FLOATING_ITEM_2
entities_end
@ -616,23 +616,23 @@ IndoorsA67Entities::
IndoorsA68Entities::
entity $0, $4, ENTITY_FIREBALL_SHOOTER
entity $0, $5, ENTITY_FIREBALL_SHOOTER
entity $3, $7, ENTITY_HIDING_GEL
entity $5, $8, ENTITY_HIDING_GEL
entity $3, $7, ENTITY_HIDING_ZOL
entity $5, $8, ENTITY_HIDING_ZOL
entity $6, $1, ENTITY_SPARK_CLOCKWISE
entities_end
IndoorsA69Entities::
entity $4, $4, ENTITY_GEL
entity $4, $5, ENTITY_GEL
entity $4, $4, ENTITY_ZOL
entity $4, $5, ENTITY_ZOL
entity $6, $7, ENTITY_DROPPABLE_RUPEE
entity $6, $8, ENTITY_DROPPABLE_HEART
entities_end
IndoorsA6AEntities::
entity $1, $3, ENTITY_STAR
entity $2, $4, ENTITY_HIDING_GEL
entity $2, $4, ENTITY_HIDING_ZOL
entity $3, $2, ENTITY_MOBLIN_SWORD
entity $5, $8, ENTITY_GEL
entity $5, $8, ENTITY_ZOL
entities_end
IndoorsA6BEntities::
@ -644,15 +644,15 @@ IndoorsA6BEntities::
entities_end
IndoorsA6CEntities::
entity $2, $3, ENTITY_GEL
entity $5, $3, ENTITY_GEL
entity $5, $6, ENTITY_GEL
entity $2, $3, ENTITY_ZOL
entity $5, $3, ENTITY_ZOL
entity $5, $6, ENTITY_ZOL
entity $5, $4, ENTITY_DROPPABLE_HEART
entities_end
IndoorsA6DEntities::
entity $3, $7, ENTITY_MOBLIN_SWORD
entity $4, $8, ENTITY_GEL
entity $4, $8, ENTITY_ZOL
entity $5, $5, ENTITY_MOBLIN
entity $1, $8, ENTITY_DROPPABLE_HEART
entities_end
@ -665,15 +665,15 @@ IndoorsA6EEntities::
IndoorsA6FEntities::
entity $4, $3, ENTITY_OWL_STATUE
entity $3, $3, ENTITY_HIDING_GEL
entity $3, $3, ENTITY_HIDING_ZOL
entity $3, $6, ENTITY_SPIKED_BEETLE
entity $4, $2, ENTITY_SPIKED_BEETLE
entity $2, $5, ENTITY_DROPPABLE_FAIRY
entities_end
IndoorsA70Entities::
entity $5, $5, ENTITY_GEL
entity $5, $8, ENTITY_GEL
entity $5, $5, ENTITY_ZOL
entity $5, $8, ENTITY_ZOL
entities_end
IndoorsA71Entities::
@ -720,13 +720,13 @@ IndoorsA76Entities::
IndoorsA77Entities::
entity $4, $2, ENTITY_SPIKED_BEETLE
entity $4, $6, ENTITY_SPIKED_BEETLE
entity $5, $5, ENTITY_GEL
entity $5, $5, ENTITY_ZOL
entities_end
IndoorsA78Entities::
entity $3, $5, ENTITY_SPIKED_BEETLE
entity $5, $3, ENTITY_SPARK_COUNTER_CLOCKWISE
entity $5, $6, ENTITY_GEL
entity $5, $6, ENTITY_ZOL
entity $6, $2, ENTITY_SPIKED_BEETLE
entities_end
@ -796,9 +796,9 @@ IndoorsA86Entities::
IndoorsA87Entities::
entity $1, $6, ENTITY_SPARK_COUNTER_CLOCKWISE
entity $2, $5, ENTITY_HIDING_GEL
entity $3, $7, ENTITY_HIDING_GEL
entity $4, $2, ENTITY_HIDING_GEL
entity $2, $5, ENTITY_HIDING_ZOL
entity $3, $7, ENTITY_HIDING_ZOL
entity $4, $2, ENTITY_HIDING_ZOL
entity $1, $8, ENTITY_DROPPABLE_HEART
entity $6, $1, ENTITY_DROPPABLE_HEART
entities_end
@ -852,7 +852,7 @@ IndoorsA8EEntities::
IndoorsA8FEntities::
entity $4, $2, ENTITY_SPARK_COUNTER_CLOCKWISE
entity $6, $4, ENTITY_GEL
entity $6, $4, ENTITY_ZOL
entity $6, $6, ENTITY_MOBLIN_SWORD
entity $5, $4, ENTITY_FLOATING_ITEM
entities_end
@ -882,8 +882,8 @@ IndoorsA93Entities::
entities_end
IndoorsA94Entities::
entity $2, $4, ENTITY_GEL
entity $4, $3, ENTITY_GEL
entity $2, $4, ENTITY_ZOL
entity $4, $3, ENTITY_ZOL
entity $5, $5, ENTITY_ANTI_FAIRY
entity $3, $4, ENTITY_DROPPABLE_HEART
entity $3, $5, ENTITY_DROPPABLE_ARROWS
@ -894,9 +894,9 @@ IndoorsA95Entities::
entities_end
IndoorsA96Entities::
entity $2, $4, ENTITY_HIDING_GEL
entity $3, $2, ENTITY_HIDING_GEL
entity $4, $4, ENTITY_HIDING_GEL
entity $2, $4, ENTITY_HIDING_ZOL
entity $3, $2, ENTITY_HIDING_ZOL
entity $4, $4, ENTITY_HIDING_ZOL
entity $2, $5, ENTITY_DROPPABLE_BOMBS
entity $2, $6, ENTITY_DROPPABLE_BOMBS
entity $3, $6, ENTITY_DROPPABLE_HEART
@ -915,14 +915,14 @@ IndoorsA98Entities::
entity $1, $6, ENTITY_SPIKE_TRAP
entity $6, $4, ENTITY_SPIKE_TRAP
entity $6, $6, ENTITY_SPIKE_TRAP
entity $2, $2, ENTITY_HIDING_GEL
entity $5, $2, ENTITY_HIDING_GEL
entity $2, $2, ENTITY_HIDING_ZOL
entity $5, $2, ENTITY_HIDING_ZOL
entities_end
IndoorsA99Entities::
entity $1, $5, ENTITY_FIREBALL_SHOOTER
entity $3, $2, ENTITY_GEL
entity $3, $4, ENTITY_GEL
entity $3, $2, ENTITY_ZOL
entity $3, $4, ENTITY_ZOL
entity $3, $7, ENTITY_DROPPABLE_FAIRY
entity $4, $3, ENTITY_FLOATING_ITEM_2
entities_end
@ -973,7 +973,7 @@ IndoorsA9FEntities::
IndoorsAA0Entities::
entity $4, $4, ENTITY_IRON_MASK
entity $4, $5, ENTITY_SPARK_COUNTER_CLOCKWISE
entity $5, $5, ENTITY_GEL
entity $5, $5, ENTITY_ZOL
entities_end
IndoorsAA1Entities::
@ -1097,9 +1097,9 @@ IndoorsAB7Entities::
IndoorsAB8Entities::
entity $5, $7, ENTITY_DROPPABLE_BOMBS
entity $5, $8, ENTITY_DROPPABLE_BOMBS
entity $2, $5, ENTITY_HIDING_GEL
entity $3, $2, ENTITY_HIDING_GEL
entity $3, $4, ENTITY_HIDING_GEL
entity $2, $5, ENTITY_HIDING_ZOL
entity $3, $2, ENTITY_HIDING_ZOL
entity $3, $4, ENTITY_HIDING_ZOL
entity $3, $2, ENTITY_FLOATING_ITEM_2
entities_end
@ -1156,18 +1156,18 @@ IndoorsAC0Entities::
entities_end
IndoorsAC1Entities::
entity $4, $6, ENTITY_HIDING_GEL
entity $5, $3, ENTITY_HIDING_GEL
entity $4, $6, ENTITY_HIDING_ZOL
entity $5, $3, ENTITY_HIDING_ZOL
entity $1, $1, ENTITY_DROPPABLE_HEART
entity $2, $5, ENTITY_DROPPABLE_BOMBS
entity $6, $1, ENTITY_DROPPABLE_ARROWS
entities_end
IndoorsAC2Entities::
entity $2, $3, ENTITY_HIDING_GEL
entity $2, $5, ENTITY_HIDING_GEL
entity $4, $5, ENTITY_HIDING_GEL
entity $5, $3, ENTITY_HIDING_GEL
entity $2, $3, ENTITY_HIDING_ZOL
entity $2, $5, ENTITY_HIDING_ZOL
entity $4, $5, ENTITY_HIDING_ZOL
entity $5, $3, ENTITY_HIDING_ZOL
entity $3, $4, ENTITY_LIFTABLE_STATUE
entities_end
@ -1206,10 +1206,10 @@ IndoorsAC9Entities::
IndoorsACAEntities::
entity $4, $4, ENTITY_TRACTOR_DEVICE
entity $2, $4, ENTITY_HIDING_GEL
entity $5, $1, ENTITY_HIDING_GEL
entity $4, $6, ENTITY_HIDING_GEL
entity $6, $4, ENTITY_HIDING_GEL
entity $2, $4, ENTITY_HIDING_ZOL
entity $5, $1, ENTITY_HIDING_ZOL
entity $4, $6, ENTITY_HIDING_ZOL
entity $6, $4, ENTITY_HIDING_ZOL
entities_end
IndoorsACBEntities::
@ -1220,8 +1220,8 @@ IndoorsACBEntities::
IndoorsACCEntities::
entity $1, $1, ENTITY_FIREBALL_SHOOTER
entity $1, $8, ENTITY_FIREBALL_SHOOTER
entity $3, $4, ENTITY_GEL
entity $3, $5, ENTITY_GEL
entity $3, $4, ENTITY_ZOL
entity $3, $5, ENTITY_ZOL
entity $3, $7, ENTITY_DROPPABLE_HEART
entity $4, $2, ENTITY_DROPPABLE_BOMBS
entities_end

180
src/data/entities/indoors_b.asm
View File

@ -107,10 +107,10 @@ IndoorsB14Entities::
entities_end
IndoorsB15Entities::
entity $2, $2, ENTITY_HIDING_GEL
entity $2, $2, ENTITY_HIDING_ZOL
entity $3, $4, ENTITY_SMASHABLE_PILLAR
entity $4, $5, ENTITY_HIDING_GEL
entity $1, $7, ENTITY_GEL
entity $4, $5, ENTITY_HIDING_ZOL
entity $1, $7, ENTITY_ZOL
entities_end
IndoorsB16Entities::
@ -123,19 +123,19 @@ IndoorsB16Entities::
IndoorsB17Entities::
entity $1, $2, ENTITY_SPARK_COUNTER_CLOCKWISE
entity $2, $5, ENTITY_SPARK_CLOCKWISE
entity $3, $3, ENTITY_HIDING_GEL
entity $5, $7, ENTITY_HIDING_GEL
entity $3, $3, ENTITY_HIDING_ZOL
entity $5, $7, ENTITY_HIDING_ZOL
entities_end
IndoorsB18Entities::
entity $4, $5, ENTITY_SMASHABLE_PILLAR
entity $3, $7, ENTITY_HIDING_GEL
entity $5, $4, ENTITY_HIDING_GEL
entity $3, $7, ENTITY_HIDING_ZOL
entity $5, $4, ENTITY_HIDING_ZOL
entities_end
IndoorsB19Entities::
entity $4, $4, ENTITY_SMASHABLE_PILLAR
entity $5, $2, ENTITY_HIDING_GEL
entity $5, $2, ENTITY_HIDING_ZOL
entity $5, $6, ENTITY_FLOATING_ITEM_2
entities_end
@ -158,8 +158,8 @@ IndoorsB1CEntities::
IndoorsB1DEntities::
entity $2, $4, ENTITY_CRYSTAL_SWITCH
entity $3, $7, ENTITY_HIDING_GEL
entity $6, $3, ENTITY_HIDING_GEL
entity $3, $7, ENTITY_HIDING_ZOL
entity $6, $3, ENTITY_HIDING_ZOL
entities_end
IndoorsB1EEntities::
@ -177,7 +177,7 @@ IndoorsB1FEntities::
IndoorsB20Entities::
entity $1, $5, ENTITY_HORSE_PIECE
entity $2, $3, ENTITY_HORSE_PIECE
entity $4, $5, ENTITY_GEL
entity $4, $5, ENTITY_ZOL
entity $5, $7, ENTITY_LASER
entities_end
@ -308,10 +308,10 @@ IndoorsB3BEntities::
entities_end
IndoorsB3CEntities::
entity $1, $1, ENTITY_HIDING_GEL
entity $2, $1, ENTITY_HIDING_GEL
entity $2, $3, ENTITY_HIDING_GEL
entity $3, $4, ENTITY_HIDING_GEL
entity $1, $1, ENTITY_HIDING_ZOL
entity $2, $1, ENTITY_HIDING_ZOL
entity $2, $3, ENTITY_HIDING_ZOL
entity $3, $4, ENTITY_HIDING_ZOL
entities_end
IndoorsB3DEntities::
@ -354,15 +354,15 @@ IndoorsB43Entities::
IndoorsB44Entities::
entity $1, $6, ENTITY_SPARK_COUNTER_CLOCKWISE
entity $1, $7, ENTITY_SPARK_COUNTER_CLOCKWISE
entity $4, $2, ENTITY_HIDING_GEL
entity $5, $2, ENTITY_HIDING_GEL
entity $4, $2, ENTITY_HIDING_ZOL
entity $5, $2, ENTITY_HIDING_ZOL
entities_end
IndoorsB45Entities::
entity $2, $3, ENTITY_HIDING_GEL
entity $2, $6, ENTITY_HIDING_GEL
entity $5, $3, ENTITY_HIDING_GEL
entity $5, $6, ENTITY_HIDING_GEL
entity $2, $3, ENTITY_HIDING_ZOL
entity $2, $6, ENTITY_HIDING_ZOL
entity $5, $3, ENTITY_HIDING_ZOL
entity $5, $6, ENTITY_HIDING_ZOL
entity $3, $8, ENTITY_FLOATING_ITEM
entity $0, $7, ENTITY_OWL_STATUE
entities_end
@ -414,8 +414,8 @@ IndoorsB4EEntities::
entities_end
IndoorsB4FEntities::
entity $2, $2, ENTITY_HIDING_GEL
entity $2, $4, ENTITY_HIDING_GEL
entity $2, $2, ENTITY_HIDING_ZOL
entity $2, $4, ENTITY_HIDING_ZOL
entities_end
IndoorsB50Entities::
@ -433,8 +433,8 @@ IndoorsB52Entities::
IndoorsB53Entities::
entity $5, $1, ENTITY_OWL_STATUE
entity $1, $8, ENTITY_LASER
entity $3, $4, ENTITY_HIDING_GEL
entity $5, $5, ENTITY_HIDING_GEL
entity $3, $4, ENTITY_HIDING_ZOL
entity $5, $5, ENTITY_HIDING_ZOL
entities_end
IndoorsB54Entities::
@ -471,8 +471,8 @@ IndoorsB59Entities::
IndoorsB5AEntities::
entity $4, $7, ENTITY_HOLE_FILLER
entity $4, $2, ENTITY_HIDING_GEL
entity $5, $3, ENTITY_HIDING_GEL
entity $4, $2, ENTITY_HIDING_ZOL
entity $5, $3, ENTITY_HIDING_ZOL
entity $3, $4, ENTITY_FLOATING_ITEM_2
entities_end
@ -481,9 +481,9 @@ IndoorsB5BEntities::
entities_end
IndoorsB5CEntities::
entity $3, $3, ENTITY_HIDING_GEL
entity $3, $5, ENTITY_HIDING_GEL
entity $4, $4, ENTITY_HIDING_GEL
entity $3, $3, ENTITY_HIDING_ZOL
entity $3, $5, ENTITY_HIDING_ZOL
entity $4, $4, ENTITY_HIDING_ZOL
entity $6, $7, ENTITY_TRACTOR_DEVICE
entities_end
@ -639,9 +639,9 @@ IndoorsB80Entities::
entities_end
IndoorsB81Entities::
entity $1, $3, ENTITY_HIDING_GEL
entity $1, $4, ENTITY_HIDING_GEL
entity $1, $5, ENTITY_HIDING_GEL
entity $1, $3, ENTITY_HIDING_ZOL
entity $1, $4, ENTITY_HIDING_ZOL
entity $1, $5, ENTITY_HIDING_ZOL
entities_end
IndoorsB82Entities::
@ -658,31 +658,31 @@ IndoorsB84Entities::
entities_end
IndoorsB85Entities::
entity $4, $8, ENTITY_HIDING_GEL
entity $4, $8, ENTITY_HIDING_ZOL
entities_end
IndoorsB86Entities::
entity $3, $6, ENTITY_HARDHAT_BEETLE
entity $3, $4, ENTITY_HIDING_GEL
entity $4, $7, ENTITY_HIDING_GEL
entity $3, $4, ENTITY_HIDING_ZOL
entity $4, $7, ENTITY_HIDING_ZOL
entity $4, $2, ENTITY_HARDHAT_BEETLE
entities_end
IndoorsB87Entities::
entity $4, $1, ENTITY_HIDING_GEL
entity $5, $1, ENTITY_HIDING_GEL
entity $4, $1, ENTITY_HIDING_ZOL
entity $5, $1, ENTITY_HIDING_ZOL
entities_end
IndoorsB88Entities::
entity $2, $5, ENTITY_HIDING_GEL
entity $2, $7, ENTITY_HIDING_GEL
entity $4, $5, ENTITY_HIDING_GEL
entity $4, $7, ENTITY_HIDING_GEL
entity $2, $5, ENTITY_HIDING_ZOL
entity $2, $7, ENTITY_HIDING_ZOL
entity $4, $5, ENTITY_HIDING_ZOL
entity $4, $7, ENTITY_HIDING_ZOL
entities_end
IndoorsB89Entities::
entity $3, $3, ENTITY_KEESE
entity $3, $5, ENTITY_HIDING_GEL
entity $3, $5, ENTITY_HIDING_ZOL
entities_end
IndoorsB8AEntities::
@ -696,8 +696,8 @@ IndoorsB8BEntities::
entities_end
IndoorsB8CEntities::
entity $4, $4, ENTITY_HIDING_GEL
entity $4, $5, ENTITY_HIDING_GEL
entity $4, $4, ENTITY_HIDING_ZOL
entity $4, $5, ENTITY_HIDING_ZOL
entities_end
IndoorsB8DEntities::
@ -722,33 +722,33 @@ IndoorsB91Entities::
entity $1, $6, ENTITY_KEESE
entity $2, $5, ENTITY_BUSH_CRAWLER
entity $5, $3, ENTITY_BUSH_CRAWLER
entity $6, $6, ENTITY_HIDING_GEL
entity $6, $6, ENTITY_HIDING_ZOL
entities_end
IndoorsB92Entities::
entity $3, $2, ENTITY_HIDING_GEL
entity $3, $2, ENTITY_HIDING_ZOL
entity $4, $5, ENTITY_BUSH_CRAWLER
entities_end
IndoorsB93Entities::
entity $2, $1, ENTITY_BUSH_CRAWLER
entity $2, $4, ENTITY_HIDING_GEL
entity $2, $4, ENTITY_HIDING_ZOL
entity $3, $7, ENTITY_BUSH_CRAWLER
entity $4, $3, ENTITY_HIDING_GEL
entity $4, $3, ENTITY_HIDING_ZOL
entities_end
IndoorsB94Entities::
entity $2, $7, ENTITY_HIDING_GEL
entity $2, $7, ENTITY_HIDING_ZOL
entities_end
IndoorsB95Entities::
entity $1, $5, ENTITY_HIDING_GEL
entity $4, $5, ENTITY_HIDING_GEL
entity $5, $2, ENTITY_HIDING_GEL
entity $1, $5, ENTITY_HIDING_ZOL
entity $4, $5, ENTITY_HIDING_ZOL
entity $5, $2, ENTITY_HIDING_ZOL
entities_end
IndoorsB96Entities::
entity $5, $2, ENTITY_HIDING_GEL
entity $5, $2, ENTITY_HIDING_ZOL
entities_end
IndoorsB97Entities::
@ -762,9 +762,9 @@ IndoorsB97Entities::
entities_end
IndoorsB98Entities::
entity $2, $2, ENTITY_GEL
entity $4, $8, ENTITY_GEL
entity $5, $3, ENTITY_GEL
entity $2, $2, ENTITY_ZOL
entity $4, $8, ENTITY_ZOL
entity $5, $3, ENTITY_ZOL
entity $2, $5, ENTITY_MIMIC
entity $4, $1, ENTITY_MIMIC
entities_end
@ -863,8 +863,8 @@ IndoorsBABEntities::
entities_end
IndoorsBACEntities::
entity $3, $3, ENTITY_HIDING_GEL
entity $4, $4, ENTITY_HIDING_GEL
entity $3, $3, ENTITY_HIDING_ZOL
entity $4, $4, ENTITY_HIDING_ZOL
entities_end
IndoorsBADEntities::
@ -874,14 +874,14 @@ IndoorsBADEntities::
entities_end
IndoorsBAEEntities::
entity $3, $1, ENTITY_HIDING_GEL
entity $5, $3, ENTITY_HIDING_GEL
entity $3, $1, ENTITY_HIDING_ZOL
entity $5, $3, ENTITY_HIDING_ZOL
entities_end
IndoorsBAFEntities::
entity $5, $4, ENTITY_HIDING_GEL
entity $5, $5, ENTITY_HIDING_GEL
entity $5, $6, ENTITY_HIDING_GEL
entity $5, $4, ENTITY_HIDING_ZOL
entity $5, $5, ENTITY_HIDING_ZOL
entity $5, $6, ENTITY_HIDING_ZOL
entities_end
IndoorsBB0Entities::
@ -917,21 +917,21 @@ IndoorsBB6Entities::
entities_end
IndoorsBB7Entities::
entity $1, $4, ENTITY_HIDING_GEL
entity $1, $4, ENTITY_HIDING_ZOL
entity $2, $0, ENTITY_FIREBALL_SHOOTER
entity $5, $5, ENTITY_HIDING_GEL
entity $5, $5, ENTITY_HIDING_ZOL
entities_end
IndoorsBB8Entities::
entity $2, $6, ENTITY_KEESE
entity $2, $7, ENTITY_KEESE
entity $4, $6, ENTITY_HIDING_GEL
entity $4, $6, ENTITY_HIDING_ZOL
entities_end
IndoorsBB9Entities::
entity $2, $2, ENTITY_KEESE
entity $2, $4, ENTITY_KEESE
entity $3, $3, ENTITY_HIDING_GEL
entity $3, $3, ENTITY_HIDING_ZOL
entities_end
IndoorsBBAEntities::
@ -939,14 +939,14 @@ IndoorsBBAEntities::
entities_end
IndoorsBBBEntities::
entity $3, $7, ENTITY_HIDING_GEL
entity $4, $2, ENTITY_HIDING_GEL
entity $3, $7, ENTITY_HIDING_ZOL
entity $4, $2, ENTITY_HIDING_ZOL
entities_end
IndoorsBBCEntities::
entity $3, $7, ENTITY_HIDING_GEL
entity $4, $5, ENTITY_HIDING_GEL
entity $6, $8, ENTITY_HIDING_GEL
entity $3, $7, ENTITY_HIDING_ZOL
entity $4, $5, ENTITY_HIDING_ZOL
entity $6, $8, ENTITY_HIDING_ZOL
entities_end
IndoorsBBDEntities::
@ -1010,18 +1010,18 @@ IndoorsBC7Entities::
entities_end
IndoorsBC8Entities::
entity $3, $2, ENTITY_HIDING_GEL
entity $3, $7, ENTITY_HIDING_GEL
entity $3, $2, ENTITY_HIDING_ZOL
entity $3, $7, ENTITY_HIDING_ZOL
entities_end
IndoorsBC9Entities::
entity $3, $3, ENTITY_HIDING_GEL
entity $3, $3, ENTITY_HIDING_ZOL
entities_end
IndoorsBCAEntities::
entity $4, $5, ENTITY_BUSH_CRAWLER
entity $6, $2, ENTITY_HIDING_GEL
entity $6, $4, ENTITY_HIDING_GEL
entity $6, $2, ENTITY_HIDING_ZOL
entity $6, $4, ENTITY_HIDING_ZOL
entities_end
IndoorsBCBEntities::
@ -1033,10 +1033,10 @@ IndoorsBCCEntities::
entities_end
IndoorsBCDEntities::
entity $2, $1, ENTITY_HIDING_GEL
entity $2, $7, ENTITY_HIDING_GEL
entity $4, $3, ENTITY_HIDING_GEL
entity $4, $8, ENTITY_HIDING_GEL
entity $2, $1, ENTITY_HIDING_ZOL
entity $2, $7, ENTITY_HIDING_ZOL
entity $4, $3, ENTITY_HIDING_ZOL
entity $4, $8, ENTITY_HIDING_ZOL
entities_end
IndoorsBCEEntities::
@ -1062,7 +1062,7 @@ IndoorsBD1Entities::
IndoorsBD2Entities::
entity $1, $3, ENTITY_MOBLIN
entity $1, $6, ENTITY_MOBLIN
entity $3, $2, ENTITY_GEL
entity $3, $2, ENTITY_ZOL
entity $3, $7, ENTITY_ANTI_FAIRY
entities_end
@ -1085,8 +1085,8 @@ IndoorsBD7Entities::
entities_end
IndoorsBD8Entities::
entity $1, $3, ENTITY_HIDING_GEL
entity $2, $6, ENTITY_HIDING_GEL
entity $1, $3, ENTITY_HIDING_ZOL
entity $2, $6, ENTITY_HIDING_ZOL
entities_end
IndoorsBD9Entities::
@ -1149,9 +1149,9 @@ IndoorsBE5Entities::
IndoorsBE6Entities::
entity $1, $3, ENTITY_HEART_PIECE
entity $3, $4, ENTITY_HIDING_GEL
entity $3, $5, ENTITY_HIDING_GEL
entity $3, $6, ENTITY_HIDING_GEL
entity $3, $4, ENTITY_HIDING_ZOL
entity $3, $5, ENTITY_HIDING_ZOL
entity $3, $6, ENTITY_HIDING_ZOL
entities_end
IndoorsBE7Entities::
@ -1190,9 +1190,9 @@ IndoorsBEEEntities::
IndoorsBEFEntities::
entity $3, $1, ENTITY_BUSH_CRAWLER
entity $3, $5, ENTITY_HIDING_GEL
entity $3, $5, ENTITY_HIDING_ZOL
entity $5, $5, ENTITY_BUSH_CRAWLER
entity $5, $3, ENTITY_HIDING_GEL
entity $5, $3, ENTITY_HIDING_ZOL
entities_end
IndoorsBF0Entities::

58
src/data/entities/overworld.asm
View File

@ -294,8 +294,8 @@ Overworld41Entities::
entities_end
Overworld42Entities::
entity $4, $5, ENTITY_GEL
entity $5, $4, ENTITY_GEL
entity $4, $5, ENTITY_ZOL
entity $5, $4, ENTITY_ZOL
entity $4, $7, ENTITY_MOBLIN
entities_end
@ -510,21 +510,21 @@ Overworld70Entities::
entities_end
Overworld71Entities::
entity $4, $2, ENTITY_GEL
entity $6, $6, ENTITY_GEL
entity $4, $2, ENTITY_ZOL
entity $6, $6, ENTITY_ZOL
entity $2, $2, ENTITY_MOBLIN
entities_end
Overworld72Entities::
entity $4, $2, ENTITY_MOBLIN
entity $4, $6, ENTITY_MOBLIN
entity $3, $2, ENTITY_GEL
entity $3, $2, ENTITY_ZOL
entities_end
Overworld73Entities::
entity $2, $4, ENTITY_MOBLIN
entity $3, $5, ENTITY_MOBLIN
entity $5, $7, ENTITY_GEL
entity $5, $7, ENTITY_ZOL
entities_end
Overworld74Entities::
@ -827,10 +827,10 @@ OverworldACEntities::
OverworldADEntities::
entity $2, $3, ENTITY_ARMOS_STATUE
entity $2, $7, ENTITY_ARMOS_STATUE
entity $2, $4, ENTITY_HIDING_GEL
entity $2, $6, ENTITY_HIDING_GEL
entity $4, $4, ENTITY_HIDING_GEL
entity $4, $6, ENTITY_HIDING_GEL
entity $2, $4, ENTITY_HIDING_ZOL
entity $2, $6, ENTITY_HIDING_ZOL
entity $4, $4, ENTITY_HIDING_ZOL
entity $4, $6, ENTITY_HIDING_ZOL
entities_end
OverworldAEEntities::
@ -908,9 +908,9 @@ OverworldBBEntities::
OverworldBCEntities::
entity $1, $2, ENTITY_ARMOS_STATUE
entity $6, $4, ENTITY_ARMOS_STATUE
entity $1, $3, ENTITY_HIDING_GEL
entity $4, $2, ENTITY_HIDING_GEL
entity $6, $6, ENTITY_HIDING_GEL
entity $1, $3, ENTITY_HIDING_ZOL
entity $4, $2, ENTITY_HIDING_ZOL
entity $6, $6, ENTITY_HIDING_ZOL
entities_end
OverworldBDEntities::
@ -918,25 +918,25 @@ OverworldBDEntities::
entity $2, $6, ENTITY_ARMOS_STATUE
entity $4, $4, ENTITY_ARMOS_STATUE
entity $5, $7, ENTITY_ARMOS_STATUE
entity $2, $5, ENTITY_HIDING_GEL
entity $3, $2, ENTITY_HIDING_GEL
entity $2, $5, ENTITY_HIDING_ZOL
entity $3, $2, ENTITY_HIDING_ZOL
entities_end
OverworldBEEntities::
entity $1, $2, ENTITY_ARMOS_STATUE
entity $1, $4, ENTITY_ARMOS_STATUE
entity $4, $6, ENTITY_ARMOS_STATUE
entity $4, $1, ENTITY_HIDING_GEL
entity $5, $3, ENTITY_HIDING_GEL
entity $5, $6, ENTITY_HIDING_GEL
entity $4, $1, ENTITY_HIDING_ZOL
entity $5, $3, ENTITY_HIDING_ZOL
entity $5, $6, ENTITY_HIDING_ZOL
entities_end
OverworldBFEntities::
entity $3, $1, ENTITY_ARMOS_STATUE
entity $3, $5, ENTITY_ARMOS_STATUE
entity $5, $3, ENTITY_ARMOS_STATUE
entity $2, $3, ENTITY_GEL
entity $2, $6, ENTITY_HIDING_GEL
entity $2, $3, ENTITY_ZOL
entity $2, $6, ENTITY_HIDING_ZOL
entities_end
OverworldC0Entities::
@ -961,15 +961,15 @@ OverworldC3Entities::
OverworldC4Entities::
entity $0, $0, ENTITY_MAZE_SIGNPOST
entity $2, $3, ENTITY_HIDING_GEL
entity $4, $4, ENTITY_HIDING_GEL
entity $5, $6, ENTITY_GEL
entity $2, $3, ENTITY_HIDING_ZOL
entity $4, $4, ENTITY_HIDING_ZOL
entity $5, $6, ENTITY_ZOL
entities_end
OverworldC5Entities::
entity $0, $0, ENTITY_MAZE_SIGNPOST
entity $4, $3, ENTITY_HIDING_GEL
entity $5, $8, ENTITY_HIDING_GEL
entity $4, $3, ENTITY_HIDING_ZOL
entity $5, $8, ENTITY_HIDING_ZOL
entities_end
OverworldC6Entities::
@ -1043,15 +1043,15 @@ OverworldD3Entities::
OverworldD4Entities::
entity $0, $0, ENTITY_MAZE_SIGNPOST
entity $2, $2, ENTITY_HIDING_GEL
entity $2, $2, ENTITY_HIDING_ZOL
entity $3, $6, ENTITY_BUSH_CRAWLER
entities_end
OverworldD5Entities::
entity $0, $0, ENTITY_MAZE_SIGNPOST
entity $2, $4, ENTITY_HIDING_GEL
entity $3, $3, ENTITY_HIDING_GEL
entity $4, $7, ENTITY_HIDING_GEL
entity $2, $4, ENTITY_HIDING_ZOL
entity $3, $3, ENTITY_HIDING_ZOL
entity $4, $7, ENTITY_HIDING_ZOL
entity $6, $4, ENTITY_BUSH_CRAWLER
entities_end

4
tools/generate_entities_data.py
View File

@ -76,8 +76,8 @@ entity_types = [
'ENTITY_POLS_VOICE',
'ENTITY_KEESE',
'ENTITY_STALFOS_AGGRESSIVE',
'ENTITY_ZOL',
'ENTITY_GEL',
'ENTITY_MINI_GEL',
'DISABLED',
'ENTITY_STALFOS_EVASIVE',
'ENTITY_GIBDO',
@ -204,7 +204,7 @@ entity_types = [
'ENTITY_HORSE_PIECE',
'ENTITY_WATER_TEKTITE',
'ENTITY_FLYING_TILES',
'ENTITY_HIDING_GEL',
'ENTITY_HIDING_ZOL',
'ENTITY_STAR',
'ENTITY_LIFTABLE_STATUE',
'ENTITY_FIREBALL_SHOOTER',

6
tools/peephole-replace.py
View File

@ -170,8 +170,8 @@ rules = [
0x18: "ENTITY_POLS_VOICE",
0x19: "ENTITY_KEESE",
0x1A: "ENTITY_STALFOS_AGGRESSIVE",
0x1B: "ENTITY_GEL",
0x1C: "ENTITY_MINI_GEL",
0x1B: "ENTITY_ZOL",
0x1C: "ENTITY_GEL",
0x1D: "ENTITY_DISABLED",
0x1E: "ENTITY_STALFOS_EVASIVE",
0x1F: "ENTITY_GIBDO",
@ -298,7 +298,7 @@ rules = [
0x98: "ENTITY_HORSE_PIECE",
0x99: "ENTITY_WATER_TEKTITE",
0x9A: "ENTITY_FLYING_TILES",
0x9B: "ENTITY_HIDING_GEL",
0x9B: "ENTITY_HIDING_ZOL",
0x9C: "ENTITY_STAR",
0x9D: "ENTITY_LIFTABLE_STATUE",
0x9E: "ENTITY_FIREBALL_SHOOTER",