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

field_specials through Task_AnimateElevatorWindowView

Browse Source
This commit is contained in:
PikalaxALT
2019-10-23 15:31:23 -04:00
parent 6e36c22920
commit 661e5d9221
59 changed files with 1522 additions and 2572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/data_835B488.s
+1 -1
View File
@@ -807,7 +807,7 @@ gUnknown_83E0248:: @ 83E0248
.4byte gUnknown_841807D, NULL
.4byte gUnknown_841808E, NULL
.4byte gUnknown_841809C, NULL
.4byte gUnknown_8417929, NULL
.4byte gOtherText_Quit, NULL
gUnknown_83E0268:: @ 83E0268
.4byte gUnknown_8417DFE, NULL
data/data_83F5738.s
+4 -83
View File
@@ -1,3 +1,7 @@
#include "constants/species.h"
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
@@ -22,89 +26,6 @@ gUnknown_83F5864:: @ 83F5864
gUnknown_83F5A44:: @ 83F5A44
.incbin "baserom.gba", 0x3F5A44, 0xB4
gUnknown_83F5AF8:: @ 83F5AF8
.incbin "baserom.gba", 0x3F5AF8, 0x22
gUnknown_83F5B1A:: @ 83F5B1A
.incbin "baserom.gba", 0x3F5B1A, 0x16
gUnknown_83F5B30:: @ 83F5B30
.incbin "baserom.gba", 0x3F5B30, 0xC
gUnknown_83F5B3C:: @ 83F5B3C
.incbin "baserom.gba", 0x3F5B3C, 0x8
gUnknown_83F5B44:: @ 83F5B44
.incbin "baserom.gba", 0x3F5B44, 0x50
gUnknown_83F5B94:: @ 83F5B94
.incbin "baserom.gba", 0x3F5B94, 0x12
gUnknown_83F5BA6:: @ 83F5BA6
.incbin "baserom.gba", 0x3F5BA6, 0x12
gUnknown_83F5BB8:: @ 83F5BB8
.incbin "baserom.gba", 0x3F5BB8, 0x9
gUnknown_83F5BC1:: @ 83F5BC1
.incbin "baserom.gba", 0x3F5BC1, 0xB
gUnknown_83F5BCC:: @ 83F5BCC
.incbin "baserom.gba", 0x3F5BCC, 0x150
gUnknown_83F5D1C:: @ 83F5D1C
.incbin "baserom.gba", 0x3F5D1C, 0x10
sStarterMon:: @ 83F5D2C
.incbin "baserom.gba", 0x3F5D2C, 0x6
gUnknown_83F5D32:: @ 83F5D32
.incbin "baserom.gba", 0x3F5D32, 0x26
gUnknown_83F5D58:: @ 83F5D58
.incbin "baserom.gba", 0x3F5D58, 0x198
.align 2
gUnknown_83F5EF0:: @ 83F5EF0
.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c"
.align 2
gUnknown_83F5F24:: @ 83F5F24
.asciz "0"
gUnknown_83F5F26:: @ 83F5F26
.incbin "baserom.gba", 0x3F5F26, 0x2A
gUnknown_83F5F50:: @ 83F5F50
.incbin "baserom.gba", 0x3F5F50, 0x160
gUnknown_83F60B0:: @ 83F60B0
.incbin "baserom.gba", 0x3F60B0, 0x20
gUnknown_83F60D0:: @ 83F60D0
.incbin "baserom.gba", 0x3F60D0, 0x100
gUnknown_83F61D0:: @ 83F61D0
.incbin "baserom.gba", 0x3F61D0, 0x20
gUnknown_83F61F0:: @ 83F61F0
.incbin "baserom.gba", 0x3F61F0, 0xB
gUnknown_83F61FB:: @ 83F61FB
.incbin "baserom.gba", 0x3F61FB, 0x8
gUnknown_83F6203:: @ 83F6203
.incbin "baserom.gba", 0x3F6203, 0x3
gUnknown_83F6206:: @ 83F6206
.incbin "baserom.gba", 0x3F6206, 0x160
gUnknown_83F6366:: @ 83F6366
.incbin "baserom.gba", 0x3F6366, 0x16
gUnknown_83F637C:: @ 83F637C
.incbin "baserom.gba", 0x3F637C, 0xC
.section .rodata.83F6C90
gUnknown_83F6C90:: @ 83F6C90
.incbin "baserom.gba", 0x3F6C90, 0x20
data/data_8471F00.s
+1 -1
View File
@@ -342,7 +342,7 @@ gUnknown_84827B4:: @ 84827B4
.include "data/text/move_descriptions.inc"
.align 2, 0
gUnknown_84886E8:: @ 84886E8
gMoveDescriptionPointers:: @ 84886E8
.4byte gMoveDescription_Pound
.4byte gMoveDescription_KarateChop
.4byte gMoveDescription_DoubleSlap
data/event_scripts.s
+6 -6
View File
@@ -227,7 +227,7 @@ gStdScriptsEnd::
.include "data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc"
.include "data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc"
.include "data/maps/ThreeIsland_DunsparceTunnel/scripts.inc"
.include "data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc"
.include "data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc"
.include "data/maps/NavelRock_1F/scripts.inc"
.include "data/maps/NavelRock_Summit/scripts.inc"
.include "data/maps/NavelRock_Base/scripts.inc"
@@ -583,7 +583,7 @@ gStdScriptsEnd::
.include "data/maps/FiveIsland_LostCave_Room4/text.inc"
.include "data/maps/FiveIsland_LostCave_Room10/text.inc"
.include "data/maps/ThreeIsland_DunsparceTunnel/text.inc"
.include "data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc"
.include "data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc"
.include "data/maps/OneIsland_KindleRoad_EmberSpa/text.inc"
.include "data/maps/PalletTown/text.inc"
.include "data/maps/ViridianCity/text.inc"
@@ -1922,7 +1922,7 @@ gUnknown_81A6955:: @ 81A6955
setvar VAR_0x8004, 27
special Special_SetSomeVariable
setvar VAR_0x8004, 0
special sub_80CA86C
special Special_AnimatePcTurnOn
playse SE_PC_ON
msgbox Text_1A5075
goto EventScript_1A6998
@@ -1984,7 +1984,7 @@ EventScript_1A6A3D:: @ 81A6A3D
EventScript_1A6A46:: @ 81A6A46
setvar VAR_0x8004, 0
playse SE_PC_OFF
special sub_80CA9A8
special Special_AnimatePcTurnOff
special sub_812B35C
releaseall
end
@@ -2169,7 +2169,7 @@ gUnknown_81A6C32:: @ 81A6C32
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
fadescreen 1
special sub_80CA7EC
special Special_TownMap
waitstate
releaseall
end
@@ -2410,7 +2410,7 @@ EventScript_1A74B7:: @ 81A74B7
setvar VAR_0x8005, 1
setvar VAR_0x8006, 8
setvar VAR_0x8007, 5
special sub_80CAC28
special Special_ShakeScreen
waitstate
releaseall
end
data/field_specials.s
+382
View File
@@ -0,0 +1,382 @@
#include "constants/species.h"
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_83F5AF8:: @ 83F5AF8
.4byte gStringVar1
.4byte gStringVar2
.4byte gStringVar3
gUnknown_83F5B04::
.incbin "baserom.gba", 0x3F5B04, 0x16
sSlotMachineIndices:: @ 83F5B1A
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte 0
.byte 1
.byte 1
.byte 2
.byte 2
.byte 2
.byte 3
.byte 3
.byte 3
.byte 4
.byte 4
.byte 5
.align 1
sResortGorgeousDeluxeRewards:: @ 83F5B30
.2byte ITEM_BIG_PEARL
.2byte ITEM_PEARL
.2byte ITEM_STARDUST
.2byte ITEM_STAR_PIECE
.2byte ITEM_NUGGET
.2byte ITEM_RARE_CANDY
.align 2
sElevatorCurrentFloorWindowTemplate:: @ 83F5B3C
.byte 0, 22, 1, 7, 4, 15
.2byte 0x0008
sFloorNamePointers:: @ 83F5B44
.4byte gUnknown_8418069
.4byte gUnknown_8418065
.4byte gUnknown_8418061
.4byte gUnknown_841805D
.4byte gUnknown_841803A
.4byte gUnknown_841803D
.4byte gUnknown_8418040
.4byte gUnknown_8418043
.4byte gUnknown_8418046
.4byte gUnknown_8418049
.4byte gUnknown_841804C
.4byte gUnknown_841804F
.4byte gUnknown_8418052
.4byte gUnknown_8418055
.4byte gUnknown_8418059
.4byte gUnknown_841806D
gUnknown_83F5B84::
.byte 26
.byte 26
.byte 26
.byte 26
.byte 30
.byte 30
.byte 30
.byte 30
.byte 30
.byte 30
.byte 30
.byte 30
.byte 30
.byte 26
.byte 26
.byte 18
.align 1
sElevatorWindowMetatilesGoingUp:: @ 83F5B94
.2byte 0x02e8, 0x02e9, 0x02ea
.2byte 0x02f0, 0x02f1, 0x02f2
.2byte 0x02f8, 0x02f9, 0x02fa
.align 1
sElevatorWindowMetatilesGoingDown:: @ 83F5BA6
.2byte 0x02e8, 0x02ea, 0x02e9
.2byte 0x02f0, 0x02f2, 0x02f1
.2byte 0x02f8, 0x02fa, 0x02f9
sElevatorAnimationDuration:: @ 83F5BB8
.byte 8
.byte 16
.byte 24
.byte 32
.byte 38
.byte 46
.byte 53
.byte 56
.byte 57
sElevatorWindowAnimDuration:: @ 83F5BC1
.byte 3
.byte 6
.byte 9
.byte 12
.byte 15
.byte 18
.byte 21
.byte 24
.byte 27
.align 2
gUnknown_83F5BCC:: @ 83F5BCC
.4byte gUnknown_8417FD9
.4byte gUnknown_8417FE6
.4byte gUnknown_8417FF3
.4byte gUnknown_8418000
.4byte gUnknown_841800D
.4byte gUnknown_8418017
.4byte gUnknown_8418022
.4byte gUnknown_841802F
.4byte gOtherText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gUnknown_8418059
.4byte gUnknown_8418055
.4byte gUnknown_8418052
.4byte gUnknown_841804F
.4byte gUnknown_841804C
.4byte gUnknown_8418049
.4byte gUnknown_8418046
.4byte gUnknown_8418043
.4byte gUnknown_8418040
.4byte gUnknown_841803D
.4byte gUnknown_841803A
.4byte gOtherText_Exit
.4byte gUnknown_841805D
.4byte gUnknown_8418061
.4byte gUnknown_8418069
.4byte gOtherText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gUnknown_8418046
.4byte gUnknown_8418043
.4byte gUnknown_8418040
.4byte gUnknown_841803D
.4byte gUnknown_841803A
.4byte gOtherText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gUnknown_841807D
.4byte gUnknown_841808E
.4byte gUnknown_841809C
.4byte gOtherText_Quit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gUnknown_84180A7
.4byte gUnknown_84180BC
.4byte gUnknown_84180D0
.4byte gUnknown_84180E4
.4byte gUnknown_84180FA
.4byte gUnknown_841810D
.4byte gUnknown_841811D
.4byte gUnknown_841812F
.4byte gUnknown_8418142
.4byte gUnknown_8418152
.4byte gUnknown_8418163
.4byte gOtherText_Exit
.4byte gUnknown_841806D
.4byte gUnknown_841805D
.4byte gOtherText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
gUnknown_83F5D1C:: @ 83F5D1C
.byte 2 @ firstArrowType
.byte 0 @ firstX
.byte 0 @ firstY
.byte 3 @ secondArrowType
.byte 0 @ secondX
.byte 0 @ secondY
.2byte 0 @ fullyUpThreshold
.2byte 0 @ fullyDownThreshold
.2byte 2000 @ tileTag
.2byte 100 @ palTag
.byte 0 @ palNum
.align 2
.align 1
sStarterMon:: @ 83F5D2C
.2byte SPECIES_BULBASAUR
.2byte SPECIES_SQUIRTLE
.2byte SPECIES_CHARMANDER
gUnknown_83F5D32:: @ 83F5D32
.byte 0x05, 0x03, 0x01
.byte 0x06, 0x03, 0x03
.byte 0x07, 0x07, 0x01
.byte 0x08, 0x05, 0x01
.byte 0x09, 0x05, 0x01
.byte 0x0b, 0x01, 0x01
.byte 0x0c, 0x07, 0x01
.byte 0x0e, 0x05, 0x01
.byte 0x22, 0x03, 0x01
.byte 0x23, 0x07, 0x01
.byte 0x1f, 0x02, 0x01
.byte 0x25, 0x04, 0x01
.align 2
gUnknown_83F5D58:: @ 83F5D58
.2byte 0x0004, 0x0000, 0x0003, 0x0000
.2byte 0x0004, 0x0003, 0x0003, 0x0000
.2byte 0x0005, 0x0001, 0x0003, 0x0001
.2byte 0x001c, 0x0000, 0x0003, 0x0029
.2byte 0x001c, 0x0000, 0x0003, 0x002a
.2byte 0x0001, 0x0000, 0x000f, 0x0000
.2byte 0x0001, 0x0000, 0x000f, 0x0003
.2byte 0x0006, 0x0000, 0x0003, 0x0002
.2byte 0x0006, 0x0002, 0x0003, 0x0002
.2byte 0x0001, 0x0001, 0x0003, 0x0016
.2byte 0x0001, 0x0002, 0x0003, 0x0016
.2byte 0x0007, 0x0005, 0x0003, 0x0003
.2byte 0x0007, 0x0006, 0x0003, 0x0003
.2byte 0x001e, 0x0000, 0x0003, 0x002c
.2byte 0x0011, 0x0000, 0x0003, 0x0017
.2byte 0x0001, 0x001e, 0x0003, 0x0017
.2byte 0x0001, 0x0020, 0x0003, 0x0018
.2byte 0x0009, 0x0003, 0x0003, 0x0005
.2byte 0x0009, 0x0006, 0x0003, 0x0005
.2byte 0x0001, 0x0005, 0x0003, 0x0005
.2byte 0x0001, 0x0024, 0x0003, 0x0014
.2byte 0x0001, 0x0026, 0x0003, 0x001d
.2byte 0x0001, 0x0051, 0x0003, 0x001c
.2byte 0x0001, 0x0051, 0x0003, 0x001c
.2byte 0x0001, 0x005f, 0x0003, 0x001c
.2byte 0x0001, 0x0058, 0x0003, 0x0004
.2byte 0x0008, 0x0002, 0x0003, 0x0004
.2byte 0x0008, 0x0004, 0x0003, 0x0004
.2byte 0x0001, 0x0023, 0x0003, 0x001a
.2byte 0x0001, 0x0021, 0x0003, 0x0019
.2byte 0x000a, 0x0000, 0x0003, 0x0006
.2byte 0x000a, 0x0007, 0x0003, 0x0006
.2byte 0x000a, 0x000e, 0x0003, 0x0006
.2byte 0x000a, 0x0010, 0x0003, 0x0006
.2byte 0x000a, 0x0011, 0x0003, 0x0006
.2byte 0x0001, 0x002a, 0x000a, 0x000e
.2byte 0x0001, 0x003f, 0x000b, 0x0000
.2byte 0x000b, 0x0003, 0x0003, 0x0007
.2byte 0x000b, 0x0007, 0x0003, 0x0007
.2byte 0x000e, 0x0002, 0x0003, 0x000a
.2byte 0x000e, 0x0003, 0x0003, 0x000a
.2byte 0x0001, 0x002f, 0x0003, 0x000a
.2byte 0x0001, 0x0053, 0x0003, 0x0026
.2byte 0x0001, 0x0053, 0x0003, 0x0026
.2byte 0x0001, 0x003b, 0x0003, 0x0008
.2byte 0x000c, 0x0000, 0x0003, 0x0008
.2byte 0x000c, 0x0001, 0x0003, 0x0008
.2byte 0x0001, 0x0027, 0x0003, 0x002a
.2byte 0x0001, 0x0028, 0x0003, 0x002a
.2byte 0x000d, 0x0000, 0x0003, 0x0009
.2byte 0x0001, 0x0048, 0x0003, 0x0003
.align 2
gUnknown_83F5EF0:: @ 83F5EF0
.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c"
.align 2
gUnknown_83F5F24:: @ 83F5F24
.asciz "0"
.align 1
gUnknown_83F5F26:: @ 83F5F26
.2byte 0x0504
.2byte 0x0605
.2byte 0x0703
.2byte 0x0800
.2byte 0x0901
.2byte 0x0a0c
.2byte 0x0b05
.2byte 0x0c05
.2byte 0x0d00
.2byte 0x0e06
.2byte 0x1000
.2byte 0x1500
.2byte 0x2000
.2byte 0x2102
.2byte 0x2201
.2byte 0x2301
.2byte 0x2400
.2byte 0x1f03
.2byte 0x2500
.2byte 0x0004
.2byte 0xffff
gUnknown_83F5F50:: @ 83F5F50
.incbin "baserom.gba", 0x3F5F50, 0x20
.incbin "baserom.gba", 0x3F5F70, 0x20
.incbin "baserom.gba", 0x3F5F90, 0x20
.incbin "baserom.gba", 0x3F5FB0, 0x20
.incbin "baserom.gba", 0x3F5FD0, 0x20
.incbin "baserom.gba", 0x3F5FF0, 0x20
.incbin "baserom.gba", 0x3F6010, 0x20
.incbin "baserom.gba", 0x3F6030, 0x20
.incbin "baserom.gba", 0x3F6050, 0x20
.incbin "baserom.gba", 0x3F6070, 0x20
.incbin "baserom.gba", 0x3F6090, 0x20
gUnknown_83F60B0:: @ 83F60B0
.incbin "baserom.gba", 0x3F60B0, 0x20
gUnknown_83F60D0:: @ 83F60D0
.incbin "baserom.gba", 0x3F60D0, 0x20
.incbin "baserom.gba", 0x3F60F0, 0x20
.incbin "baserom.gba", 0x3F6110, 0x20
.incbin "baserom.gba", 0x3F6130, 0x20
.incbin "baserom.gba", 0x3F6150, 0x20
.incbin "baserom.gba", 0x3F6170, 0x20
.incbin "baserom.gba", 0x3F6190, 0x20
.incbin "baserom.gba", 0x3F61B0, 0x20
gUnknown_83F61D0:: @ 83F61D0
.incbin "baserom.gba", 0x3F61D0, 0x20
gUnknown_83F61F0:: @ 83F61F0
.incbin "baserom.gba", 0x3F61F0, 0xB
gUnknown_83F61FB:: @ 83F61FB
.incbin "baserom.gba", 0x3F61FB, 0x8
gUnknown_83F6203:: @ 83F6203
.incbin "baserom.gba", 0x3F6203, 0x3
gUnknown_83F6206:: @ 83F6206
.incbin "baserom.gba", 0x3F6206, 0x160
gUnknown_83F6366:: @ 83F6366
.incbin "baserom.gba", 0x3F6366, 0x16
gUnknown_83F637C:: @ 83F637C
.incbin "baserom.gba", 0x3F637C, 0xC
data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin → data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin
View File
data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin → data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin
View File
data/layouts/layouts.json
+3 -3
View File
@@ -3885,15 +3885,15 @@
},
{
"id": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
"name": "SevenIsland_SeavaultCanyon_TanobyKey_Layout",
"name": "SevenIsland_SevaultCanyon_TanobyKey_Layout",
"width": 15,
"height": 16,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4A94",
"secondary_tileset": "gTileset_82D4E0C",
"border_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin",
"blockdata_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin"
"border_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin",
"blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin"
},
{
"id": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
data/maps/CeladonCity_Condominiums_3F/scripts.inc
+1 -1
View File
@@ -34,7 +34,7 @@ EventScript_16C418:: @ 816C418
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_80CA618
special Special_ShowDiploma
waitstate
release
end
data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+5 -5
View File
@@ -7,11 +7,11 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
waitmessage
setvar VAR_0x8004, 3
specialvar VAR_RESULT, sub_80CB328
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
switch VAR_RESULT
case 0, EventScript_16C1B7
case 1, EventScript_16C1C3
@@ -109,15 +109,15 @@ EventScript_16C2E6:: @ 816C2E6
end
EventScript_16C30E:: @ 816C30E
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
releaseall
end
EventScript_16C313:: @ 816C313
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
closemessage
waitse
special sub_80CB498
special Special_AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
data/maps/CeladonCity_GameCorner/scripts.inc
+1 -1
View File
@@ -273,7 +273,7 @@ EventScript_16C96C:: @ 816C96C
setfieldeffectarg 2, 14
dofieldeffect 64
waitfieldeffect 64
specialvar VAR_RESULT, sub_80CAABC
specialvar VAR_RESULT, Special_GetRandomSlotMachine
playslotmachine VAR_RESULT
releaseall
end
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+9 -9
View File
@@ -10,16 +10,16 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE
faceplayer
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_172043
compare_var_to_value VAR_STORAGE_UNKNOWN, 65535
compare_var_to_value VAR_RESORT_GOREGOUS_REQUESTED_MON, 0xFFFF
goto_if eq, EventScript_171F0B
compare_var_to_value VAR_STORAGE_UNKNOWN, 0
compare_var_to_value VAR_RESORT_GOREGOUS_REQUESTED_MON, SPECIES_NONE
goto_if ne, EventScript_171F19
msgbox gUnknown_81A42A0
goto EventScript_171EFE
end
EventScript_171EFE:: @ 8171EFE
special sub_80CB0A8
special Special_SampleResortGorgeousMonAndReward
msgbox gUnknown_81A4315
release
end
@@ -30,15 +30,15 @@ EventScript_171F0B:: @ 8171F0B
end
EventScript_171F19:: @ 8171F19
copyvar VAR_0x8004, VAR_STORAGE_UNKNOWN
specialvar VAR_RESULT, sub_80CC48C
copyvar VAR_0x8004, VAR_RESORT_GOREGOUS_REQUESTED_MON
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_171F34
goto EventScript_171EFE
end
EventScript_171F34:: @ 8171F34
special sub_80CB0A8
special Special_SampleResortGorgeousMonAndReward
msgbox gUnknown_81A43F7
addobject 2
applymovement 2, Movement_172060
@@ -62,11 +62,11 @@ EventScript_171F34:: @ 8171F34
call_if eq, EventScript_17201A
moveobjectoffscreen 2
msgbox gUnknown_81A458E
giveitem VAR_0x403B
giveitem VAR_RESORT_GOREGOUS_REWARD
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_172025
setflag FLAG_TEMP_2
setvar VAR_STORAGE_UNKNOWN, 0
setvar VAR_RESORT_GOREGOUS_REQUESTED_MON, 0
release
end
@@ -104,7 +104,7 @@ EventScript_172025:: @ 8172025
textcolor 1
msgbox gUnknown_81A461B
setflag FLAG_TEMP_2
setvar VAR_STORAGE_UNKNOWN, 0
setvar VAR_RESORT_GOREGOUS_REQUESTED_MON, 0
release
end
data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E
checkflag FLAG_NO_ROOM_FOR_TOGEPI_EGG
goto_if TRUE, EventScript_16892C
msgbox gUnknown_818A80D
specialvar VAR_RESULT, sub_80CA76C
specialvar VAR_RESULT, Special_GetLeadMonFriendship
compare_var_to_value VAR_RESULT, 6
goto_if eq, EventScript_1688AC
msgbox gUnknown_818A88F
data/maps/FourIsland/scripts.inc
+1 -1
View File
@@ -133,7 +133,7 @@ EventScript_167E19:: @ 8167E19
special GetDaycareMonNicknames
msgbox gUnknown_81BF789
special SetDaycareCompatibilityString
special sub_80CA68C
special Special_ShowStringVar4AsFieldMessage
waitmessage
waitbuttonpress
release
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+1 -1
View File
@@ -157,7 +157,7 @@ EventScript_16D462:: @ 816D462
countpokemon
compare_var_to_value VAR_RESULT, 6
goto_if ne, EventScript_1A77A9
specialvar VAR_RESULT, sub_80CABD0
specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_1A77A9
msgbox gUnknown_81BFEAC
data/maps/LavenderTown_House2/scripts.inc
+2 -2
View File
@@ -27,14 +27,14 @@ EventScript_16B2AA:: @ 816B2AA
end
EventScript_16B2B4:: @ 816B2B4
specialvar VAR_RESULT, sub_80CAD54
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
compare_var_to_value VAR_RESULT, SPECIES_EGG
goto_if eq, EventScript_16B307
special TV_CopyNicknameToStringVar1AndEnsureTerminated
special TV_CheckMonOTIDEqualsPlayerID
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16B311
specialvar VAR_RESULT, sub_80CAD7C
specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName
special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_16B311
data/maps/NavelRock_Base/scripts.inc
+2 -2
View File
@@ -46,14 +46,14 @@ NavelRock_Base_EventScript_165134:: @ 8165134
setvar VAR_0x8005, 3
setvar VAR_0x8006, 4
setvar VAR_0x8007, 2
special sub_80CAC28
special Special_ShakeScreen
delay 30
playse SE_T_AME_E
setvar VAR_0x8004, 0
setvar VAR_0x8005, 3
setvar VAR_0x8006, 4
setvar VAR_0x8007, 2
special sub_80CAC28
special Special_ShakeScreen
delay 30
delay 50
waitse
data/maps/PalletTown_GarysHouse/scripts.inc
+2 -2
View File
@@ -61,7 +61,7 @@ EventScript_168DB9:: @ 8168DB9
faceplayer
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_168E3C
specialvar VAR_RESULT, sub_80CAD54
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
compare_var_to_value VAR_RESULT, SPECIES_EGG
goto_if eq, EventScript_168E32
msgbox gUnknown_818D8CC
@@ -88,7 +88,7 @@ EventScript_168E3C:: @ 8168E3C
EventScript_168E46:: @ 8168E46
msgbox gUnknown_818D9A5
specialvar VAR_RESULT, sub_80CA76C
specialvar VAR_RESULT, Special_GetLeadMonFriendship
switch VAR_RESULT
case 0, EventScript_168EA6
case 1, EventScript_168EB0
data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+2 -2
View File
@@ -38,7 +38,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
setvar VAR_0x8004, 32
special Special_SetSomeVariable
setvar VAR_0x8004, 1
special sub_80CA86C
special Special_AnimatePcTurnOn
playse SE_PC_ON
msgbox gUnknown_81A5420
special sub_80EB6AC
@@ -50,7 +50,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17
setvar VAR_0x8004, 1
playse SE_PC_OFF
special sub_80CA9A8
special Special_AnimatePcTurnOff
special sub_812B35C
releaseall
end
data/maps/RocketHideout_Elevator/scripts.inc
+5 -5
View File
@@ -9,11 +9,11 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
waitmessage
setvar VAR_0x8004, 2
specialvar VAR_RESULT, sub_80CB328
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
switch VAR_RESULT
case 0, EventScript_161530
case 1, EventScript_16153C
@@ -87,15 +87,15 @@ EventScript_161608:: @ 8161608
end
EventScript_161609:: @ 8161609
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
releaseall
end
EventScript_16160E:: @ 816160E
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
closemessage
waitse
special sub_80CB498
special Special_AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
data/maps/Route12_FishingHouse/scripts.inc
+1 -1
View File
@@ -36,7 +36,7 @@ EventScript_16FF7F:: @ 816FF7F
goto_if eq, EventScript_1A7AE0
special sub_8112364
setvar VAR_0x8004, SPECIES_MAGIKARP
specialvar VAR_RESULT, sub_80CC48C
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_16FFF5
special sub_80A096C
data/maps/Route16/scripts.inc
+1 -1
View File
@@ -27,7 +27,7 @@ Route16_MapScript3_168113:: @ 8168113
.2byte 0
EventScript_16811D:: @ 816811D
special sub_80CA630
special Special_ForcePlayerOntoBike
end
Route16_EventScript_168121:: @ 8168121
data/maps/Route18/scripts.inc
+1 -1
View File
@@ -17,7 +17,7 @@ Route18_MapScript2_168211:: @ 8168211
.2byte 0
EventScript_16821B:: @ 816821B
special sub_80CA630
special Special_ForcePlayerOntoBike
end
Route18_EventScript_16821F:: @ 816821F
data/maps/SevenIsland_House_Room1/scripts.inc
+1 -1
View File
@@ -90,7 +90,7 @@ EventScript_17097D:: @ 817097D
EventScript_170987:: @ 8170987
special SavePlayerParty
special sub_80CAAAC
special Special_BufferEReaderTrainerName5
msgbox gUnknown_81A0598, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_170A11
data/maps/SevenIsland_House_Room2/scripts.inc
+2 -2
View File
@@ -46,14 +46,14 @@ EventScript_170AFE:: @ 8170AFE
EventScript_170B0C:: @ 8170B0C
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
special sub_80CA68C
special Special_ShowStringVar4AsFieldMessage
waitmessage
waitbuttonpress
return
EventScript_170B17:: @ 8170B17
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
special sub_80CA68C
special Special_ShowStringVar4AsFieldMessage
waitmessage
waitbuttonpress
return
data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json → data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
+8 -8
View File
@@ -1,6 +1,6 @@
{
"id": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
"name": "SevenIsland_SeavaultCanyon_TanobyKey",
"name": "SevenIsland_SevaultCanyon_TanobyKey",
"layout": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
"music": "MUS_NANAISEKI",
"region_map_section": "MAPSEC_TANOBY_KEY",
@@ -122,7 +122,7 @@
"elevation": 3,
"var": "VAR_0x4001",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39"
},
{
"type": "trigger",
@@ -131,7 +131,7 @@
"elevation": 3,
"var": "VAR_0x4007",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B"
},
{
"type": "trigger",
@@ -140,7 +140,7 @@
"elevation": 3,
"var": "VAR_0x4006",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8"
},
{
"type": "trigger",
@@ -149,7 +149,7 @@
"elevation": 3,
"var": "VAR_0x4005",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5"
},
{
"type": "trigger",
@@ -158,7 +158,7 @@
"elevation": 3,
"var": "VAR_0x4004",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2"
},
{
"type": "trigger",
@@ -167,7 +167,7 @@
"elevation": 3,
"var": "VAR_0x4003",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F"
},
{
"type": "trigger",
@@ -176,7 +176,7 @@
"elevation": 3,
"var": "VAR_0x4002",
"var_value": 99,
"script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C"
"script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C"
}
],
"bg_events": []
data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc → data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc
+13 -13
View File
@@ -1,8 +1,8 @@
SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
map_script 3, SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2
SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
map_script 3, SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2
.byte 0
SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2
SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2
setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY
checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS
call_if TRUE, EventScript_164E07
@@ -26,7 +26,7 @@ EventScript_164E07:: @ 8164E07
setobjectxyperm 7, 9, 8
return
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
lockall
compare_var_to_value VAR_0x4001, 100
goto_if eq, EventScript_164F8A
@@ -37,7 +37,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
releaseall
end
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
lockall
compare_var_to_value VAR_0x4002, 100
goto_if eq, EventScript_164F8A
@@ -48,7 +48,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
releaseall
end
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
lockall
compare_var_to_value VAR_0x4003, 100
goto_if eq, EventScript_164F8A
@@ -59,7 +59,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
releaseall
end
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
lockall
compare_var_to_value VAR_0x4004, 100
goto_if eq, EventScript_164F8A
@@ -70,7 +70,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
releaseall
end
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
lockall
compare_var_to_value VAR_0x4005, 100
goto_if eq, EventScript_164F8A
@@ -81,7 +81,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
releaseall
end
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
lockall
compare_var_to_value VAR_0x4006, 100
goto_if eq, EventScript_164F8A
@@ -92,7 +92,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
releaseall
end
SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B
SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B
lockall
compare_var_to_value VAR_0x4007, 100
goto_if eq, EventScript_164F8A
@@ -110,7 +110,7 @@ EventScript_164F2E:: @ 8164F2E
setvar VAR_0x8005, 1
setvar VAR_0x8006, 8
setvar VAR_0x8007, 3
special sub_80CAC28
special Special_ShakeScreen
delay 60
return
@@ -119,13 +119,13 @@ EventScript_164F51:: @ 8164F51
setvar VAR_0x8005, 2
setvar VAR_0x8006, 10
setvar VAR_0x8007, 3
special sub_80CAC28
special Special_ShakeScreen
delay 60
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
setvar VAR_0x8006, 12
setvar VAR_0x8007, 2
special sub_80CAC28
special Special_ShakeScreen
delay 60
playse SE_FU_ZUZUZU
waitse
data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc → data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc
View File
data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
+6 -6
View File
@@ -9,11 +9,11 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
waitmessage
setvar VAR_0x8004, 6
specialvar VAR_RESULT, sub_80CB328
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
switch VAR_RESULT
case 0, EventScript_164B46
case 1, EventScript_164B52
@@ -44,7 +44,7 @@ EventScript_164B90:: @ 8164B90
goto_if eq, EventScript_164BD3
call EventScript_164BD8
setvar VAR_ELEVATOR_FLOOR, 3
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
delay 25
applymovement 255, Movement_164BE5
waitmovement 0
@@ -58,15 +58,15 @@ EventScript_164BCD:: @ 8164BCD
end
EventScript_164BD3:: @ 8164BD3
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
releaseall
end
EventScript_164BD8:: @ 8164BD8
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
closemessage
waitse
special sub_80CB498
special Special_AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
data/maps/SilphCo_Elevator/scripts.inc
+5 -5
View File
@@ -7,11 +7,11 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
special Special_DrawElevatorCurrentFloorWindow
message Text_1A535C
waitmessage
setvar VAR_0x8004, 1
specialvar VAR_RESULT, sub_80CB328
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
special sub_80CB7C4
waitstate
switch VAR_RESULT
@@ -163,15 +163,15 @@ EventScript_1621E6:: @ 81621E6
end
EventScript_1621E7:: @ 81621E7
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
releaseall
end
EventScript_1621EC:: @ 81621EC
special sub_80CB63C
special Special_CloseElevatorCurrentFloorWindow
closemessage
waitse
special sub_80CB498
special Special_AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+1 -1
View File
@@ -28,7 +28,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
setvar VAR_0x8005, 0
setvar VAR_0x8006, 12
setvar VAR_0x8007, 3
special sub_80CAC28
special Special_ShakeScreen
delay 60
compare_var_to_value VAR_FACING, 2
call_if eq, EventScript_164325
data/maps/SixIsland_WaterPath_House1/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D
goto_if eq, EventScript_1A7AE0
special sub_8112364
setvar VAR_0x8004, SPECIES_HERACROSS
specialvar VAR_RESULT, sub_80CC48C
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1720E5
special sub_80A0918
data/maps/ThreeIsland_BerryForest/scripts.inc
+1 -1
View File
@@ -32,7 +32,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83
giveitem ITEM_IAPAPA_BERRY
compare_var_to_value VAR_RESULT, 0
call_if eq, EventScript_163D19
special sub_80CA6DC
special Special_BufferBigGuyOrBigGirlString
msgbox gUnknown_817AF3B
closemessage
setflag FLAG_RESCUED_LOSTELLE
data/maps/ThreeIsland_House1/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ ThreeIsland_House1_MapScripts:: @ 8171819
ThreeIsland_House1_EventScript_17181A:: @ 817181A
lock
faceplayer
special sub_80CA6DC
special Special_BufferBigGuyOrBigGirlString
msgbox gUnknown_81A2F3E
release
end
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+1 -1
View File
@@ -37,7 +37,7 @@ EventScript_171435:: @ 8171435
textcolor 0
msgbox gUnknown_81A28B2
textcolor 1
special sub_80CA6DC
special Special_BufferBigGuyOrBigGirlString
msgbox gUnknown_81A2931
closemessage
applymovement 3, Movement_1A75ED
data/maps/map_groups.json
+1 -1
View File
@@ -212,7 +212,7 @@
"SevenIsland_TanobyRuins_RixyChamber",
"SevenIsland_TanobyRuins_ViapoisChamber",
"ThreeIsland_DunsparceTunnel",
"SevenIsland_SeavaultCanyon_TanobyKey",
"SevenIsland_SevaultCanyon_TanobyKey",
"NavelRock_1F",
"NavelRock_Summit",
"NavelRock_Base",
data/specials.inc
+28 -28
View File
@@ -150,15 +150,15 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA68C
def_special Special_ShowStringVar4AsFieldMessage
def_special DrawWholeMapView
def_special sub_80CA69C
def_special Special_GetPlayerXY
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA6BC
def_special sub_80CA6DC
def_special sub_80CA714
def_special Special_GetPlayerTrainerIdOnesDigit
def_special Special_BufferBigGuyOrBigGirlString
def_special Special_BufferSonOrDaughterString
def_special Special_SetHiddenItemFlag
def_special nullsub_75
def_special nullsub_75
@@ -223,8 +223,8 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special Special_GetPokedexCount
def_special sub_80CA524
def_special sub_80CA86C
def_special sub_80CA9A8
def_special Special_AnimatePcTurnOn
def_special Special_AnimatePcTurnOff
def_special Special_GetElevatorFloor
def_special nullsub_75
def_special nullsub_75
@@ -236,10 +236,10 @@ gSpecials:: @ 815FD60
def_special sub_80E4634
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA664
def_special Special_GetPlayerAvatarBike
def_special nullsub_75
def_special nullsub_75
def_special sub_80CA76C
def_special Special_GetLeadMonFriendship
def_special sub_80E5970
def_special sub_80E5C28
def_special sub_80E6648
@@ -260,7 +260,7 @@ gSpecials:: @ 815FD60
def_special sub_80A03D8
def_special sub_80EB6AC
def_special sub_80EB6FC
def_special sub_80CA7EC
def_special Special_TownMap
def_special sub_8053A9C
def_special sub_8053D68
def_special sub_8054440
@@ -273,7 +273,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special ScrSpecial_CreatePCMenu
def_special HallOfFamePCBeginFade
def_special sub_80CA618
def_special Special_ShowDiploma
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -282,7 +282,7 @@ gSpecials:: @ 815FD60
def_special nullsub_61
def_special DoSoftReset
def_special Special_HallOfFame
def_special sub_80CB498
def_special Special_AnimateElevator
def_special nullsub_75
def_special SpawnCameraObject
def_special RemoveCameraObject
@@ -294,32 +294,32 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CAAAC
def_special sub_80CAABC
def_special Special_BufferEReaderTrainerName5
def_special Special_GetRandomSlotMachine
def_special GetPlayerFacingDirection
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special LeadMonHasEffortRibbon
def_special GivLeadMonEffortRibbon
def_special GiveLeadMonEffortRibbon
def_special ScrSpecial_AreLeadMonEVsMaxedOut
def_special sub_8069740
def_special sub_8069768
def_special InitRoamer
def_special nullsub_75
def_special sub_80CA804
def_special Special_PlayerHasGrassPokemonInParty
def_special nullsub_75
def_special nullsub_75
def_special sub_80CAB78
def_special Special_IsStarterFirstStageInParty
def_special nullsub_75
def_special sub_80CABD0
def_special Special_IsThereRoomInAnyBoxForMorePokemon
def_special nullsub_75
def_special sub_80CB580
def_special Special_DrawElevatorCurrentFloorWindow
def_special nullsub_75
def_special sub_80CAC08
def_special Special_CheckPartyPokerus
def_special sub_806E99C
def_special sub_80CAC28
def_special Special_ShakeScreen
def_special sub_807FA68
def_special sub_807F9D8
def_special sub_807FABC
@@ -336,7 +336,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80CAD54
def_special Special_GetSpeciesOfPartySlot_x8004
def_special sub_80BFC14
def_special nullsub_75
def_special nullsub_75
@@ -345,23 +345,23 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special HasAllKantoMons
def_special sub_80CAD7C
def_special Special_BufferMonOTNameAndCompareToPlayerName
def_special nullsub_75
def_special sub_80E759C
def_special GetNameOfEnigmaBerryInPlayerParty
def_special nullsub_75
def_special sub_810B82C
def_special sub_807F904
def_special sub_80CA630
def_special Special_ForcePlayerOntoBike
def_special sub_80CB7C4
def_special sub_80CBC5C
def_special sub_80CADC4
def_special Special_SetVermilionTrashCans
def_special sub_805D1A8
def_special sub_80CB0A8
def_special Special_SampleResortGorgeousMonAndReward
def_special Special_CheckAddCoins
def_special GetDaycarePokemonCount
def_special sub_80CB63C
def_special Special_CloseElevatorCurrentFloorWindow
def_special sub_80CBD80
def_special ScrSpecial_GetStarter
def_special sub_80CBDCC
@@ -389,7 +389,7 @@ gSpecials:: @ 815FD60
def_special GetNumLevelsGainedForRoute5DaycareMon
def_special TakePokemonFromRoute5Daycare
def_special ScrSpecial_SeaGallopFerry
def_special sub_80CC48C
def_special Special_PlayerPartyContainsSpecies
def_special Special_SetSomeVariable
def_special HelpSystem_BackupSomeVariable
def_special HelpSystem_RestoreSomeVariable
@@ -449,7 +449,7 @@ gSpecials:: @ 815FD60
def_special sub_809C4A8
def_special sub_81537C0
def_special sub_809C5FC
def_special sub_80CB328
def_special Special_InitElevatorFloorSelectMenuPos
def_special Special_ComputeLoreleiDollCollection
def_special sub_80CD1B4
def_special CreateObedientEnemyMon
data/strings.s
+1 -1
View File
@@ -1394,7 +1394,7 @@ gUnknown_8417920:: @ 0x8417920
gUnknown_8417926:: @ 0x8417926
.string "OK$"
gUnknown_8417929:: @ 0x8417929
gOtherText_Quit:: @ 0x8417929
.string "QUIT$"
gUnknown_841792E:: @ 0x841792E