diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 11:28:52 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 11:28:52 -0400 |
| commit | b9f2b93c1741c44eaa6468284303d16dde654553 (patch) | |
| tree | 6fd5f53a732e2b5b2c574d945bf85ef7ef1004d4 | |
| parent | 4342ced31f53ff5d523a7a9cf15aad8e37b355ae (diff) | |
Harmonize some more symbols with pokegold
34 files changed, 69 insertions, 63 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 7c07c9e9e..09dff3921 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -491,3 +491,5 @@ ENDM map_const ROUTE_30_BERRY_HOUSE, 4, 4 ; 9 map_const MR_POKEMONS_HOUSE, 4, 4 ; 10 map_const ROUTE_31_VIOLET_GATE, 5, 4 ; 11 + +NUM_MAP_GROUPS EQU const_value ; 26 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index caa6743c2..8f089ee39 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -43,7 +43,7 @@ const SPRITE_YOUNGSTER ; 27 const SPRITE_LASS ; 28 const SPRITE_TEACHER ; 29 - const SPRITE_BUENA ; 2a + const SPRITE_BEAUTY ; 2a const SPRITE_SUPER_NERD ; 2b const SPRITE_ROCKER ; 2c const SPRITE_POKEFAN_M ; 2d diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index 03f4076f9..6398a9511 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -294,7 +294,7 @@ IndigoGroupSprites: db SPRITE_SUDOWOODO db SPRITE_BIG_SNORLAX db SPRITE_POKEFAN_M - db SPRITE_BUENA + db SPRITE_BEAUTY db SPRITE_GRAMPS db SPRITE_YOUNGSTER db SPRITE_FISHER @@ -496,7 +496,7 @@ CianwoodGroupSprites: db SPRITE_OLIVINE_RIVAL db SPRITE_POKEFAN_M db SPRITE_LASS - db SPRITE_BUENA + db SPRITE_BEAUTY db SPRITE_SWIMMER_GIRL db SPRITE_SAILOR db SPRITE_POKEFAN_F @@ -521,7 +521,7 @@ OlivineGroupSprites: db SPRITE_OLIVINE_RIVAL db SPRITE_POKEFAN_M db SPRITE_LASS - db SPRITE_BUENA + db SPRITE_BEAUTY db SPRITE_SWIMMER_GIRL db SPRITE_SAILOR db SPRITE_POKEFAN_F diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index b55593c97..08801eab2 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -47,7 +47,7 @@ OverworldSprites: overworld_sprite YoungsterSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE overworld_sprite LassSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite TeacherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED - overworld_sprite BuenaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite BeautySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE overworld_sprite SuperNerdSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE overworld_sprite RockerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN overworld_sprite PokefanMSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN diff --git a/data/trainers/sprites.asm b/data/trainers/sprites.asm index df6c04920..b92a9032c 100644 --- a/data/trainers/sprites.asm +++ b/data/trainers/sprites.asm @@ -28,11 +28,11 @@ BTTrainerClassSprites: db SPRITE_JANINE db SPRITE_COOLTRAINER_M db SPRITE_COOLTRAINER_F - db SPRITE_BUENA + db SPRITE_BEAUTY db SPRITE_SUPER_NERD db SPRITE_ROCKET db SPRITE_GENTLEMAN - db SPRITE_BUENA + db SPRITE_BEAUTY db SPRITE_TEACHER db SPRITE_SABRINA db SPRITE_BUG_CATCHER diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 277da60b1..0051d4162 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -76,7 +76,7 @@ Unused_CheckShininess: and a ret -Unreferenced_Function8aa4: +Unreferenced_SGB_ApplyCreditsPals: push de push bc ld hl, PalPacket_9ce6 @@ -205,7 +205,7 @@ Unreferenced_Function8b67: call GetPredefPal jp LoadHLPaletteIntoDE -Unreferenced_Function8b81: +Unreferenced_GSIntro_LoadMonPalette: call CheckCGB jr nz, .cgb ldh a, [hSGB] diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm index 6367bffe6..a784d20e9 100644 --- a/engine/gfx/load_pics.asm +++ b/engine/gfx/load_pics.asm @@ -287,7 +287,7 @@ EXPORT PICS_FIX db BANK("Pics 23") ; BANK("Pics 1") + 22 db BANK("Pics 24") ; BANK("Pics 1") + 23 -Function511ec: +Unreferenced_GSIntro_GetMonFrontpic: ld a, c push de ld hl, PokemonPicPointers diff --git a/engine/link/link.asm b/engine/link/link.asm index 521cfdd8b..18d6a44de 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -2503,8 +2503,8 @@ CableClubCheckWhichChris: ld [wScriptVar], a ret -Unreferenced_Gen1LinkCommsBorderGFX: -INCBIN "gfx/trade/unused_gen_1_border_tiles.2bpp" +Unreferenced_GSLinkCommsBorderGFX: +INCBIN "gfx/trade/unused_gs_border_tiles.2bpp" Unreferenced_Function29fe4: ld a, BANK(sPartyMail) diff --git a/engine/link/mystery_gift_2.asm b/engine/link/mystery_gift_2.asm index 9712c665d..404350396 100644 --- a/engine/link/mystery_gift_2.asm +++ b/engine/link/mystery_gift_2.asm @@ -1,6 +1,6 @@ PrepMysteryGiftDataToSend: ld de, wMysteryGiftStaging - ld a, $1 + ld a, $1 + GS_VERSION ld [de], a inc de ; wc801 ld a, BANK(sGameData) diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index c2b9f9f09..63f8e565a 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -363,8 +363,8 @@ Continue: ld c, 20 call DelayFrames farcall JumpRoamMons - farcall MysteryGift_CopyReceivedDecosToPC ; Mystery Gift - farcall Function140ae ; time-related + farcall MysteryGift_CopyReceivedDecosToPC + farcall ClockContinue ld a, [wSpawnAfterChampion] cp SPAWN_LANCE jr z, .SpawnAfterE4 diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 214028bce..1e4210cd3 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -4,7 +4,7 @@ INCBIN "gfx/mobile/mobile_menu.2bpp" MainMenu: xor a ld [wDisableTextAcceleration], a - call Function49ed0 + call ClearTilemapEtc ld b, SCGB_DIPLOMA call GetSGBLayout call SetPalettes @@ -310,7 +310,7 @@ MainMenu_PrintCurrentTimeAndDay: .Day: db "DAY@" -Function49ed0: +ClearTilemapEtc: xor a ldh [hMapAnims], a call ClearTilemap diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm index 814f608f7..885dd379a 100644 --- a/engine/overworld/overworld.asm +++ b/engine/overworld/overworld.asm @@ -15,7 +15,7 @@ _ReplaceKrisSprite:: call GetUsedSprite ret -Function14146: ; mobile +_RefreshSprites: ; mobile ld hl, wSpriteFlags ld a, [hl] push af @@ -26,7 +26,7 @@ Function14146: ; mobile ld [wSpriteFlags], a ret -Function14157: ; mobile +_ClearSprites: ; mobile ld hl, wSpriteFlags ld a, [hl] push af diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 8e35b3b45..9291192d7 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -2817,9 +2817,9 @@ Script_checksave: ret ; unused - ld a, [.byte] + ld a, [.gs_version] ld [wScriptVar], a ret -.byte - db 0 +.gs_version + db GS_VERSION diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index e26130098..607efcca2 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -448,7 +448,7 @@ CheckCancelPrint: .pressed_b ld a, [wca80] - cp $c + cp $0c jr nz, .cancel .loop ld a, [wPrinterOpcode] diff --git a/engine/rtc/rtc.asm b/engine/rtc/rtc.asm index e3007ee4e..c7c4fae9e 100644 --- a/engine/rtc/rtc.asm +++ b/engine/rtc/rtc.asm @@ -90,7 +90,7 @@ SaveRTC: StartClock:: call GetClock - call Function1409b + call _FixDays call FixDays jr nc, .skip_set ; bit 5: Day count exceeds 139 @@ -101,7 +101,7 @@ StartClock:: call StartRTC ret -Function1409b: +_FixDays: ld hl, hRTCDayHi bit 7, [hl] jr nz, .set_bit_7 @@ -116,7 +116,7 @@ Function1409b: call RecordRTCStatus ; set bit 7 on sRTCStatusFlags ret -Function140ae: +ClockContinue: call CheckRTCStatus ld c, a and %11000000 ; Day count exceeded 255 or 16383 diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index cdb2c9a12..5b12aec1f 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -593,7 +593,7 @@ InitialClearDSTFlag: text_far _TimeAskOkayText text_end -DebugDisplayTime: +Unreferenced_MrChrono: hlcoord 1, 14 lb bc, 3, SCREEN_WIDTH - 2 call ClearBox diff --git a/gfx/sprites.asm b/gfx/sprites.asm index f84ae77d6..516237a7b 100644 --- a/gfx/sprites.asm +++ b/gfx/sprites.asm @@ -41,7 +41,7 @@ TwinSpriteGFX:: INCBIN "gfx/sprites/twin.2bpp" YoungsterSpriteGFX:: INCBIN "gfx/sprites/youngster.2bpp" LassSpriteGFX:: INCBIN "gfx/sprites/lass.2bpp" TeacherSpriteGFX:: INCBIN "gfx/sprites/teacher.2bpp" -BuenaSpriteGFX:: INCBIN "gfx/sprites/buena.2bpp" +BeautySpriteGFX:: INCBIN "gfx/sprites/beauty.2bpp" SuperNerdSpriteGFX:: INCBIN "gfx/sprites/super_nerd.2bpp" RockerSpriteGFX:: INCBIN "gfx/sprites/rocker.2bpp" diff --git a/gfx/sprites/buena.png b/gfx/sprites/beauty.png Binary files differindex af5a7e7e7..af5a7e7e7 100644 --- a/gfx/sprites/buena.png +++ b/gfx/sprites/beauty.png diff --git a/gfx/tileset_palette_maps.asm b/gfx/tileset_palette_maps.asm index 7f94ecc1f..b423c4c45 100644 --- a/gfx/tileset_palette_maps.asm +++ b/gfx/tileset_palette_maps.asm @@ -108,4 +108,5 @@ INCLUDE "gfx/tilesets/battle_tower_inside_palette_map.asm" TilesetBattleTowerOutsidePalMap: INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm" - ds 26, $06 ; unused +Unreferenced_MapGroupPalettes: + ds NUM_MAP_GROUPS, PAL_BG_ROOF diff --git a/gfx/trade/unused_gen_1_border_tiles.png b/gfx/trade/unused_gs_border_tiles.png Binary files differindex d3ac169fc..d3ac169fc 100644 --- a/gfx/trade/unused_gen_1_border_tiles.png +++ b/gfx/trade/unused_gs_border_tiles.png diff --git a/home/pokemon.asm b/home/pokemon.asm index 40b442fc0..edf17e7af 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -267,7 +267,7 @@ GetBaseData:: jr .end .egg - ld de, UnusedEggFrontpic + ld de, UnusedEggPic ; Sprite dimensions ld b, $55 ; 5x5 diff --git a/home/printer.asm b/home/printer.asm index 9747713c7..745399a5d 100644 --- a/home/printer.asm +++ b/home/printer.asm @@ -23,7 +23,7 @@ AskSerial:: xor a ld [hl], a - ld a, 12 + ld a, $0c ld [wPrinterOpcode], a ; handshake diff --git a/macros/legacy.asm b/macros/legacy.asm index 3ba19d234..4552afc05 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -381,3 +381,6 @@ receivetogepiegg EQUS "ReceiveTogepiEggScript" pcscript EQUS "PCScript" gamecornercoinvendor EQUS "GameCornerCoinVendorScript" happinesschecknpc EQUS "HappinessCheckScript" + +; constants/sprite_constants.asm +SPRITE_BUENA EQUS "SPRITE_BEAUTY" @@ -261,7 +261,7 @@ INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/names.asm" INCLUDE "data/pokemon/unused_pic_banks.asm" -UnusedEggFrontpic:: +UnusedEggPic:: ; Another egg pic. This is shifted up a few pixels. INCBIN "gfx/pokemon/egg/unused_front.2bpp.lz" diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 47ba8facf..b490276b7 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,6 +1,6 @@ object_const_def ; object_event constants const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER - const BATTLETOWEROUTSIDE_BUENA + const BATTLETOWEROUTSIDE_BEAUTY const BATTLETOWEROUTSIDE_SAILOR const BATTLETOWEROUTSIDE_LASS @@ -21,8 +21,8 @@ BattleTowerOutside_MapScripts: BattleTowerOutsideYoungsterScript: jumptextfaceplayer BattleTowerOutsideYoungsterText -BattleTowerOutsideBuenaScript: - jumptextfaceplayer BattleTowerOutsideBuenaText +BattleTowerOutsideBeautyScript: + jumptextfaceplayer BattleTowerOutsideBeautyText BattleTowerOutsideSailorScript: jumptextfaceplayer BattleTowerOutsideSailorText @@ -63,7 +63,7 @@ BattleTowerOutsideYoungsterText: cont "in there!" done -BattleTowerOutsideBuenaText_NotYetOpen: +BattleTowerOutsideBeautyText_NotYetOpen: ; unreferenced text "What on earth do" line "they do here?" @@ -75,7 +75,7 @@ BattleTowerOutsideBuenaText_NotYetOpen: line "#MON battles." done -BattleTowerOutsideBuenaText: +BattleTowerOutsideBeautyText: text "You can use only" line "three #MON." @@ -147,6 +147,6 @@ BattleTowerOutside_MapEvents: db 4 ; object events object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 - object_event 13, 11, SPRITE_BUENA, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 + object_event 13, 11, SPRITE_BEAUTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBeautyScript, -1 object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 4d65ea229..ef35bf96e 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -2,7 +2,7 @@ const CELADONGYM_ERIKA const CELADONGYM_LASS1 const CELADONGYM_LASS2 - const CELADONGYM_BUENA + const CELADONGYM_BEAUTY const CELADONGYM_TWIN1 const CELADONGYM_TWIN2 @@ -282,6 +282,6 @@ CeladonGym_MapEvents: object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGymErikaScript, -1 object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 - object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1 + object_event 3, 5, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1 object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoAndZoe1, -1 object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoAndZoe2, -1 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 7cde60b2b..31128c14b 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -1,7 +1,7 @@ object_const_def ; object_event constants const FASTSHIPCABINS_SW_SSW_NW_FISHER const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER - const FASTSHIPCABINS_SW_SSW_NW_BUENA + const FASTSHIPCABINS_SW_SSW_NW_BEAUTY const FASTSHIPCABINS_SW_SSW_NW_ROCKER FastShipCabins_SW_SSW_NW_MapScripts: @@ -240,5 +240,5 @@ FastShipCabins_SW_SSW_NW_MapEvents: db 4 ; object events object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 1, 26, SPRITE_BEAUTY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND object_event 3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 49faf9e72..965a8fc67 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -2,8 +2,8 @@ const GOLDENRODGYM_WHITNEY const GOLDENRODGYM_LASS1 const GOLDENRODGYM_LASS2 - const GOLDENRODGYM_BUENA1 - const GOLDENRODGYM_BUENA2 + const GOLDENRODGYM_BEAUTY1 + const GOLDENRODGYM_BEAUTY2 const GOLDENRODGYM_GYM_GUY GoldenrodGym_MapScripts: @@ -395,6 +395,6 @@ GoldenrodGym_MapEvents: object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymWhitneyScript, -1 object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1 object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1 - object_event 0, 2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 - object_event 19, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1 + object_event 0, 2, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 + object_event 19, 5, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1 object_event 5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index b92338f9c..87c6d148f 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -1,8 +1,8 @@ object_const_def ; object_event constants const MAHOGANYGYM_PRYCE - const MAHOGANYGYM_BUENA1 + const MAHOGANYGYM_BEAUTY1 const MAHOGANYGYM_ROCKER1 - const MAHOGANYGYM_BUENA2 + const MAHOGANYGYM_BEAUTY2 const MAHOGANYGYM_ROCKER2 const MAHOGANYGYM_ROCKER3 const MAHOGANYGYM_GYM_GUY @@ -385,9 +385,9 @@ MahoganyGym_MapEvents: db 7 ; object events object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MahoganyGymPryceScript, -1 - object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 + object_event 4, 6, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1 - object_event 9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1 + object_event 9, 17, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1 object_event 5, 9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1 object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1 object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1 diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 28c076cb4..e0d6f179e 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -736,5 +736,5 @@ RadioTower2F_MapEvents: object_event 0, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS object_event 1, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER object_event 12, 1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 - object_event 14, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1 + object_event 14, 5, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1 object_event 12, 7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTowerBuenaPrizeReceptionist, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/Route38.asm b/maps/Route38.asm index 619e25546..5303d0ccb 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -2,10 +2,10 @@ const ROUTE38_STANDING_YOUNGSTER1 const ROUTE38_LASS const ROUTE38_STANDING_YOUNGSTER2 - const ROUTE38_BUENA1 + const ROUTE38_BEAUTY1 const ROUTE38_SAILOR const ROUTE38_FRUIT_TREE - const ROUTE38_BUENA2 + const ROUTE38_BEAUTY2 Route38_MapScripts: db 0 ; scene scripts @@ -487,7 +487,7 @@ Route38_MapEvents: object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1 object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1 - object_event 19, 9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1 + object_event 19, 9, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1 object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1 object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route38FruitTree, -1 - object_event 5, 8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 + object_event 5, 8, SPRITE_BEAUTY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 diff --git a/maps/Route40.asm b/maps/Route40.asm index 224f90371..2c5ebc49c 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -356,7 +356,7 @@ Route40_MapEvents: object_event 6, 9, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 object_event 11, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1 - object_event 8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY + object_event 8, 10, SPRITE_BEAUTY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40PokefanMScript, -1 object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1 object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index cd5401c15..f809e992c 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,7 +1,7 @@ object_const_def ; object_event constants const VERMILIONMART_CLERK const VERMILIONMART_SUPER_NERD - const VERMILIONMART_BUENA + const VERMILIONMART_BEAUTY VermilionMart_MapScripts: db 0 ; scene scripts @@ -17,8 +17,8 @@ VermilionMartClerkScript: VermilionMartSuperNerdScript: jumptextfaceplayer VermilionMartSuperNerdText -VermilionMartBuenaScript: - jumptextfaceplayer VermilionMartBuenaText +VermilionMartBeautyScript: + jumptextfaceplayer VermilionMartBeautyText VermilionMartSuperNerdText: text "TEAM ROCKET is no" @@ -28,7 +28,7 @@ VermilionMartSuperNerdText: line "me happy." done -VermilionMartBuenaText: +VermilionMartBeautyText: text "I'm thinking about" line "going shopping in" cont "SAFFRON." @@ -48,4 +48,4 @@ VermilionMart_MapEvents: db 3 ; object events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMartClerkScript, -1 object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 - object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 + object_event 8, 6, SPRITE_BEAUTY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBeautyScript, -1 diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index d8f2d8b39..28b5b611b 100644 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -668,7 +668,7 @@ Function1163c0: ld bc, 16 * SPRITEOAMSTRUCT_LENGTH call ByteFill call DelayFrame - farcall Function14146 + farcall _RefreshSprites ld b, SCGB_MAPPALS call GetSGBLayout ldh a, [rSVBK] @@ -686,7 +686,7 @@ Function1163c0: ld a, $90 ldh [hWY], a call UpdateSprites - farcall Function14157 + farcall _ClearSprites pop af ldh [rSVBK], a farcall ReloadMapPart |
