mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
More std enums.
This commit is contained in:
parent
5d48bc96fd
commit
fdfbeb7e5f
@ -17,3 +17,32 @@
|
||||
enum smashrock
|
||||
enum pokecentersign
|
||||
enum martsign
|
||||
enum goldenrodrockets
|
||||
enum radiotowerrockets
|
||||
enum elevatorbutton
|
||||
enum daytotext
|
||||
enum bugcontestresultswarp
|
||||
enum bugcontestresults
|
||||
enum initializeevents
|
||||
enum asknumber1m
|
||||
enum asknumber2m
|
||||
enum registerednumberm
|
||||
enum numberacceptedm
|
||||
enum numberdeclinedm
|
||||
enum phonefullm
|
||||
enum rematchm
|
||||
enum giftm
|
||||
enum packfullm
|
||||
enum rematchgiftm
|
||||
enum asknumber1f
|
||||
enum asknumber2f
|
||||
enum registerednumberf
|
||||
enum numberacceptedf
|
||||
enum numberdeclinedf
|
||||
enum phonefullf
|
||||
enum rematchf
|
||||
enum giftf
|
||||
enum packfullf
|
||||
enum rematchgiftf
|
||||
enum gymstatue1
|
||||
enum gymstatue2
|
||||
|
File diff suppressed because it is too large
Load Diff
41
main.asm
41
main.asm
@ -12731,7 +12731,7 @@ UnknownScript_0x124ce: ; 0x124ce
|
||||
resetfuncs
|
||||
|
||||
.script_64f2
|
||||
jumpstd $0016
|
||||
jumpstd bugcontestresultswarp
|
||||
; 0x124f5
|
||||
|
||||
UnknownText_0x124f5: ; 0x124f5
|
||||
@ -15375,7 +15375,7 @@ UnknownScript_0x13603: ; 0x13603
|
||||
|
||||
UnknownScript_0x1360b: ; 0x1360b
|
||||
loadmovesprites
|
||||
jumpstd $0016
|
||||
jumpstd bugcontestresultswarp
|
||||
; 0x1360f
|
||||
|
||||
UnknownText_0x1360f: ; 0x1360f
|
||||
@ -52496,7 +52496,7 @@ Unknown_80671: ; 80671
|
||||
dwb TimeOfDay, $00
|
||||
dwb Function806c5, $80
|
||||
dwb Function806d3, $80
|
||||
dwb Function806e1, $80
|
||||
dwb CountBadges, $80
|
||||
dwb PlayerState, $40
|
||||
dwb Function806ef, $80
|
||||
dwb hHours, $00
|
||||
@ -52537,7 +52537,7 @@ Function806d3: ; 806d3
|
||||
jp Function8066c
|
||||
; 806e1
|
||||
|
||||
Function806e1: ; 806e1
|
||||
CountBadges: ; 806e1
|
||||
; Number of owned badges.
|
||||
ld hl, Badges
|
||||
ld b, 2
|
||||
@ -75842,9 +75842,23 @@ INCLUDE "text/phone/buena.asm"
|
||||
|
||||
SECTION "bank29", ROMX, BANK[$29]
|
||||
|
||||
INCLUDE "text/phone/extra2.asm"
|
||||
|
||||
|
||||
INCLUDE "text/phone/anthony_overworld.asm"
|
||||
INCLUDE "text/phone/todd_overworld.asm"
|
||||
INCLUDE "text/phone/gina_overworld.asm"
|
||||
INCLUDE "text/phone/irwin_overworld.asm"
|
||||
INCLUDE "text/phone/arnie_overworld.asm"
|
||||
INCLUDE "text/phone/alan_overworld.asm"
|
||||
INCLUDE "text/phone/dana_overworld.asm"
|
||||
INCLUDE "text/phone/chad_overworld.asm"
|
||||
INCLUDE "text/phone/derek_overworld.asm"
|
||||
INCLUDE "text/phone/tully_overworld.asm"
|
||||
INCLUDE "text/phone/brent_overworld.asm"
|
||||
INCLUDE "text/phone/tiffany_overworld.asm"
|
||||
INCLUDE "text/phone/vance_overworld.asm"
|
||||
INCLUDE "text/phone/wilton_overworld.asm"
|
||||
INCLUDE "text/phone/kenji_overworld.asm"
|
||||
INCLUDE "text/phone/parry_overworld.asm"
|
||||
INCLUDE "text/phone/erin_overworld.asm"
|
||||
|
||||
SECTION "Tileset Data 5", ROMX, BANK[TILESETS_5]
|
||||
|
||||
@ -95652,8 +95666,17 @@ INCLUDE "misc/mobile_5f.asm"
|
||||
SECTION "Common Text 1", ROMX, BANK[$6C]
|
||||
|
||||
INCLUDE "text/common.asm"
|
||||
|
||||
|
||||
INCLUDE "text/phone/jack_overworld.asm"
|
||||
INCLUDE "text/phone/beverly_overworld.asm"
|
||||
INCLUDE "text/phone/huey_overworld.asm"
|
||||
INCLUDE "text/phone/gaven_overworld.asm"
|
||||
INCLUDE "text/phone/beth_overworld.asm"
|
||||
INCLUDE "text/phone/jose_overworld.asm"
|
||||
INCLUDE "text/phone/reena_overworld.asm"
|
||||
INCLUDE "text/phone/joey_overworld.asm"
|
||||
INCLUDE "text/phone/wade_overworld.asm"
|
||||
INCLUDE "text/phone/ralph_overworld.asm"
|
||||
INCLUDE "text/phone/liz_overworld.asm"
|
||||
|
||||
SECTION "bank6D", ROMX, BANK[$6D]
|
||||
|
||||
|
@ -59,11 +59,11 @@ UnknownScript_0x18ec73: ; 0x18ec73
|
||||
; 0x18ec7c
|
||||
|
||||
UnknownScript_0x18ec7c: ; 0x18ec7c
|
||||
jumpstd $0012
|
||||
jumpstd goldenrodrockets
|
||||
; 0x18ec7f
|
||||
|
||||
UnknownScript_0x18ec7f: ; 0x18ec7f
|
||||
jumpstd $0013
|
||||
jumpstd radiotowerrockets
|
||||
; 0x18ec82
|
||||
|
||||
TrainerTwinsAmyandmay1: ; 0x18ec82
|
||||
@ -232,12 +232,12 @@ AzaleaGymGuyScript: ; 0x18ece6
|
||||
MapAzaleaGymSignpost1Script: ; 0x18ecfb
|
||||
checkflag $001c
|
||||
iftrue UnknownScript_0x18ed04
|
||||
jumpstd $002d
|
||||
jumpstd gymstatue1
|
||||
; 0x18ed04
|
||||
|
||||
UnknownScript_0x18ed04: ; 0x18ed04
|
||||
trainertotext BUGSY, 1, $1
|
||||
jumpstd $002e
|
||||
jumpstd gymstatue2
|
||||
; 0x18ed0b
|
||||
|
||||
UnknownText_0x18ed0b: ; 0x18ed0b
|
||||
|
@ -202,12 +202,12 @@ BlackthornGymGuyScript: ; 0x194ed6
|
||||
MapBlackthornGym1FSignpost1Script: ; 0x194eea
|
||||
checkflag $0022
|
||||
iftrue UnknownScript_0x194ef3
|
||||
jumpstd $002d
|
||||
jumpstd gymstatue1
|
||||
; 0x194ef3
|
||||
|
||||
UnknownScript_0x194ef3: ; 0x194ef3
|
||||
trainertotext CLAIR, 1, $1
|
||||
jumpstd $002e
|
||||
jumpstd gymstatue2
|
||||
; 0x194efa
|
||||
|
||||
UnknownText_0x194efa: ; 0x194efa
|
||||
|
@ -23,7 +23,7 @@ MapCeladonDeptStore1FSignpost0Script: ; 0x709e9
|
||||
; 0x709ec
|
||||
|
||||
MapCeladonDeptStore6FSignpost1Script: ; 0x709ec
|
||||
jumpstd $0014
|
||||
jumpstd elevatorbutton
|
||||
; 0x709ef
|
||||
|
||||
UnknownText_0x709ef: ; 0x709ef
|
||||
|
@ -35,7 +35,7 @@ MapCeladonDeptStore2FSignpost0Script: ; 0x70bc3
|
||||
; 0x70bc6
|
||||
|
||||
MapCeladonDeptStore2FSignpost1Script: ; 0x70bc6
|
||||
jumpstd $0014
|
||||
jumpstd elevatorbutton
|
||||
; 0x70bc9
|
||||
|
||||
UnknownText_0x70bc9: ; 0x70bc9
|
||||
|
@ -43,7 +43,7 @@ SuperNerdScript_0x70d4a: ; 0x70d4a
|
||||
; 0x70d4d
|
||||
|
||||
MapCeladonDeptStore3FSignpost1Script: ; 0x70d4d
|
||||
jumpstd $0014
|
||||
jumpstd elevatorbutton
|
||||
; 0x70d50
|
||||
|
||||
MapCeladonDeptStore3FSignpost0Script: ; 0x70d50
|
||||
|
@ -27,7 +27,7 @@ MapCeladonDeptStore4FSignpost0Script: ; 0x70f1b
|
||||
; 0x70f1e
|
||||
|
||||
MapCeladonDeptStore4FSignpost1Script: ; 0x70f1e
|
||||
jumpstd $0014
|
||||
jumpstd elevatorbutton
|
||||
; 0x70f21
|
||||
|
||||
UnknownText_0x70f21: ; 0x70f21
|
||||
|
@ -39,7 +39,7 @@ MapCeladonDeptStore5FSignpost0Script: ; 0x7101d
|
||||
; 0x71020
|
||||
|
||||
MapCeladonDeptStore5FSignpost1Script: ; 0x71020
|
||||
jumpstd $0014
|
||||
jumpstd elevatorbutton
|
||||
; 0x71023
|
||||
|
||||
UnknownText_0x71023: ; 0x71023
|
||||
|
@ -113,7 +113,7 @@ MapCeladonDeptStore6FSignpost0Script: ; 0x7124a
|
||||
; 0x7124d
|
||||
|
||||
UnknownScript_0x7124d: ; 0x7124d
|
||||
jumpstd $0014
|
||||
jumpstd elevatorbutton
|
||||
; 0x71250
|
||||
|
||||
UnknownText_0x71250: ; 0x71250
|
||||
|
@ -191,12 +191,12 @@ TwinsJoandzoe2Script: ; 0x72b10
|
||||
MapCeladonGymSignpost1Script: ; 0x72b18
|
||||
checkflag $0026
|
||||
iftrue UnknownScript_0x72b21
|
||||
jumpstd $002d
|
||||
jumpstd gymstatue1
|
||||
; 0x72b21
|
||||
|
||||
UnknownScript_0x72b21: ; 0x72b21
|
||||
trainertotext ERIKA, 1, $1
|
||||
jumpstd $002e
|
||||
jumpstd gymstatue2
|
||||
; 0x72b28
|
||||
|
||||
UnknownText_0x72b28: ; 0x72b28
|
||||
|
@ -217,12 +217,12 @@ MapCeruleanGymSignpost2Script: ; 0x1884c6
|
||||
UnknownScript_0x1884d3: ; 0x1884d3
|
||||
checkflag $0024
|
||||
iftrue UnknownScript_0x1884dc
|
||||
jumpstd $002d
|
||||
jumpstd gymstatue1
|
||||
; 0x1884dc
|
||||
|
||||
UnknownScript_0x1884dc: ; 0x1884dc
|
||||
trainertotext MISTY, 1, $1
|
||||
jumpstd $002e
|
||||
jumpstd gymstatue2
|
||||
; 0x1884e3
|
||||
|
||||
MovementData_0x1884e3: ; 0x1884e3
|
||||
|
@ -74,11 +74,11 @@ UnknownScript_0x9d681: ; 0x9d681
|
||||
; 0x9d68a
|
||||
|
||||
UnknownScript_0x9d68a: ; 0x9d68a
|
||||
jumpstd $0012
|
||||
jumpstd goldenrodrockets
|
||||
; 0x9d68d
|
||||
|
||||
UnknownScript_0x9d68d: ; 0x9d68d
|
||||
jumpstd $0013
|
||||
jumpstd radiotowerrockets
|
||||
; 0x9d690
|
||||
|
||||
TrainerBlackbeltYoshi: ; 0x9d690
|
||||
@ -204,12 +204,12 @@ BoulderScript_0x9d6e0: ; 0x9d6e0
|
||||
MapCianwoodGymSignpost1Script: ; 0x9d6e3
|
||||
checkflag $0020
|
||||
iftrue UnknownScript_0x9d6ec
|
||||
jumpstd $002d
|
||||
jumpstd gymstatue1
|
||||
; 0x9d6ec
|
||||
|
||||
UnknownScript_0x9d6ec: ; 0x9d6ec
|
||||
trainertotext CHUCK, 1, $1
|
||||
jumpstd $002e
|
||||
jumpstd gymstatue2
|
||||
; 0x9d6f3
|
||||
|
||||
MovementData_0x9d6f3: ; 0x9d6f3
|
||||
|
@ -75,11 +75,11 @@ UnknownScript_0x99db7: ; 0x99db7
|
||||
; 0x99dc0
|
||||
|
||||
UnknownScript_0x99dc0: ; 0x99dc0
|
||||
jumpstd $0012
|
||||
jumpstd goldenrodrockets
|
||||
; 0x99dc3
|
||||
|
||||
UnknownScript_0x99dc3: ; 0x99dc3
|
||||
jumpstd $0013
|
||||
jumpstd radiotowerrockets
|
||||
; 0x99dc6
|
||||
|
||||
UnknownScript_0x99dc6: ; 0x99dc6
|
||||
@ -235,12 +235,12 @@ EcruteakGymGuyScript: ; 0x99e39
|
||||
MapEcruteakGymSignpost1Script: ; 0x99e4d
|
||||
checkflag $001e
|
||||
iftrue UnknownScript_0x99e56
|
||||
jumpstd $002d
|
||||
jumpstd gymstatue1
|
||||
; 0x99e56
|
||||
|
||||
UnknownScript_0x99e56: ; 0x99e56
|
||||
trainertotext MORTY, 1, $1
|
||||
jumpstd $002e
|
||||
jumpstd gymstatue2
|
||||
; 0x99e5d
|
||||
|
||||
MovementData_0x99e5d: ; 0x99e5d
|
||||
|
@ -223,12 +223,12 @@ FuchsiaGymGuyScript: ; 0x195f03
|
||||
MapFuchsiaGymSignpost1Script: ; 0x195f17
|
||||
checkflag $0027
|
||||
iftrue UnknownScript_0x195f20
|
||||
jumpstd $002d
|
||||
jumpstd gymstatue1
|
||||
; 0x195f20
|
||||
|
||||
UnknownScript_0x195f20: ; 0x195f20
|
||||
trainertotext JANINE, 1, $1
|
||||
jumpstd $002e
|
||||
jumpstd gymstatue2
|
||||
; 0x195f27
|
||||
|
||||
MovementData_0x195f27: ; 0x195f27
|
||||
|
@ -27,7 +27,7 @@ MapGoldenrodDeptStore1FSignpost0Script: ; 0x5598d
|
||||
; 0x55990
|
||||
|
||||
MapGoldenrodDeptStore1FSignpost1Script: ; 0x55990
|
||||
jumpstd $0014
|
||||
jumpstd elevatorbutton
|
||||
; 0x55993
|
||||
|
||||
UnknownText_0x55993: ; 0x55993
|
||||
|
@ -39,7 +39,7 @@ MapGoldenrodDeptStore2FSignpost0Script: ; 0x55b76
|
||||
; 0x55b79
|
||||
|
||||
MapGoldenrodDeptStore2FSignpost1Script: ; 0x55b79
|
||||
jumpstd $0014
|
||||
jumpstd elevatorbutton
|
||||
; 0x55b7c
|
||||
|
||||
; possibly unused
|
||||
|
@ -27,7 +27,7 @@ MapGoldenrodDeptStore3FSignpost0Script: ; 0x55dc6
|
||||
; 0x55dc9
|
||||
|
||||
MapGoldenrodDeptStore3FSignpost1Script: ; 0x55dc9
|
||||
jumpstd $0014
|
||||
jumpstd elevatorbutton
|
||||
; 0x55dcc
|
||||
|
||||
UnknownText_0x55dcc: ; 0x55dcc
|
||||
|
@ -37,7 +37,7 @@ MapGoldenrodDeptStore4FSignpost0Script: ; 0x55f02
|
||||
; 0x55f05
|
||||
|
||||
MapGoldenrodDeptStore4FSignpost1Script: ; 0x55f05
|
||||
jumpstd $0014
|
||||
jumpstd elevatorbutton
|
||||
; 0x55f08
|
||||
|
||||
UnknownText_0x55f08: ; 0x55f08
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user