mirror of
https://github.com/pret/poketcg2.git
synced 2026-04-26 00:43:32 -05:00
Identify interaction overworld-mode
thanks: @mdraves91
This commit is contained in:
earthoul
parent
163ab8562f
commit
b5d135b391
|
|
@ -19,7 +19,7 @@ DEF NUM_GAME_EVENTS EQU const_value ; 6
|
|||
const OWMODE_05 ; $05
|
||||
const OWMODE_06 ; $06
|
||||
const OWMODE_07 ; $07
|
||||
const OWMODE_08 ; $08
|
||||
const OWMODE_INTERACT ; $08
|
||||
const OWMODE_AFTER_DUEL ; $09
|
||||
const OWMODE_0A ; $0a
|
||||
const OWMODE_0B ; $0b
|
||||
|
|
|
|||
|
|
@ -332,6 +332,8 @@ DEF NUM_PICS EQU const_value
|
|||
const NPC_PURPLE_CASTLE_COIN ; $e7
|
||||
const NPC_STRONGHOLD_PLATFORM ; $e8
|
||||
|
||||
DEF NPC_NONE EQU -1
|
||||
|
||||
; NPCDuelistPointers use this ordering
|
||||
const_def
|
||||
const NPC_DUELIST_SAM ; $00
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ OWModePostprocess::
|
|||
dw Func_31a8 ; OWMODE_05
|
||||
dw Func_c199 ; OWMODE_06
|
||||
dw Func_c162 ; OWMODE_07
|
||||
dw Func_c163 ; OWMODE_08
|
||||
dw Func_c163 ; OWMODE_INTERACT
|
||||
dw Func_c189 ; OWMODE_AFTER_DUEL
|
||||
dw Func_3234 ; OWMODE_0A
|
||||
dw Func_c18f ; OWMODE_0B
|
||||
|
|
@ -219,7 +219,7 @@ Func_c18f:
|
|||
Func_c199:
|
||||
ld a, OWMODE_00
|
||||
ld [wOverworldMode], a
|
||||
call Func_32f6
|
||||
call HandleOverworldPlayerMoveInput
|
||||
ret
|
||||
|
||||
Func_c1a2:
|
||||
|
|
@ -1274,7 +1274,7 @@ Func_d3e9::
|
|||
pop de
|
||||
ld a, b
|
||||
rlca
|
||||
ld hl, .data
|
||||
ld hl, .offsets
|
||||
add_hl_a
|
||||
ld a, [hli]
|
||||
add d
|
||||
|
|
@ -1284,11 +1284,11 @@ Func_d3e9::
|
|||
ld e, a
|
||||
ret
|
||||
|
||||
.data
|
||||
db 0, -1
|
||||
db 1, 0
|
||||
db 0, 1
|
||||
db -1, 0
|
||||
.offsets
|
||||
db 0, -1 ; NORTH
|
||||
db 1, 0 ; EAST
|
||||
db 0, 1 ; SOUTH
|
||||
db -1, 0 ; WEST
|
||||
|
||||
PCMenu:
|
||||
call PauseSong
|
||||
|
|
|
|||
|
|
@ -2401,13 +2401,13 @@ CheckOWObjectPointerWithID:
|
|||
|
||||
; outputs NPC ID of OW object that is
|
||||
; in the grid position de
|
||||
; if no object, then output $ff
|
||||
Func_10dfb::
|
||||
; if no object, then output NPC_NONE (-1)
|
||||
FindNPCAtLocation::
|
||||
push bc
|
||||
push de
|
||||
push hl
|
||||
ld a, $ff
|
||||
ld [wd987], a
|
||||
ld a, NPC_NONE
|
||||
ld [wTempScriptNPC], a
|
||||
|
||||
call GetOWObjectsPointer
|
||||
ld c, MAX_NUM_OW_OBJECTS
|
||||
|
|
@ -2436,7 +2436,7 @@ Func_10dfb::
|
|||
cp c
|
||||
jr nz, .next
|
||||
ld a, h
|
||||
ld [wd987], a
|
||||
ld [wTempScriptNPC], a
|
||||
.next
|
||||
pop hl
|
||||
pop de
|
||||
|
|
@ -2446,7 +2446,7 @@ Func_10dfb::
|
|||
dec c
|
||||
jr nz, .loop
|
||||
|
||||
ld a, [wd987]
|
||||
ld a, [wTempScriptNPC]
|
||||
pop hl
|
||||
pop de
|
||||
pop bc
|
||||
|
|
@ -2505,7 +2505,7 @@ Func_10e3c::
|
|||
cp $10
|
||||
jr nc, .blocked
|
||||
.asm_10e7f
|
||||
call Func_10dfb
|
||||
call FindNPCAtLocation
|
||||
inc a
|
||||
jr nz, .blocked
|
||||
sla d
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ IshiharasHouse_OWInteractions:
|
|||
|
||||
IshiharasHouse_MapScripts:
|
||||
dbw OWMODE_06, Func_2c0c1
|
||||
dbw OWMODE_08, Func_2c0f1
|
||||
dbw OWMODE_INTERACT, Func_2c0f1
|
||||
dbw OWMODE_07, Func_2c0c8
|
||||
dbw OWMODE_02, Func_2c0d1
|
||||
dbw OWMODE_0C, Func_2c101
|
||||
|
|
@ -600,7 +600,7 @@ LightningClub_NPCInteractions:
|
|||
|
||||
LightningClub_MapScripts:
|
||||
dbw OWMODE_06, Func_2c4fa
|
||||
dbw OWMODE_08, Func_2c560
|
||||
dbw OWMODE_INTERACT, Func_2c560
|
||||
dbw OWMODE_AFTER_DUEL, Func_2c568
|
||||
dbw OWMODE_07, Func_2c501
|
||||
dbw OWMODE_01, Func_2c4db
|
||||
|
|
@ -1249,7 +1249,7 @@ PsychicClubEntrance_NPCInteractions:
|
|||
PsychicClubEntrance_MapScripts:
|
||||
dbw OWMODE_00, Func_2c9ac
|
||||
dbw OWMODE_06, Func_2c9d8
|
||||
dbw OWMODE_08, Func_2ca14
|
||||
dbw OWMODE_INTERACT, Func_2ca14
|
||||
dbw OWMODE_AFTER_DUEL, Func_2ca1c
|
||||
dbw OWMODE_07, Func_2c9df
|
||||
dbw OWMODE_02, Func_2c9e8
|
||||
|
|
@ -1261,7 +1261,7 @@ PsychicClubEntrance_MapScripts:
|
|||
Func_2c9ac:
|
||||
call Func_3332
|
||||
call Func_2ca46
|
||||
call Func_32d8
|
||||
call HandleOverworldPlayerInput
|
||||
scf
|
||||
ccf
|
||||
ret
|
||||
|
|
@ -1508,7 +1508,7 @@ PsychicClubLobby_OWInteractions:
|
|||
|
||||
PsychicClubLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_2cbcf
|
||||
dbw OWMODE_08, Func_2cbdf
|
||||
dbw OWMODE_INTERACT, Func_2cbdf
|
||||
dbw OWMODE_07, Func_2cbd6
|
||||
dbw OWMODE_AFTER_DUEL, Func_2cbef
|
||||
dbw OWMODE_0B, Func_2cbf5
|
||||
|
|
@ -1760,7 +1760,7 @@ PsychicClub_NPCInteractions:
|
|||
|
||||
PsychicClub_MapScripts:
|
||||
dbw OWMODE_06, Func_2cd92
|
||||
dbw OWMODE_08, Func_2ce11
|
||||
dbw OWMODE_INTERACT, Func_2ce11
|
||||
dbw OWMODE_AFTER_DUEL, Func_2ce19
|
||||
dbw OWMODE_07, Func_2cd99
|
||||
dbw OWMODE_02, Func_2cda2
|
||||
|
|
@ -2662,7 +2662,7 @@ RockClubLobby_OWInteractions:
|
|||
|
||||
RockClubLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_2d49e
|
||||
dbw OWMODE_08, Func_2d4ae
|
||||
dbw OWMODE_INTERACT, Func_2d4ae
|
||||
dbw OWMODE_07, Func_2d4a5
|
||||
dbw OWMODE_AFTER_DUEL, Func_2d4be
|
||||
dbw OWMODE_0B, Func_2d4c4
|
||||
|
|
@ -2914,7 +2914,7 @@ RockClub_NPCInteractions:
|
|||
|
||||
RockClub_MapScripts:
|
||||
dbw OWMODE_06, Func_2d663
|
||||
dbw OWMODE_08, Func_2d6a6
|
||||
dbw OWMODE_INTERACT, Func_2d6a6
|
||||
dbw OWMODE_07, Func_2d66a
|
||||
dbw OWMODE_02, Func_2d673
|
||||
dbw OWMODE_AFTER_DUEL, Func_2d6ae
|
||||
|
|
@ -3488,7 +3488,7 @@ FightingClubLobby_OWInteractions:
|
|||
|
||||
FightingClubLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_2dade
|
||||
dbw OWMODE_08, Func_2daee
|
||||
dbw OWMODE_INTERACT, Func_2daee
|
||||
dbw OWMODE_07, Func_2dae5
|
||||
dbw OWMODE_AFTER_DUEL, Func_2dafe
|
||||
dbw OWMODE_01, Func_2dace
|
||||
|
|
@ -3780,7 +3780,7 @@ FightingClub_NPCInteractions:
|
|||
|
||||
FightingClub_MapScripts:
|
||||
dbw OWMODE_06, Func_2dd0e
|
||||
dbw OWMODE_08, Func_2dd3a
|
||||
dbw OWMODE_INTERACT, Func_2dd3a
|
||||
dbw OWMODE_07, Func_2dd31
|
||||
dbw OWMODE_AFTER_DUEL, Func_2dd42
|
||||
dbw OWMODE_02, Func_2dd15
|
||||
|
|
@ -4453,7 +4453,7 @@ GrassClub_NPCInteractions:
|
|||
|
||||
GrassClub_MapScripts:
|
||||
dbw OWMODE_06, Func_2e1d2
|
||||
dbw OWMODE_08, Func_2e1fe
|
||||
dbw OWMODE_INTERACT, Func_2e1fe
|
||||
dbw OWMODE_AFTER_DUEL, Func_2e206
|
||||
dbw OWMODE_02, Func_2e1d9
|
||||
dbw OWMODE_07, Func_2e1f5
|
||||
|
|
@ -4912,7 +4912,7 @@ ScienceClubEntrance_NPCInteractions:
|
|||
|
||||
ScienceClubEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_2e538
|
||||
dbw OWMODE_08, Func_2e574
|
||||
dbw OWMODE_INTERACT, Func_2e574
|
||||
dbw OWMODE_AFTER_DUEL, Func_2e57c
|
||||
dbw OWMODE_07, Func_2e53f
|
||||
dbw OWMODE_02, Func_2e548
|
||||
|
|
@ -5147,7 +5147,7 @@ ScienceClubLobby_OWInteractions:
|
|||
|
||||
ScienceClubLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_2e71e
|
||||
dbw OWMODE_08, Func_2e72e
|
||||
dbw OWMODE_INTERACT, Func_2e72e
|
||||
dbw OWMODE_AFTER_DUEL, Func_2e73e
|
||||
dbw OWMODE_07, Func_2e725
|
||||
dbw OWMODE_0B, Func_2e752
|
||||
|
|
@ -5474,7 +5474,7 @@ ScienceClub_NPCInteractions:
|
|||
|
||||
ScienceClub_MapScripts:
|
||||
dbw OWMODE_06, Func_2e955
|
||||
dbw OWMODE_08, Func_2e99f
|
||||
dbw OWMODE_INTERACT, Func_2e99f
|
||||
dbw OWMODE_AFTER_DUEL, Func_2e9a7
|
||||
dbw OWMODE_02, Func_2e95c
|
||||
dbw OWMODE_07, Func_2e996
|
||||
|
|
@ -6149,7 +6149,7 @@ WaterClubLobby_OWInteractions:
|
|||
|
||||
WaterClubLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_2ee9a
|
||||
dbw OWMODE_08, Func_2eeaa
|
||||
dbw OWMODE_INTERACT, Func_2eeaa
|
||||
dbw OWMODE_AFTER_DUEL, Func_2eeba
|
||||
dbw OWMODE_07, Func_2eea1
|
||||
dbw OWMODE_0B, Func_2eece
|
||||
|
|
@ -6434,7 +6434,7 @@ WaterClub_OWInteractions:
|
|||
|
||||
WaterClub_MapScripts:
|
||||
dbw OWMODE_06, Func_2f095
|
||||
dbw OWMODE_08, Func_2f0f7
|
||||
dbw OWMODE_INTERACT, Func_2f0f7
|
||||
dbw OWMODE_02, Func_2f0a5
|
||||
dbw OWMODE_AFTER_DUEL, Func_2f107
|
||||
dbw OWMODE_07, Func_2f09c
|
||||
|
|
@ -7251,7 +7251,7 @@ FireClubLobby_OWInteractions:
|
|||
|
||||
FireClubLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_2f6c7
|
||||
dbw OWMODE_08, Func_2f6d7
|
||||
dbw OWMODE_INTERACT, Func_2f6d7
|
||||
dbw OWMODE_07, Func_2f6ce
|
||||
dbw OWMODE_AFTER_DUEL, Func_2f6e7
|
||||
dbw OWMODE_0B, Func_2f6ed
|
||||
|
|
@ -7466,7 +7466,7 @@ FireClub_OWInteractions:
|
|||
|
||||
FireClub_MapScripts:
|
||||
dbw OWMODE_06, Func_2f85e
|
||||
dbw OWMODE_08, Func_2f8c8
|
||||
dbw OWMODE_INTERACT, Func_2f8c8
|
||||
dbw OWMODE_AFTER_DUEL, Func_2f8d8
|
||||
dbw OWMODE_02, Func_2f86e
|
||||
dbw OWMODE_07, Func_2f865
|
||||
|
|
@ -8138,7 +8138,7 @@ PokemonDomeEntrance_OWInteractions:
|
|||
|
||||
PokemonDomeEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_2fd83
|
||||
dbw OWMODE_08, Func_2fd93
|
||||
dbw OWMODE_INTERACT, Func_2fd93
|
||||
dbw OWMODE_07, Func_2fd8a
|
||||
dbw OWMODE_01, Func_2fd73
|
||||
db $ff
|
||||
|
|
|
|||
|
|
@ -930,7 +930,7 @@ CardDungeonQueen_NPCInteractions:
|
|||
db $ff
|
||||
|
||||
CardDungeonQueen_MapScripts:
|
||||
dbw OWMODE_08, Func_311b1
|
||||
dbw OWMODE_INTERACT, Func_311b1
|
||||
dbw OWMODE_AFTER_DUEL, Func_311d0
|
||||
dbw OWMODE_07, Func_311a8
|
||||
dbw OWMODE_02, Func_311b9
|
||||
|
|
@ -1165,7 +1165,7 @@ SealedFortEntrance_OWInteractions:
|
|||
|
||||
SealedFortEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_31386
|
||||
dbw OWMODE_08, Func_3138d
|
||||
dbw OWMODE_INTERACT, Func_3138d
|
||||
dbw OWMODE_02, Func_313a8
|
||||
db $ff
|
||||
|
||||
|
|
@ -1235,7 +1235,7 @@ GrChallengeHallEntrance_NPCInteractions:
|
|||
|
||||
GrChallengeHallEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_31426
|
||||
dbw OWMODE_08, Func_31499
|
||||
dbw OWMODE_INTERACT, Func_31499
|
||||
dbw OWMODE_07, Func_31490
|
||||
dbw OWMODE_01, Func_3142d
|
||||
dbw OWMODE_04, Func_31447
|
||||
|
|
@ -1385,7 +1385,7 @@ GrassFortEntrance_NPCInteractions:
|
|||
|
||||
GrassFortEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_3156e
|
||||
dbw OWMODE_08, Func_3159f
|
||||
dbw OWMODE_INTERACT, Func_3159f
|
||||
dbw OWMODE_02, Func_3157e
|
||||
dbw OWMODE_AFTER_DUEL, Func_315a7
|
||||
dbw OWMODE_07, Func_31575
|
||||
|
|
@ -1507,7 +1507,7 @@ GrassFortLobby_OWInteractions:
|
|||
|
||||
GrassFortLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_31673
|
||||
dbw OWMODE_08, Func_31683
|
||||
dbw OWMODE_INTERACT, Func_31683
|
||||
dbw OWMODE_AFTER_DUEL, Func_31693
|
||||
dbw OWMODE_0B, Func_31699
|
||||
dbw OWMODE_07, Func_3167a
|
||||
|
|
@ -1707,7 +1707,7 @@ GrassFortMidori_OWInteractions:
|
|||
|
||||
GrassFortMidori_MapScripts:
|
||||
dbw OWMODE_06, Func_317db
|
||||
dbw OWMODE_08, Func_31815
|
||||
dbw OWMODE_INTERACT, Func_31815
|
||||
dbw OWMODE_AFTER_DUEL, Func_31825
|
||||
dbw OWMODE_02, Func_317eb
|
||||
dbw OWMODE_07, Func_317e2
|
||||
|
|
@ -1969,7 +1969,7 @@ GrassFortYuta_OWInteractions:
|
|||
|
||||
GrassFortYuta_MapScripts:
|
||||
dbw OWMODE_06, Func_319cc
|
||||
dbw OWMODE_08, Func_319f2
|
||||
dbw OWMODE_INTERACT, Func_319f2
|
||||
dbw OWMODE_AFTER_DUEL, Func_31a02
|
||||
dbw OWMODE_02, Func_319dc
|
||||
dbw OWMODE_07, Func_319d3
|
||||
|
|
@ -2193,7 +2193,7 @@ GrassFortMiyuki_OWInteractions:
|
|||
|
||||
GrassFortMiyuki_MapScripts:
|
||||
dbw OWMODE_06, Func_31b82
|
||||
dbw OWMODE_08, Func_31ba8
|
||||
dbw OWMODE_INTERACT, Func_31ba8
|
||||
dbw OWMODE_AFTER_DUEL, Func_31bb8
|
||||
dbw OWMODE_07, Func_31b89
|
||||
dbw OWMODE_02, Func_31b92
|
||||
|
|
@ -2412,7 +2412,7 @@ LightningFortEntrance_OWInteractions:
|
|||
|
||||
LightningFortEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_31d27
|
||||
dbw OWMODE_08, Func_31d5e
|
||||
dbw OWMODE_INTERACT, Func_31d5e
|
||||
dbw OWMODE_07, Func_31d2e
|
||||
dbw OWMODE_02, Func_31d37
|
||||
db $ff
|
||||
|
|
@ -2549,7 +2549,7 @@ LightningFortLobby_OWInteractions:
|
|||
|
||||
LightningFortLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_31e52
|
||||
dbw OWMODE_08, Func_31e62
|
||||
dbw OWMODE_INTERACT, Func_31e62
|
||||
dbw OWMODE_AFTER_DUEL, Func_31e72
|
||||
dbw OWMODE_07, Func_31e59
|
||||
db $ff
|
||||
|
|
@ -2772,7 +2772,7 @@ LightningFortRenna_OWInteractions:
|
|||
|
||||
LightningFortRenna_MapScripts:
|
||||
dbw OWMODE_06, Func_32006
|
||||
dbw OWMODE_08, Func_32037
|
||||
dbw OWMODE_INTERACT, Func_32037
|
||||
dbw OWMODE_AFTER_DUEL, Func_32047
|
||||
dbw OWMODE_07, Func_3200d
|
||||
dbw OWMODE_02, Func_32016
|
||||
|
|
@ -2988,7 +2988,7 @@ LightningFortIchikawa_OWInteractions:
|
|||
|
||||
LightningFortIchikawa_MapScripts:
|
||||
dbw OWMODE_06, Func_321aa
|
||||
dbw OWMODE_08, Func_321e4
|
||||
dbw OWMODE_INTERACT, Func_321e4
|
||||
dbw OWMODE_AFTER_DUEL, Func_321f4
|
||||
dbw OWMODE_07, Func_321b1
|
||||
dbw OWMODE_02, Func_321ba
|
||||
|
|
@ -3342,7 +3342,7 @@ LightningFortCatherine_NPCInteractions:
|
|||
|
||||
LightningFortCatherine_MapScripts:
|
||||
dbw OWMODE_06, Func_3244f
|
||||
dbw OWMODE_08, Func_3245f
|
||||
dbw OWMODE_INTERACT, Func_3245f
|
||||
dbw OWMODE_AFTER_DUEL, Func_32467
|
||||
dbw OWMODE_07, Func_32456
|
||||
db $ff
|
||||
|
|
@ -3509,7 +3509,7 @@ FireFortEntrance_OWInteractions:
|
|||
|
||||
FireFortEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_325bc
|
||||
dbw OWMODE_08, Func_3261c
|
||||
dbw OWMODE_INTERACT, Func_3261c
|
||||
dbw OWMODE_07, Func_325c3
|
||||
dbw OWMODE_02, Func_325cc
|
||||
dbw OWMODE_AFTER_DUEL, Func_3262c
|
||||
|
|
@ -3687,7 +3687,7 @@ FireFortLobby_OWInteractions:
|
|||
|
||||
FireFortLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_32727
|
||||
dbw OWMODE_08, Func_32737
|
||||
dbw OWMODE_INTERACT, Func_32737
|
||||
dbw OWMODE_AFTER_DUEL, Func_32747
|
||||
dbw OWMODE_0B, Func_3274d
|
||||
dbw OWMODE_07, Func_3272e
|
||||
|
|
@ -3859,7 +3859,7 @@ FireFortJes_OWInteractions:
|
|||
|
||||
FireFortJes_MapScripts:
|
||||
dbw OWMODE_06, Func_3285d
|
||||
dbw OWMODE_08, Func_3288e
|
||||
dbw OWMODE_INTERACT, Func_3288e
|
||||
dbw OWMODE_AFTER_DUEL, Func_3289e
|
||||
dbw OWMODE_07, Func_32864
|
||||
dbw OWMODE_02, Func_3286d
|
||||
|
|
@ -4050,7 +4050,7 @@ FireFortYuki_OWInteractions:
|
|||
|
||||
FireFortYuki_MapScripts:
|
||||
dbw OWMODE_06, Func_329c6
|
||||
dbw OWMODE_08, Func_32a18
|
||||
dbw OWMODE_INTERACT, Func_32a18
|
||||
dbw OWMODE_AFTER_DUEL, Func_32a28
|
||||
dbw OWMODE_07, Func_329cd
|
||||
dbw OWMODE_02, Func_329d6
|
||||
|
|
@ -4403,7 +4403,7 @@ FireFortShoko_OWInteractions:
|
|||
|
||||
FireFortShoko_MapScripts:
|
||||
dbw OWMODE_06, Func_32c4a
|
||||
dbw OWMODE_08, Func_32c7a
|
||||
dbw OWMODE_INTERACT, Func_32c7a
|
||||
dbw OWMODE_AFTER_DUEL, Func_32c8a
|
||||
dbw OWMODE_07, Func_32c51
|
||||
dbw OWMODE_02, Func_32c5a
|
||||
|
|
@ -4694,7 +4694,7 @@ FireFortHidero_NPCInteractions:
|
|||
|
||||
FireFortHidero_MapScripts:
|
||||
dbw OWMODE_06, Func_32e51
|
||||
dbw OWMODE_08, Func_32e61
|
||||
dbw OWMODE_INTERACT, Func_32e61
|
||||
dbw OWMODE_AFTER_DUEL, Func_32e69
|
||||
dbw OWMODE_07, Func_32e58
|
||||
db $ff
|
||||
|
|
@ -4878,7 +4878,7 @@ WaterFortEntrance_OWInteractions:
|
|||
|
||||
WaterFortEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_32fe6
|
||||
dbw OWMODE_08, Func_33046
|
||||
dbw OWMODE_INTERACT, Func_33046
|
||||
dbw OWMODE_07, Func_32fed
|
||||
dbw OWMODE_02, Func_32ff6
|
||||
dbw OWMODE_AFTER_DUEL, Func_33056
|
||||
|
|
@ -5050,7 +5050,7 @@ WaterFortMiyajima_OWInteractions:
|
|||
|
||||
WaterFortMiyajima_MapScripts:
|
||||
dbw OWMODE_06, Func_33119
|
||||
dbw OWMODE_08, Func_3314a
|
||||
dbw OWMODE_INTERACT, Func_3314a
|
||||
dbw OWMODE_AFTER_DUEL, Func_3315a
|
||||
dbw OWMODE_07, Func_33120
|
||||
dbw OWMODE_02, Func_33129
|
||||
|
|
@ -5251,7 +5251,7 @@ WaterFortKanoko_NPCInteractions:
|
|||
|
||||
WaterFortKanoko_MapScripts:
|
||||
dbw OWMODE_06, Func_3327e
|
||||
dbw OWMODE_08, Func_3328e
|
||||
dbw OWMODE_INTERACT, Func_3328e
|
||||
dbw OWMODE_AFTER_DUEL, Func_33296
|
||||
dbw OWMODE_07, Func_33285
|
||||
db $ff
|
||||
|
|
@ -5408,7 +5408,7 @@ FightingFortEntrance_OWInteractions:
|
|||
|
||||
FightingFortEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_333ad
|
||||
dbw OWMODE_08, Func_33424
|
||||
dbw OWMODE_INTERACT, Func_33424
|
||||
dbw OWMODE_07, Func_333b4
|
||||
dbw OWMODE_02, Func_333bd
|
||||
db $ff
|
||||
|
|
@ -5614,7 +5614,7 @@ FightingFortMaze2_NPCInteractions:
|
|||
|
||||
FightingFortMaze2_MapScripts:
|
||||
dbw OWMODE_06, Func_33565
|
||||
dbw OWMODE_08, Func_33581
|
||||
dbw OWMODE_INTERACT, Func_33581
|
||||
dbw OWMODE_07, Func_33578
|
||||
dbw OWMODE_0F, Func_3356c
|
||||
db $ff
|
||||
|
|
@ -5761,7 +5761,7 @@ FightingFortMaze4_NPCInteractions:
|
|||
|
||||
FightingFortMaze4_MapScripts:
|
||||
dbw OWMODE_06, Func_336a3
|
||||
dbw OWMODE_08, Func_336ca
|
||||
dbw OWMODE_INTERACT, Func_336ca
|
||||
dbw OWMODE_07, Func_336c1
|
||||
dbw OWMODE_0F, Func_336aa
|
||||
dbw OWMODE_02, Func_336b6
|
||||
|
|
@ -5980,7 +5980,7 @@ FightingFortMaze8_NPCInteractions:
|
|||
|
||||
FightingFortMaze8_MapScripts:
|
||||
dbw OWMODE_06, Func_338a8
|
||||
dbw OWMODE_08, Func_338cf
|
||||
dbw OWMODE_INTERACT, Func_338cf
|
||||
dbw OWMODE_07, Func_338c6
|
||||
dbw OWMODE_0F, Func_338af
|
||||
dbw OWMODE_02, Func_338bb
|
||||
|
|
@ -6363,7 +6363,7 @@ FightingFortMaze17_NPCInteractions:
|
|||
|
||||
FightingFortMaze17_MapScripts:
|
||||
dbw OWMODE_06, Func_33c6d
|
||||
dbw OWMODE_08, Func_33cb2
|
||||
dbw OWMODE_INTERACT, Func_33cb2
|
||||
dbw OWMODE_07, Func_33ca9
|
||||
dbw OWMODE_02, Func_33c74
|
||||
dbw OWMODE_0F, Func_33c9d
|
||||
|
|
|
|||
|
|
@ -756,7 +756,7 @@ TcgAirportEntrance_OWInteractions:
|
|||
TcgAirportEntrance_MapScripts:
|
||||
dbw OWMODE_00, Func_345f1
|
||||
dbw OWMODE_06, Func_3460d
|
||||
dbw OWMODE_08, Func_3461d
|
||||
dbw OWMODE_INTERACT, Func_3461d
|
||||
dbw OWMODE_07, Func_34614
|
||||
dbw OWMODE_01, Func_345fd
|
||||
db $ff
|
||||
|
|
@ -764,7 +764,7 @@ TcgAirportEntrance_MapScripts:
|
|||
Func_345f1:
|
||||
call DoFrame
|
||||
call Func_34635
|
||||
call Func_32d8
|
||||
call HandleOverworldPlayerInput
|
||||
scf
|
||||
ccf
|
||||
ret
|
||||
|
|
@ -1007,7 +1007,7 @@ TcgAirport_NPCInteractions:
|
|||
TcgAirport_MapScripts:
|
||||
dbw OWMODE_00, Func_347ce
|
||||
dbw OWMODE_06, Func_347da
|
||||
dbw OWMODE_08, Func_3489d
|
||||
dbw OWMODE_INTERACT, Func_3489d
|
||||
dbw OWMODE_07, Func_347e1
|
||||
dbw OWMODE_02, Func_347ea
|
||||
dbw OWMODE_0F, Func_34873
|
||||
|
|
@ -1016,7 +1016,7 @@ TcgAirport_MapScripts:
|
|||
Func_347ce:
|
||||
call DoFrame
|
||||
call Func_349d5
|
||||
call Func_32d8
|
||||
call HandleOverworldPlayerInput
|
||||
scf
|
||||
ccf
|
||||
ret
|
||||
|
|
@ -1412,7 +1412,7 @@ GrAirportEntrance_OWInteractions:
|
|||
|
||||
GrAirportEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_34b16
|
||||
dbw OWMODE_08, Func_34b26
|
||||
dbw OWMODE_INTERACT, Func_34b26
|
||||
dbw OWMODE_07, Func_34b1d
|
||||
db $ff
|
||||
|
||||
|
|
@ -1543,7 +1543,7 @@ GameCenter1_OWInteractions:
|
|||
|
||||
GameCenter1_MapScripts:
|
||||
dbw OWMODE_06, Func_34c2c
|
||||
dbw OWMODE_08, Func_34c3c
|
||||
dbw OWMODE_INTERACT, Func_34c3c
|
||||
dbw OWMODE_07, Func_34c33
|
||||
db $ff
|
||||
|
||||
|
|
@ -1886,7 +1886,7 @@ GameCenter2_OWInteractions:
|
|||
|
||||
GameCenter2_MapScripts:
|
||||
dbw OWMODE_06, Func_34ee7
|
||||
dbw OWMODE_08, Func_34ef7
|
||||
dbw OWMODE_INTERACT, Func_34ef7
|
||||
dbw OWMODE_07, Func_34eee
|
||||
dbw OWMODE_02, Func_34f07
|
||||
db $ff
|
||||
|
|
@ -2159,7 +2159,7 @@ CardDungeonBishop_OWInteractions:
|
|||
|
||||
CardDungeonBishop_MapScripts:
|
||||
dbw OWMODE_06, Func_350e6
|
||||
dbw OWMODE_08, Func_350f6
|
||||
dbw OWMODE_INTERACT, Func_350f6
|
||||
dbw OWMODE_AFTER_DUEL, Func_35127
|
||||
dbw OWMODE_07, Func_350ed
|
||||
dbw OWMODE_02, Func_35106
|
||||
|
|
@ -2422,7 +2422,7 @@ GrChallengeHallLobby_OWInteractions:
|
|||
|
||||
GrChallengeHallLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_35322
|
||||
dbw OWMODE_08, Func_35332
|
||||
dbw OWMODE_INTERACT, Func_35332
|
||||
dbw OWMODE_07, Func_35329
|
||||
dbw OWMODE_01, Func_35308
|
||||
db $ff
|
||||
|
|
@ -2678,7 +2678,7 @@ GrassFortMorino_NPCInteractions:
|
|||
|
||||
GrassFortMorino_MapScripts:
|
||||
dbw OWMODE_06, Func_354d3
|
||||
dbw OWMODE_08, Func_354e3
|
||||
dbw OWMODE_INTERACT, Func_354e3
|
||||
dbw OWMODE_AFTER_DUEL, Func_354eb
|
||||
dbw OWMODE_07, Func_354da
|
||||
db $ff
|
||||
|
|
@ -2857,7 +2857,7 @@ WaterFortSenta_NPCInteractions:
|
|||
|
||||
WaterFortSenta_MapScripts:
|
||||
dbw OWMODE_06, Func_35624
|
||||
dbw OWMODE_08, Func_35661
|
||||
dbw OWMODE_INTERACT, Func_35661
|
||||
dbw OWMODE_AFTER_DUEL, Func_35669
|
||||
dbw OWMODE_07, Func_3562b
|
||||
dbw OWMODE_02, Func_35634
|
||||
|
|
@ -3151,7 +3151,7 @@ WaterFortAira_NPCInteractions:
|
|||
|
||||
WaterFortAira_MapScripts:
|
||||
dbw OWMODE_06, Func_35855
|
||||
dbw OWMODE_08, Func_35882
|
||||
dbw OWMODE_INTERACT, Func_35882
|
||||
dbw OWMODE_AFTER_DUEL, Func_3588a
|
||||
dbw OWMODE_07, Func_3585c
|
||||
dbw OWMODE_02, Func_35865
|
||||
|
|
@ -3361,7 +3361,7 @@ FightingFort_OWInteractions:
|
|||
|
||||
FightingFort_MapScripts:
|
||||
dbw OWMODE_06, Func_359fd
|
||||
dbw OWMODE_08, Func_35a7c
|
||||
dbw OWMODE_INTERACT, Func_35a7c
|
||||
dbw OWMODE_AFTER_DUEL, Func_35a8c
|
||||
dbw OWMODE_07, Func_35a04
|
||||
dbw OWMODE_02, Func_35a0d
|
||||
|
|
@ -3785,7 +3785,7 @@ FightingFortGoda_OWInteractions:
|
|||
|
||||
FightingFortGoda_MapScripts:
|
||||
dbw OWMODE_06, Func_35d7a
|
||||
dbw OWMODE_08, Func_35da0
|
||||
dbw OWMODE_INTERACT, Func_35da0
|
||||
dbw OWMODE_AFTER_DUEL, Func_35db0
|
||||
dbw OWMODE_07, Func_35d81
|
||||
dbw OWMODE_02, Func_35d8a
|
||||
|
|
@ -4039,7 +4039,7 @@ FightingFortGrace_NPCInteractions:
|
|||
|
||||
FightingFortGrace_MapScripts:
|
||||
dbw OWMODE_06, Func_35f59
|
||||
dbw OWMODE_08, Func_35f69
|
||||
dbw OWMODE_INTERACT, Func_35f69
|
||||
dbw OWMODE_AFTER_DUEL, Func_35f71
|
||||
dbw OWMODE_07, Func_35f60
|
||||
db $ff
|
||||
|
|
@ -4258,7 +4258,7 @@ PsychicStrongholdEntrance_NPCInteractions:
|
|||
|
||||
PsychicStrongholdEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_36104
|
||||
dbw OWMODE_08, Func_36140
|
||||
dbw OWMODE_INTERACT, Func_36140
|
||||
dbw OWMODE_07, Func_3610b
|
||||
dbw OWMODE_02, Func_36114
|
||||
dbw OWMODE_10, Func_360ef
|
||||
|
|
@ -4378,7 +4378,7 @@ PsychicStrongholdLobby_OWInteractions:
|
|||
|
||||
PsychicStrongholdLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_3620e
|
||||
dbw OWMODE_08, Func_3621e
|
||||
dbw OWMODE_INTERACT, Func_3621e
|
||||
dbw OWMODE_AFTER_DUEL, Func_3622e
|
||||
dbw OWMODE_0B, Func_36234
|
||||
dbw OWMODE_07, Func_36215
|
||||
|
|
@ -4578,7 +4578,7 @@ PsychicStronghold_NPCInteractions:
|
|||
|
||||
PsychicStronghold_MapScripts:
|
||||
dbw OWMODE_06, Func_3638f
|
||||
dbw OWMODE_08, Func_36440
|
||||
dbw OWMODE_INTERACT, Func_36440
|
||||
dbw OWMODE_PAUSE_MENU, Func_36448
|
||||
dbw OWMODE_AFTER_DUEL, Func_36490
|
||||
dbw OWMODE_07, Func_36396
|
||||
|
|
@ -5765,7 +5765,7 @@ PsychicStrongholdMami_NPCInteractions:
|
|||
|
||||
PsychicStrongholdMami_MapScripts:
|
||||
dbw OWMODE_06, Func_36ce5
|
||||
dbw OWMODE_08, Func_36d21
|
||||
dbw OWMODE_INTERACT, Func_36d21
|
||||
dbw OWMODE_PAUSE_MENU, Func_36d29
|
||||
dbw OWMODE_AFTER_DUEL, Func_36d65
|
||||
dbw OWMODE_07, Func_36cec
|
||||
|
|
@ -6160,7 +6160,7 @@ ColorlessAltar_NPCInteractions:
|
|||
|
||||
ColorlessAltar_MapScripts:
|
||||
dbw OWMODE_06, Func_36fe2
|
||||
dbw OWMODE_08, Func_37011
|
||||
dbw OWMODE_INTERACT, Func_37011
|
||||
dbw OWMODE_AFTER_DUEL, Func_37019
|
||||
dbw OWMODE_07, Func_36fe9
|
||||
dbw OWMODE_02, Func_36ff2
|
||||
|
|
@ -6676,7 +6676,7 @@ GrCastleEntrance_OWInteractions:
|
|||
GrCastleEntrance_MapScripts:
|
||||
dbw OWMODE_00, Func_373cb
|
||||
dbw OWMODE_06, Func_3740f
|
||||
dbw OWMODE_08, Func_3746b
|
||||
dbw OWMODE_INTERACT, Func_3746b
|
||||
dbw OWMODE_07, Func_37416
|
||||
dbw OWMODE_02, Func_3741f
|
||||
dbw OWMODE_AFTER_DUEL, Func_3747b
|
||||
|
|
@ -6709,7 +6709,7 @@ Func_373cb:
|
|||
farcall Func_10e3c
|
||||
jr .asm_3740c
|
||||
.asm_37409
|
||||
call Func_32d8
|
||||
call HandleOverworldPlayerInput
|
||||
.asm_3740c
|
||||
scf
|
||||
ccf
|
||||
|
|
@ -6996,7 +6996,7 @@ GrCastle_NPCInteractions:
|
|||
|
||||
GrCastle_MapScripts:
|
||||
dbw OWMODE_06, Func_3765c
|
||||
dbw OWMODE_08, Func_376ed
|
||||
dbw OWMODE_INTERACT, Func_376ed
|
||||
dbw OWMODE_AFTER_DUEL, Func_376f5
|
||||
dbw OWMODE_07, Func_37663
|
||||
dbw OWMODE_02, Func_3766c
|
||||
|
|
|
|||
|
|
@ -790,7 +790,7 @@ MasonLaboratoryComputerRoom_OWInteractions:
|
|||
|
||||
MasonLaboratoryComputerRoom_MapScripts:
|
||||
dbw OWMODE_06, Func_3c689
|
||||
dbw OWMODE_08, Func_3c6b3
|
||||
dbw OWMODE_INTERACT, Func_3c6b3
|
||||
dbw OWMODE_07, Func_3c690
|
||||
dbw OWMODE_02, Func_3c697
|
||||
db $ff
|
||||
|
|
@ -1008,7 +1008,7 @@ MasonLaboratoryTrainingRoom_NPCInteractions:
|
|||
|
||||
MasonLaboratoryTrainingRoom_MapScripts:
|
||||
dbw OWMODE_06, Func_3c817
|
||||
dbw OWMODE_08, Func_3c825
|
||||
dbw OWMODE_INTERACT, Func_3c825
|
||||
dbw OWMODE_AFTER_DUEL, Func_3c82d
|
||||
dbw OWMODE_07, Func_3c81e
|
||||
db $ff
|
||||
|
|
@ -1650,7 +1650,7 @@ LightningClubLobby_OWInteractions:
|
|||
|
||||
LightningClubLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_3cd2b
|
||||
dbw OWMODE_08, Func_3cd3b
|
||||
dbw OWMODE_INTERACT, Func_3cd3b
|
||||
dbw OWMODE_07, Func_3cd32
|
||||
dbw OWMODE_01, Func_3cd1b
|
||||
db $ff
|
||||
|
|
@ -1957,7 +1957,7 @@ GrassClubLobby_OWInteractions:
|
|||
|
||||
GrassClubLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_3cfa8
|
||||
dbw OWMODE_08, Func_3cfb8
|
||||
dbw OWMODE_INTERACT, Func_3cfb8
|
||||
dbw OWMODE_07, Func_3cfaf
|
||||
dbw OWMODE_AFTER_DUEL, Func_3cfc8
|
||||
dbw OWMODE_01, Func_3cf98
|
||||
|
|
@ -2282,7 +2282,7 @@ TcgChallengeHallEntrance_NPCInteractions:
|
|||
|
||||
TcgChallengeHallEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_3d259
|
||||
dbw OWMODE_08, Func_3d269
|
||||
dbw OWMODE_INTERACT, Func_3d269
|
||||
dbw OWMODE_07, Func_3d260
|
||||
dbw OWMODE_01, Func_3d1f6
|
||||
dbw OWMODE_04, Func_3d210
|
||||
|
|
@ -2454,7 +2454,7 @@ TcgChallengeHallLobby_OWInteractions:
|
|||
|
||||
TcgChallengeHallLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_3d3a0
|
||||
dbw OWMODE_08, Func_3d3b0
|
||||
dbw OWMODE_INTERACT, Func_3d3b0
|
||||
dbw OWMODE_07, Func_3d3a7
|
||||
dbw OWMODE_01, Func_3d386
|
||||
db $ff
|
||||
|
|
@ -2818,7 +2818,7 @@ PokemonDome_OWInteractions:
|
|||
|
||||
PokemonDome_MapScripts:
|
||||
dbw OWMODE_06, Func_3d6ba
|
||||
dbw OWMODE_08, Func_3d740
|
||||
dbw OWMODE_INTERACT, Func_3d740
|
||||
dbw OWMODE_AFTER_DUEL, Func_3d750
|
||||
dbw OWMODE_07, Func_3d6c1
|
||||
dbw OWMODE_02, Func_3d6ca
|
||||
|
|
@ -4977,7 +4977,7 @@ IshiharasVillaMain_OWInteractions:
|
|||
|
||||
IshiharasVillaMain_MapScripts:
|
||||
dbw OWMODE_06, Func_3e72a
|
||||
dbw OWMODE_08, Func_3e73a
|
||||
dbw OWMODE_INTERACT, Func_3e73a
|
||||
dbw OWMODE_AFTER_DUEL, Func_3e7bb
|
||||
dbw OWMODE_07, Func_3e731
|
||||
dbw OWMODE_0C, Func_3e74a
|
||||
|
|
@ -5303,7 +5303,7 @@ IshiharasVillaLibrary_OWInteractions:
|
|||
|
||||
IshiharasVillaLibrary_MapScripts:
|
||||
dbw OWMODE_06, Func_3e981
|
||||
dbw OWMODE_08, Func_3e991
|
||||
dbw OWMODE_INTERACT, Func_3e991
|
||||
dbw OWMODE_07, Func_3e988
|
||||
dbw OWMODE_0C, Func_3e9a1
|
||||
dbw OWMODE_0D, Func_3e9cf
|
||||
|
|
@ -5833,7 +5833,7 @@ GameCenterEntrance_OWInteractions:
|
|||
|
||||
GameCenterEntrance_MapScripts:
|
||||
dbw OWMODE_06, Func_3ed92
|
||||
dbw OWMODE_08, Func_3eda2
|
||||
dbw OWMODE_INTERACT, Func_3eda2
|
||||
dbw OWMODE_07, Func_3ed99
|
||||
db $ff
|
||||
|
||||
|
|
@ -6069,7 +6069,7 @@ GameCenterLobby_OWInteractions:
|
|||
|
||||
GameCenterLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_3ef95
|
||||
dbw OWMODE_08, Func_3efa5
|
||||
dbw OWMODE_INTERACT, Func_3efa5
|
||||
dbw OWMODE_AFTER_DUEL, Func_3efb5
|
||||
dbw OWMODE_0B, Func_3efba
|
||||
dbw OWMODE_07, Func_3ef9c
|
||||
|
|
@ -6228,7 +6228,7 @@ CardDungeonPawn_OWInteractions:
|
|||
|
||||
CardDungeonPawn_MapScripts:
|
||||
dbw OWMODE_06, Func_3f093
|
||||
dbw OWMODE_08, Func_3f0a3
|
||||
dbw OWMODE_INTERACT, Func_3f0a3
|
||||
dbw OWMODE_AFTER_DUEL, Func_3f0d4
|
||||
dbw OWMODE_07, Func_3f09a
|
||||
dbw OWMODE_02, Func_3f0b3
|
||||
|
|
@ -6447,7 +6447,7 @@ CardDungeonKnight_OWInteractions:
|
|||
|
||||
CardDungeonKnight_MapScripts:
|
||||
dbw OWMODE_06, Func_3f239
|
||||
dbw OWMODE_08, Func_3f249
|
||||
dbw OWMODE_INTERACT, Func_3f249
|
||||
dbw OWMODE_AFTER_DUEL, Func_3f27a
|
||||
dbw OWMODE_07, Func_3f240
|
||||
dbw OWMODE_02, Func_3f259
|
||||
|
|
@ -6688,7 +6688,7 @@ CardDungeonRook_OWInteractions:
|
|||
|
||||
CardDungeonRook_MapScripts:
|
||||
dbw OWMODE_06, Func_3f409
|
||||
dbw OWMODE_08, Func_3f419
|
||||
dbw OWMODE_INTERACT, Func_3f419
|
||||
dbw OWMODE_AFTER_DUEL, Func_3f44a
|
||||
dbw OWMODE_07, Func_3f410
|
||||
dbw OWMODE_02, Func_3f429
|
||||
|
|
@ -6950,7 +6950,7 @@ WaterFortLobby_OWInteractions:
|
|||
|
||||
WaterFortLobby_MapScripts:
|
||||
dbw OWMODE_06, Func_3f650
|
||||
dbw OWMODE_08, Func_3f660
|
||||
dbw OWMODE_INTERACT, Func_3f660
|
||||
dbw OWMODE_AFTER_DUEL, Func_3f670
|
||||
dbw OWMODE_0B, Func_3f675
|
||||
dbw OWMODE_07, Func_3f657
|
||||
|
|
@ -7196,7 +7196,7 @@ FightingFortMaze19_NPCInteractions:
|
|||
|
||||
FightingFortMaze19_MapScripts:
|
||||
dbw OWMODE_06, Func_3f7ff
|
||||
dbw OWMODE_08, Func_3f80f
|
||||
dbw OWMODE_INTERACT, Func_3f80f
|
||||
dbw OWMODE_07, Func_3f806
|
||||
db $ff
|
||||
|
||||
|
|
@ -7304,7 +7304,7 @@ FightingFortBasement_NPCInteractions:
|
|||
|
||||
FightingFortBasement_MapScripts:
|
||||
dbw OWMODE_06, Func_3f8b6
|
||||
dbw OWMODE_08, Func_3f904
|
||||
dbw OWMODE_INTERACT, Func_3f904
|
||||
dbw OWMODE_07, Func_3f8bd
|
||||
dbw OWMODE_02, Func_3f8c6
|
||||
db $ff
|
||||
|
|
|
|||
|
|
@ -1347,7 +1347,7 @@ MasonLaboratoryMain_OWInteractions:
|
|||
|
||||
MasonLaboratoryMain_MapScripts:
|
||||
dbw OWMODE_06, Func_40e83
|
||||
dbw OWMODE_08, Func_40f04
|
||||
dbw OWMODE_INTERACT, Func_40f04
|
||||
dbw OWMODE_AFTER_DUEL, Func_40f21
|
||||
dbw OWMODE_11, Func_40f14
|
||||
dbw OWMODE_07, Func_40e8a
|
||||
|
|
@ -2361,7 +2361,7 @@ TcgChallengeHall_NPCInteractions:
|
|||
|
||||
TcgChallengeHall_MapScripts:
|
||||
dbw OWMODE_06, Func_415f3
|
||||
dbw OWMODE_08, Func_41622
|
||||
dbw OWMODE_INTERACT, Func_41622
|
||||
dbw OWMODE_AFTER_DUEL, Func_4162a
|
||||
dbw OWMODE_07, Func_415fa
|
||||
dbw OWMODE_01, Func_415e6
|
||||
|
|
@ -3175,7 +3175,7 @@ GrAirport_NPCInteractions:
|
|||
GrAirport_MapScripts:
|
||||
dbw OWMODE_00, Func_41c44
|
||||
dbw OWMODE_06, Func_41c50
|
||||
dbw OWMODE_08, Func_41ccb
|
||||
dbw OWMODE_INTERACT, Func_41ccb
|
||||
dbw OWMODE_07, Func_41c57
|
||||
dbw OWMODE_02, Func_41c60
|
||||
dbw OWMODE_0F, Func_41ca1
|
||||
|
|
@ -3184,7 +3184,7 @@ GrAirport_MapScripts:
|
|||
Func_41c44:
|
||||
call DoFrame
|
||||
call Func_41db4
|
||||
call Func_32d8
|
||||
call HandleOverworldPlayerInput
|
||||
scf
|
||||
ccf
|
||||
ret
|
||||
|
|
@ -3497,7 +3497,7 @@ SealedFort_OWInteractions:
|
|||
|
||||
SealedFort_MapScripts:
|
||||
dbw OWMODE_06, Func_41f14
|
||||
dbw OWMODE_08, Func_41f1b
|
||||
dbw OWMODE_INTERACT, Func_41f1b
|
||||
dbw OWMODE_AFTER_DUEL, Func_41f36
|
||||
db $ff
|
||||
|
||||
|
|
@ -4385,7 +4385,7 @@ GrChallengeHall_OWInteractions:
|
|||
|
||||
GrChallengeHall_MapScripts:
|
||||
dbw OWMODE_06, Func_42639
|
||||
dbw OWMODE_08, Func_426b9
|
||||
dbw OWMODE_INTERACT, Func_426b9
|
||||
dbw OWMODE_AFTER_DUEL, Func_426d6
|
||||
dbw OWMODE_11, Func_426c9
|
||||
dbw OWMODE_07, Func_42640
|
||||
|
|
@ -5482,7 +5482,7 @@ GrCastleBiruritchi_OWInteractions:
|
|||
|
||||
GrCastleBiruritchi_MapScripts:
|
||||
dbw OWMODE_06, Func_42f2e
|
||||
dbw OWMODE_08, Func_42fad
|
||||
dbw OWMODE_INTERACT, Func_42fad
|
||||
dbw OWMODE_AFTER_DUEL, Func_42fbd
|
||||
dbw OWMODE_07, Func_42f35
|
||||
dbw OWMODE_02, Func_42f3e
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ Func_3195::
|
|||
|
||||
Func_31a1::
|
||||
call Func_3332
|
||||
call Func_32d8
|
||||
call HandleOverworldPlayerInput
|
||||
ret
|
||||
|
||||
Func_31a8::
|
||||
|
|
@ -390,8 +390,8 @@ ExecuteCoordScript::
|
|||
Func_328c::
|
||||
push hl
|
||||
farcall Func_d3e9
|
||||
farcall Func_10dfb
|
||||
cp $ff
|
||||
farcall FindNPCAtLocation
|
||||
cp NPC_NONE
|
||||
jr z, .set_carry
|
||||
push af
|
||||
call Func_3195
|
||||
|
|
@ -409,8 +409,8 @@ Func_328c::
|
|||
Func_32aa::
|
||||
push hl
|
||||
farcall Func_d3e9
|
||||
farcall Func_10dfb
|
||||
cp $ff
|
||||
farcall FindNPCAtLocation
|
||||
cp NPC_NONE
|
||||
jr z, .set_carry
|
||||
pop hl
|
||||
call ExecuteNPCScript
|
||||
|
|
@ -437,8 +437,8 @@ Func_32bf::
|
|||
scf
|
||||
ret
|
||||
|
||||
Func_32d8::
|
||||
call Func_32f6
|
||||
HandleOverworldPlayerInput::
|
||||
call HandleOverworldPlayerMoveInput
|
||||
jr nc, .done
|
||||
ldh a, [hKeysPressed]
|
||||
bit B_PAD_A, a
|
||||
|
|
@ -447,7 +447,7 @@ Func_32d8::
|
|||
jr nz, .start_btn_pressed
|
||||
jr .done
|
||||
.a_btn_pressed
|
||||
ld a, OWMODE_08
|
||||
ld a, OWMODE_INTERACT
|
||||
ld [wOverworldMode], a
|
||||
jr .done
|
||||
.start_btn_pressed
|
||||
|
|
@ -456,7 +456,7 @@ Func_32d8::
|
|||
.done
|
||||
ret
|
||||
|
||||
Func_32f6::
|
||||
HandleOverworldPlayerMoveInput::
|
||||
ldh a, [hKeysHeld]
|
||||
and PAD_CTRL_PAD
|
||||
jr z, .set_carry
|
||||
|
|
|
|||
|
|
@ -2780,8 +2780,9 @@ wCurSpriteAnim:: sprite_anim_struct wCurSpriteAnim ; d976
|
|||
wd986:: ; d986
|
||||
ds $1
|
||||
|
||||
; NPC_* ID or $ff
|
||||
wd987:: ; d987
|
||||
; NPC_* ID (or NPC_NONE)
|
||||
; See also; wScriptNPC
|
||||
wTempScriptNPC:: ; d987
|
||||
ds $1
|
||||
|
||||
ds $1
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ script_types = [
|
|||
"OWMODE_05",
|
||||
"OWMODE_06",
|
||||
"OWMODE_07",
|
||||
"OWMODE_08",
|
||||
"OWMODE_INTERACT",
|
||||
"OWMODE_AFTER_DUEL",
|
||||
"OWMODE_0A",
|
||||
"OWMODE_0B",
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user