Merge pull request #189 from notyourav/m

Entity changes, textbox changes
This commit is contained in:
notyourav
2021-11-05 02:14:08 -07:00
committed by GitHub
324 changed files with 2289 additions and 2295 deletions
+2
View File
@@ -66,3 +66,5 @@ _Deparsed_XSubs.pm
*.sna
__pycache__
.vscode/settings.json
.vscode/c_cpp_properties.json
.vscode/tasks.json
+4 -4
View File
@@ -66,12 +66,12 @@ MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR)
ASFLAGS := -mcpu=arm7tdmi --defsym $(GAME_VERSION)=1 --defsym REVISION=$(REVISION) --defsym $(GAME_LANGUAGE)=1
CC1 := tools/agbcc/bin/agbcc
override CFLAGS += -O2 -Wimplicit -Wparentheses -Werror -Wno-multichar
override CFLAGS += -O2 -Wimplicit -Wparentheses -Werror -Wno-multichar -g3
# -fhex-asm
ifeq ($(DINFO),1)
override CFLAGS += -g
endif
# ifeq ($(DINFO),1)
# override CFLAGS += -g
# endif
CPPFLAGS := -I tools/agbcc -I tools/agbcc/include -iquote include -nostdinc -undef -D$(GAME_VERSION) -DREVISION=$(REVISION) -D$(GAME_LANGUAGE)
+2 -2
View File
@@ -128,7 +128,7 @@ _0809D2D6:
mov r8, r3
cmp r0, #0
beq _0809D3A8
ldr r0, _0809D434 @ =gTextBox
ldr r0, _0809D434 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -285,7 +285,7 @@ _0809D3DA:
b _0809D454
.align 2, 0
_0809D430: .4byte gPlayerEntity
_0809D434: .4byte gTextBox
_0809D434: .4byte gMessage
_0809D438: .4byte gPlayerState
_0809D43C: .4byte gUnk_03003DC0
_0809D440: .4byte gUnk_02034490
+4 -4
View File
@@ -130,8 +130,8 @@ _0801C488: .4byte 0x00000427
_0801C48C: .4byte 0x00000426
_0801C490: .4byte 0x0000042E
thumb_func_start sub_0801C494
sub_0801C494: @ 0x0801C494
thumb_func_start RefreshUI
RefreshUI: @ 0x0801C494
ldr r1, _0801C49C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
@@ -139,8 +139,8 @@ sub_0801C494: @ 0x0801C494
.align 2, 0
_0801C49C: .4byte gScreen
thumb_func_start sub_0801C4A0
sub_0801C4A0: @ 0x0801C4A0
thumb_func_start RecoverUI
RecoverUI: @ 0x0801C4A0
ldr r1, _0801C4AC @ =gUnk_0200AF00
movs r0, #0
strb r0, [r1, #2]
+5 -5
View File
@@ -479,7 +479,7 @@ sub_0801CBC8: @ 0x0801CBC8
ands r0, r1
cmp r0, #0
bne _0801CBF6
ldr r0, _0801CC0C @ =gTextBox
ldr r0, _0801CC0C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -497,7 +497,7 @@ _0801CBF6:
b _0801CC1E
.align 2, 0
_0801CC08: .4byte gUnk_0200AF00
_0801CC0C: .4byte gTextBox
_0801CC0C: .4byte gMessage
_0801CC10:
ldr r1, _0801CC7C @ =gUnk_0200AF00
ldrb r0, [r5, #1]
@@ -575,7 +575,7 @@ sub_0801CC80: @ 0x0801CC80
adds r0, r0, r1
ldrb r4, [r0]
adds r0, r4, #0
bl sub_080544C8
bl ItemIsBottle
cmp r0, #0
beq _0801CCA8
adds r0, r5, r4
@@ -828,7 +828,7 @@ sub_0801CE58: @ 0x0801CE58
ands r0, r1
cmp r0, #0
bne _0801CEB4
ldr r0, _0801CEBC @ =gTextBox
ldr r0, _0801CEBC @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -866,4 +866,4 @@ _0801CEB4:
pop {r4, pc}
.align 2, 0
_0801CEB8: .4byte gUnk_0200AF00
_0801CEBC: .4byte gTextBox
_0801CEBC: .4byte gMessage
+6 -6
View File
@@ -1034,7 +1034,7 @@ _0801E040: .4byte gUnk_02022740
thumb_func_start sub_0801E044
sub_0801E044: @ 0x0801E044
push {lr}
ldr r0, _0801E06C @ =gTextBox
ldr r0, _0801E06C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -1053,7 +1053,7 @@ sub_0801E044: @ 0x0801E044
_0801E06A:
pop {pc}
.align 2, 0
_0801E06C: .4byte gTextBox
_0801E06C: .4byte gMessage
_0801E070: .4byte gUnk_02022740
thumb_func_start sub_0801E074
@@ -1086,7 +1086,7 @@ _0801E09C: .4byte gUnk_02022740
thumb_func_start sub_0801E0A0
sub_0801E0A0: @ 0x0801E0A0
push {r4, lr}
ldr r0, _0801E0D8 @ =gTextBox
ldr r0, _0801E0D8 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -1116,7 +1116,7 @@ _0801E0D2:
_0801E0D4:
pop {r4, pc}
.align 2, 0
_0801E0D8: .4byte gTextBox
_0801E0D8: .4byte gMessage
_0801E0DC: .4byte gUnk_02022740
thumb_func_start sub_0801E0E0
@@ -1130,13 +1130,13 @@ sub_0801E0E0: @ 0x0801E0E0
cmp r1, #0
beq _0801E0FC
adds r0, r2, #0
bl TextboxNoOverlap
bl MessageNoOverlap
b _0801E102
.align 2, 0
_0801E0F8: .4byte gUnk_02022740
_0801E0FC:
adds r0, r2, #0
bl TextboxNoOverlapFollow
bl MessageFromTarget
_0801E102:
pop {pc}
+8 -8
View File
@@ -658,7 +658,7 @@ _08052BEC:
_08052BEE:
ldrh r0, [r3, #0x36]
adds r1, r2, #0
bl TextBoxAtYPosition
bl MessageAtHeight
pop {pc}
.ifdef USA
@@ -2560,8 +2560,8 @@ sub_08053A1C: @ 0x08053A1C
movs r0, #8
strh r0, [r1, #8]
ldr r0, _08053A54 @ =0x00000F07
bl TextboxNoOverlapFollow
ldr r1, _08053A58 @ =gTextBox
bl MessageFromTarget
ldr r1, _08053A58 @ =gMessage
movs r0, #1
strb r0, [r1, #6]
strb r4, [r1, #7]
@@ -2573,12 +2573,12 @@ _08053A4E:
.align 2, 0
_08053A50: .4byte gMenu
_08053A54: .4byte 0x00000F07
_08053A58: .4byte gTextBox
_08053A58: .4byte gMessage
thumb_func_start sub_08053A5C
sub_08053A5C: @ 0x08053A5C
push {lr}
ldr r0, _08053A88 @ =gTextBox
ldr r0, _08053A88 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -2600,7 +2600,7 @@ sub_08053A5C: @ 0x08053A5C
_08053A86:
pop {pc}
.align 2, 0
_08053A88: .4byte gTextBox
_08053A88: .4byte gMessage
_08053A8C: .4byte gMenu
thumb_func_start sub_08053A90
@@ -3314,7 +3314,7 @@ _08054014:
mov r8, r2
_08054018:
adds r0, r6, #0
bl sub_080544C8
bl ItemIsBottle
cmp r0, #0
bne _08054034
adds r0, r6, #0
@@ -3612,7 +3612,7 @@ sub_08054288: @ 0x08054288
lsls r0, r0, #3
adds r0, r0, r1
ldrh r0, [r0, #6]
bl TextboxNoOverlapFollow
bl MessageFromTarget
pop {pc}
.align 2, 0
_08054298: .4byte gUnk_080FD5B4
+1 -1
View File
@@ -2335,7 +2335,7 @@ sub_08055DC0: @ 0x08055DC0
cmp r0, #0
bne _08055DDC
ldr r0, _08055DE4 @ =0x00000A01
bl TextboxNoOverlapFollow
bl MessageFromTarget
ldr r1, _08055DE8 @ =gMenu
ldrb r0, [r1, #6]
adds r0, #1
+2 -2
View File
@@ -35,7 +35,7 @@ _0805E3DC: .4byte gUnk_03003DC0
_0805E3E0:
ldrb r2, [r1, #1]
_0805E3E2:
ldr r0, _0805E408 @ =gTextBox
ldr r0, _0805E408 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -57,7 +57,7 @@ _0805E402:
_0805E404:
pop {pc}
.align 2, 0
_0805E408: .4byte gTextBox
_0805E408: .4byte gMessage
thumb_func_start sub_0805E40C
sub_0805E40C: @ 0x0805E40C
+8 -8
View File
@@ -396,8 +396,8 @@ _0805EFE4:
adds r0, r4, #0
pop {r4, pc}
thumb_func_start sub_0805EFE8
sub_0805EFE8: @ 0x0805EFE8
thumb_func_start GetCharacter
GetCharacter: @ 0x0805EFE8
push {r4, r5, r6, r7, lr}
adds r6, r0, #0
_0805EFEC:
@@ -794,8 +794,8 @@ _0805F320:
pop {pc}
.align 2, 0
thumb_func_start sub_GetFontStrWidth
sub_GetFontStrWidth: @ 0xGetFontStrWidth
thumb_func_start GetFontStrWith
GetFontStrWith: @ 0xGetFontStrWidth
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
@@ -822,7 +822,7 @@ _0805F34C:
mov sb, r2
_0805F352:
mov r0, sp
bl sub_0805EFE8
bl GetCharacter
adds r6, r0, #0
cmp r6, #0xe
bhi _0805F3B4
@@ -1028,7 +1028,7 @@ _0805F486:
str r0, [r4, #4]
mov r0, sp
movs r1, #1
bl sub_GetFontStrWidth
bl GetFontStrWith
lsrs r2, r0, #0x18
ldrb r1, [r4, #0x16]
muls r2, r1, r2
@@ -1161,7 +1161,7 @@ sub_0805F5CC: @ 0x0805F5CC
bl MemFill32
adds r0, r6, #0
movs r1, #0
bl sub_GetFontStrWidth
bl GetFontStrWith
adds r2, r0, #0
ldrb r1, [r4, #0x13]
movs r0, #1
@@ -1266,7 +1266,7 @@ sub_0805F6A4: @ 0x0805F6A4
movs r6, #0
_0805F6AC:
adds r0, r5, #0
bl sub_0805EFE8
bl GetCharacter
movs r7, #1
cmp r0, #0xe
bhi _0805F746
+2 -2
View File
@@ -818,10 +818,10 @@ _0806F34E:
cmp r7, #0
beq _0806F35A
mov r1, r8
bl TextboxNoOverlap
bl MessageNoOverlap
b _0806F35E
_0806F35A:
bl TextboxNoOverlapFollow
bl MessageFromTarget
_0806F35E:
pop {r3}
mov r8, r3
+2 -2
View File
@@ -33,7 +33,7 @@ sub_080705AC: @ 0x080705AC
ldrb r0, [r0]
cmp r0, #0
bne _08070674
ldr r0, _08070620 @ =gTextBox
ldr r0, _08070620 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -73,7 +73,7 @@ sub_080705AC: @ 0x080705AC
_08070614: .4byte gInput
_08070618: .4byte gFadeControl
_0807061C: .4byte gUnk_02034490
_08070620: .4byte gTextBox
_08070620: .4byte gMessage
_08070624: .4byte gSave
_08070628: .4byte gPlayerState
_0807062C: .4byte gUnk_03003DC0
+1 -1
View File
@@ -2323,7 +2323,7 @@ sub_0807441C: @ 0x0807441C
adds r4, r6, #0
adds r4, #0xb4
ldrb r0, [r4]
bl sub_0805449C
bl ItemIsSword
cmp r0, #0
beq _08074448
ldrb r0, [r4]
+2 -2
View File
@@ -29,13 +29,13 @@ sub_08078008: @ 0x08078008
adds r5, r6, #0
adds r5, #0xb4
ldrb r0, [r5]
bl sub_0805449C
bl ItemIsSword
cmp r0, #0
bne _0807802C
adds r5, r6, #0
adds r5, #0xb5
ldrb r0, [r5]
bl sub_0805449C
bl ItemIsSword
movs r2, #0
cmp r0, #0
beq _0807802E
+4 -4
View File
@@ -3185,7 +3185,7 @@ sub_0807A050: @ 0x0807A050
ldrb r2, [r3, #0xf]
cmp r2, #0
beq _0807A06A
ldr r0, _0807A08C @ =gTextBox
ldr r0, _0807A08C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -3209,7 +3209,7 @@ _0807A084:
pop {pc}
.align 2, 0
_0807A088: .4byte gPlayerState
_0807A08C: .4byte gTextBox
_0807A08C: .4byte gMessage
_0807A090: .4byte gPlayerEntity
thumb_func_start sub_0807A094
@@ -3327,13 +3327,13 @@ sub_0807A158: @ 0x0807A158
adds r0, r4, #0
adds r0, #0xb4
ldrb r0, [r0]
bl sub_0805449C
bl ItemIsSword
cmp r0, #0
bne _0807A17C
adds r0, r4, #0
adds r0, #0xb5
ldrb r0, [r0]
bl sub_0805449C
bl ItemIsSword
b _0807A17E
.align 2, 0
_0807A178: .4byte gSave
+5 -5
View File
@@ -430,7 +430,7 @@ _080A3F96:
bl SoundReq
ldr r0, _080A3FC8 @ =0x00000702
movs r1, #0xe
bl TextBoxAtYPosition
bl MessageAtHeight
movs r0, #1
strb r0, [r5, #6]
movs r0, #0x78
@@ -447,7 +447,7 @@ _080A3FC8: .4byte 0x00000702
thumb_func_start sub_080A3FCC
sub_080A3FCC: @ 0x080A3FCC
push {lr}
ldr r0, _080A3FE8 @ =gTextBox
ldr r0, _080A3FE8 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -461,7 +461,7 @@ sub_080A3FCC: @ 0x080A3FCC
_080A3FE6:
pop {pc}
.align 2, 0
_080A3FE8: .4byte gTextBox
_080A3FE8: .4byte gMessage
_080A3FEC: .4byte gMenu
_080A3FF0: .4byte 0x00000147
@@ -1170,7 +1170,7 @@ sub_080A4494: @ 0x080A4494
adds r4, r0, #0
cmp r4, #0
beq _080A44D0
ldr r0, _080A44D4 @ =gUnk_02000D00
ldr r0, _080A44D4 @ =gTextGfxBuffer
str r0, [r4, #8]
movs r1, #0
strb r1, [r4, #2]
@@ -1194,7 +1194,7 @@ _080A44D0:
adds r0, r5, #0
pop {r4, r5, pc}
.align 2, 0
_080A44D4: .4byte gUnk_02000D00
_080A44D4: .4byte gTextGfxBuffer
_080A44D8: .4byte gUnk_02002AC0
_080A44DC: .4byte gUnk_02022740
+1 -1
View File
@@ -4085,7 +4085,7 @@ _080A6D38:
strb r0, [r2]
bl sub_080A7114
ldr r0, _080A6D48 @ =0x00000704
bl TextboxNoOverlapFollow
bl MessageFromTarget
b _080A6D54
.align 2, 0
_080A6D48: .4byte 0x00000704
+1 -1
View File
@@ -192,7 +192,7 @@ sub_080A7D44: @ 0x080A7D44
bl sub_08078AA8
b _080A7D56
_080A7D52:
bl TextboxNoOverlapFollow
bl MessageFromTarget
_080A7D56:
pop {pc}
+21 -21
View File
@@ -465,8 +465,8 @@ _080878EA:
movs r0, #3
bl SetRoomFlag
ldr r0, _08087910 @ =0x0000431A
bl TextboxNoOverlapFollow
ldr r1, _08087914 @ =gTextBox
bl MessageFromTarget
ldr r1, _08087914 @ =gMessage
adds r0, r4, #0
adds r0, #0x81
ldrb r0, [r0]
@@ -475,7 +475,7 @@ _0808790C:
pop {r4, r5, r6, pc}
.align 2, 0
_08087910: .4byte 0x0000431A
_08087914: .4byte gTextBox
_08087914: .4byte gMessage
.else
push {r4, r5, r6, r7, lr}
@@ -599,8 +599,8 @@ _08087F24:
movs r0, #3
bl SetRoomFlag
ldr r0, _08087F50 @ =0x0000431A
bl TextboxNoOverlapFollow
ldr r1, _08087F54 @ =gTextBox
bl MessageFromTarget
ldr r1, _08087F54 @ =gMessage
movs r0, #1
strb r0, [r1, #6]
movs r0, #0xc
@@ -613,7 +613,7 @@ _08087F4E:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08087F50: .4byte 0x0000431A
_08087F54: .4byte gTextBox
_08087F54: .4byte gMessage
.endif
thumb_func_start sub_08087F58
@@ -1940,8 +1940,8 @@ _080884D0:
ldr r1, _080884F8 @ =0x00004327
_080884D2:
adds r0, r1, #0
bl TextboxNoOverlapFollow
ldr r1, _080884FC @ =gTextBox
bl MessageFromTarget
ldr r1, _080884FC @ =gMessage
movs r0, #1
strb r0, [r1, #6]
movs r0, #0xc
@@ -1960,7 +1960,7 @@ _080884EA:
.align 2, 0
_080884F4: .4byte 0x00004328
_080884F8: .4byte 0x00004327
_080884FC: .4byte gTextBox
_080884FC: .4byte gMessage
.ifndef EU
_08088500: .4byte gPlayerEntity
.endif
@@ -1988,8 +1988,8 @@ _08088524: .4byte 0x00004314
_08088528:
ldr r0, _0808853C @ =0x00004311
_0808852A:
bl TextboxNoOverlapFollow
ldr r0, _08088540 @ =gTextBox
bl MessageFromTarget
ldr r0, _08088540 @ =gMessage
movs r1, #1
strb r1, [r0, #6]
movs r1, #0xc
@@ -1997,7 +1997,7 @@ _0808852A:
pop {pc}
.align 2, 0
_0808853C: .4byte 0x00004311
_08088540: .4byte gTextBox
_08088540: .4byte gMessage
thumb_func_start sub_08088544
sub_08088544: @ 0x08088544
@@ -2011,8 +2011,8 @@ sub_08088544: @ 0x08088544
subs r1, #7
_08088554:
adds r0, r1, #0
bl TextboxNoOverlapFollow
ldr r0, _08088570 @ =gTextBox
bl MessageFromTarget
ldr r0, _08088570 @ =gMessage
movs r1, #1
strb r1, [r0, #6]
movs r1, #0xc
@@ -2021,7 +2021,7 @@ _08088554:
.align 2, 0
_08088568: .4byte gSave
_0808856C: .4byte 0x00004315
_08088570: .4byte gTextBox
_08088570: .4byte gMessage
thumb_func_start sub_08088574
sub_08088574: @ 0x08088574
@@ -2047,8 +2047,8 @@ _08088594:
ldr r1, _080885A8 @ =0x0000430B
_08088596:
adds r0, r1, #0
bl TextboxNoOverlapFollow
ldr r0, _080885AC @ =gTextBox
bl MessageFromTarget
ldr r0, _080885AC @ =gMessage
movs r1, #1
strb r1, [r0, #6]
movs r1, #0xc
@@ -2056,7 +2056,7 @@ _08088596:
pop {pc}
.align 2, 0
_080885A8: .4byte 0x0000430B
_080885AC: .4byte gTextBox
_080885AC: .4byte gMessage
thumb_func_start sub_080885B0
sub_080885B0: @ 0x080885B0
@@ -2072,8 +2072,8 @@ sub_080885B0: @ 0x080885B0
movs r0, #5
bl ModRupees
ldr r0, _080885E0 @ =0x00004326
bl TextboxNoOverlapFollow
ldr r1, _080885E4 @ =gTextBox
bl MessageFromTarget
ldr r1, _080885E4 @ =gMessage
movs r0, #1
strb r0, [r1, #6]
movs r0, #0xc
@@ -2081,7 +2081,7 @@ sub_080885B0: @ 0x080885B0
b _0808860A
.align 2, 0
_080885E0: .4byte 0x00004326
_080885E4: .4byte gTextBox
_080885E4: .4byte gMessage
_080885E8:
ldr r1, _08088618 @ =gSave
adds r0, r1, #0
+2 -2
View File
@@ -427,7 +427,7 @@ sub_08051BD0: @ 0x08051BD0
ldrb r0, [r0, #4]
cmp r0, #2
bne _08051C9C
ldr r0, _08051C60 @ =gTextBox
ldr r0, _08051C60 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -467,7 +467,7 @@ _08051C06:
b _08051C9C
.align 2, 0
_08051C5C: .4byte gMain
_08051C60: .4byte gTextBox
_08051C60: .4byte gMessage
_08051C64: .4byte gUnk_03003DC0
_08051C68: .4byte gRoomControls
_08051C6C:
+3 -3
View File
@@ -276,7 +276,7 @@ sub_080A03B8: @ 0x080A03B8
ldrb r0, [r4, #0xa]
bl sub_0805429C
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
_080A03E4:
pop {r4, pc}
.align 2, 0
@@ -287,7 +287,7 @@ sub_080A03E8: @ 0x080A03E8
movs r0, #0
movs r1, #0xa
bl sub_0805E4E0
ldr r0, _080A041C @ =gTextBox
ldr r0, _080A041C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -306,7 +306,7 @@ sub_080A03E8: @ 0x080A03E8
_080A041A:
pop {pc}
.align 2, 0
_080A041C: .4byte gTextBox
_080A041C: .4byte gMessage
_080A0420: .4byte gPlayerState
thumb_func_start sub_080A0424
+1 -1
View File
@@ -148,7 +148,7 @@ _080818F0:
adds r0, #0x2f
movs r1, #2
strb r1, [r0]
bl sub_08056360
bl MessageClose
_08081920:
pop {r4, pc}
.align 2, 0
+6 -6
View File
@@ -479,33 +479,33 @@
.2byte 0x0459
.endm
.macro TextboxNoOverlapFollow s:req
.macro MessageFromTarget s:req
.2byte 0x085a
.2byte \s
.endm
.macro TextboxNoOverlap s:req
.macro MessageNoOverlap s:req
.2byte 0x085b
.2byte \s
.endm
.macro TextboxNoOverlapFollowPos a:req, b:req
.macro MessageFromTargetPos a:req, b:req
.2byte 0x0c5c
.2byte \a
.2byte \b
.endm
.macro TextboxNoOverlapFollowPos_1 s:req
.macro MessageFromTargetPos_1 s:req
.2byte 0x085c
.2byte \s
.endm
.macro TextboxNoOverlapFollowTable labels:vararg
.macro MessageFromTargetTable labels:vararg
RecursiveOpcode 0x5d 1 \labels
RecursiveArgs .2byte \labels
.endm
.macro TextboxNoOverlapVar
.macro MessageNoOverlapVar
.2byte 0x045e
.endm
+1 -1
View File
@@ -54,7 +54,7 @@ _080635D0:
ldrb r0, [r4, #0xe]
ldr r1, _08063604 @ =0x00000A01
adds r0, r0, r1
bl TextboxNoOverlapFollow
bl MessageFromTarget
_080635FC:
adds r0, r4, #0
bl sub_0806ED78
+2 -2
View File
@@ -90,7 +90,7 @@ _080645EA:
.align 2, 0
_08064628: .4byte gPlayerEntity
_0806462C:
ldr r0, _08064640 @ =gTextBox
ldr r0, _08064640 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -101,5 +101,5 @@ _0806462C:
_0806463C:
pop {r4, r5, pc}
.align 2, 0
_08064640: .4byte gTextBox
_08064640: .4byte gMessage
.syntax divided
+1 -1
View File
@@ -17,7 +17,7 @@ _0806E6C2:
adds r1, r1, r0
ldrh r0, [r1]
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r4, r5, pc}
.align 2, 0
_0806E6D4: .4byte gSave
+2 -2
View File
@@ -99,7 +99,7 @@ _080170F8:
beq _08017104
b _08017222
_08017104:
ldr r0, _08017160 @ =gTextBox
ldr r0, _08017160 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -148,7 +148,7 @@ _0801714E:
strh r1, [r0]
b _08017192
.align 2, 0
_08017160: .4byte gTextBox
_08017160: .4byte gMessage
_08017164: .4byte gUnk_0200AF00
_08017168: .4byte gScreenTransition
_0801716C: .4byte gSave
+13 -13
View File
@@ -5,7 +5,7 @@
mov r5, r8
push {r5, r6, r7}
adds r6, r0, #0
ldr r0, _08056570 @ =gUnk_02024030
ldr r0, _08056570 @ =gMessageChoices
movs r7, #3
ldrsb r7, [r0, r7]
ldr r0, _08056574 @ =gInput
@@ -18,7 +18,7 @@
beq _08056582
b _080565EA
.align 2, 0
_08056570: .4byte gUnk_02024030
_08056570: .4byte gMessageChoices
_08056574: .4byte gInput
_08056578:
cmp r0, #0x10
@@ -27,7 +27,7 @@ _08056578:
beq _080565E4
b _080565EA
_08056582:
ldr r0, _08056598EU @ =gUnk_02024030
ldr r0, _08056598EU @ =gMessageChoices
lsls r1, r7, #1
adds r0, #0x10
adds r1, r1, r0
@@ -39,7 +39,7 @@ _08056582:
adds r0, #0x20
b _080565B0EU
.align 2, 0
_08056598EU: .4byte gUnk_02024030
_08056598EU: .4byte gMessageChoices
_0805659CEU: .4byte gUnk_08107C14
_080565A0EU:
strh r1, [r6, #8]
@@ -52,7 +52,7 @@ _080565A0EU:
_080565B0EU:
bl sub_0805EF40
ldr r2, _080565DC @ =gUnk_02000040
ldr r0, _080565E0 @ =gUnk_02024030
ldr r0, _080565E0 @ =gMessageChoices
ldrb r1, [r0, #3]
strb r1, [r2, #1]
movs r1, #3
@@ -69,14 +69,14 @@ _080565B0EU:
.align 2, 0
_080565D8: .4byte gUnk_08107C0F
_080565DC: .4byte gUnk_02000040
_080565E0: .4byte gUnk_02024030
_080565E0: .4byte gMessageChoices
_080565E4:
subs r7, #1
b _080565EA
_080565E8:
adds r7, #1
_080565EA:
ldr r4, _0805660C @ =gUnk_02024030
ldr r4, _0805660C @ =gMessageChoices
movs r1, #2
ldrsb r1, [r4, r1]
adds r0, r7, r1
@@ -92,7 +92,7 @@ _080565EA:
movs r1, #1
b _08056612
.align 2, 0
_0805660C: .4byte gUnk_02024030
_0805660C: .4byte gMessageChoices
_08056610:
movs r1, #0
_08056612:
@@ -100,7 +100,7 @@ _08056612:
ldrb r0, [r2]
cmp r0, #1
bne _08056624
ldr r1, _08056678 @ =gUnk_02024030
ldr r1, _08056678 @ =gMessageChoices
movs r0, #2
strb r0, [r2]
strb r0, [r1]
@@ -108,14 +108,14 @@ _08056612:
_08056624:
cmp r1, #0
beq _0805666A
ldr r0, _0805667C @ =gCurrentTextBox
ldr r0, _0805667C @ =gTextRender
mov sl, r0
movs r1, #0x56
add r1, sl
mov sb, r1
ldrh r0, [r1]
mov r8, r0
ldr r4, _08056678 @ =gUnk_02024030
ldr r4, _08056678 @ =gMessageChoices
lsls r0, r5, #1
adds r4, #8
adds r0, r0, r4
@@ -147,7 +147,7 @@ _0805666A:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08056674: .4byte gUnk_02000040
_08056678: .4byte gUnk_02024030
_0805667C: .4byte gCurrentTextBox
_08056678: .4byte gMessageChoices
_0805667C: .4byte gTextRender
_08056680: .4byte 0x0202281D
.syntax divided
@@ -28,7 +28,7 @@ _08065DA8:
adds r0, #1
strb r0, [r1, #0xc]
movs r0, #0
bl TextboxNoOverlapFollow
bl MessageFromTarget
_08065DB4:
pop {pc}
.align 2, 0
@@ -18,7 +18,7 @@ _08065DD0: @ jump table
.4byte _08065E34 @ case 3
.4byte _08065E4E @ case 4
_08065DE4:
ldr r0, _08065E04 @ =gTextBox
ldr r0, _08065E04 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -34,7 +34,7 @@ _08065DE4:
bl InitAnimationForceUpdate
b _08065EB0
.align 2, 0
_08065E04: .4byte gTextBox
_08065E04: .4byte gMessage
_08065E08:
ldrb r0, [r4, #0xe]
subs r0, #1
@@ -65,13 +65,13 @@ _08065E34:
cmp r0, #0
bne _08065EB0
movs r0, #0
bl TextboxNoOverlapFollow
bl MessageFromTarget
ldrb r0, [r4, #0xd]
adds r0, #1
strb r0, [r4, #0xd]
b _08065EB0
_08065E4E:
ldr r0, _08065E6C @ =gTextBox
ldr r0, _08065E6C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -86,7 +86,7 @@ _08065E4E:
str r0, [r4, #0x6c]
b _08065EB0
.align 2, 0
_08065E6C: .4byte gTextBox
_08065E6C: .4byte gMessage
_08065E70: .4byte gUnk_0811022E
_08065E74:
ldrb r0, [r4, #0xe]
@@ -33,7 +33,7 @@ _08064406:
adds r1, r1, r2
ldrh r0, [r1]
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r4, pc}
.align 2, 0
_08064424: .4byte gUnk_0810F6D4
@@ -92,7 +92,7 @@ _080769CC:
adds r4, r6, #0
adds r4, #0xb4
ldrb r0, [r4]
bl sub_0805449C
bl ItemIsSword
cmp r0, #0
beq _08076A38
ldrb r1, [r4]
+2 -2
View File
@@ -150,7 +150,7 @@ _080622C8: .4byte gPlayerEntity
_080622CC:
adds r0, r4, #0
bl GetNextFrame
ldr r0, _080622E0 @ =gTextBox
ldr r0, _080622E0 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -158,7 +158,7 @@ _080622CC:
bne _080622F2
b _080622EE
.align 2, 0
_080622E0: .4byte gTextBox
_080622E0: .4byte gMessage
_080622E4:
adds r0, r4, #0
bl UpdateFuseInteraction
+1 -1
View File
@@ -14,7 +14,7 @@
adds r1, r1, r0
ldrh r0, [r1]
adds r1, r5, #0
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r4, r5, pc}
.align 2, 0
_08062658: .4byte gUnk_0810BDE8
+1 -1
View File
@@ -9,7 +9,7 @@
bne _08062678
movs r0, #0
adds r1, r2, #0
bl TextboxNoOverlap
bl MessageNoOverlap
b _08062690
.align 2, 0
_08062674: .4byte gSave
+1 -1
View File
@@ -104,7 +104,7 @@ _0806BAF8:
_0806BB06:
mov r0, r8
mov r1, sb
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r3, r4}
mov r8, r3
mov sb, r4
@@ -110,7 +110,7 @@ _08067F98:
.align 2, 0
_08067FD8: .4byte gPlayerEntity
_08067FDC:
ldr r0, _08067FFC @ =gTextBox
ldr r0, _08067FFC @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -126,7 +126,7 @@ _08067FF2:
bl InitializeAnimation
b _0806801A
.align 2, 0
_08067FFC: .4byte gTextBox
_08067FFC: .4byte gMessage
_08068000:
adds r0, r5, #0
bl UpdateFuseInteraction
@@ -30,7 +30,7 @@ _080681C0:
adds r0, r0, r2
ldrh r0, [r0]
adds r1, r6, #0
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r4, r5, r6, pc}
.align 2, 0
_080681D4: .4byte gUnk_0811130E
+1 -1
View File
@@ -29,7 +29,7 @@
_08061B4C:
ldrh r0, [r2]
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
_08061B54:
pop {r4, pc}
.align 2, 0
@@ -36,21 +36,21 @@ _0806E172:
movs r0, #0
str r0, [r5, #0x14]
ldr r0, _0806E190 @ =0x0000421B
bl TextboxNoOverlapFollow
bl MessageFromTarget
b _0806E1C0
.align 2, 0
_0806E18C: .4byte 0x000003E7
_0806E190: .4byte 0x0000421B
_0806E194:
ldr r0, _0806E1A4 @ =0x00004218
bl TextboxNoOverlapFollow
ldr r1, _0806E1A8 @ =gTextBox
bl MessageFromTarget
ldr r1, _0806E1A8 @ =gMessage
ldrh r0, [r4]
str r0, [r1, #0x10]
b _0806E1C0
.align 2, 0
_0806E1A4: .4byte 0x00004218
_0806E1A8: .4byte gTextBox
_0806E1A8: .4byte gMessage
_0806E1AC:
str r1, [r5, #0x14]
adds r0, r3, #0
@@ -60,7 +60,7 @@ _0806E1AC:
adds r4, #0x76
strh r1, [r4]
ldr r0, _0806E1D4 @ =0x0000421C
bl TextboxNoOverlapFollow
bl MessageFromTarget
_0806E1C0:
ldr r1, _0806E1D8 @ =gScreenTransition
ldrh r0, [r4]
+1 -1
View File
@@ -54,7 +54,7 @@ _08063B0C:
ldrb r0, [r4, #0xe]
ldr r1, _08063B40 @ =0x00000A01
adds r0, r0, r1
bl TextboxNoOverlapFollow
bl MessageFromTarget
_08063B38:
adds r0, r4, #0
bl sub_0806ED78
+1 -1
View File
@@ -55,7 +55,7 @@ _0806AA9A:
_0806AAB6:
adds r0, r7, #0
adds r1, r6, #0
bl TextboxNoOverlap
bl MessageNoOverlap
ldr r0, [r5, #4]
cmp r0, #1
beq _0806AAEE
@@ -103,7 +103,7 @@ _080638E2:
adds r0, r0, r2
ldrh r0, [r0]
adds r1, r6, #0
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r4, r5, r6, pc}
.align 2, 0
_080638F8: .4byte gUnk_02002B0E
@@ -44,7 +44,7 @@ _0806392E:
adds r1, r1, r0
ldrh r0, [r1]
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r4, r5, pc}
.align 2, 0
_08063940: .4byte gUnk_0810CC04
+3 -3
View File
@@ -70,8 +70,8 @@ _0806513C:
_0806515E:
adds r0, r7, #0
adds r1, r5, #0
bl TextboxNoOverlap
ldr r1, _08065178 @ =gTextBox
bl MessageNoOverlap
ldr r1, _08065178 @ =gMessage
mov r2, r8
lsls r0, r2, #0x10
lsrs r0, r0, #0x10
@@ -79,7 +79,7 @@ _0806515E:
b _080651A6
.align 2, 0
_08065174: .4byte script_08014384
_08065178: .4byte gTextBox
_08065178: .4byte gMessage
_0806517C:
ldrb r1, [r2]
movs r0, #0x40
+4 -4
View File
@@ -97,7 +97,7 @@ _08064E94:
bls _08064EAA
ldr r0, _08064F0C @ =0x00002C0E
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
movs r6, #0
_08064EAA:
cmp r6, #0
@@ -167,7 +167,7 @@ _08064F30:
ldr r0, _08064F48 @ =0x00002C0D
_08064F32:
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
_08064F38:
movs r0, #0
mov r1, r8
@@ -282,7 +282,7 @@ _08065426:
bls _0806543C
ldr r0, _0806549C @ =0x00002C0E
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
movs r6, #0
_0806543C:
cmp r6, #0
@@ -352,7 +352,7 @@ _080654C0:
ldr r0, _080654D8 @ =0x00002C0D
_080654C2:
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
_080654C8:
movs r0, #0
mov r1, r8
+11 -11
View File
@@ -3,14 +3,14 @@
ldr r0, _08056598 @ =gNewWindow
movs r1, #8
bl MemClear
ldr r0, _0805659C @ =gUnk_02024030
ldr r0, _0805659C @ =gMessageChoices
movs r1, #0x18
bl MemClear
ldr r4, _080565A0 @ =gCurrentTextBox
ldr r4, _080565A0 @ =gTextRender
adds r0, r4, #0
movs r1, #0xa8
bl MemClear
ldr r0, _080565A4 @ =gTextBox
ldr r0, _080565A4 @ =gMessage
adds r1, r4, #0
movs r2, #0x20
bl MemCopy
@@ -61,12 +61,12 @@ _08056560:
strb r0, [r3, #1]
movs r0, #0
strb r0, [r3, #2]
ldr r4, _080565A0 @ =gCurrentTextBox
ldr r4, _080565A0 @ =gTextRender
adds r0, r4, #0
bl sub_08056FBC
ldr r0, _080565AC @ =gUnk_08107BE0
str r0, [r4, #0x2c]
ldr r0, _080565B0 @ =gUnk_02000D00
ldr r0, _080565B0 @ =gTextGfxBuffer
str r0, [r4, #0x58]
adds r4, #0x54
movs r0, #0xd0
@@ -74,17 +74,17 @@ _08056560:
movs r0, #2
bl SetDoTextBox
movs r0, #0
bl sub_08056BDC
bl MsgChangeLine
movs r0, #2
bl sub_080564C8
bl StatusUpdate
movs r0, #1
pop {r4, pc}
.align 2, 0
_08056598: .4byte gNewWindow
_0805659C: .4byte gUnk_02024030
_080565A0: .4byte gCurrentTextBox
_080565A4: .4byte gTextBox
_0805659C: .4byte gMessageChoices
_080565A0: .4byte gTextRender
_080565A4: .4byte gMessage
_080565A8: .4byte gSave
_080565AC: .4byte gUnk_08107BE0
_080565B0: .4byte gUnk_02000D00
_080565B0: .4byte gTextGfxBuffer
.syntax divided
+21 -21
View File
@@ -13,7 +13,7 @@ _0805675C:
adds r4, r5, #0
adds r4, #0x20
adds r0, r4, #0
bl sub_0805EFE8
bl GetCharacter
adds r7, r0, #0
cmp r7, #0xe
bls _0805676E
@@ -54,7 +54,7 @@ _080567B8:
.ifndef EU
movs r0, #0
movs r1, #0
bl sub_08056ABC
bl SwitchChoice
.endif
b _08056942
.align 2, 0
@@ -74,7 +74,7 @@ _080567DE:
cmp r0, #0
bne _080567F8
movs r0, #1
bl sub_08056BDC
bl MsgChangeLine
b _08056942
_080567F8:
adds r1, r5, #0
@@ -84,16 +84,16 @@ _080567F8:
b _08056942
_08056802:
movs r0, #3
bl sub_080564C8
bl StatusUpdate
b _08056942
_0805680A:
movs r0, #4
bl sub_080564C8
bl StatusUpdate
b _08056942
_08056812:
adds r0, r4, #0
movs r1, #0
bl sub_GetFontStrWidth
bl GetFontStrWith
adds r3, r0, #0
adds r4, r5, #0
adds r4, #0x56
@@ -110,12 +110,12 @@ _08056812:
strh r2, [r4]
b _08056942
_08056838:
ldr r1, _08056840 @ =gTextBox
ldr r1, _08056840 @ =gMessage
ldrh r0, [r5, #0x22]
strb r0, [r1, #1]
b _08056942
.align 2, 0
_08056840: .4byte gTextBox
_08056840: .4byte gMessage
_08056844:
ldr r0, _08056854 @ =gUnk_0200005C
ldrh r1, [r5, #0x22]
@@ -152,14 +152,14 @@ _0805687A:
strb r0, [r1]
adds r0, r5, #0
adds r1, r3, #0
bl sub_080569C4
bl PaletteChange
b _08056942
_0805688C:
ldrh r0, [r5, #0x22]
bl SoundReq
b _08056942
_08056894:
ldr r1, _080568A8 @ =gCurrentTextBox
ldr r1, _080568A8 @ =gTextRender
ldrh r0, [r5, #0x22]
strb r0, [r1, #3]
ldrh r0, [r5, #0x22]
@@ -169,7 +169,7 @@ _08056894:
bl sub_08056F88
b _08056942
.align 2, 0
_080568A8: .4byte gCurrentTextBox
_080568A8: .4byte gTextRender
_080568AC:
ldrh r0, [r5, #0x22]
strb r0, [r5, #7]
@@ -182,7 +182,7 @@ _080568B2:
adds r0, r6, #0
movs r1, #4
bl MemClear
ldr r4, _08056910 @ =gUnk_02024030
ldr r4, _08056910 @ =gMessageChoices
adds r0, r4, #0
movs r1, #0x18
bl MemClear
@@ -190,7 +190,7 @@ _080568B2:
strb r0, [r4]
strb r0, [r6]
_080568D2:
ldr r2, _08056910 @ =gUnk_02024030
ldr r2, _08056910 @ =gMessageChoices
movs r0, #2
ldrsb r0, [r2, r0]
cmp r0, #3
@@ -220,7 +220,7 @@ _080568D2:
b _08056942
.align 2, 0
_0805690C: .4byte gUnk_02000040
_08056910: .4byte gUnk_02024030
_08056910: .4byte gMessageChoices
_08056914:
ldrh r3, [r5, #0x22]
cmp r3, #0xfe
@@ -256,19 +256,19 @@ _08056942:
movs r0, #0
b _080569C2
_0805694C:
ldr r0, _08056960 @ =gCurrentTextBox
ldr r0, _08056960 @ =gTextRender
adds r0, #0x99
ldrb r0, [r0]
cmp r0, #2
beq _08056964
movs r0, #3
bl sub_080564C8
bl StatusUpdate
movs r0, #0
b _080569C2
.align 2, 0
_08056960: .4byte gCurrentTextBox
_08056960: .4byte gTextRender
_08056964:
ldr r1, _08056994 @ =gTextBox
ldr r1, _08056994 @ =gMessage
ldrb r0, [r1, #1]
cmp r0, #0
bne _08056970
@@ -290,10 +290,10 @@ _08056970:
strb r1, [r2]
adds r0, r5, #0
movs r1, #0
bl sub_080569C4
bl PaletteChange
b _080569B4
.align 2, 0
_08056994: .4byte gTextBox
_08056994: .4byte gMessage
_08056998:
adds r2, r5, #0
adds r2, #0x90
@@ -307,7 +307,7 @@ _08056998:
strb r0, [r2]
adds r0, r5, #0
adds r1, r3, #0
bl sub_080569C4
bl PaletteChange
_080569B4:
adds r1, r5, #0
adds r1, #0x50
@@ -93,10 +93,10 @@ _08064FD2:
adds r0, r0, r2
ldrh r0, [r0]
adds r1, r6, #0
bl TextboxNoOverlap
bl MessageNoOverlap
cmp r4, #0
ble _08064FF4
ldr r1, _0806500C @ =gTextBox
ldr r1, _0806500C @ =gMessage
lsls r0, r4, #0x10
lsrs r0, r0, #0x10
str r0, [r1, #0x10]
@@ -110,7 +110,7 @@ _08064FF4:
b _08065016
.align 2, 0
_08065008: .4byte gUnk_0810FC08
_0806500C: .4byte gTextBox
_0806500C: .4byte gMessage
_08065010:
adds r0, r7, #0
bl ClearRoomFlag
+2 -2
View File
@@ -156,7 +156,7 @@ sub_080829E4: @ 0x080829E4
ands r0, r2
orrs r0, r1
strb r0, [r5, #0x1a]
ldr r3, _08082A14 @ =gTextBox
ldr r3, _08082A14 @ =gMessage
ldrb r0, [r3]
movs r1, #0x7f
ands r1, r0
@@ -167,7 +167,7 @@ sub_080829E4: @ 0x080829E4
b _08082AB4
.align 2, 0
_08082A10: .4byte gPlayerEntity
_08082A14: .4byte gTextBox
_08082A14: .4byte gMessage
_08082A18:
cmp r1, #5
beq _08082A9C
+2 -2
View File
@@ -972,7 +972,7 @@ _080950C8:
.align 2, 0
_080950EC: .4byte 0x00001F1F
_080950F0:
ldr r0, _0809511C @ =gTextBox
ldr r0, _0809511C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -992,7 +992,7 @@ _0809510A:
strb r4, [r5, #0xa]
pop {r4, r5, pc}
.align 2, 0
_0809511C: .4byte gTextBox
_0809511C: .4byte gMessage
thumb_func_start sub_08095120
sub_08095120: @ 0x08095120
+2 -2
View File
@@ -23,7 +23,7 @@ Object9: @ 0x0808386C
bgt _08083894
cmp r0, #0
blt _08083894
ldr r0, _080838D0 @ =gTextBox
ldr r0, _080838D0 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -59,7 +59,7 @@ _080838B6:
.align 2, 0
_080838C8: .4byte gPlayerState
_080838CC: .4byte gUnk_02022740
_080838D0: .4byte gTextBox
_080838D0: .4byte gMessage
_080838D4: .4byte gUnk_03003DF0
_080838D8: .4byte gUnk_0811F754
+3 -3
View File
@@ -580,7 +580,7 @@ _0809C82A:
cmp r0, #0xff
bne _0809C84A
ldr r0, _0809C850 @ =0x00000B43
bl TextboxNoOverlapFollow
bl MessageFromTarget
movs r0, #1
strb r0, [r5, #0xd]
movs r0, #8
@@ -595,7 +595,7 @@ _0809C850: .4byte 0x00000B43
sub_0809C854: @ 0x0809C854
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _0809C8A8 @ =gTextBox
ldr r0, _0809C8A8 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -635,7 +635,7 @@ _0809C892:
bl SoundReq
b _0809C8B8
.align 2, 0
_0809C8A8: .4byte gTextBox
_0809C8A8: .4byte gMessage
_0809C8AC: .4byte gRoomControls
_0809C8B0:
movs r0, #3
+3 -3
View File
@@ -206,14 +206,14 @@ _08083D14:
adds r1, #1
_08083D16:
adds r0, r1, #0
bl TextboxNoOverlapFollow
ldr r1, _08083D24 @ =gTextBox
bl MessageFromTarget
ldr r1, _08083D24 @ =gMessage
ldrb r0, [r4, #0xb]
str r0, [r1, #0x10]
_08083D22:
pop {r4, pc}
.align 2, 0
_08083D24: .4byte gTextBox
_08083D24: .4byte gMessage
thumb_func_start sub_08083D28
sub_08083D28: @ 0x08083D28
+8 -8
View File
@@ -246,14 +246,14 @@ sub_080A13B4: @ 0x080A13B4
cmp r1, r0
blt _080A13D8
ldr r0, _080A13D4 @ =0x0000300C
bl TextboxNoOverlapFollow
bl MessageFromTarget
movs r0, #1
b _080A13E0
.align 2, 0
_080A13D4: .4byte 0x0000300C
_080A13D8:
ldr r0, _080A13E4 @ =0x00003005
bl TextboxNoOverlapFollow
bl MessageFromTarget
movs r0, #0
_080A13E0:
str r0, [r4, #0x14]
@@ -353,8 +353,8 @@ _080A1472:
bl ModRupees
ldr r0, _080A14A0 @ =0x00003007
adds r1, r5, #0
bl TextboxNoOverlap
ldr r1, _080A14A4 @ =gTextBox
bl MessageNoOverlap
ldr r1, _080A14A4 @ =gMessage
lsls r0, r4, #0x10
lsrs r0, r0, #0x10
str r0, [r1, #0x10]
@@ -362,7 +362,7 @@ _080A1472:
.align 2, 0
_080A149C: .4byte gUnk_08124ECC
_080A14A0: .4byte 0x00003007
_080A14A4: .4byte gTextBox
_080A14A4: .4byte gMessage
thumb_func_start sub_080A14A8
sub_080A14A8: @ 0x080A14A8
@@ -557,8 +557,8 @@ sub_080A1608: @ 0x080A1608
adds r4, #4
_080A1618:
adds r0, r4, #0
bl TextboxNoOverlapFollow
ldr r4, _080A1640 @ =gTextBox
bl MessageFromTarget
ldr r4, _080A1640 @ =gMessage
movs r1, #0
movs r0, #1
strb r0, [r4, #6]
@@ -574,7 +574,7 @@ _080A1618:
pop {r4, pc}
.align 2, 0
_080A163C: .4byte 0x00003002
_080A1640: .4byte gTextBox
_080A1640: .4byte gMessage
_080A1644: .4byte gUnk_08124C20
thumb_func_start sub_080A1648
+2 -2
View File
@@ -182,7 +182,7 @@ _080A269C:
_080A26B4:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
ldr r0, _080A2764 @ =gTextBox
ldr r0, _080A2764 @ =gMessage
ldrb r1, [r0]
adds r0, r7, #0
ands r0, r1
@@ -268,5 +268,5 @@ _080A273C:
_080A2762:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A2764: .4byte gTextBox
_080A2764: .4byte gMessage
_080A2768: .4byte gPlayerState
-17
View File
@@ -1,17 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08107C0C:: @ 08107C0C
.incbin "baserom.gba", 0x107C0C, 0x0000003
gUnk_08107C0F:: @ 08107C0F
.incbin "baserom.gba", 0x107C0F, 0x0000005
gUnk_08107C14:: @ 08107C14
.incbin "baserom.gba", 0x107C14, 0x0000004
gUnk_08107C18:: @ 08107C18
.incbin "baserom.gba", 0x107C18, 0x0000004
+8 -8
View File
@@ -28,8 +28,8 @@ script_08008BA2:
_0807E864
_0807E930 0x0004
Call sub_0807F2D4
TextboxNoOverlapFollow 0x4912
_0807EA94
MessageFromTarget 0x4912
_0807EA94
_0807E930 0x0008
_0807E878
Jump script_08008BA2
@@ -60,8 +60,8 @@ script_08008BD2:
CallWithArg sub_0806BB1C, 0x00000001
Call sub_0806BB7C
JumpIfNot script_08008C5C
TextboxNoOverlap 0x490c
_0807EA94
MessageNoOverlap 0x490c
_0807EA94
LoadRoomEntityList gUnk_080D6784
WaitForSomething 0x00000001
WaitForSomething 0x00000004
@@ -69,8 +69,8 @@ script_08008BD2:
PlaySound SFX_SECRET
_0807E930 0x0004
Call sub_0807F2D4
TextboxNoOverlap 0x4913
_0807EA94
MessageNoOverlap 0x4913
_0807EA94
_0807E930 0x0008
Call sub_0807F2D4
Jump script_08008C5C
@@ -91,8 +91,8 @@ SCRIPT_START script_08008C64
PlaySound SFX_STAIRS
EndBlock
WaitForSomething 0x00000002
TextboxNoOverlap 0x490d
_0807EA94
MessageNoOverlap 0x490d
_0807EA94
DoPostScriptAction 0x0007
Call sub_08064D08
_0807EDD4 0x0068, 0x0078
+2 -2
View File
@@ -64,8 +64,8 @@ script_08008E12:
WaitForSomething2 0x00000100
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
TextboxNoOverlapFollowPos 0x1053, 0x000e
_0807EA94
MessageFromTargetPos 0x1053, 0x000e
_0807EA94
_0807E5F8 0x00000080
WaitForSomething2 0x00000100
_0807E5F8 0x00000080
+2 -2
View File
@@ -4,8 +4,8 @@ SCRIPT_START script_08008FC0
PlaySound SFX_109
CallWithArg sub_0807F238, 0x0000045f
Call sub_0807F304
TextboxNoOverlapFollowPos 0x0501, 0x000e
_0807EA94
MessageFromTargetPos 0x0501, 0x000e
_0807EA94
_0807E5F8 0x00000020
Call sub_080791BC
SCRIPT_END
+31 -31
View File
@@ -29,21 +29,21 @@ SCRIPT_START script_08009080
_0807EB44 0x0004
_0807ECC4 0x0008
_0807E930 0x0004
TextboxNoOverlapFollowPos 0x1050, 0x000e
_0807EA94
MessageFromTargetPos 0x1050, 0x000e
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
_0807E930 0x0004
TextboxNoOverlapFollowPos 0x1052, 0x000e
_0807EA94
MessageFromTargetPos 0x1052, 0x000e
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
_0807EB44 0x0006
_0807E930 0x0005
TextboxNoOverlapFollowPos 0x1054, 0x000e
_0807EA94
MessageFromTargetPos 0x1054, 0x000e
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
@@ -51,26 +51,26 @@ SCRIPT_START script_08009080
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
_0807E930 0x0004
TextboxNoOverlapFollowPos 0x1056, 0x000e
_0807EA94
MessageFromTargetPos 0x1056, 0x000e
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
_0807E930 0x0004
TextboxNoOverlapFollowPos 0x1057, 0x000e
_0807EA94
MessageFromTargetPos 0x1057, 0x000e
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
_0807E930 0x0004
TextboxNoOverlapFollowPos 0x1058, 0x000e
_0807EA94
MessageFromTargetPos 0x1058, 0x000e
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
_0807E930 0x0004
TextboxNoOverlapFollowPos 0x105c, 0x000e
_0807EA94
MessageFromTargetPos 0x105c, 0x000e
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
script_0800917C:
@@ -92,8 +92,8 @@ SCRIPT_START script_08009198
WaitForSomething2 0x00000001
_0807EB74
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x105b, 0x0000
_0807EA94
MessageFromTargetPos 0x105b, 0x0000
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000002
WaitForSomething2 0x00000001
@@ -104,8 +104,8 @@ SCRIPT_START script_08009198
DoPostScriptAction 0x0005
Wait 0x003c
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x1051, 0x0000
_0807EA94
MessageFromTargetPos 0x1051, 0x0000
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000002
WaitForSomething2 0x00000001
@@ -114,8 +114,8 @@ SCRIPT_START script_08009198
_0807EB74
_0807EB8C
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x1055, 0x0000
_0807EA94
MessageFromTargetPos 0x1055, 0x0000
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000002
WaitForSomething2 0x00000001
@@ -128,8 +128,8 @@ SCRIPT_START script_08009198
_0807EB74
DoPostScriptAction 0x0000
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x1059, 0x0000
_0807EA94
MessageFromTargetPos 0x1059, 0x0000
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000002
BeginBlock
@@ -167,10 +167,10 @@ script_080092B2:
script_080092BA:
CheckEntityInteractType
JumpIfNot script_080092BA
_0807E864
_0807EB74
TextboxNoOverlap 0x105e
_0807EA94
_0807E864
_0807EB74
MessageNoOverlap 0x105e
_0807EA94
Wait 0x000f
_0807E878
Jump script_080092BA
@@ -192,11 +192,11 @@ SCRIPT_START script_080092F0
script_08009300:
CheckEntityInteractType
JumpIfNot script_08009300
_0807E864
_0807EB74
TextboxNoOverlap 0x1071
_0807EA94
_0807E878
_0807E864
_0807EB74
MessageNoOverlap 0x1071
_0807EA94
_0807E878
Jump script_08009300
.2byte 0x0000
SCRIPT_START script_08009318
+2 -2
View File
@@ -12,8 +12,8 @@ script_0800934E:
CameraTargetEntity
CheckGlobalFlag 0x0055
JumpIf script_0800939A
TextboxNoOverlap 0x1d01
_0807EA94
MessageNoOverlap 0x1d01
_0807EA94
script_08009376:
_0807EA94
Call sub_0806D640
+16 -16
View File
@@ -17,15 +17,15 @@ SCRIPT_START script_0800939A
JumpIf script_080093BC
CheckInventory1 0x000e
JumpIf script_080093BC
TextboxNoOverlap 0x1d02
_0807EA94
MessageNoOverlap 0x1d02
_0807EA94
Jump script_08009376
script_080093BC:
CheckInventory1 0x000e
JumpIfNot script_080093DA
Call sub_0806D788
TextboxNoOverlap 0x1d03
_0807EA94
MessageNoOverlap 0x1d03
_0807EA94
Call sub_0806D70C
Jump script_08009376
script_080093DA:
@@ -46,13 +46,13 @@ script_080093DA:
JumpIf script_080093EE
SetIntVariable 0x00001d04
script_080093EE:
TextboxNoOverlapVar
_0807EA94
_0807E3E8
MessageNoOverlapVar
_0807EA94
_0807E3E8
JumpIfNot script_08009376
Wait 0x001e
TextboxNoOverlap 0x1d08
_0807EA94
MessageNoOverlap 0x1d08
_0807EA94
LoadRoomEntityList gUnk_080F9C38
Wait 0x0078
Call sub_0806D6D0
@@ -77,19 +77,19 @@ script_080093EE:
.endif
.endif
Call sub_0806D5D4
_0807EB8C
TextboxNoOverlap 0x1d09
_0807EA94
_0807EB8C
MessageNoOverlap 0x1d09
_0807EA94
Wait 0x000a
Jump script_08009376
script_0800943E:
Call sub_0806D600
JumpIf script_08009452
TextboxNoOverlap 0x1d0a
_0807EA94
MessageNoOverlap 0x1d0a
_0807EA94
JumpIfNot script_08009376
script_08009452:
TextboxNoOverlap 0x1d0b
_0807EA94
MessageNoOverlap 0x1d0b
_0807EA94
Call sub_0806D74C
_0807F0C8 0xffff, 0x0000
+4 -4
View File
@@ -20,10 +20,10 @@ SCRIPT_START script_08009464
.endif
Call sub_0806D620
Wait 0x003c
WaitPlayerAction8
_0807EB8C
TextboxNoOverlap 0x1d0c
_0807EA94
WaitPlayerAction8
_0807EB8C
MessageNoOverlap 0x1d0c
_0807EA94
Wait 0x000a
Jump script_08009376
.2byte 0x0000
+3 -3
View File
@@ -9,9 +9,9 @@ SCRIPT_START script_080095F2
JumpIfNot script_08009622
PlaySound SFX_109
_0807F088 0x003c
TextboxNoOverlapFollow 0x053c
WaitPlayerAction8
_0807EA94
MessageFromTarget 0x053c
WaitPlayerAction8
_0807EA94
_0807F078 0x003c, 0x0001
script_08009622:
_0807E878
+4 -4
View File
@@ -16,8 +16,8 @@ SCRIPT_START script_08009950
Wait 0x001e
_0807E930 0x000b
Wait 0x001e
TextboxNoOverlapFollow 0x1002
_0807EA94
MessageFromTarget 0x1002
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
@@ -26,8 +26,8 @@ SCRIPT_START script_08009950
_0807EDD4 0x00b8, 0x005c
_0807EB44 0x0006
DoPostScriptAction 0x0001
TextboxNoOverlapFollow 0x1004
_0807EA94
MessageFromTarget 0x1004
_0807EA94
DoPostScriptAction 0x0000
Wait 0x001e
_0807E778 0x0002
+4 -4
View File
@@ -9,14 +9,14 @@ SCRIPT_START script_080099DC
DoPostScriptAction 0x0007
_0807EDD4 0x0068, 0x0060
Wait 0x000f
TextboxNoOverlapFollow 0x1001
_0807EA94
MessageFromTarget 0x1001
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000008
WaitForSomething2 0x00000004
DoPostScriptAction 0x0001
TextboxNoOverlapFollow 0x1003
_0807EA94
MessageFromTarget 0x1003
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000008
SCRIPT_END
+2 -2
View File
@@ -6,8 +6,8 @@ SCRIPT_START script_08009B30
EndBlock
WaitFor_2
Wait 0x001e
TextboxNoOverlapFollow 0x1005
_0807EA94
MessageFromTarget 0x1005
_0807EA94
Wait 0x003c
Call sub_0807529C
Wait 0x003c
+11 -11
View File
@@ -18,16 +18,16 @@ SCRIPT_START script_08009B78
DoPostScriptAction 0x0000
Wait 0x000f
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x1009, 0x0000
_0807E8E4_1
_0807EA94
MessageFromTargetPos 0x1009, 0x0000
_0807E8E4_1
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
_0807EB8C
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x100b, 0x0000
_0807EA94
MessageFromTargetPos 0x100b, 0x0000
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000002
WaitForSomething2 0x00000008
@@ -45,8 +45,8 @@ SCRIPT_START script_08009B78
WaitPlayerAction8
_0807E8E4_1
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x100c, 0x0000
_0807EA94
MessageFromTargetPos 0x100c, 0x0000
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000004
script_08009C4C:
@@ -54,10 +54,10 @@ script_08009C4C:
script_08009C50:
CheckEntityInteractType
JumpIfNot script_08009C50
_0807E864
_0807EB74
TextboxNoOverlap 0x100e
_0807E878
_0807E864
_0807EB74
MessageNoOverlap 0x100e
_0807E878
Jump script_08009C50
SCRIPT_END
.2byte 0x0000
+4 -4
View File
@@ -13,8 +13,8 @@ SCRIPT_START script_08009C68
_0807EB74
_0807EB8C
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x100a, 0x0000
_0807EA94
MessageFromTargetPos 0x100a, 0x0000
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000008
WaitForSomething2 0x00000004
@@ -22,8 +22,8 @@ SCRIPT_START script_08009C68
DoPostScriptAction 0x0001
_0807EB8C
_0807EB44 0x0002
TextboxNoOverlapFollowPos 0x100d, 0x0000
_0807EA94
MessageFromTargetPos 0x100d, 0x0000
_0807EA94
DoPostScriptAction 0x0000
_0807EDD4 0x0028, 0x0060
_0807EDD4 0x0000, 0x0060
+20 -20
View File
@@ -21,8 +21,8 @@ script_08009F36:
StartPlayerScript script_0800A088
WaitForSomething2 0x00000002
Call sub_0806014C
TextboxNoOverlapFollowPos 0x1f01, 0x0000
_0807EA94
MessageFromTargetPos 0x1f01, 0x0000
_0807EA94
Wait 0x001e
_0807F034 0x0065
WaitPlayerAction8
@@ -62,11 +62,11 @@ script_08009FDC:
Call sub_08060158
CheckEntityInteractType
JumpIfNot script_08009FDC
EndBlock
_0807E864
TextboxNoOverlap 0x1f0e
_0807EA94
_0807E3E8
EndBlock
_0807E864
MessageNoOverlap 0x1f0e
_0807EA94
_0807E3E8
JumpIf script_0800A002
_0807E878
Jump script_08009FDC
@@ -76,9 +76,9 @@ script_0800A002:
Call sub_08060318
WaitPlayerAction8
Wait 0x0008
_0807EB8C
TextboxNoOverlapFollow 0x1f13
_0807EA94
_0807EB8C
MessageFromTarget 0x1f13
_0807EA94
SetLocalFlag 0x00b0
_0807E878
script_0800A024:
@@ -91,16 +91,16 @@ script_0800A024:
_0807E864
CheckInventory1 0x0008
JumpIf script_0800A052
TextboxNoOverlap 0x1f14
_0807EA94
_0807E3E8
MessageNoOverlap 0x1f14
_0807EA94
_0807E3E8
JumpIf script_0800A002
_0807E878
Jump script_0800A024
script_0800A052:
TextboxNoOverlap 0x1f11
_0807EA94
_0807E3E8
MessageNoOverlap 0x1f11
_0807EA94
_0807E3E8
JumpIf script_0800A064
_0807E878
Jump script_0800A024
@@ -110,9 +110,9 @@ script_0800A064:
Call sub_08060318
WaitPlayerAction8
Wait 0x0008
_0807EB8C
TextboxNoOverlapFollow 0x1f10
_0807EA94
_0807E878
_0807EB8C
MessageFromTarget 0x1f10
_0807EA94
_0807E878
Jump script_0800A024
.2byte 0x0000
+10 -10
View File
@@ -12,8 +12,8 @@ SCRIPT_START script_0800A1D8
WaitForSomething2 0x00000001
_0807E5F8 0x00000004
WaitForSomething2 0x00000080
TextboxNoOverlapFollowPos 0x1659, 0x0000
_0807EA94
MessageFromTargetPos 0x1659, 0x0000
_0807EA94
Wait 0x003c
_0807E5F8 0x00000010
WaitForSomething2 0x00000200
@@ -27,11 +27,11 @@ SCRIPT_START script_0800A1D8
_0807E5F8 0x00000004
Call sub_0807F3F8
WaitForSomething2 0x00000080
TextboxNoOverlapFollowPos 0x165a, 0x000e
_0807EA94
MessageFromTargetPos 0x165a, 0x000e
_0807EA94
Wait 0x003c
TextboxNoOverlapFollowPos 0x165b, 0x000e
_0807EA94
MessageFromTargetPos 0x165b, 0x000e
_0807EA94
_0807E5F8 0x00000002
WaitForSomething2 0x00000040
_0807E5F8 0x00000008
@@ -45,11 +45,11 @@ SCRIPT_START script_0800A1D8
WaitForSomething2 0x00000100
_0807E5F8 0x00000006
WaitForSomething2 0x000000c0
TextboxNoOverlapFollowPos 0x165c, 0x000e
_0807EA94
MessageFromTargetPos 0x165c, 0x000e
_0807EA94
StopBgm
TextboxNoOverlapFollowPos 0x165d, 0x000e
_0807EA94
MessageFromTargetPos 0x165d, 0x000e
_0807EA94
_0807E5F8 0x00000006
WaitForSomething2 0x000000c0
_0807E5F8 0x00000006
+4 -4
View File
@@ -13,9 +13,9 @@ SCRIPT_START script_0800AB08
_0807F0B4 0x0001
SetEntityPositionRelative 0x0088, 0x0078
Call sub_0807F5C0
TextboxNoOverlapFollowPos 0x1664, 0x0000
_0807EA94
TextboxNoOverlapFollowPos 0x165e, 0x000e
_0807EA94
MessageFromTargetPos 0x1664, 0x0000
_0807EA94
MessageFromTargetPos 0x165e, 0x000e
_0807EA94
CallWithArg CreateManager36, 0x00000001
_0807F0C8 0xffff, 0x0000
+12 -12
View File
@@ -13,16 +13,16 @@ SCRIPT_START script_0800AB6E
Wait 0x003c
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
TextboxNoOverlapFollowPos 0x165f, 0x000e
_0807EA94
MessageFromTargetPos 0x165f, 0x000e
_0807EA94
StartPlayerScript script_0800ACBC
WaitForSomething2 0x00000001
TextboxNoOverlapFollowPos 0x1660, 0x000e
_0807EA94
MessageFromTargetPos 0x1660, 0x000e
_0807EA94
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
TextboxNoOverlapFollowPos 0x1661, 0x000e
_0807EA94
MessageFromTargetPos 0x1661, 0x000e
_0807EA94
_0807E5F8 0x00000008
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
@@ -32,10 +32,10 @@ SCRIPT_START script_0800AB6E
StartPlayerScript script_0800ACE0
WaitForSomething2 0x00000001
Wait 0x003c
TextboxNoOverlapFollowPos 0x1662, 0x000e
_0807EA94
TextboxNoOverlapFollowPos 0x1663, 0x000e
_0807EA94
MessageFromTargetPos 0x1662, 0x000e
_0807EA94
MessageFromTargetPos 0x1663, 0x000e
_0807EA94
SetEntityPosition 0x0000, 0xffe0
Call sub_0807F5C0
_0807E5F8 0x00000002
@@ -45,8 +45,8 @@ SCRIPT_START script_0800AB6E
StartPlayerScript script_0800AD54
WaitForSomething2 0x00000001
Wait 0x003c
TextboxNoOverlapFollowPos 0x1665, 0x000e
_0807EA94
MessageFromTargetPos 0x1665, 0x000e
_0807EA94
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
Wait 0x0078
+6 -6
View File
@@ -14,8 +14,8 @@ script_0800B024:
JumpIf script_0800B082
CheckGlobalFlag 0x0053
JumpIf script_0800B064
TextboxNoOverlap 0x3f32
_0807EA94
MessageNoOverlap 0x3f32
_0807EA94
DoPostScriptAction 0x0008
Call Windcrest_Unlock
Wait 0x003c
@@ -24,8 +24,8 @@ script_0800B024:
SetGlobalFlag 0x0053
Jump script_0800B09C
script_0800B064:
TextboxNoOverlap 0x3f32
_0807EA94
MessageNoOverlap 0x3f32
_0807EA94
DoPostScriptAction 0x0008
Call Windcrest_Unlock
Wait 0x003c
@@ -33,8 +33,8 @@ script_0800B064:
_0807EA94
Jump script_0800B09C
script_0800B082:
TextboxNoOverlap 0x3f32
_0807EA94
MessageNoOverlap 0x3f32
_0807EA94
DoPostScriptAction 0x0008
Call Windcrest_Unlock
Wait 0x003c
+4 -4
View File
@@ -17,10 +17,10 @@ SCRIPT_START script_0800B41C
Wait 0x003c
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0037
WaitPlayerAction8
_0807EB8C
TextboxNoOverlapFollow 0x200c
_0807EA94
WaitPlayerAction8
_0807EB8C
MessageFromTarget 0x200c
_0807EA94
Wait 0x0014
_0807EDD4 0x0158, 0x0290
Wait 0x000a
+5 -5
View File
@@ -16,9 +16,9 @@ script_0800B4D4:
_0807E864
_0807EB74
DoPostScriptAction 0x0000
TextboxNoOverlapFollow 0x200b
EndBlock
_0807E878
MessageFromTarget 0x200b
EndBlock
_0807E878
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_0800B4BC
@@ -28,8 +28,8 @@ script_0800B4F0:
_0807EDD4 0x0134, 0x0288
_0807EB44 0x0004
WaitForSomething2 0x00000008
TextboxNoOverlapFollow 0x2016
_0807EA94
MessageFromTarget 0x2016
_0807EA94
_0807EDD4 0x0158, 0x0288
DoPostScriptAction 0x0000
_0807EB44 0x0000
+13 -13
View File
@@ -7,11 +7,11 @@ SCRIPT_START script_0800B5EC
script_0800B5FA:
CheckEntityInteractType
JumpIfNot script_0800B5FA
_0807E864
_0807EB74
TextboxNoOverlap 0x2009
_0807EA94
_0807E878
_0807E864
_0807EB74
MessageNoOverlap 0x2009
_0807EA94
_0807E878
_0807EB44 0x0004
Jump script_0800B5FA
SCRIPT_START script_0800B614
@@ -29,20 +29,20 @@ script_0800B618:
WaitForSomething2 0x00000004
CheckLocalFlag 0x009e
JumpIf script_0800B7A2
TextboxNoOverlap 0x0583
_0807EA94
_0807E3E8
MessageNoOverlap 0x0583
_0807EA94
_0807E3E8
JumpIfNot script_0800B684
Wait 0x000f
TextboxNoOverlap 0x0584
MessageNoOverlap 0x0584
CallWithArg sub_0807F970, 0x0000058b
JumpIf script_0800B68E
CallWithArg sub_08087424, 0x00000000
Wait 0x00b4
Jump script_0800B6A6
script_0800B684:
TextboxNoOverlap 0x057d
_0807EA94
MessageNoOverlap 0x057d
_0807EA94
Jump script_0800B6A6
script_0800B68E:
_0807EA94
@@ -52,8 +52,8 @@ script_0800B698:
WaitPlayerAction8
_0807EB8C
Wait 0x001e
TextboxNoOverlap 0x057f
_0807EA94
MessageNoOverlap 0x057f
_0807EA94
script_0800B6A6:
_0807E778 0x0004
DoFade7
+10 -10
View File
@@ -16,8 +16,8 @@ script_0800B6D4:
WaitForSomething2 0x00000004
CheckLocalFlag 0x009f
JumpIf script_0800B7A2
TextboxNoOverlap 0x057b
_0807EA94
MessageNoOverlap 0x057b
_0807EA94
CallWithArg sub_0807F970, 0x0000057d
JumpIf script_0800B6A6
_0807EA94
@@ -41,8 +41,8 @@ script_0800B734:
WaitForSomething2 0x00000004
CheckLocalFlag 0x00a0
JumpIf script_0800B7A2
TextboxNoOverlap 0x0580
_0807EA94
MessageNoOverlap 0x0580
_0807EA94
CallWithArg sub_0807F970, 0x00000582
JumpIf script_0800B794
CallWithArg sub_08087424, 0x00000001
@@ -54,15 +54,15 @@ script_0800B794:
_0807F034 0x0065
Jump script_0800B698
script_0800B7A2:
TextboxNoOverlap 0x0590
_0807EA94
MessageNoOverlap 0x0590
_0807EA94
_0807E778 0x0010
DoFade7
WaitFor_2
ModHealth 0x00a0
DoFade6
WaitFor_2
TextboxNoOverlap 0x057f
_0807EA94
DoFade6
WaitFor_2
MessageNoOverlap 0x057f
_0807EA94
Jump script_0800B6A6
.2byte 0x0000
+17 -17
View File
@@ -5,10 +5,10 @@ SCRIPT_START script_0800B828
DoPostScriptAction 0x000a
EndBlock
script_0800B836:
_0807E944
_0807E864
TextboxNoOverlapFollow 0x0a01
_0807EA94
_0807E944
_0807E864
MessageFromTarget 0x0a01
_0807EA94
Wait 0x000f
_0807E878
Jump script_0800B836
@@ -42,10 +42,10 @@ script_0800B87E:
script_0800B89E:
CheckEntityInteractType
JumpIfNot script_0800B89E
_0807E864
_0807EB74
TextboxNoOverlapFollow 0x0a01
_0807EA94
_0807E864
_0807EB74
MessageFromTarget 0x0a01
_0807EA94
Wait 0x000f
_0807E878
Jump script_0800B89E
@@ -91,21 +91,21 @@ SCRIPT_START script_0800B91C
script_0800B934:
CheckEntityInteractType
JumpIfNot script_0800B934
_0807E864
_0807EB74
TextboxNoOverlapFollow 0x3f19
_0807EA94
_0807E864
_0807EB74
MessageFromTarget 0x3f19
_0807EA94
SetLocalFlag 0x005f
_0807E878
Jump script_0800B934
script_0800B94E:
CheckEntityInteractType
JumpIfNot script_0800B94E
_0807E864
_0807EB74
TextboxNoOverlapFollow 0x3f1a
_0807EA94
_0807E878
_0807E864
_0807EB74
MessageFromTarget 0x3f1a
_0807EA94
_0807E878
Jump script_0800B94E
SCRIPT_START script_0800B964
BeginBlock
+5 -5
View File
@@ -48,9 +48,9 @@ script_0800BA46:
JumpIfNot script_0800BA46
_0807E864
Call sub_0807DF28
TextboxNoOverlapFollow 0x3301
_0807EA94
_0807E3E8
MessageFromTarget 0x3301
_0807EA94
_0807E3E8
JumpIfNot script_0800BA6C
StopBgm
Call sub_0806E964
@@ -77,8 +77,8 @@ script_0800BA8E:
Wait 0x001e
_0807EDD4 0x02f0, 0x0350
Wait 0x001e
TextboxNoOverlap 0x0e00
_0807EA94
MessageNoOverlap 0x0e00
_0807EA94
Wait 0x0078
Call sub_08054968
SCRIPT_END
+2 -2
View File
@@ -9,8 +9,8 @@ script_0800BADE:
JumpIfNot script_0800BADE
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x0e01
_0807EA94
MessageNoOverlap 0x0e01
_0807EA94
Wait 0x0078
Call sub_08054968
SCRIPT_END
+2 -2
View File
@@ -6,8 +6,8 @@ script_0800BB04:
JumpIfNot script_0800BB04
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x0e02
_0807EA94
MessageNoOverlap 0x0e02
_0807EA94
Wait 0x003c
DoPostScriptAction 0x000f
Wait 0x00b4
+2 -2
View File
@@ -9,8 +9,8 @@ script_0800BB42:
JumpIfNot script_0800BB42
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x0e05
_0807EA94
MessageNoOverlap 0x0e05
_0807EA94
Wait 0x0078
Call sub_08054968
SCRIPT_END
+2 -2
View File
@@ -10,8 +10,8 @@ script_0800BB7A:
JumpIfNot script_0800BB7A
_0807EDD4 0x03a0, 0x00f8
Wait 0x001e
TextboxNoOverlap 0x0e06
_0807EA94
MessageNoOverlap 0x0e06
_0807EA94
Wait 0x000f
_0807EDD4 0x0380, 0x00f8
Call sub_08054968
+2 -2
View File
@@ -10,8 +10,8 @@ script_0800BBBA:
JumpIfNot script_0800BBBA
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x0e04
_0807EA94
MessageNoOverlap 0x0e04
_0807EA94
Wait 0x0078
Call sub_08054968
SCRIPT_END
+2 -2
View File
@@ -7,8 +7,8 @@ script_0800BBE4:
JumpIfNot script_0800BBE4
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x0e03
_0807EA94
MessageNoOverlap 0x0e03
_0807EA94
Wait 0x0078
Call sub_08054968
SCRIPT_END
+3 -3
View File
@@ -9,9 +9,9 @@ script_0800BC18:
JumpIfNot script_0800BC18
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x0e07
_0807EA94
BeginBlock
MessageNoOverlap 0x0e07
_0807EA94
BeginBlock
_0807EB44 0x0000
_0807E930 0x0004
EndBlock
+4 -4
View File
@@ -11,8 +11,8 @@ script_0800BC62:
Wait 0x001e
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x0e08
_0807EA94
MessageNoOverlap 0x0e08
_0807EA94
DoPostScriptAction 0x000f
_0807E930 0x0008
Wait 0x00f0
@@ -25,8 +25,8 @@ script_0800BC62:
Wait 0x003c
DoPostScriptAction 0x000c
Wait 0x003c
TextboxNoOverlap 0x0e09
_0807EA94
MessageNoOverlap 0x0e09
_0807EA94
Call sub_0807F158
CallWithArg sub_0807F4F8, 0x0000035c
Wait 0x001e
+4 -4
View File
@@ -8,8 +8,8 @@ SCRIPT_START script_0800BCE8
Wait 0x00f0
_0807E930 0x0000
Wait 0x003c
TextboxNoOverlap 0x0e0a
_0807EA94
MessageNoOverlap 0x0e0a
_0807EA94
_0807E930 0x0008
Wait 0x003c
_0807E5F8 0x00000001
@@ -21,8 +21,8 @@ script_0800BD1C:
_0807E930 0x0000
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x0e0c
_0807EA94
MessageNoOverlap 0x0e0c
_0807EA94
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
DoPostScriptAction 0x000f
+2 -2
View File
@@ -10,8 +10,8 @@ SCRIPT_START script_0800BD78
DoPostScriptAction 0x0007
CallWithArg sub_0807F4F8, 0x00000270
Wait 0x001e
TextboxNoOverlap 0x0e0b
_0807EA94
MessageNoOverlap 0x0e0b
_0807EA94
_0807E5F8 0x00000004
WaitForSomething2 0x00000002
SetEntitySpeed 0x0100
+4 -4
View File
@@ -9,8 +9,8 @@ SCRIPT_START script_0800BE1C
_0807E930 0x0000
_0807EB44 0x0002
Wait 0x003c
TextboxNoOverlap 0x0e0d
_0807EA94
MessageNoOverlap 0x0e0d
_0807EA94
_0807E930 0x0008
Wait 0x003c
Jump script_0800BE88
@@ -40,8 +40,8 @@ script_0800BE8C:
_0807E930 0x0000
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x0e0f
_0807EA94
MessageNoOverlap 0x0e0f
_0807EA94
_0807E5F8 0x00000002
Call sub_08054F64
DoPostScriptAction 0x000f
+2 -2
View File
@@ -10,8 +10,8 @@ SCRIPT_START script_0800BECC
DoPostScriptAction 0x0007
CallWithArg sub_0807F4F8, 0x000001b8
Wait 0x001e
TextboxNoOverlap 0x0e0e
_0807EA94
MessageNoOverlap 0x0e0e
_0807EA94
_0807E5F8 0x0000000c
WaitForSomething2 0x00000002
SetEntitySpeed 0x0100
+4 -4
View File
@@ -9,8 +9,8 @@ SCRIPT_START script_0800BF38
_0807E930 0x0000
_0807EB44 0x0002
Wait 0x003c
TextboxNoOverlap 0x0e10
_0807EA94
MessageNoOverlap 0x0e10
_0807EA94
_0807E930 0x0008
Wait 0x003c
Jump script_0800BFA4
@@ -40,8 +40,8 @@ script_0800BFA8:
_0807E930 0x0000
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x0e12
_0807EA94
MessageNoOverlap 0x0e12
_0807EA94
_0807E5F8 0x00000002
Call sub_08054F64
DoPostScriptAction 0x000f
+2 -2
View File
@@ -10,8 +10,8 @@ SCRIPT_START script_0800C004
DoPostScriptAction 0x0007
CallWithArg sub_0807F4F8, 0x000001b8
Wait 0x001e
TextboxNoOverlap 0x0e11
_0807EA94
MessageNoOverlap 0x0e11
_0807EA94
_0807E5F8 0x0000001c
WaitForSomething2 0x00000002
SetEntitySpeed 0x0100
+4 -4
View File
@@ -9,8 +9,8 @@ SCRIPT_START script_0800C0B0
_0807E930 0x0000
_0807EB44 0x0002
Wait 0x003c
TextboxNoOverlap 0x0e13
_0807EA94
MessageNoOverlap 0x0e13
_0807EA94
_0807E930 0x0008
Wait 0x003c
Jump script_0800C11C
@@ -40,8 +40,8 @@ script_0800C120:
_0807E930 0x0000
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x0e15
_0807EA94
MessageNoOverlap 0x0e15
_0807EA94
_0807E5F8 0x00000002
Call sub_08054F64
DoPostScriptAction 0x000f
+2 -2
View File
@@ -10,8 +10,8 @@ SCRIPT_START script_0800C160
DoPostScriptAction 0x0007
CallWithArg sub_0807F4F8, 0x00000128
Wait 0x001e
TextboxNoOverlap 0x0e14
_0807EA94
MessageNoOverlap 0x0e14
_0807EA94
_0807E5F8 0x0000003c
WaitForSomething2 0x00000002
SetEntitySpeed 0x0100
+4 -4
View File
@@ -9,8 +9,8 @@ SCRIPT_START script_0800C1D8
_0807E930 0x0000
_0807EB44 0x0002
Wait 0x003c
TextboxNoOverlap 0x0e16
_0807EA94
MessageNoOverlap 0x0e16
_0807EA94
_0807E930 0x0008
Wait 0x003c
Jump script_0800C244
@@ -40,8 +40,8 @@ script_0800C248:
_0807E930 0x0000
DoPostScriptAction 0x0004
Wait 0x003c
TextboxNoOverlap 0x0e18
_0807EA94
MessageNoOverlap 0x0e18
_0807EA94
_0807E5F8 0x00000002
Call sub_08054F64
DoPostScriptAction 0x000f
+2 -2
View File
@@ -10,8 +10,8 @@ SCRIPT_START script_0800C2A4
DoPostScriptAction 0x0007
CallWithArg sub_0807F4F8, 0x00000128
Wait 0x001e
TextboxNoOverlap 0x0e17
_0807EA94
MessageNoOverlap 0x0e17
_0807EA94
_0807E5F8 0x0000007c
WaitForSomething2 0x00000002
SetEntitySpeed 0x0100
+2 -2
View File
@@ -6,8 +6,8 @@ SCRIPT_START script_0800C370
_0807EEF4 0xfff8, 0x0000
_0807F0C8 0x0000, 0x0000
Wait 0x001e
TextboxNoOverlap 0x1d00
_0807EA94
MessageNoOverlap 0x1d00
_0807EA94
_0807E5F8 0x00000006
WaitForSomething2 0x00000001
_0807F0C8 0xffff, 0x0000

Some files were not shown because too many files have changed in this diff Show More