Skip to content

Commit

Permalink
oops
Browse files Browse the repository at this point in the history
  • Loading branch information
@PikalaxALT
PikalaxALT committed Feb 3, 2017
1 parent 42b31e7 commit 292f902
Show file tree
Hide file tree
Showing 16 changed files with 3,981 additions and 243 deletions.
3,734 changes: 3,734 additions & 0 deletions audio/sfx.asm
View file

Large diffs are not rendered by default.

136 changes: 68 additions & 68 deletions constants/item_constants.asm
View file
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
const_def

const ITEM_FLAMETHROWER
const ITEM_GUN
const ITEM_REVOLVER
const ITEM_BAZOOKA
const ITEM_MACHINE_GUN
const ITEM_MISSILE
const ITEM_BOMB
const ITEM_GATLING_GUN
const ITEM_SABRE
const ITEM_DRILL
const ITEM_JET_ENGINE
const ITEM_PROP_ENGINE
const ITEM_SHURIKEN
const ITEM_BATTERY
const ITEM_ARCHERY_SET
const ITEM_MICROWAVE
const ITEM_IRON
const ITEM_MIXER
const ITEM_PHONE
const ITEM_ANTENNA
const ITEM_SPANNER
const ITEM_SAW
const ITEM_CHAINSAW
const ITEM_RAY_GUN
const ITEM_AXE
const ITEM_SCREWDRIVER
const ITEM_SCREW
const ITEM_WINDER
const ITEM_GEAR
const ITEM_PHONE_CARD
const ITEM_LANCE
const ITEM_CRANE
const ITEM_ARMY_KNIFE
const ITEM_SICKLE
const ITEM_COMPUTER
const ITEM_MOBILE_PC
const ITEM_HAMMER
const ITEM_SYRINGE
const ITEM_CAMERA
const ITEM_VIDEO_CAMERA
const ITEM_FRYING_PAN
const ITEM_PENCIL
const ITEM_TIRE
const ITEM_GAS_TANK
const ITEM_FAUCET
const ITEM_BUCKET
const ITEM_VACUUM
const ITEM_MOUSE
const ITEM_KEY
const ITEM_GAME_MACHINE
const ITEM_PLUSH_TOY
const ITEM_BOMBOM
const ITEM_KICKBOARD
const ITEM_TITALLIUM
const ITEM_LUNATIUM
const ITEM_GAIAMOND
const ITEM_ROUND_METAL
const ITEM_TITANUUM
const ITEM_FUSION_PASS_1
const ITEM_FUSION_PASS_2
const ITEM_FUSION_PASS_3
const ITEM_LAB_PASS_1
const ITEM_LAB_PASS_2
const ITEM_LAB_PASS_3
const ITEM_BIOLENT_3
const ITEM_GRAPPLITE_9
const ITEM_GIGAIA_00
const ITEM_DEAD_ITEM
const ITEM_FLAMETHROWER ; 00
const ITEM_GUN ; 01
const ITEM_REVOLVER ; 02
const ITEM_BAZOOKA ; 03
const ITEM_MACHINE_GUN ; 04
const ITEM_MISSILE ; 05
const ITEM_BOMB ; 06
const ITEM_GATLING_GUN ; 07
const ITEM_SABRE ; 08
const ITEM_DRILL ; 09
const ITEM_JET_ENGINE ; 0a
const ITEM_PROP_ENGINE ; 0b
const ITEM_SHURIKEN ; 0c
const ITEM_BATTERY ; 0d
const ITEM_ARCHERY_SET ; 0e
const ITEM_MICROWAVE ; 0f
const ITEM_IRON ; 10
const ITEM_MIXER ; 11
const ITEM_PHONE ; 12
const ITEM_ANTENNA ; 13
const ITEM_SPANNER ; 14
const ITEM_SAW ; 15
const ITEM_CHAINSAW ; 16
const ITEM_RAY_GUN ; 17
const ITEM_AXE ; 18
const ITEM_SCREWDRIVER ; 19
const ITEM_SCREW ; 1a
const ITEM_WINDER ; 1b
const ITEM_GEAR ; 1c
const ITEM_PHONE_CARD ; 1d
const ITEM_LANCE ; 1e
const ITEM_CRANE ; 1f
const ITEM_ARMY_KNIFE ; 20
const ITEM_SICKLE ; 21
const ITEM_COMPUTER ; 22
const ITEM_MOBILE_PC ; 23
const ITEM_HAMMER ; 24
const ITEM_SYRINGE ; 25
const ITEM_CAMERA ; 26
const ITEM_VIDEO_CAMERA ; 27
const ITEM_FRYING_PAN ; 28
const ITEM_PENCIL ; 29
const ITEM_TIRE ; 2a
const ITEM_GAS_TANK ; 2b
const ITEM_FAUCET ; 2c
const ITEM_BUCKET ; 2d
const ITEM_VACUUM ; 2e
const ITEM_MOUSE ; 2f
const ITEM_KEY ; 30
const ITEM_GAME_MACHINE ; 31
const ITEM_PLUSH_TOY ; 32
const ITEM_BOMBOM ; 33
const ITEM_KICKBOARD ; 34
const ITEM_TITALLIUM ; 35
const ITEM_LUNATIUM ; 36
const ITEM_GAIAMOND ; 37
const ITEM_ROUND_METAL ; 38
const ITEM_TITANUUM ; 39
const ITEM_FUSION_PASS_1 ; 3a
const ITEM_FUSION_PASS_2 ; 3b
const ITEM_FUSION_PASS_3 ; 3c
const ITEM_LAB_PASS_1 ; 3d
const ITEM_LAB_PASS_2 ; 3e
const ITEM_LAB_PASS_3 ; 3f
const ITEM_BIOLENT_3 ; 40
const ITEM_GRAPPLITE_9 ; 41
const ITEM_GIGAIA_00 ; 42
const ITEM_DEAD_ITEM ; 43
6 changes: 3 additions & 3 deletions engine/minimap.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ FadeOutOverworldForMinimap:
ld [wSpriteUpdatesEnabled], a
ld a, [wCurPlayerFacing]
ld [wc9f5], a
ld a, [wca51]
ld [wca50], a
ld a, [wLoadedPartnerDenjuuSprite]
ld [wRequestedPartnerDenjuuSprite], a
ld a, $0
ld [wca64], a
ld [wPartnerDenjuuSpriteAddr + 1], a
jp IncrementSubroutine

LoadMinimapGFX: ; a8046 (2a:4046)
Expand Down
10 changes: 5 additions & 5 deletions engine/overworld_input.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ Func_39162: ; 39162 (e:5162)
jr z, .asm_3917c
cp $25
jr z, .asm_3917c
call Func_2fb4
call TakeItem
.asm_3917c
ld b, a
callba GetItemName
Expand Down Expand Up @@ -295,11 +295,11 @@ Func_391c1: ; 391c1 (e:51c1)
ld c, $ad
ld a, b
or a
jr z, .asm_391ee
call Func_2fa0
jr z, .got_text
call GiveItem
callba GetItemName
ld c, $ae
.asm_391ee
.got_text
jr .asm_3926d

.asm_391f0
Expand Down Expand Up @@ -2059,7 +2059,7 @@ Func_39ebe: ; 39ebe (e:5ebe)
ld [wCurObjectStruct + 1], a
ld a, l
ld [wCurObjectStruct], a
call Func_2cb7
call GetDirectionFromObjectToPlayer_
ld a, b
or a
jr nz, .asm_39f16
Expand Down
54 changes: 27 additions & 27 deletions engine/partner_denjuu_object.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ Func_30090:
ld a, $14
ld [hl], a
ld a, [wCurPlayerFacing]
ld [wca50], a
ld [wRequestedPartnerDenjuuSprite], a
cp $9
jr c, .asm_300cf
xor a
ld [wca50], a
ld [wRequestedPartnerDenjuuSprite], a
.asm_300cf
ld de, Data_301bf
.asm_300d1
Expand Down Expand Up @@ -153,7 +153,7 @@ Func_30090:
call Func_302a8
ld a, [wPhoneCallSubroutine]
cp $8
jp nz, Func_30240
jp nz, ForceReloadPartnerDenjuuSprite
ld a, [wCurObjectStruct + 1]
ld h, a
ld a, [wCurObjectStruct]
Expand Down Expand Up @@ -246,7 +246,7 @@ Func_30090:
ld [wPlayerObjectStruct_Duration + 18], a
ld a, $a8
ld [wPlayerObjectStruct_Duration + 11], a
call Func_30240
call ForceReloadPartnerDenjuuSprite
jp Func_30741

Data_301bf:
Expand All @@ -269,7 +269,7 @@ Func_301c3:
cp $0
jr z, .asm_301f1
ld a, $3
ld [wca50], a
ld [wRequestedPartnerDenjuuSprite], a
ld a, [wPlayerObjectStruct_XCoord]
ld [wPartnerDenjuuObjectStruct_XCoord], a
ld a, [wPlayerObjectStruct_YCoord]
Expand All @@ -280,7 +280,7 @@ Func_301c3:

.asm_301f1
ld a, $0
ld [wca50], a
ld [wRequestedPartnerDenjuuSprite], a
ld a, [wPlayerObjectStruct_XCoord]
ld [wPartnerDenjuuObjectStruct_XCoord], a
ld a, [wPlayerObjectStruct_YCoord]
Expand All @@ -291,7 +291,7 @@ Func_301c3:

.asm_30207
ld a, $6
ld [wca50], a
ld [wRequestedPartnerDenjuuSprite], a
ld a, [wPlayerObjectStruct_YCoord]
ld [wPartnerDenjuuObjectStruct_YCoord], a
ld a, [wPlayerObjectStruct_XCoord]
Expand All @@ -302,7 +302,7 @@ Func_301c3:

.asm_3021d
ld a, $6
ld [wca50], a
ld [wRequestedPartnerDenjuuSprite], a
ld a, [wPlayerObjectStruct_YCoord]
ld [wPartnerDenjuuObjectStruct_YCoord], a
ld a, [wPlayerObjectStruct_XCoord]
Expand All @@ -315,23 +315,23 @@ Func_301c3:
xor $1
ld [wPartnerDenjuuObjectStruct_TemplateIdx], a
call Func_302a8
jr Func_30240
jr ForceReloadPartnerDenjuuSprite

Func_30240: ; 30240 (c:4240)
ForceReloadPartnerDenjuuSprite: ; 30240 (c:4240)
ld hl, wPartnerDenjuuObjectStruct
ld a, $ff
ld [wca51], a
call Func_3024f
call Func_320b
ld [wLoadedPartnerDenjuuSprite], a
call RequestPartnerDenjuuSprite
call LoadPartnerDenjuuSprite
ret

Func_3024f: ; 3024f (c:424f)
ld a, [wca51]
RequestPartnerDenjuuSprite: ; 3024f (c:424f)
ld a, [wLoadedPartnerDenjuuSprite]
ld b, a
ld a, [wca50]
ld a, [wRequestedPartnerDenjuuSprite]
cp b
jr z, .nope
ld [wca51], a
ld [wLoadedPartnerDenjuuSprite], a
push af
ld a, [wc9db]
ld c, $0
Expand All @@ -351,7 +351,7 @@ Func_3024f: ; 3024f (c:424f)
ld b, a
ld a, SPRITES_01
add c
ld [wca62], a
ld [wPartnerDenjuuSpriteBank], a
ld a, b
ld d, $0
ld e, a
Expand All @@ -368,14 +368,14 @@ Func_3024f: ; 3024f (c:424f)
rr e
add hl, de
ld a, l
ld [wca63], a
ld [wPartnerDenjuuSpriteAddr], a
ld a, h
ld [wca64], a
ld [wPartnerDenjuuSpriteAddr + 1], a
ret

.nope
ld a, $0
ld [wca64], a
ld [wPartnerDenjuuSpriteAddr + 1], a
ret

Func_302a8: ; 302a8 (c:42a8)
Expand Down Expand Up @@ -429,7 +429,7 @@ Func_302a8: ; 302a8 (c:42a8)
jr z, .asm_30315
ld a, [wc94a]
and $7f
ld [wca50], a
ld [wRequestedPartnerDenjuuSprite], a
ld b, $2
ld a, [wc94a]
and $80
Expand Down Expand Up @@ -664,7 +664,7 @@ asm_30444
ld a, [hl]
ld b, a
and $7f
ld [wca50], a
ld [wRequestedPartnerDenjuuSprite], a
ld c, $2
bit 7, b
jr z, .asm_30475
Expand All @@ -677,7 +677,7 @@ asm_30444
ld l, a
ld a, c
ld [hl], a
call Func_3024f
call RequestPartnerDenjuuSprite
jp Func_303d9

Data_30487:
Expand Down Expand Up @@ -862,13 +862,13 @@ Func_3059f: ; 3059f (c:459f)
sub $3
inc b
.asm_305b6
ld [wca50], a
ld [wRequestedPartnerDenjuuSprite], a
ld a, [wCurObjectStruct]
add $2
ld l, a
ld a, b
ld [hl], a
call Func_3024f
call RequestPartnerDenjuuSprite
ld hl, wPartnerDenjuuObjectStruct
call Func_304c9
ld d, a
Expand Down Expand Up @@ -968,7 +968,7 @@ Func_305e4: ; 305e4 (c:45e4)
call Func_30741
ld a, $1
ld [wOBPalUpdate], a
jp Func_30240
jp ForceReloadPartnerDenjuuSprite

Func_30689: ; 30689 (c:4689)
ld a, [wCurObjectStruct]
Expand Down
2 changes: 1 addition & 1 deletion engine/phone_call.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ PhoneCall_PrintText:
ld [wTextDelayTimerReset], a
ld a, $2
ld [wcada], a
callba DrawTextboxInterior
callba ClearTextboxInterior
callba DrawPhoneTextbox
ret

Expand Down
2 changes: 1 addition & 1 deletion engine/phone_menu.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4026,7 +4026,7 @@ Func_12279: ; 12279 (4:6279)
ld [wcb37], a
ld [wcb21], a
enable_sram
ld hl, wcdbc
ld hl, wItems
ld b, $44
ld de, s1_b000
.loop
Expand Down
Loading

0 comments on commit 292f902

Please sign in to comment.