ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Review changes for #835

Browse Source
This commit is contained in:
GriffinR 2019-10-11 22:23:05 -04:00 committed by huderlem
parent 714b122da6
commit 4e2be7ff5e
42 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904 map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904

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

@ -1,8 +1,8 @@
BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E

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

@ -1,8 +1,8 @@
DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615 DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F

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

@ -1,8 +1,8 @@
EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0 EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD

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

@ -1,8 +1,8 @@
EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07 EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8 FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8

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

@ -1,8 +1,8 @@
FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3 FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3

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

@ -1,8 +1,8 @@
FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05 LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05

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

@ -1,8 +1,8 @@
LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97 LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD

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

@ -1,8 +1,8 @@
LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66 MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66

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

@ -1,8 +1,8 @@
MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008 MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,7 +1,7 @@
MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27 MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27
map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41 map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
.byte 0 .byte 0
MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37 MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37

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

@ -1,6 +1,6 @@
MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A

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

@ -1,8 +1,8 @@
MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006
map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011 OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011

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

@ -1,8 +1,8 @@
OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218 OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7
map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2 PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2

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

@ -1,8 +1,8 @@
PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635 PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8
map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3 PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3

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

@ -1,8 +1,8 @@
PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41 PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62
map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D

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

@ -1,8 +1,8 @@
RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF
map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA

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

@ -1,8 +1,8 @@
SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21 SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1
map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC

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

@ -1,8 +1,8 @@
SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

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

@ -1,6 +1,6 @@
VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726
map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0 .byte 0
VerdanturfTown_PokemonCenter_1F_OnTransition: @ 8202731 VerdanturfTown_PokemonCenter_1F_OnTransition: @ 8202731

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

@ -1,8 +1,8 @@
VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897 VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897
map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0 .byte 0
@ The below 3 are unused and leftover from RS @ The below 3 are unused and leftover from RS

14
data/scripts/cable_club.inc
View File

@ -1,4 +1,4 @@
CableClub_MapScript_OnTransition: @ 8276ACF CableClub_OnTransition: @ 8276ACF
call CableClub_EventScript_HideOrShowMysteryGiftMan call CableClub_EventScript_HideOrShowMysteryGiftMan
end end
@ -54,7 +54,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62
release release
end end
CableClub_MapScript2_OnWarp: @ 8276B6C CableClub_OnWarp: @ 8276B6C
map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_CheckTurnAttendant map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_CheckTurnAttendant
map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_CheckTurnAttendant map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_CheckTurnAttendant
map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, CableClub_EventScript_CheckTurnAttendant map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, CableClub_EventScript_CheckTurnAttendant
@ -72,7 +72,7 @@ CableClub_EventScript_CheckTurnAttendant:: @ 8276BAE
CableClub_EventScript_DontTurnAttendant:: @ 8276BBD CableClub_EventScript_DontTurnAttendant:: @ 8276BBD
end end
CableClub_MapScript1_OnLoad: @ 8276BBE CableClub_OnLoad: @ 8276BBE
compare VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE compare VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE
goto_if_eq CableClub_EventScript_OnLoadFromColosseum goto_if_eq CableClub_EventScript_OnLoadFromColosseum
compare VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE compare VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE
@ -115,7 +115,7 @@ CableClub_EventScript_OnLoadFromGameCorner:: @ 8276C35
call EventScript_OpenMossdeepGameCornerBarrier call EventScript_OpenMossdeepGameCornerBarrier
end end
CableClub_MapScript2_OnFrame: @ 8276C3B CableClub_OnFrame: @ 8276C3B
map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, CableClub_EventScript_Tutorial map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, CableClub_EventScript_Tutorial
map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_ExitLinkRoom map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_ExitLinkRoom
map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_ExitLinkRoom map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_ExitLinkRoom
@ -1350,7 +1350,7 @@ EventScript_CloseMossdeepGameCornerBarrier:: @ 8277C1D
setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, 1 setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, 1
return return
CableClub_MapScript1_InitUnionRoom: @ 8277C30 CableClub_OnResume: @ 8277C30
special InitUnionRoom special InitUnionRoom
end end
@ -1403,7 +1403,7 @@ MossdeepCity_GameCorner_1F_EventScript_OldMan2:: @ 8277C91
MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9 MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special DoesPartyHavePokemonJumpSpecies special IsPokemonJumpSpeciesInParty
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon
msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT
@ -1422,7 +1422,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9
MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35 MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special DoesPartyHaveDodrio special IsDodrioInParty
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon
msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT

4
data/specials.inc
View File

@ -436,9 +436,9 @@ gSpecials:: @ 81DBA64
def_special IsBadEggInParty def_special IsBadEggInParty
def_special ValidateReceivedWonderCard def_special ValidateReceivedWonderCard
def_special HasAtLeastOneBerry def_special HasAtLeastOneBerry
def_special DoesPartyHavePokemonJumpSpecies def_special IsPokemonJumpSpeciesInParty
def_special ShowPokemonJumpRecords def_special ShowPokemonJumpRecords
def_special DoesPartyHaveDodrio def_special IsDodrioInParty
def_special ShowDodrioBerryPickingRecords def_special ShowDodrioBerryPickingRecords
def_special OffsetCameraForBattle def_special OffsetCameraForBattle
def_special GetDeptStoreDefaultFloorChoice def_special GetDeptStoreDefaultFloorChoice

2
include/constants/vars.h
View File

@ -77,7 +77,7 @@
#define VAR_REGICE_STEPS_2 0x403C #define VAR_REGICE_STEPS_2 0x403C
#define VAR_REGICE_STEPS_3 0x403D #define VAR_REGICE_STEPS_3 0x403D
#define VAR_ALTERING_CAVE_WILD_SET 0x403E #define VAR_ALTERING_CAVE_WILD_SET 0x403E
#define VAR_DISTRIBUTE_EON_TICKET 0x403F // This var is read and written, but is always zero. Presumably meant to be set externally by Mystery Gift distribution #define VAR_DISTRIBUTE_EON_TICKET 0x403F // This var is read and written, but is always zero. The only way to obtain the Eon Ticket in Emerald is via Record Mixing
#define VAR_DAYS 0x4040 #define VAR_DAYS 0x4040
#define VAR_FANCLUB_UNKNOWN_1 0x4041 #define VAR_FANCLUB_UNKNOWN_1 0x4041
#define VAR_FANCLUB_UNKNOWN_2 0x4042 #define VAR_FANCLUB_UNKNOWN_2 0x4042

2
include/dodrio_berry_picking.h
View File

@ -2,7 +2,7 @@
#define GUARD_DODRIO_BERRY_PICKING_H #define GUARD_DODRIO_BERRY_PICKING_H
void sub_802493C(u16 a0, void (*callback)(void)); void sub_802493C(u16 a0, void (*callback)(void));
void DoesPartyHaveDodrio(void); void IsDodrioInParty(void);
void ShowDodrioBerryPickingRecords(void); void ShowDodrioBerryPickingRecords(void);
#endif // GUARD_DODRIO_BERRY_PICKING_H #endif // GUARD_DODRIO_BERRY_PICKING_H

2
include/pokemon_jump.h
View File

@ -5,7 +5,7 @@
void sub_802A9A8(u16 monId, MainCallback callback); void sub_802A9A8(u16 monId, MainCallback callback);
bool32 IsSpeciesAllowedInPokemonJump(u16 species); bool32 IsSpeciesAllowedInPokemonJump(u16 species);
void DoesPartyHavePokemonJumpSpecies(void); void IsPokemonJumpSpeciesInParty(void);
void ResetPokeJumpResults(void); void ResetPokeJumpResults(void);
void ShowPokemonJumpRecords(void); void ShowPokemonJumpRecords(void);
void sub_802EB24(s16 tileTag, s16 palTag, s16 x, s16 y, u8 subpriority); void sub_802EB24(s16 tileTag, s16 palTag, s16 x, s16 y, u8 subpriority);

2
src/dodrio_berry_picking.c
View File

@ -2580,7 +2580,7 @@ static u8 sub_8027A48(u8 id)
return gUnknown_02022C98->unk34[id]; return gUnknown_02022C98->unk34[id];
} }
void DoesPartyHaveDodrio(void) void IsDodrioInParty(void)
{ {
int i; int i;
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)

2
src/pokemon_jump.c
View File

@ -2209,7 +2209,7 @@ bool32 IsSpeciesAllowedInPokemonJump(u16 species)
return GetPokemonJumpSpeciesIdx(species) > -1; return GetPokemonJumpSpeciesIdx(species) > -1;
} }
void DoesPartyHavePokemonJumpSpecies(void) void IsPokemonJumpSpeciesInParty(void)
{ {
int i; int i;