Revise some map scripts, mostly for getting items

This commit is contained in:
Rangi 2020-07-16 11:19:05 -04:00
parent 58f1089370
commit 594c58a289
61 changed files with 371 additions and 348 deletions

View file

@ -13,14 +13,14 @@ MrFujisHouse_TextPointers:
LavenderHouse1Text1:
text_asm
CheckEvent EVENT_RESCUED_MR_FUJI
jr nz, .asm_72e5d
jr nz, .rescued_mr_fuji
ld hl, LavenderHouse1Text_1d8d1
call PrintText
jr .asm_6957f
.asm_72e5d
jr .done
.rescued_mr_fuji
ld hl, LavenderHouse1Text_1d8d6
call PrintText
.asm_6957f
.done
jp TextScriptEnd
LavenderHouse1Text_1d8d1:
@ -34,14 +34,14 @@ LavenderHouse1Text_1d8d6:
LavenderHouse1Text2:
text_asm
CheckEvent EVENT_RESCUED_MR_FUJI
jr nz, .asm_06470
jr nz, .rescued_mr_fuji
ld hl, LavenderHouse1Text_1d8f4
call PrintText
jr .asm_3d208
.asm_06470
jr .done
.rescued_mr_fuji
ld hl, LavenderHouse1Text_1d8f9
call PrintText
.asm_3d208
.done
jp TextScriptEnd
LavenderHouse1Text_1d8f4:
@ -69,24 +69,24 @@ LavenderHouse1Text4:
LavenderHouse1Text5:
text_asm
CheckEvent EVENT_GOT_POKE_FLUTE
jr nz, .asm_15ac2
jr nz, .got_item
ld hl, LavenderHouse1Text_1d94c
call PrintText
lb bc, POKE_FLUTE, 1
call GiveItem
jr nc, .BagFull
jr nc, .bag_full
ld hl, ReceivedFluteText
call PrintText
SetEvent EVENT_GOT_POKE_FLUTE
jr .asm_da749
.BagFull
jr .done
.bag_full
ld hl, FluteNoRoomText
call PrintText
jr .asm_da749
.asm_15ac2
jr .done
.got_item
ld hl, MrFujiAfterFluteText
call PrintText
.asm_da749
.done
jp TextScriptEnd
LavenderHouse1Text_1d94c: