dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #133 from PikalaxALT/script_menu

Browse Source 
Script menu
This commit is contained in:
PikalaxALT
2019-10-26 10:30:42 -04:00
committed by GitHub
parent 1f569f0136 680e03618a
commit f10d7d01c5
48 changed files with 2423 additions and 3472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/dodrio_berry_picking.s
+8 -8
View File
@@ -10324,7 +10324,7 @@ _0815579C:
ldr r0, [r3] ldr r0, [r3]
adds r0, r7 adds r0, r7
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, _08155858 @ =gUnknown_8417938 ldr r2, _08155858 @ =gText_Yes
movs r1, 0x2 movs r1, 0x2
mov r9, r1 mov r9, r1
str r1, [sp] str r1, [sp]
@@ -10336,7 +10336,7 @@ _0815579C:
ldr r0, [r2] ldr r0, [r2]
adds r0, r7 adds r0, r7
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, _0815585C @ =gUnknown_841793C ldr r2, _0815585C @ =gText_No
movs r1, 0x10 movs r1, 0x10
str r1, [sp] str r1, [sp]
str r5, [sp, 0x4] str r5, [sp, 0x4]
@@ -10377,8 +10377,8 @@ _0815579C:
_0815584C: .4byte 0x00003008 _0815584C: .4byte 0x00003008
_08155850: .4byte 0x00003009 _08155850: .4byte 0x00003009
_08155854: .4byte gUnknown_841CDD7 _08155854: .4byte gUnknown_841CDD7
_08155858: .4byte gUnknown_8417938 _08155858: .4byte gText_Yes
_0815585C: .4byte gUnknown_841793C _0815585C: .4byte gText_No
_08155860: .4byte gFameCheckerText_ListMenuCursor _08155860: .4byte gFameCheckerText_ListMenuCursor
_08155864: .4byte 0x00003014 _08155864: .4byte 0x00003014
_08155868: _08155868:
@@ -10425,7 +10425,7 @@ _081558B0:
ldr r0, [r2] ldr r0, [r2]
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, _08155914 @ =gUnknown_8417938 ldr r2, _08155914 @ =gText_Yes
movs r3, 0x2 movs r3, 0x2
mov r8, r3 mov r8, r3
str r3, [sp] str r3, [sp]
@@ -10440,7 +10440,7 @@ _081558B0:
ldr r0, [r2] ldr r0, [r2]
adds r0, r4 adds r0, r4
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, _08155918 @ =gUnknown_841793C ldr r2, _08155918 @ =gText_No
movs r6, 0x10 movs r6, 0x10
str r6, [sp] str r6, [sp]
movs r3, 0xFF movs r3, 0xFF
@@ -10462,8 +10462,8 @@ _081558B0:
.align 2, 0 .align 2, 0
_0815590C: .4byte 0x00003020 _0815590C: .4byte 0x00003020
_08155910: .4byte 0x00003009 _08155910: .4byte 0x00003009
_08155914: .4byte gUnknown_8417938 _08155914: .4byte gText_Yes
_08155918: .4byte gUnknown_841793C _08155918: .4byte gText_No
_0815591C: .4byte gFameCheckerText_ListMenuCursor _0815591C: .4byte gFameCheckerText_ListMenuCursor
_08155920: _08155920:
str r6, [sp] str r6, [sp]
asm/overworld.s
+3 -3
View File
@@ -3293,7 +3293,7 @@ _080564B0:
adds r2, r4, 0 adds r2, r4, 0
bl sub_805B3E0 bl sub_805B3E0
_080564BA: _080564BA:
bl sub_811092C bl RunQuestLogCB
add sp, 0x4 add sp, 0x4
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -3328,7 +3328,7 @@ sub_80564C8: @ 80564C8
.align 2, 0 .align 2, 0
_08056508: .4byte gUnknown_3005E90 _08056508: .4byte gUnknown_3005E90
_0805650C: _0805650C:
bl sub_811092C bl RunQuestLogCB
b _08056522 b _08056522
_08056512: _08056512:
bl sub_8111CD0 bl sub_8111CD0
@@ -3336,7 +3336,7 @@ _08056512:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _08056522 bne _08056522
bl sub_811092C bl RunQuestLogCB
_08056522: _08056522:
ldr r0, _08056530 @ =gUnknown_3005E90 ldr r0, _08056530 @ =gUnknown_3005E90
bl sub_806C888 bl sub_806C888
asm/script_menu.s
-2058
View File
File diff suppressed because it is too large Load Diff
asm/union_room_chat.s
+4 -4
View File
@@ -4265,7 +4265,7 @@ sub_812A424: @ 812A424
bl PutWindowTilemap bl PutWindowTilemap
ldr r0, [r6] ldr r0, [r6]
ldrb r0, [r0, 0x18] ldrb r0, [r0, 0x18]
ldr r2, _0812A514 @ =gUnknown_8417938 ldr r2, _0812A514 @ =gText_Yes
movs r5, 0x2 movs r5, 0x2
str r5, [sp] str r5, [sp]
movs r4, 0xFF movs r4, 0xFF
@@ -4276,7 +4276,7 @@ sub_812A424: @ 812A424
bl AddTextPrinterParameterized bl AddTextPrinterParameterized
ldr r0, [r6] ldr r0, [r6]
ldrb r0, [r0, 0x18] ldrb r0, [r0, 0x18]
ldr r2, _0812A518 @ =gUnknown_841793C ldr r2, _0812A518 @ =gText_No
movs r1, 0x10 movs r1, 0x10
str r1, [sp] str r1, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
@@ -4314,8 +4314,8 @@ _0812A504: .4byte 0xff00ffff
_0812A508: .4byte 0x00ffffff _0812A508: .4byte 0x00ffffff
_0812A50C: .4byte 0x0000ffff _0812A50C: .4byte 0x0000ffff
_0812A510: .4byte gUnknown_203B0E4 _0812A510: .4byte gUnknown_203B0E4
_0812A514: .4byte gUnknown_8417938 _0812A514: .4byte gText_Yes
_0812A518: .4byte gUnknown_841793C _0812A518: .4byte gText_No
thumb_func_end sub_812A424 thumb_func_end sub_812A424
thumb_func_start sub_812A51C thumb_func_start sub_812A51C
baserom.ips
BIN
View File
Binary file not shown.
common_syms/scrcmd.txt
+1
View File
@@ -0,0 +1 @@
gUnknown_3005070
data/data_835B488.s
+2 -486
View File
@@ -542,492 +542,8 @@ sBerries:: @ 83DF7E8
gUnknown_83DFC9C:: @ 83DFC9C gUnknown_83DFC9C:: @ 83DFC9C
.incbin "baserom.gba", 0x3DFC9C, 0xB4 .incbin "baserom.gba", 0x3DFC9C, 0xB4
gUnknown_83DFD50:: @ 83DFD50 .section .rodata.83E2280
.4byte gUnknown_8417938, NULL .incbin "baserom.gba", 0x3E1800, 0xA80
.4byte gUnknown_841793C, NULL
gUnknown_83DFD60:: @ 83DFD60
.4byte gUnknown_8417ADC, NULL
.4byte gUnknown_8417AE3, NULL
.4byte gUnknown_8417AE9, NULL
.4byte gUnknown_8417AEE, NULL
gUnknown_83DFD80:: @ 83DFD80
.4byte gUnknown_84178F0, NULL
.4byte gUnknown_8417907, NULL
gUnknown_83DFD90:: @ 83DFD90
.4byte gUnknown_84178EB, NULL
.4byte gUnknown_8417907, NULL
gUnknown_83DFDA0:: @ 83DFDA0
.4byte gUnknown_84178FD, NULL
.4byte gUnknown_8417907, NULL
gUnknown_83DFDB0:: @ 83DFDB0
.4byte gUnknown_84178F0, NULL
.4byte gUnknown_84178EB, NULL
.4byte gUnknown_8417907, NULL
gUnknown_83DFDC8:: @ 83DFDC8
.4byte gUnknown_84178F0, NULL
.4byte gUnknown_84178FD, NULL
.4byte gUnknown_8417907, NULL
gUnknown_83DFDE0:: @ 83DFDE0
.4byte gUnknown_84178EB, NULL
.4byte gUnknown_84178FD, NULL
.4byte gUnknown_8417907, NULL
gUnknown_83DFDF8:: @ 83DFDF8
.4byte gUnknown_84178F0, NULL
.4byte gUnknown_84178EB, NULL
.4byte gUnknown_84178FD, NULL
.4byte gUnknown_8417907, NULL
gUnknown_83DFE18:: @ 83DFE18
.4byte gUnknown_8417914, NULL
.4byte gUnknown_841790C, NULL
.4byte gUnknown_8417910, NULL
.4byte gUnknown_8417918, NULL
.4byte gUnknown_841791C, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83DFE48:: @ 83DFE48
.4byte gUnknown_8417938, NULL
.4byte gUnknown_841793C, NULL
.4byte gUnknown_84178E6, NULL
gUnknown_83DFE60:: @ 83DFE60
.4byte gUnknown_8417944, NULL
.4byte gUnknown_8417952, NULL
.4byte gUnknown_8417960, NULL
.4byte gUnknown_84178E6, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83DFE88:: @ 83DFE88
.4byte gUnknown_8417938, NULL
.4byte gUnknown_841793C, NULL
.4byte gUnknown_84178E6, NULL
gUnknown_83DFEA0:: @ 83DFEA0
.4byte gUnknown_841796D, NULL
.4byte gUnknown_841797F, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83DFEB8:: @ 83DFEB8
.4byte gUnknown_841806D, NULL
.4byte gUnknown_841805D, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83DFED0:: @ 83DFED0
.4byte gUnknown_8417D56, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83DFEE0:: @ 83DFEE0
.4byte gUnknown_8417D63, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83DFEF0:: @ 83DFEF0
.4byte gUnknown_8417D6F, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83DFF00:: @ 83DFF00
.4byte gUnknown_8417D56, NULL
.4byte gUnknown_8417D6F, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83DFF18:: @ 83DFF18
.4byte gUnknown_8417D63, NULL
.4byte gUnknown_8417D6F, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83DFF30:: @ 83DFF30
.4byte gUnknown_8417984, NULL
.4byte gUnknown_841799A, NULL
.4byte gUnknown_84179AD, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83DFF50:: @ 83DFF50
.4byte gUnknown_8417A42, NULL
.4byte gUnknown_8417A58, NULL
.4byte gUnknown_8417A6E, NULL
.4byte gUnknown_8417A84, NULL
.4byte gUnknown_8417A9A, NULL
.4byte gUnknown_8417D4C, NULL
gUnknown_83DFF80:: @ 83DFF80
.4byte gUnknown_8417F4D, NULL
.4byte gUnknown_8417ED9, NULL
.4byte gUnknown_8417EF7, NULL
.4byte gUnknown_8417F11, NULL
.4byte gUnknown_8417F2F, NULL
.4byte gUnknown_8417D4C, NULL
gUnknown_83DFFB0:: @ 83DFFB0
.4byte gUnknown_84179C0, NULL
.4byte gUnknown_84179D6, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83DFFC8:: @ 83DFFC8
.4byte gUnknown_84179ED, NULL
.4byte gUnknown_84179F7, NULL
gUnknown_83DFFD8:: @ 83DFFD8
.4byte gUnknown_8417A37, NULL
.4byte gUnknown_8417A3D, NULL
gUnknown_83DFFE8:: @ 83DFFE8
.4byte gUnknown_8417ABC, NULL
.4byte gUnknown_8417AB9, NULL
.4byte gUnknown_8417AB6, NULL
.4byte gUnknown_8417AB3, NULL
.4byte gUnknown_8417AB0, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0018:: @ 83E0018
.4byte gUnknown_8417C0F, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0028:: @ 83E0028
.4byte gUnknown_8417C1B, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0038:: @ 83E0038
.4byte gUnknown_8417C0F, NULL
.4byte gUnknown_8417C1B, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0050:: @ 83E0050
.4byte gUnknown_8417C24, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0060:: @ 83E0060
.4byte gUnknown_8417C0F, NULL
.4byte gUnknown_8417C24, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0078:: @ 83E0078
.4byte gUnknown_8417C1B, NULL
.4byte gUnknown_8417C24, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0090:: @ 83E0090
.4byte gUnknown_8417C0F, NULL
.4byte gUnknown_8417C1B, NULL
.4byte gUnknown_8417C24, NULL
.4byte gOtherText_Exit, NULL
.4byte gUnknown_8417A24, NULL
.4byte gOtherText_Exit, NULL
.4byte gUnknown_8417A02, NULL
.4byte gUnknown_8417A24, NULL
.4byte gOtherText_Exit, NULL
.4byte gUnknown_8417A0C, NULL
.4byte gUnknown_8417A24, NULL
.4byte gOtherText_Exit, NULL
.4byte gUnknown_8417A02, NULL
.4byte gUnknown_8417A0C, NULL
.4byte gUnknown_8417A24, NULL
.4byte gOtherText_Exit, NULL
.4byte gUnknown_8417A19, NULL
.4byte gUnknown_8417A24, NULL
.4byte gOtherText_Exit, NULL
.4byte gUnknown_8417A02, NULL
.4byte gUnknown_8417A19, NULL
.4byte gUnknown_8417A24, NULL
.4byte gOtherText_Exit, NULL
.4byte gUnknown_8417A0C, NULL
.4byte gUnknown_8417A19, NULL
.4byte gUnknown_8417A24, NULL
.4byte gOtherText_Exit, NULL
.4byte gUnknown_8417A02, NULL
.4byte gUnknown_8417A0C, NULL
.4byte gUnknown_8417A19, NULL
.4byte gUnknown_8417A24, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0190:: @ 83E0190
.4byte gUnknown_8417BE2, NULL
.4byte gUnknown_8417BE8, NULL
.4byte gUnknown_8417BF0, NULL
.4byte gUnknown_8417BF8, NULL
.4byte gUnknown_8417C01, NULL
gUnknown_83E01B8:: @ 83E01B8
.4byte gUnknown_8417C33, NULL
.4byte gUnknown_8417C4B, NULL
gUnknown_83E01C8:: @ 83E01C8
.4byte gUnknown_8417C55, NULL
.4byte gUnknown_8417C6A, NULL
.4byte gUnknown_8417C83, NULL
.4byte gUnknown_8417C9D, NULL
.4byte gUnknown_8417CB7, NULL
.4byte gUnknown_8417D4C, NULL
gUnknown_83E01F8:: @ 83E01F8
.4byte gUnknown_8417D79, NULL
.4byte gUnknown_8417D86, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0210:: @ 83E0210
.4byte gUnknown_8417D90, NULL
.4byte gUnknown_8417DA0, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0228:: @ 83E0228
.4byte gUnknown_841805D, NULL
.4byte gUnknown_8418061, NULL
.4byte gUnknown_8418069, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0248:: @ 83E0248
.4byte gUnknown_841807D, NULL
.4byte gUnknown_841808E, NULL
.4byte gUnknown_841809C, NULL
.4byte gOtherText_Quit, NULL
gUnknown_83E0268:: @ 83E0268
.4byte gUnknown_8417DFE, NULL
.4byte gUnknown_8417E09, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0280:: @ 83E0280
.4byte gUnknown_8417DF3, NULL
.4byte gUnknown_8417E09, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0298:: @ 83E0298
.4byte gUnknown_8417DF3, NULL
.4byte gUnknown_8417DFE, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E02B0:: @ 83E02B0
.4byte gUnknown_8417D79, NULL
.4byte gUnknown_8417E50, NULL
.4byte gUnknown_8417E5A, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E02D0:: @ 83E02D0
.4byte gUnknown_8417E66, NULL
.4byte gUnknown_8417E67, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E02E8:: @ 83E02E8
.4byte gUnknown_8417D79, NULL
.4byte gUnknown_8417E50, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0300:: @ 83E0300
.4byte gUnknown_8417E72, NULL
.4byte gUnknown_8417E7F, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0318:: @ 83E0318
.4byte gUnknown_8417E94, NULL
.4byte gUnknown_8417EA4, NULL
gUnknown_83E0328:: @ 83E0328
.4byte gUnknown_8417D79, NULL
.4byte gUnknown_8417E50, NULL
.4byte gUnknown_8417E71, NULL
.4byte gUnknown_8417E5A, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0350:: @ 83E0350
.4byte gUnknown_8417D79, NULL
.4byte gUnknown_8417E50, NULL
.4byte gUnknown_8417E71, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0370:: @ 83E0370
.4byte gUnknown_8417EB3, NULL
.4byte gUnknown_8417EC1, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0388:: @ 83E0388
.4byte gUnknown_8417EB3, NULL
.4byte gUnknown_8417ECC, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E03A0:: @ 83E03A0
.4byte gUnknown_8417EB3, NULL
.4byte gUnknown_8417EC1, NULL
.4byte gUnknown_8417ECC, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E03C0:: @ 83E03C0
.4byte gUnknown_8417DF3, NULL
.4byte gUnknown_8417DFE, NULL
.4byte gUnknown_8417E09, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E03E0:: @ 83E03E0
.4byte gUnknown_8417E46, NULL
.4byte gUnknown_8417DFE, NULL
.4byte gUnknown_8417E09, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0400:: @ 83E0400
.4byte gUnknown_8417E46, NULL
.4byte gUnknown_8417DF3, NULL
.4byte gUnknown_8417E09, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0420:: @ 83E0420
.4byte gUnknown_8417E46, NULL
.4byte gUnknown_8417DF3, NULL
.4byte gUnknown_8417DFE, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0440:: @ 83E0440
.4byte gUnknown_8417E46, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0450:: @ 83E0450
.4byte gUnknown_8417F68, NULL
.4byte gUnknown_8417F67, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0468:: @ 83E0468
.4byte gUnknown_8417F77, NULL
.4byte gUnknown_8417F69, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E0480:: @ 83E0480
.4byte gOtherText_Single, NULL
.4byte gOtherText_Double, NULL
.4byte gOtherText_Knockout, NULL
.4byte gOtherText_Mixed, NULL
.4byte gOtherText_Exit, NULL
gUnknown_83E04A8:: @ 83E04A8
.4byte gOtherText_Exit, NULL
gUnknown_83E04B0:: @ 83E04B0
.4byte gUnknown_83DFD50, 2
.4byte gUnknown_83E0190, 5
.4byte gUnknown_83DFD60, 4
.4byte gUnknown_83DFD80, 2
.4byte gUnknown_83DFD90, 2
.4byte gUnknown_83DFDA0, 2
.4byte gUnknown_83DFDB0, 3
.4byte gUnknown_83DFDC8, 3
.4byte gUnknown_83DFDE0, 3
.4byte gUnknown_83DFDF8, 4
.4byte gUnknown_83E04A8, 1
.4byte gUnknown_83E04A8, 1
.4byte gUnknown_83E04A8, 1
.4byte gUnknown_83E01B8, 2
.4byte gUnknown_83E01C8, 6
.4byte gUnknown_83DFE18, 6
.4byte gUnknown_83DFE48, 3
.4byte gUnknown_83DFE60, 5
.4byte gUnknown_83DFE88, 3
.4byte gUnknown_83DFEA0, 3
.4byte gUnknown_83DFEB8, 3
.4byte gUnknown_83DFED0, 2
.4byte gUnknown_83DFEE0, 2
.4byte gUnknown_83DFEF0, 2
.4byte gUnknown_83DFF00, 3
.4byte gUnknown_83DFF18, 3
.4byte gUnknown_83DFF30, 4
.4byte gUnknown_83DFFB0, 3
.4byte gUnknown_83DFFC8, 2
.4byte gUnknown_83DFFD8, 2
.4byte gUnknown_83DFF50, 6
.4byte gUnknown_83DFFE8, 6
.4byte gUnknown_83E0018, 2
.4byte gUnknown_83E0028, 2
.4byte gUnknown_83E0038, 3
.4byte gUnknown_83E0050, 2
.4byte gUnknown_83E0060, 3
.4byte gUnknown_83E0078, 3
.4byte gUnknown_83E0090, 4
.4byte gUnknown_83E01F8, 3
.4byte gUnknown_83E0210, 3
.4byte gUnknown_83DFF80, 6
.4byte gUnknown_83E0228, 4
.4byte gUnknown_83E0248, 4
.4byte gUnknown_83E0268, 3
.4byte gUnknown_83E0280, 3
.4byte gUnknown_83E0298, 3
.4byte gUnknown_83E02B0, 4
.4byte gUnknown_83E02D0, 3
.4byte gUnknown_83E0300, 3
.4byte gUnknown_83E02E8, 3
.4byte gUnknown_83E0318, 2
.4byte gUnknown_83E0328, 5
.4byte gUnknown_83E0350, 4
.4byte gUnknown_83E0370, 3
.4byte gUnknown_83E0388, 3
.4byte gUnknown_83E03A0, 4
.4byte gUnknown_83E03C0, 4
.4byte gUnknown_83E03E0, 4
.4byte gUnknown_83E0400, 4
.4byte gUnknown_83E0420, 4
.4byte gUnknown_83E0440, 2
.4byte gUnknown_83E0450, 3
.4byte gUnknown_83E0468, 3
.4byte gUnknown_83E0480, 5
gStdStringPtrs:: @ 83E06B8
.4byte gUnknown_8417ABF
.4byte gUnknown_8417AC4
.4byte gUnknown_8417ACB
.4byte gUnknown_8417AD0
.4byte gUnknown_8417AD6
.4byte gUnknown_8417AF4
.4byte gUnknown_8417AF9
.4byte gUnknown_8417B00
.4byte gUnknown_8417B05
.4byte gUnknown_8417B0B
.4byte gUnknown_8417B11
.4byte gUnknown_8417B17
.4byte gUnknown_8417B21
.4byte gUnknown_8417B2C
.4byte gUnknown_8417B36
.4byte gUnknown_8417B3E
.4byte gUnknown_8417B4B
.4byte gUnknown_8417B58
.4byte gUnknown_8417B65
.4byte gUnknown_8417B72
.4byte gUnknown_8417B7C
.4byte gUnknown_8417B87
.4byte gUnknown_8417B94
.4byte gUnknown_8417C2D
.4byte gUnknown_8417DA9
.4byte gUnknown_8417DB6
.4byte gUnknown_8417DC7
.4byte gUnknown_8417DD9
.4byte gUnknown_8417DE1
gUnknown_83E072C:: @ 83E072C
.incbin "baserom.gba", 0x3E072C, 0xC
gUnknown_83E0738:: @ 83E0738
.incbin "baserom.gba", 0x3E0738, 0x10
gUnknown_83E0748:: @ 83E0748
.incbin "baserom.gba", 0x3E0748, 0x20
gUnknown_83E0768:: @ 83E0768
.incbin "baserom.gba", 0x3E0768, 0x818
gUnknown_83E0F80:: @ 83E0F80
.incbin "baserom.gba", 0x3E0F80, 0x820
gUnknown_83E17A0:: @ 83E17A0
.incbin "baserom.gba", 0x3E17A0, 0x20
gUnknown_83E17C0:: @ 83E17C0
.incbin "baserom.gba", 0x3E17C0, 0x10
gUnknown_83E17D0:: @ 83E17D0
.incbin "baserom.gba", 0x3E17D0, 0x10
gUnknown_83E17E0:: @ 83E17E0
.incbin "baserom.gba", 0x3E17E0, 0xAA0
gUnknown_83E2280:: @ 83E2280 gUnknown_83E2280:: @ 83E2280
.incbin "baserom.gba", 0x3E2280, 0x10 .incbin "baserom.gba", 0x3E2280, 0x10
data/event_scripts.s
+85 -86
View File
@@ -16,6 +16,7 @@
#include "constants/fame_checker.h" #include "constants/fame_checker.h"
#include "constants/seagallop.h" #include "constants/seagallop.h"
#include "constants/game_stat.h" #include "constants/game_stat.h"
#include "constants/menu.h"
#include "constants/battle_setup.h" #include "constants/battle_setup.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "asm/macros/event.inc" .include "asm/macros/event.inc"
@@ -1593,11 +1594,11 @@ EventScript_1A6578:: @ 81A6578
goto_if eq, EventScript_1A7AE0 goto_if eq, EventScript_1A7AE0
message Text_1A5483 message Text_1A5483
waitmessage waitmessage
multichoice 19, 8, 0, 2 multichoice 19, 8, MULTICHOICE_YES_NO, FALSE | (TRUE << 1)
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A65B8 case 0, EventScript_1A65B8
case 1 EventScript_1A6663 case 1 EventScript_1A6663
case 127, EventScript_1A6663 case SCR_MENU_CANCEL, EventScript_1A6663
end end
EventScript_1A65B8:: @ 81A65B8 EventScript_1A65B8:: @ 81A65B8
@@ -1950,7 +1951,7 @@ EventScript_1A69A8:: @ 81A69A8
case 2, EventScript_1A6A7A case 2, EventScript_1A6A7A
case 3, EventScript_1A6A56 case 3, EventScript_1A6A56
case 4, EventScript_1A6A46 case 4, EventScript_1A6A46
case 127, EventScript_1A6A46 case SCR_MENU_CANCEL, EventScript_1A6A46
end end
EventScript_1A69F0:: @ 81A69F0 EventScript_1A69F0:: @ 81A69F0
@@ -4160,22 +4161,22 @@ EventScript_1A8EC5:: @ 81A8EC5
goto_if ge, EventScript_1A911E goto_if ge, EventScript_1A911E
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4
goto_if ge, EventScript_1A8F12 goto_if ge, EventScript_1A8F12
multichoice 19, 6, 44, 0 multichoice 19, 6, MULTICHOICE_ISLAND_23, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A8FF9 case 0, EventScript_1A8FF9
case 1, EventScript_1A9004 case 1, EventScript_1A9004
case 2, EventScript_1A90F6 case 2, EventScript_1A90F6
case 127, EventScript_1A90F6 case SCR_MENU_CANCEL, EventScript_1A90F6
end end
EventScript_1A8F12:: @ 81A8F12 EventScript_1A8F12:: @ 81A8F12
multichoice 19, 5, 58, 0 multichoice 19, 5, MULTICHOICE_SEAGALLOP_V23, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A8FE3 case 0, EventScript_1A8FE3
case 1, EventScript_1A8FF9 case 1, EventScript_1A8FF9
case 2, EventScript_1A9004 case 2, EventScript_1A9004
case 3, EventScript_1A90F6 case 3, EventScript_1A90F6
case 127, EventScript_1A90F6 case SCR_MENU_CANCEL, EventScript_1A90F6
end end
EventScript_1A8F54:: @ 81A8F54 EventScript_1A8F54:: @ 81A8F54
@@ -4183,22 +4184,22 @@ EventScript_1A8F54:: @ 81A8F54
goto_if ge, EventScript_1A911E goto_if ge, EventScript_1A911E
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4
goto_if ge, EventScript_1A8FA1 goto_if ge, EventScript_1A8FA1
multichoice 19, 6, 45, 0 multichoice 19, 6, MULTICHOICE_ISLAND_13, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A8FEE case 0, EventScript_1A8FEE
case 1, EventScript_1A9004 case 1, EventScript_1A9004
case 2, EventScript_1A90F6 case 2, EventScript_1A90F6
case 127, EventScript_1A90F6 case SCR_MENU_CANCEL, EventScript_1A90F6
end end
EventScript_1A8FA1:: @ 81A8FA1 EventScript_1A8FA1:: @ 81A8FA1
multichoice 19, 5, 59, 0 multichoice 19, 5, MULTICHOICE_SEAGALLOP_V13, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A8FE3 case 0, EventScript_1A8FE3
case 1, EventScript_1A8FEE case 1, EventScript_1A8FEE
case 2, EventScript_1A9004 case 2, EventScript_1A9004
case 3, EventScript_1A90F6 case 3, EventScript_1A90F6
case 127, EventScript_1A90F6 case SCR_MENU_CANCEL, EventScript_1A90F6
end end
EventScript_1A8FE3:: @ 81A8FE3 EventScript_1A8FE3:: @ 81A8FE3
@@ -4226,22 +4227,22 @@ EventScript_1A900F:: @ 81A900F
goto_if ge, EventScript_1A911E goto_if ge, EventScript_1A911E
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4
goto_if ge, EventScript_1A905C goto_if ge, EventScript_1A905C
multichoice 19, 6, 46, 0 multichoice 19, 6, MULTICHOICE_ISLAND_12, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A8FEE case 0, EventScript_1A8FEE
case 1, EventScript_1A8FF9 case 1, EventScript_1A8FF9
case 2, EventScript_1A90F6 case 2, EventScript_1A90F6
case 127, EventScript_1A90F6 case SCR_MENU_CANCEL, EventScript_1A90F6
end end
EventScript_1A905C:: @ 81A905C EventScript_1A905C:: @ 81A905C
multichoice 19, 5, 60, 0 multichoice 19, 5, MULTICHOICE_SEAGALLOP_V12, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A8FE3 case 0, EventScript_1A8FE3
case 1, EventScript_1A8FEE case 1, EventScript_1A8FEE
case 2, EventScript_1A8FF9 case 2, EventScript_1A8FF9
case 3, EventScript_1A90F6 case 3, EventScript_1A90F6
case 127, EventScript_1A90F6 case SCR_MENU_CANCEL, EventScript_1A90F6
end end
EventScript_1A909E:: @ 81A909E EventScript_1A909E:: @ 81A909E
@@ -4271,7 +4272,7 @@ EventScript_1A90DA:: @ 81A90DA
goto_if eq, EventScript_1A7AE0 goto_if eq, EventScript_1A7AE0
special sub_8112364 special sub_8112364
fadescreen 1 fadescreen 1
special ScrSpecial_SeaGallopFerry special ScrSpecial_SeagallopFerry
waitstate waitstate
end end
@@ -4296,31 +4297,31 @@ Movement_1A911C:: @ 81A911C
EventScript_1A911E:: @ 81A911E EventScript_1A911E:: @ 81A911E
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special sub_809D764 special Special_DrawSeagallopDestinationMenu
waitstate waitstate
specialvar VAR_0x8006, sub_809D8C0 specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination
switch VAR_0x8006 switch VAR_0x8006
case 0, EventScript_1A91D5 case SEAGALLOP_VERMILION_CITY, EventScript_1A91D5
case 1, EventScript_1A91E0 case SEAGALLOP_ONE_ISLAND, EventScript_1A91E0
case 2, EventScript_1A91EB case SEAGALLOP_TWO_ISLAND, EventScript_1A91EB
case 3, EventScript_1A91F6 case SEAGALLOP_THREE_ISLAND, EventScript_1A91F6
case 4, EventScript_1A9201 case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201
case 254, EventScript_1A917F case SEAGALLOP_MORE, EventScript_1A917F
case 127, EventScript_1A90F6 case SCR_MENU_CANCEL, EventScript_1A90F6
end end
EventScript_1A917F:: @ 81A917F EventScript_1A917F:: @ 81A917F
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special sub_809D764 special Special_DrawSeagallopDestinationMenu
waitstate waitstate
specialvar VAR_0x8006, sub_809D8C0 specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination
switch VAR_0x8006 switch VAR_0x8006
case 4, EventScript_1A9201 case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201
case 5, EventScript_1A920C case SEAGALLOP_FIVE_ISLAND, EventScript_1A920C
case 6, EventScript_1A9217 case SEAGALLOP_SIX_ISLAND, EventScript_1A9217
case 7, EventScript_1A9222 case SEAGALLOP_SEVEN_ISLAND, EventScript_1A9222
case 254, EventScript_1A911E case SEAGALLOP_MORE, EventScript_1A911E
case 127, EventScript_1A90F6 case SCR_MENU_CANCEL, EventScript_1A90F6
end end
EventScript_1A91D5:: @ 81A91D5 EventScript_1A91D5:: @ 81A91D5
@@ -7877,7 +7878,7 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867
waitse waitse
message gUnknown_81B1E24 message gUnknown_81B1E24
waitmessage waitmessage
multichoice 21, 0, 2, 1 multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1B28DB case 0, EventScript_1B28DB
case 1, EventScript_1B28E6 case 1, EventScript_1B28E6
@@ -8003,64 +8004,64 @@ EventScript_1B29D0:: @ 81B29D0
end end
EventScript_1B2A23:: @ 81B2A23 EventScript_1B2A23:: @ 81B2A23
multichoice 15, 8, 3, 0 multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1B2B98 case 0, EventScript_1B2B98
case 1, EventScript_1B2DF6 case 1, EventScript_1B2DF6
case 127, EventScript_1B2DF6 case SCR_MENU_CANCEL, EventScript_1B2DF6
end end
EventScript_1B2A4F:: @ 81B2A4F EventScript_1B2A4F:: @ 81B2A4F
multichoice 16, 8, 4, 0 multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1B2C62 case 0, EventScript_1B2C62
case 1, EventScript_1B2DF6 case 1, EventScript_1B2DF6
case 127, EventScript_1B2DF6 case SCR_MENU_CANCEL, EventScript_1B2DF6
end end
EventScript_1B2A7B:: @ 81B2A7B EventScript_1B2A7B:: @ 81B2A7B
multichoice 15, 8, 5, 0 multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1B2D2C case 0, EventScript_1B2D2C
case 1, EventScript_1B2DF6 case 1, EventScript_1B2DF6
case 127, EventScript_1B2DF6 case SCR_MENU_CANCEL, EventScript_1B2DF6
end end
EventScript_1B2AA7:: @ 81B2AA7 EventScript_1B2AA7:: @ 81B2AA7
multichoice 15, 6, 6, 0 multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1B2B98 case 0, EventScript_1B2B98
case 1, EventScript_1B2C62 case 1, EventScript_1B2C62
case 2, EventScript_1B2DF6 case 2, EventScript_1B2DF6
case 127, EventScript_1B2DF6 case SCR_MENU_CANCEL, EventScript_1B2DF6
end end
EventScript_1B2ADE:: @ 81B2ADE EventScript_1B2ADE:: @ 81B2ADE
multichoice 15, 6, 7, 0 multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1B2B98 case 0, EventScript_1B2B98
case 1, EventScript_1B2D2C case 1, EventScript_1B2D2C
case 2, EventScript_1B2DF6 case 2, EventScript_1B2DF6
case 127, EventScript_1B2DF6 case SCR_MENU_CANCEL, EventScript_1B2DF6
end end
EventScript_1B2B15:: @ 81B2B15 EventScript_1B2B15:: @ 81B2B15
multichoice 15, 6, 8, 0 multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1B2C62 case 0, EventScript_1B2C62
case 1, EventScript_1B2D2C case 1, EventScript_1B2D2C
case 2, EventScript_1B2DF6 case 2, EventScript_1B2DF6
case 127, EventScript_1B2DF6 case SCR_MENU_CANCEL, EventScript_1B2DF6
end end
EventScript_1B2B4C:: @ 81B2B4C EventScript_1B2B4C:: @ 81B2B4C
multichoice 15, 5, 9, 0 multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1B2B98 case 0, EventScript_1B2B98
case 1, EventScript_1B2C62 case 1, EventScript_1B2C62
case 2, EventScript_1B2D2C case 2, EventScript_1B2D2C
case 3, EventScript_1B2DF6 case 3, EventScript_1B2DF6
case 127, EventScript_1B2DF6 case SCR_MENU_CANCEL, EventScript_1B2DF6
end end
EventScript_1B2B8E:: @ 81B2B8E EventScript_1B2B8E:: @ 81B2B8E
@@ -8369,16 +8370,14 @@ ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED
multichoice 64, 1, 0, 39 map_script_2 VAR_0x406F, 1, EventScript_1BB227
showelevmenu map_script_2 VAR_0x406F, 2, EventScript_1BB227
compare_local_to_local 8, 111 map_script_2 VAR_0x406F, 5, EventScript_1BB227
setdivewarp MAP_NAVEL_ROCK_EXTERIOR, 39, 7090, 28424 map_script_2 VAR_0x406F, 3, EventScript_1BB227
setdivewarp MAP_VIRIDIAN_CITY_HOUSE1, 39, 7090, 28424 map_script_2 VAR_0x406F, 6, EventScript_1BB227
setdivewarp MAP_PALLET_TOWN, 39, 7090, 28424 map_script_2 VAR_0x406F, 7, EventScript_1BB227
setdivewarp MAP_PEWTER_CITY_MUSEUM_1F, 39, 7090, 28424 map_script_2 VAR_0x406F, 8, EventScript_1BB227
setdivewarp MAP_CERULEAN_CITY_HOUSE1, 39, 7090, 28424 .2byte 0
setdivewarp MAP_LAVENDER_TOWN_POKEMON_CENTER_1F, 39, 7090, 8
nop
EventScript_1BB227:: @ 81BB227 EventScript_1BB227:: @ 81BB227
compare_var_to_value VAR_0x8007, 0 compare_var_to_value VAR_0x8007, 0
@@ -8608,12 +8607,12 @@ EventScript_1BB459:: @ 81BB459
EventScript_1BB467:: @ 81BB467 EventScript_1BB467:: @ 81BB467
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
multichoice 0, 0, 39, 0 multichoice 0, 0, MULTICHOICE_TRADE_CENTER_COLOSSEUM, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BB6AB case 0, EventScript_1BB6AB
case 1, EventScript_1BB4A3 case 1, EventScript_1BB4A3
case 2, EventScript_1BB82F case 2, EventScript_1BB82F
case 127, EventScript_1BB82F case SCR_MENU_CANCEL, EventScript_1BB82F
end end
EventScript_1BB4A3:: @ 81BB4A3 EventScript_1BB4A3:: @ 81BB4A3
@@ -8626,14 +8625,14 @@ EventScript_1BB4AD:: @ 81BB4AD
EventScript_1BB4AE:: @ 81BB4AE EventScript_1BB4AE:: @ 81BB4AE
message Text_1BD338 message Text_1BD338
waitmessage waitmessage
multichoice 0, 0, 17, 0 multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BB50F case 0, EventScript_1BB50F
case 1, EventScript_1BB51A case 1, EventScript_1BB51A
case 2, EventScript_1BB541 case 2, EventScript_1BB541
case 3, EventScript_1BB501 case 3, EventScript_1BB501
case 4, EventScript_1BB82F case 4, EventScript_1BB82F
case 127, EventScript_1BB82F case SCR_MENU_CANCEL, EventScript_1BB82F
end end
EventScript_1BB501:: @ 81BB501 EventScript_1BB501:: @ 81BB501
@@ -9199,12 +9198,12 @@ EventScript_1BBA50:: @ 81BBA50
end end
EventScript_1BBA51:: @ 81BBA51 EventScript_1BBA51:: @ 81BBA51
multichoice 18, 6, 16, 0 multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BBA94 case 0, EventScript_1BBA94
case 1, EventScript_1BB82F case 1, EventScript_1BB82F
case 2, EventScript_1BBA88 case 2, EventScript_1BBA88
case 127, EventScript_1BB82F case SCR_MENU_CANCEL, EventScript_1BB82F
end end
EventScript_1BBA88:: @ 81BBA88 EventScript_1BBA88:: @ 81BBA88
@@ -9323,22 +9322,22 @@ EventScript_1BBBE6:: @ 81BBBE6
EventScript_1BBBE7:: @ 81BBBE7 EventScript_1BBBE7:: @ 81BBBE7
checkflag FLAG_GOT_POWDER_JAR checkflag FLAG_GOT_POWDER_JAR
goto_if FALSE, EventScript_1BBC32 goto_if FALSE, EventScript_1BBC32
multichoice 0, 0, 47, 0 multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_CRUSH, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BBC69 case 0, EventScript_1BBC69
case 1, EventScript_1BBC97 case 1, EventScript_1BBC97
case 2, EventScript_1BBD35 case 2, EventScript_1BBD35
case 3, EventScript_1BB82F case 3, EventScript_1BB82F
case 127, EventScript_1BB82F case SCR_MENU_CANCEL, EventScript_1BB82F
end end
EventScript_1BBC32:: @ 81BBC32 EventScript_1BBC32:: @ 81BBC32
multichoice 0, 0, 50, 0 multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_2, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BBC69 case 0, EventScript_1BBC69
case 1, EventScript_1BBC97 case 1, EventScript_1BBC97
case 2, EventScript_1BB82F case 2, EventScript_1BB82F
case 127, EventScript_1BB82F case SCR_MENU_CANCEL, EventScript_1BB82F
end end
EventScript_1BBC69:: @ 81BBC69 EventScript_1BBC69:: @ 81BBC69
@@ -9357,14 +9356,14 @@ EventScript_1BBC96:: @ 81BBC96
EventScript_1BBC97:: @ 81BBC97 EventScript_1BBC97:: @ 81BBC97
message Text_1BD338 message Text_1BD338
waitmessage waitmessage
multichoice 0, 0, 17, 0 multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BBCEA case 0, EventScript_1BBCEA
case 1, EventScript_1BBCF5 case 1, EventScript_1BBCF5
case 2, EventScript_1BBD1C case 2, EventScript_1BBD1C
case 3, EventScript_1BBD27 case 3, EventScript_1BBD27
case 4, EventScript_1BB82F case 4, EventScript_1BB82F
case 127, EventScript_1BB82F case SCR_MENU_CANCEL, EventScript_1BB82F
end end
EventScript_1BBCEA:: @ 81BBCEA EventScript_1BBCEA:: @ 81BBCEA
@@ -9442,12 +9441,12 @@ EventScript_1BBDBC:: @ 81BBDBC
message Text_1BD51B message Text_1BD51B
waitmessage waitmessage
call EventScript_1A6675 call EventScript_1A6675
multichoice 13, 6, 63, 0 multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BBE28 case 0, EventScript_1BBE28
case 1, EventScript_1BBE00 case 1, EventScript_1BBE00
case 2, EventScript_1BB82F case 2, EventScript_1BB82F
case 127, EventScript_1BB82F case SCR_MENU_CANCEL, EventScript_1BB82F
end end
EventScript_1BBE00:: @ 81BBE00 EventScript_1BBE00:: @ 81BBE00
@@ -9477,12 +9476,12 @@ EventScript_1BBE50:: @ 81BBE50
message Text_1BD582 message Text_1BD582
waitmessage waitmessage
call EventScript_1A6675 call EventScript_1A6675
multichoice 13, 6, 63, 0 multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BBEBC case 0, EventScript_1BBEBC
case 1, EventScript_1BBE94 case 1, EventScript_1BBE94
case 2, EventScript_1BB82F case 2, EventScript_1BB82F
case 127, EventScript_1BB82F case SCR_MENU_CANCEL, EventScript_1BB82F
end end
EventScript_1BBE94:: @ 81BBE94 EventScript_1BBE94:: @ 81BBE94
@@ -9512,12 +9511,12 @@ EventScript_1BBEE4:: @ 81BBEE4
message Text_1BD5F1 message Text_1BD5F1
waitmessage waitmessage
call EventScript_1A6675 call EventScript_1A6675
multichoice 13, 6, 63, 0 multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BBF50 case 0, EventScript_1BBF50
case 1, EventScript_1BBF28 case 1, EventScript_1BBF28
case 2, EventScript_1BB82F case 2, EventScript_1BB82F
case 127, EventScript_1BB82F case SCR_MENU_CANCEL, EventScript_1BB82F
end end
EventScript_1BBF28:: @ 81BBF28 EventScript_1BBF28:: @ 81BBF28
@@ -9659,12 +9658,12 @@ EventScript_1BC060:: @ 81BC060
faceplayer faceplayer
message Text_1BCCFF message Text_1BCCFF
waitmessage waitmessage
multichoice 0, 0, 49, 0 multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BC0B0 case 0, EventScript_1BC0B0
case 1, EventScript_1BC0BA case 1, EventScript_1BC0BA
case 2, EventScript_1BC0C4 case 2, EventScript_1BC0C4
case 127, EventScript_1BC0C4 case SCR_MENU_CANCEL, EventScript_1BC0C4
end end
EventScript_1BC0B0:: @ 81BC0B0 EventScript_1BC0B0:: @ 81BC0B0
@@ -9698,12 +9697,12 @@ EventScript_1BC0CE:: @ 81BC0CE
special HelpSystem_Disable special HelpSystem_Disable
message Text_1BD02D message Text_1BD02D
waitmessage waitmessage
multichoice 0, 0, 49, 0 multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BC13A case 0, EventScript_1BC13A
case 1, EventScript_1BC184 case 1, EventScript_1BC184
case 2, EventScript_1BB83F case 2, EventScript_1BB83F
case 127, EventScript_1BB83F case SCR_MENU_CANCEL, EventScript_1BB83F
end end
EventScript_1BC13A:: @ 81BC13A EventScript_1BC13A:: @ 81BC13A
@@ -9751,12 +9750,12 @@ EventScript_1BC1CE:: @ 81BC1CE
message Text_1BD5F1 message Text_1BD5F1
waitmessage waitmessage
call EventScript_1A6675 call EventScript_1A6675
multichoice 13, 6, 63, 0 multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BC23A case 0, EventScript_1BC23A
case 1, EventScript_1BC212 case 1, EventScript_1BC212
case 2, EventScript_1BB83F case 2, EventScript_1BB83F
case 127, EventScript_1BB83F case SCR_MENU_CANCEL, EventScript_1BB83F
end end
EventScript_1BC212:: @ 81BC212 EventScript_1BC212:: @ 81BC212
@@ -11303,12 +11302,12 @@ EventScript_1BEE3A:: @ 81BEE3A
EventScript_1BEE44:: @ 81BEE44 EventScript_1BEE44:: @ 81BEE44
message Text_1BF017 message Text_1BF017
waitmessage waitmessage
multichoice 18, 6, 18, 0 multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BEE8F case 0, EventScript_1BEE8F
case 1, EventScript_1BEEC3 case 1, EventScript_1BEEC3
case 2, EventScript_1BEE81 case 2, EventScript_1BEE81
case 127, EventScript_1BEEC3 case SCR_MENU_CANCEL, EventScript_1BEEC3
end end
EventScript_1BEE81:: @ 81BEE81 EventScript_1BEE81:: @ 81BEE81
@@ -11350,12 +11349,12 @@ EventScript_1BEECD:: @ 81BEECD
EventScript_1BEEDB:: @ 81BEEDB EventScript_1BEEDB:: @ 81BEEDB
message Text_1BF1FB message Text_1BF1FB
waitmessage waitmessage
multichoice 18, 6, 18, 0 multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1BEF26 case 0, EventScript_1BEF26
case 1, EventScript_1BEF35 case 1, EventScript_1BEF35
case 2, EventScript_1BEF18 case 2, EventScript_1BEF18
case 127, EventScript_1BEF35 case SCR_MENU_CANCEL, EventScript_1BEF35
end end
EventScript_1BEF18:: @ 81BEF18 EventScript_1BEF18:: @ 81BEF18
data/maps/BirthIsland_Harbor/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7
message Text_181726 message Text_181726
waitmessage waitmessage
setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND
multichoice 20, 8, 61, 0 multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A91D5 case 0, EventScript_1A91D5
case 1, EventScript_1A90F6 case 1, EventScript_1A90F6
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+2 -2
View File
@@ -68,7 +68,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522
message Text_1965F4 message Text_1965F4
waitmessage waitmessage
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
multichoice 0, 0, 43, 0 multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16C5C0 case 0, EventScript_16C5C0
case 1, EventScript_16C5CE case 1, EventScript_16C5CE
@@ -80,7 +80,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522
EventScript_16C578:: @ 816C578 EventScript_16C578:: @ 816C578
message Text_1965F4 message Text_1965F4
waitmessage waitmessage
multichoice 0, 0, 43, 0 multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16C5C0 case 0, EventScript_16C5C0
case 1, EventScript_16C5CE case 1, EventScript_16C5CE
data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+5 -5
View File
@@ -21,29 +21,29 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
end end
EventScript_16C1B7:: @ 816C1B7 EventScript_16C1B7:: @ 816C1B7
multichoicedefault 0, 0, 31, 0, 0 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 0, FALSE
goto EventScript_16C1F3 goto EventScript_16C1F3
EventScript_16C1C2:: @ 816C1C2 EventScript_16C1C2:: @ 816C1C2
end end
EventScript_16C1C3:: @ 816C1C3 EventScript_16C1C3:: @ 816C1C3
multichoicedefault 0, 0, 31, 1, 0 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 1, FALSE
goto EventScript_16C1F3 goto EventScript_16C1F3
end end
EventScript_16C1CF:: @ 816C1CF EventScript_16C1CF:: @ 816C1CF
multichoicedefault 0, 0, 31, 2, 0 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 2, FALSE
goto EventScript_16C1F3 goto EventScript_16C1F3
end end
EventScript_16C1DB:: @ 816C1DB EventScript_16C1DB:: @ 816C1DB
multichoicedefault 0, 0, 31, 3, 0 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 3, FALSE
goto EventScript_16C1F3 goto EventScript_16C1F3
end end
EventScript_16C1E7:: @ 816C1E7 EventScript_16C1E7:: @ 816C1E7
multichoicedefault 0, 0, 31, 4, 0 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 4, FALSE
goto EventScript_16C1F3 goto EventScript_16C1F3
end end
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+8 -8
View File
@@ -58,7 +58,7 @@ EventScript_16BD3E:: @ 816BD3E
end end
EventScript_16BDAE:: @ 816BDAE EventScript_16BDAE:: @ 816BDAE
multichoice 0, 0, 32, 0 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16BF19 case 0, EventScript_16BF19
case 1, EventScript_16C00C case 1, EventScript_16C00C
@@ -66,7 +66,7 @@ EventScript_16BDAE:: @ 816BDAE
end end
EventScript_16BDDA:: @ 816BDDA EventScript_16BDDA:: @ 816BDDA
multichoice 0, 0, 33, 0 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16BF3A case 0, EventScript_16BF3A
case 1, EventScript_16C00C case 1, EventScript_16C00C
@@ -74,7 +74,7 @@ EventScript_16BDDA:: @ 816BDDA
end end
EventScript_16BE06:: @ 816BE06 EventScript_16BE06:: @ 816BE06
multichoice 0, 0, 34, 0 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16BF19 case 0, EventScript_16BF19
case 1, EventScript_16BF3A case 1, EventScript_16BF3A
@@ -83,7 +83,7 @@ EventScript_16BE06:: @ 816BE06
end end
EventScript_16BE3D:: @ 816BE3D EventScript_16BE3D:: @ 816BE3D
multichoice 0, 0, 35, 0 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_LEMONADE, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16BF5B case 0, EventScript_16BF5B
case 1, EventScript_16C00C case 1, EventScript_16C00C
@@ -91,7 +91,7 @@ EventScript_16BE3D:: @ 816BE3D
end end
EventScript_16BE69:: @ 816BE69 EventScript_16BE69:: @ 816BE69
multichoice 0, 0, 36, 0 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_LEMONADE, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16BF19 case 0, EventScript_16BF19
case 1, EventScript_16BF5B case 1, EventScript_16BF5B
@@ -100,7 +100,7 @@ EventScript_16BE69:: @ 816BE69
end end
EventScript_16BEA0:: @ 816BEA0 EventScript_16BEA0:: @ 816BEA0
multichoice 0, 0, 37, 0 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP_LEMONADE, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16BF3A case 0, EventScript_16BF3A
case 1, EventScript_16BF5B case 1, EventScript_16BF5B
@@ -109,7 +109,7 @@ EventScript_16BEA0:: @ 816BEA0
end end
EventScript_16BED7:: @ 816BED7 EventScript_16BED7:: @ 816BED7
multichoice 0, 0, 38, 0 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP_LEMONADE, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16BF19 case 0, EventScript_16BF19
case 1, EventScript_16BF3A case 1, EventScript_16BF3A
@@ -220,7 +220,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034
end end
EventScript_16C045:: @ 816C045 EventScript_16C045:: @ 816C045
multichoice 12, 0, 26, 0 multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE
copyvar VAR_0x4001, VAR_RESULT copyvar VAR_0x4001, VAR_RESULT
switch VAR_0x4001 switch VAR_0x4001
case 0, EventScript_16C083 case 0, EventScript_16C083
data/maps/CeladonCity_GameCorner/scripts.inc
+1 -1
View File
@@ -29,7 +29,7 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
showcoinsbox 0, 5 showcoinsbox 0, 5
message Text_196984 message Text_196984
waitmessage waitmessage
multichoice 13, 0, 27, 0 multichoice 13, 0, MULTICHOICE_GAME_CORNER_COIN_PURCHASE_COUNTER, FALSE
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16C6E6 case 0, EventScript_16C6E6
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+3 -3
View File
@@ -25,7 +25,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
EventScript_16CBB2:: @ 816CBB2 EventScript_16CBB2:: @ 816CBB2
message Text_19707A message Text_19707A
waitmessage waitmessage
multichoice 11, 0, 14, 0 multichoice 11, 0, MULTICHOICE_GAME_CORNER_POKEMON_PRIZES, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16CC15 case 0, EventScript_16CC15
case 1, EventScript_16CC25 case 1, EventScript_16CC25
@@ -204,7 +204,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
EventScript_16CE47:: @ 816CE47 EventScript_16CE47:: @ 816CE47
message Text_19707A message Text_19707A
waitmessage waitmessage
multichoice 11, 0, 30, 0 multichoice 11, 0, MULTICHOICE_GAME_CORNER_TMPRIZES, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16CEA5 case 0, EventScript_16CEA5
case 1, EventScript_16CEB9 case 1, EventScript_16CEB9
@@ -302,7 +302,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
EventScript_16CFB2:: @ 816CFB2 EventScript_16CFB2:: @ 816CFB2
message Text_19707A message Text_19707A
waitmessage waitmessage
multichoice 10, 0, 41, 0 multichoice 10, 0, MULTICHOICE_GAME_CORNER_BATTLE_ITEM_PRIZES, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16D010 case 0, EventScript_16D010
case 1, EventScript_16D020 case 1, EventScript_16D020
data/maps/CeruleanCity_BikeShop/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD
showmoneybox 0, 0, 0 showmoneybox 0, 0, 0
message Text_192755 message Text_192755
waitmessage waitmessage
multichoice 11, 0, 13, 0 multichoice 11, 0, MULTICHOICE_BIKE_SHOP, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16AC07 case 0, EventScript_16AC07
case 1, EventScript_16AC15 case 1, EventScript_16AC15
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+5 -5
View File
@@ -103,7 +103,7 @@ EventScript_16E544:: @ 816E544
call EventScript_16E51C call EventScript_16E51C
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16E5FA goto_if eq, EventScript_16E5FA
multichoice 0, 0, 21, 0 multichoice 0, 0, MULTICHOICE_HELIX, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16E668 case 0, EventScript_16E668
case 1, EventScript_16E53A case 1, EventScript_16E53A
@@ -116,7 +116,7 @@ EventScript_16E586:: @ 816E586
call EventScript_16E51C call EventScript_16E51C
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16E631 goto_if eq, EventScript_16E631
multichoice 0, 0, 22, 0 multichoice 0, 0, MULTICHOICE_DOME, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16E6A6 case 0, EventScript_16E6A6
case 1, EventScript_16E53A case 1, EventScript_16E53A
@@ -126,7 +126,7 @@ EventScript_16E586:: @ 816E586
EventScript_16E5C8:: @ 816E5C8 EventScript_16E5C8:: @ 816E5C8
message Text_19A282 message Text_19A282
waitmessage waitmessage
multichoice 0, 0, 23, 0 multichoice 0, 0, MULTICHOICE_AMBER, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16E6E4 case 0, EventScript_16E6E4
case 1, EventScript_16E53A case 1, EventScript_16E53A
@@ -134,7 +134,7 @@ EventScript_16E5C8:: @ 816E5C8
end end
EventScript_16E5FA:: @ 816E5FA EventScript_16E5FA:: @ 816E5FA
multichoice 0, 0, 24, 0 multichoice 0, 0, MULTICHOICE_HELIX_AMBER, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16E668 case 0, EventScript_16E668
case 1, EventScript_16E6E4 case 1, EventScript_16E6E4
@@ -143,7 +143,7 @@ EventScript_16E5FA:: @ 816E5FA
end end
EventScript_16E631:: @ 816E631 EventScript_16E631:: @ 816E631
multichoice 0, 0, 25, 0 multichoice 0, 0, MULTICHOICE_DOME_AMBER, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16E6A6 case 0, EventScript_16E6A6
case 1, EventScript_16E6E4 case 1, EventScript_16E6E4
data/maps/NavelRock_Harbor/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ NavelRock_Harbor_EventScript_165421:: @ 8165421
message Text_181726 message Text_181726
waitmessage waitmessage
setvar VAR_0x8004, SEAGALLOP_NAVEL_ROCK setvar VAR_0x8004, SEAGALLOP_NAVEL_ROCK
multichoice 20, 8, 61, 0 multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A91D5 case 0, EventScript_1A91D5
case 1, EventScript_1A90F6 case 1, EventScript_1A90F6
data/maps/PewterCity_Museum_1F/scripts.inc
+4 -4
View File
@@ -190,9 +190,9 @@ PewterCity_Museum_1F_EventScript_16A512:: @ 816A512
setvar VAR_0x8004, SPECIES_AERODACTYL setvar VAR_0x8004, SPECIES_AERODACTYL
setvar VAR_0x8005, 10 setvar VAR_0x8005, 10
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_809D504 special Special_OpenMuseumFossilPic
msgbox gUnknown_8190945 msgbox gUnknown_8190945
special sub_809D620 special Special_CloseMuseumFossilPic
releaseall releaseall
end end
@@ -201,8 +201,8 @@ PewterCity_Museum_1F_EventScript_16A532:: @ 816A532
setvar VAR_0x8004, SPECIES_KABUTOPS setvar VAR_0x8004, SPECIES_KABUTOPS
setvar VAR_0x8005, 10 setvar VAR_0x8005, 10
setvar VAR_0x8006, 3 setvar VAR_0x8006, 3
special sub_809D504 special Special_OpenMuseumFossilPic
msgbox gUnknown_8190975 msgbox gUnknown_8190975
special sub_809D620 special Special_CloseMuseumFossilPic
releaseall releaseall
end end
data/maps/RocketHideout_Elevator/scripts.inc
+3 -3
View File
@@ -21,21 +21,21 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
end end
EventScript_161530:: @ 8161530 EventScript_161530:: @ 8161530
multichoicedefault 0, 0, 42, 0, 0 multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 0, FALSE
goto EventScript_161554 goto EventScript_161554
EventScript_16153B:: @ 816153B EventScript_16153B:: @ 816153B
end end
EventScript_16153C:: @ 816153C EventScript_16153C:: @ 816153C
multichoicedefault 0, 0, 42, 1, 0 multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 1, FALSE
goto EventScript_161554 goto EventScript_161554
EventScript_161547:: @ 8161547 EventScript_161547:: @ 8161547
end end
EventScript_161548:: @ 8161548 EventScript_161548:: @ 8161548
multichoicedefault 0, 0, 42, 2, 0 multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 2, FALSE
goto EventScript_161554 goto EventScript_161554
EventScript_161553:: @ 8161553 EventScript_161553:: @ 8161553
data/maps/Route25_SeaCottage/scripts.inc
+1 -1
View File
@@ -248,7 +248,7 @@ EventScript_1707CA:: @ 81707CA
EventScript_1707D8:: @ 81707D8 EventScript_1707D8:: @ 81707D8
message Text_1A0479 message Text_1A0479
waitmessage waitmessage
multichoice 0, 0, 1, 0 multichoice 0, 0, MULTICHOICE_EEVEELUTIONS, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_17082B case 0, EventScript_17082B
case 1, EventScript_170840 case 1, EventScript_170840
data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
+2 -2
View File
@@ -20,12 +20,12 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03
end end
EventScript_164B46:: @ 8164B46 EventScript_164B46:: @ 8164B46
multichoicedefault 0, 0, 20, 0, 0 multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE
goto EventScript_164B5E goto EventScript_164B5E
end end
EventScript_164B52:: @ 8164B52 EventScript_164B52:: @ 8164B52
multichoicedefault 0, 0, 20, 1, 0 multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE
goto EventScript_164B5E goto EventScript_164B5E
end end
data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+2 -2
View File
@@ -169,7 +169,7 @@ EventScript_164A00:: @ 8164A00
EventScript_164A08:: @ 8164A08 EventScript_164A08:: @ 8164A08
message Text_17C88D message Text_17C88D
waitmessage waitmessage
multichoice 18, 6, 16, 0 multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_164A53 case 0, EventScript_164A53
case 1, EventScript_164ABF case 1, EventScript_164ABF
@@ -183,7 +183,7 @@ EventScript_164A45:: @ 8164A45
end end
EventScript_164A53:: @ 8164A53 EventScript_164A53:: @ 8164A53
multichoice 13, 3, 64, 0 multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_164AA0 case 0, EventScript_164AA0
case 1, EventScript_164AA0 case 1, EventScript_164AA0
data/maps/TwoIsland_House/scripts.inc
+1 -1
View File
@@ -98,7 +98,7 @@ EventScript_171741:: @ 8171741
EventScript_17175B:: @ 817175B EventScript_17175B:: @ 817175B
message Text_1A2D43 message Text_1A2D43
waitmessage waitmessage
multichoice 0, 0, 51, 1 multichoice 0, 0, MULTICHOICE_MUSHROOMS, TRUE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_171741 case 0, EventScript_171741
case 1, EventScript_171727 case 1, EventScript_171727
data/maps/VermilionCity/scripts.inc
+4 -4
View File
@@ -110,7 +110,7 @@ EventScript_1669FD:: @ 81669FD
call_if FALSE, EventScript_166A53 call_if FALSE, EventScript_166A53
message Text_17FCC1 message Text_17FCC1
waitmessage waitmessage
multichoice 17, 6, 54, 0 multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A911E case 0, EventScript_1A911E
case 1, EventScript_166B0B case 1, EventScript_166B0B
@@ -128,7 +128,7 @@ EventScript_166A5F:: @ 8166A5F
call_if FALSE, EventScript_166AA5 call_if FALSE, EventScript_166AA5
message Text_17FCC1 message Text_17FCC1
waitmessage waitmessage
multichoice 13, 6, 55, 0 multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A911E case 0, EventScript_1A911E
case 1, EventScript_166B23 case 1, EventScript_166B23
@@ -148,7 +148,7 @@ EventScript_166AB1:: @ 8166AB1
call_if FALSE, EventScript_166AA5 call_if FALSE, EventScript_166AA5
message Text_17FCC1 message Text_17FCC1
waitmessage waitmessage
multichoice 13, 5, 56, 0 multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A911E case 0, EventScript_1A911E
case 1, EventScript_166B0B case 1, EventScript_166B0B
@@ -175,7 +175,7 @@ EventScript_166B3B:: @ 8166B3B
message Text_17FB23 message Text_17FB23
waitmessage waitmessage
setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
multichoice 19, 5, 57, 0 multichoice 19, 5, MULTICHOICE_SEAGALLOP_123, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A8FEE case 0, EventScript_1A8FEE
case 1, EventScript_1A8FF9 case 1, EventScript_1A8FF9
data/maps/ViridianCity_House2/scripts.inc
+1 -1
View File
@@ -56,7 +56,7 @@ ViridianCity_House2_EventScript_16A11D:: @ 816A11D
EventScript_16A12C:: @ 816A12C EventScript_16A12C:: @ 816A12C
message Text_18FF88 message Text_18FF88
waitmessage waitmessage
multichoicegrid 7, 1, 15, 3, 0 multichoicegrid 7, 1, MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD, 3, FALSE
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_16A18B case 0, EventScript_16A18B
case 1, EventScript_16A1A7 case 1, EventScript_16A1A7
data/script_menu/aerodactyl_fossil.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 767 B

data/script_menu/kabutops_fossil.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 747 B

data/specials.inc
+5 -5
View File
@@ -387,7 +387,7 @@ gSpecials:: @ 815FD60
def_special IsThereMonInRoute5Daycare def_special IsThereMonInRoute5Daycare
def_special GetNumLevelsGainedForRoute5DaycareMon def_special GetNumLevelsGainedForRoute5DaycareMon
def_special TakePokemonFromRoute5Daycare def_special TakePokemonFromRoute5Daycare
def_special ScrSpecial_SeaGallopFerry def_special ScrSpecial_SeagallopFerry
def_special Special_PlayerPartyContainsSpecies def_special Special_PlayerPartyContainsSpecies
def_special Special_SetSomeVariable def_special Special_SetSomeVariable
def_special HelpSystem_BackupSomeVariable def_special HelpSystem_BackupSomeVariable
@@ -403,8 +403,8 @@ gSpecials:: @ 815FD60
def_special sub_8112364 def_special sub_8112364
def_special Special_GetMENewsJisanItemAndState def_special Special_GetMENewsJisanItemAndState
def_special get_unknown_box_id def_special get_unknown_box_id
def_special sub_809D504 def_special Special_OpenMuseumFossilPic
def_special sub_809D620 def_special Special_CloseMuseumFossilPic
def_special sub_812781C def_special sub_812781C
def_special sub_8127888 def_special sub_8127888
def_special SetBattledTrainerFlag def_special SetBattledTrainerFlag
@@ -431,8 +431,8 @@ gSpecials:: @ 815FD60
def_special Special_HasLearnedAllMovesFromCapeBrinkTutor def_special Special_HasLearnedAllMovesFromCapeBrinkTutor
def_special Special_Credits def_special Special_Credits
def_special sub_8153810 def_special sub_8153810
def_special sub_809D764 def_special Special_DrawSeagallopDestinationMenu
def_special sub_809D8C0 def_special Special_GetSelectedSeagallopDestination
def_special sub_8147500 def_special sub_8147500
def_special GetPlayerFacingDirection def_special GetPlayerFacingDirection
def_special Special_DeoxysSound def_special Special_DeoxysSound
data/strings.s
+180 -180
View File
@@ -1358,34 +1358,34 @@ gUnknown_84178DA:: @ 84178DA
gUnknown_84178DF:: @ 0x84178DF gUnknown_84178DF:: @ 0x84178DF
.string "さんか する$" .string "さんか する$"
gUnknown_84178E6:: @ 0x84178E6 gText_Info:: @ 0x84178E6
.string "INFO$" .string "INFO$"
gUnknown_84178EB:: @ 0x84178EB gText_Eggs:: @ 0x84178EB
.string "EGGS$" .string "EGGS$"
gUnknown_84178F0:: @ 0x84178F0 gText_HallOfFame:: @ 0x84178F0
.string "HALL OF FAME$" .string "HALL OF FAME$"
gUnknown_84178FD:: @ 0x84178FD gText_Victories:: @ 0x84178FD
.string "VICTORIES$" .string "VICTORIES$"
gUnknown_8417907:: @ 0x8417907 gText_Quit:: @ 0x8417907
.string "QUIT$" .string "QUIT$"
gUnknown_841790C:: @ 0x841790C gText_Psn:: @ 0x841790C
.string "PSN$" .string "PSN$"
gUnknown_8417910:: @ 0x8417910 gText_Par:: @ 0x8417910
.string "PAR$" .string "PAR$"
gUnknown_8417914:: @ 0x8417914 gText_Slp:: @ 0x8417914
.string "SLP$" .string "SLP$"
gUnknown_8417918:: @ 0x8417918 gText_Brn:: @ 0x8417918
.string "BRN$" .string "BRN$"
gUnknown_841791C:: @ 0x841791C gText_Frz:: @ 0x841791C
.string "FRZ$" .string "FRZ$"
gUnknown_8417920:: @ 0x8417920 gUnknown_8417920:: @ 0x8417920
@@ -1403,394 +1403,394 @@ gUnknown_841792E:: @ 0x841792E
gUnknown_8417933:: @ 0x8417933 gUnknown_8417933:: @ 0x8417933
.string "これから$" .string "これから$"
gUnknown_8417938:: @ 8417938 gText_Yes:: @ 8417938
.string "YES$" .string "YES$"
gUnknown_841793C:: @ 841793C gText_No:: @ 841793C
.string "NO$" .string "NO$"
gUnknown_841793F:: @ 0x841793F gUnknown_841793F:: @ 0x841793F
.string "せつめい$" .string "せつめい$"
gUnknown_8417944:: @ 0x8417944 gText_SingleBattle:: @ 0x8417944
.string "SINGLE BATTLE$" .string "SINGLE BATTLE$"
gUnknown_8417952:: @ 0x8417952 gText_DoubleBattle:: @ 0x8417952
.string "DOUBLE BATTLE$" .string "DOUBLE BATTLE$"
gUnknown_8417960:: @ 0x8417960 gText_MultiBattle:: @ 0x8417960
.string "MULTI BATTLE$" .string "MULTI BATTLE$"
gUnknown_841796D:: @ 0x841796D gText_MakeAChallenge:: @ 0x841796D
.string "Make a challenge.$" .string "Make a challenge.$"
gUnknown_841797F:: @ 0x841797F gText_Info_2:: @ 0x841797F
.string "INFO$" .string "INFO$"
gUnknown_8417984:: @ 0x8417984 gText_FreshWater_200:: @ 0x8417984
.string "FRESH WATER{CLEAR_TO 0x57}{SMALL}¥200$" .string "FRESH WATER{CLEAR_TO 0x57}{SMALL}¥200$"
gUnknown_841799A:: @ 0x841799A gText_SodaPop_300:: @ 0x841799A
.string "SODA POP{CLEAR_TO 0x57}{SMALL}¥300$" .string "SODA POP{CLEAR_TO 0x57}{SMALL}¥300$"
gUnknown_84179AD:: @ 0x84179AD gText_Lemonade_350:: @ 0x84179AD
.string "LEMONADE{CLEAR_TO 0x57}{SMALL}¥350$" .string "LEMONADE{CLEAR_TO 0x57}{SMALL}¥350$"
gUnknown_84179C0:: @ 0x84179C0 gText_50Coins_1000:: @ 0x84179C0
.string "{SMALL} 50 COINS{CLEAR_TO 0x45}¥1,000$" .string "{SMALL} 50 COINS{CLEAR_TO 0x45}¥1,000$"
gUnknown_84179D6:: @ 0x84179D6 gText_500Coins_10000:: @ 0x84179D6
.string "{SMALL}500 COINS{CLEAR_TO 0x40}¥10,000$" .string "{SMALL}500 COINS{CLEAR_TO 0x40}¥10,000$"
gUnknown_84179ED:: @ 0x84179ED gText_Excellent:: @ 0x84179ED
.string "Excellent$" .string "Excellent$"
gUnknown_84179F7:: @ 0x84179F7 gText_NotSoBad:: @ 0x84179F7
.string "Not so bad$" .string "Not so bad$"
gUnknown_8417A02:: @ 0x8417A02 gText_RedShard:: @ 0x8417A02
.string "RED SHARD$" .string "RED SHARD$"
gUnknown_8417A0C:: @ 0x8417A0C gText_YellowShard:: @ 0x8417A0C
.string "YELLOW SHARD$" .string "YELLOW SHARD$"
gUnknown_8417A19:: @ 0x8417A19 gText_BlueShard:: @ 0x8417A19
.string "BLUE SHARD$" .string "BLUE SHARD$"
gUnknown_8417A24:: @ 0x8417A24 gText_GreenShard:: @ 0x8417A24
.string "GREEN SHARD$" .string "GREEN SHARD$"
gUnknown_8417A30:: @ 0x8417A30 gUnknown_8417A30:: @ 0x8417A30
.string "バトルタワ-$" .string "バトルタワ-$"
gUnknown_8417A37:: @ 0x8417A37 gText_Right:: @ 0x8417A37
.string "Right$" .string "Right$"
gUnknown_8417A3D:: @ 0x8417A3D gText_Left:: @ 0x8417A3D
.string "Left$" .string "Left$"
gUnknown_8417A42:: @ 0x8417A42 gText_Tm13_4000Coins:: @ 0x8417A42
.string "TM13{CLEAR_TO 0x48}{SMALL}4,000 COINS$" .string "TM13{CLEAR_TO 0x48}{SMALL}4,000 COINS$"
gUnknown_8417A58:: @ 0x8417A58 gText_Tm23_3500Coins:: @ 0x8417A58
.string "TM23{CLEAR_TO 0x48}{SMALL}3,500 COINS$" .string "TM23{CLEAR_TO 0x48}{SMALL}3,500 COINS$"
gUnknown_8417A6E:: @ 0x8417A6E gText_Tm24_4000Coins:: @ 0x8417A6E
.string "TM24{CLEAR_TO 0x48}{SMALL}4,000 COINS$" .string "TM24{CLEAR_TO 0x48}{SMALL}4,000 COINS$"
gUnknown_8417A84:: @ 0x8417A84 gText_Tm30_4500Coins:: @ 0x8417A84
.string "TM30{CLEAR_TO 0x48}{SMALL}4,500 COINS$" .string "TM30{CLEAR_TO 0x48}{SMALL}4,500 COINS$"
gUnknown_8417A9A:: @ 0x8417A9A gText_Tm35_4000Coins:: @ 0x8417A9A
.string "TM35{CLEAR_TO 0x48}{SMALL}4,000 COINS$" .string "TM35{CLEAR_TO 0x48}{SMALL}4,000 COINS$"
gUnknown_8417AB0:: @ 0x8417AB0 gText_1F_2:: @ 0x8417AB0
.string "1F$" .string "1F$"
gUnknown_8417AB3:: @ 0x8417AB3 gText_2F_2:: @ 0x8417AB3
.string "2F$" .string "2F$"
gUnknown_8417AB6:: @ 0x8417AB6 gText_3F_2:: @ 0x8417AB6
.string "3F$" .string "3F$"
gUnknown_8417AB9:: @ 0x8417AB9 gText_4F_2:: @ 0x8417AB9
.string "4F$" .string "4F$"
gUnknown_8417ABC:: @ 0x8417ABC gText_5F_2:: @ 0x8417ABC
.string "5F$" .string "5F$"
gUnknown_8417ABF:: @ 0x8417ABF gText_Cool:: @ 0x8417ABF
.string "COOL$" .string "COOL$"
gUnknown_8417AC4:: @ 0x8417AC4 gText_Beauty:: @ 0x8417AC4
.string "BEAUTY$" .string "BEAUTY$"
gUnknown_8417ACB:: @ 0x8417ACB gText_Cute:: @ 0x8417ACB
.string "CUTE$" .string "CUTE$"
gUnknown_8417AD0:: @ 0x8417AD0 gText_Smart:: @ 0x8417AD0
.string "SMART$" .string "SMART$"
gUnknown_8417AD6:: @ 0x8417AD6 gText_Tough:: @ 0x8417AD6
.string "TOUGH$" .string "TOUGH$"
gUnknown_8417ADC:: @ 0x8417ADC gText_Normal:: @ 0x8417ADC
.string "NORMAL$" .string "NORMAL$"
gUnknown_8417AE3:: @ 0x8417AE3 gText_Black:: @ 0x8417AE3
.string "BLACK$" .string "BLACK$"
gUnknown_8417AE9:: @ 0x8417AE9 gText_Pink:: @ 0x8417AE9
.string "PINK$" .string "PINK$"
gUnknown_8417AEE:: @ 0x8417AEE gText_Sepia:: @ 0x8417AEE
.string "SEPIA$" .string "SEPIA$"
gUnknown_8417AF4:: @ 0x8417AF4 gText_Cool_2:: @ 0x8417AF4
.string "COOL$" .string "COOL$"
gUnknown_8417AF9:: @ 0x8417AF9 gText_Beauty_2:: @ 0x8417AF9
.string "BEAUTY$" .string "BEAUTY$"
gUnknown_8417B00:: @ 0x8417B00 gText_Cute_2:: @ 0x8417B00
.string "CUTE$" .string "CUTE$"
gUnknown_8417B05:: @ 0x8417B05 gText_Smart_2:: @ 0x8417B05
.string "SMART$" .string "SMART$"
gUnknown_8417B0B:: @ 0x8417B0B gText_Tough_2:: @ 0x8417B0B
.string "TOUGH$" .string "TOUGH$"
gUnknown_8417B11:: @ 0x8417B11 gText_Items:: @ 0x8417B11
.string "ITEMS$" .string "ITEMS$"
gUnknown_8417B17:: @ 0x8417B17 gText_KeyItems:: @ 0x8417B17
.string "KEY ITEMS$" .string "KEY ITEMS$"
gUnknown_8417B21:: @ 0x8417B21 gText_PokeBalls:: @ 0x8417B21
.string "POKé BALLS$" .string "POKé BALLS$"
gUnknown_8417B2C:: @ 0x8417B2C gText_TmsgUnknown_8417B2CHms:: @ 0x8417B2C
.string "TMs & HMs$" .string "TMs & HMs$"
gUnknown_8417B36:: @ 0x8417B36 gText_Berries:: @ 0x8417B36
.string "BERRIES$" .string "BERRIES$"
gUnknown_8417B3E:: @ 0x8417B3E gText_Boulderbadge:: @ 0x8417B3E
.string "BOULDERBADGE$" .string "BOULDERBADGE$"
gUnknown_8417B4B:: @ 0x8417B4B gText_Cascadebadge:: @ 0x8417B4B
.string "CASCADEBADGE$" .string "CASCADEBADGE$"
gUnknown_8417B58:: @ 0x8417B58 gText_Thunderbadge:: @ 0x8417B58
.string "THUNDERBADGE$" .string "THUNDERBADGE$"
gUnknown_8417B65:: @ 0x8417B65 gText_Rainbowbadge:: @ 0x8417B65
.string "RAINBOWBADGE$" .string "RAINBOWBADGE$"
gUnknown_8417B72:: @ 0x8417B72 gText_Soulbadge:: @ 0x8417B72
.string "SOULBADGE$" .string "SOULBADGE$"
gUnknown_8417B7C:: @ 0x8417B7C gText_Marshbadge:: @ 0x8417B7C
.string "MARSHBADGE$" .string "MARSHBADGE$"
gUnknown_8417B87:: @ 0x8417B87 gText_Volcanobadge:: @ 0x8417B87
.string "VOLCANOBADGE$" .string "VOLCANOBADGE$"
gUnknown_8417B94:: @ 0x8417B94 gText_Earthbadge:: @ 0x8417B94
.string "EARTHBADGE$" .string "EARTHBADGE$"
gUnknown_8417B9F:: @ 8417B9F gText_SomeoneSPc:: @ 8417B9F
.string "SOMEONE'S PC$" .string "SOMEONE'S PC$"
gUnknown_8417BAC:: @ 8417BAC gText_BillSPc:: @ 8417BAC
.string "BILL'S PC$" .string "BILL'S PC$"
gUnknown_8417BB6:: @ 8417BB6 gText_SPc:: @ 8417BB6
.string "{PLAYER}'s PC$" .string "{PLAYER}'s PC$"
gUnknown_8417BBE:: @ 8417BBE gText_HallOfFame_2:: @ 8417BBE
.string "HALL OF FAME$" .string "HALL OF FAME$"
gUnknown_8417BCB:: @ 8417BCB gText_LogOff:: @ 8417BCB
.string "LOG OFF$" .string "LOG OFF$"
gUnknown_8417BD3:: @ 8417BD3 gText_ProfOakSPc:: @ 8417BD3
.string "PROF. OAK's PC$" .string "PROF. OAK's PC$"
gUnknown_8417BE2:: @ 0x8417BE2 gText_Eevee:: @ 0x8417BE2
.string "EEVEE$" .string "EEVEE$"
gUnknown_8417BE8:: @ 0x8417BE8 gText_Flareon:: @ 0x8417BE8
.string "FLAREON$" .string "FLAREON$"
gUnknown_8417BF0:: @ 0x8417BF0 gText_Jolteon:: @ 0x8417BF0
.string "JOLTEON$" .string "JOLTEON$"
gUnknown_8417BF8:: @ 0x8417BF8 gText_Vaporeon:: @ 0x8417BF8
.string "VAPOREON$" .string "VAPOREON$"
gUnknown_8417C01:: @ 0x8417C01 gText_QuitLooking:: @ 0x8417C01
.string "Quit looking.$" .string "Quit looking.$"
gUnknown_8417C0F:: @ 0x8417C0F gText_FreshWater:: @ 0x8417C0F
.string "FRESH WATER$" .string "FRESH WATER$"
gUnknown_8417C1B:: @ 0x8417C1B gText_SodaPop:: @ 0x8417C1B
.string "SODA POP$" .string "SODA POP$"
gUnknown_8417C24:: @ 0x8417C24 gText_Lemonade:: @ 0x8417C24
.string "LEMONADE$" .string "LEMONADE$"
gUnknown_8417C2D:: @ 8417C2D gText_Coins_2:: @ 8417C2D
.string "COINS$" .string "COINS$"
gUnknown_8417C33:: @ 0x8417C33 gText_Bicycle_1000000:: @ 0x8417C33
.string "BICYCLE{CLEAR_TO 0x49}{SMALL}¥1,000,000$" .string "BICYCLE{CLEAR_TO 0x49}{SMALL}¥1,000,000$"
gUnknown_8417C4B:: @ 0x8417C4B gText_NoThanks:: @ 0x8417C4B
.string "NO THANKS$" .string "NO THANKS$"
gUnknown_8417C55:: @ 0x8417C55 gText_Abra_180Coins:: @ 0x8417C55
.string "ABRA{CLEAR_TO 0x55}{SMALL} 180 COINS$" .string "ABRA{CLEAR_TO 0x55}{SMALL} 180 COINS$"
gUnknown_8417C6A:: @ 0x8417C6A gText_Clefairy_500Coins:: @ 0x8417C6A
.string "CLEFAIRY{CLEAR_TO 0x55}{SMALL} 500 COINS$" .string "CLEFAIRY{CLEAR_TO 0x55}{SMALL} 500 COINS$"
gUnknown_8417C83:: @ 0x8417C83 gText_Dratini_2800Coins:: @ 0x8417C83
.string "DRATINI{CLEAR_TO 0x4B}{SMALL} 2,800 COINS$" .string "DRATINI{CLEAR_TO 0x4B}{SMALL} 2,800 COINS$"
gUnknown_8417C9D:: @ 0x8417C9D gText_Scyther_5500Coins:: @ 0x8417C9D
.string "SCYTHER{CLEAR_TO 0x4B}{SMALL} 5,500 COINS$" .string "SCYTHER{CLEAR_TO 0x4B}{SMALL} 5,500 COINS$"
gUnknown_8417CB7:: @ 0x8417CB7 gText_Porygon_9999Coins:: @ 0x8417CB7
.string "PORYGON{CLEAR_TO 0x4B}{SMALL} 9,999 COINS$" .string "PORYGON{CLEAR_TO 0x4B}{SMALL} 9,999 COINS$"
gUnknown_8417CD1:: @ 0x8417CD1 gText_Abra_120Coins:: @ 0x8417CD1
.string "ABRA{CLEAR_TO 0x55}{SMALL} 120 COINS$" .string "ABRA{CLEAR_TO 0x55}{SMALL} 120 COINS$"
gUnknown_8417CE6:: @ 0x8417CE6 gText_Clefairy_750Coins:: @ 0x8417CE6
.string "CLEFAIRY{CLEAR_TO 0x55}{SMALL} 750 COINS$" .string "CLEFAIRY{CLEAR_TO 0x55}{SMALL} 750 COINS$"
gUnknown_8417CFF:: @ 0x8417CFF gText_Pinsir_2500Coins:: @ 0x8417CFF
.string "PINSIR{CLEAR_TO 0x4B}{SMALL} 2,500 COINS$" .string "PINSIR{CLEAR_TO 0x4B}{SMALL} 2,500 COINS$"
gUnknown_8417D18:: @ 0x8417D18 gText_Dratini_4600Coins:: @ 0x8417D18
.string "DRATINI{CLEAR_TO 0x4B}{SMALL} 4,600 COINS$" .string "DRATINI{CLEAR_TO 0x4B}{SMALL} 4,600 COINS$"
gUnknown_8417D32:: @ 0x8417D32 gText_Porygon_6500Coins:: @ 0x8417D32
.string "PORYGON{CLEAR_TO 0x4B}{SMALL} 6,500 COINS$" .string "PORYGON{CLEAR_TO 0x4B}{SMALL} 6,500 COINS$"
gUnknown_8417D4C:: @ 0x8417D4C gText_NoThanks_2:: @ 0x8417D4C
.string "NO THANKS$" .string "NO THANKS$"
gUnknown_8417D56:: @ 0x8417D56 gText_HelixFossil:: @ 0x8417D56
.string "HELIX FOSSIL$" .string "HELIX FOSSIL$"
gUnknown_8417D63:: @ 0x8417D63 gText_DomeFossil:: @ 0x8417D63
.string "DOME FOSSIL$" .string "DOME FOSSIL$"
gUnknown_8417D6F:: @ 0x8417D6F gText_OldAmber:: @ 0x8417D6F
.string "OLD AMBER$" .string "OLD AMBER$"
gUnknown_8417D79:: @ 0x8417D79 gText_TradeCenter:: @ 0x8417D79
.string "TRADE CENTER$" .string "TRADE CENTER$"
gUnknown_8417D86:: @ 0x8417D86 gText_Colosseum:: @ 0x8417D86
.string "COLOSSEUM$" .string "COLOSSEUM$"
gUnknown_8417D90:: @ 0x8417D90 gText_GameLinkCable:: @ 0x8417D90
.string "Game Link cable$" .string "Game Link cable$"
gUnknown_8417DA0:: @ 0x8417DA0 gText_Wireless:: @ 0x8417DA0
.string "Wireless$" .string "Wireless$"
gUnknown_8417DA9:: @ 0x8417DA9 gText_ItemsPocket:: @ 0x8417DA9
.string "ITEMS POCKET$" .string "ITEMS POCKET$"
gUnknown_8417DB6:: @ 0x8417DB6 gText_KeyItemsPocket:: @ 0x8417DB6
.string "KEY ITEMS POCKET$" .string "KEY ITEMS POCKET$"
gUnknown_8417DC7:: @ 0x8417DC7 gText_PokeBallsPocket:: @ 0x8417DC7
.string "POKé BALLS POCKET$" .string "POKé BALLS POCKET$"
gUnknown_8417DD9:: @ 0x8417DD9 gText_TmCase:: @ 0x8417DD9
.string "TM CASE$" .string "TM CASE$"
gUnknown_8417DE1:: @ 0x8417DE1 gText_BerryPouch_2:: @ 0x8417DE1
.string "BERRY POUCH$" .string "BERRY POUCH$"
gUnknown_8417DED:: @ 8417DED gText_Other:: @ 8417DED
.string "OTHER$" .string "OTHER$"
gUnknown_8417DF3:: @ 0x8417DF3 gText_OneIsland:: @ 0x8417DF3
.string "ONE ISLAND$" .string "ONE ISLAND$"
gUnknown_8417DFE:: @ 0x8417DFE gText_TwoIsland:: @ 0x8417DFE
.string "TWO ISLAND$" .string "TWO ISLAND$"
gUnknown_8417E09:: @ 0x8417E09 gText_ThreeIsland:: @ 0x8417E09
.string "THREE ISLAND$" .string "THREE ISLAND$"
gUnknown_8417E16:: @ 0x8417E16 gText_FourIsland:: @ 0x8417E16
.string "FOUR ISLAND$" .string "FOUR ISLAND$"
gUnknown_8417E22:: @ 0x8417E22 gText_FiveIsland:: @ 0x8417E22
.string "FIVE ISLAND$" .string "FIVE ISLAND$"
gUnknown_8417E2E:: @ 0x8417E2E gText_SixIsland:: @ 0x8417E2E
.string "SIX ISLAND$" .string "SIX ISLAND$"
gUnknown_8417E39:: @ 0x8417E39 gText_SevenIsland:: @ 0x8417E39
.string "SEVEN ISLAND$" .string "SEVEN ISLAND$"
gUnknown_8417E46:: @ 0x8417E46 gText_Vermilion:: @ 0x8417E46
.string "VERMILION$" .string "VERMILION$"
gUnknown_8417E50:: @ 0x8417E50 gText_Colosseum_2:: @ 0x8417E50
.string "COLOSSEUM$" .string "COLOSSEUM$"
gUnknown_8417E5A:: @ 0x8417E5A gText_BerryCrush:: @ 0x8417E5A
.string "BERRY CRUSH$" .string "BERRY CRUSH$"
gUnknown_8417E66:: @ 0x8417E66 gText_Dummy_8417E66:: @ 0x8417E66
.string "$" .string "$"
gUnknown_8417E67:: @ 0x8417E67 gText_Dummy_8417E67:: @ 0x8417E67
.string "$" .string "$"
gUnknown_8417E68:: @ 0x8417E68 gUnknown_8417E68:: @ 0x8417E68
.string "せつめいを きく$" .string "せつめいを きく$"
gUnknown_8417E71:: @ 0x8417E71 gText_Dummy_8417E71:: @ 0x8417E71
.string "$" .string "$"
gUnknown_8417E72:: @ 0x8417E72 gText_PokemonJump:: @ 0x8417E72
.string "POKéMON JUMP$" .string "POKéMON JUMP$"
gUnknown_8417E7F:: @ 0x8417E7F gText_DodrioBerryPicking:: @ 0x8417E7F
.string "DODRIO BERRY-PICKING$" .string "DODRIO BERRY-PICKING$"
gUnknown_8417E94:: @ 0x8417E94 gText_2Tinymushrooms:: @ 0x8417E94
.string "2 TINYMUSHROOMS$" .string "2 TINYMUSHROOMS$"
gUnknown_8417EA4:: @ 0x8417EA4 gText_1BigMushroom:: @ 0x8417EA4
.string "1 BIG MUSHROOM$" .string "1 BIG MUSHROOM$"
gUnknown_8417EB3:: @ 0x8417EB3 gText_SeviiIslands:: @ 0x8417EB3
.string "SEVII ISLANDS$" .string "SEVII ISLANDS$"
gUnknown_8417EC1:: @ 0x8417EC1 gText_NavelRock:: @ 0x8417EC1
.string "NAVEL ROCK$" .string "NAVEL ROCK$"
gUnknown_8417ECC:: @ 0x8417ECC gText_BirthIsland:: @ 0x8417ECC
.string "BIRTH ISLAND$" .string "BIRTH ISLAND$"
gUnknown_8417ED9:: @ 0x8417ED9 gText_MiracleSeed_1000Coins:: @ 0x8417ED9
.string "MIRACLE SEED{CLEAR_TO 0x50}{SMALL}1,000 COINS$" .string "MIRACLE SEED{CLEAR_TO 0x50}{SMALL}1,000 COINS$"
gUnknown_8417EF7:: @ 0x8417EF7 gText_Charcoal_1000Coins:: @ 0x8417EF7
.string "CHARCOAL{CLEAR_TO 0x50}{SMALL}1,000 COINS$" .string "CHARCOAL{CLEAR_TO 0x50}{SMALL}1,000 COINS$"
gUnknown_8417F11:: @ 0x8417F11 gText_MysticWater_1000Coins:: @ 0x8417F11
.string "MYSTIC WATER{CLEAR_TO 0x50}{SMALL}1,000 COINS$" .string "MYSTIC WATER{CLEAR_TO 0x50}{SMALL}1,000 COINS$"
gUnknown_8417F2F:: @ 0x8417F2F gText_YellowFlute_1600Coins:: @ 0x8417F2F
.string "YELLOW FLUTE{CLEAR_TO 0x50}{SMALL}1,600 COINS$" .string "YELLOW FLUTE{CLEAR_TO 0x50}{SMALL}1,600 COINS$"
gUnknown_8417F4D:: @ 0x8417F4D gText_SmokeBall_800Coins:: @ 0x8417F4D
.string "SMOKE BALL{CLEAR_TO 0x5A}{SMALL}800 COINS$" .string "SMOKE BALL{CLEAR_TO 0x5A}{SMALL}800 COINS$"
gUnknown_8417F67:: @ 0x8417F67 gText_Dummy_8417F67:: @ 0x8417F67
.string "$" .string "$"
gUnknown_8417F68:: @ 0x8417F68 gText_Dummy_8417F68:: @ 0x8417F68
.string "$" .string "$"
gUnknown_8417F69:: @ 0x8417F69 gText_BecomeLeader:: @ 0x8417F69
.string "BECOME LEADER$" .string "BECOME LEADER$"
gUnknown_8417F77:: @ 0x8417F77 gText_JoinGroup:: @ 0x8417F77
.string "JOIN GROUP$" .string "JOIN GROUP$"
gOtherText_Single:: @ 0x8417F82 gOtherText_Single:: @ 0x8417F82
@@ -1820,133 +1820,133 @@ gUnknown_8417FB6:: @ 0x8417FB6
gUnknown_8417FB9:: @ 8417FB9 gUnknown_8417FB9:: @ 8417FB9
.string ".$" .string ".$"
gUnknown_8417FBB:: @ 8417FBB gText_BigGuy:: @ 8417FBB
.string "Big guy$" .string "Big guy$"
gUnknown_8417FC3:: @ 8417FC3 gText_BigGirl:: @ 8417FC3
.string "Big girl$" .string "Big girl$"
gUnknown_8417FCC:: @ 8417FCC gText_Daughter:: @ 8417FCC
.string "son$" .string "son$"
gUnknown_8417FD0:: @ 8417FD0 gText_Son:: @ 8417FD0
.string "daughter$" .string "daughter$"
gUnknown_8417FD9:: @ 0x8417FD9 gText_BoulderBadge:: @ 0x8417FD9
.string "BOULDERBADGE$" .string "BOULDERBADGE$"
gUnknown_8417FE6:: @ 0x8417FE6 gText_CascadeBadge:: @ 0x8417FE6
.string "CASCADEBADGE$" .string "CASCADEBADGE$"
gUnknown_8417FF3:: @ 0x8417FF3 gText_ThunderBadge:: @ 0x8417FF3
.string "THUNDERBADGE$" .string "THUNDERBADGE$"
gUnknown_8418000:: @ 0x8418000 gText_RainbowBadge:: @ 0x8418000
.string "RAINBOWBADGE$" .string "RAINBOWBADGE$"
gUnknown_841800D:: @ 0x841800D gText_SoulBadge:: @ 0x841800D
.string "SOULBADGE$" .string "SOULBADGE$"
gUnknown_8418017:: @ 0x8418017 gText_MarshBadge:: @ 0x8418017
.string "MARSHBADGE$" .string "MARSHBADGE$"
gUnknown_8418022:: @ 0x8418022 gText_VolcanoBadge:: @ 0x8418022
.string "VOLCANOBADGE$" .string "VOLCANOBADGE$"
gUnknown_841802F:: @ 0x841802F gText_EarthBadge:: @ 0x841802F
.string "EARTHBADGE$" .string "EARTHBADGE$"
gUnknown_841803A:: @ 0x841803A gText_1F:: @ 0x841803A
.string "1F$" .string "1F$"
gUnknown_841803D:: @ 0x841803D gText_2F:: @ 0x841803D
.string "2F$" .string "2F$"
gUnknown_8418040:: @ 0x8418040 gText_3F:: @ 0x8418040
.string "3F$" .string "3F$"
gUnknown_8418043:: @ 0x8418043 gText_4F:: @ 0x8418043
.string "4F$" .string "4F$"
gUnknown_8418046:: @ 0x8418046 gText_5F:: @ 0x8418046
.string "5F$" .string "5F$"
gUnknown_8418049:: @ 0x8418049 gText_6F:: @ 0x8418049
.string "6F$" .string "6F$"
gUnknown_841804C:: @ 0x841804C gText_7F:: @ 0x841804C
.string "7F$" .string "7F$"
gUnknown_841804F:: @ 0x841804F gText_8F:: @ 0x841804F
.string "8F$" .string "8F$"
gUnknown_8418052:: @ 0x8418052 gText_9F:: @ 0x8418052
.string "9F$" .string "9F$"
gUnknown_8418055:: @ 0x8418055 gText_10F:: @ 0x8418055
.string "10F$" .string "10F$"
gUnknown_8418059:: @ 0x8418059 gText_11F:: @ 0x8418059
.string "11F$" .string "11F$"
gUnknown_841805D:: @ 0x841805D gText_B1F:: @ 0x841805D
.string "B1F$" .string "B1F$"
gUnknown_8418061:: @ 0x8418061 gText_B2F:: @ 0x8418061
.string "B2F$" .string "B2F$"
gUnknown_8418065:: @ 0x8418065 gText_B3F:: @ 0x8418065
.string "B3F$" .string "B3F$"
gUnknown_8418069:: @ 0x8418069 gText_B4F:: @ 0x8418069
.string "B4F$" .string "B4F$"
gUnknown_841806D:: @ 0x841806D gText_Rooftop:: @ 0x841806D
.string "ROOFTOP$" .string "ROOFTOP$"
gUnknown_8418075:: @ 8418075 gText_NowOn:: @ 8418075
.string "Now on:$" .string "Now on:$"
gUnknown_841807D:: @ 0x841807D gText_LinkedGamePlay:: @ 0x841807D
.string "LINKED GAME PLAY$" .string "LINKED GAME PLAY$"
gUnknown_841808E:: @ 0x841808E gText_DirectCorner:: @ 0x841808E
.string "DIRECT CORNER$" .string "DIRECT CORNER$"
gUnknown_841809C:: @ 0x841809C gText_UnionRoom:: @ 0x841809C
.string "UNION ROOM$" .string "UNION ROOM$"
gUnknown_84180A7:: @ 0x84180A7 gText_Energypowder_50:: @ 0x84180A7
.string "ENERGYPOWDER{CLEAR_TO 0x74}{SMALL}50$" .string "ENERGYPOWDER{CLEAR_TO 0x74}{SMALL}50$"
gUnknown_84180BC:: @ 0x84180BC gText_EnergyRoot_80:: @ 0x84180BC
.string "ENERGY ROOT{CLEAR_TO 0x74}{SMALL}80$" .string "ENERGY ROOT{CLEAR_TO 0x74}{SMALL}80$"
gUnknown_84180D0:: @ 0x84180D0 gText_HealPowder_50:: @ 0x84180D0
.string "HEAL POWDER{CLEAR_TO 0x74}{SMALL}50$" .string "HEAL POWDER{CLEAR_TO 0x74}{SMALL}50$"
gUnknown_84180E4:: @ 0x84180E4 gText_RevivalHerb_300:: @ 0x84180E4
.string "REVIVAL HERB{CLEAR_TO 0x6F}{SMALL}300$" .string "REVIVAL HERB{CLEAR_TO 0x6F}{SMALL}300$"
gUnknown_84180FA:: @ 0x84180FA gText_Protein_1000:: @ 0x84180FA
.string "PROTEIN{CLEAR_TO 0x65}{SMALL}1,000$" .string "PROTEIN{CLEAR_TO 0x65}{SMALL}1,000$"
gUnknown_841810D:: @ 0x841810D gText_Iron_1000:: @ 0x841810D
.string "IRON{CLEAR_TO 0x65}{SMALL}1,000$" .string "IRON{CLEAR_TO 0x65}{SMALL}1,000$"
gUnknown_841811D:: @ 0x841811D gText_Carbos_1000:: @ 0x841811D
.string "CARBOS{CLEAR_TO 0x65}{SMALL}1,000$" .string "CARBOS{CLEAR_TO 0x65}{SMALL}1,000$"
gUnknown_841812F:: @ 0x841812F gText_Calcium_1000:: @ 0x841812F
.string "CALCIUM{CLEAR_TO 0x65}{SMALL}1,000$" .string "CALCIUM{CLEAR_TO 0x65}{SMALL}1,000$"
gUnknown_8418142:: @ 0x8418142 gText_Zinc_1000:: @ 0x8418142
.string "ZINC{CLEAR_TO 0x65}{SMALL}1,000$" .string "ZINC{CLEAR_TO 0x65}{SMALL}1,000$"
gUnknown_8418152:: @ 0x8418152 gText_HpUp_1000:: @ 0x8418152
.string "HP UP{CLEAR_TO 0x65}{SMALL}1,000$" .string "HP UP{CLEAR_TO 0x65}{SMALL}1,000$"
gUnknown_8418163:: @ 0x8418163 gText_PpUp_3000:: @ 0x8418163
.string "PP UP{CLEAR_TO 0x65}{SMALL}3,000$" .string "PP UP{CLEAR_TO 0x65}{SMALL}3,000$"
gString_BattleRecords_PlayersBattleResults:: @ 8418174 gString_BattleRecords_PlayersBattleResults:: @ 8418174
include/constants/menu.h
+73
View File
@@ -0,0 +1,73 @@
#ifndef GUARD_CONSTANTS_MENU_H
#define GUARD_CONSTANTS_MENU_H
#define SCR_MENU_CANCEL 127
#define SCR_MENU_UNSET 255
#define MULTICHOICE_YES_NO 0
#define MULTICHOICE_EEVEELUTIONS 1
#define MULTICHOICE_TRAINER_CARD_ICON_TINT 2
#define MULTICHOICE_HOF_QUIT 3
#define MULTICHOICE_EGGS_QUIT 4
#define MULTICHOICE_VICTORIES_QUIT 5
#define MULTICHOICE_HOF_EGGS_QUIT 6
#define MULTICHOICE_HOF_VICTORIES_QUIT 7
#define MULTICHOICE_EGGS_VICTORIES_QUIT 8
#define MULTICHOICE_HOF_EGGS_VICTORIES_QUIT 9
#define MULTICHOICE_EXIT 10
#define MULTICHOICE_EXIT_2 11
#define MULTICHOICE_EXIT_3 12
#define MULTICHOICE_BIKE_SHOP 13
#define MULTICHOICE_GAME_CORNER_POKEMON_PRIZES 14
#define MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD 15
#define MULTICHOICE_YES_NO_INFO 16
#define MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT 17
#define MULTICHOICE_YES_NO_INFO_2 18
#define MULTICHOICE_CHALLENGE_INFO_EXIT 19
#define MULTICHOICE_ROOFTOP_B1F 20
#define MULTICHOICE_HELIX 21
#define MULTICHOICE_DOME 22
#define MULTICHOICE_AMBER 23
#define MULTICHOICE_HELIX_AMBER 24
#define MULTICHOICE_DOME_AMBER 25
#define MULTICHOICE_CELADON_VENDING_MACHINE 26
#define MULTICHOICE_GAME_CORNER_COIN_PURCHASE_COUNTER 27
#define MULTICHOICE_EXCELLENT_NOT_SO_BAD 28
#define MULTICHOICE_RIGHT_LEFT 29
#define MULTICHOICE_GAME_CORNER_TMPRIZES 30
#define MULTICHOICE_DEPT_STORE_ELEVATOR 31
#define MULTICHOICE_THIRSTY_GIRL_FRESH_WATER 32
#define MULTICHOICE_THIRSTY_GIRL_SODA_POP 33
#define MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP 34
#define MULTICHOICE_THIRSTY_GIRL_LEMONADE 35
#define MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_LEMONADE 36
#define MULTICHOICE_THIRSTY_GIRL_SODA_POP_LEMONADE 37
#define MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP_LEMONADE 38
#define MULTICHOICE_TRADE_CENTER_COLOSSEUM 39
#define MULTICHOICE_LINK_WIRELESS 40
#define MULTICHOICE_GAME_CORNER_BATTLE_ITEM_PRIZES 41
#define MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR 42
#define MULTICHOICE_LINKED_DIRECT_UNION 43
#define MULTICHOICE_ISLAND_23 44
#define MULTICHOICE_ISLAND_13 45
#define MULTICHOICE_ISLAND_12 46
#define MULTICHOICE_TRADE_COLOSSEUM_CRUSH 47
#define MULTICHOICE_48 48
#define MULTICHOICE_POKEJUMP_DODRIO 49
#define MULTICHOICE_TRADE_COLOSSEUM_2 50
#define MULTICHOICE_MUSHROOMS 51
#define MULTICHOICE_TRADE_COLOSSEUM_BLANK_CRUSH 52
#define MULTICHOICE_TRADE_COLOSSEUM_BLANK 53
#define MULTICHOICE_SEVII_NAVEL 54
#define MULTICHOICE_SEVII_BIRTH 55
#define MULTICHOICE_SEVII_NAVEL_BIRTH 56
#define MULTICHOICE_SEAGALLOP_123 57
#define MULTICHOICE_SEAGALLOP_V23 58
#define MULTICHOICE_SEAGALLOP_V13 59
#define MULTICHOICE_SEAGALLOP_V12 60
#define MULTICHOICE_SEAGALLOP_VERMILION 61
#define MULTICHOICE_62 62
#define MULTICHOICE_JOIN_OR_LEAD 63
#define MULTICHOICE_TRAINER_TOWER_MODE 64
#endif //GUARD_CONSTANTS_MENU_H
include/constants/seagallop.h
+2
View File
@@ -13,4 +13,6 @@
#define SEAGALLOP_NAVEL_ROCK 9 #define SEAGALLOP_NAVEL_ROCK 9
#define SEAGALLOP_BIRTH_ISLAND 10 #define SEAGALLOP_BIRTH_ISLAND 10
#define SEAGALLOP_MORE 254
#endif //GUARD_CONSTANTS_SEAGALLOP_H #endif //GUARD_CONSTANTS_SEAGALLOP_H
include/event_scripts.h
+9
View File
@@ -1177,4 +1177,13 @@ extern const u8 gText_SavingDontTurnOffThePower[];
extern const u8 gText_PlayerSavedTheGame[]; extern const u8 gText_PlayerSavedTheGame[];
extern const u8 gText_DifferentGameFile[]; extern const u8 gText_DifferentGameFile[];
// script_menu
extern const u8 EventScript_1A7AE0[];
extern const u8 Text_1BC388[];
extern const u8 Text_1BC3C7[];
extern const u8 Text_1BCB42[];
extern const u8 Text_1BCA95[];
extern const u8 Text_1BCACB[];
extern const u8 Text_1BCAF2[];
#endif //GUARD_EVENT_SCRIPTS_H #endif //GUARD_EVENT_SCRIPTS_H
include/field_effect.h
+2
View File
@@ -21,5 +21,7 @@ void sub_8084784(u8 a0, u8 a1);
void sub_8084F2C(u8 a0); void sub_8084F2C(u8 a0);
void sub_80853CC(u8 a0); void sub_80853CC(u8 a0);
void sub_8083598(u8 a0); void sub_8083598(u8 a0);
void sub_8083A5C(struct Sprite * sprite, u8 spriteId);
u8 sub_8083970(u16 species, s16 x, s16 y, bool8 unused);
#endif //GUARD_FIELD_EFFECTS_H #endif //GUARD_FIELD_EFFECTS_H
include/quest_log.h
+1 -1
View File
@@ -27,7 +27,7 @@ void sub_8113550(u16, const u16 *);
void sub_811539C(void); void sub_811539C(void);
void sub_8115748(u16); void sub_8115748(u16);
u8 sub_8112CAC(void); u8 sub_8112CAC(void);
bool8 sub_81119D4(void (*func)(void)); bool8 QuestLog_SchedulePlaybackCB(void (*func)(void));
void sub_8111F38(u16, u16); void sub_8111F38(u16, u16);
void sub_8111134(void); void sub_8111134(void);
void DestroyHelpMessageWindow(u8 a0); void DestroyHelpMessageWindow(u8 a0);
include/script_menu.h
+3 -3
View File
@@ -3,18 +3,18 @@
#include "global.h" #include "global.h"
extern const u8 *const gStdStringPtrs[9]; extern const u8 *const gStdStringPtrs[];
bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4); bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4);
bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5); bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5);
bool8 ScriptMenu_YesNo(u8 var1, u8 var2); bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount); bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
bool32 ScrSpecial_CreatePCMenu(void); bool8 ScrSpecial_CreatePCMenu(void);
void ScriptMenu_DisplayPCStartupPrompt(void); void ScriptMenu_DisplayPCStartupPrompt(void);
bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
void sub_809D6D4(void); void QLPlaybackCB_DestroyScriptMenuMonPicSprites(void);
void sub_809D424(void); void sub_809D424(void);
#endif //GUARD_SCRIPT_MENU_H #endif //GUARD_SCRIPT_MENU_H
include/seagallop.h
+1 -1
View File
@@ -3,6 +3,6 @@
#include "constants/seagallop.h" #include "constants/seagallop.h"
void ScrSpecial_SeaGallopFerry(void); void ScrSpecial_SeagallopFerry(void);
#endif //GUARD_SEAGALLOP_H #endif //GUARD_SEAGALLOP_H
include/strings.h
+187 -60
View File
@@ -91,7 +91,6 @@ extern const u8 gText_PkmnFainted3[];
extern const u8 gText_Coins[]; extern const u8 gText_Coins[];
extern const u8 gText_EggNickname[]; extern const u8 gText_EggNickname[];
extern const u8 gStartMenuText_Pokemon[]; extern const u8 gStartMenuText_Pokemon[];
extern const u8 gText_PkmnFainted3[];
extern const u8 gOtherText_Use[]; extern const u8 gOtherText_Use[];
extern const u8 gOtherText_Toss[]; extern const u8 gOtherText_Toss[];
@@ -99,7 +98,6 @@ extern const u8 gOtherText_Give[];
extern const u8 gOtherText_Exit[]; extern const u8 gOtherText_Exit[];
extern const u8 gText_ThreeHyphens[]; extern const u8 gText_ThreeHyphens[];
extern const u8 gOtherText_UnkF9_08_Clear_01[]; extern const u8 gOtherText_UnkF9_08_Clear_01[];
extern const u8 gFameCheckerText_ListMenuCursor[];
extern const u8 gText_TimesStrVar1[]; extern const u8 gText_TimesStrVar1[];
extern const u8 gText_IsSelected[]; extern const u8 gText_IsSelected[];
extern const u8 gText_ThereIsNoPokemon[]; extern const u8 gText_ThereIsNoPokemon[];
@@ -116,6 +114,16 @@ extern const u8 gText_TurnedOverItemsWorthYen[];
extern const u8 gPokeDudeText_TMTypes[]; extern const u8 gPokeDudeText_TMTypes[];
extern const u8 gPokeDudeText_ReadTMDescription[]; extern const u8 gPokeDudeText_ReadTMDescription[];
extern const u8 gFameCheckerText_Cancel[]; extern const u8 gFameCheckerText_Cancel[];
extern const u8 gFameCheckerText_ListMenuCursor[];
extern const u8 gFameCheckerText_FameCheckerWillBeClosed[];
extern const u8 gFameCheckerText_ClearTextbox[];
extern const u8 gFameCheckerText_MainScreenUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$"
extern const u8 gFameCheckerText_PickScreenUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$"
extern const u8 gFameCheckerText_FlavorTextUI[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_A_BUTTON}READ {KEYGFX_B_BUTTON}CANCEL$"
extern const u8 gFameCheckerOakName[]; // "OAK$"
extern const u8 gFameCheckerDaisyName[]; // "DAISY$"
extern const u8 gFameCheckerBillName[]; // "BILL$"
extern const u8 gFameCheckerMrFujiName[]; // "FUJI$"
// teachy_tv // teachy_tv
extern const u8 gTeachyTvString_TeachBattle[]; extern const u8 gTeachyTvString_TeachBattle[];
@@ -151,8 +159,6 @@ extern const u8 gString_Someone[];
extern const u8 gString_Help[]; extern const u8 gString_Help[];
extern const u8 gString_HelpSystem_ClearTo8[]; extern const u8 gString_HelpSystem_ClearTo8[];
extern const u8 gOtherText_Give[];
extern const u8 gFameCheckerText_Cancel[];
extern const u8 gOtherText_StrVar1[]; extern const u8 gOtherText_StrVar1[];
extern const u8 gOtherText_WhereShouldTheStrVar1BePlaced[]; extern const u8 gOtherText_WhereShouldTheStrVar1BePlaced[];
extern const u8 gOtherText_Powder[]; extern const u8 gOtherText_Powder[];
@@ -185,7 +191,6 @@ extern const u8 BattleText_Rose[];
extern const u8 BattleText_UnknownString3[]; extern const u8 BattleText_UnknownString3[];
extern const u8 BattleText_GetPumped[]; extern const u8 BattleText_GetPumped[];
extern const u8 BattleText_MistShroud[]; extern const u8 BattleText_MistShroud[];
extern const u8 gText_EggNickname[];
extern const u8 gText_BadEgg[]; extern const u8 gText_BadEgg[];
extern const u8 gText_PkmnsXPreventsSwitching[]; extern const u8 gText_PkmnsXPreventsSwitching[];
extern u8 *gUnknown_83FD5D0[]; extern u8 *gUnknown_83FD5D0[];
@@ -218,7 +223,6 @@ extern const u8 gUnknown_83FE6E6[];
extern const u8 gText_BattleSwitchWhich[]; extern const u8 gText_BattleSwitchWhich[];
extern const u8 gUnknown_83FE770[]; extern const u8 gUnknown_83FE770[];
extern const u8 gText_MoveInterfacePP[]; extern const u8 gText_MoveInterfacePP[];
extern const u8 gUnknown_83FE770[];
extern const u8 gText_MoveInterfaceType[]; extern const u8 gText_MoveInterfaceType[];
extern const u8 gText_LinkStandby[]; extern const u8 gText_LinkStandby[];
extern const u8 gUnknown_83FE725[]; extern const u8 gUnknown_83FE725[];
@@ -356,14 +360,6 @@ extern const u8 gText_NewGame[];
extern const u8 gText_Continue[]; extern const u8 gText_Continue[];
extern const u8 gText_MysteryGift[]; extern const u8 gText_MysteryGift[];
extern const u8 gText_WirelessAdapterIsNotConnected[]; extern const u8 gText_WirelessAdapterIsNotConnected[];
extern const u8 gText_WirelessAdapterIsNotConnected[];
extern const u8 gText_WirelessAdapterIsNotConnected[];
extern const u8 gText_WirelessAdapterIsNotConnected[];
extern const u8 gText_WirelessAdapterIsNotConnected[];
extern const u8 gText_WirelessAdapterIsNotConnected[];
extern const u8 gText_WirelessAdapterIsNotConnected[];
extern const u8 gText_WirelessAdapterIsNotConnected[];
extern const u8 gText_WirelessAdapterIsNotConnected[];
extern const u8 gText_MysteryGiftCantBeUsedWhileWirelessAdapterIsAttached[]; extern const u8 gText_MysteryGiftCantBeUsedWhileWirelessAdapterIsAttached[];
extern const u8 gText_Player[]; extern const u8 gText_Player[];
extern const u8 gText_Time[]; extern const u8 gText_Time[];
@@ -393,7 +389,6 @@ extern const u8 gText_WonderNews[];
extern const u8 gText_Exit3[]; extern const u8 gText_Exit3[];
extern const u8 gText_WirelessCommunication[]; extern const u8 gText_WirelessCommunication[];
extern const u8 gText_Friend2[]; extern const u8 gText_Friend2[];
extern const u8 gFameCheckerText_Cancel[];
extern const u8 gText_Receive[]; extern const u8 gText_Receive[];
extern const u8 gText_Send[]; extern const u8 gText_Send[];
extern const u8 gText_Toss[]; extern const u8 gText_Toss[];
@@ -460,7 +455,6 @@ extern const u8 gText_MailReturnedToBagMessageErased[];
// start_menu // start_menu
extern const u8 gStartMenuText_Pokedex[]; extern const u8 gStartMenuText_Pokedex[];
extern const u8 gStartMenuText_Pokemon[];
extern const u8 gStartMenuText_Bag[]; extern const u8 gStartMenuText_Bag[];
extern const u8 gStartMenuText_Player[]; extern const u8 gStartMenuText_Player[];
extern const u8 gStartMenuText_Save[]; extern const u8 gStartMenuText_Save[];
@@ -471,7 +465,6 @@ extern const u8 gUnknown_84162A9[];
extern const u8 gStartMenuDesc_Pokedex[]; extern const u8 gStartMenuDesc_Pokedex[];
extern const u8 gStartMenuDesc_Pokemon[]; extern const u8 gStartMenuDesc_Pokemon[];
extern const u8 gStartMenuDesc_Bag[]; extern const u8 gStartMenuDesc_Bag[];
extern const u8 gStartMenuDesc_Player[];
extern const u8 gStartMenuDesc_Save[]; extern const u8 gStartMenuDesc_Save[];
extern const u8 gStartMenuDesc_Option[]; extern const u8 gStartMenuDesc_Option[];
extern const u8 gStartMenuDesc_Exit[]; extern const u8 gStartMenuDesc_Exit[];
@@ -488,49 +481,183 @@ extern const u8 gSaveStatName_Time[];
extern const u8 gText_From[]; extern const u8 gText_From[];
// field_specials // field_specials
extern const u8 gUnknown_8417FBB[]; extern const u8 gText_BigGuy[];
extern const u8 gUnknown_8417FC3[]; extern const u8 gText_BigGirl[];
extern const u8 gUnknown_8417FD0[]; extern const u8 gText_Son[];
extern const u8 gUnknown_8417FCC[]; extern const u8 gText_Daughter[];
extern const u8 gUnknown_8418075[]; extern const u8 gText_NowOn[];
extern const u8 gUnknown_8418069[]; extern const u8 gText_B4F[];
extern const u8 gUnknown_8418065[]; extern const u8 gText_B3F[];
extern const u8 gUnknown_8418061[]; extern const u8 gText_B2F[];
extern const u8 gUnknown_841805D[]; extern const u8 gText_B1F[];
extern const u8 gUnknown_841803A[]; extern const u8 gText_1F[];
extern const u8 gUnknown_841803D[]; extern const u8 gText_2F[];
extern const u8 gUnknown_8418040[]; extern const u8 gText_3F[];
extern const u8 gUnknown_8418043[]; extern const u8 gText_4F[];
extern const u8 gUnknown_8418046[]; extern const u8 gText_5F[];
extern const u8 gUnknown_8418049[]; extern const u8 gText_6F[];
extern const u8 gUnknown_841804C[]; extern const u8 gText_7F[];
extern const u8 gUnknown_841804F[]; extern const u8 gText_8F[];
extern const u8 gUnknown_8418052[]; extern const u8 gText_9F[];
extern const u8 gUnknown_8418055[]; extern const u8 gText_10F[];
extern const u8 gUnknown_8418059[]; extern const u8 gText_11F[];
extern const u8 gUnknown_841806D[]; extern const u8 gText_Rooftop[];
extern const u8 gUnknown_8417FD9[]; extern const u8 gText_BoulderBadge[];
extern const u8 gUnknown_8417FE6[]; extern const u8 gText_CascadeBadge[];
extern const u8 gUnknown_8417FF3[]; extern const u8 gText_ThunderBadge[];
extern const u8 gUnknown_8418000[]; extern const u8 gText_RainbowBadge[];
extern const u8 gUnknown_841800D[]; extern const u8 gText_SoulBadge[];
extern const u8 gUnknown_8418017[]; extern const u8 gText_MarshBadge[];
extern const u8 gUnknown_8418022[]; extern const u8 gText_VolcanoBadge[];
extern const u8 gUnknown_841802F[]; extern const u8 gText_EarthBadge[];
extern const u8 gUnknown_841807D[]; extern const u8 gText_LinkedGamePlay[];
extern const u8 gUnknown_841808E[]; extern const u8 gText_DirectCorner[];
extern const u8 gUnknown_841809C[]; extern const u8 gText_UnionRoom[];
extern const u8 gOtherText_Quit[]; extern const u8 gOtherText_Quit[];
extern const u8 gUnknown_84180A7[]; extern const u8 gText_Energypowder_50[];
extern const u8 gUnknown_84180BC[]; extern const u8 gText_EnergyRoot_80[];
extern const u8 gUnknown_84180D0[]; extern const u8 gText_HealPowder_50[];
extern const u8 gUnknown_84180E4[]; extern const u8 gText_RevivalHerb_300[];
extern const u8 gUnknown_84180FA[]; extern const u8 gText_Protein_1000[];
extern const u8 gUnknown_841810D[]; extern const u8 gText_Iron_1000[];
extern const u8 gUnknown_841811D[]; extern const u8 gText_Carbos_1000[];
extern const u8 gUnknown_841812F[]; extern const u8 gText_Calcium_1000[];
extern const u8 gUnknown_8418142[]; extern const u8 gText_Zinc_1000[];
extern const u8 gUnknown_8418152[]; extern const u8 gText_HpUp_1000[];
extern const u8 gUnknown_8418163[]; extern const u8 gText_PpUp_3000[];
// script_menu
extern const u8 gText_SomeoneSPc[];
extern const u8 gText_BillSPc[];
extern const u8 gText_SPc[];
extern const u8 gText_HallOfFame_2[];
extern const u8 gText_LogOff[];
extern const u8 gText_ProfOakSPc[];
extern const u8 gText_Other[];
extern const u8 gUnknown_81A508A[];
extern const u8 gOtherText_Double[];
extern const u8 gOtherText_Knockout[];
extern const u8 gOtherText_Mixed[];
extern const u8 gOtherText_Single[];
extern const u8 gText_Info[];
extern const u8 gText_Eggs[];
extern const u8 gText_HallOfFame[];
extern const u8 gText_Victories[];
extern const u8 gText_Quit[];
extern const u8 gText_Psn[];
extern const u8 gText_Par[];
extern const u8 gText_Slp[];
extern const u8 gText_Brn[];
extern const u8 gText_Frz[];
extern const u8 gText_Yes[];
extern const u8 gText_No[];
extern const u8 gText_SingleBattle[];
extern const u8 gText_DoubleBattle[];
extern const u8 gText_MultiBattle[];
extern const u8 gText_MakeAChallenge[];
extern const u8 gText_Info_2[];
extern const u8 gText_FreshWater_200[];
extern const u8 gText_SodaPop_300[];
extern const u8 gText_Lemonade_350[];
extern const u8 gText_50Coins_1000[];
extern const u8 gText_500Coins_10000[];
extern const u8 gText_Excellent[];
extern const u8 gText_NotSoBad[];
extern const u8 gText_RedShard[];
extern const u8 gText_YellowShard[];
extern const u8 gText_BlueShard[];
extern const u8 gText_GreenShard[];
extern const u8 gText_Right[];
extern const u8 gText_Left[];
extern const u8 gText_Tm13_4000Coins[];
extern const u8 gText_Tm23_3500Coins[];
extern const u8 gText_Tm24_4000Coins[];
extern const u8 gText_Tm30_4500Coins[];
extern const u8 gText_Tm35_4000Coins[];
extern const u8 gText_1F_2[];
extern const u8 gText_2F_2[];
extern const u8 gText_3F_2[];
extern const u8 gText_4F_2[];
extern const u8 gText_5F_2[];
extern const u8 gText_Normal[];
extern const u8 gText_Black[];
extern const u8 gText_Pink[];
extern const u8 gText_Sepia[];
extern const u8 gText_Eevee[];
extern const u8 gText_Flareon[];
extern const u8 gText_Jolteon[];
extern const u8 gText_Vaporeon[];
extern const u8 gText_QuitLooking[];
extern const u8 gText_FreshWater[];
extern const u8 gText_SodaPop[];
extern const u8 gText_Lemonade[];
extern const u8 gText_Bicycle_1000000[];
extern const u8 gText_NoThanks[];
extern const u8 gText_Abra_180Coins[];
extern const u8 gText_Clefairy_500Coins[];
extern const u8 gText_Dratini_2800Coins[];
extern const u8 gText_Scyther_5500Coins[];
extern const u8 gText_Porygon_9999Coins[];
extern const u8 gText_NoThanks_2[];
extern const u8 gText_HelixFossil[];
extern const u8 gText_DomeFossil[];
extern const u8 gText_OldAmber[];
extern const u8 gText_TradeCenter[];
extern const u8 gText_Colosseum[];
extern const u8 gText_GameLinkCable[];
extern const u8 gText_Wireless[];
extern const u8 gText_OneIsland[];
extern const u8 gText_TwoIsland[];
extern const u8 gText_ThreeIsland[];
extern const u8 gText_Vermilion[];
extern const u8 gText_Colosseum_2[];
extern const u8 gText_BerryCrush[];
extern const u8 gText_Dummy_8417E66[];
extern const u8 gText_Dummy_8417E67[];
extern const u8 gText_Dummy_8417E71[];
extern const u8 gText_PokemonJump[];
extern const u8 gText_DodrioBerryPicking[];
extern const u8 gText_2Tinymushrooms[];
extern const u8 gText_1BigMushroom[];
extern const u8 gText_SeviiIslands[];
extern const u8 gText_NavelRock[];
extern const u8 gText_BirthIsland[];
extern const u8 gText_MiracleSeed_1000Coins[];
extern const u8 gText_Charcoal_1000Coins[];
extern const u8 gText_MysticWater_1000Coins[];
extern const u8 gText_YellowFlute_1600Coins[];
extern const u8 gText_SmokeBall_800Coins[];
extern const u8 gText_Dummy_8417F67[];
extern const u8 gText_Dummy_8417F68[];
extern const u8 gText_BecomeLeader[];
extern const u8 gText_JoinGroup[];
extern const u8 gText_Cool_2[];
extern const u8 gText_Beauty_2[];
extern const u8 gText_Cute_2[];
extern const u8 gText_Smart_2[];
extern const u8 gText_Tough_2[];
extern const u8 gText_Items[];
extern const u8 gText_KeyItems[];
extern const u8 gText_PokeBalls[];
extern const u8 gText_TmsgUnknown_8417B2CHms[];
extern const u8 gText_Berries[];
extern const u8 gText_Boulderbadge[];
extern const u8 gText_Cascadebadge[];
extern const u8 gText_Thunderbadge[];
extern const u8 gText_Rainbowbadge[];
extern const u8 gText_Soulbadge[];
extern const u8 gText_Marshbadge[];
extern const u8 gText_Volcanobadge[];
extern const u8 gText_Earthbadge[];
extern const u8 gText_Coins_2[];
extern const u8 gText_ItemsPocket[];
extern const u8 gText_KeyItemsPocket[];
extern const u8 gText_PokeBallsPocket[];
extern const u8 gText_TmCase[];
extern const u8 gText_BerryPouch_2[];
extern const u8 gText_FourIsland[];
extern const u8 gText_FiveIsland[];
extern const u8 gText_SixIsland[];
extern const u8 gText_SevenIsland[];
#endif //GUARD_STRINGS_H #endif //GUARD_STRINGS_H
ld_script.txt
+3 -1
View File
@@ -141,7 +141,7 @@ SECTIONS {
src/item.o(.text); src/item.o(.text);
asm/shop.o(.text); asm/shop.o(.text);
src/berry.o(.text); src/berry.o(.text);
asm/script_menu.o(.text); src/script_menu.o(.text);
asm/naming_screen.o(.text); asm/naming_screen.o(.text);
src/money.o(.text); src/money.o(.text);
asm/script_pokemon_util_80A0058.o(.text); asm/script_pokemon_util_80A0058.o(.text);
@@ -431,6 +431,8 @@ SECTIONS {
src/battle_anim_mon_movement.o(.rodata); src/battle_anim_mon_movement.o(.rodata);
src/item.o(.rodata); src/item.o(.rodata);
data/data_835B488.o(.rodata.83DF09C); data/data_835B488.o(.rodata.83DF09C);
src/script_menu.o(.rodata);
data/data_835B488.o(.rodata.83E2280);
src/flying.o(.rodata); src/flying.o(.rodata);
src/psychic.o(.rodata); src/psychic.o(.rodata);
src/bug.o(.rodata); src/bug.o(.rodata);
src/berry_powder.c
+1 -1
View File
@@ -111,7 +111,7 @@ void sub_815F094(void)
{ {
struct WindowTemplate template; struct WindowTemplate template;
if (sub_81119D4(sub_809D6D4) != TRUE) if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE)
{ {
template = SetWindowTemplateFields(0, 1, 1, 8, 3, 15, 32); template = SetWindowTemplateFields(0, 1, 1, 8, 3, 15, 32);
gUnknown_203F464 = AddWindow(&template); gUnknown_203F464 = AddWindow(&template);
src/coins.c
+2 -4
View File
@@ -5,8 +5,6 @@
#include "text_window.h" #include "text_window.h"
#include "strings.h" #include "strings.h"
extern const u8 gUnknown_8417C2D[];
EWRAM_DATA static u8 sCoinsWindowId = 0; EWRAM_DATA static u8 sCoinsWindowId = 0;
#define MAX_COINS 9999 #define MAX_COINS 9999
@@ -62,7 +60,7 @@ void PrintCoinsString_Parameterized(u8 windowId, u32 coinAmount, u8 x, u8 y, u8
void sub_80D0674(u8 windowId, u16 tileStart, u8 palette, u32 coinAmount) void sub_80D0674(u8 windowId, u16 tileStart, u8 palette, u32 coinAmount)
{ {
DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, tileStart, palette); DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, tileStart, palette);
AddTextPrinterParameterized(windowId, 2, gUnknown_8417C2D, 0, 0, 0xFF, 0); AddTextPrinterParameterized(windowId, 2, gText_Coins_2, 0, 0, 0xFF, 0);
PrintCoinsString_Parameterized(windowId, coinAmount, 0x10, 0xC, 0); PrintCoinsString_Parameterized(windowId, coinAmount, 0x10, 0xC, 0);
} }
@@ -88,7 +86,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y)
PutWindowTilemap(sCoinsWindowId); PutWindowTilemap(sCoinsWindowId);
TextWindow_SetStdFrame0_WithPal(sCoinsWindowId, 0x21D, 0xD0); TextWindow_SetStdFrame0_WithPal(sCoinsWindowId, 0x21D, 0xD0);
DrawStdFrameWithCustomTileAndPalette(sCoinsWindowId, FALSE, 0x21D, 0xD); DrawStdFrameWithCustomTileAndPalette(sCoinsWindowId, FALSE, 0x21D, 0xD);
AddTextPrinterParameterized(sCoinsWindowId, 2, gUnknown_8417C2D, 0, 0, 0xFF, 0); AddTextPrinterParameterized(sCoinsWindowId, 2, gText_Coins_2, 0, 0, 0xFF, 0);
PrintCoinsString(coinAmount); PrintCoinsString(coinAmount);
} }
src/fame_checker.c
+1 -12
View File
@@ -26,6 +26,7 @@
#include "menu_indicators.h" #include "menu_indicators.h"
#include "text_window.h" #include "text_window.h"
#include "fame_checker.h" #include "fame_checker.h"
#include "strings.h"
#include "constants/trainers.h" #include "constants/trainers.h"
#define SPRITETAG_SELECTOR_CURSOR 1000 #define SPRITETAG_SELECTOR_CURSOR 1000
@@ -124,18 +125,6 @@ static void Task_FCOpenOrCloseInfoBox(u8 taskId);
static void UpdateInfoBoxTilemap(u8 bg, s16 state); static void UpdateInfoBoxTilemap(u8 bg, s16 state);
static void PlaceListMenuCursor(bool8 isActive); static void PlaceListMenuCursor(bool8 isActive);
extern const u8 gFameCheckerText_Cancel[];
extern const u8 gFameCheckerText_ListMenuCursor[];
extern const u8 gFameCheckerText_FameCheckerWillBeClosed[];
extern const u8 gFameCheckerText_ClearTextbox[];
extern const u8 gFameCheckerText_MainScreenUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$"
extern const u8 gFameCheckerText_PickScreenUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$"
extern const u8 gFameCheckerText_FlavorTextUI[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_A_BUTTON}READ {KEYGFX_B_BUTTON}CANCEL$"
extern const u8 gFameCheckerOakName[]; // "OAK$"
extern const u8 gFameCheckerDaisyName[]; // "DAISY$"
extern const u8 gFameCheckerBillName[]; // "BILL$"
extern const u8 gFameCheckerMrFujiName[]; // "FUJI$"
static const u16 sFameCheckerTilemap[] = INCBIN_U16("data/fame_checker/tilemap_845c600.bin"); static const u16 sFameCheckerTilemap[] = INCBIN_U16("data/fame_checker/tilemap_845c600.bin");
static const u8 sQuestionMarkSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845ce00.4bpp"); static const u8 sQuestionMarkSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845ce00.4bpp");
static const u8 sSpinningPokeballSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845cf00.4bpp"); static const u8 sSpinningPokeballSpriteGfx[] = INCBIN_U8("data/fame_checker/img_845cf00.4bpp");
src/field_specials.c
+66 -66
View File
@@ -141,17 +141,17 @@ u8 Special_GetPlayerTrainerIdOnesDigit(void)
void Special_BufferBigGuyOrBigGirlString(void) void Special_BufferBigGuyOrBigGirlString(void)
{ {
if (gSaveBlock2Ptr->playerGender == MALE) if (gSaveBlock2Ptr->playerGender == MALE)
StringCopy(gStringVar1, gUnknown_8417FBB); StringCopy(gStringVar1, gText_BigGuy);
else else
StringCopy(gStringVar1, gUnknown_8417FC3); StringCopy(gStringVar1, gText_BigGirl);
} }
void Special_BufferSonOrDaughterString(void) void Special_BufferSonOrDaughterString(void)
{ {
if (gSaveBlock2Ptr->playerGender == MALE) if (gSaveBlock2Ptr->playerGender == MALE)
StringCopy(gStringVar1, gUnknown_8417FD0); StringCopy(gStringVar1, gText_Son);
else else
StringCopy(gStringVar1, gUnknown_8417FCC); StringCopy(gStringVar1, gText_Daughter);
} }
u8 Special_GetBattleOutcome(void) u8 Special_GetBattleOutcome(void)
@@ -729,22 +729,22 @@ static const struct WindowTemplate sElevatorCurrentFloorWindowTemplate = {
}; };
static const u8 *const sFloorNamePointers[] = { static const u8 *const sFloorNamePointers[] = {
gUnknown_8418069, gText_B4F,
gUnknown_8418065, gText_B3F,
gUnknown_8418061, gText_B2F,
gUnknown_841805D, gText_B1F,
gUnknown_841803A, gText_1F,
gUnknown_841803D, gText_2F,
gUnknown_8418040, gText_3F,
gUnknown_8418043, gText_4F,
gUnknown_8418046, gText_5F,
gUnknown_8418049, gText_6F,
gUnknown_841804C, gText_7F,
gUnknown_841804F, gText_8F,
gUnknown_8418052, gText_9F,
gUnknown_8418055, gText_10F,
gUnknown_8418059, gText_11F,
gUnknown_841806D gText_Rooftop
}; };
static const u8 sUnused_83F5B84[] = { static const u8 sUnused_83F5B84[] = {
@@ -1064,12 +1064,12 @@ void Special_DrawElevatorCurrentFloorWindow(void)
{ {
const u8 *floorname; const u8 *floorname;
u32 strwidth; u32 strwidth;
if (sub_81119D4(sub_809D6D4) != TRUE) if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE)
{ {
sElevatorCurrentFloorWindowId = AddWindow(&sElevatorCurrentFloorWindowTemplate); sElevatorCurrentFloorWindowId = AddWindow(&sElevatorCurrentFloorWindowTemplate);
TextWindow_SetStdFrame0_WithPal(sElevatorCurrentFloorWindowId, 0x21D, 0xD0); TextWindow_SetStdFrame0_WithPal(sElevatorCurrentFloorWindowId, 0x21D, 0xD0);
DrawStdFrameWithCustomTileAndPalette(sElevatorCurrentFloorWindowId, FALSE, 0x21D, 0xD); DrawStdFrameWithCustomTileAndPalette(sElevatorCurrentFloorWindowId, FALSE, 0x21D, 0xD);
AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, 2, gUnknown_8418075, 0, 2, 0xFF, NULL); AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, 2, gText_NowOn, 0, 2, 0xFF, NULL);
floorname = sFloorNamePointers[gSpecialVar_0x8005]; floorname = sFloorNamePointers[gSpecialVar_0x8005];
strwidth = GetStringWidth(2, floorname, 0); strwidth = GetStringWidth(2, floorname, 0);
AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, 2, floorname, 56 - strwidth, 16, 0xFF, NULL); AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, 2, floorname, 56 - strwidth, 16, 0xFF, NULL);
@@ -1137,7 +1137,7 @@ void Special_ListMenu(void)
{ {
u8 taskId; u8 taskId;
struct Task * task; struct Task * task;
if (sub_81119D4(sub_809D6D4) != TRUE) if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE)
{ {
taskId = CreateTask(Task_CreateScriptListMenu, 8); taskId = CreateTask(Task_CreateScriptListMenu, 8);
task = &gTasks[taskId]; task = &gTasks[taskId];
@@ -1227,61 +1227,61 @@ void Special_ListMenu(void)
static const u8 *const sListMenuLabels[][12] = { static const u8 *const sListMenuLabels[][12] = {
{ {
gUnknown_8417FD9, gText_BoulderBadge,
gUnknown_8417FE6, gText_CascadeBadge,
gUnknown_8417FF3, gText_ThunderBadge,
gUnknown_8418000, gText_RainbowBadge,
gUnknown_841800D, gText_SoulBadge,
gUnknown_8418017, gText_MarshBadge,
gUnknown_8418022, gText_VolcanoBadge,
gUnknown_841802F, gText_EarthBadge,
gOtherText_Exit, gOtherText_Exit,
}, { }, {
gUnknown_8418059, gText_11F,
gUnknown_8418055, gText_10F,
gUnknown_8418052, gText_9F,
gUnknown_841804F, gText_8F,
gUnknown_841804C, gText_7F,
gUnknown_8418049, gText_6F,
gUnknown_8418046, gText_5F,
gUnknown_8418043, gText_4F,
gUnknown_8418040, gText_3F,
gUnknown_841803D, gText_2F,
gUnknown_841803A, gText_1F,
gOtherText_Exit, gOtherText_Exit,
}, { }, {
gUnknown_841805D, gText_B1F,
gUnknown_8418061, gText_B2F,
gUnknown_8418069, gText_B4F,
gOtherText_Exit, gOtherText_Exit,
}, { }, {
gUnknown_8418046, gText_5F,
gUnknown_8418043, gText_4F,
gUnknown_8418040, gText_3F,
gUnknown_841803D, gText_2F,
gUnknown_841803A, gText_1F,
gOtherText_Exit, gOtherText_Exit,
}, { }, {
gUnknown_841807D, gText_LinkedGamePlay,
gUnknown_841808E, gText_DirectCorner,
gUnknown_841809C, gText_UnionRoom,
gOtherText_Quit, gOtherText_Quit,
}, { }, {
gUnknown_84180A7, gText_Energypowder_50,
gUnknown_84180BC, gText_EnergyRoot_80,
gUnknown_84180D0, gText_HealPowder_50,
gUnknown_84180E4, gText_RevivalHerb_300,
gUnknown_84180FA, gText_Protein_1000,
gUnknown_841810D, gText_Iron_1000,
gUnknown_841811D, gText_Carbos_1000,
gUnknown_841812F, gText_Calcium_1000,
gUnknown_8418142, gText_Zinc_1000,
gUnknown_8418152, gText_HpUp_1000,
gUnknown_8418163, gText_PpUp_3000,
gOtherText_Exit, gOtherText_Exit,
}, { }, {
gUnknown_841806D, gText_Rooftop,
gUnknown_841805D, gText_B1F,
gOtherText_Exit, gOtherText_Exit,
} }
}; };
src/quest_log.c
+60 -62
View File
@@ -38,6 +38,7 @@
#include "quest_log_8150454.h" #include "quest_log_8150454.h"
#include "quest_log.h" #include "quest_log.h"
#include "new_menu_helpers.h" #include "new_menu_helpers.h"
#include "strings.h"
u8 gUnknown_3005E88; u8 gUnknown_3005E88;
@@ -100,7 +101,7 @@ static EWRAM_DATA u8 gUnknown_203ADFE[3] = {0};
static EWRAM_DATA u16 *gUnknown_203AE04 = NULL; static EWRAM_DATA u16 *gUnknown_203AE04 = NULL;
static EWRAM_DATA u16 *gUnknown_203AE08 = NULL; static EWRAM_DATA u16 *gUnknown_203AE08 = NULL;
static EWRAM_DATA u16 *gUnknown_203AE0C[32] = {NULL}; static EWRAM_DATA u16 *gUnknown_203AE0C[32] = {NULL};
static EWRAM_DATA void (* gUnknown_203AE8C)(void) = NULL; static EWRAM_DATA void (* sQuestLogCB)(void) = NULL;
static EWRAM_DATA u16 *gUnknown_203AE90 = NULL; static EWRAM_DATA u16 *gUnknown_203AE90 = NULL;
static EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; static EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0};
static EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; static EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0};
@@ -135,17 +136,17 @@ static u16 QuestLog_GetSaneBoxCount(void);
static void sub_8111688(void); static void sub_8111688(void);
static void sub_811175C(u8, struct UnkStruct_203AE98 *); static void sub_811175C(u8, struct UnkStruct_203AE98 *);
static void sub_81118F4(s8); static void sub_81118F4(s8);
static void sub_8111914(void); static void QuestLog_AdvancePlayhead(void);
static void sub_8111984(void); static void QuestLog_EndPlayback(void);
static void sub_8111A34(u8); static void Task_RunPlaybackCB(u8);
static void sub_8111AD8(void); static void sub_8111AD8(void);
static void sub_8111B80(void); static void sub_8111B80(void);
static u8 sub_8111BD4(void); static u8 sub_8111BD4(void);
static void sub_8111D10(void); static void sub_8111D10(void);
static void sub_8111D90(u8); static void sub_8111D90(u8);
static void sub_8111E20(void); static void sub_8111E20(void);
static void sub_8111E64(s8); static void QuestLog_SkipToEndOfPlayback(s8);
static void sub_8111E84(void); static void QuestLog_WaitFadeAndCancelPlayback(void);
static bool8 sub_8111F60(void); static bool8 sub_8111F60(void);
static void sub_8111F8C(u8); static void sub_8111F8C(u8);
static void sub_8111FCC(u8); static void sub_8111FCC(u8);
@@ -177,7 +178,7 @@ static bool8 sub_8113954(u16, u16 *);
static void sub_8113A1C(u16); static void sub_8113A1C(u16);
static void sub_811381C(void); static void sub_811381C(void);
static bool8 sub_8113A44(u16, u16 *); static bool8 sub_8113A44(u16, u16 *);
static u16 *sub_8113A78(u16 *, u16 **); static u16 *QuestLog_SkipCommand(u16 *, u16 **);
static void sub_8113ABC(u16 *); static void sub_8113ABC(u16 *);
static bool8 sub_8113AE8(u16 *); static bool8 sub_8113AE8(u16 *);
static bool8 sub_8113B44(u16 *); static bool8 sub_8113B44(u16 *);
@@ -437,9 +438,9 @@ void sub_811089C(void)
memset(gSaveBlock1Ptr->questLog, 0, sizeof(gSaveBlock1Ptr->questLog)); memset(gSaveBlock1Ptr->questLog, 0, sizeof(gSaveBlock1Ptr->questLog));
gUnknown_203ADF8 = 0; gUnknown_203ADF8 = 0;
gUnknown_203ADFA = 0; gUnknown_203ADFA = 0;
gUnknown_203AE8C = 0; sQuestLogCB = NULL;
gUnknown_203AE08 = NULL; gUnknown_203AE08 = NULL;
gUnknown_203AE04 = 0; gUnknown_203AE04 = NULL;
sub_8113BD8(); sub_8113BD8();
sub_81138F8(); sub_81138F8();
} }
@@ -455,10 +456,10 @@ void sub_8110920(void)
gUnknown_203AE04 = NULL; gUnknown_203AE04 = NULL;
} }
void sub_811092C(void) void RunQuestLogCB(void)
{ {
if (gUnknown_203AE8C) if (sQuestLogCB != NULL)
gUnknown_203AE8C(); sQuestLogCB();
} }
bool8 sub_8110944(const void * a0, size_t a1) bool8 sub_8110944(const void * a0, size_t a1)
@@ -485,9 +486,9 @@ void sub_81109CC(u8 a0)
{ {
gUnknown_203ADFA = a0; gUnknown_203ADFA = a0;
if (a0 == 1) if (a0 == 1)
gUnknown_203AE8C = sub_8110A00; sQuestLogCB = sub_8110A00;
else else
gUnknown_203AE8C = sub_8110A3C; sQuestLogCB = sub_8110A3C;
} }
static void sub_8110A00(void) static void sub_8110A00(void)
@@ -497,7 +498,7 @@ static void sub_8110A00(void)
gUnknown_3005E88 = 0; gUnknown_3005E88 = 0;
sub_8110E3C(); sub_8110E3C();
gUnknown_203ADFA = 0; gUnknown_203ADFA = 0;
gUnknown_203AE8C = NULL; sQuestLogCB = NULL;
} }
} }
@@ -1194,7 +1195,7 @@ static void sub_811175C(u8 a0, struct UnkStruct_203AE98 * a1)
r6++; r6++;
break; break;
default: default:
r4 = sub_8113A78(r4, &gUnknown_203AE0C[r9]); r4 = QuestLog_SkipCommand(r4, &gUnknown_203AE0C[r9]);
if (r9 == 0) if (r9 == 0)
sub_8113ABC(gUnknown_203AE0C[0]); sub_8113ABC(gUnknown_203AE0C[0]);
r9++; r9++;
@@ -1208,10 +1209,10 @@ static void sub_811175C(u8 a0, struct UnkStruct_203AE98 * a1)
static void sub_81118F4(s8 a0) static void sub_81118F4(s8 a0)
{ {
fade_screen(1, a0); fade_screen(1, a0);
gUnknown_203AE8C = sub_8111914; sQuestLogCB = QuestLog_AdvancePlayhead;
} }
static void sub_8111914(void) static void QuestLog_AdvancePlayhead(void)
{ {
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
@@ -1224,12 +1225,12 @@ static void sub_8111914(void)
else else
{ {
gUnknown_3005E88 = 0; gUnknown_3005E88 = 0;
sub_8111984(); QuestLog_EndPlayback();
} }
} }
} }
static void sub_8111984(void) static void QuestLog_EndPlayback(void)
{ {
ResetSpecialVars(); ResetSpecialVars();
Save_ResetSaveCounters(); Save_ResetSaveCounters();
@@ -1238,15 +1239,15 @@ static void sub_8111984(void)
gFieldCallback2 = sub_8111F60; gFieldCallback2 = sub_8111F60;
FreeAllWindowBuffers(); FreeAllWindowBuffers();
gUnknown_203ADFA = 3; gUnknown_203ADFA = 3;
gUnknown_203AE8C = NULL; sQuestLogCB = NULL;
} }
void sub_81119C8(void) void sub_81119C8(void)
{ {
sub_8111914(); QuestLog_AdvancePlayhead();
} }
bool8 sub_81119D4(void (*a0)(void)) bool8 QuestLog_SchedulePlaybackCB(void (*callback)(void))
{ {
u8 taskId; u8 taskId;
@@ -1257,16 +1258,16 @@ bool8 sub_81119D4(void (*a0)(void))
break; break;
case 2: case 2:
gUnknown_3005E88 = 3; gUnknown_3005E88 = 3;
taskId = CreateTask(sub_8111A34, 80); taskId = CreateTask(Task_RunPlaybackCB, 80);
gTasks[taskId].data[0] = 0; gTasks[taskId].data[0] = 0;
gTasks[taskId].data[1] = 0; gTasks[taskId].data[1] = 0;
SetWordTaskArg(taskId, 14, (u32)a0); SetWordTaskArg(taskId, 14, (uintptr_t)callback);
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }
static void sub_8111A34(u8 taskId) static void Task_RunPlaybackCB(u8 taskId)
{ {
void (*routine)(void); void (*routine)(void);
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
@@ -1289,7 +1290,7 @@ static void sub_8111A34(u8 taskId)
if (routine != NULL) if (routine != NULL)
routine(); routine();
DestroyTask(taskId); DestroyTask(taskId);
gUnknown_203AE8C = sub_8111914; sQuestLogCB = QuestLog_AdvancePlayhead;
} }
break; break;
} }
@@ -1384,7 +1385,7 @@ void sub_8111C68(void)
{ {
gUnknown_203AE94.unk_0_6 = 1; gUnknown_203AE94.unk_0_6 = 1;
gUnknown_3005E88 = 0; gUnknown_3005E88 = 0;
sub_8111E64(-3); QuestLog_SkipToEndOfPlayback(-3);
} }
} }
} }
@@ -1465,13 +1466,13 @@ static void sub_8111E20(void)
CopyWindowToVram(gUnknown_203ADFE[1], 1); CopyWindowToVram(gUnknown_203ADFE[1], 1);
} }
static void sub_8111E64(s8 a0) static void QuestLog_SkipToEndOfPlayback(s8 a0)
{ {
fade_screen(1, a0); fade_screen(1, a0);
gUnknown_203AE8C = sub_8111E84; sQuestLogCB = QuestLog_WaitFadeAndCancelPlayback;
} }
static void sub_8111E84(void) static void QuestLog_WaitFadeAndCancelPlayback(void)
{ {
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
@@ -1483,7 +1484,7 @@ static void sub_8111E84(void)
sub_811175C(gUnknown_203ADF8, gUnknown_203AE98); sub_811175C(gUnknown_203ADF8, gUnknown_203AE98);
} }
gUnknown_3005E88 = 0; gUnknown_3005E88 = 0;
sub_8111984(); QuestLog_EndPlayback();
} }
} }
@@ -1643,7 +1644,7 @@ void sub_811231C(void)
sub_8110E68(gUnknown_203AE98); sub_8110E68(gUnknown_203AE98);
sub_8110E3C(); sub_8110E3C();
gUnknown_203ADFA = 0; gUnknown_203ADFA = 0;
gUnknown_203AE8C = NULL; sQuestLogCB = NULL;
gUnknown_203AE04 = NULL; gUnknown_203AE04 = NULL;
gUnknown_203AE08 = NULL; gUnknown_203AE08 = NULL;
gUnknown_3005E88 = 0; gUnknown_3005E88 = 0;
@@ -1659,7 +1660,7 @@ void sub_8112364(void)
sub_8110E3C(); sub_8110E3C();
gUnknown_3005E88 = 0; gUnknown_3005E88 = 0;
gUnknown_203ADFA = 0; gUnknown_203ADFA = 0;
gUnknown_203AE8C = NULL; sQuestLogCB = NULL;
} }
gUnknown_203AE04 = NULL; gUnknown_203AE04 = NULL;
gUnknown_203AE08 = NULL; gUnknown_203AE08 = NULL;
@@ -3313,7 +3314,7 @@ static const u16 *(*const sQuestLogScriptParsingCBs[])(const u16 *) = {
sub_8115800 sub_8115800
}; };
static const u8 gUnknown_8456AA0[] = { static const u8 sQuestLogEventCmdSizes[] = {
0x08, 0x08,
0x08, 0x08,
0x08, 0x08,
@@ -3359,16 +3360,16 @@ static const u8 gUnknown_8456AA0[] = {
0x06 0x06
}; };
static u16 *sub_8113A78(u16 *a0, u16 **a1) static u16 *QuestLog_SkipCommand(u16 *curPtr, u16 **prevPtr_p)
{ {
u16 r2 = a0[0] & 0xfff; u16 idx = curPtr[0] & 0xfff;
u16 r4 = a0[0] >> 12; u16 cnt = curPtr[0] >> 12;
if (r2 == 33) if (idx == 33)
r4 = 0; cnt = 0;
if (r2 < 3 || r2 > 42) if (idx < 3 || idx > 42)
return NULL; return NULL;
*a1 = a0; *prevPtr_p = curPtr;
return gUnknown_8456AA0[r2] + (gUnknown_8456AA0[r2] - 4) * r4 + (void *)a0; return sQuestLogEventCmdSizes[idx] + (sQuestLogEventCmdSizes[idx] - 4) * cnt + (void *)curPtr;
} }
static void sub_8113ABC(u16 *a0) static void sub_8113ABC(u16 *a0)
@@ -3484,7 +3485,7 @@ static void sub_8113BD8(void)
static u16 *sub_8113BF4(u16 *a0) static u16 *sub_8113BF4(u16 *a0)
{ {
if (!sub_8110988(a0, gUnknown_8456AA0[39])) if (!sub_8110988(a0, sQuestLogEventCmdSizes[39]))
return NULL; return NULL;
a0[0] = 39; a0[0] = 39;
return a0 + 1; return a0 + 1;
@@ -3492,7 +3493,7 @@ static u16 *sub_8113BF4(u16 *a0)
static u16 *sub_8113C20(u16 *a0, struct UnkStruct_203AE98 * a1) static u16 *sub_8113C20(u16 *a0, struct UnkStruct_203AE98 * a1)
{ {
if (!sub_8110988(a0, gUnknown_8456AA0[39])) if (!sub_8110988(a0, sQuestLogEventCmdSizes[39]))
return NULL; return NULL;
a1->unk_6 = 0xFF; a1->unk_6 = 0xFF;
a1->unk_4 = 0; a1->unk_4 = 0;
@@ -3505,7 +3506,7 @@ static u16 *sub_8113C20(u16 *a0, struct UnkStruct_203AE98 * a1)
static u16 *sub_8113C5C(u16 *a0, u16 a1) static u16 *sub_8113C5C(u16 *a0, u16 a1)
{ {
if (!sub_8110988(a0, gUnknown_8456AA0[41])) if (!sub_8110988(a0, sQuestLogEventCmdSizes[41]))
return NULL; return NULL;
a0[0] = 41; a0[0] = 41;
a0[1] = a1; a0[1] = a1;
@@ -3514,7 +3515,7 @@ static u16 *sub_8113C5C(u16 *a0, u16 a1)
static u16 *sub_8113C8C(u16 *a0, struct UnkStruct_203AE98 * a1) static u16 *sub_8113C8C(u16 *a0, struct UnkStruct_203AE98 * a1)
{ {
if (!sub_8110988(a0, gUnknown_8456AA0[41])) if (!sub_8110988(a0, sQuestLogEventCmdSizes[41]))
return NULL; return NULL;
a1->unk_6 = 0xFE; a1->unk_6 = 0xFE;
a1->unk_4 = a0[1]; a1->unk_4 = a0[1];
@@ -3529,7 +3530,7 @@ static u16 *sub_8113CC8(u16 *a0, struct UnkStruct_203AE98 * a1)
{ {
u8 *r6 = (u8 *)a0 + 4; u8 *r6 = (u8 *)a0 + 4;
if (!sub_8110988(a0, gUnknown_8456AA0[0])) if (!sub_8110988(a0, sQuestLogEventCmdSizes[0]))
return NULL; return NULL;
a0[0] = 0; a0[0] = 0;
a0[1] = a1->unk_4; a0[1] = a1->unk_4;
@@ -3544,7 +3545,7 @@ static u16 *sub_8113D08(u16 *a0, struct UnkStruct_203AE98 * a1)
{ {
u8 *r6 = (u8 *)a0 + 4; u8 *r6 = (u8 *)a0 + 4;
if (!sub_8110988(a0, gUnknown_8456AA0[0])) if (!sub_8110988(a0, sQuestLogEventCmdSizes[0]))
return NULL; return NULL;
a1->unk_6 = 2; a1->unk_6 = 2;
a1->unk_4 = a0[1]; a1->unk_4 = a0[1];
@@ -3560,7 +3561,7 @@ static u16 *sub_8113D48(u16 *a0, struct UnkStruct_203AE98 * a1)
u16 *r4 = a0; u16 *r4 = a0;
u8 *r6 = (u8 *)a0 + 4; u8 *r6 = (u8 *)a0 + 4;
if (!sub_8110988(r4, gUnknown_8456AA0[2])) if (!sub_8110988(r4, sQuestLogEventCmdSizes[2]))
return NULL; return NULL;
if (a1->unk_6 == 0) if (a1->unk_6 == 0)
r4[0] = 2; r4[0] = 2;
@@ -3579,7 +3580,7 @@ static u16 *sub_8113D94(u16 *a0, struct UnkStruct_203AE98 * a1)
u16 *r5 = a0; u16 *r5 = a0;
u8 *r6 = (u8 *)a0 + 4; u8 *r6 = (u8 *)a0 + 4;
if (!sub_8110988(r5, gUnknown_8456AA0[2])) if (!sub_8110988(r5, sQuestLogEventCmdSizes[2]))
return NULL; return NULL;
if (r5[0] == 2) if (r5[0] == 2)
a1->unk_6 = 0; a1->unk_6 = 0;
@@ -3601,9 +3602,9 @@ u16 *sub_8113DE0(u16 a0, u16 *a1)
u8 r1; u8 r1;
if (gUnknown_203B044.unk_1 == 0) if (gUnknown_203B044.unk_1 == 0)
r6 = gUnknown_8456AA0[a0]; r6 = sQuestLogEventCmdSizes[a0];
else else
r6 = gUnknown_8456AA0[a0] - 4; r6 = sQuestLogEventCmdSizes[a0] - 4;
if (!sub_8110944(a1, r6)) if (!sub_8110944(a1, r6))
return NULL; return NULL;
@@ -3635,13 +3636,10 @@ u16 *sub_8113DE0(u16 a0, u16 *a1)
static const u16 *sub_8113E88(u16 a0, const u16 *a1) static const u16 *sub_8113E88(u16 a0, const u16 *a1)
{ {
a1 = (const void *)a1 + (gUnknown_203B044.unk_2 * (gUnknown_8456AA0[a0] - 4) + 4); a1 = (const void *)a1 + (gUnknown_203B044.unk_2 * (sQuestLogEventCmdSizes[a0] - 4) + 4);
return a1; return a1;
} }
// TODO: delete this declaration once data_83FECCC.s is decompiled
extern const u8 gText_EggNickname[];
void QuestLog_AutoGetSpeciesName(u16 a0, u8 *a1, u8 a2) void QuestLog_AutoGetSpeciesName(u16 a0, u8 *a1, u8 a2)
{ {
if (a1 != NULL) if (a1 != NULL)
@@ -3873,7 +3871,7 @@ static u16 *sub_81143F0(u16 *a0, const u16 *a1)
if (gUnknown_203B044.unk_0 == 11 && gUnknown_203B044.unk_1 != 0) if (gUnknown_203B044.unk_0 == 11 && gUnknown_203B044.unk_1 != 0)
return r4; return r4;
if (!sub_8110944(a0, gUnknown_8456AA0[11])) if (!sub_8110944(a0, sQuestLogEventCmdSizes[11]))
return NULL; return NULL;
r4[0] = 11; r4[0] = 11;
@@ -4371,7 +4369,7 @@ static u16 *sub_8114DE8(u16 *a0, const u16 *a1)
{ {
u16 *r4 = a0; u16 *r4 = a0;
u8 *r5 = (u8 *)a0 + 8; u8 *r5 = (u8 *)a0 + 8;
if (!sub_8110944(r4, gUnknown_8456AA0[31])) if (!sub_8110944(r4, sQuestLogEventCmdSizes[31]))
return NULL; return NULL;
if (r5[0] == 0 && r5[1] == 0) if (r5[0] == 0 && r5[1] == 0)
{ {
@@ -4393,7 +4391,7 @@ static u16 *sub_8114DE8(u16 *a0, const u16 *a1)
static const u16 *sub_8114E68(const u16 *a0) static const u16 *sub_8114E68(const u16 *a0)
{ {
const u8 *r6; const u8 *r6;
if (!sub_8110944(a0, gUnknown_8456AA0[31])) if (!sub_8110944(a0, sQuestLogEventCmdSizes[31]))
return NULL; return NULL;
r6 = (const u8 *)a0 + 8; r6 = (const u8 *)a0 + 8;
@@ -4473,7 +4471,7 @@ static const u16 *sub_811500C(const u16 *a0)
static u16 *sub_8115078(u16 *a0, const u16 *a1) static u16 *sub_8115078(u16 *a0, const u16 *a1)
{ {
if (!sub_8110944(a0, gUnknown_8456AA0[33])) if (!sub_8110944(a0, sQuestLogEventCmdSizes[33]))
return NULL; return NULL;
a0[0] = 0x2021; a0[0] = 0x2021;
a0[1] = sQuestLogIdx; a0[1] = sQuestLogIdx;
@@ -4487,7 +4485,7 @@ static u16 *sub_8115078(u16 *a0, const u16 *a1)
static const u16 *sub_81150CC(const u16 *a0) static const u16 *sub_81150CC(const u16 *a0)
{ {
const u8 *r5; const u8 *r5;
if (!sub_8110944(a0, gUnknown_8456AA0[33])) if (!sub_8110944(a0, sQuestLogEventCmdSizes[33]))
return NULL; return NULL;
r5 = (const u8 *)a0 + 8; r5 = (const u8 *)a0 + 8;
src/scrcmd.c
+10 -10
View File
@@ -50,15 +50,15 @@ extern const u8 *const gStdScriptsEnd[];
static bool8 sub_806B93C(struct ScriptContext * ctx); static bool8 sub_806B93C(struct ScriptContext * ctx);
static u8 sub_806B96C(struct ScriptContext * ctx); static u8 sub_806B96C(struct ScriptContext * ctx);
EWRAM_DATA ptrdiff_t gVScriptOffset = 0; static EWRAM_DATA ptrdiff_t gVScriptOffset = 0;
EWRAM_DATA u8 gUnknown_20370AC = 0; static EWRAM_DATA u8 gUnknown_20370AC = 0;
EWRAM_DATA u16 sPauseCounter = 0; static EWRAM_DATA u16 sPauseCounter = 0;
EWRAM_DATA u16 sMovingNpcId = 0; static EWRAM_DATA u16 sMovingNpcId = 0;
EWRAM_DATA u16 sMovingNpcMapBank = 0; static EWRAM_DATA u16 sMovingNpcMapBank = 0;
EWRAM_DATA u16 sMovingNpcMapId = 0; static EWRAM_DATA u16 sMovingNpcMapId = 0;
EWRAM_DATA u16 sFieldEffectScriptId = 0; static EWRAM_DATA u16 sFieldEffectScriptId = 0;
IWRAM_DATA struct ScriptContext * gUnknown_3005070; struct ScriptContext * gUnknown_3005070;
extern u8 gSelectedEventObject; extern u8 gSelectedEventObject;
@@ -1835,7 +1835,7 @@ bool8 ScrCmd_showmoneybox(struct ScriptContext *ctx)
u8 y = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx);
u8 ignore = ScriptReadByte(ctx); u8 ignore = ScriptReadByte(ctx);
if (!ignore && sub_81119D4(sub_809D6D4) != TRUE) if (!ignore && QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE)
DrawMoneyBox(GetMoney(&gSaveBlock1Ptr->money), x, y); DrawMoneyBox(GetMoney(&gSaveBlock1Ptr->money), x, y);
return FALSE; return FALSE;
} }
@@ -1865,7 +1865,7 @@ bool8 ScrCmd_showcoinsbox(struct ScriptContext *ctx)
u8 x = ScriptReadByte(ctx); u8 x = ScriptReadByte(ctx);
u8 y = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx);
if (sub_81119D4(sub_809D6D4) != TRUE) if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE)
ShowCoinsWindow(GetCoins(), x, y); ShowCoinsWindow(GetCoins(), x, y);
return FALSE; return FALSE;
} }
src/script_menu.c
+1293
View File
File diff suppressed because it is too large Load Diff
src/seagallop.c
+19 -19
View File
@@ -25,13 +25,13 @@
static EWRAM_DATA void * sBg3TilemapBuffer = NULL; static EWRAM_DATA void * sBg3TilemapBuffer = NULL;
static void CB2_SetUpSeaGallopScene(void); static void CB2_SetUpSeagallopScene(void);
static void VBlankCB_SeaGallop(void); static void VBlankCB_SeaGallop(void);
static void MainCB2_SeaGallop(void); static void MainCB2_SeaGallop(void);
static void Task_SeaGallop_0(u8 taskId); static void Task_Seagallop_0(u8 taskId);
static void Task_SeaGallop_1(u8 taskId); static void Task_Seagallop_1(u8 taskId);
static void Task_SeaGallop_2(u8 taskId); static void Task_Seagallop_2(u8 taskId);
static void Task_SeaGallop_3(void); static void Task_Seagallop_3(void);
static void ResetGPU(void); static void ResetGPU(void);
static void ResetAllAssets(void); static void ResetAllAssets(void);
static void SetDispcnt(void); static void SetDispcnt(void);
@@ -64,7 +64,7 @@ static const struct BgTemplate sBGTemplates[] = {
} }
}; };
static const s8 sSeaGallopSpawnTable[][4] = { static const s8 sSeag[][4] = {
// Map X Y // Map X Y
[SEAGALLOP_VERMILION_CITY] = {MAP(VERMILION_CITY), 0x17, 0x20}, [SEAGALLOP_VERMILION_CITY] = {MAP(VERMILION_CITY), 0x17, 0x20},
[SEAGALLOP_ONE_ISLAND] = {MAP(ONE_ISLAND_HARBOR), 0x08, 0x05}, [SEAGALLOP_ONE_ISLAND] = {MAP(ONE_ISLAND_HARBOR), 0x08, 0x05},
@@ -176,14 +176,14 @@ static const struct SpriteTemplate sWakeSpriteTemplate = {
SpriteCB_Wake SpriteCB_Wake
}; };
void ScrSpecial_SeaGallopFerry(void) void ScrSpecial_SeagallopFerry(void)
{ {
SetVBlankCallback(NULL); SetVBlankCallback(NULL);
HelpSystem_Disable(); HelpSystem_Disable();
SetMainCallback2(CB2_SetUpSeaGallopScene); SetMainCallback2(CB2_SetUpSeagallopScene);
} }
static void CB2_SetUpSeaGallopScene(void) static void CB2_SetUpSeagallopScene(void)
{ {
void ** ptr; void ** ptr;
switch (gMain.state) switch (gMain.state)
@@ -248,7 +248,7 @@ static void CB2_SetUpSeaGallopScene(void)
SetGpuReg(REG_OFFSET_WINOUT, 0x00); SetGpuReg(REG_OFFSET_WINOUT, 0x00);
SetGpuReg(REG_OFFSET_WIN0H, 0x00F0); SetGpuReg(REG_OFFSET_WIN0H, 0x00F0);
SetGpuReg(REG_OFFSET_WIN0V, 0x1888); SetGpuReg(REG_OFFSET_WIN0V, 0x1888);
CreateTask(Task_SeaGallop_0, 8); CreateTask(Task_Seagallop_0, 8);
SetMainCallback2(MainCB2_SeaGallop); SetMainCallback2(MainCB2_SeaGallop);
gMain.state = 0; gMain.state = 0;
break; break;
@@ -270,9 +270,9 @@ static void MainCB2_SeaGallop(void)
UpdatePaletteFade(); UpdatePaletteFade();
} }
static void Task_SeaGallop_0(u8 taskId) static void Task_Seagallop_0(u8 taskId)
{ {
gTasks[taskId].func = Task_SeaGallop_1; gTasks[taskId].func = Task_Seagallop_1;
} }
static void ScrollBG(void) static void ScrollBG(void)
@@ -287,7 +287,7 @@ static void ScrollBG(void)
} }
} }
static void Task_SeaGallop_1(u8 taskId) static void Task_Seagallop_1(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task * task = &gTasks[taskId];
@@ -296,29 +296,29 @@ static void Task_SeaGallop_1(u8 taskId)
{ {
Overworld_FadeOutMapMusic(); Overworld_FadeOutMapMusic();
sub_807DC18(); sub_807DC18();
task->func = Task_SeaGallop_2; task->func = Task_Seagallop_2;
} }
} }
static void Task_SeaGallop_2(u8 taskId) static void Task_Seagallop_2(u8 taskId)
{ {
ScrollBG(); ScrollBG();
if (sub_8055FC4() && !gPaletteFade.active) if (sub_8055FC4() && !gPaletteFade.active)
{ {
Task_SeaGallop_3(); Task_Seagallop_3();
HelpSystem_Enable(); HelpSystem_Enable();
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
static void Task_SeaGallop_3(void) static void Task_Seagallop_3(void)
{ {
const s8 * warpInfo; const s8 * warpInfo;
if (gSpecialVar_0x8006 >= NELEMS(sSeaGallopSpawnTable)) if (gSpecialVar_0x8006 >= NELEMS(sSeag))
gSpecialVar_0x8006 = 0; gSpecialVar_0x8006 = 0;
warpInfo = sSeaGallopSpawnTable[gSpecialVar_0x8006]; warpInfo = sSeag[gSpecialVar_0x8006];
SetWarpDestination(warpInfo[0], warpInfo[1], -1, warpInfo[2], warpInfo[3]); SetWarpDestination(warpInfo[0], warpInfo[1], -1, warpInfo[2], warpInfo[3]);
PlayRainStoppingSoundEffect(); PlayRainStoppingSoundEffect();
PlaySE(SE_KAIDAN); PlaySE(SE_KAIDAN);
sym_common.txt
+1 -2
View File
@@ -47,8 +47,7 @@ gUnknown_3005068: @ 3005068
gUnknown_300506C: @ 300506C gUnknown_300506C: @ 300506C
.space 0x4 .space 0x4
gUnknown_3005070: @ 3005070 .include "scrcmd.o"
.space 0x4
gSelectedEventObject: @ 3005074 gSelectedEventObject: @ 3005074
.space 0x4 .space 0x4
sym_ewram.txt
+3 -2
View File
@@ -404,9 +404,10 @@ gUnknown_203996C: @ 203996C
gUnknown_2039984: @ 2039984 gUnknown_2039984: @ 2039984
.space 0x4 .space 0x4
gUnknown_2039988: @ 2039988 .align 2
.space 0x4 .include "src/script_menu.o"
.align 2
gUnknown_203998C: @ 203998C gUnknown_203998C: @ 203998C
.space 0x4 .space 0x4