diff --git a/.gitignore b/.gitignore index 71b1fa29..e808e398 100644 --- a/.gitignore +++ b/.gitignore @@ -65,4 +65,6 @@ _Deparsed_XSubs.pm *.py *.sna __pycache__ -.vscode/settings.json \ No newline at end of file +.vscode/settings.json +.vscode/c_cpp_properties.json +.vscode/tasks.json diff --git a/Jenkinsfile b/Jenkinsfile index 5f5169af..a01f6b2d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,6 +9,7 @@ pipeline { sh 'cd ${AGBCC} && ./install.sh ${WORKSPACE} && cd ${WORKSPACE}' sh 'cp /usr/local/etc/roms/tmc.us.gba baserom.gba' sh 'cp /usr/local/etc/roms/tmc.demo.gba baserom_demo.gba' + sh 'cp /usr/local/etc/roms/tmc.demo.jp.gba baserom_demo_jp.gba' sh 'cp /usr/local/etc/roms/tmc.jp.gba baserom_jp.gba' sh 'cp /usr/local/etc/roms/tmc.eu.gba baserom_eu.gba' sh 'make -j setup' diff --git a/Makefile b/Makefile index 34861d4d..b9b66534 100644 --- a/Makefile +++ b/Makefile @@ -68,12 +68,12 @@ ASSET_BUILDDIR = $(OBJ_DIR)/$(ASSET_SUBDIR) ASFLAGS := -mcpu=arm7tdmi --defsym $(GAME_VERSION)=1 --defsym REVISION=$(REVISION) --defsym $(GAME_LANGUAGE)=1 -I $(ASSET_SUBDIR) -I $(ASSET_BUILDDIR) 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) diff --git a/README.md b/README.md index c0199505..5b3e1a88 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,24 @@ # The Legend of Zelda: The Minish Cap -**Progress:** [⬛⬛⬛⬛⬛⬛⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜] 30% +**Progress:** [⬛⬛⬛⬛⬛⬛⬛⬛⬛⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜] 45% ```diff - WARNING! - -The ROM this repository builds cannot be 'shifted', primarily due to some hardcoded pointers which have yet -to be dumped. Thus this repository is currently in an experimental and research phase and cannot yet be used -traditionally as a source code base for general changes. +This repository is a work in progress, and while it can be used to make certain changes, it's still +constantly evolving. If you use it for modding purposes in its current state, please be aware that +the codebase can drastically change at any time. Also note that some parts of the ROM may not be +'shiftable' yet, so modifying them could be difficult at this point. ``` This is a WIP decompilation of The Legend of Zelda: The Minish Cap. The purpose of the project is to recreate a source code base for the game from scratch, using information found inside the game along with static and/or dynamic analysis. -It builds the following ROMs: +It can target the following ROMs: * [**tmc.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1841) `sha1: b4bd50e4131b027c334547b4524e2dbbd4227130` -* [**tmc_eu.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1734) `sha1: cff199b36ff173fb6faf152653d1bccf87c26fb7` * [**tmc_jp.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1719) `sha1: 6c5404a1effb17f481f352181d0f1c61a2765c5d` +* [**tmc_eu.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1734) `sha1: cff199b36ff173fb6faf152653d1bccf87c26fb7` * [**tmc_demo_usa.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=x051) `sha1: 63fcad218f9047b6a9edbb68c98bd0dec322d7a1` * [**tmc_demo_jp.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=x430) `sha1: 9cdb56fa79bba13158b81925c1f3641251326412` diff --git a/asm/bird.s b/asm/bird.s index 8a9e4506..cdbaf811 100644 --- a/asm/bird.s +++ b/asm/bird.s @@ -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 diff --git a/asm/chestSpawner.s b/asm/chestSpawner.s index 701e03dd..bc6f7bc2 100644 --- a/asm/chestSpawner.s +++ b/asm/chestSpawner.s @@ -126,7 +126,7 @@ sub_08083F14: @ 0x08083F14 movs r2, #0x32 ldrsh r1, [r4, r2] movs r2, #2 - bl sub_080577AC + bl CreateMagicSparkles ldrb r0, [r4, #0xe] subs r0, #1 strb r0, [r4, #0xe] diff --git a/asm/code_080011C4.s b/asm/code_080011C4.s index 2af3fbfd..99153eca 100644 --- a/asm/code_080011C4.s +++ b/asm/code_080011C4.s @@ -1129,14 +1129,17 @@ _0800268C: .byte 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00 _0800269C: .4byte gUnk_0800232E _080026A0: .4byte gUnk_08002342 + gUnk_080026A4:: - .4byte gUnk_020000B0 - .4byte gUnk_03003D68 - .4byte gUnk_03003DB0 - .4byte gUnk_03005FBC +@ normal entities + .4byte gUnk_020000B0 @ enemy target? (player) + .4byte gUnk_03003D68 @ first linked list + .4byte gUnk_03003DB0 @ last linked list + .4byte gUnk_03005FBC @ entity table +@ managers .4byte gUnk_020000B0 .4byte gUnk_03003DA8 - .4byte gHitboxCount + .4byte gCollidableCount .4byte gUnk_03005FBC thumb_func_start sub_080026C4 diff --git a/asm/code_08016B30.s b/asm/code_08016B30.s index 059e1c4c..6726c90a 100644 --- a/asm/code_08016B30.s +++ b/asm/code_08016B30.s @@ -13,7 +13,7 @@ sub_08016B30: @ 0x08016B30 thumb_func_start sub_08016B34 sub_08016B34: @ 0x08016B34 ldr r1, _08016B54 @ =0x03007FFC - ldr r0, _08016B58 @ =IntrMain + ldr r0, _08016B58 @ =gIntrMain str r0, [r1] ldr r1, _08016B5C @ =0x04000004 ldr r2, _08016B60 @ =0x00005028 @@ -29,7 +29,7 @@ sub_08016B34: @ 0x08016B34 bx lr .align 2, 0 _08016B54: .4byte 0x03007FFC -_08016B58: .4byte IntrMain +_08016B58: .4byte gIntrMain _08016B5C: .4byte 0x04000004 _08016B60: .4byte 0x00005028 _08016B64: .4byte 0x04000200 diff --git a/asm/code_0801C370.s b/asm/code_0801C370.s index 88b5614f..f9c6146d 100644 --- a/asm/code_0801C370.s +++ b/asm/code_0801C370.s @@ -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] diff --git a/asm/code_0801C85C.s b/asm/code_0801C85C.s index 2464043d..9cfb23ac 100644 --- a/asm/code_0801C85C.s +++ b/asm/code_0801C85C.s @@ -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 diff --git a/asm/code_0801D79C.s b/asm/code_0801D79C.s index c39c37a6..89dac585 100644 --- a/asm/code_0801D79C.s +++ b/asm/code_0801D79C.s @@ -660,8 +660,8 @@ _0801DD7C: .4byte gAreaRoomHeaders _0801DD80: .4byte gArea _0801DD84: .4byte 0x0000085C - thumb_func_start sub_0801DD88 -sub_0801DD88: @ 0x0801DD88 + thumb_func_start LoadDungeonMap +LoadDungeonMap: @ 0x0801DD88 push {lr} ldr r0, _0801DD98 @ =gUnk_0201AEE0 ldr r1, _0801DD9C @ =0x06006000 @@ -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} @@ -2299,14 +2299,14 @@ _0801E8BC: bl sub_0801E810 cmp r0, #0 bne _0801E93A - ldr r1, _0801E8F4 @ =0x080C9A5C + ldr r1, _0801E8F4 @ =gUnk_080FC3E4 lsls r0, r4, #3 adds r0, r0, r1 ldrb r1, [r0, #4] lsls r0, r1, #2 adds r0, r0, r1 lsls r0, r0, #2 - ldr r1, _0801E8F8 @ =0x080FDFD0 + ldr r1, _0801E8F8 @ =gUnk_080FE320 adds r2, r0, r1 ldrb r0, [r2, #0x10] cmp r0, #4 @@ -2317,8 +2317,8 @@ _0801E8BC: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801E8F4: .4byte 0x080C9A5C -_0801E8F8: .4byte 0x080FDFD0 +_0801E8F4: .4byte gUnk_080C9CBC +_0801E8F8: .4byte gUnk_080FE320 _0801E8FC: .4byte _0801E900 _0801E900: @ jump table .4byte _0801E914 @ case 0 diff --git a/asm/code_08050038.s b/asm/code_08050038.s index 6f789d02..9e01870f 100644 --- a/asm/code_08050038.s +++ b/asm/code_08050038.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_08050154 -sub_08050154: @ 0x08050154 + thumb_func_start UpdateFade +UpdateFade: @ 0x08050154 push {r4, r5, r6, lr} ldr r4, _08050180 @ =gFadeControl ldrh r0, [r4, #8] diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s index 792596b2..d63bcdc7 100644 --- a/asm/code_080526F8.s +++ b/asm/code_080526F8.s @@ -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 diff --git a/asm/code_08054C04.s b/asm/code_08054C04.s index b629f27c..a097ffe5 100644 --- a/asm/code_08054C04.s +++ b/asm/code_08054C04.s @@ -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 diff --git a/asm/code_0805E3B0.s b/asm/code_0805E3B0.s index 8ab56b12..42015748 100644 --- a/asm/code_0805E3B0.s +++ b/asm/code_0805E3B0.s @@ -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 diff --git a/asm/code_0805EC04.s b/asm/code_0805EC04.s index 6c8dc59f..9b095c0e 100644 --- a/asm/code_0805EC04.s +++ b/asm/code_0805EC04.s @@ -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 diff --git a/asm/code_0806ED78.s b/asm/code_0806ED78.s index d6735892..d93e7cc2 100644 --- a/asm/code_0806ED78.s +++ b/asm/code_0806ED78.s @@ -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 diff --git a/asm/code_0807059C.s b/asm/code_0807059C.s index 0015f569..b7bcb418 100644 --- a/asm/code_0807059C.s +++ b/asm/code_0807059C.s @@ -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 diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s index a2e22468..6b1dde5b 100644 --- a/asm/code_080732D0.s +++ b/asm/code_080732D0.s @@ -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] diff --git a/asm/code_08077B98.s b/asm/code_08077B98.s index 75eb2a4b..972fafe0 100644 --- a/asm/code_08077B98.s +++ b/asm/code_08077B98.s @@ -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 diff --git a/asm/code_08078778.s b/asm/code_08078778.s index e8b1206d..79c65777 100644 --- a/asm/code_08078778.s +++ b/asm/code_08078778.s @@ -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 diff --git a/asm/code_0807F0D8.s b/asm/code_0807F0D8.s index 98e48acc..3c9a2658 100644 --- a/asm/code_0807F0D8.s +++ b/asm/code_0807F0D8.s @@ -5,1639 +5,6 @@ .text - thumb_func_start sub_0807F0D8 -sub_0807F0D8: @ 0x0807F0D8 - ldr r0, _0807F0E8 @ =gInput - ldrh r2, [r0, #2] - rsbs r0, r2, #0 - orrs r0, r2 - lsrs r0, r0, #0x1f - str r0, [r1, #0x14] - bx lr - .align 2, 0 -_0807F0E8: .4byte gInput - - thumb_func_start sub_0807F0EC -sub_0807F0EC: @ 0x0807F0EC - push {r4, lr} - adds r4, r1, #0 - bl Random - ldr r1, [r4, #4] - bl __modsi3 - str r0, [r4, #4] - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0807F100 -sub_0807F100: @ 0x0807F100 - push {r4, r5, lr} - adds r4, r0, #0 - adds r5, r1, #0 - bl Random - movs r2, #6 - adds r1, r0, #0 - ands r1, r2 - strb r1, [r4, #0x14] - ldr r2, _0807F124 @ =gUnk_0811E750 - lsrs r0, r0, #8 - movs r1, #7 - ands r0, r1 - adds r0, r0, r2 - ldrb r0, [r0] - strb r0, [r5, #0x1a] - pop {r4, r5, pc} - .align 2, 0 -_0807F124: .4byte gUnk_0811E750 - - thumb_func_start sub_0807F128 -sub_0807F128: @ 0x0807F128 - push {r4, r5, lr} - adds r4, r0, #0 - adds r5, r1, #0 - bl Random - ldr r2, _0807F150 @ =gUnk_0811E758 - movs r3, #7 - adds r1, r0, #0 - ands r1, r3 - adds r1, r1, r2 - ldrb r1, [r1] - strb r1, [r4, #0x14] - ldr r1, _0807F154 @ =gUnk_0811E760 - lsrs r0, r0, #8 - ands r0, r3 - adds r0, r0, r1 - ldrb r0, [r0] - strb r0, [r5, #0x1a] - pop {r4, r5, pc} - .align 2, 0 -_0807F150: .4byte gUnk_0811E758 -_0807F154: .4byte gUnk_0811E760 - - thumb_func_start sub_0807F158 -sub_0807F158: @ 0x0807F158 - push {lr} - adds r2, r0, #0 - adds r2, #0x38 - movs r1, #1 - strb r1, [r2] - bl UpdateSpriteForCollisionLayer - pop {pc} - - thumb_func_start sub_0807F168 -sub_0807F168: @ 0x0807F168 - push {lr} - ldr r0, _0807F17C @ =gPlayerEntity - adds r2, r0, #0 - adds r2, #0x38 - movs r1, #1 - strb r1, [r2] - bl UpdateSpriteForCollisionLayer - pop {pc} - .align 2, 0 -_0807F17C: .4byte gPlayerEntity - - thumb_func_start sub_0807F180 -sub_0807F180: @ 0x0807F180 - push {lr} - adds r2, r0, #0 - adds r2, #0x38 - movs r1, #2 - strb r1, [r2] - bl UpdateSpriteForCollisionLayer - pop {pc} - - thumb_func_start sub_0807F190 -sub_0807F190: @ 0x0807F190 - push {lr} - movs r1, #0x80 - lsls r1, r1, #1 - movs r0, #4 - bl DoFade - pop {pc} - .align 2, 0 - - thumb_func_start sub_0807F1A0 -sub_0807F1A0: @ 0x0807F1A0 - push {r4, lr} - ldr r3, _0807F1BC @ =gPlayerEntity - movs r4, #0x2e - ldrsh r2, [r3, r4] - movs r4, #0x32 - ldrsh r3, [r3, r4] - bl sub_0807DEDC - ldr r2, _0807F1C0 @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] - pop {r4, pc} - .align 2, 0 -_0807F1BC: .4byte gPlayerEntity -_0807F1C0: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F1C4 -sub_0807F1C4: @ 0x0807F1C4 - push {lr} - ldr r2, _0807F1D8 @ =gPlayerState - ldr r0, [r2, #0x30] - movs r1, #8 - ands r0, r1 - cmp r0, #0 - beq _0807F1E0 - ldr r0, _0807F1DC @ =0x00000459 - b _0807F1E4 - .align 2, 0 -_0807F1D8: .4byte gPlayerState -_0807F1DC: .4byte 0x00000459 -_0807F1E0: - movs r0, #0xde - lsls r0, r0, #1 -_0807F1E4: - strh r0, [r2, #8] - pop {pc} - - thumb_func_start sub_0807F1E8 -sub_0807F1E8: @ 0x0807F1E8 - push {lr} - ldr r2, _0807F1FC @ =gPlayerState - ldr r0, [r2, #0x30] - movs r1, #8 - ands r0, r1 - cmp r0, #0 - beq _0807F204 - ldr r0, _0807F200 @ =0x0000045A - b _0807F206 - .align 2, 0 -_0807F1FC: .4byte gPlayerState -_0807F200: .4byte 0x0000045A -_0807F204: - ldr r0, _0807F20C @ =0x000002BD -_0807F206: - strh r0, [r2, #8] - pop {pc} - .align 2, 0 -_0807F20C: .4byte 0x000002BD - - thumb_func_start sub_0807F210 -sub_0807F210: @ 0x0807F210 - push {lr} - ldr r2, _0807F224 @ =gPlayerState - ldr r0, [r2, #0x30] - movs r1, #8 - ands r0, r1 - cmp r0, #0 - beq _0807F22C - ldr r0, _0807F228 @ =0x0000041C - b _0807F22E - .align 2, 0 -_0807F224: .4byte gPlayerState -_0807F228: .4byte 0x0000041C -_0807F22C: - ldr r0, _0807F234 @ =0x0000080C -_0807F22E: - strh r0, [r2, #8] - pop {pc} - .align 2, 0 -_0807F234: .4byte 0x0000080C - - thumb_func_start sub_0807F238 -sub_0807F238: @ 0x0807F238 - ldr r2, _0807F240 @ =gPlayerState - ldr r0, [r1, #4] - strh r0, [r2, #8] - bx lr - .align 2, 0 -_0807F240: .4byte gPlayerState - - thumb_func_start sub_0807F244 -sub_0807F244: @ 0x0807F244 - push {r4, r5, lr} - ldr r0, [r1, #4] - ldr r4, _0807F298 @ =0x0000FFFF - lsrs r5, r0, #0x10 - ands r4, r0 - cmp r4, #1 - blo _0807F28C - cmp r4, #4 - bls _0807F25A - cmp r4, #6 - bne _0807F28C -_0807F25A: - movs r4, #1 - movs r0, #2 - bl GetInventoryValue - cmp r0, #0 - beq _0807F268 - movs r4, #2 -_0807F268: - movs r0, #3 - bl GetInventoryValue - cmp r0, #0 - beq _0807F274 - movs r4, #3 -_0807F274: - movs r0, #4 - bl GetInventoryValue - cmp r0, #0 - beq _0807F280 - movs r4, #4 -_0807F280: - movs r0, #6 - bl GetInventoryValue - cmp r0, #0 - beq _0807F28C - movs r4, #6 -_0807F28C: - adds r0, r4, #0 - adds r1, r5, #0 - bl ForceEquipItem - pop {r4, r5, pc} - .align 2, 0 -_0807F298: .4byte 0x0000FFFF - - thumb_func_start sub_0807F29C -sub_0807F29C: @ 0x0807F29C - push {lr} - ldr r0, [r1, #4] - bl sub_0805ED14 - pop {pc} - .align 2, 0 - - thumb_func_start sub_0807F2A8 -sub_0807F2A8: @ 0x0807F2A8 - push {lr} - ldr r0, _0807F2C0 @ =gPlayerState - adds r0, #0x9c - ldr r0, [r0] - cmp r0, #0 - bne _0807F2C8 - ldr r2, _0807F2C4 @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] - b _0807F2CE - .align 2, 0 -_0807F2C0: .4byte gPlayerState -_0807F2C4: .4byte gActiveScriptInfo -_0807F2C8: - ldr r1, _0807F2D0 @ =gActiveScriptInfo - movs r0, #0 - strb r0, [r1, #6] -_0807F2CE: - pop {pc} - .align 2, 0 -_0807F2D0: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F2D4 -sub_0807F2D4: @ 0x0807F2D4 - push {lr} - adds r0, #0x5a - ldrb r1, [r0] - movs r0, #0x80 - ands r0, r1 - lsls r0, r0, #0x18 - lsrs r1, r0, #0x18 - cmp r1, #0 - beq _0807F2F8 - ldr r2, _0807F2F4 @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] - b _0807F2FC - .align 2, 0 -_0807F2F4: .4byte gActiveScriptInfo -_0807F2F8: - ldr r0, _0807F300 @ =gActiveScriptInfo - strb r1, [r0, #6] -_0807F2FC: - pop {pc} - .align 2, 0 -_0807F300: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F304 -sub_0807F304: @ 0x0807F304 - push {lr} - ldr r0, _0807F324 @ =gPlayerEntity - adds r0, #0x5a - ldrb r1, [r0] - movs r0, #0x80 - ands r0, r1 - lsls r0, r0, #0x18 - lsrs r1, r0, #0x18 - cmp r1, #0 - beq _0807F32C - ldr r2, _0807F328 @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] - b _0807F330 - .align 2, 0 -_0807F324: .4byte gPlayerEntity -_0807F328: .4byte gActiveScriptInfo -_0807F32C: - ldr r0, _0807F334 @ =gActiveScriptInfo - strb r1, [r0, #6] -_0807F330: - pop {pc} - .align 2, 0 -_0807F334: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F338 -sub_0807F338: @ 0x0807F338 - movs r1, #0 - str r1, [r0, #0x48] - ldrb r2, [r0, #0x17] - movs r1, #0xfe - ands r1, r2 - strb r1, [r0, #0x17] - bx lr - .align 2, 0 - - thumb_func_start sub_0807F348 -sub_0807F348: @ 0x0807F348 - push {lr} - movs r1, #2 - bl sub_0805E3A0 - pop {pc} - .align 2, 0 - - thumb_func_start sub_0807F354 -sub_0807F354: @ 0x0807F354 - push {lr} - movs r1, #6 - bl sub_0805E3A0 - pop {pc} - .align 2, 0 - - thumb_func_start sub_0807F360 -sub_0807F360: @ 0x0807F360 - push {lr} - movs r1, #3 - bl sub_0805E3A0 - pop {pc} - .align 2, 0 - - thumb_func_start sub_0807F36C -sub_0807F36C: @ 0x0807F36C - push {r4, r5, lr} - adds r5, r0, #0 - movs r1, #0x41 - movs r2, #0 - bl CreateFx - adds r4, r0, #0 - cmp r4, #0 - beq _0807F3C2 - adds r2, r4, #0 - adds r2, #0x29 - ldrb r1, [r2] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #1 - orrs r0, r1 - strb r0, [r2] - ldr r3, _0807F3C4 @ =0xFFF80000 - adds r0, r5, #0 - adds r1, r4, #0 - movs r2, #0 - bl PositionRelative - bl Random - movs r5, #1 - ands r0, r5 - cmp r0, #0 - beq _0807F3B0 - ldrb r0, [r4, #0x18] - movs r1, #0x40 - orrs r0, r1 - strb r0, [r4, #0x18] -_0807F3B0: - bl Random - ands r0, r5 - cmp r0, #0 - beq _0807F3C2 - ldrb r0, [r4, #0x18] - movs r1, #0x80 - orrs r0, r1 - strb r0, [r4, #0x18] -_0807F3C2: - pop {r4, r5, pc} - .align 2, 0 -_0807F3C4: .4byte 0xFFF80000 - - thumb_func_start sub_0807F3C8 -sub_0807F3C8: @ 0x0807F3C8 - push {lr} - bl sub_0807F36C - movs r0, #0xe5 - bl SoundReq - pop {pc} - .align 2, 0 - - thumb_func_start sub_0807F3D8 -sub_0807F3D8: @ 0x0807F3D8 - push {r4, lr} - adds r4, r0, #0 - ldrb r0, [r4, #0x14] - lsrs r0, r0, #1 - ldr r1, [r1, #4] - adds r1, r1, r0 - adds r0, r4, #0 - bl InitAnimationForceUpdate - adds r0, r4, #0 - adds r0, #0x58 - ldrb r0, [r0] - adds r4, #0x80 - strh r0, [r4] - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0807F3F8 -sub_0807F3F8: @ 0x0807F3F8 - push {lr} - ldr r0, _0807F408 @ =gPlayerEntity - movs r2, #0x18 - rsbs r2, r2, #0 - movs r1, #8 - bl CreateSpeechBubbleExclamationMark - pop {pc} - .align 2, 0 -_0807F408: .4byte gPlayerEntity - - thumb_func_start sub_0807F40C -sub_0807F40C: @ 0x0807F40C - push {lr} - ldr r0, _0807F41C @ =gPlayerEntity - movs r2, #0x18 - rsbs r2, r2, #0 - movs r1, #8 - bl CreateSpeechBubbleQuestionMark - pop {pc} - .align 2, 0 -_0807F41C: .4byte gPlayerEntity - - thumb_func_start sub_0807F420 -sub_0807F420: @ 0x0807F420 - push {lr} - ldr r2, [r1, #4] - ldrb r0, [r1, #4] - lsrs r2, r2, #8 - lsls r2, r2, #0x18 - lsrs r2, r2, #0x18 - adds r1, r2, #0 - bl MenuFadeIn - pop {pc} - - thumb_func_start sub_0807F434 -sub_0807F434: @ 0x0807F434 - push {lr} - adds r3, r0, #0 - adds r3, #0x39 - movs r2, #0 - ldrsb r2, [r3, r2] - cmp r2, #1 - beq _0807F44C - cmp r2, #2 - beq _0807F44C - movs r0, #0 - str r0, [r1, #4] - b _0807F452 -_0807F44C: - movs r0, #0 - strb r0, [r3] - str r2, [r1, #4] -_0807F452: - ldr r2, _0807F460 @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] - pop {pc} - .align 2, 0 -_0807F460: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F464 -sub_0807F464: @ 0x0807F464 - push {r4, r5, r6, lr} - adds r4, r0, #0 - adds r5, r1, #0 - ldrb r0, [r5, #0x18] - cmp r0, #0 - bne _0807F4BC - adds r0, #1 - movs r3, #0 - strb r0, [r5, #0x18] - ldr r0, [r5, #8] - movs r1, #2 - orrs r0, r1 - str r0, [r5, #8] - ldr r2, [r5, #4] - ldr r1, _0807F4A8 @ =gRoomControls - ldrh r0, [r1, #6] - adds r0, r0, r2 - strh r0, [r5, #0x1e] - ldrh r0, [r4, #0x32] - strh r0, [r5, #0x22] - movs r6, #0x2e - ldrsh r0, [r4, r6] - ldrh r1, [r1, #6] - subs r0, r0, r1 - cmp r2, r0 - ble _0807F4AC - movs r0, #0x40 - strb r0, [r4, #0x15] - ldrb r1, [r4, #0x14] - movs r0, #0x80 - ands r0, r1 - movs r1, #2 - b _0807F4B8 - .align 2, 0 -_0807F4A8: .4byte gRoomControls -_0807F4AC: - movs r0, #0xc0 - strb r0, [r4, #0x15] - ldrb r1, [r4, #0x14] - movs r0, #0x80 - ands r0, r1 - movs r1, #6 -_0807F4B8: - orrs r0, r1 - strb r0, [r4, #0x14] -_0807F4BC: - movs r0, #0x24 - ldrsh r1, [r4, r0] - ldrb r2, [r4, #0x15] - adds r0, r4, #0 - bl sub_0806F62C - movs r2, #0x1e - ldrsh r1, [r5, r2] - movs r6, #0x2e - ldrsh r0, [r4, r6] - subs r1, r1, r0 - ldrb r2, [r4, #0x15] - movs r0, #0x80 - ands r0, r2 - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - lsls r0, r0, #0x18 - eors r1, r0 - cmp r1, #0 - bge _0807F4EA - ldrh r0, [r5, #0x1e] - strh r0, [r4, #0x2e] - b _0807F4F0 -_0807F4EA: - ldr r1, _0807F4F4 @ =gActiveScriptInfo - movs r0, #0 - strb r0, [r1, #6] -_0807F4F0: - pop {r4, r5, r6, pc} - .align 2, 0 -_0807F4F4: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F4F8 -sub_0807F4F8: @ 0x0807F4F8 - push {r4, r5, lr} - adds r4, r0, #0 - adds r5, r1, #0 - ldrb r0, [r5, #0x18] - cmp r0, #0 - bne _0807F548 - adds r0, #1 - strb r0, [r5, #0x18] - ldr r0, [r5, #8] - movs r1, #2 - orrs r0, r1 - str r0, [r5, #8] - ldr r2, [r5, #4] - ldrh r0, [r4, #0x2e] - strh r0, [r5, #0x1e] - ldr r1, _0807F538 @ =gRoomControls - ldrh r0, [r1, #8] - adds r0, r0, r2 - strh r0, [r5, #0x22] - movs r3, #0x32 - ldrsh r0, [r4, r3] - ldrh r1, [r1, #8] - subs r0, r0, r1 - cmp r2, r0 - ble _0807F53C - movs r0, #0x80 - strb r0, [r4, #0x15] - ldrb r1, [r4, #0x14] - ands r0, r1 - movs r1, #4 - orrs r0, r1 - b _0807F546 - .align 2, 0 -_0807F538: .4byte gRoomControls -_0807F53C: - movs r0, #0 - strb r0, [r4, #0x15] - ldrb r1, [r4, #0x14] - movs r0, #0x80 - ands r0, r1 -_0807F546: - strb r0, [r4, #0x14] -_0807F548: - movs r0, #0x24 - ldrsh r1, [r4, r0] - ldrb r2, [r4, #0x15] - adds r0, r4, #0 - bl sub_0806F62C - movs r2, #0x22 - ldrsh r1, [r5, r2] - movs r3, #0x32 - ldrsh r0, [r4, r3] - subs r1, r1, r0 - ldrb r2, [r4, #0x15] - movs r0, #0x80 - ands r0, r2 - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - lsls r0, r0, #0x18 - eors r1, r0 - cmp r1, #0 - blt _0807F576 - ldrh r0, [r5, #0x22] - strh r0, [r4, #0x32] - b _0807F57C -_0807F576: - ldr r1, _0807F580 @ =gActiveScriptInfo - movs r0, #0 - strb r0, [r1, #6] -_0807F57C: - pop {r4, r5, pc} - .align 2, 0 -_0807F580: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F584 -sub_0807F584: @ 0x0807F584 - ldr r0, _0807F590 @ =gPlayerEntity - ldrb r0, [r0, #0x14] - lsrs r0, r0, #1 - str r0, [r1, #4] - bx lr - .align 2, 0 -_0807F590: .4byte gPlayerEntity - - thumb_func_start sub_0807F594 -sub_0807F594: @ 0x0807F594 - push {lr} - ldr r0, _0807F5A8 @ =gPlayerState - adds r0, #0xa8 - ldrb r0, [r0] - cmp r0, #0 - beq _0807F5A6 - ldr r1, _0807F5AC @ =gActiveScriptInfo - movs r0, #0 - strb r0, [r1, #6] -_0807F5A6: - pop {pc} - .align 2, 0 -_0807F5A8: .4byte gPlayerState -_0807F5AC: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F5B0 -sub_0807F5B0: @ 0x0807F5B0 - ldr r0, _0807F5BC @ =gPlayerState - ldr r1, [r1, #4] - adds r0, #0x27 - strb r1, [r0] - bx lr - .align 2, 0 -_0807F5BC: .4byte gPlayerState - - thumb_func_start sub_0807F5C0 -sub_0807F5C0: @ 0x0807F5C0 - push {r4, lr} - ldr r4, _0807F620 @ =gRoomControls - ldr r1, [r4, #0x30] - cmp r1, #0 - beq _0807F62E - movs r2, #0x2e - ldrsh r0, [r1, r2] - adds r2, r0, #0 - subs r2, #0x78 - movs r3, #0x32 - ldrsh r0, [r1, r3] - adds r3, r0, #0 - subs r3, #0x50 - ldrh r1, [r4, #6] - cmp r2, r1 - bge _0807F5E2 - adds r2, r1, #0 -_0807F5E2: - ldrh r0, [r4, #0x1e] - adds r0, r1, r0 - subs r0, #0xf0 - cmp r2, r0 - ble _0807F5EE - adds r2, r0, #0 -_0807F5EE: - ldrh r1, [r4, #8] - cmp r3, r1 - bge _0807F5F6 - adds r3, r1, #0 -_0807F5F6: - ldrh r0, [r4, #0x20] - adds r0, r1, r0 - subs r0, #0xa0 - cmp r3, r0 - ble _0807F602 - adds r3, r0, #0 -_0807F602: - movs r1, #0xa - ldrsh r0, [r4, r1] - cmp r2, r0 - bne _0807F628 - movs r2, #0xc - ldrsh r0, [r4, r2] - cmp r3, r0 - bne _0807F628 - ldr r2, _0807F624 @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] - b _0807F62E - .align 2, 0 -_0807F620: .4byte gRoomControls -_0807F624: .4byte gActiveScriptInfo -_0807F628: - ldr r1, _0807F630 @ =gActiveScriptInfo - movs r0, #0 - strb r0, [r1, #6] -_0807F62E: - pop {r4, pc} - .align 2, 0 -_0807F630: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F634 -sub_0807F634: @ 0x0807F634 - push {lr} - ldr r3, [r1, #4] - ldrh r1, [r3] - ldrh r2, [r3, #2] - ldrh r3, [r3, #4] - bl sub_0801DFB4 - ldr r0, _0807F64C @ =gPlayerState - adds r0, #0x8b - movs r1, #3 - strb r1, [r0] - pop {pc} - .align 2, 0 -_0807F64C: .4byte gPlayerState - - thumb_func_start sub_0807F650 -sub_0807F650: @ 0x0807F650 - push {r4, lr} - adds r4, r0, #0 - bl sub_08002632 - ldr r1, _0807F678 @ =gUnk_08001A7C - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r0, [r0] - ldrh r1, [r0] - ldrh r2, [r0, #2] - ldrh r3, [r0, #4] - adds r0, r4, #0 - bl sub_0801DFB4 - ldr r0, _0807F67C @ =gPlayerState - adds r0, #0x8b - movs r1, #3 - strb r1, [r0] - pop {r4, pc} - .align 2, 0 -_0807F678: .4byte gUnk_08001A7C -_0807F67C: .4byte gPlayerState - - thumb_func_start sub_0807F680 -sub_0807F680: @ 0x0807F680 - push {lr} - adds r2, r1, #0 - movs r3, #0 - ldr r0, _0807F6A8 @ =gPlayerEntity - movs r1, #0x2e - ldrsh r0, [r0, r1] - ldr r1, _0807F6AC @ =gRoomControls - ldrh r1, [r1, #6] - subs r0, r0, r1 - ldrh r1, [r2, #4] - cmp r0, r1 - ble _0807F69A - movs r3, #1 -_0807F69A: - str r3, [r2, #0x14] - ldr r2, _0807F6B0 @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] - pop {pc} - .align 2, 0 -_0807F6A8: .4byte gPlayerEntity -_0807F6AC: .4byte gRoomControls -_0807F6B0: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F6B4 -sub_0807F6B4: @ 0x0807F6B4 - push {lr} - adds r2, r1, #0 - movs r3, #0 - ldr r0, _0807F6DC @ =gPlayerEntity - movs r1, #0x32 - ldrsh r0, [r0, r1] - ldr r1, _0807F6E0 @ =gRoomControls - ldrh r1, [r1, #8] - subs r0, r0, r1 - ldrh r1, [r2, #4] - cmp r0, r1 - ble _0807F6CE - movs r3, #1 -_0807F6CE: - str r3, [r2, #0x14] - ldr r2, _0807F6E4 @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] - pop {pc} - .align 2, 0 -_0807F6DC: .4byte gPlayerEntity -_0807F6E0: .4byte gRoomControls -_0807F6E4: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F6E8 -sub_0807F6E8: @ 0x0807F6E8 - ldr r2, _0807F6F4 @ =gPlayerState - ldr r0, [r2, #0x30] - ldr r1, [r1, #4] - orrs r0, r1 - str r0, [r2, #0x30] - bx lr - .align 2, 0 -_0807F6F4: .4byte gPlayerState - - thumb_func_start sub_0807F6F8 -sub_0807F6F8: @ 0x0807F6F8 - ldr r2, _0807F704 @ =gPlayerState - ldr r1, [r1, #4] - ldr r0, [r2, #0x30] - bics r0, r1 - str r0, [r2, #0x30] - bx lr - .align 2, 0 -_0807F704: .4byte gPlayerState - - thumb_func_start sub_0807F708 -sub_0807F708: @ 0x0807F708 - push {lr} - ldr r1, [r1, #4] - bl ShowNPCDialogue - pop {pc} - .align 2, 0 - - thumb_func_start sub_0807F714 -sub_0807F714: @ 0x0807F714 - push {lr} - adds r1, r0, #0 - ldr r2, _0807F734 @ =gUnk_08114F30 - ldrb r3, [r1, #0x19] - lsrs r0, r3, #6 - adds r0, r0, r2 - ldrb r2, [r0] - lsls r2, r2, #6 - movs r0, #0x3f - ands r0, r3 - orrs r0, r2 - strb r0, [r1, #0x19] - adds r0, r1, #0 - bl ResolveEntityOnTop - pop {pc} - .align 2, 0 -_0807F734: .4byte gUnk_08114F30 - - thumb_func_start sub_0807F738 -sub_0807F738: @ 0x0807F738 - push {lr} - adds r1, r0, #0 - ldr r2, _0807F758 @ =gUnk_08114F34 - ldrb r3, [r1, #0x19] - lsrs r0, r3, #6 - adds r0, r0, r2 - ldrb r2, [r0] - lsls r2, r2, #6 - movs r0, #0x3f - ands r0, r3 - orrs r0, r2 - strb r0, [r1, #0x19] - adds r0, r1, #0 - bl sub_0806FAD8 - pop {pc} - .align 2, 0 -_0807F758: .4byte gUnk_08114F34 - - thumb_func_start sub_0807F75C -sub_0807F75C: @ 0x0807F75C - push {r4, lr} - ldr r2, [r1, #4] - ldr r3, _0807F774 @ =gPlayerEntity - ldr r1, _0807F778 @ =gRoomControls - asrs r0, r2, #0x10 - ldrh r4, [r1, #6] - adds r0, r0, r4 - strh r0, [r3, #0x2e] - ldrh r0, [r1, #8] - adds r0, r0, r2 - strh r0, [r3, #0x32] - pop {r4, pc} - .align 2, 0 -_0807F774: .4byte gPlayerEntity -_0807F778: .4byte gRoomControls - - thumb_func_start sub_0807F77C -sub_0807F77C: @ 0x0807F77C - push {lr} - ldr r0, [r1, #0x14] - cmp r0, #0 - beq _0807F786 - movs r0, #1 -_0807F786: - str r0, [r1, #4] - pop {pc} - .align 2, 0 - - thumb_func_start sub_0807F78C -sub_0807F78C: @ 0x0807F78C - push {r4, r5, r6, lr} - adds r6, r0, #0 - ldr r5, [r1, #4] - cmp r5, #0 - bne _0807F79A - ldr r0, _0807F7BC @ =gRoomVars - ldrb r5, [r0, #6] -_0807F79A: - adds r0, r5, #0 - bl GetSaleItemConfirmMessageID - adds r4, r0, #0 - adds r0, r5, #0 - bl GetItemPrice - adds r5, r0, #0 - adds r0, r4, #0 - adds r1, r6, #0 - bl TextboxNoOverlap - ldr r0, _0807F7C0 @ =gTextBox - lsls r5, r5, #0x10 - lsrs r5, r5, #0x10 - str r5, [r0, #0x10] - pop {r4, r5, r6, pc} - .align 2, 0 -_0807F7BC: .4byte gRoomVars -_0807F7C0: .4byte gTextBox - - thumb_func_start sub_0807F7C4 -sub_0807F7C4: @ 0x0807F7C4 - push {r4, lr} - adds r4, r1, #0 - ldr r0, [r4, #4] - cmp r0, #0 - bne _0807F7D2 - ldr r0, _0807F7F4 @ =gRoomVars - ldrb r0, [r0, #6] -_0807F7D2: - bl GetItemPrice - movs r2, #0 - ldr r1, _0807F7F8 @ =gSave - adds r1, #0xc0 - ldrh r1, [r1] - cmp r0, r1 - bgt _0807F7E4 - movs r2, #1 -_0807F7E4: - str r2, [r4, #0x14] - ldr r2, _0807F7FC @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] - pop {r4, pc} - .align 2, 0 -_0807F7F4: .4byte gRoomVars -_0807F7F8: .4byte gSave -_0807F7FC: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F800 -sub_0807F800: @ 0x0807F800 - push {r4, lr} - ldr r4, [r1, #4] - cmp r4, #0 - bne _0807F80C - ldr r0, _0807F834 @ =gRoomVars - ldrb r4, [r0, #6] -_0807F80C: - adds r0, r4, #0 - bl GetItemPrice - rsbs r0, r0, #0 - bl ModRupees - adds r0, r4, #0 - movs r1, #0 - movs r2, #0 - bl sub_080A7C18 - ldr r1, _0807F834 @ =gRoomVars - movs r0, #0 - strb r0, [r1, #6] - ldr r2, _0807F838 @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] - pop {r4, pc} - .align 2, 0 -_0807F834: .4byte gRoomVars -_0807F838: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F83C -sub_0807F83C: @ 0x0807F83C - push {lr} - bl sub_08079184 - pop {pc} - - thumb_func_start sub_0807F844 -sub_0807F844: @ 0x0807F844 - push {lr} - ldr r1, _0807F850 @ =gRoomControls - str r0, [r1, #0x30] - bl sub_080809D4 - pop {pc} - .align 2, 0 -_0807F850: .4byte gRoomControls - - thumb_func_start sub_0807F854 -sub_0807F854: @ 0x0807F854 - push {lr} - ldr r1, [r1, #4] - lsrs r2, r1, #0x10 - movs r0, #3 - ands r2, r0 - ldr r3, _0807F870 @ =0x0000FFFF - ands r3, r1 - cmp r2, #4 - bhi _0807F8B4 - lsls r0, r2, #2 - ldr r1, _0807F874 @ =_0807F878 - adds r0, r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0807F870: .4byte 0x0000FFFF -_0807F874: .4byte _0807F878 -_0807F878: @ jump table - .4byte _0807F88C @ case 0 - .4byte _0807F88C @ case 1 - .4byte _0807F898 @ case 2 - .4byte _0807F8A4 @ case 3 - .4byte _0807F8B0 @ case 4 -_0807F88C: - ldr r0, _0807F894 @ =gTextBox - str r3, [r0, #0x10] - b _0807F8B4 - .align 2, 0 -_0807F894: .4byte gTextBox -_0807F898: - ldr r0, _0807F8A0 @ =gTextBox - str r3, [r0, #0x14] - b _0807F8B4 - .align 2, 0 -_0807F8A0: .4byte gTextBox -_0807F8A4: - ldr r0, _0807F8AC @ =gTextBox - str r3, [r0, #0x18] - b _0807F8B4 - .align 2, 0 -_0807F8AC: .4byte gTextBox -_0807F8B0: - ldr r0, _0807F8B8 @ =gTextBox - str r3, [r0, #0x1c] -_0807F8B4: - pop {pc} - .align 2, 0 -_0807F8B8: .4byte gTextBox - - thumb_func_start sub_0807F8BC -sub_0807F8BC: @ 0x0807F8BC - push {r4, lr} - adds r4, r1, #0 - bl sub_080040A8 - cmp r0, #0 - beq _0807F8CA - movs r0, #1 -_0807F8CA: - str r0, [r4, #0x14] - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0807F8D0 -sub_0807F8D0: @ 0x0807F8D0 - push {lr} - ldr r1, [r1, #4] - bl sub_08003FC4 - ldr r2, _0807F8E4 @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] - pop {pc} - .align 2, 0 -_0807F8E4: .4byte gActiveScriptInfo - - thumb_func_start sub_0807F8E8 -sub_0807F8E8: @ 0x0807F8E8 - push {r4, r5, lr} - adds r4, r0, #0 - adds r5, r1, #0 - movs r1, #0xa6 - movs r2, #0 - movs r3, #0 - bl CreateObjectWithParent - adds r2, r0, #0 - cmp r2, #0 - beq _0807F912 - str r4, [r2, #0x50] - ldr r0, [r5, #4] - ldr r1, _0807F914 @ =0x000003FF - ands r0, r1 - movs r3, #0x80 - lsls r3, r3, #8 - adds r1, r3, #0 - adds r2, #0x86 - orrs r0, r1 - strh r0, [r2] -_0807F912: - pop {r4, r5, pc} - .align 2, 0 -_0807F914: .4byte 0x000003FF - - thumb_func_start sub_0807F918 -sub_0807F918: @ 0x0807F918 - push {lr} - ldr r0, [r1, #4] - bl PutItemOnSlot - pop {pc} - .align 2, 0 - - thumb_func_start sub_0807F924 -sub_0807F924: @ 0x0807F924 - push {lr} - bl sub_0807879C - pop {pc} - - thumb_func_start sub_0807F92C -sub_0807F92C: @ 0x0807F92C - push {lr} - bl sub_080787C0 - pop {pc} - - thumb_func_start sub_0807F934 -sub_0807F934: @ 0x0807F934 - push {lr} - bl sub_080787B4 - pop {pc} - - thumb_func_start sub_0807F93C -sub_0807F93C: @ 0x0807F93C - push {lr} - ldr r2, [r1, #4] - lsrs r1, r2, #8 - movs r3, #0xff - ands r1, r3 - ands r2, r3 - bl CreateSpeechBubbleSleep - pop {pc} - .align 2, 0 - - thumb_func_start sub_0807F950 -sub_0807F950: @ 0x0807F950 - push {lr} - sub sp, #4 - movs r0, #2 - str r0, [sp] - movs r0, #6 - movs r1, #0x56 - movs r2, #6 - movs r3, #0 - bl FindEntity - cmp r0, #0 - beq _0807F96C - bl DeleteEntity -_0807F96C: - add sp, #4 - pop {pc} - - thumb_func_start sub_0807F970 -sub_0807F970: @ 0x0807F970 - push {lr} - adds r2, r1, #0 - movs r3, #0 - ldr r1, _0807F988 @ =gCurrentTextBox - ldr r0, [r2, #4] - ldrh r1, [r1, #0x28] - cmp r0, r1 - bne _0807F982 - movs r3, #1 -_0807F982: - str r3, [r2, #0x14] - pop {pc} - .align 2, 0 -_0807F988: .4byte gCurrentTextBox - - thumb_func_start sub_0807F98C -sub_0807F98C: @ 0x0807F98C - ldr r1, [r1, #4] - str r1, [r0, #0x34] - bx lr - .align 2, 0 - - thumb_func_start sub_0807F994 -sub_0807F994: @ 0x0807F994 - ldr r2, [r1, #4] - asrs r1, r2, #0x10 - adds r3, r0, #0 - adds r3, #0x62 - strb r1, [r3] - adds r0, #0x63 - strb r2, [r0] - bx lr - - thumb_func_start sub_0807F9A4 -sub_0807F9A4: @ 0x0807F9A4 - push {lr} - ldr r0, _0807F9BC @ =gPlayerState - adds r0, #0xa8 - ldrb r0, [r0] - subs r0, #5 - cmp r0, #0x17 - bhi _0807FA30 - lsls r0, r0, #2 - ldr r1, _0807F9C0 @ =_0807F9C4 - adds r0, r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0807F9BC: .4byte gPlayerState -_0807F9C0: .4byte _0807F9C4 -_0807F9C4: @ jump table - .4byte _0807FA24 @ case 0 - .4byte _0807FA30 @ case 1 - .4byte _0807FA24 @ case 2 - .4byte _0807FA24 @ case 3 - .4byte _0807FA30 @ case 4 - .4byte _0807FA24 @ case 5 - .4byte _0807FA24 @ case 6 - .4byte _0807FA24 @ case 7 - .4byte _0807FA24 @ case 8 - .4byte _0807FA24 @ case 9 - .4byte _0807FA24 @ case 10 - .4byte _0807FA24 @ case 11 - .4byte _0807FA24 @ case 12 - .4byte _0807FA24 @ case 13 - .4byte _0807FA24 @ case 14 - .4byte _0807FA24 @ case 15 - .4byte _0807FA24 @ case 16 - .4byte _0807FA24 @ case 17 - .4byte _0807FA24 @ case 18 - .4byte _0807FA24 @ case 19 - .4byte _0807FA30 @ case 20 - .4byte _0807FA30 @ case 21 - .4byte _0807FA24 @ case 22 - .4byte _0807FA24 @ case 23 -_0807FA24: - ldr r1, _0807FA2C @ =gActiveScriptInfo - movs r0, #0 - strb r0, [r1, #6] - b _0807FA3A - .align 2, 0 -_0807FA2C: .4byte gActiveScriptInfo -_0807FA30: - ldr r2, _0807FA3C @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] -_0807FA3A: - pop {pc} - .align 2, 0 -_0807FA3C: .4byte gActiveScriptInfo - - thumb_func_start sub_0807FA40 -sub_0807FA40: @ 0x0807FA40 - push {lr} - ldr r0, _0807FA58 @ =gPlayerState - adds r0, #0xa8 - ldrb r0, [r0] - subs r0, #5 - cmp r0, #0x17 - bhi _0807FACC - lsls r0, r0, #2 - ldr r1, _0807FA5C @ =_0807FA60 - adds r0, r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0807FA58: .4byte gPlayerState -_0807FA5C: .4byte _0807FA60 -_0807FA60: @ jump table - .4byte _0807FAC0 @ case 0 - .4byte _0807FACC @ case 1 - .4byte _0807FAC0 @ case 2 - .4byte _0807FAC0 @ case 3 - .4byte _0807FACC @ case 4 - .4byte _0807FAC0 @ case 5 - .4byte _0807FAC0 @ case 6 - .4byte _0807FAC0 @ case 7 - .4byte _0807FAC0 @ case 8 - .4byte _0807FAC0 @ case 9 - .4byte _0807FAC0 @ case 10 - .4byte _0807FAC0 @ case 11 - .4byte _0807FAC0 @ case 12 - .4byte _0807FAC0 @ case 13 - .4byte _0807FACC @ case 14 - .4byte _0807FAC0 @ case 15 - .4byte _0807FAC0 @ case 16 - .4byte _0807FAC0 @ case 17 - .4byte _0807FAC0 @ case 18 - .4byte _0807FAC0 @ case 19 - .4byte _0807FACC @ case 20 - .4byte _0807FACC @ case 21 - .4byte _0807FAC0 @ case 22 - .4byte _0807FAC0 @ case 23 -_0807FAC0: - ldr r1, _0807FAC8 @ =gActiveScriptInfo - movs r0, #0 - strb r0, [r1, #6] - b _0807FAD6 - .align 2, 0 -_0807FAC8: .4byte gActiveScriptInfo -_0807FACC: - ldr r2, _0807FAD8 @ =gActiveScriptInfo - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] -_0807FAD6: - pop {pc} - .align 2, 0 -_0807FAD8: .4byte gActiveScriptInfo - - thumb_func_start sub_0807FADC -sub_0807FADC: @ 0x0807FADC - push {r4, lr} - adds r2, r0, #0 - adds r4, r1, #0 - ldrb r0, [r4, #0x18] - cmp r0, #1 - beq _0807FB06 - cmp r0, #1 - bgt _0807FAF2 - cmp r0, #0 - beq _0807FAF8 - b _0807FB1C -_0807FAF2: - cmp r0, #2 - beq _0807FB16 - b _0807FB1C -_0807FAF8: - movs r0, #1 - strb r0, [r4, #0x18] - ldr r1, [r4, #4] - adds r0, r2, #0 - bl sub_0808C650 - b _0807FB1C -_0807FB06: - bl sub_0808C67C - cmp r0, #0 - beq _0807FB1C - ldrb r0, [r4, #0x18] - adds r0, #1 - strb r0, [r4, #0x18] - b _0807FB1C -_0807FB16: - bl sub_0808C688 - b _0807FB22 -_0807FB1C: - ldr r1, _0807FB24 @ =gActiveScriptInfo - movs r0, #0 - strb r0, [r1, #6] -_0807FB22: - pop {r4, pc} - .align 2, 0 -_0807FB24: .4byte gActiveScriptInfo - - thumb_func_start sub_0807FB28 -sub_0807FB28: @ 0x0807FB28 - push {r4, lr} - adds r4, r1, #0 - ldrb r0, [r4, #0x18] - cmp r0, #0 - bne _0807FB3A - ldr r0, _0807FB54 @ =0x00007FFF - movs r1, #1 - bl sub_0801D7BC -_0807FB3A: - ldrb r0, [r4, #0x18] - adds r0, #1 - strb r0, [r4, #0x18] - ldrb r1, [r4, #0x18] - ldr r0, [r4, #4] - cmp r1, r0 - blo _0807FB58 - movs r0, #0 - movs r1, #0 - bl sub_0801D7BC - b _0807FB5E - .align 2, 0 -_0807FB54: .4byte 0x00007FFF -_0807FB58: - ldr r1, _0807FB60 @ =gActiveScriptInfo - movs r0, #0 - strb r0, [r1, #6] -_0807FB5E: - pop {r4, pc} - .align 2, 0 -_0807FB60: .4byte gActiveScriptInfo - - thumb_func_start sub_0807FB64 -sub_0807FB64: @ 0x0807FB64 - ldr r0, _0807FB70 @ =gPlayerEntity - ldr r1, [r1, #4] - adds r0, #0x3d - strb r1, [r0] - bx lr - .align 2, 0 -_0807FB70: .4byte gPlayerEntity - - thumb_func_start sub_0807FB74 -sub_0807FB74: @ 0x0807FB74 - ldr r0, _0807FB8C @ =gPlayerState - adds r0, #0x26 - movs r1, #0 - strb r1, [r0] - ldr r1, _0807FB90 @ =gPlayerEntity - adds r1, #0x3c - ldrb r2, [r1] - movs r0, #0xfb - ands r0, r2 - strb r0, [r1] - bx lr - .align 2, 0 -_0807FB8C: .4byte gPlayerState -_0807FB90: .4byte gPlayerEntity - - thumb_func_start sub_0807FB94 -sub_0807FB94: @ 0x0807FB94 - push {lr} - movs r0, #4 - bl InitScreen - pop {pc} - .align 2, 0 - - thumb_func_start sub_0807FBA0 -sub_0807FBA0: @ 0x0807FBA0 - ldr r2, _0807FBB0 @ =gRoomControls - ldrh r1, [r2, #0xa] - adds r1, #0x78 - strh r1, [r0, #0x2e] - ldrh r1, [r2, #0xc] - adds r1, #0x50 - strh r1, [r0, #0x32] - bx lr - .align 2, 0 -_0807FBB0: .4byte gRoomControls - - thumb_func_start sub_0807FBB4 -sub_0807FBB4: @ 0x0807FBB4 - ldr r2, _0807FBC0 @ =gPlayerState - ldrb r1, [r2, #0x1a] - movs r0, #0x80 - orrs r0, r1 - strb r0, [r2, #0x1a] - bx lr - .align 2, 0 -_0807FBC0: .4byte gPlayerState - - thumb_func_start sub_0807FBC4 -sub_0807FBC4: @ 0x0807FBC4 - push {lr} - bl sub_0805E4A0 - pop {pc} - - thumb_func_start sub_0807FBCC -sub_0807FBCC: @ 0x0807FBCC - push {lr} - bl sub_0805E4CC - pop {pc} - - thumb_func_start sub_0807FBD4 -sub_0807FBD4: @ 0x0807FBD4 - push {r4, lr} - adds r4, r0, #0 - movs r0, #0x24 - ldrsh r1, [r4, r0] - ldrb r2, [r4, #0x15] - adds r0, r4, #0 - bl sub_0806F62C - adds r0, r4, #0 - bl sub_080040A8 - cmp r0, #0 - beq _0807FBF4 - ldr r1, _0807FBF8 @ =gActiveScriptInfo - movs r0, #0 - strb r0, [r1, #6] -_0807FBF4: - pop {r4, pc} - .align 2, 0 -_0807FBF8: .4byte gActiveScriptInfo - -.ifndef EU - thumb_func_start sub_0807FBFC -sub_0807FBFC: @ 0x0807FBFC - ldr r3, _0807FC20 @ =gSave - adds r0, r3, #0 - adds r0, #0xb2 - movs r1, #0 - strb r1, [r0] - adds r0, #0x12 - movs r2, #0 - strh r1, [r0] - subs r0, #0x11 - strb r2, [r0] - adds r0, #0x13 - strh r1, [r0] - subs r0, #0xc - strb r2, [r0] - adds r0, #0xe - strh r1, [r0] - bx lr - .align 2, 0 -_0807FC20: .4byte gSave -.endif - -.ifdef USA - thumb_func_start sub_0807FC24 -sub_0807FC24: @ 0x0807FC24 - push {lr} - ldr r0, _0807FC3C @ =gRoomControls - ldrb r0, [r0, #5] - movs r1, #0xd1 - cmp r0, #1 - bne _0807FC32 - movs r1, #0xcf -_0807FC32: - adds r0, r1, #0 - bl SetLocalFlag - pop {pc} - .align 2, 0 -_0807FC3C: .4byte gRoomControls -.else -.ifdef DEMO_USA @ TODO deduplicate - thumb_func_start sub_0807FC24 -sub_0807FC24: @ 0x0807FC24 - push {lr} - ldr r0, _0807FC3C @ =gRoomControls - ldrb r0, [r0, #5] - movs r1, #0xd1 - cmp r0, #1 - bne _0807FC32 - movs r1, #0xcf -_0807FC32: - adds r0, r1, #0 - bl SetLocalFlag - pop {pc} - .align 2, 0 -_0807FC3C: .4byte gRoomControls -.else -.ifdef DEMO_JP @ TODO deduplicate, one byte different - thumb_func_start sub_0807FC24 -sub_0807FC24: @ 0x0807FC24 - push {lr} - ldr r0, _0807FC3C @ =gRoomControls - ldrb r0, [r0, #5] - movs r1, #0xd0 - cmp r0, #1 - bne _0807FC32 - movs r1, #0xcf -_0807FC32: - adds r0, r1, #0 - bl SetLocalFlag - pop {pc} - .align 2, 0 -_0807FC3C: .4byte gRoomControls -.endif -.endif -.endif - thumb_func_start UpdateScroll UpdateScroll: @ 0xUpdateScroll push {lr} diff --git a/asm/code_080A3BD0.s b/asm/code_080A3BD0.s index b6e487d1..bc0b67f1 100644 --- a/asm/code_080A3BD0.s +++ b/asm/code_080A3BD0.s @@ -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 @@ -3201,7 +3201,7 @@ sub_080A529C: @ 0x080A529C str r0, [r1, #0xc] ldrb r4, [r1, #3] lsls r1, r4, #3 - ldr r0, _080A52D8 @ =gUnk_08128B64 + ldr r0, _080A52D8 @ =gItemMenuTable adds r1, r1, r0 ldr r0, _080A52DC @ =gInput ldrh r2, [r0, #2] @@ -3219,7 +3219,7 @@ sub_080A529C: @ 0x080A529C .align 2, 0 _080A52D0: .4byte gMenu _080A52D4: .4byte gUnk_08128BF4 -_080A52D8: .4byte gUnk_08128B64 +_080A52D8: .4byte gItemMenuTable _080A52DC: .4byte gInput _080A52E0: cmp r4, #0x10 @@ -3358,7 +3358,7 @@ _080A4BC8: ldrb r0, [r2] cmp r0, #0 beq _080A4C68 - ldr r0, _080A4C20 @ =gUnk_08128B64 + ldr r0, _080A4C20 @ =gItemMenuTable adds r1, r6, r0 ldrb r0, [r1, #6] ldr r3, _080A4C14EU @ =gOamCmd @@ -3395,7 +3395,7 @@ _080A4BF4: _080A4C14EU: .4byte gOamCmd _080A4C18: .4byte gSave _080A4C1C: .4byte gChooseFileState -_080A4C20: .4byte gUnk_08128B64 +_080A4C20: .4byte gItemMenuTable _080A4C24: .4byte gBombBagSizes _080A4C28: cmp r3, #0xa @@ -3453,7 +3453,7 @@ _080A4C68: movs r1, #0x11 _080A4C8E: lsls r0, r1, #3 - ldr r1, _080A4D54EU @ =gUnk_08128B64 + ldr r1, _080A4D54EU @ =gItemMenuTable mov r8, r1 adds r1, r0, r1 mov r4, sb @@ -3545,7 +3545,7 @@ _080A4D44: .4byte gOamCmd _080A4D48: .4byte gSpriteAnimations_322 _080A4D4C: .4byte 0x00000141 _080A4D50EU: .4byte gChooseFileState -_080A4D54EU: .4byte gUnk_08128B64 +_080A4D54EU: .4byte gItemMenuTable _080A4D58: .4byte gMain _080A4D5C: .4byte gSave .else @@ -3580,7 +3580,7 @@ _080A53B4: ldrb r0, [r2] cmp r0, #0 beq _080A5456 - ldr r0, _080A540C @ =gUnk_08128B64 + ldr r0, _080A540C @ =gItemMenuTable adds r1, r6, r0 ldrb r0, [r1, #6] ldr r3, _080A5400 @ =gOamCmd @@ -3617,7 +3617,7 @@ _080A53E0: _080A5400: .4byte gOamCmd _080A5404: .4byte gSave _080A5408: .4byte gMenu -_080A540C: .4byte gUnk_08128B64 +_080A540C: .4byte gItemMenuTable _080A5410: .4byte gBombBagSizes _080A5414: cmp r3, #0xa @@ -3676,7 +3676,7 @@ _080A5456: movs r1, #0x11 _080A547C: lsls r0, r1, #3 - ldr r1, _080A553C @ =gUnk_08128B64 + ldr r1, _080A553C @ =gItemMenuTable mov r8, r1 adds r1, r0, r1 mov r4, sb @@ -3766,7 +3766,7 @@ _080A552C: .4byte gQuiverSizes _080A5530: .4byte gOamCmd _080A5534: .4byte gSpriteAnimations_322 _080A5538: .4byte gMenu -_080A553C: .4byte gUnk_08128B64 +_080A553C: .4byte gItemMenuTable _080A5540: .4byte gMain _080A5544: .4byte 0x000001FB _080A5548: .4byte gSave diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index 6aa470d2..e82b02ea 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -1259,7 +1259,7 @@ sub_080A5CFC: @ 0x080A5CFC push {r4, lr} adds r4, r0, #0 bl sub_0801DDA0 - bl sub_0801DD88 + bl LoadDungeonMap ldr r1, _080A5D18 @ =gUnk_02019EE0 movs r2, #0x80 lsls r2, r2, #3 @@ -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 diff --git a/asm/code_080A7C00.s b/asm/code_080A7C00.s index 38273dbe..91127b4c 100644 --- a/asm/code_080A7C00.s +++ b/asm/code_080A7C00.s @@ -192,7 +192,7 @@ sub_080A7D44: @ 0x080A7D44 bl sub_08078AA8 b _080A7D56 _080A7D52: - bl TextboxNoOverlapFollow + bl MessageFromTarget _080A7D56: pop {pc} diff --git a/asm/crt0.s b/asm/crt0.s index 06a7b8b9..8f9d1809 100644 --- a/asm/crt0.s +++ b/asm/crt0.s @@ -39,7 +39,7 @@ _080000F0: sp_irq: .4byte gUnk_03007FA0 sp_usr: .4byte gUnk_03007F00 INTR_VECTOR_BUF: .4byte 0x03007FFC -intr_main: .4byte IntrMain +intr_main: .4byte gIntrMain .ifdef EU unk_function: .4byte sub_08000118 .else diff --git a/asm/figurineDevice.s b/asm/figurineDevice.s index d076fd5b..0b58d4db 100644 --- a/asm/figurineDevice.s +++ b/asm/figurineDevice.s @@ -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 @@ -1102,7 +1102,7 @@ sub_08088160: @ 0x08088160 push {r4, lr} adds r2, r0, #0 lsls r1, r1, #3 - ldr r0, _08087FB0 @ =0x080FC094 + ldr r0, _08087FB0 @ =gUnk_080FC3E4 adds r1, r1, r0 movs r4, #0 adds r0, r2, #0 @@ -1120,7 +1120,7 @@ sub_08088160: @ 0x08088160 beq _08087FBC b _0808806A .align 2, 0 -_08087FB0: .4byte 0x080FC094 +_08087FB0: .4byte gUnk_080FC3E4 _08087FB4: cmp r0, #0x20 beq _08087FCA @@ -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 diff --git a/asm/fileScreen.s b/asm/fileScreen.s index 67b9f73d..06c15115 100755 --- a/asm/fileScreen.s +++ b/asm/fileScreen.s @@ -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: diff --git a/asm/fourElements.s b/asm/fourElements.s index dd5ffa82..2c46e6b1 100644 --- a/asm/fourElements.s +++ b/asm/fourElements.s @@ -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 diff --git a/asm/intr.s b/asm/intr.s index 29ac977e..16d25124 100644 --- a/asm/intr.s +++ b/asm/intr.s @@ -6,6 +6,10 @@ .text .code 16 + +.global RAMFUNCS_BASE +RAMFUNCS_BASE:: + sub_080B197C:: @ 0x080B197C push {r4, r5, r6} ldr r2, _080B19C0 @ =gRoomControls @@ -250,13 +254,14 @@ _080B1C48: .4byte gUnk_080B7A3E _080B1C4C: .4byte gRoomControls _080B1C50: .4byte gUnk_08000278 - arm_func_start sub_080B1C54 -sub_080B1C54: @ 0x080B1C54 + arm_func_start UpdateCollision +UpdateCollision: @ 0x080B1C54 + @ r0 : Entity* this ldrb r1, [r0, #0x10] - ands r1, r1, #0x80 + ands r1, r1, #0x80 @ disable collision flag bxeq lr - ldr r2, _080B200C @ =gUnk_03000E10 - ldr r3, _080B2010 @ =gHitboxCount + ldr r2, _080B200C @ =gCollidableList + ldr r3, _080B2010 @ =gCollidableCount ldrb r1, [r3] str r0, [r2, r1, lsl #2] add r1, r1, #1 @@ -340,8 +345,8 @@ _080B1D84: pop {r4, r5, r6, r7, r8, sb, sl, lr} bx lr _080B1D8C: .4byte gUnk_02018EA0 -_080B1D90: .4byte gUnk_03000E10 -_080B1D94: .4byte gHitboxCount +_080B1D90: .4byte gCollidableList +_080B1D94: .4byte gCollidableCount arm_func_start sub_080B1D98 sub_080B1D98: @ 0x080B1D98 @@ -525,33 +530,33 @@ _080B1FFC: .4byte gUnk_03005D5C _080B2000: .4byte gUnk_03005D24 _080B2004: .4byte gUnk_03005D18 _080B2008: .4byte gUnk_03005D58 -_080B200C: .4byte gUnk_03000E10 -_080B2010: .4byte gHitboxCount +_080B200C: .4byte gCollidableList +_080B2010: .4byte gCollidableCount _080B2014: .4byte gUnk_080B7B74 _080B2018: .4byte gUnk_080B3744 - arm_func_start sub_080B201C -sub_080B201C: @ 0x080B201C + arm_func_start IntrMain +IntrMain: mov r3, #0x4000000 add r3, r3, #0x200 - ldr r2, [r3] - ldrh r1, [r3, #8] + ldr r2, [r3] @ lo 16: interrupt_enable, hi 16: interrupt_request + ldrh r1, [r3, #8] @ interrupt master enable mrs r0, spsr push {r0, r1, r2, r3, lr} and r1, r2, r2, lsr #16 - ands r0, r1, #0x2000 + ands r0, r1, #0x2000 @ external irq bne _080B20D4 mov ip, #4 - ands r0, r1, #0x80 + ands r0, r1, #0x80 @ serial comm bne _080B2074 mov ip, #0xc - ands r0, r1, #4 + ands r0, r1, #4 @ vcount bne _080B2074 mov ip, #0x10 - ands r0, r1, #1 + ands r0, r1, #1 @ vblank bne _080B2074 mov ip, #0x14 - ands r0, r1, #0x40 + ands r0, r1, #0x40 @ timer 3 overflow bne _080B2074 mov ip, #0 _080B2074: @@ -610,8 +615,8 @@ _080B20FC: mov r0, #1 bx lr - arm_func_start sub_080B2124 -sub_080B2124: @ 0x080B2124 + arm_func_start MakeFadeBuff256 +MakeFadeBuff256: @ 0x080B2124 push {r4, r5, r6, r7, r8, sb, sl, fp} mul r3, r2, r3 mov r4, #0x400 @@ -652,50 +657,60 @@ _080B21AC: .4byte gUnk_08000F54 arm_func_start UpdateEntities UpdateEntities: @ 0x080B21B0 - ldr fp, _080B2270 @ =gUnk_03003DD0 - ldr r1, [fp] - ldm r1, {r7, r8, sb, sl} - ldr sp, [fp, #0xc] - ldr r8, [fp, #4] - ldr r0, [fp, #8] + ldr r11, _080B2270 @ =gUnk_03003DD0 + ldr r1, [r11] + ldm r1, {r7, r8, r9, r10} + ldr sp, [r11, #0xc] + ldr r8, [r11, #4] + ldr r0, [r11, #8] add pc, pc, #0x60 @ =_080B2230 + +@ gUnk_03003DD0 { +@ void* chosen_table; +@ void* linked_list_top; +@ void* curr_entity; +@ void* restore_sp; +@ } + @ UpdateEntities starts here + @ arg0 (r0) : 0 = entities, 1 = managers ldr r1, _080B2274 @ =gUnk_080026A4 add r1, r1, r0, lsl #4 - push {r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr fp, _080B2278 @ =gUnk_03003DD0 - str r1, [fp] - str sp, [fp, #0xc] - ldm r1, {r7, r8, sb, sl} -_080B21E8: + push {r4 - r11, lr} + ldr r11, _080B2278 @ =gUnk_03003DD0 + str r1, [r11, #0x0] + str sp, [r11, #0xc] + ldm r1, {r7, r8, r9, r10} +next_list: @ traverse entity linked list add r8, r8, #8 - str r8, [fp, #4] - cmp r8, sb - bhs _080B2238 - ldr r4, [r8, #4] -_080B21FC: + str r8, [r11, #4] + cmp r8, r9 + bhs lists_complete + ldr r4, [r8, #4] @ entity -> next +next_entity: cmp r4, r8 - beq _080B21E8 + beq next_list mov r0, #0 str r0, [r7] - str r4, [fp, #8] - ldrb r1, [r4, #8] - ldr r1, [sl, r1, lsl #2] + str r4, [r11, #8] + ldrb r1, [r4, #8] @ entity -> kind + ldr r1, [r10, r1, lsl #2] mov r0, r4 mov lr, pc - bx r1 @ Jump to address stored in r1 -_080B2224: - ldr r0, [fp, #8] - cmp r0, r4 - bleq sub_080B1C54 + bx r1 @ call entity kind update function + ldr r0, [r11, #8] + cmp r0, r4 @ update collision if entity is still alive + bleq UpdateCollision _080B2230: @ jumped here if ClearAndUpdateEntities ldr r4, [r0, #4] - b _080B21FC -_080B2238: + b next_entity +lists_complete: mov r0, #0 - str r0, [fp, #8] - pop {r4, r5, r6, r7, r8, sb, sl, fp, lr} + str r0, [r11, #8] + pop {r4 - r11, lr} bx lr + +_080B2248:: _080B2248: .4byte DeleteThisEntity @ 0x3005fbc _080B224C: .4byte PlayerUpdate _080B2250: .4byte DeleteThisEntity @@ -706,6 +721,7 @@ _080B2260: .4byte ObjectUpdate _080B2264: .4byte NPCUpdate _080B2268: .4byte ItemUpdate _080B226C: .4byte ManagerUpdate + _080B2270: .4byte gUnk_03003DD0 _080B2274: .4byte gUnk_080026A4 _080B2278: .4byte gUnk_03003DD0 @@ -860,7 +876,7 @@ sub_080B19C8: @ 0x080B19C8 mov r2, #0 strb r2, [r1] stmdb sp!, {lr} - bl sub_080B2478 + bl ResolveOamDrawPriority bl sub_080B2534 ldm sp!, {lr} b _080B1C40EU @@ -910,7 +926,7 @@ sub_080B19C8: @ 0x080B19C8 mov r2, #0 strb r2, [r1] stmdb sp!, {lr} - bl sub_080B2478 + bl ResolveOamDrawPriority bl sub_080B2534 ldm sp!, {lr} b _080B1C40EU @@ -949,15 +965,18 @@ sub_080B2448: @ 0x080B2448 mov r2, #0 strb r2, [r1] stmdb sp!, {lr} - bl sub_080B2478 + bl ResolveOamDrawPriority bl sub_080B2534 ldm sp!, {lr} b _080B26B4 .endif .endif - arm_func_start sub_080B2478 -sub_080B2478: @ 0x080B2478 + arm_func_start ResolveOamDrawPriority +ResolveOamDrawPriority: @ 0x080B2478 + prio_a .req r8 + prio_b .req r5 + mov sb, r0 mov r1, r0 ldrb r2, [r1], #4 @@ -965,7 +984,7 @@ sub_080B2478: @ 0x080B2478 sub sl, r2, #1 add r2, r1, sl, lsl #2 cmp sl, #0 - beq _080B252C + beq no_objs _080B2498: lsl r3, sl, #2 mov r6, #0 @@ -977,40 +996,44 @@ _080B24A0: _080B24B0: cmp r1, ip blo _080B251C +# sprite A ldr r4, [r1] +# pos ldr r8, [r4, #0x30] - add r8, r8, #-0x80000000 - lsr r8, r8, #3 + add r8, #0x80000000 + lsr r8, #3 +# load priority bits, NOT so 0 = highest priority ldrb r0, [r4, #0x29] mvn r0, r0 - orr r8, r8, r0, lsl #29 + orr prio_a, r8, r0, lsl #29 add r7, r1, r3 -_080B24D8: +next_sprite: cmp r2, r7 - blo _080B2510 + blo a_priority +# sprite B ldr r5, [r7] ldr r0, [r5, #0x30] - add r0, r0, #-0x80000000 - lsr r0, r0, #3 + add r0, #0x80000000 + lsr r0, #3 ldrb r5, [r5, #0x29] mvn r5, r5 - orr r5, r0, r5, lsl #29 - cmp r8, r5 - bhs _080B2510 + orr prio_b, r0, r5, lsl #29 + cmp prio_a, prio_b + bhs a_priority ldr r5, [r7], -r3 str r5, [r7], r3, lsl #1 - b _080B24D8 -_080B2510: + b next_sprite +a_priority: str r4, [r7, -r3]! sub r1, r1, r3 b _080B24B0 _080B251C: - add r6, r6, #1 + add r6, #1 b _080B24A0 _080B2524: - lsrs sl, sl, #1 + lsrs sl, #1 bne _080B2498 -_080B252C: +no_objs: mov r0, sb bx lr diff --git a/asm/itemForSale.s b/asm/itemForSale.s index af98dc19..941d9eee 100644 --- a/asm/itemForSale.s +++ b/asm/itemForSale.s @@ -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 diff --git a/asm/jarPortal.s b/asm/jarPortal.s index 8b057fc8..a42aa8ad 100644 --- a/asm/jarPortal.s +++ b/asm/jarPortal.s @@ -6,444 +6,3 @@ .text - - thumb_func_start JarPortal -JarPortal: @ 0x0808BE84 - push {lr} - ldr r2, _0808BE98 @ =gUnk_08121488 - ldrb r1, [r0, #0xc] - lsls r1, r1, #2 - adds r1, r1, r2 - ldr r1, [r1] - bl _call_via_r1 - pop {pc} - .align 2, 0 -_0808BE98: .4byte gUnk_08121488 - - thumb_func_start sub_0808BE9C -sub_0808BE9C: @ 0x0808BE9C - push {r4, r5, lr} - adds r4, r0, #0 - ldrb r1, [r4, #0x10] - movs r0, #0x80 - movs r2, #0 - orrs r0, r1 - strb r0, [r4, #0x10] - adds r0, r4, #0 - adds r0, #0x3f - movs r5, #1 - strb r5, [r0] - adds r1, r4, #0 - adds r1, #0x3c - movs r0, #0x47 - strb r0, [r1] - adds r1, #4 - movs r0, #0x44 - strb r0, [r1] - subs r1, #5 - movs r0, #0x80 - strb r0, [r1] - adds r0, r4, #0 - adds r0, #0x68 - strb r2, [r0] - ldrb r0, [r4, #0xa] - bl CheckLocalFlag - cmp r0, #0 - beq _0808BEEE - adds r0, r4, #0 - adds r0, #0x7c - ldrb r0, [r0] - cmp r0, #0 - bne _0808BEF8 - movs r0, #3 - strb r0, [r4, #0xc] - adds r0, r4, #0 - movs r1, #1 - bl InitAnimationForceUpdate - b _0808BF10 -_0808BEEE: - adds r0, r4, #0 - adds r0, #0x7c - ldrb r0, [r0] - cmp r0, #0 - bne _0808BF04 -_0808BEF8: - strb r5, [r4, #0xc] - adds r0, r4, #0 - movs r1, #0 - bl InitAnimationForceUpdate - b _0808BF10 -_0808BF04: - movs r0, #3 - strb r0, [r4, #0xc] - adds r0, r4, #0 - movs r1, #1 - bl InitAnimationForceUpdate -_0808BF10: - pop {r4, r5, pc} - .align 2, 0 - - thumb_func_start sub_0808BF14 -sub_0808BF14: @ 0x0808BF14 - push {r4, lr} - adds r4, r0, #0 - bl sub_0808C128 - cmp r0, #0 - beq _0808BF4C - ldrb r0, [r4, #0xc] - adds r0, #1 - strb r0, [r4, #0xc] - adds r0, r4, #0 - bl sub_0808C13C - adds r0, r4, #0 - adds r0, #0x7c - ldrb r0, [r0] - cmp r0, #0 - bne _0808BF3E - ldrb r0, [r4, #0xa] - bl SetLocalFlag - b _0808BF44 -_0808BF3E: - ldrb r0, [r4, #0xa] - bl ClearLocalFlag -_0808BF44: - adds r0, r4, #0 - movs r1, #0 - bl sub_0808C148 -_0808BF4C: - adds r0, r4, #0 - movs r1, #0 - bl sub_0808C01C - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0808BF58 -sub_0808BF58: @ 0x0808BF58 - push {r4, lr} - adds r4, r0, #0 - movs r1, #0x80 - lsls r1, r1, #6 - bl sub_08003FC4 - ldrb r0, [r4, #0xd] - cmp r0, #1 - beq _0808BF94 - cmp r0, #1 - bgt _0808BF74 - cmp r0, #0 - beq _0808BF7A - b _0808BFD6 -_0808BF74: - cmp r0, #2 - beq _0808BFB0 - b _0808BFD6 -_0808BF7A: - ldr r1, [r4, #0x20] - ldr r0, _0808BF90 @ =0x00017FFF - cmp r1, r0 - bgt _0808BFD6 - movs r0, #1 - strb r0, [r4, #0xd] - adds r0, r4, #0 - movs r1, #2 - bl InitAnimationForceUpdate - b _0808BFD6 - .align 2, 0 -_0808BF90: .4byte 0x00017FFF -_0808BF94: - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - movs r1, #0x36 - ldrsh r0, [r4, r1] - cmp r0, #0 - bne _0808BFD6 - ldrb r0, [r4, #0xd] - adds r0, #1 - strb r0, [r4, #0xd] - movs r0, #0x80 - lsls r0, r0, #8 - str r0, [r4, #0x20] - b _0808BFD6 -_0808BFB0: - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - movs r0, #0x36 - ldrsh r1, [r4, r0] - cmp r1, #0 - bne _0808BFD6 - ldrb r0, [r4, #0xc] - adds r0, #1 - strb r0, [r4, #0xc] - strb r1, [r4, #0xf] - adds r0, r4, #0 - movs r1, #1 - bl InitAnimationForceUpdate - adds r0, r4, #0 - movs r1, #1 - bl sub_0808C148 -_0808BFD6: - pop {r4, pc} - - thumb_func_start sub_0808BFD8 -sub_0808BFD8: @ 0x0808BFD8 - push {r4, lr} - adds r4, r0, #0 - bl sub_0808C128 - cmp r0, #0 - beq _0808C010 - ldrb r0, [r4, #0xc] - adds r0, #1 - strb r0, [r4, #0xc] - adds r0, r4, #0 - bl sub_0808C13C - adds r0, r4, #0 - adds r0, #0x7c - ldrb r0, [r0] - cmp r0, #0 - bne _0808C002 - ldrb r0, [r4, #0xa] - bl ClearLocalFlag - b _0808C008 -_0808C002: - ldrb r0, [r4, #0xa] - bl SetLocalFlag -_0808C008: - adds r0, r4, #0 - movs r1, #0 - bl sub_0808C148 -_0808C010: - adds r0, r4, #0 - movs r1, #1 - bl sub_0808C01C - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0808C01C -sub_0808C01C: @ 0x0808C01C - push {r4, r5, r6, lr} - adds r4, r0, #0 - adds r5, r1, #0 - movs r1, #0x2e - ldrsh r0, [r4, r1] - subs r0, #0x18 - movs r2, #0x32 - ldrsh r1, [r4, r2] - subs r1, #0x18 - movs r2, #0x30 - movs r3, #0x30 - bl CheckPlayerProximity - cmp r0, #0 - beq _0808C0A6 - ldr r2, _0808C06C @ =gArea - ldrh r0, [r4, #0x2e] - strh r0, [r2, #0x12] - ldrh r0, [r4, #0x32] - strh r0, [r2, #0x14] - movs r6, #2 - strb r6, [r2, #0x16] - movs r0, #4 - cmp r5, #0 - beq _0808C050 - movs r0, #2 -_0808C050: - strb r0, [r2, #0x17] - cmp r5, #1 - bne _0808C0A6 - ldr r3, _0808C070 @ =gPlayerState - ldr r0, [r3, #0x30] - movs r1, #0x20 - ands r0, r1 - cmp r0, #0 - beq _0808C074 - ldrb r0, [r3, #2] - cmp r0, #0 - bne _0808C074 - strb r6, [r2, #0x18] - b _0808C082 - .align 2, 0 -_0808C06C: .4byte gArea -_0808C070: .4byte gPlayerState -_0808C074: - bl sub_08057810 - cmp r0, #0 - beq _0808C082 - ldr r1, _0808C0A8 @ =gArea - movs r0, #3 - strb r0, [r1, #0x18] -_0808C082: - movs r1, #0x2e - ldrsh r0, [r4, r1] - movs r2, #0x32 - ldrsh r1, [r4, r2] - adds r2, r4, #0 - adds r2, #0x38 - ldrb r2, [r2] - bl sub_080577AC - ldrb r0, [r4, #0xf] - cmp r0, #0 - bne _0808C0A6 - movs r0, #1 - strb r0, [r4, #0xf] - movs r0, #0xa9 - lsls r0, r0, #1 - bl SoundReq -_0808C0A6: - pop {r4, r5, r6, pc} - .align 2, 0 -_0808C0A8: .4byte gArea - - thumb_func_start sub_0808C0AC -sub_0808C0AC: @ 0x0808C0AC - push {r4, lr} - adds r4, r0, #0 - movs r1, #0x80 - lsls r1, r1, #6 - bl sub_08003FC4 - ldrb r0, [r4, #0xd] - cmp r0, #1 - beq _0808C0E8 - cmp r0, #1 - bgt _0808C0C8 - cmp r0, #0 - beq _0808C0CE - b _0808C126 -_0808C0C8: - cmp r0, #2 - beq _0808C104 - b _0808C126 -_0808C0CE: - ldr r1, [r4, #0x20] - ldr r0, _0808C0E4 @ =0x00017FFF - cmp r1, r0 - bgt _0808C126 - movs r0, #1 - strb r0, [r4, #0xd] - adds r0, r4, #0 - movs r1, #3 - bl InitAnimationForceUpdate - b _0808C126 - .align 2, 0 -_0808C0E4: .4byte 0x00017FFF -_0808C0E8: - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - movs r1, #0x36 - ldrsh r0, [r4, r1] - cmp r0, #0 - bne _0808C126 - ldrb r0, [r4, #0xd] - adds r0, #1 - strb r0, [r4, #0xd] - movs r0, #0x80 - lsls r0, r0, #8 - str r0, [r4, #0x20] - b _0808C126 -_0808C104: - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - movs r1, #0x36 - ldrsh r0, [r4, r1] - cmp r0, #0 - bne _0808C126 - movs r0, #1 - strb r0, [r4, #0xc] - adds r0, r4, #0 - movs r1, #0 - bl InitAnimationForceUpdate - adds r0, r4, #0 - movs r1, #1 - bl sub_0808C148 -_0808C126: - pop {r4, pc} - - thumb_func_start sub_0808C128 -sub_0808C128: @ 0x0808C128 - push {lr} - movs r1, #0 - adds r0, #0x41 - ldrb r0, [r0] - cmp r0, #0x9d - bne _0808C136 - movs r1, #1 -_0808C136: - adds r0, r1, #0 - pop {pc} - .align 2, 0 - - thumb_func_start sub_0808C13C -sub_0808C13C: @ 0x0808C13C - movs r1, #0 - strb r1, [r0, #0xd] - movs r1, #0xa0 - lsls r1, r1, #0xa - str r1, [r0, #0x20] - bx lr - - thumb_func_start sub_0808C148 -sub_0808C148: @ 0x0808C148 - push {r4, r5, r6, lr} - adds r6, r0, #0 - movs r2, #0x2e - ldrsh r0, [r6, r2] - ldr r4, _0808C1A4 @ =gRoomControls - ldrh r2, [r4, #6] - subs r0, r0, r2 - asrs r5, r0, #4 - movs r3, #0x3f - ands r5, r3 - movs r2, #0x32 - ldrsh r0, [r6, r2] - ldrh r2, [r4, #8] - subs r0, r0, r2 - asrs r0, r0, #4 - ands r0, r3 - lsls r0, r0, #6 - orrs r5, r0 - cmp r1, #0 - bne _0808C1B8 - ldr r0, _0808C1A8 @ =0x00004092 - subs r1, r5, #1 - adds r4, r6, #0 - adds r4, #0x38 - ldrb r2, [r4] - bl SetTile - ldr r0, _0808C1AC @ =0x00004093 - ldrb r2, [r4] - adds r1, r5, #0 - bl SetTile - ldr r0, _0808C1B0 @ =0x00004094 - adds r1, r5, #0 - adds r1, #0x3f - ldrb r2, [r4] - bl SetTile - ldr r0, _0808C1B4 @ =0x00004095 - adds r1, r5, #0 - adds r1, #0x40 - ldrb r2, [r4] - bl SetTile - b _0808C1E0 - .align 2, 0 -_0808C1A4: .4byte gRoomControls -_0808C1A8: .4byte 0x00004092 -_0808C1AC: .4byte 0x00004093 -_0808C1B0: .4byte 0x00004094 -_0808C1B4: .4byte 0x00004095 -_0808C1B8: - subs r0, r5, #1 - adds r4, r6, #0 - adds r4, #0x38 - ldrb r1, [r4] - bl sub_0807BA8C - ldrb r1, [r4] - adds r0, r5, #0 - bl sub_0807BA8C - adds r0, r5, #0 - adds r0, #0x3f - ldrb r1, [r4] - bl sub_0807BA8C - adds r0, r5, #0 - adds r0, #0x40 - ldrb r1, [r4] - bl sub_0807BA8C -_0808C1E0: - pop {r4, r5, r6, pc} - .align 2, 0 diff --git a/asm/macros.inc b/asm/macros.inc index 4150307f..c40de534 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -1,5 +1,6 @@ .include "asm/macros/asm.inc" .include "asm/macros/function.inc" + .include "asm/macros/ram.inc" .include "asm/macros/m4a.inc" .include "asm/macros/map.inc" .include "asm/macros/entity.inc" diff --git a/asm/macros/ram.inc b/asm/macros/ram.inc new file mode 100644 index 00000000..d12c84e2 --- /dev/null +++ b/asm/macros/ram.inc @@ -0,0 +1,20 @@ + .ifndef GUARD_ASM_MACROS_RAM_INC + .set GUARD_ASM_MACROS_RAM_INC, 1 + +.ifdef EU + .set RAM_DIFF, 0x050AC28C - 0xaa0 +.endif + +.ifdef USA + .set RAM_DIFF, 0x050AC28C +.endif + +.ifdef JP + .set RAM_DIFF, 0x050AC28C - 0x260 +.endif + + .macro ram_addr x + .4byte \x - RAM_DIFF + .endm + + .endif @ GUARD_ASM_MACROS_RAM_INC diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc index 7e56ccea..66a3f1dc 100644 --- a/asm/macros/scripts.inc +++ b/asm/macros/scripts.inc @@ -329,7 +329,7 @@ .2byte \s .endm -.macro _0807E788 w:req +.macro SetFadeMask w:req .2byte 0x0c39 .4byte \w .endm @@ -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 diff --git a/asm/non_matching/brocco/sub_08063584.inc b/asm/non_matching/brocco/sub_08063584.inc index 25e669f5..2d2d704a 100644 --- a/asm/non_matching/brocco/sub_08063584.inc +++ b/asm/non_matching/brocco/sub_08063584.inc @@ -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 diff --git a/asm/non_matching/castleMaid/sub_08064570.inc b/asm/non_matching/castleMaid/sub_08064570.inc index abcae064..24d04d1c 100644 --- a/asm/non_matching/castleMaid/sub_08064570.inc +++ b/asm/non_matching/castleMaid/sub_08064570.inc @@ -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 diff --git a/asm/non_matching/cucco/sub_0806E6A8.inc b/asm/non_matching/cucco/sub_0806E6A8.inc index 3088da67..1c05898d 100644 --- a/asm/non_matching/cucco/sub_0806E6A8.inc +++ b/asm/non_matching/cucco/sub_0806E6A8.inc @@ -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 diff --git a/asm/non_matching/eu/HandlePlayerLife.inc b/asm/non_matching/eu/HandlePlayerLife.inc index 96134c53..bc528d6e 100644 --- a/asm/non_matching/eu/HandlePlayerLife.inc +++ b/asm/non_matching/eu/HandlePlayerLife.inc @@ -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 diff --git a/asm/non_matching/eu/TextBoxHandlerQuestion.inc b/asm/non_matching/eu/TextBoxHandlerQuestion.inc index 86aee30b..1835ff7f 100644 --- a/asm/non_matching/eu/TextBoxHandlerQuestion.inc +++ b/asm/non_matching/eu/TextBoxHandlerQuestion.inc @@ -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 diff --git a/asm/non_matching/ghostBrothers/sub_08065D74.inc b/asm/non_matching/ghostBrothers/sub_08065D74.inc index eee44d0e..7437a539 100644 --- a/asm/non_matching/ghostBrothers/sub_08065D74.inc +++ b/asm/non_matching/ghostBrothers/sub_08065D74.inc @@ -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 diff --git a/asm/non_matching/ghostBrothers/sub_08065DB8.inc b/asm/non_matching/ghostBrothers/sub_08065DB8.inc index 6e6e7d6e..1ec10789 100644 --- a/asm/non_matching/ghostBrothers/sub_08065DB8.inc +++ b/asm/non_matching/ghostBrothers/sub_08065DB8.inc @@ -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] diff --git a/asm/non_matching/guardWithSpear/sub_080643D8.inc b/asm/non_matching/guardWithSpear/sub_080643D8.inc index 75d9f6e8..dfb5fc95 100644 --- a/asm/non_matching/guardWithSpear/sub_080643D8.inc +++ b/asm/non_matching/guardWithSpear/sub_080643D8.inc @@ -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 diff --git a/asm/non_matching/itemPegasusBoots/sub_08076964.inc b/asm/non_matching/itemPegasusBoots/sub_08076964.inc index ab565b3d..979d4f34 100644 --- a/asm/non_matching/itemPegasusBoots/sub_08076964.inc +++ b/asm/non_matching/itemPegasusBoots/sub_08076964.inc @@ -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] diff --git a/asm/non_matching/kid/sub_080621AC.inc b/asm/non_matching/kid/sub_080621AC.inc index 63614833..0b353636 100644 --- a/asm/non_matching/kid/sub_080621AC.inc +++ b/asm/non_matching/kid/sub_080621AC.inc @@ -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 diff --git a/asm/non_matching/kid/sub_08062634.inc b/asm/non_matching/kid/sub_08062634.inc index 8d76db7c..2c665de5 100644 --- a/asm/non_matching/kid/sub_08062634.inc +++ b/asm/non_matching/kid/sub_08062634.inc @@ -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 diff --git a/asm/non_matching/kid/sub_0806265C.inc b/asm/non_matching/kid/sub_0806265C.inc index 7d7aa455..aff37fc7 100644 --- a/asm/non_matching/kid/sub_0806265C.inc +++ b/asm/non_matching/kid/sub_0806265C.inc @@ -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 diff --git a/asm/non_matching/librarians/sub_0806BA34.inc b/asm/non_matching/librarians/sub_0806BA34.inc index ca7a41f4..3d50153e 100644 --- a/asm/non_matching/librarians/sub_0806BA34.inc +++ b/asm/non_matching/librarians/sub_0806BA34.inc @@ -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 diff --git a/asm/non_matching/mountainMinish/sub_08067EF0.inc b/asm/non_matching/mountainMinish/sub_08067EF0.inc index 3087d0e6..a1953289 100644 --- a/asm/non_matching/mountainMinish/sub_08067EF0.inc +++ b/asm/non_matching/mountainMinish/sub_08067EF0.inc @@ -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 diff --git a/asm/non_matching/mountainMinish/sub_08068190.inc b/asm/non_matching/mountainMinish/sub_08068190.inc index 496f19d5..cb82b078 100644 --- a/asm/non_matching/mountainMinish/sub_08068190.inc +++ b/asm/non_matching/mountainMinish/sub_08068190.inc @@ -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 diff --git a/asm/non_matching/npc5/sub_08061B18.inc b/asm/non_matching/npc5/sub_08061B18.inc index 7875a8d3..6ee68383 100644 --- a/asm/non_matching/npc5/sub_08061B18.inc +++ b/asm/non_matching/npc5/sub_08061B18.inc @@ -29,7 +29,7 @@ _08061B4C: ldrh r0, [r2] adds r1, r4, #0 - bl TextboxNoOverlap + bl MessageNoOverlap _08061B54: pop {r4, pc} .align 2, 0 diff --git a/asm/non_matching/picolyteBottles/sub_0806E140.inc b/asm/non_matching/picolyteBottles/sub_0806E140.inc index f20da175..e67e3237 100644 --- a/asm/non_matching/picolyteBottles/sub_0806E140.inc +++ b/asm/non_matching/picolyteBottles/sub_0806E140.inc @@ -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] diff --git a/asm/non_matching/pina/sub_08063AC0.inc b/asm/non_matching/pina/sub_08063AC0.inc index e08da02c..ee5fd0e5 100644 --- a/asm/non_matching/pina/sub_08063AC0.inc +++ b/asm/non_matching/pina/sub_08063AC0.inc @@ -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 diff --git a/asm/non_matching/playerItem10/sub_080ACC78.inc b/asm/non_matching/playerItem10/sub_080ACC78.inc deleted file mode 100644 index 2de8d46b..00000000 --- a/asm/non_matching/playerItem10/sub_080ACC78.inc +++ /dev/null @@ -1,168 +0,0 @@ - .syntax unified - push {r4, r5, r6, r7, lr} - adds r4, r0, #0 - ldrb r2, [r4, #0xa] - ldr r0, _080ACD20 @ =gScreenTransition - ldr r0, [r0] - adds r0, r2, r0 - movs r1, #1 - ands r0, r1 - cmp r0, #0 - beq _080ACCF8 - ldr r0, _080ACD24 @ =gUnk_0812AAAC - lsls r1, r2, #2 - adds r1, r1, r0 - ldr r7, [r1] - ldr r0, [r4, #0x74] - adds r0, r7, r0 - ldrb r0, [r0] - lsls r0, r0, #0x18 - asrs r0, r0, #0x18 - cmp r0, #0 - bne _080ACCA4 - str r0, [r4, #0x74] -_080ACCA4: - ldr r0, [r4, #0x74] - adds r0, r7, r0 - movs r2, #0 - ldrsb r2, [r0, r2] - movs r3, #1 - ldrsb r3, [r0, r3] - adds r0, r4, #0 - movs r1, #0xe - bl sub_08008782 - adds r5, r0, #0 - cmp r5, #0 - beq _080ACCF2 - ldrb r1, [r5, #5] - ldrb r2, [r5, #2] - movs r0, #0x11 - bl CreateObject - adds r6, r0, #0 - cmp r6, #0 - beq _080ACCF2 - ldrb r0, [r5, #3] - strb r0, [r6, #0xe] - ldr r0, [r4, #0x74] - adds r0, r7, r0 - ldrb r0, [r0] - lsls r0, r0, #0x18 - asrs r0, r0, #0x18 - ldrh r1, [r4, #0x2e] - adds r0, r0, r1 - strh r0, [r6, #0x2e] - ldr r0, [r4, #0x74] - adds r0, r0, r7 - ldrb r0, [r0, #1] - lsls r0, r0, #0x18 - asrs r0, r0, #0x18 - ldrh r1, [r4, #0x32] - adds r0, r0, r1 - strh r0, [r6, #0x32] -_080ACCF2: - ldr r0, [r4, #0x74] - adds r0, #2 - str r0, [r4, #0x74] -_080ACCF8: - ldr r2, [r4, #0x54] - cmp r2, #0 - bne _080ACD08 - ldr r0, [r4, #0x70] - cmp r0, #2 - bls _080ACD08 - movs r0, #1 - str r0, [r4, #0x70] -_080ACD08: - ldr r0, [r4, #0x70] - subs r0, #1 - str r0, [r4, #0x70] - movs r1, #1 - rsbs r1, r1, #0 - cmp r0, r1 - bne _080ACDAE - cmp r2, #0 - bne _080ACD28 - movs r0, #2 - b _080ACD32 - .align 2, 0 -_080ACD20: .4byte gScreenTransition -_080ACD24: .4byte gUnk_0812AAAC -_080ACD28: - ldr r0, _080ACD74 @ =gUnk_0812AABC - ldrb r1, [r4, #0xa] - adds r1, r1, r0 - movs r0, #0 - ldrsb r0, [r1, r0] -_080ACD32: - str r0, [r4, #0x70] - movs r0, #0x17 - movs r1, #0 - movs r2, #0 - bl CreateObject - adds r6, r0, #0 - cmp r6, #0 - beq _080ACDAE - bl Random - adds r2, r0, #0 - movs r0, #0xf - ands r2, r0 - ldr r3, [r4, #0x48] - ldrb r1, [r3, #6] - cmp r1, r2 - bge _080ACD58 - adds r2, r1, #0 -_080ACD58: - movs r0, #1 - ands r0, r2 - cmp r0, #0 - beq _080ACD62 - rsbs r2, r2, #0 -_080ACD62: - ldrb r0, [r4, #0x14] - lsrs r0, r0, #1 - cmp r0, #1 - beq _080ACD9C - cmp r0, #1 - bgt _080ACD78 - cmp r0, #0 - beq _080ACD82 - b _080ACDAE - .align 2, 0 -_080ACD74: .4byte gUnk_0812AABC -_080ACD78: - cmp r0, #2 - beq _080ACD8C - cmp r0, #3 - beq _080ACDA2 - b _080ACDAE -_080ACD82: - ldrb r0, [r3, #7] - ldrh r1, [r4, #0x32] - subs r1, r1, r0 - strh r1, [r6, #0x32] - b _080ACD94 -_080ACD8C: - ldrh r0, [r4, #0x32] - ldrb r3, [r3, #7] - adds r0, r0, r3 - strh r0, [r6, #0x32] -_080ACD94: - ldrh r0, [r4, #0x2e] - adds r0, r0, r2 - strh r0, [r6, #0x2e] - b _080ACDAE -_080ACD9C: - ldrh r0, [r4, #0x2e] - adds r0, r0, r1 - b _080ACDA6 -_080ACDA2: - ldrh r0, [r4, #0x2e] - subs r0, r0, r1 -_080ACDA6: - strh r0, [r6, #0x2e] - ldrh r0, [r4, #0x32] - adds r0, r0, r2 - strh r0, [r6, #0x32] -_080ACDAE: - pop {r4, r5, r6, r7, pc} - .syntax divided diff --git a/asm/non_matching/rem/sub_0806AA50.inc b/asm/non_matching/rem/sub_0806AA50.inc index 8d40bee1..d1618f63 100644 --- a/asm/non_matching/rem/sub_0806AA50.inc +++ b/asm/non_matching/rem/sub_0806AA50.inc @@ -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 diff --git a/asm/non_matching/sittingPerson/sub_0806387C.inc b/asm/non_matching/sittingPerson/sub_0806387C.inc index 46a94fb0..336f23c9 100644 --- a/asm/non_matching/sittingPerson/sub_0806387C.inc +++ b/asm/non_matching/sittingPerson/sub_0806387C.inc @@ -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 diff --git a/asm/non_matching/sittingPerson/sub_0806390C.inc b/asm/non_matching/sittingPerson/sub_0806390C.inc index 20ebf13e..3089960c 100644 --- a/asm/non_matching/sittingPerson/sub_0806390C.inc +++ b/asm/non_matching/sittingPerson/sub_0806390C.inc @@ -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 diff --git a/asm/non_matching/stockwell/sub_080650CC.inc b/asm/non_matching/stockwell/sub_080650CC.inc index bdd7f568..961a8ac3 100644 --- a/asm/non_matching/stockwell/sub_080650CC.inc +++ b/asm/non_matching/stockwell/sub_080650CC.inc @@ -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 diff --git a/asm/non_matching/stockwell/sub_08065370.inc b/asm/non_matching/stockwell/sub_08065370.inc index 14d83cbc..97ca3a99 100644 --- a/asm/non_matching/stockwell/sub_08065370.inc +++ b/asm/non_matching/stockwell/sub_08065370.inc @@ -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 diff --git a/asm/non_matching/textbox/TextBoxFunction1.inc b/asm/non_matching/textbox/TextBoxFunction1.inc index ddbafe5e..45ab5344 100644 --- a/asm/non_matching/textbox/TextBoxFunction1.inc +++ b/asm/non_matching/textbox/TextBoxFunction1.inc @@ -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 diff --git a/asm/non_matching/textbox/sub_08056750.inc b/asm/non_matching/textbox/sub_08056750.inc index c6f8b6c0..7ed352b6 100644 --- a/asm/non_matching/textbox/sub_08056750.inc +++ b/asm/non_matching/textbox/sub_08056750.inc @@ -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 diff --git a/asm/non_matching/tingleSiblings/sub_08064F28.inc b/asm/non_matching/tingleSiblings/sub_08064F28.inc index 837f5fc0..aa6af2fd 100644 --- a/asm/non_matching/tingleSiblings/sub_08064F28.inc +++ b/asm/non_matching/tingleSiblings/sub_08064F28.inc @@ -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 diff --git a/asm/object6.s b/asm/object6.s index af416ed0..7814bddc 100644 --- a/asm/object6.s +++ b/asm/object6.s @@ -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 diff --git a/asm/object6A.s b/asm/object6A.s index 8e01d30f..4004db87 100644 --- a/asm/object6A.s +++ b/asm/object6A.s @@ -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 diff --git a/asm/object74.s b/asm/object74.s index 9290d093..cc2ea1f6 100644 --- a/asm/object74.s +++ b/asm/object74.s @@ -118,7 +118,7 @@ sub_08097C20: @ 0x08097C20 adds r2, r4, #0 adds r2, #0x38 ldrb r2, [r2] - bl sub_080577AC + bl CreateMagicSparkles ldrb r0, [r4, #0xe] subs r0, #1 strb r0, [r4, #0xe] diff --git a/asm/object9.s b/asm/object9.s index 3e195043..7ae593b8 100644 --- a/asm/object9.s +++ b/asm/object9.s @@ -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 diff --git a/asm/object91.s b/asm/object91.s index 35eb581d..6ae9e0b9 100644 --- a/asm/object91.s +++ b/asm/object91.s @@ -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 diff --git a/asm/objectB.s b/asm/objectB.s index cfb07492..cd3200fc 100644 --- a/asm/objectB.s +++ b/asm/objectB.s @@ -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 diff --git a/asm/objectB9.s b/asm/objectB9.s index fcebb4f0..4741530f 100644 --- a/asm/objectB9.s +++ b/asm/objectB9.s @@ -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 diff --git a/asm/objectC1.s b/asm/objectC1.s index a18b4d33..88bd02ef 100644 --- a/asm/objectC1.s +++ b/asm/objectC1.s @@ -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 diff --git a/asm/sub_0807CA18.s b/asm/sub_0807CA18.s deleted file mode 100644 index 84b0b866..00000000 --- a/asm/sub_0807CA18.s +++ /dev/null @@ -1,174 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - -.ifdef DEMO_USA -thumb_func_start sub_0807CA18 -sub_0807CA18: - push {r4, r5, r6, lr} - ldr r4, _0807CA38 @ =0x02002A40 - ldrh r1, [r4, #0x00] - movs r0, #0x80 - lsls r0, r0, #0x01 - cmp r1, r0 - beq _0807C9BA - movs r2, #0x00 - strb r2, [r4, #0x00] - movs r3, #0x01 - strb r3, [r4, #0x01] - strb r3, [r4, #0x08] - adds r1, r4, #0x0 - adds r1, #0xAA - movs r0, #0x18 - strb r0, [r1, #0x00] - adds r1, #0x01 - strb r0, [r1, #0x00] - subs r1, #0x23 - movs r0, #0x22 - strb r0, [r1, #0x00] - adds r1, #0x01 - movs r0, #0x15 - strb r0, [r1, #0x00] - adds r0, r4, #0x0 - adds r0, #0x8A - strb r2, [r0, #0x00] - adds r0, #0x01 - strb r2, [r0, #0x00] - adds r0, #0x05 - strb r3, [r0, #0x00] - adds r1, #0x03 - movs r0, #0x90 - strh r0, [r1, #0x00] - adds r1, #0x02 - movs r0, #0x38 - strh r0, [r1, #0x00] -_0807C9BA: - adds r5, r4, #0x0 - adds r5, #0x80 - ldrb r0, [r5, #0x00] - cmp r0, #0x00 - bne _0807C9CE - ldr r0, _0807CA3C @ =0x0811DFF4 - adds r1, r5, #0x0 - movs r2, #0x05 - bl MemCopy -_0807C9CE: - ldr r1, _0807CA40 @ =0x0811EF10 - movs r6, #0x80 - lsls r6, r6, #0x12 - ldrb r0, [r6, #0x04] - lsls r0, r0, #0x02 - adds r0, r0, r1 - ldr r0, [r0, #0x00] - ldr r2, _0807CA44 @ =0x000004B4 - adds r1, r4, #0x0 - bl MemCopy - ldrb r0, [r6, #0x07] - adds r2, r0, #0x0 - cmp r2, #0x00 - bne _0807CA04 - movs r0, #0x97 - strb r0, [r5, #0x00] - adds r1, r4, #0x0 - adds r1, #0x81 - movs r0, #0x7F - strb r0, [r1, #0x00] - adds r1, #0x01 - movs r0, #0xDD - strb r0, [r1, #0x00] - adds r0, r4, #0x0 - adds r0, #0x83 - strb r2, [r0, #0x00] -_0807CA04: - movs r0, #0xA0 - bl ModHealth - ldr r0, _0807CA48 @ =0xFFFFD8F1 - bl ModRupees - ldr r0, _0807CA4C @ =0x02000010 - ldrb r1, [r0, #0x07] - lsls r0, r1, #0x01 - adds r0, r0, r1 - ldr r1, _0807CA50 @ =0x0811DFF9 - adds r0, r0, r1 - movs r1, #0x95 - lsls r1, r1, #0x03 - adds r2, r4, r1 - ldrb r1, [r6, #0x04] - adds r0, r0, r1 - ldrb r1, [r0, #0x00] - lsls r0, r1, #0x03 - subs r0, r0, r1 - lsls r0, r0, #0x05 - adds r0, r0, r1 - lsls r0, r0, #0x04 - str r0, [r2, #0x00] - movs r0, #0x01 - pop {r4, r5, r6, pc} -_0807CA38: .4byte gSave -_0807CA3C: .4byte gUnk_0811E470 -_0807CA40: .4byte demoPointers -_0807CA44: .4byte 0x000004B4 -_0807CA48: .4byte 0xFFFFD8F1 -_0807CA4C: .4byte gUnk_02000010 -_0807CA50: .4byte demoUnknown1 -.else - thumb_func_start sub_0807CA18 -sub_0807CA18: @ 0x0807CA18 - push {lr} - ldr r0, _0807CA7C @ =gSave - mov ip, r0 - ldrh r1, [r0] - movs r0, #0x80 - lsls r0, r0, #1 - cmp r1, r0 - beq _0807CA66 - movs r2, #0 - mov r0, ip - strb r2, [r0] - movs r3, #1 - strb r3, [r0, #1] - strb r3, [r0, #8] - mov r1, ip - adds r1, #0xaa - movs r0, #0x18 - strb r0, [r1] - adds r1, #1 - strb r0, [r1] - subs r1, #0x23 - movs r0, #0x22 - strb r0, [r1] - adds r1, #1 - movs r0, #0x15 - strb r0, [r1] - mov r0, ip - adds r0, #0x8a - strb r2, [r0] - adds r0, #1 - strb r2, [r0] - adds r0, #5 - strb r3, [r0] - adds r1, #3 - movs r0, #0x90 - strh r0, [r1] - adds r1, #2 - movs r0, #0x38 - strh r0, [r1] -_0807CA66: - mov r1, ip - adds r1, #0x80 - ldrb r0, [r1] - cmp r0, #0 - bne _0807CA78 - ldr r0, _0807CA80 @ =gUnk_0811E470 - movs r2, #5 - bl MemCopy -_0807CA78: - movs r0, #1 - pop {pc} - .align 2, 0 -_0807CA7C: .4byte gSave -_0807CA80: .4byte gUnk_0811E470 -.endif diff --git a/asm/windTribeTeleporter.s b/asm/windTribeTeleporter.s index df0b1523..a3d14369 100644 --- a/asm/windTribeTeleporter.s +++ b/asm/windTribeTeleporter.s @@ -316,12 +316,12 @@ _080A0E50: lsls r0, r1, #2 adds r0, r0, r1 lsls r0, r0, #2 - ldr r1, _080A0E70 @ =0x0813AA18 + ldr r1, _080A0E70 @ =gUnk_0813ADEC adds r0, r0, r1 bl DoExitTransition b _080A0E8C .align 2, 0 -_080A0E70: .4byte 0x0813AA18 +_080A0E70: .4byte gUnk_0813ADEC _080A0E74: ldr r0, _080A0E90 @ =0x030010A0 ldr r0, [r0] diff --git a/asmdiff.sh b/asmdiff.sh index 54cac7b5..46f9e2ee 100755 --- a/asmdiff.sh +++ b/asmdiff.sh @@ -1,7 +1,7 @@ #!/bin/bash -buildname=tmc_eu -baserom=baserom_eu +buildname=$3 +baserom=$4 OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" diff --git a/assets/assets.json b/assets/assets.json index 63e16a05..75a60734 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -40392,121 +40392,121 @@ "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_0.bin", + "path": "animations/gSpriteAnimations_Vaati_2_0.bin", "start": 1116224, "size": 25, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_1.bin", + "path": "animations/gSpriteAnimations_Vaati_2_1.bin", "start": 1116249, "size": 5, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_2.bin", + "path": "animations/gSpriteAnimations_Vaati_2_2.bin", "start": 1116254, "size": 25, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_3.bin", + "path": "animations/gSpriteAnimations_Vaati_2_3.bin", "start": 1116279, "size": 5, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_4.bin", + "path": "animations/gSpriteAnimations_Vaati_2_4.bin", "start": 1116284, "size": 30, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_6.bin", + "path": "animations/gSpriteAnimations_Vaati_2_6.bin", "start": 1116314, "size": 25, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_16.bin", + "path": "animations/gSpriteAnimations_Vaati_2_16.bin", "start": 1116339, "size": 25, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_18.bin", + "path": "animations/gSpriteAnimations_Vaati_2_18.bin", "start": 1116364, "size": 25, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_24.bin", + "path": "animations/gSpriteAnimations_Vaati_2_24.bin", "start": 1116389, "size": 13, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_26.bin", + "path": "animations/gSpriteAnimations_Vaati_2_26.bin", "start": 1116402, "size": 13, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_40.bin", + "path": "animations/gSpriteAnimations_Vaati_2_40.bin", "start": 1116415, "size": 25, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_28.bin", + "path": "animations/gSpriteAnimations_Vaati_2_28.bin", "start": 1116440, "size": 5, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_30.bin", + "path": "animations/gSpriteAnimations_Vaati_2_30.bin", "start": 1116445, "size": 5, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_31.bin", + "path": "animations/gSpriteAnimations_Vaati_2_31.bin", "start": 1116450, "size": 5, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_29.bin", + "path": "animations/gSpriteAnimations_Vaati_2_29.bin", "start": 1116455, "size": 5, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_44.bin", + "path": "animations/gSpriteAnimations_Vaati_2_44.bin", "start": 1116460, "size": 5, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_32.bin", + "path": "animations/gSpriteAnimations_Vaati_2_32.bin", "start": 1116465, "size": 193, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_36.bin", + "path": "animations/gSpriteAnimations_Vaati_2_36.bin", "start": 1116658, "size": 229, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_48.bin", + "path": "animations/gSpriteAnimations_Vaati_2_48.bin", "start": 1116887, "size": 21, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Vaati_50.bin", + "path": "animations/gSpriteAnimations_Vaati_2_50.bin", "start": 1116908, "size": 24, "type": "animation" @@ -47969,13 +47969,13 @@ "size": 12 }, { - "path": "animations/gSpriteAnimations_Object6A_9_0.bin", + "path": "animations/gSpriteAnimations_Object6A_10_0.bin", "start": 1190732, "size": 9, "type": "animation" }, { - "path": "animations/gSpriteAnimations_Object6A_9_1.bin", + "path": "animations/gSpriteAnimations_Object6A_10_1.bin", "start": 1190741, "size": 15, "type": "animation" diff --git a/assets/sounds.json b/assets/sounds.json index 3347425f..ce84b7ca 100644 --- a/assets/sounds.json +++ b/assets/sounds.json @@ -2978,7 +2978,7 @@ } }, { - "path": "sounds/sfx152.s", + "path": "sounds/sfxNearPortal.s", "start": 14563276, "type": "midi", "options": { diff --git a/constants/audio_constants.inc b/constants/audio_constants.inc index b7cb230c..07cb901e 100644 --- a/constants/audio_constants.inc +++ b/constants/audio_constants.inc @@ -336,7 +336,7 @@ .equiv SFX_14F, 0x14f .equiv SFX_150, 0x150 .equiv SFX_151, 0x151 - .equiv SFX_152, 0x152 + .equiv SFX_NEAR_PORTAL, 0x152 .equiv SFX_153, 0x153 .equiv SFX_154, 0x154 .equiv SFX_155, 0x155 diff --git a/data/animations/npc/vaati.s b/data/animations/npc/vaati.s index 03c83df5..08d7cbe1 100644 --- a/data/animations/npc/vaati.s +++ b/data/animations/npc/vaati.s @@ -74,117 +74,117 @@ gSpriteAnimations_Vaati_1:: @ 081107CC .4byte gSpriteAnimations_Vaati_1_24 .4byte 00000000 -gSpriteAnimations_Vaati_0:: @ 08110840 - .include "animations/gSpriteAnimations_Vaati_0.s" +gSpriteAnimations_Vaati_2_0:: @ 08110840 + .include "animations/gSpriteAnimations_Vaati_2_0.s" -gSpriteAnimations_Vaati_1:: @ 08110859 - .include "animations/gSpriteAnimations_Vaati_1.s" +gSpriteAnimations_Vaati_2_1:: @ 08110859 + .include "animations/gSpriteAnimations_Vaati_2_1.s" -gSpriteAnimations_Vaati_2:: @ 0811085E - .include "animations/gSpriteAnimations_Vaati_2.s" +gSpriteAnimations_Vaati_2_2:: @ 0811085E + .include "animations/gSpriteAnimations_Vaati_2_2.s" -gSpriteAnimations_Vaati_3:: @ 08110877 - .include "animations/gSpriteAnimations_Vaati_3.s" +gSpriteAnimations_Vaati_2_3:: @ 08110877 + .include "animations/gSpriteAnimations_Vaati_2_3.s" -gSpriteAnimations_Vaati_4:: @ 0811087C - .include "animations/gSpriteAnimations_Vaati_4.s" +gSpriteAnimations_Vaati_2_4:: @ 0811087C + .include "animations/gSpriteAnimations_Vaati_2_4.s" -gSpriteAnimations_Vaati_6:: @ 0811089A - .include "animations/gSpriteAnimations_Vaati_6.s" +gSpriteAnimations_Vaati_2_6:: @ 0811089A + .include "animations/gSpriteAnimations_Vaati_2_6.s" -gSpriteAnimations_Vaati_16:: @ 081108B3 - .include "animations/gSpriteAnimations_Vaati_16.s" +gSpriteAnimations_Vaati_2_16:: @ 081108B3 + .include "animations/gSpriteAnimations_Vaati_2_16.s" -gSpriteAnimations_Vaati_18:: @ 081108CC - .include "animations/gSpriteAnimations_Vaati_18.s" +gSpriteAnimations_Vaati_2_18:: @ 081108CC + .include "animations/gSpriteAnimations_Vaati_2_18.s" -gSpriteAnimations_Vaati_24:: @ 081108E5 - .include "animations/gSpriteAnimations_Vaati_24.s" +gSpriteAnimations_Vaati_2_24:: @ 081108E5 + .include "animations/gSpriteAnimations_Vaati_2_24.s" -gSpriteAnimations_Vaati_26:: @ 081108F2 - .include "animations/gSpriteAnimations_Vaati_26.s" +gSpriteAnimations_Vaati_2_26:: @ 081108F2 + .include "animations/gSpriteAnimations_Vaati_2_26.s" -gSpriteAnimations_Vaati_40:: @ 081108FF - .include "animations/gSpriteAnimations_Vaati_40.s" +gSpriteAnimations_Vaati_2_40:: @ 081108FF + .include "animations/gSpriteAnimations_Vaati_2_40.s" -gSpriteAnimations_Vaati_28:: @ 08110918 - .include "animations/gSpriteAnimations_Vaati_28.s" +gSpriteAnimations_Vaati_2_28:: @ 08110918 + .include "animations/gSpriteAnimations_Vaati_2_28.s" -gSpriteAnimations_Vaati_30:: @ 0811091D - .include "animations/gSpriteAnimations_Vaati_30.s" +gSpriteAnimations_Vaati_2_30:: @ 0811091D + .include "animations/gSpriteAnimations_Vaati_2_30.s" -gSpriteAnimations_Vaati_31:: @ 08110922 - .include "animations/gSpriteAnimations_Vaati_31.s" +gSpriteAnimations_Vaati_2_31:: @ 08110922 + .include "animations/gSpriteAnimations_Vaati_2_31.s" -gSpriteAnimations_Vaati_29:: @ 08110927 - .include "animations/gSpriteAnimations_Vaati_29.s" +gSpriteAnimations_Vaati_2_29:: @ 08110927 + .include "animations/gSpriteAnimations_Vaati_2_29.s" -gSpriteAnimations_Vaati_44:: @ 0811092C - .include "animations/gSpriteAnimations_Vaati_44.s" +gSpriteAnimations_Vaati_2_44:: @ 0811092C + .include "animations/gSpriteAnimations_Vaati_2_44.s" -gSpriteAnimations_Vaati_32:: @ 08110931 - .include "animations/gSpriteAnimations_Vaati_32.s" +gSpriteAnimations_Vaati_2_32:: @ 08110931 + .include "animations/gSpriteAnimations_Vaati_2_32.s" -gSpriteAnimations_Vaati_36:: @ 081109F2 - .include "animations/gSpriteAnimations_Vaati_36.s" +gSpriteAnimations_Vaati_2_36:: @ 081109F2 + .include "animations/gSpriteAnimations_Vaati_2_36.s" -gSpriteAnimations_Vaati_48:: @ 08110AD7 - .include "animations/gSpriteAnimations_Vaati_48.s" +gSpriteAnimations_Vaati_2_48:: @ 08110AD7 + .include "animations/gSpriteAnimations_Vaati_2_48.s" -gSpriteAnimations_Vaati_50:: @ 08110AEC - .include "animations/gSpriteAnimations_Vaati_50.s" +gSpriteAnimations_Vaati_2_50:: @ 08110AEC + .include "animations/gSpriteAnimations_Vaati_2_50.s" gSpriteAnimations_Vaati:: @ 08110B04 - .4byte gSpriteAnimations_Vaati_0 - .4byte gSpriteAnimations_Vaati_1 - .4byte gSpriteAnimations_Vaati_2 - .4byte gSpriteAnimations_Vaati_3 - .4byte gSpriteAnimations_Vaati_4 - .4byte gSpriteAnimations_Vaati_4 - .4byte gSpriteAnimations_Vaati_6 - .4byte gSpriteAnimations_Vaati_4 - .4byte gSpriteAnimations_Vaati_0 - .4byte gSpriteAnimations_Vaati_1 - .4byte gSpriteAnimations_Vaati_2 - .4byte gSpriteAnimations_Vaati_3 - .4byte gSpriteAnimations_Vaati_4 - .4byte gSpriteAnimations_Vaati_4 - .4byte gSpriteAnimations_Vaati_6 - .4byte gSpriteAnimations_Vaati_4 - .4byte gSpriteAnimations_Vaati_16 - .4byte gSpriteAnimations_Vaati_16 - .4byte gSpriteAnimations_Vaati_18 - .4byte gSpriteAnimations_Vaati_16 - .4byte gSpriteAnimations_Vaati_16 - .4byte gSpriteAnimations_Vaati_16 - .4byte gSpriteAnimations_Vaati_18 - .4byte gSpriteAnimations_Vaati_16 - .4byte gSpriteAnimations_Vaati_24 - .4byte gSpriteAnimations_Vaati_24 - .4byte gSpriteAnimations_Vaati_26 - .4byte gSpriteAnimations_Vaati_24 - .4byte gSpriteAnimations_Vaati_28 - .4byte gSpriteAnimations_Vaati_29 - .4byte gSpriteAnimations_Vaati_30 - .4byte gSpriteAnimations_Vaati_31 - .4byte gSpriteAnimations_Vaati_32 - .4byte gSpriteAnimations_Vaati_32 - .4byte gSpriteAnimations_Vaati_32 - .4byte gSpriteAnimations_Vaati_32 - .4byte gSpriteAnimations_Vaati_36 - .4byte gSpriteAnimations_Vaati_36 - .4byte gSpriteAnimations_Vaati_36 - .4byte gSpriteAnimations_Vaati_36 - .4byte gSpriteAnimations_Vaati_40 - .4byte gSpriteAnimations_Vaati_40 - .4byte gSpriteAnimations_Vaati_40 - .4byte gSpriteAnimations_Vaati_40 - .4byte gSpriteAnimations_Vaati_44 - .4byte gSpriteAnimations_Vaati_44 - .4byte gSpriteAnimations_Vaati_44 - .4byte gSpriteAnimations_Vaati_44 - .4byte gSpriteAnimations_Vaati_48 - .4byte gSpriteAnimations_Vaati_48 - .4byte gSpriteAnimations_Vaati_50 - .4byte gSpriteAnimations_Vaati_50 + .4byte gSpriteAnimations_Vaati_2_0 + .4byte gSpriteAnimations_Vaati_2_1 + .4byte gSpriteAnimations_Vaati_2_2 + .4byte gSpriteAnimations_Vaati_2_3 + .4byte gSpriteAnimations_Vaati_2_4 + .4byte gSpriteAnimations_Vaati_2_4 + .4byte gSpriteAnimations_Vaati_2_6 + .4byte gSpriteAnimations_Vaati_2_4 + .4byte gSpriteAnimations_Vaati_2_0 + .4byte gSpriteAnimations_Vaati_2_1 + .4byte gSpriteAnimations_Vaati_2_2 + .4byte gSpriteAnimations_Vaati_2_3 + .4byte gSpriteAnimations_Vaati_2_4 + .4byte gSpriteAnimations_Vaati_2_4 + .4byte gSpriteAnimations_Vaati_2_6 + .4byte gSpriteAnimations_Vaati_2_4 + .4byte gSpriteAnimations_Vaati_2_16 + .4byte gSpriteAnimations_Vaati_2_16 + .4byte gSpriteAnimations_Vaati_2_18 + .4byte gSpriteAnimations_Vaati_2_16 + .4byte gSpriteAnimations_Vaati_2_16 + .4byte gSpriteAnimations_Vaati_2_16 + .4byte gSpriteAnimations_Vaati_2_18 + .4byte gSpriteAnimations_Vaati_2_16 + .4byte gSpriteAnimations_Vaati_2_24 + .4byte gSpriteAnimations_Vaati_2_24 + .4byte gSpriteAnimations_Vaati_2_26 + .4byte gSpriteAnimations_Vaati_2_24 + .4byte gSpriteAnimations_Vaati_2_28 + .4byte gSpriteAnimations_Vaati_2_29 + .4byte gSpriteAnimations_Vaati_2_30 + .4byte gSpriteAnimations_Vaati_2_31 + .4byte gSpriteAnimations_Vaati_2_32 + .4byte gSpriteAnimations_Vaati_2_32 + .4byte gSpriteAnimations_Vaati_2_32 + .4byte gSpriteAnimations_Vaati_2_32 + .4byte gSpriteAnimations_Vaati_2_36 + .4byte gSpriteAnimations_Vaati_2_36 + .4byte gSpriteAnimations_Vaati_2_36 + .4byte gSpriteAnimations_Vaati_2_36 + .4byte gSpriteAnimations_Vaati_2_40 + .4byte gSpriteAnimations_Vaati_2_40 + .4byte gSpriteAnimations_Vaati_2_40 + .4byte gSpriteAnimations_Vaati_2_40 + .4byte gSpriteAnimations_Vaati_2_44 + .4byte gSpriteAnimations_Vaati_2_44 + .4byte gSpriteAnimations_Vaati_2_44 + .4byte gSpriteAnimations_Vaati_2_44 + .4byte gSpriteAnimations_Vaati_2_48 + .4byte gSpriteAnimations_Vaati_2_48 + .4byte gSpriteAnimations_Vaati_2_50 + .4byte gSpriteAnimations_Vaati_2_50 .4byte 00000000 diff --git a/data/animations/object/object6A.s b/data/animations/object/object6A.s index c1a6c552..30e01553 100644 --- a/data/animations/object/object6A.s +++ b/data/animations/object/object6A.s @@ -5,15 +5,15 @@ .align 2 -gSpriteAnimations_Object6A_9_0:: @ 08122B4C - .include "animations/gSpriteAnimations_Object6A_9_0.s" +gSpriteAnimations_Object6A_10_0:: @ 08122B4C + .include "animations/gSpriteAnimations_Object6A_10_0.s" -gSpriteAnimations_Object6A_9_1:: @ 08122B55 - .include "animations/gSpriteAnimations_Object6A_9_1.s" +gSpriteAnimations_Object6A_10_1:: @ 08122B55 + .include "animations/gSpriteAnimations_Object6A_10_1.s" -gSpriteAnimations_Object6A_9:: @ 08122B64 - .4byte gSpriteAnimations_Object6A_9_0 - .4byte gSpriteAnimations_Object6A_9_1 +gSpriteAnimations_Object6A_10:: @ 08122B64 + .4byte gSpriteAnimations_Object6A_10_0 + .4byte gSpriteAnimations_Object6A_10_1 .4byte 00000000 gSpriteAnimations_Object6A_5_2:: @ 08122B70 diff --git a/data/data_08107BC8.s b/data/data_08107BC8.s deleted file mode 100755 index 16a72ce4..00000000 --- a/data/data_08107BC8.s +++ /dev/null @@ -1,14 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08107C0C:: @ 08107C0C - .incbin "data_08107BC8/gUnk_08107C0C.bin" - -gUnk_08107C0F:: @ 08107C0F - .incbin "data_08107BC8/gUnk_08107C0F.bin" - -gUnk_08107C14:: @ 08107C14 - .incbin "data_08107BC8/gUnk_08107C14.bin" diff --git a/data/data_08128A38.s b/data/data_08128A38.s index c710549a..aa7e88a2 100644 --- a/data/data_08128A38.s +++ b/data/data_08128A38.s @@ -68,157 +68,3 @@ gUnk_08128B48:: @ 08128B48 gUnk_08128B50:: @ 08128B50 .incbin "data_08127280/gUnk_08128B50.bin" - -gUnk_08128B64:: @ 08128B64 - .incbin "data_08127280/gUnk_08128B64.bin" - -gUnk_08128BF4:: @ 08128BF4 - .incbin "data_08127280/gUnk_08128BF4.bin" - -gUnk_08128BF8:: @ 08128BF8 - .4byte sub_080A5594 - .4byte sub_080A56A0 - -gUnk_08128C00:: @ 08128C00 - .incbin "data_08127280/gUnk_08128C00.bin" - -gUnk_08128C04:: @ 08128C04 - .incbin "data_08127280/gUnk_08128C04.bin" - -gUnk_08128C14:: @ 08128C14 - .incbin "data_08127280/gUnk_08128C14.bin" - -gUnk_08128C94:: @ 08128C94 - .incbin "data_08127280/gUnk_08128C94.bin" - -gUnk_08128D14:: @ 08128D14 - .4byte sub_080A59AC - .4byte sub_080A59C8 - .4byte sub_080A5A54 - .4byte sub_080A5A90 - -gUnk_08128D24:: @ 08128D24 - .4byte sub_080A5AF4 - .4byte sub_080A5B34 - .4byte sub_080A5BB8 - -gUnk_08128D30:: @ 08128D30 - .4byte sub_080A5C44 - .4byte sub_080A5C9C - -gUnk_08128D38:: @ 08128D38 - .incbin "data_08127280/gUnk_08128D38.bin" - -gUnk_08128D3C:: @ 08128D3C - .incbin "data_08127280/gUnk_08128D3C.bin" - -gUnk_08128D43:: @ 08128D43 - .incbin "data_08127280/gUnk_08128D43.bin" - -gUnk_08128D51:: @ 08128D51 - .incbin "data_08127280/gUnk_08128D51.bin" - -gUnk_08128D58:: @ 08128D58 - .4byte sub_080A6024 - .4byte sub_080A6044 - -gUnk_08128D60:: @ 08128D60 - .incbin "data_08127280/gUnk_08128D60.bin" - -gUnk_08128D70:: @ 08128D70 - .incbin "data_08127280/gUnk_08128D70.bin" - -gUnk_08128DB0:: @ 08128DB0 - .4byte sub_080A6108 - .4byte sub_080A612C - -gUnk_08128DB8:: @ 08128DB8 - .incbin "data_08127280/gUnk_08128DB8.bin" - -gUnk_08128DBC:: @ 08128DBC - .incbin "data_08127280/gUnk_08128DBC.bin" - -gUnk_08128DCC:: @ 08128DCC - .4byte sub_080A6290 - .4byte sub_080A62E0 - -gUnk_08128DD4:: @ 08128DD4 - .incbin "data_08127280/gUnk_08128DD4.bin" - -gUnk_08128DD8:: @ 08128DD8 - .incbin "data_08127280/gUnk_08128DD8.bin" - -gUnk_08128DE8:: @ 08128DE8 - .incbin "data_08127280/gUnk_08128DE8.bin" - -gUnk_08128E70:: @ 08128E70 - .4byte sub_080A6534 - .4byte sub_080A65AC - -gUnk_08128E78:: @ 08128E78 - .4byte sub_080A6650 - .4byte sub_080A667C - -gUnk_08128E80:: @ 08128E80 - .incbin "data_08127280/gUnk_08128E80.bin" - -gUnk_08128E84:: @ 08128E84 - .incbin "data_08127280/gUnk_08128E84.bin" - -gUnk_08128E94:: @ 08128E94 - .incbin "data_08127280/gUnk_08128E94.bin" - -gUnk_08128F1C:: @ 08128F1C - .4byte sub_080A6B04 - .4byte sub_080A6C1C - -gUnk_08128F24:: @ 08128F24 - .4byte sub_080A6CA8 - .4byte sub_080A6CD8 - .4byte sub_080A6DD0 - .4byte sub_080A6DF8 - .4byte sub_080A6E44 - -gUnk_08128F38:: @ 08128F38 - .incbin "data_08127280/gUnk_08128F38.bin" - -gUnk_08128F4C:: @ 08128F4C - .incbin "data_08127280/gUnk_08128F4C.bin" - -gUnk_08128F58:: @ 08128F58 - .incbin "data_08127280/gUnk_08128F58.bin" - -gUnk_08128FA8:: @ 08128FA8 - .incbin "data_08127280/gUnk_08128FA8.bin" - -gUnk_08128FC0:: @ 08128FC0 - .incbin "data_08127280/gUnk_08128FC0.bin" - -gUnk_08128FD8:: @ 08128FD8 - .incbin "data_08127280/gUnk_08128FD8.bin" - -gUnk_08128FF0:: @ 08128FF0 - .incbin "data_08127280/gUnk_08128FF0.bin" - -gUnk_08129004:: @ 08129004 - .incbin "data_08127280/gUnk_08129004.bin" - -gUnk_0812901C:: @ 0812901C - .4byte sub_080A7250 - .4byte sub_080A7328 - .4byte sub_080A7528 - .4byte sub_080A73A8 - .4byte sub_080A74C8 - -gUnk_08129030:: @ 08129030 - .4byte sub_080A71DC - .4byte sub_080A4EA0 - .4byte sub_080A71DC - .4byte sub_080A64FC - .4byte DrawKinstoneMenu - .4byte sub_08051E68 - .4byte sub_0804AB54 - .4byte sub_080A45A4 - .4byte sub_08054870 - .4byte sub_080A6C74 - .4byte sub_080A6AB8 diff --git a/data/data_08128BF4.s b/data/data_08128BF4.s new file mode 100644 index 00000000..79404fac --- /dev/null +++ b/data/data_08128BF4.s @@ -0,0 +1,156 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08128BF4:: @ 08128BF4 + .incbin "data_08127280/gUnk_08128BF4.bin" + +gUnk_08128BF8:: @ 08128BF8 + .4byte sub_080A5594 + .4byte sub_080A56A0 + +gUnk_08128C00:: @ 08128C00 + .incbin "data_08127280/gUnk_08128C00.bin" + +gUnk_08128C04:: @ 08128C04 + .incbin "data_08127280/gUnk_08128C04.bin" + +gUnk_08128C14:: @ 08128C14 + .incbin "data_08127280/gUnk_08128C14.bin" + +gUnk_08128C94:: @ 08128C94 + .incbin "data_08127280/gUnk_08128C94.bin" + +gUnk_08128D14:: @ 08128D14 + .4byte sub_080A59AC + .4byte sub_080A59C8 + .4byte sub_080A5A54 + .4byte sub_080A5A90 + +gUnk_08128D24:: @ 08128D24 + .4byte sub_080A5AF4 + .4byte sub_080A5B34 + .4byte sub_080A5BB8 + +gUnk_08128D30:: @ 08128D30 + .4byte sub_080A5C44 + .4byte sub_080A5C9C + +gUnk_08128D38:: @ 08128D38 + .incbin "data_08127280/gUnk_08128D38.bin" + +gUnk_08128D3C:: @ 08128D3C + .incbin "data_08127280/gUnk_08128D3C.bin" + +gUnk_08128D43:: @ 08128D43 + .incbin "data_08127280/gUnk_08128D43.bin" + +gUnk_08128D51:: @ 08128D51 + .incbin "data_08127280/gUnk_08128D51.bin" + +gUnk_08128D58:: @ 08128D58 + .4byte sub_080A6024 + .4byte sub_080A6044 + +gUnk_08128D60:: @ 08128D60 + .incbin "data_08127280/gUnk_08128D60.bin" + +gUnk_08128D70:: @ 08128D70 + .incbin "data_08127280/gUnk_08128D70.bin" + +gUnk_08128DB0:: @ 08128DB0 + .4byte sub_080A6108 + .4byte sub_080A612C + +gUnk_08128DB8:: @ 08128DB8 + .incbin "data_08127280/gUnk_08128DB8.bin" + +gUnk_08128DBC:: @ 08128DBC + .incbin "data_08127280/gUnk_08128DBC.bin" + +gUnk_08128DCC:: @ 08128DCC + .4byte sub_080A6290 + .4byte sub_080A62E0 + +gUnk_08128DD4:: @ 08128DD4 + .incbin "data_08127280/gUnk_08128DD4.bin" + +gUnk_08128DD8:: @ 08128DD8 + .incbin "data_08127280/gUnk_08128DD8.bin" + +gUnk_08128DE8:: @ 08128DE8 + .incbin "data_08127280/gUnk_08128DE8.bin" + +gUnk_08128E70:: @ 08128E70 + .4byte sub_080A6534 + .4byte sub_080A65AC + +gUnk_08128E78:: @ 08128E78 + .4byte sub_080A6650 + .4byte sub_080A667C + +gUnk_08128E80:: @ 08128E80 + .incbin "data_08127280/gUnk_08128E80.bin" + +gUnk_08128E84:: @ 08128E84 + .incbin "data_08127280/gUnk_08128E84.bin" + +gUnk_08128E94:: @ 08128E94 + .incbin "data_08127280/gUnk_08128E94.bin" + +gUnk_08128F1C:: @ 08128F1C + .4byte sub_080A6B04 + .4byte sub_080A6C1C + +gUnk_08128F24:: @ 08128F24 + .4byte sub_080A6CA8 + .4byte sub_080A6CD8 + .4byte sub_080A6DD0 + .4byte sub_080A6DF8 + .4byte sub_080A6E44 + +gUnk_08128F38:: @ 08128F38 + .incbin "data_08127280/gUnk_08128F38.bin" + +gUnk_08128F4C:: @ 08128F4C + .incbin "data_08127280/gUnk_08128F4C.bin" + +gUnk_08128F58:: @ 08128F58 + .incbin "data_08127280/gUnk_08128F58.bin" + +gUnk_08128FA8:: @ 08128FA8 + .incbin "data_08127280/gUnk_08128FA8.bin" + +gUnk_08128FC0:: @ 08128FC0 + .incbin "data_08127280/gUnk_08128FC0.bin" + +gUnk_08128FD8:: @ 08128FD8 + .incbin "data_08127280/gUnk_08128FD8.bin" + +gUnk_08128FF0:: @ 08128FF0 + .incbin "data_08127280/gUnk_08128FF0.bin" + +gUnk_08129004:: @ 08129004 + .incbin "data_08127280/gUnk_08129004.bin" + +gUnk_0812901C:: @ 0812901C + .4byte sub_080A7250 + .4byte sub_080A7328 + .4byte sub_080A7528 + .4byte sub_080A73A8 + .4byte sub_080A74C8 + +gUnk_08129030:: @ 08129030 + .4byte sub_080A71DC + .4byte sub_080A4EA0 + .4byte sub_080A71DC + .4byte sub_080A64FC + .4byte DrawKinstoneMenu + .4byte sub_08051E68 + .4byte sub_0804AB54 + .4byte sub_080A45A4 + .4byte sub_08054870 + .4byte sub_080A6C74 + .4byte sub_080A6AB8 diff --git a/data/data_0812AA88.s b/data/data_0812AA88.s deleted file mode 100644 index 5e742e58..00000000 --- a/data/data_0812AA88.s +++ /dev/null @@ -1,42 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_0812AA88:: @ 0812AA88 - .incbin "data_0812AA88/gUnk_0812AA88.bin" - -gUnk_0812AA91:: @ 0812AA91 - .incbin "data_0812AA88/gUnk_0812AA91.bin" - -gUnk_0812AA9A:: @ 0812AA9A - .incbin "data_0812AA88/gUnk_0812AA9A.bin" - -gUnk_0812AAAC:: @ 0812AAAC - .4byte gUnk_0812AA88 - .4byte gUnk_0812AA91 - .4byte gUnk_0812AA91 - .4byte gUnk_0812AA9A - -gUnk_0812AABC:: @ 0812AABC - .incbin "data_0812AA88/gUnk_0812AABC.bin" - -gUnk_0812AAC0:: @ 0812AAC0 - .incbin "data_0812AA88/gUnk_0812AAC0.bin" - -gUnk_0812AAC8:: @ 0812AAC8 - .incbin "data_0812AA88/gUnk_0812AAC8.bin" - -gUnk_0812AAD0:: @ 0812AAD0 - .incbin "data_0812AA88/gUnk_0812AAD0.bin" - -gUnk_0812AAD8:: @ 0812AAD8 - .4byte gUnk_0812AAC0 - .4byte gUnk_0812AAC8 - .4byte gUnk_0812AAC8 - .4byte gUnk_0812AAD0 - -gUnk_0812AAE8:: @ 0812AAE8 - .4byte 0x10100c00 - diff --git a/data/enums.s b/data/enums.s deleted file mode 100644 index c4e6e33e..00000000 --- a/data/enums.s +++ /dev/null @@ -1,7780 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -FLAGS_GLOBAL: - .4byte ENUM_BEGIN - .4byte FLAGS_GLOBAL_LV0_CLEAR - .4byte FLAGS_GLOBAL_LV1_CLEAR - .4byte FLAGS_GLOBAL_LV2_CLEAR - .4byte FLAGS_GLOBAL_LV3_CLEAR - .4byte FLAGS_GLOBAL_LV4_CLEAR - .4byte FLAGS_GLOBAL_LV5_CLEAR - .4byte FLAGS_GLOBAL_LV6_CLEAR - .4byte FLAGS_GLOBAL_LV7_CLEAR - .4byte FLAGS_GLOBAL_LV8_CLEAR - .4byte FLAGS_GLOBAL_MACHI_SET_1 - .4byte FLAGS_GLOBAL_MACHI_SET_2 - .4byte FLAGS_GLOBAL_MACHI_SET_3 - .4byte FLAGS_GLOBAL_MACHI_SET_4 - .4byte FLAGS_GLOBAL_MACHI_SET_5 - .4byte FLAGS_GLOBAL_MACHI_SET_6 - .4byte FLAGS_GLOBAL_MACHI_SET_7 - .4byte FLAGS_GLOBAL_MACHI_SET_8 - .4byte FLAGS_GLOBAL_MACHI_MACHIHOKORI - .4byte FLAGS_GLOBAL_START - .4byte FLAGS_GLOBAL_EZERO_1ST - .4byte FLAGS_GLOBAL_TABIDACHI - .4byte FLAGS_GLOBAL_LV1TARU - .4byte FLAGS_GLOBAL_LV1TARU_OPEN - .4byte FLAGS_GLOBAL_TATEKAKE_HOUSE - .4byte FLAGS_GLOBAL_TATEKAKE_TOCHU - .4byte FLAGS_GLOBAL_WATERBEAN_OUT - .4byte FLAGS_GLOBAL_WATERBEAN_PUT - .4byte FLAGS_GLOBAL_ZELDA_CHASE - .4byte FLAGS_GLOBAL_INLOCK - .4byte FLAGS_GLOBAL_DASHBOOTS - .4byte FLAGS_GLOBAL_LEFT_DOOR_OPEN - .4byte FLAGS_GLOBAL_HAKA_KEY_LOST - .4byte FLAGS_GLOBAL_HAKA_KEY_FOUND - .4byte FLAGS_GLOBAL_ENTRANCE_OK - .4byte FLAGS_GLOBAL_TATSUMAKI - .4byte FLAGS_GLOBAL_KUMOTATSUMAKI - .4byte FLAGS_GLOBAL_KAITENGIRI - .4byte FLAGS_GLOBAL_DAIKAITENGIRI - .4byte FLAGS_GLOBAL_GATOTSU - .4byte FLAGS_GLOBAL_KABUTOWARI - .4byte FLAGS_GLOBAL_MIZUKAKI_START - .4byte FLAGS_GLOBAL_MIZUKAKI_HARIFALL - .4byte FLAGS_GLOBAL_RENTED_HOUSE_DIN - .4byte FLAGS_GLOBAL_RENTED_HOUSE_NAYRU - .4byte FLAGS_GLOBAL_RENTED_HOUSE_FARORE - .4byte FLAGS_GLOBAL_NEW_HOUSE_DIN - .4byte FLAGS_GLOBAL_NEW_HOUSE_NAYRU - .4byte FLAGS_GLOBAL_NEW_HOUSE_FARORE - .4byte FLAGS_GLOBAL_OUGONTEKI_A - .4byte FLAGS_GLOBAL_OUGONTEKI_B - .4byte FLAGS_GLOBAL_OUGONTEKI_C - .4byte FLAGS_GLOBAL_OUGONTEKI_D - .4byte FLAGS_GLOBAL_OUGONTEKI_E - .4byte FLAGS_GLOBAL_OUGONTEKI_F - .4byte FLAGS_GLOBAL_OUGONTEKI_G - .4byte FLAGS_GLOBAL_OUGONTEKI_H - .4byte FLAGS_GLOBAL_OUGONTEKI_I - .4byte FLAGS_GLOBAL_KAKERA_COMPLETE - .4byte FLAGS_GLOBAL_DRUG_1 - .4byte FLAGS_GLOBAL_DRUG_2 - .4byte FLAGS_GLOBAL_DRUG_3 - .4byte FLAGS_GLOBAL_GORON_KAKERA_LV2 - .4byte FLAGS_GLOBAL_GORON_KAKERA_LV3 - .4byte FLAGS_GLOBAL_GORON_KAKERA_LV4 - .4byte FLAGS_GLOBAL_GORON_KAKERA_LV5 - .4byte FLAGS_GLOBAL_GORON_KAKERA_L - .4byte FLAGS_GLOBAL_GORON_KAKERA_M - .4byte FLAGS_GLOBAL_GORON_KAKERA_R - .4byte FLAGS_GLOBAL_CHIKATSURO_SHUTTER - .4byte FLAGS_GLOBAL_ENTRANCE_USED - .4byte FLAGS_GLOBAL_GOMAN_RENTED_HOUSE - .4byte FLAGS_GLOBAL_GOMAN_NEW_HOUSE - .4byte FLAGS_GLOBAL_OUTDOOR - .4byte FLAGS_GLOBAL_POWERGLOVE_HINT - .4byte FLAGS_GLOBAL_ANJU_LV_BIT0 - .4byte FLAGS_GLOBAL_ANJU_LV_BIT1 - .4byte FLAGS_GLOBAL_ANJU_LV_BIT2 - .4byte FLAGS_GLOBAL_ANJU_LV_BIT3 - .4byte FLAGS_GLOBAL_ANJU_HEART - .4byte FLAGS_GLOBAL_MAROYA_WAKEUP - .4byte FLAGS_GLOBAL_ENDING - .4byte FLAGS_GLOBAL_WARP_1ST - .4byte FLAGS_GLOBAL_WARP_MONUMENT - .4byte FLAGS_GLOBAL_DRUG_COUNT - .4byte FLAGS_GLOBAL_GAMECLEAR - .4byte FLAGS_GLOBAL_WHITE_SWORD_END - .4byte FLAGS_GLOBAL_SOUGEN_06_HASHIGO - .4byte FLAGS_GLOBAL_WARP_EVENT_END - .4byte FLAGS_GLOBAL_FIGURE_ALLCOMP - .4byte FLAGS_GLOBAL_AKINDO_BOTTLE_SELL - .4byte FLAGS_GLOBAL_BIN_DOGFOOD - .4byte FLAGS_GLOBAL_TINGLE_TALK1ST - .4byte FLAGS_GLOBAL_SEIIKI_BGM - .4byte FLAGS_GLOBAL_ENTRANCE_0 - .4byte FLAGS_GLOBAL_ENTRANCE_1 - .4byte FLAGS_GLOBAL_ENTRANCE_2 - .4byte FLAGS_GLOBAL_MIZUKAKI_NECHAN - .4byte FLAGS_GLOBAL_MAZE_CLEAR - .4byte FLAGS_GLOBAL_TINY_ENTRANCE -.ifndef EU - .4byte FLAGS_GLOBAL_CASTLE_BGM -.endif - .4byte ENUM_END - -ENUM_END: - .ascii "END\0" -.ifndef EU -FLAGS_GLOBAL_CASTLE_BGM: - .ascii "CASTLE_BGM\0\0" -.endif -FLAGS_GLOBAL_TINY_ENTRANCE: - .ascii "TINY_ENTRANCE\0\0\0" -FLAGS_GLOBAL_MAZE_CLEAR: - .ascii "MAZE_CLEAR\0\0" -FLAGS_GLOBAL_MIZUKAKI_NECHAN: - .ascii "MIZUKAKI_NECHAN\0" -FLAGS_GLOBAL_ENTRANCE_2: - .ascii "ENTRANCE_2\0\0" -FLAGS_GLOBAL_ENTRANCE_1: - .ascii "ENTRANCE_1\0\0" -FLAGS_GLOBAL_ENTRANCE_0: - .ascii "ENTRANCE_0\0\0" -FLAGS_GLOBAL_SEIIKI_BGM: - .ascii "SEIIKI_BGM\0\0" -FLAGS_GLOBAL_TINGLE_TALK1ST: - .ascii "TINGLE_TALK1ST\0\0" -FLAGS_GLOBAL_BIN_DOGFOOD: -.ifdef EU - .ascii "BIN_DOOGFOOD\0\0\0\0" -.else - .ascii "BIN_DOGFOOD\0" -.endif -FLAGS_GLOBAL_AKINDO_BOTTLE_SELL: - .ascii "AKINDO_BOTTLE_SELL\0\0" -FLAGS_GLOBAL_FIGURE_ALLCOMP: - .ascii "FIGURE_ALLCOMP\0\0" -FLAGS_GLOBAL_WARP_EVENT_END: - .ascii "WARP_EVENT_END\0\0" -FLAGS_GLOBAL_SOUGEN_06_HASHIGO: - .ascii "SOUGEN_06_HASHIGO\0\0\0" -FLAGS_GLOBAL_WHITE_SWORD_END: - .ascii "WHITE_SWORD_END\0" -FLAGS_GLOBAL_GAMECLEAR: - .ascii "GAMECLEAR\0\0\0" -FLAGS_GLOBAL_DRUG_COUNT: - .ascii "DRUG_COUNT\0\0" -FLAGS_GLOBAL_WARP_MONUMENT: - .ascii "WARP_MONUMENT\0\0\0" -FLAGS_GLOBAL_WARP_1ST: - .ascii "WARP_1ST\0\0\0\0" -FLAGS_GLOBAL_ENDING: - .ascii "ENDING\0\0" -FLAGS_GLOBAL_MAROYA_WAKEUP: - .ascii "MAROYA_WAKEUP\0\0\0" -FLAGS_GLOBAL_ANJU_HEART: - .ascii "ANJU_HEART\0\0" -FLAGS_GLOBAL_ANJU_LV_BIT3: - .ascii "ANJU_LV_BIT3\0\0\0\0" -FLAGS_GLOBAL_ANJU_LV_BIT2: - .ascii "ANJU_LV_BIT2\0\0\0\0" -FLAGS_GLOBAL_ANJU_LV_BIT1: - .ascii "ANJU_LV_BIT1\0\0\0\0" -FLAGS_GLOBAL_ANJU_LV_BIT0: - .ascii "ANJU_LV_BIT0\0\0\0\0" -FLAGS_GLOBAL_POWERGLOVE_HINT: - .ascii "POWERGLOVE_HINT\0" -FLAGS_GLOBAL_OUTDOOR: - .ascii "OUTDOOR\0" -FLAGS_GLOBAL_GOMAN_NEW_HOUSE: - .ascii "GOMAN_NEW_HOUSE\0" -FLAGS_GLOBAL_GOMAN_RENTED_HOUSE: - .ascii "GOMAN_RENTED_HOUSE\0\0" -FLAGS_GLOBAL_ENTRANCE_USED: - .ascii "ENTRANCE_USED\0\0\0" -FLAGS_GLOBAL_CHIKATSURO_SHUTTER: - .ascii "CHIKATSURO_SHUTTER\0\0" -FLAGS_GLOBAL_GORON_KAKERA_R: - .ascii "GORON_KAKERA_R\0\0" -FLAGS_GLOBAL_GORON_KAKERA_M: - .ascii "GORON_KAKERA_M\0\0" -FLAGS_GLOBAL_GORON_KAKERA_L: - .ascii "GORON_KAKERA_L\0\0" -FLAGS_GLOBAL_GORON_KAKERA_LV5: - .ascii "GORON_KAKERA_LV5\0\0\0\0" -FLAGS_GLOBAL_GORON_KAKERA_LV4: - .ascii "GORON_KAKERA_LV4\0\0\0\0" -FLAGS_GLOBAL_GORON_KAKERA_LV3: - .ascii "GORON_KAKERA_LV3\0\0\0\0" -FLAGS_GLOBAL_GORON_KAKERA_LV2: - .ascii "GORON_KAKERA_LV2\0\0\0\0" -FLAGS_GLOBAL_DRUG_3: - .ascii "DRUG_3\0\0" -FLAGS_GLOBAL_DRUG_2: - .ascii "DRUG_2\0\0" -FLAGS_GLOBAL_DRUG_1: - .ascii "DRUG_1\0\0" -FLAGS_GLOBAL_KAKERA_COMPLETE: - .ascii "KAKERA_COMPLETE\0" -FLAGS_GLOBAL_OUGONTEKI_I: - .ascii "OUGONTEKI_I\0" -FLAGS_GLOBAL_OUGONTEKI_H: - .ascii "OUGONTEKI_H\0" -FLAGS_GLOBAL_OUGONTEKI_G: - .ascii "OUGONTEKI_G\0" -FLAGS_GLOBAL_OUGONTEKI_F: - .ascii "OUGONTEKI_F\0" -FLAGS_GLOBAL_OUGONTEKI_E: - .ascii "OUGONTEKI_E\0" -FLAGS_GLOBAL_OUGONTEKI_D: - .ascii "OUGONTEKI_D\0" -FLAGS_GLOBAL_OUGONTEKI_C: - .ascii "OUGONTEKI_C\0" -FLAGS_GLOBAL_OUGONTEKI_B: - .ascii "OUGONTEKI_B\0" -FLAGS_GLOBAL_OUGONTEKI_A: - .ascii "OUGONTEKI_A\0" -FLAGS_GLOBAL_NEW_HOUSE_FARORE: - .ascii "NEW_HOUSE_FARORE\0\0\0\0" -FLAGS_GLOBAL_NEW_HOUSE_NAYRU: - .ascii "NEW_HOUSE_NAYRU\0" -FLAGS_GLOBAL_NEW_HOUSE_DIN: - .ascii "NEW_HOUSE_DIN\0\0\0" -FLAGS_GLOBAL_RENTED_HOUSE_FARORE: - .ascii "RENTED_HOUSE_FARORE\0" -FLAGS_GLOBAL_RENTED_HOUSE_NAYRU: - .ascii "RENTED_HOUSE_NAYRU\0\0" -FLAGS_GLOBAL_RENTED_HOUSE_DIN: - .ascii "RENTED_HOUSE_DIN\0\0\0\0" -FLAGS_GLOBAL_MIZUKAKI_HARIFALL: - .ascii "MIZUKAKI_HARIFALL\0\0\0" -FLAGS_GLOBAL_MIZUKAKI_START: - .ascii "MIZUKAKI_START\0\0" -FLAGS_GLOBAL_KABUTOWARI: - .ascii "KABUTOWARI\0\0" -FLAGS_GLOBAL_GATOTSU: - .ascii "GATOTSU\0" -FLAGS_GLOBAL_DAIKAITENGIRI: - .ascii "DAIKAITENGIRI\0\0\0" -FLAGS_GLOBAL_KAITENGIRI: - .ascii "KAITENGIRI\0\0" -FLAGS_GLOBAL_KUMOTATSUMAKI: - .ascii "KUMOTATSUMAKI\0\0\0" -FLAGS_GLOBAL_TATSUMAKI: - .ascii "TATSUMAKI\0\0\0" -FLAGS_GLOBAL_ENTRANCE_OK: - .ascii "ENTRANCE_OK\0" -FLAGS_GLOBAL_HAKA_KEY_FOUND: - .ascii "HAKA_KEY_FOUND\0\0" -FLAGS_GLOBAL_HAKA_KEY_LOST: - .ascii "HAKA_KEY_LOST\0\0\0" -FLAGS_GLOBAL_LEFT_DOOR_OPEN: - .ascii "LEFT_DOOR_OPEN\0\0" -FLAGS_GLOBAL_DASHBOOTS: - .ascii "DASHBOOTS\0\0\0" -FLAGS_GLOBAL_INLOCK: - .ascii "INLOCK\0\0" -FLAGS_GLOBAL_ZELDA_CHASE: - .ascii "ZELDA_CHASE\0" -FLAGS_GLOBAL_WATERBEAN_PUT: - .ascii "WATERBEAN_PUT\0\0\0" -FLAGS_GLOBAL_WATERBEAN_OUT: - .ascii "WATERBEAN_OUT\0\0\0" -FLAGS_GLOBAL_TATEKAKE_TOCHU: - .ascii "TATEKAKE_TOCHU\0\0" -FLAGS_GLOBAL_TATEKAKE_HOUSE: - .ascii "TATEKAKE_HOUSE\0\0" -FLAGS_GLOBAL_LV1TARU_OPEN: - .ascii "LV1TARU_OPEN\0\0\0\0" -FLAGS_GLOBAL_LV1TARU: - .ascii "LV1TARU\0" -FLAGS_GLOBAL_TABIDACHI: - .ascii "TABIDACHI\0\0\0" -FLAGS_GLOBAL_EZERO_1ST: - .ascii "EZERO_1ST\0\0\0" -FLAGS_GLOBAL_START: - .ascii "START\0\0\0" -FLAGS_GLOBAL_MACHI_MACHIHOKORI: - .ascii "MACHI_MACHIHOKORI\0\0\0" -FLAGS_GLOBAL_MACHI_SET_8: - .ascii "MACHI_SET_8\0" -FLAGS_GLOBAL_MACHI_SET_7: - .ascii "MACHI_SET_7\0" -FLAGS_GLOBAL_MACHI_SET_6: - .ascii "MACHI_SET_6\0" -FLAGS_GLOBAL_MACHI_SET_5: - .ascii "MACHI_SET_5\0" -FLAGS_GLOBAL_MACHI_SET_4: - .ascii "MACHI_SET_4\0" -FLAGS_GLOBAL_MACHI_SET_3: - .ascii "MACHI_SET_3\0" -FLAGS_GLOBAL_MACHI_SET_2: - .ascii "MACHI_SET_2\0" -FLAGS_GLOBAL_MACHI_SET_1: - .ascii "MACHI_SET_1\0" -FLAGS_GLOBAL_LV8_CLEAR: - .ascii "LV8_CLEAR\0\0\0" -FLAGS_GLOBAL_LV7_CLEAR: - .ascii "LV7_CLEAR\0\0\0" -FLAGS_GLOBAL_LV6_CLEAR: - .ascii "LV6_CLEAR\0\0\0" -FLAGS_GLOBAL_LV5_CLEAR: - .ascii "LV5_CLEAR\0\0\0" -FLAGS_GLOBAL_LV4_CLEAR: - .ascii "LV4_CLEAR\0\0\0" -FLAGS_GLOBAL_LV3_CLEAR: - .ascii "LV3_CLEAR\0\0\0" -FLAGS_GLOBAL_LV2_CLEAR: - .ascii "LV2_CLEAR\0\0\0" -FLAGS_GLOBAL_LV1_CLEAR: - .ascii "LV1_CLEAR\0\0\0" -FLAGS_GLOBAL_LV0_CLEAR: - .ascii "LV0_CLEAR\0\0\0" -ENUM_BEGIN: - .ascii "BEGIN\0\0\0" - -.ifdef JP -FLAGS_OUTDOORS: - .4byte ENUM_BEGIN - .4byte FLAGS_OUTDOORS_LV1_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV2_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV3_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV4_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV5_CLEAR_MES - .4byte FLAGS_OUTDOORS_MIZUUMI_00_BENT - .4byte FLAGS_OUTDOORS_MIZUUMI_00_00 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_H00 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_H01 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_H02 - .4byte FLAGS_OUTDOORS_HIKYOU_00_T0 - .4byte FLAGS_OUTDOORS_HIKYOU_00_T1 - .4byte FLAGS_OUTDOORS_MAENIWA_00_00 - .4byte FLAGS_OUTDOORS_MAENIWA_00_01 - .4byte FLAGS_OUTDOORS_MAENIWA_00_02 - .4byte FLAGS_OUTDOORS_MAENIWA_00_BENT - .4byte FLAGS_OUTDOORS_MAENIWA_00_WARP - .4byte FLAGS_OUTDOORS_MAENIWA_00_T0 - .4byte FLAGS_OUTDOORS_MAENIWA_00_T1 - .4byte FLAGS_OUTDOORS_MAENIWA_00_CAP_0 - .4byte FLAGS_OUTDOORS_NAKANIWA_00_EZERO - .4byte FLAGS_OUTDOORS_HIKYOU_00_00 - .4byte FLAGS_OUTDOORS_HIKYOU_00_01 - .4byte FLAGS_OUTDOORS_HIKYOU_00_02 - .4byte FLAGS_OUTDOORS_HIKYOU_00_03 - .4byte FLAGS_OUTDOORS_HIKYOU_00_04 - .4byte FLAGS_OUTDOORS_HIKYOU_00_CAP_0 - .4byte FLAGS_OUTDOORS_HIKYOU_00_CAP_1 - .4byte FLAGS_OUTDOORS_HIKYOU_00_CAP_2 - .4byte FLAGS_OUTDOORS_HIKYOU_00_SEKIZOU - .4byte FLAGS_OUTDOORS_HIKYOU_00_14 - .4byte FLAGS_OUTDOORS_HIKYOU_00_BOSEKI - .4byte FLAGS_OUTDOORS_HIKYOU_00_H00 - .4byte FLAGS_OUTDOORS_HIKYOU_00_M0 - .4byte FLAGS_OUTDOORS_HIKYOU_00_M1 - .4byte FLAGS_OUTDOORS_HIKYOU_00_M2 - .4byte FLAGS_OUTDOORS_LOST_00_ENTER - .4byte FLAGS_OUTDOORS_LOST_00_00 - .4byte FLAGS_OUTDOORS_LOST_00_01 - .4byte FLAGS_OUTDOORS_LOST_02_00 - .4byte FLAGS_OUTDOORS_LOST_03_00 - .4byte FLAGS_OUTDOORS_LOST_03_T0 - .4byte FLAGS_OUTDOORS_LOST_04_00 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA0 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA1 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA2 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA3 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA4 - .4byte FLAGS_OUTDOORS_LOST_05_00 - .4byte FLAGS_OUTDOORS_LOST_05_01 - .4byte FLAGS_OUTDOORS_LOST_05_T0 - .4byte FLAGS_OUTDOORS_LOST_05_T1 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_0 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_1 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_2 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_3 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_4 - .4byte FLAGS_OUTDOORS_MORI_00_KOBITO - .4byte FLAGS_OUTDOORS_MORI_00_H0 - .4byte FLAGS_OUTDOORS_MORI_00_H1 - .4byte FLAGS_OUTDOORS_MORI_ENTRANCE_1ST - .4byte FLAGS_OUTDOORS_YAMA_00_00 - .4byte FLAGS_OUTDOORS_YAMA_00_01 - .4byte FLAGS_OUTDOORS_YAMA_01_BW00 - .4byte FLAGS_OUTDOORS_YAMA_02_00 - .4byte FLAGS_OUTDOORS_YAMA_03_00 - .4byte FLAGS_OUTDOORS_YAMA_03_01 - .4byte FLAGS_OUTDOORS_YAMA_03_02 - .4byte FLAGS_OUTDOORS_YAMA_03_DOKU_0 - .4byte FLAGS_OUTDOORS_YAMA_03_DOKU_1 - .4byte FLAGS_OUTDOORS_YAMA_03_DOKU_2 - .4byte FLAGS_OUTDOORS_YAMA_04_CAP_0 - .4byte FLAGS_OUTDOORS_YAMA_04_R00 - .4byte FLAGS_OUTDOORS_YAMA_04_HIBI_0 - .4byte FLAGS_OUTDOORS_YAMA_04_HIBI_1 - .4byte FLAGS_OUTDOORS_YAMA_04_00 - .4byte FLAGS_OUTDOORS_YAMA_04_01 - .4byte FLAGS_OUTDOORS_YAMA_04_04 - .4byte FLAGS_OUTDOORS_YAMA_04_05 - .4byte FLAGS_OUTDOORS_YAMA_04_06 - .4byte FLAGS_OUTDOORS_YAMA_04_ENTHOUSHI - .4byte FLAGS_OUTDOORS_YAMA_04_ANAHOUSHI - .4byte FLAGS_OUTDOORS_YAMA_04_BOMBWALL0 - .4byte FLAGS_OUTDOORS_HAKA_BUNSHIN_00 - .4byte FLAGS_OUTDOORS_HAKA_BOSEKI_00 - .4byte FLAGS_OUTDOORS_HAKA_BOSEKI_01 - .4byte FLAGS_OUTDOORS_HAKA_BOSEKI_02 - .4byte FLAGS_OUTDOORS_HAKA_00_CAP_0 - .4byte FLAGS_OUTDOORS_HAKA_00_BW00 - .4byte FLAGS_OUTDOORS_HAKA_01_T0 - .4byte FLAGS_OUTDOORS_HAKA_KEY_GET - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_4 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_5 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_6 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_7 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_8 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_9 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_10 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_11 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_12 - .4byte FLAGS_OUTDOORS_SOUGEN_01_00 - .4byte FLAGS_OUTDOORS_SOUGEN_01_BENT - .4byte FLAGS_OUTDOORS_SOUGEN_01_ZELDA - .4byte FLAGS_OUTDOORS_SOUGEN_02_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_02_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_03_BOMBWALL - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_05_BOMB_00 - .4byte FLAGS_OUTDOORS_SOUGEN_05_00 - .4byte FLAGS_OUTDOORS_SOUGEN_05_01 - .4byte FLAGS_OUTDOORS_SOUGEN_05_IWA02 - .4byte FLAGS_OUTDOORS_SOUGEN_05_BENT - .4byte FLAGS_OUTDOORS_SOUGEN_05_H00 - .4byte FLAGS_OUTDOORS_SOUGEN_05_R0 - .4byte FLAGS_OUTDOORS_SOUGEN_05_CAP_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_4 - .4byte FLAGS_OUTDOORS_SOUGEN_06_IWA_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_AKINDO - .4byte FLAGS_OUTDOORS_SOUGEN_06_SAIKAI - .4byte FLAGS_OUTDOORS_SOUGEN_06_BENT - .4byte FLAGS_OUTDOORS_SOUGEN_06_SLIDE - .4byte FLAGS_OUTDOORS_SOUGEN_06_R1 - .4byte FLAGS_OUTDOORS_SOUGEN_07_00 - .4byte FLAGS_OUTDOORS_SOUGEN_07_01 - .4byte FLAGS_OUTDOORS_SOUGEN_07_02 - .4byte FLAGS_OUTDOORS_SOUGEN_07_H00 - .4byte FLAGS_OUTDOORS_SOUGEN_08_00 - .4byte FLAGS_OUTDOORS_SOUGEN_08_01 - .4byte FLAGS_OUTDOORS_SOUGEN_08_02 - .4byte FLAGS_OUTDOORS_SOUGEN_08_03 - .4byte FLAGS_OUTDOORS_SOUGEN_08_04 - .4byte FLAGS_OUTDOORS_SOUGEN_08_05 - .4byte FLAGS_OUTDOORS_SOUGEN_08_06 - .4byte FLAGS_OUTDOORS_SOUGEN_08_07 - .4byte FLAGS_OUTDOORS_SOUGEN_08_08 - .4byte FLAGS_OUTDOORS_SOUGEN_08_TORITSUKI - .4byte FLAGS_OUTDOORS_SOUGEN_08_T00 - .4byte FLAGS_OUTDOORS_CASTLE_00_00 - .4byte FLAGS_OUTDOORS_CASTLE_04_MEZAME - .4byte FLAGS_OUTDOORS_CASTLE_04_MAID_TALK - .4byte FLAGS_OUTDOORS_SUIGEN_00_h0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_T0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_r0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_r1 - .4byte FLAGS_OUTDOORS_SUIGEN_00_r2 - .4byte FLAGS_OUTDOORS_SUIGEN_00_CAP_0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_CAP_1 - .4byte FLAGS_OUTDOORS_SUIGEN_00_R0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_R1 - .4byte FLAGS_OUTDOORS_SUIGEN_00_h1 - .4byte FLAGS_OUTDOORS_SUIGENGORON_00_CAP_0 - .4byte FLAGS_OUTDOORS_DAIGORON_SHIELD - .4byte FLAGS_OUTDOORS_DAIGORON_EXCHG - .4byte FLAGS_OUTDOORS_BEANDEMO_00 - .4byte FLAGS_OUTDOORS_BEANDEMO_01 - .4byte FLAGS_OUTDOORS_BEANDEMO_02 - .4byte FLAGS_OUTDOORS_BEANDEMO_03 - .4byte FLAGS_OUTDOORS_BEANDEMO_04 - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_A - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_E - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_K - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_L - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_M - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_N - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_O - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_P - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_Q - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_R - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_S - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_T - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_U - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_V - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_W - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_X - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_Y - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_Z - .4byte FLAGS_OUTDOORS_MACHI_02_HEISHI_TALK - .4byte FLAGS_OUTDOORS_MACHI00_00 - .4byte FLAGS_OUTDOORS_MACHI00_02 - .4byte FLAGS_OUTDOORS_MACHI00_03 - .4byte FLAGS_OUTDOORS_MACHI_00_T00 - .4byte FLAGS_OUTDOORS_MACHI_00_T01 - .4byte FLAGS_OUTDOORS_MACHI_01_DEMO - .4byte FLAGS_OUTDOORS_MACHI_02_HEISHI - .4byte FLAGS_OUTDOORS_MACHI_02_DOG - .4byte FLAGS_OUTDOORS_MACHI_07_BELL - .4byte FLAGS_OUTDOORS_SHOP05_OPEN - .4byte FLAGS_OUTDOORS_MACHI_MES_20 - .4byte FLAGS_OUTDOORS_MACHI_MES_21 - .4byte FLAGS_OUTDOORS_MACHI_MES_22 - .4byte FLAGS_OUTDOORS_MACHI_MES_23 - .4byte FLAGS_OUTDOORS_MACHI_MES_24 - .4byte FLAGS_OUTDOORS_MACHI_MES_30 - .4byte FLAGS_OUTDOORS_MACHI_MES_40 - .4byte FLAGS_OUTDOORS_MACHI_MES_60 - .4byte FLAGS_OUTDOORS_MACHI_MES_50 - .4byte FLAGS_OUTDOORS_MACHI_DOG_C - .4byte FLAGS_OUTDOORS_KUMOUE_00_CAP_0 - .4byte FLAGS_OUTDOORS_KUMOUE_01_CAP_0 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T0 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T1 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T2 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T3 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T4 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T5 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T6 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K0 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K1 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K2 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K3 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K4 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K5 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K6 - .4byte FLAGS_OUTDOORS_KUMONOUE_01_KAKERA - .4byte FLAGS_OUTDOORS_KUMOUE_02_CAP_0 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_01 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_02 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_03 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_04 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_05 - .4byte FLAGS_OUTDOORS_KUMOUE_02_00 - .4byte FLAGS_OUTDOORS_KUMOUE_02_01 - .4byte FLAGS_OUTDOORS_KUMOUE_02_02 - .4byte FLAGS_OUTDOORS_KUMOUE_02_03 - .4byte FLAGS_OUTDOORS_KUMOUE_UNCLE_TALK - .4byte FLAGS_OUTDOORS_KUMOUE_GIRL_TALK - .4byte FLAGS_OUTDOORS_MIZUUMI_00_CAP_0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_R2 - .4byte FLAGS_OUTDOORS_YAMA_04_CAP_1 - .4byte FLAGS_OUTDOORS_LOST_05_02 - .4byte FLAGS_OUTDOORS_LOST_05_03 - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_J - .4byte ENUM_END - -FLAGS_OUTDOORS_KAKERA_TAKARA_J: - .ascii "KAKERA_TAKARA_J\0" -FLAGS_OUTDOORS_LOST_05_03: - .ascii "LOST_05_03\0\0" -FLAGS_OUTDOORS_LOST_05_02: - .ascii "LOST_05_02\0\0" -FLAGS_OUTDOORS_YAMA_04_CAP_1: - .ascii "YAMA_04_CAP_1\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_R2: - .ascii "SUIGEN_00_R2\0\0\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_CAP_0: - .ascii "MIZUUMI_00_CAP_0\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_GIRL_TALK: - .ascii "KUMOUE_GIRL_TALK\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_UNCLE_TALK: - .ascii "KUMOUE_UNCLE_TALK\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_03: - .ascii "KUMOUE_02_03\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_02: - .ascii "KUMOUE_02_02\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_01: - .ascii "KUMOUE_02_01\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_00: - .ascii "KUMOUE_02_00\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_05: - .ascii "KUMOUE_02_AWASE_05\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_04: - .ascii "KUMOUE_02_AWASE_04\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_03: - .ascii "KUMOUE_02_AWASE_03\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_02: - .ascii "KUMOUE_02_AWASE_02\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_01: - .ascii "KUMOUE_02_AWASE_01\0\0" -FLAGS_OUTDOORS_KUMOUE_02_CAP_0: - .ascii "KUMOUE_02_CAP_0\0" -FLAGS_OUTDOORS_KUMONOUE_01_KAKERA: - .ascii "KUMONOUE_01_KAKERA\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K6: - .ascii "KUMOUR_01_K6\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K5: - .ascii "KUMOUR_01_K5\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K4: - .ascii "KUMOUR_01_K4\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K3: - .ascii "KUMOUR_01_K3\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K2: - .ascii "KUMOUR_01_K2\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K1: - .ascii "KUMOUR_01_K1\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K0: - .ascii "KUMOUR_01_K0\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T6: - .ascii "KUMOUE_01_T6\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T5: - .ascii "KUMOUE_01_T5\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T4: - .ascii "KUMOUE_01_T4\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T3: - .ascii "KUMOUE_01_T3\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T2: - .ascii "KUMOUE_01_T2\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T1: - .ascii "KUMOUE_01_T1\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T0: - .ascii "KUMOUE_01_T0\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_CAP_0: - .ascii "KUMOUE_01_CAP_0\0" -FLAGS_OUTDOORS_KUMOUE_00_CAP_0: - .ascii "KUMOUE_00_CAP_0\0" -FLAGS_OUTDOORS_MACHI_DOG_C: - .ascii "MACHI_DOG_C\0" -FLAGS_OUTDOORS_MACHI_MES_50: - .ascii "MACHI_MES_50\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_60: - .ascii "MACHI_MES_60\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_40: - .ascii "MACHI_MES_40\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_30: - .ascii "MACHI_MES_30\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_24: - .ascii "MACHI_MES_24\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_23: - .ascii "MACHI_MES_23\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_22: - .ascii "MACHI_MES_22\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_21: - .ascii "MACHI_MES_21\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_20: - .ascii "MACHI_MES_20\0\0\0\0" -FLAGS_OUTDOORS_SHOP05_OPEN: - .ascii "SHOP05_OPEN\0" -FLAGS_OUTDOORS_MACHI_07_BELL: - .ascii "MACHI_07_BELL\0\0\0" -FLAGS_OUTDOORS_MACHI_02_DOG: - .ascii "MACHI_02_DOG\0\0\0\0" -FLAGS_OUTDOORS_MACHI_02_HEISHI: - .ascii "MACHI_02_HEISHI\0" -FLAGS_OUTDOORS_MACHI_01_DEMO: - .ascii "MACHI_01_DEMO\0\0\0" -FLAGS_OUTDOORS_MACHI_00_T01: - .ascii "MACHI_00_T01\0\0\0\0" -FLAGS_OUTDOORS_MACHI_00_T00: - .ascii "MACHI_00_T00\0\0\0\0" -FLAGS_OUTDOORS_MACHI00_03: - .ascii "MACHI00_03\0\0" -FLAGS_OUTDOORS_MACHI00_02: - .ascii "MACHI00_02\0\0" -FLAGS_OUTDOORS_MACHI00_00: - .ascii "MACHI00_00\0\0" -FLAGS_OUTDOORS_MACHI_02_HEISHI_TALK: - .ascii "MACHI_02_HEISHI_TALK\0\0\0\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_Z: - .ascii "KAKERA_TAKARA_Z\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_Y: - .ascii "KAKERA_TAKARA_Y\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_X: - .ascii "KAKERA_TAKARA_X\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_W: - .ascii "KAKERA_TAKARA_W\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_V: - .ascii "KAKERA_TAKARA_V\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_U: - .ascii "KAKERA_TAKARA_U\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_T: - .ascii "KAKERA_TAKARA_T\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_S: - .ascii "KAKERA_TAKARA_S\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_R: - .ascii "KAKERA_TAKARA_R\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_Q: - .ascii "KAKERA_TAKARA_Q\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_P: - .ascii "KAKERA_TAKARA_P\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_O: - .ascii "KAKERA_TAKARA_O\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_N: - .ascii "KAKERA_TAKARA_N\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_M: - .ascii "KAKERA_TAKARA_M\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_L: - .ascii "KAKERA_TAKARA_L\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_K: - .ascii "KAKERA_TAKARA_K\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_E: - .ascii "KAKERA_TAKARA_E\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_A: - .ascii "KAKERA_TAKARA_A\0" -FLAGS_OUTDOORS_BEANDEMO_04: - .ascii "BEANDEMO_04\0" -FLAGS_OUTDOORS_BEANDEMO_03: - .ascii "BEANDEMO_03\0" -FLAGS_OUTDOORS_BEANDEMO_02: - .ascii "BEANDEMO_02\0" -FLAGS_OUTDOORS_BEANDEMO_01: - .ascii "BEANDEMO_01\0" -FLAGS_OUTDOORS_BEANDEMO_00: - .ascii "BEANDEMO_00\0" -FLAGS_OUTDOORS_DAIGORON_EXCHG: - .ascii "DAIGORON_EXCHG\0\0" -FLAGS_OUTDOORS_DAIGORON_SHIELD: - .ascii "DAIGORON_SHIELD\0" -FLAGS_OUTDOORS_SUIGENGORON_00_CAP_0: - .ascii "SUIGENGORON_00_CAP_0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_h1: - .ascii "SUIGEN_00_h1\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_R1: - .ascii "SUIGEN_00_R1\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_R0: - .ascii "SUIGEN_00_R0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_CAP_1: - .ascii "SUIGEN_00_CAP_1\0" -FLAGS_OUTDOORS_SUIGEN_00_CAP_0: - .ascii "SUIGEN_00_CAP_0\0" -FLAGS_OUTDOORS_SUIGEN_00_r2: - .ascii "SUIGEN_00_r2\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_r1: - .ascii "SUIGEN_00_r1\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_r0: - .ascii "SUIGEN_00_r0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_T0: - .ascii "SUIGEN_00_T0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_h0: - .ascii "SUIGEN_00_h0\0\0\0\0" -FLAGS_OUTDOORS_CASTLE_04_MAID_TALK: - .ascii "CASTLE_04_MAID_TALK\0" -FLAGS_OUTDOORS_CASTLE_04_MEZAME: - .ascii "CASTLE_04_MEZAME\0\0\0\0" -FLAGS_OUTDOORS_CASTLE_00_00: - .ascii "CASTLE_00_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_T00: - .ascii "SOUGEN_08_T00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_TORITSUKI: - .ascii "SOUGEN_08_TORITSUKI\0" -FLAGS_OUTDOORS_SOUGEN_08_08: - .ascii "SOUGEN_08_08\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_07: - .ascii "SOUGEN_08_07\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_06: - .ascii "SOUGEN_08_06\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_05: - .ascii "SOUGEN_08_05\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_04: - .ascii "SOUGEN_08_04\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_03: - .ascii "SOUGEN_08_03\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_02: - .ascii "SOUGEN_08_02\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_01: - .ascii "SOUGEN_08_01\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_00: - .ascii "SOUGEN_08_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_H00: - .ascii "SOUGEN_07_H00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_02: - .ascii "SOUGEN_07_02\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_01: - .ascii "SOUGEN_07_01\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_00: - .ascii "SOUGEN_07_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_R1: - .ascii "SOUGEN_06_R1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_SLIDE: - .ascii "SOUGEN_06_SLIDE\0" -FLAGS_OUTDOORS_SOUGEN_06_BENT: - .ascii "SOUGEN_06_BENT\0\0" -FLAGS_OUTDOORS_SOUGEN_06_SAIKAI: - .ascii "SOUGEN_06_SAIKAI\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_AKINDO: - .ascii "SOUGEN_06_AKINDO\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_IWA_0: - .ascii "SOUGEN_06_IWA_0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_4: - .ascii "SOUGEN_06_HIBI_4\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_3: - .ascii "SOUGEN_06_HIBI_3\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_2: - .ascii "SOUGEN_06_HIBI_2\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_1: - .ascii "SOUGEN_06_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_0: - .ascii "SOUGEN_06_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_3: - .ascii "SOUGEN_06_WAKAGI_3\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_2: - .ascii "SOUGEN_06_WAKAGI_2\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_1: - .ascii "SOUGEN_06_WAKAGI_1\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_0: - .ascii "SOUGEN_06_WAKAGI_0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_CAP_0: - .ascii "SOUGEN_05_CAP_0\0" -FLAGS_OUTDOORS_SOUGEN_05_R0: - .ascii "SOUGEN_05_R0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_H00: - .ascii "SOUGEN_05_H00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_BENT: - .ascii "SOUGEN_05_BENT\0\0" -FLAGS_OUTDOORS_SOUGEN_05_IWA02: - .ascii "SOUGEN_05_IWA02\0" -FLAGS_OUTDOORS_SOUGEN_05_01: - .ascii "SOUGEN_05_01\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_00: - .ascii "SOUGEN_05_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_BOMB_00: - .ascii "SOUGEN_05_BOMB_00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_3: - .ascii "SOUGEN_05_HIBI_3\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_2: - .ascii "SOUGEN_05_HIBI_2\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_1: - .ascii "SOUGEN_05_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_0: - .ascii "SOUGEN_05_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_3: - .ascii "SOUGEN_04_HIBI_3\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_2: - .ascii "SOUGEN_04_HIBI_2\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_1: - .ascii "SOUGEN_04_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_0: - .ascii "SOUGEN_04_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_03_BOMBWALL: - .ascii "SOUGEN_03_BOMBWALL\0\0" -FLAGS_OUTDOORS_SOUGEN_02_HIBI_1: - .ascii "SOUGEN_02_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_02_HIBI_0: - .ascii "SOUGEN_02_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_01_ZELDA: - .ascii "SOUGEN_01_ZELDA\0" -FLAGS_OUTDOORS_SOUGEN_01_BENT: - .ascii "SOUGEN_01_BENT\0\0" -FLAGS_OUTDOORS_SOUGEN_01_00: - .ascii "SOUGEN_01_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_12: - .ascii "SOUGEN_01_WAKAGI_12\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_11: - .ascii "SOUGEN_01_WAKAGI_11\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_10: - .ascii "SOUGEN_01_WAKAGI_10\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_9: - .ascii "SOUGEN_01_WAKAGI_9\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_8: - .ascii "SOUGEN_01_WAKAGI_8\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_7: - .ascii "SOUGEN_01_WAKAGI_7\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_6: - .ascii "SOUGEN_01_WAKAGI_6\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_5: - .ascii "SOUGEN_01_WAKAGI_5\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_4: - .ascii "SOUGEN_01_WAKAGI_4\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_3: - .ascii "SOUGEN_01_WAKAGI_3\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_2: - .ascii "SOUGEN_01_WAKAGI_2\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_1: - .ascii "SOUGEN_01_WAKAGI_1\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_0: - .ascii "SOUGEN_01_WAKAGI_0\0\0" -FLAGS_OUTDOORS_HAKA_KEY_GET: - .ascii "HAKA_KEY_GET\0\0\0\0" -FLAGS_OUTDOORS_HAKA_01_T0: - .ascii "HAKA_01_T0\0\0" -FLAGS_OUTDOORS_HAKA_00_BW00: - .ascii "HAKA_00_BW00\0\0\0\0" -FLAGS_OUTDOORS_HAKA_00_CAP_0: - .ascii "HAKA_00_CAP_0\0\0\0" -FLAGS_OUTDOORS_HAKA_BOSEKI_02: - .ascii "HAKA_BOSEKI_02\0\0" -FLAGS_OUTDOORS_HAKA_BOSEKI_01: - .ascii "HAKA_BOSEKI_01\0\0" -FLAGS_OUTDOORS_HAKA_BOSEKI_00: - .ascii "HAKA_BOSEKI_00\0\0" -FLAGS_OUTDOORS_HAKA_BUNSHIN_00: - .ascii "HAKA_BUNSHIN_00\0" -FLAGS_OUTDOORS_YAMA_04_BOMBWALL0: - .ascii "YAMA_04_BOMBWALL0\0\0\0" -FLAGS_OUTDOORS_YAMA_04_ANAHOUSHI: - .ascii "YAMA_04_ANAHOUSHI\0\0\0" -FLAGS_OUTDOORS_YAMA_04_ENTHOUSHI: - .ascii "YAMA_04_ENTHOUSHI\0\0\0" -FLAGS_OUTDOORS_YAMA_04_06: - .ascii "YAMA_04_06\0\0" -FLAGS_OUTDOORS_YAMA_04_05: - .ascii "YAMA_04_05\0\0" -FLAGS_OUTDOORS_YAMA_04_04: - .ascii "YAMA_04_04\0\0" -FLAGS_OUTDOORS_YAMA_04_01: - .ascii "YAMA_04_01\0\0" -FLAGS_OUTDOORS_YAMA_04_00: - .ascii "YAMA_04_00\0\0" -FLAGS_OUTDOORS_YAMA_04_HIBI_1: - .ascii "YAMA_04_HIBI_1\0\0" -FLAGS_OUTDOORS_YAMA_04_HIBI_0: - .ascii "YAMA_04_HIBI_0\0\0" -FLAGS_OUTDOORS_YAMA_04_R00: - .ascii "YAMA_04_R00\0" -FLAGS_OUTDOORS_YAMA_04_CAP_0: - .ascii "YAMA_04_CAP_0\0\0\0" -FLAGS_OUTDOORS_YAMA_03_DOKU_2: - .ascii "YAMA_03_DOKU_2\0\0" -FLAGS_OUTDOORS_YAMA_03_DOKU_1: - .ascii "YAMA_03_DOKU_1\0\0" -FLAGS_OUTDOORS_YAMA_03_DOKU_0: - .ascii "YAMA_03_DOKU_0\0\0" -FLAGS_OUTDOORS_YAMA_03_02: - .ascii "YAMA_03_02\0\0" -FLAGS_OUTDOORS_YAMA_03_01: - .ascii "YAMA_03_01\0\0" -FLAGS_OUTDOORS_YAMA_03_00: - .ascii "YAMA_03_00\0\0" -FLAGS_OUTDOORS_YAMA_02_00: - .ascii "YAMA_02_00\0\0" -FLAGS_OUTDOORS_YAMA_01_BW00: - .ascii "YAMA_01_BW00\0\0\0\0" -FLAGS_OUTDOORS_YAMA_00_01: - .ascii "YAMA_00_01\0\0" -FLAGS_OUTDOORS_YAMA_00_00: - .ascii "YAMA_00_00\0\0" -FLAGS_OUTDOORS_MORI_ENTRANCE_1ST: - .ascii "MORI_ENTRANCE_1ST\0\0\0" -FLAGS_OUTDOORS_MORI_00_H1: - .ascii "MORI_00_H1\0\0" -FLAGS_OUTDOORS_MORI_00_H0: - .ascii "MORI_00_H0\0\0" -FLAGS_OUTDOORS_MORI_00_KOBITO: - .ascii "MORI_00_KOBITO\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_4: - .ascii "MORI_00_HIBI_4\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_3: - .ascii "MORI_00_HIBI_3\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_2: - .ascii "MORI_00_HIBI_2\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_1: - .ascii "MORI_00_HIBI_1\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_0: - .ascii "MORI_00_HIBI_0\0\0" -FLAGS_OUTDOORS_LOST_05_T1: - .ascii "LOST_05_T1\0\0" -FLAGS_OUTDOORS_LOST_05_T0: - .ascii "LOST_05_T0\0\0" -FLAGS_OUTDOORS_LOST_05_01: - .ascii "LOST_05_01\0\0" -FLAGS_OUTDOORS_LOST_05_00: - .ascii "LOST_05_00\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA4: - .ascii "LOST_04_SIBA4\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA3: - .ascii "LOST_04_SIBA3\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA2: - .ascii "LOST_04_SIBA2\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA1: - .ascii "LOST_04_SIBA1\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA0: - .ascii "LOST_04_SIBA0\0\0\0" -FLAGS_OUTDOORS_LOST_04_00: - .ascii "LOST_04_00\0\0" -FLAGS_OUTDOORS_LOST_03_T0: - .ascii "LOST_03_T0\0\0" -FLAGS_OUTDOORS_LOST_03_00: - .ascii "LOST_03_00\0\0" -FLAGS_OUTDOORS_LOST_02_00: - .ascii "LOST_02_00\0\0" -FLAGS_OUTDOORS_LOST_00_01: - .ascii "LOST_00_01\0\0" -FLAGS_OUTDOORS_LOST_00_00: - .ascii "LOST_00_00\0\0" -FLAGS_OUTDOORS_LOST_00_ENTER: - .ascii "LOST_00_ENTER\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_M2: - .ascii "HIKYOU_00_M2\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_M1: - .ascii "HIKYOU_00_M1\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_M0: - .ascii "HIKYOU_00_M0\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_H00: - .ascii "HIKYOU_00_H00\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_BOSEKI: - .ascii "HIKYOU_00_BOSEKI\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_14: - .ascii "HIKYOU_00_14\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_SEKIZOU: - .ascii "HIKYOU_00_SEKIZOU\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_CAP_2: - .ascii "HIKYOU_00_CAP_2\0" -FLAGS_OUTDOORS_HIKYOU_00_CAP_1: - .ascii "HIKYOU_00_CAP_1\0" -FLAGS_OUTDOORS_HIKYOU_00_CAP_0: - .ascii "HIKYOU_00_CAP_0\0" -FLAGS_OUTDOORS_HIKYOU_00_04: - .ascii "HIKYOU_00_04\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_03: - .ascii "HIKYOU_00_03\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_02: - .ascii "HIKYOU_00_02\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_01: - .ascii "HIKYOU_00_01\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_00: - .ascii "HIKYOU_00_00\0\0\0\0" -FLAGS_OUTDOORS_NAKANIWA_00_EZERO: - .ascii "NAKANIWA_00_EZERO\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_CAP_0: - .ascii "MAENIWA_00_CAP_0\0\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_T1: - .ascii "MAENIWA_00_T1\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_T0: - .ascii "MAENIWA_00_T0\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_WARP: - .ascii "MAENIWA_00_WARP\0" -FLAGS_OUTDOORS_MAENIWA_00_BENT: - .ascii "MAENIWA_00_BENT\0" -FLAGS_OUTDOORS_MAENIWA_00_02: - .ascii "MAENIWA_00_02\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_01: - .ascii "MAENIWA_00_01\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_00: - .ascii "MAENIWA_00_00\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_T1: - .ascii "HIKYOU_00_T1\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_T0: - .ascii "HIKYOU_00_T0\0\0\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_H02: - .ascii "MIZUUMI_00_H02\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_H01: - .ascii "MIZUUMI_00_H01\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_H00: - .ascii "MIZUUMI_00_H00\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_00: - .ascii "MIZUUMI_00_00\0\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_BENT: - .ascii "MIZUUMI_00_BENT\0" -FLAGS_OUTDOORS_LV5_CLEAR_MES: - .ascii "LV5_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV4_CLEAR_MES: - .ascii "LV4_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV3_CLEAR_MES: - .ascii "LV3_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV2_CLEAR_MES: - .ascii "LV2_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV1_CLEAR_MES: - .ascii "LV1_CLEAR_MES\0\0\0" - -.else - -.ifdef EU -@ TODO same as JP, deduplicate -FLAGS_OUTDOORS: - .4byte ENUM_BEGIN - .4byte FLAGS_OUTDOORS_LV1_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV2_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV3_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV4_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV5_CLEAR_MES - .4byte FLAGS_OUTDOORS_MIZUUMI_00_BENT - .4byte FLAGS_OUTDOORS_MIZUUMI_00_00 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_H00 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_H01 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_H02 - .4byte FLAGS_OUTDOORS_HIKYOU_00_T0 - .4byte FLAGS_OUTDOORS_HIKYOU_00_T1 - .4byte FLAGS_OUTDOORS_MAENIWA_00_00 - .4byte FLAGS_OUTDOORS_MAENIWA_00_01 - .4byte FLAGS_OUTDOORS_MAENIWA_00_02 - .4byte FLAGS_OUTDOORS_MAENIWA_00_BENT - .4byte FLAGS_OUTDOORS_MAENIWA_00_WARP - .4byte FLAGS_OUTDOORS_MAENIWA_00_T0 - .4byte FLAGS_OUTDOORS_MAENIWA_00_T1 - .4byte FLAGS_OUTDOORS_MAENIWA_00_CAP_0 - .4byte FLAGS_OUTDOORS_NAKANIWA_00_EZERO - .4byte FLAGS_OUTDOORS_HIKYOU_00_00 - .4byte FLAGS_OUTDOORS_HIKYOU_00_01 - .4byte FLAGS_OUTDOORS_HIKYOU_00_02 - .4byte FLAGS_OUTDOORS_HIKYOU_00_03 - .4byte FLAGS_OUTDOORS_HIKYOU_00_04 - .4byte FLAGS_OUTDOORS_HIKYOU_00_CAP_0 - .4byte FLAGS_OUTDOORS_HIKYOU_00_CAP_1 - .4byte FLAGS_OUTDOORS_HIKYOU_00_CAP_2 - .4byte FLAGS_OUTDOORS_HIKYOU_00_SEKIZOU - .4byte FLAGS_OUTDOORS_HIKYOU_00_14 - .4byte FLAGS_OUTDOORS_HIKYOU_00_BOSEKI - .4byte FLAGS_OUTDOORS_HIKYOU_00_H00 - .4byte FLAGS_OUTDOORS_HIKYOU_00_M0 - .4byte FLAGS_OUTDOORS_HIKYOU_00_M1 - .4byte FLAGS_OUTDOORS_HIKYOU_00_M2 - .4byte FLAGS_OUTDOORS_LOST_00_ENTER - .4byte FLAGS_OUTDOORS_LOST_00_00 - .4byte FLAGS_OUTDOORS_LOST_00_01 - .4byte FLAGS_OUTDOORS_LOST_02_00 - .4byte FLAGS_OUTDOORS_LOST_03_00 - .4byte FLAGS_OUTDOORS_LOST_03_T0 - .4byte FLAGS_OUTDOORS_LOST_04_00 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA0 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA1 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA2 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA3 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA4 - .4byte FLAGS_OUTDOORS_LOST_05_00 - .4byte FLAGS_OUTDOORS_LOST_05_01 - .4byte FLAGS_OUTDOORS_LOST_05_T0 - .4byte FLAGS_OUTDOORS_LOST_05_T1 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_0 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_1 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_2 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_3 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_4 - .4byte FLAGS_OUTDOORS_MORI_00_KOBITO - .4byte FLAGS_OUTDOORS_MORI_00_H0 - .4byte FLAGS_OUTDOORS_MORI_00_H1 - .4byte FLAGS_OUTDOORS_MORI_ENTRANCE_1ST - .4byte FLAGS_OUTDOORS_YAMA_00_00 - .4byte FLAGS_OUTDOORS_YAMA_00_01 - .4byte FLAGS_OUTDOORS_YAMA_01_BW00 - .4byte FLAGS_OUTDOORS_YAMA_02_00 - .4byte FLAGS_OUTDOORS_YAMA_03_00 - .4byte FLAGS_OUTDOORS_YAMA_03_01 - .4byte FLAGS_OUTDOORS_YAMA_03_02 - .4byte FLAGS_OUTDOORS_YAMA_03_DOKU_0 - .4byte FLAGS_OUTDOORS_YAMA_03_DOKU_1 - .4byte FLAGS_OUTDOORS_YAMA_03_DOKU_2 - .4byte FLAGS_OUTDOORS_YAMA_04_CAP_0 - .4byte FLAGS_OUTDOORS_YAMA_04_R00 - .4byte FLAGS_OUTDOORS_YAMA_04_HIBI_0 - .4byte FLAGS_OUTDOORS_YAMA_04_HIBI_1 - .4byte FLAGS_OUTDOORS_YAMA_04_00 - .4byte FLAGS_OUTDOORS_YAMA_04_01 - .4byte FLAGS_OUTDOORS_YAMA_04_04 - .4byte FLAGS_OUTDOORS_YAMA_04_05 - .4byte FLAGS_OUTDOORS_YAMA_04_06 - .4byte FLAGS_OUTDOORS_YAMA_04_ENTHOUSHI - .4byte FLAGS_OUTDOORS_YAMA_04_ANAHOUSHI - .4byte FLAGS_OUTDOORS_YAMA_04_BOMBWALL0 - .4byte FLAGS_OUTDOORS_HAKA_BUNSHIN_00 - .4byte FLAGS_OUTDOORS_HAKA_BOSEKI_00 - .4byte FLAGS_OUTDOORS_HAKA_BOSEKI_01 - .4byte FLAGS_OUTDOORS_HAKA_BOSEKI_02 - .4byte FLAGS_OUTDOORS_HAKA_00_CAP_0 - .4byte FLAGS_OUTDOORS_HAKA_00_BW00 - .4byte FLAGS_OUTDOORS_HAKA_01_T0 - .4byte FLAGS_OUTDOORS_HAKA_KEY_GET - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_4 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_5 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_6 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_7 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_8 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_9 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_10 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_11 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_12 - .4byte FLAGS_OUTDOORS_SOUGEN_01_00 - .4byte FLAGS_OUTDOORS_SOUGEN_01_BENT - .4byte FLAGS_OUTDOORS_SOUGEN_01_ZELDA - .4byte FLAGS_OUTDOORS_SOUGEN_02_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_02_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_03_BOMBWALL - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_05_BOMB_00 - .4byte FLAGS_OUTDOORS_SOUGEN_05_00 - .4byte FLAGS_OUTDOORS_SOUGEN_05_01 - .4byte FLAGS_OUTDOORS_SOUGEN_05_IWA02 - .4byte FLAGS_OUTDOORS_SOUGEN_05_BENT - .4byte FLAGS_OUTDOORS_SOUGEN_05_H00 - .4byte FLAGS_OUTDOORS_SOUGEN_05_R0 - .4byte FLAGS_OUTDOORS_SOUGEN_05_CAP_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_4 - .4byte FLAGS_OUTDOORS_SOUGEN_06_IWA_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_AKINDO - .4byte FLAGS_OUTDOORS_SOUGEN_06_SAIKAI - .4byte FLAGS_OUTDOORS_SOUGEN_06_BENT - .4byte FLAGS_OUTDOORS_SOUGEN_06_SLIDE - .4byte FLAGS_OUTDOORS_SOUGEN_06_R1 - .4byte FLAGS_OUTDOORS_SOUGEN_07_00 - .4byte FLAGS_OUTDOORS_SOUGEN_07_01 - .4byte FLAGS_OUTDOORS_SOUGEN_07_02 - .4byte FLAGS_OUTDOORS_SOUGEN_07_H00 - .4byte FLAGS_OUTDOORS_SOUGEN_08_00 - .4byte FLAGS_OUTDOORS_SOUGEN_08_01 - .4byte FLAGS_OUTDOORS_SOUGEN_08_02 - .4byte FLAGS_OUTDOORS_SOUGEN_08_03 - .4byte FLAGS_OUTDOORS_SOUGEN_08_04 - .4byte FLAGS_OUTDOORS_SOUGEN_08_05 - .4byte FLAGS_OUTDOORS_SOUGEN_08_06 - .4byte FLAGS_OUTDOORS_SOUGEN_08_07 - .4byte FLAGS_OUTDOORS_SOUGEN_08_08 - .4byte FLAGS_OUTDOORS_SOUGEN_08_TORITSUKI - .4byte FLAGS_OUTDOORS_SOUGEN_08_T00 - .4byte FLAGS_OUTDOORS_CASTLE_00_00 - .4byte FLAGS_OUTDOORS_CASTLE_04_MEZAME - .4byte FLAGS_OUTDOORS_CASTLE_04_MAID_TALK - .4byte FLAGS_OUTDOORS_SUIGEN_00_h0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_T0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_r0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_r1 - .4byte FLAGS_OUTDOORS_SUIGEN_00_r2 - .4byte FLAGS_OUTDOORS_SUIGEN_00_CAP_0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_CAP_1 - .4byte FLAGS_OUTDOORS_SUIGEN_00_R0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_R1 - .4byte FLAGS_OUTDOORS_SUIGEN_00_h1 - .4byte FLAGS_OUTDOORS_SUIGENGORON_00_CAP_0 - .4byte FLAGS_OUTDOORS_DAIGORON_SHIELD - .4byte FLAGS_OUTDOORS_DAIGORON_EXCHG - .4byte FLAGS_OUTDOORS_BEANDEMO_00 - .4byte FLAGS_OUTDOORS_BEANDEMO_01 - .4byte FLAGS_OUTDOORS_BEANDEMO_02 - .4byte FLAGS_OUTDOORS_BEANDEMO_03 - .4byte FLAGS_OUTDOORS_BEANDEMO_04 - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_A - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_E - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_K - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_L - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_M - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_N - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_O - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_P - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_Q - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_R - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_S - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_T - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_U - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_V - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_W - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_X - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_Y - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_Z - .4byte FLAGS_OUTDOORS_MACHI_02_HEISHI_TALK - .4byte FLAGS_OUTDOORS_MACHI00_00 - .4byte FLAGS_OUTDOORS_MACHI00_02 - .4byte FLAGS_OUTDOORS_MACHI00_03 - .4byte FLAGS_OUTDOORS_MACHI_00_T00 - .4byte FLAGS_OUTDOORS_MACHI_00_T01 - .4byte FLAGS_OUTDOORS_MACHI_01_DEMO - .4byte FLAGS_OUTDOORS_MACHI_02_HEISHI - .4byte FLAGS_OUTDOORS_MACHI_02_DOG - .4byte FLAGS_OUTDOORS_MACHI_07_BELL - .4byte FLAGS_OUTDOORS_SHOP05_OPEN - .4byte FLAGS_OUTDOORS_MACHI_MES_20 - .4byte FLAGS_OUTDOORS_MACHI_MES_21 - .4byte FLAGS_OUTDOORS_MACHI_MES_22 - .4byte FLAGS_OUTDOORS_MACHI_MES_23 - .4byte FLAGS_OUTDOORS_MACHI_MES_24 - .4byte FLAGS_OUTDOORS_MACHI_MES_30 - .4byte FLAGS_OUTDOORS_MACHI_MES_40 - .4byte FLAGS_OUTDOORS_MACHI_MES_60 - .4byte FLAGS_OUTDOORS_MACHI_MES_50 - .4byte FLAGS_OUTDOORS_MACHI_DOG_C - .4byte FLAGS_OUTDOORS_KUMOUE_00_CAP_0 - .4byte FLAGS_OUTDOORS_KUMOUE_01_CAP_0 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T0 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T1 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T2 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T3 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T4 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T5 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T6 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K0 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K1 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K2 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K3 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K4 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K5 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K6 - .4byte FLAGS_OUTDOORS_KUMONOUE_01_KAKERA - .4byte FLAGS_OUTDOORS_KUMOUE_02_CAP_0 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_01 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_02 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_03 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_04 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_05 - .4byte FLAGS_OUTDOORS_KUMOUE_02_00 - .4byte FLAGS_OUTDOORS_KUMOUE_02_01 - .4byte FLAGS_OUTDOORS_KUMOUE_02_02 - .4byte FLAGS_OUTDOORS_KUMOUE_02_03 - .4byte FLAGS_OUTDOORS_KUMOUE_UNCLE_TALK - .4byte FLAGS_OUTDOORS_KUMOUE_GIRL_TALK - .4byte FLAGS_OUTDOORS_MIZUUMI_00_CAP_0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_R2 - .4byte FLAGS_OUTDOORS_YAMA_04_CAP_1 - .4byte FLAGS_OUTDOORS_LOST_05_02 - .4byte FLAGS_OUTDOORS_LOST_05_03 - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_J - .4byte ENUM_END -FLAGS_OUTDOORS_KAKERA_TAKARA_J: - .ascii "KAKERA_TAKARA_J\0" -FLAGS_OUTDOORS_LOST_05_03: - .ascii "LOST_05_03\0\0" -FLAGS_OUTDOORS_LOST_05_02: - .ascii "LOST_05_02\0\0" -FLAGS_OUTDOORS_YAMA_04_CAP_1: - .ascii "YAMA_04_CAP_1\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_R2: - .ascii "SUIGEN_00_R2\0\0\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_CAP_0: - .ascii "MIZUUMI_00_CAP_0\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_GIRL_TALK: - .ascii "KUMOUE_GIRL_TALK\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_UNCLE_TALK: - .ascii "KUMOUE_UNCLE_TALK\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_03: - .ascii "KUMOUE_02_03\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_02: - .ascii "KUMOUE_02_02\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_01: - .ascii "KUMOUE_02_01\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_00: - .ascii "KUMOUE_02_00\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_05: - .ascii "KUMOUE_02_AWASE_05\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_04: - .ascii "KUMOUE_02_AWASE_04\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_03: - .ascii "KUMOUE_02_AWASE_03\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_02: - .ascii "KUMOUE_02_AWASE_02\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_01: - .ascii "KUMOUE_02_AWASE_01\0\0" -FLAGS_OUTDOORS_KUMOUE_02_CAP_0: - .ascii "KUMOUE_02_CAP_0\0" -FLAGS_OUTDOORS_KUMONOUE_01_KAKERA: - .ascii "KUMONOUE_01_KAKERA\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K6: - .ascii "KUMOUR_01_K6\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K5: - .ascii "KUMOUR_01_K5\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K4: - .ascii "KUMOUR_01_K4\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K3: - .ascii "KUMOUR_01_K3\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K2: - .ascii "KUMOUR_01_K2\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K1: - .ascii "KUMOUR_01_K1\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K0: - .ascii "KUMOUR_01_K0\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T6: - .ascii "KUMOUE_01_T6\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T5: - .ascii "KUMOUE_01_T5\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T4: - .ascii "KUMOUE_01_T4\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T3: - .ascii "KUMOUE_01_T3\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T2: - .ascii "KUMOUE_01_T2\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T1: - .ascii "KUMOUE_01_T1\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T0: - .ascii "KUMOUE_01_T0\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_CAP_0: - .ascii "KUMOUE_01_CAP_0\0" -FLAGS_OUTDOORS_KUMOUE_00_CAP_0: - .ascii "KUMOUE_00_CAP_0\0" -FLAGS_OUTDOORS_MACHI_DOG_C: - .ascii "MACHI_DOG_C\0" -FLAGS_OUTDOORS_MACHI_MES_50: - .ascii "MACHI_MES_50\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_60: - .ascii "MACHI_MES_60\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_40: - .ascii "MACHI_MES_40\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_30: - .ascii "MACHI_MES_30\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_24: - .ascii "MACHI_MES_24\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_23: - .ascii "MACHI_MES_23\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_22: - .ascii "MACHI_MES_22\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_21: - .ascii "MACHI_MES_21\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_20: - .ascii "MACHI_MES_20\0\0\0\0" -FLAGS_OUTDOORS_SHOP05_OPEN: - .ascii "SHOP05_OPEN\0" -FLAGS_OUTDOORS_MACHI_07_BELL: - .ascii "MACHI_07_BELL\0\0\0" -FLAGS_OUTDOORS_MACHI_02_DOG: - .ascii "MACHI_02_DOG\0\0\0\0" -FLAGS_OUTDOORS_MACHI_02_HEISHI: - .ascii "MACHI_02_HEISHI\0" -FLAGS_OUTDOORS_MACHI_01_DEMO: - .ascii "MACHI_01_DEMO\0\0\0" -FLAGS_OUTDOORS_MACHI_00_T01: - .ascii "MACHI_00_T01\0\0\0\0" -FLAGS_OUTDOORS_MACHI_00_T00: - .ascii "MACHI_00_T00\0\0\0\0" -FLAGS_OUTDOORS_MACHI00_03: - .ascii "MACHI00_03\0\0" -FLAGS_OUTDOORS_MACHI00_02: - .ascii "MACHI00_02\0\0" -FLAGS_OUTDOORS_MACHI00_00: - .ascii "MACHI00_00\0\0" -FLAGS_OUTDOORS_MACHI_02_HEISHI_TALK: - .ascii "MACHI_02_HEISHI_TALK\0\0\0\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_Z: - .ascii "KAKERA_TAKARA_Z\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_Y: - .ascii "KAKERA_TAKARA_Y\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_X: - .ascii "KAKERA_TAKARA_X\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_W: - .ascii "KAKERA_TAKARA_W\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_V: - .ascii "KAKERA_TAKARA_V\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_U: - .ascii "KAKERA_TAKARA_U\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_T: - .ascii "KAKERA_TAKARA_T\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_S: - .ascii "KAKERA_TAKARA_S\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_R: - .ascii "KAKERA_TAKARA_R\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_Q: - .ascii "KAKERA_TAKARA_Q\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_P: - .ascii "KAKERA_TAKARA_P\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_O: - .ascii "KAKERA_TAKARA_O\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_N: - .ascii "KAKERA_TAKARA_N\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_M: - .ascii "KAKERA_TAKARA_M\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_L: - .ascii "KAKERA_TAKARA_L\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_K: - .ascii "KAKERA_TAKARA_K\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_E: - .ascii "KAKERA_TAKARA_E\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_A: - .ascii "KAKERA_TAKARA_A\0" -FLAGS_OUTDOORS_BEANDEMO_04: - .ascii "BEANDEMO_04\0" -FLAGS_OUTDOORS_BEANDEMO_03: - .ascii "BEANDEMO_03\0" -FLAGS_OUTDOORS_BEANDEMO_02: - .ascii "BEANDEMO_02\0" -FLAGS_OUTDOORS_BEANDEMO_01: - .ascii "BEANDEMO_01\0" -FLAGS_OUTDOORS_BEANDEMO_00: - .ascii "BEANDEMO_00\0" -FLAGS_OUTDOORS_DAIGORON_EXCHG: - .ascii "DAIGORON_EXCHG\0\0" -FLAGS_OUTDOORS_DAIGORON_SHIELD: - .ascii "DAIGORON_SHIELD\0" -FLAGS_OUTDOORS_SUIGENGORON_00_CAP_0: - .ascii "SUIGENGORON_00_CAP_0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_h1: - .ascii "SUIGEN_00_h1\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_R1: - .ascii "SUIGEN_00_R1\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_R0: - .ascii "SUIGEN_00_R0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_CAP_1: - .ascii "SUIGEN_00_CAP_1\0" -FLAGS_OUTDOORS_SUIGEN_00_CAP_0: - .ascii "SUIGEN_00_CAP_0\0" -FLAGS_OUTDOORS_SUIGEN_00_r2: - .ascii "SUIGEN_00_r2\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_r1: - .ascii "SUIGEN_00_r1\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_r0: - .ascii "SUIGEN_00_r0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_T0: - .ascii "SUIGEN_00_T0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_h0: - .ascii "SUIGEN_00_h0\0\0\0\0" -FLAGS_OUTDOORS_CASTLE_04_MAID_TALK: - .ascii "CASTLE_04_MAID_TALK\0" -FLAGS_OUTDOORS_CASTLE_04_MEZAME: - .ascii "CASTLE_04_MEZAME\0\0\0\0" -FLAGS_OUTDOORS_CASTLE_00_00: - .ascii "CASTLE_00_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_T00: - .ascii "SOUGEN_08_T00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_TORITSUKI: - .ascii "SOUGEN_08_TORITSUKI\0" -FLAGS_OUTDOORS_SOUGEN_08_08: - .ascii "SOUGEN_08_08\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_07: - .ascii "SOUGEN_08_07\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_06: - .ascii "SOUGEN_08_06\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_05: - .ascii "SOUGEN_08_05\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_04: - .ascii "SOUGEN_08_04\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_03: - .ascii "SOUGEN_08_03\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_02: - .ascii "SOUGEN_08_02\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_01: - .ascii "SOUGEN_08_01\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_00: - .ascii "SOUGEN_08_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_H00: - .ascii "SOUGEN_07_H00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_02: - .ascii "SOUGEN_07_02\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_01: - .ascii "SOUGEN_07_01\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_00: - .ascii "SOUGEN_07_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_R1: - .ascii "SOUGEN_06_R1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_SLIDE: - .ascii "SOUGEN_06_SLIDE\0" -FLAGS_OUTDOORS_SOUGEN_06_BENT: - .ascii "SOUGEN_06_BENT\0\0" -FLAGS_OUTDOORS_SOUGEN_06_SAIKAI: - .ascii "SOUGEN_06_SAIKAI\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_AKINDO: - .ascii "SOUGEN_06_AKINDO\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_IWA_0: - .ascii "SOUGEN_06_IWA_0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_4: - .ascii "SOUGEN_06_HIBI_4\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_3: - .ascii "SOUGEN_06_HIBI_3\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_2: - .ascii "SOUGEN_06_HIBI_2\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_1: - .ascii "SOUGEN_06_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_0: - .ascii "SOUGEN_06_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_3: - .ascii "SOUGEN_06_WAKAGI_3\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_2: - .ascii "SOUGEN_06_WAKAGI_2\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_1: - .ascii "SOUGEN_06_WAKAGI_1\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_0: - .ascii "SOUGEN_06_WAKAGI_0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_CAP_0: - .ascii "SOUGEN_05_CAP_0\0" -FLAGS_OUTDOORS_SOUGEN_05_R0: - .ascii "SOUGEN_05_R0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_H00: - .ascii "SOUGEN_05_H00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_BENT: - .ascii "SOUGEN_05_BENT\0\0" -FLAGS_OUTDOORS_SOUGEN_05_IWA02: - .ascii "SOUGEN_05_IWA02\0" -FLAGS_OUTDOORS_SOUGEN_05_01: - .ascii "SOUGEN_05_01\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_00: - .ascii "SOUGEN_05_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_BOMB_00: - .ascii "SOUGEN_05_BOMB_00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_3: - .ascii "SOUGEN_05_HIBI_3\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_2: - .ascii "SOUGEN_05_HIBI_2\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_1: - .ascii "SOUGEN_05_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_0: - .ascii "SOUGEN_05_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_3: - .ascii "SOUGEN_04_HIBI_3\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_2: - .ascii "SOUGEN_04_HIBI_2\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_1: - .ascii "SOUGEN_04_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_0: - .ascii "SOUGEN_04_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_03_BOMBWALL: - .ascii "SOUGEN_03_BOMBWALL\0\0" -FLAGS_OUTDOORS_SOUGEN_02_HIBI_1: - .ascii "SOUGEN_02_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_02_HIBI_0: - .ascii "SOUGEN_02_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_01_ZELDA: - .ascii "SOUGEN_01_ZELDA\0" -FLAGS_OUTDOORS_SOUGEN_01_BENT: - .ascii "SOUGEN_01_BENT\0\0" -FLAGS_OUTDOORS_SOUGEN_01_00: - .ascii "SOUGEN_01_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_12: - .ascii "SOUGEN_01_WAKAGI_12\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_11: - .ascii "SOUGEN_01_WAKAGI_11\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_10: - .ascii "SOUGEN_01_WAKAGI_10\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_9: - .ascii "SOUGEN_01_WAKAGI_9\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_8: - .ascii "SOUGEN_01_WAKAGI_8\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_7: - .ascii "SOUGEN_01_WAKAGI_7\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_6: - .ascii "SOUGEN_01_WAKAGI_6\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_5: - .ascii "SOUGEN_01_WAKAGI_5\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_4: - .ascii "SOUGEN_01_WAKAGI_4\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_3: - .ascii "SOUGEN_01_WAKAGI_3\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_2: - .ascii "SOUGEN_01_WAKAGI_2\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_1: - .ascii "SOUGEN_01_WAKAGI_1\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_0: - .ascii "SOUGEN_01_WAKAGI_0\0\0" -FLAGS_OUTDOORS_HAKA_KEY_GET: - .ascii "HAKA_KEY_GET\0\0\0\0" -FLAGS_OUTDOORS_HAKA_01_T0: - .ascii "HAKA_01_T0\0\0" -FLAGS_OUTDOORS_HAKA_00_BW00: - .ascii "HAKA_00_BW00\0\0\0\0" -FLAGS_OUTDOORS_HAKA_00_CAP_0: - .ascii "HAKA_00_CAP_0\0\0\0" -FLAGS_OUTDOORS_HAKA_BOSEKI_02: - .ascii "HAKA_BOSEKI_02\0\0" -FLAGS_OUTDOORS_HAKA_BOSEKI_01: - .ascii "HAKA_BOSEKI_01\0\0" -FLAGS_OUTDOORS_HAKA_BOSEKI_00: - .ascii "HAKA_BOSEKI_00\0\0" -FLAGS_OUTDOORS_HAKA_BUNSHIN_00: - .ascii "HAKA_BUNSHIN_00\0" -FLAGS_OUTDOORS_YAMA_04_BOMBWALL0: - .ascii "YAMA_04_BOMBWALL0\0\0\0" -FLAGS_OUTDOORS_YAMA_04_ANAHOUSHI: - .ascii "YAMA_04_ANAHOUSHI\0\0\0" -FLAGS_OUTDOORS_YAMA_04_ENTHOUSHI: - .ascii "YAMA_04_ENTHOUSHI\0\0\0" -FLAGS_OUTDOORS_YAMA_04_06: - .ascii "YAMA_04_06\0\0" -FLAGS_OUTDOORS_YAMA_04_05: - .ascii "YAMA_04_05\0\0" -FLAGS_OUTDOORS_YAMA_04_04: - .ascii "YAMA_04_04\0\0" -FLAGS_OUTDOORS_YAMA_04_01: - .ascii "YAMA_04_01\0\0" -FLAGS_OUTDOORS_YAMA_04_00: - .ascii "YAMA_04_00\0\0" -FLAGS_OUTDOORS_YAMA_04_HIBI_1: - .ascii "YAMA_04_HIBI_1\0\0" -FLAGS_OUTDOORS_YAMA_04_HIBI_0: - .ascii "YAMA_04_HIBI_0\0\0" -FLAGS_OUTDOORS_YAMA_04_R00: - .ascii "YAMA_04_R00\0" -FLAGS_OUTDOORS_YAMA_04_CAP_0: - .ascii "YAMA_04_CAP_0\0\0\0" -FLAGS_OUTDOORS_YAMA_03_DOKU_2: - .ascii "YAMA_03_DOKU_2\0\0" -FLAGS_OUTDOORS_YAMA_03_DOKU_1: - .ascii "YAMA_03_DOKU_1\0\0" -FLAGS_OUTDOORS_YAMA_03_DOKU_0: - .ascii "YAMA_03_DOKU_0\0\0" -FLAGS_OUTDOORS_YAMA_03_02: - .ascii "YAMA_03_02\0\0" -FLAGS_OUTDOORS_YAMA_03_01: - .ascii "YAMA_03_01\0\0" -FLAGS_OUTDOORS_YAMA_03_00: - .ascii "YAMA_03_00\0\0" -FLAGS_OUTDOORS_YAMA_02_00: - .ascii "YAMA_02_00\0\0" -FLAGS_OUTDOORS_YAMA_01_BW00: - .ascii "YAMA_01_BW00\0\0\0\0" -FLAGS_OUTDOORS_YAMA_00_01: - .ascii "YAMA_00_01\0\0" -FLAGS_OUTDOORS_YAMA_00_00: - .ascii "YAMA_00_00\0\0" -FLAGS_OUTDOORS_MORI_ENTRANCE_1ST: - .ascii "MORI_ENTRANCE_1ST\0\0\0" -FLAGS_OUTDOORS_MORI_00_H1: - .ascii "MORI_00_H1\0\0" -FLAGS_OUTDOORS_MORI_00_H0: - .ascii "MORI_00_H0\0\0" -FLAGS_OUTDOORS_MORI_00_KOBITO: - .ascii "MORI_00_KOBITO\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_4: - .ascii "MORI_00_HIBI_4\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_3: - .ascii "MORI_00_HIBI_3\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_2: - .ascii "MORI_00_HIBI_2\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_1: - .ascii "MORI_00_HIBI_1\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_0: - .ascii "MORI_00_HIBI_0\0\0" -FLAGS_OUTDOORS_LOST_05_T1: - .ascii "LOST_05_T1\0\0" -FLAGS_OUTDOORS_LOST_05_T0: - .ascii "LOST_05_T0\0\0" -FLAGS_OUTDOORS_LOST_05_01: - .ascii "LOST_05_01\0\0" -FLAGS_OUTDOORS_LOST_05_00: - .ascii "LOST_05_00\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA4: - .ascii "LOST_04_SIBA4\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA3: - .ascii "LOST_04_SIBA3\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA2: - .ascii "LOST_04_SIBA2\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA1: - .ascii "LOST_04_SIBA1\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA0: - .ascii "LOST_04_SIBA0\0\0\0" -FLAGS_OUTDOORS_LOST_04_00: - .ascii "LOST_04_00\0\0" -FLAGS_OUTDOORS_LOST_03_T0: - .ascii "LOST_03_T0\0\0" -FLAGS_OUTDOORS_LOST_03_00: - .ascii "LOST_03_00\0\0" -FLAGS_OUTDOORS_LOST_02_00: - .ascii "LOST_02_00\0\0" -FLAGS_OUTDOORS_LOST_00_01: - .ascii "LOST_00_01\0\0" -FLAGS_OUTDOORS_LOST_00_00: - .ascii "LOST_00_00\0\0" -FLAGS_OUTDOORS_LOST_00_ENTER: - .ascii "LOST_00_ENTER\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_M2: - .ascii "HIKYOU_00_M2\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_M1: - .ascii "HIKYOU_00_M1\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_M0: - .ascii "HIKYOU_00_M0\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_H00: - .ascii "HIKYOU_00_H00\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_BOSEKI: - .ascii "HIKYOU_00_BOSEKI\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_14: - .ascii "HIKYOU_00_14\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_SEKIZOU: - .ascii "HIKYOU_00_SEKIZOU\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_CAP_2: - .ascii "HIKYOU_00_CAP_2\0" -FLAGS_OUTDOORS_HIKYOU_00_CAP_1: - .ascii "HIKYOU_00_CAP_1\0" -FLAGS_OUTDOORS_HIKYOU_00_CAP_0: - .ascii "HIKYOU_00_CAP_0\0" -FLAGS_OUTDOORS_HIKYOU_00_04: - .ascii "HIKYOU_00_04\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_03: - .ascii "HIKYOU_00_03\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_02: - .ascii "HIKYOU_00_02\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_01: - .ascii "HIKYOU_00_01\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_00: - .ascii "HIKYOU_00_00\0\0\0\0" -FLAGS_OUTDOORS_NAKANIWA_00_EZERO: - .ascii "NAKANIWA_00_EZERO\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_CAP_0: - .ascii "MAENIWA_00_CAP_0\0\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_T1: - .ascii "MAENIWA_00_T1\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_T0: - .ascii "MAENIWA_00_T0\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_WARP: - .ascii "MAENIWA_00_WARP\0" -FLAGS_OUTDOORS_MAENIWA_00_BENT: - .ascii "MAENIWA_00_BENT\0" -FLAGS_OUTDOORS_MAENIWA_00_02: - .ascii "MAENIWA_00_02\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_01: - .ascii "MAENIWA_00_01\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_00: - .ascii "MAENIWA_00_00\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_T1: - .ascii "HIKYOU_00_T1\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_T0: - .ascii "HIKYOU_00_T0\0\0\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_H02: - .ascii "MIZUUMI_00_H02\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_H01: - .ascii "MIZUUMI_00_H01\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_H00: - .ascii "MIZUUMI_00_H00\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_00: - .ascii "MIZUUMI_00_00\0\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_BENT: - .ascii "MIZUUMI_00_BENT\0" -FLAGS_OUTDOORS_LV5_CLEAR_MES: - .ascii "LV5_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV4_CLEAR_MES: - .ascii "LV4_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV3_CLEAR_MES: - .ascii "LV3_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV2_CLEAR_MES: - .ascii "LV2_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV1_CLEAR_MES: - .ascii "LV1_CLEAR_MES\0\0\0" -.else - -.ifdef DEMO_JP -@ TODO nearly same as JP, deduplicate -FLAGS_OUTDOORS: - .4byte ENUM_BEGIN - .4byte FLAGS_OUTDOORS_LV1_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV2_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV3_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV4_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV5_CLEAR_MES - .4byte FLAGS_OUTDOORS_MIZUUMI_00_BENT - .4byte FLAGS_OUTDOORS_MIZUUMI_00_00 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_H00 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_H01 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_H02 - .4byte FLAGS_OUTDOORS_HIKYOU_00_T0 - .4byte FLAGS_OUTDOORS_HIKYOU_00_T1 - .4byte FLAGS_OUTDOORS_MAENIWA_00_00 - .4byte FLAGS_OUTDOORS_MAENIWA_00_01 - .4byte FLAGS_OUTDOORS_MAENIWA_00_02 - .4byte FLAGS_OUTDOORS_MAENIWA_00_BENT - .4byte FLAGS_OUTDOORS_MAENIWA_00_WARP - .4byte FLAGS_OUTDOORS_MAENIWA_00_T0 - .4byte FLAGS_OUTDOORS_MAENIWA_00_T1 - .4byte FLAGS_OUTDOORS_MAENIWA_00_CAP_0 - .4byte FLAGS_OUTDOORS_NAKANIWA_00_EZERO - .4byte FLAGS_OUTDOORS_HIKYOU_00_00 - .4byte FLAGS_OUTDOORS_HIKYOU_00_01 - .4byte FLAGS_OUTDOORS_HIKYOU_00_02 - .4byte FLAGS_OUTDOORS_HIKYOU_00_03 - .4byte FLAGS_OUTDOORS_HIKYOU_00_04 - .4byte FLAGS_OUTDOORS_HIKYOU_00_CAP_0 - .4byte FLAGS_OUTDOORS_HIKYOU_00_CAP_1 - .4byte FLAGS_OUTDOORS_HIKYOU_00_CAP_2 - .4byte FLAGS_OUTDOORS_HIKYOU_00_SEKIZOU - .4byte FLAGS_OUTDOORS_HIKYOU_00_14 - .4byte FLAGS_OUTDOORS_HIKYOU_00_BOSEKI - .4byte FLAGS_OUTDOORS_HIKYOU_00_H00 - .4byte FLAGS_OUTDOORS_HIKYOU_00_M0 - .4byte FLAGS_OUTDOORS_HIKYOU_00_M1 - .4byte FLAGS_OUTDOORS_HIKYOU_00_M2 - .4byte FLAGS_OUTDOORS_LOST_00_ENTER - .4byte FLAGS_OUTDOORS_LOST_00_00 - .4byte FLAGS_OUTDOORS_LOST_00_01 - .4byte FLAGS_OUTDOORS_LOST_02_00 - .4byte FLAGS_OUTDOORS_LOST_03_00 - .4byte FLAGS_OUTDOORS_LOST_03_T0 - .4byte FLAGS_OUTDOORS_LOST_04_00 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA0 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA1 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA2 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA3 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA4 - .4byte FLAGS_OUTDOORS_LOST_05_00 - .4byte FLAGS_OUTDOORS_LOST_05_01 - .4byte FLAGS_OUTDOORS_LOST_05_T0 - .4byte FLAGS_OUTDOORS_LOST_05_T1 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_0 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_1 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_2 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_3 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_4 - .4byte FLAGS_OUTDOORS_MORI_00_KOBITO - .4byte FLAGS_OUTDOORS_MORI_00_H0 - .4byte FLAGS_OUTDOORS_MORI_00_H1 - .4byte FLAGS_OUTDOORS_MORI_ENTRANCE_1ST - .4byte FLAGS_OUTDOORS_YAMA_00_00 - .4byte FLAGS_OUTDOORS_YAMA_00_01 - .4byte FLAGS_OUTDOORS_YAMA_01_BW00 - .4byte FLAGS_OUTDOORS_YAMA_02_00 - .4byte FLAGS_OUTDOORS_YAMA_03_00 - .4byte FLAGS_OUTDOORS_YAMA_03_01 - .4byte FLAGS_OUTDOORS_YAMA_03_02 - .4byte FLAGS_OUTDOORS_YAMA_03_DOKU_0 - .4byte FLAGS_OUTDOORS_YAMA_03_DOKU_1 - .4byte FLAGS_OUTDOORS_YAMA_03_DOKU_2 - .4byte FLAGS_OUTDOORS_YAMA_04_CAP_0 - .4byte FLAGS_OUTDOORS_YAMA_04_R00 - .4byte FLAGS_OUTDOORS_YAMA_04_HIBI_0 - .4byte FLAGS_OUTDOORS_YAMA_04_HIBI_1 - .4byte FLAGS_OUTDOORS_YAMA_04_00 - .4byte FLAGS_OUTDOORS_YAMA_04_01 - .4byte FLAGS_OUTDOORS_YAMA_04_04 - .4byte FLAGS_OUTDOORS_YAMA_04_05 - .4byte FLAGS_OUTDOORS_YAMA_04_06 - .4byte FLAGS_OUTDOORS_YAMA_04_ENTHOUSHI - .4byte FLAGS_OUTDOORS_YAMA_04_ANAHOUSHI - .4byte FLAGS_OUTDOORS_YAMA_04_BOMBWALL0 - .4byte FLAGS_OUTDOORS_HAKA_BUNSHIN_00 - .4byte FLAGS_OUTDOORS_HAKA_BOSEKI_00 - .4byte FLAGS_OUTDOORS_HAKA_BOSEKI_01 - .4byte FLAGS_OUTDOORS_HAKA_BOSEKI_02 - .4byte FLAGS_OUTDOORS_HAKA_00_CAP_0 - .4byte FLAGS_OUTDOORS_HAKA_00_BW00 - .4byte FLAGS_OUTDOORS_HAKA_01_T0 - .4byte FLAGS_OUTDOORS_HAKA_KEY_GET - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_4 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_5 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_6 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_7 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_8 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_9 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_10 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_11 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_12 - .4byte FLAGS_OUTDOORS_SOUGEN_01_00 - .4byte FLAGS_OUTDOORS_SOUGEN_01_BENT - .4byte FLAGS_OUTDOORS_SOUGEN_01_ZELDA - .4byte FLAGS_OUTDOORS_SOUGEN_02_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_02_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_03_BOMBWALL - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_05_BOMB_00 - .4byte FLAGS_OUTDOORS_SOUGEN_05_00 - .4byte FLAGS_OUTDOORS_SOUGEN_05_01 - .4byte FLAGS_OUTDOORS_SOUGEN_05_IWA02 - .4byte FLAGS_OUTDOORS_SOUGEN_05_BENT - .4byte FLAGS_OUTDOORS_SOUGEN_05_H00 - .4byte FLAGS_OUTDOORS_SOUGEN_05_R0 - .4byte FLAGS_OUTDOORS_SOUGEN_05_CAP_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_4 - .4byte FLAGS_OUTDOORS_SOUGEN_06_IWA_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_AKINDO - .4byte FLAGS_OUTDOORS_SOUGEN_06_SAIKAI - .4byte FLAGS_OUTDOORS_SOUGEN_06_BENT - .4byte FLAGS_OUTDOORS_SOUGEN_06_SLIDE - .4byte FLAGS_OUTDOORS_SOUGEN_06_R1 - .4byte FLAGS_OUTDOORS_SOUGEN_07_00 - .4byte FLAGS_OUTDOORS_SOUGEN_07_01 - .4byte FLAGS_OUTDOORS_SOUGEN_07_02 - .4byte FLAGS_OUTDOORS_SOUGEN_07_H00 - .4byte FLAGS_OUTDOORS_SOUGEN_08_00 - .4byte FLAGS_OUTDOORS_SOUGEN_08_01 - .4byte FLAGS_OUTDOORS_SOUGEN_08_02 - .4byte FLAGS_OUTDOORS_SOUGEN_08_03 - .4byte FLAGS_OUTDOORS_SOUGEN_08_04 - .4byte FLAGS_OUTDOORS_SOUGEN_08_05 - .4byte FLAGS_OUTDOORS_SOUGEN_08_06 - .4byte FLAGS_OUTDOORS_SOUGEN_08_07 - .4byte FLAGS_OUTDOORS_SOUGEN_08_08 - .4byte FLAGS_OUTDOORS_SOUGEN_08_TORITSUKI - .4byte FLAGS_OUTDOORS_SOUGEN_08_T00 - .4byte FLAGS_OUTDOORS_CASTLE_00_00 - .4byte FLAGS_OUTDOORS_CASTLE_04_MEZAME - .4byte FLAGS_OUTDOORS_CASTLE_04_MAID_TALK - .4byte FLAGS_OUTDOORS_SUIGEN_00_h0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_T0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_r0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_r1 - .4byte FLAGS_OUTDOORS_SUIGEN_00_r2 - .4byte FLAGS_OUTDOORS_SUIGEN_00_CAP_0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_CAP_1 - .4byte FLAGS_OUTDOORS_SUIGEN_00_R0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_R1 - .4byte FLAGS_OUTDOORS_SUIGEN_00_h1 - .4byte FLAGS_OUTDOORS_SUIGENGORON_00_CAP_0 - .4byte FLAGS_OUTDOORS_DAIGORON_SHIELD - .4byte FLAGS_OUTDOORS_DAIGORON_EXCHG - .4byte FLAGS_OUTDOORS_BEANDEMO_00 - .4byte FLAGS_OUTDOORS_BEANDEMO_01 - .4byte FLAGS_OUTDOORS_BEANDEMO_02 - .4byte FLAGS_OUTDOORS_BEANDEMO_03 - .4byte FLAGS_OUTDOORS_BEANDEMO_04 - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_A - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_E - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_K - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_L - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_M - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_N - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_O - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_P - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_Q - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_R - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_S - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_T - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_U - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_V - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_W - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_X - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_Y - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_Z - .4byte FLAGS_OUTDOORS_MACHI_02_HEISHI_TALK - .4byte FLAGS_OUTDOORS_MACHI00_00 - .4byte FLAGS_OUTDOORS_MACHI00_02 - .4byte FLAGS_OUTDOORS_MACHI00_03 - .4byte FLAGS_OUTDOORS_MACHI_00_T00 - .4byte FLAGS_OUTDOORS_MACHI_00_T01 - .4byte FLAGS_OUTDOORS_MACHI_01_DEMO - .4byte FLAGS_OUTDOORS_MACHI_02_HEISHI - .4byte FLAGS_OUTDOORS_MACHI_02_DOG - .4byte FLAGS_OUTDOORS_MACHI_07_BELL - .4byte FLAGS_OUTDOORS_SHOP05_OPEN - .4byte FLAGS_OUTDOORS_MACHI_MES_20 - .4byte FLAGS_OUTDOORS_MACHI_MES_21 - .4byte FLAGS_OUTDOORS_MACHI_MES_22 - .4byte FLAGS_OUTDOORS_MACHI_MES_23 - .4byte FLAGS_OUTDOORS_MACHI_MES_24 - .4byte FLAGS_OUTDOORS_MACHI_MES_30 - .4byte FLAGS_OUTDOORS_MACHI_MES_40 - .4byte FLAGS_OUTDOORS_MACHI_MES_60 - .4byte FLAGS_OUTDOORS_MACHI_MES_50 - .4byte FLAGS_OUTDOORS_MACHI_DOG_C - .4byte FLAGS_OUTDOORS_KUMOUE_00_CAP_0 - .4byte FLAGS_OUTDOORS_KUMOUE_01_CAP_0 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T0 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T1 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T2 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T3 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T4 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T5 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T6 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K0 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K1 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K2 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K3 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K4 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K5 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K6 - .4byte FLAGS_OUTDOORS_KUMONOUE_01_KAKERA - .4byte FLAGS_OUTDOORS_KUMOUE_02_CAP_0 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_01 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_02 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_03 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_04 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_05 - .4byte FLAGS_OUTDOORS_KUMOUE_02_00 - .4byte FLAGS_OUTDOORS_KUMOUE_02_01 - .4byte FLAGS_OUTDOORS_KUMOUE_02_02 - .4byte FLAGS_OUTDOORS_KUMOUE_02_03 - .4byte FLAGS_OUTDOORS_KUMOUE_UNCLE_TALK - .4byte FLAGS_OUTDOORS_KUMOUE_GIRL_TALK - .4byte FLAGS_OUTDOORS_MIZUUMI_00_CAP_0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_R2 - .4byte FLAGS_OUTDOORS_YAMA_04_CAP_1 - .4byte FLAGS_OUTDOORS_LOST_05_02 - .4byte FLAGS_OUTDOORS_LOST_05_03 - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_J -.ifdef DEMO_JP - .4byte FLAGS_OUTDOORS_KS_WARPUSE -.endif - .4byte ENUM_END - -.ifdef DEMO_JP -FLAGS_OUTDOORS_KS_WARPUSE: - .ascii "KS_WARPUSE\0\0" -.endif -FLAGS_OUTDOORS_KAKERA_TAKARA_J: - .ascii "KAKERA_TAKARA_J\0" -FLAGS_OUTDOORS_LOST_05_03: - .ascii "LOST_05_03\0\0" -FLAGS_OUTDOORS_LOST_05_02: - .ascii "LOST_05_02\0\0" -FLAGS_OUTDOORS_YAMA_04_CAP_1: - .ascii "YAMA_04_CAP_1\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_R2: - .ascii "SUIGEN_00_R2\0\0\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_CAP_0: - .ascii "MIZUUMI_00_CAP_0\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_GIRL_TALK: - .ascii "KUMOUE_GIRL_TALK\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_UNCLE_TALK: - .ascii "KUMOUE_UNCLE_TALK\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_03: - .ascii "KUMOUE_02_03\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_02: - .ascii "KUMOUE_02_02\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_01: - .ascii "KUMOUE_02_01\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_00: - .ascii "KUMOUE_02_00\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_05: - .ascii "KUMOUE_02_AWASE_05\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_04: - .ascii "KUMOUE_02_AWASE_04\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_03: - .ascii "KUMOUE_02_AWASE_03\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_02: - .ascii "KUMOUE_02_AWASE_02\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_01: - .ascii "KUMOUE_02_AWASE_01\0\0" -FLAGS_OUTDOORS_KUMOUE_02_CAP_0: - .ascii "KUMOUE_02_CAP_0\0" -FLAGS_OUTDOORS_KUMONOUE_01_KAKERA: - .ascii "KUMONOUE_01_KAKERA\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K6: - .ascii "KUMOUR_01_K6\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K5: - .ascii "KUMOUR_01_K5\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K4: - .ascii "KUMOUR_01_K4\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K3: - .ascii "KUMOUR_01_K3\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K2: - .ascii "KUMOUR_01_K2\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K1: - .ascii "KUMOUR_01_K1\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K0: - .ascii "KUMOUR_01_K0\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T6: - .ascii "KUMOUE_01_T6\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T5: - .ascii "KUMOUE_01_T5\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T4: - .ascii "KUMOUE_01_T4\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T3: - .ascii "KUMOUE_01_T3\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T2: - .ascii "KUMOUE_01_T2\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T1: - .ascii "KUMOUE_01_T1\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T0: - .ascii "KUMOUE_01_T0\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_CAP_0: - .ascii "KUMOUE_01_CAP_0\0" -FLAGS_OUTDOORS_KUMOUE_00_CAP_0: - .ascii "KUMOUE_00_CAP_0\0" -FLAGS_OUTDOORS_MACHI_DOG_C: - .ascii "MACHI_DOG_C\0" -FLAGS_OUTDOORS_MACHI_MES_50: - .ascii "MACHI_MES_50\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_60: - .ascii "MACHI_MES_60\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_40: - .ascii "MACHI_MES_40\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_30: - .ascii "MACHI_MES_30\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_24: - .ascii "MACHI_MES_24\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_23: - .ascii "MACHI_MES_23\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_22: - .ascii "MACHI_MES_22\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_21: - .ascii "MACHI_MES_21\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_20: - .ascii "MACHI_MES_20\0\0\0\0" -FLAGS_OUTDOORS_SHOP05_OPEN: - .ascii "SHOP05_OPEN\0" -FLAGS_OUTDOORS_MACHI_07_BELL: - .ascii "MACHI_07_BELL\0\0\0" -FLAGS_OUTDOORS_MACHI_02_DOG: - .ascii "MACHI_02_DOG\0\0\0\0" -FLAGS_OUTDOORS_MACHI_02_HEISHI: - .ascii "MACHI_02_HEISHI\0" -FLAGS_OUTDOORS_MACHI_01_DEMO: - .ascii "MACHI_01_DEMO\0\0\0" -FLAGS_OUTDOORS_MACHI_00_T01: - .ascii "MACHI_00_T01\0\0\0\0" -FLAGS_OUTDOORS_MACHI_00_T00: - .ascii "MACHI_00_T00\0\0\0\0" -FLAGS_OUTDOORS_MACHI00_03: - .ascii "MACHI00_03\0\0" -FLAGS_OUTDOORS_MACHI00_02: - .ascii "MACHI00_02\0\0" -FLAGS_OUTDOORS_MACHI00_00: - .ascii "MACHI00_00\0\0" -FLAGS_OUTDOORS_MACHI_02_HEISHI_TALK: - .ascii "MACHI_02_HEISHI_TALK\0\0\0\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_Z: - .ascii "KAKERA_TAKARA_Z\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_Y: - .ascii "KAKERA_TAKARA_Y\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_X: - .ascii "KAKERA_TAKARA_X\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_W: - .ascii "KAKERA_TAKARA_W\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_V: - .ascii "KAKERA_TAKARA_V\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_U: - .ascii "KAKERA_TAKARA_U\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_T: - .ascii "KAKERA_TAKARA_T\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_S: - .ascii "KAKERA_TAKARA_S\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_R: - .ascii "KAKERA_TAKARA_R\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_Q: - .ascii "KAKERA_TAKARA_Q\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_P: - .ascii "KAKERA_TAKARA_P\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_O: - .ascii "KAKERA_TAKARA_O\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_N: - .ascii "KAKERA_TAKARA_N\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_M: - .ascii "KAKERA_TAKARA_M\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_L: - .ascii "KAKERA_TAKARA_L\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_K: - .ascii "KAKERA_TAKARA_K\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_E: - .ascii "KAKERA_TAKARA_E\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_A: - .ascii "KAKERA_TAKARA_A\0" -FLAGS_OUTDOORS_BEANDEMO_04: - .ascii "BEANDEMO_04\0" -FLAGS_OUTDOORS_BEANDEMO_03: - .ascii "BEANDEMO_03\0" -FLAGS_OUTDOORS_BEANDEMO_02: - .ascii "BEANDEMO_02\0" -FLAGS_OUTDOORS_BEANDEMO_01: - .ascii "BEANDEMO_01\0" -FLAGS_OUTDOORS_BEANDEMO_00: - .ascii "BEANDEMO_00\0" -FLAGS_OUTDOORS_DAIGORON_EXCHG: - .ascii "DAIGORON_EXCHG\0\0" -FLAGS_OUTDOORS_DAIGORON_SHIELD: - .ascii "DAIGORON_SHIELD\0" -FLAGS_OUTDOORS_SUIGENGORON_00_CAP_0: - .ascii "SUIGENGORON_00_CAP_0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_h1: - .ascii "SUIGEN_00_h1\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_R1: - .ascii "SUIGEN_00_R1\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_R0: - .ascii "SUIGEN_00_R0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_CAP_1: - .ascii "SUIGEN_00_CAP_1\0" -FLAGS_OUTDOORS_SUIGEN_00_CAP_0: - .ascii "SUIGEN_00_CAP_0\0" -FLAGS_OUTDOORS_SUIGEN_00_r2: - .ascii "SUIGEN_00_r2\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_r1: - .ascii "SUIGEN_00_r1\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_r0: - .ascii "SUIGEN_00_r0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_T0: - .ascii "SUIGEN_00_T0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_h0: - .ascii "SUIGEN_00_h0\0\0\0\0" -FLAGS_OUTDOORS_CASTLE_04_MAID_TALK: - .ascii "CASTLE_04_MAID_TALK\0" -FLAGS_OUTDOORS_CASTLE_04_MEZAME: - .ascii "CASTLE_04_MEZAME\0\0\0\0" -FLAGS_OUTDOORS_CASTLE_00_00: - .ascii "CASTLE_00_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_T00: - .ascii "SOUGEN_08_T00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_TORITSUKI: - .ascii "SOUGEN_08_TORITSUKI\0" -FLAGS_OUTDOORS_SOUGEN_08_08: - .ascii "SOUGEN_08_08\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_07: - .ascii "SOUGEN_08_07\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_06: - .ascii "SOUGEN_08_06\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_05: - .ascii "SOUGEN_08_05\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_04: - .ascii "SOUGEN_08_04\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_03: - .ascii "SOUGEN_08_03\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_02: - .ascii "SOUGEN_08_02\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_01: - .ascii "SOUGEN_08_01\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_00: - .ascii "SOUGEN_08_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_H00: - .ascii "SOUGEN_07_H00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_02: - .ascii "SOUGEN_07_02\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_01: - .ascii "SOUGEN_07_01\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_00: - .ascii "SOUGEN_07_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_R1: - .ascii "SOUGEN_06_R1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_SLIDE: - .ascii "SOUGEN_06_SLIDE\0" -FLAGS_OUTDOORS_SOUGEN_06_BENT: - .ascii "SOUGEN_06_BENT\0\0" -FLAGS_OUTDOORS_SOUGEN_06_SAIKAI: - .ascii "SOUGEN_06_SAIKAI\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_AKINDO: - .ascii "SOUGEN_06_AKINDO\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_IWA_0: - .ascii "SOUGEN_06_IWA_0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_4: - .ascii "SOUGEN_06_HIBI_4\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_3: - .ascii "SOUGEN_06_HIBI_3\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_2: - .ascii "SOUGEN_06_HIBI_2\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_1: - .ascii "SOUGEN_06_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_0: - .ascii "SOUGEN_06_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_3: - .ascii "SOUGEN_06_WAKAGI_3\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_2: - .ascii "SOUGEN_06_WAKAGI_2\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_1: - .ascii "SOUGEN_06_WAKAGI_1\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_0: - .ascii "SOUGEN_06_WAKAGI_0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_CAP_0: - .ascii "SOUGEN_05_CAP_0\0" -FLAGS_OUTDOORS_SOUGEN_05_R0: - .ascii "SOUGEN_05_R0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_H00: - .ascii "SOUGEN_05_H00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_BENT: - .ascii "SOUGEN_05_BENT\0\0" -FLAGS_OUTDOORS_SOUGEN_05_IWA02: - .ascii "SOUGEN_05_IWA02\0" -FLAGS_OUTDOORS_SOUGEN_05_01: - .ascii "SOUGEN_05_01\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_00: - .ascii "SOUGEN_05_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_BOMB_00: - .ascii "SOUGEN_05_BOMB_00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_3: - .ascii "SOUGEN_05_HIBI_3\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_2: - .ascii "SOUGEN_05_HIBI_2\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_1: - .ascii "SOUGEN_05_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_0: - .ascii "SOUGEN_05_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_3: - .ascii "SOUGEN_04_HIBI_3\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_2: - .ascii "SOUGEN_04_HIBI_2\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_1: - .ascii "SOUGEN_04_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_0: - .ascii "SOUGEN_04_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_03_BOMBWALL: - .ascii "SOUGEN_03_BOMBWALL\0\0" -FLAGS_OUTDOORS_SOUGEN_02_HIBI_1: - .ascii "SOUGEN_02_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_02_HIBI_0: - .ascii "SOUGEN_02_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_01_ZELDA: - .ascii "SOUGEN_01_ZELDA\0" -FLAGS_OUTDOORS_SOUGEN_01_BENT: - .ascii "SOUGEN_01_BENT\0\0" -FLAGS_OUTDOORS_SOUGEN_01_00: - .ascii "SOUGEN_01_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_12: - .ascii "SOUGEN_01_WAKAGI_12\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_11: - .ascii "SOUGEN_01_WAKAGI_11\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_10: - .ascii "SOUGEN_01_WAKAGI_10\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_9: - .ascii "SOUGEN_01_WAKAGI_9\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_8: - .ascii "SOUGEN_01_WAKAGI_8\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_7: - .ascii "SOUGEN_01_WAKAGI_7\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_6: - .ascii "SOUGEN_01_WAKAGI_6\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_5: - .ascii "SOUGEN_01_WAKAGI_5\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_4: - .ascii "SOUGEN_01_WAKAGI_4\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_3: - .ascii "SOUGEN_01_WAKAGI_3\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_2: - .ascii "SOUGEN_01_WAKAGI_2\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_1: - .ascii "SOUGEN_01_WAKAGI_1\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_0: - .ascii "SOUGEN_01_WAKAGI_0\0\0" -FLAGS_OUTDOORS_HAKA_KEY_GET: - .ascii "HAKA_KEY_GET\0\0\0\0" -FLAGS_OUTDOORS_HAKA_01_T0: - .ascii "HAKA_01_T0\0\0" -FLAGS_OUTDOORS_HAKA_00_BW00: - .ascii "HAKA_00_BW00\0\0\0\0" -FLAGS_OUTDOORS_HAKA_00_CAP_0: - .ascii "HAKA_00_CAP_0\0\0\0" -FLAGS_OUTDOORS_HAKA_BOSEKI_02: - .ascii "HAKA_BOSEKI_02\0\0" -FLAGS_OUTDOORS_HAKA_BOSEKI_01: - .ascii "HAKA_BOSEKI_01\0\0" -FLAGS_OUTDOORS_HAKA_BOSEKI_00: - .ascii "HAKA_BOSEKI_00\0\0" -FLAGS_OUTDOORS_HAKA_BUNSHIN_00: - .ascii "HAKA_BUNSHIN_00\0" -FLAGS_OUTDOORS_YAMA_04_BOMBWALL0: - .ascii "YAMA_04_BOMBWALL0\0\0\0" -FLAGS_OUTDOORS_YAMA_04_ANAHOUSHI: - .ascii "YAMA_04_ANAHOUSHI\0\0\0" -FLAGS_OUTDOORS_YAMA_04_ENTHOUSHI: - .ascii "YAMA_04_ENTHOUSHI\0\0\0" -FLAGS_OUTDOORS_YAMA_04_06: - .ascii "YAMA_04_06\0\0" -FLAGS_OUTDOORS_YAMA_04_05: - .ascii "YAMA_04_05\0\0" -FLAGS_OUTDOORS_YAMA_04_04: - .ascii "YAMA_04_04\0\0" -FLAGS_OUTDOORS_YAMA_04_01: - .ascii "YAMA_04_01\0\0" -FLAGS_OUTDOORS_YAMA_04_00: - .ascii "YAMA_04_00\0\0" -FLAGS_OUTDOORS_YAMA_04_HIBI_1: - .ascii "YAMA_04_HIBI_1\0\0" -FLAGS_OUTDOORS_YAMA_04_HIBI_0: - .ascii "YAMA_04_HIBI_0\0\0" -FLAGS_OUTDOORS_YAMA_04_R00: - .ascii "YAMA_04_R00\0" -FLAGS_OUTDOORS_YAMA_04_CAP_0: - .ascii "YAMA_04_CAP_0\0\0\0" -FLAGS_OUTDOORS_YAMA_03_DOKU_2: - .ascii "YAMA_03_DOKU_2\0\0" -FLAGS_OUTDOORS_YAMA_03_DOKU_1: - .ascii "YAMA_03_DOKU_1\0\0" -FLAGS_OUTDOORS_YAMA_03_DOKU_0: - .ascii "YAMA_03_DOKU_0\0\0" -FLAGS_OUTDOORS_YAMA_03_02: - .ascii "YAMA_03_02\0\0" -FLAGS_OUTDOORS_YAMA_03_01: - .ascii "YAMA_03_01\0\0" -FLAGS_OUTDOORS_YAMA_03_00: - .ascii "YAMA_03_00\0\0" -FLAGS_OUTDOORS_YAMA_02_00: - .ascii "YAMA_02_00\0\0" -FLAGS_OUTDOORS_YAMA_01_BW00: - .ascii "YAMA_01_BW00\0\0\0\0" -FLAGS_OUTDOORS_YAMA_00_01: - .ascii "YAMA_00_01\0\0" -FLAGS_OUTDOORS_YAMA_00_00: - .ascii "YAMA_00_00\0\0" -FLAGS_OUTDOORS_MORI_ENTRANCE_1ST: - .ascii "MORI_ENTRANCE_1ST\0\0\0" -FLAGS_OUTDOORS_MORI_00_H1: - .ascii "MORI_00_H1\0\0" -FLAGS_OUTDOORS_MORI_00_H0: - .ascii "MORI_00_H0\0\0" -FLAGS_OUTDOORS_MORI_00_KOBITO: - .ascii "MORI_00_KOBITO\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_4: - .ascii "MORI_00_HIBI_4\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_3: - .ascii "MORI_00_HIBI_3\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_2: - .ascii "MORI_00_HIBI_2\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_1: - .ascii "MORI_00_HIBI_1\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_0: - .ascii "MORI_00_HIBI_0\0\0" -FLAGS_OUTDOORS_LOST_05_T1: - .ascii "LOST_05_T1\0\0" -FLAGS_OUTDOORS_LOST_05_T0: - .ascii "LOST_05_T0\0\0" -FLAGS_OUTDOORS_LOST_05_01: - .ascii "LOST_05_01\0\0" -FLAGS_OUTDOORS_LOST_05_00: - .ascii "LOST_05_00\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA4: - .ascii "LOST_04_SIBA4\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA3: - .ascii "LOST_04_SIBA3\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA2: - .ascii "LOST_04_SIBA2\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA1: - .ascii "LOST_04_SIBA1\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA0: - .ascii "LOST_04_SIBA0\0\0\0" -FLAGS_OUTDOORS_LOST_04_00: - .ascii "LOST_04_00\0\0" -FLAGS_OUTDOORS_LOST_03_T0: - .ascii "LOST_03_T0\0\0" -FLAGS_OUTDOORS_LOST_03_00: - .ascii "LOST_03_00\0\0" -FLAGS_OUTDOORS_LOST_02_00: - .ascii "LOST_02_00\0\0" -FLAGS_OUTDOORS_LOST_00_01: - .ascii "LOST_00_01\0\0" -FLAGS_OUTDOORS_LOST_00_00: - .ascii "LOST_00_00\0\0" -FLAGS_OUTDOORS_LOST_00_ENTER: - .ascii "LOST_00_ENTER\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_M2: - .ascii "HIKYOU_00_M2\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_M1: - .ascii "HIKYOU_00_M1\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_M0: - .ascii "HIKYOU_00_M0\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_H00: - .ascii "HIKYOU_00_H00\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_BOSEKI: - .ascii "HIKYOU_00_BOSEKI\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_14: - .ascii "HIKYOU_00_14\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_SEKIZOU: - .ascii "HIKYOU_00_SEKIZOU\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_CAP_2: - .ascii "HIKYOU_00_CAP_2\0" -FLAGS_OUTDOORS_HIKYOU_00_CAP_1: - .ascii "HIKYOU_00_CAP_1\0" -FLAGS_OUTDOORS_HIKYOU_00_CAP_0: - .ascii "HIKYOU_00_CAP_0\0" -FLAGS_OUTDOORS_HIKYOU_00_04: - .ascii "HIKYOU_00_04\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_03: - .ascii "HIKYOU_00_03\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_02: - .ascii "HIKYOU_00_02\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_01: - .ascii "HIKYOU_00_01\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_00: - .ascii "HIKYOU_00_00\0\0\0\0" -FLAGS_OUTDOORS_NAKANIWA_00_EZERO: - .ascii "NAKANIWA_00_EZERO\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_CAP_0: - .ascii "MAENIWA_00_CAP_0\0\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_T1: - .ascii "MAENIWA_00_T1\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_T0: - .ascii "MAENIWA_00_T0\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_WARP: - .ascii "MAENIWA_00_WARP\0" -FLAGS_OUTDOORS_MAENIWA_00_BENT: - .ascii "MAENIWA_00_BENT\0" -FLAGS_OUTDOORS_MAENIWA_00_02: - .ascii "MAENIWA_00_02\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_01: - .ascii "MAENIWA_00_01\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_00: - .ascii "MAENIWA_00_00\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_T1: - .ascii "HIKYOU_00_T1\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_T0: - .ascii "HIKYOU_00_T0\0\0\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_H02: - .ascii "MIZUUMI_00_H02\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_H01: - .ascii "MIZUUMI_00_H01\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_H00: - .ascii "MIZUUMI_00_H00\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_00: - .ascii "MIZUUMI_00_00\0\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_BENT: - .ascii "MIZUUMI_00_BENT\0" -FLAGS_OUTDOORS_LV5_CLEAR_MES: - .ascii "LV5_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV4_CLEAR_MES: - .ascii "LV4_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV3_CLEAR_MES: - .ascii "LV3_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV2_CLEAR_MES: - .ascii "LV2_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV1_CLEAR_MES: - .ascii "LV1_CLEAR_MES\0\0\0" -.else -FLAGS_OUTDOORS: - .4byte ENUM_BEGIN - .4byte FLAGS_OUTDOORS_LV1_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV2_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV3_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV4_CLEAR_MES - .4byte FLAGS_OUTDOORS_LV5_CLEAR_MES - .4byte FLAGS_OUTDOORS_MIZUUMI_00_BENT - .4byte FLAGS_OUTDOORS_MIZUUMI_00_00 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_H00 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_H01 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_H02 - .4byte FLAGS_OUTDOORS_MIZUUMI_00_CAP_0 - .4byte FLAGS_OUTDOORS_MAENIWA_00_00 - .4byte FLAGS_OUTDOORS_MAENIWA_00_01 - .4byte FLAGS_OUTDOORS_MAENIWA_00_02 - .4byte FLAGS_OUTDOORS_MAENIWA_00_BENT - .4byte FLAGS_OUTDOORS_MAENIWA_00_WARP - .4byte FLAGS_OUTDOORS_MAENIWA_00_T0 - .4byte FLAGS_OUTDOORS_MAENIWA_00_T1 - .4byte FLAGS_OUTDOORS_MAENIWA_00_CAP_0 - .4byte FLAGS_OUTDOORS_NAKANIWA_00_EZERO - .4byte FLAGS_OUTDOORS_HIKYOU_00_00 - .4byte FLAGS_OUTDOORS_HIKYOU_00_01 - .4byte FLAGS_OUTDOORS_HIKYOU_00_02 - .4byte FLAGS_OUTDOORS_HIKYOU_00_03 - .4byte FLAGS_OUTDOORS_HIKYOU_00_04 - .4byte FLAGS_OUTDOORS_HIKYOU_00_CAP_0 - .4byte FLAGS_OUTDOORS_HIKYOU_00_CAP_1 - .4byte FLAGS_OUTDOORS_HIKYOU_00_CAP_2 - .4byte FLAGS_OUTDOORS_HIKYOU_00_SEKIZOU - .4byte FLAGS_OUTDOORS_HIKYOU_00_14 - .4byte FLAGS_OUTDOORS_HIKYOU_00_BOSEKI - .4byte FLAGS_OUTDOORS_HIKYOU_00_M0 - .4byte FLAGS_OUTDOORS_HIKYOU_00_M1 - .4byte FLAGS_OUTDOORS_HIKYOU_00_M2 - .4byte FLAGS_OUTDOORS_HIKYOU_00_T1 - .4byte FLAGS_OUTDOORS_LOST_00_ENTER - .4byte FLAGS_OUTDOORS_LOST_00_00 - .4byte FLAGS_OUTDOORS_LOST_00_01 - .4byte FLAGS_OUTDOORS_LOST_02_00 - .4byte FLAGS_OUTDOORS_LOST_03_00 - .4byte FLAGS_OUTDOORS_LOST_03_T0 - .4byte FLAGS_OUTDOORS_LOST_04_00 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA0 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA1 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA2 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA3 - .4byte FLAGS_OUTDOORS_LOST_04_SIBA4 - .4byte FLAGS_OUTDOORS_LOST_05_00 - .4byte FLAGS_OUTDOORS_LOST_05_01 - .4byte FLAGS_OUTDOORS_LOST_05_02 - .4byte FLAGS_OUTDOORS_LOST_05_03 - .4byte FLAGS_OUTDOORS_LOST_05_T0 - .4byte FLAGS_OUTDOORS_LOST_05_T1 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_0 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_1 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_2 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_3 - .4byte FLAGS_OUTDOORS_MORI_00_HIBI_4 - .4byte FLAGS_OUTDOORS_MORI_00_KOBITO - .4byte FLAGS_OUTDOORS_MORI_00_H0 - .4byte FLAGS_OUTDOORS_MORI_00_H1 - .4byte FLAGS_OUTDOORS_MORI_ENTRANCE_1ST - .4byte FLAGS_OUTDOORS_YAMA_00_00 - .4byte FLAGS_OUTDOORS_YAMA_00_01 - .4byte FLAGS_OUTDOORS_YAMA_01_BW00 - .4byte FLAGS_OUTDOORS_YAMA_02_00 - .4byte FLAGS_OUTDOORS_YAMA_03_00 - .4byte FLAGS_OUTDOORS_YAMA_03_01 - .4byte FLAGS_OUTDOORS_YAMA_03_02 - .4byte FLAGS_OUTDOORS_YAMA_03_DOKU_0 - .4byte FLAGS_OUTDOORS_YAMA_03_DOKU_1 - .4byte FLAGS_OUTDOORS_YAMA_03_DOKU_2 - .4byte FLAGS_OUTDOORS_YAMA_04_CAP_0 - .4byte FLAGS_OUTDOORS_YAMA_04_CAP_1 - .4byte FLAGS_OUTDOORS_YAMA_04_R00 - .4byte FLAGS_OUTDOORS_YAMA_04_HIBI_0 - .4byte FLAGS_OUTDOORS_YAMA_04_HIBI_1 - .4byte FLAGS_OUTDOORS_YAMA_04_00 - .4byte FLAGS_OUTDOORS_YAMA_04_01 - .4byte FLAGS_OUTDOORS_YAMA_04_04 - .4byte FLAGS_OUTDOORS_YAMA_04_05 - .4byte FLAGS_OUTDOORS_YAMA_04_06 - .4byte FLAGS_OUTDOORS_YAMA_04_ENTHOUSHI - .4byte FLAGS_OUTDOORS_YAMA_04_ANAHOUSHI - .4byte FLAGS_OUTDOORS_YAMA_04_BOMBWALL0 - .4byte FLAGS_OUTDOORS_HAKA_BUNSHIN_00 - .4byte FLAGS_OUTDOORS_HAKA_BOSEKI_00 - .4byte FLAGS_OUTDOORS_HAKA_BOSEKI_01 - .4byte FLAGS_OUTDOORS_HAKA_BOSEKI_02 - .4byte FLAGS_OUTDOORS_HAKA_00_CAP_0 - .4byte FLAGS_OUTDOORS_HAKA_00_BW00 - .4byte FLAGS_OUTDOORS_HAKA_01_T0 - .4byte FLAGS_OUTDOORS_HAKA_KEY_GET - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_4 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_5 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_6 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_7 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_8 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_9 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_10 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_11 - .4byte FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_12 - .4byte FLAGS_OUTDOORS_SOUGEN_01_00 - .4byte FLAGS_OUTDOORS_SOUGEN_01_BENT - .4byte FLAGS_OUTDOORS_SOUGEN_01_ZELDA - .4byte FLAGS_OUTDOORS_SOUGEN_02_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_02_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_03_BOMBWALL - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_04_HIBI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_05_HIBI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_05_BOMB_00 - .4byte FLAGS_OUTDOORS_SOUGEN_05_00 - .4byte FLAGS_OUTDOORS_SOUGEN_05_01 - .4byte FLAGS_OUTDOORS_SOUGEN_05_IWA02 - .4byte FLAGS_OUTDOORS_SOUGEN_05_BENT - .4byte FLAGS_OUTDOORS_SOUGEN_05_H00 - .4byte FLAGS_OUTDOORS_SOUGEN_05_R0 - .4byte FLAGS_OUTDOORS_SOUGEN_05_CAP_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_1 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_2 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_3 - .4byte FLAGS_OUTDOORS_SOUGEN_06_HIBI_4 - .4byte FLAGS_OUTDOORS_SOUGEN_06_IWA_0 - .4byte FLAGS_OUTDOORS_SOUGEN_06_AKINDO - .4byte FLAGS_OUTDOORS_SOUGEN_06_SAIKAI - .4byte FLAGS_OUTDOORS_SOUGEN_06_BENT - .4byte FLAGS_OUTDOORS_SOUGEN_06_SLIDE - .4byte FLAGS_OUTDOORS_SOUGEN_06_R1 - .4byte FLAGS_OUTDOORS_SOUGEN_07_00 - .4byte FLAGS_OUTDOORS_SOUGEN_07_01 - .4byte FLAGS_OUTDOORS_SOUGEN_07_02 - .4byte FLAGS_OUTDOORS_SOUGEN_08_00 - .4byte FLAGS_OUTDOORS_SOUGEN_08_01 - .4byte FLAGS_OUTDOORS_SOUGEN_08_02 - .4byte FLAGS_OUTDOORS_SOUGEN_08_03 - .4byte FLAGS_OUTDOORS_SOUGEN_08_04 - .4byte FLAGS_OUTDOORS_SOUGEN_08_05 - .4byte FLAGS_OUTDOORS_SOUGEN_08_06 - .4byte FLAGS_OUTDOORS_SOUGEN_08_07 - .4byte FLAGS_OUTDOORS_SOUGEN_08_08 - .4byte FLAGS_OUTDOORS_SOUGEN_08_TORITSUKI - .4byte FLAGS_OUTDOORS_SOUGEN_08_T00 - .4byte FLAGS_OUTDOORS_CASTLE_00_00 - .4byte FLAGS_OUTDOORS_CASTLE_04_MEZAME - .4byte FLAGS_OUTDOORS_CASTLE_04_MAID_TALK - .4byte FLAGS_OUTDOORS_SUIGEN_00_h0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_T0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_r0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_r1 - .4byte FLAGS_OUTDOORS_SUIGEN_00_r2 - .4byte FLAGS_OUTDOORS_SUIGEN_00_CAP_0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_CAP_1 - .4byte FLAGS_OUTDOORS_SUIGEN_00_R0 - .4byte FLAGS_OUTDOORS_SUIGEN_00_R1 - .4byte FLAGS_OUTDOORS_SUIGEN_00_R2 - .4byte FLAGS_OUTDOORS_SUIGEN_00_h1 - .4byte FLAGS_OUTDOORS_SUIGENGORON_00_CAP_0 - .4byte FLAGS_OUTDOORS_DAIGORON_SHIELD - .4byte FLAGS_OUTDOORS_DAIGORON_EXCHG - .4byte FLAGS_OUTDOORS_BEANDEMO_00 - .4byte FLAGS_OUTDOORS_BEANDEMO_01 - .4byte FLAGS_OUTDOORS_BEANDEMO_02 - .4byte FLAGS_OUTDOORS_BEANDEMO_03 - .4byte FLAGS_OUTDOORS_BEANDEMO_04 - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_A - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_E - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_J - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_K - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_L - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_M - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_N - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_O - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_P - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_Q - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_R - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_S - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_T - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_U - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_V - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_W - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_X - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_Y - .4byte FLAGS_OUTDOORS_KAKERA_TAKARA_Z - .4byte FLAGS_OUTDOORS_MACHI_02_HEISHI_TALK - .4byte FLAGS_OUTDOORS_MACHI00_00 - .4byte FLAGS_OUTDOORS_MACHI00_02 - .4byte FLAGS_OUTDOORS_MACHI00_03 - .4byte FLAGS_OUTDOORS_MACHI_00_T00 - .4byte FLAGS_OUTDOORS_MACHI_00_T01 - .4byte FLAGS_OUTDOORS_MACHI_01_DEMO - .4byte FLAGS_OUTDOORS_MACHI_02_HEISHI - .4byte FLAGS_OUTDOORS_MACHI_02_DOG - .4byte FLAGS_OUTDOORS_MACHI_07_BELL - .4byte FLAGS_OUTDOORS_SHOP05_OPEN - .4byte FLAGS_OUTDOORS_MACHI_MES_20 - .4byte FLAGS_OUTDOORS_MACHI_MES_21 - .4byte FLAGS_OUTDOORS_MACHI_MES_22 - .4byte FLAGS_OUTDOORS_MACHI_MES_23 - .4byte FLAGS_OUTDOORS_MACHI_MES_24 - .4byte FLAGS_OUTDOORS_MACHI_MES_30 - .4byte FLAGS_OUTDOORS_MACHI_MES_40 - .4byte FLAGS_OUTDOORS_MACHI_MES_60 - .4byte FLAGS_OUTDOORS_MACHI_MES_50 - .4byte FLAGS_OUTDOORS_MACHI_DOG_C - .4byte FLAGS_OUTDOORS_KUMOUE_00_CAP_0 - .4byte FLAGS_OUTDOORS_KUMOUE_01_CAP_0 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T0 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T1 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T2 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T3 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T4 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T5 - .4byte FLAGS_OUTDOORS_KUMOUE_01_T6 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K0 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K1 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K2 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K3 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K4 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K5 - .4byte FLAGS_OUTDOORS_KUMOUR_01_K6 - .4byte FLAGS_OUTDOORS_KUMONOUE_01_KAKERA - .4byte FLAGS_OUTDOORS_KUMOUE_02_CAP_0 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_01 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_02 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_03 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_04 - .4byte FLAGS_OUTDOORS_KUMOUE_02_AWASE_05 - .4byte FLAGS_OUTDOORS_KUMOUE_02_00 - .4byte FLAGS_OUTDOORS_KUMOUE_02_01 - .4byte FLAGS_OUTDOORS_KUMOUE_02_02 - .4byte FLAGS_OUTDOORS_KUMOUE_02_03 - .4byte FLAGS_OUTDOORS_KUMOUE_UNCLE_TALK - .4byte FLAGS_OUTDOORS_KUMOUE_GIRL_TALK - .4byte FLAGS_OUTDOORS_KS_A06 - .4byte FLAGS_OUTDOORS_KS_B18 - .4byte FLAGS_OUTDOORS_KS_C21 - .4byte FLAGS_OUTDOORS_KS_C25 - .4byte ENUM_END - -FLAGS_OUTDOORS_KS_C25: - .ascii "KS_C25\0\0" -FLAGS_OUTDOORS_KS_C21: - .ascii "KS_C21\0\0" -FLAGS_OUTDOORS_KS_B18: - .ascii "KS_B18\0\0" -FLAGS_OUTDOORS_KS_A06: - .ascii "KS_A06\0\0" -FLAGS_OUTDOORS_KUMOUE_GIRL_TALK: - .ascii "KUMOUE_GIRL_TALK\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_UNCLE_TALK: - .ascii "KUMOUE_UNCLE_TALK\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_03: - .ascii "KUMOUE_02_03\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_02: - .ascii "KUMOUE_02_02\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_01: - .ascii "KUMOUE_02_01\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_00: - .ascii "KUMOUE_02_00\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_05: - .ascii "KUMOUE_02_AWASE_05\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_04: - .ascii "KUMOUE_02_AWASE_04\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_03: - .ascii "KUMOUE_02_AWASE_03\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_02: - .ascii "KUMOUE_02_AWASE_02\0\0" -FLAGS_OUTDOORS_KUMOUE_02_AWASE_01: - .ascii "KUMOUE_02_AWASE_01\0\0" -FLAGS_OUTDOORS_KUMOUE_02_CAP_0: - .ascii "KUMOUE_02_CAP_0\0" -FLAGS_OUTDOORS_KUMONOUE_01_KAKERA: - .ascii "KUMONOUE_01_KAKERA\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K6: - .ascii "KUMOUR_01_K6\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K5: - .ascii "KUMOUR_01_K5\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K4: - .ascii "KUMOUR_01_K4\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K3: - .ascii "KUMOUR_01_K3\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K2: - .ascii "KUMOUR_01_K2\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K1: - .ascii "KUMOUR_01_K1\0\0\0\0" -FLAGS_OUTDOORS_KUMOUR_01_K0: - .ascii "KUMOUR_01_K0\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T6: - .ascii "KUMOUE_01_T6\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T5: - .ascii "KUMOUE_01_T5\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T4: - .ascii "KUMOUE_01_T4\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T3: - .ascii "KUMOUE_01_T3\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T2: - .ascii "KUMOUE_01_T2\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T1: - .ascii "KUMOUE_01_T1\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_T0: - .ascii "KUMOUE_01_T0\0\0\0\0" -FLAGS_OUTDOORS_KUMOUE_01_CAP_0: - .ascii "KUMOUE_01_CAP_0\0" -FLAGS_OUTDOORS_KUMOUE_00_CAP_0: - .ascii "KUMOUE_00_CAP_0\0" -FLAGS_OUTDOORS_MACHI_DOG_C: - .ascii "MACHI_DOG_C\0" -FLAGS_OUTDOORS_MACHI_MES_50: - .ascii "MACHI_MES_50\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_60: - .ascii "MACHI_MES_60\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_40: - .ascii "MACHI_MES_40\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_30: - .ascii "MACHI_MES_30\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_24: - .ascii "MACHI_MES_24\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_23: - .ascii "MACHI_MES_23\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_22: - .ascii "MACHI_MES_22\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_21: - .ascii "MACHI_MES_21\0\0\0\0" -FLAGS_OUTDOORS_MACHI_MES_20: - .ascii "MACHI_MES_20\0\0\0\0" -FLAGS_OUTDOORS_SHOP05_OPEN: - .ascii "SHOP05_OPEN\0" -FLAGS_OUTDOORS_MACHI_07_BELL: - .ascii "MACHI_07_BELL\0\0\0" -FLAGS_OUTDOORS_MACHI_02_DOG: - .ascii "MACHI_02_DOG\0\0\0\0" -FLAGS_OUTDOORS_MACHI_02_HEISHI: - .ascii "MACHI_02_HEISHI\0" -FLAGS_OUTDOORS_MACHI_01_DEMO: - .ascii "MACHI_01_DEMO\0\0\0" -FLAGS_OUTDOORS_MACHI_00_T01: - .ascii "MACHI_00_T01\0\0\0\0" -FLAGS_OUTDOORS_MACHI_00_T00: - .ascii "MACHI_00_T00\0\0\0\0" -FLAGS_OUTDOORS_MACHI00_03: - .ascii "MACHI00_03\0\0" -FLAGS_OUTDOORS_MACHI00_02: - .ascii "MACHI00_02\0\0" -FLAGS_OUTDOORS_MACHI00_00: - .ascii "MACHI00_00\0\0" -FLAGS_OUTDOORS_MACHI_02_HEISHI_TALK: - .ascii "MACHI_02_HEISHI_TALK\0\0\0\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_Z: - .ascii "KAKERA_TAKARA_Z\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_Y: - .ascii "KAKERA_TAKARA_Y\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_X: - .ascii "KAKERA_TAKARA_X\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_W: - .ascii "KAKERA_TAKARA_W\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_V: - .ascii "KAKERA_TAKARA_V\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_U: - .ascii "KAKERA_TAKARA_U\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_T: - .ascii "KAKERA_TAKARA_T\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_S: - .ascii "KAKERA_TAKARA_S\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_R: - .ascii "KAKERA_TAKARA_R\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_Q: - .ascii "KAKERA_TAKARA_Q\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_P: - .ascii "KAKERA_TAKARA_P\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_O: - .ascii "KAKERA_TAKARA_O\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_N: - .ascii "KAKERA_TAKARA_N\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_M: - .ascii "KAKERA_TAKARA_M\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_L: - .ascii "KAKERA_TAKARA_L\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_K: - .ascii "KAKERA_TAKARA_K\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_J: - .ascii "KAKERA_TAKARA_J\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_E: - .ascii "KAKERA_TAKARA_E\0" -FLAGS_OUTDOORS_KAKERA_TAKARA_A: - .ascii "KAKERA_TAKARA_A\0" -FLAGS_OUTDOORS_BEANDEMO_04: - .ascii "BEANDEMO_04\0" -FLAGS_OUTDOORS_BEANDEMO_03: - .ascii "BEANDEMO_03\0" -FLAGS_OUTDOORS_BEANDEMO_02: - .ascii "BEANDEMO_02\0" -FLAGS_OUTDOORS_BEANDEMO_01: - .ascii "BEANDEMO_01\0" -FLAGS_OUTDOORS_BEANDEMO_00: - .ascii "BEANDEMO_00\0" -FLAGS_OUTDOORS_DAIGORON_EXCHG: - .ascii "DAIGORON_EXCHG\0\0" -FLAGS_OUTDOORS_DAIGORON_SHIELD: - .ascii "DAIGORON_SHIELD\0" -FLAGS_OUTDOORS_SUIGENGORON_00_CAP_0: - .ascii "SUIGENGORON_00_CAP_0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_h1: - .ascii "SUIGEN_00_h1\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_R2: - .ascii "SUIGEN_00_R2\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_R1: - .ascii "SUIGEN_00_R1\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_R0: - .ascii "SUIGEN_00_R0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_CAP_1: - .ascii "SUIGEN_00_CAP_1\0" -FLAGS_OUTDOORS_SUIGEN_00_CAP_0: - .ascii "SUIGEN_00_CAP_0\0" -FLAGS_OUTDOORS_SUIGEN_00_r2: - .ascii "SUIGEN_00_r2\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_r1: - .ascii "SUIGEN_00_r1\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_r0: - .ascii "SUIGEN_00_r0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_T0: - .ascii "SUIGEN_00_T0\0\0\0\0" -FLAGS_OUTDOORS_SUIGEN_00_h0: - .ascii "SUIGEN_00_h0\0\0\0\0" -FLAGS_OUTDOORS_CASTLE_04_MAID_TALK: - .ascii "CASTLE_04_MAID_TALK\0" -FLAGS_OUTDOORS_CASTLE_04_MEZAME: - .ascii "CASTLE_04_MEZAME\0\0\0\0" -FLAGS_OUTDOORS_CASTLE_00_00: - .ascii "CASTLE_00_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_T00: - .ascii "SOUGEN_08_T00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_TORITSUKI: - .ascii "SOUGEN_08_TORITSUKI\0" -FLAGS_OUTDOORS_SOUGEN_08_08: - .ascii "SOUGEN_08_08\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_07: - .ascii "SOUGEN_08_07\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_06: - .ascii "SOUGEN_08_06\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_05: - .ascii "SOUGEN_08_05\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_04: - .ascii "SOUGEN_08_04\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_03: - .ascii "SOUGEN_08_03\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_02: - .ascii "SOUGEN_08_02\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_01: - .ascii "SOUGEN_08_01\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_08_00: - .ascii "SOUGEN_08_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_02: - .ascii "SOUGEN_07_02\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_01: - .ascii "SOUGEN_07_01\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_07_00: - .ascii "SOUGEN_07_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_R1: - .ascii "SOUGEN_06_R1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_SLIDE: - .ascii "SOUGEN_06_SLIDE\0" -FLAGS_OUTDOORS_SOUGEN_06_BENT: - .ascii "SOUGEN_06_BENT\0\0" -FLAGS_OUTDOORS_SOUGEN_06_SAIKAI: - .ascii "SOUGEN_06_SAIKAI\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_AKINDO: - .ascii "SOUGEN_06_AKINDO\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_IWA_0: - .ascii "SOUGEN_06_IWA_0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_4: - .ascii "SOUGEN_06_HIBI_4\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_3: - .ascii "SOUGEN_06_HIBI_3\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_2: - .ascii "SOUGEN_06_HIBI_2\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_1: - .ascii "SOUGEN_06_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_HIBI_0: - .ascii "SOUGEN_06_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_3: - .ascii "SOUGEN_06_WAKAGI_3\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_2: - .ascii "SOUGEN_06_WAKAGI_2\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_1: - .ascii "SOUGEN_06_WAKAGI_1\0\0" -FLAGS_OUTDOORS_SOUGEN_06_WAKAGI_0: - .ascii "SOUGEN_06_WAKAGI_0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_CAP_0: - .ascii "SOUGEN_05_CAP_0\0" -FLAGS_OUTDOORS_SOUGEN_05_R0: - .ascii "SOUGEN_05_R0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_H00: - .ascii "SOUGEN_05_H00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_BENT: - .ascii "SOUGEN_05_BENT\0\0" -FLAGS_OUTDOORS_SOUGEN_05_IWA02: - .ascii "SOUGEN_05_IWA02\0" -FLAGS_OUTDOORS_SOUGEN_05_01: - .ascii "SOUGEN_05_01\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_00: - .ascii "SOUGEN_05_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_BOMB_00: - .ascii "SOUGEN_05_BOMB_00\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_3: - .ascii "SOUGEN_05_HIBI_3\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_2: - .ascii "SOUGEN_05_HIBI_2\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_1: - .ascii "SOUGEN_05_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_05_HIBI_0: - .ascii "SOUGEN_05_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_3: - .ascii "SOUGEN_04_HIBI_3\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_2: - .ascii "SOUGEN_04_HIBI_2\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_1: - .ascii "SOUGEN_04_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_04_HIBI_0: - .ascii "SOUGEN_04_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_03_BOMBWALL: - .ascii "SOUGEN_03_BOMBWALL\0\0" -FLAGS_OUTDOORS_SOUGEN_02_HIBI_1: - .ascii "SOUGEN_02_HIBI_1\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_02_HIBI_0: - .ascii "SOUGEN_02_HIBI_0\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_01_ZELDA: - .ascii "SOUGEN_01_ZELDA\0" -FLAGS_OUTDOORS_SOUGEN_01_BENT: - .ascii "SOUGEN_01_BENT\0\0" -FLAGS_OUTDOORS_SOUGEN_01_00: - .ascii "SOUGEN_01_00\0\0\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_12: - .ascii "SOUGEN_01_WAKAGI_12\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_11: - .ascii "SOUGEN_01_WAKAGI_11\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_10: - .ascii "SOUGEN_01_WAKAGI_10\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_9: - .ascii "SOUGEN_01_WAKAGI_9\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_8: - .ascii "SOUGEN_01_WAKAGI_8\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_7: - .ascii "SOUGEN_01_WAKAGI_7\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_6: - .ascii "SOUGEN_01_WAKAGI_6\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_5: - .ascii "SOUGEN_01_WAKAGI_5\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_4: - .ascii "SOUGEN_01_WAKAGI_4\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_3: - .ascii "SOUGEN_01_WAKAGI_3\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_2: - .ascii "SOUGEN_01_WAKAGI_2\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_1: - .ascii "SOUGEN_01_WAKAGI_1\0\0" -FLAGS_OUTDOORS_SOUGEN_01_WAKAGI_0: - .ascii "SOUGEN_01_WAKAGI_0\0\0" -FLAGS_OUTDOORS_HAKA_KEY_GET: - .ascii "HAKA_KEY_GET\0\0\0\0" -FLAGS_OUTDOORS_HAKA_01_T0: - .ascii "HAKA_01_T0\0\0" -FLAGS_OUTDOORS_HAKA_00_BW00: - .ascii "HAKA_00_BW00\0\0\0\0" -FLAGS_OUTDOORS_HAKA_00_CAP_0: - .ascii "HAKA_00_CAP_0\0\0\0" -FLAGS_OUTDOORS_HAKA_BOSEKI_02: - .ascii "HAKA_BOSEKI_02\0\0" -FLAGS_OUTDOORS_HAKA_BOSEKI_01: - .ascii "HAKA_BOSEKI_01\0\0" -FLAGS_OUTDOORS_HAKA_BOSEKI_00: - .ascii "HAKA_BOSEKI_00\0\0" -FLAGS_OUTDOORS_HAKA_BUNSHIN_00: - .ascii "HAKA_BUNSHIN_00\0" -FLAGS_OUTDOORS_YAMA_04_BOMBWALL0: - .ascii "YAMA_04_BOMBWALL0\0\0\0" -FLAGS_OUTDOORS_YAMA_04_ANAHOUSHI: - .ascii "YAMA_04_ANAHOUSHI\0\0\0" -FLAGS_OUTDOORS_YAMA_04_ENTHOUSHI: - .ascii "YAMA_04_ENTHOUSHI\0\0\0" -FLAGS_OUTDOORS_YAMA_04_06: - .ascii "YAMA_04_06\0\0" -FLAGS_OUTDOORS_YAMA_04_05: - .ascii "YAMA_04_05\0\0" -FLAGS_OUTDOORS_YAMA_04_04: - .ascii "YAMA_04_04\0\0" -FLAGS_OUTDOORS_YAMA_04_01: - .ascii "YAMA_04_01\0\0" -FLAGS_OUTDOORS_YAMA_04_00: - .ascii "YAMA_04_00\0\0" -FLAGS_OUTDOORS_YAMA_04_HIBI_1: - .ascii "YAMA_04_HIBI_1\0\0" -FLAGS_OUTDOORS_YAMA_04_HIBI_0: - .ascii "YAMA_04_HIBI_0\0\0" -FLAGS_OUTDOORS_YAMA_04_R00: - .ascii "YAMA_04_R00\0" -FLAGS_OUTDOORS_YAMA_04_CAP_1: - .ascii "YAMA_04_CAP_1\0\0\0" -FLAGS_OUTDOORS_YAMA_04_CAP_0: - .ascii "YAMA_04_CAP_0\0\0\0" -FLAGS_OUTDOORS_YAMA_03_DOKU_2: - .ascii "YAMA_03_DOKU_2\0\0" -FLAGS_OUTDOORS_YAMA_03_DOKU_1: - .ascii "YAMA_03_DOKU_1\0\0" -FLAGS_OUTDOORS_YAMA_03_DOKU_0: - .ascii "YAMA_03_DOKU_0\0\0" -FLAGS_OUTDOORS_YAMA_03_02: - .ascii "YAMA_03_02\0\0" -FLAGS_OUTDOORS_YAMA_03_01: - .ascii "YAMA_03_01\0\0" -FLAGS_OUTDOORS_YAMA_03_00: - .ascii "YAMA_03_00\0\0" -FLAGS_OUTDOORS_YAMA_02_00: - .ascii "YAMA_02_00\0\0" -FLAGS_OUTDOORS_YAMA_01_BW00: - .ascii "YAMA_01_BW00\0\0\0\0" -FLAGS_OUTDOORS_YAMA_00_01: - .ascii "YAMA_00_01\0\0" -FLAGS_OUTDOORS_YAMA_00_00: - .ascii "YAMA_00_00\0\0" -FLAGS_OUTDOORS_MORI_ENTRANCE_1ST: - .ascii "MORI_ENTRANCE_1ST\0\0\0" -FLAGS_OUTDOORS_MORI_00_H1: - .ascii "MORI_00_H1\0\0" -FLAGS_OUTDOORS_MORI_00_H0: - .ascii "MORI_00_H0\0\0" -FLAGS_OUTDOORS_MORI_00_KOBITO: - .ascii "MORI_00_KOBITO\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_4: - .ascii "MORI_00_HIBI_4\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_3: - .ascii "MORI_00_HIBI_3\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_2: - .ascii "MORI_00_HIBI_2\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_1: - .ascii "MORI_00_HIBI_1\0\0" -FLAGS_OUTDOORS_MORI_00_HIBI_0: - .ascii "MORI_00_HIBI_0\0\0" -FLAGS_OUTDOORS_LOST_05_T1: - .ascii "LOST_05_T1\0\0" -FLAGS_OUTDOORS_LOST_05_T0: - .ascii "LOST_05_T0\0\0" -FLAGS_OUTDOORS_LOST_05_03: - .ascii "LOST_05_03\0\0" -FLAGS_OUTDOORS_LOST_05_02: - .ascii "LOST_05_02\0\0" -FLAGS_OUTDOORS_LOST_05_01: - .ascii "LOST_05_01\0\0" -FLAGS_OUTDOORS_LOST_05_00: - .ascii "LOST_05_00\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA4: - .ascii "LOST_04_SIBA4\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA3: - .ascii "LOST_04_SIBA3\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA2: - .ascii "LOST_04_SIBA2\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA1: - .ascii "LOST_04_SIBA1\0\0\0" -FLAGS_OUTDOORS_LOST_04_SIBA0: - .ascii "LOST_04_SIBA0\0\0\0" -FLAGS_OUTDOORS_LOST_04_00: - .ascii "LOST_04_00\0\0" -FLAGS_OUTDOORS_LOST_03_T0: - .ascii "LOST_03_T0\0\0" -FLAGS_OUTDOORS_LOST_03_00: - .ascii "LOST_03_00\0\0" -FLAGS_OUTDOORS_LOST_02_00: - .ascii "LOST_02_00\0\0" -FLAGS_OUTDOORS_LOST_00_01: - .ascii "LOST_00_01\0\0" -FLAGS_OUTDOORS_LOST_00_00: - .ascii "LOST_00_00\0\0" -FLAGS_OUTDOORS_LOST_00_ENTER: - .ascii "LOST_00_ENTER\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_T1: - .ascii "HIKYOU_00_T1\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_M2: - .ascii "HIKYOU_00_M2\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_M1: - .ascii "HIKYOU_00_M1\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_M0: - .ascii "HIKYOU_00_M0\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_BOSEKI: - .ascii "HIKYOU_00_BOSEKI\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_14: - .ascii "HIKYOU_00_14\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_SEKIZOU: - .ascii "HIKYOU_00_SEKIZOU\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_CAP_2: - .ascii "HIKYOU_00_CAP_2\0" -FLAGS_OUTDOORS_HIKYOU_00_CAP_1: - .ascii "HIKYOU_00_CAP_1\0" -FLAGS_OUTDOORS_HIKYOU_00_CAP_0: - .ascii "HIKYOU_00_CAP_0\0" -FLAGS_OUTDOORS_HIKYOU_00_04: - .ascii "HIKYOU_00_04\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_03: - .ascii "HIKYOU_00_03\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_02: - .ascii "HIKYOU_00_02\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_01: - .ascii "HIKYOU_00_01\0\0\0\0" -FLAGS_OUTDOORS_HIKYOU_00_00: - .ascii "HIKYOU_00_00\0\0\0\0" -FLAGS_OUTDOORS_NAKANIWA_00_EZERO: - .ascii "NAKANIWA_00_EZERO\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_CAP_0: - .ascii "MAENIWA_00_CAP_0\0\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_T1: - .ascii "MAENIWA_00_T1\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_T0: - .ascii "MAENIWA_00_T0\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_WARP: - .ascii "MAENIWA_00_WARP\0" -FLAGS_OUTDOORS_MAENIWA_00_BENT: - .ascii "MAENIWA_00_BENT\0" -FLAGS_OUTDOORS_MAENIWA_00_02: - .ascii "MAENIWA_00_02\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_01: - .ascii "MAENIWA_00_01\0\0\0" -FLAGS_OUTDOORS_MAENIWA_00_00: - .ascii "MAENIWA_00_00\0\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_CAP_0: - .ascii "MIZUUMI_00_CAP_0\0\0\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_H02: - .ascii "MIZUUMI_00_H02\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_H01: - .ascii "MIZUUMI_00_H01\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_H00: - .ascii "MIZUUMI_00_H00\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_00: - .ascii "MIZUUMI_00_00\0\0\0" -FLAGS_OUTDOORS_MIZUUMI_00_BENT: - .ascii "MIZUUMI_00_BENT\0" -FLAGS_OUTDOORS_LV5_CLEAR_MES: - .ascii "LV5_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV4_CLEAR_MES: - .ascii "LV4_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV3_CLEAR_MES: - .ascii "LV3_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV2_CLEAR_MES: - .ascii "LV2_CLEAR_MES\0\0\0" -FLAGS_OUTDOORS_LV1_CLEAR_MES: - .ascii "LV1_CLEAR_MES\0\0\0" -.endif -.endif -.endif - - -.ifdef DEMO_JP -FLAGS_INDOORS: - .4byte ENUM_BEGIN - .4byte FLAGS_INDOORS_BILL05_YADO1F_MATSU_T0 - .4byte FLAGS_INDOORS_BILL06_YADO1F_TAKE_T0 - .4byte FLAGS_INDOORS_BILL07_YADO1F_UME_T0 - .4byte FLAGS_INDOORS_BILL0A_YADO_TAKARA_T0 - .4byte FLAGS_INDOORS_SHOUSE_00_T0 - .4byte FLAGS_INDOORS_SHOUSE_00_T1 - .4byte FLAGS_INDOORS_SHOUSE_01_T0 - .4byte FLAGS_INDOORS_SHOUSE_02_T0 - .4byte FLAGS_INDOORS_SHOUSE_02_T1 - .4byte FLAGS_INDOORS_SHOUSE_02_T2 - .4byte FLAGS_INDOORS_SHOUSE_02_XXXX0 - .4byte FLAGS_INDOORS_SHOUSE_02_XXXX1 - .4byte FLAGS_INDOORS_SHOUSE_02_XXXX2 - .4byte FLAGS_INDOORS_SHOUSE_03_T0 - .4byte FLAGS_INDOORS_SHOUSE_03_T1 - .4byte FLAGS_INDOORS_KOBITOANA_06_T0 - .4byte FLAGS_INDOORS_KOBITOANA_03_T0 - .4byte FLAGS_INDOORS_KOBITOANA_07_T0 - .4byte FLAGS_INDOORS_KOBITOANA_09_T0 - .4byte FLAGS_INDOORS_KOBITOANA_0A_T0 - .4byte FLAGS_INDOORS_KOBITOANA_0B_T0 - .4byte FLAGS_INDOORS_MHOUSE11_T0 - .4byte FLAGS_INDOORS_URO_08_T0 - .4byte FLAGS_INDOORS_URO_0A_T0 - .4byte FLAGS_INDOORS_URO_0B_T0 - .4byte FLAGS_INDOORS_BILL00_SHICHOU_00 - .4byte FLAGS_INDOORS_BILL00_SHICHOU_01 - .4byte FLAGS_INDOORS_BILL00_SHICHOU_02 - .4byte FLAGS_INDOORS_BILL00_SHICHOU_03 - .4byte FLAGS_INDOORS_BILL00_SHICHOU_04 - .4byte FLAGS_INDOORS_BILL01_TESSIN_1 - .4byte FLAGS_INDOORS_BILL01_TESSIN_2 - .4byte FLAGS_INDOORS_BILL01_TESSIN_3 - .4byte FLAGS_INDOORS_BILL01_TESSIN_4 - .4byte FLAGS_INDOORS_BILL01_TESSIN_5 - .4byte FLAGS_INDOORS_BILL01_TESSIN_6 - .4byte FLAGS_INDOORS_BILL01_TESSIN_7 - .4byte FLAGS_INDOORS_BILL01_TESSIN_8 - .4byte FLAGS_INDOORS_BILL09_YADO2F_POEMN - .4byte FLAGS_INDOORS_BILL0A_YADO_TAKARA_00 - .4byte FLAGS_INDOORS_BILL0B_SCHOOLL_00 - .4byte FLAGS_INDOORS_BILL0C_SCHOOLR_00 - .4byte FLAGS_INDOORS_MHOUSE00_00 - .4byte FLAGS_INDOORS_MHOUSE00_01 - .4byte FLAGS_INDOORS_MHOUSE00_02 - .4byte FLAGS_INDOORS_MHOUSE00_03 - .4byte FLAGS_INDOORS_MHOUSE00_04 - .4byte FLAGS_INDOORS_MHOUSE00_05 - .4byte FLAGS_INDOORS_MHOUSE01_00 - .4byte FLAGS_INDOORS_MHOUSE01_01 - .4byte FLAGS_INDOORS_MHOUSE01_02 - .4byte FLAGS_INDOORS_MHOUSE01_03 - .4byte FLAGS_INDOORS_MHOUSE03_00 - .4byte FLAGS_INDOORS_MHOUSE03_01 - .4byte FLAGS_INDOORS_MHOUSE04_00 - .4byte FLAGS_INDOORS_MHOUSE04_01 - .4byte FLAGS_INDOORS_MHOUSE04_02 - .4byte FLAGS_INDOORS_MHOUSE04_03 - .4byte FLAGS_INDOORS_MHOUSE04_04 - .4byte FLAGS_INDOORS_MHOUSE06_00 - .4byte FLAGS_INDOORS_MHOUSE07_00 - .4byte FLAGS_INDOORS_MHOUSE07_01 - .4byte FLAGS_INDOORS_MHOUSE08_00 - .4byte FLAGS_INDOORS_MHOUSE08_01 - .4byte FLAGS_INDOORS_MHOUSE08_02 - .4byte FLAGS_INDOORS_MHOUSE08_03 - .4byte FLAGS_INDOORS_MHOUSE08_04 - .4byte FLAGS_INDOORS_MHOUSE0C_00 - .4byte FLAGS_INDOORS_MHOUSE14_00 - .4byte FLAGS_INDOORS_MHOUSE15_OP1ST - .4byte FLAGS_INDOORS_MHOUSE2_00_00 - .4byte FLAGS_INDOORS_MHOUSE2_00_01 - .4byte FLAGS_INDOORS_MHOUSE2_00_02 - .4byte FLAGS_INDOORS_MHOUSE2_00_03 - .4byte FLAGS_INDOORS_MHOUSE2_01_T0 - .4byte FLAGS_INDOORS_MHOUSE2_02_KAME - .4byte FLAGS_INDOORS_MHOUSE2_02_KEY - .4byte FLAGS_INDOORS_MHOUSE2_03_00 - .4byte FLAGS_INDOORS_MHOUSE2_05_00 - .4byte FLAGS_INDOORS_SHOP00_ITEM_00 - .4byte FLAGS_INDOORS_SHOP00_ITEM_01 - .4byte FLAGS_INDOORS_SHOP00_ITEM_02 - .4byte FLAGS_INDOORS_SHOP00_ITEM_03 - .4byte FLAGS_INDOORS_SHOP00_ITEM_04 - .4byte FLAGS_INDOORS_SHOP00_SAIFU - .4byte FLAGS_INDOORS_SHOP00_YAZUTSU - .4byte FLAGS_INDOORS_SHOP01_CAFE_00 - .4byte FLAGS_INDOORS_SHOP01_CAFE_01 - .4byte FLAGS_INDOORS_SHOP01_TALK - .4byte FLAGS_INDOORS_HOUSE_XXXXX - .4byte FLAGS_INDOORS_SHOP03_PAN_1ST - .4byte FLAGS_INDOORS_SHOP07_TALK1ST - .4byte FLAGS_INDOORS_SHOP07_GACHAPON - .4byte FLAGS_INDOORS_SHOP07_TANA - .4byte FLAGS_INDOORS_SHOP07_COMPLETE - .4byte FLAGS_INDOORS_SHOP02_KUTSU_00 - .4byte FLAGS_INDOORS_NPC37_REM_TALK1ST - .4byte FLAGS_INDOORS_NPC37_REM_SLEEP - .4byte FLAGS_INDOORS_SORA_ELDER_RECOVER - .4byte FLAGS_INDOORS_SORA_CHIEF_TALK - .4byte FLAGS_INDOORS_SORA_ELDER_TALK1ST - .4byte FLAGS_INDOORS_SORA_ELDER_TALK2ND - .4byte FLAGS_INDOORS_NPC06_19GUY_QUESTION - .4byte FLAGS_INDOORS_NPC06_19GUY_ANSWER - .4byte FLAGS_INDOORS_DANPEI_TALK1ST - .4byte FLAGS_INDOORS_MIZUKAKI_KOBITO - .4byte FLAGS_INDOORS_MIZUKAKI_HINT1 - .4byte FLAGS_INDOORS_MIZUKAKI_BOOK1_FALL - .4byte FLAGS_INDOORS_MIZUKAKI_HINT2 - .4byte FLAGS_INDOORS_MIZUKAKI_HINT2_2ND - .4byte FLAGS_INDOORS_MIZUKAKI_BOOK2_FALL - .4byte FLAGS_INDOORS_MIZUKAKI_HINT3 - .4byte FLAGS_INDOORS_MIZUKAKI_HINT3_MAYOR - .4byte FLAGS_INDOORS_MIZUKAKI_BOOK3_FALL - .4byte FLAGS_INDOORS_MIZUKAKI_BOOK_ALLBACK - .4byte FLAGS_INDOORS_MIZUKAKI_STAIR - .4byte FLAGS_INDOORS_MIZUKAKI_STAIR_WARP_OK - .4byte FLAGS_INDOORS_KHOUSE27_00 - .4byte FLAGS_INDOORS_NO_USE_00 - .4byte FLAGS_INDOORS_KHOUSE51_00 - .4byte FLAGS_INDOORS_NO_USE_01 - .4byte FLAGS_INDOORS_KHOUSE51_02 - .4byte FLAGS_INDOORS_KHOUSE42_00 - .4byte FLAGS_INDOORS_NO_USE_02 - .4byte FLAGS_INDOORS_NO_USE_03 - .4byte FLAGS_INDOORS_OYAKATA_DEMO - .4byte FLAGS_INDOORS_YAMAKOBITO_OPEN - .4byte FLAGS_INDOORS_M_PRIEST_TALK - .4byte FLAGS_INDOORS_M_ELDER_TALK1ST - .4byte FLAGS_INDOORS_M_PRIEST_MOVE - .4byte FLAGS_INDOORS_M_ELDER_TALK2ND - .4byte FLAGS_INDOORS_MHOUSE04_DANRO - .4byte FLAGS_INDOORS_MHOUSE06_DANRO - .4byte FLAGS_INDOORS_URO_POEMN_TALK - .4byte FLAGS_INDOORS_MHOUSE06_MES_20 - .4byte FLAGS_INDOORS_MHOUSE07_MES_20 - .4byte FLAGS_INDOORS_MAYOR_2_TALK1ST - .4byte FLAGS_INDOORS_MAYOR_4_TALK1ST - .4byte FLAGS_INDOORS_BILL01_TESSIN_RESERVED - .4byte FLAGS_INDOORS_BILL01_TESSIN_BRANDNEW - .4byte FLAGS_INDOORS_KOBITO_MORI_1ST - .4byte FLAGS_INDOORS_KOBITO_YAMA_ENTER - .4byte FLAGS_INDOORS_KHOUSE52_KINOKO - .4byte FLAGS_INDOORS_SORA_YAKATA_ENTER - .4byte FLAGS_INDOORS_YADO_CHECKIN - .4byte FLAGS_INDOORS_MINIGAME_GAMEEND - .4byte FLAGS_INDOORS_MINIGAME_LEVEL2 - .4byte FLAGS_INDOORS_MHOUSE_DIN_TALK - .4byte FLAGS_INDOORS_MHOUSE_NAYRU_TALK - .4byte FLAGS_INDOORS_MHOUSE_FARORE_TALK - .4byte FLAGS_INDOORS_URO_12_H0 - .4byte FLAGS_INDOORS_URO_19_H0 - .4byte FLAGS_INDOORS_URO_1F_H0 - .4byte FLAGS_INDOORS_BILL09_TSW0 - .4byte FLAGS_INDOORS_BILL09_TSW1 - .4byte FLAGS_INDOORS_KHOUSE41_TALK1ST - .4byte FLAGS_INDOORS_TAIMA_SAIBAI_1ST - .4byte FLAGS_INDOORS_IZUMI_00_FAIRY - .4byte FLAGS_INDOORS_IZUMI_01_FAIRY - .4byte FLAGS_INDOORS_IZUMI_02_FAIRY - .4byte FLAGS_INDOORS_BILL0B_DOUZOU_L - .4byte FLAGS_INDOORS_BILL0B_DOUZOU_R - .4byte FLAGS_INDOORS_KOBITOANA_08_T0 - .4byte FLAGS_INDOORS_KOBITOANA_0C_T0 - .4byte FLAGS_INDOORS_KOBITOANA_0D_T0 - .4byte FLAGS_INDOORS_KOBITOHOUSE_23_H0 - .4byte FLAGS_INDOORS_MHOUSE08_DANRO - .4byte FLAGS_INDOORS_MHOUSE09_DANRO - .4byte FLAGS_INDOORS_MHOUSE0A_DANRO - .4byte FLAGS_INDOORS_MHOUSE0B_DANRO - .4byte FLAGS_INDOORS_MHOUSE0C_DANRO - .4byte FLAGS_INDOORS_MHOUSE12_DANRO - .4byte FLAGS_INDOORS_SORA_DANRO - .4byte FLAGS_INDOORS_MIZUKAKI_HINT3_MAP - .4byte FLAGS_INDOORS_LEFT_TALK - .4byte FLAGS_INDOORS_KHOUSE26_REMOCON - .4byte FLAGS_INDOORS_SORA_KIDS_MOVE - .4byte FLAGS_INDOORS_KOBITOANA_00_T0 - .4byte FLAGS_INDOORS_KHOUSE23_TALK1ST - .4byte FLAGS_INDOORS_SHOP05_ELEMENT_H00 - .4byte FLAGS_INDOORS_SHOP05_ELEMENT_T00 - .4byte FLAGS_INDOORS_SHOP05_ELEMENT_T01 - .4byte FLAGS_INDOORS_SHOP05_ELEMENT_T02 - .4byte FLAGS_INDOORS_BILL0a_YADO_TAKARA_H00 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R00 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R01 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R02 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R03 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R04 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R05 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R06 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R07 - .4byte FLAGS_INDOORS_KOBITO_MORI_00_H00 - .4byte FLAGS_INDOORS_KOBITO_MORI_00_H0 - .4byte FLAGS_INDOORS_CAFE_01_CAP_0 - .4byte FLAGS_INDOORS_BILL_00_CAP_0 - .4byte FLAGS_INDOORS_BILL_02_CAP_0 - .4byte FLAGS_INDOORS_MHOUSE_07_CAP_0 - .4byte FLAGS_INDOORS_MHOUSE_07_CAP_1 - .4byte FLAGS_INDOORS_MHOUSE_10_CAP_0 - .4byte FLAGS_INDOORS_MHOUSE_15_CAP_0 - .4byte FLAGS_INDOORS_MHOUSE_15_CAP_1 - .4byte FLAGS_INDOORS_SHOP_03_CAP_0 - .4byte FLAGS_INDOORS_MHOUSE_07_CAP_2 - .4byte FLAGS_INDOORS_SHOP00_BOMBBAG - .4byte FLAGS_INDOORS_CAFE_01_CAP_1 - .4byte FLAGS_INDOORS_MH01_KS_KUSURI - .4byte FLAGS_INDOORS_MH09_KS_KUSURI - .4byte ENUM_END -FLAGS_INDOORS_MH09_KS_KUSURI: - .ascii "MH09_KS_KUSURI\0\0" -FLAGS_INDOORS_MH01_KS_KUSURI: - .ascii "MH01_KS_KUSURI\0\0" -FLAGS_INDOORS_CAFE_01_CAP_1: - .ascii "CAFE_01_CAP_1\0\0\0" -FLAGS_INDOORS_SHOP00_BOMBBAG: - .ascii "SHOP00_BOMBBAG\0\0" -FLAGS_INDOORS_MHOUSE_07_CAP_2: - .ascii "MHOUSE_07_CAP_2\0" -FLAGS_INDOORS_SHOP_03_CAP_0: - .ascii "SHOP_03_CAP_0\0\0\0" -FLAGS_INDOORS_MHOUSE_15_CAP_1: - .ascii "MHOUSE_15_CAP_1\0" -FLAGS_INDOORS_MHOUSE_15_CAP_0: - .ascii "MHOUSE_15_CAP_0\0" -FLAGS_INDOORS_MHOUSE_10_CAP_0: - .ascii "MHOUSE_10_CAP_0\0" -FLAGS_INDOORS_MHOUSE_07_CAP_1: - .ascii "MHOUSE_07_CAP_1\0" -FLAGS_INDOORS_MHOUSE_07_CAP_0: - .ascii "MHOUSE_07_CAP_0\0" -FLAGS_INDOORS_BILL_02_CAP_0: - .ascii "BILL_02_CAP_0\0\0\0" -FLAGS_INDOORS_BILL_00_CAP_0: - .ascii "BILL_00_CAP_0\0\0\0" -FLAGS_INDOORS_CAFE_01_CAP_0: - .ascii "CAFE_01_CAP_0\0\0\0" -FLAGS_INDOORS_KOBITO_MORI_00_H0: - .ascii "KOBITO_MORI_00_H0\0\0\0" -FLAGS_INDOORS_KOBITO_MORI_00_H00: - .ascii "KOBITO_MORI_00_H00\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R07: - .ascii "KOBITOYAMA_00_R07\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R06: - .ascii "KOBITOYAMA_00_R06\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R05: - .ascii "KOBITOYAMA_00_R05\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R04: - .ascii "KOBITOYAMA_00_R04\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R03: - .ascii "KOBITOYAMA_00_R03\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R02: - .ascii "KOBITOYAMA_00_R02\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R01: - .ascii "KOBITOYAMA_00_R01\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R00: - .ascii "KOBITOYAMA_00_R00\0\0\0" -FLAGS_INDOORS_BILL0a_YADO_TAKARA_H00: - .ascii "BILL0a_YADO_TAKARA_H00\0\0" -FLAGS_INDOORS_SHOP05_ELEMENT_T02: - .ascii "SHOP05_ELEMENT_T02\0\0" -FLAGS_INDOORS_SHOP05_ELEMENT_T01: - .ascii "SHOP05_ELEMENT_T01\0\0" -FLAGS_INDOORS_SHOP05_ELEMENT_T00: - .ascii "SHOP05_ELEMENT_T00\0\0" -FLAGS_INDOORS_SHOP05_ELEMENT_H00: - .ascii "SHOP05_ELEMENT_H00\0\0" -FLAGS_INDOORS_KHOUSE23_TALK1ST: - .ascii "KHOUSE23_TALK1ST\0\0\0\0" -FLAGS_INDOORS_KOBITOANA_00_T0: - .ascii "KOBITOANA_00_T0\0" -FLAGS_INDOORS_SORA_KIDS_MOVE: - .ascii "SORA_KIDS_MOVE\0\0" -FLAGS_INDOORS_KHOUSE26_REMOCON: - .ascii "KHOUSE26_REMOCON\0\0\0\0" -FLAGS_INDOORS_LEFT_TALK: - .ascii "LEFT_TALK\0\0\0" -FLAGS_INDOORS_MIZUKAKI_HINT3_MAP: - .ascii "MIZUKAKI_HINT3_MAP\0\0" -FLAGS_INDOORS_SORA_DANRO: - .ascii "SORA_DANRO\0\0" -FLAGS_INDOORS_MHOUSE12_DANRO: - .ascii "MHOUSE12_DANRO\0\0" -FLAGS_INDOORS_MHOUSE0C_DANRO: - .ascii "MHOUSE0C_DANRO\0\0" -FLAGS_INDOORS_MHOUSE0B_DANRO: - .ascii "MHOUSE0B_DANRO\0\0" -FLAGS_INDOORS_MHOUSE0A_DANRO: - .ascii "MHOUSE0A_DANRO\0\0" -FLAGS_INDOORS_MHOUSE09_DANRO: - .ascii "MHOUSE09_DANRO\0\0" -FLAGS_INDOORS_MHOUSE08_DANRO: - .ascii "MHOUSE08_DANRO\0\0" -FLAGS_INDOORS_KOBITOHOUSE_23_H0: - .ascii "KOBITOHOUSE_23_H0\0\0\0" -FLAGS_INDOORS_KOBITOANA_0D_T0: - .ascii "KOBITOANA_0D_T0\0" -FLAGS_INDOORS_KOBITOANA_0C_T0: - .ascii "KOBITOANA_0C_T0\0" -FLAGS_INDOORS_KOBITOANA_08_T0: - .ascii "KOBITOANA_08_T0\0" -FLAGS_INDOORS_BILL0B_DOUZOU_R: - .ascii "BILL0B_DOUZOU_R\0" -FLAGS_INDOORS_BILL0B_DOUZOU_L: - .ascii "BILL0B_DOUZOU_L\0" -FLAGS_INDOORS_IZUMI_02_FAIRY: - .ascii "IZUMI_02_FAIRY\0\0" -FLAGS_INDOORS_IZUMI_01_FAIRY: - .ascii "IZUMI_01_FAIRY\0\0" -FLAGS_INDOORS_IZUMI_00_FAIRY: - .ascii "IZUMI_00_FAIRY\0\0" -FLAGS_INDOORS_TAIMA_SAIBAI_1ST: - .ascii "TAIMA_SAIBAI_1ST\0\0\0\0" -FLAGS_INDOORS_KHOUSE41_TALK1ST: - .ascii "KHOUSE41_TALK1ST\0\0\0\0" -FLAGS_INDOORS_BILL09_TSW1: - .ascii "BILL09_TSW1\0" -FLAGS_INDOORS_BILL09_TSW0: - .ascii "BILL09_TSW0\0" -FLAGS_INDOORS_URO_1F_H0: - .ascii "URO_1F_H0\0\0\0" -FLAGS_INDOORS_URO_19_H0: - .ascii "URO_19_H0\0\0\0" -FLAGS_INDOORS_URO_12_H0: - .ascii "URO_12_H0\0\0\0" -FLAGS_INDOORS_MHOUSE_FARORE_TALK: - .ascii "MHOUSE_FARORE_TALK\0\0" -FLAGS_INDOORS_MHOUSE_NAYRU_TALK: - .ascii "MHOUSE_NAYRU_TALK\0\0\0" -FLAGS_INDOORS_MHOUSE_DIN_TALK: - .ascii "MHOUSE_DIN_TALK\0" -FLAGS_INDOORS_MINIGAME_LEVEL2: - .ascii "MINIGAME_LEVEL2\0" -FLAGS_INDOORS_MINIGAME_GAMEEND: - .ascii "MINIGAME_GAMEEND\0\0\0\0" -FLAGS_INDOORS_YADO_CHECKIN: - .ascii "YADO_CHECKIN\0\0\0\0" -FLAGS_INDOORS_SORA_YAKATA_ENTER: - .ascii "SORA_YAKATA_ENTER\0\0\0" -FLAGS_INDOORS_KHOUSE52_KINOKO: - .ascii "KHOUSE52_KINOKO\0" -FLAGS_INDOORS_KOBITO_YAMA_ENTER: - .ascii "KOBITO_YAMA_ENTER\0\0\0" -FLAGS_INDOORS_KOBITO_MORI_1ST: - .ascii "KOBITO_MORI_1ST\0" -FLAGS_INDOORS_BILL01_TESSIN_BRANDNEW: - .ascii "BILL01_TESSIN_BRANDNEW\0\0" -FLAGS_INDOORS_BILL01_TESSIN_RESERVED: - .ascii "BILL01_TESSIN_RESERVED\0\0" -FLAGS_INDOORS_MAYOR_4_TALK1ST: - .ascii "MAYOR_4_TALK1ST\0" -FLAGS_INDOORS_MAYOR_2_TALK1ST: - .ascii "MAYOR_2_TALK1ST\0" -FLAGS_INDOORS_MHOUSE07_MES_20: - .ascii "MHOUSE07_MES_20\0" -FLAGS_INDOORS_MHOUSE06_MES_20: - .ascii "MHOUSE06_MES_20\0" -FLAGS_INDOORS_URO_POEMN_TALK: - .ascii "URO_POEMN_TALK\0\0" -FLAGS_INDOORS_MHOUSE06_DANRO: - .ascii "MHOUSE06_DANRO\0\0" -FLAGS_INDOORS_MHOUSE04_DANRO: - .ascii "MHOUSE04_DANRO\0\0" -FLAGS_INDOORS_M_ELDER_TALK2ND: - .ascii "M_ELDER_TALK2ND\0" -FLAGS_INDOORS_M_PRIEST_MOVE: - .ascii "M_PRIEST_MOVE\0\0\0" -FLAGS_INDOORS_M_ELDER_TALK1ST: - .ascii "M_ELDER_TALK1ST\0" -FLAGS_INDOORS_M_PRIEST_TALK: - .ascii "M_PRIEST_TALK\0\0\0" -FLAGS_INDOORS_YAMAKOBITO_OPEN: - .ascii "YAMAKOBITO_OPEN\0" -FLAGS_INDOORS_OYAKATA_DEMO: - .ascii "OYAKATA_DEMO\0\0\0\0" -FLAGS_INDOORS_NO_USE_03: - .ascii "NO_USE_03\0\0\0" -FLAGS_INDOORS_NO_USE_02: - .ascii "NO_USE_02\0\0\0" -FLAGS_INDOORS_KHOUSE42_00: - .ascii "KHOUSE42_00\0" -FLAGS_INDOORS_KHOUSE51_02: - .ascii "KHOUSE51_02\0" -FLAGS_INDOORS_NO_USE_01: - .ascii "NO_USE_01\0\0\0" -FLAGS_INDOORS_KHOUSE51_00: - .ascii "KHOUSE51_00\0" -FLAGS_INDOORS_NO_USE_00: - .ascii "NO_USE_00\0\0\0" -FLAGS_INDOORS_KHOUSE27_00: - .ascii "KHOUSE27_00\0" -FLAGS_INDOORS_MIZUKAKI_STAIR_WARP_OK: - .ascii "MIZUKAKI_STAIR_WARP_OK\0\0" -FLAGS_INDOORS_MIZUKAKI_STAIR: - .ascii "MIZUKAKI_STAIR\0\0" -FLAGS_INDOORS_MIZUKAKI_BOOK_ALLBACK: - .ascii "MIZUKAKI_BOOK_ALLBACK\0\0\0" -FLAGS_INDOORS_MIZUKAKI_BOOK3_FALL: - .ascii "MIZUKAKI_BOOK3_FALL\0" -FLAGS_INDOORS_MIZUKAKI_HINT3_MAYOR: - .ascii "MIZUKAKI_HINT3_MAYOR\0\0\0\0" -FLAGS_INDOORS_MIZUKAKI_HINT3: - .ascii "MIZUKAKI_HINT3\0\0" -FLAGS_INDOORS_MIZUKAKI_BOOK2_FALL: - .ascii "MIZUKAKI_BOOK2_FALL\0" -FLAGS_INDOORS_MIZUKAKI_HINT2_2ND: - .ascii "MIZUKAKI_HINT2_2ND\0\0" -FLAGS_INDOORS_MIZUKAKI_HINT2: - .ascii "MIZUKAKI_HINT2\0\0" -FLAGS_INDOORS_MIZUKAKI_BOOK1_FALL: - .ascii "MIZUKAKI_BOOK1_FALL\0" -FLAGS_INDOORS_MIZUKAKI_HINT1: - .ascii "MIZUKAKI_HINT1\0\0" -FLAGS_INDOORS_MIZUKAKI_KOBITO: - .ascii "MIZUKAKI_KOBITO\0" -FLAGS_INDOORS_DANPEI_TALK1ST: - .ascii "DANPEI_TALK1ST\0\0" -FLAGS_INDOORS_NPC06_19GUY_ANSWER: - .ascii "NPC06_19GUY_ANSWER\0\0" -FLAGS_INDOORS_NPC06_19GUY_QUESTION: - .ascii "NPC06_19GUY_QUESTION\0\0\0\0" -FLAGS_INDOORS_SORA_ELDER_TALK2ND: - .ascii "SORA_ELDER_TALK2ND\0\0" -FLAGS_INDOORS_SORA_ELDER_TALK1ST: - .ascii "SORA_ELDER_TALK1ST\0\0" -FLAGS_INDOORS_SORA_CHIEF_TALK: - .ascii "SORA_CHIEF_TALK\0" -FLAGS_INDOORS_SORA_ELDER_RECOVER: - .ascii "SORA_ELDER_RECOVER\0\0" -FLAGS_INDOORS_NPC37_REM_SLEEP: - .ascii "NPC37_REM_SLEEP\0" -FLAGS_INDOORS_NPC37_REM_TALK1ST: - .ascii "NPC37_REM_TALK1ST\0\0\0" -FLAGS_INDOORS_SHOP02_KUTSU_00: - .ascii "SHOP02_KUTSU_00\0" -FLAGS_INDOORS_SHOP07_COMPLETE: - .ascii "SHOP07_COMPLETE\0" -FLAGS_INDOORS_SHOP07_TANA: - .ascii "SHOP07_TANA\0" -FLAGS_INDOORS_SHOP07_GACHAPON: - .ascii "SHOP07_GACHAPON\0" -FLAGS_INDOORS_SHOP07_TALK1ST: - .ascii "SHOP07_TALK1ST\0\0" -FLAGS_INDOORS_SHOP03_PAN_1ST: - .ascii "SHOP03_PAN_1ST\0\0" -FLAGS_INDOORS_HOUSE_XXXXX: - .ascii "HOUSE_XXXXX\0" -FLAGS_INDOORS_SHOP01_TALK: - .ascii "SHOP01_TALK\0" -FLAGS_INDOORS_SHOP01_CAFE_01: - .ascii "SHOP01_CAFE_01\0\0" -FLAGS_INDOORS_SHOP01_CAFE_00: - .ascii "SHOP01_CAFE_00\0\0" -FLAGS_INDOORS_SHOP00_YAZUTSU: - .ascii "SHOP00_YAZUTSU\0\0" -FLAGS_INDOORS_SHOP00_SAIFU: - .ascii "SHOP00_SAIFU\0\0\0\0" -FLAGS_INDOORS_SHOP00_ITEM_04: - .ascii "SHOP00_ITEM_04\0\0" -FLAGS_INDOORS_SHOP00_ITEM_03: - .ascii "SHOP00_ITEM_03\0\0" -FLAGS_INDOORS_SHOP00_ITEM_02: - .ascii "SHOP00_ITEM_02\0\0" -FLAGS_INDOORS_SHOP00_ITEM_01: - .ascii "SHOP00_ITEM_01\0\0" -FLAGS_INDOORS_SHOP00_ITEM_00: - .ascii "SHOP00_ITEM_00\0\0" -FLAGS_INDOORS_MHOUSE2_05_00: - .ascii "MHOUSE2_05_00\0\0\0" -FLAGS_INDOORS_MHOUSE2_03_00: - .ascii "MHOUSE2_03_00\0\0\0" -FLAGS_INDOORS_MHOUSE2_02_KEY: - .ascii "MHOUSE2_02_KEY\0\0" -FLAGS_INDOORS_MHOUSE2_02_KAME: - .ascii "MHOUSE2_02_KAME\0" -FLAGS_INDOORS_MHOUSE2_01_T0: - .ascii "MHOUSE2_01_T0\0\0\0" -FLAGS_INDOORS_MHOUSE2_00_03: - .ascii "MHOUSE2_00_03\0\0\0" -FLAGS_INDOORS_MHOUSE2_00_02: - .ascii "MHOUSE2_00_02\0\0\0" -FLAGS_INDOORS_MHOUSE2_00_01: - .ascii "MHOUSE2_00_01\0\0\0" -FLAGS_INDOORS_MHOUSE2_00_00: - .ascii "MHOUSE2_00_00\0\0\0" -FLAGS_INDOORS_MHOUSE15_OP1ST: - .ascii "MHOUSE15_OP1ST\0\0" -FLAGS_INDOORS_MHOUSE14_00: - .ascii "MHOUSE14_00\0" -FLAGS_INDOORS_MHOUSE0C_00: - .ascii "MHOUSE0C_00\0" -FLAGS_INDOORS_MHOUSE08_04: - .ascii "MHOUSE08_04\0" -FLAGS_INDOORS_MHOUSE08_03: - .ascii "MHOUSE08_03\0" -FLAGS_INDOORS_MHOUSE08_02: - .ascii "MHOUSE08_02\0" -FLAGS_INDOORS_MHOUSE08_01: - .ascii "MHOUSE08_01\0" -FLAGS_INDOORS_MHOUSE08_00: - .ascii "MHOUSE08_00\0" -FLAGS_INDOORS_MHOUSE07_01: - .ascii "MHOUSE07_01\0" -FLAGS_INDOORS_MHOUSE07_00: - .ascii "MHOUSE07_00\0" -FLAGS_INDOORS_MHOUSE06_00: - .ascii "MHOUSE06_00\0" -FLAGS_INDOORS_MHOUSE04_04: - .ascii "MHOUSE04_04\0" -FLAGS_INDOORS_MHOUSE04_03: - .ascii "MHOUSE04_03\0" -FLAGS_INDOORS_MHOUSE04_02: - .ascii "MHOUSE04_02\0" -FLAGS_INDOORS_MHOUSE04_01: - .ascii "MHOUSE04_01\0" -FLAGS_INDOORS_MHOUSE04_00: - .ascii "MHOUSE04_00\0" -FLAGS_INDOORS_MHOUSE03_01: - .ascii "MHOUSE03_01\0" -FLAGS_INDOORS_MHOUSE03_00: - .ascii "MHOUSE03_00\0" -FLAGS_INDOORS_MHOUSE01_03: - .ascii "MHOUSE01_03\0" -FLAGS_INDOORS_MHOUSE01_02: - .ascii "MHOUSE01_02\0" -FLAGS_INDOORS_MHOUSE01_01: - .ascii "MHOUSE01_01\0" -FLAGS_INDOORS_MHOUSE01_00: - .ascii "MHOUSE01_00\0" -FLAGS_INDOORS_MHOUSE00_05: - .ascii "MHOUSE00_05\0" -FLAGS_INDOORS_MHOUSE00_04: - .ascii "MHOUSE00_04\0" -FLAGS_INDOORS_MHOUSE00_03: - .ascii "MHOUSE00_03\0" -FLAGS_INDOORS_MHOUSE00_02: - .ascii "MHOUSE00_02\0" -FLAGS_INDOORS_MHOUSE00_01: - .ascii "MHOUSE00_01\0" -FLAGS_INDOORS_MHOUSE00_00: - .ascii "MHOUSE00_00\0" -FLAGS_INDOORS_BILL0C_SCHOOLR_00: - .ascii "BILL0C_SCHOOLR_00\0\0\0" -FLAGS_INDOORS_BILL0B_SCHOOLL_00: - .ascii "BILL0B_SCHOOLL_00\0\0\0" -FLAGS_INDOORS_BILL0A_YADO_TAKARA_00: - .ascii "BILL0A_YADO_TAKARA_00\0\0\0" -FLAGS_INDOORS_BILL09_YADO2F_POEMN: - .ascii "BILL09_YADO2F_POEMN\0" -FLAGS_INDOORS_BILL01_TESSIN_8: - .ascii "BILL01_TESSIN_8\0" -FLAGS_INDOORS_BILL01_TESSIN_7: - .ascii "BILL01_TESSIN_7\0" -FLAGS_INDOORS_BILL01_TESSIN_6: - .ascii "BILL01_TESSIN_6\0" -FLAGS_INDOORS_BILL01_TESSIN_5: - .ascii "BILL01_TESSIN_5\0" -FLAGS_INDOORS_BILL01_TESSIN_4: - .ascii "BILL01_TESSIN_4\0" -FLAGS_INDOORS_BILL01_TESSIN_3: - .ascii "BILL01_TESSIN_3\0" -FLAGS_INDOORS_BILL01_TESSIN_2: - .ascii "BILL01_TESSIN_2\0" -FLAGS_INDOORS_BILL01_TESSIN_1: - .ascii "BILL01_TESSIN_1\0" -FLAGS_INDOORS_BILL00_SHICHOU_04: - .ascii "BILL00_SHICHOU_04\0\0\0" -FLAGS_INDOORS_BILL00_SHICHOU_03: - .ascii "BILL00_SHICHOU_03\0\0\0" -FLAGS_INDOORS_BILL00_SHICHOU_02: - .ascii "BILL00_SHICHOU_02\0\0\0" -FLAGS_INDOORS_BILL00_SHICHOU_01: - .ascii "BILL00_SHICHOU_01\0\0\0" -FLAGS_INDOORS_BILL00_SHICHOU_00: - .ascii "BILL00_SHICHOU_00\0\0\0" -FLAGS_INDOORS_URO_0B_T0: - .ascii "URO_0B_T0\0\0\0" -FLAGS_INDOORS_URO_0A_T0: - .ascii "URO_0A_T0\0\0\0" -FLAGS_INDOORS_URO_08_T0: - .ascii "URO_08_T0\0\0\0" -FLAGS_INDOORS_MHOUSE11_T0: - .ascii "MHOUSE11_T0\0" -FLAGS_INDOORS_KOBITOANA_0B_T0: - .ascii "KOBITOANA_0B_T0\0" -FLAGS_INDOORS_KOBITOANA_0A_T0: - .ascii "KOBITOANA_0A_T0\0" -FLAGS_INDOORS_KOBITOANA_09_T0: - .ascii "KOBITOANA_09_T0\0" -FLAGS_INDOORS_KOBITOANA_07_T0: - .ascii "KOBITOANA_07_T0\0" -FLAGS_INDOORS_KOBITOANA_03_T0: - .ascii "KOBITOANA_03_T0\0" -FLAGS_INDOORS_KOBITOANA_06_T0: - .ascii "KOBITOANA_06_T0\0" -FLAGS_INDOORS_SHOUSE_03_T1: - .ascii "SHOUSE_03_T1\0\0\0\0" -FLAGS_INDOORS_SHOUSE_03_T0: - .ascii "SHOUSE_03_T0\0\0\0\0" -FLAGS_INDOORS_SHOUSE_02_XXXX2: - .ascii "SHOUSE_02_XXXX2\0" -FLAGS_INDOORS_SHOUSE_02_XXXX1: - .ascii "SHOUSE_02_XXXX1\0" -FLAGS_INDOORS_SHOUSE_02_XXXX0: - .ascii "SHOUSE_02_XXXX0\0" -FLAGS_INDOORS_SHOUSE_02_T2: - .ascii "SHOUSE_02_T2\0\0\0\0" -FLAGS_INDOORS_SHOUSE_02_T1: - .ascii "SHOUSE_02_T1\0\0\0\0" -FLAGS_INDOORS_SHOUSE_02_T0: - .ascii "SHOUSE_02_T0\0\0\0\0" -FLAGS_INDOORS_SHOUSE_01_T0: - .ascii "SHOUSE_01_T0\0\0\0\0" -FLAGS_INDOORS_SHOUSE_00_T1: - .ascii "SHOUSE_00_T1\0\0\0\0" -FLAGS_INDOORS_SHOUSE_00_T0: - .ascii "SHOUSE_00_T0\0\0\0\0" -FLAGS_INDOORS_BILL0A_YADO_TAKARA_T0: - .ascii "BILL0A_YADO_TAKARA_T0\0\0\0" -FLAGS_INDOORS_BILL07_YADO1F_UME_T0: - .ascii "BILL07_YADO1F_UME_T0\0\0\0\0" -FLAGS_INDOORS_BILL06_YADO1F_TAKE_T0: - .ascii "BILL06_YADO1F_TAKE_T0\0\0\0" -FLAGS_INDOORS_BILL05_YADO1F_MATSU_T0: - .ascii "BILL05_YADO1F_MATSU_T0\0\0" -.else -FLAGS_INDOORS: - .4byte ENUM_BEGIN - .4byte FLAGS_INDOORS_BILL05_YADO1F_MATSU_T0 - .4byte FLAGS_INDOORS_BILL06_YADO1F_TAKE_T0 - .4byte FLAGS_INDOORS_BILL07_YADO1F_UME_T0 - .4byte FLAGS_INDOORS_BILL0A_YADO_TAKARA_T0 - .4byte FLAGS_INDOORS_SHOUSE_00_T0 - .4byte FLAGS_INDOORS_SHOUSE_00_T1 - .4byte FLAGS_INDOORS_SHOUSE_01_T0 - .4byte FLAGS_INDOORS_SHOUSE_02_T0 - .4byte FLAGS_INDOORS_SHOUSE_02_T1 - .4byte FLAGS_INDOORS_SHOUSE_02_T2 - .4byte FLAGS_INDOORS_SHOUSE_02_XXXX0 - .4byte FLAGS_INDOORS_SHOUSE_02_XXXX1 - .4byte FLAGS_INDOORS_SHOUSE_02_XXXX2 - .4byte FLAGS_INDOORS_SHOUSE_03_T0 - .4byte FLAGS_INDOORS_SHOUSE_03_T1 - .4byte FLAGS_INDOORS_KOBITOANA_06_T0 - .4byte FLAGS_INDOORS_KOBITOANA_03_T0 - .4byte FLAGS_INDOORS_KOBITOANA_07_T0 - .4byte FLAGS_INDOORS_KOBITOANA_09_T0 - .4byte FLAGS_INDOORS_KOBITOANA_0A_T0 - .4byte FLAGS_INDOORS_KOBITOANA_0B_T0 - .4byte FLAGS_INDOORS_MHOUSE11_T0 - .4byte FLAGS_INDOORS_URO_08_T0 - .4byte FLAGS_INDOORS_URO_0A_T0 - .4byte FLAGS_INDOORS_URO_0B_T0 - .4byte FLAGS_INDOORS_BILL00_SHICHOU_00 - .4byte FLAGS_INDOORS_BILL00_SHICHOU_01 - .4byte FLAGS_INDOORS_BILL00_SHICHOU_02 - .4byte FLAGS_INDOORS_BILL00_SHICHOU_03 - .4byte FLAGS_INDOORS_BILL00_SHICHOU_04 - .4byte FLAGS_INDOORS_BILL01_TESSIN_1 - .4byte FLAGS_INDOORS_BILL01_TESSIN_2 - .4byte FLAGS_INDOORS_BILL01_TESSIN_3 - .4byte FLAGS_INDOORS_BILL01_TESSIN_4 - .4byte FLAGS_INDOORS_BILL01_TESSIN_5 - .4byte FLAGS_INDOORS_BILL01_TESSIN_6 - .4byte FLAGS_INDOORS_BILL01_TESSIN_7 - .4byte FLAGS_INDOORS_BILL01_TESSIN_8 - .4byte FLAGS_INDOORS_BILL09_YADO2F_POEMN - .4byte FLAGS_INDOORS_BILL0A_YADO_TAKARA_00 - .4byte FLAGS_INDOORS_BILL0B_SCHOOLL_00 - .4byte FLAGS_INDOORS_BILL0C_SCHOOLR_00 - .4byte FLAGS_INDOORS_MHOUSE00_00 - .4byte FLAGS_INDOORS_MHOUSE00_01 - .4byte FLAGS_INDOORS_MHOUSE00_02 - .4byte FLAGS_INDOORS_MHOUSE00_03 - .4byte FLAGS_INDOORS_MHOUSE00_04 - .4byte FLAGS_INDOORS_MHOUSE00_05 - .4byte FLAGS_INDOORS_MHOUSE01_00 - .4byte FLAGS_INDOORS_MHOUSE01_01 - .4byte FLAGS_INDOORS_MHOUSE01_02 - .4byte FLAGS_INDOORS_MHOUSE01_03 - .4byte FLAGS_INDOORS_MHOUSE03_00 - .4byte FLAGS_INDOORS_MHOUSE03_01 - .4byte FLAGS_INDOORS_MHOUSE04_00 - .4byte FLAGS_INDOORS_MHOUSE04_01 - .4byte FLAGS_INDOORS_MHOUSE04_02 - .4byte FLAGS_INDOORS_MHOUSE04_03 - .4byte FLAGS_INDOORS_MHOUSE04_04 - .4byte FLAGS_INDOORS_MHOUSE06_00 - .4byte FLAGS_INDOORS_MHOUSE07_00 - .4byte FLAGS_INDOORS_MHOUSE07_01 - .4byte FLAGS_INDOORS_MHOUSE08_00 - .4byte FLAGS_INDOORS_MHOUSE08_01 - .4byte FLAGS_INDOORS_MHOUSE08_02 - .4byte FLAGS_INDOORS_MHOUSE08_03 - .4byte FLAGS_INDOORS_MHOUSE08_04 - .4byte FLAGS_INDOORS_MHOUSE0C_00 - .4byte FLAGS_INDOORS_MHOUSE14_00 - .4byte FLAGS_INDOORS_MHOUSE15_OP1ST - .4byte FLAGS_INDOORS_MHOUSE2_00_00 - .4byte FLAGS_INDOORS_MHOUSE2_00_01 - .4byte FLAGS_INDOORS_MHOUSE2_00_02 - .4byte FLAGS_INDOORS_MHOUSE2_00_03 - .4byte FLAGS_INDOORS_MHOUSE2_01_T0 - .4byte FLAGS_INDOORS_MHOUSE2_02_KAME - .4byte FLAGS_INDOORS_MHOUSE2_02_KEY - .4byte FLAGS_INDOORS_MHOUSE2_03_00 - .4byte FLAGS_INDOORS_MHOUSE2_05_00 - .4byte FLAGS_INDOORS_SHOP00_ITEM_00 - .4byte FLAGS_INDOORS_SHOP00_ITEM_01 - .4byte FLAGS_INDOORS_SHOP00_ITEM_02 - .4byte FLAGS_INDOORS_SHOP00_ITEM_03 - .4byte FLAGS_INDOORS_SHOP00_ITEM_04 - .4byte FLAGS_INDOORS_SHOP00_SAIFU - .4byte FLAGS_INDOORS_SHOP00_YAZUTSU - .4byte FLAGS_INDOORS_SHOP01_CAFE_00 - .4byte FLAGS_INDOORS_SHOP01_CAFE_01 - .4byte FLAGS_INDOORS_SHOP01_TALK - .4byte FLAGS_INDOORS_HOUSE_XXXXX - .4byte FLAGS_INDOORS_SHOP03_PAN_1ST - .4byte FLAGS_INDOORS_SHOP07_TALK1ST - .4byte FLAGS_INDOORS_SHOP07_GACHAPON - .4byte FLAGS_INDOORS_SHOP07_TANA - .4byte FLAGS_INDOORS_SHOP07_COMPLETE - .4byte FLAGS_INDOORS_SHOP02_KUTSU_00 - .4byte FLAGS_INDOORS_NPC37_REM_TALK1ST - .4byte FLAGS_INDOORS_NPC37_REM_SLEEP - .4byte FLAGS_INDOORS_SORA_ELDER_RECOVER - .4byte FLAGS_INDOORS_SORA_CHIEF_TALK - .4byte FLAGS_INDOORS_SORA_ELDER_TALK1ST - .4byte FLAGS_INDOORS_SORA_ELDER_TALK2ND - .4byte FLAGS_INDOORS_NPC06_19GUY_QUESTION - .4byte FLAGS_INDOORS_NPC06_19GUY_ANSWER - .4byte FLAGS_INDOORS_DANPEI_TALK1ST - .4byte FLAGS_INDOORS_MIZUKAKI_KOBITO - .4byte FLAGS_INDOORS_MIZUKAKI_HINT1 - .4byte FLAGS_INDOORS_MIZUKAKI_BOOK1_FALL - .4byte FLAGS_INDOORS_MIZUKAKI_HINT2 - .4byte FLAGS_INDOORS_MIZUKAKI_HINT2_2ND - .4byte FLAGS_INDOORS_MIZUKAKI_BOOK2_FALL - .4byte FLAGS_INDOORS_MIZUKAKI_HINT3 - .4byte FLAGS_INDOORS_MIZUKAKI_HINT3_MAYOR - .4byte FLAGS_INDOORS_MIZUKAKI_BOOK3_FALL - .4byte FLAGS_INDOORS_MIZUKAKI_BOOK_ALLBACK - .4byte FLAGS_INDOORS_MIZUKAKI_STAIR - .4byte FLAGS_INDOORS_MIZUKAKI_STAIR_WARP_OK - .4byte FLAGS_INDOORS_KHOUSE27_00 - .4byte FLAGS_INDOORS_NO_USE_00 - .4byte FLAGS_INDOORS_KHOUSE51_00 - .4byte FLAGS_INDOORS_NO_USE_01 - .4byte FLAGS_INDOORS_KHOUSE51_02 - .4byte FLAGS_INDOORS_KHOUSE42_00 - .4byte FLAGS_INDOORS_NO_USE_02 - .4byte FLAGS_INDOORS_NO_USE_03 - .4byte FLAGS_INDOORS_OYAKATA_DEMO - .4byte FLAGS_INDOORS_YAMAKOBITO_OPEN - .4byte FLAGS_INDOORS_M_PRIEST_TALK - .4byte FLAGS_INDOORS_M_ELDER_TALK1ST - .4byte FLAGS_INDOORS_M_PRIEST_MOVE - .4byte FLAGS_INDOORS_M_ELDER_TALK2ND - .4byte FLAGS_INDOORS_MHOUSE04_DANRO - .4byte FLAGS_INDOORS_MHOUSE06_DANRO - .4byte FLAGS_INDOORS_URO_POEMN_TALK - .4byte FLAGS_INDOORS_MHOUSE06_MES_20 - .4byte FLAGS_INDOORS_MHOUSE07_MES_20 - .4byte FLAGS_INDOORS_MAYOR_2_TALK1ST - .4byte FLAGS_INDOORS_MAYOR_4_TALK1ST - .4byte FLAGS_INDOORS_BILL01_TESSIN_RESERVED - .4byte FLAGS_INDOORS_BILL01_TESSIN_BRANDNEW - .4byte FLAGS_INDOORS_KOBITO_MORI_1ST - .4byte FLAGS_INDOORS_KOBITO_YAMA_ENTER - .4byte FLAGS_INDOORS_KHOUSE52_KINOKO - .4byte FLAGS_INDOORS_SORA_YAKATA_ENTER - .4byte FLAGS_INDOORS_YADO_CHECKIN - .4byte FLAGS_INDOORS_MINIGAME_GAMEEND - .4byte FLAGS_INDOORS_MINIGAME_LEVEL2 - .4byte FLAGS_INDOORS_MHOUSE_DIN_TALK - .4byte FLAGS_INDOORS_MHOUSE_NAYRU_TALK - .4byte FLAGS_INDOORS_MHOUSE_FARORE_TALK - .4byte FLAGS_INDOORS_URO_12_H0 - .4byte FLAGS_INDOORS_URO_19_H0 - .4byte FLAGS_INDOORS_URO_1F_H0 - .4byte FLAGS_INDOORS_BILL09_TSW0 - .4byte FLAGS_INDOORS_BILL09_TSW1 - .4byte FLAGS_INDOORS_KHOUSE41_TALK1ST - .4byte FLAGS_INDOORS_TAIMA_SAIBAI_1ST - .4byte FLAGS_INDOORS_IZUMI_00_FAIRY - .4byte FLAGS_INDOORS_IZUMI_01_FAIRY - .4byte FLAGS_INDOORS_IZUMI_02_FAIRY - .4byte FLAGS_INDOORS_BILL0B_DOUZOU_L - .4byte FLAGS_INDOORS_BILL0B_DOUZOU_R - .4byte FLAGS_INDOORS_KOBITOANA_08_T0 - .4byte FLAGS_INDOORS_KOBITOANA_0C_T0 - .4byte FLAGS_INDOORS_KOBITOANA_0D_T0 - .4byte FLAGS_INDOORS_KOBITOHOUSE_23_H0 - .4byte FLAGS_INDOORS_MHOUSE08_DANRO - .4byte FLAGS_INDOORS_MHOUSE09_DANRO - .4byte FLAGS_INDOORS_MHOUSE0A_DANRO - .4byte FLAGS_INDOORS_MHOUSE0B_DANRO - .4byte FLAGS_INDOORS_MHOUSE0C_DANRO - .4byte FLAGS_INDOORS_MHOUSE12_DANRO - .4byte FLAGS_INDOORS_SORA_DANRO - .4byte FLAGS_INDOORS_MIZUKAKI_HINT3_MAP - .4byte FLAGS_INDOORS_LEFT_TALK - .4byte FLAGS_INDOORS_KHOUSE26_REMOCON - .4byte FLAGS_INDOORS_SORA_KIDS_MOVE - .4byte FLAGS_INDOORS_KOBITOANA_00_T0 - .4byte FLAGS_INDOORS_KHOUSE23_TALK1ST - .4byte FLAGS_INDOORS_SHOP05_ELEMENT_H00 - .4byte FLAGS_INDOORS_SHOP05_ELEMENT_T00 - .4byte FLAGS_INDOORS_SHOP05_ELEMENT_T01 - .4byte FLAGS_INDOORS_SHOP05_ELEMENT_T02 - .4byte FLAGS_INDOORS_BILL0a_YADO_TAKARA_H00 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R00 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R01 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R02 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R03 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R04 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R05 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R06 - .4byte FLAGS_INDOORS_KOBITOYAMA_00_R07 - .4byte FLAGS_INDOORS_KOBITO_MORI_00_H00 - .4byte FLAGS_INDOORS_KOBITO_MORI_00_H0 - .4byte FLAGS_INDOORS_CAFE_01_CAP_0 - .4byte FLAGS_INDOORS_BILL_00_CAP_0 - .4byte FLAGS_INDOORS_BILL_02_CAP_0 - .4byte FLAGS_INDOORS_MHOUSE_07_CAP_0 - .4byte FLAGS_INDOORS_MHOUSE_07_CAP_1 - .4byte FLAGS_INDOORS_MHOUSE_10_CAP_0 - .4byte FLAGS_INDOORS_MHOUSE_15_CAP_0 - .4byte FLAGS_INDOORS_MHOUSE_15_CAP_1 - .4byte FLAGS_INDOORS_SHOP_03_CAP_0 - .4byte FLAGS_INDOORS_MHOUSE_07_CAP_2 -.ifndef EU - .4byte FLAGS_INDOORS_SHOP00_BOMBBAG - .4byte FLAGS_INDOORS_CAFE_01_CAP_1 -.ifndef JP - .4byte FLAGS_INDOORS_KS_A02 - .4byte FLAGS_INDOORS_KS_A09 - .4byte FLAGS_INDOORS_KS_A18 - .4byte FLAGS_INDOORS_KS_B07 - .4byte FLAGS_INDOORS_KS_B16 -.endif -.endif - .4byte ENUM_END - -.ifndef EU -.ifndef JP -FLAGS_INDOORS_KS_B16: - .ascii "KS_B16\0\0" -FLAGS_INDOORS_KS_B07: - .ascii "KS_B07\0\0" -FLAGS_INDOORS_KS_A18: - .ascii "KS_A18\0\0" -FLAGS_INDOORS_KS_A09: - .ascii "KS_A09\0\0" -FLAGS_INDOORS_KS_A02: - .ascii "KS_A02\0\0" -.endif -FLAGS_INDOORS_CAFE_01_CAP_1: - .ascii "CAFE_01_CAP_1\0\0\0" -FLAGS_INDOORS_SHOP00_BOMBBAG: - .ascii "SHOP00_BOMBBAG\0\0" -.endif -FLAGS_INDOORS_MHOUSE_07_CAP_2: - .ascii "MHOUSE_07_CAP_2\0" -FLAGS_INDOORS_SHOP_03_CAP_0: - .ascii "SHOP_03_CAP_0\0\0\0" -FLAGS_INDOORS_MHOUSE_15_CAP_1: - .ascii "MHOUSE_15_CAP_1\0" -FLAGS_INDOORS_MHOUSE_15_CAP_0: - .ascii "MHOUSE_15_CAP_0\0" -FLAGS_INDOORS_MHOUSE_10_CAP_0: - .ascii "MHOUSE_10_CAP_0\0" -FLAGS_INDOORS_MHOUSE_07_CAP_1: - .ascii "MHOUSE_07_CAP_1\0" -FLAGS_INDOORS_MHOUSE_07_CAP_0: - .ascii "MHOUSE_07_CAP_0\0" -FLAGS_INDOORS_BILL_02_CAP_0: - .ascii "BILL_02_CAP_0\0\0\0" -FLAGS_INDOORS_BILL_00_CAP_0: - .ascii "BILL_00_CAP_0\0\0\0" -FLAGS_INDOORS_CAFE_01_CAP_0: - .ascii "CAFE_01_CAP_0\0\0\0" -FLAGS_INDOORS_KOBITO_MORI_00_H0: - .ascii "KOBITO_MORI_00_H0\0\0\0" -FLAGS_INDOORS_KOBITO_MORI_00_H00: - .ascii "KOBITO_MORI_00_H00\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R07: - .ascii "KOBITOYAMA_00_R07\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R06: - .ascii "KOBITOYAMA_00_R06\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R05: - .ascii "KOBITOYAMA_00_R05\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R04: - .ascii "KOBITOYAMA_00_R04\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R03: - .ascii "KOBITOYAMA_00_R03\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R02: - .ascii "KOBITOYAMA_00_R02\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R01: - .ascii "KOBITOYAMA_00_R01\0\0\0" -FLAGS_INDOORS_KOBITOYAMA_00_R00: - .ascii "KOBITOYAMA_00_R00\0\0\0" -FLAGS_INDOORS_BILL0a_YADO_TAKARA_H00: - .ascii "BILL0a_YADO_TAKARA_H00\0\0" -FLAGS_INDOORS_SHOP05_ELEMENT_T02: - .ascii "SHOP05_ELEMENT_T02\0\0" -FLAGS_INDOORS_SHOP05_ELEMENT_T01: - .ascii "SHOP05_ELEMENT_T01\0\0" -FLAGS_INDOORS_SHOP05_ELEMENT_T00: - .ascii "SHOP05_ELEMENT_T00\0\0" -FLAGS_INDOORS_SHOP05_ELEMENT_H00: - .ascii "SHOP05_ELEMENT_H00\0\0" -FLAGS_INDOORS_KHOUSE23_TALK1ST: - .ascii "KHOUSE23_TALK1ST\0\0\0\0" -FLAGS_INDOORS_KOBITOANA_00_T0: - .ascii "KOBITOANA_00_T0\0" -FLAGS_INDOORS_SORA_KIDS_MOVE: - .ascii "SORA_KIDS_MOVE\0\0" -FLAGS_INDOORS_KHOUSE26_REMOCON: - .ascii "KHOUSE26_REMOCON\0\0\0\0" -FLAGS_INDOORS_LEFT_TALK: - .ascii "LEFT_TALK\0\0\0" -FLAGS_INDOORS_MIZUKAKI_HINT3_MAP: - .ascii "MIZUKAKI_HINT3_MAP\0\0" -FLAGS_INDOORS_SORA_DANRO: - .ascii "SORA_DANRO\0\0" -FLAGS_INDOORS_MHOUSE12_DANRO: - .ascii "MHOUSE12_DANRO\0\0" -FLAGS_INDOORS_MHOUSE0C_DANRO: - .ascii "MHOUSE0C_DANRO\0\0" -FLAGS_INDOORS_MHOUSE0B_DANRO: - .ascii "MHOUSE0B_DANRO\0\0" -FLAGS_INDOORS_MHOUSE0A_DANRO: - .ascii "MHOUSE0A_DANRO\0\0" -FLAGS_INDOORS_MHOUSE09_DANRO: - .ascii "MHOUSE09_DANRO\0\0" -FLAGS_INDOORS_MHOUSE08_DANRO: - .ascii "MHOUSE08_DANRO\0\0" -FLAGS_INDOORS_KOBITOHOUSE_23_H0: - .ascii "KOBITOHOUSE_23_H0\0\0\0" -FLAGS_INDOORS_KOBITOANA_0D_T0: - .ascii "KOBITOANA_0D_T0\0" -FLAGS_INDOORS_KOBITOANA_0C_T0: - .ascii "KOBITOANA_0C_T0\0" -FLAGS_INDOORS_KOBITOANA_08_T0: - .ascii "KOBITOANA_08_T0\0" -FLAGS_INDOORS_BILL0B_DOUZOU_R: - .ascii "BILL0B_DOUZOU_R\0" -FLAGS_INDOORS_BILL0B_DOUZOU_L: - .ascii "BILL0B_DOUZOU_L\0" -FLAGS_INDOORS_IZUMI_02_FAIRY: - .ascii "IZUMI_02_FAIRY\0\0" -FLAGS_INDOORS_IZUMI_01_FAIRY: - .ascii "IZUMI_01_FAIRY\0\0" -FLAGS_INDOORS_IZUMI_00_FAIRY: - .ascii "IZUMI_00_FAIRY\0\0" -FLAGS_INDOORS_TAIMA_SAIBAI_1ST: - .ascii "TAIMA_SAIBAI_1ST\0\0\0\0" -FLAGS_INDOORS_KHOUSE41_TALK1ST: - .ascii "KHOUSE41_TALK1ST\0\0\0\0" -FLAGS_INDOORS_BILL09_TSW1: - .ascii "BILL09_TSW1\0" -FLAGS_INDOORS_BILL09_TSW0: - .ascii "BILL09_TSW0\0" -FLAGS_INDOORS_URO_1F_H0: - .ascii "URO_1F_H0\0\0\0" -FLAGS_INDOORS_URO_19_H0: - .ascii "URO_19_H0\0\0\0" -FLAGS_INDOORS_URO_12_H0: - .ascii "URO_12_H0\0\0\0" -FLAGS_INDOORS_MHOUSE_FARORE_TALK: - .ascii "MHOUSE_FARORE_TALK\0\0" -FLAGS_INDOORS_MHOUSE_NAYRU_TALK: - .ascii "MHOUSE_NAYRU_TALK\0\0\0" -FLAGS_INDOORS_MHOUSE_DIN_TALK: - .ascii "MHOUSE_DIN_TALK\0" -FLAGS_INDOORS_MINIGAME_LEVEL2: - .ascii "MINIGAME_LEVEL2\0" -FLAGS_INDOORS_MINIGAME_GAMEEND: - .ascii "MINIGAME_GAMEEND\0\0\0\0" -FLAGS_INDOORS_YADO_CHECKIN: - .ascii "YADO_CHECKIN\0\0\0\0" -FLAGS_INDOORS_SORA_YAKATA_ENTER: - .ascii "SORA_YAKATA_ENTER\0\0\0" -FLAGS_INDOORS_KHOUSE52_KINOKO: - .ascii "KHOUSE52_KINOKO\0" -FLAGS_INDOORS_KOBITO_YAMA_ENTER: - .ascii "KOBITO_YAMA_ENTER\0\0\0" -FLAGS_INDOORS_KOBITO_MORI_1ST: - .ascii "KOBITO_MORI_1ST\0" -FLAGS_INDOORS_BILL01_TESSIN_BRANDNEW: - .ascii "BILL01_TESSIN_BRANDNEW\0\0" -FLAGS_INDOORS_BILL01_TESSIN_RESERVED: - .ascii "BILL01_TESSIN_RESERVED\0\0" -FLAGS_INDOORS_MAYOR_4_TALK1ST: - .ascii "MAYOR_4_TALK1ST\0" -FLAGS_INDOORS_MAYOR_2_TALK1ST: - .ascii "MAYOR_2_TALK1ST\0" -FLAGS_INDOORS_MHOUSE07_MES_20: - .ascii "MHOUSE07_MES_20\0" -FLAGS_INDOORS_MHOUSE06_MES_20: - .ascii "MHOUSE06_MES_20\0" -FLAGS_INDOORS_URO_POEMN_TALK: - .ascii "URO_POEMN_TALK\0\0" -FLAGS_INDOORS_MHOUSE06_DANRO: - .ascii "MHOUSE06_DANRO\0\0" -FLAGS_INDOORS_MHOUSE04_DANRO: - .ascii "MHOUSE04_DANRO\0\0" -FLAGS_INDOORS_M_ELDER_TALK2ND: - .ascii "M_ELDER_TALK2ND\0" -FLAGS_INDOORS_M_PRIEST_MOVE: - .ascii "M_PRIEST_MOVE\0\0\0" -FLAGS_INDOORS_M_ELDER_TALK1ST: - .ascii "M_ELDER_TALK1ST\0" -FLAGS_INDOORS_M_PRIEST_TALK: - .ascii "M_PRIEST_TALK\0\0\0" -FLAGS_INDOORS_YAMAKOBITO_OPEN: - .ascii "YAMAKOBITO_OPEN\0" -FLAGS_INDOORS_OYAKATA_DEMO: - .ascii "OYAKATA_DEMO\0\0\0\0" -FLAGS_INDOORS_NO_USE_03: - .ascii "NO_USE_03\0\0\0" -FLAGS_INDOORS_NO_USE_02: - .ascii "NO_USE_02\0\0\0" -FLAGS_INDOORS_KHOUSE42_00: - .ascii "KHOUSE42_00\0" -FLAGS_INDOORS_KHOUSE51_02: - .ascii "KHOUSE51_02\0" -FLAGS_INDOORS_NO_USE_01: - .ascii "NO_USE_01\0\0\0" -FLAGS_INDOORS_KHOUSE51_00: - .ascii "KHOUSE51_00\0" -FLAGS_INDOORS_NO_USE_00: - .ascii "NO_USE_00\0\0\0" -FLAGS_INDOORS_KHOUSE27_00: - .ascii "KHOUSE27_00\0" -FLAGS_INDOORS_MIZUKAKI_STAIR_WARP_OK: - .ascii "MIZUKAKI_STAIR_WARP_OK\0\0" -FLAGS_INDOORS_MIZUKAKI_STAIR: - .ascii "MIZUKAKI_STAIR\0\0" -FLAGS_INDOORS_MIZUKAKI_BOOK_ALLBACK: - .ascii "MIZUKAKI_BOOK_ALLBACK\0\0\0" -FLAGS_INDOORS_MIZUKAKI_BOOK3_FALL: - .ascii "MIZUKAKI_BOOK3_FALL\0" -FLAGS_INDOORS_MIZUKAKI_HINT3_MAYOR: - .ascii "MIZUKAKI_HINT3_MAYOR\0\0\0\0" -FLAGS_INDOORS_MIZUKAKI_HINT3: - .ascii "MIZUKAKI_HINT3\0\0" -FLAGS_INDOORS_MIZUKAKI_BOOK2_FALL: - .ascii "MIZUKAKI_BOOK2_FALL\0" -FLAGS_INDOORS_MIZUKAKI_HINT2_2ND: - .ascii "MIZUKAKI_HINT2_2ND\0\0" -FLAGS_INDOORS_MIZUKAKI_HINT2: - .ascii "MIZUKAKI_HINT2\0\0" -FLAGS_INDOORS_MIZUKAKI_BOOK1_FALL: - .ascii "MIZUKAKI_BOOK1_FALL\0" -FLAGS_INDOORS_MIZUKAKI_HINT1: - .ascii "MIZUKAKI_HINT1\0\0" -FLAGS_INDOORS_MIZUKAKI_KOBITO: - .ascii "MIZUKAKI_KOBITO\0" -FLAGS_INDOORS_DANPEI_TALK1ST: - .ascii "DANPEI_TALK1ST\0\0" -FLAGS_INDOORS_NPC06_19GUY_ANSWER: - .ascii "NPC06_19GUY_ANSWER\0\0" -FLAGS_INDOORS_NPC06_19GUY_QUESTION: - .ascii "NPC06_19GUY_QUESTION\0\0\0\0" -FLAGS_INDOORS_SORA_ELDER_TALK2ND: - .ascii "SORA_ELDER_TALK2ND\0\0" -FLAGS_INDOORS_SORA_ELDER_TALK1ST: - .ascii "SORA_ELDER_TALK1ST\0\0" -FLAGS_INDOORS_SORA_CHIEF_TALK: - .ascii "SORA_CHIEF_TALK\0" -FLAGS_INDOORS_SORA_ELDER_RECOVER: - .ascii "SORA_ELDER_RECOVER\0\0" -FLAGS_INDOORS_NPC37_REM_SLEEP: - .ascii "NPC37_REM_SLEEP\0" -FLAGS_INDOORS_NPC37_REM_TALK1ST: - .ascii "NPC37_REM_TALK1ST\0\0\0" -FLAGS_INDOORS_SHOP02_KUTSU_00: - .ascii "SHOP02_KUTSU_00\0" -FLAGS_INDOORS_SHOP07_COMPLETE: - .ascii "SHOP07_COMPLETE\0" -FLAGS_INDOORS_SHOP07_TANA: - .ascii "SHOP07_TANA\0" -FLAGS_INDOORS_SHOP07_GACHAPON: - .ascii "SHOP07_GACHAPON\0" -FLAGS_INDOORS_SHOP07_TALK1ST: - .ascii "SHOP07_TALK1ST\0\0" -FLAGS_INDOORS_SHOP03_PAN_1ST: - .ascii "SHOP03_PAN_1ST\0\0" -FLAGS_INDOORS_HOUSE_XXXXX: - .ascii "HOUSE_XXXXX\0" -FLAGS_INDOORS_SHOP01_TALK: - .ascii "SHOP01_TALK\0" -FLAGS_INDOORS_SHOP01_CAFE_01: - .ascii "SHOP01_CAFE_01\0\0" -FLAGS_INDOORS_SHOP01_CAFE_00: - .ascii "SHOP01_CAFE_00\0\0" -FLAGS_INDOORS_SHOP00_YAZUTSU: - .ascii "SHOP00_YAZUTSU\0\0" -FLAGS_INDOORS_SHOP00_SAIFU: - .ascii "SHOP00_SAIFU\0\0\0\0" -FLAGS_INDOORS_SHOP00_ITEM_04: - .ascii "SHOP00_ITEM_04\0\0" -FLAGS_INDOORS_SHOP00_ITEM_03: - .ascii "SHOP00_ITEM_03\0\0" -FLAGS_INDOORS_SHOP00_ITEM_02: - .ascii "SHOP00_ITEM_02\0\0" -FLAGS_INDOORS_SHOP00_ITEM_01: - .ascii "SHOP00_ITEM_01\0\0" -FLAGS_INDOORS_SHOP00_ITEM_00: - .ascii "SHOP00_ITEM_00\0\0" -FLAGS_INDOORS_MHOUSE2_05_00: - .ascii "MHOUSE2_05_00\0\0\0" -FLAGS_INDOORS_MHOUSE2_03_00: - .ascii "MHOUSE2_03_00\0\0\0" -FLAGS_INDOORS_MHOUSE2_02_KEY: - .ascii "MHOUSE2_02_KEY\0\0" -FLAGS_INDOORS_MHOUSE2_02_KAME: - .ascii "MHOUSE2_02_KAME\0" -FLAGS_INDOORS_MHOUSE2_01_T0: - .ascii "MHOUSE2_01_T0\0\0\0" -FLAGS_INDOORS_MHOUSE2_00_03: - .ascii "MHOUSE2_00_03\0\0\0" -FLAGS_INDOORS_MHOUSE2_00_02: - .ascii "MHOUSE2_00_02\0\0\0" -FLAGS_INDOORS_MHOUSE2_00_01: - .ascii "MHOUSE2_00_01\0\0\0" -FLAGS_INDOORS_MHOUSE2_00_00: - .ascii "MHOUSE2_00_00\0\0\0" -FLAGS_INDOORS_MHOUSE15_OP1ST: - .ascii "MHOUSE15_OP1ST\0\0" -FLAGS_INDOORS_MHOUSE14_00: - .ascii "MHOUSE14_00\0" -FLAGS_INDOORS_MHOUSE0C_00: - .ascii "MHOUSE0C_00\0" -FLAGS_INDOORS_MHOUSE08_04: - .ascii "MHOUSE08_04\0" -FLAGS_INDOORS_MHOUSE08_03: - .ascii "MHOUSE08_03\0" -FLAGS_INDOORS_MHOUSE08_02: - .ascii "MHOUSE08_02\0" -FLAGS_INDOORS_MHOUSE08_01: - .ascii "MHOUSE08_01\0" -FLAGS_INDOORS_MHOUSE08_00: - .ascii "MHOUSE08_00\0" -FLAGS_INDOORS_MHOUSE07_01: - .ascii "MHOUSE07_01\0" -FLAGS_INDOORS_MHOUSE07_00: - .ascii "MHOUSE07_00\0" -FLAGS_INDOORS_MHOUSE06_00: - .ascii "MHOUSE06_00\0" -FLAGS_INDOORS_MHOUSE04_04: - .ascii "MHOUSE04_04\0" -FLAGS_INDOORS_MHOUSE04_03: - .ascii "MHOUSE04_03\0" -FLAGS_INDOORS_MHOUSE04_02: - .ascii "MHOUSE04_02\0" -FLAGS_INDOORS_MHOUSE04_01: - .ascii "MHOUSE04_01\0" -FLAGS_INDOORS_MHOUSE04_00: - .ascii "MHOUSE04_00\0" -FLAGS_INDOORS_MHOUSE03_01: - .ascii "MHOUSE03_01\0" -FLAGS_INDOORS_MHOUSE03_00: - .ascii "MHOUSE03_00\0" -FLAGS_INDOORS_MHOUSE01_03: - .ascii "MHOUSE01_03\0" -FLAGS_INDOORS_MHOUSE01_02: - .ascii "MHOUSE01_02\0" -FLAGS_INDOORS_MHOUSE01_01: - .ascii "MHOUSE01_01\0" -FLAGS_INDOORS_MHOUSE01_00: - .ascii "MHOUSE01_00\0" -FLAGS_INDOORS_MHOUSE00_05: - .ascii "MHOUSE00_05\0" -FLAGS_INDOORS_MHOUSE00_04: - .ascii "MHOUSE00_04\0" -FLAGS_INDOORS_MHOUSE00_03: - .ascii "MHOUSE00_03\0" -FLAGS_INDOORS_MHOUSE00_02: - .ascii "MHOUSE00_02\0" -FLAGS_INDOORS_MHOUSE00_01: - .ascii "MHOUSE00_01\0" -FLAGS_INDOORS_MHOUSE00_00: - .ascii "MHOUSE00_00\0" -FLAGS_INDOORS_BILL0C_SCHOOLR_00: - .ascii "BILL0C_SCHOOLR_00\0\0\0" -FLAGS_INDOORS_BILL0B_SCHOOLL_00: - .ascii "BILL0B_SCHOOLL_00\0\0\0" -FLAGS_INDOORS_BILL0A_YADO_TAKARA_00: - .ascii "BILL0A_YADO_TAKARA_00\0\0\0" -FLAGS_INDOORS_BILL09_YADO2F_POEMN: - .ascii "BILL09_YADO2F_POEMN\0" -FLAGS_INDOORS_BILL01_TESSIN_8: - .ascii "BILL01_TESSIN_8\0" -FLAGS_INDOORS_BILL01_TESSIN_7: - .ascii "BILL01_TESSIN_7\0" -FLAGS_INDOORS_BILL01_TESSIN_6: - .ascii "BILL01_TESSIN_6\0" -FLAGS_INDOORS_BILL01_TESSIN_5: - .ascii "BILL01_TESSIN_5\0" -FLAGS_INDOORS_BILL01_TESSIN_4: - .ascii "BILL01_TESSIN_4\0" -FLAGS_INDOORS_BILL01_TESSIN_3: - .ascii "BILL01_TESSIN_3\0" -FLAGS_INDOORS_BILL01_TESSIN_2: - .ascii "BILL01_TESSIN_2\0" -FLAGS_INDOORS_BILL01_TESSIN_1: - .ascii "BILL01_TESSIN_1\0" -FLAGS_INDOORS_BILL00_SHICHOU_04: - .ascii "BILL00_SHICHOU_04\0\0\0" -FLAGS_INDOORS_BILL00_SHICHOU_03: - .ascii "BILL00_SHICHOU_03\0\0\0" -FLAGS_INDOORS_BILL00_SHICHOU_02: - .ascii "BILL00_SHICHOU_02\0\0\0" -FLAGS_INDOORS_BILL00_SHICHOU_01: - .ascii "BILL00_SHICHOU_01\0\0\0" -FLAGS_INDOORS_BILL00_SHICHOU_00: - .ascii "BILL00_SHICHOU_00\0\0\0" -FLAGS_INDOORS_URO_0B_T0: - .ascii "URO_0B_T0\0\0\0" -FLAGS_INDOORS_URO_0A_T0: - .ascii "URO_0A_T0\0\0\0" -FLAGS_INDOORS_URO_08_T0: - .ascii "URO_08_T0\0\0\0" -FLAGS_INDOORS_MHOUSE11_T0: - .ascii "MHOUSE11_T0\0" -FLAGS_INDOORS_KOBITOANA_0B_T0: - .ascii "KOBITOANA_0B_T0\0" -FLAGS_INDOORS_KOBITOANA_0A_T0: - .ascii "KOBITOANA_0A_T0\0" -FLAGS_INDOORS_KOBITOANA_09_T0: - .ascii "KOBITOANA_09_T0\0" -FLAGS_INDOORS_KOBITOANA_07_T0: - .ascii "KOBITOANA_07_T0\0" -FLAGS_INDOORS_KOBITOANA_03_T0: - .ascii "KOBITOANA_03_T0\0" -FLAGS_INDOORS_KOBITOANA_06_T0: - .ascii "KOBITOANA_06_T0\0" -FLAGS_INDOORS_SHOUSE_03_T1: - .ascii "SHOUSE_03_T1\0\0\0\0" -FLAGS_INDOORS_SHOUSE_03_T0: - .ascii "SHOUSE_03_T0\0\0\0\0" -FLAGS_INDOORS_SHOUSE_02_XXXX2: - .ascii "SHOUSE_02_XXXX2\0" -FLAGS_INDOORS_SHOUSE_02_XXXX1: - .ascii "SHOUSE_02_XXXX1\0" -FLAGS_INDOORS_SHOUSE_02_XXXX0: - .ascii "SHOUSE_02_XXXX0\0" -FLAGS_INDOORS_SHOUSE_02_T2: - .ascii "SHOUSE_02_T2\0\0\0\0" -FLAGS_INDOORS_SHOUSE_02_T1: - .ascii "SHOUSE_02_T1\0\0\0\0" -FLAGS_INDOORS_SHOUSE_02_T0: - .ascii "SHOUSE_02_T0\0\0\0\0" -FLAGS_INDOORS_SHOUSE_01_T0: - .ascii "SHOUSE_01_T0\0\0\0\0" -FLAGS_INDOORS_SHOUSE_00_T1: - .ascii "SHOUSE_00_T1\0\0\0\0" -FLAGS_INDOORS_SHOUSE_00_T0: - .ascii "SHOUSE_00_T0\0\0\0\0" -FLAGS_INDOORS_BILL0A_YADO_TAKARA_T0: - .ascii "BILL0A_YADO_TAKARA_T0\0\0\0" -FLAGS_INDOORS_BILL07_YADO1F_UME_T0: - .ascii "BILL07_YADO1F_UME_T0\0\0\0\0" -FLAGS_INDOORS_BILL06_YADO1F_TAKE_T0: - .ascii "BILL06_YADO1F_TAKE_T0\0\0\0" -FLAGS_INDOORS_BILL05_YADO1F_MATSU_T0: - .ascii "BILL05_YADO1F_MATSU_T0\0\0" - -.endif - -FLAGS_CAVES1: - .4byte ENUM_BEGIN - .4byte FLAGS_CAVES1_MAROYA_TAKARA - .4byte FLAGS_CAVES1_MACHI_CHIKA_00_00 - .4byte FLAGS_CAVES1_MACHI_CHIKA_00_01 - .4byte FLAGS_CAVES1_MACHI_CHIKA_00_02 - .4byte FLAGS_CAVES1_MACHI_CHIKA_00_03 - .4byte FLAGS_CAVES1_MACHI_CHIKA_00_T0 - .4byte FLAGS_CAVES1_MACHI_CHIKA_00_T1 - .4byte FLAGS_CAVES1_MACHI_CHIKA_00_T2 - .4byte FLAGS_CAVES1_MACHI_CHIKA_00_T3 - .4byte FLAGS_CAVES1_MACHI_CHIKA_00_T4 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_00_T0 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_01_T0 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_03_00 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_03_01 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_03_T0 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_04_T0 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_10_00 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_10_01 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_10_02 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_10_T0 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_12_T0 - .4byte FLAGS_CAVES1_LV4_HAKA_05_T0 - .4byte FLAGS_CAVES1_LV4_HAKA_04_T0 - .4byte FLAGS_CAVES1_LV4_HAKA_04_T1 - .4byte FLAGS_CAVES1_LV4_HAKA_01_00 - .4byte FLAGS_CAVES1_LV4_HAKA_01_01 - .4byte FLAGS_CAVES1_LV4_HAKA_03_00 - .4byte FLAGS_CAVES1_LV4_HAKA_04_R0 - .4byte FLAGS_CAVES1_LV4_HAKA_04_R1 - .4byte FLAGS_CAVES1_LV4_HAKA_04_R2 - .4byte FLAGS_CAVES1_LV4_HAKA_04_R3 - .4byte FLAGS_CAVES1_LV4_HAKA_04_R4 - .4byte FLAGS_CAVES1_LV4_HAKA_04_R5 - .4byte FLAGS_CAVES1_LV4_HAKA_04_R6 - .4byte FLAGS_CAVES1_LV4_HAKA_04_R8 - .4byte FLAGS_CAVES1_LV4_HAKA_04_R9 - .4byte FLAGS_CAVES1_LV4_HAKA_04_R10 - .4byte FLAGS_CAVES1_LV4_HAKA_04_R11 - .4byte FLAGS_CAVES1_LV4_HAKA_04_KB0 - .4byte FLAGS_CAVES1_LV4_HAKA_04_KB1 - .4byte FLAGS_CAVES1_LV4_HAKA_05_H0 - .4byte FLAGS_CAVES1_LV4_HAKA_05_H1 - .4byte FLAGS_CAVES1_LV4_HAKA_05_H2 - .4byte FLAGS_CAVES1_LV4_HAKA_05_H3 - .4byte FLAGS_CAVES1_OUBO_02_BW0 - .4byte FLAGS_CAVES1_OUBO_02_BW1 - .4byte FLAGS_CAVES1_OUBO_06_BW0 - .4byte FLAGS_CAVES1_OUBO_06_BW1 - .4byte FLAGS_CAVES1_OUBO_07_ENTER - .4byte FLAGS_CAVES1_OUBO_KAKERA - .4byte FLAGS_CAVES1_MOGURA_00_T0 - .4byte FLAGS_CAVES1_MOGURA_00_T1 - .4byte FLAGS_CAVES1_MOGURA_00_T2 - .4byte FLAGS_CAVES1_MOGURA_01_T0 - .4byte FLAGS_CAVES1_MOGURA_02_T0 - .4byte FLAGS_CAVES1_MOGURA_02_T1 - .4byte FLAGS_CAVES1_MOGURA_02_T2 - .4byte FLAGS_CAVES1_MOGURA_02_T3 - .4byte FLAGS_CAVES1_MOGURA_02_T4 - .4byte FLAGS_CAVES1_MOGURA_02_T5 - .4byte FLAGS_CAVES1_MOGURA_02_T6 - .4byte FLAGS_CAVES1_MOGURA_02_T7 - .4byte FLAGS_CAVES1_MOGURA_02_T8 - .4byte FLAGS_CAVES1_MOGURA_09_T0 - .4byte FLAGS_CAVES1_MOGURA_09_T1 - .4byte FLAGS_CAVES1_MOGURA_10_T0 - .4byte FLAGS_CAVES1_MOGURA_10_T1 - .4byte FLAGS_CAVES1_MOGURA_10_T2 - .4byte FLAGS_CAVES1_MOGURA_1c_T0 - .4byte FLAGS_CAVES1_MOGURA_21_r0 - .4byte FLAGS_CAVES1_MOGURA_27_T0 - .4byte FLAGS_CAVES1_MOGURA_27_T1 - .4byte FLAGS_CAVES1_MOGURA_27_T2 - .4byte FLAGS_CAVES1_MOGURA_41_T0 - .4byte FLAGS_CAVES1_MOGURA_41_T1 - .4byte FLAGS_CAVES1_MOGURA_41_T2 - .4byte FLAGS_CAVES1_MOGURA_41_T3 - .4byte FLAGS_CAVES1_MOGURA_50_00 - .4byte FLAGS_CAVES1_MOGURA_50_T0 - .4byte FLAGS_CAVES1_MOGURA_51_T0 - .4byte FLAGS_CAVES1_MOGURA_51_T1 - .4byte FLAGS_CAVES1_MOGURA_51_T2 - .4byte FLAGS_CAVES1_MOGURA_51_00 - .4byte FLAGS_CAVES1_MOGURA_51_01 - .4byte FLAGS_CAVES1_MOGURA_51_02 - .4byte FLAGS_CAVES1_MOGURA_51_03 - .4byte FLAGS_CAVES1_MOGURA_51_04 - .4byte FLAGS_CAVES1_MOGURA_51_05 - .4byte FLAGS_CAVES1_MOGURA_51_06 - .4byte FLAGS_CAVES1_MOGURA_51_07 - .4byte FLAGS_CAVES1_MOGURA_51_08 - .4byte FLAGS_CAVES1_MOGURA_52_00 - .4byte FLAGS_CAVES1_MOGURA_52_T0 - .4byte FLAGS_CAVES1_MOGURA_52_T1 - .4byte FLAGS_CAVES1_MOGURA_53_00 - .4byte FLAGS_CAVES1_MOGURA_53_T0 - .4byte FLAGS_CAVES1_MOGURA_53_T1 - .4byte FLAGS_CAVES1_MOGURA_53_WALK - .4byte FLAGS_CAVES1_MOGURA_54_00 - .4byte FLAGS_CAVES1_MOGURA_54_01 - .4byte FLAGS_CAVES1_MOGURA_54_02 - .4byte FLAGS_CAVES1_MOGURA_54_WALK - .4byte FLAGS_CAVES1_AMOS_00_00 - .4byte FLAGS_CAVES1_AMOS_01_00 - .4byte FLAGS_CAVES1_AMOS_02_00 - .4byte FLAGS_CAVES1_AMOS_03_00 - .4byte FLAGS_CAVES1_AMOS_04_00 - .4byte FLAGS_CAVES1_AMOS_05_00 - .4byte FLAGS_CAVES1_AMOS_06_00 - .4byte FLAGS_CAVES1_AMOS_07_00 - .4byte FLAGS_CAVES1_AMOS_08_00 - .4byte FLAGS_CAVES1_AMOS_09_00 - .4byte FLAGS_CAVES1_AMOS_0A_00 - .4byte FLAGS_CAVES1_AMOS_0B_00 - .4byte FLAGS_CAVES1_AMOS_0C_00 - .4byte FLAGS_CAVES1_AMOS_0D_00 - .4byte FLAGS_CAVES1_AMOS_0E_00 - .4byte FLAGS_CAVES1_AMOS_0F_00 - .4byte FLAGS_CAVES1_HARI_01_T0 - .4byte FLAGS_CAVES1_SEIIKI_STAINED_GLASS - .4byte FLAGS_CAVES1_SEIIKI_ENTER - .4byte FLAGS_CAVES1_SEIIKI_SWORD_1ST - .4byte FLAGS_CAVES1_SEIIKI_SWORD_2ND - .4byte FLAGS_CAVES1_SEIIKI_SWORD_3RD - .4byte FLAGS_CAVES1_SEIIKI_BUNSHIN - .4byte FLAGS_CAVES1_BAGUZU_MORI_02_00 - .4byte FLAGS_CAVES1_BAGUZU_MORI_02_T0 - .4byte FLAGS_CAVES1_BAGUZU_MORI_02_T1 - .4byte FLAGS_CAVES1_BAGUZU_MORI_02_T2 - .4byte FLAGS_CAVES1_CHIKATSURO_01_BW00 - .4byte FLAGS_CAVES1_SORA_10_H00 - .4byte FLAGS_CAVES1_SORA_11_H00 - .4byte FLAGS_CAVES1_SORA_11_T00 - .4byte FLAGS_CAVES1_SORA_11_T01 - .4byte FLAGS_CAVES1_SORA_12_T00 - .4byte FLAGS_CAVES1_SORA_13_H00 - .4byte FLAGS_CAVES1_SORA_13_T00 - .4byte FLAGS_CAVES1_SORA_13_T01 - .4byte FLAGS_CAVES1_SORA_14_T00 - .4byte FLAGS_CAVES1_SORA_14_R00 - .4byte FLAGS_CAVES1_SORA_14_R01 - .4byte FLAGS_CAVES1_SORA_14_R02 - .4byte FLAGS_CAVES1_SORA_14_R03 - .4byte FLAGS_CAVES1_SORA_14_R04 - .4byte FLAGS_CAVES1_SORA_14_R05 - .4byte FLAGS_CAVES1_SORA_14_R06 - .4byte FLAGS_CAVES1_SORA_14_R07 - .4byte FLAGS_CAVES1_IZUMIGARE_00_H00 - .4byte FLAGS_CAVES1_IZUMIGARE_00_H01 - .4byte FLAGS_CAVES1_SORA_10_R00 - .4byte FLAGS_CAVES1_SORA_10_R01 - .4byte FLAGS_CAVES1_SORA_10_R02 - .4byte FLAGS_CAVES1_SORA_10_R03 - .4byte FLAGS_CAVES1_SORA_10_R04 - .4byte FLAGS_CAVES1_SORA_10_R05 - .4byte FLAGS_CAVES1_SORA_10_R06 - .4byte FLAGS_CAVES1_SORA_10_R07 - .4byte FLAGS_CAVES1_SORA_14_R08 - .4byte FLAGS_CAVES1_SORA_14_R09 - .4byte FLAGS_CAVES1_SORA_14_R0a - .4byte FLAGS_CAVES1_SORA_14_R0b - .4byte FLAGS_CAVES1_SORA_14_R0c - .4byte FLAGS_CAVES1_SORA_14_R0d - .4byte FLAGS_CAVES1_SORA_14_R0e - .4byte FLAGS_CAVES1_SORA_14_R0f - .4byte FLAGS_CAVES1_KAKERA_TAKARA_B - .4byte FLAGS_CAVES1_KAKERA_TAKARA_C - .4byte FLAGS_CAVES1_KAKERA_TAKARA_D - .4byte FLAGS_CAVES1_KAKERA_TAKARA_F - .4byte FLAGS_CAVES1_KAKERA_TAKARA_G - .4byte FLAGS_CAVES1_KAKERA_TAKARA_H - .4byte FLAGS_CAVES1_KAKERA_TAKARA_I - .4byte FLAGS_CAVES1_KAKERA_TAKARA_XXXX - .4byte FLAGS_CAVES1_TESTMAP00_00 - .4byte FLAGS_CAVES1_TESTMAP01_00 - .4byte FLAGS_CAVES1_TESTMAP01_01 - .4byte FLAGS_CAVES1_TESTMAP02_00 - .4byte FLAGS_CAVES1_LV4_HAKA_08_T0 - .4byte FLAGS_CAVES1_LV4_HAKA_07_00 - .4byte FLAGS_CAVES1_LV4_HAKA_04_00 - .4byte FLAGS_CAVES1_LV4_HAKA_04_01 - .4byte FLAGS_CAVES1_LV4_HAKA_04_K0 - .4byte FLAGS_CAVES1_LV4_HAKA_04_K1 - .4byte FLAGS_CAVES1_LV4_HAKA_01_02 - .4byte FLAGS_CAVES1_LV4_HAKA_08_XX - .4byte FLAGS_CAVES1_BAGUZU_MORI_03_H00 - .4byte FLAGS_CAVES1_MOGURAU_00_H00 - .4byte FLAGS_CAVES1_HARI_01_H00 - .4byte FLAGS_CAVES1_HARI_03_T00 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_00_CAP_0 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_11_CAP_0 - .4byte FLAGS_CAVES1_LV4_HAKA_08_CAP_0 - .4byte FLAGS_CAVES1_BAGUZUIWA_02_CAP_0 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_01_CAP_0 - .4byte FLAGS_CAVES1_MACHI_CHIKA2_01_HK - .4byte FLAGS_CAVES1_LV4_HAKA_08_B0 - .4byte FLAGS_CAVES1_LV4_HAKA_08_K0 - .4byte FLAGS_CAVES1_MAROYA_1ST -.ifndef EU - .4byte FLAGS_CAVES1_MACHI_CHIKA2_10_CAP_0 -.ifndef JP -.ifndef DEMO_JP - .4byte FLAGS_CAVES1_KS_C02 -.endif -.endif -.endif - .4byte ENUM_END - -.ifndef EU -.ifndef JP -.ifndef DEMO_JP -FLAGS_CAVES1_KS_C02: - .ascii "KS_C02\0\0" -.endif -.endif -FLAGS_CAVES1_MACHI_CHIKA2_10_CAP_0: - .ascii "MACHI_CHIKA2_10_CAP_0\0\0\0" -.endif -FLAGS_CAVES1_MAROYA_1ST: - .ascii "MAROYA_1ST\0\0" -FLAGS_CAVES1_LV4_HAKA_08_K0: - .ascii "LV4_HAKA_08_K0\0\0" -FLAGS_CAVES1_LV4_HAKA_08_B0: - .ascii "LV4_HAKA_08_B0\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_01_HK: - .ascii "MACHI_CHIKA2_01_HK\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_01_CAP_0: - .ascii "MACHI_CHIKA2_01_CAP_0\0\0\0" -FLAGS_CAVES1_BAGUZUIWA_02_CAP_0: - .ascii "BAGUZUIWA_02_CAP_0\0\0" -FLAGS_CAVES1_LV4_HAKA_08_CAP_0: - .ascii "LV4_HAKA_08_CAP_0\0\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_11_CAP_0: - .ascii "MACHI_CHIKA2_11_CAP_0\0\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_00_CAP_0: - .ascii "MACHI_CHIKA2_00_CAP_0\0\0\0" -FLAGS_CAVES1_HARI_03_T00: - .ascii "HARI_03_T00\0" -FLAGS_CAVES1_HARI_01_H00: - .ascii "HARI_01_H00\0" -FLAGS_CAVES1_MOGURAU_00_H00: - .ascii "MOGURAU_00_H00\0\0" -FLAGS_CAVES1_BAGUZU_MORI_03_H00: - .ascii "BAGUZU_MORI_03_H00\0\0" -FLAGS_CAVES1_LV4_HAKA_08_XX: - .ascii "LV4_HAKA_08_XX\0\0" -FLAGS_CAVES1_LV4_HAKA_01_02: - .ascii "LV4_HAKA_01_02\0\0" -FLAGS_CAVES1_LV4_HAKA_04_K1: - .ascii "LV4_HAKA_04_K1\0\0" -FLAGS_CAVES1_LV4_HAKA_04_K0: - .ascii "LV4_HAKA_04_K0\0\0" -FLAGS_CAVES1_LV4_HAKA_04_01: - .ascii "LV4_HAKA_04_01\0\0" -FLAGS_CAVES1_LV4_HAKA_04_00: - .ascii "LV4_HAKA_04_00\0\0" -FLAGS_CAVES1_LV4_HAKA_07_00: - .ascii "LV4_HAKA_07_00\0\0" -FLAGS_CAVES1_LV4_HAKA_08_T0: - .ascii "LV4_HAKA_08_T0\0\0" -FLAGS_CAVES1_TESTMAP02_00: - .ascii "TESTMAP02_00\0\0\0\0" -FLAGS_CAVES1_TESTMAP01_01: - .ascii "TESTMAP01_01\0\0\0\0" -FLAGS_CAVES1_TESTMAP01_00: - .ascii "TESTMAP01_00\0\0\0\0" -FLAGS_CAVES1_TESTMAP00_00: - .ascii "TESTMAP00_00\0\0\0\0" -FLAGS_CAVES1_KAKERA_TAKARA_XXXX: - .ascii "KAKERA_TAKARA_XXXX\0\0" -FLAGS_CAVES1_KAKERA_TAKARA_I: - .ascii "KAKERA_TAKARA_I\0" -FLAGS_CAVES1_KAKERA_TAKARA_H: - .ascii "KAKERA_TAKARA_H\0" -FLAGS_CAVES1_KAKERA_TAKARA_G: - .ascii "KAKERA_TAKARA_G\0" -FLAGS_CAVES1_KAKERA_TAKARA_F: - .ascii "KAKERA_TAKARA_F\0" -FLAGS_CAVES1_KAKERA_TAKARA_D: - .ascii "KAKERA_TAKARA_D\0" -FLAGS_CAVES1_KAKERA_TAKARA_C: - .ascii "KAKERA_TAKARA_C\0" -FLAGS_CAVES1_KAKERA_TAKARA_B: - .ascii "KAKERA_TAKARA_B\0" -FLAGS_CAVES1_SORA_14_R0f: - .ascii "SORA_14_R0f\0" -FLAGS_CAVES1_SORA_14_R0e: - .ascii "SORA_14_R0e\0" -FLAGS_CAVES1_SORA_14_R0d: - .ascii "SORA_14_R0d\0" -FLAGS_CAVES1_SORA_14_R0c: - .ascii "SORA_14_R0c\0" -FLAGS_CAVES1_SORA_14_R0b: - .ascii "SORA_14_R0b\0" -FLAGS_CAVES1_SORA_14_R0a: - .ascii "SORA_14_R0a\0" -FLAGS_CAVES1_SORA_14_R09: - .ascii "SORA_14_R09\0" -FLAGS_CAVES1_SORA_14_R08: - .ascii "SORA_14_R08\0" -FLAGS_CAVES1_SORA_10_R07: - .ascii "SORA_10_R07\0" -FLAGS_CAVES1_SORA_10_R06: - .ascii "SORA_10_R06\0" -FLAGS_CAVES1_SORA_10_R05: - .ascii "SORA_10_R05\0" -FLAGS_CAVES1_SORA_10_R04: - .ascii "SORA_10_R04\0" -FLAGS_CAVES1_SORA_10_R03: - .ascii "SORA_10_R03\0" -FLAGS_CAVES1_SORA_10_R02: - .ascii "SORA_10_R02\0" -FLAGS_CAVES1_SORA_10_R01: - .ascii "SORA_10_R01\0" -FLAGS_CAVES1_SORA_10_R00: - .ascii "SORA_10_R00\0" -FLAGS_CAVES1_IZUMIGARE_00_H01: - .ascii "IZUMIGARE_00_H01\0\0\0\0" -FLAGS_CAVES1_IZUMIGARE_00_H00: - .ascii "IZUMIGARE_00_H00\0\0\0\0" -FLAGS_CAVES1_SORA_14_R07: - .ascii "SORA_14_R07\0" -FLAGS_CAVES1_SORA_14_R06: - .ascii "SORA_14_R06\0" -FLAGS_CAVES1_SORA_14_R05: - .ascii "SORA_14_R05\0" -FLAGS_CAVES1_SORA_14_R04: - .ascii "SORA_14_R04\0" -FLAGS_CAVES1_SORA_14_R03: - .ascii "SORA_14_R03\0" -FLAGS_CAVES1_SORA_14_R02: - .ascii "SORA_14_R02\0" -FLAGS_CAVES1_SORA_14_R01: - .ascii "SORA_14_R01\0" -FLAGS_CAVES1_SORA_14_R00: - .ascii "SORA_14_R00\0" -FLAGS_CAVES1_SORA_14_T00: - .ascii "SORA_14_T00\0" -FLAGS_CAVES1_SORA_13_T01: - .ascii "SORA_13_T01\0" -FLAGS_CAVES1_SORA_13_T00: - .ascii "SORA_13_T00\0" -FLAGS_CAVES1_SORA_13_H00: - .ascii "SORA_13_H00\0" -FLAGS_CAVES1_SORA_12_T00: - .ascii "SORA_12_T00\0" -FLAGS_CAVES1_SORA_11_T01: - .ascii "SORA_11_T01\0" -FLAGS_CAVES1_SORA_11_T00: - .ascii "SORA_11_T00\0" -FLAGS_CAVES1_SORA_11_H00: - .ascii "SORA_11_H00\0" -FLAGS_CAVES1_SORA_10_H00: - .ascii "SORA_10_H00\0" -FLAGS_CAVES1_CHIKATSURO_01_BW00: - .ascii "CHIKATSURO_01_BW00\0\0" -FLAGS_CAVES1_BAGUZU_MORI_02_T2: - .ascii "BAGUZU_MORI_02_T2\0\0\0" -FLAGS_CAVES1_BAGUZU_MORI_02_T1: - .ascii "BAGUZU_MORI_02_T1\0\0\0" -FLAGS_CAVES1_BAGUZU_MORI_02_T0: - .ascii "BAGUZU_MORI_02_T0\0\0\0" -FLAGS_CAVES1_BAGUZU_MORI_02_00: - .ascii "BAGUZU_MORI_02_00\0\0\0" -FLAGS_CAVES1_SEIIKI_BUNSHIN: - .ascii "SEIIKI_BUNSHIN\0\0" -FLAGS_CAVES1_SEIIKI_SWORD_3RD: - .ascii "SEIIKI_SWORD_3RD\0\0\0\0" -FLAGS_CAVES1_SEIIKI_SWORD_2ND: - .ascii "SEIIKI_SWORD_2ND\0\0\0\0" -FLAGS_CAVES1_SEIIKI_SWORD_1ST: - .ascii "SEIIKI_SWORD_1ST\0\0\0\0" -FLAGS_CAVES1_SEIIKI_ENTER: - .ascii "SEIIKI_ENTER\0\0\0\0" -FLAGS_CAVES1_SEIIKI_STAINED_GLASS: - .ascii "SEIIKI_STAINED_GLASS\0\0\0\0" -FLAGS_CAVES1_HARI_01_T0: - .ascii "HARI_01_T0\0\0" -FLAGS_CAVES1_AMOS_0F_00: - .ascii "AMOS_0F_00\0\0" -FLAGS_CAVES1_AMOS_0E_00: - .ascii "AMOS_0E_00\0\0" -FLAGS_CAVES1_AMOS_0D_00: - .ascii "AMOS_0D_00\0\0" -FLAGS_CAVES1_AMOS_0C_00: - .ascii "AMOS_0C_00\0\0" -FLAGS_CAVES1_AMOS_0B_00: - .ascii "AMOS_0B_00\0\0" -FLAGS_CAVES1_AMOS_0A_00: - .ascii "AMOS_0A_00\0\0" -FLAGS_CAVES1_AMOS_09_00: - .ascii "AMOS_09_00\0\0" -FLAGS_CAVES1_AMOS_08_00: - .ascii "AMOS_08_00\0\0" -FLAGS_CAVES1_AMOS_07_00: - .ascii "AMOS_07_00\0\0" -FLAGS_CAVES1_AMOS_06_00: - .ascii "AMOS_06_00\0\0" -FLAGS_CAVES1_AMOS_05_00: - .ascii "AMOS_05_00\0\0" -FLAGS_CAVES1_AMOS_04_00: - .ascii "AMOS_04_00\0\0" -FLAGS_CAVES1_AMOS_03_00: - .ascii "AMOS_03_00\0\0" -FLAGS_CAVES1_AMOS_02_00: - .ascii "AMOS_02_00\0\0" -FLAGS_CAVES1_AMOS_01_00: - .ascii "AMOS_01_00\0\0" -FLAGS_CAVES1_AMOS_00_00: - .ascii "AMOS_00_00\0\0" -FLAGS_CAVES1_MOGURA_54_WALK: - .ascii "MOGURA_54_WALK\0\0" -FLAGS_CAVES1_MOGURA_54_02: - .ascii "MOGURA_54_02\0\0\0\0" -FLAGS_CAVES1_MOGURA_54_01: - .ascii "MOGURA_54_01\0\0\0\0" -FLAGS_CAVES1_MOGURA_54_00: - .ascii "MOGURA_54_00\0\0\0\0" -FLAGS_CAVES1_MOGURA_53_WALK: - .ascii "MOGURA_53_WALK\0\0" -FLAGS_CAVES1_MOGURA_53_T1: - .ascii "MOGURA_53_T1\0\0\0\0" -FLAGS_CAVES1_MOGURA_53_T0: - .ascii "MOGURA_53_T0\0\0\0\0" -FLAGS_CAVES1_MOGURA_53_00: - .ascii "MOGURA_53_00\0\0\0\0" -FLAGS_CAVES1_MOGURA_52_T1: - .ascii "MOGURA_52_T1\0\0\0\0" -FLAGS_CAVES1_MOGURA_52_T0: - .ascii "MOGURA_52_T0\0\0\0\0" -FLAGS_CAVES1_MOGURA_52_00: - .ascii "MOGURA_52_00\0\0\0\0" -FLAGS_CAVES1_MOGURA_51_08: - .ascii "MOGURA_51_08\0\0\0\0" -FLAGS_CAVES1_MOGURA_51_07: - .ascii "MOGURA_51_07\0\0\0\0" -FLAGS_CAVES1_MOGURA_51_06: - .ascii "MOGURA_51_06\0\0\0\0" -FLAGS_CAVES1_MOGURA_51_05: - .ascii "MOGURA_51_05\0\0\0\0" -FLAGS_CAVES1_MOGURA_51_04: - .ascii "MOGURA_51_04\0\0\0\0" -FLAGS_CAVES1_MOGURA_51_03: - .ascii "MOGURA_51_03\0\0\0\0" -FLAGS_CAVES1_MOGURA_51_02: - .ascii "MOGURA_51_02\0\0\0\0" -FLAGS_CAVES1_MOGURA_51_01: - .ascii "MOGURA_51_01\0\0\0\0" -FLAGS_CAVES1_MOGURA_51_00: - .ascii "MOGURA_51_00\0\0\0\0" -FLAGS_CAVES1_MOGURA_51_T2: - .ascii "MOGURA_51_T2\0\0\0\0" -FLAGS_CAVES1_MOGURA_51_T1: - .ascii "MOGURA_51_T1\0\0\0\0" -FLAGS_CAVES1_MOGURA_51_T0: - .ascii "MOGURA_51_T0\0\0\0\0" -FLAGS_CAVES1_MOGURA_50_T0: - .ascii "MOGURA_50_T0\0\0\0\0" -FLAGS_CAVES1_MOGURA_50_00: - .ascii "MOGURA_50_00\0\0\0\0" -FLAGS_CAVES1_MOGURA_41_T3: - .ascii "MOGURA_41_T3\0\0\0\0" -FLAGS_CAVES1_MOGURA_41_T2: - .ascii "MOGURA_41_T2\0\0\0\0" -FLAGS_CAVES1_MOGURA_41_T1: - .ascii "MOGURA_41_T1\0\0\0\0" -FLAGS_CAVES1_MOGURA_41_T0: - .ascii "MOGURA_41_T0\0\0\0\0" -FLAGS_CAVES1_MOGURA_27_T2: - .ascii "MOGURA_27_T2\0\0\0\0" -FLAGS_CAVES1_MOGURA_27_T1: - .ascii "MOGURA_27_T1\0\0\0\0" -FLAGS_CAVES1_MOGURA_27_T0: - .ascii "MOGURA_27_T0\0\0\0\0" -FLAGS_CAVES1_MOGURA_21_r0: - .ascii "MOGURA_21_r0\0\0\0\0" -FLAGS_CAVES1_MOGURA_1c_T0: - .ascii "MOGURA_1c_T0\0\0\0\0" -FLAGS_CAVES1_MOGURA_10_T2: - .ascii "MOGURA_10_T2\0\0\0\0" -FLAGS_CAVES1_MOGURA_10_T1: - .ascii "MOGURA_10_T1\0\0\0\0" -FLAGS_CAVES1_MOGURA_10_T0: - .ascii "MOGURA_10_T0\0\0\0\0" -FLAGS_CAVES1_MOGURA_09_T1: - .ascii "MOGURA_09_T1\0\0\0\0" -FLAGS_CAVES1_MOGURA_09_T0: - .ascii "MOGURA_09_T0\0\0\0\0" -FLAGS_CAVES1_MOGURA_02_T8: - .ascii "MOGURA_02_T8\0\0\0\0" -FLAGS_CAVES1_MOGURA_02_T7: - .ascii "MOGURA_02_T7\0\0\0\0" -FLAGS_CAVES1_MOGURA_02_T6: - .ascii "MOGURA_02_T6\0\0\0\0" -FLAGS_CAVES1_MOGURA_02_T5: - .ascii "MOGURA_02_T5\0\0\0\0" -FLAGS_CAVES1_MOGURA_02_T4: - .ascii "MOGURA_02_T4\0\0\0\0" -FLAGS_CAVES1_MOGURA_02_T3: - .ascii "MOGURA_02_T3\0\0\0\0" -FLAGS_CAVES1_MOGURA_02_T2: - .ascii "MOGURA_02_T2\0\0\0\0" -FLAGS_CAVES1_MOGURA_02_T1: - .ascii "MOGURA_02_T1\0\0\0\0" -FLAGS_CAVES1_MOGURA_02_T0: - .ascii "MOGURA_02_T0\0\0\0\0" -FLAGS_CAVES1_MOGURA_01_T0: - .ascii "MOGURA_01_T0\0\0\0\0" -FLAGS_CAVES1_MOGURA_00_T2: - .ascii "MOGURA_00_T2\0\0\0\0" -FLAGS_CAVES1_MOGURA_00_T1: - .ascii "MOGURA_00_T1\0\0\0\0" -FLAGS_CAVES1_MOGURA_00_T0: - .ascii "MOGURA_00_T0\0\0\0\0" -FLAGS_CAVES1_OUBO_KAKERA: - .ascii "OUBO_KAKERA\0" -FLAGS_CAVES1_OUBO_07_ENTER: - .ascii "OUBO_07_ENTER\0\0\0" -FLAGS_CAVES1_OUBO_06_BW1: - .ascii "OUBO_06_BW1\0" -FLAGS_CAVES1_OUBO_06_BW0: - .ascii "OUBO_06_BW0\0" -FLAGS_CAVES1_OUBO_02_BW1: - .ascii "OUBO_02_BW1\0" -FLAGS_CAVES1_OUBO_02_BW0: - .ascii "OUBO_02_BW0\0" -FLAGS_CAVES1_LV4_HAKA_05_H3: - .ascii "LV4_HAKA_05_H3\0\0" -FLAGS_CAVES1_LV4_HAKA_05_H2: - .ascii "LV4_HAKA_05_H2\0\0" -FLAGS_CAVES1_LV4_HAKA_05_H1: - .ascii "LV4_HAKA_05_H1\0\0" -FLAGS_CAVES1_LV4_HAKA_05_H0: - .ascii "LV4_HAKA_05_H0\0\0" -FLAGS_CAVES1_LV4_HAKA_04_KB1: - .ascii "LV4_HAKA_04_KB1\0" -FLAGS_CAVES1_LV4_HAKA_04_KB0: - .ascii "LV4_HAKA_04_KB0\0" -FLAGS_CAVES1_LV4_HAKA_04_R11: - .ascii "LV4_HAKA_04_R11\0" -FLAGS_CAVES1_LV4_HAKA_04_R10: - .ascii "LV4_HAKA_04_R10\0" -FLAGS_CAVES1_LV4_HAKA_04_R9: - .ascii "LV4_HAKA_04_R9\0\0" -FLAGS_CAVES1_LV4_HAKA_04_R8: - .ascii "LV4_HAKA_04_R8\0\0" -FLAGS_CAVES1_LV4_HAKA_04_R6: - .ascii "LV4_HAKA_04_R6\0\0" -FLAGS_CAVES1_LV4_HAKA_04_R5: - .ascii "LV4_HAKA_04_R5\0\0" -FLAGS_CAVES1_LV4_HAKA_04_R4: - .ascii "LV4_HAKA_04_R4\0\0" -FLAGS_CAVES1_LV4_HAKA_04_R3: - .ascii "LV4_HAKA_04_R3\0\0" -FLAGS_CAVES1_LV4_HAKA_04_R2: - .ascii "LV4_HAKA_04_R2\0\0" -FLAGS_CAVES1_LV4_HAKA_04_R1: - .ascii "LV4_HAKA_04_R1\0\0" -FLAGS_CAVES1_LV4_HAKA_04_R0: - .ascii "LV4_HAKA_04_R0\0\0" -FLAGS_CAVES1_LV4_HAKA_03_00: - .ascii "LV4_HAKA_03_00\0\0" -FLAGS_CAVES1_LV4_HAKA_01_01: - .ascii "LV4_HAKA_01_01\0\0" -FLAGS_CAVES1_LV4_HAKA_01_00: - .ascii "LV4_HAKA_01_00\0\0" -FLAGS_CAVES1_LV4_HAKA_04_T1: - .ascii "LV4_HAKA_04_T1\0\0" -FLAGS_CAVES1_LV4_HAKA_04_T0: - .ascii "LV4_HAKA_04_T0\0\0" -FLAGS_CAVES1_LV4_HAKA_05_T0: - .ascii "LV4_HAKA_05_T0\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_12_T0: - .ascii "MACHI_CHIKA2_12_T0\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_10_T0: - .ascii "MACHI_CHIKA2_10_T0\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_10_02: - .ascii "MACHI_CHIKA2_10_02\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_10_01: - .ascii "MACHI_CHIKA2_10_01\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_10_00: - .ascii "MACHI_CHIKA2_10_00\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_04_T0: - .ascii "MACHI_CHIKA2_04_T0\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_03_T0: - .ascii "MACHI_CHIKA2_03_T0\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_03_01: - .ascii "MACHI_CHIKA2_03_01\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_03_00: - .ascii "MACHI_CHIKA2_03_00\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_01_T0: - .ascii "MACHI_CHIKA2_01_T0\0\0" -FLAGS_CAVES1_MACHI_CHIKA2_00_T0: - .ascii "MACHI_CHIKA2_00_T0\0\0" -FLAGS_CAVES1_MACHI_CHIKA_00_T4: - .ascii "MACHI_CHIKA_00_T4\0\0\0" -FLAGS_CAVES1_MACHI_CHIKA_00_T3: - .ascii "MACHI_CHIKA_00_T3\0\0\0" -FLAGS_CAVES1_MACHI_CHIKA_00_T2: - .ascii "MACHI_CHIKA_00_T2\0\0\0" -FLAGS_CAVES1_MACHI_CHIKA_00_T1: - .ascii "MACHI_CHIKA_00_T1\0\0\0" -FLAGS_CAVES1_MACHI_CHIKA_00_T0: - .ascii "MACHI_CHIKA_00_T0\0\0\0" -FLAGS_CAVES1_MACHI_CHIKA_00_03: - .ascii "MACHI_CHIKA_00_03\0\0\0" -FLAGS_CAVES1_MACHI_CHIKA_00_02: - .ascii "MACHI_CHIKA_00_02\0\0\0" -FLAGS_CAVES1_MACHI_CHIKA_00_01: - .ascii "MACHI_CHIKA_00_01\0\0\0" -FLAGS_CAVES1_MACHI_CHIKA_00_00: - .ascii "MACHI_CHIKA_00_00\0\0\0" -FLAGS_CAVES1_MAROYA_TAKARA: - .ascii "MAROYA_TAKARA\0\0\0" - - -FLAGS_CAVES2: - .4byte ENUM_BEGIN - .4byte FLAGS_CAVES2_DOUKUTU_00_T0 - .4byte FLAGS_CAVES2_DOUKUTU_00_T1 - .4byte FLAGS_CAVES2_DOUKUTU_05_EVENT - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_00_T0 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_00_T1 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_00_T2 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_00_T3 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_00_T4 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_00_SW0 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_00_SW1 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_00_SW2 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_00_SW3 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_07_T0 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_0B_T0 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_0C_T0 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_0C_BW00 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_0D_00 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_0D_T0 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_0E_BW00 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_0F_T00 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R00 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R01 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R02 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R03 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R04 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R05 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R06 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R07 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R08 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R09 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R0A - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R0B - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R0C - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R0D - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R0E - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R00 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R01 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R02 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R03 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R04 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R05 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R06 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R07 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R08 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R09 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R0A - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R0B - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R0C - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R0D - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R0E - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_13_T0 - .4byte FLAGS_CAVES2_HIKYOU_DOUKUTU0_00_T0 - .4byte FLAGS_CAVES2_HIKYOU_DOUKUTU0_01_T0 - .4byte FLAGS_CAVES2_HIKYOU_DOUKUTU0_01_T1 - .4byte FLAGS_CAVES2_HIKYOU_DOUKUTU0_02_KAIGARA - .4byte FLAGS_CAVES2_HIKYOU_DOUKUTU0_04_H00 - .4byte FLAGS_CAVES2_HIKYOU_DOUKUTU1_00_00 - .4byte FLAGS_CAVES2_HIKYOU_DOUKUTU1_00_T0 - .4byte FLAGS_CAVES2_YAMADOUKUTU_01_00 - .4byte FLAGS_CAVES2_YAMADOUKUTU_02_00 - .4byte FLAGS_CAVES2_YAMADOUKUTU_03_T0 - .4byte FLAGS_CAVES2_YAMADOUKUTU_06_H0 - .4byte FLAGS_CAVES2_YAMADOUKUTU_07_T0 - .4byte FLAGS_CAVES2_YAMADOUKUTU_08_h0 - .4byte FLAGS_CAVES2_YAMADOUKUTU_08_h1 - .4byte FLAGS_CAVES2_YAMADOUKUTU_08_h2 - .4byte FLAGS_CAVES2_YAMADOUKUTU_09_r0 - .4byte FLAGS_CAVES2_YAMADOUKUTU_09_r1 - .4byte FLAGS_CAVES2_YAMADOUKUTU_09_r2 - .4byte FLAGS_CAVES2_YAMADOUKUTU_0F_00 - .4byte FLAGS_CAVES2_YAMADOUKUTU_10_00 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_00_T0 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_01_BW00 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_02_T0 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_04_BW00 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_05_T0 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R0 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R1 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R2 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R3 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R4 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R5 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R6 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R7 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R8 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R9 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R10 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R11 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R12 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R13 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R14 - .4byte FLAGS_CAVES2_SUIGEN_DOUKUTU_09_H00 - .4byte FLAGS_CAVES2_HAKA_DOUKUTU_00_H0 - .4byte FLAGS_CAVES2_HAKA_DOUKUTU_01_T0 - .4byte FLAGS_CAVES2_HAKA_DOUKUTU_01_GEENE - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_00_T0 - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_02_T0 - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_05_T0 - .4byte FLAGS_CAVES2_KOBITO_SHIRO_DOUKUTU_00_H0 - .4byte FLAGS_CAVES2_KOBITO_SHIRO_DOUKUTU_00_T0 - .4byte FLAGS_CAVES2_KOBITO_SHIRO_DOUKUTU_01_T0 - .4byte FLAGS_CAVES2_KOBITO_URA_DOUKUTU_00_T0 - .4byte FLAGS_CAVES2_KOBITO_URA_DOUKUTU_01_T0 - .4byte FLAGS_CAVES2_GORON_DOUKUTU_APPEAR - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_03_T0 - .4byte FLAGS_CAVES2_HIKYOU_DOUKUTU0_01_AKINDO - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_14_AKINDO - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_17_AKINDO - .4byte FLAGS_CAVES2_YAMADOUKUTU_04_AKINDO - .4byte FLAGS_CAVES2_YAMADOUKUTU_0D_AKINDO - .4byte FLAGS_CAVES2_YAMADOUKUTU_0F_AKINDO - .4byte FLAGS_CAVES2_YAMADOUKUTU_0E_SENNIN - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_04_T0 - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_07_T0 - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_09_T0 - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_09_T1 - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_09_T2 - .4byte FLAGS_CAVES2_GORON_DOUKUTU_01_T0 - .4byte FLAGS_CAVES2_GORON_DOUKUTU_01_T1 - .4byte FLAGS_CAVES2_GORON_DOUKUTU_01_T2 - .4byte FLAGS_CAVES2_GORON_DOUKUTU_01_T3 - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_09_H0 - .4byte FLAGS_CAVES2_SOUGEN_DOUKUTU_15_H0 - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_01_H00 - .4byte FLAGS_CAVES2_YAMADOUKUTU_05_H00 - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_03_H00 - .4byte FLAGS_CAVES2_DOUKUTU_04_H00 - .4byte FLAGS_CAVES2_DOUKUTU_00_H00 - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_04_H00 - .4byte FLAGS_CAVES2_DOUKUTU_06_H00 - .4byte FLAGS_CAVES2_DOUKUTU_05_H00 - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_02_H00 - .4byte FLAGS_CAVES2_KOBITO_DOUKUTU_01_T0 - .4byte FLAGS_CAVES2_YAMADOUKUTU_04_CAP_0 -.ifndef EU -.ifndef JP -.ifndef DEMO_JP - .4byte FLAGS_CAVES2_KS_B06 - .4byte FLAGS_CAVES2_KS_B15 - .4byte FLAGS_CAVES2_KS_B01 - .4byte FLAGS_CAVES2_KS_B12 - .4byte FLAGS_CAVES2_KS_C12 - .4byte FLAGS_CAVES2_KS_C37 -.endif -.endif -.endif - .4byte ENUM_END - -.ifndef EU -.ifndef JP -.ifndef DEMO_JP -FLAGS_CAVES2_KS_C37: - .ascii "KS_C37\0\0" -FLAGS_CAVES2_KS_C12: - .ascii "KS_C12\0\0" -FLAGS_CAVES2_KS_B12: - .ascii "KS_B12\0\0" -FLAGS_CAVES2_KS_B01: - .ascii "KS_B01\0\0" -FLAGS_CAVES2_KS_B15: - .ascii "KS_B15\0\0" -FLAGS_CAVES2_KS_B06: - .ascii "KS_B06\0\0" -.endif -.endif -.endif -FLAGS_CAVES2_YAMADOUKUTU_04_CAP_0: - .ascii "YAMADOUKUTU_04_CAP_0\0\0\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_01_T0: - .ascii "KOBITO_DOUKUTU_01_T0\0\0\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_02_H00: - .ascii "KOBITO_DOUKUTU_02_H00\0\0\0" -FLAGS_CAVES2_DOUKUTU_05_H00: - .ascii "DOUKUTU_05_H00\0\0" -FLAGS_CAVES2_DOUKUTU_06_H00: - .ascii "DOUKUTU_06_H00\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_04_H00: - .ascii "KOBITO_DOUKUTU_04_H00\0\0\0" -FLAGS_CAVES2_DOUKUTU_00_H00: - .ascii "DOUKUTU_00_H00\0\0" -FLAGS_CAVES2_DOUKUTU_04_H00: - .ascii "DOUKUTU_04_H00\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_03_H00: - .ascii "KOBITO_DOUKUTU_03_H00\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_05_H00: - .ascii "YAMADOUKUTU_05_H00\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_01_H00: - .ascii "KOBITO_DOUKUTU_01_H00\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_15_H0: - .ascii "SOUGEN_DOUKUTU_15_H0\0\0\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_09_H0: - .ascii "KOBITO_DOUKUTU_09_H0\0\0\0\0" -FLAGS_CAVES2_GORON_DOUKUTU_01_T3: - .ascii "GORON_DOUKUTU_01_T3\0" -FLAGS_CAVES2_GORON_DOUKUTU_01_T2: - .ascii "GORON_DOUKUTU_01_T2\0" -FLAGS_CAVES2_GORON_DOUKUTU_01_T1: - .ascii "GORON_DOUKUTU_01_T1\0" -FLAGS_CAVES2_GORON_DOUKUTU_01_T0: - .ascii "GORON_DOUKUTU_01_T0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_09_T2: - .ascii "KOBITO_DOUKUTU_09_T2\0\0\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_09_T1: - .ascii "KOBITO_DOUKUTU_09_T1\0\0\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_09_T0: - .ascii "KOBITO_DOUKUTU_09_T0\0\0\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_07_T0: - .ascii "KOBITO_DOUKUTU_07_T0\0\0\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_04_T0: - .ascii "KOBITO_DOUKUTU_04_T0\0\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_0E_SENNIN: - .ascii "YAMADOUKUTU_0E_SENNIN\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_0F_AKINDO: - .ascii "YAMADOUKUTU_0F_AKINDO\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_0D_AKINDO: - .ascii "YAMADOUKUTU_0D_AKINDO\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_04_AKINDO: - .ascii "YAMADOUKUTU_04_AKINDO\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_17_AKINDO: - .ascii "SOUGEN_DOUKUTU_17_AKINDO\0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_14_AKINDO: - .ascii "SOUGEN_DOUKUTU_14_AKINDO\0\0\0\0" -FLAGS_CAVES2_HIKYOU_DOUKUTU0_01_AKINDO: - .ascii "HIKYOU_DOUKUTU0_01_AKINDO\0\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_03_T0: - .ascii "KOBITO_DOUKUTU_03_T0\0\0\0\0" -FLAGS_CAVES2_GORON_DOUKUTU_APPEAR: - .ascii "GORON_DOUKUTU_APPEAR\0\0\0\0" -FLAGS_CAVES2_KOBITO_URA_DOUKUTU_01_T0: - .ascii "KOBITO_URA_DOUKUTU_01_T0\0\0\0\0" -FLAGS_CAVES2_KOBITO_URA_DOUKUTU_00_T0: - .ascii "KOBITO_URA_DOUKUTU_00_T0\0\0\0\0" -FLAGS_CAVES2_KOBITO_SHIRO_DOUKUTU_01_T0: - .ascii "KOBITO_SHIRO_DOUKUTU_01_T0\0\0" -FLAGS_CAVES2_KOBITO_SHIRO_DOUKUTU_00_T0: - .ascii "KOBITO_SHIRO_DOUKUTU_00_T0\0\0" -FLAGS_CAVES2_KOBITO_SHIRO_DOUKUTU_00_H0: - .ascii "KOBITO_SHIRO_DOUKUTU_00_H0\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_05_T0: - .ascii "KOBITO_DOUKUTU_05_T0\0\0\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_02_T0: - .ascii "KOBITO_DOUKUTU_02_T0\0\0\0\0" -FLAGS_CAVES2_KOBITO_DOUKUTU_00_T0: - .ascii "KOBITO_DOUKUTU_00_T0\0\0\0\0" -FLAGS_CAVES2_HAKA_DOUKUTU_01_GEENE: - .ascii "HAKA_DOUKUTU_01_GEENE\0\0\0" -FLAGS_CAVES2_HAKA_DOUKUTU_01_T0: - .ascii "HAKA_DOUKUTU_01_T0\0\0" -FLAGS_CAVES2_HAKA_DOUKUTU_00_H0: - .ascii "HAKA_DOUKUTU_00_H0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_09_H00: - .ascii "SUIGEN_DOUKUTU_09_H00\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R14: - .ascii "SUIGEN_DOUKUTU_08_R14\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R13: - .ascii "SUIGEN_DOUKUTU_08_R13\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R12: - .ascii "SUIGEN_DOUKUTU_08_R12\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R11: - .ascii "SUIGEN_DOUKUTU_08_R11\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R10: - .ascii "SUIGEN_DOUKUTU_08_R10\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R9: - .ascii "SUIGEN_DOUKUTU_08_R9\0\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R8: - .ascii "SUIGEN_DOUKUTU_08_R8\0\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R7: - .ascii "SUIGEN_DOUKUTU_08_R7\0\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R6: - .ascii "SUIGEN_DOUKUTU_08_R6\0\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R5: - .ascii "SUIGEN_DOUKUTU_08_R5\0\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R4: - .ascii "SUIGEN_DOUKUTU_08_R4\0\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R3: - .ascii "SUIGEN_DOUKUTU_08_R3\0\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R2: - .ascii "SUIGEN_DOUKUTU_08_R2\0\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R1: - .ascii "SUIGEN_DOUKUTU_08_R1\0\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_08_R0: - .ascii "SUIGEN_DOUKUTU_08_R0\0\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_05_T0: - .ascii "SUIGEN_DOUKUTU_05_T0\0\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_04_BW00: - .ascii "SUIGEN_DOUKUTU_04_BW00\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_02_T0: - .ascii "SUIGEN_DOUKUTU_02_T0\0\0\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_01_BW00: - .ascii "SUIGEN_DOUKUTU_01_BW00\0\0" -FLAGS_CAVES2_SUIGEN_DOUKUTU_00_T0: - .ascii "SUIGEN_DOUKUTU_00_T0\0\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_10_00: - .ascii "YAMADOUKUTU_10_00\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_0F_00: - .ascii "YAMADOUKUTU_0F_00\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_09_r2: - .ascii "YAMADOUKUTU_09_r2\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_09_r1: - .ascii "YAMADOUKUTU_09_r1\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_09_r0: - .ascii "YAMADOUKUTU_09_r0\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_08_h2: - .ascii "YAMADOUKUTU_08_h2\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_08_h1: - .ascii "YAMADOUKUTU_08_h1\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_08_h0: - .ascii "YAMADOUKUTU_08_h0\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_07_T0: - .ascii "YAMADOUKUTU_07_T0\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_06_H0: - .ascii "YAMADOUKUTU_06_H0\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_03_T0: - .ascii "YAMADOUKUTU_03_T0\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_02_00: - .ascii "YAMADOUKUTU_02_00\0\0\0" -FLAGS_CAVES2_YAMADOUKUTU_01_00: - .ascii "YAMADOUKUTU_01_00\0\0\0" -FLAGS_CAVES2_HIKYOU_DOUKUTU1_00_T0: - .ascii "HIKYOU_DOUKUTU1_00_T0\0\0\0" -FLAGS_CAVES2_HIKYOU_DOUKUTU1_00_00: - .ascii "HIKYOU_DOUKUTU1_00_00\0\0\0" -FLAGS_CAVES2_HIKYOU_DOUKUTU0_04_H00: - .ascii "HIKYOU_DOUKUTU0_04_H00\0\0" -FLAGS_CAVES2_HIKYOU_DOUKUTU0_02_KAIGARA: - .ascii "HIKYOU_DOUKUTU0_02_KAIGARA\0\0" -FLAGS_CAVES2_HIKYOU_DOUKUTU0_01_T1: - .ascii "HIKYOU_DOUKUTU0_01_T1\0\0\0" -FLAGS_CAVES2_HIKYOU_DOUKUTU0_01_T0: - .ascii "HIKYOU_DOUKUTU0_01_T0\0\0\0" -FLAGS_CAVES2_HIKYOU_DOUKUTU0_00_T0: - .ascii "HIKYOU_DOUKUTU0_00_T0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_13_T0: - .ascii "SOUGEN_DOUKUTU_13_T0\0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R0E: - .ascii "SOUGEN_DOUKUTU_11_R0E\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R0D: - .ascii "SOUGEN_DOUKUTU_11_R0D\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R0C: - .ascii "SOUGEN_DOUKUTU_11_R0C\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R0B: - .ascii "SOUGEN_DOUKUTU_11_R0B\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R0A: - .ascii "SOUGEN_DOUKUTU_11_R0A\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R09: - .ascii "SOUGEN_DOUKUTU_11_R09\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R08: - .ascii "SOUGEN_DOUKUTU_11_R08\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R07: - .ascii "SOUGEN_DOUKUTU_11_R07\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R06: - .ascii "SOUGEN_DOUKUTU_11_R06\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R05: - .ascii "SOUGEN_DOUKUTU_11_R05\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R04: - .ascii "SOUGEN_DOUKUTU_11_R04\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R03: - .ascii "SOUGEN_DOUKUTU_11_R03\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R02: - .ascii "SOUGEN_DOUKUTU_11_R02\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R01: - .ascii "SOUGEN_DOUKUTU_11_R01\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_11_R00: - .ascii "SOUGEN_DOUKUTU_11_R00\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R0E: - .ascii "SOUGEN_DOUKUTU_10_R0E\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R0D: - .ascii "SOUGEN_DOUKUTU_10_R0D\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R0C: - .ascii "SOUGEN_DOUKUTU_10_R0C\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R0B: - .ascii "SOUGEN_DOUKUTU_10_R0B\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R0A: - .ascii "SOUGEN_DOUKUTU_10_R0A\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R09: - .ascii "SOUGEN_DOUKUTU_10_R09\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R08: - .ascii "SOUGEN_DOUKUTU_10_R08\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R07: - .ascii "SOUGEN_DOUKUTU_10_R07\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R06: - .ascii "SOUGEN_DOUKUTU_10_R06\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R05: - .ascii "SOUGEN_DOUKUTU_10_R05\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R04: - .ascii "SOUGEN_DOUKUTU_10_R04\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R03: - .ascii "SOUGEN_DOUKUTU_10_R03\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R02: - .ascii "SOUGEN_DOUKUTU_10_R02\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R01: - .ascii "SOUGEN_DOUKUTU_10_R01\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_10_R00: - .ascii "SOUGEN_DOUKUTU_10_R00\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_0F_T00: - .ascii "SOUGEN_DOUKUTU_0F_T00\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_0E_BW00: - .ascii "SOUGEN_DOUKUTU_0E_BW00\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_0D_T0: - .ascii "SOUGEN_DOUKUTU_0D_T0\0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_0D_00: - .ascii "SOUGEN_DOUKUTU_0D_00\0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_0C_BW00: - .ascii "SOUGEN_DOUKUTU_0C_BW00\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_0C_T0: - .ascii "SOUGEN_DOUKUTU_0C_T0\0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_0B_T0: - .ascii "SOUGEN_DOUKUTU_0B_T0\0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_07_T0: - .ascii "SOUGEN_DOUKUTU_07_T0\0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_00_SW3: - .ascii "SOUGEN_DOUKUTU_00_SW3\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_00_SW2: - .ascii "SOUGEN_DOUKUTU_00_SW2\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_00_SW1: - .ascii "SOUGEN_DOUKUTU_00_SW1\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_00_SW0: - .ascii "SOUGEN_DOUKUTU_00_SW0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_00_T4: - .ascii "SOUGEN_DOUKUTU_00_T4\0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_00_T3: - .ascii "SOUGEN_DOUKUTU_00_T3\0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_00_T2: - .ascii "SOUGEN_DOUKUTU_00_T2\0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_00_T1: - .ascii "SOUGEN_DOUKUTU_00_T1\0\0\0\0" -FLAGS_CAVES2_SOUGEN_DOUKUTU_00_T0: - .ascii "SOUGEN_DOUKUTU_00_T0\0\0\0\0" -FLAGS_CAVES2_DOUKUTU_05_EVENT: - .ascii "DOUKUTU_05_EVENT\0\0\0\0" -FLAGS_CAVES2_DOUKUTU_00_T1: - .ascii "DOUKUTU_00_T1\0\0\0" -FLAGS_CAVES2_DOUKUTU_00_T0: - .ascii "DOUKUTU_00_T0\0\0\0" - - -FLAGS_DWS: - .4byte ENUM_BEGIN - .4byte FLAGS_DWS_LV1_00_WALK - .4byte FLAGS_DWS_LV1_01_WALK - .4byte FLAGS_DWS_LV1_02_WALK - .4byte FLAGS_DWS_LV1_03_WALK - .4byte FLAGS_DWS_LV1_04_WALK - .4byte FLAGS_DWS_LV1_05_WALK - .4byte FLAGS_DWS_LV1_06_WALK - .4byte FLAGS_DWS_LV1_07_WALK - .4byte FLAGS_DWS_LV1_08_WALK - .4byte FLAGS_DWS_LV1_09_WALK - .4byte FLAGS_DWS_LV1_0A_WALK - .4byte FLAGS_DWS_LV1_0B_WALK - .4byte FLAGS_DWS_LV1_10_WALK - .4byte FLAGS_DWS_LV1_11_WALK - .4byte FLAGS_DWS_LV1_12_WALK - .4byte FLAGS_DWS_LV1_13_WALK - .4byte FLAGS_DWS_LV1_14_WALK - .4byte FLAGS_DWS_LV1_15_WALK - .4byte FLAGS_DWS_LV1_16_WALK - .4byte FLAGS_DWS_LV1_17_WALK - .4byte FLAGS_DWS_LV1_TARU_0 - .4byte FLAGS_DWS_LV1_TARU_1 - .4byte FLAGS_DWS_LV1_00_00 - .4byte FLAGS_DWS_LV1_00_01 - .4byte FLAGS_DWS_LV1_00_02 - .4byte FLAGS_DWS_LV1_00_03 - .4byte FLAGS_DWS_LV1_00_T0 - .4byte FLAGS_DWS_LV1_01_00 - .4byte FLAGS_DWS_LV1_01_01 - .4byte FLAGS_DWS_LV1_01_02 - .4byte FLAGS_DWS_LV1_01_03 - .4byte FLAGS_DWS_LV1_01_04 - .4byte FLAGS_DWS_LV1_01_T0 - .4byte FLAGS_DWS_LV1_01_T1 - .4byte FLAGS_DWS_LV1_01_T2 - .4byte FLAGS_DWS_LV1_02_T0 - .4byte FLAGS_DWS_LV1_03_CAP_0 - .4byte FLAGS_DWS_LV1_04_02 - .4byte FLAGS_DWS_LV1_04_T0 - .4byte FLAGS_DWS_LV1_05_T0 - .4byte FLAGS_DWS_LV1_05_T1 - .4byte FLAGS_DWS_LV1_06_03 - .4byte FLAGS_DWS_LV1_06_T0 - .4byte FLAGS_DWS_LV1_06_CAP_0 - .4byte FLAGS_DWS_LV1_07_00 - .4byte FLAGS_DWS_LV1_07_CAP_0 - .4byte FLAGS_DWS_LV1_08_00 - .4byte FLAGS_DWS_LV1_08_KEY - .4byte FLAGS_DWS_LV1_09_00 - .4byte FLAGS_DWS_LV1_0A_00 - .4byte FLAGS_DWS_LV1_0A_CAP_0 - .4byte FLAGS_DWS_LV1_0B_01 - .4byte FLAGS_DWS_LV1_0B_02 - .4byte FLAGS_DWS_LV1_0B_15 - .4byte FLAGS_DWS_LV1_0B_CAP_0 - .4byte FLAGS_DWS_LV1_10_00 - .4byte FLAGS_DWS_LV1_10_01 - .4byte FLAGS_DWS_LV1_10_02 - .4byte FLAGS_DWS_LV1_10_03 - .4byte FLAGS_DWS_LV1_10_KEY - .4byte FLAGS_DWS_LV1_10_T0 - .4byte FLAGS_DWS_LV1_11_01 - .4byte FLAGS_DWS_LV1_11_T0 - .4byte FLAGS_DWS_LV1_12_15 - .4byte FLAGS_DWS_LV1_12_T0 - .4byte FLAGS_DWS_LV1_12_T1 - .4byte FLAGS_DWS_LV1_12_00 - .4byte FLAGS_DWS_LV1_12_01 - .4byte FLAGS_DWS_LV1_14_00 - .4byte FLAGS_DWS_LV1_14_CAP_0 - .4byte FLAGS_DWS_LV1_16_UTSUWA - .4byte FLAGS_DWS_LV1_16_1STEND - .4byte FLAGS_DWS_LV1_17_00 - .4byte FLAGS_DWS_LV1_17_T0 - .4byte FLAGS_DWS_LV1_02_00 - .4byte FLAGS_DWS_LV1_02_01 - .4byte FLAGS_DWS_LV1_10_04 - .4byte FLAGS_DWS_LV1_20_CAP_0 - .4byte FLAGS_DWS_LV1_01_HK - .4byte FLAGS_DWS_LV1_04_CAP_0 - .4byte FLAGS_DWS_LV1_03_00 - .4byte FLAGS_DWS_LV1_05_HK - .4byte FLAGS_DWS_LV1_08_01 - .4byte FLAGS_DWS_LV1_01_05 - .4byte FLAGS_DWS_LV1_10_CAP_0 -.ifndef EU -.ifndef JP - .4byte FLAGS_DWS_LV1_12_CAP_0 -.endif -.endif - .4byte ENUM_END - -.ifndef EU -.ifndef JP -FLAGS_DWS_LV1_12_CAP_0: - .ascii "LV1_12_CAP_0 \0\0\0" -.endif -.endif -FLAGS_DWS_LV1_10_CAP_0 : - .ascii "LV1_10_CAP_0 \0\0\0" -FLAGS_DWS_LV1_01_05: - .ascii "LV1_01_05\0\0\0" -FLAGS_DWS_LV1_08_01: - .ascii "LV1_08_01\0\0\0" -FLAGS_DWS_LV1_05_HK : - .ascii "LV1_05_HK \0\0" -FLAGS_DWS_LV1_03_00: - .ascii "LV1_03_00\0\0\0" -FLAGS_DWS_LV1_04_CAP_0: - .ascii "LV1_04_CAP_0\0\0\0\0" -FLAGS_DWS_LV1_01_HK : - .ascii "LV1_01_HK \0\0" -FLAGS_DWS_LV1_20_CAP_0 : - .ascii "LV1_20_CAP_0 \0\0\0" -FLAGS_DWS_LV1_10_04: - .ascii "LV1_10_04\0\0\0" -FLAGS_DWS_LV1_02_01: - .ascii "LV1_02_01\0\0\0" -FLAGS_DWS_LV1_02_00: - .ascii "LV1_02_00\0\0\0" -FLAGS_DWS_LV1_17_T0: - .ascii "LV1_17_T0\0\0\0" -FLAGS_DWS_LV1_17_00: - .ascii "LV1_17_00\0\0\0" -FLAGS_DWS_LV1_16_1STEND: - .ascii "LV1_16_1STEND\0\0\0" -FLAGS_DWS_LV1_16_UTSUWA: - .ascii "LV1_16_UTSUWA\0\0\0" -FLAGS_DWS_LV1_14_CAP_0: - .ascii "LV1_14_CAP_0\0\0\0\0" -FLAGS_DWS_LV1_14_00: - .ascii "LV1_14_00\0\0\0" -FLAGS_DWS_LV1_12_01: - .ascii "LV1_12_01\0\0\0" -FLAGS_DWS_LV1_12_00: - .ascii "LV1_12_00\0\0\0" -FLAGS_DWS_LV1_12_T1: - .ascii "LV1_12_T1\0\0\0" -FLAGS_DWS_LV1_12_T0: - .ascii "LV1_12_T0\0\0\0" -FLAGS_DWS_LV1_12_15: - .ascii "LV1_12_15\0\0\0" -FLAGS_DWS_LV1_11_T0: - .ascii "LV1_11_T0\0\0\0" -FLAGS_DWS_LV1_11_01: - .ascii "LV1_11_01\0\0\0" -FLAGS_DWS_LV1_10_T0: - .ascii "LV1_10_T0\0\0\0" -FLAGS_DWS_LV1_10_KEY: - .ascii "LV1_10_KEY\0\0" -FLAGS_DWS_LV1_10_03: - .ascii "LV1_10_03\0\0\0" -FLAGS_DWS_LV1_10_02: - .ascii "LV1_10_02\0\0\0" -FLAGS_DWS_LV1_10_01: - .ascii "LV1_10_01\0\0\0" -FLAGS_DWS_LV1_10_00: - .ascii "LV1_10_00\0\0\0" -FLAGS_DWS_LV1_0B_CAP_0: - .ascii "LV1_0B_CAP_0\0\0\0\0" -FLAGS_DWS_LV1_0B_15: - .ascii "LV1_0B_15\0\0\0" -FLAGS_DWS_LV1_0B_02: - .ascii "LV1_0B_02\0\0\0" -FLAGS_DWS_LV1_0B_01: - .ascii "LV1_0B_01\0\0\0" -FLAGS_DWS_LV1_0A_CAP_0: - .ascii "LV1_0A_CAP_0\0\0\0\0" -FLAGS_DWS_LV1_0A_00: - .ascii "LV1_0A_00\0\0\0" -FLAGS_DWS_LV1_09_00: - .ascii "LV1_09_00\0\0\0" -FLAGS_DWS_LV1_08_KEY: - .ascii "LV1_08_KEY\0\0" -FLAGS_DWS_LV1_08_00: - .ascii "LV1_08_00\0\0\0" -FLAGS_DWS_LV1_07_CAP_0: - .ascii "LV1_07_CAP_0\0\0\0\0" -FLAGS_DWS_LV1_07_00: - .ascii "LV1_07_00\0\0\0" -FLAGS_DWS_LV1_06_CAP_0: - .ascii "LV1_06_CAP_0\0\0\0\0" -FLAGS_DWS_LV1_06_T0: - .ascii "LV1_06_T0\0\0\0" -FLAGS_DWS_LV1_06_03: - .ascii "LV1_06_03\0\0\0" -FLAGS_DWS_LV1_05_T1: - .ascii "LV1_05_T1\0\0\0" -FLAGS_DWS_LV1_05_T0: - .ascii "LV1_05_T0\0\0\0" -FLAGS_DWS_LV1_04_T0: - .ascii "LV1_04_T0\0\0\0" -FLAGS_DWS_LV1_04_02: - .ascii "LV1_04_02\0\0\0" -FLAGS_DWS_LV1_03_CAP_0: - .ascii "LV1_03_CAP_0\0\0\0\0" -FLAGS_DWS_LV1_02_T0: - .ascii "LV1_02_T0\0\0\0" -FLAGS_DWS_LV1_01_T2: - .ascii "LV1_01_T2\0\0\0" -FLAGS_DWS_LV1_01_T1: - .ascii "LV1_01_T1\0\0\0" -FLAGS_DWS_LV1_01_T0: - .ascii "LV1_01_T0\0\0\0" -FLAGS_DWS_LV1_01_04: - .ascii "LV1_01_04\0\0\0" -FLAGS_DWS_LV1_01_03: - .ascii "LV1_01_03\0\0\0" -FLAGS_DWS_LV1_01_02: - .ascii "LV1_01_02\0\0\0" -FLAGS_DWS_LV1_01_01: - .ascii "LV1_01_01\0\0\0" -FLAGS_DWS_LV1_01_00: - .ascii "LV1_01_00\0\0\0" -FLAGS_DWS_LV1_00_T0: - .ascii "LV1_00_T0\0\0\0" -FLAGS_DWS_LV1_00_03: - .ascii "LV1_00_03\0\0\0" -FLAGS_DWS_LV1_00_02: - .ascii "LV1_00_02\0\0\0" -FLAGS_DWS_LV1_00_01: - .ascii "LV1_00_01\0\0\0" -FLAGS_DWS_LV1_00_00: - .ascii "LV1_00_00\0\0\0" -FLAGS_DWS_LV1_TARU_1: - .ascii "LV1_TARU_1\0\0" -FLAGS_DWS_LV1_TARU_0: - .ascii "LV1_TARU_0\0\0" -FLAGS_DWS_LV1_17_WALK: - .ascii "LV1_17_WALK\0" -FLAGS_DWS_LV1_16_WALK: - .ascii "LV1_16_WALK\0" -FLAGS_DWS_LV1_15_WALK: - .ascii "LV1_15_WALK\0" -FLAGS_DWS_LV1_14_WALK: - .ascii "LV1_14_WALK\0" -FLAGS_DWS_LV1_13_WALK: - .ascii "LV1_13_WALK\0" -FLAGS_DWS_LV1_12_WALK: - .ascii "LV1_12_WALK\0" -FLAGS_DWS_LV1_11_WALK: - .ascii "LV1_11_WALK\0" -FLAGS_DWS_LV1_10_WALK: - .ascii "LV1_10_WALK\0" -FLAGS_DWS_LV1_0B_WALK: - .ascii "LV1_0B_WALK\0" -FLAGS_DWS_LV1_0A_WALK: - .ascii "LV1_0A_WALK\0" -FLAGS_DWS_LV1_09_WALK: - .ascii "LV1_09_WALK\0" -FLAGS_DWS_LV1_08_WALK: - .ascii "LV1_08_WALK\0" -FLAGS_DWS_LV1_07_WALK: - .ascii "LV1_07_WALK\0" -FLAGS_DWS_LV1_06_WALK: - .ascii "LV1_06_WALK\0" -FLAGS_DWS_LV1_05_WALK: - .ascii "LV1_05_WALK\0" -FLAGS_DWS_LV1_04_WALK: - .ascii "LV1_04_WALK\0" -FLAGS_DWS_LV1_03_WALK: - .ascii "LV1_03_WALK\0" -FLAGS_DWS_LV1_02_WALK: - .ascii "LV1_02_WALK\0" -FLAGS_DWS_LV1_01_WALK: - .ascii "LV1_01_WALK\0" -FLAGS_DWS_LV1_00_WALK: - .ascii "LV1_00_WALK\0" - -FLAGS_COF: - .4byte ENUM_BEGIN - .4byte FLAGS_COF_LV2_00_WALK - .4byte FLAGS_COF_LV2_01_WALK - .4byte FLAGS_COF_LV2_02_WALK - .4byte FLAGS_COF_LV2_03_WALK - .4byte FLAGS_COF_LV2_04_WALK - .4byte FLAGS_COF_LV2_05_WALK - .4byte FLAGS_COF_LV2_06_WALK - .4byte FLAGS_COF_LV2_07_WALK - .4byte FLAGS_COF_LV2_08_WALK - .4byte FLAGS_COF_LV2_09_WALK - .4byte FLAGS_COF_LV2_10_WALK - .4byte FLAGS_COF_LV2_11_WALK - .4byte FLAGS_COF_LV2_12_WALK - .4byte FLAGS_COF_LV2_13_WALK - .4byte FLAGS_COF_LV2_14_WALK - .4byte FLAGS_COF_LV2_15_WALK - .4byte FLAGS_COF_LV2_16_WALK - .4byte FLAGS_COF_LV2_17_WALK - .4byte FLAGS_COF_LV2_BOSS_00_WALK - .4byte FLAGS_COF_LV2_00_00 - .4byte FLAGS_COF_LV2_00_01 - .4byte FLAGS_COF_LV2_01_01 - .4byte FLAGS_COF_LV2_01_02 - .4byte FLAGS_COF_LV2_01_T0 - .4byte FLAGS_COF_LV2_01_T1 - .4byte FLAGS_COF_LV2_02_01 - .4byte FLAGS_COF_LV2_03_CAP_0 - .4byte FLAGS_COF_LV2_04_00 - .4byte FLAGS_COF_LV2_04_01 - .4byte FLAGS_COF_LV2_04_CAP_0 - .4byte FLAGS_COF_LV2_06_00 - .4byte FLAGS_COF_LV2_06_T0 - .4byte FLAGS_COF_LV2_06_CAP_0 - .4byte FLAGS_COF_LV2_07_00 - .4byte FLAGS_COF_LV2_07_CAP_0 - .4byte FLAGS_COF_LV2_08_00 - .4byte FLAGS_COF_LV2_08_01 - .4byte FLAGS_COF_LV2_08_T0 - .4byte FLAGS_COF_LV2_08_T1 - .4byte FLAGS_COF_LV2_09_00 - .4byte FLAGS_COF_LV2_09_T0 - .4byte FLAGS_COF_LV2_09_T1 - .4byte FLAGS_COF_LV2_10_00 - .4byte FLAGS_COF_LV2_10_T0 - .4byte FLAGS_COF_LV2_10_T1 - .4byte FLAGS_COF_LV2_11_00 - .4byte FLAGS_COF_LV2_11_01 - .4byte FLAGS_COF_LV2_14_T0 - .4byte FLAGS_COF_LV2_15_01 - .4byte FLAGS_COF_LV2_15_T0 - .4byte FLAGS_COF_LV2_15_CAP_0 - .4byte FLAGS_COF_LV2_16_00 - .4byte FLAGS_COF_LV2_17_00 - .4byte FLAGS_COF_LV2_17_15 - .4byte FLAGS_COF_LV2_17_T0 - .4byte FLAGS_COF_LV2_17_T1 - .4byte FLAGS_COF_LV2_17_T2 - .4byte FLAGS_COF_LV2_20_UTSUWA - .4byte FLAGS_COF_LV2_00_02 - .4byte FLAGS_COF_LV2_06_HK - .4byte FLAGS_COF_LV2_11_02 - .4byte FLAGS_COF_LV2_05_R1 - .4byte FLAGS_COF_LV2_05_R2 - .4byte FLAGS_COF_LV2_05_R3 - .4byte FLAGS_COF_LV2_05_R4 - .4byte FLAGS_COF_LV2_05_R5 - .4byte FLAGS_COF_LV2_00_CAP_0 - .4byte FLAGS_COF_LV2_09_CAP_0 - .4byte ENUM_END - -FLAGS_COF_LV2_09_CAP_0: - .ascii "LV2_09_CAP_0\0\0\0\0" -FLAGS_COF_LV2_00_CAP_0: - .ascii "LV2_00_CAP_0\0\0\0\0" -FLAGS_COF_LV2_05_R5: - .ascii "LV2_05_R5\0\0\0" -FLAGS_COF_LV2_05_R4: - .ascii "LV2_05_R4\0\0\0" -FLAGS_COF_LV2_05_R3: - .ascii "LV2_05_R3\0\0\0" -FLAGS_COF_LV2_05_R2: - .ascii "LV2_05_R2\0\0\0" -FLAGS_COF_LV2_05_R1: - .ascii "LV2_05_R1\0\0\0" -FLAGS_COF_LV2_11_02: - .ascii "LV2_11_02\0\0\0" -FLAGS_COF_LV2_06_HK: - .ascii "LV2_06_HK\0\0\0" -FLAGS_COF_LV2_00_02 : - .ascii "LV2_00_02 \0\0" -FLAGS_COF_LV2_20_UTSUWA: - .ascii "LV2_20_UTSUWA\0\0\0" -FLAGS_COF_LV2_17_T2: - .ascii "LV2_17_T2\0\0\0" -FLAGS_COF_LV2_17_T1: - .ascii "LV2_17_T1\0\0\0" -FLAGS_COF_LV2_17_T0: - .ascii "LV2_17_T0\0\0\0" -FLAGS_COF_LV2_17_15: - .ascii "LV2_17_15\0\0\0" -FLAGS_COF_LV2_17_00: - .ascii "LV2_17_00\0\0\0" -FLAGS_COF_LV2_16_00: - .ascii "LV2_16_00\0\0\0" -FLAGS_COF_LV2_15_CAP_0: - .ascii "LV2_15_CAP_0\0\0\0\0" -FLAGS_COF_LV2_15_T0: - .ascii "LV2_15_T0\0\0\0" -FLAGS_COF_LV2_15_01: - .ascii "LV2_15_01\0\0\0" -FLAGS_COF_LV2_14_T0: - .ascii "LV2_14_T0\0\0\0" -FLAGS_COF_LV2_11_01: - .ascii "LV2_11_01\0\0\0" -FLAGS_COF_LV2_11_00: - .ascii "LV2_11_00\0\0\0" -FLAGS_COF_LV2_10_T1: - .ascii "LV2_10_T1\0\0\0" -FLAGS_COF_LV2_10_T0: - .ascii "LV2_10_T0\0\0\0" -FLAGS_COF_LV2_10_00: - .ascii "LV2_10_00\0\0\0" -FLAGS_COF_LV2_09_T1: - .ascii "LV2_09_T1\0\0\0" -FLAGS_COF_LV2_09_T0: - .ascii "LV2_09_T0\0\0\0" -FLAGS_COF_LV2_09_00: - .ascii "LV2_09_00\0\0\0" -FLAGS_COF_LV2_08_T1: - .ascii "LV2_08_T1\0\0\0" -FLAGS_COF_LV2_08_T0: - .ascii "LV2_08_T0\0\0\0" -FLAGS_COF_LV2_08_01: - .ascii "LV2_08_01\0\0\0" -FLAGS_COF_LV2_08_00: - .ascii "LV2_08_00\0\0\0" -FLAGS_COF_LV2_07_CAP_0: - .ascii "LV2_07_CAP_0\0\0\0\0" -FLAGS_COF_LV2_07_00: - .ascii "LV2_07_00\0\0\0" -FLAGS_COF_LV2_06_CAP_0: - .ascii "LV2_06_CAP_0\0\0\0\0" -FLAGS_COF_LV2_06_T0: - .ascii "LV2_06_T0\0\0\0" -FLAGS_COF_LV2_06_00: - .ascii "LV2_06_00\0\0\0" -FLAGS_COF_LV2_04_CAP_0: - .ascii "LV2_04_CAP_0\0\0\0\0" -FLAGS_COF_LV2_04_01: - .ascii "LV2_04_01\0\0\0" -FLAGS_COF_LV2_04_00: - .ascii "LV2_04_00\0\0\0" -FLAGS_COF_LV2_03_CAP_0: - .ascii "LV2_03_CAP_0\0\0\0\0" -FLAGS_COF_LV2_02_01: - .ascii "LV2_02_01\0\0\0" -FLAGS_COF_LV2_01_T1: - .ascii "LV2_01_T1\0\0\0" -FLAGS_COF_LV2_01_T0: - .ascii "LV2_01_T0\0\0\0" -FLAGS_COF_LV2_01_02: - .ascii "LV2_01_02\0\0\0" -FLAGS_COF_LV2_01_01: - .ascii "LV2_01_01\0\0\0" -FLAGS_COF_LV2_00_01: - .ascii "LV2_00_01\0\0\0" -FLAGS_COF_LV2_00_00: - .ascii "LV2_00_00\0\0\0" -FLAGS_COF_LV2_BOSS_00_WALK: - .ascii "LV2_BOSS_00_WALK\0\0\0\0" -FLAGS_COF_LV2_17_WALK: - .ascii "LV2_17_WALK\0" -FLAGS_COF_LV2_16_WALK: - .ascii "LV2_16_WALK\0" -FLAGS_COF_LV2_15_WALK: - .ascii "LV2_15_WALK\0" -FLAGS_COF_LV2_14_WALK: - .ascii "LV2_14_WALK\0" -FLAGS_COF_LV2_13_WALK: - .ascii "LV2_13_WALK\0" -FLAGS_COF_LV2_12_WALK: - .ascii "LV2_12_WALK\0" -FLAGS_COF_LV2_11_WALK: - .ascii "LV2_11_WALK\0" -FLAGS_COF_LV2_10_WALK: - .ascii "LV2_10_WALK\0" -FLAGS_COF_LV2_09_WALK: - .ascii "LV2_09_WALK\0" -FLAGS_COF_LV2_08_WALK: - .ascii "LV2_08_WALK\0" -FLAGS_COF_LV2_07_WALK: - .ascii "LV2_07_WALK\0" -FLAGS_COF_LV2_06_WALK: - .ascii "LV2_06_WALK\0" -FLAGS_COF_LV2_05_WALK: - .ascii "LV2_05_WALK\0" -FLAGS_COF_LV2_04_WALK: - .ascii "LV2_04_WALK\0" -FLAGS_COF_LV2_03_WALK: - .ascii "LV2_03_WALK\0" -FLAGS_COF_LV2_02_WALK: - .ascii "LV2_02_WALK\0" -FLAGS_COF_LV2_01_WALK: - .ascii "LV2_01_WALK\0" -FLAGS_COF_LV2_00_WALK: - .ascii "LV2_00_WALK\0" - -FLAGS_FOW: - .4byte ENUM_BEGIN - .4byte FLAGS_FOW_LV3_00_WALK - .4byte FLAGS_FOW_LV3_01_WALK - .4byte FLAGS_FOW_LV3_02_WALK - .4byte FLAGS_FOW_LV3_03_WALK - .4byte FLAGS_FOW_LV3_04_WALK - .4byte FLAGS_FOW_LV3_05_WALK - .4byte FLAGS_FOW_LV3_06_WALK - .4byte FLAGS_FOW_LV3_10_WALK - .4byte FLAGS_FOW_LV3_11_WALK - .4byte FLAGS_FOW_LV3_12_WALK - .4byte FLAGS_FOW_LV3_13_WALK - .4byte FLAGS_FOW_LV3_14_WALK - .4byte FLAGS_FOW_LV3_15_WALK - .4byte FLAGS_FOW_LV3_16_WALK - .4byte FLAGS_FOW_LV3_17_WALK - .4byte FLAGS_FOW_LV3_18_WALK - .4byte FLAGS_FOW_LV3_19_WALK - .4byte FLAGS_FOW_LV3_1A_WALK - .4byte FLAGS_FOW_LV3_1B_WALK - .4byte FLAGS_FOW_LV3_1C_WALK - .4byte FLAGS_FOW_LV3_1D_WALK - .4byte FLAGS_FOW_LV3_20_WALK - .4byte FLAGS_FOW_LV3_21_WALK - .4byte FLAGS_FOW_LV3_22_WALK - .4byte FLAGS_FOW_LV3_23_WALK - .4byte FLAGS_FOW_LV3_24_WALK - .4byte FLAGS_FOW_LV3_00_00 - .4byte FLAGS_FOW_LV3_00_T0 - .4byte FLAGS_FOW_LV3_02_00 - .4byte FLAGS_FOW_LV3_02_01 - .4byte FLAGS_FOW_LV3_02_02 - .4byte FLAGS_FOW_LV3_02_KEYFALL - .4byte FLAGS_FOW_LV3_03_00 - .4byte FLAGS_FOW_LV3_03_01 - .4byte FLAGS_FOW_LV3_04_00 - .4byte FLAGS_FOW_LV3_04_KEYFALL - .4byte FLAGS_FOW_LV3_04_WARP_0 - .4byte FLAGS_FOW_LV3_04_BOSSDOOR - .4byte FLAGS_FOW_LV3_10_00 - .4byte FLAGS_FOW_LV3_11_00 - .4byte FLAGS_FOW_LV3_12_CAP_0 - .4byte FLAGS_FOW_LV3_13_00 - .4byte FLAGS_FOW_LV3_14_00 - .4byte FLAGS_FOW_LV3_14_01 - .4byte FLAGS_FOW_LV3_14_02 - .4byte FLAGS_FOW_LV3_14_KEY - .4byte FLAGS_FOW_LV3_15_00 - .4byte FLAGS_FOW_LV3_17_00 - .4byte FLAGS_FOW_LV3_16_BOSSDIE - .4byte FLAGS_FOW_LV3_16_GETUTSUWA - .4byte FLAGS_FOW_LV3_18_00 - .4byte FLAGS_FOW_LV3_18_00_BW00 - .4byte FLAGS_FOW_LV3_19_01 - .4byte FLAGS_FOW_LV3_19_02 - .4byte FLAGS_FOW_LV3_19_03 - .4byte FLAGS_FOW_LV3_19_04 - .4byte FLAGS_FOW_LV3_19_T0 - .4byte FLAGS_FOW_LV3_1B_T0 - .4byte FLAGS_FOW_LV3_1D_00 - .4byte FLAGS_FOW_LV3_1D_01 - .4byte FLAGS_FOW_LV3_1D_T0 - .4byte FLAGS_FOW_LV3_1D_T1 - .4byte FLAGS_FOW_LV3_20_00 - .4byte FLAGS_FOW_LV3_20_CAP_0 - .4byte FLAGS_FOW_LV3_22_00 - .4byte FLAGS_FOW_LV3_23_01 - .4byte FLAGS_FOW_LV3_23_T0 - .4byte FLAGS_FOW_LV3_24_T0 - .4byte FLAGS_FOW_LV3_OCARINA_FALL - .4byte FLAGS_FOW_LV3_02_CAP_0 - .4byte FLAGS_FOW_LV3_24_HK - .4byte FLAGS_FOW_LV3_10_01 - .4byte FLAGS_FOW_LV3_17_01 - .4byte ENUM_END - -FLAGS_FOW_LV3_17_01: - .ascii "LV3_17_01\0\0\0" -FLAGS_FOW_LV3_10_01: - .ascii "LV3_10_01\0\0\0" -FLAGS_FOW_LV3_24_HK: - .ascii "LV3_24_HK\0\0\0" -FLAGS_FOW_LV3_02_CAP_0 : - .ascii "LV3_02_CAP_0 \0\0\0" -FLAGS_FOW_LV3_OCARINA_FALL: - .ascii "LV3_OCARINA_FALL\0\0\0\0" -FLAGS_FOW_LV3_24_T0: - .ascii "LV3_24_T0\0\0\0" -FLAGS_FOW_LV3_23_T0: - .ascii "LV3_23_T0\0\0\0" -FLAGS_FOW_LV3_23_01: - .ascii "LV3_23_01\0\0\0" -FLAGS_FOW_LV3_22_00: - .ascii "LV3_22_00\0\0\0" -FLAGS_FOW_LV3_20_CAP_0: - .ascii "LV3_20_CAP_0\0\0\0\0" -FLAGS_FOW_LV3_20_00: - .ascii "LV3_20_00\0\0\0" -FLAGS_FOW_LV3_1D_T1: - .ascii "LV3_1D_T1\0\0\0" -FLAGS_FOW_LV3_1D_T0: - .ascii "LV3_1D_T0\0\0\0" -FLAGS_FOW_LV3_1D_01: - .ascii "LV3_1D_01\0\0\0" -FLAGS_FOW_LV3_1D_00: - .ascii "LV3_1D_00\0\0\0" -FLAGS_FOW_LV3_1B_T0: - .ascii "LV3_1B_T0\0\0\0" -FLAGS_FOW_LV3_19_T0: - .ascii "LV3_19_T0\0\0\0" -FLAGS_FOW_LV3_19_04: - .ascii "LV3_19_04\0\0\0" -FLAGS_FOW_LV3_19_03: - .ascii "LV3_19_03\0\0\0" -FLAGS_FOW_LV3_19_02: - .ascii "LV3_19_02\0\0\0" -FLAGS_FOW_LV3_19_01: - .ascii "LV3_19_01\0\0\0" -FLAGS_FOW_LV3_18_00_BW00: - .ascii "LV3_18_00_BW00\0\0" -FLAGS_FOW_LV3_18_00: - .ascii "LV3_18_00\0\0\0" -FLAGS_FOW_LV3_16_GETUTSUWA: - .ascii "LV3_16_GETUTSUWA\0\0\0\0" -FLAGS_FOW_LV3_16_BOSSDIE: - .ascii "LV3_16_BOSSDIE\0\0" -FLAGS_FOW_LV3_17_00: - .ascii "LV3_17_00\0\0\0" -FLAGS_FOW_LV3_15_00: - .ascii "LV3_15_00\0\0\0" -FLAGS_FOW_LV3_14_KEY: - .ascii "LV3_14_KEY\0\0" -FLAGS_FOW_LV3_14_02: - .ascii "LV3_14_02\0\0\0" -FLAGS_FOW_LV3_14_01: - .ascii "LV3_14_01\0\0\0" -FLAGS_FOW_LV3_14_00: - .ascii "LV3_14_00\0\0\0" -FLAGS_FOW_LV3_13_00: - .ascii "LV3_13_00\0\0\0" -FLAGS_FOW_LV3_12_CAP_0: - .ascii "LV3_12_CAP_0\0\0\0\0" -FLAGS_FOW_LV3_11_00: - .ascii "LV3_11_00\0\0\0" -FLAGS_FOW_LV3_10_00: - .ascii "LV3_10_00\0\0\0" -FLAGS_FOW_LV3_04_BOSSDOOR: - .ascii "LV3_04_BOSSDOOR\0" -FLAGS_FOW_LV3_04_WARP_0: - .ascii "LV3_04_WARP_0\0\0\0" -FLAGS_FOW_LV3_04_KEYFALL: - .ascii "LV3_04_KEYFALL\0\0" -FLAGS_FOW_LV3_04_00: - .ascii "LV3_04_00\0\0\0" -FLAGS_FOW_LV3_03_01: - .ascii "LV3_03_01\0\0\0" -FLAGS_FOW_LV3_03_00: - .ascii "LV3_03_00\0\0\0" -FLAGS_FOW_LV3_02_KEYFALL: - .ascii "LV3_02_KEYFALL\0\0" -FLAGS_FOW_LV3_02_02: - .ascii "LV3_02_02\0\0\0" -FLAGS_FOW_LV3_02_01: - .ascii "LV3_02_01\0\0\0" -FLAGS_FOW_LV3_02_00: - .ascii "LV3_02_00\0\0\0" -FLAGS_FOW_LV3_00_T0: - .ascii "LV3_00_T0\0\0\0" -FLAGS_FOW_LV3_00_00: - .ascii "LV3_00_00\0\0\0" -FLAGS_FOW_LV3_24_WALK: - .ascii "LV3_24_WALK\0" -FLAGS_FOW_LV3_23_WALK: - .ascii "LV3_23_WALK\0" -FLAGS_FOW_LV3_22_WALK: - .ascii "LV3_22_WALK\0" -FLAGS_FOW_LV3_21_WALK: - .ascii "LV3_21_WALK\0" -FLAGS_FOW_LV3_20_WALK: - .ascii "LV3_20_WALK\0" -FLAGS_FOW_LV3_1D_WALK: - .ascii "LV3_1D_WALK\0" -FLAGS_FOW_LV3_1C_WALK: - .ascii "LV3_1C_WALK\0" -FLAGS_FOW_LV3_1B_WALK: - .ascii "LV3_1B_WALK\0" -FLAGS_FOW_LV3_1A_WALK: - .ascii "LV3_1A_WALK\0" -FLAGS_FOW_LV3_19_WALK: - .ascii "LV3_19_WALK\0" -FLAGS_FOW_LV3_18_WALK: - .ascii "LV3_18_WALK\0" -FLAGS_FOW_LV3_17_WALK: - .ascii "LV3_17_WALK\0" -FLAGS_FOW_LV3_16_WALK: - .ascii "LV3_16_WALK\0" -FLAGS_FOW_LV3_15_WALK: - .ascii "LV3_15_WALK\0" -FLAGS_FOW_LV3_14_WALK: - .ascii "LV3_14_WALK\0" -FLAGS_FOW_LV3_13_WALK: - .ascii "LV3_13_WALK\0" -FLAGS_FOW_LV3_12_WALK: - .ascii "LV3_12_WALK\0" -FLAGS_FOW_LV3_11_WALK: - .ascii "LV3_11_WALK\0" -FLAGS_FOW_LV3_10_WALK: - .ascii "LV3_10_WALK\0" -FLAGS_FOW_LV3_06_WALK: - .ascii "LV3_06_WALK\0" -FLAGS_FOW_LV3_05_WALK: - .ascii "LV3_05_WALK\0" -FLAGS_FOW_LV3_04_WALK: - .ascii "LV3_04_WALK\0" -FLAGS_FOW_LV3_03_WALK: - .ascii "LV3_03_WALK\0" -FLAGS_FOW_LV3_02_WALK: - .ascii "LV3_02_WALK\0" -FLAGS_FOW_LV3_01_WALK: - .ascii "LV3_01_WALK\0" -FLAGS_FOW_LV3_00_WALK: - .ascii "LV3_00_WALK\0" - - -FLAGS_TOD: - .4byte ENUM_BEGIN - .4byte FLAGS_TOD_LV4_00_WALK - .4byte FLAGS_TOD_LV4_01_WALK - .4byte FLAGS_TOD_LV4_02_WALK - .4byte FLAGS_TOD_LV4_03_WALK - .4byte FLAGS_TOD_LV4_04_WALK - .4byte FLAGS_TOD_LV4_05_WALK - .4byte FLAGS_TOD_LV4_06_WALK - .4byte FLAGS_TOD_LV4_07_WALK - .4byte FLAGS_TOD_LV4_08_WALK - .4byte FLAGS_TOD_LV4_09_WALK - .4byte FLAGS_TOD_LV4_0A_WALK - .4byte FLAGS_TOD_LV4_0B_WALK - .4byte FLAGS_TOD_LV4_0C_WALK - .4byte FLAGS_TOD_LV4_0D_WALK - .4byte FLAGS_TOD_LV4_0E_WALK - .4byte FLAGS_TOD_LV4_0F_WALK - .4byte FLAGS_TOD_LV4_10_WALK - .4byte FLAGS_TOD_LV4_11_WALK - .4byte FLAGS_TOD_LV4_20_WALK - .4byte FLAGS_TOD_LV4_21_WALK - .4byte FLAGS_TOD_LV4_22_WALK - .4byte FLAGS_TOD_LV4_23_WALK - .4byte FLAGS_TOD_LV4_24_WALK - .4byte FLAGS_TOD_LV4_25_WALK - .4byte FLAGS_TOD_LV4_26_WALK - .4byte FLAGS_TOD_LV4_27_WALK - .4byte FLAGS_TOD_LV4_28_WALK - .4byte FLAGS_TOD_LV4_29_WALK - .4byte FLAGS_TOD_LV4_2A_WALK - .4byte FLAGS_TOD_LV4_2B_WALK - .4byte FLAGS_TOD_LV4_2C_WALK - .4byte FLAGS_TOD_LV4_2D_WALK - .4byte FLAGS_TOD_LV4_2E_WALK - .4byte FLAGS_TOD_LV4_2F_WALK - .4byte FLAGS_TOD_LV4_30_WALK - .4byte FLAGS_TOD_LV4_31_WALK - .4byte FLAGS_TOD_LV4_32_WALK - .4byte FLAGS_TOD_LV4_33_WALK - .4byte FLAGS_TOD_LV4_34_WALK - .4byte FLAGS_TOD_LV4_35_WALK - .4byte FLAGS_TOD_LV4_INIT - .4byte FLAGS_TOD_LV4_01_00 - .4byte FLAGS_TOD_LV4_03_CAP_0 - .4byte FLAGS_TOD_LV4_03_BOSSDOOR - .4byte FLAGS_TOD_LV4_05_00 - .4byte FLAGS_TOD_LV4_05_01 - .4byte FLAGS_TOD_LV4_06_00 - .4byte FLAGS_TOD_LV4_07_00 - .4byte FLAGS_TOD_LV4_08_00 - .4byte FLAGS_TOD_LV4_08_01 - .4byte FLAGS_TOD_LV4_08_02 - .4byte FLAGS_TOD_LV4_08_RAY_HALF - .4byte FLAGS_TOD_LV4_08_RAY_HALF_E - .4byte FLAGS_TOD_LV4_08_RAY_FULL - .4byte FLAGS_TOD_LV4_08_RAY_FULL_E - .4byte FLAGS_TOD_LV4_09_T0 - .4byte FLAGS_TOD_LV4_0a_TSUBO - .4byte FLAGS_TOD_LV4_0a_T0 - .4byte FLAGS_TOD_LV4_0c_00 - .4byte FLAGS_TOD_LV4_0d_00 - .4byte FLAGS_TOD_LV4_0d_01 - .4byte FLAGS_TOD_LV4_0d_02 - .4byte FLAGS_TOD_LV4_0d_T0 - .4byte FLAGS_TOD_LV4_0e_UTSUWA - .4byte FLAGS_TOD_LV4_0f_00 - .4byte FLAGS_TOD_LV4_0f_01 - .4byte FLAGS_TOD_LV4_0f_02 - .4byte FLAGS_TOD_LV4_0f_03 - .4byte FLAGS_TOD_LV4_0f_04 - .4byte FLAGS_TOD_LV4_10_RAY - .4byte FLAGS_TOD_LV4_10_T0 - .4byte FLAGS_TOD_LV4_10_BOSSDIE - .4byte FLAGS_TOD_LV4_11_00 - .4byte FLAGS_TOD_LV4_11_RAY_SP - .4byte FLAGS_TOD_LV4_11_RAY - .4byte FLAGS_TOD_LV4_11_T0 - .4byte FLAGS_TOD_LV4_20_00 - .4byte FLAGS_TOD_LV4_20_RAY - .4byte FLAGS_TOD_LV4_20_BOSSKEY - .4byte FLAGS_TOD_LV4_21_00 - .4byte FLAGS_TOD_LV4_21_RAY - .4byte FLAGS_TOD_LV4_21_KEY - .4byte FLAGS_TOD_LV4_21_CAP_0 - .4byte FLAGS_TOD_LV4_22_00 - .4byte FLAGS_TOD_LV4_23_00 - .4byte FLAGS_TOD_LV4_24_00 - .4byte FLAGS_TOD_LV4_27_00 - .4byte FLAGS_TOD_LV4_28_00 - .4byte FLAGS_TOD_LV4_28_01 - .4byte FLAGS_TOD_LV4_28_T0 - .4byte FLAGS_TOD_LV4_28_T1 - .4byte FLAGS_TOD_LV4_29_CAP_0 - .4byte FLAGS_TOD_LV4_2b_T0 - .4byte FLAGS_TOD_LV4_2b_T1 - .4byte FLAGS_TOD_LV4_2b_T2 - .4byte FLAGS_TOD_LV4_2b_BKABE - .4byte FLAGS_TOD_LV4_2b_00 - .4byte FLAGS_TOD_LV4_2b_01 - .4byte FLAGS_TOD_LV4_2b_02 - .4byte FLAGS_TOD_LV4_2b_03 - .4byte FLAGS_TOD_LV4_2b_04 - .4byte FLAGS_TOD_LV4_2c_00 - .4byte FLAGS_TOD_LV4_2c_02 - .4byte FLAGS_TOD_LV4_2c_T0 - .4byte FLAGS_TOD_LV4_2d_00 - .4byte FLAGS_TOD_LV4_2d_01 - .4byte FLAGS_TOD_LV4_2d_02 - .4byte FLAGS_TOD_LV4_2e_RAY - .4byte FLAGS_TOD_LV4_2f_00 - .4byte FLAGS_TOD_LV4_2f_01 - .4byte FLAGS_TOD_LV4_2f_KEY - .4byte FLAGS_TOD_LV4_30_00 - .4byte FLAGS_TOD_LV4_30_BKABE - .4byte FLAGS_TOD_LV4_31_00 - .4byte FLAGS_TOD_LV4_31_01 - .4byte FLAGS_TOD_LV4_32_00 - .4byte FLAGS_TOD_LV4_32_01 - .4byte FLAGS_TOD_LV4_32_T0 - .4byte FLAGS_TOD_LV4_32_T1 - .4byte FLAGS_TOD_LV4_33_01 - .4byte FLAGS_TOD_LV4_34_00 - .4byte FLAGS_TOD_LV4_34_01 - .4byte FLAGS_TOD_LV4_35_00 - .4byte FLAGS_TOD_LV4_35_01 - .4byte FLAGS_TOD_LV4_22_01 - .4byte FLAGS_TOD_LV4_2d_T0 - .4byte FLAGS_TOD_LV4_03_CAP_1 - .4byte FLAGS_TOD_LV4_08_CAP_0 - .4byte FLAGS_TOD_LV4_08_CAP_1 - .4byte FLAGS_TOD_LV4_36_WALK - .4byte FLAGS_TOD_LV4_36_T0 - .4byte FLAGS_TOD_LV4_21_CAP_1 - .4byte FLAGS_TOD_LV4_0d_03 - .4byte FLAGS_TOD_LV4_0d_04 - .4byte FLAGS_TOD_LV4_0d_05 - .4byte FLAGS_TOD_LV4_0d_06 - .4byte FLAGS_TOD_LV4_0d_07 - .4byte FLAGS_TOD_LV4_25_00 - .4byte FLAGS_TOD_LV4_25_01 - .4byte FLAGS_TOD_LV4_25_02 - .4byte FLAGS_TOD_LV4_25_03 - .4byte FLAGS_TOD_LV4_25_04 - .4byte FLAGS_TOD_LV4_31_02 - .4byte FLAGS_TOD_LV4_31_03 - .4byte FLAGS_TOD_LV4_31_04 - .4byte FLAGS_TOD_LV4_31_05 - .4byte FLAGS_TOD_LV4_31_06 - .4byte FLAGS_TOD_LV4_31_07 - .4byte FLAGS_TOD_LV4_06_01 - .4byte FLAGS_TOD_LV4_06_02 - .4byte FLAGS_TOD_LV4_06_03 - .4byte FLAGS_TOD_LV4_06_04 - .4byte FLAGS_TOD_LV4_06_05 - .4byte FLAGS_TOD_LV4_06_06 - .4byte FLAGS_TOD_LV4_08_OCT - .4byte FLAGS_TOD_LV4_05_02 - .4byte FLAGS_TOD_LV4_28_02 - .4byte FLAGS_TOD_LV4_2c_01 - .4byte FLAGS_TOD_LV4_33_02 - .4byte FLAGS_TOD_LV4_31_08 - .4byte FLAGS_TOD_LV4_34_02 - .4byte FLAGS_TOD_LV4_20_RAY_SW - .4byte FLAGS_TOD_LV4_21_RAY_SW - .4byte ENUM_END - -FLAGS_TOD_LV4_21_RAY_SW: - .ascii "LV4_21_RAY_SW\0\0\0" -FLAGS_TOD_LV4_20_RAY_SW: - .ascii "LV4_20_RAY_SW\0\0\0" -FLAGS_TOD_LV4_34_02: - .ascii "LV4_34_02\0\0\0" -FLAGS_TOD_LV4_31_08: - .ascii "LV4_31_08\0\0\0" -FLAGS_TOD_LV4_33_02: - .ascii "LV4_33_02\0\0\0" -FLAGS_TOD_LV4_2c_01: - .ascii "LV4_2c_01\0\0\0" -FLAGS_TOD_LV4_28_02: - .ascii "LV4_28_02\0\0\0" -FLAGS_TOD_LV4_05_02: - .ascii "LV4_05_02\0\0\0" -FLAGS_TOD_LV4_08_OCT: - .ascii "LV4_08_OCT\0\0" -FLAGS_TOD_LV4_06_06: - .ascii "LV4_06_06\0\0\0" -FLAGS_TOD_LV4_06_05: - .ascii "LV4_06_05\0\0\0" -FLAGS_TOD_LV4_06_04: - .ascii "LV4_06_04\0\0\0" -FLAGS_TOD_LV4_06_03: - .ascii "LV4_06_03\0\0\0" -FLAGS_TOD_LV4_06_02: - .ascii "LV4_06_02\0\0\0" -FLAGS_TOD_LV4_06_01: - .ascii "LV4_06_01\0\0\0" -FLAGS_TOD_LV4_31_07: - .ascii "LV4_31_07\0\0\0" -FLAGS_TOD_LV4_31_06: - .ascii "LV4_31_06\0\0\0" -FLAGS_TOD_LV4_31_05: - .ascii "LV4_31_05\0\0\0" -FLAGS_TOD_LV4_31_04: - .ascii "LV4_31_04\0\0\0" -FLAGS_TOD_LV4_31_03: - .ascii "LV4_31_03\0\0\0" -FLAGS_TOD_LV4_31_02: - .ascii "LV4_31_02\0\0\0" -FLAGS_TOD_LV4_25_04: - .ascii "LV4_25_04\0\0\0" -FLAGS_TOD_LV4_25_03: - .ascii "LV4_25_03\0\0\0" -FLAGS_TOD_LV4_25_02: - .ascii "LV4_25_02\0\0\0" -FLAGS_TOD_LV4_25_01: - .ascii "LV4_25_01\0\0\0" -FLAGS_TOD_LV4_25_00: - .ascii "LV4_25_00\0\0\0" -FLAGS_TOD_LV4_0d_07: - .ascii "LV4_0d_07\0\0\0" -FLAGS_TOD_LV4_0d_06: - .ascii "LV4_0d_06\0\0\0" -FLAGS_TOD_LV4_0d_05: - .ascii "LV4_0d_05\0\0\0" -FLAGS_TOD_LV4_0d_04: - .ascii "LV4_0d_04\0\0\0" -FLAGS_TOD_LV4_0d_03: - .ascii "LV4_0d_03\0\0\0" -FLAGS_TOD_LV4_21_CAP_1 : - .ascii "LV4_21_CAP_1 \0\0\0" -FLAGS_TOD_LV4_36_T0: - .ascii "LV4_36_T0\0\0\0" -FLAGS_TOD_LV4_36_WALK: - .ascii "LV4_36_WALK\0" -FLAGS_TOD_LV4_08_CAP_1 : - .ascii "LV4_08_CAP_1 \0\0\0" -FLAGS_TOD_LV4_08_CAP_0 : - .ascii "LV4_08_CAP_0 \0\0\0" -FLAGS_TOD_LV4_03_CAP_1 : - .ascii "LV4_03_CAP_1 \0\0\0" -FLAGS_TOD_LV4_2d_T0: - .ascii "LV4_2d_T0\0\0\0" -FLAGS_TOD_LV4_22_01: - .ascii "LV4_22_01\0\0\0" -FLAGS_TOD_LV4_35_01: - .ascii "LV4_35_01\0\0\0" -FLAGS_TOD_LV4_35_00: - .ascii "LV4_35_00\0\0\0" -FLAGS_TOD_LV4_34_01: - .ascii "LV4_34_01\0\0\0" -FLAGS_TOD_LV4_34_00: - .ascii "LV4_34_00\0\0\0" -FLAGS_TOD_LV4_33_01: - .ascii "LV4_33_01\0\0\0" -FLAGS_TOD_LV4_32_T1: - .ascii "LV4_32_T1\0\0\0" -FLAGS_TOD_LV4_32_T0: - .ascii "LV4_32_T0\0\0\0" -FLAGS_TOD_LV4_32_01: - .ascii "LV4_32_01\0\0\0" -FLAGS_TOD_LV4_32_00: - .ascii "LV4_32_00\0\0\0" -FLAGS_TOD_LV4_31_01: - .ascii "LV4_31_01\0\0\0" -FLAGS_TOD_LV4_31_00: - .ascii "LV4_31_00\0\0\0" -FLAGS_TOD_LV4_30_BKABE: - .ascii "LV4_30_BKABE\0\0\0\0" -FLAGS_TOD_LV4_30_00: - .ascii "LV4_30_00\0\0\0" -FLAGS_TOD_LV4_2f_KEY: - .ascii "LV4_2f_KEY\0\0" -FLAGS_TOD_LV4_2f_01: - .ascii "LV4_2f_01\0\0\0" -FLAGS_TOD_LV4_2f_00: - .ascii "LV4_2f_00\0\0\0" -FLAGS_TOD_LV4_2e_RAY: - .ascii "LV4_2e_RAY\0\0" -FLAGS_TOD_LV4_2d_02: - .ascii "LV4_2d_02\0\0\0" -FLAGS_TOD_LV4_2d_01: - .ascii "LV4_2d_01\0\0\0" -FLAGS_TOD_LV4_2d_00: - .ascii "LV4_2d_00\0\0\0" -FLAGS_TOD_LV4_2c_T0: - .ascii "LV4_2c_T0\0\0\0" -FLAGS_TOD_LV4_2c_02: - .ascii "LV4_2c_02\0\0\0" -FLAGS_TOD_LV4_2c_00: - .ascii "LV4_2c_00\0\0\0" -FLAGS_TOD_LV4_2b_04: - .ascii "LV4_2b_04\0\0\0" -FLAGS_TOD_LV4_2b_03: - .ascii "LV4_2b_03\0\0\0" -FLAGS_TOD_LV4_2b_02: - .ascii "LV4_2b_02\0\0\0" -FLAGS_TOD_LV4_2b_01: - .ascii "LV4_2b_01\0\0\0" -FLAGS_TOD_LV4_2b_00: - .ascii "LV4_2b_00\0\0\0" -FLAGS_TOD_LV4_2b_BKABE: - .ascii "LV4_2b_BKABE\0\0\0\0" -FLAGS_TOD_LV4_2b_T2: - .ascii "LV4_2b_T2\0\0\0" -FLAGS_TOD_LV4_2b_T1: - .ascii "LV4_2b_T1\0\0\0" -FLAGS_TOD_LV4_2b_T0: - .ascii "LV4_2b_T0\0\0\0" -FLAGS_TOD_LV4_29_CAP_0: - .ascii "LV4_29_CAP_0\0\0\0\0" -FLAGS_TOD_LV4_28_T1: - .ascii "LV4_28_T1\0\0\0" -FLAGS_TOD_LV4_28_T0: - .ascii "LV4_28_T0\0\0\0" -FLAGS_TOD_LV4_28_01: - .ascii "LV4_28_01\0\0\0" -FLAGS_TOD_LV4_28_00: - .ascii "LV4_28_00\0\0\0" -FLAGS_TOD_LV4_27_00: - .ascii "LV4_27_00\0\0\0" -FLAGS_TOD_LV4_24_00: - .ascii "LV4_24_00\0\0\0" -FLAGS_TOD_LV4_23_00: - .ascii "LV4_23_00\0\0\0" -FLAGS_TOD_LV4_22_00: - .ascii "LV4_22_00\0\0\0" -FLAGS_TOD_LV4_21_CAP_0: - .ascii "LV4_21_CAP_0\0\0\0\0" -FLAGS_TOD_LV4_21_KEY: - .ascii "LV4_21_KEY\0\0" -FLAGS_TOD_LV4_21_RAY: - .ascii "LV4_21_RAY\0\0" -FLAGS_TOD_LV4_21_00: - .ascii "LV4_21_00\0\0\0" -FLAGS_TOD_LV4_20_BOSSKEY: - .ascii "LV4_20_BOSSKEY\0\0" -FLAGS_TOD_LV4_20_RAY: - .ascii "LV4_20_RAY\0\0" -FLAGS_TOD_LV4_20_00: - .ascii "LV4_20_00\0\0\0" -FLAGS_TOD_LV4_11_T0: - .ascii "LV4_11_T0\0\0\0" -FLAGS_TOD_LV4_11_RAY: - .ascii "LV4_11_RAY\0\0" -FLAGS_TOD_LV4_11_RAY_SP: - .ascii "LV4_11_RAY_SP\0\0\0" -FLAGS_TOD_LV4_11_00: - .ascii "LV4_11_00\0\0\0" -FLAGS_TOD_LV4_10_BOSSDIE: - .ascii "LV4_10_BOSSDIE\0\0" -FLAGS_TOD_LV4_10_T0: - .ascii "LV4_10_T0\0\0\0" -FLAGS_TOD_LV4_10_RAY: - .ascii "LV4_10_RAY\0\0" -FLAGS_TOD_LV4_0f_04: - .ascii "LV4_0f_04\0\0\0" -FLAGS_TOD_LV4_0f_03: - .ascii "LV4_0f_03\0\0\0" -FLAGS_TOD_LV4_0f_02: - .ascii "LV4_0f_02\0\0\0" -FLAGS_TOD_LV4_0f_01: - .ascii "LV4_0f_01\0\0\0" -FLAGS_TOD_LV4_0f_00: - .ascii "LV4_0f_00\0\0\0" -FLAGS_TOD_LV4_0e_UTSUWA: - .ascii "LV4_0e_UTSUWA\0\0\0" -FLAGS_TOD_LV4_0d_T0: - .ascii "LV4_0d_T0\0\0\0" -FLAGS_TOD_LV4_0d_02: - .ascii "LV4_0d_02\0\0\0" -FLAGS_TOD_LV4_0d_01: - .ascii "LV4_0d_01\0\0\0" -FLAGS_TOD_LV4_0d_00: - .ascii "LV4_0d_00\0\0\0" -FLAGS_TOD_LV4_0c_00: - .ascii "LV4_0c_00\0\0\0" -FLAGS_TOD_LV4_0a_T0: - .ascii "LV4_0a_T0\0\0\0" -FLAGS_TOD_LV4_0a_TSUBO: - .ascii "LV4_0a_TSUBO\0\0\0\0" -FLAGS_TOD_LV4_09_T0: - .ascii "LV4_09_T0\0\0\0" -FLAGS_TOD_LV4_08_RAY_FULL_E: - .ascii "LV4_08_RAY_FULL_E\0\0\0" -FLAGS_TOD_LV4_08_RAY_FULL: - .ascii "LV4_08_RAY_FULL\0" -FLAGS_TOD_LV4_08_RAY_HALF_E: - .ascii "LV4_08_RAY_HALF_E\0\0\0" -FLAGS_TOD_LV4_08_RAY_HALF: - .ascii "LV4_08_RAY_HALF\0" -FLAGS_TOD_LV4_08_02: - .ascii "LV4_08_02\0\0\0" -FLAGS_TOD_LV4_08_01: - .ascii "LV4_08_01\0\0\0" -FLAGS_TOD_LV4_08_00: - .ascii "LV4_08_00\0\0\0" -FLAGS_TOD_LV4_07_00: - .ascii "LV4_07_00\0\0\0" -FLAGS_TOD_LV4_06_00: - .ascii "LV4_06_00\0\0\0" -FLAGS_TOD_LV4_05_01: - .ascii "LV4_05_01\0\0\0" -FLAGS_TOD_LV4_05_00: - .ascii "LV4_05_00\0\0\0" -FLAGS_TOD_LV4_03_BOSSDOOR: - .ascii "LV4_03_BOSSDOOR\0" -FLAGS_TOD_LV4_03_CAP_0: - .ascii "LV4_03_CAP_0\0\0\0\0" -FLAGS_TOD_LV4_01_00: - .ascii "LV4_01_00\0\0\0" -FLAGS_TOD_LV4_INIT: - .ascii "LV4_INIT\0\0\0\0" -FLAGS_TOD_LV4_35_WALK: - .ascii "LV4_35_WALK\0" -FLAGS_TOD_LV4_34_WALK: - .ascii "LV4_34_WALK\0" -FLAGS_TOD_LV4_33_WALK: - .ascii "LV4_33_WALK\0" -FLAGS_TOD_LV4_32_WALK: - .ascii "LV4_32_WALK\0" -FLAGS_TOD_LV4_31_WALK: - .ascii "LV4_31_WALK\0" -FLAGS_TOD_LV4_30_WALK: - .ascii "LV4_30_WALK\0" -FLAGS_TOD_LV4_2F_WALK: - .ascii "LV4_2F_WALK\0" -FLAGS_TOD_LV4_2E_WALK: - .ascii "LV4_2E_WALK\0" -FLAGS_TOD_LV4_2D_WALK: - .ascii "LV4_2D_WALK\0" -FLAGS_TOD_LV4_2C_WALK: - .ascii "LV4_2C_WALK\0" -FLAGS_TOD_LV4_2B_WALK: - .ascii "LV4_2B_WALK\0" -FLAGS_TOD_LV4_2A_WALK: - .ascii "LV4_2A_WALK\0" -FLAGS_TOD_LV4_29_WALK: - .ascii "LV4_29_WALK\0" -FLAGS_TOD_LV4_28_WALK: - .ascii "LV4_28_WALK\0" -FLAGS_TOD_LV4_27_WALK: - .ascii "LV4_27_WALK\0" -FLAGS_TOD_LV4_26_WALK: - .ascii "LV4_26_WALK\0" -FLAGS_TOD_LV4_25_WALK: - .ascii "LV4_25_WALK\0" -FLAGS_TOD_LV4_24_WALK: - .ascii "LV4_24_WALK\0" -FLAGS_TOD_LV4_23_WALK: - .ascii "LV4_23_WALK\0" -FLAGS_TOD_LV4_22_WALK: - .ascii "LV4_22_WALK\0" -FLAGS_TOD_LV4_21_WALK: - .ascii "LV4_21_WALK\0" -FLAGS_TOD_LV4_20_WALK: - .ascii "LV4_20_WALK\0" -FLAGS_TOD_LV4_11_WALK: - .ascii "LV4_11_WALK\0" -FLAGS_TOD_LV4_10_WALK: - .ascii "LV4_10_WALK\0" -FLAGS_TOD_LV4_0F_WALK: - .ascii "LV4_0F_WALK\0" -FLAGS_TOD_LV4_0E_WALK: - .ascii "LV4_0E_WALK\0" -FLAGS_TOD_LV4_0D_WALK: - .ascii "LV4_0D_WALK\0" -FLAGS_TOD_LV4_0C_WALK: - .ascii "LV4_0C_WALK\0" -FLAGS_TOD_LV4_0B_WALK: - .ascii "LV4_0B_WALK\0" -FLAGS_TOD_LV4_0A_WALK: - .ascii "LV4_0A_WALK\0" -FLAGS_TOD_LV4_09_WALK: - .ascii "LV4_09_WALK\0" -FLAGS_TOD_LV4_08_WALK: - .ascii "LV4_08_WALK\0" -FLAGS_TOD_LV4_07_WALK: - .ascii "LV4_07_WALK\0" -FLAGS_TOD_LV4_06_WALK: - .ascii "LV4_06_WALK\0" -FLAGS_TOD_LV4_05_WALK: - .ascii "LV4_05_WALK\0" -FLAGS_TOD_LV4_04_WALK: - .ascii "LV4_04_WALK\0" -FLAGS_TOD_LV4_03_WALK: - .ascii "LV4_03_WALK\0" -FLAGS_TOD_LV4_02_WALK: - .ascii "LV4_02_WALK\0" -FLAGS_TOD_LV4_01_WALK: - .ascii "LV4_01_WALK\0" -FLAGS_TOD_LV4_00_WALK: - .ascii "LV4_00_WALK\0" - -FLAGS_POW: - .4byte ENUM_BEGIN - .4byte FLAGS_POW_LV5_00_WALK - .4byte FLAGS_POW_LV5_01_WALK - .4byte FLAGS_POW_LV5_02_WALK - .4byte FLAGS_POW_LV5_03_WALK - .4byte FLAGS_POW_LV5_04_WALK - .4byte FLAGS_POW_LV5_05_WALK - .4byte FLAGS_POW_LV5_06_WALK - .4byte FLAGS_POW_LV5_07_WALK - .4byte FLAGS_POW_LV5_08_WALK - .4byte FLAGS_POW_LV5_09_WALK - .4byte FLAGS_POW_LV5_0A_WALK - .4byte FLAGS_POW_LV5_0B_WALK - .4byte FLAGS_POW_LV5_0C_WALK - .4byte FLAGS_POW_LV5_0D_WALK - .4byte FLAGS_POW_LV5_0E_WALK - .4byte FLAGS_POW_LV5_0F_WALK - .4byte FLAGS_POW_LV5_10_WALK - .4byte FLAGS_POW_LV5_11_WALK - .4byte FLAGS_POW_LV5_12_WALK - .4byte FLAGS_POW_LV5_13_WALK - .4byte FLAGS_POW_LV5_14_WALK - .4byte FLAGS_POW_LV5_15_WALK - .4byte FLAGS_POW_LV5_16_WALK - .4byte FLAGS_POW_LV5_17_WALK - .4byte FLAGS_POW_LV5_18_WALK - .4byte FLAGS_POW_LV5_19_WALK - .4byte FLAGS_POW_LV5_1A_WALK - .4byte FLAGS_POW_LV5_1B_WALK - .4byte FLAGS_POW_LV5_1C_WALK - .4byte FLAGS_POW_LV5_1D_WALK - .4byte FLAGS_POW_LV5_1E_WALK - .4byte FLAGS_POW_LV5_1F_WALK - .4byte FLAGS_POW_LV5_20_WALK - .4byte FLAGS_POW_LV5_21_WALK - .4byte FLAGS_POW_LV5_22_WALK - .4byte FLAGS_POW_LV5_23_WALK - .4byte FLAGS_POW_LV5_24_WALK - .4byte FLAGS_POW_LV5_25_WALK - .4byte FLAGS_POW_LV5_26_WALK - .4byte FLAGS_POW_LV5_27_WALK - .4byte FLAGS_POW_LV5_28_WALK - .4byte FLAGS_POW_LV5_29_WALK - .4byte FLAGS_POW_LV5_2A_WALK - .4byte FLAGS_POW_LV5_2B_WALK - .4byte FLAGS_POW_LV5_2C_WALK - .4byte FLAGS_POW_LV5_2D_WALK - .4byte FLAGS_POW_LV5_2E_WALK - .4byte FLAGS_POW_LV5_2F_WALK - .4byte FLAGS_POW_LV5_30_WALK - .4byte FLAGS_POW_LV5_31_WALK - .4byte FLAGS_POW_LV5_32_WALK - .4byte FLAGS_POW_LV5_01_T0 - .4byte FLAGS_POW_LV5_03_T0 - .4byte FLAGS_POW_LV5_03_BOSSDOOR - .4byte FLAGS_POW_LV5_04_T0 - .4byte FLAGS_POW_LV5_05_00 - .4byte FLAGS_POW_LV5_05_01 - .4byte FLAGS_POW_LV5_05_02 - .4byte FLAGS_POW_LV5_06_00 - .4byte FLAGS_POW_LV5_07_00 - .4byte FLAGS_POW_LV5_07_01 - .4byte FLAGS_POW_LV5_07_T0 - .4byte FLAGS_POW_LV5_08_00 - .4byte FLAGS_POW_LV5_08_01 - .4byte FLAGS_POW_LV5_08_KEY - .4byte FLAGS_POW_LV5_08_BOSSDOOR - .4byte FLAGS_POW_LV5_0b_B0 - .4byte FLAGS_POW_LV5_0b_B1 - .4byte FLAGS_POW_LV5_0d_00 - .4byte FLAGS_POW_LV5_0e_00 - .4byte FLAGS_POW_LV5_0f_T0 - .4byte FLAGS_POW_LV5_0f_T1 - .4byte FLAGS_POW_LV5_10_T0 - .4byte FLAGS_POW_LV5_15_00 - .4byte FLAGS_POW_LV5_15_01 - .4byte FLAGS_POW_LV5_15_02 - .4byte FLAGS_POW_LV5_15_03 - .4byte FLAGS_POW_LV5_15_04 - .4byte FLAGS_POW_LV5_15_T0 - .4byte FLAGS_POW_LV5_15_B0 - .4byte FLAGS_POW_LV5_15_B1 - .4byte FLAGS_POW_LV5_1a_00 - .4byte FLAGS_POW_LV5_1a_01 - .4byte FLAGS_POW_LV5_1b_00 - .4byte FLAGS_POW_LV5_1b_T0 - .4byte FLAGS_POW_LV5_1c_00 - .4byte FLAGS_POW_LV5_1c_T0 - .4byte FLAGS_POW_LV5_20_00 - .4byte FLAGS_POW_LV5_20_01 - .4byte FLAGS_POW_LV5_21_00 - .4byte FLAGS_POW_LV5_21_01 - .4byte FLAGS_POW_LV5_21_02 - .4byte FLAGS_POW_LV5_21_03 - .4byte FLAGS_POW_LV5_21_04 - .4byte FLAGS_POW_LV5_21_05 - .4byte FLAGS_POW_LV5_21_06 - .4byte FLAGS_POW_LV5_21_07 - .4byte FLAGS_POW_LV5_21_08 - .4byte FLAGS_POW_LV5_21_09 - .4byte FLAGS_POW_LV5_21_0a - .4byte FLAGS_POW_LV5_21_CAP_0 - .4byte FLAGS_POW_LV5_22_00 - .4byte FLAGS_POW_LV5_22_01 - .4byte FLAGS_POW_LV5_22_CAP_0 - .4byte FLAGS_POW_LV5_23_00 - .4byte FLAGS_POW_LV5_23_01 - .4byte FLAGS_POW_LV5_27_00 - .4byte FLAGS_POW_LV5_29_00 - .4byte FLAGS_POW_LV5_29_01 - .4byte FLAGS_POW_LV5_29_T0 - .4byte FLAGS_POW_LV5_2b_T0 - .4byte FLAGS_POW_LV5_2c_00 - .4byte FLAGS_POW_LV5_2c_01 - .4byte FLAGS_POW_LV5_2c_02 - .4byte FLAGS_POW_LV5_2c_03 - .4byte FLAGS_POW_LV5_2c_T0 - .4byte FLAGS_POW_LV5_2c_CAP_0 - .4byte FLAGS_POW_LV5_2d_T0 - .4byte FLAGS_POW_LV5_31_CAP_0 - .4byte FLAGS_POW_LV5_32_CAP_0 - .4byte FLAGS_POW_LV5_32_T0 - .4byte FLAGS_POW_LV5_32_T1 - .4byte FLAGS_POW_LV5_BOSSDIE - .4byte FLAGS_POW_LV5_MBOSSDIE - .4byte FLAGS_POW_LV5_00_UTSUWA - .4byte FLAGS_POW_LV5_0c_00 - .4byte FLAGS_POW_LV5_0A_CAP_0 - .4byte FLAGS_POW_LV5_0f_HK - .4byte FLAGS_POW_LV5_05_03 - .4byte FLAGS_POW_LV5_08_02 - .4byte FLAGS_POW_LV5_0c_01 - .4byte FLAGS_POW_LV5_0c_02 - .4byte FLAGS_POW_LV5_22_02 - .4byte FLAGS_POW_LV5_15_05 - .4byte FLAGS_POW_LV5_20_02 - .4byte ENUM_END - -FLAGS_POW_LV5_20_02: - .ascii "LV5_20_02\0\0\0" -FLAGS_POW_LV5_15_05: - .ascii "LV5_15_05\0\0\0" -FLAGS_POW_LV5_22_02: - .ascii "LV5_22_02\0\0\0" -FLAGS_POW_LV5_0c_02: - .ascii "LV5_0c_02\0\0\0" -FLAGS_POW_LV5_0c_01: - .ascii "LV5_0c_01\0\0\0" -FLAGS_POW_LV5_08_02: - .ascii "LV5_08_02\0\0\0" -FLAGS_POW_LV5_05_03: - .ascii "LV5_05_03\0\0\0" -FLAGS_POW_LV5_0f_HK: - .ascii "LV5_0f_HK\0\0\0" -FLAGS_POW_LV5_0A_CAP_0: - .ascii "LV5_0A_CAP_0\0\0\0\0" -FLAGS_POW_LV5_0c_00: - .ascii "LV5_0c_00\0\0\0" -FLAGS_POW_LV5_00_UTSUWA: - .ascii "LV5_00_UTSUWA\0\0\0" -FLAGS_POW_LV5_MBOSSDIE: - .ascii "LV5_MBOSSDIE\0\0\0\0" -FLAGS_POW_LV5_BOSSDIE: - .ascii "LV5_BOSSDIE\0" -FLAGS_POW_LV5_32_T1: - .ascii "LV5_32_T1\0\0\0" -FLAGS_POW_LV5_32_T0: - .ascii "LV5_32_T0\0\0\0" -FLAGS_POW_LV5_32_CAP_0: - .ascii "LV5_32_CAP_0\0\0\0\0" -FLAGS_POW_LV5_31_CAP_0: - .ascii "LV5_31_CAP_0\0\0\0\0" -FLAGS_POW_LV5_2d_T0: - .ascii "LV5_2d_T0\0\0\0" -FLAGS_POW_LV5_2c_CAP_0: - .ascii "LV5_2c_CAP_0\0\0\0\0" -FLAGS_POW_LV5_2c_T0: - .ascii "LV5_2c_T0\0\0\0" -FLAGS_POW_LV5_2c_03: - .ascii "LV5_2c_03\0\0\0" -FLAGS_POW_LV5_2c_02: - .ascii "LV5_2c_02\0\0\0" -FLAGS_POW_LV5_2c_01: - .ascii "LV5_2c_01\0\0\0" -FLAGS_POW_LV5_2c_00: - .ascii "LV5_2c_00\0\0\0" -FLAGS_POW_LV5_2b_T0: - .ascii "LV5_2b_T0\0\0\0" -FLAGS_POW_LV5_29_T0: - .ascii "LV5_29_T0\0\0\0" -FLAGS_POW_LV5_29_01: - .ascii "LV5_29_01\0\0\0" -FLAGS_POW_LV5_29_00: - .ascii "LV5_29_00\0\0\0" -FLAGS_POW_LV5_27_00: - .ascii "LV5_27_00\0\0\0" -FLAGS_POW_LV5_23_01: - .ascii "LV5_23_01\0\0\0" -FLAGS_POW_LV5_23_00: - .ascii "LV5_23_00\0\0\0" -FLAGS_POW_LV5_22_CAP_0: - .ascii "LV5_22_CAP_0\0\0\0\0" -FLAGS_POW_LV5_22_01: - .ascii "LV5_22_01\0\0\0" -FLAGS_POW_LV5_22_00: - .ascii "LV5_22_00\0\0\0" -FLAGS_POW_LV5_21_CAP_0: - .ascii "LV5_21_CAP_0\0\0\0\0" -FLAGS_POW_LV5_21_0a: - .ascii "LV5_21_0a\0\0\0" -FLAGS_POW_LV5_21_09: - .ascii "LV5_21_09\0\0\0" -FLAGS_POW_LV5_21_08: - .ascii "LV5_21_08\0\0\0" -FLAGS_POW_LV5_21_07: - .ascii "LV5_21_07\0\0\0" -FLAGS_POW_LV5_21_06: - .ascii "LV5_21_06\0\0\0" -FLAGS_POW_LV5_21_05: - .ascii "LV5_21_05\0\0\0" -FLAGS_POW_LV5_21_04: - .ascii "LV5_21_04\0\0\0" -FLAGS_POW_LV5_21_03: - .ascii "LV5_21_03\0\0\0" -FLAGS_POW_LV5_21_02: - .ascii "LV5_21_02\0\0\0" -FLAGS_POW_LV5_21_01: - .ascii "LV5_21_01\0\0\0" -FLAGS_POW_LV5_21_00: - .ascii "LV5_21_00\0\0\0" -FLAGS_POW_LV5_20_01: - .ascii "LV5_20_01\0\0\0" -FLAGS_POW_LV5_20_00: - .ascii "LV5_20_00\0\0\0" -FLAGS_POW_LV5_1c_T0: - .ascii "LV5_1c_T0\0\0\0" -FLAGS_POW_LV5_1c_00: - .ascii "LV5_1c_00\0\0\0" -FLAGS_POW_LV5_1b_T0: - .ascii "LV5_1b_T0\0\0\0" -FLAGS_POW_LV5_1b_00: - .ascii "LV5_1b_00\0\0\0" -FLAGS_POW_LV5_1a_01: - .ascii "LV5_1a_01\0\0\0" -FLAGS_POW_LV5_1a_00: - .ascii "LV5_1a_00\0\0\0" -FLAGS_POW_LV5_15_B1: - .ascii "LV5_15_B1\0\0\0" -FLAGS_POW_LV5_15_B0: - .ascii "LV5_15_B0\0\0\0" -FLAGS_POW_LV5_15_T0: - .ascii "LV5_15_T0\0\0\0" -FLAGS_POW_LV5_15_04: - .ascii "LV5_15_04\0\0\0" -FLAGS_POW_LV5_15_03: - .ascii "LV5_15_03\0\0\0" -FLAGS_POW_LV5_15_02: - .ascii "LV5_15_02\0\0\0" -FLAGS_POW_LV5_15_01: - .ascii "LV5_15_01\0\0\0" -FLAGS_POW_LV5_15_00: - .ascii "LV5_15_00\0\0\0" -FLAGS_POW_LV5_10_T0: - .ascii "LV5_10_T0\0\0\0" -FLAGS_POW_LV5_0f_T1: - .ascii "LV5_0f_T1\0\0\0" -FLAGS_POW_LV5_0f_T0: - .ascii "LV5_0f_T0\0\0\0" -FLAGS_POW_LV5_0e_00: - .ascii "LV5_0e_00\0\0\0" -FLAGS_POW_LV5_0d_00: - .ascii "LV5_0d_00\0\0\0" -FLAGS_POW_LV5_0b_B1: - .ascii "LV5_0b_B1\0\0\0" -FLAGS_POW_LV5_0b_B0: - .ascii "LV5_0b_B0\0\0\0" -FLAGS_POW_LV5_08_BOSSDOOR: - .ascii "LV5_08_BOSSDOOR\0" -FLAGS_POW_LV5_08_KEY: - .ascii "LV5_08_KEY\0\0" -FLAGS_POW_LV5_08_01: - .ascii "LV5_08_01\0\0\0" -FLAGS_POW_LV5_08_00: - .ascii "LV5_08_00\0\0\0" -FLAGS_POW_LV5_07_T0: - .ascii "LV5_07_T0\0\0\0" -FLAGS_POW_LV5_07_01: - .ascii "LV5_07_01\0\0\0" -FLAGS_POW_LV5_07_00: - .ascii "LV5_07_00\0\0\0" -FLAGS_POW_LV5_06_00: - .ascii "LV5_06_00\0\0\0" -FLAGS_POW_LV5_05_02: - .ascii "LV5_05_02\0\0\0" -FLAGS_POW_LV5_05_01: - .ascii "LV5_05_01\0\0\0" -FLAGS_POW_LV5_05_00: - .ascii "LV5_05_00\0\0\0" -FLAGS_POW_LV5_04_T0: - .ascii "LV5_04_T0\0\0\0" -FLAGS_POW_LV5_03_BOSSDOOR: - .ascii "LV5_03_BOSSDOOR\0" -FLAGS_POW_LV5_03_T0: - .ascii "LV5_03_T0\0\0\0" -FLAGS_POW_LV5_01_T0: - .ascii "LV5_01_T0\0\0\0" -FLAGS_POW_LV5_32_WALK: - .ascii "LV5_32_WALK\0" -FLAGS_POW_LV5_31_WALK: - .ascii "LV5_31_WALK\0" -FLAGS_POW_LV5_30_WALK: - .ascii "LV5_30_WALK\0" -FLAGS_POW_LV5_2F_WALK: - .ascii "LV5_2F_WALK\0" -FLAGS_POW_LV5_2E_WALK: - .ascii "LV5_2E_WALK\0" -FLAGS_POW_LV5_2D_WALK: - .ascii "LV5_2D_WALK\0" -FLAGS_POW_LV5_2C_WALK: - .ascii "LV5_2C_WALK\0" -FLAGS_POW_LV5_2B_WALK: - .ascii "LV5_2B_WALK\0" -FLAGS_POW_LV5_2A_WALK: - .ascii "LV5_2A_WALK\0" -FLAGS_POW_LV5_29_WALK: - .ascii "LV5_29_WALK\0" -FLAGS_POW_LV5_28_WALK: - .ascii "LV5_28_WALK\0" -FLAGS_POW_LV5_27_WALK: - .ascii "LV5_27_WALK\0" -FLAGS_POW_LV5_26_WALK: - .ascii "LV5_26_WALK\0" -FLAGS_POW_LV5_25_WALK: - .ascii "LV5_25_WALK\0" -FLAGS_POW_LV5_24_WALK: - .ascii "LV5_24_WALK\0" -FLAGS_POW_LV5_23_WALK: - .ascii "LV5_23_WALK\0" -FLAGS_POW_LV5_22_WALK: - .ascii "LV5_22_WALK\0" -FLAGS_POW_LV5_21_WALK: - .ascii "LV5_21_WALK\0" -FLAGS_POW_LV5_20_WALK: - .ascii "LV5_20_WALK\0" -FLAGS_POW_LV5_1F_WALK: - .ascii "LV5_1F_WALK\0" -FLAGS_POW_LV5_1E_WALK: - .ascii "LV5_1E_WALK\0" -FLAGS_POW_LV5_1D_WALK: - .ascii "LV5_1D_WALK\0" -FLAGS_POW_LV5_1C_WALK: - .ascii "LV5_1C_WALK\0" -FLAGS_POW_LV5_1B_WALK: - .ascii "LV5_1B_WALK\0" -FLAGS_POW_LV5_1A_WALK: - .ascii "LV5_1A_WALK\0" -FLAGS_POW_LV5_19_WALK: - .ascii "LV5_19_WALK\0" -FLAGS_POW_LV5_18_WALK: - .ascii "LV5_18_WALK\0" -FLAGS_POW_LV5_17_WALK: - .ascii "LV5_17_WALK\0" -FLAGS_POW_LV5_16_WALK: - .ascii "LV5_16_WALK\0" -FLAGS_POW_LV5_15_WALK: - .ascii "LV5_15_WALK\0" -FLAGS_POW_LV5_14_WALK: - .ascii "LV5_14_WALK\0" -FLAGS_POW_LV5_13_WALK: - .ascii "LV5_13_WALK\0" -FLAGS_POW_LV5_12_WALK: - .ascii "LV5_12_WALK\0" -FLAGS_POW_LV5_11_WALK: - .ascii "LV5_11_WALK\0" -FLAGS_POW_LV5_10_WALK: - .ascii "LV5_10_WALK\0" -FLAGS_POW_LV5_0F_WALK: - .ascii "LV5_0F_WALK\0" -FLAGS_POW_LV5_0E_WALK: - .ascii "LV5_0E_WALK\0" -FLAGS_POW_LV5_0D_WALK: - .ascii "LV5_0D_WALK\0" -FLAGS_POW_LV5_0C_WALK: - .ascii "LV5_0C_WALK\0" -FLAGS_POW_LV5_0B_WALK: - .ascii "LV5_0B_WALK\0" -FLAGS_POW_LV5_0A_WALK: - .ascii "LV5_0A_WALK\0" -FLAGS_POW_LV5_09_WALK: - .ascii "LV5_09_WALK\0" -FLAGS_POW_LV5_08_WALK: - .ascii "LV5_08_WALK\0" -FLAGS_POW_LV5_07_WALK: - .ascii "LV5_07_WALK\0" -FLAGS_POW_LV5_06_WALK: - .ascii "LV5_06_WALK\0" -FLAGS_POW_LV5_05_WALK: - .ascii "LV5_05_WALK\0" -FLAGS_POW_LV5_04_WALK: - .ascii "LV5_04_WALK\0" -FLAGS_POW_LV5_03_WALK: - .ascii "LV5_03_WALK\0" -FLAGS_POW_LV5_02_WALK: - .ascii "LV5_02_WALK\0" -FLAGS_POW_LV5_01_WALK: - .ascii "LV5_01_WALK\0" -FLAGS_POW_LV5_00_WALK: - .ascii "LV5_00_WALK\0" - -FLAGS_DHC: - .4byte ENUM_BEGIN - .4byte FLAGS_DHC_LV6_00_WALK - .4byte FLAGS_DHC_LV6_01_WALK - .4byte FLAGS_DHC_LV6_02_WALK - .4byte FLAGS_DHC_LV6_03_WALK - .4byte FLAGS_DHC_LV6_04_WALK - .4byte FLAGS_DHC_LV6_05_WALK - .4byte FLAGS_DHC_LV6_06_WALK - .4byte FLAGS_DHC_LV6_07_WALK - .4byte FLAGS_DHC_LV6_08_WALK - .4byte FLAGS_DHC_LV6_09_WALK - .4byte FLAGS_DHC_LV6_0A_WALK - .4byte FLAGS_DHC_LV6_0B_WALK - .4byte FLAGS_DHC_LV6_0C_WALK - .4byte FLAGS_DHC_LV6_0D_WALK - .4byte FLAGS_DHC_LV6_0E_WALK - .4byte FLAGS_DHC_LV6_0F_WALK - .4byte FLAGS_DHC_LV6_10_WALK - .4byte FLAGS_DHC_LV6_11_WALK - .4byte FLAGS_DHC_LV6_12_WALK - .4byte FLAGS_DHC_LV6_13_WALK - .4byte FLAGS_DHC_LV6_14_WALK - .4byte FLAGS_DHC_LV6_15_WALK - .4byte FLAGS_DHC_LV6_16_WALK - .4byte FLAGS_DHC_LV6_17_WALK - .4byte FLAGS_DHC_LV6_18_WALK - .4byte FLAGS_DHC_LV6_19_WALK - .4byte FLAGS_DHC_LV6_1A_WALK - .4byte FLAGS_DHC_LV6_1B_WALK - .4byte FLAGS_DHC_LV6_1C_WALK - .4byte FLAGS_DHC_LV6_1D_WALK - .4byte FLAGS_DHC_LV6_1E_WALK - .4byte FLAGS_DHC_LV6_1F_WALK - .4byte FLAGS_DHC_LV6_20_WALK - .4byte FLAGS_DHC_LV6_21_WALK - .4byte FLAGS_DHC_LV6_22_WALK - .4byte FLAGS_DHC_LV6_23_WALK - .4byte FLAGS_DHC_LV6_24_WALK - .4byte FLAGS_DHC_LV6_25_WALK - .4byte FLAGS_DHC_LV6_26_WALK - .4byte FLAGS_DHC_LV6_27_WALK - .4byte FLAGS_DHC_LV6_28_WALK - .4byte FLAGS_DHC_LV6_29_WALK - .4byte FLAGS_DHC_LV6_2A_WALK - .4byte FLAGS_DHC_LV6_2B_WALK - .4byte FLAGS_DHC_LV6_2C_WALK - .4byte FLAGS_DHC_LV6_2D_WALK - .4byte FLAGS_DHC_LV6_2E_WALK - .4byte FLAGS_DHC_LV6_2F_WALK - .4byte FLAGS_DHC_LV6_30_WALK - .4byte FLAGS_DHC_LV6_31_WALK - .4byte FLAGS_DHC_LV6_32_WALK - .4byte FLAGS_DHC_LV6_33_WALK - .4byte FLAGS_DHC_LV6_34_WALK - .4byte FLAGS_DHC_LV6_35_WALK - .4byte FLAGS_DHC_LV6_36_WALK - .4byte FLAGS_DHC_LV6_37_WALK - .4byte FLAGS_DHC_LV6_38_WALK - .4byte FLAGS_DHC_LV6_39_WALK - .4byte FLAGS_DHC_LV6_3A_WALK - .4byte FLAGS_DHC_LV6_3B_WALK - .4byte FLAGS_DHC_LV6_00_00 - .4byte FLAGS_DHC_LV6_01_T0 - .4byte FLAGS_DHC_LV6_02_T0 - .4byte FLAGS_DHC_LV6_03_T0 - .4byte FLAGS_DHC_LV6_04_T0 - .4byte FLAGS_DHC_LV6_07_00 - .4byte FLAGS_DHC_LV6_09_T0 - .4byte FLAGS_DHC_LV6_09_KB0 - .4byte FLAGS_DHC_LV6_09_KB1 - .4byte FLAGS_DHC_LV6_09_KB2 - .4byte FLAGS_DHC_LV6_09_KB3 - .4byte FLAGS_DHC_LV6_0a_01 - .4byte FLAGS_DHC_LV6_0b_00 - .4byte FLAGS_DHC_LV6_0c_00 - .4byte FLAGS_DHC_LV6_0c_01 - .4byte FLAGS_DHC_LV6_0e_00 - .4byte FLAGS_DHC_LV6_10_00 - .4byte FLAGS_DHC_LV6_11_00 - .4byte FLAGS_DHC_LV6_11_01 - .4byte FLAGS_DHC_LV6_11_B0 - .4byte FLAGS_DHC_LV6_11_B1 - .4byte FLAGS_DHC_LV6_11_B2 - .4byte FLAGS_DHC_LV6_13_00 - .4byte FLAGS_DHC_LV6_14_00 - .4byte FLAGS_DHC_LV6_14_BOSSDOOR - .4byte FLAGS_DHC_LV6_15_00 - .4byte FLAGS_DHC_LV6_16_00 - .4byte FLAGS_DHC_LV6_17_00 - .4byte FLAGS_DHC_LV6_17_01 - .4byte FLAGS_DHC_LV6_18_00 - .4byte FLAGS_DHC_LV6_1a_00 - .4byte FLAGS_DHC_LV6_1c_CAP_0 - .4byte FLAGS_DHC_LV6_1d_00 - .4byte FLAGS_DHC_LV6_1f_00 - .4byte FLAGS_DHC_LV6_20_T0 - .4byte FLAGS_DHC_LV6_24_00 - .4byte FLAGS_DHC_LV6_26_00 - .4byte FLAGS_DHC_LV6_26_01 - .4byte FLAGS_DHC_LV6_26_CAP_0 - .4byte FLAGS_DHC_LV6_27_00 - .4byte FLAGS_DHC_LV6_27_T0 - .4byte FLAGS_DHC_LV6_30_00 - .4byte FLAGS_DHC_LV6_32_00 - .4byte FLAGS_DHC_LV6_34_00 - .4byte FLAGS_DHC_LV6_34_01 - .4byte FLAGS_DHC_LV6_35_00 - .4byte FLAGS_DHC_LV6_37_T0 - .4byte FLAGS_DHC_LV6_39_00 - .4byte FLAGS_DHC_LV6_39_01 - .4byte FLAGS_DHC_LV6_39_02 - .4byte FLAGS_DHC_LV6_1f_CHAIR_L - .4byte FLAGS_DHC_LV6_1f_CHAIR_R - .4byte FLAGS_DHC_LV6_1d_KEYGET - .4byte FLAGS_DHC_LV6_1b_TAREMAKU - .4byte FLAGS_DHC_LV6SOTO_01_KAIJO - .4byte FLAGS_DHC_LV6_SEKIKA_END - .4byte FLAGS_DHC_LV6_GUFUU1_FIGURE - .4byte FLAGS_DHC_LV6_GUFUU2_FIGURE - .4byte FLAGS_DHC_LV6_GUFUU1_GISHIKI - .4byte FLAGS_DHC_LV6_GUFUU1_DEMO - .4byte FLAGS_DHC_LV6_ZELDA_DISCURSE - .4byte FLAGS_DHC_LV6_00_ESCAPE - .4byte FLAGS_DHC_LV6_GUFUU2_DEAD - .4byte FLAGS_DHC_LV6_KANE_START - .4byte FLAGS_DHC_LV6_KANE_1ST - .4byte FLAGS_DHC_LV6_KANE_2ND - .4byte FLAGS_DHC_LV6_SOTO_ENDING - .4byte FLAGS_DHC_LV6_08_00 - .4byte FLAGS_DHC_LV6_39_03 - .4byte FLAGS_DHC_LV6_SOTO_06_00 - .4byte FLAGS_DHC_LV6_SOTO_06_01 - .4byte FLAGS_DHC_LV6_0A_CAP_0 - .4byte FLAGS_DHC_LV6SOTO_01_CAP_0 - .4byte FLAGS_DHC_LV6_0a_00 - .4byte FLAGS_DHC_LV6_0b_01 - .4byte FLAGS_DHC_LV6_0e_01 - .4byte FLAGS_DHC_LV6_10_01 - .4byte FLAGS_DHC_LV6_13_01 - .4byte FLAGS_DHC_LV6_14_01 - .4byte FLAGS_DHC_LV6_15_01 - .4byte FLAGS_DHC_LV6_1a_01 - .4byte FLAGS_DHC_LV6_1f_01 - .4byte FLAGS_DHC_LV6_39_04 - .4byte FLAGS_DHC_LV6_17_02 - .4byte FLAGS_DHC_LV6_18_01 - .4byte FLAGS_DHC_LV6_08_01 - .4byte FLAGS_DHC_LV6_SOTO_01_00 - .4byte FLAGS_DHC_LV6_SOTO_01_01 - .4byte FLAGS_DHC_LV6_SOTO_01_02 - .4byte FLAGS_DHC_LV6_39_KING - .4byte ENUM_END - -FLAGS_DHC_LV6_39_KING: - .ascii "LV6_39_KING\0" -FLAGS_DHC_LV6_SOTO_01_02: - .ascii "LV6_SOTO_01_02\0\0" -FLAGS_DHC_LV6_SOTO_01_01: - .ascii "LV6_SOTO_01_01\0\0" -FLAGS_DHC_LV6_SOTO_01_00: - .ascii "LV6_SOTO_01_00\0\0" -FLAGS_DHC_LV6_08_01: - .ascii "LV6_08_01\0\0\0" -FLAGS_DHC_LV6_18_01: - .ascii "LV6_18_01\0\0\0" -FLAGS_DHC_LV6_17_02: - .ascii "LV6_17_02\0\0\0" -FLAGS_DHC_LV6_39_04: - .ascii "LV6_39_04\0\0\0" -FLAGS_DHC_LV6_1f_01: - .ascii "LV6_1f_01\0\0\0" -FLAGS_DHC_LV6_1a_01: - .ascii "LV6_1a_01\0\0\0" -FLAGS_DHC_LV6_15_01: - .ascii "LV6_15_01\0\0\0" -FLAGS_DHC_LV6_14_01: - .ascii "LV6_14_01\0\0\0" -FLAGS_DHC_LV6_13_01: - .ascii "LV6_13_01\0\0\0" -FLAGS_DHC_LV6_10_01: - .ascii "LV6_10_01\0\0\0" -FLAGS_DHC_LV6_0e_01: - .ascii "LV6_0e_01\0\0\0" -FLAGS_DHC_LV6_0b_01: - .ascii "LV6_0b_01\0\0\0" -FLAGS_DHC_LV6_0a_00: - .ascii "LV6_0a_00\0\0\0" -FLAGS_DHC_LV6SOTO_01_CAP_0 : - .ascii "LV6SOTO_01_CAP_0 \0\0\0" -FLAGS_DHC_LV6_0A_CAP_0 : - .ascii "LV6_0A_CAP_0 \0\0\0" -FLAGS_DHC_LV6_SOTO_06_01: - .ascii "LV6_SOTO_06_01\0\0" -FLAGS_DHC_LV6_SOTO_06_00: - .ascii "LV6_SOTO_06_00\0\0" -FLAGS_DHC_LV6_39_03: - .ascii "LV6_39_03\0\0\0" -FLAGS_DHC_LV6_08_00: - .ascii "LV6_08_00\0\0\0" -FLAGS_DHC_LV6_SOTO_ENDING: - .ascii "LV6_SOTO_ENDING\0" -FLAGS_DHC_LV6_KANE_2ND: - .ascii "LV6_KANE_2ND\0\0\0\0" -FLAGS_DHC_LV6_KANE_1ST: - .ascii "LV6_KANE_1ST\0\0\0\0" -FLAGS_DHC_LV6_KANE_START: - .ascii "LV6_KANE_START\0\0" -FLAGS_DHC_LV6_GUFUU2_DEAD: - .ascii "LV6_GUFUU2_DEAD\0" -FLAGS_DHC_LV6_00_ESCAPE: - .ascii "LV6_00_ESCAPE\0\0\0" -FLAGS_DHC_LV6_ZELDA_DISCURSE: - .ascii "LV6_ZELDA_DISCURSE\0\0" -FLAGS_DHC_LV6_GUFUU1_DEMO: - .ascii "LV6_GUFUU1_DEMO\0" -FLAGS_DHC_LV6_GUFUU1_GISHIKI: - .ascii "LV6_GUFUU1_GISHIKI\0\0" -FLAGS_DHC_LV6_GUFUU2_FIGURE: - .ascii "LV6_GUFUU2_FIGURE\0\0\0" -FLAGS_DHC_LV6_GUFUU1_FIGURE: - .ascii "LV6_GUFUU1_FIGURE\0\0\0" -FLAGS_DHC_LV6_SEKIKA_END: - .ascii "LV6_SEKIKA_END\0\0" -FLAGS_DHC_LV6SOTO_01_KAIJO: - .ascii "LV6SOTO_01_KAIJO\0\0\0\0" -FLAGS_DHC_LV6_1b_TAREMAKU: - .ascii "LV6_1b_TAREMAKU\0" -FLAGS_DHC_LV6_1d_KEYGET: - .ascii "LV6_1d_KEYGET\0\0\0" -FLAGS_DHC_LV6_1f_CHAIR_R: - .ascii "LV6_1f_CHAIR_R\0\0" -FLAGS_DHC_LV6_1f_CHAIR_L: - .ascii "LV6_1f_CHAIR_L\0\0" -FLAGS_DHC_LV6_39_02: - .ascii "LV6_39_02\0\0\0" -FLAGS_DHC_LV6_39_01: - .ascii "LV6_39_01\0\0\0" -FLAGS_DHC_LV6_39_00: - .ascii "LV6_39_00\0\0\0" -FLAGS_DHC_LV6_37_T0: - .ascii "LV6_37_T0\0\0\0" -FLAGS_DHC_LV6_35_00: - .ascii "LV6_35_00\0\0\0" -FLAGS_DHC_LV6_34_01: - .ascii "LV6_34_01\0\0\0" -FLAGS_DHC_LV6_34_00: - .ascii "LV6_34_00\0\0\0" -FLAGS_DHC_LV6_32_00: - .ascii "LV6_32_00\0\0\0" -FLAGS_DHC_LV6_30_00: - .ascii "LV6_30_00\0\0\0" -FLAGS_DHC_LV6_27_T0: - .ascii "LV6_27_T0\0\0\0" -FLAGS_DHC_LV6_27_00: - .ascii "LV6_27_00\0\0\0" -FLAGS_DHC_LV6_26_CAP_0 : - .ascii "LV6_26_CAP_0 \0\0\0" -FLAGS_DHC_LV6_26_01: - .ascii "LV6_26_01\0\0\0" -FLAGS_DHC_LV6_26_00: - .ascii "LV6_26_00\0\0\0" -FLAGS_DHC_LV6_24_00: - .ascii "LV6_24_00\0\0\0" -FLAGS_DHC_LV6_20_T0: - .ascii "LV6_20_T0\0\0\0" -FLAGS_DHC_LV6_1f_00: - .ascii "LV6_1f_00\0\0\0" -FLAGS_DHC_LV6_1d_00: - .ascii "LV6_1d_00\0\0\0" -FLAGS_DHC_LV6_1c_CAP_0: - .ascii "LV6_1c_CAP_0\0\0\0\0" -FLAGS_DHC_LV6_1a_00: - .ascii "LV6_1a_00\0\0\0" -FLAGS_DHC_LV6_18_00: - .ascii "LV6_18_00\0\0\0" -FLAGS_DHC_LV6_17_01: - .ascii "LV6_17_01\0\0\0" -FLAGS_DHC_LV6_17_00: - .ascii "LV6_17_00\0\0\0" -FLAGS_DHC_LV6_16_00: - .ascii "LV6_16_00\0\0\0" -FLAGS_DHC_LV6_15_00: - .ascii "LV6_15_00\0\0\0" -FLAGS_DHC_LV6_14_BOSSDOOR: - .ascii "LV6_14_BOSSDOOR\0" -FLAGS_DHC_LV6_14_00: - .ascii "LV6_14_00\0\0\0" -FLAGS_DHC_LV6_13_00: - .ascii "LV6_13_00\0\0\0" -FLAGS_DHC_LV6_11_B2: - .ascii "LV6_11_B2\0\0\0" -FLAGS_DHC_LV6_11_B1: - .ascii "LV6_11_B1\0\0\0" -FLAGS_DHC_LV6_11_B0: - .ascii "LV6_11_B0\0\0\0" -FLAGS_DHC_LV6_11_01: - .ascii "LV6_11_01\0\0\0" -FLAGS_DHC_LV6_11_00: - .ascii "LV6_11_00\0\0\0" -FLAGS_DHC_LV6_10_00: - .ascii "LV6_10_00\0\0\0" -FLAGS_DHC_LV6_0e_00: - .ascii "LV6_0e_00\0\0\0" -FLAGS_DHC_LV6_0c_01: - .ascii "LV6_0c_01\0\0\0" -FLAGS_DHC_LV6_0c_00: - .ascii "LV6_0c_00\0\0\0" -FLAGS_DHC_LV6_0b_00: - .ascii "LV6_0b_00\0\0\0" -FLAGS_DHC_LV6_0a_01: - .ascii "LV6_0a_01\0\0\0" -FLAGS_DHC_LV6_09_KB3: - .ascii "LV6_09_KB3\0\0" -FLAGS_DHC_LV6_09_KB2: - .ascii "LV6_09_KB2\0\0" -FLAGS_DHC_LV6_09_KB1: - .ascii "LV6_09_KB1\0\0" -FLAGS_DHC_LV6_09_KB0: - .ascii "LV6_09_KB0\0\0" -FLAGS_DHC_LV6_09_T0: - .ascii "LV6_09_T0\0\0\0" -FLAGS_DHC_LV6_07_00: - .ascii "LV6_07_00\0\0\0" -FLAGS_DHC_LV6_04_T0: - .ascii "LV6_04_T0\0\0\0" -FLAGS_DHC_LV6_03_T0: - .ascii "LV6_03_T0\0\0\0" -FLAGS_DHC_LV6_02_T0: - .ascii "LV6_02_T0\0\0\0" -FLAGS_DHC_LV6_01_T0: - .ascii "LV6_01_T0\0\0\0" -FLAGS_DHC_LV6_00_00: - .ascii "LV6_00_00\0\0\0" -FLAGS_DHC_LV6_3B_WALK: - .ascii "LV6_3B_WALK\0" -FLAGS_DHC_LV6_3A_WALK: - .ascii "LV6_3A_WALK\0" -FLAGS_DHC_LV6_39_WALK: - .ascii "LV6_39_WALK\0" -FLAGS_DHC_LV6_38_WALK: - .ascii "LV6_38_WALK\0" -FLAGS_DHC_LV6_37_WALK: - .ascii "LV6_37_WALK\0" -FLAGS_DHC_LV6_36_WALK: - .ascii "LV6_36_WALK\0" -FLAGS_DHC_LV6_35_WALK: - .ascii "LV6_35_WALK\0" -FLAGS_DHC_LV6_34_WALK: - .ascii "LV6_34_WALK\0" -FLAGS_DHC_LV6_33_WALK: - .ascii "LV6_33_WALK\0" -FLAGS_DHC_LV6_32_WALK: - .ascii "LV6_32_WALK\0" -FLAGS_DHC_LV6_31_WALK: - .ascii "LV6_31_WALK\0" -FLAGS_DHC_LV6_30_WALK: - .ascii "LV6_30_WALK\0" -FLAGS_DHC_LV6_2F_WALK: - .ascii "LV6_2F_WALK\0" -FLAGS_DHC_LV6_2E_WALK: - .ascii "LV6_2E_WALK\0" -FLAGS_DHC_LV6_2D_WALK: - .ascii "LV6_2D_WALK\0" -FLAGS_DHC_LV6_2C_WALK: - .ascii "LV6_2C_WALK\0" -FLAGS_DHC_LV6_2B_WALK: - .ascii "LV6_2B_WALK\0" -FLAGS_DHC_LV6_2A_WALK: - .ascii "LV6_2A_WALK\0" -FLAGS_DHC_LV6_29_WALK: - .ascii "LV6_29_WALK\0" -FLAGS_DHC_LV6_28_WALK: - .ascii "LV6_28_WALK\0" -FLAGS_DHC_LV6_27_WALK: - .ascii "LV6_27_WALK\0" -FLAGS_DHC_LV6_26_WALK: - .ascii "LV6_26_WALK\0" -FLAGS_DHC_LV6_25_WALK: - .ascii "LV6_25_WALK\0" -FLAGS_DHC_LV6_24_WALK: - .ascii "LV6_24_WALK\0" -FLAGS_DHC_LV6_23_WALK: - .ascii "LV6_23_WALK\0" -FLAGS_DHC_LV6_22_WALK: - .ascii "LV6_22_WALK\0" -FLAGS_DHC_LV6_21_WALK: - .ascii "LV6_21_WALK\0" -FLAGS_DHC_LV6_20_WALK: - .ascii "LV6_20_WALK\0" -FLAGS_DHC_LV6_1F_WALK: - .ascii "LV6_1F_WALK\0" -FLAGS_DHC_LV6_1E_WALK: - .ascii "LV6_1E_WALK\0" -FLAGS_DHC_LV6_1D_WALK: - .ascii "LV6_1D_WALK\0" -FLAGS_DHC_LV6_1C_WALK: - .ascii "LV6_1C_WALK\0" -FLAGS_DHC_LV6_1B_WALK: - .ascii "LV6_1B_WALK\0" -FLAGS_DHC_LV6_1A_WALK: - .ascii "LV6_1A_WALK\0" -FLAGS_DHC_LV6_19_WALK: - .ascii "LV6_19_WALK\0" -FLAGS_DHC_LV6_18_WALK: - .ascii "LV6_18_WALK\0" -FLAGS_DHC_LV6_17_WALK: - .ascii "LV6_17_WALK\0" -FLAGS_DHC_LV6_16_WALK: - .ascii "LV6_16_WALK\0" -FLAGS_DHC_LV6_15_WALK: - .ascii "LV6_15_WALK\0" -FLAGS_DHC_LV6_14_WALK: - .ascii "LV6_14_WALK\0" -FLAGS_DHC_LV6_13_WALK: - .ascii "LV6_13_WALK\0" -FLAGS_DHC_LV6_12_WALK: - .ascii "LV6_12_WALK\0" -FLAGS_DHC_LV6_11_WALK: - .ascii "LV6_11_WALK\0" -FLAGS_DHC_LV6_10_WALK: - .ascii "LV6_10_WALK\0" -FLAGS_DHC_LV6_0F_WALK: - .ascii "LV6_0F_WALK\0" -FLAGS_DHC_LV6_0E_WALK: - .ascii "LV6_0E_WALK\0" -FLAGS_DHC_LV6_0D_WALK: - .ascii "LV6_0D_WALK\0" -FLAGS_DHC_LV6_0C_WALK: - .ascii "LV6_0C_WALK\0" -FLAGS_DHC_LV6_0B_WALK: - .ascii "LV6_0B_WALK\0" -FLAGS_DHC_LV6_0A_WALK: - .ascii "LV6_0A_WALK\0" -FLAGS_DHC_LV6_09_WALK: - .ascii "LV6_09_WALK\0" -FLAGS_DHC_LV6_08_WALK: - .ascii "LV6_08_WALK\0" -FLAGS_DHC_LV6_07_WALK: - .ascii "LV6_07_WALK\0" -FLAGS_DHC_LV6_06_WALK: - .ascii "LV6_06_WALK\0" -FLAGS_DHC_LV6_05_WALK: - .ascii "LV6_05_WALK\0" -FLAGS_DHC_LV6_04_WALK: - .ascii "LV6_04_WALK\0" -FLAGS_DHC_LV6_03_WALK: - .ascii "LV6_03_WALK\0" -FLAGS_DHC_LV6_02_WALK: - .ascii "LV6_02_WALK\0" -FLAGS_DHC_LV6_01_WALK: - .ascii "LV6_01_WALK\0" -FLAGS_DHC_LV6_00_WALK: - .ascii "LV6_00_WALK\0" - -FLAGS_UNUSED1: - .4byte ENUM_BEGIN - .4byte ENUM_END - -FLAGS_UNUSED2: - .4byte ENUM_BEGIN - .4byte ENUM_END diff --git a/data/gfx/sprite_ptrs.s b/data/gfx/sprite_ptrs.s index 7412713a..3da7ea8a 100644 --- a/data/gfx/sprite_ptrs.s +++ b/data/gfx/sprite_ptrs.s @@ -1641,7 +1641,7 @@ gMoreSpritePtrs:: @ 08003DD4 .4byte 00000000 .4byte 00000000 - .4byte gSpriteAnimations_Object6A_9 + .4byte gSpriteAnimations_Object6A_10 .4byte 00000000 .4byte 00000000 .4byte 00000000 diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc index c6307a6f..c1bc824e 100644 --- a/data/scripts/script_08008B5C.inc +++ b/data/scripts/script_08008B5C.inc @@ -28,7 +28,7 @@ script_08008BA2: _0807E864 _0807E930 0x0004 Call sub_0807F2D4 - TextboxNoOverlapFollow 0x4912 + MessageFromTarget 0x4912 WaitUntilTextboxCloses _0807E930 0x0008 _0807E878 @@ -60,7 +60,7 @@ script_08008BD2: CallWithArg sub_0806BB1C, 0x00000001 Call sub_0806BB7C JumpIfNot script_08008C5C - TextboxNoOverlap 0x490c + MessageNoOverlap 0x490c WaitUntilTextboxCloses LoadRoomEntityList gUnk_080D6784 WaitForSomething 0x00000001 @@ -69,7 +69,7 @@ script_08008BD2: PlaySound SFX_SECRET _0807E930 0x0004 Call sub_0807F2D4 - TextboxNoOverlap 0x4913 + MessageNoOverlap 0x4913 WaitUntilTextboxCloses _0807E930 0x0008 Call sub_0807F2D4 @@ -91,7 +91,7 @@ SCRIPT_START script_08008C64 PlaySound SFX_STAIRS EndBlock WaitForSomething 0x00000002 - TextboxNoOverlap 0x490d + MessageNoOverlap 0x490d WaitUntilTextboxCloses DoPostScriptAction 0x0007 Call sub_08064D08 diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc index 1eed9434..1dd05221 100644 --- a/data/scripts/script_08008D8C.inc +++ b/data/scripts/script_08008D8C.inc @@ -64,7 +64,7 @@ script_08008E12: WaitForSomething2 0x00000100 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollowPos 0x1053, 0x000e + MessageFromTargetPos 0x1053, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000080 WaitForSomething2 0x00000100 diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc index 3272e672..04ab3012 100644 --- a/data/scripts/script_08008FC0.inc +++ b/data/scripts/script_08008FC0.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08008FC0 PlaySound SFX_109 CallWithArg sub_0807F238, 0x0000045f Call sub_0807F304 - TextboxNoOverlapFollowPos 0x0501, 0x000e + MessageFromTargetPos 0x0501, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000020 Call sub_080791BC diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc index fd2ced57..ba22fe01 100644 --- a/data/scripts/script_0800903C.inc +++ b/data/scripts/script_0800903C.inc @@ -29,20 +29,20 @@ SCRIPT_START script_08009080 _0807EB44 0x0004 _0807ECC4 0x0008 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1050, 0x000e + MessageFromTargetPos 0x1050, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1052, 0x000e + MessageFromTargetPos 0x1052, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EB44 0x0006 _0807E930 0x0005 - TextboxNoOverlapFollowPos 0x1054, 0x000e + MessageFromTargetPos 0x1054, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 @@ -51,25 +51,25 @@ SCRIPT_START script_08009080 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1056, 0x000e + MessageFromTargetPos 0x1056, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1057, 0x000e + MessageFromTargetPos 0x1057, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x1058, 0x000e + MessageFromTargetPos 0x1058, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 - TextboxNoOverlapFollowPos 0x105c, 0x000e + MessageFromTargetPos 0x105c, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000100 @@ -92,7 +92,7 @@ SCRIPT_START script_08009198 WaitForSomething2 0x00000001 _0807EB74 DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x105b, 0x0000 + MessageFromTargetPos 0x105b, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -104,7 +104,7 @@ SCRIPT_START script_08009198 DoPostScriptAction 0x0005 Wait 0x003c DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1051, 0x0000 + MessageFromTargetPos 0x1051, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -114,7 +114,7 @@ SCRIPT_START script_08009198 _0807EB74 _0807EB8C DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1055, 0x0000 + MessageFromTargetPos 0x1055, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -128,7 +128,7 @@ SCRIPT_START script_08009198 _0807EB74 DoPostScriptAction 0x0000 DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1059, 0x0000 + MessageFromTargetPos 0x1059, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -167,9 +167,9 @@ script_080092B2: script_080092BA: CheckEntityInteractType JumpIfNot script_080092BA - _0807E864 - _0807EB74 - TextboxNoOverlap 0x105e + _0807E864 + _0807EB74 + MessageNoOverlap 0x105e WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -192,11 +192,11 @@ SCRIPT_START script_080092F0 script_08009300: CheckEntityInteractType JumpIfNot script_08009300 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x1071 + _0807E864 + _0807EB74 + MessageNoOverlap 0x1071 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08009300 .2byte 0x0000 SCRIPT_START script_08009318 diff --git a/data/scripts/script_08009348.inc b/data/scripts/script_08009348.inc index 88e1cf86..17a843d6 100644 --- a/data/scripts/script_08009348.inc +++ b/data/scripts/script_08009348.inc @@ -12,7 +12,7 @@ script_0800934E: CameraTargetEntity CheckGlobalFlag 0x0055 JumpIf script_0800939A - TextboxNoOverlap 0x1d01 + MessageNoOverlap 0x1d01 WaitUntilTextboxCloses script_08009376: WaitUntilTextboxCloses diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc index 214690f8..39e1d99d 100644 --- a/data/scripts/script_0800939A.inc +++ b/data/scripts/script_0800939A.inc @@ -17,14 +17,14 @@ SCRIPT_START script_0800939A JumpIf script_080093BC CheckInventory1 0x000e JumpIf script_080093BC - TextboxNoOverlap 0x1d02 + MessageNoOverlap 0x1d02 WaitUntilTextboxCloses Jump script_08009376 script_080093BC: CheckInventory1 0x000e JumpIfNot script_080093DA Call sub_0806D788 - TextboxNoOverlap 0x1d03 + MessageNoOverlap 0x1d03 WaitUntilTextboxCloses Call sub_0806D70C Jump script_08009376 @@ -46,12 +46,12 @@ script_080093DA: JumpIf script_080093EE SetIntVariable 0x00001d04 script_080093EE: - TextboxNoOverlapVar + MessageNoOverlapVar WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_08009376 Wait 0x001e - TextboxNoOverlap 0x1d08 + MessageNoOverlap 0x1d08 WaitUntilTextboxCloses LoadRoomEntityList gUnk_080F9C38 Wait 0x0078 @@ -77,19 +77,19 @@ script_080093EE: .endif .endif Call sub_0806D5D4 - _0807EB8C - TextboxNoOverlap 0x1d09 + _0807EB8C + MessageNoOverlap 0x1d09 WaitUntilTextboxCloses Wait 0x000a Jump script_08009376 script_0800943E: Call sub_0806D600 JumpIf script_08009452 - TextboxNoOverlap 0x1d0a + MessageNoOverlap 0x1d0a WaitUntilTextboxCloses JumpIfNot script_08009376 script_08009452: - TextboxNoOverlap 0x1d0b + MessageNoOverlap 0x1d0b WaitUntilTextboxCloses Call sub_0806D74C _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index 05c10085..26dafb65 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -20,9 +20,9 @@ SCRIPT_START script_08009464 .endif Call sub_0806D620 Wait 0x003c - WaitPlayerAction8 - _0807EB8C - TextboxNoOverlap 0x1d0c + WaitPlayerAction8 + _0807EB8C + MessageNoOverlap 0x1d0c WaitUntilTextboxCloses Wait 0x000a Jump script_08009376 diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc index a8f53247..4b5abf8d 100644 --- a/data/scripts/script_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -9,8 +9,8 @@ SCRIPT_START script_080095F2 JumpIfNot script_08009622 PlaySound SFX_109 _0807F088 0x003c - TextboxNoOverlapFollow 0x053c - WaitPlayerAction8 + MessageFromTarget 0x053c + WaitPlayerAction8 WaitUntilTextboxCloses _0807F078 0x003c, 0x0001 script_08009622: diff --git a/data/scripts/script_08009950.inc b/data/scripts/script_08009950.inc index 121de12d..18c18086 100644 --- a/data/scripts/script_08009950.inc +++ b/data/scripts/script_08009950.inc @@ -16,7 +16,7 @@ SCRIPT_START script_08009950 Wait 0x001e _0807E930 0x000b Wait 0x001e - TextboxNoOverlapFollow 0x1002 + MessageFromTarget 0x1002 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000004 @@ -26,7 +26,7 @@ SCRIPT_START script_08009950 _0807EDD4 0x00b8, 0x005c _0807EB44 0x0006 DoPostScriptAction 0x0001 - TextboxNoOverlapFollow 0x1004 + MessageFromTarget 0x1004 WaitUntilTextboxCloses DoPostScriptAction 0x0000 Wait 0x001e diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc index 42aaa4c8..9fec298d 100644 --- a/data/scripts/script_080099DC.inc +++ b/data/scripts/script_080099DC.inc @@ -9,13 +9,13 @@ SCRIPT_START script_080099DC DoPostScriptAction 0x0007 _0807EDD4 0x0068, 0x0060 Wait 0x000f - TextboxNoOverlapFollow 0x1001 + MessageFromTarget 0x1001 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 DoPostScriptAction 0x0001 - TextboxNoOverlapFollow 0x1003 + MessageFromTarget 0x1003 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000008 diff --git a/data/scripts/script_08009B30.inc b/data/scripts/script_08009B30.inc index 4c85886e..93160763 100644 --- a/data/scripts/script_08009B30.inc +++ b/data/scripts/script_08009B30.inc @@ -6,7 +6,7 @@ SCRIPT_START script_08009B30 EndBlock WaitFor_2 Wait 0x001e - TextboxNoOverlapFollow 0x1005 + MessageFromTarget 0x1005 WaitUntilTextboxCloses Wait 0x003c Call sub_0807529C diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc index 38809939..04b88f0d 100644 --- a/data/scripts/script_08009B78.inc +++ b/data/scripts/script_08009B78.inc @@ -18,15 +18,15 @@ SCRIPT_START script_08009B78 DoPostScriptAction 0x0000 Wait 0x000f DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x1009, 0x0000 - _0807E8E4_1 + MessageFromTargetPos 0x1009, 0x0000 + _0807E8E4_1 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807EB8C DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x100b, 0x0000 + MessageFromTargetPos 0x100b, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000002 @@ -45,7 +45,7 @@ SCRIPT_START script_08009B78 WaitPlayerAction8 _0807E8E4_1 DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x100c, 0x0000 + MessageFromTargetPos 0x100c, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000004 @@ -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 diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc index da7e9e2a..d4f1e156 100644 --- a/data/scripts/script_08009C68.inc +++ b/data/scripts/script_08009C68.inc @@ -13,7 +13,7 @@ SCRIPT_START script_08009C68 _0807EB74 _0807EB8C DoPostScriptAction 0x0001 - TextboxNoOverlapFollowPos 0x100a, 0x0000 + MessageFromTargetPos 0x100a, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807E5F8 0x00000008 @@ -22,7 +22,7 @@ SCRIPT_START script_08009C68 DoPostScriptAction 0x0001 _0807EB8C _0807EB44 0x0002 - TextboxNoOverlapFollowPos 0x100d, 0x0000 + MessageFromTargetPos 0x100d, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 _0807EDD4 0x0028, 0x0060 diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc index 356d68ef..48c49a06 100644 --- a/data/scripts/script_08009F14.inc +++ b/data/scripts/script_08009F14.inc @@ -21,7 +21,7 @@ script_08009F36: StartPlayerScript script_0800A088 WaitForSomething2 0x00000002 Call sub_0806014C - TextboxNoOverlapFollowPos 0x1f01, 0x0000 + MessageFromTargetPos 0x1f01, 0x0000 WaitUntilTextboxCloses Wait 0x001e _0807F034 0x0065 @@ -62,11 +62,11 @@ script_08009FDC: Call sub_08060158 CheckEntityInteractType JumpIfNot script_08009FDC - EndBlock - _0807E864 - TextboxNoOverlap 0x1f0e + EndBlock + _0807E864 + MessageNoOverlap 0x1f0e WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_0800A002 _0807E878 Jump script_08009FDC @@ -76,8 +76,8 @@ script_0800A002: Call sub_08060318 WaitPlayerAction8 Wait 0x0008 - _0807EB8C - TextboxNoOverlapFollow 0x1f13 + _0807EB8C + MessageFromTarget 0x1f13 WaitUntilTextboxCloses SetLocalFlag 0x00b0 _0807E878 @@ -91,16 +91,16 @@ script_0800A024: _0807E864 CheckInventory1 0x0008 JumpIf script_0800A052 - TextboxNoOverlap 0x1f14 + MessageNoOverlap 0x1f14 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_0800A002 _0807E878 Jump script_0800A024 script_0800A052: - TextboxNoOverlap 0x1f11 + MessageNoOverlap 0x1f11 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_0800A064 _0807E878 Jump script_0800A024 @@ -110,9 +110,9 @@ script_0800A064: Call sub_08060318 WaitPlayerAction8 Wait 0x0008 - _0807EB8C - TextboxNoOverlapFollow 0x1f10 + _0807EB8C + MessageFromTarget 0x1f10 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800A024 .2byte 0x0000 diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc index e9e286cb..90b926db 100644 --- a/data/scripts/script_0800A1D8.inc +++ b/data/scripts/script_0800A1D8.inc @@ -12,7 +12,7 @@ SCRIPT_START script_0800A1D8 WaitForSomething2 0x00000001 _0807E5F8 0x00000004 WaitForSomething2 0x00000080 - TextboxNoOverlapFollowPos 0x1659, 0x0000 + MessageFromTargetPos 0x1659, 0x0000 WaitUntilTextboxCloses Wait 0x003c _0807E5F8 0x00000010 @@ -27,10 +27,10 @@ SCRIPT_START script_0800A1D8 _0807E5F8 0x00000004 Call sub_0807F3F8 WaitForSomething2 0x00000080 - TextboxNoOverlapFollowPos 0x165a, 0x000e + MessageFromTargetPos 0x165a, 0x000e WaitUntilTextboxCloses Wait 0x003c - TextboxNoOverlapFollowPos 0x165b, 0x000e + MessageFromTargetPos 0x165b, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000040 @@ -45,10 +45,10 @@ SCRIPT_START script_0800A1D8 WaitForSomething2 0x00000100 _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 - TextboxNoOverlapFollowPos 0x165c, 0x000e + MessageFromTargetPos 0x165c, 0x000e WaitUntilTextboxCloses StopBgm - TextboxNoOverlapFollowPos 0x165d, 0x000e + MessageFromTargetPos 0x165d, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc index 6254f21c..32c0454d 100644 --- a/data/scripts/script_0800AB08.inc +++ b/data/scripts/script_0800AB08.inc @@ -13,9 +13,9 @@ SCRIPT_START script_0800AB08 _0807F0B4 0x0001 SetEntityPositionRelative 0x0088, 0x0078 Call sub_0807F5C0 - TextboxNoOverlapFollowPos 0x1664, 0x0000 + MessageFromTargetPos 0x1664, 0x0000 WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x165e, 0x000e + MessageFromTargetPos 0x165e, 0x000e WaitUntilTextboxCloses CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc index bb07dedb..da617bfc 100644 --- a/data/scripts/script_0800AB6E.inc +++ b/data/scripts/script_0800AB6E.inc @@ -13,15 +13,15 @@ SCRIPT_START script_0800AB6E Wait 0x003c _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x165f, 0x000e + MessageFromTargetPos 0x165f, 0x000e WaitUntilTextboxCloses StartPlayerScript script_0800ACBC WaitForSomething2 0x00000001 - TextboxNoOverlapFollowPos 0x1660, 0x000e + MessageFromTargetPos 0x1660, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x1661, 0x000e + MessageFromTargetPos 0x1661, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000008 _0807E5F8 0x00000002 @@ -32,9 +32,9 @@ SCRIPT_START script_0800AB6E StartPlayerScript script_0800ACE0 WaitForSomething2 0x00000001 Wait 0x003c - TextboxNoOverlapFollowPos 0x1662, 0x000e + MessageFromTargetPos 0x1662, 0x000e WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x1663, 0x000e + MessageFromTargetPos 0x1663, 0x000e WaitUntilTextboxCloses SetEntityPosition 0x0000, 0xffe0 Call sub_0807F5C0 @@ -45,7 +45,7 @@ SCRIPT_START script_0800AB6E StartPlayerScript script_0800AD54 WaitForSomething2 0x00000001 Wait 0x003c - TextboxNoOverlapFollowPos 0x1665, 0x000e + MessageFromTargetPos 0x1665, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc index eadd3725..78d910d2 100644 --- a/data/scripts/script_0800B00C.inc +++ b/data/scripts/script_0800B00C.inc @@ -14,7 +14,7 @@ script_0800B024: JumpIf script_0800B082 CheckGlobalFlag 0x0053 JumpIf script_0800B064 - TextboxNoOverlap 0x3f32 + MessageNoOverlap 0x3f32 WaitUntilTextboxCloses DoPostScriptAction 0x0008 Call Windcrest_Unlock @@ -24,7 +24,7 @@ script_0800B024: SetGlobalFlag 0x0053 Jump script_0800B09C script_0800B064: - TextboxNoOverlap 0x3f32 + MessageNoOverlap 0x3f32 WaitUntilTextboxCloses DoPostScriptAction 0x0008 Call Windcrest_Unlock @@ -33,7 +33,7 @@ script_0800B064: WaitUntilTextboxCloses Jump script_0800B09C script_0800B082: - TextboxNoOverlap 0x3f32 + MessageNoOverlap 0x3f32 WaitUntilTextboxCloses DoPostScriptAction 0x0008 Call Windcrest_Unlock diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc index f19bc0d8..4eebd83c 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -17,9 +17,9 @@ SCRIPT_START script_0800B41C Wait 0x003c PlaySound SFX_TASK_COMPLETE _0807F088 0x0037 - WaitPlayerAction8 - _0807EB8C - TextboxNoOverlapFollow 0x200c + WaitPlayerAction8 + _0807EB8C + MessageFromTarget 0x200c WaitUntilTextboxCloses Wait 0x0014 _0807EDD4 0x0158, 0x0290 diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc index a573d2be..d8d094a2 100644 --- a/data/scripts/script_0800B4AC.inc +++ b/data/scripts/script_0800B4AC.inc @@ -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,7 +28,7 @@ script_0800B4F0: _0807EDD4 0x0134, 0x0288 _0807EB44 0x0004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollow 0x2016 + MessageFromTarget 0x2016 WaitUntilTextboxCloses _0807EDD4 0x0158, 0x0288 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc index 85a46bc9..b00d322d 100644 --- a/data/scripts/script_0800B5EC.inc +++ b/data/scripts/script_0800B5EC.inc @@ -7,11 +7,11 @@ SCRIPT_START script_0800B5EC script_0800B5FA: CheckEntityInteractType JumpIfNot script_0800B5FA - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2009 + _0807E864 + _0807EB74 + MessageNoOverlap 0x2009 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 Jump script_0800B5FA SCRIPT_START script_0800B614 @@ -29,19 +29,19 @@ script_0800B618: WaitForSomething2 0x00000004 CheckLocalFlag 0x009e JumpIf script_0800B7A2 - TextboxNoOverlap 0x0583 + MessageNoOverlap 0x0583 WaitUntilTextboxCloses - _0807E3E8 + _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 + MessageNoOverlap 0x057d WaitUntilTextboxCloses Jump script_0800B6A6 script_0800B68E: @@ -52,7 +52,7 @@ script_0800B698: WaitPlayerAction8 _0807EB8C Wait 0x001e - TextboxNoOverlap 0x057f + MessageNoOverlap 0x057f WaitUntilTextboxCloses script_0800B6A6: _0807E778 0x0004 diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc index 5b6c780c..f0608d4b 100644 --- a/data/scripts/script_0800B6C8.inc +++ b/data/scripts/script_0800B6C8.inc @@ -16,7 +16,7 @@ script_0800B6D4: WaitForSomething2 0x00000004 CheckLocalFlag 0x009f JumpIf script_0800B7A2 - TextboxNoOverlap 0x057b + MessageNoOverlap 0x057b WaitUntilTextboxCloses CallWithArg sub_0807F970, 0x0000057d JumpIf script_0800B6A6 @@ -41,7 +41,7 @@ script_0800B734: WaitForSomething2 0x00000004 CheckLocalFlag 0x00a0 JumpIf script_0800B7A2 - TextboxNoOverlap 0x0580 + MessageNoOverlap 0x0580 WaitUntilTextboxCloses CallWithArg sub_0807F970, 0x00000582 JumpIf script_0800B794 @@ -54,15 +54,15 @@ script_0800B794: _0807F034 0x0065 Jump script_0800B698 script_0800B7A2: - TextboxNoOverlap 0x0590 + MessageNoOverlap 0x0590 WaitUntilTextboxCloses _0807E778 0x0010 DoFade7 WaitFor_2 ModHealth 0x00a0 - DoFade6 - WaitFor_2 - TextboxNoOverlap 0x057f + DoFade6 + WaitFor_2 + MessageNoOverlap 0x057f WaitUntilTextboxCloses Jump script_0800B6A6 .2byte 0x0000 diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc index d0d40909..43faad8a 100644 --- a/data/scripts/script_0800B828.inc +++ b/data/scripts/script_0800B828.inc @@ -5,9 +5,9 @@ SCRIPT_START script_0800B828 DoPostScriptAction 0x000a EndBlock script_0800B836: - _0807E944 - _0807E864 - TextboxNoOverlapFollow 0x0a01 + _0807E944 + _0807E864 + MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -42,9 +42,9 @@ script_0800B87E: script_0800B89E: CheckEntityInteractType JumpIfNot script_0800B89E - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x0a01 + _0807E864 + _0807EB74 + MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -91,9 +91,9 @@ SCRIPT_START script_0800B91C script_0800B934: CheckEntityInteractType JumpIfNot script_0800B934 - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x3f19 + _0807E864 + _0807EB74 + MessageFromTarget 0x3f19 WaitUntilTextboxCloses SetLocalFlag 0x005f _0807E878 @@ -101,11 +101,11 @@ script_0800B934: script_0800B94E: CheckEntityInteractType JumpIfNot script_0800B94E - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x3f1a + _0807E864 + _0807EB74 + MessageFromTarget 0x3f1a WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800B94E SCRIPT_START script_0800B964 BeginBlock diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc index 4a9b530a..79b4f784 100644 --- a/data/scripts/script_0800B9B4.inc +++ b/data/scripts/script_0800B9B4.inc @@ -48,9 +48,9 @@ script_0800BA46: JumpIfNot script_0800BA46 _0807E864 Call sub_0807DF28 - TextboxNoOverlapFollow 0x3301 + MessageFromTarget 0x3301 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0800BA6C StopBgm Call sub_0806E964 @@ -77,7 +77,7 @@ script_0800BA8E: Wait 0x001e _0807EDD4 0x02f0, 0x0350 Wait 0x001e - TextboxNoOverlap 0x0e00 + MessageNoOverlap 0x0e00 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BACC.inc b/data/scripts/script_0800BACC.inc index 4428bef5..5195fe1e 100644 --- a/data/scripts/script_0800BACC.inc +++ b/data/scripts/script_0800BACC.inc @@ -9,7 +9,7 @@ script_0800BADE: JumpIfNot script_0800BADE DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e01 + MessageNoOverlap 0x0e01 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc index dab3d9b6..31c1ae72 100644 --- a/data/scripts/script_0800BB00.inc +++ b/data/scripts/script_0800BB00.inc @@ -6,7 +6,7 @@ script_0800BB04: JumpIfNot script_0800BB04 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e02 + MessageNoOverlap 0x0e02 WaitUntilTextboxCloses Wait 0x003c DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800BB30.inc b/data/scripts/script_0800BB30.inc index 2946a35c..5b5871ad 100644 --- a/data/scripts/script_0800BB30.inc +++ b/data/scripts/script_0800BB30.inc @@ -9,7 +9,7 @@ script_0800BB42: JumpIfNot script_0800BB42 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e05 + MessageNoOverlap 0x0e05 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc index 8068349d..2e582383 100644 --- a/data/scripts/script_0800BB64.inc +++ b/data/scripts/script_0800BB64.inc @@ -10,7 +10,7 @@ script_0800BB7A: JumpIfNot script_0800BB7A _0807EDD4 0x03a0, 0x00f8 Wait 0x001e - TextboxNoOverlap 0x0e06 + MessageNoOverlap 0x0e06 WaitUntilTextboxCloses Wait 0x000f _0807EDD4 0x0380, 0x00f8 diff --git a/data/scripts/script_0800BBA4.inc b/data/scripts/script_0800BBA4.inc index c0d48a78..76aa8ebe 100644 --- a/data/scripts/script_0800BBA4.inc +++ b/data/scripts/script_0800BBA4.inc @@ -10,7 +10,7 @@ script_0800BBBA: JumpIfNot script_0800BBBA DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e04 + MessageNoOverlap 0x0e04 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc index f8060b27..bed21d4e 100644 --- a/data/scripts/script_0800BBDC.inc +++ b/data/scripts/script_0800BBDC.inc @@ -7,7 +7,7 @@ script_0800BBE4: JumpIfNot script_0800BBE4 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e03 + MessageNoOverlap 0x0e03 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/script_0800BC08.inc b/data/scripts/script_0800BC08.inc index e51157f7..237767b7 100644 --- a/data/scripts/script_0800BC08.inc +++ b/data/scripts/script_0800BC08.inc @@ -9,9 +9,9 @@ script_0800BC18: JumpIfNot script_0800BC18 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e07 + MessageNoOverlap 0x0e07 WaitUntilTextboxCloses - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0004 EndBlock diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc index 0d216ad8..377ff8ef 100644 --- a/data/scripts/script_0800BC50.inc +++ b/data/scripts/script_0800BC50.inc @@ -11,7 +11,7 @@ script_0800BC62: Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e08 + MessageNoOverlap 0x0e08 WaitUntilTextboxCloses DoPostScriptAction 0x000f _0807E930 0x0008 @@ -25,7 +25,7 @@ script_0800BC62: Wait 0x003c DoPostScriptAction 0x000c Wait 0x003c - TextboxNoOverlap 0x0e09 + MessageNoOverlap 0x0e09 WaitUntilTextboxCloses Call sub_0807F158 CallWithArg sub_0807F4F8, 0x0000035c diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc index 8edaaca1..f8c1841c 100644 --- a/data/scripts/script_0800BCE8.inc +++ b/data/scripts/script_0800BCE8.inc @@ -8,7 +8,7 @@ SCRIPT_START script_0800BCE8 Wait 0x00f0 _0807E930 0x0000 Wait 0x003c - TextboxNoOverlap 0x0e0a + MessageNoOverlap 0x0e0a WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c @@ -21,7 +21,7 @@ script_0800BD1C: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e0c + MessageNoOverlap 0x0e0c WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc index ceeeff37..814887f0 100644 --- a/data/scripts/script_0800BD78.inc +++ b/data/scripts/script_0800BD78.inc @@ -10,7 +10,7 @@ SCRIPT_START script_0800BD78 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000270 Wait 0x001e - TextboxNoOverlap 0x0e0b + MessageNoOverlap 0x0e0b WaitUntilTextboxCloses _0807E5F8 0x00000004 WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc index 09cbd130..d5217ce9 100644 --- a/data/scripts/script_0800BE1C.inc +++ b/data/scripts/script_0800BE1C.inc @@ -9,7 +9,7 @@ SCRIPT_START script_0800BE1C _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c - TextboxNoOverlap 0x0e0d + MessageNoOverlap 0x0e0d WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c @@ -40,7 +40,7 @@ script_0800BE8C: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e0f + MessageNoOverlap 0x0e0f WaitUntilTextboxCloses _0807E5F8 0x00000002 Call sub_08054F64 diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc index 03a63f5f..e16b42dd 100644 --- a/data/scripts/script_0800BECC.inc +++ b/data/scripts/script_0800BECC.inc @@ -10,7 +10,7 @@ SCRIPT_START script_0800BECC DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e - TextboxNoOverlap 0x0e0e + MessageNoOverlap 0x0e0e WaitUntilTextboxCloses _0807E5F8 0x0000000c WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc index 715ce851..5c982ab0 100644 --- a/data/scripts/script_0800BF38.inc +++ b/data/scripts/script_0800BF38.inc @@ -9,7 +9,7 @@ SCRIPT_START script_0800BF38 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c - TextboxNoOverlap 0x0e10 + MessageNoOverlap 0x0e10 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c @@ -40,7 +40,7 @@ script_0800BFA8: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e12 + MessageNoOverlap 0x0e12 WaitUntilTextboxCloses _0807E5F8 0x00000002 Call sub_08054F64 diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc index d58aaa8e..46d7e104 100644 --- a/data/scripts/script_0800C004.inc +++ b/data/scripts/script_0800C004.inc @@ -10,7 +10,7 @@ SCRIPT_START script_0800C004 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e - TextboxNoOverlap 0x0e11 + MessageNoOverlap 0x0e11 WaitUntilTextboxCloses _0807E5F8 0x0000001c WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc index 48e45c34..e02b5368 100644 --- a/data/scripts/script_0800C0B0.inc +++ b/data/scripts/script_0800C0B0.inc @@ -9,7 +9,7 @@ SCRIPT_START script_0800C0B0 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c - TextboxNoOverlap 0x0e13 + MessageNoOverlap 0x0e13 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c @@ -40,7 +40,7 @@ script_0800C120: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e15 + MessageNoOverlap 0x0e15 WaitUntilTextboxCloses _0807E5F8 0x00000002 Call sub_08054F64 diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc index 53e9585e..3fa4ab2c 100644 --- a/data/scripts/script_0800C160.inc +++ b/data/scripts/script_0800C160.inc @@ -10,7 +10,7 @@ SCRIPT_START script_0800C160 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e - TextboxNoOverlap 0x0e14 + MessageNoOverlap 0x0e14 WaitUntilTextboxCloses _0807E5F8 0x0000003c WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc index 5e466c9e..0d78bf42 100644 --- a/data/scripts/script_0800C1D8.inc +++ b/data/scripts/script_0800C1D8.inc @@ -9,7 +9,7 @@ SCRIPT_START script_0800C1D8 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c - TextboxNoOverlap 0x0e16 + MessageNoOverlap 0x0e16 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c @@ -40,7 +40,7 @@ script_0800C248: _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x0e18 + MessageNoOverlap 0x0e18 WaitUntilTextboxCloses _0807E5F8 0x00000002 Call sub_08054F64 diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc index da2245f0..5c40fc25 100644 --- a/data/scripts/script_0800C2A4.inc +++ b/data/scripts/script_0800C2A4.inc @@ -10,7 +10,7 @@ SCRIPT_START script_0800C2A4 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e - TextboxNoOverlap 0x0e17 + MessageNoOverlap 0x0e17 WaitUntilTextboxCloses _0807E5F8 0x0000007c WaitForSomething2 0x00000002 diff --git a/data/scripts/script_0800C370.inc b/data/scripts/script_0800C370.inc index 181227ad..43489062 100644 --- a/data/scripts/script_0800C370.inc +++ b/data/scripts/script_0800C370.inc @@ -6,7 +6,7 @@ SCRIPT_START script_0800C370 _0807EEF4 0xfff8, 0x0000 _0807F0C8 0x0000, 0x0000 Wait 0x001e - TextboxNoOverlap 0x1d00 + MessageNoOverlap 0x1d00 WaitUntilTextboxCloses _0807E5F8 0x00000006 WaitForSomething2 0x00000001 diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc index 4ab5a719..313ff8ec 100644 --- a/data/scripts/script_0800C550.inc +++ b/data/scripts/script_0800C550.inc @@ -37,7 +37,7 @@ script_0800C5A6: Call sub_08060208 Jump script_0800C5C0 script_0800C5BC: - TextboxNoOverlap 0x4710 + MessageNoOverlap 0x4710 script_0800C5C0: WaitUntilTextboxCloses _0807E878 @@ -111,7 +111,7 @@ script_0800C684: CheckInventory1 0x005b JumpIf script_0800C6B6 DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f16 + MessageFromTarget 0x1f16 WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -123,7 +123,7 @@ script_0800C6B6: CheckLocalFlag 0x0081 JumpIf script_0800C6DC DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f1b + MessageFromTarget 0x1f1b WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -134,7 +134,7 @@ script_0800C6DC: CheckLocalFlag 0x0082 JumpIf script_0800C712 DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f17 + MessageFromTarget 0x1f17 WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -147,7 +147,7 @@ script_0800C6DC: SetLocalFlag 0x0082 script_0800C712: DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f18 + MessageFromTarget 0x1f18 WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -158,7 +158,7 @@ script_0800C730: CheckLocalFlag 0x0083 JumpIf script_0800C756 DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f19 + MessageFromTarget 0x1f19 WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -167,7 +167,7 @@ script_0800C730: Jump script_0800C652 script_0800C756: DoPostScriptAction 0x0002 - TextboxNoOverlapFollow 0x1f1a + MessageFromTarget 0x1f1a WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -190,7 +190,7 @@ script_0800C780: CheckInventory1 0x005b JumpIf script_0800C7C0 _0807E930 0x0008 - TextboxNoOverlapFollow 0x2122 + MessageFromTarget 0x2122 WaitUntilTextboxCloses DoPostScriptAction 0x0000 Call sub_0807DF50 @@ -200,16 +200,16 @@ script_0800C7C0: _0807E930 0x0008 CheckLocalFlag 0x0081 JumpIf script_0800C80A - TextboxNoOverlapFollow 0x1130 + MessageFromTarget 0x1130 WaitUntilTextboxCloses _0807EB28 0x1131 WaitUntilTextboxCloses - _0807EB8C - TextboxNoOverlapFollow 0x1132 + _0807EB8C + MessageFromTarget 0x1132 WaitUntilTextboxCloses SetIntVariable 0x00000103 Call sub_0807F420 - TextboxNoOverlapFollow 0x1133 + MessageFromTarget 0x1133 WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 @@ -218,7 +218,7 @@ script_0800C7C0: _0807E878 Jump script_0800C780 script_0800C80A: - TextboxNoOverlapFollow 0x1133 + MessageFromTarget 0x1133 WaitUntilTextboxCloses Wait 0x000a _0807E930 0x0000 @@ -229,7 +229,7 @@ script_0800C824: _0807E930 0x0008 CheckLocalFlag 0x0083 JumpIf script_0800C8AE - TextboxNoOverlapFollow 0x1135 + MessageFromTarget 0x1135 WaitUntilTextboxCloses SetEntitySpeed 0x0040 _0807EDD4 0x0038, 0x0044 @@ -239,9 +239,9 @@ script_0800C824: Wait 0x003c PlaySound SFX_SECRET Wait 0x003c - _0807EB74 - _0807EB8C - TextboxNoOverlapFollow 0x1136 + _0807EB74 + _0807EB8C + MessageFromTarget 0x1136 WaitUntilTextboxCloses _0807EB28 0x1137 WaitUntilTextboxCloses @@ -257,7 +257,7 @@ script_0800C87C: _0807EB74 SetIntVariable 0x00000008 Call sub_0807F3D8 - TextboxNoOverlapFollow 0x1136 + MessageFromTarget 0x1136 WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 @@ -265,7 +265,7 @@ script_0800C87C: _0807E878 Jump script_0800C87C script_0800C8AE: - TextboxNoOverlapFollow 0x1136 + MessageFromTarget 0x1136 WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc index 6319ed4e..05613e87 100644 --- a/data/scripts/script_0800C91C.inc +++ b/data/scripts/script_0800C91C.inc @@ -38,8 +38,8 @@ script_0800C928: Wait 0x003c _0807E5F8 0x00000200 WaitForSomething2 0x00000400 - _0807E8E4_0 - TextboxNoOverlapFollow 0x1126 + _0807E8E4_0 + MessageFromTarget 0x1126 Call sub_0807F40C WaitUntilTextboxCloses _0807E5F8 0x00000200 @@ -54,13 +54,13 @@ script_0800C928: WaitForSomething2 0x00040000 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 - _0807E8E4_3 - TextboxNoOverlapFollow 0x1127 + _0807E8E4_3 + MessageFromTarget 0x1127 WaitUntilTextboxCloses _0807E5F8 0x00002000 WaitForSomething2 0x00004000 - _0807E8E4_1 - TextboxNoOverlapFollow 0x1128 + _0807E8E4_1 + MessageFromTarget 0x1128 WaitUntilTextboxCloses _0807E5F8 0x00000200 _0807E5F8 0x00000800 diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc index ee573cb5..69d3a300 100644 --- a/data/scripts/script_0800CD7C.inc +++ b/data/scripts/script_0800CD7C.inc @@ -19,7 +19,7 @@ script_0800CDA6: CheckLocalFlag 0x009d JumpIf script_0800CDC4 SetLocalFlag 0x009d - TextboxNoOverlap 0x213d + MessageNoOverlap 0x213d Jump script_0800CF40 script_0800CDC4: CheckGlobalFlag 0x003b @@ -30,16 +30,16 @@ script_0800CDC4: JumpIfNot script_0800CF2A SetGlobalFlag 0x003b ClearGlobalFlag 0x0054 - TextboxNoOverlap 0x2141 + MessageNoOverlap 0x2141 Jump script_0800CF40 script_0800CDEC: - TextboxNoOverlap 0x213e + MessageNoOverlap 0x213e WaitUntilTextboxCloses _0807E48C 0x0023 JumpIfNot script_0800CE14 - TextboxNoOverlap 0x214b + MessageNoOverlap 0x214b WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0023 @@ -48,9 +48,9 @@ script_0800CDEC: script_0800CE14: _0807E48C 0x0022 JumpIfNot script_0800CF40 - TextboxNoOverlap 0x214b + MessageNoOverlap 0x214b WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0022 @@ -59,7 +59,7 @@ script_0800CE32: _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 - TextboxNoOverlap 0x213f + MessageNoOverlap 0x213f Jump script_0800CF02 script_0800CE46: CheckGlobalFlag 0x003c @@ -70,16 +70,16 @@ script_0800CE46: JumpIfNot script_0800CF2A SetGlobalFlag 0x003c ClearGlobalFlag 0x0054 - TextboxNoOverlap 0x2145 + MessageNoOverlap 0x2145 Jump script_0800CF40 script_0800CE6E: - TextboxNoOverlap 0x2142 + MessageNoOverlap 0x2142 WaitUntilTextboxCloses _0807E48C 0x0027 JumpIfNot script_0800CF40 - TextboxNoOverlap 0x214c + MessageNoOverlap 0x214c WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0027 @@ -87,7 +87,7 @@ script_0800CE6E: _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 - TextboxNoOverlap 0x2143 + MessageNoOverlap 0x2143 Jump script_0800CF02 script_0800CEA6: CheckGlobalFlag 0x003d @@ -98,16 +98,16 @@ script_0800CEA6: JumpIfNot script_0800CF2A SetGlobalFlag 0x003d ClearGlobalFlag 0x0054 - TextboxNoOverlap 0x2149 + MessageNoOverlap 0x2149 Jump script_0800CF40 script_0800CECE: - TextboxNoOverlap 0x2146 + MessageNoOverlap 0x2146 WaitUntilTextboxCloses _0807E48C 0x0024 JumpIfNot script_0800CF40 - TextboxNoOverlap 0x214d + MessageNoOverlap 0x214d WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0024 @@ -115,7 +115,7 @@ script_0800CECE: _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 - TextboxNoOverlap 0x2147 + MessageNoOverlap 0x2147 script_0800CF02: WaitUntilTextboxCloses Call sub_0807DF50 @@ -132,13 +132,13 @@ script_0800CF20: _0807E864 Call sub_0807DF28 script_0800CF2A: - TextboxNoOverlap 0x2140 + MessageNoOverlap 0x2140 WaitUntilTextboxCloses Call sub_0807DF50 _0807E878 Jump script_0800CF0C script_0800CF3C: - TextboxNoOverlap 0x214a + MessageNoOverlap 0x214a script_0800CF40: WaitUntilTextboxCloses Call sub_0807DF50 @@ -215,7 +215,7 @@ script_0800CFFA: _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 - TextboxNoOverlap 0x1219 + MessageNoOverlap 0x1219 Jump script_0800D17C script_0800D032: CheckInventory1 0x0041 @@ -225,7 +225,7 @@ script_0800D032: _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 - TextboxNoOverlapFollowPos 0x125c, 0x0002 + MessageFromTargetPos 0x125c, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_0800D1B4 WaitForSomething2 0x00000008 @@ -236,12 +236,12 @@ script_0800D032: _0807E5F8 0x00000020 StartPlayerScript script_0800D1E0 WaitForSomething2 0x00000008 - TextboxNoOverlapFollowPos 0x125d, 0x0002 + MessageFromTargetPos 0x125d, 0x0002 Jump script_0800D17C script_0800D098: CheckLocalFlag 0x007e JumpIfNot script_0800D0A8 - TextboxNoOverlapFollow 0x123e + MessageFromTarget 0x123e Jump script_0800D17C script_0800D0A8: StartPlayerScript script_0800D190 @@ -253,7 +253,7 @@ script_0800D0A8: _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 - TextboxNoOverlapFollowPos 0x123d, 0x0002 + MessageFromTargetPos 0x123d, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_0800D1B4 WaitForSomething2 0x00000008 @@ -268,7 +268,7 @@ script_0800D108: PlaySound SFX_F8 _0807E5F8 0x00000010 SetLocalFlag 0x007e - TextboxNoOverlapFollowPos 0x123e, 0x0002 + MessageFromTargetPos 0x123e, 0x0002 WaitUntilTextboxCloses Wait 0x000f _0807E930 0x0009 @@ -277,7 +277,7 @@ script_0800D108: _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Wait 0x001e - TextboxNoOverlapFollowPos 0x123f, 0x0002 + MessageFromTargetPos 0x123f, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00000001 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_0800D1E0.inc b/data/scripts/script_0800D1E0.inc index 3d440035..5a9f4e39 100644 --- a/data/scripts/script_0800D1E0.inc +++ b/data/scripts/script_0800D1E0.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800D1E0 PlaySound SFX_109 CallWithArg sub_0807F238, 0x000001e2 Call sub_0807F304 - TextboxNoOverlap 0x0502 + MessageNoOverlap 0x0502 WaitUntilTextboxCloses _0807E5F8 0x00000008 Call sub_080791BC diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc index 7023cd05..7187c45d 100644 --- a/data/scripts/script_0800D278.inc +++ b/data/scripts/script_0800D278.inc @@ -62,7 +62,7 @@ script_0800D31E: _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 - TextboxNoOverlapFollow 0x1219 + MessageFromTarget 0x1219 WaitUntilTextboxCloses Wait 0x000f _0807E878 diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc index aec2ac91..9b20129e 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -15,8 +15,8 @@ script_0800D88E: StartPlayerScript script_0800D92C WaitForSomething2 0x00000001 script_0800D8B0: - _0807E8E4_0 - TextboxNoOverlap 0x1324 + _0807E8E4_0 + MessageNoOverlap 0x1324 WaitUntilTextboxCloses CheckInventory1 0x0017 JumpIf script_0800D8D6 diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc index e816b0a3..8ca3a5dd 100644 --- a/data/scripts/script_0800D954.inc +++ b/data/scripts/script_0800D954.inc @@ -17,11 +17,11 @@ script_0800D962: DoPostScriptAction 0x0007 PlaySound SFX_ELEMENT_FLOAT SetEntity0x20 0xffff8000 - TextboxNoOverlap 0x1701 + MessageNoOverlap 0x1701 WaitUntilTextboxCloses _0807E5F8 0x00000004 WaitForSomething2 0x00000002 - TextboxNoOverlap 0x1702 + MessageNoOverlap 0x1702 WaitUntilTextboxCloses SetEntity0x20 0x00010000 _0807E5F8 0x00000004 diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc index f17b7f71..071becb7 100644 --- a/data/scripts/script_0800DA60.inc +++ b/data/scripts/script_0800DA60.inc @@ -16,13 +16,13 @@ script_0800DA64: Call sub_0807F5C0 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 - TextboxNoOverlapFollowPos 0x162d, 0x0002 + MessageFromTargetPos 0x162d, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00000001 Wait 0x001e - TextboxNoOverlapFollowPos 0x162e, 0x0002 + MessageFromTargetPos 0x162e, 0x0002 WaitUntilTextboxCloses - _0807E8E4_0 + _0807E8E4_0 CallWithArg sub_0807F75C, 0x00780138 _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc index 43d6fe01..95192f9d 100644 --- a/data/scripts/script_0800DB78.inc +++ b/data/scripts/script_0800DB78.inc @@ -34,7 +34,7 @@ script_0800DBCA: _0807E5F8 0x00000001 StartPlayerScript script_0800DE00 WaitForSomething2 0x00000006 - TextboxNoOverlapFollowPos 0x1643, 0x0002 + MessageFromTargetPos 0x1643, 0x0002 WaitUntilTextboxCloses _0807EB28 0x1645 WaitUntilTextboxCloses diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc index dd3b992d..13de03c2 100644 --- a/data/scripts/script_0800DF24.inc +++ b/data/scripts/script_0800DF24.inc @@ -19,7 +19,7 @@ SCRIPT_START script_0800DF24 Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 - TextboxNoOverlapFollowPos 0x162f, 0x0002 + MessageFromTargetPos 0x162f, 0x0002 WaitUntilTextboxCloses PlayBgm BGM_VAATI_REBORN DoPostScriptAction 0x0019 diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc index fecc5ded..e9ffcfb9 100644 --- a/data/scripts/script_0800DFE4.inc +++ b/data/scripts/script_0800DFE4.inc @@ -4,7 +4,7 @@ SCRIPT_START script_0800DFE4 _0807E864 EndBlock StopBgm - TextboxNoOverlapFollowPos 0x1632, 0x0002 + MessageFromTargetPos 0x1632, 0x0002 WaitUntilTextboxCloses SetRoomFlag 0x0003 script_0800DFFE: @@ -19,7 +19,7 @@ script_0800E012: _0807E864 Call sub_0807DF28 SetLocalFlag 0x007b - TextboxNoOverlapFollowPos 0x1639, 0x000c + MessageFromTargetPos 0x1639, 0x000c WaitUntilTextboxCloses Wait 0x0096 PlaySound SFX_EVAPORATE diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index ddb7ddc4..df275e25 100644 --- a/data/scripts/script_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -27,7 +27,7 @@ script_0800E0DE: _0807EB8C _0807EB74 Wait 0x000a - TextboxNoOverlap 0x2402 + MessageNoOverlap 0x2402 WaitUntilTextboxCloses SetLocalFlag 0x0093 script_0800E12E: @@ -37,9 +37,9 @@ script_0800E12E: script_0800E138: CheckEntityInteractType JumpIfNot script_0800E138 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2402 + _0807E864 + _0807EB74 + MessageNoOverlap 0x2402 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -75,7 +75,7 @@ script_0800E176: _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 Wait 0x000a - TextboxNoOverlap 0x2401 + MessageNoOverlap 0x2401 WaitUntilTextboxCloses SetLocalFlag 0x0094 script_0800E1D0: @@ -89,9 +89,9 @@ script_0800E1E0: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2401 + MessageNoOverlap 0x2401 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800E1E0 SCRIPT_START script_0800E200 BeginBlock @@ -167,10 +167,10 @@ script_0800E312: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - EndBlock - TextboxNoOverlap 0x2404 + EndBlock + MessageNoOverlap 0x2404 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800E2AE script_0800E32E: CheckEntityInteractType @@ -178,9 +178,9 @@ script_0800E32E: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2403 + MessageNoOverlap 0x2403 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800E32E .2byte 0x0000 SCRIPT_START script_0800E350 @@ -221,9 +221,9 @@ script_0800E3BE: script_0800E3C8: CheckEntityInteractType JumpIfNot script_0800E3C8 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x240c + _0807E864 + _0807EB74 + MessageNoOverlap 0x240c WaitUntilTextboxCloses Wait 0x000f _0807F034 0x0053 @@ -237,9 +237,9 @@ script_0800E3E8: script_0800E3EE: CheckEntityInteractType JumpIfNot script_0800E3EE - _0807E864 - _0807EB74 - TextboxNoOverlap 0x240d + _0807E864 + _0807EB74 + MessageNoOverlap 0x240d WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -253,9 +253,9 @@ SCRIPT_START script_0800E408 script_0800E41A: CheckEntityInteractType JumpIfNot script_0800E41A - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2406 + _0807E864 + _0807EB74 + MessageNoOverlap 0x2406 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -273,9 +273,9 @@ script_0800E44C: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2405 + MessageNoOverlap 0x2405 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800E44C SCRIPT_START script_0800E46C BeginBlock @@ -290,9 +290,9 @@ script_0800E484: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlap 0x2407 + MessageNoOverlap 0x2407 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800E484 @@ -327,10 +327,10 @@ script_0800E4B6: EndBlock Call sub_0807F3F8 Wait 0x003c - TextboxNoOverlapFollow 0x160c + MessageFromTarget 0x160c WaitUntilTextboxCloses Wait 0x001e - TextboxNoOverlapFollow 0x160d + MessageFromTarget 0x160d WaitUntilTextboxCloses Wait 0x001e _0807EB28 0x160e diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc index 19d33467..e2f26ffa 100644 --- a/data/scripts/script_0800E58C.inc +++ b/data/scripts/script_0800E58C.inc @@ -9,7 +9,7 @@ SCRIPT_START script_0800E58C Wait 0x003c PlaySound SFX_9B Wait 0x001e - TextboxNoOverlap 0x1625 + MessageNoOverlap 0x1625 WaitUntilTextboxCloses Wait 0x003c Call sub_08053C84 diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index 580680ca..6e3a7acd 100644 --- a/data/scripts/script_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -136,8 +136,8 @@ script_0800E832: JumpIfNot script_0800E832 _0807E864 _0807EB44 0x0004 - BeginBlock - TextboxNoOverlapFollow 0x4501 + BeginBlock + MessageFromTarget 0x4501 CallWithArg sub_0807F854, 0x00010032 CallWithArg sub_0807F854, 0x000200c8 CallWithArg sub_0807F854, 0x00030190 @@ -146,8 +146,8 @@ script_0800E832: _0807EB38 JumpTable script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872 script_0800E872: - BeginBlock - TextboxNoOverlapFollow 0x4505 + BeginBlock + MessageFromTarget 0x4505 CallWithArg sub_0807F854, 0x00010190 EndBlock WaitUntilTextboxCloses @@ -155,7 +155,7 @@ script_0800E872: JumpIfNot script_0800E908 ModRupees 0xfe70 SetLocalFlag 0x0091 - TextboxNoOverlapFollow 0x4508 + MessageFromTarget 0x4508 WaitUntilTextboxCloses Call sub_0806C578 SCRIPT_END diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/script_0800E8A4.inc index bc07ceb0..bb0dd75f 100644 --- a/data/scripts/script_0800E8A4.inc +++ b/data/scripts/script_0800E8A4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E8A4 - BeginBlock - TextboxNoOverlapFollow 0x4504 + BeginBlock + MessageFromTarget 0x4504 CallWithArg sub_0807F854, 0x000100c8 EndBlock WaitUntilTextboxCloses @@ -8,7 +8,7 @@ SCRIPT_START script_0800E8A4 JumpIfNot script_0800E908 ModRupees 0xff38 SetLocalFlag 0x0091 - TextboxNoOverlapFollow 0x4508 + MessageFromTarget 0x4508 WaitUntilTextboxCloses Call sub_0806C588 SCRIPT_END diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc index 25644bd7..facf15c1 100644 --- a/data/scripts/script_0800E8D6.inc +++ b/data/scripts/script_0800E8D6.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800E8D6 - BeginBlock - TextboxNoOverlapFollow 0x4503 + BeginBlock + MessageFromTarget 0x4503 CallWithArg sub_0807F854, 0x00010032 EndBlock WaitUntilTextboxCloses @@ -8,7 +8,7 @@ SCRIPT_START script_0800E8D6 JumpIfNot script_0800E908 ModRupees 0xffce SetLocalFlag 0x0091 - TextboxNoOverlapFollow 0x4508 + MessageFromTarget 0x4508 WaitUntilTextboxCloses Call sub_0806C598 SCRIPT_END diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc index 432b04aa..be2a5614 100644 --- a/data/scripts/script_0800E908.inc +++ b/data/scripts/script_0800E908.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800E908 - TextboxNoOverlapFollow 0x4507 + MessageFromTarget 0x4507 Jump script_0800E914 script_0800E910: - TextboxNoOverlapFollow 0x4509 + MessageFromTarget 0x4509 script_0800E914: WaitUntilTextboxCloses _0807E878 @@ -50,11 +50,11 @@ script_0800E974: StartPlayerScript script_0800E9F4 WaitForSomething2 0x00000001 DoPostScriptAction 0x000a - TextboxNoOverlapFollow 0x4a24 + MessageFromTarget 0x4a24 WaitUntilTextboxCloses _0807E930 0x000a Wait 0x0014 - TextboxNoOverlapFollow 0x4a25 + MessageFromTarget 0x4a25 WaitUntilTextboxCloses _0807E930 0x0000 StartPlayerScript script_0800EA1C @@ -62,7 +62,7 @@ script_0800E974: SetLocalFlag 0x0074 PlaySound SFX_SECRET Wait 0x00f0 - TextboxNoOverlapFollow 0x4a26 + MessageFromTarget 0x4a26 WaitUntilTextboxCloses SetLocalFlag 0x0075 script_0800E9E4: diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index 6b898be2..ab672332 100644 --- a/data/scripts/script_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -265,13 +265,13 @@ script_0800EDB6: JumpIf script_0800EE3E Wait 0x000a _0807E5F8 0x00000001 - TextboxNoOverlapFollow 0x4c07 + MessageFromTarget 0x4c07 WaitUntilTextboxCloses _0807E5F8 0x00000010 - TextboxNoOverlapFollow 0x4c08 + MessageFromTarget 0x4c08 WaitUntilTextboxCloses _0807E5F8 0x00000020 - TextboxNoOverlapFollow 0x4c09 + MessageFromTarget 0x4c09 WaitUntilTextboxCloses SetIntVariable 0x00000503 Call sub_0807F420 @@ -290,7 +290,7 @@ script_0800EE12: WaitForSomething2 0x00000008 Jump script_0800ED98 script_0800EE3E: - TextboxNoOverlapFollow 0x4c16 + MessageFromTarget 0x4c16 WaitUntilTextboxCloses Call sub_0807DF50 _0807E878 @@ -316,13 +316,13 @@ script_0800EE76: JumpIf script_0800EEFE Wait 0x000a _0807E5F8 0x00000001 - TextboxNoOverlapFollow 0x4c07 + MessageFromTarget 0x4c07 WaitUntilTextboxCloses _0807E5F8 0x00000002 - TextboxNoOverlapFollow 0x4c08 + MessageFromTarget 0x4c08 WaitUntilTextboxCloses _0807E5F8 0x00000004 - TextboxNoOverlapFollow 0x4c09 + MessageFromTarget 0x4c09 WaitUntilTextboxCloses SetIntVariable 0x00000503 Call sub_0807F420 @@ -341,19 +341,19 @@ script_0800EED2: WaitForSomething2 0x00000040 Jump script_0800EE58 script_0800EEFE: - TextboxNoOverlapFollow 0x4c15 + MessageFromTarget 0x4c15 WaitUntilTextboxCloses Call sub_0807DF50 _0807E878 Jump script_0800EE58 - TextboxNoOverlapFollow 0x4c07 + MessageFromTarget 0x4c07 WaitUntilTextboxCloses _0807E5F8 0x00000012 Wait 0x000a - TextboxNoOverlapFollow 0x4c08 + MessageFromTarget 0x4c08 WaitUntilTextboxCloses _0807E5F8 0x00000024 - TextboxNoOverlapFollow 0x4c09 + MessageFromTarget 0x4c09 WaitUntilTextboxCloses _0807E5F8 0x00000048 Call sub_080791BC diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc index 9e1b9df0..920a220f 100644 --- a/data/scripts/script_0800EF40.inc +++ b/data/scripts/script_0800EF40.inc @@ -10,7 +10,7 @@ script_0800EF50: _0807E864 CheckLocalFlagByOffset 0x0200, 0x006d JumpIf script_0800EF82 - TextboxNoOverlapFollow 0x4d01 + MessageFromTarget 0x4d01 WaitUntilTextboxCloses StartPlayerScript script_0800EF9C WaitForSomething2 0x00000001 @@ -19,7 +19,7 @@ script_0800EF50: Jump script_0800EF50 script_0800EF82: SetGlobalFlag 0x001f - TextboxNoOverlapFollow 0x4d02 + MessageFromTarget 0x4d02 WaitUntilTextboxCloses Wait 0x000f _0807E878 diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index d0a58d81..d8d298e3 100644 --- a/data/scripts/script_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -59,18 +59,18 @@ script_0800F09A: WaitForSomething2 0x00000001 _0807E5F8 0x0000001e WaitForSomething2 0x00000040 - TextboxNoOverlapFollowPos 0x1201, 0x000c + MessageFromTargetPos 0x1201, 0x000c WaitUntilTextboxCloses WaitForSomething2 0x000003c0 - _0807E8E4_0 - TextboxNoOverlapFollowPos 0x1202, 0x000c + _0807E8E4_0 + MessageFromTargetPos 0x1202, 0x000c WaitUntilTextboxCloses _0807F034 0x0067 WaitPlayerAction8 _0807E8E4_0 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 - TextboxNoOverlapFollowPos 0x1203, 0x000c + MessageFromTargetPos 0x1203, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000002 Call sub_0807DF50 diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc index 2b34fc02..ee317b85 100644 --- a/data/scripts/script_0800F184.inc +++ b/data/scripts/script_0800F184.inc @@ -32,7 +32,7 @@ script_0800F1E6: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c + MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_0800F33C WaitForSomething2 0x00000400 @@ -48,7 +48,7 @@ script_0800F22A: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c + MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_0800F354 WaitForSomething2 0x00000400 @@ -64,7 +64,7 @@ script_0800F26A: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c + MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_0800F36C WaitForSomething2 0x00000400 @@ -80,7 +80,7 @@ script_0800F2AA: _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlapFollowPos 0x1206, 0x000c + MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses StartPlayerScript script_0800F384 WaitForSomething2 0x00000400 @@ -97,9 +97,9 @@ script_0800F2EA: _0807E864 _0807EB74 _0807E930 0x0008 - TextboxNoOverlapFollowPos 0x1208, 0x000c + MessageFromTargetPos 0x1208, 0x000c WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_0800F1E6 script_0800F314: EndBlock diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc index db4824e9..a03aa9fa 100644 --- a/data/scripts/script_0800F39C.inc +++ b/data/scripts/script_0800F39C.inc @@ -22,12 +22,12 @@ script_0800F3EA: BeginBlock CheckEntityInteractType JumpIfNot script_0800F402 - EndBlock - _0807E864 - _0807EB74 - TextboxNoOverlap 0x1237 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x1237 WaitUntilTextboxCloses - _0807E878 + _0807E878 script_0800F402: TestBit 0x00000004 JumpIfNot script_0800F3EA diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc index b923116f..b601ce10 100644 --- a/data/scripts/script_0800F430.inc +++ b/data/scripts/script_0800F430.inc @@ -21,12 +21,12 @@ script_0800F478: BeginBlock CheckEntityInteractType JumpIfNot script_0800F490 - EndBlock - _0807E864 - _0807EB74 - TextboxNoOverlap 0x1238 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x1238 WaitUntilTextboxCloses - _0807E878 + _0807E878 script_0800F490: TestBit 0x00000008 JumpIfNot script_0800F478 diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc index ee6359ed..41815127 100644 --- a/data/scripts/script_0800F4C4.inc +++ b/data/scripts/script_0800F4C4.inc @@ -21,12 +21,12 @@ script_0800F50C: BeginBlock CheckEntityInteractType JumpIfNot script_0800F524 - EndBlock - _0807E864 - _0807EB74 - TextboxNoOverlap 0x1239 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x1239 WaitUntilTextboxCloses - _0807E878 + _0807E878 script_0800F524: TestBit 0x00000010 JumpIfNot script_0800F50C diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc index bcefcea4..14b29ac3 100644 --- a/data/scripts/script_0800F554.inc +++ b/data/scripts/script_0800F554.inc @@ -64,7 +64,7 @@ script_0800F604: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 - TextboxNoOverlap 0x2511 + MessageNoOverlap 0x2511 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -135,10 +135,10 @@ script_0800F6A0: .endif .endif JumpIf script_0800F6C4 - TextboxNoOverlap 0x2512 + MessageNoOverlap 0x2512 Jump script_0800F6C8 script_0800F6C4: - TextboxNoOverlap 0x251f + MessageNoOverlap 0x251f script_0800F6C8: WaitUntilTextboxCloses Wait 0x000f diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc index 6a32dcb4..bf480cfd 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -54,7 +54,7 @@ SCRIPT_START script_0800F73C Call sub_0807F5C0 WaitForSomething2 0x00000001 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2501, 0x0000 + MessageFromTargetPos 0x2501, 0x0000 WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -70,7 +70,7 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2503, 0x000e + MessageFromTargetPos 0x2503, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -83,7 +83,7 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2504, 0x000e + MessageFromTargetPos 0x2504, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -96,7 +96,7 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - TextboxNoOverlapFollowPos 0x2505, 0x000e + MessageFromTargetPos 0x2505, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -111,7 +111,7 @@ SCRIPT_START script_0800F73C _0807E8E4_0 Call sub_0807F3F8 Wait 0x003c - TextboxNoOverlapFollowPos 0x1021, 0x000e + MessageFromTargetPos 0x1021, 0x000e WaitUntilTextboxCloses StartPlayerScript script_0800FAE4 SetEntityPositionRelative 0x00f0, 0x0258 @@ -120,44 +120,44 @@ SCRIPT_START script_0800F73C Wait 0x001e Call sub_08063C2C WaitForSomething2 0x00000001 - TextboxNoOverlapFollowPos 0x1022, 0x000e + MessageFromTargetPos 0x1022, 0x000e WaitUntilTextboxCloses - _0807E8E4_0 + _0807E8E4_0 Call sub_08063C14 Call sub_08094CDC Wait 0x001e - TextboxNoOverlapFollowPos 0x1023, 0x000e + MessageFromTargetPos 0x1023, 0x000e WaitUntilTextboxCloses Call sub_08063C14 Call sub_08094DD8 Wait 0x001e - TextboxNoOverlapFollowPos 0x1024, 0x000e + MessageFromTargetPos 0x1024, 0x000e WaitUntilTextboxCloses Call sub_08063C14 Call sub_08094D34 Wait 0x001e - TextboxNoOverlapFollowPos 0x1025, 0x000e + MessageFromTargetPos 0x1025, 0x000e WaitUntilTextboxCloses Call sub_08063C5C - TextboxNoOverlapFollowPos 0x1026, 0x000e + MessageFromTargetPos 0x1026, 0x000e WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E8E4_1 Call sub_08063C2C - TextboxNoOverlapFollowPos 0x1027, 0x0000 + MessageFromTargetPos 0x1027, 0x0000 WaitUntilTextboxCloses Call sub_08063C74 Wait 0x003c Call sub_08063C14 - _0807E8E4_0 - TextboxNoOverlapFollowPos 0x1028, 0x000e + _0807E8E4_0 + MessageFromTargetPos 0x1028, 0x000e WaitUntilTextboxCloses - _0807E8E4_1 - TextboxNoOverlapFollowPos 0x1029, 0x0000 + _0807E8E4_1 + MessageFromTargetPos 0x1029, 0x0000 WaitUntilTextboxCloses - _0807E8E4_0 - TextboxNoOverlapFollowPos 0x102a, 0x000e + _0807E8E4_0 + MessageFromTargetPos 0x102a, 0x000e WaitUntilTextboxCloses Call sub_08063C14 Call sub_08094D70 @@ -172,7 +172,7 @@ SCRIPT_START script_0800F73C _0807E8E4_1 Call sub_0807F3F8 Wait 0x003c - TextboxNoOverlapFollowPos 0x102b, 0x0000 + MessageFromTargetPos 0x102b, 0x0000 WaitUntilTextboxCloses _0807F034 0x000d WaitPlayerAction8 @@ -185,7 +185,7 @@ SCRIPT_START script_0800F73C Wait 0x00b7 SetIntVariable 0x00000000 Call sub_0807F5B0 - TextboxNoOverlapFollowPos 0x102c, 0x0000 + MessageFromTargetPos 0x102c, 0x0000 WaitUntilTextboxCloses CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/script_0800FD0C.inc index 5744cc3b..c922a2fb 100644 --- a/data/scripts/script_0800FD0C.inc +++ b/data/scripts/script_0800FD0C.inc @@ -33,7 +33,7 @@ script_0800FD1A: JumpIf script_0800FD5C _0807E864 Call sub_0807F9A4 - TextboxNoOverlapFollowPos 0x2506, 0x0000 + MessageFromTargetPos 0x2506, 0x0000 WaitUntilTextboxCloses StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 @@ -45,7 +45,7 @@ script_0800FD50: script_0800FD5C: _0807E864 Call sub_0807F9A4 - TextboxNoOverlapFollowPos 0x106c, 0x0000 + MessageFromTargetPos 0x106c, 0x0000 WaitUntilTextboxCloses StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc index 357aa9f2..4da89980 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -77,7 +77,7 @@ script_0800FFCC: CallWithArg sub_0807F3D8, 0x00000008 CheckInventory1 0x0048 JumpIf script_0800FFF8 - TextboxNoOverlap 0x3401 + MessageNoOverlap 0x3401 WaitUntilTextboxCloses Jump script_08010060 script_0800FFF8: @@ -95,11 +95,11 @@ script_0800FFF8: .endif .endif JumpIfNot script_0801000A - TextboxNoOverlap 0x340b + MessageNoOverlap 0x340b WaitUntilTextboxCloses Jump script_08010060 script_0801000A: - TextboxNoOverlap 0x3402 + MessageNoOverlap 0x3402 WaitUntilTextboxCloses Jump script_08010060 script_08010014: @@ -110,7 +110,7 @@ script_08010014: _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 PlaySound SFX_TASK_COMPLETE - TextboxNoOverlap 0x340a + MessageNoOverlap 0x340a WaitUntilTextboxCloses _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x0000000c @@ -149,7 +149,7 @@ script_08010090: _0807E864 _0807EB74 CallWithArg sub_080672B0, 0x00000004 - TextboxNoOverlapFollow 0x0a01 + MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f _0807E878 diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index f895f3a3..5181354d 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -36,11 +36,11 @@ SCRIPT_START script_08010120 script_08010132: CheckEntityInteractType JumpIfNot script_08010132 - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x4f22 + _0807E864 + _0807EB74 + MessageFromTarget 0x4f22 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08010132 SCRIPT_START script_08010148 BeginBlock @@ -55,9 +55,9 @@ script_0801015A: _0807EB74 CheckRoomFlag 0x0001 JumpIf script_0801019E - TextboxNoOverlapFollowPos 0x3001, 0x0000 + MessageFromTargetPos 0x3001, 0x0000 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_080101A6 Call sub_080A1608 WaitUntilTextboxCloses @@ -81,7 +81,7 @@ script_080101AC: Call sub_080A1270 _0807E864 Call sub_0807DF28 - TextboxNoOverlapFollowPos 0x3004, 0x0007 + MessageFromTargetPos 0x3004, 0x0007 WaitUntilTextboxCloses StopBgm _0807E778 0x0004 diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index 6a90ab9b..6ca8b25e 100644 --- a/data/scripts/script_08010264.inc +++ b/data/scripts/script_08010264.inc @@ -211,13 +211,13 @@ script_08010502: CheckRoomFlag 0x000e JumpIf script_0801052E SetRoomFlag 0x000e - TextboxNoOverlap 0x2b10 + MessageNoOverlap 0x2b10 WaitUntilTextboxCloses script_0801052E: Call sub_080634E4 JumpTable script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570 script_08010544: - TextboxNoOverlap 0x2b0d + MessageNoOverlap 0x2b0d Jump script_080105E0 script_0801054C: CheckGlobalFlag 0x003d @@ -243,24 +243,24 @@ script_08010570: JumpIfNot script_080105CC Call sub_08063504 JumpIf script_080105D4 - TextboxNoOverlap 0x2b07 + MessageNoOverlap 0x2b07 WaitUntilTextboxCloses CallWithArg sub_0807F800, 0x00000000 - WaitPlayerAction8 + WaitPlayerAction8 WaitUntilTextboxCloses - TextboxNoOverlap 0x2b0c + MessageNoOverlap 0x2b0c Jump script_080105E0 script_080105C4: - TextboxNoOverlap 0x2b09 + MessageNoOverlap 0x2b09 Jump script_080105E0 script_080105CC: - TextboxNoOverlap 0x2b0a + MessageNoOverlap 0x2b0a Jump script_080105E0 script_080105D4: - TextboxNoOverlap 0x2b0b + MessageNoOverlap 0x2b0b Jump script_080105E0 script_080105DC: - TextboxNoOverlap 0x2b0e + MessageNoOverlap 0x2b0e script_080105E0: WaitUntilTextboxCloses Call sub_0807DF50 @@ -276,11 +276,11 @@ script_080105E0: script_08010602: CheckEntityInteractType JumpIfNot script_08010602 - _0807E864 - _0807EB74 - TextboxNoOverlapFollow 0x0a01 + _0807E864 + _0807EB74 + MessageFromTarget 0x0a01 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 Jump script_08010602 SCRIPT_START script_0801061C @@ -330,9 +330,9 @@ script_08010686: _0807EB74 HasRoomItemForSale Call sub_0807F77C - TextboxNoOverlapFollowTable 0x3c08, 0x3c09 + MessageFromTargetTable 0x3c08, 0x3c09 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 Jump script_08010686 .2byte 0x0000 @@ -352,7 +352,7 @@ script_080106BE: DoPostScriptAction 0x0000 HasRoomItemForSale JumpIf script_080106E0 - TextboxNoOverlap 0x3c07 + MessageNoOverlap 0x3c07 Jump script_08010726 script_080106E0: Call sub_08062EB8 @@ -363,14 +363,14 @@ script_080106E0: WaitUntilTextboxCloses BuyItem 0x0000, 0x0000 JumpIf script_0801070C - TextboxNoOverlap 0x3c04 + MessageNoOverlap 0x3c04 Jump script_08010726 script_0801070C: WaitPlayerAction8 ModHealth 0x0008 Call sub_08062EDC JumpIf script_08010724 - TextboxNoOverlap 0x3c06 + MessageNoOverlap 0x3c06 Jump script_08010726 script_08010724: WaitPlayerAction8 @@ -401,12 +401,12 @@ script_08010746: JumpIfNot script_08010786 HasRupees 0x00c8 JumpIf script_08010778 - TextboxNoOverlap 0x4008 + MessageNoOverlap 0x4008 Jump script_08010786 script_08010778: ModRupees 0xff38 Call sub_08062E14 - TextboxNoOverlap 0x4007 + MessageNoOverlap 0x4007 script_08010786: EndBlock WaitUntilTextboxCloses @@ -470,13 +470,13 @@ script_08010804: JumpIfNot script_08010858 CheckGlobalFlag 0x0041 JumpIfNot script_08010850 - TextboxNoOverlap 0x3f39 + MessageNoOverlap 0x3f39 Jump script_080108BA script_08010850: - TextboxNoOverlap 0x2c1b + MessageNoOverlap 0x2c1b Jump script_080108BA script_08010858: - TextboxNoOverlap 0x2c1a + MessageNoOverlap 0x2c1a Jump script_080108BA script_08010860: EndBlock @@ -498,7 +498,7 @@ script_08010860: JumpIfNot script_080108AA CheckGlobalFlag 0x0044 JumpIfNot script_080108AA - TextboxNoOverlap 0x2c21 + MessageNoOverlap 0x2c21 Jump script_080108B2 script_080108AA: .ifdef USA @@ -508,7 +508,7 @@ script_080108AA: SetLocalFlag 0x00fa .endif .endif - TextboxNoOverlap 0x2c20 + MessageNoOverlap 0x2c20 script_080108B2: WaitUntilTextboxCloses Call sub_0807F83C diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index f5bddf73..79bd4c24 100644 --- a/data/scripts/script_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -24,15 +24,15 @@ SCRIPT_START script_08010BEC StartPlayerScript script_08011074 WaitForSomething2 0x00000400 _0807F078 0x0034, 0x0002 - TextboxNoOverlapFollowPos 0x1036, 0x000c + MessageFromTargetPos 0x1036, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000010 WaitForSomething2 0x00000020 - TextboxNoOverlapFollowPos 0x1037, 0x0002 + MessageFromTargetPos 0x1037, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00000010 WaitForSomething2 0x00000020 - TextboxNoOverlapFollowPos 0x1038, 0x000c + MessageFromTargetPos 0x1038, 0x000c WaitUntilTextboxCloses StopBgm _0807E778 0x0004 @@ -69,7 +69,7 @@ SCRIPT_START script_08010BEC _0807E8E4_1 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollowPos 0x1039, 0x000c + MessageFromTargetPos 0x1039, 0x000c WaitUntilTextboxCloses PlayBgm BGM_CASTLE_TOURNAMENT _0807E8E4_2 @@ -82,7 +82,7 @@ SCRIPT_START script_08010BEC Wait 0x012c _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - TextboxNoOverlapFollowPos 0x103a, 0x000c + MessageFromTargetPos 0x103a, 0x000c WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x01c0 _0807F0B4 0x0004 @@ -100,7 +100,7 @@ SCRIPT_START script_08010BEC PlaySound SFX_9B _0807E5F8 0x00000100 WaitForSomething2 0x00000200 - TextboxNoOverlapFollowPos 0x1043, 0x0000 + MessageFromTargetPos 0x1043, 0x0000 WaitUntilTextboxCloses PlayBgm BGM_VAATI_THEME _0807E5F8 0x00000100 @@ -116,7 +116,7 @@ SCRIPT_START script_08010BEC WaitForSomething2 0x00005000 _0807E5F8 0x00028000 WaitForSomething2 0x00050000 - TextboxNoOverlapFollowPos 0x1044, 0x0000 + MessageFromTargetPos 0x1044, 0x0000 WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x0098 StopBgm diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc index 847b3bbd..62f2874d 100644 --- a/data/scripts/script_08010E5A.inc +++ b/data/scripts/script_08010E5A.inc @@ -47,9 +47,9 @@ SCRIPT_START script_08010E5A _0807E5F8 0x00000100 WaitForSomething2 0x00000020 WaitForSomething2 0x00000200 - TextboxNoOverlapFollowPos 0x1045, 0x000c + MessageFromTargetPos 0x1045, 0x000c WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x1046, 0x0000 + MessageFromTargetPos 0x1046, 0x0000 WaitUntilTextboxCloses CallWithArg CreateManager36, 0x00000002 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc index a86c6f81..64f3c058 100644 --- a/data/scripts/script_08010F84.inc +++ b/data/scripts/script_08010F84.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08010F84 WaitForSomething2 0x00000200 StartPlayerScript script_080110BC WaitForSomething2 0x00000400 - TextboxNoOverlapFollowPos 0x1047, 0x0000 + MessageFromTargetPos 0x1047, 0x0000 WaitUntilTextboxCloses Call sub_0806DC3C Call sub_080791BC @@ -28,11 +28,11 @@ SCRIPT_START script_08010F84 WaitForSomething2 0x00000020 StopBgm Wait 0x003c - TextboxNoOverlapFollowPos 0x104a, 0x0000 + MessageFromTargetPos 0x104a, 0x0000 WaitUntilTextboxCloses _0807E5F8 0x00000100 WaitForSomething2 0x00000200 - TextboxNoOverlapFollowPos 0x1049, 0x0000 + MessageFromTargetPos 0x1049, 0x0000 WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x0098 Wait 0x0078 diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc index f7ef1688..18b0d47a 100644 --- a/data/scripts/script_0801194C.inc +++ b/data/scripts/script_0801194C.inc @@ -24,10 +24,10 @@ script_0801197C: CallWithArg sub_0807F3D8, 0x00000000 CheckGlobalFlag 0x0015 JumpIf script_080119A0 - TextboxNoOverlapFollow 0x103d + MessageFromTarget 0x103d Jump script_080119A4 script_080119A0: - TextboxNoOverlapFollow 0x103f + MessageFromTarget 0x103f script_080119A4: WaitUntilTextboxCloses Wait 0x000f @@ -87,9 +87,9 @@ script_08011A44: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlapFollow 0x1320 + MessageFromTarget 0x1320 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08011A44 SCRIPT_START script_08011A64 BeginBlock @@ -106,9 +106,9 @@ script_08011A7C: CallWithArg sub_0807F3D8, 0x00000000 CallWithArg sub_080644B4, 0x00000006 JumpIf script_08011AFA - TextboxNoOverlapFollow 0x1320 + MessageFromTarget 0x1320 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08011A7C .2byte 0x0000 BeginBlock @@ -123,9 +123,9 @@ script_08011AC4: _0807E864 _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - TextboxNoOverlapFollow 0x1322 + MessageFromTarget 0x1322 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08011AC4 SCRIPT_START script_08011AE4 @@ -135,7 +135,7 @@ SCRIPT_START script_08011AE4 Call sub_0807F9A4 Call sub_0807DF28 script_08011AFA: - TextboxNoOverlapFollowPos 0x1321, 0x0007 + MessageFromTargetPos 0x1321, 0x0007 WaitUntilTextboxCloses .ifdef JP SetLocalFlag 0x0011 diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc index 07756dab..c679db6d 100644 --- a/data/scripts/script_08011B20.inc +++ b/data/scripts/script_08011B20.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08011B20 _0807E864 Call sub_0807DF28 - TextboxNoOverlapFollowPos 0x1320, 0x000c + MessageFromTargetPos 0x1320, 0x000c WaitUntilTextboxCloses - _0807E878 + _0807E878 Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc index 5a746fdb..3054956e 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -11,8 +11,8 @@ SCRIPT_START script_08011B40 _0807EB44 0x0006 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB8C - TextboxNoOverlap 0x3d07 + _0807EB8C + MessageNoOverlap 0x3d07 WaitUntilTextboxCloses _0807EB44 0x0004 ClearGlobalFlag 0x0050 @@ -21,11 +21,11 @@ SCRIPT_START script_08011B40 script_08011B84: CheckEntityInteractType JumpIfNot script_08011B84 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x3d01 + _0807E864 + _0807EB74 + MessageNoOverlap 0x3d01 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_08011BA4 script_08011B9A: _0807E878 @@ -36,12 +36,12 @@ script_08011BA4: JumpIf script_08011BBC DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x3d05 + MessageNoOverlap 0x3d05 Jump script_08011B9A script_08011BBC: ModRupees 0xfff6 Wait 0x001e - TextboxNoOverlap 0x3d06 + MessageNoOverlap 0x3d06 WaitUntilTextboxCloses CallWithArg sub_0806C2A0, 0x00000000 WaitFor_2 diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc index c283c9d0..519811d2 100644 --- a/data/scripts/script_08011C7C.inc +++ b/data/scripts/script_08011C7C.inc @@ -16,9 +16,9 @@ script_08011C9A: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4515 + MessageNoOverlap 0x4515 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011C9A @@ -35,9 +35,9 @@ script_08011CC2: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x3105 + MessageNoOverlap 0x3105 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_08011D0E _0807E878 _0807EB44 0x0004 @@ -50,7 +50,7 @@ script_08011D00: _0807EB74 DoPostScriptAction 0x0000 script_08011D0E: - TextboxNoOverlap 0x3108 + MessageNoOverlap 0x3108 WaitUntilTextboxCloses SetGlobalFlag 0x002b _0807E878 @@ -76,9 +76,9 @@ script_08011D46: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4513 + MessageNoOverlap 0x4513 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011D46 @@ -95,9 +95,9 @@ script_08011D6E: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x3103 + MessageNoOverlap 0x3103 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_08011DBA _0807E878 _0807EB44 0x0004 @@ -110,7 +110,7 @@ script_08011DAC: _0807EB74 DoPostScriptAction 0x0000 script_08011DBA: - TextboxNoOverlap 0x3106 + MessageNoOverlap 0x3106 WaitUntilTextboxCloses SetGlobalFlag 0x002c _0807E878 @@ -136,9 +136,9 @@ script_08011DF2: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4514 + MessageNoOverlap 0x4514 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011DF2 @@ -155,9 +155,9 @@ script_08011E1A: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x3104 + MessageNoOverlap 0x3104 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_08011E66 _0807E878 _0807EB44 0x0004 @@ -170,7 +170,7 @@ script_08011E58: _0807EB74 DoPostScriptAction 0x0000 script_08011E66: - TextboxNoOverlap 0x3107 + MessageNoOverlap 0x3107 WaitUntilTextboxCloses SetGlobalFlag 0x002d _0807E878 @@ -200,13 +200,13 @@ script_08011E96: DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011ECC - TextboxNoOverlap 0x4524 + MessageNoOverlap 0x4524 WaitUntilTextboxCloses Jump script_08011ED8 script_08011ECC: - TextboxNoOverlap 0x3111 + MessageNoOverlap 0x3111 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_08011EF4 script_08011ED8: _0807E878 @@ -220,7 +220,7 @@ script_08011EE6: _0807EB74 DoPostScriptAction 0x0000 script_08011EF4: - TextboxNoOverlap 0x3114 + MessageNoOverlap 0x3114 WaitUntilTextboxCloses SetGlobalFlag 0x002e _0807E878 @@ -249,13 +249,13 @@ script_08011F22: DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011F58 - TextboxNoOverlap 0x4522 + MessageNoOverlap 0x4522 WaitUntilTextboxCloses Jump script_08011F64 script_08011F58: - TextboxNoOverlap 0x310f + MessageNoOverlap 0x310f WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_08011F80 script_08011F64: _0807E878 @@ -269,7 +269,7 @@ script_08011F72: _0807EB74 DoPostScriptAction 0x0000 script_08011F80: - TextboxNoOverlap 0x3112 + MessageNoOverlap 0x3112 WaitUntilTextboxCloses SetGlobalFlag 0x002f _0807E878 @@ -298,13 +298,13 @@ script_08011FAE: DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011FE4 - TextboxNoOverlap 0x4523 + MessageNoOverlap 0x4523 WaitUntilTextboxCloses Jump script_08011FF0 script_08011FE4: - TextboxNoOverlap 0x3110 + MessageNoOverlap 0x3110 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_0801200C script_08011FF0: _0807E878 @@ -318,7 +318,7 @@ script_08011FFE: _0807EB74 DoPostScriptAction 0x0000 script_0801200C: - TextboxNoOverlap 0x3113 + MessageNoOverlap 0x3113 WaitUntilTextboxCloses SetGlobalFlag 0x0030 _0807E878 @@ -342,24 +342,24 @@ script_0801203A: DoPostScriptAction 0x0000 CheckLocalFlag 0x0094 JumpIf script_0801205E - TextboxNoOverlap 0x3122 + MessageNoOverlap 0x3122 WaitUntilTextboxCloses SetLocalFlag 0x0094 Jump script_0801209E script_0801205E: _0807E48C 0x0031 JumpIfNot script_08012070 - TextboxNoOverlap 0x3123 + MessageNoOverlap 0x3123 WaitUntilTextboxCloses Jump script_0801209E script_08012070: - TextboxNoOverlap 0x3124 + MessageNoOverlap 0x3124 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0801209E _0807E48C 0x0020 JumpIfNot script_0801209A - TextboxNoOverlap 0x3125 + MessageNoOverlap 0x3125 WaitUntilTextboxCloses _0807F034 0x0031 WaitPlayerAction8 @@ -376,7 +376,7 @@ script_08012070: .endif Jump script_0801209E script_0801209A: - TextboxNoOverlap 0x3127 + MessageNoOverlap 0x3127 script_0801209E: WaitUntilTextboxCloses _0807E878 @@ -400,24 +400,24 @@ script_080120C6: DoPostScriptAction 0x0000 CheckLocalFlag 0x0095 JumpIf script_080120EA - TextboxNoOverlap 0x3116 + MessageNoOverlap 0x3116 WaitUntilTextboxCloses SetLocalFlag 0x0095 Jump script_0801212A script_080120EA: _0807E48C 0x002f JumpIfNot script_080120FC - TextboxNoOverlap 0x3117 + MessageNoOverlap 0x3117 WaitUntilTextboxCloses Jump script_0801212A script_080120FC: - TextboxNoOverlap 0x3118 + MessageNoOverlap 0x3118 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_0801212A _0807E48C 0x0020 JumpIfNot script_08012126 - TextboxNoOverlap 0x3119 + MessageNoOverlap 0x3119 WaitUntilTextboxCloses _0807F034 0x002f WaitPlayerAction8 @@ -434,7 +434,7 @@ script_080120FC: .endif Jump script_0801212A script_08012126: - TextboxNoOverlap 0x311b + MessageNoOverlap 0x311b script_0801212A: WaitUntilTextboxCloses _0807E878 @@ -458,24 +458,24 @@ script_08012152: DoPostScriptAction 0x0000 CheckLocalFlag 0x0096 JumpIf script_08012176 - TextboxNoOverlap 0x311c + MessageNoOverlap 0x311c WaitUntilTextboxCloses SetLocalFlag 0x0096 Jump script_080121B6 script_08012176: _0807E48C 0x0030 JumpIfNot script_08012188 - TextboxNoOverlap 0x311d + MessageNoOverlap 0x311d WaitUntilTextboxCloses Jump script_080121B6 script_08012188: - TextboxNoOverlap 0x311e + MessageNoOverlap 0x311e WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_080121B6 _0807E48C 0x0020 JumpIfNot script_080121B2 - TextboxNoOverlap 0x311f + MessageNoOverlap 0x311f WaitUntilTextboxCloses _0807F034 0x0030 WaitPlayerAction8 @@ -492,7 +492,7 @@ script_08012188: .endif Jump script_080121B6 script_080121B2: - TextboxNoOverlap 0x3121 + MessageNoOverlap 0x3121 script_080121B6: WaitUntilTextboxCloses _0807E878 @@ -514,9 +514,9 @@ script_080121DE: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4527 + MessageNoOverlap 0x4527 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_080121DE @@ -533,9 +533,9 @@ script_08012216: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4525 + MessageNoOverlap 0x4525 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08012216 @@ -552,9 +552,9 @@ script_0801224E: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x4526 + MessageNoOverlap 0x4526 WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_0801224E @@ -579,9 +579,9 @@ script_08012298: _0807EB74 _0807E864 Call sub_08061FD8 - TextboxNoOverlapFollow 0x2302 + MessageFromTarget 0x2302 WaitUntilTextboxCloses - _0807E878 + _0807E878 SetGlobalFlag 0x001e Jump script_08012284 script_080122BA: @@ -598,9 +598,9 @@ script_080122CE: _0807EB74 _0807E864 Call sub_08061FD8 - TextboxNoOverlapFollow 0x2303 + MessageFromTarget 0x2303 WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_080122BA script_080122EC: EndBlock diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index 233a6f09..326bc40e 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -7,9 +7,9 @@ SCRIPT_START script_0801232C script_08012338: CheckEntityInteractType JumpIfNot script_08012338 - _0807EB74 - _0807E864 - TextboxNoOverlapFollow 0x2304 + _0807EB74 + _0807E864 + MessageFromTarget 0x2304 WaitUntilTextboxCloses CheckLocalFlag 0x0042 JumpIf script_0801235A @@ -31,7 +31,7 @@ script_08012368: StopBgm BeginBlock _0807E778 0x0004 - _0807E788 0x00007fff + SetFadeMask 0x00007fff DoFade5 _0807E858 0x0080 EndBlock @@ -48,14 +48,14 @@ script_08012368: _0807E8E4_0 StartPlayerScript script_08012410 WaitForSomething2 0x00000001 - TextboxNoOverlap 0x1402 + MessageNoOverlap 0x1402 WaitUntilTextboxCloses StopBgm SetEntity0x20 0x00010000 Wait 0x003c BeginBlock _0807E778 0x0004 - _0807E788 0xffffffff + SetFadeMask 0xffffffff DoFade4 _0807E858 0x0080 EndBlock diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index 01e3deba..0a87a50e 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -44,9 +44,9 @@ script_0801248A: Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08012AB0 - TextboxNoOverlapFollowPos 0x1101, 0x0007 + MessageFromTargetPos 0x1101, 0x0007 WaitUntilTextboxCloses - CameraTargetPlayer + CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 WaitFor_2 @@ -77,7 +77,7 @@ script_0801248A: MoveEntityToPlayer Call sub_0807F844 CameraTargetPlayer - _0807E788 0xffffffff + SetFadeMask 0xffffffff _0807E778 0x0004 _0807E800 0x00000000 WaitFor_2 diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc index c28722a6..4470cf0e 100644 --- a/data/scripts/script_080126FC.inc +++ b/data/scripts/script_080126FC.inc @@ -7,14 +7,14 @@ SCRIPT_START script_080126FC WaitForSomething2 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1102, 0x000c + MessageFromTargetPos 0x1102, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1103, 0x000c + MessageFromTargetPos 0x1103, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 _0807E5F8 0x00000008 @@ -25,29 +25,29 @@ SCRIPT_START script_080126FC WaitForSomething2 0x00000004 DoPostScriptAction 0x0011 _0807E930 0x001c - TextboxNoOverlapFollowPos 0x1105, 0x000c + MessageFromTargetPos 0x1105, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1106, 0x000c + MessageFromTargetPos 0x1106, 0x000c WaitUntilTextboxCloses _0807E930 0x001c Call sub_0806D96C - TextboxNoOverlapFollowPos 0x1107, 0x000c + MessageFromTargetPos 0x1107, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 - TextboxNoOverlapFollowPos 0x1108, 0x000c + MessageFromTargetPos 0x1108, 0x000c WaitUntilTextboxCloses _0807E930 0x001c Call sub_0806D96C - TextboxNoOverlapFollowPos 0x1109, 0x000c + MessageFromTargetPos 0x1109, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 DoPostScriptAction 0x000a @@ -64,7 +64,7 @@ script_080127F2: _0807E864 Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x1114, 0x000c + MessageFromTargetPos 0x1114, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 _0807E878 @@ -82,13 +82,13 @@ script_08012824: WaitForSomething2 0x00000004 Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110a, 0x000c + MessageFromTargetPos 0x110a, 0x000c WaitUntilTextboxCloses _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110b, 0x000c + MessageFromTargetPos 0x110b, 0x000c WaitUntilTextboxCloses _0807E930 0x001f _0807E5F8 0x00000008 @@ -96,19 +96,19 @@ script_08012824: DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110c, 0x000c + MessageFromTargetPos 0x110c, 0x000c WaitUntilTextboxCloses _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110d, 0x000c + MessageFromTargetPos 0x110d, 0x000c WaitUntilTextboxCloses _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110e, 0x000c + MessageFromTargetPos 0x110e, 0x000c WaitUntilTextboxCloses _0807E930 0x0018 SetEntitySpeed 0x0080 @@ -130,8 +130,8 @@ script_08012904: script_08012920: _0807E864 _0807E930 0x0010 - EndBlock - TextboxNoOverlapFollowPos 0x1115, 0x000c + EndBlock + MessageFromTargetPos 0x1115, 0x000c WaitUntilTextboxCloses _0807E930 0x0018 _0807E878 @@ -144,7 +144,7 @@ script_0801293A: _0807EB8C Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x110f, 0x000c + MessageFromTargetPos 0x110f, 0x000c _0807E930 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 @@ -166,8 +166,8 @@ script_08012984: script_080129A0: _0807E864 _0807E930 0x0010 - EndBlock - TextboxNoOverlapFollowPos 0x1115, 0x000c + EndBlock + MessageFromTargetPos 0x1115, 0x000c WaitUntilTextboxCloses _0807E930 0x0018 _0807E878 @@ -180,7 +180,7 @@ script_080129BA: _0807EB8C Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x1110, 0x000c + MessageFromTargetPos 0x1110, 0x000c _0807E930 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 @@ -203,8 +203,8 @@ script_08012A08: script_08012A24: _0807E864 _0807E930 0x0010 - EndBlock - TextboxNoOverlapFollowPos 0x1115, 0x000c + EndBlock + MessageFromTargetPos 0x1115, 0x000c WaitUntilTextboxCloses _0807E930 0x0018 _0807E878 @@ -219,7 +219,7 @@ script_08012A3E: _0807EB8C Call sub_0806D944 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x1111, 0x000c + MessageFromTargetPos 0x1111, 0x000c _0807E930 0x0018 SetEntitySpeed 0x0080 Call sub_0806D8A0 diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc index e5013b16..c63f591e 100644 --- a/data/scripts/script_08012C68.inc +++ b/data/scripts/script_08012C68.inc @@ -8,9 +8,9 @@ SCRIPT_START script_08012C68 script_08012C7E: CheckEntityInteractType JumpIfNot script_08012C7E - _0807E864 - _0807E8E4_0 - TextboxNoOverlapFollow 0x111d + _0807E864 + _0807E8E4_0 + MessageFromTarget 0x111d WaitUntilTextboxCloses SetGlobalFlag 0x0022 _0807E878 diff --git a/data/scripts/script_08012F0C.inc b/data/scripts/script_08012F0C.inc index e56c81b9..17ccbb21 100644 --- a/data/scripts/script_08012F0C.inc +++ b/data/scripts/script_08012F0C.inc @@ -19,8 +19,8 @@ script_08012F48: script_08012F50: Call sub_0806A96C JumpIfNot script_08012F50 - _0807E864 - TextboxNoOverlap 0x4401 + _0807E864 + MessageNoOverlap 0x4401 WaitUntilTextboxCloses SetLocalFlag 0x0061 _0807E878 @@ -28,7 +28,7 @@ script_08012F50: script_08012F6C: Call sub_0806A96C JumpIfNot script_08012F6C - TextboxNoOverlap 0x4402 + MessageNoOverlap 0x4402 WaitUntilTextboxCloses _0807E908 0x0001 Jump script_08012F6C diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc index cdcaa6c1..fdd495d6 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -27,8 +27,8 @@ script_08012FD2: CheckInventory1 0x0038 JumpIf script_08013006 script_08012FFA: - _0807E944 - TextboxNoOverlap 0x4403 + _0807E944 + MessageNoOverlap 0x4403 WaitUntilTextboxCloses Jump script_08012FFA script_08013006: @@ -47,24 +47,24 @@ script_08013006: Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x4404 + MessageNoOverlap 0x4404 WaitUntilTextboxCloses Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x440e + MessageNoOverlap 0x440e WaitUntilTextboxCloses Wait 0x001e Call sub_0806A9E8 _0807E930 0x000f Wait 0x00f0 - TextboxNoOverlap 0x4405 + MessageNoOverlap 0x4405 WaitUntilTextboxCloses _0807E5F8 0x00000200 _0807F034 0x0015 - WaitPlayerAction8 - _0807EB8C - TextboxNoOverlap 0x4406 + WaitPlayerAction8 + _0807EB8C + MessageNoOverlap 0x4406 WaitUntilTextboxCloses _0807E908 0x0001 Call sub_0807DF50 @@ -72,13 +72,13 @@ script_08013006: script_0801308A: Call sub_0806A96C JumpIfNot script_0801308A - TextboxNoOverlap 0x4407 + MessageNoOverlap 0x4407 WaitUntilTextboxCloses _0807E908 0x0001 script_0801309E: Call sub_0806A96C JumpIfNot script_0801309E - TextboxNoOverlap 0x440d + MessageNoOverlap 0x440d WaitUntilTextboxCloses _0807E908 0x0001 Jump script_0801308A diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index 48dbc388..c32c850d 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -30,8 +30,8 @@ SCRIPT_START script_080131AC Call sub_080536B8 _0807E864 Call sub_0807DF28 - WaitFor_2 - TextboxNoOverlapFollowPos 0x1602, 0x000c + WaitFor_2 + MessageFromTargetPos 0x1602, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000008 WaitForSomething2 0x00000010 @@ -45,11 +45,11 @@ SCRIPT_START script_080131AC StartPlayerScript script_08013378 _0807E5F8 0x00000020 WaitForSomething2 0x00000042 - TextboxNoOverlapFollowPos 0x1603, 0x000c + MessageFromTargetPos 0x1603, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000020 WaitForSomething2 0x00000040 - _0807E788 0xffff7fff + SetFadeMask 0xffff7fff _0807E778 0x0004 DoFade5 WaitFor_2 @@ -58,9 +58,9 @@ SCRIPT_START script_080131AC Wait 0x003c CameraTargetPlayer Call sub_0807F5C0 - TextboxNoOverlapFollowPos 0x1604, 0x0007 + MessageFromTargetPos 0x1604, 0x0007 WaitUntilTextboxCloses - _0807E788 0xffffffff + SetFadeMask 0xffffffff _0807E778 0x0004 DoFade4 WaitFor_2 diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc index 80a2f6e3..2c83e70b 100644 --- a/data/scripts/script_080134DC.inc +++ b/data/scripts/script_080134DC.inc @@ -66,7 +66,7 @@ script_080134F8: DoFade6 WaitFor_2 PlaySound SFX_109 - TextboxNoOverlapFollowPos 0x0503, 0x000c + MessageFromTargetPos 0x0503, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00040000 CallWithArg CreateManager36, 0x00000001 diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc index 8873bf72..1f7bb597 100644 --- a/data/scripts/script_08013720.inc +++ b/data/scripts/script_08013720.inc @@ -69,7 +69,7 @@ script_0801373C: DoFade6 WaitFor_2 PlaySound SFX_109 - TextboxNoOverlapFollowPos 0x0504, 0x000c + MessageFromTargetPos 0x0504, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00040000 SetLocalFlag 0x007b diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc index e7336b42..2cbc2caf 100644 --- a/data/scripts/script_080138B4.inc +++ b/data/scripts/script_080138B4.inc @@ -74,7 +74,7 @@ script_080138D0: DoFade6 WaitFor_2 PlaySound SFX_109 - TextboxNoOverlapFollowPos 0x0505, 0x000c + MessageFromTargetPos 0x0505, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00040000 .ifndef EU diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index 8858c63e..b0ec2caf 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -24,10 +24,10 @@ script_0801427C: script_08014298: CheckEntityInteractType JumpIfNot script_08014298 - _0807E864 - TextboxNoOverlapFollowPos 0x0647, 0x000c + _0807E864 + MessageFromTargetPos 0x0647, 0x000c WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08014298 .2byte 0x0000 .endif diff --git a/data/scripts/script_080142B0.inc b/data/scripts/script_080142B0.inc index 5d2587df..7a9188ad 100644 --- a/data/scripts/script_080142B0.inc +++ b/data/scripts/script_080142B0.inc @@ -29,7 +29,7 @@ script_080142C4: Wait 0x000a _0807E930 0x0002 Wait 0x001e - TextboxNoOverlap 0x2c12 + MessageNoOverlap 0x2c12 WaitUntilTextboxCloses Wait 0x0014 _0807E930 0x0004 @@ -53,7 +53,7 @@ script_08014330: Wait 0x001e _0807E930 0x0001 Wait 0x001e - TextboxNoOverlap 0x2c13 + MessageNoOverlap 0x2c13 WaitUntilTextboxCloses Wait 0x0014 _0807E930 0x0004 diff --git a/data/scripts/script_08014384.inc b/data/scripts/script_08014384.inc index 86aa3647..ac5a30fe 100644 --- a/data/scripts/script_08014384.inc +++ b/data/scripts/script_08014384.inc @@ -11,7 +11,7 @@ SCRIPT_START script_08014384 WaitUntilTextboxCloses _0807EB8C Wait 0x001e - TextboxNoOverlapVar + MessageNoOverlapVar script_080143AC: WaitUntilTextboxCloses Wait 0x001e diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc index 602f8a7d..dc3c8b0f 100644 --- a/data/scripts/script_080143C0.inc +++ b/data/scripts/script_080143C0.inc @@ -6,9 +6,9 @@ SCRIPT_START script_080143C0 _0807E930 0x0001 Call sub_080654EC Wait 0x003c - TextboxNoOverlap 0x2c16 + MessageNoOverlap 0x2c16 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIf script_080143FA SetIntVariable 0x00000002 Call sub_08065528 @@ -16,21 +16,21 @@ SCRIPT_START script_080143C0 script_080143FA: Call sub_080654EC Wait 0x001e - TextboxNoOverlap 0x2c18 + MessageNoOverlap 0x2c18 WaitUntilTextboxCloses Wait 0x000a SetIntVariable 0x00000000 Call sub_08065528 _0807F034 0x0036 - WaitPlayerAction8 - TextboxNoOverlap 0x2c19 + WaitPlayerAction8 + MessageNoOverlap 0x2c19 WaitUntilTextboxCloses SetIntVariable 0x00000303 Call sub_0807F420 .ifndef EU Wait 0x001e - _0807EB8C - TextboxNoOverlap 0x2c22 + _0807EB8C + MessageNoOverlap 0x2c22 WaitUntilTextboxCloses .endif script_0801443E: diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc index 4905e22f..6888e5d0 100644 --- a/data/scripts/script_08014450.inc +++ b/data/scripts/script_08014450.inc @@ -12,23 +12,23 @@ script_08014462: _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 - TextboxNoOverlapFollow 0x4202 - TextboxNoOverlapFollow 0x4203 + MessageFromTarget 0x4202 + MessageFromTarget 0x4203 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_080144F0 DoPostScriptAction 0x0001 Wait 0x008c DoPostScriptAction 0x0000 HasRupees 0x000a JumpIf script_080144A2 - TextboxNoOverlapFollow 0x4204 + MessageFromTarget 0x4204 Jump script_080144FC script_080144A2: Call sub_0806E250 JumpIfNot script_080144B8 - TextboxNoOverlapFollow 0x420b - _0807EB38 + MessageFromTarget 0x420b + _0807EB38 JumpTable script_080144B8, script_080144C0 script_080144B8: ClearLocalFlag 0x0093 @@ -44,7 +44,7 @@ script_080144C0: .endif script_080144C8: ModRupees 0xfff6 - TextboxNoOverlapFollow 0x420c + MessageFromTarget 0x420c PlaySound SFX_10C Wait 0x0018 SetRoomFlag 0x0000 diff --git a/data/scripts/script_080145B0.inc b/data/scripts/script_080145B0.inc index cb47bc67..0b0264e5 100644 --- a/data/scripts/script_080145B0.inc +++ b/data/scripts/script_080145B0.inc @@ -17,7 +17,7 @@ script_080145C2: Wait 0x000c _0807EB8C .endif - TextboxNoOverlapFollowPos 0x432e, 0x000c + MessageFromTargetPos 0x432e, 0x000c WaitUntilTextboxCloses .ifdef EU Wait 0x0018 diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc index a3189a6b..cd83bffc 100644 --- a/data/scripts/script_080145E8.inc +++ b/data/scripts/script_080145E8.inc @@ -16,7 +16,7 @@ script_080145F8: Wait 0x0018 _0807E8E4_3 _0807EB44 0x0002 - TextboxNoOverlapFollowPos 0x432b, 0x000c + MessageFromTargetPos 0x432b, 0x000c WaitUntilTextboxCloses Wait 0x0018 _0807E878 @@ -102,7 +102,7 @@ script_080146E2: SetRoomFlag 0x000a Jump script_0801473C script_0801472E_2: - TextboxNoOverlapFollowPos 0x432f, 0x000c + MessageFromTargetPos 0x432f, 0x000c Jump script_080147CE @ TODO script_08014816 .else CheckRoomFlag 0x0004 @@ -111,9 +111,9 @@ script_0801472E_2: JumpIfNot script_0801463A CheckLocalFlag 0x005e JumpIf script_080146A0 - _0807E864 - _0807EB8C - TextboxNoOverlapFollowPos 0x432b, 0x000c + _0807E864 + _0807EB8C + MessageFromTargetPos 0x432b, 0x000c Jump script_080147CE script_08014672: .ifdef DEMO_JP @@ -144,7 +144,7 @@ script_080146A0: _0807E930 0x0002 CheckGlobalFlag 0x0059 JumpIfNot script_080146C6 - TextboxNoOverlapFollowPos 0x432f, 0x000c + MessageFromTargetPos 0x432f, 0x000c Jump script_080147CE script_080146C6: CheckRoomFlag 0x0004 @@ -161,7 +161,7 @@ script_080146C6: .endif script_080146F4: - TextboxNoOverlapFollowPos 0x431e, 0x000c + MessageFromTargetPos 0x431e, 0x000c Jump script_080147CE script_080146FE: .ifdef EU @@ -174,11 +174,11 @@ script_080146FE: script_0801474A: SetRoomFlag 0x000a .endif - TextboxNoOverlapFollowPos 0x4305, 0x000c + MessageFromTargetPos 0x4305, 0x000c WaitUntilTextboxCloses _0807E3BC 0x0001 JumpIfNot script_080147C4 - TextboxNoOverlapFollowPos 0x4306, 0x000c + MessageFromTargetPos 0x4306, 0x000c Jump script_0801473C script_08014720: .ifdef EU @@ -214,7 +214,7 @@ script_08014754: .else SetRoomFlag 0x0004 .endif - TextboxNoOverlapFollowPos 0x431e, 0x000c + MessageFromTargetPos 0x431e, 0x000c Jump script_080147CE script_08014770: .ifdef EU @@ -252,7 +252,7 @@ script_080147C4: .else SetRoomFlag 0x0009 .endif - TextboxNoOverlapFollowPos 0x4307, 0x000c + MessageFromTargetPos 0x4307, 0x000c script_080147CE: WaitUntilTextboxCloses .ifdef EU diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc index 765fa7f7..98d12714 100644 --- a/data/scripts/script_08014804.inc +++ b/data/scripts/script_08014804.inc @@ -9,8 +9,8 @@ SCRIPT_START script_08014804 Wait 0x0010 CheckLocalFlag 0x0093 JumpIf script_080148B6 - TextboxNoOverlapFollowPos 0x4215, 0x000c - _0807E878 + MessageFromTargetPos 0x4215, 0x000c + _0807E878 script_0801482E: TestBit 0x00000001 JumpIf script_08014862 @@ -22,8 +22,8 @@ script_0801482E: _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 - TextboxNoOverlapFollowPos 0x4215, 0x000c - _0807E878 + MessageFromTargetPos 0x4215, 0x000c + _0807E878 Jump script_0801482E script_08014862: _0807E930 0x0008 @@ -49,8 +49,8 @@ script_0801488E: Wait 0x0020 _0807E930 0x0002 script_080148B6: - TextboxNoOverlapFollowPos 0x4216, 0x000c - _0807E878 + MessageFromTargetPos 0x4216, 0x000c + _0807E878 Jump script_0801488E script_080148C2: _0807E930 0x0008 diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc index 51c30deb..058d4364 100644 --- a/data/scripts/script_08014A80.inc +++ b/data/scripts/script_08014A80.inc @@ -7,17 +7,17 @@ SCRIPT_START script_08014A80 DoPostScriptAction 0x0004 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 - TextboxNoOverlap 0x2f0a + MessageNoOverlap 0x2f0a WaitUntilTextboxCloses _0807E5F8 0x00000002 script_08014AAC: _0807E30C JumpIfNot script_08014AAC - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2f0a + _0807E864 + _0807EB74 + MessageNoOverlap 0x2f0a WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08014AAC .2byte 0x0000 SCRIPT_START script_08014AC4 @@ -36,10 +36,10 @@ script_08014AD2: CheckLocalFlag 0x0064 JumpIf script_08014AFE SetLocalFlag 0x0064 - TextboxNoOverlap 0x2f0b + MessageNoOverlap 0x2f0b Jump script_08014B02 script_08014AFE: - TextboxNoOverlap 0x2f0c + MessageNoOverlap 0x2f0c script_08014B02: WaitUntilTextboxCloses Wait 0x000f diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc index 575b8603..a53d3c1f 100644 --- a/data/scripts/script_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -12,10 +12,10 @@ script_08014B48: JumpIf script_08014B70 CheckEntityInteractType JumpIfNot script_08014B48 - EndBlock - _0807E864 - _0807EB74 - TextboxNoOverlap 0x2f01 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x2f01 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -56,14 +56,14 @@ script_08014BF2: CheckLocalFlag 0x0065 JumpIf script_08014C1C SetLocalFlag 0x0065 - TextboxNoOverlap 0x2f07 + MessageNoOverlap 0x2f07 WaitUntilTextboxCloses SetIntVariable 0x00000064 _0807F034 0x003f WaitPlayerAction8 Jump script_08014C22 script_08014C1C: - TextboxNoOverlap 0x2f08 + MessageNoOverlap 0x2f08 WaitUntilTextboxCloses script_08014C22: Wait 0x000f @@ -90,13 +90,13 @@ script_08014C56: CheckLocalFlag 0x0066 JumpIf script_08014C7C SetLocalFlag 0x0066 - TextboxNoOverlap 0x2f0d + MessageNoOverlap 0x2f0d WaitUntilTextboxCloses _0807F034 0x000a WaitPlayerAction8 Jump script_08014C82 script_08014C7C: - TextboxNoOverlap 0x2f09 + MessageNoOverlap 0x2f09 WaitUntilTextboxCloses script_08014C82: Wait 0x000f diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc index a2c0f4df..c7c09148 100644 --- a/data/scripts/script_08014CDC.inc +++ b/data/scripts/script_08014CDC.inc @@ -10,8 +10,8 @@ SCRIPT_START script_08014CDC EndBlock WaitForSomething2 0x00000001 Call sub_08066E08 - _0807E864 - TextboxNoOverlapFollowPos 0x1010, 0x000c + _0807E864 + MessageFromTargetPos 0x1010, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000002 script_08014D1E: @@ -23,7 +23,7 @@ script_08014D1E: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlap 0x1012 + MessageNoOverlap 0x1012 WaitUntilTextboxCloses _0807EC64 0x0040 _0807EB44 0x0004 @@ -36,7 +36,7 @@ script_08014D60: JumpIf script_08014D60 _0807E864 Call sub_0807DF28 - TextboxNoOverlap 0x1013 + MessageNoOverlap 0x1013 WaitUntilTextboxCloses _0807EC64 0x0040 _0807EB44 0x0004 @@ -50,7 +50,7 @@ script_08014D96: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlap 0x1014 + MessageNoOverlap 0x1014 WaitUntilTextboxCloses _0807EC64 0x0018 .ifdef JP diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index 6cb1115d..a42da868 100644 --- a/data/scripts/script_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -38,14 +38,14 @@ script_08014E64: _0807E48C 0x0020 JumpIfNot script_08014EB8 CallWithArg sub_0807F800, 0x00000022 - WaitPlayerAction8 - TextboxNoOverlap 0x0a04 + WaitPlayerAction8 + MessageNoOverlap 0x0a04 Jump script_08014EBC script_08014EB0: - TextboxNoOverlap 0x0a03 + MessageNoOverlap 0x0a03 Jump script_08014EBC script_08014EB8: - TextboxNoOverlap 0x0a02 + MessageNoOverlap 0x0a02 script_08014EBC: WaitUntilTextboxCloses Call sub_0807DF50 @@ -62,11 +62,11 @@ SCRIPT_START script_08014ECC script_08014EE0: CheckEntityInteractType JumpIfNot script_08014EE0 - _0807E864 - _0807EB74 - TextboxNoOverlap 0x200d + _0807E864 + _0807EB74 + MessageNoOverlap 0x200d WaitUntilTextboxCloses - _0807E878 + _0807E878 Jump script_08014EE0 .2byte 0x0000 SCRIPT_START script_08014EF8 @@ -82,9 +82,9 @@ script_08014F0C: _0807E864 _0807EB74 DoPostScriptAction 0x0000 - TextboxNoOverlap 0x200e + MessageNoOverlap 0x200e WaitUntilTextboxCloses - _0807E878 + _0807E878 _0807EB44 0x0004 _0807E930 0x000a Jump script_08014F0C @@ -104,8 +104,8 @@ script_08014F4A: Call sub_0807DF28 _0807EB74 DoPostScriptAction 0x0000 - BeginBlock - TextboxNoOverlap 0x3b0b + BeginBlock + MessageNoOverlap 0x3b0b CallWithArg sub_0807F854, 0x00010064 EndBlock WaitUntilTextboxCloses @@ -117,14 +117,14 @@ script_08014F4A: JumpIfNot script_08014FA2 ModRupees 0xff9c _0807F034 0x0022 - WaitPlayerAction8 - TextboxNoOverlap 0x3b11 + WaitPlayerAction8 + MessageNoOverlap 0x3b11 Jump script_08014FA6 script_08014F9A: - TextboxNoOverlap 0x3b0e + MessageNoOverlap 0x3b0e Jump script_08014FA6 script_08014FA2: - TextboxNoOverlap 0x3b0f + MessageNoOverlap 0x3b0f script_08014FA6: WaitUntilTextboxCloses Call sub_0807DF50 @@ -148,7 +148,7 @@ script_08014FCC: CameraTargetEntity StartPlayerScript script_080152B4 WaitForSomething2 0x00000001 - TextboxNoOverlapFollowPos 0x1301, 0x0002 + MessageFromTargetPos 0x1301, 0x0002 WaitUntilTextboxCloses Call sub_0807F3F8 Wait 0x003c @@ -159,11 +159,11 @@ script_08014FCC: PlayBgm BGM_VAATI_THEME _0807EB28 0x1302 WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x1303, 0x0002 + MessageFromTargetPos 0x1303, 0x0002 WaitUntilTextboxCloses _0807EB28 0x1304 WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x1305, 0x0002 + MessageFromTargetPos 0x1305, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc index 03702883..d7337b44 100644 --- a/data/scripts/script_08015390.inc +++ b/data/scripts/script_08015390.inc @@ -7,7 +7,7 @@ SCRIPT_START script_08015390 Call sub_0806D944 WaitForSomething2 0x00000008 _0807E930 0x0010 - TextboxNoOverlapFollowPos 0x1314, 0x000c + MessageFromTargetPos 0x1314, 0x000c WaitUntilTextboxCloses _0807E930 0x0018 Call sub_0806D8A0 diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc index f672715e..019ff352 100644 --- a/data/scripts/script_080153EC.inc +++ b/data/scripts/script_080153EC.inc @@ -17,20 +17,20 @@ SCRIPT_START script_080153EC WaitForSomething2 0x00001100 _0807F0B4 0x0004 SetEntityPositionRelative 0x0078, 0x0090 - TextboxNoOverlapFollowPos 0x1330, 0x0002 + MessageFromTargetPos 0x1330, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00000880 WaitForSomething2 0x00001000 Wait 0x003c - TextboxNoOverlapFollowPos 0x130d, 0x0002 + MessageFromTargetPos 0x130d, 0x0002 WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x130e, 0x000c + MessageFromTargetPos 0x130e, 0x000c WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x130f, 0x0002 + MessageFromTargetPos 0x130f, 0x0002 WaitUntilTextboxCloses - TextboxNoOverlapFollowPos 0x1310, 0x000c + MessageFromTargetPos 0x1310, 0x000c WaitUntilTextboxCloses CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc index 8ab4bef6..d30b9978 100644 --- a/data/scripts/script_0801548E.inc +++ b/data/scripts/script_0801548E.inc @@ -5,7 +5,7 @@ SCRIPT_START script_0801548E CallWithArg sub_0807FB28, 0x00000003 _0807E5F8 0x00048000 WaitForSomething2 0x00090000 - TextboxNoOverlapFollowPos 0x1311, 0x0002 + MessageFromTargetPos 0x1311, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00008000 WaitForSomething2 0x00010000 @@ -13,7 +13,7 @@ SCRIPT_START script_0801548E WaitForSomething2 0x00010000 CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 - TextboxNoOverlapFollowPos 0x1312, 0x000c + MessageFromTargetPos 0x1312, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000800 WaitForSomething2 0x00001000 diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc index 8a17a7ef..2cb7bc3c 100644 --- a/data/scripts/script_080157AC.inc +++ b/data/scripts/script_080157AC.inc @@ -32,7 +32,7 @@ script_080157DA: WaitForSomething2 0x00000010 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 - TextboxNoOverlapFollowPos 0x1066, 0x0002 + MessageFromTargetPos 0x1066, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00000001 WaitForSomething2 0x00000002 @@ -54,12 +54,12 @@ script_08015888: CameraTargetEntity StartPlayerScript script_08015938 WaitForSomething2 0x00000010 - TextboxNoOverlapFollowPos 0x106a, 0x000c + MessageFromTargetPos 0x106a, 0x000c WaitUntilTextboxCloses _0807E5F8 0x00000008 Wait 0x0078 - _0807E8E4_2 - TextboxNoOverlapFollowPos 0x1068, 0x0002 + _0807E8E4_2 + MessageFromTargetPos 0x1068, 0x0002 WaitUntilTextboxCloses _0807E5F8 0x00000001 WaitForSomething2 0x00000002 diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc index c61ace33..a8d05e76 100644 --- a/data/scripts/script_08015958.inc +++ b/data/scripts/script_08015958.inc @@ -15,7 +15,7 @@ SCRIPT_START script_08015958 _0807EDD4 0x01f8, 0x02f8 _0807EB44 0x0004 DoPostScriptAction 0x0000 - TextboxNoOverlapFollowPos 0x1011, 0x0002 + MessageFromTargetPos 0x1011, 0x0002 WaitUntilTextboxCloses _0807EDD4 0x01f8, 0x0268 SetEntityPositionRelative 0x0248, 0x0218 @@ -56,8 +56,8 @@ script_08015A32: JumpIf script_08015A54 CheckEntityInteractType JumpIfNot script_08015A32 - EndBlock - TextboxNoOverlapFollowPos 0x1067, 0x0002 + EndBlock + MessageFromTargetPos 0x1067, 0x0002 WaitUntilTextboxCloses Jump script_08015A32 script_08015A54: diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc index 23671dbe..6c5d3065 100644 --- a/data/scripts/script_08015B34.inc +++ b/data/scripts/script_08015B34.inc @@ -21,7 +21,7 @@ SCRIPT_START script_08015B34 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - TextboxNoOverlapFollowPos 0x2506, 0x0002 + MessageFromTargetPos 0x2506, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_08015B84 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc index d7226c5a..48ae9e24 100644 --- a/data/scripts/script_08015C7C.inc +++ b/data/scripts/script_08015C7C.inc @@ -8,7 +8,7 @@ SCRIPT_START script_08015C7C DoPostScriptAction 0x0000 CallWithArg sub_0807F238, 0x000003c5 Call sub_0807F304 - TextboxNoOverlapFollowPos 0x1318, 0x000c + MessageFromTargetPos 0x1318, 0x000c WaitUntilTextboxCloses CallWithArg sub_0807F238, 0x000003c9 Call sub_0807F304 diff --git a/data/scripts/script_08015DF0.inc b/data/scripts/script_08015DF0.inc index 081b2b2c..9cc8db37 100644 --- a/data/scripts/script_08015DF0.inc +++ b/data/scripts/script_08015DF0.inc @@ -6,19 +6,19 @@ SCRIPT_START script_08015DF0 WaitForSomething2 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - TextboxNoOverlap 0x1319 + MessageNoOverlap 0x1319 WaitUntilTextboxCloses _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - TextboxNoOverlap 0x131a + MessageNoOverlap 0x131a WaitUntilTextboxCloses _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - TextboxNoOverlap 0x131d + MessageNoOverlap 0x131d WaitUntilTextboxCloses _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - TextboxNoOverlap 0x131e + MessageNoOverlap 0x131e WaitUntilTextboxCloses _0807E5F8 0x00000008 WaitForSomething 0x00000400 diff --git a/data/scripts/script_08015E58.inc b/data/scripts/script_08015E58.inc index 85d5ccab..457d8fb6 100644 --- a/data/scripts/script_08015E58.inc +++ b/data/scripts/script_08015E58.inc @@ -32,7 +32,7 @@ SCRIPT_START script_08015E58 WaitForSomething2 0x00000010 DoPostScriptAction 0x0014 Wait 0x001e - TextboxNoOverlap 0x131b + MessageNoOverlap 0x131b WaitUntilTextboxCloses _0807E5F8 0x00000020 WaitForSomething2 0x00000010 diff --git a/data/scripts/script_08015F08.inc b/data/scripts/script_08015F08.inc index 6f079b51..2bedafbe 100644 --- a/data/scripts/script_08015F08.inc +++ b/data/scripts/script_08015F08.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08015F08 DoPostScriptAction 0x0000 EndBlock WaitForSomething2 0x00000001 - TextboxNoOverlap 0x131c + MessageNoOverlap 0x131c WaitUntilTextboxCloses _0807E5F8 0x00000002 WaitForSomething 0x00000200 diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index 4704883f..576ed2c3 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -23,33 +23,33 @@ script_080160E0: EndBlock HasRoomItemForSale JumpIfNot script_0801611A - TextboxNoOverlapFollow 0x2d07 + MessageFromTarget 0x2d07 WaitUntilTextboxCloses - _0807E3E8 + _0807E3E8 JumpIfNot script_08016132 BuyItem 0x0000, 0x0000 JumpIf script_0801610C - TextboxNoOverlapFollow 0x2d0b + MessageFromTarget 0x2d0b WaitUntilTextboxCloses Jump script_08016132 script_0801610C: WaitPlayerAction8 .ifndef EU - _0807EB8C - TextboxNoOverlapFollow 0x2d0d + _0807EB8C + MessageFromTarget 0x2d0d .else - TextboxNoOverlapFollow 0x2d08 + MessageFromTarget 0x2d08 .endif WaitUntilTextboxCloses Jump script_08016132 script_0801611A: CheckKinstoneFused 0x0014 JumpIfNot script_0801612C - TextboxNoOverlapFollow 0x2d09 + MessageFromTarget 0x2d09 WaitUntilTextboxCloses Jump script_08016132 script_0801612C: - TextboxNoOverlapFollow 0x2d01 + MessageFromTarget 0x2d01 WaitUntilTextboxCloses script_08016132: _0807E878 @@ -66,21 +66,21 @@ script_08016146: JumpIfNot script_08016146 _0807E864 GetInventoryValue 0x0025 - TextboxNoOverlapFollowTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 - _0807E3E8 + MessageFromTargetTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 + _0807E3E8 JumpIfNot script_0801618A _0807E48C 0x0020 JumpIf script_08016172 - TextboxNoOverlapFollow 0x2d0c + MessageFromTarget 0x2d0c Jump script_0801618A script_08016172: BuyItem 0x0025, 0x0000 JumpIf script_08016184 - TextboxNoOverlapFollow 0x2d0b + MessageFromTarget 0x2d0b Jump script_0801618A script_08016184: - WaitPlayerAction8 - TextboxNoOverlapFollow 0x2d06 + WaitPlayerAction8 + MessageFromTarget 0x2d06 script_0801618A: _0807E878 Jump script_08016146 @@ -95,26 +95,26 @@ script_0801619A: JumpIfNot script_0801619A _0807E864 GetInventoryValue 0x0024 - TextboxNoOverlapFollowTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 - _0807E3E8 + MessageFromTargetTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 + _0807E3E8 JumpIfNot script_080161E2 _0807E48C 0x0020 JumpIf script_080161C6 - TextboxNoOverlapFollow 0x2d0c + MessageFromTarget 0x2d0c Jump script_080161E2 script_080161C6: BuyItem 0x0024, 0x0000 JumpIf script_080161D8 - TextboxNoOverlapFollow 0x2d0b + MessageFromTarget 0x2d0b Jump script_080161E2 script_080161D8: .ifndef EU - WaitPlayerAction8 + WaitPlayerAction8 WaitUntilTextboxCloses - _0807EB8C - TextboxNoOverlap 0x2d06 + _0807EB8C + MessageNoOverlap 0x2d06 .else - TextboxNoOverlapFollow 0x2d06 + MessageFromTarget 0x2d06 .endif script_080161E2: _0807E878 diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc index 6b85d8b8..6f6aaa07 100644 --- a/data/scripts/script_08016384.inc +++ b/data/scripts/script_08016384.inc @@ -66,4 +66,4 @@ SCRIPT_START script_08016384 WaitFor_1 WaitFor_2 _0807E778 0x0004 - _0807E788 0x0000ffff + SetFadeMask 0x0000ffff diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index b2e0d70c..57c2cda5 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -29,11 +29,11 @@ SCRIPT_START script_08016482 _0807E9E4 0x0000 _0807EA88 0x0001 WaitUntilTextboxCloses - TextboxNoOverlapFollow 0x0601 - TextboxNoOverlap 0x0601 - TextboxNoOverlapFollowPos_1 0x0601 - TextboxNoOverlapFollowTable 0x0601, 0x0602, 0x0603 - TextboxNoOverlapVar + MessageFromTarget 0x0601 + MessageNoOverlap 0x0601 + MessageFromTargetPos_1 0x0601 + MessageFromTargetTable 0x0601, 0x0602, 0x0603 + MessageNoOverlapVar _0807EB28 0x0602 _0807EB38 _0807EB44 0x0000 diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc index 394e7392..47de49ed 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -13,16 +13,16 @@ SCRIPT_START script_080165F8 script_080165FE: _0807E30C JumpIfNot script_080165FE - TextboxNoOverlapFollow 0x0601 + MessageFromTarget 0x0601 Jump script_080165FE SCRIPT_START script_0801660C BeginBlock _0807E9D4 EndBlock script_08016612: - _0807E944 - _0807E864 - TextboxNoOverlapFollow 0x0602 + _0807E944 + _0807E864 + MessageFromTarget 0x0602 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -239,7 +239,7 @@ script_0801693E: _0807E944 _0807E864 Wait 0x0018 - TextboxNoOverlapFollow 0x0a01 + MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f _0807E878 @@ -255,7 +255,7 @@ script_0801696A: _0807E944 _0807E864 Wait 0x0018 - TextboxNoOverlapFollow 0x0a01 + MessageFromTarget 0x0a01 WaitUntilTextboxCloses Wait 0x000f _0807E878 diff --git a/data/sound/sounds.s b/data/sound/sounds.s index d42c8a46..a2a6df41 100644 --- a/data/sound/sounds.s +++ b/data/sound/sounds.s @@ -302,7 +302,7 @@ .include "sounds/sfx14F.s" .include "sounds/sfx150.s" .include "sounds/sfx151.s" - .include "sounds/sfx152.s" + .include "sounds/sfxNearPortal.s" .include "sounds/sfx153.s" .include "sounds/sfx154.s" .include "sounds/sfx155.s" diff --git a/include/audio.h b/include/audio.h index 4f8ecb84..99ccf298 100644 --- a/include/audio.h +++ b/include/audio.h @@ -346,7 +346,7 @@ typedef enum { SFX_14F, SFX_150, SFX_151, - SFX_152, + SFX_NEAR_PORTAL, SFX_153, SFX_154, SFX_155, diff --git a/include/effects.h b/include/effects.h new file mode 100644 index 00000000..696ab9ab --- /dev/null +++ b/include/effects.h @@ -0,0 +1,118 @@ +#ifndef EFFECTS_H +#define EFFECTS_H + +#include "entity.h" + +typedef enum { + FX_FALL_DOWN, + FX_EXPLOSION, + FX_DEATH, + FX_BUSH, + FX_ROCK, + FX_POT_SHATTER, + FX_6, + FX_SPARKLE, + FX_8, + FX_9, + FX_A, + FX_WATER_SPLASH, + FX_LAVA_SPLASH, + FX_ICE, + FX_ROCK_HUGE, + FX_ROCK_SMALL, + FX_REFLECT, + FX_DASH, + FX_BLUE_SPARKLE, + FX_RED_BUSH, + FX_SPARKLE2, + FX_ROCK2, + FX_FIRE, + FX_GRASS_CUT, + FX_18, + FX_SWORD_MAGIC, + FX_LIGHTNING, + FX_LIGHTNING_STRIKE, + FX_STARS, + FX_STARS_STRIKE, + FX_STARS_STRIKE2, + FX_REFLECT2, + FX_RIPPLE, + FX_RIPPLE_LARGE, + FX_BROWN_SMOKE, + FX_BROWN_SMOKE_LARGE, + FX_BROWN_SMOKE2, + FX_SWEAT, + FX_26, + FX_27, + FX_SLOW_EXPLOSION, + FX_CONFETTI, + FX_CONFETTI_LARGE, + FX_GREEN_SPLASH2, + FX_REFECT3, + FX_SIGN, + FX_SLOW_SMOKE2, + FX_SLOW_SMOKE_SMALL, + FX_SPARKLE_SECRET, + FX_MAILBOX_UNUSED, + FX_32, + FX_33, + FX_34, + FX_BIG_EXPLOSION, + FX_LAVA_SPLASH_HUGE, + FX_GRASS_CUT2, + FX_BUSH_CUT2, + FX_BUSH_CUT3, + FX_EGG, + FX_WOOD, + FX_BONE, + FX_STARS2, + FX_GRASS_CUT3, + FX_GRASS_CUT4, + FX_GRASS_CUT5, + FX_REFLECT4, + FX_STEAM_EFC, + FX_BIG_EXPLOSION2, + FX_WHITE_SPLASH, + FX_WHITE_ROCK, + FX_GIANT_EXPLOSION, + FX_GIANT_EXPLOSION2, + FX_GIANT_EXPLOSION3, + FX_GREEN_ORB, + FX_GREEN_ORB_SLOW, + FX_WHITE_AURA, + FX_WOOD2, + FX_SPARKLE3, + FX_MAGIC_STORM, + FX_BLUE_EFC, + FX_REFLECT5, + FX_GIANT_EXPLOSION4, + FX_GREEN_SPLASH, + FX_BLUE_PUFF, + FX_WHITE_PUFF, + FX_AURA_BASE, + FX_RED_AURA, + FX_BLUE_AURA, + FX_58, + FX_59, + FX_5A, + FX_5B, + FX_BARREL_BEAM, + FX_BARREL, + FX_5E, + FX_5F, + FX_60, + FX_STONE_BLOCK, + FX_62, + FX_63, + FX_64, + FX_65, + FX_66, + FX_67, + FX_68, + FX_69, + FX_6A, + FX_6B, + FX_6C, +} Effect; + +#endif // EFFECTS_H \ No newline at end of file diff --git a/include/entity.h b/include/entity.h index 2109a212..1873138f 100644 --- a/include/entity.h +++ b/include/entity.h @@ -91,7 +91,7 @@ typedef struct Entity { /*0x1d*/ u8 field_0x1d; /*0x1e*/ u8 frameIndex; /*0x1f*/ u8 lastFrameIndex; - /*0x20*/ s32 field_0x20; + /*0x20*/ s32 hVelocity; /*0x24*/ s16 speed; /*0x26*/ u8 spriteAnimation[3]; /*0x29*/ struct { @@ -109,11 +109,11 @@ typedef struct Entity { /*0x3b*/ u8 flags2; /*0x3c*/ u8 field_0x3c; /*0x3d*/ s8 iframes; - /*0x3e*/ u8 field_0x3e; + /*0x3e*/ u8 knockbackDirection; /*0x3f*/ u8 damageType; /*0x40*/ u8 field_0x40; /*0x41*/ u8 bitfield; - /*0x42*/ u8 field_0x42; + /*0x42*/ u8 knockbackDuration; /*0x43*/ u8 field_0x43; /*0x44*/ u8 field_0x44; /*0x45*/ u8 currentHealth; diff --git a/include/fileScreen.h b/include/fileScreen.h index 3ec9b15b..ef528333 100644 --- a/include/fileScreen.h +++ b/include/fileScreen.h @@ -54,7 +54,7 @@ extern struct_02019EE0 gUnk_02019EE0; extern void sub_08056FEC(u32, struct_020227E8*); extern void sub_0805F46C(u32, void*); -extern void sub_0801C4A0(u32, u32); +extern void RecoverUI(u32 bottomPt, u32 topPt); extern void sub_08080668(void); extern void sub_0805194C(u32); extern void LoadPalettes(const u8*, int, int); @@ -70,7 +70,7 @@ extern void (*const gUnk_080FC908[])(void); extern const u8 gGlobalGfxAndPalettes[]; extern void (*const gUnk_080FC93C[])(); extern u32 gUsedPalettes; -extern u8 gUnk_02000D00[]; +extern u8 gTextGfxBuffer[]; extern u8 gUnk_02001B40; extern u8 gUnk_02022030; diff --git a/include/flags.h b/include/flags.h index 81dbf5f2..2a7b4f21 100644 --- a/include/flags.h +++ b/include/flags.h @@ -28,8 +28,8 @@ void SetRoomFlag(u32); extern u32 gGlobalFlags; extern u32 gRoomFlags; -typedef enum { - FLAG_NONE, +typedef enum _Flag { + BEGIN, /*0x01*/ LV0_CLEAR, /* */ /*0x02*/ LV1_CLEAR, /* */ /*0x03*/ LV2_CLEAR, /* */ @@ -130,6 +130,1545 @@ typedef enum { /*0x62*/ MAZE_CLEAR, /* Cleared Castle maze */ /*0x63*/ TINY_ENTRANCE, /* Ezlo described entrances */ /*0x64*/ CASTLE_BGM, /* Castle intro BGM */ + END, } Flag; +typedef enum { + BEGIN_1, + LV1_CLEAR_MES, + LV2_CLEAR_MES, + LV3_CLEAR_MES, + LV4_CLEAR_MES, + LV5_CLEAR_MES, + MIZUUMI_00_BENT, + MIZUUMI_00_00, + MIZUUMI_00_H00, + MIZUUMI_00_H01, + MIZUUMI_00_H02, + MIZUUMI_00_CAP_0, + MAENIWA_00_00, + MAENIWA_00_01, + MAENIWA_00_02, + MAENIWA_00_BENT, + MAENIWA_00_WARP, + MAENIWA_00_T0, + MAENIWA_00_T1, + MAENIWA_00_CAP_0, + NAKANIWA_00_EZERO, + HIKYOU_00_00, + HIKYOU_00_01, + HIKYOU_00_02, + HIKYOU_00_03, + HIKYOU_00_04, + HIKYOU_00_CAP_0, + HIKYOU_00_CAP_1, + HIKYOU_00_CAP_2, + HIKYOU_00_SEKIZOU, + HIKYOU_00_14, + HIKYOU_00_BOSEKI, + HIKYOU_00_M0, + HIKYOU_00_M1, + HIKYOU_00_M2, + HIKYOU_00_T1, + LOST_00_ENTER, + LOST_00_00, + LOST_00_01, + LOST_02_00, + LOST_03_00, + LOST_03_T0, + LOST_04_00, + LOST_04_SIBA0, + LOST_04_SIBA1, + LOST_04_SIBA2, + LOST_04_SIBA3, + LOST_04_SIBA4, + LOST_05_00, + LOST_05_01, + LOST_05_02, + LOST_05_03, + LOST_05_T0, + LOST_05_T1, + MORI_00_HIBI_0, + MORI_00_HIBI_1, + MORI_00_HIBI_2, + MORI_00_HIBI_3, + MORI_00_HIBI_4, + MORI_00_KOBITO, + MORI_00_H0, + MORI_00_H1, + MORI_ENTRANCE_1ST, + YAMA_00_00, + YAMA_00_01, + YAMA_01_BW00, + YAMA_02_00, + YAMA_03_00, + YAMA_03_01, + YAMA_03_02, + YAMA_03_DOKU_0, + YAMA_03_DOKU_1, + YAMA_03_DOKU_2, + YAMA_04_CAP_0, + YAMA_04_CAP_1, + YAMA_04_R00, + YAMA_04_HIBI_0, + YAMA_04_HIBI_1, + YAMA_04_00, + YAMA_04_01, + YAMA_04_04, + YAMA_04_05, + YAMA_04_06, + YAMA_04_ENTHOUSHI, + YAMA_04_ANAHOUSHI, + YAMA_04_BOMBWALL0, + HAKA_BUNSHIN_00, + HAKA_BOSEKI_00, + HAKA_BOSEKI_01, + HAKA_BOSEKI_02, + HAKA_00_CAP_0, + HAKA_00_BW00, + HAKA_01_T0, + HAKA_KEY_GET, + SOUGEN_01_WAKAGI_0, + SOUGEN_01_WAKAGI_1, + SOUGEN_01_WAKAGI_2, + SOUGEN_01_WAKAGI_3, + SOUGEN_01_WAKAGI_4, + SOUGEN_01_WAKAGI_5, + SOUGEN_01_WAKAGI_6, + SOUGEN_01_WAKAGI_7, + SOUGEN_01_WAKAGI_8, + SOUGEN_01_WAKAGI_9, + SOUGEN_01_WAKAGI_10, + SOUGEN_01_WAKAGI_11, + SOUGEN_01_WAKAGI_12, + SOUGEN_01_00, + SOUGEN_01_BENT, + SOUGEN_01_ZELDA, + SOUGEN_02_HIBI_0, + SOUGEN_02_HIBI_1, + SOUGEN_03_BOMBWALL, + SOUGEN_04_HIBI_0, + SOUGEN_04_HIBI_1, + SOUGEN_04_HIBI_2, + SOUGEN_04_HIBI_3, + SOUGEN_05_HIBI_0, + SOUGEN_05_HIBI_1, + SOUGEN_05_HIBI_2, + SOUGEN_05_HIBI_3, + SOUGEN_05_BOMB_00, + SOUGEN_05_00, + SOUGEN_05_01, + SOUGEN_05_IWA02, + SOUGEN_05_BENT, + SOUGEN_05_H00, + SOUGEN_05_R0, + SOUGEN_05_CAP_0, + SOUGEN_06_WAKAGI_0, + SOUGEN_06_WAKAGI_1, + SOUGEN_06_WAKAGI_2, + SOUGEN_06_WAKAGI_3, + SOUGEN_06_HIBI_0, + SOUGEN_06_HIBI_1, + SOUGEN_06_HIBI_2, + SOUGEN_06_HIBI_3, + SOUGEN_06_HIBI_4, + SOUGEN_06_IWA_0, + SOUGEN_06_AKINDO, + SOUGEN_06_SAIKAI, + SOUGEN_06_BENT, + SOUGEN_06_SLIDE, + SOUGEN_06_R1, + SOUGEN_07_00, + SOUGEN_07_01, + SOUGEN_07_02, + SOUGEN_08_00, + SOUGEN_08_01, + SOUGEN_08_02, + SOUGEN_08_03, + SOUGEN_08_04, + SOUGEN_08_05, + SOUGEN_08_06, + SOUGEN_08_07, + SOUGEN_08_08, + SOUGEN_08_TORITSUKI, + SOUGEN_08_T00, + CASTLE_00_00, + CASTLE_04_MEZAME, + CASTLE_04_MAID_TALK, + SUIGEN_00_h0, + SUIGEN_00_T0, + SUIGEN_00_r0, + SUIGEN_00_r1, + SUIGEN_00_r2, + SUIGEN_00_CAP_0, + SUIGEN_00_CAP_1, + SUIGEN_00_R0, + SUIGEN_00_R1, + SUIGEN_00_R2, + SUIGEN_00_h1, + SUIGENGORON_00_CAP_0, + DAIGORON_SHIELD, + DAIGORON_EXCHG, + BEANDEMO_00, + BEANDEMO_01, + BEANDEMO_02, + BEANDEMO_03, + BEANDEMO_04, + KAKERA_TAKARA_A, + KAKERA_TAKARA_E, + KAKERA_TAKARA_J, + KAKERA_TAKARA_K, + KAKERA_TAKARA_L, + KAKERA_TAKARA_M, + KAKERA_TAKARA_N, + KAKERA_TAKARA_O, + KAKERA_TAKARA_P, + KAKERA_TAKARA_Q, + KAKERA_TAKARA_R, + KAKERA_TAKARA_S, + KAKERA_TAKARA_T, + KAKERA_TAKARA_U, + KAKERA_TAKARA_V, + KAKERA_TAKARA_W, + KAKERA_TAKARA_X, + KAKERA_TAKARA_Y, + KAKERA_TAKARA_Z, + MACHI_02_HEISHI_TALK, + MACHI00_00, + MACHI00_02, + MACHI00_03, + MACHI_00_T00, + MACHI_00_T01, + MACHI_01_DEMO, + MACHI_02_HEISHI, + MACHI_02_DOG, + MACHI_07_BELL, + SHOP05_OPEN, + MACHI_MES_20, + MACHI_MES_21, + MACHI_MES_22, + MACHI_MES_23, + MACHI_MES_24, + MACHI_MES_30, + MACHI_MES_40, + MACHI_MES_60, + MACHI_MES_50, + MACHI_DOG_C, + KUMOUE_00_CAP_0, + KUMOUE_01_CAP_0, + KUMOUE_01_T0, + KUMOUE_01_T1, + KUMOUE_01_T2, + KUMOUE_01_T3, + KUMOUE_01_T4, + KUMOUE_01_T5, + KUMOUE_01_T6, + KUMOUR_01_K0, + KUMOUR_01_K1, + KUMOUR_01_K2, + KUMOUR_01_K3, + KUMOUR_01_K4, + KUMOUR_01_K5, + KUMOUR_01_K6, + KUMONOUE_01_KAKERA, + KUMOUE_02_CAP_0, + KUMOUE_02_AWASE_01, + KUMOUE_02_AWASE_02, + KUMOUE_02_AWASE_03, + KUMOUE_02_AWASE_04, + KUMOUE_02_AWASE_05, + KUMOUE_02_00, + KUMOUE_02_01, + KUMOUE_02_02, + KUMOUE_02_03, + KUMOUE_UNCLE_TALK, + KUMOUE_GIRL_TALK, + KS_A06, + KS_B18, + KS_C21, + KS_C25, + END_1, +} LocalFlags1; + +typedef enum { + BEGIN_2, + BILL05_YADO1F_MATSU_T0, + BILL06_YADO1F_TAKE_T0, + BILL07_YADO1F_UME_T0, + BILL0A_YADO_TAKARA_T0, + SHOUSE_00_T0, + SHOUSE_00_T1, + SHOUSE_01_T0, + SHOUSE_02_T0, + SHOUSE_02_T1, + SHOUSE_02_T2, + SHOUSE_02_XXXX0, + SHOUSE_02_XXXX1, + SHOUSE_02_XXXX2, + SHOUSE_03_T0, + SHOUSE_03_T1, + KOBITOANA_06_T0, + KOBITOANA_03_T0, + KOBITOANA_07_T0, + KOBITOANA_09_T0, + KOBITOANA_0A_T0, + KOBITOANA_0B_T0, + MHOUSE11_T0, + URO_08_T0, + URO_0A_T0, + URO_0B_T0, + BILL00_SHICHOU_00, + BILL00_SHICHOU_01, + BILL00_SHICHOU_02, + BILL00_SHICHOU_03, + BILL00_SHICHOU_04, + BILL01_TESSIN_1, + BILL01_TESSIN_2, + BILL01_TESSIN_3, + BILL01_TESSIN_4, + BILL01_TESSIN_5, + BILL01_TESSIN_6, + BILL01_TESSIN_7, + BILL01_TESSIN_8, + BILL09_YADO2F_POEMN, + BILL0A_YADO_TAKARA_00, + BILL0B_SCHOOLL_00, + BILL0C_SCHOOLR_00, + MHOUSE00_00, + MHOUSE00_01, + MHOUSE00_02, + MHOUSE00_03, + MHOUSE00_04, + MHOUSE00_05, + MHOUSE01_00, + MHOUSE01_01, + MHOUSE01_02, + MHOUSE01_03, + MHOUSE03_00, + MHOUSE03_01, + MHOUSE04_00, + MHOUSE04_01, + MHOUSE04_02, + MHOUSE04_03, + MHOUSE04_04, + MHOUSE06_00, + MHOUSE07_00, + MHOUSE07_01, + MHOUSE08_00, + MHOUSE08_01, + MHOUSE08_02, + MHOUSE08_03, + MHOUSE08_04, + MHOUSE0C_00, + MHOUSE14_00, + MHOUSE15_OP1ST, + MHOUSE2_00_00, + MHOUSE2_00_01, + MHOUSE2_00_02, + MHOUSE2_00_03, + MHOUSE2_01_T0, + MHOUSE2_02_KAME, + MHOUSE2_02_KEY, + MHOUSE2_03_00, + MHOUSE2_05_00, + SHOP00_ITEM_00, + SHOP00_ITEM_01, + SHOP00_ITEM_02, + SHOP00_ITEM_03, + SHOP00_ITEM_04, + SHOP00_SAIFU, + SHOP00_YAZUTSU, + SHOP01_CAFE_00, + SHOP01_CAFE_01, + SHOP01_TALK, + HOUSE_XXXXX, + SHOP03_PAN_1ST, + SHOP07_TALK1ST, + SHOP07_GACHAPON, + SHOP07_TANA, + SHOP07_COMPLETE, + SHOP02_KUTSU_00, + NPC37_REM_TALK1ST, + NPC37_REM_SLEEP, + SORA_ELDER_RECOVER, + SORA_CHIEF_TALK, + SORA_ELDER_TALK1ST, + SORA_ELDER_TALK2ND, + NPC06_19GUY_QUESTION, + NPC06_19GUY_ANSWER, + DANPEI_TALK1ST, + MIZUKAKI_KOBITO, + MIZUKAKI_HINT1, + MIZUKAKI_BOOK1_FALL, + MIZUKAKI_HINT2, + MIZUKAKI_HINT2_2ND, + MIZUKAKI_BOOK2_FALL, + MIZUKAKI_HINT3, + MIZUKAKI_HINT3_MAYOR, + MIZUKAKI_BOOK3_FALL, + MIZUKAKI_BOOK_ALLBACK, + MIZUKAKI_STAIR, + MIZUKAKI_STAIR_WARP_OK, + KHOUSE27_00, + NO_USE_00, + KHOUSE51_00, + NO_USE_01, + KHOUSE51_02, + KHOUSE42_00, + NO_USE_02, + NO_USE_03, + OYAKATA_DEMO, + YAMAKOBITO_OPEN, + M_PRIEST_TALK, + M_ELDER_TALK1ST, + M_PRIEST_MOVE, + M_ELDER_TALK2ND, + MHOUSE04_DANRO, + MHOUSE06_DANRO, + URO_POEMN_TALK, + MHOUSE06_MES_20, + MHOUSE07_MES_20, + MAYOR_2_TALK1ST, + MAYOR_4_TALK1ST, + BILL01_TESSIN_RESERVED, + BILL01_TESSIN_BRANDNEW, + KOBITO_MORI_1ST, + KOBITO_YAMA_ENTER, + KHOUSE52_KINOKO, + SORA_YAKATA_ENTER, + YADO_CHECKIN, + MINIGAME_GAMEEND, + MINIGAME_LEVEL2, + MHOUSE_DIN_TALK, + MHOUSE_NAYRU_TALK, + MHOUSE_FARORE_TALK, + URO_12_H0, + URO_19_H0, + URO_1F_H0, + BILL09_TSW0, + BILL09_TSW1, + KHOUSE41_TALK1ST, + TAIMA_SAIBAI_1ST, + IZUMI_00_FAIRY, + IZUMI_01_FAIRY, + IZUMI_02_FAIRY, + BILL0B_DOUZOU_L, + BILL0B_DOUZOU_R, + KOBITOANA_08_T0, + KOBITOANA_0C_T0, + KOBITOANA_0D_T0, + KOBITOHOUSE_23_H0, + MHOUSE08_DANRO, + MHOUSE09_DANRO, + MHOUSE0A_DANRO, + MHOUSE0B_DANRO, + MHOUSE0C_DANRO, + MHOUSE12_DANRO, + SORA_DANRO, + MIZUKAKI_HINT3_MAP, + LEFT_TALK, + KHOUSE26_REMOCON, + SORA_KIDS_MOVE, + KOBITOANA_00_T0, + KHOUSE23_TALK1ST, + SHOP05_ELEMENT_H00, + SHOP05_ELEMENT_T00, + SHOP05_ELEMENT_T01, + SHOP05_ELEMENT_T02, + BILL0a_YADO_TAKARA_H00, + KOBITOYAMA_00_R00, + KOBITOYAMA_00_R01, + KOBITOYAMA_00_R02, + KOBITOYAMA_00_R03, + KOBITOYAMA_00_R04, + KOBITOYAMA_00_R05, + KOBITOYAMA_00_R06, + KOBITOYAMA_00_R07, + KOBITO_MORI_00_H00, + KOBITO_MORI_00_H0, + CAFE_01_CAP_0, + BILL_00_CAP_0, + BILL_02_CAP_0, + MHOUSE_07_CAP_0, + MHOUSE_07_CAP_1, + MHOUSE_10_CAP_0, + MHOUSE_15_CAP_0, + MHOUSE_15_CAP_1, + SHOP_03_CAP_0, + MHOUSE_07_CAP_2, + SHOP00_BOMBBAG, + CAFE_01_CAP_1, + KS_A02, + KS_A09, + KS_A18, + KS_B07, + KS_B16, + END_2, +} LocalFlags2; + +typedef enum { + BEGIN_3, + MAROYA_TAKARA, + MACHI_CHIKA_00_00, + MACHI_CHIKA_00_01, + MACHI_CHIKA_00_02, + MACHI_CHIKA_00_03, + MACHI_CHIKA_00_T0, + MACHI_CHIKA_00_T1, + MACHI_CHIKA_00_T2, + MACHI_CHIKA_00_T3, + MACHI_CHIKA_00_T4, + MACHI_CHIKA2_00_T0, + MACHI_CHIKA2_01_T0, + MACHI_CHIKA2_03_00, + MACHI_CHIKA2_03_01, + MACHI_CHIKA2_03_T0, + MACHI_CHIKA2_04_T0, + MACHI_CHIKA2_10_00, + MACHI_CHIKA2_10_01, + MACHI_CHIKA2_10_02, + MACHI_CHIKA2_10_T0, + MACHI_CHIKA2_12_T0, + LV4_HAKA_05_T0, + LV4_HAKA_04_T0, + LV4_HAKA_04_T1, + LV4_HAKA_01_00, + LV4_HAKA_01_01, + LV4_HAKA_03_00, + LV4_HAKA_04_R0, + LV4_HAKA_04_R1, + LV4_HAKA_04_R2, + LV4_HAKA_04_R3, + LV4_HAKA_04_R4, + LV4_HAKA_04_R5, + LV4_HAKA_04_R6, + LV4_HAKA_04_R8, + LV4_HAKA_04_R9, + LV4_HAKA_04_R10, + LV4_HAKA_04_R11, + LV4_HAKA_04_KB0, + LV4_HAKA_04_KB1, + LV4_HAKA_05_H0, + LV4_HAKA_05_H1, + LV4_HAKA_05_H2, + LV4_HAKA_05_H3, + OUBO_02_BW0, + OUBO_02_BW1, + OUBO_06_BW0, + OUBO_06_BW1, + OUBO_07_ENTER, + OUBO_KAKERA, + MOGURA_00_T0, + MOGURA_00_T1, + MOGURA_00_T2, + MOGURA_01_T0, + MOGURA_02_T0, + MOGURA_02_T1, + MOGURA_02_T2, + MOGURA_02_T3, + MOGURA_02_T4, + MOGURA_02_T5, + MOGURA_02_T6, + MOGURA_02_T7, + MOGURA_02_T8, + MOGURA_09_T0, + MOGURA_09_T1, + MOGURA_10_T0, + MOGURA_10_T1, + MOGURA_10_T2, + MOGURA_1c_T0, + MOGURA_21_r0, + MOGURA_27_T0, + MOGURA_27_T1, + MOGURA_27_T2, + MOGURA_41_T0, + MOGURA_41_T1, + MOGURA_41_T2, + MOGURA_41_T3, + MOGURA_50_00, + MOGURA_50_T0, + MOGURA_51_T0, + MOGURA_51_T1, + MOGURA_51_T2, + MOGURA_51_00, + MOGURA_51_01, + MOGURA_51_02, + MOGURA_51_03, + MOGURA_51_04, + MOGURA_51_05, + MOGURA_51_06, + MOGURA_51_07, + MOGURA_51_08, + MOGURA_52_00, + MOGURA_52_T0, + MOGURA_52_T1, + MOGURA_53_00, + MOGURA_53_T0, + MOGURA_53_T1, + MOGURA_53_WALK, + MOGURA_54_00, + MOGURA_54_01, + MOGURA_54_02, + MOGURA_54_WALK, + AMOS_00_00, + AMOS_01_00, + AMOS_02_00, + AMOS_03_00, + AMOS_04_00, + AMOS_05_00, + AMOS_06_00, + AMOS_07_00, + AMOS_08_00, + AMOS_09_00, + AMOS_0A_00, + AMOS_0B_00, + AMOS_0C_00, + AMOS_0D_00, + AMOS_0E_00, + AMOS_0F_00, + HARI_01_T0, + SEIIKI_STAINED_GLASS, + SEIIKI_ENTER, + SEIIKI_SWORD_1ST, + SEIIKI_SWORD_2ND, + SEIIKI_SWORD_3RD, + SEIIKI_BUNSHIN, + BAGUZU_MORI_02_00, + BAGUZU_MORI_02_T0, + BAGUZU_MORI_02_T1, + BAGUZU_MORI_02_T2, + CHIKATSURO_01_BW00, + SORA_10_H00, + SORA_11_H00, + SORA_11_T00, + SORA_11_T01, + SORA_12_T00, + SORA_13_H00, + SORA_13_T00, + SORA_13_T01, + SORA_14_T00, + SORA_14_R00, + SORA_14_R01, + SORA_14_R02, + SORA_14_R03, + SORA_14_R04, + SORA_14_R05, + SORA_14_R06, + SORA_14_R07, + IZUMIGARE_00_H00, + IZUMIGARE_00_H01, + SORA_10_R00, + SORA_10_R01, + SORA_10_R02, + SORA_10_R03, + SORA_10_R04, + SORA_10_R05, + SORA_10_R06, + SORA_10_R07, + SORA_14_R08, + SORA_14_R09, + SORA_14_R0a, + SORA_14_R0b, + SORA_14_R0c, + SORA_14_R0d, + SORA_14_R0e, + SORA_14_R0f, + KAKERA_TAKARA_B, + KAKERA_TAKARA_C, + KAKERA_TAKARA_D, + KAKERA_TAKARA_F, + KAKERA_TAKARA_G, + KAKERA_TAKARA_H, + KAKERA_TAKARA_I, + KAKERA_TAKARA_XXXX, + TESTMAP00_00, + TESTMAP01_00, + TESTMAP01_01, + TESTMAP02_00, + LV4_HAKA_08_T0, + LV4_HAKA_07_00, + LV4_HAKA_04_00, + LV4_HAKA_04_01, + LV4_HAKA_04_K0, + LV4_HAKA_04_K1, + LV4_HAKA_01_02, + LV4_HAKA_08_XX, + BAGUZU_MORI_03_H00, + MOGURAU_00_H00, + HARI_01_H00, + HARI_03_T00, + MACHI_CHIKA2_00_CAP_0, + MACHI_CHIKA2_11_CAP_0, + LV4_HAKA_08_CAP_0, + BAGUZUIWA_02_CAP_0, + MACHI_CHIKA2_01_CAP_0, + MACHI_CHIKA2_01_HK, + LV4_HAKA_08_B0, + LV4_HAKA_08_K0, + MAROYA_1ST, + MACHI_CHIKA2_10_CAP_0, + KS_C02, + END_3, +} LocalFlags3; + +typedef enum { + BEGIN_4, + DOUKUTU_00_T0, + DOUKUTU_00_T1, + DOUKUTU_05_EVENT, + SOUGEN_DOUKUTU_00_T0, + SOUGEN_DOUKUTU_00_T1, + SOUGEN_DOUKUTU_00_T2, + SOUGEN_DOUKUTU_00_T3, + SOUGEN_DOUKUTU_00_T4, + SOUGEN_DOUKUTU_00_SW0, + SOUGEN_DOUKUTU_00_SW1, + SOUGEN_DOUKUTU_00_SW2, + SOUGEN_DOUKUTU_00_SW3, + SOUGEN_DOUKUTU_07_T0, + SOUGEN_DOUKUTU_0B_T0, + SOUGEN_DOUKUTU_0C_T0, + SOUGEN_DOUKUTU_0C_BW00, + SOUGEN_DOUKUTU_0D_00, + SOUGEN_DOUKUTU_0D_T0, + SOUGEN_DOUKUTU_0E_BW00, + SOUGEN_DOUKUTU_0F_T00, + SOUGEN_DOUKUTU_10_R00, + SOUGEN_DOUKUTU_10_R01, + SOUGEN_DOUKUTU_10_R02, + SOUGEN_DOUKUTU_10_R03, + SOUGEN_DOUKUTU_10_R04, + SOUGEN_DOUKUTU_10_R05, + SOUGEN_DOUKUTU_10_R06, + SOUGEN_DOUKUTU_10_R07, + SOUGEN_DOUKUTU_10_R08, + SOUGEN_DOUKUTU_10_R09, + SOUGEN_DOUKUTU_10_R0A, + SOUGEN_DOUKUTU_10_R0B, + SOUGEN_DOUKUTU_10_R0C, + SOUGEN_DOUKUTU_10_R0D, + SOUGEN_DOUKUTU_10_R0E, + SOUGEN_DOUKUTU_11_R00, + SOUGEN_DOUKUTU_11_R01, + SOUGEN_DOUKUTU_11_R02, + SOUGEN_DOUKUTU_11_R03, + SOUGEN_DOUKUTU_11_R04, + SOUGEN_DOUKUTU_11_R05, + SOUGEN_DOUKUTU_11_R06, + SOUGEN_DOUKUTU_11_R07, + SOUGEN_DOUKUTU_11_R08, + SOUGEN_DOUKUTU_11_R09, + SOUGEN_DOUKUTU_11_R0A, + SOUGEN_DOUKUTU_11_R0B, + SOUGEN_DOUKUTU_11_R0C, + SOUGEN_DOUKUTU_11_R0D, + SOUGEN_DOUKUTU_11_R0E, + SOUGEN_DOUKUTU_13_T0, + HIKYOU_DOUKUTU0_00_T0, + HIKYOU_DOUKUTU0_01_T0, + HIKYOU_DOUKUTU0_01_T1, + HIKYOU_DOUKUTU0_02_KAIGARA, + HIKYOU_DOUKUTU0_04_H00, + HIKYOU_DOUKUTU1_00_00, + HIKYOU_DOUKUTU1_00_T0, + YAMADOUKUTU_01_00, + YAMADOUKUTU_02_00, + YAMADOUKUTU_03_T0, + YAMADOUKUTU_06_H0, + YAMADOUKUTU_07_T0, + YAMADOUKUTU_08_h0, + YAMADOUKUTU_08_h1, + YAMADOUKUTU_08_h2, + YAMADOUKUTU_09_r0, + YAMADOUKUTU_09_r1, + YAMADOUKUTU_09_r2, + YAMADOUKUTU_0F_00, + YAMADOUKUTU_10_00, + SUIGEN_DOUKUTU_00_T0, + SUIGEN_DOUKUTU_01_BW00, + SUIGEN_DOUKUTU_02_T0, + SUIGEN_DOUKUTU_04_BW00, + SUIGEN_DOUKUTU_05_T0, + SUIGEN_DOUKUTU_08_R0, + SUIGEN_DOUKUTU_08_R1, + SUIGEN_DOUKUTU_08_R2, + SUIGEN_DOUKUTU_08_R3, + SUIGEN_DOUKUTU_08_R4, + SUIGEN_DOUKUTU_08_R5, + SUIGEN_DOUKUTU_08_R6, + SUIGEN_DOUKUTU_08_R7, + SUIGEN_DOUKUTU_08_R8, + SUIGEN_DOUKUTU_08_R9, + SUIGEN_DOUKUTU_08_R10, + SUIGEN_DOUKUTU_08_R11, + SUIGEN_DOUKUTU_08_R12, + SUIGEN_DOUKUTU_08_R13, + SUIGEN_DOUKUTU_08_R14, + SUIGEN_DOUKUTU_09_H00, + HAKA_DOUKUTU_00_H0, + HAKA_DOUKUTU_01_T0, + HAKA_DOUKUTU_01_GEENE, + KOBITO_DOUKUTU_00_T0, + KOBITO_DOUKUTU_02_T0, + KOBITO_DOUKUTU_05_T0, + KOBITO_SHIRO_DOUKUTU_00_H0, + KOBITO_SHIRO_DOUKUTU_00_T0, + KOBITO_SHIRO_DOUKUTU_01_T0, + KOBITO_URA_DOUKUTU_00_T0, + KOBITO_URA_DOUKUTU_01_T0, + GORON_DOUKUTU_APPEAR, + KOBITO_DOUKUTU_03_T0, + HIKYOU_DOUKUTU0_01_AKINDO, + SOUGEN_DOUKUTU_14_AKINDO, + SOUGEN_DOUKUTU_17_AKINDO, + YAMADOUKUTU_04_AKINDO, + YAMADOUKUTU_0D_AKINDO, + YAMADOUKUTU_0F_AKINDO, + YAMADOUKUTU_0E_SENNIN, + KOBITO_DOUKUTU_04_T0, + KOBITO_DOUKUTU_07_T0, + KOBITO_DOUKUTU_09_T0, + KOBITO_DOUKUTU_09_T1, + KOBITO_DOUKUTU_09_T2, + GORON_DOUKUTU_01_T0, + GORON_DOUKUTU_01_T1, + GORON_DOUKUTU_01_T2, + GORON_DOUKUTU_01_T3, + KOBITO_DOUKUTU_09_H0, + SOUGEN_DOUKUTU_15_H0, + KOBITO_DOUKUTU_01_H00, + YAMADOUKUTU_05_H00, + KOBITO_DOUKUTU_03_H00, + DOUKUTU_04_H00, + DOUKUTU_00_H00, + KOBITO_DOUKUTU_04_H00, + DOUKUTU_06_H00, + DOUKUTU_05_H00, + KOBITO_DOUKUTU_02_H00, + KOBITO_DOUKUTU_01_T0, + YAMADOUKUTU_04_CAP_0, + KS_B06, + KS_B15, + KS_B01, + KS_B12, + KS_C12, + KS_C37, + END_4, +} LocalFlags4; + +typedef enum { + BEGIN_5, + LV1_00_WALK, + LV1_01_WALK, + LV1_02_WALK, + LV1_03_WALK, + LV1_04_WALK, + LV1_05_WALK, + LV1_06_WALK, + LV1_07_WALK, + LV1_08_WALK, + LV1_09_WALK, + LV1_0A_WALK, + LV1_0B_WALK, + LV1_10_WALK, + LV1_11_WALK, + LV1_12_WALK, + LV1_13_WALK, + LV1_14_WALK, + LV1_15_WALK, + LV1_16_WALK, + LV1_17_WALK, + LV1_TARU_0, + LV1_TARU_1, + LV1_00_00, + LV1_00_01, + LV1_00_02, + LV1_00_03, + LV1_00_T0, + LV1_01_00, + LV1_01_01, + LV1_01_02, + LV1_01_03, + LV1_01_04, + LV1_01_T0, + LV1_01_T1, + LV1_01_T2, + LV1_02_T0, + LV1_03_CAP_0, + LV1_04_02, + LV1_04_T0, + LV1_05_T0, + LV1_05_T1, + LV1_06_03, + LV1_06_T0, + LV1_06_CAP_0, + LV1_07_00, + LV1_07_CAP_0, + LV1_08_00, + LV1_08_KEY, + LV1_09_00, + LV1_0A_00, + LV1_0A_CAP_0, + LV1_0B_01, + LV1_0B_02, + LV1_0B_15, + LV1_0B_CAP_0, + LV1_10_00, + LV1_10_01, + LV1_10_02, + LV1_10_03, + LV1_10_KEY, + LV1_10_T0, + LV1_11_01, + LV1_11_T0, + LV1_12_15, + LV1_12_T0, + LV1_12_T1, + LV1_12_00, + LV1_12_01, + LV1_14_00, + LV1_14_CAP_0, + LV1_16_UTSUWA, + LV1_16_1STEND, + LV1_17_00, + LV1_17_T0, + LV1_02_00, + LV1_02_01, + LV1_10_04, + LV1_20_CAP_0, + LV1_01_HK, + LV1_04_CAP_0, + LV1_03_00, + LV1_05_HK, + LV1_08_01, + LV1_01_05, + LV1_10_CAP_0, + LV1_12_CAP_0, + END_5, +} LocalFlags5; + +typedef enum { + BEGIN_6, + LV2_00_WALK, + LV2_01_WALK, + LV2_02_WALK, + LV2_03_WALK, + LV2_04_WALK, + LV2_05_WALK, + LV2_06_WALK, + LV2_07_WALK, + LV2_08_WALK, + LV2_09_WALK, + LV2_10_WALK, + LV2_11_WALK, + LV2_12_WALK, + LV2_13_WALK, + LV2_14_WALK, + LV2_15_WALK, + LV2_16_WALK, + LV2_17_WALK, + LV2_BOSS_00_WALK, + LV2_00_00, + LV2_00_01, + LV2_01_01, + LV2_01_02, + LV2_01_T0, + LV2_01_T1, + LV2_02_01, + LV2_03_CAP_0, + LV2_04_00, + LV2_04_01, + LV2_04_CAP_0, + LV2_06_00, + LV2_06_T0, + LV2_06_CAP_0, + LV2_07_00, + LV2_07_CAP_0, + LV2_08_00, + LV2_08_01, + LV2_08_T0, + LV2_08_T1, + LV2_09_00, + LV2_09_T0, + LV2_09_T1, + LV2_10_00, + LV2_10_T0, + LV2_10_T1, + LV2_11_00, + LV2_11_01, + LV2_14_T0, + LV2_15_01, + LV2_15_T0, + LV2_15_CAP_0, + LV2_16_00, + LV2_17_00, + LV2_17_15, + LV2_17_T0, + LV2_17_T1, + LV2_17_T2, + LV2_20_UTSUWA, + LV2_00_02, + LV2_06_HK, + LV2_11_02, + LV2_05_R1, + LV2_05_R2, + LV2_05_R3, + LV2_05_R4, + LV2_05_R5, + LV2_00_CAP_0, + LV2_09_CAP_0, + END_6, +} LocalFlags6; + +typedef enum { + BEGIN_7, + LV3_00_WALK, + LV3_01_WALK, + LV3_02_WALK, + LV3_03_WALK, + LV3_04_WALK, + LV3_05_WALK, + LV3_06_WALK, + LV3_10_WALK, + LV3_11_WALK, + LV3_12_WALK, + LV3_13_WALK, + LV3_14_WALK, + LV3_15_WALK, + LV3_16_WALK, + LV3_17_WALK, + LV3_18_WALK, + LV3_19_WALK, + LV3_1A_WALK, + LV3_1B_WALK, + LV3_1C_WALK, + LV3_1D_WALK, + LV3_20_WALK, + LV3_21_WALK, + LV3_22_WALK, + LV3_23_WALK, + LV3_24_WALK, + LV3_00_00, + LV3_00_T0, + LV3_02_00, + LV3_02_01, + LV3_02_02, + LV3_02_KEYFALL, + LV3_03_00, + LV3_03_01, + LV3_04_00, + LV3_04_KEYFALL, + LV3_04_WARP_0, + LV3_04_BOSSDOOR, + LV3_10_00, + LV3_11_00, + LV3_12_CAP_0, + LV3_13_00, + LV3_14_00, + LV3_14_01, + LV3_14_02, + LV3_14_KEY, + LV3_15_00, + LV3_17_00, + LV3_16_BOSSDIE, + LV3_16_GETUTSUWA, + LV3_18_00, + LV3_18_00_BW00, + LV3_19_01, + LV3_19_02, + LV3_19_03, + LV3_19_04, + LV3_19_T0, + LV3_1B_T0, + LV3_1D_00, + LV3_1D_01, + LV3_1D_T0, + LV3_1D_T1, + LV3_20_00, + LV3_20_CAP_0, + LV3_22_00, + LV3_23_01, + LV3_23_T0, + LV3_24_T0, + LV3_OCARINA_FALL, + LV3_02_CAP_0, + LV3_24_HK, + LV3_10_01, + LV3_17_01, + END_7, +} LocalFlags7; + +typedef enum { + BEGIN_8, + LV4_00_WALK, + LV4_01_WALK, + LV4_02_WALK, + LV4_03_WALK, + LV4_04_WALK, + LV4_05_WALK, + LV4_06_WALK, + LV4_07_WALK, + LV4_08_WALK, + LV4_09_WALK, + LV4_0A_WALK, + LV4_0B_WALK, + LV4_0C_WALK, + LV4_0D_WALK, + LV4_0E_WALK, + LV4_0F_WALK, + LV4_10_WALK, + LV4_11_WALK, + LV4_20_WALK, + LV4_21_WALK, + LV4_22_WALK, + LV4_23_WALK, + LV4_24_WALK, + LV4_25_WALK, + LV4_26_WALK, + LV4_27_WALK, + LV4_28_WALK, + LV4_29_WALK, + LV4_2A_WALK, + LV4_2B_WALK, + LV4_2C_WALK, + LV4_2D_WALK, + LV4_2E_WALK, + LV4_2F_WALK, + LV4_30_WALK, + LV4_31_WALK, + LV4_32_WALK, + LV4_33_WALK, + LV4_34_WALK, + LV4_35_WALK, + LV4_INIT, + LV4_01_00, + LV4_03_CAP_0, + LV4_03_BOSSDOOR, + LV4_05_00, + LV4_05_01, + LV4_06_00, + LV4_07_00, + LV4_08_00, + LV4_08_01, + LV4_08_02, + LV4_08_RAY_HALF, + LV4_08_RAY_HALF_E, + LV4_08_RAY_FULL, + LV4_08_RAY_FULL_E, + LV4_09_T0, + LV4_0a_TSUBO, + LV4_0a_T0, + LV4_0c_00, + LV4_0d_00, + LV4_0d_01, + LV4_0d_02, + LV4_0d_T0, + LV4_0e_UTSUWA, + LV4_0f_00, + LV4_0f_01, + LV4_0f_02, + LV4_0f_03, + LV4_0f_04, + LV4_10_RAY, + LV4_10_T0, + LV4_10_BOSSDIE, + LV4_11_00, + LV4_11_RAY_SP, + LV4_11_RAY, + LV4_11_T0, + LV4_20_00, + LV4_20_RAY, + LV4_20_BOSSKEY, + LV4_21_00, + LV4_21_RAY, + LV4_21_KEY, + LV4_21_CAP_0, + LV4_22_00, + LV4_23_00, + LV4_24_00, + LV4_27_00, + LV4_28_00, + LV4_28_01, + LV4_28_T0, + LV4_28_T1, + LV4_29_CAP_0, + LV4_2b_T0, + LV4_2b_T1, + LV4_2b_T2, + LV4_2b_BKABE, + LV4_2b_00, + LV4_2b_01, + LV4_2b_02, + LV4_2b_03, + LV4_2b_04, + LV4_2c_00, + LV4_2c_02, + LV4_2c_T0, + LV4_2d_00, + LV4_2d_01, + LV4_2d_02, + LV4_2e_RAY, + LV4_2f_00, + LV4_2f_01, + LV4_2f_KEY, + LV4_30_00, + LV4_30_BKABE, + LV4_31_00, + LV4_31_01, + LV4_32_00, + LV4_32_01, + LV4_32_T0, + LV4_32_T1, + LV4_33_01, + LV4_34_00, + LV4_34_01, + LV4_35_00, + LV4_35_01, + LV4_22_01, + LV4_2d_T0, + LV4_03_CAP_1, + LV4_08_CAP_0, + LV4_08_CAP_1, + LV4_36_WALK, + LV4_36_T0, + LV4_21_CAP_1, + LV4_0d_03, + LV4_0d_04, + LV4_0d_05, + LV4_0d_06, + LV4_0d_07, + LV4_25_00, + LV4_25_01, + LV4_25_02, + LV4_25_03, + LV4_25_04, + LV4_31_02, + LV4_31_03, + LV4_31_04, + LV4_31_05, + LV4_31_06, + LV4_31_07, + LV4_06_01, + LV4_06_02, + LV4_06_03, + LV4_06_04, + LV4_06_05, + LV4_06_06, + LV4_08_OCT, + LV4_05_02, + LV4_28_02, + LV4_2c_01, + LV4_33_02, + LV4_31_08, + LV4_34_02, + LV4_20_RAY_SW, + LV4_21_RAY_SW, + END_8, +} LocalFlags8; + +typedef enum { + BEGIN_9, + LV5_00_WALK, + LV5_01_WALK, + LV5_02_WALK, + LV5_03_WALK, + LV5_04_WALK, + LV5_05_WALK, + LV5_06_WALK, + LV5_07_WALK, + LV5_08_WALK, + LV5_09_WALK, + LV5_0A_WALK, + LV5_0B_WALK, + LV5_0C_WALK, + LV5_0D_WALK, + LV5_0E_WALK, + LV5_0F_WALK, + LV5_10_WALK, + LV5_11_WALK, + LV5_12_WALK, + LV5_13_WALK, + LV5_14_WALK, + LV5_15_WALK, + LV5_16_WALK, + LV5_17_WALK, + LV5_18_WALK, + LV5_19_WALK, + LV5_1A_WALK, + LV5_1B_WALK, + LV5_1C_WALK, + LV5_1D_WALK, + LV5_1E_WALK, + LV5_1F_WALK, + LV5_20_WALK, + LV5_21_WALK, + LV5_22_WALK, + LV5_23_WALK, + LV5_24_WALK, + LV5_25_WALK, + LV5_26_WALK, + LV5_27_WALK, + LV5_28_WALK, + LV5_29_WALK, + LV5_2A_WALK, + LV5_2B_WALK, + LV5_2C_WALK, + LV5_2D_WALK, + LV5_2E_WALK, + LV5_2F_WALK, + LV5_30_WALK, + LV5_31_WALK, + LV5_32_WALK, + LV5_01_T0, + LV5_03_T0, + LV5_03_BOSSDOOR, + LV5_04_T0, + LV5_05_00, + LV5_05_01, + LV5_05_02, + LV5_06_00, + LV5_07_00, + LV5_07_01, + LV5_07_T0, + LV5_08_00, + LV5_08_01, + LV5_08_KEY, + LV5_08_BOSSDOOR, + LV5_0b_B0, + LV5_0b_B1, + LV5_0d_00, + LV5_0e_00, + LV5_0f_T0, + LV5_0f_T1, + LV5_10_T0, + LV5_15_00, + LV5_15_01, + LV5_15_02, + LV5_15_03, + LV5_15_04, + LV5_15_T0, + LV5_15_B0, + LV5_15_B1, + LV5_1a_00, + LV5_1a_01, + LV5_1b_00, + LV5_1b_T0, + LV5_1c_00, + LV5_1c_T0, + LV5_20_00, + LV5_20_01, + LV5_21_00, + LV5_21_01, + LV5_21_02, + LV5_21_03, + LV5_21_04, + LV5_21_05, + LV5_21_06, + LV5_21_07, + LV5_21_08, + LV5_21_09, + LV5_21_0a, + LV5_21_CAP_0, + LV5_22_00, + LV5_22_01, + LV5_22_CAP_0, + LV5_23_00, + LV5_23_01, + LV5_27_00, + LV5_29_00, + LV5_29_01, + LV5_29_T0, + LV5_2b_T0, + LV5_2c_00, + LV5_2c_01, + LV5_2c_02, + LV5_2c_03, + LV5_2c_T0, + LV5_2c_CAP_0, + LV5_2d_T0, + LV5_31_CAP_0, + LV5_32_CAP_0, + LV5_32_T0, + LV5_32_T1, + LV5_BOSSDIE, + LV5_MBOSSDIE, + LV5_00_UTSUWA, + LV5_0c_00, + LV5_0A_CAP_0, + LV5_0f_HK, + LV5_05_03, + LV5_08_02, + LV5_0c_01, + LV5_0c_02, + LV5_22_02, + LV5_15_05, + LV5_20_02, + END_9, +} LocalFlags9; + +typedef enum { + BEGIN_10, + LV6_00_WALK, + LV6_01_WALK, + LV6_02_WALK, + LV6_03_WALK, + LV6_04_WALK, + LV6_05_WALK, + LV6_06_WALK, + LV6_07_WALK, + LV6_08_WALK, + LV6_09_WALK, + LV6_0A_WALK, + LV6_0B_WALK, + LV6_0C_WALK, + LV6_0D_WALK, + LV6_0E_WALK, + LV6_0F_WALK, + LV6_10_WALK, + LV6_11_WALK, + LV6_12_WALK, + LV6_13_WALK, + LV6_14_WALK, + LV6_15_WALK, + LV6_16_WALK, + LV6_17_WALK, + LV6_18_WALK, + LV6_19_WALK, + LV6_1A_WALK, + LV6_1B_WALK, + LV6_1C_WALK, + LV6_1D_WALK, + LV6_1E_WALK, + LV6_1F_WALK, + LV6_20_WALK, + LV6_21_WALK, + LV6_22_WALK, + LV6_23_WALK, + LV6_24_WALK, + LV6_25_WALK, + LV6_26_WALK, + LV6_27_WALK, + LV6_28_WALK, + LV6_29_WALK, + LV6_2A_WALK, + LV6_2B_WALK, + LV6_2C_WALK, + LV6_2D_WALK, + LV6_2E_WALK, + LV6_2F_WALK, + LV6_30_WALK, + LV6_31_WALK, + LV6_32_WALK, + LV6_33_WALK, + LV6_34_WALK, + LV6_35_WALK, + LV6_36_WALK, + LV6_37_WALK, + LV6_38_WALK, + LV6_39_WALK, + LV6_3A_WALK, + LV6_3B_WALK, + LV6_00_00, + LV6_01_T0, + LV6_02_T0, + LV6_03_T0, + LV6_04_T0, + LV6_07_00, + LV6_09_T0, + LV6_09_KB0, + LV6_09_KB1, + LV6_09_KB2, + LV6_09_KB3, + LV6_0a_01, + LV6_0b_00, + LV6_0c_00, + LV6_0c_01, + LV6_0e_00, + LV6_10_00, + LV6_11_00, + LV6_11_01, + LV6_11_B0, + LV6_11_B1, + LV6_11_B2, + LV6_13_00, + LV6_14_00, + LV6_14_BOSSDOOR, + LV6_15_00, + LV6_16_00, + LV6_17_00, + LV6_17_01, + LV6_18_00, + LV6_1a_00, + LV6_1c_CAP_0, + LV6_1d_00, + LV6_1f_00, + LV6_20_T0, + LV6_24_00, + LV6_26_00, + LV6_26_01, + LV6_26_CAP_0, + LV6_27_00, + LV6_27_T0, + LV6_30_00, + LV6_32_00, + LV6_34_00, + LV6_34_01, + LV6_35_00, + LV6_37_T0, + LV6_39_00, + LV6_39_01, + LV6_39_02, + LV6_1f_CHAIR_L, + LV6_1f_CHAIR_R, + LV6_1d_KEYGET, + LV6_1b_TAREMAKU, + LV6SOTO_01_KAIJO, + LV6_SEKIKA_END, + LV6_GUFUU1_FIGURE, + LV6_GUFUU2_FIGURE, + LV6_GUFUU1_GISHIKI, + LV6_GUFUU1_DEMO, + LV6_ZELDA_DISCURSE, + LV6_00_ESCAPE, + LV6_GUFUU2_DEAD, + LV6_KANE_START, + LV6_KANE_1ST, + LV6_KANE_2ND, + LV6_SOTO_ENDING, + LV6_08_00, + LV6_39_03, + LV6_SOTO_06_00, + LV6_SOTO_06_01, + LV6_0A_CAP_0, + LV6SOTO_01_CAP_0, + LV6_0a_00, + LV6_0b_01, + LV6_0e_01, + LV6_10_01, + LV6_13_01, + LV6_14_01, + LV6_15_01, + LV6_1a_01, + LV6_1f_01, + LV6_39_04, + LV6_17_02, + LV6_18_01, + LV6_08_01, + LV6_SOTO_01_00, + LV6_SOTO_01_01, + LV6_SOTO_01_02, + LV6_39_KING, + END_10, +} LocalFlags10; + +typedef enum { + BEGIN_11, + END_11, +} LocalFlags11; + +typedef enum { + BEGIN_12, + END_12, +} LocalFlags12; + #endif diff --git a/include/functions.h b/include/functions.h index 45e0f294..cc9b7d45 100644 --- a/include/functions.h +++ b/include/functions.h @@ -9,6 +9,7 @@ #include "player.h" #include "room.h" #include "structures.h" +#include "script.h" // Identified - to be sorted into header files extern void ShowNPCDialogue(Entity*, Dialog*); @@ -42,7 +43,22 @@ extern void ResetPlayer(void); extern u32 IsItemEquipped(u32); extern void DeleteManager(Manager*); extern bool32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY); +extern Entity* CreateProjectileWithParent(Entity*, u8, u8); +extern u32 GetBottleContaining(u32); extern u32 GetTileTypeByEntity(Entity*); +extern u32 GetSaleItemConfirmMessageID(u32); +extern void FlushSprites(void); +extern void DispReset(u32); +extern void InitSoundPlayingInfo(void); +extern void InitDMA(void); +extern Entity* CreateProjectile(u32); +extern void RegisterPlayerHitbox(); +extern s32 GetItemPrice(); +extern void DoExitTransition(ScreenTransitionData*); +extern void CreateDustAt(u32, u32, u32); +extern void PutItemOnSlot(u32 itemID); +extern void CreateSpeechBubbleSleep(Entity*, u32, u32); +extern u32 CheckPlayerProximity(u32, u32, u32, u32); // Unidentified extern u32 sub_0806ED78(Entity*); @@ -80,8 +96,6 @@ extern u32 sub_08049FA0(Entity*); extern u32 sub_08049FDC(Entity*, u32); extern u32 sub_080041A0(Entity*, Entity*, u32, u32); extern u32 sub_08049EE4(Entity*); -extern Entity* CreateProjectileWithParent(Entity*, u8, u8); -extern u32 GetBottleContaining(u32); extern void sub_08077E54(ItemBehavior*); extern void sub_080042BA(Entity*, u32); extern bool32 sub_08077F24(ItemBehavior*, u32); @@ -92,7 +106,6 @@ extern s32 sub_0807887C(Entity*, u32, u32); extern s32 sub_08078904(); extern void sub_0805E5A8(void); extern void sub_0805E5C0(void); -extern void FlushSprites(void); extern void sub_080AD9B0(void); extern void sub_080AD918(void); extern void sub_0801E104(void); @@ -118,7 +131,6 @@ extern u32 sub_08060354(void); extern void sub_08057E64(void); extern void sub_0809F814(u32); extern void sub_080300E8(void); -extern void DispReset(u32); extern void sub_08058D34(void); extern void sub_0807AABC(Entity*); extern void sub_08078A90(u32); @@ -142,7 +154,6 @@ extern void sub_080AF2E4(void); extern void sub_0804F578(void); extern void sub_08059994(void); extern s32 sub_0801CFA8(u32); -extern void InitSoundPlayingInfo(void); extern void sub_080ADA14(u32, u32); // trampoline to sub_080B27F4 extern void sub_0801E1B8(u32, u32); extern void sub_0801E1EC(s32, s32, s32); @@ -171,7 +182,6 @@ extern void sub_0807A108(void); extern u32 sub_0801766C(Entity*); extern void sub_08004168(Entity*); extern u32 sub_08052638(u32); -extern void InitDMA(void); extern void sub_08056208(void); extern void sub_08050384(); extern u32 sub_0806F520(); @@ -181,7 +191,6 @@ extern void sub_0804A7D4(Entity*); extern void sub_08033744(Entity*); extern void sub_0800417E(Entity*, u32); extern void sub_080784C8(); -extern void RegisterPlayerHitbox(); extern u32 sub_0808288C(Entity*, u32, u32, u32); extern void sub_0806FDA0(Entity*); extern void sub_080AE008(Entity*, u32, u32); @@ -227,7 +236,6 @@ extern u32 sub_0805F7A0(u32); extern u32* sub_0805F25C(u32); extern u32 sub_080045DA(s32, s32); u32 sub_0806FCB8(Entity*, u32, u32, u32); -extern Entity* CreateProjectile(u32); extern void sub_080A1D70(Entity*, u32); extern void sub_0806F62C(Entity*, u32, u32); extern void sub_080A1ED0(u32, u32, u32); @@ -241,7 +249,6 @@ extern u32 sub_08052734(); // has Dungeon Map? extern u32 sub_08052764(); // has Dungeon Compass? extern u32 sub_0805279C(); // has Dungeon Big Key? extern u32 sub_080527CC(); // num Dungeon small keys? -extern u32 GetItemPrice(); extern void sub_08078790(Entity*, u32); extern void sub_080788E0(Entity*); extern void sub_08078AA8(u32, u32); @@ -253,7 +260,7 @@ extern u32 sub_08079D48(); extern u32 sub_08008B22(); extern void sub_080791BC9(); extern void sub_080791BC(); -extern void sub_08056360(); +extern void MessageClose(); extern u32 sub_080542AC(u32); extern u32 sub_08079FC4(u32); extern void sub_0800455E(Entity*); @@ -262,12 +269,16 @@ extern void sub_0804ACF8(); extern void sub_08073904(Entity*); extern u32 sub_08056134(void); extern void sub_08004484(Entity*, Entity*); -extern void sub_080564C8(u32); -extern void sub_0805EEB4(u8*, u32); -extern void sub_08056BDC(u32); -extern void sub_08056F88(u32, u32); extern void sub_0805F8E4(u32 r0, WStruct* r1); -extern void DoExitTransition(ScreenTransitionData*); +extern u32 sub_08002632(Entity*); +extern void sub_0807879C(Entity*); +extern void sub_080787C0(Entity*); +extern void sub_080787B4(Entity*); +extern void sub_0808C650(Entity*, u32); +extern u32 sub_0808C67C(void); +extern void sub_0808C688(void); +extern void sub_0805E4A0(Entity*); +extern void sub_0805E4CC(Entity*); extern Entity* sub_08077C94(ItemBehavior*, u32); extern Entity* sub_08077C0C(ItemBehavior*, u32); @@ -283,7 +294,6 @@ extern void sub_08078E84(Entity*, Entity*); extern void sub_080042D0(Entity*, u32, u16); extern u32 sub_080002A8(u32, u32, u32); -extern void CreateDustAt(u32, u32, u32); extern void sub_080806BC(u32, u32, u32, u32); extern void sub_080186C0(u32); diff --git a/include/main.h b/include/main.h index 679fd35f..b358ba49 100644 --- a/include/main.h +++ b/include/main.h @@ -88,8 +88,7 @@ extern void sub_080ADD30(void); extern void DoSoftReset(void); extern void sub_08056260(void); extern void VBlankIntrWait(); -extern void MessageUpdate(void); -extern void sub_08050154(void); +extern void UpdateFade(void); extern u8 gUnk_03003DE4; diff --git a/include/player.h b/include/player.h index c4ef0f0f..11d91234 100644 --- a/include/player.h +++ b/include/player.h @@ -67,24 +67,20 @@ typedef struct { /*0x26*/ u8 swimState; /*0x27*/ u8 field_0x27[5]; /*0x2c*/ u8* field_0x2c; - /*0x30*/ union { - /* */ u32 all; - /* */ struct { - /* */ u32 unk1 : 1; - /* */ u32 unk2 : 1; - /* */ u32 unk4 : 1; - /* */ u32 noMinishCap : 1; - /* */ u32 pullingState : 1; - /* */ u32 windyState : 1; - /* */ u32 filler6 : 1; - /* */ u32 unk7 : 1; - /* */ u32 unk8 : 1; - /* */ u32 unk9 : 1; - /* */ u32 slipperyState : 1; - /* */ u32 filler11 : 5; - /* */ u32 filler11b : 16; - /* */ } PACKED b; - /* */ } flags; + /*0x30*/ u32 flags; + /* unk1 : 1; */ + /* unk2 : 1; */ + /* unk4 : 1; */ + /* noMinishCap : 1; */ + /* pullingState : 1; */ + /* windyState : 1; */ + /* filler6 : 1; */ + /* unk7 : 1; */ + /* unk8 : 1; */ + /* unk9 : 1; */ + /* slipperyState : 1; */ + /* filler11 : 5; */ + /* filler11b : 16; */ /*0x34*/ u8 field_0x34[2]; /*0x36*/ s16 field_0x36; /*0x38*/ u8 field_0x38; diff --git a/include/room.h b/include/room.h index f34f7297..b030d8e0 100644 --- a/include/room.h +++ b/include/room.h @@ -24,7 +24,9 @@ typedef struct { /*0x0E*/ u8 unk5; /*0x0F*/ u8 unk6; /*0x10*/ u8 unk_10; - /*0x11*/ u8 filler[3]; + /*0x11*/ s8 oam_offset_x; + /*0x12*/ s8 oam_offset_y; + /*0x13*/ u8 unk13; /*0x14*/ u8 screenShakeMagnitude; /*0x15*/ u8 unk7; /*0x16*/ u16 screenShakeTime; diff --git a/include/save.h b/include/save.h index dbb2b6b3..adfb7f45 100644 --- a/include/save.h +++ b/include/save.h @@ -22,7 +22,8 @@ typedef enum { extern SaveResult HandleSave(u32 arg0); typedef struct { - /*0x000*/ u8 filler0[0x2]; + /*0x000*/ u8 unk_00; + /*0x000*/ u8 unk_01; /*0x002*/ u8 messageSpeed; /*0x003*/ u8 brightnessPref; /*0x004*/ u8 filler4[0x2]; @@ -35,14 +36,24 @@ typedef struct { /*0x050*/ u32 unk50; /*0x054*/ u8 filler54[0x2C]; /*0x080*/ u8 playerName[FILENAME_LENGTH]; - /*0x086*/ u8 filler86[0x22]; + /*0x086*/ u8 filler86[0x2]; + /*0x088*/ u8 unk_88; + /*0x089*/ u8 unk_89; + /*0x08A*/ u8 unk_8A; + /*0x08B*/ u8 unk_8B; + /*0x08C*/ u16 unk_8C; + /*0x08E*/ u16 unk_8E; + /*0x08F*/ u8 unk_8F; + /*0x090*/ u8 filler91[0x15]; /*0x0A8*/ Stats stats; /*0x0D0*/ u8 fillerD0[0x71]; /*0x141*/ u8 unk141[0x34f]; /*0x490*/ u32 unk490; /*0x494*/ u32 unk494; /*0x498*/ u32 unk498; - /*0x49C*/ u8 filler49C[0x18]; + /*0x49C*/ u8 filler49C[0xC]; + /*0x4a8*/ u32 unk_4a8; + /*0x4ac*/ u8 filler4ac[0x8]; } SaveFile; extern SaveFile gSave; @@ -54,4 +65,11 @@ s32 ReadSaveFile(u32, SaveFile*); u32 Read_02000000(struct_02000000*); void SetFileStatusDeleted(u32 index); -#endif \ No newline at end of file +extern const char gUnk_0811E470[]; + +#ifdef DEMO_USA +extern const u8* const demoPointers[]; +extern const u8 demoUnknown1[]; +#endif + +#endif diff --git a/include/structures.h b/include/structures.h index 86962b43..a875d89a 100644 --- a/include/structures.h +++ b/include/structures.h @@ -15,8 +15,8 @@ typedef struct { u8 _e; u8 _f; } struct_02000000; -#define gUnk_02000000 ((struct_02000000*)(0x2000000)) -// extern struct_02000000 gUnk_02000000; +#define gSaveHeader ((struct_02000000*)(0x2000000)) +// extern struct_02000000 gSaveHeader; typedef struct { u8 unk_00; @@ -93,7 +93,7 @@ typedef struct { u8 field_0x1; u8 field_0x2; u8 field_0x3; - u32 field_0x4; + u32 mask; u16 fadeType; // fade in or out, are there others? u16 fadeSpeed; // subtracted from duration u16 fadeDuration; @@ -103,9 +103,9 @@ typedef struct { s16 field_0x14; u16 field_0x16; u16 field_0x18; -} struct_03000FD0; +} FadeControl; -extern struct_03000FD0 gFadeControl; +extern FadeControl gFadeControl; typedef struct { u8 filler0[0x1A]; diff --git a/include/textbox.h b/include/textbox.h index e85590b9..b2603fbf 100644 --- a/include/textbox.h +++ b/include/textbox.h @@ -16,34 +16,36 @@ typedef struct { u8 textWindowPosY; u16 textIndex; u16 unk2; // HI? - u16 field_0xc; - u16 field_0xe; + u32 field_0xc; u32 field_0x10; u32 field_0x14; u32 field_0x18; u32 field_0x1c; -} TextBox; -extern TextBox gTextBox; +} Message; +extern Message gMessage; typedef struct { - TextBox textBox; - u8 _20; - u8 _21; - u16 _22; - u16 _24; - u16 _26; - u16 _28; - u8 _2a[0x2]; - void* _2c; - u8 _30[0x20]; + u8 flags; + u8 code; // first byte read + u16 param; // second byte read + u16 extended; // ascii adjusted for jp chars + u16 _6; + u16 textIndex; + void* _c; + u8 buf[32]; +} Token; + +typedef struct { + Message message; + Token curToken; WStruct _50; - char playerName[0xa]; + char playerName[10]; u8 _66[0x10]; u8 _76; u8 _77[0x11]; - u8 _88; - u8 state; - u8 _8a; + u8 msgStatus; + u8 renderStatus; + u8 newlineDelay; u8 _8b; u8 _8c; u8 _8d; @@ -51,43 +53,46 @@ typedef struct { u8 _8f; u8 _90; u8 _91; - s8 _92; + s8 typeSpeed; u8 _93; u8 _94; - u8 _95; + u8 delay; u8 _96; u8 _97; union { u32 word; struct { - u8 b0; + u8 lineNo; u8 b1; u8 b2; s8 sizeScale; } bytes; } _98; u8 _9c; - u8 _9d; - u16 _9e; - u16 _a0; - u16 _a2; - u16 _a4; + u8 updateDraw; + u16 beginTiles[4]; u16 _a6; -} CurrentTextBox; -extern CurrentTextBox gCurrentTextBox; -static_assert(sizeof(CurrentTextBox) == 0xa8); +} TextRender; +extern TextRender gTextRender; +static_assert(sizeof(TextRender) == 0xa8); /** * @brief Initialize the message system. */ void MessageInitialize(void); +/** + * @brief Update the message system. + * + */ +void MessageMain(void); + /** * @brief Show a message on screen. * * @param index u32 Message index */ -void ShowTextbox(u32 index); +void MessageRequest(u32 index); /** * @brief Show a message at screen posiiton. @@ -96,7 +101,7 @@ void ShowTextbox(u32 index); * @param x u32 Screen x * @param y u32 Screen y */ -void TextboxAtPosition(u32 index, u32 x, u32 y); +void MessageAtPos(u32 index, u32 x, u32 y); /** * @brief Show a message that attempts not to obscure the entity. @@ -104,13 +109,15 @@ void TextboxAtPosition(u32 index, u32 x, u32 y); * @param index u32 Message index * @param entity Entity* Your important entity */ -void TextboxNoOverlap(u32 index, Entity* entity); +void MessageNoOverlap(u32 index, Entity* entity); /** * @brief Show a message that attempts not to obscure the camera target. * * @param index u32 Message index */ -void TextboxNoOverlapFollow(u32 index); +void MessageFromTarget(u32 index); + +void DispMessageFrame(u16*, u32, u32, u32); #endif diff --git a/include/tiles.h b/include/tiles.h new file mode 100644 index 00000000..9915face --- /dev/null +++ b/include/tiles.h @@ -0,0 +1,18 @@ +#ifndef TILES_H +#define TILES_H + +typedef enum { + CUT_BUSH = 0x1C, + CUT_GRASS = 0x1D, + CUT_SIGNPOST = 0x1E, + CUT_TREE = 0x1F, + ROCK = 0x55, + CHEST = 0x73, + SIGNPOST = 0x176, + PERMA_ROCK = 0x1D3, + PERMA_ROCK2 = 0x1D4, + PERMA_ROCK3 = 0x1D5, + PERMA_ROCK4 = 0x1D6, +} Tile; + +#endif // TILES_H diff --git a/include/utils.h b/include/utils.h index 0634700e..004a5ada 100644 --- a/include/utils.h +++ b/include/utils.h @@ -40,6 +40,8 @@ void ReadKeyInput(void); void LoadPalettes(const u8*, int, int); void LoadPaletteGroup(u32 group); +void sub_0801D79C(u32 colorIndex, u32 color); +void sub_0801D7BC(u32 color, u32 arg1); /** * Allocate memory on heap. diff --git a/linker.ld b/linker.ld index e983ff0b..36d6f013 100644 --- a/linker.ld +++ b/linker.ld @@ -16,7 +16,7 @@ SECTIONS { . = 0x00000020; gUnk_02000020 = .; . = 0x00000030; gUnk_02000030 = .; . = 0x00000040; gUnk_02000040 = .; - . = 0x00000050; gTextBox = .; + . = 0x00000050; gMessage = .; . = 0x0000005C; gUnk_0200005C = .; . = 0x00000070; gUnk_02000070 = .; . = 0x00000080; gMenu = .; @@ -26,7 +26,7 @@ SECTIONS { . = 0x000000B0; gUnk_020000B0 = .; . = 0x000000C0; gUnk_020000C0 = .; . = 0x00000CC0; gUnk_02000CC0 = .; - . = 0x00000D00; gUnk_02000D00 = .; + . = 0x00000D00; gTextGfxBuffer = .; . = 0x00001A00; gUnk_02001A00 = .; . = 0x00001A3C; gUnk_02001A3C = .; . = 0x00001A40; gBG3Buffer = .; @@ -90,7 +90,7 @@ SECTIONS { . = 0x00022730; gUnk_02022730 = .; . = 0x00022740; gUnk_02022740 = .; . = 0x00022750; gPlayerScriptExecutionContext = .; - . = 0x00022780; gCurrentTextBox = .; + . = 0x00022780; gTextRender = .; . = 0x000227DC; gUnk_020227DC = .; . = 0x000227E8; gUnk_020227E8 = .; . = 0x000227F0; gUnk_020227F0 = .; @@ -98,7 +98,7 @@ SECTIONS { . = 0x00022800; gUnk_02022800 = .; . = 0x0002281E; gUnk_0202281E = .; . = 0x00022830; gUnk_02022830 = .; - . = 0x00024030; gUnk_02024030 = .; + . = 0x00024030; gMessageChoices = .; . = 0x00024048; gUnk_02024048 = .; . = 0x00024050; gUnk_02024050 = .; . = 0x00024090; gUnk_02024090 = .; @@ -181,7 +181,7 @@ SECTIONS { . = 0x00000BF8; gUnk_03000BF8 = .; . = 0x00000C24; gUnk_03000C24 = .; . = 0x00000C30; gUnk_03000C30 = .; - . = 0x00000E10; gUnk_03000E10 = .; + . = 0x00000E10; gCollidableList = .; . = 0x00000F50; gScreen = .; . = 0x00000F58; gBG0Settings = .; . = 0x00000F64; gBG1Settings = .; @@ -212,7 +212,7 @@ SECTIONS { . = 0x00003DA0; gUnk_03003DA0 = .; . = 0x00003DA8; gUnk_03003DA8 = .; . = 0x00003DB0; gUnk_03003DB0 = .; - . = 0x00003DB8; gHitboxCount = .; + . = 0x00003DB8; gCollidableCount = .; . = 0x00003DBC; gEntCount = .; . = 0x00003DC0; gUnk_03003DC0 = .; . = 0x00003DD0; gUnk_03003DD0 = .; @@ -274,7 +274,7 @@ SECTIONS { . = 0x00005D24; gUnk_03005D24 = .; . = 0x00005D58; gUnk_03005D58 = .; . = 0x00005D5C; gUnk_03005D5C = .; - . = 0x00005D90; IntrMain = .; + . = 0x00005D90; gIntrMain = .; . = 0x00005E60; gUnk_03005E60 = .; . = 0x00005E98; gUnk_03005E98 = .; . = 0x00005F24; _ClearAndUpdateEntities = .; @@ -694,7 +694,7 @@ SECTIONS { src/sub_0807B820.o(.text); asm/code_0807B9B8.o(.text); src/sub_0807C998.o(.text); - asm/sub_0807CA18.o(.text); + src/sub_0807CA18.o(.text); asm/getInventoryValue.o(.text); asm/code_0807CAA0.o(.text); src/flags.o(.text); @@ -763,6 +763,7 @@ SECTIONS { asm/object35.o(.text); asm/object36.o(.text); asm/object37.o(.text); + src/object/jarPortal.o(.text); asm/jarPortal.o(.text); asm/bossDoor.o(.text); asm/object3A.o(.text); @@ -1195,7 +1196,6 @@ SECTIONS { data/map/metatile_headers.o(.rodata); data/map/map_headers.o(.rodata); src/textbox.o(.rodata); - data/data_08107BC8.o(.rodata); data/const/manager/manager1.o(.rodata); data/const/manager/manager3.o(.rodata); data/const/manager/manager4.o(.rodata); @@ -1660,6 +1660,8 @@ SECTIONS { data/data_08127280.o(.rodata); data/gfx/figurines.o(.rodata); data/data_08128A38.o(.rodata); + src/itemMenuTable.o(.rodata); + data/data_08128BF4.o(.rodata); data/const/playerItem/playerItemSword.o(.rodata); data/projectile_functions.o(.rodata); src/projectile/darkNutSwordSlash.o(.rodata); @@ -1719,8 +1721,8 @@ SECTIONS { data/animations/projectile/gyorgMaleEnergyProjectile.o(.rodata); src/projectile/v3TennisBallProjectile.o(.rodata); data/const/playerItem/playerItem10.o(.rodata); - data/data_0812AA88.o(.rodata); - data/enums.o(.rodata); + src/playerItem/playerItem10.o(.rodata); + src/flagDebug.o(.rodata); data/const/playerItem/playerItem13.o(.rodata); src/intro.o(.rodata); data/data_081320FC.o(.rodata); diff --git a/src/arm_proxy.c b/src/arm_proxy.c index e1f13c74..d8efb2a0 100644 --- a/src/arm_proxy.c +++ b/src/arm_proxy.c @@ -10,6 +10,7 @@ #include "manager.h" #include "utils.h" #include "npc.h" +#include "effects.h" extern u8 gUnk_03003DE0; extern u8 gUnk_03000C30; @@ -21,7 +22,7 @@ extern u8 gUnk_03003DF0[]; extern u8 gUnk_03003BE0; extern Entity* gUnk_03004040[3]; extern u8 gUnk_020342F8; -extern u8 gHitboxCount; +extern u8 gCollidableCount; extern void gDoCollision(void); extern void sub_080ADD70(); @@ -128,16 +129,16 @@ void PrepNextFrame(void) { void PlayerUpdate(Entity* this) { if (gSave.stats.effect != 0) - gPlayerState.flags.all |= 0x4000; + gPlayerState.flags |= 0x4000; else - gPlayerState.flags.all &= ~0x4000; + gPlayerState.flags &= ~0x4000; if (sub_0805E3B0(this) == 0) { - if ((gPlayerState.flags.all & 0x80000) != 0) { + if ((gPlayerState.flags & 0x80000) != 0) { sub_08077B20(); - if ((gPlayerState.flags.all & 0x200000) != 0) { + if ((gPlayerState.flags & 0x200000) != 0) { gPlayerState.playerAction = 0x18; - gPlayerState.flags.all &= ~0x80000; + gPlayerState.flags &= ~0x80000; gPlayerState.hurtBlinkSpeed = 0xf0; this->flags |= 0x80; } else { @@ -170,10 +171,10 @@ void HandlePlayerLife(Entity* this) { if ((gPlayerEntity.bitfield & 0x80) && (gPlayerEntity.iframes > 0)) SoundReq(SFX_86); - gPlayerState.flags.all &= ~(0x2000000 | 0x200); - if (gPlayerState.flags.all & 0x400) + gPlayerState.flags &= ~(0x2000000 | 0x200); + if (gPlayerState.flags & 0x400) ResetPlayer(); - if ((gPlayerState.flags.all & 0x400000) && !gPlayerState.field_0xa0[0]) + if ((gPlayerState.flags & 0x400000) && !gPlayerState.field_0xa0[0]) sub_0807A108(); if (sub_08079B24() == 0) sub_08079708(this); @@ -189,10 +190,10 @@ void HandlePlayerLife(Entity* this) { return; } - if ((gPlayerState.field_0x8b != 0) || (gTextBox.doTextBox & 0x7f)) + if ((gPlayerState.field_0x8b != 0) || (gMessage.doTextBox & 0x7f)) return; - gRoomVars.unk2 = gTextBox.doTextBox & 0x7f; + gRoomVars.unk2 = gMessage.doTextBox & 0x7f; temp = gSave.stats.maxHealth / 4; if (temp > 24) temp = 24; @@ -227,7 +228,7 @@ void HandlePlayerLife(Entity* this) { } else if ((gSave.stats.effectTimer == 0) || --gSave.stats.effectTimer == 0) { gSave.stats.effect = 0; } else if ((gSave.stats.effectTimer & 0x3f) == 0) { - CreateFx(this, 0x55 + gSave.stats.effect, 0); + CreateFx(this, FX_AURA_BASE + gSave.stats.effect, 0); } } #endif @@ -242,12 +243,12 @@ void sub_080171F0(void) { gPlayerEntity.bitfield &= ~0x80; if (gPlayerEntity.action != 0x14) - gPlayerState.flags.all = (gPlayerState.flags.all & ~0x10000) | (0x10000 * (gPlayerState.flags.all & 2) / 2); + gPlayerState.flags = (gPlayerState.flags & ~0x10000) | (0x10000 * (gPlayerState.flags & 2) / 2); - gPlayerState.flags.all &= ~2; + gPlayerState.flags &= ~2; sub_080028E0(&gPlayerEntity); - if (gPlayerState.flags.all & 0x400000) + if (gPlayerState.flags & 0x400000) gUnk_0200AF00.filler25[10] = 1; sub_08078180(); @@ -262,13 +263,13 @@ void sub_080171F0(void) { gPlayerState.field_0x3f = 0; sub_0807B0C8(); - if (gPlayerState.flags.all & 0x400000) + if (gPlayerState.flags & 0x400000) gUnk_03004040[0]->spriteOffsetY = gUnk_03004040[1]->spriteOffsetY = gUnk_03004040[2]->spriteOffsetY = 0; if (gPlayerEntity.action == 0x1d) - gPlayerState.flags.all |= 0x20000000; + gPlayerState.flags |= 0x20000000; else - gPlayerState.flags.all &= ~0x20000000; + gPlayerState.flags &= ~0x20000000; sub_0807A8D8(&gPlayerEntity); if (gPlayerState.jumpStatus & 0xc0) @@ -370,7 +371,7 @@ NONMATCH("asm/non_matching/arm_proxy/NPCUpdate.inc", void NPCUpdate(Entity* this END_NONMATCH void ClearHitboxList(void) { - gHitboxCount = 0; + gCollidableCount = 0; } void CollisionMain(void) { diff --git a/src/audio.c b/src/audio.c index e6b1da5a..5889a0eb 100644 --- a/src/audio.c +++ b/src/audio.c @@ -198,7 +198,6 @@ s32 fade(s32 target, s32 current) { void doPlaySound(u32 sound) { u32 volume; - u32 iVar2; MusicPlayerInfo* musicPlayerInfo; if (sound == 0) @@ -209,8 +208,7 @@ void doPlaySound(u32 sound) { } else { volume = gSoundPlayingInfo.volumeSfx; } - iVar2 = gSoundPlayingInfo.volumeMaster; - volume = iVar2 * volume / 0x100; + volume = gSoundPlayingInfo.volumeMaster * volume / 0x100; musicPlayerInfo = gMusicPlayers[gSongTable[sound].musicPlayerIndex].info; m4aMPlayImmInit(musicPlayerInfo); m4aMPlayVolumeControl(musicPlayerInfo, 0xffff, volume); @@ -535,7 +533,7 @@ extern const SongHeader sfx14E; extern const SongHeader sfx14F; extern const SongHeader sfx150; extern const SongHeader sfx151; -extern const SongHeader sfx152; +extern const SongHeader sfxNearPortal; extern const SongHeader sfx153; extern const SongHeader sfx154; extern const SongHeader sfx155; @@ -1167,7 +1165,7 @@ const Song gSongTable[] = { [SFX_14F] = { &sfx14F, MUSIC_PLAYER_15, MUSIC_PLAYER_15 }, [SFX_150] = { &sfx150, MUSIC_PLAYER_14, MUSIC_PLAYER_14 }, [SFX_151] = { &sfx151, MUSIC_PLAYER_13, MUSIC_PLAYER_13 }, - [SFX_152] = { &sfx152, MUSIC_PLAYER_18, MUSIC_PLAYER_18 }, + [SFX_NEAR_PORTAL] = { &sfxNearPortal, MUSIC_PLAYER_18, MUSIC_PLAYER_18 }, [SFX_153] = { &sfx153, MUSIC_PLAYER_11, MUSIC_PLAYER_11 }, [SFX_154] = { &sfx154, MUSIC_PLAYER_10, MUSIC_PLAYER_10 }, [SFX_155] = { &sfx155, MUSIC_PLAYER_0F, MUSIC_PLAYER_0F }, diff --git a/src/code_08018C58.c b/src/code_08018C58.c index 14caf9cd..04d39a04 100644 --- a/src/code_08018C58.c +++ b/src/code_08018C58.c @@ -15,12 +15,10 @@ void CreateMinishEntrance(u32 tilePos) { } void sub_08018C58(u32 tilePos) { - u32 i = 0; + u32 i; - for (; i < 6;) { + for (i = 0; i < 6; i += 2, tilePos += 0x40) { SetTileType(0x260 + i, tilePos, 1); SetTileType(0x261 + i, tilePos + 1, 1); - i += 2; - tilePos += 0x40; } } diff --git a/src/code_0805436C.c b/src/code_0805436C.c index c2625d5b..7ec445b3 100644 --- a/src/code_0805436C.c +++ b/src/code_0805436C.c @@ -4,22 +4,14 @@ #include "menu.h" #include "area.h" #include "utils.h" - -typedef struct { - u8 filler[0xa8]; - Stats stats; -} SaveFile; +#include "structures.h" +#include "save.h" typedef struct { u8 unk; u8 filler[7]; } struct_080FD5B4; -typedef struct { - u8 filler[0x2e]; - u8 unk; -} ScreenTransition; - extern SaveFile gSave; extern struct_080FD5B4 gUnk_080FD5B4[]; extern ScreenTransition gScreenTransition; @@ -105,7 +97,7 @@ u32 SetBottleContents(u32 itemID, u32 bottleIndex) { return bottleIndex; } -u32 sub_0805449C(u32 arg0) { +u32 ItemIsSword(u32 arg0) { switch (arg0) { case 1: case 2: @@ -118,8 +110,8 @@ u32 sub_0805449C(u32 arg0) { } } -u32 sub_080544B4(u32 arg0) { - switch (arg0) { +u32 ItemIsShield(u32 id) { + switch (id) { case 13: case 14: return 1; @@ -128,8 +120,8 @@ u32 sub_080544B4(u32 arg0) { } } -u32 sub_080544C8(u32 arg0) { - switch (arg0) { +u32 ItemIsBottle(u32 id) { + switch (id) { case 28: case 29: case 30: @@ -140,14 +132,14 @@ u32 sub_080544C8(u32 arg0) { } } -u32 GetBottleContaining(u32 arg0) { - if (arg0 == gSave.stats.bottles[0]) { +u32 GetBottleContaining(u32 id) { + if (id == gSave.stats.bottles[0]) { return 1; - } else if (arg0 == gSave.stats.bottles[1]) { + } else if (id == gSave.stats.bottles[1]) { return 2; - } else if (arg0 == gSave.stats.bottles[2]) { + } else if (id == gSave.stats.bottles[2]) { return 3; - } else if (arg0 == gSave.stats.bottles[3]) { + } else if (id == gSave.stats.bottles[3]) { return 4; } else { return 0; @@ -160,7 +152,7 @@ NONMATCH("asm/non_matching/sub_08054524.inc", void sub_08054524(void)) { bVar1 = gArea.locationIndex; if (gArea.locationIndex == 0) { - bVar1 = gScreenTransition.unk; + bVar1 = gScreenTransition.field_0x24[0xa]; } if (bVar1 > 0x16) { bVar1 = 0; @@ -263,7 +255,7 @@ u32 CreateItemDrop(Entity* arg0, u32 itemID, u32 itemParameter) { } else if (arg0->id == 0x1e) { itemEntity->direction = arg0->animationState << 3 | 0x80; itemEntity->speed = 0xc0; - itemEntity->field_0x20 = 0x18000; + itementity->hVelocity = 0x18000; } } CopyPosition(arg0, itemEntity); diff --git a/src/code_0805EC04.c b/src/code_0805EC04.c index bd38cac5..d49bb996 100644 --- a/src/code_0805EC04.c +++ b/src/code_0805EC04.c @@ -10,7 +10,8 @@ typedef struct { } VStruct; typedef struct { - u8 filler[0x420]; + u8 _0[0x20]; + struct OamData oam[0x80]; VStruct unk[0x100]; } UStruct; diff --git a/src/code_0805F9A0.c b/src/code_0805F9A0.c index 120a7625..a921491e 100644 --- a/src/code_0805F9A0.c +++ b/src/code_0805F9A0.c @@ -141,7 +141,7 @@ void sub_0805F918(u32 idx, u32 idx2, void* dest) { u32 sub_0805F9A0(u32 r0) { - if (gUnk_02000000->gameLanguage == 0) { + if (gSaveHeader->gameLanguage == 0) { u16* val = &gUnk_081092D4; u32 i = 0; diff --git a/src/code_08077DF4.c b/src/code_08077DF4.c index 84a360f2..ac1d61e5 100644 --- a/src/code_08077DF4.c +++ b/src/code_08077DF4.c @@ -44,7 +44,6 @@ void sub_08077E54(ItemBehavior* beh) { } void sub_08077E78(ItemBehavior* arg0, u32 bits) { - u8* pbVar1; u32 not ; if (bits == 0) { diff --git a/src/code_080A29BC.c b/src/code_080A29BC.c index c085a684..17fb9fba 100644 --- a/src/code_080A29BC.c +++ b/src/code_080A29BC.c @@ -2,6 +2,7 @@ #include "entity.h" #include "room.h" #include "object.h" +#include "effects.h" void sub_080A29C8(s32 xOff, s32 yOff, u32 layer) { Entity* pEVar1; @@ -15,15 +16,15 @@ void sub_080A29C8(s32 xOff, s32 yOff, u32 layer) { } void sub_080A29FC(Entity* parent) { - CreateFx(parent, 0x11, 0); + CreateFx(parent, FX_DASH, 0); } void sub_080A2A08(Entity* parent) { - CreateFx(parent, 0x6, 0); + CreateFx(parent, FX_6, 0); } void sub_080A2A14(Entity* parent) { - CreateFx(parent, 0xb, 0); + CreateFx(parent, FX_WATER_SPLASH, 0); } Entity* sub_080A2A20(Entity* parent, u32 form, u32 parameter) { @@ -50,7 +51,7 @@ Entity* sub_080A2A3C(Entity* parent, u32 form, u32 subtype, u32 param_4) { Entity* sub_080A2A64(Entity* parent) { Entity* pEVar1; - pEVar1 = CreateFx(parent, 0x20, 0); + pEVar1 = CreateFx(parent, FX_SPARKLE2, 0); if (pEVar1 != NULL) { pEVar1->spritePriority.b0 = 7; } diff --git a/src/createObject.c b/src/createObject.c index cf3655c9..0d18f6b1 100644 --- a/src/createObject.c +++ b/src/createObject.c @@ -4,6 +4,7 @@ #include "room.h" #include "createObject.h" #include "object.h" +#include "effects.h" Entity* CreateObject(u32 subtype, u32 form, u32 parameter) { Entity* entity; @@ -36,13 +37,13 @@ Entity* CreateFx(Entity* parentEnt, u32 form, u32 parameter) { } void CreateDust(Entity* parent) { - CreateFx(parent, 2, 0); + CreateFx(parent, FX_DEATH, 0); } void CreateDustAt(s32 xOff, s32 yOff, u32 layer) { Entity* ent; - ent = CreateObject(SPECIAL_FX, 2, 0); + ent = CreateObject(SPECIAL_FX, FX_DEATH, 0); if (ent != NULL) { ent->x.HALF.HI = gRoomControls.roomOriginX + xOff; ent->y.HALF.HI = gRoomControls.roomOriginY + yOff; @@ -51,15 +52,15 @@ void CreateDustAt(s32 xOff, s32 yOff, u32 layer) { } void CreateDustSmall(Entity* parent) { - CreateFx(parent, 0x11, 0); + CreateFx(parent, FX_DASH, 0); } void CreateExplosionBroken(Entity* parent) { - CreateFx(parent, 0x6, 0); + CreateFx(parent, FX_6, 0); } void CreateWaterSplash(Entity* parent) { - CreateFx(parent, 0xb, 0); + CreateFx(parent, FX_WATER_SPLASH, 0); } Entity* sub_080A2A20(Entity* parent, u32 form, u32 parameter) { @@ -86,7 +87,7 @@ Entity* sub_080A2A3C(Entity* parent, u32 form, u32 subtype, u32 param_4) { Entity* CreateWaterTrace(Entity* parent) { Entity* ent; - ent = CreateFx(parent, 0x20, 0); + ent = CreateFx(parent, FX_RIPPLE, 0); if (ent != NULL) { ent->spritePriority.b0 = 7; } diff --git a/src/debugScreen.c b/src/debugScreen.c index b75181f2..9e290ae2 100644 --- a/src/debugScreen.c +++ b/src/debugScreen.c @@ -27,7 +27,7 @@ void sub_0805FA04(void) { MessageInitialize(); MemClear((void*)&gUnk_02032EC0, sizeof(UI)); MemClear((void*)&gMenu, sizeof(Menu)); - gMenu.unk16 = gUnk_02000000->gameLanguage; + gMenu.unk16 = gSaveHeader->gameLanguage; sub_08053320(); sub_0801D79C(0, 0x1144); gMain.funcIndex = 1; @@ -56,8 +56,8 @@ void sub_0805FA98(void) { } break; case 0x100: - gUnk_02000000->gameLanguage = gMenu.unk16; - TextboxNoOverlapFollow(gMenu.unk14 * 0x100 + gMenu.unk15); + gSaveHeader->gameLanguage = gMenu.unk16; + MessageFromTarget(gMenu.unk14 * 0x100 + gMenu.unk15); break; case 0x2: MessageInitialize(); diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c index e506a605..4644e620 100644 --- a/src/enemy/acroBandits.c +++ b/src/enemy/acroBandits.c @@ -52,7 +52,7 @@ void sub_080318DC(Entity* this) { if (this->bitfield != 0x80 && this->bitfield != 0x81) { if (this->type == 1) { - if (this->action < 7 && this->field_0x42) { + if (this->action < 7 && this->knockbackDuration != 0) { brother = this->attachedEntity; if (brother) { brother->parent = this->parent; @@ -72,7 +72,7 @@ void sub_080318DC(Entity* this) { this->action = 9; this->spritePriority.b1 = 1; - if (this->field_0x3e < 0x10) { + if (this->knockbackDirection < 0x10) { this->spriteSettings.b.flipX = 0; } else { this->spriteSettings.b.flipX = 1; @@ -81,19 +81,19 @@ void sub_080318DC(Entity* this) { } if (this->currentHealth == 0) { - this->field_0x3e = ((this->field_0x3e + (7 & Random())) - 4) & 0x1f; - this->field_0x42 += this->type2 * 3; + this->knockbackDirection = ((this->knockbackDirection + (7 & Random())) - 4) & 0x1f; + this->knockbackDuration += this->type2 * 3; sub_08032338(this); } } - if (this->field_0x42 && this->frames.all & 0x10) { + if (this->knockbackDuration != 0 && this->frames.all & 0x10) { if (this->type == 0) { this->action = 8; } else { this->action = 9; } - if (this->field_0x3e < 0x10) { + if (this->knockbackDirection < 0x10) { this->spriteSettings.b.flipX = 0; } else { this->spriteSettings.b.flipX = 1; @@ -323,7 +323,7 @@ void sub_08031E90(Entity* this) { void sub_08031EA8(Entity* this) { this->action = 1; this->spritePriority.b1 = 1; - this->field_0x20 = 0x40000; + this->hVelocity = 0x40000; this->height.HALF.HI = (4 - this->type2) * 0xe; this->field_0x78.HALF.HI = Random(); InitializeAnimation(this, 4); @@ -332,8 +332,8 @@ void sub_08031EA8(Entity* this) { void sub_08031EE8(Entity* this) { int draw; - this->height.WORD -= this->field_0x20; - this->field_0x20 -= 0x1800; + this->height.WORD -= this->hVelocity; + this->hVelocity -= 0x1800; if (this->height.HALF.HI < 1) { draw = this->spriteSettings.b.draw; @@ -347,7 +347,7 @@ void sub_08031EE8(Entity* this) { if (draw == 1) GetNextFrame(this); - if (this->field_0x20 < 1) { + if (this->hVelocity < 1) { this->action = 2; this->flags |= 0x80; InitializeAnimation(this, 5); @@ -450,7 +450,7 @@ void sub_08032160(Entity* this) { this->spriteSettings.b.flipX = 0; } this->speed = 0xf0; - this->field_0x20 = 0x12000; + this->hVelocity = 0x12000; this->spritePriority.b1 = 1; InitializeAnimation(this, 12); } diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c index 8ce4858b..15535172 100644 --- a/src/enemy/beetle.c +++ b/src/enemy/beetle.c @@ -48,7 +48,7 @@ void sub_08021780(Entity* this) { } if (this->currentHealth == 0) - this->field_0x42 = 0; + this->knockbackDuration = 0; sub_0804AA30(this, gUnk_080CB590); } @@ -105,7 +105,7 @@ void sub_080218CC(Entity* this) { this->spriteSettings.b.draw = 1; this->direction = ((sub_08049F84(this, 1) ^ 0x10) + gUnk_080CB5DC[Random() & 7]) & 0x1f; this->speed = 0x100; - this->field_0x20 = 0x12000; + this->hVelocity = 0x12000; } GetNextFrame(this); @@ -216,7 +216,7 @@ void sub_08021AD8(Entity* this) { } void sub_08021B64(Entity* this) { - if (gPlayerState.flags.all & 4) { + if (gPlayerState.flags & 4) { this->action = 3; this->height.WORD = 0; InitializeAnimation(this, 2); @@ -233,12 +233,12 @@ void sub_08021B64(Entity* this) { this->actionDelay = (u8)iVar4; } - if (gPlayerState.flags.all & 0x110) + if (gPlayerState.flags & 0x110) iVar4 = 0; if (iVar4 == 0) { this->action = 6; - this->field_0x20 = 0x10000; + this->hVelocity = 0x10000; ((u8*)&this->field_0x86)[1] = 0; if (gPlayerEntity.direction != 0xff) { this->direction = 0x10 ^ gPlayerEntity.direction; @@ -299,7 +299,7 @@ u32 sub_08021D00(Entity* this) { } else { this->action = 4; this->actionDelay = 1; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; InitializeAnimation(this, 4); ret = 1; } diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c index 77bf64da..67bb138b 100644 --- a/src/enemy/bobomb.c +++ b/src/enemy/bobomb.c @@ -30,8 +30,8 @@ void sub_0802C688(Entity* this) { case 0: case 1: if (this->field_0x82.HALF.LO) { - this->field_0x42 = 0; - gPlayerEntity.field_0x42 = 4; + this->knockbackDuration = 0; + gPlayerEntity.knockbackDuration = 4; } return; case 0xe: @@ -39,7 +39,7 @@ void sub_0802C688(Entity* this) { case 0x15: case 0x16: this->action = 3; - this->field_0x42 = 0; + this->knockbackDuration = 0; sub_0802CBC4(this); return; } @@ -54,7 +54,7 @@ void sub_0802C688(Entity* this) { this->action = 3; this->damageType = 0x6e; this->field_0xf = 1; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; this->speed = 0; this->field_0x80.HALF.HI = 1; InitializeAnimation(this, this->direction >> 4 | 6); @@ -72,7 +72,7 @@ void sub_0802C7AC(Entity* this) { if (this->field_0x82.HALF.LO != 2) { this->speed = this->field_0x82.HALF.LO ? 0x200 : 0x80; } - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; this->field_0x82.HALF.HI = 0; this->field_0x80.HALF.HI = 0; } else { @@ -225,7 +225,7 @@ void sub_0802CA94(Entity* this) { this->flags &= ~0x80; this->field_0xf = 1; this->spritePriority.b1 = 1; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; this->speed = 0; this->field_0x82.HALF.HI = 0; this->field_0x80.HALF.HI = 0; diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c index e096feda..d5220c6d 100644 --- a/src/enemy/bombPeahat.c +++ b/src/enemy/bombPeahat.c @@ -381,7 +381,7 @@ void sub_0802ADDC(Entity* this) { void sub_0802AE24(Entity* this) { this->action = 1; this->actionDelay = 0xf0; - this->field_0x20 = 0x8000; + this->hVelocity = 0x8000; this->hitbox = (Hitbox*)&gUnk_080CD174; this->field_0x3c = 3; this->field_0x16 = 0; diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index 3d592781..989c6bea 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -6,6 +6,7 @@ #include "random.h" #include "npc.h" #include "functions.h" +#include "effects.h" extern void sub_0801D040(Entity*, u32); extern Entity* sub_08049DF4(u32); @@ -60,7 +61,7 @@ void sub_08028934(Entity* this) { this->actionDelay = 0x28; this->flags &= ~0x80; sub_080290E0(this, 4); - pEVar1 = CreateFx(this, 3, 0); + pEVar1 = CreateFx(this, FX_BUSH, 0); if (pEVar1 != NULL) { pEVar1->height.HALF.HI -= 8; } @@ -245,11 +246,11 @@ void sub_08028CE8(Entity* this) { struct SalesOffering* offer = (struct SalesOffering*)this->field_0x7c.WORD; u32 subtype; - if ((gTextBox.doTextBox & 0x7f) == 0 && sub_0802915C(this) && !sub_08056338()) { + if ((gMessage.doTextBox & 0x7f) == 0 && sub_0802915C(this) && !sub_08056338()) { if (offer->price <= gSave.stats.rupees) { if (sub_080291DC(this)) { /* Bag full. */ - TextboxNoOverlapFollow(0x2904); + MessageFromTarget(0x2904); sub_08078A90(0); } else { ModRupees(-offer->price); @@ -284,7 +285,7 @@ void sub_08028CE8(Entity* this) { } } else { /* Not enough money. */ - TextboxNoOverlapFollow(0x2903); + MessageFromTarget(0x2903); sub_08078A90(0); } } @@ -302,7 +303,7 @@ void sub_08028DE8(Entity* this) { this->field_0x80.HALF.HI = 1; } } else { - TextboxNoOverlapFollow(0x2902); + MessageFromTarget(0x2902); this->action = 4; this->field_0x80.HALF.HI = 0; this->actionDelay = 1; @@ -314,11 +315,11 @@ void sub_08028DE8(Entity* this) { } void sub_08028E40(Entity* this) { - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { struct SalesOffering* offer = (struct SalesOffering*)this->field_0x7c.WORD; this->action = 4; - this->subAction = gTextBox.doTextBox & 0x7f; + this->subAction = gMessage.doTextBox & 0x7f; this->actionDelay = 1; if (CheckLocalFlag(offer->field_0xa) == 0) { SetLocalFlag(offer->field_0xa); @@ -382,8 +383,8 @@ void sub_08028F0C(Entity* this) { dialog = offer->field_0x4; sub_08078A90(1); } - TextboxNoOverlapFollow(dialog); - gTextBox.field_0x10 = offer->price; + MessageFromTarget(dialog); + gMessage.field_0x10 = offer->price; } } diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c index 7c891a9f..56e23b75 100644 --- a/src/enemy/chuchu.c +++ b/src/enemy/chuchu.c @@ -117,7 +117,7 @@ void sub_0801EF40(Entity* this) { } } else { sub_0804AA1C(this); - this->field_0x20 = 0; + this->hVelocity = 0; InitializeAnimation(this, 9); } this->field_0x80.HALF.LO = this->currentHealth; @@ -698,7 +698,7 @@ void sub_0801FB68(Entity* this) { break; } - this->field_0x20 = 0; + this->hVelocity = 0; } u32 sub_0801FBD0(Entity* this) { @@ -711,7 +711,7 @@ u32 sub_0801FBD0(Entity* this) { void Chuchu_JumpAtPlayer(Entity* this) { this->speed = 0x180; - this->field_0x20 = 0x20000; + this->hVelocity = 0x20000; this->direction = sub_08049F84(this, 1); InitializeAnimation(this, 3); } diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c index 683ba4b8..2ae41b08 100644 --- a/src/enemy/cuccoChickAggr.c +++ b/src/enemy/cuccoChickAggr.c @@ -49,7 +49,7 @@ void sub_08022988(Entity* this) { return; this->frameIndex = 1; - this->field_0x20 = 0x10000; + this->hVelocity = 0x10000; EnqueueSFX(0xd6); } @@ -75,7 +75,7 @@ void sub_080229F8(Entity* this) { this->speed = 0xc0; sub_08022B44(this); } else { - this->field_0x20 = 0x10000; + this->hVelocity = 0x10000; EnqueueSFX(0xd6); } } @@ -138,7 +138,7 @@ u32 sub_08022B20(Entity* this) { } void sub_08022B44(Entity* this) { - this->field_0x20 = 0xc000; + this->hVelocity = 0xc000; this->direction = GetFacingDirection(this, &gPlayerEntity); if (this->direction & 0xf) diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c index 4ede2e2d..d28e3b15 100644 --- a/src/enemy/darkNut.c +++ b/src/enemy/darkNut.c @@ -64,7 +64,7 @@ void sub_08020BB8(Entity* this) { this->action = 11; this->actionDelay = gUnk_080CAB0C[this->type]; this->damageType = 81; - sub_08021218(this, 8, DirectionToAnimationState(this->field_0x3e ^ 0x10)); + sub_08021218(this, 8, DirectionToAnimationState(this->knockbackDirection ^ 0x10)); sub_08021588(this); sub_0804A9FC(this, 0x1c); break; @@ -72,7 +72,7 @@ void sub_08020BB8(Entity* this) { this->action = 11; this->actionDelay = gUnk_080CAB10[this->type]; this->damageType = 81; - sub_08021218(this, 8, DirectionToAnimationState(this->field_0x3e ^ 0x10)); + sub_08021218(this, 8, DirectionToAnimationState(this->knockbackDirection ^ 0x10)); sub_08021588(this); sub_0804A9FC(this, 0x1c); break; diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c index 2bfc1fc4..c3fd44ee 100644 --- a/src/enemy/doorMimic.c +++ b/src/enemy/doorMimic.c @@ -1,10 +1,10 @@ #include "enemy.h" #include "entity.h" #include "functions.h" +#include "effects.h" extern s16 sub_080001DA(u32, u32); // ? extern void sub_08049CF4(); -extern u32 CheckPlayerProximity(u32, u32, u32, u32); void sub_080221C0(); typedef struct { @@ -37,7 +37,7 @@ void sub_08021FF4(Entity* this) { void sub_08022004(Entity* this) { SetTile((u16)this->field_0x7c.HALF.LO, (u16)this->field_0x7c.HALF.HI, this->collisionLayer); - CreateFx(this, 5, 0); + CreateFx(this, FX_POT_SHATTER, 0); sub_08049CF4(this); DeleteThisEntity(); } @@ -80,7 +80,7 @@ void sub_080220F0(Entity* this) { this->field_0x44 = 0; off = gUnk_080CB76C[this->type2]; for (i = 0; i < 6; i++, off++) { - Entity* fx = CreateFx(this, 0x11, 0); + Entity* fx = CreateFx(this, FX_DASH, 0); if (fx) { fx->x.HALF.HI += off->h; fx->y.HALF.HI += off->v; diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c index 74135810..29446667 100644 --- a/src/enemy/fallingBoulder.c +++ b/src/enemy/fallingBoulder.c @@ -1,6 +1,7 @@ #include "enemy.h" #include "random.h" #include "functions.h" +#include "effects.h" void sub_0802C4B0(Entity*); void sub_0802C62C(Entity*); @@ -31,7 +32,7 @@ void sub_0802C254(Entity* this) { void sub_0802C258(Entity* this) { sub_0804A720(this); - this->field_0x20 = 0x20000; + this->hVelocity = 0x20000; this->actionDelay = 2; this->field_0x7a.HWORD = Random() & 0x70; switch (this->type) { @@ -92,7 +93,7 @@ NONMATCH("asm/non_matching/fallingBoulder/sub_0802C334.inc", void sub_0802C334(E u32 diff = 0; s32 i; for (i = 1; i > -1; i--) { - Entity* ent = CreateFx(this, 0x15, 0); + Entity* ent = CreateFx(this, FX_ROCK2, 0); if (ent) { ent->x.HALF.HI += 12; ent->x.HALF.HI -= diff; @@ -189,7 +190,7 @@ void sub_0802C4B0(Entity* this) { } rand = Random() & 7; - this->field_0x20 = 0x20000; + this->hVelocity = 0x20000; if (rand & 4) { if (rand & 3) { *(u32*)&this->cutsceneBeh = gUnk_080CD58C[offset | 1]; diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c index f7851aad..2103e19f 100644 --- a/src/enemy/fireballGuy.c +++ b/src/enemy/fireballGuy.c @@ -3,6 +3,7 @@ #include "enemy.h" #include "random.h" #include "functions.h" +#include "effects.h" typedef struct { s8 h, v; @@ -88,7 +89,7 @@ void sub_08045454(Entity* this) { off++; } - ent = CreateFx(this, 2, 0); + ent = CreateFx(this, FX_DEATH, 0); if (ent) CopyPosition(this, ent); @@ -100,7 +101,7 @@ u32 sub_0804A024(Entity*, u32, u32); void sub_08045524(Entity* this) { u32 tmp, tmp1, tmp2; - this->field_0x20 = 0x1c000; + this->hVelocity = 0x1c000; tmp = sub_0804A024(this, 1, 8); if (tmp != 0xff && (Random() & 3) == 0) { this->actionDelay = Random() & 3; diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c index 7f6d04e6..d1773a7d 100644 --- a/src/enemy/gibdo.c +++ b/src/enemy/gibdo.c @@ -58,7 +58,7 @@ NONMATCH("asm/non_matching/gibdo/sub_080374A4.inc", void sub_080374A4(Entity* th } else { if ((u8)(this->action - 1) < 2) { this->action = 1; - x = DirectionTurnAround(this->field_0x3e); + x = DirectionTurnAround(this->knockbackDirection); this->direction = x; this->animationState = x >> 3; InitAnimationForceUpdate(this, this->animationState); @@ -342,19 +342,19 @@ void sub_08037A58(Entity* this) { this->damageType = 0x26; this->flags2 |= 1; this->iframes = 0xf4; - this->field_0x3e = (this->animationState << 3) ^ 0x10; - this->field_0x42 = 8; + this->knockbackDirection = DirectionFromAnimationState(this->animationState) ^ 0x10; + this->knockbackDuration = 8; this->field_0x46 = 0x180; this->field_0x76.HALF.LO = 0x3c; InitAnimationForceUpdate(this, this->animationState + 0x10); } void sub_08037ACC(Entity* this) { - gPlayerState.flags.all &= 0xFFFFFEFF; + gPlayerState.flags &= 0xFFFFFEFF; gPlayerEntity.flags |= 0x80; gPlayerEntity.iframes = 0x1e; - gPlayerEntity.field_0x3e = DirectionFromAnimationState(this->animationState); - gPlayerEntity.field_0x42 = 4; + gPlayerEntity.knockbackDirection = DirectionFromAnimationState(this->animationState); + gPlayerEntity.knockbackDuration = 4; gPlayerEntity.field_0x46 = 0x180; } // Damage player maybe? diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c index effceb3b..7aaa2153 100644 --- a/src/enemy/gyorgMale.c +++ b/src/enemy/gyorgMale.c @@ -6,6 +6,7 @@ #include "fileScreen.h" #include "random.h" #include "functions.h" +#include "effects.h" void (*const gUnk_080D1AFC[8])(Entity*); void (*const gUnk_080D1B1C[7])(Entity*); @@ -935,7 +936,7 @@ void sub_08047BF0(Entity* this) { sub_08047E48(this); if (this->actionDelay == 0) { if ((this->field_0xf++ & 0xF) == 0) { - tmp = CreateFx(this, 0x51, 0); + tmp = CreateFx(this, FX_GIANT_EXPLOSION4, 0); if (tmp) { u32 rand = Random(); tmp->x.HALF.HI += (rand & 0x1E) + 0xFFF1; @@ -960,17 +961,17 @@ void sub_08047BF0(Entity* this) { if (this->actionDelay == 0x5A) { tmp = this->attachedEntity; tmp->spriteSettings.b.draw = 0; - CreateFx(tmp, 0x51, 0); + CreateFx(tmp, FX_GIANT_EXPLOSION4, 0); } else { if (this->actionDelay == 0x3C) { tmp = this->attachedEntity->attachedEntity; tmp->spriteSettings.b.draw = 0; - CreateFx(tmp, 0x51, 0); + CreateFx(tmp, FX_GIANT_EXPLOSION4, 0); } else { if (this->actionDelay == 0x1E) { tmp = this->attachedEntity->attachedEntity->attachedEntity; tmp->spriteSettings.b.draw = 0; - CreateFx(tmp, 0x51, 0); + CreateFx(tmp, FX_GIANT_EXPLOSION4, 0); } } } diff --git a/src/enemy/hangingSeed.c b/src/enemy/hangingSeed.c index fe6fe0fc..95593f7b 100644 --- a/src/enemy/hangingSeed.c +++ b/src/enemy/hangingSeed.c @@ -1,6 +1,7 @@ #include "entity.h" #include "enemy.h" #include "functions.h" +#include "effects.h" extern void (*const gHangingSeedFunctions[])(Entity*); extern void (*const gUnk_080CB588[])(Entity*); @@ -15,7 +16,7 @@ void HangingSeed_OnTick(Entity* this) { void sub_080216FC(Entity* this) { if (this->bitfield & 0x80) { - CreateFx(this, 3, 0x80); + CreateFx(this, FX_BUSH, 0x80); DeleteThisEntity(); } } diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c index 169f9db2..41f0ed85 100644 --- a/src/enemy/helmasaur.c +++ b/src/enemy/helmasaur.c @@ -48,7 +48,7 @@ void sub_0802BBC4(Entity* this) { case 2: case 3: if (this->action == 4) { - this->field_0x42 = 0; + this->knockbackDuration = 0; sub_0802C218(this); } break; @@ -89,7 +89,7 @@ void sub_0802BCA8(Entity* this) { this->action = 7; this->actionDelay = 0x5a; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; this->damageType = 0x19; this->field_0x3a = this->field_0x3a & 0xfb; this->field_0x1c = 0x12; @@ -369,7 +369,7 @@ void sub_0802C1CC(Entity* this) { void sub_0802C218(Entity* this) { this->action = 6; this->speed = 0xe0; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; } // clang-format off diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c index df748792..1b4f20c0 100644 --- a/src/enemy/keaton.c +++ b/src/enemy/keaton.c @@ -3,6 +3,7 @@ #include "enemy.h" #include "random.h" #include "functions.h" +#include "effects.h" extern Entity* gUnk_020000B0; @@ -39,7 +40,7 @@ void sub_080323F4(Entity* this) { if (this->action != 3 && this->action != 4) { this->action = 3; this->actionDelay = 0xC; - this->direction = DirectionTurnAround(this->field_0x3e); + this->direction = DirectionTurnAround(this->knockbackDirection); InitAnimationForceUpdate(this, this->direction >> 3); } else if (this->bitfield == 0xCC) { if (this->field_0x43 == 0) { @@ -222,7 +223,7 @@ void sub_08032794(Entity* this) { Entity* target; s8* temp; - target = CreateFx(this, 0x11, 0x40); + target = CreateFx(this, FX_DASH, 0x40); if (target != NULL) { temp = &gUnk_080CE810[this->animationState * 2]; PositionRelative(this, target, temp[0] << 0x10, temp[1] << 0x10); diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c index d97bec40..1353d489 100644 --- a/src/enemy/lakitu.c +++ b/src/enemy/lakitu.c @@ -5,6 +5,7 @@ #include "coord.h" #include "random.h" #include "player.h" +#include "effects.h" extern void (*const LakituActionFuncs[])(Entity*); @@ -56,15 +57,15 @@ void Lakitu_DoAction(Entity* this) { void sub_0803C784(Entity* this) { if ((this->bitfield & 0x7f) == 0x1d) { - this->field_0x20 = 0x20000; + this->hVelocity = 0x20000; sub_0803CBAC(this); } else { if (this->damageType == 0x43) { - Entity* fx = CreateFx(this, 2, 0); + Entity* fx = CreateFx(this, FX_DEATH, 0); if (fx != NULL) { - u32 angle = (this->field_0x3e ^ 0x10) << 3; + u32 angle = (this->knockbackDirection ^ 0x10) << 3; s32 sine; sine = gSineTable[angle]; @@ -352,7 +353,7 @@ void sub_0803CC08(Entity* this) { return; } - if (this->field_0x20 >= 0) { + if (this->hVelocity >= 0) { return; } @@ -360,25 +361,25 @@ void sub_0803CC08(Entity* this) { return; } - fx = CreateFx(this, 2, 0); + fx = CreateFx(this, FX_DEATH, 0); if (fx != NULL) { fx->x.HALF.HI += 6; fx->y.HALF.HI += 6; } - fx = CreateFx(this, 2, 0); + fx = CreateFx(this, FX_DEATH, 0); if (fx != NULL) { fx->x.HALF.HI -= 6; fx->y.HALF.HI += 6; } - fx = CreateFx(this, 2, 0); + fx = CreateFx(this, FX_DEATH, 0); if (fx != NULL) { fx->x.HALF.HI += 6; fx->y.HALF.HI -= 6; } - fx = CreateFx(this, 2, 0); + fx = CreateFx(this, FX_DEATH, 0); if (fx != NULL) { fx->x.HALF.HI -= 6; fx->y.HALF.HI -= 6; diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c index 5ce140c5..b7301df7 100644 --- a/src/enemy/lakituCloud.c +++ b/src/enemy/lakituCloud.c @@ -2,6 +2,7 @@ #include "entity.h" #include "player.h" #include "functions.h" +#include "effects.h" extern u32 GetNextFunction(Entity*); @@ -24,7 +25,7 @@ void sub_0803CCD4(Entity* this) { } void sub_0803CCEC(Entity* this) { - this->field_0x42 = 0; + this->knockbackDuration = 0; sub_0803CCD4(this); } @@ -126,7 +127,7 @@ void sub_0803CE14(Entity* this) { } void sub_0803CE3C(Entity* this) { - CreateFx(this, 2, 0); + CreateFx(this, FX_DEATH, 0); this->action = 2; this->actionDelay = 60; diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c index b6a5988f..70f5ea3f 100644 --- a/src/enemy/likeLike.c +++ b/src/enemy/likeLike.c @@ -6,7 +6,7 @@ #include "createObject.h" #include "functions.h" -extern bool32 sub_080544B4(u32); +extern bool32 ItemIsShield(u32); void sub_0802810C(Entity*); void sub_080281A0(Entity*); @@ -207,9 +207,9 @@ void sub_0802805C(Entity* this) { NONMATCH("asm/non_matching/likeLike/sub_0802810C.inc", void sub_0802810C(Entity* this)) { gPlayerState.jumpStatus = 0x41; gPlayerState.field_0xa = 0; - gPlayerState.flags.all &= 0xffffffef; + gPlayerState.flags &= 0xffffffef; gPlayerEntity.flags |= 0x80; - gPlayerEntity.field_0x20 = 0x18000; + gPlayerEntity.hVelocity = 0x18000; gPlayerEntity.iframes = -60; gPlayerEntity.direction = gPlayerEntity.animationState << 2; gPlayerEntity.spritePriority.b1 = this->field_0x82.HALF.HI; @@ -229,10 +229,10 @@ void sub_080281A0(Entity* this) { this->field_0xf = 0x19; if (sub_080281E0(0xe)) { this->field_0x80.HALF.LO = 0xe; - TextboxNoOverlapFollow(0x578); + MessageFromTarget(0x578); } else if (sub_080281E0(0xd)) { this->field_0x80.HALF.LO = 0xd; - TextboxNoOverlapFollow(0x578); + MessageFromTarget(0x578); } else { ModHealth(-1); } @@ -241,11 +241,11 @@ void sub_080281A0(Entity* this) { bool32 sub_080281E0(u32 param_1) { bool32 ret = FALSE; if (GetInventoryValue(param_1) == 1) { - if (sub_080544B4(gSave.stats.itemOnA)) { + if (ItemIsShield(gSave.stats.itemOnA)) { gSave.stats.itemOnA = 0; } - if (sub_080544B4(gSave.stats.itemOnB)) { + if (ItemIsShield(gSave.stats.itemOnB)) { gSave.stats.itemOnB = 0; } @@ -262,7 +262,7 @@ void sub_08028224(u32 param_1) { #else sub_080A7C18(param_1, 0, 1); #endif - TextboxNoOverlapFollow(0x579); + MessageFromTarget(0x579); } void (*const gUnk_080CC6FC[])(Entity*) = { diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c index 7d1fa2ee..513848d9 100644 --- a/src/enemy/madderpillar.c +++ b/src/enemy/madderpillar.c @@ -2,6 +2,7 @@ #include "entity.h" #include "random.h" #include "functions.h" +#include "effects.h" extern u8 gEntCount; extern Hitbox gUnk_080FD298; @@ -163,7 +164,7 @@ void sub_08029B2C(Entity* this) { if (sub_0802A14C(this)) { if (this->field_0x86.HALF.LO) { if (--this->actionDelay == 0) { - CreateFx(this, 0x48, 0); + CreateFx(this, FX_GIANT_EXPLOSION3, 0); DeleteEntity(this); } } else { @@ -241,7 +242,7 @@ void sub_08029C6C(Entity* this) { void sub_08029C98(Entity* this) { if (sub_0802A14C(this)) { - CreateFx(this, 0x48, 0); + CreateFx(this, FX_GIANT_EXPLOSION3, 0); DeleteEntity(this); } else { gUnk_080CCDA8[this->action](this); diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c index be47d87f..96ded54d 100644 --- a/src/enemy/mazaalBracelet.c +++ b/src/enemy/mazaalBracelet.c @@ -4,6 +4,7 @@ #include "random.h" #include "object.h" #include "functions.h" +#include "effects.h" void sub_0803B538(Entity*); u32 sub_0803B4E4(Entity*); @@ -915,7 +916,7 @@ void sub_0803B100(Entity* this) { Entity* temp; this->action = 0x29; - this->field_0x20 = 0x14000; + this->hVelocity = 0x14000; if (this->type == 0) { this->hitbox = &gUnk_080FD364; } else { @@ -962,7 +963,7 @@ void sub_0803B1B8(Entity* this) { this->field_0x7c.HALF.HI = 0x5dc; this->spriteSettings.b.draw = 0; this->damageType = 0x14; - temp = CreateFx(this, 0x51, 0); + temp = CreateFx(this, FX_GIANT_EXPLOSION4, 0); if (temp != (Entity*)0x0) { temp->x.HALF.HI += this->hitbox->offset_x; temp->y.HALF.HI += this->hitbox->offset_y; @@ -981,7 +982,7 @@ void sub_0803B1B8(Entity* this) { if ((temp->field_0x80.HALF.LO & 0xc) == 0xc) { temp->action = 0xb; temp->actionDelay = 0x78; - temp->field_0x20 = 0; + temp->hVelocity = 0; (*(Entity**)&temp->field_0x74)->field_0x7c.HALF_U.HI = 0x708; (*(Entity**)&temp->field_0x78)->field_0x7c.HALF_U.HI = 0x708; } @@ -1226,9 +1227,9 @@ void sub_0803B724(Entity* param_1) { void sub_0803B798(void) { gPlayerState.jumpStatus = 0x41; gPlayerState.field_0xa = 0; - gPlayerState.flags.all &= 0xffef; + gPlayerState.flags &= 0xffef; gPlayerEntity.flags |= 0x80; - gPlayerEntity.field_0x20 = 0x18000; + gPlayerEntity.hVelocity = 0x18000; gPlayerEntity.height.HALF.HI = -10; gPlayerEntity.direction = 0x10; gPlayerEntity.animationState = 4; @@ -1256,7 +1257,7 @@ u32 sub_0803B870(Entity* this) { Entity* entity; entity = this->attachedEntity; - if ((entity->bitfield & 0x80) != 0 && (gPlayerState.flags.all & 0x10) != 0) { + if ((entity->bitfield & 0x80) != 0 && (gPlayerState.flags & 0x10) != 0) { this->action = 0x18; this->actionDelay = 0x44; this->spriteSettings.b.draw = 0; diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c index bfa45e69..a4b000e8 100644 --- a/src/enemy/mazaalHead.c +++ b/src/enemy/mazaalHead.c @@ -6,6 +6,7 @@ #include "random.h" #include "object.h" #include "functions.h" +#include "effects.h" extern void UnloadOBJPalette(Entity*); @@ -78,7 +79,7 @@ void (*const gUnk_080CECB4[])(Entity*) = { }; const u8 gUnk_080CECEC[] = { 0xff, 0xfe, 0xff, 0x00, 0x01, 0x02, 0x01, 0x00 }; const s8 gUnk_080CECF4[] = { -2, 0x01, -8, -4, -0x14, 0x08, 0x0e, -0x10, -6, 0x0c, 0x12, -2, 0x00, 0x00 }; -const u8 gUnk_080CED02[] = { 0x46, 0x46, 0x47, 0x48 }; +const u8 gUnk_080CED02[] = { FX_GIANT_EXPLOSION, FX_GIANT_EXPLOSION, FX_GIANT_EXPLOSION2, FX_GIANT_EXPLOSION3 }; const u8 gUnk_080CED06[] = { 0xff, 0x00, 0x01, 0x00, 0x00, 0x00 }; void (*const gUnk_080CED0C[])(Entity*) = { sub_08034578, sub_080344E0, sub_0803451C, sub_080344E0, sub_08034558, sub_080344E0, sub_0803451C, sub_080346A0, @@ -815,7 +816,7 @@ void sub_08034BC8(Entity* this) { } void sub_08034C00(Entity* this) { - if (((gPlayerState.flags.all & 0x80) != 0) && + if (((gPlayerState.flags & 0x80) != 0) && CheckPlayerInRegion(this->x.HALF.HI - gRoomControls.roomOriginX, this->y.HALF.HI - gRoomControls.roomOriginY + 0xd, 3, 3) != 0) { if (gScreenTransition.field_0x39 >= 0x3d) { diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c index 0e32a810..e9cf7191 100644 --- a/src/enemy/mazaalMacro.c +++ b/src/enemy/mazaalMacro.c @@ -5,6 +5,7 @@ #include "script.h" #include "structures.h" #include "functions.h" +#include "effects.h" extern void sub_0807B600(u32); @@ -43,7 +44,7 @@ void (*const gUnk_080CEEB0[])(Entity*) = { sub_08034E30, sub_08034E68, sub_08034EC0, sub_08034ED8, sub_08034EE4, sub_08034F58, }; -const u8 gUnk_080CEEC8[] = { 0x46, 0x46, 0x47, 0x48 }; +const u8 gUnk_080CEEC8[] = { FX_GIANT_EXPLOSION, FX_GIANT_EXPLOSION, FX_GIANT_EXPLOSION2, FX_GIANT_EXPLOSION3 }; const u8 gUnk_080CEECC[] = { 0x58, 0x68, 0x88, 0x68, 0xb8, 0x68, 0x58, 0xa8, 0x88, 0xa8, 0xb8, 0xa8 }; const s16 gUnk_080CEED8[] = { -0x82, -0x81, -0x80, -0x7f, -0x7e, -0x42, -0x41, -0x40, -0x3f, -0x3e, -2, -1, 1, 2, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x7e, 0x7f, 0x80, 0x81, 0x82 }; @@ -113,7 +114,7 @@ void sub_08034D4C(Entity* this) { void sub_08034DC8(Entity* this) { if (gScreenTransition.field_0x39 == 0) { - CreateFx(this, 0x51, 0); + CreateFx(this, FX_GIANT_EXPLOSION4, 0); sub_0807BA8C(COORD_TO_TILE(this), this->collisionLayer); DeleteThisEntity(); } diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c index 3210aeeb..930ed8f0 100644 --- a/src/enemy/miniFireballGuy.c +++ b/src/enemy/miniFireballGuy.c @@ -53,7 +53,7 @@ void sub_08045654(Entity* this) { void sub_08045678(Entity* this) { - this->field_0x20 = 0x1c000; + this->hVelocity = 0x1c000; if (this->actionDelay != 0) { this->actionDelay--; } else { diff --git a/src/enemy/moldorm.c b/src/enemy/moldorm.c index 2fc1f67f..1ee92567 100644 --- a/src/enemy/moldorm.c +++ b/src/enemy/moldorm.c @@ -36,7 +36,7 @@ void sub_08022BEC(Entity* this) { this->field_0x7a.HALF.LO = this->currentHealth; this->actionDelay = 1; - this->direction = this->field_0x3e; + this->direction = this->knockbackDirection; this->animationState = ((this->direction + 2) & 0x1c) >> 2; this->frameIndex = this->animationState; diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c index cb27ab6d..88ad48bf 100644 --- a/src/enemy/moldworm.c +++ b/src/enemy/moldworm.c @@ -2,6 +2,7 @@ #include "entity.h" #include "random.h" #include "functions.h" +#include "effects.h" extern void sub_0800449C(Entity*, u32); extern bool32 sub_08023A38(u32); @@ -83,11 +84,11 @@ void sub_080230E4(Entity* this) { CopyPosition(this, &gPlayerEntity); gPlayerEntity.flags = gPlayerEntity.flags | 0x80; gPlayerEntity.spriteSettings.b.draw = 1; - gPlayerEntity.field_0x20 = 0x18000; + gPlayerEntity.hVelocity = 0x18000; gPlayerEntity.direction = 0xff; gPlayerEntity.iframes = -0x14; gPlayerState.jumpStatus = 0x41; - gPlayerState.flags.all &= 0xfff7ffff; + gPlayerState.flags &= 0xfff7ffff; } sub_0804AA30(this, gUnk_080CBC38); @@ -177,7 +178,7 @@ void sub_08023330(Entity* this) { this->field_0x7c.BYTES.byte3 = 0; sub_08023A88(this, this->animationState); CopyPosition(this, this->attachedEntity); - CreateFx(this, 4, 0); + CreateFx(this, FX_ROCK, 0); } } @@ -199,7 +200,7 @@ void sub_08023398(Entity* this) { this->damageType = 0x85; this->attachedEntity->actionDelay = 1; sub_08023A68(this); - CreateFx(this, 4, 0); + CreateFx(this, FX_ROCK, 0); return; } this->field_0x78.HWORD = 0x28; @@ -265,7 +266,7 @@ void sub_0802351C(Entity* this) { if (this->field_0x7c.BYTES.byte3 == 0) { if (this->type2 == 0) { gPlayerEntity.animationState = this->animationState & 7; - gPlayerState.flags.all |= 0x80000; + gPlayerState.flags |= 0x80000; PositionRelative(this, &gPlayerEntity, 0, gUnk_080CBC90[this->animationState & 7] << 0x10); gPlayerEntity.spriteOffsetY = -gUnk_080CBC90[this->animationState & 7]; } @@ -400,7 +401,7 @@ void sub_08023894(Entity* this) { this->parent->field_0x7c.BYTES.byte3 = 1; InitializeAnimation(this, this->animationState); if (this->parent->type2 == 0) { - gPlayerState.flags.all |= 0x200000; + gPlayerState.flags |= 0x200000; gPlayerEntity.x.HALF.HI = this->x.HALF.HI; gPlayerEntity.y.HALF.HI = this->y.HALF.HI; gPlayerEntity.direction = DirectionRoundUp(GetFacingDirection(*(Entity**)&this->field_0x74, this)); diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c index adcbea9d..9a96a72d 100644 --- a/src/enemy/peahat.c +++ b/src/enemy/peahat.c @@ -234,7 +234,7 @@ void Peahat_Stunned(Entity* this) { } if (this->direction == 0xff) - this->direction = this->field_0x3e; + this->direction = this->knockbackDirection; ProcessMovement(this); GetNextFrame(this); @@ -260,7 +260,7 @@ void Peahat_RepairPropeller(Entity* this) { return; this->action = 9; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; this->direction = Random() & 0x1f; sub_0804AA1C(this); this->animationState = PeahatAnimation_RepairPropeller; @@ -286,7 +286,7 @@ void Peahat_Hop(Entity* this) { if (--this->actionDelay == 0) { if (this->frames.all & 0x80) { this->action = 9; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; this->animationState = PeahatAnimation_NewPropeller; InitializeAnimation(this, this->animationState); } else { diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index 698edc94..b8247e34 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -395,7 +395,7 @@ void sub_080244E8(Entity* this) { sub_080249DC(this); this->cutsceneBeh.HALF.HI = gPlayerEntity.spritePriority.b1; gPlayerEntity.flags &= 0x7f; - gPlayerState.flags.all |= 0x100; + gPlayerState.flags |= 0x100; gPlayerState.field_0xa |= 0x80; if (gPlayerState.swimState != 0) { gPlayerState.swimState = 0; @@ -809,7 +809,7 @@ NONMATCH("asm/non_matching/pesto/sub_08024E4C.inc", void sub_08024E4C(Entity* th Entity* player = &gPlayerEntity; ResetPlayer(); - gPlayerState.flags.all |= 0x100; + gPlayerState.flags |= 0x100; gPlayerState.field_0xa |= 0x80; gPlayerState.playerAction = 0xe; gPlayerState.field_0x38 = 0x14; @@ -832,7 +832,7 @@ END_NONMATCH void sub_08024F50(Entity* this) { gPlayerState.field_0xa = 0; - gPlayerState.flags.all &= 0xfffffeff; + gPlayerState.flags &= 0xfffffeff; CopyPosition(this, &gPlayerEntity); gPlayerEntity.action = 1; gPlayerEntity.flags |= 0x80; diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c index c3b02ae4..4225a61f 100644 --- a/src/enemy/puffstool.c +++ b/src/enemy/puffstool.c @@ -3,6 +3,7 @@ #include "random.h" #include "object.h" #include "functions.h" +#include "effects.h" extern u32 sub_080002E0(u32, u32); extern u32 sub_080002C8(u16, u8); @@ -71,11 +72,11 @@ void sub_08025020(Entity* this) { } this->action = 7; this->actionDelay = 0x3c; - if (0 < this->field_0x20) { - this->field_0x20 = 0; + if (0 < this->hVelocity) { + this->hVelocity = 0; } this->iframes = -0xc; - this->field_0x42 = 0; + this->knockbackDuration = 0; if (this->field_0x80.HALF.LO == 0) { this->animationState = (*(Entity**)&this->field_0x4c)->direction >> 3; InitializeAnimation(this, this->animationState + 4); @@ -199,7 +200,7 @@ void sub_080252E0(Entity* this) { this->action = 3; this->actionDelay = 0x1e; this->field_0xf = 0; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; InitializeAnimation(this, 1); } } @@ -212,7 +213,7 @@ void sub_0802538C(Entity* this) { GetNextFrame(this); } else { sub_08003FC4(this, 0x2000); - if (this->field_0x20 < 0x2000) { + if (this->hVelocity < 0x2000) { this->action = 4; InitializeAnimation(this, 2); } @@ -241,7 +242,7 @@ void sub_0802541C(Entity* this) { if (this->frames.all & 0x80) { this->action = 3; this->field_0xf = 1; - this->field_0x20 = 0x20000; + this->hVelocity = 0x20000; InitializeAnimation(this, 1); } } @@ -520,12 +521,12 @@ bool32 sub_08025AB8(u32 tile, u32 layer) { void sub_08025AE8(Entity* this) { Entity* ent; - ent = CreateFx(this, 0x22, 0); + ent = CreateFx(this, FX_BROWN_SMOKE, 0); if (ent) { ent->y.WORD--; } - ent = CreateFx(this, 0x23, 0); + ent = CreateFx(this, FX_BROWN_SMOKE_LARGE, 0); if (ent) { ent->y.WORD++; } diff --git a/src/enemy/rockChuchu.c b/src/enemy/rockChuchu.c index c7b0dbe1..e4f2bf30 100644 --- a/src/enemy/rockChuchu.c +++ b/src/enemy/rockChuchu.c @@ -2,6 +2,7 @@ #include "entity.h" #include "random.h" #include "functions.h" +#include "effects.h" extern void sub_0804A4E4(Entity*, Entity*); @@ -40,7 +41,7 @@ void sub_08022254(Entity* this) { break; case 0x16: case 0x1c: - CreateFx(this, 4, 0); + CreateFx(this, FX_ROCK, 0); ent = CreateEnemy(CHUCHU, 1); if (ent) { ent->type2 = 1; @@ -51,7 +52,7 @@ void sub_08022254(Entity* this) { this->action = 2; this->flags &= ~0x80; this->spriteSettings.b.draw = 0; - this->direction = this->field_0x3e; + this->direction = this->knockbackDirection; this->attachedEntity = ent; } } @@ -101,8 +102,8 @@ void sub_080223E4(Entity* this) { ent->bitfield = 0x94; ent->iframes = 0x10; #ifndef EU - ent->field_0x42 = 0xc; - ent->field_0x3e = this->direction; + ent->knockbackDuration = 0xc; + ent->knockbackDirection = this->direction; #endif } diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c index 0e6ee1bb..cafa618d 100644 --- a/src/enemy/rollobite.c +++ b/src/enemy/rollobite.c @@ -32,7 +32,7 @@ void Rollobite_OnTick(Entity* this) { void sub_08020668(Entity* this) { if (this->damageType == 34 && this->currentHealth != 0xff) { this->action = 4; - this->field_0x20 = 0x20000; + this->hVelocity = 0x20000; this->direction = 0xff; this->currentHealth = 0xff; this->damageType = 35; @@ -54,11 +54,11 @@ void sub_08020668(Entity* this) { void sub_080206E0(Entity* this) { if (Rollobite_TryToHoleUp(this)) { - this->field_0x42 = 0; + this->knockbackDuration = 0; } else if (Rollobite_IsRolledUp(this)) { - this->field_0x42--; - sub_080AE58C(this, this->field_0x3e, 10); - sub_080AE7E8(this, this->field_0x46, this->field_0x3e, 10); + this->knockbackDuration--; + sub_080AE58C(this, this->knockbackDirection, 10); + sub_080AE7E8(this, this->field_0x46, this->knockbackDirection, 10); } else { sub_08001324(this); } @@ -102,7 +102,7 @@ void sub_080207A8(Entity* this) { this->spritePriority.b0 = 4; this->field_0x3a &= 0xfb; this->direction ^= 0x10; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; this->speed = 0x80; InitializeAnimation(this, this->animationState + 0x10); } @@ -262,7 +262,7 @@ bool32 Rollobite_TryToHoleUp(Entity* this) { this->x.HALF.HI += 8; this->y.HALF.HI &= 0xfff0; this->y.HALF.HI += 13; - this->field_0x20 = 0x20000; + this->hVelocity = 0x20000; InitializeAnimation(this, this->animationState + 0x14); SetTile(0x4034, tile, this->collisionLayer); return TRUE; diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c index 0f29065a..fd72c272 100644 --- a/src/enemy/rupeeLike.c +++ b/src/enemy/rupeeLike.c @@ -231,9 +231,9 @@ void sub_080296C8(Entity* this) { void sub_080296D8(Entity* this) { gPlayerState.jumpStatus = 0x41; - gPlayerState.flags.all &= 0xffffffef; + gPlayerState.flags &= 0xffffffef; gPlayerEntity.flags |= 0x80; - gPlayerEntity.field_0x20 = 0x18000; + gPlayerEntity.hVelocity = 0x18000; gPlayerEntity.iframes = 0xa6; gPlayerEntity.height.HALF.HI = -2; gPlayerEntity.direction = gPlayerEntity.animationState << 2; diff --git a/src/enemy/slime.c b/src/enemy/slime.c index cd79f8f7..34f9cb55 100644 --- a/src/enemy/slime.c +++ b/src/enemy/slime.c @@ -4,6 +4,7 @@ #include "room.h" #include "random.h" #include "functions.h" +#include "effects.h" typedef struct { s8 h, v; @@ -115,7 +116,7 @@ void sub_080450A8(Entity* this) { off++; } - ent = CreateFx(this, 2, 0); + ent = CreateFx(this, FX_DEATH, 0); if (ent) CopyPosition(this, ent); diff --git a/src/enemy/spark.c b/src/enemy/spark.c index e11228e6..71e913c5 100644 --- a/src/enemy/spark.c +++ b/src/enemy/spark.c @@ -2,6 +2,7 @@ #include "entity.h" #include "object.h" #include "functions.h" +#include "effects.h" extern void (*const gUnk_080CD234[])(Entity*); extern void (*const gUnk_080CD24C[])(Entity*); @@ -23,7 +24,7 @@ void sub_0802B2E0(Entity* this) { this->iframes = 0; this->spriteSettings.b.draw = 0; this->action = 2; - ent = CreateFx(this, 2, 0); + ent = CreateFx(this, FX_DEATH, 0); if (ent) { this->attachedEntity = ent; this->actionDelay = 14; diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c index 68f52f04..34beba3a 100644 --- a/src/enemy/spearMoblin.c +++ b/src/enemy/spearMoblin.c @@ -2,6 +2,7 @@ #include "entity.h" #include "random.h" #include "functions.h" +#include "effects.h" extern bool32 sub_0806FC80(Entity*, Entity*, u32); extern Entity* sub_08049DF4(u32); @@ -224,7 +225,7 @@ void sub_08028528(Entity* this) { if ((this->actionDelay & 7) == 0) { EnqueueSFX(0xf0); - CreateFx(this, 2, 0x40); + CreateFx(this, FX_DEATH, 0x40); } if (++this->field_0x7a.HALF.HI == 0x80) { @@ -379,11 +380,11 @@ bool32 sub_080288A4(Entity* this) { void sub_080288C0(Entity* this) { Entity* ent = this->attachedEntity; if (ent && (ent->bitfield & 0x80)) { - this->field_0x3e = ent->field_0x3e; + this->knockbackDirection = ent->knockbackDirection; this->iframes = -ent->iframes; this->field_0x46 = ent->field_0x46; - this->field_0x42 = ent->field_0x42; - ent->field_0x42 = 0; + this->knockbackDuration = ent->knockbackDuration; + ent->knockbackDuration = 0; } } diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c index 46c87653..4884f873 100644 --- a/src/enemy/spikedBeetle.c +++ b/src/enemy/spikedBeetle.c @@ -49,10 +49,10 @@ void sub_0802B628(Entity* this) { case 0x1d: if (this->action < 6) { this->action = 6; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; this->speed = 0xc0; - this->direction = this->field_0x3e; - this->field_0x42 = 0; + this->direction = this->knockbackDirection; + this->knockbackDuration = 0; this->iframes = -8; this->damageType = 100; InitializeAnimation(this, 9); @@ -166,7 +166,7 @@ void sub_0802B8E0(Entity* this) { } } else { this->action = 8; - this->field_0x20 = 0x10000; + this->hVelocity = 0x10000; this->speed = 0x60; this->damageType = 99; InitializeAnimation(this, this->animationState); diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c index bd0ca141..5f928636 100644 --- a/src/enemy/spinyChuchu.c +++ b/src/enemy/spinyChuchu.c @@ -159,7 +159,7 @@ void sub_080226EC(Entity* this) { if (sub_080228F0(this)) { this->action = 6; - this->field_0x20 = 0x12000; + this->hVelocity = 0x12000; this->speed = 0x140; this->direction = GetFacingDirection(this, gUnk_020000B0); this->damageType = 0x5a; diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c index ab5da752..0a2367bd 100644 --- a/src/enemy/tektite.c +++ b/src/enemy/tektite.c @@ -39,9 +39,9 @@ void sub_0802F150(Entity* this) { this->field_0xf = 0; *(u8*)&this->field_0x7c = 0; if (this->height.HALF.HI != 0) { - this->field_0x20 >>= 2; + this->hVelocity >>= 2; } else { - this->field_0x20 = 0; + this->hVelocity = 0; } InitializeAnimation(this, 0); break; @@ -95,7 +95,7 @@ void sub_0802F284(Entity* this) { this->action = 2; this->actionDelay = 0x10; this->field_0xf = this->type; - this->field_0x20 = this->field_0x82.HWORD << 4; + this->hVelocity = this->field_0x82.HWORD << 4; sub_0802F45C(this); InitializeAnimation(this, 2); } @@ -166,7 +166,7 @@ void sub_0802F3F4(Entity* this) { this->action = 2; this->actionDelay = 0x10; this->field_0xf = this->type; - this->field_0x20 = this->field_0x82.HWORD << 4; + this->hVelocity = this->field_0x82.HWORD << 4; (*(u8*)&this->field_0x7c.HALF.LO)++; sub_0802F45C(this); InitializeAnimation(this, 2); diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c index 2567c463..f5b7103a 100644 --- a/src/enemy/tektiteGolden.c +++ b/src/enemy/tektiteGolden.c @@ -33,9 +33,9 @@ void sub_08037F00(Entity* this) { this->field_0xf = 0; this->field_0x80.HALF.LO = 0; if (this->height.HALF.HI != 0) { - this->field_0x20 >>= 2; + this->hVelocity >>= 2; } else { - this->field_0x20 = 0; + this->hVelocity = 0; } InitializeAnimation(this, 0); @@ -86,7 +86,7 @@ void sub_08037Fe0(Entity* this) { this->action = 2; this->actionDelay = 6; this->field_0xf = 0; - this->field_0x20 = 0x38000; + this->hVelocity = 0x38000; sub_08038168(this); InitializeAnimation(this, 2); } @@ -142,7 +142,7 @@ void sub_08038110(Entity* this) { if (this->field_0x80.HALF.LO < 5) { this->action = 2; this->actionDelay = 8; - this->field_0x20 = 0x38000; + this->hVelocity = 0x38000; sub_08038168(this); InitializeAnimation(this, 2); } else { diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c index 66aa67c9..bd5d18f8 100644 --- a/src/enemy/vaatiArm.c +++ b/src/enemy/vaatiArm.c @@ -6,6 +6,7 @@ #include "random.h" #include "utils.h" #include "functions.h" +#include "effects.h" extern void DoExitTransition(ScreenTransitionData*); @@ -951,7 +952,7 @@ NONMATCH("asm/non_matching/vaati/sub_08043490.inc", void sub_08043490(Entity* th entity = ((VaatiArm_HeapStruct*)this->myHeap)->entities[4]; if (entity->height.HALF.HI < -4) { - entity->field_0x20 = 0x18000; + entity->hVelocity = 0x18000; this->subAction = 2; this->field_0x7c.BYTES.byte2 = 0; ((VaatiArm_HeapStruct*)this->myHeap)->parent->subAction = 2; @@ -978,7 +979,7 @@ void sub_08043520(Entity* this) { entity = ((VaatiArm_HeapStruct*)this->myHeap)->entities[4]; sub_08003FC4(entity, 0x1a00); - if ((entity->field_0x20 < 0) && (-6 < entity->height.HALF.HI)) { + if ((entity->hVelocity < 0) && (-6 < entity->height.HALF.HI)) { entity->height.HALF.HI = -6; this->subAction = 3; this->field_0x7a.HWORD = 900; @@ -1064,7 +1065,7 @@ static inline void deleteThing(Entity* this, const u32 index) { if (index == 1) { this->spriteSettings.b.draw = 0; } - CreateFx(((VaatiArm_HeapStruct*)this->myHeap)->entities[index], 0x51, 0); + CreateFx(((VaatiArm_HeapStruct*)this->myHeap)->entities[index], FX_GIANT_EXPLOSION4, 0); ((VaatiArm_HeapStruct*)this->myHeap)->entities[index]->myHeap = NULL; DeleteEntity(((VaatiArm_HeapStruct*)this->myHeap)->entities[index]); } @@ -1331,7 +1332,7 @@ void sub_08043D08(Entity* this) { entity->spriteSettings.b.draw = 0; InitializeAnimation(entity, 0x13); sub_0804AA1C(entity); - fx = CreateFx(entity, 0x51, 0); + fx = CreateFx(entity, FX_GIANT_EXPLOSION4, 0); if (fx != NULL) { fx->x.HALF.HI += gUnk_080D13E9[this->type2]; fx->y.HALF.HI -= 6; @@ -1351,7 +1352,7 @@ void sub_08043DB0(Entity* this) { Entity* pEVar3; Entity* pEVar4; - if (((gPlayerState.flags.all & 0x80) != 0)) { + if (((gPlayerState.flags & 0x80) != 0)) { pEVar3 = ((VaatiArm_HeapStruct*)this->myHeap)->entities[3]; if (CheckPlayerInRegion(pEVar3->x.HALF.HI - gRoomControls.roomOriginX, pEVar3->y.HALF.HI - gRoomControls.roomOriginY + 2, 3, 3)) { diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c index 1d77249e..a74de388 100644 --- a/src/enemy/vaatiProjectile.c +++ b/src/enemy/vaatiProjectile.c @@ -74,7 +74,7 @@ void VaatiProjectileFunction1(Entity* this) { entity->flags = entity->flags & 0x7f; } } else { - gPlayerState.flags.all &= 0xfffffeff; // using b.unk8 does not match + gPlayerState.flags &= 0xfffffeff; // using b.unk8 does not match entity = &gPlayerEntity; entity->flags = gPlayerEntity.flags | 0x80; } diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c index 9df23058..f96527e9 100644 --- a/src/enemy/vaatiRebornEnemy.c +++ b/src/enemy/vaatiRebornEnemy.c @@ -6,6 +6,7 @@ #include "audio.h" #include "area.h" #include "functions.h" +#include "effects.h" extern void sub_080AEFB4(Entity*); extern u8 gEntCount; @@ -477,7 +478,7 @@ void VaatiRebornEnemyType0Action7(Entity* this) { SetRoomFlag(1); } else { if ((this->actionDelay & 7) == 0) { - fx = CreateFx(this, 2, 0); + fx = CreateFx(this, FX_DEATH, 0); if (fx != NULL) { tmp = Random() & 0x3f3f; fx->x.HALF.HI = ((tmp & 0xff) - 0x20) + fx->x.HALF.HI; diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c index 399f511b..757d6544 100644 --- a/src/enemy/vaatiTransfigured.c +++ b/src/enemy/vaatiTransfigured.c @@ -5,6 +5,7 @@ #include "flags.h" #include "audio.h" #include "functions.h" +#include "effects.h" void sub_080409B0(Entity*); void sub_080408EC(Entity*); @@ -312,7 +313,7 @@ void VaatiTransfiguredType0Action3(Entity* this) { if (this->actionDelay != 0) { if (--this->actionDelay == 0) { this->flags &= 0x7f; - this->field_0x20 = 0x38000; + this->hVelocity = 0x38000; this->field_0xf = 0x10; } break; @@ -378,7 +379,7 @@ void VaatiTransfiguredType0Action4(Entity* this) { this->field_0x74.HALF.LO = 0; this->actionDelay = 0x80; this->field_0xf = 0; - this->field_0x20 = 0x24000; + this->hVelocity = 0x24000; SoundReq(SFX_12B); } break; @@ -567,7 +568,7 @@ void VaatiTransfiguredType0Action7(Entity* this) { } this->field_0xf = (this->field_0xf + 1) & 7; if (this->field_0xf == 0) { - pEVar3 = CreateFx(this, 0x55, 0); + pEVar3 = CreateFx(this, FX_AURA_BASE, 0); if (pEVar3 != NULL) { uVar4 = Random() & 0x3f3f; pEVar3->x.HALF.HI += (uVar4 & 0xff) - 0x20; @@ -1060,7 +1061,7 @@ void sub_080409B0(Entity* this) { this->field_0x80.HALF.HI = 3; this->flags &= 0x7f; this->damageType = 0x36; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; SoundReq(SFX_164); } } @@ -1068,7 +1069,7 @@ void sub_080409B0(Entity* this) { } if (this->field_0x80.HALF.HI < 3) { - if (this->field_0x42 != 0) { + if (this->knockbackDuration != 0) { sub_080AF18C(this); } } else { diff --git a/src/enemy/vaatiTransfiguredEye.c b/src/enemy/vaatiTransfiguredEye.c index ab0bd34a..a4cf8999 100644 --- a/src/enemy/vaatiTransfiguredEye.c +++ b/src/enemy/vaatiTransfiguredEye.c @@ -93,8 +93,8 @@ void VaatiTransfiguredEyeFunction0Action0(Entity* this) { Entity* child; u8 bVar2; - bVar2 = gTextBox.doTextBox & 0x7f; - if ((gTextBox.doTextBox & 0x7f) == 0) { + bVar2 = gMessage.doTextBox & 0x7f; + if ((gMessage.doTextBox & 0x7f) == 0) { this->action = 1; this->spriteSettings.b.draw = 0; this->field_0x80.HALF.LO = bVar2; diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c index 1beef337..08b5cb85 100644 --- a/src/enemy/vaatiWrath.c +++ b/src/enemy/vaatiWrath.c @@ -10,6 +10,7 @@ #include "structures.h" #include "functions.h" #include "save.h" +#include "effects.h" extern u8 gEntCount; @@ -455,7 +456,7 @@ void VaatiWrathType0ActionA(Entity* this) { this->subAction = 0; this->direction = 0; this->speed = 0x100; - this->field_0x20 = 0x12000; + this->hVelocity = 0x12000; sub_0801D2B4(this, 0x16b); InitAnimationForceUpdate(this, 5); type1 = ((VaatiWrathHeapStruct*)this->myHeap)->type1; @@ -625,7 +626,7 @@ void sub_08041CD0(Entity* this) { } else { this->subAction = 2; this->actionDelay = 0x3c; - TextboxNoOverlapFollow(0x1651); + MessageFromTarget(0x1651); } } else { UpdateAnimationSingleFrame(this); @@ -636,7 +637,7 @@ void sub_08041D14(Entity* this) { Entity* pEVar1; GetNextFrame(((VaatiWrathHeapStruct*)this->myHeap)->type2); - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { if (this->actionDelay != 0) { this->actionDelay--; } else { @@ -708,7 +709,7 @@ void sub_08041E78(Entity* this) { const s8* temp; if ((this->field_0xf & 0xf) == 0) { - fx = CreateFx(this, 0x51, 0); + fx = CreateFx(this, FX_GIANT_EXPLOSION4, 0); if (fx != NULL) { temp = &gUnk_080D0E90[this->field_0xf >> 3 & 0xe]; fx->x.HALF.HI += *temp++; diff --git a/src/enemy/vaatiWrathEye.c b/src/enemy/vaatiWrathEye.c index 53434faa..2fd855f5 100644 --- a/src/enemy/vaatiWrathEye.c +++ b/src/enemy/vaatiWrathEye.c @@ -2,6 +2,7 @@ #include "audio.h" #include "structures.h" #include "functions.h" +#include "effects.h" void sub_080485D8(Entity*); void sub_080485FC(Entity*); @@ -158,7 +159,7 @@ void VaatiWrathEyeAction7(Entity* this) { this->actionDelay = 0x3c; this->flags &= 0x7f; this->spriteSettings.b.draw = 0; - CreateFx(this, 0x1f, 0x40); + CreateFx(this, FX_REFLECT2, 0x40); this->parent->field_0x7a.HALF.HI |= 0x10 << this->type; } else { if (--this->actionDelay != 0) { diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c index 663c3612..9a3ae8d2 100644 --- a/src/enemy/wallMaster.c +++ b/src/enemy/wallMaster.c @@ -37,9 +37,9 @@ void sub_0802A454(Entity* this) { } } - if (this->field_0x42) - if (this->field_0x42 > 4) - this->field_0x42 -= 4; + if (this->knockbackDuration != 0) + if (this->knockbackDuration > 4) + this->knockbackDuration -= 4; if (this->field_0x43 != 0) { sub_0804A9FC(this, 0x1c); diff --git a/src/enemy/wallMaster2.c b/src/enemy/wallMaster2.c index a0c79d74..26074c7d 100644 --- a/src/enemy/wallMaster2.c +++ b/src/enemy/wallMaster2.c @@ -118,7 +118,7 @@ void sub_0802CE68(Entity* this) { gPlayerState.field_0xa |= 0x80; gPlayerState.field_0x1a[0] |= 0x80; - gPlayerState.flags.all |= 0x100; + gPlayerState.flags |= 0x100; if (!sub_0806FCB8(this, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI, 4)) { this->direction = GetFacingDirection(this, &gPlayerEntity); sub_0806F69C(this); diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c index e469cd03..73fc59eb 100644 --- a/src/enemy/waterDrop.c +++ b/src/enemy/waterDrop.c @@ -22,7 +22,7 @@ void sub_0802A250(Entity* this) { this->action = 1; this->actionDelay = 0; - this->field_0x20 = -0x30000; + this->hVelocity = -0x30000; this->speed = gUnk_080CD03C[Random() & 3]; this->direction = gUnk_080CD040[Random() & 3] + 0x18; this->collisionLayer = 2; diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c index 247cf0a0..05fdc4e0 100644 --- a/src/enemy/wisp.c +++ b/src/enemy/wisp.c @@ -6,6 +6,7 @@ #include "random.h" #include "createObject.h" #include "functions.h" +#include "effects.h" extern void (*const gUnk_080CEB74[])(Entity*); extern void (*const gUnk_080CEB8C[])(Entity*); @@ -36,7 +37,7 @@ void sub_08033564(Entity* this) { this->spriteSettings.b.draw = FALSE; this->flags &= 0x7f; this->field_0x7c.HALF.LO = 0x27c; - gPlayerState.flags.all |= 0x4000; + gPlayerState.flags |= 0x4000; gSave.stats.effect = this->type + 1; gSave.stats.effectTimer = 600; if (this->type == 0) { @@ -52,7 +53,7 @@ void sub_08033564(Entity* this) { this->flags &= 0x7f; this->iframes = 0; this->spriteSettings.b.draw = FALSE; - ent = CreateFx(this, 2, 0); + ent = CreateFx(this, FX_DEATH, 0); if (ent != NULL) { this->attachedEntity = ent; this->actionDelay = 0xe; diff --git a/src/entity.c b/src/entity.c index 60e571ff..cd9361f4 100644 --- a/src/entity.c +++ b/src/entity.c @@ -102,7 +102,7 @@ void DeleteEntity(Entity* ent) { ent->spriteSettings.b.draw = 0; ent->field_0x3c = 0; ent->bitfield = 0; - ent->field_0x42 = 0; + ent->knockbackDuration = 0; ent->currentHealth = 0; UnlinkEntity(ent); ent->next = NULL; diff --git a/src/ezloNag.c b/src/ezloNag.c index aa45634e..584b13fa 100644 --- a/src/ezloNag.c +++ b/src/ezloNag.c @@ -66,7 +66,7 @@ void sub_0801CF18(Element* arg0) { void sub_0801CF60(Element* arg0) { - if ((gUnk_0200AF00.ezloNagFuncIndex >= 5) || (gTextBox.doTextBox & 0x7f)) { + if ((gUnk_0200AF00.ezloNagFuncIndex >= 5) || (gMessage.doTextBox & 0x7f)) { arg0->unk4 = 0; arg0->unk0 &= -3; return; diff --git a/src/fileScreen.c b/src/fileScreen.c index b1e990be..0c8d4e6c 100644 --- a/src/fileScreen.c +++ b/src/fileScreen.c @@ -113,7 +113,7 @@ void CreateDialogBox(u32 arg0, u32 arg1) { } void sub_08050384(void) { - sub_0801C4A0(0, 0); + RecoverUI(0, 0); MemClear(&gBG0Buffer, sizeof(gBG0Buffer)); gScreen.bg.bg0Updated = 1; } @@ -144,14 +144,14 @@ void LoadOptionsFromSave(u32 idx) { brightnessPref = saveFile->brightnessPref; } - gUnk_02000000->messageSpeed = messageSpeed; - gUnk_02000000->brightnessPref = brightnessPref; + gSaveHeader->messageSpeed = messageSpeed; + gSaveHeader->brightnessPref = brightnessPref; gUsedPalettes = 0xFFFFFFFF; } void SetActiveSave(u32 idx) { if (idx < NUM_SAVE_SLOTS) { - gUnk_02000000->saveFileId = idx; + gSaveHeader->saveFileId = idx; MemCopy(&gUnk_02019EE0.saves[idx], &gSave, sizeof(gUnk_02019EE0.saves[idx])); } LoadOptionsFromSave(idx); @@ -181,8 +181,8 @@ void HandleChooseFileScreen(void) { sub_0801C208(); sub_080AD9B0(); sub_080AD918(); - if (gUnk_02019EE0.unk3 != gUnk_02000000->gameLanguage) { - gUnk_02019EE0.unk3 = gUnk_02000000->gameLanguage; + if (gUnk_02019EE0.unk3 != gSaveHeader->gameLanguage) { + gUnk_02019EE0.unk3 = gSaveHeader->gameLanguage; sub_080503A8(0x6); sub_080503A8(0xF); } @@ -202,7 +202,7 @@ static void HandleFileScreenEnter(void) { MemClear(&gUnk_0200AF00, sizeof(gUnk_0200AF00)); MemClear(&gUnk_02019EE0, sizeof(gUnk_02019EE0)); gUnk_02019EE0.unk3 = 7; - gUnk_02019EE0.unk6 = gUnk_02000000->gameLanguage > LANGUAGE_EN ? 3 : 0; + gUnk_02019EE0.unk6 = gSaveHeader->gameLanguage > LANGUAGE_EN ? 3 : 0; MemClear(&gUnk_02032EC0, sizeof(gUnk_02032EC0)); gUnk_02032EC0.lastState = 8; SetFileSelectState(STATE_NONE); @@ -297,7 +297,7 @@ void sub_0805070C(void) { var0->bgColor = 5; var0->unk1 = 1; var0->unk4 = 0x30; - var0->unk8 = gUnk_02000D00; + var0->unk8 = gTextGfxBuffer; for (i = 0; i < NUM_SAVE_SLOTS; i++) { var0->unk6 = 0; MemClear(var0->unk8, 0x200); @@ -323,7 +323,7 @@ void sub_08050790(void) { var0->bgColor = 5; var0->unk1 = 1; var0->unk4 = 0x80; - var0->unk8 = gUnk_02000D00; + var0->unk8 = gTextGfxBuffer; for (i = 0; i < 16; i++) { var0->unk6 = 0; var1 = i * 16; @@ -331,7 +331,7 @@ void sub_08050790(void) { sub_0805F7DC(var1, var0); var1++; } - MemCopy(gUnk_02000D00, (void*)(BG_VRAM + i * 0x400), 0x400); + MemCopy(gTextGfxBuffer, (void*)(BG_VRAM + i * 0x400), 0x400); } sub_0805F300(var0); } @@ -420,7 +420,7 @@ void sub_08050940(void) { keys &= ~(DPAD_UP | DPAD_DOWN); } - num_rows = gUnk_02000000->gameLanguage > 1 ? NUM_SAVE_SLOTS + 1 : NUM_SAVE_SLOTS; + num_rows = gSaveHeader->gameLanguage > 1 ? NUM_SAVE_SLOTS + 1 : NUM_SAVE_SLOTS; mode = gUnk_02032EC0.lastState; switch (keys) { case DPAD_UP: @@ -679,7 +679,7 @@ void HandleFileLanguageSelect(void) { void sub_08050DB8(void) { MemClear(&gBG2Buffer, sizeof(gBG2Buffer)); sub_080503A8(0xc); - gMenu.field_0x4 = gUnk_02000000->gameLanguage; + gMenu.field_0x4 = gSaveHeader->gameLanguage; sub_080A7114(1); } @@ -689,7 +689,7 @@ void sub_08050DE4(void) { if (gUnk_02019EE0.isTransitioning) return; - row_idx = gUnk_02000000->gameLanguage; + row_idx = gSaveHeader->gameLanguage; switch (gInput.newKeys) { case DPAD_UP: row_idx--; @@ -709,7 +709,7 @@ void sub_08050DE4(void) { break; case B_BUTTON: row_idx = gMenu.field_0x4; - gUnk_02000000->gameLanguage = gMenu.field_0x4; + gSaveHeader->gameLanguage = gMenu.field_0x4; SoundReq(SFX_MENU_CANCEL); SetFileSelectState(STATE_NONE); break; @@ -722,8 +722,8 @@ void sub_08050DE4(void) { if (row_idx > 6) { row_idx = 6; } - if (gUnk_02000000->gameLanguage != row_idx) { - gUnk_02000000->gameLanguage = row_idx; + if (gSaveHeader->gameLanguage != row_idx) { + gSaveHeader->gameLanguage = row_idx; SoundReq(SFX_TEXTBOX_CHOICE); } } @@ -869,7 +869,7 @@ NONMATCH("asm/non_matching/fileScreen/sub_080610B8.inc", void sub_080610B8(void) END_NONMATCH void sub_08051358(void) { - gMenu.field_0x12 = gUnk_02000000->gameLanguage == 0 ? 4 : 3; + gMenu.field_0x12 = gSaveHeader->gameLanguage == 0 ? 4 : 3; if (gMenu.focusCoords[0] != 0x0b || gMenu.focusCoords[1] != 0x5) { gMenu.focusCoords[1] = 0x5; @@ -958,7 +958,7 @@ u32 sub_080514BC(u32 a1) { u32 c; u32 idx; - if (gUnk_02000000->gameLanguage != 0) + if (gSaveHeader->gameLanguage != 0) return 1; switch (a1) { @@ -1169,7 +1169,7 @@ void sub_080517EC(void) { void sub_08051874(void) { s32 temp; - gUnk_02000000->saveFileId = gUnk_02019EE0.unk7; + gSaveHeader->saveFileId = gUnk_02019EE0.unk7; temp = HandleSave(0); gUnk_02019EE0.saveStatus[gUnk_02019EE0.unk7] = temp; switch (temp) { @@ -1202,8 +1202,8 @@ void sub_080518E4(void) { void HandleFileStart(void) { if (gMenu.menuType == 0) { gMenu.menuType = 1; - gUnk_02000000->messageSpeed = gSave.messageSpeed; - gUnk_02000000->brightnessPref = gSave.brightnessPref; + gSaveHeader->messageSpeed = gSave.messageSpeed; + gSaveHeader->brightnessPref = gSave.brightnessPref; gMain.funcIndex = 2; DoFade(5, 8); } diff --git a/src/flagDebug.c b/src/flagDebug.c new file mode 100644 index 00000000..e65edcf4 --- /dev/null +++ b/src/flagDebug.c @@ -0,0 +1,1236 @@ +// #define DEF_FLAGS( name, ... ) \ +// const char* const name##_flags[] = { \ +// "BEGIN", \ +// __VA_ARGS__ \ +// "END" \ +// }; + +// DEF_FLAGS(global, "a", +// "b"); + +const char* const globalFlagNames[] = { + "BEGIN", + "LV0_CLEAR", + "LV1_CLEAR", + "LV2_CLEAR", + "LV3_CLEAR", + "LV4_CLEAR", + "LV5_CLEAR", + "LV6_CLEAR", + "LV7_CLEAR", + "LV8_CLEAR", + "MACHI_SET_1", + "MACHI_SET_2", + "MACHI_SET_3", + "MACHI_SET_4", + "MACHI_SET_5", + "MACHI_SET_6", + "MACHI_SET_7", + "MACHI_SET_8", + "MACHI_MACHIHOKORI", + "START", + "EZERO_1ST", + "TABIDACHI", + "LV1TARU", + "LV1TARU_OPEN", + "TATEKAKE_HOUSE", + "TATEKAKE_TOCHU", + "WATERBEAN_OUT", + "WATERBEAN_PUT", + "ZELDA_CHASE", + "INLOCK", + "DASHBOOTS", + "LEFT_DOOR_OPEN", + "HAKA_KEY_LOST", + "HAKA_KEY_FOUND", + "ENTRANCE_OK", + "TATSUMAKI", + "KUMOTATSUMAKI", + "KAITENGIRI", + "DAIKAITENGIRI", + "GATOTSU", + "KABUTOWARI", + "MIZUKAKI_START", + "MIZUKAKI_HARIFALL", + "RENTED_HOUSE_DIN", + "RENTED_HOUSE_NAYRU", + "RENTED_HOUSE_FARORE", + "NEW_HOUSE_DIN", + "NEW_HOUSE_NAYRU", + "NEW_HOUSE_FARORE", + "OUGONTEKI_A", + "OUGONTEKI_B", + "OUGONTEKI_C", + "OUGONTEKI_D", + "OUGONTEKI_E", + "OUGONTEKI_F", + "OUGONTEKI_G", + "OUGONTEKI_H", + "OUGONTEKI_I", + "KAKERA_COMPLETE", + "DRUG_1", + "DRUG_2", + "DRUG_3", + "GORON_KAKERA_LV2", + "GORON_KAKERA_LV3", + "GORON_KAKERA_LV4", + "GORON_KAKERA_LV5", + "GORON_KAKERA_L", + "GORON_KAKERA_M", + "GORON_KAKERA_R", + "CHIKATSURO_SHUTTER", + "ENTRANCE_USED", + "GOMAN_RENTED_HOUSE", + "GOMAN_NEW_HOUSE", + "OUTDOOR", + "POWERGLOVE_HINT", + "ANJU_LV_BIT0", + "ANJU_LV_BIT1", + "ANJU_LV_BIT2", + "ANJU_LV_BIT3", + "ANJU_HEART", + "MAROYA_WAKEUP", + "ENDING", + "WARP_1ST", + "WARP_MONUMENT", + "DRUG_COUNT", + "GAMECLEAR", + "WHITE_SWORD_END", + "SOUGEN_06_HASHIGO", + "WARP_EVENT_END", + "FIGURE_ALLCOMP", + "AKINDO_BOTTLE_SELL", +#ifdef EU + "BIN_DOOGFOOD", +#else + "BIN_DOGFOOD", +#endif + "TINGLE_TALK1ST", + "SEIIKI_BGM", + "ENTRANCE_0", + "ENTRANCE_1", + "ENTRANCE_2", + "MIZUKAKI_NECHAN", + "MAZE_CLEAR", + "TINY_ENTRANCE", +#ifndef EU + "CASTLE_BGM", +#endif + "END", +}; + +const char* const localFlags1Names[] = { + "BEGIN", + "LV1_CLEAR_MES", + "LV2_CLEAR_MES", + "LV3_CLEAR_MES", + "LV4_CLEAR_MES", + "LV5_CLEAR_MES", + "MIZUUMI_00_BENT", + "MIZUUMI_00_00", + "MIZUUMI_00_H00", + "MIZUUMI_00_H01", + "MIZUUMI_00_H02", +#if !defined(EU) && !defined(JP) && !defined(DEMO_JP) + "MIZUUMI_00_CAP_0", +#else + "HIKYOU_00_T0", + "HIKYOU_00_T1", +#endif + "MAENIWA_00_00", + "MAENIWA_00_01", + "MAENIWA_00_02", + "MAENIWA_00_BENT", + "MAENIWA_00_WARP", + "MAENIWA_00_T0", + "MAENIWA_00_T1", + "MAENIWA_00_CAP_0", + "NAKANIWA_00_EZERO", + "HIKYOU_00_00", + "HIKYOU_00_01", + "HIKYOU_00_02", + "HIKYOU_00_03", + "HIKYOU_00_04", + "HIKYOU_00_CAP_0", + "HIKYOU_00_CAP_1", + "HIKYOU_00_CAP_2", + "HIKYOU_00_SEKIZOU", + "HIKYOU_00_14", + "HIKYOU_00_BOSEKI", +#if defined(EU) || defined(JP) || defined(DEMO_JP) + "HIKYOU_00_H00", +#endif + "HIKYOU_00_M0", + "HIKYOU_00_M1", + "HIKYOU_00_M2", +#if !defined(EU) && !defined(JP) && !defined(DEMO_JP) + "HIKYOU_00_T1", +#endif + "LOST_00_ENTER", + "LOST_00_00", + "LOST_00_01", + "LOST_02_00", + "LOST_03_00", + "LOST_03_T0", + "LOST_04_00", + "LOST_04_SIBA0", + "LOST_04_SIBA1", + "LOST_04_SIBA2", + "LOST_04_SIBA3", + "LOST_04_SIBA4", + "LOST_05_00", + "LOST_05_01", +#if !defined(JP) && !defined(EU) && !defined(DEMO_JP) + "LOST_05_02", + "LOST_05_03", +#endif + "LOST_05_T0", + "LOST_05_T1", + "MORI_00_HIBI_0", + "MORI_00_HIBI_1", + "MORI_00_HIBI_2", + "MORI_00_HIBI_3", + "MORI_00_HIBI_4", + "MORI_00_KOBITO", + "MORI_00_H0", + "MORI_00_H1", + "MORI_ENTRANCE_1ST", + "YAMA_00_00", + "YAMA_00_01", + "YAMA_01_BW00", + "YAMA_02_00", + "YAMA_03_00", + "YAMA_03_01", + "YAMA_03_02", + "YAMA_03_DOKU_0", + "YAMA_03_DOKU_1", + "YAMA_03_DOKU_2", + "YAMA_04_CAP_0", +#if !defined(JP) && !defined(EU) && !defined(DEMO_JP) + "YAMA_04_CAP_1", +#endif + "YAMA_04_R00", + "YAMA_04_HIBI_0", + "YAMA_04_HIBI_1", + "YAMA_04_00", + "YAMA_04_01", + "YAMA_04_04", + "YAMA_04_05", + "YAMA_04_06", + "YAMA_04_ENTHOUSHI", + "YAMA_04_ANAHOUSHI", + "YAMA_04_BOMBWALL0", + "HAKA_BUNSHIN_00", + "HAKA_BOSEKI_00", + "HAKA_BOSEKI_01", + "HAKA_BOSEKI_02", + "HAKA_00_CAP_0", + "HAKA_00_BW00", + "HAKA_01_T0", + "HAKA_KEY_GET", + "SOUGEN_01_WAKAGI_0", + "SOUGEN_01_WAKAGI_1", + "SOUGEN_01_WAKAGI_2", + "SOUGEN_01_WAKAGI_3", + "SOUGEN_01_WAKAGI_4", + "SOUGEN_01_WAKAGI_5", + "SOUGEN_01_WAKAGI_6", + "SOUGEN_01_WAKAGI_7", + "SOUGEN_01_WAKAGI_8", + "SOUGEN_01_WAKAGI_9", + "SOUGEN_01_WAKAGI_10", + "SOUGEN_01_WAKAGI_11", + "SOUGEN_01_WAKAGI_12", + "SOUGEN_01_00", + "SOUGEN_01_BENT", + "SOUGEN_01_ZELDA", + "SOUGEN_02_HIBI_0", + "SOUGEN_02_HIBI_1", + "SOUGEN_03_BOMBWALL", + "SOUGEN_04_HIBI_0", + "SOUGEN_04_HIBI_1", + "SOUGEN_04_HIBI_2", + "SOUGEN_04_HIBI_3", + "SOUGEN_05_HIBI_0", + "SOUGEN_05_HIBI_1", + "SOUGEN_05_HIBI_2", + "SOUGEN_05_HIBI_3", + "SOUGEN_05_BOMB_00", + "SOUGEN_05_00", + "SOUGEN_05_01", + "SOUGEN_05_IWA02", + "SOUGEN_05_BENT", + "SOUGEN_05_H00", + "SOUGEN_05_R0", + "SOUGEN_05_CAP_0", + "SOUGEN_06_WAKAGI_0", + "SOUGEN_06_WAKAGI_1", + "SOUGEN_06_WAKAGI_2", + "SOUGEN_06_WAKAGI_3", + "SOUGEN_06_HIBI_0", + "SOUGEN_06_HIBI_1", + "SOUGEN_06_HIBI_2", + "SOUGEN_06_HIBI_3", + "SOUGEN_06_HIBI_4", + "SOUGEN_06_IWA_0", + "SOUGEN_06_AKINDO", + "SOUGEN_06_SAIKAI", + "SOUGEN_06_BENT", + "SOUGEN_06_SLIDE", + "SOUGEN_06_R1", + "SOUGEN_07_00", + "SOUGEN_07_01", + "SOUGEN_07_02", +#if defined(JP) || defined(EU) || defined(DEMO_JP) + "SOUGEN_07_H00", +#endif + "SOUGEN_08_00", + "SOUGEN_08_01", + "SOUGEN_08_02", + "SOUGEN_08_03", + "SOUGEN_08_04", + "SOUGEN_08_05", + "SOUGEN_08_06", + "SOUGEN_08_07", + "SOUGEN_08_08", + "SOUGEN_08_TORITSUKI", + "SOUGEN_08_T00", + "CASTLE_00_00", + "CASTLE_04_MEZAME", + "CASTLE_04_MAID_TALK", + "SUIGEN_00_h0", + "SUIGEN_00_T0", + "SUIGEN_00_r0", + "SUIGEN_00_r1", + "SUIGEN_00_r2", + "SUIGEN_00_CAP_0", + "SUIGEN_00_CAP_1", + "SUIGEN_00_R0", + "SUIGEN_00_R1", +#if !defined(JP) && !defined(EU) && !defined(DEMO_JP) + "SUIGEN_00_R2", +#endif + "SUIGEN_00_h1", + "SUIGENGORON_00_CAP_0", + "DAIGORON_SHIELD", + "DAIGORON_EXCHG", + "BEANDEMO_00", + "BEANDEMO_01", + "BEANDEMO_02", + "BEANDEMO_03", + "BEANDEMO_04", + "KAKERA_TAKARA_A", + "KAKERA_TAKARA_E", +#if !defined(JP) && !defined(EU) && !defined(DEMO_JP) + "KAKERA_TAKARA_J", +#endif + "KAKERA_TAKARA_K", + "KAKERA_TAKARA_L", + "KAKERA_TAKARA_M", + "KAKERA_TAKARA_N", + "KAKERA_TAKARA_O", + "KAKERA_TAKARA_P", + "KAKERA_TAKARA_Q", + "KAKERA_TAKARA_R", + "KAKERA_TAKARA_S", + "KAKERA_TAKARA_T", + "KAKERA_TAKARA_U", + "KAKERA_TAKARA_V", + "KAKERA_TAKARA_W", + "KAKERA_TAKARA_X", + "KAKERA_TAKARA_Y", + "KAKERA_TAKARA_Z", + "MACHI_02_HEISHI_TALK", + "MACHI00_00", + "MACHI00_02", + "MACHI00_03", + "MACHI_00_T00", + "MACHI_00_T01", + "MACHI_01_DEMO", + "MACHI_02_HEISHI", + "MACHI_02_DOG", + "MACHI_07_BELL", + "SHOP05_OPEN", + "MACHI_MES_20", + "MACHI_MES_21", + "MACHI_MES_22", + "MACHI_MES_23", + "MACHI_MES_24", + "MACHI_MES_30", + "MACHI_MES_40", + "MACHI_MES_60", + "MACHI_MES_50", + "MACHI_DOG_C", + "KUMOUE_00_CAP_0", + "KUMOUE_01_CAP_0", + "KUMOUE_01_T0", + "KUMOUE_01_T1", + "KUMOUE_01_T2", + "KUMOUE_01_T3", + "KUMOUE_01_T4", + "KUMOUE_01_T5", + "KUMOUE_01_T6", + "KUMOUR_01_K0", + "KUMOUR_01_K1", + "KUMOUR_01_K2", + "KUMOUR_01_K3", + "KUMOUR_01_K4", + "KUMOUR_01_K5", + "KUMOUR_01_K6", + "KUMONOUE_01_KAKERA", + "KUMOUE_02_CAP_0", + "KUMOUE_02_AWASE_01", + "KUMOUE_02_AWASE_02", + "KUMOUE_02_AWASE_03", + "KUMOUE_02_AWASE_04", + "KUMOUE_02_AWASE_05", + "KUMOUE_02_00", + "KUMOUE_02_01", + "KUMOUE_02_02", + "KUMOUE_02_03", + "KUMOUE_UNCLE_TALK", + "KUMOUE_GIRL_TALK", +#if !defined(JP) && !defined(EU) && !defined(DEMO_JP) + "KS_A06", + "KS_B18", + "KS_C21", + "KS_C25", +#else + "MIZUUMI_00_CAP_0", + "SUIGEN_00_R2", + "YAMA_04_CAP_1", + "LOST_05_02", + "LOST_05_03", + "KAKERA_TAKARA_J", +#endif +#ifdef DEMO_JP + "KS_WARPUSE", +#endif + "END", +}; + +const char* const localFlags2Names[] = { + "BEGIN", + "BILL05_YADO1F_MATSU_T0", + "BILL06_YADO1F_TAKE_T0", + "BILL07_YADO1F_UME_T0", + "BILL0A_YADO_TAKARA_T0", + "SHOUSE_00_T0", + "SHOUSE_00_T1", + "SHOUSE_01_T0", + "SHOUSE_02_T0", + "SHOUSE_02_T1", + "SHOUSE_02_T2", + "SHOUSE_02_XXXX0", + "SHOUSE_02_XXXX1", + "SHOUSE_02_XXXX2", + "SHOUSE_03_T0", + "SHOUSE_03_T1", + "KOBITOANA_06_T0", + "KOBITOANA_03_T0", + "KOBITOANA_07_T0", + "KOBITOANA_09_T0", + "KOBITOANA_0A_T0", + "KOBITOANA_0B_T0", + "MHOUSE11_T0", + "URO_08_T0", + "URO_0A_T0", + "URO_0B_T0", + "BILL00_SHICHOU_00", + "BILL00_SHICHOU_01", + "BILL00_SHICHOU_02", + "BILL00_SHICHOU_03", + "BILL00_SHICHOU_04", + "BILL01_TESSIN_1", + "BILL01_TESSIN_2", + "BILL01_TESSIN_3", + "BILL01_TESSIN_4", + "BILL01_TESSIN_5", + "BILL01_TESSIN_6", + "BILL01_TESSIN_7", + "BILL01_TESSIN_8", + "BILL09_YADO2F_POEMN", + "BILL0A_YADO_TAKARA_00", + "BILL0B_SCHOOLL_00", + "BILL0C_SCHOOLR_00", + "MHOUSE00_00", + "MHOUSE00_01", + "MHOUSE00_02", + "MHOUSE00_03", + "MHOUSE00_04", + "MHOUSE00_05", + "MHOUSE01_00", + "MHOUSE01_01", + "MHOUSE01_02", + "MHOUSE01_03", + "MHOUSE03_00", + "MHOUSE03_01", + "MHOUSE04_00", + "MHOUSE04_01", + "MHOUSE04_02", + "MHOUSE04_03", + "MHOUSE04_04", + "MHOUSE06_00", + "MHOUSE07_00", + "MHOUSE07_01", + "MHOUSE08_00", + "MHOUSE08_01", + "MHOUSE08_02", + "MHOUSE08_03", + "MHOUSE08_04", + "MHOUSE0C_00", + "MHOUSE14_00", + "MHOUSE15_OP1ST", + "MHOUSE2_00_00", + "MHOUSE2_00_01", + "MHOUSE2_00_02", + "MHOUSE2_00_03", + "MHOUSE2_01_T0", + "MHOUSE2_02_KAME", + "MHOUSE2_02_KEY", + "MHOUSE2_03_00", + "MHOUSE2_05_00", + "SHOP00_ITEM_00", + "SHOP00_ITEM_01", + "SHOP00_ITEM_02", + "SHOP00_ITEM_03", + "SHOP00_ITEM_04", + "SHOP00_SAIFU", + "SHOP00_YAZUTSU", + "SHOP01_CAFE_00", + "SHOP01_CAFE_01", + "SHOP01_TALK", + "HOUSE_XXXXX", + "SHOP03_PAN_1ST", + "SHOP07_TALK1ST", + "SHOP07_GACHAPON", + "SHOP07_TANA", + "SHOP07_COMPLETE", + "SHOP02_KUTSU_00", + "NPC37_REM_TALK1ST", + "NPC37_REM_SLEEP", + "SORA_ELDER_RECOVER", + "SORA_CHIEF_TALK", + "SORA_ELDER_TALK1ST", + "SORA_ELDER_TALK2ND", + "NPC06_19GUY_QUESTION", + "NPC06_19GUY_ANSWER", + "DANPEI_TALK1ST", + "MIZUKAKI_KOBITO", + "MIZUKAKI_HINT1", + "MIZUKAKI_BOOK1_FALL", + "MIZUKAKI_HINT2", + "MIZUKAKI_HINT2_2ND", + "MIZUKAKI_BOOK2_FALL", + "MIZUKAKI_HINT3", + "MIZUKAKI_HINT3_MAYOR", + "MIZUKAKI_BOOK3_FALL", + "MIZUKAKI_BOOK_ALLBACK", + "MIZUKAKI_STAIR", + "MIZUKAKI_STAIR_WARP_OK", + "KHOUSE27_00", + "NO_USE_00", + "KHOUSE51_00", + "NO_USE_01", + "KHOUSE51_02", + "KHOUSE42_00", + "NO_USE_02", + "NO_USE_03", + "OYAKATA_DEMO", + "YAMAKOBITO_OPEN", + "M_PRIEST_TALK", + "M_ELDER_TALK1ST", + "M_PRIEST_MOVE", + "M_ELDER_TALK2ND", + "MHOUSE04_DANRO", + "MHOUSE06_DANRO", + "URO_POEMN_TALK", + "MHOUSE06_MES_20", + "MHOUSE07_MES_20", + "MAYOR_2_TALK1ST", + "MAYOR_4_TALK1ST", + "BILL01_TESSIN_RESERVED", + "BILL01_TESSIN_BRANDNEW", + "KOBITO_MORI_1ST", + "KOBITO_YAMA_ENTER", + "KHOUSE52_KINOKO", + "SORA_YAKATA_ENTER", + "YADO_CHECKIN", + "MINIGAME_GAMEEND", + "MINIGAME_LEVEL2", + "MHOUSE_DIN_TALK", + "MHOUSE_NAYRU_TALK", + "MHOUSE_FARORE_TALK", + "URO_12_H0", + "URO_19_H0", + "URO_1F_H0", + "BILL09_TSW0", + "BILL09_TSW1", + "KHOUSE41_TALK1ST", + "TAIMA_SAIBAI_1ST", + "IZUMI_00_FAIRY", + "IZUMI_01_FAIRY", + "IZUMI_02_FAIRY", + "BILL0B_DOUZOU_L", + "BILL0B_DOUZOU_R", + "KOBITOANA_08_T0", + "KOBITOANA_0C_T0", + "KOBITOANA_0D_T0", + "KOBITOHOUSE_23_H0", + "MHOUSE08_DANRO", + "MHOUSE09_DANRO", + "MHOUSE0A_DANRO", + "MHOUSE0B_DANRO", + "MHOUSE0C_DANRO", + "MHOUSE12_DANRO", + "SORA_DANRO", + "MIZUKAKI_HINT3_MAP", + "LEFT_TALK", + "KHOUSE26_REMOCON", + "SORA_KIDS_MOVE", + "KOBITOANA_00_T0", + "KHOUSE23_TALK1ST", + "SHOP05_ELEMENT_H00", + "SHOP05_ELEMENT_T00", + "SHOP05_ELEMENT_T01", + "SHOP05_ELEMENT_T02", + "BILL0a_YADO_TAKARA_H00", + "KOBITOYAMA_00_R00", + "KOBITOYAMA_00_R01", + "KOBITOYAMA_00_R02", + "KOBITOYAMA_00_R03", + "KOBITOYAMA_00_R04", + "KOBITOYAMA_00_R05", + "KOBITOYAMA_00_R06", + "KOBITOYAMA_00_R07", + "KOBITO_MORI_00_H00", + "KOBITO_MORI_00_H0", + "CAFE_01_CAP_0", + "BILL_00_CAP_0", + "BILL_02_CAP_0", + "MHOUSE_07_CAP_0", + "MHOUSE_07_CAP_1", + "MHOUSE_10_CAP_0", + "MHOUSE_15_CAP_0", + "MHOUSE_15_CAP_1", + "SHOP_03_CAP_0", + "MHOUSE_07_CAP_2", +#ifndef EU + "SHOP00_BOMBBAG", + "CAFE_01_CAP_1", +#endif +#if !defined(EU) && !defined(JP) && !defined(DEMO_JP) + "KS_A02", + "KS_A09", + "KS_A18", + "KS_B07", + "KS_B16", +#endif +#ifdef DEMO_JP + "MH01_KS_KUSURI", + "MH09_KS_KUSURI", +#endif + "END", +}; + +const char* const localFlags3Names[] = { + "BEGIN", + "MAROYA_TAKARA", + "MACHI_CHIKA_00_00", + "MACHI_CHIKA_00_01", + "MACHI_CHIKA_00_02", + "MACHI_CHIKA_00_03", + "MACHI_CHIKA_00_T0", + "MACHI_CHIKA_00_T1", + "MACHI_CHIKA_00_T2", + "MACHI_CHIKA_00_T3", + "MACHI_CHIKA_00_T4", + "MACHI_CHIKA2_00_T0", + "MACHI_CHIKA2_01_T0", + "MACHI_CHIKA2_03_00", + "MACHI_CHIKA2_03_01", + "MACHI_CHIKA2_03_T0", + "MACHI_CHIKA2_04_T0", + "MACHI_CHIKA2_10_00", + "MACHI_CHIKA2_10_01", + "MACHI_CHIKA2_10_02", + "MACHI_CHIKA2_10_T0", + "MACHI_CHIKA2_12_T0", + "LV4_HAKA_05_T0", + "LV4_HAKA_04_T0", + "LV4_HAKA_04_T1", + "LV4_HAKA_01_00", + "LV4_HAKA_01_01", + "LV4_HAKA_03_00", + "LV4_HAKA_04_R0", + "LV4_HAKA_04_R1", + "LV4_HAKA_04_R2", + "LV4_HAKA_04_R3", + "LV4_HAKA_04_R4", + "LV4_HAKA_04_R5", + "LV4_HAKA_04_R6", + "LV4_HAKA_04_R8", + "LV4_HAKA_04_R9", + "LV4_HAKA_04_R10", + "LV4_HAKA_04_R11", + "LV4_HAKA_04_KB0", + "LV4_HAKA_04_KB1", + "LV4_HAKA_05_H0", + "LV4_HAKA_05_H1", + "LV4_HAKA_05_H2", + "LV4_HAKA_05_H3", + "OUBO_02_BW0", + "OUBO_02_BW1", + "OUBO_06_BW0", + "OUBO_06_BW1", + "OUBO_07_ENTER", + "OUBO_KAKERA", + "MOGURA_00_T0", + "MOGURA_00_T1", + "MOGURA_00_T2", + "MOGURA_01_T0", + "MOGURA_02_T0", + "MOGURA_02_T1", + "MOGURA_02_T2", + "MOGURA_02_T3", + "MOGURA_02_T4", + "MOGURA_02_T5", + "MOGURA_02_T6", + "MOGURA_02_T7", + "MOGURA_02_T8", + "MOGURA_09_T0", + "MOGURA_09_T1", + "MOGURA_10_T0", + "MOGURA_10_T1", + "MOGURA_10_T2", + "MOGURA_1c_T0", + "MOGURA_21_r0", + "MOGURA_27_T0", + "MOGURA_27_T1", + "MOGURA_27_T2", + "MOGURA_41_T0", + "MOGURA_41_T1", + "MOGURA_41_T2", + "MOGURA_41_T3", + "MOGURA_50_00", + "MOGURA_50_T0", + "MOGURA_51_T0", + "MOGURA_51_T1", + "MOGURA_51_T2", + "MOGURA_51_00", + "MOGURA_51_01", + "MOGURA_51_02", + "MOGURA_51_03", + "MOGURA_51_04", + "MOGURA_51_05", + "MOGURA_51_06", + "MOGURA_51_07", + "MOGURA_51_08", + "MOGURA_52_00", + "MOGURA_52_T0", + "MOGURA_52_T1", + "MOGURA_53_00", + "MOGURA_53_T0", + "MOGURA_53_T1", + "MOGURA_53_WALK", + "MOGURA_54_00", + "MOGURA_54_01", + "MOGURA_54_02", + "MOGURA_54_WALK", + "AMOS_00_00", + "AMOS_01_00", + "AMOS_02_00", + "AMOS_03_00", + "AMOS_04_00", + "AMOS_05_00", + "AMOS_06_00", + "AMOS_07_00", + "AMOS_08_00", + "AMOS_09_00", + "AMOS_0A_00", + "AMOS_0B_00", + "AMOS_0C_00", + "AMOS_0D_00", + "AMOS_0E_00", + "AMOS_0F_00", + "HARI_01_T0", + "SEIIKI_STAINED_GLASS", + "SEIIKI_ENTER", + "SEIIKI_SWORD_1ST", + "SEIIKI_SWORD_2ND", + "SEIIKI_SWORD_3RD", + "SEIIKI_BUNSHIN", + "BAGUZU_MORI_02_00", + "BAGUZU_MORI_02_T0", + "BAGUZU_MORI_02_T1", + "BAGUZU_MORI_02_T2", + "CHIKATSURO_01_BW00", + "SORA_10_H00", + "SORA_11_H00", + "SORA_11_T00", + "SORA_11_T01", + "SORA_12_T00", + "SORA_13_H00", + "SORA_13_T00", + "SORA_13_T01", + "SORA_14_T00", + "SORA_14_R00", + "SORA_14_R01", + "SORA_14_R02", + "SORA_14_R03", + "SORA_14_R04", + "SORA_14_R05", + "SORA_14_R06", + "SORA_14_R07", + "IZUMIGARE_00_H00", + "IZUMIGARE_00_H01", + "SORA_10_R00", + "SORA_10_R01", + "SORA_10_R02", + "SORA_10_R03", + "SORA_10_R04", + "SORA_10_R05", + "SORA_10_R06", + "SORA_10_R07", + "SORA_14_R08", + "SORA_14_R09", + "SORA_14_R0a", + "SORA_14_R0b", + "SORA_14_R0c", + "SORA_14_R0d", + "SORA_14_R0e", + "SORA_14_R0f", + "KAKERA_TAKARA_B", + "KAKERA_TAKARA_C", + "KAKERA_TAKARA_D", + "KAKERA_TAKARA_F", + "KAKERA_TAKARA_G", + "KAKERA_TAKARA_H", + "KAKERA_TAKARA_I", + "KAKERA_TAKARA_XXXX", + "TESTMAP00_00", + "TESTMAP01_00", + "TESTMAP01_01", + "TESTMAP02_00", + "LV4_HAKA_08_T0", + "LV4_HAKA_07_00", + "LV4_HAKA_04_00", + "LV4_HAKA_04_01", + "LV4_HAKA_04_K0", + "LV4_HAKA_04_K1", + "LV4_HAKA_01_02", + "LV4_HAKA_08_XX", + "BAGUZU_MORI_03_H00", + "MOGURAU_00_H00", + "HARI_01_H00", + "HARI_03_T00", + "MACHI_CHIKA2_00_CAP_0", + "MACHI_CHIKA2_11_CAP_0", + "LV4_HAKA_08_CAP_0", + "BAGUZUIWA_02_CAP_0", + "MACHI_CHIKA2_01_CAP_0", + "MACHI_CHIKA2_01_HK", + "LV4_HAKA_08_B0", + "LV4_HAKA_08_K0", + "MAROYA_1ST", +#ifndef EU + "MACHI_CHIKA2_10_CAP_0", +#endif +#if !defined(EU) && !defined(JP) && !defined(DEMO_JP) + "KS_C02", +#endif + "END", +}; + +const char* const localFlags4Names[] = { + "BEGIN", + "DOUKUTU_00_T0", + "DOUKUTU_00_T1", + "DOUKUTU_05_EVENT", + "SOUGEN_DOUKUTU_00_T0", + "SOUGEN_DOUKUTU_00_T1", + "SOUGEN_DOUKUTU_00_T2", + "SOUGEN_DOUKUTU_00_T3", + "SOUGEN_DOUKUTU_00_T4", + "SOUGEN_DOUKUTU_00_SW0", + "SOUGEN_DOUKUTU_00_SW1", + "SOUGEN_DOUKUTU_00_SW2", + "SOUGEN_DOUKUTU_00_SW3", + "SOUGEN_DOUKUTU_07_T0", + "SOUGEN_DOUKUTU_0B_T0", + "SOUGEN_DOUKUTU_0C_T0", + "SOUGEN_DOUKUTU_0C_BW00", + "SOUGEN_DOUKUTU_0D_00", + "SOUGEN_DOUKUTU_0D_T0", + "SOUGEN_DOUKUTU_0E_BW00", + "SOUGEN_DOUKUTU_0F_T00", + "SOUGEN_DOUKUTU_10_R00", + "SOUGEN_DOUKUTU_10_R01", + "SOUGEN_DOUKUTU_10_R02", + "SOUGEN_DOUKUTU_10_R03", + "SOUGEN_DOUKUTU_10_R04", + "SOUGEN_DOUKUTU_10_R05", + "SOUGEN_DOUKUTU_10_R06", + "SOUGEN_DOUKUTU_10_R07", + "SOUGEN_DOUKUTU_10_R08", + "SOUGEN_DOUKUTU_10_R09", + "SOUGEN_DOUKUTU_10_R0A", + "SOUGEN_DOUKUTU_10_R0B", + "SOUGEN_DOUKUTU_10_R0C", + "SOUGEN_DOUKUTU_10_R0D", + "SOUGEN_DOUKUTU_10_R0E", + "SOUGEN_DOUKUTU_11_R00", + "SOUGEN_DOUKUTU_11_R01", + "SOUGEN_DOUKUTU_11_R02", + "SOUGEN_DOUKUTU_11_R03", + "SOUGEN_DOUKUTU_11_R04", + "SOUGEN_DOUKUTU_11_R05", + "SOUGEN_DOUKUTU_11_R06", + "SOUGEN_DOUKUTU_11_R07", + "SOUGEN_DOUKUTU_11_R08", + "SOUGEN_DOUKUTU_11_R09", + "SOUGEN_DOUKUTU_11_R0A", + "SOUGEN_DOUKUTU_11_R0B", + "SOUGEN_DOUKUTU_11_R0C", + "SOUGEN_DOUKUTU_11_R0D", + "SOUGEN_DOUKUTU_11_R0E", + "SOUGEN_DOUKUTU_13_T0", + "HIKYOU_DOUKUTU0_00_T0", + "HIKYOU_DOUKUTU0_01_T0", + "HIKYOU_DOUKUTU0_01_T1", + "HIKYOU_DOUKUTU0_02_KAIGARA", + "HIKYOU_DOUKUTU0_04_H00", + "HIKYOU_DOUKUTU1_00_00", + "HIKYOU_DOUKUTU1_00_T0", + "YAMADOUKUTU_01_00", + "YAMADOUKUTU_02_00", + "YAMADOUKUTU_03_T0", + "YAMADOUKUTU_06_H0", + "YAMADOUKUTU_07_T0", + "YAMADOUKUTU_08_h0", + "YAMADOUKUTU_08_h1", + "YAMADOUKUTU_08_h2", + "YAMADOUKUTU_09_r0", + "YAMADOUKUTU_09_r1", + "YAMADOUKUTU_09_r2", + "YAMADOUKUTU_0F_00", + "YAMADOUKUTU_10_00", + "SUIGEN_DOUKUTU_00_T0", + "SUIGEN_DOUKUTU_01_BW00", + "SUIGEN_DOUKUTU_02_T0", + "SUIGEN_DOUKUTU_04_BW00", + "SUIGEN_DOUKUTU_05_T0", + "SUIGEN_DOUKUTU_08_R0", + "SUIGEN_DOUKUTU_08_R1", + "SUIGEN_DOUKUTU_08_R2", + "SUIGEN_DOUKUTU_08_R3", + "SUIGEN_DOUKUTU_08_R4", + "SUIGEN_DOUKUTU_08_R5", + "SUIGEN_DOUKUTU_08_R6", + "SUIGEN_DOUKUTU_08_R7", + "SUIGEN_DOUKUTU_08_R8", + "SUIGEN_DOUKUTU_08_R9", + "SUIGEN_DOUKUTU_08_R10", + "SUIGEN_DOUKUTU_08_R11", + "SUIGEN_DOUKUTU_08_R12", + "SUIGEN_DOUKUTU_08_R13", + "SUIGEN_DOUKUTU_08_R14", + "SUIGEN_DOUKUTU_09_H00", + "HAKA_DOUKUTU_00_H0", + "HAKA_DOUKUTU_01_T0", + "HAKA_DOUKUTU_01_GEENE", + "KOBITO_DOUKUTU_00_T0", + "KOBITO_DOUKUTU_02_T0", + "KOBITO_DOUKUTU_05_T0", + "KOBITO_SHIRO_DOUKUTU_00_H0", + "KOBITO_SHIRO_DOUKUTU_00_T0", + "KOBITO_SHIRO_DOUKUTU_01_T0", + "KOBITO_URA_DOUKUTU_00_T0", + "KOBITO_URA_DOUKUTU_01_T0", + "GORON_DOUKUTU_APPEAR", + "KOBITO_DOUKUTU_03_T0", + "HIKYOU_DOUKUTU0_01_AKINDO", + "SOUGEN_DOUKUTU_14_AKINDO", + "SOUGEN_DOUKUTU_17_AKINDO", + "YAMADOUKUTU_04_AKINDO", + "YAMADOUKUTU_0D_AKINDO", + "YAMADOUKUTU_0F_AKINDO", + "YAMADOUKUTU_0E_SENNIN", + "KOBITO_DOUKUTU_04_T0", + "KOBITO_DOUKUTU_07_T0", + "KOBITO_DOUKUTU_09_T0", + "KOBITO_DOUKUTU_09_T1", + "KOBITO_DOUKUTU_09_T2", + "GORON_DOUKUTU_01_T0", + "GORON_DOUKUTU_01_T1", + "GORON_DOUKUTU_01_T2", + "GORON_DOUKUTU_01_T3", + "KOBITO_DOUKUTU_09_H0", + "SOUGEN_DOUKUTU_15_H0", + "KOBITO_DOUKUTU_01_H00", + "YAMADOUKUTU_05_H00", + "KOBITO_DOUKUTU_03_H00", + "DOUKUTU_04_H00", + "DOUKUTU_00_H00", + "KOBITO_DOUKUTU_04_H00", + "DOUKUTU_06_H00", + "DOUKUTU_05_H00", + "KOBITO_DOUKUTU_02_H00", + "KOBITO_DOUKUTU_01_T0", + "YAMADOUKUTU_04_CAP_0", +#if !defined(EU) && !defined(JP) && !defined(DEMO_JP) + "KS_B06", + "KS_B15", + "KS_B01", + "KS_B12", + "KS_C12", + "KS_C37", +#endif + "END", +}; + +const char* const localFlags5Names[] = { + "BEGIN", "LV1_00_WALK", "LV1_01_WALK", "LV1_02_WALK", "LV1_03_WALK", "LV1_04_WALK", "LV1_05_WALK", + "LV1_06_WALK", "LV1_07_WALK", "LV1_08_WALK", "LV1_09_WALK", "LV1_0A_WALK", "LV1_0B_WALK", "LV1_10_WALK", + "LV1_11_WALK", "LV1_12_WALK", "LV1_13_WALK", "LV1_14_WALK", "LV1_15_WALK", "LV1_16_WALK", "LV1_17_WALK", + "LV1_TARU_0", "LV1_TARU_1", "LV1_00_00", "LV1_00_01", "LV1_00_02", "LV1_00_03", "LV1_00_T0", + "LV1_01_00", "LV1_01_01", "LV1_01_02", "LV1_01_03", "LV1_01_04", "LV1_01_T0", "LV1_01_T1", + "LV1_01_T2", "LV1_02_T0", "LV1_03_CAP_0", "LV1_04_02", "LV1_04_T0", "LV1_05_T0", "LV1_05_T1", + "LV1_06_03", "LV1_06_T0", "LV1_06_CAP_0", "LV1_07_00", "LV1_07_CAP_0", "LV1_08_00", "LV1_08_KEY", + "LV1_09_00", "LV1_0A_00", "LV1_0A_CAP_0", "LV1_0B_01", "LV1_0B_02", "LV1_0B_15", "LV1_0B_CAP_0", + "LV1_10_00", "LV1_10_01", "LV1_10_02", "LV1_10_03", "LV1_10_KEY", "LV1_10_T0", "LV1_11_01", + "LV1_11_T0", "LV1_12_15", "LV1_12_T0", "LV1_12_T1", "LV1_12_00", "LV1_12_01", "LV1_14_00", + "LV1_14_CAP_0", "LV1_16_UTSUWA", "LV1_16_1STEND", "LV1_17_00", "LV1_17_T0", "LV1_02_00", "LV1_02_01", + "LV1_10_04", "LV1_20_CAP_0 ", "LV1_01_HK ", "LV1_04_CAP_0", "LV1_03_00", "LV1_05_HK ", "LV1_08_01", + "LV1_01_05", "LV1_10_CAP_0 ", +#if !defined(EU) && !defined(JP) + "LV1_12_CAP_0 ", +#endif + "END", +}; + +const char* const localFlags6Names[] = { + "BEGIN", "LV2_00_WALK", "LV2_01_WALK", "LV2_02_WALK", "LV2_03_WALK", "LV2_04_WALK", "LV2_05_WALK", + "LV2_06_WALK", "LV2_07_WALK", "LV2_08_WALK", "LV2_09_WALK", "LV2_10_WALK", "LV2_11_WALK", "LV2_12_WALK", + "LV2_13_WALK", "LV2_14_WALK", "LV2_15_WALK", "LV2_16_WALK", "LV2_17_WALK", "LV2_BOSS_00_WALK", "LV2_00_00", + "LV2_00_01", "LV2_01_01", "LV2_01_02", "LV2_01_T0", "LV2_01_T1", "LV2_02_01", "LV2_03_CAP_0", + "LV2_04_00", "LV2_04_01", "LV2_04_CAP_0", "LV2_06_00", "LV2_06_T0", "LV2_06_CAP_0", "LV2_07_00", + "LV2_07_CAP_0", "LV2_08_00", "LV2_08_01", "LV2_08_T0", "LV2_08_T1", "LV2_09_00", "LV2_09_T0", + "LV2_09_T1", "LV2_10_00", "LV2_10_T0", "LV2_10_T1", "LV2_11_00", "LV2_11_01", "LV2_14_T0", + "LV2_15_01", "LV2_15_T0", "LV2_15_CAP_0", "LV2_16_00", "LV2_17_00", "LV2_17_15", "LV2_17_T0", + "LV2_17_T1", "LV2_17_T2", "LV2_20_UTSUWA", "LV2_00_02 ", "LV2_06_HK", "LV2_11_02", "LV2_05_R1", + "LV2_05_R2", "LV2_05_R3", "LV2_05_R4", "LV2_05_R5", "LV2_00_CAP_0", "LV2_09_CAP_0", "END", +}; + +const char* const localFlags7Names[] = { + "BEGIN", + "LV3_00_WALK", + "LV3_01_WALK", + "LV3_02_WALK", + "LV3_03_WALK", + "LV3_04_WALK", + "LV3_05_WALK", + "LV3_06_WALK", + "LV3_10_WALK", + "LV3_11_WALK", + "LV3_12_WALK", + "LV3_13_WALK", + "LV3_14_WALK", + "LV3_15_WALK", + "LV3_16_WALK", + "LV3_17_WALK", + "LV3_18_WALK", + "LV3_19_WALK", + "LV3_1A_WALK", + "LV3_1B_WALK", + "LV3_1C_WALK", + "LV3_1D_WALK", + "LV3_20_WALK", + "LV3_21_WALK", + "LV3_22_WALK", + "LV3_23_WALK", + "LV3_24_WALK", + "LV3_00_00", + "LV3_00_T0", + "LV3_02_00", + "LV3_02_01", + "LV3_02_02", + "LV3_02_KEYFALL", + "LV3_03_00", + "LV3_03_01", + "LV3_04_00", + "LV3_04_KEYFALL", + "LV3_04_WARP_0", + "LV3_04_BOSSDOOR", + "LV3_10_00", + "LV3_11_00", + "LV3_12_CAP_0", + "LV3_13_00", + "LV3_14_00", + "LV3_14_01", + "LV3_14_02", + "LV3_14_KEY", + "LV3_15_00", + "LV3_17_00", + "LV3_16_BOSSDIE", + "LV3_16_GETUTSUWA", + "LV3_18_00", + "LV3_18_00_BW00", + "LV3_19_01", + "LV3_19_02", + "LV3_19_03", + "LV3_19_04", + "LV3_19_T0", + "LV3_1B_T0", + "LV3_1D_00", + "LV3_1D_01", + "LV3_1D_T0", + "LV3_1D_T1", + "LV3_20_00", + "LV3_20_CAP_0", + "LV3_22_00", + "LV3_23_01", + "LV3_23_T0", + "LV3_24_T0", + "LV3_OCARINA_FALL", + "LV3_02_CAP_0 ", + "LV3_24_HK", + "LV3_10_01", + "LV3_17_01", + "END", +}; + +const char* const localFlags8Names[] = { + "BEGIN", "LV4_00_WALK", "LV4_01_WALK", + "LV4_02_WALK", "LV4_03_WALK", "LV4_04_WALK", + "LV4_05_WALK", "LV4_06_WALK", "LV4_07_WALK", + "LV4_08_WALK", "LV4_09_WALK", "LV4_0A_WALK", + "LV4_0B_WALK", "LV4_0C_WALK", "LV4_0D_WALK", + "LV4_0E_WALK", "LV4_0F_WALK", "LV4_10_WALK", + "LV4_11_WALK", "LV4_20_WALK", "LV4_21_WALK", + "LV4_22_WALK", "LV4_23_WALK", "LV4_24_WALK", + "LV4_25_WALK", "LV4_26_WALK", "LV4_27_WALK", + "LV4_28_WALK", "LV4_29_WALK", "LV4_2A_WALK", + "LV4_2B_WALK", "LV4_2C_WALK", "LV4_2D_WALK", + "LV4_2E_WALK", "LV4_2F_WALK", "LV4_30_WALK", + "LV4_31_WALK", "LV4_32_WALK", "LV4_33_WALK", + "LV4_34_WALK", "LV4_35_WALK", "LV4_INIT", + "LV4_01_00", "LV4_03_CAP_0", "LV4_03_BOSSDOOR", + "LV4_05_00", "LV4_05_01", "LV4_06_00", + "LV4_07_00", "LV4_08_00", "LV4_08_01", + "LV4_08_02", "LV4_08_RAY_HALF", "LV4_08_RAY_HALF_E", + "LV4_08_RAY_FULL", "LV4_08_RAY_FULL_E", "LV4_09_T0", + "LV4_0a_TSUBO", "LV4_0a_T0", "LV4_0c_00", + "LV4_0d_00", "LV4_0d_01", "LV4_0d_02", + "LV4_0d_T0", "LV4_0e_UTSUWA", "LV4_0f_00", + "LV4_0f_01", "LV4_0f_02", "LV4_0f_03", + "LV4_0f_04", "LV4_10_RAY", "LV4_10_T0", + "LV4_10_BOSSDIE", "LV4_11_00", "LV4_11_RAY_SP", + "LV4_11_RAY", "LV4_11_T0", "LV4_20_00", + "LV4_20_RAY", "LV4_20_BOSSKEY", "LV4_21_00", + "LV4_21_RAY", "LV4_21_KEY", "LV4_21_CAP_0", + "LV4_22_00", "LV4_23_00", "LV4_24_00", + "LV4_27_00", "LV4_28_00", "LV4_28_01", + "LV4_28_T0", "LV4_28_T1", "LV4_29_CAP_0", + "LV4_2b_T0", "LV4_2b_T1", "LV4_2b_T2", + "LV4_2b_BKABE", "LV4_2b_00", "LV4_2b_01", + "LV4_2b_02", "LV4_2b_03", "LV4_2b_04", + "LV4_2c_00", "LV4_2c_02", "LV4_2c_T0", + "LV4_2d_00", "LV4_2d_01", "LV4_2d_02", + "LV4_2e_RAY", "LV4_2f_00", "LV4_2f_01", + "LV4_2f_KEY", "LV4_30_00", "LV4_30_BKABE", + "LV4_31_00", "LV4_31_01", "LV4_32_00", + "LV4_32_01", "LV4_32_T0", "LV4_32_T1", + "LV4_33_01", "LV4_34_00", "LV4_34_01", + "LV4_35_00", "LV4_35_01", "LV4_22_01", + "LV4_2d_T0", "LV4_03_CAP_1 ", "LV4_08_CAP_0 ", + "LV4_08_CAP_1 ", "LV4_36_WALK", "LV4_36_T0", + "LV4_21_CAP_1 ", "LV4_0d_03", "LV4_0d_04", + "LV4_0d_05", "LV4_0d_06", "LV4_0d_07", + "LV4_25_00", "LV4_25_01", "LV4_25_02", + "LV4_25_03", "LV4_25_04", "LV4_31_02", + "LV4_31_03", "LV4_31_04", "LV4_31_05", + "LV4_31_06", "LV4_31_07", "LV4_06_01", + "LV4_06_02", "LV4_06_03", "LV4_06_04", + "LV4_06_05", "LV4_06_06", "LV4_08_OCT", + "LV4_05_02", "LV4_28_02", "LV4_2c_01", + "LV4_33_02", "LV4_31_08", "LV4_34_02", + "LV4_20_RAY_SW", "LV4_21_RAY_SW", "END", +}; + +const char* const localFlags9Names[] = { + "BEGIN", "LV5_00_WALK", "LV5_01_WALK", "LV5_02_WALK", "LV5_03_WALK", "LV5_04_WALK", + "LV5_05_WALK", "LV5_06_WALK", "LV5_07_WALK", "LV5_08_WALK", "LV5_09_WALK", "LV5_0A_WALK", + "LV5_0B_WALK", "LV5_0C_WALK", "LV5_0D_WALK", "LV5_0E_WALK", "LV5_0F_WALK", "LV5_10_WALK", + "LV5_11_WALK", "LV5_12_WALK", "LV5_13_WALK", "LV5_14_WALK", "LV5_15_WALK", "LV5_16_WALK", + "LV5_17_WALK", "LV5_18_WALK", "LV5_19_WALK", "LV5_1A_WALK", "LV5_1B_WALK", "LV5_1C_WALK", + "LV5_1D_WALK", "LV5_1E_WALK", "LV5_1F_WALK", "LV5_20_WALK", "LV5_21_WALK", "LV5_22_WALK", + "LV5_23_WALK", "LV5_24_WALK", "LV5_25_WALK", "LV5_26_WALK", "LV5_27_WALK", "LV5_28_WALK", + "LV5_29_WALK", "LV5_2A_WALK", "LV5_2B_WALK", "LV5_2C_WALK", "LV5_2D_WALK", "LV5_2E_WALK", + "LV5_2F_WALK", "LV5_30_WALK", "LV5_31_WALK", "LV5_32_WALK", "LV5_01_T0", "LV5_03_T0", + "LV5_03_BOSSDOOR", "LV5_04_T0", "LV5_05_00", "LV5_05_01", "LV5_05_02", "LV5_06_00", + "LV5_07_00", "LV5_07_01", "LV5_07_T0", "LV5_08_00", "LV5_08_01", "LV5_08_KEY", + "LV5_08_BOSSDOOR", "LV5_0b_B0", "LV5_0b_B1", "LV5_0d_00", "LV5_0e_00", "LV5_0f_T0", + "LV5_0f_T1", "LV5_10_T0", "LV5_15_00", "LV5_15_01", "LV5_15_02", "LV5_15_03", + "LV5_15_04", "LV5_15_T0", "LV5_15_B0", "LV5_15_B1", "LV5_1a_00", "LV5_1a_01", + "LV5_1b_00", "LV5_1b_T0", "LV5_1c_00", "LV5_1c_T0", "LV5_20_00", "LV5_20_01", + "LV5_21_00", "LV5_21_01", "LV5_21_02", "LV5_21_03", "LV5_21_04", "LV5_21_05", + "LV5_21_06", "LV5_21_07", "LV5_21_08", "LV5_21_09", "LV5_21_0a", "LV5_21_CAP_0", + "LV5_22_00", "LV5_22_01", "LV5_22_CAP_0", "LV5_23_00", "LV5_23_01", "LV5_27_00", + "LV5_29_00", "LV5_29_01", "LV5_29_T0", "LV5_2b_T0", "LV5_2c_00", "LV5_2c_01", + "LV5_2c_02", "LV5_2c_03", "LV5_2c_T0", "LV5_2c_CAP_0", "LV5_2d_T0", "LV5_31_CAP_0", + "LV5_32_CAP_0", "LV5_32_T0", "LV5_32_T1", "LV5_BOSSDIE", "LV5_MBOSSDIE", "LV5_00_UTSUWA", + "LV5_0c_00", "LV5_0A_CAP_0", "LV5_0f_HK", "LV5_05_03", "LV5_08_02", "LV5_0c_01", + "LV5_0c_02", "LV5_22_02", "LV5_15_05", "LV5_20_02", "END", +}; + +const char* const localFlags10Names[] = { + "BEGIN", "LV6_00_WALK", "LV6_01_WALK", "LV6_02_WALK", + "LV6_03_WALK", "LV6_04_WALK", "LV6_05_WALK", "LV6_06_WALK", + "LV6_07_WALK", "LV6_08_WALK", "LV6_09_WALK", "LV6_0A_WALK", + "LV6_0B_WALK", "LV6_0C_WALK", "LV6_0D_WALK", "LV6_0E_WALK", + "LV6_0F_WALK", "LV6_10_WALK", "LV6_11_WALK", "LV6_12_WALK", + "LV6_13_WALK", "LV6_14_WALK", "LV6_15_WALK", "LV6_16_WALK", + "LV6_17_WALK", "LV6_18_WALK", "LV6_19_WALK", "LV6_1A_WALK", + "LV6_1B_WALK", "LV6_1C_WALK", "LV6_1D_WALK", "LV6_1E_WALK", + "LV6_1F_WALK", "LV6_20_WALK", "LV6_21_WALK", "LV6_22_WALK", + "LV6_23_WALK", "LV6_24_WALK", "LV6_25_WALK", "LV6_26_WALK", + "LV6_27_WALK", "LV6_28_WALK", "LV6_29_WALK", "LV6_2A_WALK", + "LV6_2B_WALK", "LV6_2C_WALK", "LV6_2D_WALK", "LV6_2E_WALK", + "LV6_2F_WALK", "LV6_30_WALK", "LV6_31_WALK", "LV6_32_WALK", + "LV6_33_WALK", "LV6_34_WALK", "LV6_35_WALK", "LV6_36_WALK", + "LV6_37_WALK", "LV6_38_WALK", "LV6_39_WALK", "LV6_3A_WALK", + "LV6_3B_WALK", "LV6_00_00", "LV6_01_T0", "LV6_02_T0", + "LV6_03_T0", "LV6_04_T0", "LV6_07_00", "LV6_09_T0", + "LV6_09_KB0", "LV6_09_KB1", "LV6_09_KB2", "LV6_09_KB3", + "LV6_0a_01", "LV6_0b_00", "LV6_0c_00", "LV6_0c_01", + "LV6_0e_00", "LV6_10_00", "LV6_11_00", "LV6_11_01", + "LV6_11_B0", "LV6_11_B1", "LV6_11_B2", "LV6_13_00", + "LV6_14_00", "LV6_14_BOSSDOOR", "LV6_15_00", "LV6_16_00", + "LV6_17_00", "LV6_17_01", "LV6_18_00", "LV6_1a_00", + "LV6_1c_CAP_0", "LV6_1d_00", "LV6_1f_00", "LV6_20_T0", + "LV6_24_00", "LV6_26_00", "LV6_26_01", "LV6_26_CAP_0 ", + "LV6_27_00", "LV6_27_T0", "LV6_30_00", "LV6_32_00", + "LV6_34_00", "LV6_34_01", "LV6_35_00", "LV6_37_T0", + "LV6_39_00", "LV6_39_01", "LV6_39_02", "LV6_1f_CHAIR_L", + "LV6_1f_CHAIR_R", "LV6_1d_KEYGET", "LV6_1b_TAREMAKU", "LV6SOTO_01_KAIJO", + "LV6_SEKIKA_END", "LV6_GUFUU1_FIGURE", "LV6_GUFUU2_FIGURE", "LV6_GUFUU1_GISHIKI", + "LV6_GUFUU1_DEMO", "LV6_ZELDA_DISCURSE", "LV6_00_ESCAPE", "LV6_GUFUU2_DEAD", + "LV6_KANE_START", "LV6_KANE_1ST", "LV6_KANE_2ND", "LV6_SOTO_ENDING", + "LV6_08_00", "LV6_39_03", "LV6_SOTO_06_00", "LV6_SOTO_06_01", + "LV6_0A_CAP_0 ", "LV6SOTO_01_CAP_0 ", "LV6_0a_00", "LV6_0b_01", + "LV6_0e_01", "LV6_10_01", "LV6_13_01", "LV6_14_01", + "LV6_15_01", "LV6_1a_01", "LV6_1f_01", "LV6_39_04", + "LV6_17_02", "LV6_18_01", "LV6_08_01", "LV6_SOTO_01_00", + "LV6_SOTO_01_01", "LV6_SOTO_01_02", "LV6_39_KING", "END", +}; + +const char* const localFlags11Names[] = { + "BEGIN", + "END", +}; + +const char* const localFlags12Names[] = { + "BEGIN", + "END", +}; diff --git a/src/flags.c b/src/flags.c index 2129ae01..f1080cde 100644 --- a/src/flags.c +++ b/src/flags.c @@ -13,13 +13,13 @@ u32 CheckLocalFlag(u32 flag) { } u32 CheckFlags(u32 flags) { - s32 uVar1; + s32 type; s32 index; s32 length; index = flags & 0x3ff; length = (((flags & (0xf0) << 0x6) >> 0xa) + 1); - uVar1 = (flags & 0xc000) >> 0xe; - switch ((u32)uVar1) { + type = (flags & 0xc000) >> 0xe; + switch ((u32)type) { case 2: return CheckRoomFlags(index, length); case 0: diff --git a/src/game.c b/src/game.c index 42cd5391..0326a516 100644 --- a/src/game.c +++ b/src/game.c @@ -67,7 +67,7 @@ void sub_0805212C(void) { #else sub_08052418(0, 0); gScreen.lcd.displayControl |= 0x600; - gFadeControl.field_0x4 = 0xffff; + gFadeControl.mask = 0x0000ffff; DoFade(4, 0x10); #endif } @@ -97,7 +97,7 @@ void sub_080521A0(void) { gMenu.field_0x3 = 0; sub_080A7114(1); sub_08052418(0, 0); - gFadeControl.field_0x4 = 0xffffffff; + gFadeControl.mask = 0xffffffff; break; case 1: if (gMenu.transitionTimer == 0) { @@ -245,7 +245,7 @@ NONMATCH("asm/non_matching/game/sub_08052418.inc", void sub_08052418(int param_1 gUnk_020227E8._0[param_2 * 2].BYTES.byte1 = 1; MemCopy(&gUnk_080FCA8C, &temp, sizeof(temp)); i = param_1 * 0xc; - // temp._0 = gBG1Buffer[gUnk_080FCAA4._8[param_1]][gUnk_080FCAA4._0[gUnk_02000000->gameLanguage + i]] * 2; + // temp._0 = gBG1Buffer[gUnk_080FCAA4._8[param_1]][gUnk_080FCAA4._0[gSaveHeader->gameLanguage + i]] * 2; temp._13 = ((temp._13 & 0xfe) | gUnk_080FCAA4._8[i + 1]) & 1; sub_0805F46C(gUnk_080FCAA4._a[param_1], &temp); gScreen.bg.bg1xOffset = 1; @@ -265,7 +265,7 @@ void InitializePlayer(void) { gRoomControls.cameraTarget = pl; gPlayerState.playerAction = gUnk_080FCAC8[gScreenTransition.field_0xf]; if (!CheckGlobalFlag(EZERO_1ST)) { - gPlayerState.flags.all |= 8; + gPlayerState.flags |= 8; } switch (gScreenTransition.field_0xf) { case 0x2: diff --git a/src/intro.c b/src/intro.c index 61d63686..04783e12 100644 --- a/src/intro.c +++ b/src/intro.c @@ -94,7 +94,7 @@ static void HandleNintendoCapcomLogos(void) { gIntroState.timer = 120; LoadGfxGroup(16); LoadGfxGroup(1); - if (gUnk_02000000->gameLanguage == 0) { + if (gSaveHeader->gameLanguage == 0) { paletteGroup = 1; } else { paletteGroup = 2; @@ -148,13 +148,13 @@ static void HandleTitlescreen(void) { sub_080ADD30(); gUnk_02024490.unk0 = 1; LoadGfxGroup(2); - if (gUnk_02000000->gameLanguage == 0) { + if (gSaveHeader->gameLanguage == 0) { paletteGroup = 3; } else { paletteGroup = 4; } LoadPaletteGroup(paletteGroup); - if (gUnk_02000000->gameLanguage == 0) { + if (gSaveHeader->gameLanguage == 0) { // Blend first and second layer gScreen.controls.layerFXControl = BLDCNT_TGT1_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_EFFECT_BLEND; gScreen.controls.alphaBlend = BLDALPHA_BLEND(9, 9); @@ -183,7 +183,7 @@ static void HandleTitlescreen(void) { if (gFadeControl.active) { return; } - if (gUnk_02000000->gameLanguage == 0) { + if (gSaveHeader->gameLanguage == 0) { HandleJapaneseTitlescreenAnimationIntro(); } else { HandleTitlescreenAnimationIntro(); @@ -240,8 +240,8 @@ static void HandleTitlescreen(void) { #endif } } - if (gIntroState.gameLanguage != gUnk_02000000->gameLanguage) { - gIntroState.gameLanguage = gUnk_02000000->gameLanguage; + if (gIntroState.gameLanguage != gSaveHeader->gameLanguage) { + gIntroState.gameLanguage = gSaveHeader->gameLanguage; LoadGfxGroup(3); } UpdateLightRays(); @@ -285,7 +285,7 @@ static void HandleJapaneseTitlescreenAnimationIntro(void) { gIntroState.subState++; gScreen.bg.bg1yOffset = 0; gScreen.bg.bg1Control = 0xc09; - gFadeControl.field_0x4 = 0x40; + gFadeControl.mask = 0x00000040; DoFade(6, 0x10); SoundReq(SFX_F8); } @@ -293,7 +293,7 @@ static void HandleJapaneseTitlescreenAnimationIntro(void) { break; case 1: if (!gFadeControl.active) { - gFadeControl.field_0x4 = -1; + gFadeControl.mask = 0xFFFFFFFF; gIntroState.subState++; #if defined(JP) || defined(EU) || defined(DEMO_JP) gIntroState.timer = 120; diff --git a/src/item/itemLantern.c b/src/item/itemLantern.c index 51f52afe..652dd5e0 100644 --- a/src/item/itemLantern.c +++ b/src/item/itemLantern.c @@ -21,9 +21,9 @@ void sub_08075A0C(ItemBehavior* this, u32 arg1) { s8* tmp; itemSlot = IsItemEquipped(this->behaviorID); if (gPlayerState.heldObject != 0 || gPlayerState.playerAction == 0x18 || gPlayerState.jumpStatus != 0 || - gPlayerState.field_0x2c != NULL || (gPlayerState.flags.all & 0x80) != 0) { + gPlayerState.field_0x2c != NULL || (gPlayerState.flags & 0x80) != 0) { ForceEquipItem(0xf, itemSlot); - gPlayerState.flags.all &= 0xff7fffff; + gPlayerState.flags &= 0xff7fffff; ForceEquipItem(0xf, itemSlot); sub_08077E78(this, arg1); } else { @@ -50,11 +50,11 @@ ASM_FUNC("asm/non_matching/eu/sub_08075ADC.inc", void sub_08075ADC(ItemBehavior* void sub_08075ADC(ItemBehavior* this, u32 arg1) { u32 bVar1; - if (gPlayerState.field_0x2c != NULL || (this->field_0x5[9] & 1) == 0 || (gPlayerState.flags.all & 0x110) != 0 || + if (gPlayerState.field_0x2c != NULL || (this->field_0x5[9] & 1) == 0 || (gPlayerState.flags & 0x110) != 0 || sub_08079D48() == 0) { this->field_0xf = 0; this->stateID += 1; - gPlayerState.flags.all |= 0x800000; + gPlayerState.flags |= 0x800000; bVar1 = 8 >> arg1; gPlayerState.field_0x3[1] = gPlayerState.field_0x3[1] & ~((bVar1 << 4) | bVar1); bVar1 = ~bVar1; @@ -73,11 +73,11 @@ void sub_08075B54(ItemBehavior* this, u32 arg1) { Entity* object; s8* tmp; - if ((gPlayerState.flags.all & 0x110) == 0) { + if ((gPlayerState.flags & 0x110) == 0) { itemSlot = IsItemEquipped(this->behaviorID); if (!(((sub_08077F10(this) == 0) && (itemSlot < 2)) || (gPlayerState.jumpStatus != 0))) { ForceEquipItem(0xf, itemSlot); - gPlayerState.flags.all &= 0xff7fffff; + gPlayerState.flags &= 0xff7fffff; sub_08077E78(this, arg1); SoundReq(SFX_ITEM_LANTERN_OFF); } else { diff --git a/src/item/itemOcarina.c b/src/item/itemOcarina.c index 84a147dc..8d126e23 100644 --- a/src/item/itemOcarina.c +++ b/src/item/itemOcarina.c @@ -24,7 +24,7 @@ void OcarinaUse(ItemBehavior* this, u32 arg1) { gPlayerEntity.spriteSettings.b.flipX = 0; gPlayerEntity.flags &= 0x7f; gPlayerEntity.field_0x7a.HWORD = 2; - gPlayerState.flags.all |= 0x10000000; + gPlayerState.flags |= 0x10000000; gPlayerState.field_0x27[0] = -1; gUnk_02034490[0] = 1; gPlayerState.field_0xa = (8 >> arg1) | gPlayerState.field_0xa; @@ -41,7 +41,7 @@ NONMATCH("asm/non_matching/ocarina/OcarinaUpdate.inc", void OcarinaUpdate(ItemBe UpdateItemAnim(this); if ((this->field_0x5[9] & 0x80) != 0) { gPlayerEntity.flags |= 0x80; - gPlayerState.flags.all &= 0xefffffff; + gPlayerState.flags &= 0xefffffff; gPlayerState.field_0x27[0] = 0; gUnk_02034490[0] = 0; CreateBird(); diff --git a/src/item/itemPegasusBoots.c b/src/item/itemPegasusBoots.c index 0eca0fe9..b572d2f6 100644 --- a/src/item/itemPegasusBoots.c +++ b/src/item/itemPegasusBoots.c @@ -2,6 +2,7 @@ #include "audio.h" #include "random.h" #include "functions.h" +#include "effects.h" extern void (*const gUnk_0811BDCC[])(ItemBehavior* beh, u32); @@ -16,20 +17,19 @@ void ItemPegasusBoots(ItemBehavior* this, u32 arg1) { gPlayerState.field_0x1d[1] = 0; gPlayerState.field_0xe = 0; sub_08077E78(this, arg1); - } else { bVar1 = this->field_0x5[2] - 1; this->field_0x5[2] = bVar1; if ((bVar1 & 7) == 0) { SoundReq(SFX_PLY_LAND); } - if (((gPlayerState.flags.all & 0x80) == 0) && ((this->field_0x5[2] & 7) == 0)) { + if (((gPlayerState.flags & 0x80) == 0) && ((this->field_0x5[2] & 7) == 0)) { if (gPlayerState.field_0x10[2] == 0x11) { if (gPlayerEntity.spriteOffsetY == 0) { - CreateFx(&gPlayerEntity, 0x52, 0); + CreateFx(&gPlayerEntity, FX_GREEN_SPLASH, 0); } } else { - fx = CreateFx(&gPlayerEntity, 0x11, 0x40); + fx = CreateFx(&gPlayerEntity, FX_DASH, 0x40); if ((fx != NULL) && (fx->y.HALF.HI = fx->y.HALF.HI + 2, this->stateID != 2)) { uVar4 = Random() & 3; if ((Random() & 1) != 0) { @@ -53,12 +53,12 @@ void sub_080768F8(ItemBehavior* this, u32 arg1) { u32 bVar2; bVar1 = gPlayerState.field_0x1c | gPlayerState.field_0x3[1] | gPlayerState.heldObject | gPlayerState.jumpStatus; - bVar2 = (gPlayerState.flags.all & 0x1000); + bVar2 = (gPlayerState.flags & 0x1000); bVar1 |= bVar2; if (bVar1 == 0) { gPlayerState.field_0x1d[1] = 1; gPlayerState.field_0x1d[4] = bVar1; - if ((gPlayerState.flags.all & 0x80) == 0) { + if ((gPlayerState.flags & 0x80) == 0) { this->field_0x5[2] = 0x10; } else { gPlayerState.field_0x8 = 0xc14; diff --git a/src/item/itemRocsCape.c b/src/item/itemRocsCape.c index ba98de91..d718e610 100644 --- a/src/item/itemRocsCape.c +++ b/src/item/itemRocsCape.c @@ -22,7 +22,7 @@ extern bool32 sub_08077EFC(ItemBehavior*); if ((gPlayerState.jumpStatus != 0) && ((gPlayerState.jumpStatus & 7) != 3)) goto _08076710; if (-1 < gPlayerEntity.height.WORD) { - gPlayerEntity.field_0x20 = 0x20000; + gPlayerEntity.hVelocity = 0x20000; gPlayerState.jumpStatus = 1; gPlayerState.field_0x2c = NULL; this->stateID += 1; @@ -45,7 +45,7 @@ extern bool32 sub_08077EFC(ItemBehavior*); gPlayerState.jumpStatus = 1; gPlayerState.field_0xe = -1; gPlayerState.field_0x2c = NULL; - gPlayerEntity.field_0x20 = 0x20000; + gPlayerEntity.hVelocity = 0x20000; _0807673C: sub_08077F84(); SoundReq(SFX_PLY_VO4); @@ -67,10 +67,10 @@ void sub_08076758(ItemBehavior* this, u32 arg1) { ((gPlayerState.jumpStatus & 7) != 3)) { if (sub_08077EFC(this)) { if (this->stateID < 2) { - if ((gPlayerEntity.field_0x20 < 1) && ((gPlayerState.jumpStatus & 0x10) == 0)) { + if ((gPlayerEntity.hVelocity < 1) && ((gPlayerState.jumpStatus & 0x10) == 0)) { this->stateID = 2; gPlayerEntity.field_0x7a.HWORD = 2; - gPlayerEntity.field_0x20 = 0x20000; + gPlayerEntity.hVelocity = 0x20000; gPlayerState.jumpStatus |= 0x10; gPlayerState.field_0x8 = 0x288; SoundReq(SFX_172); diff --git a/src/item/itemSword.c b/src/item/itemSword.c index 951ef527..c18178f2 100644 --- a/src/item/itemSword.c +++ b/src/item/itemSword.c @@ -72,9 +72,9 @@ void sub_0807564C(ItemBehavior* this, u32 arg1) { void sub_08075694(ItemBehavior* this, u32 arg1) { this->field_0x5[2] = 1; - if ((gPlayerState.flags.all & 0x8000000) != 0) { - gPlayerState.flags.all &= 0xf7ffffff; - gPlayerState.flags.all &= 0xfffbffff; + if ((gPlayerState.flags & 0x8000000) != 0) { + gPlayerState.flags &= 0xf7ffffff; + gPlayerState.flags &= 0xfffbffff; sub_08077DF4(this, 300); } else { gPlayerState.field_0xab = 1; @@ -86,7 +86,7 @@ void sub_08075694(ItemBehavior* this, u32 arg1) { gPlayerEntity.field_0x40 = 0x1e; gPlayerState.field_0x1a[1] |= 0x40; gPlayerState.field_0x1a[1] &= 0xdf; - if ((gPlayerState.field_0xa0[0] == 0x04) && ((gPlayerState.flags.all & 0x400000) == 0)) { + if ((gPlayerState.field_0xa0[0] == 0x04) && ((gPlayerState.flags & 0x400000) == 0)) { gPlayerState.field_0xa0[0] = 0x01; sub_0807A108(); } @@ -121,10 +121,10 @@ void sub_080758B0(ItemBehavior* this, u32 arg1) { ASM_FUNC("asm/non_matching/itemSword/sub_08075900.inc", void sub_08075900(ItemBehavior* this, u32 arg1)) void sub_080759B8(ItemBehavior* this, u32 arg1) { - if ((gPlayerState.flags.all & 0x80) == 0) { + if ((gPlayerState.flags & 0x80) == 0) { gPlayerEntity.field_0x40 = 0; } - gPlayerState.flags.all &= 0xf7ffffff; + gPlayerState.flags &= 0xf7ffffff; gPlayerState.field_0x1a[1] = 0; gPlayerState.field_0x2c = NULL; sub_08077E78(this, arg1); diff --git a/src/itemMenuTable.c b/src/itemMenuTable.c new file mode 100644 index 00000000..04622c7a --- /dev/null +++ b/src/itemMenuTable.c @@ -0,0 +1,53 @@ +#include "global.h" + +typedef enum { + SWORD, + GUST_JAR, + CANE, + BOOMERANG, + SHIELD, + MOLE_MITTS, + LANTERN, + BOMBS, + PEGASUS_BOOTS, + ROCS_CAPE, + OCARINA, + BOW, + BOTTLE0, + BOTTLE1, + BOTTLE2, + BOTTLE3, + SAVE_BUTTON, +} ItemMenuTableSlot; + +typedef struct { + u8 up; + u8 down; + u8 left; + u8 right; + u8 type; + u8 unk0; + u8 x; + u8 y; +} ItemMenuTableEntry; + +const ItemMenuTableEntry gItemMenuTable[] = { + [SWORD] = { BOTTLE0, SHIELD, BOOMERANG, GUST_JAR, 0x01, 0x0c, 0x42, 0x33 }, + [GUST_JAR] = { BOTTLE1, MOLE_MITTS, SWORD, CANE, 0x01, 0x10, 0x66, 0x33 }, + [CANE] = { BOTTLE3, LANTERN, GUST_JAR, BOOMERANG, 0x01, 0x14, 0x8a, 0x33 }, + [BOOMERANG] = { SAVE_BUTTON, BOMBS, CANE, SWORD, 0x01, 0x15, 0xae, 0x33 }, + [SHIELD] = { SWORD, PEGASUS_BOOTS, BOMBS, MOLE_MITTS, 0x01, 0x16, 0x42, 0x4b }, + [MOLE_MITTS] = { GUST_JAR, ROCS_CAPE, SHIELD, LANTERN, 0x01, 0x17, 0x66, 0x4b }, + [LANTERN] = { CANE, OCARINA, MOLE_MITTS, BOMBS, 0x01, 0x00, 0x8a, 0x4b }, + [BOMBS] = { BOOMERANG, BOW, LANTERN, SHIELD, 0x01, 0x00, 0xae, 0x4b }, + [PEGASUS_BOOTS] = { SHIELD, BOTTLE0, BOW, ROCS_CAPE, 0x01, 0x00, 0x42, 0x63 }, + [ROCS_CAPE] = { MOLE_MITTS, BOTTLE1, PEGASUS_BOOTS, OCARINA, 0x01, 0x00, 0x66, 0x63 }, + [OCARINA] = { LANTERN, BOTTLE3, ROCS_CAPE, BOW, 0x01, 0x00, 0x8a, 0x63 }, + [BOW] = { BOMBS, SAVE_BUTTON, OCARINA, PEGASUS_BOOTS, 0x01, 0x00, 0xae, 0x63 }, + [BOTTLE0] = { PEGASUS_BOOTS, SWORD, SAVE_BUTTON, BOTTLE1, 0x01, 0x00, 0x42, 0x7b }, + [BOTTLE1] = { ROCS_CAPE, GUST_JAR, BOTTLE0, BOTTLE2, 0x01, 0x00, 0x5a, 0x7b }, + [BOTTLE2] = { ROCS_CAPE, GUST_JAR, BOTTLE1, BOTTLE3, 0x01, 0x00, 0x72, 0x7b }, + [BOTTLE3] = { OCARINA, CANE, BOTTLE2, SAVE_BUTTON, 0x01, 0x00, 0x8a, 0x7b }, + [SAVE_BUTTON] = { BOW, BOOMERANG, BOTTLE3, BOTTLE0, 0x03, 0x00, 0xb5, 0x75 }, + { BOW, BOOMERANG, BOTTLE3, BOTTLE0, 0x05, 0x00, 0xb5, 0x75 }, +}; diff --git a/src/main.c b/src/main.c index 08c2c285..8b57ff67 100644 --- a/src/main.c +++ b/src/main.c @@ -80,8 +80,8 @@ void AgbMain(void) { gMain.ticks++; sScreenHandlers[gMain.screen](); - MessageUpdate(); - sub_08050154(); + MessageMain(); + UpdateFade(); SoundLoop(); break; } @@ -191,7 +191,7 @@ NONMATCH("asm/non_matching/sub_080560B8.inc", static void sub_080560B8(void)) { case -1: default: MemCopy(&sDefaultSettings, (void*)0x2000000, 16); - Write_02000000(gUnk_02000000); + Write_02000000(gSaveHeader); break; } } @@ -211,14 +211,13 @@ END_NONMATCH u32 sub_08056134(void) { #ifdef EU - if ((gUnk_02000000->signature != SIGNATURE) || (gUnk_02000000->saveFileId >= NUM_SAVE_SLOTS) || - (gUnk_02000000->messageSpeed >= MAX_MSG_SPEED) || (gUnk_02000000->brightnessPref >= MAX_BRIGHTNESS) || - (gUnk_02000000->gameLanguage <= GAME_LANGUAGE) || (gUnk_02000000->gameLanguage >= 7) || - (gUnk_02000000->_e != 0)) + if ((gSaveHeader->signature != SIGNATURE) || (gSaveHeader->saveFileId >= NUM_SAVE_SLOTS) || + (gSaveHeader->messageSpeed >= MAX_MSG_SPEED) || (gSaveHeader->brightnessPref >= MAX_BRIGHTNESS) || + (gSaveHeader->gameLanguage <= GAME_LANGUAGE) || (gSaveHeader->gameLanguage >= 7) || (gSaveHeader->_e != 0)) #else - if ((gUnk_02000000->signature != SIGNATURE) || (gUnk_02000000->saveFileId >= NUM_SAVE_SLOTS) || - (gUnk_02000000->messageSpeed >= MAX_MSG_SPEED) || (gUnk_02000000->brightnessPref >= MAX_BRIGHTNESS) || - (gUnk_02000000->gameLanguage != GAME_LANGUAGE) || (gUnk_02000000->_e != 0)) + if ((gSaveHeader->signature != SIGNATURE) || (gSaveHeader->saveFileId >= NUM_SAVE_SLOTS) || + (gSaveHeader->messageSpeed >= MAX_MSG_SPEED) || (gSaveHeader->brightnessPref >= MAX_BRIGHTNESS) || + (gSaveHeader->gameLanguage != GAME_LANGUAGE) || (gSaveHeader->_e != 0)) #endif return FALSE; diff --git a/src/manager/manager1.c b/src/manager/manager1.c index 200fc720..59a9373f 100644 --- a/src/manager/manager1.c +++ b/src/manager/manager1.c @@ -17,10 +17,10 @@ void Manager1_Main(Entity* this) { u8* pbVar2; gUnk_08107C5C[this->action](this); - gUnk_08107C48[((u8*)&this->field_0x20)[1]](this); - bVar1 = gUnk_08107C40[((u8*)&this->field_0x20)[1]]; - if ((bVar1 != 0) && (*(u8*)&this->field_0x20 != bVar1)) { - ((u8*)&this->field_0x20)[0] = bVar1; + gUnk_08107C48[((u8*)&this->hVelocity)[1]](this); + bVar1 = gUnk_08107C40[((u8*)&this->hVelocity)[1]]; + if ((bVar1 != 0) && (*(u8*)&this->hVelocity != bVar1)) { + ((u8*)&this->hVelocity)[0] = bVar1; LoadGfxGroup(bVar1); } } @@ -28,9 +28,9 @@ void Manager1_Main(Entity* this) { void sub_080570B8(Entity* this) { u8* pbVar1; - LoadGfxGroup(((u8*)&this->field_0x20)[0]); + LoadGfxGroup(((u8*)&this->hVelocity)[0]); this->height.WORD = 0; - pbVar1 = ((u8*)&this->field_0x20 + 1); + pbVar1 = ((u8*)&this->hVelocity + 1); if (*pbVar1 == 3) { gScreen.affine.bg3Updated = 1; } else { @@ -46,9 +46,9 @@ void sub_080570F8(void) { void sub_08057118(Entity* this) { this->actionDelay = 0; - *(u8*)&this->field_0x20 = 0; - ((u8*)&this->field_0x20)[1] = 0; - ((u8*)&this->field_0x20)[2] = 0; + *(u8*)&this->hVelocity = 0; + ((u8*)&this->hVelocity)[1] = 0; + ((u8*)&this->hVelocity)[2] = 0; this->action = 1; gScreen.affine.bg3Control = 0x1e04; gScreen.lcd.displayControl |= 0x800; diff --git a/src/manager/manager15.c b/src/manager/manager15.c index 24b214b5..b0ce0828 100644 --- a/src/manager/manager15.c +++ b/src/manager/manager15.c @@ -253,8 +253,6 @@ void sub_0805A664(Manager15* this) { sub_0805A68C(this); } -extern u32 CheckPlayerProximity(u32, u32, u32, u32); - void sub_0805A68C(Manager15* this) { if (CheckPlayerProximity(this->unk_38 - 0x18, this->unk_3a - 0x18, 0x30, 0x30)) { if (this->unk_2c <= 0x1007) { diff --git a/src/manager/manager1A.c b/src/manager/manager1A.c index 2b4027a2..838fd898 100644 --- a/src/manager/manager1A.c +++ b/src/manager/manager1A.c @@ -32,7 +32,6 @@ void Manager1A_Main(Manager1A* this) { } extern void sub_08052D74(void*, void*, void*); -extern u32 CheckPlayerProximity(u32, u32, u32, u32); typedef struct struct_08108764 { u8 unk_00; @@ -140,9 +139,9 @@ void sub_0805B168(Manager1A* this) { u32 sub_0805B1CC(Manager1A* this) { u32 re = 0; if (CheckPlayerProximity(this->unk_20, this->unk_22, this->unk_24, this->unk_26)) { - if ((gPlayerState.flags.all & 0x4) && (gPlayerState.flags.all & 0x1)) { - gPlayerState.flags.all |= 0x8000; - } else if (gPlayerState.flags.all & 0x8000) { + if ((gPlayerState.flags & 0x4) && (gPlayerState.flags & 0x1)) { + gPlayerState.flags |= 0x8000; + } else if (gPlayerState.flags & 0x8000) { re = 1; } } @@ -158,7 +157,7 @@ void sub_0805B210(Manager1A* this) { gScreenTransition.areaID = tmp->unk_01; gScreenTransition.roomID = tmp->unk_02; gScreenTransition.playerLayer = tmp->unk_03; - if (gPlayerState.flags.all & 0x80) { + if (gPlayerState.flags & 0x80) { gScreenTransition.field_0xf = 6; } else { gScreenTransition.field_0xf = 2; diff --git a/src/manager/manager26.c b/src/manager/manager26.c index 6fa80711..96d0d270 100644 --- a/src/manager/manager26.c +++ b/src/manager/manager26.c @@ -76,7 +76,7 @@ void sub_0805C7C4(Manager26* this) { } void sub_0805C7CC(Manager26* this) { - if (gPlayerState.flags.all & 0x80) { + if (gPlayerState.flags & 0x80) { if (gPlayerEntity.y.HALF.HI < this->unk_2a + 0x10) { this->manager.unk_0d = 1; } else { diff --git a/src/manager/manager3.c b/src/manager/manager3.c index 5652ad89..99884daa 100644 --- a/src/manager/manager3.c +++ b/src/manager/manager3.c @@ -7,6 +7,7 @@ #include "random.h" #include "audio.h" #include "object.h" +#include "functions.h" // Facilitates the usage of minish portals. @@ -25,10 +26,9 @@ typedef struct { } Manager3; extern s8 gUnk_08107C6C[]; -extern u32 CheckPlayerProximity(u32, u32, u32, u32); extern u32 sub_08057810(void); extern u32 sub_080002C0(u16, u16, u8); -extern void sub_080577AC(u32, u32, u32); +extern void CreateMagicSparkles(u32, u32, u32); void Manager3_Main(Manager3* this) { s8 tmp; @@ -47,7 +47,7 @@ void Manager3_Main(Manager3* this) { gArea.field_0x18 = 1; gArea.curPortalType = 5; } else { - if ((gPlayerState.flags.all & 0x20) && gPlayerState.jumpStatus == 0) { + if ((gPlayerState.flags & 0x20) && gPlayerState.jumpStatus == 0) { gArea.field_0x18 = 2; } else { if (sub_08057810()) { @@ -55,11 +55,11 @@ void Manager3_Main(Manager3* this) { } } if (sub_080002C0(this->unk_38, this->unk_3a, this->manager.unk_0e) == 0x3d) { - sub_080577AC(this->unk_38 + gRoomControls.roomOriginX, this->unk_3a + gRoomControls.roomOriginY, - this->manager.unk_0e); + CreateMagicSparkles(this->unk_38 + gRoomControls.roomOriginX, this->unk_3a + gRoomControls.roomOriginY, + this->manager.unk_0e); if (!this->manager.unk_0f) { this->manager.unk_0f = 1; - SoundReq(SFX_152); + SoundReq(SFX_NEAR_PORTAL); } } } @@ -69,15 +69,15 @@ void Manager3_Main(Manager3* this) { } } -void sub_080577AC(u32 baseX, u32 baseY, u32 layer) { +void CreateMagicSparkles(u32 baseX, u32 baseY, u32 layer) { u32 r; int offsetX, offsetY; Entity* spark; r = Random(); - if ((r & 0x7) != 0) + if (r & 0x7) return; spark = CreateObject(SPECIAL_FX, 0x26, 0); - if (!spark) + if (spark == NULL) return; offsetX = (r >> 0x8) & 0xF; offsetY = ((r >> 0x10) & 0xF); @@ -94,7 +94,7 @@ void sub_080577AC(u32 baseX, u32 baseY, u32 layer) { } u32 sub_08057810(void) { - if ((gPlayerState.flags.all & 0x80) && !gPlayerState.field_0xaa && (gArea.curPortalType != 0x6) && + if ((gPlayerState.flags & 0x80) && !gPlayerState.field_0xaa && (gArea.curPortalType != 0x6) && (gPlayerState.heldObject == 0)) { switch (gPlayerState.field_0xa8) { case 0: diff --git a/src/manager/manager37.c b/src/manager/manager37.c index 35003011..c05425b0 100644 --- a/src/manager/manager37.c +++ b/src/manager/manager37.c @@ -79,13 +79,13 @@ void sub_0805DF4C(Manager* this) { if (--this->unk_0e == 0) { this->action = 3; this->unk_0e = 0x1e; - TextboxNoOverlapFollow(0x164f); + MessageFromTarget(0x164f); } } } void sub_0805DF98(Manager* this) { - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { if (this->unk_0e != 0) { this->unk_0e -= 1; } else { diff --git a/src/manager/manager39.c b/src/manager/manager39.c index d6018b42..d607b3c2 100644 --- a/src/manager/manager39.c +++ b/src/manager/manager39.c @@ -37,7 +37,7 @@ void sub_0805E1F8(u32, u32); void Manager39_Main(Manager39* this) { gUnk_08108E28[this->manager.action](this); - if ((gRoomControls.roomID != this->unk_20) || (gTextBox.doTextBox & 0x7F)) { + if ((gRoomControls.roomID != this->unk_20) || (gMessage.doTextBox & 0x7F)) { sub_0805E1D8(this); } } diff --git a/src/manager/manager6.c b/src/manager/manager6.c index 7c7f3cfb..d2a8fc66 100644 --- a/src/manager/manager6.c +++ b/src/manager/manager6.c @@ -18,7 +18,7 @@ void Manager6_Main(Manager6* this) { for (i = this->warpList; i->posX != 0xFFFF; i++) { tmp = (i->unk_07.all & 0x3); if (((tmp & (gPlayerEntity.collisionLayer)) != 0) && - (((gPlayerState.flags.all & 0x80) != 0) || ((i->unk_07.b.unk2) != 0)) && + (((gPlayerState.flags & 0x80) != 0) || ((i->unk_07.b.unk2) != 0)) && (CheckPlayerInRegion(i->posX, i->posY, i->width, i->height) != 0) && (gPlayerEntity.height.HALF.HI == 0)) { DoExitTransition(GetCurrentRoomProperty(i->unk_06)); diff --git a/src/manager/managerA.c b/src/manager/managerA.c index 3eaef479..456b087d 100644 --- a/src/manager/managerA.c +++ b/src/manager/managerA.c @@ -49,7 +49,7 @@ void sub_080585DC(ManagerA*); void sub_08058408(ManagerA* this) { u32 tmp2; - tmp2 = (gPlayerState.flags.all & 0x08); + tmp2 = (gPlayerState.flags & 0x08); if (tmp2 != 0) return; if (!CheckPlayerInRegion(this->unk_20, this->unk_22, this->unk_24, this->unk_26)) @@ -59,7 +59,7 @@ void sub_08058408(ManagerA* this) { return; case 2: sub_080585DC(this); - if ((gPlayerState.flags.all & 0x80) == 0) + if ((gPlayerState.flags & 0x80) == 0) return; case 0: default: @@ -118,7 +118,7 @@ extern void UnfreezeTime(void); void sub_08058514(ManagerA* this) { switch (this->manager.unk_0d) { case 1: - if ((gPlayerState.flags.all & 0x1235) != 0) + if ((gPlayerState.flags & 0x1235) != 0) return; if (gPlayerEntity.height.HALF.HI != 0) return; diff --git a/src/manager/managerF.c b/src/manager/managerF.c index 97d732f7..69f8c369 100644 --- a/src/manager/managerF.c +++ b/src/manager/managerF.c @@ -9,6 +9,7 @@ #include "textbox.h" #include "script.h" #include "utils.h" +#include "tiles.h" void sub_08058ECC(ManagerF*); @@ -335,14 +336,14 @@ void sub_0805930C(ManagerF* this) { } void SetDirtTile(u32 tile) { - SetTileType(0x1d, tile, 1); + SetTileType(CUT_GRASS, tile, 1); SetTileType(0, tile, 2); SetTileType(0, tile - 0x40, 2); } void sub_08059368(ManagerF* this) { this->manager.action = 1; - if (this->unk_3c == gCurrentTextBox._28) { + if (this->unk_3c == gTextRender.curToken.textIndex) { SetFlag(this->unk_3e); DeleteThisEntity(); } @@ -359,7 +360,7 @@ void sub_0805938C(ManagerF* this) { } u32 sub_080593CC(ManagerF* this) { - if (!(gPlayerState.flags.all & 0x80) && gPlayerState.swimState != 0 && gPlayerEntity.animationState == 0 && + if (!(gPlayerState.flags & 0x80) && gPlayerState.swimState != 0 && gPlayerEntity.animationState == 0 && (gPlayerState.field_0x90.HALF.LO & 0xF00) == 0x400) { return sub_0806FCB8(&gPlayerEntity, this->unk_38, this->unk_3a + 0xC, 6); } diff --git a/src/npc/beedle.c b/src/npc/beedle.c index b4d25858..55d54a01 100644 --- a/src/npc/beedle.c +++ b/src/npc/beedle.c @@ -53,14 +53,14 @@ void sub_08063314(Entity* this) { InitializeAnimation(this, offset); } if (this->interactType != '\0') { - TextboxNoOverlapFollow(this->actionDelay + 0xA01); + MessageFromTarget(this->actionDelay + 0xA01); this->action++; } sub_0806ED78(this); } void sub_0806336C(Entity* this) { - if ((gTextBox.doTextBox & 0x7F) == 0) { + if ((gMessage.doTextBox & 0x7F) == 0) { this->action++; InitializeAnimation(this, 8); } diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c index 611f6b24..d5320463 100644 --- a/src/npc/bigGoron.c +++ b/src/npc/bigGoron.c @@ -34,7 +34,6 @@ extern Hitbox gUnk_080FD180; Entity* sub_0806D00C(Entity* this); void sub_0806D4C0(Entity*, u32); -extern u32 CheckPlayerProximity(u32, u32, u32, u32); void BigGoron(Entity* this) { gUnk_081140D4[this->type](this); @@ -185,7 +184,7 @@ void sub_0806D274(Entity* this) { case 0: case 1: default: - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { this->frameIndex = 2; break; } diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c index 37067485..d6069c99 100644 --- a/src/npc/bladeBrothers.c +++ b/src/npc/bladeBrothers.c @@ -9,6 +9,7 @@ #include "npc.h" #include "audio.h" #include "functions.h" +#include "effects.h" extern void (*gUnk_081115C0[])(Entity*); extern void (*gUnk_081115D0[])(Entity*); @@ -86,7 +87,7 @@ void sub_08068A4C(Entity* this) { if (this->interactType != 0) { this->interactType = 0; this->action = 2; - TextboxNoOverlapFollow(0); + MessageFromTarget(0); } } @@ -165,7 +166,7 @@ void sub_08068BD0(Entity* this) { void sub_08068BEC(Entity* this, u32 unused) { Entity* target; - target = CreateFx(this, 0x44, 0); + target = CreateFx(this, FX_WHITE_SPLASH, 0); if (target) { target->spritePriority.b0 = 1; PositionRelative(this, target, 0, -0x100000); @@ -306,42 +307,42 @@ switchD_08068d12_caseD_0: // Introduction dialoague void sub_08068DB8(Entity* this) { - TextboxNoOverlap(gUnk_08111664[this->actionDelay], this); + MessageNoOverlap(gUnk_08111664[this->actionDelay], this); } // Ask to teach dialoague void sub_08068DD0(Entity* this) { - TextboxNoOverlap(gUnk_0811167A[this->actionDelay], this); + MessageNoOverlap(gUnk_0811167A[this->actionDelay], this); } // Technique Dialogue void sub_08068DE8(Entity* this) { - TextboxNoOverlap(gUnk_08111690[this->actionDelay], this); + MessageNoOverlap(gUnk_08111690[this->actionDelay], this); } // Posession dialogue void sub_08068E00(Entity* this) { - TextboxNoOverlap(gUnk_081116A6[this->actionDelay], this); + MessageNoOverlap(gUnk_081116A6[this->actionDelay], this); } void sub_08068E18(Entity* this) { - TextboxNoOverlap(gUnk_081116BC[this->actionDelay], this); + MessageNoOverlap(gUnk_081116BC[this->actionDelay], this); } void sub_08068E30(Entity* this) { - TextboxNoOverlap(gUnk_081116D2[this->actionDelay], this); + MessageNoOverlap(gUnk_081116D2[this->actionDelay], this); } void sub_08068E48(Entity* this) { - TextboxNoOverlap(gUnk_081116E8[this->actionDelay], this); + MessageNoOverlap(gUnk_081116E8[this->actionDelay], this); } void sub_08068E60(Entity* this) { - TextboxNoOverlap(gUnk_081116FE[this->actionDelay], this); + MessageNoOverlap(gUnk_081116FE[this->actionDelay], this); } void sub_08068E78(Entity* this) { - TextboxNoOverlap(gUnk_08111714[this->actionDelay], this); + MessageNoOverlap(gUnk_08111714[this->actionDelay], this); } void sub_08068E90(Entity* this) { diff --git a/src/npc/brocco.c b/src/npc/brocco.c index 46ec7aa5..e38053fa 100644 --- a/src/npc/brocco.c +++ b/src/npc/brocco.c @@ -34,7 +34,7 @@ void sub_0806355C(Entity* this) { ASM_FUNC("asm/non_matching/brocco/sub_08063584.inc", void sub_08063584(Entity* this)) void sub_08063608(Entity* this) { - u8 tmp = gTextBox.doTextBox & 0x7f; + u8 tmp = gMessage.doTextBox & 0x7f; if (tmp == 0) { this->action = 1; this->field_0xf = tmp; diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c index 9b1e5606..aa070e14 100644 --- a/src/npc/carpenter.c +++ b/src/npc/carpenter.c @@ -77,7 +77,7 @@ void sub_080672C8(Entity* this) { tmp = CheckGlobalFlag(TABIDACHI); dialog = BOOLCAST(tmp); } - TextboxNoOverlap(gUnk_08110CE8[(dialog * 2 + this->type * 6) / 2], this); + MessageNoOverlap(gUnk_08110CE8[(dialog * 2 + this->type * 6) / 2], this); } void sub_08067304(Entity* this) { diff --git a/src/npc/castleMaid.c b/src/npc/castleMaid.c index 425dd203..bf2289c8 100644 --- a/src/npc/castleMaid.c +++ b/src/npc/castleMaid.c @@ -80,7 +80,7 @@ NONMATCH("asm/non_matching/castleMaid/sub_08064570.inc", void sub_08064570(Entit } break; case 2: - if ((gTextBox.doTextBox & 0x7f) != 0) { + if ((gMessage.doTextBox & 0x7f) != 0) { return; } this->action = 1; @@ -111,7 +111,7 @@ void sub_0806464C(Entity* this) { } else { tmp = 1; } - TextboxNoOverlap(gUnk_0810F88C[tmp], this); + MessageNoOverlap(gUnk_0810F88C[tmp], this); } void sub_08064688(Entity* this) { diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c index 5e1861e7..390e86a1 100644 --- a/src/npc/castorWildsStatue.c +++ b/src/npc/castorWildsStatue.c @@ -2,6 +2,7 @@ #include "script.h" #include "functions.h" #include "flags.h" +#include "effects.h" extern Hitbox gUnk_08110E94; @@ -87,7 +88,7 @@ void sub_08067534(Entity* this) { Entity* entity; s32 i; for (i = 0; i < 2; ++i) { - entity = CreateFx(this, 2, 0); + entity = CreateFx(this, FX_DEATH, 0); if (entity != NULL) { entity->x.HALF.HI += gUnk_08110E64[i]; entity->y.HALF.HI += 0x1c; diff --git a/src/npc/cat.c b/src/npc/cat.c index b08369a0..30160f98 100644 --- a/src/npc/cat.c +++ b/src/npc/cat.c @@ -151,7 +151,7 @@ void sub_0806797C(Entity* this) { void sub_0806799C(Entity* this) { UpdateAnimationSingleFrame(this); - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { sub_08067B08(this); sub_0805E3A0(this, 1); } @@ -272,7 +272,7 @@ void sub_08067C44(Entity* this) { s32 iVar4; u32 uVar5; - uVar5 = -((s32) - (gPlayerState.flags.all & 0x80) >> 0x1f); + uVar5 = -((s32) - (gPlayerState.flags & 0x80) >> 0x1f); if (uVar5 != this->field_0x68.HALF.HI) { if (uVar5 == 0) { sub_08078778(this); diff --git a/src/npc/cow.c b/src/npc/cow.c index 411b139f..0a1ec389 100644 --- a/src/npc/cow.c +++ b/src/npc/cow.c @@ -181,7 +181,7 @@ void Cow_ShowDialogue(Entity* ent) { void sub_0806920C(Entity* ent) { // TODO: figure out what bitfield flag this is - u32 var0 = gPlayerState.flags.all & 0x80; + u32 var0 = gPlayerState.flags & 0x80; u32 var1 = -var0 >> 0x1F; if (var1 != ent->field_0x6c.HALF.HI) { @@ -200,7 +200,7 @@ void sub_0806924C(Entity* ent) { s8 itype = ent->interactType; if (itype != 0) { // TODO: figure out what bitfield flag this is - if ((gPlayerState.flags.all & 0x80) != 0) { + if ((gPlayerState.flags & 0x80) != 0) { if (itype == 2) { ent->action = 4; sub_0806F118(ent); diff --git a/src/npc/cucco.c b/src/npc/cucco.c index abfe0904..37d3efb4 100644 --- a/src/npc/cucco.c +++ b/src/npc/cucco.c @@ -59,7 +59,7 @@ void sub_0806E648(Entity* this) { void sub_0806E65C(Entity* this) { if (this->interactType != 0) { - if ((gPlayerState.flags.all & 0x80) != 0) { + if ((gPlayerState.flags & 0x80) != 0) { if (this->interactType == 2) { this->action = 4; sub_0806F118(this); diff --git a/src/npc/cuccoChick.c b/src/npc/cuccoChick.c index a1963b41..faf90f6e 100644 --- a/src/npc/cuccoChick.c +++ b/src/npc/cuccoChick.c @@ -53,7 +53,7 @@ void sub_0806E824(Entity* this) { void sub_0806E838(Entity* this) { if (this->interactType != 0) { - if ((gPlayerState.flags.all & 0x80) != 0) { + if ((gPlayerState.flags & 0x80) != 0) { if (this->interactType == 2) { this->action = 3; sub_0806F118(this); @@ -69,7 +69,7 @@ void sub_0806E838(Entity* this) { } void sub_0806E884(Entity* this) { - TextboxNoOverlap(0xdb6, this); + MessageNoOverlap(0xdb6, this); } void CuccoChick_Fusion(Entity* this) { @@ -79,7 +79,7 @@ void CuccoChick_Fusion(Entity* this) { this->frameIndex = 1; } else { if (sub_08003FC4(this, 0x3000) == 0) { - this->field_0x20 = 0x10000; + this->hVelocity = 0x10000; } } } diff --git a/src/npc/dampe.c b/src/npc/dampe.c index 6293bcd7..f42e3cce 100644 --- a/src/npc/dampe.c +++ b/src/npc/dampe.c @@ -66,7 +66,7 @@ void sub_0806BE84(Entity* this, ScriptExecutionContext* context) { if (GetInventoryValue(0x3C) >= 2) { msgIndex = 2; } - TextboxNoOverlap(gUnk_08113344[msgIndex], this); + MessageNoOverlap(gUnk_08113344[msgIndex], this); } void sub_0806BEC8(Entity* this, ScriptExecutionContext* context) { @@ -83,7 +83,7 @@ void sub_0806BEC8(Entity* this, ScriptExecutionContext* context) { msgIndex = 2; } - TextboxNoOverlap(gUnk_0811334A[msgIndex], this); + MessageNoOverlap(gUnk_0811334A[msgIndex], this); } void sub_0806BEFC() { diff --git a/src/npc/din.c b/src/npc/din.c index ec340fb1..d17d1dea 100644 --- a/src/npc/din.c +++ b/src/npc/din.c @@ -5,8 +5,6 @@ #include "functions.h" #include "save.h" -extern u32 sub_08002632(Entity*); - void Din(Entity* this) { switch (this->action) { case 0: diff --git a/src/npc/dog.c b/src/npc/dog.c index 6f9ed898..7f312ff4 100644 --- a/src/npc/dog.c +++ b/src/npc/dog.c @@ -71,7 +71,7 @@ void sub_08069B44(Entity* this) { if ((this->flags & 2) != 0) { sub_0807DD50(this); } - if (((this->type == 0) && ((gPlayerState.flags.all & 0x80) == 0)) && (GetInventoryValue(0x36) != 2)) { + if (((this->type == 0) && ((gPlayerState.flags & 0x80) == 0)) && (GetInventoryValue(0x36) != 2)) { this->action = 4; } #if defined(JP) || defined(EU) || defined(DEMO_JP) @@ -87,7 +87,7 @@ void sub_08069B44(Entity* this) { void sub_08069C40(Entity* this) { UpdateAnimationSingleFrame(this); if (sub_08069F90(this) != 0) { - if ((gPlayerState.flags.all & 0x80) != 0) { + if ((gPlayerState.flags & 0x80) != 0) { sub_08069CB8(this); } else { this->animationState = GetAnimationState(this); @@ -282,14 +282,14 @@ u32 sub_08069F90(Entity* this) { } void sub_08069FBC(Entity* this) { - u32 tmp = (gPlayerState.flags.all & 0x80) != 0 ? 0x24 : 0x20; + u32 tmp = (gPlayerState.flags & 0x80) != 0 ? 0x24 : 0x20; if ((this->animationState == 1) || (this->animationState == 3)) { this->field_0x6a.HALF.HI = tmp; } } void sub_08069FE8(Entity* this) { - u32 tmp = -((s32) - (gPlayerState.flags.all & 0x80) >> 0x1f); + u32 tmp = -((s32) - (gPlayerState.flags & 0x80) >> 0x1f); if (tmp != this->field_0x6a.HALF.LO) { if (tmp == 0) { sub_08078778(this); @@ -302,7 +302,7 @@ void sub_08069FE8(Entity* this) { void sub_0806A028(Entity* this) { if (this->interactType != 0) { - if ((gPlayerState.flags.all & 0x80) != 0) { + if ((gPlayerState.flags & 0x80) != 0) { if (this->interactType == 2) { this->action = 6; sub_0806F118(this); @@ -326,7 +326,7 @@ void sub_0806A080(Entity* this) { void sub_0806A0A4(Entity* this) { s32 dialog; - if ((gPlayerState.flags.all & 0x80) != 0) { + if ((gPlayerState.flags & 0x80) != 0) { dialog = 4; #if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckLocalFlag(0xcc) == 0) { @@ -364,12 +364,12 @@ void sub_0806A0A4(Entity* this) { } } } - TextboxNoOverlap(gUnk_08111F74[(u32)gSave.unk8 * 5 + dialog], this); + MessageNoOverlap(gUnk_08111F74[(u32)gSave.unk8 * 5 + dialog], this); } void sub_0806A144(Entity* this) { s32 dialog = 4; - if ((gPlayerState.flags.all & 0x80) != 0) { + if ((gPlayerState.flags & 0x80) != 0) { dialog = 3; if ((GetInventoryValue(0x46) == 0) && (CheckGlobalFlag(0x29) != 0)) { if (CheckLocalFlag(0x85) == 0) { @@ -379,7 +379,7 @@ void sub_0806A144(Entity* this) { } } } - TextboxNoOverlap(gUnk_08111FD8[dialog], this); + MessageNoOverlap(gUnk_08111FD8[dialog], this); } void Dog_Fusion(Entity* this) { diff --git a/src/npc/drLeft.c b/src/npc/drLeft.c index 65863d72..9a99a651 100644 --- a/src/npc/drLeft.c +++ b/src/npc/drLeft.c @@ -77,7 +77,7 @@ void sub_0806C038(Entity* this) { } } } - TextboxNoOverlap(gUnk_081133A4[index], this); + MessageNoOverlap(gUnk_081133A4[index], this); } void sub_0806C09C(Entity* this) { diff --git a/src/npc/epona.c b/src/npc/epona.c index 1846d4f9..4c0abc0f 100644 --- a/src/npc/epona.c +++ b/src/npc/epona.c @@ -38,7 +38,7 @@ void sub_08065A00(Entity* this) { } void sub_08065A10(Entity* this) { - if ((gTextBox.doTextBox & 0x7F) == 0) { + if ((gMessage.doTextBox & 0x7F) == 0) { this->action = 1; InitAnimationForceUpdate(this, this->animationState / 2); } @@ -58,7 +58,7 @@ void sub_08065A50(Entity* this) { void sub_08065A64(Entity* this) { u32 uVar2; - uVar2 = -(gPlayerState.flags.all & 0x80) >> 0x1f; + uVar2 = -(gPlayerState.flags & 0x80) >> 0x1f; if (uVar2 != this->field_0x68.HALF.HI) { if (uVar2 == 0) { sub_08078778(this); @@ -71,7 +71,7 @@ void sub_08065A64(Entity* this) { void sub_08065AA4(Entity* this) { if (this->interactType != 0) { - if (gPlayerState.flags.all & 0x80) { + if (gPlayerState.flags & 0x80) { if (this->interactType == 2) { this->action = 4; sub_0806F118(this); diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c index 6f1a16bd..3133fc00 100644 --- a/src/npc/ezloCap.c +++ b/src/npc/ezloCap.c @@ -3,6 +3,7 @@ #include "script.h" #include "audio.h" #include "functions.h" +#include "effects.h" const u8 gUnk_08114134[]; const u8 gUnk_08114144[]; @@ -55,7 +56,7 @@ void sub_0806D944(Entity* this) { // Ezlo Angry FX void sub_0806D96C(Entity* this) { - Entity* fx = CreateFx(this, 0x42, 0); + Entity* fx = CreateFx(this, FX_STEAM_EFC, 0); if (fx != NULL) { fx->spritePriority.b0 = 1; PositionRelative(this, fx, 0, 0xFFE80000); diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c index e42500e8..48c5f42d 100644 --- a/src/npc/forestMinish.c +++ b/src/npc/forestMinish.c @@ -149,7 +149,7 @@ void sub_080601D4(Entity* this) { temp = CheckKinstoneFused(0x17); uVar2 = BOOLCAST(temp); } - TextboxNoOverlap(gUnk_0810A354[uVar2], this); + MessageNoOverlap(gUnk_0810A354[uVar2], this); } void sub_08060208(Entity* this) { @@ -197,7 +197,7 @@ void sub_08060270(Entity* this) { SetLocalFlag(0x76); } } - TextboxNoOverlap(gUnk_0810A35A[index], this); + MessageNoOverlap(gUnk_0810A35A[index], this); } void sub_080602BC(Entity* this) { @@ -213,7 +213,7 @@ void sub_080602BC(Entity* this) { index = 0; } } - TextboxNoOverlap(gUnk_0810A362[index], this); + MessageNoOverlap(gUnk_0810A362[index], this); } void sub_0806030C(Entity* this, ScriptExecutionContext* context) { diff --git a/src/npc/ghostBrothers.c b/src/npc/ghostBrothers.c index afdc774f..fddefb9c 100644 --- a/src/npc/ghostBrothers.c +++ b/src/npc/ghostBrothers.c @@ -115,7 +115,7 @@ void sub_08065F20(Entity* this) { UpdateAnimationSingleFrame(this); if (this->interactType != 0) { this->interactType = 0; - TextboxNoOverlapFollow(0); + MessageFromTarget(0); this->animIndex += 1; if (gSpriteAnimations_GhostBrothers[this->animIndex] == 0) { this->animIndex = 0; diff --git a/src/npc/gorman.c b/src/npc/gorman.c index 861a29d8..8c45efdc 100644 --- a/src/npc/gorman.c +++ b/src/npc/gorman.c @@ -99,7 +99,7 @@ void sub_08069888(Entity* this) { } else { index = 5; } - TextboxNoOverlap(gUnk_08111C50[index], this); + MessageNoOverlap(gUnk_08111C50[index], this); } ASM_FUNC("asm/non_matching/gorman/sub_0806991C.inc", void sub_0806991C(Entity* this, ScriptExecutionContext* context)) diff --git a/src/npc/goron.c b/src/npc/goron.c index 46a6e940..a2498d86 100644 --- a/src/npc/goron.c +++ b/src/npc/goron.c @@ -3,6 +3,7 @@ #include "functions.h" #include "textbox.h" #include "script.h" +#include "effects.h" extern void (*gUnk_08111A80[])(Entity*); extern void (*gUnk_08111A8C[])(Entity*); @@ -40,13 +41,13 @@ void sub_08069328(Entity* this) { this->action = 2; sub_0805E47C(this); InitAnimationForceUpdate(this, 8); - TextboxNoOverlapFollow(this->actionDelay + (0x90 << 5)); + MessageFromTarget(this->actionDelay + (0x90 << 5)); } } void sub_08069390(Entity* this) { UpdateAnimationSingleFrame(this); - if ((gTextBox.doTextBox & 0x7F) == 0) { + if ((gMessage.doTextBox & 0x7F) == 0) { this->action = 1; this->interactType = 0; sub_0805E584(this); @@ -79,13 +80,13 @@ void sub_080693D0(Entity* this) { } void sub_08069428(Entity* this, s32 offsetX, bool32 createFx65) { - Entity* fx = CreateFx(this, 4, 0); + Entity* fx = CreateFx(this, FX_ROCK, 0); if (fx) { PositionRelative(this, fx, offsetX, 0xFFF00000); ResolveEntityOnTop(this, fx); } if (createFx65 != 0) { - fx = CreateFx(this, 65, 0); + fx = CreateFx(this, FX_REFLECT4, 0); if (fx) { PositionRelative(this, fx, offsetX, 0xFFF00000); ResolveEntityOnTop(this, fx); diff --git a/src/npc/goronMerchant.c b/src/npc/goronMerchant.c index ca41b899..f081cead 100644 --- a/src/npc/goronMerchant.c +++ b/src/npc/goronMerchant.c @@ -52,9 +52,9 @@ void sub_080695AC(Entity* this) { void sub_080695E8(Entity* this) { UpdateAnimationSingleFrame(this); - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { this->action = 1; - this->interactType = gTextBox.doTextBox & 0x7f; + this->interactType = gMessage.doTextBox & 0x7f; sub_0805E584(this); InitAnimationForceUpdate(this, this->animationState); } @@ -80,8 +80,8 @@ void sub_08069654(Entity* this) { void sub_08069660(Entity* this) { u32 uVar1; - TextboxNoOverlap(0x2c1c, this); - gTextBox.field_0x10 = (u16)GoronMerchant_GetSalePrice(this); + MessageNoOverlap(0x2c1c, this); + gMessage.field_0x10 = (u16)GoronMerchant_GetSalePrice(this); } void sub_08069684(void) { @@ -142,11 +142,11 @@ void GoronMerchant_TryToBuyKinstone(Entity* this, ScriptExecutionContext* contex gRoomVars.field_0x7 = 0; context->condition = 1; } else { - TextboxNoOverlap(0x2c1f, this); + MessageNoOverlap(0x2c1f, this); context->condition = 0; } } else { - TextboxNoOverlap(0x2c1e, this); + MessageNoOverlap(0x2c1e, this); context->condition = 0; } gActiveScriptInfo.flags = gActiveScriptInfo.flags | 1; diff --git a/src/npc/guard.c b/src/npc/guard.c index 7e9b0034..736625cd 100644 --- a/src/npc/guard.c +++ b/src/npc/guard.c @@ -85,8 +85,8 @@ void sub_08063DC8(Entity* this) { InitAnimationForceUpdate(this, this->animationState + 4); } else { sub_0806EE20(this); - if (this->field_0x3e != this->animationState) { - this->animationState = this->field_0x3e; + if (this->knockbackDirection != this->animationState) { + this->animationState = this->knockbackDirection; InitializeAnimation(this, this->animationState + 4); } else { GetNextFrame(this); @@ -107,7 +107,7 @@ void sub_08063E54(Entity* this) { } void sub_08063E6C(Entity* this) { - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { this->action = 1; InitializeAnimation(this, this->animationState + 4); } @@ -160,7 +160,7 @@ void sub_08063F20(Entity* this) { } void sub_08063F78(Entity* this) { - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { this->action = this->action - 1; InitializeAnimation(this, (this->animationState >> 1) + 4 + *(s8*)&this->field_0x70); } diff --git a/src/npc/kid.c b/src/npc/kid.c index e4c4c80a..459e545d 100644 --- a/src/npc/kid.c +++ b/src/npc/kid.c @@ -70,7 +70,7 @@ void sub_08062130(Entity* this) { } void sub_08062194(Entity* this) { - TextboxNoOverlapFollow(0); + MessageFromTarget(0); this->action = 1; this->interactType = 0; } @@ -132,7 +132,7 @@ NONMATCH("asm/non_matching/kid/sub_080621AC.inc", void sub_080621AC(Entity* this break; case 2: GetNextFrame(this); - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { this->action = 1; } break; @@ -203,13 +203,13 @@ END_NONMATCH NONMATCH("asm/non_matching/kid/sub_08062634.inc", void sub_08062634(Entity* this)) { u32 a = this->type2; u32 b = (Random() & 1); - TextboxNoOverlap(*((u16*)gUnk_0810BDE8 + b + a * 2), this); + MessageNoOverlap(*((u16*)gUnk_0810BDE8 + b + a * 2), this); } END_NONMATCH NONMATCH("asm/non_matching/kid/sub_0806265C.inc", void sub_0806265C(Entity* this, ScriptExecutionContext* context)) { if (gSave.unk8 == 0) { - TextboxNoOverlap(0, this); + MessageNoOverlap(0, this); } else { ShowNPCDialogue(this, &gUnk_0810BE10[this->type * 9 + gSave.unk8]); } diff --git a/src/npc/kingDaltus.c b/src/npc/kingDaltus.c index 714ed1f6..f296cd4b 100644 --- a/src/npc/kingDaltus.c +++ b/src/npc/kingDaltus.c @@ -90,7 +90,7 @@ void sub_0806673C(Entity* this) { } else { index = 3; } - TextboxNoOverlap(gUnk_081104F8[index], this); + MessageNoOverlap(gUnk_081104F8[index], this); } void KingDaltus_Fusion(Entity* this) { diff --git a/src/npc/kingGustaf.c b/src/npc/kingGustaf.c index cd0d3722..97388682 100644 --- a/src/npc/kingGustaf.c +++ b/src/npc/kingGustaf.c @@ -16,12 +16,12 @@ void KingGustaf(Entity* this) { gScreen.controls.layerFXControl = 0x3f40; gScreen.controls.alphaBlend = 0x1000; this->speed = 0x1000; - this->field_0x20 = 0; + this->hVelocity = 0; } else { sub_0807DD94(this, 0); speed = 0x100; speed *= this->speed; - speed += this->field_0x20; + speed += this->hVelocity; speed >>= 0x10; if (speed > 0x10) { speed = 0x10; diff --git a/src/npc/librari.c b/src/npc/librari.c index 992a920c..f5e1b629 100644 --- a/src/npc/librari.c +++ b/src/npc/librari.c @@ -55,7 +55,7 @@ void sub_0806B260(Entity* this, ScriptExecutionContext* context) { } else { index = 3; } - TextboxNoOverlap(gUnk_08112D48[index], this); + MessageNoOverlap(gUnk_08112D48[index], this); } extern u16 gUnk_08112D50[]; @@ -82,7 +82,7 @@ void sub_0806B2B4(Entity* this) { } else { index = 0; } - TextboxNoOverlap(gUnk_08112D50[index], this); + MessageNoOverlap(gUnk_08112D50[index], this); } void Librari_Fusion(Entity* this) { diff --git a/src/npc/librarians.c b/src/npc/librarians.c index f88ecc6d..9b134e7a 100644 --- a/src/npc/librarians.c +++ b/src/npc/librarians.c @@ -57,5 +57,5 @@ void sub_0806BBB0(Entity* this) { } else { tmp = 2; } - TextboxNoOverlap(gUnk_08113078[tmp], this); + MessageNoOverlap(gUnk_08113078[tmp], this); } diff --git a/src/npc/mailbox.c b/src/npc/mailbox.c index bab9a8ba..43b87eb8 100644 --- a/src/npc/mailbox.c +++ b/src/npc/mailbox.c @@ -2,6 +2,7 @@ #include "entity.h" #include "textbox.h" #include "functions.h" +#include "effects.h" extern void sub_08063280(); @@ -41,7 +42,7 @@ void sub_08063254(Entity* this, u32 unused) { sub_08063280(this, unused); if ((this->frames.all & 0x80) != 0) { this->action = 3; - TextboxNoOverlapFollow(0); + MessageFromTarget(0); } } @@ -58,5 +59,5 @@ void sub_08063280(Entity* this, u32 unused) { var = e->frames.all & 0x7F; e->frames.all ^= var; if (var == 2) - CreateFx(e, 49, 0); + CreateFx(e, FX_MAILBOX_UNUSED, 0); } diff --git a/src/npc/marcy.c b/src/npc/marcy.c index 35e66f8f..89937936 100644 --- a/src/npc/marcy.c +++ b/src/npc/marcy.c @@ -50,7 +50,7 @@ void sub_08062D18(Entity* this, ScriptExecutionContext* context) { tmp = 3; } - TextboxNoOverlap(gUnk_0810C34C[tmp], this); + MessageNoOverlap(gUnk_0810C34C[tmp], this); if (tmp == 0) { context->condition = TRUE; } else { diff --git a/src/npc/melari.c b/src/npc/melari.c index 1e911439..9f1df856 100644 --- a/src/npc/melari.c +++ b/src/npc/melari.c @@ -6,6 +6,7 @@ #include "random.h" #include "audio.h" #include "functions.h" +#include "effects.h" extern void sub_08068780(Entity*); extern s32 sub_0806EDD8(Entity*, u32, u32); @@ -49,7 +50,7 @@ void sub_08068730(Entity* this) { } if (this->interactType != 0) { this->interactType = 0; - TextboxNoOverlapFollow(this->actionDelay + 0x1200); + MessageFromTarget(this->actionDelay + 0x1200); } } @@ -91,7 +92,7 @@ void sub_08068780(Entity* this) { } else { EnqueueSFX(gUnk_08111538[(s32)Random() % 3]); } - ent = CreateFx(this, 0x3d, 0x20); + ent = CreateFx(this, FX_STARS2, 0x20); if (ent != NULL) { PositionRelative(this, ent, 0x180000, -0xa0000); } diff --git a/src/npc/ministerPotho.c b/src/npc/ministerPotho.c index 5beb9499..6c3bfb29 100644 --- a/src/npc/ministerPotho.c +++ b/src/npc/ministerPotho.c @@ -92,7 +92,7 @@ void sub_08066904(Entity* this) { } else { index = 3; } - TextboxNoOverlap(gUnk_08110650[index], this); + MessageNoOverlap(gUnk_08110650[index], this); } void MinisterPotho_Fusion(Entity* this) { diff --git a/src/npc/mountainMinish.c b/src/npc/mountainMinish.c index b295b57d..fa4ab4c8 100644 --- a/src/npc/mountainMinish.c +++ b/src/npc/mountainMinish.c @@ -50,7 +50,7 @@ void sub_08067E88(Entity* this) { if (this->interactType != 0) { this->interactType = 0; this->action = 2; - TextboxNoOverlapFollow(this->actionDelay + 0x1200); + MessageFromTarget(this->actionDelay + 0x1200); } } @@ -86,7 +86,7 @@ NONMATCH("asm/non_matching/mountainMinish/sub_08068190.inc", void sub_08068190(E } // TODO unable to devide the array access variables by two without breaking everything - TextboxNoOverlap(gUnk_0811130E[uVar2 * 2 + uVar3 * 8], this); + MessageNoOverlap(gUnk_0811130E[uVar2 * 2 + uVar3 * 8], this); } END_NONMATCH diff --git a/src/npc/mutoh.c b/src/npc/mutoh.c index 5391ac8d..3f66dd26 100644 --- a/src/npc/mutoh.c +++ b/src/npc/mutoh.c @@ -60,7 +60,7 @@ void sub_080670B4(Entity* this) { uVar1 = CheckGlobalFlag(TABIDACHI); uVar2 = BOOLCAST(uVar1); } - TextboxNoOverlap(gUnk_08110C0C[uVar2], this); + MessageNoOverlap(gUnk_08110C0C[uVar2], this); } void sub_080670E4(Entity* this) { diff --git a/src/npc/npc23.c b/src/npc/npc23.c index 6320a7fe..fbb6e943 100644 --- a/src/npc/npc23.c +++ b/src/npc/npc23.c @@ -39,7 +39,7 @@ void sub_080662F8(Entity* this) { void sub_08066358(Entity* this) { if (this->interactType != 0) { this->interactType = 0; - TextboxNoOverlapFollow(0); + MessageFromTarget(0); if ((this->type2 & 0x10) != 0) { this->action = 3; this->subAction = 0; diff --git a/src/npc/npc5.c b/src/npc/npc5.c index d64e5c77..f90e709b 100644 --- a/src/npc/npc5.c +++ b/src/npc/npc5.c @@ -392,7 +392,7 @@ NONMATCH("asm/non_matching/npc5/sub_08061170.inc", bool32 sub_08061170(Entity* t this->action = 6; tmp = (sub_08079FD4(this, 1) * 0x10 - 4); // tmp <<= 0xc; - this->field_0x20 = tmp; + this->hVelocity = tmp; this->speed = 0x100; this->direction = direction; this->animationState = direction >> 2; @@ -867,7 +867,7 @@ NONMATCH("asm/non_matching/npc5/sub_08061B18.inc", void sub_08061B18(Entity* thi if ((((Tmp**)&this->field_0x68))[++this->actionDelay]->unk_2 == 0) { this->actionDelay = 0; } - TextboxNoOverlap((u32)*puVar2, this); + MessageNoOverlap((u32)*puVar2, this); break; } } diff --git a/src/npc/npc9.c b/src/npc/npc9.c index 23a0bd3e..f0924a9b 100644 --- a/src/npc/npc9.c +++ b/src/npc/npc9.c @@ -30,13 +30,13 @@ void sub_08062B14(Entity* this) { void sub_08062B48(Entity* this) { GetNextFrame(this); if ((this->frames.b.f3) != 0) { - TextboxNoOverlapFollow(0xa01); + MessageFromTarget(0xa01); this->action++; } } void sub_08062B70(Entity* this) { - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { InitializeAnimation(this, 2); this->action = 1; sub_0805E584(this); diff --git a/src/npc/percy.c b/src/npc/percy.c index 5bd1fc37..16578b58 100644 --- a/src/npc/percy.c +++ b/src/npc/percy.c @@ -6,6 +6,7 @@ #include "flags.h" #include "script.h" #include "save.h" +#include "effects.h" extern void sub_0806B41C(Entity*); extern void sub_0806B3CC(Entity*); @@ -48,7 +49,7 @@ void sub_0806B3CC(Entity* this) { GetNextFrame(this); if (this->interactType != 0) { this->interactType = 0; - TextboxNoOverlapFollow(0); + MessageFromTarget(0); } sub_0806ED78(this); } @@ -63,7 +64,7 @@ void sub_0806B41C(Entity* this) { this->action = 1; this->spriteSettings.b.draw = 1; if (this->type2 == 2) { - CreateFx(this, 0x25, 0); + CreateFx(this, FX_SWEAT, 0); } sub_0807DD50(this); } @@ -106,7 +107,7 @@ void sub_0806B504(Entity* this) { SetLocalFlag(0x86); } - TextboxNoOverlap(gUnk_08112E54[idx], this); + MessageNoOverlap(gUnk_08112E54[idx], this); } void sub_0806B540(Entity* this) { @@ -115,7 +116,7 @@ void sub_0806B540(Entity* this) { context = *(ScriptExecutionContext**)&this->cutsceneBeh; switch (context->unk_18) { case 0: - TextboxNoOverlap(0x2312, this); + MessageNoOverlap(0x2312, this); if (CheckLocalFlag(0x3f) != 0) { return; } @@ -123,13 +124,13 @@ void sub_0806B540(Entity* this) { SetLocalFlag(0x3f); break; case 1: - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { context->unk_18 = 2; - TextboxNoOverlap(0x2315, this); + MessageNoOverlap(0x2315, this); } break; case 2: - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { context->unk_18 = 3; if (gSave.stats.filler3[0] != 0) { sub_080A7C18(0x58, 0, 0); diff --git a/src/npc/picolyteBottle.c b/src/npc/picolyteBottle.c index 73c99b40..f95ef7d3 100644 --- a/src/npc/picolyteBottle.c +++ b/src/npc/picolyteBottle.c @@ -109,10 +109,10 @@ void sub_0806E1FC(Entity* this) { void sub_0806E20C(void) { if (gScreenTransition.field_0x6 != 0) { - TextboxNoOverlapFollow(0x421f); - gTextBox.field_0x10 = gScreenTransition.field_0x6; + MessageFromTarget(0x421f); + gMessage.field_0x10 = gScreenTransition.field_0x6; } else { - TextboxNoOverlapFollow(0x4220); + MessageFromTarget(0x4220); } } diff --git a/src/npc/pina.c b/src/npc/pina.c index 0acf265f..53c31486 100644 --- a/src/npc/pina.c +++ b/src/npc/pina.c @@ -36,7 +36,7 @@ void sub_08063A98(Entity* this) { ASM_FUNC("asm/non_matching/pina/sub_08063AC0.inc", void sub_08063AC0(Entity* this)) void sub_08063B44(Entity* this) { - u8 tmp = gTextBox.doTextBox & 0x7f; + u8 tmp = gMessage.doTextBox & 0x7f; if (tmp == 0) { this->action = 1; this->field_0xf = tmp; diff --git a/src/npc/pita.c b/src/npc/pita.c index ebd369bc..90c28687 100644 --- a/src/npc/pita.c +++ b/src/npc/pita.c @@ -61,7 +61,7 @@ bool32 sub_08062EDC(Entity* this, ScriptExecutionContext* context) { tmp = sub_080028F4(gUnk_0810C435); tmp2 = gUnk_0810C43D[tmp]; sub_080A7C18(0x5c, tmp2, 1); - TextboxNoOverlap(0x3c05, this); + MessageNoOverlap(0x3c05, this); context->condition = TRUE; return TRUE; } diff --git a/src/npc/postman.c b/src/npc/postman.c index 40a482e4..8a378f79 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -9,6 +9,7 @@ #include "save.h" #include "script.h" #include "flags.h" +#include "effects.h" extern void sub_08060528(Entity*); extern void sub_0806EE04(Entity*, void*, u32); @@ -64,10 +65,10 @@ void sub_0806045C(Entity* this) { case 1: case 2: this->action = 2; - TextboxNoOverlapFollow(0); + MessageFromTarget(0); break; default: - bVar1 = this->field_0x3e; + bVar1 = this->knockbackDirection; if (bVar1 != this->animationState) { this->animationState = bVar1; InitAnimationForceUpdate(this, 4 + bVar1); @@ -99,7 +100,7 @@ void sub_080604DC(Entity* this) { if (((u32)(this->spriteSettings.raw << 0x1e) >> 0x1e == 1) && sub_080040A8(this)) { if ((this->frames.all & 1) != 0) { this->frames.all &= 0xfe; - ent = CreateFx(this, 0x11, 0x40); + ent = CreateFx(this, FX_DASH, 0x40); if (ent != NULL) { ent->y.HALF.HI++; sub_0805E3A0(ent, 3); @@ -139,7 +140,7 @@ void sub_08060528(Entity* this) { break; case 2: UpdateAnimationSingleFrame(this); - if ((gTextBox.doTextBox & 0x7f) != 0) { + if ((gMessage.doTextBox & 0x7f) != 0) { break; } this->action = 1; @@ -155,7 +156,7 @@ void sub_08060528(Entity* this) { if (0 < (s16)this->field_0x6a.HWORD) { if ((s16)this->field_0x6a.HWORD > 0x12b) { this->field_0x6a.HWORD = 0; - this->field_0x20 = 0x20000; + this->hVelocity = 0x20000; this->field_0x6c.HALF.HI = 1; sub_080788E0(this); EnqueueSFX(0x7c); @@ -164,7 +165,7 @@ void sub_08060528(Entity* this) { } } sub_08003FC4(this, 0x1800); - if (((this->field_0x6c.HALF.HI != 0) && (this->field_0x20 == 0)) && this->height.WORD == 0) { + if (((this->field_0x6c.HALF.HI != 0) && (this->hVelocity == 0)) && this->height.WORD == 0) { this->field_0x6c.HALF.HI = 0; sub_080606C0(this); } diff --git a/src/npc/rem.c b/src/npc/rem.c index 974640a1..cc172a52 100644 --- a/src/npc/rem.c +++ b/src/npc/rem.c @@ -302,7 +302,7 @@ void sub_0806AA18(Entity* this) { } else { index = 0x440d; } - TextboxNoOverlap(index, this); + MessageNoOverlap(index, this); } ASM_FUNC("asm/non_matching/rem/sub_0806AA50.inc", void sub_0806AA50(Entity* this, ScriptExecutionContext* context)) diff --git a/src/npc/smallTownMinish.c b/src/npc/smallTownMinish.c index a51772c1..eee7d9e8 100644 --- a/src/npc/smallTownMinish.c +++ b/src/npc/smallTownMinish.c @@ -20,7 +20,7 @@ void SmallTownMinish(Entity* this) { } else { sub_0807DD94(this, NULL); } - if ((gPlayerState.flags.all & 0x80) != 0) { + if ((gPlayerState.flags & 0x80) != 0) { this->spriteSettings.b.draw = 1; } else { this->spriteSettings.b.draw = 0; diff --git a/src/npc/smith.c b/src/npc/smith.c index c15b1219..cdeff498 100644 --- a/src/npc/smith.c +++ b/src/npc/smith.c @@ -7,6 +7,7 @@ #include "npc.h" #include "audio.h" #include "functions.h" +#include "effects.h" extern void sub_08078850(Entity*, u32, u32, u32*); @@ -43,7 +44,7 @@ void Smith(Entity* this) { } if ((this->frames.all & 1) != 0) { this->frames.all &= 0xfe; - CreateFx(this, 0x3d, 0x20); + CreateFx(this, FX_STARS2, 0x20); SoundReq(gUnk_08110380[(Random() & 7)]); } } @@ -90,7 +91,7 @@ void sub_08066118(Entity* this) { } if (this->interactType != 0) { this->action = 2; - TextboxNoOverlapFollow(0); + MessageFromTarget(0); } } diff --git a/src/npc/stamp.c b/src/npc/stamp.c index 51b209b3..b983f9c5 100644 --- a/src/npc/stamp.c +++ b/src/npc/stamp.c @@ -3,6 +3,7 @@ #include "textbox.h" #include "functions.h" #include "script.h" +#include "effects.h" extern void sub_08062CA4(); @@ -40,13 +41,13 @@ void sub_08062C24(Entity* ent) { GetNextFrame(ent); if ((ent->frames.all & 128) != 0) { InitializeAnimation(ent, 4); - TextboxNoOverlapFollow(2561); + MessageFromTarget(2561); ent->action++; } } void sub_08062C54(Entity* ent) { - if ((gTextBox.doTextBox & 127) == 0) { + if ((gMessage.doTextBox & 127) == 0) { ent->action = 1; InitializeAnimation(ent, 0); sub_0805E584(ent); @@ -57,7 +58,7 @@ void sub_08062C7C(Entity* ent) { ent->action = 1; sub_0807DD64(ent); InitializeAnimation(ent, 0); - CreateFx(ent, 37, 0); + CreateFx(ent, FX_SWEAT, 0); sub_08062CA4(ent); } diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c index 3977a633..91e4a53c 100644 --- a/src/npc/stockwell.c +++ b/src/npc/stockwell.c @@ -42,8 +42,8 @@ ASM_FUNC("asm/non_matching/stockwell/sub_080650CC.inc", void sub_080650CC(Entity void sub_080651AC(Entity* this) { GetNextFrame(this); - if ((gTextBox.doTextBox & 0x7f) == 0) { - this->interactType = gTextBox.doTextBox & 0x7f; + if ((gMessage.doTextBox & 0x7f) == 0) { + this->interactType = gMessage.doTextBox & 0x7f; this->action = 1; InitializeAnimation(this, 4); } @@ -67,7 +67,7 @@ void sub_080651F8(Entity* this) { void sub_0806522C(Entity* this) { if (--this->actionDelay == 0) { ++this->subAction; - TextboxNoOverlap(0x2c16, this); + MessageNoOverlap(0x2c16, this); } } @@ -90,12 +90,12 @@ void sub_08065250(Entity* this) { void sub_0806528C(Entity* this) { if (--this->actionDelay == 0) { ++this->subAction; - TextboxNoOverlap(0x2c18, this); + MessageNoOverlap(0x2c18, this); } } void sub_080652B0(Entity* this) { - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { this->subAction += 1; this->actionDelay = 10; gRoomVars.greatFairyState = this->field_0xf; @@ -109,22 +109,22 @@ void sub_080652E4(Entity* this) { } else { if (gPlayerEntity.action != 8) { this->subAction += 1; - TextboxNoOverlap(0x2c19, this); + MessageNoOverlap(0x2c19, this); } } } void sub_08065314(Entity* this) { - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { this->subAction += 1; MenuFadeIn(3, 3); } } void sub_08065338(Entity* this) { - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { this->action = 1; - this->subAction = gTextBox.doTextBox & 0x7f; + this->subAction = gMessage.doTextBox & 0x7f; gRoomVars.greatFairyState = this->field_0xf; InitializeAnimation(this, 4); } diff --git a/src/npc/sturgeon.c b/src/npc/sturgeon.c index 7f2ce06b..0e317696 100644 --- a/src/npc/sturgeon.c +++ b/src/npc/sturgeon.c @@ -66,7 +66,7 @@ void sub_08064B44(Entity* this) { ASM_FUNC("asm/non_matching/sturgeon/sub_08064B88.inc", void sub_08064B88(Entity* this)) void sub_08064C2C(Entity* this) { - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { this->action = 1; InitializeAnimation(this, (u32)this->field_0xf); } @@ -104,7 +104,7 @@ void sub_08064CD8(Entity* this) { flag = CheckLocalFlag(0x73); tmp = BOOLCAST(flag); } - TextboxNoOverlap(gUnk_0810FA54[tmp], this); + MessageNoOverlap(gUnk_0810FA54[tmp], this); } void sub_08064D08(Entity* this) { diff --git a/src/npc/talon.c b/src/npc/talon.c index f9c7d66f..841d9467 100644 --- a/src/npc/talon.c +++ b/src/npc/talon.c @@ -92,7 +92,7 @@ void sub_08065680(Entity* this) { } void sub_080656A4(Entity* this) { - if ((gTextBox.doTextBox & 0x7F) == 0) { + if ((gMessage.doTextBox & 0x7F) == 0) { this->action = this->field_0x68.HALF.HI; InitAnimationForceUpdate(this, this->field_0x6a.HALF.LO); } @@ -115,7 +115,7 @@ void sub_080656D4(Entity* this) { this->field_0x68.HALF.HI = this->action; this->action = 3; this->interactType = 0; - TextboxNoOverlap(*(u32*)(*(u32*)&this->cutsceneBeh.HWORD + 4), this); + MessageNoOverlap(*(u32*)(*(u32*)&this->cutsceneBeh.HWORD + 4), this); label: sub_0806574C(this); } diff --git a/src/npc/tingleSiblings.c b/src/npc/tingleSiblings.c index f5bcaf5b..f4111b05 100644 --- a/src/npc/tingleSiblings.c +++ b/src/npc/tingleSiblings.c @@ -33,7 +33,7 @@ void sub_08064DA0(Entity* this) { if (this->interactType != 0) { this->action = 2; InitAnimationForceUpdate(this, 6); - TextboxNoOverlapFollow(0); + MessageFromTarget(0); } } diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c index 79f35176..b5103040 100644 --- a/src/npc/townMinish.c +++ b/src/npc/townMinish.c @@ -122,7 +122,7 @@ void sub_0806ACC4(Entity* this) { } break; case 2: - if (gTextBox.doTextBox & 0x7f) + if (gMessage.doTextBox & 0x7f) break; this->action = 1; @@ -223,12 +223,12 @@ void sub_0806AF60(Entity* this, ScriptExecutionContext* context) { } void sub_0806AF70(Entity* this, ScriptExecutionContext* context) { - this->field_0x20 = 0x24000; + this->hVelocity = 0x24000; } void sub_0806AF78(Entity* this, ScriptExecutionContext* context) { sub_08003FC4(this, 0x1800); - if (0 <= this->height.WORD && this->field_0x20 < 1) { + if (0 <= this->height.WORD && this->hVelocity < 1) { this->height.WORD = 0; sub_0806AF70(this, context); } @@ -273,7 +273,7 @@ void sub_0806B004(Entity* this, ScriptExecutionContext* context) { SetLocalFlag(0x6a); } } - TextboxNoOverlap(gUnk_08112C40[idx], this); + MessageNoOverlap(gUnk_08112C40[idx], this); } void sub_0806B064(Entity* this) { @@ -285,7 +285,7 @@ void sub_0806B064(Entity* this) { idx = 2; } } - TextboxNoOverlap(gUnk_08112C4A[idx], this); + MessageNoOverlap(gUnk_08112C4A[idx], this); } void sub_0806B098(Entity* this) { @@ -299,7 +299,7 @@ void sub_0806B098(Entity* this) { idx = BOOLCAST(f); } } - TextboxNoOverlap(gUnk_08112C50[(this->type2 - 7) * 3 + idx], this); + MessageNoOverlap(gUnk_08112C50[(this->type2 - 7) * 3 + idx], this); } void sub_0806B0E0(Entity* this) { @@ -310,7 +310,7 @@ void sub_0806B0E0(Entity* this) { idx = 1; } - TextboxNoOverlap(gUnk_08112C5C[idx], this); + MessageNoOverlap(gUnk_08112C5C[idx], this); } void sub_0806B134(Entity* this) { @@ -329,7 +329,7 @@ void sub_0806B134(Entity* this) { if (5 < gSave.unk8) { idx = 3; } - TextboxNoOverlap(gUnk_08112C60[idx], this); + MessageNoOverlap(gUnk_08112C60[idx], this); } void TownMinish_Fusion(Entity* this) { diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c index de089fbe..eb86baed 100644 --- a/src/npc/townsperson.c +++ b/src/npc/townsperson.c @@ -9,6 +9,7 @@ #include "random.h" #include "structures.h" #include "functions.h" +#include "effects.h" typedef struct { u8 frame1; @@ -69,7 +70,7 @@ void sub_08061C00(Entity* this) { sub_0806ED78(this); if (this->interactType != 0) { this->interactType = 0; - TextboxNoOverlapFollow(this->type2 + 0xa01); + MessageFromTarget(this->type2 + 0xa01); } } @@ -140,7 +141,7 @@ void sub_08061D64(Entity* this) { void sub_08061E24(Entity* this) { GetNextFrame(this); - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { this->action = 1; InitializeAnimation(this, this->field_0x68.HALF.HI); } @@ -228,7 +229,7 @@ void sub_08061E90(Entity* this, Entity* arg1) { void sub_08061F94(Entity* this) { Entity* ent; - ent = CreateFx(this, 0x35, 0); + ent = CreateFx(this, FX_BIG_EXPLOSION, 0); if (ent != NULL) { ResolveEntityOnTop(this, ent); } @@ -253,7 +254,7 @@ void sub_08061FE4(Entity* this) { } void sub_08061FF4(Entity* this) { - TextboxNoOverlap(gUnk_0810B790[this->type], this); + MessageNoOverlap(gUnk_0810B790[this->type], this); } void sub_0806200C(Entity* this) { @@ -269,7 +270,7 @@ void sub_0806200C(Entity* this) { index = 1; } } - TextboxNoOverlap(gUnk_0810B7BA[index], this); + MessageNoOverlap(gUnk_0810B7BA[index], this); } void sub_08062048(Entity* this) { @@ -282,7 +283,7 @@ void sub_08062048(Entity* this) { } ShowNPCDialogue(this, gUnk_0810B7C0 + this->type * 0x8 + iVar1); } else { - TextboxNoOverlap(0, this); + MessageNoOverlap(0, this); } } diff --git a/src/npc/vaatiReborn.c b/src/npc/vaatiReborn.c index b3555aeb..61c88c55 100644 --- a/src/npc/vaatiReborn.c +++ b/src/npc/vaatiReborn.c @@ -103,7 +103,7 @@ void VaatiRebornAction1(Entity* this) { break; } CopyPosition(this, entity); - TextboxNoOverlapFollow(0x1634); + MessageFromTarget(0x1634); this->subAction = this->subAction + 1; DeleteThisEntity(); return; diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c index 677ce4f3..789e5b2c 100644 --- a/src/npc/windTribespeople.c +++ b/src/npc/windTribespeople.c @@ -69,7 +69,7 @@ void sub_0806C7D4(Entity* this) { } void sub_0806C834(Entity* this) { - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { --this->action; InitializeAnimation(this, (this->animationState / 2) + 4); } @@ -140,7 +140,7 @@ void sub_0806C944(Entity* this) { iVar2 = 1; } } - TextboxNoOverlap(gUnk_08113B0C[iVar2], this); + MessageNoOverlap(gUnk_08113B0C[iVar2], this); } void sub_0806C978(Entity* this) { @@ -148,7 +148,7 @@ void sub_0806C978(Entity* this) { u32 flagAsBool; flag = CheckGlobalFlag(0x58); flagAsBool = BOOLCAST(flag); - TextboxNoOverlap(gUnk_08113B12[flagAsBool], this); + MessageNoOverlap(gUnk_08113B12[flagAsBool], this); } void sub_0806C99C(Entity* this) { @@ -160,7 +160,7 @@ void sub_0806C99C(Entity* this) { if (CheckLocalFlag(99) != 0) { flagAsBool += 1; } - TextboxNoOverlap(gUnk_08113B16[flagAsBool], this); + MessageNoOverlap(gUnk_08113B16[flagAsBool], this); } void sub_0806C9D0(Entity* this) { @@ -168,7 +168,7 @@ void sub_0806C9D0(Entity* this) { if (CheckLocalFlag(100) == 0) { tmp = 1; } - TextboxNoOverlap(gUnk_08113B1E[tmp], this); + MessageNoOverlap(gUnk_08113B1E[tmp], this); } void sub_0806C9F8(Entity* this) { @@ -176,15 +176,15 @@ void sub_0806C9F8(Entity* this) { u32 flagAsBool; flag = CheckGlobalFlag(0x58); flagAsBool = BOOLCAST(flag); - TextboxNoOverlap(gUnk_08113B22[flagAsBool], this); + MessageNoOverlap(gUnk_08113B22[flagAsBool], this); } void sub_0806CA1C(Entity* this) { - TextboxNoOverlap(0x251b, this); + MessageNoOverlap(0x251b, this); } void sub_0806CA2C(Entity* this) { - TextboxNoOverlap(0x2527, this); + MessageNoOverlap(0x2527, this); } void sub_0806CA3C(Entity* this) { diff --git a/src/npc/zelda.c b/src/npc/zelda.c index c9a50cfb..13045c51 100644 --- a/src/npc/zelda.c +++ b/src/npc/zelda.c @@ -129,7 +129,7 @@ void sub_08066E80(Entity* this, ScriptExecutionContext* context) { UpdateAnimationSingleFrame(this); if (this->frames.all & 1) { context->unk_18++; - this->field_0x20 = 0x20000; + this->hVelocity = 0x20000; this->frames.all &= 0xFE; SoundReq(SFX_PLY_JUMP); } @@ -140,7 +140,7 @@ void sub_08066E80(Entity* this, ScriptExecutionContext* context) { if (!(this->frames.all & 1)) { UpdateAnimationSingleFrame(this); } - if (this->field_0x20 < 0) { + if (this->hVelocity < 0) { context->unk_18++; } break; diff --git a/src/object/bakerOven.c b/src/object/bakerOven.c index f9de2600..13cb6627 100644 --- a/src/object/bakerOven.c +++ b/src/object/bakerOven.c @@ -66,8 +66,8 @@ void sub_0809CD0C(Entity* this) { ModHealth(-2); sub_0800449C(&gPlayerEntity, 0x7a); gPlayerEntity.iframes = 16; - gPlayerEntity.field_0x3e = 16; - gPlayerEntity.field_0x42 = 12; + gPlayerEntity.knockbackDirection = 16; + gPlayerEntity.knockbackDuration = 12; gPlayerEntity.field_0x46 = 16; } } diff --git a/src/object/bigVortex.c b/src/object/bigVortex.c index 866309ae..9a06d4ff 100644 --- a/src/object/bigVortex.c +++ b/src/object/bigVortex.c @@ -3,6 +3,7 @@ #include "flags.h" #include "object.h" #include "functions.h" +#include "effects.h" extern void sub_08098E3C(Entity*); extern void sub_08098E88(Entity*); @@ -43,7 +44,7 @@ void sub_08098D6C(Entity* this) { if (CheckFlags(this->field_0x86.HWORD)) { this->action = 2; this->actionDelay = 0x2d; - ent = CreateFx(this, 0x43, 0); + ent = CreateFx(this, FX_BIG_EXPLOSION2, 0); if (ent != NULL) { ent->y.HALF.HI += 8; } diff --git a/src/object/bird.c b/src/object/bird.c index 3d1558e3..758a3564 100644 --- a/src/object/bird.c +++ b/src/object/bird.c @@ -6,6 +6,7 @@ #include "random.h" #include "object.h" #include "functions.h" +#include "effects.h" extern void (*const gUnk_08123EC0[])(Entity*); extern void (*const gUnk_08123EEC[])(Entity*); @@ -28,7 +29,7 @@ void sub_0809CF54(Entity* this) { this->spriteSettings.b.draw = TRUE; this->actionDelay = 0x31; this->field_0xf = 1; - this->field_0x20 = -0x18000; + this->hVelocity = -0x18000; this->height.WORD = -0x38C000; this->field_0x68.HWORD = -0x800; this->speed = 0x280; @@ -84,7 +85,7 @@ void sub_0809D084(Entity* this) { PositionRelative(this->parent, this, 0, 0x80000); } else { this->subAction++; - this->field_0x20 = temp; + this->hVelocity = temp; } } } @@ -99,7 +100,7 @@ void sub_0809D0AC(Entity* this) { this->collisionLayer = 1; SetLocalFlag(0x45); SoundReq(SFX_SECRET); - fx = CreateFx(this, 0x11, 0); + fx = CreateFx(this, FX_DASH, 0); if (fx != NULL) { sub_0806FAD8(this, fx); } @@ -118,7 +119,7 @@ void sub_0809D10C(Entity* this) { } void sub_0809D130(Entity* this) { - if ((gPlayerState.flags.all & 0x80) != 0) { + if ((gPlayerState.flags & 0x80) != 0) { sub_0800445C(this); } else if (sub_08017850(this) != 0) { CreateItemEntity(0x17, 0, 0); diff --git a/src/object/book.c b/src/object/book.c index b51c4716..3c60630c 100644 --- a/src/object/book.c +++ b/src/object/book.c @@ -5,6 +5,7 @@ #include "flags.h" #include "room.h" #include "textbox.h" +#include "effects.h" extern void (*const BookActionFuncs[])(Entity*); extern s8 const gUnk_08123D94[]; @@ -96,7 +97,7 @@ void sub_0809B4A8(Entity* this) { gPlayerState.pushedObject = 0x9e; gPlayerState.playerAction = 5; - gPlayerState.flags.all |= 1; + gPlayerState.flags |= 1; gPlayerEntity.x.HALF.LO = 0; gPlayerEntity.y.HALF.LO = 0; @@ -135,14 +136,14 @@ void sub_0809B56C(Entity* this) { SetFlag(this->field_0x86.HWORD); - fx = CreateFx(this, 2, 0); + fx = CreateFx(this, FX_DEATH, 0); if (fx) { ResolveEntityOnTop(this, fx); } } void sub_0809B5B4(Entity* this) { - if (gPlayerState.flags.all & 0x80) { + if (gPlayerState.flags & 0x80) { sub_0800445C(this); } else if (sub_08017850(this)) { CreateItemEntity(this->type + 0x39, 0, 0); @@ -196,7 +197,7 @@ void sub_0809B5EC(Entity* this) { break; } case 1: { - u8 doTextBox = gTextBox.doTextBox & 0x7f; + u8 doTextBox = gMessage.doTextBox & 0x7f; if (!doTextBox) { this->spriteSettings.b.draw = 1; this->subAction = doTextBox; diff --git a/src/object/button.c b/src/object/button.c index 5111575e..8bbd7bca 100644 --- a/src/object/button.c +++ b/src/object/button.c @@ -4,6 +4,7 @@ #include "room.h" #include "audio.h" #include "functions.h" +#include "effects.h" extern void (*const gUnk_0811EE38[])(Entity*); @@ -152,11 +153,11 @@ Entity* sub_08081D74(Entity* this) { } ent = 0; if (sub_08081E0C(this)) { - if (!(gPlayerState.flags.all & 0x10) && !(gPlayerState.flags.all & 0x80)) { + if (!(gPlayerState.flags & 0x10) && !(gPlayerState.flags & 0x80)) { ent = &gPlayerEntity; } } else { - if (gPlayerState.flags.all & 0x400000) { + if (gPlayerState.flags & 0x400000) { if (sub_080041A0(this, gUnk_03004040[0], 5, 6)) { ent = gUnk_03004040[0]; } else if (sub_080041A0(this, gUnk_03004040[1], 5, 6)) { @@ -231,13 +232,13 @@ u32 sub_08081F00(u32* unk1, u32* unk2) { } void sub_08081F24(Entity* this) { - Entity* fx = CreateFx(this, 0x11, 0x40); + Entity* fx = CreateFx(this, FX_DASH, 0x40); if (fx) { fx->scriptedScene = 3; fx->x.HALF.HI += 7; fx->y.HALF.HI += 5; } - fx = CreateFx(this, 0x11, 0x40); + fx = CreateFx(this, FX_DASH, 0x40); if (fx) { fx->scriptedScene = 3; fx->x.HALF.HI -= 7; diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c index bff3a5d8..5c5e419e 100644 --- a/src/object/fileScreenObjects.c +++ b/src/object/fileScreenObjects.c @@ -181,7 +181,7 @@ void sub_0808EA28(Entity* this) { u32 var1; if (this->type == 3) { - if (gUnk_02000000->gameLanguage > LANGUAGE_EN) { + if (gSaveHeader->gameLanguage > LANGUAGE_EN) { this->spriteSettings.b.draw = 2; } else { this->spriteSettings.b.draw = 0; diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c index 046eb0aa..1821a27b 100644 --- a/src/object/heartContainer.c +++ b/src/object/heartContainer.c @@ -59,7 +59,7 @@ static void sub_0808E714(Entity* this) { static void sub_0808E764(Entity* this) { sub_08080CB4(this); - if (!(gPlayerState.flags.all & 0x80) && sub_08017850(this)) { + if (!(gPlayerState.flags & 0x80) && sub_08017850(this)) { SetFlag(this->cutsceneBeh.HWORD); CreateItemEntity(0x62, 0, 0); DeleteThisEntity(); diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index ee77e759..2e4f555a 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -150,8 +150,8 @@ void sub_080810A8(Entity* this) { this->direction |= 0xFF; } - if (this->field_0x20 == 0) { - this->field_0x20 = 0x1E000; + if (this->hVelocity == 0) { + this->hVelocity = 0x1E000; } if (this->collisionLayer == 2) { @@ -218,7 +218,7 @@ void sub_080811EC(Entity* this) { } sub_08003FC4(this, 0x2800); - if (this->field_0x20 <= 0) { + if (this->hVelocity <= 0) { this->action = 2; this->flags |= 0x80; sub_080814A4(this); @@ -273,7 +273,7 @@ void sub_080812E8(Entity* this) { #ifdef EU if ((playerState->swimState & 0x80) && sub_080177A0(this, &gPlayerEntity)) { #else - if ((playerState->swimState & 0x80) && !(playerState->flags.all & 0x80) && sub_080177A0(this, &gPlayerEntity)) { + if ((playerState->swimState & 0x80) && !(playerState->flags & 0x80) && sub_080177A0(this, &gPlayerEntity)) { #endif sub_080810FC(this); } @@ -413,7 +413,7 @@ void sub_0808153C(Entity* this) { if (this->field_0x68.HALF.LO == 0) { if (!sub_08003FC4(this, 0x1000) && !sub_0800442E(this)) { this->field_0x68.HALF.LO = 1; - this->field_0x20 = 0x1E000; + this->hVelocity = 0x1E000; sub_0808148C(this->type); UpdateSpriteForCollisionLayer(this); } @@ -433,7 +433,7 @@ void sub_08081598(Entity* this) { this->flags &= 0x7F; this->action = 4; this->actionDelay = 14; - this->field_0x20 = 0x20000; + this->hVelocity = 0x20000; this->spriteSettings.b.draw = 1; this->spritePriority.b1 = 2; this->spritePriority.b0 = 3; diff --git a/src/object/jarPortal.c b/src/object/jarPortal.c new file mode 100644 index 00000000..a3f2541d --- /dev/null +++ b/src/object/jarPortal.c @@ -0,0 +1,181 @@ +#include "global.h" +#include "entity.h" +#include "flags.h" +#include "functions.h" +#include "area.h" +#include "audio.h" + +extern void (*gUnk_08121488[])(Entity*); + +extern u32 sub_08057810(void); +extern void CreateMagicSparkles(u32, u32, u32); + +u32 sub_0808C128(Entity*); +void sub_0808C13C(Entity*); +void sub_0808C148(Entity*, u32); +void sub_0808C01C(Entity*, u32); + +void JarPortal(Entity* this) { + gUnk_08121488[this->action](this); +} + +void sub_0808BE9C(Entity* this) { + this->flags |= 0x80; + this->damageType = 1; + this->field_0x3c = 0x47; + this->field_0x40 = 0x44; + this->flags2 = 0x80; + this->field_0x68.HALF.LO = 0; + if (CheckLocalFlag(this->type)) { + if (this->field_0x7c.BYTES.byte0 != 0) { + this->action = 1; + InitAnimationForceUpdate(this, 0); + } else { + this->action = 3; + InitAnimationForceUpdate(this, 1); + } + } else { + if (this->field_0x7c.BYTES.byte0 == 0) { + this->action = 1; + InitAnimationForceUpdate(this, 0); + } else { + this->action = 3; + InitAnimationForceUpdate(this, 1); + } + } +} + +void sub_0808BF14(Entity* this) { + if (sub_0808C128(this)) { + this->action++; + sub_0808C13C(this); + if (this->field_0x7c.BYTES.byte0 == 0) { + SetLocalFlag(this->type); + } else { + ClearLocalFlag(this->type); + } + sub_0808C148(this, 0); + } + sub_0808C01C(this, 0); +} + +void sub_0808BF58(Entity* this) { + sub_08003FC4(this, 0x2000); + switch (this->subAction) { + case 0: + if (this->hVelocity <= 98303) { + ++this->subAction; + InitAnimationForceUpdate(this, 2); + } + break; + case 1: + UpdateAnimationSingleFrame(this); + if (!this->height.HALF.HI) { + ++this->subAction; + this->hVelocity = 0x8000; + } + break; + case 2: + UpdateAnimationSingleFrame(this); + if (!this->height.HALF.HI) { + ++this->action; + this->field_0xf = 0; + InitAnimationForceUpdate(this, 1); + sub_0808C148(this, 1); + } + break; + } +} + +void sub_0808BFD8(Entity* this) { + if (sub_0808C128(this)) { + ++this->action; + sub_0808C13C(this); + if (!this->field_0x7c.BYTES.byte0) + ClearLocalFlag(this->type); + else + SetLocalFlag(this->type); + sub_0808C148(this, 0); + } + sub_0808C01C(this, 1); +} + +void sub_0808C01C(Entity* this, u32 r1) { + if (CheckPlayerProximity(this->x.HALF.HI - 0x18, this->y.HALF.HI - 0x18, 0x30, 0x30)) { + u32 type; + gArea.curPortalX = this->x.HALF.HI; + gArea.curPortalY = this->y.HALF.HI; + gArea.curPortalExitDirection = 2; + type = 4; + if (r1 != 0) + type = 2; + gArea.curPortalType = type; + if (r1 == 1) { + if (((gPlayerState.flags & 0x20) != 0) && (gPlayerState.jumpStatus == 0)) { + gArea.field_0x18 = 2; + } else { + if (sub_08057810() != 0) { + gArea.field_0x18 = 3; + } + } + CreateMagicSparkles(this->x.HALF.HI, this->y.HALF.HI, this->collisionLayer); + if (this->field_0xf == 0) { + this->field_0xf = 1; + SoundReq(SFX_NEAR_PORTAL); + } + } + } +} + +void sub_0808C0AC(Entity* this) { + sub_08003FC4(this, 0x2000); + switch (this->subAction) { + case 0: + if (this->hVelocity <= 98303) { + this->subAction = 1; + InitAnimationForceUpdate(this, 3); + } + break; + case 1: + UpdateAnimationSingleFrame(this); + if (!this->height.HALF.HI) { + ++this->subAction; + this->hVelocity = 0x8000; + } + break; + case 2: + UpdateAnimationSingleFrame(this); + if (!this->height.HALF.HI) { + this->action = 1; + InitAnimationForceUpdate(this, 0); + sub_0808C148(this, 1); + } + break; + } +} + +u32 sub_0808C128(Entity* this) { + return this->bitfield == 157; +} + +void sub_0808C13C(Entity* this) { + this->subAction = 0; + this->hVelocity = 163840; +} + +void sub_0808C148(Entity* this, u32 a2) { + u32 pos; + + pos = COORD_TO_TILE(this); + if (!a2) { + SetTile(16530, pos - 1, this->collisionLayer); + SetTile(16531, pos, this->collisionLayer); + SetTile(16532, pos + 63, this->collisionLayer); + SetTile(16533, pos + 64, this->collisionLayer); + } else { + sub_0807BA8C(pos - 1, this->collisionLayer); + sub_0807BA8C(pos, this->collisionLayer); + sub_0807BA8C(pos + 63, this->collisionLayer); + sub_0807BA8C(pos + 64, this->collisionLayer); + } +} diff --git a/src/object/lilypadSmall.c b/src/object/lilypadSmall.c index ce0d8c08..37f78580 100644 --- a/src/object/lilypadSmall.c +++ b/src/object/lilypadSmall.c @@ -32,7 +32,7 @@ void LilypadSmall(Entity* this) { } u32 sub_08097ADC(Entity* this) { - if ((gPlayerState.flags.all & 0x80) == 0) { + if ((gPlayerState.flags & 0x80) == 0) { return 0; } else if (sub_080041A0(this, &gPlayerEntity, 8, 8) == 0) { return 0; diff --git a/src/object/lockedDoor.c b/src/object/lockedDoor.c index f7918284..d82a3e3d 100644 --- a/src/object/lockedDoor.c +++ b/src/object/lockedDoor.c @@ -4,6 +4,7 @@ #include "game.h" #include "audio.h" #include "functions.h" +#include "effects.h" void sub_08083338(Entity*); void sub_080834B4(Entity*); @@ -315,12 +316,12 @@ u32 sub_080837B0(Entity* this) { void sub_08083814(Entity* this, u32 unk0) { Entity* fx; const struct_0811F730* tmp = &gUnk_0811F730[unk0]; - fx = CreateFx(this, 0x11, 0x40); + fx = CreateFx(this, FX_DASH, 0x40); if (fx) { fx->x.HALF.HI += tmp->unk_00.x; fx->y.HALF.HI += tmp->unk_00.y; } - fx = CreateFx(this, 0x11, 0x40); + fx = CreateFx(this, FX_DASH, 0x40); if (fx) { fx->x.HALF.HI += tmp->unk_02.x; fx->y.HALF.HI += tmp->unk_02.y; diff --git a/src/object/mask.c b/src/object/mask.c index b6d06206..cd94a1b5 100644 --- a/src/object/mask.c +++ b/src/object/mask.c @@ -6,6 +6,7 @@ #include "player.h" #include "flags.h" #include "functions.h" +#include "effects.h" extern void (*MaskActionFuncs[])(Entity*); @@ -46,7 +47,7 @@ void sub_080929A4(Entity* this) { } this->action = 1; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; this->field_0x78.HWORD = ((Random() & 7) << 10) | 0x2000; @@ -111,7 +112,7 @@ void sub_08092B0C(Entity* this) { break; } - CreateFx(this, 5, 0); + CreateFx(this, FX_POT_SHATTER, 0); sub_0805457C(this, 3); } else { diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c index 475a35ac..a65cf709 100644 --- a/src/object/metalDoor.c +++ b/src/object/metalDoor.c @@ -4,6 +4,7 @@ #include "flags.h" #include "audio.h" #include "functions.h" +#include "effects.h" extern u32 sub_08083734(Entity*, u32); extern void sub_080A080C(Entity*); @@ -56,12 +57,12 @@ void sub_080A074C(Entity* this) { this->height.HALF.HI = 0; this->x.HALF.HI = this->field_0x70.HALF.LO; this->y.HALF.HI = this->field_0x70.HALF.HI; - ent = CreateFx(this, 0x11, 0x40); + ent = CreateFx(this, FX_DASH, 0x40); if (ent != NULL) { ent->x.HALF.HI += 0xc; ent->y.HALF.HI -= 0xc; } - ent = CreateFx(this, 0x11, 0x40); + ent = CreateFx(this, FX_DASH, 0x40); if (ent != NULL) { ent->x.HALF.HI -= 0xc; ent->y.HALF.HI -= 0xc; diff --git a/src/object/minecart.c b/src/object/minecart.c index 7578a6b2..01d7d1ac 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -36,7 +36,7 @@ void sub_080916EC(Entity* this) { struct_030010EC* unk = &gUnk_030010EC[this->actionDelay]; *(struct_030010EC**)&this->cutsceneBeh.HWORD = unk; - if ((gRoomControls.roomID != unk->field_0x4) || (gPlayerState.flags.all & 0x1000) != 0) { + if ((gRoomControls.roomID != unk->field_0x4) || (gPlayerState.flags & 0x1000) != 0) { DeleteThisEntity(); } this->x.HALF.HI = gRoomControls.roomOriginX + ((unk->field_0x0 & 0x3f) << 4) + 8; @@ -60,13 +60,13 @@ void sub_080916EC(Entity* this) { void sub_080917DC(Entity* this) { if ((this->bitfield & 0x7f) == 0x1d) { - this->field_0x20 = 0x2a000; + this->hVelocity = 0x2a000; this->action = 7; InitAnimationForceUpdate(this, this->type2 + 4 + this->animationState); SoundReq(SFX_13B); } else { if (sub_0800445C(this) != 0) { - if (((gPlayerState.flags.all & 0x40080) == 0) && (gPlayerState.field_0x1c == 0) && + if (((gPlayerState.flags & 0x40080) == 0) && (gPlayerState.field_0x1c == 0) && (gPlayerState.heldObject == 0) && (gPlayerState.jumpStatus == 0)) { this->actionDelay++; } else { @@ -79,8 +79,8 @@ void sub_080917DC(Entity* this) { if (8 < this->actionDelay) { this->action = this->action + 1; gPlayerState.jumpStatus = 0x81; - gPlayerState.flags.all |= 0x4000000; - gPlayerEntity.field_0x20 = 0x20000; + gPlayerState.flags |= 0x4000000; + gPlayerEntity.hVelocity = 0x20000; gPlayerEntity.speed = 0x100; gPlayerEntity.flags &= 0x7f; ResetPlayer(); @@ -98,11 +98,11 @@ void sub_080918A4(Entity* this) { gPlayerEntity.x.HALF.HI = this->x.HALF.HI; gPlayerEntity.y.HALF.HI = this->y.HALF.HI; if (gPlayerEntity.height.HALF.HI > -0x10) { - if ((s32)gPlayerEntity.field_0x20 > -1) { + if ((s32)gPlayerEntity.hVelocity > -1) { return; } gPlayerEntity.animationState = this->animationState << 1; - gPlayerState.flags.all = (gPlayerState.flags.all ^ 0x4000000) | 0x1000; + gPlayerState.flags = (gPlayerState.flags ^ 0x4000000) | 0x1000; this->action++; this->field_0xf = 1; this->flags |= 0x20; @@ -118,7 +118,7 @@ void sub_080918A4(Entity* this) { } else { gPlayerEntity.direction = GetFacingDirection(&gPlayerEntity, this); } - if (gPlayerEntity.field_0x20 < 0) { + if (gPlayerEntity.hVelocity < 0) { gPlayerEntity.spritePriority.b0 = this->spritePriority.b0 - 1; } } @@ -128,7 +128,7 @@ void sub_080919AC(Entity* this) { u32 uVar3; gRoomControls.unk5 = 7; - if ((gPlayerState.flags.all & 0x1000) == 0) { + if ((gPlayerState.flags & 0x1000) == 0) { this->action = 1; return; } @@ -174,8 +174,8 @@ void sub_080919AC(Entity* this) { this->action = 6; sub_08017744(this); gPlayerState.jumpStatus = 0x41; - gPlayerState.flags.all = (gPlayerState.flags.all ^ 0x1000) | 0x4000000; - gPlayerEntity.field_0x20 = 0x20000; + gPlayerState.flags = (gPlayerState.flags ^ 0x1000) | 0x4000000; + gPlayerEntity.hVelocity = 0x20000; gPlayerEntity.speed = 0x200; gPlayerEntity.animationState = this->animationState << 1; gPlayerEntity.direction = this->direction; diff --git a/src/object/minishSizedEntrance.c b/src/object/minishSizedEntrance.c index ce5ab316..ddd776ae 100644 --- a/src/object/minishSizedEntrance.c +++ b/src/object/minishSizedEntrance.c @@ -27,11 +27,11 @@ void sub_08090F00(Entity* this) { if (this->type == 1) { Entity* parent = this->parent; u32 mask = 1 << this->field_0xf; - if (!(parent->field_0x20 & mask)) { + if (!(parent->hVelocity & mask)) { DeleteThisEntity(); } } - if ((gPlayerState.flags.all & 0x80) && sub_080041A0(this, &gPlayerEntity, 4, 4) && + if ((gPlayerState.flags & 0x80) && sub_080041A0(this, &gPlayerEntity, 4, 4) && (gPlayerEntity.height.HALF.HI == 0) && (((u16)gPlayerState.field_0x90.HALF.LO) & gUnk_0812225C[this->type2])) { DoExitTransition(GetCurrentRoomProperty(this->actionDelay)); } diff --git a/src/object/object1A.c b/src/object/object1A.c index ad3b1389..494ba821 100644 --- a/src/object/object1A.c +++ b/src/object/object1A.c @@ -54,7 +54,7 @@ void sub_08086A6C(Entity* ent) { u32 uVar1; uVar1 = Random(); - ent->field_0x20 = 163840; + ent->hVelocity = 163840; ent->direction = (uVar1 >> 16) & 31; ent->speed = uVar1 & 480; } diff --git a/src/object/object1C.c b/src/object/object1C.c index 3ca965c6..3bd9af76 100644 --- a/src/object/object1C.c +++ b/src/object/object1C.c @@ -13,7 +13,7 @@ void Object1C(Entity* this) { this->action = 1; } if (CheckRectOnScreen(this->field_0x80.HWORD, this->field_0x82.HWORD, 0x10, 0x10) == 0) { - this->parent->field_0x20 &= ~(1 << this->type2); + this->parent->hVelocity &= ~(1 << this->type2); DeleteThisEntity(); } } diff --git a/src/object/object86.c b/src/object/object86.c index 02e0b480..717e3ad0 100644 --- a/src/object/object86.c +++ b/src/object/object86.c @@ -75,5 +75,5 @@ void sub_08099ECC(Entity* this) { CopyPosition(this, &gPlayerEntity); gPlayerState.playerAction = 3; gPlayerState.field_0x34[4] = 0; - gPlayerState.flags.all |= 0x8000; + gPlayerState.flags |= 0x8000; } diff --git a/src/object/objectA2.c b/src/object/objectA2.c index 2cc132fe..a2092bb7 100644 --- a/src/object/objectA2.c +++ b/src/object/objectA2.c @@ -5,6 +5,7 @@ #include "audio.h" #include "structures.h" #include "functions.h" +#include "effects.h" void sub_0809F318(Entity*); void sub_0809F374(Entity*); @@ -45,7 +46,7 @@ void sub_0809F318(Entity* this) { void sub_0809F374(Entity* this) { sub_0806F69C(this); #ifndef EU - if (gUnk_02000000->gameLanguage < 2) { + if (gSaveHeader->gameLanguage < 2) { if (sub_080044EC(this, 0x2000) < 2) { this->height.WORD = 0; this->action = 2; @@ -85,7 +86,7 @@ void sub_0809F408(Entity* this) { switch (this->frames.all) { case 9: this->frames.all = 0; - CreateFx(this, 0x43, 0); + CreateFx(this, FX_BIG_EXPLOSION2, 0); gMenu.field_0x0 = 1; break; case 0x80: diff --git a/src/object/pot.c b/src/object/pot.c index 7aff3672..79d0a38f 100644 --- a/src/object/pot.c +++ b/src/object/pot.c @@ -5,6 +5,7 @@ #include "room.h" #include "object.h" #include "functions.h" +#include "effects.h" void sub_08082824(Entity*); static void sub_08082850(Entity*, Entity*); @@ -66,7 +67,7 @@ void sub_08082310(Entity* this) { case 0x1D: SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer); this->action = 5; - this->field_0x20 = 0x2A000; + this->hVelocity = 0x2A000; this->spriteOffsetY = 0; this->spriteSettings.b.shadow = 1; this->spritePriority.b1 = 3; @@ -84,7 +85,7 @@ void sub_08082310(Entity* this) { this->direction = (tileType - 0x4001) * 8; this->actionDelay = 32; this->action = 4; - if (gPlayerState.flags.all & 0x80) { + if (gPlayerState.flags & 0x80) { this->speed >>= 1; this->actionDelay = 64; } @@ -97,7 +98,7 @@ void sub_08082310(Entity* this) { break; default: if (sub_080002B8(this) == 13) { - CreateFx(this, 0, 0); + CreateFx(this, FX_FALL_DOWN, 0); } else if (tileType == 0x4005) { gPlayerState.field_0xab = 4; SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer); @@ -137,13 +138,13 @@ void sub_08082588(Entity* this) { void sub_0808259C(Entity* this) { switch (sub_080043E8(this)) { case 2: - CreateFx(this, 11, 0); + CreateFx(this, FX_WATER_SPLASH, 0); break; case 1: - CreateFx(this, 0, 0); + CreateFx(this, FX_FALL_DOWN, 0); break; case 3: - CreateFx(this, 12, 0); + CreateFx(this, FX_LAVA_SPLASH, 0); break; default: sub_08082850(this, &gPlayerEntity); @@ -183,7 +184,7 @@ void sub_08082614(Entity* this) { } this->action = 1; - if (gPlayerState.flags.all & 0x80) { + if (gPlayerState.flags & 0x80) { this->speed <<= 1; } @@ -250,7 +251,7 @@ void sub_08082818(Entity* this) { } void sub_08082824(Entity* this) { - if (this->field_0x20 < 0) { + if (this->hVelocity < 0) { this->spriteSettings.b.flipY = 1; } @@ -261,7 +262,7 @@ void sub_08082824(Entity* this) { static void sub_08082850(Entity* this, Entity* parent) { u32 parameter = sub_0808288C(this, this->type, this->field_0x7c.BYTES.byte1, this->type2); - Entity* fxEntity = CreateFx(this, 5, parameter); + Entity* fxEntity = CreateFx(this, FX_POT_SHATTER, parameter); if (fxEntity) { fxEntity->parent = parent; } diff --git a/src/object/swordsmanNewsletter.c b/src/object/swordsmanNewsletter.c index e74d2ee1..1cca2ba0 100644 --- a/src/object/swordsmanNewsletter.c +++ b/src/object/swordsmanNewsletter.c @@ -24,6 +24,6 @@ void sub_080933D8(Entity* this) { void sub_080933FC(Entity* this) { if (this->interactType != 0) { this->interactType = 0; - TextboxNoOverlap(gUnk_081228B8[this->type], this); + MessageNoOverlap(gUnk_081228B8[this->type], this); } } diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c index 53f593bb..dcaf3ebc 100644 --- a/src/object/treeHidingPortal.c +++ b/src/object/treeHidingPortal.c @@ -6,6 +6,7 @@ #include "room.h" #include "structures.h" #include "functions.h" +#include "effects.h" extern void sub_0809E96C(Entity*); extern void CreateSparkle(Entity*); @@ -70,7 +71,7 @@ void sub_0809E918(Entity* this) { Entity* fx; s16* i = gUnk_08124364; while (*i != -1000) { - fx = CreateFx(this, 3, 0); + fx = CreateFx(this, FX_BUSH, 0); if (fx != NULL) { fx->x.HALF.HI += i[0]; fx->y.HALF.HI += i[1]; diff --git a/src/object/warpPoint.c b/src/object/warpPoint.c index 287a2e70..69ed1fdc 100644 --- a/src/object/warpPoint.c +++ b/src/object/warpPoint.c @@ -206,7 +206,7 @@ void sub_0808B73C(Entity* this) { } u32 sub_0808B7C8(Entity* this) { - if (!(gPlayerState.flags.all & 0x80) && gPlayerState.field_0xa8 != 0x12 && gPlayerEntity.currentHealth != 0 && + if (!(gPlayerState.flags & 0x80) && gPlayerState.field_0xa8 != 0x12 && gPlayerEntity.currentHealth != 0 && sub_08079F8C() && sub_080041A0(this, &gPlayerEntity, 5, 5) && gPlayerEntity.height.HALF.HI == 0) { if (this->actionDelay == 0 && gPlayerEntity.action == 0x1b) { sub_080791D0(); diff --git a/src/object/windcrest.c b/src/object/windcrest.c index 91bdb37a..3ebaef24 100644 --- a/src/object/windcrest.c +++ b/src/object/windcrest.c @@ -4,6 +4,7 @@ #include "save.h" #include "script.h" #include "functions.h" +#include "effects.h" extern void sub_08078850(Entity*, u32, u32, u8*); @@ -26,5 +27,5 @@ void sub_080A2124(Entity* this) { void Windcrest_Unlock(Entity* this) { SoundReq(SFX_SECRET); gSave.windcrests = gSave.windcrests | 1 << (this->type2 + 0x18); - CreateFx(this, 0x46, 0); + CreateFx(this, FX_GIANT_EXPLOSION, 0); } diff --git a/src/player.c b/src/player.c index f53077c6..ac3bd614 100644 --- a/src/player.c +++ b/src/player.c @@ -10,6 +10,7 @@ #include "object.h" #include "functions.h" #include "object.h" +#include "effects.h" static void (*const sPlayerActions[])(Entity*); extern void (*const gUnk_0811BA60[])(Entity*); @@ -154,14 +155,14 @@ void PlayerFall(Entity* this) { void sub_08070C3C(Entity* this) { sub_08004168(this); - gPlayerState.flags.all |= 0x1 | 0x4; - gPlayerState.flags.all &= ~0x400; + gPlayerState.flags |= 0x1 | 0x4; + gPlayerState.flags &= ~0x400; gPlayerState.jumpStatus = 0; - if ((gPlayerState.flags.all & 0x80) != 0) + if ((gPlayerState.flags & 0x80) != 0) gPlayerState.field_0x8 = 0x1ba; - else if ((gPlayerState.flags.all & 8) != 0) + else if ((gPlayerState.flags & 8) != 0) gPlayerState.field_0x8 = 0x458; else gPlayerState.field_0x8 = 0x1b8; @@ -178,11 +179,11 @@ void sub_08070C3C(Entity* this) { void sub_08070CB4(Entity* this) { UpdateAnimationSingleFrame(this); if ((this->frames.all & 0x80) != 0) { - if ((gSave.stats.health != 0) && ((gPlayerState.flags.all & 0x8000) != 0)) { - gPlayerState.flags.all &= ~(0x1 | 0x4); + if ((gSave.stats.health != 0) && ((gPlayerState.flags & 0x8000) != 0)) { + gPlayerState.flags &= ~(0x1 | 0x4); this->spriteSettings.b.draw = 0; } else { - gPlayerState.flags.all &= ~(0x4 | 0x8000); + gPlayerState.flags &= ~(0x4 | 0x8000); RespawnPlayer(); gPlayerState.field_0xa = 0; this->iframes = 32; @@ -199,18 +200,18 @@ void sub_08070D38(Entity* this) { this->flags &= ~0x80; this->direction = ((this->animationState & 0xe) << 2) ^ 0x10; this->speed = 0x100; - this->field_0x42 = 0; + this->knockbackDuration = 0; this->subAction++; this->actionDelay = gPlayerState.field_0x38; this->spriteIndex = 1; - if ((gPlayerState.flags.all & 0x80) == 0) { - this->field_0x20 = 0x20000; + if ((gPlayerState.flags & 0x80) == 0) { + this->hVelocity = 0x20000; gPlayerState.field_0x8 = 0x114; sub_08080964(16, 0); } else { gPlayerState.field_0x8 = 0xc18; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; } gPlayerState.jumpStatus = 0x80; @@ -241,7 +242,7 @@ NONMATCH("asm/non_matching/player/sub_08070DC4.inc", void sub_08070DC4(Entity* t } if (--this->actionDelay != 0xFF) { - this->field_0x20 = 0x10000; + this->hVelocity = 0x10000; return; } @@ -258,7 +259,7 @@ NONMATCH("asm/non_matching/player/sub_08070DC4.inc", void sub_08070DC4(Entity* t this->actionDelay = 8; this->subAction++; - if ((gPlayerState.flags.all & 0x80) == 0) + if ((gPlayerState.flags & 0x80) == 0) gPlayerState.field_0x8 = 0x100; } END_NONMATCH @@ -274,7 +275,7 @@ void sub_08070E7C(Entity* this) { void sub_08070E9C(Entity* this) { if (sub_08078EFC() != 0) { - sub_08056360(); + MessageClose(); } else { gPlayerState.field_0x27[0] = 4; gPlayerState.field_0xa8 = 0x13; @@ -286,10 +287,10 @@ void sub_08070E9C(Entity* this) { void sub_08070EDC(Entity* this) { this->scriptedScene = 2; - if ((gTextBox.doTextBox & 0x7f) != 0) + if ((gMessage.doTextBox & 0x7f) != 0) this->subAction = 1; - if ((gPlayerState.flags.all & 0x80) == 0) + if ((gPlayerState.flags & 0x80) == 0) sub_08079938(); else gPlayerState.field_0x8 = 0xc18; @@ -297,7 +298,7 @@ void sub_08070EDC(Entity* this) { void sub_08070f24(Entity* this) { UpdateAnimationSingleFrame(this); - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { this->scriptedScene = this->scriptedScene2; sub_080791D0(); } @@ -326,11 +327,11 @@ void sub_08070FA4(Entity* this) { this->spriteSettings.b.flipX = FALSE; this->animationState = 4; - gPlayerState.flags.all |= 1; + gPlayerState.flags |= 1; gPlayerState.jumpStatus = 0; - if ((gPlayerState.flags.all & 0x80) == 0) { - if (gPlayerState.flags.all & 0x8) { + if ((gPlayerState.flags & 0x80) == 0) { + if (gPlayerState.flags & 0x8) { if (sub_080542AC(gPlayerState.field_0x38)) { temp = 0x45e; } else { @@ -361,12 +362,12 @@ void sub_08071038(Entity* this) { UpdateAnimationSingleFrame(this); - if (sub_08078EFC() || (gTextBox.doTextBox & 0x7f)) + if (sub_08078EFC() || (gMessage.doTextBox & 0x7f)) return; if (this->frames.all & 0x80) { this->attachedEntity = 0; - this->field_0x42 = 0; + this->knockbackDuration = 0; this->iframes = 248; gPlayerState.jumpStatus = 0; sub_080791D0(); @@ -383,16 +384,16 @@ void sub_080710A8(Entity* this) { this->subAction++; - gPlayerState.flags.all |= 1; - gPlayerState.flags.all &= ~(0x400 | 0x800); + gPlayerState.flags |= 1; + gPlayerState.flags &= ~(0x400 | 0x800); gPlayerState.playerAction = 0; if ((gPlayerState.heldObject | gPlayerState.field_0x1a[1]) == 0) { - if ((gPlayerState.flags.all & 0x80) == 0) { + if ((gPlayerState.flags & 0x80) == 0) { ResetPlayer(); - if ((gPlayerState.flags.all & 0x8) != 0) { + if ((gPlayerState.flags & 0x8) != 0) { gPlayerState.field_0x8 = 0x420; } else { gPlayerState.field_0x8 = 0x810; @@ -405,7 +406,7 @@ void sub_080710A8(Entity* this) { temp = sub_08079FC4(1); asm("lsl r0, r0, #0x4"); - this->field_0x20 = (temp - 4) * 64 * 64; + this->hVelocity = (temp - 4) * 64 * 64; this->speed = 256; sub_0807A108(); @@ -454,8 +455,8 @@ void sub_08071130(Entity* this) { this->actionDelay = 6; - if (((gPlayerState.heldObject | gPlayerState.keepFacing) == 0) && ((gPlayerState.flags.all & 0x80) == 0)) { - if (gPlayerState.flags.all & 0x8) { + if (((gPlayerState.heldObject | gPlayerState.keepFacing) == 0) && ((gPlayerState.flags & 0x80) == 0)) { + if (gPlayerState.flags & 0x8) { gPlayerState.field_0x8 = 0x424; } else { gPlayerState.field_0x8 = 0x820; @@ -465,13 +466,13 @@ void sub_08071130(Entity* this) { this->subAction++; sub_08078F60(); - this->field_0x42 = 0; + this->knockbackDuration = 0; SoundReq(SFX_PLY_LAND); } void sub_08071208(Entity* this) { if ((gPlayerState.heldObject | gPlayerState.keepFacing) == 0) { - if ((gPlayerState.flags.all & 0x80) == 0) { + if ((gPlayerState.flags & 0x80) == 0) { UpdateAnimationSingleFrame(this); } } @@ -484,7 +485,7 @@ void sub_08071208(Entity* this) { void PlayerDrown(Entity* this) { gPlayerState.field_0xa8 = 0x16; - gPlayerState.flags.all |= 4; + gPlayerState.flags |= 4; this->flags &= ~0x80; gUnk_0811BA94[this->subAction](this); } @@ -493,17 +494,17 @@ void sub_0807127C(Entity* this) { this->subAction = 1; this->spritePriority.b1 = 0; - if (gPlayerState.flags.all & 0x80) { + if (gPlayerState.flags & 0x80) { this->actionDelay = 0x3c; gPlayerState.field_0x8 = 0xc19; SoundReq(SFX_WATER_SPLASH); } else { - if ((gPlayerState.flags.all & 0x10000) == 0) + if ((gPlayerState.flags & 0x10000) == 0) sub_08004168(this); - CreateFx(this, 11, 0); + CreateFx(this, FX_WATER_SPLASH, 0); - if ((gPlayerState.flags.all & 8) == 0) + if ((gPlayerState.flags & 8) == 0) gPlayerState.field_0x8 = 0x72c; else gPlayerState.field_0x8 = 0x44c; @@ -518,7 +519,7 @@ void sub_080712F0(Entity* this) { temp = FALSE; - if ((gPlayerState.flags.all & 0x80) != 0) { + if ((gPlayerState.flags & 0x80) != 0) { if (--this->actionDelay == 0) temp = TRUE; } else if ((this->frames.all & 0x80) != 0) { @@ -531,11 +532,11 @@ void sub_080712F0(Entity* this) { if (temp == FALSE) return; - this->field_0x42 = 0; + this->knockbackDuration = 0; this->iframes = 32; this->spritePriority.b1 = 1; this->spriteSettings.b.draw = FALSE; - gPlayerState.flags.all &= ~0x4; + gPlayerState.flags &= ~0x4; RespawnPlayer(); } @@ -547,7 +548,7 @@ static void PlayerUsePortal(Entity* this) { if ((this->subAction == 7) || (this->subAction < 3)) return; - if ((gPlayerState.flags.all & 0x20) == 0) + if ((gPlayerState.flags & 0x20) == 0) return; if ((gInput.newKeys & (0x100 | 0x2)) == 0) @@ -568,7 +569,7 @@ void PortalJumpOnUpdate(Entity* this) { u16 y; this->flags &= ~0x80; - this->field_0x42 = 0; + this->knockbackDuration = 0; x = gArea.curPortalX; y = gArea.curPortalY; @@ -583,7 +584,7 @@ void PortalJumpOnUpdate(Entity* this) { UpdateAnimationSingleFrame(this); if (gPlayerState.jumpStatus == 0) { - gPlayerState.flags.all |= 0x20; + gPlayerState.flags |= 0x20; this->subAction = 1; this->animationState = 4; this->spriteSettings.b.flipX = FALSE; @@ -614,13 +615,13 @@ void PortalStandUpdate(Entity* this) { if (--this->actionDelay == 0xff) { this->direction = gPlayerState.field_0xd; this->animationState = this->direction >> 2; - this->field_0x20 = 0x20000; + this->hVelocity = 0x20000; this->speed = 256; this->action = 9; this->subAction = 7; this->field_0xf = 0; - gPlayerState.field_0x8 = (gPlayerState.flags.all & 8) ? 0x41C : 0x80C; - gPlayerState.flags.all &= ~0x20; + gPlayerState.field_0x8 = (gPlayerState.flags & 8) ? 0x41C : 0x80C; + gPlayerState.flags &= ~0x20; return; } this->direction = gPlayerState.field_0xd; @@ -656,7 +657,7 @@ void PortalActivateUpdate(Entity* this) { UpdateAnimationSingleFrame(this); - if (gPlayerState.flags.all & 0x80) + if (gPlayerState.flags & 0x80) this->subAction = 4; } @@ -669,7 +670,7 @@ void PortalShrinkInit(Entity* this) { *(u32*)&this->cutsceneBeh = 0x100; sub_0805EC9C(this, 0x100, 0x100, 0); gPlayerState.field_0x8 = 0x2c3; - gPlayerState.flags.all |= 0x80; + gPlayerState.flags |= 0x80; SoundReq(SFX_PLY_SHRINKING); } @@ -723,14 +724,14 @@ void sub_080717F8(Entity* this) { gUnk_02034490[0] = 0; this->action = 9; this->subAction = 0; - gPlayerState.flags.all = (gPlayerState.flags.all & ~0x20) | 0x80; + gPlayerState.flags = (gPlayerState.flags & ~0x20) | 0x80; sub_0805EC60(this); UnfreezeTime(); } void PlayerTalkEzlo(Entity* this) { if (sub_08078EFC()) { - sub_08056360(); + MessageClose(); sub_08071A6C(); } else { gPlayerState.field_0xa8 = 0x13; @@ -746,7 +747,7 @@ void sub_080718A0(Entity* this) { gUnk_03003DC0.unk0 = 6; this->scriptedScene = 6; - if (gPlayerState.flags.all & 0x80) { + if (gPlayerState.flags & 0x80) { this->subAction = 2; this->spritePriority.b1 = 0; sub_08052BB8(); @@ -790,10 +791,10 @@ void sub_0807193C(Entity* this) { void sub_08071990(Entity* this) { u32 temp; - if ((gTextBox.doTextBox & 0x7f) == 0) { + if ((gMessage.doTextBox & 0x7f) == 0) { this->subAction++; - if ((gPlayerState.flags.all & 0x80) == 0) { + if ((gPlayerState.flags & 0x80) == 0) { if (this->animationState == 2) gPlayerState.field_0x8 = 0x3cd; else @@ -805,7 +806,7 @@ void sub_08071990(Entity* this) { return; } - if (gPlayerState.flags.all & 0x80) + if (gPlayerState.flags & 0x80) return; if (this->animationState == 2) @@ -849,13 +850,13 @@ void sub_08071AB0(Entity* this) { u32 speed; this->subAction++; - gPlayerState.flags.all |= 1; + gPlayerState.flags |= 1; if (this->type == 1) { this->speed = 0; this->actionDelay = 0; this->field_0xf = 1; } else { - this->speed = (gPlayerState.flags.all & 0x80) ? 64 : 128; + this->speed = (gPlayerState.flags & 0x80) ? 64 : 128; } sub_08071AF0(this); } @@ -885,12 +886,12 @@ void sub_08071AF0(Entity* this) { void sub_08071B60(Entity* this) { gPlayerState.pushedObject = 2; - gPlayerState.flags.all &= ~0x1; + gPlayerState.flags &= ~0x1; this->type = 0; - this->field_0x42 = 0; + this->knockbackDuration = 0; sub_080728AC(this); this->field_0xf = 6; - if ((gPlayerState.flags.all & 0x80) == 0) { + if ((gPlayerState.flags & 0x80) == 0) { gPlayerState.field_0x8 = 0x104; this->spriteIndex = 3; InitAnimationForceUpdate(this, (this->animationState >> 1) + 0x3c); @@ -908,11 +909,11 @@ void PlayerMinishDie(Entity* this) { void sub_08071BDC(Entity* this) { u32 temp; - if (gPlayerState.flags.all & (0x10 | 0x100)) + if (gPlayerState.flags & (0x10 | 0x100)) return; if (sub_08003FC4(this, 0x2000)) { - if ((gPlayerState.flags.all & 8) != 0) + if ((gPlayerState.flags & 8) != 0) gPlayerState.field_0x8 = 0x420; else gPlayerState.field_0x8 = 0x810; @@ -920,7 +921,7 @@ void sub_08071BDC(Entity* this) { } gPlayerState.playerAction = 0; - if (gPlayerState.flags.all & 0x80) { + if (gPlayerState.flags & 0x80) { if ((u8)(gPlayerState.field_0x10[2] - 8) < 3) { sub_0807A298(this); RespawnPlayer(); @@ -928,11 +929,11 @@ void sub_08071BDC(Entity* this) { } temp = 0xc1a; } else { - temp = (gPlayerState.flags.all & 8) ? 0x459 : 0x1bc; + temp = (gPlayerState.flags & 8) ? 0x459 : 0x1bc; } gPlayerState.field_0x8 = temp; - gPlayerState.flags.all &= ~(0x1000000 | 0x200000 | 0x40000 | 0x800 | 0x400 | 0x100 | 0x1); + gPlayerState.flags &= ~(0x1000000 | 0x200000 | 0x40000 | 0x800 | 0x400 | 0x100 | 0x1); this->subAction = 1; this->animationState = 4; this->spritePriority.b1 = 1; @@ -948,8 +949,8 @@ void sub_08071CAC(Entity* this) { UpdateAnimationSingleFrame(this); if (this->frames.all & 0x80) { u32 temp; - if ((gPlayerState.flags.all & 0x80) == 0) - temp = (gPlayerState.flags.all & 8) ? 0x45a : 0x2bd; + if ((gPlayerState.flags & 0x80) == 0) + temp = (gPlayerState.flags & 8) ? 0x45a : 0x2bd; else temp = 0xc1b; gPlayerState.field_0x8 = temp; @@ -982,7 +983,7 @@ void sub_08071D04(Entity* this) { gPlayerState.field_0x3c[0] = 0; this->direction = 0xff; this->speed = 0; - this->field_0x20 = 0x18000; + this->hVelocity = 0x18000; gPlayerState.jumpStatus = 1; gPlayerState.swimState = 0; return; @@ -1024,7 +1025,7 @@ void sub_08071E04(Entity* this) { sub_0807A1B8(); if (gPlayerState.field_0x10[2] == 1) { gPlayerState.field_0x10[1] = 7; - gPlayerState.flags.all |= 0x200; + gPlayerState.flags |= 0x200; sub_080791BC(); return; } @@ -1122,7 +1123,7 @@ void sub_08071F80(Entity* this) { if (sub_08079B24() == 0) { sub_08079708(this); } else { - if (gPlayerState.flags.all & 0x800) { + if (gPlayerState.flags & 0x800) { if (sub_0807953C() != 0) { this->actionDelay -= 3; this->spriteOffsetX = 2; @@ -1139,11 +1140,11 @@ void sub_08071F80(Entity* this) { void sub_08072008(Entity* this) { this->iframes = 160; - this->field_0x42 = 0; + this->knockbackDuration = 0; this->flags |= 0x80; this->spriteOffsetX = 0; - gPlayerState.flags.all &= ~(0x800 | 0x1); - CreateFx(this, 0xd, 0); + gPlayerState.flags &= ~(0x800 | 0x1); + CreateFx(this, FX_ICE, 0); sub_080791BC(); } @@ -1193,7 +1194,7 @@ void sub_08072100(Entity* this) { if (gPlayerState.field_0x39) this->direction = 0xff; - if ((gPlayerState.flags.all & 8)) { + if ((gPlayerState.flags & 8)) { gPlayerState.field_0x8 = 0x404; } else { gPlayerState.field_0x8 = 0x104; @@ -1216,7 +1217,7 @@ void sub_08072168(Entity* this) { gPlayerState.field_0xd = this->direction; sub_08019840(); if (--this->actionDelay == 0xff) { - this->field_0x42 = 0; + this->knockbackDuration = 0; this->flags |= 0x80; UpdateSpriteForCollisionLayer(this); sub_080791BC(); @@ -1236,12 +1237,12 @@ void sub_08072214(Entity* this) { this->speed = 128; this->actionDelay = gPlayerState.field_0x38; this->direction = (this->animationState ^ 4) << 2; - if (!(gPlayerState.flags.all & 8)) { + if (!(gPlayerState.flags & 8)) { gPlayerState.field_0x8 = 0x34c; } else { gPlayerState.field_0x8 = 0x944; } - gPlayerState.flags.all |= 1; + gPlayerState.flags |= 1; sub_08072260(this); } @@ -1250,13 +1251,13 @@ void sub_08072260(Entity* this) { sub_08079E08(); UpdateAnimationSingleFrame(this); if (--this->actionDelay == 0) { - gPlayerState.flags.all &= ~0x1; - if (!(gPlayerState.flags.all & 8)) { + gPlayerState.flags &= ~0x1; + if (!(gPlayerState.flags & 8)) { gPlayerState.field_0x8 = 0x34c; } else { gPlayerState.field_0x8 = 0x944; } - this->field_0x42 = 0; + this->knockbackDuration = 0; sub_080791BC(); } } @@ -1272,9 +1273,9 @@ void sub_080722DC(Entity* this) { Entity* ent; this->flags &= ~0x80; - if (!(gPlayerState.flags.all & 0x80)) { + if (!(gPlayerState.flags & 0x80)) { this->subAction = 1; - this->field_0x20 = 0x28000; + this->hVelocity = 0x28000; ent = CreateObject(OBJECT_42, 0x80, 0); if (ent != NULL) { ent->attachedEntity = this; @@ -1283,9 +1284,9 @@ void sub_080722DC(Entity* this) { } else { this->spriteSettings.b.draw = 0; this->subAction = 3; - this->field_0x42 = 10; + this->knockbackDuration = 10; } - gPlayerState.flags.all |= (0x400 | 0x1); + gPlayerState.flags |= (0x400 | 0x1); ResetPlayer(); SoundReq(SFX_124); SoundReq(SFX_PLY_VO6); @@ -1299,13 +1300,13 @@ void sub_08072354(Entity* this) { return; this->spritePriority.b1 = 0; - this->field_0x42 = 0; + this->knockbackDuration = 0; this->subAction = 2; this->actionDelay = 0x3c; gPlayerState.field_0x8 = 0x2c1; - gPlayerState.flags.all &= ~0x400; + gPlayerState.flags &= ~0x400; UpdateSpriteForCollisionLayer(this); - CreateFx(this, 0xc, 0); + CreateFx(this, FX_LAVA_SPLASH, 0); SoundReq(SFX_1A6); } @@ -1320,10 +1321,10 @@ void sub_080723D0(Entity* this) { } void sub_0807240C(Entity* this) { - if (--this->field_0x42 == 0xff) { + if (--this->knockbackDuration == 0xff) { this->spriteSettings.b.draw = 3; this->iframes = 0x14; - gPlayerState.flags.all &= ~0x400; + gPlayerState.flags &= ~0x400; ModHealth(-2); RespawnPlayer(); } @@ -1360,7 +1361,7 @@ void PlayerRoomTransition(Entity* this) { } void sub_080724DC(Entity* this) { - this->field_0x42 = 0; + this->knockbackDuration = 0; sub_0807A108(); if (sub_080002B8(this) != 0x29) { if ((gPlayerState.field_0x82[7] == 0) && (gPlayerState.swimState != 0)) { @@ -1376,7 +1377,7 @@ void sub_080724DC(Entity* this) { this->spriteSettings.b.draw = 3; this->subAction = 1; if (gRoomVars.field_0x0 == 0) { - if (gPlayerState.flags.all & 0x80) { + if (gPlayerState.flags & 0x80) { gPlayerState.field_0x8 = 0xc18; } else { gPlayerState.field_0x8 = 0x104; @@ -1420,15 +1421,15 @@ void PlayerRoll(Entity* this) { void sub_08072650(Entity* this) { u32 temp; - if ((gPlayerState.flags.all & 0x200000) == 0) { + if ((gPlayerState.flags & 0x200000) == 0) { sub_0806F948(&gPlayerEntity); this->direction = this->animationState << 2; } this->subAction = 1; this->actionDelay = 0; ResetPlayer(); - temp = gPlayerState.flags.all; - if (gPlayerState.flags.all & 0x80) { + temp = gPlayerState.flags; + if (gPlayerState.flags & 0x80) { this->spritePriority.b1 = 0; gPlayerState.field_0x8 = 0xc08; } else { @@ -1439,7 +1440,7 @@ void sub_08072650(Entity* this) { gPlayerState.field_0x8 = 0x2ac; } } - gPlayerState.flags.all |= 0x40000; + gPlayerState.flags |= 0x40000; if (Random() & 1) { SoundReq(SFX_PLY_VO5); } else { @@ -1449,29 +1450,29 @@ void sub_08072650(Entity* this) { } void sub_080726F4(Entity* this) { - if (((gPlayerState.flags.all & (0x40000 | 0x80000)) != 0x40000) || - (!(gPlayerState.flags.all & 0x200000) && (this->iframes != 0) && (this->bitfield & 0x80))) { - gPlayerState.flags.all &= ~0x40000; + if (((gPlayerState.flags & (0x40000 | 0x80000)) != 0x40000) || + (!(gPlayerState.flags & 0x200000) && (this->iframes != 0) && (this->bitfield & 0x80))) { + gPlayerState.flags &= ~0x40000; if (!sub_08078EFC()) sub_080728AC(this); return; } this->direction = (this->animationState & 6) << 2; - if (((gPlayerState.flags.all & 0x80) == 0) && (--this->actionDelay == 0xff)) { - CreateFx(&gPlayerEntity, 0x11, 0x40); + if (((gPlayerState.flags & 0x80) == 0) && (--this->actionDelay == 0xff)) { + CreateFx(&gPlayerEntity, FX_DASH, 0x40); this->actionDelay = 4; } - if ((gPlayerState.flags.all & 2) == 0) { + if ((gPlayerState.flags & 2) == 0) { sub_0807A1B8(); } if (sub_08078EFC()) { - gPlayerState.flags.all &= ~0x40000; + gPlayerState.flags &= ~0x40000; return; } - if ((gPlayerState.flags.all & 0x80000) != 0) { - gPlayerState.flags.all &= ~0x40000; + if ((gPlayerState.flags & 0x80000) != 0) { + gPlayerState.flags &= ~0x40000; return; } @@ -1479,8 +1480,8 @@ void sub_080726F4(Entity* this) { return; } - if (gPlayerState.flags.all & 0x250) { - gPlayerState.flags.all &= ~0x40000; + if (gPlayerState.flags & 0x250) { + gPlayerState.flags &= ~0x40000; sub_080728AC(this); return; } @@ -1507,7 +1508,7 @@ void sub_080726F4(Entity* this) { sub_08078F24(); sub_08079E08(); } - if (((this->frames.all & 0x10) == 0) && ((gPlayerState.flags.all & 0x80) == 0)) { + if (((this->frames.all & 0x10) == 0) && ((gPlayerState.flags & 0x80) == 0)) { *(u8*)&this->field_0x40 = 0; } if ((this->frames.all & 0x40) != 0) { @@ -1517,31 +1518,31 @@ void sub_080726F4(Entity* this) { sub_080791D0(); } if ((this->frames.all & 0x80) != 0) { - gPlayerState.flags.all &= ~(0x200000 | 0x40000); + gPlayerState.flags &= ~(0x200000 | 0x40000); } UpdateAnimationSingleFrame(this); } void sub_080728AC(Entity* this) { sub_08079938(); - if (gPlayerState.flags.all & 0x80) + if (gPlayerState.flags & 0x80) sub_0807B068(this); else sub_08078F60(); if (gPlayerState.swimState != 0) this->speed = 0; - if (!(gPlayerState.flags.all & 0x40)) + if (!(gPlayerState.flags & 0x40)) gPlayerEntity.spriteSettings.b.draw = 3; - if (!(gPlayerState.flags.all & 0x80)) + if (!(gPlayerState.flags & 0x80)) gPlayerEntity.spritePriority.b1 = 1; if (!(gRoomControls.unk6 & 4)) { - if ((gPlayerState.flags.all & 0x40)) + if ((gPlayerState.flags & 0x40)) this->flags |= 0x80; sub_080791D0(); } - if (!(gPlayerState.flags.all & 2)) { + if (!(gPlayerState.flags & 2)) { sub_0807A1B8(); } } @@ -1562,8 +1563,8 @@ void sub_08072970(Entity* this) { this->spritePriority.b0 = 7; this->spritePriority.b1 = 0; this->actionDelay = 0; - gPlayerState.flags.all |= 0x100000; - if (gPlayerState.flags.all & 8) { + gPlayerState.flags |= 0x100000; + if (gPlayerState.flags & 8) { gPlayerState.field_0x8 = 0x950; } else { gPlayerState.field_0x8 = 0x61c; @@ -1589,7 +1590,7 @@ void sub_08072A60(Entity* this) { } this->subAction = 2; - if (gPlayerState.flags.all & 8) { + if (gPlayerState.flags & 8) { gPlayerState.field_0x8 = 0x954; } else { gPlayerState.field_0x8 = 0x620; @@ -1605,7 +1606,7 @@ void sub_08072ACC(Entity* this) { } else if (this->field_0xf > 7) { this->flags |= 0x80; this->direction = gPlayerState.field_0xd; - this->field_0x20 = 0x1a000; + this->hVelocity = 0x1a000; this->speed = 0x78; this->spritePriority.b0 = 4; this->spritePriority.b1 = 1; @@ -1635,7 +1636,7 @@ void sub_08072B5C(Entity* this) { this->flags |= 0x80; this->spritePriority.b0 = 4; this->speed = 0x40; - this->field_0x20 = 0x39000; + this->hVelocity = 0x39000; this->height.WORD--; gPlayerState.jumpStatus = 0x41; sub_0806F854(this, 0, -12); @@ -1650,7 +1651,7 @@ void sub_08072B5C(Entity* this) { temp <<= 4; temp -= 4; temp <<= 12; - this->field_0x20 = temp; + this->hVelocity = temp; this->speed = 0x100; gPlayerState.field_0x8 = 0x810; SoundReq(0x7c); @@ -1666,7 +1667,7 @@ void sub_08072C48(Entity* this) { if (gPlayerState.field_0x14) { if (sub_08008B22()) { gPlayerState.field_0x10[1] = 7; - if (!(gPlayerState.flags.all & 0x80)) { + if (!(gPlayerState.flags & 0x80)) { sub_080791BC(); } } @@ -1703,7 +1704,7 @@ void sub_08072CFC(Entity* this) { if (gPlayerState.field_0x38 < 8) { gPlayerState.field_0x38 = 8; } - this->field_0x20 = gPlayerState.field_0x38 << 0xc; + this->hVelocity = gPlayerState.field_0x38 << 0xc; this->speed = 0x200; gPlayerState.field_0x8 = 0x810; this->actionDelay = 5; @@ -1782,19 +1783,19 @@ NONMATCH("asm/non_matching/player/sub_08072D54.inc", void sub_08072D54(Entity* t if (gPlayerState.field_0x14 != 0) { if (sub_08008B22() == 0) { gPlayerState.field_0x10[1] = 7; - if (!(gPlayerState.flags.all & 0x80)) { + if (!(gPlayerState.flags & 0x80)) { sub_080791BC(); } } } else { - if ((gPlayerState.flags.all & 8)) { + if ((gPlayerState.flags & 8)) { gPlayerState.field_0x8 = 0x424; } else { gPlayerState.field_0x8 = 0x820; } this->actionDelay = 6; this->subAction = 3; - this->field_0x42 = 0; + this->knockbackDuration = 0; SoundReq(0x7d); } } @@ -1816,9 +1817,9 @@ void sub_08072F34(Entity* this) { gPlayerState.field_0xa8 = 0x18; gPlayerState.field_0x10[2] = sub_0807A1E8(this, 0, 0); gUnk_0811BBE4[this->subAction](this); - if (this->field_0x42 != 0) { + if (this->knockbackDuration != 0) { sub_080792D8(); - if (this->field_0x42 == 0) { + if (this->knockbackDuration == 0) { this->action = 0x1d; this->subAction = 0; this->y.HALF.LO = 0; @@ -1897,8 +1898,8 @@ void sub_08073094(Entity* this) { switch (gPlayerState.field_0x10[2]) { case 0x2a: case 0x2c: - this->field_0x42 = 0; - gPlayerState.flags.all |= 0x20000000; + this->knockbackDuration = 0; + gPlayerState.flags |= 0x20000000; UpdateAnimationSingleFrame(this); if ((this->frames.all & 0x40) != 0) { sub_0807A1B8(); diff --git a/src/playerItem/playerItem10.c b/src/playerItem/playerItem10.c index 89f24d2e..9ffc8e2c 100644 --- a/src/playerItem/playerItem10.c +++ b/src/playerItem/playerItem10.c @@ -1,16 +1,77 @@ #include "entity.h" #include "player.h" #include "functions.h" +#include "random.h" extern void (*const gUnk_0812AA80[])(Entity*); -extern Hitbox* gUnk_0812AAD8[]; bool32 sub_080ACDB0(Entity*); void sub_080ACC78(Entity*); void sub_080ACECC(Entity*); -extern u8 gUnk_0812AAE8[]; +typedef struct { + u16 bits; + u8 type2; + u8 actionDelay; + u8 _4; + u8 type; + u16 tileID; +} Obj11; + +Obj11* sub_08008782(Entity*, u32, u32, u32); + +const s8 gUnk_0812AA88[] = { + -4, -4, 4, -4, -4, 4, 4, 4, 0, +}; + +const s8 gUnk_0812AA91[] = { + -5, -5, 5, -5, -5, 5, 5, 5, 0, +}; + +const s8 gUnk_0812AA9A[] = { + -9, -9, 1, -9, 9, -9, -9, 1, 9, 1, -9, 9, 1, 9, 9, 9, 0, 0, +}; + +const s8* const gUnk_0812AAAC[] = { + gUnk_0812AA88, + gUnk_0812AA91, + gUnk_0812AA91, + gUnk_0812AA9A, +}; + +const s8 gUnk_0812AABC[] = { + 0x78, + 0x50, + 0x28, + 0x4, +}; + +const Hitbox gUnk_0812AAC0 = { + 0, 0, 4, 2, 2, 4, 4, 4, +}; + +const Hitbox gUnk_0812AAC8 = { + 0, 0, 4, 3, 3, 4, 9, 9, +}; + +const Hitbox gUnk_0812AAD0 = { + 0, 0, 8, 7, 7, 8, 14, 14, +}; + +const Hitbox* const gUnk_0812AAD8[] = { + &gUnk_0812AAC0, + &gUnk_0812AAC8, + &gUnk_0812AAC8, + &gUnk_0812AAD0, +}; + +const u8 gUnk_0812AAE8[] = { + 0, + 12, + 16, + 16, +}; void PlayerItem10(Entity* this) { if ((gPlayerState.field_0x1c & 0x7f) != 1) { @@ -27,7 +88,7 @@ void sub_080ACC04(Entity* this) { this->speed = 0x200; this->flags |= 0xa0; this->field_0x3c = 2; - this->hitbox = gUnk_0812AAD8[this->type]; + this->hitbox = (Hitbox*)gUnk_0812AAD8[this->type]; this->field_0x70.WORD = 0x10; sub_080ACDB0(this); sub_0801766C(this); @@ -40,7 +101,72 @@ void sub_080ACC5C(Entity* this) { } } -ASM_FUNC("asm/non_matching/playerItem10/sub_080ACC78.inc", void sub_080ACC78(Entity* this)) +void sub_080ACC78(Entity* this) { + s32 width; + Obj11* o; + Entity* child; + s32 offset; + const s8* puVar8; + + if ((this->type + gScreenTransition.frameCount) & 1) { + puVar8 = gUnk_0812AAAC[this->type]; + if (puVar8[*(u32*)&this->field_0x74] == 0) { + *(u32*)&this->field_0x74 = 0; + } + o = sub_08008782(this, 0xe, puVar8[*(u32*)&this->field_0x74], puVar8[*(u32*)&this->field_0x74 + 1]); + if (o != NULL) { + child = CreateObject(0x11, o->type, o->type2); + if (child != NULL) { + child->actionDelay = o->actionDelay; + child->x.HALF.HI = puVar8[*(u32*)&this->field_0x74] + this->x.HALF.HI; + child->y.HALF.HI = puVar8[*(u32*)&this->field_0x74 + 1] + this->y.HALF.HI; + } + } + *(u32*)&this->field_0x74 += 2; + } + if (this->attachedEntity == NULL && (u32)this->field_0x70.WORD > 2) { + this->field_0x70.WORD = 1; + } + + if (--this->field_0x70.WORD != -1) { + return; + } + if (this->attachedEntity == NULL) { + this->field_0x70.WORD = 2; + } else { + this->field_0x70.WORD = gUnk_0812AABC[this->type]; + } + child = CreateObject(0x17, 0, 0); + if (child == NULL) { + return; + } + offset = Random() % 16; + width = this->hitbox->width; + if (width < offset) { + offset = width; + } + if (offset & 1) { + offset = -offset; + } + switch (this->animationState >> 1) { + case 0: + child->y.HALF.HI = this->y.HALF.HI - this->hitbox->height; + child->x.HALF.HI = this->x.HALF.HI + offset; + break; + case 2: + child->y.HALF.HI = this->y.HALF.HI + this->hitbox->height; + child->x.HALF.HI = this->x.HALF.HI + offset; + break; + case 1: + child->x.HALF.HI = this->x.HALF.HI + this->hitbox->width; + child->y.HALF.HI = this->y.HALF.HI + offset; + break; + case 3: + child->x.HALF.HI = this->x.HALF.HI - this->hitbox->width; + child->y.HALF.HI = this->y.HALF.HI + offset; + break; + } +} ASM_FUNC("asm/non_matching/playerItem10/sub_080ACDB0.inc", bool32 sub_080ACDB0(Entity* this)) diff --git a/src/playerItem/playerItem14.c b/src/playerItem/playerItem14.c index 5883ccc2..dca41640 100644 --- a/src/playerItem/playerItem14.c +++ b/src/playerItem/playerItem14.c @@ -3,6 +3,7 @@ #include "functions.h" #include "player.h" #include "room.h" +#include "effects.h" extern void (*const gUnk_08109AC8[])(Entity*); extern Hitbox gUnk_08109AD0; @@ -46,11 +47,11 @@ void sub_0805FC74(Entity* this) { } if (!sub_080002F0(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) && sub_080040D8(this, &gUnk_08003E44, this->x.HALF.HI, this->y.HALF.HI)) { - CreateFx(this, 0x19, 0); + CreateFx(this, FX_SWORD_MAGIC, 0); DeleteThisEntity(); } if (this->bitfield != 0) { - CreateFx(this, 0x19, 0); + CreateFx(this, FX_SWORD_MAGIC, 0); DeleteThisEntity(); } } else { diff --git a/src/playerItem/playerItemBow.c b/src/playerItem/playerItemBow.c index 351a2907..7f6aaf22 100644 --- a/src/playerItem/playerItemBow.c +++ b/src/playerItem/playerItemBow.c @@ -1,6 +1,7 @@ #include "global.h" #include "entity.h" #include "functions.h" +#include "effects.h" extern void (*const gUnk_080B3E30[])(Entity*); @@ -33,6 +34,6 @@ void sub_08019444(Entity* this) { void sub_08019468(Entity* this) { if (this->field_0x40 == 0x0e) { - CreateFx(this, 0x50, 0); + CreateFx(this, FX_REFLECT5, 0); } } diff --git a/src/playerItem/playerItemSwordBeam.c b/src/playerItem/playerItemSwordBeam.c index 7329b69b..8fb41232 100644 --- a/src/playerItem/playerItemSwordBeam.c +++ b/src/playerItem/playerItemSwordBeam.c @@ -3,6 +3,7 @@ #include "coord.h" #include "functions.h" #include "audio.h" +#include "effects.h" extern void (*const gUnk_080B43F4[])(Entity*); @@ -70,11 +71,11 @@ void sub_08019580(Entity* this) { } if ((sub_080002F0(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.collisionLayer, 0x80) == 0) && (sub_080040D8(this, &gUnk_08003E44, this->x.HALF.HI, this->y.HALF.HI) != 0)) { - CreateFx(this, 0x19, 0); + CreateFx(this, FX_SWORD_MAGIC, 0); DeleteThisEntity(); } if (this->bitfield != 0) { - CreateFx(this, 0x19, 0); + CreateFx(this, FX_SWORD_MAGIC, 0); DeleteThisEntity(); } if (sub_08008790(this, 0xc) != NULL) { diff --git a/src/projectile/arrowProjectile.c b/src/projectile/arrowProjectile.c index 48db32b3..fc6d3305 100644 --- a/src/projectile/arrowProjectile.c +++ b/src/projectile/arrowProjectile.c @@ -34,7 +34,7 @@ void sub_080A9334(Entity* this) { if ((this->bitfield & 0x3f) != 0) { ModHealth(-2); sub_080A9488(this); - this->field_0x42 = 0; + this->knockbackDuration = 0; this->iframes = 0; } else { DeleteThisEntity(); @@ -48,7 +48,7 @@ void ArrowProjectile_Init(Entity* this) { this->flags &= 0x7f; this->actionDelay = 0x6a; this->field_0xf = 0; - this->field_0x20 = 0xa00; + this->hVelocity = 0xa00; sub_080A94C0(this, this->type); } @@ -106,8 +106,8 @@ void sub_080A9488(Entity* this) { this->action = 4; this->flags &= 0x7f; this->actionDelay = 2; - this->field_0x20 = 0x18000; - this->animationState = (this->field_0x3e & 0x18) >> 3; + this->hVelocity = 0x18000; + this->animationState = (this->knockbackDirection & 0x18) >> 3; EnqueueSFX(SFX_METAL_CLINK); sub_080A94C0(this, this->animationState); } diff --git a/src/projectile/boneProjectile.c b/src/projectile/boneProjectile.c index 61f60863..cfa5f3ed 100644 --- a/src/projectile/boneProjectile.c +++ b/src/projectile/boneProjectile.c @@ -59,7 +59,7 @@ void BoneProjectile_Action2(Entity* this) { this->action = 3; this->flags = this->flags & 0x7f; this->speed = 0xe0; - this->field_0x20 = 0xe000; + this->hVelocity = 0xe000; } } @@ -83,7 +83,7 @@ void BoneProjectile_Action4(Entity* this) { void sub_080A82D8(Entity* this) { this->action = 4; this->flags &= 0x7f; - this->field_0x20 = 0x10000; + this->hVelocity = 0x10000; this->direction ^= 0x10; this->speed = 0x80; } diff --git a/src/projectile/cannonballProjectile.c b/src/projectile/cannonballProjectile.c index 950b6159..2f4c8339 100644 --- a/src/projectile/cannonballProjectile.c +++ b/src/projectile/cannonballProjectile.c @@ -1,6 +1,7 @@ #include "entity.h" #include "enemy.h" #include "functions.h" +#include "effects.h" extern void CreateItemOnGround(Entity*); extern s32 sub_080AF090(Entity*); @@ -27,7 +28,7 @@ void sub_080AB544(Entity* this) { if (this->iframes < -4) { this->action = 2; - this->direction = this->field_0x3e; + this->direction = this->knockbackDirection; tmp = (this->type ^ 2) << 3; if (this->direction - tmp + 1 < 3) { this->direction = tmp; @@ -46,7 +47,7 @@ void CannonballProjectile_Init(Entity* this) { void CannonballProjectile_Action1(Entity* this) { GetNextFrame(this); if (sub_080AF090(this) == 0) { - CreateFx(this, 2, 0); + CreateFx(this, FX_DEATH, 0); DeleteThisEntity(); } sub_080AB5F4(this); @@ -56,7 +57,7 @@ void CannonballProjectile_Action2(Entity* this) { GetNextFrame(this); sub_080AF090(this); if ((sub_080AB634(this) == 0) && (this->collisions != 0)) { - CreateFx(this, 2, 0); + CreateFx(this, FX_DEATH, 0); DeleteThisEntity(); } } @@ -77,7 +78,7 @@ bool32 sub_080AB5F4(Entity* this) { } bool32 sub_080AB634(Entity* this) { - Entity** entities = ((Entity**)&this->parent->field_0x20); + Entity** entities = ((Entity**)&this->parent->hVelocity); u32 i; for (i = 0; i <= 3; ++i) { if (entities[i] != NULL && (sub_080177A0(this, entities[i]) != 0)) { @@ -85,7 +86,7 @@ bool32 sub_080AB634(Entity* this) { entities[i]->action = 3; entities[i]->actionDelay = 0x1e; entities[i]->spriteSettings.b.draw = 0; - CreateFx(entities[i], 0x45, 0); + CreateFx(entities[i], FX_WHITE_ROCK, 0); } DeleteEntity(this); return TRUE; diff --git a/src/projectile/dekuSeedProjectile.c b/src/projectile/dekuSeedProjectile.c index e17caa58..40c51e69 100644 --- a/src/projectile/dekuSeedProjectile.c +++ b/src/projectile/dekuSeedProjectile.c @@ -30,7 +30,7 @@ void sub_080A8470(Entity* this) { } DeleteEntity(this); } else { - this->direction = (this->field_0x3e + 4) & 0x18; + this->direction = DirectionRoundUp(this->knockbackDirection); if ((u8)(this->bitfield + 0x7e) < 2) { sub_080A8680(this); } else { @@ -74,14 +74,14 @@ void DekuSeedProjectile_Action1(Entity* this) { parent = this->parent; if ((parent->next != NULL) && (sub_080177A0(this, parent) != 0)) { this->iframes = 0x10; - this->field_0x3e = -this->direction; + this->knockbackDirection = -this->direction; this->bitfield = -0x80; - this->field_0x42 = 0xc; + this->knockbackDuration = 0xc; this->field_0x46 = 0; parent->iframes = 0x10; - parent->field_0x3e = this->direction; + parent->knockbackDirection = this->direction; parent->bitfield = -0x3e; - parent->field_0x42 = 0xc; + parent->knockbackDuration = 0xc; parent->field_0x46 = 0; } } diff --git a/src/projectile/dirtBallProjectile.c b/src/projectile/dirtBallProjectile.c index fd2765e7..fd5909b8 100644 --- a/src/projectile/dirtBallProjectile.c +++ b/src/projectile/dirtBallProjectile.c @@ -3,6 +3,7 @@ #include "player.h" #include "coord.h" #include "functions.h" +#include "effects.h" extern void sub_08078954(Entity*); @@ -47,7 +48,7 @@ void DirtBallProjectile_Init(Entity* this) { this->action = 1; this->subAction = 0; this->spriteSettings.b.shadow = 1; - this->field_0x20 = 0x8000; + this->hVelocity = 0x8000; this->hitbox = (Hitbox*)&gUnk_08129764; this->field_0x3c |= 0x10; switch (this->type) { @@ -129,13 +130,13 @@ void DirtBallProjectile_Action2(Entity* this) { if (tmp != 0) { switch (tmp) { case 2: - CreateFx(this, 0xb, 0); + CreateFx(this, FX_WATER_SPLASH, 0); break; case 1: - CreateFx(this, 0, 0); + CreateFx(this, FX_FALL_DOWN, 0); break; case 3: - CreateFx(this, 0xc, 0); + CreateFx(this, FX_LAVA_SPLASH, 0); break; } DeleteThisEntity(); @@ -148,7 +149,7 @@ void DirtBallProjectile_Action2(Entity* this) { this->action = 3; return; case 2: - entity = CreateFx(this, 5, 0x80); + entity = CreateFx(this, FX_POT_SHATTER, 0x80); if (entity != NULL) { entity->parent = NULL; } diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c index 287b0013..d48820b0 100644 --- a/src/projectile/gleerokProjectile.c +++ b/src/projectile/gleerokProjectile.c @@ -5,6 +5,7 @@ #include "functions.h" #include "random.h" #include "audio.h" +#include "effects.h" extern void sub_0806F5BC(Entity*, u32, u32); extern u32 sub_080041DC(Entity*, u32, u32); @@ -35,7 +36,7 @@ void GleerokProjectile_Init(Entity* this) { s32 iVar2; this->action = 1; - this->field_0x20 = -0x10000; + this->hVelocity = -0x10000; if (this->type != 3) { CopyPosition(this->parent, this); sub_0806F5BC(this, 0x1000, this->direction); @@ -62,11 +63,11 @@ void GleerokProjectile_Init(Entity* this) { } else if (0x400 < iVar2) { iVar2 = 0x400; } - this->field_0x20 = this->height.WORD / (iVar2 << 8) << 0xd; + this->hVelocity = this->height.WORD / (iVar2 << 8) << 0xd; this->field_0xf = 0x1e; break; case 2: - this->field_0x20 = (this->height.WORD / 0x18000) << 0xc; + this->hVelocity = (this->height.WORD / 0x18000) << 0xc; break; case 3: this->height.WORD = 0xff600000; @@ -90,7 +91,7 @@ void GleerokProjectile_Action1(Entity* this) { if (this->type == 3) { if (sub_08003FC4(this, 0x1800) == 0) { sub_08008790(this, 7); - CreateFx(this, 4, 0); + CreateFx(this, FX_ROCK, 0); DeleteThisEntity(); } } else { diff --git a/src/projectile/guardLineOfSight.c b/src/projectile/guardLineOfSight.c index 9cbe3a22..2fff5c06 100644 --- a/src/projectile/guardLineOfSight.c +++ b/src/projectile/guardLineOfSight.c @@ -35,7 +35,7 @@ void GuardLineOfSight(Entity* this) { entity = CreateProjectile(0xc); if (entity != NULL) { entity->type = 1; - tmp = this->parent->field_0x3e; + tmp = this->parent->knockbackDirection; entity->direction = (gUnk_081299C8[(this->actionDelay >> 2 & 7)] + (tmp << 3)) & 0x1f; entity->parent = this->parent; CopyPosition(this, entity); diff --git a/src/projectile/lakituCloudProjectile.c b/src/projectile/lakituCloudProjectile.c index 76ac9ea5..25599826 100644 --- a/src/projectile/lakituCloudProjectile.c +++ b/src/projectile/lakituCloudProjectile.c @@ -2,6 +2,7 @@ #include "enemy.h" #include "functions.h" #include "player.h" +#include "effects.h" extern void sub_0800449C(Entity*, u32); extern void sub_08079D84(void); @@ -26,7 +27,7 @@ void nullsub_539(Entity* this) { void sub_080A9CF0(Entity* this) { if (sub_0806F520() == 0) { - CreateFx(this, 2, 0); + CreateFx(this, FX_DEATH, 0); DeleteThisEntity(); } LakituCloudProjectile_SubActions[this->subAction](this); @@ -46,7 +47,7 @@ void LakituCloudProjectile_SubAction2(Entity* this) { sub_0800449C(&gPlayerEntity, 0x7a); sub_08079D84(); } - CreateFx(this, 2, 0); + CreateFx(this, FX_DEATH, 0); DeleteThisEntity(); } } diff --git a/src/projectile/lakituLightning.c b/src/projectile/lakituLightning.c index 8d055ba6..975491c2 100644 --- a/src/projectile/lakituLightning.c +++ b/src/projectile/lakituLightning.c @@ -1,5 +1,6 @@ #include "entity.h" #include "enemy.h" +#include "effects.h" extern s32 sub_080AF090(Entity*); extern s32 sub_080A7EB0(Entity*); @@ -35,7 +36,7 @@ void LakituLightning_Action1(Entity* this) { GetNextFrame(this); sub_080AF090(this); if ((this->collisions != 0) || (--this->actionDelay == 0)) { - CreateFx(this, 0x4f, 0); + CreateFx(this, FX_BLUE_EFC, 0); DeleteThisEntity(); } if (sub_080A7EB0(this) != 0) { diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c index 0ab5c3ad..1bcfd7cf 100644 --- a/src/projectile/mandiblesProjectile.c +++ b/src/projectile/mandiblesProjectile.c @@ -66,14 +66,14 @@ void sub_080A9EBC(Entity* this) { default: parent = this->parent; parent->iframes = this->iframes; - parent->field_0x3e = this->field_0x3e; - parent->field_0x42 = this->field_0x42; + parent->knockbackDirection = this->knockbackDirection; + parent->knockbackDuration = this->knockbackDuration; if (this->action == 1) { sub_080AA320(this); } break; } - this->field_0x42 = 0; + this->knockbackDuration = 0; } } diff --git a/src/projectile/moblinSpear.c b/src/projectile/moblinSpear.c index a4123e20..c24e3480 100644 --- a/src/projectile/moblinSpear.c +++ b/src/projectile/moblinSpear.c @@ -27,7 +27,7 @@ void sub_080A832C(Entity* this) { if (this->bitfield == 0x80) { this->iframes = 0x10; - this->field_0x42 = 0xc; + this->knockbackDuration = 0xc; this->field_0x46 = 0x180; this->parent->bitfield = this->bitfield; } @@ -37,10 +37,10 @@ void sub_080A832C(Entity* this) { } else { this->parent->iframes = -tmp; } - this->parent->field_0x42 = this->field_0x42; + this->parent->knockbackDuration = this->knockbackDuration; this->parent->field_0x46 = this->field_0x46; - this->parent->field_0x3e = this->field_0x3e; - this->field_0x42 = 0; + this->parent->knockbackDirection = this->knockbackDirection; + this->knockbackDuration = 0; } void MoblinSpear_Init(Entity* this) { diff --git a/src/projectile/octorokBossProjectile.c b/src/projectile/octorokBossProjectile.c index e927283e..5b1f8e44 100644 --- a/src/projectile/octorokBossProjectile.c +++ b/src/projectile/octorokBossProjectile.c @@ -3,6 +3,7 @@ #include "random.h" #include "functions.h" #include "audio.h" +#include "effects.h" void OctorokBossProjectile_Action2(Entity*); extern void sub_080AE58C(Entity*, u32, u32); @@ -39,7 +40,7 @@ void OctorokBossProjectile_Init(Entity* this) { this->spriteRendering.b3 = 3; this->spritePriority.b0 = 6; this->speed = (Random() & 0x1ff) + 0x200; - this->field_0x20 = (Random() & 0x1fff) + 0x18000; + this->hVelocity = (Random() & 0x1fff) + 0x18000; uVar1 = (((u8)Random() & 7) - 4); this->direction -= uVar1; *(u32*)&this->field_0x78 = 600; @@ -84,7 +85,7 @@ void OctorokBossProjectile_Action1(Entity* this) { if ((this->bitfield & 0x7f) == 0) { OctorokBossProjectile_Action2(this); } - this->direction = this->field_0x3e << 3; + this->direction = this->knockbackDirection << 3; this->speed = 0x400; this->type2 = 1; this->actionDelay = 0; @@ -98,9 +99,9 @@ void OctorokBossProjectile_Action1(Entity* this) { this->parent->currentHealth -= 1; this->parent->iframes = 0x1e; if (this->parent->field_0x7c.BYTES.byte0 != 0) { - this->parent->field_0x42 = 0x18; + this->parent->knockbackDuration = 0x18; this->parent->field_0x46 = 0x200; - this->parent->field_0x3e = this->direction >> 3; + this->parent->knockbackDirection = this->direction >> 3; } SoundReq(SFX_BOSS_HIT); OctorokBossProjectile_Action2(this); @@ -183,14 +184,14 @@ void OctorokBossProjectile_Action1(Entity* this) { if (sub_08003FC4(this, 0x1800) != 0) { return; } - CreateFx(this, 4, 0); + CreateFx(this, FX_ROCK, 0); DeleteThisEntity(); break; } } void OctorokBossProjectile_Action2(Entity* this) { - CreateFx(this, 4, 0); + CreateFx(this, FX_ROCK, 0); DeleteThisEntity(); } diff --git a/src/projectile/rockProjectile.c b/src/projectile/rockProjectile.c index e9e47b2c..72d34a73 100644 --- a/src/projectile/rockProjectile.c +++ b/src/projectile/rockProjectile.c @@ -23,7 +23,7 @@ void sub_080A8064(Entity* this) { if (this->bitfield == 0x80) { DeleteEntity(this); } else { - this->direction = this->field_0x3e; + this->direction = this->knockbackDirection; sub_080A8178(this); } } @@ -31,7 +31,7 @@ void sub_080A8064(Entity* this) { void RockProjectile_Init(Entity* this) { this->action = 1; this->actionDelay = 0x30; - this->field_0x20 = 0xa000; + this->hVelocity = 0xa000; InitializeAnimation(this, 0); } @@ -86,7 +86,7 @@ void sub_080A8178(Entity* this) { this->action = 2; this->flags &= 0x7f; this->speed = 0x40; - this->field_0x20 = 0x14000; + this->hVelocity = 0x14000; } void (*const RockProjectile_Functions[])(Entity*) = { diff --git a/src/projectile/stalfosProjectile.c b/src/projectile/stalfosProjectile.c index c743fcbc..fb75691e 100644 --- a/src/projectile/stalfosProjectile.c +++ b/src/projectile/stalfosProjectile.c @@ -1,6 +1,7 @@ #include "entity.h" #include "enemy.h" #include "functions.h" +#include "effects.h" extern void (*const StalfosProjectile_Functions[])(Entity*); extern void (*const StalfosProjectile_Actions[])(Entity*); @@ -32,7 +33,7 @@ void sub_080A9A34(Entity* this) { if (this->bitfield == 0x9d) { this->action = 3; this->flags &= 0x7f; - this->field_0x20 = 0x2a000; + this->hVelocity = 0x2a000; this->spritePriority.b1 = 1; } } @@ -76,7 +77,7 @@ void StalfosProjectile_Init(Entity* this) { break; case 2: this->action = 3; - this->field_0x20 = 0x2a000; + this->hVelocity = 0x2a000; this->spritePriority.b1 = 1; break; default: @@ -116,7 +117,7 @@ void StalfosProjectile_Action2(Entity* this) { } void StalfosProjectile_Action3(Entity* this) { - if (this->field_0x20 < 0) { + if (this->hVelocity < 0) { this->spriteSettings.b.flipY = 1; } if (sub_08003FC4(this, 0x2000) == 0) { @@ -126,9 +127,9 @@ void StalfosProjectile_Action3(Entity* this) { void sub_080A9BA8(Entity* this) { if (this->type == 0) { - CreateFx(this, 5, 0); + CreateFx(this, FX_POT_SHATTER, 0); } else { - CreateFx(this, 0x3c, 0); + CreateFx(this, FX_BONE, 0); } DeleteThisEntity(); } diff --git a/src/projectile/v1DarkMagicProjectile.c b/src/projectile/v1DarkMagicProjectile.c index baa70ecb..dc9c97c3 100644 --- a/src/projectile/v1DarkMagicProjectile.c +++ b/src/projectile/v1DarkMagicProjectile.c @@ -49,8 +49,8 @@ void sub_080AAC44(Entity* this) { CopyPosition(this->parent, this); } } - if (this->field_0x42 != 0) { - this->field_0x42 = 0; + if (this->knockbackDuration != 0) { + this->knockbackDuration = 0; } } diff --git a/src/projectile/v1FireProjectile.c b/src/projectile/v1FireProjectile.c index cad6d879..00dff22b 100644 --- a/src/projectile/v1FireProjectile.c +++ b/src/projectile/v1FireProjectile.c @@ -42,7 +42,7 @@ void V1FireProjectile_Init(Entity* this) { s8* data; this->action = 1; - this->field_0x20 = -0x10000; + this->hVelocity = -0x10000; this->field_0x76.HWORD = TILE(this->x.HALF.HI, this->y.HALF.HI); CopyPosition(this->parent, this); sub_0806F5BC(this, 0x1000, this->direction); @@ -68,7 +68,7 @@ void V1FireProjectile_Init(Entity* this) { iVar2 = 0x20; } } - this->field_0x20 = (this->height.WORD / (iVar2 << 8)) << 0xd; + this->hVelocity = (this->height.WORD / (iVar2 << 8)) << 0xd; this->direction = sub_080045B4(this, x, y); } diff --git a/src/projectile/v2Projectile.c b/src/projectile/v2Projectile.c index 0420790b..ffb558a1 100644 --- a/src/projectile/v2Projectile.c +++ b/src/projectile/v2Projectile.c @@ -4,6 +4,7 @@ #include "functions.h" #include "random.h" #include "audio.h" +#include "effects.h" extern void (*const V2Projectile_Functions[])(Entity*); extern void (*const gUnk_0812A7EC[])(Entity*); @@ -26,7 +27,7 @@ ASM_FUNC("asm/non_matching/v2Projectile/sub_080ABBF4.inc", void sub_080ABBF4(Ent void sub_080ABC54(Entity* this) { if (sub_0806F520() == 0) { - CreateFx(this, 2, 0); + CreateFx(this, FX_DEATH, 0); DeleteThisEntity(); } gUnk_0812A808[this->subAction](this); @@ -44,7 +45,7 @@ void sub_080ABC90(Entity* this) { ModHealth(-2); sub_0800449C(&gPlayerEntity, 0x7a); sub_08079D84(); - CreateFx(this, 2, 0); + CreateFx(this, FX_DEATH, 0); DeleteThisEntity(); } } @@ -96,7 +97,7 @@ ASM_FUNC("asm/non_matching/v2Projectile/sub_080ABE04.inc", void sub_080ABE04(Ent void sub_080ABE88(Entity* this) { if (sub_08003FC4(this, 0x1800) == 0) { - CreateFx(this, 4, 0); + CreateFx(this, FX_ROCK, 0); DeleteThisEntity(); } } diff --git a/src/projectile/v3TennisBallProjectile.c b/src/projectile/v3TennisBallProjectile.c index 82d64a3c..d2c4ef74 100644 --- a/src/projectile/v3TennisBallProjectile.c +++ b/src/projectile/v3TennisBallProjectile.c @@ -2,6 +2,7 @@ #include "enemy.h" #include "audio.h" #include "functions.h" +#include "effects.h" extern s32 sub_080AF090(Entity*); extern s32 sub_080A7EB0(Entity*); @@ -56,7 +57,7 @@ void sub_080ACB90(Entity* this) { Entity* parent = this->parent; if ((this->x.HALF.HI == parent->x.HALF.HI) && (this->y.HALF.HI <= parent->y.HALF.HI)) { parent->field_0xf = 1; - CreateFx(this, 0x1f, 0x40); + CreateFx(this, FX_REFLECT2, 0x40); EnqueueSFX(SFX_ITEM_GLOVES_KNOCKBACK); DeleteThisEntity(); } diff --git a/src/room.c b/src/room.c index e9fc0110..8ecb4573 100644 --- a/src/room.c +++ b/src/room.c @@ -13,6 +13,7 @@ #include "script.h" #include "random.h" #include "functions.h" +#include "effects.h" void sub_0804B3C4(void* arg0) { sub_0804B29C(arg0); @@ -2240,7 +2241,7 @@ u32 sub_unk3_DeepwoodShrine_Entrance() { #if defined(DEMO_USA) || defined(DEMO_JP) void sub_StateChange_DeepwoodShrine_Entrance() { #ifdef DEMO_USA - if (gUnk_02000000->saveFileId != 0 && GetInventoryValue(0x40) == 0) { + if (gSaveHeader->saveFileId != 0 && GetInventoryValue(0x40) == 0) { #else #ifdef DEMO_JP if (GetInventoryValue(0x40) == 0) { @@ -4871,7 +4872,7 @@ extern EntityData gUnk_080F30CC; void sub_StateChange_HouseInteriors2_Stockwell(void) { // dog food - if ((GetInventoryValue(0x36) == 1) && !CheckGlobalFlag(BIN_DOGFOOD) && (gPlayerState.flags.all & 0x80) == 0) { + if ((GetInventoryValue(0x36) == 1) && !CheckGlobalFlag(BIN_DOGFOOD) && (gPlayerState.flags & 0x80) == 0) { LoadRoomEntityList(&gUnk_080F30CC); } } @@ -4895,7 +4896,7 @@ void sub_StateChange_HouseInteriors2_LinksHouseBedroom(void) { gArea.musicIndex = gArea.pMusicIndex; SoundReq(SONG_PLAY_VOL_RESET | BGM_MINISH_CAP); } - if ((gPlayerState.flags.all & 8) == 0) { + if ((gPlayerState.flags & 8) == 0) { LoadRoomEntityList(&gUnk_080F31D8); } } @@ -5831,7 +5832,7 @@ void sub_0804F5E8(void) { void sub_0804F680(Entity* parent, s32 x, s32 y) { Entity* fx; - fx = CreateFx(parent, 2, 0); + fx = CreateFx(parent, FX_DEATH, 0); if (fx != NULL) { fx->x.HALF.HI = gRoomControls.roomOriginX + x; fx->y.HALF.HI = gRoomControls.roomOriginY + y; @@ -5872,13 +5873,13 @@ void sub_0804F760(Entity* this) { void sub_0804F79C(Entity* parent) { Entity* fx; - fx = CreateFx(parent, 0x35, 0); + fx = CreateFx(parent, FX_BIG_EXPLOSION, 0); if (fx != NULL) { fx->spriteRendering.b3 = 0; fx->x.HALF.HI = gRoomControls.roomOriginX + 0x1b8; fx->y.HALF.HI = gRoomControls.roomOriginY + 0x148; } - fx = CreateFx(parent, 0x35, 0); + fx = CreateFx(parent, FX_BIG_EXPLOSION, 0); if (fx != NULL) { fx->spriteRendering.b3 = 0; fx->x.HALF.HI = gRoomControls.roomOriginX + 0x238; diff --git a/src/save.c b/src/save.c index f218c0b3..562f116e 100644 --- a/src/save.c +++ b/src/save.c @@ -63,13 +63,12 @@ asm("demoPointer1: .incbin \"baserom_demo.gba\", 0x11e010, 0x500"); asm("demoPointer2: .incbin \"baserom_demo.gba\", 0x11e510, 0x500"); asm("demoPointer3: .incbin \"baserom_demo.gba\", 0x11ea10, 0x500"); -extern const u32 demoPointer1; -extern const u32 demoPointer2; -extern const u32 demoPointer3; +extern const u8 demoPointer1[]; +extern const u8 demoPointer2[]; +extern const u8 demoPointer3[]; -const u32 demoPointers[] = { (u32)&demoPointer1, (u32)&demoPointer2, (u32)&demoPointer3 }; +const u8* const demoPointers[] = { demoPointer1, demoPointer2, demoPointer3 }; #endif - #else #if defined(JP) || defined(EU) @@ -116,14 +115,14 @@ SaveResult HandleSaveInProgress(u32 arg0) { InitDMA(); switch (arg0) { case 0: - temp = WriteSaveFile(gUnk_02000000->saveFileId, &gSave); + temp = WriteSaveFile(gSaveHeader->saveFileId, &gSave); break; case 1: - SetFileStatusDeleted(gUnk_02000000->saveFileId); + SetFileStatusDeleted(gSaveHeader->saveFileId); temp = 1; break; case 2: - temp = Write_02000000(gUnk_02000000); + temp = Write_02000000(gSaveHeader); break; } gMenu.field_0xa = temp; diff --git a/src/script.c b/src/script.c index 28b469b9..655eb3b5 100644 --- a/src/script.c +++ b/src/script.c @@ -11,6 +11,8 @@ #include "random.h" #include "audio.h" #include "functions.h" +#include "main.h" +#include "effects.h" void InitScriptForEntity(Entity*, ScriptExecutionContext*, u16*); void InitScriptExecutionContext(ScriptExecutionContext* context, u16* script); @@ -73,7 +75,7 @@ void ScriptCommand_WaitForPlayerAction0x17(Entity* entity, ScriptExecutionContex void ScriptCommand_WaitFor_1(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WaitFor_2(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E778(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E788(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_SetFadeMask(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E79C(Entity* entity, ScriptExecutionContext* context); void ScriptCommandNop2(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_DoFade4(Entity* entity, ScriptExecutionContext* context); @@ -104,11 +106,11 @@ void ScriptCommand_0807E9F0(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EA4C(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EA88(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WaitUntilTextboxCloses(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_TextboxNoOverlapFollow(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_TextboxNoOverlap(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_TextboxNoOverlapFollowPos(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_TextboxNoOverlapFollowTable(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_TextboxNoOverlapVar(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MessageFromTarget(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MessageNoOverlap(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MessageFromTargetPos(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MessageFromTargetTable(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MessageNoOverlapVar(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EB38(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EB44(Entity* entity, ScriptExecutionContext* context); @@ -157,7 +159,7 @@ void ScriptCommand_0807F0C8(Entity* entity, ScriptExecutionContext* context); extern void CreateSpeechBubbleExclamationMark(Entity*, u32, u32); extern void CreateSpeechBubbleQuestionMark(Entity*, u32, u32); -extern void sub_0801C4A0(u32); +extern void RecoverUI(u32); typedef void (*ScriptCommand)(Entity*, ScriptExecutionContext*); @@ -218,7 +220,7 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop, ScriptCommand_WaitFor_1, ScriptCommand_WaitFor_2, ScriptCommand_0807E778, - ScriptCommand_0807E788, + ScriptCommand_SetFadeMask, ScriptCommand_0807E79C, ScriptCommandNop2, ScriptCommand_DoFade4, @@ -251,11 +253,11 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop, ScriptCommand_0807EA4C, ScriptCommand_0807EA88, ScriptCommand_WaitUntilTextboxCloses, - ScriptCommand_TextboxNoOverlapFollow, - ScriptCommand_TextboxNoOverlap, - ScriptCommand_TextboxNoOverlapFollowPos, - ScriptCommand_TextboxNoOverlapFollowTable, - ScriptCommand_TextboxNoOverlapVar, + ScriptCommand_MessageFromTarget, + ScriptCommand_MessageNoOverlap, + ScriptCommand_MessageFromTargetPos, + ScriptCommand_MessageFromTargetTable, + ScriptCommand_MessageNoOverlapVar, ScriptCommand_0807EB28, ScriptCommand_0807EB38, ScriptCommand_0807EB44, @@ -301,6 +303,9 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop, ScriptCommand_0807F0B4, ScriptCommand_0807F0C8 }; +extern u16* gUnk_08001A7C[]; +extern u8 gUnk_08114F30[]; +extern u8 gUnk_08114F34[]; extern const u16 gUnk_08016984; extern u8 gUnk_0811E514[]; extern u8 gUnk_0811E510[]; @@ -401,7 +406,7 @@ void HandlePostScriptActions(Entity* entity, ScriptExecutionContext* context) { case 1 << 0x02: break; case 1 << 0x03: - entity->field_0x20 = 0x18000; + entity->hVelocity = 0x18000; break; case 1 << 0x04: CreateSpeechBubbleExclamationMark(entity, 8, -0x18); @@ -597,7 +602,7 @@ void sub_0807DF38(void) { void sub_0807DF50(void) { gUnk_02034490[0] = 0; gUnk_0200AF00.filler0[1] = 0; - sub_0801C4A0(0); + RecoverUI(0); sub_080791D0(); sub_08079184(); } @@ -801,7 +806,7 @@ void ScriptCommand_CheckEntityInteractType(Entity* entity, ScriptExecutionContex } void ScriptCommand_0807E30C(Entity* entity, ScriptExecutionContext* context) { - if ((context->unk_1A & 0xF) == 0 && (gPlayerState.flags.all & 0x80) == 0 && + if ((context->unk_1A & 0xF) == 0 && (gPlayerState.flags & 0x80) == 0 && sub_080041A0(entity, &gPlayerEntity, 0x28, 0x28)) { entity->animationState = sub_0806F5B0(GetFacingDirection(entity, &gPlayerEntity)); } @@ -885,12 +890,12 @@ void ScriptCommand_0807E514(Entity* entity, ScriptExecutionContext* context) { void ScriptCommand_CheckPlayerFlags(Entity* entity, ScriptExecutionContext* context) { context->condition = - !!(GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer) & gPlayerState.flags.all); + !!(GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer) & gPlayerState.flags); gActiveScriptInfo.flags |= 1; } void ScriptCommand_0807E564(Entity* entity, ScriptExecutionContext* context) { - context->condition = (gPlayerState.flags.all >> 7) & 1; + context->condition = (gPlayerState.flags >> 7) & 1; gActiveScriptInfo.flags |= 1; } @@ -1000,8 +1005,8 @@ void ScriptCommand_0807E778(Entity* entity, ScriptExecutionContext* context) { gActiveScriptInfo.unk_08 = context->scriptInstructionPointer[1]; } -void ScriptCommand_0807E788(Entity* entity, ScriptExecutionContext* context) { - gFadeControl.field_0x4 = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); +void ScriptCommand_SetFadeMask(Entity* entity, ScriptExecutionContext* context) { + gFadeControl.mask = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); } void ScriptCommand_0807E79C(Entity* entity, ScriptExecutionContext* context) { @@ -1126,10 +1131,10 @@ void ScriptCommand_0807E974(Entity* entity, ScriptExecutionContext* context) { break; entity->interactType = 0; context->unk_18++; - TextboxNoOverlapFollow(context->scriptInstructionPointer[1]); + MessageFromTarget(context->scriptInstructionPointer[1]); break; case 1: - if (gTextBox.doTextBox & 0x7F) + if (gMessage.doTextBox & 0x7F) break; context->unk_18 = 2; context->unk_19 = 0xF; @@ -1190,36 +1195,36 @@ void ScriptCommand_0807EA88(Entity* entity, ScriptExecutionContext* context) { } void ScriptCommand_WaitUntilTextboxCloses(Entity* entity, ScriptExecutionContext* context) { - if (gTextBox.doTextBox & 0x7F) { + if (gMessage.doTextBox & 0x7F) { gActiveScriptInfo.commandSize = 0; } } -void ScriptCommand_TextboxNoOverlapFollow(Entity* entity, ScriptExecutionContext* context) { - TextboxNoOverlapFollow(context->scriptInstructionPointer[1]); +void ScriptCommand_MessageFromTarget(Entity* entity, ScriptExecutionContext* context) { + MessageFromTarget(context->scriptInstructionPointer[1]); } -void ScriptCommand_TextboxNoOverlap(Entity* entity, ScriptExecutionContext* context) { - TextboxNoOverlap(context->scriptInstructionPointer[1], entity); +void ScriptCommand_MessageNoOverlap(Entity* entity, ScriptExecutionContext* context) { + MessageNoOverlap(context->scriptInstructionPointer[1], entity); } -void ScriptCommand_TextboxNoOverlapFollowPos(Entity* entity, ScriptExecutionContext* context) { - TextboxNoOverlapFollow(context->scriptInstructionPointer[1]); - gTextBox.textWindowPosX = 1; - gTextBox.textWindowPosY = context->scriptInstructionPointer[2]; +void ScriptCommand_MessageFromTargetPos(Entity* entity, ScriptExecutionContext* context) { + MessageFromTarget(context->scriptInstructionPointer[1]); + gMessage.textWindowPosX = 1; + gMessage.textWindowPosY = context->scriptInstructionPointer[2]; } -void ScriptCommand_TextboxNoOverlapFollowTable(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_MessageFromTargetTable(Entity* entity, ScriptExecutionContext* context) { if (gActiveScriptInfo.commandSize > context->intVariable) { u16* tmp = context->scriptInstructionPointer + context->intVariable; - TextboxNoOverlapFollow(tmp[1]); + MessageFromTarget(tmp[1]); } else { - TextboxNoOverlapFollow(0); + MessageFromTarget(0); } } -void ScriptCommand_TextboxNoOverlapVar(Entity* entity, ScriptExecutionContext* context) { - TextboxNoOverlap(context->intVariable, entity); +void ScriptCommand_MessageNoOverlapVar(Entity* entity, ScriptExecutionContext* context) { + MessageNoOverlap(context->intVariable, entity); } void ScriptCommand_0807EB28(Entity* entity, ScriptExecutionContext* context) { @@ -1262,7 +1267,7 @@ void ScriptCommand_SetEntitySpeed(Entity* entity, ScriptExecutionContext* contex } void ScriptCommand_SetEntity0x20(Entity* entity, ScriptExecutionContext* context) { - entity->field_0x20 = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); + entity->hVelocity = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); } void ScriptCommand_SetEntityPositionRelative(Entity* entity, ScriptExecutionContext* context) { @@ -1433,7 +1438,7 @@ void ScriptCommand_0807EEF4(Entity* entity, ScriptExecutionContext* context) { void ScriptCommand_0807EF3C(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; - entity->field_0x20 = ((s16)context->scriptInstructionPointer[1]) << 8; + entity->hVelocity = ((s16)context->scriptInstructionPointer[1]) << 8; context->x.HALF.LO = context->scriptInstructionPointer[2] << 8; sub_08003FC4(entity, (u16)context->x.HALF.LO); } else { @@ -1524,3 +1529,627 @@ void ScriptCommand_0807F0B4(Entity* entity, ScriptExecutionContext* context) { void ScriptCommand_0807F0C8(Entity* entity, ScriptExecutionContext* context) { sub_08080964(context->scriptInstructionPointer[1], context->scriptInstructionPointer[2]); } + +extern u8 gUnk_0811E750[]; +extern u8 gUnk_0811E758[]; +extern u8 gUnk_0811E760[]; + +void sub_0807F0D8(Entity* entity, ScriptExecutionContext* context) { + context->condition = (-(u32)gInput.newKeys | ((u32)gInput.newKeys)) >> 0x1f; +} + +void sub_0807F0EC(Entity* entity, ScriptExecutionContext* context) { + context->intVariable = (s32)Random() % (s32)context->intVariable; +} + +void sub_0807F100(Entity* entity, ScriptExecutionContext* context) { + u32 rand; + + rand = Random(); + entity->animationState = rand & 6; + context->unk_1A = gUnk_0811E750[(rand >> 8) & 7]; +} + +void sub_0807F128(Entity* entity, ScriptExecutionContext* context) { + u32 rand; + + rand = Random(); + entity->animationState = gUnk_0811E758[rand & 7]; + context->unk_1A = gUnk_0811E760[(rand >> 8) & 7]; +} + +void sub_0807F158(Entity* entity, ScriptExecutionContext* context) { + entity->collisionLayer = 1; + UpdateSpriteForCollisionLayer(entity); +} + +void sub_0807F168(Entity* entity, ScriptExecutionContext* context) { + gPlayerEntity.collisionLayer = 1; + UpdateSpriteForCollisionLayer(&gPlayerEntity); +} + +void sub_0807F180(Entity* entity, ScriptExecutionContext* context) { + entity->collisionLayer = 2; + UpdateSpriteForCollisionLayer(entity); +} + +void sub_0807F190(Entity* entity, ScriptExecutionContext* context) { + DoFade(4, 256); +} + +void sub_0807F1A0(Entity* entity, ScriptExecutionContext* context) { + sub_0807DEDC(entity, context, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI); + gActiveScriptInfo.flags |= 1; +} + +void sub_0807F1C4(Entity* entity, ScriptExecutionContext* context) { + if ((gPlayerState.flags & 8) != 0) { + gPlayerState.field_0x8 = 0x459; + } else { + gPlayerState.field_0x8 = 0x1bc; + } +} + +void sub_0807F1E8(Entity* entity, ScriptExecutionContext* context) { + if ((gPlayerState.flags & 8) != 0) { + gPlayerState.field_0x8 = 0x45a; + } else { + gPlayerState.field_0x8 = 0x2bd; + } +} + +void sub_0807F210(Entity* entity, ScriptExecutionContext* context) { + if ((gPlayerState.flags & 8) != 0) { + gPlayerState.field_0x8 = 0x41c; + } else { + gPlayerState.field_0x8 = 0x80c; + } +} + +void sub_0807F238(Entity* entity, ScriptExecutionContext* context) { + gPlayerState.field_0x8 = context->intVariable; +} + +void sub_0807F244(Entity* entity, ScriptExecutionContext* context) { + u32 slot; + u32 item; + + item = context->intVariable & 0xFFFF; + slot = context->intVariable >> 0x10; + item &= 0xFFFF; + switch (item) { + case 1: + case 2: + case 3: + case 4: + case 6: + // Pick greatest sword unlocked + item = 1; + if (GetInventoryValue(2)) + item = 2; + if (GetInventoryValue(3)) + item = 3; + if (GetInventoryValue(4)) + item = 4; + if (GetInventoryValue(6)) + item = 6; + break; + } + ForceEquipItem(item, slot); +} + +void sub_0807F29C(Entity* entity, ScriptExecutionContext* context) { + sub_0805ED14((void*)context->intVariable); +} + +void sub_0807F2A8(Entity* entity, ScriptExecutionContext* context) { + if (gPlayerState.field_0x9c == 0) { + gActiveScriptInfo.flags |= 1; + } else { + gActiveScriptInfo.commandSize = 0; + } +} + +void sub_0807F2D4(Entity* entity, ScriptExecutionContext* context) { + if ((entity->frames.all & 0x80) != 0) { + gActiveScriptInfo.flags |= 1; + } else { + gActiveScriptInfo.commandSize = 0; + } +} + +void sub_0807F304(Entity* entity, ScriptExecutionContext* context) { + if ((gPlayerEntity.frames.all & 0x80) != 0) { + gActiveScriptInfo.flags |= 1; + } else { + gActiveScriptInfo.commandSize = 0; + } +} + +void sub_0807F338(Entity* entity, ScriptExecutionContext* context) { + entity->hitbox = NULL; + entity->field_0x17 &= ~1; +} + +void sub_0807F348(Entity* entity, ScriptExecutionContext* context) { + sub_0805E3A0(entity, 2); +} + +void sub_0807F354(Entity* entity, ScriptExecutionContext* context) { + sub_0805E3A0(entity, 6); +} + +void sub_0807F360(Entity* entity, ScriptExecutionContext* context) { + sub_0805E3A0(entity, 3); +} + +void sub_0807F36C(Entity* entity, ScriptExecutionContext* context) { + Entity* fx; + fx = CreateFx(entity, FX_REFLECT4, 0); + if (fx != NULL) { + fx->spritePriority.b0 = 1; + PositionRelative(entity, fx, 0, -524288); + if (Random() & 1) + fx->spriteSettings.b.flipX = 1; + if (Random() & 1) + fx->spriteSettings.b.flipY = 1; + } +} + +void sub_0807F3C8(Entity* entity, ScriptExecutionContext* context) { + sub_0807F36C(entity, context); + SoundReq(SFX_BUTTON_DEPRESS); +} + +void sub_0807F3D8(Entity* entity, ScriptExecutionContext* context) { + InitAnimationForceUpdate(entity, context->intVariable + (entity->animationState >> 1)); + entity->field_0x80.HWORD = entity->animIndex; +} + +void sub_0807F3F8(Entity* entity, ScriptExecutionContext* context) { + CreateSpeechBubbleExclamationMark(&gPlayerEntity, 8, -24); +} + +void sub_0807F40C(Entity* entity, ScriptExecutionContext* context) { + CreateSpeechBubbleQuestionMark(&gPlayerEntity, 8, -24); +} + +void sub_0807F420(Entity* entity, ScriptExecutionContext* context) { + MenuFadeIn(context->intVariable & 0xff, (u8)(context->intVariable >> 8)); +} + +void sub_0807F434(Entity* entity, ScriptExecutionContext* context) { + switch (entity->interactType) { + case 1: + entity->interactType = 0; + context->intVariable = 1; + break; + case 2: + entity->interactType = 0; + context->intVariable = 2; + break; + default: + context->intVariable = 0; + break; + } + gActiveScriptInfo.flags |= 1; +} + +void sub_0807F464(Entity* entity, ScriptExecutionContext* context) { + s32 s32Var; + + if (!context->unk_18) { + context->unk_18++; + context->postScriptActions |= 2; + s32Var = context->intVariable; + context->x.HALF.HI = gRoomControls.roomOriginX + s32Var; + context->y.HALF.HI = entity->y.HALF.HI; + if (s32Var > entity->x.HALF.HI - gRoomControls.roomOriginX) { + entity->direction = 64; + entity->animationState = (entity->animationState & 0x80) | 2; + } else { + entity->direction = -64; + entity->animationState = (entity->animationState & 0x80) | 6; + } + } + sub_0806F62C(entity, entity->speed, entity->direction); + if (((context->x.HALF.HI - entity->x.HALF.HI) ^ ((entity->direction & 0x80) << 24)) < 0) + entity->x.HALF.HI = context->x.HALF.HI; + else + gActiveScriptInfo.commandSize = 0; +} + +void sub_0807F4F8(Entity* entity, ScriptExecutionContext* context) { + s32 s32Var; + + if (!context->unk_18) { + context->unk_18++; + context->postScriptActions |= 2; + s32Var = context->intVariable; + context->x.HALF.HI = entity->x.HALF.HI; + context->y.HALF.HI = gRoomControls.roomOriginY + s32Var; + if (s32Var > entity->y.HALF.HI - gRoomControls.roomOriginY) { + entity->direction = 128; + entity->animationState = (entity->animationState & 0x80) | 4; + } else { + entity->direction = 0; + entity->animationState = (entity->animationState & 0x80); + } + } + sub_0806F62C(entity, entity->speed, entity->direction); + if (((context->y.HALF.HI - entity->y.HALF.HI) ^ ((entity->direction & 0x80) << 24)) >= 0) + entity->y.HALF.HI = context->y.HALF.HI; + else + gActiveScriptInfo.commandSize = 0; +} + +void sub_0807F584(Entity* entity, ScriptExecutionContext* context) { + context->intVariable = gPlayerEntity.animationState >> 1; +} + +void sub_0807F594(Entity* entity, ScriptExecutionContext* context) { + if (gPlayerState.field_0xa8) + gActiveScriptInfo.commandSize = 0; +} + +void sub_0807F5B0(Entity* entity, ScriptExecutionContext* context) { + gPlayerState.field_0x27[0] = context->intVariable; +} + +void sub_0807F5C0(Entity* entity, ScriptExecutionContext* context) { + s32 left; + s32 bottom; + + if (gRoomControls.cameraTarget != NULL) { + left = gRoomControls.cameraTarget->x.HALF.HI - DISPLAY_WIDTH / 2; + bottom = gRoomControls.cameraTarget->y.HALF.HI - DISPLAY_HEIGHT / 2; + + if (left < gRoomControls.roomOriginX) + left = gRoomControls.roomOriginX; + if (left > gRoomControls.roomOriginX + gRoomControls.width - DISPLAY_WIDTH) + left = gRoomControls.roomOriginX + gRoomControls.width - DISPLAY_WIDTH; + if (bottom < gRoomControls.roomOriginY) + bottom = gRoomControls.roomOriginY; + if (bottom > gRoomControls.roomOriginY + gRoomControls.height - DISPLAY_HEIGHT) + bottom = gRoomControls.roomOriginY + gRoomControls.height - DISPLAY_HEIGHT; + + if (left == gRoomControls.roomScrollX && bottom == gRoomControls.roomScrollY) + gActiveScriptInfo.flags |= 1u; + else + gActiveScriptInfo.commandSize = 0; + } +} + +void sub_0807F634(Entity* entity, ScriptExecutionContext* context) { + u16* p = (u16*)context->intVariable; + sub_0801DFB4(entity, p[0], p[1], p[2]); + gPlayerState.field_0x8b = 3; +} + +void sub_0807F650(Entity* entity, ScriptExecutionContext* context) { + u32 p = sub_08002632(entity); + sub_0801DFB4(entity, gUnk_08001A7C[p][0], gUnk_08001A7C[p][1], gUnk_08001A7C[p][2]); + gPlayerState.field_0x8b = 3; +} + +void sub_0807F680(Entity* entity, ScriptExecutionContext* context) { + context->condition = gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX > (s32)(context->intVariable & 0xffff); + gActiveScriptInfo.flags |= 1; +} + +void sub_0807F6B4(Entity* entity, ScriptExecutionContext* context) { + context->condition = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY > (s32)(context->intVariable & 0xffff); + gActiveScriptInfo.flags |= 1; +} + +void sub_0807F6E8(Entity* entity, ScriptExecutionContext* context) { + gPlayerState.flags |= context->intVariable; +} + +void sub_0807F6F8(Entity* entity, ScriptExecutionContext* context) { + gPlayerState.flags &= ~context->intVariable; +} + +void sub_0807F708(Entity* entity, ScriptExecutionContext* context) { + ShowNPCDialogue(entity, (Dialog*)context->intVariable); +} + +void sub_0807F714(Entity* entity, ScriptExecutionContext* context) { + entity->spriteRendering.b3 = gUnk_08114F30[entity->spriteRendering.b3]; + ResolveEntityOnTop(entity, entity); +} + +void sub_0807F738(Entity* entity, ScriptExecutionContext* context) { + entity->spriteRendering.b3 = gUnk_08114F34[entity->spriteRendering.b3]; + sub_0806FAD8(entity, entity); +} + +void sub_0807F75C(Entity* entity, ScriptExecutionContext* context) { + s32 s32Var = context->intVariable; + gPlayerEntity.x.HALF.HI = (s32Var >> 16) + gRoomControls.roomOriginX; + gPlayerEntity.y.HALF.HI = (s32Var & 0xffff) + gRoomControls.roomOriginY; +} + +void sub_0807F77C(Entity* entity, ScriptExecutionContext* context) { + if (context->condition) + context->intVariable = 1; + else + context->intVariable = 0; +} + +void sub_0807F78C(Entity* entity, ScriptExecutionContext* context) { + u32 item = context->intVariable; + u32 msg; + u32 price; + + if (context->intVariable == 0) + item = gRoomVars.itemForSaleIndex; + + msg = GetSaleItemConfirmMessageID(item); + price = GetItemPrice(item); + MessageNoOverlap(msg, entity); + gMessage.field_0x10 = (u16)price; +} + +void sub_0807F7C4(Entity* entity, ScriptExecutionContext* context) { + u32 item = context->intVariable; + u32 msg; + u32 price; + + if (context->intVariable == 0) + item = gRoomVars.itemForSaleIndex; + + context->condition = GetItemPrice(item) <= gSave.stats.rupees; + gActiveScriptInfo.flags |= 1; +} + +void sub_0807F800(Entity* entity, ScriptExecutionContext* context) { + u32 item = context->intVariable; + u32 msg; + u32 price; + + if (context->intVariable == 0) + item = gRoomVars.itemForSaleIndex; + + price = GetItemPrice(item); + ModRupees(-price); + sub_080A7C18(item, 0, 0); + gRoomVars.itemForSaleIndex = 0; + gActiveScriptInfo.flags |= 1; +} + +void sub_0807F83C(Entity* entity, ScriptExecutionContext* context) { + sub_08079184(); +} + +void sub_0807F844(Entity* entity, ScriptExecutionContext* context) { + gRoomControls.cameraTarget = entity; + sub_080809D4(); +} + +void sub_0807F854(Entity* entity, ScriptExecutionContext* context) { + u32 value; + u32 idx; + + idx = (context->intVariable >> 0x10) & 3; + value = context->intVariable & 0xffff; + switch (idx) { + case 0: + case 1: + gMessage.field_0x10 = value; + break; + case 2: + gMessage.field_0x14 = value; + break; + case 3: + gMessage.field_0x18 = value; + break; + case 4: + gMessage.field_0x1c = value; + break; + } +} + +void sub_0807F8BC(Entity* entity, ScriptExecutionContext* context) { + if (sub_080040A8(entity)) + context->condition = 1; + else + context->condition = 0; +} + +void sub_0807F8D0(Entity* entity, ScriptExecutionContext* context) { + sub_08003FC4(entity, context->intVariable); + gActiveScriptInfo.flags |= 1; +} + +void sub_0807F8E8(Entity* entity, ScriptExecutionContext* context) { + Entity* c = CreateObjectWithParent(entity, 0xA6, 0, 0); + if (c != NULL) { + c->parent = entity; + c->field_0x86.HWORD = (context->intVariable & 0x3ff) | 0x8000; + } +} + +void sub_0807F918(Entity* entity, ScriptExecutionContext* context) { + PutItemOnSlot(context->intVariable); +} + +void sub_0807F924(Entity* entity, ScriptExecutionContext* context) { + sub_0807879C(entity); +} + +void sub_0807F92C(Entity* entity, ScriptExecutionContext* context) { + sub_080787C0(entity); +} + +void sub_0807F934(Entity* entity, ScriptExecutionContext* context) { + sub_080787B4(entity); +} + +void sub_0807F93C(Entity* entity, ScriptExecutionContext* context) { + CreateSpeechBubbleSleep(entity, (context->intVariable >> 8) & 0xff, context->intVariable & 0xff); +} + +void sub_0807F950(Entity* entity, ScriptExecutionContext* context) { + Entity* c = FindEntity(6, 0x56, 6, 0, 2); + if (c != NULL) + DeleteEntity(c); +} + +void sub_0807F970(Entity* entity, ScriptExecutionContext* context) { + context->condition = context->intVariable == gTextRender.curToken.textIndex; +} + +void sub_0807F98C(Entity* entity, ScriptExecutionContext* context) { + entity->height.WORD = context->intVariable; +} + +void sub_0807F994(Entity* entity, ScriptExecutionContext* context) { + entity->spriteOffsetX = (s32)context->intVariable >> 0x10; + entity->spriteOffsetY = context->intVariable & 0xffff; +} + +void sub_0807F9A4(Entity* entity, ScriptExecutionContext* context) { + switch (gPlayerState.field_0xa8) { + case 5: + case 7: + case 8: + case 10: + case 11: + case 12: + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + case 19: + case 20: + case 21: + case 22: + case 23: + case 24: + case 27: + case 28: + gActiveScriptInfo.commandSize = 0; + break; + default: + gActiveScriptInfo.flags |= 1u; + break; + } +} + +void sub_0807FA40(Entity* entity, ScriptExecutionContext* context) { + switch (gPlayerState.field_0xa8) { + case 5: + case 7: + case 8: + case 10: + case 11: + case 12: + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + case 20: + case 21: + case 22: + case 23: + case 24: + case 27: + case 28: + gActiveScriptInfo.commandSize = 0; + break; + default: + gActiveScriptInfo.flags |= 1u; + break; + } +} + +void sub_0807FADC(Entity* entity, ScriptExecutionContext* context) { + switch (context->unk_18) { + case 0: + context->unk_18++; + sub_0808C650(entity, context->intVariable); + break; + case 1: + if (sub_0808C67C()) + context->unk_18++; + break; + case 2: + sub_0808C688(); + return; + } + gActiveScriptInfo.commandSize = 0; +} + +void sub_0807FB28(Entity* entity, ScriptExecutionContext* context) { + if (!context->unk_18) + sub_0801D7BC(0x7fff, 1); + + context->unk_18++; + if (context->unk_18 >= context->intVariable) + sub_0801D7BC(0, 0); + else + gActiveScriptInfo.commandSize = 0; +} + +void sub_0807FB64(Entity* entity, ScriptExecutionContext* context) { + gPlayerEntity.iframes = context->intVariable; +} + +void sub_0807FB74(Entity* entity, ScriptExecutionContext* context) { + gPlayerState.swimState = 0; + gPlayerEntity.field_0x3c &= ~4; +} + +void sub_0807FB94(Entity* entity, ScriptExecutionContext* context) { + InitScreen(SCREEN_CREDITS); +} + +void sub_0807FBA0(Entity* entity, ScriptExecutionContext* context) { + entity->x.HALF.HI = gRoomControls.roomScrollX + 120; + entity->y.HALF.HI = gRoomControls.roomScrollY + 80; +} + +void sub_0807FBB4(Entity* entity, ScriptExecutionContext* context) { + gPlayerState.field_0x1a[0] |= 0x80; +} + +void sub_0807FBC4(Entity* entity, ScriptExecutionContext* context) { + sub_0805E4A0(entity); +} + +void sub_0807FBCC(Entity* entity, ScriptExecutionContext* context) { + sub_0805E4CC(entity); +} + +void sub_0807FBD4(Entity* entity, ScriptExecutionContext* context) { + sub_0806F62C(entity, entity->speed, entity->direction); + if (sub_080040A8(entity)) + gActiveScriptInfo.commandSize = 0; +} + +#ifndef EU +void sub_0807FBFC(Entity* entity, ScriptExecutionContext* context) { + gSave.stats.charm = 0; + gSave.stats.charmTimer = 0; + gSave.stats.unkB = 0; + gSave.stats.unkTimer = 0; + gSave.stats.effect = 0; + gSave.stats.effectTimer = 0; +} + +#if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) +void sub_0807FC24(Entity* entity, ScriptExecutionContext* context) { +#if defined(DEMO_JP) + u32 idx = gRoomControls.roomID == 1 ? 0xcf : 0xd0; +#else + u32 idx = gRoomControls.roomID == 1 ? 0xcf : 0xd1; +#endif + SetLocalFlag(idx); +} +#endif +#endif diff --git a/src/sub_08050008.c b/src/sub_08050008.c index df79883a..580c3a32 100644 --- a/src/sub_08050008.c +++ b/src/sub_08050008.c @@ -6,5 +6,5 @@ extern u32 gUnk_020354C0; void sub_08050008() { MemClear(&gUnk_020354C0, 128); - gFadeControl.field_0x4 = -1; + gFadeControl.mask = 0xFFFFFFFF; } diff --git a/src/sub_0805E374.c b/src/sub_0805E374.c index e035ce07..3ec3e287 100644 --- a/src/sub_0805E374.c +++ b/src/sub_0805E374.c @@ -9,7 +9,7 @@ Entity* sub_0805E374(Entity* param_1) { u8 r3 = gScreenTransition.field_0x24[8]; u8* array = gUnk_081091F8; - if (r3 != '\x02') { + if (r3 != 2) { array = gUnk_081091EE; } return sub_0805E3A0(param_1, array[param_1->kind]); diff --git a/src/sub_0807B820.c b/src/sub_0807B820.c index fabdc8d9..14da7b18 100644 --- a/src/sub_0807B820.c +++ b/src/sub_0807B820.c @@ -9,46 +9,46 @@ void sub_0807B7D8(u32 param_1, u32 param_2, u32 param_3) { sub_08000152(53); sub_0807B778(param_2, param_3); sub_0807B778(param_2 + 1, param_3); - sub_0807B778(param_2 + -1, param_3); + sub_0807B778(param_2 - 1, param_3); sub_0807B778(param_2 + 64, param_3); - sub_0807B778(param_2 + -64, param_3); + sub_0807B778(param_2 - 64, param_3); } else { SetTileType(param_1, param_2, param_3); } } void sub_0807B820(u32 param_1) { - SetTileType(620, param_1 + -65, 1); - SetTileType(627, param_1 + -65, 2); - SetTileType(621, param_1 + -64, 1); - SetTileType(628, param_1 + -64, 2); - SetTileType(622, param_1 + -63, 1); - SetTileType(629, param_1 + -63, 2); - SetTileType(623, param_1 + -1, 1); + SetTileType(620, param_1 - 65, 1); + SetTileType(627, param_1 - 65, 2); + SetTileType(621, param_1 - 64, 1); + SetTileType(628, param_1 - 64, 2); + SetTileType(622, param_1 - 63, 1); + SetTileType(629, param_1 - 63, 2); + SetTileType(623, param_1 - 1, 1); SetTileType(624, param_1, 1); SetTileType(626, param_1 + 1, 1); } void sub_0807B8A8(u32 param_1) { - SetTileType(636, param_1 + -65, 1); - SetTileType(643, param_1 + -65, 2); - SetTileType(637, param_1 + -64, 1); - SetTileType(644, param_1 + -64, 2); - SetTileType(638, param_1 + -63, 1); - SetTileType(645, param_1 + -63, 2); - SetTileType(639, param_1 + -1, 1); + SetTileType(636, param_1 - 65, 1); + SetTileType(643, param_1 - 65, 2); + SetTileType(637, param_1 - 64, 1); + SetTileType(644, param_1 - 64, 2); + SetTileType(638, param_1 - 63, 1); + SetTileType(645, param_1 - 63, 2); + SetTileType(639, param_1 - 1, 1); SetTileType(640, param_1, 1); SetTileType(642, param_1 + 1, 1); } void sub_0807B930(int param_1) { - SetTileType(652, param_1 + -65, 1); - SetTileType(659, param_1 + -65, 2); - SetTileType(653, param_1 + -64, 1); - SetTileType(660, param_1 + -64, 2); - SetTileType(654, param_1 + -63, 1); - SetTileType(661, param_1 + -63, 2); - SetTileType(655, param_1 + -1, 1); + SetTileType(652, param_1 - 65, 1); + SetTileType(659, param_1 - 65, 2); + SetTileType(653, param_1 - 64, 1); + SetTileType(660, param_1 - 64, 2); + SetTileType(654, param_1 - 63, 1); + SetTileType(661, param_1 - 63, 2); + SetTileType(655, param_1 - 1, 1); SetTileType(656, param_1, 1); SetTileType(658, param_1 + 1, 1); } diff --git a/src/sub_0807CA18.c b/src/sub_0807CA18.c new file mode 100644 index 00000000..7dd5603a --- /dev/null +++ b/src/sub_0807CA18.c @@ -0,0 +1,41 @@ +#include "global.h" +#include "structures.h" +#include "save.h" +#include "utils.h" + +u8 sub_0807CA18() { + if (gSave.unk_00 != 0x00 || gSave.unk_01 != 1) { + gSave.unk_00 = 0; + gSave.unk_01 = 1; + gSave.unk8 = 1; + gSave.stats.health = 0x18; + gSave.stats.maxHealth = 0x18; + gSave.unk_88 = 0x22; + gSave.unk_89 = 0x15; + gSave.unk_8A = 0; + gSave.unk_8B = 0; + gSave.unk_8F = 1; + gSave.unk_8C = 0x90; + gSave.unk_8E = 0x38; + } + if (gSave.playerName[0] == 0) { + MemCopy(gUnk_0811E470, &gSave.playerName, 5); + } +#ifdef DEMO_USA + { + const u8* tmp; + MemCopy(demoPointers[gSaveHeader->saveFileId], &gSave, 0x4B4); + if (gSaveHeader->gameLanguage == 0) { + gSave.playerName[0] = 0x97; + gSave.playerName[1] = 0x7F; + gSave.playerName[2] = 0xDD; + gSave.playerName[3] = 0; + } + ModHealth(0xA0); + ModRupees(-9999); + tmp = demoUnknown1 + gUnk_02000010.field_0x7 * 3; + gSave.unk_4a8 = tmp[gSaveHeader->saveFileId] * 3600; + } +#endif + return 1; +} diff --git a/src/sub_080A554C.c b/src/sub_080A554C.c index 4ec59e7f..dffcbab0 100644 --- a/src/sub_080A554C.c +++ b/src/sub_080A554C.c @@ -11,7 +11,7 @@ u32 sub_080A554C(u32 arg0) { if (arg0 != 0) { for (i = 0; i < 17; i++) { - if (arg0 == (&gUnk_02000090)[i]) + if (arg0 == gMenu.focusCoords[i]) return i; } } diff --git a/src/sub_08127D30.c b/src/sub_08127D30.c index 32887106..13b6839b 100644 --- a/src/sub_08127D30.c +++ b/src/sub_08127D30.c @@ -3,8 +3,5 @@ extern u8 gAreaMetadata[69]; u32 sub_08052654(u32 r0) { - // u32 r1 = gAreaMetadata; - // u32 r1 = gAreaMetadata; - return gAreaMetadata[r0 * 4] == 129; } diff --git a/src/textbox.c b/src/textbox.c index 01b7bbae..71da7228 100644 --- a/src/textbox.c +++ b/src/textbox.c @@ -8,74 +8,96 @@ #include "structures.h" #include "save.h" -#define TEXTBOX_ADVANCE_KEYS (A_BUTTON | B_BUTTON | DPAD_ANY | R_BUTTON) -#define TEXTBOX_PRESS_ANY_ADVANCE_KEYS ((gInput.newKeys & TEXTBOX_ADVANCE_KEYS) != 0) +#define MESSAGE_ADVANCE_KEYS (A_BUTTON | B_BUTTON | DPAD_ANY | R_BUTTON) +#define MESSAGE_PRESS_ANY_ADVANCE_KEYS ((gInput.newKeys & MESSAGE_ADVANCE_KEYS) != 0) -#define TEXTBOX_WIDTH 0x20 -#define TEXTBOX_POSITION_INDEX(window) ((window).yPos * TEXTBOX_WIDTH + (window).xPos) +#define MESSAGE_WIDTH 0x20 +#define MESSAGE_POSITION_INDEX(window) ((window).yPos * MESSAGE_WIDTH + (window).xPos) + +#define MESSAGE_PALETTE 0xF + +// todo: move this to a shared header for ui tiles +enum { + MSG_BORDER_CORNER = 0x7B, + MSG_BORDER_H_CORNER = 0x7C, + MSG_BORDER_H_STRAIGHT = 0x7D, + MSG_BORDER_V_CORNER = 0x7E, + MSG_BORDER_V_STRAIGHT = 0x7F, + MSG_CURSOR = 0x80, + MSG_BACKGROUND = 0x81, + MSG_TEXT_LINE1TOP = 0x82, + MSG_TEXT_LINE1BOTTOM = 0x83, + MSG_TEXT_LINE2TOP = 0xb6, + MSG_TEXT_LINE2BOTTOM = 0xb7, +}; extern void WriteBit(u32*, u32); -extern void sub_0805EF40(u8*, u8*); -extern void sub_0801C4A0(u32, u32); -extern void sub_0801C494(void); +extern void sub_0805EF40(Token* tok, const u8*); +extern void RecoverUI(u32 bottomPt, u32 topPt); +extern void RefreshUI(void); extern void sub_0805F918(u32, u32, u32); extern u32 sub_0801D51C(u32, u8*, u32); u32 sub_08056FEC(u32, u8*); - -u16 sub_08056750(CurrentTextBox*); -u32 sub_0805EFE8(u8*); -void sub_08056ABC(u32, u32); -void sub_080569C4(CurrentTextBox*, u32); +u32 GetCharacter(Token* tok); +extern void sub_0805EEB4(Token* tok, u32 textIdx); u16 sub_0805F7DC(u32, u8*); -u32 sub_GetFontStrWidth(u8*, u32); -void sub_08056FBC(CurrentTextBox*); -void SetDoTextBox(u32 doTextbox); -void Load_02000D00_Asyc(void); +u32 GetFontStrWith(u8*, u32); -void DeleteWindow(void); -void CreateWindow(void); -u32 CalcWindowSize(u32 fade); +static void StatusUpdate(u32 status); -void DispMessageFrame(u16*, u32, u32, u32); -void DispString(void); -void DispCursor(void); +static u16 RunTextCommand(TextRender* this); +static void PaletteChange(TextRender* this, u32 id); +static void SwitchChoice(u32 to, u32 from); -typedef u32 (*TextBoxFunction)(void); +static void MsgChangeLine(u32 lineNo); +static void SetDoTextBox(u32 doTextbox); -u32 TextBoxFunction0(void); -u32 TextBoxFunction1(void); -u32 HandleTextBox(void); -u32 TextBoxFunctionOpen(void); -u32 TextBoxFunctionClose(void); -u32 TextBoxFunction5(void); +static void DeleteWindow(void); +static u32 ChangeWindowSize(u32 delta); +static void CreateWindow(void); -const TextBoxFunction gTextBoxFunctions[] = { - TextBoxFunction0, TextBoxFunction1, HandleTextBox, TextBoxFunctionOpen, TextBoxFunctionClose, TextBoxFunction5, -}; +static void DispString(void); +static void DispCursor(void); +static void DrawCanvasLine(void); +static void sub_08056F88(u32, u32); +static void sub_08056FBC(TextRender*); -extern u8 gUnk_020227DC, gUnk_020227E8, gUnk_020227F0, gUnk_020227F8, gUnk_02022800; -u8* const gUnk_08107BE0[] = { - &gUnk_020227DC, &gUnk_020227E8, &gUnk_020227F0, &gUnk_020227F8, &gUnk_02022800, -}; +typedef u32 (*MessageFunction)(void); +static u32 MsgIdle(void); +static u32 MsgInit(void); +static u32 MsgUpdate(void); +static u32 MsgOpen(void); +static u32 MsgClose(void); +static u32 MsgDie(void); +typedef enum { + MSG_IDLE, + MSG_INIT, + MSG_UPDATE, + MSG_OPEN, + MSG_CLOSE, + MSG_DIE, +} MessageStatus; -typedef void (*TextBoxHandler)(CurrentTextBox*); - -void TextBoxHandler0(CurrentTextBox* this); -void TextBoxHandler1(CurrentTextBox* param_1); -void TextBoxHandlerAdvance(CurrentTextBox* ctb); -void TextBoxHandlerNextBox(CurrentTextBox* ctb); -void TextBoxHandler4(CurrentTextBox* ctb); -void TextBoxHandlerQuestion(CurrentTextBox* ctb); - -const TextBoxHandler gTextBoxHandlers[] = { - TextBoxHandler0, TextBoxHandler1, TextBoxHandlerAdvance, - TextBoxHandlerNextBox, TextBoxHandler4, TextBoxHandlerQuestion, -}; +typedef void (*TextRenderFunction)(TextRender*); +static void TextDispInit(TextRender* this); +static void TextDispUpdate(TextRender* this); +static void TextDispDie(TextRender* this); +static void TextDispWait(TextRender* this); +static void TextDispRoll(TextRender* this); +static void TextDispEnquiry(TextRender* this); +typedef enum { + RENDER_INIT, + RENDER_UPDATE, + RENDER_DIE, + RENDER_WAIT, + RENDER_ROLL, + RENDER_ENQUIRY, +} TextRenderStatus; typedef struct Window { u8 unk0; - u8 unk1; + u8 active; u8 unk2; u8 unk3; u8 xPos; @@ -89,658 +111,660 @@ extern Window gNewWindow; extern struct { u8 unk_00; u8 unk_01[1]; - s8 unk_02; - s8 unk_03; + s8 choiceCount; + s8 currentChoice; u8 unk_04[4]; u16 unk_08[4]; u16 unk_10[4]; -} gUnk_02024030; +} gMessageChoices; -extern u32 gUnk_0200005C; - -extern u8 gUnk_020227A0; -extern u8 gUnk_02000D00[0xD00]; - -extern const u8 gUnk_08107C0C[]; +extern u8 gTextGfxBuffer[0xD00]; s32 sub_08056338(void) { s32 result; result = -1; - if (((gTextBox.doTextBox & 0x7f) == 0) && (gUnk_02000040.unk_00 == 3)) + if (((gMessage.doTextBox & 0x7f) == 0) && (gUnk_02000040.unk_00 == 3)) result = gUnk_02000040.unk_01; return result; } -void sub_08056360(void) { - if ((gTextBox.doTextBox & 0x7f) != 0) { - gTextBox.doTextBox = 0x88; +void MessageClose(void) { + if ((gMessage.doTextBox & 0x7f) != 0) { + gMessage.doTextBox = 0x88; } } -void TextboxNoOverlapFollow(u32 index) { +void MessageFromTarget(u32 index) { if (gRoomControls.cameraTarget != NULL) { - TextboxNoOverlap(index, gRoomControls.cameraTarget); + MessageNoOverlap(index, gRoomControls.cameraTarget); } else { - ShowTextbox(index); + MessageRequest(index); } } -void TextboxNoOverlap(u32 index, Entity* entity) { +void MessageNoOverlap(u32 index, Entity* entity) { s16 y; s16 height; - ShowTextbox(index); + MessageRequest(index); y = entity->y.HALF.HI; height = entity->height.HALF.HI; if (((y + height) - gRoomControls.roomScrollY) > 0x58) { - gTextBox.textWindowPosY = 1; + gMessage.textWindowPosY = 1; } } -void TextBoxAtYPosition(u32 index, u32 y) { - TextboxAtPosition(index, 1, y); +void MessageAtHeight(u32 index, u32 y) { + MessageAtPos(index, 1, y); } -void TextboxAtPosition(u32 index, u32 x, u32 y) { - ShowTextbox(index); - gTextBox.textWindowPosX = x; - gTextBox.textWindowPosY = y; +void MessageAtPos(u32 index, u32 x, u32 y) { + MessageRequest(index); + gMessage.textWindowPosX = x; + gMessage.textWindowPosY = y; } -void ShowTextbox(u32 index) { - MemClear(&gTextBox, sizeof(gTextBox)); - gTextBox.textIndex = index; - gTextBox.textSpeed = 99; - gTextBox.textWindowWidth = 26; - gTextBox.textWindowHeight = 4; - gTextBox.textWindowPosX = 1; - gTextBox.textWindowPosY = 12; - gTextBox.doTextBox = 1; +void MessageRequest(u32 index) { + MemClear(&gMessage, sizeof(gMessage)); + gMessage.textIndex = index; + gMessage.textSpeed = 99; + gMessage.textWindowWidth = 26; + gMessage.textWindowHeight = 4; + gMessage.textWindowPosX = 1; + gMessage.textWindowPosY = 12; + gMessage.doTextBox = 1; } void MessageInitialize(void) { - MemClear(&gTextBox, sizeof(gTextBox)); - MemClear(&gCurrentTextBox, sizeof(gCurrentTextBox)); + MemClear(&gMessage, sizeof(gMessage)); + MemClear(&gTextRender, sizeof(gTextRender)); MemClear(&gNewWindow, sizeof(gNewWindow)); MemClear(&gCurrentWindow, sizeof(gCurrentWindow)); MemClear(&gUnk_02000040, 4); } -void MessageUpdate(void) { - int iVar1; +void MessageMain(void) { + static const MessageFunction gMessageFunctions[] = { + [MSG_IDLE] = MsgIdle, [MSG_INIT] = MsgInit, [MSG_UPDATE] = MsgUpdate, + [MSG_OPEN] = MsgOpen, [MSG_CLOSE] = MsgClose, [MSG_DIE] = MsgDie, + }; - if (gTextBox.doTextBox == 1) { - MemClear((u32*)&gCurrentTextBox, sizeof(gCurrentTextBox)); - sub_080564C8(1); + if (gMessage.doTextBox == 1) { + MemClear((u32*)&gTextRender, sizeof(gTextRender)); + StatusUpdate(MSG_INIT); } - if (gCurrentTextBox._8a != 0) { - gCurrentTextBox._8a--; + if (gTextRender.newlineDelay != 0) { + gTextRender.newlineDelay--; } else { + int result; do { - iVar1 = gTextBoxFunctions[gCurrentTextBox._88](); - } while (iVar1 != 0); + result = gMessageFunctions[gTextRender.msgStatus](); + } while (result != 0); } - if (gCurrentTextBox._9d != 0) { - gCurrentTextBox._9d = 0; - Load_02000D00_Asyc(); + if (gTextRender.updateDraw) { + gTextRender.updateDraw = 0; + DrawCanvasLine(); } DeleteWindow(); CreateWindow(); } -void sub_080564C8(u32 unk) { - gCurrentTextBox._88 = unk; - gCurrentTextBox.state = 0; +static void StatusUpdate(MessageStatus status) { + gTextRender.msgStatus = status; + gTextRender.renderStatus = RENDER_INIT; } -u32 TextBoxFunction0(void) { - gCurrentTextBox._98.bytes.b1 = 0; +static u32 MsgIdle(void) { + gTextRender._98.bytes.b1 = 0; return 0; } +extern u8 gUnk_020227DC, gUnk_020227E8, gUnk_020227F0, gUnk_020227F8, gUnk_02022800; +u8* const gUnk_08107BE0[] = { + &gUnk_020227DC, &gUnk_020227E8, &gUnk_020227F0, &gUnk_020227F8, &gUnk_02022800, +}; + // regalloc in loop -NONMATCH("asm/non_matching/textbox/TextBoxFunction1.inc", u32 TextBoxFunction1(void)) { - u32 uVar1; +NONMATCH("asm/non_matching/textbox/TextBoxFunction1.inc", static u32 MsgInit(void)) { char* dest; u32 i; - char c; - MemClear((void*)&gNewWindow, 8); - MemClear((void*)&gUnk_02024030, 0x18); - MemClear((void*)&gCurrentTextBox, sizeof(gCurrentTextBox)); - MemCopy(&gTextBox, &gCurrentTextBox, sizeof(gTextBox)); - if (gCurrentTextBox.textBox.textSpeed == 0x63) { - gCurrentTextBox.textBox.textSpeed = gUnk_02000000->messageSpeed; + MemClear((void*)&gNewWindow, sizeof(gNewWindow)); + MemClear((void*)&gMessageChoices, sizeof(gMessageChoices)); + MemClear((void*)&gTextRender, sizeof(gTextRender)); + MemCopy(&gMessage, &gTextRender, sizeof(gMessage)); + if (gTextRender.message.textSpeed == 99) { + gTextRender.message.textSpeed = gSaveHeader->messageSpeed; } - gCurrentTextBox._9c = 0xff; - sub_0805EEB4(&gCurrentTextBox._20, gCurrentTextBox.textBox.textIndex); - gCurrentTextBox.playerName[0] = 2; - gCurrentTextBox.playerName[1] = 0xe; - dest = &gCurrentTextBox.playerName[2]; + gTextRender._9c = 0xff; + sub_0805EEB4(&gTextRender.curToken, gTextRender.message.textIndex); + gTextRender.playerName[0] = 2; + gTextRender.playerName[1] = 0xe; // Green text color + dest = &gTextRender.playerName[2]; for (i = 0; i < FILENAME_LENGTH; ++i) { - c = gSave.playerName[i]; + char c = gSave.playerName[i]; if (c == '\0') break; - *dest = c; - dest++; + *dest++ = c; } dest[0] = 2; - dest[1] = 15; - dest[2] = 0; - sub_08056FBC(&gCurrentTextBox); - gCurrentTextBox._2c = &gUnk_08107BE0; - gCurrentTextBox._50.unk8 = gUnk_02000D00; - gCurrentTextBox._50.unk4 = 0xd0; + dest[1] = 0xf; // White text color + dest[2] = '\0'; + sub_08056FBC(&gTextRender); + gTextRender.curToken._c = &gUnk_08107BE0; + gTextRender._50.unk8 = gTextGfxBuffer; + gTextRender._50.unk4 = 0xd0; SetDoTextBox(2); - sub_08056BDC(0); - sub_080564C8(2); + MsgChangeLine(0); + StatusUpdate(MSG_UPDATE); return 1; } END_NONMATCH -u32 TextBoxFunctionOpen(void) { - if (gCurrentTextBox.state == 0) { - gCurrentTextBox.state = 1; - gCurrentTextBox._98.bytes.b1 = 1; - sub_08056F88(gCurrentTextBox.textBox.unk3, gCurrentTextBox._50.unk3); +static u32 MsgOpen(void) { + if (gTextRender.renderStatus == RENDER_INIT) { + gTextRender.renderStatus = RENDER_UPDATE; + gTextRender._98.bytes.b1 = 1; + sub_08056F88(gTextRender.message.unk3, gTextRender._50.unk3); SoundReq(SFX_TEXTBOX_OPEN); } - if (CalcWindowSize(1)) { - gCurrentTextBox._98.bytes.b1 = 2; - sub_080564C8(2); + if (ChangeWindowSize(1)) { + gTextRender._98.bytes.b1 = 2; + StatusUpdate(MSG_UPDATE); } return 0; } -u32 TextBoxFunctionClose(void) { - if (gCurrentTextBox.state == 0) { - gCurrentTextBox.state = 1; - gCurrentTextBox._98.bytes.b1 = 3; - sub_08056BDC(0); +static u32 MsgClose(void) { + if (gTextRender.renderStatus == RENDER_INIT) { + gTextRender.renderStatus = RENDER_UPDATE; + gTextRender._98.bytes.b1 = 3; + MsgChangeLine(0); SoundReq(SFX_TEXTBOX_CLOSE); } - if (CalcWindowSize(-1)) { - gCurrentTextBox._98.bytes.b1 = 0; - sub_080564C8(2); + if (ChangeWindowSize(-1)) { + gTextRender._98.bytes.b1 = 0; + StatusUpdate(MSG_UPDATE); } return 0; } -u32 TextBoxFunction5(void) { +static u32 MsgDie(void) { SetDoTextBox(0); - sub_080564C8(0); + StatusUpdate(MSG_IDLE); return 0; } -u32 HandleTextBox(void) { +static u32 MsgUpdate(void) { + static const TextRenderFunction gTextDispFunctions[] = { + [RENDER_INIT] = TextDispInit, [RENDER_UPDATE] = TextDispUpdate, [RENDER_DIE] = TextDispDie, + [RENDER_WAIT] = TextDispWait, [RENDER_ROLL] = TextDispRoll, [RENDER_ENQUIRY] = TextDispEnquiry, + }; + SetDoTextBox(4); - gTextBoxHandlers[gCurrentTextBox.state](&gCurrentTextBox); - CalcWindowSize(0); + gTextDispFunctions[gTextRender.renderStatus](&gTextRender); + ChangeWindowSize(0); return 0; } -void TextBoxHandler0(CurrentTextBox* this) { - if ((gCurrentTextBox._20 & 1) == 0) { - if (gCurrentTextBox._98.bytes.b1 == 0) { - sub_080564C8(5); +static void TextDispInit(TextRender* this) { + if ((gTextRender.curToken.flags & 1) == 0) { + if (gTextRender._98.bytes.b1 == 0) { + StatusUpdate(MSG_DIE); } } else { - this->state = 1; + this->renderStatus = RENDER_UPDATE; } } -void TextBoxHandler1(CurrentTextBox* param_1) { - u32 uVar3; - s32 iVar4; - int iVar5; - int iVar6; +static void TextDispUpdate(TextRender* this) { + static const u8 speeds[] = { 5, 3, 1 }; + u32 speedModifier; + s32 numCharsToRead, pxDrawn; - if (param_1->_95 != 0) { - param_1->_95--; + if (this->delay != 0) { + this->delay--; + return; + } + + if ((gInput.heldKeys & B_BUTTON) != 0) { + speedModifier = 8; } else { - if ((gInput.heldKeys & B_BUTTON) != 0) { - iVar4 = 8; - } else { - iVar4 = 1; - } - param_1->_92 -= iVar4; - if (param_1->_92 < 1) { - iVar5 = 0; - do { - iVar5++; - param_1->_92 += gUnk_08107C0C[param_1->textBox.textSpeed]; - } while (param_1->_92 < 1); - iVar6 = 0; - do { - uVar3 = sub_08056750(param_1); - if (((uVar3 == 0) || (param_1->_95 != 0)) || (param_1->_8a != 0)) - break; - iVar6 += uVar3; - iVar5--; - } while (0 < iVar5); - if (iVar6 != 0) { - gCurrentTextBox._9d = 1; - } else { - param_1->_92 = 0; - } - } + speedModifier = 1; + } + this->typeSpeed -= speedModifier; + + if (this->typeSpeed > 0) { + return; + } + + numCharsToRead = 0; + do { + numCharsToRead++; + this->typeSpeed += speeds[this->message.textSpeed]; + } while (this->typeSpeed <= 0); + + pxDrawn = 0; + do { + u32 pxCnt = RunTextCommand(this); + if (pxCnt == 0 || this->delay != 0 || this->newlineDelay != 0) + break; + pxDrawn += pxCnt; + numCharsToRead--; + } while (0 < numCharsToRead); + + if (pxDrawn != 0) { + gTextRender.updateDraw = 1; + } else { + this->typeSpeed = 0; } } -NONMATCH("asm/non_matching/textbox/sub_08056750.inc", u16 sub_08056750(CurrentTextBox* param_1)) { - s32 r0, r1, r2, r3; - u32 r7; - s32 tmp; - u32 t; - u32* t2; +NONMATCH("asm/non_matching/textbox/sub_08056750.inc", static u16 RunTextCommand(TextRender* this)) { + s32 palette; + u32 chr = this->curToken.extended; - r7 = param_1->_24; - - if (r7 == 0) { - r7 = sub_0805EFE8(¶m_1->_20); - switch (r7) { + if (chr == 0) { + s32 r1; + chr = GetCharacter(&this->curToken); + switch (chr) { case 0: if (gUnk_02000040.unk_00 == 1) { - param_1->state = 5; - sub_08056ABC(0, 0); + this->renderStatus = RENDER_ENQUIRY; + SwitchChoice(0, 0); } else { - param_1->state = 2; + this->renderStatus = RENDER_DIE; } break; case 1: - param_1->_8a = 2; - if (param_1->_98.bytes.b0 == 0) { - sub_08056BDC(1); + this->newlineDelay = 2; + if (this->_98.bytes.lineNo == 0) { + MsgChangeLine(1); } else { - param_1->state = 3; + this->renderStatus = RENDER_WAIT; } break; case 2: - sub_080564C8(3); + StatusUpdate(MSG_OPEN); break; case 3: - sub_080564C8(4); + StatusUpdate(MSG_CLOSE); break; case 4: - param_1->_50.unk6 += - (param_1->_50.unk4 - param_1->_50.unk6 - sub_GetFontStrWidth(¶m_1->_20, 0)) / 2; + this->_50.unk6 += (this->_50.unk4 - this->_50.unk6 - GetFontStrWith(&this->curToken.flags, 0)) / 2; break; case 5: - gTextBox.unk = param_1->_22; + gMessage.unk = this->curToken.param; break; case 6: - t2 = &gUnk_0200005C; - t = param_1->_22; - WriteBit(t2, 0x1f & t); + WriteBit(&gMessage.field_0xc, this->curToken.param & 0x1f); break; case 7: - switch (param_1->_22) { + switch (this->curToken.param) { case 0xe: - param_1->_91 = param_1->_8f; - r3 = 2; + this->_91 = this->_8f; + palette = 2; break; case 0xf: - r3 = param_1->_91; + palette = this->_91; break; default: - r3 = param_1->_22; + palette = this->curToken.param; break; } - param_1->_90 = 0; - sub_080569C4(param_1, r3); + this->_90 = 0; + PaletteChange(this, palette); break; case 8: - SoundReq(param_1->_22); + SoundReq(this->curToken.param); break; case 9: - gCurrentTextBox.textBox.unk3 = param_1->_22; - sub_08056F88(param_1->_22, param_1->_50.unk3); + gTextRender.message.unk3 = this->curToken.param; + sub_08056F88(this->curToken.param, this->_50.unk3); break; case 10: - param_1->textBox.textWindowPosY = param_1->_22; + this->message.textWindowPosY = this->curToken.param; break; case 12: if (gUnk_02000040.unk_00 != 1) { MemClear(&gUnk_02000040, 4); - MemClear(&gUnk_02024030, sizeof(gUnk_02024030)); - gUnk_02024030.unk_00 = 1; + MemClear(&gMessageChoices, sizeof(gMessageChoices)); + gMessageChoices.unk_00 = 1; gUnk_02000040.unk_00 = 1; } - if (gUnk_02024030.unk_02 > 3) + if (gMessageChoices.choiceCount > 3) break; - gUnk_02024030.unk_10[gUnk_02024030.unk_02] = param_1->_26; - gUnk_02024030.unk_08[gUnk_02024030.unk_02] = param_1->_50.unk6; - gUnk_02024030.unk_02++; - param_1->_50.unk6 += 8; + gMessageChoices.unk_10[gMessageChoices.choiceCount] = this->curToken._6; + gMessageChoices.unk_08[gMessageChoices.choiceCount] = this->_50.unk6; + gMessageChoices.choiceCount++; + this->_50.unk6 += 8; break; case 13: - switch (param_1->_22) { + switch (this->curToken.param) { case 0xff: - param_1->_8e = 1; + this->_8e = 1; break; case 0xfe: - param_1->_8e = 2; + this->_8e = 2; break; default: - param_1->_95 = param_1->_22; + this->delay = this->curToken.param; break; } break; case 14: - r1 = param_1->_22; - param_1->_94 = r1; + r1 = this->curToken.param; + this->_94 = r1; break; default: break; } - if (r7 >> 8 == 0) + if (chr >> 8 == 0) return 0; } - if (gCurrentTextBox._98.bytes.b1 != 2) { - sub_080564C8(3); + if (gTextRender._98.bytes.b1 != 2) { + StatusUpdate(MSG_OPEN); return 0; } - if (gTextBox.unk == 0) { - gTextBox.unk = 0x80; + if (gMessage.unk == 0) { + gMessage.unk = 0x80; } - param_1->_24 = 0; - if (r7 >> 8 == 7) { - param_1->_90 = param_1->_8f | 0x80; - sub_080569C4(param_1, 0); + this->curToken.extended = '\0'; + if (chr >> 8 == 7) { + this->_90 = this->_8f | 0x80; + PaletteChange(this, 0); } else { - if ((param_1->_90 & 0x80) != 0) { - r3 = param_1->_90; - param_1->_90 = 0; - sub_080569C4(param_1, r3); + if ((this->_90 & 0x80) != 0) { + palette = this->_90; + this->_90 = 0; + PaletteChange(this, palette); } } - return sub_0805F7DC(r7, ¶m_1->_30[0x20]); + return sub_0805F7DC(chr, &this->_50.unk0); } END_NONMATCH -void sub_080569C4(CurrentTextBox* ctb, u32 unk) { - u32 temp = unk & 0x7; - ctb->_8f = temp; - ctb->_50.unk2 = temp; +static void PaletteChange(TextRender* this, u32 id) { + u32 temp = id % 8; + this->_8f = temp; + this->_50.unk2 = temp; } -extern u8 gUnk_08107C14; -extern u8 gUnk_08107C0F; +const u8 gUnk_08107C0F[] = { 0x8, 0x1e, 0x4, 0x12, 0x0 }; +const u8 gUnk_08107C14[] = { 0x8, 0x1e, 0x8, 0xFE, 0x0 }; #ifdef EU -ASM_FUNC("asm/non_matching/eu/TextBoxHandlerQuestion.inc", void TextBoxHandlerQuestion(CurrentTextBox* ctb)) +ASM_FUNC("asm/non_matching/eu/TextBoxHandlerQuestion.inc", static void TextDispEnquiry(TextRender* ctb)) #else -void TextBoxHandlerQuestion(CurrentTextBox* ctb) { - s32 r1, r5, r6; - u32 error; - u8* ptr1; - u8* ptr2; +static void TextDispEnquiry(TextRender* this) { + s32 nextTextIdx, choiceIdx, lastChoice; + u32 doSwitch; + const u8* src; - r5 = gUnk_02024030.unk_03; + choiceIdx = gMessageChoices.currentChoice; switch (gInput.newKeys) { case START_BUTTON: case A_BUTTON: - r1 = gUnk_02024030.unk_10[r5]; - if (r1 == 0) { - ptr2 = &gUnk_08107C14; - ptr1 = &ctb->_20; + nextTextIdx = gMessageChoices.unk_10[choiceIdx]; + if (nextTextIdx == 0) { + src = gUnk_08107C14; } else { - ctb->textBox.textIndex = r1; - sub_0805EEB4(&ctb->_20, r1); - ptr2 = &gUnk_08107C0F; - ptr1 = &ctb->_20; + this->message.textIndex = nextTextIdx; + sub_0805EEB4(&this->curToken, nextTextIdx); + src = gUnk_08107C0F; } - sub_0805EF40(ptr1, ptr2); - gUnk_02000040.unk_01 = gUnk_02024030.unk_03; + sub_0805EF40(&this->curToken, src); + gUnk_02000040.unk_01 = gMessageChoices.currentChoice; gUnk_02000040.unk_00 = 3; - MemClear(&gUnk_02024030, sizeof(gUnk_02024030)); - SoundReq(0x6a); // SFX_TEXTBOX_SELECT - ctb->state = 1; + MemClear(&gMessageChoices, sizeof(gMessageChoices)); + SoundReq(SFX_TEXTBOX_SELECT); + this->renderStatus = RENDER_UPDATE; break; case DPAD_LEFT: - r5--; + choiceIdx--; break; case DPAD_RIGHT: - r5++; + choiceIdx++; break; default: break; } - r5 = (r5 + gUnk_02024030.unk_02) % gUnk_02024030.unk_02; - r6 = gUnk_02024030.unk_03; - if (r5 != r6) { - gUnk_02024030.unk_03 = r5; - SoundReq(0x69); // SFX_TEXTBOX_CHOICE - error = 1; + choiceIdx = (choiceIdx + gMessageChoices.choiceCount) % gMessageChoices.choiceCount; + lastChoice = gMessageChoices.currentChoice; + if (choiceIdx != lastChoice) { + gMessageChoices.currentChoice = choiceIdx; + SoundReq(SFX_TEXTBOX_CHOICE); + doSwitch = 1; } else { - error = 0; + doSwitch = 0; } if (gUnk_02000040.unk_00 == 1) { - gUnk_02024030.unk_00 = gUnk_02000040.unk_00 = 2; - error = 1; + gMessageChoices.unk_00 = gUnk_02000040.unk_00 = 2; + doSwitch = 1; } - if (error != 0) { - sub_08056ABC(r5, r6); + if (doSwitch) { + SwitchChoice(choiceIdx, lastChoice); } } -void sub_08056ABC(u32 unk_0, u32 unk_1) { +static void SwitchChoice(u32 to, u32 from) { u16 t; - t = gCurrentTextBox._50.unk6; - gCurrentTextBox._50.unk6 = gUnk_02024030.unk_08[unk_1]; - sub_0805F8E4(0, &gCurrentTextBox._50); - gCurrentTextBox._50.unk6 = gUnk_02024030.unk_08[unk_0]; - sub_0805F8E4(1, &gCurrentTextBox._50); - gCurrentTextBox._50.unk6 = t; - gCurrentTextBox._9d = 1; + t = gTextRender._50.unk6; + gTextRender._50.unk6 = gMessageChoices.unk_08[from]; + sub_0805F8E4(0, &gTextRender._50); + gTextRender._50.unk6 = gMessageChoices.unk_08[to]; + sub_0805F8E4(1, &gTextRender._50); + gTextRender._50.unk6 = t; + gTextRender.updateDraw = 1; } #endif -void TextBoxHandlerNextBox(CurrentTextBox* ctb) { - u32 t; - u8* ptr; - gTextBox.unk = 0; - if (ctb->_94 != 0) { - ctb->_94--; - if (ctb->_94 != 0) - return; - ptr = &ctb->state; - t = 4; - } else { - if (TEXTBOX_PRESS_ANY_ADVANCE_KEYS) { - SoundReq(0x68); // SFX_TEXTBOX_SWAP - ctb->_98.bytes.b2 = 0; - ptr = &ctb->state; - t = 4; - } else { - ptr = &ctb->_98.bytes.b2; - t = *ptr + 1; +static void TextDispWait(TextRender* this) { + gMessage.unk = 0; + if (this->_94 != 0) { + if (--this->_94 == 0) { + this->renderStatus = RENDER_ROLL; } - } - *ptr = t; -} - -void TextBoxHandler4(CurrentTextBox* ctb) { - sub_08056BDC(0); - sub_080569C4(ctb, ctb->_8f | 0x40); - ctb->state = 1; -} - -void TextBoxHandlerAdvance(CurrentTextBox* ctb) { - gTextBox.unk = 0; - SetDoTextBox(7); - if ((ctb->_8e != 1) && (ctb->_8e == 2 || TEXTBOX_PRESS_ANY_ADVANCE_KEYS)) { - sub_080564C8(4); - } -} - -void sub_08056BDC(u32 unk) { - gCurrentTextBox._98.bytes.b0 = unk; - if (unk == 0) { - MemFill32(0xFFFFFFFF, gUnk_02000D00, sizeof(gUnk_02000D00)); - Load_02000D00_Asyc(); - gCurrentTextBox._9e = 0xf082; - gCurrentTextBox._a0 = 0xf083; - gCurrentTextBox._a2 = 0xf0b6; - gCurrentTextBox._a4 = 0xf0b7; - gCurrentTextBox._50.unk6 = 0; - gCurrentTextBox._50.unk4 = 0xd0; + } else if (MESSAGE_PRESS_ANY_ADVANCE_KEYS) { + SoundReq(SFX_TEXTBOX_SWAP); + this->_98.bytes.b2 = 0; + this->renderStatus = RENDER_ROLL; } else { - gCurrentTextBox._50.unk6 = 0xd0; - gCurrentTextBox._50.unk4 = 0x1a0; + this->_98.bytes.b2++; } - sub_080569C4(&gCurrentTextBox, gCurrentTextBox._8f | 0x40); } -void SetDoTextBox(u32 doTextbox) { - gTextBox.doTextBox = gCurrentTextBox.textBox.doTextBox = doTextbox; +static void TextDispRoll(TextRender* this) { + MsgChangeLine(0); + PaletteChange(this, this->_8f | 0x40); + this->renderStatus = RENDER_UPDATE; } -void DeleteWindow(void) { - u16* ptr; - int i, j; +static void TextDispDie(TextRender* this) { + gMessage.unk = 0; + SetDoTextBox(7); + if ((this->_8e != 1) && (this->_8e == 2 || MESSAGE_PRESS_ANY_ADVANCE_KEYS)) { + StatusUpdate(MSG_CLOSE); + } +} +static void MsgChangeLine(u32 lineNo) { + gTextRender._98.bytes.lineNo = lineNo; + if (lineNo == 0) { + MemFill32(0xFFFFFFFF, gTextGfxBuffer, sizeof(gTextGfxBuffer)); + DrawCanvasLine(); + gTextRender.beginTiles[0] = (MESSAGE_PALETTE << 12) | MSG_TEXT_LINE1TOP; + gTextRender.beginTiles[1] = (MESSAGE_PALETTE << 12) | MSG_TEXT_LINE1BOTTOM; + gTextRender.beginTiles[2] = (MESSAGE_PALETTE << 12) | MSG_TEXT_LINE2TOP; + gTextRender.beginTiles[3] = (MESSAGE_PALETTE << 12) | MSG_TEXT_LINE2BOTTOM; + gTextRender._50.unk6 = 0; + gTextRender._50.unk4 = 0xd0; + } else { + gTextRender._50.unk6 = 0xd0; + gTextRender._50.unk4 = 0x1a0; + } + PaletteChange(&gTextRender, gTextRender._8f | 0x40); +} + +static void SetDoTextBox(u32 doTextbox) { + gMessage.doTextBox = gTextRender.message.doTextBox = doTextbox; +} + +static void DeleteWindow(void) { Window* window = &gCurrentWindow; - - if (window->unk1 != 0) { - window->unk1 = 0; - ptr = &gBG0Buffer[TEXTBOX_POSITION_INDEX(*window)]; + if (window->active) { + u16* ptr; + int i; + window->active = 0; + ptr = &gBG0Buffer[MESSAGE_POSITION_INDEX(*window)]; i = window->height + 2; do { - j = 0; + int j = 0; do { ptr[j] = 0; } while (j++, j < window->width + 2); - ptr += TEXTBOX_WIDTH; + ptr += MESSAGE_WIDTH; i--; } while (i > 0); - sub_0801C4A0(window->yPos, window->height); - sub_0801C494(); + RecoverUI(window->yPos, window->height); + RefreshUI(); } } -u32 CalcWindowSize(u32 fade) { - u32 scale; - u32 ret; +static u32 ChangeWindowSize(u32 delta) { Window* window; + u32 result = 0; - ret = 0; + gTextRender._98.bytes.sizeScale += delta; - gCurrentTextBox._98.bytes.sizeScale += fade; - if (gCurrentTextBox._98.bytes.sizeScale < 1) { - gCurrentTextBox._98.bytes.sizeScale = 0; - } else { - if (gCurrentTextBox._98.bytes.sizeScale < 8) - goto LAB_08056cee; - gCurrentTextBox._98.bytes.sizeScale = 8; + if (gTextRender._98.bytes.sizeScale < 1) { + gTextRender._98.bytes.sizeScale = 0; + result = 1; + } else if (gTextRender._98.bytes.sizeScale >= 8) { + gTextRender._98.bytes.sizeScale = 8; + result = 1; } - ret = 1; -LAB_08056cee: + window = &gNewWindow; - if (gCurrentTextBox._98.bytes.sizeScale != 0) { - scale = gCurrentTextBox._98.bytes.sizeScale; - window->width = (scale * (gCurrentTextBox.textBox.textWindowWidth << 1)) / 16; + if (gTextRender._98.bytes.sizeScale != 0) { + u32 scale = gTextRender._98.bytes.sizeScale; + window->width = (scale * (gTextRender.message.textWindowWidth << 1)) / 16; if ((window->width & 1) != 0) { window->width++; } - window->xPos = ((gCurrentTextBox.textBox.textWindowWidth / 2) + gCurrentTextBox.textBox.textWindowPosX) - - (window->width / 2); + window->xPos = + ((gTextRender.message.textWindowWidth / 2) + gTextRender.message.textWindowPosX) - (window->width / 2); - window->height = (scale * (gCurrentTextBox.textBox.textWindowHeight << 1)) / 16; + window->height = (scale * (gTextRender.message.textWindowHeight << 1)) / 16; if ((window->height & 1) != 0) { window->height++; } - window->yPos = ((gCurrentTextBox.textBox.textWindowHeight / 2) + gCurrentTextBox.textBox.textWindowPosY) - - (window->height / 2); + window->yPos = + ((gTextRender.message.textWindowHeight / 2) + gTextRender.message.textWindowPosY) - (window->height / 2); } else { window->yPos = -1; window->xPos = -1; window->height = -1; window->width = -1; } - window->unk1 = 1; - return ret; + window->active = 1; + return result; } -void CreateWindow(void) { - s32 r0, r3; +static void CreateWindow(void) { + s32 borderBeginTile; u16* ptr; - r0 = gCurrentTextBox._98.bytes.sizeScale; - if (r0 <= 0) + if (gTextRender._98.bytes.sizeScale <= 0) return; - ptr = &gBG0Buffer[TEXTBOX_POSITION_INDEX(gNewWindow)]; - r3 = 0xf07b; - DispMessageFrame(ptr, gNewWindow.width, gNewWindow.height, r3); + ptr = &gBG0Buffer[MESSAGE_POSITION_INDEX(gNewWindow)]; + borderBeginTile = (MESSAGE_PALETTE << 12) | MSG_BORDER_CORNER; + DispMessageFrame(ptr, gNewWindow.width, gNewWindow.height, borderBeginTile); DispString(); DispCursor(); gCurrentWindow = gNewWindow; - sub_0801C494(); + RefreshUI(); } +// Also used by figurine menu ASM_FUNC("asm/non_matching/textbox/DispMessageFrame.inc", void DispMessageFrame(u16* buffer, u32 width_, u32 height_, u32 flags_)) extern u16 gUnk_02034CB2[]; extern u16 gUnk_0202281E[]; -void DispString(void) { - u32 r0, r2, r4; - u16 *ptr, *ptr2; - s32 i, j; +/* + Each character is two tiles tall. + They are stored in VRAM in the following order: + + 82 84 86 --> | | |\| |/ + 83 85 87 --> |_ | | \ |\ + + b6 b8 ba --> | | | + b7 b9 bb --> . . . + + There are 2 lines of text available, and each line is 20 chars long, + So the canvas is 20x4 tiles. +*/ + +static void DispString(void) { + u32 r0, tileAttr; + u16 *buf, *line; + s32 i, w, h; Window* window = &gNewWindow; if (window->width != 0) { if (window->height != 0) { - r4 = window->height; - ptr = &gUnk_02034CB2[TEXTBOX_POSITION_INDEX(*window)]; - i = (s32)(4 - r4) / 2; + h = window->height; + buf = &gBG0Buffer[MESSAGE_POSITION_INDEX(*window) + 1]; + i = (4 - h) / 2; do { - j = window->width; - r2 = gUnk_0202281E[i]; - ptr += TEXTBOX_WIDTH; + //! @bug abnormally big width causes tile idx to overwrite other tile attributes + w = window->width; + tileAttr = gTextRender.beginTiles[i]; + buf += MESSAGE_WIDTH; r0 = i + 1; - r4--; - ptr2 = ptr; + h--; + line = buf; do { - *ptr2 = r2; - ptr2++; - r2 += 2; - j--; - } while (j > 0); + *line = tileAttr; + line++; + tileAttr += 2; + w--; + } while (w > 0); i = r0; - } while (r4 != 0); + } while (h != 0); } } } -void DispCursor(void) { +static void DispCursor(void) { u32 offset; u16* ptr; - if ((gCurrentTextBox._98.word & 0x10ff00) == 0x100200) { - ptr = &gBG0Buffer[TEXTBOX_POSITION_INDEX(gNewWindow)]; - offset = (((gNewWindow.height + 1) * TEXTBOX_WIDTH) - 2); + if ((gTextRender._98.word & 0x10ff00) == 0x100200) { + ptr = &gBG0Buffer[MESSAGE_POSITION_INDEX(gNewWindow)]; + offset = (((gNewWindow.height + 1) * MESSAGE_WIDTH) - 2); offset += gNewWindow.width; ptr += offset; *ptr = 0xf080; } } -void Load_02000D00_Asyc(void) { - LoadResourceAsync(gUnk_02000D00, 0x0600D040, sizeof(gUnk_02000D00)); +static void DrawCanvasLine(void) { + LoadResourceAsync(gTextGfxBuffer, 0x0600D040, sizeof(gTextGfxBuffer)); } void sub_08056F88(u32 unk_1, u32 unk_2) { @@ -750,27 +774,27 @@ void sub_08056F88(u32 unk_1, u32 unk_2) { unk_1 = 0; } uVar1 = unk_1 << 4 | unk_2; - if (gCurrentTextBox._9c != uVar1) { - gCurrentTextBox._9c = uVar1; + if (gTextRender._9c != uVar1) { + gTextRender._9c = uVar1; sub_0805F918(unk_1, unk_2, 0x0600CF60); } } -void sub_08056FBC(CurrentTextBox* ctb) { - sub_08056FEC(ctb->textBox.field_0x10, &ctb->_66[0x2]); - sub_08056FEC(ctb->textBox.field_0x14, &ctb->_66[0xa]); - sub_08056FEC(ctb->textBox.field_0x18, &ctb->_77[0x1]); - sub_08056FEC(ctb->textBox.field_0x1c, &ctb->_77[0x9]); +static void sub_08056FBC(TextRender* ctb) { + sub_08056FEC(ctb->message.field_0x10, &ctb->_66[0x2]); + sub_08056FEC(ctb->message.field_0x14, &ctb->_66[0xa]); + sub_08056FEC(ctb->message.field_0x18, &ctb->_77[0x1]); + sub_08056FEC(ctb->message.field_0x1c, &ctb->_77[0x9]); } -NONMATCH("asm/non_matching/textbox/sub_08056FEC.inc", u32 sub_08056FEC(u32 param_1, u8* param_2)) { +NONMATCH("asm/non_matching/textbox/sub_08056FEC.inc", u32 sub_08056FEC(u32 this, u8* param_2)) { u32 uVar1; int iVar2; int iVar3; int iVar4; u8 local_1c[8]; - uVar1 = sub_0801D51C(param_1, param_2, param_1); + uVar1 = sub_0801D51C(this, param_2, this); uVar1 = uVar1 & 0xfffffff; iVar4 = 0; do { diff --git a/src/utils.c b/src/utils.c index f4ad2bf0..76feb455 100644 --- a/src/utils.c +++ b/src/utils.c @@ -157,17 +157,17 @@ void LoadGfxGroup(u32 group) { case 0xD: return; case 0xE: - if (gUnk_02000000->gameLanguage != 0 && gUnk_02000000->gameLanguage != 1) { + if (gSaveHeader->gameLanguage != 0 && gSaveHeader->gameLanguage != 1) { loadGfx = TRUE; } break; case 0xF: - if (gUnk_02000000->gameLanguage != 0) { + if (gSaveHeader->gameLanguage != 0) { loadGfx = TRUE; } break; default: - if (ctrl == gUnk_02000000->gameLanguage) { + if (ctrl == gSaveHeader->gameLanguage) { loadGfx = TRUE; } break;