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

Merge branch 'master' into battle_engine_v2

Browse Source
This commit is contained in:
DizzyEggg 2018-12-29 15:11:54 +01:00
commit 27b1d74dad
605 changed files with 1057 additions and 1081 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/contest_link_80F57C4.s
View File

@ -578,10 +578,10 @@ _080F5D58:
adds r0, r5, 0
movs r1, 0
bl VarSet
bl sub_8076D5C
bl SetContinueGameWarpStatusToDynamicWarp
movs r0, 0x1
bl TrySavingData
bl sav2_gender2_inplace_and_xFE
bl ClearContinueGameWarpStatus2
adds r0, r5, 0
adds r1, r4, 0
bl VarSet
@ -5598,7 +5598,7 @@ _080F874C:
movs r3, 0x1
negs r3, r3
movs r0, 0
bl saved_warp2_set
bl SetDynamicWarp
bl ScriptContext2_Disable
bl EnableBothScriptContexts
_080F877E:

4
asm/macros/map.inc
View File

@ -101,3 +101,7 @@
map \map
.space 2
.endm
.macro map_header_flags allow_bike:req, allow_escape_rope:req, allow_run:req, show_map_name:req
.byte ((\show_map_name & 1) << 3) | ((\allow_run & 1) << 2) | ((\allow_escape_rope & 1) << 1) | \allow_bike
.endm

8
asm/rom_8011DC0.s
View File

@ -15686,7 +15686,7 @@ _0801EB04:
lsls r0, 24
cmp r0, 0
bne _0801EBC2
bl sub_8076D5C
bl SetContinueGameWarpStatusToDynamicWarp
movs r0, 0
bl TrySavingData
ldr r0, =gUnknown_02022C84
@ -15713,7 +15713,7 @@ _0801EB40:
bne _0801EBC2
movs r0, 0x37
bl PlaySE
bl sav2_gender2_inplace_and_xFE
bl ClearContinueGameWarpStatus2
ldr r0, =gUnknown_02022C84
ldr r1, [r0]
movs r0, 0xA
@ -20568,7 +20568,7 @@ _080211EC:
beq _080211F8
b _08021302
_080211F8:
bl sub_81971D0
bl InitStandardTextBoxWindows
bl sub_8197200
adds r0, r5, 0
bl sub_8022588
@ -39128,7 +39128,7 @@ _0802A7CE:
movs r1, 0
movs r2, 0
bl ChangeBgY
bl sub_81971D0
bl InitStandardTextBoxWindows
bl sub_8197200
movs r1, 0x82
lsls r1, 5

8
asm/trade.s
View File

@ -1,6 +1,6 @@
.include "asm/macros.inc"
.include "constants/gba_constants.inc"
.include "constants/misc_constants.inc"
.include "constants/global.inc"
.syntax unified
@ -2399,7 +2399,7 @@ _08078726:
bne _08078766
adds r0, r4, 0
movs r1, 0x2
ldr r2, =gSpeciesNames + 303 * POKEMON_NAME_LENGTH @ SPECIES_SHEDINJA
ldr r2, =gSpeciesNames + 303 * 11 @ SPECIES_SHEDINJA * POKEMON_NAME_LENGTH + 1
bl SetMonData
_08078766:
adds r4, 0x64
@ -13851,7 +13851,7 @@ _0807EDCE:
movs r0, 0x2
bl sub_801B990
_0807EDF6:
bl sub_8076D5C
bl SetContinueGameWarpStatusToDynamicWarp
bl sub_8153380
ldr r1, =gMain
movs r2, 0x87
@ -13884,7 +13884,7 @@ _0807EE38:
lsrs r1, r0, 24
cmp r1, 0
beq _0807EE5C
bl sav2_gender2_inplace_and_xFE
bl ClearContinueGameWarpStatus2
ldr r0, =gMain
movs r1, 0x87
lsls r1, 3

4
asm/trainer_card.s
View File

@ -4971,7 +4971,7 @@ _080C5204:
b _080C52C8
_080C5214:
str r4, [r0]
bl sav1_map_get_name
bl GetCurrentRegionMapSectionId
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x3A
@ -7780,7 +7780,7 @@ sub_80C6974: @ 80C6974
adds r1, r6
ldrb r1, [r1, 0xC]
bl StartSpriteAnim
bl sav1_map_get_name
bl GetCurrentRegionMapSectionId
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x3A

2
constants/constants.inc
View File

@ -1,5 +1,5 @@
.include "constants/gba_constants.inc"
.include "constants/misc_constants.inc"
.include "constants/global.inc"
.include "constants/contest_constants.inc"
.include "constants/pokemon_data_constants.inc"
.include "constants/berry_constants.inc"

3
constants/misc_constants.inc → constants/global.inc
View File

@ -3,9 +3,6 @@
.set NULL, 0
.set POKEMON_NAME_LENGTH, 11
.set MOVE_NAME_LENGTH, 13
.set SPRITE_SIZE_8x8, (OAM_SIZE_0 >> 28) | (OAM_SQUARE >> 14)
.set SPRITE_SIZE_16x16, (OAM_SIZE_1 >> 28) | (OAM_SQUARE >> 14)
.set SPRITE_SIZE_32x32, (OAM_SIZE_2 >> 28) | (OAM_SQUARE >> 14)

13
data/event_scripts.s
View File

@ -1,3 +1,4 @@
#include "constants/global.h"
#include "constants/battle_frontier.h"
#include "constants/battle_setup.h"
#include "constants/event_objects.h"
@ -1792,9 +1793,9 @@ Route110_EventScript_271ED7:: @ 8271ED7
Route119_EventScript_271ED7:: @ 8271ED7
RustboroCity_EventScript_271ED7:: @ 8271ED7
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq RustboroCity_EventScript_271EEF
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq RustboroCity_EventScript_271EF5
end
@ -1810,9 +1811,9 @@ LavaridgeTown_EventScript_271EFB:: @ 8271EFB
Route110_EventScript_271EFB:: @ 8271EFB
Route119_EventScript_271EFB:: @ 8271EFB
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq LavaridgeTown_EventScript_271F13
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq LavaridgeTown_EventScript_271F19
end
@ -1826,9 +1827,9 @@ LavaridgeTown_EventScript_271F19:: @ 8271F19
EventScript_271F1F:: @ 8271F1F
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq EventScript_271F37
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq EventScript_271F3D
end

1
data/layouts/Route111_NoMirageTower/layout.inc
View File

@ -12,3 +12,4 @@ Route111_NoMirageTower_Layout::
.4byte Route111_NoMirageTower_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Mauville

2
data/maps/AbandonedShip_CaptainsOffice/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_CaptainsOffice: @ 84845A4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Corridors_1F/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_Corridors_1F: @ 84844C4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Corridors_B1F/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_Corridors_B1F: @ 84844FC
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Deck/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_Deck: @ 84844A8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_HiddenFloorRooms/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 7
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Room_B1F/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_Room_B1F: @ 848456C
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Rooms2_1F/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_Rooms2_1F: @ 8484588
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Rooms2_B1F/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_Rooms2_B1F: @ 8484534
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Rooms_1F/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_Rooms_1F: @ 84844E0
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Rooms_B1F/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_Rooms_B1F: @ 8484518
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Underwater1/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_Underwater1: @ 8484550
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
.byte 13
map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Underwater2/header.inc
View File

@ -10,6 +10,6 @@ AbandonedShip_Underwater2: @ 84845C0
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
.byte 13
map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AlteringCave/header.inc
View File

@ -10,6 +10,6 @@ AlteringCave: @ 8484A58
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AncientTomb/header.inc
View File

@ -10,6 +10,6 @@ AncientTomb: @ 8484630
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AquaHideout_1F/header.inc
View File

@ -10,6 +10,6 @@ AquaHideout_1F: @ 8484144
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
.byte MAP_BATTLE_SCENE_AQUA

2
data/maps/AquaHideout_B1F/header.inc
View File

@ -10,6 +10,6 @@ AquaHideout_B1F: @ 8484160
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
.byte MAP_BATTLE_SCENE_AQUA

2
data/maps/AquaHideout_B2F/header.inc
View File

@ -10,6 +10,6 @@ AquaHideout_B2F: @ 848417C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
.byte MAP_BATTLE_SCENE_AQUA

2
data/maps/AquaHideout_UnusedRubyMap1/header.inc
View File

@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap1: @ 84846D8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_MAGMA

2
data/maps/AquaHideout_UnusedRubyMap2/header.inc
View File

@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap2: @ 84846F4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_MAGMA

2
data/maps/AquaHideout_UnusedRubyMap3/header.inc
View File

@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap3: @ 8484710
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_MAGMA

2
data/maps/ArtisanCave_1F/header.inc
View File

@ -10,6 +10,6 @@ ArtisanCave_1F: @ 84849B0
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/ArtisanCave_B1F/header.inc
View File

@ -10,6 +10,6 @@ ArtisanCave_B1F: @ 8484994
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -17,9 +17,9 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC
return

2
data/maps/BattleFrontier_BattleArenaCorridor/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattleArenaCorridor: @ 8485468
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattleArenaLobby: @ 848544C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -20,9 +20,9 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA
return

2
data/maps/BattleFrontier_BattleDomeCorridor/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattleDomeCorridor: @ 8485350
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattleDomeLobby: @ 8485334
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -8,9 +8,9 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
setvar VAR_0x8004, 5
special CallFrontierUtilFunc
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
setvar VAR_0x8004, 9
special CallFrontierUtilFunc

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

@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -12,9 +12,9 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856
return

2
data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattlePikeCorridor: @ 8485510
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattlePikeLobby: @ 84854F4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidTop: @ 8485430
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_FRONTIER

2
data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_FRONTIER

2
data/maps/BattleFrontier_BattleTowerCorridor/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor: @ 8485200
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattleTowerElevator: @ 84851E4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_BattleTowerLobby: @ 84851C8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge1/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_Lounge1: @ 84855B8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge2/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_Lounge2: @ 84855F0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge3/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_Lounge3: @ 848560C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge4/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_Lounge4: @ 8485628
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge5/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_Lounge5: @ 8485660
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge6/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_Lounge6: @ 848567C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge7/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_Lounge7: @ 8485698
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge8/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_Lounge8: @ 84856D0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge9/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_Lounge9: @ 84856EC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Mart/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_Mart: @ 8485740
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_OutsideEast/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_OutsideEast: @ 84852C4
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
.byte 13
map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_OutsideWest/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_OutsideWest: @ 84851AC
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
.byte 13
map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

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

@ -10,6 +10,6 @@ BattleFrontier_PokemonCenter_1F: @ 8485708
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_PokemonCenter_2F/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_PokemonCenter_2F: @ 8485724
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_RankingHall/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_RankingHall: @ 848559C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_ReceptionGate/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_ReceptionGate: @ 84856B4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_ScottsHouse/header.inc
View File

@ -10,6 +10,6 @@ BattleFrontier_ScottsHouse: @ 8485644
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattlePyramidSquare01/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare01: @ 8484F60
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare02/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare02: @ 8484F7C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare03/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare03: @ 8484F98
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare04/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare04: @ 8484FB4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare05/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare05: @ 8484FD0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare06/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare06: @ 8484FEC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare07/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare07: @ 8485008
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare08/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare08: @ 8485024
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare09/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare09: @ 8485040
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare10/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare10: @ 848505C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare11/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare11: @ 8485078
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare12/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare12: @ 8485094
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare13/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare13: @ 84850B0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare14/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare14: @ 84850CC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare15/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare15: @ 84850E8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare16/header.inc
View File

@ -10,6 +10,6 @@ BattlePyramidSquare16: @ 8485104
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

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

@ -10,6 +10,6 @@ BirthIsland_Exterior: @ 8485794
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 12
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

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