mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Organize the engine/ directory, director's cut
Cleaned up `engine/routines`, in favor of moving files into more appropriate directories. predef-related routines are now in top-level `engine`. `rtc/delete_save_change_clock.asm` has been split into both `menus/delete_save.asm` and `rtc/reset_password.asm`. Made a new subdirectory: * engine/math: Contains all generic math-related routines.
This commit is contained in:
parent
0d9241889f
commit
be76ee56a8
36
engine/menus/delete_save.asm
Normal file
36
engine/menus/delete_save.asm
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
_DeleteSaveData: ; 4d54c
|
||||||
|
farcall BlankScreen
|
||||||
|
ld b, SCGB_DIPLOMA
|
||||||
|
call GetSGBLayout
|
||||||
|
call LoadStandardFont
|
||||||
|
call LoadFontsExtra
|
||||||
|
ld de, MUSIC_MAIN_MENU
|
||||||
|
call PlayMusic
|
||||||
|
ld hl, .Text_ClearAllSaveData
|
||||||
|
call PrintText
|
||||||
|
ld hl, .NoYesMenuHeader
|
||||||
|
call CopyMenuHeader
|
||||||
|
call VerticalMenu
|
||||||
|
ret c
|
||||||
|
ld a, [wMenuCursorY]
|
||||||
|
cp $1
|
||||||
|
ret z
|
||||||
|
farcall EmptyAllSRAMBanks
|
||||||
|
ret
|
||||||
|
|
||||||
|
.Text_ClearAllSaveData: ; 0x4d580
|
||||||
|
; Clear all save data?
|
||||||
|
text_jump UnknownText_0x1c564a
|
||||||
|
db "@"
|
||||||
|
|
||||||
|
.NoYesMenuHeader: ; 0x4d585
|
||||||
|
db 0 ; flags
|
||||||
|
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
|
||||||
|
dw .MenuData
|
||||||
|
db 1 ; default option
|
||||||
|
|
||||||
|
.MenuData: ; 0x4d58d
|
||||||
|
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
|
||||||
|
db 2 ; items
|
||||||
|
db "NO@"
|
||||||
|
db "YES@"
|
@ -257,40 +257,3 @@ ClockResetPassword: ; 4d41e
|
|||||||
dec c
|
dec c
|
||||||
jr nz, .ComponentFromString
|
jr nz, .ComponentFromString
|
||||||
ret
|
ret
|
||||||
|
|
||||||
_DeleteSaveData: ; 4d54c
|
|
||||||
farcall BlankScreen
|
|
||||||
ld b, SCGB_DIPLOMA
|
|
||||||
call GetSGBLayout
|
|
||||||
call LoadStandardFont
|
|
||||||
call LoadFontsExtra
|
|
||||||
ld de, MUSIC_MAIN_MENU
|
|
||||||
call PlayMusic
|
|
||||||
ld hl, .Text_ClearAllSaveData
|
|
||||||
call PrintText
|
|
||||||
ld hl, .NoYesMenuHeader
|
|
||||||
call CopyMenuHeader
|
|
||||||
call VerticalMenu
|
|
||||||
ret c
|
|
||||||
ld a, [wMenuCursorY]
|
|
||||||
cp $1
|
|
||||||
ret z
|
|
||||||
farcall EmptyAllSRAMBanks
|
|
||||||
ret
|
|
||||||
|
|
||||||
.Text_ClearAllSaveData: ; 0x4d580
|
|
||||||
; Clear all save data?
|
|
||||||
text_jump UnknownText_0x1c564a
|
|
||||||
db "@"
|
|
||||||
|
|
||||||
.NoYesMenuHeader: ; 0x4d585
|
|
||||||
db 0 ; flags
|
|
||||||
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
|
|
||||||
dw .MenuData
|
|
||||||
db 1 ; default option
|
|
||||||
|
|
||||||
.MenuData: ; 0x4d58d
|
|
||||||
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
|
|
||||||
db 2 ; items
|
|
||||||
db "NO@"
|
|
||||||
db "YES@"
|
|
@ -1,5 +1,4 @@
|
|||||||
|
RestartClock_GetWraparoundTime: ; 20000 (8:4000)
|
||||||
ResetClock_GetWraparoundTime: ; 20000 (8:4000)
|
|
||||||
push hl
|
push hl
|
||||||
dec a
|
dec a
|
||||||
ld e, a
|
ld e, a
|
||||||
@ -152,7 +151,7 @@ RestartClock: ; 20021 (8:4021)
|
|||||||
|
|
||||||
.pressed_up
|
.pressed_up
|
||||||
ld a, [wBuffer1]
|
ld a, [wBuffer1]
|
||||||
call ResetClock_GetWraparoundTime
|
call RestartClock_GetWraparoundTime
|
||||||
ld a, [de]
|
ld a, [de]
|
||||||
inc a
|
inc a
|
||||||
ld [de], a
|
ld [de], a
|
||||||
@ -164,7 +163,7 @@ RestartClock: ; 20021 (8:4021)
|
|||||||
|
|
||||||
.pressed_down
|
.pressed_down
|
||||||
ld a, [wBuffer1]
|
ld a, [wBuffer1]
|
||||||
call ResetClock_GetWraparoundTime
|
call RestartClock_GetWraparoundTime
|
||||||
ld a, [de]
|
ld a, [de]
|
||||||
dec a
|
dec a
|
||||||
ld [de], a
|
ld [de], a
|
||||||
@ -230,7 +229,7 @@ RestartClock: ; 20021 (8:4021)
|
|||||||
|
|
||||||
.PlaceChars: ; 20168 (8:4168)
|
.PlaceChars: ; 20168 (8:4168)
|
||||||
push de
|
push de
|
||||||
call ResetClock_GetWraparoundTime
|
call RestartClock_GetWraparoundTime
|
||||||
ld a, [wBuffer3]
|
ld a, [wBuffer3]
|
||||||
dec a
|
dec a
|
||||||
ld b, a
|
ld b, a
|
23
main.asm
23
main.asm
@ -10,7 +10,7 @@ INCLUDE "engine/menus/intro_menu.asm"
|
|||||||
INCLUDE "engine/overworld/init_map.asm"
|
INCLUDE "engine/overworld/init_map.asm"
|
||||||
INCLUDE "engine/pokemon/learn.asm"
|
INCLUDE "engine/pokemon/learn.asm"
|
||||||
INCLUDE "engine/pokemon/checknickerrors.asm"
|
INCLUDE "engine/pokemon/checknickerrors.asm"
|
||||||
INCLUDE "engine/routines/math.asm"
|
INCLUDE "engine/math/math.asm"
|
||||||
INCLUDE "data/items/attributes.asm"
|
INCLUDE "data/items/attributes.asm"
|
||||||
INCLUDE "engine/overworld/npc_movement.asm"
|
INCLUDE "engine/overworld/npc_movement.asm"
|
||||||
INCLUDE "engine/events/happiness_egg.asm"
|
INCLUDE "engine/events/happiness_egg.asm"
|
||||||
@ -20,8 +20,8 @@ INCLUDE "engine/events/specials_2.asm"
|
|||||||
SECTION "bank2", ROMX
|
SECTION "bank2", ROMX
|
||||||
|
|
||||||
INCLUDE "engine/overworld/player_object.asm"
|
INCLUDE "engine/overworld/player_object.asm"
|
||||||
INCLUDE "engine/routines/sine.asm"
|
INCLUDE "engine/math/sine.asm"
|
||||||
INCLUDE "engine/routines/predef.asm"
|
INCLUDE "engine/predef.asm"
|
||||||
INCLUDE "engine/gfx/color.asm"
|
INCLUDE "engine/gfx/color.asm"
|
||||||
|
|
||||||
|
|
||||||
@ -29,7 +29,7 @@ SECTION "bank3", ROMX
|
|||||||
|
|
||||||
INCLUDE "engine/events/checktime.asm"
|
INCLUDE "engine/events/checktime.asm"
|
||||||
INCLUDE "engine/events/specials.asm"
|
INCLUDE "engine/events/specials.asm"
|
||||||
INCLUDE "engine/routines/printnum.asm"
|
INCLUDE "engine/math/printnum.asm"
|
||||||
INCLUDE "engine/pokemon/health.asm"
|
INCLUDE "engine/pokemon/health.asm"
|
||||||
INCLUDE "engine/events/overworld.asm"
|
INCLUDE "engine/events/overworld.asm"
|
||||||
INCLUDE "engine/items/items.asm"
|
INCLUDE "engine/items/items.asm"
|
||||||
@ -65,7 +65,7 @@ INCLUDE "engine/events/bug_contest/judging.asm"
|
|||||||
INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm"
|
INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm"
|
||||||
INCLUDE "engine/events/bug_contest/contest_2.asm"
|
INCLUDE "engine/events/bug_contest/contest_2.asm"
|
||||||
INCLUDE "engine/pokemon/correcterrorsinplayerparty.asm"
|
INCLUDE "engine/pokemon/correcterrorsinplayerparty.asm"
|
||||||
INCLUDE "engine/routines/getsquareroot.asm"
|
INCLUDE "engine/math/getsquareroot.asm"
|
||||||
|
|
||||||
|
|
||||||
SECTION "bank5", ROMX
|
SECTION "bank5", ROMX
|
||||||
@ -95,7 +95,7 @@ INCLUDE "engine/tilesets/mapgroup_roofs.asm"
|
|||||||
|
|
||||||
SECTION "Clock Reset", ROMX
|
SECTION "Clock Reset", ROMX
|
||||||
|
|
||||||
INCLUDE "engine/rtc/clock_reset.asm"
|
INCLUDE "engine/rtc/restart_clock.asm"
|
||||||
|
|
||||||
|
|
||||||
SECTION "bank9", ROMX
|
SECTION "bank9", ROMX
|
||||||
@ -208,7 +208,7 @@ SECTION "bank13", ROMX
|
|||||||
INCLUDE "engine/tilesets/map_palettes.asm"
|
INCLUDE "engine/tilesets/map_palettes.asm"
|
||||||
INCLUDE "gfx/tileset_palette_maps.asm"
|
INCLUDE "gfx/tileset_palette_maps.asm"
|
||||||
INCLUDE "data/collision_permissions.asm"
|
INCLUDE "data/collision_permissions.asm"
|
||||||
INCLUDE "engine/routines/emptyallsrambanks.asm"
|
INCLUDE "engine/menus/emptyallsrambanks.asm"
|
||||||
INCLUDE "engine/menus/savemenu_copytilemapatonce.asm"
|
INCLUDE "engine/menus/savemenu_copytilemapatonce.asm"
|
||||||
INCLUDE "engine/events/checksave.asm"
|
INCLUDE "engine/events/checksave.asm"
|
||||||
INCLUDE "data/maps/scenes.asm"
|
INCLUDE "data/maps/scenes.asm"
|
||||||
@ -222,9 +222,10 @@ Shrink2Pic: ; 4d2d9
|
|||||||
INCBIN "gfx/new_game/shrink2.2bpp.lz"
|
INCBIN "gfx/new_game/shrink2.2bpp.lz"
|
||||||
|
|
||||||
INCLUDE "engine/link/link_2.asm"
|
INCLUDE "engine/link/link_2.asm"
|
||||||
INCLUDE "engine/rtc/delete_save_change_clock.asm"
|
INCLUDE "engine/rtc/reset_password.asm"
|
||||||
|
INCLUDE "engine/menus/delete_save.asm"
|
||||||
INCLUDE "data/tilesets.asm"
|
INCLUDE "data/tilesets.asm"
|
||||||
INCLUDE "engine/routines/flagpredef.asm"
|
INCLUDE "engine/flagpredef.asm"
|
||||||
INCLUDE "engine/gfx/trademonfrontpic.asm"
|
INCLUDE "engine/gfx/trademonfrontpic.asm"
|
||||||
INCLUDE "engine/events/pokerus/check_pokerus.asm"
|
INCLUDE "engine/events/pokerus/check_pokerus.asm"
|
||||||
INCLUDE "engine/events/lucky_number.asm"
|
INCLUDE "engine/events/lucky_number.asm"
|
||||||
@ -253,9 +254,9 @@ INCLUDE "engine/events/basement_key.asm"
|
|||||||
INCLUDE "engine/events/sacred_ash.asm"
|
INCLUDE "engine/events/sacred_ash.asm"
|
||||||
INCLUDE "engine/pokemon/tempmon.asm"
|
INCLUDE "engine/pokemon/tempmon.asm"
|
||||||
INCLUDE "engine/pokemon/types.asm"
|
INCLUDE "engine/pokemon/types.asm"
|
||||||
INCLUDE "engine/routines/unreferenced_getgen1trainerclassname.asm"
|
INCLUDE "engine/battle/unreferenced_getgen1trainerclassname.asm"
|
||||||
INCLUDE "engine/pokemon/mon_stats.asm"
|
INCLUDE "engine/pokemon/mon_stats.asm"
|
||||||
INCLUDE "engine/routines/initlist.asm"
|
INCLUDE "engine/link/initlist.asm"
|
||||||
INCLUDE "engine/pokemon/experience.asm"
|
INCLUDE "engine/pokemon/experience.asm"
|
||||||
INCLUDE "engine/pokemon/switchpartymons.asm"
|
INCLUDE "engine/pokemon/switchpartymons.asm"
|
||||||
INCLUDE "engine/gfx/load_pics.asm"
|
INCLUDE "engine/gfx/load_pics.asm"
|
||||||
|
Loading…
Reference in New Issue
Block a user