Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update with master

Browse Source
This commit is contained in:
DizzyEggg 2018-12-26 17:46:51 +01:00
commit 517573eb4b
191 changed files with 10775 additions and 7508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
asm/battle_anim_effects_3.s
View File

@ -5,50 +5,6 @@
.text
thumb_func_start AnimTask_GetReturnPowerLevel
AnimTask_GetReturnPowerLevel: @ 815F8A0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r3, =gBattleAnimArgs
movs r2, 0
strh r2, [r3, 0xE]
ldr r1, =gAnimFriendship
ldrb r0, [r1]
ldrb r1, [r1]
adds r0, r1, 0
subs r0, 0x3D
lsls r0, 24
lsrs r0, 24
adds r2, r1, 0
cmp r0, 0x1E
bhi _0815F8C4
movs r0, 0x1
strh r0, [r3, 0xE]
_0815F8C4:
adds r0, r2, 0
subs r0, 0x5C
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6C
bhi _0815F8D4
movs r0, 0x2
strh r0, [r3, 0xE]
_0815F8D4:
lsls r0, r1, 24
lsrs r0, 24
cmp r0, 0xC8
bls _0815F8E0
movs r0, 0x3
strh r0, [r3, 0xE]
_0815F8E0:
adds r0, r4, 0
bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end AnimTask_GetReturnPowerLevel
thumb_func_start sub_815F8F4
sub_815F8F4: @ 815F8F4

2199
asm/dark.s
View File

File diff suppressed because it is too large Load Diff

2172
asm/psychic.s
View File

File diff suppressed because it is too large Load Diff

19
data/event_scripts.s
View File

@ -11,6 +11,7 @@
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/vars.h"
#include "constants/weather.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
@ -1087,7 +1088,7 @@ EventScript_2715DE:: @ 82715DE
setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL
setflag FLAG_HIDE_ROUTE_111_DESERT_RIVAL
setflag FLAG_HIDE_ROUTE_111_PLAYER_DESCENT
setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
@ -1798,11 +1799,11 @@ RustboroCity_EventScript_271ED7:: @ 8271ED7
end
RustboroCity_EventScript_271EEF:: @ 8271EEF
setvar VAR_OBJ_GFX_ID_0, 105
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
RustboroCity_EventScript_271EF5:: @ 8271EF5
setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
LavaridgeTown_EventScript_271EFB:: @ 8271EFB
@ -1816,11 +1817,11 @@ Route119_EventScript_271EFB:: @ 8271EFB
end
LavaridgeTown_EventScript_271F13:: @ 8271F13
setvar VAR_OBJ_GFX_ID_3, 106
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE
return
LavaridgeTown_EventScript_271F19:: @ 8271F19
setvar VAR_OBJ_GFX_ID_3, 101
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
return
EventScript_271F1F:: @ 8271F1F
@ -1832,11 +1833,11 @@ EventScript_271F1F:: @ 8271F1F
end
EventScript_271F37:: @ 8271F37
setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
EventScript_271F3D:: @ 8271F3D
setvar VAR_OBJ_GFX_ID_0, 105
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
DewfordTown_Gym_EventScript_271F43:: @ 8271F43
@ -8976,8 +8977,8 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE
.2byte 0
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
setvar VAR_OBJ_GFX_ID_1, 28
setvar VAR_OBJ_GFX_ID_0, 28
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_0x8004, 5
special CallBattlePikeFunction
compare VAR_RESULT, 3

2
data/layouts.inc
View File

@ -389,7 +389,7 @@
.include "data/layouts/DesertUnderpass/layout.inc"
.include "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc"
.include "data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc"
.include "data/layouts/UnknownMap_08470BD8/layout.inc"
.include "data/layouts/Route111_NoMirageTower/layout.inc"
.include "data/layouts/UnionRoom/layout.inc"
.include "data/layouts/SafariZone_Northeast/layout.inc"
.include "data/layouts/SafariZone_Southeast/layout.inc"

0
data/layouts/UnknownMap_08470BD8/border.bin → data/layouts/Route111_NoMirageTower/border.bin
View File

14
data/layouts/Route111_NoMirageTower/layout.inc Normal file
View File

@ -0,0 +1,14 @@
Route111_NoMirageTower_MapBorder::
.incbin "data/layouts/Route111_NoMirageTower/border.bin"
Route111_NoMirageTower_MapBlockdata::
.incbin "data/layouts/Route111_NoMirageTower/map.bin"
.align 2
Route111_NoMirageTower_Layout::
.4byte 0x28
.4byte 0x8C
.4byte Route111_NoMirageTower_MapBorder
.4byte Route111_NoMirageTower_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Mauville

0
data/layouts/UnknownMap_08470BD8/map.bin → data/layouts/Route111_NoMirageTower/map.bin
View File

15
data/layouts/UnknownMap_08470BD8/layout.inc
View File

@ -1,15 +0,0 @@
UnknownMap_08470BD8_MapBorder::
.incbin "data/layouts/UnknownMap_08470BD8/border.bin"
UnknownMap_08470BD8_MapBlockdata::
.incbin "data/layouts/UnknownMap_08470BD8/map.bin"
.align 2
UnknownMap_08470BD8_Layout::
.4byte 0x28
.4byte 0x8C
.4byte UnknownMap_08470BD8_MapBorder
.4byte UnknownMap_08470BD8_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Mauville

2
data/layouts_table.inc
View File

@ -391,7 +391,7 @@ gMapLayouts::
.4byte DesertUnderpass_Layout
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout
.4byte BattleFrontier_BattleTowerCorridor2_Layout
.4byte UnknownMap_08470BD8_Layout
.4byte Route111_NoMirageTower_Layout
.4byte UnionRoom_Layout
.4byte SafariZone_Northeast_Layout
.4byte SafariZone_Southeast_Layout

4
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
View File

@ -24,11 +24,11 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE
return
BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6
setvar VAR_OBJ_GFX_ID_1, 100
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC:: @ 82574CC
setvar VAR_OBJ_GFX_ID_1, 105
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2

2
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
View File

@ -9,7 +9,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41
BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55

4
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View File

@ -27,11 +27,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4
setvar VAR_OBJ_GFX_ID_1, 100
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA
setvar VAR_OBJ_GFX_ID_1, 105
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00

2
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
View File

@ -16,7 +16,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB
BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F

2
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
View File

@ -9,7 +9,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218

6
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
View File

@ -30,7 +30,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A
setvar VAR_TEMP_1, 1
hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
compare VAR_TEMP_F, 0
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24
hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
@ -39,11 +39,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24
end
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25
setvar VAR_OBJ_GFX_ID_F, 100
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B
setvar VAR_OBJ_GFX_ID_F, 105
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31

2
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
View File

@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3
BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407

2
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
View File

@ -15,7 +15,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF
turnobject 1, 1
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF

8
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
View File

@ -19,13 +19,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833
return
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B
setvar VAR_OBJ_GFX_ID_1, 100
setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856
setvar VAR_OBJ_GFX_ID_1, 105
setvar VAR_OBJ_GFX_ID_0, 105
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861

2
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
View File

@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789
BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D

2
data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
View File

@ -42,7 +42,7 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7
BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B

2
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
View File

@ -16,7 +16,7 @@ BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3
BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707

2
data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
View File

@ -34,7 +34,7 @@ BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE
BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8
setvar VAR_TEMP_4, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2

2
data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
View File

@ -30,7 +30,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466
BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470
setvar VAR_TEMP_4, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A

2
data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
View File

@ -18,7 +18,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
setvar VAR_TEMP_4, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891

2
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
View File

@ -9,7 +9,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721
BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735

2
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
View File

@ -19,7 +19,7 @@ BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE
BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
compare VAR_TEMP_C, 0
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3
setobjectxyperm 2, 0, 0

6
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
View File

@ -17,11 +17,11 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
checkplayergender
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
setvar VAR_OBJ_GFX_ID_F, 0
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
setvar VAR_OBJ_GFX_ID_F, 89
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F
@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
.2byte 0
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D
hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
end
BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43

6
data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
View File

@ -17,11 +17,11 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
checkplayergender
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
setvar VAR_OBJ_GFX_ID_F, 0
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
return
BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B
setvar VAR_OBJ_GFX_ID_F, 89
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
return
BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91
@ -33,7 +33,7 @@ BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95
.2byte 0
BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F
hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
special sub_8139980

2
data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
View File

@ -85,6 +85,6 @@ BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96
BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end

2
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
View File

@ -35,7 +35,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9
BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD

18
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
View File

@ -25,14 +25,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
end
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA
setvar VAR_OBJ_GFX_ID_0, 7
setvar VAR_OBJ_GFX_ID_1, 7
setvar VAR_OBJ_GFX_ID_2, 7
setvar VAR_OBJ_GFX_ID_3, 7
setvar VAR_OBJ_GFX_ID_4, 7
setvar VAR_OBJ_GFX_ID_5, 7
setvar VAR_OBJ_GFX_ID_6, 7
setvar VAR_OBJ_GFX_ID_7, 7
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_BOY_1
setvar VAR_TEMP_1, 1
setvar VAR_TEMP_3, 1
setobjectxyperm 1, 10, 2
@ -43,7 +43,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14
.2byte 0
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23

2
data/maps/BirthIsland_Exterior/scripts.inc
View File

@ -10,7 +10,7 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
setflag FLAG_0x8D3
setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_0x4034, 0
setvar VAR_0x4035, 0
call_if_set FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F4E

18
data/maps/DewfordTown/scripts.inc
View File

@ -117,29 +117,29 @@ DewfordTown_EventScript_1E9656:: @ 81E9656
DewfordTown_EventScript_1E9660:: @ 81E9660
call DewfordTown_EventScript_271E95
setobjectpriority 2, MAP_DEWFORD_TOWN, 0
setobjectpriority 255, MAP_DEWFORD_TOWN, 0
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0
applymovement 2, DewfordTown_Movement_1E991D
waitmovement 0
removeobject 2
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911
waitmovement 0
hideobjectat 255, MAP_DEWFORD_TOWN
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
call DewfordTown_EventScript_2720A0
applymovement 4, DewfordTown_Movement_1E97A2
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2
waitmovement 0
showobjectat 255, MAP_ROUTE104
showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
call DewfordTown_EventScript_2720A8
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914
waitmovement 0
showobjectat 255, MAP_ROUTE104
showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
hideobjectat 4, MAP_DEWFORD_TOWN
setvar VAR_0x408E, 2
resetobjectpriority 255, MAP_DEWFORD_TOWN
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
copyvar VAR_0x4096, VAR_0x8008
waitstate
@ -149,19 +149,19 @@ DewfordTown_EventScript_1E9660:: @ 81E9660
DewfordTown_EventScript_1E96E7:: @ 81E96E7
call DewfordTown_EventScript_271E95
setobjectpriority 2, MAP_DEWFORD_TOWN, 0
setobjectpriority 255, MAP_DEWFORD_TOWN, 1
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1
applymovement 2, DewfordTown_Movement_1E991D
waitmovement 0
removeobject 2
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911
waitmovement 0
hideobjectat 255, MAP_DEWFORD_TOWN
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
call DewfordTown_EventScript_2720A0
applymovement 4, DewfordTown_Movement_1E9865
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865
waitmovement 0
call DewfordTown_EventScript_2720A8
showobjectat 255, MAP_ROUTE109
showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918
waitmovement 0
setobjectxyperm 2, 21, 26
@ -178,7 +178,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
call_if_set FLAG_0x095, DewfordTown_EventScript_1E9799
closemessage
copyvar VAR_0x4096, VAR_0x8008
resetobjectpriority 255, MAP_DEWFORD_TOWN
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
resetobjectpriority 2, MAP_ROUTE109
moveobjectoffscreen 2
release

2
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
View File

@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
.2byte 0
EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14

2
data/maps/EverGrandeCity_DrakesRoom/scripts.inc
View File

@ -9,7 +9,7 @@ EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC
.2byte 0
EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB

2
data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
View File

@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422
.2byte 0
EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431

2
data/maps/EverGrandeCity_Hall1/scripts.inc
View File

@ -7,6 +7,6 @@ EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F
.2byte 0
EverGrandeCity_Hall1_EventScript_229579:: @ 8229579
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end

2
data/maps/EverGrandeCity_Hall2/scripts.inc
View File

@ -7,6 +7,6 @@ EverGrandeCity_Hall2_MapScript2_229584: @ 8229584
.2byte 0
EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end

2
data/maps/EverGrandeCity_Hall3/scripts.inc
View File

@ -7,6 +7,6 @@ EverGrandeCity_Hall3_MapScript2_229599: @ 8229599
.2byte 0
EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end

2
data/maps/EverGrandeCity_Hall4/scripts.inc
View File

@ -7,6 +7,6 @@ EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE
.2byte 0
EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end

2
data/maps/EverGrandeCity_Hall5/scripts.inc
View File

@ -7,6 +7,6 @@ EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3
.2byte 0
EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end

2
data/maps/EverGrandeCity_HallOfFame/scripts.inc
View File

@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837
.2byte 0
EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846

2
data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
View File

@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184
.2byte 0
EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193

2
data/maps/EverGrandeCity_SidneysRoom/scripts.inc
View File

@ -30,7 +30,7 @@ EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E
.2byte 0
EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D

10
data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
View File

@ -17,13 +17,13 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF
return
FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7
setvar VAR_OBJ_GFX_ID_1, 100
setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2
setvar VAR_OBJ_GFX_ID_1, 105
setvar VAR_OBJ_GFX_ID_0, 105
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD
@ -260,7 +260,7 @@ FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0
.2byte 0
FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA
hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
removeobject 3
setvar VAR_TEMP_1, 1

2
data/maps/FallarborTown_BattleTentLobby/scripts.inc
View File

@ -9,7 +9,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71
FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85

4
data/maps/FarawayIsland_Entrance/scripts.inc
View File

@ -7,12 +7,12 @@ FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94
end
FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98
setweather 1
setweather WEATHER_CLOUDS
doweather
end
FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D
setweather 0
setweather WEATHER_NONE
doweather
end

2
data/maps/JaggedPass/scripts.inc
View File

@ -26,7 +26,7 @@ JaggedPass_MapScript1_23068B: @ 823068B
end
JaggedPass_EventScript_230697:: @ 8230697
setweather 7
setweather WEATHER_ASH
doweather
return

4
data/maps/LilycoveCity_Harbor/scripts.inc
View File

@ -363,7 +363,7 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514
compare VAR_FACING, 4
call_if_eq LilycoveCity_Harbor_EventScript_21E610
delay 30
hideobjectat 255, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
setvar VAR_0x8004, 2
call LilycoveCity_Harbor_EventScript_2721E2
return
@ -424,7 +424,7 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC
compare VAR_FACING, 4
call_if_eq LilycoveCity_Harbor_EventScript_21E610
delay 30
hideobjectat 255, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
setvar VAR_0x8004, 2
call LilycoveCity_Harbor_EventScript_2721E2
return

2
data/maps/LittlerootTown/scripts.inc
View File

@ -137,7 +137,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17
waitmovement 0
setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
setvar VAR_0x4092, 3
hideobjectat 255, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor VAR_0x8004, VAR_0x8005
waitdooranim
clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN

4
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
View File

@ -48,11 +48,11 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06
.2byte 0
LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
addobject 2
addobject 3
turnobject 3, 2

2
data/maps/MauvilleCity/scripts.inc
View File

@ -4,7 +4,7 @@ MauvilleCity_MapScripts:: @ 81DF385
MauvilleCity_MapScript1_1DF38B: @ 81DF38B
setflag FLAG_VISITED_MAUVILLE_CITY
clearflag FLAG_0x09D
clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
setflag FLAG_SYS_TV_START
clearflag FLAG_0x063

2
data/maps/MirageTower_1F/scripts.inc
View File

@ -4,7 +4,7 @@ MirageTower_1F_MapScripts:: @ 823AD01
MirageTower_1F_MapScript1_23AD07: @ 823AD07
setflag FLAG_0x8DC
setflag FLAG_0x09D
setflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
setflag FLAG_LANDMARK_MIRAGE_TOWER
end

2
data/maps/MirageTower_4F/scripts.inc
View File

@ -50,7 +50,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
setvar VAR_0x8007, 2
special sub_8139560
waitstate
special sub_81BE994
special DoMirageTowerCeilingCrumble
waitstate
setvar VAR_0x40CB, 1
clearflag FLAG_LANDMARK_MIRAGE_TOWER

6
data/maps/MtPyre_Exterior/scripts.inc
View File

@ -13,16 +13,16 @@ MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8
return
MtPyre_Exterior_EventScript_231FE9:: @ 8231FE9
setweather 6
setweather WEATHER_FOG_1
return
MtPyre_Exterior_EventScript_231FED:: @ 8231FED
setweather 6
setweather WEATHER_FOG_1
doweather
end
MtPyre_Exterior_EventScript_231FF2:: @ 8231FF2
setweather 2
setweather WEATHER_SUNNY
doweather
end

2
data/maps/NavelRock_Top/scripts.inc
View File

@ -42,7 +42,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269230
waitmovement 0
delay 50
setweather 0
setweather WEATHER_NONE
doweather
waitse
playmoncry SPECIES_HO_OH, 2

2
data/maps/PetalburgCity/scripts.inc
View File

@ -68,7 +68,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC418
waitmovement 0
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
hideobjectat 255, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor VAR_0x8004, VAR_0x8005
waitdooranim
clearflag FLAG_SPECIAL_FLAG_0x4000

2
data/maps/PetalburgCity_Gym/scripts.inc
View File

@ -78,7 +78,7 @@ PetalburgCity_Gym_MapScript2_20498B: @ 820498B
.2byte 0
PetalburgCity_Gym_EventScript_204995:: @ 8204995
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
PetalburgCity_Gym_MapScript2_20499A: @ 820499A

2
data/maps/PetalburgCity_WallysHouse/scripts.inc
View File

@ -8,7 +8,7 @@ PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234
.2byte 0
PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E
turnobject 255, 4
turnobject EVENT_OBJ_ID_PLAYER, 4
turnobject 1, 3
end

2
data/maps/Route101/scripts.inc
View File

@ -222,7 +222,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
setflag FLAG_0x052
fadescreen 1
removeobject 4
setobjectxy 255, 6, 13
setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13
applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4
waitmovement 0
special ChooseStarter

8
data/maps/Route104/scripts.inc
View File

@ -357,13 +357,13 @@ Route104_EventScript_1ED090:: @ 81ED090
Route104_EventScript_1ED099:: @ 81ED099
setobjectpriority 8, MAP_ROUTE104, 0
setobjectpriority 255, MAP_ROUTE104, 0
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104, 0
applymovement 8, Route104_Movement_1ED359
waitmovement 0
removeobject 8
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F
waitmovement 0
hideobjectat 255, MAP_ROUTE104
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
call Route104_EventScript_2720A0
goto_if_set FLAG_0x132, Route104_EventScript_1ED0D9
goto_if_unset FLAG_0x132, Route104_EventScript_1ED0EF
@ -399,7 +399,7 @@ Route104_EventScript_1ED139:: @ 81ED139
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353
waitmovement 0
call Route104_EventScript_2720A8
showobjectat 255, MAP_DEWFORD_TOWN
showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355
waitmovement 0
setobjectxyperm 2, 12, 8
@ -414,7 +414,7 @@ Route104_EventScript_1ED139:: @ 81ED139
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
hideobjectat 7, MAP_ROUTE104
copyvar VAR_0x4096, VAR_0x8008
resetobjectpriority 255, MAP_ROUTE104
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
resetobjectpriority 2, MAP_DEWFORD_TOWN
moveobjectoffscreen 2
setvar VAR_0x408E, 0

8
data/maps/Route109/scripts.inc
View File

@ -4,7 +4,7 @@ Route109_MapScripts:: @ 81EE75F
Route109_EventScript_1EE760:: @ 81EE760
call Route109_EventScript_271E95
setobjectpriority 2, MAP_ROUTE109, 0
setobjectpriority 255, MAP_ROUTE109, 0
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109, 0
applymovement 2, Route109_Movement_1EE90B
waitmovement 0
removeobject 2
@ -33,14 +33,14 @@ Route109_EventScript_1EE7C5:: @ 81EE7C5
end
Route109_EventScript_1EE7D5:: @ 81EE7D5
hideobjectat 255, MAP_ROUTE109
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
call Route109_EventScript_2720A0
applymovement 1, Route109_Movement_1EE84F
applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F
waitmovement 0
delay 50
call Route109_EventScript_2720A8
showobjectat 255, MAP_DEWFORD_TOWN
showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900
waitmovement 0
addobject 4
@ -56,7 +56,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5
msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT
closemessage
copyvar VAR_0x4096, VAR_0x8008
resetobjectpriority 255, MAP_ROUTE109
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
resetobjectpriority 2, MAP_DEWFORD_TOWN
moveobjectoffscreen 2
release

2
data/maps/Route110_TrickHouseEntrance/scripts.inc
View File

@ -133,7 +133,7 @@ Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
addobject 1
showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
turnobject 1, 4
turnobject 255, 3
turnobject EVENT_OBJ_ID_PLAYER, 3
end
Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26

2
data/maps/Route111/events.inc
View File

@ -43,7 +43,7 @@ Route111_EventObjects: @ 85291F0
object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, FLAG_ITEM_ROUTE_111_ELIXIR
object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 0, 0, Route111_EventScript_1F119B, 0
object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_FOSSIL
object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_RIVAL
object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_PLAYER_DESCENT
object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY
Route111_MapWarps: @ 8529640

30
data/maps/Route111/scripts.inc
View File

@ -39,8 +39,8 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4
Route111_MapScript1_1F0D87: @ 81F0D87
setvar VAR_0x40D6, 0
special sub_81BE79C
call_if_unset FLAG_0x14E, Route111_EventScript_1F0E3C
special SetMirageTowerVisibility
call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C
compare VAR_0x40CB, 1
call_if_eq Route111_EventScript_1F0DC2
compare VAR_0x40CB, 2
@ -60,11 +60,11 @@ Route111_EventScript_1F0DC2:: @ 81F0DC2
return
Route111_EventScript_1F0DDA:: @ 81F0DDA
setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
Route111_EventScript_1F0DE0:: @ 81F0DE0
setvar VAR_OBJ_GFX_ID_0, 105
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
Route111_EventScript_1F0DE6:: @ 81F0DE6
@ -81,7 +81,7 @@ Route111_EventScript_1F0DE6:: @ 81F0DE6
goto_if_lt Route111_EventScript_1F0E25
Route111_EventScript_1F0E22:: @ 81F0E22
setweather 8
setweather WEATHER_SANDSTORM
Route111_EventScript_1F0E25:: @ 81F0E25
return
@ -109,7 +109,7 @@ Route111_MapScript2_1F0E46: @ 81F0E46
.2byte 0
Route111_EventScript_1F0E50:: @ 81F0E50
hideobjectat 255, MAP_LITTLEROOT_TOWN
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
end
Route111_MapScript2_1F0E56: @ 81F0E56
@ -118,21 +118,21 @@ Route111_MapScript2_1F0E56: @ 81F0E56
Route111_EventScript_1F0E60:: @ 81F0E60
lockall
special sub_81BEB68
special StartMirageTowerShake
waitstate
delay 24
playse SE_RU_HYUU
addobject 45
special sub_81BE7F4
special StartPlayerDescendMirageTower
waitstate
showobjectat 255, MAP_LITTLEROOT_TOWN
showobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
removeobject 45
delay 16
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
delay 16
special sub_81BEB54
special StartMirageTowerDisintegration
waitstate
special sub_81BEB7C
special StartMirageTowerFossilFallAndSink
waitstate
setvar VAR_0x40CB, 2
clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
@ -259,14 +259,14 @@ Route111_Movement_1F0FAE: @ 81F0FAE
step_end
Route111_EventScript_1F0FB0:: @ 81F0FB0
setweather 2
setweather WEATHER_SUNNY
fadenewbgm MUS_DOORO_X1
doweather
setvar VAR_TEMP_3, 0
end
Route111_EventScript_1F0FBD:: @ 81F0FBD
setweather 8
setweather WEATHER_SANDSTORM
fadenewbgm MUS_ASHROAD
doweather
end
@ -415,7 +415,7 @@ Route111_EventScript_1F119B:: @ 81F119B
goto_if_eq Route111_EventScript_1F11C6
compare VAR_0x40CB, 2
goto_if_eq Route111_EventScript_1F11D0
goto_if_set FLAG_0x14E, Route111_EventScript_1F11DA
goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA
msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT
release
end

2
data/maps/Route112/scripts.inc
View File

@ -3,7 +3,7 @@ Route112_MapScripts:: @ 81F1DA8
.byte 0
Route112_MapScript1_1F1DAE: @ 81F1DAE
clearflag FLAG_0x09D
clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
setvar VAR_0x40BD, 0
end

4
data/maps/Route113/scripts.inc
View File

@ -8,7 +8,7 @@ Route113_MapScript1_1F215E: @ 81F215E
end
Route113_MapScript1_1F2161: @ 81F2161
clearflag FLAG_0x09D
clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
call Route113_EventScript_1F216A
end
@ -18,7 +18,7 @@ Route113_EventScript_1F216A:: @ 81F216A
goto_if_lt Route113_EventScript_1F2189
compare VAR_TEMP_0, 84
goto_if_gt Route113_EventScript_1F2189
setweather 7
setweather WEATHER_ASH
return
Route113_EventScript_1F2189:: @ 81F2189

6
data/maps/Route120/scripts.inc
View File

@ -76,11 +76,11 @@ Route120_EventScript_1F54D8:: @ 81F54D8
return
Route120_EventScript_1F54FF:: @ 81F54FF
setweather 1
setweather WEATHER_CLOUDS
return
Route120_EventScript_1F5503:: @ 81F5503
setweather 2
setweather WEATHER_SUNNY
return
Route120_EventScript_1F5507:: @ 81F5507
@ -92,7 +92,7 @@ Route120_EventScript_1F5507:: @ 81F5507
end
Route120_EventScript_1F5523:: @ 81F5523
setweather 3
setweather WEATHER_RAIN_LIGHT
return
Route120_EventScript_1F5527:: @ 81F5527

2
data/maps/RustboroCity_DevonCorp_3F/scripts.inc
View File

@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455
.2byte 0
RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F
turnobject 255, 4
turnobject EVENT_OBJ_ID_PLAYER, 4
end
RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464

2
data/maps/SeafloorCavern_Room9/scripts.inc
View File

@ -28,7 +28,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC
msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT
setweather 0
setweather WEATHER_NONE
doweather
special sub_80B05B4
waitstate

2
data/maps/SkyPillar_Outside/scripts.inc
View File

@ -72,7 +72,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT
closemessage
setflag FLAG_SYS_WEATHER_CTRL
setweather 15
setweather WEATHER_15
doweather
special WaitWeather
waitstate

6
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
View File

@ -17,11 +17,11 @@ SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976
return
SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E
setvar VAR_OBJ_GFX_ID_1, 100
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994
setvar VAR_OBJ_GFX_ID_1, 105
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A
@ -30,7 +30,7 @@ SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A
SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4
setvar VAR_TEMP_1, 1
hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM
end

2
data/maps/SlateportCity_BattleTentCorridor/scripts.inc
View File

@ -15,7 +15,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B
turnobject 1, 1
SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B

2
data/maps/SlateportCity_BattleTentLobby/scripts.inc
View File

@ -9,7 +9,7 @@ SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B
SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F

2
data/maps/SlateportCity_Harbor/scripts.inc
View File

@ -235,7 +235,7 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9
compare VAR_FACING, 4
call_if_eq SlateportCity_Harbor_EventScript_20CC37
delay 30
hideobjectat 255, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
setvar VAR_0x8004, 5
call SlateportCity_Harbor_EventScript_2721E2
return

14
data/maps/SootopolisCity/scripts.inc
View File

@ -117,7 +117,7 @@ SootopolisCity_EventScript_1E583D:: @ 81E583D
return
SootopolisCity_EventScript_1E583E:: @ 81E583E
setweather 13
setweather WEATHER_RAIN_HEAVY
return
SootopolisCity_EventScript_1E5842:: @ 81E5842
@ -179,11 +179,11 @@ SootopolisCity_EventScript_1E58E5:: @ 81E58E5
end
SootopolisCity_EventScript_1E58FC:: @ 81E58FC
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
return
SootopolisCity_EventScript_1E5901:: @ 81E5901
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
setvar VAR_0x40CA, 3
return
@ -214,7 +214,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
special RemoveCameraObject
delay 60
fadescreenspeed 1, 8
setweather 15
setweather WEATHER_15
doweather
setvar VAR_0x8004, 0
special sub_813B7D8
@ -314,7 +314,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
special RemoveCameraObject
delay 60
fadescreenspeed 1, 8
setweather 15
setweather WEATHER_15
doweather
setvar VAR_0x8004, 0
special sub_813B7D8
@ -532,7 +532,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
special sub_8139560
waitstate
waitmoncry
setweather 0
setweather WEATHER_NONE
doweather
applymovement 11, SootopolisCity_Movement_1E5E5B
waitmovement 0
@ -585,7 +585,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
special sub_8139560
waitstate
waitmoncry
setweather 0
setweather WEATHER_NONE
doweather
applymovement 11, SootopolisCity_Movement_1E5E5B
waitmovement 0

8
data/maps/SouthernIsland_Interior/scripts.inc
View File

@ -23,12 +23,12 @@ SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E
end
SouthernIsland_Interior_EventScript_242A8A:: @ 8242A8A
setvar VAR_OBJ_GFX_ID_1, 188
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS
setvar VAR_TEMP_4, 408
return
SouthernIsland_Interior_EventScript_242A95:: @ 8242A95
setvar VAR_OBJ_GFX_ID_1, 187
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS
setvar VAR_TEMP_4, 407
return
@ -41,11 +41,11 @@ SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0
end
SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8
setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
SouthernIsland_Interior_EventScript_242ABE:: @ 8242ABE
setvar VAR_OBJ_GFX_ID_0, 105
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4

2
data/maps/TrainerHill_Entrance/scripts.inc
View File

@ -22,7 +22,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
special sp194_trainer_tower
compare VAR_RESULT, 0
goto_if_eq TrainerHill_Entrance_EventScript_2680FF
setobjectxy 255, 9, 6
setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6
applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
end

6
data/maps/UnknownMap_25_34/scripts.inc
View File

@ -75,7 +75,7 @@ LinkContestRoom1_EventScript_23B829:: @ 823B829
LinkContestRoom1_EventScript_23B834:: @ 823B834
special sub_80F8B94
hideobjectat 255, MAP_LITTLEROOT_TOWN
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
call LinkContestRoom1_EventScript_23BB2B
end
@ -449,10 +449,10 @@ LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6
return
LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE
setvar VAR_OBJ_GFX_ID_3, 100
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4
setvar VAR_OBJ_GFX_ID_3, 105
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return

8
data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
View File

@ -17,13 +17,13 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310
return
VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328
setvar VAR_OBJ_GFX_ID_1, 100
setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333
setvar VAR_OBJ_GFX_ID_1, 105
setvar VAR_OBJ_GFX_ID_0, 105
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E

2
data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
View File

@ -9,7 +9,7 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB
VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF

649
data/party_menu.s
View File

@ -1,649 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 1
gUnknown_0861500C:: @ 861500C
.2byte 0x0005, 0x000e, 0x0019, 0x0022, 0x0026, 0x0044, 0x0045, 0x0066, 0x0076, 0x0087, 0x008a, 0x0056, 0x0099, 0x009d, 0x00a4, 0x00df
.2byte 0x00cd, 0x00f4, 0x00ad, 0x00c4, 0x00cb, 0x00bd, 0x0008, 0x00cf, 0x00d6, 0x0081, 0x006f, 0x0009, 0x0007, 0x00d2
.align 2
gUnknown_08615048:: @ 8615048
.4byte 0x00000000, 0x25b4409a, 0x25b4409a, 0x25b4409a, 0x37b4e0ff, 0x37b4e0ff, 0x37b4e0ff, 0x05fdc0fd
.4byte 0x05fdc0fd, 0x05fdc0fd, 0x00000000, 0x00000000, 0x03944490, 0x00000000, 0x00000000, 0x23944092
.4byte 0x03b44090, 0x03b44090, 0x03b44090, 0x07bc48b8, 0x07bc48b8, 0x03b44090, 0x03b44090, 0x01946098
.4byte 0x01946098, 0x0fb5c8fd, 0x0fb5c8fd, 0x27b5e0fa, 0x27b5e0fa, 0x05b440b8, 0x05b440b8, 0x3dfce0fd
.4byte 0x05b440b8, 0x05b440b8, 0x3dfce0fd, 0x1df7cffd, 0x1df7cffd, 0x03944098, 0x03944098, 0x1df7ccfd
.4byte 0x1df7ccfd, 0x03944090, 0x03944090, 0x01944092, 0x01944092, 0x0194409a, 0x219440ba, 0x219440ba
.4byte 0x03944090, 0x03944090, 0x01b46098, 0x01b46098, 0x07be4498, 0x07be4498, 0x03fec0fd, 0x23fec0fd
.4byte 0x1ff6e1fd, 0x1ff6e1fd, 0x03944098, 0x03944098, 0x059c4098, 0x05fc41fd, 0x05fcc1fd, 0x19d6cdfd
.4byte 0x19d6cdfd, 0x19d6cdfd, 0x19f4e1fd, 0x19f4e1fd, 0x19f4e1fd, 0x01944092, 0x01944092, 0x0194409a
.4byte 0x019c4092, 0x019c4092, 0x15b5f1f9, 0x15b5f1f9, 0x35b5f1fd, 0x03944098, 0x03944098, 0x03be4c98
.4byte 0x23feccfd, 0x03954890, 0x03954890, 0x03b6409a, 0x03b44098, 0x03b44098, 0x019c4098, 0x019c4098
.4byte 0x19f4d088, 0x19f4d088, 0x039c5090, 0x039c5090, 0x01965480, 0x01965480, 0x19d6d5fd, 0x01b67098
.4byte 0x19d6cdfd, 0x19d6cdfd, 0x21bc409a, 0x21bc409a, 0x03955880, 0x03955880, 0x01975490, 0x01975490
.4byte 0x19bce0ff, 0x19bce0ff, 0x03b4e1fd, 0x1bf4e1fd, 0x1dffe4ff, 0x01955080, 0x01955080, 0x01bd60ba
.4byte 0x39bde0ff, 0x05bfcffd, 0x0196409a, 0x39fce0fd, 0x039c4090, 0x039c4090, 0x039c4090, 0x039c4090
.4byte 0x039e4890, 0x039e4c90, 0x19f64dfd, 0x239440b2, 0x01fec5fd, 0x1bf4c8fd, 0x19b4c0fd, 0x219460da
.4byte 0x019c4098, 0x00000000, 0x019c4898, 0x019c4498, 0x00000000, 0x03b44098, 0x03bc4098, 0x03b44898
.4byte 0x03b44098, 0x039e4c90, 0x019d6098, 0x019d60d8, 0x019d6098, 0x219d60de, 0x03946090, 0x1dffe1fd
.4byte 0x03bc4090, 0x03b44890, 0x03b44090, 0x039c4898, 0x039c4898, 0x3bfcc898, 0x1bfecdfd, 0x3fffffff
.4byte 0x01b440ba, 0x21b440ba, 0x21b440ba, 0x07b54098, 0x27b54098, 0x3fb5e0fd, 0x01fce0ff, 0x21fce0ff
.4byte 0x21fce0ff, 0x3ff5c098, 0x3ff5c098, 0x03b44490, 0x03b44490, 0x0bd5c093, 0x0bd5c093, 0x01944098
.4byte 0x01944098, 0x03944090, 0x01944890, 0x01944890, 0x07b548fd, 0x05bf4ffd, 0x05bf4cfd, 0x07b74ffd
.4byte 0x07b74ffd, 0x03964c90, 0x03964c90, 0x07944898, 0x1f94c8fd, 0x1f94c8fd, 0x01944092, 0x07fdc0dd
.4byte 0x07fdc0dd, 0x1df7f0fd, 0x05bcc1fd, 0x05944092, 0x05944092, 0x05944092, 0x3ff4cdfd, 0x01944092
.4byte 0x01944092, 0x03944490, 0x05f5c098, 0x05f5c0fd, 0x03b64498, 0x03b64498, 0x03be4c90, 0x23feccfd
.4byte 0x07964c90, 0x00000000, 0x00000000, 0x03b64c98, 0x059570b8, 0x059570b8, 0x05b76cb8, 0x239464b2
.4byte 0x05b57098, 0x1df4c9fd, 0x1df4e9fd, 0x079d4892, 0x239440b2, 0x05b56098, 0x219460fa, 0x27fec4b2
.4byte 0x3ff5c1ff, 0x3ff5e1ff, 0x05b56098, 0x05b56098, 0x05bc6098, 0x05bc6098, 0x05b57098, 0x07b44890
.4byte 0x07b448d0, 0x03bc40fd, 0x03bc4098, 0x03b460b0, 0x03b444b8, 0x03b444b8, 0x039c4098, 0x05b540b8
.4byte 0x05b560b8, 0x079e4c90, 0x03b64c98, 0x00000000, 0x03b460fc, 0x03b460fc, 0x01fec5fd, 0x1bf4c8fd
.4byte 0x19b4c0fd, 0x1dffe9fd, 0x05bdcffd, 0x03b64898, 0x03b64098, 0x03be4098, 0x01b46098, 0x01b46098
.4byte 0x31b4e8fd, 0x03be4c98, 0x03b64c90, 0x07b64592, 0x00000000, 0x00000000, 0x00000000, 0x00000000
.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x2bb4c0ff, 0x2bb4c0ff, 0x2bb4c0ff
.4byte 0x03b460ff, 0x3bb4e0ff, 0x3bb4e0ff, 0x05bd4098, 0x05fde0fd, 0x05fde0fd, 0x01b640b8, 0x01b640b8
.4byte 0x27bd4898, 0x27bd4898, 0x00000000, 0x00000000, 0x03944090, 0x00000000, 0x03944090, 0x019c409a
.4byte 0x19fcc09a, 0x19fcc1ff, 0x0595509a, 0x27b7509e, 0x27b7509e, 0x21b44090, 0x23b44092, 0x21b44490
.4byte 0x03b440b0, 0x03b440b0, 0x0194409a, 0x29b4c0ff, 0x1fffe5fd, 0x03bc4090, 0x03bc4090, 0x039e4090
.4byte 0x039e4090, 0x059d4098, 0x059d4098, 0x07bf4c98, 0x07bf4c98, 0x3fffe9fd, 0x01b67490, 0x01b67490
.4byte 0x1df5f898, 0x01b47098, 0x39f6c5fd, 0x01bc4090, 0x01bc6090, 0x039e4090, 0x21bc40ba, 0x23bc40ba
.4byte 0x039c4090, 0x03be4098, 0x23bc4090, 0x23bc4090, 0x01b46098, 0x03b46098, 0x33b46098, 0x19f4e1fd
.4byte 0x19f4e1fd, 0x03b44898, 0x03b44898, 0x05b56098, 0x05b57098, 0x05bd6098, 0x05bd6098, 0x05bd6098
.4byte 0x29b4c0fb, 0x29b4c0ff, 0x019c4098, 0x059d5098, 0x07977498, 0x07977498, 0x07bd4098, 0x039e4498
.4byte 0x1bfec4fd, 0x0fb5c9fd, 0x0fb5c9fd, 0x09fee0ff, 0x1bf6c5fd, 0x1bf6e5fd, 0x03b64498, 0x03b64498
.4byte 0x00000000, 0x019e4498, 0x19fee5fd, 0x23b6409a, 0x39fce0fd, 0x39fce0fd, 0x39fce0fd, 0x1df5d4b8
.4byte 0x1df5d4b8, 0x21b4409a, 0x1dffc0fd, 0x1dffe0fd, 0x1dffe0fd, 0x019c4098, 0x03bc4098, 0x03bc4098
.4byte 0x23be6cba, 0x019e4c98, 0x01be4d98, 0x23b44098, 0x3ffde8ff, 0x01be6098, 0x25b56098, 0x25b56098
.4byte 0x3dfde8fd, 0x079e4898, 0x0bf6c9fd, 0x0bf6c9fd, 0x01b66098, 0x01b66098, 0x21b4609a, 0x21b460da
.4byte 0x1dfe4c98, 0x1dfe4c98, 0x1dfe4c98, 0x21b46098, 0x25b56098, 0x27b56098, 0x00000000, 0x2ffff098
.4byte 0x2ffff098, 0x1df7f8fd, 0x0dfff8fd, 0x0df7f8fd, 0x07be6898, 0x3fb7e8ff, 0x23be6898, 0x23be4c98
.4byte 0x23be4c98, 0x1ffecd98, 0x1bfeecfd, 0x059f4490
.align 2
gUnknown_086156B8:: @ 86156B8
.4byte 0x000011f0, 0x000021e1, 0x000003c2
.align 2
gUnknown_086156C4:: @ 86156C4
.4byte BlitBitmapToPartyWindow_Default1, 0x0d280b18, 0x08201420, 0x08081440, 0x08182526, 0x08182535, 0x03302318, 0x1040220c
.align 2
gUnknown_086156E4:: @ 86156E4
.4byte BlitBitmapToPartyWindow_Default2, 0x0d280316, 0x08200c1e, 0x08080c3e, 0x08180c66, 0x08180c75, 0x03300a58, 0x1040044d
.align 2
gUnknown_08615704:: @ 8615704
.4byte 0x32142810, 0x22103432, 0x1c6c1268, 0x19661b88, 0x346c2a68, 0x31663388, 0x4c6c4268, 0x49664b88
.4byte 0x646c5a68, 0x61666388, 0x7c6c7268, 0x79667b88, 0x22141810, 0x12102432, 0x5a145010, 0x4a105c32
.4byte 0x1c6c1268, 0x19661b88, 0x3c6c3268, 0x39663b88, 0x5c6c5268, 0x59665b88, 0x7c6c7268, 0x79667b88
.4byte 0x22141810, 0x12102432, 0x5a145010, 0x4a105c32, 0x246a1a68, 0x21662388, 0x3c6a3268, 0x39663b88
.4byte 0x5c6a5268, 0x59665b88, 0x746a6a68, 0x71667388, 0x2a142010, 0x1a102c32, 0x2c6a2268, 0x29662b88
.4byte 0x446a3a68, 0x41664388, 0x72146810, 0x62107432, 0x746a6a68, 0x71667388, 0x8c6a8268, 0x89668b88
.align 1
gUnknown_086157C4:: @ 86157C4
.incbin "graphics/interface/unknown_6157C4.bin"
.align 1
gUnknown_086157E0:: @ 86157E0
.incbin "graphics/interface/unknown_6157E0.bin"
gUnknown_086157FC:: @ 86157FC
.byte 0x00, 0x03, 0x02, 0x00
gUnknown_08615800:: @ 8615800
.byte 0x01, 0x06, 0x00, 0x0b, 0x0c, 0x01, 0x02, 0x03, 0x01, 0x08, 0x09, 0x00, 0x01, 0x02, 0x00, 0x00
.align 2
gUnknown_08615810:: @ 8615810
window_template 0x00, 0x01, 0x03, 0x0a, 0x07, 0x03, 0x0063
window_template 0x00, 0x0c, 0x01, 0x12, 0x03, 0x04, 0x00a9
window_template 0x00, 0x0c, 0x04, 0x12, 0x03, 0x05, 0x00df
window_template 0x00, 0x0c, 0x07, 0x12, 0x03, 0x06, 0x0115
window_template 0x00, 0x0c, 0x0a, 0x12, 0x03, 0x07, 0x014b
window_template 0x00, 0x0c, 0x0d, 0x12, 0x03, 0x08, 0x0181
window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df
null_window_template
.align 2
gUnknown_08615850:: @ 8615850
window_template 0x00, 0x01, 0x01, 0x0a, 0x07, 0x03, 0x0063
window_template 0x00, 0x01, 0x08, 0x0a, 0x07, 0x04, 0x00a9
window_template 0x00, 0x0c, 0x01, 0x12, 0x03, 0x05, 0x00ef
window_template 0x00, 0x0c, 0x05, 0x12, 0x03, 0x06, 0x0125
window_template 0x00, 0x0c, 0x09, 0x12, 0x03, 0x07, 0x015b
window_template 0x00, 0x0c, 0x0d, 0x12, 0x03, 0x08, 0x0191
window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df
null_window_template
.align 2
gUnknown_08615890:: @ 8615890
window_template 0x00, 0x01, 0x01, 0x0a, 0x07, 0x03, 0x0063
window_template 0x00, 0x01, 0x08, 0x0a, 0x07, 0x04, 0x00a9
window_template 0x00, 0x0c, 0x02, 0x12, 0x03, 0x05, 0x00ef
window_template 0x00, 0x0c, 0x05, 0x12, 0x03, 0x06, 0x0125
window_template 0x00, 0x0c, 0x09, 0x12, 0x03, 0x07, 0x015b
window_template 0x00, 0x0c, 0x0c, 0x12, 0x03, 0x08, 0x0191
window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df
null_window_template
.align 2
gUnknown_086158D0:: @ 86158D0
window_template 0x00, 0x01, 0x02, 0x0a, 0x07, 0x03, 0x0063
window_template 0x00, 0x0c, 0x03, 0x12, 0x03, 0x05, 0x00a9
window_template 0x00, 0x0c, 0x06, 0x12, 0x03, 0x06, 0x00df
window_template 0x02, 0x01, 0x0b, 0x0a, 0x07, 0x04, 0x0115
window_template 0x02, 0x0c, 0x0c, 0x12, 0x03, 0x07, 0x016b
window_template 0x02, 0x0c, 0x0f, 0x12, 0x03, 0x08, 0x01a1
null_window_template
.align 2
gUnknown_08615908:: @ 8615908
window_template 0x00, 0x18, 0x11, 0x06, 0x02, 0x03, 0x01c7
.align 2
gUnknown_08615910:: @ 8615910
window_template 0x00, 0x18, 0x12, 0x06, 0x02, 0x03, 0x01c7
.align 2
gUnknown_08615918:: @ 8615918
window_template 0x00, 0x18, 0x10, 0x06, 0x02, 0x03, 0x01d3
.align 2
gUnknown_08615920:: @ 8615920
window_template 0x02, 0x01, 0x11, 0x15, 0x02, 0x0f, 0x024f
.align 2
gUnknown_08615928:: @ 8615928
window_template 0x02, 0x01, 0x11, 0x10, 0x02, 0x0f, 0x0279
.align 2
gUnknown_08615930:: @ 8615930
window_template 0x02, 0x01, 0x11, 0x14, 0x02, 0x0f, 0x0299
.align 2
gUnknown_08615938:: @ 8615938
window_template 0x02, 0x01, 0x11, 0x12, 0x02, 0x0f, 0x0299
.align 2
gUnknown_08615940:: @ 8615940
window_template 0x02, 0x01, 0x11, 0x10, 0x02, 0x0f, 0x0299
.align 2
gUnknown_08615948:: @ 8615948
window_template 0x02, 0x01, 0x0f, 0x14, 0x04, 0x0f, 0x0299
.align 2
gUnknown_08615950:: @ 8615950
window_template 0x02, 0x17, 0x0d, 0x06, 0x06, 0x0e, 0x039d
.align 2
gUnknown_08615958:: @ 8615958
window_template 0x02, 0x15, 0x0d, 0x08, 0x06, 0x0e, 0x039d
.align 2
gUnknown_08615960:: @ 8615960
window_template 0x02, 0x13, 0x0b, 0x0a, 0x08, 0x0e, 0x02e9
.align 2
gUnknown_08615968:: @ 8615968
window_template 0x02, 0x15, 0x09, 0x05, 0x04, 0x0e, 0x02e9
.align 2
gUnknown_08615970:: @ 8615970
window_template 0x02, 0x13, 0x01, 0x0a, 0x0b, 0x0e, 0x02e9
window_template 0x02, 0x02, 0x0f, 0x1b, 0x04, 0x0e, 0x01df
window_template 0x02, 0x00, 0x0d, 0x12, 0x03, 0x0c, 0x039d
gUnknown_08615988:: @ 8615988
.byte 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1a, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21
.byte 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x28, 0x3b, 0x3c, 0x3a, 0x3a, 0x3a, 0x3a, 0x3a, 0x3a, 0x3d, 0x0f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x2e, 0x2f, 0x2f, 0x2f
.byte 0x2f, 0x2f, 0x2f, 0x2f, 0x2f, 0x30
gUnknown_086159CE:: @ 86159CE
.byte 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1a, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21
.byte 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x28, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x2a, 0x0f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x2e, 0x2f, 0x2f, 0x2f
.byte 0x2f, 0x2f, 0x2f, 0x2f, 0x2f, 0x30
gUnknown_08615A14:: @ 8615A14
.byte 0x2b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2d, 0x31, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x34, 0x35, 0x33, 0x33, 0x33
.byte 0x33, 0x33, 0x33, 0x36, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39
gUnknown_08615A4A:: @ 8615A4A
.byte 0x2b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2d, 0x31, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21
.byte 0x21, 0x21, 0x21, 0x32, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39
gUnknown_08615A80:: @ 8615A80
.byte 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x1f, 0x25, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x27
gUnknown_08615AB6:: @ 8615AB6
.byte 0x0b, 0x0c
gUnknown_08615AB8:: @ 8615AB8
.byte 0x09, 0x0a
gUnknown_08615ABA:: @ 8615ABA
.byte 0x04, 0x05, 0x06
gUnknown_08615ABD:: @ 8615ABD
.byte 0x01, 0x07, 0x08
gUnknown_08615AC0:: @ 8615AC0
.byte 0x01, 0x0b, 0x0c
gUnknown_08615AC3:: @ 8615AC3
.byte 0x3b, 0x3c
gUnknown_08615AC5:: @ 8615AC5
.byte 0x4b, 0x4c
gUnknown_08615AC7:: @ 8615AC7
.byte 0x39, 0x3a
gUnknown_08615AC9:: @ 8615AC9
.byte 0x49, 0x4a
gUnknown_08615ACB:: @ 8615ACB
.byte 0x59, 0x5a
gUnknown_08615ACD:: @ 8615ACD
.byte 0x34, 0x35, 0x36
gUnknown_08615AD0:: @ 8615AD0
.byte 0x44, 0x45, 0x46
gUnknown_08615AD3:: @ 8615AD3
.byte 0x54, 0x55, 0x56
gUnknown_08615AD6:: @ 8615AD6
.byte 0x74, 0x75, 0x76
gUnknown_08615AD9:: @ 8615AD9
.byte 0x84, 0x85, 0x86
gUnknown_08615ADC:: @ 8615ADC
.byte 0x94, 0x95, 0x96
gUnknown_08615ADF:: @ 8615ADF
.byte 0x64, 0x65, 0x66
gUnknown_08615AE2:: @ 8615AE2
.byte 0x31, 0x37, 0x38
gUnknown_08615AE5:: @ 8615AE5
.byte 0x41, 0x47, 0x48
gUnknown_08615AE8:: @ 8615AE8
.byte 0x51, 0x57, 0x58
gUnknown_08615AEB:: @ 8615AEB
.byte 0x61, 0x67, 0x68
gUnknown_08615AEE:: @ 8615AEE
.byte 0xa1, 0xa7, 0xa8
gUnknown_08615AF1:: @ 8615AF1
.byte 0x11, 0x1b, 0x1c
.align 2
gUnknown_08615AF4:: @ 8615AF4
.4byte gUnknown_085E9E43
.4byte gUnknown_085EA010
.4byte gUnknown_085EA02A
.4byte gUnknown_085E9E55
.4byte gUnknown_085E9E64
.4byte gUnknown_085E9E79
.4byte gUnknown_085E9E8F
.4byte gUnknown_085E9EBC
.4byte gUnknown_085E9ED4
.4byte gUnknown_085E9EE9
.4byte gUnknown_085E9FDB
.4byte gUnknown_085EA046
.4byte gUnknown_085EA05B
.4byte gUnknown_085E9F01
.4byte gUnknown_085E9F58
.4byte gUnknown_085E9F6F
.4byte gUnknown_085E9F81
.4byte gUnknown_085E9F90
.4byte gUnknown_085E9FA7
.4byte gUnknown_085E9FC2
.4byte gText_EmptyString2
.4byte gUnknown_085E9EA6
.4byte gUnknown_085E9F16
.4byte gUnknown_085E9F2A
.4byte gUnknown_085E9F42
.4byte gUnknown_085E9FF9
.4byte gUnknown_085EA073
gUnknown_08615B60:: @ 8615B60
.4byte gUnknown_085EA091
.4byte gUnknown_085EA099
.4byte gUnknown_085EA09E
.4byte gUnknown_085EA0A4
.4byte gUnknown_085EA0AB
.4byte gUnknown_085EA0E7
.4byte gUnknown_085EA0B1
.4byte gUnknown_085EA0B6
.4byte gUnknown_085EA0BF
.4byte gUnknown_085EA0C5
.4byte gUnknown_085EA0CF
.4byte gUnknown_085EA0D7
.4byte gUnknown_085EA0DC
.align 1
gUnknown_08615B94:: @ 8615B94
.2byte 0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071
.2byte 0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068
.2byte 0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d
.2byte 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123
.align 2
gUnknown_08615C08:: @ 8615C08
.4byte gText_Summary5, sub_81B37FC
.4byte gText_Switch2, brm_switch
.4byte gText_Cancel2, brm_cancel_1
.4byte gText_Item, sub_81B4134
.4byte gMenuText_Give, sub_81B4198
.4byte gText_Take, sub_81B4724
.4byte gText_Mail, sub_81B4A08
.4byte gText_Take2, brm_take_2
.4byte gText_Read2, sub_81B4A6C
.4byte gText_Cancel2, sub_81B4D78
.4byte gText_Shift, brm_shift_sendout
.4byte gText_SendOut, brm_shift_sendout
.4byte gText_Enter, sub_81B4E8C
.4byte gText_NoEntry, sub_81B4FA8
.4byte gText_Store, sub_81B50AC
.4byte gText_Register, sub_81B50C8
.4byte gText_Trade4, brm_trade_1
.4byte gText_Trade4, sub_81B52E4
.4byte gMenuText_Toss, sub_81B47E0
.4byte gMoveNames+195, sub_81B5470
.4byte gMoveNames+1924, sub_81B5470
.4byte gMoveNames+3237, sub_81B5470
.4byte gMoveNames+910, sub_81B5470
.4byte gMoveNames+741, sub_81B5470
.4byte gMoveNames+247, sub_81B5470
.4byte gMoveNames+3783, sub_81B5470
.4byte gMoveNames+1651, sub_81B5470
.4byte gMoveNames+1300, sub_81B5470
.4byte gMoveNames+1183, sub_81B5470
.4byte gMoveNames+3770, sub_81B5470
.4byte gMoveNames+2704, sub_81B5470
.4byte gMoveNames+1755, sub_81B5470
.4byte gMoveNames+2990, sub_81B5470
gUnknown_08615D10:: @ 8615D10
.byte 0x00, 0x01, 0x02
gUnknown_08615D13:: @ 8615D13
.byte 0x0a, 0x00, 0x02
gUnknown_08615D16:: @ 8615D16
.byte 0x0b, 0x00, 0x02
gUnknown_08615D19:: @ 8615D19
.byte 0x00, 0x02
gUnknown_08615D1B:: @ 8615D1B
.byte 0x0c, 0x00, 0x02
gUnknown_08615D1E:: @ 8615D1E
.byte 0x0d, 0x00, 0x02
gUnknown_08615D21:: @ 8615D21
.byte 0x0e, 0x00, 0x02
gUnknown_08615D24:: @ 8615D24
.byte 0x04, 0x05, 0x09
gUnknown_08615D27:: @ 8615D27
.byte 0x08, 0x07, 0x09
gUnknown_08615D2A:: @ 8615D2A
.byte 0x0f, 0x00, 0x02
gUnknown_08615D2D:: @ 8615D2D
.byte 0x10, 0x00, 0x02
gUnknown_08615D30:: @ 8615D30
.byte 0x11, 0x00, 0x02
gUnknown_08615D33:: @ 8615D33
.byte 0x05, 0x12, 0x02
.align 2
gUnknown_08615D38:: @ 8615D38
.4byte NULL, gUnknown_08615D10, gUnknown_08615D13, gUnknown_08615D16, gUnknown_08615D1B, gUnknown_08615D1E, gUnknown_08615D21, gUnknown_08615D19
.4byte gUnknown_08615D24, gUnknown_08615D27, gUnknown_08615D2A, gUnknown_08615D2D, gUnknown_08615D30, gUnknown_08615D33
gUnknown_08615D70:: @ 8615D70
.byte 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03
.align 1
gUnknown_08615D7E:: @ 8615D7E
.2byte 0x000f, 0x0094, 0x00f9, 0x0046, 0x0039, 0x0013, 0x0123, 0x007f, 0x0064, 0x005b, 0x0122, 0x00d0, 0x0087, 0x00e6, 0x000e
.align 2
gUnknown_08615D9C:: @ 8615D9C
.4byte SetUpFieldMove_Cut, 0x00000007
.4byte SetUpFieldMove_Flash, 0x0000000d
.4byte SetUpFieldMove_RockSmash, 0x0000000d
.4byte SetUpFieldMove_Strength, 0x0000000d
.4byte sub_81B5820, 0x00000008
.4byte sub_81B5884, 0x0000000d
.4byte sub_81B5974, 0x0000000d
.4byte hm_prepare_waterfall, 0x0000000d
.4byte SetUpFieldMove_Teleport, 0x0000000d
.4byte SetUpFieldMove_Dig, 0x0000000d
.4byte SetUpFieldMove_SecretPower, 0x0000000d
.4byte SetUpFieldMove_SoftBoiled, 0x00000010
.4byte SetUpFieldMove_SoftBoiled, 0x00000010
.4byte SetUpFieldMove_SweetScent, 0x0000000d
.align 2
gUnknown_08615E0C:: @ 8615E0C
.4byte gText_NotPkmnOtherTrainerWants
.4byte gText_ThatIsntAnEgg
.4byte gText_PkmnCantBeTradedNow
.4byte gText_PkmnCantBeTradedNow
.4byte gText_OtherTrainersPkmnCantBeTraded
.4byte gText_EggCantBeTradedNow
.4byte gText_OtherTrainerCantAcceptPkmn
.4byte gText_CantTradeWithTrainer
.4byte gText_CantTradeWithTrainer
.align 2
gUnknown_08615E30:: @ 8615E30
.incbin "graphics/interface/hold_icons.4bpp"
.align 2
gUnknown_08615E70:: @ 8615E70
.incbin "graphics/interface/hold_icons.gbapal"
.align 2
gOamData_8615E90:: @ 8615E90
.2byte 0x0000, 0x0000, 0x0400, 0x0000
.align 2
gSpriteAnim_8615E98:: @ 8615E98
.2byte 0x0000, 0x0001, 0xffff, 0x0000
.align 2
gSpriteAnim_8615EA0:: @ 8615EA0
.2byte 0x0001, 0x0001, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8615EA8:: @ 8615EA8
.4byte gSpriteAnim_8615E98
.4byte gSpriteAnim_8615EA0
.align 2
gUnknown_08615EB0:: @ 8615EB0
obj_tiles gUnknown_08615E30, 0x40, 55120
.align 2
gUnknown_08615EB8:: @ 8615EB8
obj_pal gUnknown_08615E70, 55120
.align 2
gSpriteTemplate_8615EC0:: @ 8615EC0
spr_template 0xd750, 0xd750, gOamData_8615E90, gSpriteAnimTable_8615EA8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gOamData_8615ED8:: @ 8615ED8
.2byte 0x0000, 0x8000, 0x0400, 0x0000
.align 2
gSpriteAnim_8615EE0:: @ 8615EE0
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615EE8:: @ 8615EE8
.2byte 0x0010, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8615EF0:: @ 8615EF0
.4byte gSpriteAnim_8615EE0
.4byte gSpriteAnim_8615EE8
.align 2
gUnknown_08615EF8:: @ 8615EF8
obj_tiles gPartyMenuPokeball_Gfx, 0x400, 1200
.align 2
gUnknown_08615F00:: @ 8615F00
obj_pal gPartyMenuPokeball_Pal, 1200
.align 2
gSpriteTemplate_8615F08:: @ 8615F08
spr_template 0x04b0, 0x04b0, gOamData_8615ED8, gSpriteAnimTable_8615EF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gOamData_8615F20:: @ 8615F20
.2byte 0x0000, 0x4000, 0x0800, 0x0000
.align 2
gSpriteAnim_8615F28:: @ 8615F28
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615F30:: @ 8615F30
.2byte 0x0004, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615F38:: @ 8615F38
.2byte 0x0008, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615F40:: @ 8615F40
.2byte 0x000c, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615F48:: @ 8615F48
.2byte 0x0010, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615F50:: @ 8615F50
.2byte 0x0014, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8615F58:: @ 8615F58
.4byte gSpriteAnim_8615F28
.4byte gSpriteAnim_8615F30
.4byte gSpriteAnim_8615F38
.4byte gSpriteAnim_8615F40
.4byte gSpriteAnim_8615F48
.4byte gSpriteAnim_8615F50
.align 2
gUnknown_08615F70:: @ 8615F70
obj_tiles gPartyMenuPokeballSmall_Gfx, 0x0300, 0x04b1
.align 2
gSpriteTemplate_8615F78:: @ 8615F78
spr_template 0x04b1, 0x04b0, gOamData_8615F20, gSpriteAnimTable_8615F58, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gOamData_8615F90:: @ 8615F90
.2byte 0x4000, 0x4000, 0x0400, 0x0000
.align 2
gSpriteAnim_8615F98:: @ 8615F98
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FA0:: @ 8615FA0
.2byte 0x0004, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FA8:: @ 8615FA8
.2byte 0x0008, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FB0:: @ 8615FB0
.2byte 0x000c, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FB8:: @ 8615FB8
.2byte 0x0010, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FC0:: @ 8615FC0
.2byte 0x0014, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FC8:: @ 8615FC8
.2byte 0x0018, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FD0:: @ 8615FD0
.2byte 0x001c, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8615FD8:: @ 8615FD8
.4byte gSpriteAnim_8615F98
.4byte gSpriteAnim_8615FA0
.4byte gSpriteAnim_8615FA8
.4byte gSpriteAnim_8615FB0
.4byte gSpriteAnim_8615FB8
.4byte gSpriteAnim_8615FC0
.4byte gSpriteAnim_8615FC8
.4byte gSpriteAnim_8615FD0
.align 2
gUnknown_08615FF8:: @ 8615FF8
obj_tiles gStatusGfx_Icons, 0x400, 1202
.align 2
gUnknown_08616000:: @ 8616000
obj_pal gStatusPal_Icons, 1202
.align 2
gSpriteTemplate_8616008:: @ 8616008
spr_template 0x04b2, 0x04b2, gOamData_8615F90, gSpriteAnimTable_8615FD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_08616020:: @ 8616020
.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
.align 2
gUnknown_08616028:: @ 8616028
.4byte gText_HP4
.4byte gText_Attack3
.4byte gText_Defense3
.4byte gText_SpAtk4
.4byte gText_SpDef4
.4byte gText_Speed2
.align 1
gUnknown_08616040:: @ 8616040
.2byte 0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071
.2byte 0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068
.2byte 0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d
.2byte 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123

12
data/scripts/cable_club.inc
View File

@ -466,7 +466,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1
waitdooranim
release
@ -570,7 +570,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A
waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1
waitdooranim
release
@ -645,7 +645,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1
waitdooranim
release
@ -1043,7 +1043,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 5, 1
waitdooranim
special sub_8018090
@ -1378,7 +1378,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A
waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A
waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1
waitdooranim
release
@ -1587,7 +1587,7 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E
closemessage
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_277360
waitmovement 0
hideobjectat 255, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
release
waitstate
end

12
data/specials.inc
View File

@ -419,9 +419,9 @@ gSpecials:: @ 81DBA64
def_special ShouldTryGetTrainerScript
def_special ShowMapNamePopup
def_special ShowMapNamePopup
def_special sub_81BE994
def_special sub_81BE79C
def_special sub_81BE7F4
def_special DoMirageTowerCeilingCrumble
def_special SetMirageTowerVisibility
def_special StartPlayerDescendMirageTower
def_special sub_81398C0
def_special IsWirelessAdapterConnected
def_special BerryBlenderLinkBecomeLeader
@ -491,9 +491,9 @@ gSpecials:: @ 81DBA64
def_special sub_813AFC8
def_special sub_813B1D0
def_special CreateObedientEnemyMon
def_special sub_81BEB54
def_special sub_81BEB68
def_special sub_81BEB7C
def_special StartMirageTowerDisintegration
def_special StartMirageTowerShake
def_special StartMirageTowerFossilFallAndSink
def_special ChangeBoxPokemonNickname
def_special get_unknown_box_id
def_special sub_813B21C

2
include/battle.h
View File

@ -488,7 +488,7 @@ struct BattleStruct
u8 wildVictorySong;
u8 dynamicMoveType;
u8 wrappedBy[MAX_BATTLERS_COUNT];
u16 assistPossibleMoves[PARTY_SIZE * 4]; // Each of mons can know max 4 moves.
u16 assistPossibleMoves[PARTY_SIZE * MAX_MON_MOVES]; // Each of mons can know max 4 moves.
u8 focusPunchBattlerId;
u8 battlerPreventingSwitchout;
u8 moneyMultiplier;

7
include/battle_anim.h
View File

@ -58,7 +58,7 @@ void DestroyAnimSprite(struct Sprite *sprite);
void DestroyAnimVisualTask(u8 taskId);
void DestroyAnimSoundTask(u8 taskId);
bool8 IsBattlerSpriteVisible(u8 battlerId);
void sub_80A438C(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible);
void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible);
bool8 IsContest(void);
s8 BattleAnimAdjustPanning(s8 pan);
s8 BattleAnimAdjustPanning2(s8 pan);
@ -78,8 +78,8 @@ void sub_80A6450(struct Sprite *sprite);
void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y);
void DestroySpriteAndMatrix(struct Sprite *sprite);
void AnimTranslateLinearSimple(struct Sprite *sprite);
void InitSpritePosToAnimAttacker(struct Sprite *sprite, u8 a2);
void InitSpritePosToAnimTarget(struct Sprite *sprite, bool8 a2);
void InitSpritePosToAnimAttacker(struct Sprite *sprite, bool8 respectMonPicOffsets);
void InitSpritePosToAnimTarget(struct Sprite *sprite, bool8 respectMonPicOffsets);
void StartAnimLinearTranslation(struct Sprite *sprite);
void InitAnimArcTranslation(struct Sprite *sprite);
bool8 AnimTranslateLinear(struct Sprite *sprite);
@ -149,6 +149,7 @@ u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority
void sub_80A749C(struct Sprite *sprite);
void sub_80A6814(u8 taskId);
void sub_80A8610(struct Sprite *sprite);
void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId);
enum
{

20
include/bg.h
View File

@ -13,14 +13,16 @@ struct BGCntrlBitfield // for the I/O registers
enum
{
BG_CTRL_ATTR_VISIBLE = 1,
BG_CTRL_ATTR_CHARBASEINDEX = 2,
BG_CTRL_ATTR_MAPBASEINDEX = 3,
BG_CTRL_ATTR_SCREENSIZE = 4,
BG_CTRL_ATTR_PALETTEMODE = 5,
BG_CTRL_ATTR_PRIORITY = 6,
BG_CTRL_ATTR_MOSAIC = 7,
BG_CTRL_ATTR_WRAPAROUND = 8,
BG_ATTR_CHARBASEINDEX = 1,
BG_ATTR_MAPBASEINDEX,
BG_ATTR_SCREENSIZE,
BG_ATTR_PALETTEMODE,
BG_ATTR_MOSAIC,
BG_ATTR_WRAPAROUND,
BG_ATTR_PRIORITY,
BG_ATTR_METRIC,
BG_ATTR_TYPE,
BG_ATTR_BASETILE,
};
struct BgTemplate
@ -38,8 +40,6 @@ void ResetBgs(void);
u8 GetBgMode(void);
void ResetBgControlStructs(void);
void Unused_ResetBgControlStruct(u8 bg);
void SetBgControlAttributes(u8 bg, u8 charBaseIndex, u8 mapBaseIndex, u8 screenSize, u8 paletteMode, u8 priority, u8 mosaic, u8 wraparound);
u16 GetBgControlAttribute(u8 bg, u8 attributeId);
u8 LoadBgVram(u8 bg, const void *src, u16 size, u16 destOffset, u8 mode);
void SetTextModeAndHideBgs(void);
bool8 IsInvalidBg(u8 bg);

6
include/constants/flags.h
View File

@ -162,7 +162,7 @@
#define FLAG_0x09A 0x9A
#define FLAG_0x09B 0x9B
#define FLAG_0x09C 0x9C
#define FLAG_0x09D 0x9D
#define FLAG_FORCE_MIRAGE_TOWER_VISIBLE 0x9D
#define FLAG_0x09E 0x9E
#define FLAG_0x09F 0x9F
#define FLAG_0x0A0 0xA0
@ -344,7 +344,7 @@
#define FLAG_0x14B 0x14B
#define FLAG_0x14C 0x14C
#define FLAG_0x14D 0x14D
#define FLAG_0x14E 0x14E
#define FLAG_MIRAGE_TOWER_VISIBLE 0x14E
#define FLAG_0x14F 0x14F// PLAYER CHOSE CLAW FOSSIL
#define FLAG_0x150 0x150// PLAYER CHOSE ROOT FOSSIL
#define FLAG_0x151 0x151
@ -804,7 +804,7 @@
#define FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN 0x368
#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT 0x369
#define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL 0x36A
#define FLAG_HIDE_ROUTE_111_DESERT_RIVAL 0x36B
#define FLAG_HIDE_ROUTE_111_PLAYER_DESCENT 0x36B
#define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL 0x36C
#define FLAG_HIDE_MT_CHIMNEY_TRAINERS 0x36D
#define FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT 0x36E

6
include/field_specials.h
View File

@ -15,7 +15,13 @@ bool32 sub_8138168(void);
bool32 sub_81381B0(void);
bool32 sub_81381F8(void);
bool32 CountSSTidalStep(u16 delta);
u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y);
void sub_813A128(void);
void sub_813A878(u8 a0);
u8 sub_813BADC(u8 a0);
bool8 sub_813B9C0(void);
void SetShoalItemFlag(u16 v0);
void UpdateFrontierManiac(u16 a0);
void UpdateFrontierGambler(u16 a0);
#endif // GUARD_FIELD_SPECIALS_H

61
include/fldeff.h Normal file
View File

@ -0,0 +1,61 @@
#ifndef GUARD_FLDEFF_H
#define GUARD_FLDEFF_H
// cut
bool8 SetUpFieldMove_Cut(void);
bool8 FldEff_UseCutOnGrass(void);
bool8 FldEff_UseCutOnTree(void);
bool8 FldEff_CutGrass(void);
void sub_80D423C(s16 x, s16 y);
void sub_80D42B8(s16 x, s16 y);
extern const struct SpritePalette gFieldEffectObjectPaletteInfo6;
// groundshake
bool8 sub_81BE66C(void);
void sub_81BE6AC(void);
void sub_81BE6B8(void);
void sub_81BE72C(void);
void sub_81BE79C(void);
void sub_81BE7F4(void);
void sub_81BE994(void);
// escalator
void sub_80E1558(u8 var);
void sub_80E1570(void);
bool8 sub_80E1584(void);
// soft-boiled
bool8 SetUpFieldMove_SoftBoiled(void);
void sub_81615A8(u8 taskId);
void sub_8161560(u8 taskId);
// flash
bool8 SetUpFieldMove_Flash(void);
void c2_change_map(void);
bool8 GetMapPairFadeToType(u8 a1, u8 a2);
bool8 GetMapPairFadeFromType(u8 a1, u8 a2);
// strength
bool8 SetUpFieldMove_Strength(void);
bool8 sub_8145E2C(void);
// sweet scent
bool8 SetUpFieldMove_SweetScent(void);
bool8 FldEff_SweetScent(void);
// teleport
bool8 SetUpFieldMove_Teleport(void);
bool8 FldEff_UseTeleport(void);
// dig
bool8 SetUpFieldMove_Dig(void);
bool8 FldEff_UseDig(void);
// rock smash
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
u8 oei_task_add(void);
bool8 SetUpFieldMove_RockSmash(void);
bool8 FldEff_UseRockSmash(void);
#endif // GUARD_FLDEFF_H

13
include/fldeff_cut.h
View File

@ -1,13 +0,0 @@
#ifndef GUARD_FLDEFF_CUT_H
#define GUARD_FLDEFF_CUT_H
extern const struct SpritePalette gFieldEffectObjectPaletteInfo6;
bool8 SetUpFieldMove_Cut(void);
bool8 FldEff_UseCutOnGrass(void);
bool8 FldEff_UseCutOnTree(void);
bool8 FldEff_CutGrass(void);
void sub_80D423C(s16 x, s16 y);
void sub_80D42B8(s16 x, s16 y);
#endif // GUARD_FLDEFF_CUT_H

6
include/fldeff_groundshake.h
View File

@ -1,6 +0,0 @@
#ifndef GUARD_FLDEFF_GROUNDSHAKE_H
#define GUARD_FLDEFF_GROUNDSHAKE_H
void sub_81BE72C(void);
#endif // GUARD_FLDEFF_GROUNDSHAKE_H

7
include/fldeff_softboiled.h
View File

@ -1,7 +0,0 @@
#ifndef GUARD_FLDEFF_SOFTBOILED_H
#define GUARD_FLDEFF_SOFTBOILED_H
void sub_81615A8(u8 taskId);
void sub_8161560(u8 taskId);
#endif // GUARD_FLDEFF_SOFTBOILED_H

11
include/graphics.h
View File

@ -4720,6 +4720,10 @@ extern const u32 gBattleAnimBackgroundTilemap_17[];
extern const u32 gBattleAnimBackgroundTilemap_20[];
extern const u32 gBattleAnimBackgroundTilemap_21[];
extern const u32 gUnknown_08C1D0AC[];
extern const u32 gUnknown_08C1D1E8[];
extern const u32 gUnknown_08C1D210[];
extern const u32 gUnknown_08C20668[];
extern const u32 gUnknown_08C20684[];
extern const u32 gBattleStatMask_Gfx[];
@ -4793,4 +4797,11 @@ extern const u32 gCableCarDoor_Gfx[];
extern const u32 gCableCarCord_Gfx[];
extern const u16 gCableCar_Pal[];
// Party menu
extern const u32 gPartyMenuPokeball_Gfx[];
extern const u32 gPartyMenuPokeballSmall_Gfx[];
extern const u32 gStatusPal_Icons[];
extern const u32 gPartyMenuPokeball_Pal[];
extern const u32 gStatusPal_Icons[];
#endif //GUARD_GRAPHICS_H

8
include/mirage_tower.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef GUARD_MIRAGE_TOWER_H
#define GUARD_MIRAGE_TOWER_H
void ClearMirageTowerPulseBlendEffect(void);
void ClearMirageTowerPulseBlend(void);
void TryStartMirageTowerPulseBlendEffect(void);
#endif // GUARD_MIRAGE_TOWER_H

10
include/party_menu.h
View File

@ -48,7 +48,7 @@ extern MainCallback gPostMenuFieldCallback;
extern u8 gSelectedOrderFromParty[4];
extern u8 gUnknown_0203CF00[3];
extern const u16 gUnknown_0861500C[]; // tutor table
extern const u16 gTutorMoves[];
void sub_81B0FCC(u8 slot, u8 b);
bool8 IsMultiBattle(void);
@ -64,11 +64,7 @@ u8 sub_81B205C(struct Pokemon *mon);
void display_pokemon_menu_message(u32 stringID);
void sub_81B47E0(u8 taskId);
bool8 FieldCallback_PrepareFadeInFromMenu(void);
bool8 sub_81B5820(void);
bool8 sub_81B5884(void);
void sub_81B58A8(void);
bool8 hm_prepare_waterfall(void);
bool8 sub_81B5974(void);
void LoadHeldItemIcons(void);
void sub_81B5D4C(u8 *a, u8 *b, u8 c);
void sub_81B617C(void);
@ -77,8 +73,8 @@ void sub_81B67C8(u8 taskId, TaskFunc task);
void dp05_ether(u8 taskId, TaskFunc task);
void dp05_pp_up(u8 taskId, TaskFunc task);
u16 ItemIdToBattleMoveId(u16 item);
bool8 sub_81B6D14(u16 move);
bool8 pokemon_has_move(struct Pokemon *mon, u16 move);
bool8 IsMoveHm(u16 move);
bool8 MonKnowsMove(struct Pokemon *mon, u16 move);
void sub_81B6DC4(u8 taskId, TaskFunc task);
void dp05_rare_candy(u8 taskId, TaskFunc task);
void sub_81B79E8(u8 taskId, TaskFunc task);

18
include/rom6.h
View File

@ -1,18 +0,0 @@
#ifndef GUARD_ROM6_H
#define GUARD_ROM6_H
void OpenPokeblockCase(u8, void(void));
u8 GetLeadMonIndex(void);
u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y);
void sub_813BADC(bool8);
bool8 sub_813B9C0(void);
void UpdateMirageRnd(u16 days);
void UpdateBirchState(u16 days);
void UpdateFrontierManiac(u16 days);
void UpdateFrontierGambler(u16 days);
void SetShoalItemFlag(u16 days);
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
u8 oei_task_add(void);
#endif //GUARD_ROM6_H

55
include/roulette_util.h
View File

@ -1,45 +1,44 @@
#ifndef GUARD_ROULETTE_UTIL_H
#define GUARD_ROULETTE_UTIL_H
struct InnerStruct203CF18_3
struct PulseBlendSettings
{
u16 unk0;
u16 unk2;
u8 unk4;
u8 unk5;
u8 unk6;
s8 unk7_0:4;
s8 unk7_4:2;
s8 unk7_6:1;
u16 blendColor;
u16 paletteOffset;
u8 numColors;
u8 delay;
u8 numFadeCycles;
s8 maxBlendCoeff:4;
s8 fadeType:2;
s8 restorePaletteOnUnload:1;
s8 unk7_7:1;
};
struct InnerStruct203CF18_2
struct PulseBlendPalette
{
u8 unk0;
u8 unk1_0:4;
u8 unk1_4:1;
u8 paletteSelector;
u8 blendCoeff:4;
u8 fadeDirection:1;
s8 unk1_5:1;
s8 unk1_6:1;
u32 unk1_7:1;
u8 unk2;
u8 unk3;
struct InnerStruct203CF18_3 unk4;
s8 available:1;
u32 inUse:1;
u8 delayCounter;
u8 fadeCycleCounter;
struct PulseBlendSettings pulseBlendSettings;
};
// structures
struct InnerStruct203CF18
struct PulseBlend
{
u16 unk0;
struct InnerStruct203CF18_2 unk4[16];
u16 usedPulseBlendPalettes;
struct PulseBlendPalette pulseBlendPalettes[16];
};
int sub_8151B68(struct InnerStruct203CF18 *, const struct InnerStruct203CF18_3 *);
void sub_8151B3C(struct InnerStruct203CF18 *);
void sub_8151CA8(struct InnerStruct203CF18 *, u16, u8);
void sub_8151C50(struct InnerStruct203CF18 *, u16, u8);
void sub_8151D28(struct InnerStruct203CF18 *, u16, u8);
void sub_8151E50(struct InnerStruct203CF18 *);
int InitPulseBlendPaletteSettings(struct PulseBlend *, const struct PulseBlendSettings *);
void InitPulseBlend(struct PulseBlend *);
void MarkUsedPulseBlendPalettes(struct PulseBlend *, u16, u8);
void UnloadUsedPulseBlendPalettes(struct PulseBlend *, u16, u8);
void UnmarkUsedPulseBlendPalettes(struct PulseBlend *, u16, u8);
void UpdatePulseBlend(struct PulseBlend *);
void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height);
void sub_8152058(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height);

63
include/strings.h
View File

@ -1921,4 +1921,67 @@ extern const u8 gDaycareText_GetAlong[];
extern const u8 gDaycareText_DontLikeOther[];
extern const u8 gDaycareText_PlayOther[];
// party menu
extern const u8 gUnknown_085E9E43[];
extern const u8 gUnknown_085EA010[];
extern const u8 gUnknown_085EA02A[];
extern const u8 gUnknown_085E9E55[];
extern const u8 gUnknown_085E9E64[];
extern const u8 gUnknown_085E9E79[];
extern const u8 gUnknown_085E9E8F[];
extern const u8 gUnknown_085E9EBC[];
extern const u8 gUnknown_085E9ED4[];
extern const u8 gUnknown_085E9EE9[];
extern const u8 gUnknown_085E9FDB[];
extern const u8 gUnknown_085EA046[];
extern const u8 gUnknown_085EA05B[];
extern const u8 gUnknown_085E9F01[];
extern const u8 gUnknown_085E9F58[];
extern const u8 gUnknown_085E9F6F[];
extern const u8 gUnknown_085E9F81[];
extern const u8 gUnknown_085E9F90[];
extern const u8 gUnknown_085E9FA7[];
extern const u8 gUnknown_085E9FC2[];
extern const u8 gUnknown_085E9EA6[];
extern const u8 gUnknown_085E9F16[];
extern const u8 gUnknown_085E9F2A[];
extern const u8 gUnknown_085E9F42[];
extern const u8 gUnknown_085E9FF9[];
extern const u8 gUnknown_085EA073[];
extern const u8 gUnknown_085EA091[];
extern const u8 gUnknown_085EA099[];
extern const u8 gUnknown_085EA09E[];
extern const u8 gUnknown_085EA0A4[];
extern const u8 gUnknown_085EA0AB[];
extern const u8 gUnknown_085EA0E7[];
extern const u8 gUnknown_085EA0B1[];
extern const u8 gUnknown_085EA0B6[];
extern const u8 gUnknown_085EA0BF[];
extern const u8 gUnknown_085EA0C5[];
extern const u8 gUnknown_085EA0CF[];
extern const u8 gUnknown_085EA0D7[];
extern const u8 gUnknown_085EA0DC[];
extern const u8 gText_Take[];
extern const u8 gText_Mail[];
extern const u8 gText_Take2[];
extern const u8 gText_Read2[];
extern const u8 gText_Cancel2[];
extern const u8 gText_Shift[];
extern const u8 gText_SendOut[];
extern const u8 gText_Enter[];
extern const u8 gText_NoEntry[];
extern const u8 gText_Store[];
extern const u8 gText_Register[];
extern const u8 gText_Trade4[];
extern const u8 gText_Summary5[];
extern const u8 gText_Switch2[];
extern const u8 gText_Item[];
extern const u8 gText_NotPkmnOtherTrainerWants[];
extern const u8 gText_ThatIsntAnEgg[];
extern const u8 gText_PkmnCantBeTradedNow[];
extern const u8 gText_OtherTrainersPkmnCantBeTraded[];
extern const u8 gText_EggCantBeTradedNow[];
extern const u8 gText_OtherTrainerCantAcceptPkmn[];
extern const u8 gText_CantTradeWithTrainer[];
#endif //GUARD_STRINGS_H

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