pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Named more specials, fixed a missing EOL

Browse Source
This commit is contained in:
PikalaxALT 2015-07-20 18:59:26 -04:00
parent d9300a9bec
commit 06673cbee7
42 changed files with 170 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/color.asm
View File

@ -1944,7 +1944,7 @@ Functionb1de: ; b1de
callba Function494ac callba Function494ac
jr c, .asm_b230 jr c, .asm_b230
ld a, [wd19a] ld a, [wRoofPalette]
and 7 and 7
ld e, a ld e, a
ld d, 0 ld d, 0
@ -2009,7 +2009,7 @@ endr
ld a, $5 ; BANK(Unkn2Pals) ld a, $5 ; BANK(Unkn2Pals)
call FarCopyWRAM call FarCopyWRAM
ld a, [wd19a] ld a, [wRoofPalette]
cp 1 cp 1
jr z, .asm_b253 jr z, .asm_b253
cp 2 cp 2

2
engine/events_2.asm
View File

@ -146,7 +146,7 @@ Function97cfd:: ; 97cfd
ld hl, StatusFlags ld hl, StatusFlags
bit 5, [hl] bit 5, [hl]
jr nz, .asm_97d21 jr nz, .asm_97d21
ld a, [wd19a] ld a, [wRoofPalette]
cp $4 cp $4
jr z, .asm_97d17 jr z, .asm_97d17
cp $7 cp $7

2
engine/map_setup.asm
View File

@ -393,7 +393,7 @@ Function154f7: ; 154f7
jr c, .ok jr c, .ok
ret ret
.ok .ok
call Functione4a call Special_ReplaceKrisSprite
ret ret
Function1550c: ; 1550c (5:550c) Function1550c: ; 1550c (5:550c)

90
engine/specials.asm
View File

@ -46,38 +46,38 @@ SpecialsPointers:: ; c029
add_special ContestReturnMons add_special ContestReturnMons
add_special Special_GiveParkBalls add_special Special_GiveParkBalls
add_special Special_CheckMagikarpLength add_special Special_CheckMagikarpLength
add_special Functionfbcd2 add_special Special_MagikarpHouseSign
add_special HealParty add_special HealParty
add_special PokemonCenterPC add_special PokemonCenterPC
add_special Functionc2e7 add_special Special_KrissHousePC
add_special Function166d6 add_special Special_DayCareMan
add_special Function1672a add_special Special_DayCareLady
add_special Function16936 add_special Special_DayCareManOutside
add_special MoveDeletion add_special MoveDeletion
add_special Function16218 add_special Special_BankOfMom
add_special Function8cc04 add_special Special_MagnetTrain
add_special SpecialNameRival add_special SpecialNameRival
add_special Function90913 add_special Special_SetDayOfWeek
add_special Functionc2c0 add_special Special_TownMap
add_special Functionc2cd add_special Special_UnownPrinter
add_special MapRadio add_special MapRadio
add_special Functionc360 add_special Special_UnownPuzzle
add_special Functionc373 add_special Special_SlotMachine
add_special Functionc380 add_special Special_CardFlip
add_special Functionc38d add_special Special_DummyNonfunctionalGameCornerGame
add_special Functionc3db add_special Special_WhiteBGMapBufferScreen
add_special FadeBlackBGMap add_special FadeBlackBGMap
add_special Function8c092 add_special Special_BattleTowerFade
add_special Function8c0b6 add_special Special_FadeBlackQuickly
add_special FadeInBGMap add_special FadeInBGMap
add_special Function8c0ab add_special Special_FadeInQuickly
add_special Functiond91 add_special Special_ReloadSpritesNoPalettes
add_special WhiteBGMap add_special WhiteBGMap
add_special UpdateTimePals add_special UpdateTimePals
add_special ClearTileMap add_special ClearTileMap
add_special DrawOnMap add_special DrawOnMap
add_special Functione4a add_special Special_ReplaceKrisSprite
add_special Functionc230 add_special Special_GameCornerPrizeMonCheckDex
add_special SpecialSeenMon add_special SpecialSeenMon
add_special WaitSFX add_special WaitSFX
add_special PlayMapMusic add_special PlayMapMusic
@ -155,7 +155,7 @@ SpecialsPointers:: ; c029
add_special SpecialOmanyteChamber add_special SpecialOmanyteChamber
add_special Function11c1ab add_special Function11c1ab
add_special Function170687 add_special Function170687
add_special Function8ae68 add_special Special_DisplayUnownWords
add_special Function17d224 add_special Function17d224
add_special Function17d2b6 add_special Function17d2b6
add_special Function17d2ce add_special Function17d2ce
@ -202,7 +202,7 @@ Functionc225: ; c225
ret ret
; c230 ; c230
Functionc230: ; c230 Special_GameCornerPrizeMonCheckDex: ; c230
ld a, [ScriptVar] ld a, [ScriptVar]
dec a dec a
call CheckCaughtMon call CheckCaughtMon
@ -283,14 +283,14 @@ SpecialNameRater: ; c2b9
ret ret
; c2c0 ; c2c0
Functionc2c0: ; c2c0 Special_TownMap: ; c2c0
call FadeToMenu call FadeToMenu
callba Function9191c callba Function9191c
call Function2b4d call Function2b4d
ret ret
; c2cd ; c2cd
Functionc2cd: ; c2cd Special_UnownPrinter: ; c2cd
call FadeToMenu call FadeToMenu
callba Function16be4 callba Function16be4
call Function2b4d call Function2b4d
@ -304,7 +304,7 @@ Functionc2da: ; c2da
ret ret
; c2e7 ; c2e7
Functionc2e7: ; c2e7 Special_KrissHousePC: ; c2e7
xor a xor a
ld [ScriptVar], a ld [ScriptVar], a
callba Function156d9 callba Function156d9
@ -376,7 +376,7 @@ MapRadio: ; c355
ret ret
; c360 ; c360
Functionc360: ; c360 Special_UnownPuzzle: ; c360
call FadeToMenu call FadeToMenu
callba Functione1190 callba Functione1190
ld a, [wd0ec] ld a, [wd0ec]
@ -385,34 +385,34 @@ Functionc360: ; c360
ret ret
; c373 ; c373
Functionc373: ; c373 Special_SlotMachine: ; c373
call Functionc3ae call Special_CheckCoins
ret c ret c
ld a, BANK(Function926c7) ld a, BANK(_SlotMachine)
ld hl, Function926c7 ld hl, _SlotMachine
call Functionc39a call Special_StartGameCornerGame
ret ret
; c380 ; c380
Functionc380: ; c380 Special_CardFlip: ; c380
call Functionc3ae call Special_CheckCoins
ret c ret c
ld a, BANK(Functione00ee) ld a, BANK(_CardFlip)
ld hl, Functione00ee ld hl, _CardFlip
call Functionc39a call Special_StartGameCornerGame
ret ret
; c38d ; c38d
Functionc38d: ; c38d Special_DummyNonfunctionalGameCornerGame: ; c38d
call Functionc3ae call Special_CheckCoins
ret c ret c
ld a, BANK(Functione1e5b) ld a, BANK(_DummyGame)
ld hl, Functione1e5b ld hl, _DummyGame
call Functionc39a call Special_StartGameCornerGame
ret ret
; c39a ; c39a
Functionc39a: ; c39a Special_StartGameCornerGame: ; c39a
call Function31cf call Function31cf
call FadeToMenu call FadeToMenu
ld hl, wd0e8 ld hl, wd0e8
@ -427,7 +427,7 @@ Functionc39a: ; c39a
ret ret
; c3ae ; c3ae
Functionc3ae: ; c3ae Special_CheckCoins: ; c3ae
ld hl, Coins ld hl, Coins
ld a, [hli] ld a, [hli]
or [hl] or [hl]
@ -465,7 +465,7 @@ UnknownText_0xc3d6: ; 0xc3d6
db "@" db "@"
; 0xc3db ; 0xc3db
Functionc3db: ; c3db Special_WhiteBGMapBufferScreen: ; c3db
call WhiteBGMap call WhiteBGMap
call BufferScreen call BufferScreen
ret ret

2
engine/std_scripts.asm
View File

@ -184,7 +184,7 @@ TownMapScript:
loadfont loadfont
farwritetext TownMapText farwritetext TownMapText
closetext closetext
special Functionc2c0 special Special_TownMap
loadmovesprites loadmovesprites
end end

2
home/copy.asm
View File

@ -105,7 +105,7 @@ Functiondfd:: ; dfd
Functione4a:: ; e4a Special_ReplaceKrisSprite:: ; e4a
callba Function14135 callba Function14135
ret ret
; e51 ; e51

8
home/flag.asm
View File

@ -1,11 +1,11 @@
Function2e50:: ; 2e50 ResetMapBufferEventFlags:: ; 2e50
xor a xor a
ld hl, EventFlags ld hl, EventFlags
ld [hli], a ld [hli], a
ret ret
; 2e56 ; 2e56
Function2e56:: ; 2e56 ResetBikeFlags:: ; 2e56
xor a xor a
ld hl, BikeFlags ld hl, BikeFlags
ld [hli], a ld [hli], a
@ -13,8 +13,8 @@ Function2e56:: ; 2e56
ret ret
; 2e5d ; 2e5d
Function2e5d:: ; 2e5d ResetFlashIfOutOfCave:: ; 2e5d
ld a, [wd19a] ld a, [wRoofPalette]
cp $2 cp $2
jr z, .asm_2e69 jr z, .asm_2e69
cp $1 cp $1

2
home/map.asm
View File

@ -1,6 +1,6 @@
; Functions dealing with rendering and interacting with maps. ; Functions dealing with rendering and interacting with maps.
Function210f:: ; 210f Clearwc7e8:: ; 210f
ld hl, wc7e8 ld hl, wc7e8
ld bc, $0018 ld bc, $0018
ld a, $0 ld a, $0

2
home/palettes.asm
View File

@ -302,7 +302,7 @@ Functiond90:: ; d90
; d91 ; d91
Functiond91:: ; d91 Special_ReloadSpritesNoPalettes:: ; d91
ld a, [hCGB] ld a, [hCGB]
and a and a
ret z ret z

2
home/window.asm
View File

@ -40,7 +40,7 @@ Function2de2:: ; 2de2
call Function2e31 call Function2e31
ld a, $90 ld a, $90
ld [hWY], a ld [hWY], a
call Functione4a call Special_ReplaceKrisSprite
callba ReturnFromMapSetupScript callba ReturnFromMapSetupScript
callba Function106594 callba Function106594
ret ret

68
main.asm
View File

@ -5004,7 +5004,7 @@ UsedSurfScript: ; c986
copybytetovar Buffer2 copybytetovar Buffer2
writevarcode VAR_MOVEMENT writevarcode VAR_MOVEMENT
special Functione4a special Special_ReplaceKrisSprite
special PlayMapMusic special PlayMapMusic
; step into the water ; step into the water
special Function8379 ; (slow_step_x, step_end) special Function8379 ; (slow_step_x, step_end)
@ -5242,7 +5242,7 @@ FlyFunction: ; ca3b
Functioncacb: ; cacb Functioncacb: ; cacb
callba Function561d callba Function561d
call DelayFrame call DelayFrame
call Functione4a call Special_ReplaceKrisSprite
callba Function106594 callba Function106594
ret ret
; cade ; cade
@ -6343,7 +6343,7 @@ PutTheRodAway: ; d095
ld a, $1 ld a, $1
ld [PlayerAction], a ld [PlayerAction], a
call DrawOnMap call DrawOnMap
call Functione4a call Special_ReplaceKrisSprite
ret ret
; d0a4 ; d0a4
@ -6462,14 +6462,14 @@ Script_GetOnBike: ; 0xd13e
writetext UnknownText_0xd17c writetext UnknownText_0xd17c
closetext closetext
loadmovesprites loadmovesprites
special Functione4a special Special_ReplaceKrisSprite
end end
; 0xd14e ; 0xd14e
Script_GetOnBike_Register: ; 0xd14e Script_GetOnBike_Register: ; 0xd14e
writecode VAR_MOVEMENT, $1 writecode VAR_MOVEMENT, $1
loadmovesprites loadmovesprites
special Functione4a special Special_ReplaceKrisSprite
end end
; 0xd156 ; 0xd156
@ -6486,7 +6486,7 @@ Script_GetOffBike: ; 0xd158
UnknownScript_0xd163: UnknownScript_0xd163:
loadmovesprites loadmovesprites
special Functione4a special Special_ReplaceKrisSprite
special PlayMapMusic special PlayMapMusic
end end
; 0xd16b ; 0xd16b
@ -21243,7 +21243,7 @@ CheckCoins:: ; 160a1
INCLUDE "items/marts.asm" INCLUDE "items/marts.asm"
Function16218: ; 16218 Special_BankOfMom: ; 16218
ld a, [$ffaa] ld a, [$ffaa]
push af push af
ld a, $1 ld a, $1
@ -21992,7 +21992,7 @@ MenuData2_0x166bd: ; 0x166bd
db "CANCEL@" db "CANCEL@"
; 0x166d6 ; 0x166d6
Function166d6: ; 166d6 Special_DayCareMan: ; 166d6
ld hl, wDaycareMan ld hl, wDaycareMan
bit 0, [hl] bit 0, [hl]
jr nz, .asm_166fe jr nz, .asm_166fe
@ -22031,7 +22031,7 @@ Function166d6: ; 166d6
ret ret
; 1672a ; 1672a
Function1672a: ; 1672a Special_DayCareLady: ; 1672a
ld hl, wDaycareLady ld hl, wDaycareLady
bit 0, [hl] bit 0, [hl]
jr nz, .asm_16752 jr nz, .asm_16752
@ -22399,7 +22399,7 @@ UnknownText_0x16931: ; 0x16931
db "@" db "@"
; 0x16936 ; 0x16936
Function16936: ; 16936 Special_DayCareManOutside: ; 16936
ld hl, wDaycareMan ld hl, wDaycareMan
bit 6, [hl] bit 6, [hl]
jr nz, Function16949 jr nz, Function16949
@ -29177,7 +29177,7 @@ DecorationDesc_TownMapPoster: ; 0x26f91
loadfont loadfont
writetext UnknownText_0x26f9b writetext UnknownText_0x26f9b
closetext closetext
special Functionc2c0 special Special_TownMap
loadmovesprites loadmovesprites
end end
; 0x26f9b ; 0x26f9b
@ -41297,7 +41297,7 @@ Function494ac: ; 494ac
ret ret
.ice_path .ice_path
ld a, [wd19a] ; permission ld a, [wRoofPalette] ; permission
and 7 and 7
cp 3 ; Hall of Fame cp 3 ; Hall of Fame
jr z, .do_nothing jr z, .do_nothing
@ -52231,7 +52231,7 @@ WaterToLandSprite: ; 803f9
push bc push bc
ld a, PLAYER_NORMAL ld a, PLAYER_NORMAL
ld [PlayerState], a ld [PlayerState], a
call Functione4a ; UpdateSprites call Special_ReplaceKrisSprite ; UpdateSprites
pop bc pop bc
ret ret
; 80404 ; 80404
@ -52419,7 +52419,7 @@ VarActionTable: ; 80671
dwb MapGroup, $00 dwb MapGroup, $00
dwb MapNumber, $00 dwb MapNumber, $00
dwb Function806ff, $80 dwb Function806ff, $80
dwb wd19a, $00 dwb wRoofPalette, $00
dwb Function80715, $80 dwb Function80715, $80
dwb wd46c, $00 dwb wd46c, $00
dwb XCoord, $00 dwb XCoord, $00
@ -61386,7 +61386,7 @@ SpecialKabutoChamber: ; 8ae4e
ret ret
; 8ae68 ; 8ae68
Function8ae68: ; 8ae68 Special_DisplayUnownWords: ; 8ae68
ld a, [ScriptVar] ld a, [ScriptVar]
ld hl, MenuDataHeader_0x8aed5 ld hl, MenuDataHeader_0x8aed5
and a and a
@ -63558,7 +63558,7 @@ FadeBlackBGMap:: ; 8c084
ret ret
; 8c092 ; 8c092
Function8c092: ; 8c092 Special_BattleTowerFade: ; 8c092
call Function8c0c1 call Function8c0c1
ld c, $9 ld c, $9
call GetTimePalFade call GetTimePalFade
@ -63575,7 +63575,7 @@ Function8c092: ; 8c092
ret ret
; 8c0ab ; 8c0ab
Function8c0ab: ; 8c0ab Special_FadeInQuickly: ; 8c0ab
ld c, $0 ld c, $0
call GetTimePalFade call GetTimePalFade
ld b, $4 ld b, $4
@ -63583,7 +63583,7 @@ Function8c0ab: ; 8c0ab
ret ret
; 8c0b6 ; 8c0b6
Function8c0b6: ; 8c0b6 Special_FadeBlackQuickly: ; 8c0b6
ld c, $9 ld c, $9
call GetTimePalFade call GetTimePalFade
ld b, $4 ld b, $4
@ -64031,7 +64031,7 @@ Function8c365: ; 8c365 (23:4365)
jr nc, .asm_8c375 jr nc, .asm_8c375
set 0, e set 0, e
.asm_8c375 .asm_8c375
ld a, [wd19a] ld a, [wRoofPalette]
cp $4 cp $4
jr z, .asm_8c386 jr z, .asm_8c386
cp $5 cp $5
@ -64732,7 +64732,7 @@ ShakeHeadbuttTree: ; 8c80a
ld hl, VTiles1 ld hl, VTiles1
lb bc, BANK(Font), $c lb bc, BANK(Font), $c
call Get1bpp call Get1bpp
call Functione4a call Special_ReplaceKrisSprite
ret ret
; 8c893 ; 8c893
@ -65117,7 +65117,7 @@ Function8cbe6: ; 8cbe6 (23:4be6)
ld [hl], $80 ld [hl], $80
ret ret
Function8cc04: ; 8cc04 Special_MagnetTrain: ; 8cc04
ld a, [ScriptVar] ld a, [ScriptVar]
and a and a
jr nz, .asm_8cc14 jr nz, .asm_8cc14
@ -65553,13 +65553,13 @@ Function8ceae: ; 8ceae
ld [rSVBK], a ld [rSVBK], a
ld a, [TimeOfDayPal] ld a, [TimeOfDayPal]
push af push af
ld a, [wd19a] ld a, [wRoofPalette]
push af push af
ld a, [TimeOfDay] ld a, [TimeOfDay]
and $3 and $3
ld [TimeOfDayPal], a ld [TimeOfDayPal], a
ld a, $1 ld a, $1
ld [wd19a], a ld [wRoofPalette], a
ld b, $9 ld b, $9
call GetSGBLayout call GetSGBLayout
call UpdateTimePals call UpdateTimePals
@ -65570,7 +65570,7 @@ Function8ceae: ; 8ceae
ld a, [rOBP1] ld a, [rOBP1]
ld [wcfc9], a ld [wcfc9], a
pop af pop af
ld [wd19a], a ld [wRoofPalette], a
pop af pop af
ld [TimeOfDayPal], a ld [TimeOfDayPal], a
pop af pop af
@ -69205,7 +69205,7 @@ Function90178: ; 90178 (24:4178)
ret ret
Function90188: ; 90188 Function90188: ; 90188
ld a, [wd19a] ld a, [wRoofPalette]
cp $1 cp $1
jr z, .asm_90195 jr z, .asm_90195
cp $2 cp $2
@ -70165,7 +70165,7 @@ GFX_9090b: ; 9090b
INCBIN "gfx/unknown/09090b.2bpp" INCBIN "gfx/unknown/09090b.2bpp"
; 90913 ; 90913
Function90913: ; 90913 Special_SetDayOfWeek: ; 90913
ld a, [$ffaa] ld a, [$ffaa]
push af push af
ld a, $1 ld a, $1
@ -73691,7 +73691,7 @@ Function923b8: ; 923b8
INCLUDE "data/wild/fish.asm" INCLUDE "data/wild/fish.asm"
Function926c7: _SlotMachine:
ld hl, Options ld hl, Options
set 4, [hl] set 4, [hl]
call Function926f7 call Function926f7
@ -80258,7 +80258,7 @@ Functione00ed: ; e00ed (38:40ed)
ret ret
; e00ee (38:40ee) ; e00ee (38:40ee)
Functione00ee: ; e00ee (38:40ee) _CardFlip: ; e00ee (38:40ee)
ld hl, Options ld hl, Options
set 4, [hl] set 4, [hl]
call WhiteBGMap call WhiteBGMap
@ -82816,7 +82816,7 @@ INCBIN "gfx/unknown/0e1bab.2bpp.lz"
LZ_e1c9b: ; e1c9b LZ_e1c9b: ; e1c9b
INCBIN "gfx/unknown/0e1c9b.2bpp.lz" INCBIN "gfx/unknown/0e1c9b.2bpp.lz"
Functione1e5b: ; e1e5b (38:5e5b) _DummyGame: ; e1e5b (38:5e5b)
call Functione1e67 call Functione1e67
call DelayFrame call DelayFrame
.asm_e1e61 .asm_e1e61
@ -90316,7 +90316,7 @@ Functionfbbdb: ; fbbdb
INCLUDE "battle/magikarp_length.asm" INCLUDE "battle/magikarp_length.asm"
Functionfbcd2: ; fbcd2 Special_MagikarpHouseSign: ; fbcd2
ld a, [wdfe8] ld a, [wdfe8]
ld [Buffer1], a ld [Buffer1], a
ld a, [wdfe9] ld a, [wdfe9]
@ -92084,11 +92084,11 @@ FishingRodGFX: INCBIN "gfx/misc/fishing.2bpp"
RunCallback_05_03: ; 1045b0 RunCallback_05_03: ; 1045b0
call Function210f call Clearwc7e8
call Function2e50 call ResetMapBufferEventFlags
call Function2e5d call ResetFlashIfOutOfCave
call GetCurrentMapTrigger call GetCurrentMapTrigger
call Function2e56 call ResetBikeFlags
ld a, $5 ld a, $5
call RunMapCallback call RunMapCallback

4
maps/BattleTowerBattleRoom.asm
View File

@ -91,7 +91,7 @@ UnknownScript_0x9f4a3:
UnknownScript_0x9f4c2: UnknownScript_0x9f4c2:
pause 60 pause 60
special Function8c092 special Special_BattleTowerFade
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
writebyte $4 writebyte $4
special Function170687 special Function170687
@ -103,7 +103,7 @@ UnknownScript_0x9f4c2:
UnknownScript_0x9f4d9: UnknownScript_0x9f4d9:
pause 60 pause 60
special Function8c092 special Special_BattleTowerFade
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
BattleTowerBattleRoomScript_0x9f4e4: BattleTowerBattleRoomScript_0x9f4e4:
loadfont loadfont

8
maps/CeladonGameCorner.asm
View File

@ -104,20 +104,20 @@ MapCeladonGameCornerSignpost35Script:
if_equal $0, MapCeladonGameCornerSignpost16Script if_equal $0, MapCeladonGameCornerSignpost16Script
refreshscreen $0 refreshscreen $0
writebyte $0 writebyte $0
special Functionc373 special Special_SlotMachine
loadmovesprites loadmovesprites
end end
MapCeladonGameCornerSignpost16Script: MapCeladonGameCornerSignpost16Script:
refreshscreen $0 refreshscreen $0
writebyte $1 writebyte $1
special Functionc373 special Special_SlotMachine
loadmovesprites loadmovesprites
end end
MapCeladonGameCornerSignpost11Script: MapCeladonGameCornerSignpost11Script:
refreshscreen $0 refreshscreen $0
special Functionc380 special Special_CardFlip
loadmovesprites loadmovesprites
end end
@ -128,7 +128,7 @@ MapCeladonGameCornerSignpost9Script:
loadfont loadfont
writetext UnknownText_0x72567 writetext UnknownText_0x72567
closetext closetext
special Functionc380 special Special_CardFlip
loadmovesprites loadmovesprites
end end

6
maps/CeladonGameCornerPrizeRoom.asm
View File

@ -146,7 +146,7 @@ UnknownScript_0x727ed:
writetext UnknownText_0x729ad writetext UnknownText_0x729ad
closetext closetext
writebyte PIKACHU writebyte PIKACHU
special Functionc230 special Special_GameCornerPrizeMonCheckDex
givepoke PIKACHU, 25, 0, 0 givepoke PIKACHU, 25, 0, 0
takecoins 2222 takecoins 2222
jump UnknownScript_0x727d3 jump UnknownScript_0x727d3
@ -164,7 +164,7 @@ UnknownScript_0x7281b:
writetext UnknownText_0x729ad writetext UnknownText_0x729ad
closetext closetext
writebyte PORYGON writebyte PORYGON
special Functionc230 special Special_GameCornerPrizeMonCheckDex
givepoke PORYGON, 15, 0, 0 givepoke PORYGON, 15, 0, 0
takecoins 5555 takecoins 5555
jump UnknownScript_0x727d3 jump UnknownScript_0x727d3
@ -182,7 +182,7 @@ UnknownScript_0x72849:
writetext UnknownText_0x729ad writetext UnknownText_0x729ad
closetext closetext
writebyte LARVITAR writebyte LARVITAR
special Functionc230 special Special_GameCornerPrizeMonCheckDex
givepoke LARVITAR, 40, 0, 0 givepoke LARVITAR, 40, 0, 0
takecoins 8888 takecoins 8888
jump UnknownScript_0x727d3 jump UnknownScript_0x727d3

4
maps/DayCare.asm
View File

@ -50,7 +50,7 @@ UnknownScript_0x62fb6:
end end
UnknownScript_0x62fbd: UnknownScript_0x62fbd:
special Function166d6 special Special_DayCareMan
closetext closetext
loadmovesprites loadmovesprites
end end
@ -60,7 +60,7 @@ GrannyScript_0x62fc3:
loadfont loadfont
checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE
iftrue UnknownScript_0x62fd1 iftrue UnknownScript_0x62fd1
special Function1672a special Special_DayCareLady
closetext closetext
loadmovesprites loadmovesprites
end end

6
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -35,15 +35,15 @@ TwinScript_0x75ebb:
writetext UnknownText_0x7621f writetext UnknownText_0x7621f
closetext closetext
loadmovesprites loadmovesprites
special Function8c0b6 special Special_FadeBlackQuickly
special Functiond91 special Special_ReloadSpritesNoPalettes
disappear $5 disappear $5
applymovement $0, MovementData_0x76004 applymovement $0, MovementData_0x76004
moveperson $4, $3, $13 moveperson $4, $3, $13
appear $4 appear $4
spriteface $0, UP spriteface $0, UP
spriteface $4, UP spriteface $4, UP
special Function8c0ab special Special_FadeInQuickly
spriteface $3, DOWN spriteface $3, DOWN
showemote EMOTE_SHOCK, $3, 15 showemote EMOTE_SHOCK, $3, 15
applymovement $4, MovementData_0x7600c applymovement $4, MovementData_0x7600c

6
maps/FastShipCabins_SW_SSW_NW.asm
View File

@ -63,14 +63,14 @@ FastShipBed:
writetext FastShipBedText1 writetext FastShipBedText1
closetext closetext
loadmovesprites loadmovesprites
special Function8c0b6 special Special_FadeBlackQuickly
special Functiond91 special Special_ReloadSpritesNoPalettes
special Mobile_HealParty special Mobile_HealParty
special HealParty special HealParty
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
pause 60 pause 60
special RestartMapMusic special RestartMapMusic
special Function8c0ab special Special_FadeInQuickly
loadfont loadfont
writetext FastShipBedText2 writetext FastShipBedText2
closetext closetext

12
maps/GoldenrodGameCorner.asm
View File

@ -175,7 +175,7 @@ UnknownScript_0x56d26:
writetext UnknownText_0x56ebd writetext UnknownText_0x56ebd
closetext closetext
writebyte ABRA writebyte ABRA
special Functionc230 special Special_GameCornerPrizeMonCheckDex
givepoke ABRA, 5, 0, 0 givepoke ABRA, 5, 0, 0
takecoins 100 takecoins 100
jump UnknownScript_0x56d0c jump UnknownScript_0x56d0c
@ -193,7 +193,7 @@ UnknownScript_0x56d54:
writetext UnknownText_0x56ebd writetext UnknownText_0x56ebd
closetext closetext
writebyte CUBONE writebyte CUBONE
special Functionc230 special Special_GameCornerPrizeMonCheckDex
givepoke CUBONE, 15, 0, 0 givepoke CUBONE, 15, 0, 0
takecoins 800 takecoins 800
jump UnknownScript_0x56d0c jump UnknownScript_0x56d0c
@ -211,7 +211,7 @@ UnknownScript_0x56d82:
writetext UnknownText_0x56ebd writetext UnknownText_0x56ebd
closetext closetext
writebyte WOBBUFFET writebyte WOBBUFFET
special Functionc230 special Special_GameCornerPrizeMonCheckDex
givepoke WOBBUFFET, 15, 0, 0 givepoke WOBBUFFET, 15, 0, 0
takecoins 1500 takecoins 1500
jump UnknownScript_0x56d0c jump UnknownScript_0x56d0c
@ -292,20 +292,20 @@ MapGoldenrodGameCornerSignpost17Script:
if_equal $0, MapGoldenrodGameCornerSignpost7Script if_equal $0, MapGoldenrodGameCornerSignpost7Script
refreshscreen $0 refreshscreen $0
writebyte $0 writebyte $0
special Functionc373 special Special_SlotMachine
loadmovesprites loadmovesprites
end end
MapGoldenrodGameCornerSignpost7Script: MapGoldenrodGameCornerSignpost7Script:
refreshscreen $0 refreshscreen $0
writebyte $1 writebyte $1
special Functionc373 special Special_SlotMachine
loadmovesprites loadmovesprites
end end
MapGoldenrodGameCornerSignpost29Script: MapGoldenrodGameCornerSignpost29Script:
refreshscreen $0 refreshscreen $0
special Functionc380 special Special_CardFlip
loadmovesprites loadmovesprites
end end

2
maps/GoldenrodMagnetTrainStation.asm
View File

@ -33,7 +33,7 @@ UnknownScript_0x550fa:
applymovement $2, MovementData_0x55146 applymovement $2, MovementData_0x55146
applymovement $0, MovementData_0x5514f applymovement $0, MovementData_0x5514f
writebyte $0 writebyte $0
special Function8cc04 special Special_MagnetTrain
warpcheck warpcheck
newloadmap $f9 newloadmap $f9
applymovement $0, MovementData_0x55122 applymovement $0, MovementData_0x55122

4
maps/KrissHouse1F.asm
View File

@ -43,7 +43,7 @@ UnknownScript_0x7a4f6:
clearevent EVENT_KRISS_HOUSE_MOM_2 clearevent EVENT_KRISS_HOUSE_MOM_2
writetext UnknownText_0x7a6bd writetext UnknownText_0x7a6bd
keeptextopen keeptextopen
special Function90913 special Special_SetDayOfWeek
UnknownScript_0x7a519: UnknownScript_0x7a519:
writetext UnknownText_0x7a742 writetext UnknownText_0x7a742
yesorno yesorno
@ -142,7 +142,7 @@ UnknownScript_0x7a5b5:
setevent EVENT_FIRST_TIME_BANKING_WITH_MOM setevent EVENT_FIRST_TIME_BANKING_WITH_MOM
UnknownScript_0x7a5b8: UnknownScript_0x7a5b8:
setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
special Function16218 special Special_BankOfMom
closetext closetext
loadmovesprites loadmovesprites
end end

2
maps/KrissHouse2F.asm
View File

@ -84,7 +84,7 @@ KrissHouseBookshelf:
KrissHousePC: KrissHousePC:
loadfont loadfont
special Functionc2e7 special Special_KrissHousePC
iftrue .Warp iftrue .Warp
loadmovesprites loadmovesprites
end end

2
maps/LakeofRage.asm
View File

@ -132,7 +132,7 @@ MapLakeofRageSignpost1Script:
UnknownScript_0x700b8: UnknownScript_0x700b8:
keeptextopen keeptextopen
special Functionfbcd2 special Special_MagikarpHouseSign
loadmovesprites loadmovesprites
end end

6
maps/MrPokemonsHouse.asm
View File

@ -108,13 +108,13 @@ UnknownScript_0x196ec9:
writetext UnknownText_0x1970ed writetext UnknownText_0x1970ed
closetext closetext
loadmovesprites loadmovesprites
special Function8c0b6 special Special_FadeBlackQuickly
special Functiond91 special Special_ReloadSpritesNoPalettes
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
special Mobile_HealParty special Mobile_HealParty
special HealParty special HealParty
pause 60 pause 60
special Function8c0ab special Special_FadeInQuickly
special RestartMapMusic special RestartMapMusic
loadfont loadfont
writetext UnknownText_0x197134 writetext UnknownText_0x197134

10
maps/PokeCenter2F.asm
View File

@ -435,7 +435,7 @@ PokeCenter2F_CheckGender:
special Functionc225 special Functionc225
applymovement $0, MovementData_0x192d1c applymovement $0, MovementData_0x192d1c
setflag ENGINE_KRIS_IN_CABLE_CLUB setflag ENGINE_KRIS_IN_CABLE_CLUB
special Functione4a special Special_ReplaceKrisSprite
loadfont loadfont
writetext Text_LikeTheLook writetext Text_LikeTheLook
closetext closetext
@ -461,7 +461,7 @@ Script_CleanUpFemaleFlagAfterTrade:
writebyte $90 writebyte $90
special Functionc225 special Functionc225
applymovement $0, MovementData_0x192d1c applymovement $0, MovementData_0x192d1c
special Functione4a special Special_ReplaceKrisSprite
applymovement $0, MovementData_0x192d2a applymovement $0, MovementData_0x192d2a
applymovement $2, MovementData_0x192cfe applymovement $2, MovementData_0x192cfe
end end
@ -483,7 +483,7 @@ Script_CleanUpFemaleFlagAfterBattle:
writebyte $90 writebyte $90
special Functionc225 special Functionc225
applymovement $0, MovementData_0x192d1c applymovement $0, MovementData_0x192d1c
special Functione4a special Special_ReplaceKrisSprite
applymovement $0, MovementData_0x192d2a applymovement $0, MovementData_0x192d2a
applymovement $3, MovementData_0x192cfe applymovement $3, MovementData_0x192cfe
end end
@ -544,7 +544,7 @@ TimeCapsuleScript_CheckPlayerGender:
applymovement $0, MovementData_0x192d22 applymovement $0, MovementData_0x192d22
faceperson $0, $4 faceperson $0, $4
setflag ENGINE_KRIS_IN_CABLE_CLUB setflag ENGINE_KRIS_IN_CABLE_CLUB
special Functione4a special Special_ReplaceKrisSprite
loadfont loadfont
writetext Text_LikeTheLook writetext Text_LikeTheLook
closetext closetext
@ -571,7 +571,7 @@ Script_LeftTimeCapsule:
writebyte $90 writebyte $90
special Functionc225 special Functionc225
applymovement $0, MovementData_0x192d1c applymovement $0, MovementData_0x192d1c
special Functione4a special Special_ReplaceKrisSprite
applymovement $0, MovementData_0x192cfc applymovement $0, MovementData_0x192cfc
applymovement $4, MovementData_0x192d01 applymovement $4, MovementData_0x192d01
.Done: .Done:

6
maps/RadioTower5F.asm
View File

@ -90,12 +90,12 @@ UnknownScript_0x6006e:
writetext UnknownText_0x6050e writetext UnknownText_0x6050e
closetext closetext
loadmovesprites loadmovesprites
special Function8c0b6 special Special_FadeBlackQuickly
special Functiond91 special Special_ReloadSpritesNoPalettes
disappear $3 disappear $3
disappear $4 disappear $4
pause 15 pause 15
special Function8c0ab special Special_FadeInQuickly
setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1
setevent EVENT_CLEARED_RADIO_TOWER setevent EVENT_CLEARED_RADIO_TOWER
clearflag ENGINE_ROCKETS_IN_RADIO_TOWER clearflag ENGINE_ROCKETS_IN_RADIO_TOWER

6
maps/Route24.asm
View File

@ -25,11 +25,11 @@ RocketScript_0x1adbfa:
writetext UnknownText_0x1adee1 writetext UnknownText_0x1adee1
closetext closetext
loadmovesprites loadmovesprites
special Function8c0b6 special Special_FadeBlackQuickly
special Functiond91 special Special_ReloadSpritesNoPalettes
disappear $2 disappear $2
pause 25 pause 25
special Function8c0ab special Special_FadeInQuickly
playmapmusic playmapmusic
end end

6
maps/Route26HealSpeechHouse.asm
View File

@ -11,13 +11,13 @@ TeacherScript_0x7b125:
writetext UnknownText_0x7b14d writetext UnknownText_0x7b14d
closetext closetext
loadmovesprites loadmovesprites
special Function8c0b6 special Special_FadeBlackQuickly
special Functiond91 special Special_ReloadSpritesNoPalettes
special Mobile_HealParty special Mobile_HealParty
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
special HealParty special HealParty
pause 60 pause 60
special Function8c0ab special Special_FadeInQuickly
special RestartMapMusic special RestartMapMusic
loadfont loadfont
writetext UnknownText_0x7b18b writetext UnknownText_0x7b18b

2
maps/Route34.asm
View File

@ -44,7 +44,7 @@ UnknownScript_0x78039:
GrampsScript_0x7803d: GrampsScript_0x7803d:
faceplayer faceplayer
loadfont loadfont
special Function16936 special Special_DayCareManOutside
closetext closetext
loadmovesprites loadmovesprites
if_equal $1, UnknownScript_0x7805a if_equal $1, UnknownScript_0x7805a

6
maps/Route36NationalParkgate.asm
View File

@ -67,14 +67,14 @@ UnknownScript_0x6ab47:
writetext UnknownText_0x6b2c5 writetext UnknownText_0x6b2c5
closetext closetext
loadmovesprites loadmovesprites
special Function8c0b6 special Special_FadeBlackQuickly
special Functiond91 special Special_ReloadSpritesNoPalettes
scall UnknownScript_0x6ab8c scall UnknownScript_0x6ab8c
disappear $2 disappear $2
appear $d appear $d
applymovement $0, MovementData_0x6add1 applymovement $0, MovementData_0x6add1
pause 15 pause 15
special Function8c0ab special Special_FadeInQuickly
jumpstd bugcontestresults jumpstd bugcontestresults
UnknownScript_0x6ab76: UnknownScript_0x6ab76:

6
maps/RuinsofAlphAerodactylChamber.asm
View File

@ -55,7 +55,7 @@ UnknownScript_0x58dd3:
MapRuinsofAlphAerodactylChamberSignpost2Script: MapRuinsofAlphAerodactylChamberSignpost2Script:
refreshscreen $0 refreshscreen $0
writebyte $2 writebyte $2
special Functionc360 special Special_UnownPuzzle
loadmovesprites loadmovesprites
iftrue UnknownScript_0x58df7 iftrue UnknownScript_0x58df7
end end
@ -89,7 +89,7 @@ MapRuinsofAlphAerodactylChamberSignpost4Script:
loadfont loadfont
writetext UnknownText_0x58e4f writetext UnknownText_0x58e4f
writebyte $1 writebyte $1
special Function8ae68 special Special_DisplayUnownWords
loadmovesprites loadmovesprites
end end
@ -99,7 +99,7 @@ MapRuinsofAlphAerodactylChamberSignpost5Script:
loadfont loadfont
writetext UnknownText_0x58e81 writetext UnknownText_0x58e81
writebyte $1 writebyte $1
special Function8ae68 special Special_DisplayUnownWords
loadmovesprites loadmovesprites
end end

6
maps/RuinsofAlphHoOhChamber.asm
View File

@ -56,7 +56,7 @@ UnknownScript_0x58596:
MapRuinsofAlphHoOhChamberSignpost2Script: MapRuinsofAlphHoOhChamberSignpost2Script:
refreshscreen $0 refreshscreen $0
writebyte $3 writebyte $3
special Functionc360 special Special_UnownPuzzle
loadmovesprites loadmovesprites
iftrue UnknownScript_0x585ba iftrue UnknownScript_0x585ba
end end
@ -90,7 +90,7 @@ MapRuinsofAlphHoOhChamberSignpost4Script:
loadfont loadfont
writetext UnknownText_0x58612 writetext UnknownText_0x58612
writebyte $3 writebyte $3
special Function8ae68 special Special_DisplayUnownWords
loadmovesprites loadmovesprites
end end
@ -100,7 +100,7 @@ MapRuinsofAlphHoOhChamberSignpost5Script:
loadfont loadfont
writetext UnknownText_0x58644 writetext UnknownText_0x58644
writebyte $3 writebyte $3
special Function8ae68 special Special_DisplayUnownWords
loadmovesprites loadmovesprites
end end

6
maps/RuinsofAlphKabutoChamber.asm
View File

@ -60,7 +60,7 @@ ReceptionistScript_0x58769:
MapRuinsofAlphKabutoChamberSignpost2Script: MapRuinsofAlphKabutoChamberSignpost2Script:
refreshscreen $0 refreshscreen $0
writebyte $0 writebyte $0
special Functionc360 special Special_UnownPuzzle
loadmovesprites loadmovesprites
iftrue UnknownScript_0x58778 iftrue UnknownScript_0x58778
end end
@ -125,7 +125,7 @@ MapRuinsofAlphKabutoChamberSignpost4Script:
loadfont loadfont
writetext UnknownText_0x58aa7 writetext UnknownText_0x58aa7
writebyte $0 writebyte $0
special Function8ae68 special Special_DisplayUnownWords
loadmovesprites loadmovesprites
end end
@ -135,7 +135,7 @@ MapRuinsofAlphKabutoChamberSignpost5Script:
loadfont loadfont
writetext UnknownText_0x58ad9 writetext UnknownText_0x58ad9
writebyte $0 writebyte $0
special Function8ae68 special Special_DisplayUnownWords
loadmovesprites loadmovesprites
end end

6
maps/RuinsofAlphOmanyteChamber.asm
View File

@ -56,7 +56,7 @@ UnknownScript_0x58c12:
MapRuinsofAlphOmanyteChamberSignpost2Script: MapRuinsofAlphOmanyteChamberSignpost2Script:
refreshscreen $0 refreshscreen $0
writebyte $1 writebyte $1
special Functionc360 special Special_UnownPuzzle
loadmovesprites loadmovesprites
iftrue UnknownScript_0x58c36 iftrue UnknownScript_0x58c36
end end
@ -90,7 +90,7 @@ MapRuinsofAlphOmanyteChamberSignpost4Script:
loadfont loadfont
writetext UnknownText_0x58c8e writetext UnknownText_0x58c8e
writebyte $2 writebyte $2
special Function8ae68 special Special_DisplayUnownWords
loadmovesprites loadmovesprites
end end
@ -100,7 +100,7 @@ MapRuinsofAlphOmanyteChamberSignpost5Script:
loadfont loadfont
writetext UnknownText_0x58cc0 writetext UnknownText_0x58cc0
writebyte $2 writebyte $2
special Function8ae68 special Special_DisplayUnownWords
loadmovesprites loadmovesprites
end end

2
maps/RuinsofAlphResearchCenter.asm
View File

@ -165,7 +165,7 @@ UnknownScript_0x5925a:
UnknownScript_0x59260: UnknownScript_0x59260:
writetext UnknownText_0x5982d writetext UnknownText_0x5982d
closetext closetext
special Functionc2cd special Special_UnownPrinter
loadmovesprites loadmovesprites
end end

2
maps/SaffronTrainStation.asm
View File

@ -33,7 +33,7 @@ UnknownScript_0x18a82c:
applymovement $2, MovementData_0x18a88f applymovement $2, MovementData_0x18a88f
applymovement $0, MovementData_0x18a898 applymovement $0, MovementData_0x18a898
writebyte $1 writebyte $1
special Function8cc04 special Special_MagnetTrain
warpcheck warpcheck
newloadmap $f9 newloadmap $f9
applymovement $0, MovementData_0x18a854 applymovement $0, MovementData_0x18a854

6
maps/SilverCaveRoom3.asm
View File

@ -22,11 +22,11 @@ RedScript_0x18c603:
writetext UnknownText_0x18c63f writetext UnknownText_0x18c63f
closetext closetext
loadmovesprites loadmovesprites
special Function8c0b6 special Special_FadeBlackQuickly
special Functiond91 special Special_ReloadSpritesNoPalettes
disappear $2 disappear $2
pause 15 pause 15
special Function8c0ab special Special_FadeInQuickly
pause 30 pause 30
special HealParty special HealParty
refreshscreen $0 refreshscreen $0

6
maps/SlowpokeWellB1F.asm
View File

@ -27,14 +27,14 @@ GruntM1Script:
writetext TrainerGruntM1WhenTalkText writetext TrainerGruntM1WhenTalkText
closetext closetext
loadmovesprites loadmovesprites
special Function8c0b6 special Special_FadeBlackQuickly
special Functiond91 special Special_ReloadSpritesNoPalettes
disappear $2 disappear $2
disappear $3 disappear $3
disappear $4 disappear $4
disappear $5 disappear $5
pause 15 pause 15
special Function8c0ab special Special_FadeInQuickly
disappear $8 disappear $8
moveperson $8, $b, $6 moveperson $8, $b, $6
appear $8 appear $8

6
maps/SproutTower3F.asm
View File

@ -47,11 +47,11 @@ UnknownScript_0x184947:
pause 15 pause 15
loadmovesprites loadmovesprites
playsound SFX_WARP_TO playsound SFX_WARP_TO
special Function8c0b6 special Special_FadeBlackQuickly
special Functiond91 special Special_ReloadSpritesNoPalettes
disappear $8 disappear $8
waitbutton waitbutton
special Function8c0ab special Special_FadeInQuickly
dotrigger $1 dotrigger $1
special RestartMapMusic special RestartMapMusic
end end

6
maps/TeamRocketBaseB2F.asm
View File

@ -98,15 +98,15 @@ UnknownScript_0x6cfac:
writetext UnknownText_0x6d4c6 writetext UnknownText_0x6d4c6
closetext closetext
loadmovesprites loadmovesprites
special Function8c0b6 special Special_FadeBlackQuickly
special Functiond91 special Special_ReloadSpritesNoPalettes
disappear $2 disappear $2
disappear $3 disappear $3
disappear $c disappear $c
disappear $d disappear $d
disappear $e disappear $e
pause 15 pause 15
special Function8c0ab special Special_FadeInQuickly
dotrigger $2 dotrigger $2
clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
spriteface $4, DOWN spriteface $4, DOWN

2
predef/sgb.asm
View File

@ -548,7 +548,7 @@ Function8a0c: ; 8a0c
ret ret
.asm_8a16 .asm_8a16
ld a, [wd19a] ld a, [wRoofPalette]
cp $2 cp $2
jr z, .asm_8a39 jr z, .asm_8a39
cp $4 cp $4

2
wram.asm
View File

@ -1550,7 +1550,7 @@ wd195:: ds 1
wd196:: ds 1 wd196:: ds 1
wd197:: ds 2 wd197:: ds 2
wd199:: ds 1 wd199:: ds 1
wd19a:: ds 3 wRoofPalette:: ds 3
; width/height are in blocks (2x2 walkable tiles, 4x4 graphics tiles) ; width/height are in blocks (2x2 walkable tiles, 4x4 graphics tiles)
MapHeader:: ; d19d MapHeader:: ; d19d